Console Output

Started by upstream project "bcc-pr" build number 1076
originally caused by:
 GitHub pull request #3531 of commit 69a45c897eca19e92e1cf055e48399398fb16c18, no merge conflicts.
Running as SYSTEM
Building remotely on ubuntu1710-slave-5a6 (ubuntu1710) in workspace /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710
The recommended git tool is: NONE
No credentials specified
Cloning the remote Git repository
Cloning repository https://github.com/iovisor/bcc.git
 > git init /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710 # timeout=10
Fetching upstream changes from https://github.com/iovisor/bcc.git
 > git --version # timeout=10
 > git --version # 'git version 2.14.1'
 > git fetch --tags --progress -- https://github.com/iovisor/bcc.git +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/iovisor/bcc.git # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/iovisor/bcc.git # timeout=10
Fetching upstream changes from https://github.com/iovisor/bcc.git
 > git fetch --tags --progress -- https://github.com/iovisor/bcc.git +refs/pull/*:refs/remotes/origin/pr/* # timeout=10
JENKINS-19022: warning: possible memory leak due to Git plugin usage; see: https://wiki.jenkins.io/display/JENKINS/Remove+Git+Plugin+BuildsByBranch+BuildData
Checking out Revision 6c1ab2117de64ae967d03b025b7822b707c8c497 (refs/remotes/origin/pr/3531/merge)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 6c1ab2117de64ae967d03b025b7822b707c8c497 # timeout=10
Commit message: "Merge 69a45c897eca19e92e1cf055e48399398fb16c18 into b21bd30d092d57752ce2874f04f739a1f0f42b43"
 > git rev-list --no-walk 41bc04f77fd1cfb01beda632d6aea923303e52e9 # timeout=10
First time build. Skipping changelog.
Run condition [Execute Shell] enabling prebuild for step [Execute shell]
Run condition [Execute Shell] enabling prebuild for step [Execute shell]
[ubuntu1710] $ /bin/sh -xe /tmp/CommandInterpreterCondition8653402080816625455.sh
+ grep -q ^ID=fedora /etc/os-release
Run condition [Execute Shell] preventing perform for step [Execute shell]
[ubuntu1710] $ /bin/sh -xe /tmp/CommandInterpreterCondition12734221461964697377.sh
+ grep -q ^ID=ubuntu /etc/os-release
Run condition [Execute Shell] enabling perform for step [Execute shell]
[ubuntu1710] $ /bin/sh -xe /tmp/jenkins410381755533052646.sh
+ git clean -df
+ seq 1 30
+ sudo fuser /var/lib/dpkg/lock
+ break
+ sudo dpkg -r bcc-tools libbcc libbcc-examples python-bcc bcc-lua
dpkg: warning: ignoring request to remove bcc-tools which isn't installed
dpkg: warning: ignoring request to remove libbcc which isn't installed
dpkg: warning: ignoring request to remove libbcc-examples which isn't installed
dpkg: warning: ignoring request to remove python-bcc which isn't installed
dpkg: warning: ignoring request to remove bcc-lua which isn't installed
+ rm -rf build
+ ./scripts/build-deb.sh test
+ set -e
+ PARALLEL=2
++ mktemp -d /tmp/debuild.XXXXXX
+ TMP=/tmp/debuild.1xf8Y7
+ trap cleanup EXIT
+ git submodule update --init --recursive
+ . scripts/git-tag.sh
+++ git describe --tags --abbrev=0
++ git_tag_latest=v0.20.0
+++ git rev-list v0.20.0.. --count
++ git_rev_count=74
++ git_rev_count=75
+++ git log --pretty=%s -n 1
++ git_subject='Merge 69a45c897eca19e92e1cf055e48399398fb16c18 into b21bd30d092d57752ce2874f04f739a1f0f42b43'
++ release=75
++ [[ 75 != \1 ]]
+++ git log --pretty=%h -n 1
++ release=75.git.6c1ab211
++ revision=0.20.0
+ git archive HEAD --prefix=bcc/ --format=tar -o /tmp/debuild.1xf8Y7/bcc_0.20.0.orig.tar
+ pushd src/cc/libbpf
~/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/libbpf ~/jenkins/workspace/bcc-pr/label/ubuntu1710
+ git archive HEAD --prefix=bcc/src/cc/libbpf/ --format=tar -o /tmp/debuild.1xf8Y7/bcc_libbpf_0.20.0.orig.tar
+ popd
~/jenkins/workspace/bcc-pr/label/ubuntu1710
+ pushd /tmp/debuild.1xf8Y7
/tmp/debuild.1xf8Y7 ~/jenkins/workspace/bcc-pr/label/ubuntu1710
+ tar -A -f bcc_0.20.0.orig.tar bcc_libbpf_0.20.0.orig.tar
+ gzip bcc_0.20.0.orig.tar
+ tar xf bcc_0.20.0.orig.tar.gz
+ cd bcc
+ debuild=debuild
+ [[ test = \t\e\s\t ]]
+ debuild+=' --preserve-envvar PATH'
+ echo -e '#!/bin/bash\nexec /usr/bin/dpkg-deb -z1 "$@"'
+ sudo tee /usr/local/bin/dpkg-deb
#!/bin/bash
exec /usr/bin/dpkg-deb -z1 "$@"
+ sudo chmod +x /usr/local/bin/dpkg-deb
+ dch -b -v 0.20.0-75.git.6c1ab211 'Merge 69a45c897eca19e92e1cf055e48399398fb16c18 into b21bd30d092d57752ce2874f04f739a1f0f42b43'
+ [[ test = \n\i\g\h\t\l\y ]]
+ DEB_BUILD_OPTIONS='nocheck parallel=2'
+ debuild --preserve-envvar PATH -us -uc
 dpkg-buildpackage -rfakeroot -us -uc
dpkg-buildpackage: info: source package bcc
dpkg-buildpackage: info: source version 0.20.0-75.git.6c1ab211
dpkg-buildpackage: info: source distribution UNRELEASED
dpkg-buildpackage: info: source changed by Yonghong Song <iovisor@ubuntu1710-slave-5a6.c.io-visor.internal>
 dpkg-source --before-build bcc
dpkg-buildpackage: info: host architecture amd64
 fakeroot debian/rules clean
dh clean --buildsystem=cmake --parallel --with python2,python3
   dh_auto_clean -O--buildsystem=cmake -O--parallel
   dh_clean -O--buildsystem=cmake -O--parallel
 dpkg-source -b bcc
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building bcc using existing ./bcc_0.20.0.orig.tar.gz
dpkg-source: info: building bcc in bcc_0.20.0-75.git.6c1ab211.debian.tar.xz
dpkg-source: info: building bcc in bcc_0.20.0-75.git.6c1ab211.dsc
 debian/rules build
dh build --buildsystem=cmake --parallel --with python2,python3
   dh_update_autotools_config -O--buildsystem=cmake -O--parallel
   debian/rules override_dh_auto_configure
make[1]: Entering directory '/tmp/debuild.1xf8Y7/bcc'
dh_auto_configure -- -DREVISION_LAST=0.20.0 -DREVISION=0.20.0 -DLLVM_DEFINITIONS="-D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -DPYTHON_CMD="python2;python3"
	cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DREVISION_LAST=0.20.0 -DREVISION=0.20.0 "-DLLVM_DEFINITIONS=-D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -DPYTHON_CMD=python2\;python3
-- The C compiler identification is GNU 7.2.0
-- The CXX compiler identification is GNU 7.2.0
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Revision is 0.20.0
-- Performing Test HAVE_NO_PIE_FLAG
-- Performing Test HAVE_NO_PIE_FLAG - Success
-- Performing Test HAVE_REALLOCARRAY_SUPPORT
-- Performing Test HAVE_REALLOCARRAY_SUPPORT - Success
-- Found LLVM: /usr/lib/llvm-3.8/include 3.8.1
-- Found BISON: /usr/bin/bison (found version "3.0.4") 
-- Found FLEX: /usr/bin/flex (found version "2.6.1") 
-- Found LibElf: /usr/lib/x86_64-linux-gnu/libelf.so  
-- Performing Test ELF_GETSHDRSTRNDX
-- Performing Test ELF_GETSHDRSTRNDX - Success
-- Could NOT find LibDebuginfod (missing: LIBDEBUGINFOD_LIBRARIES LIBDEBUGINFOD_INCLUDE_DIRS) 
-- Using static-libstdc++
-- Found LuaJIT: /usr/lib/x86_64-linux-gnu/libluajit-5.1.a;/usr/lib/x86_64-linux-gnu/libdl.so;/usr/lib/x86_64-linux-gnu/libm.so  
-- Configuring done
-- Generating done
CMake Warning:
  Manually-specified variables were not used by the project:

    CMAKE_EXPORT_NO_PACKAGE_REGISTRY


-- Build files have been written to: /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu
make[1]: Leaving directory '/tmp/debuild.1xf8Y7/bcc'
   dh_auto_build -O--buildsystem=cmake -O--parallel
	make -j2
make[1]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
/usr/bin/cmake -H/tmp/debuild.1xf8Y7/bcc -B/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu --check-build-system CMakeFiles/Makefile.cmake 0
/usr/bin/cmake -E cmake_progress_start /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/CMakeFiles /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/CMakeFiles/progress.marks
make -f CMakeFiles/Makefile2 all
make[2]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-loader-static.dir/build.make src/cc/CMakeFiles/bcc-loader-static.dir/depend
make -f src/cc/CMakeFiles/bpf-static.dir/build.make src/cc/CMakeFiles/bpf-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bcc-loader-static.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bpf-static.dir/DependInfo.cmake --color=
Scanning dependencies of target bcc-loader-static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-loader-static.dir/build.make src/cc/CMakeFiles/bcc-loader-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[  0%] Building CXX object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_syms.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-loader-static.dir/bcc_syms.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_syms.cc
Scanning dependencies of target bpf-static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bpf-static.dir/build.make src/cc/CMakeFiles/bpf-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[  1%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf.c
[  1%] Building C object src/cc/CMakeFiles/bpf-static.dir/perf_reader.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/perf_reader.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/perf_reader.c
[  1%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/bpf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/bpf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/bpf.c
[  2%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/bpf_prog_linfo.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/bpf_prog_linfo.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/bpf_prog_linfo.c
[  2%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/btf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/btf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf.c
[  2%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/btf_dump.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/btf_dump.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf_dump.c
[  3%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/gen_loader.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/gen_loader.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/gen_loader.c
[  3%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/hashmap.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/hashmap.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/hashmap.c
[  3%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/libbpf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/libbpf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/libbpf.c
[  3%] Building C object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_elf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-loader-static.dir/bcc_elf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_elf.c
[  4%] Building C object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_perf_map.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-loader-static.dir/bcc_perf_map.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_perf_map.c
[  4%] Building C object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_proc.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-loader-static.dir/bcc_proc.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_proc.c
[  4%] Building CXX object src/cc/CMakeFiles/bcc-loader-static.dir/common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-loader-static.dir/common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/common.cc
[  5%] Linking CXX static library libbcc-loader-static.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -P CMakeFiles/bcc-loader-static.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/bcc-loader-static.dir/link.txt --verbose=1
/usr/bin/ar qc libbcc-loader-static.a  CMakeFiles/bcc-loader-static.dir/bcc_syms.cc.o CMakeFiles/bcc-loader-static.dir/bcc_elf.c.o CMakeFiles/bcc-loader-static.dir/bcc_perf_map.c.o CMakeFiles/bcc-loader-static.dir/bcc_proc.c.o CMakeFiles/bcc-loader-static.dir/common.cc.o
/usr/bin/ranlib libbcc-loader-static.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[  5%] Built target bcc-loader-static
make -f src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build.make src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/DependInfo.cmake --color=
[  6%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/libbpf_errno.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/libbpf_errno.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/libbpf_errno.c
[  6%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/libbpf_probes.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/libbpf_probes.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/libbpf_probes.c
[  6%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/linker.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/linker.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/linker.c
Scanning dependencies of target clang_frontend
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build.make src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[  7%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/loader.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -DKERNEL_MODULES_DIR='"/lib/modules"'   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/clang_frontend.dir/loader.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang/loader.cc
[  8%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/netlink.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/netlink.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/netlink.c
[  8%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/nlattr.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/nlattr.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/nlattr.c
[  8%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/ringbuf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/ringbuf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/ringbuf.c
[  9%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/str_error.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/str_error.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/str_error.c
[  9%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/strset.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/strset.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/strset.c
[  9%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/xsk.c
[ 10%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/bcc_syms.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-static.dir/bcc_syms.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_syms.cc
[ 10%] Building C object src/cc/CMakeFiles/bpf-static.dir/bcc_elf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/bcc_elf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_elf.c
[ 10%] Building C object src/cc/CMakeFiles/bpf-static.dir/bcc_perf_map.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/bcc_perf_map.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_perf_map.c
[ 11%] Building C object src/cc/CMakeFiles/bpf-static.dir/bcc_proc.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-static.dir/bcc_proc.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_proc.c
[ 11%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-static.dir/common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/common.cc
[ 11%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/usdt/usdt.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-static.dir/usdt/usdt.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt.cc
[ 11%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/usdt/usdt_args.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-static.dir/usdt/usdt_args.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt_args.cc
[ 11%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/b_frontend_action.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -DKERNEL_MODULES_DIR='"/lib/modules"'   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/clang_frontend.dir/b_frontend_action.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang/b_frontend_action.cc
[ 12%] Linking CXX static library libbcc_bpf.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -P CMakeFiles/bpf-static.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/bpf-static.dir/link.txt --verbose=1
/usr/bin/ar qc libbcc_bpf.a  CMakeFiles/bpf-static.dir/libbpf.c.o CMakeFiles/bpf-static.dir/perf_reader.c.o CMakeFiles/bpf-static.dir/libbpf/src/bpf.c.o CMakeFiles/bpf-static.dir/libbpf/src/bpf_prog_linfo.c.o CMakeFiles/bpf-static.dir/libbpf/src/btf.c.o CMakeFiles/bpf-static.dir/libbpf/src/btf_dump.c.o CMakeFiles/bpf-static.dir/libbpf/src/gen_loader.c.o CMakeFiles/bpf-static.dir/libbpf/src/hashmap.c.o CMakeFiles/bpf-static.dir/libbpf/src/libbpf.c.o CMakeFiles/bpf-static.dir/libbpf/src/libbpf_errno.c.o CMakeFiles/bpf-static.dir/libbpf/src/libbpf_probes.c.o CMakeFiles/bpf-static.dir/libbpf/src/linker.c.o CMakeFiles/bpf-static.dir/libbpf/src/netlink.c.o CMakeFiles/bpf-static.dir/libbpf/src/nlattr.c.o CMakeFiles/bpf-static.dir/libbpf/src/ringbuf.c.o CMakeFiles/bpf-static.dir/libbpf/src/str_error.c.o CMakeFiles/bpf-static.dir/libbpf/src/strset.c.o CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o CMakeFiles/bpf-static.dir/bcc_syms.cc.o CMakeFiles/bpf-static.dir/bcc_elf.c.o CMakeFiles/bpf-static.dir/bcc_perf_map.c.o CMakeFiles/bpf-static.dir/bcc_proc.c.o CMakeFiles/bpf-static.dir/common.cc.o CMakeFiles/bpf-static.dir/usdt/usdt.cc.o CMakeFiles/bpf-static.dir/usdt/usdt_args.cc.o
/usr/bin/ranlib libbcc_bpf.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 12%] Built target bpf-static
make -f src/cc/api/CMakeFiles/api-static.dir/build.make src/cc/api/CMakeFiles/api-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/api /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api/CMakeFiles/api-static.dir/DependInfo.cmake --color=
Scanning dependencies of target api-static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/api/CMakeFiles/api-static.dir/build.make src/cc/api/CMakeFiles/api-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 12%] Building CXX object src/cc/api/CMakeFiles/api-static.dir/BPF.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/api-static.dir/BPF.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/api/BPF.cc
[ 13%] Building CXX object src/cc/api/CMakeFiles/api-static.dir/BPFTable.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/api-static.dir/BPFTable.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/api/BPFTable.cc
[ 13%] Linking CXX static library libapi-static.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api && /usr/bin/cmake -P CMakeFiles/api-static.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api && /usr/bin/cmake -E cmake_link_script CMakeFiles/api-static.dir/link.txt --verbose=1
/usr/bin/ar qc libapi-static.a  CMakeFiles/api-static.dir/BPF.cc.o CMakeFiles/api-static.dir/BPFTable.cc.o
/usr/bin/ranlib libapi-static.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 13%] Built target api-static
make -f src/cc/usdt/CMakeFiles/usdt-static.dir/build.make src/cc/usdt/CMakeFiles/usdt-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/usdt /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt/CMakeFiles/usdt-static.dir/DependInfo.cmake --color=
Scanning dependencies of target usdt-static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/usdt/CMakeFiles/usdt-static.dir/build.make src/cc/usdt/CMakeFiles/usdt-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 13%] Building CXX object src/cc/usdt/CMakeFiles/usdt-static.dir/usdt_args.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/usdt-static.dir/usdt_args.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt_args.cc
[ 14%] Building CXX object src/cc/usdt/CMakeFiles/usdt-static.dir/usdt.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/usdt-static.dir/usdt.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt.cc
[ 14%] Linking CXX static library libusdt-static.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt && /usr/bin/cmake -P CMakeFiles/usdt-static.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt && /usr/bin/cmake -E cmake_link_script CMakeFiles/usdt-static.dir/link.txt --verbose=1
/usr/bin/ar qc libusdt-static.a  CMakeFiles/usdt-static.dir/usdt_args.cc.o CMakeFiles/usdt-static.dir/usdt.cc.o
/usr/bin/ranlib libusdt-static.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 14%] Built target usdt-static
make -f src/cc/frontends/b/CMakeFiles/b_frontend.dir/build.make src/cc/frontends/b/CMakeFiles/b_frontend.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 15%] [FLEX][Lexer] Building scanner with flex 2.6.1
cd /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b && /usr/bin/flex --c++ --o lexer.ll.cc -o/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b/lexer.ll.cc lexer.ll
lexer.ll:110: warning, -s option given but default rule can be matched
[ 15%] [BISON][Parser] Building parser with bison 3.0.4
cd /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b && /usr/bin/bison -o parser.yy.cc -v --debug -d -o /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b/parser.yy.cc parser.yy
parser.yy:19.9-17: warning: deprecated directive, use ‘%define api.namespace ebpf::cc’ [-Wdeprecated]
 %define namespace "ebpf::cc"
         ^^^^^^^^^
parser.yy:19.9-17: warning: %define variable 'api.namespace' requires '{...}' values [-Wdeprecated]
 %define namespace "ebpf::cc"
         ^^^^^^^^^
parser.yy:20.9-25: warning: %define variable 'parser_class_name' requires '{...}' values [-Wdeprecated]
 %define parser_class_name "BisonParser"
         ^^^^^^^^^^^^^^^^^
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b/CMakeFiles/b_frontend.dir/DependInfo.cmake --color=
Scanning dependencies of target b_frontend
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/frontends/b/CMakeFiles/b_frontend.dir/build.make src/cc/frontends/b/CMakeFiles/b_frontend.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 15%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/loader.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/loader.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b/loader.cc
[ 15%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/codegen_llvm.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/codegen_llvm.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b/codegen_llvm.cc
[ 16%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/node.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/node.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b/node.cc
[ 16%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/parser.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/parser.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b/parser.cc
[ 16%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/tp_frontend_action.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -DKERNEL_MODULES_DIR='"/lib/modules"'   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/clang_frontend.dir/tp_frontend_action.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang/tp_frontend_action.cc
[ 16%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/printer.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/printer.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b/printer.cc
[ 17%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/type_check.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/type_check.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b/type_check.cc
[ 17%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/parser.yy.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/parser.yy.cc.o -c /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b/parser.yy.cc
[ 17%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/lexer.ll.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/b_frontend.dir/lexer.ll.cc.o -c /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b/lexer.ll.cc
[ 18%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/kbuild_helper.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -DKERNEL_MODULES_DIR='"/lib/modules"'   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/clang_frontend.dir/kbuild_helper.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang/kbuild_helper.cc
/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang/kbuild_helper.cc:80:3: warning: multi-line comment [-Wcomment]
   // USERINCLUDE    := \
   ^
/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang/kbuild_helper.cc:89:3: warning: multi-line comment [-Wcomment]
   // LINUXINCLUDE    := \
   ^
[ 18%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/__/__/common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -DKERNEL_MODULES_DIR='"/lib/modules"'   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/clang_frontend.dir/__/__/common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/common.cc
[ 19%] Linking CXX static library libb_frontend.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/cmake -P CMakeFiles/b_frontend.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b && /usr/bin/cmake -E cmake_link_script CMakeFiles/b_frontend.dir/link.txt --verbose=1
/usr/bin/ar qc libb_frontend.a  CMakeFiles/b_frontend.dir/loader.cc.o CMakeFiles/b_frontend.dir/codegen_llvm.cc.o CMakeFiles/b_frontend.dir/node.cc.o CMakeFiles/b_frontend.dir/parser.cc.o CMakeFiles/b_frontend.dir/printer.cc.o CMakeFiles/b_frontend.dir/type_check.cc.o CMakeFiles/b_frontend.dir/parser.yy.cc.o CMakeFiles/b_frontend.dir/lexer.ll.cc.o
/usr/bin/ranlib libb_frontend.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 19%] Built target b_frontend
make -f src/cc/CMakeFiles/bpf-shared.dir/build.make src/cc/CMakeFiles/bpf-shared.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bpf-shared.dir/DependInfo.cmake --color=
Scanning dependencies of target bpf-shared
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bpf-shared.dir/build.make src/cc/CMakeFiles/bpf-shared.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 19%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf.c
[ 20%] Building C object src/cc/CMakeFiles/bpf-shared.dir/perf_reader.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/perf_reader.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/perf_reader.c
[ 20%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/bpf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/bpf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/bpf.c
[ 20%] Linking CXX static library libclang_frontend.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/cmake -P CMakeFiles/clang_frontend.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang && /usr/bin/cmake -E cmake_link_script CMakeFiles/clang_frontend.dir/link.txt --verbose=1
/usr/bin/ar qc libclang_frontend.a  CMakeFiles/clang_frontend.dir/loader.cc.o CMakeFiles/clang_frontend.dir/b_frontend_action.cc.o CMakeFiles/clang_frontend.dir/tp_frontend_action.cc.o CMakeFiles/clang_frontend.dir/kbuild_helper.cc.o CMakeFiles/clang_frontend.dir/__/__/common.cc.o
/usr/bin/ranlib libclang_frontend.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 20%] Built target clang_frontend
make -f src/python/CMakeFiles/bcc_py_python3.dir/build.make src/python/CMakeFiles/bcc_py_python3.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python/CMakeFiles/bcc_py_python3.dir/DependInfo.cmake --color=
Scanning dependencies of target bcc_py_python3
[ 20%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/bpf_prog_linfo.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/bpf_prog_linfo.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/bpf_prog_linfo.c
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/python/CMakeFiles/bcc_py_python3.dir/build.make src/python/CMakeFiles/bcc_py_python3.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 20%] Building sdist for python3
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python/bcc-python3 && python3 setup.py sdist
[ 21%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/btf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/btf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf.c
running sdist
running check
warning: sdist: manifest template 'MANIFEST.in' does not exist (using default file list)

warning: sdist: standard file not found: should have one of README, README.txt

writing manifest file 'MANIFEST'
creating bcc-0.20.0
creating bcc-0.20.0/bcc
making hard links in bcc-0.20.0...
hard linking setup.py -> bcc-0.20.0
hard linking bcc/__init__.py -> bcc-0.20.0/bcc
hard linking bcc/containers.py -> bcc-0.20.0/bcc
hard linking bcc/disassembler.py -> bcc-0.20.0/bcc
hard linking bcc/libbcc.py -> bcc-0.20.0/bcc
hard linking bcc/perf.py -> bcc-0.20.0/bcc
hard linking bcc/syscall.py -> bcc-0.20.0/bcc
hard linking bcc/table.py -> bcc-0.20.0/bcc
hard linking bcc/tcp.py -> bcc-0.20.0/bcc
hard linking bcc/usdt.py -> bcc-0.20.0/bcc
hard linking bcc/utils.py -> bcc-0.20.0/bcc
hard linking bcc/version.py -> bcc-0.20.0/bcc
creating dist
Creating tar archive
removing 'bcc-0.20.0' (and everything under it)
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 21%] Built target bcc_py_python3
make -f src/python/CMakeFiles/bcc_py_python2.dir/build.make src/python/CMakeFiles/bcc_py_python2.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python/CMakeFiles/bcc_py_python2.dir/DependInfo.cmake --color=
Scanning dependencies of target bcc_py_python2
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/python/CMakeFiles/bcc_py_python2.dir/build.make src/python/CMakeFiles/bcc_py_python2.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 22%] Building sdist for python2
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python/bcc-python2 && python2 setup.py sdist
running sdist
running check
warning: sdist: manifest template 'MANIFEST.in' does not exist (using default file list)

warning: sdist: standard file not found: should have one of README, README.txt

writing manifest file 'MANIFEST'
creating bcc-0.20.0
creating bcc-0.20.0/bcc
making hard links in bcc-0.20.0...
hard linking setup.py -> bcc-0.20.0
hard linking bcc/__init__.py -> bcc-0.20.0/bcc
hard linking bcc/containers.py -> bcc-0.20.0/bcc
hard linking bcc/disassembler.py -> bcc-0.20.0/bcc
hard linking bcc/libbcc.py -> bcc-0.20.0/bcc
hard linking bcc/perf.py -> bcc-0.20.0/bcc
hard linking bcc/syscall.py -> bcc-0.20.0/bcc
hard linking bcc/table.py -> bcc-0.20.0/bcc
hard linking bcc/tcp.py -> bcc-0.20.0/bcc
hard linking bcc/usdt.py -> bcc-0.20.0/bcc
hard linking bcc/utils.py -> bcc-0.20.0/bcc
hard linking bcc/version.py -> bcc-0.20.0/bcc
creating dist
Creating tar archive
removing 'bcc-0.20.0' (and everything under it)
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 22%] Built target bcc_py_python2
make -f src/lua/CMakeFiles/bcc-lua.dir/build.make src/lua/CMakeFiles/bcc-lua.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 22%] Generating bcc.lua
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua && /usr/bin/luajit /tmp/debuild.1xf8Y7/bcc/src/lua/src/squish.lua /tmp/debuild.1xf8Y7/bcc/src/lua
Writing bcc.lua...
OK!
[ 22%] Generating bcc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua && /usr/bin/luajit -bg bcc.lua bcc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/lua /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua/CMakeFiles/bcc-lua.dir/DependInfo.cmake --color=
Scanning dependencies of target bcc-lua
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/lua/CMakeFiles/bcc-lua.dir/build.make src/lua/CMakeFiles/bcc-lua.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 23%] Building C object src/lua/CMakeFiles/bcc-lua.dir/src/main.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/usr/include/luajit-2.0  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall   -o CMakeFiles/bcc-lua.dir/src/main.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/lua/src/main.c
[ 23%] Linking C executable bcc-lua
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua && /usr/bin/cmake -E cmake_link_script CMakeFiles/bcc-lua.dir/link.txt --verbose=1
/usr/bin/cc -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/bcc-lua.dir/src/main.c.o bcc.o  -o bcc-lua -Wl,-Bstatic -lluajit-5.1 -Wl,-Bdynamic -ldl -lm -no-pie 
[ 23%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/btf_dump.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/btf_dump.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf_dump.c
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 23%] Built target bcc-lua
make -f introspection/CMakeFiles/bps.dir/build.make introspection/CMakeFiles/bps.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/introspection /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/introspection /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/introspection/CMakeFiles/bps.dir/DependInfo.cmake --color=
Scanning dependencies of target bps
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f introspection/CMakeFiles/bps.dir/build.make introspection/CMakeFiles/bps.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 23%] Building C object introspection/CMakeFiles/bps.dir/bps.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/introspection && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall   -o CMakeFiles/bps.dir/bps.c.o   -c /tmp/debuild.1xf8Y7/bcc/introspection/bps.c
[ 23%] Linking CXX executable bps
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/introspection && /usr/bin/cmake -E cmake_link_script CMakeFiles/bps.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall   -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/bps.dir/bps.c.o  -o bps ../src/cc/libbcc_bpf.a -lelf -lz -lrt 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 23%] Built target bps
make -f man/man8/CMakeFiles/man.dir/build.make man/man8/CMakeFiles/man.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/man/man8 /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/CMakeFiles/man.dir/DependInfo.cmake --color=
Scanning dependencies of target man
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f man/man8/CMakeFiles/man.dir/build.make man/man8/CMakeFiles/man.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 24%] Generating argdist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/argdist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/argdist.8.gz
[ 24%] Generating bashreadline.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/bashreadline.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/bashreadline.8.gz
[ 24%] Generating bindsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/bindsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/bindsnoop.8.gz
[ 25%] Generating biolatency.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/biolatency.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/biolatency.8.gz
[ 25%] Generating biolatpcts.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/biolatpcts.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/biolatpcts.8.gz
[ 25%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/gen_loader.c.o
[ 25%] Generating biosnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/biosnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/biosnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/gen_loader.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/gen_loader.c
[ 26%] Generating biotop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/biotop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/biotop.8.gz
[ 26%] Generating bitesize.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/bitesize.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/bitesize.8.gz
[ 26%] Generating bpflist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/bpflist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/bpflist.8.gz
[ 27%] Generating bps.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/bps.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/bps.8.gz
[ 27%] Generating btrfsdist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/btrfsdist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/btrfsdist.8.gz
[ 27%] Generating btrfsslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/btrfsslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/btrfsslower.8.gz
[ 28%] Generating cachestat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/cachestat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/cachestat.8.gz
[ 28%] Generating cachetop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/cachetop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/cachetop.8.gz
[ 28%] Generating capable.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/capable.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/capable.8.gz
[ 29%] Generating cobjnew.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/cobjnew.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/cobjnew.8.gz
[ 29%] Generating compactsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/compactsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/compactsnoop.8.gz
[ 29%] Generating cpudist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/cpudist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/cpudist.8.gz
[ 29%] Generating cpuunclaimed.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/cpuunclaimed.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/cpuunclaimed.8.gz
[ 30%] Generating criticalstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/criticalstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/criticalstat.8.gz
[ 30%] Generating cthreads.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/cthreads.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/cthreads.8.gz
[ 30%] Generating dbslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/dbslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/dbslower.8.gz
[ 31%] Generating dbstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/dbstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/dbstat.8.gz
[ 31%] Generating dcsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/dcsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/dcsnoop.8.gz
[ 31%] Generating dcstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/dcstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/dcstat.8.gz
[ 32%] Generating deadlock.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/deadlock.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/deadlock.8.gz
[ 32%] Generating dirtop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/dirtop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/dirtop.8.gz
[ 32%] Generating drsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/drsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/drsnoop.8.gz
[ 33%] Generating execsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/execsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/execsnoop.8.gz
[ 33%] Generating exitsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/exitsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/exitsnoop.8.gz
[ 33%] Generating ext4dist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/ext4dist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/ext4dist.8.gz
[ 34%] Generating ext4slower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/ext4slower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/ext4slower.8.gz
[ 35%] Generating filelife.8.gz
[ 35%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/hashmap.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/filelife.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/filelife.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/hashmap.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/hashmap.c
[ 35%] Generating fileslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/fileslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/fileslower.8.gz
[ 36%] Generating filetop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/filetop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/filetop.8.gz
[ 36%] Generating funccount.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/funccount.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/funccount.8.gz
[ 36%] Generating funcinterval.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/funcinterval.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/funcinterval.8.gz
[ 37%] Generating funclatency.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/funclatency.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/funclatency.8.gz
[ 37%] Generating funcslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/funcslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/funcslower.8.gz
[ 37%] Generating gethostlatency.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/gethostlatency.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/gethostlatency.8.gz
[ 38%] Generating hardirqs.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/hardirqs.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/hardirqs.8.gz
[ 38%] Generating inject.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/inject.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/inject.8.gz
[ 38%] Generating javacalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/javacalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/javacalls.8.gz
[ 38%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/libbpf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/libbpf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/libbpf.c
[ 39%] Generating javaflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/javaflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/javaflow.8.gz
[ 39%] Generating javagc.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/javagc.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/javagc.8.gz
[ 39%] Generating javaobjnew.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/javaobjnew.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/javaobjnew.8.gz
[ 39%] Generating javastat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/javastat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/javastat.8.gz
[ 40%] Generating javathreads.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/javathreads.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/javathreads.8.gz
[ 40%] Generating killsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/killsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/killsnoop.8.gz
[ 40%] Generating klockstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/klockstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/klockstat.8.gz
[ 41%] Generating kvmexit.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/kvmexit.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/kvmexit.8.gz
[ 41%] Generating llcstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/llcstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/llcstat.8.gz
[ 41%] Generating mdflush.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/mdflush.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/mdflush.8.gz
[ 42%] Generating memleak.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/memleak.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/memleak.8.gz
[ 42%] Generating mountsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/mountsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/mountsnoop.8.gz
[ 42%] Generating mysqld_qslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/mysqld_qslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/mysqld_qslower.8.gz
[ 43%] Generating netqtop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/netqtop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/netqtop.8.gz
[ 43%] Generating nfsdist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/nfsdist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/nfsdist.8.gz
[ 43%] Generating nfsslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/nfsslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/nfsslower.8.gz
[ 44%] Generating nodegc.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/nodegc.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/nodegc.8.gz
[ 44%] Generating nodestat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/nodestat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/nodestat.8.gz
[ 44%] Generating offcputime.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/offcputime.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/offcputime.8.gz
[ 45%] Generating offwaketime.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/offwaketime.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/offwaketime.8.gz
[ 45%] Generating oomkill.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/oomkill.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/oomkill.8.gz
[ 45%] Generating opensnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/opensnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/opensnoop.8.gz
[ 46%] Generating perlcalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/perlcalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/perlcalls.8.gz
[ 46%] Generating perlflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/perlflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/perlflow.8.gz
[ 46%] Generating perlstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/perlstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/perlstat.8.gz
[ 47%] Generating phpcalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/phpcalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/phpcalls.8.gz
[ 47%] Generating phpflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/phpflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/phpflow.8.gz
[ 47%] Generating phpstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/phpstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/phpstat.8.gz
[ 48%] Generating pidpersec.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/pidpersec.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/pidpersec.8.gz
[ 48%] Generating profile.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/profile.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/profile.8.gz
[ 48%] Generating pythoncalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/pythoncalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/pythoncalls.8.gz
[ 48%] Generating pythonflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/pythonflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/pythonflow.8.gz
[ 49%] Generating pythongc.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/pythongc.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/pythongc.8.gz
[ 49%] Generating pythonstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/pythonstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/pythonstat.8.gz
[ 49%] Generating readahead.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/readahead.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/readahead.8.gz
[ 50%] Generating reset-trace.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/reset-trace.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/reset-trace.8.gz
[ 50%] Generating rubycalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/rubycalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/rubycalls.8.gz
[ 50%] Generating rubyflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/rubyflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/rubyflow.8.gz
[ 51%] Generating rubygc.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/rubygc.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/rubygc.8.gz
[ 51%] Generating rubyobjnew.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/rubyobjnew.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/rubyobjnew.8.gz
[ 51%] Generating rubystat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/rubystat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/rubystat.8.gz
[ 52%] Generating runqlat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/runqlat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/runqlat.8.gz
[ 52%] Generating runqlen.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/runqlen.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/runqlen.8.gz
[ 52%] Generating runqslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/runqslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/runqslower.8.gz
[ 53%] Generating shmsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/shmsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/shmsnoop.8.gz
[ 53%] Generating slabratetop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/slabratetop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/slabratetop.8.gz
[ 53%] Generating sofdsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/sofdsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/sofdsnoop.8.gz
[ 54%] Generating softirqs.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/softirqs.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/softirqs.8.gz
[ 54%] Generating solisten.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/solisten.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/solisten.8.gz
[ 54%] Generating spfdsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/spfdsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/spfdsnoop.8.gz
[ 55%] Generating sslsniff.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/sslsniff.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/sslsniff.8.gz
[ 55%] Generating stackcount.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/stackcount.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/stackcount.8.gz
[ 55%] Generating statsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/statsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/statsnoop.8.gz
[ 56%] Generating swapin.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/swapin.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/swapin.8.gz
[ 56%] Generating syncsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/syncsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/syncsnoop.8.gz
[ 56%] Generating syscount.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/syscount.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/syscount.8.gz
[ 57%] Generating tclcalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tclcalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tclcalls.8.gz
[ 57%] Generating tclflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tclflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tclflow.8.gz
[ 57%] Generating tclobjnew.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tclobjnew.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tclobjnew.8.gz
[ 57%] Generating tclstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tclstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tclstat.8.gz
[ 58%] Generating tcpaccept.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpaccept.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpaccept.8.gz
[ 58%] Generating tcpconnect.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpconnect.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpconnect.8.gz
[ 58%] Generating tcpconnlat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpconnlat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpconnlat.8.gz
[ 59%] Generating tcpdrop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpdrop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpdrop.8.gz
[ 59%] Generating tcplife.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcplife.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcplife.8.gz
[ 59%] Generating tcpretrans.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpretrans.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpretrans.8.gz
[ 60%] Generating tcprtt.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcprtt.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcprtt.8.gz
[ 60%] Generating tcpstates.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpstates.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpstates.8.gz
[ 60%] Generating tcpsubnet.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpsubnet.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpsubnet.8.gz
[ 61%] Generating tcpsynbl.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcpsynbl.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcpsynbl.8.gz
[ 61%] Generating tcptop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcptop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcptop.8.gz
[ 61%] Generating tcptracer.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tcptracer.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tcptracer.8.gz
[ 62%] Generating threadsnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/threadsnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/threadsnoop.8.gz
[ 62%] Generating tplist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/tplist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/tplist.8.gz
[ 62%] Generating trace.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/trace.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/trace.8.gz
[ 63%] Generating ttysnoop.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/ttysnoop.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/ttysnoop.8.gz
[ 63%] Generating ucalls.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/ucalls.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/ucalls.8.gz
[ 63%] Generating uflow.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/uflow.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/uflow.8.gz
[ 64%] Generating ugc.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/ugc.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/ugc.8.gz
[ 64%] Generating uobjnew.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/uobjnew.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/uobjnew.8.gz
[ 64%] Generating ustat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/ustat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/ustat.8.gz
[ 65%] Generating uthreads.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/uthreads.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/uthreads.8.gz
[ 65%] Generating vfscount.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/vfscount.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/vfscount.8.gz
[ 65%] Generating vfsstat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/vfsstat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/vfsstat.8.gz
[ 66%] Generating virtiostat.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/virtiostat.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/virtiostat.8.gz
[ 66%] Generating wakeuptime.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/wakeuptime.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/wakeuptime.8.gz
[ 66%] Generating xfsdist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/xfsdist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/xfsdist.8.gz
[ 66%] Generating xfsslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/xfsslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/xfsslower.8.gz
[ 67%] Generating zfsdist.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/zfsdist.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/zfsdist.8.gz
[ 67%] Generating zfsslower.8.gz
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 && /bin/gzip -c /tmp/debuild.1xf8Y7/bcc/man/man8/zfsslower.8 > /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/zfsslower.8.gz
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 67%] Built target man
make -f tests/cc/CMakeFiles/usdt_test_lib.dir/build.make tests/cc/CMakeFiles/usdt_test_lib.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc/CMakeFiles/usdt_test_lib.dir/DependInfo.cmake --color=
Scanning dependencies of target usdt_test_lib
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f tests/cc/CMakeFiles/usdt_test_lib.dir/build.make tests/cc/CMakeFiles/usdt_test_lib.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 67%] Building CXX object tests/cc/CMakeFiles/usdt_test_lib.dir/usdt_test_lib.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -Dusdt_test_lib_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC -fPIC   -std=gnu++14 -o CMakeFiles/usdt_test_lib.dir/usdt_test_lib.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/usdt_test_lib.cc
[ 68%] Linking CXX shared library libusdt_test_lib.so
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/usdt_test_lib.dir/link.txt --verbose=1
/usr/bin/c++ -fPIC -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC -Wl,-Bsymbolic-functions -Wl,-z,relro -shared -Wl,-soname,libusdt_test_lib.so -o libusdt_test_lib.so CMakeFiles/usdt_test_lib.dir/usdt_test_lib.cc.o 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 68%] Built target usdt_test_lib
make -f src/cc/CMakeFiles/bcc-shared.dir/build.make src/cc/CMakeFiles/bcc-shared.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bcc-shared.dir/DependInfo.cmake --color=
Scanning dependencies of target bcc-shared
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-shared.dir/build.make src/cc/CMakeFiles/bcc-shared.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/link_all.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/link_all.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/link_all.cc
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/bcc_common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_common.cc
[ 69%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bpf_module.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/bpf_module.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bpf_module.cc
[ 69%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_errno.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_errno.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/libbpf_errno.c
[ 70%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_probes.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_probes.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/libbpf_probes.c
[ 70%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/linker.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/linker.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/linker.c
[ 70%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/netlink.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/netlink.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/netlink.c
[ 71%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/nlattr.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/nlattr.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/nlattr.c
[ 71%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/ringbuf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/ringbuf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/ringbuf.c
[ 71%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/str_error.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/str_error.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/str_error.c
[ 72%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/strset.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/strset.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/strset.c
[ 72%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/xsk.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/libbpf/src/xsk.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/xsk.c
[ 72%] Building CXX object src/cc/CMakeFiles/bpf-shared.dir/bcc_syms.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-shared.dir/bcc_syms.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_syms.cc
[ 73%] Building C object src/cc/CMakeFiles/bpf-shared.dir/bcc_elf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/bcc_elf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_elf.c
[ 73%] Building C object src/cc/CMakeFiles/bpf-shared.dir/bcc_perf_map.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/bcc_perf_map.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_perf_map.c
[ 73%] Building C object src/cc/CMakeFiles/bpf-shared.dir/bcc_proc.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bpf-shared.dir/bcc_proc.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_proc.c
[ 73%] Building CXX object src/cc/CMakeFiles/bpf-shared.dir/common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-shared.dir/common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/common.cc
[ 74%] Building CXX object src/cc/CMakeFiles/bpf-shared.dir/usdt/usdt.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-shared.dir/usdt/usdt.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt.cc
[ 74%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_btf.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/bcc_btf.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc
/tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc: In member function ‘int ebpf::BTF::get_btf_info(const char*, void**, unsigned int*, unsigned int*, void**, unsigned int*, unsigned int*)’:
/tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:316:33: warning: ‘int btf_ext__reloc_func_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_func_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         func_info, func_info_cnt);
                                 ^
In file included from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_libbpf_inc.h:9:0,
                 from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:22:
/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf.h:80:5: note: declared here
 int btf_ext__reloc_func_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
/tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:323:33: warning: ‘int btf_ext__reloc_line_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_line_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         line_info, line_info_cnt);
                                 ^
In file included from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_libbpf_inc.h:9:0,
                 from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:22:
/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf.h:85:5: note: declared here
 int btf_ext__reloc_line_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
[ 74%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/exported_files.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/exported_files.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/exported_files.cc
[ 74%] Building CXX object src/cc/CMakeFiles/bpf-shared.dir/usdt/usdt_args.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbpf_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bpf-shared.dir/usdt/usdt_args.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt_args.cc
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bpf_module_rw_engine.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/bpf_module_rw_engine.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bpf_module_rw_engine.cc
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/table_storage.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/table_storage.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/table_storage.cc
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/shared_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/shared_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/shared_table.cc
[ 75%] Linking CXX shared library libbcc_bpf.so
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/bpf-shared.dir/link.txt --verbose=1
/usr/bin/c++ -fPIC -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -Wl,-Bsymbolic-functions -Wl,-z,relro -static-libstdc++  -Wl,--exclude-libs=libclangFrontend.a -Wl,--exclude-libs=libclangSerialization.a -Wl,--exclude-libs=libclangDriver.a -Wl,--exclude-libs=libclangParse.a -Wl,--exclude-libs=libclangSema.a -Wl,--exclude-libs=libclangCodeGen.a -Wl,--exclude-libs=libclangAnalysis.a -Wl,--exclude-libs=libclangRewrite.a -Wl,--exclude-libs=libclangEdit.a -Wl,--exclude-libs=libclangAST.a -Wl,--exclude-libs=libclangLex.a -Wl,--exclude-libs=libclangBasic.a  -Wl,--exclude-libs=libLLVMX86CodeGen.a -Wl,--exclude-libs=libLLVMX86Desc.a -Wl,--exclude-libs=libLLVMX86Info.a -Wl,--exclude-libs=libLLVMMCDisassembler.a -Wl,--exclude-libs=libLLVMX86AsmPrinter.a -Wl,--exclude-libs=libLLVMX86Utils.a -Wl,--exclude-libs=libLLVMLTO.a -Wl,--exclude-libs=libLLVMPasses.a -Wl,--exclude-libs=libLLVMipo.a -Wl,--exclude-libs=libLLVMVectorize.a -Wl,--exclude-libs=libLLVMOption.a -Wl,--exclude-libs=libLLVMObjCARCOpts.a -Wl,--exclude-libs=libLLVMMCJIT.a -Wl,--exclude-libs=libLLVMExecutionEngine.a -Wl,--exclude-libs=libLLVMRuntimeDyld.a -Wl,--exclude-libs=libLLVMLinker.a -Wl,--exclude-libs=libLLVMIRReader.a -Wl,--exclude-libs=libLLVMAsmParser.a -Wl,--exclude-libs=libLLVMDebugInfoDWARF.a -Wl,--exclude-libs=libLLVMBPFCodeGen.a -Wl,--exclude-libs=libLLVMSelectionDAG.a -Wl,--exclude-libs=libLLVMBPFDesc.a -Wl,--exclude-libs=libLLVMBPFInfo.a -Wl,--exclude-libs=libLLVMBPFAsmPrinter.a -Wl,--exclude-libs=libLLVMAsmPrinter.a -Wl,--exclude-libs=libLLVMCodeGen.a -Wl,--exclude-libs=libLLVMTarget.a -Wl,--exclude-libs=libLLVMScalarOpts.a -Wl,--exclude-libs=libLLVMInstCombine.a -Wl,--exclude-libs=libLLVMInstrumentation.a -Wl,--exclude-libs=libLLVMTransformUtils.a -Wl,--exclude-libs=libLLVMProfileData.a -Wl,--exclude-libs=libLLVMObject.a -Wl,--exclude-libs=libLLVMMCParser.a -Wl,--exclude-libs=libLLVMMC.a -Wl,--exclude-libs=libLLVMBitReader.a -Wl,--exclude-libs=libLLVMAnalysis.a -Wl,--exclude-libs=libLLVMBitWriter.a -Wl,--exclude-libs=libLLVMCore.a -Wl,--exclude-libs=libLLVMSupport.a -shared -Wl,-soname,libbcc_bpf.so.0 -o libbcc_bpf.so.0.20.0 CMakeFiles/bpf-shared.dir/libbpf.c.o CMakeFiles/bpf-shared.dir/perf_reader.c.o CMakeFiles/bpf-shared.dir/libbpf/src/bpf.c.o CMakeFiles/bpf-shared.dir/libbpf/src/bpf_prog_linfo.c.o CMakeFiles/bpf-shared.dir/libbpf/src/btf.c.o CMakeFiles/bpf-shared.dir/libbpf/src/btf_dump.c.o CMakeFiles/bpf-shared.dir/libbpf/src/gen_loader.c.o CMakeFiles/bpf-shared.dir/libbpf/src/hashmap.c.o CMakeFiles/bpf-shared.dir/libbpf/src/libbpf.c.o CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_errno.c.o CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_probes.c.o CMakeFiles/bpf-shared.dir/libbpf/src/linker.c.o CMakeFiles/bpf-shared.dir/libbpf/src/netlink.c.o CMakeFiles/bpf-shared.dir/libbpf/src/nlattr.c.o CMakeFiles/bpf-shared.dir/libbpf/src/ringbuf.c.o CMakeFiles/bpf-shared.dir/libbpf/src/str_error.c.o CMakeFiles/bpf-shared.dir/libbpf/src/strset.c.o CMakeFiles/bpf-shared.dir/libbpf/src/xsk.c.o CMakeFiles/bpf-shared.dir/bcc_syms.cc.o CMakeFiles/bpf-shared.dir/bcc_elf.c.o CMakeFiles/bpf-shared.dir/bcc_perf_map.c.o CMakeFiles/bpf-shared.dir/bcc_proc.c.o CMakeFiles/bpf-shared.dir/common.cc.o CMakeFiles/bpf-shared.dir/usdt/usdt.cc.o CMakeFiles/bpf-shared.dir/usdt/usdt_args.cc.o -lelf -lz 
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_symlink_library libbcc_bpf.so.0.20.0 libbcc_bpf.so.0 libbcc_bpf.so
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 75%] Built target bpf-shared
[ 76%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bpffs_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/bpffs_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bpffs_table.cc
make -f src/cc/CMakeFiles/bcc-static.dir/build.make src/cc/CMakeFiles/bcc-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bcc-static.dir/DependInfo.cmake --color=
Scanning dependencies of target bcc-static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-static.dir/build.make src/cc/CMakeFiles/bcc-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 76%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/bcc_common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_common.cc
[ 76%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/json_map_decl_visitor.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/json_map_decl_visitor.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/json_map_decl_visitor.cc
[ 77%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpf_module.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/bpf_module.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bpf_module.cc
[ 77%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_btf.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/bcc_btf.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc
/tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc: In member function ‘int ebpf::BTF::get_btf_info(const char*, void**, unsigned int*, unsigned int*, void**, unsigned int*, unsigned int*)’:
/tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:316:33: warning: ‘int btf_ext__reloc_func_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_func_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         func_info, func_info_cnt);
                                 ^
In file included from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_libbpf_inc.h:9:0,
                 from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:22:
/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf.h:80:5: note: declared here
 int btf_ext__reloc_func_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
/tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:323:33: warning: ‘int btf_ext__reloc_line_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_line_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         line_info, line_info_cnt);
                                 ^
In file included from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_libbpf_inc.h:9:0,
                 from /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_btf.cc:22:
/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/src/btf.h:85:5: note: declared here
 int btf_ext__reloc_line_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
[ 77%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/exported_files.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/exported_files.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/exported_files.cc
[ 78%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpf_module_rw_engine.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/bpf_module_rw_engine.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bpf_module_rw_engine.cc
[ 78%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_syms.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/bcc_syms.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_syms.cc
[ 79%] Building C object src/cc/CMakeFiles/bcc-shared.dir/bcc_elf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-shared.dir/bcc_elf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_elf.c
[ 79%] Building C object src/cc/CMakeFiles/bcc-shared.dir/bcc_perf_map.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-shared.dir/bcc_perf_map.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_perf_map.c
[ 79%] Building C object src/cc/CMakeFiles/bcc-shared.dir/bcc_proc.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-shared.dir/bcc_proc.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_proc.c
[ 80%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++  -Dbcc_shared_EXPORTS -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -fPIC   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-shared.dir/common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/common.cc
[ 80%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/table_storage.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/table_storage.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/table_storage.cc
[ 80%] Linking CXX shared library libbcc.so
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/bcc-shared.dir/link.txt --verbose=1
/usr/bin/c++ -fPIC -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3 -Wl,-Bsymbolic-functions -Wl,-z,relro -static-libstdc++  -Wl,--exclude-libs=libclangFrontend.a -Wl,--exclude-libs=libclangSerialization.a -Wl,--exclude-libs=libclangDriver.a -Wl,--exclude-libs=libclangParse.a -Wl,--exclude-libs=libclangSema.a -Wl,--exclude-libs=libclangCodeGen.a -Wl,--exclude-libs=libclangAnalysis.a -Wl,--exclude-libs=libclangRewrite.a -Wl,--exclude-libs=libclangEdit.a -Wl,--exclude-libs=libclangAST.a -Wl,--exclude-libs=libclangLex.a -Wl,--exclude-libs=libclangBasic.a  -Wl,--exclude-libs=libLLVMX86CodeGen.a -Wl,--exclude-libs=libLLVMX86Desc.a -Wl,--exclude-libs=libLLVMX86Info.a -Wl,--exclude-libs=libLLVMMCDisassembler.a -Wl,--exclude-libs=libLLVMX86AsmPrinter.a -Wl,--exclude-libs=libLLVMX86Utils.a -Wl,--exclude-libs=libLLVMLTO.a -Wl,--exclude-libs=libLLVMPasses.a -Wl,--exclude-libs=libLLVMipo.a -Wl,--exclude-libs=libLLVMVectorize.a -Wl,--exclude-libs=libLLVMOption.a -Wl,--exclude-libs=libLLVMObjCARCOpts.a -Wl,--exclude-libs=libLLVMMCJIT.a -Wl,--exclude-libs=libLLVMExecutionEngine.a -Wl,--exclude-libs=libLLVMRuntimeDyld.a -Wl,--exclude-libs=libLLVMLinker.a -Wl,--exclude-libs=libLLVMIRReader.a -Wl,--exclude-libs=libLLVMAsmParser.a -Wl,--exclude-libs=libLLVMDebugInfoDWARF.a -Wl,--exclude-libs=libLLVMBPFCodeGen.a -Wl,--exclude-libs=libLLVMSelectionDAG.a -Wl,--exclude-libs=libLLVMBPFDesc.a -Wl,--exclude-libs=libLLVMBPFInfo.a -Wl,--exclude-libs=libLLVMBPFAsmPrinter.a -Wl,--exclude-libs=libLLVMAsmPrinter.a -Wl,--exclude-libs=libLLVMCodeGen.a -Wl,--exclude-libs=libLLVMTarget.a -Wl,--exclude-libs=libLLVMScalarOpts.a -Wl,--exclude-libs=libLLVMInstCombine.a -Wl,--exclude-libs=libLLVMInstrumentation.a -Wl,--exclude-libs=libLLVMTransformUtils.a -Wl,--exclude-libs=libLLVMProfileData.a -Wl,--exclude-libs=libLLVMObject.a -Wl,--exclude-libs=libLLVMMCParser.a -Wl,--exclude-libs=libLLVMMC.a -Wl,--exclude-libs=libLLVMBitReader.a -Wl,--exclude-libs=libLLVMAnalysis.a -Wl,--exclude-libs=libLLVMBitWriter.a -Wl,--exclude-libs=libLLVMCore.a -Wl,--exclude-libs=libLLVMSupport.a -shared -Wl,-soname,libbcc.so.0 -o libbcc.so.0.20.0 CMakeFiles/bcc-shared.dir/link_all.cc.o CMakeFiles/bcc-shared.dir/bcc_common.cc.o CMakeFiles/bcc-shared.dir/bpf_module.cc.o CMakeFiles/bcc-shared.dir/bcc_btf.cc.o CMakeFiles/bcc-shared.dir/exported_files.cc.o CMakeFiles/bcc-shared.dir/bpf_module_rw_engine.cc.o CMakeFiles/bcc-shared.dir/table_storage.cc.o CMakeFiles/bcc-shared.dir/shared_table.cc.o CMakeFiles/bcc-shared.dir/bpffs_table.cc.o CMakeFiles/bcc-shared.dir/json_map_decl_visitor.cc.o CMakeFiles/bcc-shared.dir/bcc_syms.cc.o CMakeFiles/bcc-shared.dir/bcc_elf.c.o CMakeFiles/bcc-shared.dir/bcc_perf_map.c.o CMakeFiles/bcc-shared.dir/bcc_proc.c.o CMakeFiles/bcc-shared.dir/common.cc.o frontends/b/libb_frontend.a frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -Wl,--no-whole-archive -lelf libbcc_bpf.a -Wl,--whole-archive api/libapi-static.a -Wl,--no-whole-archive usdt/libusdt-static.a -lrt -ldl -ltinfo -lpthread -lm -lelf -lz 
[ 80%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/shared_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/shared_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/shared_table.cc
[ 81%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpffs_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/bpffs_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bpffs_table.cc
[ 81%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/json_map_decl_visitor.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/json_map_decl_visitor.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/json_map_decl_visitor.cc
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_symlink_library libbcc.so.0.20.0 libbcc.so.0 libbcc.so
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 81%] Built target bcc-shared
make -f tests/cc/CMakeFiles/test_libbcc.dir/build.make tests/cc/CMakeFiles/test_libbcc.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc/CMakeFiles/test_libbcc.dir/DependInfo.cmake --color=
Scanning dependencies of target test_libbcc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f tests/cc/CMakeFiles/test_libbcc.dir/build.make tests/cc/CMakeFiles/test_libbcc.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 81%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_libbcc.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_libbcc.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_libbcc.cc
[ 81%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/common.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/common.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/common.cc
[ 82%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/usdt/usdt.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/usdt/usdt.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt.cc
[ 82%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/usdt/usdt_args.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/usdt/usdt_args.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/usdt/usdt_args.cc
[ 83%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_c_api.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_c_api.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_c_api.cc
[ 83%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_array_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_array_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_array_table.cc
[ 83%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_syms.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fno-rtti -fPIC -DBCC_PROG_TAG_DIR='"/var/tmp/bcc"' -Wno-unused-result -DLLVM_MAJOR_VERSION=3   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=gnu++14 -o CMakeFiles/bcc-static.dir/bcc_syms.cc.o -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_syms.cc
[ 83%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_bpf_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_bpf_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_bpf_table.cc
[ 83%] Building C object src/cc/CMakeFiles/bcc-static.dir/bcc_elf.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-static.dir/bcc_elf.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_elf.c
[ 84%] Building C object src/cc/CMakeFiles/bcc-static.dir/bcc_perf_map.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-static.dir/bcc_perf_map.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_perf_map.c
[ 84%] Building C object src/cc/CMakeFiles/bcc-static.dir/bcc_proc.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b -I/tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang -I/usr/lib/llvm-3.8/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -fPIC -Wno-unused-result   -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -o CMakeFiles/bcc-static.dir/bcc_proc.c.o   -c /tmp/debuild.1xf8Y7/bcc/src/cc/bcc_proc.c
[ 84%] Linking CXX static library libbcc.a
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -P CMakeFiles/bcc-static.dir/cmake_clean_target.cmake
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/bcc-static.dir/link.txt --verbose=1
/usr/bin/ar qc libbcc.a  CMakeFiles/bcc-static.dir/bcc_common.cc.o CMakeFiles/bcc-static.dir/bpf_module.cc.o CMakeFiles/bcc-static.dir/bcc_btf.cc.o CMakeFiles/bcc-static.dir/exported_files.cc.o CMakeFiles/bcc-static.dir/bpf_module_rw_engine.cc.o CMakeFiles/bcc-static.dir/table_storage.cc.o CMakeFiles/bcc-static.dir/shared_table.cc.o CMakeFiles/bcc-static.dir/bpffs_table.cc.o CMakeFiles/bcc-static.dir/json_map_decl_visitor.cc.o CMakeFiles/bcc-static.dir/common.cc.o CMakeFiles/bcc-static.dir/usdt/usdt.cc.o CMakeFiles/bcc-static.dir/usdt/usdt_args.cc.o CMakeFiles/bcc-static.dir/bcc_syms.cc.o CMakeFiles/bcc-static.dir/bcc_elf.c.o CMakeFiles/bcc-static.dir/bcc_perf_map.c.o CMakeFiles/bcc-static.dir/bcc_proc.c.o
/usr/bin/ranlib libbcc.a
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 84%] Built target bcc-static
make -f examples/cpp/CMakeFiles/KFuncExample.dir/build.make examples/cpp/CMakeFiles/KFuncExample.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/KFuncExample.dir/DependInfo.cmake --color=
Scanning dependencies of target KFuncExample
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/KFuncExample.dir/build.make examples/cpp/CMakeFiles/KFuncExample.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 84%] Building CXX object examples/cpp/CMakeFiles/KFuncExample.dir/KFuncExample.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/KFuncExample.dir/KFuncExample.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/KFuncExample.cc
[ 85%] Linking CXX executable KFuncExample
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/KFuncExample.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/KFuncExample.dir/KFuncExample.cc.o  -o KFuncExample ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 86%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_cg_storage.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_cg_storage.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_cg_storage.cc
[ 86%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_hash_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_hash_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_hash_table.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 86%] Built target KFuncExample
make -f examples/cpp/CMakeFiles/KModRetExample.dir/build.make examples/cpp/CMakeFiles/KModRetExample.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/KModRetExample.dir/DependInfo.cmake --color=
Scanning dependencies of target KModRetExample
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/KModRetExample.dir/build.make examples/cpp/CMakeFiles/KModRetExample.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 86%] Building CXX object examples/cpp/CMakeFiles/KModRetExample.dir/KModRetExample.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/KModRetExample.dir/KModRetExample.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/KModRetExample.cc
[ 86%] Linking CXX executable KModRetExample
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/KModRetExample.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/KModRetExample.dir/KModRetExample.cc.o  -o KModRetExample ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 86%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_map_in_map.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_map_in_map.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_map_in_map.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 86%] Built target KModRetExample
make -f examples/cpp/CMakeFiles/HelloWorld.dir/build.make examples/cpp/CMakeFiles/HelloWorld.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/HelloWorld.dir/DependInfo.cmake --color=
Scanning dependencies of target HelloWorld
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/HelloWorld.dir/build.make examples/cpp/CMakeFiles/HelloWorld.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 87%] Building CXX object examples/cpp/CMakeFiles/HelloWorld.dir/HelloWorld.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/HelloWorld.dir/HelloWorld.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/HelloWorld.cc
[ 87%] Linking CXX executable HelloWorld
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/HelloWorld.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/HelloWorld.dir/HelloWorld.cc.o  -o HelloWorld ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 88%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_perf_event.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_perf_event.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_perf_event.cc
[ 88%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_pinned_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_pinned_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_pinned_table.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 88%] Built target HelloWorld
make -f examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build.make examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/DependInfo.cmake --color=
Scanning dependencies of target FollyRequestContextSwitch
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build.make examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 88%] Building CXX object examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/FollyRequestContextSwitch.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/FollyRequestContextSwitch.dir/FollyRequestContextSwitch.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/FollyRequestContextSwitch.cc
[ 88%] Linking CXX executable FollyRequestContextSwitch
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/FollyRequestContextSwitch.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/FollyRequestContextSwitch.dir/FollyRequestContextSwitch.cc.o  -o FollyRequestContextSwitch ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 88%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_prog_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_prog_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_prog_table.cc
[ 89%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_queuestack_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_queuestack_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_queuestack_table.cc
[ 89%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_shared_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_shared_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_shared_table.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 89%] Built target FollyRequestContextSwitch
make -f examples/cpp/CMakeFiles/CGroupTest.dir/build.make examples/cpp/CMakeFiles/CGroupTest.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/CGroupTest.dir/DependInfo.cmake --color=
Scanning dependencies of target CGroupTest
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/CGroupTest.dir/build.make examples/cpp/CMakeFiles/CGroupTest.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 89%] Building CXX object examples/cpp/CMakeFiles/CGroupTest.dir/CGroupTest.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/CGroupTest.dir/CGroupTest.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/CGroupTest.cc
[ 89%] Linking CXX executable CGroupTest
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/CGroupTest.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/CGroupTest.dir/CGroupTest.cc.o  -o CGroupTest ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 89%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_sk_storage.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_sk_storage.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_sk_storage.cc
[ 90%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_sock_table.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_sock_table.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_sock_table.cc
[ 90%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_usdt_args.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_usdt_args.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_usdt_args.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 90%] Built target CGroupTest
make -f examples/cpp/CMakeFiles/CPUDistribution.dir/build.make examples/cpp/CMakeFiles/CPUDistribution.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/CPUDistribution.dir/DependInfo.cmake --color=
Scanning dependencies of target CPUDistribution
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/CPUDistribution.dir/build.make examples/cpp/CMakeFiles/CPUDistribution.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 90%] Building CXX object examples/cpp/CMakeFiles/CPUDistribution.dir/CPUDistribution.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/CPUDistribution.dir/CPUDistribution.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/CPUDistribution.cc
[ 90%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_usdt_probes.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_usdt_probes.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_usdt_probes.cc
[ 91%] Linking CXX executable CPUDistribution
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/CPUDistribution.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/CPUDistribution.dir/CPUDistribution.cc.o  -o CPUDistribution ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 92%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/utils.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/utils.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/utils.cc
[ 92%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_parse_tracepoint.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/c++  -DLIBBCC_NAME=\"libbcc.so\" -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC   -std=gnu++14 -o CMakeFiles/test_libbcc.dir/test_parse_tracepoint.cc.o -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_parse_tracepoint.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 92%] Built target CPUDistribution
make -f examples/cpp/CMakeFiles/LLCStat.dir/build.make examples/cpp/CMakeFiles/LLCStat.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/LLCStat.dir/DependInfo.cmake --color=
Scanning dependencies of target LLCStat
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/LLCStat.dir/build.make examples/cpp/CMakeFiles/LLCStat.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 93%] Building CXX object examples/cpp/CMakeFiles/LLCStat.dir/LLCStat.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/LLCStat.dir/LLCStat.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/LLCStat.cc
[ 93%] Linking CXX executable test_libbcc
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/test_libbcc.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/test_libbcc.dir/test_libbcc.cc.o CMakeFiles/test_libbcc.dir/test_c_api.cc.o CMakeFiles/test_libbcc.dir/test_array_table.cc.o CMakeFiles/test_libbcc.dir/test_bpf_table.cc.o CMakeFiles/test_libbcc.dir/test_cg_storage.cc.o CMakeFiles/test_libbcc.dir/test_hash_table.cc.o CMakeFiles/test_libbcc.dir/test_map_in_map.cc.o CMakeFiles/test_libbcc.dir/test_perf_event.cc.o CMakeFiles/test_libbcc.dir/test_pinned_table.cc.o CMakeFiles/test_libbcc.dir/test_prog_table.cc.o CMakeFiles/test_libbcc.dir/test_queuestack_table.cc.o CMakeFiles/test_libbcc.dir/test_shared_table.cc.o CMakeFiles/test_libbcc.dir/test_sk_storage.cc.o CMakeFiles/test_libbcc.dir/test_sock_table.cc.o CMakeFiles/test_libbcc.dir/test_usdt_args.cc.o CMakeFiles/test_libbcc.dir/test_usdt_probes.cc.o CMakeFiles/test_libbcc.dir/utils.cc.o CMakeFiles/test_libbcc.dir/test_parse_tracepoint.cc.o  -o test_libbcc  -L/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -Wl,-rpath,/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc:/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc -lbcc -ldl libusdt_test_lib.so 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 93%] Built target test_libbcc
make -f examples/cpp/CMakeFiles/RandomRead.dir/build.make examples/cpp/CMakeFiles/RandomRead.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/RandomRead.dir/DependInfo.cmake --color=
Scanning dependencies of target RandomRead
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/RandomRead.dir/build.make examples/cpp/CMakeFiles/RandomRead.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 94%] Building CXX object examples/cpp/CMakeFiles/RandomRead.dir/RandomRead.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/RandomRead.dir/RandomRead.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/RandomRead.cc
[ 94%] Linking CXX executable LLCStat
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/LLCStat.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/LLCStat.dir/LLCStat.cc.o  -o LLCStat ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 94%] Linking CXX executable RandomRead
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/RandomRead.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/RandomRead.dir/RandomRead.cc.o  -o RandomRead ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 94%] Built target LLCStat
make -f examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build.make examples/cpp/CMakeFiles/RecordMySQLQuery.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/RecordMySQLQuery.dir/DependInfo.cmake --color=
Scanning dependencies of target RecordMySQLQuery
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build.make examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 94%] Building CXX object examples/cpp/CMakeFiles/RecordMySQLQuery.dir/RecordMySQLQuery.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/RecordMySQLQuery.dir/RecordMySQLQuery.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/RecordMySQLQuery.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 94%] Built target RandomRead
make -f examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build.make examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/DependInfo.cmake --color=
Scanning dependencies of target SkLocalStorageIterator
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build.make examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 94%] Building CXX object examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/SkLocalStorageIterator.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/SkLocalStorageIterator.dir/SkLocalStorageIterator.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/SkLocalStorageIterator.cc
[ 95%] Linking CXX executable RecordMySQLQuery
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/RecordMySQLQuery.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/RecordMySQLQuery.dir/RecordMySQLQuery.cc.o  -o RecordMySQLQuery ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 95%] Linking CXX executable SkLocalStorageIterator
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/SkLocalStorageIterator.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/SkLocalStorageIterator.dir/SkLocalStorageIterator.cc.o  -o SkLocalStorageIterator ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 95%] Built target RecordMySQLQuery
make -f examples/cpp/CMakeFiles/TCPSendStack.dir/build.make examples/cpp/CMakeFiles/TCPSendStack.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/TCPSendStack.dir/DependInfo.cmake --color=
Scanning dependencies of target TCPSendStack
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/TCPSendStack.dir/build.make examples/cpp/CMakeFiles/TCPSendStack.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 96%] Building CXX object examples/cpp/CMakeFiles/TCPSendStack.dir/TCPSendStack.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/TCPSendStack.dir/TCPSendStack.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/TCPSendStack.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 96%] Built target SkLocalStorageIterator
make -f examples/cpp/CMakeFiles/UseExternalMap.dir/build.make examples/cpp/CMakeFiles/UseExternalMap.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/UseExternalMap.dir/DependInfo.cmake --color=
Scanning dependencies of target UseExternalMap
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/UseExternalMap.dir/build.make examples/cpp/CMakeFiles/UseExternalMap.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 97%] Building CXX object examples/cpp/CMakeFiles/UseExternalMap.dir/UseExternalMap.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/UseExternalMap.dir/UseExternalMap.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/UseExternalMap.cc
[ 97%] Linking CXX executable TCPSendStack
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/TCPSendStack.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/TCPSendStack.dir/TCPSendStack.cc.o  -o TCPSendStack ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 97%] Linking CXX executable UseExternalMap
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/UseExternalMap.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/UseExternalMap.dir/UseExternalMap.cc.o  -o UseExternalMap ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 97%] Built target TCPSendStack
make -f examples/cpp/CMakeFiles/TaskIterator.dir/build.make examples/cpp/CMakeFiles/TaskIterator.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/TaskIterator.dir/DependInfo.cmake --color=
Scanning dependencies of target TaskIterator
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/TaskIterator.dir/build.make examples/cpp/CMakeFiles/TaskIterator.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 97%] Building CXX object examples/cpp/CMakeFiles/TaskIterator.dir/TaskIterator.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/TaskIterator.dir/TaskIterator.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/TaskIterator.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 97%] Built target UseExternalMap
make -f examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build.make examples/cpp/pyperf/CMakeFiles/PyPerf.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf/CMakeFiles/PyPerf.dir/DependInfo.cmake --color=
Scanning dependencies of target PyPerf
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build.make examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 97%] Building CXX object examples/cpp/pyperf/CMakeFiles/PyPerf.dir/PyPerf.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/PyPerf.dir/PyPerf.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf/PyPerf.cc
[ 97%] Linking CXX executable TaskIterator
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp && /usr/bin/cmake -E cmake_link_script CMakeFiles/TaskIterator.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/TaskIterator.dir/TaskIterator.cc.o  -o TaskIterator ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[ 98%] Building CXX object examples/cpp/pyperf/CMakeFiles/PyPerf.dir/PyPerfUtil.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/PyPerf.dir/PyPerfUtil.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf/PyPerfUtil.cc
[ 98%] Building CXX object examples/cpp/pyperf/CMakeFiles/PyPerf.dir/PyPerfBPFProgram.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/PyPerf.dir/PyPerfBPFProgram.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf/PyPerfBPFProgram.cc
[ 98%] Building CXX object examples/cpp/pyperf/CMakeFiles/PyPerf.dir/PyPerfLoggingHelper.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/PyPerf.dir/PyPerfLoggingHelper.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf/PyPerfLoggingHelper.cc
[ 99%] Building CXX object examples/cpp/pyperf/CMakeFiles/PyPerf.dir/PyPerfDefaultPrinter.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/PyPerf.dir/PyPerfDefaultPrinter.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf/PyPerfDefaultPrinter.cc
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 99%] Built target TaskIterator
make -f tests/cc/CMakeFiles/test_static.dir/build.make tests/cc/CMakeFiles/test_static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc/CMakeFiles/test_static.dir/DependInfo.cmake --color=
Scanning dependencies of target test_static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f tests/cc/CMakeFiles/test_static.dir/build.make tests/cc/CMakeFiles/test_static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[100%] Building C object tests/cc/CMakeFiles/test_static.dir/test_static.c.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/cc  -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi -I/tmp/debuild.1xf8Y7/bcc/tests/python/include  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wno-unused-result -fPIC   -o CMakeFiles/test_static.dir/test_static.c.o   -c /tmp/debuild.1xf8Y7/bcc/tests/cc/test_static.c
[100%] Linking CXX executable test_static
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc && /usr/bin/cmake -E cmake_link_script CMakeFiles/test_static.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -Wno-unused-result -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/test_static.dir/test_static.c.o  -o test_static ../../src/cc/libbcc.a ../../src/cc/frontends/b/libb_frontend.a ../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../src/cc/libbcc_bpf.a ../../src/cc/api/libapi-static.a ../../src/cc/usdt/libusdt-static.a ../../src/cc/libbcc-loader-static.a -lelf -lz 
[100%] Building CXX object examples/cpp/pyperf/CMakeFiles/PyPerf.dir/Py36Offsets.cc.o
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/c++   -I/usr/lib/llvm-3.8/include/../tools/clang/include -I/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc -I/tmp/debuild.1xf8Y7/bcc/src/cc/api -I/tmp/debuild.1xf8Y7/bcc/src/cc/libbpf/include/uapi  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC   -std=gnu++14 -o CMakeFiles/PyPerf.dir/Py36Offsets.cc.o -c /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf/Py36Offsets.cc
[100%] Linking CXX executable PyPerf
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf && /usr/bin/cmake -E cmake_link_script CMakeFiles/PyPerf.dir/link.txt --verbose=1
/usr/bin/c++  -g -O2 -fdebug-prefix-map=/tmp/debuild.1xf8Y7/bcc=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall  -fPIC  -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic CMakeFiles/PyPerf.dir/PyPerf.cc.o CMakeFiles/PyPerf.dir/PyPerfUtil.cc.o CMakeFiles/PyPerf.dir/PyPerfBPFProgram.cc.o CMakeFiles/PyPerf.dir/PyPerfLoggingHelper.cc.o CMakeFiles/PyPerf.dir/PyPerfDefaultPrinter.cc.o CMakeFiles/PyPerf.dir/Py36Offsets.cc.o  -o PyPerf ../../../src/cc/libbcc.a ../../../src/cc/libbcc.a ../../../src/cc/frontends/b/libb_frontend.a ../../../src/cc/frontends/clang/libclang_frontend.a -Wl,--whole-archive /usr/lib/llvm-3.8/lib/libclangFrontend.a /usr/lib/llvm-3.8/lib/libclangSerialization.a /usr/lib/llvm-3.8/lib/libclangDriver.a /usr/lib/llvm-3.8/lib/libclangParse.a /usr/lib/llvm-3.8/lib/libclangSema.a /usr/lib/llvm-3.8/lib/libclangCodeGen.a /usr/lib/llvm-3.8/lib/libclangAnalysis.a /usr/lib/llvm-3.8/lib/libclangRewrite.a /usr/lib/llvm-3.8/lib/libclangEdit.a /usr/lib/llvm-3.8/lib/libclangAST.a /usr/lib/llvm-3.8/lib/libclangLex.a /usr/lib/llvm-3.8/lib/libclangBasic.a /usr/lib/llvm-3.8/lib/libLLVMX86CodeGen.a /usr/lib/llvm-3.8/lib/libLLVMX86Desc.a /usr/lib/llvm-3.8/lib/libLLVMX86Info.a /usr/lib/llvm-3.8/lib/libLLVMMCDisassembler.a /usr/lib/llvm-3.8/lib/libLLVMX86AsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMX86Utils.a /usr/lib/llvm-3.8/lib/libLLVMLTO.a /usr/lib/llvm-3.8/lib/libLLVMPasses.a /usr/lib/llvm-3.8/lib/libLLVMipo.a /usr/lib/llvm-3.8/lib/libLLVMVectorize.a /usr/lib/llvm-3.8/lib/libLLVMOption.a /usr/lib/llvm-3.8/lib/libLLVMObjCARCOpts.a /usr/lib/llvm-3.8/lib/libLLVMMCJIT.a /usr/lib/llvm-3.8/lib/libLLVMExecutionEngine.a /usr/lib/llvm-3.8/lib/libLLVMRuntimeDyld.a /usr/lib/llvm-3.8/lib/libLLVMLinker.a /usr/lib/llvm-3.8/lib/libLLVMIRReader.a /usr/lib/llvm-3.8/lib/libLLVMAsmParser.a /usr/lib/llvm-3.8/lib/libLLVMDebugInfoDWARF.a /usr/lib/llvm-3.8/lib/libLLVMBPFCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMSelectionDAG.a /usr/lib/llvm-3.8/lib/libLLVMBPFDesc.a /usr/lib/llvm-3.8/lib/libLLVMBPFInfo.a /usr/lib/llvm-3.8/lib/libLLVMBPFAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMAsmPrinter.a /usr/lib/llvm-3.8/lib/libLLVMCodeGen.a /usr/lib/llvm-3.8/lib/libLLVMTarget.a /usr/lib/llvm-3.8/lib/libLLVMScalarOpts.a /usr/lib/llvm-3.8/lib/libLLVMInstCombine.a /usr/lib/llvm-3.8/lib/libLLVMInstrumentation.a /usr/lib/llvm-3.8/lib/libLLVMTransformUtils.a /usr/lib/llvm-3.8/lib/libLLVMProfileData.a /usr/lib/llvm-3.8/lib/libLLVMObject.a /usr/lib/llvm-3.8/lib/libLLVMMCParser.a /usr/lib/llvm-3.8/lib/libLLVMMC.a /usr/lib/llvm-3.8/lib/libLLVMBitReader.a /usr/lib/llvm-3.8/lib/libLLVMAnalysis.a /usr/lib/llvm-3.8/lib/libLLVMBitWriter.a /usr/lib/llvm-3.8/lib/libLLVMCore.a /usr/lib/llvm-3.8/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm -Wl,--no-whole-archive -lelf ../../../src/cc/libbcc_bpf.a ../../../src/cc/api/libapi-static.a ../../../src/cc/usdt/libusdt-static.a ../../../src/cc/libbcc-loader-static.a -lelf -lz 
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[100%] Built target test_static
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[100%] Built target PyPerf
make[2]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
/usr/bin/cmake -E cmake_progress_start /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/CMakeFiles 0
make[1]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
   debian/rules override_dh_auto_test
make[1]: Entering directory '/tmp/debuild.1xf8Y7/bcc'
dh_auto_test -O--buildsystem=cmake -O--no-parallel
make[1]: Leaving directory '/tmp/debuild.1xf8Y7/bcc'
 fakeroot debian/rules binary
dh binary --buildsystem=cmake --parallel --with python2,python3
   dh_testroot -O--buildsystem=cmake -O--parallel
   dh_prep -O--buildsystem=cmake -O--parallel
   dh_auto_install -O--buildsystem=cmake -O--parallel
	make -j2 install DESTDIR=/tmp/debuild.1xf8Y7/bcc/debian/tmp AM_UPDATE_INFO_DIR=no
make[1]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
/usr/bin/cmake -H/tmp/debuild.1xf8Y7/bcc -B/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu --check-build-system CMakeFiles/Makefile.cmake 0
/usr/bin/cmake -E cmake_progress_start /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/CMakeFiles /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/CMakeFiles/progress.marks
make -f CMakeFiles/Makefile2 all
make[2]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-loader-static.dir/build.make src/cc/CMakeFiles/bcc-loader-static.dir/depend
make -f src/cc/CMakeFiles/bpf-static.dir/build.make src/cc/CMakeFiles/bpf-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bcc-loader-static.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bpf-static.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-loader-static.dir/build.make src/cc/CMakeFiles/bcc-loader-static.dir/build
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bpf-static.dir/build.make src/cc/CMakeFiles/bpf-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/CMakeFiles/bcc-loader-static.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/CMakeFiles/bpf-static.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[  2%] Built target bcc-loader-static
make -f src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build.make src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/clang /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/DependInfo.cmake --color=
[ 11%] Built target bpf-static
make -f src/cc/api/CMakeFiles/api-static.dir/build.make src/cc/api/CMakeFiles/api-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/api /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/api/CMakeFiles/api-static.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build.make src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/api/CMakeFiles/api-static.dir/build.make src/cc/api/CMakeFiles/api-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/api/CMakeFiles/api-static.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 12%] Built target api-static
make -f src/cc/usdt/CMakeFiles/usdt-static.dir/build.make src/cc/usdt/CMakeFiles/usdt-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/usdt /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/usdt/CMakeFiles/usdt-static.dir/DependInfo.cmake --color=
[ 14%] Built target clang_frontend
make -f src/cc/frontends/b/CMakeFiles/b_frontend.dir/build.make src/cc/frontends/b/CMakeFiles/b_frontend.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc/frontends/b /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/frontends/b/CMakeFiles/b_frontend.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/usdt/CMakeFiles/usdt-static.dir/build.make src/cc/usdt/CMakeFiles/usdt-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/usdt/CMakeFiles/usdt-static.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/frontends/b/CMakeFiles/b_frontend.dir/build.make src/cc/frontends/b/CMakeFiles/b_frontend.dir/build
[ 15%] Built target usdt-static
make -f src/cc/CMakeFiles/bpf-shared.dir/build.make src/cc/CMakeFiles/bpf-shared.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bpf-shared.dir/DependInfo.cmake --color=
make[3]: Nothing to be done for 'src/cc/frontends/b/CMakeFiles/b_frontend.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 19%] Built target b_frontend
make -f src/python/CMakeFiles/bcc_py_python3.dir/build.make src/python/CMakeFiles/bcc_py_python3.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python/CMakeFiles/bcc_py_python3.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bpf-shared.dir/build.make src/cc/CMakeFiles/bpf-shared.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/CMakeFiles/bpf-shared.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/python/CMakeFiles/bcc_py_python3.dir/build.make src/python/CMakeFiles/bcc_py_python3.dir/build
[ 27%] Built target bpf-shared
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/python/CMakeFiles/bcc_py_python3.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/python/CMakeFiles/bcc_py_python2.dir/build.make src/python/CMakeFiles/bcc_py_python2.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/python/CMakeFiles/bcc_py_python2.dir/DependInfo.cmake --color=
[ 27%] Built target bcc_py_python3
make -f src/lua/CMakeFiles/bcc-lua.dir/build.make src/lua/CMakeFiles/bcc-lua.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/lua /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/lua/CMakeFiles/bcc-lua.dir/DependInfo.cmake --color=
make -f src/python/CMakeFiles/bcc_py_python2.dir/build.make src/python/CMakeFiles/bcc_py_python2.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/python/CMakeFiles/bcc_py_python2.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/lua/CMakeFiles/bcc-lua.dir/build.make src/lua/CMakeFiles/bcc-lua.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/lua/CMakeFiles/bcc-lua.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 28%] Built target bcc_py_python2
make -f introspection/CMakeFiles/bps.dir/build.make introspection/CMakeFiles/bps.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/introspection /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/introspection /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/introspection/CMakeFiles/bps.dir/DependInfo.cmake --color=
[ 29%] Built target bcc-lua
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f man/man8/CMakeFiles/man.dir/build.make man/man8/CMakeFiles/man.dir/depend
make -f introspection/CMakeFiles/bps.dir/build.make introspection/CMakeFiles/bps.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'introspection/CMakeFiles/bps.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/man/man8 /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8 /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/man/man8/CMakeFiles/man.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f man/man8/CMakeFiles/man.dir/build.make man/man8/CMakeFiles/man.dir/build
[ 29%] Built target bps
make -f tests/cc/CMakeFiles/usdt_test_lib.dir/build.make tests/cc/CMakeFiles/usdt_test_lib.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc/CMakeFiles/usdt_test_lib.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'man/man8/CMakeFiles/man.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f tests/cc/CMakeFiles/usdt_test_lib.dir/build.make tests/cc/CMakeFiles/usdt_test_lib.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'tests/cc/CMakeFiles/usdt_test_lib.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 72%] Built target man
make -f src/cc/CMakeFiles/bcc-shared.dir/build.make src/cc/CMakeFiles/bcc-shared.dir/depend
[ 73%] Built target usdt_test_lib
make -f src/cc/CMakeFiles/bcc-static.dir/build.make src/cc/CMakeFiles/bcc-static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bcc-shared.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/src/cc/CMakeFiles/bcc-static.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-shared.dir/build.make src/cc/CMakeFiles/bcc-shared.dir/build
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f src/cc/CMakeFiles/bcc-static.dir/build.make src/cc/CMakeFiles/bcc-static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/CMakeFiles/bcc-shared.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'src/cc/CMakeFiles/bcc-static.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 79%] Built target bcc-shared
[ 83%] Built target bcc-static
make -f tests/cc/CMakeFiles/test_libbcc.dir/build.make tests/cc/CMakeFiles/test_libbcc.dir/depend
make -f examples/cpp/CMakeFiles/KFuncExample.dir/build.make examples/cpp/CMakeFiles/KFuncExample.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/KFuncExample.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc/CMakeFiles/test_libbcc.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/KFuncExample.dir/build.make examples/cpp/CMakeFiles/KFuncExample.dir/build
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f tests/cc/CMakeFiles/test_libbcc.dir/build.make tests/cc/CMakeFiles/test_libbcc.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/KFuncExample.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'tests/cc/CMakeFiles/test_libbcc.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 84%] Built target KFuncExample
make -f examples/cpp/CMakeFiles/KModRetExample.dir/build.make examples/cpp/CMakeFiles/KModRetExample.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/KModRetExample.dir/DependInfo.cmake --color=
[ 90%] Built target test_libbcc
make -f examples/cpp/CMakeFiles/HelloWorld.dir/build.make examples/cpp/CMakeFiles/HelloWorld.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/HelloWorld.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/KModRetExample.dir/build.make examples/cpp/CMakeFiles/KModRetExample.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/KModRetExample.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/HelloWorld.dir/build.make examples/cpp/CMakeFiles/HelloWorld.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/HelloWorld.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 90%] Built target KModRetExample
make -f examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build.make examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build.make examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build
[ 91%] Built target HelloWorld
make -f examples/cpp/CMakeFiles/CGroupTest.dir/build.make examples/cpp/CMakeFiles/CGroupTest.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/CGroupTest.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/FollyRequestContextSwitch.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/CGroupTest.dir/build.make examples/cpp/CMakeFiles/CGroupTest.dir/build
[ 91%] Built target FollyRequestContextSwitch
make -f examples/cpp/CMakeFiles/CPUDistribution.dir/build.make examples/cpp/CMakeFiles/CPUDistribution.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/CPUDistribution.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/CGroupTest.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 91%] Built target CGroupTest
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/CPUDistribution.dir/build.make examples/cpp/CMakeFiles/CPUDistribution.dir/build
make -f examples/cpp/CMakeFiles/LLCStat.dir/build.make examples/cpp/CMakeFiles/LLCStat.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/LLCStat.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/CPUDistribution.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/LLCStat.dir/build.make examples/cpp/CMakeFiles/LLCStat.dir/build
[ 92%] Built target CPUDistribution
make -f examples/cpp/CMakeFiles/RandomRead.dir/build.make examples/cpp/CMakeFiles/RandomRead.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/RandomRead.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/LLCStat.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/RandomRead.dir/build.make examples/cpp/CMakeFiles/RandomRead.dir/build
[ 93%] Built target LLCStat
make -f examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build.make examples/cpp/CMakeFiles/RecordMySQLQuery.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/RandomRead.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/RecordMySQLQuery.dir/DependInfo.cmake --color=
[ 94%] Built target RandomRead
make -f examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build.make examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build.make examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build.make examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/RecordMySQLQuery.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/SkLocalStorageIterator.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 95%] Built target RecordMySQLQuery
make -f examples/cpp/CMakeFiles/TCPSendStack.dir/build.make examples/cpp/CMakeFiles/TCPSendStack.dir/depend
[ 95%] Built target SkLocalStorageIterator
make -f examples/cpp/CMakeFiles/UseExternalMap.dir/build.make examples/cpp/CMakeFiles/UseExternalMap.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/TCPSendStack.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/UseExternalMap.dir/DependInfo.cmake --color=
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/TCPSendStack.dir/build.make examples/cpp/CMakeFiles/TCPSendStack.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/TCPSendStack.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/UseExternalMap.dir/build.make examples/cpp/CMakeFiles/UseExternalMap.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/UseExternalMap.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 96%] Built target TCPSendStack
make -f examples/cpp/CMakeFiles/TaskIterator.dir/build.make examples/cpp/CMakeFiles/TaskIterator.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/CMakeFiles/TaskIterator.dir/DependInfo.cmake --color=
[ 97%] Built target UseExternalMap
make -f examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build.make examples/cpp/pyperf/CMakeFiles/PyPerf.dir/depend
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/CMakeFiles/TaskIterator.dir/build.make examples/cpp/CMakeFiles/TaskIterator.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/examples/cpp/pyperf /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/examples/cpp/pyperf/CMakeFiles/PyPerf.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/CMakeFiles/TaskIterator.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build.make examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build
[ 97%] Built target TaskIterator
make -f tests/cc/CMakeFiles/test_static.dir/build.make tests/cc/CMakeFiles/test_static.dir/depend
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
cd /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/debuild.1xf8Y7/bcc /tmp/debuild.1xf8Y7/bcc/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/tests/cc/CMakeFiles/test_static.dir/DependInfo.cmake --color=
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'examples/cpp/pyperf/CMakeFiles/PyPerf.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make -f tests/cc/CMakeFiles/test_static.dir/build.make tests/cc/CMakeFiles/test_static.dir/build
make[3]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[3]: Nothing to be done for 'tests/cc/CMakeFiles/test_static.dir/build'.
make[3]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
[ 99%] Built target PyPerf
[100%] Built target test_static
make[2]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
/usr/bin/cmake -E cmake_progress_start /tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu/CMakeFiles 0
make -f CMakeFiles/Makefile2 preinstall
make[2]: Entering directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
make[2]: Nothing to be done for 'preinstall'.
make[2]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
Install the project...
/usr/bin/cmake -P cmake_install.cmake
-- Install configuration: "None"
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc.so.0.20.0
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc.so.0
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc.so
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc.a
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc-loader-static.a
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc_bpf.a
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/file_desc.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/table_desc.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/table_storage.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_common.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bpf_module.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_exception.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_syms.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_proc.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_elf.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_usdt.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/pkt_cls.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/pkt_sched.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/if_xdp.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/bpf.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/if_link.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/bpf_common.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/btf.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/compat/linux/netlink.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/libbcc.pc
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/libbpf.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/perf_reader.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/bcc_version.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc_bpf.so.0.20.0
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc_bpf.so.0
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/x86_64-linux-gnu/libbcc_bpf.so
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/BPF.h
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/include/bcc/BPFTable.h
running install
running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/bcc
copying bcc/version.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/__init__.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/syscall.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/perf.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/containers.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/libbcc.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/table.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/tcp.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/utils.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/disassembler.py -> build/lib.linux-x86_64-2.7/bcc
copying bcc/usdt.py -> build/lib.linux-x86_64-2.7/bcc
running install_lib
creating /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7
creating /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages
creating /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/version.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/__init__.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/syscall.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/perf.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/containers.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/libbcc.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/table.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/tcp.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/utils.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/disassembler.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
copying build/lib.linux-x86_64-2.7/bcc/usdt.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/version.py to version.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/__init__.py to __init__.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/syscall.py to syscall.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/perf.py to perf.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/containers.py to containers.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/libbcc.py to libbcc.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/table.py to table.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/tcp.py to tcp.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/utils.py to utils.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/disassembler.py to disassembler.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc/usdt.py to usdt.pyc
running install_egg_info
Writing /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python2.7/dist-packages/bcc-0.20.0.egg-info
running install
running build
running build_py
creating build
creating build/lib
creating build/lib/bcc
copying bcc/version.py -> build/lib/bcc
copying bcc/__init__.py -> build/lib/bcc
copying bcc/syscall.py -> build/lib/bcc
copying bcc/perf.py -> build/lib/bcc
copying bcc/containers.py -> build/lib/bcc
copying bcc/libbcc.py -> build/lib/bcc
copying bcc/table.py -> build/lib/bcc
copying bcc/tcp.py -> build/lib/bcc
copying bcc/utils.py -> build/lib/bcc
copying bcc/disassembler.py -> build/lib/bcc
copying bcc/usdt.py -> build/lib/bcc
running install_lib
creating /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3
creating /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages
creating /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/version.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/__init__.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/syscall.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/perf.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/containers.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/libbcc.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/table.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/tcp.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/utils.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/disassembler.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
copying build/lib/bcc/usdt.py -> /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/version.py to version.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/__init__.py to __init__.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/syscall.py to syscall.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/perf.py to perf.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/containers.py to containers.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/libbcc.py to libbcc.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/table.py to table.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/tcp.py to tcp.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/utils.py to utils.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/disassembler.py to disassembler.cpython-36.pyc
byte-compiling /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc/usdt.py to usdt.cpython-36.pyc
running install_egg_info
Writing /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/lib/python3/dist-packages/bcc-0.20.0.egg-info
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/bin/bcc-lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/introspection/bps
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/hello_world.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/bashreadline.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/bashreadline.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/kprobe-latency.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/kprobe-write.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/memleak.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/offcputime.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/sock-parse-dns.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/sock-parse-http.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/sock-proto.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/sock-protolen.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/strlen_count.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/task_switch.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/tracepoint-offcputime.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/uprobe-readline-perf.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/uprobe-readline.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/uprobe-tailkt.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/lua/usdt_ruby.lua
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/simulation.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/simple_tc.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tc_perf_event.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/distributed_bridge/simulation.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/distributed_bridge/tunnel.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/distributed_bridge/tunnel_mesh.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/distributed_bridge/main.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/distributed_bridge/tunnel_mesh.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/distributed_bridge/tunnel.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/neighbor_sharing/README.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/neighbor_sharing/simulation.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/neighbor_sharing/tc_neighbor_sharing.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/neighbor_sharing/tc_neighbor_sharing.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/vlan_learning/README.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/vlan_learning/simulation.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/vlan_learning/vlan_learning.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/vlan_learning/vlan_learning.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/README.md
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/chord.png
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/monitor.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/simulation.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/vxlan.jpg
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/main.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/monitor.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/setup.sh
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/tunnel_monitor/traffic.sh
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/http_filter/http-parse-complete.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/http_filter/http-parse-simple.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/http_filter/README.md
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/http_filter/http-parse-complete.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/http_filter/http-parse-simple.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/xdp/xdp_drop_count.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/xdp/xdp_macswap_count.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/xdp/xdp_redirect_cpu.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/networking/xdp/xdp_redirect_map.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/biolatpcts.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/bitehist.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/dddos.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/disksnoop.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/hello_fields.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/hello_perf_output.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/hello_perf_output_using_ns.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/kvm_hypercall.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/mallocstacks.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/mysqld_query.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/nflatency.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/nodejs_http_server.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/stack_buildid_example.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/stacksnoop.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/strlen_count.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/strlen_hist.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/strlen_hist_ifunc.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/strlen_snoop.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/sync_timing.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/task_switch.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/tcpv4connect.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/trace_fields.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/trace_perf_output.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/urandomread-explicit.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/urandomread.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/vfsreadlat.py
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/task_switch.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/vfsreadlat.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/CMakeLists.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/biolatpcts_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/bitehist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/dddos_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/disksnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/kvm_hypercall.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/mysqld_query_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/nodejs_http_server_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/stacksnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/tcpv4connect_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/urandomread_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/examples/tracing/vfsreadlat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/argdist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/bashreadline.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/bindsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/biolatency.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/biolatpcts.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/biosnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/biotop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/bitesize.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/bpflist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/bps.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/btrfsdist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/btrfsslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/cachestat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/cachetop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/capable.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/cobjnew.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/compactsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/cpudist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/cpuunclaimed.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/criticalstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/cthreads.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/dbslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/dbstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/dcsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/dcstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/deadlock.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/dirtop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/drsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/execsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/exitsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/ext4dist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/ext4slower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/filelife.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/fileslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/filetop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/funccount.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/funcinterval.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/funclatency.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/funcslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/gethostlatency.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/hardirqs.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/inject.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/javacalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/javaflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/javagc.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/javaobjnew.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/javastat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/javathreads.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/killsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/klockstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/kvmexit.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/llcstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/mdflush.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/memleak.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/mountsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/mysqld_qslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/netqtop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/nfsdist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/nfsslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/nodegc.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/nodestat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/offcputime.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/offwaketime.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/oomkill.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/opensnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/perlcalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/perlflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/perlstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/phpcalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/phpflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/phpstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/pidpersec.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/profile.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/pythoncalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/pythonflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/pythongc.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/pythonstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/readahead.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/reset-trace.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/rubycalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/rubyflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/rubygc.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/rubyobjnew.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/rubystat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/runqlat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/runqlen.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/runqslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/shmsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/slabratetop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/sofdsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/softirqs.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/solisten.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/spfdsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/sslsniff.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/stackcount.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/statsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/swapin.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/syncsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/syscount.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tclcalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tclflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tclobjnew.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tclstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpaccept.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpconnect.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpconnlat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpdrop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcplife.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpretrans.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcprtt.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpstates.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpsubnet.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcpsynbl.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcptop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tcptracer.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/threadsnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/tplist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/trace.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/ttysnoop.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/ucalls.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/uflow.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/ugc.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/uobjnew.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/ustat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/uthreads.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/vfscount.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/vfsstat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/virtiostat.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/wakeuptime.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/xfsdist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/xfsslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/zfsdist.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/man/man8/zfsslower.8.gz
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/argdist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/bashreadline
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/bindsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/biolatency
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/biolatpcts
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/biosnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/biotop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/bitesize
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/bpflist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/btrfsdist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/btrfsslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/cachestat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/cachetop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/capable
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/compactsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/cpudist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/cpuunclaimed
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/criticalstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/dbslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/dbstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/dcsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/dcstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/deadlock
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/dirtop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/drsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/execsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/exitsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/ext4dist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/ext4slower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/filelife
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/fileslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/filetop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/funccount
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/funcinterval
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/funclatency
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/funcslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/gethostlatency
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/hardirqs
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/inject
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/killsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/klockstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/kvmexit
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/llcstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/mdflush
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/memleak
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/mountsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/mysqld_qslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/netqtop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/nfsdist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/nfsslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/offcputime
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/offwaketime
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/oomkill
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/opensnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/pidpersec
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/profile
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/readahead
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/runqlat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/runqlen
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/runqslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/shmsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/slabratetop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/sofdsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/softirqs
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/solisten
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/sslsniff
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/stackcount
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/statsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/swapin
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/syncsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/syscount
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpaccept
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpconnect
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpconnlat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpdrop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcplife
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpretrans
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcprtt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpstates
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpsubnet
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcpsynbl
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcptop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tcptracer
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/threadsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tplist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/trace
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/ttysnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/vfscount
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/vfsstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/virtiostat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/wakeuptime
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/xfsdist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/xfsslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/zfsdist
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/zfsslower
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/cobjnew
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/javacalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/javaflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/javagc
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/javaobjnew
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/javastat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/javathreads
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/nodegc
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/nodestat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/perlcalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/perlflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/perlstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/phpcalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/phpflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/phpstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/pythoncalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/pythonflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/pythongc
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/pythonstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/reset-trace
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/rubycalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/rubyflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/rubygc
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/rubyobjnew
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/rubystat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tclcalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tclflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tclobjnew
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/tclstat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/deadlock.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/netqtop.c
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/argdist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/bashreadline_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/bindsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/biolatency_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/biolatpcts_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/biosnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/biotop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/bitesize_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/bpflist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/btrfsdist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/btrfsslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/cachestat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/cachetop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/capable_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/cobjnew_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/compactsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/cpudist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/cpuunclaimed_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/criticalstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/cthreads_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/dbslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/dbstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/dcsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/dcstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/deadlock_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/dirtop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/drsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/execsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/exitsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/ext4dist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/ext4slower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/filelife_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/fileslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/filetop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/funccount_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/funcinterval_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/funclatency_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/funcslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/gethostlatency_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/hardirqs_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/inject_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/javacalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/javaflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/javagc_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/javaobjnew_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/javastat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/javathreads_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/killsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/klockstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/kvmexit_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/llcstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/mdflush_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/memleak_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/mountsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/mysqld_qslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/netqtop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/nfsdist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/nfsslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/nodegc_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/nodestat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/offcputime_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/offwaketime_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/oomkill_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/opensnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/perlcalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/perlflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/perlstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/phpcalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/phpflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/phpstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/pidpersec_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/profile_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/pythoncalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/pythonflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/pythongc_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/pythonstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/readahead_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/reset-trace_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/rubycalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/rubyflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/rubygc_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/rubyobjnew_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/rubystat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/runqlat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/runqlen_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/runqslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/shmsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/slabratetop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/sofdsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/softirqs_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/solisten_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/sslsniff_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/stackcount_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/statsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/swapin_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/syncsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/syscount_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tclcalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tclflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tclobjnew_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tclstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpaccept_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpconnect_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpconnlat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpdrop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcplife_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpretrans_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcprtt_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpstates_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpsubnet_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcpsynbl_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcptop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tcptracer_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/threadsnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/tplist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/trace_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/ttysnoop_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/vfscount_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/vfsstat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/virtiostat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/wakeuptime_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/xfsdist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/xfsslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/zfsdist_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/zfsslower_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/lib/ucalls
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/lib/uflow
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/lib/ugc
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/lib/uobjnew
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/lib/ustat
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/lib/uthreads
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/lib/ucalls_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/lib/uflow_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/lib/ugc_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/lib/uobjnew_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/lib/ustat_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/doc/lib/uthreads_example.txt
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/bashreadline
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/biosnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/compactsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/filelife
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/gethostlatency
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/hardirqs
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/killsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/memleak
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/offcputime
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/offwaketime
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/oomkill
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/opensnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/profile
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/softirqs
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/stackcount
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/stacksnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/statsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/syncsnoop
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/tcpaccept
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/tcpconnect
-- Installing: /tmp/debuild.1xf8Y7/bcc/debian/tmp/usr/share/bcc/tools/old/wakeuptime
make[1]: Leaving directory '/tmp/debuild.1xf8Y7/bcc/obj-x86_64-linux-gnu'
   dh_install -O--buildsystem=cmake -O--parallel
   dh_installdocs -O--buildsystem=cmake -O--parallel
   dh_installchangelogs -O--buildsystem=cmake -O--parallel
   dh_python2 -O--buildsystem=cmake -O--parallel
   dh_python3 -O--buildsystem=cmake -O--parallel
   dh_perl -O--buildsystem=cmake -O--parallel
   dh_link -O--buildsystem=cmake -O--parallel
   dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel
   dh_compress -O--buildsystem=cmake -O--parallel
   dh_fixperms -O--buildsystem=cmake -O--parallel
   dh_missing -O--buildsystem=cmake -O--parallel
   dh_strip -O--buildsystem=cmake -O--parallel
   dh_makeshlibs -O--buildsystem=cmake -O--parallel
   dh_shlibdeps -O--buildsystem=cmake -O--parallel
   dh_installdeb -O--buildsystem=cmake -O--parallel
   dh_gencontrol -O--buildsystem=cmake -O--parallel
dpkg-gencontrol: warning: package libbcc: unused substitution variable ${shlibs:Depends}
dpkg-gencontrol: warning: package python3-bcc: unused substitution variable ${python3:Depends}
dpkg-gencontrol: warning: package libbcc: unused substitution variable ${shlibs:Depends}
dpkg-gencontrol: warning: package bcc-tools: unused substitution variable ${shlibs:Depends}
dpkg-gencontrol: warning: package bcc-lua: unused substitution variable ${shlibs:Depends}
dpkg-gencontrol: warning: package python-bcc: unused substitution variable ${python:Depends}
dpkg-gencontrol: warning: package python-bcc: unused substitution variable ${python:Versions}
dpkg-gencontrol: warning: package python-bcc: unused substitution variable ${python:Provides}
   dh_md5sums -O--buildsystem=cmake -O--parallel
   dh_builddeb -O--buildsystem=cmake -O--parallel
dpkg-deb: building package 'python3-bcc' in '../python3-bcc_0.20.0-75.git.6c1ab211_all.deb'.
dpkg-deb: building package 'libbcc' in '../libbcc_0.20.0-75.git.6c1ab211_amd64.deb'.
dpkg-deb: building package 'bcc-tools' in '../bcc-tools_0.20.0-75.git.6c1ab211_all.deb'.
dpkg-deb: building package 'bcc-lua' in '../bcc-lua_0.20.0-75.git.6c1ab211_all.deb'.
dpkg-deb: building package 'libbcc-dbgsym' in 'debian/.debhelper/scratch-space/build-libbcc/libbcc-dbgsym_0.20.0-75.git.6c1ab211_amd64.deb'.
	Renaming libbcc-dbgsym_0.20.0-75.git.6c1ab211_amd64.deb to libbcc-dbgsym_0.20.0-75.git.6c1ab211_amd64.ddeb
dpkg-deb: building package 'libbcc-examples' in '../libbcc-examples_0.20.0-75.git.6c1ab211_amd64.deb'.
dpkg-deb: building package 'python-bcc' in '../python-bcc_0.20.0-75.git.6c1ab211_all.deb'.
 dpkg-genbuildinfo
 dpkg-genchanges  >../bcc_0.20.0-75.git.6c1ab211_amd64.changes
dpkg-genchanges: info: not including original source code in upload
 dpkg-source --after-build bcc
dpkg-buildpackage: info: binary and diff upload (original source NOT included)
Now running lintian...
W: bcc source: package-depends-on-hardcoded-libc libbcc depends
E: bcc source: source-is-missing libbpf-tools/bin/bpftool
W: bcc source: debhelper-but-no-misc-depends libbcc
W: bcc source: debhelper-but-no-misc-depends libbcc-examples
W: bcc source: debhelper-but-no-misc-depends python-bcc
W: bcc source: debhelper-but-no-misc-depends python3-bcc
W: bcc source: debhelper-but-no-misc-depends bcc-tools
W: bcc source: debhelper-but-no-misc-depends bcc-lua
W: bcc source: binary-nmu-debian-revision-in-source 0.20.0-75.git.6c1ab211
W: bcc source: missing-license-paragraph-in-dep5-copyright apache-2.0 (paragraph at line 5)
W: bcc source: ancient-standards-version 3.9.5 (current is 4.1.1)
E: bcc source: not-binnmuable-all-depends-any python-bcc -> libbcc
E: bcc source: not-binnmuable-all-depends-any python3-bcc -> libbcc
E: bcc source: not-binnmuable-all-depends-any bcc-lua -> libbcc
E: libbcc-examples: extended-description-is-empty
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/hello_world.py
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/bashreadline.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/kprobe-latency.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/kprobe-write.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/memleak.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/offcputime.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/sock-parse-dns.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/sock-parse-http.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/sock-proto.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/sock-protolen.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/strlen_count.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/task_switch.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/tracepoint-offcputime.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/uprobe-readline-perf.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/uprobe-readline.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/uprobe-tailkt.lua #!bcc-lua
W: libbcc-examples: unusual-interpreter usr/share/bcc/examples/lua/usdt_ruby.lua #!bcc-lua
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/distributed_bridge/main.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/distributed_bridge/tunnel.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/distributed_bridge/tunnel_mesh.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/http_filter/http-parse-complete.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/http_filter/http-parse-simple.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/neighbor_sharing/tc_neighbor_sharing.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/simple_tc.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/tc_perf_event.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/tunnel_monitor/main.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/tunnel_monitor/monitor.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/vlan_learning/vlan_learning.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/xdp/xdp_drop_count.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/xdp/xdp_macswap_count.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/xdp/xdp_redirect_cpu.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/networking/xdp/xdp_redirect_map.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/biolatpcts.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/bitehist.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/dddos.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/disksnoop.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/hello_fields.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/hello_perf_output.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/hello_perf_output_using_ns.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/kvm_hypercall.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/mallocstacks.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/mysqld_query.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/nflatency.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/nodejs_http_server.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/stack_buildid_example.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/stacksnoop.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/strlen_count.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/strlen_hist.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/strlen_hist_ifunc.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/strlen_snoop.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/sync_timing.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/task_switch.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/tcpv4connect.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/trace_fields.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/trace_perf_output.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/urandomread-explicit.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/urandomread.py
E: libbcc-examples: python-script-but-no-python-dep usr/share/bcc/examples/tracing/vfsreadlat.py
E: bcc-lua: arch-independent-package-contains-binary-or-object usr/bin/bcc-lua
E: bcc-lua: missing-dependency-on-libc needed by usr/bin/bcc-lua
E: bcc-lua: extended-description-is-empty
W: bcc-lua: binary-without-manpage usr/bin/bcc-lua
E: python3-bcc: extended-description-is-empty
W: python3-bcc: wrong-section-according-to-package-name python3-bcc => python
W: libbcc: package-name-doesnt-match-sonames libbcc0 libbcc-bpf0
W: libbcc: extra-license-file usr/share/doc/libbcc/LICENSE.txt.gz
W: libbcc: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/libbcc_bpf.so.0.20.0 usr/lib/x86_64-linux-gnu/libbcc_bpf.so
W: libbcc: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/libbcc.so.0.20.0 usr/lib/x86_64-linux-gnu/libbcc.so
E: python-bcc: extended-description-is-empty
W: python-bcc: wrong-section-according-to-package-name python-bcc => python
E: bcc-tools: arch-independent-package-contains-binary-or-object usr/share/bcc/introspection/bps
E: bcc-tools: arch-dependent-file-in-usr-share usr/share/bcc/introspection/bps
E: bcc-tools: missing-dependency-on-libc needed by usr/share/bcc/introspection/bps
E: bcc-tools: extended-description-is-empty
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/argdist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/bashreadline
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/bindsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/biolatency
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/biolatpcts
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/biosnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/biotop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/bitesize
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/bpflist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/btrfsdist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/btrfsslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/cachestat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/cachetop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/capable
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/compactsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/cpudist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/cpuunclaimed
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/criticalstat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/dbslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/dbstat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/dcsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/dcstat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/deadlock
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/dirtop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/drsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/execsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/exitsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/ext4dist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/ext4slower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/filelife
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/fileslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/filetop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/funccount
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/funcinterval
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/funclatency
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/funcslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/gethostlatency
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/hardirqs
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/inject
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/killsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/klockstat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/kvmexit
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/lib/ucalls
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/lib/uflow
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/lib/ugc
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/lib/uobjnew
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/lib/ustat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/lib/uthreads
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/llcstat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/mdflush
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/memleak
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/mountsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/mysqld_qslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/netqtop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/nfsdist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/nfsslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/offcputime
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/offwaketime
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/bashreadline
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/biosnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/compactsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/filelife
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/gethostlatency
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/hardirqs
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/killsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/memleak
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/offcputime
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/offwaketime
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/oomkill
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/opensnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/profile
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/softirqs
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/stackcount
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/stacksnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/statsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/syncsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/tcpaccept
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/tcpconnect
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/old/wakeuptime
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/oomkill
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/opensnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/pidpersec
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/profile
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/readahead
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/runqlat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/runqlen
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/runqslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/shmsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/slabratetop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/sofdsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/softirqs
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/solisten
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/sslsniff
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/stackcount
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/statsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/swapin
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/syncsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/syscount
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpaccept
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpconnect
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpconnlat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpdrop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcplife
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpretrans
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcprtt
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpstates
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpsubnet
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcpsynbl
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcptop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tcptracer
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/threadsnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/tplist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/trace
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/ttysnoop
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/vfscount
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/vfsstat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/virtiostat
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/wakeuptime
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/xfsdist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/xfsslower
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/zfsdist
E: bcc-tools: python-script-but-no-python-dep usr/share/bcc/tools/zfsslower
Finished running lintian.
+ popd
~/jenkins/workspace/bcc-pr/label/ubuntu1710
+ cp /tmp/debuild.1xf8Y7/bcc-lua_0.20.0-75.git.6c1ab211_all.deb /tmp/debuild.1xf8Y7/bcc-tools_0.20.0-75.git.6c1ab211_all.deb /tmp/debuild.1xf8Y7/libbcc-examples_0.20.0-75.git.6c1ab211_amd64.deb /tmp/debuild.1xf8Y7/libbcc_0.20.0-75.git.6c1ab211_amd64.deb /tmp/debuild.1xf8Y7/python-bcc_0.20.0-75.git.6c1ab211_all.deb /tmp/debuild.1xf8Y7/python3-bcc_0.20.0-75.git.6c1ab211_all.deb .
+ cleanup
+ [[ -d /tmp/debuild.1xf8Y7 ]]
+ rm -rf /tmp/debuild.1xf8Y7
+ sudo dpkg -i bcc-lua_0.20.0-75.git.6c1ab211_all.deb bcc-tools_0.20.0-75.git.6c1ab211_all.deb libbcc-examples_0.20.0-75.git.6c1ab211_amd64.deb libbcc_0.20.0-75.git.6c1ab211_amd64.deb python-bcc_0.20.0-75.git.6c1ab211_all.deb python3-bcc_0.20.0-75.git.6c1ab211_all.deb
Selecting previously unselected package bcc-lua.
(Reading database ... 86069 files and directories currently installed.)
Preparing to unpack bcc-lua_0.20.0-75.git.6c1ab211_all.deb ...
Unpacking bcc-lua (0.20.0-75.git.6c1ab211) ...
Selecting previously unselected package bcc-tools.
Preparing to unpack bcc-tools_0.20.0-75.git.6c1ab211_all.deb ...
Unpacking bcc-tools (0.20.0-75.git.6c1ab211) ...
Selecting previously unselected package libbcc-examples.
Preparing to unpack libbcc-examples_0.20.0-75.git.6c1ab211_amd64.deb ...
Unpacking libbcc-examples (0.20.0-75.git.6c1ab211) ...
Selecting previously unselected package libbcc.
Preparing to unpack libbcc_0.20.0-75.git.6c1ab211_amd64.deb ...
Unpacking libbcc (0.20.0-75.git.6c1ab211) ...
Selecting previously unselected package python-bcc.
Preparing to unpack python-bcc_0.20.0-75.git.6c1ab211_all.deb ...
Unpacking python-bcc (0.20.0-75.git.6c1ab211) ...
Selecting previously unselected package python3-bcc.
Preparing to unpack python3-bcc_0.20.0-75.git.6c1ab211_all.deb ...
Unpacking python3-bcc (0.20.0-75.git.6c1ab211) ...
Setting up libbcc (0.20.0-75.git.6c1ab211) ...
Setting up python-bcc (0.20.0-75.git.6c1ab211) ...
Setting up python3-bcc (0.20.0-75.git.6c1ab211) ...
Setting up bcc-lua (0.20.0-75.git.6c1ab211) ...
Setting up bcc-tools (0.20.0-75.git.6c1ab211) ...
Setting up libbcc-examples (0.20.0-75.git.6c1ab211) ...
Processing triggers for libc-bin (2.26-0ubuntu2.1) ...
+ mkdir upload
+ mv bcc-lua_0.20.0-75.git.6c1ab211_all.deb bcc-tools_0.20.0-75.git.6c1ab211_all.deb libbcc-examples_0.20.0-75.git.6c1ab211_amd64.deb libbcc_0.20.0-75.git.6c1ab211_amd64.deb python-bcc_0.20.0-75.git.6c1ab211_all.deb python3-bcc_0.20.0-75.git.6c1ab211_all.deb upload
[ubuntu1710] $ /bin/sh -xe /tmp/jenkins113752102780594335.sh
+ mkdir build
+ cd build
+ [[ ubuntu1710 ubuntu1710-slave-5a6 = *fc28* ]]
/tmp/jenkins113752102780594335.sh: 4: /tmp/jenkins113752102780594335.sh: [[: not found
+ cmake ..
-- The C compiler identification is GNU 7.2.0
-- The CXX compiler identification is GNU 7.2.0
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Latest recognized Git tag is v0.20.0
-- Git HEAD is 6c1ab2117de64ae967d03b025b7822b707c8c497
-- Revision is 0.20.0-6c1ab211
-- Performing Test HAVE_NO_PIE_FLAG
-- Performing Test HAVE_NO_PIE_FLAG - Success
-- Performing Test HAVE_REALLOCARRAY_SUPPORT
-- Performing Test HAVE_REALLOCARRAY_SUPPORT - Success
-- Found LLVM: /usr/lib/llvm-3.8/include 3.8.1
-- Found BISON: /usr/bin/bison (found version "3.0.4") 
-- Found FLEX: /usr/bin/flex (found version "2.6.1") 
-- Found LibElf: /usr/lib/x86_64-linux-gnu/libelf.so  
-- Performing Test ELF_GETSHDRSTRNDX
-- Performing Test ELF_GETSHDRSTRNDX - Success
-- Could NOT find LibDebuginfod (missing: LIBDEBUGINFOD_LIBRARIES LIBDEBUGINFOD_INCLUDE_DIRS) 
-- Using static-libstdc++
-- Found LuaJIT: /usr/lib/x86_64-linux-gnu/libluajit-5.1.a;/usr/lib/x86_64-linux-gnu/libdl.so;/usr/lib/x86_64-linux-gnu/libm.so  
-- Configuring done
-- Generating done
-- Build files have been written to: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build
+ make -j2 -C tests/cc
make: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/cc'
make[1]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target usdt_test_lib
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[  0%] Building CXX object tests/cc/CMakeFiles/usdt_test_lib.dir/usdt_test_lib.cc.o
[  2%] Linking CXX shared library libusdt_test_lib.so
Scanning dependencies of target clang_frontend
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[  5%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/loader.cc.o
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[  5%] Built target usdt_test_lib
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target bcc-loader-static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[  5%] Building CXX object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_syms.cc.o
[  5%] Building C object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_elf.c.o
[  7%] Building C object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_perf_map.c.o
[  7%] Building C object src/cc/CMakeFiles/bcc-loader-static.dir/bcc_proc.c.o
[  7%] Building CXX object src/cc/CMakeFiles/bcc-loader-static.dir/common.cc.o
[ 10%] Linking CXX static library libbcc-loader-static.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 10%] Built target bcc-loader-static
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target bpf-static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 13%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf.c.o
[ 13%] Building C object src/cc/CMakeFiles/bpf-static.dir/perf_reader.c.o
[ 13%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/bpf.c.o
[ 15%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/bpf_prog_linfo.c.o
[ 15%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/btf.c.o
[ 15%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/btf_dump.c.o
[ 18%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/gen_loader.c.o
[ 18%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/b_frontend_action.cc.o
[ 18%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/hashmap.c.o
[ 18%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/libbpf.c.o
[ 18%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/libbpf_errno.c.o
[ 21%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/libbpf_probes.c.o
[ 21%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/linker.c.o
[ 21%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/netlink.c.o
[ 23%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/nlattr.c.o
[ 23%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/ringbuf.c.o
[ 23%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/str_error.c.o
[ 26%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/strset.c.o
[ 26%] Building C object src/cc/CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o
[ 26%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/bcc_syms.cc.o
[ 28%] Building C object src/cc/CMakeFiles/bpf-static.dir/bcc_elf.c.o
[ 28%] Building C object src/cc/CMakeFiles/bpf-static.dir/bcc_perf_map.c.o
[ 28%] Building C object src/cc/CMakeFiles/bpf-static.dir/bcc_proc.c.o
[ 31%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/common.cc.o
[ 31%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/usdt/usdt.cc.o
[ 31%] Building CXX object src/cc/CMakeFiles/bpf-static.dir/usdt/usdt_args.cc.o
[ 34%] Linking CXX static library libbcc_bpf.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 34%] Built target bpf-static
[ 34%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/tp_frontend_action.cc.o
[ 36%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/kbuild_helper.cc.o
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/frontends/clang/kbuild_helper.cc:80:3: warning: multi-line comment [-Wcomment]
   // USERINCLUDE    := \
   ^
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/frontends/clang/kbuild_helper.cc:89:3: warning: multi-line comment [-Wcomment]
   // LINUXINCLUDE    := \
   ^
[ 36%] Building CXX object src/cc/frontends/clang/CMakeFiles/clang_frontend.dir/__/__/common.cc.o
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target api-static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 36%] Building CXX object src/cc/api/CMakeFiles/api-static.dir/BPF.cc.o
[ 36%] Linking CXX static library libclang_frontend.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 36%] Built target clang_frontend
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target usdt-static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 36%] Building CXX object src/cc/usdt/CMakeFiles/usdt-static.dir/usdt_args.cc.o
[ 39%] Building CXX object src/cc/api/CMakeFiles/api-static.dir/BPFTable.cc.o
[ 39%] Linking CXX static library libapi-static.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 39%] Built target api-static
[ 42%] Building CXX object src/cc/usdt/CMakeFiles/usdt-static.dir/usdt.cc.o
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 44%] [FLEX][Lexer] Building scanner with flex 2.6.1
lexer.ll:110: warning, -s option given but default rule can be matched
[ 44%] [BISON][Parser] Building parser with bison 3.0.4
parser.yy:19.9-17: warning: deprecated directive, use ‘%define api.namespace ebpf::cc’ [-Wdeprecated]
 %define namespace "ebpf::cc"
         ^^^^^^^^^
parser.yy:19.9-17: warning: %define variable 'api.namespace' requires '{...}' values [-Wdeprecated]
 %define namespace "ebpf::cc"
         ^^^^^^^^^
parser.yy:20.9-25: warning: %define variable 'parser_class_name' requires '{...}' values [-Wdeprecated]
 %define parser_class_name "BisonParser"
         ^^^^^^^^^^^^^^^^^
Scanning dependencies of target b_frontend
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 44%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/loader.cc.o
[ 44%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/codegen_llvm.cc.o
[ 44%] Linking CXX static library libusdt-static.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 44%] Built target usdt-static
[ 47%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/node.cc.o
[ 47%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/parser.cc.o
[ 47%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/printer.cc.o
[ 50%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/type_check.cc.o
[ 50%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/parser.yy.cc.o
[ 50%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/lexer.ll.cc.o
[ 52%] Linking CXX static library libb_frontend.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 52%] Built target b_frontend
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target bcc-shared
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target bcc-static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 52%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/link_all.cc.o
[ 52%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_common.cc.o
[ 55%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_common.cc.o
[ 57%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpf_module.cc.o
[ 57%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bpf_module.cc.o
[ 57%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_btf.cc.o
[ 57%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_btf.cc.o
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc: In member function ‘int ebpf::BTF::get_btf_info(const char*, void**, unsigned int*, unsigned int*, void**, unsigned int*, unsigned int*)’:
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:316:33: warning: ‘int btf_ext__reloc_func_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_func_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         func_info, func_info_cnt);
                                 ^
In file included from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_libbpf_inc.h:9:0,
                 from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:22:
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/libbpf/src/btf.h:80:5: note: declared here
 int btf_ext__reloc_func_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:323:33: warning: ‘int btf_ext__reloc_line_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_line_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         line_info, line_info_cnt);
                                 ^
In file included from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_libbpf_inc.h:9:0,
                 from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:22:
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/libbpf/src/btf.h:85:5: note: declared here
 int btf_ext__reloc_line_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc: In member function ‘int ebpf::BTF::get_btf_info(const char*, void**, unsigned int*, unsigned int*, void**, unsigned int*, unsigned int*)’:
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:316:33: warning: ‘int btf_ext__reloc_func_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_func_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         func_info, func_info_cnt);
                                 ^
In file included from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_libbpf_inc.h:9:0,
                 from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:22:
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/libbpf/src/btf.h:80:5: note: declared here
 int btf_ext__reloc_func_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:323:33: warning: ‘int btf_ext__reloc_line_info(const btf*, const btf_ext*, const char*, __u32, void**, __u32*)’ is deprecated: btf_ext__reloc_line_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions [-Wdeprecated-declarations]
         line_info, line_info_cnt);
                                 ^
In file included from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_libbpf_inc.h:9:0,
                 from /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/bcc_btf.cc:22:
/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/src/cc/libbpf/src/btf.h:85:5: note: declared here
 int btf_ext__reloc_line_info(const struct btf *btf,
     ^~~~~~~~~~~~~~~~~~~~~~~~
[ 57%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/exported_files.cc.o
[ 60%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/exported_files.cc.o
[ 63%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpf_module_rw_engine.cc.o
[ 63%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bpf_module_rw_engine.cc.o
[ 63%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/table_storage.cc.o
[ 63%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/table_storage.cc.o
[ 63%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/shared_table.cc.o
[ 63%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/shared_table.cc.o
[ 65%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpffs_table.cc.o
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bpffs_table.cc.o
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/json_map_decl_visitor.cc.o
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/json_map_decl_visitor.cc.o
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_syms.cc.o
[ 68%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/common.cc.o
[ 71%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/usdt/usdt.cc.o
[ 73%] Building C object src/cc/CMakeFiles/bcc-shared.dir/bcc_elf.c.o
[ 73%] Building C object src/cc/CMakeFiles/bcc-shared.dir/bcc_perf_map.c.o
[ 73%] Building C object src/cc/CMakeFiles/bcc-shared.dir/bcc_proc.c.o
[ 76%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/common.cc.o
[ 76%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/usdt/usdt_args.cc.o
[ 76%] Linking CXX shared library libbcc.so
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 76%] Built target bcc-shared
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target test_libbcc
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 76%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_libbcc.cc.o
[ 76%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_syms.cc.o
[ 78%] Building C object src/cc/CMakeFiles/bcc-static.dir/bcc_elf.c.o
[ 78%] Building C object src/cc/CMakeFiles/bcc-static.dir/bcc_perf_map.c.o
[ 78%] Building C object src/cc/CMakeFiles/bcc-static.dir/bcc_proc.c.o
[ 81%] Linking CXX static library libbcc.a
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 81%] Built target bcc-static
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
Scanning dependencies of target test_static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make[2]: Entering directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 84%] Building C object tests/cc/CMakeFiles/test_static.dir/test_static.c.o
[ 84%] Linking CXX executable test_static
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[ 84%] Built target test_static
[ 86%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_c_api.cc.o
[ 86%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_array_table.cc.o
[ 86%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_bpf_table.cc.o
[ 89%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_cg_storage.cc.o
[ 89%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_hash_table.cc.o
[ 89%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_map_in_map.cc.o
[ 92%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_perf_event.cc.o
[ 92%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_pinned_table.cc.o
[ 92%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_prog_table.cc.o
[ 94%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_queuestack_table.cc.o
[ 94%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_shared_table.cc.o
[ 94%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_sk_storage.cc.o
[ 97%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_sock_table.cc.o
[ 97%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_usdt_args.cc.o
[ 97%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_usdt_probes.cc.o
[100%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/utils.cc.o
[100%] Building CXX object tests/cc/CMakeFiles/test_libbcc.dir/test_parse_tracepoint.cc.o
[100%] Linking CXX executable test_libbcc
make[2]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
[100%] Built target test_libbcc
make[1]: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build'
make: Leaving directory '/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/cc'
+ ctest -V -D ExperimentalTest --no-compress-output
UpdateCTestConfiguration  from :/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/DartConfiguration.tcl
Cannot find file: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/DartConfiguration.tcl
   Site: 
   Build name: (empty)
Create new tag: 20210712-2013 - Experimental
UpdateCTestConfiguration  from :/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/DartConfiguration.tcl
Cannot find file: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/DartConfiguration.tcl
Test project /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build
Constructing a list of tests
Updating test list for fixtures
Added 0 tests to meet fixture requirements
Checking test dependency graph...
Checking test dependency graph end
test 1
      Start  1: style-check

1: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/scripts/c-style-check.sh
1: Test timeout computed to be: 9.99988e+06
1: diff --git a/introspection/bps.c b/introspection/bps.c
1: index 6ec02e6c..fe0e87b1 100644
1: --- a/introspection/bps.c
1: +++ b/introspection/bps.c
1: @@ -16,38 +16,38 @@
1:  #define CLOCK_BOOTTIME 7
1:  #endif
1:  
1: -static const char * const prog_type_strings[] = {
1: -  [BPF_PROG_TYPE_UNSPEC] = "unspec",
1: -  [BPF_PROG_TYPE_SOCKET_FILTER] = "socket filter",
1: -  [BPF_PROG_TYPE_KPROBE] = "kprobe",
1: -  [BPF_PROG_TYPE_SCHED_CLS] = "sched cls",
1: -  [BPF_PROG_TYPE_SCHED_ACT] = "sched act",
1: -  [BPF_PROG_TYPE_TRACEPOINT] = "tracepoint",
1: -  [BPF_PROG_TYPE_XDP] = "xdp",
1: -  [BPF_PROG_TYPE_PERF_EVENT] = "perf event",
1: -  [BPF_PROG_TYPE_CGROUP_SKB] = "cgroup skb",
1: -  [BPF_PROG_TYPE_CGROUP_SOCK] = "cgroup sock",
1: -  [BPF_PROG_TYPE_LWT_IN] = "lwt in",
1: -  [BPF_PROG_TYPE_LWT_OUT] = "lwt out",
1: -  [BPF_PROG_TYPE_LWT_XMIT] = "lwt xmit",
1: -  [BPF_PROG_TYPE_SOCK_OPS] = "sock ops",
1: -  [BPF_PROG_TYPE_SK_SKB] = "sk skb",
1: -  [BPF_PROG_TYPE_CGROUP_DEVICE] = "cgroup_device",
1: -  [BPF_PROG_TYPE_SK_MSG] = "sk_msg",
1: -  [BPF_PROG_TYPE_RAW_TRACEPOINT] = "raw_tracepoint",
1: -  [BPF_PROG_TYPE_CGROUP_SOCK_ADDR] = "cgroup_sock_addr",
1: -  [BPF_PROG_TYPE_LIRC_MODE2] = "lirc_mode2",
1: -  [BPF_PROG_TYPE_SK_REUSEPORT] = "sk_reuseport",
1: -  [BPF_PROG_TYPE_FLOW_DISSECTOR] = "flow_dissector",
1: -  [BPF_PROG_TYPE_CGROUP_SYSCTL] = "cgroup_sysctl",
1: -  [BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE] = "raw_tracepoint_writable",
1: -  [BPF_PROG_TYPE_CGROUP_SOCKOPT] = "cgroup_sockopt",
1: -  [BPF_PROG_TYPE_TRACING] = "tracing",
1: -  [BPF_PROG_TYPE_STRUCT_OPS] = "struct_ops",
1: -  [BPF_PROG_TYPE_EXT] = "ext",
1: -  [BPF_PROG_TYPE_LSM] = "lsm",
1: -  [BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup",
1: -  [BPF_PROG_TYPE_SYSCALL] = "syscall",
1: +static const char *const prog_type_strings[] = {
1: +        [BPF_PROG_TYPE_UNSPEC] = "unspec",
1: +        [BPF_PROG_TYPE_SOCKET_FILTER] = "socket filter",
1: +        [BPF_PROG_TYPE_KPROBE] = "kprobe",
1: +        [BPF_PROG_TYPE_SCHED_CLS] = "sched cls",
1: +        [BPF_PROG_TYPE_SCHED_ACT] = "sched act",
1: +        [BPF_PROG_TYPE_TRACEPOINT] = "tracepoint",
1: +        [BPF_PROG_TYPE_XDP] = "xdp",
1: +        [BPF_PROG_TYPE_PERF_EVENT] = "perf event",
1: +        [BPF_PROG_TYPE_CGROUP_SKB] = "cgroup skb",
1: +        [BPF_PROG_TYPE_CGROUP_SOCK] = "cgroup sock",
1: +        [BPF_PROG_TYPE_LWT_IN] = "lwt in",
1: +        [BPF_PROG_TYPE_LWT_OUT] = "lwt out",
1: +        [BPF_PROG_TYPE_LWT_XMIT] = "lwt xmit",
1: +        [BPF_PROG_TYPE_SOCK_OPS] = "sock ops",
1: +        [BPF_PROG_TYPE_SK_SKB] = "sk skb",
1: +        [BPF_PROG_TYPE_CGROUP_DEVICE] = "cgroup_device",
1: +        [BPF_PROG_TYPE_SK_MSG] = "sk_msg",
1: +        [BPF_PROG_TYPE_RAW_TRACEPOINT] = "raw_tracepoint",
1: +        [BPF_PROG_TYPE_CGROUP_SOCK_ADDR] = "cgroup_sock_addr",
1: +        [BPF_PROG_TYPE_LIRC_MODE2] = "lirc_mode2",
1: +        [BPF_PROG_TYPE_SK_REUSEPORT] = "sk_reuseport",
1: +        [BPF_PROG_TYPE_FLOW_DISSECTOR] = "flow_dissector",
1: +        [BPF_PROG_TYPE_CGROUP_SYSCTL] = "cgroup_sysctl",
1: +        [BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE] = "raw_tracepoint_writable",
1: +        [BPF_PROG_TYPE_CGROUP_SOCKOPT] = "cgroup_sockopt",
1: +        [BPF_PROG_TYPE_TRACING] = "tracing",
1: +        [BPF_PROG_TYPE_STRUCT_OPS] = "struct_ops",
1: +        [BPF_PROG_TYPE_EXT] = "ext",
1: +        [BPF_PROG_TYPE_LSM] = "lsm",
1: +        [BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup",
1: +        [BPF_PROG_TYPE_SYSCALL] = "syscall",
1:  };
1:  
1:  static const char * const map_type_strings[] = {
1: diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
1: index 7dc35b8c..ca092305 100644
1: --- a/src/cc/libbpf.c
1: +++ b/src/cc/libbpf.c
1: @@ -105,174 +105,174 @@ struct bpf_helper {
1:  };
1:  
1:  static struct bpf_helper helpers[] = {
1: -  {"map_lookup_elem", "3.19"},
1: -  {"map_update_elem", "3.19"},
1: -  {"map_delete_elem", "3.19"},
1: -  {"probe_read", "4.1"},
1: -  {"ktime_get_ns", "4.1"},
1: -  {"trace_printk", "4.1"},
1: -  {"get_prandom_u32", "4.1"},
1: -  {"get_smp_processor_id", "4.1"},
1: -  {"skb_store_bytes", "4.1"},
1: -  {"l3_csum_replace", "4.1"},
1: -  {"l4_csum_replace", "4.1"},
1: -  {"tail_call", "4.2"},
1: -  {"clone_redirect", "4.2"},
1: -  {"get_current_pid_tgid", "4.2"},
1: -  {"get_current_uid_gid", "4.2"},
1: -  {"get_current_comm", "4.2"},
1: -  {"get_cgroup_classid", "4.3"},
1: -  {"skb_vlan_push", "4.3"},
1: -  {"skb_vlan_pop", "4.3"},
1: -  {"skb_get_tunnel_key", "4.3"},
1: -  {"skb_set_tunnel_key", "4.3"},
1: -  {"perf_event_read", "4.3"},
1: -  {"redirect", "4.4"},
1: -  {"get_route_realm", "4.4"},
1: -  {"perf_event_output", "4.4"},
1: -  {"skb_load_bytes", "4.5"},
1: -  {"get_stackid", "4.6"},
1: -  {"csum_diff", "4.6"},
1: -  {"skb_get_tunnel_opt", "4.6"},
1: -  {"skb_set_tunnel_opt", "4.6"},
1: -  {"skb_change_proto", "4.8"},
1: -  {"skb_change_type", "4.8"},
1: -  {"skb_under_cgroup", "4.8"},
1: -  {"get_hash_recalc", "4.8"},
1: -  {"get_current_task", "4.8"},
1: -  {"probe_write_user", "4.8"},
1: -  {"current_task_under_cgroup", "4.9"},
1: -  {"skb_change_tail", "4.9"},
1: -  {"skb_pull_data", "4.9"},
1: -  {"csum_update", "4.9"},
1: -  {"set_hash_invalid", "4.9"},
1: -  {"get_numa_node_id", "4.10"},
1: -  {"skb_change_head", "4.10"},
1: -  {"xdp_adjust_head", "4.10"},
1: -  {"probe_read_str", "4.11"},
1: -  {"get_socket_cookie", "4.12"},
1: -  {"get_socket_uid", "4.12"},
1: -  {"set_hash", "4.13"},
1: -  {"setsockopt", "4.13"},
1: -  {"skb_adjust_room", "4.13"},
1: -  {"redirect_map", "4.14"},
1: -  {"sk_redirect_map", "4.14"},
1: -  {"sock_map_update", "4.14"},
1: -  {"xdp_adjust_meta", "4.15"},
1: -  {"perf_event_read_value", "4.15"},
1: -  {"perf_prog_read_value", "4.15"},
1: -  {"getsockopt", "4.15"},
1: -  {"override_return", "4.16"},
1: -  {"sock_ops_cb_flags_set", "4.16"},
1: -  {"msg_redirect_map", "4.17"},
1: -  {"msg_apply_bytes", "4.17"},
1: -  {"msg_cork_bytes", "4.17"},
1: -  {"msg_pull_data", "4.17"},
1: -  {"bind", "4.17"},
1: -  {"xdp_adjust_tail", "4.18"},
1: -  {"skb_get_xfrm_state", "4.18"},
1: -  {"get_stack", "4.18"},
1: -  {"skb_load_bytes_relative", "4.18"},
1: -  {"fib_lookup", "4.18"},
1: -  {"sock_hash_update", "4.18"},
1: -  {"msg_redirect_hash", "4.18"},
1: -  {"sk_redirect_hash", "4.18"},
1: -  {"lwt_push_encap", "4.18"},
1: -  {"lwt_seg6_store_bytes", "4.18"},
1: -  {"lwt_seg6_adjust_srh", "4.18"},
1: -  {"lwt_seg6_action", "4.18"},
1: -  {"rc_repeat", "4.18"},
1: -  {"rc_keydown", "4.18"},
1: -  {"skb_cgroup_id", "4.18"},
1: -  {"get_current_cgroup_id", "4.18"},
1: -  {"get_local_storage", "4.19"},
1: -  {"sk_select_reuseport", "4.19"},
1: -  {"skb_ancestor_cgroup_id", "4.19"},
1: -  {"sk_lookup_tcp", "4.20"},
1: -  {"sk_lookup_udp", "4.20"},
1: -  {"sk_release", "4.20"},
1: -  {"map_push_elem", "4.20"},
1: -  {"map_pop_elem", "4.20"},
1: -  {"map_peak_elem", "4.20"},
1: -  {"msg_push_data", "4.20"},
1: -  {"msg_pop_data", "5.0"},
1: -  {"rc_pointer_rel", "5.0"},
1: -  {"spin_lock", "5.1"},
1: -  {"spin_unlock", "5.1"},
1: -  {"sk_fullsock", "5.1"},
1: -  {"tcp_sock", "5.1"},
1: -  {"skb_ecn_set_ce", "5.1"},
1: -  {"get_listener_sock", "5.1"},
1: -  {"skc_lookup_tcp", "5.2"},
1: -  {"tcp_check_syncookie", "5.2"},
1: -  {"sysctl_get_name", "5.2"},
1: -  {"sysctl_get_current_value", "5.2"},
1: -  {"sysctl_get_new_value", "5.2"},
1: -  {"sysctl_set_new_value", "5.2"},
1: -  {"strtol", "5.2"},
1: -  {"strtoul", "5.2"},
1: -  {"sk_storage_get", "5.2"},
1: -  {"sk_storage_delete", "5.2"},
1: -  {"send_signal", "5.3"},
1: -  {"tcp_gen_syncookie", "5.3"},
1: -  {"skb_output", "5.5"},
1: -  {"probe_read_user", "5.5"},
1: -  {"probe_read_kernel", "5.5"},
1: -  {"probe_read_user_str", "5.5"},
1: -  {"probe_read_kernel_str", "5.5"},
1: -  {"tcp_send_ack", "5.5"},
1: -  {"send_signal_thread", "5.5"},
1: -  {"jiffies64", "5.5"},
1: -  {"read_branch_records", "5.6"},
1: -  {"get_ns_current_pid_tgid", "5.6"},
1: -  {"xdp_output", "5.6"},
1: -  {"get_netns_cookie", "5.6"},
1: -  {"get_current_ancestor_cgroup_id", "5.6"},
1: -  {"sk_assign", "5.6"},
1: -  {"ktime_get_boot_ns", "5.7"},
1: -  {"seq_printf", "5.7"},
1: -  {"seq_write", "5.7"},
1: -  {"sk_cgroup_id", "5.7"},
1: -  {"sk_ancestor_cgroup_id", "5.7"},
1: -  {"csum_level", "5.7"},
1: -  {"ringbuf_output", "5.8"},
1: -  {"ringbuf_reserve", "5.8"},
1: -  {"ringbuf_submit", "5.8"},
1: -  {"ringbuf_discard", "5.8"},
1: -  {"ringbuf_query", "5.8"},
1: -  {"skc_to_tcp6_sock", "5.9"},
1: -  {"skc_to_tcp_sock", "5.9"},
1: -  {"skc_to_tcp_timewait_sock", "5.9"},
1: -  {"skc_to_tcp_request_sock", "5.9"},
1: -  {"skc_to_udp6_sock", "5.9"},
1: -  {"get_task_stack", "5.9"},
1: -  {"load_hdr_opt", "5.10"},
1: -  {"store_hdr_opt", "5.10"},
1: -  {"reserve_hdr_opt", "5.10"},
1: -  {"inode_storage_get", "5.10"},
1: -  {"inode_storage_delete", "5.10"},
1: -  {"d_path", "5.10"},
1: -  {"copy_from_user", "5.10"},
1: -  {"snprintf_btf", "5.10"},
1: -  {"seq_printf_btf", "5.10"},
1: -  {"skb_cgroup_classid", "5.10"},
1: -  {"redirect_neigh", "5.10"},
1: -  {"per_cpu_ptr", "5.10"},
1: -  {"this_cpu_ptr", "5.10"},
1: -  {"redirect_peer", "5.10"},
1: -  {"task_storage_get", "5.11"},
1: -  {"task_storage_delete", "5.11"},
1: -  {"get_current_task_btf", "5.11"},
1: -  {"bprm_opts_set", "5.11"},
1: -  {"ktime_get_coarse_ns", "5.11"},
1: -  {"ima_inode_hash", "5.11"},
1: -  {"sock_from_file", "5.11"},
1: -  {"check_mtu", "5.12"},
1: -  {"for_each_map_elem", "5.13"},
1: -  {"snprintf", "5.13"},
1: -  {"sys_bpf", "5.14"},
1: -  {"btf_find_by_name_kind", "5.14"},
1: -  {"sys_close", "5.14"},
1: +    {"map_lookup_elem", "3.19"},
1: +    {"map_update_elem", "3.19"},
1: +    {"map_delete_elem", "3.19"},
1: +    {"probe_read", "4.1"},
1: +    {"ktime_get_ns", "4.1"},
1: +    {"trace_printk", "4.1"},
1: +    {"get_prandom_u32", "4.1"},
1: +    {"get_smp_processor_id", "4.1"},
1: +    {"skb_store_bytes", "4.1"},
1: +    {"l3_csum_replace", "4.1"},
1: +    {"l4_csum_replace", "4.1"},
1: +    {"tail_call", "4.2"},
1: +    {"clone_redirect", "4.2"},
1: +    {"get_current_pid_tgid", "4.2"},
1: +    {"get_current_uid_gid", "4.2"},
1: +    {"get_current_comm", "4.2"},
1: +    {"get_cgroup_classid", "4.3"},
1: +    {"skb_vlan_push", "4.3"},
1: +    {"skb_vlan_pop", "4.3"},
1: +    {"skb_get_tunnel_key", "4.3"},
1: +    {"skb_set_tunnel_key", "4.3"},
1: +    {"perf_event_read", "4.3"},
1: +    {"redirect", "4.4"},
1: +    {"get_route_realm", "4.4"},
1: +    {"perf_event_output", "4.4"},
1: +    {"skb_load_bytes", "4.5"},
1: +    {"get_stackid", "4.6"},
1: +    {"csum_diff", "4.6"},
1: +    {"skb_get_tunnel_opt", "4.6"},
1: +    {"skb_set_tunnel_opt", "4.6"},
1: +    {"skb_change_proto", "4.8"},
1: +    {"skb_change_type", "4.8"},
1: +    {"skb_under_cgroup", "4.8"},
1: +    {"get_hash_recalc", "4.8"},
1: +    {"get_current_task", "4.8"},
1: +    {"probe_write_user", "4.8"},
1: +    {"current_task_under_cgroup", "4.9"},
1: +    {"skb_change_tail", "4.9"},
1: +    {"skb_pull_data", "4.9"},
1: +    {"csum_update", "4.9"},
1: +    {"set_hash_invalid", "4.9"},
1: +    {"get_numa_node_id", "4.10"},
1: +    {"skb_change_head", "4.10"},
1: +    {"xdp_adjust_head", "4.10"},
1: +    {"probe_read_str", "4.11"},
1: +    {"get_socket_cookie", "4.12"},
1: +    {"get_socket_uid", "4.12"},
1: +    {"set_hash", "4.13"},
1: +    {"setsockopt", "4.13"},
1: +    {"skb_adjust_room", "4.13"},
1: +    {"redirect_map", "4.14"},
1: +    {"sk_redirect_map", "4.14"},
1: +    {"sock_map_update", "4.14"},
1: +    {"xdp_adjust_meta", "4.15"},
1: +    {"perf_event_read_value", "4.15"},
1: +    {"perf_prog_read_value", "4.15"},
1: +    {"getsockopt", "4.15"},
1: +    {"override_return", "4.16"},
1: +    {"sock_ops_cb_flags_set", "4.16"},
1: +    {"msg_redirect_map", "4.17"},
1: +    {"msg_apply_bytes", "4.17"},
1: +    {"msg_cork_bytes", "4.17"},
1: +    {"msg_pull_data", "4.17"},
1: +    {"bind", "4.17"},
1: +    {"xdp_adjust_tail", "4.18"},
1: +    {"skb_get_xfrm_state", "4.18"},
1: +    {"get_stack", "4.18"},
1: +    {"skb_load_bytes_relative", "4.18"},
1: +    {"fib_lookup", "4.18"},
1: +    {"sock_hash_update", "4.18"},
1: +    {"msg_redirect_hash", "4.18"},
1: +    {"sk_redirect_hash", "4.18"},
1: +    {"lwt_push_encap", "4.18"},
1: +    {"lwt_seg6_store_bytes", "4.18"},
1: +    {"lwt_seg6_adjust_srh", "4.18"},
1: +    {"lwt_seg6_action", "4.18"},
1: +    {"rc_repeat", "4.18"},
1: +    {"rc_keydown", "4.18"},
1: +    {"skb_cgroup_id", "4.18"},
1: +    {"get_current_cgroup_id", "4.18"},
1: +    {"get_local_storage", "4.19"},
1: +    {"sk_select_reuseport", "4.19"},
1: +    {"skb_ancestor_cgroup_id", "4.19"},
1: +    {"sk_lookup_tcp", "4.20"},
1: +    {"sk_lookup_udp", "4.20"},
1: +    {"sk_release", "4.20"},
1: +    {"map_push_elem", "4.20"},
1: +    {"map_pop_elem", "4.20"},
1: +    {"map_peak_elem", "4.20"},
1: +    {"msg_push_data", "4.20"},
1: +    {"msg_pop_data", "5.0"},
1: +    {"rc_pointer_rel", "5.0"},
1: +    {"spin_lock", "5.1"},
1: +    {"spin_unlock", "5.1"},
1: +    {"sk_fullsock", "5.1"},
1: +    {"tcp_sock", "5.1"},
1: +    {"skb_ecn_set_ce", "5.1"},
1: +    {"get_listener_sock", "5.1"},
1: +    {"skc_lookup_tcp", "5.2"},
1: +    {"tcp_check_syncookie", "5.2"},
1: +    {"sysctl_get_name", "5.2"},
1: +    {"sysctl_get_current_value", "5.2"},
1: +    {"sysctl_get_new_value", "5.2"},
1: +    {"sysctl_set_new_value", "5.2"},
1: +    {"strtol", "5.2"},
1: +    {"strtoul", "5.2"},
1: +    {"sk_storage_get", "5.2"},
1: +    {"sk_storage_delete", "5.2"},
1: +    {"send_signal", "5.3"},
1: +    {"tcp_gen_syncookie", "5.3"},
1: +    {"skb_output", "5.5"},
1: +    {"probe_read_user", "5.5"},
1: +    {"probe_read_kernel", "5.5"},
1: +    {"probe_read_user_str", "5.5"},
1: +    {"probe_read_kernel_str", "5.5"},
1: +    {"tcp_send_ack", "5.5"},
1: +    {"send_signal_thread", "5.5"},
1: +    {"jiffies64", "5.5"},
1: +    {"read_branch_records", "5.6"},
1: +    {"get_ns_current_pid_tgid", "5.6"},
1: +    {"xdp_output", "5.6"},
1: +    {"get_netns_cookie", "5.6"},
1: +    {"get_current_ancestor_cgroup_id", "5.6"},
1: +    {"sk_assign", "5.6"},
1: +    {"ktime_get_boot_ns", "5.7"},
1: +    {"seq_printf", "5.7"},
1: +    {"seq_write", "5.7"},
1: +    {"sk_cgroup_id", "5.7"},
1: +    {"sk_ancestor_cgroup_id", "5.7"},
1: +    {"csum_level", "5.7"},
1: +    {"ringbuf_output", "5.8"},
1: +    {"ringbuf_reserve", "5.8"},
1: +    {"ringbuf_submit", "5.8"},
1: +    {"ringbuf_discard", "5.8"},
1: +    {"ringbuf_query", "5.8"},
1: +    {"skc_to_tcp6_sock", "5.9"},
1: +    {"skc_to_tcp_sock", "5.9"},
1: +    {"skc_to_tcp_timewait_sock", "5.9"},
1: +    {"skc_to_tcp_request_sock", "5.9"},
1: +    {"skc_to_udp6_sock", "5.9"},
1: +    {"get_task_stack", "5.9"},
1: +    {"load_hdr_opt", "5.10"},
1: +    {"store_hdr_opt", "5.10"},
1: +    {"reserve_hdr_opt", "5.10"},
1: +    {"inode_storage_get", "5.10"},
1: +    {"inode_storage_delete", "5.10"},
1: +    {"d_path", "5.10"},
1: +    {"copy_from_user", "5.10"},
1: +    {"snprintf_btf", "5.10"},
1: +    {"seq_printf_btf", "5.10"},
1: +    {"skb_cgroup_classid", "5.10"},
1: +    {"redirect_neigh", "5.10"},
1: +    {"per_cpu_ptr", "5.10"},
1: +    {"this_cpu_ptr", "5.10"},
1: +    {"redirect_peer", "5.10"},
1: +    {"task_storage_get", "5.11"},
1: +    {"task_storage_delete", "5.11"},
1: +    {"get_current_task_btf", "5.11"},
1: +    {"bprm_opts_set", "5.11"},
1: +    {"ktime_get_coarse_ns", "5.11"},
1: +    {"ima_inode_hash", "5.11"},
1: +    {"sock_from_file", "5.11"},
1: +    {"check_mtu", "5.12"},
1: +    {"for_each_map_elem", "5.13"},
1: +    {"snprintf", "5.13"},
1: +    {"sys_bpf", "5.14"},
1: +    {"btf_find_by_name_kind", "5.14"},
1: +    {"sys_close", "5.14"},
1:  };
1:  
1:  static uint64_t ptr_to_u64(void *ptr)
1: diff --git a/src/cc/libbpf/include/linux/compiler.h b/src/cc/libbpf/include/linux/compiler.h
1: index 26336dc7..5bdf3eb4 100644
1: --- a/src/cc/libbpf/include/linux/compiler.h
1: +++ b/src/cc/libbpf/include/linux/compiler.h
1: @@ -3,68 +3,68 @@
1:  #ifndef __LINUX_COMPILER_H
1:  #define __LINUX_COMPILER_H
1:  
1: -#define likely(x)		__builtin_expect(!!(x), 1)
1: -#define unlikely(x)		__builtin_expect(!!(x), 0)
1: +#define likely(x) __builtin_expect(!!(x), 1)
1: +#define unlikely(x) __builtin_expect(!!(x), 0)
1:  
1: -#define READ_ONCE(x)		(*(volatile typeof(x) *)&x)
1: -#define WRITE_ONCE(x, v)	(*(volatile typeof(x) *)&x) = (v)
1: +#define READ_ONCE(x) (*(volatile typeof(x) *)&x)
1: +#define WRITE_ONCE(x, v) (*(volatile typeof(x) *)&x) = (v)
1:  
1: -#define barrier()		asm volatile("" ::: "memory")
1: +#define barrier() asm volatile("" ::: "memory")
1:  
1:  #if defined(__x86_64__)
1:  
1: -# define smp_rmb()		barrier()
1: -# define smp_wmb()		barrier()
1: -# define smp_mb()		asm volatile("lock; addl $0,-132(%%rsp)" ::: "memory", "cc")
1: +#define smp_rmb() barrier()
1: +#define smp_wmb() barrier()
1: +#define smp_mb() asm volatile("lock; addl $0,-132(%%rsp)" ::: "memory", "cc")
1:  
1: -# define smp_store_release(p, v)		\
1: -do {						\
1: -	barrier();				\
1: -	WRITE_ONCE(*p, v);			\
1: -} while (0)
1: +#define smp_store_release(p, v) \
1: +  do {                          \
1: +    barrier();                  \
1: +    WRITE_ONCE(*p, v);          \
1: +  } while (0)
1:  
1: -# define smp_load_acquire(p)			\
1: -({						\
1: -	typeof(*p) ___p = READ_ONCE(*p);	\
1: -	barrier();				\
1: -	___p;					\
1: -})
1: +#define smp_load_acquire(p)          \
1: +  ({                                 \
1: +    typeof(*p) ___p = READ_ONCE(*p); \
1: +    barrier();                       \
1: +    ___p;                            \
1: +  })
1:  
1:  #elif defined(__aarch64__)
1:  
1: -# define smp_rmb()		asm volatile("dmb ishld" ::: "memory")
1: -# define smp_wmb()		asm volatile("dmb ishst" ::: "memory")
1: -# define smp_mb()		asm volatile("dmb ish" ::: "memory")
1: +#define smp_rmb() asm volatile("dmb ishld" ::: "memory")
1: +#define smp_wmb() asm volatile("dmb ishst" ::: "memory")
1: +#define smp_mb() asm volatile("dmb ish" ::: "memory")
1:  
1:  #endif
1:  
1:  #ifndef smp_mb
1: -# define smp_mb()		__sync_synchronize()
1: +#define smp_mb() __sync_synchronize()
1:  #endif
1:  
1:  #ifndef smp_rmb
1: -# define smp_rmb()		smp_mb()
1: +#define smp_rmb() smp_mb()
1:  #endif
1:  
1:  #ifndef smp_wmb
1: -# define smp_wmb()		smp_mb()
1: +#define smp_wmb() smp_mb()
1:  #endif
1:  
1:  #ifndef smp_store_release
1: -# define smp_store_release(p, v)		\
1: -do {						\
1: -	smp_mb();				\
1: -	WRITE_ONCE(*p, v);			\
1: -} while (0)
1: +#define smp_store_release(p, v) \
1: +  do {                          \
1: +    smp_mb();                   \
1: +    WRITE_ONCE(*p, v);          \
1: +  } while (0)
1:  #endif
1:  
1:  #ifndef smp_load_acquire
1: -# define smp_load_acquire(p)			\
1: -({						\
1: -	typeof(*p) ___p = READ_ONCE(*p);	\
1: -	smp_mb();				\
1: -	___p;					\
1: -})
1: +#define smp_load_acquire(p)          \
1: +  ({                                 \
1: +    typeof(*p) ___p = READ_ONCE(*p); \
1: +    smp_mb();                        \
1: +    ___p;                            \
1: +  })
1:  #endif
1:  
1:  #endif /* __LINUX_COMPILER_H */
1: diff --git a/src/cc/libbpf/include/linux/err.h b/src/cc/libbpf/include/linux/err.h
1: index 1b1dafbc..665a9081 100644
1: --- a/src/cc/libbpf/include/linux/err.h
1: +++ b/src/cc/libbpf/include/linux/err.h
1: @@ -3,36 +3,27 @@
1:  #ifndef __LINUX_ERR_H
1:  #define __LINUX_ERR_H
1:  
1: -#include <linux/types.h>
1:  #include <asm/errno.h>
1: +#include <linux/types.h>
1:  
1: -#define MAX_ERRNO       4095
1: +#define MAX_ERRNO 4095
1:  
1:  #define IS_ERR_VALUE(x) ((x) >= (unsigned long)-MAX_ERRNO)
1:  
1: -static inline void * ERR_PTR(long error_)
1: -{
1: -	return (void *) error_;
1: -}
1: +static inline void *ERR_PTR(long error_) { return (void *)error_; }
1:  
1: -static inline long PTR_ERR(const void *ptr)
1: -{
1: -	return (long) ptr;
1: -}
1: +static inline long PTR_ERR(const void *ptr) { return (long)ptr; }
1:  
1: -static inline bool IS_ERR(const void *ptr)
1: -{
1: -	return IS_ERR_VALUE((unsigned long)ptr);
1: +static inline bool IS_ERR(const void *ptr) {
1: +  return IS_ERR_VALUE((unsigned long)ptr);
1:  }
1:  
1: -static inline bool IS_ERR_OR_NULL(const void *ptr)
1: -{
1: -	return (!ptr) || IS_ERR_VALUE((unsigned long)ptr);
1: +static inline bool IS_ERR_OR_NULL(const void *ptr) {
1: +  return (!ptr) || IS_ERR_VALUE((unsigned long)ptr);
1:  }
1:  
1: -static inline long PTR_ERR_OR_ZERO(const void *ptr)
1: -{
1: -	return IS_ERR(ptr) ? PTR_ERR(ptr) : 0;
1: +static inline long PTR_ERR_OR_ZERO(const void *ptr) {
1: +  return IS_ERR(ptr) ? PTR_ERR(ptr) : 0;
1:  }
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/include/linux/filter.h b/src/cc/libbpf/include/linux/filter.h
1: index 8c25a009..e146241e 100644
1: --- a/src/cc/libbpf/include/linux/filter.h
1: +++ b/src/cc/libbpf/include/linux/filter.h
1: @@ -5,122 +5,100 @@
1:  
1:  #include <linux/bpf.h>
1:  
1: -#define BPF_RAW_INSN(CODE, DST, SRC, OFF, IMM)			\
1: -	((struct bpf_insn) {					\
1: -		.code = CODE,					\
1: -		.dst_reg = DST,					\
1: -		.src_reg = SRC,					\
1: -		.off = OFF,					\
1: -		.imm = IMM })
1: -
1: -#define BPF_ALU64_IMM(OP, DST, IMM)				\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_ALU64 | BPF_OP(OP) | BPF_K,	\
1: -		.dst_reg = DST,					\
1: -		.src_reg = 0,					\
1: -		.off   = 0,					\
1: -		.imm   = IMM })
1: -
1: -#define BPF_MOV64_IMM(DST, IMM)					\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_ALU64 | BPF_MOV | BPF_K,		\
1: -		.dst_reg = DST,					\
1: -		.src_reg = 0,					\
1: -		.off   = 0,					\
1: -		.imm   = IMM })
1: -
1: -#define BPF_EXIT_INSN()						\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_JMP | BPF_EXIT,			\
1: -		.dst_reg = 0,					\
1: -		.src_reg = 0,					\
1: -		.off   = 0,					\
1: -		.imm   = 0 })
1: -
1: -#define BPF_EMIT_CALL(FUNC)					\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_JMP | BPF_CALL,			\
1: -		.dst_reg = 0,					\
1: -		.src_reg = 0,					\
1: -		.off   = 0,					\
1: -		.imm   = ((FUNC) - BPF_FUNC_unspec) })
1: -
1: -#define BPF_LDX_MEM(SIZE, DST, SRC, OFF)			\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM,	\
1: -		.dst_reg = DST,					\
1: -		.src_reg = SRC,					\
1: -		.off   = OFF,					\
1: -		.imm   = 0 })
1: -
1: -#define BPF_STX_MEM(SIZE, DST, SRC, OFF)			\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_STX | BPF_SIZE(SIZE) | BPF_MEM,	\
1: -		.dst_reg = DST,					\
1: -		.src_reg = SRC,					\
1: -		.off   = OFF,					\
1: -		.imm   = 0 })
1: -
1: -#define BPF_ST_MEM(SIZE, DST, OFF, IMM)				\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_ST | BPF_SIZE(SIZE) | BPF_MEM,	\
1: -		.dst_reg = DST,					\
1: -		.src_reg = 0,					\
1: -		.off   = OFF,					\
1: -		.imm   = IMM })
1: -
1: -#define BPF_MOV64_REG(DST, SRC)					\
1: -	((struct bpf_insn) {					\
1: -		.code  = BPF_ALU64 | BPF_MOV | BPF_X,		\
1: -		.dst_reg = DST,					\
1: -		.src_reg = SRC,					\
1: -		.off   = 0,					\
1: -		.imm   = 0 })
1: -
1: -#define BPF_MOV32_IMM(DST, IMM)					\
1: -	((struct bpf_insn) {					\
1: -		.code = BPF_ALU | BPF_MOV | BPF_K,		\
1: -		.dst_reg = DST,					\
1: -		.src_reg = 0,					\
1: -		.off   = 0,					\
1: -		.imm   = IMM })
1: -
1: -#define BPF_LD_IMM64_RAW_FULL(DST, SRC, OFF1, OFF2, IMM1, IMM2)	\
1: -	((struct bpf_insn) {					\
1: -		.code = BPF_LD | BPF_DW | BPF_IMM,		\
1: -		.dst_reg = DST,					\
1: -		.src_reg = SRC,					\
1: -		.off   = OFF1,					\
1: -		.imm   = IMM1 }),			\
1: -	((struct bpf_insn) {					\
1: -		.code  = 0,					\
1: -		.dst_reg = 0,					\
1: -		.src_reg = 0,					\
1: -		.off   = OFF2,					\
1: -		.imm   = IMM2 })
1: -
1: -#define BPF_LD_MAP_FD(DST, MAP_FD)				\
1: -	BPF_LD_IMM64_RAW_FULL(DST, BPF_PSEUDO_MAP_FD, 0, 0,	\
1: -			      MAP_FD, 0)
1: -
1: -#define BPF_LD_MAP_VALUE(DST, MAP_FD, VALUE_OFF)		\
1: -	BPF_LD_IMM64_RAW_FULL(DST, BPF_PSEUDO_MAP_VALUE, 0, 0,	\
1: -			      MAP_FD, VALUE_OFF)
1: -
1: -#define BPF_JMP_IMM(OP, DST, IMM, OFF)				\
1: -	((struct bpf_insn) {					\
1: -		.code = BPF_JMP | BPF_OP(OP) | BPF_K,		\
1: -		.dst_reg = DST,					\
1: -		.src_reg = 0,					\
1: -		.off  = OFF,					\
1: -		.imm  = IMM })
1: -
1: -#define BPF_JMP32_IMM(OP, DST, IMM, OFF)			\
1: -	((struct bpf_insn) {					\
1: -		.code = BPF_JMP32 | BPF_OP(OP) | BPF_K,		\
1: -		.dst_reg = DST,					\
1: -		.src_reg = 0,					\
1: -		.off  = OFF,					\
1: -		.imm  = IMM })
1: +#define BPF_RAW_INSN(CODE, DST, SRC, OFF, IMM) \
1: +  ((struct bpf_insn){                          \
1: +      .code = CODE, .dst_reg = DST, .src_reg = SRC, .off = OFF, .imm = IMM})
1: +
1: +#define BPF_ALU64_IMM(OP, DST, IMM)                          \
1: +  ((struct bpf_insn){.code = BPF_ALU64 | BPF_OP(OP) | BPF_K, \
1: +                     .dst_reg = DST,                         \
1: +                     .src_reg = 0,                           \
1: +                     .off = 0,                               \
1: +                     .imm = IMM})
1: +
1: +#define BPF_MOV64_IMM(DST, IMM)                           \
1: +  ((struct bpf_insn){.code = BPF_ALU64 | BPF_MOV | BPF_K, \
1: +                     .dst_reg = DST,                      \
1: +                     .src_reg = 0,                        \
1: +                     .off = 0,                            \
1: +                     .imm = IMM})
1: +
1: +#define BPF_EXIT_INSN()                          \
1: +  ((struct bpf_insn){.code = BPF_JMP | BPF_EXIT, \
1: +                     .dst_reg = 0,               \
1: +                     .src_reg = 0,               \
1: +                     .off = 0,                   \
1: +                     .imm = 0})
1: +
1: +#define BPF_EMIT_CALL(FUNC)                      \
1: +  ((struct bpf_insn){.code = BPF_JMP | BPF_CALL, \
1: +                     .dst_reg = 0,               \
1: +                     .src_reg = 0,               \
1: +                     .off = 0,                   \
1: +                     .imm = ((FUNC)-BPF_FUNC_unspec)})
1: +
1: +#define BPF_LDX_MEM(SIZE, DST, SRC, OFF)                         \
1: +  ((struct bpf_insn){.code = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM, \
1: +                     .dst_reg = DST,                             \
1: +                     .src_reg = SRC,                             \
1: +                     .off = OFF,                                 \
1: +                     .imm = 0})
1: +
1: +#define BPF_STX_MEM(SIZE, DST, SRC, OFF)                         \
1: +  ((struct bpf_insn){.code = BPF_STX | BPF_SIZE(SIZE) | BPF_MEM, \
1: +                     .dst_reg = DST,                             \
1: +                     .src_reg = SRC,                             \
1: +                     .off = OFF,                                 \
1: +                     .imm = 0})
1: +
1: +#define BPF_ST_MEM(SIZE, DST, OFF, IMM)                         \
1: +  ((struct bpf_insn){.code = BPF_ST | BPF_SIZE(SIZE) | BPF_MEM, \
1: +                     .dst_reg = DST,                            \
1: +                     .src_reg = 0,                              \
1: +                     .off = OFF,                                \
1: +                     .imm = IMM})
1: +
1: +#define BPF_MOV64_REG(DST, SRC)                           \
1: +  ((struct bpf_insn){.code = BPF_ALU64 | BPF_MOV | BPF_X, \
1: +                     .dst_reg = DST,                      \
1: +                     .src_reg = SRC,                      \
1: +                     .off = 0,                            \
1: +                     .imm = 0})
1: +
1: +#define BPF_MOV32_IMM(DST, IMM)                         \
1: +  ((struct bpf_insn){.code = BPF_ALU | BPF_MOV | BPF_K, \
1: +                     .dst_reg = DST,                    \
1: +                     .src_reg = 0,                      \
1: +                     .off = 0,                          \
1: +                     .imm = IMM})
1: +
1: +#define BPF_LD_IMM64_RAW_FULL(DST, SRC, OFF1, OFF2, IMM1, IMM2) \
1: +  ((struct bpf_insn){.code = BPF_LD | BPF_DW | BPF_IMM,         \
1: +                     .dst_reg = DST,                            \
1: +                     .src_reg = SRC,                            \
1: +                     .off = OFF1,                               \
1: +                     .imm = IMM1}),                             \
1: +      ((struct bpf_insn){                                       \
1: +          .code = 0, .dst_reg = 0, .src_reg = 0, .off = OFF2, .imm = IMM2})
1: +
1: +#define BPF_LD_MAP_FD(DST, MAP_FD) \
1: +  BPF_LD_IMM64_RAW_FULL(DST, BPF_PSEUDO_MAP_FD, 0, 0, MAP_FD, 0)
1: +
1: +#define BPF_LD_MAP_VALUE(DST, MAP_FD, VALUE_OFF) \
1: +  BPF_LD_IMM64_RAW_FULL(DST, BPF_PSEUDO_MAP_VALUE, 0, 0, MAP_FD, VALUE_OFF)
1: +
1: +#define BPF_JMP_IMM(OP, DST, IMM, OFF)                     \
1: +  ((struct bpf_insn){.code = BPF_JMP | BPF_OP(OP) | BPF_K, \
1: +                     .dst_reg = DST,                       \
1: +                     .src_reg = 0,                         \
1: +                     .off = OFF,                           \
1: +                     .imm = IMM})
1: +
1: +#define BPF_JMP32_IMM(OP, DST, IMM, OFF)                     \
1: +  ((struct bpf_insn){.code = BPF_JMP32 | BPF_OP(OP) | BPF_K, \
1: +                     .dst_reg = DST,                         \
1: +                     .src_reg = 0,                           \
1: +                     .off = OFF,                             \
1: +                     .imm = IMM})
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/include/linux/kernel.h b/src/cc/libbpf/include/linux/kernel.h
1: index a4a7a9d6..e35701a4 100644
1: --- a/src/cc/libbpf/include/linux/kernel.h
1: +++ b/src/cc/libbpf/include/linux/kernel.h
1: @@ -4,41 +4,46 @@
1:  #define __LINUX_KERNEL_H
1:  
1:  #ifndef offsetof
1: -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
1: +#define offsetof(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
1:  #endif
1:  
1:  #ifndef container_of
1: -#define container_of(ptr, type, member) ({			\
1: -	const typeof(((type *)0)->member) * __mptr = (ptr);	\
1: -	(type *)((char *)__mptr - offsetof(type, member)); })
1: +#define container_of(ptr, type, member)                \
1: +  ({                                                   \
1: +    const typeof(((type *)0)->member) *__mptr = (ptr); \
1: +    (type *)((char *)__mptr - offsetof(type, member)); \
1: +  })
1:  #endif
1:  
1:  #ifndef max
1: -#define max(x, y) ({				\
1: -	typeof(x) _max1 = (x);			\
1: -	typeof(y) _max2 = (y);			\
1: -	(void) (&_max1 == &_max2);		\
1: -	_max1 > _max2 ? _max1 : _max2; })
1: +#define max(x, y)                  \
1: +  ({                               \
1: +    typeof(x) _max1 = (x);         \
1: +    typeof(y) _max2 = (y);         \
1: +    (void)(&_max1 == &_max2);      \
1: +    _max1 > _max2 ? _max1 : _max2; \
1: +  })
1:  #endif
1:  
1:  #ifndef min
1: -#define min(x, y) ({				\
1: -	typeof(x) _min1 = (x);			\
1: -	typeof(y) _min2 = (y);			\
1: -	(void) (&_min1 == &_min2);		\
1: -	_min1 < _min2 ? _min1 : _min2; })
1: +#define min(x, y)                  \
1: +  ({                               \
1: +    typeof(x) _min1 = (x);         \
1: +    typeof(y) _min2 = (y);         \
1: +    (void)(&_min1 == &_min2);      \
1: +    _min1 < _min2 ? _min1 : _min2; \
1: +  })
1:  #endif
1:  
1:  #ifndef roundup
1: -#define roundup(x, y) (				\
1: -{						\
1: -	const typeof(y) __y = y;		\
1: -	(((x) + (__y - 1)) / __y) * __y;	\
1: -}						\
1: -)
1: +#define roundup(x, y)                \
1: +  ({                                 \
1: +    const typeof(y) __y = y;         \
1: +    (((x) + (__y - 1)) / __y) * __y; \
1: +  })
1:  #endif
1:  
1:  #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
1: -#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
1: +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/include/linux/list.h b/src/cc/libbpf/include/linux/list.h
1: index fc91c34e..3d5699b7 100644
1: --- a/src/cc/libbpf/include/linux/list.h
1: +++ b/src/cc/libbpf/include/linux/list.h
1: @@ -3,29 +3,25 @@
1:  #ifndef __LINUX_LIST_H
1:  #define __LINUX_LIST_H
1:  
1: -#define LIST_HEAD_INIT(name) { &(name), &(name) }
1: -#define LIST_HEAD(name) \
1: -        struct list_head name = LIST_HEAD_INIT(name)
1: +#define LIST_HEAD_INIT(name) \
1: +  { &(name), &(name) }
1: +#define LIST_HEAD(name) struct list_head name = LIST_HEAD_INIT(name)
1:  
1:  #define POISON_POINTER_DELTA 0
1: -#define LIST_POISON1  ((void *) 0x100 + POISON_POINTER_DELTA)
1: -#define LIST_POISON2  ((void *) 0x200 + POISON_POINTER_DELTA)
1: +#define LIST_POISON1 ((void *)0x100 + POISON_POINTER_DELTA)
1: +#define LIST_POISON2 ((void *)0x200 + POISON_POINTER_DELTA)
1:  
1: -
1: -static inline void INIT_LIST_HEAD(struct list_head *list)
1: -{
1: -        list->next = list;
1: -        list->prev = list;
1: +static inline void INIT_LIST_HEAD(struct list_head *list) {
1: +  list->next = list;
1: +  list->prev = list;
1:  }
1:  
1: -static inline void __list_add(struct list_head *new,
1: -                              struct list_head *prev,
1: -                              struct list_head *next)
1: -{
1: -        next->prev = new;
1: -        new->next = next;
1: -        new->prev = prev;
1: -        prev->next = new;
1: +static inline void __list_add(struct list_head *new, struct list_head *prev,
1: +                              struct list_head *next) {
1: +  next->prev = new;
1: +  new->next = next;
1: +  new->prev = prev;
1: +  prev->next = new;
1:  }
1:  
1:  /**
1: @@ -36,9 +32,8 @@ static inline void __list_add(struct list_head *new,
1:   * Insert a new entry after the specified head.
1:   * This is good for implementing stacks.
1:   */
1: -static inline void list_add(struct list_head *new, struct list_head *head)
1: -{
1: -        __list_add(new, head, head->next);
1: +static inline void list_add(struct list_head *new, struct list_head *head) {
1: +  __list_add(new, head, head->next);
1:  }
1:  
1:  /*
1: @@ -48,10 +43,9 @@ static inline void list_add(struct list_head *new, struct list_head *head)
1:   * This is only for internal list manipulation where we know
1:   * the prev/next entries already!
1:   */
1: -static inline void __list_del(struct list_head * prev, struct list_head * next)
1: -{
1: -        next->prev = prev;
1: -        prev->next = next;
1: +static inline void __list_del(struct list_head *prev, struct list_head *next) {
1: +  next->prev = prev;
1: +  prev->next = next;
1:  }
1:  
1:  /**
1: @@ -60,32 +54,27 @@ static inline void __list_del(struct list_head * prev, struct list_head * next)
1:   * Note: list_empty() on entry does not return true after this, the entry is
1:   * in an undefined state.
1:   */
1: -static inline void __list_del_entry(struct list_head *entry)
1: -{
1: -        __list_del(entry->prev, entry->next);
1: +static inline void __list_del_entry(struct list_head *entry) {
1: +  __list_del(entry->prev, entry->next);
1:  }
1:  
1: -static inline void list_del(struct list_head *entry)
1: -{
1: -        __list_del(entry->prev, entry->next);
1: -        entry->next = LIST_POISON1;
1: -        entry->prev = LIST_POISON2;
1: +static inline void list_del(struct list_head *entry) {
1: +  __list_del(entry->prev, entry->next);
1: +  entry->next = LIST_POISON1;
1: +  entry->prev = LIST_POISON2;
1:  }
1:  
1: -static inline int list_empty(const struct list_head *head)
1: -{
1: -	return head->next == head;
1: +static inline int list_empty(const struct list_head *head) {
1: +  return head->next == head;
1:  }
1:  
1: -#define list_entry(ptr, type, member) \
1: -        container_of(ptr, type, member)
1: +#define list_entry(ptr, type, member) container_of(ptr, type, member)
1:  #define list_first_entry(ptr, type, member) \
1: -        list_entry((ptr)->next, type, member)
1: +  list_entry((ptr)->next, type, member)
1:  #define list_next_entry(pos, member) \
1: -        list_entry((pos)->member.next, typeof(*(pos)), member)
1: -#define list_for_each_entry(pos, head, member) \
1: -	for (pos = list_first_entry(head, typeof(*pos), member); \
1: -	     &pos->member != (head); \
1: -	     pos = list_next_entry(pos, member))
1: +  list_entry((pos)->member.next, typeof(*(pos)), member)
1: +#define list_for_each_entry(pos, head, member)             \
1: +  for (pos = list_first_entry(head, typeof(*pos), member); \
1: +       &pos->member != (head); pos = list_next_entry(pos, member))
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/include/linux/overflow.h b/src/cc/libbpf/include/linux/overflow.h
1: index 53d75803..3c83bcd0 100644
1: --- a/src/cc/libbpf/include/linux/overflow.h
1: +++ b/src/cc/libbpf/include/linux/overflow.h
1: @@ -3,19 +3,19 @@
1:  #ifndef __LINUX_OVERFLOW_H
1:  #define __LINUX_OVERFLOW_H
1:  
1: -#define is_signed_type(type)	(((type)(-1)) < (type)1)
1: -#define __type_half_max(type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type)))
1: +#define is_signed_type(type) (((type)(-1)) < (type)1)
1: +#define __type_half_max(type) \
1: +  ((type)1 << (8 * sizeof(type) - 1 - is_signed_type(type)))
1:  #define type_max(T) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))
1: -#define type_min(T) ((T)((T)-type_max(T)-(T)1))
1: +#define type_min(T) ((T)((T)-type_max(T) - (T)1))
1:  
1:  #ifndef unlikely
1: -#define unlikely(x)	__builtin_expect(!!(x), 0)
1: +#define unlikely(x) __builtin_expect(!!(x), 0)
1:  #endif
1:  
1:  #ifdef __GNUC__
1: -#define GCC_VERSION (__GNUC__ * 10000           \
1: -                     + __GNUC_MINOR__ * 100     \
1: -                     + __GNUC_PATCHLEVEL__)
1: +#define GCC_VERSION \
1: +  (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
1:  #if GCC_VERSION >= 50100
1:  #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
1:  #endif
1: @@ -23,31 +23,32 @@
1:  
1:  #ifdef COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW
1:  
1: -#define check_mul_overflow(a, b, d) ({		\
1: -	typeof(a) __a = (a);			\
1: -	typeof(b) __b = (b);			\
1: -	typeof(d) __d = (d);			\
1: -	(void) (&__a == &__b);			\
1: -	(void) (&__a == __d);			\
1: -	__builtin_mul_overflow(__a, __b, __d);	\
1: -})
1: +#define check_mul_overflow(a, b, d)        \
1: +  ({                                       \
1: +    typeof(a) __a = (a);                   \
1: +    typeof(b) __b = (b);                   \
1: +    typeof(d) __d = (d);                   \
1: +    (void)(&__a == &__b);                  \
1: +    (void)(&__a == __d);                   \
1: +    __builtin_mul_overflow(__a, __b, __d); \
1: +  })
1:  
1:  #else
1:  
1:  /*
1:   * If one of a or b is a compile-time constant, this avoids a division.
1:   */
1: -#define __unsigned_mul_overflow(a, b, d) ({		\
1: -	typeof(a) __a = (a);				\
1: -	typeof(b) __b = (b);				\
1: -	typeof(d) __d = (d);				\
1: -	(void) (&__a == &__b);				\
1: -	(void) (&__a == __d);				\
1: -	*__d = __a * __b;				\
1: -	__builtin_constant_p(__b) ?			\
1: -	  __b > 0 && __a > type_max(typeof(__a)) / __b : \
1: -	  __a > 0 && __b > type_max(typeof(__b)) / __a;	 \
1: -})
1: +#define __unsigned_mul_overflow(a, b, d)                                      \
1: +  ({                                                                          \
1: +    typeof(a) __a = (a);                                                      \
1: +    typeof(b) __b = (b);                                                      \
1: +    typeof(d) __d = (d);                                                      \
1: +    (void)(&__a == &__b);                                                     \
1: +    (void)(&__a == __d);                                                      \
1: +    *__d = __a * __b;                                                         \
1: +    __builtin_constant_p(__b) ? __b > 0 && __a > type_max(typeof(__a)) / __b  \
1: +                              : __a > 0 && __b > type_max(typeof(__b)) / __a; \
1: +  })
1:  
1:  /*
1:   * Signed multiplication is rather hard. gcc always follows C99, so
1: @@ -65,25 +66,26 @@
1:   * code and warns about the limited range of __b.
1:   */
1:  
1: -#define __signed_mul_overflow(a, b, d) ({				\
1: -	typeof(a) __a = (a);						\
1: -	typeof(b) __b = (b);						\
1: -	typeof(d) __d = (d);						\
1: -	typeof(a) __tmax = type_max(typeof(a));				\
1: -	typeof(a) __tmin = type_min(typeof(a));				\
1: -	(void) (&__a == &__b);						\
1: -	(void) (&__a == __d);						\
1: -	*__d = (__u64)__a * (__u64)__b;					\
1: -	(__b > 0   && (__a > __tmax/__b || __a < __tmin/__b)) ||	\
1: -	(__b < (typeof(__b))-1  && (__a > __tmin/__b || __a < __tmax/__b)) || \
1: -	(__b == (typeof(__b))-1 && __a == __tmin);			\
1: -})
1: -
1: -#define check_mul_overflow(a, b, d)					\
1: -	__builtin_choose_expr(is_signed_type(typeof(a)),		\
1: -			__signed_mul_overflow(a, b, d),			\
1: -			__unsigned_mul_overflow(a, b, d))
1: +#define __signed_mul_overflow(a, b, d)                         \
1: +  ({                                                           \
1: +    typeof(a) __a = (a);                                       \
1: +    typeof(b) __b = (b);                                       \
1: +    typeof(d) __d = (d);                                       \
1: +    typeof(a) __tmax = type_max(typeof(a));                    \
1: +    typeof(a) __tmin = type_min(typeof(a));                    \
1: +    (void)(&__a == &__b);                                      \
1: +    (void)(&__a == __d);                                       \
1: +    *__d = (__u64)__a * (__u64)__b;                            \
1: +    (__b > 0 && (__a > __tmax / __b || __a < __tmin / __b)) || \
1: +        (__b < (typeof(__b)) - 1 &&                            \
1: +         (__a > __tmin / __b || __a < __tmax / __b)) ||        \
1: +        (__b == (typeof(__b)) - 1 && __a == __tmin);           \
1: +  })
1:  
1: +#define check_mul_overflow(a, b, d)                     \
1: +  __builtin_choose_expr(is_signed_type(typeof(a)),      \
1: +                        __signed_mul_overflow(a, b, d), \
1: +                        __unsigned_mul_overflow(a, b, d))
1:  
1:  #endif /* COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW */
1:  
1: diff --git a/src/cc/libbpf/include/linux/ring_buffer.h b/src/cc/libbpf/include/linux/ring_buffer.h
1: index fc4677bc..21d91dba 100644
1: --- a/src/cc/libbpf/include/linux/ring_buffer.h
1: +++ b/src/cc/libbpf/include/linux/ring_buffer.h
1: @@ -4,15 +4,13 @@
1:  
1:  #include <linux/compiler.h>
1:  
1: -static inline __u64 ring_buffer_read_head(struct perf_event_mmap_page *base)
1: -{
1: -	return smp_load_acquire(&base->data_head);
1: +static inline __u64 ring_buffer_read_head(struct perf_event_mmap_page *base) {
1: +  return smp_load_acquire(&base->data_head);
1:  }
1:  
1:  static inline void ring_buffer_write_tail(struct perf_event_mmap_page *base,
1: -					  __u64 tail)
1: -{
1: -	smp_store_release(&base->data_tail, tail);
1: +                                          __u64 tail) {
1: +  smp_store_release(&base->data_tail, tail);
1:  }
1:  
1:  #endif /* _TOOLS_LINUX_RING_BUFFER_H_ */
1: diff --git a/src/cc/libbpf/include/linux/types.h b/src/cc/libbpf/include/linux/types.h
1: index bae1ed8f..39dc68b3 100644
1: --- a/src/cc/libbpf/include/linux/types.h
1: +++ b/src/cc/libbpf/include/linux/types.h
1: @@ -7,8 +7,8 @@
1:  #include <stddef.h>
1:  #include <stdint.h>
1:  
1: -#include <asm/types.h>
1:  #include <asm/posix_types.h>
1: +#include <asm/types.h>
1:  
1:  #define __bitwise__
1:  #define __bitwise __bitwise__
1: @@ -21,11 +21,11 @@ typedef __u64 __bitwise __le64;
1:  typedef __u64 __bitwise __be64;
1:  
1:  #ifndef __aligned_u64
1: -# define __aligned_u64 __u64 __attribute__((aligned(8)))
1: +#define __aligned_u64 __u64 __attribute__((aligned(8)))
1:  #endif
1:  
1:  struct list_head {
1: -	struct list_head *next, *prev;
1: +  struct list_head *next, *prev;
1:  };
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/include/uapi/linux/bpf.h b/src/cc/libbpf/include/uapi/linux/bpf.h
1: index bf9252c7..9e68e928 100644
1: --- a/src/cc/libbpf/include/uapi/linux/bpf.h
1: +++ b/src/cc/libbpf/include/uapi/linux/bpf.h
1: @@ -8,89 +8,89 @@
1:  #ifndef _UAPI__LINUX_BPF_H__
1:  #define _UAPI__LINUX_BPF_H__
1:  
1: -#include <linux/types.h>
1:  #include <linux/bpf_common.h>
1: +#include <linux/types.h>
1:  
1:  /* Extended instruction set based on top of classic BPF */
1:  
1:  /* instruction classes */
1: -#define BPF_JMP32	0x06	/* jmp mode in word width */
1: -#define BPF_ALU64	0x07	/* alu mode in double word width */
1: +#define BPF_JMP32 0x06 /* jmp mode in word width */
1: +#define BPF_ALU64 0x07 /* alu mode in double word width */
1:  
1:  /* ld/ldx fields */
1: -#define BPF_DW		0x18	/* double word (64-bit) */
1: -#define BPF_ATOMIC	0xc0	/* atomic memory ops - op type in immediate */
1: -#define BPF_XADD	0xc0	/* exclusive add - legacy name */
1: +#define BPF_DW 0x18     /* double word (64-bit) */
1: +#define BPF_ATOMIC 0xc0 /* atomic memory ops - op type in immediate */
1: +#define BPF_XADD 0xc0   /* exclusive add - legacy name */
1:  
1:  /* alu/jmp fields */
1: -#define BPF_MOV		0xb0	/* mov reg to reg */
1: -#define BPF_ARSH	0xc0	/* sign extending arithmetic shift right */
1: +#define BPF_MOV 0xb0  /* mov reg to reg */
1: +#define BPF_ARSH 0xc0 /* sign extending arithmetic shift right */
1:  
1:  /* change endianness of a register */
1: -#define BPF_END		0xd0	/* flags for endianness conversion: */
1: -#define BPF_TO_LE	0x00	/* convert to little-endian */
1: -#define BPF_TO_BE	0x08	/* convert to big-endian */
1: -#define BPF_FROM_LE	BPF_TO_LE
1: -#define BPF_FROM_BE	BPF_TO_BE
1: +#define BPF_END 0xd0   /* flags for endianness conversion: */
1: +#define BPF_TO_LE 0x00 /* convert to little-endian */
1: +#define BPF_TO_BE 0x08 /* convert to big-endian */
1: +#define BPF_FROM_LE BPF_TO_LE
1: +#define BPF_FROM_BE BPF_TO_BE
1:  
1:  /* jmp encodings */
1: -#define BPF_JNE		0x50	/* jump != */
1: -#define BPF_JLT		0xa0	/* LT is unsigned, '<' */
1: -#define BPF_JLE		0xb0	/* LE is unsigned, '<=' */
1: -#define BPF_JSGT	0x60	/* SGT is signed '>', GT in x86 */
1: -#define BPF_JSGE	0x70	/* SGE is signed '>=', GE in x86 */
1: -#define BPF_JSLT	0xc0	/* SLT is signed, '<' */
1: -#define BPF_JSLE	0xd0	/* SLE is signed, '<=' */
1: -#define BPF_CALL	0x80	/* function call */
1: -#define BPF_EXIT	0x90	/* function return */
1: +#define BPF_JNE 0x50  /* jump != */
1: +#define BPF_JLT 0xa0  /* LT is unsigned, '<' */
1: +#define BPF_JLE 0xb0  /* LE is unsigned, '<=' */
1: +#define BPF_JSGT 0x60 /* SGT is signed '>', GT in x86 */
1: +#define BPF_JSGE 0x70 /* SGE is signed '>=', GE in x86 */
1: +#define BPF_JSLT 0xc0 /* SLT is signed, '<' */
1: +#define BPF_JSLE 0xd0 /* SLE is signed, '<=' */
1: +#define BPF_CALL 0x80 /* function call */
1: +#define BPF_EXIT 0x90 /* function return */
1:  
1:  /* atomic op type fields (stored in immediate) */
1: -#define BPF_FETCH	0x01	/* not an opcode on its own, used to build others */
1: -#define BPF_XCHG	(0xe0 | BPF_FETCH)	/* atomic exchange */
1: -#define BPF_CMPXCHG	(0xf0 | BPF_FETCH)	/* atomic compare-and-write */
1: +#define BPF_FETCH 0x01 /* not an opcode on its own, used to build others */
1: +#define BPF_XCHG (0xe0 | BPF_FETCH)    /* atomic exchange */
1: +#define BPF_CMPXCHG (0xf0 | BPF_FETCH) /* atomic compare-and-write */
1:  
1:  /* Register numbers */
1:  enum {
1: -	BPF_REG_0 = 0,
1: -	BPF_REG_1,
1: -	BPF_REG_2,
1: -	BPF_REG_3,
1: -	BPF_REG_4,
1: -	BPF_REG_5,
1: -	BPF_REG_6,
1: -	BPF_REG_7,
1: -	BPF_REG_8,
1: -	BPF_REG_9,
1: -	BPF_REG_10,
1: -	__MAX_BPF_REG,
1: +  BPF_REG_0 = 0,
1: +  BPF_REG_1,
1: +  BPF_REG_2,
1: +  BPF_REG_3,
1: +  BPF_REG_4,
1: +  BPF_REG_5,
1: +  BPF_REG_6,
1: +  BPF_REG_7,
1: +  BPF_REG_8,
1: +  BPF_REG_9,
1: +  BPF_REG_10,
1: +  __MAX_BPF_REG,
1:  };
1:  
1:  /* BPF has 10 general purpose 64-bit registers and stack frame. */
1: -#define MAX_BPF_REG	__MAX_BPF_REG
1: +#define MAX_BPF_REG __MAX_BPF_REG
1:  
1:  struct bpf_insn {
1: -	__u8	code;		/* opcode */
1: -	__u8	dst_reg:4;	/* dest register */
1: -	__u8	src_reg:4;	/* source register */
1: -	__s16	off;		/* signed offset */
1: -	__s32	imm;		/* signed immediate constant */
1: +  __u8 code;        /* opcode */
1: +  __u8 dst_reg : 4; /* dest register */
1: +  __u8 src_reg : 4; /* source register */
1: +  __s16 off;        /* signed offset */
1: +  __s32 imm;        /* signed immediate constant */
1:  };
1:  
1:  /* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
1:  struct bpf_lpm_trie_key {
1: -	__u32	prefixlen;	/* up to 32 for AF_INET, 128 for AF_INET6 */
1: -	__u8	data[0];	/* Arbitrary size */
1: +  __u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */
1: +  __u8 data[0];    /* Arbitrary size */
1:  };
1:  
1:  struct bpf_cgroup_storage_key {
1: -	__u64	cgroup_inode_id;	/* cgroup inode id */
1: -	__u32	attach_type;		/* program attach type */
1: +  __u64 cgroup_inode_id; /* cgroup inode id */
1: +  __u32 attach_type;     /* program attach type */
1:  };
1:  
1:  union bpf_iter_link_info {
1: -	struct {
1: -		__u32	map_fd;
1: -	} map;
1: +  struct {
1: +    __u32 map_fd;
1: +  } map;
1:  };
1:  
1:  /* BPF syscall commands, see bpf(2) man-page for more details. */
1: @@ -839,76 +839,76 @@ union bpf_iter_link_info {
1:   *	filesystem or attached (for example, bound to a program or device).
1:   */
1:  enum bpf_cmd {
1: -	BPF_MAP_CREATE,
1: -	BPF_MAP_LOOKUP_ELEM,
1: -	BPF_MAP_UPDATE_ELEM,
1: -	BPF_MAP_DELETE_ELEM,
1: -	BPF_MAP_GET_NEXT_KEY,
1: -	BPF_PROG_LOAD,
1: -	BPF_OBJ_PIN,
1: -	BPF_OBJ_GET,
1: -	BPF_PROG_ATTACH,
1: -	BPF_PROG_DETACH,
1: -	BPF_PROG_TEST_RUN,
1: -	BPF_PROG_RUN = BPF_PROG_TEST_RUN,
1: -	BPF_PROG_GET_NEXT_ID,
1: -	BPF_MAP_GET_NEXT_ID,
1: -	BPF_PROG_GET_FD_BY_ID,
1: -	BPF_MAP_GET_FD_BY_ID,
1: -	BPF_OBJ_GET_INFO_BY_FD,
1: -	BPF_PROG_QUERY,
1: -	BPF_RAW_TRACEPOINT_OPEN,
1: -	BPF_BTF_LOAD,
1: -	BPF_BTF_GET_FD_BY_ID,
1: -	BPF_TASK_FD_QUERY,
1: -	BPF_MAP_LOOKUP_AND_DELETE_ELEM,
1: -	BPF_MAP_FREEZE,
1: -	BPF_BTF_GET_NEXT_ID,
1: -	BPF_MAP_LOOKUP_BATCH,
1: -	BPF_MAP_LOOKUP_AND_DELETE_BATCH,
1: -	BPF_MAP_UPDATE_BATCH,
1: -	BPF_MAP_DELETE_BATCH,
1: -	BPF_LINK_CREATE,
1: -	BPF_LINK_UPDATE,
1: -	BPF_LINK_GET_FD_BY_ID,
1: -	BPF_LINK_GET_NEXT_ID,
1: -	BPF_ENABLE_STATS,
1: -	BPF_ITER_CREATE,
1: -	BPF_LINK_DETACH,
1: -	BPF_PROG_BIND_MAP,
1: +  BPF_MAP_CREATE,
1: +  BPF_MAP_LOOKUP_ELEM,
1: +  BPF_MAP_UPDATE_ELEM,
1: +  BPF_MAP_DELETE_ELEM,
1: +  BPF_MAP_GET_NEXT_KEY,
1: +  BPF_PROG_LOAD,
1: +  BPF_OBJ_PIN,
1: +  BPF_OBJ_GET,
1: +  BPF_PROG_ATTACH,
1: +  BPF_PROG_DETACH,
1: +  BPF_PROG_TEST_RUN,
1: +  BPF_PROG_RUN = BPF_PROG_TEST_RUN,
1: +  BPF_PROG_GET_NEXT_ID,
1: +  BPF_MAP_GET_NEXT_ID,
1: +  BPF_PROG_GET_FD_BY_ID,
1: +  BPF_MAP_GET_FD_BY_ID,
1: +  BPF_OBJ_GET_INFO_BY_FD,
1: +  BPF_PROG_QUERY,
1: +  BPF_RAW_TRACEPOINT_OPEN,
1: +  BPF_BTF_LOAD,
1: +  BPF_BTF_GET_FD_BY_ID,
1: +  BPF_TASK_FD_QUERY,
1: +  BPF_MAP_LOOKUP_AND_DELETE_ELEM,
1: +  BPF_MAP_FREEZE,
1: +  BPF_BTF_GET_NEXT_ID,
1: +  BPF_MAP_LOOKUP_BATCH,
1: +  BPF_MAP_LOOKUP_AND_DELETE_BATCH,
1: +  BPF_MAP_UPDATE_BATCH,
1: +  BPF_MAP_DELETE_BATCH,
1: +  BPF_LINK_CREATE,
1: +  BPF_LINK_UPDATE,
1: +  BPF_LINK_GET_FD_BY_ID,
1: +  BPF_LINK_GET_NEXT_ID,
1: +  BPF_ENABLE_STATS,
1: +  BPF_ITER_CREATE,
1: +  BPF_LINK_DETACH,
1: +  BPF_PROG_BIND_MAP,
1:  };
1:  
1:  enum bpf_map_type {
1: -	BPF_MAP_TYPE_UNSPEC,
1: -	BPF_MAP_TYPE_HASH,
1: -	BPF_MAP_TYPE_ARRAY,
1: -	BPF_MAP_TYPE_PROG_ARRAY,
1: -	BPF_MAP_TYPE_PERF_EVENT_ARRAY,
1: -	BPF_MAP_TYPE_PERCPU_HASH,
1: -	BPF_MAP_TYPE_PERCPU_ARRAY,
1: -	BPF_MAP_TYPE_STACK_TRACE,
1: -	BPF_MAP_TYPE_CGROUP_ARRAY,
1: -	BPF_MAP_TYPE_LRU_HASH,
1: -	BPF_MAP_TYPE_LRU_PERCPU_HASH,
1: -	BPF_MAP_TYPE_LPM_TRIE,
1: -	BPF_MAP_TYPE_ARRAY_OF_MAPS,
1: -	BPF_MAP_TYPE_HASH_OF_MAPS,
1: -	BPF_MAP_TYPE_DEVMAP,
1: -	BPF_MAP_TYPE_SOCKMAP,
1: -	BPF_MAP_TYPE_CPUMAP,
1: -	BPF_MAP_TYPE_XSKMAP,
1: -	BPF_MAP_TYPE_SOCKHASH,
1: -	BPF_MAP_TYPE_CGROUP_STORAGE,
1: -	BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
1: -	BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE,
1: -	BPF_MAP_TYPE_QUEUE,
1: -	BPF_MAP_TYPE_STACK,
1: -	BPF_MAP_TYPE_SK_STORAGE,
1: -	BPF_MAP_TYPE_DEVMAP_HASH,
1: -	BPF_MAP_TYPE_STRUCT_OPS,
1: -	BPF_MAP_TYPE_RINGBUF,
1: -	BPF_MAP_TYPE_INODE_STORAGE,
1: -	BPF_MAP_TYPE_TASK_STORAGE,
1: +  BPF_MAP_TYPE_UNSPEC,
1: +  BPF_MAP_TYPE_HASH,
1: +  BPF_MAP_TYPE_ARRAY,
1: +  BPF_MAP_TYPE_PROG_ARRAY,
1: +  BPF_MAP_TYPE_PERF_EVENT_ARRAY,
1: +  BPF_MAP_TYPE_PERCPU_HASH,
1: +  BPF_MAP_TYPE_PERCPU_ARRAY,
1: +  BPF_MAP_TYPE_STACK_TRACE,
1: +  BPF_MAP_TYPE_CGROUP_ARRAY,
1: +  BPF_MAP_TYPE_LRU_HASH,
1: +  BPF_MAP_TYPE_LRU_PERCPU_HASH,
1: +  BPF_MAP_TYPE_LPM_TRIE,
1: +  BPF_MAP_TYPE_ARRAY_OF_MAPS,
1: +  BPF_MAP_TYPE_HASH_OF_MAPS,
1: +  BPF_MAP_TYPE_DEVMAP,
1: +  BPF_MAP_TYPE_SOCKMAP,
1: +  BPF_MAP_TYPE_CPUMAP,
1: +  BPF_MAP_TYPE_XSKMAP,
1: +  BPF_MAP_TYPE_SOCKHASH,
1: +  BPF_MAP_TYPE_CGROUP_STORAGE,
1: +  BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
1: +  BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE,
1: +  BPF_MAP_TYPE_QUEUE,
1: +  BPF_MAP_TYPE_STACK,
1: +  BPF_MAP_TYPE_SK_STORAGE,
1: +  BPF_MAP_TYPE_DEVMAP_HASH,
1: +  BPF_MAP_TYPE_STRUCT_OPS,
1: +  BPF_MAP_TYPE_RINGBUF,
1: +  BPF_MAP_TYPE_INODE_STORAGE,
1: +  BPF_MAP_TYPE_TASK_STORAGE,
1:  };
1:  
1:  /* Note that tracing related programs such as
1: @@ -920,97 +920,97 @@ enum bpf_map_type {
1:   * analyzed, and not /a/ specific kernel /and/ all future ones.
1:   */
1:  enum bpf_prog_type {
1: -	BPF_PROG_TYPE_UNSPEC,
1: -	BPF_PROG_TYPE_SOCKET_FILTER,
1: -	BPF_PROG_TYPE_KPROBE,
1: -	BPF_PROG_TYPE_SCHED_CLS,
1: -	BPF_PROG_TYPE_SCHED_ACT,
1: -	BPF_PROG_TYPE_TRACEPOINT,
1: -	BPF_PROG_TYPE_XDP,
1: -	BPF_PROG_TYPE_PERF_EVENT,
1: -	BPF_PROG_TYPE_CGROUP_SKB,
1: -	BPF_PROG_TYPE_CGROUP_SOCK,
1: -	BPF_PROG_TYPE_LWT_IN,
1: -	BPF_PROG_TYPE_LWT_OUT,
1: -	BPF_PROG_TYPE_LWT_XMIT,
1: -	BPF_PROG_TYPE_SOCK_OPS,
1: -	BPF_PROG_TYPE_SK_SKB,
1: -	BPF_PROG_TYPE_CGROUP_DEVICE,
1: -	BPF_PROG_TYPE_SK_MSG,
1: -	BPF_PROG_TYPE_RAW_TRACEPOINT,
1: -	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -	BPF_PROG_TYPE_LWT_SEG6LOCAL,
1: -	BPF_PROG_TYPE_LIRC_MODE2,
1: -	BPF_PROG_TYPE_SK_REUSEPORT,
1: -	BPF_PROG_TYPE_FLOW_DISSECTOR,
1: -	BPF_PROG_TYPE_CGROUP_SYSCTL,
1: -	BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
1: -	BPF_PROG_TYPE_CGROUP_SOCKOPT,
1: -	BPF_PROG_TYPE_TRACING,
1: -	BPF_PROG_TYPE_STRUCT_OPS,
1: -	BPF_PROG_TYPE_EXT,
1: -	BPF_PROG_TYPE_LSM,
1: -	BPF_PROG_TYPE_SK_LOOKUP,
1: -	BPF_PROG_TYPE_SYSCALL, /* a program that can execute syscalls */
1: +  BPF_PROG_TYPE_UNSPEC,
1: +  BPF_PROG_TYPE_SOCKET_FILTER,
1: +  BPF_PROG_TYPE_KPROBE,
1: +  BPF_PROG_TYPE_SCHED_CLS,
1: +  BPF_PROG_TYPE_SCHED_ACT,
1: +  BPF_PROG_TYPE_TRACEPOINT,
1: +  BPF_PROG_TYPE_XDP,
1: +  BPF_PROG_TYPE_PERF_EVENT,
1: +  BPF_PROG_TYPE_CGROUP_SKB,
1: +  BPF_PROG_TYPE_CGROUP_SOCK,
1: +  BPF_PROG_TYPE_LWT_IN,
1: +  BPF_PROG_TYPE_LWT_OUT,
1: +  BPF_PROG_TYPE_LWT_XMIT,
1: +  BPF_PROG_TYPE_SOCK_OPS,
1: +  BPF_PROG_TYPE_SK_SKB,
1: +  BPF_PROG_TYPE_CGROUP_DEVICE,
1: +  BPF_PROG_TYPE_SK_MSG,
1: +  BPF_PROG_TYPE_RAW_TRACEPOINT,
1: +  BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +  BPF_PROG_TYPE_LWT_SEG6LOCAL,
1: +  BPF_PROG_TYPE_LIRC_MODE2,
1: +  BPF_PROG_TYPE_SK_REUSEPORT,
1: +  BPF_PROG_TYPE_FLOW_DISSECTOR,
1: +  BPF_PROG_TYPE_CGROUP_SYSCTL,
1: +  BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
1: +  BPF_PROG_TYPE_CGROUP_SOCKOPT,
1: +  BPF_PROG_TYPE_TRACING,
1: +  BPF_PROG_TYPE_STRUCT_OPS,
1: +  BPF_PROG_TYPE_EXT,
1: +  BPF_PROG_TYPE_LSM,
1: +  BPF_PROG_TYPE_SK_LOOKUP,
1: +  BPF_PROG_TYPE_SYSCALL, /* a program that can execute syscalls */
1:  };
1:  
1:  enum bpf_attach_type {
1: -	BPF_CGROUP_INET_INGRESS,
1: -	BPF_CGROUP_INET_EGRESS,
1: -	BPF_CGROUP_INET_SOCK_CREATE,
1: -	BPF_CGROUP_SOCK_OPS,
1: -	BPF_SK_SKB_STREAM_PARSER,
1: -	BPF_SK_SKB_STREAM_VERDICT,
1: -	BPF_CGROUP_DEVICE,
1: -	BPF_SK_MSG_VERDICT,
1: -	BPF_CGROUP_INET4_BIND,
1: -	BPF_CGROUP_INET6_BIND,
1: -	BPF_CGROUP_INET4_CONNECT,
1: -	BPF_CGROUP_INET6_CONNECT,
1: -	BPF_CGROUP_INET4_POST_BIND,
1: -	BPF_CGROUP_INET6_POST_BIND,
1: -	BPF_CGROUP_UDP4_SENDMSG,
1: -	BPF_CGROUP_UDP6_SENDMSG,
1: -	BPF_LIRC_MODE2,
1: -	BPF_FLOW_DISSECTOR,
1: -	BPF_CGROUP_SYSCTL,
1: -	BPF_CGROUP_UDP4_RECVMSG,
1: -	BPF_CGROUP_UDP6_RECVMSG,
1: -	BPF_CGROUP_GETSOCKOPT,
1: -	BPF_CGROUP_SETSOCKOPT,
1: -	BPF_TRACE_RAW_TP,
1: -	BPF_TRACE_FENTRY,
1: -	BPF_TRACE_FEXIT,
1: -	BPF_MODIFY_RETURN,
1: -	BPF_LSM_MAC,
1: -	BPF_TRACE_ITER,
1: -	BPF_CGROUP_INET4_GETPEERNAME,
1: -	BPF_CGROUP_INET6_GETPEERNAME,
1: -	BPF_CGROUP_INET4_GETSOCKNAME,
1: -	BPF_CGROUP_INET6_GETSOCKNAME,
1: -	BPF_XDP_DEVMAP,
1: -	BPF_CGROUP_INET_SOCK_RELEASE,
1: -	BPF_XDP_CPUMAP,
1: -	BPF_SK_LOOKUP,
1: -	BPF_XDP,
1: -	BPF_SK_SKB_VERDICT,
1: -	BPF_SK_REUSEPORT_SELECT,
1: -	BPF_SK_REUSEPORT_SELECT_OR_MIGRATE,
1: -	__MAX_BPF_ATTACH_TYPE
1: +  BPF_CGROUP_INET_INGRESS,
1: +  BPF_CGROUP_INET_EGRESS,
1: +  BPF_CGROUP_INET_SOCK_CREATE,
1: +  BPF_CGROUP_SOCK_OPS,
1: +  BPF_SK_SKB_STREAM_PARSER,
1: +  BPF_SK_SKB_STREAM_VERDICT,
1: +  BPF_CGROUP_DEVICE,
1: +  BPF_SK_MSG_VERDICT,
1: +  BPF_CGROUP_INET4_BIND,
1: +  BPF_CGROUP_INET6_BIND,
1: +  BPF_CGROUP_INET4_CONNECT,
1: +  BPF_CGROUP_INET6_CONNECT,
1: +  BPF_CGROUP_INET4_POST_BIND,
1: +  BPF_CGROUP_INET6_POST_BIND,
1: +  BPF_CGROUP_UDP4_SENDMSG,
1: +  BPF_CGROUP_UDP6_SENDMSG,
1: +  BPF_LIRC_MODE2,
1: +  BPF_FLOW_DISSECTOR,
1: +  BPF_CGROUP_SYSCTL,
1: +  BPF_CGROUP_UDP4_RECVMSG,
1: +  BPF_CGROUP_UDP6_RECVMSG,
1: +  BPF_CGROUP_GETSOCKOPT,
1: +  BPF_CGROUP_SETSOCKOPT,
1: +  BPF_TRACE_RAW_TP,
1: +  BPF_TRACE_FENTRY,
1: +  BPF_TRACE_FEXIT,
1: +  BPF_MODIFY_RETURN,
1: +  BPF_LSM_MAC,
1: +  BPF_TRACE_ITER,
1: +  BPF_CGROUP_INET4_GETPEERNAME,
1: +  BPF_CGROUP_INET6_GETPEERNAME,
1: +  BPF_CGROUP_INET4_GETSOCKNAME,
1: +  BPF_CGROUP_INET6_GETSOCKNAME,
1: +  BPF_XDP_DEVMAP,
1: +  BPF_CGROUP_INET_SOCK_RELEASE,
1: +  BPF_XDP_CPUMAP,
1: +  BPF_SK_LOOKUP,
1: +  BPF_XDP,
1: +  BPF_SK_SKB_VERDICT,
1: +  BPF_SK_REUSEPORT_SELECT,
1: +  BPF_SK_REUSEPORT_SELECT_OR_MIGRATE,
1: +  __MAX_BPF_ATTACH_TYPE
1:  };
1:  
1:  #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
1:  
1:  enum bpf_link_type {
1: -	BPF_LINK_TYPE_UNSPEC = 0,
1: -	BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
1: -	BPF_LINK_TYPE_TRACING = 2,
1: -	BPF_LINK_TYPE_CGROUP = 3,
1: -	BPF_LINK_TYPE_ITER = 4,
1: -	BPF_LINK_TYPE_NETNS = 5,
1: -	BPF_LINK_TYPE_XDP = 6,
1: -
1: -	MAX_BPF_LINK_TYPE,
1: +  BPF_LINK_TYPE_UNSPEC = 0,
1: +  BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
1: +  BPF_LINK_TYPE_TRACING = 2,
1: +  BPF_LINK_TYPE_CGROUP = 3,
1: +  BPF_LINK_TYPE_ITER = 4,
1: +  BPF_LINK_TYPE_NETNS = 5,
1: +  BPF_LINK_TYPE_XDP = 6,
1: +
1: +  MAX_BPF_LINK_TYPE,
1:  };
1:  
1:  /* cgroup-bpf attach flags used in BPF_PROG_ATTACH command
1: @@ -1057,16 +1057,16 @@ enum bpf_link_type {
1:   * All eligible programs are executed regardless of return code from
1:   * earlier programs.
1:   */
1: -#define BPF_F_ALLOW_OVERRIDE	(1U << 0)
1: -#define BPF_F_ALLOW_MULTI	(1U << 1)
1: -#define BPF_F_REPLACE		(1U << 2)
1: +#define BPF_F_ALLOW_OVERRIDE (1U << 0)
1: +#define BPF_F_ALLOW_MULTI (1U << 1)
1: +#define BPF_F_REPLACE (1U << 2)
1:  
1:  /* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
1:   * verifier will perform strict alignment checking as if the kernel
1:   * has been built with CONFIG_EFFICIENT_UNALIGNED_ACCESS not set,
1:   * and NET_IP_ALIGN defined to 2.
1:   */
1: -#define BPF_F_STRICT_ALIGNMENT	(1U << 0)
1: +#define BPF_F_STRICT_ALIGNMENT (1U << 0)
1:  
1:  /* If BPF_F_ANY_ALIGNMENT is used in BPF_PROF_LOAD command, the
1:   * verifier will allow any alignment whatsoever.  On platforms
1: @@ -1080,7 +1080,7 @@ enum bpf_link_type {
1:   * of an unaligned access the alignment check would trigger before
1:   * the one we are interested in.
1:   */
1: -#define BPF_F_ANY_ALIGNMENT	(1U << 1)
1: +#define BPF_F_ANY_ALIGNMENT (1U << 1)
1:  
1:  /* BPF_F_TEST_RND_HI32 is used in BPF_PROG_LOAD command for testing purpose.
1:   * Verifier does sub-register def/use analysis and identifies instructions whose
1: @@ -1098,10 +1098,10 @@ enum bpf_link_type {
1:   * Then, if verifier is not doing correct analysis, such randomization will
1:   * regress tests to expose bugs.
1:   */
1: -#define BPF_F_TEST_RND_HI32	(1U << 2)
1: +#define BPF_F_TEST_RND_HI32 (1U << 2)
1:  
1:  /* The verifier internal test flag. Behavior is undefined */
1: -#define BPF_F_TEST_STATE_FREQ	(1U << 3)
1: +#define BPF_F_TEST_STATE_FREQ (1U << 3)
1:  
1:  /* If BPF_F_SLEEPABLE is used in BPF_PROG_LOAD command, the verifier will
1:   * restrict map and helper usage for such programs. Sleepable BPF programs can
1: @@ -1109,7 +1109,7 @@ enum bpf_link_type {
1:   * Such programs are allowed to use helpers that may sleep like
1:   * bpf_copy_from_user().
1:   */
1: -#define BPF_F_SLEEPABLE		(1U << 4)
1: +#define BPF_F_SLEEPABLE (1U << 4)
1:  
1:  /* When BPF ldimm64's insn[0].src_reg != 0 then this can have
1:   * the following extensions:
1: @@ -1122,8 +1122,8 @@ enum bpf_link_type {
1:   * ldimm64 rewrite:  address of map
1:   * verifier type:    CONST_PTR_TO_MAP
1:   */
1: -#define BPF_PSEUDO_MAP_FD	1
1: -#define BPF_PSEUDO_MAP_IDX	5
1: +#define BPF_PSEUDO_MAP_FD 1
1: +#define BPF_PSEUDO_MAP_IDX 5
1:  
1:  /* insn[0].src_reg:  BPF_PSEUDO_MAP_[IDX_]VALUE
1:   * insn[0].imm:      map fd or fd_idx
1: @@ -1133,8 +1133,8 @@ enum bpf_link_type {
1:   * ldimm64 rewrite:  address of map[0]+offset
1:   * verifier type:    PTR_TO_MAP_VALUE
1:   */
1: -#define BPF_PSEUDO_MAP_VALUE		2
1: -#define BPF_PSEUDO_MAP_IDX_VALUE	6
1: +#define BPF_PSEUDO_MAP_VALUE 2
1: +#define BPF_PSEUDO_MAP_IDX_VALUE 6
1:  
1:  /* insn[0].src_reg:  BPF_PSEUDO_BTF_ID
1:   * insn[0].imm:      kernel btd id of VAR
1: @@ -1145,7 +1145,7 @@ enum bpf_link_type {
1:   * verifier type:    PTR_TO_BTF_ID or PTR_TO_MEM, depending on whether the var
1:   *                   is struct/union.
1:   */
1: -#define BPF_PSEUDO_BTF_ID	3
1: +#define BPF_PSEUDO_BTF_ID 3
1:  /* insn[0].src_reg:  BPF_PSEUDO_FUNC
1:   * insn[0].imm:      insn offset to the func
1:   * insn[1].imm:      0
1: @@ -1154,63 +1154,65 @@ enum bpf_link_type {
1:   * ldimm64 rewrite:  address of the function
1:   * verifier type:    PTR_TO_FUNC.
1:   */
1: -#define BPF_PSEUDO_FUNC		4
1: +#define BPF_PSEUDO_FUNC 4
1:  
1:  /* when bpf_call->src_reg == BPF_PSEUDO_CALL, bpf_call->imm == pc-relative
1:   * offset to another bpf function
1:   */
1: -#define BPF_PSEUDO_CALL		1
1: +#define BPF_PSEUDO_CALL 1
1:  /* when bpf_call->src_reg == BPF_PSEUDO_KFUNC_CALL,
1:   * bpf_call->imm == btf_id of a BTF_KIND_FUNC in the running kernel
1:   */
1: -#define BPF_PSEUDO_KFUNC_CALL	2
1: +#define BPF_PSEUDO_KFUNC_CALL 2
1:  
1:  /* flags for BPF_MAP_UPDATE_ELEM command */
1:  enum {
1: -	BPF_ANY		= 0, /* create new element or update existing */
1: -	BPF_NOEXIST	= 1, /* create new element if it didn't exist */
1: -	BPF_EXIST	= 2, /* update existing element */
1: -	BPF_F_LOCK	= 4, /* spin_lock-ed map_lookup/map_update */
1: +  BPF_ANY = 0,     /* create new element or update existing */
1: +  BPF_NOEXIST = 1, /* create new element if it didn't exist */
1: +  BPF_EXIST = 2,   /* update existing element */
1: +  BPF_F_LOCK = 4,  /* spin_lock-ed map_lookup/map_update */
1:  };
1:  
1:  /* flags for BPF_MAP_CREATE command */
1:  enum {
1: -	BPF_F_NO_PREALLOC	= (1U << 0),
1: -/* Instead of having one common LRU list in the
1: - * BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list
1: - * which can scale and perform better.
1: - * Note, the LRU nodes (including free nodes) cannot be moved
1: - * across different LRU lists.
1: - */
1: -	BPF_F_NO_COMMON_LRU	= (1U << 1),
1: -/* Specify numa node during map creation */
1: -	BPF_F_NUMA_NODE		= (1U << 2),
1: -
1: -/* Flags for accessing BPF object from syscall side. */
1: -	BPF_F_RDONLY		= (1U << 3),
1: -	BPF_F_WRONLY		= (1U << 4),
1: -
1: -/* Flag for stack_map, store build_id+offset instead of pointer */
1: -	BPF_F_STACK_BUILD_ID	= (1U << 5),
1: -
1: -/* Zero-initialize hash function seed. This should only be used for testing. */
1: -	BPF_F_ZERO_SEED		= (1U << 6),
1: -
1: -/* Flags for accessing BPF object from program side. */
1: -	BPF_F_RDONLY_PROG	= (1U << 7),
1: -	BPF_F_WRONLY_PROG	= (1U << 8),
1: -
1: -/* Clone map from listener for newly accepted socket */
1: -	BPF_F_CLONE		= (1U << 9),
1: -
1: -/* Enable memory-mapping BPF map */
1: -	BPF_F_MMAPABLE		= (1U << 10),
1: -
1: -/* Share perf_event among processes */
1: -	BPF_F_PRESERVE_ELEMS	= (1U << 11),
1: -
1: -/* Create a map that is suitable to be an inner map with dynamic max entries */
1: -	BPF_F_INNER_MAP		= (1U << 12),
1: +  BPF_F_NO_PREALLOC = (1U << 0),
1: +  /* Instead of having one common LRU list in the
1: +   * BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list
1: +   * which can scale and perform better.
1: +   * Note, the LRU nodes (including free nodes) cannot be moved
1: +   * across different LRU lists.
1: +   */
1: +  BPF_F_NO_COMMON_LRU = (1U << 1),
1: +  /* Specify numa node during map creation */
1: +  BPF_F_NUMA_NODE = (1U << 2),
1: +
1: +  /* Flags for accessing BPF object from syscall side. */
1: +  BPF_F_RDONLY = (1U << 3),
1: +  BPF_F_WRONLY = (1U << 4),
1: +
1: +  /* Flag for stack_map, store build_id+offset instead of pointer */
1: +  BPF_F_STACK_BUILD_ID = (1U << 5),
1: +
1: +  /* Zero-initialize hash function seed. This should only be used for testing.
1: +     */
1: +  BPF_F_ZERO_SEED = (1U << 6),
1: +
1: +  /* Flags for accessing BPF object from program side. */
1: +  BPF_F_RDONLY_PROG = (1U << 7),
1: +  BPF_F_WRONLY_PROG = (1U << 8),
1: +
1: +  /* Clone map from listener for newly accepted socket */
1: +  BPF_F_CLONE = (1U << 9),
1: +
1: +  /* Enable memory-mapping BPF map */
1: +  BPF_F_MMAPABLE = (1U << 10),
1: +
1: +  /* Share perf_event among processes */
1: +  BPF_F_PRESERVE_ELEMS = (1U << 11),
1: +
1: +  /* Create a map that is suitable to be an inner map with dynamic max entries
1: +     */
1: +  BPF_F_INNER_MAP = (1U << 12),
1:  };
1:  
1:  /* Flags for BPF_PROG_QUERY. */
1: @@ -1219,267 +1221,267 @@ enum {
1:   * programs that will be executed for events within a cgroup.
1:   * attach_flags with this flag are returned only for directly attached programs.
1:   */
1: -#define BPF_F_QUERY_EFFECTIVE	(1U << 0)
1: +#define BPF_F_QUERY_EFFECTIVE (1U << 0)
1:  
1:  /* Flags for BPF_PROG_TEST_RUN */
1:  
1:  /* If set, run the test on the cpu specified by bpf_attr.test.cpu */
1: -#define BPF_F_TEST_RUN_ON_CPU	(1U << 0)
1: +#define BPF_F_TEST_RUN_ON_CPU (1U << 0)
1:  
1:  /* type for BPF_ENABLE_STATS */
1:  enum bpf_stats_type {
1: -	/* enabled run_time_ns and run_cnt */
1: -	BPF_STATS_RUN_TIME = 0,
1: +  /* enabled run_time_ns and run_cnt */
1: +  BPF_STATS_RUN_TIME = 0,
1:  };
1:  
1:  enum bpf_stack_build_id_status {
1: -	/* user space need an empty entry to identify end of a trace */
1: -	BPF_STACK_BUILD_ID_EMPTY = 0,
1: -	/* with valid build_id and offset */
1: -	BPF_STACK_BUILD_ID_VALID = 1,
1: -	/* couldn't get build_id, fallback to ip */
1: -	BPF_STACK_BUILD_ID_IP = 2,
1: +  /* user space need an empty entry to identify end of a trace */
1: +  BPF_STACK_BUILD_ID_EMPTY = 0,
1: +  /* with valid build_id and offset */
1: +  BPF_STACK_BUILD_ID_VALID = 1,
1: +  /* couldn't get build_id, fallback to ip */
1: +  BPF_STACK_BUILD_ID_IP = 2,
1:  };
1:  
1:  #define BPF_BUILD_ID_SIZE 20
1:  struct bpf_stack_build_id {
1: -	__s32		status;
1: -	unsigned char	build_id[BPF_BUILD_ID_SIZE];
1: -	union {
1: -		__u64	offset;
1: -		__u64	ip;
1: -	};
1: +  __s32 status;
1: +  unsigned char build_id[BPF_BUILD_ID_SIZE];
1: +  union {
1: +    __u64 offset;
1: +    __u64 ip;
1: +  };
1:  };
1:  
1:  #define BPF_OBJ_NAME_LEN 16U
1:  
1:  union bpf_attr {
1: -	struct { /* anonymous struct used by BPF_MAP_CREATE command */
1: -		__u32	map_type;	/* one of enum bpf_map_type */
1: -		__u32	key_size;	/* size of key in bytes */
1: -		__u32	value_size;	/* size of value in bytes */
1: -		__u32	max_entries;	/* max number of entries in a map */
1: -		__u32	map_flags;	/* BPF_MAP_CREATE related
1: -					 * flags defined above.
1: -					 */
1: -		__u32	inner_map_fd;	/* fd pointing to the inner map */
1: -		__u32	numa_node;	/* numa node (effective only if
1: -					 * BPF_F_NUMA_NODE is set).
1: -					 */
1: -		char	map_name[BPF_OBJ_NAME_LEN];
1: -		__u32	map_ifindex;	/* ifindex of netdev to create on */
1: -		__u32	btf_fd;		/* fd pointing to a BTF type data */
1: -		__u32	btf_key_type_id;	/* BTF type_id of the key */
1: -		__u32	btf_value_type_id;	/* BTF type_id of the value */
1: -		__u32	btf_vmlinux_value_type_id;/* BTF type_id of a kernel-
1: -						   * struct stored as the
1: -						   * map value
1: -						   */
1: -	};
1: -
1: -	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
1: -		__u32		map_fd;
1: -		__aligned_u64	key;
1: -		union {
1: -			__aligned_u64 value;
1: -			__aligned_u64 next_key;
1: -		};
1: -		__u64		flags;
1: -	};
1: -
1: -	struct { /* struct used by BPF_MAP_*_BATCH commands */
1: -		__aligned_u64	in_batch;	/* start batch,
1: -						 * NULL to start from beginning
1: -						 */
1: -		__aligned_u64	out_batch;	/* output: next start batch */
1: -		__aligned_u64	keys;
1: -		__aligned_u64	values;
1: -		__u32		count;		/* input/output:
1: -						 * input: # of key/value
1: -						 * elements
1: -						 * output: # of filled elements
1: -						 */
1: -		__u32		map_fd;
1: -		__u64		elem_flags;
1: -		__u64		flags;
1: -	} batch;
1: -
1: -	struct { /* anonymous struct used by BPF_PROG_LOAD command */
1: -		__u32		prog_type;	/* one of enum bpf_prog_type */
1: -		__u32		insn_cnt;
1: -		__aligned_u64	insns;
1: -		__aligned_u64	license;
1: -		__u32		log_level;	/* verbosity level of verifier */
1: -		__u32		log_size;	/* size of user buffer */
1: -		__aligned_u64	log_buf;	/* user supplied buffer */
1: -		__u32		kern_version;	/* not used */
1: -		__u32		prog_flags;
1: -		char		prog_name[BPF_OBJ_NAME_LEN];
1: -		__u32		prog_ifindex;	/* ifindex of netdev to prep for */
1: -		/* For some prog types expected attach type must be known at
1: -		 * load time to verify attach type specific parts of prog
1: -		 * (context accesses, allowed helpers, etc).
1: -		 */
1: -		__u32		expected_attach_type;
1: -		__u32		prog_btf_fd;	/* fd pointing to BTF type data */
1: -		__u32		func_info_rec_size;	/* userspace bpf_func_info size */
1: -		__aligned_u64	func_info;	/* func info */
1: -		__u32		func_info_cnt;	/* number of bpf_func_info records */
1: -		__u32		line_info_rec_size;	/* userspace bpf_line_info size */
1: -		__aligned_u64	line_info;	/* line info */
1: -		__u32		line_info_cnt;	/* number of bpf_line_info records */
1: -		__u32		attach_btf_id;	/* in-kernel BTF type id to attach to */
1: -		union {
1: -			/* valid prog_fd to attach to bpf prog */
1: -			__u32		attach_prog_fd;
1: -			/* or valid module BTF object fd or 0 to attach to vmlinux */
1: -			__u32		attach_btf_obj_fd;
1: -		};
1: -		__u32		:32;		/* pad */
1: -		__aligned_u64	fd_array;	/* array of FDs */
1: -	};
1: -
1: -	struct { /* anonymous struct used by BPF_OBJ_* commands */
1: -		__aligned_u64	pathname;
1: -		__u32		bpf_fd;
1: -		__u32		file_flags;
1: -	};
1: -
1: -	struct { /* anonymous struct used by BPF_PROG_ATTACH/DETACH commands */
1: -		__u32		target_fd;	/* container object to attach to */
1: -		__u32		attach_bpf_fd;	/* eBPF program to attach */
1: -		__u32		attach_type;
1: -		__u32		attach_flags;
1: -		__u32		replace_bpf_fd;	/* previously attached eBPF
1: -						 * program to replace if
1: -						 * BPF_F_REPLACE is used
1: -						 */
1: -	};
1: -
1: -	struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */
1: -		__u32		prog_fd;
1: -		__u32		retval;
1: -		__u32		data_size_in;	/* input: len of data_in */
1: -		__u32		data_size_out;	/* input/output: len of data_out
1: -						 *   returns ENOSPC if data_out
1: -						 *   is too small.
1: -						 */
1: -		__aligned_u64	data_in;
1: -		__aligned_u64	data_out;
1: -		__u32		repeat;
1: -		__u32		duration;
1: -		__u32		ctx_size_in;	/* input: len of ctx_in */
1: -		__u32		ctx_size_out;	/* input/output: len of ctx_out
1: -						 *   returns ENOSPC if ctx_out
1: -						 *   is too small.
1: -						 */
1: -		__aligned_u64	ctx_in;
1: -		__aligned_u64	ctx_out;
1: -		__u32		flags;
1: -		__u32		cpu;
1: -	} test;
1: -
1: -	struct { /* anonymous struct used by BPF_*_GET_*_ID */
1: -		union {
1: -			__u32		start_id;
1: -			__u32		prog_id;
1: -			__u32		map_id;
1: -			__u32		btf_id;
1: -			__u32		link_id;
1: -		};
1: -		__u32		next_id;
1: -		__u32		open_flags;
1: -	};
1: -
1: -	struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
1: -		__u32		bpf_fd;
1: -		__u32		info_len;
1: -		__aligned_u64	info;
1: -	} info;
1: -
1: -	struct { /* anonymous struct used by BPF_PROG_QUERY command */
1: -		__u32		target_fd;	/* container object to query */
1: -		__u32		attach_type;
1: -		__u32		query_flags;
1: -		__u32		attach_flags;
1: -		__aligned_u64	prog_ids;
1: -		__u32		prog_cnt;
1: -	} query;
1: -
1: -	struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
1: -		__u64 name;
1: -		__u32 prog_fd;
1: -	} raw_tracepoint;
1: -
1: -	struct { /* anonymous struct for BPF_BTF_LOAD */
1: -		__aligned_u64	btf;
1: -		__aligned_u64	btf_log_buf;
1: -		__u32		btf_size;
1: -		__u32		btf_log_size;
1: -		__u32		btf_log_level;
1: -	};
1: -
1: -	struct {
1: -		__u32		pid;		/* input: pid */
1: -		__u32		fd;		/* input: fd */
1: -		__u32		flags;		/* input: flags */
1: -		__u32		buf_len;	/* input/output: buf len */
1: -		__aligned_u64	buf;		/* input/output:
1: -						 *   tp_name for tracepoint
1: -						 *   symbol for kprobe
1: -						 *   filename for uprobe
1: -						 */
1: -		__u32		prog_id;	/* output: prod_id */
1: -		__u32		fd_type;	/* output: BPF_FD_TYPE_* */
1: -		__u64		probe_offset;	/* output: probe_offset */
1: -		__u64		probe_addr;	/* output: probe_addr */
1: -	} task_fd_query;
1: -
1: -	struct { /* struct used by BPF_LINK_CREATE command */
1: -		__u32		prog_fd;	/* eBPF program to attach */
1: -		union {
1: -			__u32		target_fd;	/* object to attach to */
1: -			__u32		target_ifindex; /* target ifindex */
1: -		};
1: -		__u32		attach_type;	/* attach type */
1: -		__u32		flags;		/* extra flags */
1: -		union {
1: -			__u32		target_btf_id;	/* btf_id of target to attach to */
1: -			struct {
1: -				__aligned_u64	iter_info;	/* extra bpf_iter_link_info */
1: -				__u32		iter_info_len;	/* iter_info length */
1: -			};
1: -		};
1: -	} link_create;
1: -
1: -	struct { /* struct used by BPF_LINK_UPDATE command */
1: -		__u32		link_fd;	/* link fd */
1: -		/* new program fd to update link with */
1: -		__u32		new_prog_fd;
1: -		__u32		flags;		/* extra flags */
1: -		/* expected link's program fd; is specified only if
1: -		 * BPF_F_REPLACE flag is set in flags */
1: -		__u32		old_prog_fd;
1: -	} link_update;
1: -
1: -	struct {
1: -		__u32		link_fd;
1: -	} link_detach;
1: -
1: -	struct { /* struct used by BPF_ENABLE_STATS command */
1: -		__u32		type;
1: -	} enable_stats;
1: -
1: -	struct { /* struct used by BPF_ITER_CREATE command */
1: -		__u32		link_fd;
1: -		__u32		flags;
1: -	} iter_create;
1: -
1: -	struct { /* struct used by BPF_PROG_BIND_MAP command */
1: -		__u32		prog_fd;
1: -		__u32		map_fd;
1: -		__u32		flags;		/* extra flags */
1: -	} prog_bind_map;
1: +  struct {              /* anonymous struct used by BPF_MAP_CREATE command */
1: +    __u32 map_type;     /* one of enum bpf_map_type */
1: +    __u32 key_size;     /* size of key in bytes */
1: +    __u32 value_size;   /* size of value in bytes */
1: +    __u32 max_entries;  /* max number of entries in a map */
1: +    __u32 map_flags;    /* BPF_MAP_CREATE related
1: +                         * flags defined above.
1: +                         */
1: +    __u32 inner_map_fd; /* fd pointing to the inner map */
1: +    __u32 numa_node;    /* numa node (effective only if
1: +                         * BPF_F_NUMA_NODE is set).
1: +                         */
1: +    char map_name[BPF_OBJ_NAME_LEN];
1: +    __u32 map_ifindex;               /* ifindex of netdev to create on */
1: +    __u32 btf_fd;                    /* fd pointing to a BTF type data */
1: +    __u32 btf_key_type_id;           /* BTF type_id of the key */
1: +    __u32 btf_value_type_id;         /* BTF type_id of the value */
1: +    __u32 btf_vmlinux_value_type_id; /* BTF type_id of a kernel-
1: +                                      * struct stored as the
1: +                                      * map value
1: +                                      */
1: +  };
1: +
1: +  struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
1: +    __u32 map_fd;
1: +    __aligned_u64 key;
1: +    union {
1: +      __aligned_u64 value;
1: +      __aligned_u64 next_key;
1: +    };
1: +    __u64 flags;
1: +  };
1: +
1: +  struct {                   /* struct used by BPF_MAP_*_BATCH commands */
1: +    __aligned_u64 in_batch;  /* start batch,
1: +                              * NULL to start from beginning
1: +                              */
1: +    __aligned_u64 out_batch; /* output: next start batch */
1: +    __aligned_u64 keys;
1: +    __aligned_u64 values;
1: +    __u32 count; /* input/output:
1: +                  * input: # of key/value
1: +                  * elements
1: +                  * output: # of filled elements
1: +                  */
1: +    __u32 map_fd;
1: +    __u64 elem_flags;
1: +    __u64 flags;
1: +  } batch;
1: +
1: +  struct {           /* anonymous struct used by BPF_PROG_LOAD command */
1: +    __u32 prog_type; /* one of enum bpf_prog_type */
1: +    __u32 insn_cnt;
1: +    __aligned_u64 insns;
1: +    __aligned_u64 license;
1: +    __u32 log_level;       /* verbosity level of verifier */
1: +    __u32 log_size;        /* size of user buffer */
1: +    __aligned_u64 log_buf; /* user supplied buffer */
1: +    __u32 kern_version;    /* not used */
1: +    __u32 prog_flags;
1: +    char prog_name[BPF_OBJ_NAME_LEN];
1: +    __u32 prog_ifindex; /* ifindex of netdev to prep for */
1: +    /* For some prog types expected attach type must be known at
1: +     * load time to verify attach type specific parts of prog
1: +     * (context accesses, allowed helpers, etc).
1: +     */
1: +    __u32 expected_attach_type;
1: +    __u32 prog_btf_fd;        /* fd pointing to BTF type data */
1: +    __u32 func_info_rec_size; /* userspace bpf_func_info size */
1: +    __aligned_u64 func_info;  /* func info */
1: +    __u32 func_info_cnt;      /* number of bpf_func_info records */
1: +    __u32 line_info_rec_size; /* userspace bpf_line_info size */
1: +    __aligned_u64 line_info;  /* line info */
1: +    __u32 line_info_cnt;      /* number of bpf_line_info records */
1: +    __u32 attach_btf_id;      /* in-kernel BTF type id to attach to */
1: +    union {
1: +      /* valid prog_fd to attach to bpf prog */
1: +      __u32 attach_prog_fd;
1: +      /* or valid module BTF object fd or 0 to attach to vmlinux */
1: +      __u32 attach_btf_obj_fd;
1: +    };
1: +    __u32 : 32;             /* pad */
1: +    __aligned_u64 fd_array; /* array of FDs */
1: +  };
1: +
1: +  struct { /* anonymous struct used by BPF_OBJ_* commands */
1: +    __aligned_u64 pathname;
1: +    __u32 bpf_fd;
1: +    __u32 file_flags;
1: +  };
1: +
1: +  struct { /* anonymous struct used by BPF_PROG_ATTACH/DETACH commands */
1: +    __u32 target_fd;     /* container object to attach to */
1: +    __u32 attach_bpf_fd; /* eBPF program to attach */
1: +    __u32 attach_type;
1: +    __u32 attach_flags;
1: +    __u32 replace_bpf_fd; /* previously attached eBPF
1: +                           * program to replace if
1: +                           * BPF_F_REPLACE is used
1: +                           */
1: +  };
1: +
1: +  struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */
1: +    __u32 prog_fd;
1: +    __u32 retval;
1: +    __u32 data_size_in;  /* input: len of data_in */
1: +    __u32 data_size_out; /* input/output: len of data_out
1: +                          *   returns ENOSPC if data_out
1: +                          *   is too small.
1: +                          */
1: +    __aligned_u64 data_in;
1: +    __aligned_u64 data_out;
1: +    __u32 repeat;
1: +    __u32 duration;
1: +    __u32 ctx_size_in;  /* input: len of ctx_in */
1: +    __u32 ctx_size_out; /* input/output: len of ctx_out
1: +                         *   returns ENOSPC if ctx_out
1: +                         *   is too small.
1: +                         */
1: +    __aligned_u64 ctx_in;
1: +    __aligned_u64 ctx_out;
1: +    __u32 flags;
1: +    __u32 cpu;
1: +  } test;
1: +
1: +  struct { /* anonymous struct used by BPF_*_GET_*_ID */
1: +    union {
1: +      __u32 start_id;
1: +      __u32 prog_id;
1: +      __u32 map_id;
1: +      __u32 btf_id;
1: +      __u32 link_id;
1: +    };
1: +    __u32 next_id;
1: +    __u32 open_flags;
1: +  };
1: +
1: +  struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
1: +    __u32 bpf_fd;
1: +    __u32 info_len;
1: +    __aligned_u64 info;
1: +  } info;
1: +
1: +  struct {           /* anonymous struct used by BPF_PROG_QUERY command */
1: +    __u32 target_fd; /* container object to query */
1: +    __u32 attach_type;
1: +    __u32 query_flags;
1: +    __u32 attach_flags;
1: +    __aligned_u64 prog_ids;
1: +    __u32 prog_cnt;
1: +  } query;
1: +
1: +  struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
1: +    __u64 name;
1: +    __u32 prog_fd;
1: +  } raw_tracepoint;
1: +
1: +  struct { /* anonymous struct for BPF_BTF_LOAD */
1: +    __aligned_u64 btf;
1: +    __aligned_u64 btf_log_buf;
1: +    __u32 btf_size;
1: +    __u32 btf_log_size;
1: +    __u32 btf_log_level;
1: +  };
1: +
1: +  struct {
1: +    __u32 pid;          /* input: pid */
1: +    __u32 fd;           /* input: fd */
1: +    __u32 flags;        /* input: flags */
1: +    __u32 buf_len;      /* input/output: buf len */
1: +    __aligned_u64 buf;  /* input/output:
1: +                         *   tp_name for tracepoint
1: +                         *   symbol for kprobe
1: +                         *   filename for uprobe
1: +                         */
1: +    __u32 prog_id;      /* output: prod_id */
1: +    __u32 fd_type;      /* output: BPF_FD_TYPE_* */
1: +    __u64 probe_offset; /* output: probe_offset */
1: +    __u64 probe_addr;   /* output: probe_addr */
1: +  } task_fd_query;
1: +
1: +  struct {         /* struct used by BPF_LINK_CREATE command */
1: +    __u32 prog_fd; /* eBPF program to attach */
1: +    union {
1: +      __u32 target_fd;      /* object to attach to */
1: +      __u32 target_ifindex; /* target ifindex */
1: +    };
1: +    __u32 attach_type; /* attach type */
1: +    __u32 flags;       /* extra flags */
1: +    union {
1: +      __u32 target_btf_id; /* btf_id of target to attach to */
1: +      struct {
1: +        __aligned_u64 iter_info; /* extra bpf_iter_link_info */
1: +        __u32 iter_info_len;     /* iter_info length */
1: +      };
1: +    };
1: +  } link_create;
1: +
1: +  struct {         /* struct used by BPF_LINK_UPDATE command */
1: +    __u32 link_fd; /* link fd */
1: +    /* new program fd to update link with */
1: +    __u32 new_prog_fd;
1: +    __u32 flags; /* extra flags */
1: +    /* expected link's program fd; is specified only if
1: +     * BPF_F_REPLACE flag is set in flags */
1: +    __u32 old_prog_fd;
1: +  } link_update;
1: +
1: +  struct {
1: +    __u32 link_fd;
1: +  } link_detach;
1: +
1: +  struct { /* struct used by BPF_ENABLE_STATS command */
1: +    __u32 type;
1: +  } enable_stats;
1: +
1: +  struct { /* struct used by BPF_ITER_CREATE command */
1: +    __u32 link_fd;
1: +    __u32 flags;
1: +  } iter_create;
1: +
1: +  struct { /* struct used by BPF_PROG_BIND_MAP command */
1: +    __u32 prog_fd;
1: +    __u32 map_fd;
1: +    __u32 flags; /* extra flags */
1: +  } prog_bind_map;
1:  
1:  } __attribute__((aligned(8)));
1:  
1: @@ -1507,7 +1509,8 @@ union bpf_attr {
1:   * 		Map value associated to *key*, or **NULL** if no entry was
1:   * 		found.
1:   *
1: - * long bpf_map_update_elem(struct bpf_map *map, const void *key, const void *value, u64 flags)
1: + * long bpf_map_update_elem(struct bpf_map *map, const void *key, const void
1: + **value, u64 flags)
1:   * 	Description
1:   * 		Add or update the value of the entry associated to *key* in
1:   * 		*map* with *value*. *flags* is one of:
1: @@ -1569,7 +1572,8 @@ union bpf_attr {
1:   *
1:   * 		::
1:   *
1: - * 			telnet-470   [001] .N.. 419421.045894: 0x00000001: <formatted msg>
1: + * 			telnet-470   [001] .N.. 419421.045894: 0x00000001:
1: + *<formatted msg>
1:   *
1:   * 		In the above:
1:   *
1: @@ -1629,7 +1633,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		The SMP id of the processor running the program.
1:   *
1: - * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
1: + * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from,
1: + *u32 len, u64 flags)
1:   * 	Description
1:   * 		Store *len* bytes from address *from* into the packet
1:   * 		associated to *skb*, at *offset*. *flags* are a combination of
1: @@ -1646,7 +1651,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_l3_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 size)
1: + * long bpf_l3_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to,
1: + *u64 size)
1:   * 	Description
1:   * 		Recompute the layer 3 (e.g. IP) checksum for the packet
1:   * 		associated to *skb*. Computation is incremental, so the helper
1: @@ -1671,7 +1677,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_l4_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 flags)
1: + * long bpf_l4_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to,
1: + *u64 flags)
1:   * 	Description
1:   * 		Recompute the layer 4 (e.g. TCP, UDP or ICMP) checksum for the
1:   * 		packet associated to *skb*. Computation is incremental, so the
1: @@ -1835,7 +1842,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_skb_get_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
1: + * long bpf_skb_get_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key,
1: + *u32 size, u64 flags)
1:   * 	Description
1:   * 		Get tunnel metadata. This helper takes a pointer *key* to an
1:   * 		empty **struct bpf_tunnel_key** of **size**, that will be
1: @@ -1886,7 +1894,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_skb_set_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
1: + * long bpf_skb_set_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key,
1: + *u32 size, u64 flags)
1:   * 	Description
1:   * 		Populate tunnel metadata for packet associated to *skb.* The
1:   * 		tunnel metadata is set to the contents of *key*, of *size*. The
1: @@ -1999,7 +2008,8 @@ union bpf_attr {
1:   * 		The realm of the route for the packet associated to *skb*, or 0
1:   * 		if none was found.
1:   *
1: - * long bpf_perf_event_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
1: + * long bpf_perf_event_output(void *ctx, struct bpf_map *map, u64 flags, void
1: + **data, u64 size)
1:   * 	Description
1:   * 		Write raw *data* blob into a special BPF perf event held by
1:   * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
1: @@ -2103,7 +2113,8 @@ union bpf_attr {
1:   * 		The positive or null stack id on success, or a negative error
1:   * 		in case of failure.
1:   *
1: - * s64 bpf_csum_diff(__be32 *from, u32 from_size, __be32 *to, u32 to_size, __wsum seed)
1: + * s64 bpf_csum_diff(__be32 *from, u32 from_size, __be32 *to, u32 to_size,
1: + *__wsum seed)
1:   * 	Description
1:   * 		Compute a checksum difference, from the raw buffer pointed by
1:   * 		*from*, of length *from_size* (that must be a multiple of 4),
1: @@ -2212,7 +2223,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_skb_under_cgroup(struct sk_buff *skb, struct bpf_map *map, u32 index)
1: + * long bpf_skb_under_cgroup(struct sk_buff *skb, struct bpf_map *map, u32
1: + *index)
1:   * 	Description
1:   * 		Check whether *skb* is a descendant of the cgroup2 held by
1:   * 		*map* of type **BPF_MAP_TYPE_CGROUP_ARRAY**, at *index*.
1: @@ -2464,7 +2476,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0
1:   *
1: - * long bpf_setsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
1: + * long bpf_setsockopt(void *bpf_socket, int level, int optname, void *optval,
1: + *int optlen)
1:   * 	Description
1:   * 		Emulate a call to **setsockopt()** on the socket associated to
1:   * 		*bpf_socket*, which must be a full socket. The *level* at
1: @@ -2495,7 +2508,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags)
1: + * long bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64
1: + *flags)
1:   * 	Description
1:   * 		Grow or shrink the room for data in the packet associated to
1:   * 		*skb* by *len_diff*, and according to the selected *mode*.
1: @@ -2570,7 +2584,8 @@ union bpf_attr {
1:   * 		**XDP_REDIRECT** on success, or the value of the two lower bits
1:   * 		of the *flags* argument on error.
1:   *
1: - * long bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags)
1: + * long bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key,
1: + *u64 flags)
1:   * 	Description
1:   * 		Redirect the packet to the socket referenced by *map* (of type
1:   * 		**BPF_MAP_TYPE_SOCKMAP**) at index *key*. Both ingress and
1: @@ -2581,7 +2596,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		**SK_PASS** on success, or **SK_DROP** on error.
1:   *
1: - * long bpf_sock_map_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
1: + * long bpf_sock_map_update(struct bpf_sock_ops *skops, struct bpf_map *map,
1: + *void *key, u64 flags)
1:   * 	Description
1:   * 		Add an entry to, or update a *map* referencing sockets. The
1:   * 		*skops* is used as a new value for the entry associated to
1: @@ -2629,7 +2645,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_perf_event_read_value(struct bpf_map *map, u64 flags, struct bpf_perf_event_value *buf, u32 buf_size)
1: + * long bpf_perf_event_read_value(struct bpf_map *map, u64 flags, struct
1: + *bpf_perf_event_value *buf, u32 buf_size)
1:   * 	Description
1:   * 		Read the value of a perf event counter, and store it into *buf*
1:   * 		of size *buf_size*. This helper relies on a *map* of type
1: @@ -2679,7 +2696,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, u32 buf_size)
1: + * long bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct
1: + *bpf_perf_event_value *buf, u32 buf_size)
1:   * 	Description
1:   * 		For en eBPF program attached to a perf event, retrieve the
1:   * 		value of the event counter associated to *ctx* and store it in
1: @@ -2690,7 +2708,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_getsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
1: + * long bpf_getsockopt(void *bpf_socket, int level, int optname, void *optval,
1: + *int optlen)
1:   * 	Description
1:   * 		Emulate a call to **getsockopt()** on the socket associated to
1:   * 		*bpf_socket*, which must be a full socket. The *level* at
1: @@ -2768,7 +2787,8 @@ union bpf_attr {
1:   * 		callback:
1:   *
1:   * 		**bpf_sock_ops_cb_flags_set(bpf_sock,**
1: - * 			**bpf_sock->bpf_sock_ops_cb_flags & ~BPF_SOCK_OPS_RTO_CB_FLAG)**
1: + * 			**bpf_sock->bpf_sock_ops_cb_flags &
1: + *~BPF_SOCK_OPS_RTO_CB_FLAG)**
1:   *
1:   * 		Here are some examples of where one could call such eBPF
1:   * 		program:
1: @@ -2784,7 +2804,8 @@ union bpf_attr {
1:   * 		be set is returned (which comes down to 0 if all bits were set
1:   * 		as required).
1:   *
1: - * long bpf_msg_redirect_map(struct sk_msg_buff *msg, struct bpf_map *map, u32 key, u64 flags)
1: + * long bpf_msg_redirect_map(struct sk_msg_buff *msg, struct bpf_map *map, u32
1: + *key, u64 flags)
1:   * 	Description
1:   * 		This helper is used in programs implementing policies at the
1:   * 		socket level. If the message *msg* is allowed to pass (i.e. if
1: @@ -2850,7 +2871,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0
1:   *
1: - * long bpf_msg_pull_data(struct sk_msg_buff *msg, u32 start, u32 end, u64 flags)
1: + * long bpf_msg_pull_data(struct sk_msg_buff *msg, u32 start, u32 end, u64
1: + *flags)
1:   * 	Description
1:   * 		For socket policies, pull in non-linear data from user space
1:   * 		for *msg* and set pointers *msg*\ **->data** and *msg*\
1: @@ -2913,7 +2935,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_skb_get_xfrm_state(struct sk_buff *skb, u32 index, struct bpf_xfrm_state *xfrm_state, u32 size, u64 flags)
1: + * long bpf_skb_get_xfrm_state(struct sk_buff *skb, u32 index, struct
1: + *bpf_xfrm_state *xfrm_state, u32 size, u64 flags)
1:   * 	Description
1:   * 		Retrieve the XFRM state (IP transform framework, see also
1:   * 		**ip-xfrm(8)**) at *index* in XFRM "security path" for *skb*.
1: @@ -2962,7 +2985,8 @@ union bpf_attr {
1:   * 		A non-negative value equal to or less than *size* on success,
1:   * 		or a negative error in case of failure.
1:   *
1: - * long bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32 len, u32 start_header)
1: + * long bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32
1: + *len, u32 start_header)
1:   * 	Description
1:   * 		This helper is similar to **bpf_skb_load_bytes**\ () in that
1:   * 		it provides an easy way to load *len* bytes from *offset*
1: @@ -2984,7 +3008,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_fib_lookup(void *ctx, struct bpf_fib_lookup *params, int plen, u32 flags)
1: + * long bpf_fib_lookup(void *ctx, struct bpf_fib_lookup *params, int plen, u32
1: + *flags)
1:   *	Description
1:   *		Do FIB lookup in kernel tables using parameters in *params*.
1:   *		If lookup is successful and result shows packet is to be
1: @@ -3018,7 +3043,8 @@ union bpf_attr {
1:   *		If lookup fails with BPF_FIB_LKUP_RET_FRAG_NEEDED, then the MTU
1:   *		was exceeded and output params->mtu_result contains the MTU.
1:   *
1: - * long bpf_sock_hash_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
1: + * long bpf_sock_hash_update(struct bpf_sock_ops *skops, struct bpf_map *map,
1: + *void *key, u64 flags)
1:   *	Description
1:   *		Add an entry to, or update a sockhash *map* referencing sockets.
1:   *		The *skops* is used as a new value for the entry associated to
1: @@ -3037,7 +3063,8 @@ union bpf_attr {
1:   *	Return
1:   *		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_msg_redirect_hash(struct sk_msg_buff *msg, struct bpf_map *map, void *key, u64 flags)
1: + * long bpf_msg_redirect_hash(struct sk_msg_buff *msg, struct bpf_map *map, void
1: + **key, u64 flags)
1:   *	Description
1:   *		This helper is used in programs implementing policies at the
1:   *		socket level. If the message *msg* is allowed to pass (i.e. if
1: @@ -3051,7 +3078,8 @@ union bpf_attr {
1:   *	Return
1:   *		**SK_PASS** on success, or **SK_DROP** on error.
1:   *
1: - * long bpf_sk_redirect_hash(struct sk_buff *skb, struct bpf_map *map, void *key, u64 flags)
1: + * long bpf_sk_redirect_hash(struct sk_buff *skb, struct bpf_map *map, void
1: + **key, u64 flags)
1:   *	Description
1:   *		This helper is used in programs implementing policies at the
1:   *		skb socket level. If the sk_buff *skb* is allowed to pass (i.e.
1: @@ -3102,7 +3130,8 @@ union bpf_attr {
1:   *	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_lwt_seg6_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len)
1: + * long bpf_lwt_seg6_store_bytes(struct sk_buff *skb, u32 offset, const void
1: + **from, u32 len)
1:   *	Description
1:   *		Store *len* bytes from address *from* into the packet
1:   *		associated to *skb*, at *offset*. Only the flags, tag and TLVs
1: @@ -3133,7 +3162,8 @@ union bpf_attr {
1:   *	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_lwt_seg6_action(struct sk_buff *skb, u32 action, void *param, u32 param_len)
1: + * long bpf_lwt_seg6_action(struct sk_buff *skb, u32 action, void *param, u32
1: + *param_len)
1:   *	Description
1:   *		Apply an IPv6 Segment Routing action of type *action* to the
1:   *		packet associated to *skb*. Each action takes a parameter
1: @@ -3246,7 +3276,8 @@ union bpf_attr {
1:   *	Return
1:   *		A pointer to the local storage area.
1:   *
1: - * long bpf_sk_select_reuseport(struct sk_reuseport_md *reuse, struct bpf_map *map, void *key, u64 flags)
1: + * long bpf_sk_select_reuseport(struct sk_reuseport_md *reuse, struct bpf_map
1: + **map, void *key, u64 flags)
1:   *	Description
1:   *		Select a **SO_REUSEPORT** socket from a
1:   *		**BPF_MAP_TYPE_REUSEPORT_ARRAY** *map*.
1: @@ -3273,7 +3304,8 @@ union bpf_attr {
1:   *	Return
1:   *		The id is returned or 0 in case the id could not be retrieved.
1:   *
1: - * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
1: + * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple,
1: + *u32 tuple_size, u64 netns, u64 flags)
1:   *	Description
1:   *		Look for TCP socket matching *tuple*, optionally in a child
1:   *		network namespace *netns*. The return value must be checked,
1: @@ -3310,7 +3342,8 @@ union bpf_attr {
1:   *		result is from *reuse*\ **->socks**\ [] using the hash of the
1:   *		tuple.
1:   *
1: - * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
1: + * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple,
1: + *u32 tuple_size, u64 netns, u64 flags)
1:   *	Description
1:   *		Look for UDP socket matching *tuple*, optionally in a child
1:   *		network namespace *netns*. The return value must be checked,
1: @@ -3377,7 +3410,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_msg_push_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
1: + * long bpf_msg_push_data(struct sk_msg_buff *msg, u32 start, u32 len, u64
1: + *flags)
1:   *	Description
1:   *		For socket policies, insert *len* bytes into *msg* at offset
1:   *		*start*.
1: @@ -3508,7 +3542,8 @@ union bpf_attr {
1:   *		A **struct bpf_sock** pointer on success, or **NULL** in
1:   *		case of failure.
1:   *
1: - * struct bpf_sock *bpf_skc_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
1: + * struct bpf_sock *bpf_skc_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple,
1: + *u32 tuple_size, u64 netns, u64 flags)
1:   *	Description
1:   *		Look for TCP socket matching *tuple*, optionally in a child
1:   *		network namespace *netns*. The return value must be checked,
1: @@ -3527,7 +3562,8 @@ union bpf_attr {
1:   *		result is from *reuse*\ **->socks**\ [] using the hash of the
1:   *		tuple.
1:   *
1: - * long bpf_tcp_check_syncookie(void *sk, void *iph, u32 iph_len, struct tcphdr *th, u32 th_len)
1: + * long bpf_tcp_check_syncookie(void *sk, void *iph, u32 iph_len, struct tcphdr
1: + **th, u32 th_len)
1:   * 	Description
1:   * 		Check whether *iph* and *th* contain a valid SYN cookie ACK for
1:   * 		the listening socket in *sk*.
1: @@ -3542,7 +3578,8 @@ union bpf_attr {
1:   * 		0 if *iph* and *th* are a valid SYN cookie ACK, or a negative
1:   * 		error otherwise.
1:   *
1: - * long bpf_sysctl_get_name(struct bpf_sysctl *ctx, char *buf, size_t buf_len, u64 flags)
1: + * long bpf_sysctl_get_name(struct bpf_sysctl *ctx, char *buf, size_t buf_len,
1: + *u64 flags)
1:   *	Description
1:   *		Get name of sysctl in /proc/sys/ and copy it into provided by
1:   *		program buffer *buf* of size *buf_len*.
1: @@ -3558,7 +3595,8 @@ union bpf_attr {
1:   *		**-E2BIG** if the buffer wasn't big enough (*buf* will contain
1:   *		truncated name in this case).
1:   *
1: - * long bpf_sysctl_get_current_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
1: + * long bpf_sysctl_get_current_value(struct bpf_sysctl *ctx, char *buf, size_t
1: + *buf_len)
1:   *	Description
1:   *		Get current value of sysctl as it is presented in /proc/sys
1:   *		(incl. newline, etc), and copy it as a string into provided
1: @@ -3577,7 +3615,8 @@ union bpf_attr {
1:   *		**-EINVAL** if current value was unavailable, e.g. because
1:   *		sysctl is uninitialized and read returns -EIO for it.
1:   *
1: - * long bpf_sysctl_get_new_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
1: + * long bpf_sysctl_get_new_value(struct bpf_sysctl *ctx, char *buf, size_t
1: + *buf_len)
1:   *	Description
1:   *		Get new value being written by user space to sysctl (before
1:   *		the actual write happens) and copy it as a string into
1: @@ -3594,7 +3633,8 @@ union bpf_attr {
1:   *
1:   *		**-EINVAL** if sysctl is being read.
1:   *
1: - * long bpf_sysctl_set_new_value(struct bpf_sysctl *ctx, const char *buf, size_t buf_len)
1: + * long bpf_sysctl_set_new_value(struct bpf_sysctl *ctx, const char *buf, size_t
1: + *buf_len)
1:   *	Description
1:   *		Override new value being written by user space to sysctl with
1:   *		value provided by program in buffer *buf* of size *buf_len*.
1: @@ -3635,7 +3675,8 @@ union bpf_attr {
1:   *
1:   *		**-ERANGE** if resulting value was out of range.
1:   *
1: - * long bpf_strtoul(const char *buf, size_t buf_len, u64 flags, unsigned long *res)
1: + * long bpf_strtoul(const char *buf, size_t buf_len, u64 flags, unsigned long
1: + **res)
1:   *	Description
1:   *		Convert the initial part of the string from buffer *buf* of
1:   *		size *buf_len* to an unsigned long integer according to the
1: @@ -3658,7 +3699,8 @@ union bpf_attr {
1:   *
1:   *		**-ERANGE** if resulting value was out of range.
1:   *
1: - * void *bpf_sk_storage_get(struct bpf_map *map, void *sk, void *value, u64 flags)
1: + * void *bpf_sk_storage_get(struct bpf_map *map, void *sk, void *value, u64
1: + *flags)
1:   *	Description
1:   *		Get a bpf-local-storage from a *sk*.
1:   *
1: @@ -3713,7 +3755,8 @@ union bpf_attr {
1:   *
1:   *		**-EAGAIN** if bpf program can try again.
1:   *
1: - * s64 bpf_tcp_gen_syncookie(void *sk, void *iph, u32 iph_len, struct tcphdr *th, u32 th_len)
1: + * s64 bpf_tcp_gen_syncookie(void *sk, void *iph, u32 iph_len, struct tcphdr
1: + **th, u32 th_len)
1:   *	Description
1:   *		Try to issue a SYN cookie for the packet with corresponding
1:   *		IP/TCP headers, *iph* and *th*, on the listening socket in *sk*.
1: @@ -3739,7 +3782,8 @@ union bpf_attr {
1:   *
1:   *		**-EPROTONOSUPPORT** IP packet version is not 4 or 6
1:   *
1: - * long bpf_skb_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
1: + * long bpf_skb_output(void *ctx, struct bpf_map *map, u64 flags, void *data,
1: + *u64 size)
1:   * 	Description
1:   * 		Write raw *data* blob into a special BPF perf event held by
1:   * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
1: @@ -3797,7 +3841,8 @@ union bpf_attr {
1:   * 			void bpf_sys_open(struct pt_regs *ctx)
1:   * 			{
1:   * 			        char buf[PATHLEN]; // PATHLEN is defined to 256
1: - * 			        int res = bpf_probe_read_user_str(buf, sizeof(buf),
1: + * 			        int res = bpf_probe_read_user_str(buf,
1: + *sizeof(buf),
1:   * 				                                  ctx->di);
1:   *
1:   * 				// Consume buf, for example push it to
1: @@ -3823,10 +3868,13 @@ union bpf_attr {
1:   *
1:   * long bpf_probe_read_kernel_str(void *dst, u32 size, const void *unsafe_ptr)
1:   * 	Description
1: - * 		Copy a NUL terminated string from an unsafe kernel address *unsafe_ptr*
1: - * 		to *dst*. Same semantics as with **bpf_probe_read_user_str**\ () apply.
1: + * 		Copy a NUL terminated string from an unsafe kernel address
1: + **unsafe_ptr*
1: + * 		to *dst*. Same semantics as with **bpf_probe_read_user_str**\ ()
1: + *apply.
1:   * 	Return
1: - * 		On success, the strictly positive length of the string, including
1: + * 		On success, the strictly positive length of the string,
1: + *including
1:   * 		the trailing NUL character. On error, a negative value.
1:   *
1:   * long bpf_tcp_send_ack(void *tp, u32 rcv_nxt)
1: @@ -3838,7 +3886,8 @@ union bpf_attr {
1:   *
1:   * long bpf_send_signal_thread(u32 sig)
1:   *	Description
1: - *		Send signal *sig* to the thread corresponding to the current task.
1: + *		Send signal *sig* to the thread corresponding to the current
1: + *task.
1:   *	Return
1:   *		0 on success or successfully queued.
1:   *
1: @@ -3856,10 +3905,12 @@ union bpf_attr {
1:   *	Return
1:   *		The 64 bit jiffies
1:   *
1: - * long bpf_read_branch_records(struct bpf_perf_event_data *ctx, void *buf, u32 size, u64 flags)
1: + * long bpf_read_branch_records(struct bpf_perf_event_data *ctx, void *buf, u32
1: + *size, u64 flags)
1:   *	Description
1:   *		For an eBPF program attached to a perf event, retrieve the
1: - *		branch records (**struct perf_branch_entry**) associated to *ctx*
1: + *		branch records (**struct perf_branch_entry**) associated to
1: + **ctx*
1:   *		and store it in the buffer pointed by *buf* up to size
1:   *		*size* bytes.
1:   *	Return
1: @@ -3875,19 +3926,24 @@ union bpf_attr {
1:   *
1:   *		**-ENOENT** if architecture does not support branch records.
1:   *
1: - * long bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
1: + * long bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info
1: + **nsdata, u32 size)
1:   *	Description
1: - *		Returns 0 on success, values for *pid* and *tgid* as seen from the current
1: + *		Returns 0 on success, values for *pid* and *tgid* as seen from the
1: + *current
1:   *		*namespace* will be returned in *nsdata*.
1:   *	Return
1:   *		0 on success, or one of the following in case of failure:
1:   *
1: - *		**-EINVAL** if dev and inum supplied don't match dev_t and inode number
1: - *              with nsfs of current task, or if dev conversion to dev_t lost high bits.
1: + *		**-EINVAL** if dev and inum supplied don't match dev_t and inode
1: + *number
1: + *              with nsfs of current task, or if dev conversion to dev_t lost
1: + *high bits.
1:   *
1:   *		**-ENOENT** if pidns does not exists for the current task.
1:   *
1: - * long bpf_xdp_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
1: + * long bpf_xdp_output(void *ctx, struct bpf_map *map, u64 flags, void *data,
1: + *u64 size)
1:   *	Description
1:   *		Write raw *data* blob into a special BPF perf event held by
1:   *		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
1: @@ -4031,44 +4087,57 @@ union bpf_attr {
1:   * 	Return
1:   * 		Current *ktime*.
1:   *
1: - * long bpf_seq_printf(struct seq_file *m, const char *fmt, u32 fmt_size, const void *data, u32 data_len)
1: + * long bpf_seq_printf(struct seq_file *m, const char *fmt, u32 fmt_size, const
1: + *void *data, u32 data_len)
1:   * 	Description
1:   * 		**bpf_seq_printf**\ () uses seq_file **seq_printf**\ () to print
1:   * 		out the format string.
1: - * 		The *m* represents the seq_file. The *fmt* and *fmt_size* are for
1: - * 		the format string itself. The *data* and *data_len* are format string
1: - * 		arguments. The *data* are a **u64** array and corresponding format string
1: - * 		values are stored in the array. For strings and pointers where pointees
1: - * 		are accessed, only the pointer values are stored in the *data* array.
1: + * 		The *m* represents the seq_file. The *fmt* and *fmt_size* are
1: + *for
1: + * 		the format string itself. The *data* and *data_len* are format
1: + *string
1: + * 		arguments. The *data* are a **u64** array and corresponding
1: + *format string
1: + * 		values are stored in the array. For strings and pointers where
1: + *pointees
1: + * 		are accessed, only the pointer values are stored in the *data*
1: + *array.
1:   * 		The *data_len* is the size of *data* in bytes.
1:   *
1:   *		Formats **%s**, **%p{i,I}{4,6}** requires to read kernel memory.
1:   *		Reading kernel memory may fail due to either invalid address or
1: - *		valid address but requiring a major memory fault. If reading kernel memory
1: + *		valid address but requiring a major memory fault. If reading
1: + *kernel memory
1:   *		fails, the string for **%s** will be an empty string, and the ip
1:   *		address for **%p{i,I}{4,6}** will be 0. Not returning error to
1: - *		bpf program is consistent with what **bpf_trace_printk**\ () does for now.
1: + *		bpf program is consistent with what **bpf_trace_printk**\ () does
1: + *for now.
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure:
1:   *
1:   *		**-EBUSY** if per-CPU memory copy buffer is busy, can try again
1:   *		by returning 1 from bpf program.
1:   *
1: - *		**-EINVAL** if arguments are invalid, or if *fmt* is invalid/unsupported.
1: + *		**-EINVAL** if arguments are invalid, or if *fmt* is
1: + *invalid/unsupported.
1:   *
1:   *		**-E2BIG** if *fmt* contains too many format specifiers.
1:   *
1: - *		**-EOVERFLOW** if an overflow happened: The same object will be tried again.
1: + *		**-EOVERFLOW** if an overflow happened: The same object will be
1: + *tried again.
1:   *
1:   * long bpf_seq_write(struct seq_file *m, const void *data, u32 len)
1:   * 	Description
1: - * 		**bpf_seq_write**\ () uses seq_file **seq_write**\ () to write the data.
1: - * 		The *m* represents the seq_file. The *data* and *len* represent the
1: + * 		**bpf_seq_write**\ () uses seq_file **seq_write**\ () to write
1: + *the data.
1: + * 		The *m* represents the seq_file. The *data* and *len* represent
1: + *the
1:   * 		data to write in bytes.
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure:
1:   *
1: - *		**-EOVERFLOW** if an overflow happened: The same object will be tried again.
1: + *		**-EOVERFLOW** if an overflow happened: The same object will be
1: + *tried again.
1:   *
1:   * u64 bpf_sk_cgroup_id(void *sk)
1:   *	Description
1: @@ -4112,9 +4181,12 @@ union bpf_attr {
1:   * 		If **0** is specified in *flags*, an adaptive notification
1:   * 		of new data availability is sent.
1:   *
1: - * 		An adaptive notification is a notification sent whenever the user-space
1: - * 		process has caught up and consumed all available payloads. In case the user-space
1: - * 		process is still processing a previous payload, then no notification is needed
1: + * 		An adaptive notification is a notification sent whenever the
1: + *user-space
1: + * 		process has caught up and consumed all available payloads. In
1: + *case the user-space
1: + * 		process is still processing a previous payload, then no
1: + *notification is needed
1:   * 		as it will process the newly added payload automatically.
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1: @@ -4137,7 +4209,8 @@ union bpf_attr {
1:   * 		If **0** is specified in *flags*, an adaptive notification
1:   * 		of new data availability is sent.
1:   *
1: - * 		See 'bpf_ringbuf_output()' for the definition of adaptive notification.
1: + * 		See 'bpf_ringbuf_output()' for the definition of adaptive
1: + *notification.
1:   * 	Return
1:   * 		Nothing. Always succeeds.
1:   *
1: @@ -4151,7 +4224,8 @@ union bpf_attr {
1:   * 		If **0** is specified in *flags*, an adaptive notification
1:   * 		of new data availability is sent.
1:   *
1: - * 		See 'bpf_ringbuf_output()' for the definition of adaptive notification.
1: + * 		See 'bpf_ringbuf_output()' for the definition of adaptive
1: + *notification.
1:   * 	Return
1:   * 		Nothing. Always succeeds.
1:   *
1: @@ -4218,7 +4292,8 @@ union bpf_attr {
1:   *
1:   * struct tcp_timewait_sock *bpf_skc_to_tcp_timewait_sock(void *sk)
1:   * 	Description
1: - *		Dynamically cast a *sk* pointer to a *tcp_timewait_sock* pointer.
1: + *		Dynamically cast a *sk* pointer to a *tcp_timewait_sock*
1: + *pointer.
1:   *	Return
1:   *		*sk* if casting is valid, or **NULL** otherwise.
1:   *
1: @@ -4234,7 +4309,8 @@ union bpf_attr {
1:   *	Return
1:   *		*sk* if casting is valid, or **NULL** otherwise.
1:   *
1: - * long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags)
1: + * long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64
1: + *flags)
1:   *	Description
1:   *		Return a user or a kernel stack in bpf program provided buffer.
1:   *		To achieve this, the helper needs *task*, which is a valid
1: @@ -4266,7 +4342,8 @@ union bpf_attr {
1:   *		A non-negative value equal to or less than *size* on success,
1:   *		or a negative error in case of failure.
1:   *
1: - * long bpf_load_hdr_opt(struct bpf_sock_ops *skops, void *searchby_res, u32 len, u64 flags)
1: + * long bpf_load_hdr_opt(struct bpf_sock_ops *skops, void *searchby_res, u32
1: + *len, u64 flags)
1:   *	Description
1:   *		Load header option.  Support reading a particular TCP header
1:   *		option for bpf program (**BPF_PROG_TYPE_SOCK_OPS**).
1: @@ -4329,7 +4406,8 @@ union bpf_attr {
1:   *		**-EPERM** if the helper cannot be used under the current
1:   *		*skops*\ **->op**.
1:   *
1: - * long bpf_store_hdr_opt(struct bpf_sock_ops *skops, const void *from, u32 len, u64 flags)
1: + * long bpf_store_hdr_opt(struct bpf_sock_ops *skops, const void *from, u32 len,
1: + *u64 flags)
1:   *	Description
1:   *		Store header option.  The data will be copied
1:   *		from buffer *from* with length *len* to the TCP header.
1: @@ -4384,7 +4462,8 @@ union bpf_attr {
1:   *		**-EPERM** if the helper cannot be used under the current
1:   *		*skops*\ **->op**.
1:   *
1: - * void *bpf_inode_storage_get(struct bpf_map *map, void *inode, void *value, u64 flags)
1: + * void *bpf_inode_storage_get(struct bpf_map *map, void *inode, void *value,
1: + *u64 flags)
1:   *	Description
1:   *		Get a bpf_local_storage from an *inode*.
1:   *
1: @@ -4439,7 +4518,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		0 on success, or a negative error in case of failure.
1:   *
1: - * long bpf_snprintf_btf(char *str, u32 str_size, struct btf_ptr *ptr, u32 btf_ptr_size, u64 flags)
1: + * long bpf_snprintf_btf(char *str, u32 str_size, struct btf_ptr *ptr, u32
1: + *btf_ptr_size, u64 flags)
1:   *	Description
1:   *		Use BTF to store a string representation of *ptr*->ptr in *str*,
1:   *		using *ptr*->type_id.  This value should specify the type
1: @@ -4475,7 +4555,8 @@ union bpf_attr {
1:   *		written if output had to be truncated due to string size),
1:   *		or a negative error in cases of failure.
1:   *
1: - * long bpf_seq_printf_btf(struct seq_file *m, struct btf_ptr *ptr, u32 ptr_size, u64 flags)
1: + * long bpf_seq_printf_btf(struct seq_file *m, struct btf_ptr *ptr, u32
1: + *ptr_size, u64 flags)
1:   *	Description
1:   *		Use BTF to write to seq_write a string representation of
1:   *		*ptr*->ptr, using *ptr*->type_id as per bpf_snprintf_btf().
1: @@ -4492,7 +4573,8 @@ union bpf_attr {
1:   * 	Return
1:   * 		The id is returned or 0 in case the id could not be retrieved.
1:   *
1: - * long bpf_redirect_neigh(u32 ifindex, struct bpf_redir_neigh *params, int plen, u64 flags)
1: + * long bpf_redirect_neigh(u32 ifindex, struct bpf_redir_neigh *params, int
1: + *plen, u64 flags)
1:   * 	Description
1:   * 		Redirect the packet to another net device of index *ifindex*
1:   * 		and fill in L2 addresses from neighboring subsystem. This helper
1: @@ -4558,7 +4640,8 @@ union bpf_attr {
1:   * 		The helper returns **TC_ACT_REDIRECT** on success or
1:   * 		**TC_ACT_SHOT** on error.
1:   *
1: - * void *bpf_task_storage_get(struct bpf_map *map, struct task_struct *task, void *value, u64 flags)
1: + * void *bpf_task_storage_get(struct bpf_map *map, struct task_struct *task,
1: + *void *value, u64 flags)
1:   *	Description
1:   *		Get a bpf_local_storage from the *task*.
1:   *
1: @@ -4566,7 +4649,8 @@ union bpf_attr {
1:   *		a *map* with *task* as the **key**.  From this
1:   *		perspective,  the usage is not much different from
1:   *		**bpf_map_lookup_elem**\ (*map*, **&**\ *task*) except this
1: - *		helper enforces the key must be an task_struct and the map must also
1: + *		helper enforces the key must be an task_struct and the map must
1: + *also
1:   *		be a **BPF_MAP_TYPE_TASK_STORAGE**.
1:   *
1:   *		Underneath, the value is stored locally at *task* instead of
1: @@ -4640,7 +4724,8 @@ union bpf_attr {
1:   *		A pointer to a struct socket on success or NULL if the file is
1:   *		not a socket.
1:   *
1: - * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)
1: + * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64
1: + *flags)
1:   *	Description
1:   *		Check packet size against exceeding MTU of net device (based
1:   *		on *ifindex*).  This helper will likely be used in combination
1: @@ -4707,7 +4792,8 @@ union bpf_attr {
1:   *		* **BPF_MTU_CHK_RET_FRAG_NEEDED**
1:   *		* **BPF_MTU_CHK_RET_SEGS_TOOBIG**
1:   *
1: - * long bpf_for_each_map_elem(struct bpf_map *map, void *callback_fn, void *callback_ctx, u64 flags)
1: + * long bpf_for_each_map_elem(struct bpf_map *map, void *callback_fn, void
1: + **callback_ctx, u64 flags)
1:   *	Description
1:   *		For each element in **map**, call **callback_fn** function with
1:   *		**map**, **callback_ctx** and other map-specific parameters.
1: @@ -4723,20 +4809,25 @@ union bpf_attr {
1:   *		BPF_MAP_TYPE_LRU_HASH, BPF_MAP_TYPE_LRU_PERCPU_HASH,
1:   *		BPF_MAP_TYPE_ARRAY, BPF_MAP_TYPE_PERCPU_ARRAY
1:   *
1: - *		long (\*callback_fn)(struct bpf_map \*map, const void \*key, void \*value, void \*ctx);
1: + *		long (\*callback_fn)(struct bpf_map \*map, const void \*key, void
1: + *\*value, void \*ctx);
1:   *
1: - *		For per_cpu maps, the map_value is the value on the cpu where the
1: + *		For per_cpu maps, the map_value is the value on the cpu where
1: + *the
1:   *		bpf_prog is running.
1:   *
1: - *		If **callback_fn** return 0, the helper will continue to the next
1: + *		If **callback_fn** return 0, the helper will continue to the
1: + *next
1:   *		element. If return value is 1, the helper will skip the rest of
1:   *		elements and return. Other return values are not used now.
1:   *
1:   *	Return
1: - *		The number of traversed map elements for success, **-EINVAL** for
1: + *		The number of traversed map elements for success, **-EINVAL**
1: + *for
1:   *		invalid **flags**.
1:   *
1: - * long bpf_snprintf(char *str, u32 str_size, const char *fmt, u64 *data, u32 data_len)
1: + * long bpf_snprintf(char *str, u32 str_size, const char *fmt, u64 *data, u32
1: + *data_len)
1:   *	Description
1:   *		Outputs a string into the **str** buffer of size **str_size**
1:   *		based on a format string stored in a read-only map pointed by
1: @@ -4771,7 +4862,8 @@ union bpf_attr {
1:   *
1:   * long bpf_btf_find_by_name_kind(char *name, int name_sz, u32 kind, int flags)
1:   * 	Description
1: - * 		Find BTF type with given name and kind in vmlinux BTF or in module's BTFs.
1: + * 		Find BTF type with given name and kind in vmlinux BTF or in
1: + *module's BTFs.
1:   * 	Return
1:   * 		Returns btf_id and btf_obj_fd in lower and upper 32 bits.
1:   *
1: @@ -4781,185 +4873,71 @@ union bpf_attr {
1:   * 	Return
1:   * 		A syscall result.
1:   */
1: -#define __BPF_FUNC_MAPPER(FN)		\
1: -	FN(unspec),			\
1: -	FN(map_lookup_elem),		\
1: -	FN(map_update_elem),		\
1: -	FN(map_delete_elem),		\
1: -	FN(probe_read),			\
1: -	FN(ktime_get_ns),		\
1: -	FN(trace_printk),		\
1: -	FN(get_prandom_u32),		\
1: -	FN(get_smp_processor_id),	\
1: -	FN(skb_store_bytes),		\
1: -	FN(l3_csum_replace),		\
1: -	FN(l4_csum_replace),		\
1: -	FN(tail_call),			\
1: -	FN(clone_redirect),		\
1: -	FN(get_current_pid_tgid),	\
1: -	FN(get_current_uid_gid),	\
1: -	FN(get_current_comm),		\
1: -	FN(get_cgroup_classid),		\
1: -	FN(skb_vlan_push),		\
1: -	FN(skb_vlan_pop),		\
1: -	FN(skb_get_tunnel_key),		\
1: -	FN(skb_set_tunnel_key),		\
1: -	FN(perf_event_read),		\
1: -	FN(redirect),			\
1: -	FN(get_route_realm),		\
1: -	FN(perf_event_output),		\
1: -	FN(skb_load_bytes),		\
1: -	FN(get_stackid),		\
1: -	FN(csum_diff),			\
1: -	FN(skb_get_tunnel_opt),		\
1: -	FN(skb_set_tunnel_opt),		\
1: -	FN(skb_change_proto),		\
1: -	FN(skb_change_type),		\
1: -	FN(skb_under_cgroup),		\
1: -	FN(get_hash_recalc),		\
1: -	FN(get_current_task),		\
1: -	FN(probe_write_user),		\
1: -	FN(current_task_under_cgroup),	\
1: -	FN(skb_change_tail),		\
1: -	FN(skb_pull_data),		\
1: -	FN(csum_update),		\
1: -	FN(set_hash_invalid),		\
1: -	FN(get_numa_node_id),		\
1: -	FN(skb_change_head),		\
1: -	FN(xdp_adjust_head),		\
1: -	FN(probe_read_str),		\
1: -	FN(get_socket_cookie),		\
1: -	FN(get_socket_uid),		\
1: -	FN(set_hash),			\
1: -	FN(setsockopt),			\
1: -	FN(skb_adjust_room),		\
1: -	FN(redirect_map),		\
1: -	FN(sk_redirect_map),		\
1: -	FN(sock_map_update),		\
1: -	FN(xdp_adjust_meta),		\
1: -	FN(perf_event_read_value),	\
1: -	FN(perf_prog_read_value),	\
1: -	FN(getsockopt),			\
1: -	FN(override_return),		\
1: -	FN(sock_ops_cb_flags_set),	\
1: -	FN(msg_redirect_map),		\
1: -	FN(msg_apply_bytes),		\
1: -	FN(msg_cork_bytes),		\
1: -	FN(msg_pull_data),		\
1: -	FN(bind),			\
1: -	FN(xdp_adjust_tail),		\
1: -	FN(skb_get_xfrm_state),		\
1: -	FN(get_stack),			\
1: -	FN(skb_load_bytes_relative),	\
1: -	FN(fib_lookup),			\
1: -	FN(sock_hash_update),		\
1: -	FN(msg_redirect_hash),		\
1: -	FN(sk_redirect_hash),		\
1: -	FN(lwt_push_encap),		\
1: -	FN(lwt_seg6_store_bytes),	\
1: -	FN(lwt_seg6_adjust_srh),	\
1: -	FN(lwt_seg6_action),		\
1: -	FN(rc_repeat),			\
1: -	FN(rc_keydown),			\
1: -	FN(skb_cgroup_id),		\
1: -	FN(get_current_cgroup_id),	\
1: -	FN(get_local_storage),		\
1: -	FN(sk_select_reuseport),	\
1: -	FN(skb_ancestor_cgroup_id),	\
1: -	FN(sk_lookup_tcp),		\
1: -	FN(sk_lookup_udp),		\
1: -	FN(sk_release),			\
1: -	FN(map_push_elem),		\
1: -	FN(map_pop_elem),		\
1: -	FN(map_peek_elem),		\
1: -	FN(msg_push_data),		\
1: -	FN(msg_pop_data),		\
1: -	FN(rc_pointer_rel),		\
1: -	FN(spin_lock),			\
1: -	FN(spin_unlock),		\
1: -	FN(sk_fullsock),		\
1: -	FN(tcp_sock),			\
1: -	FN(skb_ecn_set_ce),		\
1: -	FN(get_listener_sock),		\
1: -	FN(skc_lookup_tcp),		\
1: -	FN(tcp_check_syncookie),	\
1: -	FN(sysctl_get_name),		\
1: -	FN(sysctl_get_current_value),	\
1: -	FN(sysctl_get_new_value),	\
1: -	FN(sysctl_set_new_value),	\
1: -	FN(strtol),			\
1: -	FN(strtoul),			\
1: -	FN(sk_storage_get),		\
1: -	FN(sk_storage_delete),		\
1: -	FN(send_signal),		\
1: -	FN(tcp_gen_syncookie),		\
1: -	FN(skb_output),			\
1: -	FN(probe_read_user),		\
1: -	FN(probe_read_kernel),		\
1: -	FN(probe_read_user_str),	\
1: -	FN(probe_read_kernel_str),	\
1: -	FN(tcp_send_ack),		\
1: -	FN(send_signal_thread),		\
1: -	FN(jiffies64),			\
1: -	FN(read_branch_records),	\
1: -	FN(get_ns_current_pid_tgid),	\
1: -	FN(xdp_output),			\
1: -	FN(get_netns_cookie),		\
1: -	FN(get_current_ancestor_cgroup_id),	\
1: -	FN(sk_assign),			\
1: -	FN(ktime_get_boot_ns),		\
1: -	FN(seq_printf),			\
1: -	FN(seq_write),			\
1: -	FN(sk_cgroup_id),		\
1: -	FN(sk_ancestor_cgroup_id),	\
1: -	FN(ringbuf_output),		\
1: -	FN(ringbuf_reserve),		\
1: -	FN(ringbuf_submit),		\
1: -	FN(ringbuf_discard),		\
1: -	FN(ringbuf_query),		\
1: -	FN(csum_level),			\
1: -	FN(skc_to_tcp6_sock),		\
1: -	FN(skc_to_tcp_sock),		\
1: -	FN(skc_to_tcp_timewait_sock),	\
1: -	FN(skc_to_tcp_request_sock),	\
1: -	FN(skc_to_udp6_sock),		\
1: -	FN(get_task_stack),		\
1: -	FN(load_hdr_opt),		\
1: -	FN(store_hdr_opt),		\
1: -	FN(reserve_hdr_opt),		\
1: -	FN(inode_storage_get),		\
1: -	FN(inode_storage_delete),	\
1: -	FN(d_path),			\
1: -	FN(copy_from_user),		\
1: -	FN(snprintf_btf),		\
1: -	FN(seq_printf_btf),		\
1: -	FN(skb_cgroup_classid),		\
1: -	FN(redirect_neigh),		\
1: -	FN(per_cpu_ptr),		\
1: -	FN(this_cpu_ptr),		\
1: -	FN(redirect_peer),		\
1: -	FN(task_storage_get),		\
1: -	FN(task_storage_delete),	\
1: -	FN(get_current_task_btf),	\
1: -	FN(bprm_opts_set),		\
1: -	FN(ktime_get_coarse_ns),	\
1: -	FN(ima_inode_hash),		\
1: -	FN(sock_from_file),		\
1: -	FN(check_mtu),			\
1: -	FN(for_each_map_elem),		\
1: -	FN(snprintf),			\
1: -	FN(sys_bpf),			\
1: -	FN(btf_find_by_name_kind),	\
1: -	FN(sys_close),			\
1: -	/* */
1: +#define __BPF_FUNC_MAPPER(FN)                                                  \
1: +  FN(unspec)                                                                   \
1: +  , FN(map_lookup_elem), FN(map_update_elem), FN(map_delete_elem),             \
1: +      FN(probe_read), FN(ktime_get_ns), FN(trace_printk), FN(get_prandom_u32), \
1: +      FN(get_smp_processor_id), FN(skb_store_bytes), FN(l3_csum_replace),      \
1: +      FN(l4_csum_replace), FN(tail_call), FN(clone_redirect),                  \
1: +      FN(get_current_pid_tgid), FN(get_current_uid_gid), FN(get_current_comm), \
1: +      FN(get_cgroup_classid), FN(skb_vlan_push), FN(skb_vlan_pop),             \
1: +      FN(skb_get_tunnel_key), FN(skb_set_tunnel_key), FN(perf_event_read),     \
1: +      FN(redirect), FN(get_route_realm), FN(perf_event_output),                \
1: +      FN(skb_load_bytes), FN(get_stackid), FN(csum_diff),                      \
1: +      FN(skb_get_tunnel_opt), FN(skb_set_tunnel_opt), FN(skb_change_proto),    \
1: +      FN(skb_change_type), FN(skb_under_cgroup), FN(get_hash_recalc),          \
1: +      FN(get_current_task), FN(probe_write_user),                              \
1: +      FN(current_task_under_cgroup), FN(skb_change_tail), FN(skb_pull_data),   \
1: +      FN(csum_update), FN(set_hash_invalid), FN(get_numa_node_id),             \
1: +      FN(skb_change_head), FN(xdp_adjust_head), FN(probe_read_str),            \
1: +      FN(get_socket_cookie), FN(get_socket_uid), FN(set_hash), FN(setsockopt), \
1: +      FN(skb_adjust_room), FN(redirect_map), FN(sk_redirect_map),              \
1: +      FN(sock_map_update), FN(xdp_adjust_meta), FN(perf_event_read_value),     \
1: +      FN(perf_prog_read_value), FN(getsockopt), FN(override_return),           \
1: +      FN(sock_ops_cb_flags_set), FN(msg_redirect_map), FN(msg_apply_bytes),    \
1: +      FN(msg_cork_bytes), FN(msg_pull_data), FN(bind), FN(xdp_adjust_tail),    \
1: +      FN(skb_get_xfrm_state), FN(get_stack), FN(skb_load_bytes_relative),      \
1: +      FN(fib_lookup), FN(sock_hash_update), FN(msg_redirect_hash),             \
1: +      FN(sk_redirect_hash), FN(lwt_push_encap), FN(lwt_seg6_store_bytes),      \
1: +      FN(lwt_seg6_adjust_srh), FN(lwt_seg6_action), FN(rc_repeat),             \
1: +      FN(rc_keydown), FN(skb_cgroup_id), FN(get_current_cgroup_id),            \
1: +      FN(get_local_storage), FN(sk_select_reuseport),                          \
1: +      FN(skb_ancestor_cgroup_id), FN(sk_lookup_tcp), FN(sk_lookup_udp),        \
1: +      FN(sk_release), FN(map_push_elem), FN(map_pop_elem), FN(map_peek_elem),  \
1: +      FN(msg_push_data), FN(msg_pop_data), FN(rc_pointer_rel), FN(spin_lock),  \
1: +      FN(spin_unlock), FN(sk_fullsock), FN(tcp_sock), FN(skb_ecn_set_ce),      \
1: +      FN(get_listener_sock), FN(skc_lookup_tcp), FN(tcp_check_syncookie),      \
1: +      FN(sysctl_get_name), FN(sysctl_get_current_value),                       \
1: +      FN(sysctl_get_new_value), FN(sysctl_set_new_value), FN(strtol),          \
1: +      FN(strtoul), FN(sk_storage_get), FN(sk_storage_delete), FN(send_signal), \
1: +      FN(tcp_gen_syncookie), FN(skb_output), FN(probe_read_user),              \
1: +      FN(probe_read_kernel), FN(probe_read_user_str),                          \
1: +      FN(probe_read_kernel_str), FN(tcp_send_ack), FN(send_signal_thread),     \
1: +      FN(jiffies64), FN(read_branch_records), FN(get_ns_current_pid_tgid),     \
1: +      FN(xdp_output), FN(get_netns_cookie),                                    \
1: +      FN(get_current_ancestor_cgroup_id), FN(sk_assign),                       \
1: +      FN(ktime_get_boot_ns), FN(seq_printf), FN(seq_write), FN(sk_cgroup_id),  \
1: +      FN(sk_ancestor_cgroup_id), FN(ringbuf_output), FN(ringbuf_reserve),      \
1: +      FN(ringbuf_submit), FN(ringbuf_discard), FN(ringbuf_query),              \
1: +      FN(csum_level), FN(skc_to_tcp6_sock), FN(skc_to_tcp_sock),               \
1: +      FN(skc_to_tcp_timewait_sock), FN(skc_to_tcp_request_sock),               \
1: +      FN(skc_to_udp6_sock), FN(get_task_stack), FN(load_hdr_opt),              \
1: +      FN(store_hdr_opt), FN(reserve_hdr_opt), FN(inode_storage_get),           \
1: +      FN(inode_storage_delete), FN(d_path), FN(copy_from_user),                \
1: +      FN(snprintf_btf), FN(seq_printf_btf), FN(skb_cgroup_classid),            \
1: +      FN(redirect_neigh), FN(per_cpu_ptr), FN(this_cpu_ptr),                   \
1: +      FN(redirect_peer), FN(task_storage_get), FN(task_storage_delete),        \
1: +      FN(get_current_task_btf), FN(bprm_opts_set), FN(ktime_get_coarse_ns),    \
1: +      FN(ima_inode_hash), FN(sock_from_file), FN(check_mtu),                   \
1: +      FN(for_each_map_elem), FN(snprintf), FN(sys_bpf),                        \
1: +      FN(btf_find_by_name_kind), FN(sys_close), /* */
1:  
1:  /* integer value in 'imm' field of BPF_CALL instruction selects which helper
1:   * function eBPF program intends to call
1:   */
1: -#define __BPF_ENUM_FN(x) BPF_FUNC_ ## x
1: +#define __BPF_ENUM_FN(x) BPF_FUNC_##x
1:  enum bpf_func_id {
1: -	__BPF_FUNC_MAPPER(__BPF_ENUM_FN)
1: -	__BPF_FUNC_MAX_ID,
1: +  __BPF_FUNC_MAPPER(__BPF_ENUM_FN) __BPF_FUNC_MAX_ID,
1:  };
1:  #undef __BPF_ENUM_FN
1:  
1: @@ -4967,245 +4945,244 @@ enum bpf_func_id {
1:  
1:  /* BPF_FUNC_skb_store_bytes flags. */
1:  enum {
1: -	BPF_F_RECOMPUTE_CSUM		= (1ULL << 0),
1: -	BPF_F_INVALIDATE_HASH		= (1ULL << 1),
1: +  BPF_F_RECOMPUTE_CSUM = (1ULL << 0),
1: +  BPF_F_INVALIDATE_HASH = (1ULL << 1),
1:  };
1:  
1:  /* BPF_FUNC_l3_csum_replace and BPF_FUNC_l4_csum_replace flags.
1:   * First 4 bits are for passing the header field size.
1:   */
1:  enum {
1: -	BPF_F_HDR_FIELD_MASK		= 0xfULL,
1: +  BPF_F_HDR_FIELD_MASK = 0xfULL,
1:  };
1:  
1:  /* BPF_FUNC_l4_csum_replace flags. */
1:  enum {
1: -	BPF_F_PSEUDO_HDR		= (1ULL << 4),
1: -	BPF_F_MARK_MANGLED_0		= (1ULL << 5),
1: -	BPF_F_MARK_ENFORCE		= (1ULL << 6),
1: +  BPF_F_PSEUDO_HDR = (1ULL << 4),
1: +  BPF_F_MARK_MANGLED_0 = (1ULL << 5),
1: +  BPF_F_MARK_ENFORCE = (1ULL << 6),
1:  };
1:  
1:  /* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
1:  enum {
1: -	BPF_F_INGRESS			= (1ULL << 0),
1: +  BPF_F_INGRESS = (1ULL << 0),
1:  };
1:  
1:  /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
1:  enum {
1: -	BPF_F_TUNINFO_IPV6		= (1ULL << 0),
1: +  BPF_F_TUNINFO_IPV6 = (1ULL << 0),
1:  };
1:  
1:  /* flags for both BPF_FUNC_get_stackid and BPF_FUNC_get_stack. */
1:  enum {
1: -	BPF_F_SKIP_FIELD_MASK		= 0xffULL,
1: -	BPF_F_USER_STACK		= (1ULL << 8),
1: -/* flags used by BPF_FUNC_get_stackid only. */
1: -	BPF_F_FAST_STACK_CMP		= (1ULL << 9),
1: -	BPF_F_REUSE_STACKID		= (1ULL << 10),
1: -/* flags used by BPF_FUNC_get_stack only. */
1: -	BPF_F_USER_BUILD_ID		= (1ULL << 11),
1: +  BPF_F_SKIP_FIELD_MASK = 0xffULL,
1: +  BPF_F_USER_STACK = (1ULL << 8),
1: +  /* flags used by BPF_FUNC_get_stackid only. */
1: +  BPF_F_FAST_STACK_CMP = (1ULL << 9),
1: +  BPF_F_REUSE_STACKID = (1ULL << 10),
1: +  /* flags used by BPF_FUNC_get_stack only. */
1: +  BPF_F_USER_BUILD_ID = (1ULL << 11),
1:  };
1:  
1:  /* BPF_FUNC_skb_set_tunnel_key flags. */
1:  enum {
1: -	BPF_F_ZERO_CSUM_TX		= (1ULL << 1),
1: -	BPF_F_DONT_FRAGMENT		= (1ULL << 2),
1: -	BPF_F_SEQ_NUMBER		= (1ULL << 3),
1: +  BPF_F_ZERO_CSUM_TX = (1ULL << 1),
1: +  BPF_F_DONT_FRAGMENT = (1ULL << 2),
1: +  BPF_F_SEQ_NUMBER = (1ULL << 3),
1:  };
1:  
1:  /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
1:   * BPF_FUNC_perf_event_read_value flags.
1:   */
1:  enum {
1: -	BPF_F_INDEX_MASK		= 0xffffffffULL,
1: -	BPF_F_CURRENT_CPU		= BPF_F_INDEX_MASK,
1: -/* BPF_FUNC_perf_event_output for sk_buff input context. */
1: -	BPF_F_CTXLEN_MASK		= (0xfffffULL << 32),
1: +  BPF_F_INDEX_MASK = 0xffffffffULL,
1: +  BPF_F_CURRENT_CPU = BPF_F_INDEX_MASK,
1: +  /* BPF_FUNC_perf_event_output for sk_buff input context. */
1: +  BPF_F_CTXLEN_MASK = (0xfffffULL << 32),
1:  };
1:  
1:  /* Current network namespace */
1:  enum {
1: -	BPF_F_CURRENT_NETNS		= (-1L),
1: +  BPF_F_CURRENT_NETNS = (-1L),
1:  };
1:  
1:  /* BPF_FUNC_csum_level level values. */
1:  enum {
1: -	BPF_CSUM_LEVEL_QUERY,
1: -	BPF_CSUM_LEVEL_INC,
1: -	BPF_CSUM_LEVEL_DEC,
1: -	BPF_CSUM_LEVEL_RESET,
1: +  BPF_CSUM_LEVEL_QUERY,
1: +  BPF_CSUM_LEVEL_INC,
1: +  BPF_CSUM_LEVEL_DEC,
1: +  BPF_CSUM_LEVEL_RESET,
1:  };
1:  
1:  /* BPF_FUNC_skb_adjust_room flags. */
1:  enum {
1: -	BPF_F_ADJ_ROOM_FIXED_GSO	= (1ULL << 0),
1: -	BPF_F_ADJ_ROOM_ENCAP_L3_IPV4	= (1ULL << 1),
1: -	BPF_F_ADJ_ROOM_ENCAP_L3_IPV6	= (1ULL << 2),
1: -	BPF_F_ADJ_ROOM_ENCAP_L4_GRE	= (1ULL << 3),
1: -	BPF_F_ADJ_ROOM_ENCAP_L4_UDP	= (1ULL << 4),
1: -	BPF_F_ADJ_ROOM_NO_CSUM_RESET	= (1ULL << 5),
1: -	BPF_F_ADJ_ROOM_ENCAP_L2_ETH	= (1ULL << 6),
1: +  BPF_F_ADJ_ROOM_FIXED_GSO = (1ULL << 0),
1: +  BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = (1ULL << 1),
1: +  BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = (1ULL << 2),
1: +  BPF_F_ADJ_ROOM_ENCAP_L4_GRE = (1ULL << 3),
1: +  BPF_F_ADJ_ROOM_ENCAP_L4_UDP = (1ULL << 4),
1: +  BPF_F_ADJ_ROOM_NO_CSUM_RESET = (1ULL << 5),
1: +  BPF_F_ADJ_ROOM_ENCAP_L2_ETH = (1ULL << 6),
1:  };
1:  
1:  enum {
1: -	BPF_ADJ_ROOM_ENCAP_L2_MASK	= 0xff,
1: -	BPF_ADJ_ROOM_ENCAP_L2_SHIFT	= 56,
1: +  BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff,
1: +  BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 56,
1:  };
1:  
1: -#define BPF_F_ADJ_ROOM_ENCAP_L2(len)	(((__u64)len & \
1: -					  BPF_ADJ_ROOM_ENCAP_L2_MASK) \
1: -					 << BPF_ADJ_ROOM_ENCAP_L2_SHIFT)
1: +#define BPF_F_ADJ_ROOM_ENCAP_L2(len) \
1: +  (((__u64)len & BPF_ADJ_ROOM_ENCAP_L2_MASK) << BPF_ADJ_ROOM_ENCAP_L2_SHIFT)
1:  
1:  /* BPF_FUNC_sysctl_get_name flags. */
1:  enum {
1: -	BPF_F_SYSCTL_BASE_NAME		= (1ULL << 0),
1: +  BPF_F_SYSCTL_BASE_NAME = (1ULL << 0),
1:  };
1:  
1:  /* BPF_FUNC_<kernel_obj>_storage_get flags */
1:  enum {
1: -	BPF_LOCAL_STORAGE_GET_F_CREATE	= (1ULL << 0),
1: -	/* BPF_SK_STORAGE_GET_F_CREATE is only kept for backward compatibility
1: -	 * and BPF_LOCAL_STORAGE_GET_F_CREATE must be used instead.
1: -	 */
1: -	BPF_SK_STORAGE_GET_F_CREATE  = BPF_LOCAL_STORAGE_GET_F_CREATE,
1: +  BPF_LOCAL_STORAGE_GET_F_CREATE = (1ULL << 0),
1: +  /* BPF_SK_STORAGE_GET_F_CREATE is only kept for backward compatibility
1: +   * and BPF_LOCAL_STORAGE_GET_F_CREATE must be used instead.
1: +   */
1: +  BPF_SK_STORAGE_GET_F_CREATE = BPF_LOCAL_STORAGE_GET_F_CREATE,
1:  };
1:  
1:  /* BPF_FUNC_read_branch_records flags. */
1:  enum {
1: -	BPF_F_GET_BRANCH_RECORDS_SIZE	= (1ULL << 0),
1: +  BPF_F_GET_BRANCH_RECORDS_SIZE = (1ULL << 0),
1:  };
1:  
1:  /* BPF_FUNC_bpf_ringbuf_commit, BPF_FUNC_bpf_ringbuf_discard, and
1:   * BPF_FUNC_bpf_ringbuf_output flags.
1:   */
1:  enum {
1: -	BPF_RB_NO_WAKEUP		= (1ULL << 0),
1: -	BPF_RB_FORCE_WAKEUP		= (1ULL << 1),
1: +  BPF_RB_NO_WAKEUP = (1ULL << 0),
1: +  BPF_RB_FORCE_WAKEUP = (1ULL << 1),
1:  };
1:  
1:  /* BPF_FUNC_bpf_ringbuf_query flags */
1:  enum {
1: -	BPF_RB_AVAIL_DATA = 0,
1: -	BPF_RB_RING_SIZE = 1,
1: -	BPF_RB_CONS_POS = 2,
1: -	BPF_RB_PROD_POS = 3,
1: +  BPF_RB_AVAIL_DATA = 0,
1: +  BPF_RB_RING_SIZE = 1,
1: +  BPF_RB_CONS_POS = 2,
1: +  BPF_RB_PROD_POS = 3,
1:  };
1:  
1:  /* BPF ring buffer constants */
1:  enum {
1: -	BPF_RINGBUF_BUSY_BIT		= (1U << 31),
1: -	BPF_RINGBUF_DISCARD_BIT		= (1U << 30),
1: -	BPF_RINGBUF_HDR_SZ		= 8,
1: +  BPF_RINGBUF_BUSY_BIT = (1U << 31),
1: +  BPF_RINGBUF_DISCARD_BIT = (1U << 30),
1: +  BPF_RINGBUF_HDR_SZ = 8,
1:  };
1:  
1:  /* BPF_FUNC_sk_assign flags in bpf_sk_lookup context. */
1:  enum {
1: -	BPF_SK_LOOKUP_F_REPLACE		= (1ULL << 0),
1: -	BPF_SK_LOOKUP_F_NO_REUSEPORT	= (1ULL << 1),
1: +  BPF_SK_LOOKUP_F_REPLACE = (1ULL << 0),
1: +  BPF_SK_LOOKUP_F_NO_REUSEPORT = (1ULL << 1),
1:  };
1:  
1:  /* Mode for BPF_FUNC_skb_adjust_room helper. */
1:  enum bpf_adj_room_mode {
1: -	BPF_ADJ_ROOM_NET,
1: -	BPF_ADJ_ROOM_MAC,
1: +  BPF_ADJ_ROOM_NET,
1: +  BPF_ADJ_ROOM_MAC,
1:  };
1:  
1:  /* Mode for BPF_FUNC_skb_load_bytes_relative helper. */
1:  enum bpf_hdr_start_off {
1: -	BPF_HDR_START_MAC,
1: -	BPF_HDR_START_NET,
1: +  BPF_HDR_START_MAC,
1: +  BPF_HDR_START_NET,
1:  };
1:  
1:  /* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */
1:  enum bpf_lwt_encap_mode {
1: -	BPF_LWT_ENCAP_SEG6,
1: -	BPF_LWT_ENCAP_SEG6_INLINE,
1: -	BPF_LWT_ENCAP_IP,
1: +  BPF_LWT_ENCAP_SEG6,
1: +  BPF_LWT_ENCAP_SEG6_INLINE,
1: +  BPF_LWT_ENCAP_IP,
1:  };
1:  
1:  /* Flags for bpf_bprm_opts_set helper */
1:  enum {
1: -	BPF_F_BPRM_SECUREEXEC	= (1ULL << 0),
1: +  BPF_F_BPRM_SECUREEXEC = (1ULL << 0),
1:  };
1:  
1:  /* Flags for bpf_redirect_map helper */
1:  enum {
1: -	BPF_F_BROADCAST		= (1ULL << 3),
1: -	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4),
1: +  BPF_F_BROADCAST = (1ULL << 3),
1: +  BPF_F_EXCLUDE_INGRESS = (1ULL << 4),
1:  };
1:  
1: -#define __bpf_md_ptr(type, name)	\
1: -union {					\
1: -	type name;			\
1: -	__u64 :64;			\
1: -} __attribute__((aligned(8)))
1: +#define __bpf_md_ptr(type, name) \
1: +  union {                        \
1: +    type name;                   \
1: +    __u64 : 64;                  \
1: +  } __attribute__((aligned(8)))
1:  
1:  /* user accessible mirror of in-kernel sk_buff.
1:   * new fields can only be added to the end of this structure
1:   */
1:  struct __sk_buff {
1: -	__u32 len;
1: -	__u32 pkt_type;
1: -	__u32 mark;
1: -	__u32 queue_mapping;
1: -	__u32 protocol;
1: -	__u32 vlan_present;
1: -	__u32 vlan_tci;
1: -	__u32 vlan_proto;
1: -	__u32 priority;
1: -	__u32 ingress_ifindex;
1: -	__u32 ifindex;
1: -	__u32 tc_index;
1: -	__u32 cb[5];
1: -	__u32 hash;
1: -	__u32 tc_classid;
1: -	__u32 data;
1: -	__u32 data_end;
1: -	__u32 napi_id;
1: -
1: -	/* Accessed by BPF_PROG_TYPE_sk_skb types from here to ... */
1: -	__u32 family;
1: -	__u32 remote_ip4;	/* Stored in network byte order */
1: -	__u32 local_ip4;	/* Stored in network byte order */
1: -	__u32 remote_ip6[4];	/* Stored in network byte order */
1: -	__u32 local_ip6[4];	/* Stored in network byte order */
1: -	__u32 remote_port;	/* Stored in network byte order */
1: -	__u32 local_port;	/* stored in host byte order */
1: -	/* ... here. */
1: -
1: -	__u32 data_meta;
1: -	__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
1: -	__u64 tstamp;
1: -	__u32 wire_len;
1: -	__u32 gso_segs;
1: -	__bpf_md_ptr(struct bpf_sock *, sk);
1: -	__u32 gso_size;
1: +  __u32 len;
1: +  __u32 pkt_type;
1: +  __u32 mark;
1: +  __u32 queue_mapping;
1: +  __u32 protocol;
1: +  __u32 vlan_present;
1: +  __u32 vlan_tci;
1: +  __u32 vlan_proto;
1: +  __u32 priority;
1: +  __u32 ingress_ifindex;
1: +  __u32 ifindex;
1: +  __u32 tc_index;
1: +  __u32 cb[5];
1: +  __u32 hash;
1: +  __u32 tc_classid;
1: +  __u32 data;
1: +  __u32 data_end;
1: +  __u32 napi_id;
1: +
1: +  /* Accessed by BPF_PROG_TYPE_sk_skb types from here to ... */
1: +  __u32 family;
1: +  __u32 remote_ip4;    /* Stored in network byte order */
1: +  __u32 local_ip4;     /* Stored in network byte order */
1: +  __u32 remote_ip6[4]; /* Stored in network byte order */
1: +  __u32 local_ip6[4];  /* Stored in network byte order */
1: +  __u32 remote_port;   /* Stored in network byte order */
1: +  __u32 local_port;    /* stored in host byte order */
1: +  /* ... here. */
1: +
1: +  __u32 data_meta;
1: +  __bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
1: +  __u64 tstamp;
1: +  __u32 wire_len;
1: +  __u32 gso_segs;
1: +  __bpf_md_ptr(struct bpf_sock *, sk);
1: +  __u32 gso_size;
1:  };
1:  
1:  struct bpf_tunnel_key {
1: -	__u32 tunnel_id;
1: -	union {
1: -		__u32 remote_ipv4;
1: -		__u32 remote_ipv6[4];
1: -	};
1: -	__u8 tunnel_tos;
1: -	__u8 tunnel_ttl;
1: -	__u16 tunnel_ext;	/* Padding, future use. */
1: -	__u32 tunnel_label;
1: +  __u32 tunnel_id;
1: +  union {
1: +    __u32 remote_ipv4;
1: +    __u32 remote_ipv6[4];
1: +  };
1: +  __u8 tunnel_tos;
1: +  __u8 tunnel_ttl;
1: +  __u16 tunnel_ext; /* Padding, future use. */
1: +  __u32 tunnel_label;
1:  };
1:  
1:  /* user accessible mirror of in-kernel xfrm_state.
1:   * new fields can only be added to the end of this structure
1:   */
1:  struct bpf_xfrm_state {
1: -	__u32 reqid;
1: -	__u32 spi;	/* Stored in network byte order */
1: -	__u16 family;
1: -	__u16 ext;	/* Padding, future use. */
1: -	union {
1: -		__u32 remote_ipv4;	/* Stored in network byte order */
1: -		__u32 remote_ipv6[4];	/* Stored in network byte order */
1: -	};
1: +  __u32 reqid;
1: +  __u32 spi; /* Stored in network byte order */
1: +  __u16 family;
1: +  __u16 ext; /* Padding, future use. */
1: +  union {
1: +    __u32 remote_ipv4;    /* Stored in network byte order */
1: +    __u32 remote_ipv6[4]; /* Stored in network byte order */
1: +  };
1:  };
1:  
1:  /* Generic BPF return codes which all BPF program types may support.
1: @@ -5216,104 +5193,104 @@ struct bpf_xfrm_state {
1:   * XDP is handled seprately, see XDP_*.
1:   */
1:  enum bpf_ret_code {
1: -	BPF_OK = 0,
1: -	/* 1 reserved */
1: -	BPF_DROP = 2,
1: -	/* 3-6 reserved */
1: -	BPF_REDIRECT = 7,
1: -	/* >127 are reserved for prog type specific return codes.
1: -	 *
1: -	 * BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and
1: -	 *    BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been
1: -	 *    changed and should be routed based on its new L3 header.
1: -	 *    (This is an L3 redirect, as opposed to L2 redirect
1: -	 *    represented by BPF_REDIRECT above).
1: -	 */
1: -	BPF_LWT_REROUTE = 128,
1: +  BPF_OK = 0,
1: +  /* 1 reserved */
1: +  BPF_DROP = 2,
1: +  /* 3-6 reserved */
1: +  BPF_REDIRECT = 7,
1: +  /* >127 are reserved for prog type specific return codes.
1: +   *
1: +   * BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and
1: +   *    BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been
1: +   *    changed and should be routed based on its new L3 header.
1: +   *    (This is an L3 redirect, as opposed to L2 redirect
1: +   *    represented by BPF_REDIRECT above).
1: +   */
1: +  BPF_LWT_REROUTE = 128,
1:  };
1:  
1:  struct bpf_sock {
1: -	__u32 bound_dev_if;
1: -	__u32 family;
1: -	__u32 type;
1: -	__u32 protocol;
1: -	__u32 mark;
1: -	__u32 priority;
1: -	/* IP address also allows 1 and 2 bytes access */
1: -	__u32 src_ip4;
1: -	__u32 src_ip6[4];
1: -	__u32 src_port;		/* host byte order */
1: -	__u32 dst_port;		/* network byte order */
1: -	__u32 dst_ip4;
1: -	__u32 dst_ip6[4];
1: -	__u32 state;
1: -	__s32 rx_queue_mapping;
1: +  __u32 bound_dev_if;
1: +  __u32 family;
1: +  __u32 type;
1: +  __u32 protocol;
1: +  __u32 mark;
1: +  __u32 priority;
1: +  /* IP address also allows 1 and 2 bytes access */
1: +  __u32 src_ip4;
1: +  __u32 src_ip6[4];
1: +  __u32 src_port; /* host byte order */
1: +  __u32 dst_port; /* network byte order */
1: +  __u32 dst_ip4;
1: +  __u32 dst_ip6[4];
1: +  __u32 state;
1: +  __s32 rx_queue_mapping;
1:  };
1:  
1:  struct bpf_tcp_sock {
1: -	__u32 snd_cwnd;		/* Sending congestion window		*/
1: -	__u32 srtt_us;		/* smoothed round trip time << 3 in usecs */
1: -	__u32 rtt_min;
1: -	__u32 snd_ssthresh;	/* Slow start size threshold		*/
1: -	__u32 rcv_nxt;		/* What we want to receive next		*/
1: -	__u32 snd_nxt;		/* Next sequence we send		*/
1: -	__u32 snd_una;		/* First byte we want an ack for	*/
1: -	__u32 mss_cache;	/* Cached effective mss, not including SACKS */
1: -	__u32 ecn_flags;	/* ECN status bits.			*/
1: -	__u32 rate_delivered;	/* saved rate sample: packets delivered */
1: -	__u32 rate_interval_us;	/* saved rate sample: time elapsed */
1: -	__u32 packets_out;	/* Packets which are "in flight"	*/
1: -	__u32 retrans_out;	/* Retransmitted packets out		*/
1: -	__u32 total_retrans;	/* Total retransmits for entire connection */
1: -	__u32 segs_in;		/* RFC4898 tcpEStatsPerfSegsIn
1: -				 * total number of segments in.
1: -				 */
1: -	__u32 data_segs_in;	/* RFC4898 tcpEStatsPerfDataSegsIn
1: -				 * total number of data segments in.
1: -				 */
1: -	__u32 segs_out;		/* RFC4898 tcpEStatsPerfSegsOut
1: -				 * The total number of segments sent.
1: -				 */
1: -	__u32 data_segs_out;	/* RFC4898 tcpEStatsPerfDataSegsOut
1: -				 * total number of data segments sent.
1: -				 */
1: -	__u32 lost_out;		/* Lost packets			*/
1: -	__u32 sacked_out;	/* SACK'd packets			*/
1: -	__u64 bytes_received;	/* RFC4898 tcpEStatsAppHCThruOctetsReceived
1: -				 * sum(delta(rcv_nxt)), or how many bytes
1: -				 * were acked.
1: -				 */
1: -	__u64 bytes_acked;	/* RFC4898 tcpEStatsAppHCThruOctetsAcked
1: -				 * sum(delta(snd_una)), or how many bytes
1: -				 * were acked.
1: -				 */
1: -	__u32 dsack_dups;	/* RFC4898 tcpEStatsStackDSACKDups
1: -				 * total number of DSACK blocks received
1: -				 */
1: -	__u32 delivered;	/* Total data packets delivered incl. rexmits */
1: -	__u32 delivered_ce;	/* Like the above but only ECE marked packets */
1: -	__u32 icsk_retransmits;	/* Number of unrecovered [RTO] timeouts */
1: +  __u32 snd_cwnd; /* Sending congestion window		*/
1: +  __u32 srtt_us;  /* smoothed round trip time << 3 in usecs */
1: +  __u32 rtt_min;
1: +  __u32 snd_ssthresh;     /* Slow start size threshold		*/
1: +  __u32 rcv_nxt;          /* What we want to receive next		*/
1: +  __u32 snd_nxt;          /* Next sequence we send		*/
1: +  __u32 snd_una;          /* First byte we want an ack for	*/
1: +  __u32 mss_cache;        /* Cached effective mss, not including SACKS */
1: +  __u32 ecn_flags;        /* ECN status bits.			*/
1: +  __u32 rate_delivered;   /* saved rate sample: packets delivered */
1: +  __u32 rate_interval_us; /* saved rate sample: time elapsed */
1: +  __u32 packets_out;      /* Packets which are "in flight"	*/
1: +  __u32 retrans_out;      /* Retransmitted packets out		*/
1: +  __u32 total_retrans;    /* Total retransmits for entire connection */
1: +  __u32 segs_in;          /* RFC4898 tcpEStatsPerfSegsIn
1: +                           * total number of segments in.
1: +                           */
1: +  __u32 data_segs_in;     /* RFC4898 tcpEStatsPerfDataSegsIn
1: +                           * total number of data segments in.
1: +                           */
1: +  __u32 segs_out;         /* RFC4898 tcpEStatsPerfSegsOut
1: +                           * The total number of segments sent.
1: +                           */
1: +  __u32 data_segs_out;    /* RFC4898 tcpEStatsPerfDataSegsOut
1: +                           * total number of data segments sent.
1: +                           */
1: +  __u32 lost_out;         /* Lost packets			*/
1: +  __u32 sacked_out;       /* SACK'd packets			*/
1: +  __u64 bytes_received;   /* RFC4898 tcpEStatsAppHCThruOctetsReceived
1: +                           * sum(delta(rcv_nxt)), or how many bytes
1: +                           * were acked.
1: +                           */
1: +  __u64 bytes_acked;      /* RFC4898 tcpEStatsAppHCThruOctetsAcked
1: +                           * sum(delta(snd_una)), or how many bytes
1: +                           * were acked.
1: +                           */
1: +  __u32 dsack_dups;       /* RFC4898 tcpEStatsStackDSACKDups
1: +                           * total number of DSACK blocks received
1: +                           */
1: +  __u32 delivered;        /* Total data packets delivered incl. rexmits */
1: +  __u32 delivered_ce;     /* Like the above but only ECE marked packets */
1: +  __u32 icsk_retransmits; /* Number of unrecovered [RTO] timeouts */
1:  };
1:  
1:  struct bpf_sock_tuple {
1: -	union {
1: -		struct {
1: -			__be32 saddr;
1: -			__be32 daddr;
1: -			__be16 sport;
1: -			__be16 dport;
1: -		} ipv4;
1: -		struct {
1: -			__be32 saddr[4];
1: -			__be32 daddr[4];
1: -			__be16 sport;
1: -			__be16 dport;
1: -		} ipv6;
1: -	};
1: +  union {
1: +    struct {
1: +      __be32 saddr;
1: +      __be32 daddr;
1: +      __be16 sport;
1: +      __be16 dport;
1: +    } ipv4;
1: +    struct {
1: +      __be32 saddr[4];
1: +      __be32 daddr[4];
1: +      __be16 sport;
1: +      __be16 dport;
1: +    } ipv6;
1: +  };
1:  };
1:  
1:  struct bpf_xdp_sock {
1: -	__u32 queue_id;
1: +  __u32 queue_id;
1:  };
1:  
1:  #define XDP_PACKET_HEADROOM 256
1: @@ -5324,25 +5301,25 @@ struct bpf_xdp_sock {
1:   * result in packet drops and a warning via bpf_warn_invalid_xdp_action().
1:   */
1:  enum xdp_action {
1: -	XDP_ABORTED = 0,
1: -	XDP_DROP,
1: -	XDP_PASS,
1: -	XDP_TX,
1: -	XDP_REDIRECT,
1: +  XDP_ABORTED = 0,
1: +  XDP_DROP,
1: +  XDP_PASS,
1: +  XDP_TX,
1: +  XDP_REDIRECT,
1:  };
1:  
1:  /* user accessible metadata for XDP packet hook
1:   * new fields must be added to the end of this structure
1:   */
1:  struct xdp_md {
1: -	__u32 data;
1: -	__u32 data_end;
1: -	__u32 data_meta;
1: -	/* Below access go through struct xdp_rxq_info */
1: -	__u32 ingress_ifindex; /* rxq->dev->ifindex */
1: -	__u32 rx_queue_index;  /* rxq->queue_index  */
1: -
1: -	__u32 egress_ifindex;  /* txq->dev->ifindex */
1: +  __u32 data;
1: +  __u32 data_end;
1: +  __u32 data_meta;
1: +  /* Below access go through struct xdp_rxq_info */
1: +  __u32 ingress_ifindex; /* rxq->dev->ifindex */
1: +  __u32 rx_queue_index;  /* rxq->queue_index  */
1: +
1: +  __u32 egress_ifindex; /* txq->dev->ifindex */
1:  };
1:  
1:  /* DEVMAP map-value layout
1: @@ -5351,11 +5328,11 @@ struct xdp_md {
1:   * New members can only be added to the end of this structure.
1:   */
1:  struct bpf_devmap_val {
1: -	__u32 ifindex;   /* device index */
1: -	union {
1: -		int   fd;  /* prog fd on map write */
1: -		__u32 id;  /* prog id on map read */
1: -	} bpf_prog;
1: +  __u32 ifindex; /* device index */
1: +  union {
1: +    int fd;   /* prog fd on map write */
1: +    __u32 id; /* prog id on map read */
1: +  } bpf_prog;
1:  };
1:  
1:  /* CPUMAP map-value layout
1: @@ -5364,178 +5341,178 @@ struct bpf_devmap_val {
1:   * New members can only be added to the end of this structure.
1:   */
1:  struct bpf_cpumap_val {
1: -	__u32 qsize;	/* queue size to remote target CPU */
1: -	union {
1: -		int   fd;	/* prog fd on map write */
1: -		__u32 id;	/* prog id on map read */
1: -	} bpf_prog;
1: +  __u32 qsize; /* queue size to remote target CPU */
1: +  union {
1: +    int fd;   /* prog fd on map write */
1: +    __u32 id; /* prog id on map read */
1: +  } bpf_prog;
1:  };
1:  
1:  enum sk_action {
1: -	SK_DROP = 0,
1: -	SK_PASS,
1: +  SK_DROP = 0,
1: +  SK_PASS,
1:  };
1:  
1:  /* user accessible metadata for SK_MSG packet hook, new fields must
1:   * be added to the end of this structure
1:   */
1:  struct sk_msg_md {
1: -	__bpf_md_ptr(void *, data);
1: -	__bpf_md_ptr(void *, data_end);
1: -
1: -	__u32 family;
1: -	__u32 remote_ip4;	/* Stored in network byte order */
1: -	__u32 local_ip4;	/* Stored in network byte order */
1: -	__u32 remote_ip6[4];	/* Stored in network byte order */
1: -	__u32 local_ip6[4];	/* Stored in network byte order */
1: -	__u32 remote_port;	/* Stored in network byte order */
1: -	__u32 local_port;	/* stored in host byte order */
1: -	__u32 size;		/* Total size of sk_msg */
1: -
1: -	__bpf_md_ptr(struct bpf_sock *, sk); /* current socket */
1: +  __bpf_md_ptr(void *, data);
1: +  __bpf_md_ptr(void *, data_end);
1: +
1: +  __u32 family;
1: +  __u32 remote_ip4;    /* Stored in network byte order */
1: +  __u32 local_ip4;     /* Stored in network byte order */
1: +  __u32 remote_ip6[4]; /* Stored in network byte order */
1: +  __u32 local_ip6[4];  /* Stored in network byte order */
1: +  __u32 remote_port;   /* Stored in network byte order */
1: +  __u32 local_port;    /* stored in host byte order */
1: +  __u32 size;          /* Total size of sk_msg */
1: +
1: +  __bpf_md_ptr(struct bpf_sock *, sk); /* current socket */
1:  };
1:  
1:  struct sk_reuseport_md {
1: -	/*
1: -	 * Start of directly accessible data. It begins from
1: -	 * the tcp/udp header.
1: -	 */
1: -	__bpf_md_ptr(void *, data);
1: -	/* End of directly accessible data */
1: -	__bpf_md_ptr(void *, data_end);
1: -	/*
1: -	 * Total length of packet (starting from the tcp/udp header).
1: -	 * Note that the directly accessible bytes (data_end - data)
1: -	 * could be less than this "len".  Those bytes could be
1: -	 * indirectly read by a helper "bpf_skb_load_bytes()".
1: -	 */
1: -	__u32 len;
1: -	/*
1: -	 * Eth protocol in the mac header (network byte order). e.g.
1: -	 * ETH_P_IP(0x0800) and ETH_P_IPV6(0x86DD)
1: -	 */
1: -	__u32 eth_protocol;
1: -	__u32 ip_protocol;	/* IP protocol. e.g. IPPROTO_TCP, IPPROTO_UDP */
1: -	__u32 bind_inany;	/* Is sock bound to an INANY address? */
1: -	__u32 hash;		/* A hash of the packet 4 tuples */
1: -	/* When reuse->migrating_sk is NULL, it is selecting a sk for the
1: -	 * new incoming connection request (e.g. selecting a listen sk for
1: -	 * the received SYN in the TCP case).  reuse->sk is one of the sk
1: -	 * in the reuseport group. The bpf prog can use reuse->sk to learn
1: -	 * the local listening ip/port without looking into the skb.
1: -	 *
1: -	 * When reuse->migrating_sk is not NULL, reuse->sk is closed and
1: -	 * reuse->migrating_sk is the socket that needs to be migrated
1: -	 * to another listening socket.  migrating_sk could be a fullsock
1: -	 * sk that is fully established or a reqsk that is in-the-middle
1: -	 * of 3-way handshake.
1: -	 */
1: -	__bpf_md_ptr(struct bpf_sock *, sk);
1: -	__bpf_md_ptr(struct bpf_sock *, migrating_sk);
1: +  /*
1: +   * Start of directly accessible data. It begins from
1: +   * the tcp/udp header.
1: +   */
1: +  __bpf_md_ptr(void *, data);
1: +  /* End of directly accessible data */
1: +  __bpf_md_ptr(void *, data_end);
1: +  /*
1: +   * Total length of packet (starting from the tcp/udp header).
1: +   * Note that the directly accessible bytes (data_end - data)
1: +   * could be less than this "len".  Those bytes could be
1: +   * indirectly read by a helper "bpf_skb_load_bytes()".
1: +   */
1: +  __u32 len;
1: +  /*
1: +   * Eth protocol in the mac header (network byte order). e.g.
1: +   * ETH_P_IP(0x0800) and ETH_P_IPV6(0x86DD)
1: +   */
1: +  __u32 eth_protocol;
1: +  __u32 ip_protocol; /* IP protocol. e.g. IPPROTO_TCP, IPPROTO_UDP */
1: +  __u32 bind_inany;  /* Is sock bound to an INANY address? */
1: +  __u32 hash;        /* A hash of the packet 4 tuples */
1: +  /* When reuse->migrating_sk is NULL, it is selecting a sk for the
1: +   * new incoming connection request (e.g. selecting a listen sk for
1: +   * the received SYN in the TCP case).  reuse->sk is one of the sk
1: +   * in the reuseport group. The bpf prog can use reuse->sk to learn
1: +   * the local listening ip/port without looking into the skb.
1: +   *
1: +   * When reuse->migrating_sk is not NULL, reuse->sk is closed and
1: +   * reuse->migrating_sk is the socket that needs to be migrated
1: +   * to another listening socket.  migrating_sk could be a fullsock
1: +   * sk that is fully established or a reqsk that is in-the-middle
1: +   * of 3-way handshake.
1: +   */
1: +  __bpf_md_ptr(struct bpf_sock *, sk);
1: +  __bpf_md_ptr(struct bpf_sock *, migrating_sk);
1:  };
1:  
1: -#define BPF_TAG_SIZE	8
1: +#define BPF_TAG_SIZE 8
1:  
1:  struct bpf_prog_info {
1: -	__u32 type;
1: -	__u32 id;
1: -	__u8  tag[BPF_TAG_SIZE];
1: -	__u32 jited_prog_len;
1: -	__u32 xlated_prog_len;
1: -	__aligned_u64 jited_prog_insns;
1: -	__aligned_u64 xlated_prog_insns;
1: -	__u64 load_time;	/* ns since boottime */
1: -	__u32 created_by_uid;
1: -	__u32 nr_map_ids;
1: -	__aligned_u64 map_ids;
1: -	char name[BPF_OBJ_NAME_LEN];
1: -	__u32 ifindex;
1: -	__u32 gpl_compatible:1;
1: -	__u32 :31; /* alignment pad */
1: -	__u64 netns_dev;
1: -	__u64 netns_ino;
1: -	__u32 nr_jited_ksyms;
1: -	__u32 nr_jited_func_lens;
1: -	__aligned_u64 jited_ksyms;
1: -	__aligned_u64 jited_func_lens;
1: -	__u32 btf_id;
1: -	__u32 func_info_rec_size;
1: -	__aligned_u64 func_info;
1: -	__u32 nr_func_info;
1: -	__u32 nr_line_info;
1: -	__aligned_u64 line_info;
1: -	__aligned_u64 jited_line_info;
1: -	__u32 nr_jited_line_info;
1: -	__u32 line_info_rec_size;
1: -	__u32 jited_line_info_rec_size;
1: -	__u32 nr_prog_tags;
1: -	__aligned_u64 prog_tags;
1: -	__u64 run_time_ns;
1: -	__u64 run_cnt;
1: -	__u64 recursion_misses;
1: +  __u32 type;
1: +  __u32 id;
1: +  __u8 tag[BPF_TAG_SIZE];
1: +  __u32 jited_prog_len;
1: +  __u32 xlated_prog_len;
1: +  __aligned_u64 jited_prog_insns;
1: +  __aligned_u64 xlated_prog_insns;
1: +  __u64 load_time; /* ns since boottime */
1: +  __u32 created_by_uid;
1: +  __u32 nr_map_ids;
1: +  __aligned_u64 map_ids;
1: +  char name[BPF_OBJ_NAME_LEN];
1: +  __u32 ifindex;
1: +  __u32 gpl_compatible : 1;
1: +  __u32 : 31; /* alignment pad */
1: +  __u64 netns_dev;
1: +  __u64 netns_ino;
1: +  __u32 nr_jited_ksyms;
1: +  __u32 nr_jited_func_lens;
1: +  __aligned_u64 jited_ksyms;
1: +  __aligned_u64 jited_func_lens;
1: +  __u32 btf_id;
1: +  __u32 func_info_rec_size;
1: +  __aligned_u64 func_info;
1: +  __u32 nr_func_info;
1: +  __u32 nr_line_info;
1: +  __aligned_u64 line_info;
1: +  __aligned_u64 jited_line_info;
1: +  __u32 nr_jited_line_info;
1: +  __u32 line_info_rec_size;
1: +  __u32 jited_line_info_rec_size;
1: +  __u32 nr_prog_tags;
1: +  __aligned_u64 prog_tags;
1: +  __u64 run_time_ns;
1: +  __u64 run_cnt;
1: +  __u64 recursion_misses;
1:  } __attribute__((aligned(8)));
1:  
1:  struct bpf_map_info {
1: -	__u32 type;
1: -	__u32 id;
1: -	__u32 key_size;
1: -	__u32 value_size;
1: -	__u32 max_entries;
1: -	__u32 map_flags;
1: -	char  name[BPF_OBJ_NAME_LEN];
1: -	__u32 ifindex;
1: -	__u32 btf_vmlinux_value_type_id;
1: -	__u64 netns_dev;
1: -	__u64 netns_ino;
1: -	__u32 btf_id;
1: -	__u32 btf_key_type_id;
1: -	__u32 btf_value_type_id;
1: +  __u32 type;
1: +  __u32 id;
1: +  __u32 key_size;
1: +  __u32 value_size;
1: +  __u32 max_entries;
1: +  __u32 map_flags;
1: +  char name[BPF_OBJ_NAME_LEN];
1: +  __u32 ifindex;
1: +  __u32 btf_vmlinux_value_type_id;
1: +  __u64 netns_dev;
1: +  __u64 netns_ino;
1: +  __u32 btf_id;
1: +  __u32 btf_key_type_id;
1: +  __u32 btf_value_type_id;
1:  } __attribute__((aligned(8)));
1:  
1:  struct bpf_btf_info {
1: -	__aligned_u64 btf;
1: -	__u32 btf_size;
1: -	__u32 id;
1: -	__aligned_u64 name;
1: -	__u32 name_len;
1: -	__u32 kernel_btf;
1: +  __aligned_u64 btf;
1: +  __u32 btf_size;
1: +  __u32 id;
1: +  __aligned_u64 name;
1: +  __u32 name_len;
1: +  __u32 kernel_btf;
1:  } __attribute__((aligned(8)));
1:  
1:  struct bpf_link_info {
1: -	__u32 type;
1: -	__u32 id;
1: -	__u32 prog_id;
1: -	union {
1: -		struct {
1: -			__aligned_u64 tp_name; /* in/out: tp_name buffer ptr */
1: -			__u32 tp_name_len;     /* in/out: tp_name buffer len */
1: -		} raw_tracepoint;
1: -		struct {
1: -			__u32 attach_type;
1: -			__u32 target_obj_id; /* prog_id for PROG_EXT, otherwise btf object id */
1: -			__u32 target_btf_id; /* BTF type id inside the object */
1: -		} tracing;
1: -		struct {
1: -			__u64 cgroup_id;
1: -			__u32 attach_type;
1: -		} cgroup;
1: -		struct {
1: -			__aligned_u64 target_name; /* in/out: target_name buffer ptr */
1: -			__u32 target_name_len;	   /* in/out: target_name buffer len */
1: -			union {
1: -				struct {
1: -					__u32 map_id;
1: -				} map;
1: -			};
1: -		} iter;
1: -		struct  {
1: -			__u32 netns_ino;
1: -			__u32 attach_type;
1: -		} netns;
1: -		struct {
1: -			__u32 ifindex;
1: -		} xdp;
1: -	};
1: +  __u32 type;
1: +  __u32 id;
1: +  __u32 prog_id;
1: +  union {
1: +    struct {
1: +      __aligned_u64 tp_name; /* in/out: tp_name buffer ptr */
1: +      __u32 tp_name_len;     /* in/out: tp_name buffer len */
1: +    } raw_tracepoint;
1: +    struct {
1: +      __u32 attach_type;
1: +      __u32 target_obj_id; /* prog_id for PROG_EXT, otherwise btf object id */
1: +      __u32 target_btf_id; /* BTF type id inside the object */
1: +    } tracing;
1: +    struct {
1: +      __u64 cgroup_id;
1: +      __u32 attach_type;
1: +    } cgroup;
1: +    struct {
1: +      __aligned_u64 target_name; /* in/out: target_name buffer ptr */
1: +      __u32 target_name_len;     /* in/out: target_name buffer len */
1: +      union {
1: +        struct {
1: +          __u32 map_id;
1: +        } map;
1: +      };
1: +    } iter;
1: +    struct {
1: +      __u32 netns_ino;
1: +      __u32 attach_type;
1: +    } netns;
1: +    struct {
1: +      __u32 ifindex;
1: +    } xdp;
1: +  };
1:  } __attribute__((aligned(8)));
1:  
1:  /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
1: @@ -5543,26 +5520,26 @@ struct bpf_link_info {
1:   * attach type).
1:   */
1:  struct bpf_sock_addr {
1: -	__u32 user_family;	/* Allows 4-byte read, but no write. */
1: -	__u32 user_ip4;		/* Allows 1,2,4-byte read and 4-byte write.
1: -				 * Stored in network byte order.
1: -				 */
1: -	__u32 user_ip6[4];	/* Allows 1,2,4,8-byte read and 4,8-byte write.
1: -				 * Stored in network byte order.
1: -				 */
1: -	__u32 user_port;	/* Allows 1,2,4-byte read and 4-byte write.
1: -				 * Stored in network byte order
1: -				 */
1: -	__u32 family;		/* Allows 4-byte read, but no write */
1: -	__u32 type;		/* Allows 4-byte read, but no write */
1: -	__u32 protocol;		/* Allows 4-byte read, but no write */
1: -	__u32 msg_src_ip4;	/* Allows 1,2,4-byte read and 4-byte write.
1: -				 * Stored in network byte order.
1: -				 */
1: -	__u32 msg_src_ip6[4];	/* Allows 1,2,4,8-byte read and 4,8-byte write.
1: -				 * Stored in network byte order.
1: -				 */
1: -	__bpf_md_ptr(struct bpf_sock *, sk);
1: +  __u32 user_family;    /* Allows 4-byte read, but no write. */
1: +  __u32 user_ip4;       /* Allows 1,2,4-byte read and 4-byte write.
1: +                         * Stored in network byte order.
1: +                         */
1: +  __u32 user_ip6[4];    /* Allows 1,2,4,8-byte read and 4,8-byte write.
1: +                         * Stored in network byte order.
1: +                         */
1: +  __u32 user_port;      /* Allows 1,2,4-byte read and 4-byte write.
1: +                         * Stored in network byte order
1: +                         */
1: +  __u32 family;         /* Allows 4-byte read, but no write */
1: +  __u32 type;           /* Allows 4-byte read, but no write */
1: +  __u32 protocol;       /* Allows 4-byte read, but no write */
1: +  __u32 msg_src_ip4;    /* Allows 1,2,4-byte read and 4-byte write.
1: +                         * Stored in network byte order.
1: +                         */
1: +  __u32 msg_src_ip6[4]; /* Allows 1,2,4,8-byte read and 4,8-byte write.
1: +                         * Stored in network byte order.
1: +                         */
1: +  __bpf_md_ptr(struct bpf_sock *, sk);
1:  };
1:  
1:  /* User bpf_sock_ops struct to access socket values and specify request ops
1: @@ -5572,244 +5549,244 @@ struct bpf_sock_addr {
1:   * New fields can only be added at the end of this structure
1:   */
1:  struct bpf_sock_ops {
1: -	__u32 op;
1: -	union {
1: -		__u32 args[4];		/* Optionally passed to bpf program */
1: -		__u32 reply;		/* Returned by bpf program	    */
1: -		__u32 replylong[4];	/* Optionally returned by bpf prog  */
1: -	};
1: -	__u32 family;
1: -	__u32 remote_ip4;	/* Stored in network byte order */
1: -	__u32 local_ip4;	/* Stored in network byte order */
1: -	__u32 remote_ip6[4];	/* Stored in network byte order */
1: -	__u32 local_ip6[4];	/* Stored in network byte order */
1: -	__u32 remote_port;	/* Stored in network byte order */
1: -	__u32 local_port;	/* stored in host byte order */
1: -	__u32 is_fullsock;	/* Some TCP fields are only valid if
1: -				 * there is a full socket. If not, the
1: -				 * fields read as zero.
1: -				 */
1: -	__u32 snd_cwnd;
1: -	__u32 srtt_us;		/* Averaged RTT << 3 in usecs */
1: -	__u32 bpf_sock_ops_cb_flags; /* flags defined in uapi/linux/tcp.h */
1: -	__u32 state;
1: -	__u32 rtt_min;
1: -	__u32 snd_ssthresh;
1: -	__u32 rcv_nxt;
1: -	__u32 snd_nxt;
1: -	__u32 snd_una;
1: -	__u32 mss_cache;
1: -	__u32 ecn_flags;
1: -	__u32 rate_delivered;
1: -	__u32 rate_interval_us;
1: -	__u32 packets_out;
1: -	__u32 retrans_out;
1: -	__u32 total_retrans;
1: -	__u32 segs_in;
1: -	__u32 data_segs_in;
1: -	__u32 segs_out;
1: -	__u32 data_segs_out;
1: -	__u32 lost_out;
1: -	__u32 sacked_out;
1: -	__u32 sk_txhash;
1: -	__u64 bytes_received;
1: -	__u64 bytes_acked;
1: -	__bpf_md_ptr(struct bpf_sock *, sk);
1: -	/* [skb_data, skb_data_end) covers the whole TCP header.
1: -	 *
1: -	 * BPF_SOCK_OPS_PARSE_HDR_OPT_CB: The packet received
1: -	 * BPF_SOCK_OPS_HDR_OPT_LEN_CB:   Not useful because the
1: -	 *                                header has not been written.
1: -	 * BPF_SOCK_OPS_WRITE_HDR_OPT_CB: The header and options have
1: -	 *				  been written so far.
1: -	 * BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB:  The SYNACK that concludes
1: -	 *					the 3WHS.
1: -	 * BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB: The ACK that concludes
1: -	 *					the 3WHS.
1: -	 *
1: -	 * bpf_load_hdr_opt() can also be used to read a particular option.
1: -	 */
1: -	__bpf_md_ptr(void *, skb_data);
1: -	__bpf_md_ptr(void *, skb_data_end);
1: -	__u32 skb_len;		/* The total length of a packet.
1: -				 * It includes the header, options,
1: -				 * and payload.
1: -				 */
1: -	__u32 skb_tcp_flags;	/* tcp_flags of the header.  It provides
1: -				 * an easy way to check for tcp_flags
1: -				 * without parsing skb_data.
1: -				 *
1: -				 * In particular, the skb_tcp_flags
1: -				 * will still be available in
1: -				 * BPF_SOCK_OPS_HDR_OPT_LEN even though
1: -				 * the outgoing header has not
1: -				 * been written yet.
1: -				 */
1: +  __u32 op;
1: +  union {
1: +    __u32 args[4];      /* Optionally passed to bpf program */
1: +    __u32 reply;        /* Returned by bpf program	    */
1: +    __u32 replylong[4]; /* Optionally returned by bpf prog  */
1: +  };
1: +  __u32 family;
1: +  __u32 remote_ip4;    /* Stored in network byte order */
1: +  __u32 local_ip4;     /* Stored in network byte order */
1: +  __u32 remote_ip6[4]; /* Stored in network byte order */
1: +  __u32 local_ip6[4];  /* Stored in network byte order */
1: +  __u32 remote_port;   /* Stored in network byte order */
1: +  __u32 local_port;    /* stored in host byte order */
1: +  __u32 is_fullsock;   /* Some TCP fields are only valid if
1: +                        * there is a full socket. If not, the
1: +                        * fields read as zero.
1: +                        */
1: +  __u32 snd_cwnd;
1: +  __u32 srtt_us;               /* Averaged RTT << 3 in usecs */
1: +  __u32 bpf_sock_ops_cb_flags; /* flags defined in uapi/linux/tcp.h */
1: +  __u32 state;
1: +  __u32 rtt_min;
1: +  __u32 snd_ssthresh;
1: +  __u32 rcv_nxt;
1: +  __u32 snd_nxt;
1: +  __u32 snd_una;
1: +  __u32 mss_cache;
1: +  __u32 ecn_flags;
1: +  __u32 rate_delivered;
1: +  __u32 rate_interval_us;
1: +  __u32 packets_out;
1: +  __u32 retrans_out;
1: +  __u32 total_retrans;
1: +  __u32 segs_in;
1: +  __u32 data_segs_in;
1: +  __u32 segs_out;
1: +  __u32 data_segs_out;
1: +  __u32 lost_out;
1: +  __u32 sacked_out;
1: +  __u32 sk_txhash;
1: +  __u64 bytes_received;
1: +  __u64 bytes_acked;
1: +  __bpf_md_ptr(struct bpf_sock *, sk);
1: +  /* [skb_data, skb_data_end) covers the whole TCP header.
1: +   *
1: +   * BPF_SOCK_OPS_PARSE_HDR_OPT_CB: The packet received
1: +   * BPF_SOCK_OPS_HDR_OPT_LEN_CB:   Not useful because the
1: +   *                                header has not been written.
1: +   * BPF_SOCK_OPS_WRITE_HDR_OPT_CB: The header and options have
1: +   *				  been written so far.
1: +   * BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB:  The SYNACK that concludes
1: +   *					the 3WHS.
1: +   * BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB: The ACK that concludes
1: +   *					the 3WHS.
1: +   *
1: +   * bpf_load_hdr_opt() can also be used to read a particular option.
1: +   */
1: +  __bpf_md_ptr(void *, skb_data);
1: +  __bpf_md_ptr(void *, skb_data_end);
1: +  __u32 skb_len;       /* The total length of a packet.
1: +                        * It includes the header, options,
1: +                        * and payload.
1: +                        */
1: +  __u32 skb_tcp_flags; /* tcp_flags of the header.  It provides
1: +                        * an easy way to check for tcp_flags
1: +                        * without parsing skb_data.
1: +                        *
1: +                        * In particular, the skb_tcp_flags
1: +                        * will still be available in
1: +                        * BPF_SOCK_OPS_HDR_OPT_LEN even though
1: +                        * the outgoing header has not
1: +                        * been written yet.
1: +                        */
1:  };
1:  
1:  /* Definitions for bpf_sock_ops_cb_flags */
1:  enum {
1: -	BPF_SOCK_OPS_RTO_CB_FLAG	= (1<<0),
1: -	BPF_SOCK_OPS_RETRANS_CB_FLAG	= (1<<1),
1: -	BPF_SOCK_OPS_STATE_CB_FLAG	= (1<<2),
1: -	BPF_SOCK_OPS_RTT_CB_FLAG	= (1<<3),
1: -	/* Call bpf for all received TCP headers.  The bpf prog will be
1: -	 * called under sock_ops->op == BPF_SOCK_OPS_PARSE_HDR_OPT_CB
1: -	 *
1: -	 * Please refer to the comment in BPF_SOCK_OPS_PARSE_HDR_OPT_CB
1: -	 * for the header option related helpers that will be useful
1: -	 * to the bpf programs.
1: -	 *
1: -	 * It could be used at the client/active side (i.e. connect() side)
1: -	 * when the server told it that the server was in syncookie
1: -	 * mode and required the active side to resend the bpf-written
1: -	 * options.  The active side can keep writing the bpf-options until
1: -	 * it received a valid packet from the server side to confirm
1: -	 * the earlier packet (and options) has been received.  The later
1: -	 * example patch is using it like this at the active side when the
1: -	 * server is in syncookie mode.
1: -	 *
1: -	 * The bpf prog will usually turn this off in the common cases.
1: -	 */
1: -	BPF_SOCK_OPS_PARSE_ALL_HDR_OPT_CB_FLAG	= (1<<4),
1: -	/* Call bpf when kernel has received a header option that
1: -	 * the kernel cannot handle.  The bpf prog will be called under
1: -	 * sock_ops->op == BPF_SOCK_OPS_PARSE_HDR_OPT_CB.
1: -	 *
1: -	 * Please refer to the comment in BPF_SOCK_OPS_PARSE_HDR_OPT_CB
1: -	 * for the header option related helpers that will be useful
1: -	 * to the bpf programs.
1: -	 */
1: -	BPF_SOCK_OPS_PARSE_UNKNOWN_HDR_OPT_CB_FLAG = (1<<5),
1: -	/* Call bpf when the kernel is writing header options for the
1: -	 * outgoing packet.  The bpf prog will first be called
1: -	 * to reserve space in a skb under
1: -	 * sock_ops->op == BPF_SOCK_OPS_HDR_OPT_LEN_CB.  Then
1: -	 * the bpf prog will be called to write the header option(s)
1: -	 * under sock_ops->op == BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
1: -	 *
1: -	 * Please refer to the comment in BPF_SOCK_OPS_HDR_OPT_LEN_CB
1: -	 * and BPF_SOCK_OPS_WRITE_HDR_OPT_CB for the header option
1: -	 * related helpers that will be useful to the bpf programs.
1: -	 *
1: -	 * The kernel gets its chance to reserve space and write
1: -	 * options first before the BPF program does.
1: -	 */
1: -	BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG = (1<<6),
1: -/* Mask of all currently supported cb flags */
1: -	BPF_SOCK_OPS_ALL_CB_FLAGS       = 0x7F,
1: +  BPF_SOCK_OPS_RTO_CB_FLAG = (1 << 0),
1: +  BPF_SOCK_OPS_RETRANS_CB_FLAG = (1 << 1),
1: +  BPF_SOCK_OPS_STATE_CB_FLAG = (1 << 2),
1: +  BPF_SOCK_OPS_RTT_CB_FLAG = (1 << 3),
1: +  /* Call bpf for all received TCP headers.  The bpf prog will be
1: +   * called under sock_ops->op == BPF_SOCK_OPS_PARSE_HDR_OPT_CB
1: +   *
1: +   * Please refer to the comment in BPF_SOCK_OPS_PARSE_HDR_OPT_CB
1: +   * for the header option related helpers that will be useful
1: +   * to the bpf programs.
1: +   *
1: +   * It could be used at the client/active side (i.e. connect() side)
1: +   * when the server told it that the server was in syncookie
1: +   * mode and required the active side to resend the bpf-written
1: +   * options.  The active side can keep writing the bpf-options until
1: +   * it received a valid packet from the server side to confirm
1: +   * the earlier packet (and options) has been received.  The later
1: +   * example patch is using it like this at the active side when the
1: +   * server is in syncookie mode.
1: +   *
1: +   * The bpf prog will usually turn this off in the common cases.
1: +   */
1: +  BPF_SOCK_OPS_PARSE_ALL_HDR_OPT_CB_FLAG = (1 << 4),
1: +  /* Call bpf when kernel has received a header option that
1: +   * the kernel cannot handle.  The bpf prog will be called under
1: +   * sock_ops->op == BPF_SOCK_OPS_PARSE_HDR_OPT_CB.
1: +   *
1: +   * Please refer to the comment in BPF_SOCK_OPS_PARSE_HDR_OPT_CB
1: +   * for the header option related helpers that will be useful
1: +   * to the bpf programs.
1: +   */
1: +  BPF_SOCK_OPS_PARSE_UNKNOWN_HDR_OPT_CB_FLAG = (1 << 5),
1: +  /* Call bpf when the kernel is writing header options for the
1: +   * outgoing packet.  The bpf prog will first be called
1: +   * to reserve space in a skb under
1: +   * sock_ops->op == BPF_SOCK_OPS_HDR_OPT_LEN_CB.  Then
1: +   * the bpf prog will be called to write the header option(s)
1: +   * under sock_ops->op == BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
1: +   *
1: +   * Please refer to the comment in BPF_SOCK_OPS_HDR_OPT_LEN_CB
1: +   * and BPF_SOCK_OPS_WRITE_HDR_OPT_CB for the header option
1: +   * related helpers that will be useful to the bpf programs.
1: +   *
1: +   * The kernel gets its chance to reserve space and write
1: +   * options first before the BPF program does.
1: +   */
1: +  BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG = (1 << 6),
1: +  /* Mask of all currently supported cb flags */
1: +  BPF_SOCK_OPS_ALL_CB_FLAGS = 0x7F,
1:  };
1:  
1:  /* List of known BPF sock_ops operators.
1:   * New entries can only be added at the end
1:   */
1:  enum {
1: -	BPF_SOCK_OPS_VOID,
1: -	BPF_SOCK_OPS_TIMEOUT_INIT,	/* Should return SYN-RTO value to use or
1: -					 * -1 if default value should be used
1: -					 */
1: -	BPF_SOCK_OPS_RWND_INIT,		/* Should return initial advertized
1: -					 * window (in packets) or -1 if default
1: -					 * value should be used
1: -					 */
1: -	BPF_SOCK_OPS_TCP_CONNECT_CB,	/* Calls BPF program right before an
1: -					 * active connection is initialized
1: -					 */
1: -	BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB,	/* Calls BPF program when an
1: -						 * active connection is
1: -						 * established
1: -						 */
1: -	BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB,	/* Calls BPF program when a
1: -						 * passive connection is
1: -						 * established
1: -						 */
1: -	BPF_SOCK_OPS_NEEDS_ECN,		/* If connection's congestion control
1: -					 * needs ECN
1: -					 */
1: -	BPF_SOCK_OPS_BASE_RTT,		/* Get base RTT. The correct value is
1: -					 * based on the path and may be
1: -					 * dependent on the congestion control
1: -					 * algorithm. In general it indicates
1: -					 * a congestion threshold. RTTs above
1: -					 * this indicate congestion
1: -					 */
1: -	BPF_SOCK_OPS_RTO_CB,		/* Called when an RTO has triggered.
1: -					 * Arg1: value of icsk_retransmits
1: -					 * Arg2: value of icsk_rto
1: -					 * Arg3: whether RTO has expired
1: -					 */
1: -	BPF_SOCK_OPS_RETRANS_CB,	/* Called when skb is retransmitted.
1: -					 * Arg1: sequence number of 1st byte
1: -					 * Arg2: # segments
1: -					 * Arg3: return value of
1: -					 *       tcp_transmit_skb (0 => success)
1: -					 */
1: -	BPF_SOCK_OPS_STATE_CB,		/* Called when TCP changes state.
1: -					 * Arg1: old_state
1: -					 * Arg2: new_state
1: -					 */
1: -	BPF_SOCK_OPS_TCP_LISTEN_CB,	/* Called on listen(2), right after
1: -					 * socket transition to LISTEN state.
1: -					 */
1: -	BPF_SOCK_OPS_RTT_CB,		/* Called on every RTT.
1: -					 */
1: -	BPF_SOCK_OPS_PARSE_HDR_OPT_CB,	/* Parse the header option.
1: -					 * It will be called to handle
1: -					 * the packets received at
1: -					 * an already established
1: -					 * connection.
1: -					 *
1: -					 * sock_ops->skb_data:
1: -					 * Referring to the received skb.
1: -					 * It covers the TCP header only.
1: -					 *
1: -					 * bpf_load_hdr_opt() can also
1: -					 * be used to search for a
1: -					 * particular option.
1: -					 */
1: -	BPF_SOCK_OPS_HDR_OPT_LEN_CB,	/* Reserve space for writing the
1: -					 * header option later in
1: -					 * BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
1: -					 * Arg1: bool want_cookie. (in
1: -					 *       writing SYNACK only)
1: -					 *
1: -					 * sock_ops->skb_data:
1: -					 * Not available because no header has
1: -					 * been	written yet.
1: -					 *
1: -					 * sock_ops->skb_tcp_flags:
1: -					 * The tcp_flags of the
1: -					 * outgoing skb. (e.g. SYN, ACK, FIN).
1: -					 *
1: -					 * bpf_reserve_hdr_opt() should
1: -					 * be used to reserve space.
1: -					 */
1: -	BPF_SOCK_OPS_WRITE_HDR_OPT_CB,	/* Write the header options
1: -					 * Arg1: bool want_cookie. (in
1: -					 *       writing SYNACK only)
1: -					 *
1: -					 * sock_ops->skb_data:
1: -					 * Referring to the outgoing skb.
1: -					 * It covers the TCP header
1: -					 * that has already been written
1: -					 * by the kernel and the
1: -					 * earlier bpf-progs.
1: -					 *
1: -					 * sock_ops->skb_tcp_flags:
1: -					 * The tcp_flags of the outgoing
1: -					 * skb. (e.g. SYN, ACK, FIN).
1: -					 *
1: -					 * bpf_store_hdr_opt() should
1: -					 * be used to write the
1: -					 * option.
1: -					 *
1: -					 * bpf_load_hdr_opt() can also
1: -					 * be used to search for a
1: -					 * particular option that
1: -					 * has already been written
1: -					 * by the kernel or the
1: -					 * earlier bpf-progs.
1: -					 */
1: +  BPF_SOCK_OPS_VOID,
1: +  BPF_SOCK_OPS_TIMEOUT_INIT,           /* Should return SYN-RTO value to use or
1: +                                        * -1 if default value should be used
1: +                                        */
1: +  BPF_SOCK_OPS_RWND_INIT,              /* Should return initial advertized
1: +                                        * window (in packets) or -1 if default
1: +                                        * value should be used
1: +                                        */
1: +  BPF_SOCK_OPS_TCP_CONNECT_CB,         /* Calls BPF program right before an
1: +                                        * active connection is initialized
1: +                                        */
1: +  BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB,  /* Calls BPF program when an
1: +                                        * active connection is
1: +                                        * established
1: +                                        */
1: +  BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB, /* Calls BPF program when a
1: +                                        * passive connection is
1: +                                        * established
1: +                                        */
1: +  BPF_SOCK_OPS_NEEDS_ECN,              /* If connection's congestion control
1: +                                        * needs ECN
1: +                                        */
1: +  BPF_SOCK_OPS_BASE_RTT,               /* Get base RTT. The correct value is
1: +                                        * based on the path and may be
1: +                                        * dependent on the congestion control
1: +                                        * algorithm. In general it indicates
1: +                                        * a congestion threshold. RTTs above
1: +                                        * this indicate congestion
1: +                                        */
1: +  BPF_SOCK_OPS_RTO_CB,                 /* Called when an RTO has triggered.
1: +                                        * Arg1: value of icsk_retransmits
1: +                                        * Arg2: value of icsk_rto
1: +                                        * Arg3: whether RTO has expired
1: +                                        */
1: +  BPF_SOCK_OPS_RETRANS_CB,             /* Called when skb is retransmitted.
1: +                                        * Arg1: sequence number of 1st byte
1: +                                        * Arg2: # segments
1: +                                        * Arg3: return value of
1: +                                        *       tcp_transmit_skb (0 => success)
1: +                                        */
1: +  BPF_SOCK_OPS_STATE_CB,               /* Called when TCP changes state.
1: +                                        * Arg1: old_state
1: +                                        * Arg2: new_state
1: +                                        */
1: +  BPF_SOCK_OPS_TCP_LISTEN_CB,          /* Called on listen(2), right after
1: +                                        * socket transition to LISTEN state.
1: +                                        */
1: +  BPF_SOCK_OPS_RTT_CB,                 /* Called on every RTT.
1: +                                        */
1: +  BPF_SOCK_OPS_PARSE_HDR_OPT_CB,       /* Parse the header option.
1: +                                        * It will be called to handle
1: +                                        * the packets received at
1: +                                        * an already established
1: +                                        * connection.
1: +                                        *
1: +                                        * sock_ops->skb_data:
1: +                                        * Referring to the received skb.
1: +                                        * It covers the TCP header only.
1: +                                        *
1: +                                        * bpf_load_hdr_opt() can also
1: +                                        * be used to search for a
1: +                                        * particular option.
1: +                                        */
1: +  BPF_SOCK_OPS_HDR_OPT_LEN_CB,         /* Reserve space for writing the
1: +                                        * header option later in
1: +                                        * BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
1: +                                        * Arg1: bool want_cookie. (in
1: +                                        *       writing SYNACK only)
1: +                                        *
1: +                                        * sock_ops->skb_data:
1: +                                        * Not available because no header has
1: +                                        * been	written yet.
1: +                                        *
1: +                                        * sock_ops->skb_tcp_flags:
1: +                                        * The tcp_flags of the
1: +                                        * outgoing skb. (e.g. SYN, ACK, FIN).
1: +                                        *
1: +                                        * bpf_reserve_hdr_opt() should
1: +                                        * be used to reserve space.
1: +                                        */
1: +  BPF_SOCK_OPS_WRITE_HDR_OPT_CB,       /* Write the header options
1: +                                        * Arg1: bool want_cookie. (in
1: +                                        *       writing SYNACK only)
1: +                                        *
1: +                                        * sock_ops->skb_data:
1: +                                        * Referring to the outgoing skb.
1: +                                        * It covers the TCP header
1: +                                        * that has already been written
1: +                                        * by the kernel and the
1: +                                        * earlier bpf-progs.
1: +                                        *
1: +                                        * sock_ops->skb_tcp_flags:
1: +                                        * The tcp_flags of the outgoing
1: +                                        * skb. (e.g. SYN, ACK, FIN).
1: +                                        *
1: +                                        * bpf_store_hdr_opt() should
1: +                                        * be used to write the
1: +                                        * option.
1: +                                        *
1: +                                        * bpf_load_hdr_opt() can also
1: +                                        * be used to search for a
1: +                                        * particular option that
1: +                                        * has already been written
1: +                                        * by the kernel or the
1: +                                        * earlier bpf-progs.
1: +                                        */
1:  };
1:  
1:  /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
1: @@ -5818,305 +5795,305 @@ enum {
1:   * the BPF sock_ops function.
1:   */
1:  enum {
1: -	BPF_TCP_ESTABLISHED = 1,
1: -	BPF_TCP_SYN_SENT,
1: -	BPF_TCP_SYN_RECV,
1: -	BPF_TCP_FIN_WAIT1,
1: -	BPF_TCP_FIN_WAIT2,
1: -	BPF_TCP_TIME_WAIT,
1: -	BPF_TCP_CLOSE,
1: -	BPF_TCP_CLOSE_WAIT,
1: -	BPF_TCP_LAST_ACK,
1: -	BPF_TCP_LISTEN,
1: -	BPF_TCP_CLOSING,	/* Now a valid state */
1: -	BPF_TCP_NEW_SYN_RECV,
1: -
1: -	BPF_TCP_MAX_STATES	/* Leave at the end! */
1: +  BPF_TCP_ESTABLISHED = 1,
1: +  BPF_TCP_SYN_SENT,
1: +  BPF_TCP_SYN_RECV,
1: +  BPF_TCP_FIN_WAIT1,
1: +  BPF_TCP_FIN_WAIT2,
1: +  BPF_TCP_TIME_WAIT,
1: +  BPF_TCP_CLOSE,
1: +  BPF_TCP_CLOSE_WAIT,
1: +  BPF_TCP_LAST_ACK,
1: +  BPF_TCP_LISTEN,
1: +  BPF_TCP_CLOSING, /* Now a valid state */
1: +  BPF_TCP_NEW_SYN_RECV,
1: +
1: +  BPF_TCP_MAX_STATES /* Leave at the end! */
1:  };
1:  
1:  enum {
1: -	TCP_BPF_IW		= 1001,	/* Set TCP initial congestion window */
1: -	TCP_BPF_SNDCWND_CLAMP	= 1002,	/* Set sndcwnd_clamp */
1: -	TCP_BPF_DELACK_MAX	= 1003, /* Max delay ack in usecs */
1: -	TCP_BPF_RTO_MIN		= 1004, /* Min delay ack in usecs */
1: -	/* Copy the SYN pkt to optval
1: -	 *
1: -	 * BPF_PROG_TYPE_SOCK_OPS only.  It is similar to the
1: -	 * bpf_getsockopt(TCP_SAVED_SYN) but it does not limit
1: -	 * to only getting from the saved_syn.  It can either get the
1: -	 * syn packet from:
1: -	 *
1: -	 * 1. the just-received SYN packet (only available when writing the
1: -	 *    SYNACK).  It will be useful when it is not necessary to
1: -	 *    save the SYN packet for latter use.  It is also the only way
1: -	 *    to get the SYN during syncookie mode because the syn
1: -	 *    packet cannot be saved during syncookie.
1: -	 *
1: -	 * OR
1: -	 *
1: -	 * 2. the earlier saved syn which was done by
1: -	 *    bpf_setsockopt(TCP_SAVE_SYN).
1: -	 *
1: -	 * The bpf_getsockopt(TCP_BPF_SYN*) option will hide where the
1: -	 * SYN packet is obtained.
1: -	 *
1: -	 * If the bpf-prog does not need the IP[46] header,  the
1: -	 * bpf-prog can avoid parsing the IP header by using
1: -	 * TCP_BPF_SYN.  Otherwise, the bpf-prog can get both
1: -	 * IP[46] and TCP header by using TCP_BPF_SYN_IP.
1: -	 *
1: -	 *      >0: Total number of bytes copied
1: -	 * -ENOSPC: Not enough space in optval. Only optlen number of
1: -	 *          bytes is copied.
1: -	 * -ENOENT: The SYN skb is not available now and the earlier SYN pkt
1: -	 *	    is not saved by setsockopt(TCP_SAVE_SYN).
1: -	 */
1: -	TCP_BPF_SYN		= 1005, /* Copy the TCP header */
1: -	TCP_BPF_SYN_IP		= 1006, /* Copy the IP[46] and TCP header */
1: -	TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */
1: +  TCP_BPF_IW = 1001,            /* Set TCP initial congestion window */
1: +  TCP_BPF_SNDCWND_CLAMP = 1002, /* Set sndcwnd_clamp */
1: +  TCP_BPF_DELACK_MAX = 1003,    /* Max delay ack in usecs */
1: +  TCP_BPF_RTO_MIN = 1004,       /* Min delay ack in usecs */
1: +  /* Copy the SYN pkt to optval
1: +   *
1: +   * BPF_PROG_TYPE_SOCK_OPS only.  It is similar to the
1: +   * bpf_getsockopt(TCP_SAVED_SYN) but it does not limit
1: +   * to only getting from the saved_syn.  It can either get the
1: +   * syn packet from:
1: +   *
1: +   * 1. the just-received SYN packet (only available when writing the
1: +   *    SYNACK).  It will be useful when it is not necessary to
1: +   *    save the SYN packet for latter use.  It is also the only way
1: +   *    to get the SYN during syncookie mode because the syn
1: +   *    packet cannot be saved during syncookie.
1: +   *
1: +   * OR
1: +   *
1: +   * 2. the earlier saved syn which was done by
1: +   *    bpf_setsockopt(TCP_SAVE_SYN).
1: +   *
1: +   * The bpf_getsockopt(TCP_BPF_SYN*) option will hide where the
1: +   * SYN packet is obtained.
1: +   *
1: +   * If the bpf-prog does not need the IP[46] header,  the
1: +   * bpf-prog can avoid parsing the IP header by using
1: +   * TCP_BPF_SYN.  Otherwise, the bpf-prog can get both
1: +   * IP[46] and TCP header by using TCP_BPF_SYN_IP.
1: +   *
1: +   *      >0: Total number of bytes copied
1: +   * -ENOSPC: Not enough space in optval. Only optlen number of
1: +   *          bytes is copied.
1: +   * -ENOENT: The SYN skb is not available now and the earlier SYN pkt
1: +   *	    is not saved by setsockopt(TCP_SAVE_SYN).
1: +   */
1: +  TCP_BPF_SYN = 1005,     /* Copy the TCP header */
1: +  TCP_BPF_SYN_IP = 1006,  /* Copy the IP[46] and TCP header */
1: +  TCP_BPF_SYN_MAC = 1007, /* Copy the MAC, IP[46], and TCP header */
1:  };
1:  
1:  enum {
1: -	BPF_LOAD_HDR_OPT_TCP_SYN = (1ULL << 0),
1: +  BPF_LOAD_HDR_OPT_TCP_SYN = (1ULL << 0),
1:  };
1:  
1:  /* args[0] value during BPF_SOCK_OPS_HDR_OPT_LEN_CB and
1:   * BPF_SOCK_OPS_WRITE_HDR_OPT_CB.
1:   */
1:  enum {
1: -	BPF_WRITE_HDR_TCP_CURRENT_MSS = 1,	/* Kernel is finding the
1: -						 * total option spaces
1: -						 * required for an established
1: -						 * sk in order to calculate the
1: -						 * MSS.  No skb is actually
1: -						 * sent.
1: -						 */
1: -	BPF_WRITE_HDR_TCP_SYNACK_COOKIE = 2,	/* Kernel is in syncookie mode
1: -						 * when sending a SYN.
1: -						 */
1: +  BPF_WRITE_HDR_TCP_CURRENT_MSS = 1,   /* Kernel is finding the
1: +                                        * total option spaces
1: +                                        * required for an established
1: +                                        * sk in order to calculate the
1: +                                        * MSS.  No skb is actually
1: +                                        * sent.
1: +                                        */
1: +  BPF_WRITE_HDR_TCP_SYNACK_COOKIE = 2, /* Kernel is in syncookie mode
1: +                                        * when sending a SYN.
1: +                                        */
1:  };
1:  
1:  struct bpf_perf_event_value {
1: -	__u64 counter;
1: -	__u64 enabled;
1: -	__u64 running;
1: +  __u64 counter;
1: +  __u64 enabled;
1: +  __u64 running;
1:  };
1:  
1:  enum {
1: -	BPF_DEVCG_ACC_MKNOD	= (1ULL << 0),
1: -	BPF_DEVCG_ACC_READ	= (1ULL << 1),
1: -	BPF_DEVCG_ACC_WRITE	= (1ULL << 2),
1: +  BPF_DEVCG_ACC_MKNOD = (1ULL << 0),
1: +  BPF_DEVCG_ACC_READ = (1ULL << 1),
1: +  BPF_DEVCG_ACC_WRITE = (1ULL << 2),
1:  };
1:  
1:  enum {
1: -	BPF_DEVCG_DEV_BLOCK	= (1ULL << 0),
1: -	BPF_DEVCG_DEV_CHAR	= (1ULL << 1),
1: +  BPF_DEVCG_DEV_BLOCK = (1ULL << 0),
1: +  BPF_DEVCG_DEV_CHAR = (1ULL << 1),
1:  };
1:  
1:  struct bpf_cgroup_dev_ctx {
1: -	/* access_type encoded as (BPF_DEVCG_ACC_* << 16) | BPF_DEVCG_DEV_* */
1: -	__u32 access_type;
1: -	__u32 major;
1: -	__u32 minor;
1: +  /* access_type encoded as (BPF_DEVCG_ACC_* << 16) | BPF_DEVCG_DEV_* */
1: +  __u32 access_type;
1: +  __u32 major;
1: +  __u32 minor;
1:  };
1:  
1:  struct bpf_raw_tracepoint_args {
1: -	__u64 args[0];
1: +  __u64 args[0];
1:  };
1:  
1:  /* DIRECT:  Skip the FIB rules and go to FIB table associated with device
1:   * OUTPUT:  Do lookup from egress perspective; default is ingress
1:   */
1:  enum {
1: -	BPF_FIB_LOOKUP_DIRECT  = (1U << 0),
1: -	BPF_FIB_LOOKUP_OUTPUT  = (1U << 1),
1: +  BPF_FIB_LOOKUP_DIRECT = (1U << 0),
1: +  BPF_FIB_LOOKUP_OUTPUT = (1U << 1),
1:  };
1:  
1:  enum {
1: -	BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */
1: -	BPF_FIB_LKUP_RET_BLACKHOLE,    /* dest is blackholed; can be dropped */
1: -	BPF_FIB_LKUP_RET_UNREACHABLE,  /* dest is unreachable; can be dropped */
1: -	BPF_FIB_LKUP_RET_PROHIBIT,     /* dest not allowed; can be dropped */
1: -	BPF_FIB_LKUP_RET_NOT_FWDED,    /* packet is not forwarded */
1: -	BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */
1: -	BPF_FIB_LKUP_RET_UNSUPP_LWT,   /* fwd requires encapsulation */
1: -	BPF_FIB_LKUP_RET_NO_NEIGH,     /* no neighbor entry for nh */
1: -	BPF_FIB_LKUP_RET_FRAG_NEEDED,  /* fragmentation required to fwd */
1: +  BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */
1: +  BPF_FIB_LKUP_RET_BLACKHOLE,    /* dest is blackholed; can be dropped */
1: +  BPF_FIB_LKUP_RET_UNREACHABLE,  /* dest is unreachable; can be dropped */
1: +  BPF_FIB_LKUP_RET_PROHIBIT,     /* dest not allowed; can be dropped */
1: +  BPF_FIB_LKUP_RET_NOT_FWDED,    /* packet is not forwarded */
1: +  BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */
1: +  BPF_FIB_LKUP_RET_UNSUPP_LWT,   /* fwd requires encapsulation */
1: +  BPF_FIB_LKUP_RET_NO_NEIGH,     /* no neighbor entry for nh */
1: +  BPF_FIB_LKUP_RET_FRAG_NEEDED,  /* fragmentation required to fwd */
1:  };
1:  
1:  struct bpf_fib_lookup {
1: -	/* input:  network family for lookup (AF_INET, AF_INET6)
1: -	 * output: network family of egress nexthop
1: -	 */
1: -	__u8	family;
1: -
1: -	/* set if lookup is to consider L4 data - e.g., FIB rules */
1: -	__u8	l4_protocol;
1: -	__be16	sport;
1: -	__be16	dport;
1: -
1: -	union {	/* used for MTU check */
1: -		/* input to lookup */
1: -		__u16	tot_len; /* L3 length from network hdr (iph->tot_len) */
1: -
1: -		/* output: MTU value */
1: -		__u16	mtu_result;
1: -	};
1: -	/* input: L3 device index for lookup
1: -	 * output: device index from FIB lookup
1: -	 */
1: -	__u32	ifindex;
1: -
1: -	union {
1: -		/* inputs to lookup */
1: -		__u8	tos;		/* AF_INET  */
1: -		__be32	flowinfo;	/* AF_INET6, flow_label + priority */
1: -
1: -		/* output: metric of fib result (IPv4/IPv6 only) */
1: -		__u32	rt_metric;
1: -	};
1: -
1: -	union {
1: -		__be32		ipv4_src;
1: -		__u32		ipv6_src[4];  /* in6_addr; network order */
1: -	};
1: -
1: -	/* input to bpf_fib_lookup, ipv{4,6}_dst is destination address in
1: -	 * network header. output: bpf_fib_lookup sets to gateway address
1: -	 * if FIB lookup returns gateway route
1: -	 */
1: -	union {
1: -		__be32		ipv4_dst;
1: -		__u32		ipv6_dst[4];  /* in6_addr; network order */
1: -	};
1: -
1: -	/* output */
1: -	__be16	h_vlan_proto;
1: -	__be16	h_vlan_TCI;
1: -	__u8	smac[6];     /* ETH_ALEN */
1: -	__u8	dmac[6];     /* ETH_ALEN */
1: +  /* input:  network family for lookup (AF_INET, AF_INET6)
1: +   * output: network family of egress nexthop
1: +   */
1: +  __u8 family;
1: +
1: +  /* set if lookup is to consider L4 data - e.g., FIB rules */
1: +  __u8 l4_protocol;
1: +  __be16 sport;
1: +  __be16 dport;
1: +
1: +  union { /* used for MTU check */
1: +    /* input to lookup */
1: +    __u16 tot_len; /* L3 length from network hdr (iph->tot_len) */
1: +
1: +    /* output: MTU value */
1: +    __u16 mtu_result;
1: +  };
1: +  /* input: L3 device index for lookup
1: +   * output: device index from FIB lookup
1: +   */
1: +  __u32 ifindex;
1: +
1: +  union {
1: +    /* inputs to lookup */
1: +    __u8 tos;        /* AF_INET  */
1: +    __be32 flowinfo; /* AF_INET6, flow_label + priority */
1: +
1: +    /* output: metric of fib result (IPv4/IPv6 only) */
1: +    __u32 rt_metric;
1: +  };
1: +
1: +  union {
1: +    __be32 ipv4_src;
1: +    __u32 ipv6_src[4]; /* in6_addr; network order */
1: +  };
1: +
1: +  /* input to bpf_fib_lookup, ipv{4,6}_dst is destination address in
1: +   * network header. output: bpf_fib_lookup sets to gateway address
1: +   * if FIB lookup returns gateway route
1: +   */
1: +  union {
1: +    __be32 ipv4_dst;
1: +    __u32 ipv6_dst[4]; /* in6_addr; network order */
1: +  };
1: +
1: +  /* output */
1: +  __be16 h_vlan_proto;
1: +  __be16 h_vlan_TCI;
1: +  __u8 smac[6]; /* ETH_ALEN */
1: +  __u8 dmac[6]; /* ETH_ALEN */
1:  };
1:  
1:  struct bpf_redir_neigh {
1: -	/* network family for lookup (AF_INET, AF_INET6) */
1: -	__u32 nh_family;
1: -	/* network address of nexthop; skips fib lookup to find gateway */
1: -	union {
1: -		__be32		ipv4_nh;
1: -		__u32		ipv6_nh[4];  /* in6_addr; network order */
1: -	};
1: +  /* network family for lookup (AF_INET, AF_INET6) */
1: +  __u32 nh_family;
1: +  /* network address of nexthop; skips fib lookup to find gateway */
1: +  union {
1: +    __be32 ipv4_nh;
1: +    __u32 ipv6_nh[4]; /* in6_addr; network order */
1: +  };
1:  };
1:  
1:  /* bpf_check_mtu flags*/
1: -enum  bpf_check_mtu_flags {
1: -	BPF_MTU_CHK_SEGS  = (1U << 0),
1: +enum bpf_check_mtu_flags {
1: +  BPF_MTU_CHK_SEGS = (1U << 0),
1:  };
1:  
1:  enum bpf_check_mtu_ret {
1: -	BPF_MTU_CHK_RET_SUCCESS,      /* check and lookup successful */
1: -	BPF_MTU_CHK_RET_FRAG_NEEDED,  /* fragmentation required to fwd */
1: -	BPF_MTU_CHK_RET_SEGS_TOOBIG,  /* GSO re-segmentation needed to fwd */
1: +  BPF_MTU_CHK_RET_SUCCESS,     /* check and lookup successful */
1: +  BPF_MTU_CHK_RET_FRAG_NEEDED, /* fragmentation required to fwd */
1: +  BPF_MTU_CHK_RET_SEGS_TOOBIG, /* GSO re-segmentation needed to fwd */
1:  };
1:  
1:  enum bpf_task_fd_type {
1: -	BPF_FD_TYPE_RAW_TRACEPOINT,	/* tp name */
1: -	BPF_FD_TYPE_TRACEPOINT,		/* tp name */
1: -	BPF_FD_TYPE_KPROBE,		/* (symbol + offset) or addr */
1: -	BPF_FD_TYPE_KRETPROBE,		/* (symbol + offset) or addr */
1: -	BPF_FD_TYPE_UPROBE,		/* filename + offset */
1: -	BPF_FD_TYPE_URETPROBE,		/* filename + offset */
1: +  BPF_FD_TYPE_RAW_TRACEPOINT, /* tp name */
1: +  BPF_FD_TYPE_TRACEPOINT,     /* tp name */
1: +  BPF_FD_TYPE_KPROBE,         /* (symbol + offset) or addr */
1: +  BPF_FD_TYPE_KRETPROBE,      /* (symbol + offset) or addr */
1: +  BPF_FD_TYPE_UPROBE,         /* filename + offset */
1: +  BPF_FD_TYPE_URETPROBE,      /* filename + offset */
1:  };
1:  
1:  enum {
1: -	BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG		= (1U << 0),
1: -	BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL		= (1U << 1),
1: -	BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP		= (1U << 2),
1: +  BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG = (1U << 0),
1: +  BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL = (1U << 1),
1: +  BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP = (1U << 2),
1:  };
1:  
1:  struct bpf_flow_keys {
1: -	__u16	nhoff;
1: -	__u16	thoff;
1: -	__u16	addr_proto;			/* ETH_P_* of valid addrs */
1: -	__u8	is_frag;
1: -	__u8	is_first_frag;
1: -	__u8	is_encap;
1: -	__u8	ip_proto;
1: -	__be16	n_proto;
1: -	__be16	sport;
1: -	__be16	dport;
1: -	union {
1: -		struct {
1: -			__be32	ipv4_src;
1: -			__be32	ipv4_dst;
1: -		};
1: -		struct {
1: -			__u32	ipv6_src[4];	/* in6_addr; network order */
1: -			__u32	ipv6_dst[4];	/* in6_addr; network order */
1: -		};
1: -	};
1: -	__u32	flags;
1: -	__be32	flow_label;
1: +  __u16 nhoff;
1: +  __u16 thoff;
1: +  __u16 addr_proto; /* ETH_P_* of valid addrs */
1: +  __u8 is_frag;
1: +  __u8 is_first_frag;
1: +  __u8 is_encap;
1: +  __u8 ip_proto;
1: +  __be16 n_proto;
1: +  __be16 sport;
1: +  __be16 dport;
1: +  union {
1: +    struct {
1: +      __be32 ipv4_src;
1: +      __be32 ipv4_dst;
1: +    };
1: +    struct {
1: +      __u32 ipv6_src[4]; /* in6_addr; network order */
1: +      __u32 ipv6_dst[4]; /* in6_addr; network order */
1: +    };
1: +  };
1: +  __u32 flags;
1: +  __be32 flow_label;
1:  };
1:  
1:  struct bpf_func_info {
1: -	__u32	insn_off;
1: -	__u32	type_id;
1: +  __u32 insn_off;
1: +  __u32 type_id;
1:  };
1:  
1: -#define BPF_LINE_INFO_LINE_NUM(line_col)	((line_col) >> 10)
1: -#define BPF_LINE_INFO_LINE_COL(line_col)	((line_col) & 0x3ff)
1: +#define BPF_LINE_INFO_LINE_NUM(line_col) ((line_col) >> 10)
1: +#define BPF_LINE_INFO_LINE_COL(line_col) ((line_col)&0x3ff)
1:  
1:  struct bpf_line_info {
1: -	__u32	insn_off;
1: -	__u32	file_name_off;
1: -	__u32	line_off;
1: -	__u32	line_col;
1: +  __u32 insn_off;
1: +  __u32 file_name_off;
1: +  __u32 line_off;
1: +  __u32 line_col;
1:  };
1:  
1:  struct bpf_spin_lock {
1: -	__u32	val;
1: +  __u32 val;
1:  };
1:  
1:  struct bpf_sysctl {
1: -	__u32	write;		/* Sysctl is being read (= 0) or written (= 1).
1: -				 * Allows 1,2,4-byte read, but no write.
1: -				 */
1: -	__u32	file_pos;	/* Sysctl file position to read from, write to.
1: -				 * Allows 1,2,4-byte read an 4-byte write.
1: -				 */
1: +  __u32 write;    /* Sysctl is being read (= 0) or written (= 1).
1: +                   * Allows 1,2,4-byte read, but no write.
1: +                   */
1: +  __u32 file_pos; /* Sysctl file position to read from, write to.
1: +                   * Allows 1,2,4-byte read an 4-byte write.
1: +                   */
1:  };
1:  
1:  struct bpf_sockopt {
1: -	__bpf_md_ptr(struct bpf_sock *, sk);
1: -	__bpf_md_ptr(void *, optval);
1: -	__bpf_md_ptr(void *, optval_end);
1: -
1: -	__s32	level;
1: -	__s32	optname;
1: -	__s32	optlen;
1: -	__s32	retval;
1: +  __bpf_md_ptr(struct bpf_sock *, sk);
1: +  __bpf_md_ptr(void *, optval);
1: +  __bpf_md_ptr(void *, optval_end);
1: +
1: +  __s32 level;
1: +  __s32 optname;
1: +  __s32 optlen;
1: +  __s32 retval;
1:  };
1:  
1:  struct bpf_pidns_info {
1: -	__u32 pid;
1: -	__u32 tgid;
1: +  __u32 pid;
1: +  __u32 tgid;
1:  };
1:  
1:  /* User accessible data for SK_LOOKUP programs. Add new fields at the end. */
1:  struct bpf_sk_lookup {
1: -	union {
1: -		__bpf_md_ptr(struct bpf_sock *, sk); /* Selected socket */
1: -		__u64 cookie; /* Non-zero if socket was selected in PROG_TEST_RUN */
1: -	};
1: -
1: -	__u32 family;		/* Protocol family (AF_INET, AF_INET6) */
1: -	__u32 protocol;		/* IP protocol (IPPROTO_TCP, IPPROTO_UDP) */
1: -	__u32 remote_ip4;	/* Network byte order */
1: -	__u32 remote_ip6[4];	/* Network byte order */
1: -	__u32 remote_port;	/* Network byte order */
1: -	__u32 local_ip4;	/* Network byte order */
1: -	__u32 local_ip6[4];	/* Network byte order */
1: -	__u32 local_port;	/* Host byte order */
1: +  union {
1: +    __bpf_md_ptr(struct bpf_sock *, sk); /* Selected socket */
1: +    __u64 cookie; /* Non-zero if socket was selected in PROG_TEST_RUN */
1: +  };
1: +
1: +  __u32 family;        /* Protocol family (AF_INET, AF_INET6) */
1: +  __u32 protocol;      /* IP protocol (IPPROTO_TCP, IPPROTO_UDP) */
1: +  __u32 remote_ip4;    /* Network byte order */
1: +  __u32 remote_ip6[4]; /* Network byte order */
1: +  __u32 remote_port;   /* Network byte order */
1: +  __u32 local_ip4;     /* Network byte order */
1: +  __u32 local_ip6[4];  /* Network byte order */
1: +  __u32 local_port;    /* Host byte order */
1:  };
1:  
1:  /*
1: @@ -6128,9 +6105,9 @@ struct bpf_sk_lookup {
1:   * Display flags - BTF_F_* - are passed to bpf_snprintf_btf separately.
1:   */
1:  struct btf_ptr {
1: -	void *ptr;
1: -	__u32 type_id;
1: -	__u32 flags;		/* BTF ptr flags; unused at present. */
1: +  void *ptr;
1: +  __u32 type_id;
1: +  __u32 flags; /* BTF ptr flags; unused at present. */
1:  };
1:  
1:  /*
1: @@ -6143,10 +6120,10 @@ struct btf_ptr {
1:   *       are not displayed by default
1:   */
1:  enum {
1: -	BTF_F_COMPACT	=	(1ULL << 0),
1: -	BTF_F_NONAME	=	(1ULL << 1),
1: -	BTF_F_PTR_RAW	=	(1ULL << 2),
1: -	BTF_F_ZERO	=	(1ULL << 3),
1: +  BTF_F_COMPACT = (1ULL << 0),
1: +  BTF_F_NONAME = (1ULL << 1),
1: +  BTF_F_PTR_RAW = (1ULL << 2),
1: +  BTF_F_ZERO = (1ULL << 3),
1:  };
1:  
1:  #endif /* _UAPI__LINUX_BPF_H__ */
1: diff --git a/src/cc/libbpf/include/uapi/linux/bpf_common.h b/src/cc/libbpf/include/uapi/linux/bpf_common.h
1: index ee97668b..30ff194e 100644
1: --- a/src/cc/libbpf/include/uapi/linux/bpf_common.h
1: +++ b/src/cc/libbpf/include/uapi/linux/bpf_common.h
1: @@ -3,52 +3,52 @@
1:  #define _UAPI__LINUX_BPF_COMMON_H__
1:  
1:  /* Instruction classes */
1: -#define BPF_CLASS(code) ((code) & 0x07)
1: -#define		BPF_LD		0x00
1: -#define		BPF_LDX		0x01
1: -#define		BPF_ST		0x02
1: -#define		BPF_STX		0x03
1: -#define		BPF_ALU		0x04
1: -#define		BPF_JMP		0x05
1: -#define		BPF_RET		0x06
1: -#define		BPF_MISC        0x07
1: +#define BPF_CLASS(code) ((code)&0x07)
1: +#define BPF_LD 0x00
1: +#define BPF_LDX 0x01
1: +#define BPF_ST 0x02
1: +#define BPF_STX 0x03
1: +#define BPF_ALU 0x04
1: +#define BPF_JMP 0x05
1: +#define BPF_RET 0x06
1: +#define BPF_MISC 0x07
1:  
1:  /* ld/ldx fields */
1: -#define BPF_SIZE(code)  ((code) & 0x18)
1: -#define		BPF_W		0x00 /* 32-bit */
1: -#define		BPF_H		0x08 /* 16-bit */
1: -#define		BPF_B		0x10 /*  8-bit */
1: +#define BPF_SIZE(code) ((code)&0x18)
1: +#define BPF_W 0x00 /* 32-bit */
1: +#define BPF_H 0x08 /* 16-bit */
1: +#define BPF_B 0x10 /*  8-bit */
1:  /* eBPF		BPF_DW		0x18    64-bit */
1: -#define BPF_MODE(code)  ((code) & 0xe0)
1: -#define		BPF_IMM		0x00
1: -#define		BPF_ABS		0x20
1: -#define		BPF_IND		0x40
1: -#define		BPF_MEM		0x60
1: -#define		BPF_LEN		0x80
1: -#define		BPF_MSH		0xa0
1: +#define BPF_MODE(code) ((code)&0xe0)
1: +#define BPF_IMM 0x00
1: +#define BPF_ABS 0x20
1: +#define BPF_IND 0x40
1: +#define BPF_MEM 0x60
1: +#define BPF_LEN 0x80
1: +#define BPF_MSH 0xa0
1:  
1:  /* alu/jmp fields */
1: -#define BPF_OP(code)    ((code) & 0xf0)
1: -#define		BPF_ADD		0x00
1: -#define		BPF_SUB		0x10
1: -#define		BPF_MUL		0x20
1: -#define		BPF_DIV		0x30
1: -#define		BPF_OR		0x40
1: -#define		BPF_AND		0x50
1: -#define		BPF_LSH		0x60
1: -#define		BPF_RSH		0x70
1: -#define		BPF_NEG		0x80
1: -#define		BPF_MOD		0x90
1: -#define		BPF_XOR		0xa0
1: +#define BPF_OP(code) ((code)&0xf0)
1: +#define BPF_ADD 0x00
1: +#define BPF_SUB 0x10
1: +#define BPF_MUL 0x20
1: +#define BPF_DIV 0x30
1: +#define BPF_OR 0x40
1: +#define BPF_AND 0x50
1: +#define BPF_LSH 0x60
1: +#define BPF_RSH 0x70
1: +#define BPF_NEG 0x80
1: +#define BPF_MOD 0x90
1: +#define BPF_XOR 0xa0
1:  
1: -#define		BPF_JA		0x00
1: -#define		BPF_JEQ		0x10
1: -#define		BPF_JGT		0x20
1: -#define		BPF_JGE		0x30
1: -#define		BPF_JSET        0x40
1: -#define BPF_SRC(code)   ((code) & 0x08)
1: -#define		BPF_K		0x00
1: -#define		BPF_X		0x08
1: +#define BPF_JA 0x00
1: +#define BPF_JEQ 0x10
1: +#define BPF_JGT 0x20
1: +#define BPF_JGE 0x30
1: +#define BPF_JSET 0x40
1: +#define BPF_SRC(code) ((code)&0x08)
1: +#define BPF_K 0x00
1: +#define BPF_X 0x08
1:  
1:  #ifndef BPF_MAXINSNS
1:  #define BPF_MAXINSNS 4096
1: diff --git a/src/cc/libbpf/include/uapi/linux/btf.h b/src/cc/libbpf/include/uapi/linux/btf.h
1: index d27b1708..e381aef9 100644
1: --- a/src/cc/libbpf/include/uapi/linux/btf.h
1: +++ b/src/cc/libbpf/include/uapi/linux/btf.h
1: @@ -5,76 +5,76 @@
1:  
1:  #include <linux/types.h>
1:  
1: -#define BTF_MAGIC	0xeB9F
1: -#define BTF_VERSION	1
1: +#define BTF_MAGIC 0xeB9F
1: +#define BTF_VERSION 1
1:  
1:  struct btf_header {
1: -	__u16	magic;
1: -	__u8	version;
1: -	__u8	flags;
1: -	__u32	hdr_len;
1: -
1: -	/* All offsets are in bytes relative to the end of this header */
1: -	__u32	type_off;	/* offset of type section	*/
1: -	__u32	type_len;	/* length of type section	*/
1: -	__u32	str_off;	/* offset of string section	*/
1: -	__u32	str_len;	/* length of string section	*/
1: +  __u16 magic;
1: +  __u8 version;
1: +  __u8 flags;
1: +  __u32 hdr_len;
1: +
1: +  /* All offsets are in bytes relative to the end of this header */
1: +  __u32 type_off; /* offset of type section	*/
1: +  __u32 type_len; /* length of type section	*/
1: +  __u32 str_off;  /* offset of string section	*/
1: +  __u32 str_len;  /* length of string section	*/
1:  };
1:  
1:  /* Max # of type identifier */
1: -#define BTF_MAX_TYPE	0x000fffff
1: +#define BTF_MAX_TYPE 0x000fffff
1:  /* Max offset into the string section */
1: -#define BTF_MAX_NAME_OFFSET	0x00ffffff
1: +#define BTF_MAX_NAME_OFFSET 0x00ffffff
1:  /* Max # of struct/union/enum members or func args */
1: -#define BTF_MAX_VLEN	0xffff
1: +#define BTF_MAX_VLEN 0xffff
1:  
1:  struct btf_type {
1: -	__u32 name_off;
1: -	/* "info" bits arrangement
1: -	 * bits  0-15: vlen (e.g. # of struct's members)
1: -	 * bits 16-23: unused
1: -	 * bits 24-27: kind (e.g. int, ptr, array...etc)
1: -	 * bits 28-30: unused
1: -	 * bit     31: kind_flag, currently used by
1: -	 *             struct, union and fwd
1: -	 */
1: -	__u32 info;
1: -	/* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC.
1: -	 * "size" tells the size of the type it is describing.
1: -	 *
1: -	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
1: -	 * FUNC, FUNC_PROTO and VAR.
1: -	 * "type" is a type_id referring to another type.
1: -	 */
1: -	union {
1: -		__u32 size;
1: -		__u32 type;
1: -	};
1: +  __u32 name_off;
1: +  /* "info" bits arrangement
1: +   * bits  0-15: vlen (e.g. # of struct's members)
1: +   * bits 16-23: unused
1: +   * bits 24-27: kind (e.g. int, ptr, array...etc)
1: +   * bits 28-30: unused
1: +   * bit     31: kind_flag, currently used by
1: +   *             struct, union and fwd
1: +   */
1: +  __u32 info;
1: +  /* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC.
1: +   * "size" tells the size of the type it is describing.
1: +   *
1: +   * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
1: +   * FUNC, FUNC_PROTO and VAR.
1: +   * "type" is a type_id referring to another type.
1: +   */
1: +  union {
1: +    __u32 size;
1: +    __u32 type;
1: +  };
1:  };
1:  
1: -#define BTF_INFO_KIND(info)	(((info) >> 24) & 0x1f)
1: -#define BTF_INFO_VLEN(info)	((info) & 0xffff)
1: -#define BTF_INFO_KFLAG(info)	((info) >> 31)
1: -
1: -#define BTF_KIND_UNKN		0	/* Unknown	*/
1: -#define BTF_KIND_INT		1	/* Integer	*/
1: -#define BTF_KIND_PTR		2	/* Pointer	*/
1: -#define BTF_KIND_ARRAY		3	/* Array	*/
1: -#define BTF_KIND_STRUCT		4	/* Struct	*/
1: -#define BTF_KIND_UNION		5	/* Union	*/
1: -#define BTF_KIND_ENUM		6	/* Enumeration	*/
1: -#define BTF_KIND_FWD		7	/* Forward	*/
1: -#define BTF_KIND_TYPEDEF	8	/* Typedef	*/
1: -#define BTF_KIND_VOLATILE	9	/* Volatile	*/
1: -#define BTF_KIND_CONST		10	/* Const	*/
1: -#define BTF_KIND_RESTRICT	11	/* Restrict	*/
1: -#define BTF_KIND_FUNC		12	/* Function	*/
1: -#define BTF_KIND_FUNC_PROTO	13	/* Function Proto	*/
1: -#define BTF_KIND_VAR		14	/* Variable	*/
1: -#define BTF_KIND_DATASEC	15	/* Section	*/
1: -#define BTF_KIND_FLOAT		16	/* Floating point	*/
1: -#define BTF_KIND_MAX		BTF_KIND_FLOAT
1: -#define NR_BTF_KINDS		(BTF_KIND_MAX + 1)
1: +#define BTF_INFO_KIND(info) (((info) >> 24) & 0x1f)
1: +#define BTF_INFO_VLEN(info) ((info)&0xffff)
1: +#define BTF_INFO_KFLAG(info) ((info) >> 31)
1: +
1: +#define BTF_KIND_UNKN 0        /* Unknown	*/
1: +#define BTF_KIND_INT 1         /* Integer	*/
1: +#define BTF_KIND_PTR 2         /* Pointer	*/
1: +#define BTF_KIND_ARRAY 3       /* Array	*/
1: +#define BTF_KIND_STRUCT 4      /* Struct	*/
1: +#define BTF_KIND_UNION 5       /* Union	*/
1: +#define BTF_KIND_ENUM 6        /* Enumeration	*/
1: +#define BTF_KIND_FWD 7         /* Forward	*/
1: +#define BTF_KIND_TYPEDEF 8     /* Typedef	*/
1: +#define BTF_KIND_VOLATILE 9    /* Volatile	*/
1: +#define BTF_KIND_CONST 10      /* Const	*/
1: +#define BTF_KIND_RESTRICT 11   /* Restrict	*/
1: +#define BTF_KIND_FUNC 12       /* Function	*/
1: +#define BTF_KIND_FUNC_PROTO 13 /* Function Proto	*/
1: +#define BTF_KIND_VAR 14        /* Variable	*/
1: +#define BTF_KIND_DATASEC 15    /* Section	*/
1: +#define BTF_KIND_FLOAT 16      /* Floating point	*/
1: +#define BTF_KIND_MAX BTF_KIND_FLOAT
1: +#define NR_BTF_KINDS (BTF_KIND_MAX + 1)
1:  
1:  /* For some specific BTF_KIND, "struct btf_type" is immediately
1:   * followed by extra data.
1: @@ -83,29 +83,29 @@ struct btf_type {
1:  /* BTF_KIND_INT is followed by a u32 and the following
1:   * is the 32 bits arrangement:
1:   */
1: -#define BTF_INT_ENCODING(VAL)	(((VAL) & 0x0f000000) >> 24)
1: -#define BTF_INT_OFFSET(VAL)	(((VAL) & 0x00ff0000) >> 16)
1: -#define BTF_INT_BITS(VAL)	((VAL)  & 0x000000ff)
1: +#define BTF_INT_ENCODING(VAL) (((VAL)&0x0f000000) >> 24)
1: +#define BTF_INT_OFFSET(VAL) (((VAL)&0x00ff0000) >> 16)
1: +#define BTF_INT_BITS(VAL) ((VAL)&0x000000ff)
1:  
1:  /* Attributes stored in the BTF_INT_ENCODING */
1: -#define BTF_INT_SIGNED	(1 << 0)
1: -#define BTF_INT_CHAR	(1 << 1)
1: -#define BTF_INT_BOOL	(1 << 2)
1: +#define BTF_INT_SIGNED (1 << 0)
1: +#define BTF_INT_CHAR (1 << 1)
1: +#define BTF_INT_BOOL (1 << 2)
1:  
1:  /* BTF_KIND_ENUM is followed by multiple "struct btf_enum".
1:   * The exact number of btf_enum is stored in the vlen (of the
1:   * info in "struct btf_type").
1:   */
1:  struct btf_enum {
1: -	__u32	name_off;
1: -	__s32	val;
1: +  __u32 name_off;
1: +  __s32 val;
1:  };
1:  
1:  /* BTF_KIND_ARRAY is followed by one "struct btf_array" */
1:  struct btf_array {
1: -	__u32	type;
1: -	__u32	index_type;
1: -	__u32	nelems;
1: +  __u32 type;
1: +  __u32 index_type;
1: +  __u32 nelems;
1:  };
1:  
1:  /* BTF_KIND_STRUCT and BTF_KIND_UNION are followed
1: @@ -114,50 +114,50 @@ struct btf_array {
1:   * "struct btf_type").
1:   */
1:  struct btf_member {
1: -	__u32	name_off;
1: -	__u32	type;
1: -	/* If the type info kind_flag is set, the btf_member offset
1: -	 * contains both member bitfield size and bit offset. The
1: -	 * bitfield size is set for bitfield members. If the type
1: -	 * info kind_flag is not set, the offset contains only bit
1: -	 * offset.
1: -	 */
1: -	__u32	offset;
1: +  __u32 name_off;
1: +  __u32 type;
1: +  /* If the type info kind_flag is set, the btf_member offset
1: +   * contains both member bitfield size and bit offset. The
1: +   * bitfield size is set for bitfield members. If the type
1: +   * info kind_flag is not set, the offset contains only bit
1: +   * offset.
1: +   */
1: +  __u32 offset;
1:  };
1:  
1:  /* If the struct/union type info kind_flag is set, the
1:   * following two macros are used to access bitfield_size
1:   * and bit_offset from btf_member.offset.
1:   */
1: -#define BTF_MEMBER_BITFIELD_SIZE(val)	((val) >> 24)
1: -#define BTF_MEMBER_BIT_OFFSET(val)	((val) & 0xffffff)
1: +#define BTF_MEMBER_BITFIELD_SIZE(val) ((val) >> 24)
1: +#define BTF_MEMBER_BIT_OFFSET(val) ((val)&0xffffff)
1:  
1:  /* BTF_KIND_FUNC_PROTO is followed by multiple "struct btf_param".
1:   * The exact number of btf_param is stored in the vlen (of the
1:   * info in "struct btf_type").
1:   */
1:  struct btf_param {
1: -	__u32	name_off;
1: -	__u32	type;
1: +  __u32 name_off;
1: +  __u32 type;
1:  };
1:  
1:  enum {
1: -	BTF_VAR_STATIC = 0,
1: -	BTF_VAR_GLOBAL_ALLOCATED = 1,
1: -	BTF_VAR_GLOBAL_EXTERN = 2,
1: +  BTF_VAR_STATIC = 0,
1: +  BTF_VAR_GLOBAL_ALLOCATED = 1,
1: +  BTF_VAR_GLOBAL_EXTERN = 2,
1:  };
1:  
1:  enum btf_func_linkage {
1: -	BTF_FUNC_STATIC = 0,
1: -	BTF_FUNC_GLOBAL = 1,
1: -	BTF_FUNC_EXTERN = 2,
1: +  BTF_FUNC_STATIC = 0,
1: +  BTF_FUNC_GLOBAL = 1,
1: +  BTF_FUNC_EXTERN = 2,
1:  };
1:  
1:  /* BTF_KIND_VAR is followed by a single "struct btf_var" to describe
1:   * additional information related to the variable such as its linkage.
1:   */
1:  struct btf_var {
1: -	__u32	linkage;
1: +  __u32 linkage;
1:  };
1:  
1:  /* BTF_KIND_DATASEC is followed by multiple "struct btf_var_secinfo"
1: @@ -165,9 +165,9 @@ struct btf_var {
1:   * in-section offset as well as size.
1:   */
1:  struct btf_var_secinfo {
1: -	__u32	type;
1: -	__u32	offset;
1: -	__u32	size;
1: +  __u32 type;
1: +  __u32 offset;
1: +  __u32 size;
1:  };
1:  
1:  #endif /* _UAPI__LINUX_BTF_H__ */
1: diff --git a/src/cc/libbpf/include/uapi/linux/if_link.h b/src/cc/libbpf/include/uapi/linux/if_link.h
1: index d208b2af..2243a603 100644
1: --- a/src/cc/libbpf/include/uapi/linux/if_link.h
1: +++ b/src/cc/libbpf/include/uapi/linux/if_link.h
1: @@ -2,87 +2,87 @@
1:  #ifndef _UAPI_LINUX_IF_LINK_H
1:  #define _UAPI_LINUX_IF_LINK_H
1:  
1: -#include <linux/types.h>
1:  #include <linux/netlink.h>
1: +#include <linux/types.h>
1:  
1:  /* This struct should be in sync with struct rtnl_link_stats64 */
1:  struct rtnl_link_stats {
1: -	__u32	rx_packets;		/* total packets received	*/
1: -	__u32	tx_packets;		/* total packets transmitted	*/
1: -	__u32	rx_bytes;		/* total bytes received 	*/
1: -	__u32	tx_bytes;		/* total bytes transmitted	*/
1: -	__u32	rx_errors;		/* bad packets received		*/
1: -	__u32	tx_errors;		/* packet transmit problems	*/
1: -	__u32	rx_dropped;		/* no space in linux buffers	*/
1: -	__u32	tx_dropped;		/* no space available in linux	*/
1: -	__u32	multicast;		/* multicast packets received	*/
1: -	__u32	collisions;
1: -
1: -	/* detailed rx_errors: */
1: -	__u32	rx_length_errors;
1: -	__u32	rx_over_errors;		/* receiver ring buff overflow	*/
1: -	__u32	rx_crc_errors;		/* recved pkt with crc error	*/
1: -	__u32	rx_frame_errors;	/* recv'd frame alignment error */
1: -	__u32	rx_fifo_errors;		/* recv'r fifo overrun		*/
1: -	__u32	rx_missed_errors;	/* receiver missed packet	*/
1: -
1: -	/* detailed tx_errors */
1: -	__u32	tx_aborted_errors;
1: -	__u32	tx_carrier_errors;
1: -	__u32	tx_fifo_errors;
1: -	__u32	tx_heartbeat_errors;
1: -	__u32	tx_window_errors;
1: -
1: -	/* for cslip etc */
1: -	__u32	rx_compressed;
1: -	__u32	tx_compressed;
1: -
1: -	__u32	rx_nohandler;		/* dropped, no handler found	*/
1: +  __u32 rx_packets; /* total packets received	*/
1: +  __u32 tx_packets; /* total packets transmitted	*/
1: +  __u32 rx_bytes;   /* total bytes received 	*/
1: +  __u32 tx_bytes;   /* total bytes transmitted	*/
1: +  __u32 rx_errors;  /* bad packets received		*/
1: +  __u32 tx_errors;  /* packet transmit problems	*/
1: +  __u32 rx_dropped; /* no space in linux buffers	*/
1: +  __u32 tx_dropped; /* no space available in linux	*/
1: +  __u32 multicast;  /* multicast packets received	*/
1: +  __u32 collisions;
1: +
1: +  /* detailed rx_errors: */
1: +  __u32 rx_length_errors;
1: +  __u32 rx_over_errors;   /* receiver ring buff overflow	*/
1: +  __u32 rx_crc_errors;    /* recved pkt with crc error	*/
1: +  __u32 rx_frame_errors;  /* recv'd frame alignment error */
1: +  __u32 rx_fifo_errors;   /* recv'r fifo overrun		*/
1: +  __u32 rx_missed_errors; /* receiver missed packet	*/
1: +
1: +  /* detailed tx_errors */
1: +  __u32 tx_aborted_errors;
1: +  __u32 tx_carrier_errors;
1: +  __u32 tx_fifo_errors;
1: +  __u32 tx_heartbeat_errors;
1: +  __u32 tx_window_errors;
1: +
1: +  /* for cslip etc */
1: +  __u32 rx_compressed;
1: +  __u32 tx_compressed;
1: +
1: +  __u32 rx_nohandler; /* dropped, no handler found	*/
1:  };
1:  
1:  /* The main device statistics structure */
1:  struct rtnl_link_stats64 {
1: -	__u64	rx_packets;		/* total packets received	*/
1: -	__u64	tx_packets;		/* total packets transmitted	*/
1: -	__u64	rx_bytes;		/* total bytes received 	*/
1: -	__u64	tx_bytes;		/* total bytes transmitted	*/
1: -	__u64	rx_errors;		/* bad packets received		*/
1: -	__u64	tx_errors;		/* packet transmit problems	*/
1: -	__u64	rx_dropped;		/* no space in linux buffers	*/
1: -	__u64	tx_dropped;		/* no space available in linux	*/
1: -	__u64	multicast;		/* multicast packets received	*/
1: -	__u64	collisions;
1: -
1: -	/* detailed rx_errors: */
1: -	__u64	rx_length_errors;
1: -	__u64	rx_over_errors;		/* receiver ring buff overflow	*/
1: -	__u64	rx_crc_errors;		/* recved pkt with crc error	*/
1: -	__u64	rx_frame_errors;	/* recv'd frame alignment error */
1: -	__u64	rx_fifo_errors;		/* recv'r fifo overrun		*/
1: -	__u64	rx_missed_errors;	/* receiver missed packet	*/
1: -
1: -	/* detailed tx_errors */
1: -	__u64	tx_aborted_errors;
1: -	__u64	tx_carrier_errors;
1: -	__u64	tx_fifo_errors;
1: -	__u64	tx_heartbeat_errors;
1: -	__u64	tx_window_errors;
1: -
1: -	/* for cslip etc */
1: -	__u64	rx_compressed;
1: -	__u64	tx_compressed;
1: -
1: -	__u64	rx_nohandler;		/* dropped, no handler found	*/
1: +  __u64 rx_packets; /* total packets received	*/
1: +  __u64 tx_packets; /* total packets transmitted	*/
1: +  __u64 rx_bytes;   /* total bytes received 	*/
1: +  __u64 tx_bytes;   /* total bytes transmitted	*/
1: +  __u64 rx_errors;  /* bad packets received		*/
1: +  __u64 tx_errors;  /* packet transmit problems	*/
1: +  __u64 rx_dropped; /* no space in linux buffers	*/
1: +  __u64 tx_dropped; /* no space available in linux	*/
1: +  __u64 multicast;  /* multicast packets received	*/
1: +  __u64 collisions;
1: +
1: +  /* detailed rx_errors: */
1: +  __u64 rx_length_errors;
1: +  __u64 rx_over_errors;   /* receiver ring buff overflow	*/
1: +  __u64 rx_crc_errors;    /* recved pkt with crc error	*/
1: +  __u64 rx_frame_errors;  /* recv'd frame alignment error */
1: +  __u64 rx_fifo_errors;   /* recv'r fifo overrun		*/
1: +  __u64 rx_missed_errors; /* receiver missed packet	*/
1: +
1: +  /* detailed tx_errors */
1: +  __u64 tx_aborted_errors;
1: +  __u64 tx_carrier_errors;
1: +  __u64 tx_fifo_errors;
1: +  __u64 tx_heartbeat_errors;
1: +  __u64 tx_window_errors;
1: +
1: +  /* for cslip etc */
1: +  __u64 rx_compressed;
1: +  __u64 tx_compressed;
1: +
1: +  __u64 rx_nohandler; /* dropped, no handler found	*/
1:  };
1:  
1:  /* The struct should be in sync with struct ifmap */
1:  struct rtnl_link_ifmap {
1: -	__u64	mem_start;
1: -	__u64	mem_end;
1: -	__u64	base_addr;
1: -	__u16	irq;
1: -	__u8	dma;
1: -	__u8	port;
1: +  __u64 mem_start;
1: +  __u64 mem_end;
1: +  __u64 base_addr;
1: +  __u16 irq;
1: +  __u8 dma;
1: +  __u8 port;
1:  };
1:  
1:  /*
1: @@ -104,88 +104,88 @@ struct rtnl_link_ifmap {
1:   */
1:  
1:  enum {
1: -	IFLA_UNSPEC,
1: -	IFLA_ADDRESS,
1: -	IFLA_BROADCAST,
1: -	IFLA_IFNAME,
1: -	IFLA_MTU,
1: -	IFLA_LINK,
1: -	IFLA_QDISC,
1: -	IFLA_STATS,
1: -	IFLA_COST,
1: +  IFLA_UNSPEC,
1: +  IFLA_ADDRESS,
1: +  IFLA_BROADCAST,
1: +  IFLA_IFNAME,
1: +  IFLA_MTU,
1: +  IFLA_LINK,
1: +  IFLA_QDISC,
1: +  IFLA_STATS,
1: +  IFLA_COST,
1:  #define IFLA_COST IFLA_COST
1: -	IFLA_PRIORITY,
1: +  IFLA_PRIORITY,
1:  #define IFLA_PRIORITY IFLA_PRIORITY
1: -	IFLA_MASTER,
1: +  IFLA_MASTER,
1:  #define IFLA_MASTER IFLA_MASTER
1: -	IFLA_WIRELESS,		/* Wireless Extension event - see wireless.h */
1: +  IFLA_WIRELESS, /* Wireless Extension event - see wireless.h */
1:  #define IFLA_WIRELESS IFLA_WIRELESS
1: -	IFLA_PROTINFO,		/* Protocol specific information for a link */
1: +  IFLA_PROTINFO, /* Protocol specific information for a link */
1:  #define IFLA_PROTINFO IFLA_PROTINFO
1: -	IFLA_TXQLEN,
1: +  IFLA_TXQLEN,
1:  #define IFLA_TXQLEN IFLA_TXQLEN
1: -	IFLA_MAP,
1: +  IFLA_MAP,
1:  #define IFLA_MAP IFLA_MAP
1: -	IFLA_WEIGHT,
1: +  IFLA_WEIGHT,
1:  #define IFLA_WEIGHT IFLA_WEIGHT
1: -	IFLA_OPERSTATE,
1: -	IFLA_LINKMODE,
1: -	IFLA_LINKINFO,
1: +  IFLA_OPERSTATE,
1: +  IFLA_LINKMODE,
1: +  IFLA_LINKINFO,
1:  #define IFLA_LINKINFO IFLA_LINKINFO
1: -	IFLA_NET_NS_PID,
1: -	IFLA_IFALIAS,
1: -	IFLA_NUM_VF,		/* Number of VFs if device is SR-IOV PF */
1: -	IFLA_VFINFO_LIST,
1: -	IFLA_STATS64,
1: -	IFLA_VF_PORTS,
1: -	IFLA_PORT_SELF,
1: -	IFLA_AF_SPEC,
1: -	IFLA_GROUP,		/* Group the device belongs to */
1: -	IFLA_NET_NS_FD,
1: -	IFLA_EXT_MASK,		/* Extended info mask, VFs, etc */
1: -	IFLA_PROMISCUITY,	/* Promiscuity count: > 0 means acts PROMISC */
1: +  IFLA_NET_NS_PID,
1: +  IFLA_IFALIAS,
1: +  IFLA_NUM_VF, /* Number of VFs if device is SR-IOV PF */
1: +  IFLA_VFINFO_LIST,
1: +  IFLA_STATS64,
1: +  IFLA_VF_PORTS,
1: +  IFLA_PORT_SELF,
1: +  IFLA_AF_SPEC,
1: +  IFLA_GROUP, /* Group the device belongs to */
1: +  IFLA_NET_NS_FD,
1: +  IFLA_EXT_MASK,    /* Extended info mask, VFs, etc */
1: +  IFLA_PROMISCUITY, /* Promiscuity count: > 0 means acts PROMISC */
1:  #define IFLA_PROMISCUITY IFLA_PROMISCUITY
1: -	IFLA_NUM_TX_QUEUES,
1: -	IFLA_NUM_RX_QUEUES,
1: -	IFLA_CARRIER,
1: -	IFLA_PHYS_PORT_ID,
1: -	IFLA_CARRIER_CHANGES,
1: -	IFLA_PHYS_SWITCH_ID,
1: -	IFLA_LINK_NETNSID,
1: -	IFLA_PHYS_PORT_NAME,
1: -	IFLA_PROTO_DOWN,
1: -	IFLA_GSO_MAX_SEGS,
1: -	IFLA_GSO_MAX_SIZE,
1: -	IFLA_PAD,
1: -	IFLA_XDP,
1: -	IFLA_EVENT,
1: -	IFLA_NEW_NETNSID,
1: -	IFLA_IF_NETNSID,
1: -	IFLA_TARGET_NETNSID = IFLA_IF_NETNSID, /* new alias */
1: -	IFLA_CARRIER_UP_COUNT,
1: -	IFLA_CARRIER_DOWN_COUNT,
1: -	IFLA_NEW_IFINDEX,
1: -	IFLA_MIN_MTU,
1: -	IFLA_MAX_MTU,
1: -	IFLA_PROP_LIST,
1: -	IFLA_ALT_IFNAME, /* Alternative ifname */
1: -	IFLA_PERM_ADDRESS,
1: -	__IFLA_MAX
1: +  IFLA_NUM_TX_QUEUES,
1: +  IFLA_NUM_RX_QUEUES,
1: +  IFLA_CARRIER,
1: +  IFLA_PHYS_PORT_ID,
1: +  IFLA_CARRIER_CHANGES,
1: +  IFLA_PHYS_SWITCH_ID,
1: +  IFLA_LINK_NETNSID,
1: +  IFLA_PHYS_PORT_NAME,
1: +  IFLA_PROTO_DOWN,
1: +  IFLA_GSO_MAX_SEGS,
1: +  IFLA_GSO_MAX_SIZE,
1: +  IFLA_PAD,
1: +  IFLA_XDP,
1: +  IFLA_EVENT,
1: +  IFLA_NEW_NETNSID,
1: +  IFLA_IF_NETNSID,
1: +  IFLA_TARGET_NETNSID = IFLA_IF_NETNSID, /* new alias */
1: +  IFLA_CARRIER_UP_COUNT,
1: +  IFLA_CARRIER_DOWN_COUNT,
1: +  IFLA_NEW_IFINDEX,
1: +  IFLA_MIN_MTU,
1: +  IFLA_MAX_MTU,
1: +  IFLA_PROP_LIST,
1: +  IFLA_ALT_IFNAME, /* Alternative ifname */
1: +  IFLA_PERM_ADDRESS,
1: +  __IFLA_MAX
1:  };
1:  
1: -
1:  #define IFLA_MAX (__IFLA_MAX - 1)
1:  
1:  /* backwards compatibility for userspace */
1:  #ifndef __KERNEL__
1: -#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
1: -#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
1: +#define IFLA_RTA(r) \
1: +  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
1: +#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg))
1:  #endif
1:  
1:  enum {
1: -	IFLA_INET_UNSPEC,
1: -	IFLA_INET_CONF,
1: -	__IFLA_INET_MAX,
1: +  IFLA_INET_UNSPEC,
1: +  IFLA_INET_CONF,
1: +  __IFLA_INET_MAX,
1:  };
1:  
1:  #define IFLA_INET_MAX (__IFLA_INET_MAX - 1)
1: @@ -221,589 +221,568 @@ enum {
1:  
1:  /* Subtype attributes for IFLA_PROTINFO */
1:  enum {
1: -	IFLA_INET6_UNSPEC,
1: -	IFLA_INET6_FLAGS,	/* link flags			*/
1: -	IFLA_INET6_CONF,	/* sysctl parameters		*/
1: -	IFLA_INET6_STATS,	/* statistics			*/
1: -	IFLA_INET6_MCAST,	/* MC things. What of them?	*/
1: -	IFLA_INET6_CACHEINFO,	/* time values and max reasm size */
1: -	IFLA_INET6_ICMP6STATS,	/* statistics (icmpv6)		*/
1: -	IFLA_INET6_TOKEN,	/* device token			*/
1: -	IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */
1: -	__IFLA_INET6_MAX
1: +  IFLA_INET6_UNSPEC,
1: +  IFLA_INET6_FLAGS,         /* link flags			*/
1: +  IFLA_INET6_CONF,          /* sysctl parameters		*/
1: +  IFLA_INET6_STATS,         /* statistics			*/
1: +  IFLA_INET6_MCAST,         /* MC things. What of them?	*/
1: +  IFLA_INET6_CACHEINFO,     /* time values and max reasm size */
1: +  IFLA_INET6_ICMP6STATS,    /* statistics (icmpv6)		*/
1: +  IFLA_INET6_TOKEN,         /* device token			*/
1: +  IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */
1: +  __IFLA_INET6_MAX
1:  };
1:  
1: -#define IFLA_INET6_MAX	(__IFLA_INET6_MAX - 1)
1: +#define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1)
1:  
1:  enum in6_addr_gen_mode {
1: -	IN6_ADDR_GEN_MODE_EUI64,
1: -	IN6_ADDR_GEN_MODE_NONE,
1: -	IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
1: -	IN6_ADDR_GEN_MODE_RANDOM,
1: +  IN6_ADDR_GEN_MODE_EUI64,
1: +  IN6_ADDR_GEN_MODE_NONE,
1: +  IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
1: +  IN6_ADDR_GEN_MODE_RANDOM,
1:  };
1:  
1:  /* Bridge section */
1:  
1:  enum {
1: -	IFLA_BR_UNSPEC,
1: -	IFLA_BR_FORWARD_DELAY,
1: -	IFLA_BR_HELLO_TIME,
1: -	IFLA_BR_MAX_AGE,
1: -	IFLA_BR_AGEING_TIME,
1: -	IFLA_BR_STP_STATE,
1: -	IFLA_BR_PRIORITY,
1: -	IFLA_BR_VLAN_FILTERING,
1: -	IFLA_BR_VLAN_PROTOCOL,
1: -	IFLA_BR_GROUP_FWD_MASK,
1: -	IFLA_BR_ROOT_ID,
1: -	IFLA_BR_BRIDGE_ID,
1: -	IFLA_BR_ROOT_PORT,
1: -	IFLA_BR_ROOT_PATH_COST,
1: -	IFLA_BR_TOPOLOGY_CHANGE,
1: -	IFLA_BR_TOPOLOGY_CHANGE_DETECTED,
1: -	IFLA_BR_HELLO_TIMER,
1: -	IFLA_BR_TCN_TIMER,
1: -	IFLA_BR_TOPOLOGY_CHANGE_TIMER,
1: -	IFLA_BR_GC_TIMER,
1: -	IFLA_BR_GROUP_ADDR,
1: -	IFLA_BR_FDB_FLUSH,
1: -	IFLA_BR_MCAST_ROUTER,
1: -	IFLA_BR_MCAST_SNOOPING,
1: -	IFLA_BR_MCAST_QUERY_USE_IFADDR,
1: -	IFLA_BR_MCAST_QUERIER,
1: -	IFLA_BR_MCAST_HASH_ELASTICITY,
1: -	IFLA_BR_MCAST_HASH_MAX,
1: -	IFLA_BR_MCAST_LAST_MEMBER_CNT,
1: -	IFLA_BR_MCAST_STARTUP_QUERY_CNT,
1: -	IFLA_BR_MCAST_LAST_MEMBER_INTVL,
1: -	IFLA_BR_MCAST_MEMBERSHIP_INTVL,
1: -	IFLA_BR_MCAST_QUERIER_INTVL,
1: -	IFLA_BR_MCAST_QUERY_INTVL,
1: -	IFLA_BR_MCAST_QUERY_RESPONSE_INTVL,
1: -	IFLA_BR_MCAST_STARTUP_QUERY_INTVL,
1: -	IFLA_BR_NF_CALL_IPTABLES,
1: -	IFLA_BR_NF_CALL_IP6TABLES,
1: -	IFLA_BR_NF_CALL_ARPTABLES,
1: -	IFLA_BR_VLAN_DEFAULT_PVID,
1: -	IFLA_BR_PAD,
1: -	IFLA_BR_VLAN_STATS_ENABLED,
1: -	IFLA_BR_MCAST_STATS_ENABLED,
1: -	IFLA_BR_MCAST_IGMP_VERSION,
1: -	IFLA_BR_MCAST_MLD_VERSION,
1: -	IFLA_BR_VLAN_STATS_PER_PORT,
1: -	IFLA_BR_MULTI_BOOLOPT,
1: -	__IFLA_BR_MAX,
1: -};
1: -
1: -#define IFLA_BR_MAX	(__IFLA_BR_MAX - 1)
1: +  IFLA_BR_UNSPEC,
1: +  IFLA_BR_FORWARD_DELAY,
1: +  IFLA_BR_HELLO_TIME,
1: +  IFLA_BR_MAX_AGE,
1: +  IFLA_BR_AGEING_TIME,
1: +  IFLA_BR_STP_STATE,
1: +  IFLA_BR_PRIORITY,
1: +  IFLA_BR_VLAN_FILTERING,
1: +  IFLA_BR_VLAN_PROTOCOL,
1: +  IFLA_BR_GROUP_FWD_MASK,
1: +  IFLA_BR_ROOT_ID,
1: +  IFLA_BR_BRIDGE_ID,
1: +  IFLA_BR_ROOT_PORT,
1: +  IFLA_BR_ROOT_PATH_COST,
1: +  IFLA_BR_TOPOLOGY_CHANGE,
1: +  IFLA_BR_TOPOLOGY_CHANGE_DETECTED,
1: +  IFLA_BR_HELLO_TIMER,
1: +  IFLA_BR_TCN_TIMER,
1: +  IFLA_BR_TOPOLOGY_CHANGE_TIMER,
1: +  IFLA_BR_GC_TIMER,
1: +  IFLA_BR_GROUP_ADDR,
1: +  IFLA_BR_FDB_FLUSH,
1: +  IFLA_BR_MCAST_ROUTER,
1: +  IFLA_BR_MCAST_SNOOPING,
1: +  IFLA_BR_MCAST_QUERY_USE_IFADDR,
1: +  IFLA_BR_MCAST_QUERIER,
1: +  IFLA_BR_MCAST_HASH_ELASTICITY,
1: +  IFLA_BR_MCAST_HASH_MAX,
1: +  IFLA_BR_MCAST_LAST_MEMBER_CNT,
1: +  IFLA_BR_MCAST_STARTUP_QUERY_CNT,
1: +  IFLA_BR_MCAST_LAST_MEMBER_INTVL,
1: +  IFLA_BR_MCAST_MEMBERSHIP_INTVL,
1: +  IFLA_BR_MCAST_QUERIER_INTVL,
1: +  IFLA_BR_MCAST_QUERY_INTVL,
1: +  IFLA_BR_MCAST_QUERY_RESPONSE_INTVL,
1: +  IFLA_BR_MCAST_STARTUP_QUERY_INTVL,
1: +  IFLA_BR_NF_CALL_IPTABLES,
1: +  IFLA_BR_NF_CALL_IP6TABLES,
1: +  IFLA_BR_NF_CALL_ARPTABLES,
1: +  IFLA_BR_VLAN_DEFAULT_PVID,
1: +  IFLA_BR_PAD,
1: +  IFLA_BR_VLAN_STATS_ENABLED,
1: +  IFLA_BR_MCAST_STATS_ENABLED,
1: +  IFLA_BR_MCAST_IGMP_VERSION,
1: +  IFLA_BR_MCAST_MLD_VERSION,
1: +  IFLA_BR_VLAN_STATS_PER_PORT,
1: +  IFLA_BR_MULTI_BOOLOPT,
1: +  __IFLA_BR_MAX,
1: +};
1: +
1: +#define IFLA_BR_MAX (__IFLA_BR_MAX - 1)
1:  
1:  struct ifla_bridge_id {
1: -	__u8	prio[2];
1: -	__u8	addr[6]; /* ETH_ALEN */
1: +  __u8 prio[2];
1: +  __u8 addr[6]; /* ETH_ALEN */
1:  };
1:  
1:  enum {
1: -	BRIDGE_MODE_UNSPEC,
1: -	BRIDGE_MODE_HAIRPIN,
1: +  BRIDGE_MODE_UNSPEC,
1: +  BRIDGE_MODE_HAIRPIN,
1:  };
1:  
1:  enum {
1: -	IFLA_BRPORT_UNSPEC,
1: -	IFLA_BRPORT_STATE,	/* Spanning tree state     */
1: -	IFLA_BRPORT_PRIORITY,	/* "             priority  */
1: -	IFLA_BRPORT_COST,	/* "             cost      */
1: -	IFLA_BRPORT_MODE,	/* mode (hairpin)          */
1: -	IFLA_BRPORT_GUARD,	/* bpdu guard              */
1: -	IFLA_BRPORT_PROTECT,	/* root port protection    */
1: -	IFLA_BRPORT_FAST_LEAVE,	/* multicast fast leave    */
1: -	IFLA_BRPORT_LEARNING,	/* mac learning */
1: -	IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
1: -	IFLA_BRPORT_PROXYARP,	/* proxy ARP */
1: -	IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
1: -	IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
1: -	IFLA_BRPORT_ROOT_ID,	/* designated root */
1: -	IFLA_BRPORT_BRIDGE_ID,	/* designated bridge */
1: -	IFLA_BRPORT_DESIGNATED_PORT,
1: -	IFLA_BRPORT_DESIGNATED_COST,
1: -	IFLA_BRPORT_ID,
1: -	IFLA_BRPORT_NO,
1: -	IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,
1: -	IFLA_BRPORT_CONFIG_PENDING,
1: -	IFLA_BRPORT_MESSAGE_AGE_TIMER,
1: -	IFLA_BRPORT_FORWARD_DELAY_TIMER,
1: -	IFLA_BRPORT_HOLD_TIMER,
1: -	IFLA_BRPORT_FLUSH,
1: -	IFLA_BRPORT_MULTICAST_ROUTER,
1: -	IFLA_BRPORT_PAD,
1: -	IFLA_BRPORT_MCAST_FLOOD,
1: -	IFLA_BRPORT_MCAST_TO_UCAST,
1: -	IFLA_BRPORT_VLAN_TUNNEL,
1: -	IFLA_BRPORT_BCAST_FLOOD,
1: -	IFLA_BRPORT_GROUP_FWD_MASK,
1: -	IFLA_BRPORT_NEIGH_SUPPRESS,
1: -	IFLA_BRPORT_ISOLATED,
1: -	IFLA_BRPORT_BACKUP_PORT,
1: -	IFLA_BRPORT_MRP_RING_OPEN,
1: -	IFLA_BRPORT_MRP_IN_OPEN,
1: -	__IFLA_BRPORT_MAX
1: +  IFLA_BRPORT_UNSPEC,
1: +  IFLA_BRPORT_STATE,         /* Spanning tree state     */
1: +  IFLA_BRPORT_PRIORITY,      /* "             priority  */
1: +  IFLA_BRPORT_COST,          /* "             cost      */
1: +  IFLA_BRPORT_MODE,          /* mode (hairpin)          */
1: +  IFLA_BRPORT_GUARD,         /* bpdu guard              */
1: +  IFLA_BRPORT_PROTECT,       /* root port protection    */
1: +  IFLA_BRPORT_FAST_LEAVE,    /* multicast fast leave    */
1: +  IFLA_BRPORT_LEARNING,      /* mac learning */
1: +  IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
1: +  IFLA_BRPORT_PROXYARP,      /* proxy ARP */
1: +  IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
1: +  IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
1: +  IFLA_BRPORT_ROOT_ID,       /* designated root */
1: +  IFLA_BRPORT_BRIDGE_ID,     /* designated bridge */
1: +  IFLA_BRPORT_DESIGNATED_PORT,
1: +  IFLA_BRPORT_DESIGNATED_COST,
1: +  IFLA_BRPORT_ID,
1: +  IFLA_BRPORT_NO,
1: +  IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,
1: +  IFLA_BRPORT_CONFIG_PENDING,
1: +  IFLA_BRPORT_MESSAGE_AGE_TIMER,
1: +  IFLA_BRPORT_FORWARD_DELAY_TIMER,
1: +  IFLA_BRPORT_HOLD_TIMER,
1: +  IFLA_BRPORT_FLUSH,
1: +  IFLA_BRPORT_MULTICAST_ROUTER,
1: +  IFLA_BRPORT_PAD,
1: +  IFLA_BRPORT_MCAST_FLOOD,
1: +  IFLA_BRPORT_MCAST_TO_UCAST,
1: +  IFLA_BRPORT_VLAN_TUNNEL,
1: +  IFLA_BRPORT_BCAST_FLOOD,
1: +  IFLA_BRPORT_GROUP_FWD_MASK,
1: +  IFLA_BRPORT_NEIGH_SUPPRESS,
1: +  IFLA_BRPORT_ISOLATED,
1: +  IFLA_BRPORT_BACKUP_PORT,
1: +  IFLA_BRPORT_MRP_RING_OPEN,
1: +  IFLA_BRPORT_MRP_IN_OPEN,
1: +  __IFLA_BRPORT_MAX
1:  };
1:  #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
1:  
1:  struct ifla_cacheinfo {
1: -	__u32	max_reasm_len;
1: -	__u32	tstamp;		/* ipv6InterfaceTable updated timestamp */
1: -	__u32	reachable_time;
1: -	__u32	retrans_time;
1: +  __u32 max_reasm_len;
1: +  __u32 tstamp; /* ipv6InterfaceTable updated timestamp */
1: +  __u32 reachable_time;
1: +  __u32 retrans_time;
1:  };
1:  
1:  enum {
1: -	IFLA_INFO_UNSPEC,
1: -	IFLA_INFO_KIND,
1: -	IFLA_INFO_DATA,
1: -	IFLA_INFO_XSTATS,
1: -	IFLA_INFO_SLAVE_KIND,
1: -	IFLA_INFO_SLAVE_DATA,
1: -	__IFLA_INFO_MAX,
1: +  IFLA_INFO_UNSPEC,
1: +  IFLA_INFO_KIND,
1: +  IFLA_INFO_DATA,
1: +  IFLA_INFO_XSTATS,
1: +  IFLA_INFO_SLAVE_KIND,
1: +  IFLA_INFO_SLAVE_DATA,
1: +  __IFLA_INFO_MAX,
1:  };
1:  
1: -#define IFLA_INFO_MAX	(__IFLA_INFO_MAX - 1)
1: +#define IFLA_INFO_MAX (__IFLA_INFO_MAX - 1)
1:  
1:  /* VLAN section */
1:  
1:  enum {
1: -	IFLA_VLAN_UNSPEC,
1: -	IFLA_VLAN_ID,
1: -	IFLA_VLAN_FLAGS,
1: -	IFLA_VLAN_EGRESS_QOS,
1: -	IFLA_VLAN_INGRESS_QOS,
1: -	IFLA_VLAN_PROTOCOL,
1: -	__IFLA_VLAN_MAX,
1: +  IFLA_VLAN_UNSPEC,
1: +  IFLA_VLAN_ID,
1: +  IFLA_VLAN_FLAGS,
1: +  IFLA_VLAN_EGRESS_QOS,
1: +  IFLA_VLAN_INGRESS_QOS,
1: +  IFLA_VLAN_PROTOCOL,
1: +  __IFLA_VLAN_MAX,
1:  };
1:  
1: -#define IFLA_VLAN_MAX	(__IFLA_VLAN_MAX - 1)
1: +#define IFLA_VLAN_MAX (__IFLA_VLAN_MAX - 1)
1:  
1:  struct ifla_vlan_flags {
1: -	__u32	flags;
1: -	__u32	mask;
1: +  __u32 flags;
1: +  __u32 mask;
1:  };
1:  
1: -enum {
1: -	IFLA_VLAN_QOS_UNSPEC,
1: -	IFLA_VLAN_QOS_MAPPING,
1: -	__IFLA_VLAN_QOS_MAX
1: -};
1: +enum { IFLA_VLAN_QOS_UNSPEC, IFLA_VLAN_QOS_MAPPING, __IFLA_VLAN_QOS_MAX };
1:  
1: -#define IFLA_VLAN_QOS_MAX	(__IFLA_VLAN_QOS_MAX - 1)
1: +#define IFLA_VLAN_QOS_MAX (__IFLA_VLAN_QOS_MAX - 1)
1:  
1:  struct ifla_vlan_qos_mapping {
1: -	__u32 from;
1: -	__u32 to;
1: +  __u32 from;
1: +  __u32 to;
1:  };
1:  
1:  /* MACVLAN section */
1:  enum {
1: -	IFLA_MACVLAN_UNSPEC,
1: -	IFLA_MACVLAN_MODE,
1: -	IFLA_MACVLAN_FLAGS,
1: -	IFLA_MACVLAN_MACADDR_MODE,
1: -	IFLA_MACVLAN_MACADDR,
1: -	IFLA_MACVLAN_MACADDR_DATA,
1: -	IFLA_MACVLAN_MACADDR_COUNT,
1: -	IFLA_MACVLAN_BC_QUEUE_LEN,
1: -	IFLA_MACVLAN_BC_QUEUE_LEN_USED,
1: -	__IFLA_MACVLAN_MAX,
1: +  IFLA_MACVLAN_UNSPEC,
1: +  IFLA_MACVLAN_MODE,
1: +  IFLA_MACVLAN_FLAGS,
1: +  IFLA_MACVLAN_MACADDR_MODE,
1: +  IFLA_MACVLAN_MACADDR,
1: +  IFLA_MACVLAN_MACADDR_DATA,
1: +  IFLA_MACVLAN_MACADDR_COUNT,
1: +  IFLA_MACVLAN_BC_QUEUE_LEN,
1: +  IFLA_MACVLAN_BC_QUEUE_LEN_USED,
1: +  __IFLA_MACVLAN_MAX,
1:  };
1:  
1:  #define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
1:  
1:  enum macvlan_mode {
1: -	MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */
1: -	MACVLAN_MODE_VEPA    = 2, /* talk to other ports through ext bridge */
1: -	MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
1: -	MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */
1: -	MACVLAN_MODE_SOURCE  = 16,/* use source MAC address list to assign */
1: +  MACVLAN_MODE_PRIVATE = 1,  /* don't talk to other macvlans */
1: +  MACVLAN_MODE_VEPA = 2,     /* talk to other ports through ext bridge */
1: +  MACVLAN_MODE_BRIDGE = 4,   /* talk to bridge ports directly */
1: +  MACVLAN_MODE_PASSTHRU = 8, /* take over the underlying device */
1: +  MACVLAN_MODE_SOURCE = 16,  /* use source MAC address list to assign */
1:  };
1:  
1:  enum macvlan_macaddr_mode {
1: -	MACVLAN_MACADDR_ADD,
1: -	MACVLAN_MACADDR_DEL,
1: -	MACVLAN_MACADDR_FLUSH,
1: -	MACVLAN_MACADDR_SET,
1: +  MACVLAN_MACADDR_ADD,
1: +  MACVLAN_MACADDR_DEL,
1: +  MACVLAN_MACADDR_FLUSH,
1: +  MACVLAN_MACADDR_SET,
1:  };
1:  
1: -#define MACVLAN_FLAG_NOPROMISC	1
1: +#define MACVLAN_FLAG_NOPROMISC 1
1:  
1:  /* VRF section */
1: -enum {
1: -	IFLA_VRF_UNSPEC,
1: -	IFLA_VRF_TABLE,
1: -	__IFLA_VRF_MAX
1: -};
1: +enum { IFLA_VRF_UNSPEC, IFLA_VRF_TABLE, __IFLA_VRF_MAX };
1:  
1:  #define IFLA_VRF_MAX (__IFLA_VRF_MAX - 1)
1:  
1: -enum {
1: -	IFLA_VRF_PORT_UNSPEC,
1: -	IFLA_VRF_PORT_TABLE,
1: -	__IFLA_VRF_PORT_MAX
1: -};
1: +enum { IFLA_VRF_PORT_UNSPEC, IFLA_VRF_PORT_TABLE, __IFLA_VRF_PORT_MAX };
1:  
1:  #define IFLA_VRF_PORT_MAX (__IFLA_VRF_PORT_MAX - 1)
1:  
1:  /* MACSEC section */
1:  enum {
1: -	IFLA_MACSEC_UNSPEC,
1: -	IFLA_MACSEC_SCI,
1: -	IFLA_MACSEC_PORT,
1: -	IFLA_MACSEC_ICV_LEN,
1: -	IFLA_MACSEC_CIPHER_SUITE,
1: -	IFLA_MACSEC_WINDOW,
1: -	IFLA_MACSEC_ENCODING_SA,
1: -	IFLA_MACSEC_ENCRYPT,
1: -	IFLA_MACSEC_PROTECT,
1: -	IFLA_MACSEC_INC_SCI,
1: -	IFLA_MACSEC_ES,
1: -	IFLA_MACSEC_SCB,
1: -	IFLA_MACSEC_REPLAY_PROTECT,
1: -	IFLA_MACSEC_VALIDATION,
1: -	IFLA_MACSEC_PAD,
1: -	IFLA_MACSEC_OFFLOAD,
1: -	__IFLA_MACSEC_MAX,
1: +  IFLA_MACSEC_UNSPEC,
1: +  IFLA_MACSEC_SCI,
1: +  IFLA_MACSEC_PORT,
1: +  IFLA_MACSEC_ICV_LEN,
1: +  IFLA_MACSEC_CIPHER_SUITE,
1: +  IFLA_MACSEC_WINDOW,
1: +  IFLA_MACSEC_ENCODING_SA,
1: +  IFLA_MACSEC_ENCRYPT,
1: +  IFLA_MACSEC_PROTECT,
1: +  IFLA_MACSEC_INC_SCI,
1: +  IFLA_MACSEC_ES,
1: +  IFLA_MACSEC_SCB,
1: +  IFLA_MACSEC_REPLAY_PROTECT,
1: +  IFLA_MACSEC_VALIDATION,
1: +  IFLA_MACSEC_PAD,
1: +  IFLA_MACSEC_OFFLOAD,
1: +  __IFLA_MACSEC_MAX,
1:  };
1:  
1:  #define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1)
1:  
1:  /* XFRM section */
1: -enum {
1: -	IFLA_XFRM_UNSPEC,
1: -	IFLA_XFRM_LINK,
1: -	IFLA_XFRM_IF_ID,
1: -	__IFLA_XFRM_MAX
1: -};
1: +enum { IFLA_XFRM_UNSPEC, IFLA_XFRM_LINK, IFLA_XFRM_IF_ID, __IFLA_XFRM_MAX };
1:  
1:  #define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1)
1:  
1:  enum macsec_validation_type {
1: -	MACSEC_VALIDATE_DISABLED = 0,
1: -	MACSEC_VALIDATE_CHECK = 1,
1: -	MACSEC_VALIDATE_STRICT = 2,
1: -	__MACSEC_VALIDATE_END,
1: -	MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,
1: +  MACSEC_VALIDATE_DISABLED = 0,
1: +  MACSEC_VALIDATE_CHECK = 1,
1: +  MACSEC_VALIDATE_STRICT = 2,
1: +  __MACSEC_VALIDATE_END,
1: +  MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,
1:  };
1:  
1:  enum macsec_offload {
1: -	MACSEC_OFFLOAD_OFF = 0,
1: -	MACSEC_OFFLOAD_PHY = 1,
1: -	MACSEC_OFFLOAD_MAC = 2,
1: -	__MACSEC_OFFLOAD_END,
1: -	MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
1: +  MACSEC_OFFLOAD_OFF = 0,
1: +  MACSEC_OFFLOAD_PHY = 1,
1: +  MACSEC_OFFLOAD_MAC = 2,
1: +  __MACSEC_OFFLOAD_END,
1: +  MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
1:  };
1:  
1:  /* IPVLAN section */
1:  enum {
1: -	IFLA_IPVLAN_UNSPEC,
1: -	IFLA_IPVLAN_MODE,
1: -	IFLA_IPVLAN_FLAGS,
1: -	__IFLA_IPVLAN_MAX
1: +  IFLA_IPVLAN_UNSPEC,
1: +  IFLA_IPVLAN_MODE,
1: +  IFLA_IPVLAN_FLAGS,
1: +  __IFLA_IPVLAN_MAX
1:  };
1:  
1:  #define IFLA_IPVLAN_MAX (__IFLA_IPVLAN_MAX - 1)
1:  
1:  enum ipvlan_mode {
1: -	IPVLAN_MODE_L2 = 0,
1: -	IPVLAN_MODE_L3,
1: -	IPVLAN_MODE_L3S,
1: -	IPVLAN_MODE_MAX
1: +  IPVLAN_MODE_L2 = 0,
1: +  IPVLAN_MODE_L3,
1: +  IPVLAN_MODE_L3S,
1: +  IPVLAN_MODE_MAX
1:  };
1:  
1: -#define IPVLAN_F_PRIVATE	0x01
1: -#define IPVLAN_F_VEPA		0x02
1: +#define IPVLAN_F_PRIVATE 0x01
1: +#define IPVLAN_F_VEPA 0x02
1:  
1:  /* VXLAN section */
1:  enum {
1: -	IFLA_VXLAN_UNSPEC,
1: -	IFLA_VXLAN_ID,
1: -	IFLA_VXLAN_GROUP,	/* group or remote address */
1: -	IFLA_VXLAN_LINK,
1: -	IFLA_VXLAN_LOCAL,
1: -	IFLA_VXLAN_TTL,
1: -	IFLA_VXLAN_TOS,
1: -	IFLA_VXLAN_LEARNING,
1: -	IFLA_VXLAN_AGEING,
1: -	IFLA_VXLAN_LIMIT,
1: -	IFLA_VXLAN_PORT_RANGE,	/* source port */
1: -	IFLA_VXLAN_PROXY,
1: -	IFLA_VXLAN_RSC,
1: -	IFLA_VXLAN_L2MISS,
1: -	IFLA_VXLAN_L3MISS,
1: -	IFLA_VXLAN_PORT,	/* destination port */
1: -	IFLA_VXLAN_GROUP6,
1: -	IFLA_VXLAN_LOCAL6,
1: -	IFLA_VXLAN_UDP_CSUM,
1: -	IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
1: -	IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
1: -	IFLA_VXLAN_REMCSUM_TX,
1: -	IFLA_VXLAN_REMCSUM_RX,
1: -	IFLA_VXLAN_GBP,
1: -	IFLA_VXLAN_REMCSUM_NOPARTIAL,
1: -	IFLA_VXLAN_COLLECT_METADATA,
1: -	IFLA_VXLAN_LABEL,
1: -	IFLA_VXLAN_GPE,
1: -	IFLA_VXLAN_TTL_INHERIT,
1: -	IFLA_VXLAN_DF,
1: -	__IFLA_VXLAN_MAX
1: -};
1: -#define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
1: +  IFLA_VXLAN_UNSPEC,
1: +  IFLA_VXLAN_ID,
1: +  IFLA_VXLAN_GROUP, /* group or remote address */
1: +  IFLA_VXLAN_LINK,
1: +  IFLA_VXLAN_LOCAL,
1: +  IFLA_VXLAN_TTL,
1: +  IFLA_VXLAN_TOS,
1: +  IFLA_VXLAN_LEARNING,
1: +  IFLA_VXLAN_AGEING,
1: +  IFLA_VXLAN_LIMIT,
1: +  IFLA_VXLAN_PORT_RANGE, /* source port */
1: +  IFLA_VXLAN_PROXY,
1: +  IFLA_VXLAN_RSC,
1: +  IFLA_VXLAN_L2MISS,
1: +  IFLA_VXLAN_L3MISS,
1: +  IFLA_VXLAN_PORT, /* destination port */
1: +  IFLA_VXLAN_GROUP6,
1: +  IFLA_VXLAN_LOCAL6,
1: +  IFLA_VXLAN_UDP_CSUM,
1: +  IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
1: +  IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
1: +  IFLA_VXLAN_REMCSUM_TX,
1: +  IFLA_VXLAN_REMCSUM_RX,
1: +  IFLA_VXLAN_GBP,
1: +  IFLA_VXLAN_REMCSUM_NOPARTIAL,
1: +  IFLA_VXLAN_COLLECT_METADATA,
1: +  IFLA_VXLAN_LABEL,
1: +  IFLA_VXLAN_GPE,
1: +  IFLA_VXLAN_TTL_INHERIT,
1: +  IFLA_VXLAN_DF,
1: +  __IFLA_VXLAN_MAX
1: +};
1: +#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
1:  
1:  struct ifla_vxlan_port_range {
1: -	__be16	low;
1: -	__be16	high;
1: +  __be16 low;
1: +  __be16 high;
1:  };
1:  
1:  enum ifla_vxlan_df {
1: -	VXLAN_DF_UNSET = 0,
1: -	VXLAN_DF_SET,
1: -	VXLAN_DF_INHERIT,
1: -	__VXLAN_DF_END,
1: -	VXLAN_DF_MAX = __VXLAN_DF_END - 1,
1: +  VXLAN_DF_UNSET = 0,
1: +  VXLAN_DF_SET,
1: +  VXLAN_DF_INHERIT,
1: +  __VXLAN_DF_END,
1: +  VXLAN_DF_MAX = __VXLAN_DF_END - 1,
1:  };
1:  
1:  /* GENEVE section */
1:  enum {
1: -	IFLA_GENEVE_UNSPEC,
1: -	IFLA_GENEVE_ID,
1: -	IFLA_GENEVE_REMOTE,
1: -	IFLA_GENEVE_TTL,
1: -	IFLA_GENEVE_TOS,
1: -	IFLA_GENEVE_PORT,	/* destination port */
1: -	IFLA_GENEVE_COLLECT_METADATA,
1: -	IFLA_GENEVE_REMOTE6,
1: -	IFLA_GENEVE_UDP_CSUM,
1: -	IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
1: -	IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
1: -	IFLA_GENEVE_LABEL,
1: -	IFLA_GENEVE_TTL_INHERIT,
1: -	IFLA_GENEVE_DF,
1: -	__IFLA_GENEVE_MAX
1: -};
1: -#define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)
1: +  IFLA_GENEVE_UNSPEC,
1: +  IFLA_GENEVE_ID,
1: +  IFLA_GENEVE_REMOTE,
1: +  IFLA_GENEVE_TTL,
1: +  IFLA_GENEVE_TOS,
1: +  IFLA_GENEVE_PORT, /* destination port */
1: +  IFLA_GENEVE_COLLECT_METADATA,
1: +  IFLA_GENEVE_REMOTE6,
1: +  IFLA_GENEVE_UDP_CSUM,
1: +  IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
1: +  IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
1: +  IFLA_GENEVE_LABEL,
1: +  IFLA_GENEVE_TTL_INHERIT,
1: +  IFLA_GENEVE_DF,
1: +  __IFLA_GENEVE_MAX
1: +};
1: +#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
1:  
1:  enum ifla_geneve_df {
1: -	GENEVE_DF_UNSET = 0,
1: -	GENEVE_DF_SET,
1: -	GENEVE_DF_INHERIT,
1: -	__GENEVE_DF_END,
1: -	GENEVE_DF_MAX = __GENEVE_DF_END - 1,
1: +  GENEVE_DF_UNSET = 0,
1: +  GENEVE_DF_SET,
1: +  GENEVE_DF_INHERIT,
1: +  __GENEVE_DF_END,
1: +  GENEVE_DF_MAX = __GENEVE_DF_END - 1,
1:  };
1:  
1:  /* PPP section */
1: -enum {
1: -	IFLA_PPP_UNSPEC,
1: -	IFLA_PPP_DEV_FD,
1: -	__IFLA_PPP_MAX
1: -};
1: +enum { IFLA_PPP_UNSPEC, IFLA_PPP_DEV_FD, __IFLA_PPP_MAX };
1:  #define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)
1:  
1:  /* GTP section */
1:  
1:  enum ifla_gtp_role {
1: -	GTP_ROLE_GGSN = 0,
1: -	GTP_ROLE_SGSN,
1: +  GTP_ROLE_GGSN = 0,
1: +  GTP_ROLE_SGSN,
1:  };
1:  
1:  enum {
1: -	IFLA_GTP_UNSPEC,
1: -	IFLA_GTP_FD0,
1: -	IFLA_GTP_FD1,
1: -	IFLA_GTP_PDP_HASHSIZE,
1: -	IFLA_GTP_ROLE,
1: -	__IFLA_GTP_MAX,
1: +  IFLA_GTP_UNSPEC,
1: +  IFLA_GTP_FD0,
1: +  IFLA_GTP_FD1,
1: +  IFLA_GTP_PDP_HASHSIZE,
1: +  IFLA_GTP_ROLE,
1: +  __IFLA_GTP_MAX,
1:  };
1:  #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
1:  
1:  /* Bonding section */
1:  
1:  enum {
1: -	IFLA_BOND_UNSPEC,
1: -	IFLA_BOND_MODE,
1: -	IFLA_BOND_ACTIVE_SLAVE,
1: -	IFLA_BOND_MIIMON,
1: -	IFLA_BOND_UPDELAY,
1: -	IFLA_BOND_DOWNDELAY,
1: -	IFLA_BOND_USE_CARRIER,
1: -	IFLA_BOND_ARP_INTERVAL,
1: -	IFLA_BOND_ARP_IP_TARGET,
1: -	IFLA_BOND_ARP_VALIDATE,
1: -	IFLA_BOND_ARP_ALL_TARGETS,
1: -	IFLA_BOND_PRIMARY,
1: -	IFLA_BOND_PRIMARY_RESELECT,
1: -	IFLA_BOND_FAIL_OVER_MAC,
1: -	IFLA_BOND_XMIT_HASH_POLICY,
1: -	IFLA_BOND_RESEND_IGMP,
1: -	IFLA_BOND_NUM_PEER_NOTIF,
1: -	IFLA_BOND_ALL_SLAVES_ACTIVE,
1: -	IFLA_BOND_MIN_LINKS,
1: -	IFLA_BOND_LP_INTERVAL,
1: -	IFLA_BOND_PACKETS_PER_SLAVE,
1: -	IFLA_BOND_AD_LACP_RATE,
1: -	IFLA_BOND_AD_SELECT,
1: -	IFLA_BOND_AD_INFO,
1: -	IFLA_BOND_AD_ACTOR_SYS_PRIO,
1: -	IFLA_BOND_AD_USER_PORT_KEY,
1: -	IFLA_BOND_AD_ACTOR_SYSTEM,
1: -	IFLA_BOND_TLB_DYNAMIC_LB,
1: -	IFLA_BOND_PEER_NOTIF_DELAY,
1: -	__IFLA_BOND_MAX,
1: -};
1: -
1: -#define IFLA_BOND_MAX	(__IFLA_BOND_MAX - 1)
1: +  IFLA_BOND_UNSPEC,
1: +  IFLA_BOND_MODE,
1: +  IFLA_BOND_ACTIVE_SLAVE,
1: +  IFLA_BOND_MIIMON,
1: +  IFLA_BOND_UPDELAY,
1: +  IFLA_BOND_DOWNDELAY,
1: +  IFLA_BOND_USE_CARRIER,
1: +  IFLA_BOND_ARP_INTERVAL,
1: +  IFLA_BOND_ARP_IP_TARGET,
1: +  IFLA_BOND_ARP_VALIDATE,
1: +  IFLA_BOND_ARP_ALL_TARGETS,
1: +  IFLA_BOND_PRIMARY,
1: +  IFLA_BOND_PRIMARY_RESELECT,
1: +  IFLA_BOND_FAIL_OVER_MAC,
1: +  IFLA_BOND_XMIT_HASH_POLICY,
1: +  IFLA_BOND_RESEND_IGMP,
1: +  IFLA_BOND_NUM_PEER_NOTIF,
1: +  IFLA_BOND_ALL_SLAVES_ACTIVE,
1: +  IFLA_BOND_MIN_LINKS,
1: +  IFLA_BOND_LP_INTERVAL,
1: +  IFLA_BOND_PACKETS_PER_SLAVE,
1: +  IFLA_BOND_AD_LACP_RATE,
1: +  IFLA_BOND_AD_SELECT,
1: +  IFLA_BOND_AD_INFO,
1: +  IFLA_BOND_AD_ACTOR_SYS_PRIO,
1: +  IFLA_BOND_AD_USER_PORT_KEY,
1: +  IFLA_BOND_AD_ACTOR_SYSTEM,
1: +  IFLA_BOND_TLB_DYNAMIC_LB,
1: +  IFLA_BOND_PEER_NOTIF_DELAY,
1: +  __IFLA_BOND_MAX,
1: +};
1: +
1: +#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
1:  
1:  enum {
1: -	IFLA_BOND_AD_INFO_UNSPEC,
1: -	IFLA_BOND_AD_INFO_AGGREGATOR,
1: -	IFLA_BOND_AD_INFO_NUM_PORTS,
1: -	IFLA_BOND_AD_INFO_ACTOR_KEY,
1: -	IFLA_BOND_AD_INFO_PARTNER_KEY,
1: -	IFLA_BOND_AD_INFO_PARTNER_MAC,
1: -	__IFLA_BOND_AD_INFO_MAX,
1: +  IFLA_BOND_AD_INFO_UNSPEC,
1: +  IFLA_BOND_AD_INFO_AGGREGATOR,
1: +  IFLA_BOND_AD_INFO_NUM_PORTS,
1: +  IFLA_BOND_AD_INFO_ACTOR_KEY,
1: +  IFLA_BOND_AD_INFO_PARTNER_KEY,
1: +  IFLA_BOND_AD_INFO_PARTNER_MAC,
1: +  __IFLA_BOND_AD_INFO_MAX,
1:  };
1:  
1: -#define IFLA_BOND_AD_INFO_MAX	(__IFLA_BOND_AD_INFO_MAX - 1)
1: +#define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1)
1:  
1:  enum {
1: -	IFLA_BOND_SLAVE_UNSPEC,
1: -	IFLA_BOND_SLAVE_STATE,
1: -	IFLA_BOND_SLAVE_MII_STATUS,
1: -	IFLA_BOND_SLAVE_LINK_FAILURE_COUNT,
1: -	IFLA_BOND_SLAVE_PERM_HWADDR,
1: -	IFLA_BOND_SLAVE_QUEUE_ID,
1: -	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,
1: -	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,
1: -	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,
1: -	__IFLA_BOND_SLAVE_MAX,
1: +  IFLA_BOND_SLAVE_UNSPEC,
1: +  IFLA_BOND_SLAVE_STATE,
1: +  IFLA_BOND_SLAVE_MII_STATUS,
1: +  IFLA_BOND_SLAVE_LINK_FAILURE_COUNT,
1: +  IFLA_BOND_SLAVE_PERM_HWADDR,
1: +  IFLA_BOND_SLAVE_QUEUE_ID,
1: +  IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,
1: +  IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,
1: +  IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,
1: +  __IFLA_BOND_SLAVE_MAX,
1:  };
1:  
1: -#define IFLA_BOND_SLAVE_MAX	(__IFLA_BOND_SLAVE_MAX - 1)
1: +#define IFLA_BOND_SLAVE_MAX (__IFLA_BOND_SLAVE_MAX - 1)
1:  
1:  /* SR-IOV virtual function management section */
1:  
1:  enum {
1: -	IFLA_VF_INFO_UNSPEC,
1: -	IFLA_VF_INFO,
1: -	__IFLA_VF_INFO_MAX,
1: +  IFLA_VF_INFO_UNSPEC,
1: +  IFLA_VF_INFO,
1: +  __IFLA_VF_INFO_MAX,
1:  };
1:  
1:  #define IFLA_VF_INFO_MAX (__IFLA_VF_INFO_MAX - 1)
1:  
1:  enum {
1: -	IFLA_VF_UNSPEC,
1: -	IFLA_VF_MAC,		/* Hardware queue specific attributes */
1: -	IFLA_VF_VLAN,		/* VLAN ID and QoS */
1: -	IFLA_VF_TX_RATE,	/* Max TX Bandwidth Allocation */
1: -	IFLA_VF_SPOOFCHK,	/* Spoof Checking on/off switch */
1: -	IFLA_VF_LINK_STATE,	/* link state enable/disable/auto switch */
1: -	IFLA_VF_RATE,		/* Min and Max TX Bandwidth Allocation */
1: -	IFLA_VF_RSS_QUERY_EN,	/* RSS Redirection Table and Hash Key query
1: -				 * on/off switch
1: -				 */
1: -	IFLA_VF_STATS,		/* network device statistics */
1: -	IFLA_VF_TRUST,		/* Trust VF */
1: -	IFLA_VF_IB_NODE_GUID,	/* VF Infiniband node GUID */
1: -	IFLA_VF_IB_PORT_GUID,	/* VF Infiniband port GUID */
1: -	IFLA_VF_VLAN_LIST,	/* nested list of vlans, option for QinQ */
1: -	IFLA_VF_BROADCAST,	/* VF broadcast */
1: -	__IFLA_VF_MAX,
1: +  IFLA_VF_UNSPEC,
1: +  IFLA_VF_MAC,          /* Hardware queue specific attributes */
1: +  IFLA_VF_VLAN,         /* VLAN ID and QoS */
1: +  IFLA_VF_TX_RATE,      /* Max TX Bandwidth Allocation */
1: +  IFLA_VF_SPOOFCHK,     /* Spoof Checking on/off switch */
1: +  IFLA_VF_LINK_STATE,   /* link state enable/disable/auto switch */
1: +  IFLA_VF_RATE,         /* Min and Max TX Bandwidth Allocation */
1: +  IFLA_VF_RSS_QUERY_EN, /* RSS Redirection Table and Hash Key query
1: +                         * on/off switch
1: +                         */
1: +  IFLA_VF_STATS,        /* network device statistics */
1: +  IFLA_VF_TRUST,        /* Trust VF */
1: +  IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */
1: +  IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
1: +  IFLA_VF_VLAN_LIST,    /* nested list of vlans, option for QinQ */
1: +  IFLA_VF_BROADCAST,    /* VF broadcast */
1: +  __IFLA_VF_MAX,
1:  };
1:  
1:  #define IFLA_VF_MAX (__IFLA_VF_MAX - 1)
1:  
1:  struct ifla_vf_mac {
1: -	__u32 vf;
1: -	__u8 mac[32]; /* MAX_ADDR_LEN */
1: +  __u32 vf;
1: +  __u8 mac[32]; /* MAX_ADDR_LEN */
1:  };
1:  
1:  struct ifla_vf_broadcast {
1: -	__u8 broadcast[32];
1: +  __u8 broadcast[32];
1:  };
1:  
1:  struct ifla_vf_vlan {
1: -	__u32 vf;
1: -	__u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
1: -	__u32 qos;
1: +  __u32 vf;
1: +  __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
1: +  __u32 qos;
1:  };
1:  
1:  enum {
1: -	IFLA_VF_VLAN_INFO_UNSPEC,
1: -	IFLA_VF_VLAN_INFO,	/* VLAN ID, QoS and VLAN protocol */
1: -	__IFLA_VF_VLAN_INFO_MAX,
1: +  IFLA_VF_VLAN_INFO_UNSPEC,
1: +  IFLA_VF_VLAN_INFO, /* VLAN ID, QoS and VLAN protocol */
1: +  __IFLA_VF_VLAN_INFO_MAX,
1:  };
1:  
1:  #define IFLA_VF_VLAN_INFO_MAX (__IFLA_VF_VLAN_INFO_MAX - 1)
1:  #define MAX_VLAN_LIST_LEN 1
1:  
1:  struct ifla_vf_vlan_info {
1: -	__u32 vf;
1: -	__u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
1: -	__u32 qos;
1: -	__be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
1: +  __u32 vf;
1: +  __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
1: +  __u32 qos;
1: +  __be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
1:  };
1:  
1:  struct ifla_vf_tx_rate {
1: -	__u32 vf;
1: -	__u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
1: +  __u32 vf;
1: +  __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
1:  };
1:  
1:  struct ifla_vf_rate {
1: -	__u32 vf;
1: -	__u32 min_tx_rate; /* Min Bandwidth in Mbps */
1: -	__u32 max_tx_rate; /* Max Bandwidth in Mbps */
1: +  __u32 vf;
1: +  __u32 min_tx_rate; /* Min Bandwidth in Mbps */
1: +  __u32 max_tx_rate; /* Max Bandwidth in Mbps */
1:  };
1:  
1:  struct ifla_vf_spoofchk {
1: -	__u32 vf;
1: -	__u32 setting;
1: +  __u32 vf;
1: +  __u32 setting;
1:  };
1:  
1:  struct ifla_vf_guid {
1: -	__u32 vf;
1: -	__u64 guid;
1: +  __u32 vf;
1: +  __u64 guid;
1:  };
1:  
1:  enum {
1: -	IFLA_VF_LINK_STATE_AUTO,	/* link state of the uplink */
1: -	IFLA_VF_LINK_STATE_ENABLE,	/* link always up */
1: -	IFLA_VF_LINK_STATE_DISABLE,	/* link always down */
1: -	__IFLA_VF_LINK_STATE_MAX,
1: +  IFLA_VF_LINK_STATE_AUTO,    /* link state of the uplink */
1: +  IFLA_VF_LINK_STATE_ENABLE,  /* link always up */
1: +  IFLA_VF_LINK_STATE_DISABLE, /* link always down */
1: +  __IFLA_VF_LINK_STATE_MAX,
1:  };
1:  
1:  struct ifla_vf_link_state {
1: -	__u32 vf;
1: -	__u32 link_state;
1: +  __u32 vf;
1: +  __u32 link_state;
1:  };
1:  
1:  struct ifla_vf_rss_query_en {
1: -	__u32 vf;
1: -	__u32 setting;
1: +  __u32 vf;
1: +  __u32 setting;
1:  };
1:  
1:  enum {
1: -	IFLA_VF_STATS_RX_PACKETS,
1: -	IFLA_VF_STATS_TX_PACKETS,
1: -	IFLA_VF_STATS_RX_BYTES,
1: -	IFLA_VF_STATS_TX_BYTES,
1: -	IFLA_VF_STATS_BROADCAST,
1: -	IFLA_VF_STATS_MULTICAST,
1: -	IFLA_VF_STATS_PAD,
1: -	IFLA_VF_STATS_RX_DROPPED,
1: -	IFLA_VF_STATS_TX_DROPPED,
1: -	__IFLA_VF_STATS_MAX,
1: +  IFLA_VF_STATS_RX_PACKETS,
1: +  IFLA_VF_STATS_TX_PACKETS,
1: +  IFLA_VF_STATS_RX_BYTES,
1: +  IFLA_VF_STATS_TX_BYTES,
1: +  IFLA_VF_STATS_BROADCAST,
1: +  IFLA_VF_STATS_MULTICAST,
1: +  IFLA_VF_STATS_PAD,
1: +  IFLA_VF_STATS_RX_DROPPED,
1: +  IFLA_VF_STATS_TX_DROPPED,
1: +  __IFLA_VF_STATS_MAX,
1:  };
1:  
1:  #define IFLA_VF_STATS_MAX (__IFLA_VF_STATS_MAX - 1)
1:  
1:  struct ifla_vf_trust {
1: -	__u32 vf;
1: -	__u32 setting;
1: +  __u32 vf;
1: +  __u32 setting;
1:  };
1:  
1:  /* VF ports management section
1: @@ -822,92 +801,90 @@ struct ifla_vf_trust {
1:   */
1:  
1:  enum {
1: -	IFLA_VF_PORT_UNSPEC,
1: -	IFLA_VF_PORT,			/* nest */
1: -	__IFLA_VF_PORT_MAX,
1: +  IFLA_VF_PORT_UNSPEC,
1: +  IFLA_VF_PORT, /* nest */
1: +  __IFLA_VF_PORT_MAX,
1:  };
1:  
1:  #define IFLA_VF_PORT_MAX (__IFLA_VF_PORT_MAX - 1)
1:  
1:  enum {
1: -	IFLA_PORT_UNSPEC,
1: -	IFLA_PORT_VF,			/* __u32 */
1: -	IFLA_PORT_PROFILE,		/* string */
1: -	IFLA_PORT_VSI_TYPE,		/* 802.1Qbg (pre-)standard VDP */
1: -	IFLA_PORT_INSTANCE_UUID,	/* binary UUID */
1: -	IFLA_PORT_HOST_UUID,		/* binary UUID */
1: -	IFLA_PORT_REQUEST,		/* __u8 */
1: -	IFLA_PORT_RESPONSE,		/* __u16, output only */
1: -	__IFLA_PORT_MAX,
1: +  IFLA_PORT_UNSPEC,
1: +  IFLA_PORT_VF,            /* __u32 */
1: +  IFLA_PORT_PROFILE,       /* string */
1: +  IFLA_PORT_VSI_TYPE,      /* 802.1Qbg (pre-)standard VDP */
1: +  IFLA_PORT_INSTANCE_UUID, /* binary UUID */
1: +  IFLA_PORT_HOST_UUID,     /* binary UUID */
1: +  IFLA_PORT_REQUEST,       /* __u8 */
1: +  IFLA_PORT_RESPONSE,      /* __u16, output only */
1: +  __IFLA_PORT_MAX,
1:  };
1:  
1:  #define IFLA_PORT_MAX (__IFLA_PORT_MAX - 1)
1:  
1: -#define PORT_PROFILE_MAX	40
1: -#define PORT_UUID_MAX		16
1: -#define PORT_SELF_VF		-1
1: +#define PORT_PROFILE_MAX 40
1: +#define PORT_UUID_MAX 16
1: +#define PORT_SELF_VF -1
1:  
1:  enum {
1: -	PORT_REQUEST_PREASSOCIATE = 0,
1: -	PORT_REQUEST_PREASSOCIATE_RR,
1: -	PORT_REQUEST_ASSOCIATE,
1: -	PORT_REQUEST_DISASSOCIATE,
1: +  PORT_REQUEST_PREASSOCIATE = 0,
1: +  PORT_REQUEST_PREASSOCIATE_RR,
1: +  PORT_REQUEST_ASSOCIATE,
1: +  PORT_REQUEST_DISASSOCIATE,
1:  };
1:  
1:  enum {
1: -	PORT_VDP_RESPONSE_SUCCESS = 0,
1: -	PORT_VDP_RESPONSE_INVALID_FORMAT,
1: -	PORT_VDP_RESPONSE_INSUFFICIENT_RESOURCES,
1: -	PORT_VDP_RESPONSE_UNUSED_VTID,
1: -	PORT_VDP_RESPONSE_VTID_VIOLATION,
1: -	PORT_VDP_RESPONSE_VTID_VERSION_VIOALTION,
1: -	PORT_VDP_RESPONSE_OUT_OF_SYNC,
1: -	/* 0x08-0xFF reserved for future VDP use */
1: -	PORT_PROFILE_RESPONSE_SUCCESS = 0x100,
1: -	PORT_PROFILE_RESPONSE_INPROGRESS,
1: -	PORT_PROFILE_RESPONSE_INVALID,
1: -	PORT_PROFILE_RESPONSE_BADSTATE,
1: -	PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES,
1: -	PORT_PROFILE_RESPONSE_ERROR,
1: +  PORT_VDP_RESPONSE_SUCCESS = 0,
1: +  PORT_VDP_RESPONSE_INVALID_FORMAT,
1: +  PORT_VDP_RESPONSE_INSUFFICIENT_RESOURCES,
1: +  PORT_VDP_RESPONSE_UNUSED_VTID,
1: +  PORT_VDP_RESPONSE_VTID_VIOLATION,
1: +  PORT_VDP_RESPONSE_VTID_VERSION_VIOALTION,
1: +  PORT_VDP_RESPONSE_OUT_OF_SYNC,
1: +  /* 0x08-0xFF reserved for future VDP use */
1: +  PORT_PROFILE_RESPONSE_SUCCESS = 0x100,
1: +  PORT_PROFILE_RESPONSE_INPROGRESS,
1: +  PORT_PROFILE_RESPONSE_INVALID,
1: +  PORT_PROFILE_RESPONSE_BADSTATE,
1: +  PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES,
1: +  PORT_PROFILE_RESPONSE_ERROR,
1:  };
1:  
1:  struct ifla_port_vsi {
1: -	__u8 vsi_mgr_id;
1: -	__u8 vsi_type_id[3];
1: -	__u8 vsi_type_version;
1: -	__u8 pad[3];
1: +  __u8 vsi_mgr_id;
1: +  __u8 vsi_type_id[3];
1: +  __u8 vsi_type_version;
1: +  __u8 pad[3];
1:  };
1:  
1: -
1:  /* IPoIB section */
1:  
1:  enum {
1: -	IFLA_IPOIB_UNSPEC,
1: -	IFLA_IPOIB_PKEY,
1: -	IFLA_IPOIB_MODE,
1: -	IFLA_IPOIB_UMCAST,
1: -	__IFLA_IPOIB_MAX
1: +  IFLA_IPOIB_UNSPEC,
1: +  IFLA_IPOIB_PKEY,
1: +  IFLA_IPOIB_MODE,
1: +  IFLA_IPOIB_UMCAST,
1: +  __IFLA_IPOIB_MAX
1:  };
1:  
1:  enum {
1: -	IPOIB_MODE_DATAGRAM  = 0, /* using unreliable datagram QPs */
1: -	IPOIB_MODE_CONNECTED = 1, /* using connected QPs */
1: +  IPOIB_MODE_DATAGRAM = 0,  /* using unreliable datagram QPs */
1: +  IPOIB_MODE_CONNECTED = 1, /* using connected QPs */
1:  };
1:  
1:  #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
1:  
1: -
1:  /* HSR section */
1:  
1:  enum {
1: -	IFLA_HSR_UNSPEC,
1: -	IFLA_HSR_SLAVE1,
1: -	IFLA_HSR_SLAVE2,
1: -	IFLA_HSR_MULTICAST_SPEC,	/* Last byte of supervision addr */
1: -	IFLA_HSR_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
1: -	IFLA_HSR_SEQ_NR,
1: -	IFLA_HSR_VERSION,		/* HSR version */
1: -	__IFLA_HSR_MAX,
1: +  IFLA_HSR_UNSPEC,
1: +  IFLA_HSR_SLAVE1,
1: +  IFLA_HSR_SLAVE2,
1: +  IFLA_HSR_MULTICAST_SPEC,   /* Last byte of supervision addr */
1: +  IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */
1: +  IFLA_HSR_SEQ_NR,
1: +  IFLA_HSR_VERSION, /* HSR version */
1: +  __IFLA_HSR_MAX,
1:  };
1:  
1:  #define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
1: @@ -915,29 +892,29 @@ enum {
1:  /* STATS section */
1:  
1:  struct if_stats_msg {
1: -	__u8  family;
1: -	__u8  pad1;
1: -	__u16 pad2;
1: -	__u32 ifindex;
1: -	__u32 filter_mask;
1: +  __u8 family;
1: +  __u8 pad1;
1: +  __u16 pad2;
1: +  __u32 ifindex;
1: +  __u32 filter_mask;
1:  };
1:  
1:  /* A stats attribute can be netdev specific or a global stat.
1:   * For netdev stats, lets use the prefix IFLA_STATS_LINK_*
1:   */
1:  enum {
1: -	IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
1: -	IFLA_STATS_LINK_64,
1: -	IFLA_STATS_LINK_XSTATS,
1: -	IFLA_STATS_LINK_XSTATS_SLAVE,
1: -	IFLA_STATS_LINK_OFFLOAD_XSTATS,
1: -	IFLA_STATS_AF_SPEC,
1: -	__IFLA_STATS_MAX,
1: +  IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
1: +  IFLA_STATS_LINK_64,
1: +  IFLA_STATS_LINK_XSTATS,
1: +  IFLA_STATS_LINK_XSTATS_SLAVE,
1: +  IFLA_STATS_LINK_OFFLOAD_XSTATS,
1: +  IFLA_STATS_AF_SPEC,
1: +  __IFLA_STATS_MAX,
1:  };
1:  
1:  #define IFLA_STATS_MAX (__IFLA_STATS_MAX - 1)
1:  
1: -#define IFLA_STATS_FILTER_BIT(ATTR)	(1 << (ATTR - 1))
1: +#define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1))
1:  
1:  /* These are embedded into IFLA_STATS_LINK_XSTATS:
1:   * [IFLA_STATS_LINK_XSTATS]
1: @@ -945,105 +922,104 @@ enum {
1:   *    -> [rtnl link type specific attributes]
1:   */
1:  enum {
1: -	LINK_XSTATS_TYPE_UNSPEC,
1: -	LINK_XSTATS_TYPE_BRIDGE,
1: -	LINK_XSTATS_TYPE_BOND,
1: -	__LINK_XSTATS_TYPE_MAX
1: +  LINK_XSTATS_TYPE_UNSPEC,
1: +  LINK_XSTATS_TYPE_BRIDGE,
1: +  LINK_XSTATS_TYPE_BOND,
1: +  __LINK_XSTATS_TYPE_MAX
1:  };
1:  #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
1:  
1:  /* These are stats embedded into IFLA_STATS_LINK_OFFLOAD_XSTATS */
1:  enum {
1: -	IFLA_OFFLOAD_XSTATS_UNSPEC,
1: -	IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
1: -	__IFLA_OFFLOAD_XSTATS_MAX
1: +  IFLA_OFFLOAD_XSTATS_UNSPEC,
1: +  IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
1: +  __IFLA_OFFLOAD_XSTATS_MAX
1:  };
1:  #define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)
1:  
1:  /* XDP section */
1:  
1: -#define XDP_FLAGS_UPDATE_IF_NOEXIST	(1U << 0)
1: -#define XDP_FLAGS_SKB_MODE		(1U << 1)
1: -#define XDP_FLAGS_DRV_MODE		(1U << 2)
1: -#define XDP_FLAGS_HW_MODE		(1U << 3)
1: -#define XDP_FLAGS_REPLACE		(1U << 4)
1: -#define XDP_FLAGS_MODES			(XDP_FLAGS_SKB_MODE | \
1: -					 XDP_FLAGS_DRV_MODE | \
1: -					 XDP_FLAGS_HW_MODE)
1: -#define XDP_FLAGS_MASK			(XDP_FLAGS_UPDATE_IF_NOEXIST | \
1: -					 XDP_FLAGS_MODES | XDP_FLAGS_REPLACE)
1: +#define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0)
1: +#define XDP_FLAGS_SKB_MODE (1U << 1)
1: +#define XDP_FLAGS_DRV_MODE (1U << 2)
1: +#define XDP_FLAGS_HW_MODE (1U << 3)
1: +#define XDP_FLAGS_REPLACE (1U << 4)
1: +#define XDP_FLAGS_MODES \
1: +  (XDP_FLAGS_SKB_MODE | XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE)
1: +#define XDP_FLAGS_MASK \
1: +  (XDP_FLAGS_UPDATE_IF_NOEXIST | XDP_FLAGS_MODES | XDP_FLAGS_REPLACE)
1:  
1:  /* These are stored into IFLA_XDP_ATTACHED on dump. */
1:  enum {
1: -	XDP_ATTACHED_NONE = 0,
1: -	XDP_ATTACHED_DRV,
1: -	XDP_ATTACHED_SKB,
1: -	XDP_ATTACHED_HW,
1: -	XDP_ATTACHED_MULTI,
1: +  XDP_ATTACHED_NONE = 0,
1: +  XDP_ATTACHED_DRV,
1: +  XDP_ATTACHED_SKB,
1: +  XDP_ATTACHED_HW,
1: +  XDP_ATTACHED_MULTI,
1:  };
1:  
1:  enum {
1: -	IFLA_XDP_UNSPEC,
1: -	IFLA_XDP_FD,
1: -	IFLA_XDP_ATTACHED,
1: -	IFLA_XDP_FLAGS,
1: -	IFLA_XDP_PROG_ID,
1: -	IFLA_XDP_DRV_PROG_ID,
1: -	IFLA_XDP_SKB_PROG_ID,
1: -	IFLA_XDP_HW_PROG_ID,
1: -	IFLA_XDP_EXPECTED_FD,
1: -	__IFLA_XDP_MAX,
1: +  IFLA_XDP_UNSPEC,
1: +  IFLA_XDP_FD,
1: +  IFLA_XDP_ATTACHED,
1: +  IFLA_XDP_FLAGS,
1: +  IFLA_XDP_PROG_ID,
1: +  IFLA_XDP_DRV_PROG_ID,
1: +  IFLA_XDP_SKB_PROG_ID,
1: +  IFLA_XDP_HW_PROG_ID,
1: +  IFLA_XDP_EXPECTED_FD,
1: +  __IFLA_XDP_MAX,
1:  };
1:  
1:  #define IFLA_XDP_MAX (__IFLA_XDP_MAX - 1)
1:  
1:  enum {
1: -	IFLA_EVENT_NONE,
1: -	IFLA_EVENT_REBOOT,		/* internal reset / reboot */
1: -	IFLA_EVENT_FEATURES,		/* change in offload features */
1: -	IFLA_EVENT_BONDING_FAILOVER,	/* change in active slave */
1: -	IFLA_EVENT_NOTIFY_PEERS,	/* re-sent grat. arp/ndisc */
1: -	IFLA_EVENT_IGMP_RESEND,		/* re-sent IGMP JOIN */
1: -	IFLA_EVENT_BONDING_OPTIONS,	/* change in bonding options */
1: +  IFLA_EVENT_NONE,
1: +  IFLA_EVENT_REBOOT,           /* internal reset / reboot */
1: +  IFLA_EVENT_FEATURES,         /* change in offload features */
1: +  IFLA_EVENT_BONDING_FAILOVER, /* change in active slave */
1: +  IFLA_EVENT_NOTIFY_PEERS,     /* re-sent grat. arp/ndisc */
1: +  IFLA_EVENT_IGMP_RESEND,      /* re-sent IGMP JOIN */
1: +  IFLA_EVENT_BONDING_OPTIONS,  /* change in bonding options */
1:  };
1:  
1:  /* tun section */
1:  
1:  enum {
1: -	IFLA_TUN_UNSPEC,
1: -	IFLA_TUN_OWNER,
1: -	IFLA_TUN_GROUP,
1: -	IFLA_TUN_TYPE,
1: -	IFLA_TUN_PI,
1: -	IFLA_TUN_VNET_HDR,
1: -	IFLA_TUN_PERSIST,
1: -	IFLA_TUN_MULTI_QUEUE,
1: -	IFLA_TUN_NUM_QUEUES,
1: -	IFLA_TUN_NUM_DISABLED_QUEUES,
1: -	__IFLA_TUN_MAX,
1: +  IFLA_TUN_UNSPEC,
1: +  IFLA_TUN_OWNER,
1: +  IFLA_TUN_GROUP,
1: +  IFLA_TUN_TYPE,
1: +  IFLA_TUN_PI,
1: +  IFLA_TUN_VNET_HDR,
1: +  IFLA_TUN_PERSIST,
1: +  IFLA_TUN_MULTI_QUEUE,
1: +  IFLA_TUN_NUM_QUEUES,
1: +  IFLA_TUN_NUM_DISABLED_QUEUES,
1: +  __IFLA_TUN_MAX,
1:  };
1:  
1:  #define IFLA_TUN_MAX (__IFLA_TUN_MAX - 1)
1:  
1:  /* rmnet section */
1:  
1: -#define RMNET_FLAGS_INGRESS_DEAGGREGATION         (1U << 0)
1: -#define RMNET_FLAGS_INGRESS_MAP_COMMANDS          (1U << 1)
1: -#define RMNET_FLAGS_INGRESS_MAP_CKSUMV4           (1U << 2)
1: -#define RMNET_FLAGS_EGRESS_MAP_CKSUMV4            (1U << 3)
1: +#define RMNET_FLAGS_INGRESS_DEAGGREGATION (1U << 0)
1: +#define RMNET_FLAGS_INGRESS_MAP_COMMANDS (1U << 1)
1: +#define RMNET_FLAGS_INGRESS_MAP_CKSUMV4 (1U << 2)
1: +#define RMNET_FLAGS_EGRESS_MAP_CKSUMV4 (1U << 3)
1:  
1:  enum {
1: -	IFLA_RMNET_UNSPEC,
1: -	IFLA_RMNET_MUX_ID,
1: -	IFLA_RMNET_FLAGS,
1: -	__IFLA_RMNET_MAX,
1: +  IFLA_RMNET_UNSPEC,
1: +  IFLA_RMNET_MUX_ID,
1: +  IFLA_RMNET_FLAGS,
1: +  __IFLA_RMNET_MAX,
1:  };
1:  
1: -#define IFLA_RMNET_MAX	(__IFLA_RMNET_MAX - 1)
1: +#define IFLA_RMNET_MAX (__IFLA_RMNET_MAX - 1)
1:  
1:  struct ifla_rmnet_flags {
1: -	__u32	flags;
1: -	__u32	mask;
1: +  __u32 flags;
1: +  __u32 mask;
1:  };
1:  
1:  #endif /* _UAPI_LINUX_IF_LINK_H */
1: diff --git a/src/cc/libbpf/include/uapi/linux/if_xdp.h b/src/cc/libbpf/include/uapi/linux/if_xdp.h
1: index a78a8096..621a6f7b 100644
1: --- a/src/cc/libbpf/include/uapi/linux/if_xdp.h
1: +++ b/src/cc/libbpf/include/uapi/linux/if_xdp.h
1: @@ -13,9 +13,9 @@
1:  #include <linux/types.h>
1:  
1:  /* Options for the sxdp_flags field */
1: -#define XDP_SHARED_UMEM	(1 << 0)
1: -#define XDP_COPY	(1 << 1) /* Force copy-mode */
1: -#define XDP_ZEROCOPY	(1 << 2) /* Force zero-copy mode */
1: +#define XDP_SHARED_UMEM (1 << 0)
1: +#define XDP_COPY (1 << 1)     /* Force copy-mode */
1: +#define XDP_ZEROCOPY (1 << 2) /* Force zero-copy mode */
1:  /* If this option is set, the driver might go sleep and in that case
1:   * the XDP_RING_NEED_WAKEUP flag in the fill and/or Tx rings will be
1:   * set. If it is set, the application need to explicitly wake up the
1: @@ -30,80 +30,80 @@
1:  #define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)
1:  
1:  struct sockaddr_xdp {
1: -	__u16 sxdp_family;
1: -	__u16 sxdp_flags;
1: -	__u32 sxdp_ifindex;
1: -	__u32 sxdp_queue_id;
1: -	__u32 sxdp_shared_umem_fd;
1: +  __u16 sxdp_family;
1: +  __u16 sxdp_flags;
1: +  __u32 sxdp_ifindex;
1: +  __u32 sxdp_queue_id;
1: +  __u32 sxdp_shared_umem_fd;
1:  };
1:  
1:  /* XDP_RING flags */
1:  #define XDP_RING_NEED_WAKEUP (1 << 0)
1:  
1:  struct xdp_ring_offset {
1: -	__u64 producer;
1: -	__u64 consumer;
1: -	__u64 desc;
1: -	__u64 flags;
1: +  __u64 producer;
1: +  __u64 consumer;
1: +  __u64 desc;
1: +  __u64 flags;
1:  };
1:  
1:  struct xdp_mmap_offsets {
1: -	struct xdp_ring_offset rx;
1: -	struct xdp_ring_offset tx;
1: -	struct xdp_ring_offset fr; /* Fill */
1: -	struct xdp_ring_offset cr; /* Completion */
1: +  struct xdp_ring_offset rx;
1: +  struct xdp_ring_offset tx;
1: +  struct xdp_ring_offset fr; /* Fill */
1: +  struct xdp_ring_offset cr; /* Completion */
1:  };
1:  
1:  /* XDP socket options */
1: -#define XDP_MMAP_OFFSETS		1
1: -#define XDP_RX_RING			2
1: -#define XDP_TX_RING			3
1: -#define XDP_UMEM_REG			4
1: -#define XDP_UMEM_FILL_RING		5
1: -#define XDP_UMEM_COMPLETION_RING	6
1: -#define XDP_STATISTICS			7
1: -#define XDP_OPTIONS			8
1: +#define XDP_MMAP_OFFSETS 1
1: +#define XDP_RX_RING 2
1: +#define XDP_TX_RING 3
1: +#define XDP_UMEM_REG 4
1: +#define XDP_UMEM_FILL_RING 5
1: +#define XDP_UMEM_COMPLETION_RING 6
1: +#define XDP_STATISTICS 7
1: +#define XDP_OPTIONS 8
1:  
1:  struct xdp_umem_reg {
1: -	__u64 addr; /* Start of packet data area */
1: -	__u64 len; /* Length of packet data area */
1: -	__u32 chunk_size;
1: -	__u32 headroom;
1: -	__u32 flags;
1: +  __u64 addr; /* Start of packet data area */
1: +  __u64 len;  /* Length of packet data area */
1: +  __u32 chunk_size;
1: +  __u32 headroom;
1: +  __u32 flags;
1:  };
1:  
1:  struct xdp_statistics {
1: -	__u64 rx_dropped; /* Dropped for other reasons */
1: -	__u64 rx_invalid_descs; /* Dropped due to invalid descriptor */
1: -	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */
1: -	__u64 rx_ring_full; /* Dropped due to rx ring being full */
1: -	__u64 rx_fill_ring_empty_descs; /* Failed to retrieve item from fill ring */
1: -	__u64 tx_ring_empty_descs; /* Failed to retrieve item from tx ring */
1: +  __u64 rx_dropped;               /* Dropped for other reasons */
1: +  __u64 rx_invalid_descs;         /* Dropped due to invalid descriptor */
1: +  __u64 tx_invalid_descs;         /* Dropped due to invalid descriptor */
1: +  __u64 rx_ring_full;             /* Dropped due to rx ring being full */
1: +  __u64 rx_fill_ring_empty_descs; /* Failed to retrieve item from fill ring */
1: +  __u64 tx_ring_empty_descs;      /* Failed to retrieve item from tx ring */
1:  };
1:  
1:  struct xdp_options {
1: -	__u32 flags;
1: +  __u32 flags;
1:  };
1:  
1:  /* Flags for the flags field of struct xdp_options */
1:  #define XDP_OPTIONS_ZEROCOPY (1 << 0)
1:  
1:  /* Pgoff for mmaping the rings */
1: -#define XDP_PGOFF_RX_RING			  0
1: -#define XDP_PGOFF_TX_RING		 0x80000000
1: -#define XDP_UMEM_PGOFF_FILL_RING	0x100000000ULL
1: -#define XDP_UMEM_PGOFF_COMPLETION_RING	0x180000000ULL
1: +#define XDP_PGOFF_RX_RING 0
1: +#define XDP_PGOFF_TX_RING 0x80000000
1: +#define XDP_UMEM_PGOFF_FILL_RING 0x100000000ULL
1: +#define XDP_UMEM_PGOFF_COMPLETION_RING 0x180000000ULL
1:  
1:  /* Masks for unaligned chunks mode */
1:  #define XSK_UNALIGNED_BUF_OFFSET_SHIFT 48
1:  #define XSK_UNALIGNED_BUF_ADDR_MASK \
1: -	((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)
1: +  ((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)
1:  
1:  /* Rx/Tx descriptor */
1:  struct xdp_desc {
1: -	__u64 addr;
1: -	__u32 len;
1: -	__u32 options;
1: +  __u64 addr;
1: +  __u32 len;
1: +  __u32 options;
1:  };
1:  
1:  /* UMEM descriptor is __u64 */
1: diff --git a/src/cc/libbpf/include/uapi/linux/netlink.h b/src/cc/libbpf/include/uapi/linux/netlink.h
1: index 0a4d7331..9e66f9c2 100644
1: --- a/src/cc/libbpf/include/uapi/linux/netlink.h
1: +++ b/src/cc/libbpf/include/uapi/linux/netlink.h
1: @@ -6,76 +6,78 @@
1:  #include <linux/socket.h> /* for __kernel_sa_family_t */
1:  #include <linux/types.h>
1:  
1: -#define NETLINK_ROUTE		0	/* Routing/device hook				*/
1: -#define NETLINK_UNUSED		1	/* Unused number				*/
1: -#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
1: -#define NETLINK_FIREWALL	3	/* Unused number, formerly ip_queue		*/
1: -#define NETLINK_SOCK_DIAG	4	/* socket monitoring				*/
1: -#define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */
1: -#define NETLINK_XFRM		6	/* ipsec */
1: -#define NETLINK_SELINUX		7	/* SELinux event notifications */
1: -#define NETLINK_ISCSI		8	/* Open-iSCSI */
1: -#define NETLINK_AUDIT		9	/* auditing */
1: -#define NETLINK_FIB_LOOKUP	10	
1: -#define NETLINK_CONNECTOR	11
1: -#define NETLINK_NETFILTER	12	/* netfilter subsystem */
1: -#define NETLINK_IP6_FW		13
1: -#define NETLINK_DNRTMSG		14	/* DECnet routing messages */
1: -#define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */
1: -#define NETLINK_GENERIC		16
1: +#define NETLINK_ROUTE 0     /* Routing/device hook				*/
1: +#define NETLINK_UNUSED 1    /* Unused number				*/
1: +#define NETLINK_USERSOCK 2  /* Reserved for user mode socket protocols 	*/
1: +#define NETLINK_FIREWALL 3  /* Unused number, formerly ip_queue		*/
1: +#define NETLINK_SOCK_DIAG 4 /* socket monitoring \
1: +                               */
1: +#define NETLINK_NFLOG 5     /* netfilter/iptables ULOG */
1: +#define NETLINK_XFRM 6      /* ipsec */
1: +#define NETLINK_SELINUX 7   /* SELinux event notifications */
1: +#define NETLINK_ISCSI 8     /* Open-iSCSI */
1: +#define NETLINK_AUDIT 9     /* auditing */
1: +#define NETLINK_FIB_LOOKUP 10
1: +#define NETLINK_CONNECTOR 11
1: +#define NETLINK_NETFILTER 12 /* netfilter subsystem */
1: +#define NETLINK_IP6_FW 13
1: +#define NETLINK_DNRTMSG 14        /* DECnet routing messages */
1: +#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
1: +#define NETLINK_GENERIC 16
1:  /* leave room for NETLINK_DM (DM Events) */
1: -#define NETLINK_SCSITRANSPORT	18	/* SCSI Transports */
1: -#define NETLINK_ECRYPTFS	19
1: -#define NETLINK_RDMA		20
1: -#define NETLINK_CRYPTO		21	/* Crypto layer */
1: -#define NETLINK_SMC		22	/* SMC monitoring */
1: +#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
1: +#define NETLINK_ECRYPTFS 19
1: +#define NETLINK_RDMA 20
1: +#define NETLINK_CRYPTO 21 /* Crypto layer */
1: +#define NETLINK_SMC 22    /* SMC monitoring */
1:  
1: -#define NETLINK_INET_DIAG	NETLINK_SOCK_DIAG
1: +#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG
1:  
1: -#define MAX_LINKS 32		
1: +#define MAX_LINKS 32
1:  
1:  struct sockaddr_nl {
1: -	__kernel_sa_family_t	nl_family;	/* AF_NETLINK	*/
1: -	unsigned short	nl_pad;		/* zero		*/
1: -	__u32		nl_pid;		/* port ID	*/
1: -       	__u32		nl_groups;	/* multicast groups mask */
1: +  __kernel_sa_family_t nl_family; /* AF_NETLINK	*/
1: +  unsigned short nl_pad;          /* zero		*/
1: +  __u32 nl_pid;                   /* port ID	*/
1: +  __u32 nl_groups;                /* multicast groups mask */
1:  };
1:  
1:  struct nlmsghdr {
1: -	__u32		nlmsg_len;	/* Length of message including header */
1: -	__u16		nlmsg_type;	/* Message content */
1: -	__u16		nlmsg_flags;	/* Additional flags */
1: -	__u32		nlmsg_seq;	/* Sequence number */
1: -	__u32		nlmsg_pid;	/* Sending process port ID */
1: +  __u32 nlmsg_len;   /* Length of message including header */
1: +  __u16 nlmsg_type;  /* Message content */
1: +  __u16 nlmsg_flags; /* Additional flags */
1: +  __u32 nlmsg_seq;   /* Sequence number */
1: +  __u32 nlmsg_pid;   /* Sending process port ID */
1:  };
1:  
1:  /* Flags values */
1:  
1: -#define NLM_F_REQUEST		0x01	/* It is request message. 	*/
1: -#define NLM_F_MULTI		0x02	/* Multipart message, terminated by NLMSG_DONE */
1: -#define NLM_F_ACK		0x04	/* Reply with ack, with zero or error code */
1: -#define NLM_F_ECHO		0x08	/* Echo this request 		*/
1: -#define NLM_F_DUMP_INTR		0x10	/* Dump was inconsistent due to sequence change */
1: -#define NLM_F_DUMP_FILTERED	0x20	/* Dump was filtered as requested */
1: +#define NLM_F_REQUEST 0x01   /* It is request message. 	*/
1: +#define NLM_F_MULTI 0x02     /* Multipart message, terminated by NLMSG_DONE */
1: +#define NLM_F_ACK 0x04       /* Reply with ack, with zero or error code */
1: +#define NLM_F_ECHO 0x08      /* Echo this request 		*/
1: +#define NLM_F_DUMP_INTR 0x10 /* Dump was inconsistent due to sequence change \
1: +                                */
1: +#define NLM_F_DUMP_FILTERED 0x20 /* Dump was filtered as requested */
1:  
1:  /* Modifiers to GET request */
1: -#define NLM_F_ROOT	0x100	/* specify tree	root	*/
1: -#define NLM_F_MATCH	0x200	/* return all matching	*/
1: -#define NLM_F_ATOMIC	0x400	/* atomic GET		*/
1: -#define NLM_F_DUMP	(NLM_F_ROOT|NLM_F_MATCH)
1: +#define NLM_F_ROOT 0x100   /* specify tree	root	*/
1: +#define NLM_F_MATCH 0x200  /* return all matching	*/
1: +#define NLM_F_ATOMIC 0x400 /* atomic GET		*/
1: +#define NLM_F_DUMP (NLM_F_ROOT | NLM_F_MATCH)
1:  
1:  /* Modifiers to NEW request */
1: -#define NLM_F_REPLACE	0x100	/* Override existing		*/
1: -#define NLM_F_EXCL	0x200	/* Do not touch, if it exists	*/
1: -#define NLM_F_CREATE	0x400	/* Create, if it does not exist	*/
1: -#define NLM_F_APPEND	0x800	/* Add to end of list		*/
1: +#define NLM_F_REPLACE 0x100 /* Override existing		*/
1: +#define NLM_F_EXCL 0x200    /* Do not touch, if it exists	*/
1: +#define NLM_F_CREATE 0x400  /* Create, if it does not exist	*/
1: +#define NLM_F_APPEND 0x800  /* Add to end of list		*/
1:  
1:  /* Modifiers to DELETE request */
1: -#define NLM_F_NONREC	0x100	/* Do not delete recursively	*/
1: +#define NLM_F_NONREC 0x100 /* Do not delete recursively	*/
1:  
1:  /* Flags for ACK message */
1: -#define NLM_F_CAPPED	0x100	/* request was capped */
1: -#define NLM_F_ACK_TLVS	0x200	/* extended ACK TVLs were included */
1: +#define NLM_F_CAPPED 0x100   /* request was capped */
1: +#define NLM_F_ACK_TLVS 0x200 /* extended ACK TVLs were included */
1:  
1:  /*
1:     4.4BSD ADD		NLM_F_CREATE|NLM_F_EXCL
1: @@ -86,38 +88,39 @@ struct nlmsghdr {
1:     Check		NLM_F_EXCL
1:   */
1:  
1: -#define NLMSG_ALIGNTO	4U
1: -#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) )
1: -#define NLMSG_HDRLEN	 ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
1: +#define NLMSG_ALIGNTO 4U
1: +#define NLMSG_ALIGN(len) (((len) + NLMSG_ALIGNTO - 1) & ~(NLMSG_ALIGNTO - 1))
1: +#define NLMSG_HDRLEN ((int)NLMSG_ALIGN(sizeof(struct nlmsghdr)))
1:  #define NLMSG_LENGTH(len) ((len) + NLMSG_HDRLEN)
1:  #define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
1: -#define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
1: -#define NLMSG_NEXT(nlh,len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
1: -				  (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
1: -#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
1: -			   (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
1: -			   (nlh)->nlmsg_len <= (len))
1: -#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
1: -
1: -#define NLMSG_NOOP		0x1	/* Nothing.		*/
1: -#define NLMSG_ERROR		0x2	/* Error		*/
1: -#define NLMSG_DONE		0x3	/* End of a dump	*/
1: -#define NLMSG_OVERRUN		0x4	/* Data lost		*/
1: -
1: -#define NLMSG_MIN_TYPE		0x10	/* < 0x10: reserved control messages */
1: +#define NLMSG_DATA(nlh) ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
1: +#define NLMSG_NEXT(nlh, len)               \
1: +  ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
1: +   (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
1: +#define NLMSG_OK(nlh, len)                  \
1: +  ((len) >= (int)sizeof(struct nlmsghdr) && \
1: +   (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && (nlh)->nlmsg_len <= (len))
1: +#define NLMSG_PAYLOAD(nlh, len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
1: +
1: +#define NLMSG_NOOP 0x1    /* Nothing.		*/
1: +#define NLMSG_ERROR 0x2   /* Error		*/
1: +#define NLMSG_DONE 0x3    /* End of a dump	*/
1: +#define NLMSG_OVERRUN 0x4 /* Data lost		*/
1: +
1: +#define NLMSG_MIN_TYPE 0x10 /* < 0x10: reserved control messages */
1:  
1:  struct nlmsgerr {
1: -	int		error;
1: -	struct nlmsghdr msg;
1: -	/*
1: -	 * followed by the message contents unless NETLINK_CAP_ACK was set
1: -	 * or the ACK indicates success (error == 0)
1: -	 * message length is aligned with NLMSG_ALIGN()
1: -	 */
1: -	/*
1: -	 * followed by TLVs defined in enum nlmsgerr_attrs
1: -	 * if NETLINK_EXT_ACK was set
1: -	 */
1: +  int error;
1: +  struct nlmsghdr msg;
1: +  /*
1: +   * followed by the message contents unless NETLINK_CAP_ACK was set
1: +   * or the ACK indicates success (error == 0)
1: +   * message length is aligned with NLMSG_ALIGN()
1: +   */
1: +  /*
1: +   * followed by TLVs defined in enum nlmsgerr_attrs
1: +   * if NETLINK_EXT_ACK was set
1: +   */
1:  };
1:  
1:  /**
1: @@ -133,70 +136,72 @@ struct nlmsgerr {
1:   * @NLMSGERR_ATTR_MAX: highest attribute number
1:   */
1:  enum nlmsgerr_attrs {
1: -	NLMSGERR_ATTR_UNUSED,
1: -	NLMSGERR_ATTR_MSG,
1: -	NLMSGERR_ATTR_OFFS,
1: -	NLMSGERR_ATTR_COOKIE,
1: +  NLMSGERR_ATTR_UNUSED,
1: +  NLMSGERR_ATTR_MSG,
1: +  NLMSGERR_ATTR_OFFS,
1: +  NLMSGERR_ATTR_COOKIE,
1:  
1: -	__NLMSGERR_ATTR_MAX,
1: -	NLMSGERR_ATTR_MAX = __NLMSGERR_ATTR_MAX - 1
1: +  __NLMSGERR_ATTR_MAX,
1: +  NLMSGERR_ATTR_MAX = __NLMSGERR_ATTR_MAX - 1
1:  };
1:  
1: -#define NETLINK_ADD_MEMBERSHIP		1
1: -#define NETLINK_DROP_MEMBERSHIP		2
1: -#define NETLINK_PKTINFO			3
1: -#define NETLINK_BROADCAST_ERROR		4
1: -#define NETLINK_NO_ENOBUFS		5
1: +#define NETLINK_ADD_MEMBERSHIP 1
1: +#define NETLINK_DROP_MEMBERSHIP 2
1: +#define NETLINK_PKTINFO 3
1: +#define NETLINK_BROADCAST_ERROR 4
1: +#define NETLINK_NO_ENOBUFS 5
1:  #ifndef __KERNEL__
1: -#define NETLINK_RX_RING			6
1: -#define NETLINK_TX_RING			7
1: +#define NETLINK_RX_RING 6
1: +#define NETLINK_TX_RING 7
1:  #endif
1: -#define NETLINK_LISTEN_ALL_NSID		8
1: -#define NETLINK_LIST_MEMBERSHIPS	9
1: -#define NETLINK_CAP_ACK			10
1: -#define NETLINK_EXT_ACK			11
1: -#define NETLINK_GET_STRICT_CHK		12
1: +#define NETLINK_LISTEN_ALL_NSID 8
1: +#define NETLINK_LIST_MEMBERSHIPS 9
1: +#define NETLINK_CAP_ACK 10
1: +#define NETLINK_EXT_ACK 11
1: +#define NETLINK_GET_STRICT_CHK 12
1:  
1:  struct nl_pktinfo {
1: -	__u32	group;
1: +  __u32 group;
1:  };
1:  
1:  struct nl_mmap_req {
1: -	unsigned int	nm_block_size;
1: -	unsigned int	nm_block_nr;
1: -	unsigned int	nm_frame_size;
1: -	unsigned int	nm_frame_nr;
1: +  unsigned int nm_block_size;
1: +  unsigned int nm_block_nr;
1: +  unsigned int nm_frame_size;
1: +  unsigned int nm_frame_nr;
1:  };
1:  
1:  struct nl_mmap_hdr {
1: -	unsigned int	nm_status;
1: -	unsigned int	nm_len;
1: -	__u32		nm_group;
1: -	/* credentials */
1: -	__u32		nm_pid;
1: -	__u32		nm_uid;
1: -	__u32		nm_gid;
1: +  unsigned int nm_status;
1: +  unsigned int nm_len;
1: +  __u32 nm_group;
1: +  /* credentials */
1: +  __u32 nm_pid;
1: +  __u32 nm_uid;
1: +  __u32 nm_gid;
1:  };
1:  
1:  #ifndef __KERNEL__
1:  enum nl_mmap_status {
1: -	NL_MMAP_STATUS_UNUSED,
1: -	NL_MMAP_STATUS_RESERVED,
1: -	NL_MMAP_STATUS_VALID,
1: -	NL_MMAP_STATUS_COPY,
1: -	NL_MMAP_STATUS_SKIP,
1: +  NL_MMAP_STATUS_UNUSED,
1: +  NL_MMAP_STATUS_RESERVED,
1: +  NL_MMAP_STATUS_VALID,
1: +  NL_MMAP_STATUS_COPY,
1: +  NL_MMAP_STATUS_SKIP,
1:  };
1:  
1: -#define NL_MMAP_MSG_ALIGNMENT		NLMSG_ALIGNTO
1: -#define NL_MMAP_MSG_ALIGN(sz)		__ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT)
1: -#define NL_MMAP_HDRLEN			NL_MMAP_MSG_ALIGN(sizeof(struct nl_mmap_hdr))
1: +#define NL_MMAP_MSG_ALIGNMENT NLMSG_ALIGNTO
1: +#define NL_MMAP_MSG_ALIGN(sz) __ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT)
1: +#define NL_MMAP_HDRLEN NL_MMAP_MSG_ALIGN(sizeof(struct nl_mmap_hdr))
1:  #endif
1:  
1: -#define NET_MAJOR 36		/* Major 36 is reserved for networking 						*/
1: +#define NET_MAJOR                           \
1: +  36 /* Major 36 is reserved for networking \
1: +        */
1:  
1:  enum {
1: -	NETLINK_UNCONNECTED = 0,
1: -	NETLINK_CONNECTED,
1: +  NETLINK_UNCONNECTED = 0,
1: +  NETLINK_CONNECTED,
1:  };
1:  
1:  /*
1: @@ -209,8 +214,8 @@ enum {
1:   */
1:  
1:  struct nlattr {
1: -	__u16           nla_len;
1: -	__u16           nla_type;
1: +  __u16 nla_len;
1: +  __u16 nla_type;
1:  };
1:  
1:  /*
1: @@ -223,13 +228,13 @@ struct nlattr {
1:   *
1:   * Note: The N and O flag are mutually exclusive.
1:   */
1: -#define NLA_F_NESTED		(1 << 15)
1: -#define NLA_F_NET_BYTEORDER	(1 << 14)
1: -#define NLA_TYPE_MASK		~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
1: +#define NLA_F_NESTED (1 << 15)
1: +#define NLA_F_NET_BYTEORDER (1 << 14)
1: +#define NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
1:  
1: -#define NLA_ALIGNTO		4
1: -#define NLA_ALIGN(len)		(((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
1: -#define NLA_HDRLEN		((int) NLA_ALIGN(sizeof(struct nlattr)))
1: +#define NLA_ALIGNTO 4
1: +#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
1: +#define NLA_HDRLEN ((int)NLA_ALIGN(sizeof(struct nlattr)))
1:  
1:  /* Generic 32 bitflags attribute content sent to the kernel.
1:   *
1: @@ -245,8 +250,8 @@ struct nlattr {
1:   *
1:   */
1:  struct nla_bitfield32 {
1: -	__u32 value;
1: -	__u32 selector;
1: +  __u32 value;
1: +  __u32 selector;
1:  };
1:  
1:  #endif /* _UAPI__LINUX_NETLINK_H */
1: diff --git a/src/cc/libbpf/include/uapi/linux/pkt_cls.h b/src/cc/libbpf/include/uapi/linux/pkt_cls.h
1: index 12153771..6adcc043 100644
1: --- a/src/cc/libbpf/include/uapi/linux/pkt_cls.h
1: +++ b/src/cc/libbpf/include/uapi/linux/pkt_cls.h
1: @@ -2,50 +2,51 @@
1:  #ifndef __LINUX_PKT_CLS_H
1:  #define __LINUX_PKT_CLS_H
1:  
1: -#include <linux/types.h>
1:  #include <linux/pkt_sched.h>
1: +#include <linux/types.h>
1:  
1:  #define TC_COOKIE_MAX_SIZE 16
1:  
1:  /* Action attributes */
1:  enum {
1: -	TCA_ACT_UNSPEC,
1: -	TCA_ACT_KIND,
1: -	TCA_ACT_OPTIONS,
1: -	TCA_ACT_INDEX,
1: -	TCA_ACT_STATS,
1: -	TCA_ACT_PAD,
1: -	TCA_ACT_COOKIE,
1: -	__TCA_ACT_MAX
1: +  TCA_ACT_UNSPEC,
1: +  TCA_ACT_KIND,
1: +  TCA_ACT_OPTIONS,
1: +  TCA_ACT_INDEX,
1: +  TCA_ACT_STATS,
1: +  TCA_ACT_PAD,
1: +  TCA_ACT_COOKIE,
1: +  __TCA_ACT_MAX
1:  };
1:  
1:  #define TCA_ACT_MAX __TCA_ACT_MAX
1: -#define TCA_OLD_COMPAT (TCA_ACT_MAX+1)
1: +#define TCA_OLD_COMPAT (TCA_ACT_MAX + 1)
1:  #define TCA_ACT_MAX_PRIO 32
1: -#define TCA_ACT_BIND	1
1: -#define TCA_ACT_NOBIND	0
1: -#define TCA_ACT_UNBIND	1
1: -#define TCA_ACT_NOUNBIND	0
1: -#define TCA_ACT_REPLACE		1
1: -#define TCA_ACT_NOREPLACE	0
1: -
1: -#define TC_ACT_UNSPEC	(-1)
1: -#define TC_ACT_OK		0
1: -#define TC_ACT_RECLASSIFY	1
1: -#define TC_ACT_SHOT		2
1: -#define TC_ACT_PIPE		3
1: -#define TC_ACT_STOLEN		4
1: -#define TC_ACT_QUEUED		5
1: -#define TC_ACT_REPEAT		6
1: -#define TC_ACT_REDIRECT		7
1: -#define TC_ACT_TRAP		8 /* For hw path, this means "trap to cpu"
1: -				   * and don't further process the frame
1: -				   * in hardware. For sw path, this is
1: -				   * equivalent of TC_ACT_STOLEN - drop
1: -				   * the skb and act like everything
1: -				   * is alright.
1: -				   */
1: -#define TC_ACT_VALUE_MAX	TC_ACT_TRAP
1: +#define TCA_ACT_BIND 1
1: +#define TCA_ACT_NOBIND 0
1: +#define TCA_ACT_UNBIND 1
1: +#define TCA_ACT_NOUNBIND 0
1: +#define TCA_ACT_REPLACE 1
1: +#define TCA_ACT_NOREPLACE 0
1: +
1: +#define TC_ACT_UNSPEC (-1)
1: +#define TC_ACT_OK 0
1: +#define TC_ACT_RECLASSIFY 1
1: +#define TC_ACT_SHOT 2
1: +#define TC_ACT_PIPE 3
1: +#define TC_ACT_STOLEN 4
1: +#define TC_ACT_QUEUED 5
1: +#define TC_ACT_REPEAT 6
1: +#define TC_ACT_REDIRECT 7
1: +#define TC_ACT_TRAP                          \
1: +  8 /* For hw path, this means "trap to cpu" \
1: +     * and don't further process the frame   \
1: +     * in hardware. For sw path, this is     \
1: +     * equivalent of TC_ACT_STOLEN - drop    \
1: +     * the skb and act like everything       \
1: +     * is alright.                           \
1: +     */
1: +#define TC_ACT_VALUE_MAX TC_ACT_TRAP
1:  
1:  /* There is a special kind of actions called "extended actions",
1:   * which need a value parameter. These have a local opcode located in
1: @@ -61,206 +62,204 @@ enum {
1:  
1:  #define TC_ACT_JUMP __TC_ACT_EXT(1)
1:  #define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)
1: -#define TC_ACT_EXT_OPCODE_MAX	TC_ACT_GOTO_CHAIN
1: +#define TC_ACT_EXT_OPCODE_MAX TC_ACT_GOTO_CHAIN
1:  
1:  /* Action type identifiers*/
1:  enum {
1: -	TCA_ID_UNSPEC=0,
1: -	TCA_ID_POLICE=1,
1: -	/* other actions go here */
1: -	__TCA_ID_MAX=255
1: +  TCA_ID_UNSPEC = 0,
1: +  TCA_ID_POLICE = 1,
1: +  /* other actions go here */
1: +  __TCA_ID_MAX = 255
1:  };
1:  
1:  #define TCA_ID_MAX __TCA_ID_MAX
1:  
1:  struct tc_police {
1: -	__u32			index;
1: -	int			action;
1: -#define TC_POLICE_UNSPEC	TC_ACT_UNSPEC
1: -#define TC_POLICE_OK		TC_ACT_OK
1: -#define TC_POLICE_RECLASSIFY	TC_ACT_RECLASSIFY
1: -#define TC_POLICE_SHOT		TC_ACT_SHOT
1: -#define TC_POLICE_PIPE		TC_ACT_PIPE
1: -
1: -	__u32			limit;
1: -	__u32			burst;
1: -	__u32			mtu;
1: -	struct tc_ratespec	rate;
1: -	struct tc_ratespec	peakrate;
1: -	int			refcnt;
1: -	int			bindcnt;
1: -	__u32			capab;
1: +  __u32 index;
1: +  int action;
1: +#define TC_POLICE_UNSPEC TC_ACT_UNSPEC
1: +#define TC_POLICE_OK TC_ACT_OK
1: +#define TC_POLICE_RECLASSIFY TC_ACT_RECLASSIFY
1: +#define TC_POLICE_SHOT TC_ACT_SHOT
1: +#define TC_POLICE_PIPE TC_ACT_PIPE
1: +
1: +  __u32 limit;
1: +  __u32 burst;
1: +  __u32 mtu;
1: +  struct tc_ratespec rate;
1: +  struct tc_ratespec peakrate;
1: +  int refcnt;
1: +  int bindcnt;
1: +  __u32 capab;
1:  };
1:  
1:  struct tcf_t {
1: -	__u64   install;
1: -	__u64   lastuse;
1: -	__u64   expires;
1: -	__u64   firstuse;
1: +  __u64 install;
1: +  __u64 lastuse;
1: +  __u64 expires;
1: +  __u64 firstuse;
1:  };
1:  
1:  struct tc_cnt {
1: -	int                   refcnt;
1: -	int                   bindcnt;
1: +  int refcnt;
1: +  int bindcnt;
1:  };
1:  
1:  #define tc_gen \
1: -	__u32                 index; \
1: -	__u32                 capab; \
1: -	int                   action; \
1: -	int                   refcnt; \
1: -	int                   bindcnt
1: +  __u32 index; \
1: +  __u32 capab; \
1: +  int action;  \
1: +  int refcnt;  \
1: +  int bindcnt
1:  
1:  enum {
1: -	TCA_POLICE_UNSPEC,
1: -	TCA_POLICE_TBF,
1: -	TCA_POLICE_RATE,
1: -	TCA_POLICE_PEAKRATE,
1: -	TCA_POLICE_AVRATE,
1: -	TCA_POLICE_RESULT,
1: -	TCA_POLICE_TM,
1: -	TCA_POLICE_PAD,
1: -	__TCA_POLICE_MAX
1: +  TCA_POLICE_UNSPEC,
1: +  TCA_POLICE_TBF,
1: +  TCA_POLICE_RATE,
1: +  TCA_POLICE_PEAKRATE,
1: +  TCA_POLICE_AVRATE,
1: +  TCA_POLICE_RESULT,
1: +  TCA_POLICE_TM,
1: +  TCA_POLICE_PAD,
1: +  __TCA_POLICE_MAX
1:  #define TCA_POLICE_RESULT TCA_POLICE_RESULT
1:  };
1:  
1:  #define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)
1:  
1:  /* tca flags definitions */
1: -#define TCA_CLS_FLAGS_SKIP_HW	(1 << 0) /* don't offload filter to HW */
1: -#define TCA_CLS_FLAGS_SKIP_SW	(1 << 1) /* don't use filter in SW */
1: -#define TCA_CLS_FLAGS_IN_HW	(1 << 2) /* filter is offloaded to HW */
1: +#define TCA_CLS_FLAGS_SKIP_HW (1 << 0)   /* don't offload filter to HW */
1: +#define TCA_CLS_FLAGS_SKIP_SW (1 << 1)   /* don't use filter in SW */
1: +#define TCA_CLS_FLAGS_IN_HW (1 << 2)     /* filter is offloaded to HW */
1:  #define TCA_CLS_FLAGS_NOT_IN_HW (1 << 3) /* filter isn't offloaded to HW */
1: -#define TCA_CLS_FLAGS_VERBOSE	(1 << 4) /* verbose logging */
1: +#define TCA_CLS_FLAGS_VERBOSE (1 << 4)   /* verbose logging */
1:  
1:  /* U32 filters */
1:  
1:  #define TC_U32_HTID(h) ((h)&0xFFF00000)
1: -#define TC_U32_USERHTID(h) (TC_U32_HTID(h)>>20)
1: -#define TC_U32_HASH(h) (((h)>>12)&0xFF)
1: +#define TC_U32_USERHTID(h) (TC_U32_HTID(h) >> 20)
1: +#define TC_U32_HASH(h) (((h) >> 12) & 0xFF)
1:  #define TC_U32_NODE(h) ((h)&0xFFF)
1:  #define TC_U32_KEY(h) ((h)&0xFFFFF)
1: -#define TC_U32_UNSPEC	0
1: -#define TC_U32_ROOT	(0xFFF00000)
1: +#define TC_U32_UNSPEC 0
1: +#define TC_U32_ROOT (0xFFF00000)
1:  
1:  enum {
1: -	TCA_U32_UNSPEC,
1: -	TCA_U32_CLASSID,
1: -	TCA_U32_HASH,
1: -	TCA_U32_LINK,
1: -	TCA_U32_DIVISOR,
1: -	TCA_U32_SEL,
1: -	TCA_U32_POLICE,
1: -	TCA_U32_ACT,
1: -	TCA_U32_INDEV,
1: -	TCA_U32_PCNT,
1: -	TCA_U32_MARK,
1: -	TCA_U32_FLAGS,
1: -	TCA_U32_PAD,
1: -	__TCA_U32_MAX
1: +  TCA_U32_UNSPEC,
1: +  TCA_U32_CLASSID,
1: +  TCA_U32_HASH,
1: +  TCA_U32_LINK,
1: +  TCA_U32_DIVISOR,
1: +  TCA_U32_SEL,
1: +  TCA_U32_POLICE,
1: +  TCA_U32_ACT,
1: +  TCA_U32_INDEV,
1: +  TCA_U32_PCNT,
1: +  TCA_U32_MARK,
1: +  TCA_U32_FLAGS,
1: +  TCA_U32_PAD,
1: +  __TCA_U32_MAX
1:  };
1:  
1:  #define TCA_U32_MAX (__TCA_U32_MAX - 1)
1:  
1:  struct tc_u32_key {
1: -	__be32		mask;
1: -	__be32		val;
1: -	int		off;
1: -	int		offmask;
1: +  __be32 mask;
1: +  __be32 val;
1: +  int off;
1: +  int offmask;
1:  };
1:  
1:  struct tc_u32_sel {
1: -	unsigned char		flags;
1: -	unsigned char		offshift;
1: -	unsigned char		nkeys;
1: +  unsigned char flags;
1: +  unsigned char offshift;
1: +  unsigned char nkeys;
1:  
1: -	__be16			offmask;
1: -	__u16			off;
1: -	short			offoff;
1: +  __be16 offmask;
1: +  __u16 off;
1: +  short offoff;
1:  
1: -	short			hoff;
1: -	__be32			hmask;
1: -	struct tc_u32_key	keys[0];
1: +  short hoff;
1: +  __be32 hmask;
1: +  struct tc_u32_key keys[0];
1:  };
1:  
1:  struct tc_u32_mark {
1: -	__u32		val;
1: -	__u32		mask;
1: -	__u32		success;
1: +  __u32 val;
1: +  __u32 mask;
1: +  __u32 success;
1:  };
1:  
1:  struct tc_u32_pcnt {
1: -	__u64 rcnt;
1: -	__u64 rhit;
1: -	__u64 kcnts[0];
1: +  __u64 rcnt;
1: +  __u64 rhit;
1: +  __u64 kcnts[0];
1:  };
1:  
1:  /* Flags */
1:  
1: -#define TC_U32_TERMINAL		1
1: -#define TC_U32_OFFSET		2
1: -#define TC_U32_VAROFFSET	4
1: -#define TC_U32_EAT		8
1: +#define TC_U32_TERMINAL 1
1: +#define TC_U32_OFFSET 2
1: +#define TC_U32_VAROFFSET 4
1: +#define TC_U32_EAT 8
1:  
1:  #define TC_U32_MAXDEPTH 8
1:  
1: -
1:  /* RSVP filter */
1:  
1:  enum {
1: -	TCA_RSVP_UNSPEC,
1: -	TCA_RSVP_CLASSID,
1: -	TCA_RSVP_DST,
1: -	TCA_RSVP_SRC,
1: -	TCA_RSVP_PINFO,
1: -	TCA_RSVP_POLICE,
1: -	TCA_RSVP_ACT,
1: -	__TCA_RSVP_MAX
1: +  TCA_RSVP_UNSPEC,
1: +  TCA_RSVP_CLASSID,
1: +  TCA_RSVP_DST,
1: +  TCA_RSVP_SRC,
1: +  TCA_RSVP_PINFO,
1: +  TCA_RSVP_POLICE,
1: +  TCA_RSVP_ACT,
1: +  __TCA_RSVP_MAX
1:  };
1:  
1: -#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
1: +#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1)
1:  
1:  struct tc_rsvp_gpi {
1: -	__u32	key;
1: -	__u32	mask;
1: -	int	offset;
1: +  __u32 key;
1: +  __u32 mask;
1: +  int offset;
1:  };
1:  
1:  struct tc_rsvp_pinfo {
1: -	struct tc_rsvp_gpi dpi;
1: -	struct tc_rsvp_gpi spi;
1: -	__u8	protocol;
1: -	__u8	tunnelid;
1: -	__u8	tunnelhdr;
1: -	__u8	pad;
1: +  struct tc_rsvp_gpi dpi;
1: +  struct tc_rsvp_gpi spi;
1: +  __u8 protocol;
1: +  __u8 tunnelid;
1: +  __u8 tunnelhdr;
1: +  __u8 pad;
1:  };
1:  
1:  /* ROUTE filter */
1:  
1:  enum {
1: -	TCA_ROUTE4_UNSPEC,
1: -	TCA_ROUTE4_CLASSID,
1: -	TCA_ROUTE4_TO,
1: -	TCA_ROUTE4_FROM,
1: -	TCA_ROUTE4_IIF,
1: -	TCA_ROUTE4_POLICE,
1: -	TCA_ROUTE4_ACT,
1: -	__TCA_ROUTE4_MAX
1: +  TCA_ROUTE4_UNSPEC,
1: +  TCA_ROUTE4_CLASSID,
1: +  TCA_ROUTE4_TO,
1: +  TCA_ROUTE4_FROM,
1: +  TCA_ROUTE4_IIF,
1: +  TCA_ROUTE4_POLICE,
1: +  TCA_ROUTE4_ACT,
1: +  __TCA_ROUTE4_MAX
1:  };
1:  
1:  #define TCA_ROUTE4_MAX (__TCA_ROUTE4_MAX - 1)
1:  
1: -
1:  /* FW filter */
1:  
1:  enum {
1: -	TCA_FW_UNSPEC,
1: -	TCA_FW_CLASSID,
1: -	TCA_FW_POLICE,
1: -	TCA_FW_INDEV,
1: -	TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
1: -	TCA_FW_MASK,
1: -	__TCA_FW_MAX
1: +  TCA_FW_UNSPEC,
1: +  TCA_FW_CLASSID,
1: +  TCA_FW_POLICE,
1: +  TCA_FW_INDEV,
1: +  TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
1: +  TCA_FW_MASK,
1: +  __TCA_FW_MAX
1:  };
1:  
1:  #define TCA_FW_MAX (__TCA_FW_MAX - 1)
1: @@ -268,113 +267,112 @@ enum {
1:  /* TC index filter */
1:  
1:  enum {
1: -	TCA_TCINDEX_UNSPEC,
1: -	TCA_TCINDEX_HASH,
1: -	TCA_TCINDEX_MASK,
1: -	TCA_TCINDEX_SHIFT,
1: -	TCA_TCINDEX_FALL_THROUGH,
1: -	TCA_TCINDEX_CLASSID,
1: -	TCA_TCINDEX_POLICE,
1: -	TCA_TCINDEX_ACT,
1: -	__TCA_TCINDEX_MAX
1: +  TCA_TCINDEX_UNSPEC,
1: +  TCA_TCINDEX_HASH,
1: +  TCA_TCINDEX_MASK,
1: +  TCA_TCINDEX_SHIFT,
1: +  TCA_TCINDEX_FALL_THROUGH,
1: +  TCA_TCINDEX_CLASSID,
1: +  TCA_TCINDEX_POLICE,
1: +  TCA_TCINDEX_ACT,
1: +  __TCA_TCINDEX_MAX
1:  };
1:  
1: -#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)
1: +#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1)
1:  
1:  /* Flow filter */
1:  
1:  enum {
1: -	FLOW_KEY_SRC,
1: -	FLOW_KEY_DST,
1: -	FLOW_KEY_PROTO,
1: -	FLOW_KEY_PROTO_SRC,
1: -	FLOW_KEY_PROTO_DST,
1: -	FLOW_KEY_IIF,
1: -	FLOW_KEY_PRIORITY,
1: -	FLOW_KEY_MARK,
1: -	FLOW_KEY_NFCT,
1: -	FLOW_KEY_NFCT_SRC,
1: -	FLOW_KEY_NFCT_DST,
1: -	FLOW_KEY_NFCT_PROTO_SRC,
1: -	FLOW_KEY_NFCT_PROTO_DST,
1: -	FLOW_KEY_RTCLASSID,
1: -	FLOW_KEY_SKUID,
1: -	FLOW_KEY_SKGID,
1: -	FLOW_KEY_VLAN_TAG,
1: -	FLOW_KEY_RXHASH,
1: -	__FLOW_KEY_MAX,
1: -};
1: -
1: -#define FLOW_KEY_MAX	(__FLOW_KEY_MAX - 1)
1: +  FLOW_KEY_SRC,
1: +  FLOW_KEY_DST,
1: +  FLOW_KEY_PROTO,
1: +  FLOW_KEY_PROTO_SRC,
1: +  FLOW_KEY_PROTO_DST,
1: +  FLOW_KEY_IIF,
1: +  FLOW_KEY_PRIORITY,
1: +  FLOW_KEY_MARK,
1: +  FLOW_KEY_NFCT,
1: +  FLOW_KEY_NFCT_SRC,
1: +  FLOW_KEY_NFCT_DST,
1: +  FLOW_KEY_NFCT_PROTO_SRC,
1: +  FLOW_KEY_NFCT_PROTO_DST,
1: +  FLOW_KEY_RTCLASSID,
1: +  FLOW_KEY_SKUID,
1: +  FLOW_KEY_SKGID,
1: +  FLOW_KEY_VLAN_TAG,
1: +  FLOW_KEY_RXHASH,
1: +  __FLOW_KEY_MAX,
1: +};
1: +
1: +#define FLOW_KEY_MAX (__FLOW_KEY_MAX - 1)
1:  
1:  enum {
1: -	FLOW_MODE_MAP,
1: -	FLOW_MODE_HASH,
1: +  FLOW_MODE_MAP,
1: +  FLOW_MODE_HASH,
1:  };
1:  
1:  enum {
1: -	TCA_FLOW_UNSPEC,
1: -	TCA_FLOW_KEYS,
1: -	TCA_FLOW_MODE,
1: -	TCA_FLOW_BASECLASS,
1: -	TCA_FLOW_RSHIFT,
1: -	TCA_FLOW_ADDEND,
1: -	TCA_FLOW_MASK,
1: -	TCA_FLOW_XOR,
1: -	TCA_FLOW_DIVISOR,
1: -	TCA_FLOW_ACT,
1: -	TCA_FLOW_POLICE,
1: -	TCA_FLOW_EMATCHES,
1: -	TCA_FLOW_PERTURB,
1: -	__TCA_FLOW_MAX
1: -};
1: -
1: -#define TCA_FLOW_MAX	(__TCA_FLOW_MAX - 1)
1: +  TCA_FLOW_UNSPEC,
1: +  TCA_FLOW_KEYS,
1: +  TCA_FLOW_MODE,
1: +  TCA_FLOW_BASECLASS,
1: +  TCA_FLOW_RSHIFT,
1: +  TCA_FLOW_ADDEND,
1: +  TCA_FLOW_MASK,
1: +  TCA_FLOW_XOR,
1: +  TCA_FLOW_DIVISOR,
1: +  TCA_FLOW_ACT,
1: +  TCA_FLOW_POLICE,
1: +  TCA_FLOW_EMATCHES,
1: +  TCA_FLOW_PERTURB,
1: +  __TCA_FLOW_MAX
1: +};
1: +
1: +#define TCA_FLOW_MAX (__TCA_FLOW_MAX - 1)
1:  
1:  /* Basic filter */
1:  
1:  enum {
1: -	TCA_BASIC_UNSPEC,
1: -	TCA_BASIC_CLASSID,
1: -	TCA_BASIC_EMATCHES,
1: -	TCA_BASIC_ACT,
1: -	TCA_BASIC_POLICE,
1: -	__TCA_BASIC_MAX
1: +  TCA_BASIC_UNSPEC,
1: +  TCA_BASIC_CLASSID,
1: +  TCA_BASIC_EMATCHES,
1: +  TCA_BASIC_ACT,
1: +  TCA_BASIC_POLICE,
1: +  __TCA_BASIC_MAX
1:  };
1:  
1:  #define TCA_BASIC_MAX (__TCA_BASIC_MAX - 1)
1:  
1: -
1:  /* Cgroup classifier */
1:  
1:  enum {
1: -	TCA_CGROUP_UNSPEC,
1: -	TCA_CGROUP_ACT,
1: -	TCA_CGROUP_POLICE,
1: -	TCA_CGROUP_EMATCHES,
1: -	__TCA_CGROUP_MAX,
1: +  TCA_CGROUP_UNSPEC,
1: +  TCA_CGROUP_ACT,
1: +  TCA_CGROUP_POLICE,
1: +  TCA_CGROUP_EMATCHES,
1: +  __TCA_CGROUP_MAX,
1:  };
1:  
1:  #define TCA_CGROUP_MAX (__TCA_CGROUP_MAX - 1)
1:  
1:  /* BPF classifier */
1:  
1: -#define TCA_BPF_FLAG_ACT_DIRECT		(1 << 0)
1: +#define TCA_BPF_FLAG_ACT_DIRECT (1 << 0)
1:  
1:  enum {
1: -	TCA_BPF_UNSPEC,
1: -	TCA_BPF_ACT,
1: -	TCA_BPF_POLICE,
1: -	TCA_BPF_CLASSID,
1: -	TCA_BPF_OPS_LEN,
1: -	TCA_BPF_OPS,
1: -	TCA_BPF_FD,
1: -	TCA_BPF_NAME,
1: -	TCA_BPF_FLAGS,
1: -	TCA_BPF_FLAGS_GEN,
1: -	TCA_BPF_TAG,
1: -	TCA_BPF_ID,
1: -	__TCA_BPF_MAX,
1: +  TCA_BPF_UNSPEC,
1: +  TCA_BPF_ACT,
1: +  TCA_BPF_POLICE,
1: +  TCA_BPF_CLASSID,
1: +  TCA_BPF_OPS_LEN,
1: +  TCA_BPF_OPS,
1: +  TCA_BPF_FD,
1: +  TCA_BPF_NAME,
1: +  TCA_BPF_FLAGS,
1: +  TCA_BPF_FLAGS_GEN,
1: +  TCA_BPF_TAG,
1: +  TCA_BPF_ID,
1: +  __TCA_BPF_MAX,
1:  };
1:  
1:  #define TCA_BPF_MAX (__TCA_BPF_MAX - 1)
1: @@ -382,150 +380,150 @@ enum {
1:  /* Flower classifier */
1:  
1:  enum {
1: -	TCA_FLOWER_UNSPEC,
1: -	TCA_FLOWER_CLASSID,
1: -	TCA_FLOWER_INDEV,
1: -	TCA_FLOWER_ACT,
1: -	TCA_FLOWER_KEY_ETH_DST,		/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ETH_DST_MASK,	/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ETH_SRC,		/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ETH_SRC_MASK,	/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ETH_TYPE,	/* be16 */
1: -	TCA_FLOWER_KEY_IP_PROTO,	/* u8 */
1: -	TCA_FLOWER_KEY_IPV4_SRC,	/* be32 */
1: -	TCA_FLOWER_KEY_IPV4_SRC_MASK,	/* be32 */
1: -	TCA_FLOWER_KEY_IPV4_DST,	/* be32 */
1: -	TCA_FLOWER_KEY_IPV4_DST_MASK,	/* be32 */
1: -	TCA_FLOWER_KEY_IPV6_SRC,	/* struct in6_addr */
1: -	TCA_FLOWER_KEY_IPV6_SRC_MASK,	/* struct in6_addr */
1: -	TCA_FLOWER_KEY_IPV6_DST,	/* struct in6_addr */
1: -	TCA_FLOWER_KEY_IPV6_DST_MASK,	/* struct in6_addr */
1: -	TCA_FLOWER_KEY_TCP_SRC,		/* be16 */
1: -	TCA_FLOWER_KEY_TCP_DST,		/* be16 */
1: -	TCA_FLOWER_KEY_UDP_SRC,		/* be16 */
1: -	TCA_FLOWER_KEY_UDP_DST,		/* be16 */
1: -
1: -	TCA_FLOWER_FLAGS,
1: -	TCA_FLOWER_KEY_VLAN_ID,		/* be16 */
1: -	TCA_FLOWER_KEY_VLAN_PRIO,	/* u8   */
1: -	TCA_FLOWER_KEY_VLAN_ETH_TYPE,	/* be16 */
1: -
1: -	TCA_FLOWER_KEY_ENC_KEY_ID,	/* be32 */
1: -	TCA_FLOWER_KEY_ENC_IPV4_SRC,	/* be32 */
1: -	TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK,/* be32 */
1: -	TCA_FLOWER_KEY_ENC_IPV4_DST,	/* be32 */
1: -	TCA_FLOWER_KEY_ENC_IPV4_DST_MASK,/* be32 */
1: -	TCA_FLOWER_KEY_ENC_IPV6_SRC,	/* struct in6_addr */
1: -	TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK,/* struct in6_addr */
1: -	TCA_FLOWER_KEY_ENC_IPV6_DST,	/* struct in6_addr */
1: -	TCA_FLOWER_KEY_ENC_IPV6_DST_MASK,/* struct in6_addr */
1: -
1: -	TCA_FLOWER_KEY_TCP_SRC_MASK,	/* be16 */
1: -	TCA_FLOWER_KEY_TCP_DST_MASK,	/* be16 */
1: -	TCA_FLOWER_KEY_UDP_SRC_MASK,	/* be16 */
1: -	TCA_FLOWER_KEY_UDP_DST_MASK,	/* be16 */
1: -	TCA_FLOWER_KEY_SCTP_SRC_MASK,	/* be16 */
1: -	TCA_FLOWER_KEY_SCTP_DST_MASK,	/* be16 */
1: -
1: -	TCA_FLOWER_KEY_SCTP_SRC,	/* be16 */
1: -	TCA_FLOWER_KEY_SCTP_DST,	/* be16 */
1: -
1: -	TCA_FLOWER_KEY_ENC_UDP_SRC_PORT,	/* be16 */
1: -	TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK,	/* be16 */
1: -	TCA_FLOWER_KEY_ENC_UDP_DST_PORT,	/* be16 */
1: -	TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK,	/* be16 */
1: -
1: -	TCA_FLOWER_KEY_FLAGS,		/* be32 */
1: -	TCA_FLOWER_KEY_FLAGS_MASK,	/* be32 */
1: -
1: -	TCA_FLOWER_KEY_ICMPV4_CODE,	/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV4_CODE_MASK,/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV4_TYPE,	/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV4_TYPE_MASK,/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV6_CODE,	/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV6_CODE_MASK,/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV6_TYPE,	/* u8 */
1: -	TCA_FLOWER_KEY_ICMPV6_TYPE_MASK,/* u8 */
1: -
1: -	TCA_FLOWER_KEY_ARP_SIP,		/* be32 */
1: -	TCA_FLOWER_KEY_ARP_SIP_MASK,	/* be32 */
1: -	TCA_FLOWER_KEY_ARP_TIP,		/* be32 */
1: -	TCA_FLOWER_KEY_ARP_TIP_MASK,	/* be32 */
1: -	TCA_FLOWER_KEY_ARP_OP,		/* u8 */
1: -	TCA_FLOWER_KEY_ARP_OP_MASK,	/* u8 */
1: -	TCA_FLOWER_KEY_ARP_SHA,		/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ARP_SHA_MASK,	/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ARP_THA,		/* ETH_ALEN */
1: -	TCA_FLOWER_KEY_ARP_THA_MASK,	/* ETH_ALEN */
1: -
1: -	TCA_FLOWER_KEY_MPLS_TTL,	/* u8 - 8 bits */
1: -	TCA_FLOWER_KEY_MPLS_BOS,	/* u8 - 1 bit */
1: -	TCA_FLOWER_KEY_MPLS_TC,		/* u8 - 3 bits */
1: -	TCA_FLOWER_KEY_MPLS_LABEL,	/* be32 - 20 bits */
1: -
1: -	TCA_FLOWER_KEY_TCP_FLAGS,	/* be16 */
1: -	TCA_FLOWER_KEY_TCP_FLAGS_MASK,	/* be16 */
1: -
1: -	TCA_FLOWER_KEY_IP_TOS,		/* u8 */
1: -	TCA_FLOWER_KEY_IP_TOS_MASK,	/* u8 */
1: -	TCA_FLOWER_KEY_IP_TTL,		/* u8 */
1: -	TCA_FLOWER_KEY_IP_TTL_MASK,	/* u8 */
1: -
1: -	TCA_FLOWER_KEY_CVLAN_ID,	/* be16 */
1: -	TCA_FLOWER_KEY_CVLAN_PRIO,	/* u8   */
1: -	TCA_FLOWER_KEY_CVLAN_ETH_TYPE,	/* be16 */
1: -
1: -	TCA_FLOWER_KEY_ENC_IP_TOS,	/* u8 */
1: -	TCA_FLOWER_KEY_ENC_IP_TOS_MASK,	/* u8 */
1: -	TCA_FLOWER_KEY_ENC_IP_TTL,	/* u8 */
1: -	TCA_FLOWER_KEY_ENC_IP_TTL_MASK,	/* u8 */
1: -
1: -	TCA_FLOWER_KEY_ENC_OPTS,
1: -	TCA_FLOWER_KEY_ENC_OPTS_MASK,
1: -
1: -	TCA_FLOWER_IN_HW_COUNT,
1: -
1: -	__TCA_FLOWER_MAX,
1: +  TCA_FLOWER_UNSPEC,
1: +  TCA_FLOWER_CLASSID,
1: +  TCA_FLOWER_INDEV,
1: +  TCA_FLOWER_ACT,
1: +  TCA_FLOWER_KEY_ETH_DST,       /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ETH_DST_MASK,  /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ETH_SRC,       /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ETH_SRC_MASK,  /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ETH_TYPE,      /* be16 */
1: +  TCA_FLOWER_KEY_IP_PROTO,      /* u8 */
1: +  TCA_FLOWER_KEY_IPV4_SRC,      /* be32 */
1: +  TCA_FLOWER_KEY_IPV4_SRC_MASK, /* be32 */
1: +  TCA_FLOWER_KEY_IPV4_DST,      /* be32 */
1: +  TCA_FLOWER_KEY_IPV4_DST_MASK, /* be32 */
1: +  TCA_FLOWER_KEY_IPV6_SRC,      /* struct in6_addr */
1: +  TCA_FLOWER_KEY_IPV6_SRC_MASK, /* struct in6_addr */
1: +  TCA_FLOWER_KEY_IPV6_DST,      /* struct in6_addr */
1: +  TCA_FLOWER_KEY_IPV6_DST_MASK, /* struct in6_addr */
1: +  TCA_FLOWER_KEY_TCP_SRC,       /* be16 */
1: +  TCA_FLOWER_KEY_TCP_DST,       /* be16 */
1: +  TCA_FLOWER_KEY_UDP_SRC,       /* be16 */
1: +  TCA_FLOWER_KEY_UDP_DST,       /* be16 */
1: +
1: +  TCA_FLOWER_FLAGS,
1: +  TCA_FLOWER_KEY_VLAN_ID,       /* be16 */
1: +  TCA_FLOWER_KEY_VLAN_PRIO,     /* u8   */
1: +  TCA_FLOWER_KEY_VLAN_ETH_TYPE, /* be16 */
1: +
1: +  TCA_FLOWER_KEY_ENC_KEY_ID,        /* be32 */
1: +  TCA_FLOWER_KEY_ENC_IPV4_SRC,      /* be32 */
1: +  TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK, /* be32 */
1: +  TCA_FLOWER_KEY_ENC_IPV4_DST,      /* be32 */
1: +  TCA_FLOWER_KEY_ENC_IPV4_DST_MASK, /* be32 */
1: +  TCA_FLOWER_KEY_ENC_IPV6_SRC,      /* struct in6_addr */
1: +  TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK, /* struct in6_addr */
1: +  TCA_FLOWER_KEY_ENC_IPV6_DST,      /* struct in6_addr */
1: +  TCA_FLOWER_KEY_ENC_IPV6_DST_MASK, /* struct in6_addr */
1: +
1: +  TCA_FLOWER_KEY_TCP_SRC_MASK,  /* be16 */
1: +  TCA_FLOWER_KEY_TCP_DST_MASK,  /* be16 */
1: +  TCA_FLOWER_KEY_UDP_SRC_MASK,  /* be16 */
1: +  TCA_FLOWER_KEY_UDP_DST_MASK,  /* be16 */
1: +  TCA_FLOWER_KEY_SCTP_SRC_MASK, /* be16 */
1: +  TCA_FLOWER_KEY_SCTP_DST_MASK, /* be16 */
1: +
1: +  TCA_FLOWER_KEY_SCTP_SRC, /* be16 */
1: +  TCA_FLOWER_KEY_SCTP_DST, /* be16 */
1: +
1: +  TCA_FLOWER_KEY_ENC_UDP_SRC_PORT,      /* be16 */
1: +  TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK, /* be16 */
1: +  TCA_FLOWER_KEY_ENC_UDP_DST_PORT,      /* be16 */
1: +  TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK, /* be16 */
1: +
1: +  TCA_FLOWER_KEY_FLAGS,      /* be32 */
1: +  TCA_FLOWER_KEY_FLAGS_MASK, /* be32 */
1: +
1: +  TCA_FLOWER_KEY_ICMPV4_CODE,      /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV4_CODE_MASK, /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV4_TYPE,      /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV4_TYPE_MASK, /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV6_CODE,      /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV6_CODE_MASK, /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV6_TYPE,      /* u8 */
1: +  TCA_FLOWER_KEY_ICMPV6_TYPE_MASK, /* u8 */
1: +
1: +  TCA_FLOWER_KEY_ARP_SIP,      /* be32 */
1: +  TCA_FLOWER_KEY_ARP_SIP_MASK, /* be32 */
1: +  TCA_FLOWER_KEY_ARP_TIP,      /* be32 */
1: +  TCA_FLOWER_KEY_ARP_TIP_MASK, /* be32 */
1: +  TCA_FLOWER_KEY_ARP_OP,       /* u8 */
1: +  TCA_FLOWER_KEY_ARP_OP_MASK,  /* u8 */
1: +  TCA_FLOWER_KEY_ARP_SHA,      /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ARP_SHA_MASK, /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ARP_THA,      /* ETH_ALEN */
1: +  TCA_FLOWER_KEY_ARP_THA_MASK, /* ETH_ALEN */
1: +
1: +  TCA_FLOWER_KEY_MPLS_TTL,   /* u8 - 8 bits */
1: +  TCA_FLOWER_KEY_MPLS_BOS,   /* u8 - 1 bit */
1: +  TCA_FLOWER_KEY_MPLS_TC,    /* u8 - 3 bits */
1: +  TCA_FLOWER_KEY_MPLS_LABEL, /* be32 - 20 bits */
1: +
1: +  TCA_FLOWER_KEY_TCP_FLAGS,      /* be16 */
1: +  TCA_FLOWER_KEY_TCP_FLAGS_MASK, /* be16 */
1: +
1: +  TCA_FLOWER_KEY_IP_TOS,      /* u8 */
1: +  TCA_FLOWER_KEY_IP_TOS_MASK, /* u8 */
1: +  TCA_FLOWER_KEY_IP_TTL,      /* u8 */
1: +  TCA_FLOWER_KEY_IP_TTL_MASK, /* u8 */
1: +
1: +  TCA_FLOWER_KEY_CVLAN_ID,       /* be16 */
1: +  TCA_FLOWER_KEY_CVLAN_PRIO,     /* u8   */
1: +  TCA_FLOWER_KEY_CVLAN_ETH_TYPE, /* be16 */
1: +
1: +  TCA_FLOWER_KEY_ENC_IP_TOS,      /* u8 */
1: +  TCA_FLOWER_KEY_ENC_IP_TOS_MASK, /* u8 */
1: +  TCA_FLOWER_KEY_ENC_IP_TTL,      /* u8 */
1: +  TCA_FLOWER_KEY_ENC_IP_TTL_MASK, /* u8 */
1: +
1: +  TCA_FLOWER_KEY_ENC_OPTS,
1: +  TCA_FLOWER_KEY_ENC_OPTS_MASK,
1: +
1: +  TCA_FLOWER_IN_HW_COUNT,
1: +
1: +  __TCA_FLOWER_MAX,
1:  };
1:  
1:  #define TCA_FLOWER_MAX (__TCA_FLOWER_MAX - 1)
1:  
1:  enum {
1: -	TCA_FLOWER_KEY_ENC_OPTS_UNSPEC,
1: -	TCA_FLOWER_KEY_ENC_OPTS_GENEVE, /* Nested
1: -					 * TCA_FLOWER_KEY_ENC_OPT_GENEVE_
1: -					 * attributes
1: -					 */
1: -	__TCA_FLOWER_KEY_ENC_OPTS_MAX,
1: +  TCA_FLOWER_KEY_ENC_OPTS_UNSPEC,
1: +  TCA_FLOWER_KEY_ENC_OPTS_GENEVE, /* Nested
1: +                                   * TCA_FLOWER_KEY_ENC_OPT_GENEVE_
1: +                                   * attributes
1: +                                   */
1: +  __TCA_FLOWER_KEY_ENC_OPTS_MAX,
1:  };
1:  
1:  #define TCA_FLOWER_KEY_ENC_OPTS_MAX (__TCA_FLOWER_KEY_ENC_OPTS_MAX - 1)
1:  
1:  enum {
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_UNSPEC,
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS,            /* u16 */
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE,             /* u8 */
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA,             /* 4 to 128 bytes */
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_UNSPEC,
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS, /* u16 */
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE,  /* u8 */
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA,  /* 4 to 128 bytes */
1:  
1: -	__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX,
1: +  __TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX,
1:  };
1:  
1:  #define TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX \
1: -		(__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX - 1)
1: +  (__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX - 1)
1:  
1:  enum {
1: -	TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),
1: -	TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),
1: +  TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),
1: +  TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),
1:  };
1:  
1:  /* Match-all classifier */
1:  
1:  enum {
1: -	TCA_MATCHALL_UNSPEC,
1: -	TCA_MATCHALL_CLASSID,
1: -	TCA_MATCHALL_ACT,
1: -	TCA_MATCHALL_FLAGS,
1: -	__TCA_MATCHALL_MAX,
1: +  TCA_MATCHALL_UNSPEC,
1: +  TCA_MATCHALL_CLASSID,
1: +  TCA_MATCHALL_ACT,
1: +  TCA_MATCHALL_FLAGS,
1: +  __TCA_MATCHALL_MAX,
1:  };
1:  
1:  #define TCA_MATCHALL_MAX (__TCA_MATCHALL_MAX - 1)
1: @@ -533,27 +531,27 @@ enum {
1:  /* Extended Matches */
1:  
1:  struct tcf_ematch_tree_hdr {
1: -	__u16		nmatches;
1: -	__u16		progid;
1: +  __u16 nmatches;
1: +  __u16 progid;
1:  };
1:  
1:  enum {
1: -	TCA_EMATCH_TREE_UNSPEC,
1: -	TCA_EMATCH_TREE_HDR,
1: -	TCA_EMATCH_TREE_LIST,
1: -	__TCA_EMATCH_TREE_MAX
1: +  TCA_EMATCH_TREE_UNSPEC,
1: +  TCA_EMATCH_TREE_HDR,
1: +  TCA_EMATCH_TREE_LIST,
1: +  __TCA_EMATCH_TREE_MAX
1:  };
1:  #define TCA_EMATCH_TREE_MAX (__TCA_EMATCH_TREE_MAX - 1)
1:  
1:  struct tcf_ematch_hdr {
1: -	__u16		matchid;
1: -	__u16		kind;
1: -	__u16		flags;
1: -	__u16		pad; /* currently unused */
1: +  __u16 matchid;
1: +  __u16 kind;
1: +  __u16 flags;
1: +  __u16 pad; /* currently unused */
1:  };
1:  
1:  /*  0                   1
1: - *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 
1: + *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
1:   * +-----------------------+-+-+---+
1:   * |         Unused        |S|I| R |
1:   * +-----------------------+-+-+---+
1: @@ -566,20 +564,20 @@ struct tcf_ematch_hdr {
1:   * I(1) ::= invert result
1:   * S(1) ::= simple payload
1:   */
1: -#define TCF_EM_REL_END	0
1: -#define TCF_EM_REL_AND	(1<<0)
1: -#define TCF_EM_REL_OR	(1<<1)
1: -#define TCF_EM_INVERT	(1<<2)
1: -#define TCF_EM_SIMPLE	(1<<3)
1: +#define TCF_EM_REL_END 0
1: +#define TCF_EM_REL_AND (1 << 0)
1: +#define TCF_EM_REL_OR (1 << 1)
1: +#define TCF_EM_INVERT (1 << 2)
1: +#define TCF_EM_SIMPLE (1 << 3)
1:  
1: -#define TCF_EM_REL_MASK	3
1: -#define TCF_EM_REL_VALID(v) (((v) & TCF_EM_REL_MASK) != TCF_EM_REL_MASK)
1: +#define TCF_EM_REL_MASK 3
1: +#define TCF_EM_REL_VALID(v) (((v)&TCF_EM_REL_MASK) != TCF_EM_REL_MASK)
1:  
1:  enum {
1: -	TCF_LAYER_LINK,
1: -	TCF_LAYER_NETWORK,
1: -	TCF_LAYER_TRANSPORT,
1: -	__TCF_LAYER_MAX
1: +  TCF_LAYER_LINK,
1: +  TCF_LAYER_NETWORK,
1: +  TCF_LAYER_TRANSPORT,
1: +  __TCF_LAYER_MAX
1:  };
1:  #define TCF_LAYER_MAX (__TCF_LAYER_MAX - 1)
1:  
1: @@ -587,26 +585,20 @@ enum {
1:   *   1..32767		Reserved for ematches inside kernel tree
1:   *   32768..65535	Free to use, not reliable
1:   */
1: -#define	TCF_EM_CONTAINER	0
1: -#define	TCF_EM_CMP		1
1: -#define	TCF_EM_NBYTE		2
1: -#define	TCF_EM_U32		3
1: -#define	TCF_EM_META		4
1: -#define	TCF_EM_TEXT		5
1: -#define	TCF_EM_VLAN		6
1: -#define	TCF_EM_CANID		7
1: -#define	TCF_EM_IPSET		8
1: -#define	TCF_EM_IPT		9
1: -#define	TCF_EM_MAX		9
1: -
1: -enum {
1: -	TCF_EM_PROG_TC
1: -};
1: -
1: -enum {
1: -	TCF_EM_OPND_EQ,
1: -	TCF_EM_OPND_GT,
1: -	TCF_EM_OPND_LT
1: -};
1: +#define TCF_EM_CONTAINER 0
1: +#define TCF_EM_CMP 1
1: +#define TCF_EM_NBYTE 2
1: +#define TCF_EM_U32 3
1: +#define TCF_EM_META 4
1: +#define TCF_EM_TEXT 5
1: +#define TCF_EM_VLAN 6
1: +#define TCF_EM_CANID 7
1: +#define TCF_EM_IPSET 8
1: +#define TCF_EM_IPT 9
1: +#define TCF_EM_MAX 9
1: +
1: +enum { TCF_EM_PROG_TC };
1: +
1: +enum { TCF_EM_OPND_EQ, TCF_EM_OPND_GT, TCF_EM_OPND_LT };
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/include/uapi/linux/pkt_sched.h b/src/cc/libbpf/include/uapi/linux/pkt_sched.h
1: index 5c903abc..e9a814a3 100644
1: --- a/src/cc/libbpf/include/uapi/linux/pkt_sched.h
1: +++ b/src/cc/libbpf/include/uapi/linux/pkt_sched.h
1: @@ -17,34 +17,34 @@
1:     filler or even bulk.
1:   */
1:  
1: -#define TC_PRIO_BESTEFFORT		0
1: -#define TC_PRIO_FILLER			1
1: -#define TC_PRIO_BULK			2
1: -#define TC_PRIO_INTERACTIVE_BULK	4
1: -#define TC_PRIO_INTERACTIVE		6
1: -#define TC_PRIO_CONTROL			7
1: +#define TC_PRIO_BESTEFFORT 0
1: +#define TC_PRIO_FILLER 1
1: +#define TC_PRIO_BULK 2
1: +#define TC_PRIO_INTERACTIVE_BULK 4
1: +#define TC_PRIO_INTERACTIVE 6
1: +#define TC_PRIO_CONTROL 7
1:  
1: -#define TC_PRIO_MAX			15
1: +#define TC_PRIO_MAX 15
1:  
1:  /* Generic queue statistics, available for all the elements.
1:     Particular schedulers may have also their private records.
1:   */
1:  
1:  struct tc_stats {
1: -	__u64	bytes;			/* Number of enqueued bytes */
1: -	__u32	packets;		/* Number of enqueued packets	*/
1: -	__u32	drops;			/* Packets dropped because of lack of resources */
1: -	__u32	overlimits;		/* Number of throttle events when this
1: -					 * flow goes out of allocated bandwidth */
1: -	__u32	bps;			/* Current flow byte rate */
1: -	__u32	pps;			/* Current flow packet rate */
1: -	__u32	qlen;
1: -	__u32	backlog;
1: +  __u64 bytes;      /* Number of enqueued bytes */
1: +  __u32 packets;    /* Number of enqueued packets	*/
1: +  __u32 drops;      /* Packets dropped because of lack of resources */
1: +  __u32 overlimits; /* Number of throttle events when this
1: +                     * flow goes out of allocated bandwidth */
1: +  __u32 bps;        /* Current flow byte rate */
1: +  __u32 pps;        /* Current flow packet rate */
1: +  __u32 qlen;
1: +  __u32 backlog;
1:  };
1:  
1:  struct tc_estimator {
1: -	signed char	interval;
1: -	unsigned char	ewma_log;
1: +  signed char interval;
1: +  unsigned char ewma_log;
1:  };
1:  
1:  /* "Handles"
1: @@ -68,60 +68,55 @@ struct tc_estimator {
1:  #define TC_H_MIN_MASK (0x0000FFFFU)
1:  #define TC_H_MAJ(h) ((h)&TC_H_MAJ_MASK)
1:  #define TC_H_MIN(h) ((h)&TC_H_MIN_MASK)
1: -#define TC_H_MAKE(maj,min) (((maj)&TC_H_MAJ_MASK)|((min)&TC_H_MIN_MASK))
1: +#define TC_H_MAKE(maj, min) (((maj)&TC_H_MAJ_MASK) | ((min)&TC_H_MIN_MASK))
1:  
1: -#define TC_H_UNSPEC	(0U)
1: -#define TC_H_ROOT	(0xFFFFFFFFU)
1: -#define TC_H_INGRESS    (0xFFFFFFF1U)
1: -#define TC_H_CLSACT	TC_H_INGRESS
1: +#define TC_H_UNSPEC (0U)
1: +#define TC_H_ROOT (0xFFFFFFFFU)
1: +#define TC_H_INGRESS (0xFFFFFFF1U)
1: +#define TC_H_CLSACT TC_H_INGRESS
1:  
1: -#define TC_H_MIN_PRIORITY	0xFFE0U
1: -#define TC_H_MIN_INGRESS	0xFFF2U
1: -#define TC_H_MIN_EGRESS		0xFFF3U
1: +#define TC_H_MIN_PRIORITY 0xFFE0U
1: +#define TC_H_MIN_INGRESS 0xFFF2U
1: +#define TC_H_MIN_EGRESS 0xFFF3U
1:  
1:  /* Need to corrospond to iproute2 tc/tc_core.h "enum link_layer" */
1:  enum tc_link_layer {
1: -	TC_LINKLAYER_UNAWARE, /* Indicate unaware old iproute2 util */
1: -	TC_LINKLAYER_ETHERNET,
1: -	TC_LINKLAYER_ATM,
1: +  TC_LINKLAYER_UNAWARE, /* Indicate unaware old iproute2 util */
1: +  TC_LINKLAYER_ETHERNET,
1: +  TC_LINKLAYER_ATM,
1:  };
1:  #define TC_LINKLAYER_MASK 0x0F /* limit use to lower 4 bits */
1:  
1:  struct tc_ratespec {
1: -	unsigned char	cell_log;
1: -	__u8		linklayer; /* lower 4 bits */
1: -	unsigned short	overhead;
1: -	short		cell_align;
1: -	unsigned short	mpu;
1: -	__u32		rate;
1: +  unsigned char cell_log;
1: +  __u8 linklayer; /* lower 4 bits */
1: +  unsigned short overhead;
1: +  short cell_align;
1: +  unsigned short mpu;
1: +  __u32 rate;
1:  };
1:  
1: -#define TC_RTAB_SIZE	1024
1: +#define TC_RTAB_SIZE 1024
1:  
1:  struct tc_sizespec {
1: -	unsigned char	cell_log;
1: -	unsigned char	size_log;
1: -	short		cell_align;
1: -	int		overhead;
1: -	unsigned int	linklayer;
1: -	unsigned int	mpu;
1: -	unsigned int	mtu;
1: -	unsigned int	tsize;
1: +  unsigned char cell_log;
1: +  unsigned char size_log;
1: +  short cell_align;
1: +  int overhead;
1: +  unsigned int linklayer;
1: +  unsigned int mpu;
1: +  unsigned int mtu;
1: +  unsigned int tsize;
1:  };
1:  
1: -enum {
1: -	TCA_STAB_UNSPEC,
1: -	TCA_STAB_BASE,
1: -	TCA_STAB_DATA,
1: -	__TCA_STAB_MAX
1: -};
1: +enum { TCA_STAB_UNSPEC, TCA_STAB_BASE, TCA_STAB_DATA, __TCA_STAB_MAX };
1:  
1:  #define TCA_STAB_MAX (__TCA_STAB_MAX - 1)
1:  
1:  /* FIFO section */
1:  
1:  struct tc_fifo_qopt {
1: -	__u32	limit;	/* Queue length: bytes for bfifo, packets for pfifo */
1: +  __u32 limit; /* Queue length: bytes for bfifo, packets for pfifo */
1:  };
1:  
1:  /* SKBPRIO section */
1: @@ -136,73 +131,72 @@ struct tc_fifo_qopt {
1:  #define SKBPRIO_MAX_PRIORITY 64
1:  
1:  struct tc_skbprio_qopt {
1: -	__u32	limit;		/* Queue length in packets. */
1: +  __u32 limit; /* Queue length in packets. */
1:  };
1:  
1:  /* PRIO section */
1:  
1: -#define TCQ_PRIO_BANDS	16
1: +#define TCQ_PRIO_BANDS 16
1:  #define TCQ_MIN_PRIO_BANDS 2
1:  
1:  struct tc_prio_qopt {
1: -	int	bands;			/* Number of bands */
1: -	__u8	priomap[TC_PRIO_MAX+1];	/* Map: logical priority -> PRIO band */
1: +  int bands;                     /* Number of bands */
1: +  __u8 priomap[TC_PRIO_MAX + 1]; /* Map: logical priority -> PRIO band */
1:  };
1:  
1:  /* MULTIQ section */
1:  
1:  struct tc_multiq_qopt {
1: -	__u16	bands;			/* Number of bands */
1: -	__u16	max_bands;		/* Maximum number of queues */
1: +  __u16 bands;     /* Number of bands */
1: +  __u16 max_bands; /* Maximum number of queues */
1:  };
1:  
1:  /* PLUG section */
1:  
1: -#define TCQ_PLUG_BUFFER                0
1: -#define TCQ_PLUG_RELEASE_ONE           1
1: -#define TCQ_PLUG_RELEASE_INDEFINITE    2
1: -#define TCQ_PLUG_LIMIT                 3
1: +#define TCQ_PLUG_BUFFER 0
1: +#define TCQ_PLUG_RELEASE_ONE 1
1: +#define TCQ_PLUG_RELEASE_INDEFINITE 2
1: +#define TCQ_PLUG_LIMIT 3
1:  
1:  struct tc_plug_qopt {
1: -	/* TCQ_PLUG_BUFFER: Inset a plug into the queue and
1: -	 *  buffer any incoming packets
1: -	 * TCQ_PLUG_RELEASE_ONE: Dequeue packets from queue head
1: -	 *   to beginning of the next plug.
1: -	 * TCQ_PLUG_RELEASE_INDEFINITE: Dequeue all packets from queue.
1: -	 *   Stop buffering packets until the next TCQ_PLUG_BUFFER
1: -	 *   command is received (just act as a pass-thru queue).
1: -	 * TCQ_PLUG_LIMIT: Increase/decrease queue size
1: -	 */
1: -	int             action;
1: -	__u32           limit;
1: +  /* TCQ_PLUG_BUFFER: Inset a plug into the queue and
1: +   *  buffer any incoming packets
1: +   * TCQ_PLUG_RELEASE_ONE: Dequeue packets from queue head
1: +   *   to beginning of the next plug.
1: +   * TCQ_PLUG_RELEASE_INDEFINITE: Dequeue all packets from queue.
1: +   *   Stop buffering packets until the next TCQ_PLUG_BUFFER
1: +   *   command is received (just act as a pass-thru queue).
1: +   * TCQ_PLUG_LIMIT: Increase/decrease queue size
1: +   */
1: +  int action;
1: +  __u32 limit;
1:  };
1:  
1:  /* TBF section */
1:  
1:  struct tc_tbf_qopt {
1: -	struct tc_ratespec rate;
1: -	struct tc_ratespec peakrate;
1: -	__u32		limit;
1: -	__u32		buffer;
1: -	__u32		mtu;
1: +  struct tc_ratespec rate;
1: +  struct tc_ratespec peakrate;
1: +  __u32 limit;
1: +  __u32 buffer;
1: +  __u32 mtu;
1:  };
1:  
1:  enum {
1: -	TCA_TBF_UNSPEC,
1: -	TCA_TBF_PARMS,
1: -	TCA_TBF_RTAB,
1: -	TCA_TBF_PTAB,
1: -	TCA_TBF_RATE64,
1: -	TCA_TBF_PRATE64,
1: -	TCA_TBF_BURST,
1: -	TCA_TBF_PBURST,
1: -	TCA_TBF_PAD,
1: -	__TCA_TBF_MAX,
1: +  TCA_TBF_UNSPEC,
1: +  TCA_TBF_PARMS,
1: +  TCA_TBF_RTAB,
1: +  TCA_TBF_PTAB,
1: +  TCA_TBF_RATE64,
1: +  TCA_TBF_PRATE64,
1: +  TCA_TBF_BURST,
1: +  TCA_TBF_PBURST,
1: +  TCA_TBF_PAD,
1: +  __TCA_TBF_MAX,
1:  };
1:  
1:  #define TCA_TBF_MAX (__TCA_TBF_MAX - 1)
1:  
1: -
1:  /* TEQL section */
1:  
1:  /* TEQL does not require any parameters */
1: @@ -210,74 +204,73 @@ enum {
1:  /* SFQ section */
1:  
1:  struct tc_sfq_qopt {
1: -	unsigned	quantum;	/* Bytes per round allocated to flow */
1: -	int		perturb_period;	/* Period of hash perturbation */
1: -	__u32		limit;		/* Maximal packets in queue */
1: -	unsigned	divisor;	/* Hash divisor  */
1: -	unsigned	flows;		/* Maximal number of flows  */
1: +  unsigned quantum;   /* Bytes per round allocated to flow */
1: +  int perturb_period; /* Period of hash perturbation */
1: +  __u32 limit;        /* Maximal packets in queue */
1: +  unsigned divisor;   /* Hash divisor  */
1: +  unsigned flows;     /* Maximal number of flows  */
1:  };
1:  
1:  struct tc_sfqred_stats {
1: -	__u32           prob_drop;      /* Early drops, below max threshold */
1: -	__u32           forced_drop;	/* Early drops, after max threshold */
1: -	__u32           prob_mark;      /* Marked packets, below max threshold */
1: -	__u32           forced_mark;    /* Marked packets, after max threshold */
1: -	__u32           prob_mark_head; /* Marked packets, below max threshold */
1: -	__u32           forced_mark_head;/* Marked packets, after max threshold */
1: +  __u32 prob_drop;        /* Early drops, below max threshold */
1: +  __u32 forced_drop;      /* Early drops, after max threshold */
1: +  __u32 prob_mark;        /* Marked packets, below max threshold */
1: +  __u32 forced_mark;      /* Marked packets, after max threshold */
1: +  __u32 prob_mark_head;   /* Marked packets, below max threshold */
1: +  __u32 forced_mark_head; /* Marked packets, after max threshold */
1:  };
1:  
1:  struct tc_sfq_qopt_v1 {
1: -	struct tc_sfq_qopt v0;
1: -	unsigned int	depth;		/* max number of packets per flow */
1: -	unsigned int	headdrop;
1: -/* SFQRED parameters */
1: -	__u32		limit;		/* HARD maximal flow queue length (bytes) */
1: -	__u32		qth_min;	/* Min average length threshold (bytes) */
1: -	__u32		qth_max;	/* Max average length threshold (bytes) */
1: -	unsigned char   Wlog;		/* log(W)		*/
1: -	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
1: -	unsigned char   Scell_log;	/* cell size for idle damping */
1: -	unsigned char	flags;
1: -	__u32		max_P;		/* probability, high resolution */
1: -/* SFQRED stats */
1: -	struct tc_sfqred_stats stats;
1: +  struct tc_sfq_qopt v0;
1: +  unsigned int depth; /* max number of packets per flow */
1: +  unsigned int headdrop;
1: +  /* SFQRED parameters */
1: +  __u32 limit;             /* HARD maximal flow queue length (bytes) */
1: +  __u32 qth_min;           /* Min average length threshold (bytes) */
1: +  __u32 qth_max;           /* Max average length threshold (bytes) */
1: +  unsigned char Wlog;      /* log(W)		*/
1: +  unsigned char Plog;      /* log(P_max/(qth_max-qth_min))	*/
1: +  unsigned char Scell_log; /* cell size for idle damping */
1: +  unsigned char flags;
1: +  __u32 max_P; /* probability, high resolution */
1: +               /* SFQRED stats */
1: +  struct tc_sfqred_stats stats;
1:  };
1:  
1: -
1:  struct tc_sfq_xstats {
1: -	__s32		allot;
1: +  __s32 allot;
1:  };
1:  
1:  /* RED section */
1:  
1:  enum {
1: -	TCA_RED_UNSPEC,
1: -	TCA_RED_PARMS,
1: -	TCA_RED_STAB,
1: -	TCA_RED_MAX_P,
1: -	__TCA_RED_MAX,
1: +  TCA_RED_UNSPEC,
1: +  TCA_RED_PARMS,
1: +  TCA_RED_STAB,
1: +  TCA_RED_MAX_P,
1: +  __TCA_RED_MAX,
1:  };
1:  
1:  #define TCA_RED_MAX (__TCA_RED_MAX - 1)
1:  
1:  struct tc_red_qopt {
1: -	__u32		limit;		/* HARD maximal queue length (bytes)	*/
1: -	__u32		qth_min;	/* Min average length threshold (bytes) */
1: -	__u32		qth_max;	/* Max average length threshold (bytes) */
1: -	unsigned char   Wlog;		/* log(W)		*/
1: -	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
1: -	unsigned char   Scell_log;	/* cell size for idle damping */
1: -	unsigned char	flags;
1: -#define TC_RED_ECN		1
1: -#define TC_RED_HARDDROP		2
1: -#define TC_RED_ADAPTATIVE	4
1: +  __u32 limit;             /* HARD maximal queue length (bytes)	*/
1: +  __u32 qth_min;           /* Min average length threshold (bytes) */
1: +  __u32 qth_max;           /* Max average length threshold (bytes) */
1: +  unsigned char Wlog;      /* log(W)		*/
1: +  unsigned char Plog;      /* log(P_max/(qth_max-qth_min))	*/
1: +  unsigned char Scell_log; /* cell size for idle damping */
1: +  unsigned char flags;
1: +#define TC_RED_ECN 1
1: +#define TC_RED_HARDDROP 2
1: +#define TC_RED_ADAPTATIVE 4
1:  };
1:  
1:  struct tc_red_xstats {
1: -	__u32           early;          /* Early drops */
1: -	__u32           pdrop;          /* Drops due to queue limits */
1: -	__u32           other;          /* Drops due to drop() calls */
1: -	__u32           marked;         /* Marked packets */
1: +  __u32 early;  /* Early drops */
1: +  __u32 pdrop;  /* Drops due to queue limits */
1: +  __u32 other;  /* Drops due to drop() calls */
1: +  __u32 marked; /* Marked packets */
1:  };
1:  
1:  /* GRED section */
1: @@ -285,268 +278,267 @@ struct tc_red_xstats {
1:  #define MAX_DPs 16
1:  
1:  enum {
1: -       TCA_GRED_UNSPEC,
1: -       TCA_GRED_PARMS,
1: -       TCA_GRED_STAB,
1: -       TCA_GRED_DPS,
1: -       TCA_GRED_MAX_P,
1: -       TCA_GRED_LIMIT,
1: -       TCA_GRED_VQ_LIST,	/* nested TCA_GRED_VQ_ENTRY */
1: -       __TCA_GRED_MAX,
1: +  TCA_GRED_UNSPEC,
1: +  TCA_GRED_PARMS,
1: +  TCA_GRED_STAB,
1: +  TCA_GRED_DPS,
1: +  TCA_GRED_MAX_P,
1: +  TCA_GRED_LIMIT,
1: +  TCA_GRED_VQ_LIST, /* nested TCA_GRED_VQ_ENTRY */
1: +  __TCA_GRED_MAX,
1:  };
1:  
1:  #define TCA_GRED_MAX (__TCA_GRED_MAX - 1)
1:  
1:  enum {
1: -	TCA_GRED_VQ_ENTRY_UNSPEC,
1: -	TCA_GRED_VQ_ENTRY,	/* nested TCA_GRED_VQ_* */
1: -	__TCA_GRED_VQ_ENTRY_MAX,
1: +  TCA_GRED_VQ_ENTRY_UNSPEC,
1: +  TCA_GRED_VQ_ENTRY, /* nested TCA_GRED_VQ_* */
1: +  __TCA_GRED_VQ_ENTRY_MAX,
1:  };
1:  #define TCA_GRED_VQ_ENTRY_MAX (__TCA_GRED_VQ_ENTRY_MAX - 1)
1:  
1:  enum {
1: -	TCA_GRED_VQ_UNSPEC,
1: -	TCA_GRED_VQ_PAD,
1: -	TCA_GRED_VQ_DP,			/* u32 */
1: -	TCA_GRED_VQ_STAT_BYTES,		/* u64 */
1: -	TCA_GRED_VQ_STAT_PACKETS,	/* u32 */
1: -	TCA_GRED_VQ_STAT_BACKLOG,	/* u32 */
1: -	TCA_GRED_VQ_STAT_PROB_DROP,	/* u32 */
1: -	TCA_GRED_VQ_STAT_PROB_MARK,	/* u32 */
1: -	TCA_GRED_VQ_STAT_FORCED_DROP,	/* u32 */
1: -	TCA_GRED_VQ_STAT_FORCED_MARK,	/* u32 */
1: -	TCA_GRED_VQ_STAT_PDROP,		/* u32 */
1: -	TCA_GRED_VQ_STAT_OTHER,		/* u32 */
1: -	TCA_GRED_VQ_FLAGS,		/* u32 */
1: -	__TCA_GRED_VQ_MAX
1: +  TCA_GRED_VQ_UNSPEC,
1: +  TCA_GRED_VQ_PAD,
1: +  TCA_GRED_VQ_DP,               /* u32 */
1: +  TCA_GRED_VQ_STAT_BYTES,       /* u64 */
1: +  TCA_GRED_VQ_STAT_PACKETS,     /* u32 */
1: +  TCA_GRED_VQ_STAT_BACKLOG,     /* u32 */
1: +  TCA_GRED_VQ_STAT_PROB_DROP,   /* u32 */
1: +  TCA_GRED_VQ_STAT_PROB_MARK,   /* u32 */
1: +  TCA_GRED_VQ_STAT_FORCED_DROP, /* u32 */
1: +  TCA_GRED_VQ_STAT_FORCED_MARK, /* u32 */
1: +  TCA_GRED_VQ_STAT_PDROP,       /* u32 */
1: +  TCA_GRED_VQ_STAT_OTHER,       /* u32 */
1: +  TCA_GRED_VQ_FLAGS,            /* u32 */
1: +  __TCA_GRED_VQ_MAX
1:  };
1:  
1:  #define TCA_GRED_VQ_MAX (__TCA_GRED_VQ_MAX - 1)
1:  
1:  struct tc_gred_qopt {
1: -	__u32		limit;        /* HARD maximal queue length (bytes)    */
1: -	__u32		qth_min;      /* Min average length threshold (bytes) */
1: -	__u32		qth_max;      /* Max average length threshold (bytes) */
1: -	__u32		DP;           /* up to 2^32 DPs */
1: -	__u32		backlog;
1: -	__u32		qave;
1: -	__u32		forced;
1: -	__u32		early;
1: -	__u32		other;
1: -	__u32		pdrop;
1: -	__u8		Wlog;         /* log(W)               */
1: -	__u8		Plog;         /* log(P_max/(qth_max-qth_min)) */
1: -	__u8		Scell_log;    /* cell size for idle damping */
1: -	__u8		prio;         /* prio of this VQ */
1: -	__u32		packets;
1: -	__u32		bytesin;
1: +  __u32 limit;   /* HARD maximal queue length (bytes)    */
1: +  __u32 qth_min; /* Min average length threshold (bytes) */
1: +  __u32 qth_max; /* Max average length threshold (bytes) */
1: +  __u32 DP;      /* up to 2^32 DPs */
1: +  __u32 backlog;
1: +  __u32 qave;
1: +  __u32 forced;
1: +  __u32 early;
1: +  __u32 other;
1: +  __u32 pdrop;
1: +  __u8 Wlog;      /* log(W)               */
1: +  __u8 Plog;      /* log(P_max/(qth_max-qth_min)) */
1: +  __u8 Scell_log; /* cell size for idle damping */
1: +  __u8 prio;      /* prio of this VQ */
1: +  __u32 packets;
1: +  __u32 bytesin;
1:  };
1:  
1:  /* gred setup */
1:  struct tc_gred_sopt {
1: -	__u32		DPs;
1: -	__u32		def_DP;
1: -	__u8		grio;
1: -	__u8		flags;
1: -	__u16		pad1;
1: +  __u32 DPs;
1: +  __u32 def_DP;
1: +  __u8 grio;
1: +  __u8 flags;
1: +  __u16 pad1;
1:  };
1:  
1:  /* CHOKe section */
1:  
1:  enum {
1: -	TCA_CHOKE_UNSPEC,
1: -	TCA_CHOKE_PARMS,
1: -	TCA_CHOKE_STAB,
1: -	TCA_CHOKE_MAX_P,
1: -	__TCA_CHOKE_MAX,
1: +  TCA_CHOKE_UNSPEC,
1: +  TCA_CHOKE_PARMS,
1: +  TCA_CHOKE_STAB,
1: +  TCA_CHOKE_MAX_P,
1: +  __TCA_CHOKE_MAX,
1:  };
1:  
1:  #define TCA_CHOKE_MAX (__TCA_CHOKE_MAX - 1)
1:  
1:  struct tc_choke_qopt {
1: -	__u32		limit;		/* Hard queue length (packets)	*/
1: -	__u32		qth_min;	/* Min average threshold (packets) */
1: -	__u32		qth_max;	/* Max average threshold (packets) */
1: -	unsigned char   Wlog;		/* log(W)		*/
1: -	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
1: -	unsigned char   Scell_log;	/* cell size for idle damping */
1: -	unsigned char	flags;		/* see RED flags */
1: +  __u32 limit;             /* Hard queue length (packets)	*/
1: +  __u32 qth_min;           /* Min average threshold (packets) */
1: +  __u32 qth_max;           /* Max average threshold (packets) */
1: +  unsigned char Wlog;      /* log(W)		*/
1: +  unsigned char Plog;      /* log(P_max/(qth_max-qth_min))	*/
1: +  unsigned char Scell_log; /* cell size for idle damping */
1: +  unsigned char flags;     /* see RED flags */
1:  };
1:  
1:  struct tc_choke_xstats {
1: -	__u32		early;          /* Early drops */
1: -	__u32		pdrop;          /* Drops due to queue limits */
1: -	__u32		other;          /* Drops due to drop() calls */
1: -	__u32		marked;         /* Marked packets */
1: -	__u32		matched;	/* Drops due to flow match */
1: +  __u32 early;   /* Early drops */
1: +  __u32 pdrop;   /* Drops due to queue limits */
1: +  __u32 other;   /* Drops due to drop() calls */
1: +  __u32 marked;  /* Marked packets */
1: +  __u32 matched; /* Drops due to flow match */
1:  };
1:  
1:  /* HTB section */
1: -#define TC_HTB_NUMPRIO		8
1: -#define TC_HTB_MAXDEPTH		8
1: -#define TC_HTB_PROTOVER		3 /* the same as HTB and TC's major */
1: +#define TC_HTB_NUMPRIO 8
1: +#define TC_HTB_MAXDEPTH 8
1: +#define TC_HTB_PROTOVER 3 /* the same as HTB and TC's major */
1:  
1:  struct tc_htb_opt {
1: -	struct tc_ratespec 	rate;
1: -	struct tc_ratespec 	ceil;
1: -	__u32	buffer;
1: -	__u32	cbuffer;
1: -	__u32	quantum;
1: -	__u32	level;		/* out only */
1: -	__u32	prio;
1: +  struct tc_ratespec rate;
1: +  struct tc_ratespec ceil;
1: +  __u32 buffer;
1: +  __u32 cbuffer;
1: +  __u32 quantum;
1: +  __u32 level; /* out only */
1: +  __u32 prio;
1:  };
1:  struct tc_htb_glob {
1: -	__u32 version;		/* to match HTB/TC */
1: -    	__u32 rate2quantum;	/* bps->quantum divisor */
1: -    	__u32 defcls;		/* default class number */
1: -	__u32 debug;		/* debug flags */
1: +  __u32 version;      /* to match HTB/TC */
1: +  __u32 rate2quantum; /* bps->quantum divisor */
1: +  __u32 defcls;       /* default class number */
1: +  __u32 debug;        /* debug flags */
1:  
1: -	/* stats */
1: -	__u32 direct_pkts; /* count of non shaped packets */
1: +  /* stats */
1: +  __u32 direct_pkts; /* count of non shaped packets */
1:  };
1:  enum {
1: -	TCA_HTB_UNSPEC,
1: -	TCA_HTB_PARMS,
1: -	TCA_HTB_INIT,
1: -	TCA_HTB_CTAB,
1: -	TCA_HTB_RTAB,
1: -	TCA_HTB_DIRECT_QLEN,
1: -	TCA_HTB_RATE64,
1: -	TCA_HTB_CEIL64,
1: -	TCA_HTB_PAD,
1: -	TCA_HTB_OFFLOAD,
1: -	__TCA_HTB_MAX,
1: +  TCA_HTB_UNSPEC,
1: +  TCA_HTB_PARMS,
1: +  TCA_HTB_INIT,
1: +  TCA_HTB_CTAB,
1: +  TCA_HTB_RTAB,
1: +  TCA_HTB_DIRECT_QLEN,
1: +  TCA_HTB_RATE64,
1: +  TCA_HTB_CEIL64,
1: +  TCA_HTB_PAD,
1: +  TCA_HTB_OFFLOAD,
1: +  __TCA_HTB_MAX,
1:  };
1:  
1:  #define TCA_HTB_MAX (__TCA_HTB_MAX - 1)
1:  
1:  struct tc_htb_xstats {
1: -	__u32 lends;
1: -	__u32 borrows;
1: -	__u32 giants;	/* unused since 'Make HTB scheduler work with TSO.' */
1: -	__s32 tokens;
1: -	__s32 ctokens;
1: +  __u32 lends;
1: +  __u32 borrows;
1: +  __u32 giants; /* unused since 'Make HTB scheduler work with TSO.' */
1: +  __s32 tokens;
1: +  __s32 ctokens;
1:  };
1:  
1:  /* HFSC section */
1:  
1:  struct tc_hfsc_qopt {
1: -	__u16	defcls;		/* default class */
1: +  __u16 defcls; /* default class */
1:  };
1:  
1:  struct tc_service_curve {
1: -	__u32	m1;		/* slope of the first segment in bps */
1: -	__u32	d;		/* x-projection of the first segment in us */
1: -	__u32	m2;		/* slope of the second segment in bps */
1: +  __u32 m1; /* slope of the first segment in bps */
1: +  __u32 d;  /* x-projection of the first segment in us */
1: +  __u32 m2; /* slope of the second segment in bps */
1:  };
1:  
1:  struct tc_hfsc_stats {
1: -	__u64	work;		/* total work done */
1: -	__u64	rtwork;		/* work done by real-time criteria */
1: -	__u32	period;		/* current period */
1: -	__u32	level;		/* class level in hierarchy */
1: +  __u64 work;   /* total work done */
1: +  __u64 rtwork; /* work done by real-time criteria */
1: +  __u32 period; /* current period */
1: +  __u32 level;  /* class level in hierarchy */
1:  };
1:  
1:  enum {
1: -	TCA_HFSC_UNSPEC,
1: -	TCA_HFSC_RSC,
1: -	TCA_HFSC_FSC,
1: -	TCA_HFSC_USC,
1: -	__TCA_HFSC_MAX,
1: +  TCA_HFSC_UNSPEC,
1: +  TCA_HFSC_RSC,
1: +  TCA_HFSC_FSC,
1: +  TCA_HFSC_USC,
1: +  __TCA_HFSC_MAX,
1:  };
1:  
1:  #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
1:  
1: -
1:  /* CBQ section */
1:  
1: -#define TC_CBQ_MAXPRIO		8
1: -#define TC_CBQ_MAXLEVEL		8
1: -#define TC_CBQ_DEF_EWMA		5
1: +#define TC_CBQ_MAXPRIO 8
1: +#define TC_CBQ_MAXLEVEL 8
1: +#define TC_CBQ_DEF_EWMA 5
1:  
1:  struct tc_cbq_lssopt {
1: -	unsigned char	change;
1: -	unsigned char	flags;
1: -#define TCF_CBQ_LSS_BOUNDED	1
1: -#define TCF_CBQ_LSS_ISOLATED	2
1: -	unsigned char  	ewma_log;
1: -	unsigned char  	level;
1: -#define TCF_CBQ_LSS_FLAGS	1
1: -#define TCF_CBQ_LSS_EWMA	2
1: -#define TCF_CBQ_LSS_MAXIDLE	4
1: -#define TCF_CBQ_LSS_MINIDLE	8
1: -#define TCF_CBQ_LSS_OFFTIME	0x10
1: -#define TCF_CBQ_LSS_AVPKT	0x20
1: -	__u32		maxidle;
1: -	__u32		minidle;
1: -	__u32		offtime;
1: -	__u32		avpkt;
1: +  unsigned char change;
1: +  unsigned char flags;
1: +#define TCF_CBQ_LSS_BOUNDED 1
1: +#define TCF_CBQ_LSS_ISOLATED 2
1: +  unsigned char ewma_log;
1: +  unsigned char level;
1: +#define TCF_CBQ_LSS_FLAGS 1
1: +#define TCF_CBQ_LSS_EWMA 2
1: +#define TCF_CBQ_LSS_MAXIDLE 4
1: +#define TCF_CBQ_LSS_MINIDLE 8
1: +#define TCF_CBQ_LSS_OFFTIME 0x10
1: +#define TCF_CBQ_LSS_AVPKT 0x20
1: +  __u32 maxidle;
1: +  __u32 minidle;
1: +  __u32 offtime;
1: +  __u32 avpkt;
1:  };
1:  
1:  struct tc_cbq_wrropt {
1: -	unsigned char	flags;
1: -	unsigned char	priority;
1: -	unsigned char	cpriority;
1: -	unsigned char	__reserved;
1: -	__u32		allot;
1: -	__u32		weight;
1: +  unsigned char flags;
1: +  unsigned char priority;
1: +  unsigned char cpriority;
1: +  unsigned char __reserved;
1: +  __u32 allot;
1: +  __u32 weight;
1:  };
1:  
1:  struct tc_cbq_ovl {
1: -	unsigned char	strategy;
1: -#define	TC_CBQ_OVL_CLASSIC	0
1: -#define	TC_CBQ_OVL_DELAY	1
1: -#define	TC_CBQ_OVL_LOWPRIO	2
1: -#define	TC_CBQ_OVL_DROP		3
1: -#define	TC_CBQ_OVL_RCLASSIC	4
1: -	unsigned char	priority2;
1: -	__u16		pad;
1: -	__u32		penalty;
1: +  unsigned char strategy;
1: +#define TC_CBQ_OVL_CLASSIC 0
1: +#define TC_CBQ_OVL_DELAY 1
1: +#define TC_CBQ_OVL_LOWPRIO 2
1: +#define TC_CBQ_OVL_DROP 3
1: +#define TC_CBQ_OVL_RCLASSIC 4
1: +  unsigned char priority2;
1: +  __u16 pad;
1: +  __u32 penalty;
1:  };
1:  
1:  struct tc_cbq_police {
1: -	unsigned char	police;
1: -	unsigned char	__res1;
1: -	unsigned short	__res2;
1: +  unsigned char police;
1: +  unsigned char __res1;
1: +  unsigned short __res2;
1:  };
1:  
1:  struct tc_cbq_fopt {
1: -	__u32		split;
1: -	__u32		defmap;
1: -	__u32		defchange;
1: +  __u32 split;
1: +  __u32 defmap;
1: +  __u32 defchange;
1:  };
1:  
1:  struct tc_cbq_xstats {
1: -	__u32		borrows;
1: -	__u32		overactions;
1: -	__s32		avgidle;
1: -	__s32		undertime;
1: +  __u32 borrows;
1: +  __u32 overactions;
1: +  __s32 avgidle;
1: +  __s32 undertime;
1:  };
1:  
1:  enum {
1: -	TCA_CBQ_UNSPEC,
1: -	TCA_CBQ_LSSOPT,
1: -	TCA_CBQ_WRROPT,
1: -	TCA_CBQ_FOPT,
1: -	TCA_CBQ_OVL_STRATEGY,
1: -	TCA_CBQ_RATE,
1: -	TCA_CBQ_RTAB,
1: -	TCA_CBQ_POLICE,
1: -	__TCA_CBQ_MAX,
1: +  TCA_CBQ_UNSPEC,
1: +  TCA_CBQ_LSSOPT,
1: +  TCA_CBQ_WRROPT,
1: +  TCA_CBQ_FOPT,
1: +  TCA_CBQ_OVL_STRATEGY,
1: +  TCA_CBQ_RATE,
1: +  TCA_CBQ_RTAB,
1: +  TCA_CBQ_POLICE,
1: +  __TCA_CBQ_MAX,
1:  };
1:  
1: -#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
1: +#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1)
1:  
1:  /* dsmark section */
1:  
1:  enum {
1: -	TCA_DSMARK_UNSPEC,
1: -	TCA_DSMARK_INDICES,
1: -	TCA_DSMARK_DEFAULT_INDEX,
1: -	TCA_DSMARK_SET_TC_INDEX,
1: -	TCA_DSMARK_MASK,
1: -	TCA_DSMARK_VALUE,
1: -	__TCA_DSMARK_MAX,
1: +  TCA_DSMARK_UNSPEC,
1: +  TCA_DSMARK_INDICES,
1: +  TCA_DSMARK_DEFAULT_INDEX,
1: +  TCA_DSMARK_SET_TC_INDEX,
1: +  TCA_DSMARK_MASK,
1: +  TCA_DSMARK_VALUE,
1: +  __TCA_DSMARK_MAX,
1:  };
1:  
1:  #define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
1: @@ -554,121 +546,117 @@ enum {
1:  /* ATM  section */
1:  
1:  enum {
1: -	TCA_ATM_UNSPEC,
1: -	TCA_ATM_FD,		/* file/socket descriptor */
1: -	TCA_ATM_PTR,		/* pointer to descriptor - later */
1: -	TCA_ATM_HDR,		/* LL header */
1: -	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */
1: -	TCA_ATM_ADDR,		/* PVC address (for output only) */
1: -	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */
1: -	__TCA_ATM_MAX,
1: +  TCA_ATM_UNSPEC,
1: +  TCA_ATM_FD,     /* file/socket descriptor */
1: +  TCA_ATM_PTR,    /* pointer to descriptor - later */
1: +  TCA_ATM_HDR,    /* LL header */
1: +  TCA_ATM_EXCESS, /* excess traffic class (0 for CLP)  */
1: +  TCA_ATM_ADDR,   /* PVC address (for output only) */
1: +  TCA_ATM_STATE,  /* VC state (ATM_VS_*; for output only) */
1: +  __TCA_ATM_MAX,
1:  };
1:  
1: -#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)
1: +#define TCA_ATM_MAX (__TCA_ATM_MAX - 1)
1:  
1:  /* Network emulator */
1:  
1:  enum {
1: -	TCA_NETEM_UNSPEC,
1: -	TCA_NETEM_CORR,
1: -	TCA_NETEM_DELAY_DIST,
1: -	TCA_NETEM_REORDER,
1: -	TCA_NETEM_CORRUPT,
1: -	TCA_NETEM_LOSS,
1: -	TCA_NETEM_RATE,
1: -	TCA_NETEM_ECN,
1: -	TCA_NETEM_RATE64,
1: -	TCA_NETEM_PAD,
1: -	TCA_NETEM_LATENCY64,
1: -	TCA_NETEM_JITTER64,
1: -	TCA_NETEM_SLOT,
1: -	TCA_NETEM_SLOT_DIST,
1: -	__TCA_NETEM_MAX,
1: +  TCA_NETEM_UNSPEC,
1: +  TCA_NETEM_CORR,
1: +  TCA_NETEM_DELAY_DIST,
1: +  TCA_NETEM_REORDER,
1: +  TCA_NETEM_CORRUPT,
1: +  TCA_NETEM_LOSS,
1: +  TCA_NETEM_RATE,
1: +  TCA_NETEM_ECN,
1: +  TCA_NETEM_RATE64,
1: +  TCA_NETEM_PAD,
1: +  TCA_NETEM_LATENCY64,
1: +  TCA_NETEM_JITTER64,
1: +  TCA_NETEM_SLOT,
1: +  TCA_NETEM_SLOT_DIST,
1: +  __TCA_NETEM_MAX,
1:  };
1:  
1:  #define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1)
1:  
1:  struct tc_netem_qopt {
1: -	__u32	latency;	/* added delay (us) */
1: -	__u32   limit;		/* fifo limit (packets) */
1: -	__u32	loss;		/* random packet loss (0=none ~0=100%) */
1: -	__u32	gap;		/* re-ordering gap (0 for none) */
1: -	__u32   duplicate;	/* random packet dup  (0=none ~0=100%) */
1: -	__u32	jitter;		/* random jitter in latency (us) */
1: +  __u32 latency;   /* added delay (us) */
1: +  __u32 limit;     /* fifo limit (packets) */
1: +  __u32 loss;      /* random packet loss (0=none ~0=100%) */
1: +  __u32 gap;       /* re-ordering gap (0 for none) */
1: +  __u32 duplicate; /* random packet dup  (0=none ~0=100%) */
1: +  __u32 jitter;    /* random jitter in latency (us) */
1:  };
1:  
1:  struct tc_netem_corr {
1: -	__u32	delay_corr;	/* delay correlation */
1: -	__u32	loss_corr;	/* packet loss correlation */
1: -	__u32	dup_corr;	/* duplicate correlation  */
1: +  __u32 delay_corr; /* delay correlation */
1: +  __u32 loss_corr;  /* packet loss correlation */
1: +  __u32 dup_corr;   /* duplicate correlation  */
1:  };
1:  
1:  struct tc_netem_reorder {
1: -	__u32	probability;
1: -	__u32	correlation;
1: +  __u32 probability;
1: +  __u32 correlation;
1:  };
1:  
1:  struct tc_netem_corrupt {
1: -	__u32	probability;
1: -	__u32	correlation;
1: +  __u32 probability;
1: +  __u32 correlation;
1:  };
1:  
1:  struct tc_netem_rate {
1: -	__u32	rate;	/* byte/s */
1: -	__s32	packet_overhead;
1: -	__u32	cell_size;
1: -	__s32	cell_overhead;
1: +  __u32 rate; /* byte/s */
1: +  __s32 packet_overhead;
1: +  __u32 cell_size;
1: +  __s32 cell_overhead;
1:  };
1:  
1:  struct tc_netem_slot {
1: -	__s64   min_delay; /* nsec */
1: -	__s64   max_delay;
1: -	__s32   max_packets;
1: -	__s32   max_bytes;
1: -	__s64	dist_delay; /* nsec */
1: -	__s64	dist_jitter; /* nsec */
1: +  __s64 min_delay; /* nsec */
1: +  __s64 max_delay;
1: +  __s32 max_packets;
1: +  __s32 max_bytes;
1: +  __s64 dist_delay;  /* nsec */
1: +  __s64 dist_jitter; /* nsec */
1:  };
1:  
1:  enum {
1: -	NETEM_LOSS_UNSPEC,
1: -	NETEM_LOSS_GI,		/* General Intuitive - 4 state model */
1: -	NETEM_LOSS_GE,		/* Gilbert Elliot models */
1: -	__NETEM_LOSS_MAX
1: +  NETEM_LOSS_UNSPEC,
1: +  NETEM_LOSS_GI, /* General Intuitive - 4 state model */
1: +  NETEM_LOSS_GE, /* Gilbert Elliot models */
1: +  __NETEM_LOSS_MAX
1:  };
1:  #define NETEM_LOSS_MAX (__NETEM_LOSS_MAX - 1)
1:  
1:  /* State transition probabilities for 4 state model */
1:  struct tc_netem_gimodel {
1: -	__u32	p13;
1: -	__u32	p31;
1: -	__u32	p32;
1: -	__u32	p14;
1: -	__u32	p23;
1: +  __u32 p13;
1: +  __u32 p31;
1: +  __u32 p32;
1: +  __u32 p14;
1: +  __u32 p23;
1:  };
1:  
1:  /* Gilbert-Elliot models */
1:  struct tc_netem_gemodel {
1: -	__u32 p;
1: -	__u32 r;
1: -	__u32 h;
1: -	__u32 k1;
1: +  __u32 p;
1: +  __u32 r;
1: +  __u32 h;
1: +  __u32 k1;
1:  };
1:  
1: -#define NETEM_DIST_SCALE	8192
1: -#define NETEM_DIST_MAX		16384
1: +#define NETEM_DIST_SCALE 8192
1: +#define NETEM_DIST_MAX 16384
1:  
1:  /* DRR */
1:  
1: -enum {
1: -	TCA_DRR_UNSPEC,
1: -	TCA_DRR_QUANTUM,
1: -	__TCA_DRR_MAX
1: -};
1: +enum { TCA_DRR_UNSPEC, TCA_DRR_QUANTUM, __TCA_DRR_MAX };
1:  
1: -#define TCA_DRR_MAX	(__TCA_DRR_MAX - 1)
1: +#define TCA_DRR_MAX (__TCA_DRR_MAX - 1)
1:  
1:  struct tc_drr_stats {
1: -	__u32	deficit;
1: +  __u32 deficit;
1:  };
1:  
1:  /* MQPRIO */
1: @@ -676,49 +664,45 @@ struct tc_drr_stats {
1:  #define TC_QOPT_MAX_QUEUE 16
1:  
1:  enum {
1: -	TC_MQPRIO_HW_OFFLOAD_NONE,	/* no offload requested */
1: -	TC_MQPRIO_HW_OFFLOAD_TCS,	/* offload TCs, no queue counts */
1: -	__TC_MQPRIO_HW_OFFLOAD_MAX
1: +  TC_MQPRIO_HW_OFFLOAD_NONE, /* no offload requested */
1: +  TC_MQPRIO_HW_OFFLOAD_TCS,  /* offload TCs, no queue counts */
1: +  __TC_MQPRIO_HW_OFFLOAD_MAX
1:  };
1:  
1:  #define TC_MQPRIO_HW_OFFLOAD_MAX (__TC_MQPRIO_HW_OFFLOAD_MAX - 1)
1:  
1: -enum {
1: -	TC_MQPRIO_MODE_DCB,
1: -	TC_MQPRIO_MODE_CHANNEL,
1: -	__TC_MQPRIO_MODE_MAX
1: -};
1: +enum { TC_MQPRIO_MODE_DCB, TC_MQPRIO_MODE_CHANNEL, __TC_MQPRIO_MODE_MAX };
1:  
1:  #define __TC_MQPRIO_MODE_MAX (__TC_MQPRIO_MODE_MAX - 1)
1:  
1:  enum {
1: -	TC_MQPRIO_SHAPER_DCB,
1: -	TC_MQPRIO_SHAPER_BW_RATE,	/* Add new shapers below */
1: -	__TC_MQPRIO_SHAPER_MAX
1: +  TC_MQPRIO_SHAPER_DCB,
1: +  TC_MQPRIO_SHAPER_BW_RATE, /* Add new shapers below */
1: +  __TC_MQPRIO_SHAPER_MAX
1:  };
1:  
1:  #define __TC_MQPRIO_SHAPER_MAX (__TC_MQPRIO_SHAPER_MAX - 1)
1:  
1:  struct tc_mqprio_qopt {
1: -	__u8	num_tc;
1: -	__u8	prio_tc_map[TC_QOPT_BITMASK + 1];
1: -	__u8	hw;
1: -	__u16	count[TC_QOPT_MAX_QUEUE];
1: -	__u16	offset[TC_QOPT_MAX_QUEUE];
1: +  __u8 num_tc;
1: +  __u8 prio_tc_map[TC_QOPT_BITMASK + 1];
1: +  __u8 hw;
1: +  __u16 count[TC_QOPT_MAX_QUEUE];
1: +  __u16 offset[TC_QOPT_MAX_QUEUE];
1:  };
1:  
1: -#define TC_MQPRIO_F_MODE		0x1
1: -#define TC_MQPRIO_F_SHAPER		0x2
1: -#define TC_MQPRIO_F_MIN_RATE		0x4
1: -#define TC_MQPRIO_F_MAX_RATE		0x8
1: +#define TC_MQPRIO_F_MODE 0x1
1: +#define TC_MQPRIO_F_SHAPER 0x2
1: +#define TC_MQPRIO_F_MIN_RATE 0x4
1: +#define TC_MQPRIO_F_MAX_RATE 0x8
1:  
1:  enum {
1: -	TCA_MQPRIO_UNSPEC,
1: -	TCA_MQPRIO_MODE,
1: -	TCA_MQPRIO_SHAPER,
1: -	TCA_MQPRIO_MIN_RATE64,
1: -	TCA_MQPRIO_MAX_RATE64,
1: -	__TCA_MQPRIO_MAX,
1: +  TCA_MQPRIO_UNSPEC,
1: +  TCA_MQPRIO_MODE,
1: +  TCA_MQPRIO_SHAPER,
1: +  TCA_MQPRIO_MIN_RATE64,
1: +  TCA_MQPRIO_MAX_RATE64,
1: +  __TCA_MQPRIO_MAX,
1:  };
1:  
1:  #define TCA_MQPRIO_MAX (__TCA_MQPRIO_MAX - 1)
1: @@ -726,9 +710,9 @@ enum {
1:  /* SFB */
1:  
1:  enum {
1: -	TCA_SFB_UNSPEC,
1: -	TCA_SFB_PARMS,
1: -	__TCA_SFB_MAX,
1: +  TCA_SFB_UNSPEC,
1: +  TCA_SFB_PARMS,
1: +  __TCA_SFB_MAX,
1:  };
1:  
1:  #define TCA_SFB_MAX (__TCA_SFB_MAX - 1)
1: @@ -737,399 +721,382 @@ enum {
1:   * Note: increment, decrement are Q0.16 fixed-point values.
1:   */
1:  struct tc_sfb_qopt {
1: -	__u32 rehash_interval;	/* delay between hash move, in ms */
1: -	__u32 warmup_time;	/* double buffering warmup time in ms (warmup_time < rehash_interval) */
1: -	__u32 max;		/* max len of qlen_min */
1: -	__u32 bin_size;		/* maximum queue length per bin */
1: -	__u32 increment;	/* probability increment, (d1 in Blue) */
1: -	__u32 decrement;	/* probability decrement, (d2 in Blue) */
1: -	__u32 limit;		/* max SFB queue length */
1: -	__u32 penalty_rate;	/* inelastic flows are rate limited to 'rate' pps */
1: -	__u32 penalty_burst;
1: +  __u32 rehash_interval; /* delay between hash move, in ms */
1: +  __u32 warmup_time;     /* double buffering warmup time in ms (warmup_time <
1: +                            rehash_interval) */
1: +  __u32 max;             /* max len of qlen_min */
1: +  __u32 bin_size;        /* maximum queue length per bin */
1: +  __u32 increment;       /* probability increment, (d1 in Blue) */
1: +  __u32 decrement;       /* probability decrement, (d2 in Blue) */
1: +  __u32 limit;           /* max SFB queue length */
1: +  __u32 penalty_rate;    /* inelastic flows are rate limited to 'rate' pps */
1: +  __u32 penalty_burst;
1:  };
1:  
1:  struct tc_sfb_xstats {
1: -	__u32 earlydrop;
1: -	__u32 penaltydrop;
1: -	__u32 bucketdrop;
1: -	__u32 queuedrop;
1: -	__u32 childdrop; /* drops in child qdisc */
1: -	__u32 marked;
1: -	__u32 maxqlen;
1: -	__u32 maxprob;
1: -	__u32 avgprob;
1: +  __u32 earlydrop;
1: +  __u32 penaltydrop;
1: +  __u32 bucketdrop;
1: +  __u32 queuedrop;
1: +  __u32 childdrop; /* drops in child qdisc */
1: +  __u32 marked;
1: +  __u32 maxqlen;
1: +  __u32 maxprob;
1: +  __u32 avgprob;
1:  };
1:  
1:  #define SFB_MAX_PROB 0xFFFF
1:  
1:  /* QFQ */
1: -enum {
1: -	TCA_QFQ_UNSPEC,
1: -	TCA_QFQ_WEIGHT,
1: -	TCA_QFQ_LMAX,
1: -	__TCA_QFQ_MAX
1: -};
1: +enum { TCA_QFQ_UNSPEC, TCA_QFQ_WEIGHT, TCA_QFQ_LMAX, __TCA_QFQ_MAX };
1:  
1: -#define TCA_QFQ_MAX	(__TCA_QFQ_MAX - 1)
1: +#define TCA_QFQ_MAX (__TCA_QFQ_MAX - 1)
1:  
1:  struct tc_qfq_stats {
1: -	__u32 weight;
1: -	__u32 lmax;
1: +  __u32 weight;
1: +  __u32 lmax;
1:  };
1:  
1:  /* CODEL */
1:  
1:  enum {
1: -	TCA_CODEL_UNSPEC,
1: -	TCA_CODEL_TARGET,
1: -	TCA_CODEL_LIMIT,
1: -	TCA_CODEL_INTERVAL,
1: -	TCA_CODEL_ECN,
1: -	TCA_CODEL_CE_THRESHOLD,
1: -	__TCA_CODEL_MAX
1: +  TCA_CODEL_UNSPEC,
1: +  TCA_CODEL_TARGET,
1: +  TCA_CODEL_LIMIT,
1: +  TCA_CODEL_INTERVAL,
1: +  TCA_CODEL_ECN,
1: +  TCA_CODEL_CE_THRESHOLD,
1: +  __TCA_CODEL_MAX
1:  };
1:  
1: -#define TCA_CODEL_MAX	(__TCA_CODEL_MAX - 1)
1: +#define TCA_CODEL_MAX (__TCA_CODEL_MAX - 1)
1:  
1:  struct tc_codel_xstats {
1: -	__u32	maxpacket; /* largest packet we've seen so far */
1: -	__u32	count;	   /* how many drops we've done since the last time we
1: -			    * entered dropping state
1: -			    */
1: -	__u32	lastcount; /* count at entry to dropping state */
1: -	__u32	ldelay;    /* in-queue delay seen by most recently dequeued packet */
1: -	__s32	drop_next; /* time to drop next packet */
1: -	__u32	drop_overlimit; /* number of time max qdisc packet limit was hit */
1: -	__u32	ecn_mark;  /* number of packets we ECN marked instead of dropped */
1: -	__u32	dropping;  /* are we in dropping state ? */
1: -	__u32	ce_mark;   /* number of CE marked packets because of ce_threshold */
1: +  __u32 maxpacket; /* largest packet we've seen so far */
1: +  __u32 count;     /* how many drops we've done since the last time we
1: +                    * entered dropping state
1: +                    */
1: +  __u32 lastcount; /* count at entry to dropping state */
1: +  __u32 ldelay;    /* in-queue delay seen by most recently dequeued packet */
1: +  __s32 drop_next; /* time to drop next packet */
1: +  __u32 drop_overlimit; /* number of time max qdisc packet limit was hit */
1: +  __u32 ecn_mark;       /* number of packets we ECN marked instead of dropped */
1: +  __u32 dropping;       /* are we in dropping state ? */
1: +  __u32 ce_mark; /* number of CE marked packets because of ce_threshold */
1:  };
1:  
1:  /* FQ_CODEL */
1:  
1:  enum {
1: -	TCA_FQ_CODEL_UNSPEC,
1: -	TCA_FQ_CODEL_TARGET,
1: -	TCA_FQ_CODEL_LIMIT,
1: -	TCA_FQ_CODEL_INTERVAL,
1: -	TCA_FQ_CODEL_ECN,
1: -	TCA_FQ_CODEL_FLOWS,
1: -	TCA_FQ_CODEL_QUANTUM,
1: -	TCA_FQ_CODEL_CE_THRESHOLD,
1: -	TCA_FQ_CODEL_DROP_BATCH_SIZE,
1: -	TCA_FQ_CODEL_MEMORY_LIMIT,
1: -	__TCA_FQ_CODEL_MAX
1: +  TCA_FQ_CODEL_UNSPEC,
1: +  TCA_FQ_CODEL_TARGET,
1: +  TCA_FQ_CODEL_LIMIT,
1: +  TCA_FQ_CODEL_INTERVAL,
1: +  TCA_FQ_CODEL_ECN,
1: +  TCA_FQ_CODEL_FLOWS,
1: +  TCA_FQ_CODEL_QUANTUM,
1: +  TCA_FQ_CODEL_CE_THRESHOLD,
1: +  TCA_FQ_CODEL_DROP_BATCH_SIZE,
1: +  TCA_FQ_CODEL_MEMORY_LIMIT,
1: +  __TCA_FQ_CODEL_MAX
1:  };
1:  
1: -#define TCA_FQ_CODEL_MAX	(__TCA_FQ_CODEL_MAX - 1)
1: +#define TCA_FQ_CODEL_MAX (__TCA_FQ_CODEL_MAX - 1)
1:  
1:  enum {
1: -	TCA_FQ_CODEL_XSTATS_QDISC,
1: -	TCA_FQ_CODEL_XSTATS_CLASS,
1: +  TCA_FQ_CODEL_XSTATS_QDISC,
1: +  TCA_FQ_CODEL_XSTATS_CLASS,
1:  };
1:  
1:  struct tc_fq_codel_qd_stats {
1: -	__u32	maxpacket;	/* largest packet we've seen so far */
1: -	__u32	drop_overlimit; /* number of time max qdisc
1: -				 * packet limit was hit
1: -				 */
1: -	__u32	ecn_mark;	/* number of packets we ECN marked
1: -				 * instead of being dropped
1: -				 */
1: -	__u32	new_flow_count; /* number of time packets
1: -				 * created a 'new flow'
1: -				 */
1: -	__u32	new_flows_len;	/* count of flows in new list */
1: -	__u32	old_flows_len;	/* count of flows in old list */
1: -	__u32	ce_mark;	/* packets above ce_threshold */
1: -	__u32	memory_usage;	/* in bytes */
1: -	__u32	drop_overmemory;
1: +  __u32 maxpacket;      /* largest packet we've seen so far */
1: +  __u32 drop_overlimit; /* number of time max qdisc
1: +                         * packet limit was hit
1: +                         */
1: +  __u32 ecn_mark;       /* number of packets we ECN marked
1: +                         * instead of being dropped
1: +                         */
1: +  __u32 new_flow_count; /* number of time packets
1: +                         * created a 'new flow'
1: +                         */
1: +  __u32 new_flows_len;  /* count of flows in new list */
1: +  __u32 old_flows_len;  /* count of flows in old list */
1: +  __u32 ce_mark;        /* packets above ce_threshold */
1: +  __u32 memory_usage;   /* in bytes */
1: +  __u32 drop_overmemory;
1:  };
1:  
1:  struct tc_fq_codel_cl_stats {
1: -	__s32	deficit;
1: -	__u32	ldelay;		/* in-queue delay seen by most recently
1: -				 * dequeued packet
1: -				 */
1: -	__u32	count;
1: -	__u32	lastcount;
1: -	__u32	dropping;
1: -	__s32	drop_next;
1: +  __s32 deficit;
1: +  __u32 ldelay; /* in-queue delay seen by most recently
1: +                 * dequeued packet
1: +                 */
1: +  __u32 count;
1: +  __u32 lastcount;
1: +  __u32 dropping;
1: +  __s32 drop_next;
1:  };
1:  
1:  struct tc_fq_codel_xstats {
1: -	__u32	type;
1: -	union {
1: -		struct tc_fq_codel_qd_stats qdisc_stats;
1: -		struct tc_fq_codel_cl_stats class_stats;
1: -	};
1: +  __u32 type;
1: +  union {
1: +    struct tc_fq_codel_qd_stats qdisc_stats;
1: +    struct tc_fq_codel_cl_stats class_stats;
1: +  };
1:  };
1:  
1:  /* FQ */
1:  
1:  enum {
1: -	TCA_FQ_UNSPEC,
1: +  TCA_FQ_UNSPEC,
1:  
1: -	TCA_FQ_PLIMIT,		/* limit of total number of packets in queue */
1: +  TCA_FQ_PLIMIT, /* limit of total number of packets in queue */
1:  
1: -	TCA_FQ_FLOW_PLIMIT,	/* limit of packets per flow */
1: +  TCA_FQ_FLOW_PLIMIT, /* limit of packets per flow */
1:  
1: -	TCA_FQ_QUANTUM,		/* RR quantum */
1: +  TCA_FQ_QUANTUM, /* RR quantum */
1:  
1: -	TCA_FQ_INITIAL_QUANTUM,		/* RR quantum for new flow */
1: +  TCA_FQ_INITIAL_QUANTUM, /* RR quantum for new flow */
1:  
1: -	TCA_FQ_RATE_ENABLE,	/* enable/disable rate limiting */
1: +  TCA_FQ_RATE_ENABLE, /* enable/disable rate limiting */
1:  
1: -	TCA_FQ_FLOW_DEFAULT_RATE,/* obsolete, do not use */
1: +  TCA_FQ_FLOW_DEFAULT_RATE, /* obsolete, do not use */
1:  
1: -	TCA_FQ_FLOW_MAX_RATE,	/* per flow max rate */
1: +  TCA_FQ_FLOW_MAX_RATE, /* per flow max rate */
1:  
1: -	TCA_FQ_BUCKETS_LOG,	/* log2(number of buckets) */
1: +  TCA_FQ_BUCKETS_LOG, /* log2(number of buckets) */
1:  
1: -	TCA_FQ_FLOW_REFILL_DELAY,	/* flow credit refill delay in usec */
1: +  TCA_FQ_FLOW_REFILL_DELAY, /* flow credit refill delay in usec */
1:  
1: -	TCA_FQ_ORPHAN_MASK,	/* mask applied to orphaned skb hashes */
1: +  TCA_FQ_ORPHAN_MASK, /* mask applied to orphaned skb hashes */
1:  
1: -	TCA_FQ_LOW_RATE_THRESHOLD, /* per packet delay under this rate */
1: +  TCA_FQ_LOW_RATE_THRESHOLD, /* per packet delay under this rate */
1:  
1: -	TCA_FQ_CE_THRESHOLD,	/* DCTCP-like CE-marking threshold */
1: +  TCA_FQ_CE_THRESHOLD, /* DCTCP-like CE-marking threshold */
1:  
1: -	__TCA_FQ_MAX
1: +  __TCA_FQ_MAX
1:  };
1:  
1: -#define TCA_FQ_MAX	(__TCA_FQ_MAX - 1)
1: +#define TCA_FQ_MAX (__TCA_FQ_MAX - 1)
1:  
1:  struct tc_fq_qd_stats {
1: -	__u64	gc_flows;
1: -	__u64	highprio_packets;
1: -	__u64	tcp_retrans;
1: -	__u64	throttled;
1: -	__u64	flows_plimit;
1: -	__u64	pkts_too_long;
1: -	__u64	allocation_errors;
1: -	__s64	time_next_delayed_flow;
1: -	__u32	flows;
1: -	__u32	inactive_flows;
1: -	__u32	throttled_flows;
1: -	__u32	unthrottle_latency_ns;
1: -	__u64	ce_mark;		/* packets above ce_threshold */
1: +  __u64 gc_flows;
1: +  __u64 highprio_packets;
1: +  __u64 tcp_retrans;
1: +  __u64 throttled;
1: +  __u64 flows_plimit;
1: +  __u64 pkts_too_long;
1: +  __u64 allocation_errors;
1: +  __s64 time_next_delayed_flow;
1: +  __u32 flows;
1: +  __u32 inactive_flows;
1: +  __u32 throttled_flows;
1: +  __u32 unthrottle_latency_ns;
1: +  __u64 ce_mark; /* packets above ce_threshold */
1:  };
1:  
1:  /* Heavy-Hitter Filter */
1:  
1:  enum {
1: -	TCA_HHF_UNSPEC,
1: -	TCA_HHF_BACKLOG_LIMIT,
1: -	TCA_HHF_QUANTUM,
1: -	TCA_HHF_HH_FLOWS_LIMIT,
1: -	TCA_HHF_RESET_TIMEOUT,
1: -	TCA_HHF_ADMIT_BYTES,
1: -	TCA_HHF_EVICT_TIMEOUT,
1: -	TCA_HHF_NON_HH_WEIGHT,
1: -	__TCA_HHF_MAX
1: +  TCA_HHF_UNSPEC,
1: +  TCA_HHF_BACKLOG_LIMIT,
1: +  TCA_HHF_QUANTUM,
1: +  TCA_HHF_HH_FLOWS_LIMIT,
1: +  TCA_HHF_RESET_TIMEOUT,
1: +  TCA_HHF_ADMIT_BYTES,
1: +  TCA_HHF_EVICT_TIMEOUT,
1: +  TCA_HHF_NON_HH_WEIGHT,
1: +  __TCA_HHF_MAX
1:  };
1:  
1: -#define TCA_HHF_MAX	(__TCA_HHF_MAX - 1)
1: +#define TCA_HHF_MAX (__TCA_HHF_MAX - 1)
1:  
1:  struct tc_hhf_xstats {
1: -	__u32	drop_overlimit; /* number of times max qdisc packet limit
1: -				 * was hit
1: -				 */
1: -	__u32	hh_overlimit;   /* number of times max heavy-hitters was hit */
1: -	__u32	hh_tot_count;   /* number of captured heavy-hitters so far */
1: -	__u32	hh_cur_count;   /* number of current heavy-hitters */
1: +  __u32 drop_overlimit; /* number of times max qdisc packet limit
1: +                         * was hit
1: +                         */
1: +  __u32 hh_overlimit;   /* number of times max heavy-hitters was hit */
1: +  __u32 hh_tot_count;   /* number of captured heavy-hitters so far */
1: +  __u32 hh_cur_count;   /* number of current heavy-hitters */
1:  };
1:  
1:  /* PIE */
1:  enum {
1: -	TCA_PIE_UNSPEC,
1: -	TCA_PIE_TARGET,
1: -	TCA_PIE_LIMIT,
1: -	TCA_PIE_TUPDATE,
1: -	TCA_PIE_ALPHA,
1: -	TCA_PIE_BETA,
1: -	TCA_PIE_ECN,
1: -	TCA_PIE_BYTEMODE,
1: -	__TCA_PIE_MAX
1: -};
1: -#define TCA_PIE_MAX   (__TCA_PIE_MAX - 1)
1: +  TCA_PIE_UNSPEC,
1: +  TCA_PIE_TARGET,
1: +  TCA_PIE_LIMIT,
1: +  TCA_PIE_TUPDATE,
1: +  TCA_PIE_ALPHA,
1: +  TCA_PIE_BETA,
1: +  TCA_PIE_ECN,
1: +  TCA_PIE_BYTEMODE,
1: +  __TCA_PIE_MAX
1: +};
1: +#define TCA_PIE_MAX (__TCA_PIE_MAX - 1)
1:  
1:  struct tc_pie_xstats {
1: -	__u32 prob;             /* current probability */
1: -	__u32 delay;            /* current delay in ms */
1: -	__u32 avg_dq_rate;      /* current average dq_rate in bits/pie_time */
1: -	__u32 packets_in;       /* total number of packets enqueued */
1: -	__u32 dropped;          /* packets dropped due to pie_action */
1: -	__u32 overlimit;        /* dropped due to lack of space in queue */
1: -	__u32 maxq;             /* maximum queue size */
1: -	__u32 ecn_mark;         /* packets marked with ecn*/
1: +  __u32 prob;        /* current probability */
1: +  __u32 delay;       /* current delay in ms */
1: +  __u32 avg_dq_rate; /* current average dq_rate in bits/pie_time */
1: +  __u32 packets_in;  /* total number of packets enqueued */
1: +  __u32 dropped;     /* packets dropped due to pie_action */
1: +  __u32 overlimit;   /* dropped due to lack of space in queue */
1: +  __u32 maxq;        /* maximum queue size */
1: +  __u32 ecn_mark;    /* packets marked with ecn*/
1:  };
1:  
1:  /* CBS */
1:  struct tc_cbs_qopt {
1: -	__u8 offload;
1: -	__u8 _pad[3];
1: -	__s32 hicredit;
1: -	__s32 locredit;
1: -	__s32 idleslope;
1: -	__s32 sendslope;
1: +  __u8 offload;
1: +  __u8 _pad[3];
1: +  __s32 hicredit;
1: +  __s32 locredit;
1: +  __s32 idleslope;
1: +  __s32 sendslope;
1:  };
1:  
1:  enum {
1: -	TCA_CBS_UNSPEC,
1: -	TCA_CBS_PARMS,
1: -	__TCA_CBS_MAX,
1: +  TCA_CBS_UNSPEC,
1: +  TCA_CBS_PARMS,
1: +  __TCA_CBS_MAX,
1:  };
1:  
1:  #define TCA_CBS_MAX (__TCA_CBS_MAX - 1)
1:  
1: -
1:  /* ETF */
1:  struct tc_etf_qopt {
1: -	__s32 delta;
1: -	__s32 clockid;
1: -	__u32 flags;
1: -#define TC_ETF_DEADLINE_MODE_ON	BIT(0)
1: -#define TC_ETF_OFFLOAD_ON	BIT(1)
1: +  __s32 delta;
1: +  __s32 clockid;
1: +  __u32 flags;
1: +#define TC_ETF_DEADLINE_MODE_ON BIT(0)
1: +#define TC_ETF_OFFLOAD_ON BIT(1)
1:  };
1:  
1:  enum {
1: -	TCA_ETF_UNSPEC,
1: -	TCA_ETF_PARMS,
1: -	__TCA_ETF_MAX,
1: +  TCA_ETF_UNSPEC,
1: +  TCA_ETF_PARMS,
1: +  __TCA_ETF_MAX,
1:  };
1:  
1:  #define TCA_ETF_MAX (__TCA_ETF_MAX - 1)
1:  
1: -
1:  /* CAKE */
1:  enum {
1: -	TCA_CAKE_UNSPEC,
1: -	TCA_CAKE_PAD,
1: -	TCA_CAKE_BASE_RATE64,
1: -	TCA_CAKE_DIFFSERV_MODE,
1: -	TCA_CAKE_ATM,
1: -	TCA_CAKE_FLOW_MODE,
1: -	TCA_CAKE_OVERHEAD,
1: -	TCA_CAKE_RTT,
1: -	TCA_CAKE_TARGET,
1: -	TCA_CAKE_AUTORATE,
1: -	TCA_CAKE_MEMORY,
1: -	TCA_CAKE_NAT,
1: -	TCA_CAKE_RAW,
1: -	TCA_CAKE_WASH,
1: -	TCA_CAKE_MPU,
1: -	TCA_CAKE_INGRESS,
1: -	TCA_CAKE_ACK_FILTER,
1: -	TCA_CAKE_SPLIT_GSO,
1: -	__TCA_CAKE_MAX
1: -};
1: -#define TCA_CAKE_MAX	(__TCA_CAKE_MAX - 1)
1: +  TCA_CAKE_UNSPEC,
1: +  TCA_CAKE_PAD,
1: +  TCA_CAKE_BASE_RATE64,
1: +  TCA_CAKE_DIFFSERV_MODE,
1: +  TCA_CAKE_ATM,
1: +  TCA_CAKE_FLOW_MODE,
1: +  TCA_CAKE_OVERHEAD,
1: +  TCA_CAKE_RTT,
1: +  TCA_CAKE_TARGET,
1: +  TCA_CAKE_AUTORATE,
1: +  TCA_CAKE_MEMORY,
1: +  TCA_CAKE_NAT,
1: +  TCA_CAKE_RAW,
1: +  TCA_CAKE_WASH,
1: +  TCA_CAKE_MPU,
1: +  TCA_CAKE_INGRESS,
1: +  TCA_CAKE_ACK_FILTER,
1: +  TCA_CAKE_SPLIT_GSO,
1: +  __TCA_CAKE_MAX
1: +};
1: +#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1)
1:  
1:  enum {
1: -	__TCA_CAKE_STATS_INVALID,
1: -	TCA_CAKE_STATS_PAD,
1: -	TCA_CAKE_STATS_CAPACITY_ESTIMATE64,
1: -	TCA_CAKE_STATS_MEMORY_LIMIT,
1: -	TCA_CAKE_STATS_MEMORY_USED,
1: -	TCA_CAKE_STATS_AVG_NETOFF,
1: -	TCA_CAKE_STATS_MIN_NETLEN,
1: -	TCA_CAKE_STATS_MAX_NETLEN,
1: -	TCA_CAKE_STATS_MIN_ADJLEN,
1: -	TCA_CAKE_STATS_MAX_ADJLEN,
1: -	TCA_CAKE_STATS_TIN_STATS,
1: -	TCA_CAKE_STATS_DEFICIT,
1: -	TCA_CAKE_STATS_COBALT_COUNT,
1: -	TCA_CAKE_STATS_DROPPING,
1: -	TCA_CAKE_STATS_DROP_NEXT_US,
1: -	TCA_CAKE_STATS_P_DROP,
1: -	TCA_CAKE_STATS_BLUE_TIMER_US,
1: -	__TCA_CAKE_STATS_MAX
1: +  __TCA_CAKE_STATS_INVALID,
1: +  TCA_CAKE_STATS_PAD,
1: +  TCA_CAKE_STATS_CAPACITY_ESTIMATE64,
1: +  TCA_CAKE_STATS_MEMORY_LIMIT,
1: +  TCA_CAKE_STATS_MEMORY_USED,
1: +  TCA_CAKE_STATS_AVG_NETOFF,
1: +  TCA_CAKE_STATS_MIN_NETLEN,
1: +  TCA_CAKE_STATS_MAX_NETLEN,
1: +  TCA_CAKE_STATS_MIN_ADJLEN,
1: +  TCA_CAKE_STATS_MAX_ADJLEN,
1: +  TCA_CAKE_STATS_TIN_STATS,
1: +  TCA_CAKE_STATS_DEFICIT,
1: +  TCA_CAKE_STATS_COBALT_COUNT,
1: +  TCA_CAKE_STATS_DROPPING,
1: +  TCA_CAKE_STATS_DROP_NEXT_US,
1: +  TCA_CAKE_STATS_P_DROP,
1: +  TCA_CAKE_STATS_BLUE_TIMER_US,
1: +  __TCA_CAKE_STATS_MAX
1:  };
1:  #define TCA_CAKE_STATS_MAX (__TCA_CAKE_STATS_MAX - 1)
1:  
1:  enum {
1: -	__TCA_CAKE_TIN_STATS_INVALID,
1: -	TCA_CAKE_TIN_STATS_PAD,
1: -	TCA_CAKE_TIN_STATS_SENT_PACKETS,
1: -	TCA_CAKE_TIN_STATS_SENT_BYTES64,
1: -	TCA_CAKE_TIN_STATS_DROPPED_PACKETS,
1: -	TCA_CAKE_TIN_STATS_DROPPED_BYTES64,
1: -	TCA_CAKE_TIN_STATS_ACKS_DROPPED_PACKETS,
1: -	TCA_CAKE_TIN_STATS_ACKS_DROPPED_BYTES64,
1: -	TCA_CAKE_TIN_STATS_ECN_MARKED_PACKETS,
1: -	TCA_CAKE_TIN_STATS_ECN_MARKED_BYTES64,
1: -	TCA_CAKE_TIN_STATS_BACKLOG_PACKETS,
1: -	TCA_CAKE_TIN_STATS_BACKLOG_BYTES,
1: -	TCA_CAKE_TIN_STATS_THRESHOLD_RATE64,
1: -	TCA_CAKE_TIN_STATS_TARGET_US,
1: -	TCA_CAKE_TIN_STATS_INTERVAL_US,
1: -	TCA_CAKE_TIN_STATS_WAY_INDIRECT_HITS,
1: -	TCA_CAKE_TIN_STATS_WAY_MISSES,
1: -	TCA_CAKE_TIN_STATS_WAY_COLLISIONS,
1: -	TCA_CAKE_TIN_STATS_PEAK_DELAY_US,
1: -	TCA_CAKE_TIN_STATS_AVG_DELAY_US,
1: -	TCA_CAKE_TIN_STATS_BASE_DELAY_US,
1: -	TCA_CAKE_TIN_STATS_SPARSE_FLOWS,
1: -	TCA_CAKE_TIN_STATS_BULK_FLOWS,
1: -	TCA_CAKE_TIN_STATS_UNRESPONSIVE_FLOWS,
1: -	TCA_CAKE_TIN_STATS_MAX_SKBLEN,
1: -	TCA_CAKE_TIN_STATS_FLOW_QUANTUM,
1: -	__TCA_CAKE_TIN_STATS_MAX
1: +  __TCA_CAKE_TIN_STATS_INVALID,
1: +  TCA_CAKE_TIN_STATS_PAD,
1: +  TCA_CAKE_TIN_STATS_SENT_PACKETS,
1: +  TCA_CAKE_TIN_STATS_SENT_BYTES64,
1: +  TCA_CAKE_TIN_STATS_DROPPED_PACKETS,
1: +  TCA_CAKE_TIN_STATS_DROPPED_BYTES64,
1: +  TCA_CAKE_TIN_STATS_ACKS_DROPPED_PACKETS,
1: +  TCA_CAKE_TIN_STATS_ACKS_DROPPED_BYTES64,
1: +  TCA_CAKE_TIN_STATS_ECN_MARKED_PACKETS,
1: +  TCA_CAKE_TIN_STATS_ECN_MARKED_BYTES64,
1: +  TCA_CAKE_TIN_STATS_BACKLOG_PACKETS,
1: +  TCA_CAKE_TIN_STATS_BACKLOG_BYTES,
1: +  TCA_CAKE_TIN_STATS_THRESHOLD_RATE64,
1: +  TCA_CAKE_TIN_STATS_TARGET_US,
1: +  TCA_CAKE_TIN_STATS_INTERVAL_US,
1: +  TCA_CAKE_TIN_STATS_WAY_INDIRECT_HITS,
1: +  TCA_CAKE_TIN_STATS_WAY_MISSES,
1: +  TCA_CAKE_TIN_STATS_WAY_COLLISIONS,
1: +  TCA_CAKE_TIN_STATS_PEAK_DELAY_US,
1: +  TCA_CAKE_TIN_STATS_AVG_DELAY_US,
1: +  TCA_CAKE_TIN_STATS_BASE_DELAY_US,
1: +  TCA_CAKE_TIN_STATS_SPARSE_FLOWS,
1: +  TCA_CAKE_TIN_STATS_BULK_FLOWS,
1: +  TCA_CAKE_TIN_STATS_UNRESPONSIVE_FLOWS,
1: +  TCA_CAKE_TIN_STATS_MAX_SKBLEN,
1: +  TCA_CAKE_TIN_STATS_FLOW_QUANTUM,
1: +  __TCA_CAKE_TIN_STATS_MAX
1:  };
1:  #define TCA_CAKE_TIN_STATS_MAX (__TCA_CAKE_TIN_STATS_MAX - 1)
1:  #define TC_CAKE_MAX_TINS (8)
1:  
1:  enum {
1: -	CAKE_FLOW_NONE = 0,
1: -	CAKE_FLOW_SRC_IP,
1: -	CAKE_FLOW_DST_IP,
1: -	CAKE_FLOW_HOSTS,    /* = CAKE_FLOW_SRC_IP | CAKE_FLOW_DST_IP */
1: -	CAKE_FLOW_FLOWS,
1: -	CAKE_FLOW_DUAL_SRC, /* = CAKE_FLOW_SRC_IP | CAKE_FLOW_FLOWS */
1: -	CAKE_FLOW_DUAL_DST, /* = CAKE_FLOW_DST_IP | CAKE_FLOW_FLOWS */
1: -	CAKE_FLOW_TRIPLE,   /* = CAKE_FLOW_HOSTS  | CAKE_FLOW_FLOWS */
1: -	CAKE_FLOW_MAX,
1: +  CAKE_FLOW_NONE = 0,
1: +  CAKE_FLOW_SRC_IP,
1: +  CAKE_FLOW_DST_IP,
1: +  CAKE_FLOW_HOSTS, /* = CAKE_FLOW_SRC_IP | CAKE_FLOW_DST_IP */
1: +  CAKE_FLOW_FLOWS,
1: +  CAKE_FLOW_DUAL_SRC, /* = CAKE_FLOW_SRC_IP | CAKE_FLOW_FLOWS */
1: +  CAKE_FLOW_DUAL_DST, /* = CAKE_FLOW_DST_IP | CAKE_FLOW_FLOWS */
1: +  CAKE_FLOW_TRIPLE,   /* = CAKE_FLOW_HOSTS  | CAKE_FLOW_FLOWS */
1: +  CAKE_FLOW_MAX,
1:  };
1:  
1:  enum {
1: -	CAKE_DIFFSERV_DIFFSERV3 = 0,
1: -	CAKE_DIFFSERV_DIFFSERV4,
1: -	CAKE_DIFFSERV_DIFFSERV8,
1: -	CAKE_DIFFSERV_BESTEFFORT,
1: -	CAKE_DIFFSERV_PRECEDENCE,
1: -	CAKE_DIFFSERV_MAX
1: +  CAKE_DIFFSERV_DIFFSERV3 = 0,
1: +  CAKE_DIFFSERV_DIFFSERV4,
1: +  CAKE_DIFFSERV_DIFFSERV8,
1: +  CAKE_DIFFSERV_BESTEFFORT,
1: +  CAKE_DIFFSERV_PRECEDENCE,
1: +  CAKE_DIFFSERV_MAX
1:  };
1:  
1: -enum {
1: -	CAKE_ACK_NONE = 0,
1: -	CAKE_ACK_FILTER,
1: -	CAKE_ACK_AGGRESSIVE,
1: -	CAKE_ACK_MAX
1: -};
1: -
1: -enum {
1: -	CAKE_ATM_NONE = 0,
1: -	CAKE_ATM_ATM,
1: -	CAKE_ATM_PTM,
1: -	CAKE_ATM_MAX
1: -};
1: +enum { CAKE_ACK_NONE = 0, CAKE_ACK_FILTER, CAKE_ACK_AGGRESSIVE, CAKE_ACK_MAX };
1:  
1: +enum { CAKE_ATM_NONE = 0, CAKE_ATM_ATM, CAKE_ATM_PTM, CAKE_ATM_MAX };
1:  
1:  /* TAPRIO */
1:  enum {
1: -	TC_TAPRIO_CMD_SET_GATES = 0x00,
1: -	TC_TAPRIO_CMD_SET_AND_HOLD = 0x01,
1: -	TC_TAPRIO_CMD_SET_AND_RELEASE = 0x02,
1: +  TC_TAPRIO_CMD_SET_GATES = 0x00,
1: +  TC_TAPRIO_CMD_SET_AND_HOLD = 0x01,
1: +  TC_TAPRIO_CMD_SET_AND_RELEASE = 0x02,
1:  };
1:  
1:  enum {
1: -	TCA_TAPRIO_SCHED_ENTRY_UNSPEC,
1: -	TCA_TAPRIO_SCHED_ENTRY_INDEX, /* u32 */
1: -	TCA_TAPRIO_SCHED_ENTRY_CMD, /* u8 */
1: -	TCA_TAPRIO_SCHED_ENTRY_GATE_MASK, /* u32 */
1: -	TCA_TAPRIO_SCHED_ENTRY_INTERVAL, /* u32 */
1: -	__TCA_TAPRIO_SCHED_ENTRY_MAX,
1: +  TCA_TAPRIO_SCHED_ENTRY_UNSPEC,
1: +  TCA_TAPRIO_SCHED_ENTRY_INDEX,     /* u32 */
1: +  TCA_TAPRIO_SCHED_ENTRY_CMD,       /* u8 */
1: +  TCA_TAPRIO_SCHED_ENTRY_GATE_MASK, /* u32 */
1: +  TCA_TAPRIO_SCHED_ENTRY_INTERVAL,  /* u32 */
1: +  __TCA_TAPRIO_SCHED_ENTRY_MAX,
1:  };
1:  #define TCA_TAPRIO_SCHED_ENTRY_MAX (__TCA_TAPRIO_SCHED_ENTRY_MAX - 1)
1:  
1: @@ -1141,22 +1108,22 @@ enum {
1:   *     [TCA_TAPRIO_SCHED_ENTRY_INTERVAL]
1:   */
1:  enum {
1: -	TCA_TAPRIO_SCHED_UNSPEC,
1: -	TCA_TAPRIO_SCHED_ENTRY,
1: -	__TCA_TAPRIO_SCHED_MAX,
1: +  TCA_TAPRIO_SCHED_UNSPEC,
1: +  TCA_TAPRIO_SCHED_ENTRY,
1: +  __TCA_TAPRIO_SCHED_MAX,
1:  };
1:  
1:  #define TCA_TAPRIO_SCHED_MAX (__TCA_TAPRIO_SCHED_MAX - 1)
1:  
1:  enum {
1: -	TCA_TAPRIO_ATTR_UNSPEC,
1: -	TCA_TAPRIO_ATTR_PRIOMAP, /* struct tc_mqprio_qopt */
1: -	TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST, /* nested of entry */
1: -	TCA_TAPRIO_ATTR_SCHED_BASE_TIME, /* s64 */
1: -	TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */
1: -	TCA_TAPRIO_ATTR_SCHED_CLOCKID, /* s32 */
1: -	TCA_TAPRIO_PAD,
1: -	__TCA_TAPRIO_ATTR_MAX,
1: +  TCA_TAPRIO_ATTR_UNSPEC,
1: +  TCA_TAPRIO_ATTR_PRIOMAP,            /* struct tc_mqprio_qopt */
1: +  TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST,   /* nested of entry */
1: +  TCA_TAPRIO_ATTR_SCHED_BASE_TIME,    /* s64 */
1: +  TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */
1: +  TCA_TAPRIO_ATTR_SCHED_CLOCKID,      /* s32 */
1: +  TCA_TAPRIO_PAD,
1: +  __TCA_TAPRIO_ATTR_MAX,
1:  };
1:  
1:  #define TCA_TAPRIO_ATTR_MAX (__TCA_TAPRIO_ATTR_MAX - 1)
1: diff --git a/src/cc/libbpf/src/bpf.c b/src/cc/libbpf/src/bpf.c
1: index 86dcac44..ef224f73 100644
1: --- a/src/cc/libbpf/src/bpf.c
1: +++ b/src/cc/libbpf/src/bpf.c
1: @@ -21,14 +21,14 @@
1:   * License along with this program; if not,  see <http://www.gnu.org/licenses>
1:   */
1:  
1: -#include <stdlib.h>
1: -#include <string.h>
1: -#include <memory.h>
1: -#include <unistd.h>
1: +#include "bpf.h"
1:  #include <asm/unistd.h>
1:  #include <errno.h>
1:  #include <linux/bpf.h>
1: -#include "bpf.h"
1: +#include <memory.h>
1: +#include <stdlib.h>
1: +#include <string.h>
1: +#include <unistd.h>
1:  #include "libbpf.h"
1:  #include "libbpf_internal.h"
1:  
1: @@ -37,1018 +37,953 @@
1:   * required to be defined explicitly.
1:   */
1:  #ifndef __NR_bpf
1: -# if defined(__i386__)
1: -#  define __NR_bpf 357
1: -# elif defined(__x86_64__)
1: -#  define __NR_bpf 321
1: -# elif defined(__aarch64__)
1: -#  define __NR_bpf 280
1: -# elif defined(__sparc__)
1: -#  define __NR_bpf 349
1: -# elif defined(__s390__)
1: -#  define __NR_bpf 351
1: -# elif defined(__arc__)
1: -#  define __NR_bpf 280
1: -# else
1: -#  error __NR_bpf not defined. libbpf does not support your arch.
1: -# endif
1: +#if defined(__i386__)
1: +#define __NR_bpf 357
1: +#elif defined(__x86_64__)
1: +#define __NR_bpf 321
1: +#elif defined(__aarch64__)
1: +#define __NR_bpf 280
1: +#elif defined(__sparc__)
1: +#define __NR_bpf 349
1: +#elif defined(__s390__)
1: +#define __NR_bpf 351
1: +#elif defined(__arc__)
1: +#define __NR_bpf 280
1: +#else
1: +#error __NR_bpf not defined. libbpf does not support your arch.
1: +#endif
1:  #endif
1:  
1: -static inline __u64 ptr_to_u64(const void *ptr)
1: -{
1: -	return (__u64) (unsigned long) ptr;
1: +static inline __u64 ptr_to_u64(const void *ptr) {
1: +  return (__u64)(unsigned long)ptr;
1:  }
1:  
1:  static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
1: -			  unsigned int size)
1: -{
1: -	return syscall(__NR_bpf, cmd, attr, size);
1: +                          unsigned int size) {
1: +  return syscall(__NR_bpf, cmd, attr, size);
1:  }
1:  
1: -static inline int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size)
1: -{
1: -	int retries = 5;
1: -	int fd;
1: +static inline int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size) {
1: +  int retries = 5;
1: +  int fd;
1:  
1: -	do {
1: -		fd = sys_bpf(BPF_PROG_LOAD, attr, size);
1: -	} while (fd < 0 && errno == EAGAIN && retries-- > 0);
1: +  do {
1: +    fd = sys_bpf(BPF_PROG_LOAD, attr, size);
1: +  } while (fd < 0 && errno == EAGAIN && retries-- > 0);
1:  
1: -	return fd;
1: +  return fd;
1:  }
1:  
1: -int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: -
1: -	memset(&attr, '\0', sizeof(attr));
1: -
1: -	attr.map_type = create_attr->map_type;
1: -	attr.key_size = create_attr->key_size;
1: -	attr.value_size = create_attr->value_size;
1: -	attr.max_entries = create_attr->max_entries;
1: -	attr.map_flags = create_attr->map_flags;
1: -	if (create_attr->name)
1: -		memcpy(attr.map_name, create_attr->name,
1: -		       min(strlen(create_attr->name), BPF_OBJ_NAME_LEN - 1));
1: -	attr.numa_node = create_attr->numa_node;
1: -	attr.btf_fd = create_attr->btf_fd;
1: -	attr.btf_key_type_id = create_attr->btf_key_type_id;
1: -	attr.btf_value_type_id = create_attr->btf_value_type_id;
1: -	attr.map_ifindex = create_attr->map_ifindex;
1: -	if (attr.map_type == BPF_MAP_TYPE_STRUCT_OPS)
1: -		attr.btf_vmlinux_value_type_id =
1: -			create_attr->btf_vmlinux_value_type_id;
1: -	else
1: -		attr.inner_map_fd = create_attr->inner_map_fd;
1: -
1: -	fd = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) {
1: +  union bpf_attr attr;
1: +  int fd;
1: +
1: +  memset(&attr, '\0', sizeof(attr));
1: +
1: +  attr.map_type = create_attr->map_type;
1: +  attr.key_size = create_attr->key_size;
1: +  attr.value_size = create_attr->value_size;
1: +  attr.max_entries = create_attr->max_entries;
1: +  attr.map_flags = create_attr->map_flags;
1: +  if (create_attr->name)
1: +    memcpy(attr.map_name, create_attr->name,
1: +           min(strlen(create_attr->name), BPF_OBJ_NAME_LEN - 1));
1: +  attr.numa_node = create_attr->numa_node;
1: +  attr.btf_fd = create_attr->btf_fd;
1: +  attr.btf_key_type_id = create_attr->btf_key_type_id;
1: +  attr.btf_value_type_id = create_attr->btf_value_type_id;
1: +  attr.map_ifindex = create_attr->map_ifindex;
1: +  if (attr.map_type == BPF_MAP_TYPE_STRUCT_OPS)
1: +    attr.btf_vmlinux_value_type_id = create_attr->btf_vmlinux_value_type_id;
1: +  else
1: +    attr.inner_map_fd = create_attr->inner_map_fd;
1: +
1: +  fd = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
1: -			int key_size, int value_size, int max_entries,
1: -			__u32 map_flags, int node)
1: -{
1: -	struct bpf_create_map_attr map_attr = {};
1: -
1: -	map_attr.name = name;
1: -	map_attr.map_type = map_type;
1: -	map_attr.map_flags = map_flags;
1: -	map_attr.key_size = key_size;
1: -	map_attr.value_size = value_size;
1: -	map_attr.max_entries = max_entries;
1: -	if (node >= 0) {
1: -		map_attr.numa_node = node;
1: -		map_attr.map_flags |= BPF_F_NUMA_NODE;
1: -	}
1: -
1: -	return bpf_create_map_xattr(&map_attr);
1: +                        int key_size, int value_size, int max_entries,
1: +                        __u32 map_flags, int node) {
1: +  struct bpf_create_map_attr map_attr = {};
1: +
1: +  map_attr.name = name;
1: +  map_attr.map_type = map_type;
1: +  map_attr.map_flags = map_flags;
1: +  map_attr.key_size = key_size;
1: +  map_attr.value_size = value_size;
1: +  map_attr.max_entries = max_entries;
1: +  if (node >= 0) {
1: +    map_attr.numa_node = node;
1: +    map_attr.map_flags |= BPF_F_NUMA_NODE;
1: +  }
1: +
1: +  return bpf_create_map_xattr(&map_attr);
1:  }
1:  
1: -int bpf_create_map(enum bpf_map_type map_type, int key_size,
1: -		   int value_size, int max_entries, __u32 map_flags)
1: -{
1: -	struct bpf_create_map_attr map_attr = {};
1: +int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size,
1: +                   int max_entries, __u32 map_flags) {
1: +  struct bpf_create_map_attr map_attr = {};
1:  
1: -	map_attr.map_type = map_type;
1: -	map_attr.map_flags = map_flags;
1: -	map_attr.key_size = key_size;
1: -	map_attr.value_size = value_size;
1: -	map_attr.max_entries = max_entries;
1: +  map_attr.map_type = map_type;
1: +  map_attr.map_flags = map_flags;
1: +  map_attr.key_size = key_size;
1: +  map_attr.value_size = value_size;
1: +  map_attr.max_entries = max_entries;
1:  
1: -	return bpf_create_map_xattr(&map_attr);
1: +  return bpf_create_map_xattr(&map_attr);
1:  }
1:  
1:  int bpf_create_map_name(enum bpf_map_type map_type, const char *name,
1: -			int key_size, int value_size, int max_entries,
1: -			__u32 map_flags)
1: -{
1: -	struct bpf_create_map_attr map_attr = {};
1: -
1: -	map_attr.name = name;
1: -	map_attr.map_type = map_type;
1: -	map_attr.map_flags = map_flags;
1: -	map_attr.key_size = key_size;
1: -	map_attr.value_size = value_size;
1: -	map_attr.max_entries = max_entries;
1: -
1: -	return bpf_create_map_xattr(&map_attr);
1: +                        int key_size, int value_size, int max_entries,
1: +                        __u32 map_flags) {
1: +  struct bpf_create_map_attr map_attr = {};
1: +
1: +  map_attr.name = name;
1: +  map_attr.map_type = map_type;
1: +  map_attr.map_flags = map_flags;
1: +  map_attr.key_size = key_size;
1: +  map_attr.value_size = value_size;
1: +  map_attr.max_entries = max_entries;
1: +
1: +  return bpf_create_map_xattr(&map_attr);
1:  }
1:  
1:  int bpf_create_map_in_map_node(enum bpf_map_type map_type, const char *name,
1: -			       int key_size, int inner_map_fd, int max_entries,
1: -			       __u32 map_flags, int node)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: -
1: -	memset(&attr, '\0', sizeof(attr));
1: -
1: -	attr.map_type = map_type;
1: -	attr.key_size = key_size;
1: -	attr.value_size = 4;
1: -	attr.inner_map_fd = inner_map_fd;
1: -	attr.max_entries = max_entries;
1: -	attr.map_flags = map_flags;
1: -	if (name)
1: -		memcpy(attr.map_name, name,
1: -		       min(strlen(name), BPF_OBJ_NAME_LEN - 1));
1: -
1: -	if (node >= 0) {
1: -		attr.map_flags |= BPF_F_NUMA_NODE;
1: -		attr.numa_node = node;
1: -	}
1: -
1: -	fd = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: -}
1: +                               int key_size, int inner_map_fd, int max_entries,
1: +                               __u32 map_flags, int node) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,
1: -			  int key_size, int inner_map_fd, int max_entries,
1: -			  __u32 map_flags)
1: -{
1: -	return bpf_create_map_in_map_node(map_type, name, key_size,
1: -					  inner_map_fd, max_entries, map_flags,
1: -					  -1);
1: -}
1: +  memset(&attr, '\0', sizeof(attr));
1: +
1: +  attr.map_type = map_type;
1: +  attr.key_size = key_size;
1: +  attr.value_size = 4;
1: +  attr.inner_map_fd = inner_map_fd;
1: +  attr.max_entries = max_entries;
1: +  attr.map_flags = map_flags;
1: +  if (name)
1: +    memcpy(attr.map_name, name, min(strlen(name), BPF_OBJ_NAME_LEN - 1));
1:  
1: -static void *
1: -alloc_zero_tailing_info(const void *orecord, __u32 cnt,
1: -			__u32 actual_rec_size, __u32 expected_rec_size)
1: -{
1: -	__u64 info_len = (__u64)actual_rec_size * cnt;
1: -	void *info, *nrecord;
1: -	int i;
1: -
1: -	info = malloc(info_len);
1: -	if (!info)
1: -		return NULL;
1: -
1: -	/* zero out bytes kernel does not understand */
1: -	nrecord = info;
1: -	for (i = 0; i < cnt; i++) {
1: -		memcpy(nrecord, orecord, expected_rec_size);
1: -		memset(nrecord + expected_rec_size, 0,
1: -		       actual_rec_size - expected_rec_size);
1: -		orecord += actual_rec_size;
1: -		nrecord += actual_rec_size;
1: -	}
1: -
1: -	return info;
1: +  if (node >= 0) {
1: +    attr.map_flags |= BPF_F_NUMA_NODE;
1: +    attr.numa_node = node;
1: +  }
1: +
1: +  fd = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr)
1: -{
1: -	void *finfo = NULL, *linfo = NULL;
1: -	union bpf_attr attr;
1: -	int fd;
1: -
1: -	if (!load_attr->log_buf != !load_attr->log_buf_sz)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	if (load_attr->log_level > (4 | 2 | 1) || (load_attr->log_level && !load_attr->log_buf))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_type = load_attr->prog_type;
1: -	attr.expected_attach_type = load_attr->expected_attach_type;
1: -
1: -	if (load_attr->attach_prog_fd)
1: -		attr.attach_prog_fd = load_attr->attach_prog_fd;
1: -	else
1: -		attr.attach_btf_obj_fd = load_attr->attach_btf_obj_fd;
1: -	attr.attach_btf_id = load_attr->attach_btf_id;
1: -
1: -	attr.prog_ifindex = load_attr->prog_ifindex;
1: -	attr.kern_version = load_attr->kern_version;
1: -
1: -	attr.insn_cnt = (__u32)load_attr->insn_cnt;
1: -	attr.insns = ptr_to_u64(load_attr->insns);
1: -	attr.license = ptr_to_u64(load_attr->license);
1: -
1: -	attr.log_level = load_attr->log_level;
1: -	if (attr.log_level) {
1: -		attr.log_buf = ptr_to_u64(load_attr->log_buf);
1: -		attr.log_size = load_attr->log_buf_sz;
1: -	}
1: -
1: -	attr.prog_btf_fd = load_attr->prog_btf_fd;
1: -	attr.prog_flags = load_attr->prog_flags;
1: -
1: -	attr.func_info_rec_size = load_attr->func_info_rec_size;
1: -	attr.func_info_cnt = load_attr->func_info_cnt;
1: -	attr.func_info = ptr_to_u64(load_attr->func_info);
1: -
1: -	attr.line_info_rec_size = load_attr->line_info_rec_size;
1: -	attr.line_info_cnt = load_attr->line_info_cnt;
1: -	attr.line_info = ptr_to_u64(load_attr->line_info);
1: -
1: -	if (load_attr->name)
1: -		memcpy(attr.prog_name, load_attr->name,
1: -		       min(strlen(load_attr->name), (size_t)BPF_OBJ_NAME_LEN - 1));
1: -
1: -	fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: -	if (fd >= 0)
1: -		return fd;
1: -
1: -	/* After bpf_prog_load, the kernel may modify certain attributes
1: -	 * to give user space a hint how to deal with loading failure.
1: -	 * Check to see whether we can make some changes and load again.
1: -	 */
1: -	while (errno == E2BIG && (!finfo || !linfo)) {
1: -		if (!finfo && attr.func_info_cnt &&
1: -		    attr.func_info_rec_size < load_attr->func_info_rec_size) {
1: -			/* try with corrected func info records */
1: -			finfo = alloc_zero_tailing_info(load_attr->func_info,
1: -							load_attr->func_info_cnt,
1: -							load_attr->func_info_rec_size,
1: -							attr.func_info_rec_size);
1: -			if (!finfo) {
1: -				errno = E2BIG;
1: -				goto done;
1: -			}
1: -
1: -			attr.func_info = ptr_to_u64(finfo);
1: -			attr.func_info_rec_size = load_attr->func_info_rec_size;
1: -		} else if (!linfo && attr.line_info_cnt &&
1: -			   attr.line_info_rec_size <
1: -			   load_attr->line_info_rec_size) {
1: -			linfo = alloc_zero_tailing_info(load_attr->line_info,
1: -							load_attr->line_info_cnt,
1: -							load_attr->line_info_rec_size,
1: -							attr.line_info_rec_size);
1: -			if (!linfo) {
1: -				errno = E2BIG;
1: -				goto done;
1: -			}
1: -
1: -			attr.line_info = ptr_to_u64(linfo);
1: -			attr.line_info_rec_size = load_attr->line_info_rec_size;
1: -		} else {
1: -			break;
1: -		}
1: -
1: -		fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: -		if (fd >= 0)
1: -			goto done;
1: -	}
1: -
1: -	if (load_attr->log_level || !load_attr->log_buf)
1: -		goto done;
1: -
1: -	/* Try again with log */
1: -	attr.log_buf = ptr_to_u64(load_attr->log_buf);
1: -	attr.log_size = load_attr->log_buf_sz;
1: -	attr.log_level = 1;
1: -	load_attr->log_buf[0] = 0;
1: -
1: -	fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: +int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,
1: +                          int key_size, int inner_map_fd, int max_entries,
1: +                          __u32 map_flags) {
1: +  return bpf_create_map_in_map_node(map_type, name, key_size, inner_map_fd,
1: +                                    max_entries, map_flags, -1);
1: +}
1: +
1: +static void *alloc_zero_tailing_info(const void *orecord, __u32 cnt,
1: +                                     __u32 actual_rec_size,
1: +                                     __u32 expected_rec_size) {
1: +  __u64 info_len = (__u64)actual_rec_size * cnt;
1: +  void *info, *nrecord;
1: +  int i;
1: +
1: +  info = malloc(info_len);
1: +  if (!info)
1: +    return NULL;
1: +
1: +  /* zero out bytes kernel does not understand */
1: +  nrecord = info;
1: +  for (i = 0; i < cnt; i++) {
1: +    memcpy(nrecord, orecord, expected_rec_size);
1: +    memset(nrecord + expected_rec_size, 0, actual_rec_size - expected_rec_size);
1: +    orecord += actual_rec_size;
1: +    nrecord += actual_rec_size;
1: +  }
1: +
1: +  return info;
1: +}
1: +
1: +int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr) {
1: +  void *finfo = NULL, *linfo = NULL;
1: +  union bpf_attr attr;
1: +  int fd;
1: +
1: +  if (!load_attr->log_buf != !load_attr->log_buf_sz)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  if (load_attr->log_level > (4 | 2 | 1) ||
1: +      (load_attr->log_level && !load_attr->log_buf))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_type = load_attr->prog_type;
1: +  attr.expected_attach_type = load_attr->expected_attach_type;
1: +
1: +  if (load_attr->attach_prog_fd)
1: +    attr.attach_prog_fd = load_attr->attach_prog_fd;
1: +  else
1: +    attr.attach_btf_obj_fd = load_attr->attach_btf_obj_fd;
1: +  attr.attach_btf_id = load_attr->attach_btf_id;
1: +
1: +  attr.prog_ifindex = load_attr->prog_ifindex;
1: +  attr.kern_version = load_attr->kern_version;
1: +
1: +  attr.insn_cnt = (__u32)load_attr->insn_cnt;
1: +  attr.insns = ptr_to_u64(load_attr->insns);
1: +  attr.license = ptr_to_u64(load_attr->license);
1: +
1: +  attr.log_level = load_attr->log_level;
1: +  if (attr.log_level) {
1: +    attr.log_buf = ptr_to_u64(load_attr->log_buf);
1: +    attr.log_size = load_attr->log_buf_sz;
1: +  }
1: +
1: +  attr.prog_btf_fd = load_attr->prog_btf_fd;
1: +  attr.prog_flags = load_attr->prog_flags;
1: +
1: +  attr.func_info_rec_size = load_attr->func_info_rec_size;
1: +  attr.func_info_cnt = load_attr->func_info_cnt;
1: +  attr.func_info = ptr_to_u64(load_attr->func_info);
1: +
1: +  attr.line_info_rec_size = load_attr->line_info_rec_size;
1: +  attr.line_info_cnt = load_attr->line_info_cnt;
1: +  attr.line_info = ptr_to_u64(load_attr->line_info);
1: +
1: +  if (load_attr->name)
1: +    memcpy(attr.prog_name, load_attr->name,
1: +           min(strlen(load_attr->name), (size_t)BPF_OBJ_NAME_LEN - 1));
1: +
1: +  fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: +  if (fd >= 0)
1: +    return fd;
1: +
1: +  /* After bpf_prog_load, the kernel may modify certain attributes
1: +   * to give user space a hint how to deal with loading failure.
1: +   * Check to see whether we can make some changes and load again.
1: +   */
1: +  while (errno == E2BIG && (!finfo || !linfo)) {
1: +    if (!finfo && attr.func_info_cnt &&
1: +        attr.func_info_rec_size < load_attr->func_info_rec_size) {
1: +      /* try with corrected func info records */
1: +      finfo = alloc_zero_tailing_info(
1: +          load_attr->func_info, load_attr->func_info_cnt,
1: +          load_attr->func_info_rec_size, attr.func_info_rec_size);
1: +      if (!finfo) {
1: +        errno = E2BIG;
1: +        goto done;
1: +      }
1: +
1: +      attr.func_info = ptr_to_u64(finfo);
1: +      attr.func_info_rec_size = load_attr->func_info_rec_size;
1: +    } else if (!linfo && attr.line_info_cnt &&
1: +               attr.line_info_rec_size < load_attr->line_info_rec_size) {
1: +      linfo = alloc_zero_tailing_info(
1: +          load_attr->line_info, load_attr->line_info_cnt,
1: +          load_attr->line_info_rec_size, attr.line_info_rec_size);
1: +      if (!linfo) {
1: +        errno = E2BIG;
1: +        goto done;
1: +      }
1: +
1: +      attr.line_info = ptr_to_u64(linfo);
1: +      attr.line_info_rec_size = load_attr->line_info_rec_size;
1: +    } else {
1: +      break;
1: +    }
1: +
1: +    fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: +    if (fd >= 0)
1: +      goto done;
1: +  }
1: +
1: +  if (load_attr->log_level || !load_attr->log_buf)
1: +    goto done;
1: +
1: +  /* Try again with log */
1: +  attr.log_buf = ptr_to_u64(load_attr->log_buf);
1: +  attr.log_size = load_attr->log_buf_sz;
1: +  attr.log_level = 1;
1: +  load_attr->log_buf[0] = 0;
1: +
1: +  fd = sys_bpf_prog_load(&attr, sizeof(attr));
1:  done:
1: -	/* free() doesn't affect errno, so we don't need to restore it */
1: -	free(finfo);
1: -	free(linfo);
1: -	return libbpf_err_errno(fd);
1: +  /* free() doesn't affect errno, so we don't need to restore it */
1: +  free(finfo);
1: +  free(linfo);
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr,
1: -			   char *log_buf, size_t log_buf_sz)
1: -{
1: -	struct bpf_prog_load_params p = {};
1: -
1: -	if (!load_attr || !log_buf != !log_buf_sz)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	p.prog_type = load_attr->prog_type;
1: -	p.expected_attach_type = load_attr->expected_attach_type;
1: -	switch (p.prog_type) {
1: -	case BPF_PROG_TYPE_STRUCT_OPS:
1: -	case BPF_PROG_TYPE_LSM:
1: -		p.attach_btf_id = load_attr->attach_btf_id;
1: -		break;
1: -	case BPF_PROG_TYPE_TRACING:
1: -	case BPF_PROG_TYPE_EXT:
1: -		p.attach_btf_id = load_attr->attach_btf_id;
1: -		p.attach_prog_fd = load_attr->attach_prog_fd;
1: -		break;
1: -	default:
1: -		p.prog_ifindex = load_attr->prog_ifindex;
1: -		p.kern_version = load_attr->kern_version;
1: -	}
1: -	p.insn_cnt = load_attr->insns_cnt;
1: -	p.insns = load_attr->insns;
1: -	p.license = load_attr->license;
1: -	p.log_level = load_attr->log_level;
1: -	p.log_buf = log_buf;
1: -	p.log_buf_sz = log_buf_sz;
1: -	p.prog_btf_fd = load_attr->prog_btf_fd;
1: -	p.func_info_rec_size = load_attr->func_info_rec_size;
1: -	p.func_info_cnt = load_attr->func_info_cnt;
1: -	p.func_info = load_attr->func_info;
1: -	p.line_info_rec_size = load_attr->line_info_rec_size;
1: -	p.line_info_cnt = load_attr->line_info_cnt;
1: -	p.line_info = load_attr->line_info;
1: -	p.name = load_attr->name;
1: -	p.prog_flags = load_attr->prog_flags;
1: -
1: -	return libbpf__bpf_prog_load(&p);
1: +                           char *log_buf, size_t log_buf_sz) {
1: +  struct bpf_prog_load_params p = {};
1: +
1: +  if (!load_attr || !log_buf != !log_buf_sz)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  p.prog_type = load_attr->prog_type;
1: +  p.expected_attach_type = load_attr->expected_attach_type;
1: +  switch (p.prog_type) {
1: +  case BPF_PROG_TYPE_STRUCT_OPS:
1: +  case BPF_PROG_TYPE_LSM:
1: +    p.attach_btf_id = load_attr->attach_btf_id;
1: +    break;
1: +  case BPF_PROG_TYPE_TRACING:
1: +  case BPF_PROG_TYPE_EXT:
1: +    p.attach_btf_id = load_attr->attach_btf_id;
1: +    p.attach_prog_fd = load_attr->attach_prog_fd;
1: +    break;
1: +  default:
1: +    p.prog_ifindex = load_attr->prog_ifindex;
1: +    p.kern_version = load_attr->kern_version;
1: +  }
1: +  p.insn_cnt = load_attr->insns_cnt;
1: +  p.insns = load_attr->insns;
1: +  p.license = load_attr->license;
1: +  p.log_level = load_attr->log_level;
1: +  p.log_buf = log_buf;
1: +  p.log_buf_sz = log_buf_sz;
1: +  p.prog_btf_fd = load_attr->prog_btf_fd;
1: +  p.func_info_rec_size = load_attr->func_info_rec_size;
1: +  p.func_info_cnt = load_attr->func_info_cnt;
1: +  p.func_info = load_attr->func_info;
1: +  p.line_info_rec_size = load_attr->line_info_rec_size;
1: +  p.line_info_cnt = load_attr->line_info_cnt;
1: +  p.line_info = load_attr->line_info;
1: +  p.name = load_attr->name;
1: +  p.prog_flags = load_attr->prog_flags;
1: +
1: +  return libbpf__bpf_prog_load(&p);
1:  }
1:  
1:  int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,
1: -		     size_t insns_cnt, const char *license,
1: -		     __u32 kern_version, char *log_buf,
1: -		     size_t log_buf_sz)
1: -{
1: -	struct bpf_load_program_attr load_attr;
1: -
1: -	memset(&load_attr, 0, sizeof(struct bpf_load_program_attr));
1: -	load_attr.prog_type = type;
1: -	load_attr.expected_attach_type = 0;
1: -	load_attr.name = NULL;
1: -	load_attr.insns = insns;
1: -	load_attr.insns_cnt = insns_cnt;
1: -	load_attr.license = license;
1: -	load_attr.kern_version = kern_version;
1: -
1: -	return bpf_load_program_xattr(&load_attr, log_buf, log_buf_sz);
1: +                     size_t insns_cnt, const char *license, __u32 kern_version,
1: +                     char *log_buf, size_t log_buf_sz) {
1: +  struct bpf_load_program_attr load_attr;
1: +
1: +  memset(&load_attr, 0, sizeof(struct bpf_load_program_attr));
1: +  load_attr.prog_type = type;
1: +  load_attr.expected_attach_type = 0;
1: +  load_attr.name = NULL;
1: +  load_attr.insns = insns;
1: +  load_attr.insns_cnt = insns_cnt;
1: +  load_attr.license = license;
1: +  load_attr.kern_version = kern_version;
1: +
1: +  return bpf_load_program_xattr(&load_attr, log_buf, log_buf_sz);
1:  }
1:  
1:  int bpf_verify_program(enum bpf_prog_type type, const struct bpf_insn *insns,
1: -		       size_t insns_cnt, __u32 prog_flags, const char *license,
1: -		       __u32 kern_version, char *log_buf, size_t log_buf_sz,
1: -		       int log_level)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_type = type;
1: -	attr.insn_cnt = (__u32)insns_cnt;
1: -	attr.insns = ptr_to_u64(insns);
1: -	attr.license = ptr_to_u64(license);
1: -	attr.log_buf = ptr_to_u64(log_buf);
1: -	attr.log_size = log_buf_sz;
1: -	attr.log_level = log_level;
1: -	log_buf[0] = 0;
1: -	attr.kern_version = kern_version;
1: -	attr.prog_flags = prog_flags;
1: -
1: -	fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +                       size_t insns_cnt, __u32 prog_flags, const char *license,
1: +                       __u32 kern_version, char *log_buf, size_t log_buf_sz,
1: +                       int log_level) {
1: +  union bpf_attr attr;
1: +  int fd;
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_type = type;
1: +  attr.insn_cnt = (__u32)insns_cnt;
1: +  attr.insns = ptr_to_u64(insns);
1: +  attr.license = ptr_to_u64(license);
1: +  attr.log_buf = ptr_to_u64(log_buf);
1: +  attr.log_size = log_buf_sz;
1: +  attr.log_level = log_level;
1: +  log_buf[0] = 0;
1: +  attr.kern_version = kern_version;
1: +  attr.prog_flags = prog_flags;
1: +
1: +  fd = sys_bpf_prog_load(&attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_map_update_elem(int fd, const void *key, const void *value,
1: -			__u64 flags)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: -	attr.value = ptr_to_u64(value);
1: -	attr.flags = flags;
1: -
1: -	ret = sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +                        __u64 flags) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1: +  attr.value = ptr_to_u64(value);
1: +  attr.flags = flags;
1: +
1: +  ret = sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_map_lookup_elem(int fd, const void *key, void *value)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_map_lookup_elem(int fd, const void *key, void *value) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: -	attr.value = ptr_to_u64(value);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1: +  attr.value = ptr_to_u64(value);
1:  
1: -	ret = sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_map_lookup_elem_flags(int fd, const void *key, void *value, __u64 flags)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_map_lookup_elem_flags(int fd, const void *key, void *value,
1: +                              __u64 flags) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: -	attr.value = ptr_to_u64(value);
1: -	attr.flags = flags;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1: +  attr.value = ptr_to_u64(value);
1: +  attr.flags = flags;
1:  
1: -	ret = sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_map_lookup_and_delete_elem(int fd, const void *key, void *value)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_map_lookup_and_delete_elem(int fd, const void *key, void *value) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: -	attr.value = ptr_to_u64(value);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1: +  attr.value = ptr_to_u64(value);
1:  
1: -	ret = sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, __u64 flags)
1: -{
1: -	union bpf_attr attr;
1: +int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value,
1: +                                         __u64 flags) {
1: +  union bpf_attr attr;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: -	attr.value = ptr_to_u64(value);
1: -	attr.flags = flags;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1: +  attr.value = ptr_to_u64(value);
1: +  attr.flags = flags;
1:  
1: -	return sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));
1: +  return sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));
1:  }
1:  
1: -int bpf_map_delete_elem(int fd, const void *key)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_map_delete_elem(int fd, const void *key) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1:  
1: -	ret = sys_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_map_get_next_key(int fd, const void *key, void *next_key)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_map_get_next_key(int fd, const void *key, void *next_key) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: -	attr.key = ptr_to_u64(key);
1: -	attr.next_key = ptr_to_u64(next_key);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1: +  attr.key = ptr_to_u64(key);
1: +  attr.next_key = ptr_to_u64(next_key);
1:  
1: -	ret = sys_bpf(BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_map_freeze(int fd)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_map_freeze(int fd) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_fd = fd;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_fd = fd;
1:  
1: -	ret = sys_bpf(BPF_MAP_FREEZE, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_MAP_FREEZE, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -static int bpf_map_batch_common(int cmd, int fd, void  *in_batch,
1: -				void *out_batch, void *keys, void *values,
1: -				__u32 *count,
1: -				const struct bpf_map_batch_opts *opts)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	if (!OPTS_VALID(opts, bpf_map_batch_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.batch.map_fd = fd;
1: -	attr.batch.in_batch = ptr_to_u64(in_batch);
1: -	attr.batch.out_batch = ptr_to_u64(out_batch);
1: -	attr.batch.keys = ptr_to_u64(keys);
1: -	attr.batch.values = ptr_to_u64(values);
1: -	attr.batch.count = *count;
1: -	attr.batch.elem_flags  = OPTS_GET(opts, elem_flags, 0);
1: -	attr.batch.flags = OPTS_GET(opts, flags, 0);
1: -
1: -	ret = sys_bpf(cmd, &attr, sizeof(attr));
1: -	*count = attr.batch.count;
1: -
1: -	return libbpf_err_errno(ret);
1: +static int bpf_map_batch_common(int cmd, int fd, void *in_batch,
1: +                                void *out_batch, void *keys, void *values,
1: +                                __u32 *count,
1: +                                const struct bpf_map_batch_opts *opts) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  if (!OPTS_VALID(opts, bpf_map_batch_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.batch.map_fd = fd;
1: +  attr.batch.in_batch = ptr_to_u64(in_batch);
1: +  attr.batch.out_batch = ptr_to_u64(out_batch);
1: +  attr.batch.keys = ptr_to_u64(keys);
1: +  attr.batch.values = ptr_to_u64(values);
1: +  attr.batch.count = *count;
1: +  attr.batch.elem_flags = OPTS_GET(opts, elem_flags, 0);
1: +  attr.batch.flags = OPTS_GET(opts, flags, 0);
1: +
1: +  ret = sys_bpf(cmd, &attr, sizeof(attr));
1: +  *count = attr.batch.count;
1: +
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1:  int bpf_map_delete_batch(int fd, void *keys, __u32 *count,
1: -			 const struct bpf_map_batch_opts *opts)
1: -{
1: -	return bpf_map_batch_common(BPF_MAP_DELETE_BATCH, fd, NULL,
1: -				    NULL, keys, NULL, count, opts);
1: +                         const struct bpf_map_batch_opts *opts) {
1: +  return bpf_map_batch_common(BPF_MAP_DELETE_BATCH, fd, NULL, NULL, keys, NULL,
1: +                              count, opts);
1:  }
1:  
1:  int bpf_map_lookup_batch(int fd, void *in_batch, void *out_batch, void *keys,
1: -			 void *values, __u32 *count,
1: -			 const struct bpf_map_batch_opts *opts)
1: -{
1: -	return bpf_map_batch_common(BPF_MAP_LOOKUP_BATCH, fd, in_batch,
1: -				    out_batch, keys, values, count, opts);
1: +                         void *values, __u32 *count,
1: +                         const struct bpf_map_batch_opts *opts) {
1: +  return bpf_map_batch_common(BPF_MAP_LOOKUP_BATCH, fd, in_batch, out_batch,
1: +                              keys, values, count, opts);
1:  }
1:  
1:  int bpf_map_lookup_and_delete_batch(int fd, void *in_batch, void *out_batch,
1: -				    void *keys, void *values, __u32 *count,
1: -				    const struct bpf_map_batch_opts *opts)
1: -{
1: -	return bpf_map_batch_common(BPF_MAP_LOOKUP_AND_DELETE_BATCH,
1: -				    fd, in_batch, out_batch, keys, values,
1: -				    count, opts);
1: +                                    void *keys, void *values, __u32 *count,
1: +                                    const struct bpf_map_batch_opts *opts) {
1: +  return bpf_map_batch_common(BPF_MAP_LOOKUP_AND_DELETE_BATCH, fd, in_batch,
1: +                              out_batch, keys, values, count, opts);
1:  }
1:  
1:  int bpf_map_update_batch(int fd, void *keys, void *values, __u32 *count,
1: -			 const struct bpf_map_batch_opts *opts)
1: -{
1: -	return bpf_map_batch_common(BPF_MAP_UPDATE_BATCH, fd, NULL, NULL,
1: -				    keys, values, count, opts);
1: +                         const struct bpf_map_batch_opts *opts) {
1: +  return bpf_map_batch_common(BPF_MAP_UPDATE_BATCH, fd, NULL, NULL, keys,
1: +                              values, count, opts);
1:  }
1:  
1: -int bpf_obj_pin(int fd, const char *pathname)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_obj_pin(int fd, const char *pathname) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.pathname = ptr_to_u64((void *)pathname);
1: -	attr.bpf_fd = fd;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.pathname = ptr_to_u64((void *)pathname);
1: +  attr.bpf_fd = fd;
1:  
1: -	ret = sys_bpf(BPF_OBJ_PIN, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_OBJ_PIN, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_obj_get(const char *pathname)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_obj_get(const char *pathname) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.pathname = ptr_to_u64((void *)pathname);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.pathname = ptr_to_u64((void *)pathname);
1:  
1: -	fd = sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_prog_attach(int prog_fd, int target_fd, enum bpf_attach_type type,
1: -		    unsigned int flags)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_prog_attach_opts, opts,
1: -		.flags = flags,
1: -	);
1: +                    unsigned int flags) {
1: +  DECLARE_LIBBPF_OPTS(bpf_prog_attach_opts, opts, .flags = flags, );
1:  
1: -	return bpf_prog_attach_xattr(prog_fd, target_fd, type, &opts);
1: +  return bpf_prog_attach_xattr(prog_fd, target_fd, type, &opts);
1:  }
1:  
1: -int bpf_prog_attach_xattr(int prog_fd, int target_fd,
1: -			  enum bpf_attach_type type,
1: -			  const struct bpf_prog_attach_opts *opts)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	if (!OPTS_VALID(opts, bpf_prog_attach_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.target_fd	   = target_fd;
1: -	attr.attach_bpf_fd = prog_fd;
1: -	attr.attach_type   = type;
1: -	attr.attach_flags  = OPTS_GET(opts, flags, 0);
1: -	attr.replace_bpf_fd = OPTS_GET(opts, replace_prog_fd, 0);
1: -
1: -	ret = sys_bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +int bpf_prog_attach_xattr(int prog_fd, int target_fd, enum bpf_attach_type type,
1: +                          const struct bpf_prog_attach_opts *opts) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  if (!OPTS_VALID(opts, bpf_prog_attach_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.target_fd = target_fd;
1: +  attr.attach_bpf_fd = prog_fd;
1: +  attr.attach_type = type;
1: +  attr.attach_flags = OPTS_GET(opts, flags, 0);
1: +  attr.replace_bpf_fd = OPTS_GET(opts, replace_prog_fd, 0);
1: +
1: +  ret = sys_bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_prog_detach(int target_fd, enum bpf_attach_type type)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_prog_detach(int target_fd, enum bpf_attach_type type) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.target_fd	 = target_fd;
1: -	attr.attach_type = type;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.target_fd = target_fd;
1: +  attr.attach_type = type;
1:  
1: -	ret = sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_prog_detach2(int prog_fd, int target_fd, enum bpf_attach_type type)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_prog_detach2(int prog_fd, int target_fd, enum bpf_attach_type type) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.target_fd	 = target_fd;
1: -	attr.attach_bpf_fd = prog_fd;
1: -	attr.attach_type = type;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.target_fd = target_fd;
1: +  attr.attach_bpf_fd = prog_fd;
1: +  attr.attach_type = type;
1:  
1: -	ret = sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1:  int bpf_link_create(int prog_fd, int target_fd,
1: -		    enum bpf_attach_type attach_type,
1: -		    const struct bpf_link_create_opts *opts)
1: -{
1: -	__u32 target_btf_id, iter_info_len;
1: -	union bpf_attr attr;
1: -	int fd;
1: -
1: -	if (!OPTS_VALID(opts, bpf_link_create_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	iter_info_len = OPTS_GET(opts, iter_info_len, 0);
1: -	target_btf_id = OPTS_GET(opts, target_btf_id, 0);
1: -
1: -	if (iter_info_len && target_btf_id)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.link_create.prog_fd = prog_fd;
1: -	attr.link_create.target_fd = target_fd;
1: -	attr.link_create.attach_type = attach_type;
1: -	attr.link_create.flags = OPTS_GET(opts, flags, 0);
1: -
1: -	if (iter_info_len) {
1: -		attr.link_create.iter_info =
1: -			ptr_to_u64(OPTS_GET(opts, iter_info, (void *)0));
1: -		attr.link_create.iter_info_len = iter_info_len;
1: -	} else if (target_btf_id) {
1: -		attr.link_create.target_btf_id = target_btf_id;
1: -	}
1: -
1: -	fd = sys_bpf(BPF_LINK_CREATE, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +                    enum bpf_attach_type attach_type,
1: +                    const struct bpf_link_create_opts *opts) {
1: +  __u32 target_btf_id, iter_info_len;
1: +  union bpf_attr attr;
1: +  int fd;
1: +
1: +  if (!OPTS_VALID(opts, bpf_link_create_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  iter_info_len = OPTS_GET(opts, iter_info_len, 0);
1: +  target_btf_id = OPTS_GET(opts, target_btf_id, 0);
1: +
1: +  if (iter_info_len && target_btf_id)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.link_create.prog_fd = prog_fd;
1: +  attr.link_create.target_fd = target_fd;
1: +  attr.link_create.attach_type = attach_type;
1: +  attr.link_create.flags = OPTS_GET(opts, flags, 0);
1: +
1: +  if (iter_info_len) {
1: +    attr.link_create.iter_info =
1: +        ptr_to_u64(OPTS_GET(opts, iter_info, (void *)0));
1: +    attr.link_create.iter_info_len = iter_info_len;
1: +  } else if (target_btf_id) {
1: +    attr.link_create.target_btf_id = target_btf_id;
1: +  }
1: +
1: +  fd = sys_bpf(BPF_LINK_CREATE, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int bpf_link_detach(int link_fd)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +int bpf_link_detach(int link_fd) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.link_detach.link_fd = link_fd;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.link_detach.link_fd = link_fd;
1:  
1: -	ret = sys_bpf(BPF_LINK_DETACH, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_LINK_DETACH, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1:  int bpf_link_update(int link_fd, int new_prog_fd,
1: -		    const struct bpf_link_update_opts *opts)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	if (!OPTS_VALID(opts, bpf_link_update_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.link_update.link_fd = link_fd;
1: -	attr.link_update.new_prog_fd = new_prog_fd;
1: -	attr.link_update.flags = OPTS_GET(opts, flags, 0);
1: -	attr.link_update.old_prog_fd = OPTS_GET(opts, old_prog_fd, 0);
1: -
1: -	ret = sys_bpf(BPF_LINK_UPDATE, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +                    const struct bpf_link_update_opts *opts) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  if (!OPTS_VALID(opts, bpf_link_update_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.link_update.link_fd = link_fd;
1: +  attr.link_update.new_prog_fd = new_prog_fd;
1: +  attr.link_update.flags = OPTS_GET(opts, flags, 0);
1: +  attr.link_update.old_prog_fd = OPTS_GET(opts, old_prog_fd, 0);
1: +
1: +  ret = sys_bpf(BPF_LINK_UPDATE, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_iter_create(int link_fd)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_iter_create(int link_fd) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.iter_create.link_fd = link_fd;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.iter_create.link_fd = link_fd;
1:  
1: -	fd = sys_bpf(BPF_ITER_CREATE, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_ITER_CREATE, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags,
1: -		   __u32 *attach_flags, __u32 *prog_ids, __u32 *prog_cnt)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +                   __u32 *attach_flags, __u32 *prog_ids, __u32 *prog_cnt) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.query.target_fd	= target_fd;
1: -	attr.query.attach_type	= type;
1: -	attr.query.query_flags	= query_flags;
1: -	attr.query.prog_cnt	= *prog_cnt;
1: -	attr.query.prog_ids	= ptr_to_u64(prog_ids);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.query.target_fd = target_fd;
1: +  attr.query.attach_type = type;
1: +  attr.query.query_flags = query_flags;
1: +  attr.query.prog_cnt = *prog_cnt;
1: +  attr.query.prog_ids = ptr_to_u64(prog_ids);
1:  
1: -	ret = sys_bpf(BPF_PROG_QUERY, &attr, sizeof(attr));
1: +  ret = sys_bpf(BPF_PROG_QUERY, &attr, sizeof(attr));
1:  
1: -	if (attach_flags)
1: -		*attach_flags = attr.query.attach_flags;
1: -	*prog_cnt = attr.query.prog_cnt;
1: +  if (attach_flags)
1: +    *attach_flags = attr.query.attach_flags;
1: +  *prog_cnt = attr.query.prog_cnt;
1:  
1: -	return libbpf_err_errno(ret);
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1:  int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size,
1: -		      void *data_out, __u32 *size_out, __u32 *retval,
1: -		      __u32 *duration)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.test.prog_fd = prog_fd;
1: -	attr.test.data_in = ptr_to_u64(data);
1: -	attr.test.data_out = ptr_to_u64(data_out);
1: -	attr.test.data_size_in = size;
1: -	attr.test.repeat = repeat;
1: -
1: -	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
1: -
1: -	if (size_out)
1: -		*size_out = attr.test.data_size_out;
1: -	if (retval)
1: -		*retval = attr.test.retval;
1: -	if (duration)
1: -		*duration = attr.test.duration;
1: -
1: -	return libbpf_err_errno(ret);
1: +                      void *data_out, __u32 *size_out, __u32 *retval,
1: +                      __u32 *duration) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.test.prog_fd = prog_fd;
1: +  attr.test.data_in = ptr_to_u64(data);
1: +  attr.test.data_out = ptr_to_u64(data_out);
1: +  attr.test.data_size_in = size;
1: +  attr.test.repeat = repeat;
1: +
1: +  ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
1: +
1: +  if (size_out)
1: +    *size_out = attr.test.data_size_out;
1: +  if (retval)
1: +    *retval = attr.test.retval;
1: +  if (duration)
1: +    *duration = attr.test.duration;
1: +
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	if (!test_attr->data_out && test_attr->data_size_out > 0)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.test.prog_fd = test_attr->prog_fd;
1: -	attr.test.data_in = ptr_to_u64(test_attr->data_in);
1: -	attr.test.data_out = ptr_to_u64(test_attr->data_out);
1: -	attr.test.data_size_in = test_attr->data_size_in;
1: -	attr.test.data_size_out = test_attr->data_size_out;
1: -	attr.test.ctx_in = ptr_to_u64(test_attr->ctx_in);
1: -	attr.test.ctx_out = ptr_to_u64(test_attr->ctx_out);
1: -	attr.test.ctx_size_in = test_attr->ctx_size_in;
1: -	attr.test.ctx_size_out = test_attr->ctx_size_out;
1: -	attr.test.repeat = test_attr->repeat;
1: -
1: -	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
1: -
1: -	test_attr->data_size_out = attr.test.data_size_out;
1: -	test_attr->ctx_size_out = attr.test.ctx_size_out;
1: -	test_attr->retval = attr.test.retval;
1: -	test_attr->duration = attr.test.duration;
1: -
1: -	return libbpf_err_errno(ret);
1: +int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  if (!test_attr->data_out && test_attr->data_size_out > 0)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.test.prog_fd = test_attr->prog_fd;
1: +  attr.test.data_in = ptr_to_u64(test_attr->data_in);
1: +  attr.test.data_out = ptr_to_u64(test_attr->data_out);
1: +  attr.test.data_size_in = test_attr->data_size_in;
1: +  attr.test.data_size_out = test_attr->data_size_out;
1: +  attr.test.ctx_in = ptr_to_u64(test_attr->ctx_in);
1: +  attr.test.ctx_out = ptr_to_u64(test_attr->ctx_out);
1: +  attr.test.ctx_size_in = test_attr->ctx_size_in;
1: +  attr.test.ctx_size_out = test_attr->ctx_size_out;
1: +  attr.test.repeat = test_attr->repeat;
1: +
1: +  ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
1: +
1: +  test_attr->data_size_out = attr.test.data_size_out;
1: +  test_attr->ctx_size_out = attr.test.ctx_size_out;
1: +  test_attr->retval = attr.test.retval;
1: +  test_attr->duration = attr.test.duration;
1: +
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: -
1: -	if (!OPTS_VALID(opts, bpf_test_run_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.test.prog_fd = prog_fd;
1: -	attr.test.cpu = OPTS_GET(opts, cpu, 0);
1: -	attr.test.flags = OPTS_GET(opts, flags, 0);
1: -	attr.test.repeat = OPTS_GET(opts, repeat, 0);
1: -	attr.test.duration = OPTS_GET(opts, duration, 0);
1: -	attr.test.ctx_size_in = OPTS_GET(opts, ctx_size_in, 0);
1: -	attr.test.ctx_size_out = OPTS_GET(opts, ctx_size_out, 0);
1: -	attr.test.data_size_in = OPTS_GET(opts, data_size_in, 0);
1: -	attr.test.data_size_out = OPTS_GET(opts, data_size_out, 0);
1: -	attr.test.ctx_in = ptr_to_u64(OPTS_GET(opts, ctx_in, NULL));
1: -	attr.test.ctx_out = ptr_to_u64(OPTS_GET(opts, ctx_out, NULL));
1: -	attr.test.data_in = ptr_to_u64(OPTS_GET(opts, data_in, NULL));
1: -	attr.test.data_out = ptr_to_u64(OPTS_GET(opts, data_out, NULL));
1: -
1: -	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
1: -
1: -	OPTS_SET(opts, data_size_out, attr.test.data_size_out);
1: -	OPTS_SET(opts, ctx_size_out, attr.test.ctx_size_out);
1: -	OPTS_SET(opts, duration, attr.test.duration);
1: -	OPTS_SET(opts, retval, attr.test.retval);
1: -
1: -	return libbpf_err_errno(ret);
1: +int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts) {
1: +  union bpf_attr attr;
1: +  int ret;
1: +
1: +  if (!OPTS_VALID(opts, bpf_test_run_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.test.prog_fd = prog_fd;
1: +  attr.test.cpu = OPTS_GET(opts, cpu, 0);
1: +  attr.test.flags = OPTS_GET(opts, flags, 0);
1: +  attr.test.repeat = OPTS_GET(opts, repeat, 0);
1: +  attr.test.duration = OPTS_GET(opts, duration, 0);
1: +  attr.test.ctx_size_in = OPTS_GET(opts, ctx_size_in, 0);
1: +  attr.test.ctx_size_out = OPTS_GET(opts, ctx_size_out, 0);
1: +  attr.test.data_size_in = OPTS_GET(opts, data_size_in, 0);
1: +  attr.test.data_size_out = OPTS_GET(opts, data_size_out, 0);
1: +  attr.test.ctx_in = ptr_to_u64(OPTS_GET(opts, ctx_in, NULL));
1: +  attr.test.ctx_out = ptr_to_u64(OPTS_GET(opts, ctx_out, NULL));
1: +  attr.test.data_in = ptr_to_u64(OPTS_GET(opts, data_in, NULL));
1: +  attr.test.data_out = ptr_to_u64(OPTS_GET(opts, data_out, NULL));
1: +
1: +  ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
1: +
1: +  OPTS_SET(opts, data_size_out, attr.test.data_size_out);
1: +  OPTS_SET(opts, ctx_size_out, attr.test.ctx_size_out);
1: +  OPTS_SET(opts, duration, attr.test.duration);
1: +  OPTS_SET(opts, retval, attr.test.retval);
1: +
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1: -static int bpf_obj_get_next_id(__u32 start_id, __u32 *next_id, int cmd)
1: -{
1: -	union bpf_attr attr;
1: -	int err;
1: +static int bpf_obj_get_next_id(__u32 start_id, __u32 *next_id, int cmd) {
1: +  union bpf_attr attr;
1: +  int err;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.start_id = start_id;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.start_id = start_id;
1:  
1: -	err = sys_bpf(cmd, &attr, sizeof(attr));
1: -	if (!err)
1: -		*next_id = attr.next_id;
1: +  err = sys_bpf(cmd, &attr, sizeof(attr));
1: +  if (!err)
1: +    *next_id = attr.next_id;
1:  
1: -	return libbpf_err_errno(err);
1: +  return libbpf_err_errno(err);
1:  }
1:  
1: -int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)
1: -{
1: -	return bpf_obj_get_next_id(start_id, next_id, BPF_PROG_GET_NEXT_ID);
1: +int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id) {
1: +  return bpf_obj_get_next_id(start_id, next_id, BPF_PROG_GET_NEXT_ID);
1:  }
1:  
1: -int bpf_map_get_next_id(__u32 start_id, __u32 *next_id)
1: -{
1: -	return bpf_obj_get_next_id(start_id, next_id, BPF_MAP_GET_NEXT_ID);
1: +int bpf_map_get_next_id(__u32 start_id, __u32 *next_id) {
1: +  return bpf_obj_get_next_id(start_id, next_id, BPF_MAP_GET_NEXT_ID);
1:  }
1:  
1: -int bpf_btf_get_next_id(__u32 start_id, __u32 *next_id)
1: -{
1: -	return bpf_obj_get_next_id(start_id, next_id, BPF_BTF_GET_NEXT_ID);
1: +int bpf_btf_get_next_id(__u32 start_id, __u32 *next_id) {
1: +  return bpf_obj_get_next_id(start_id, next_id, BPF_BTF_GET_NEXT_ID);
1:  }
1:  
1: -int bpf_link_get_next_id(__u32 start_id, __u32 *next_id)
1: -{
1: -	return bpf_obj_get_next_id(start_id, next_id, BPF_LINK_GET_NEXT_ID);
1: +int bpf_link_get_next_id(__u32 start_id, __u32 *next_id) {
1: +  return bpf_obj_get_next_id(start_id, next_id, BPF_LINK_GET_NEXT_ID);
1:  }
1:  
1: -int bpf_prog_get_fd_by_id(__u32 id)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_prog_get_fd_by_id(__u32 id) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_id = id;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_id = id;
1:  
1: -	fd = sys_bpf(BPF_PROG_GET_FD_BY_ID, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_PROG_GET_FD_BY_ID, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int bpf_map_get_fd_by_id(__u32 id)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_map_get_fd_by_id(__u32 id) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.map_id = id;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.map_id = id;
1:  
1: -	fd = sys_bpf(BPF_MAP_GET_FD_BY_ID, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_MAP_GET_FD_BY_ID, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int bpf_btf_get_fd_by_id(__u32 id)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_btf_get_fd_by_id(__u32 id) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.btf_id = id;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.btf_id = id;
1:  
1: -	fd = sys_bpf(BPF_BTF_GET_FD_BY_ID, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_BTF_GET_FD_BY_ID, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int bpf_link_get_fd_by_id(__u32 id)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_link_get_fd_by_id(__u32 id) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.link_id = id;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.link_id = id;
1:  
1: -	fd = sys_bpf(BPF_LINK_GET_FD_BY_ID, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_LINK_GET_FD_BY_ID, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len)
1: -{
1: -	union bpf_attr attr;
1: -	int err;
1: +int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len) {
1: +  union bpf_attr attr;
1: +  int err;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.info.bpf_fd = bpf_fd;
1: -	attr.info.info_len = *info_len;
1: -	attr.info.info = ptr_to_u64(info);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.info.bpf_fd = bpf_fd;
1: +  attr.info.info_len = *info_len;
1: +  attr.info.info = ptr_to_u64(info);
1:  
1: -	err = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &attr, sizeof(attr));
1: +  err = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &attr, sizeof(attr));
1:  
1: -	if (!err)
1: -		*info_len = attr.info.info_len;
1: +  if (!err)
1: +    *info_len = attr.info.info_len;
1:  
1: -	return libbpf_err_errno(err);
1: +  return libbpf_err_errno(err);
1:  }
1:  
1: -int bpf_raw_tracepoint_open(const char *name, int prog_fd)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_raw_tracepoint_open(const char *name, int prog_fd) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.raw_tracepoint.name = ptr_to_u64(name);
1: -	attr.raw_tracepoint.prog_fd = prog_fd;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.raw_tracepoint.name = ptr_to_u64(name);
1: +  attr.raw_tracepoint.prog_fd = prog_fd;
1:  
1: -	fd = sys_bpf(BPF_RAW_TRACEPOINT_OPEN, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_RAW_TRACEPOINT_OPEN, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1: -int bpf_load_btf(const void *btf, __u32 btf_size, char *log_buf, __u32 log_buf_size,
1: -		 bool do_log)
1: -{
1: -	union bpf_attr attr = {};
1: -	int fd;
1: +int bpf_load_btf(const void *btf, __u32 btf_size, char *log_buf,
1: +                 __u32 log_buf_size, bool do_log) {
1: +  union bpf_attr attr = {};
1: +  int fd;
1:  
1: -	attr.btf = ptr_to_u64(btf);
1: -	attr.btf_size = btf_size;
1: +  attr.btf = ptr_to_u64(btf);
1: +  attr.btf_size = btf_size;
1:  
1:  retry:
1: -	if (do_log && log_buf && log_buf_size) {
1: -		attr.btf_log_level = 1;
1: -		attr.btf_log_size = log_buf_size;
1: -		attr.btf_log_buf = ptr_to_u64(log_buf);
1: -	}
1: +  if (do_log && log_buf && log_buf_size) {
1: +    attr.btf_log_level = 1;
1: +    attr.btf_log_size = log_buf_size;
1: +    attr.btf_log_buf = ptr_to_u64(log_buf);
1: +  }
1:  
1: -	fd = sys_bpf(BPF_BTF_LOAD, &attr, sizeof(attr));
1: +  fd = sys_bpf(BPF_BTF_LOAD, &attr, sizeof(attr));
1:  
1: -	if (fd < 0 && !do_log && log_buf && log_buf_size) {
1: -		do_log = true;
1: -		goto retry;
1: -	}
1: +  if (fd < 0 && !do_log && log_buf && log_buf_size) {
1: +    do_log = true;
1: +    goto retry;
1: +  }
1:  
1: -	return libbpf_err_errno(fd);
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len,
1: -		      __u32 *prog_id, __u32 *fd_type, __u64 *probe_offset,
1: -		      __u64 *probe_addr)
1: -{
1: -	union bpf_attr attr = {};
1: -	int err;
1: -
1: -	attr.task_fd_query.pid = pid;
1: -	attr.task_fd_query.fd = fd;
1: -	attr.task_fd_query.flags = flags;
1: -	attr.task_fd_query.buf = ptr_to_u64(buf);
1: -	attr.task_fd_query.buf_len = *buf_len;
1: -
1: -	err = sys_bpf(BPF_TASK_FD_QUERY, &attr, sizeof(attr));
1: -
1: -	*buf_len = attr.task_fd_query.buf_len;
1: -	*prog_id = attr.task_fd_query.prog_id;
1: -	*fd_type = attr.task_fd_query.fd_type;
1: -	*probe_offset = attr.task_fd_query.probe_offset;
1: -	*probe_addr = attr.task_fd_query.probe_addr;
1: -
1: -	return libbpf_err_errno(err);
1: +                      __u32 *prog_id, __u32 *fd_type, __u64 *probe_offset,
1: +                      __u64 *probe_addr) {
1: +  union bpf_attr attr = {};
1: +  int err;
1: +
1: +  attr.task_fd_query.pid = pid;
1: +  attr.task_fd_query.fd = fd;
1: +  attr.task_fd_query.flags = flags;
1: +  attr.task_fd_query.buf = ptr_to_u64(buf);
1: +  attr.task_fd_query.buf_len = *buf_len;
1: +
1: +  err = sys_bpf(BPF_TASK_FD_QUERY, &attr, sizeof(attr));
1: +
1: +  *buf_len = attr.task_fd_query.buf_len;
1: +  *prog_id = attr.task_fd_query.prog_id;
1: +  *fd_type = attr.task_fd_query.fd_type;
1: +  *probe_offset = attr.task_fd_query.probe_offset;
1: +  *probe_addr = attr.task_fd_query.probe_addr;
1: +
1: +  return libbpf_err_errno(err);
1:  }
1:  
1: -int bpf_enable_stats(enum bpf_stats_type type)
1: -{
1: -	union bpf_attr attr;
1: -	int fd;
1: +int bpf_enable_stats(enum bpf_stats_type type) {
1: +  union bpf_attr attr;
1: +  int fd;
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.enable_stats.type = type;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.enable_stats.type = type;
1:  
1: -	fd = sys_bpf(BPF_ENABLE_STATS, &attr, sizeof(attr));
1: -	return libbpf_err_errno(fd);
1: +  fd = sys_bpf(BPF_ENABLE_STATS, &attr, sizeof(attr));
1: +  return libbpf_err_errno(fd);
1:  }
1:  
1:  int bpf_prog_bind_map(int prog_fd, int map_fd,
1: -		      const struct bpf_prog_bind_opts *opts)
1: -{
1: -	union bpf_attr attr;
1: -	int ret;
1: +                      const struct bpf_prog_bind_opts *opts) {
1: +  union bpf_attr attr;
1: +  int ret;
1:  
1: -	if (!OPTS_VALID(opts, bpf_prog_bind_opts))
1: -		return libbpf_err(-EINVAL);
1: +  if (!OPTS_VALID(opts, bpf_prog_bind_opts))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_bind_map.prog_fd = prog_fd;
1: -	attr.prog_bind_map.map_fd = map_fd;
1: -	attr.prog_bind_map.flags = OPTS_GET(opts, flags, 0);
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_bind_map.prog_fd = prog_fd;
1: +  attr.prog_bind_map.map_fd = map_fd;
1: +  attr.prog_bind_map.flags = OPTS_GET(opts, flags, 0);
1:  
1: -	ret = sys_bpf(BPF_PROG_BIND_MAP, &attr, sizeof(attr));
1: -	return libbpf_err_errno(ret);
1: +  ret = sys_bpf(BPF_PROG_BIND_MAP, &attr, sizeof(attr));
1: +  return libbpf_err_errno(ret);
1:  }
1: diff --git a/src/cc/libbpf/src/bpf.h b/src/cc/libbpf/src/bpf.h
1: index 4f758f8f..c976c238 100644
1: --- a/src/cc/libbpf/src/bpf.h
1: +++ b/src/cc/libbpf/src/bpf.h
1: @@ -35,195 +35,195 @@ extern "C" {
1:  #endif
1:  
1:  struct bpf_create_map_attr {
1: -	const char *name;
1: -	enum bpf_map_type map_type;
1: -	__u32 map_flags;
1: -	__u32 key_size;
1: -	__u32 value_size;
1: -	__u32 max_entries;
1: -	__u32 numa_node;
1: -	__u32 btf_fd;
1: -	__u32 btf_key_type_id;
1: -	__u32 btf_value_type_id;
1: -	__u32 map_ifindex;
1: -	union {
1: -		__u32 inner_map_fd;
1: -		__u32 btf_vmlinux_value_type_id;
1: -	};
1: +  const char *name;
1: +  enum bpf_map_type map_type;
1: +  __u32 map_flags;
1: +  __u32 key_size;
1: +  __u32 value_size;
1: +  __u32 max_entries;
1: +  __u32 numa_node;
1: +  __u32 btf_fd;
1: +  __u32 btf_key_type_id;
1: +  __u32 btf_value_type_id;
1: +  __u32 map_ifindex;
1: +  union {
1: +    __u32 inner_map_fd;
1: +    __u32 btf_vmlinux_value_type_id;
1: +  };
1:  };
1:  
1: -LIBBPF_API int
1: -bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr);
1: +LIBBPF_API int bpf_create_map_xattr(
1: +    const struct bpf_create_map_attr *create_attr);
1:  LIBBPF_API int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
1: -				   int key_size, int value_size,
1: -				   int max_entries, __u32 map_flags, int node);
1: +                                   int key_size, int value_size,
1: +                                   int max_entries, __u32 map_flags, int node);
1:  LIBBPF_API int bpf_create_map_name(enum bpf_map_type map_type, const char *name,
1: -				   int key_size, int value_size,
1: -				   int max_entries, __u32 map_flags);
1: +                                   int key_size, int value_size,
1: +                                   int max_entries, __u32 map_flags);
1:  LIBBPF_API int bpf_create_map(enum bpf_map_type map_type, int key_size,
1: -			      int value_size, int max_entries, __u32 map_flags);
1: +                              int value_size, int max_entries, __u32 map_flags);
1:  LIBBPF_API int bpf_create_map_in_map_node(enum bpf_map_type map_type,
1: -					  const char *name, int key_size,
1: -					  int inner_map_fd, int max_entries,
1: -					  __u32 map_flags, int node);
1: +                                          const char *name, int key_size,
1: +                                          int inner_map_fd, int max_entries,
1: +                                          __u32 map_flags, int node);
1:  LIBBPF_API int bpf_create_map_in_map(enum bpf_map_type map_type,
1: -				     const char *name, int key_size,
1: -				     int inner_map_fd, int max_entries,
1: -				     __u32 map_flags);
1: +                                     const char *name, int key_size,
1: +                                     int inner_map_fd, int max_entries,
1: +                                     __u32 map_flags);
1:  
1:  struct bpf_load_program_attr {
1: -	enum bpf_prog_type prog_type;
1: -	enum bpf_attach_type expected_attach_type;
1: -	const char *name;
1: -	const struct bpf_insn *insns;
1: -	size_t insns_cnt;
1: -	const char *license;
1: -	union {
1: -		__u32 kern_version;
1: -		__u32 attach_prog_fd;
1: -	};
1: -	union {
1: -		__u32 prog_ifindex;
1: -		__u32 attach_btf_id;
1: -	};
1: -	__u32 prog_btf_fd;
1: -	__u32 func_info_rec_size;
1: -	const void *func_info;
1: -	__u32 func_info_cnt;
1: -	__u32 line_info_rec_size;
1: -	const void *line_info;
1: -	__u32 line_info_cnt;
1: -	__u32 log_level;
1: -	__u32 prog_flags;
1: +  enum bpf_prog_type prog_type;
1: +  enum bpf_attach_type expected_attach_type;
1: +  const char *name;
1: +  const struct bpf_insn *insns;
1: +  size_t insns_cnt;
1: +  const char *license;
1: +  union {
1: +    __u32 kern_version;
1: +    __u32 attach_prog_fd;
1: +  };
1: +  union {
1: +    __u32 prog_ifindex;
1: +    __u32 attach_btf_id;
1: +  };
1: +  __u32 prog_btf_fd;
1: +  __u32 func_info_rec_size;
1: +  const void *func_info;
1: +  __u32 func_info_cnt;
1: +  __u32 line_info_rec_size;
1: +  const void *line_info;
1: +  __u32 line_info_cnt;
1: +  __u32 log_level;
1: +  __u32 prog_flags;
1:  };
1:  
1:  /* Flags to direct loading requirements */
1: -#define MAPS_RELAX_COMPAT	0x01
1: +#define MAPS_RELAX_COMPAT 0x01
1:  
1:  /* Recommend log buffer size */
1: -#define BPF_LOG_BUF_SIZE (UINT32_MAX >> 8) /* verifier maximum in kernels <= 5.1 */
1: -LIBBPF_API int
1: -bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr,
1: -		       char *log_buf, size_t log_buf_sz);
1: +#define BPF_LOG_BUF_SIZE \
1: +  (UINT32_MAX >> 8) /* verifier maximum in kernels <= 5.1 */
1: +LIBBPF_API int bpf_load_program_xattr(
1: +    const struct bpf_load_program_attr *load_attr, char *log_buf,
1: +    size_t log_buf_sz);
1:  LIBBPF_API int bpf_load_program(enum bpf_prog_type type,
1: -				const struct bpf_insn *insns, size_t insns_cnt,
1: -				const char *license, __u32 kern_version,
1: -				char *log_buf, size_t log_buf_sz);
1: +                                const struct bpf_insn *insns, size_t insns_cnt,
1: +                                const char *license, __u32 kern_version,
1: +                                char *log_buf, size_t log_buf_sz);
1:  LIBBPF_API int bpf_verify_program(enum bpf_prog_type type,
1: -				  const struct bpf_insn *insns,
1: -				  size_t insns_cnt, __u32 prog_flags,
1: -				  const char *license, __u32 kern_version,
1: -				  char *log_buf, size_t log_buf_sz,
1: -				  int log_level);
1: +                                  const struct bpf_insn *insns,
1: +                                  size_t insns_cnt, __u32 prog_flags,
1: +                                  const char *license, __u32 kern_version,
1: +                                  char *log_buf, size_t log_buf_sz,
1: +                                  int log_level);
1:  
1:  LIBBPF_API int bpf_map_update_elem(int fd, const void *key, const void *value,
1: -				   __u64 flags);
1: +                                   __u64 flags);
1:  
1:  LIBBPF_API int bpf_map_lookup_elem(int fd, const void *key, void *value);
1:  LIBBPF_API int bpf_map_lookup_elem_flags(int fd, const void *key, void *value,
1: -					 __u64 flags);
1: +                                         __u64 flags);
1:  LIBBPF_API int bpf_map_lookup_and_delete_elem(int fd, const void *key,
1: -					      void *value);
1: +                                              void *value);
1:  LIBBPF_API int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key,
1: -						    void *value, __u64 flags);
1: +                                                    void *value, __u64 flags);
1:  LIBBPF_API int bpf_map_delete_elem(int fd, const void *key);
1:  LIBBPF_API int bpf_map_get_next_key(int fd, const void *key, void *next_key);
1:  LIBBPF_API int bpf_map_freeze(int fd);
1:  
1:  struct bpf_map_batch_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	__u64 elem_flags;
1: -	__u64 flags;
1: +  size_t sz; /* size of this struct for forward/backward compatibility */
1: +  __u64 elem_flags;
1: +  __u64 flags;
1:  };
1:  #define bpf_map_batch_opts__last_field flags
1:  
1: -LIBBPF_API int bpf_map_delete_batch(int fd, void *keys,
1: -				    __u32 *count,
1: -				    const struct bpf_map_batch_opts *opts);
1: +LIBBPF_API int bpf_map_delete_batch(int fd, void *keys, __u32 *count,
1: +                                    const struct bpf_map_batch_opts *opts);
1:  LIBBPF_API int bpf_map_lookup_batch(int fd, void *in_batch, void *out_batch,
1: -				    void *keys, void *values, __u32 *count,
1: -				    const struct bpf_map_batch_opts *opts);
1: -LIBBPF_API int bpf_map_lookup_and_delete_batch(int fd, void *in_batch,
1: -					void *out_batch, void *keys,
1: -					void *values, __u32 *count,
1: -					const struct bpf_map_batch_opts *opts);
1: +                                    void *keys, void *values, __u32 *count,
1: +                                    const struct bpf_map_batch_opts *opts);
1: +LIBBPF_API int bpf_map_lookup_and_delete_batch(
1: +    int fd, void *in_batch, void *out_batch, void *keys, void *values,
1: +    __u32 *count, const struct bpf_map_batch_opts *opts);
1:  LIBBPF_API int bpf_map_update_batch(int fd, void *keys, void *values,
1: -				    __u32 *count,
1: -				    const struct bpf_map_batch_opts *opts);
1: +                                    __u32 *count,
1: +                                    const struct bpf_map_batch_opts *opts);
1:  
1:  LIBBPF_API int bpf_obj_pin(int fd, const char *pathname);
1:  LIBBPF_API int bpf_obj_get(const char *pathname);
1:  
1:  struct bpf_prog_attach_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	unsigned int flags;
1: -	int replace_prog_fd;
1: +  size_t sz; /* size of this struct for forward/backward compatibility */
1: +  unsigned int flags;
1: +  int replace_prog_fd;
1:  };
1:  #define bpf_prog_attach_opts__last_field replace_prog_fd
1:  
1:  LIBBPF_API int bpf_prog_attach(int prog_fd, int attachable_fd,
1: -			       enum bpf_attach_type type, unsigned int flags);
1: +                               enum bpf_attach_type type, unsigned int flags);
1:  LIBBPF_API int bpf_prog_attach_xattr(int prog_fd, int attachable_fd,
1: -				     enum bpf_attach_type type,
1: -				     const struct bpf_prog_attach_opts *opts);
1: +                                     enum bpf_attach_type type,
1: +                                     const struct bpf_prog_attach_opts *opts);
1:  LIBBPF_API int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);
1:  LIBBPF_API int bpf_prog_detach2(int prog_fd, int attachable_fd,
1: -				enum bpf_attach_type type);
1: +                                enum bpf_attach_type type);
1:  
1:  union bpf_iter_link_info; /* defined in up-to-date linux/bpf.h */
1:  struct bpf_link_create_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	__u32 flags;
1: -	union bpf_iter_link_info *iter_info;
1: -	__u32 iter_info_len;
1: -	__u32 target_btf_id;
1: +  size_t sz; /* size of this struct for forward/backward compatibility */
1: +  __u32 flags;
1: +  union bpf_iter_link_info *iter_info;
1: +  __u32 iter_info_len;
1: +  __u32 target_btf_id;
1:  };
1:  #define bpf_link_create_opts__last_field target_btf_id
1:  
1:  LIBBPF_API int bpf_link_create(int prog_fd, int target_fd,
1: -			       enum bpf_attach_type attach_type,
1: -			       const struct bpf_link_create_opts *opts);
1: +                               enum bpf_attach_type attach_type,
1: +                               const struct bpf_link_create_opts *opts);
1:  
1:  LIBBPF_API int bpf_link_detach(int link_fd);
1:  
1:  struct bpf_link_update_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	__u32 flags;	   /* extra flags */
1: -	__u32 old_prog_fd; /* expected old program FD */
1: +  size_t sz;   /* size of this struct for forward/backward compatibility */
1: +  __u32 flags; /* extra flags */
1: +  __u32 old_prog_fd; /* expected old program FD */
1:  };
1:  #define bpf_link_update_opts__last_field old_prog_fd
1:  
1:  LIBBPF_API int bpf_link_update(int link_fd, int new_prog_fd,
1: -			       const struct bpf_link_update_opts *opts);
1: +                               const struct bpf_link_update_opts *opts);
1:  
1:  LIBBPF_API int bpf_iter_create(int link_fd);
1:  
1:  struct bpf_prog_test_run_attr {
1: -	int prog_fd;
1: -	int repeat;
1: -	const void *data_in;
1: -	__u32 data_size_in;
1: -	void *data_out;      /* optional */
1: -	__u32 data_size_out; /* in: max length of data_out
1: -			      * out: length of data_out */
1: -	__u32 retval;        /* out: return code of the BPF program */
1: -	__u32 duration;      /* out: average per repetition in ns */
1: -	const void *ctx_in; /* optional */
1: -	__u32 ctx_size_in;
1: -	void *ctx_out;      /* optional */
1: -	__u32 ctx_size_out; /* in: max length of ctx_out
1: -			     * out: length of cxt_out */
1: +  int prog_fd;
1: +  int repeat;
1: +  const void *data_in;
1: +  __u32 data_size_in;
1: +  void *data_out;      /* optional */
1: +  __u32 data_size_out; /* in: max length of data_out
1: +                        * out: length of data_out */
1: +  __u32 retval;        /* out: return code of the BPF program */
1: +  __u32 duration;      /* out: average per repetition in ns */
1: +  const void *ctx_in;  /* optional */
1: +  __u32 ctx_size_in;
1: +  void *ctx_out;      /* optional */
1: +  __u32 ctx_size_out; /* in: max length of ctx_out
1: +                       * out: length of cxt_out */
1:  };
1:  
1: -LIBBPF_API int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr);
1: +LIBBPF_API int bpf_prog_test_run_xattr(
1: +    struct bpf_prog_test_run_attr *test_attr);
1:  
1:  /*
1:   * bpf_prog_test_run does not check that data_out is large enough. Consider
1:   * using bpf_prog_test_run_xattr instead.
1:   */
1:  LIBBPF_API int bpf_prog_test_run(int prog_fd, int repeat, void *data,
1: -				 __u32 size, void *data_out, __u32 *size_out,
1: -				 __u32 *retval, __u32 *duration);
1: +                                 __u32 size, void *data_out, __u32 *size_out,
1: +                                 __u32 *retval, __u32 *duration);
1:  LIBBPF_API int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id);
1:  LIBBPF_API int bpf_map_get_next_id(__u32 start_id, __u32 *next_id);
1:  LIBBPF_API int bpf_btf_get_next_id(__u32 start_id, __u32 *next_id);
1: @@ -234,51 +234,51 @@ LIBBPF_API int bpf_btf_get_fd_by_id(__u32 id);
1:  LIBBPF_API int bpf_link_get_fd_by_id(__u32 id);
1:  LIBBPF_API int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len);
1:  LIBBPF_API int bpf_prog_query(int target_fd, enum bpf_attach_type type,
1: -			      __u32 query_flags, __u32 *attach_flags,
1: -			      __u32 *prog_ids, __u32 *prog_cnt);
1: +                              __u32 query_flags, __u32 *attach_flags,
1: +                              __u32 *prog_ids, __u32 *prog_cnt);
1:  LIBBPF_API int bpf_raw_tracepoint_open(const char *name, int prog_fd);
1:  LIBBPF_API int bpf_load_btf(const void *btf, __u32 btf_size, char *log_buf,
1: -			    __u32 log_buf_size, bool do_log);
1: +                            __u32 log_buf_size, bool do_log);
1:  LIBBPF_API int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf,
1: -				 __u32 *buf_len, __u32 *prog_id, __u32 *fd_type,
1: -				 __u64 *probe_offset, __u64 *probe_addr);
1: +                                 __u32 *buf_len, __u32 *prog_id, __u32 *fd_type,
1: +                                 __u64 *probe_offset, __u64 *probe_addr);
1:  
1:  enum bpf_stats_type; /* defined in up-to-date linux/bpf.h */
1:  LIBBPF_API int bpf_enable_stats(enum bpf_stats_type type);
1:  
1:  struct bpf_prog_bind_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	__u32 flags;
1: +  size_t sz; /* size of this struct for forward/backward compatibility */
1: +  __u32 flags;
1:  };
1:  #define bpf_prog_bind_opts__last_field flags
1:  
1:  LIBBPF_API int bpf_prog_bind_map(int prog_fd, int map_fd,
1: -				 const struct bpf_prog_bind_opts *opts);
1: +                                 const struct bpf_prog_bind_opts *opts);
1:  
1:  struct bpf_test_run_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	const void *data_in; /* optional */
1: -	void *data_out;      /* optional */
1: -	__u32 data_size_in;
1: -	__u32 data_size_out; /* in: max length of data_out
1: -			      * out: length of data_out
1: -			      */
1: -	const void *ctx_in; /* optional */
1: -	void *ctx_out;      /* optional */
1: -	__u32 ctx_size_in;
1: -	__u32 ctx_size_out; /* in: max length of ctx_out
1: -			     * out: length of cxt_out
1: -			     */
1: -	__u32 retval;        /* out: return code of the BPF program */
1: -	int repeat;
1: -	__u32 duration;      /* out: average per repetition in ns */
1: -	__u32 flags;
1: -	__u32 cpu;
1: +  size_t sz; /* size of this struct for forward/backward compatibility */
1: +  const void *data_in; /* optional */
1: +  void *data_out;      /* optional */
1: +  __u32 data_size_in;
1: +  __u32 data_size_out; /* in: max length of data_out
1: +                        * out: length of data_out
1: +                        */
1: +  const void *ctx_in;  /* optional */
1: +  void *ctx_out;       /* optional */
1: +  __u32 ctx_size_in;
1: +  __u32 ctx_size_out; /* in: max length of ctx_out
1: +                       * out: length of cxt_out
1: +                       */
1: +  __u32 retval;       /* out: return code of the BPF program */
1: +  int repeat;
1: +  __u32 duration; /* out: average per repetition in ns */
1: +  __u32 flags;
1: +  __u32 cpu;
1:  };
1:  #define bpf_test_run_opts__last_field cpu
1:  
1:  LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
1: -				      struct bpf_test_run_opts *opts);
1: +                                      struct bpf_test_run_opts *opts);
1:  
1:  #ifdef __cplusplus
1:  } /* extern "C" */
1: diff --git a/src/cc/libbpf/src/bpf_core_read.h b/src/cc/libbpf/src/bpf_core_read.h
1: index 09ebe3db..676895ad 100644
1: --- a/src/cc/libbpf/src/bpf_core_read.h
1: +++ b/src/cc/libbpf/src/bpf_core_read.h
1: @@ -11,51 +11,50 @@
1:   * selftests/bpf for examples.
1:   */
1:  enum bpf_field_info_kind {
1: -	BPF_FIELD_BYTE_OFFSET = 0,	/* field byte offset */
1: -	BPF_FIELD_BYTE_SIZE = 1,
1: -	BPF_FIELD_EXISTS = 2,		/* field existence in target kernel */
1: -	BPF_FIELD_SIGNED = 3,
1: -	BPF_FIELD_LSHIFT_U64 = 4,
1: -	BPF_FIELD_RSHIFT_U64 = 5,
1: +  BPF_FIELD_BYTE_OFFSET = 0, /* field byte offset */
1: +  BPF_FIELD_BYTE_SIZE = 1,
1: +  BPF_FIELD_EXISTS = 2, /* field existence in target kernel */
1: +  BPF_FIELD_SIGNED = 3,
1: +  BPF_FIELD_LSHIFT_U64 = 4,
1: +  BPF_FIELD_RSHIFT_U64 = 5,
1:  };
1:  
1:  /* second argument to __builtin_btf_type_id() built-in */
1:  enum bpf_type_id_kind {
1: -	BPF_TYPE_ID_LOCAL = 0,		/* BTF type ID in local program */
1: -	BPF_TYPE_ID_TARGET = 1,		/* BTF type ID in target kernel */
1: +  BPF_TYPE_ID_LOCAL = 0,  /* BTF type ID in local program */
1: +  BPF_TYPE_ID_TARGET = 1, /* BTF type ID in target kernel */
1:  };
1:  
1:  /* second argument to __builtin_preserve_type_info() built-in */
1:  enum bpf_type_info_kind {
1: -	BPF_TYPE_EXISTS = 0,		/* type existence in target kernel */
1: -	BPF_TYPE_SIZE = 1,		/* type size in target kernel */
1: +  BPF_TYPE_EXISTS = 0, /* type existence in target kernel */
1: +  BPF_TYPE_SIZE = 1,   /* type size in target kernel */
1:  };
1:  
1:  /* second argument to __builtin_preserve_enum_value() built-in */
1:  enum bpf_enum_value_kind {
1: -	BPF_ENUMVAL_EXISTS = 0,		/* enum value existence in kernel */
1: -	BPF_ENUMVAL_VALUE = 1,		/* enum value value relocation */
1: +  BPF_ENUMVAL_EXISTS = 0, /* enum value existence in kernel */
1: +  BPF_ENUMVAL_VALUE = 1,  /* enum value value relocation */
1:  };
1:  
1: -#define __CORE_RELO(src, field, info)					      \
1: -	__builtin_preserve_field_info((src)->field, BPF_FIELD_##info)
1: +#define __CORE_RELO(src, field, info) \
1: +  __builtin_preserve_field_info((src)->field, BPF_FIELD_##info)
1:  
1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
1: -#define __CORE_BITFIELD_PROBE_READ(dst, src, fld)			      \
1: -	bpf_probe_read_kernel(						      \
1: -			(void *)dst,				      \
1: -			__CORE_RELO(src, fld, BYTE_SIZE),		      \
1: -			(const void *)src + __CORE_RELO(src, fld, BYTE_OFFSET))
1: +#define __CORE_BITFIELD_PROBE_READ(dst, src, fld)    \
1: +  bpf_probe_read_kernel(                             \
1: +      (void *)dst, __CORE_RELO(src, fld, BYTE_SIZE), \
1: +      (const void *)src + __CORE_RELO(src, fld, BYTE_OFFSET))
1:  #else
1:  /* semantics of LSHIFT_64 assumes loading values into low-ordered bytes, so
1:   * for big-endian we need to adjust destination pointer accordingly, based on
1:   * field byte size
1:   */
1: -#define __CORE_BITFIELD_PROBE_READ(dst, src, fld)			      \
1: -	bpf_probe_read_kernel(						      \
1: -			(void *)dst + (8 - __CORE_RELO(src, fld, BYTE_SIZE)), \
1: -			__CORE_RELO(src, fld, BYTE_SIZE),		      \
1: -			(const void *)src + __CORE_RELO(src, fld, BYTE_OFFSET))
1: +#define __CORE_BITFIELD_PROBE_READ(dst, src, fld)           \
1: +  bpf_probe_read_kernel(                                    \
1: +      (void *)dst + (8 - __CORE_RELO(src, fld, BYTE_SIZE)), \
1: +      __CORE_RELO(src, fld, BYTE_SIZE),                     \
1: +      (const void *)src + __CORE_RELO(src, fld, BYTE_OFFSET))
1:  #endif
1:  
1:  /*
1: @@ -66,17 +65,18 @@ enum bpf_enum_value_kind {
1:   * integer storage. Macro functions as an expression and its return type is
1:   * bpf_probe_read_kernel()'s return value: 0, on success, <0 on error.
1:   */
1: -#define BPF_CORE_READ_BITFIELD_PROBED(s, field) ({			      \
1: -	unsigned long long val = 0;					      \
1: -									      \
1: -	__CORE_BITFIELD_PROBE_READ(&val, s, field);			      \
1: -	val <<= __CORE_RELO(s, field, LSHIFT_U64);			      \
1: -	if (__CORE_RELO(s, field, SIGNED))				      \
1: -		val = ((long long)val) >> __CORE_RELO(s, field, RSHIFT_U64);  \
1: -	else								      \
1: -		val = val >> __CORE_RELO(s, field, RSHIFT_U64);		      \
1: -	val;								      \
1: -})
1: +#define BPF_CORE_READ_BITFIELD_PROBED(s, field)                    \
1: +  ({                                                               \
1: +    unsigned long long val = 0;                                    \
1: +                                                                   \
1: +    __CORE_BITFIELD_PROBE_READ(&val, s, field);                    \
1: +    val <<= __CORE_RELO(s, field, LSHIFT_U64);                     \
1: +    if (__CORE_RELO(s, field, SIGNED))                             \
1: +      val = ((long long)val) >> __CORE_RELO(s, field, RSHIFT_U64); \
1: +    else                                                           \
1: +      val = val >> __CORE_RELO(s, field, RSHIFT_U64);              \
1: +    val;                                                           \
1: +  })
1:  
1:  /*
1:   * Extract bitfield, identified by s->field, and return its value as u64.
1: @@ -84,31 +84,40 @@ enum bpf_enum_value_kind {
1:   * BPF program types that support such functionality (e.g., typed raw
1:   * tracepoints).
1:   */
1: -#define BPF_CORE_READ_BITFIELD(s, field) ({				      \
1: -	const void *p = (const void *)s + __CORE_RELO(s, field, BYTE_OFFSET); \
1: -	unsigned long long val;						      \
1: -									      \
1: -	/* This is a so-called barrier_var() operation that makes specified   \
1: -	 * variable "a black box" for optimizing compiler.		      \
1: -	 * It forces compiler to perform BYTE_OFFSET relocation on p and use  \
1: -	 * its calculated value in the switch below, instead of applying      \
1: -	 * the same relocation 4 times for each individual memory load.       \
1: -	 */								      \
1: -	asm volatile("" : "=r"(p) : "0"(p));				      \
1: -									      \
1: -	switch (__CORE_RELO(s, field, BYTE_SIZE)) {			      \
1: -	case 1: val = *(const unsigned char *)p; break;			      \
1: -	case 2: val = *(const unsigned short *)p; break;		      \
1: -	case 4: val = *(const unsigned int *)p; break;			      \
1: -	case 8: val = *(const unsigned long long *)p; break;		      \
1: -	}								      \
1: -	val <<= __CORE_RELO(s, field, LSHIFT_U64);			      \
1: -	if (__CORE_RELO(s, field, SIGNED))				      \
1: -		val = ((long long)val) >> __CORE_RELO(s, field, RSHIFT_U64);  \
1: -	else								      \
1: -		val = val >> __CORE_RELO(s, field, RSHIFT_U64);		      \
1: -	val;								      \
1: -})
1: +#define BPF_CORE_READ_BITFIELD(s, field)                                  \
1: +  ({                                                                      \
1: +    const void *p = (const void *)s + __CORE_RELO(s, field, BYTE_OFFSET); \
1: +    unsigned long long val;                                               \
1: +                                                                          \
1: +    /* This is a so-called barrier_var() operation that makes specified   \
1: +     * variable "a black box" for optimizing compiler.                    \
1: +     * It forces compiler to perform BYTE_OFFSET relocation on p and use  \
1: +     * its calculated value in the switch below, instead of applying      \
1: +     * the same relocation 4 times for each individual memory load.       \
1: +     */                                                                   \
1: +    asm volatile("" : "=r"(p) : "0"(p));                                  \
1: +                                                                          \
1: +    switch (__CORE_RELO(s, field, BYTE_SIZE)) {                           \
1: +    case 1:                                                               \
1: +      val = *(const unsigned char *)p;                                    \
1: +      break;                                                              \
1: +    case 2:                                                               \
1: +      val = *(const unsigned short *)p;                                   \
1: +      break;                                                              \
1: +    case 4:                                                               \
1: +      val = *(const unsigned int *)p;                                     \
1: +      break;                                                              \
1: +    case 8:                                                               \
1: +      val = *(const unsigned long long *)p;                               \
1: +      break;                                                              \
1: +    }                                                                     \
1: +    val <<= __CORE_RELO(s, field, LSHIFT_U64);                            \
1: +    if (__CORE_RELO(s, field, SIGNED))                                    \
1: +      val = ((long long)val) >> __CORE_RELO(s, field, RSHIFT_U64);        \
1: +    else                                                                  \
1: +      val = val >> __CORE_RELO(s, field, RSHIFT_U64);                     \
1: +    val;                                                                  \
1: +  })
1:  
1:  /*
1:   * Convenience macro to check that field actually exists in target kernel's.
1: @@ -116,23 +125,23 @@ enum bpf_enum_value_kind {
1:   *    1, if matching field is present in target kernel;
1:   *    0, if no matching field found.
1:   */
1: -#define bpf_core_field_exists(field)					    \
1: -	__builtin_preserve_field_info(field, BPF_FIELD_EXISTS)
1: +#define bpf_core_field_exists(field) \
1: +  __builtin_preserve_field_info(field, BPF_FIELD_EXISTS)
1:  
1:  /*
1:   * Convenience macro to get the byte size of a field. Works for integers,
1:   * struct/unions, pointers, arrays, and enums.
1:   */
1: -#define bpf_core_field_size(field)					    \
1: -	__builtin_preserve_field_info(field, BPF_FIELD_BYTE_SIZE)
1: +#define bpf_core_field_size(field) \
1: +  __builtin_preserve_field_info(field, BPF_FIELD_BYTE_SIZE)
1:  
1:  /*
1:   * Convenience macro to get BTF type ID of a specified type, using a local BTF
1:   * information. Return 32-bit unsigned integer with type ID from program's own
1:   * BTF. Always succeeds.
1:   */
1: -#define bpf_core_type_id_local(type)					    \
1: -	__builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_LOCAL)
1: +#define bpf_core_type_id_local(type) \
1: +  __builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_LOCAL)
1:  
1:  /*
1:   * Convenience macro to get BTF type ID of a target kernel's type that matches
1: @@ -141,8 +150,8 @@ enum bpf_enum_value_kind {
1:   *    - valid 32-bit unsigned type ID in kernel BTF;
1:   *    - 0, if no matching type was found in a target kernel BTF.
1:   */
1: -#define bpf_core_type_id_kernel(type)					    \
1: -	__builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_TARGET)
1: +#define bpf_core_type_id_kernel(type) \
1: +  __builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_TARGET)
1:  
1:  /*
1:   * Convenience macro to check that provided named type
1: @@ -151,8 +160,8 @@ enum bpf_enum_value_kind {
1:   *    1, if such type is present in target kernel's BTF;
1:   *    0, if no matching type is found.
1:   */
1: -#define bpf_core_type_exists(type)					    \
1: -	__builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_EXISTS)
1: +#define bpf_core_type_exists(type) \
1: +  __builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_EXISTS)
1:  
1:  /*
1:   * Convenience macro to get the byte size of a provided named type
1: @@ -161,8 +170,8 @@ enum bpf_enum_value_kind {
1:   *    >= 0 size (in bytes), if type is present in target kernel's BTF;
1:   *    0, if no matching type is found.
1:   */
1: -#define bpf_core_type_size(type)					    \
1: -	__builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_SIZE)
1: +#define bpf_core_type_size(type) \
1: +  __builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_SIZE)
1:  
1:  /*
1:   * Convenience macro to check that provided enumerator value is defined in
1: @@ -172,8 +181,9 @@ enum bpf_enum_value_kind {
1:   *    kernel's BTF;
1:   *    0, if no matching enum and/or enum value within that enum is found.
1:   */
1: -#define bpf_core_enum_value_exists(enum_type, enum_value)		    \
1: -	__builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, BPF_ENUMVAL_EXISTS)
1: +#define bpf_core_enum_value_exists(enum_type, enum_value)         \
1: +  __builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, \
1: +                                BPF_ENUMVAL_EXISTS)
1:  
1:  /*
1:   * Convenience macro to get the integer value of an enumerator value in
1: @@ -183,8 +193,9 @@ enum bpf_enum_value_kind {
1:   *    present in target kernel's BTF;
1:   *    0, if no matching enum and/or enum value within that enum is found.
1:   */
1: -#define bpf_core_enum_value(enum_type, enum_value)			    \
1: -	__builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, BPF_ENUMVAL_VALUE)
1: +#define bpf_core_enum_value(enum_type, enum_value)                \
1: +  __builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, \
1: +                                BPF_ENUMVAL_VALUE)
1:  
1:  /*
1:   * bpf_core_read() abstracts away bpf_probe_read_kernel() call and captures
1: @@ -202,25 +213,29 @@ enum bpf_enum_value_kind {
1:   * actual field offset, based on target kernel BTF type that matches original
1:   * (local) BTF, used to record relocation.
1:   */
1: -#define bpf_core_read(dst, sz, src)					    \
1: -	bpf_probe_read_kernel(dst, sz, (const void *)__builtin_preserve_access_index(src))
1: +#define bpf_core_read(dst, sz, src) \
1: +  bpf_probe_read_kernel(dst, sz,    \
1: +                        (const void *)__builtin_preserve_access_index(src))
1:  
1:  /* NOTE: see comments for BPF_CORE_READ_USER() about the proper types use. */
1: -#define bpf_core_read_user(dst, sz, src)				    \
1: -	bpf_probe_read_user(dst, sz, (const void *)__builtin_preserve_access_index(src))
1: +#define bpf_core_read_user(dst, sz, src) \
1: +  bpf_probe_read_user(dst, sz,           \
1: +                      (const void *)__builtin_preserve_access_index(src))
1:  /*
1:   * bpf_core_read_str() is a thin wrapper around bpf_probe_read_str()
1:   * additionally emitting BPF CO-RE field relocation for specified source
1:   * argument.
1:   */
1: -#define bpf_core_read_str(dst, sz, src)					    \
1: -	bpf_probe_read_kernel_str(dst, sz, (const void *)__builtin_preserve_access_index(src))
1: +#define bpf_core_read_str(dst, sz, src) \
1: +  bpf_probe_read_kernel_str(            \
1: +      dst, sz, (const void *)__builtin_preserve_access_index(src))
1:  
1:  /* NOTE: see comments for BPF_CORE_READ_USER() about the proper types use. */
1: -#define bpf_core_read_user_str(dst, sz, src)				    \
1: -	bpf_probe_read_user_str(dst, sz, (const void *)__builtin_preserve_access_index(src))
1: +#define bpf_core_read_user_str(dst, sz, src) \
1: +  bpf_probe_read_user_str(dst, sz,           \
1: +                          (const void *)__builtin_preserve_access_index(src))
1:  
1: -#define ___concat(a, b) a ## b
1: +#define ___concat(a, b) a##b
1:  #define ___apply(fn, n) ___concat(fn, n)
1:  #define ___nth(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, __11, N, ...) N
1:  
1: @@ -273,96 +288,97 @@ enum bpf_enum_value_kind {
1:  
1:  #define ___type(...) typeof(___arrow(__VA_ARGS__))
1:  
1: -#define ___read(read_fn, dst, src_type, src, accessor)			    \
1: -	read_fn((void *)(dst), sizeof(*(dst)), &((src_type)(src))->accessor)
1: +#define ___read(read_fn, dst, src_type, src, accessor) \
1: +  read_fn((void *)(dst), sizeof(*(dst)), &((src_type)(src))->accessor)
1:  
1:  /* "recursively" read a sequence of inner pointers using local __t var */
1:  #define ___rd_first(fn, src, a) ___read(fn, &__t, ___type(src), src, a);
1: -#define ___rd_last(fn, ...)						    \
1: -	___read(fn, &__t, ___type(___nolast(__VA_ARGS__)), __t, ___last(__VA_ARGS__));
1: -#define ___rd_p1(fn, ...) const void *__t; ___rd_first(fn, __VA_ARGS__)
1: -#define ___rd_p2(fn, ...) ___rd_p1(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p3(fn, ...) ___rd_p2(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p4(fn, ...) ___rd_p3(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p5(fn, ...) ___rd_p4(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p6(fn, ...) ___rd_p5(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p7(fn, ...) ___rd_p6(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p8(fn, ...) ___rd_p7(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___rd_p9(fn, ...) ___rd_p8(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: -#define ___read_ptrs(fn, src, ...)					    \
1: -	___apply(___rd_p, ___narg(__VA_ARGS__))(fn, src, __VA_ARGS__)
1: -
1: -#define ___core_read0(fn, fn_ptr, dst, src, a)				    \
1: -	___read(fn, dst, ___type(src), src, a);
1: -#define ___core_readN(fn, fn_ptr, dst, src, ...)			    \
1: -	___read_ptrs(fn_ptr, src, ___nolast(__VA_ARGS__))		    \
1: -	___read(fn, dst, ___type(src, ___nolast(__VA_ARGS__)), __t,	    \
1: -		___last(__VA_ARGS__));
1: -#define ___core_read(fn, fn_ptr, dst, src, a, ...)			    \
1: -	___apply(___core_read, ___empty(__VA_ARGS__))(fn, fn_ptr, dst,	    \
1: -						      src, a, ##__VA_ARGS__)
1: +#define ___rd_last(fn, ...) \
1: +  ___read(fn, &__t, ___type(___nolast(__VA_ARGS__)), __t, ___last(__VA_ARGS__));
1: +#define ___rd_p1(fn, ...) \
1: +  const void *__t;        \
1: +  ___rd_first(fn, __VA_ARGS__)
1: +#define ___rd_p2(fn, ...) \
1: +  ___rd_p1(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p3(fn, ...) \
1: +  ___rd_p2(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p4(fn, ...) \
1: +  ___rd_p3(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p5(fn, ...) \
1: +  ___rd_p4(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p6(fn, ...) \
1: +  ___rd_p5(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p7(fn, ...) \
1: +  ___rd_p6(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p8(fn, ...) \
1: +  ___rd_p7(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___rd_p9(fn, ...) \
1: +  ___rd_p8(fn, ___nolast(__VA_ARGS__)) ___rd_last(fn, __VA_ARGS__)
1: +#define ___read_ptrs(fn, src, ...) \
1: +  ___apply(___rd_p, ___narg(__VA_ARGS__))(fn, src, __VA_ARGS__)
1: +
1: +#define ___core_read0(fn, fn_ptr, dst, src, a) \
1: +  ___read(fn, dst, ___type(src), src, a);
1: +#define ___core_readN(fn, fn_ptr, dst, src, ...)                  \
1: +  ___read_ptrs(fn_ptr, src, ___nolast(__VA_ARGS__))               \
1: +      ___read(fn, dst, ___type(src, ___nolast(__VA_ARGS__)), __t, \
1: +              ___last(__VA_ARGS__));
1: +#define ___core_read(fn, fn_ptr, dst, src, a, ...)                       \
1: +  ___apply(___core_read, ___empty(__VA_ARGS__))(fn, fn_ptr, dst, src, a, \
1: +                                                ##__VA_ARGS__)
1:  
1:  /*
1:   * BPF_CORE_READ_INTO() is a more performance-conscious variant of
1:   * BPF_CORE_READ(), in which final field is read into user-provided storage.
1:   * See BPF_CORE_READ() below for more details on general usage.
1:   */
1: -#define BPF_CORE_READ_INTO(dst, src, a, ...) ({				    \
1: -	___core_read(bpf_core_read, bpf_core_read,			    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_CORE_READ_INTO(dst, src, a, ...) \
1: +  ({___core_read(bpf_core_read, bpf_core_read, dst, (src), a, ##__VA_ARGS__)})
1:  
1:  /*
1:   * Variant of BPF_CORE_READ_INTO() for reading from user-space memory.
1:   *
1:   * NOTE: see comments for BPF_CORE_READ_USER() about the proper types use.
1:   */
1: -#define BPF_CORE_READ_USER_INTO(dst, src, a, ...) ({			    \
1: -	___core_read(bpf_core_read_user, bpf_core_read_user,		    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_CORE_READ_USER_INTO(dst, src, a, ...)                       \
1: +  ({___core_read(bpf_core_read_user, bpf_core_read_user, dst, (src), a, \
1: +                 ##__VA_ARGS__)})
1:  
1:  /* Non-CO-RE variant of BPF_CORE_READ_INTO() */
1: -#define BPF_PROBE_READ_INTO(dst, src, a, ...) ({			    \
1: -	___core_read(bpf_probe_read, bpf_probe_read,			    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_PROBE_READ_INTO(dst, src, a, ...) \
1: +  ({___core_read(bpf_probe_read, bpf_probe_read, dst, (src), a, ##__VA_ARGS__)})
1:  
1:  /* Non-CO-RE variant of BPF_CORE_READ_USER_INTO().
1:   *
1:   * As no CO-RE relocations are emitted, source types can be arbitrary and are
1:   * not restricted to kernel types only.
1:   */
1: -#define BPF_PROBE_READ_USER_INTO(dst, src, a, ...) ({			    \
1: -	___core_read(bpf_probe_read_user, bpf_probe_read_user,		    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_PROBE_READ_USER_INTO(dst, src, a, ...)                        \
1: +  ({___core_read(bpf_probe_read_user, bpf_probe_read_user, dst, (src), a, \
1: +                 ##__VA_ARGS__)})
1:  
1:  /*
1:   * BPF_CORE_READ_STR_INTO() does same "pointer chasing" as
1:   * BPF_CORE_READ() for intermediate pointers, but then executes (and returns
1:   * corresponding error code) bpf_core_read_str() for final string read.
1:   */
1: -#define BPF_CORE_READ_STR_INTO(dst, src, a, ...) ({			    \
1: -	___core_read(bpf_core_read_str, bpf_core_read,			    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_CORE_READ_STR_INTO(dst, src, a, ...)                  \
1: +  ({___core_read(bpf_core_read_str, bpf_core_read, dst, (src), a, \
1: +                 ##__VA_ARGS__)})
1:  
1:  /*
1:   * Variant of BPF_CORE_READ_STR_INTO() for reading from user-space memory.
1:   *
1:   * NOTE: see comments for BPF_CORE_READ_USER() about the proper types use.
1:   */
1: -#define BPF_CORE_READ_USER_STR_INTO(dst, src, a, ...) ({		    \
1: -	___core_read(bpf_core_read_user_str, bpf_core_read_user,	    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_CORE_READ_USER_STR_INTO(dst, src, a, ...)                       \
1: +  ({___core_read(bpf_core_read_user_str, bpf_core_read_user, dst, (src), a, \
1: +                 ##__VA_ARGS__)})
1:  
1:  /* Non-CO-RE variant of BPF_CORE_READ_STR_INTO() */
1: -#define BPF_PROBE_READ_STR_INTO(dst, src, a, ...) ({			    \
1: -	___core_read(bpf_probe_read_str, bpf_probe_read,		    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_PROBE_READ_STR_INTO(dst, src, a, ...)                   \
1: +  ({___core_read(bpf_probe_read_str, bpf_probe_read, dst, (src), a, \
1: +                 ##__VA_ARGS__)})
1:  
1:  /*
1:   * Non-CO-RE variant of BPF_CORE_READ_USER_STR_INTO().
1: @@ -370,10 +386,9 @@ enum bpf_enum_value_kind {
1:   * As no CO-RE relocations are emitted, source types can be arbitrary and are
1:   * not restricted to kernel types only.
1:   */
1: -#define BPF_PROBE_READ_USER_STR_INTO(dst, src, a, ...) ({		    \
1: -	___core_read(bpf_probe_read_user_str, bpf_probe_read_user,	    \
1: -		     dst, (src), a, ##__VA_ARGS__)			    \
1: -})
1: +#define BPF_PROBE_READ_USER_STR_INTO(dst, src, a, ...)                        \
1: +  ({___core_read(bpf_probe_read_user_str, bpf_probe_read_user, dst, (src), a, \
1: +                 ##__VA_ARGS__)})
1:  
1:  /*
1:   * BPF_CORE_READ() is used to simplify BPF CO-RE relocatable read, especially
1: @@ -399,11 +414,12 @@ enum bpf_enum_value_kind {
1:   * N.B. Only up to 9 "field accessors" are supported, which should be more
1:   * than enough for any practical purpose.
1:   */
1: -#define BPF_CORE_READ(src, a, ...) ({					    \
1: -	___type((src), a, ##__VA_ARGS__) __r;				    \
1: -	BPF_CORE_READ_INTO(&__r, (src), a, ##__VA_ARGS__);		    \
1: -	__r;								    \
1: -})
1: +#define BPF_CORE_READ(src, a, ...)                     \
1: +  ({                                                   \
1: +    ___type((src), a, ##__VA_ARGS__) __r;              \
1: +    BPF_CORE_READ_INTO(&__r, (src), a, ##__VA_ARGS__); \
1: +    __r;                                               \
1: +  })
1:  
1:  /*
1:   * Variant of BPF_CORE_READ() for reading from user-space memory.
1: @@ -415,18 +431,20 @@ enum bpf_enum_value_kind {
1:   * read kernel UAPI types from the user-space memory passed in as a syscall
1:   * input argument.
1:   */
1: -#define BPF_CORE_READ_USER(src, a, ...) ({				    \
1: -	___type((src), a, ##__VA_ARGS__) __r;				    \
1: -	BPF_CORE_READ_USER_INTO(&__r, (src), a, ##__VA_ARGS__);		    \
1: -	__r;								    \
1: -})
1: +#define BPF_CORE_READ_USER(src, a, ...)                     \
1: +  ({                                                        \
1: +    ___type((src), a, ##__VA_ARGS__) __r;                   \
1: +    BPF_CORE_READ_USER_INTO(&__r, (src), a, ##__VA_ARGS__); \
1: +    __r;                                                    \
1: +  })
1:  
1:  /* Non-CO-RE variant of BPF_CORE_READ() */
1: -#define BPF_PROBE_READ(src, a, ...) ({					    \
1: -	___type((src), a, ##__VA_ARGS__) __r;				    \
1: -	BPF_PROBE_READ_INTO(&__r, (src), a, ##__VA_ARGS__);		    \
1: -	__r;								    \
1: -})
1: +#define BPF_PROBE_READ(src, a, ...)                     \
1: +  ({                                                    \
1: +    ___type((src), a, ##__VA_ARGS__) __r;               \
1: +    BPF_PROBE_READ_INTO(&__r, (src), a, ##__VA_ARGS__); \
1: +    __r;                                                \
1: +  })
1:  
1:  /*
1:   * Non-CO-RE variant of BPF_CORE_READ_USER().
1: @@ -434,11 +452,11 @@ enum bpf_enum_value_kind {
1:   * As no CO-RE relocations are emitted, source types can be arbitrary and are
1:   * not restricted to kernel types only.
1:   */
1: -#define BPF_PROBE_READ_USER(src, a, ...) ({				    \
1: -	___type((src), a, ##__VA_ARGS__) __r;				    \
1: -	BPF_PROBE_READ_USER_INTO(&__r, (src), a, ##__VA_ARGS__);	    \
1: -	__r;								    \
1: -})
1: +#define BPF_PROBE_READ_USER(src, a, ...)                     \
1: +  ({                                                         \
1: +    ___type((src), a, ##__VA_ARGS__) __r;                    \
1: +    BPF_PROBE_READ_USER_INTO(&__r, (src), a, ##__VA_ARGS__); \
1: +    __r;                                                     \
1: +  })
1:  
1:  #endif
1: -
1: diff --git a/src/cc/libbpf/src/bpf_endian.h b/src/cc/libbpf/src/bpf_endian.h
1: index ec9db4fe..c27a8dcd 100644
1: --- a/src/cc/libbpf/src/bpf_endian.h
1: +++ b/src/cc/libbpf/src/bpf_endian.h
1: @@ -10,27 +10,21 @@
1:   * 3) 00000000 00000000 00000000 00000000 00000000 00000000 00000000 nnnnnnnn
1:   * 4) 00000000 00000000 00000000 00000000 00000000 00000000 nnnnnnnn 00000000
1:   */
1: -#define ___bpf_mvb(x, b, n, m) ((__u##b)(x) << (b-(n+1)*8) >> (b-8) << (m*8))
1: +#define ___bpf_mvb(x, b, n, m) \
1: +  ((__u##b)(x) << (b - (n + 1) * 8) >> (b - 8) << (m * 8))
1:  
1: -#define ___bpf_swab16(x) ((__u16)(			\
1: -			  ___bpf_mvb(x, 16, 0, 1) |	\
1: -			  ___bpf_mvb(x, 16, 1, 0)))
1: +#define ___bpf_swab16(x) \
1: +  ((__u16)(___bpf_mvb(x, 16, 0, 1) | ___bpf_mvb(x, 16, 1, 0)))
1:  
1: -#define ___bpf_swab32(x) ((__u32)(			\
1: -			  ___bpf_mvb(x, 32, 0, 3) |	\
1: -			  ___bpf_mvb(x, 32, 1, 2) |	\
1: -			  ___bpf_mvb(x, 32, 2, 1) |	\
1: -			  ___bpf_mvb(x, 32, 3, 0)))
1: +#define ___bpf_swab32(x)                                       \
1: +  ((__u32)(___bpf_mvb(x, 32, 0, 3) | ___bpf_mvb(x, 32, 1, 2) | \
1: +           ___bpf_mvb(x, 32, 2, 1) | ___bpf_mvb(x, 32, 3, 0)))
1:  
1: -#define ___bpf_swab64(x) ((__u64)(			\
1: -			  ___bpf_mvb(x, 64, 0, 7) |	\
1: -			  ___bpf_mvb(x, 64, 1, 6) |	\
1: -			  ___bpf_mvb(x, 64, 2, 5) |	\
1: -			  ___bpf_mvb(x, 64, 3, 4) |	\
1: -			  ___bpf_mvb(x, 64, 4, 3) |	\
1: -			  ___bpf_mvb(x, 64, 5, 2) |	\
1: -			  ___bpf_mvb(x, 64, 6, 1) |	\
1: -			  ___bpf_mvb(x, 64, 7, 0)))
1: +#define ___bpf_swab64(x)                                       \
1: +  ((__u64)(___bpf_mvb(x, 64, 0, 7) | ___bpf_mvb(x, 64, 1, 6) | \
1: +           ___bpf_mvb(x, 64, 2, 5) | ___bpf_mvb(x, 64, 3, 4) | \
1: +           ___bpf_mvb(x, 64, 4, 3) | ___bpf_mvb(x, 64, 5, 2) | \
1: +           ___bpf_mvb(x, 64, 6, 1) | ___bpf_mvb(x, 64, 7, 0)))
1:  
1:  /* LLVM's BPF target selects the endianness of the CPU
1:   * it compiles on, or the user specifies (bpfel/bpfeb),
1: @@ -48,52 +42,48 @@
1:   * use different targets.
1:   */
1:  #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1: -# define __bpf_ntohs(x)			__builtin_bswap16(x)
1: -# define __bpf_htons(x)			__builtin_bswap16(x)
1: -# define __bpf_constant_ntohs(x)	___bpf_swab16(x)
1: -# define __bpf_constant_htons(x)	___bpf_swab16(x)
1: -# define __bpf_ntohl(x)			__builtin_bswap32(x)
1: -# define __bpf_htonl(x)			__builtin_bswap32(x)
1: -# define __bpf_constant_ntohl(x)	___bpf_swab32(x)
1: -# define __bpf_constant_htonl(x)	___bpf_swab32(x)
1: -# define __bpf_be64_to_cpu(x)		__builtin_bswap64(x)
1: -# define __bpf_cpu_to_be64(x)		__builtin_bswap64(x)
1: -# define __bpf_constant_be64_to_cpu(x)	___bpf_swab64(x)
1: -# define __bpf_constant_cpu_to_be64(x)	___bpf_swab64(x)
1: +#define __bpf_ntohs(x) __builtin_bswap16(x)
1: +#define __bpf_htons(x) __builtin_bswap16(x)
1: +#define __bpf_constant_ntohs(x) ___bpf_swab16(x)
1: +#define __bpf_constant_htons(x) ___bpf_swab16(x)
1: +#define __bpf_ntohl(x) __builtin_bswap32(x)
1: +#define __bpf_htonl(x) __builtin_bswap32(x)
1: +#define __bpf_constant_ntohl(x) ___bpf_swab32(x)
1: +#define __bpf_constant_htonl(x) ___bpf_swab32(x)
1: +#define __bpf_be64_to_cpu(x) __builtin_bswap64(x)
1: +#define __bpf_cpu_to_be64(x) __builtin_bswap64(x)
1: +#define __bpf_constant_be64_to_cpu(x) ___bpf_swab64(x)
1: +#define __bpf_constant_cpu_to_be64(x) ___bpf_swab64(x)
1:  #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1: -# define __bpf_ntohs(x)			(x)
1: -# define __bpf_htons(x)			(x)
1: -# define __bpf_constant_ntohs(x)	(x)
1: -# define __bpf_constant_htons(x)	(x)
1: -# define __bpf_ntohl(x)			(x)
1: -# define __bpf_htonl(x)			(x)
1: -# define __bpf_constant_ntohl(x)	(x)
1: -# define __bpf_constant_htonl(x)	(x)
1: -# define __bpf_be64_to_cpu(x)		(x)
1: -# define __bpf_cpu_to_be64(x)		(x)
1: -# define __bpf_constant_be64_to_cpu(x)  (x)
1: -# define __bpf_constant_cpu_to_be64(x)  (x)
1: +#define __bpf_ntohs(x) (x)
1: +#define __bpf_htons(x) (x)
1: +#define __bpf_constant_ntohs(x) (x)
1: +#define __bpf_constant_htons(x) (x)
1: +#define __bpf_ntohl(x) (x)
1: +#define __bpf_htonl(x) (x)
1: +#define __bpf_constant_ntohl(x) (x)
1: +#define __bpf_constant_htonl(x) (x)
1: +#define __bpf_be64_to_cpu(x) (x)
1: +#define __bpf_cpu_to_be64(x) (x)
1: +#define __bpf_constant_be64_to_cpu(x) (x)
1: +#define __bpf_constant_cpu_to_be64(x) (x)
1:  #else
1: -# error "Fix your compiler's __BYTE_ORDER__?!"
1: +#error "Fix your compiler's __BYTE_ORDER__?!"
1:  #endif
1:  
1: -#define bpf_htons(x)				\
1: -	(__builtin_constant_p(x) ?		\
1: -	 __bpf_constant_htons(x) : __bpf_htons(x))
1: -#define bpf_ntohs(x)				\
1: -	(__builtin_constant_p(x) ?		\
1: -	 __bpf_constant_ntohs(x) : __bpf_ntohs(x))
1: -#define bpf_htonl(x)				\
1: -	(__builtin_constant_p(x) ?		\
1: -	 __bpf_constant_htonl(x) : __bpf_htonl(x))
1: -#define bpf_ntohl(x)				\
1: -	(__builtin_constant_p(x) ?		\
1: -	 __bpf_constant_ntohl(x) : __bpf_ntohl(x))
1: -#define bpf_cpu_to_be64(x)			\
1: -	(__builtin_constant_p(x) ?		\
1: -	 __bpf_constant_cpu_to_be64(x) : __bpf_cpu_to_be64(x))
1: -#define bpf_be64_to_cpu(x)			\
1: -	(__builtin_constant_p(x) ?		\
1: -	 __bpf_constant_be64_to_cpu(x) : __bpf_be64_to_cpu(x))
1: +#define bpf_htons(x) \
1: +  (__builtin_constant_p(x) ? __bpf_constant_htons(x) : __bpf_htons(x))
1: +#define bpf_ntohs(x) \
1: +  (__builtin_constant_p(x) ? __bpf_constant_ntohs(x) : __bpf_ntohs(x))
1: +#define bpf_htonl(x) \
1: +  (__builtin_constant_p(x) ? __bpf_constant_htonl(x) : __bpf_htonl(x))
1: +#define bpf_ntohl(x) \
1: +  (__builtin_constant_p(x) ? __bpf_constant_ntohl(x) : __bpf_ntohl(x))
1: +#define bpf_cpu_to_be64(x)                                 \
1: +  (__builtin_constant_p(x) ? __bpf_constant_cpu_to_be64(x) \
1: +                           : __bpf_cpu_to_be64(x))
1: +#define bpf_be64_to_cpu(x)                                 \
1: +  (__builtin_constant_p(x) ? __bpf_constant_be64_to_cpu(x) \
1: +                           : __bpf_be64_to_cpu(x))
1:  
1:  #endif /* __BPF_ENDIAN__ */
1: diff --git a/src/cc/libbpf/src/bpf_gen_internal.h b/src/cc/libbpf/src/bpf_gen_internal.h
1: index 61540039..8b9d0afd 100644
1: --- a/src/cc/libbpf/src/bpf_gen_internal.h
1: +++ b/src/cc/libbpf/src/bpf_gen_internal.h
1: @@ -4,38 +4,44 @@
1:  #define __BPF_GEN_INTERNAL_H
1:  
1:  struct ksym_relo_desc {
1: -	const char *name;
1: -	int kind;
1: -	int insn_idx;
1: +  const char *name;
1: +  int kind;
1: +  int insn_idx;
1:  };
1:  
1:  struct bpf_gen {
1: -	struct gen_loader_opts *opts;
1: -	void *data_start;
1: -	void *data_cur;
1: -	void *insn_start;
1: -	void *insn_cur;
1: -	ssize_t cleanup_label;
1: -	__u32 nr_progs;
1: -	__u32 nr_maps;
1: -	int log_level;
1: -	int error;
1: -	struct ksym_relo_desc *relos;
1: -	int relo_cnt;
1: -	char attach_target[128];
1: -	int attach_kind;
1: +  struct gen_loader_opts *opts;
1: +  void *data_start;
1: +  void *data_cur;
1: +  void *insn_start;
1: +  void *insn_cur;
1: +  ssize_t cleanup_label;
1: +  __u32 nr_progs;
1: +  __u32 nr_maps;
1: +  int log_level;
1: +  int error;
1: +  struct ksym_relo_desc *relos;
1: +  int relo_cnt;
1: +  char attach_target[128];
1: +  int attach_kind;
1:  };
1:  
1:  void bpf_gen__init(struct bpf_gen *gen, int log_level);
1:  int bpf_gen__finish(struct bpf_gen *gen);
1:  void bpf_gen__free(struct bpf_gen *gen);
1: -void bpf_gen__load_btf(struct bpf_gen *gen, const void *raw_data, __u32 raw_size);
1: -void bpf_gen__map_create(struct bpf_gen *gen, struct bpf_create_map_attr *map_attr, int map_idx);
1: +void bpf_gen__load_btf(struct bpf_gen *gen, const void *raw_data,
1: +                       __u32 raw_size);
1: +void bpf_gen__map_create(struct bpf_gen *gen,
1: +                         struct bpf_create_map_attr *map_attr, int map_idx);
1:  struct bpf_prog_load_params;
1: -void bpf_gen__prog_load(struct bpf_gen *gen, struct bpf_prog_load_params *load_attr, int prog_idx);
1: -void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *value, __u32 value_size);
1: +void bpf_gen__prog_load(struct bpf_gen *gen,
1: +                        struct bpf_prog_load_params *load_attr, int prog_idx);
1: +void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *value,
1: +                              __u32 value_size);
1:  void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx);
1: -void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *name, enum bpf_attach_type type);
1: -void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, int kind, int insn_idx);
1: +void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *name,
1: +                                   enum bpf_attach_type type);
1: +void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, int kind,
1: +                            int insn_idx);
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/src/bpf_helper_defs.h b/src/cc/libbpf/src/bpf_helper_defs.h
1: index d345c708..0c5fae74 100644
1: --- a/src/cc/libbpf/src/bpf_helper_defs.h
1: +++ b/src/cc/libbpf/src/bpf_helper_defs.h
1: @@ -46,7 +46,7 @@ struct file;
1:   * 	Map value associated to *key*, or **NULL** if no entry was
1:   * 	found.
1:   */
1: -static void *(*bpf_map_lookup_elem)(void *map, const void *key) = (void *) 1;
1: +static void *(*bpf_map_lookup_elem)(void *map, const void *key) = (void *)1;
1:  
1:  /*
1:   * bpf_map_update_elem
1: @@ -68,7 +68,8 @@ static void *(*bpf_map_lookup_elem)(void *map, const void *key) = (void *) 1;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_map_update_elem)(void *map, const void *key, const void *value, __u64 flags) = (void *) 2;
1: +static long (*bpf_map_update_elem)(void *map, const void *key,
1: +                                   const void *value, __u64 flags) = (void *)2;
1:  
1:  /*
1:   * bpf_map_delete_elem
1: @@ -78,7 +79,7 @@ static long (*bpf_map_update_elem)(void *map, const void *key, const void *value
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_map_delete_elem)(void *map, const void *key) = (void *) 3;
1: +static long (*bpf_map_delete_elem)(void *map, const void *key) = (void *)3;
1:  
1:  /*
1:   * bpf_probe_read
1: @@ -92,7 +93,8 @@ static long (*bpf_map_delete_elem)(void *map, const void *key) = (void *) 3;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_probe_read)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 4;
1: +static long (*bpf_probe_read)(void *dst, __u32 size,
1: +                              const void *unsafe_ptr) = (void *)4;
1:  
1:  /*
1:   * bpf_ktime_get_ns
1: @@ -104,7 +106,7 @@ static long (*bpf_probe_read)(void *dst, __u32 size, const void *unsafe_ptr) = (
1:   * Returns
1:   * 	Current *ktime*.
1:   */
1: -static __u64 (*bpf_ktime_get_ns)(void) = (void *) 5;
1: +static __u64 (*bpf_ktime_get_ns)(void) = (void *)5;
1:  
1:  /*
1:   * bpf_trace_printk
1: @@ -127,7 +129,8 @@ static __u64 (*bpf_ktime_get_ns)(void) = (void *) 5;
1:   *
1:   * 	::
1:   *
1: - * 		telnet-470   [001] .N.. 419421.045894: 0x00000001: <formatted msg>
1: + * 		telnet-470   [001] .N.. 419421.045894: 0x00000001: <formatted
1: + * msg>
1:   *
1:   * 	In the above:
1:   *
1: @@ -167,7 +170,8 @@ static __u64 (*bpf_ktime_get_ns)(void) = (void *) 5;
1:   * 	The number of bytes written to the buffer, or a negative error
1:   * 	in case of failure.
1:   */
1: -static long (*bpf_trace_printk)(const char *fmt, __u32 fmt_size, ...) = (void *) 6;
1: +static long (*bpf_trace_printk)(const char *fmt, __u32 fmt_size,
1: +                                ...) = (void *)6;
1:  
1:  /*
1:   * bpf_get_prandom_u32
1: @@ -183,7 +187,7 @@ static long (*bpf_trace_printk)(const char *fmt, __u32 fmt_size, ...) = (void *)
1:   * Returns
1:   * 	A random 32-bit unsigned value.
1:   */
1: -static __u32 (*bpf_get_prandom_u32)(void) = (void *) 7;
1: +static __u32 (*bpf_get_prandom_u32)(void) = (void *)7;
1:  
1:  /*
1:   * bpf_get_smp_processor_id
1: @@ -196,7 +200,7 @@ static __u32 (*bpf_get_prandom_u32)(void) = (void *) 7;
1:   * Returns
1:   * 	The SMP id of the processor running the program.
1:   */
1: -static __u32 (*bpf_get_smp_processor_id)(void) = (void *) 8;
1: +static __u32 (*bpf_get_smp_processor_id)(void) = (void *)8;
1:  
1:  /*
1:   * bpf_skb_store_bytes
1: @@ -217,7 +221,9 @@ static __u32 (*bpf_get_smp_processor_id)(void) = (void *) 8;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_store_bytes)(struct __sk_buff *skb, __u32 offset, const void *from, __u32 len, __u64 flags) = (void *) 9;
1: +static long (*bpf_skb_store_bytes)(struct __sk_buff *skb, __u32 offset,
1: +                                   const void *from, __u32 len,
1: +                                   __u64 flags) = (void *)9;
1:  
1:  /*
1:   * bpf_l3_csum_replace
1: @@ -246,7 +252,9 @@ static long (*bpf_skb_store_bytes)(struct __sk_buff *skb, __u32 offset, const vo
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_l3_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 from, __u64 to, __u64 size) = (void *) 10;
1: +static long (*bpf_l3_csum_replace)(struct __sk_buff *skb, __u32 offset,
1: +                                   __u64 from, __u64 to,
1: +                                   __u64 size) = (void *)10;
1:  
1:  /*
1:   * bpf_l4_csum_replace
1: @@ -282,7 +290,9 @@ static long (*bpf_l3_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 fr
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_l4_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 from, __u64 to, __u64 flags) = (void *) 11;
1: +static long (*bpf_l4_csum_replace)(struct __sk_buff *skb, __u32 offset,
1: +                                   __u64 from, __u64 to,
1: +                                   __u64 flags) = (void *)11;
1:  
1:  /*
1:   * bpf_tail_call
1: @@ -317,7 +327,8 @@ static long (*bpf_l4_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 fr
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_tail_call)(void *ctx, void *prog_array_map, __u32 index) = (void *) 12;
1: +static long (*bpf_tail_call)(void *ctx, void *prog_array_map,
1: +                             __u32 index) = (void *)12;
1:  
1:  /*
1:   * bpf_clone_redirect
1: @@ -345,7 +356,8 @@ static long (*bpf_tail_call)(void *ctx, void *prog_array_map, __u32 index) = (vo
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_clone_redirect)(struct __sk_buff *skb, __u32 ifindex, __u64 flags) = (void *) 13;
1: +static long (*bpf_clone_redirect)(struct __sk_buff *skb, __u32 ifindex,
1: +                                  __u64 flags) = (void *)13;
1:  
1:  /*
1:   * bpf_get_current_pid_tgid
1: @@ -357,7 +369,7 @@ static long (*bpf_clone_redirect)(struct __sk_buff *skb, __u32 ifindex, __u64 fl
1:   * 	*current_task*\ **->tgid << 32 \|**
1:   * 	*current_task*\ **->pid**.
1:   */
1: -static __u64 (*bpf_get_current_pid_tgid)(void) = (void *) 14;
1: +static __u64 (*bpf_get_current_pid_tgid)(void) = (void *)14;
1:  
1:  /*
1:   * bpf_get_current_uid_gid
1: @@ -367,7 +379,7 @@ static __u64 (*bpf_get_current_pid_tgid)(void) = (void *) 14;
1:   * 	A 64-bit integer containing the current GID and UID, and
1:   * 	created as such: *current_gid* **<< 32 \|** *current_uid*.
1:   */
1: -static __u64 (*bpf_get_current_uid_gid)(void) = (void *) 15;
1: +static __u64 (*bpf_get_current_uid_gid)(void) = (void *)15;
1:  
1:  /*
1:   * bpf_get_current_comm
1: @@ -382,7 +394,7 @@ static __u64 (*bpf_get_current_uid_gid)(void) = (void *) 15;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_get_current_comm)(void *buf, __u32 size_of_buf) = (void *) 16;
1: +static long (*bpf_get_current_comm)(void *buf, __u32 size_of_buf) = (void *)16;
1:  
1:  /*
1:   * bpf_get_cgroup_classid
1: @@ -412,7 +424,7 @@ static long (*bpf_get_current_comm)(void *buf, __u32 size_of_buf) = (void *) 16;
1:   * Returns
1:   * 	The classid, or 0 for the default unconfigured classid.
1:   */
1: -static __u32 (*bpf_get_cgroup_classid)(struct __sk_buff *skb) = (void *) 17;
1: +static __u32 (*bpf_get_cgroup_classid)(struct __sk_buff *skb) = (void *)17;
1:  
1:  /*
1:   * bpf_skb_vlan_push
1: @@ -432,7 +444,8 @@ static __u32 (*bpf_get_cgroup_classid)(struct __sk_buff *skb) = (void *) 17;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_vlan_push)(struct __sk_buff *skb, __be16 vlan_proto, __u16 vlan_tci) = (void *) 18;
1: +static long (*bpf_skb_vlan_push)(struct __sk_buff *skb, __be16 vlan_proto,
1: +                                 __u16 vlan_tci) = (void *)18;
1:  
1:  /*
1:   * bpf_skb_vlan_pop
1: @@ -448,7 +461,7 @@ static long (*bpf_skb_vlan_push)(struct __sk_buff *skb, __be16 vlan_proto, __u16
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_vlan_pop)(struct __sk_buff *skb) = (void *) 19;
1: +static long (*bpf_skb_vlan_pop)(struct __sk_buff *skb) = (void *)19;
1:  
1:  /*
1:   * bpf_skb_get_tunnel_key
1: @@ -503,7 +516,9 @@ static long (*bpf_skb_vlan_pop)(struct __sk_buff *skb) = (void *) 19;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_get_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_key *key, __u32 size, __u64 flags) = (void *) 20;
1: +static long (*bpf_skb_get_tunnel_key)(struct __sk_buff *skb,
1: +                                      struct bpf_tunnel_key *key, __u32 size,
1: +                                      __u64 flags) = (void *)20;
1:  
1:  /*
1:   * bpf_skb_set_tunnel_key
1: @@ -544,7 +559,9 @@ static long (*bpf_skb_get_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_k
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_set_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_key *key, __u32 size, __u64 flags) = (void *) 21;
1: +static long (*bpf_skb_set_tunnel_key)(struct __sk_buff *skb,
1: +                                      struct bpf_tunnel_key *key, __u32 size,
1: +                                      __u64 flags) = (void *)21;
1:  
1:  /*
1:   * bpf_perf_event_read
1: @@ -577,7 +594,7 @@ static long (*bpf_skb_set_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_k
1:   * 	The value of the perf event counter read from the map, or a
1:   * 	negative error code in case of failure.
1:   */
1: -static __u64 (*bpf_perf_event_read)(void *map, __u64 flags) = (void *) 22;
1: +static __u64 (*bpf_perf_event_read)(void *map, __u64 flags) = (void *)22;
1:  
1:  /*
1:   * bpf_redirect
1: @@ -604,7 +621,7 @@ static __u64 (*bpf_perf_event_read)(void *map, __u64 flags) = (void *) 22;
1:   * 	are **TC_ACT_REDIRECT** on success or **TC_ACT_SHOT** on
1:   * 	error.
1:   */
1: -static long (*bpf_redirect)(__u32 ifindex, __u64 flags) = (void *) 23;
1: +static long (*bpf_redirect)(__u32 ifindex, __u64 flags) = (void *)23;
1:  
1:  /*
1:   * bpf_get_route_realm
1: @@ -632,7 +649,7 @@ static long (*bpf_redirect)(__u32 ifindex, __u64 flags) = (void *) 23;
1:   * 	The realm of the route for the packet associated to *skb*, or 0
1:   * 	if none was found.
1:   */
1: -static __u32 (*bpf_get_route_realm)(struct __sk_buff *skb) = (void *) 24;
1: +static __u32 (*bpf_get_route_realm)(struct __sk_buff *skb) = (void *)24;
1:  
1:  /*
1:   * bpf_perf_event_output
1: @@ -681,7 +698,8 @@ static __u32 (*bpf_get_route_realm)(struct __sk_buff *skb) = (void *) 24;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_perf_event_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 25;
1: +static long (*bpf_perf_event_output)(void *ctx, void *map, __u64 flags,
1: +                                     void *data, __u64 size) = (void *)25;
1:  
1:  /*
1:   * bpf_skb_load_bytes
1: @@ -702,7 +720,8 @@ static long (*bpf_perf_event_output)(void *ctx, void *map, __u64 flags, void *da
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_load_bytes)(const void *skb, __u32 offset, void *to, __u32 len) = (void *) 26;
1: +static long (*bpf_skb_load_bytes)(const void *skb, __u32 offset, void *to,
1: +                                  __u32 len) = (void *)26;
1:  
1:  /*
1:   * bpf_get_stackid
1: @@ -748,7 +767,7 @@ static long (*bpf_skb_load_bytes)(const void *skb, __u32 offset, void *to, __u32
1:   * 	The positive or null stack id on success, or a negative error
1:   * 	in case of failure.
1:   */
1: -static long (*bpf_get_stackid)(void *ctx, void *map, __u64 flags) = (void *) 27;
1: +static long (*bpf_get_stackid)(void *ctx, void *map, __u64 flags) = (void *)27;
1:  
1:  /*
1:   * bpf_csum_diff
1: @@ -779,7 +798,8 @@ static long (*bpf_get_stackid)(void *ctx, void *map, __u64 flags) = (void *) 27;
1:   * 	The checksum result, or a negative error code in case of
1:   * 	failure.
1:   */
1: -static __s64 (*bpf_csum_diff)(__be32 *from, __u32 from_size, __be32 *to, __u32 to_size, __wsum seed) = (void *) 28;
1: +static __s64 (*bpf_csum_diff)(__be32 *from, __u32 from_size, __be32 *to,
1: +                              __u32 to_size, __wsum seed) = (void *)28;
1:  
1:  /*
1:   * bpf_skb_get_tunnel_opt
1: @@ -801,7 +821,8 @@ static __s64 (*bpf_csum_diff)(__be32 *from, __u32 from_size, __be32 *to, __u32 t
1:   * Returns
1:   * 	The size of the option data retrieved.
1:   */
1: -static long (*bpf_skb_get_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 size) = (void *) 29;
1: +static long (*bpf_skb_get_tunnel_opt)(struct __sk_buff *skb, void *opt,
1: +                                      __u32 size) = (void *)29;
1:  
1:  /*
1:   * bpf_skb_set_tunnel_opt
1: @@ -815,7 +836,8 @@ static long (*bpf_skb_get_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 si
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_set_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 size) = (void *) 30;
1: +static long (*bpf_skb_set_tunnel_opt)(struct __sk_buff *skb, void *opt,
1: +                                      __u32 size) = (void *)30;
1:  
1:  /*
1:   * bpf_skb_change_proto
1: @@ -846,7 +868,8 @@ static long (*bpf_skb_set_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 si
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_change_proto)(struct __sk_buff *skb, __be16 proto, __u64 flags) = (void *) 31;
1: +static long (*bpf_skb_change_proto)(struct __sk_buff *skb, __be16 proto,
1: +                                    __u64 flags) = (void *)31;
1:  
1:  /*
1:   * bpf_skb_change_type
1: @@ -877,7 +900,8 @@ static long (*bpf_skb_change_proto)(struct __sk_buff *skb, __be16 proto, __u64 f
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_change_type)(struct __sk_buff *skb, __u32 type) = (void *) 32;
1: +static long (*bpf_skb_change_type)(struct __sk_buff *skb,
1: +                                   __u32 type) = (void *)32;
1:  
1:  /*
1:   * bpf_skb_under_cgroup
1: @@ -892,7 +916,8 @@ static long (*bpf_skb_change_type)(struct __sk_buff *skb, __u32 type) = (void *)
1:   * 	* 1, if the *skb* succeeded the cgroup2 descendant test.
1:   * 	* A negative error code, if an error occurred.
1:   */
1: -static long (*bpf_skb_under_cgroup)(struct __sk_buff *skb, void *map, __u32 index) = (void *) 33;
1: +static long (*bpf_skb_under_cgroup)(struct __sk_buff *skb, void *map,
1: +                                    __u32 index) = (void *)33;
1:  
1:  /*
1:   * bpf_get_hash_recalc
1: @@ -912,7 +937,7 @@ static long (*bpf_skb_under_cgroup)(struct __sk_buff *skb, void *map, __u32 inde
1:   * Returns
1:   * 	The 32-bit hash.
1:   */
1: -static __u32 (*bpf_get_hash_recalc)(struct __sk_buff *skb) = (void *) 34;
1: +static __u32 (*bpf_get_hash_recalc)(struct __sk_buff *skb) = (void *)34;
1:  
1:  /*
1:   * bpf_get_current_task
1: @@ -921,7 +946,7 @@ static __u32 (*bpf_get_hash_recalc)(struct __sk_buff *skb) = (void *) 34;
1:   * Returns
1:   * 	A pointer to the current task struct.
1:   */
1: -static __u64 (*bpf_get_current_task)(void) = (void *) 35;
1: +static __u64 (*bpf_get_current_task)(void) = (void *)35;
1:  
1:  /*
1:   * bpf_probe_write_user
1: @@ -944,7 +969,8 @@ static __u64 (*bpf_get_current_task)(void) = (void *) 35;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_probe_write_user)(void *dst, const void *src, __u32 len) = (void *) 36;
1: +static long (*bpf_probe_write_user)(void *dst, const void *src,
1: +                                    __u32 len) = (void *)36;
1:  
1:  /*
1:   * bpf_current_task_under_cgroup
1: @@ -960,7 +986,8 @@ static long (*bpf_probe_write_user)(void *dst, const void *src, __u32 len) = (vo
1:   * 	* 1, if current task does not belong to the cgroup2.
1:   * 	* A negative error code, if an error occurred.
1:   */
1: -static long (*bpf_current_task_under_cgroup)(void *map, __u32 index) = (void *) 37;
1: +static long (*bpf_current_task_under_cgroup)(void *map,
1: +                                             __u32 index) = (void *)37;
1:  
1:  /*
1:   * bpf_skb_change_tail
1: @@ -988,7 +1015,8 @@ static long (*bpf_current_task_under_cgroup)(void *map, __u32 index) = (void *)
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_change_tail)(struct __sk_buff *skb, __u32 len, __u64 flags) = (void *) 38;
1: +static long (*bpf_skb_change_tail)(struct __sk_buff *skb, __u32 len,
1: +                                   __u64 flags) = (void *)38;
1:  
1:  /*
1:   * bpf_skb_pull_data
1: @@ -1028,7 +1056,7 @@ static long (*bpf_skb_change_tail)(struct __sk_buff *skb, __u32 len, __u64 flags
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_pull_data)(struct __sk_buff *skb, __u32 len) = (void *) 39;
1: +static long (*bpf_skb_pull_data)(struct __sk_buff *skb, __u32 len) = (void *)39;
1:  
1:  /*
1:   * bpf_csum_update
1: @@ -1044,7 +1072,8 @@ static long (*bpf_skb_pull_data)(struct __sk_buff *skb, __u32 len) = (void *) 39
1:   * 	The checksum on success, or a negative error code in case of
1:   * 	failure.
1:   */
1: -static __s64 (*bpf_csum_update)(struct __sk_buff *skb, __wsum csum) = (void *) 40;
1: +static __s64 (*bpf_csum_update)(struct __sk_buff *skb,
1: +                                __wsum csum) = (void *)40;
1:  
1:  /*
1:   * bpf_set_hash_invalid
1: @@ -1056,7 +1085,7 @@ static __s64 (*bpf_csum_update)(struct __sk_buff *skb, __wsum csum) = (void *) 4
1:   * 	hash or when the **bpf_get_hash_recalc**\ () helper is called.
1:   *
1:   */
1: -static void (*bpf_set_hash_invalid)(struct __sk_buff *skb) = (void *) 41;
1: +static void (*bpf_set_hash_invalid)(struct __sk_buff *skb) = (void *)41;
1:  
1:  /*
1:   * bpf_get_numa_node_id
1: @@ -1071,7 +1100,7 @@ static void (*bpf_set_hash_invalid)(struct __sk_buff *skb) = (void *) 41;
1:   * Returns
1:   * 	The id of current NUMA node.
1:   */
1: -static long (*bpf_get_numa_node_id)(void) = (void *) 42;
1: +static long (*bpf_get_numa_node_id)(void) = (void *)42;
1:  
1:  /*
1:   * bpf_skb_change_head
1: @@ -1096,7 +1125,8 @@ static long (*bpf_get_numa_node_id)(void) = (void *) 42;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_change_head)(struct __sk_buff *skb, __u32 len, __u64 flags) = (void *) 43;
1: +static long (*bpf_skb_change_head)(struct __sk_buff *skb, __u32 len,
1: +                                   __u64 flags) = (void *)43;
1:  
1:  /*
1:   * bpf_xdp_adjust_head
1: @@ -1115,7 +1145,8 @@ static long (*bpf_skb_change_head)(struct __sk_buff *skb, __u32 len, __u64 flags
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_xdp_adjust_head)(struct xdp_md *xdp_md, int delta) = (void *) 44;
1: +static long (*bpf_xdp_adjust_head)(struct xdp_md *xdp_md,
1: +                                   int delta) = (void *)44;
1:  
1:  /*
1:   * bpf_probe_read_str
1: @@ -1132,7 +1163,8 @@ static long (*bpf_xdp_adjust_head)(struct xdp_md *xdp_md, int delta) = (void *)
1:   * 	including the trailing NUL character. On error, a negative
1:   * 	value.
1:   */
1: -static long (*bpf_probe_read_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 45;
1: +static long (*bpf_probe_read_str)(void *dst, __u32 size,
1: +                                  const void *unsafe_ptr) = (void *)45;
1:  
1:  /*
1:   * bpf_get_socket_cookie
1: @@ -1149,7 +1181,7 @@ static long (*bpf_probe_read_str)(void *dst, __u32 size, const void *unsafe_ptr)
1:   * 	A 8-byte long unique number on success, or 0 if the socket
1:   * 	field is missing inside *skb*.
1:   */
1: -static __u64 (*bpf_get_socket_cookie)(void *ctx) = (void *) 46;
1: +static __u64 (*bpf_get_socket_cookie)(void *ctx) = (void *)46;
1:  
1:  /*
1:   * bpf_get_socket_uid
1: @@ -1162,7 +1194,7 @@ static __u64 (*bpf_get_socket_cookie)(void *ctx) = (void *) 46;
1:   * 	is returned (note that **overflowuid** might also be the actual
1:   * 	UID value for the socket).
1:   */
1: -static __u32 (*bpf_get_socket_uid)(struct __sk_buff *skb) = (void *) 47;
1: +static __u32 (*bpf_get_socket_uid)(struct __sk_buff *skb) = (void *)47;
1:  
1:  /*
1:   * bpf_set_hash
1: @@ -1173,7 +1205,7 @@ static __u32 (*bpf_get_socket_uid)(struct __sk_buff *skb) = (void *) 47;
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_set_hash)(struct __sk_buff *skb, __u32 hash) = (void *) 48;
1: +static long (*bpf_set_hash)(struct __sk_buff *skb, __u32 hash) = (void *)48;
1:  
1:  /*
1:   * bpf_setsockopt
1: @@ -1208,7 +1240,8 @@ static long (*bpf_set_hash)(struct __sk_buff *skb, __u32 hash) = (void *) 48;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_setsockopt)(void *bpf_socket, int level, int optname, void *optval, int optlen) = (void *) 49;
1: +static long (*bpf_setsockopt)(void *bpf_socket, int level, int optname,
1: +                              void *optval, int optlen) = (void *)49;
1:  
1:  /*
1:   * bpf_skb_adjust_room
1: @@ -1262,7 +1295,8 @@ static long (*bpf_setsockopt)(void *bpf_socket, int level, int optname, void *op
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_adjust_room)(struct __sk_buff *skb, __s32 len_diff, __u32 mode, __u64 flags) = (void *) 50;
1: +static long (*bpf_skb_adjust_room)(struct __sk_buff *skb, __s32 len_diff,
1: +                                   __u32 mode, __u64 flags) = (void *)50;
1:  
1:  /*
1:   * bpf_redirect_map
1: @@ -1291,7 +1325,7 @@ static long (*bpf_skb_adjust_room)(struct __sk_buff *skb, __s32 len_diff, __u32
1:   * 	**XDP_REDIRECT** on success, or the value of the two lower bits
1:   * 	of the *flags* argument on error.
1:   */
1: -static long (*bpf_redirect_map)(void *map, __u32 key, __u64 flags) = (void *) 51;
1: +static long (*bpf_redirect_map)(void *map, __u32 key, __u64 flags) = (void *)51;
1:  
1:  /*
1:   * bpf_sk_redirect_map
1: @@ -1306,7 +1340,8 @@ static long (*bpf_redirect_map)(void *map, __u32 key, __u64 flags) = (void *) 51
1:   * Returns
1:   * 	**SK_PASS** on success, or **SK_DROP** on error.
1:   */
1: -static long (*bpf_sk_redirect_map)(struct __sk_buff *skb, void *map, __u32 key, __u64 flags) = (void *) 52;
1: +static long (*bpf_sk_redirect_map)(struct __sk_buff *skb, void *map, __u32 key,
1: +                                   __u64 flags) = (void *)52;
1:  
1:  /*
1:   * bpf_sock_map_update
1: @@ -1329,7 +1364,8 @@ static long (*bpf_sk_redirect_map)(struct __sk_buff *skb, void *map, __u32 key,
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_sock_map_update)(struct bpf_sock_ops *skops, void *map, void *key, __u64 flags) = (void *) 53;
1: +static long (*bpf_sock_map_update)(struct bpf_sock_ops *skops, void *map,
1: +                                   void *key, __u64 flags) = (void *)53;
1:  
1:  /*
1:   * bpf_xdp_adjust_meta
1: @@ -1362,7 +1398,8 @@ static long (*bpf_sock_map_update)(struct bpf_sock_ops *skops, void *map, void *
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_xdp_adjust_meta)(struct xdp_md *xdp_md, int delta) = (void *) 54;
1: +static long (*bpf_xdp_adjust_meta)(struct xdp_md *xdp_md,
1: +                                   int delta) = (void *)54;
1:  
1:  /*
1:   * bpf_perf_event_read_value
1: @@ -1416,7 +1453,9 @@ static long (*bpf_xdp_adjust_meta)(struct xdp_md *xdp_md, int delta) = (void *)
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_perf_event_read_value)(void *map, __u64 flags, struct bpf_perf_event_value *buf, __u32 buf_size) = (void *) 55;
1: +static long (*bpf_perf_event_read_value)(void *map, __u64 flags,
1: +                                         struct bpf_perf_event_value *buf,
1: +                                         __u32 buf_size) = (void *)55;
1:  
1:  /*
1:   * bpf_perf_prog_read_value
1: @@ -1431,7 +1470,9 @@ static long (*bpf_perf_event_read_value)(void *map, __u64 flags, struct bpf_perf
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_perf_prog_read_value)(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, __u32 buf_size) = (void *) 56;
1: +static long (*bpf_perf_prog_read_value)(struct bpf_perf_event_data *ctx,
1: +                                        struct bpf_perf_event_value *buf,
1: +                                        __u32 buf_size) = (void *)56;
1:  
1:  /*
1:   * bpf_getsockopt
1: @@ -1460,7 +1501,8 @@ static long (*bpf_perf_prog_read_value)(struct bpf_perf_event_data *ctx, struct
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_getsockopt)(void *bpf_socket, int level, int optname, void *optval, int optlen) = (void *) 57;
1: +static long (*bpf_getsockopt)(void *bpf_socket, int level, int optname,
1: +                              void *optval, int optlen) = (void *)57;
1:  
1:  /*
1:   * bpf_override_return
1: @@ -1489,7 +1531,7 @@ static long (*bpf_getsockopt)(void *bpf_socket, int level, int optname, void *op
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_override_return)(struct pt_regs *regs, __u64 rc) = (void *) 58;
1: +static long (*bpf_override_return)(struct pt_regs *regs, __u64 rc) = (void *)58;
1:  
1:  /*
1:   * bpf_sock_ops_cb_flags_set
1: @@ -1537,7 +1579,8 @@ static long (*bpf_override_return)(struct pt_regs *regs, __u64 rc) = (void *) 58
1:   * 	be set is returned (which comes down to 0 if all bits were set
1:   * 	as required).
1:   */
1: -static long (*bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops *bpf_sock, int argval) = (void *) 59;
1: +static long (*bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops *bpf_sock,
1: +                                         int argval) = (void *)59;
1:  
1:  /*
1:   * bpf_msg_redirect_map
1: @@ -1555,7 +1598,8 @@ static long (*bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops *bpf_sock, int argv
1:   * Returns
1:   * 	**SK_PASS** on success, or **SK_DROP** on error.
1:   */
1: -static long (*bpf_msg_redirect_map)(struct sk_msg_md *msg, void *map, __u32 key, __u64 flags) = (void *) 60;
1: +static long (*bpf_msg_redirect_map)(struct sk_msg_md *msg, void *map, __u32 key,
1: +                                    __u64 flags) = (void *)60;
1:  
1:  /*
1:   * bpf_msg_apply_bytes
1: @@ -1593,7 +1637,8 @@ static long (*bpf_msg_redirect_map)(struct sk_msg_md *msg, void *map, __u32 key,
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_msg_apply_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *) 61;
1: +static long (*bpf_msg_apply_bytes)(struct sk_msg_md *msg,
1: +                                   __u32 bytes) = (void *)61;
1:  
1:  /*
1:   * bpf_msg_cork_bytes
1: @@ -1615,7 +1660,8 @@ static long (*bpf_msg_apply_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_msg_cork_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *) 62;
1: +static long (*bpf_msg_cork_bytes)(struct sk_msg_md *msg,
1: +                                  __u32 bytes) = (void *)62;
1:  
1:  /*
1:   * bpf_msg_pull_data
1: @@ -1650,7 +1696,8 @@ static long (*bpf_msg_cork_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *)
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_msg_pull_data)(struct sk_msg_md *msg, __u32 start, __u32 end, __u64 flags) = (void *) 63;
1: +static long (*bpf_msg_pull_data)(struct sk_msg_md *msg, __u32 start, __u32 end,
1: +                                 __u64 flags) = (void *)63;
1:  
1:  /*
1:   * bpf_bind
1: @@ -1672,7 +1719,8 @@ static long (*bpf_msg_pull_data)(struct sk_msg_md *msg, __u32 start, __u32 end,
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_bind)(struct bpf_sock_addr *ctx, struct sockaddr *addr, int addr_len) = (void *) 64;
1: +static long (*bpf_bind)(struct bpf_sock_addr *ctx, struct sockaddr *addr,
1: +                        int addr_len) = (void *)64;
1:  
1:  /*
1:   * bpf_xdp_adjust_tail
1: @@ -1690,7 +1738,8 @@ static long (*bpf_bind)(struct bpf_sock_addr *ctx, struct sockaddr *addr, int ad
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_xdp_adjust_tail)(struct xdp_md *xdp_md, int delta) = (void *) 65;
1: +static long (*bpf_xdp_adjust_tail)(struct xdp_md *xdp_md,
1: +                                   int delta) = (void *)65;
1:  
1:  /*
1:   * bpf_skb_get_xfrm_state
1: @@ -1710,7 +1759,9 @@ static long (*bpf_xdp_adjust_tail)(struct xdp_md *xdp_md, int delta) = (void *)
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_get_xfrm_state)(struct __sk_buff *skb, __u32 index, struct bpf_xfrm_state *xfrm_state, __u32 size, __u64 flags) = (void *) 66;
1: +static long (*bpf_skb_get_xfrm_state)(struct __sk_buff *skb, __u32 index,
1: +                                      struct bpf_xfrm_state *xfrm_state,
1: +                                      __u32 size, __u64 flags) = (void *)66;
1:  
1:  /*
1:   * bpf_get_stack
1: @@ -1747,7 +1798,8 @@ static long (*bpf_skb_get_xfrm_state)(struct __sk_buff *skb, __u32 index, struct
1:   * 	A non-negative value equal to or less than *size* on success,
1:   * 	or a negative error in case of failure.
1:   */
1: -static long (*bpf_get_stack)(void *ctx, void *buf, __u32 size, __u64 flags) = (void *) 67;
1: +static long (*bpf_get_stack)(void *ctx, void *buf, __u32 size,
1: +                             __u64 flags) = (void *)67;
1:  
1:  /*
1:   * bpf_skb_load_bytes_relative
1: @@ -1773,7 +1825,9 @@ static long (*bpf_get_stack)(void *ctx, void *buf, __u32 size, __u64 flags) = (v
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_load_bytes_relative)(const void *skb, __u32 offset, void *to, __u32 len, __u32 start_header) = (void *) 68;
1: +static long (*bpf_skb_load_bytes_relative)(const void *skb, __u32 offset,
1: +                                           void *to, __u32 len,
1: +                                           __u32 start_header) = (void *)68;
1:  
1:  /*
1:   * bpf_fib_lookup
1: @@ -1811,7 +1865,8 @@ static long (*bpf_skb_load_bytes_relative)(const void *skb, __u32 offset, void *
1:   * 	If lookup fails with BPF_FIB_LKUP_RET_FRAG_NEEDED, then the MTU
1:   * 	was exceeded and output params->mtu_result contains the MTU.
1:   */
1: -static long (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params, int plen, __u32 flags) = (void *) 69;
1: +static long (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params,
1: +                              int plen, __u32 flags) = (void *)69;
1:  
1:  /*
1:   * bpf_sock_hash_update
1: @@ -1834,7 +1889,8 @@ static long (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params, int plen
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_sock_hash_update)(struct bpf_sock_ops *skops, void *map, void *key, __u64 flags) = (void *) 70;
1: +static long (*bpf_sock_hash_update)(struct bpf_sock_ops *skops, void *map,
1: +                                    void *key, __u64 flags) = (void *)70;
1:  
1:  /*
1:   * bpf_msg_redirect_hash
1: @@ -1852,7 +1908,8 @@ static long (*bpf_sock_hash_update)(struct bpf_sock_ops *skops, void *map, void
1:   * Returns
1:   * 	**SK_PASS** on success, or **SK_DROP** on error.
1:   */
1: -static long (*bpf_msg_redirect_hash)(struct sk_msg_md *msg, void *map, void *key, __u64 flags) = (void *) 71;
1: +static long (*bpf_msg_redirect_hash)(struct sk_msg_md *msg, void *map,
1: +                                     void *key, __u64 flags) = (void *)71;
1:  
1:  /*
1:   * bpf_sk_redirect_hash
1: @@ -1870,7 +1927,8 @@ static long (*bpf_msg_redirect_hash)(struct sk_msg_md *msg, void *map, void *key
1:   * Returns
1:   * 	**SK_PASS** on success, or **SK_DROP** on error.
1:   */
1: -static long (*bpf_sk_redirect_hash)(struct __sk_buff *skb, void *map, void *key, __u64 flags) = (void *) 72;
1: +static long (*bpf_sk_redirect_hash)(struct __sk_buff *skb, void *map, void *key,
1: +                                    __u64 flags) = (void *)72;
1:  
1:  /*
1:   * bpf_lwt_push_encap
1: @@ -1911,7 +1969,8 @@ static long (*bpf_sk_redirect_hash)(struct __sk_buff *skb, void *map, void *key,
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_lwt_push_encap)(struct __sk_buff *skb, __u32 type, void *hdr, __u32 len) = (void *) 73;
1: +static long (*bpf_lwt_push_encap)(struct __sk_buff *skb, __u32 type, void *hdr,
1: +                                  __u32 len) = (void *)73;
1:  
1:  /*
1:   * bpf_lwt_seg6_store_bytes
1: @@ -1930,7 +1989,9 @@ static long (*bpf_lwt_push_encap)(struct __sk_buff *skb, __u32 type, void *hdr,
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_lwt_seg6_store_bytes)(struct __sk_buff *skb, __u32 offset, const void *from, __u32 len) = (void *) 74;
1: +static long (*bpf_lwt_seg6_store_bytes)(struct __sk_buff *skb, __u32 offset,
1: +                                        const void *from,
1: +                                        __u32 len) = (void *)74;
1:  
1:  /*
1:   * bpf_lwt_seg6_adjust_srh
1: @@ -1950,7 +2011,8 @@ static long (*bpf_lwt_seg6_store_bytes)(struct __sk_buff *skb, __u32 offset, con
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_lwt_seg6_adjust_srh)(struct __sk_buff *skb, __u32 offset, __s32 delta) = (void *) 75;
1: +static long (*bpf_lwt_seg6_adjust_srh)(struct __sk_buff *skb, __u32 offset,
1: +                                       __s32 delta) = (void *)75;
1:  
1:  /*
1:   * bpf_lwt_seg6_action
1: @@ -1983,7 +2045,8 @@ static long (*bpf_lwt_seg6_adjust_srh)(struct __sk_buff *skb, __u32 offset, __s3
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_lwt_seg6_action)(struct __sk_buff *skb, __u32 action, void *param, __u32 param_len) = (void *) 76;
1: +static long (*bpf_lwt_seg6_action)(struct __sk_buff *skb, __u32 action,
1: +                                   void *param, __u32 param_len) = (void *)76;
1:  
1:  /*
1:   * bpf_rc_repeat
1: @@ -2006,7 +2069,7 @@ static long (*bpf_lwt_seg6_action)(struct __sk_buff *skb, __u32 action, void *pa
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_rc_repeat)(void *ctx) = (void *) 77;
1: +static long (*bpf_rc_repeat)(void *ctx) = (void *)77;
1:  
1:  /*
1:   * bpf_rc_keydown
1: @@ -2036,7 +2099,8 @@ static long (*bpf_rc_repeat)(void *ctx) = (void *) 77;
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_rc_keydown)(void *ctx, __u32 protocol, __u64 scancode, __u32 toggle) = (void *) 78;
1: +static long (*bpf_rc_keydown)(void *ctx, __u32 protocol, __u64 scancode,
1: +                              __u32 toggle) = (void *)78;
1:  
1:  /*
1:   * bpf_skb_cgroup_id
1: @@ -2056,7 +2120,7 @@ static long (*bpf_rc_keydown)(void *ctx, __u32 protocol, __u64 scancode, __u32 t
1:   * Returns
1:   * 	The id is returned or 0 in case the id could not be retrieved.
1:   */
1: -static __u64 (*bpf_skb_cgroup_id)(struct __sk_buff *skb) = (void *) 79;
1: +static __u64 (*bpf_skb_cgroup_id)(struct __sk_buff *skb) = (void *)79;
1:  
1:  /*
1:   * bpf_get_current_cgroup_id
1: @@ -2066,7 +2130,7 @@ static __u64 (*bpf_skb_cgroup_id)(struct __sk_buff *skb) = (void *) 79;
1:   * 	A 64-bit integer containing the current cgroup id based
1:   * 	on the cgroup within which the current task is running.
1:   */
1: -static __u64 (*bpf_get_current_cgroup_id)(void) = (void *) 80;
1: +static __u64 (*bpf_get_current_cgroup_id)(void) = (void *)80;
1:  
1:  /*
1:   * bpf_get_local_storage
1: @@ -2088,7 +2152,7 @@ static __u64 (*bpf_get_current_cgroup_id)(void) = (void *) 80;
1:   * Returns
1:   * 	A pointer to the local storage area.
1:   */
1: -static void *(*bpf_get_local_storage)(void *map, __u64 flags) = (void *) 81;
1: +static void *(*bpf_get_local_storage)(void *map, __u64 flags) = (void *)81;
1:  
1:  /*
1:   * bpf_sk_select_reuseport
1: @@ -2101,7 +2165,8 @@ static void *(*bpf_get_local_storage)(void *map, __u64 flags) = (void *) 81;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_sk_select_reuseport)(struct sk_reuseport_md *reuse, void *map, void *key, __u64 flags) = (void *) 82;
1: +static long (*bpf_sk_select_reuseport)(struct sk_reuseport_md *reuse, void *map,
1: +                                       void *key, __u64 flags) = (void *)82;
1:  
1:  /*
1:   * bpf_skb_ancestor_cgroup_id
1: @@ -2123,7 +2188,8 @@ static long (*bpf_sk_select_reuseport)(struct sk_reuseport_md *reuse, void *map,
1:   * Returns
1:   * 	The id is returned or 0 in case the id could not be retrieved.
1:   */
1: -static __u64 (*bpf_skb_ancestor_cgroup_id)(struct __sk_buff *skb, int ancestor_level) = (void *) 83;
1: +static __u64 (*bpf_skb_ancestor_cgroup_id)(struct __sk_buff *skb,
1: +                                           int ancestor_level) = (void *)83;
1:  
1:  /*
1:   * bpf_sk_lookup_tcp
1: @@ -2164,7 +2230,10 @@ static __u64 (*bpf_skb_ancestor_cgroup_id)(struct __sk_buff *skb, int ancestor_l
1:   * 	result is from *reuse*\ **->socks**\ [] using the hash of the
1:   * 	tuple.
1:   */
1: -static struct bpf_sock *(*bpf_sk_lookup_tcp)(void *ctx, struct bpf_sock_tuple *tuple, __u32 tuple_size, __u64 netns, __u64 flags) = (void *) 84;
1: +static struct bpf_sock *(*bpf_sk_lookup_tcp)(void *ctx,
1: +                                             struct bpf_sock_tuple *tuple,
1: +                                             __u32 tuple_size, __u64 netns,
1: +                                             __u64 flags) = (void *)84;
1:  
1:  /*
1:   * bpf_sk_lookup_udp
1: @@ -2205,7 +2274,10 @@ static struct bpf_sock *(*bpf_sk_lookup_tcp)(void *ctx, struct bpf_sock_tuple *t
1:   * 	result is from *reuse*\ **->socks**\ [] using the hash of the
1:   * 	tuple.
1:   */
1: -static struct bpf_sock *(*bpf_sk_lookup_udp)(void *ctx, struct bpf_sock_tuple *tuple, __u32 tuple_size, __u64 netns, __u64 flags) = (void *) 85;
1: +static struct bpf_sock *(*bpf_sk_lookup_udp)(void *ctx,
1: +                                             struct bpf_sock_tuple *tuple,
1: +                                             __u32 tuple_size, __u64 netns,
1: +                                             __u64 flags) = (void *)85;
1:  
1:  /*
1:   * bpf_sk_release
1: @@ -2217,7 +2289,7 @@ static struct bpf_sock *(*bpf_sk_lookup_udp)(void *ctx, struct bpf_sock_tuple *t
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_sk_release)(void *sock) = (void *) 86;
1: +static long (*bpf_sk_release)(void *sock) = (void *)86;
1:  
1:  /*
1:   * bpf_map_push_elem
1: @@ -2231,7 +2303,8 @@ static long (*bpf_sk_release)(void *sock) = (void *) 86;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_map_push_elem)(void *map, const void *value, __u64 flags) = (void *) 87;
1: +static long (*bpf_map_push_elem)(void *map, const void *value,
1: +                                 __u64 flags) = (void *)87;
1:  
1:  /*
1:   * bpf_map_pop_elem
1: @@ -2241,7 +2314,7 @@ static long (*bpf_map_push_elem)(void *map, const void *value, __u64 flags) = (v
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_map_pop_elem)(void *map, void *value) = (void *) 88;
1: +static long (*bpf_map_pop_elem)(void *map, void *value) = (void *)88;
1:  
1:  /*
1:   * bpf_map_peek_elem
1: @@ -2251,7 +2324,7 @@ static long (*bpf_map_pop_elem)(void *map, void *value) = (void *) 88;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_map_peek_elem)(void *map, void *value) = (void *) 89;
1: +static long (*bpf_map_peek_elem)(void *map, void *value) = (void *)89;
1:  
1:  /*
1:   * bpf_msg_push_data
1: @@ -2271,7 +2344,8 @@ static long (*bpf_map_peek_elem)(void *map, void *value) = (void *) 89;
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_msg_push_data)(struct sk_msg_md *msg, __u32 start, __u32 len, __u64 flags) = (void *) 90;
1: +static long (*bpf_msg_push_data)(struct sk_msg_md *msg, __u32 start, __u32 len,
1: +                                 __u64 flags) = (void *)90;
1:  
1:  /*
1:   * bpf_msg_pop_data
1: @@ -2287,7 +2361,8 @@ static long (*bpf_msg_push_data)(struct sk_msg_md *msg, __u32 start, __u32 len,
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_msg_pop_data)(struct sk_msg_md *msg, __u32 start, __u32 len, __u64 flags) = (void *) 91;
1: +static long (*bpf_msg_pop_data)(struct sk_msg_md *msg, __u32 start, __u32 len,
1: +                                __u64 flags) = (void *)91;
1:  
1:  /*
1:   * bpf_rc_pointer_rel
1: @@ -2305,7 +2380,8 @@ static long (*bpf_msg_pop_data)(struct sk_msg_md *msg, __u32 start, __u32 len, _
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_rc_pointer_rel)(void *ctx, __s32 rel_x, __s32 rel_y) = (void *) 92;
1: +static long (*bpf_rc_pointer_rel)(void *ctx, __s32 rel_x,
1: +                                  __s32 rel_y) = (void *)92;
1:  
1:  /*
1:   * bpf_spin_lock
1: @@ -2357,7 +2433,7 @@ static long (*bpf_rc_pointer_rel)(void *ctx, __s32 rel_x, __s32 rel_y) = (void *
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_spin_lock)(struct bpf_spin_lock *lock) = (void *) 93;
1: +static long (*bpf_spin_lock)(struct bpf_spin_lock *lock) = (void *)93;
1:  
1:  /*
1:   * bpf_spin_unlock
1: @@ -2368,7 +2444,7 @@ static long (*bpf_spin_lock)(struct bpf_spin_lock *lock) = (void *) 93;
1:   * Returns
1:   * 	0
1:   */
1: -static long (*bpf_spin_unlock)(struct bpf_spin_lock *lock) = (void *) 94;
1: +static long (*bpf_spin_unlock)(struct bpf_spin_lock *lock) = (void *)94;
1:  
1:  /*
1:   * bpf_sk_fullsock
1: @@ -2380,7 +2456,7 @@ static long (*bpf_spin_unlock)(struct bpf_spin_lock *lock) = (void *) 94;
1:   * 	A **struct bpf_sock** pointer on success, or **NULL** in
1:   * 	case of failure.
1:   */
1: -static struct bpf_sock *(*bpf_sk_fullsock)(struct bpf_sock *sk) = (void *) 95;
1: +static struct bpf_sock *(*bpf_sk_fullsock)(struct bpf_sock *sk) = (void *)95;
1:  
1:  /*
1:   * bpf_tcp_sock
1: @@ -2392,7 +2468,7 @@ static struct bpf_sock *(*bpf_sk_fullsock)(struct bpf_sock *sk) = (void *) 95;
1:   * 	A **struct bpf_tcp_sock** pointer on success, or **NULL** in
1:   * 	case of failure.
1:   */
1: -static struct bpf_tcp_sock *(*bpf_tcp_sock)(struct bpf_sock *sk) = (void *) 96;
1: +static struct bpf_tcp_sock *(*bpf_tcp_sock)(struct bpf_sock *sk) = (void *)96;
1:  
1:  /*
1:   * bpf_skb_ecn_set_ce
1: @@ -2406,7 +2482,7 @@ static struct bpf_tcp_sock *(*bpf_tcp_sock)(struct bpf_sock *sk) = (void *) 96;
1:   * 	1 if the **CE** flag is set (either by the current helper call
1:   * 	or because it was already present), 0 if it is not set.
1:   */
1: -static long (*bpf_skb_ecn_set_ce)(struct __sk_buff *skb) = (void *) 97;
1: +static long (*bpf_skb_ecn_set_ce)(struct __sk_buff *skb) = (void *)97;
1:  
1:  /*
1:   * bpf_get_listener_sock
1: @@ -2418,7 +2494,8 @@ static long (*bpf_skb_ecn_set_ce)(struct __sk_buff *skb) = (void *) 97;
1:   * 	A **struct bpf_sock** pointer on success, or **NULL** in
1:   * 	case of failure.
1:   */
1: -static struct bpf_sock *(*bpf_get_listener_sock)(struct bpf_sock *sk) = (void *) 98;
1: +static struct bpf_sock *(*bpf_get_listener_sock)(struct bpf_sock *sk) =
1: +    (void *)98;
1:  
1:  /*
1:   * bpf_skc_lookup_tcp
1: @@ -2441,7 +2518,10 @@ static struct bpf_sock *(*bpf_get_listener_sock)(struct bpf_sock *sk) = (void *)
1:   * 	result is from *reuse*\ **->socks**\ [] using the hash of the
1:   * 	tuple.
1:   */
1: -static struct bpf_sock *(*bpf_skc_lookup_tcp)(void *ctx, struct bpf_sock_tuple *tuple, __u32 tuple_size, __u64 netns, __u64 flags) = (void *) 99;
1: +static struct bpf_sock *(*bpf_skc_lookup_tcp)(void *ctx,
1: +                                              struct bpf_sock_tuple *tuple,
1: +                                              __u32 tuple_size, __u64 netns,
1: +                                              __u64 flags) = (void *)99;
1:  
1:  /*
1:   * bpf_tcp_check_syncookie
1: @@ -2460,7 +2540,9 @@ static struct bpf_sock *(*bpf_skc_lookup_tcp)(void *ctx, struct bpf_sock_tuple *
1:   * 	0 if *iph* and *th* are a valid SYN cookie ACK, or a negative
1:   * 	error otherwise.
1:   */
1: -static long (*bpf_tcp_check_syncookie)(void *sk, void *iph, __u32 iph_len, struct tcphdr *th, __u32 th_len) = (void *) 100;
1: +static long (*bpf_tcp_check_syncookie)(void *sk, void *iph, __u32 iph_len,
1: +                                       struct tcphdr *th,
1: +                                       __u32 th_len) = (void *)100;
1:  
1:  /*
1:   * bpf_sysctl_get_name
1: @@ -2480,7 +2562,9 @@ static long (*bpf_tcp_check_syncookie)(void *sk, void *iph, __u32 iph_len, struc
1:   * 	**-E2BIG** if the buffer wasn't big enough (*buf* will contain
1:   * 	truncated name in this case).
1:   */
1: -static long (*bpf_sysctl_get_name)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len, __u64 flags) = (void *) 101;
1: +static long (*bpf_sysctl_get_name)(struct bpf_sysctl *ctx, char *buf,
1: +                                   unsigned long buf_len,
1: +                                   __u64 flags) = (void *)101;
1:  
1:  /*
1:   * bpf_sysctl_get_current_value
1: @@ -2503,7 +2587,8 @@ static long (*bpf_sysctl_get_name)(struct bpf_sysctl *ctx, char *buf, unsigned l
1:   * 	**-EINVAL** if current value was unavailable, e.g. because
1:   * 	sysctl is uninitialized and read returns -EIO for it.
1:   */
1: -static long (*bpf_sysctl_get_current_value)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *) 102;
1: +static long (*bpf_sysctl_get_current_value)(
1: +    struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *)102;
1:  
1:  /*
1:   * bpf_sysctl_get_new_value
1: @@ -2524,7 +2609,8 @@ static long (*bpf_sysctl_get_current_value)(struct bpf_sysctl *ctx, char *buf, u
1:   *
1:   * 	**-EINVAL** if sysctl is being read.
1:   */
1: -static long (*bpf_sysctl_get_new_value)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *) 103;
1: +static long (*bpf_sysctl_get_new_value)(struct bpf_sysctl *ctx, char *buf,
1: +                                        unsigned long buf_len) = (void *)103;
1:  
1:  /*
1:   * bpf_sysctl_set_new_value
1: @@ -2545,7 +2631,8 @@ static long (*bpf_sysctl_get_new_value)(struct bpf_sysctl *ctx, char *buf, unsig
1:   *
1:   * 	**-EINVAL** if sysctl is being read.
1:   */
1: -static long (*bpf_sysctl_set_new_value)(struct bpf_sysctl *ctx, const char *buf, unsigned long buf_len) = (void *) 104;
1: +static long (*bpf_sysctl_set_new_value)(struct bpf_sysctl *ctx, const char *buf,
1: +                                        unsigned long buf_len) = (void *)104;
1:  
1:  /*
1:   * bpf_strtol
1: @@ -2573,7 +2660,8 @@ static long (*bpf_sysctl_set_new_value)(struct bpf_sysctl *ctx, const char *buf,
1:   *
1:   * 	**-ERANGE** if resulting value was out of range.
1:   */
1: -static long (*bpf_strtol)(const char *buf, unsigned long buf_len, __u64 flags, long *res) = (void *) 105;
1: +static long (*bpf_strtol)(const char *buf, unsigned long buf_len, __u64 flags,
1: +                          long *res) = (void *)105;
1:  
1:  /*
1:   * bpf_strtoul
1: @@ -2600,7 +2688,8 @@ static long (*bpf_strtol)(const char *buf, unsigned long buf_len, __u64 flags, l
1:   *
1:   * 	**-ERANGE** if resulting value was out of range.
1:   */
1: -static long (*bpf_strtoul)(const char *buf, unsigned long buf_len, __u64 flags, unsigned long *res) = (void *) 106;
1: +static long (*bpf_strtoul)(const char *buf, unsigned long buf_len, __u64 flags,
1: +                           unsigned long *res) = (void *)106;
1:  
1:  /*
1:   * bpf_sk_storage_get
1: @@ -2635,7 +2724,8 @@ static long (*bpf_strtoul)(const char *buf, unsigned long buf_len, __u64 flags,
1:   * 	**NULL** if not found or there was an error in adding
1:   * 	a new bpf-local-storage.
1:   */
1: -static void *(*bpf_sk_storage_get)(void *map, void *sk, void *value, __u64 flags) = (void *) 107;
1: +static void *(*bpf_sk_storage_get)(void *map, void *sk, void *value,
1: +                                   __u64 flags) = (void *)107;
1:  
1:  /*
1:   * bpf_sk_storage_delete
1: @@ -2648,7 +2738,7 @@ static void *(*bpf_sk_storage_get)(void *map, void *sk, void *value, __u64 flags
1:   * 	**-ENOENT** if the bpf-local-storage cannot be found.
1:   * 	**-EINVAL** if sk is not a fullsock (e.g. a request_sock).
1:   */
1: -static long (*bpf_sk_storage_delete)(void *map, void *sk) = (void *) 108;
1: +static long (*bpf_sk_storage_delete)(void *map, void *sk) = (void *)108;
1:  
1:  /*
1:   * bpf_send_signal
1: @@ -2667,7 +2757,7 @@ static long (*bpf_sk_storage_delete)(void *map, void *sk) = (void *) 108;
1:   *
1:   * 	**-EAGAIN** if bpf program can try again.
1:   */
1: -static long (*bpf_send_signal)(__u32 sig) = (void *) 109;
1: +static long (*bpf_send_signal)(__u32 sig) = (void *)109;
1:  
1:  /*
1:   * bpf_tcp_gen_syncookie
1: @@ -2697,7 +2787,9 @@ static long (*bpf_send_signal)(__u32 sig) = (void *) 109;
1:   *
1:   * 	**-EPROTONOSUPPORT** IP packet version is not 4 or 6
1:   */
1: -static __s64 (*bpf_tcp_gen_syncookie)(void *sk, void *iph, __u32 iph_len, struct tcphdr *th, __u32 th_len) = (void *) 110;
1: +static __s64 (*bpf_tcp_gen_syncookie)(void *sk, void *iph, __u32 iph_len,
1: +                                      struct tcphdr *th,
1: +                                      __u32 th_len) = (void *)110;
1:  
1:  /*
1:   * bpf_skb_output
1: @@ -2725,7 +2817,8 @@ static __s64 (*bpf_tcp_gen_syncookie)(void *sk, void *iph, __u32 iph_len, struct
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_skb_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 111;
1: +static long (*bpf_skb_output)(void *ctx, void *map, __u64 flags, void *data,
1: +                              __u64 size) = (void *)111;
1:  
1:  /*
1:   * bpf_probe_read_user
1: @@ -2736,7 +2829,8 @@ static long (*bpf_skb_output)(void *ctx, void *map, __u64 flags, void *data, __u
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_probe_read_user)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 112;
1: +static long (*bpf_probe_read_user)(void *dst, __u32 size,
1: +                                   const void *unsafe_ptr) = (void *)112;
1:  
1:  /*
1:   * bpf_probe_read_kernel
1: @@ -2747,7 +2841,8 @@ static long (*bpf_probe_read_user)(void *dst, __u32 size, const void *unsafe_ptr
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 113;
1: +static long (*bpf_probe_read_kernel)(void *dst, __u32 size,
1: +                                     const void *unsafe_ptr) = (void *)113;
1:  
1:  /*
1:   * bpf_probe_read_user_str
1: @@ -2795,7 +2890,8 @@ static long (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_p
1:   * 	including the trailing NUL character. On error, a negative
1:   * 	value.
1:   */
1: -static long (*bpf_probe_read_user_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 114;
1: +static long (*bpf_probe_read_user_str)(void *dst, __u32 size,
1: +                                       const void *unsafe_ptr) = (void *)114;
1:  
1:  /*
1:   * bpf_probe_read_kernel_str
1: @@ -2807,7 +2903,8 @@ static long (*bpf_probe_read_user_str)(void *dst, __u32 size, const void *unsafe
1:   * 	On success, the strictly positive length of the string, including
1:   * 	the trailing NUL character. On error, a negative value.
1:   */
1: -static long (*bpf_probe_read_kernel_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 115;
1: +static long (*bpf_probe_read_kernel_str)(void *dst, __u32 size,
1: +                                         const void *unsafe_ptr) = (void *)115;
1:  
1:  /*
1:   * bpf_tcp_send_ack
1: @@ -2818,7 +2915,7 @@ static long (*bpf_probe_read_kernel_str)(void *dst, __u32 size, const void *unsa
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_tcp_send_ack)(void *tp, __u32 rcv_nxt) = (void *) 116;
1: +static long (*bpf_tcp_send_ack)(void *tp, __u32 rcv_nxt) = (void *)116;
1:  
1:  /*
1:   * bpf_send_signal_thread
1: @@ -2836,7 +2933,7 @@ static long (*bpf_tcp_send_ack)(void *tp, __u32 rcv_nxt) = (void *) 116;
1:   *
1:   * 	**-EAGAIN** if bpf program can try again.
1:   */
1: -static long (*bpf_send_signal_thread)(__u32 sig) = (void *) 117;
1: +static long (*bpf_send_signal_thread)(__u32 sig) = (void *)117;
1:  
1:  /*
1:   * bpf_jiffies64
1: @@ -2846,7 +2943,7 @@ static long (*bpf_send_signal_thread)(__u32 sig) = (void *) 117;
1:   * Returns
1:   * 	The 64 bit jiffies
1:   */
1: -static __u64 (*bpf_jiffies64)(void) = (void *) 118;
1: +static __u64 (*bpf_jiffies64)(void) = (void *)118;
1:  
1:  /*
1:   * bpf_read_branch_records
1: @@ -2869,12 +2966,15 @@ static __u64 (*bpf_jiffies64)(void) = (void *) 118;
1:   *
1:   * 	**-ENOENT** if architecture does not support branch records.
1:   */
1: -static long (*bpf_read_branch_records)(struct bpf_perf_event_data *ctx, void *buf, __u32 size, __u64 flags) = (void *) 119;
1: +static long (*bpf_read_branch_records)(struct bpf_perf_event_data *ctx,
1: +                                       void *buf, __u32 size,
1: +                                       __u64 flags) = (void *)119;
1:  
1:  /*
1:   * bpf_get_ns_current_pid_tgid
1:   *
1: - * 	Returns 0 on success, values for *pid* and *tgid* as seen from the current
1: + * 	Returns 0 on success, values for *pid* and *tgid* as seen from the
1: + * current
1:   * 	*namespace* will be returned in *nsdata*.
1:   *
1:   * Returns
1: @@ -2885,7 +2985,9 @@ static long (*bpf_read_branch_records)(struct bpf_perf_event_data *ctx, void *bu
1:   *
1:   * 	**-ENOENT** if pidns does not exists for the current task.
1:   */
1: -static long (*bpf_get_ns_current_pid_tgid)(__u64 dev, __u64 ino, struct bpf_pidns_info *nsdata, __u32 size) = (void *) 120;
1: +static long (*bpf_get_ns_current_pid_tgid)(__u64 dev, __u64 ino,
1: +                                           struct bpf_pidns_info *nsdata,
1: +                                           __u32 size) = (void *)120;
1:  
1:  /*
1:   * bpf_xdp_output
1: @@ -2913,7 +3015,8 @@ static long (*bpf_get_ns_current_pid_tgid)(__u64 dev, __u64 ino, struct bpf_pidn
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_xdp_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 121;
1: +static long (*bpf_xdp_output)(void *ctx, void *map, __u64 flags, void *data,
1: +                              __u64 size) = (void *)121;
1:  
1:  /*
1:   * bpf_get_netns_cookie
1: @@ -2930,7 +3033,7 @@ static long (*bpf_xdp_output)(void *ctx, void *map, __u64 flags, void *data, __u
1:   * Returns
1:   * 	A 8-byte long opaque number.
1:   */
1: -static __u64 (*bpf_get_netns_cookie)(void *ctx) = (void *) 122;
1: +static __u64 (*bpf_get_netns_cookie)(void *ctx) = (void *)122;
1:  
1:  /*
1:   * bpf_get_current_ancestor_cgroup_id
1: @@ -2952,7 +3055,8 @@ static __u64 (*bpf_get_netns_cookie)(void *ctx) = (void *) 122;
1:   * Returns
1:   * 	The id is returned or 0 in case the id could not be retrieved.
1:   */
1: -static __u64 (*bpf_get_current_ancestor_cgroup_id)(int ancestor_level) = (void *) 123;
1: +static __u64 (*bpf_get_current_ancestor_cgroup_id)(int ancestor_level) =
1: +    (void *)123;
1:  
1:  /*
1:   * bpf_sk_assign
1: @@ -2987,7 +3091,7 @@ static __u64 (*bpf_get_current_ancestor_cgroup_id)(int ancestor_level) = (void *
1:   * 	**-ESOCKTNOSUPPORT** if the socket type is not supported
1:   * 	(reuseport).
1:   */
1: -static long (*bpf_sk_assign)(void *ctx, void *sk, __u64 flags) = (void *) 124;
1: +static long (*bpf_sk_assign)(void *ctx, void *sk, __u64 flags) = (void *)124;
1:  
1:  /*
1:   * bpf_ktime_get_boot_ns
1: @@ -2999,7 +3103,7 @@ static long (*bpf_sk_assign)(void *ctx, void *sk, __u64 flags) = (void *) 124;
1:   * Returns
1:   * 	Current *ktime*.
1:   */
1: -static __u64 (*bpf_ktime_get_boot_ns)(void) = (void *) 125;
1: +static __u64 (*bpf_ktime_get_boot_ns)(void) = (void *)125;
1:  
1:  /*
1:   * bpf_seq_printf
1: @@ -3008,17 +3112,20 @@ static __u64 (*bpf_ktime_get_boot_ns)(void) = (void *) 125;
1:   * 	out the format string.
1:   * 	The *m* represents the seq_file. The *fmt* and *fmt_size* are for
1:   * 	the format string itself. The *data* and *data_len* are format string
1: - * 	arguments. The *data* are a **u64** array and corresponding format string
1: + * 	arguments. The *data* are a **u64** array and corresponding format
1: + * string
1:   * 	values are stored in the array. For strings and pointers where pointees
1:   * 	are accessed, only the pointer values are stored in the *data* array.
1:   * 	The *data_len* is the size of *data* in bytes.
1:   *
1:   * 	Formats **%s**, **%p{i,I}{4,6}** requires to read kernel memory.
1:   * 	Reading kernel memory may fail due to either invalid address or
1: - * 	valid address but requiring a major memory fault. If reading kernel memory
1: + * 	valid address but requiring a major memory fault. If reading kernel
1: + * memory
1:   * 	fails, the string for **%s** will be an empty string, and the ip
1:   * 	address for **%p{i,I}{4,6}** will be 0. Not returning error to
1: - * 	bpf program is consistent with what **bpf_trace_printk**\ () does for now.
1: + * 	bpf program is consistent with what **bpf_trace_printk**\ () does for
1: + * now.
1:   *
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure:
1: @@ -3026,13 +3133,17 @@ static __u64 (*bpf_ktime_get_boot_ns)(void) = (void *) 125;
1:   * 	**-EBUSY** if per-CPU memory copy buffer is busy, can try again
1:   * 	by returning 1 from bpf program.
1:   *
1: - * 	**-EINVAL** if arguments are invalid, or if *fmt* is invalid/unsupported.
1: + * 	**-EINVAL** if arguments are invalid, or if *fmt* is
1: + * invalid/unsupported.
1:   *
1:   * 	**-E2BIG** if *fmt* contains too many format specifiers.
1:   *
1: - * 	**-EOVERFLOW** if an overflow happened: The same object will be tried again.
1: + * 	**-EOVERFLOW** if an overflow happened: The same object will be tried
1: + * again.
1:   */
1: -static long (*bpf_seq_printf)(struct seq_file *m, const char *fmt, __u32 fmt_size, const void *data, __u32 data_len) = (void *) 126;
1: +static long (*bpf_seq_printf)(struct seq_file *m, const char *fmt,
1: +                              __u32 fmt_size, const void *data,
1: +                              __u32 data_len) = (void *)126;
1:  
1:  /*
1:   * bpf_seq_write
1: @@ -3044,9 +3155,11 @@ static long (*bpf_seq_printf)(struct seq_file *m, const char *fmt, __u32 fmt_siz
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure:
1:   *
1: - * 	**-EOVERFLOW** if an overflow happened: The same object will be tried again.
1: + * 	**-EOVERFLOW** if an overflow happened: The same object will be tried
1: + * again.
1:   */
1: -static long (*bpf_seq_write)(struct seq_file *m, const void *data, __u32 len) = (void *) 127;
1: +static long (*bpf_seq_write)(struct seq_file *m, const void *data,
1: +                             __u32 len) = (void *)127;
1:  
1:  /*
1:   * bpf_sk_cgroup_id
1: @@ -3064,7 +3177,7 @@ static long (*bpf_seq_write)(struct seq_file *m, const void *data, __u32 len) =
1:   * Returns
1:   * 	The id is returned or 0 in case the id could not be retrieved.
1:   */
1: -static __u64 (*bpf_sk_cgroup_id)(void *sk) = (void *) 128;
1: +static __u64 (*bpf_sk_cgroup_id)(void *sk) = (void *)128;
1:  
1:  /*
1:   * bpf_sk_ancestor_cgroup_id
1: @@ -3086,7 +3199,8 @@ static __u64 (*bpf_sk_cgroup_id)(void *sk) = (void *) 128;
1:   * Returns
1:   * 	The id is returned or 0 in case the id could not be retrieved.
1:   */
1: -static __u64 (*bpf_sk_ancestor_cgroup_id)(void *sk, int ancestor_level) = (void *) 129;
1: +static __u64 (*bpf_sk_ancestor_cgroup_id)(void *sk,
1: +                                          int ancestor_level) = (void *)129;
1:  
1:  /*
1:   * bpf_ringbuf_output
1: @@ -3100,14 +3214,17 @@ static __u64 (*bpf_sk_ancestor_cgroup_id)(void *sk, int ancestor_level) = (void
1:   * 	of new data availability is sent.
1:   *
1:   * 	An adaptive notification is a notification sent whenever the user-space
1: - * 	process has caught up and consumed all available payloads. In case the user-space
1: - * 	process is still processing a previous payload, then no notification is needed
1: + * 	process has caught up and consumed all available payloads. In case the
1: + * user-space
1: + * 	process is still processing a previous payload, then no notification is
1: + * needed
1:   * 	as it will process the newly added payload automatically.
1:   *
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_ringbuf_output)(void *ringbuf, void *data, __u64 size, __u64 flags) = (void *) 130;
1: +static long (*bpf_ringbuf_output)(void *ringbuf, void *data, __u64 size,
1: +                                  __u64 flags) = (void *)130;
1:  
1:  /*
1:   * bpf_ringbuf_reserve
1: @@ -3119,7 +3236,8 @@ static long (*bpf_ringbuf_output)(void *ringbuf, void *data, __u64 size, __u64 f
1:   * 	Valid pointer with *size* bytes of memory available; NULL,
1:   * 	otherwise.
1:   */
1: -static void *(*bpf_ringbuf_reserve)(void *ringbuf, __u64 size, __u64 flags) = (void *) 131;
1: +static void *(*bpf_ringbuf_reserve)(void *ringbuf, __u64 size,
1: +                                    __u64 flags) = (void *)131;
1:  
1:  /*
1:   * bpf_ringbuf_submit
1: @@ -3137,7 +3255,7 @@ static void *(*bpf_ringbuf_reserve)(void *ringbuf, __u64 size, __u64 flags) = (v
1:   * Returns
1:   * 	Nothing. Always succeeds.
1:   */
1: -static void (*bpf_ringbuf_submit)(void *data, __u64 flags) = (void *) 132;
1: +static void (*bpf_ringbuf_submit)(void *data, __u64 flags) = (void *)132;
1:  
1:  /*
1:   * bpf_ringbuf_discard
1: @@ -3155,7 +3273,7 @@ static void (*bpf_ringbuf_submit)(void *data, __u64 flags) = (void *) 132;
1:   * Returns
1:   * 	Nothing. Always succeeds.
1:   */
1: -static void (*bpf_ringbuf_discard)(void *data, __u64 flags) = (void *) 133;
1: +static void (*bpf_ringbuf_discard)(void *data, __u64 flags) = (void *)133;
1:  
1:  /*
1:   * bpf_ringbuf_query
1: @@ -3176,7 +3294,7 @@ static void (*bpf_ringbuf_discard)(void *data, __u64 flags) = (void *) 133;
1:   * Returns
1:   * 	Requested value, or 0, if *flags* are not recognized.
1:   */
1: -static __u64 (*bpf_ringbuf_query)(void *ringbuf, __u64 flags) = (void *) 134;
1: +static __u64 (*bpf_ringbuf_query)(void *ringbuf, __u64 flags) = (void *)134;
1:  
1:  /*
1:   * bpf_csum_level
1: @@ -3212,7 +3330,7 @@ static __u64 (*bpf_ringbuf_query)(void *ringbuf, __u64 flags) = (void *) 134;
1:   * 	is returned or the error code -EACCES in case the skb is not
1:   * 	subject to CHECKSUM_UNNECESSARY.
1:   */
1: -static long (*bpf_csum_level)(struct __sk_buff *skb, __u64 level) = (void *) 135;
1: +static long (*bpf_csum_level)(struct __sk_buff *skb, __u64 level) = (void *)135;
1:  
1:  /*
1:   * bpf_skc_to_tcp6_sock
1: @@ -3222,7 +3340,7 @@ static long (*bpf_csum_level)(struct __sk_buff *skb, __u64 level) = (void *) 135
1:   * Returns
1:   * 	*sk* if casting is valid, or **NULL** otherwise.
1:   */
1: -static struct tcp6_sock *(*bpf_skc_to_tcp6_sock)(void *sk) = (void *) 136;
1: +static struct tcp6_sock *(*bpf_skc_to_tcp6_sock)(void *sk) = (void *)136;
1:  
1:  /*
1:   * bpf_skc_to_tcp_sock
1: @@ -3232,7 +3350,7 @@ static struct tcp6_sock *(*bpf_skc_to_tcp6_sock)(void *sk) = (void *) 136;
1:   * Returns
1:   * 	*sk* if casting is valid, or **NULL** otherwise.
1:   */
1: -static struct tcp_sock *(*bpf_skc_to_tcp_sock)(void *sk) = (void *) 137;
1: +static struct tcp_sock *(*bpf_skc_to_tcp_sock)(void *sk) = (void *)137;
1:  
1:  /*
1:   * bpf_skc_to_tcp_timewait_sock
1: @@ -3242,7 +3360,8 @@ static struct tcp_sock *(*bpf_skc_to_tcp_sock)(void *sk) = (void *) 137;
1:   * Returns
1:   * 	*sk* if casting is valid, or **NULL** otherwise.
1:   */
1: -static struct tcp_timewait_sock *(*bpf_skc_to_tcp_timewait_sock)(void *sk) = (void *) 138;
1: +static struct tcp_timewait_sock *(*bpf_skc_to_tcp_timewait_sock)(void *sk) =
1: +    (void *)138;
1:  
1:  /*
1:   * bpf_skc_to_tcp_request_sock
1: @@ -3252,7 +3371,8 @@ static struct tcp_timewait_sock *(*bpf_skc_to_tcp_timewait_sock)(void *sk) = (vo
1:   * Returns
1:   * 	*sk* if casting is valid, or **NULL** otherwise.
1:   */
1: -static struct tcp_request_sock *(*bpf_skc_to_tcp_request_sock)(void *sk) = (void *) 139;
1: +static struct tcp_request_sock *(*bpf_skc_to_tcp_request_sock)(void *sk) =
1: +    (void *)139;
1:  
1:  /*
1:   * bpf_skc_to_udp6_sock
1: @@ -3262,7 +3382,7 @@ static struct tcp_request_sock *(*bpf_skc_to_tcp_request_sock)(void *sk) = (void
1:   * Returns
1:   * 	*sk* if casting is valid, or **NULL** otherwise.
1:   */
1: -static struct udp6_sock *(*bpf_skc_to_udp6_sock)(void *sk) = (void *) 140;
1: +static struct udp6_sock *(*bpf_skc_to_udp6_sock)(void *sk) = (void *)140;
1:  
1:  /*
1:   * bpf_get_task_stack
1: @@ -3298,7 +3418,8 @@ static struct udp6_sock *(*bpf_skc_to_udp6_sock)(void *sk) = (void *) 140;
1:   * 	A non-negative value equal to or less than *size* on success,
1:   * 	or a negative error in case of failure.
1:   */
1: -static long (*bpf_get_task_stack)(struct task_struct *task, void *buf, __u32 size, __u64 flags) = (void *) 141;
1: +static long (*bpf_get_task_stack)(struct task_struct *task, void *buf,
1: +                                  __u32 size, __u64 flags) = (void *)141;
1:  
1:  /*
1:   * bpf_load_hdr_opt
1: @@ -3365,7 +3486,8 @@ static long (*bpf_get_task_stack)(struct task_struct *task, void *buf, __u32 siz
1:   * 	**-EPERM** if the helper cannot be used under the current
1:   * 	*skops*\ **->op**.
1:   */
1: -static long (*bpf_load_hdr_opt)(struct bpf_sock_ops *skops, void *searchby_res, __u32 len, __u64 flags) = (void *) 142;
1: +static long (*bpf_load_hdr_opt)(struct bpf_sock_ops *skops, void *searchby_res,
1: +                                __u32 len, __u64 flags) = (void *)142;
1:  
1:  /*
1:   * bpf_store_hdr_opt
1: @@ -3402,7 +3524,8 @@ static long (*bpf_load_hdr_opt)(struct bpf_sock_ops *skops, void *searchby_res,
1:   * 	**-EPERM** if the helper cannot be used under the current
1:   * 	*skops*\ **->op**.
1:   */
1: -static long (*bpf_store_hdr_opt)(struct bpf_sock_ops *skops, const void *from, __u32 len, __u64 flags) = (void *) 143;
1: +static long (*bpf_store_hdr_opt)(struct bpf_sock_ops *skops, const void *from,
1: +                                 __u32 len, __u64 flags) = (void *)143;
1:  
1:  /*
1:   * bpf_reserve_hdr_opt
1: @@ -3428,7 +3551,8 @@ static long (*bpf_store_hdr_opt)(struct bpf_sock_ops *skops, const void *from, _
1:   * 	**-EPERM** if the helper cannot be used under the current
1:   * 	*skops*\ **->op**.
1:   */
1: -static long (*bpf_reserve_hdr_opt)(struct bpf_sock_ops *skops, __u32 len, __u64 flags) = (void *) 144;
1: +static long (*bpf_reserve_hdr_opt)(struct bpf_sock_ops *skops, __u32 len,
1: +                                   __u64 flags) = (void *)144;
1:  
1:  /*
1:   * bpf_inode_storage_get
1: @@ -3460,7 +3584,8 @@ static long (*bpf_reserve_hdr_opt)(struct bpf_sock_ops *skops, __u32 len, __u64
1:   * 	**NULL** if not found or there was an error in adding
1:   * 	a new bpf_local_storage.
1:   */
1: -static void *(*bpf_inode_storage_get)(void *map, void *inode, void *value, __u64 flags) = (void *) 145;
1: +static void *(*bpf_inode_storage_get)(void *map, void *inode, void *value,
1: +                                      __u64 flags) = (void *)145;
1:  
1:  /*
1:   * bpf_inode_storage_delete
1: @@ -3472,7 +3597,7 @@ static void *(*bpf_inode_storage_get)(void *map, void *inode, void *value, __u64
1:   *
1:   * 	**-ENOENT** if the bpf_local_storage cannot be found.
1:   */
1: -static int (*bpf_inode_storage_delete)(void *map, void *inode) = (void *) 146;
1: +static int (*bpf_inode_storage_delete)(void *map, void *inode) = (void *)146;
1:  
1:  /*
1:   * bpf_d_path
1: @@ -3488,7 +3613,7 @@ static int (*bpf_inode_storage_delete)(void *map, void *inode) = (void *) 146;
1:   * 	including the trailing NUL character. On error, a negative
1:   * 	value.
1:   */
1: -static long (*bpf_d_path)(struct path *path, char *buf, __u32 sz) = (void *) 147;
1: +static long (*bpf_d_path)(struct path *path, char *buf, __u32 sz) = (void *)147;
1:  
1:  /*
1:   * bpf_copy_from_user
1: @@ -3499,7 +3624,8 @@ static long (*bpf_d_path)(struct path *path, char *buf, __u32 sz) = (void *) 147
1:   * Returns
1:   * 	0 on success, or a negative error in case of failure.
1:   */
1: -static long (*bpf_copy_from_user)(void *dst, __u32 size, const void *user_ptr) = (void *) 148;
1: +static long (*bpf_copy_from_user)(void *dst, __u32 size,
1: +                                  const void *user_ptr) = (void *)148;
1:  
1:  /*
1:   * bpf_snprintf_btf
1: @@ -3539,7 +3665,8 @@ static long (*bpf_copy_from_user)(void *dst, __u32 size, const void *user_ptr) =
1:   * 	written if output had to be truncated due to string size),
1:   * 	or a negative error in cases of failure.
1:   */
1: -static long (*bpf_snprintf_btf)(char *str, __u32 str_size, struct btf_ptr *ptr, __u32 btf_ptr_size, __u64 flags) = (void *) 149;
1: +static long (*bpf_snprintf_btf)(char *str, __u32 str_size, struct btf_ptr *ptr,
1: +                                __u32 btf_ptr_size, __u64 flags) = (void *)149;
1:  
1:  /*
1:   * bpf_seq_printf_btf
1: @@ -3551,7 +3678,8 @@ static long (*bpf_snprintf_btf)(char *str, __u32 str_size, struct btf_ptr *ptr,
1:   * Returns
1:   * 	0 on success or a negative error in case of failure.
1:   */
1: -static long (*bpf_seq_printf_btf)(struct seq_file *m, struct btf_ptr *ptr, __u32 ptr_size, __u64 flags) = (void *) 150;
1: +static long (*bpf_seq_printf_btf)(struct seq_file *m, struct btf_ptr *ptr,
1: +                                  __u32 ptr_size, __u64 flags) = (void *)150;
1:  
1:  /*
1:   * bpf_skb_cgroup_classid
1: @@ -3564,7 +3692,7 @@ static long (*bpf_seq_printf_btf)(struct seq_file *m, struct btf_ptr *ptr, __u32
1:   * Returns
1:   * 	The id is returned or 0 in case the id could not be retrieved.
1:   */
1: -static __u64 (*bpf_skb_cgroup_classid)(struct __sk_buff *skb) = (void *) 151;
1: +static __u64 (*bpf_skb_cgroup_classid)(struct __sk_buff *skb) = (void *)151;
1:  
1:  /*
1:   * bpf_redirect_neigh
1: @@ -3589,7 +3717,8 @@ static __u64 (*bpf_skb_cgroup_classid)(struct __sk_buff *skb) = (void *) 151;
1:   * 	The helper returns **TC_ACT_REDIRECT** on success or
1:   * 	**TC_ACT_SHOT** on error.
1:   */
1: -static long (*bpf_redirect_neigh)(__u32 ifindex, struct bpf_redir_neigh *params, int plen, __u64 flags) = (void *) 152;
1: +static long (*bpf_redirect_neigh)(__u32 ifindex, struct bpf_redir_neigh *params,
1: +                                  int plen, __u64 flags) = (void *)152;
1:  
1:  /*
1:   * bpf_per_cpu_ptr
1: @@ -3610,7 +3739,8 @@ static long (*bpf_redirect_neigh)(__u32 ifindex, struct bpf_redir_neigh *params,
1:   * 	A pointer pointing to the kernel percpu variable on *cpu*, or
1:   * 	NULL, if *cpu* is invalid.
1:   */
1: -static void *(*bpf_per_cpu_ptr)(const void *percpu_ptr, __u32 cpu) = (void *) 153;
1: +static void *(*bpf_per_cpu_ptr)(const void *percpu_ptr,
1: +                                __u32 cpu) = (void *)153;
1:  
1:  /*
1:   * bpf_this_cpu_ptr
1: @@ -3626,7 +3756,7 @@ static void *(*bpf_per_cpu_ptr)(const void *percpu_ptr, __u32 cpu) = (void *) 15
1:   * Returns
1:   * 	A pointer pointing to the kernel percpu variable on this cpu.
1:   */
1: -static void *(*bpf_this_cpu_ptr)(const void *percpu_ptr) = (void *) 154;
1: +static void *(*bpf_this_cpu_ptr)(const void *percpu_ptr) = (void *)154;
1:  
1:  /*
1:   * bpf_redirect_peer
1: @@ -3646,7 +3776,7 @@ static void *(*bpf_this_cpu_ptr)(const void *percpu_ptr) = (void *) 154;
1:   * 	The helper returns **TC_ACT_REDIRECT** on success or
1:   * 	**TC_ACT_SHOT** on error.
1:   */
1: -static long (*bpf_redirect_peer)(__u32 ifindex, __u64 flags) = (void *) 155;
1: +static long (*bpf_redirect_peer)(__u32 ifindex, __u64 flags) = (void *)155;
1:  
1:  /*
1:   * bpf_task_storage_get
1: @@ -3678,7 +3808,8 @@ static long (*bpf_redirect_peer)(__u32 ifindex, __u64 flags) = (void *) 155;
1:   * 	**NULL** if not found or there was an error in adding
1:   * 	a new bpf_local_storage.
1:   */
1: -static void *(*bpf_task_storage_get)(void *map, struct task_struct *task, void *value, __u64 flags) = (void *) 156;
1: +static void *(*bpf_task_storage_get)(void *map, struct task_struct *task,
1: +                                     void *value, __u64 flags) = (void *)156;
1:  
1:  /*
1:   * bpf_task_storage_delete
1: @@ -3690,7 +3821,8 @@ static void *(*bpf_task_storage_get)(void *map, struct task_struct *task, void *
1:   *
1:   * 	**-ENOENT** if the bpf_local_storage cannot be found.
1:   */
1: -static long (*bpf_task_storage_delete)(void *map, struct task_struct *task) = (void *) 157;
1: +static long (*bpf_task_storage_delete)(void *map,
1: +                                       struct task_struct *task) = (void *)157;
1:  
1:  /*
1:   * bpf_get_current_task_btf
1: @@ -3702,7 +3834,7 @@ static long (*bpf_task_storage_delete)(void *map, struct task_struct *task) = (v
1:   * Returns
1:   * 	Pointer to the current task.
1:   */
1: -static struct task_struct *(*bpf_get_current_task_btf)(void) = (void *) 158;
1: +static struct task_struct *(*bpf_get_current_task_btf)(void) = (void *)158;
1:  
1:  /*
1:   * bpf_bprm_opts_set
1: @@ -3716,7 +3848,8 @@ static struct task_struct *(*bpf_get_current_task_btf)(void) = (void *) 158;
1:   * Returns
1:   * 	**-EINVAL** if invalid *flags* are passed, zero otherwise.
1:   */
1: -static long (*bpf_bprm_opts_set)(struct linux_binprm *bprm, __u64 flags) = (void *) 159;
1: +static long (*bpf_bprm_opts_set)(struct linux_binprm *bprm,
1: +                                 __u64 flags) = (void *)159;
1:  
1:  /*
1:   * bpf_ktime_get_coarse_ns
1: @@ -3730,7 +3863,7 @@ static long (*bpf_bprm_opts_set)(struct linux_binprm *bprm, __u64 flags) = (void
1:   * Returns
1:   * 	Current *ktime*.
1:   */
1: -static __u64 (*bpf_ktime_get_coarse_ns)(void) = (void *) 160;
1: +static __u64 (*bpf_ktime_get_coarse_ns)(void) = (void *)160;
1:  
1:  /*
1:   * bpf_ima_inode_hash
1: @@ -3744,7 +3877,8 @@ static __u64 (*bpf_ktime_get_coarse_ns)(void) = (void *) 160;
1:   * 	**-EOPNOTSUP** if IMA is disabled or **-EINVAL** if
1:   * 	invalid arguments are passed.
1:   */
1: -static long (*bpf_ima_inode_hash)(struct inode *inode, void *dst, __u32 size) = (void *) 161;
1: +static long (*bpf_ima_inode_hash)(struct inode *inode, void *dst,
1: +                                  __u32 size) = (void *)161;
1:  
1:  /*
1:   * bpf_sock_from_file
1: @@ -3756,7 +3890,7 @@ static long (*bpf_ima_inode_hash)(struct inode *inode, void *dst, __u32 size) =
1:   * 	A pointer to a struct socket on success or NULL if the file is
1:   * 	not a socket.
1:   */
1: -static struct socket *(*bpf_sock_from_file)(struct file *file) = (void *) 162;
1: +static struct socket *(*bpf_sock_from_file)(struct file *file) = (void *)162;
1:  
1:  /*
1:   * bpf_check_mtu
1: @@ -3827,7 +3961,8 @@ static struct socket *(*bpf_sock_from_file)(struct file *file) = (void *) 162;
1:   * 	* **BPF_MTU_CHK_RET_FRAG_NEEDED**
1:   * 	* **BPF_MTU_CHK_RET_SEGS_TOOBIG**
1:   */
1: -static long (*bpf_check_mtu)(void *ctx, __u32 ifindex, __u32 *mtu_len, __s32 len_diff, __u64 flags) = (void *) 163;
1: +static long (*bpf_check_mtu)(void *ctx, __u32 ifindex, __u32 *mtu_len,
1: +                             __s32 len_diff, __u64 flags) = (void *)163;
1:  
1:  /*
1:   * bpf_for_each_map_elem
1: @@ -3846,7 +3981,8 @@ static long (*bpf_check_mtu)(void *ctx, __u32 ifindex, __u32 *mtu_len, __s32 len
1:   * 	BPF_MAP_TYPE_LRU_HASH, BPF_MAP_TYPE_LRU_PERCPU_HASH,
1:   * 	BPF_MAP_TYPE_ARRAY, BPF_MAP_TYPE_PERCPU_ARRAY
1:   *
1: - * 	long (\*callback_fn)(struct bpf_map \*map, const void \*key, void \*value, void \*ctx);
1: + * 	long (\*callback_fn)(struct bpf_map \*map, const void \*key, void
1: + * \*value, void \*ctx);
1:   *
1:   * 	For per_cpu maps, the map_value is the value on the cpu where the
1:   * 	bpf_prog is running.
1: @@ -3860,7 +3996,9 @@ static long (*bpf_check_mtu)(void *ctx, __u32 ifindex, __u32 *mtu_len, __s32 len
1:   * 	The number of traversed map elements for success, **-EINVAL** for
1:   * 	invalid **flags**.
1:   */
1: -static long (*bpf_for_each_map_elem)(void *map, void *callback_fn, void *callback_ctx, __u64 flags) = (void *) 164;
1: +static long (*bpf_for_each_map_elem)(void *map, void *callback_fn,
1: +                                     void *callback_ctx,
1: +                                     __u64 flags) = (void *)164;
1:  
1:  /*
1:   * bpf_snprintf
1: @@ -3891,7 +4029,8 @@ static long (*bpf_for_each_map_elem)(void *map, void *callback_fn, void *callbac
1:   *
1:   * 	Or **-EBUSY** if the per-CPU memory copy buffer is busy.
1:   */
1: -static long (*bpf_snprintf)(char *str, __u32 str_size, const char *fmt, __u64 *data, __u32 data_len) = (void *) 165;
1: +static long (*bpf_snprintf)(char *str, __u32 str_size, const char *fmt,
1: +                            __u64 *data, __u32 data_len) = (void *)165;
1:  
1:  /*
1:   * bpf_sys_bpf
1: @@ -3901,17 +4040,20 @@ static long (*bpf_snprintf)(char *str, __u32 str_size, const char *fmt, __u64 *d
1:   * Returns
1:   * 	A syscall result.
1:   */
1: -static long (*bpf_sys_bpf)(__u32 cmd, void *attr, __u32 attr_size) = (void *) 166;
1: +static long (*bpf_sys_bpf)(__u32 cmd, void *attr,
1: +                           __u32 attr_size) = (void *)166;
1:  
1:  /*
1:   * bpf_btf_find_by_name_kind
1:   *
1: - * 	Find BTF type with given name and kind in vmlinux BTF or in module's BTFs.
1: + * 	Find BTF type with given name and kind in vmlinux BTF or in module's
1: + * BTFs.
1:   *
1:   * Returns
1:   * 	Returns btf_id and btf_obj_fd in lower and upper 32 bits.
1:   */
1: -static long (*bpf_btf_find_by_name_kind)(char *name, int name_sz, __u32 kind, int flags) = (void *) 167;
1: +static long (*bpf_btf_find_by_name_kind)(char *name, int name_sz, __u32 kind,
1: +                                         int flags) = (void *)167;
1:  
1:  /*
1:   * bpf_sys_close
1: @@ -3921,6 +4063,4 @@ static long (*bpf_btf_find_by_name_kind)(char *name, int name_sz, __u32 kind, in
1:   * Returns
1:   * 	A syscall result.
1:   */
1: -static long (*bpf_sys_close)(__u32 fd) = (void *) 168;
1: -
1: -
1: +static long (*bpf_sys_close)(__u32 fd) = (void *)168;
1: diff --git a/src/cc/libbpf/src/bpf_helpers.h b/src/cc/libbpf/src/bpf_helpers.h
1: index b9987c3e..e315b783 100644
1: --- a/src/cc/libbpf/src/bpf_helpers.h
1: +++ b/src/cc/libbpf/src/bpf_helpers.h
1: @@ -10,17 +10,16 @@
1:   */
1:  #include "bpf_helper_defs.h"
1:  
1: -#define __uint(name, val) int (*name)[val]
1: +#define __uint(name, val) int(*name)[val]
1:  #define __type(name, val) typeof(val) *name
1:  #define __array(name, val) typeof(val) *name[]
1:  
1:  /* Helper macro to print out debug messages */
1: -#define bpf_printk(fmt, ...)				\
1: -({							\
1: -	char ____fmt[] = fmt;				\
1: -	bpf_trace_printk(____fmt, sizeof(____fmt),	\
1: -			 ##__VA_ARGS__);		\
1: -})
1: +#define bpf_printk(fmt, ...)                                   \
1: +  ({                                                           \
1: +    char ____fmt[] = fmt;                                      \
1: +    bpf_trace_printk(____fmt, sizeof(____fmt), ##__VA_ARGS__); \
1: +  })
1:  
1:  /*
1:   * Helper macro to place programs, maps, license in
1: @@ -30,11 +29,10 @@
1:   * To allow use of SEC() with externs (e.g., for extern .maps declarations),
1:   * make sure __attribute__((unused)) doesn't trigger compilation warning.
1:   */
1: -#define SEC(name) \
1: -	_Pragma("GCC diagnostic push")					    \
1: -	_Pragma("GCC diagnostic ignored \"-Wignored-attributes\"")	    \
1: -	__attribute__((section(name), used))				    \
1: -	_Pragma("GCC diagnostic pop")					    \
1: +#define SEC(name)                                                \
1: +  _Pragma("GCC diagnostic push")                                 \
1: +      _Pragma("GCC diagnostic ignored \"-Wignored-attributes\"") \
1: +          __attribute__((section(name), used)) _Pragma("GCC diagnostic pop")
1:  
1:  /* Avoid 'linux/stddef.h' definition of '__always_inline'. */
1:  #undef __always_inline
1: @@ -66,21 +64,22 @@
1:  #endif
1:  
1:  #ifndef KERNEL_VERSION
1: -#define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
1: +#define KERNEL_VERSION(a, b, c) \
1: +  (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
1:  #endif
1:  
1:  /*
1:   * Helper macros to manipulate data structures
1:   */
1:  #ifndef offsetof
1: -#define offsetof(TYPE, MEMBER)	((unsigned long)&((TYPE *)0)->MEMBER)
1: +#define offsetof(TYPE, MEMBER) ((unsigned long)&((TYPE *)0)->MEMBER)
1:  #endif
1:  #ifndef container_of
1: -#define container_of(ptr, type, member)				\
1: -	({							\
1: -		void *__mptr = (void *)(ptr);			\
1: -		((type *)(__mptr - offsetof(type, member)));	\
1: -	})
1: +#define container_of(ptr, type, member)          \
1: +  ({                                             \
1: +    void *__mptr = (void *)(ptr);                \
1: +    ((type *)(__mptr - offsetof(type, member))); \
1: +  })
1:  #endif
1:  
1:  /*
1: @@ -96,38 +95,38 @@
1:   * being compiled out.
1:   */
1:  #ifndef __bpf_unreachable
1: -# define __bpf_unreachable()	__builtin_trap()
1: +#define __bpf_unreachable() __builtin_trap()
1:  #endif
1:  
1:  /*
1:   * Helper function to perform a tail call with a constant/immediate map slot.
1:   */
1:  #if __clang_major__ >= 8 && defined(__bpf__)
1: -static __always_inline void
1: -bpf_tail_call_static(void *ctx, const void *map, const __u32 slot)
1: -{
1: -	if (!__builtin_constant_p(slot))
1: -		__bpf_unreachable();
1: -
1: -	/*
1: -	 * Provide a hard guarantee that LLVM won't optimize setting r2 (map
1: -	 * pointer) and r3 (constant map index) from _different paths_ ending
1: -	 * up at the _same_ call insn as otherwise we won't be able to use the
1: -	 * jmpq/nopl retpoline-free patching by the x86-64 JIT in the kernel
1: -	 * given they mismatch. See also d2e4c1e6c294 ("bpf: Constant map key
1: -	 * tracking for prog array pokes") for details on verifier tracking.
1: -	 *
1: -	 * Note on clobber list: we need to stay in-line with BPF calling
1: -	 * convention, so even if we don't end up using r0, r4, r5, we need
1: -	 * to mark them as clobber so that LLVM doesn't end up using them
1: -	 * before / after the call.
1: -	 */
1: -	asm volatile("r1 = %[ctx]\n\t"
1: -		     "r2 = %[map]\n\t"
1: -		     "r3 = %[slot]\n\t"
1: -		     "call 12"
1: -		     :: [ctx]"r"(ctx), [map]"r"(map), [slot]"i"(slot)
1: -		     : "r0", "r1", "r2", "r3", "r4", "r5");
1: +static __always_inline void bpf_tail_call_static(void *ctx, const void *map,
1: +                                                 const __u32 slot) {
1: +  if (!__builtin_constant_p(slot))
1: +    __bpf_unreachable();
1: +
1: +  /*
1: +   * Provide a hard guarantee that LLVM won't optimize setting r2 (map
1: +   * pointer) and r3 (constant map index) from _different paths_ ending
1: +   * up at the _same_ call insn as otherwise we won't be able to use the
1: +   * jmpq/nopl retpoline-free patching by the x86-64 JIT in the kernel
1: +   * given they mismatch. See also d2e4c1e6c294 ("bpf: Constant map key
1: +   * tracking for prog array pokes") for details on verifier tracking.
1: +   *
1: +   * Note on clobber list: we need to stay in-line with BPF calling
1: +   * convention, so even if we don't end up using r0, r4, r5, we need
1: +   * to mark them as clobber so that LLVM doesn't end up using them
1: +   * before / after the call.
1: +   */
1: +  asm volatile(
1: +      "r1 = %[ctx]\n\t"
1: +      "r2 = %[map]\n\t"
1: +      "r3 = %[slot]\n\t"
1: +      "call 12" ::[ctx] "r"(ctx),
1: +      [map] "r"(map), [slot] "i"(slot)
1: +      : "r0", "r1", "r2", "r3", "r4", "r5");
1:  }
1:  #endif
1:  
1: @@ -136,30 +135,30 @@ bpf_tail_call_static(void *ctx, const void *map, const __u32 slot)
1:   * to describe BPF map attributes to libbpf loader
1:   */
1:  struct bpf_map_def {
1: -	unsigned int type;
1: -	unsigned int key_size;
1: -	unsigned int value_size;
1: -	unsigned int max_entries;
1: -	unsigned int map_flags;
1: +  unsigned int type;
1: +  unsigned int key_size;
1: +  unsigned int value_size;
1: +  unsigned int max_entries;
1: +  unsigned int map_flags;
1:  };
1:  
1:  enum libbpf_pin_type {
1: -	LIBBPF_PIN_NONE,
1: -	/* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
1: -	LIBBPF_PIN_BY_NAME,
1: +  LIBBPF_PIN_NONE,
1: +  /* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
1: +  LIBBPF_PIN_BY_NAME,
1:  };
1:  
1:  enum libbpf_tristate {
1: -	TRI_NO = 0,
1: -	TRI_YES = 1,
1: -	TRI_MODULE = 2,
1: +  TRI_NO = 0,
1: +  TRI_YES = 1,
1: +  TRI_MODULE = 2,
1:  };
1:  
1:  #define __kconfig __attribute__((section(".kconfig")))
1:  #define __ksym __attribute__((section(".ksyms")))
1:  
1:  #ifndef ___bpf_concat
1: -#define ___bpf_concat(a, b) a ## b
1: +#define ___bpf_concat(a, b) a##b
1:  #endif
1:  #ifndef ___bpf_apply
1:  #define ___bpf_apply(fn, n) ___bpf_concat(fn, n)
1: @@ -169,59 +168,82 @@ enum libbpf_tristate {
1:  #endif
1:  #ifndef ___bpf_narg
1:  #define ___bpf_narg(...) \
1: -	___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
1: +  ___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
1:  #endif
1:  
1: -#define ___bpf_fill0(arr, p, x) do {} while (0)
1: +#define ___bpf_fill0(arr, p, x) \
1: +  do {                          \
1: +  } while (0)
1:  #define ___bpf_fill1(arr, p, x) arr[p] = x
1: -#define ___bpf_fill2(arr, p, x, args...) arr[p] = x; ___bpf_fill1(arr, p + 1, args)
1: -#define ___bpf_fill3(arr, p, x, args...) arr[p] = x; ___bpf_fill2(arr, p + 1, args)
1: -#define ___bpf_fill4(arr, p, x, args...) arr[p] = x; ___bpf_fill3(arr, p + 1, args)
1: -#define ___bpf_fill5(arr, p, x, args...) arr[p] = x; ___bpf_fill4(arr, p + 1, args)
1: -#define ___bpf_fill6(arr, p, x, args...) arr[p] = x; ___bpf_fill5(arr, p + 1, args)
1: -#define ___bpf_fill7(arr, p, x, args...) arr[p] = x; ___bpf_fill6(arr, p + 1, args)
1: -#define ___bpf_fill8(arr, p, x, args...) arr[p] = x; ___bpf_fill7(arr, p + 1, args)
1: -#define ___bpf_fill9(arr, p, x, args...) arr[p] = x; ___bpf_fill8(arr, p + 1, args)
1: -#define ___bpf_fill10(arr, p, x, args...) arr[p] = x; ___bpf_fill9(arr, p + 1, args)
1: -#define ___bpf_fill11(arr, p, x, args...) arr[p] = x; ___bpf_fill10(arr, p + 1, args)
1: -#define ___bpf_fill12(arr, p, x, args...) arr[p] = x; ___bpf_fill11(arr, p + 1, args)
1: +#define ___bpf_fill2(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill1(arr, p + 1, args)
1: +#define ___bpf_fill3(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill2(arr, p + 1, args)
1: +#define ___bpf_fill4(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill3(arr, p + 1, args)
1: +#define ___bpf_fill5(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill4(arr, p + 1, args)
1: +#define ___bpf_fill6(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill5(arr, p + 1, args)
1: +#define ___bpf_fill7(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill6(arr, p + 1, args)
1: +#define ___bpf_fill8(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill7(arr, p + 1, args)
1: +#define ___bpf_fill9(arr, p, x, args...) \
1: +  arr[p] = x;                            \
1: +  ___bpf_fill8(arr, p + 1, args)
1: +#define ___bpf_fill10(arr, p, x, args...) \
1: +  arr[p] = x;                             \
1: +  ___bpf_fill9(arr, p + 1, args)
1: +#define ___bpf_fill11(arr, p, x, args...) \
1: +  arr[p] = x;                             \
1: +  ___bpf_fill10(arr, p + 1, args)
1: +#define ___bpf_fill12(arr, p, x, args...) \
1: +  arr[p] = x;                             \
1: +  ___bpf_fill11(arr, p + 1, args)
1:  #define ___bpf_fill(arr, args...) \
1: -	___bpf_apply(___bpf_fill, ___bpf_narg(args))(arr, 0, args)
1: +  ___bpf_apply(___bpf_fill, ___bpf_narg(args))(arr, 0, args)
1:  
1:  /*
1:   * BPF_SEQ_PRINTF to wrap bpf_seq_printf to-be-printed values
1:   * in a structure.
1:   */
1: -#define BPF_SEQ_PRINTF(seq, fmt, args...)			\
1: -({								\
1: -	static const char ___fmt[] = fmt;			\
1: -	unsigned long long ___param[___bpf_narg(args)];		\
1: -								\
1: -	_Pragma("GCC diagnostic push")				\
1: -	_Pragma("GCC diagnostic ignored \"-Wint-conversion\"")	\
1: -	___bpf_fill(___param, args);				\
1: -	_Pragma("GCC diagnostic pop")				\
1: -								\
1: -	bpf_seq_printf(seq, ___fmt, sizeof(___fmt),		\
1: -		       ___param, sizeof(___param));		\
1: -})
1: +#define BPF_SEQ_PRINTF(seq, fmt, args...)                      \
1: +  ({                                                           \
1: +    static const char ___fmt[] = fmt;                          \
1: +    unsigned long long ___param[___bpf_narg(args)];            \
1: +                                                               \
1: +    _Pragma("GCC diagnostic push")                             \
1: +        _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \
1: +            ___bpf_fill(___param, args);                       \
1: +    _Pragma("GCC diagnostic pop")                              \
1: +                                                               \
1: +        bpf_seq_printf(seq, ___fmt, sizeof(___fmt), ___param,  \
1: +                       sizeof(___param));                      \
1: +  })
1:  
1:  /*
1:   * BPF_SNPRINTF wraps the bpf_snprintf helper with variadic arguments instead of
1:   * an array of u64.
1:   */
1: -#define BPF_SNPRINTF(out, out_size, fmt, args...)		\
1: -({								\
1: -	static const char ___fmt[] = fmt;			\
1: -	unsigned long long ___param[___bpf_narg(args)];		\
1: -								\
1: -	_Pragma("GCC diagnostic push")				\
1: -	_Pragma("GCC diagnostic ignored \"-Wint-conversion\"")	\
1: -	___bpf_fill(___param, args);				\
1: -	_Pragma("GCC diagnostic pop")				\
1: -								\
1: -	bpf_snprintf(out, out_size, ___fmt,			\
1: -		     ___param, sizeof(___param));		\
1: -})
1: +#define BPF_SNPRINTF(out, out_size, fmt, args...)                        \
1: +  ({                                                                     \
1: +    static const char ___fmt[] = fmt;                                    \
1: +    unsigned long long ___param[___bpf_narg(args)];                      \
1: +                                                                         \
1: +    _Pragma("GCC diagnostic push")                                       \
1: +        _Pragma("GCC diagnostic ignored \"-Wint-conversion\"")           \
1: +            ___bpf_fill(___param, args);                                 \
1: +    _Pragma("GCC diagnostic pop")                                        \
1: +                                                                         \
1: +        bpf_snprintf(out, out_size, ___fmt, ___param, sizeof(___param)); \
1: +  })
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/src/bpf_prog_linfo.c b/src/cc/libbpf/src/bpf_prog_linfo.c
1: index 5c503096..965d3482 100644
1: --- a/src/cc/libbpf/src/bpf_prog_linfo.c
1: +++ b/src/cc/libbpf/src/bpf_prog_linfo.c
1: @@ -1,246 +1,228 @@
1:  // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
1:  /* Copyright (c) 2018 Facebook */
1:  
1: -#include <string.h>
1: -#include <stdlib.h>
1: -#include <linux/err.h>
1:  #include <linux/bpf.h>
1: +#include <linux/err.h>
1: +#include <stdlib.h>
1: +#include <string.h>
1:  #include "libbpf.h"
1:  #include "libbpf_internal.h"
1:  
1:  struct bpf_prog_linfo {
1: -	void *raw_linfo;
1: -	void *raw_jited_linfo;
1: -	__u32 *nr_jited_linfo_per_func;
1: -	__u32 *jited_linfo_func_idx;
1: -	__u32 nr_linfo;
1: -	__u32 nr_jited_func;
1: -	__u32 rec_size;
1: -	__u32 jited_rec_size;
1: +  void *raw_linfo;
1: +  void *raw_jited_linfo;
1: +  __u32 *nr_jited_linfo_per_func;
1: +  __u32 *jited_linfo_func_idx;
1: +  __u32 nr_linfo;
1: +  __u32 nr_jited_func;
1: +  __u32 rec_size;
1: +  __u32 jited_rec_size;
1:  };
1:  
1:  static int dissect_jited_func(struct bpf_prog_linfo *prog_linfo,
1: -			      const __u64 *ksym_func, const __u32 *ksym_len)
1: -{
1: -	__u32 nr_jited_func, nr_linfo;
1: -	const void *raw_jited_linfo;
1: -	const __u64 *jited_linfo;
1: -	__u64 last_jited_linfo;
1: -	/*
1: -	 * Index to raw_jited_linfo:
1: -	 *      i: Index for searching the next ksym_func
1: -	 * prev_i: Index to the last found ksym_func
1: -	 */
1: -	__u32 i, prev_i;
1: -	__u32 f; /* Index to ksym_func */
1: -
1: -	raw_jited_linfo = prog_linfo->raw_jited_linfo;
1: -	jited_linfo = raw_jited_linfo;
1: -	if (ksym_func[0] != *jited_linfo)
1: -		goto errout;
1: -
1: -	prog_linfo->jited_linfo_func_idx[0] = 0;
1: -	nr_jited_func = prog_linfo->nr_jited_func;
1: -	nr_linfo = prog_linfo->nr_linfo;
1: -
1: -	for (prev_i = 0, i = 1, f = 1;
1: -	     i < nr_linfo && f < nr_jited_func;
1: -	     i++) {
1: -		raw_jited_linfo += prog_linfo->jited_rec_size;
1: -		last_jited_linfo = *jited_linfo;
1: -		jited_linfo = raw_jited_linfo;
1: -
1: -		if (ksym_func[f] == *jited_linfo) {
1: -			prog_linfo->jited_linfo_func_idx[f] = i;
1: -
1: -			/* Sanity check */
1: -			if (last_jited_linfo - ksym_func[f - 1] + 1 >
1: -			    ksym_len[f - 1])
1: -				goto errout;
1: -
1: -			prog_linfo->nr_jited_linfo_per_func[f - 1] =
1: -				i - prev_i;
1: -			prev_i = i;
1: -
1: -			/*
1: -			 * The ksym_func[f] is found in jited_linfo.
1: -			 * Look for the next one.
1: -			 */
1: -			f++;
1: -		} else if (*jited_linfo <= last_jited_linfo) {
1: -			/* Ensure the addr is increasing _within_ a func */
1: -			goto errout;
1: -		}
1: -	}
1: -
1: -	if (f != nr_jited_func)
1: -		goto errout;
1: -
1: -	prog_linfo->nr_jited_linfo_per_func[nr_jited_func - 1] =
1: -		nr_linfo - prev_i;
1: -
1: -	return 0;
1: +                              const __u64 *ksym_func, const __u32 *ksym_len) {
1: +  __u32 nr_jited_func, nr_linfo;
1: +  const void *raw_jited_linfo;
1: +  const __u64 *jited_linfo;
1: +  __u64 last_jited_linfo;
1: +  /*
1: +   * Index to raw_jited_linfo:
1: +   *      i: Index for searching the next ksym_func
1: +   * prev_i: Index to the last found ksym_func
1: +   */
1: +  __u32 i, prev_i;
1: +  __u32 f; /* Index to ksym_func */
1: +
1: +  raw_jited_linfo = prog_linfo->raw_jited_linfo;
1: +  jited_linfo = raw_jited_linfo;
1: +  if (ksym_func[0] != *jited_linfo)
1: +    goto errout;
1: +
1: +  prog_linfo->jited_linfo_func_idx[0] = 0;
1: +  nr_jited_func = prog_linfo->nr_jited_func;
1: +  nr_linfo = prog_linfo->nr_linfo;
1: +
1: +  for (prev_i = 0, i = 1, f = 1; i < nr_linfo && f < nr_jited_func; i++) {
1: +    raw_jited_linfo += prog_linfo->jited_rec_size;
1: +    last_jited_linfo = *jited_linfo;
1: +    jited_linfo = raw_jited_linfo;
1: +
1: +    if (ksym_func[f] == *jited_linfo) {
1: +      prog_linfo->jited_linfo_func_idx[f] = i;
1: +
1: +      /* Sanity check */
1: +      if (last_jited_linfo - ksym_func[f - 1] + 1 > ksym_len[f - 1])
1: +        goto errout;
1: +
1: +      prog_linfo->nr_jited_linfo_per_func[f - 1] = i - prev_i;
1: +      prev_i = i;
1: +
1: +      /*
1: +       * The ksym_func[f] is found in jited_linfo.
1: +       * Look for the next one.
1: +       */
1: +      f++;
1: +    } else if (*jited_linfo <= last_jited_linfo) {
1: +      /* Ensure the addr is increasing _within_ a func */
1: +      goto errout;
1: +    }
1: +  }
1: +
1: +  if (f != nr_jited_func)
1: +    goto errout;
1: +
1: +  prog_linfo->nr_jited_linfo_per_func[nr_jited_func - 1] = nr_linfo - prev_i;
1: +
1: +  return 0;
1:  
1:  errout:
1: -	return -EINVAL;
1: +  return -EINVAL;
1:  }
1:  
1: -void bpf_prog_linfo__free(struct bpf_prog_linfo *prog_linfo)
1: -{
1: -	if (!prog_linfo)
1: -		return;
1: +void bpf_prog_linfo__free(struct bpf_prog_linfo *prog_linfo) {
1: +  if (!prog_linfo)
1: +    return;
1:  
1: -	free(prog_linfo->raw_linfo);
1: -	free(prog_linfo->raw_jited_linfo);
1: -	free(prog_linfo->nr_jited_linfo_per_func);
1: -	free(prog_linfo->jited_linfo_func_idx);
1: -	free(prog_linfo);
1: +  free(prog_linfo->raw_linfo);
1: +  free(prog_linfo->raw_jited_linfo);
1: +  free(prog_linfo->nr_jited_linfo_per_func);
1: +  free(prog_linfo->jited_linfo_func_idx);
1: +  free(prog_linfo);
1:  }
1:  
1: -struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info)
1: -{
1: -	struct bpf_prog_linfo *prog_linfo;
1: -	__u32 nr_linfo, nr_jited_func;
1: -	__u64 data_sz;
1: -
1: -	nr_linfo = info->nr_line_info;
1: -
1: -	if (!nr_linfo)
1: -		return errno = EINVAL, NULL;
1: -
1: -	/*
1: -	 * The min size that bpf_prog_linfo has to access for
1: -	 * searching purpose.
1: -	 */
1: -	if (info->line_info_rec_size <
1: -	    offsetof(struct bpf_line_info, file_name_off))
1: -		return errno = EINVAL, NULL;
1: -
1: -	prog_linfo = calloc(1, sizeof(*prog_linfo));
1: -	if (!prog_linfo)
1: -		return errno = ENOMEM, NULL;
1: -
1: -	/* Copy xlated line_info */
1: -	prog_linfo->nr_linfo = nr_linfo;
1: -	prog_linfo->rec_size = info->line_info_rec_size;
1: -	data_sz = (__u64)nr_linfo * prog_linfo->rec_size;
1: -	prog_linfo->raw_linfo = malloc(data_sz);
1: -	if (!prog_linfo->raw_linfo)
1: -		goto err_free;
1: -	memcpy(prog_linfo->raw_linfo, (void *)(long)info->line_info, data_sz);
1: -
1: -	nr_jited_func = info->nr_jited_ksyms;
1: -	if (!nr_jited_func ||
1: -	    !info->jited_line_info ||
1: -	    info->nr_jited_line_info != nr_linfo ||
1: -	    info->jited_line_info_rec_size < sizeof(__u64) ||
1: -	    info->nr_jited_func_lens != nr_jited_func ||
1: -	    !info->jited_ksyms ||
1: -	    !info->jited_func_lens)
1: -		/* Not enough info to provide jited_line_info */
1: -		return prog_linfo;
1: -
1: -	/* Copy jited_line_info */
1: -	prog_linfo->nr_jited_func = nr_jited_func;
1: -	prog_linfo->jited_rec_size = info->jited_line_info_rec_size;
1: -	data_sz = (__u64)nr_linfo * prog_linfo->jited_rec_size;
1: -	prog_linfo->raw_jited_linfo = malloc(data_sz);
1: -	if (!prog_linfo->raw_jited_linfo)
1: -		goto err_free;
1: -	memcpy(prog_linfo->raw_jited_linfo,
1: -	       (void *)(long)info->jited_line_info, data_sz);
1: -
1: -	/* Number of jited_line_info per jited func */
1: -	prog_linfo->nr_jited_linfo_per_func = malloc(nr_jited_func *
1: -						     sizeof(__u32));
1: -	if (!prog_linfo->nr_jited_linfo_per_func)
1: -		goto err_free;
1: -
1: -	/*
1: -	 * For each jited func,
1: -	 * the start idx to the "linfo" and "jited_linfo" array,
1: -	 */
1: -	prog_linfo->jited_linfo_func_idx = malloc(nr_jited_func *
1: -						  sizeof(__u32));
1: -	if (!prog_linfo->jited_linfo_func_idx)
1: -		goto err_free;
1: -
1: -	if (dissect_jited_func(prog_linfo,
1: -			       (__u64 *)(long)info->jited_ksyms,
1: -			       (__u32 *)(long)info->jited_func_lens))
1: -		goto err_free;
1: -
1: -	return prog_linfo;
1: +struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info) {
1: +  struct bpf_prog_linfo *prog_linfo;
1: +  __u32 nr_linfo, nr_jited_func;
1: +  __u64 data_sz;
1: +
1: +  nr_linfo = info->nr_line_info;
1: +
1: +  if (!nr_linfo)
1: +    return errno = EINVAL, NULL;
1: +
1: +  /*
1: +   * The min size that bpf_prog_linfo has to access for
1: +   * searching purpose.
1: +   */
1: +  if (info->line_info_rec_size < offsetof(struct bpf_line_info, file_name_off))
1: +    return errno = EINVAL, NULL;
1: +
1: +  prog_linfo = calloc(1, sizeof(*prog_linfo));
1: +  if (!prog_linfo)
1: +    return errno = ENOMEM, NULL;
1: +
1: +  /* Copy xlated line_info */
1: +  prog_linfo->nr_linfo = nr_linfo;
1: +  prog_linfo->rec_size = info->line_info_rec_size;
1: +  data_sz = (__u64)nr_linfo * prog_linfo->rec_size;
1: +  prog_linfo->raw_linfo = malloc(data_sz);
1: +  if (!prog_linfo->raw_linfo)
1: +    goto err_free;
1: +  memcpy(prog_linfo->raw_linfo, (void *)(long)info->line_info, data_sz);
1: +
1: +  nr_jited_func = info->nr_jited_ksyms;
1: +  if (!nr_jited_func || !info->jited_line_info ||
1: +      info->nr_jited_line_info != nr_linfo ||
1: +      info->jited_line_info_rec_size < sizeof(__u64) ||
1: +      info->nr_jited_func_lens != nr_jited_func || !info->jited_ksyms ||
1: +      !info->jited_func_lens)
1: +    /* Not enough info to provide jited_line_info */
1: +    return prog_linfo;
1: +
1: +  /* Copy jited_line_info */
1: +  prog_linfo->nr_jited_func = nr_jited_func;
1: +  prog_linfo->jited_rec_size = info->jited_line_info_rec_size;
1: +  data_sz = (__u64)nr_linfo * prog_linfo->jited_rec_size;
1: +  prog_linfo->raw_jited_linfo = malloc(data_sz);
1: +  if (!prog_linfo->raw_jited_linfo)
1: +    goto err_free;
1: +  memcpy(prog_linfo->raw_jited_linfo, (void *)(long)info->jited_line_info,
1: +         data_sz);
1: +
1: +  /* Number of jited_line_info per jited func */
1: +  prog_linfo->nr_jited_linfo_per_func = malloc(nr_jited_func * sizeof(__u32));
1: +  if (!prog_linfo->nr_jited_linfo_per_func)
1: +    goto err_free;
1: +
1: +  /*
1: +   * For each jited func,
1: +   * the start idx to the "linfo" and "jited_linfo" array,
1: +   */
1: +  prog_linfo->jited_linfo_func_idx = malloc(nr_jited_func * sizeof(__u32));
1: +  if (!prog_linfo->jited_linfo_func_idx)
1: +    goto err_free;
1: +
1: +  if (dissect_jited_func(prog_linfo, (__u64 *)(long)info->jited_ksyms,
1: +                         (__u32 *)(long)info->jited_func_lens))
1: +    goto err_free;
1: +
1: +  return prog_linfo;
1:  
1:  err_free:
1: -	bpf_prog_linfo__free(prog_linfo);
1: -	return errno = EINVAL, NULL;
1: +  bpf_prog_linfo__free(prog_linfo);
1: +  return errno = EINVAL, NULL;
1:  }
1:  
1: -const struct bpf_line_info *
1: -bpf_prog_linfo__lfind_addr_func(const struct bpf_prog_linfo *prog_linfo,
1: -				__u64 addr, __u32 func_idx, __u32 nr_skip)
1: -{
1: -	__u32 jited_rec_size, rec_size, nr_linfo, start, i;
1: -	const void *raw_jited_linfo, *raw_linfo;
1: -	const __u64 *jited_linfo;
1: -
1: -	if (func_idx >= prog_linfo->nr_jited_func)
1: -		return errno = ENOENT, NULL;
1: -
1: -	nr_linfo = prog_linfo->nr_jited_linfo_per_func[func_idx];
1: -	if (nr_skip >= nr_linfo)
1: -		return errno = ENOENT, NULL;
1: -
1: -	start = prog_linfo->jited_linfo_func_idx[func_idx] + nr_skip;
1: -	jited_rec_size = prog_linfo->jited_rec_size;
1: -	raw_jited_linfo = prog_linfo->raw_jited_linfo +
1: -		(start * jited_rec_size);
1: -	jited_linfo = raw_jited_linfo;
1: -	if (addr < *jited_linfo)
1: -		return errno = ENOENT, NULL;
1: -
1: -	nr_linfo -= nr_skip;
1: -	rec_size = prog_linfo->rec_size;
1: -	raw_linfo = prog_linfo->raw_linfo + (start * rec_size);
1: -	for (i = 0; i < nr_linfo; i++) {
1: -		if (addr < *jited_linfo)
1: -			break;
1: -
1: -		raw_linfo += rec_size;
1: -		raw_jited_linfo += jited_rec_size;
1: -		jited_linfo = raw_jited_linfo;
1: -	}
1: -
1: -	return raw_linfo - rec_size;
1: +const struct bpf_line_info *bpf_prog_linfo__lfind_addr_func(
1: +    const struct bpf_prog_linfo *prog_linfo, __u64 addr, __u32 func_idx,
1: +    __u32 nr_skip) {
1: +  __u32 jited_rec_size, rec_size, nr_linfo, start, i;
1: +  const void *raw_jited_linfo, *raw_linfo;
1: +  const __u64 *jited_linfo;
1: +
1: +  if (func_idx >= prog_linfo->nr_jited_func)
1: +    return errno = ENOENT, NULL;
1: +
1: +  nr_linfo = prog_linfo->nr_jited_linfo_per_func[func_idx];
1: +  if (nr_skip >= nr_linfo)
1: +    return errno = ENOENT, NULL;
1: +
1: +  start = prog_linfo->jited_linfo_func_idx[func_idx] + nr_skip;
1: +  jited_rec_size = prog_linfo->jited_rec_size;
1: +  raw_jited_linfo = prog_linfo->raw_jited_linfo + (start * jited_rec_size);
1: +  jited_linfo = raw_jited_linfo;
1: +  if (addr < *jited_linfo)
1: +    return errno = ENOENT, NULL;
1: +
1: +  nr_linfo -= nr_skip;
1: +  rec_size = prog_linfo->rec_size;
1: +  raw_linfo = prog_linfo->raw_linfo + (start * rec_size);
1: +  for (i = 0; i < nr_linfo; i++) {
1: +    if (addr < *jited_linfo)
1: +      break;
1: +
1: +    raw_linfo += rec_size;
1: +    raw_jited_linfo += jited_rec_size;
1: +    jited_linfo = raw_jited_linfo;
1: +  }
1: +
1: +  return raw_linfo - rec_size;
1:  }
1:  
1: -const struct bpf_line_info *
1: -bpf_prog_linfo__lfind(const struct bpf_prog_linfo *prog_linfo,
1: -		      __u32 insn_off, __u32 nr_skip)
1: -{
1: -	const struct bpf_line_info *linfo;
1: -	__u32 rec_size, nr_linfo, i;
1: -	const void *raw_linfo;
1: -
1: -	nr_linfo = prog_linfo->nr_linfo;
1: -	if (nr_skip >= nr_linfo)
1: -		return errno = ENOENT, NULL;
1: -
1: -	rec_size = prog_linfo->rec_size;
1: -	raw_linfo = prog_linfo->raw_linfo + (nr_skip * rec_size);
1: -	linfo = raw_linfo;
1: -	if (insn_off < linfo->insn_off)
1: -		return errno = ENOENT, NULL;
1: -
1: -	nr_linfo -= nr_skip;
1: -	for (i = 0; i < nr_linfo; i++) {
1: -		if (insn_off < linfo->insn_off)
1: -			break;
1: -
1: -		raw_linfo += rec_size;
1: -		linfo = raw_linfo;
1: -	}
1: -
1: -	return raw_linfo - rec_size;
1: +const struct bpf_line_info *bpf_prog_linfo__lfind(
1: +    const struct bpf_prog_linfo *prog_linfo, __u32 insn_off, __u32 nr_skip) {
1: +  const struct bpf_line_info *linfo;
1: +  __u32 rec_size, nr_linfo, i;
1: +  const void *raw_linfo;
1: +
1: +  nr_linfo = prog_linfo->nr_linfo;
1: +  if (nr_skip >= nr_linfo)
1: +    return errno = ENOENT, NULL;
1: +
1: +  rec_size = prog_linfo->rec_size;
1: +  raw_linfo = prog_linfo->raw_linfo + (nr_skip * rec_size);
1: +  linfo = raw_linfo;
1: +  if (insn_off < linfo->insn_off)
1: +    return errno = ENOENT, NULL;
1: +
1: +  nr_linfo -= nr_skip;
1: +  for (i = 0; i < nr_linfo; i++) {
1: +    if (insn_off < linfo->insn_off)
1: +      break;
1: +
1: +    raw_linfo += rec_size;
1: +    linfo = raw_linfo;
1: +  }
1: +
1: +  return raw_linfo - rec_size;
1:  }
1: diff --git a/src/cc/libbpf/src/bpf_tracing.h b/src/cc/libbpf/src/bpf_tracing.h
1: index d6bfbe00..431f7e01 100644
1: --- a/src/cc/libbpf/src/bpf_tracing.h
1: +++ b/src/cc/libbpf/src/bpf_tracing.h
1: @@ -4,56 +4,57 @@
1:  
1:  /* Scan the ARCH passed in from ARCH env variable (see Makefile) */
1:  #if defined(__TARGET_ARCH_x86)
1: -	#define bpf_target_x86
1: -	#define bpf_target_defined
1: +#define bpf_target_x86
1: +#define bpf_target_defined
1:  #elif defined(__TARGET_ARCH_s390)
1: -	#define bpf_target_s390
1: -	#define bpf_target_defined
1: +#define bpf_target_s390
1: +#define bpf_target_defined
1:  #elif defined(__TARGET_ARCH_arm)
1: -	#define bpf_target_arm
1: -	#define bpf_target_defined
1: +#define bpf_target_arm
1: +#define bpf_target_defined
1:  #elif defined(__TARGET_ARCH_arm64)
1: -	#define bpf_target_arm64
1: -	#define bpf_target_defined
1: +#define bpf_target_arm64
1: +#define bpf_target_defined
1:  #elif defined(__TARGET_ARCH_mips)
1: -	#define bpf_target_mips
1: -	#define bpf_target_defined
1: +#define bpf_target_mips
1: +#define bpf_target_defined
1:  #elif defined(__TARGET_ARCH_powerpc)
1: -	#define bpf_target_powerpc
1: -	#define bpf_target_defined
1: +#define bpf_target_powerpc
1: +#define bpf_target_defined
1:  #elif defined(__TARGET_ARCH_sparc)
1: -	#define bpf_target_sparc
1: -	#define bpf_target_defined
1: +#define bpf_target_sparc
1: +#define bpf_target_defined
1:  #else
1:  
1:  /* Fall back to what the compiler says */
1:  #if defined(__x86_64__)
1: -	#define bpf_target_x86
1: -	#define bpf_target_defined
1: +#define bpf_target_x86
1: +#define bpf_target_defined
1:  #elif defined(__s390__)
1: -	#define bpf_target_s390
1: -	#define bpf_target_defined
1: +#define bpf_target_s390
1: +#define bpf_target_defined
1:  #elif defined(__arm__)
1: -	#define bpf_target_arm
1: -	#define bpf_target_defined
1: +#define bpf_target_arm
1: +#define bpf_target_defined
1:  #elif defined(__aarch64__)
1: -	#define bpf_target_arm64
1: -	#define bpf_target_defined
1: +#define bpf_target_arm64
1: +#define bpf_target_defined
1:  #elif defined(__mips__)
1: -	#define bpf_target_mips
1: -	#define bpf_target_defined
1: +#define bpf_target_mips
1: +#define bpf_target_defined
1:  #elif defined(__powerpc__)
1: -	#define bpf_target_powerpc
1: -	#define bpf_target_defined
1: +#define bpf_target_powerpc
1: +#define bpf_target_defined
1:  #elif defined(__sparc__)
1: -	#define bpf_target_sparc
1: -	#define bpf_target_defined
1: +#define bpf_target_sparc
1: +#define bpf_target_defined
1:  #endif /* no compiler target */
1:  
1:  #endif
1:  
1:  #ifndef __BPF_TARGET_MISSING
1: -#define __BPF_TARGET_MISSING "GCC error \"Must specify a BPF target arch via __TARGET_ARCH_xxx\""
1: +#define __BPF_TARGET_MISSING \
1: +  "GCC error \"Must specify a BPF target arch via __TARGET_ARCH_xxx\""
1:  #endif
1:  
1:  #if defined(bpf_target_x86)
1: @@ -171,7 +172,8 @@ struct pt_regs;
1:  #define PT_REGS_PARM4(x) ((x)->uregs[3])
1:  #define PT_REGS_PARM5(x) ((x)->uregs[4])
1:  #define PT_REGS_RET(x) ((x)->uregs[14])
1: -#define PT_REGS_FP(x) ((x)->uregs[11]) /* Works only with CONFIG_FRAME_POINTER */
1: +#define PT_REGS_FP(x) \
1: +  ((x)->uregs[11]) /* Works only with CONFIG_FRAME_POINTER */
1:  #define PT_REGS_RC(x) ((x)->uregs[0])
1:  #define PT_REGS_SP(x) ((x)->uregs[13])
1:  #define PT_REGS_IP(x) ((x)->uregs[12])
1: @@ -223,7 +225,8 @@ struct pt_regs;
1:  #define PT_REGS_PARM4(x) ((x)->regs[7])
1:  #define PT_REGS_PARM5(x) ((x)->regs[8])
1:  #define PT_REGS_RET(x) ((x)->regs[31])
1: -#define PT_REGS_FP(x) ((x)->regs[30]) /* Works only with CONFIG_FRAME_POINTER */
1: +#define PT_REGS_FP(x) ((x)->regs[30]) /* Works only with CONFIG_FRAME_POINTER \
1: +                                         */
1:  #define PT_REGS_RC(x) ((x)->regs[2])
1:  #define PT_REGS_SP(x) ((x)->regs[29])
1:  #define PT_REGS_IP(x) ((x)->cp0_epc)
1: @@ -291,50 +294,140 @@ struct pt_regs;
1:  #endif
1:  
1:  #if defined(bpf_target_powerpc)
1: -#define BPF_KPROBE_READ_RET_IP(ip, ctx)		({ (ip) = (ctx)->link; })
1: -#define BPF_KRETPROBE_READ_RET_IP		BPF_KPROBE_READ_RET_IP
1: +#define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = (ctx)->link; })
1: +#define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP
1:  #elif defined(bpf_target_sparc)
1: -#define BPF_KPROBE_READ_RET_IP(ip, ctx)		({ (ip) = PT_REGS_RET(ctx); })
1: -#define BPF_KRETPROBE_READ_RET_IP		BPF_KPROBE_READ_RET_IP
1: +#define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = PT_REGS_RET(ctx); })
1: +#define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP
1:  #elif defined(bpf_target_defined)
1: -#define BPF_KPROBE_READ_RET_IP(ip, ctx)					    \
1: -	({ bpf_probe_read_kernel(&(ip), sizeof(ip), (void *)PT_REGS_RET(ctx)); })
1: -#define BPF_KRETPROBE_READ_RET_IP(ip, ctx)				    \
1: -	({ bpf_probe_read_kernel(&(ip), sizeof(ip),			    \
1: -			  (void *)(PT_REGS_FP(ctx) + sizeof(ip))); })
1: +#define BPF_KPROBE_READ_RET_IP(ip, ctx) \
1: +  ({ bpf_probe_read_kernel(&(ip), sizeof(ip), (void *)PT_REGS_RET(ctx)); })
1: +#define BPF_KRETPROBE_READ_RET_IP(ip, ctx)                         \
1: +  ({                                                               \
1: +    bpf_probe_read_kernel(&(ip), sizeof(ip),                       \
1: +                          (void *)(PT_REGS_FP(ctx) + sizeof(ip))); \
1: +  })
1:  #endif
1:  
1:  #if !defined(bpf_target_defined)
1:  
1: -#define PT_REGS_PARM1(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM2(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM3(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM4(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM5(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_RET(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_FP(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_RC(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_SP(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_IP(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -
1: -#define PT_REGS_PARM1_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM2_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM3_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM4_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_PARM5_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_RET_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_FP_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_RC_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_SP_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define PT_REGS_IP_CORE(x) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -
1: -#define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: -#define BPF_KRETPROBE_READ_RET_IP(ip, ctx) ({ _Pragma(__BPF_TARGET_MISSING); 0l; })
1: +#define PT_REGS_PARM1(x)           \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM2(x)           \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM3(x)           \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM4(x)           \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM5(x)           \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_RET(x)             \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_FP(x)              \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_RC(x)              \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_SP(x)              \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_IP(x)              \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +
1: +#define PT_REGS_PARM1_CORE(x)      \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM2_CORE(x)      \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM3_CORE(x)      \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM4_CORE(x)      \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_PARM5_CORE(x)      \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_RET_CORE(x)        \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_FP_CORE(x)         \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_RC_CORE(x)         \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_SP_CORE(x)         \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +#define PT_REGS_IP_CORE(x)         \
1: +  ({                               \
1: +    _Pragma(__BPF_TARGET_MISSING); \
1: +    0l;                            \
1: +  })
1: +
1: +#define BPF_KPROBE_READ_RET_IP(ip, ctx) \
1: +  ({                                    \
1: +    _Pragma(__BPF_TARGET_MISSING);      \
1: +    0l;                                 \
1: +  })
1: +#define BPF_KRETPROBE_READ_RET_IP(ip, ctx) \
1: +  ({                                       \
1: +    _Pragma(__BPF_TARGET_MISSING);         \
1: +    0l;                                    \
1: +  })
1:  
1:  #endif /* !defined(bpf_target_defined) */
1:  
1:  #ifndef ___bpf_concat
1: -#define ___bpf_concat(a, b) a ## b
1: +#define ___bpf_concat(a, b) a##b
1:  #endif
1:  #ifndef ___bpf_apply
1:  #define ___bpf_apply(fn, n) ___bpf_concat(fn, n)
1: @@ -344,7 +437,7 @@ struct pt_regs;
1:  #endif
1:  #ifndef ___bpf_narg
1:  #define ___bpf_narg(...) \
1: -	___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
1: +  ___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
1:  #endif
1:  
1:  #define ___bpf_ctx_cast0() ctx
1: @@ -361,7 +454,7 @@ struct pt_regs;
1:  #define ___bpf_ctx_cast11(x, args...) ___bpf_ctx_cast10(args), (void *)ctx[10]
1:  #define ___bpf_ctx_cast12(x, args...) ___bpf_ctx_cast11(args), (void *)ctx[11]
1:  #define ___bpf_ctx_cast(args...) \
1: -	___bpf_apply(___bpf_ctx_cast, ___bpf_narg(args))(args)
1: +  ___bpf_apply(___bpf_ctx_cast, ___bpf_narg(args))(args)
1:  
1:  /*
1:   * BPF_PROG is a convenience wrapper for generic tp_btf/fentry/fexit and
1: @@ -378,35 +471,32 @@ struct pt_regs;
1:   * This is useful when using BPF helpers that expect original context
1:   * as one of the parameters (e.g., for bpf_perf_event_output()).
1:   */
1: -#define BPF_PROG(name, args...)						    \
1: -name(unsigned long long *ctx);						    \
1: -static __attribute__((always_inline)) typeof(name(0))			    \
1: -____##name(unsigned long long *ctx, ##args);				    \
1: -typeof(name(0)) name(unsigned long long *ctx)				    \
1: -{									    \
1: -	_Pragma("GCC diagnostic push")					    \
1: -	_Pragma("GCC diagnostic ignored \"-Wint-conversion\"")		    \
1: -	return ____##name(___bpf_ctx_cast(args));			    \
1: -	_Pragma("GCC diagnostic pop")					    \
1: -}									    \
1: -static __attribute__((always_inline)) typeof(name(0))			    \
1: -____##name(unsigned long long *ctx, ##args)
1: +#define BPF_PROG(name, args...)                                                                  \
1: +  name(unsigned long long *ctx);                                                                 \
1: +  static __attribute__((always_inline)) typeof(name(0))                                          \
1: +      ____##name(unsigned long long *ctx, ##args);                                               \
1: +  typeof(name(0)) name(unsigned long long *ctx) {                                                \
1: +    _Pragma("GCC diagnostic push") _Pragma(                                                      \
1: +        "GCC diagnostic ignored \"-Wint-conversion\"") return ____##name(___bpf_ctx_cast(args)); \
1: +    _Pragma("GCC diagnostic pop")                                                                \
1: +  }                                                                                              \
1: +  static __attribute__((always_inline)) typeof(name(0))                                          \
1: +      ____##name(unsigned long long *ctx, ##args)
1:  
1:  struct pt_regs;
1:  
1:  #define ___bpf_kprobe_args0() ctx
1: -#define ___bpf_kprobe_args1(x) \
1: -	___bpf_kprobe_args0(), (void *)PT_REGS_PARM1(ctx)
1: +#define ___bpf_kprobe_args1(x) ___bpf_kprobe_args0(), (void *)PT_REGS_PARM1(ctx)
1:  #define ___bpf_kprobe_args2(x, args...) \
1: -	___bpf_kprobe_args1(args), (void *)PT_REGS_PARM2(ctx)
1: +  ___bpf_kprobe_args1(args), (void *)PT_REGS_PARM2(ctx)
1:  #define ___bpf_kprobe_args3(x, args...) \
1: -	___bpf_kprobe_args2(args), (void *)PT_REGS_PARM3(ctx)
1: +  ___bpf_kprobe_args2(args), (void *)PT_REGS_PARM3(ctx)
1:  #define ___bpf_kprobe_args4(x, args...) \
1: -	___bpf_kprobe_args3(args), (void *)PT_REGS_PARM4(ctx)
1: +  ___bpf_kprobe_args3(args), (void *)PT_REGS_PARM4(ctx)
1:  #define ___bpf_kprobe_args5(x, args...) \
1: -	___bpf_kprobe_args4(args), (void *)PT_REGS_PARM5(ctx)
1: +  ___bpf_kprobe_args4(args), (void *)PT_REGS_PARM5(ctx)
1:  #define ___bpf_kprobe_args(args...) \
1: -	___bpf_apply(___bpf_kprobe_args, ___bpf_narg(args))(args)
1: +  ___bpf_apply(___bpf_kprobe_args, ___bpf_narg(args))(args)
1:  
1:  /*
1:   * BPF_KPROBE serves the same purpose for kprobes as BPF_PROG for
1: @@ -418,25 +508,23 @@ struct pt_regs;
1:   * Original struct pt_regs* context is preserved as 'ctx' argument. This might
1:   * be necessary when using BPF helpers like bpf_perf_event_output().
1:   */
1: -#define BPF_KPROBE(name, args...)					    \
1: -name(struct pt_regs *ctx);						    \
1: -static __attribute__((always_inline)) typeof(name(0))			    \
1: -____##name(struct pt_regs *ctx, ##args);				    \
1: -typeof(name(0)) name(struct pt_regs *ctx)				    \
1: -{									    \
1: -	_Pragma("GCC diagnostic push")					    \
1: -	_Pragma("GCC diagnostic ignored \"-Wint-conversion\"")		    \
1: -	return ____##name(___bpf_kprobe_args(args));			    \
1: -	_Pragma("GCC diagnostic pop")					    \
1: -}									    \
1: -static __attribute__((always_inline)) typeof(name(0))			    \
1: -____##name(struct pt_regs *ctx, ##args)
1: +#define BPF_KPROBE(name, args...)                                                                   \
1: +  name(struct pt_regs *ctx);                                                                        \
1: +  static __attribute__((always_inline)) typeof(name(0))                                             \
1: +      ____##name(struct pt_regs *ctx, ##args);                                                      \
1: +  typeof(name(0)) name(struct pt_regs *ctx) {                                                       \
1: +    _Pragma("GCC diagnostic push") _Pragma(                                                         \
1: +        "GCC diagnostic ignored \"-Wint-conversion\"") return ____##name(___bpf_kprobe_args(args)); \
1: +    _Pragma("GCC diagnostic pop")                                                                   \
1: +  }                                                                                                 \
1: +  static __attribute__((always_inline)) typeof(name(0))                                             \
1: +      ____##name(struct pt_regs *ctx, ##args)
1:  
1:  #define ___bpf_kretprobe_args0() ctx
1:  #define ___bpf_kretprobe_args1(x) \
1: -	___bpf_kretprobe_args0(), (void *)PT_REGS_RC(ctx)
1: +  ___bpf_kretprobe_args0(), (void *)PT_REGS_RC(ctx)
1:  #define ___bpf_kretprobe_args(args...) \
1: -	___bpf_apply(___bpf_kretprobe_args, ___bpf_narg(args))(args)
1: +  ___bpf_apply(___bpf_kretprobe_args, ___bpf_narg(args))(args)
1:  
1:  /*
1:   * BPF_KRETPROBE is similar to BPF_KPROBE, except, it only provides optional
1: @@ -444,17 +532,15 @@ ____##name(struct pt_regs *ctx, ##args)
1:   * arguments, because they will be clobbered by the time probed function
1:   * returns.
1:   */
1: -#define BPF_KRETPROBE(name, args...)					    \
1: -name(struct pt_regs *ctx);						    \
1: -static __attribute__((always_inline)) typeof(name(0))			    \
1: -____##name(struct pt_regs *ctx, ##args);				    \
1: -typeof(name(0)) name(struct pt_regs *ctx)				    \
1: -{									    \
1: -	_Pragma("GCC diagnostic push")					    \
1: -	_Pragma("GCC diagnostic ignored \"-Wint-conversion\"")		    \
1: -	return ____##name(___bpf_kretprobe_args(args));			    \
1: -	_Pragma("GCC diagnostic pop")					    \
1: -}									    \
1: -static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)
1: +#define BPF_KRETPROBE(name, args...)                                                                   \
1: +  name(struct pt_regs *ctx);                                                                           \
1: +  static __attribute__((always_inline)) typeof(name(0))                                                \
1: +      ____##name(struct pt_regs *ctx, ##args);                                                         \
1: +  typeof(name(0)) name(struct pt_regs *ctx) {                                                          \
1: +    _Pragma("GCC diagnostic push") _Pragma(                                                            \
1: +        "GCC diagnostic ignored \"-Wint-conversion\"") return ____##name(___bpf_kretprobe_args(args)); \
1: +    _Pragma("GCC diagnostic pop")                                                                      \
1: +  }                                                                                                    \
1: +  static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/src/btf.c b/src/cc/libbpf/src/btf.c
1: index b46760b9..bf67af13 100644
1: --- a/src/cc/libbpf/src/btf.c
1: +++ b/src/cc/libbpf/src/btf.c
1: @@ -1,26 +1,26 @@
1:  // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
1:  /* Copyright (c) 2018 Facebook */
1:  
1: +#include "btf.h"
1:  #include <byteswap.h>
1:  #include <endian.h>
1: +#include <errno.h>
1: +#include <fcntl.h>
1: +#include <gelf.h>
1: +#include <linux/btf.h>
1: +#include <linux/err.h>
1: +#include <linux/kernel.h>
1:  #include <stdio.h>
1:  #include <stdlib.h>
1:  #include <string.h>
1: -#include <fcntl.h>
1: -#include <unistd.h>
1: -#include <errno.h>
1: -#include <sys/utsname.h>
1:  #include <sys/param.h>
1:  #include <sys/stat.h>
1: -#include <linux/kernel.h>
1: -#include <linux/err.h>
1: -#include <linux/btf.h>
1: -#include <gelf.h>
1: -#include "btf.h"
1: +#include <sys/utsname.h>
1: +#include <unistd.h>
1:  #include "bpf.h"
1: +#include "hashmap.h"
1:  #include "libbpf.h"
1:  #include "libbpf_internal.h"
1: -#include "hashmap.h"
1:  #include "strset.h"
1:  
1:  #define BTF_MAX_NR_TYPES 0x7fffffffU
1: @@ -29,103 +29,103 @@
1:  static struct btf_type btf_void;
1:  
1:  struct btf {
1: -	/* raw BTF data in native endianness */
1: -	void *raw_data;
1: -	/* raw BTF data in non-native endianness */
1: -	void *raw_data_swapped;
1: -	__u32 raw_size;
1: -	/* whether target endianness differs from the native one */
1: -	bool swapped_endian;
1: -
1: -	/*
1: -	 * When BTF is loaded from an ELF or raw memory it is stored
1: -	 * in a contiguous memory block. The hdr, type_data, and, strs_data
1: -	 * point inside that memory region to their respective parts of BTF
1: -	 * representation:
1: -	 *
1: -	 * +--------------------------------+
1: -	 * |  Header  |  Types  |  Strings  |
1: -	 * +--------------------------------+
1: -	 * ^          ^         ^
1: -	 * |          |         |
1: -	 * hdr        |         |
1: -	 * types_data-+         |
1: -	 * strs_data------------+
1: -	 *
1: -	 * If BTF data is later modified, e.g., due to types added or
1: -	 * removed, BTF deduplication performed, etc, this contiguous
1: -	 * representation is broken up into three independently allocated
1: -	 * memory regions to be able to modify them independently.
1: -	 * raw_data is nulled out at that point, but can be later allocated
1: -	 * and cached again if user calls btf__get_raw_data(), at which point
1: -	 * raw_data will contain a contiguous copy of header, types, and
1: -	 * strings:
1: -	 *
1: -	 * +----------+  +---------+  +-----------+
1: -	 * |  Header  |  |  Types  |  |  Strings  |
1: -	 * +----------+  +---------+  +-----------+
1: -	 * ^             ^            ^
1: -	 * |             |            |
1: -	 * hdr           |            |
1: -	 * types_data----+            |
1: -	 * strset__data(strs_set)-----+
1: -	 *
1: -	 *               +----------+---------+-----------+
1: -	 *               |  Header  |  Types  |  Strings  |
1: -	 * raw_data----->+----------+---------+-----------+
1: -	 */
1: -	struct btf_header *hdr;
1: -
1: -	void *types_data;
1: -	size_t types_data_cap; /* used size stored in hdr->type_len */
1: -
1: -	/* type ID to `struct btf_type *` lookup index
1: -	 * type_offs[0] corresponds to the first non-VOID type:
1: -	 *   - for base BTF it's type [1];
1: -	 *   - for split BTF it's the first non-base BTF type.
1: -	 */
1: -	__u32 *type_offs;
1: -	size_t type_offs_cap;
1: -	/* number of types in this BTF instance:
1: -	 *   - doesn't include special [0] void type;
1: -	 *   - for split BTF counts number of types added on top of base BTF.
1: -	 */
1: -	__u32 nr_types;
1: -	/* if not NULL, points to the base BTF on top of which the current
1: -	 * split BTF is based
1: -	 */
1: -	struct btf *base_btf;
1: -	/* BTF type ID of the first type in this BTF instance:
1: -	 *   - for base BTF it's equal to 1;
1: -	 *   - for split BTF it's equal to biggest type ID of base BTF plus 1.
1: -	 */
1: -	int start_id;
1: -	/* logical string offset of this BTF instance:
1: -	 *   - for base BTF it's equal to 0;
1: -	 *   - for split BTF it's equal to total size of base BTF's string section size.
1: -	 */
1: -	int start_str_off;
1: -
1: -	/* only one of strs_data or strs_set can be non-NULL, depending on
1: -	 * whether BTF is in a modifiable state (strs_set is used) or not
1: -	 * (strs_data points inside raw_data)
1: -	 */
1: -	void *strs_data;
1: -	/* a set of unique strings */
1: -	struct strset *strs_set;
1: -	/* whether strings are already deduplicated */
1: -	bool strs_deduped;
1: -
1: -	/* BTF object FD, if loaded into kernel */
1: -	int fd;
1: -
1: -	/* Pointer size (in bytes) for a target architecture of this BTF */
1: -	int ptr_sz;
1: +  /* raw BTF data in native endianness */
1: +  void *raw_data;
1: +  /* raw BTF data in non-native endianness */
1: +  void *raw_data_swapped;
1: +  __u32 raw_size;
1: +  /* whether target endianness differs from the native one */
1: +  bool swapped_endian;
1: +
1: +  /*
1: +   * When BTF is loaded from an ELF or raw memory it is stored
1: +   * in a contiguous memory block. The hdr, type_data, and, strs_data
1: +   * point inside that memory region to their respective parts of BTF
1: +   * representation:
1: +   *
1: +   * +--------------------------------+
1: +   * |  Header  |  Types  |  Strings  |
1: +   * +--------------------------------+
1: +   * ^          ^         ^
1: +   * |          |         |
1: +   * hdr        |         |
1: +   * types_data-+         |
1: +   * strs_data------------+
1: +   *
1: +   * If BTF data is later modified, e.g., due to types added or
1: +   * removed, BTF deduplication performed, etc, this contiguous
1: +   * representation is broken up into three independently allocated
1: +   * memory regions to be able to modify them independently.
1: +   * raw_data is nulled out at that point, but can be later allocated
1: +   * and cached again if user calls btf__get_raw_data(), at which point
1: +   * raw_data will contain a contiguous copy of header, types, and
1: +   * strings:
1: +   *
1: +   * +----------+  +---------+  +-----------+
1: +   * |  Header  |  |  Types  |  |  Strings  |
1: +   * +----------+  +---------+  +-----------+
1: +   * ^             ^            ^
1: +   * |             |            |
1: +   * hdr           |            |
1: +   * types_data----+            |
1: +   * strset__data(strs_set)-----+
1: +   *
1: +   *               +----------+---------+-----------+
1: +   *               |  Header  |  Types  |  Strings  |
1: +   * raw_data----->+----------+---------+-----------+
1: +   */
1: +  struct btf_header *hdr;
1: +
1: +  void *types_data;
1: +  size_t types_data_cap; /* used size stored in hdr->type_len */
1: +
1: +  /* type ID to `struct btf_type *` lookup index
1: +   * type_offs[0] corresponds to the first non-VOID type:
1: +   *   - for base BTF it's type [1];
1: +   *   - for split BTF it's the first non-base BTF type.
1: +   */
1: +  __u32 *type_offs;
1: +  size_t type_offs_cap;
1: +  /* number of types in this BTF instance:
1: +   *   - doesn't include special [0] void type;
1: +   *   - for split BTF counts number of types added on top of base BTF.
1: +   */
1: +  __u32 nr_types;
1: +  /* if not NULL, points to the base BTF on top of which the current
1: +   * split BTF is based
1: +   */
1: +  struct btf *base_btf;
1: +  /* BTF type ID of the first type in this BTF instance:
1: +   *   - for base BTF it's equal to 1;
1: +   *   - for split BTF it's equal to biggest type ID of base BTF plus 1.
1: +   */
1: +  int start_id;
1: +  /* logical string offset of this BTF instance:
1: +   *   - for base BTF it's equal to 0;
1: +   *   - for split BTF it's equal to total size of base BTF's string section
1: +   * size.
1: +   */
1: +  int start_str_off;
1: +
1: +  /* only one of strs_data or strs_set can be non-NULL, depending on
1: +   * whether BTF is in a modifiable state (strs_set is used) or not
1: +   * (strs_data points inside raw_data)
1: +   */
1: +  void *strs_data;
1: +  /* a set of unique strings */
1: +  struct strset *strs_set;
1: +  /* whether strings are already deduplicated */
1: +  bool strs_deduped;
1: +
1: +  /* BTF object FD, if loaded into kernel */
1: +  int fd;
1: +
1: +  /* Pointer size (in bytes) for a target architecture of this BTF */
1: +  int ptr_sz;
1:  };
1:  
1: -static inline __u64 ptr_to_u64(const void *ptr)
1: -{
1: -	return (__u64) (unsigned long) ptr;
1: +static inline __u64 ptr_to_u64(const void *ptr) {
1: +  return (__u64)(unsigned long)ptr;
1:  }
1:  
1:  /* Ensure given dynamically allocated memory region pointed to by *data* with
1: @@ -139,349 +139,337 @@ static inline __u64 ptr_to_u64(const void *ptr)
1:   * On error, NULL is returned.
1:   */
1:  void *libbpf_add_mem(void **data, size_t *cap_cnt, size_t elem_sz,
1: -		     size_t cur_cnt, size_t max_cnt, size_t add_cnt)
1: -{
1: -	size_t new_cnt;
1: -	void *new_data;
1: +                     size_t cur_cnt, size_t max_cnt, size_t add_cnt) {
1: +  size_t new_cnt;
1: +  void *new_data;
1:  
1: -	if (cur_cnt + add_cnt <= *cap_cnt)
1: -		return *data + cur_cnt * elem_sz;
1: +  if (cur_cnt + add_cnt <= *cap_cnt)
1: +    return *data + cur_cnt * elem_sz;
1:  
1: -	/* requested more than the set limit */
1: -	if (cur_cnt + add_cnt > max_cnt)
1: -		return NULL;
1: +  /* requested more than the set limit */
1: +  if (cur_cnt + add_cnt > max_cnt)
1: +    return NULL;
1:  
1: -	new_cnt = *cap_cnt;
1: -	new_cnt += new_cnt / 4;		  /* expand by 25% */
1: -	if (new_cnt < 16)		  /* but at least 16 elements */
1: -		new_cnt = 16;
1: -	if (new_cnt > max_cnt)		  /* but not exceeding a set limit */
1: -		new_cnt = max_cnt;
1: -	if (new_cnt < cur_cnt + add_cnt)  /* also ensure we have enough memory */
1: -		new_cnt = cur_cnt + add_cnt;
1: +  new_cnt = *cap_cnt;
1: +  new_cnt += new_cnt / 4; /* expand by 25% */
1: +  if (new_cnt < 16)       /* but at least 16 elements */
1: +    new_cnt = 16;
1: +  if (new_cnt > max_cnt) /* but not exceeding a set limit */
1: +    new_cnt = max_cnt;
1: +  if (new_cnt < cur_cnt + add_cnt) /* also ensure we have enough memory */
1: +    new_cnt = cur_cnt + add_cnt;
1:  
1: -	new_data = libbpf_reallocarray(*data, new_cnt, elem_sz);
1: -	if (!new_data)
1: -		return NULL;
1: +  new_data = libbpf_reallocarray(*data, new_cnt, elem_sz);
1: +  if (!new_data)
1: +    return NULL;
1:  
1: -	/* zero out newly allocated portion of memory */
1: -	memset(new_data + (*cap_cnt) * elem_sz, 0, (new_cnt - *cap_cnt) * elem_sz);
1: +  /* zero out newly allocated portion of memory */
1: +  memset(new_data + (*cap_cnt) * elem_sz, 0, (new_cnt - *cap_cnt) * elem_sz);
1:  
1: -	*data = new_data;
1: -	*cap_cnt = new_cnt;
1: -	return new_data + cur_cnt * elem_sz;
1: +  *data = new_data;
1: +  *cap_cnt = new_cnt;
1: +  return new_data + cur_cnt * elem_sz;
1:  }
1:  
1:  /* Ensure given dynamically allocated memory region has enough allocated space
1:   * to accommodate *need_cnt* elements of size *elem_sz* bytes each
1:   */
1: -int libbpf_ensure_mem(void **data, size_t *cap_cnt, size_t elem_sz, size_t need_cnt)
1: -{
1: -	void *p;
1: -
1: -	if (need_cnt <= *cap_cnt)
1: -		return 0;
1: -
1: -	p = libbpf_add_mem(data, cap_cnt, elem_sz, *cap_cnt, SIZE_MAX, need_cnt - *cap_cnt);
1: -	if (!p)
1: -		return -ENOMEM;
1: -
1: -	return 0;
1: -}
1: -
1: -static int btf_add_type_idx_entry(struct btf *btf, __u32 type_off)
1: -{
1: -	__u32 *p;
1: -
1: -	p = libbpf_add_mem((void **)&btf->type_offs, &btf->type_offs_cap, sizeof(__u32),
1: -			   btf->nr_types, BTF_MAX_NR_TYPES, 1);
1: -	if (!p)
1: -		return -ENOMEM;
1: -
1: -	*p = type_off;
1: -	return 0;
1: -}
1: -
1: -static void btf_bswap_hdr(struct btf_header *h)
1: -{
1: -	h->magic = bswap_16(h->magic);
1: -	h->hdr_len = bswap_32(h->hdr_len);
1: -	h->type_off = bswap_32(h->type_off);
1: -	h->type_len = bswap_32(h->type_len);
1: -	h->str_off = bswap_32(h->str_off);
1: -	h->str_len = bswap_32(h->str_len);
1: -}
1: -
1: -static int btf_parse_hdr(struct btf *btf)
1: -{
1: -	struct btf_header *hdr = btf->hdr;
1: -	__u32 meta_left;
1: -
1: -	if (btf->raw_size < sizeof(struct btf_header)) {
1: -		pr_debug("BTF header not found\n");
1: -		return -EINVAL;
1: -	}
1: -
1: -	if (hdr->magic == bswap_16(BTF_MAGIC)) {
1: -		btf->swapped_endian = true;
1: -		if (bswap_32(hdr->hdr_len) != sizeof(struct btf_header)) {
1: -			pr_warn("Can't load BTF with non-native endianness due to unsupported header length %u\n",
1: -				bswap_32(hdr->hdr_len));
1: -			return -ENOTSUP;
1: -		}
1: -		btf_bswap_hdr(hdr);
1: -	} else if (hdr->magic != BTF_MAGIC) {
1: -		pr_debug("Invalid BTF magic:%x\n", hdr->magic);
1: -		return -EINVAL;
1: -	}
1: -
1: -	meta_left = btf->raw_size - sizeof(*hdr);
1: -	if (meta_left < hdr->str_off + hdr->str_len) {
1: -		pr_debug("Invalid BTF total size:%u\n", btf->raw_size);
1: -		return -EINVAL;
1: -	}
1: -
1: -	if (hdr->type_off + hdr->type_len > hdr->str_off) {
1: -		pr_debug("Invalid BTF data sections layout: type data at %u + %u, strings data at %u + %u\n",
1: -			 hdr->type_off, hdr->type_len, hdr->str_off, hdr->str_len);
1: -		return -EINVAL;
1: -	}
1: -
1: -	if (hdr->type_off % 4) {
1: -		pr_debug("BTF type section is not aligned to 4 bytes\n");
1: -		return -EINVAL;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int btf_parse_str_sec(struct btf *btf)
1: -{
1: -	const struct btf_header *hdr = btf->hdr;
1: -	const char *start = btf->strs_data;
1: -	const char *end = start + btf->hdr->str_len;
1: -
1: -	if (btf->base_btf && hdr->str_len == 0)
1: -		return 0;
1: -	if (!hdr->str_len || hdr->str_len - 1 > BTF_MAX_STR_OFFSET || end[-1]) {
1: -		pr_debug("Invalid BTF string section\n");
1: -		return -EINVAL;
1: -	}
1: -	if (!btf->base_btf && start[0]) {
1: -		pr_debug("Invalid BTF string section\n");
1: -		return -EINVAL;
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int btf_type_size(const struct btf_type *t)
1: -{
1: -	const int base_size = sizeof(struct btf_type);
1: -	__u16 vlen = btf_vlen(t);
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_RESTRICT:
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_FUNC:
1: -	case BTF_KIND_FLOAT:
1: -		return base_size;
1: -	case BTF_KIND_INT:
1: -		return base_size + sizeof(__u32);
1: -	case BTF_KIND_ENUM:
1: -		return base_size + vlen * sizeof(struct btf_enum);
1: -	case BTF_KIND_ARRAY:
1: -		return base_size + sizeof(struct btf_array);
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION:
1: -		return base_size + vlen * sizeof(struct btf_member);
1: -	case BTF_KIND_FUNC_PROTO:
1: -		return base_size + vlen * sizeof(struct btf_param);
1: -	case BTF_KIND_VAR:
1: -		return base_size + sizeof(struct btf_var);
1: -	case BTF_KIND_DATASEC:
1: -		return base_size + vlen * sizeof(struct btf_var_secinfo);
1: -	default:
1: -		pr_debug("Unsupported BTF_KIND:%u\n", btf_kind(t));
1: -		return -EINVAL;
1: -	}
1: -}
1: -
1: -static void btf_bswap_type_base(struct btf_type *t)
1: -{
1: -	t->name_off = bswap_32(t->name_off);
1: -	t->info = bswap_32(t->info);
1: -	t->type = bswap_32(t->type);
1: -}
1: -
1: -static int btf_bswap_type_rest(struct btf_type *t)
1: -{
1: -	struct btf_var_secinfo *v;
1: -	struct btf_member *m;
1: -	struct btf_array *a;
1: -	struct btf_param *p;
1: -	struct btf_enum *e;
1: -	__u16 vlen = btf_vlen(t);
1: -	int i;
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_RESTRICT:
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_FUNC:
1: -	case BTF_KIND_FLOAT:
1: -		return 0;
1: -	case BTF_KIND_INT:
1: -		*(__u32 *)(t + 1) = bswap_32(*(__u32 *)(t + 1));
1: -		return 0;
1: -	case BTF_KIND_ENUM:
1: -		for (i = 0, e = btf_enum(t); i < vlen; i++, e++) {
1: -			e->name_off = bswap_32(e->name_off);
1: -			e->val = bswap_32(e->val);
1: -		}
1: -		return 0;
1: -	case BTF_KIND_ARRAY:
1: -		a = btf_array(t);
1: -		a->type = bswap_32(a->type);
1: -		a->index_type = bswap_32(a->index_type);
1: -		a->nelems = bswap_32(a->nelems);
1: -		return 0;
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION:
1: -		for (i = 0, m = btf_members(t); i < vlen; i++, m++) {
1: -			m->name_off = bswap_32(m->name_off);
1: -			m->type = bswap_32(m->type);
1: -			m->offset = bswap_32(m->offset);
1: -		}
1: -		return 0;
1: -	case BTF_KIND_FUNC_PROTO:
1: -		for (i = 0, p = btf_params(t); i < vlen; i++, p++) {
1: -			p->name_off = bswap_32(p->name_off);
1: -			p->type = bswap_32(p->type);
1: -		}
1: -		return 0;
1: -	case BTF_KIND_VAR:
1: -		btf_var(t)->linkage = bswap_32(btf_var(t)->linkage);
1: -		return 0;
1: -	case BTF_KIND_DATASEC:
1: -		for (i = 0, v = btf_var_secinfos(t); i < vlen; i++, v++) {
1: -			v->type = bswap_32(v->type);
1: -			v->offset = bswap_32(v->offset);
1: -			v->size = bswap_32(v->size);
1: -		}
1: -		return 0;
1: -	default:
1: -		pr_debug("Unsupported BTF_KIND:%u\n", btf_kind(t));
1: -		return -EINVAL;
1: -	}
1: -}
1: -
1: -static int btf_parse_type_sec(struct btf *btf)
1: -{
1: -	struct btf_header *hdr = btf->hdr;
1: -	void *next_type = btf->types_data;
1: -	void *end_type = next_type + hdr->type_len;
1: -	int err, type_size;
1: -
1: -	while (next_type + sizeof(struct btf_type) <= end_type) {
1: -		if (btf->swapped_endian)
1: -			btf_bswap_type_base(next_type);
1: -
1: -		type_size = btf_type_size(next_type);
1: -		if (type_size < 0)
1: -			return type_size;
1: -		if (next_type + type_size > end_type) {
1: -			pr_warn("BTF type [%d] is malformed\n", btf->start_id + btf->nr_types);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (btf->swapped_endian && btf_bswap_type_rest(next_type))
1: -			return -EINVAL;
1: -
1: -		err = btf_add_type_idx_entry(btf, next_type - btf->types_data);
1: -		if (err)
1: -			return err;
1: -
1: -		next_type += type_size;
1: -		btf->nr_types++;
1: -	}
1: -
1: -	if (next_type != end_type) {
1: -		pr_warn("BTF types data is malformed\n");
1: -		return -EINVAL;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -__u32 btf__get_nr_types(const struct btf *btf)
1: -{
1: -	return btf->start_id + btf->nr_types - 1;
1: -}
1: -
1: -const struct btf *btf__base_btf(const struct btf *btf)
1: -{
1: -	return btf->base_btf;
1: -}
1: +int libbpf_ensure_mem(void **data, size_t *cap_cnt, size_t elem_sz,
1: +                      size_t need_cnt) {
1: +  void *p;
1: +
1: +  if (need_cnt <= *cap_cnt)
1: +    return 0;
1: +
1: +  p = libbpf_add_mem(data, cap_cnt, elem_sz, *cap_cnt, SIZE_MAX,
1: +                     need_cnt - *cap_cnt);
1: +  if (!p)
1: +    return -ENOMEM;
1: +
1: +  return 0;
1: +}
1: +
1: +static int btf_add_type_idx_entry(struct btf *btf, __u32 type_off) {
1: +  __u32 *p;
1: +
1: +  p = libbpf_add_mem((void **)&btf->type_offs, &btf->type_offs_cap,
1: +                     sizeof(__u32), btf->nr_types, BTF_MAX_NR_TYPES, 1);
1: +  if (!p)
1: +    return -ENOMEM;
1: +
1: +  *p = type_off;
1: +  return 0;
1: +}
1: +
1: +static void btf_bswap_hdr(struct btf_header *h) {
1: +  h->magic = bswap_16(h->magic);
1: +  h->hdr_len = bswap_32(h->hdr_len);
1: +  h->type_off = bswap_32(h->type_off);
1: +  h->type_len = bswap_32(h->type_len);
1: +  h->str_off = bswap_32(h->str_off);
1: +  h->str_len = bswap_32(h->str_len);
1: +}
1: +
1: +static int btf_parse_hdr(struct btf *btf) {
1: +  struct btf_header *hdr = btf->hdr;
1: +  __u32 meta_left;
1: +
1: +  if (btf->raw_size < sizeof(struct btf_header)) {
1: +    pr_debug("BTF header not found\n");
1: +    return -EINVAL;
1: +  }
1: +
1: +  if (hdr->magic == bswap_16(BTF_MAGIC)) {
1: +    btf->swapped_endian = true;
1: +    if (bswap_32(hdr->hdr_len) != sizeof(struct btf_header)) {
1: +      pr_warn(
1: +          "Can't load BTF with non-native endianness due to unsupported header "
1: +          "length %u\n",
1: +          bswap_32(hdr->hdr_len));
1: +      return -ENOTSUP;
1: +    }
1: +    btf_bswap_hdr(hdr);
1: +  } else if (hdr->magic != BTF_MAGIC) {
1: +    pr_debug("Invalid BTF magic:%x\n", hdr->magic);
1: +    return -EINVAL;
1: +  }
1: +
1: +  meta_left = btf->raw_size - sizeof(*hdr);
1: +  if (meta_left < hdr->str_off + hdr->str_len) {
1: +    pr_debug("Invalid BTF total size:%u\n", btf->raw_size);
1: +    return -EINVAL;
1: +  }
1: +
1: +  if (hdr->type_off + hdr->type_len > hdr->str_off) {
1: +    pr_debug(
1: +        "Invalid BTF data sections layout: type data at %u + %u, strings data "
1: +        "at %u + %u\n",
1: +        hdr->type_off, hdr->type_len, hdr->str_off, hdr->str_len);
1: +    return -EINVAL;
1: +  }
1: +
1: +  if (hdr->type_off % 4) {
1: +    pr_debug("BTF type section is not aligned to 4 bytes\n");
1: +    return -EINVAL;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int btf_parse_str_sec(struct btf *btf) {
1: +  const struct btf_header *hdr = btf->hdr;
1: +  const char *start = btf->strs_data;
1: +  const char *end = start + btf->hdr->str_len;
1: +
1: +  if (btf->base_btf && hdr->str_len == 0)
1: +    return 0;
1: +  if (!hdr->str_len || hdr->str_len - 1 > BTF_MAX_STR_OFFSET || end[-1]) {
1: +    pr_debug("Invalid BTF string section\n");
1: +    return -EINVAL;
1: +  }
1: +  if (!btf->base_btf && start[0]) {
1: +    pr_debug("Invalid BTF string section\n");
1: +    return -EINVAL;
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int btf_type_size(const struct btf_type *t) {
1: +  const int base_size = sizeof(struct btf_type);
1: +  __u16 vlen = btf_vlen(t);
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_RESTRICT:
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_FUNC:
1: +  case BTF_KIND_FLOAT:
1: +    return base_size;
1: +  case BTF_KIND_INT:
1: +    return base_size + sizeof(__u32);
1: +  case BTF_KIND_ENUM:
1: +    return base_size + vlen * sizeof(struct btf_enum);
1: +  case BTF_KIND_ARRAY:
1: +    return base_size + sizeof(struct btf_array);
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION:
1: +    return base_size + vlen * sizeof(struct btf_member);
1: +  case BTF_KIND_FUNC_PROTO:
1: +    return base_size + vlen * sizeof(struct btf_param);
1: +  case BTF_KIND_VAR:
1: +    return base_size + sizeof(struct btf_var);
1: +  case BTF_KIND_DATASEC:
1: +    return base_size + vlen * sizeof(struct btf_var_secinfo);
1: +  default:
1: +    pr_debug("Unsupported BTF_KIND:%u\n", btf_kind(t));
1: +    return -EINVAL;
1: +  }
1: +}
1: +
1: +static void btf_bswap_type_base(struct btf_type *t) {
1: +  t->name_off = bswap_32(t->name_off);
1: +  t->info = bswap_32(t->info);
1: +  t->type = bswap_32(t->type);
1: +}
1: +
1: +static int btf_bswap_type_rest(struct btf_type *t) {
1: +  struct btf_var_secinfo *v;
1: +  struct btf_member *m;
1: +  struct btf_array *a;
1: +  struct btf_param *p;
1: +  struct btf_enum *e;
1: +  __u16 vlen = btf_vlen(t);
1: +  int i;
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_RESTRICT:
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_FUNC:
1: +  case BTF_KIND_FLOAT:
1: +    return 0;
1: +  case BTF_KIND_INT:
1: +    *(__u32 *)(t + 1) = bswap_32(*(__u32 *)(t + 1));
1: +    return 0;
1: +  case BTF_KIND_ENUM:
1: +    for (i = 0, e = btf_enum(t); i < vlen; i++, e++) {
1: +      e->name_off = bswap_32(e->name_off);
1: +      e->val = bswap_32(e->val);
1: +    }
1: +    return 0;
1: +  case BTF_KIND_ARRAY:
1: +    a = btf_array(t);
1: +    a->type = bswap_32(a->type);
1: +    a->index_type = bswap_32(a->index_type);
1: +    a->nelems = bswap_32(a->nelems);
1: +    return 0;
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION:
1: +    for (i = 0, m = btf_members(t); i < vlen; i++, m++) {
1: +      m->name_off = bswap_32(m->name_off);
1: +      m->type = bswap_32(m->type);
1: +      m->offset = bswap_32(m->offset);
1: +    }
1: +    return 0;
1: +  case BTF_KIND_FUNC_PROTO:
1: +    for (i = 0, p = btf_params(t); i < vlen; i++, p++) {
1: +      p->name_off = bswap_32(p->name_off);
1: +      p->type = bswap_32(p->type);
1: +    }
1: +    return 0;
1: +  case BTF_KIND_VAR:
1: +    btf_var(t)->linkage = bswap_32(btf_var(t)->linkage);
1: +    return 0;
1: +  case BTF_KIND_DATASEC:
1: +    for (i = 0, v = btf_var_secinfos(t); i < vlen; i++, v++) {
1: +      v->type = bswap_32(v->type);
1: +      v->offset = bswap_32(v->offset);
1: +      v->size = bswap_32(v->size);
1: +    }
1: +    return 0;
1: +  default:
1: +    pr_debug("Unsupported BTF_KIND:%u\n", btf_kind(t));
1: +    return -EINVAL;
1: +  }
1: +}
1: +
1: +static int btf_parse_type_sec(struct btf *btf) {
1: +  struct btf_header *hdr = btf->hdr;
1: +  void *next_type = btf->types_data;
1: +  void *end_type = next_type + hdr->type_len;
1: +  int err, type_size;
1: +
1: +  while (next_type + sizeof(struct btf_type) <= end_type) {
1: +    if (btf->swapped_endian)
1: +      btf_bswap_type_base(next_type);
1: +
1: +    type_size = btf_type_size(next_type);
1: +    if (type_size < 0)
1: +      return type_size;
1: +    if (next_type + type_size > end_type) {
1: +      pr_warn("BTF type [%d] is malformed\n", btf->start_id + btf->nr_types);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (btf->swapped_endian && btf_bswap_type_rest(next_type))
1: +      return -EINVAL;
1: +
1: +    err = btf_add_type_idx_entry(btf, next_type - btf->types_data);
1: +    if (err)
1: +      return err;
1: +
1: +    next_type += type_size;
1: +    btf->nr_types++;
1: +  }
1: +
1: +  if (next_type != end_type) {
1: +    pr_warn("BTF types data is malformed\n");
1: +    return -EINVAL;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +__u32 btf__get_nr_types(const struct btf *btf) {
1: +  return btf->start_id + btf->nr_types - 1;
1: +}
1: +
1: +const struct btf *btf__base_btf(const struct btf *btf) { return btf->base_btf; }
1:  
1:  /* internal helper returning non-const pointer to a type */
1: -struct btf_type *btf_type_by_id(struct btf *btf, __u32 type_id)
1: -{
1: -	if (type_id == 0)
1: -		return &btf_void;
1: -	if (type_id < btf->start_id)
1: -		return btf_type_by_id(btf->base_btf, type_id);
1: -	return btf->types_data + btf->type_offs[type_id - btf->start_id];
1: +struct btf_type *btf_type_by_id(struct btf *btf, __u32 type_id) {
1: +  if (type_id == 0)
1: +    return &btf_void;
1: +  if (type_id < btf->start_id)
1: +    return btf_type_by_id(btf->base_btf, type_id);
1: +  return btf->types_data + btf->type_offs[type_id - btf->start_id];
1:  }
1:  
1: -const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id)
1: -{
1: -	if (type_id >= btf->start_id + btf->nr_types)
1: -		return errno = EINVAL, NULL;
1: -	return btf_type_by_id((struct btf *)btf, type_id);
1: +const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id) {
1: +  if (type_id >= btf->start_id + btf->nr_types)
1: +    return errno = EINVAL, NULL;
1: +  return btf_type_by_id((struct btf *)btf, type_id);
1:  }
1:  
1: -static int determine_ptr_size(const struct btf *btf)
1: -{
1: -	const struct btf_type *t;
1: -	const char *name;
1: -	int i, n;
1: +static int determine_ptr_size(const struct btf *btf) {
1: +  const struct btf_type *t;
1: +  const char *name;
1: +  int i, n;
1:  
1: -	if (btf->base_btf && btf->base_btf->ptr_sz > 0)
1: -		return btf->base_btf->ptr_sz;
1: +  if (btf->base_btf && btf->base_btf->ptr_sz > 0)
1: +    return btf->base_btf->ptr_sz;
1:  
1: -	n = btf__get_nr_types(btf);
1: -	for (i = 1; i <= n; i++) {
1: -		t = btf__type_by_id(btf, i);
1: -		if (!btf_is_int(t))
1: -			continue;
1: +  n = btf__get_nr_types(btf);
1: +  for (i = 1; i <= n; i++) {
1: +    t = btf__type_by_id(btf, i);
1: +    if (!btf_is_int(t))
1: +      continue;
1:  
1: -		name = btf__name_by_offset(btf, t->name_off);
1: -		if (!name)
1: -			continue;
1: +    name = btf__name_by_offset(btf, t->name_off);
1: +    if (!name)
1: +      continue;
1:  
1: -		if (strcmp(name, "long int") == 0 ||
1: -		    strcmp(name, "long unsigned int") == 0) {
1: -			if (t->size != 4 && t->size != 8)
1: -				continue;
1: -			return t->size;
1: -		}
1: -	}
1: +    if (strcmp(name, "long int") == 0 ||
1: +        strcmp(name, "long unsigned int") == 0) {
1: +      if (t->size != 4 && t->size != 8)
1: +        continue;
1: +      return t->size;
1: +    }
1: +  }
1:  
1: -	return -1;
1: +  return -1;
1:  }
1:  
1: -static size_t btf_ptr_sz(const struct btf *btf)
1: -{
1: -	if (!btf->ptr_sz)
1: -		((struct btf *)btf)->ptr_sz = determine_ptr_size(btf);
1: -	return btf->ptr_sz < 0 ? sizeof(void *) : btf->ptr_sz;
1: +static size_t btf_ptr_sz(const struct btf *btf) {
1: +  if (!btf->ptr_sz)
1: +    ((struct btf *)btf)->ptr_sz = determine_ptr_size(btf);
1: +  return btf->ptr_sz < 0 ? sizeof(void *) : btf->ptr_sz;
1:  }
1:  
1:  /* Return pointer size this BTF instance assumes. The size is heuristically
1: @@ -492,1056 +480,1008 @@ static size_t btf_ptr_sz(const struct btf *btf)
1:   * architecture that libbpf was compiled for. It's possible to override
1:   * guessed value by using btf__set_pointer_size() API.
1:   */
1: -size_t btf__pointer_size(const struct btf *btf)
1: -{
1: -	if (!btf->ptr_sz)
1: -		((struct btf *)btf)->ptr_sz = determine_ptr_size(btf);
1: +size_t btf__pointer_size(const struct btf *btf) {
1: +  if (!btf->ptr_sz)
1: +    ((struct btf *)btf)->ptr_sz = determine_ptr_size(btf);
1:  
1: -	if (btf->ptr_sz < 0)
1: -		/* not enough BTF type info to guess */
1: -		return 0;
1: +  if (btf->ptr_sz < 0)
1: +    /* not enough BTF type info to guess */
1: +    return 0;
1:  
1: -	return btf->ptr_sz;
1: +  return btf->ptr_sz;
1:  }
1:  
1:  /* Override or set pointer size in bytes. Only values of 4 and 8 are
1:   * supported.
1:   */
1: -int btf__set_pointer_size(struct btf *btf, size_t ptr_sz)
1: -{
1: -	if (ptr_sz != 4 && ptr_sz != 8)
1: -		return libbpf_err(-EINVAL);
1: -	btf->ptr_sz = ptr_sz;
1: -	return 0;
1: +int btf__set_pointer_size(struct btf *btf, size_t ptr_sz) {
1: +  if (ptr_sz != 4 && ptr_sz != 8)
1: +    return libbpf_err(-EINVAL);
1: +  btf->ptr_sz = ptr_sz;
1: +  return 0;
1:  }
1:  
1: -static bool is_host_big_endian(void)
1: -{
1: +static bool is_host_big_endian(void) {
1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
1: -	return false;
1: +  return false;
1:  #elif __BYTE_ORDER == __BIG_ENDIAN
1: -	return true;
1: +  return true;
1:  #else
1: -# error "Unrecognized __BYTE_ORDER__"
1: +#error "Unrecognized __BYTE_ORDER__"
1:  #endif
1:  }
1:  
1: -enum btf_endianness btf__endianness(const struct btf *btf)
1: -{
1: -	if (is_host_big_endian())
1: -		return btf->swapped_endian ? BTF_LITTLE_ENDIAN : BTF_BIG_ENDIAN;
1: -	else
1: -		return btf->swapped_endian ? BTF_BIG_ENDIAN : BTF_LITTLE_ENDIAN;
1: +enum btf_endianness btf__endianness(const struct btf *btf) {
1: +  if (is_host_big_endian())
1: +    return btf->swapped_endian ? BTF_LITTLE_ENDIAN : BTF_BIG_ENDIAN;
1: +  else
1: +    return btf->swapped_endian ? BTF_BIG_ENDIAN : BTF_LITTLE_ENDIAN;
1:  }
1:  
1: -int btf__set_endianness(struct btf *btf, enum btf_endianness endian)
1: -{
1: -	if (endian != BTF_LITTLE_ENDIAN && endian != BTF_BIG_ENDIAN)
1: -		return libbpf_err(-EINVAL);
1: +int btf__set_endianness(struct btf *btf, enum btf_endianness endian) {
1: +  if (endian != BTF_LITTLE_ENDIAN && endian != BTF_BIG_ENDIAN)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	btf->swapped_endian = is_host_big_endian() != (endian == BTF_BIG_ENDIAN);
1: -	if (!btf->swapped_endian) {
1: -		free(btf->raw_data_swapped);
1: -		btf->raw_data_swapped = NULL;
1: -	}
1: -	return 0;
1: +  btf->swapped_endian = is_host_big_endian() != (endian == BTF_BIG_ENDIAN);
1: +  if (!btf->swapped_endian) {
1: +    free(btf->raw_data_swapped);
1: +    btf->raw_data_swapped = NULL;
1: +  }
1: +  return 0;
1:  }
1:  
1: -static bool btf_type_is_void(const struct btf_type *t)
1: -{
1: -	return t == &btf_void || btf_is_fwd(t);
1: +static bool btf_type_is_void(const struct btf_type *t) {
1: +  return t == &btf_void || btf_is_fwd(t);
1:  }
1:  
1: -static bool btf_type_is_void_or_null(const struct btf_type *t)
1: -{
1: -	return !t || btf_type_is_void(t);
1: +static bool btf_type_is_void_or_null(const struct btf_type *t) {
1: +  return !t || btf_type_is_void(t);
1:  }
1:  
1:  #define MAX_RESOLVE_DEPTH 32
1:  
1: -__s64 btf__resolve_size(const struct btf *btf, __u32 type_id)
1: -{
1: -	const struct btf_array *array;
1: -	const struct btf_type *t;
1: -	__u32 nelems = 1;
1: -	__s64 size = -1;
1: -	int i;
1: -
1: -	t = btf__type_by_id(btf, type_id);
1: -	for (i = 0; i < MAX_RESOLVE_DEPTH && !btf_type_is_void_or_null(t); i++) {
1: -		switch (btf_kind(t)) {
1: -		case BTF_KIND_INT:
1: -		case BTF_KIND_STRUCT:
1: -		case BTF_KIND_UNION:
1: -		case BTF_KIND_ENUM:
1: -		case BTF_KIND_DATASEC:
1: -		case BTF_KIND_FLOAT:
1: -			size = t->size;
1: -			goto done;
1: -		case BTF_KIND_PTR:
1: -			size = btf_ptr_sz(btf);
1: -			goto done;
1: -		case BTF_KIND_TYPEDEF:
1: -		case BTF_KIND_VOLATILE:
1: -		case BTF_KIND_CONST:
1: -		case BTF_KIND_RESTRICT:
1: -		case BTF_KIND_VAR:
1: -			type_id = t->type;
1: -			break;
1: -		case BTF_KIND_ARRAY:
1: -			array = btf_array(t);
1: -			if (nelems && array->nelems > UINT32_MAX / nelems)
1: -				return libbpf_err(-E2BIG);
1: -			nelems *= array->nelems;
1: -			type_id = array->type;
1: -			break;
1: -		default:
1: -			return libbpf_err(-EINVAL);
1: -		}
1: -
1: -		t = btf__type_by_id(btf, type_id);
1: -	}
1: +__s64 btf__resolve_size(const struct btf *btf, __u32 type_id) {
1: +  const struct btf_array *array;
1: +  const struct btf_type *t;
1: +  __u32 nelems = 1;
1: +  __s64 size = -1;
1: +  int i;
1: +
1: +  t = btf__type_by_id(btf, type_id);
1: +  for (i = 0; i < MAX_RESOLVE_DEPTH && !btf_type_is_void_or_null(t); i++) {
1: +    switch (btf_kind(t)) {
1: +    case BTF_KIND_INT:
1: +    case BTF_KIND_STRUCT:
1: +    case BTF_KIND_UNION:
1: +    case BTF_KIND_ENUM:
1: +    case BTF_KIND_DATASEC:
1: +    case BTF_KIND_FLOAT:
1: +      size = t->size;
1: +      goto done;
1: +    case BTF_KIND_PTR:
1: +      size = btf_ptr_sz(btf);
1: +      goto done;
1: +    case BTF_KIND_TYPEDEF:
1: +    case BTF_KIND_VOLATILE:
1: +    case BTF_KIND_CONST:
1: +    case BTF_KIND_RESTRICT:
1: +    case BTF_KIND_VAR:
1: +      type_id = t->type;
1: +      break;
1: +    case BTF_KIND_ARRAY:
1: +      array = btf_array(t);
1: +      if (nelems && array->nelems > UINT32_MAX / nelems)
1: +        return libbpf_err(-E2BIG);
1: +      nelems *= array->nelems;
1: +      type_id = array->type;
1: +      break;
1: +    default:
1: +      return libbpf_err(-EINVAL);
1: +    }
1: +
1: +    t = btf__type_by_id(btf, type_id);
1: +  }
1:  
1:  done:
1: -	if (size < 0)
1: -		return libbpf_err(-EINVAL);
1: -	if (nelems && size > UINT32_MAX / nelems)
1: -		return libbpf_err(-E2BIG);
1: -
1: -	return nelems * size;
1: -}
1: -
1: -int btf__align_of(const struct btf *btf, __u32 id)
1: -{
1: -	const struct btf_type *t = btf__type_by_id(btf, id);
1: -	__u16 kind = btf_kind(t);
1: -
1: -	switch (kind) {
1: -	case BTF_KIND_INT:
1: -	case BTF_KIND_ENUM:
1: -	case BTF_KIND_FLOAT:
1: -		return min(btf_ptr_sz(btf), (size_t)t->size);
1: -	case BTF_KIND_PTR:
1: -		return btf_ptr_sz(btf);
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_RESTRICT:
1: -		return btf__align_of(btf, t->type);
1: -	case BTF_KIND_ARRAY:
1: -		return btf__align_of(btf, btf_array(t)->type);
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION: {
1: -		const struct btf_member *m = btf_members(t);
1: -		__u16 vlen = btf_vlen(t);
1: -		int i, max_align = 1, align;
1: -
1: -		for (i = 0; i < vlen; i++, m++) {
1: -			align = btf__align_of(btf, m->type);
1: -			if (align <= 0)
1: -				return libbpf_err(align);
1: -			max_align = max(max_align, align);
1: -		}
1: -
1: -		return max_align;
1: -	}
1: -	default:
1: -		pr_warn("unsupported BTF_KIND:%u\n", btf_kind(t));
1: -		return errno = EINVAL, 0;
1: -	}
1: -}
1: -
1: -int btf__resolve_type(const struct btf *btf, __u32 type_id)
1: -{
1: -	const struct btf_type *t;
1: -	int depth = 0;
1: -
1: -	t = btf__type_by_id(btf, type_id);
1: -	while (depth < MAX_RESOLVE_DEPTH &&
1: -	       !btf_type_is_void_or_null(t) &&
1: -	       (btf_is_mod(t) || btf_is_typedef(t) || btf_is_var(t))) {
1: -		type_id = t->type;
1: -		t = btf__type_by_id(btf, type_id);
1: -		depth++;
1: -	}
1: -
1: -	if (depth == MAX_RESOLVE_DEPTH || btf_type_is_void_or_null(t))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	return type_id;
1: -}
1: -
1: -__s32 btf__find_by_name(const struct btf *btf, const char *type_name)
1: -{
1: -	__u32 i, nr_types = btf__get_nr_types(btf);
1: -
1: -	if (!strcmp(type_name, "void"))
1: -		return 0;
1: -
1: -	for (i = 1; i <= nr_types; i++) {
1: -		const struct btf_type *t = btf__type_by_id(btf, i);
1: -		const char *name = btf__name_by_offset(btf, t->name_off);
1: -
1: -		if (name && !strcmp(type_name, name))
1: -			return i;
1: -	}
1: -
1: -	return libbpf_err(-ENOENT);
1: +  if (size < 0)
1: +    return libbpf_err(-EINVAL);
1: +  if (nelems && size > UINT32_MAX / nelems)
1: +    return libbpf_err(-E2BIG);
1: +
1: +  return nelems * size;
1: +}
1: +
1: +int btf__align_of(const struct btf *btf, __u32 id) {
1: +  const struct btf_type *t = btf__type_by_id(btf, id);
1: +  __u16 kind = btf_kind(t);
1: +
1: +  switch (kind) {
1: +  case BTF_KIND_INT:
1: +  case BTF_KIND_ENUM:
1: +  case BTF_KIND_FLOAT:
1: +    return min(btf_ptr_sz(btf), (size_t)t->size);
1: +  case BTF_KIND_PTR:
1: +    return btf_ptr_sz(btf);
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_RESTRICT:
1: +    return btf__align_of(btf, t->type);
1: +  case BTF_KIND_ARRAY:
1: +    return btf__align_of(btf, btf_array(t)->type);
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION: {
1: +    const struct btf_member *m = btf_members(t);
1: +    __u16 vlen = btf_vlen(t);
1: +    int i, max_align = 1, align;
1: +
1: +    for (i = 0; i < vlen; i++, m++) {
1: +      align = btf__align_of(btf, m->type);
1: +      if (align <= 0)
1: +        return libbpf_err(align);
1: +      max_align = max(max_align, align);
1: +    }
1: +
1: +    return max_align;
1: +  }
1: +  default:
1: +    pr_warn("unsupported BTF_KIND:%u\n", btf_kind(t));
1: +    return errno = EINVAL, 0;
1: +  }
1: +}
1: +
1: +int btf__resolve_type(const struct btf *btf, __u32 type_id) {
1: +  const struct btf_type *t;
1: +  int depth = 0;
1: +
1: +  t = btf__type_by_id(btf, type_id);
1: +  while (depth < MAX_RESOLVE_DEPTH && !btf_type_is_void_or_null(t) &&
1: +         (btf_is_mod(t) || btf_is_typedef(t) || btf_is_var(t))) {
1: +    type_id = t->type;
1: +    t = btf__type_by_id(btf, type_id);
1: +    depth++;
1: +  }
1: +
1: +  if (depth == MAX_RESOLVE_DEPTH || btf_type_is_void_or_null(t))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  return type_id;
1: +}
1: +
1: +__s32 btf__find_by_name(const struct btf *btf, const char *type_name) {
1: +  __u32 i, nr_types = btf__get_nr_types(btf);
1: +
1: +  if (!strcmp(type_name, "void"))
1: +    return 0;
1: +
1: +  for (i = 1; i <= nr_types; i++) {
1: +    const struct btf_type *t = btf__type_by_id(btf, i);
1: +    const char *name = btf__name_by_offset(btf, t->name_off);
1: +
1: +    if (name && !strcmp(type_name, name))
1: +      return i;
1: +  }
1: +
1: +  return libbpf_err(-ENOENT);
1:  }
1:  
1:  __s32 btf__find_by_name_kind(const struct btf *btf, const char *type_name,
1: -			     __u32 kind)
1: -{
1: -	__u32 i, nr_types = btf__get_nr_types(btf);
1: -
1: -	if (kind == BTF_KIND_UNKN || !strcmp(type_name, "void"))
1: -		return 0;
1: +                             __u32 kind) {
1: +  __u32 i, nr_types = btf__get_nr_types(btf);
1: +
1: +  if (kind == BTF_KIND_UNKN || !strcmp(type_name, "void"))
1: +    return 0;
1: +
1: +  for (i = 1; i <= nr_types; i++) {
1: +    const struct btf_type *t = btf__type_by_id(btf, i);
1: +    const char *name;
1: +
1: +    if (btf_kind(t) != kind)
1: +      continue;
1: +    name = btf__name_by_offset(btf, t->name_off);
1: +    if (name && !strcmp(type_name, name))
1: +      return i;
1: +  }
1: +
1: +  return libbpf_err(-ENOENT);
1: +}
1: +
1: +static bool btf_is_modifiable(const struct btf *btf) {
1: +  return (void *)btf->hdr != btf->raw_data;
1: +}
1: +
1: +void btf__free(struct btf *btf) {
1: +  if (IS_ERR_OR_NULL(btf))
1: +    return;
1: +
1: +  if (btf->fd >= 0)
1: +    close(btf->fd);
1: +
1: +  if (btf_is_modifiable(btf)) {
1: +    /* if BTF was modified after loading, it will have a split
1: +     * in-memory representation for header, types, and strings
1: +     * sections, so we need to free all of them individually. It
1: +     * might still have a cached contiguous raw data present,
1: +     * which will be unconditionally freed below.
1: +     */
1: +    free(btf->hdr);
1: +    free(btf->types_data);
1: +    strset__free(btf->strs_set);
1: +  }
1: +  free(btf->raw_data);
1: +  free(btf->raw_data_swapped);
1: +  free(btf->type_offs);
1: +  free(btf);
1: +}
1: +
1: +static struct btf *btf_new_empty(struct btf *base_btf) {
1: +  struct btf *btf;
1: +
1: +  btf = calloc(1, sizeof(*btf));
1: +  if (!btf)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  btf->nr_types = 0;
1: +  btf->start_id = 1;
1: +  btf->start_str_off = 0;
1: +  btf->fd = -1;
1: +  btf->ptr_sz = sizeof(void *);
1: +  btf->swapped_endian = false;
1:  
1: -	for (i = 1; i <= nr_types; i++) {
1: -		const struct btf_type *t = btf__type_by_id(btf, i);
1: -		const char *name;
1: +  if (base_btf) {
1: +    btf->base_btf = base_btf;
1: +    btf->start_id = btf__get_nr_types(base_btf) + 1;
1: +    btf->start_str_off = base_btf->hdr->str_len;
1: +  }
1:  
1: -		if (btf_kind(t) != kind)
1: -			continue;
1: -		name = btf__name_by_offset(btf, t->name_off);
1: -		if (name && !strcmp(type_name, name))
1: -			return i;
1: -	}
1: -
1: -	return libbpf_err(-ENOENT);
1: -}
1: -
1: -static bool btf_is_modifiable(const struct btf *btf)
1: -{
1: -	return (void *)btf->hdr != btf->raw_data;
1: -}
1: -
1: -void btf__free(struct btf *btf)
1: -{
1: -	if (IS_ERR_OR_NULL(btf))
1: -		return;
1: -
1: -	if (btf->fd >= 0)
1: -		close(btf->fd);
1: -
1: -	if (btf_is_modifiable(btf)) {
1: -		/* if BTF was modified after loading, it will have a split
1: -		 * in-memory representation for header, types, and strings
1: -		 * sections, so we need to free all of them individually. It
1: -		 * might still have a cached contiguous raw data present,
1: -		 * which will be unconditionally freed below.
1: -		 */
1: -		free(btf->hdr);
1: -		free(btf->types_data);
1: -		strset__free(btf->strs_set);
1: -	}
1: -	free(btf->raw_data);
1: -	free(btf->raw_data_swapped);
1: -	free(btf->type_offs);
1: -	free(btf);
1: -}
1: -
1: -static struct btf *btf_new_empty(struct btf *base_btf)
1: -{
1: -	struct btf *btf;
1: -
1: -	btf = calloc(1, sizeof(*btf));
1: -	if (!btf)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	btf->nr_types = 0;
1: -	btf->start_id = 1;
1: -	btf->start_str_off = 0;
1: -	btf->fd = -1;
1: -	btf->ptr_sz = sizeof(void *);
1: -	btf->swapped_endian = false;
1: -
1: -	if (base_btf) {
1: -		btf->base_btf = base_btf;
1: -		btf->start_id = btf__get_nr_types(base_btf) + 1;
1: -		btf->start_str_off = base_btf->hdr->str_len;
1: -	}
1: -
1: -	/* +1 for empty string at offset 0 */
1: -	btf->raw_size = sizeof(struct btf_header) + (base_btf ? 0 : 1);
1: -	btf->raw_data = calloc(1, btf->raw_size);
1: -	if (!btf->raw_data) {
1: -		free(btf);
1: -		return ERR_PTR(-ENOMEM);
1: -	}
1: -
1: -	btf->hdr = btf->raw_data;
1: -	btf->hdr->hdr_len = sizeof(struct btf_header);
1: -	btf->hdr->magic = BTF_MAGIC;
1: -	btf->hdr->version = BTF_VERSION;
1: -
1: -	btf->types_data = btf->raw_data + btf->hdr->hdr_len;
1: -	btf->strs_data = btf->raw_data + btf->hdr->hdr_len;
1: -	btf->hdr->str_len = base_btf ? 0 : 1; /* empty string at offset 0 */
1: -
1: -	return btf;
1: -}
1: -
1: -struct btf *btf__new_empty(void)
1: -{
1: -	return libbpf_ptr(btf_new_empty(NULL));
1: -}
1: -
1: -struct btf *btf__new_empty_split(struct btf *base_btf)
1: -{
1: -	return libbpf_ptr(btf_new_empty(base_btf));
1: -}
1: -
1: -static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf)
1: -{
1: -	struct btf *btf;
1: -	int err;
1: -
1: -	btf = calloc(1, sizeof(struct btf));
1: -	if (!btf)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	btf->nr_types = 0;
1: -	btf->start_id = 1;
1: -	btf->start_str_off = 0;
1: -
1: -	if (base_btf) {
1: -		btf->base_btf = base_btf;
1: -		btf->start_id = btf__get_nr_types(base_btf) + 1;
1: -		btf->start_str_off = base_btf->hdr->str_len;
1: -	}
1: -
1: -	btf->raw_data = malloc(size);
1: -	if (!btf->raw_data) {
1: -		err = -ENOMEM;
1: -		goto done;
1: -	}
1: -	memcpy(btf->raw_data, data, size);
1: -	btf->raw_size = size;
1: -
1: -	btf->hdr = btf->raw_data;
1: -	err = btf_parse_hdr(btf);
1: -	if (err)
1: -		goto done;
1: -
1: -	btf->strs_data = btf->raw_data + btf->hdr->hdr_len + btf->hdr->str_off;
1: -	btf->types_data = btf->raw_data + btf->hdr->hdr_len + btf->hdr->type_off;
1: -
1: -	err = btf_parse_str_sec(btf);
1: -	err = err ?: btf_parse_type_sec(btf);
1: -	if (err)
1: -		goto done;
1: -
1: -	btf->fd = -1;
1: +  /* +1 for empty string at offset 0 */
1: +  btf->raw_size = sizeof(struct btf_header) + (base_btf ? 0 : 1);
1: +  btf->raw_data = calloc(1, btf->raw_size);
1: +  if (!btf->raw_data) {
1: +    free(btf);
1: +    return ERR_PTR(-ENOMEM);
1: +  }
1: +
1: +  btf->hdr = btf->raw_data;
1: +  btf->hdr->hdr_len = sizeof(struct btf_header);
1: +  btf->hdr->magic = BTF_MAGIC;
1: +  btf->hdr->version = BTF_VERSION;
1: +
1: +  btf->types_data = btf->raw_data + btf->hdr->hdr_len;
1: +  btf->strs_data = btf->raw_data + btf->hdr->hdr_len;
1: +  btf->hdr->str_len = base_btf ? 0 : 1; /* empty string at offset 0 */
1: +
1: +  return btf;
1: +}
1: +
1: +struct btf *btf__new_empty(void) {
1: +  return libbpf_ptr(btf_new_empty(NULL));
1: +}
1: +
1: +struct btf *btf__new_empty_split(struct btf *base_btf) {
1: +  return libbpf_ptr(btf_new_empty(base_btf));
1: +}
1: +
1: +static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) {
1: +  struct btf *btf;
1: +  int err;
1: +
1: +  btf = calloc(1, sizeof(struct btf));
1: +  if (!btf)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  btf->nr_types = 0;
1: +  btf->start_id = 1;
1: +  btf->start_str_off = 0;
1: +
1: +  if (base_btf) {
1: +    btf->base_btf = base_btf;
1: +    btf->start_id = btf__get_nr_types(base_btf) + 1;
1: +    btf->start_str_off = base_btf->hdr->str_len;
1: +  }
1: +
1: +  btf->raw_data = malloc(size);
1: +  if (!btf->raw_data) {
1: +    err = -ENOMEM;
1: +    goto done;
1: +  }
1: +  memcpy(btf->raw_data, data, size);
1: +  btf->raw_size = size;
1: +
1: +  btf->hdr = btf->raw_data;
1: +  err = btf_parse_hdr(btf);
1: +  if (err)
1: +    goto done;
1: +
1: +  btf->strs_data = btf->raw_data + btf->hdr->hdr_len + btf->hdr->str_off;
1: +  btf->types_data = btf->raw_data + btf->hdr->hdr_len + btf->hdr->type_off;
1: +
1: +  err = btf_parse_str_sec(btf);
1: +  err = err ?: btf_parse_type_sec(btf);
1: +  if (err)
1: +    goto done;
1: +
1: +  btf->fd = -1;
1:  
1:  done:
1: -	if (err) {
1: -		btf__free(btf);
1: -		return ERR_PTR(err);
1: -	}
1: +  if (err) {
1: +    btf__free(btf);
1: +    return ERR_PTR(err);
1: +  }
1:  
1: -	return btf;
1: +  return btf;
1:  }
1:  
1: -struct btf *btf__new(const void *data, __u32 size)
1: -{
1: -	return libbpf_ptr(btf_new(data, size, NULL));
1: +struct btf *btf__new(const void *data, __u32 size) {
1: +  return libbpf_ptr(btf_new(data, size, NULL));
1:  }
1:  
1:  static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
1: -				 struct btf_ext **btf_ext)
1: -{
1: -	Elf_Data *btf_data = NULL, *btf_ext_data = NULL;
1: -	int err = 0, fd = -1, idx = 0;
1: -	struct btf *btf = NULL;
1: -	Elf_Scn *scn = NULL;
1: -	Elf *elf = NULL;
1: -	GElf_Ehdr ehdr;
1: -	size_t shstrndx;
1: -
1: -	if (elf_version(EV_CURRENT) == EV_NONE) {
1: -		pr_warn("failed to init libelf for %s\n", path);
1: -		return ERR_PTR(-LIBBPF_ERRNO__LIBELF);
1: -	}
1: -
1: -	fd = open(path, O_RDONLY);
1: -	if (fd < 0) {
1: -		err = -errno;
1: -		pr_warn("failed to open %s: %s\n", path, strerror(errno));
1: -		return ERR_PTR(err);
1: -	}
1: -
1: -	err = -LIBBPF_ERRNO__FORMAT;
1: -
1: -	elf = elf_begin(fd, ELF_C_READ, NULL);
1: -	if (!elf) {
1: -		pr_warn("failed to open %s as ELF file\n", path);
1: -		goto done;
1: -	}
1: -	if (!gelf_getehdr(elf, &ehdr)) {
1: -		pr_warn("failed to get EHDR from %s\n", path);
1: -		goto done;
1: -	}
1: -
1: -	if (elf_getshdrstrndx(elf, &shstrndx)) {
1: -		pr_warn("failed to get section names section index for %s\n",
1: -			path);
1: -		goto done;
1: -	}
1: -
1: -	if (!elf_rawdata(elf_getscn(elf, shstrndx), NULL)) {
1: -		pr_warn("failed to get e_shstrndx from %s\n", path);
1: -		goto done;
1: -	}
1: -
1: -	while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: -		GElf_Shdr sh;
1: -		char *name;
1: -
1: -		idx++;
1: -		if (gelf_getshdr(scn, &sh) != &sh) {
1: -			pr_warn("failed to get section(%d) header from %s\n",
1: -				idx, path);
1: -			goto done;
1: -		}
1: -		name = elf_strptr(elf, shstrndx, sh.sh_name);
1: -		if (!name) {
1: -			pr_warn("failed to get section(%d) name from %s\n",
1: -				idx, path);
1: -			goto done;
1: -		}
1: -		if (strcmp(name, BTF_ELF_SEC) == 0) {
1: -			btf_data = elf_getdata(scn, 0);
1: -			if (!btf_data) {
1: -				pr_warn("failed to get section(%d, %s) data from %s\n",
1: -					idx, name, path);
1: -				goto done;
1: -			}
1: -			continue;
1: -		} else if (btf_ext && strcmp(name, BTF_EXT_ELF_SEC) == 0) {
1: -			btf_ext_data = elf_getdata(scn, 0);
1: -			if (!btf_ext_data) {
1: -				pr_warn("failed to get section(%d, %s) data from %s\n",
1: -					idx, name, path);
1: -				goto done;
1: -			}
1: -			continue;
1: -		}
1: -	}
1: -
1: -	err = 0;
1: -
1: -	if (!btf_data) {
1: -		err = -ENOENT;
1: -		goto done;
1: -	}
1: -	btf = btf_new(btf_data->d_buf, btf_data->d_size, base_btf);
1: -	err = libbpf_get_error(btf);
1: -	if (err)
1: -		goto done;
1: -
1: -	switch (gelf_getclass(elf)) {
1: -	case ELFCLASS32:
1: -		btf__set_pointer_size(btf, 4);
1: -		break;
1: -	case ELFCLASS64:
1: -		btf__set_pointer_size(btf, 8);
1: -		break;
1: -	default:
1: -		pr_warn("failed to get ELF class (bitness) for %s\n", path);
1: -		break;
1: -	}
1: -
1: -	if (btf_ext && btf_ext_data) {
1: -		*btf_ext = btf_ext__new(btf_ext_data->d_buf, btf_ext_data->d_size);
1: -		err = libbpf_get_error(*btf_ext);
1: -		if (err)
1: -			goto done;
1: -	} else if (btf_ext) {
1: -		*btf_ext = NULL;
1: -	}
1: +                                 struct btf_ext **btf_ext) {
1: +  Elf_Data *btf_data = NULL, *btf_ext_data = NULL;
1: +  int err = 0, fd = -1, idx = 0;
1: +  struct btf *btf = NULL;
1: +  Elf_Scn *scn = NULL;
1: +  Elf *elf = NULL;
1: +  GElf_Ehdr ehdr;
1: +  size_t shstrndx;
1: +
1: +  if (elf_version(EV_CURRENT) == EV_NONE) {
1: +    pr_warn("failed to init libelf for %s\n", path);
1: +    return ERR_PTR(-LIBBPF_ERRNO__LIBELF);
1: +  }
1: +
1: +  fd = open(path, O_RDONLY);
1: +  if (fd < 0) {
1: +    err = -errno;
1: +    pr_warn("failed to open %s: %s\n", path, strerror(errno));
1: +    return ERR_PTR(err);
1: +  }
1: +
1: +  err = -LIBBPF_ERRNO__FORMAT;
1: +
1: +  elf = elf_begin(fd, ELF_C_READ, NULL);
1: +  if (!elf) {
1: +    pr_warn("failed to open %s as ELF file\n", path);
1: +    goto done;
1: +  }
1: +  if (!gelf_getehdr(elf, &ehdr)) {
1: +    pr_warn("failed to get EHDR from %s\n", path);
1: +    goto done;
1: +  }
1: +
1: +  if (elf_getshdrstrndx(elf, &shstrndx)) {
1: +    pr_warn("failed to get section names section index for %s\n", path);
1: +    goto done;
1: +  }
1: +
1: +  if (!elf_rawdata(elf_getscn(elf, shstrndx), NULL)) {
1: +    pr_warn("failed to get e_shstrndx from %s\n", path);
1: +    goto done;
1: +  }
1: +
1: +  while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: +    GElf_Shdr sh;
1: +    char *name;
1: +
1: +    idx++;
1: +    if (gelf_getshdr(scn, &sh) != &sh) {
1: +      pr_warn("failed to get section(%d) header from %s\n", idx, path);
1: +      goto done;
1: +    }
1: +    name = elf_strptr(elf, shstrndx, sh.sh_name);
1: +    if (!name) {
1: +      pr_warn("failed to get section(%d) name from %s\n", idx, path);
1: +      goto done;
1: +    }
1: +    if (strcmp(name, BTF_ELF_SEC) == 0) {
1: +      btf_data = elf_getdata(scn, 0);
1: +      if (!btf_data) {
1: +        pr_warn("failed to get section(%d, %s) data from %s\n", idx, name,
1: +                path);
1: +        goto done;
1: +      }
1: +      continue;
1: +    } else if (btf_ext && strcmp(name, BTF_EXT_ELF_SEC) == 0) {
1: +      btf_ext_data = elf_getdata(scn, 0);
1: +      if (!btf_ext_data) {
1: +        pr_warn("failed to get section(%d, %s) data from %s\n", idx, name,
1: +                path);
1: +        goto done;
1: +      }
1: +      continue;
1: +    }
1: +  }
1: +
1: +  err = 0;
1: +
1: +  if (!btf_data) {
1: +    err = -ENOENT;
1: +    goto done;
1: +  }
1: +  btf = btf_new(btf_data->d_buf, btf_data->d_size, base_btf);
1: +  err = libbpf_get_error(btf);
1: +  if (err)
1: +    goto done;
1: +
1: +  switch (gelf_getclass(elf)) {
1: +  case ELFCLASS32:
1: +    btf__set_pointer_size(btf, 4);
1: +    break;
1: +  case ELFCLASS64:
1: +    btf__set_pointer_size(btf, 8);
1: +    break;
1: +  default:
1: +    pr_warn("failed to get ELF class (bitness) for %s\n", path);
1: +    break;
1: +  }
1: +
1: +  if (btf_ext && btf_ext_data) {
1: +    *btf_ext = btf_ext__new(btf_ext_data->d_buf, btf_ext_data->d_size);
1: +    err = libbpf_get_error(*btf_ext);
1: +    if (err)
1: +      goto done;
1: +  } else if (btf_ext) {
1: +    *btf_ext = NULL;
1: +  }
1:  done:
1: -	if (elf)
1: -		elf_end(elf);
1: -	close(fd);
1: -
1: -	if (!err)
1: -		return btf;
1: -
1: -	if (btf_ext)
1: -		btf_ext__free(*btf_ext);
1: -	btf__free(btf);
1: -
1: -	return ERR_PTR(err);
1: -}
1: -
1: -struct btf *btf__parse_elf(const char *path, struct btf_ext **btf_ext)
1: -{
1: -	return libbpf_ptr(btf_parse_elf(path, NULL, btf_ext));
1: -}
1: -
1: -struct btf *btf__parse_elf_split(const char *path, struct btf *base_btf)
1: -{
1: -	return libbpf_ptr(btf_parse_elf(path, base_btf, NULL));
1: -}
1: -
1: -static struct btf *btf_parse_raw(const char *path, struct btf *base_btf)
1: -{
1: -	struct btf *btf = NULL;
1: -	void *data = NULL;
1: -	FILE *f = NULL;
1: -	__u16 magic;
1: -	int err = 0;
1: -	long sz;
1: -
1: -	f = fopen(path, "rb");
1: -	if (!f) {
1: -		err = -errno;
1: -		goto err_out;
1: -	}
1: -
1: -	/* check BTF magic */
1: -	if (fread(&magic, 1, sizeof(magic), f) < sizeof(magic)) {
1: -		err = -EIO;
1: -		goto err_out;
1: -	}
1: -	if (magic != BTF_MAGIC && magic != bswap_16(BTF_MAGIC)) {
1: -		/* definitely not a raw BTF */
1: -		err = -EPROTO;
1: -		goto err_out;
1: -	}
1: -
1: -	/* get file size */
1: -	if (fseek(f, 0, SEEK_END)) {
1: -		err = -errno;
1: -		goto err_out;
1: -	}
1: -	sz = ftell(f);
1: -	if (sz < 0) {
1: -		err = -errno;
1: -		goto err_out;
1: -	}
1: -	/* rewind to the start */
1: -	if (fseek(f, 0, SEEK_SET)) {
1: -		err = -errno;
1: -		goto err_out;
1: -	}
1: -
1: -	/* pre-alloc memory and read all of BTF data */
1: -	data = malloc(sz);
1: -	if (!data) {
1: -		err = -ENOMEM;
1: -		goto err_out;
1: -	}
1: -	if (fread(data, 1, sz, f) < sz) {
1: -		err = -EIO;
1: -		goto err_out;
1: -	}
1: -
1: -	/* finally parse BTF data */
1: -	btf = btf_new(data, sz, base_btf);
1: +  if (elf)
1: +    elf_end(elf);
1: +  close(fd);
1: +
1: +  if (!err)
1: +    return btf;
1: +
1: +  if (btf_ext)
1: +    btf_ext__free(*btf_ext);
1: +  btf__free(btf);
1: +
1: +  return ERR_PTR(err);
1: +}
1: +
1: +struct btf *btf__parse_elf(const char *path, struct btf_ext **btf_ext) {
1: +  return libbpf_ptr(btf_parse_elf(path, NULL, btf_ext));
1: +}
1: +
1: +struct btf *btf__parse_elf_split(const char *path, struct btf *base_btf) {
1: +  return libbpf_ptr(btf_parse_elf(path, base_btf, NULL));
1: +}
1: +
1: +static struct btf *btf_parse_raw(const char *path, struct btf *base_btf) {
1: +  struct btf *btf = NULL;
1: +  void *data = NULL;
1: +  FILE *f = NULL;
1: +  __u16 magic;
1: +  int err = 0;
1: +  long sz;
1: +
1: +  f = fopen(path, "rb");
1: +  if (!f) {
1: +    err = -errno;
1: +    goto err_out;
1: +  }
1: +
1: +  /* check BTF magic */
1: +  if (fread(&magic, 1, sizeof(magic), f) < sizeof(magic)) {
1: +    err = -EIO;
1: +    goto err_out;
1: +  }
1: +  if (magic != BTF_MAGIC && magic != bswap_16(BTF_MAGIC)) {
1: +    /* definitely not a raw BTF */
1: +    err = -EPROTO;
1: +    goto err_out;
1: +  }
1: +
1: +  /* get file size */
1: +  if (fseek(f, 0, SEEK_END)) {
1: +    err = -errno;
1: +    goto err_out;
1: +  }
1: +  sz = ftell(f);
1: +  if (sz < 0) {
1: +    err = -errno;
1: +    goto err_out;
1: +  }
1: +  /* rewind to the start */
1: +  if (fseek(f, 0, SEEK_SET)) {
1: +    err = -errno;
1: +    goto err_out;
1: +  }
1: +
1: +  /* pre-alloc memory and read all of BTF data */
1: +  data = malloc(sz);
1: +  if (!data) {
1: +    err = -ENOMEM;
1: +    goto err_out;
1: +  }
1: +  if (fread(data, 1, sz, f) < sz) {
1: +    err = -EIO;
1: +    goto err_out;
1: +  }
1: +
1: +  /* finally parse BTF data */
1: +  btf = btf_new(data, sz, base_btf);
1:  
1:  err_out:
1: -	free(data);
1: -	if (f)
1: -		fclose(f);
1: -	return err ? ERR_PTR(err) : btf;
1: +  free(data);
1: +  if (f)
1: +    fclose(f);
1: +  return err ? ERR_PTR(err) : btf;
1:  }
1:  
1: -struct btf *btf__parse_raw(const char *path)
1: -{
1: -	return libbpf_ptr(btf_parse_raw(path, NULL));
1: +struct btf *btf__parse_raw(const char *path) {
1: +  return libbpf_ptr(btf_parse_raw(path, NULL));
1:  }
1:  
1: -struct btf *btf__parse_raw_split(const char *path, struct btf *base_btf)
1: -{
1: -	return libbpf_ptr(btf_parse_raw(path, base_btf));
1: +struct btf *btf__parse_raw_split(const char *path, struct btf *base_btf) {
1: +  return libbpf_ptr(btf_parse_raw(path, base_btf));
1:  }
1:  
1: -static struct btf *btf_parse(const char *path, struct btf *base_btf, struct btf_ext **btf_ext)
1: -{
1: -	struct btf *btf;
1: -	int err;
1: +static struct btf *btf_parse(const char *path, struct btf *base_btf,
1: +                             struct btf_ext **btf_ext) {
1: +  struct btf *btf;
1: +  int err;
1:  
1: -	if (btf_ext)
1: -		*btf_ext = NULL;
1: +  if (btf_ext)
1: +    *btf_ext = NULL;
1:  
1: -	btf = btf_parse_raw(path, base_btf);
1: -	err = libbpf_get_error(btf);
1: -	if (!err)
1: -		return btf;
1: -	if (err != -EPROTO)
1: -		return ERR_PTR(err);
1: -	return btf_parse_elf(path, base_btf, btf_ext);
1: +  btf = btf_parse_raw(path, base_btf);
1: +  err = libbpf_get_error(btf);
1: +  if (!err)
1: +    return btf;
1: +  if (err != -EPROTO)
1: +    return ERR_PTR(err);
1: +  return btf_parse_elf(path, base_btf, btf_ext);
1:  }
1:  
1: -struct btf *btf__parse(const char *path, struct btf_ext **btf_ext)
1: -{
1: -	return libbpf_ptr(btf_parse(path, NULL, btf_ext));
1: +struct btf *btf__parse(const char *path, struct btf_ext **btf_ext) {
1: +  return libbpf_ptr(btf_parse(path, NULL, btf_ext));
1:  }
1:  
1: -struct btf *btf__parse_split(const char *path, struct btf *base_btf)
1: -{
1: -	return libbpf_ptr(btf_parse(path, base_btf, NULL));
1: +struct btf *btf__parse_split(const char *path, struct btf *base_btf) {
1: +  return libbpf_ptr(btf_parse(path, base_btf, NULL));
1:  }
1:  
1: -static int compare_vsi_off(const void *_a, const void *_b)
1: -{
1: -	const struct btf_var_secinfo *a = _a;
1: -	const struct btf_var_secinfo *b = _b;
1: +static int compare_vsi_off(const void *_a, const void *_b) {
1: +  const struct btf_var_secinfo *a = _a;
1: +  const struct btf_var_secinfo *b = _b;
1:  
1: -	return a->offset - b->offset;
1: +  return a->offset - b->offset;
1:  }
1:  
1:  static int btf_fixup_datasec(struct bpf_object *obj, struct btf *btf,
1: -			     struct btf_type *t)
1: -{
1: -	__u32 size = 0, off = 0, i, vars = btf_vlen(t);
1: -	const char *name = btf__name_by_offset(btf, t->name_off);
1: -	const struct btf_type *t_var;
1: -	struct btf_var_secinfo *vsi;
1: -	const struct btf_var *var;
1: -	int ret;
1: -
1: -	if (!name) {
1: -		pr_debug("No name found in string section for DATASEC kind.\n");
1: -		return -ENOENT;
1: -	}
1: -
1: -	/* .extern datasec size and var offsets were set correctly during
1: -	 * extern collection step, so just skip straight to sorting variables
1: -	 */
1: -	if (t->size)
1: -		goto sort_vars;
1: -
1: -	ret = bpf_object__section_size(obj, name, &size);
1: -	if (ret || !size || (t->size && t->size != size)) {
1: -		pr_debug("Invalid size for section %s: %u bytes\n", name, size);
1: -		return -ENOENT;
1: -	}
1: -
1: -	t->size = size;
1: -
1: -	for (i = 0, vsi = btf_var_secinfos(t); i < vars; i++, vsi++) {
1: -		t_var = btf__type_by_id(btf, vsi->type);
1: -		var = btf_var(t_var);
1: -
1: -		if (!btf_is_var(t_var)) {
1: -			pr_debug("Non-VAR type seen in section %s\n", name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (var->linkage == BTF_VAR_STATIC)
1: -			continue;
1: -
1: -		name = btf__name_by_offset(btf, t_var->name_off);
1: -		if (!name) {
1: -			pr_debug("No name found in string section for VAR kind\n");
1: -			return -ENOENT;
1: -		}
1: -
1: -		ret = bpf_object__variable_offset(obj, name, &off);
1: -		if (ret) {
1: -			pr_debug("No offset found in symbol table for VAR %s\n",
1: -				 name);
1: -			return -ENOENT;
1: -		}
1: -
1: -		vsi->offset = off;
1: -	}
1: +                             struct btf_type *t) {
1: +  __u32 size = 0, off = 0, i, vars = btf_vlen(t);
1: +  const char *name = btf__name_by_offset(btf, t->name_off);
1: +  const struct btf_type *t_var;
1: +  struct btf_var_secinfo *vsi;
1: +  const struct btf_var *var;
1: +  int ret;
1: +
1: +  if (!name) {
1: +    pr_debug("No name found in string section for DATASEC kind.\n");
1: +    return -ENOENT;
1: +  }
1: +
1: +  /* .extern datasec size and var offsets were set correctly during
1: +   * extern collection step, so just skip straight to sorting variables
1: +   */
1: +  if (t->size)
1: +    goto sort_vars;
1: +
1: +  ret = bpf_object__section_size(obj, name, &size);
1: +  if (ret || !size || (t->size && t->size != size)) {
1: +    pr_debug("Invalid size for section %s: %u bytes\n", name, size);
1: +    return -ENOENT;
1: +  }
1: +
1: +  t->size = size;
1: +
1: +  for (i = 0, vsi = btf_var_secinfos(t); i < vars; i++, vsi++) {
1: +    t_var = btf__type_by_id(btf, vsi->type);
1: +    var = btf_var(t_var);
1: +
1: +    if (!btf_is_var(t_var)) {
1: +      pr_debug("Non-VAR type seen in section %s\n", name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (var->linkage == BTF_VAR_STATIC)
1: +      continue;
1: +
1: +    name = btf__name_by_offset(btf, t_var->name_off);
1: +    if (!name) {
1: +      pr_debug("No name found in string section for VAR kind\n");
1: +      return -ENOENT;
1: +    }
1: +
1: +    ret = bpf_object__variable_offset(obj, name, &off);
1: +    if (ret) {
1: +      pr_debug("No offset found in symbol table for VAR %s\n", name);
1: +      return -ENOENT;
1: +    }
1: +
1: +    vsi->offset = off;
1: +  }
1:  
1:  sort_vars:
1: -	qsort(btf_var_secinfos(t), vars, sizeof(*vsi), compare_vsi_off);
1: -	return 0;
1: +  qsort(btf_var_secinfos(t), vars, sizeof(*vsi), compare_vsi_off);
1: +  return 0;
1:  }
1:  
1: -int btf__finalize_data(struct bpf_object *obj, struct btf *btf)
1: -{
1: -	int err = 0;
1: -	__u32 i;
1: +int btf__finalize_data(struct bpf_object *obj, struct btf *btf) {
1: +  int err = 0;
1: +  __u32 i;
1:  
1: -	for (i = 1; i <= btf->nr_types; i++) {
1: -		struct btf_type *t = btf_type_by_id(btf, i);
1: +  for (i = 1; i <= btf->nr_types; i++) {
1: +    struct btf_type *t = btf_type_by_id(btf, i);
1:  
1: -		/* Loader needs to fix up some of the things compiler
1: -		 * couldn't get its hands on while emitting BTF. This
1: -		 * is section size and global variable offset. We use
1: -		 * the info from the ELF itself for this purpose.
1: -		 */
1: -		if (btf_is_datasec(t)) {
1: -			err = btf_fixup_datasec(obj, btf, t);
1: -			if (err)
1: -				break;
1: -		}
1: -	}
1: +    /* Loader needs to fix up some of the things compiler
1: +     * couldn't get its hands on while emitting BTF. This
1: +     * is section size and global variable offset. We use
1: +     * the info from the ELF itself for this purpose.
1: +     */
1: +    if (btf_is_datasec(t)) {
1: +      err = btf_fixup_datasec(obj, btf, t);
1: +      if (err)
1: +        break;
1: +    }
1: +  }
1:  
1: -	return libbpf_err(err);
1: +  return libbpf_err(err);
1:  }
1:  
1: -static void *btf_get_raw_data(const struct btf *btf, __u32 *size, bool swap_endian);
1: +static void *btf_get_raw_data(const struct btf *btf, __u32 *size,
1: +                              bool swap_endian);
1:  
1: -int btf__load(struct btf *btf)
1: -{
1: -	__u32 log_buf_size = 0, raw_size;
1: -	char *log_buf = NULL;
1: -	void *raw_data;
1: -	int err = 0;
1: +int btf__load(struct btf *btf) {
1: +  __u32 log_buf_size = 0, raw_size;
1: +  char *log_buf = NULL;
1: +  void *raw_data;
1: +  int err = 0;
1:  
1: -	if (btf->fd >= 0)
1: -		return libbpf_err(-EEXIST);
1: +  if (btf->fd >= 0)
1: +    return libbpf_err(-EEXIST);
1:  
1:  retry_load:
1: -	if (log_buf_size) {
1: -		log_buf = malloc(log_buf_size);
1: -		if (!log_buf)
1: -			return libbpf_err(-ENOMEM);
1: -
1: -		*log_buf = 0;
1: -	}
1: -
1: -	raw_data = btf_get_raw_data(btf, &raw_size, false);
1: -	if (!raw_data) {
1: -		err = -ENOMEM;
1: -		goto done;
1: -	}
1: -	/* cache native raw data representation */
1: -	btf->raw_size = raw_size;
1: -	btf->raw_data = raw_data;
1: -
1: -	btf->fd = bpf_load_btf(raw_data, raw_size, log_buf, log_buf_size, false);
1: -	if (btf->fd < 0) {
1: -		if (!log_buf || errno == ENOSPC) {
1: -			log_buf_size = max((__u32)BPF_LOG_BUF_SIZE,
1: -					   log_buf_size << 1);
1: -			free(log_buf);
1: -			goto retry_load;
1: -		}
1: -
1: -		err = -errno;
1: -		pr_warn("Error loading BTF: %s(%d)\n", strerror(errno), errno);
1: -		if (*log_buf)
1: -			pr_warn("%s\n", log_buf);
1: -		goto done;
1: -	}
1: +  if (log_buf_size) {
1: +    log_buf = malloc(log_buf_size);
1: +    if (!log_buf)
1: +      return libbpf_err(-ENOMEM);
1: +
1: +    *log_buf = 0;
1: +  }
1: +
1: +  raw_data = btf_get_raw_data(btf, &raw_size, false);
1: +  if (!raw_data) {
1: +    err = -ENOMEM;
1: +    goto done;
1: +  }
1: +  /* cache native raw data representation */
1: +  btf->raw_size = raw_size;
1: +  btf->raw_data = raw_data;
1: +
1: +  btf->fd = bpf_load_btf(raw_data, raw_size, log_buf, log_buf_size, false);
1: +  if (btf->fd < 0) {
1: +    if (!log_buf || errno == ENOSPC) {
1: +      log_buf_size = max((__u32)BPF_LOG_BUF_SIZE, log_buf_size << 1);
1: +      free(log_buf);
1: +      goto retry_load;
1: +    }
1: +
1: +    err = -errno;
1: +    pr_warn("Error loading BTF: %s(%d)\n", strerror(errno), errno);
1: +    if (*log_buf)
1: +      pr_warn("%s\n", log_buf);
1: +    goto done;
1: +  }
1:  
1:  done:
1: -	free(log_buf);
1: -	return libbpf_err(err);
1: -}
1: -
1: -int btf__fd(const struct btf *btf)
1: -{
1: -	return btf->fd;
1: -}
1: -
1: -void btf__set_fd(struct btf *btf, int fd)
1: -{
1: -	btf->fd = fd;
1: -}
1: -
1: -static const void *btf_strs_data(const struct btf *btf)
1: -{
1: -	return btf->strs_data ? btf->strs_data : strset__data(btf->strs_set);
1: -}
1: -
1: -static void *btf_get_raw_data(const struct btf *btf, __u32 *size, bool swap_endian)
1: -{
1: -	struct btf_header *hdr = btf->hdr;
1: -	struct btf_type *t;
1: -	void *data, *p;
1: -	__u32 data_sz;
1: -	int i;
1: -
1: -	data = swap_endian ? btf->raw_data_swapped : btf->raw_data;
1: -	if (data) {
1: -		*size = btf->raw_size;
1: -		return data;
1: -	}
1: -
1: -	data_sz = hdr->hdr_len + hdr->type_len + hdr->str_len;
1: -	data = calloc(1, data_sz);
1: -	if (!data)
1: -		return NULL;
1: -	p = data;
1: -
1: -	memcpy(p, hdr, hdr->hdr_len);
1: -	if (swap_endian)
1: -		btf_bswap_hdr(p);
1: -	p += hdr->hdr_len;
1: -
1: -	memcpy(p, btf->types_data, hdr->type_len);
1: -	if (swap_endian) {
1: -		for (i = 0; i < btf->nr_types; i++) {
1: -			t = p + btf->type_offs[i];
1: -			/* btf_bswap_type_rest() relies on native t->info, so
1: -			 * we swap base type info after we swapped all the
1: -			 * additional information
1: -			 */
1: -			if (btf_bswap_type_rest(t))
1: -				goto err_out;
1: -			btf_bswap_type_base(t);
1: -		}
1: -	}
1: -	p += hdr->type_len;
1: -
1: -	memcpy(p, btf_strs_data(btf), hdr->str_len);
1: -	p += hdr->str_len;
1: -
1: -	*size = data_sz;
1: -	return data;
1: +  free(log_buf);
1: +  return libbpf_err(err);
1: +}
1: +
1: +int btf__fd(const struct btf *btf) { return btf->fd; }
1: +
1: +void btf__set_fd(struct btf *btf, int fd) { btf->fd = fd; }
1: +
1: +static const void *btf_strs_data(const struct btf *btf) {
1: +  return btf->strs_data ? btf->strs_data : strset__data(btf->strs_set);
1: +}
1: +
1: +static void *btf_get_raw_data(const struct btf *btf, __u32 *size,
1: +                              bool swap_endian) {
1: +  struct btf_header *hdr = btf->hdr;
1: +  struct btf_type *t;
1: +  void *data, *p;
1: +  __u32 data_sz;
1: +  int i;
1: +
1: +  data = swap_endian ? btf->raw_data_swapped : btf->raw_data;
1: +  if (data) {
1: +    *size = btf->raw_size;
1: +    return data;
1: +  }
1: +
1: +  data_sz = hdr->hdr_len + hdr->type_len + hdr->str_len;
1: +  data = calloc(1, data_sz);
1: +  if (!data)
1: +    return NULL;
1: +  p = data;
1: +
1: +  memcpy(p, hdr, hdr->hdr_len);
1: +  if (swap_endian)
1: +    btf_bswap_hdr(p);
1: +  p += hdr->hdr_len;
1: +
1: +  memcpy(p, btf->types_data, hdr->type_len);
1: +  if (swap_endian) {
1: +    for (i = 0; i < btf->nr_types; i++) {
1: +      t = p + btf->type_offs[i];
1: +      /* btf_bswap_type_rest() relies on native t->info, so
1: +       * we swap base type info after we swapped all the
1: +       * additional information
1: +       */
1: +      if (btf_bswap_type_rest(t))
1: +        goto err_out;
1: +      btf_bswap_type_base(t);
1: +    }
1: +  }
1: +  p += hdr->type_len;
1: +
1: +  memcpy(p, btf_strs_data(btf), hdr->str_len);
1: +  p += hdr->str_len;
1: +
1: +  *size = data_sz;
1: +  return data;
1:  err_out:
1: -	free(data);
1: -	return NULL;
1: -}
1: -
1: -const void *btf__get_raw_data(const struct btf *btf_ro, __u32 *size)
1: -{
1: -	struct btf *btf = (struct btf *)btf_ro;
1: -	__u32 data_sz;
1: -	void *data;
1: -
1: -	data = btf_get_raw_data(btf, &data_sz, btf->swapped_endian);
1: -	if (!data)
1: -		return errno = -ENOMEM, NULL;
1: -
1: -	btf->raw_size = data_sz;
1: -	if (btf->swapped_endian)
1: -		btf->raw_data_swapped = data;
1: -	else
1: -		btf->raw_data = data;
1: -	*size = data_sz;
1: -	return data;
1: -}
1: -
1: -const char *btf__str_by_offset(const struct btf *btf, __u32 offset)
1: -{
1: -	if (offset < btf->start_str_off)
1: -		return btf__str_by_offset(btf->base_btf, offset);
1: -	else if (offset - btf->start_str_off < btf->hdr->str_len)
1: -		return btf_strs_data(btf) + (offset - btf->start_str_off);
1: -	else
1: -		return errno = EINVAL, NULL;
1: -}
1: -
1: -const char *btf__name_by_offset(const struct btf *btf, __u32 offset)
1: -{
1: -	return btf__str_by_offset(btf, offset);
1: -}
1: -
1: -struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf)
1: -{
1: -	struct bpf_btf_info btf_info;
1: -	__u32 len = sizeof(btf_info);
1: -	__u32 last_size;
1: -	struct btf *btf;
1: -	void *ptr;
1: -	int err;
1: -
1: -	/* we won't know btf_size until we call bpf_obj_get_info_by_fd(). so
1: -	 * let's start with a sane default - 4KiB here - and resize it only if
1: -	 * bpf_obj_get_info_by_fd() needs a bigger buffer.
1: -	 */
1: -	last_size = 4096;
1: -	ptr = malloc(last_size);
1: -	if (!ptr)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	memset(&btf_info, 0, sizeof(btf_info));
1: -	btf_info.btf = ptr_to_u64(ptr);
1: -	btf_info.btf_size = last_size;
1: -	err = bpf_obj_get_info_by_fd(btf_fd, &btf_info, &len);
1: -
1: -	if (!err && btf_info.btf_size > last_size) {
1: -		void *temp_ptr;
1: -
1: -		last_size = btf_info.btf_size;
1: -		temp_ptr = realloc(ptr, last_size);
1: -		if (!temp_ptr) {
1: -			btf = ERR_PTR(-ENOMEM);
1: -			goto exit_free;
1: -		}
1: -		ptr = temp_ptr;
1: -
1: -		len = sizeof(btf_info);
1: -		memset(&btf_info, 0, sizeof(btf_info));
1: -		btf_info.btf = ptr_to_u64(ptr);
1: -		btf_info.btf_size = last_size;
1: -
1: -		err = bpf_obj_get_info_by_fd(btf_fd, &btf_info, &len);
1: -	}
1: -
1: -	if (err || btf_info.btf_size > last_size) {
1: -		btf = err ? ERR_PTR(-errno) : ERR_PTR(-E2BIG);
1: -		goto exit_free;
1: -	}
1: -
1: -	btf = btf_new(ptr, btf_info.btf_size, base_btf);
1: +  free(data);
1: +  return NULL;
1: +}
1: +
1: +const void *btf__get_raw_data(const struct btf *btf_ro, __u32 *size) {
1: +  struct btf *btf = (struct btf *)btf_ro;
1: +  __u32 data_sz;
1: +  void *data;
1: +
1: +  data = btf_get_raw_data(btf, &data_sz, btf->swapped_endian);
1: +  if (!data)
1: +    return errno = -ENOMEM, NULL;
1: +
1: +  btf->raw_size = data_sz;
1: +  if (btf->swapped_endian)
1: +    btf->raw_data_swapped = data;
1: +  else
1: +    btf->raw_data = data;
1: +  *size = data_sz;
1: +  return data;
1: +}
1: +
1: +const char *btf__str_by_offset(const struct btf *btf, __u32 offset) {
1: +  if (offset < btf->start_str_off)
1: +    return btf__str_by_offset(btf->base_btf, offset);
1: +  else if (offset - btf->start_str_off < btf->hdr->str_len)
1: +    return btf_strs_data(btf) + (offset - btf->start_str_off);
1: +  else
1: +    return errno = EINVAL, NULL;
1: +}
1: +
1: +const char *btf__name_by_offset(const struct btf *btf, __u32 offset) {
1: +  return btf__str_by_offset(btf, offset);
1: +}
1: +
1: +struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf) {
1: +  struct bpf_btf_info btf_info;
1: +  __u32 len = sizeof(btf_info);
1: +  __u32 last_size;
1: +  struct btf *btf;
1: +  void *ptr;
1: +  int err;
1: +
1: +  /* we won't know btf_size until we call bpf_obj_get_info_by_fd(). so
1: +   * let's start with a sane default - 4KiB here - and resize it only if
1: +   * bpf_obj_get_info_by_fd() needs a bigger buffer.
1: +   */
1: +  last_size = 4096;
1: +  ptr = malloc(last_size);
1: +  if (!ptr)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  memset(&btf_info, 0, sizeof(btf_info));
1: +  btf_info.btf = ptr_to_u64(ptr);
1: +  btf_info.btf_size = last_size;
1: +  err = bpf_obj_get_info_by_fd(btf_fd, &btf_info, &len);
1: +
1: +  if (!err && btf_info.btf_size > last_size) {
1: +    void *temp_ptr;
1: +
1: +    last_size = btf_info.btf_size;
1: +    temp_ptr = realloc(ptr, last_size);
1: +    if (!temp_ptr) {
1: +      btf = ERR_PTR(-ENOMEM);
1: +      goto exit_free;
1: +    }
1: +    ptr = temp_ptr;
1: +
1: +    len = sizeof(btf_info);
1: +    memset(&btf_info, 0, sizeof(btf_info));
1: +    btf_info.btf = ptr_to_u64(ptr);
1: +    btf_info.btf_size = last_size;
1: +
1: +    err = bpf_obj_get_info_by_fd(btf_fd, &btf_info, &len);
1: +  }
1: +
1: +  if (err || btf_info.btf_size > last_size) {
1: +    btf = err ? ERR_PTR(-errno) : ERR_PTR(-E2BIG);
1: +    goto exit_free;
1: +  }
1: +
1: +  btf = btf_new(ptr, btf_info.btf_size, base_btf);
1:  
1:  exit_free:
1: -	free(ptr);
1: -	return btf;
1: +  free(ptr);
1: +  return btf;
1:  }
1:  
1: -int btf__get_from_id(__u32 id, struct btf **btf)
1: -{
1: -	struct btf *res;
1: -	int err, btf_fd;
1: +int btf__get_from_id(__u32 id, struct btf **btf) {
1: +  struct btf *res;
1: +  int err, btf_fd;
1:  
1: -	*btf = NULL;
1: -	btf_fd = bpf_btf_get_fd_by_id(id);
1: -	if (btf_fd < 0)
1: -		return libbpf_err(-errno);
1: +  *btf = NULL;
1: +  btf_fd = bpf_btf_get_fd_by_id(id);
1: +  if (btf_fd < 0)
1: +    return libbpf_err(-errno);
1:  
1: -	res = btf_get_from_fd(btf_fd, NULL);
1: -	err = libbpf_get_error(res);
1: +  res = btf_get_from_fd(btf_fd, NULL);
1: +  err = libbpf_get_error(res);
1:  
1: -	close(btf_fd);
1: +  close(btf_fd);
1:  
1: -	if (err)
1: -		return libbpf_err(err);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	*btf = res;
1: -	return 0;
1: +  *btf = res;
1: +  return 0;
1:  }
1:  
1:  int btf__get_map_kv_tids(const struct btf *btf, const char *map_name,
1: -			 __u32 expected_key_size, __u32 expected_value_size,
1: -			 __u32 *key_type_id, __u32 *value_type_id)
1: -{
1: -	const struct btf_type *container_type;
1: -	const struct btf_member *key, *value;
1: -	const size_t max_name = 256;
1: -	char container_name[max_name];
1: -	__s64 key_size, value_size;
1: -	__s32 container_id;
1: -
1: -	if (snprintf(container_name, max_name, "____btf_map_%s", map_name) == max_name) {
1: -		pr_warn("map:%s length of '____btf_map_%s' is too long\n",
1: -			map_name, map_name);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	container_id = btf__find_by_name(btf, container_name);
1: -	if (container_id < 0) {
1: -		pr_debug("map:%s container_name:%s cannot be found in BTF. Missing BPF_ANNOTATE_KV_PAIR?\n",
1: -			 map_name, container_name);
1: -		return libbpf_err(container_id);
1: -	}
1: -
1: -	container_type = btf__type_by_id(btf, container_id);
1: -	if (!container_type) {
1: -		pr_warn("map:%s cannot find BTF type for container_id:%u\n",
1: -			map_name, container_id);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (!btf_is_struct(container_type) || btf_vlen(container_type) < 2) {
1: -		pr_warn("map:%s container_name:%s is an invalid container struct\n",
1: -			map_name, container_name);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	key = btf_members(container_type);
1: -	value = key + 1;
1: -
1: -	key_size = btf__resolve_size(btf, key->type);
1: -	if (key_size < 0) {
1: -		pr_warn("map:%s invalid BTF key_type_size\n", map_name);
1: -		return libbpf_err(key_size);
1: -	}
1: -
1: -	if (expected_key_size != key_size) {
1: -		pr_warn("map:%s btf_key_type_size:%u != map_def_key_size:%u\n",
1: -			map_name, (__u32)key_size, expected_key_size);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	value_size = btf__resolve_size(btf, value->type);
1: -	if (value_size < 0) {
1: -		pr_warn("map:%s invalid BTF value_type_size\n", map_name);
1: -		return libbpf_err(value_size);
1: -	}
1: -
1: -	if (expected_value_size != value_size) {
1: -		pr_warn("map:%s btf_value_type_size:%u != map_def_value_size:%u\n",
1: -			map_name, (__u32)value_size, expected_value_size);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	*key_type_id = key->type;
1: -	*value_type_id = value->type;
1: -
1: -	return 0;
1: -}
1: -
1: -static void btf_invalidate_raw_data(struct btf *btf)
1: -{
1: -	if (btf->raw_data) {
1: -		free(btf->raw_data);
1: -		btf->raw_data = NULL;
1: -	}
1: -	if (btf->raw_data_swapped) {
1: -		free(btf->raw_data_swapped);
1: -		btf->raw_data_swapped = NULL;
1: -	}
1: +                         __u32 expected_key_size, __u32 expected_value_size,
1: +                         __u32 *key_type_id, __u32 *value_type_id) {
1: +  const struct btf_type *container_type;
1: +  const struct btf_member *key, *value;
1: +  const size_t max_name = 256;
1: +  char container_name[max_name];
1: +  __s64 key_size, value_size;
1: +  __s32 container_id;
1: +
1: +  if (snprintf(container_name, max_name, "____btf_map_%s", map_name) ==
1: +      max_name) {
1: +    pr_warn("map:%s length of '____btf_map_%s' is too long\n", map_name,
1: +            map_name);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  container_id = btf__find_by_name(btf, container_name);
1: +  if (container_id < 0) {
1: +    pr_debug(
1: +        "map:%s container_name:%s cannot be found in BTF. Missing "
1: +        "BPF_ANNOTATE_KV_PAIR?\n",
1: +        map_name, container_name);
1: +    return libbpf_err(container_id);
1: +  }
1: +
1: +  container_type = btf__type_by_id(btf, container_id);
1: +  if (!container_type) {
1: +    pr_warn("map:%s cannot find BTF type for container_id:%u\n", map_name,
1: +            container_id);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (!btf_is_struct(container_type) || btf_vlen(container_type) < 2) {
1: +    pr_warn("map:%s container_name:%s is an invalid container struct\n",
1: +            map_name, container_name);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  key = btf_members(container_type);
1: +  value = key + 1;
1: +
1: +  key_size = btf__resolve_size(btf, key->type);
1: +  if (key_size < 0) {
1: +    pr_warn("map:%s invalid BTF key_type_size\n", map_name);
1: +    return libbpf_err(key_size);
1: +  }
1: +
1: +  if (expected_key_size != key_size) {
1: +    pr_warn("map:%s btf_key_type_size:%u != map_def_key_size:%u\n", map_name,
1: +            (__u32)key_size, expected_key_size);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  value_size = btf__resolve_size(btf, value->type);
1: +  if (value_size < 0) {
1: +    pr_warn("map:%s invalid BTF value_type_size\n", map_name);
1: +    return libbpf_err(value_size);
1: +  }
1: +
1: +  if (expected_value_size != value_size) {
1: +    pr_warn("map:%s btf_value_type_size:%u != map_def_value_size:%u\n",
1: +            map_name, (__u32)value_size, expected_value_size);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  *key_type_id = key->type;
1: +  *value_type_id = value->type;
1: +
1: +  return 0;
1: +}
1: +
1: +static void btf_invalidate_raw_data(struct btf *btf) {
1: +  if (btf->raw_data) {
1: +    free(btf->raw_data);
1: +    btf->raw_data = NULL;
1: +  }
1: +  if (btf->raw_data_swapped) {
1: +    free(btf->raw_data_swapped);
1: +    btf->raw_data_swapped = NULL;
1: +  }
1:  }
1:  
1:  /* Ensure BTF is ready to be modified (by splitting into a three memory
1:   * regions for header, types, and strings). Also invalidate cached
1:   * raw_data, if any.
1:   */
1: -static int btf_ensure_modifiable(struct btf *btf)
1: -{
1: -	void *hdr, *types;
1: -	struct strset *set = NULL;
1: -	int err = -ENOMEM;
1: -
1: -	if (btf_is_modifiable(btf)) {
1: -		/* any BTF modification invalidates raw_data */
1: -		btf_invalidate_raw_data(btf);
1: -		return 0;
1: -	}
1: -
1: -	/* split raw data into three memory regions */
1: -	hdr = malloc(btf->hdr->hdr_len);
1: -	types = malloc(btf->hdr->type_len);
1: -	if (!hdr || !types)
1: -		goto err_out;
1: -
1: -	memcpy(hdr, btf->hdr, btf->hdr->hdr_len);
1: -	memcpy(types, btf->types_data, btf->hdr->type_len);
1: -
1: -	/* build lookup index for all strings */
1: -	set = strset__new(BTF_MAX_STR_OFFSET, btf->strs_data, btf->hdr->str_len);
1: -	if (IS_ERR(set)) {
1: -		err = PTR_ERR(set);
1: -		goto err_out;
1: -	}
1: -
1: -	/* only when everything was successful, update internal state */
1: -	btf->hdr = hdr;
1: -	btf->types_data = types;
1: -	btf->types_data_cap = btf->hdr->type_len;
1: -	btf->strs_data = NULL;
1: -	btf->strs_set = set;
1: -	/* if BTF was created from scratch, all strings are guaranteed to be
1: -	 * unique and deduplicated
1: -	 */
1: -	if (btf->hdr->str_len == 0)
1: -		btf->strs_deduped = true;
1: -	if (!btf->base_btf && btf->hdr->str_len == 1)
1: -		btf->strs_deduped = true;
1: -
1: -	/* invalidate raw_data representation */
1: -	btf_invalidate_raw_data(btf);
1: -
1: -	return 0;
1: +static int btf_ensure_modifiable(struct btf *btf) {
1: +  void *hdr, *types;
1: +  struct strset *set = NULL;
1: +  int err = -ENOMEM;
1: +
1: +  if (btf_is_modifiable(btf)) {
1: +    /* any BTF modification invalidates raw_data */
1: +    btf_invalidate_raw_data(btf);
1: +    return 0;
1: +  }
1: +
1: +  /* split raw data into three memory regions */
1: +  hdr = malloc(btf->hdr->hdr_len);
1: +  types = malloc(btf->hdr->type_len);
1: +  if (!hdr || !types)
1: +    goto err_out;
1: +
1: +  memcpy(hdr, btf->hdr, btf->hdr->hdr_len);
1: +  memcpy(types, btf->types_data, btf->hdr->type_len);
1: +
1: +  /* build lookup index for all strings */
1: +  set = strset__new(BTF_MAX_STR_OFFSET, btf->strs_data, btf->hdr->str_len);
1: +  if (IS_ERR(set)) {
1: +    err = PTR_ERR(set);
1: +    goto err_out;
1: +  }
1: +
1: +  /* only when everything was successful, update internal state */
1: +  btf->hdr = hdr;
1: +  btf->types_data = types;
1: +  btf->types_data_cap = btf->hdr->type_len;
1: +  btf->strs_data = NULL;
1: +  btf->strs_set = set;
1: +  /* if BTF was created from scratch, all strings are guaranteed to be
1: +   * unique and deduplicated
1: +   */
1: +  if (btf->hdr->str_len == 0)
1: +    btf->strs_deduped = true;
1: +  if (!btf->base_btf && btf->hdr->str_len == 1)
1: +    btf->strs_deduped = true;
1: +
1: +  /* invalidate raw_data representation */
1: +  btf_invalidate_raw_data(btf);
1: +
1: +  return 0;
1:  
1:  err_out:
1: -	strset__free(set);
1: -	free(hdr);
1: -	free(types);
1: -	return err;
1: +  strset__free(set);
1: +  free(hdr);
1: +  free(types);
1: +  return err;
1:  }
1:  
1:  /* Find an offset in BTF string section that corresponds to a given string *s*.
1: @@ -1550,25 +1490,24 @@ err_out:
1:   *   - -ENOENT, if string is not in the string section;
1:   *   - <0, on any other error.
1:   */
1: -int btf__find_str(struct btf *btf, const char *s)
1: -{
1: -	int off;
1: +int btf__find_str(struct btf *btf, const char *s) {
1: +  int off;
1:  
1: -	if (btf->base_btf) {
1: -		off = btf__find_str(btf->base_btf, s);
1: -		if (off != -ENOENT)
1: -			return off;
1: -	}
1: +  if (btf->base_btf) {
1: +    off = btf__find_str(btf->base_btf, s);
1: +    if (off != -ENOENT)
1: +      return off;
1: +  }
1:  
1: -	/* BTF needs to be in a modifiable state to build string lookup index */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  /* BTF needs to be in a modifiable state to build string lookup index */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	off = strset__find_str(btf->strs_set, s);
1: -	if (off < 0)
1: -		return libbpf_err(off);
1: +  off = strset__find_str(btf->strs_set, s);
1: +  if (off < 0)
1: +    return libbpf_err(off);
1:  
1: -	return btf->start_str_off + off;
1: +  return btf->start_str_off + off;
1:  }
1:  
1:  /* Add a string s to the BTF string section.
1: @@ -1576,99 +1515,94 @@ int btf__find_str(struct btf *btf, const char *s)
1:   *   - > 0 offset into string section, on success;
1:   *   - < 0, on error.
1:   */
1: -int btf__add_str(struct btf *btf, const char *s)
1: -{
1: -	int off;
1: +int btf__add_str(struct btf *btf, const char *s) {
1: +  int off;
1:  
1: -	if (btf->base_btf) {
1: -		off = btf__find_str(btf->base_btf, s);
1: -		if (off != -ENOENT)
1: -			return off;
1: -	}
1: +  if (btf->base_btf) {
1: +    off = btf__find_str(btf->base_btf, s);
1: +    if (off != -ENOENT)
1: +      return off;
1: +  }
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	off = strset__add_str(btf->strs_set, s);
1: -	if (off < 0)
1: -		return libbpf_err(off);
1: +  off = strset__add_str(btf->strs_set, s);
1: +  if (off < 0)
1: +    return libbpf_err(off);
1:  
1: -	btf->hdr->str_len = strset__data_size(btf->strs_set);
1: +  btf->hdr->str_len = strset__data_size(btf->strs_set);
1:  
1: -	return btf->start_str_off + off;
1: +  return btf->start_str_off + off;
1:  }
1:  
1: -static void *btf_add_type_mem(struct btf *btf, size_t add_sz)
1: -{
1: -	return libbpf_add_mem(&btf->types_data, &btf->types_data_cap, 1,
1: -			      btf->hdr->type_len, UINT_MAX, add_sz);
1: +static void *btf_add_type_mem(struct btf *btf, size_t add_sz) {
1: +  return libbpf_add_mem(&btf->types_data, &btf->types_data_cap, 1,
1: +                        btf->hdr->type_len, UINT_MAX, add_sz);
1:  }
1:  
1: -static void btf_type_inc_vlen(struct btf_type *t)
1: -{
1: -	t->info = btf_type_info(btf_kind(t), btf_vlen(t) + 1, btf_kflag(t));
1: +static void btf_type_inc_vlen(struct btf_type *t) {
1: +  t->info = btf_type_info(btf_kind(t), btf_vlen(t) + 1, btf_kflag(t));
1:  }
1:  
1: -static int btf_commit_type(struct btf *btf, int data_sz)
1: -{
1: -	int err;
1: +static int btf_commit_type(struct btf *btf, int data_sz) {
1: +  int err;
1:  
1: -	err = btf_add_type_idx_entry(btf, btf->hdr->type_len);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = btf_add_type_idx_entry(btf, btf->hdr->type_len);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	btf->hdr->type_len += data_sz;
1: -	btf->hdr->str_off += data_sz;
1: -	btf->nr_types++;
1: -	return btf->start_id + btf->nr_types - 1;
1: +  btf->hdr->type_len += data_sz;
1: +  btf->hdr->str_off += data_sz;
1: +  btf->nr_types++;
1: +  return btf->start_id + btf->nr_types - 1;
1:  }
1:  
1:  struct btf_pipe {
1: -	const struct btf *src;
1: -	struct btf *dst;
1: +  const struct btf *src;
1: +  struct btf *dst;
1:  };
1:  
1: -static int btf_rewrite_str(__u32 *str_off, void *ctx)
1: -{
1: -	struct btf_pipe *p = ctx;
1: -	int off;
1: +static int btf_rewrite_str(__u32 *str_off, void *ctx) {
1: +  struct btf_pipe *p = ctx;
1: +  int off;
1:  
1: -	if (!*str_off) /* nothing to do for empty strings */
1: -		return 0;
1: +  if (!*str_off) /* nothing to do for empty strings */
1: +    return 0;
1:  
1: -	off = btf__add_str(p->dst, btf__str_by_offset(p->src, *str_off));
1: -	if (off < 0)
1: -		return off;
1: +  off = btf__add_str(p->dst, btf__str_by_offset(p->src, *str_off));
1: +  if (off < 0)
1: +    return off;
1:  
1: -	*str_off = off;
1: -	return 0;
1: +  *str_off = off;
1: +  return 0;
1:  }
1:  
1: -int btf__add_type(struct btf *btf, const struct btf *src_btf, const struct btf_type *src_type)
1: -{
1: -	struct btf_pipe p = { .src = src_btf, .dst = btf };
1: -	struct btf_type *t;
1: -	int sz, err;
1: +int btf__add_type(struct btf *btf, const struct btf *src_btf,
1: +                  const struct btf_type *src_type) {
1: +  struct btf_pipe p = {.src = src_btf, .dst = btf};
1: +  struct btf_type *t;
1: +  int sz, err;
1:  
1: -	sz = btf_type_size(src_type);
1: -	if (sz < 0)
1: -		return libbpf_err(sz);
1: +  sz = btf_type_size(src_type);
1: +  if (sz < 0)
1: +    return libbpf_err(sz);
1:  
1: -	/* deconstruct BTF, if necessary, and invalidate raw_data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  /* deconstruct BTF, if necessary, and invalidate raw_data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	memcpy(t, src_type, sz);
1: +  memcpy(t, src_type, sz);
1:  
1: -	err = btf_type_visit_str_offs(t, btf_rewrite_str, &p);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = btf_type_visit_str_offs(t, btf_rewrite_str, &p);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -1680,44 +1614,44 @@ int btf__add_type(struct btf *btf, const struct btf *src_btf, const struct btf_t
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_int(struct btf *btf, const char *name, size_t byte_sz, int encoding)
1: -{
1: -	struct btf_type *t;
1: -	int sz, name_off;
1: -
1: -	/* non-empty name */
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: -	/* byte_sz must be power of 2 */
1: -	if (!byte_sz || (byte_sz & (byte_sz - 1)) || byte_sz > 16)
1: -		return libbpf_err(-EINVAL);
1: -	if (encoding & ~(BTF_INT_SIGNED | BTF_INT_CHAR | BTF_INT_BOOL))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	/* deconstruct BTF, if necessary, and invalidate raw_data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	sz = sizeof(struct btf_type) + sizeof(int);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	/* if something goes wrong later, we might end up with an extra string,
1: -	 * but that shouldn't be a problem, because BTF can't be constructed
1: -	 * completely anyway and will most probably be just discarded
1: -	 */
1: -	name_off = btf__add_str(btf, name);
1: -	if (name_off < 0)
1: -		return name_off;
1: -
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(BTF_KIND_INT, 0, 0);
1: -	t->size = byte_sz;
1: -	/* set INT info, we don't allow setting legacy bit offset/size */
1: -	*(__u32 *)(t + 1) = (encoding << 24) | (byte_sz * 8);
1: -
1: -	return btf_commit_type(btf, sz);
1: +int btf__add_int(struct btf *btf, const char *name, size_t byte_sz,
1: +                 int encoding) {
1: +  struct btf_type *t;
1: +  int sz, name_off;
1: +
1: +  /* non-empty name */
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1: +  /* byte_sz must be power of 2 */
1: +  if (!byte_sz || (byte_sz & (byte_sz - 1)) || byte_sz > 16)
1: +    return libbpf_err(-EINVAL);
1: +  if (encoding & ~(BTF_INT_SIGNED | BTF_INT_CHAR | BTF_INT_BOOL))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  /* deconstruct BTF, if necessary, and invalidate raw_data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  sz = sizeof(struct btf_type) + sizeof(int);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  /* if something goes wrong later, we might end up with an extra string,
1: +   * but that shouldn't be a problem, because BTF can't be constructed
1: +   * completely anyway and will most probably be just discarded
1: +   */
1: +  name_off = btf__add_str(btf, name);
1: +  if (name_off < 0)
1: +    return name_off;
1: +
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(BTF_KIND_INT, 0, 0);
1: +  t->size = byte_sz;
1: +  /* set INT info, we don't allow setting legacy bit offset/size */
1: +  *(__u32 *)(t + 1) = (encoding << 24) | (byte_sz * 8);
1: +
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -1728,78 +1662,76 @@ int btf__add_int(struct btf *btf, const char *name, size_t byte_sz, int encoding
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_float(struct btf *btf, const char *name, size_t byte_sz)
1: -{
1: -	struct btf_type *t;
1: -	int sz, name_off;
1: +int btf__add_float(struct btf *btf, const char *name, size_t byte_sz) {
1: +  struct btf_type *t;
1: +  int sz, name_off;
1:  
1: -	/* non-empty name */
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: +  /* non-empty name */
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1:  
1: -	/* byte_sz must be one of the explicitly allowed values */
1: -	if (byte_sz != 2 && byte_sz != 4 && byte_sz != 8 && byte_sz != 12 &&
1: -	    byte_sz != 16)
1: -		return libbpf_err(-EINVAL);
1: +  /* byte_sz must be one of the explicitly allowed values */
1: +  if (byte_sz != 2 && byte_sz != 4 && byte_sz != 8 && byte_sz != 12 &&
1: +      byte_sz != 16)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	name_off = btf__add_str(btf, name);
1: -	if (name_off < 0)
1: -		return name_off;
1: +  name_off = btf__add_str(btf, name);
1: +  if (name_off < 0)
1: +    return name_off;
1:  
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(BTF_KIND_FLOAT, 0, 0);
1: -	t->size = byte_sz;
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(BTF_KIND_FLOAT, 0, 0);
1: +  t->size = byte_sz;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /* it's completely legal to append BTF types with type IDs pointing forward to
1:   * types that haven't been appended yet, so we only make sure that id looks
1:   * sane, we can't guarantee that ID will always be valid
1:   */
1: -static int validate_type_id(int id)
1: -{
1: -	if (id < 0 || id > BTF_MAX_NR_TYPES)
1: -		return -EINVAL;
1: -	return 0;
1: +static int validate_type_id(int id) {
1: +  if (id < 0 || id > BTF_MAX_NR_TYPES)
1: +    return -EINVAL;
1: +  return 0;
1:  }
1:  
1:  /* generic append function for PTR, TYPEDEF, CONST/VOLATILE/RESTRICT */
1: -static int btf_add_ref_kind(struct btf *btf, int kind, const char *name, int ref_type_id)
1: -{
1: -	struct btf_type *t;
1: -	int sz, name_off = 0;
1: +static int btf_add_ref_kind(struct btf *btf, int kind, const char *name,
1: +                            int ref_type_id) {
1: +  struct btf_type *t;
1: +  int sz, name_off = 0;
1:  
1: -	if (validate_type_id(ref_type_id))
1: -		return libbpf_err(-EINVAL);
1: +  if (validate_type_id(ref_type_id))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	if (name && name[0]) {
1: -		name_off = btf__add_str(btf, name);
1: -		if (name_off < 0)
1: -			return name_off;
1: -	}
1: +  if (name && name[0]) {
1: +    name_off = btf__add_str(btf, name);
1: +    if (name_off < 0)
1: +      return name_off;
1: +  }
1:  
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(kind, 0, 0);
1: -	t->type = ref_type_id;
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(kind, 0, 0);
1: +  t->type = ref_type_id;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -1809,9 +1741,8 @@ static int btf_add_ref_kind(struct btf *btf, int kind, const char *name, int ref
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_ptr(struct btf *btf, int ref_type_id)
1: -{
1: -	return btf_add_ref_kind(btf, BTF_KIND_PTR, NULL, ref_type_id);
1: +int btf__add_ptr(struct btf *btf, int ref_type_id) {
1: +  return btf_add_ref_kind(btf, BTF_KIND_PTR, NULL, ref_type_id);
1:  }
1:  
1:  /*
1: @@ -1823,63 +1754,63 @@ int btf__add_ptr(struct btf *btf, int ref_type_id)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_array(struct btf *btf, int index_type_id, int elem_type_id, __u32 nr_elems)
1: -{
1: -	struct btf_type *t;
1: -	struct btf_array *a;
1: -	int sz;
1: +int btf__add_array(struct btf *btf, int index_type_id, int elem_type_id,
1: +                   __u32 nr_elems) {
1: +  struct btf_type *t;
1: +  struct btf_array *a;
1: +  int sz;
1:  
1: -	if (validate_type_id(index_type_id) || validate_type_id(elem_type_id))
1: -		return libbpf_err(-EINVAL);
1: +  if (validate_type_id(index_type_id) || validate_type_id(elem_type_id))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type) + sizeof(struct btf_array);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type) + sizeof(struct btf_array);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	t->name_off = 0;
1: -	t->info = btf_type_info(BTF_KIND_ARRAY, 0, 0);
1: -	t->size = 0;
1: +  t->name_off = 0;
1: +  t->info = btf_type_info(BTF_KIND_ARRAY, 0, 0);
1: +  t->size = 0;
1:  
1: -	a = btf_array(t);
1: -	a->type = elem_type_id;
1: -	a->index_type = index_type_id;
1: -	a->nelems = nr_elems;
1: +  a = btf_array(t);
1: +  a->type = elem_type_id;
1: +  a->index_type = index_type_id;
1: +  a->nelems = nr_elems;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /* generic STRUCT/UNION append function */
1: -static int btf_add_composite(struct btf *btf, int kind, const char *name, __u32 bytes_sz)
1: -{
1: -	struct btf_type *t;
1: -	int sz, name_off = 0;
1: +static int btf_add_composite(struct btf *btf, int kind, const char *name,
1: +                             __u32 bytes_sz) {
1: +  struct btf_type *t;
1: +  int sz, name_off = 0;
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	if (name && name[0]) {
1: -		name_off = btf__add_str(btf, name);
1: -		if (name_off < 0)
1: -			return name_off;
1: -	}
1: +  if (name && name[0]) {
1: +    name_off = btf__add_str(btf, name);
1: +    if (name_off < 0)
1: +      return name_off;
1: +  }
1:  
1: -	/* start out with vlen=0 and no kflag; this will be adjusted when
1: -	 * adding each member
1: -	 */
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(kind, 0, 0);
1: -	t->size = bytes_sz;
1: +  /* start out with vlen=0 and no kflag; this will be adjusted when
1: +   * adding each member
1: +   */
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(kind, 0, 0);
1: +  t->size = bytes_sz;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -1894,9 +1825,8 @@ static int btf_add_composite(struct btf *btf, int kind, const char *name, __u32
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_struct(struct btf *btf, const char *name, __u32 byte_sz)
1: -{
1: -	return btf_add_composite(btf, BTF_KIND_STRUCT, name, byte_sz);
1: +int btf__add_struct(struct btf *btf, const char *name, __u32 byte_sz) {
1: +  return btf_add_composite(btf, BTF_KIND_STRUCT, name, byte_sz);
1:  }
1:  
1:  /*
1: @@ -1912,14 +1842,12 @@ int btf__add_struct(struct btf *btf, const char *name, __u32 byte_sz)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_union(struct btf *btf, const char *name, __u32 byte_sz)
1: -{
1: -	return btf_add_composite(btf, BTF_KIND_UNION, name, byte_sz);
1: +int btf__add_union(struct btf *btf, const char *name, __u32 byte_sz) {
1: +  return btf_add_composite(btf, BTF_KIND_UNION, name, byte_sz);
1:  }
1:  
1: -static struct btf_type *btf_last_type(struct btf *btf)
1: -{
1: -	return btf_type_by_id(btf, btf__get_nr_types(btf));
1: +static struct btf_type *btf_last_type(struct btf *btf) {
1: +  return btf_type_by_id(btf, btf__get_nr_types(btf));
1:  }
1:  
1:  /*
1: @@ -1933,58 +1861,58 @@ static struct btf_type *btf_last_type(struct btf *btf)
1:   *   - <0, on error.
1:   */
1:  int btf__add_field(struct btf *btf, const char *name, int type_id,
1: -		   __u32 bit_offset, __u32 bit_size)
1: -{
1: -	struct btf_type *t;
1: -	struct btf_member *m;
1: -	bool is_bitfield;
1: -	int sz, name_off = 0;
1: -
1: -	/* last type should be union/struct */
1: -	if (btf->nr_types == 0)
1: -		return libbpf_err(-EINVAL);
1: -	t = btf_last_type(btf);
1: -	if (!btf_is_composite(t))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	if (validate_type_id(type_id))
1: -		return libbpf_err(-EINVAL);
1: -	/* best-effort bit field offset/size enforcement */
1: -	is_bitfield = bit_size || (bit_offset % 8 != 0);
1: -	if (is_bitfield && (bit_size == 0 || bit_size > 255 || bit_offset > 0xffffff))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	/* only offset 0 is allowed for unions */
1: -	if (btf_is_union(t) && bit_offset)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	/* decompose and invalidate raw data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	sz = sizeof(struct btf_member);
1: -	m = btf_add_type_mem(btf, sz);
1: -	if (!m)
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	if (name && name[0]) {
1: -		name_off = btf__add_str(btf, name);
1: -		if (name_off < 0)
1: -			return name_off;
1: -	}
1: -
1: -	m->name_off = name_off;
1: -	m->type = type_id;
1: -	m->offset = bit_offset | (bit_size << 24);
1: -
1: -	/* btf_add_type_mem can invalidate t pointer */
1: -	t = btf_last_type(btf);
1: -	/* update parent type's vlen and kflag */
1: -	t->info = btf_type_info(btf_kind(t), btf_vlen(t) + 1, is_bitfield || btf_kflag(t));
1: -
1: -	btf->hdr->type_len += sz;
1: -	btf->hdr->str_off += sz;
1: -	return 0;
1: +                   __u32 bit_offset, __u32 bit_size) {
1: +  struct btf_type *t;
1: +  struct btf_member *m;
1: +  bool is_bitfield;
1: +  int sz, name_off = 0;
1: +
1: +  /* last type should be union/struct */
1: +  if (btf->nr_types == 0)
1: +    return libbpf_err(-EINVAL);
1: +  t = btf_last_type(btf);
1: +  if (!btf_is_composite(t))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  if (validate_type_id(type_id))
1: +    return libbpf_err(-EINVAL);
1: +  /* best-effort bit field offset/size enforcement */
1: +  is_bitfield = bit_size || (bit_offset % 8 != 0);
1: +  if (is_bitfield && (bit_size == 0 || bit_size > 255 || bit_offset > 0xffffff))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  /* only offset 0 is allowed for unions */
1: +  if (btf_is_union(t) && bit_offset)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  /* decompose and invalidate raw data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  sz = sizeof(struct btf_member);
1: +  m = btf_add_type_mem(btf, sz);
1: +  if (!m)
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  if (name && name[0]) {
1: +    name_off = btf__add_str(btf, name);
1: +    if (name_off < 0)
1: +      return name_off;
1: +  }
1: +
1: +  m->name_off = name_off;
1: +  m->type = type_id;
1: +  m->offset = bit_offset | (bit_size << 24);
1: +
1: +  /* btf_add_type_mem can invalidate t pointer */
1: +  t = btf_last_type(btf);
1: +  /* update parent type's vlen and kflag */
1: +  t->info =
1: +      btf_type_info(btf_kind(t), btf_vlen(t) + 1, is_bitfield || btf_kflag(t));
1: +
1: +  btf->hdr->type_len += sz;
1: +  btf->hdr->str_off += sz;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -2000,35 +1928,34 @@ int btf__add_field(struct btf *btf, const char *name, int type_id,
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_enum(struct btf *btf, const char *name, __u32 byte_sz)
1: -{
1: -	struct btf_type *t;
1: -	int sz, name_off = 0;
1: +int btf__add_enum(struct btf *btf, const char *name, __u32 byte_sz) {
1: +  struct btf_type *t;
1: +  int sz, name_off = 0;
1:  
1: -	/* byte_sz must be power of 2 */
1: -	if (!byte_sz || (byte_sz & (byte_sz - 1)) || byte_sz > 8)
1: -		return libbpf_err(-EINVAL);
1: +  /* byte_sz must be power of 2 */
1: +  if (!byte_sz || (byte_sz & (byte_sz - 1)) || byte_sz > 8)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	if (name && name[0]) {
1: -		name_off = btf__add_str(btf, name);
1: -		if (name_off < 0)
1: -			return name_off;
1: -	}
1: +  if (name && name[0]) {
1: +    name_off = btf__add_str(btf, name);
1: +    if (name_off < 0)
1: +      return name_off;
1: +  }
1:  
1: -	/* start out with vlen=0; it will be adjusted when adding enum values */
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(BTF_KIND_ENUM, 0, 0);
1: -	t->size = byte_sz;
1: +  /* start out with vlen=0; it will be adjusted when adding enum values */
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(BTF_KIND_ENUM, 0, 0);
1: +  t->size = byte_sz;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -2039,48 +1966,47 @@ int btf__add_enum(struct btf *btf, const char *name, __u32 byte_sz)
1:   *   -  0, on success;
1:   *   - <0, on error.
1:   */
1: -int btf__add_enum_value(struct btf *btf, const char *name, __s64 value)
1: -{
1: -	struct btf_type *t;
1: -	struct btf_enum *v;
1: -	int sz, name_off;
1: -
1: -	/* last type should be BTF_KIND_ENUM */
1: -	if (btf->nr_types == 0)
1: -		return libbpf_err(-EINVAL);
1: -	t = btf_last_type(btf);
1: -	if (!btf_is_enum(t))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	/* non-empty name */
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: -	if (value < INT_MIN || value > UINT_MAX)
1: -		return libbpf_err(-E2BIG);
1: -
1: -	/* decompose and invalidate raw data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	sz = sizeof(struct btf_enum);
1: -	v = btf_add_type_mem(btf, sz);
1: -	if (!v)
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	name_off = btf__add_str(btf, name);
1: -	if (name_off < 0)
1: -		return name_off;
1: -
1: -	v->name_off = name_off;
1: -	v->val = value;
1: -
1: -	/* update parent type's vlen */
1: -	t = btf_last_type(btf);
1: -	btf_type_inc_vlen(t);
1: -
1: -	btf->hdr->type_len += sz;
1: -	btf->hdr->str_off += sz;
1: -	return 0;
1: +int btf__add_enum_value(struct btf *btf, const char *name, __s64 value) {
1: +  struct btf_type *t;
1: +  struct btf_enum *v;
1: +  int sz, name_off;
1: +
1: +  /* last type should be BTF_KIND_ENUM */
1: +  if (btf->nr_types == 0)
1: +    return libbpf_err(-EINVAL);
1: +  t = btf_last_type(btf);
1: +  if (!btf_is_enum(t))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  /* non-empty name */
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1: +  if (value < INT_MIN || value > UINT_MAX)
1: +    return libbpf_err(-E2BIG);
1: +
1: +  /* decompose and invalidate raw data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  sz = sizeof(struct btf_enum);
1: +  v = btf_add_type_mem(btf, sz);
1: +  if (!v)
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  name_off = btf__add_str(btf, name);
1: +  if (name_off < 0)
1: +    return name_off;
1: +
1: +  v->name_off = name_off;
1: +  v->val = value;
1: +
1: +  /* update parent type's vlen */
1: +  t = btf_last_type(btf);
1: +  btf_type_inc_vlen(t);
1: +
1: +  btf->hdr->type_len += sz;
1: +  btf->hdr->str_off += sz;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -2092,32 +2018,32 @@ int btf__add_enum_value(struct btf *btf, const char *name, __s64 value)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_fwd(struct btf *btf, const char *name, enum btf_fwd_kind fwd_kind)
1: -{
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: -
1: -	switch (fwd_kind) {
1: -	case BTF_FWD_STRUCT:
1: -	case BTF_FWD_UNION: {
1: -		struct btf_type *t;
1: -		int id;
1: -
1: -		id = btf_add_ref_kind(btf, BTF_KIND_FWD, name, 0);
1: -		if (id <= 0)
1: -			return id;
1: -		t = btf_type_by_id(btf, id);
1: -		t->info = btf_type_info(BTF_KIND_FWD, 0, fwd_kind == BTF_FWD_UNION);
1: -		return id;
1: -	}
1: -	case BTF_FWD_ENUM:
1: -		/* enum forward in BTF currently is just an enum with no enum
1: -		 * values; we also assume a standard 4-byte size for it
1: -		 */
1: -		return btf__add_enum(btf, name, sizeof(int));
1: -	default:
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +int btf__add_fwd(struct btf *btf, const char *name,
1: +                 enum btf_fwd_kind fwd_kind) {
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1: +
1: +  switch (fwd_kind) {
1: +  case BTF_FWD_STRUCT:
1: +  case BTF_FWD_UNION: {
1: +    struct btf_type *t;
1: +    int id;
1: +
1: +    id = btf_add_ref_kind(btf, BTF_KIND_FWD, name, 0);
1: +    if (id <= 0)
1: +      return id;
1: +    t = btf_type_by_id(btf, id);
1: +    t->info = btf_type_info(BTF_KIND_FWD, 0, fwd_kind == BTF_FWD_UNION);
1: +    return id;
1: +  }
1: +  case BTF_FWD_ENUM:
1: +    /* enum forward in BTF currently is just an enum with no enum
1: +     * values; we also assume a standard 4-byte size for it
1: +     */
1: +    return btf__add_enum(btf, name, sizeof(int));
1: +  default:
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  }
1:  
1:  /*
1: @@ -2128,12 +2054,11 @@ int btf__add_fwd(struct btf *btf, const char *name, enum btf_fwd_kind fwd_kind)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_typedef(struct btf *btf, const char *name, int ref_type_id)
1: -{
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: +int btf__add_typedef(struct btf *btf, const char *name, int ref_type_id) {
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1:  
1: -	return btf_add_ref_kind(btf, BTF_KIND_TYPEDEF, name, ref_type_id);
1: +  return btf_add_ref_kind(btf, BTF_KIND_TYPEDEF, name, ref_type_id);
1:  }
1:  
1:  /*
1: @@ -2143,9 +2068,8 @@ int btf__add_typedef(struct btf *btf, const char *name, int ref_type_id)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_volatile(struct btf *btf, int ref_type_id)
1: -{
1: -	return btf_add_ref_kind(btf, BTF_KIND_VOLATILE, NULL, ref_type_id);
1: +int btf__add_volatile(struct btf *btf, int ref_type_id) {
1: +  return btf_add_ref_kind(btf, BTF_KIND_VOLATILE, NULL, ref_type_id);
1:  }
1:  
1:  /*
1: @@ -2155,9 +2079,8 @@ int btf__add_volatile(struct btf *btf, int ref_type_id)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_const(struct btf *btf, int ref_type_id)
1: -{
1: -	return btf_add_ref_kind(btf, BTF_KIND_CONST, NULL, ref_type_id);
1: +int btf__add_const(struct btf *btf, int ref_type_id) {
1: +  return btf_add_ref_kind(btf, BTF_KIND_CONST, NULL, ref_type_id);
1:  }
1:  
1:  /*
1: @@ -2167,9 +2090,8 @@ int btf__add_const(struct btf *btf, int ref_type_id)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_restrict(struct btf *btf, int ref_type_id)
1: -{
1: -	return btf_add_ref_kind(btf, BTF_KIND_RESTRICT, NULL, ref_type_id);
1: +int btf__add_restrict(struct btf *btf, int ref_type_id) {
1: +  return btf_add_ref_kind(btf, BTF_KIND_RESTRICT, NULL, ref_type_id);
1:  }
1:  
1:  /*
1: @@ -2181,23 +2103,22 @@ int btf__add_restrict(struct btf *btf, int ref_type_id)
1:   *   - <0, on error.
1:   */
1:  int btf__add_func(struct btf *btf, const char *name,
1: -		  enum btf_func_linkage linkage, int proto_type_id)
1: -{
1: -	int id;
1: +                  enum btf_func_linkage linkage, int proto_type_id) {
1: +  int id;
1:  
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: -	if (linkage != BTF_FUNC_STATIC && linkage != BTF_FUNC_GLOBAL &&
1: -	    linkage != BTF_FUNC_EXTERN)
1: -		return libbpf_err(-EINVAL);
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1: +  if (linkage != BTF_FUNC_STATIC && linkage != BTF_FUNC_GLOBAL &&
1: +      linkage != BTF_FUNC_EXTERN)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	id = btf_add_ref_kind(btf, BTF_KIND_FUNC, name, proto_type_id);
1: -	if (id > 0) {
1: -		struct btf_type *t = btf_type_by_id(btf, id);
1: +  id = btf_add_ref_kind(btf, BTF_KIND_FUNC, name, proto_type_id);
1: +  if (id > 0) {
1: +    struct btf_type *t = btf_type_by_id(btf, id);
1:  
1: -		t->info = btf_type_info(BTF_KIND_FUNC, linkage, 0);
1: -	}
1: -	return libbpf_err(id);
1: +    t->info = btf_type_info(BTF_KIND_FUNC, linkage, 0);
1: +  }
1: +  return libbpf_err(id);
1:  }
1:  
1:  /*
1: @@ -2212,30 +2133,29 @@ int btf__add_func(struct btf *btf, const char *name,
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_func_proto(struct btf *btf, int ret_type_id)
1: -{
1: -	struct btf_type *t;
1: -	int sz;
1: +int btf__add_func_proto(struct btf *btf, int ret_type_id) {
1: +  struct btf_type *t;
1: +  int sz;
1:  
1: -	if (validate_type_id(ret_type_id))
1: -		return libbpf_err(-EINVAL);
1: +  if (validate_type_id(ret_type_id))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	/* start out with vlen=0; this will be adjusted when adding enum
1: -	 * values, if necessary
1: -	 */
1: -	t->name_off = 0;
1: -	t->info = btf_type_info(BTF_KIND_FUNC_PROTO, 0, 0);
1: -	t->type = ret_type_id;
1: +  /* start out with vlen=0; this will be adjusted when adding enum
1: +   * values, if necessary
1: +   */
1: +  t->name_off = 0;
1: +  t->info = btf_type_info(BTF_KIND_FUNC_PROTO, 0, 0);
1: +  t->type = ret_type_id;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -2246,47 +2166,46 @@ int btf__add_func_proto(struct btf *btf, int ret_type_id)
1:   *   -  0, on success;
1:   *   - <0, on error.
1:   */
1: -int btf__add_func_param(struct btf *btf, const char *name, int type_id)
1: -{
1: -	struct btf_type *t;
1: -	struct btf_param *p;
1: -	int sz, name_off = 0;
1: +int btf__add_func_param(struct btf *btf, const char *name, int type_id) {
1: +  struct btf_type *t;
1: +  struct btf_param *p;
1: +  int sz, name_off = 0;
1:  
1: -	if (validate_type_id(type_id))
1: -		return libbpf_err(-EINVAL);
1: +  if (validate_type_id(type_id))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	/* last type should be BTF_KIND_FUNC_PROTO */
1: -	if (btf->nr_types == 0)
1: -		return libbpf_err(-EINVAL);
1: -	t = btf_last_type(btf);
1: -	if (!btf_is_func_proto(t))
1: -		return libbpf_err(-EINVAL);
1: +  /* last type should be BTF_KIND_FUNC_PROTO */
1: +  if (btf->nr_types == 0)
1: +    return libbpf_err(-EINVAL);
1: +  t = btf_last_type(btf);
1: +  if (!btf_is_func_proto(t))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	/* decompose and invalidate raw data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  /* decompose and invalidate raw data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_param);
1: -	p = btf_add_type_mem(btf, sz);
1: -	if (!p)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_param);
1: +  p = btf_add_type_mem(btf, sz);
1: +  if (!p)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	if (name && name[0]) {
1: -		name_off = btf__add_str(btf, name);
1: -		if (name_off < 0)
1: -			return name_off;
1: -	}
1: +  if (name && name[0]) {
1: +    name_off = btf__add_str(btf, name);
1: +    if (name_off < 0)
1: +      return name_off;
1: +  }
1:  
1: -	p->name_off = name_off;
1: -	p->type = type_id;
1: +  p->name_off = name_off;
1: +  p->type = type_id;
1:  
1: -	/* update parent type's vlen */
1: -	t = btf_last_type(btf);
1: -	btf_type_inc_vlen(t);
1: +  /* update parent type's vlen */
1: +  t = btf_last_type(btf);
1: +  btf_type_inc_vlen(t);
1:  
1: -	btf->hdr->type_len += sz;
1: -	btf->hdr->str_off += sz;
1: -	return 0;
1: +  btf->hdr->type_len += sz;
1: +  btf->hdr->str_off += sz;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -2299,42 +2218,41 @@ int btf__add_func_param(struct btf *btf, const char *name, int type_id)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_var(struct btf *btf, const char *name, int linkage, int type_id)
1: -{
1: -	struct btf_type *t;
1: -	struct btf_var *v;
1: -	int sz, name_off;
1: +int btf__add_var(struct btf *btf, const char *name, int linkage, int type_id) {
1: +  struct btf_type *t;
1: +  struct btf_var *v;
1: +  int sz, name_off;
1:  
1: -	/* non-empty name */
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: -	if (linkage != BTF_VAR_STATIC && linkage != BTF_VAR_GLOBAL_ALLOCATED &&
1: -	    linkage != BTF_VAR_GLOBAL_EXTERN)
1: -		return libbpf_err(-EINVAL);
1: -	if (validate_type_id(type_id))
1: -		return libbpf_err(-EINVAL);
1: +  /* non-empty name */
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1: +  if (linkage != BTF_VAR_STATIC && linkage != BTF_VAR_GLOBAL_ALLOCATED &&
1: +      linkage != BTF_VAR_GLOBAL_EXTERN)
1: +    return libbpf_err(-EINVAL);
1: +  if (validate_type_id(type_id))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	/* deconstruct BTF, if necessary, and invalidate raw_data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  /* deconstruct BTF, if necessary, and invalidate raw_data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type) + sizeof(struct btf_var);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type) + sizeof(struct btf_var);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	name_off = btf__add_str(btf, name);
1: -	if (name_off < 0)
1: -		return name_off;
1: +  name_off = btf__add_str(btf, name);
1: +  if (name_off < 0)
1: +    return name_off;
1:  
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(BTF_KIND_VAR, 0, 0);
1: -	t->type = type_id;
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(BTF_KIND_VAR, 0, 0);
1: +  t->type = type_id;
1:  
1: -	v = btf_var(t);
1: -	v->linkage = linkage;
1: +  v = btf_var(t);
1: +  v->linkage = linkage;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -2349,33 +2267,32 @@ int btf__add_var(struct btf *btf, const char *name, int linkage, int type_id)
1:   *   - >0, type ID of newly added BTF type;
1:   *   - <0, on error.
1:   */
1: -int btf__add_datasec(struct btf *btf, const char *name, __u32 byte_sz)
1: -{
1: -	struct btf_type *t;
1: -	int sz, name_off;
1: +int btf__add_datasec(struct btf *btf, const char *name, __u32 byte_sz) {
1: +  struct btf_type *t;
1: +  int sz, name_off;
1:  
1: -	/* non-empty name */
1: -	if (!name || !name[0])
1: -		return libbpf_err(-EINVAL);
1: +  /* non-empty name */
1: +  if (!name || !name[0])
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_type);
1: -	t = btf_add_type_mem(btf, sz);
1: -	if (!t)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_type);
1: +  t = btf_add_type_mem(btf, sz);
1: +  if (!t)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	name_off = btf__add_str(btf, name);
1: -	if (name_off < 0)
1: -		return name_off;
1: +  name_off = btf__add_str(btf, name);
1: +  if (name_off < 0)
1: +    return name_off;
1:  
1: -	/* start with vlen=0, which will be update as var_secinfos are added */
1: -	t->name_off = name_off;
1: -	t->info = btf_type_info(BTF_KIND_DATASEC, 0, 0);
1: -	t->size = byte_sz;
1: +  /* start with vlen=0, which will be update as var_secinfos are added */
1: +  t->name_off = name_off;
1: +  t->info = btf_type_info(BTF_KIND_DATASEC, 0, 0);
1: +  t->size = byte_sz;
1:  
1: -	return btf_commit_type(btf, sz);
1: +  return btf_commit_type(btf, sz);
1:  }
1:  
1:  /*
1: @@ -2388,361 +2305,347 @@ int btf__add_datasec(struct btf *btf, const char *name, __u32 byte_sz)
1:   *   -  0, on success;
1:   *   - <0, on error.
1:   */
1: -int btf__add_datasec_var_info(struct btf *btf, int var_type_id, __u32 offset, __u32 byte_sz)
1: -{
1: -	struct btf_type *t;
1: -	struct btf_var_secinfo *v;
1: -	int sz;
1: +int btf__add_datasec_var_info(struct btf *btf, int var_type_id, __u32 offset,
1: +                              __u32 byte_sz) {
1: +  struct btf_type *t;
1: +  struct btf_var_secinfo *v;
1: +  int sz;
1:  
1: -	/* last type should be BTF_KIND_DATASEC */
1: -	if (btf->nr_types == 0)
1: -		return libbpf_err(-EINVAL);
1: -	t = btf_last_type(btf);
1: -	if (!btf_is_datasec(t))
1: -		return libbpf_err(-EINVAL);
1: +  /* last type should be BTF_KIND_DATASEC */
1: +  if (btf->nr_types == 0)
1: +    return libbpf_err(-EINVAL);
1: +  t = btf_last_type(btf);
1: +  if (!btf_is_datasec(t))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (validate_type_id(var_type_id))
1: -		return libbpf_err(-EINVAL);
1: +  if (validate_type_id(var_type_id))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	/* decompose and invalidate raw data */
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: +  /* decompose and invalidate raw data */
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	sz = sizeof(struct btf_var_secinfo);
1: -	v = btf_add_type_mem(btf, sz);
1: -	if (!v)
1: -		return libbpf_err(-ENOMEM);
1: +  sz = sizeof(struct btf_var_secinfo);
1: +  v = btf_add_type_mem(btf, sz);
1: +  if (!v)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	v->type = var_type_id;
1: -	v->offset = offset;
1: -	v->size = byte_sz;
1: +  v->type = var_type_id;
1: +  v->offset = offset;
1: +  v->size = byte_sz;
1:  
1: -	/* update parent type's vlen */
1: -	t = btf_last_type(btf);
1: -	btf_type_inc_vlen(t);
1: +  /* update parent type's vlen */
1: +  t = btf_last_type(btf);
1: +  btf_type_inc_vlen(t);
1:  
1: -	btf->hdr->type_len += sz;
1: -	btf->hdr->str_off += sz;
1: -	return 0;
1: +  btf->hdr->type_len += sz;
1: +  btf->hdr->str_off += sz;
1: +  return 0;
1:  }
1:  
1:  struct btf_ext_sec_setup_param {
1: -	__u32 off;
1: -	__u32 len;
1: -	__u32 min_rec_size;
1: -	struct btf_ext_info *ext_info;
1: -	const char *desc;
1: +  __u32 off;
1: +  __u32 len;
1: +  __u32 min_rec_size;
1: +  struct btf_ext_info *ext_info;
1: +  const char *desc;
1:  };
1:  
1:  static int btf_ext_setup_info(struct btf_ext *btf_ext,
1: -			      struct btf_ext_sec_setup_param *ext_sec)
1: -{
1: -	const struct btf_ext_info_sec *sinfo;
1: -	struct btf_ext_info *ext_info;
1: -	__u32 info_left, record_size;
1: -	/* The start of the info sec (including the __u32 record_size). */
1: -	void *info;
1: -
1: -	if (ext_sec->len == 0)
1: -		return 0;
1: -
1: -	if (ext_sec->off & 0x03) {
1: -		pr_debug(".BTF.ext %s section is not aligned to 4 bytes\n",
1: -		     ext_sec->desc);
1: -		return -EINVAL;
1: -	}
1: -
1: -	info = btf_ext->data + btf_ext->hdr->hdr_len + ext_sec->off;
1: -	info_left = ext_sec->len;
1: -
1: -	if (btf_ext->data + btf_ext->data_size < info + ext_sec->len) {
1: -		pr_debug("%s section (off:%u len:%u) is beyond the end of the ELF section .BTF.ext\n",
1: -			 ext_sec->desc, ext_sec->off, ext_sec->len);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* At least a record size */
1: -	if (info_left < sizeof(__u32)) {
1: -		pr_debug(".BTF.ext %s record size not found\n", ext_sec->desc);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* The record size needs to meet the minimum standard */
1: -	record_size = *(__u32 *)info;
1: -	if (record_size < ext_sec->min_rec_size ||
1: -	    record_size & 0x03) {
1: -		pr_debug("%s section in .BTF.ext has invalid record size %u\n",
1: -			 ext_sec->desc, record_size);
1: -		return -EINVAL;
1: -	}
1: -
1: -	sinfo = info + sizeof(__u32);
1: -	info_left -= sizeof(__u32);
1: -
1: -	/* If no records, return failure now so .BTF.ext won't be used. */
1: -	if (!info_left) {
1: -		pr_debug("%s section in .BTF.ext has no records", ext_sec->desc);
1: -		return -EINVAL;
1: -	}
1: -
1: -	while (info_left) {
1: -		unsigned int sec_hdrlen = sizeof(struct btf_ext_info_sec);
1: -		__u64 total_record_size;
1: -		__u32 num_records;
1: -
1: -		if (info_left < sec_hdrlen) {
1: -			pr_debug("%s section header is not found in .BTF.ext\n",
1: -			     ext_sec->desc);
1: -			return -EINVAL;
1: -		}
1: -
1: -		num_records = sinfo->num_info;
1: -		if (num_records == 0) {
1: -			pr_debug("%s section has incorrect num_records in .BTF.ext\n",
1: -			     ext_sec->desc);
1: -			return -EINVAL;
1: -		}
1: -
1: -		total_record_size = sec_hdrlen +
1: -				    (__u64)num_records * record_size;
1: -		if (info_left < total_record_size) {
1: -			pr_debug("%s section has incorrect num_records in .BTF.ext\n",
1: -			     ext_sec->desc);
1: -			return -EINVAL;
1: -		}
1: -
1: -		info_left -= total_record_size;
1: -		sinfo = (void *)sinfo + total_record_size;
1: -	}
1: -
1: -	ext_info = ext_sec->ext_info;
1: -	ext_info->len = ext_sec->len - sizeof(__u32);
1: -	ext_info->rec_size = record_size;
1: -	ext_info->info = info + sizeof(__u32);
1: -
1: -	return 0;
1: -}
1: -
1: -static int btf_ext_setup_func_info(struct btf_ext *btf_ext)
1: -{
1: -	struct btf_ext_sec_setup_param param = {
1: -		.off = btf_ext->hdr->func_info_off,
1: -		.len = btf_ext->hdr->func_info_len,
1: -		.min_rec_size = sizeof(struct bpf_func_info_min),
1: -		.ext_info = &btf_ext->func_info,
1: -		.desc = "func_info"
1: -	};
1: -
1: -	return btf_ext_setup_info(btf_ext, &param);
1: -}
1: -
1: -static int btf_ext_setup_line_info(struct btf_ext *btf_ext)
1: -{
1: -	struct btf_ext_sec_setup_param param = {
1: -		.off = btf_ext->hdr->line_info_off,
1: -		.len = btf_ext->hdr->line_info_len,
1: -		.min_rec_size = sizeof(struct bpf_line_info_min),
1: -		.ext_info = &btf_ext->line_info,
1: -		.desc = "line_info",
1: -	};
1: -
1: -	return btf_ext_setup_info(btf_ext, &param);
1: -}
1: -
1: -static int btf_ext_setup_core_relos(struct btf_ext *btf_ext)
1: -{
1: -	struct btf_ext_sec_setup_param param = {
1: -		.off = btf_ext->hdr->core_relo_off,
1: -		.len = btf_ext->hdr->core_relo_len,
1: -		.min_rec_size = sizeof(struct bpf_core_relo),
1: -		.ext_info = &btf_ext->core_relo_info,
1: -		.desc = "core_relo",
1: -	};
1: -
1: -	return btf_ext_setup_info(btf_ext, &param);
1: -}
1: -
1: -static int btf_ext_parse_hdr(__u8 *data, __u32 data_size)
1: -{
1: -	const struct btf_ext_header *hdr = (struct btf_ext_header *)data;
1: -
1: -	if (data_size < offsetofend(struct btf_ext_header, hdr_len) ||
1: -	    data_size < hdr->hdr_len) {
1: -		pr_debug("BTF.ext header not found");
1: -		return -EINVAL;
1: -	}
1: -
1: -	if (hdr->magic == bswap_16(BTF_MAGIC)) {
1: -		pr_warn("BTF.ext in non-native endianness is not supported\n");
1: -		return -ENOTSUP;
1: -	} else if (hdr->magic != BTF_MAGIC) {
1: -		pr_debug("Invalid BTF.ext magic:%x\n", hdr->magic);
1: -		return -EINVAL;
1: -	}
1: -
1: -	if (hdr->version != BTF_VERSION) {
1: -		pr_debug("Unsupported BTF.ext version:%u\n", hdr->version);
1: -		return -ENOTSUP;
1: -	}
1: -
1: -	if (hdr->flags) {
1: -		pr_debug("Unsupported BTF.ext flags:%x\n", hdr->flags);
1: -		return -ENOTSUP;
1: -	}
1: -
1: -	if (data_size == hdr->hdr_len) {
1: -		pr_debug("BTF.ext has no data\n");
1: -		return -EINVAL;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -void btf_ext__free(struct btf_ext *btf_ext)
1: -{
1: -	if (IS_ERR_OR_NULL(btf_ext))
1: -		return;
1: -	free(btf_ext->data);
1: -	free(btf_ext);
1: -}
1: -
1: -struct btf_ext *btf_ext__new(__u8 *data, __u32 size)
1: -{
1: -	struct btf_ext *btf_ext;
1: -	int err;
1: -
1: -	err = btf_ext_parse_hdr(data, size);
1: -	if (err)
1: -		return libbpf_err_ptr(err);
1: -
1: -	btf_ext = calloc(1, sizeof(struct btf_ext));
1: -	if (!btf_ext)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -
1: -	btf_ext->data_size = size;
1: -	btf_ext->data = malloc(size);
1: -	if (!btf_ext->data) {
1: -		err = -ENOMEM;
1: -		goto done;
1: -	}
1: -	memcpy(btf_ext->data, data, size);
1: -
1: -	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, line_info_len)) {
1: -		err = -EINVAL;
1: -		goto done;
1: -	}
1: -
1: -	err = btf_ext_setup_func_info(btf_ext);
1: -	if (err)
1: -		goto done;
1: -
1: -	err = btf_ext_setup_line_info(btf_ext);
1: -	if (err)
1: -		goto done;
1: -
1: -	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
1: -		err = -EINVAL;
1: -		goto done;
1: -	}
1: -
1: -	err = btf_ext_setup_core_relos(btf_ext);
1: -	if (err)
1: -		goto done;
1: +                              struct btf_ext_sec_setup_param *ext_sec) {
1: +  const struct btf_ext_info_sec *sinfo;
1: +  struct btf_ext_info *ext_info;
1: +  __u32 info_left, record_size;
1: +  /* The start of the info sec (including the __u32 record_size). */
1: +  void *info;
1: +
1: +  if (ext_sec->len == 0)
1: +    return 0;
1: +
1: +  if (ext_sec->off & 0x03) {
1: +    pr_debug(".BTF.ext %s section is not aligned to 4 bytes\n", ext_sec->desc);
1: +    return -EINVAL;
1: +  }
1: +
1: +  info = btf_ext->data + btf_ext->hdr->hdr_len + ext_sec->off;
1: +  info_left = ext_sec->len;
1: +
1: +  if (btf_ext->data + btf_ext->data_size < info + ext_sec->len) {
1: +    pr_debug(
1: +        "%s section (off:%u len:%u) is beyond the end of the ELF section "
1: +        ".BTF.ext\n",
1: +        ext_sec->desc, ext_sec->off, ext_sec->len);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* At least a record size */
1: +  if (info_left < sizeof(__u32)) {
1: +    pr_debug(".BTF.ext %s record size not found\n", ext_sec->desc);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* The record size needs to meet the minimum standard */
1: +  record_size = *(__u32 *)info;
1: +  if (record_size < ext_sec->min_rec_size || record_size & 0x03) {
1: +    pr_debug("%s section in .BTF.ext has invalid record size %u\n",
1: +             ext_sec->desc, record_size);
1: +    return -EINVAL;
1: +  }
1: +
1: +  sinfo = info + sizeof(__u32);
1: +  info_left -= sizeof(__u32);
1: +
1: +  /* If no records, return failure now so .BTF.ext won't be used. */
1: +  if (!info_left) {
1: +    pr_debug("%s section in .BTF.ext has no records", ext_sec->desc);
1: +    return -EINVAL;
1: +  }
1: +
1: +  while (info_left) {
1: +    unsigned int sec_hdrlen = sizeof(struct btf_ext_info_sec);
1: +    __u64 total_record_size;
1: +    __u32 num_records;
1: +
1: +    if (info_left < sec_hdrlen) {
1: +      pr_debug("%s section header is not found in .BTF.ext\n", ext_sec->desc);
1: +      return -EINVAL;
1: +    }
1: +
1: +    num_records = sinfo->num_info;
1: +    if (num_records == 0) {
1: +      pr_debug("%s section has incorrect num_records in .BTF.ext\n",
1: +               ext_sec->desc);
1: +      return -EINVAL;
1: +    }
1: +
1: +    total_record_size = sec_hdrlen + (__u64)num_records * record_size;
1: +    if (info_left < total_record_size) {
1: +      pr_debug("%s section has incorrect num_records in .BTF.ext\n",
1: +               ext_sec->desc);
1: +      return -EINVAL;
1: +    }
1: +
1: +    info_left -= total_record_size;
1: +    sinfo = (void *)sinfo + total_record_size;
1: +  }
1: +
1: +  ext_info = ext_sec->ext_info;
1: +  ext_info->len = ext_sec->len - sizeof(__u32);
1: +  ext_info->rec_size = record_size;
1: +  ext_info->info = info + sizeof(__u32);
1: +
1: +  return 0;
1: +}
1: +
1: +static int btf_ext_setup_func_info(struct btf_ext *btf_ext) {
1: +  struct btf_ext_sec_setup_param param = {
1: +      .off = btf_ext->hdr->func_info_off,
1: +      .len = btf_ext->hdr->func_info_len,
1: +      .min_rec_size = sizeof(struct bpf_func_info_min),
1: +      .ext_info = &btf_ext->func_info,
1: +      .desc = "func_info"};
1: +
1: +  return btf_ext_setup_info(btf_ext, &param);
1: +}
1: +
1: +static int btf_ext_setup_line_info(struct btf_ext *btf_ext) {
1: +  struct btf_ext_sec_setup_param param = {
1: +      .off = btf_ext->hdr->line_info_off,
1: +      .len = btf_ext->hdr->line_info_len,
1: +      .min_rec_size = sizeof(struct bpf_line_info_min),
1: +      .ext_info = &btf_ext->line_info,
1: +      .desc = "line_info",
1: +  };
1: +
1: +  return btf_ext_setup_info(btf_ext, &param);
1: +}
1: +
1: +static int btf_ext_setup_core_relos(struct btf_ext *btf_ext) {
1: +  struct btf_ext_sec_setup_param param = {
1: +      .off = btf_ext->hdr->core_relo_off,
1: +      .len = btf_ext->hdr->core_relo_len,
1: +      .min_rec_size = sizeof(struct bpf_core_relo),
1: +      .ext_info = &btf_ext->core_relo_info,
1: +      .desc = "core_relo",
1: +  };
1: +
1: +  return btf_ext_setup_info(btf_ext, &param);
1: +}
1: +
1: +static int btf_ext_parse_hdr(__u8 *data, __u32 data_size) {
1: +  const struct btf_ext_header *hdr = (struct btf_ext_header *)data;
1: +
1: +  if (data_size < offsetofend(struct btf_ext_header, hdr_len) ||
1: +      data_size < hdr->hdr_len) {
1: +    pr_debug("BTF.ext header not found");
1: +    return -EINVAL;
1: +  }
1: +
1: +  if (hdr->magic == bswap_16(BTF_MAGIC)) {
1: +    pr_warn("BTF.ext in non-native endianness is not supported\n");
1: +    return -ENOTSUP;
1: +  } else if (hdr->magic != BTF_MAGIC) {
1: +    pr_debug("Invalid BTF.ext magic:%x\n", hdr->magic);
1: +    return -EINVAL;
1: +  }
1: +
1: +  if (hdr->version != BTF_VERSION) {
1: +    pr_debug("Unsupported BTF.ext version:%u\n", hdr->version);
1: +    return -ENOTSUP;
1: +  }
1: +
1: +  if (hdr->flags) {
1: +    pr_debug("Unsupported BTF.ext flags:%x\n", hdr->flags);
1: +    return -ENOTSUP;
1: +  }
1: +
1: +  if (data_size == hdr->hdr_len) {
1: +    pr_debug("BTF.ext has no data\n");
1: +    return -EINVAL;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +void btf_ext__free(struct btf_ext *btf_ext) {
1: +  if (IS_ERR_OR_NULL(btf_ext))
1: +    return;
1: +  free(btf_ext->data);
1: +  free(btf_ext);
1: +}
1: +
1: +struct btf_ext *btf_ext__new(__u8 *data, __u32 size) {
1: +  struct btf_ext *btf_ext;
1: +  int err;
1: +
1: +  err = btf_ext_parse_hdr(data, size);
1: +  if (err)
1: +    return libbpf_err_ptr(err);
1: +
1: +  btf_ext = calloc(1, sizeof(struct btf_ext));
1: +  if (!btf_ext)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +
1: +  btf_ext->data_size = size;
1: +  btf_ext->data = malloc(size);
1: +  if (!btf_ext->data) {
1: +    err = -ENOMEM;
1: +    goto done;
1: +  }
1: +  memcpy(btf_ext->data, data, size);
1: +
1: +  if (btf_ext->hdr->hdr_len <
1: +      offsetofend(struct btf_ext_header, line_info_len)) {
1: +    err = -EINVAL;
1: +    goto done;
1: +  }
1: +
1: +  err = btf_ext_setup_func_info(btf_ext);
1: +  if (err)
1: +    goto done;
1: +
1: +  err = btf_ext_setup_line_info(btf_ext);
1: +  if (err)
1: +    goto done;
1: +
1: +  if (btf_ext->hdr->hdr_len <
1: +      offsetofend(struct btf_ext_header, core_relo_len)) {
1: +    err = -EINVAL;
1: +    goto done;
1: +  }
1: +
1: +  err = btf_ext_setup_core_relos(btf_ext);
1: +  if (err)
1: +    goto done;
1:  
1:  done:
1: -	if (err) {
1: -		btf_ext__free(btf_ext);
1: -		return libbpf_err_ptr(err);
1: -	}
1: +  if (err) {
1: +    btf_ext__free(btf_ext);
1: +    return libbpf_err_ptr(err);
1: +  }
1:  
1: -	return btf_ext;
1: +  return btf_ext;
1:  }
1:  
1: -const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size)
1: -{
1: -	*size = btf_ext->data_size;
1: -	return btf_ext->data;
1: +const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size) {
1: +  *size = btf_ext->data_size;
1: +  return btf_ext->data;
1:  }
1:  
1:  static int btf_ext_reloc_info(const struct btf *btf,
1: -			      const struct btf_ext_info *ext_info,
1: -			      const char *sec_name, __u32 insns_cnt,
1: -			      void **info, __u32 *cnt)
1: -{
1: -	__u32 sec_hdrlen = sizeof(struct btf_ext_info_sec);
1: -	__u32 i, record_size, existing_len, records_len;
1: -	struct btf_ext_info_sec *sinfo;
1: -	const char *info_sec_name;
1: -	__u64 remain_len;
1: -	void *data;
1: -
1: -	record_size = ext_info->rec_size;
1: -	sinfo = ext_info->info;
1: -	remain_len = ext_info->len;
1: -	while (remain_len > 0) {
1: -		records_len = sinfo->num_info * record_size;
1: -		info_sec_name = btf__name_by_offset(btf, sinfo->sec_name_off);
1: -		if (strcmp(info_sec_name, sec_name)) {
1: -			remain_len -= sec_hdrlen + records_len;
1: -			sinfo = (void *)sinfo + sec_hdrlen + records_len;
1: -			continue;
1: -		}
1: -
1: -		existing_len = (*cnt) * record_size;
1: -		data = realloc(*info, existing_len + records_len);
1: -		if (!data)
1: -			return libbpf_err(-ENOMEM);
1: -
1: -		memcpy(data + existing_len, sinfo->data, records_len);
1: -		/* adjust insn_off only, the rest data will be passed
1: -		 * to the kernel.
1: -		 */
1: -		for (i = 0; i < sinfo->num_info; i++) {
1: -			__u32 *insn_off;
1: -
1: -			insn_off = data + existing_len + (i * record_size);
1: -			*insn_off = *insn_off / sizeof(struct bpf_insn) + insns_cnt;
1: -		}
1: -		*info = data;
1: -		*cnt += sinfo->num_info;
1: -		return 0;
1: -	}
1: -
1: -	return libbpf_err(-ENOENT);
1: +                              const struct btf_ext_info *ext_info,
1: +                              const char *sec_name, __u32 insns_cnt,
1: +                              void **info, __u32 *cnt) {
1: +  __u32 sec_hdrlen = sizeof(struct btf_ext_info_sec);
1: +  __u32 i, record_size, existing_len, records_len;
1: +  struct btf_ext_info_sec *sinfo;
1: +  const char *info_sec_name;
1: +  __u64 remain_len;
1: +  void *data;
1: +
1: +  record_size = ext_info->rec_size;
1: +  sinfo = ext_info->info;
1: +  remain_len = ext_info->len;
1: +  while (remain_len > 0) {
1: +    records_len = sinfo->num_info * record_size;
1: +    info_sec_name = btf__name_by_offset(btf, sinfo->sec_name_off);
1: +    if (strcmp(info_sec_name, sec_name)) {
1: +      remain_len -= sec_hdrlen + records_len;
1: +      sinfo = (void *)sinfo + sec_hdrlen + records_len;
1: +      continue;
1: +    }
1: +
1: +    existing_len = (*cnt) * record_size;
1: +    data = realloc(*info, existing_len + records_len);
1: +    if (!data)
1: +      return libbpf_err(-ENOMEM);
1: +
1: +    memcpy(data + existing_len, sinfo->data, records_len);
1: +    /* adjust insn_off only, the rest data will be passed
1: +     * to the kernel.
1: +     */
1: +    for (i = 0; i < sinfo->num_info; i++) {
1: +      __u32 *insn_off;
1: +
1: +      insn_off = data + existing_len + (i * record_size);
1: +      *insn_off = *insn_off / sizeof(struct bpf_insn) + insns_cnt;
1: +    }
1: +    *info = data;
1: +    *cnt += sinfo->num_info;
1: +    return 0;
1: +  }
1: +
1: +  return libbpf_err(-ENOENT);
1:  }
1:  
1:  int btf_ext__reloc_func_info(const struct btf *btf,
1: -			     const struct btf_ext *btf_ext,
1: -			     const char *sec_name, __u32 insns_cnt,
1: -			     void **func_info, __u32 *cnt)
1: -{
1: -	return btf_ext_reloc_info(btf, &btf_ext->func_info, sec_name,
1: -				  insns_cnt, func_info, cnt);
1: +                             const struct btf_ext *btf_ext,
1: +                             const char *sec_name, __u32 insns_cnt,
1: +                             void **func_info, __u32 *cnt) {
1: +  return btf_ext_reloc_info(btf, &btf_ext->func_info, sec_name, insns_cnt,
1: +                            func_info, cnt);
1:  }
1:  
1:  int btf_ext__reloc_line_info(const struct btf *btf,
1: -			     const struct btf_ext *btf_ext,
1: -			     const char *sec_name, __u32 insns_cnt,
1: -			     void **line_info, __u32 *cnt)
1: -{
1: -	return btf_ext_reloc_info(btf, &btf_ext->line_info, sec_name,
1: -				  insns_cnt, line_info, cnt);
1: +                             const struct btf_ext *btf_ext,
1: +                             const char *sec_name, __u32 insns_cnt,
1: +                             void **line_info, __u32 *cnt) {
1: +  return btf_ext_reloc_info(btf, &btf_ext->line_info, sec_name, insns_cnt,
1: +                            line_info, cnt);
1:  }
1:  
1: -__u32 btf_ext__func_info_rec_size(const struct btf_ext *btf_ext)
1: -{
1: -	return btf_ext->func_info.rec_size;
1: +__u32 btf_ext__func_info_rec_size(const struct btf_ext *btf_ext) {
1: +  return btf_ext->func_info.rec_size;
1:  }
1:  
1: -__u32 btf_ext__line_info_rec_size(const struct btf_ext *btf_ext)
1: -{
1: -	return btf_ext->line_info.rec_size;
1: +__u32 btf_ext__line_info_rec_size(const struct btf_ext *btf_ext) {
1: +  return btf_ext->line_info.rec_size;
1:  }
1:  
1:  struct btf_dedup;
1:  
1:  static struct btf_dedup *btf_dedup_new(struct btf *btf, struct btf_ext *btf_ext,
1: -				       const struct btf_dedup_opts *opts);
1: +                                       const struct btf_dedup_opts *opts);
1:  static void btf_dedup_free(struct btf_dedup *d);
1:  static int btf_dedup_prep(struct btf_dedup *d);
1:  static int btf_dedup_strings(struct btf_dedup *d);
1: @@ -2890,286 +2793,272 @@ static int btf_dedup_remap_types(struct btf_dedup *d);
1:   * `btf_dedup_is_equiv` function.
1:   */
1:  int btf__dedup(struct btf *btf, struct btf_ext *btf_ext,
1: -	       const struct btf_dedup_opts *opts)
1: -{
1: -	struct btf_dedup *d = btf_dedup_new(btf, btf_ext, opts);
1: -	int err;
1: -
1: -	if (IS_ERR(d)) {
1: -		pr_debug("btf_dedup_new failed: %ld", PTR_ERR(d));
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (btf_ensure_modifiable(btf))
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	err = btf_dedup_prep(d);
1: -	if (err) {
1: -		pr_debug("btf_dedup_prep failed:%d\n", err);
1: -		goto done;
1: -	}
1: -	err = btf_dedup_strings(d);
1: -	if (err < 0) {
1: -		pr_debug("btf_dedup_strings failed:%d\n", err);
1: -		goto done;
1: -	}
1: -	err = btf_dedup_prim_types(d);
1: -	if (err < 0) {
1: -		pr_debug("btf_dedup_prim_types failed:%d\n", err);
1: -		goto done;
1: -	}
1: -	err = btf_dedup_struct_types(d);
1: -	if (err < 0) {
1: -		pr_debug("btf_dedup_struct_types failed:%d\n", err);
1: -		goto done;
1: -	}
1: -	err = btf_dedup_ref_types(d);
1: -	if (err < 0) {
1: -		pr_debug("btf_dedup_ref_types failed:%d\n", err);
1: -		goto done;
1: -	}
1: -	err = btf_dedup_compact_types(d);
1: -	if (err < 0) {
1: -		pr_debug("btf_dedup_compact_types failed:%d\n", err);
1: -		goto done;
1: -	}
1: -	err = btf_dedup_remap_types(d);
1: -	if (err < 0) {
1: -		pr_debug("btf_dedup_remap_types failed:%d\n", err);
1: -		goto done;
1: -	}
1: +               const struct btf_dedup_opts *opts) {
1: +  struct btf_dedup *d = btf_dedup_new(btf, btf_ext, opts);
1: +  int err;
1: +
1: +  if (IS_ERR(d)) {
1: +    pr_debug("btf_dedup_new failed: %ld", PTR_ERR(d));
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (btf_ensure_modifiable(btf))
1: +    return libbpf_err(-ENOMEM);
1: +
1: +  err = btf_dedup_prep(d);
1: +  if (err) {
1: +    pr_debug("btf_dedup_prep failed:%d\n", err);
1: +    goto done;
1: +  }
1: +  err = btf_dedup_strings(d);
1: +  if (err < 0) {
1: +    pr_debug("btf_dedup_strings failed:%d\n", err);
1: +    goto done;
1: +  }
1: +  err = btf_dedup_prim_types(d);
1: +  if (err < 0) {
1: +    pr_debug("btf_dedup_prim_types failed:%d\n", err);
1: +    goto done;
1: +  }
1: +  err = btf_dedup_struct_types(d);
1: +  if (err < 0) {
1: +    pr_debug("btf_dedup_struct_types failed:%d\n", err);
1: +    goto done;
1: +  }
1: +  err = btf_dedup_ref_types(d);
1: +  if (err < 0) {
1: +    pr_debug("btf_dedup_ref_types failed:%d\n", err);
1: +    goto done;
1: +  }
1: +  err = btf_dedup_compact_types(d);
1: +  if (err < 0) {
1: +    pr_debug("btf_dedup_compact_types failed:%d\n", err);
1: +    goto done;
1: +  }
1: +  err = btf_dedup_remap_types(d);
1: +  if (err < 0) {
1: +    pr_debug("btf_dedup_remap_types failed:%d\n", err);
1: +    goto done;
1: +  }
1:  
1:  done:
1: -	btf_dedup_free(d);
1: -	return libbpf_err(err);
1: +  btf_dedup_free(d);
1: +  return libbpf_err(err);
1:  }
1:  
1:  #define BTF_UNPROCESSED_ID ((__u32)-1)
1:  #define BTF_IN_PROGRESS_ID ((__u32)-2)
1:  
1:  struct btf_dedup {
1: -	/* .BTF section to be deduped in-place */
1: -	struct btf *btf;
1: -	/*
1: -	 * Optional .BTF.ext section. When provided, any strings referenced
1: -	 * from it will be taken into account when deduping strings
1: -	 */
1: -	struct btf_ext *btf_ext;
1: -	/*
1: -	 * This is a map from any type's signature hash to a list of possible
1: -	 * canonical representative type candidates. Hash collisions are
1: -	 * ignored, so even types of various kinds can share same list of
1: -	 * candidates, which is fine because we rely on subsequent
1: -	 * btf_xxx_equal() checks to authoritatively verify type equality.
1: -	 */
1: -	struct hashmap *dedup_table;
1: -	/* Canonical types map */
1: -	__u32 *map;
1: -	/* Hypothetical mapping, used during type graph equivalence checks */
1: -	__u32 *hypot_map;
1: -	__u32 *hypot_list;
1: -	size_t hypot_cnt;
1: -	size_t hypot_cap;
1: -	/* Whether hypothetical mapping, if successful, would need to adjust
1: -	 * already canonicalized types (due to a new forward declaration to
1: -	 * concrete type resolution). In such case, during split BTF dedup
1: -	 * candidate type would still be considered as different, because base
1: -	 * BTF is considered to be immutable.
1: -	 */
1: -	bool hypot_adjust_canon;
1: -	/* Various option modifying behavior of algorithm */
1: -	struct btf_dedup_opts opts;
1: -	/* temporary strings deduplication state */
1: -	struct strset *strs_set;
1: +  /* .BTF section to be deduped in-place */
1: +  struct btf *btf;
1: +  /*
1: +   * Optional .BTF.ext section. When provided, any strings referenced
1: +   * from it will be taken into account when deduping strings
1: +   */
1: +  struct btf_ext *btf_ext;
1: +  /*
1: +   * This is a map from any type's signature hash to a list of possible
1: +   * canonical representative type candidates. Hash collisions are
1: +   * ignored, so even types of various kinds can share same list of
1: +   * candidates, which is fine because we rely on subsequent
1: +   * btf_xxx_equal() checks to authoritatively verify type equality.
1: +   */
1: +  struct hashmap *dedup_table;
1: +  /* Canonical types map */
1: +  __u32 *map;
1: +  /* Hypothetical mapping, used during type graph equivalence checks */
1: +  __u32 *hypot_map;
1: +  __u32 *hypot_list;
1: +  size_t hypot_cnt;
1: +  size_t hypot_cap;
1: +  /* Whether hypothetical mapping, if successful, would need to adjust
1: +   * already canonicalized types (due to a new forward declaration to
1: +   * concrete type resolution). In such case, during split BTF dedup
1: +   * candidate type would still be considered as different, because base
1: +   * BTF is considered to be immutable.
1: +   */
1: +  bool hypot_adjust_canon;
1: +  /* Various option modifying behavior of algorithm */
1: +  struct btf_dedup_opts opts;
1: +  /* temporary strings deduplication state */
1: +  struct strset *strs_set;
1:  };
1:  
1: -static long hash_combine(long h, long value)
1: -{
1: -	return h * 31 + value;
1: -}
1: +static long hash_combine(long h, long value) { return h * 31 + value; }
1:  
1:  #define for_each_dedup_cand(d, node, hash) \
1: -	hashmap__for_each_key_entry(d->dedup_table, node, (void *)hash)
1: +  hashmap__for_each_key_entry(d->dedup_table, node, (void *)hash)
1:  
1: -static int btf_dedup_table_add(struct btf_dedup *d, long hash, __u32 type_id)
1: -{
1: -	return hashmap__append(d->dedup_table,
1: -			       (void *)hash, (void *)(long)type_id);
1: +static int btf_dedup_table_add(struct btf_dedup *d, long hash, __u32 type_id) {
1: +  return hashmap__append(d->dedup_table, (void *)hash, (void *)(long)type_id);
1:  }
1:  
1: -static int btf_dedup_hypot_map_add(struct btf_dedup *d,
1: -				   __u32 from_id, __u32 to_id)
1: -{
1: -	if (d->hypot_cnt == d->hypot_cap) {
1: -		__u32 *new_list;
1: +static int btf_dedup_hypot_map_add(struct btf_dedup *d, __u32 from_id,
1: +                                   __u32 to_id) {
1: +  if (d->hypot_cnt == d->hypot_cap) {
1: +    __u32 *new_list;
1:  
1: -		d->hypot_cap += max((size_t)16, d->hypot_cap / 2);
1: -		new_list = libbpf_reallocarray(d->hypot_list, d->hypot_cap, sizeof(__u32));
1: -		if (!new_list)
1: -			return -ENOMEM;
1: -		d->hypot_list = new_list;
1: -	}
1: -	d->hypot_list[d->hypot_cnt++] = from_id;
1: -	d->hypot_map[from_id] = to_id;
1: -	return 0;
1: +    d->hypot_cap += max((size_t)16, d->hypot_cap / 2);
1: +    new_list = libbpf_reallocarray(d->hypot_list, d->hypot_cap, sizeof(__u32));
1: +    if (!new_list)
1: +      return -ENOMEM;
1: +    d->hypot_list = new_list;
1: +  }
1: +  d->hypot_list[d->hypot_cnt++] = from_id;
1: +  d->hypot_map[from_id] = to_id;
1: +  return 0;
1:  }
1:  
1: -static void btf_dedup_clear_hypot_map(struct btf_dedup *d)
1: -{
1: -	int i;
1: +static void btf_dedup_clear_hypot_map(struct btf_dedup *d) {
1: +  int i;
1:  
1: -	for (i = 0; i < d->hypot_cnt; i++)
1: -		d->hypot_map[d->hypot_list[i]] = BTF_UNPROCESSED_ID;
1: -	d->hypot_cnt = 0;
1: -	d->hypot_adjust_canon = false;
1: +  for (i = 0; i < d->hypot_cnt; i++)
1: +    d->hypot_map[d->hypot_list[i]] = BTF_UNPROCESSED_ID;
1: +  d->hypot_cnt = 0;
1: +  d->hypot_adjust_canon = false;
1:  }
1:  
1: -static void btf_dedup_free(struct btf_dedup *d)
1: -{
1: -	hashmap__free(d->dedup_table);
1: -	d->dedup_table = NULL;
1: +static void btf_dedup_free(struct btf_dedup *d) {
1: +  hashmap__free(d->dedup_table);
1: +  d->dedup_table = NULL;
1:  
1: -	free(d->map);
1: -	d->map = NULL;
1: +  free(d->map);
1: +  d->map = NULL;
1:  
1: -	free(d->hypot_map);
1: -	d->hypot_map = NULL;
1: +  free(d->hypot_map);
1: +  d->hypot_map = NULL;
1:  
1: -	free(d->hypot_list);
1: -	d->hypot_list = NULL;
1: +  free(d->hypot_list);
1: +  d->hypot_list = NULL;
1:  
1: -	free(d);
1: +  free(d);
1:  }
1:  
1: -static size_t btf_dedup_identity_hash_fn(const void *key, void *ctx)
1: -{
1: -	return (size_t)key;
1: +static size_t btf_dedup_identity_hash_fn(const void *key, void *ctx) {
1: +  return (size_t)key;
1:  }
1:  
1: -static size_t btf_dedup_collision_hash_fn(const void *key, void *ctx)
1: -{
1: -	return 0;
1: +static size_t btf_dedup_collision_hash_fn(const void *key, void *ctx) {
1: +  return 0;
1:  }
1:  
1: -static bool btf_dedup_equal_fn(const void *k1, const void *k2, void *ctx)
1: -{
1: -	return k1 == k2;
1: +static bool btf_dedup_equal_fn(const void *k1, const void *k2, void *ctx) {
1: +  return k1 == k2;
1:  }
1:  
1:  static struct btf_dedup *btf_dedup_new(struct btf *btf, struct btf_ext *btf_ext,
1: -				       const struct btf_dedup_opts *opts)
1: -{
1: -	struct btf_dedup *d = calloc(1, sizeof(struct btf_dedup));
1: -	hashmap_hash_fn hash_fn = btf_dedup_identity_hash_fn;
1: -	int i, err = 0, type_cnt;
1: -
1: -	if (!d)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	d->opts.dont_resolve_fwds = opts && opts->dont_resolve_fwds;
1: -	/* dedup_table_size is now used only to force collisions in tests */
1: -	if (opts && opts->dedup_table_size == 1)
1: -		hash_fn = btf_dedup_collision_hash_fn;
1: -
1: -	d->btf = btf;
1: -	d->btf_ext = btf_ext;
1: -
1: -	d->dedup_table = hashmap__new(hash_fn, btf_dedup_equal_fn, NULL);
1: -	if (IS_ERR(d->dedup_table)) {
1: -		err = PTR_ERR(d->dedup_table);
1: -		d->dedup_table = NULL;
1: -		goto done;
1: -	}
1: -
1: -	type_cnt = btf__get_nr_types(btf) + 1;
1: -	d->map = malloc(sizeof(__u32) * type_cnt);
1: -	if (!d->map) {
1: -		err = -ENOMEM;
1: -		goto done;
1: -	}
1: -	/* special BTF "void" type is made canonical immediately */
1: -	d->map[0] = 0;
1: -	for (i = 1; i < type_cnt; i++) {
1: -		struct btf_type *t = btf_type_by_id(d->btf, i);
1: -
1: -		/* VAR and DATASEC are never deduped and are self-canonical */
1: -		if (btf_is_var(t) || btf_is_datasec(t))
1: -			d->map[i] = i;
1: -		else
1: -			d->map[i] = BTF_UNPROCESSED_ID;
1: -	}
1: -
1: -	d->hypot_map = malloc(sizeof(__u32) * type_cnt);
1: -	if (!d->hypot_map) {
1: -		err = -ENOMEM;
1: -		goto done;
1: -	}
1: -	for (i = 0; i < type_cnt; i++)
1: -		d->hypot_map[i] = BTF_UNPROCESSED_ID;
1: +                                       const struct btf_dedup_opts *opts) {
1: +  struct btf_dedup *d = calloc(1, sizeof(struct btf_dedup));
1: +  hashmap_hash_fn hash_fn = btf_dedup_identity_hash_fn;
1: +  int i, err = 0, type_cnt;
1: +
1: +  if (!d)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  d->opts.dont_resolve_fwds = opts && opts->dont_resolve_fwds;
1: +  /* dedup_table_size is now used only to force collisions in tests */
1: +  if (opts && opts->dedup_table_size == 1)
1: +    hash_fn = btf_dedup_collision_hash_fn;
1: +
1: +  d->btf = btf;
1: +  d->btf_ext = btf_ext;
1: +
1: +  d->dedup_table = hashmap__new(hash_fn, btf_dedup_equal_fn, NULL);
1: +  if (IS_ERR(d->dedup_table)) {
1: +    err = PTR_ERR(d->dedup_table);
1: +    d->dedup_table = NULL;
1: +    goto done;
1: +  }
1: +
1: +  type_cnt = btf__get_nr_types(btf) + 1;
1: +  d->map = malloc(sizeof(__u32) * type_cnt);
1: +  if (!d->map) {
1: +    err = -ENOMEM;
1: +    goto done;
1: +  }
1: +  /* special BTF "void" type is made canonical immediately */
1: +  d->map[0] = 0;
1: +  for (i = 1; i < type_cnt; i++) {
1: +    struct btf_type *t = btf_type_by_id(d->btf, i);
1: +
1: +    /* VAR and DATASEC are never deduped and are self-canonical */
1: +    if (btf_is_var(t) || btf_is_datasec(t))
1: +      d->map[i] = i;
1: +    else
1: +      d->map[i] = BTF_UNPROCESSED_ID;
1: +  }
1: +
1: +  d->hypot_map = malloc(sizeof(__u32) * type_cnt);
1: +  if (!d->hypot_map) {
1: +    err = -ENOMEM;
1: +    goto done;
1: +  }
1: +  for (i = 0; i < type_cnt; i++)
1: +    d->hypot_map[i] = BTF_UNPROCESSED_ID;
1:  
1:  done:
1: -	if (err) {
1: -		btf_dedup_free(d);
1: -		return ERR_PTR(err);
1: -	}
1: +  if (err) {
1: +    btf_dedup_free(d);
1: +    return ERR_PTR(err);
1: +  }
1:  
1: -	return d;
1: +  return d;
1:  }
1:  
1:  /*
1:   * Iterate over all possible places in .BTF and .BTF.ext that can reference
1:   * string and pass pointer to it to a provided callback `fn`.
1:   */
1: -static int btf_for_each_str_off(struct btf_dedup *d, str_off_visit_fn fn, void *ctx)
1: -{
1: -	int i, r;
1: +static int btf_for_each_str_off(struct btf_dedup *d, str_off_visit_fn fn,
1: +                                void *ctx) {
1: +  int i, r;
1:  
1: -	for (i = 0; i < d->btf->nr_types; i++) {
1: -		struct btf_type *t = btf_type_by_id(d->btf, d->btf->start_id + i);
1: +  for (i = 0; i < d->btf->nr_types; i++) {
1: +    struct btf_type *t = btf_type_by_id(d->btf, d->btf->start_id + i);
1:  
1: -		r = btf_type_visit_str_offs(t, fn, ctx);
1: -		if (r)
1: -			return r;
1: -	}
1: +    r = btf_type_visit_str_offs(t, fn, ctx);
1: +    if (r)
1: +      return r;
1: +  }
1:  
1: -	if (!d->btf_ext)
1: -		return 0;
1: +  if (!d->btf_ext)
1: +    return 0;
1:  
1: -	r = btf_ext_visit_str_offs(d->btf_ext, fn, ctx);
1: -	if (r)
1: -		return r;
1: +  r = btf_ext_visit_str_offs(d->btf_ext, fn, ctx);
1: +  if (r)
1: +    return r;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int strs_dedup_remap_str_off(__u32 *str_off_ptr, void *ctx)
1: -{
1: -	struct btf_dedup *d = ctx;
1: -	__u32 str_off = *str_off_ptr;
1: -	const char *s;
1: -	int off, err;
1: +static int strs_dedup_remap_str_off(__u32 *str_off_ptr, void *ctx) {
1: +  struct btf_dedup *d = ctx;
1: +  __u32 str_off = *str_off_ptr;
1: +  const char *s;
1: +  int off, err;
1:  
1: -	/* don't touch empty string or string in main BTF */
1: -	if (str_off == 0 || str_off < d->btf->start_str_off)
1: -		return 0;
1: +  /* don't touch empty string or string in main BTF */
1: +  if (str_off == 0 || str_off < d->btf->start_str_off)
1: +    return 0;
1:  
1: -	s = btf__str_by_offset(d->btf, str_off);
1: -	if (d->btf->base_btf) {
1: -		err = btf__find_str(d->btf->base_btf, s);
1: -		if (err >= 0) {
1: -			*str_off_ptr = err;
1: -			return 0;
1: -		}
1: -		if (err != -ENOENT)
1: -			return err;
1: -	}
1: +  s = btf__str_by_offset(d->btf, str_off);
1: +  if (d->btf->base_btf) {
1: +    err = btf__find_str(d->btf->base_btf, s);
1: +    if (err >= 0) {
1: +      *str_off_ptr = err;
1: +      return 0;
1: +    }
1: +    if (err != -ENOENT)
1: +      return err;
1: +  }
1:  
1: -	off = strset__add_str(d->strs_set, s);
1: -	if (off < 0)
1: -		return off;
1: +  off = strset__add_str(d->strs_set, s);
1: +  if (off < 0)
1: +    return off;
1:  
1: -	*str_off_ptr = d->btf->start_str_off + off;
1: -	return 0;
1: +  *str_off_ptr = d->btf->start_str_off + off;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -3183,135 +3072,124 @@ static int strs_dedup_remap_str_off(__u32 *str_off_ptr, void *ctx)
1:   * sequential blob of memory and new offsets are calculated. Then all the string
1:   * references are iterated again and rewritten using new offsets.
1:   */
1: -static int btf_dedup_strings(struct btf_dedup *d)
1: -{
1: -	int err;
1: -
1: -	if (d->btf->strs_deduped)
1: -		return 0;
1: -
1: -	d->strs_set = strset__new(BTF_MAX_STR_OFFSET, NULL, 0);
1: -	if (IS_ERR(d->strs_set)) {
1: -		err = PTR_ERR(d->strs_set);
1: -		goto err_out;
1: -	}
1: -
1: -	if (!d->btf->base_btf) {
1: -		/* insert empty string; we won't be looking it up during strings
1: -		 * dedup, but it's good to have it for generic BTF string lookups
1: -		 */
1: -		err = strset__add_str(d->strs_set, "");
1: -		if (err < 0)
1: -			goto err_out;
1: -	}
1: -
1: -	/* remap string offsets */
1: -	err = btf_for_each_str_off(d, strs_dedup_remap_str_off, d);
1: -	if (err)
1: -		goto err_out;
1: -
1: -	/* replace BTF string data and hash with deduped ones */
1: -	strset__free(d->btf->strs_set);
1: -	d->btf->hdr->str_len = strset__data_size(d->strs_set);
1: -	d->btf->strs_set = d->strs_set;
1: -	d->strs_set = NULL;
1: -	d->btf->strs_deduped = true;
1: -	return 0;
1: +static int btf_dedup_strings(struct btf_dedup *d) {
1: +  int err;
1: +
1: +  if (d->btf->strs_deduped)
1: +    return 0;
1: +
1: +  d->strs_set = strset__new(BTF_MAX_STR_OFFSET, NULL, 0);
1: +  if (IS_ERR(d->strs_set)) {
1: +    err = PTR_ERR(d->strs_set);
1: +    goto err_out;
1: +  }
1: +
1: +  if (!d->btf->base_btf) {
1: +    /* insert empty string; we won't be looking it up during strings
1: +     * dedup, but it's good to have it for generic BTF string lookups
1: +     */
1: +    err = strset__add_str(d->strs_set, "");
1: +    if (err < 0)
1: +      goto err_out;
1: +  }
1: +
1: +  /* remap string offsets */
1: +  err = btf_for_each_str_off(d, strs_dedup_remap_str_off, d);
1: +  if (err)
1: +    goto err_out;
1: +
1: +  /* replace BTF string data and hash with deduped ones */
1: +  strset__free(d->btf->strs_set);
1: +  d->btf->hdr->str_len = strset__data_size(d->strs_set);
1: +  d->btf->strs_set = d->strs_set;
1: +  d->strs_set = NULL;
1: +  d->btf->strs_deduped = true;
1: +  return 0;
1:  
1:  err_out:
1: -	strset__free(d->strs_set);
1: -	d->strs_set = NULL;
1: +  strset__free(d->strs_set);
1: +  d->strs_set = NULL;
1:  
1: -	return err;
1: +  return err;
1:  }
1:  
1: -static long btf_hash_common(struct btf_type *t)
1: -{
1: -	long h;
1: +static long btf_hash_common(struct btf_type *t) {
1: +  long h;
1:  
1: -	h = hash_combine(0, t->name_off);
1: -	h = hash_combine(h, t->info);
1: -	h = hash_combine(h, t->size);
1: -	return h;
1: +  h = hash_combine(0, t->name_off);
1: +  h = hash_combine(h, t->info);
1: +  h = hash_combine(h, t->size);
1: +  return h;
1:  }
1:  
1: -static bool btf_equal_common(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	return t1->name_off == t2->name_off &&
1: -	       t1->info == t2->info &&
1: -	       t1->size == t2->size;
1: +static bool btf_equal_common(struct btf_type *t1, struct btf_type *t2) {
1: +  return t1->name_off == t2->name_off && t1->info == t2->info &&
1: +         t1->size == t2->size;
1:  }
1:  
1:  /* Calculate type signature hash of INT. */
1: -static long btf_hash_int(struct btf_type *t)
1: -{
1: -	__u32 info = *(__u32 *)(t + 1);
1: -	long h;
1: +static long btf_hash_int(struct btf_type *t) {
1: +  __u32 info = *(__u32 *)(t + 1);
1: +  long h;
1:  
1: -	h = btf_hash_common(t);
1: -	h = hash_combine(h, info);
1: -	return h;
1: +  h = btf_hash_common(t);
1: +  h = hash_combine(h, info);
1: +  return h;
1:  }
1:  
1:  /* Check structural equality of two INTs. */
1: -static bool btf_equal_int(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	__u32 info1, info2;
1: +static bool btf_equal_int(struct btf_type *t1, struct btf_type *t2) {
1: +  __u32 info1, info2;
1:  
1: -	if (!btf_equal_common(t1, t2))
1: -		return false;
1: -	info1 = *(__u32 *)(t1 + 1);
1: -	info2 = *(__u32 *)(t2 + 1);
1: -	return info1 == info2;
1: +  if (!btf_equal_common(t1, t2))
1: +    return false;
1: +  info1 = *(__u32 *)(t1 + 1);
1: +  info2 = *(__u32 *)(t2 + 1);
1: +  return info1 == info2;
1:  }
1:  
1:  /* Calculate type signature hash of ENUM. */
1: -static long btf_hash_enum(struct btf_type *t)
1: -{
1: -	long h;
1: +static long btf_hash_enum(struct btf_type *t) {
1: +  long h;
1:  
1: -	/* don't hash vlen and enum members to support enum fwd resolving */
1: -	h = hash_combine(0, t->name_off);
1: -	h = hash_combine(h, t->info & ~0xffff);
1: -	h = hash_combine(h, t->size);
1: -	return h;
1: +  /* don't hash vlen and enum members to support enum fwd resolving */
1: +  h = hash_combine(0, t->name_off);
1: +  h = hash_combine(h, t->info & ~0xffff);
1: +  h = hash_combine(h, t->size);
1: +  return h;
1:  }
1:  
1:  /* Check structural equality of two ENUMs. */
1: -static bool btf_equal_enum(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	const struct btf_enum *m1, *m2;
1: -	__u16 vlen;
1: -	int i;
1: -
1: -	if (!btf_equal_common(t1, t2))
1: -		return false;
1: -
1: -	vlen = btf_vlen(t1);
1: -	m1 = btf_enum(t1);
1: -	m2 = btf_enum(t2);
1: -	for (i = 0; i < vlen; i++) {
1: -		if (m1->name_off != m2->name_off || m1->val != m2->val)
1: -			return false;
1: -		m1++;
1: -		m2++;
1: -	}
1: -	return true;
1: -}
1: -
1: -static inline bool btf_is_enum_fwd(struct btf_type *t)
1: -{
1: -	return btf_is_enum(t) && btf_vlen(t) == 0;
1: -}
1: -
1: -static bool btf_compat_enum(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	if (!btf_is_enum_fwd(t1) && !btf_is_enum_fwd(t2))
1: -		return btf_equal_enum(t1, t2);
1: -	/* ignore vlen when comparing */
1: -	return t1->name_off == t2->name_off &&
1: -	       (t1->info & ~0xffff) == (t2->info & ~0xffff) &&
1: -	       t1->size == t2->size;
1: +static bool btf_equal_enum(struct btf_type *t1, struct btf_type *t2) {
1: +  const struct btf_enum *m1, *m2;
1: +  __u16 vlen;
1: +  int i;
1: +
1: +  if (!btf_equal_common(t1, t2))
1: +    return false;
1: +
1: +  vlen = btf_vlen(t1);
1: +  m1 = btf_enum(t1);
1: +  m2 = btf_enum(t2);
1: +  for (i = 0; i < vlen; i++) {
1: +    if (m1->name_off != m2->name_off || m1->val != m2->val)
1: +      return false;
1: +    m1++;
1: +    m2++;
1: +  }
1: +  return true;
1: +}
1: +
1: +static inline bool btf_is_enum_fwd(struct btf_type *t) {
1: +  return btf_is_enum(t) && btf_vlen(t) == 0;
1: +}
1: +
1: +static bool btf_compat_enum(struct btf_type *t1, struct btf_type *t2) {
1: +  if (!btf_is_enum_fwd(t1) && !btf_is_enum_fwd(t2))
1: +    return btf_equal_enum(t1, t2);
1: +  /* ignore vlen when comparing */
1: +  return t1->name_off == t2->name_off &&
1: +         (t1->info & ~0xffff) == (t2->info & ~0xffff) && t1->size == t2->size;
1:  }
1:  
1:  /*
1: @@ -3319,20 +3197,19 @@ static bool btf_compat_enum(struct btf_type *t1, struct btf_type *t2)
1:   * as referenced type IDs equivalence is established separately during type
1:   * graph equivalence check algorithm.
1:   */
1: -static long btf_hash_struct(struct btf_type *t)
1: -{
1: -	const struct btf_member *member = btf_members(t);
1: -	__u32 vlen = btf_vlen(t);
1: -	long h = btf_hash_common(t);
1: -	int i;
1: -
1: -	for (i = 0; i < vlen; i++) {
1: -		h = hash_combine(h, member->name_off);
1: -		h = hash_combine(h, member->offset);
1: -		/* no hashing of referenced type ID, it can be unresolved yet */
1: -		member++;
1: -	}
1: -	return h;
1: +static long btf_hash_struct(struct btf_type *t) {
1: +  const struct btf_member *member = btf_members(t);
1: +  __u32 vlen = btf_vlen(t);
1: +  long h = btf_hash_common(t);
1: +  int i;
1: +
1: +  for (i = 0; i < vlen; i++) {
1: +    h = hash_combine(h, member->name_off);
1: +    h = hash_combine(h, member->offset);
1: +    /* no hashing of referenced type ID, it can be unresolved yet */
1: +    member++;
1: +  }
1: +  return h;
1:  }
1:  
1:  /*
1: @@ -3340,25 +3217,24 @@ static long btf_hash_struct(struct btf_type *t)
1:   * IDs. This check is performed during type graph equivalence check and
1:   * referenced types equivalence is checked separately.
1:   */
1: -static bool btf_shallow_equal_struct(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	const struct btf_member *m1, *m2;
1: -	__u16 vlen;
1: -	int i;
1: -
1: -	if (!btf_equal_common(t1, t2))
1: -		return false;
1: -
1: -	vlen = btf_vlen(t1);
1: -	m1 = btf_members(t1);
1: -	m2 = btf_members(t2);
1: -	for (i = 0; i < vlen; i++) {
1: -		if (m1->name_off != m2->name_off || m1->offset != m2->offset)
1: -			return false;
1: -		m1++;
1: -		m2++;
1: -	}
1: -	return true;
1: +static bool btf_shallow_equal_struct(struct btf_type *t1, struct btf_type *t2) {
1: +  const struct btf_member *m1, *m2;
1: +  __u16 vlen;
1: +  int i;
1: +
1: +  if (!btf_equal_common(t1, t2))
1: +    return false;
1: +
1: +  vlen = btf_vlen(t1);
1: +  m1 = btf_members(t1);
1: +  m2 = btf_members(t2);
1: +  for (i = 0; i < vlen; i++) {
1: +    if (m1->name_off != m2->name_off || m1->offset != m2->offset)
1: +      return false;
1: +    m1++;
1: +    m2++;
1: +  }
1: +  return true;
1:  }
1:  
1:  /*
1: @@ -3366,15 +3242,14 @@ static bool btf_shallow_equal_struct(struct btf_type *t1, struct btf_type *t2)
1:   * under assumption that they were already resolved to canonical type IDs and
1:   * are not going to change.
1:   */
1: -static long btf_hash_array(struct btf_type *t)
1: -{
1: -	const struct btf_array *info = btf_array(t);
1: -	long h = btf_hash_common(t);
1: +static long btf_hash_array(struct btf_type *t) {
1: +  const struct btf_array *info = btf_array(t);
1: +  long h = btf_hash_common(t);
1:  
1: -	h = hash_combine(h, info->type);
1: -	h = hash_combine(h, info->index_type);
1: -	h = hash_combine(h, info->nelems);
1: -	return h;
1: +  h = hash_combine(h, info->type);
1: +  h = hash_combine(h, info->index_type);
1: +  h = hash_combine(h, info->nelems);
1: +  return h;
1:  }
1:  
1:  /*
1: @@ -3384,18 +3259,16 @@ static long btf_hash_array(struct btf_type *t)
1:   * This function is called during reference types deduplication to compare
1:   * ARRAY to potential canonical representative.
1:   */
1: -static bool btf_equal_array(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	const struct btf_array *info1, *info2;
1: +static bool btf_equal_array(struct btf_type *t1, struct btf_type *t2) {
1: +  const struct btf_array *info1, *info2;
1:  
1: -	if (!btf_equal_common(t1, t2))
1: -		return false;
1: +  if (!btf_equal_common(t1, t2))
1: +    return false;
1:  
1: -	info1 = btf_array(t1);
1: -	info2 = btf_array(t2);
1: -	return info1->type == info2->type &&
1: -	       info1->index_type == info2->index_type &&
1: -	       info1->nelems == info2->nelems;
1: +  info1 = btf_array(t1);
1: +  info2 = btf_array(t2);
1: +  return info1->type == info2->type && info1->index_type == info2->index_type &&
1: +         info1->nelems == info2->nelems;
1:  }
1:  
1:  /*
1: @@ -3403,12 +3276,11 @@ static bool btf_equal_array(struct btf_type *t1, struct btf_type *t2)
1:   * IDs. This check is performed during type graph equivalence check and
1:   * referenced types equivalence is checked separately.
1:   */
1: -static bool btf_compat_array(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	if (!btf_equal_common(t1, t2))
1: -		return false;
1: +static bool btf_compat_array(struct btf_type *t1, struct btf_type *t2) {
1: +  if (!btf_equal_common(t1, t2))
1: +    return false;
1:  
1: -	return btf_array(t1)->nelems == btf_array(t2)->nelems;
1: +  return btf_array(t1)->nelems == btf_array(t2)->nelems;
1:  }
1:  
1:  /*
1: @@ -3416,19 +3288,18 @@ static bool btf_compat_array(struct btf_type *t1, struct btf_type *t2)
1:   * under assumption that they were already resolved to canonical type IDs and
1:   * are not going to change.
1:   */
1: -static long btf_hash_fnproto(struct btf_type *t)
1: -{
1: -	const struct btf_param *member = btf_params(t);
1: -	__u16 vlen = btf_vlen(t);
1: -	long h = btf_hash_common(t);
1: -	int i;
1: +static long btf_hash_fnproto(struct btf_type *t) {
1: +  const struct btf_param *member = btf_params(t);
1: +  __u16 vlen = btf_vlen(t);
1: +  long h = btf_hash_common(t);
1: +  int i;
1:  
1: -	for (i = 0; i < vlen; i++) {
1: -		h = hash_combine(h, member->name_off);
1: -		h = hash_combine(h, member->type);
1: -		member++;
1: -	}
1: -	return h;
1: +  for (i = 0; i < vlen; i++) {
1: +    h = hash_combine(h, member->name_off);
1: +    h = hash_combine(h, member->type);
1: +    member++;
1: +  }
1: +  return h;
1:  }
1:  
1:  /*
1: @@ -3438,25 +3309,24 @@ static long btf_hash_fnproto(struct btf_type *t)
1:   * This function is called during reference types deduplication to compare
1:   * FUNC_PROTO to potential canonical representative.
1:   */
1: -static bool btf_equal_fnproto(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	const struct btf_param *m1, *m2;
1: -	__u16 vlen;
1: -	int i;
1: -
1: -	if (!btf_equal_common(t1, t2))
1: -		return false;
1: -
1: -	vlen = btf_vlen(t1);
1: -	m1 = btf_params(t1);
1: -	m2 = btf_params(t2);
1: -	for (i = 0; i < vlen; i++) {
1: -		if (m1->name_off != m2->name_off || m1->type != m2->type)
1: -			return false;
1: -		m1++;
1: -		m2++;
1: -	}
1: -	return true;
1: +static bool btf_equal_fnproto(struct btf_type *t1, struct btf_type *t2) {
1: +  const struct btf_param *m1, *m2;
1: +  __u16 vlen;
1: +  int i;
1: +
1: +  if (!btf_equal_common(t1, t2))
1: +    return false;
1: +
1: +  vlen = btf_vlen(t1);
1: +  m1 = btf_params(t1);
1: +  m2 = btf_params(t2);
1: +  for (i = 0; i < vlen; i++) {
1: +    if (m1->name_off != m2->name_off || m1->type != m2->type)
1: +      return false;
1: +    m1++;
1: +    m2++;
1: +  }
1: +  return true;
1:  }
1:  
1:  /*
1: @@ -3464,87 +3334,85 @@ static bool btf_equal_fnproto(struct btf_type *t1, struct btf_type *t2)
1:   * IDs. This check is performed during type graph equivalence check and
1:   * referenced types equivalence is checked separately.
1:   */
1: -static bool btf_compat_fnproto(struct btf_type *t1, struct btf_type *t2)
1: -{
1: -	const struct btf_param *m1, *m2;
1: -	__u16 vlen;
1: -	int i;
1: -
1: -	/* skip return type ID */
1: -	if (t1->name_off != t2->name_off || t1->info != t2->info)
1: -		return false;
1: -
1: -	vlen = btf_vlen(t1);
1: -	m1 = btf_params(t1);
1: -	m2 = btf_params(t2);
1: -	for (i = 0; i < vlen; i++) {
1: -		if (m1->name_off != m2->name_off)
1: -			return false;
1: -		m1++;
1: -		m2++;
1: -	}
1: -	return true;
1: +static bool btf_compat_fnproto(struct btf_type *t1, struct btf_type *t2) {
1: +  const struct btf_param *m1, *m2;
1: +  __u16 vlen;
1: +  int i;
1: +
1: +  /* skip return type ID */
1: +  if (t1->name_off != t2->name_off || t1->info != t2->info)
1: +    return false;
1: +
1: +  vlen = btf_vlen(t1);
1: +  m1 = btf_params(t1);
1: +  m2 = btf_params(t2);
1: +  for (i = 0; i < vlen; i++) {
1: +    if (m1->name_off != m2->name_off)
1: +      return false;
1: +    m1++;
1: +    m2++;
1: +  }
1: +  return true;
1:  }
1:  
1:  /* Prepare split BTF for deduplication by calculating hashes of base BTF's
1:   * types and initializing the rest of the state (canonical type mapping) for
1:   * the fixed base BTF part.
1:   */
1: -static int btf_dedup_prep(struct btf_dedup *d)
1: -{
1: -	struct btf_type *t;
1: -	int type_id;
1: -	long h;
1: -
1: -	if (!d->btf->base_btf)
1: -		return 0;
1: -
1: -	for (type_id = 1; type_id < d->btf->start_id; type_id++) {
1: -		t = btf_type_by_id(d->btf, type_id);
1: -
1: -		/* all base BTF types are self-canonical by definition */
1: -		d->map[type_id] = type_id;
1: -
1: -		switch (btf_kind(t)) {
1: -		case BTF_KIND_VAR:
1: -		case BTF_KIND_DATASEC:
1: -			/* VAR and DATASEC are never hash/deduplicated */
1: -			continue;
1: -		case BTF_KIND_CONST:
1: -		case BTF_KIND_VOLATILE:
1: -		case BTF_KIND_RESTRICT:
1: -		case BTF_KIND_PTR:
1: -		case BTF_KIND_FWD:
1: -		case BTF_KIND_TYPEDEF:
1: -		case BTF_KIND_FUNC:
1: -		case BTF_KIND_FLOAT:
1: -			h = btf_hash_common(t);
1: -			break;
1: -		case BTF_KIND_INT:
1: -			h = btf_hash_int(t);
1: -			break;
1: -		case BTF_KIND_ENUM:
1: -			h = btf_hash_enum(t);
1: -			break;
1: -		case BTF_KIND_STRUCT:
1: -		case BTF_KIND_UNION:
1: -			h = btf_hash_struct(t);
1: -			break;
1: -		case BTF_KIND_ARRAY:
1: -			h = btf_hash_array(t);
1: -			break;
1: -		case BTF_KIND_FUNC_PROTO:
1: -			h = btf_hash_fnproto(t);
1: -			break;
1: -		default:
1: -			pr_debug("unknown kind %d for type [%d]\n", btf_kind(t), type_id);
1: -			return -EINVAL;
1: -		}
1: -		if (btf_dedup_table_add(d, h, type_id))
1: -			return -ENOMEM;
1: -	}
1: -
1: -	return 0;
1: +static int btf_dedup_prep(struct btf_dedup *d) {
1: +  struct btf_type *t;
1: +  int type_id;
1: +  long h;
1: +
1: +  if (!d->btf->base_btf)
1: +    return 0;
1: +
1: +  for (type_id = 1; type_id < d->btf->start_id; type_id++) {
1: +    t = btf_type_by_id(d->btf, type_id);
1: +
1: +    /* all base BTF types are self-canonical by definition */
1: +    d->map[type_id] = type_id;
1: +
1: +    switch (btf_kind(t)) {
1: +    case BTF_KIND_VAR:
1: +    case BTF_KIND_DATASEC:
1: +      /* VAR and DATASEC are never hash/deduplicated */
1: +      continue;
1: +    case BTF_KIND_CONST:
1: +    case BTF_KIND_VOLATILE:
1: +    case BTF_KIND_RESTRICT:
1: +    case BTF_KIND_PTR:
1: +    case BTF_KIND_FWD:
1: +    case BTF_KIND_TYPEDEF:
1: +    case BTF_KIND_FUNC:
1: +    case BTF_KIND_FLOAT:
1: +      h = btf_hash_common(t);
1: +      break;
1: +    case BTF_KIND_INT:
1: +      h = btf_hash_int(t);
1: +      break;
1: +    case BTF_KIND_ENUM:
1: +      h = btf_hash_enum(t);
1: +      break;
1: +    case BTF_KIND_STRUCT:
1: +    case BTF_KIND_UNION:
1: +      h = btf_hash_struct(t);
1: +      break;
1: +    case BTF_KIND_ARRAY:
1: +      h = btf_hash_array(t);
1: +      break;
1: +    case BTF_KIND_FUNC_PROTO:
1: +      h = btf_hash_fnproto(t);
1: +      break;
1: +    default:
1: +      pr_debug("unknown kind %d for type [%d]\n", btf_kind(t), type_id);
1: +      return -EINVAL;
1: +    }
1: +    if (btf_dedup_table_add(d, h, type_id))
1: +      return -ENOMEM;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -3553,108 +3421,105 @@ static int btf_dedup_prep(struct btf_dedup *d)
1:   * candidate. If no canonical candidate matches, type itself is marked as
1:   * canonical and is added into `btf_dedup->dedup_table` as another candidate.
1:   */
1: -static int btf_dedup_prim_type(struct btf_dedup *d, __u32 type_id)
1: -{
1: -	struct btf_type *t = btf_type_by_id(d->btf, type_id);
1: -	struct hashmap_entry *hash_entry;
1: -	struct btf_type *cand;
1: -	/* if we don't find equivalent type, then we are canonical */
1: -	__u32 new_id = type_id;
1: -	__u32 cand_id;
1: -	long h;
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_RESTRICT:
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_ARRAY:
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION:
1: -	case BTF_KIND_FUNC:
1: -	case BTF_KIND_FUNC_PROTO:
1: -	case BTF_KIND_VAR:
1: -	case BTF_KIND_DATASEC:
1: -		return 0;
1: -
1: -	case BTF_KIND_INT:
1: -		h = btf_hash_int(t);
1: -		for_each_dedup_cand(d, hash_entry, h) {
1: -			cand_id = (__u32)(long)hash_entry->value;
1: -			cand = btf_type_by_id(d->btf, cand_id);
1: -			if (btf_equal_int(t, cand)) {
1: -				new_id = cand_id;
1: -				break;
1: -			}
1: -		}
1: -		break;
1: -
1: -	case BTF_KIND_ENUM:
1: -		h = btf_hash_enum(t);
1: -		for_each_dedup_cand(d, hash_entry, h) {
1: -			cand_id = (__u32)(long)hash_entry->value;
1: -			cand = btf_type_by_id(d->btf, cand_id);
1: -			if (btf_equal_enum(t, cand)) {
1: -				new_id = cand_id;
1: -				break;
1: -			}
1: -			if (d->opts.dont_resolve_fwds)
1: -				continue;
1: -			if (btf_compat_enum(t, cand)) {
1: -				if (btf_is_enum_fwd(t)) {
1: -					/* resolve fwd to full enum */
1: -					new_id = cand_id;
1: -					break;
1: -				}
1: -				/* resolve canonical enum fwd to full enum */
1: -				d->map[cand_id] = type_id;
1: -			}
1: -		}
1: -		break;
1: -
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_FLOAT:
1: -		h = btf_hash_common(t);
1: -		for_each_dedup_cand(d, hash_entry, h) {
1: -			cand_id = (__u32)(long)hash_entry->value;
1: -			cand = btf_type_by_id(d->btf, cand_id);
1: -			if (btf_equal_common(t, cand)) {
1: -				new_id = cand_id;
1: -				break;
1: -			}
1: -		}
1: -		break;
1: -
1: -	default:
1: -		return -EINVAL;
1: -	}
1: -
1: -	d->map[type_id] = new_id;
1: -	if (type_id == new_id && btf_dedup_table_add(d, h, type_id))
1: -		return -ENOMEM;
1: -
1: -	return 0;
1: -}
1: -
1: -static int btf_dedup_prim_types(struct btf_dedup *d)
1: -{
1: -	int i, err;
1: -
1: -	for (i = 0; i < d->btf->nr_types; i++) {
1: -		err = btf_dedup_prim_type(d, d->btf->start_id + i);
1: -		if (err)
1: -			return err;
1: -	}
1: -	return 0;
1: +static int btf_dedup_prim_type(struct btf_dedup *d, __u32 type_id) {
1: +  struct btf_type *t = btf_type_by_id(d->btf, type_id);
1: +  struct hashmap_entry *hash_entry;
1: +  struct btf_type *cand;
1: +  /* if we don't find equivalent type, then we are canonical */
1: +  __u32 new_id = type_id;
1: +  __u32 cand_id;
1: +  long h;
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_RESTRICT:
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_ARRAY:
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION:
1: +  case BTF_KIND_FUNC:
1: +  case BTF_KIND_FUNC_PROTO:
1: +  case BTF_KIND_VAR:
1: +  case BTF_KIND_DATASEC:
1: +    return 0;
1: +
1: +  case BTF_KIND_INT:
1: +    h = btf_hash_int(t);
1: +    for_each_dedup_cand(d, hash_entry, h) {
1: +      cand_id = (__u32)(long)hash_entry->value;
1: +      cand = btf_type_by_id(d->btf, cand_id);
1: +      if (btf_equal_int(t, cand)) {
1: +        new_id = cand_id;
1: +        break;
1: +      }
1: +    }
1: +    break;
1: +
1: +  case BTF_KIND_ENUM:
1: +    h = btf_hash_enum(t);
1: +    for_each_dedup_cand(d, hash_entry, h) {
1: +      cand_id = (__u32)(long)hash_entry->value;
1: +      cand = btf_type_by_id(d->btf, cand_id);
1: +      if (btf_equal_enum(t, cand)) {
1: +        new_id = cand_id;
1: +        break;
1: +      }
1: +      if (d->opts.dont_resolve_fwds)
1: +        continue;
1: +      if (btf_compat_enum(t, cand)) {
1: +        if (btf_is_enum_fwd(t)) {
1: +          /* resolve fwd to full enum */
1: +          new_id = cand_id;
1: +          break;
1: +        }
1: +        /* resolve canonical enum fwd to full enum */
1: +        d->map[cand_id] = type_id;
1: +      }
1: +    }
1: +    break;
1: +
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_FLOAT:
1: +    h = btf_hash_common(t);
1: +    for_each_dedup_cand(d, hash_entry, h) {
1: +      cand_id = (__u32)(long)hash_entry->value;
1: +      cand = btf_type_by_id(d->btf, cand_id);
1: +      if (btf_equal_common(t, cand)) {
1: +        new_id = cand_id;
1: +        break;
1: +      }
1: +    }
1: +    break;
1: +
1: +  default:
1: +    return -EINVAL;
1: +  }
1: +
1: +  d->map[type_id] = new_id;
1: +  if (type_id == new_id && btf_dedup_table_add(d, h, type_id))
1: +    return -ENOMEM;
1: +
1: +  return 0;
1: +}
1: +
1: +static int btf_dedup_prim_types(struct btf_dedup *d) {
1: +  int i, err;
1: +
1: +  for (i = 0; i < d->btf->nr_types; i++) {
1: +    err = btf_dedup_prim_type(d, d->btf->start_id + i);
1: +    if (err)
1: +      return err;
1: +  }
1: +  return 0;
1:  }
1:  
1:  /*
1:   * Check whether type is already mapped into canonical one (could be to itself).
1:   */
1: -static inline bool is_type_mapped(struct btf_dedup *d, uint32_t type_id)
1: -{
1: -	return d->map[type_id] <= BTF_MAX_NR_TYPES;
1: +static inline bool is_type_mapped(struct btf_dedup *d, uint32_t type_id) {
1: +  return d->map[type_id] <= BTF_MAX_NR_TYPES;
1:  }
1:  
1:  /*
1: @@ -3662,50 +3527,46 @@ static inline bool is_type_mapped(struct btf_dedup *d, uint32_t type_id)
1:   * type ID. If type is FWD and is resolved into STRUCT/UNION already, follow
1:   * STRUCT/UNION link and resolve it into canonical type ID as well.
1:   */
1: -static inline __u32 resolve_type_id(struct btf_dedup *d, __u32 type_id)
1: -{
1: -	while (is_type_mapped(d, type_id) && d->map[type_id] != type_id)
1: -		type_id = d->map[type_id];
1: -	return type_id;
1: +static inline __u32 resolve_type_id(struct btf_dedup *d, __u32 type_id) {
1: +  while (is_type_mapped(d, type_id) && d->map[type_id] != type_id)
1: +    type_id = d->map[type_id];
1: +  return type_id;
1:  }
1:  
1:  /*
1:   * Resolve FWD to underlying STRUCT/UNION, if any; otherwise return original
1:   * type ID.
1:   */
1: -static uint32_t resolve_fwd_id(struct btf_dedup *d, uint32_t type_id)
1: -{
1: -	__u32 orig_type_id = type_id;
1: +static uint32_t resolve_fwd_id(struct btf_dedup *d, uint32_t type_id) {
1: +  __u32 orig_type_id = type_id;
1:  
1: -	if (!btf_is_fwd(btf__type_by_id(d->btf, type_id)))
1: -		return type_id;
1: +  if (!btf_is_fwd(btf__type_by_id(d->btf, type_id)))
1: +    return type_id;
1:  
1: -	while (is_type_mapped(d, type_id) && d->map[type_id] != type_id)
1: -		type_id = d->map[type_id];
1: +  while (is_type_mapped(d, type_id) && d->map[type_id] != type_id)
1: +    type_id = d->map[type_id];
1:  
1: -	if (!btf_is_fwd(btf__type_by_id(d->btf, type_id)))
1: -		return type_id;
1: +  if (!btf_is_fwd(btf__type_by_id(d->btf, type_id)))
1: +    return type_id;
1:  
1: -	return orig_type_id;
1: +  return orig_type_id;
1:  }
1:  
1: -
1: -static inline __u16 btf_fwd_kind(struct btf_type *t)
1: -{
1: -	return btf_kflag(t) ? BTF_KIND_UNION : BTF_KIND_STRUCT;
1: +static inline __u16 btf_fwd_kind(struct btf_type *t) {
1: +  return btf_kflag(t) ? BTF_KIND_UNION : BTF_KIND_STRUCT;
1:  }
1:  
1:  /* Check if given two types are identical ARRAY definitions */
1: -static int btf_dedup_identical_arrays(struct btf_dedup *d, __u32 id1, __u32 id2)
1: -{
1: -	struct btf_type *t1, *t2;
1: +static int btf_dedup_identical_arrays(struct btf_dedup *d, __u32 id1,
1: +                                      __u32 id2) {
1: +  struct btf_type *t1, *t2;
1:  
1: -	t1 = btf_type_by_id(d->btf, id1);
1: -	t2 = btf_type_by_id(d->btf, id2);
1: -	if (!btf_is_array(t1) || !btf_is_array(t2))
1: -		return 0;
1: +  t1 = btf_type_by_id(d->btf, id1);
1: +  t2 = btf_type_by_id(d->btf, id2);
1: +  if (!btf_is_array(t1) || !btf_is_array(t2))
1: +    return 0;
1:  
1: -	return btf_equal_array(t1, t2);
1: +  return btf_equal_array(t1, t2);
1:  }
1:  
1:  /*
1: @@ -3802,153 +3663,152 @@ static int btf_dedup_identical_arrays(struct btf_dedup *d, __u32 id1, __u32 id2)
1:   *     canonical graph.
1:   */
1:  static int btf_dedup_is_equiv(struct btf_dedup *d, __u32 cand_id,
1: -			      __u32 canon_id)
1: -{
1: -	struct btf_type *cand_type;
1: -	struct btf_type *canon_type;
1: -	__u32 hypot_type_id;
1: -	__u16 cand_kind;
1: -	__u16 canon_kind;
1: -	int i, eq;
1: -
1: -	/* if both resolve to the same canonical, they must be equivalent */
1: -	if (resolve_type_id(d, cand_id) == resolve_type_id(d, canon_id))
1: -		return 1;
1: -
1: -	canon_id = resolve_fwd_id(d, canon_id);
1: -
1: -	hypot_type_id = d->hypot_map[canon_id];
1: -	if (hypot_type_id <= BTF_MAX_NR_TYPES) {
1: -		/* In some cases compiler will generate different DWARF types
1: -		 * for *identical* array type definitions and use them for
1: -		 * different fields within the *same* struct. This breaks type
1: -		 * equivalence check, which makes an assumption that candidate
1: -		 * types sub-graph has a consistent and deduped-by-compiler
1: -		 * types within a single CU. So work around that by explicitly
1: -		 * allowing identical array types here.
1: -		 */
1: -		return hypot_type_id == cand_id ||
1: -		       btf_dedup_identical_arrays(d, hypot_type_id, cand_id);
1: -	}
1: -
1: -	if (btf_dedup_hypot_map_add(d, canon_id, cand_id))
1: -		return -ENOMEM;
1: -
1: -	cand_type = btf_type_by_id(d->btf, cand_id);
1: -	canon_type = btf_type_by_id(d->btf, canon_id);
1: -	cand_kind = btf_kind(cand_type);
1: -	canon_kind = btf_kind(canon_type);
1: -
1: -	if (cand_type->name_off != canon_type->name_off)
1: -		return 0;
1: -
1: -	/* FWD <--> STRUCT/UNION equivalence check, if enabled */
1: -	if (!d->opts.dont_resolve_fwds
1: -	    && (cand_kind == BTF_KIND_FWD || canon_kind == BTF_KIND_FWD)
1: -	    && cand_kind != canon_kind) {
1: -		__u16 real_kind;
1: -		__u16 fwd_kind;
1: -
1: -		if (cand_kind == BTF_KIND_FWD) {
1: -			real_kind = canon_kind;
1: -			fwd_kind = btf_fwd_kind(cand_type);
1: -		} else {
1: -			real_kind = cand_kind;
1: -			fwd_kind = btf_fwd_kind(canon_type);
1: -			/* we'd need to resolve base FWD to STRUCT/UNION */
1: -			if (fwd_kind == real_kind && canon_id < d->btf->start_id)
1: -				d->hypot_adjust_canon = true;
1: -		}
1: -		return fwd_kind == real_kind;
1: -	}
1: -
1: -	if (cand_kind != canon_kind)
1: -		return 0;
1: -
1: -	switch (cand_kind) {
1: -	case BTF_KIND_INT:
1: -		return btf_equal_int(cand_type, canon_type);
1: -
1: -	case BTF_KIND_ENUM:
1: -		if (d->opts.dont_resolve_fwds)
1: -			return btf_equal_enum(cand_type, canon_type);
1: -		else
1: -			return btf_compat_enum(cand_type, canon_type);
1: -
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_FLOAT:
1: -		return btf_equal_common(cand_type, canon_type);
1: -
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_RESTRICT:
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_FUNC:
1: -		if (cand_type->info != canon_type->info)
1: -			return 0;
1: -		return btf_dedup_is_equiv(d, cand_type->type, canon_type->type);
1: -
1: -	case BTF_KIND_ARRAY: {
1: -		const struct btf_array *cand_arr, *canon_arr;
1: -
1: -		if (!btf_compat_array(cand_type, canon_type))
1: -			return 0;
1: -		cand_arr = btf_array(cand_type);
1: -		canon_arr = btf_array(canon_type);
1: -		eq = btf_dedup_is_equiv(d, cand_arr->index_type, canon_arr->index_type);
1: -		if (eq <= 0)
1: -			return eq;
1: -		return btf_dedup_is_equiv(d, cand_arr->type, canon_arr->type);
1: -	}
1: -
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION: {
1: -		const struct btf_member *cand_m, *canon_m;
1: -		__u16 vlen;
1: -
1: -		if (!btf_shallow_equal_struct(cand_type, canon_type))
1: -			return 0;
1: -		vlen = btf_vlen(cand_type);
1: -		cand_m = btf_members(cand_type);
1: -		canon_m = btf_members(canon_type);
1: -		for (i = 0; i < vlen; i++) {
1: -			eq = btf_dedup_is_equiv(d, cand_m->type, canon_m->type);
1: -			if (eq <= 0)
1: -				return eq;
1: -			cand_m++;
1: -			canon_m++;
1: -		}
1: -
1: -		return 1;
1: -	}
1: -
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		const struct btf_param *cand_p, *canon_p;
1: -		__u16 vlen;
1: -
1: -		if (!btf_compat_fnproto(cand_type, canon_type))
1: -			return 0;
1: -		eq = btf_dedup_is_equiv(d, cand_type->type, canon_type->type);
1: -		if (eq <= 0)
1: -			return eq;
1: -		vlen = btf_vlen(cand_type);
1: -		cand_p = btf_params(cand_type);
1: -		canon_p = btf_params(canon_type);
1: -		for (i = 0; i < vlen; i++) {
1: -			eq = btf_dedup_is_equiv(d, cand_p->type, canon_p->type);
1: -			if (eq <= 0)
1: -				return eq;
1: -			cand_p++;
1: -			canon_p++;
1: -		}
1: -		return 1;
1: -	}
1: -
1: -	default:
1: -		return -EINVAL;
1: -	}
1: -	return 0;
1: +                              __u32 canon_id) {
1: +  struct btf_type *cand_type;
1: +  struct btf_type *canon_type;
1: +  __u32 hypot_type_id;
1: +  __u16 cand_kind;
1: +  __u16 canon_kind;
1: +  int i, eq;
1: +
1: +  /* if both resolve to the same canonical, they must be equivalent */
1: +  if (resolve_type_id(d, cand_id) == resolve_type_id(d, canon_id))
1: +    return 1;
1: +
1: +  canon_id = resolve_fwd_id(d, canon_id);
1: +
1: +  hypot_type_id = d->hypot_map[canon_id];
1: +  if (hypot_type_id <= BTF_MAX_NR_TYPES) {
1: +    /* In some cases compiler will generate different DWARF types
1: +     * for *identical* array type definitions and use them for
1: +     * different fields within the *same* struct. This breaks type
1: +     * equivalence check, which makes an assumption that candidate
1: +     * types sub-graph has a consistent and deduped-by-compiler
1: +     * types within a single CU. So work around that by explicitly
1: +     * allowing identical array types here.
1: +     */
1: +    return hypot_type_id == cand_id ||
1: +           btf_dedup_identical_arrays(d, hypot_type_id, cand_id);
1: +  }
1: +
1: +  if (btf_dedup_hypot_map_add(d, canon_id, cand_id))
1: +    return -ENOMEM;
1: +
1: +  cand_type = btf_type_by_id(d->btf, cand_id);
1: +  canon_type = btf_type_by_id(d->btf, canon_id);
1: +  cand_kind = btf_kind(cand_type);
1: +  canon_kind = btf_kind(canon_type);
1: +
1: +  if (cand_type->name_off != canon_type->name_off)
1: +    return 0;
1: +
1: +  /* FWD <--> STRUCT/UNION equivalence check, if enabled */
1: +  if (!d->opts.dont_resolve_fwds &&
1: +      (cand_kind == BTF_KIND_FWD || canon_kind == BTF_KIND_FWD) &&
1: +      cand_kind != canon_kind) {
1: +    __u16 real_kind;
1: +    __u16 fwd_kind;
1: +
1: +    if (cand_kind == BTF_KIND_FWD) {
1: +      real_kind = canon_kind;
1: +      fwd_kind = btf_fwd_kind(cand_type);
1: +    } else {
1: +      real_kind = cand_kind;
1: +      fwd_kind = btf_fwd_kind(canon_type);
1: +      /* we'd need to resolve base FWD to STRUCT/UNION */
1: +      if (fwd_kind == real_kind && canon_id < d->btf->start_id)
1: +        d->hypot_adjust_canon = true;
1: +    }
1: +    return fwd_kind == real_kind;
1: +  }
1: +
1: +  if (cand_kind != canon_kind)
1: +    return 0;
1: +
1: +  switch (cand_kind) {
1: +  case BTF_KIND_INT:
1: +    return btf_equal_int(cand_type, canon_type);
1: +
1: +  case BTF_KIND_ENUM:
1: +    if (d->opts.dont_resolve_fwds)
1: +      return btf_equal_enum(cand_type, canon_type);
1: +    else
1: +      return btf_compat_enum(cand_type, canon_type);
1: +
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_FLOAT:
1: +    return btf_equal_common(cand_type, canon_type);
1: +
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_RESTRICT:
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_FUNC:
1: +    if (cand_type->info != canon_type->info)
1: +      return 0;
1: +    return btf_dedup_is_equiv(d, cand_type->type, canon_type->type);
1: +
1: +  case BTF_KIND_ARRAY: {
1: +    const struct btf_array *cand_arr, *canon_arr;
1: +
1: +    if (!btf_compat_array(cand_type, canon_type))
1: +      return 0;
1: +    cand_arr = btf_array(cand_type);
1: +    canon_arr = btf_array(canon_type);
1: +    eq = btf_dedup_is_equiv(d, cand_arr->index_type, canon_arr->index_type);
1: +    if (eq <= 0)
1: +      return eq;
1: +    return btf_dedup_is_equiv(d, cand_arr->type, canon_arr->type);
1: +  }
1: +
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION: {
1: +    const struct btf_member *cand_m, *canon_m;
1: +    __u16 vlen;
1: +
1: +    if (!btf_shallow_equal_struct(cand_type, canon_type))
1: +      return 0;
1: +    vlen = btf_vlen(cand_type);
1: +    cand_m = btf_members(cand_type);
1: +    canon_m = btf_members(canon_type);
1: +    for (i = 0; i < vlen; i++) {
1: +      eq = btf_dedup_is_equiv(d, cand_m->type, canon_m->type);
1: +      if (eq <= 0)
1: +        return eq;
1: +      cand_m++;
1: +      canon_m++;
1: +    }
1: +
1: +    return 1;
1: +  }
1: +
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    const struct btf_param *cand_p, *canon_p;
1: +    __u16 vlen;
1: +
1: +    if (!btf_compat_fnproto(cand_type, canon_type))
1: +      return 0;
1: +    eq = btf_dedup_is_equiv(d, cand_type->type, canon_type->type);
1: +    if (eq <= 0)
1: +      return eq;
1: +    vlen = btf_vlen(cand_type);
1: +    cand_p = btf_params(cand_type);
1: +    canon_p = btf_params(canon_type);
1: +    for (i = 0; i < vlen; i++) {
1: +      eq = btf_dedup_is_equiv(d, cand_p->type, canon_p->type);
1: +      if (eq <= 0)
1: +        return eq;
1: +      cand_p++;
1: +      canon_p++;
1: +    }
1: +    return 1;
1: +  }
1: +
1: +  default:
1: +    return -EINVAL;
1: +  }
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -3977,67 +3837,65 @@ static int btf_dedup_is_equiv(struct btf_dedup *d, __u32 cand_id,
1:   * deduplicated completely already anyway) or reference types (they rely on
1:   * stability of struct/union canonical relationship for equivalence checks).
1:   */
1: -static void btf_dedup_merge_hypot_map(struct btf_dedup *d)
1: -{
1: -	__u32 canon_type_id, targ_type_id;
1: -	__u16 t_kind, c_kind;
1: -	__u32 t_id, c_id;
1: -	int i;
1: -
1: -	for (i = 0; i < d->hypot_cnt; i++) {
1: -		canon_type_id = d->hypot_list[i];
1: -		targ_type_id = d->hypot_map[canon_type_id];
1: -		t_id = resolve_type_id(d, targ_type_id);
1: -		c_id = resolve_type_id(d, canon_type_id);
1: -		t_kind = btf_kind(btf__type_by_id(d->btf, t_id));
1: -		c_kind = btf_kind(btf__type_by_id(d->btf, c_id));
1: -		/*
1: -		 * Resolve FWD into STRUCT/UNION.
1: -		 * It's ok to resolve FWD into STRUCT/UNION that's not yet
1: -		 * mapped to canonical representative (as opposed to
1: -		 * STRUCT/UNION <--> STRUCT/UNION mapping logic below), because
1: -		 * eventually that struct is going to be mapped and all resolved
1: -		 * FWDs will automatically resolve to correct canonical
1: -		 * representative. This will happen before ref type deduping,
1: -		 * which critically depends on stability of these mapping. This
1: -		 * stability is not a requirement for STRUCT/UNION equivalence
1: -		 * checks, though.
1: -		 */
1: -
1: -		/* if it's the split BTF case, we still need to point base FWD
1: -		 * to STRUCT/UNION in a split BTF, because FWDs from split BTF
1: -		 * will be resolved against base FWD. If we don't point base
1: -		 * canonical FWD to the resolved STRUCT/UNION, then all the
1: -		 * FWDs in split BTF won't be correctly resolved to a proper
1: -		 * STRUCT/UNION.
1: -		 */
1: -		if (t_kind != BTF_KIND_FWD && c_kind == BTF_KIND_FWD)
1: -			d->map[c_id] = t_id;
1: -
1: -		/* if graph equivalence determined that we'd need to adjust
1: -		 * base canonical types, then we need to only point base FWDs
1: -		 * to STRUCTs/UNIONs and do no more modifications. For all
1: -		 * other purposes the type graphs were not equivalent.
1: -		 */
1: -		if (d->hypot_adjust_canon)
1: -			continue;
1: -		
1: -		if (t_kind == BTF_KIND_FWD && c_kind != BTF_KIND_FWD)
1: -			d->map[t_id] = c_id;
1: -
1: -		if ((t_kind == BTF_KIND_STRUCT || t_kind == BTF_KIND_UNION) &&
1: -		    c_kind != BTF_KIND_FWD &&
1: -		    is_type_mapped(d, c_id) &&
1: -		    !is_type_mapped(d, t_id)) {
1: -			/*
1: -			 * as a perf optimization, we can map struct/union
1: -			 * that's part of type graph we just verified for
1: -			 * equivalence. We can do that for struct/union that has
1: -			 * canonical representative only, though.
1: -			 */
1: -			d->map[t_id] = c_id;
1: -		}
1: -	}
1: +static void btf_dedup_merge_hypot_map(struct btf_dedup *d) {
1: +  __u32 canon_type_id, targ_type_id;
1: +  __u16 t_kind, c_kind;
1: +  __u32 t_id, c_id;
1: +  int i;
1: +
1: +  for (i = 0; i < d->hypot_cnt; i++) {
1: +    canon_type_id = d->hypot_list[i];
1: +    targ_type_id = d->hypot_map[canon_type_id];
1: +    t_id = resolve_type_id(d, targ_type_id);
1: +    c_id = resolve_type_id(d, canon_type_id);
1: +    t_kind = btf_kind(btf__type_by_id(d->btf, t_id));
1: +    c_kind = btf_kind(btf__type_by_id(d->btf, c_id));
1: +    /*
1: +     * Resolve FWD into STRUCT/UNION.
1: +     * It's ok to resolve FWD into STRUCT/UNION that's not yet
1: +     * mapped to canonical representative (as opposed to
1: +     * STRUCT/UNION <--> STRUCT/UNION mapping logic below), because
1: +     * eventually that struct is going to be mapped and all resolved
1: +     * FWDs will automatically resolve to correct canonical
1: +     * representative. This will happen before ref type deduping,
1: +     * which critically depends on stability of these mapping. This
1: +     * stability is not a requirement for STRUCT/UNION equivalence
1: +     * checks, though.
1: +     */
1: +
1: +    /* if it's the split BTF case, we still need to point base FWD
1: +     * to STRUCT/UNION in a split BTF, because FWDs from split BTF
1: +     * will be resolved against base FWD. If we don't point base
1: +     * canonical FWD to the resolved STRUCT/UNION, then all the
1: +     * FWDs in split BTF won't be correctly resolved to a proper
1: +     * STRUCT/UNION.
1: +     */
1: +    if (t_kind != BTF_KIND_FWD && c_kind == BTF_KIND_FWD)
1: +      d->map[c_id] = t_id;
1: +
1: +    /* if graph equivalence determined that we'd need to adjust
1: +     * base canonical types, then we need to only point base FWDs
1: +     * to STRUCTs/UNIONs and do no more modifications. For all
1: +     * other purposes the type graphs were not equivalent.
1: +     */
1: +    if (d->hypot_adjust_canon)
1: +      continue;
1: +
1: +    if (t_kind == BTF_KIND_FWD && c_kind != BTF_KIND_FWD)
1: +      d->map[t_id] = c_id;
1: +
1: +    if ((t_kind == BTF_KIND_STRUCT || t_kind == BTF_KIND_UNION) &&
1: +        c_kind != BTF_KIND_FWD && is_type_mapped(d, c_id) &&
1: +        !is_type_mapped(d, t_id)) {
1: +      /*
1: +       * as a perf optimization, we can map struct/union
1: +       * that's part of type graph we just verified for
1: +       * equivalence. We can do that for struct/union that has
1: +       * canonical representative only, though.
1: +       */
1: +      d->map[t_id] = c_id;
1: +    }
1: +  }
1:  }
1:  
1:  /*
1: @@ -4062,74 +3920,72 @@ static void btf_dedup_merge_hypot_map(struct btf_dedup *d)
1:   * as canonical for itself and is added into btf_dedup->dedup_table hash map
1:   * for further look ups.
1:   */
1: -static int btf_dedup_struct_type(struct btf_dedup *d, __u32 type_id)
1: -{
1: -	struct btf_type *cand_type, *t;
1: -	struct hashmap_entry *hash_entry;
1: -	/* if we don't find equivalent type, then we are canonical */
1: -	__u32 new_id = type_id;
1: -	__u16 kind;
1: -	long h;
1: -
1: -	/* already deduped or is in process of deduping (loop detected) */
1: -	if (d->map[type_id] <= BTF_MAX_NR_TYPES)
1: -		return 0;
1: -
1: -	t = btf_type_by_id(d->btf, type_id);
1: -	kind = btf_kind(t);
1: -
1: -	if (kind != BTF_KIND_STRUCT && kind != BTF_KIND_UNION)
1: -		return 0;
1: -
1: -	h = btf_hash_struct(t);
1: -	for_each_dedup_cand(d, hash_entry, h) {
1: -		__u32 cand_id = (__u32)(long)hash_entry->value;
1: -		int eq;
1: -
1: -		/*
1: -		 * Even though btf_dedup_is_equiv() checks for
1: -		 * btf_shallow_equal_struct() internally when checking two
1: -		 * structs (unions) for equivalence, we need to guard here
1: -		 * from picking matching FWD type as a dedup candidate.
1: -		 * This can happen due to hash collision. In such case just
1: -		 * relying on btf_dedup_is_equiv() would lead to potentially
1: -		 * creating a loop (FWD -> STRUCT and STRUCT -> FWD), because
1: -		 * FWD and compatible STRUCT/UNION are considered equivalent.
1: -		 */
1: -		cand_type = btf_type_by_id(d->btf, cand_id);
1: -		if (!btf_shallow_equal_struct(t, cand_type))
1: -			continue;
1: -
1: -		btf_dedup_clear_hypot_map(d);
1: -		eq = btf_dedup_is_equiv(d, type_id, cand_id);
1: -		if (eq < 0)
1: -			return eq;
1: -		if (!eq)
1: -			continue;
1: -		btf_dedup_merge_hypot_map(d);
1: -		if (d->hypot_adjust_canon) /* not really equivalent */
1: -			continue;
1: -		new_id = cand_id;
1: -		break;
1: -	}
1: -
1: -	d->map[type_id] = new_id;
1: -	if (type_id == new_id && btf_dedup_table_add(d, h, type_id))
1: -		return -ENOMEM;
1: -
1: -	return 0;
1: -}
1: -
1: -static int btf_dedup_struct_types(struct btf_dedup *d)
1: -{
1: -	int i, err;
1: -
1: -	for (i = 0; i < d->btf->nr_types; i++) {
1: -		err = btf_dedup_struct_type(d, d->btf->start_id + i);
1: -		if (err)
1: -			return err;
1: -	}
1: -	return 0;
1: +static int btf_dedup_struct_type(struct btf_dedup *d, __u32 type_id) {
1: +  struct btf_type *cand_type, *t;
1: +  struct hashmap_entry *hash_entry;
1: +  /* if we don't find equivalent type, then we are canonical */
1: +  __u32 new_id = type_id;
1: +  __u16 kind;
1: +  long h;
1: +
1: +  /* already deduped or is in process of deduping (loop detected) */
1: +  if (d->map[type_id] <= BTF_MAX_NR_TYPES)
1: +    return 0;
1: +
1: +  t = btf_type_by_id(d->btf, type_id);
1: +  kind = btf_kind(t);
1: +
1: +  if (kind != BTF_KIND_STRUCT && kind != BTF_KIND_UNION)
1: +    return 0;
1: +
1: +  h = btf_hash_struct(t);
1: +  for_each_dedup_cand(d, hash_entry, h) {
1: +    __u32 cand_id = (__u32)(long)hash_entry->value;
1: +    int eq;
1: +
1: +    /*
1: +     * Even though btf_dedup_is_equiv() checks for
1: +     * btf_shallow_equal_struct() internally when checking two
1: +     * structs (unions) for equivalence, we need to guard here
1: +     * from picking matching FWD type as a dedup candidate.
1: +     * This can happen due to hash collision. In such case just
1: +     * relying on btf_dedup_is_equiv() would lead to potentially
1: +     * creating a loop (FWD -> STRUCT and STRUCT -> FWD), because
1: +     * FWD and compatible STRUCT/UNION are considered equivalent.
1: +     */
1: +    cand_type = btf_type_by_id(d->btf, cand_id);
1: +    if (!btf_shallow_equal_struct(t, cand_type))
1: +      continue;
1: +
1: +    btf_dedup_clear_hypot_map(d);
1: +    eq = btf_dedup_is_equiv(d, type_id, cand_id);
1: +    if (eq < 0)
1: +      return eq;
1: +    if (!eq)
1: +      continue;
1: +    btf_dedup_merge_hypot_map(d);
1: +    if (d->hypot_adjust_canon) /* not really equivalent */
1: +      continue;
1: +    new_id = cand_id;
1: +    break;
1: +  }
1: +
1: +  d->map[type_id] = new_id;
1: +  if (type_id == new_id && btf_dedup_table_add(d, h, type_id))
1: +    return -ENOMEM;
1: +
1: +  return 0;
1: +}
1: +
1: +static int btf_dedup_struct_types(struct btf_dedup *d) {
1: +  int i, err;
1: +
1: +  for (i = 0; i < d->btf->nr_types; i++) {
1: +    err = btf_dedup_struct_type(d, d->btf->start_id + i);
1: +    if (err)
1: +      return err;
1: +  }
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -4156,127 +4012,125 @@ static int btf_dedup_struct_types(struct btf_dedup *d)
1:   * will become canonical representative of itself and will be added into
1:   * btf_dedup->dedup_table as another possible canonical representative.
1:   */
1: -static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id)
1: -{
1: -	struct hashmap_entry *hash_entry;
1: -	__u32 new_id = type_id, cand_id;
1: -	struct btf_type *t, *cand;
1: -	/* if we don't find equivalent type, then we are representative type */
1: -	int ref_type_id;
1: -	long h;
1: -
1: -	if (d->map[type_id] == BTF_IN_PROGRESS_ID)
1: -		return -ELOOP;
1: -	if (d->map[type_id] <= BTF_MAX_NR_TYPES)
1: -		return resolve_type_id(d, type_id);
1: -
1: -	t = btf_type_by_id(d->btf, type_id);
1: -	d->map[type_id] = BTF_IN_PROGRESS_ID;
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_RESTRICT:
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_FUNC:
1: -		ref_type_id = btf_dedup_ref_type(d, t->type);
1: -		if (ref_type_id < 0)
1: -			return ref_type_id;
1: -		t->type = ref_type_id;
1: -
1: -		h = btf_hash_common(t);
1: -		for_each_dedup_cand(d, hash_entry, h) {
1: -			cand_id = (__u32)(long)hash_entry->value;
1: -			cand = btf_type_by_id(d->btf, cand_id);
1: -			if (btf_equal_common(t, cand)) {
1: -				new_id = cand_id;
1: -				break;
1: -			}
1: -		}
1: -		break;
1: -
1: -	case BTF_KIND_ARRAY: {
1: -		struct btf_array *info = btf_array(t);
1: -
1: -		ref_type_id = btf_dedup_ref_type(d, info->type);
1: -		if (ref_type_id < 0)
1: -			return ref_type_id;
1: -		info->type = ref_type_id;
1: -
1: -		ref_type_id = btf_dedup_ref_type(d, info->index_type);
1: -		if (ref_type_id < 0)
1: -			return ref_type_id;
1: -		info->index_type = ref_type_id;
1: -
1: -		h = btf_hash_array(t);
1: -		for_each_dedup_cand(d, hash_entry, h) {
1: -			cand_id = (__u32)(long)hash_entry->value;
1: -			cand = btf_type_by_id(d->btf, cand_id);
1: -			if (btf_equal_array(t, cand)) {
1: -				new_id = cand_id;
1: -				break;
1: -			}
1: -		}
1: -		break;
1: -	}
1: -
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		struct btf_param *param;
1: -		__u16 vlen;
1: -		int i;
1: -
1: -		ref_type_id = btf_dedup_ref_type(d, t->type);
1: -		if (ref_type_id < 0)
1: -			return ref_type_id;
1: -		t->type = ref_type_id;
1: -
1: -		vlen = btf_vlen(t);
1: -		param = btf_params(t);
1: -		for (i = 0; i < vlen; i++) {
1: -			ref_type_id = btf_dedup_ref_type(d, param->type);
1: -			if (ref_type_id < 0)
1: -				return ref_type_id;
1: -			param->type = ref_type_id;
1: -			param++;
1: -		}
1: -
1: -		h = btf_hash_fnproto(t);
1: -		for_each_dedup_cand(d, hash_entry, h) {
1: -			cand_id = (__u32)(long)hash_entry->value;
1: -			cand = btf_type_by_id(d->btf, cand_id);
1: -			if (btf_equal_fnproto(t, cand)) {
1: -				new_id = cand_id;
1: -				break;
1: -			}
1: -		}
1: -		break;
1: -	}
1: -
1: -	default:
1: -		return -EINVAL;
1: -	}
1: -
1: -	d->map[type_id] = new_id;
1: -	if (type_id == new_id && btf_dedup_table_add(d, h, type_id))
1: -		return -ENOMEM;
1: -
1: -	return new_id;
1: -}
1: -
1: -static int btf_dedup_ref_types(struct btf_dedup *d)
1: -{
1: -	int i, err;
1: -
1: -	for (i = 0; i < d->btf->nr_types; i++) {
1: -		err = btf_dedup_ref_type(d, d->btf->start_id + i);
1: -		if (err < 0)
1: -			return err;
1: -	}
1: -	/* we won't need d->dedup_table anymore */
1: -	hashmap__free(d->dedup_table);
1: -	d->dedup_table = NULL;
1: -	return 0;
1: +static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id) {
1: +  struct hashmap_entry *hash_entry;
1: +  __u32 new_id = type_id, cand_id;
1: +  struct btf_type *t, *cand;
1: +  /* if we don't find equivalent type, then we are representative type */
1: +  int ref_type_id;
1: +  long h;
1: +
1: +  if (d->map[type_id] == BTF_IN_PROGRESS_ID)
1: +    return -ELOOP;
1: +  if (d->map[type_id] <= BTF_MAX_NR_TYPES)
1: +    return resolve_type_id(d, type_id);
1: +
1: +  t = btf_type_by_id(d->btf, type_id);
1: +  d->map[type_id] = BTF_IN_PROGRESS_ID;
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_RESTRICT:
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_FUNC:
1: +    ref_type_id = btf_dedup_ref_type(d, t->type);
1: +    if (ref_type_id < 0)
1: +      return ref_type_id;
1: +    t->type = ref_type_id;
1: +
1: +    h = btf_hash_common(t);
1: +    for_each_dedup_cand(d, hash_entry, h) {
1: +      cand_id = (__u32)(long)hash_entry->value;
1: +      cand = btf_type_by_id(d->btf, cand_id);
1: +      if (btf_equal_common(t, cand)) {
1: +        new_id = cand_id;
1: +        break;
1: +      }
1: +    }
1: +    break;
1: +
1: +  case BTF_KIND_ARRAY: {
1: +    struct btf_array *info = btf_array(t);
1: +
1: +    ref_type_id = btf_dedup_ref_type(d, info->type);
1: +    if (ref_type_id < 0)
1: +      return ref_type_id;
1: +    info->type = ref_type_id;
1: +
1: +    ref_type_id = btf_dedup_ref_type(d, info->index_type);
1: +    if (ref_type_id < 0)
1: +      return ref_type_id;
1: +    info->index_type = ref_type_id;
1: +
1: +    h = btf_hash_array(t);
1: +    for_each_dedup_cand(d, hash_entry, h) {
1: +      cand_id = (__u32)(long)hash_entry->value;
1: +      cand = btf_type_by_id(d->btf, cand_id);
1: +      if (btf_equal_array(t, cand)) {
1: +        new_id = cand_id;
1: +        break;
1: +      }
1: +    }
1: +    break;
1: +  }
1: +
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    struct btf_param *param;
1: +    __u16 vlen;
1: +    int i;
1: +
1: +    ref_type_id = btf_dedup_ref_type(d, t->type);
1: +    if (ref_type_id < 0)
1: +      return ref_type_id;
1: +    t->type = ref_type_id;
1: +
1: +    vlen = btf_vlen(t);
1: +    param = btf_params(t);
1: +    for (i = 0; i < vlen; i++) {
1: +      ref_type_id = btf_dedup_ref_type(d, param->type);
1: +      if (ref_type_id < 0)
1: +        return ref_type_id;
1: +      param->type = ref_type_id;
1: +      param++;
1: +    }
1: +
1: +    h = btf_hash_fnproto(t);
1: +    for_each_dedup_cand(d, hash_entry, h) {
1: +      cand_id = (__u32)(long)hash_entry->value;
1: +      cand = btf_type_by_id(d->btf, cand_id);
1: +      if (btf_equal_fnproto(t, cand)) {
1: +        new_id = cand_id;
1: +        break;
1: +      }
1: +    }
1: +    break;
1: +  }
1: +
1: +  default:
1: +    return -EINVAL;
1: +  }
1: +
1: +  d->map[type_id] = new_id;
1: +  if (type_id == new_id && btf_dedup_table_add(d, h, type_id))
1: +    return -ENOMEM;
1: +
1: +  return new_id;
1: +}
1: +
1: +static int btf_dedup_ref_types(struct btf_dedup *d) {
1: +  int i, err;
1: +
1: +  for (i = 0; i < d->btf->nr_types; i++) {
1: +    err = btf_dedup_ref_type(d, d->btf->start_id + i);
1: +    if (err < 0)
1: +      return err;
1: +  }
1: +  /* we won't need d->dedup_table anymore */
1: +  hashmap__free(d->dedup_table);
1: +  d->dedup_table = NULL;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -4290,52 +4144,52 @@ static int btf_dedup_ref_types(struct btf_dedup *d)
1:   * during next phase to "fix up" type IDs, referenced from struct/union and
1:   * reference types.
1:   */
1: -static int btf_dedup_compact_types(struct btf_dedup *d)
1: -{
1: -	__u32 *new_offs;
1: -	__u32 next_type_id = d->btf->start_id;
1: -	const struct btf_type *t;
1: -	void *p;
1: -	int i, id, len;
1: -
1: -	/* we are going to reuse hypot_map to store compaction remapping */
1: -	d->hypot_map[0] = 0;
1: -	/* base BTF types are not renumbered */
1: -	for (id = 1; id < d->btf->start_id; id++)
1: -		d->hypot_map[id] = id;
1: -	for (i = 0, id = d->btf->start_id; i < d->btf->nr_types; i++, id++)
1: -		d->hypot_map[id] = BTF_UNPROCESSED_ID;
1: -
1: -	p = d->btf->types_data;
1: -
1: -	for (i = 0, id = d->btf->start_id; i < d->btf->nr_types; i++, id++) {
1: -		if (d->map[id] != id)
1: -			continue;
1: -
1: -		t = btf__type_by_id(d->btf, id);
1: -		len = btf_type_size(t);
1: -		if (len < 0)
1: -			return len;
1: -
1: -		memmove(p, t, len);
1: -		d->hypot_map[id] = next_type_id;
1: -		d->btf->type_offs[next_type_id - d->btf->start_id] = p - d->btf->types_data;
1: -		p += len;
1: -		next_type_id++;
1: -	}
1: -
1: -	/* shrink struct btf's internal types index and update btf_header */
1: -	d->btf->nr_types = next_type_id - d->btf->start_id;
1: -	d->btf->type_offs_cap = d->btf->nr_types;
1: -	d->btf->hdr->type_len = p - d->btf->types_data;
1: -	new_offs = libbpf_reallocarray(d->btf->type_offs, d->btf->type_offs_cap,
1: -				       sizeof(*new_offs));
1: -	if (d->btf->type_offs_cap && !new_offs)
1: -		return -ENOMEM;
1: -	d->btf->type_offs = new_offs;
1: -	d->btf->hdr->str_off = d->btf->hdr->type_len;
1: -	d->btf->raw_size = d->btf->hdr->hdr_len + d->btf->hdr->type_len + d->btf->hdr->str_len;
1: -	return 0;
1: +static int btf_dedup_compact_types(struct btf_dedup *d) {
1: +  __u32 *new_offs;
1: +  __u32 next_type_id = d->btf->start_id;
1: +  const struct btf_type *t;
1: +  void *p;
1: +  int i, id, len;
1: +
1: +  /* we are going to reuse hypot_map to store compaction remapping */
1: +  d->hypot_map[0] = 0;
1: +  /* base BTF types are not renumbered */
1: +  for (id = 1; id < d->btf->start_id; id++)
1: +    d->hypot_map[id] = id;
1: +  for (i = 0, id = d->btf->start_id; i < d->btf->nr_types; i++, id++)
1: +    d->hypot_map[id] = BTF_UNPROCESSED_ID;
1: +
1: +  p = d->btf->types_data;
1: +
1: +  for (i = 0, id = d->btf->start_id; i < d->btf->nr_types; i++, id++) {
1: +    if (d->map[id] != id)
1: +      continue;
1: +
1: +    t = btf__type_by_id(d->btf, id);
1: +    len = btf_type_size(t);
1: +    if (len < 0)
1: +      return len;
1: +
1: +    memmove(p, t, len);
1: +    d->hypot_map[id] = next_type_id;
1: +    d->btf->type_offs[next_type_id - d->btf->start_id] = p - d->btf->types_data;
1: +    p += len;
1: +    next_type_id++;
1: +  }
1: +
1: +  /* shrink struct btf's internal types index and update btf_header */
1: +  d->btf->nr_types = next_type_id - d->btf->start_id;
1: +  d->btf->type_offs_cap = d->btf->nr_types;
1: +  d->btf->hdr->type_len = p - d->btf->types_data;
1: +  new_offs = libbpf_reallocarray(d->btf->type_offs, d->btf->type_offs_cap,
1: +                                 sizeof(*new_offs));
1: +  if (d->btf->type_offs_cap && !new_offs)
1: +    return -ENOMEM;
1: +  d->btf->type_offs = new_offs;
1: +  d->btf->hdr->str_off = d->btf->hdr->type_len;
1: +  d->btf->raw_size =
1: +      d->btf->hdr->hdr_len + d->btf->hdr->type_len + d->btf->hdr->str_len;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -4344,18 +4198,17 @@ static int btf_dedup_compact_types(struct btf_dedup *d)
1:   * then mapping it to a deduplicated type ID, stored in btf_dedup->hypot_map,
1:   * which is populated during compaction phase.
1:   */
1: -static int btf_dedup_remap_type_id(__u32 *type_id, void *ctx)
1: -{
1: -	struct btf_dedup *d = ctx;
1: -	__u32 resolved_type_id, new_type_id;
1: +static int btf_dedup_remap_type_id(__u32 *type_id, void *ctx) {
1: +  struct btf_dedup *d = ctx;
1: +  __u32 resolved_type_id, new_type_id;
1:  
1: -	resolved_type_id = resolve_type_id(d, *type_id);
1: -	new_type_id = d->hypot_map[resolved_type_id];
1: -	if (new_type_id > BTF_MAX_NR_TYPES)
1: -		return -EINVAL;
1: +  resolved_type_id = resolve_type_id(d, *type_id);
1: +  new_type_id = d->hypot_map[resolved_type_id];
1: +  if (new_type_id > BTF_MAX_NR_TYPES)
1: +    return -EINVAL;
1:  
1: -	*type_id = new_type_id;
1: -	return 0;
1: +  *type_id = new_type_id;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -4368,271 +4221,269 @@ static int btf_dedup_remap_type_id(__u32 *type_id, void *ctx)
1:   * referenced from any BTF type (e.g., struct fields, func proto args, etc) to
1:   * their final deduped type IDs.
1:   */
1: -static int btf_dedup_remap_types(struct btf_dedup *d)
1: -{
1: -	int i, r;
1: +static int btf_dedup_remap_types(struct btf_dedup *d) {
1: +  int i, r;
1:  
1: -	for (i = 0; i < d->btf->nr_types; i++) {
1: -		struct btf_type *t = btf_type_by_id(d->btf, d->btf->start_id + i);
1: +  for (i = 0; i < d->btf->nr_types; i++) {
1: +    struct btf_type *t = btf_type_by_id(d->btf, d->btf->start_id + i);
1:  
1: -		r = btf_type_visit_type_ids(t, btf_dedup_remap_type_id, d);
1: -		if (r)
1: -			return r;
1: -	}
1: +    r = btf_type_visit_type_ids(t, btf_dedup_remap_type_id, d);
1: +    if (r)
1: +      return r;
1: +  }
1:  
1: -	if (!d->btf_ext)
1: -		return 0;
1: +  if (!d->btf_ext)
1: +    return 0;
1:  
1: -	r = btf_ext_visit_type_ids(d->btf_ext, btf_dedup_remap_type_id, d);
1: -	if (r)
1: -		return r;
1: +  r = btf_ext_visit_type_ids(d->btf_ext, btf_dedup_remap_type_id, d);
1: +  if (r)
1: +    return r;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  /*
1:   * Probe few well-known locations for vmlinux kernel image and try to load BTF
1:   * data out of it to use for target BTF.
1:   */
1: -struct btf *libbpf_find_kernel_btf(void)
1: -{
1: -	struct {
1: -		const char *path_fmt;
1: -		bool raw_btf;
1: -	} locations[] = {
1: -		/* try canonical vmlinux BTF through sysfs first */
1: -		{ "/sys/kernel/btf/vmlinux", true /* raw BTF */ },
1: -		/* fall back to trying to find vmlinux ELF on disk otherwise */
1: -		{ "/boot/vmlinux-%1$s" },
1: -		{ "/lib/modules/%1$s/vmlinux-%1$s" },
1: -		{ "/lib/modules/%1$s/build/vmlinux" },
1: -		{ "/usr/lib/modules/%1$s/kernel/vmlinux" },
1: -		{ "/usr/lib/debug/boot/vmlinux-%1$s" },
1: -		{ "/usr/lib/debug/boot/vmlinux-%1$s.debug" },
1: -		{ "/usr/lib/debug/lib/modules/%1$s/vmlinux" },
1: -	};
1: -	char path[PATH_MAX + 1];
1: -	struct utsname buf;
1: -	struct btf *btf;
1: -	int i, err;
1: -
1: -	uname(&buf);
1: -
1: -	for (i = 0; i < ARRAY_SIZE(locations); i++) {
1: -		snprintf(path, PATH_MAX, locations[i].path_fmt, buf.release);
1: -
1: -		if (access(path, R_OK))
1: -			continue;
1: -
1: -		if (locations[i].raw_btf)
1: -			btf = btf__parse_raw(path);
1: -		else
1: -			btf = btf__parse_elf(path, NULL);
1: -		err = libbpf_get_error(btf);
1: -		pr_debug("loading kernel BTF '%s': %d\n", path, err);
1: -		if (err)
1: -			continue;
1: -
1: -		return btf;
1: -	}
1: -
1: -	pr_warn("failed to find valid kernel BTF\n");
1: -	return libbpf_err_ptr(-ESRCH);
1: -}
1: -
1: -int btf_type_visit_type_ids(struct btf_type *t, type_id_visit_fn visit, void *ctx)
1: -{
1: -	int i, n, err;
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_INT:
1: -	case BTF_KIND_FLOAT:
1: -	case BTF_KIND_ENUM:
1: -		return 0;
1: -
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_RESTRICT:
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_FUNC:
1: -	case BTF_KIND_VAR:
1: -		return visit(&t->type, ctx);
1: -
1: -	case BTF_KIND_ARRAY: {
1: -		struct btf_array *a = btf_array(t);
1: -
1: -		err = visit(&a->type, ctx);
1: -		err = err ?: visit(&a->index_type, ctx);
1: -		return err;
1: -	}
1: -
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION: {
1: -		struct btf_member *m = btf_members(t);
1: -
1: -		for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: -			err = visit(&m->type, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -		return 0;
1: -	}
1: -
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		struct btf_param *m = btf_params(t);
1: -
1: -		err = visit(&t->type, ctx);
1: -		if (err)
1: -			return err;
1: -		for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: -			err = visit(&m->type, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -		return 0;
1: -	}
1: -
1: -	case BTF_KIND_DATASEC: {
1: -		struct btf_var_secinfo *m = btf_var_secinfos(t);
1: -
1: -		for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: -			err = visit(&m->type, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -		return 0;
1: -	}
1: -
1: -	default:
1: -		return -EINVAL;
1: -	}
1: -}
1: -
1: -int btf_type_visit_str_offs(struct btf_type *t, str_off_visit_fn visit, void *ctx)
1: -{
1: -	int i, n, err;
1: -
1: -	err = visit(&t->name_off, ctx);
1: -	if (err)
1: -		return err;
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION: {
1: -		struct btf_member *m = btf_members(t);
1: -
1: -		for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: -			err = visit(&m->name_off, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -		break;
1: -	}
1: -	case BTF_KIND_ENUM: {
1: -		struct btf_enum *m = btf_enum(t);
1: -
1: -		for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: -			err = visit(&m->name_off, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -		break;
1: -	}
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		struct btf_param *m = btf_params(t);
1: -
1: -		for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: -			err = visit(&m->name_off, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -		break;
1: -	}
1: -	default:
1: -		break;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -int btf_ext_visit_type_ids(struct btf_ext *btf_ext, type_id_visit_fn visit, void *ctx)
1: -{
1: -	const struct btf_ext_info *seg;
1: -	struct btf_ext_info_sec *sec;
1: -	int i, err;
1: -
1: -	seg = &btf_ext->func_info;
1: -	for_each_btf_ext_sec(seg, sec) {
1: -		struct bpf_func_info_min *rec;
1: -
1: -		for_each_btf_ext_rec(seg, sec, i, rec) {
1: -			err = visit(&rec->type_id, ctx);
1: -			if (err < 0)
1: -				return err;
1: -		}
1: -	}
1: -
1: -	seg = &btf_ext->core_relo_info;
1: -	for_each_btf_ext_sec(seg, sec) {
1: -		struct bpf_core_relo *rec;
1: -
1: -		for_each_btf_ext_rec(seg, sec, i, rec) {
1: -			err = visit(&rec->type_id, ctx);
1: -			if (err < 0)
1: -				return err;
1: -		}
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -int btf_ext_visit_str_offs(struct btf_ext *btf_ext, str_off_visit_fn visit, void *ctx)
1: -{
1: -	const struct btf_ext_info *seg;
1: -	struct btf_ext_info_sec *sec;
1: -	int i, err;
1: -
1: -	seg = &btf_ext->func_info;
1: -	for_each_btf_ext_sec(seg, sec) {
1: -		err = visit(&sec->sec_name_off, ctx);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	seg = &btf_ext->line_info;
1: -	for_each_btf_ext_sec(seg, sec) {
1: -		struct bpf_line_info_min *rec;
1: -
1: -		err = visit(&sec->sec_name_off, ctx);
1: -		if (err)
1: -			return err;
1: -
1: -		for_each_btf_ext_rec(seg, sec, i, rec) {
1: -			err = visit(&rec->file_name_off, ctx);
1: -			if (err)
1: -				return err;
1: -			err = visit(&rec->line_off, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -	}
1: -
1: -	seg = &btf_ext->core_relo_info;
1: -	for_each_btf_ext_sec(seg, sec) {
1: -		struct bpf_core_relo *rec;
1: -
1: -		err = visit(&sec->sec_name_off, ctx);
1: -		if (err)
1: -			return err;
1: -
1: -		for_each_btf_ext_rec(seg, sec, i, rec) {
1: -			err = visit(&rec->access_str_off, ctx);
1: -			if (err)
1: -				return err;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +struct btf *libbpf_find_kernel_btf(void) {
1: +  struct {
1: +    const char *path_fmt;
1: +    bool raw_btf;
1: +  } locations[] = {
1: +      /* try canonical vmlinux BTF through sysfs first */
1: +      {"/sys/kernel/btf/vmlinux", true /* raw BTF */},
1: +      /* fall back to trying to find vmlinux ELF on disk otherwise */
1: +      {"/boot/vmlinux-%1$s"},
1: +      {"/lib/modules/%1$s/vmlinux-%1$s"},
1: +      {"/lib/modules/%1$s/build/vmlinux"},
1: +      {"/usr/lib/modules/%1$s/kernel/vmlinux"},
1: +      {"/usr/lib/debug/boot/vmlinux-%1$s"},
1: +      {"/usr/lib/debug/boot/vmlinux-%1$s.debug"},
1: +      {"/usr/lib/debug/lib/modules/%1$s/vmlinux"},
1: +  };
1: +  char path[PATH_MAX + 1];
1: +  struct utsname buf;
1: +  struct btf *btf;
1: +  int i, err;
1: +
1: +  uname(&buf);
1: +
1: +  for (i = 0; i < ARRAY_SIZE(locations); i++) {
1: +    snprintf(path, PATH_MAX, locations[i].path_fmt, buf.release);
1: +
1: +    if (access(path, R_OK))
1: +      continue;
1: +
1: +    if (locations[i].raw_btf)
1: +      btf = btf__parse_raw(path);
1: +    else
1: +      btf = btf__parse_elf(path, NULL);
1: +    err = libbpf_get_error(btf);
1: +    pr_debug("loading kernel BTF '%s': %d\n", path, err);
1: +    if (err)
1: +      continue;
1: +
1: +    return btf;
1: +  }
1: +
1: +  pr_warn("failed to find valid kernel BTF\n");
1: +  return libbpf_err_ptr(-ESRCH);
1: +}
1: +
1: +int btf_type_visit_type_ids(struct btf_type *t, type_id_visit_fn visit,
1: +                            void *ctx) {
1: +  int i, n, err;
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_INT:
1: +  case BTF_KIND_FLOAT:
1: +  case BTF_KIND_ENUM:
1: +    return 0;
1: +
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_RESTRICT:
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_FUNC:
1: +  case BTF_KIND_VAR:
1: +    return visit(&t->type, ctx);
1: +
1: +  case BTF_KIND_ARRAY: {
1: +    struct btf_array *a = btf_array(t);
1: +
1: +    err = visit(&a->type, ctx);
1: +    err = err ?: visit(&a->index_type, ctx);
1: +    return err;
1: +  }
1: +
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION: {
1: +    struct btf_member *m = btf_members(t);
1: +
1: +    for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: +      err = visit(&m->type, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +    return 0;
1: +  }
1: +
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    struct btf_param *m = btf_params(t);
1: +
1: +    err = visit(&t->type, ctx);
1: +    if (err)
1: +      return err;
1: +    for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: +      err = visit(&m->type, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +    return 0;
1: +  }
1: +
1: +  case BTF_KIND_DATASEC: {
1: +    struct btf_var_secinfo *m = btf_var_secinfos(t);
1: +
1: +    for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: +      err = visit(&m->type, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +    return 0;
1: +  }
1: +
1: +  default:
1: +    return -EINVAL;
1: +  }
1: +}
1: +
1: +int btf_type_visit_str_offs(struct btf_type *t, str_off_visit_fn visit,
1: +                            void *ctx) {
1: +  int i, n, err;
1: +
1: +  err = visit(&t->name_off, ctx);
1: +  if (err)
1: +    return err;
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION: {
1: +    struct btf_member *m = btf_members(t);
1: +
1: +    for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: +      err = visit(&m->name_off, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +    break;
1: +  }
1: +  case BTF_KIND_ENUM: {
1: +    struct btf_enum *m = btf_enum(t);
1: +
1: +    for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: +      err = visit(&m->name_off, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +    break;
1: +  }
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    struct btf_param *m = btf_params(t);
1: +
1: +    for (i = 0, n = btf_vlen(t); i < n; i++, m++) {
1: +      err = visit(&m->name_off, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +    break;
1: +  }
1: +  default:
1: +    break;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +int btf_ext_visit_type_ids(struct btf_ext *btf_ext, type_id_visit_fn visit,
1: +                           void *ctx) {
1: +  const struct btf_ext_info *seg;
1: +  struct btf_ext_info_sec *sec;
1: +  int i, err;
1: +
1: +  seg = &btf_ext->func_info;
1: +  for_each_btf_ext_sec(seg, sec) {
1: +    struct bpf_func_info_min *rec;
1: +
1: +    for_each_btf_ext_rec(seg, sec, i, rec) {
1: +      err = visit(&rec->type_id, ctx);
1: +      if (err < 0)
1: +        return err;
1: +    }
1: +  }
1: +
1: +  seg = &btf_ext->core_relo_info;
1: +  for_each_btf_ext_sec(seg, sec) {
1: +    struct bpf_core_relo *rec;
1: +
1: +    for_each_btf_ext_rec(seg, sec, i, rec) {
1: +      err = visit(&rec->type_id, ctx);
1: +      if (err < 0)
1: +        return err;
1: +    }
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +int btf_ext_visit_str_offs(struct btf_ext *btf_ext, str_off_visit_fn visit,
1: +                           void *ctx) {
1: +  const struct btf_ext_info *seg;
1: +  struct btf_ext_info_sec *sec;
1: +  int i, err;
1: +
1: +  seg = &btf_ext->func_info;
1: +  for_each_btf_ext_sec(seg, sec) {
1: +    err = visit(&sec->sec_name_off, ctx);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  seg = &btf_ext->line_info;
1: +  for_each_btf_ext_sec(seg, sec) {
1: +    struct bpf_line_info_min *rec;
1: +
1: +    err = visit(&sec->sec_name_off, ctx);
1: +    if (err)
1: +      return err;
1: +
1: +    for_each_btf_ext_rec(seg, sec, i, rec) {
1: +      err = visit(&rec->file_name_off, ctx);
1: +      if (err)
1: +        return err;
1: +      err = visit(&rec->line_off, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +  }
1: +
1: +  seg = &btf_ext->core_relo_info;
1: +  for_each_btf_ext_sec(seg, sec) {
1: +    struct bpf_core_relo *rec;
1: +
1: +    err = visit(&sec->sec_name_off, ctx);
1: +    if (err)
1: +      return err;
1: +
1: +    for_each_btf_ext_rec(seg, sec, i, rec) {
1: +      err = visit(&rec->access_str_off, ctx);
1: +      if (err)
1: +        return err;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1: diff --git a/src/cc/libbpf/src/btf.h b/src/cc/libbpf/src/btf.h
1: index b54f1c3e..68044406 100644
1: --- a/src/cc/libbpf/src/btf.h
1: +++ b/src/cc/libbpf/src/btf.h
1: @@ -4,10 +4,10 @@
1:  #ifndef __LIBBPF_BTF_H
1:  #define __LIBBPF_BTF_H
1:  
1: -#include <stdarg.h>
1: -#include <stdbool.h>
1:  #include <linux/btf.h>
1:  #include <linux/types.h>
1: +#include <stdarg.h>
1: +#include <stdbool.h>
1:  
1:  #include "libbpf_common.h"
1:  
1: @@ -26,34 +26,38 @@ struct btf_type;
1:  struct bpf_object;
1:  
1:  enum btf_endianness {
1: -	BTF_LITTLE_ENDIAN = 0,
1: -	BTF_BIG_ENDIAN = 1,
1: +  BTF_LITTLE_ENDIAN = 0,
1: +  BTF_BIG_ENDIAN = 1,
1:  };
1:  
1:  LIBBPF_API void btf__free(struct btf *btf);
1:  
1:  LIBBPF_API struct btf *btf__new(const void *data, __u32 size);
1: -LIBBPF_API struct btf *btf__new_split(const void *data, __u32 size, struct btf *base_btf);
1: +LIBBPF_API struct btf *btf__new_split(const void *data, __u32 size,
1: +                                      struct btf *base_btf);
1:  LIBBPF_API struct btf *btf__new_empty(void);
1:  LIBBPF_API struct btf *btf__new_empty_split(struct btf *base_btf);
1:  
1:  LIBBPF_API struct btf *btf__parse(const char *path, struct btf_ext **btf_ext);
1:  LIBBPF_API struct btf *btf__parse_split(const char *path, struct btf *base_btf);
1: -LIBBPF_API struct btf *btf__parse_elf(const char *path, struct btf_ext **btf_ext);
1: -LIBBPF_API struct btf *btf__parse_elf_split(const char *path, struct btf *base_btf);
1: +LIBBPF_API struct btf *btf__parse_elf(const char *path,
1: +                                      struct btf_ext **btf_ext);
1: +LIBBPF_API struct btf *btf__parse_elf_split(const char *path,
1: +                                            struct btf *base_btf);
1:  LIBBPF_API struct btf *btf__parse_raw(const char *path);
1: -LIBBPF_API struct btf *btf__parse_raw_split(const char *path, struct btf *base_btf);
1: +LIBBPF_API struct btf *btf__parse_raw_split(const char *path,
1: +                                            struct btf *base_btf);
1:  
1:  LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf);
1:  LIBBPF_API int btf__load(struct btf *btf);
1:  LIBBPF_API __s32 btf__find_by_name(const struct btf *btf,
1: -				   const char *type_name);
1: +                                   const char *type_name);
1:  LIBBPF_API __s32 btf__find_by_name_kind(const struct btf *btf,
1: -					const char *type_name, __u32 kind);
1: +                                        const char *type_name, __u32 kind);
1:  LIBBPF_API __u32 btf__get_nr_types(const struct btf *btf);
1:  LIBBPF_API const struct btf *btf__base_btf(const struct btf *btf);
1:  LIBBPF_API const struct btf_type *btf__type_by_id(const struct btf *btf,
1: -						  __u32 id);
1: +                                                  __u32 id);
1:  LIBBPF_API size_t btf__pointer_size(const struct btf *btf);
1:  LIBBPF_API int btf__set_pointer_size(struct btf *btf, size_t ptr_sz);
1:  LIBBPF_API enum btf_endianness btf__endianness(const struct btf *btf);
1: @@ -68,24 +72,30 @@ LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
1:  LIBBPF_API const char *btf__str_by_offset(const struct btf *btf, __u32 offset);
1:  LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);
1:  LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name,
1: -				    __u32 expected_key_size,
1: -				    __u32 expected_value_size,
1: -				    __u32 *key_type_id, __u32 *value_type_id);
1: +                                    __u32 expected_key_size,
1: +                                    __u32 expected_value_size,
1: +                                    __u32 *key_type_id, __u32 *value_type_id);
1:  
1:  LIBBPF_API struct btf_ext *btf_ext__new(__u8 *data, __u32 size);
1:  LIBBPF_API void btf_ext__free(struct btf_ext *btf_ext);
1:  LIBBPF_API const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext,
1: -					     __u32 *size);
1: -LIBBPF_API LIBBPF_DEPRECATED("btf_ext__reloc_func_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions")
1: -int btf_ext__reloc_func_info(const struct btf *btf,
1: -			     const struct btf_ext *btf_ext,
1: -			     const char *sec_name, __u32 insns_cnt,
1: -			     void **func_info, __u32 *cnt);
1: -LIBBPF_API LIBBPF_DEPRECATED("btf_ext__reloc_line_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions")
1: -int btf_ext__reloc_line_info(const struct btf *btf,
1: -			     const struct btf_ext *btf_ext,
1: -			     const char *sec_name, __u32 insns_cnt,
1: -			     void **line_info, __u32 *cnt);
1: +                                             __u32 *size);
1: +LIBBPF_API LIBBPF_DEPRECATED(
1: +    "btf_ext__reloc_func_info was never meant as a public API and has wrong "
1: +    "assumptions embedded in it; it will be removed in the future libbpf "
1: +    "versions") int btf_ext__reloc_func_info(const struct btf *btf,
1: +                                             const struct btf_ext *btf_ext,
1: +                                             const char *sec_name,
1: +                                             __u32 insns_cnt, void **func_info,
1: +                                             __u32 *cnt);
1: +LIBBPF_API LIBBPF_DEPRECATED(
1: +    "btf_ext__reloc_line_info was never meant as a public API and has wrong "
1: +    "assumptions embedded in it; it will be removed in the future libbpf "
1: +    "versions") int btf_ext__reloc_line_info(const struct btf *btf,
1: +                                             const struct btf_ext *btf_ext,
1: +                                             const char *sec_name,
1: +                                             __u32 insns_cnt, void **line_info,
1: +                                             __u32 *cnt);
1:  LIBBPF_API __u32 btf_ext__func_info_rec_size(const struct btf_ext *btf_ext);
1:  LIBBPF_API __u32 btf_ext__line_info_rec_size(const struct btf_ext *btf_ext);
1:  
1: @@ -94,281 +104,256 @@ LIBBPF_API struct btf *libbpf_find_kernel_btf(void);
1:  LIBBPF_API int btf__find_str(struct btf *btf, const char *s);
1:  LIBBPF_API int btf__add_str(struct btf *btf, const char *s);
1:  LIBBPF_API int btf__add_type(struct btf *btf, const struct btf *src_btf,
1: -			     const struct btf_type *src_type);
1: +                             const struct btf_type *src_type);
1:  
1: -LIBBPF_API int btf__add_int(struct btf *btf, const char *name, size_t byte_sz, int encoding);
1: -LIBBPF_API int btf__add_float(struct btf *btf, const char *name, size_t byte_sz);
1: +LIBBPF_API int btf__add_int(struct btf *btf, const char *name, size_t byte_sz,
1: +                            int encoding);
1: +LIBBPF_API int btf__add_float(struct btf *btf, const char *name,
1: +                              size_t byte_sz);
1:  LIBBPF_API int btf__add_ptr(struct btf *btf, int ref_type_id);
1: -LIBBPF_API int btf__add_array(struct btf *btf,
1: -			      int index_type_id, int elem_type_id, __u32 nr_elems);
1: +LIBBPF_API int btf__add_array(struct btf *btf, int index_type_id,
1: +                              int elem_type_id, __u32 nr_elems);
1:  /* struct/union construction APIs */
1:  LIBBPF_API int btf__add_struct(struct btf *btf, const char *name, __u32 sz);
1:  LIBBPF_API int btf__add_union(struct btf *btf, const char *name, __u32 sz);
1: -LIBBPF_API int btf__add_field(struct btf *btf, const char *name, int field_type_id,
1: -			      __u32 bit_offset, __u32 bit_size);
1: +LIBBPF_API int btf__add_field(struct btf *btf, const char *name,
1: +                              int field_type_id, __u32 bit_offset,
1: +                              __u32 bit_size);
1:  
1:  /* enum construction APIs */
1:  LIBBPF_API int btf__add_enum(struct btf *btf, const char *name, __u32 bytes_sz);
1: -LIBBPF_API int btf__add_enum_value(struct btf *btf, const char *name, __s64 value);
1: +LIBBPF_API int btf__add_enum_value(struct btf *btf, const char *name,
1: +                                   __s64 value);
1:  
1:  enum btf_fwd_kind {
1: -	BTF_FWD_STRUCT = 0,
1: -	BTF_FWD_UNION = 1,
1: -	BTF_FWD_ENUM = 2,
1: +  BTF_FWD_STRUCT = 0,
1: +  BTF_FWD_UNION = 1,
1: +  BTF_FWD_ENUM = 2,
1:  };
1:  
1: -LIBBPF_API int btf__add_fwd(struct btf *btf, const char *name, enum btf_fwd_kind fwd_kind);
1: -LIBBPF_API int btf__add_typedef(struct btf *btf, const char *name, int ref_type_id);
1: +LIBBPF_API int btf__add_fwd(struct btf *btf, const char *name,
1: +                            enum btf_fwd_kind fwd_kind);
1: +LIBBPF_API int btf__add_typedef(struct btf *btf, const char *name,
1: +                                int ref_type_id);
1:  LIBBPF_API int btf__add_volatile(struct btf *btf, int ref_type_id);
1:  LIBBPF_API int btf__add_const(struct btf *btf, int ref_type_id);
1:  LIBBPF_API int btf__add_restrict(struct btf *btf, int ref_type_id);
1:  
1:  /* func and func_proto construction APIs */
1:  LIBBPF_API int btf__add_func(struct btf *btf, const char *name,
1: -			     enum btf_func_linkage linkage, int proto_type_id);
1: +                             enum btf_func_linkage linkage, int proto_type_id);
1:  LIBBPF_API int btf__add_func_proto(struct btf *btf, int ret_type_id);
1: -LIBBPF_API int btf__add_func_param(struct btf *btf, const char *name, int type_id);
1: +LIBBPF_API int btf__add_func_param(struct btf *btf, const char *name,
1: +                                   int type_id);
1:  
1:  /* var & datasec construction APIs */
1: -LIBBPF_API int btf__add_var(struct btf *btf, const char *name, int linkage, int type_id);
1: -LIBBPF_API int btf__add_datasec(struct btf *btf, const char *name, __u32 byte_sz);
1: +LIBBPF_API int btf__add_var(struct btf *btf, const char *name, int linkage,
1: +                            int type_id);
1: +LIBBPF_API int btf__add_datasec(struct btf *btf, const char *name,
1: +                                __u32 byte_sz);
1:  LIBBPF_API int btf__add_datasec_var_info(struct btf *btf, int var_type_id,
1: -					 __u32 offset, __u32 byte_sz);
1: +                                         __u32 offset, __u32 byte_sz);
1:  
1:  struct btf_dedup_opts {
1: -	unsigned int dedup_table_size;
1: -	bool dont_resolve_fwds;
1: +  unsigned int dedup_table_size;
1: +  bool dont_resolve_fwds;
1:  };
1:  
1:  LIBBPF_API int btf__dedup(struct btf *btf, struct btf_ext *btf_ext,
1: -			  const struct btf_dedup_opts *opts);
1: +                          const struct btf_dedup_opts *opts);
1:  
1:  struct btf_dump;
1:  
1:  struct btf_dump_opts {
1: -	void *ctx;
1: +  void *ctx;
1:  };
1:  
1:  typedef void (*btf_dump_printf_fn_t)(void *ctx, const char *fmt, va_list args);
1:  
1:  LIBBPF_API struct btf_dump *btf_dump__new(const struct btf *btf,
1: -					  const struct btf_ext *btf_ext,
1: -					  const struct btf_dump_opts *opts,
1: -					  btf_dump_printf_fn_t printf_fn);
1: +                                          const struct btf_ext *btf_ext,
1: +                                          const struct btf_dump_opts *opts,
1: +                                          btf_dump_printf_fn_t printf_fn);
1:  LIBBPF_API void btf_dump__free(struct btf_dump *d);
1:  
1:  LIBBPF_API int btf_dump__dump_type(struct btf_dump *d, __u32 id);
1:  
1:  struct btf_dump_emit_type_decl_opts {
1: -	/* size of this struct, for forward/backward compatiblity */
1: -	size_t sz;
1: -	/* optional field name for type declaration, e.g.:
1: -	 * - struct my_struct <FNAME>
1: -	 * - void (*<FNAME>)(int)
1: -	 * - char (*<FNAME>)[123]
1: -	 */
1: -	const char *field_name;
1: -	/* extra indentation level (in number of tabs) to emit for multi-line
1: -	 * type declarations (e.g., anonymous struct); applies for lines
1: -	 * starting from the second one (first line is assumed to have
1: -	 * necessary indentation already
1: -	 */
1: -	int indent_level;
1: -	/* strip all the const/volatile/restrict mods */
1: -	bool strip_mods;
1: -	size_t :0;
1: +  /* size of this struct, for forward/backward compatiblity */
1: +  size_t sz;
1: +  /* optional field name for type declaration, e.g.:
1: +   * - struct my_struct <FNAME>
1: +   * - void (*<FNAME>)(int)
1: +   * - char (*<FNAME>)[123]
1: +   */
1: +  const char *field_name;
1: +  /* extra indentation level (in number of tabs) to emit for multi-line
1: +   * type declarations (e.g., anonymous struct); applies for lines
1: +   * starting from the second one (first line is assumed to have
1: +   * necessary indentation already
1: +   */
1: +  int indent_level;
1: +  /* strip all the const/volatile/restrict mods */
1: +  bool strip_mods;
1: +  size_t : 0;
1:  };
1:  #define btf_dump_emit_type_decl_opts__last_field strip_mods
1:  
1: -LIBBPF_API int
1: -btf_dump__emit_type_decl(struct btf_dump *d, __u32 id,
1: -			 const struct btf_dump_emit_type_decl_opts *opts);
1: +LIBBPF_API int btf_dump__emit_type_decl(
1: +    struct btf_dump *d, __u32 id,
1: +    const struct btf_dump_emit_type_decl_opts *opts);
1:  
1:  /*
1:   * A set of helpers for easier BTF types handling
1:   */
1: -static inline __u16 btf_kind(const struct btf_type *t)
1: -{
1: -	return BTF_INFO_KIND(t->info);
1: +static inline __u16 btf_kind(const struct btf_type *t) {
1: +  return BTF_INFO_KIND(t->info);
1:  }
1:  
1: -static inline __u16 btf_vlen(const struct btf_type *t)
1: -{
1: -	return BTF_INFO_VLEN(t->info);
1: +static inline __u16 btf_vlen(const struct btf_type *t) {
1: +  return BTF_INFO_VLEN(t->info);
1:  }
1:  
1: -static inline bool btf_kflag(const struct btf_type *t)
1: -{
1: -	return BTF_INFO_KFLAG(t->info);
1: +static inline bool btf_kflag(const struct btf_type *t) {
1: +  return BTF_INFO_KFLAG(t->info);
1:  }
1:  
1: -static inline bool btf_is_void(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_UNKN;
1: +static inline bool btf_is_void(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_UNKN;
1:  }
1:  
1: -static inline bool btf_is_int(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_INT;
1: +static inline bool btf_is_int(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_INT;
1:  }
1:  
1: -static inline bool btf_is_ptr(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_PTR;
1: +static inline bool btf_is_ptr(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_PTR;
1:  }
1:  
1: -static inline bool btf_is_array(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_ARRAY;
1: +static inline bool btf_is_array(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_ARRAY;
1:  }
1:  
1: -static inline bool btf_is_struct(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_STRUCT;
1: +static inline bool btf_is_struct(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_STRUCT;
1:  }
1:  
1: -static inline bool btf_is_union(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_UNION;
1: +static inline bool btf_is_union(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_UNION;
1:  }
1:  
1: -static inline bool btf_is_composite(const struct btf_type *t)
1: -{
1: -	__u16 kind = btf_kind(t);
1: +static inline bool btf_is_composite(const struct btf_type *t) {
1: +  __u16 kind = btf_kind(t);
1:  
1: -	return kind == BTF_KIND_STRUCT || kind == BTF_KIND_UNION;
1: +  return kind == BTF_KIND_STRUCT || kind == BTF_KIND_UNION;
1:  }
1:  
1: -static inline bool btf_is_enum(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_ENUM;
1: +static inline bool btf_is_enum(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_ENUM;
1:  }
1:  
1: -static inline bool btf_is_fwd(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_FWD;
1: +static inline bool btf_is_fwd(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_FWD;
1:  }
1:  
1: -static inline bool btf_is_typedef(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_TYPEDEF;
1: +static inline bool btf_is_typedef(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_TYPEDEF;
1:  }
1:  
1: -static inline bool btf_is_volatile(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_VOLATILE;
1: +static inline bool btf_is_volatile(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_VOLATILE;
1:  }
1:  
1: -static inline bool btf_is_const(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_CONST;
1: +static inline bool btf_is_const(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_CONST;
1:  }
1:  
1: -static inline bool btf_is_restrict(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_RESTRICT;
1: +static inline bool btf_is_restrict(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_RESTRICT;
1:  }
1:  
1: -static inline bool btf_is_mod(const struct btf_type *t)
1: -{
1: -	__u16 kind = btf_kind(t);
1: +static inline bool btf_is_mod(const struct btf_type *t) {
1: +  __u16 kind = btf_kind(t);
1:  
1: -	return kind == BTF_KIND_VOLATILE ||
1: -	       kind == BTF_KIND_CONST ||
1: -	       kind == BTF_KIND_RESTRICT;
1: +  return kind == BTF_KIND_VOLATILE || kind == BTF_KIND_CONST ||
1: +         kind == BTF_KIND_RESTRICT;
1:  }
1:  
1: -static inline bool btf_is_func(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_FUNC;
1: +static inline bool btf_is_func(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_FUNC;
1:  }
1:  
1: -static inline bool btf_is_func_proto(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_FUNC_PROTO;
1: +static inline bool btf_is_func_proto(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_FUNC_PROTO;
1:  }
1:  
1: -static inline bool btf_is_var(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_VAR;
1: +static inline bool btf_is_var(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_VAR;
1:  }
1:  
1: -static inline bool btf_is_datasec(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_DATASEC;
1: +static inline bool btf_is_datasec(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_DATASEC;
1:  }
1:  
1: -static inline bool btf_is_float(const struct btf_type *t)
1: -{
1: -	return btf_kind(t) == BTF_KIND_FLOAT;
1: +static inline bool btf_is_float(const struct btf_type *t) {
1: +  return btf_kind(t) == BTF_KIND_FLOAT;
1:  }
1:  
1: -static inline __u8 btf_int_encoding(const struct btf_type *t)
1: -{
1: -	return BTF_INT_ENCODING(*(__u32 *)(t + 1));
1: +static inline __u8 btf_int_encoding(const struct btf_type *t) {
1: +  return BTF_INT_ENCODING(*(__u32 *)(t + 1));
1:  }
1:  
1: -static inline __u8 btf_int_offset(const struct btf_type *t)
1: -{
1: -	return BTF_INT_OFFSET(*(__u32 *)(t + 1));
1: +static inline __u8 btf_int_offset(const struct btf_type *t) {
1: +  return BTF_INT_OFFSET(*(__u32 *)(t + 1));
1:  }
1:  
1: -static inline __u8 btf_int_bits(const struct btf_type *t)
1: -{
1: -	return BTF_INT_BITS(*(__u32 *)(t + 1));
1: +static inline __u8 btf_int_bits(const struct btf_type *t) {
1: +  return BTF_INT_BITS(*(__u32 *)(t + 1));
1:  }
1:  
1: -static inline struct btf_array *btf_array(const struct btf_type *t)
1: -{
1: -	return (struct btf_array *)(t + 1);
1: +static inline struct btf_array *btf_array(const struct btf_type *t) {
1: +  return (struct btf_array *)(t + 1);
1:  }
1:  
1: -static inline struct btf_enum *btf_enum(const struct btf_type *t)
1: -{
1: -	return (struct btf_enum *)(t + 1);
1: +static inline struct btf_enum *btf_enum(const struct btf_type *t) {
1: +  return (struct btf_enum *)(t + 1);
1:  }
1:  
1: -static inline struct btf_member *btf_members(const struct btf_type *t)
1: -{
1: -	return (struct btf_member *)(t + 1);
1: +static inline struct btf_member *btf_members(const struct btf_type *t) {
1: +  return (struct btf_member *)(t + 1);
1:  }
1:  
1:  /* Get bit offset of a member with specified index. */
1:  static inline __u32 btf_member_bit_offset(const struct btf_type *t,
1: -					  __u32 member_idx)
1: -{
1: -	const struct btf_member *m = btf_members(t) + member_idx;
1: -	bool kflag = btf_kflag(t);
1: +                                          __u32 member_idx) {
1: +  const struct btf_member *m = btf_members(t) + member_idx;
1: +  bool kflag = btf_kflag(t);
1:  
1: -	return kflag ? BTF_MEMBER_BIT_OFFSET(m->offset) : m->offset;
1: +  return kflag ? BTF_MEMBER_BIT_OFFSET(m->offset) : m->offset;
1:  }
1:  /*
1:   * Get bitfield size of a member, assuming t is BTF_KIND_STRUCT or
1:   * BTF_KIND_UNION. If member is not a bitfield, zero is returned.
1:   */
1:  static inline __u32 btf_member_bitfield_size(const struct btf_type *t,
1: -					     __u32 member_idx)
1: -{
1: -	const struct btf_member *m = btf_members(t) + member_idx;
1: -	bool kflag = btf_kflag(t);
1: +                                             __u32 member_idx) {
1: +  const struct btf_member *m = btf_members(t) + member_idx;
1: +  bool kflag = btf_kflag(t);
1:  
1: -	return kflag ? BTF_MEMBER_BITFIELD_SIZE(m->offset) : 0;
1: +  return kflag ? BTF_MEMBER_BITFIELD_SIZE(m->offset) : 0;
1:  }
1:  
1: -static inline struct btf_param *btf_params(const struct btf_type *t)
1: -{
1: -	return (struct btf_param *)(t + 1);
1: +static inline struct btf_param *btf_params(const struct btf_type *t) {
1: +  return (struct btf_param *)(t + 1);
1:  }
1:  
1: -static inline struct btf_var *btf_var(const struct btf_type *t)
1: -{
1: -	return (struct btf_var *)(t + 1);
1: +static inline struct btf_var *btf_var(const struct btf_type *t) {
1: +  return (struct btf_var *)(t + 1);
1:  }
1:  
1: -static inline struct btf_var_secinfo *
1: -btf_var_secinfos(const struct btf_type *t)
1: -{
1: -	return (struct btf_var_secinfo *)(t + 1);
1: +static inline struct btf_var_secinfo *btf_var_secinfos(
1: +    const struct btf_type *t) {
1: +  return (struct btf_var_secinfo *)(t + 1);
1:  }
1:  
1:  #ifdef __cplusplus
1: diff --git a/src/cc/libbpf/src/btf_dump.c b/src/cc/libbpf/src/btf_dump.c
1: index 5dc6b517..0f560ab4 100644
1: --- a/src/cc/libbpf/src/btf_dump.c
1: +++ b/src/cc/libbpf/src/btf_dump.c
1: @@ -6,14 +6,14 @@
1:   * Copyright (c) 2019 Facebook
1:   */
1:  
1: +#include <errno.h>
1: +#include <linux/btf.h>
1: +#include <linux/err.h>
1: +#include <linux/kernel.h>
1:  #include <stdbool.h>
1:  #include <stddef.h>
1:  #include <stdlib.h>
1:  #include <string.h>
1: -#include <errno.h>
1: -#include <linux/err.h>
1: -#include <linux/btf.h>
1: -#include <linux/kernel.h>
1:  #include "btf.h"
1:  #include "hashmap.h"
1:  #include "libbpf.h"
1: @@ -22,194 +22,184 @@
1:  static const char PREFIXES[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
1:  static const size_t PREFIX_CNT = sizeof(PREFIXES) - 1;
1:  
1: -static const char *pfx(int lvl)
1: -{
1: -	return lvl >= PREFIX_CNT ? PREFIXES : &PREFIXES[PREFIX_CNT - lvl];
1: +static const char *pfx(int lvl) {
1: +  return lvl >= PREFIX_CNT ? PREFIXES : &PREFIXES[PREFIX_CNT - lvl];
1:  }
1:  
1:  enum btf_dump_type_order_state {
1: -	NOT_ORDERED,
1: -	ORDERING,
1: -	ORDERED,
1: +  NOT_ORDERED,
1: +  ORDERING,
1: +  ORDERED,
1:  };
1:  
1:  enum btf_dump_type_emit_state {
1: -	NOT_EMITTED,
1: -	EMITTING,
1: -	EMITTED,
1: +  NOT_EMITTED,
1: +  EMITTING,
1: +  EMITTED,
1:  };
1:  
1:  /* per-type auxiliary state */
1:  struct btf_dump_type_aux_state {
1: -	/* topological sorting state */
1: -	enum btf_dump_type_order_state order_state: 2;
1: -	/* emitting state used to determine the need for forward declaration */
1: -	enum btf_dump_type_emit_state emit_state: 2;
1: -	/* whether forward declaration was already emitted */
1: -	__u8 fwd_emitted: 1;
1: -	/* whether unique non-duplicate name was already assigned */
1: -	__u8 name_resolved: 1;
1: -	/* whether type is referenced from any other type */
1: -	__u8 referenced: 1;
1: +  /* topological sorting state */
1: +  enum btf_dump_type_order_state order_state : 2;
1: +  /* emitting state used to determine the need for forward declaration */
1: +  enum btf_dump_type_emit_state emit_state : 2;
1: +  /* whether forward declaration was already emitted */
1: +  __u8 fwd_emitted : 1;
1: +  /* whether unique non-duplicate name was already assigned */
1: +  __u8 name_resolved : 1;
1: +  /* whether type is referenced from any other type */
1: +  __u8 referenced : 1;
1:  };
1:  
1:  struct btf_dump {
1: -	const struct btf *btf;
1: -	const struct btf_ext *btf_ext;
1: -	btf_dump_printf_fn_t printf_fn;
1: -	struct btf_dump_opts opts;
1: -	int ptr_sz;
1: -	bool strip_mods;
1: -	int last_id;
1: -
1: -	/* per-type auxiliary state */
1: -	struct btf_dump_type_aux_state *type_states;
1: -	size_t type_states_cap;
1: -	/* per-type optional cached unique name, must be freed, if present */
1: -	const char **cached_names;
1: -	size_t cached_names_cap;
1: -
1: -	/* topo-sorted list of dependent type definitions */
1: -	__u32 *emit_queue;
1: -	int emit_queue_cap;
1: -	int emit_queue_cnt;
1: -
1: -	/*
1: -	 * stack of type declarations (e.g., chain of modifiers, arrays,
1: -	 * funcs, etc)
1: -	 */
1: -	__u32 *decl_stack;
1: -	int decl_stack_cap;
1: -	int decl_stack_cnt;
1: -
1: -	/* maps struct/union/enum name to a number of name occurrences */
1: -	struct hashmap *type_names;
1: -	/*
1: -	 * maps typedef identifiers and enum value names to a number of such
1: -	 * name occurrences
1: -	 */
1: -	struct hashmap *ident_names;
1: +  const struct btf *btf;
1: +  const struct btf_ext *btf_ext;
1: +  btf_dump_printf_fn_t printf_fn;
1: +  struct btf_dump_opts opts;
1: +  int ptr_sz;
1: +  bool strip_mods;
1: +  int last_id;
1: +
1: +  /* per-type auxiliary state */
1: +  struct btf_dump_type_aux_state *type_states;
1: +  size_t type_states_cap;
1: +  /* per-type optional cached unique name, must be freed, if present */
1: +  const char **cached_names;
1: +  size_t cached_names_cap;
1: +
1: +  /* topo-sorted list of dependent type definitions */
1: +  __u32 *emit_queue;
1: +  int emit_queue_cap;
1: +  int emit_queue_cnt;
1: +
1: +  /*
1: +   * stack of type declarations (e.g., chain of modifiers, arrays,
1: +   * funcs, etc)
1: +   */
1: +  __u32 *decl_stack;
1: +  int decl_stack_cap;
1: +  int decl_stack_cnt;
1: +
1: +  /* maps struct/union/enum name to a number of name occurrences */
1: +  struct hashmap *type_names;
1: +  /*
1: +   * maps typedef identifiers and enum value names to a number of such
1: +   * name occurrences
1: +   */
1: +  struct hashmap *ident_names;
1:  };
1:  
1: -static size_t str_hash_fn(const void *key, void *ctx)
1: -{
1: -	return str_hash(key);
1: -}
1: +static size_t str_hash_fn(const void *key, void *ctx) { return str_hash(key); }
1:  
1: -static bool str_equal_fn(const void *a, const void *b, void *ctx)
1: -{
1: -	return strcmp(a, b) == 0;
1: +static bool str_equal_fn(const void *a, const void *b, void *ctx) {
1: +  return strcmp(a, b) == 0;
1:  }
1:  
1: -static const char *btf_name_of(const struct btf_dump *d, __u32 name_off)
1: -{
1: -	return btf__name_by_offset(d->btf, name_off);
1: +static const char *btf_name_of(const struct btf_dump *d, __u32 name_off) {
1: +  return btf__name_by_offset(d->btf, name_off);
1:  }
1:  
1: -static void btf_dump_printf(const struct btf_dump *d, const char *fmt, ...)
1: -{
1: -	va_list args;
1: +static void btf_dump_printf(const struct btf_dump *d, const char *fmt, ...) {
1: +  va_list args;
1:  
1: -	va_start(args, fmt);
1: -	d->printf_fn(d->opts.ctx, fmt, args);
1: -	va_end(args);
1: +  va_start(args, fmt);
1: +  d->printf_fn(d->opts.ctx, fmt, args);
1: +  va_end(args);
1:  }
1:  
1:  static int btf_dump_mark_referenced(struct btf_dump *d);
1:  static int btf_dump_resize(struct btf_dump *d);
1:  
1:  struct btf_dump *btf_dump__new(const struct btf *btf,
1: -			       const struct btf_ext *btf_ext,
1: -			       const struct btf_dump_opts *opts,
1: -			       btf_dump_printf_fn_t printf_fn)
1: -{
1: -	struct btf_dump *d;
1: -	int err;
1: -
1: -	d = calloc(1, sizeof(struct btf_dump));
1: -	if (!d)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -
1: -	d->btf = btf;
1: -	d->btf_ext = btf_ext;
1: -	d->printf_fn = printf_fn;
1: -	d->opts.ctx = opts ? opts->ctx : NULL;
1: -	d->ptr_sz = btf__pointer_size(btf) ? : sizeof(void *);
1: -
1: -	d->type_names = hashmap__new(str_hash_fn, str_equal_fn, NULL);
1: -	if (IS_ERR(d->type_names)) {
1: -		err = PTR_ERR(d->type_names);
1: -		d->type_names = NULL;
1: -		goto err;
1: -	}
1: -	d->ident_names = hashmap__new(str_hash_fn, str_equal_fn, NULL);
1: -	if (IS_ERR(d->ident_names)) {
1: -		err = PTR_ERR(d->ident_names);
1: -		d->ident_names = NULL;
1: -		goto err;
1: -	}
1: -
1: -	err = btf_dump_resize(d);
1: -	if (err)
1: -		goto err;
1: -
1: -	return d;
1: +                               const struct btf_ext *btf_ext,
1: +                               const struct btf_dump_opts *opts,
1: +                               btf_dump_printf_fn_t printf_fn) {
1: +  struct btf_dump *d;
1: +  int err;
1: +
1: +  d = calloc(1, sizeof(struct btf_dump));
1: +  if (!d)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +
1: +  d->btf = btf;
1: +  d->btf_ext = btf_ext;
1: +  d->printf_fn = printf_fn;
1: +  d->opts.ctx = opts ? opts->ctx : NULL;
1: +  d->ptr_sz = btf__pointer_size(btf) ?: sizeof(void *);
1: +
1: +  d->type_names = hashmap__new(str_hash_fn, str_equal_fn, NULL);
1: +  if (IS_ERR(d->type_names)) {
1: +    err = PTR_ERR(d->type_names);
1: +    d->type_names = NULL;
1: +    goto err;
1: +  }
1: +  d->ident_names = hashmap__new(str_hash_fn, str_equal_fn, NULL);
1: +  if (IS_ERR(d->ident_names)) {
1: +    err = PTR_ERR(d->ident_names);
1: +    d->ident_names = NULL;
1: +    goto err;
1: +  }
1: +
1: +  err = btf_dump_resize(d);
1: +  if (err)
1: +    goto err;
1: +
1: +  return d;
1:  err:
1: -	btf_dump__free(d);
1: -	return libbpf_err_ptr(err);
1: +  btf_dump__free(d);
1: +  return libbpf_err_ptr(err);
1:  }
1:  
1: -static int btf_dump_resize(struct btf_dump *d)
1: -{
1: -	int err, last_id = btf__get_nr_types(d->btf);
1: -
1: -	if (last_id <= d->last_id)
1: -		return 0;
1: -
1: -	if (libbpf_ensure_mem((void **)&d->type_states, &d->type_states_cap,
1: -			      sizeof(*d->type_states), last_id + 1))
1: -		return -ENOMEM;
1: -	if (libbpf_ensure_mem((void **)&d->cached_names, &d->cached_names_cap,
1: -			      sizeof(*d->cached_names), last_id + 1))
1: -		return -ENOMEM;
1: -
1: -	if (d->last_id == 0) {
1: -		/* VOID is special */
1: -		d->type_states[0].order_state = ORDERED;
1: -		d->type_states[0].emit_state = EMITTED;
1: -	}
1: -
1: -	/* eagerly determine referenced types for anon enums */
1: -	err = btf_dump_mark_referenced(d);
1: -	if (err)
1: -		return err;
1: -
1: -	d->last_id = last_id;
1: -	return 0;
1: +static int btf_dump_resize(struct btf_dump *d) {
1: +  int err, last_id = btf__get_nr_types(d->btf);
1: +
1: +  if (last_id <= d->last_id)
1: +    return 0;
1: +
1: +  if (libbpf_ensure_mem((void **)&d->type_states, &d->type_states_cap,
1: +                        sizeof(*d->type_states), last_id + 1))
1: +    return -ENOMEM;
1: +  if (libbpf_ensure_mem((void **)&d->cached_names, &d->cached_names_cap,
1: +                        sizeof(*d->cached_names), last_id + 1))
1: +    return -ENOMEM;
1: +
1: +  if (d->last_id == 0) {
1: +    /* VOID is special */
1: +    d->type_states[0].order_state = ORDERED;
1: +    d->type_states[0].emit_state = EMITTED;
1: +  }
1: +
1: +  /* eagerly determine referenced types for anon enums */
1: +  err = btf_dump_mark_referenced(d);
1: +  if (err)
1: +    return err;
1: +
1: +  d->last_id = last_id;
1: +  return 0;
1:  }
1:  
1: -void btf_dump__free(struct btf_dump *d)
1: -{
1: -	int i;
1: -
1: -	if (IS_ERR_OR_NULL(d))
1: -		return;
1: -
1: -	free(d->type_states);
1: -	if (d->cached_names) {
1: -		/* any set cached name is owned by us and should be freed */
1: -		for (i = 0; i <= d->last_id; i++) {
1: -			if (d->cached_names[i])
1: -				free((void *)d->cached_names[i]);
1: -		}
1: -	}
1: -	free(d->cached_names);
1: -	free(d->emit_queue);
1: -	free(d->decl_stack);
1: -	hashmap__free(d->type_names);
1: -	hashmap__free(d->ident_names);
1: -
1: -	free(d);
1: +void btf_dump__free(struct btf_dump *d) {
1: +  int i;
1: +
1: +  if (IS_ERR_OR_NULL(d))
1: +    return;
1: +
1: +  free(d->type_states);
1: +  if (d->cached_names) {
1: +    /* any set cached name is owned by us and should be freed */
1: +    for (i = 0; i <= d->last_id; i++) {
1: +      if (d->cached_names[i])
1: +        free((void *)d->cached_names[i]);
1: +    }
1: +  }
1: +  free(d->cached_names);
1: +  free(d->emit_queue);
1: +  free(d->decl_stack);
1: +  hashmap__free(d->type_names);
1: +  hashmap__free(d->ident_names);
1: +
1: +  free(d);
1:  }
1:  
1:  static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr);
1: @@ -231,26 +221,25 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id);
1:   *
1:   * Returns 0 on success; <0, otherwise.
1:   */
1: -int btf_dump__dump_type(struct btf_dump *d, __u32 id)
1: -{
1: -	int err, i;
1: +int btf_dump__dump_type(struct btf_dump *d, __u32 id) {
1: +  int err, i;
1:  
1: -	if (id > btf__get_nr_types(d->btf))
1: -		return libbpf_err(-EINVAL);
1: +  if (id > btf__get_nr_types(d->btf))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	err = btf_dump_resize(d);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = btf_dump_resize(d);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	d->emit_queue_cnt = 0;
1: -	err = btf_dump_order_type(d, id, false);
1: -	if (err < 0)
1: -		return libbpf_err(err);
1: +  d->emit_queue_cnt = 0;
1: +  err = btf_dump_order_type(d, id, false);
1: +  if (err < 0)
1: +    return libbpf_err(err);
1:  
1: -	for (i = 0; i < d->emit_queue_cnt; i++)
1: -		btf_dump_emit_type(d, d->emit_queue[i], 0 /*top-level*/);
1: +  for (i = 0; i < d->emit_queue_cnt; i++)
1: +    btf_dump_emit_type(d, d->emit_queue[i], 0 /*top-level*/);
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -265,85 +254,84 @@ int btf_dump__dump_type(struct btf_dump *d, __u32 id)
1:   * top-level anonymous enum won't be referenced by anything, while embedded
1:   * one will.
1:   */
1: -static int btf_dump_mark_referenced(struct btf_dump *d)
1: -{
1: -	int i, j, n = btf__get_nr_types(d->btf);
1: -	const struct btf_type *t;
1: -	__u16 vlen;
1: -
1: -	for (i = d->last_id + 1; i <= n; i++) {
1: -		t = btf__type_by_id(d->btf, i);
1: -		vlen = btf_vlen(t);
1: -
1: -		switch (btf_kind(t)) {
1: -		case BTF_KIND_INT:
1: -		case BTF_KIND_ENUM:
1: -		case BTF_KIND_FWD:
1: -		case BTF_KIND_FLOAT:
1: -			break;
1: -
1: -		case BTF_KIND_VOLATILE:
1: -		case BTF_KIND_CONST:
1: -		case BTF_KIND_RESTRICT:
1: -		case BTF_KIND_PTR:
1: -		case BTF_KIND_TYPEDEF:
1: -		case BTF_KIND_FUNC:
1: -		case BTF_KIND_VAR:
1: -			d->type_states[t->type].referenced = 1;
1: -			break;
1: -
1: -		case BTF_KIND_ARRAY: {
1: -			const struct btf_array *a = btf_array(t);
1: -
1: -			d->type_states[a->index_type].referenced = 1;
1: -			d->type_states[a->type].referenced = 1;
1: -			break;
1: -		}
1: -		case BTF_KIND_STRUCT:
1: -		case BTF_KIND_UNION: {
1: -			const struct btf_member *m = btf_members(t);
1: -
1: -			for (j = 0; j < vlen; j++, m++)
1: -				d->type_states[m->type].referenced = 1;
1: -			break;
1: -		}
1: -		case BTF_KIND_FUNC_PROTO: {
1: -			const struct btf_param *p = btf_params(t);
1: -
1: -			for (j = 0; j < vlen; j++, p++)
1: -				d->type_states[p->type].referenced = 1;
1: -			break;
1: -		}
1: -		case BTF_KIND_DATASEC: {
1: -			const struct btf_var_secinfo *v = btf_var_secinfos(t);
1: -
1: -			for (j = 0; j < vlen; j++, v++)
1: -				d->type_states[v->type].referenced = 1;
1: -			break;
1: -		}
1: -		default:
1: -			return -EINVAL;
1: -		}
1: -	}
1: -	return 0;
1: +static int btf_dump_mark_referenced(struct btf_dump *d) {
1: +  int i, j, n = btf__get_nr_types(d->btf);
1: +  const struct btf_type *t;
1: +  __u16 vlen;
1: +
1: +  for (i = d->last_id + 1; i <= n; i++) {
1: +    t = btf__type_by_id(d->btf, i);
1: +    vlen = btf_vlen(t);
1: +
1: +    switch (btf_kind(t)) {
1: +    case BTF_KIND_INT:
1: +    case BTF_KIND_ENUM:
1: +    case BTF_KIND_FWD:
1: +    case BTF_KIND_FLOAT:
1: +      break;
1: +
1: +    case BTF_KIND_VOLATILE:
1: +    case BTF_KIND_CONST:
1: +    case BTF_KIND_RESTRICT:
1: +    case BTF_KIND_PTR:
1: +    case BTF_KIND_TYPEDEF:
1: +    case BTF_KIND_FUNC:
1: +    case BTF_KIND_VAR:
1: +      d->type_states[t->type].referenced = 1;
1: +      break;
1: +
1: +    case BTF_KIND_ARRAY: {
1: +      const struct btf_array *a = btf_array(t);
1: +
1: +      d->type_states[a->index_type].referenced = 1;
1: +      d->type_states[a->type].referenced = 1;
1: +      break;
1: +    }
1: +    case BTF_KIND_STRUCT:
1: +    case BTF_KIND_UNION: {
1: +      const struct btf_member *m = btf_members(t);
1: +
1: +      for (j = 0; j < vlen; j++, m++)
1: +        d->type_states[m->type].referenced = 1;
1: +      break;
1: +    }
1: +    case BTF_KIND_FUNC_PROTO: {
1: +      const struct btf_param *p = btf_params(t);
1: +
1: +      for (j = 0; j < vlen; j++, p++)
1: +        d->type_states[p->type].referenced = 1;
1: +      break;
1: +    }
1: +    case BTF_KIND_DATASEC: {
1: +      const struct btf_var_secinfo *v = btf_var_secinfos(t);
1: +
1: +      for (j = 0; j < vlen; j++, v++)
1: +        d->type_states[v->type].referenced = 1;
1: +      break;
1: +    }
1: +    default:
1: +      return -EINVAL;
1: +    }
1: +  }
1: +  return 0;
1:  }
1:  
1: -static int btf_dump_add_emit_queue_id(struct btf_dump *d, __u32 id)
1: -{
1: -	__u32 *new_queue;
1: -	size_t new_cap;
1: -
1: -	if (d->emit_queue_cnt >= d->emit_queue_cap) {
1: -		new_cap = max(16, d->emit_queue_cap * 3 / 2);
1: -		new_queue = libbpf_reallocarray(d->emit_queue, new_cap, sizeof(new_queue[0]));
1: -		if (!new_queue)
1: -			return -ENOMEM;
1: -		d->emit_queue = new_queue;
1: -		d->emit_queue_cap = new_cap;
1: -	}
1: -
1: -	d->emit_queue[d->emit_queue_cnt++] = id;
1: -	return 0;
1: +static int btf_dump_add_emit_queue_id(struct btf_dump *d, __u32 id) {
1: +  __u32 *new_queue;
1: +  size_t new_cap;
1: +
1: +  if (d->emit_queue_cnt >= d->emit_queue_cap) {
1: +    new_cap = max(16, d->emit_queue_cap * 3 / 2);
1: +    new_queue =
1: +        libbpf_reallocarray(d->emit_queue, new_cap, sizeof(new_queue[0]));
1: +    if (!new_queue)
1: +      return -ENOMEM;
1: +    d->emit_queue = new_queue;
1: +    d->emit_queue_cap = new_cap;
1: +  }
1: +
1: +  d->emit_queue[d->emit_queue_cnt++] = id;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -420,199 +408,197 @@ static int btf_dump_add_emit_queue_id(struct btf_dump *d, __u32 id)
1:   *   declaration);
1:   *   - <0, on error (e.g., unsatisfiable type loop detected).
1:   */
1: -static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr)
1: -{
1: -	/*
1: -	 * Order state is used to detect strong link cycles, but only for BTF
1: -	 * kinds that are or could be an independent definition (i.e.,
1: -	 * stand-alone fwd decl, enum, typedef, struct, union). Ptrs, arrays,
1: -	 * func_protos, modifiers are just means to get to these definitions.
1: -	 * Int/void don't need definitions, they are assumed to be always
1: -	 * properly defined.  We also ignore datasec, var, and funcs for now.
1: -	 * So for all non-defining kinds, we never even set ordering state,
1: -	 * for defining kinds we set ORDERING and subsequently ORDERED if it
1: -	 * forms a strong link.
1: -	 */
1: -	struct btf_dump_type_aux_state *tstate = &d->type_states[id];
1: -	const struct btf_type *t;
1: -	__u16 vlen;
1: -	int err, i;
1: -
1: -	/* return true, letting typedefs know that it's ok to be emitted */
1: -	if (tstate->order_state == ORDERED)
1: -		return 1;
1: -
1: -	t = btf__type_by_id(d->btf, id);
1: -
1: -	if (tstate->order_state == ORDERING) {
1: -		/* type loop, but resolvable through fwd declaration */
1: -		if (btf_is_composite(t) && through_ptr && t->name_off != 0)
1: -			return 0;
1: -		pr_warn("unsatisfiable type cycle, id:[%u]\n", id);
1: -		return -ELOOP;
1: -	}
1: -
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_INT:
1: -	case BTF_KIND_FLOAT:
1: -		tstate->order_state = ORDERED;
1: -		return 0;
1: -
1: -	case BTF_KIND_PTR:
1: -		err = btf_dump_order_type(d, t->type, true);
1: -		tstate->order_state = ORDERED;
1: -		return err;
1: -
1: -	case BTF_KIND_ARRAY:
1: -		return btf_dump_order_type(d, btf_array(t)->type, false);
1: -
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION: {
1: -		const struct btf_member *m = btf_members(t);
1: -		/*
1: -		 * struct/union is part of strong link, only if it's embedded
1: -		 * (so no ptr in a path) or it's anonymous (so has to be
1: -		 * defined inline, even if declared through ptr)
1: -		 */
1: -		if (through_ptr && t->name_off != 0)
1: -			return 0;
1: -
1: -		tstate->order_state = ORDERING;
1: -
1: -		vlen = btf_vlen(t);
1: -		for (i = 0; i < vlen; i++, m++) {
1: -			err = btf_dump_order_type(d, m->type, false);
1: -			if (err < 0)
1: -				return err;
1: -		}
1: -
1: -		if (t->name_off != 0) {
1: -			err = btf_dump_add_emit_queue_id(d, id);
1: -			if (err < 0)
1: -				return err;
1: -		}
1: -
1: -		tstate->order_state = ORDERED;
1: -		return 1;
1: -	}
1: -	case BTF_KIND_ENUM:
1: -	case BTF_KIND_FWD:
1: -		/*
1: -		 * non-anonymous or non-referenced enums are top-level
1: -		 * declarations and should be emitted. Same logic can be
1: -		 * applied to FWDs, it won't hurt anyways.
1: -		 */
1: -		if (t->name_off != 0 || !tstate->referenced) {
1: -			err = btf_dump_add_emit_queue_id(d, id);
1: -			if (err)
1: -				return err;
1: -		}
1: -		tstate->order_state = ORDERED;
1: -		return 1;
1: -
1: -	case BTF_KIND_TYPEDEF: {
1: -		int is_strong;
1: -
1: -		is_strong = btf_dump_order_type(d, t->type, through_ptr);
1: -		if (is_strong < 0)
1: -			return is_strong;
1: -
1: -		/* typedef is similar to struct/union w.r.t. fwd-decls */
1: -		if (through_ptr && !is_strong)
1: -			return 0;
1: -
1: -		/* typedef is always a named definition */
1: -		err = btf_dump_add_emit_queue_id(d, id);
1: -		if (err)
1: -			return err;
1: -
1: -		d->type_states[id].order_state = ORDERED;
1: -		return 1;
1: -	}
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_RESTRICT:
1: -		return btf_dump_order_type(d, t->type, through_ptr);
1: -
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		const struct btf_param *p = btf_params(t);
1: -		bool is_strong;
1: -
1: -		err = btf_dump_order_type(d, t->type, through_ptr);
1: -		if (err < 0)
1: -			return err;
1: -		is_strong = err > 0;
1: -
1: -		vlen = btf_vlen(t);
1: -		for (i = 0; i < vlen; i++, p++) {
1: -			err = btf_dump_order_type(d, p->type, through_ptr);
1: -			if (err < 0)
1: -				return err;
1: -			if (err > 0)
1: -				is_strong = true;
1: -		}
1: -		return is_strong;
1: -	}
1: -	case BTF_KIND_FUNC:
1: -	case BTF_KIND_VAR:
1: -	case BTF_KIND_DATASEC:
1: -		d->type_states[id].order_state = ORDERED;
1: -		return 0;
1: -
1: -	default:
1: -		return -EINVAL;
1: -	}
1: +static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) {
1: +  /*
1: +   * Order state is used to detect strong link cycles, but only for BTF
1: +   * kinds that are or could be an independent definition (i.e.,
1: +   * stand-alone fwd decl, enum, typedef, struct, union). Ptrs, arrays,
1: +   * func_protos, modifiers are just means to get to these definitions.
1: +   * Int/void don't need definitions, they are assumed to be always
1: +   * properly defined.  We also ignore datasec, var, and funcs for now.
1: +   * So for all non-defining kinds, we never even set ordering state,
1: +   * for defining kinds we set ORDERING and subsequently ORDERED if it
1: +   * forms a strong link.
1: +   */
1: +  struct btf_dump_type_aux_state *tstate = &d->type_states[id];
1: +  const struct btf_type *t;
1: +  __u16 vlen;
1: +  int err, i;
1: +
1: +  /* return true, letting typedefs know that it's ok to be emitted */
1: +  if (tstate->order_state == ORDERED)
1: +    return 1;
1: +
1: +  t = btf__type_by_id(d->btf, id);
1: +
1: +  if (tstate->order_state == ORDERING) {
1: +    /* type loop, but resolvable through fwd declaration */
1: +    if (btf_is_composite(t) && through_ptr && t->name_off != 0)
1: +      return 0;
1: +    pr_warn("unsatisfiable type cycle, id:[%u]\n", id);
1: +    return -ELOOP;
1: +  }
1: +
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_INT:
1: +  case BTF_KIND_FLOAT:
1: +    tstate->order_state = ORDERED;
1: +    return 0;
1: +
1: +  case BTF_KIND_PTR:
1: +    err = btf_dump_order_type(d, t->type, true);
1: +    tstate->order_state = ORDERED;
1: +    return err;
1: +
1: +  case BTF_KIND_ARRAY:
1: +    return btf_dump_order_type(d, btf_array(t)->type, false);
1: +
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION: {
1: +    const struct btf_member *m = btf_members(t);
1: +    /*
1: +     * struct/union is part of strong link, only if it's embedded
1: +     * (so no ptr in a path) or it's anonymous (so has to be
1: +     * defined inline, even if declared through ptr)
1: +     */
1: +    if (through_ptr && t->name_off != 0)
1: +      return 0;
1: +
1: +    tstate->order_state = ORDERING;
1: +
1: +    vlen = btf_vlen(t);
1: +    for (i = 0; i < vlen; i++, m++) {
1: +      err = btf_dump_order_type(d, m->type, false);
1: +      if (err < 0)
1: +        return err;
1: +    }
1: +
1: +    if (t->name_off != 0) {
1: +      err = btf_dump_add_emit_queue_id(d, id);
1: +      if (err < 0)
1: +        return err;
1: +    }
1: +
1: +    tstate->order_state = ORDERED;
1: +    return 1;
1: +  }
1: +  case BTF_KIND_ENUM:
1: +  case BTF_KIND_FWD:
1: +    /*
1: +     * non-anonymous or non-referenced enums are top-level
1: +     * declarations and should be emitted. Same logic can be
1: +     * applied to FWDs, it won't hurt anyways.
1: +     */
1: +    if (t->name_off != 0 || !tstate->referenced) {
1: +      err = btf_dump_add_emit_queue_id(d, id);
1: +      if (err)
1: +        return err;
1: +    }
1: +    tstate->order_state = ORDERED;
1: +    return 1;
1: +
1: +  case BTF_KIND_TYPEDEF: {
1: +    int is_strong;
1: +
1: +    is_strong = btf_dump_order_type(d, t->type, through_ptr);
1: +    if (is_strong < 0)
1: +      return is_strong;
1: +
1: +    /* typedef is similar to struct/union w.r.t. fwd-decls */
1: +    if (through_ptr && !is_strong)
1: +      return 0;
1: +
1: +    /* typedef is always a named definition */
1: +    err = btf_dump_add_emit_queue_id(d, id);
1: +    if (err)
1: +      return err;
1: +
1: +    d->type_states[id].order_state = ORDERED;
1: +    return 1;
1: +  }
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_RESTRICT:
1: +    return btf_dump_order_type(d, t->type, through_ptr);
1: +
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    const struct btf_param *p = btf_params(t);
1: +    bool is_strong;
1: +
1: +    err = btf_dump_order_type(d, t->type, through_ptr);
1: +    if (err < 0)
1: +      return err;
1: +    is_strong = err > 0;
1: +
1: +    vlen = btf_vlen(t);
1: +    for (i = 0; i < vlen; i++, p++) {
1: +      err = btf_dump_order_type(d, p->type, through_ptr);
1: +      if (err < 0)
1: +        return err;
1: +      if (err > 0)
1: +        is_strong = true;
1: +    }
1: +    return is_strong;
1: +  }
1: +  case BTF_KIND_FUNC:
1: +  case BTF_KIND_VAR:
1: +  case BTF_KIND_DATASEC:
1: +    d->type_states[id].order_state = ORDERED;
1: +    return 0;
1: +
1: +  default:
1: +    return -EINVAL;
1: +  }
1:  }
1:  
1:  static void btf_dump_emit_missing_aliases(struct btf_dump *d, __u32 id,
1: -					  const struct btf_type *t);
1: +                                          const struct btf_type *t);
1:  
1:  static void btf_dump_emit_struct_fwd(struct btf_dump *d, __u32 id,
1: -				     const struct btf_type *t);
1: +                                     const struct btf_type *t);
1:  static void btf_dump_emit_struct_def(struct btf_dump *d, __u32 id,
1: -				     const struct btf_type *t, int lvl);
1: +                                     const struct btf_type *t, int lvl);
1:  
1:  static void btf_dump_emit_enum_fwd(struct btf_dump *d, __u32 id,
1: -				   const struct btf_type *t);
1: +                                   const struct btf_type *t);
1:  static void btf_dump_emit_enum_def(struct btf_dump *d, __u32 id,
1: -				   const struct btf_type *t, int lvl);
1: +                                   const struct btf_type *t, int lvl);
1:  
1:  static void btf_dump_emit_fwd_def(struct btf_dump *d, __u32 id,
1: -				  const struct btf_type *t);
1: +                                  const struct btf_type *t);
1:  
1:  static void btf_dump_emit_typedef_def(struct btf_dump *d, __u32 id,
1: -				      const struct btf_type *t, int lvl);
1: +                                      const struct btf_type *t, int lvl);
1:  
1:  /* a local view into a shared stack */
1:  struct id_stack {
1: -	const __u32 *ids;
1: -	int cnt;
1: +  const __u32 *ids;
1: +  int cnt;
1:  };
1:  
1:  static void btf_dump_emit_type_decl(struct btf_dump *d, __u32 id,
1: -				    const char *fname, int lvl);
1: +                                    const char *fname, int lvl);
1:  static void btf_dump_emit_type_chain(struct btf_dump *d,
1: -				     struct id_stack *decl_stack,
1: -				     const char *fname, int lvl);
1: +                                     struct id_stack *decl_stack,
1: +                                     const char *fname, int lvl);
1:  
1:  static const char *btf_dump_type_name(struct btf_dump *d, __u32 id);
1:  static const char *btf_dump_ident_name(struct btf_dump *d, __u32 id);
1:  static size_t btf_dump_name_dups(struct btf_dump *d, struct hashmap *name_map,
1: -				 const char *orig_name);
1: -
1: -static bool btf_dump_is_blacklisted(struct btf_dump *d, __u32 id)
1: -{
1: -	const struct btf_type *t = btf__type_by_id(d->btf, id);
1: -
1: -	/* __builtin_va_list is a compiler built-in, which causes compilation
1: -	 * errors, when compiling w/ different compiler, then used to compile
1: -	 * original code (e.g., GCC to compile kernel, Clang to use generated
1: -	 * C header from BTF). As it is built-in, it should be already defined
1: -	 * properly internally in compiler.
1: -	 */
1: -	if (t->name_off == 0)
1: -		return false;
1: -	return strcmp(btf_name_of(d, t->name_off), "__builtin_va_list") == 0;
1: +                                 const char *orig_name);
1: +
1: +static bool btf_dump_is_blacklisted(struct btf_dump *d, __u32 id) {
1: +  const struct btf_type *t = btf__type_by_id(d->btf, id);
1: +
1: +  /* __builtin_va_list is a compiler built-in, which causes compilation
1: +   * errors, when compiling w/ different compiler, then used to compile
1: +   * original code (e.g., GCC to compile kernel, Clang to use generated
1: +   * C header from BTF). As it is built-in, it should be already defined
1: +   * properly internally in compiler.
1: +   */
1: +  if (t->name_off == 0)
1: +    return false;
1: +  return strcmp(btf_name_of(d, t->name_off), "__builtin_va_list") == 0;
1:  }
1:  
1:  /*
1: @@ -633,398 +619,374 @@ static bool btf_dump_is_blacklisted(struct btf_dump *d, __u32 id)
1:   * that doesn't comply to C rules completely), algorithm will try to proceed
1:   * and produce as much meaningful output as possible.
1:   */
1: -static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id)
1: -{
1: -	struct btf_dump_type_aux_state *tstate = &d->type_states[id];
1: -	bool top_level_def = cont_id == 0;
1: -	const struct btf_type *t;
1: -	__u16 kind;
1: -
1: -	if (tstate->emit_state == EMITTED)
1: -		return;
1: -
1: -	t = btf__type_by_id(d->btf, id);
1: -	kind = btf_kind(t);
1: -
1: -	if (tstate->emit_state == EMITTING) {
1: -		if (tstate->fwd_emitted)
1: -			return;
1: -
1: -		switch (kind) {
1: -		case BTF_KIND_STRUCT:
1: -		case BTF_KIND_UNION:
1: -			/*
1: -			 * if we are referencing a struct/union that we are
1: -			 * part of - then no need for fwd declaration
1: -			 */
1: -			if (id == cont_id)
1: -				return;
1: -			if (t->name_off == 0) {
1: -				pr_warn("anonymous struct/union loop, id:[%u]\n",
1: -					id);
1: -				return;
1: -			}
1: -			btf_dump_emit_struct_fwd(d, id, t);
1: -			btf_dump_printf(d, ";\n\n");
1: -			tstate->fwd_emitted = 1;
1: -			break;
1: -		case BTF_KIND_TYPEDEF:
1: -			/*
1: -			 * for typedef fwd_emitted means typedef definition
1: -			 * was emitted, but it can be used only for "weak"
1: -			 * references through pointer only, not for embedding
1: -			 */
1: -			if (!btf_dump_is_blacklisted(d, id)) {
1: -				btf_dump_emit_typedef_def(d, id, t, 0);
1: -				btf_dump_printf(d, ";\n\n");
1: -			}
1: -			tstate->fwd_emitted = 1;
1: -			break;
1: -		default:
1: -			break;
1: -		}
1: -
1: -		return;
1: -	}
1: -
1: -	switch (kind) {
1: -	case BTF_KIND_INT:
1: -		/* Emit type alias definitions if necessary */
1: -		btf_dump_emit_missing_aliases(d, id, t);
1: -
1: -		tstate->emit_state = EMITTED;
1: -		break;
1: -	case BTF_KIND_ENUM:
1: -		if (top_level_def) {
1: -			btf_dump_emit_enum_def(d, id, t, 0);
1: -			btf_dump_printf(d, ";\n\n");
1: -		}
1: -		tstate->emit_state = EMITTED;
1: -		break;
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_RESTRICT:
1: -		btf_dump_emit_type(d, t->type, cont_id);
1: -		break;
1: -	case BTF_KIND_ARRAY:
1: -		btf_dump_emit_type(d, btf_array(t)->type, cont_id);
1: -		break;
1: -	case BTF_KIND_FWD:
1: -		btf_dump_emit_fwd_def(d, id, t);
1: -		btf_dump_printf(d, ";\n\n");
1: -		tstate->emit_state = EMITTED;
1: -		break;
1: -	case BTF_KIND_TYPEDEF:
1: -		tstate->emit_state = EMITTING;
1: -		btf_dump_emit_type(d, t->type, id);
1: -		/*
1: -		 * typedef can server as both definition and forward
1: -		 * declaration; at this stage someone depends on
1: -		 * typedef as a forward declaration (refers to it
1: -		 * through pointer), so unless we already did it,
1: -		 * emit typedef as a forward declaration
1: -		 */
1: -		if (!tstate->fwd_emitted && !btf_dump_is_blacklisted(d, id)) {
1: -			btf_dump_emit_typedef_def(d, id, t, 0);
1: -			btf_dump_printf(d, ";\n\n");
1: -		}
1: -		tstate->emit_state = EMITTED;
1: -		break;
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION:
1: -		tstate->emit_state = EMITTING;
1: -		/* if it's a top-level struct/union definition or struct/union
1: -		 * is anonymous, then in C we'll be emitting all fields and
1: -		 * their types (as opposed to just `struct X`), so we need to
1: -		 * make sure that all types, referenced from struct/union
1: -		 * members have necessary forward-declarations, where
1: -		 * applicable
1: -		 */
1: -		if (top_level_def || t->name_off == 0) {
1: -			const struct btf_member *m = btf_members(t);
1: -			__u16 vlen = btf_vlen(t);
1: -			int i, new_cont_id;
1: -
1: -			new_cont_id = t->name_off == 0 ? cont_id : id;
1: -			for (i = 0; i < vlen; i++, m++)
1: -				btf_dump_emit_type(d, m->type, new_cont_id);
1: -		} else if (!tstate->fwd_emitted && id != cont_id) {
1: -			btf_dump_emit_struct_fwd(d, id, t);
1: -			btf_dump_printf(d, ";\n\n");
1: -			tstate->fwd_emitted = 1;
1: -		}
1: -
1: -		if (top_level_def) {
1: -			btf_dump_emit_struct_def(d, id, t, 0);
1: -			btf_dump_printf(d, ";\n\n");
1: -			tstate->emit_state = EMITTED;
1: -		} else {
1: -			tstate->emit_state = NOT_EMITTED;
1: -		}
1: -		break;
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		const struct btf_param *p = btf_params(t);
1: -		__u16 vlen = btf_vlen(t);
1: -		int i;
1: -
1: -		btf_dump_emit_type(d, t->type, cont_id);
1: -		for (i = 0; i < vlen; i++, p++)
1: -			btf_dump_emit_type(d, p->type, cont_id);
1: -
1: -		break;
1: -	}
1: -	default:
1: -		break;
1: -	}
1: +static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id) {
1: +  struct btf_dump_type_aux_state *tstate = &d->type_states[id];
1: +  bool top_level_def = cont_id == 0;
1: +  const struct btf_type *t;
1: +  __u16 kind;
1: +
1: +  if (tstate->emit_state == EMITTED)
1: +    return;
1: +
1: +  t = btf__type_by_id(d->btf, id);
1: +  kind = btf_kind(t);
1: +
1: +  if (tstate->emit_state == EMITTING) {
1: +    if (tstate->fwd_emitted)
1: +      return;
1: +
1: +    switch (kind) {
1: +    case BTF_KIND_STRUCT:
1: +    case BTF_KIND_UNION:
1: +      /*
1: +       * if we are referencing a struct/union that we are
1: +       * part of - then no need for fwd declaration
1: +       */
1: +      if (id == cont_id)
1: +        return;
1: +      if (t->name_off == 0) {
1: +        pr_warn("anonymous struct/union loop, id:[%u]\n", id);
1: +        return;
1: +      }
1: +      btf_dump_emit_struct_fwd(d, id, t);
1: +      btf_dump_printf(d, ";\n\n");
1: +      tstate->fwd_emitted = 1;
1: +      break;
1: +    case BTF_KIND_TYPEDEF:
1: +      /*
1: +       * for typedef fwd_emitted means typedef definition
1: +       * was emitted, but it can be used only for "weak"
1: +       * references through pointer only, not for embedding
1: +       */
1: +      if (!btf_dump_is_blacklisted(d, id)) {
1: +        btf_dump_emit_typedef_def(d, id, t, 0);
1: +        btf_dump_printf(d, ";\n\n");
1: +      }
1: +      tstate->fwd_emitted = 1;
1: +      break;
1: +    default:
1: +      break;
1: +    }
1: +
1: +    return;
1: +  }
1: +
1: +  switch (kind) {
1: +  case BTF_KIND_INT:
1: +    /* Emit type alias definitions if necessary */
1: +    btf_dump_emit_missing_aliases(d, id, t);
1: +
1: +    tstate->emit_state = EMITTED;
1: +    break;
1: +  case BTF_KIND_ENUM:
1: +    if (top_level_def) {
1: +      btf_dump_emit_enum_def(d, id, t, 0);
1: +      btf_dump_printf(d, ";\n\n");
1: +    }
1: +    tstate->emit_state = EMITTED;
1: +    break;
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_RESTRICT:
1: +    btf_dump_emit_type(d, t->type, cont_id);
1: +    break;
1: +  case BTF_KIND_ARRAY:
1: +    btf_dump_emit_type(d, btf_array(t)->type, cont_id);
1: +    break;
1: +  case BTF_KIND_FWD:
1: +    btf_dump_emit_fwd_def(d, id, t);
1: +    btf_dump_printf(d, ";\n\n");
1: +    tstate->emit_state = EMITTED;
1: +    break;
1: +  case BTF_KIND_TYPEDEF:
1: +    tstate->emit_state = EMITTING;
1: +    btf_dump_emit_type(d, t->type, id);
1: +    /*
1: +     * typedef can server as both definition and forward
1: +     * declaration; at this stage someone depends on
1: +     * typedef as a forward declaration (refers to it
1: +     * through pointer), so unless we already did it,
1: +     * emit typedef as a forward declaration
1: +     */
1: +    if (!tstate->fwd_emitted && !btf_dump_is_blacklisted(d, id)) {
1: +      btf_dump_emit_typedef_def(d, id, t, 0);
1: +      btf_dump_printf(d, ";\n\n");
1: +    }
1: +    tstate->emit_state = EMITTED;
1: +    break;
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION:
1: +    tstate->emit_state = EMITTING;
1: +    /* if it's a top-level struct/union definition or struct/union
1: +     * is anonymous, then in C we'll be emitting all fields and
1: +     * their types (as opposed to just `struct X`), so we need to
1: +     * make sure that all types, referenced from struct/union
1: +     * members have necessary forward-declarations, where
1: +     * applicable
1: +     */
1: +    if (top_level_def || t->name_off == 0) {
1: +      const struct btf_member *m = btf_members(t);
1: +      __u16 vlen = btf_vlen(t);
1: +      int i, new_cont_id;
1: +
1: +      new_cont_id = t->name_off == 0 ? cont_id : id;
1: +      for (i = 0; i < vlen; i++, m++)
1: +        btf_dump_emit_type(d, m->type, new_cont_id);
1: +    } else if (!tstate->fwd_emitted && id != cont_id) {
1: +      btf_dump_emit_struct_fwd(d, id, t);
1: +      btf_dump_printf(d, ";\n\n");
1: +      tstate->fwd_emitted = 1;
1: +    }
1: +
1: +    if (top_level_def) {
1: +      btf_dump_emit_struct_def(d, id, t, 0);
1: +      btf_dump_printf(d, ";\n\n");
1: +      tstate->emit_state = EMITTED;
1: +    } else {
1: +      tstate->emit_state = NOT_EMITTED;
1: +    }
1: +    break;
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    const struct btf_param *p = btf_params(t);
1: +    __u16 vlen = btf_vlen(t);
1: +    int i;
1: +
1: +    btf_dump_emit_type(d, t->type, cont_id);
1: +    for (i = 0; i < vlen; i++, p++)
1: +      btf_dump_emit_type(d, p->type, cont_id);
1: +
1: +    break;
1: +  }
1: +  default:
1: +    break;
1: +  }
1:  }
1:  
1:  static bool btf_is_struct_packed(const struct btf *btf, __u32 id,
1: -				 const struct btf_type *t)
1: -{
1: -	const struct btf_member *m;
1: -	int align, i, bit_sz;
1: -	__u16 vlen;
1: -
1: -	align = btf__align_of(btf, id);
1: -	/* size of a non-packed struct has to be a multiple of its alignment*/
1: -	if (align && t->size % align)
1: -		return true;
1: -
1: -	m = btf_members(t);
1: -	vlen = btf_vlen(t);
1: -	/* all non-bitfield fields have to be naturally aligned */
1: -	for (i = 0; i < vlen; i++, m++) {
1: -		align = btf__align_of(btf, m->type);
1: -		bit_sz = btf_member_bitfield_size(t, i);
1: -		if (align && bit_sz == 0 && m->offset % (8 * align) != 0)
1: -			return true;
1: -	}
1: -
1: -	/*
1: -	 * if original struct was marked as packed, but its layout is
1: -	 * naturally aligned, we'll detect that it's not packed
1: -	 */
1: -	return false;
1: +                                 const struct btf_type *t) {
1: +  const struct btf_member *m;
1: +  int align, i, bit_sz;
1: +  __u16 vlen;
1: +
1: +  align = btf__align_of(btf, id);
1: +  /* size of a non-packed struct has to be a multiple of its alignment*/
1: +  if (align && t->size % align)
1: +    return true;
1: +
1: +  m = btf_members(t);
1: +  vlen = btf_vlen(t);
1: +  /* all non-bitfield fields have to be naturally aligned */
1: +  for (i = 0; i < vlen; i++, m++) {
1: +    align = btf__align_of(btf, m->type);
1: +    bit_sz = btf_member_bitfield_size(t, i);
1: +    if (align && bit_sz == 0 && m->offset % (8 * align) != 0)
1: +      return true;
1: +  }
1: +
1: +  /*
1: +   * if original struct was marked as packed, but its layout is
1: +   * naturally aligned, we'll detect that it's not packed
1: +   */
1: +  return false;
1:  }
1:  
1: -static int chip_away_bits(int total, int at_most)
1: -{
1: -	return total % at_most ? : at_most;
1: +static int chip_away_bits(int total, int at_most) {
1: +  return total % at_most ?: at_most;
1:  }
1:  
1: -static void btf_dump_emit_bit_padding(const struct btf_dump *d,
1: -				      int cur_off, int m_off, int m_bit_sz,
1: -				      int align, int lvl)
1: -{
1: -	int off_diff = m_off - cur_off;
1: -	int ptr_bits = d->ptr_sz * 8;
1: -
1: -	if (off_diff <= 0)
1: -		/* no gap */
1: -		return;
1: -	if (m_bit_sz == 0 && off_diff < align * 8)
1: -		/* natural padding will take care of a gap */
1: -		return;
1: -
1: -	while (off_diff > 0) {
1: -		const char *pad_type;
1: -		int pad_bits;
1: -
1: -		if (ptr_bits > 32 && off_diff > 32) {
1: -			pad_type = "long";
1: -			pad_bits = chip_away_bits(off_diff, ptr_bits);
1: -		} else if (off_diff > 16) {
1: -			pad_type = "int";
1: -			pad_bits = chip_away_bits(off_diff, 32);
1: -		} else if (off_diff > 8) {
1: -			pad_type = "short";
1: -			pad_bits = chip_away_bits(off_diff, 16);
1: -		} else {
1: -			pad_type = "char";
1: -			pad_bits = chip_away_bits(off_diff, 8);
1: -		}
1: -		btf_dump_printf(d, "\n%s%s: %d;", pfx(lvl), pad_type, pad_bits);
1: -		off_diff -= pad_bits;
1: -	}
1: +static void btf_dump_emit_bit_padding(const struct btf_dump *d, int cur_off,
1: +                                      int m_off, int m_bit_sz, int align,
1: +                                      int lvl) {
1: +  int off_diff = m_off - cur_off;
1: +  int ptr_bits = d->ptr_sz * 8;
1: +
1: +  if (off_diff <= 0)
1: +    /* no gap */
1: +    return;
1: +  if (m_bit_sz == 0 && off_diff < align * 8)
1: +    /* natural padding will take care of a gap */
1: +    return;
1: +
1: +  while (off_diff > 0) {
1: +    const char *pad_type;
1: +    int pad_bits;
1: +
1: +    if (ptr_bits > 32 && off_diff > 32) {
1: +      pad_type = "long";
1: +      pad_bits = chip_away_bits(off_diff, ptr_bits);
1: +    } else if (off_diff > 16) {
1: +      pad_type = "int";
1: +      pad_bits = chip_away_bits(off_diff, 32);
1: +    } else if (off_diff > 8) {
1: +      pad_type = "short";
1: +      pad_bits = chip_away_bits(off_diff, 16);
1: +    } else {
1: +      pad_type = "char";
1: +      pad_bits = chip_away_bits(off_diff, 8);
1: +    }
1: +    btf_dump_printf(d, "\n%s%s: %d;", pfx(lvl), pad_type, pad_bits);
1: +    off_diff -= pad_bits;
1: +  }
1:  }
1:  
1:  static void btf_dump_emit_struct_fwd(struct btf_dump *d, __u32 id,
1: -				     const struct btf_type *t)
1: -{
1: -	btf_dump_printf(d, "%s %s",
1: -			btf_is_struct(t) ? "struct" : "union",
1: -			btf_dump_type_name(d, id));
1: +                                     const struct btf_type *t) {
1: +  btf_dump_printf(d, "%s %s", btf_is_struct(t) ? "struct" : "union",
1: +                  btf_dump_type_name(d, id));
1:  }
1:  
1: -static void btf_dump_emit_struct_def(struct btf_dump *d,
1: -				     __u32 id,
1: -				     const struct btf_type *t,
1: -				     int lvl)
1: -{
1: -	const struct btf_member *m = btf_members(t);
1: -	bool is_struct = btf_is_struct(t);
1: -	int align, i, packed, off = 0;
1: -	__u16 vlen = btf_vlen(t);
1: -
1: -	packed = is_struct ? btf_is_struct_packed(d->btf, id, t) : 0;
1: -
1: -	btf_dump_printf(d, "%s%s%s {",
1: -			is_struct ? "struct" : "union",
1: -			t->name_off ? " " : "",
1: -			btf_dump_type_name(d, id));
1: -
1: -	for (i = 0; i < vlen; i++, m++) {
1: -		const char *fname;
1: -		int m_off, m_sz;
1: -
1: -		fname = btf_name_of(d, m->name_off);
1: -		m_sz = btf_member_bitfield_size(t, i);
1: -		m_off = btf_member_bit_offset(t, i);
1: -		align = packed ? 1 : btf__align_of(d->btf, m->type);
1: -
1: -		btf_dump_emit_bit_padding(d, off, m_off, m_sz, align, lvl + 1);
1: -		btf_dump_printf(d, "\n%s", pfx(lvl + 1));
1: -		btf_dump_emit_type_decl(d, m->type, fname, lvl + 1);
1: -
1: -		if (m_sz) {
1: -			btf_dump_printf(d, ": %d", m_sz);
1: -			off = m_off + m_sz;
1: -		} else {
1: -			m_sz = max((__s64)0, btf__resolve_size(d->btf, m->type));
1: -			off = m_off + m_sz * 8;
1: -		}
1: -		btf_dump_printf(d, ";");
1: -	}
1: -
1: -	/* pad at the end, if necessary */
1: -	if (is_struct) {
1: -		align = packed ? 1 : btf__align_of(d->btf, id);
1: -		btf_dump_emit_bit_padding(d, off, t->size * 8, 0, align,
1: -					  lvl + 1);
1: -	}
1: -
1: -	if (vlen)
1: -		btf_dump_printf(d, "\n");
1: -	btf_dump_printf(d, "%s}", pfx(lvl));
1: -	if (packed)
1: -		btf_dump_printf(d, " __attribute__((packed))");
1: +static void btf_dump_emit_struct_def(struct btf_dump *d, __u32 id,
1: +                                     const struct btf_type *t, int lvl) {
1: +  const struct btf_member *m = btf_members(t);
1: +  bool is_struct = btf_is_struct(t);
1: +  int align, i, packed, off = 0;
1: +  __u16 vlen = btf_vlen(t);
1: +
1: +  packed = is_struct ? btf_is_struct_packed(d->btf, id, t) : 0;
1: +
1: +  btf_dump_printf(d, "%s%s%s {", is_struct ? "struct" : "union",
1: +                  t->name_off ? " " : "", btf_dump_type_name(d, id));
1: +
1: +  for (i = 0; i < vlen; i++, m++) {
1: +    const char *fname;
1: +    int m_off, m_sz;
1: +
1: +    fname = btf_name_of(d, m->name_off);
1: +    m_sz = btf_member_bitfield_size(t, i);
1: +    m_off = btf_member_bit_offset(t, i);
1: +    align = packed ? 1 : btf__align_of(d->btf, m->type);
1: +
1: +    btf_dump_emit_bit_padding(d, off, m_off, m_sz, align, lvl + 1);
1: +    btf_dump_printf(d, "\n%s", pfx(lvl + 1));
1: +    btf_dump_emit_type_decl(d, m->type, fname, lvl + 1);
1: +
1: +    if (m_sz) {
1: +      btf_dump_printf(d, ": %d", m_sz);
1: +      off = m_off + m_sz;
1: +    } else {
1: +      m_sz = max((__s64)0, btf__resolve_size(d->btf, m->type));
1: +      off = m_off + m_sz * 8;
1: +    }
1: +    btf_dump_printf(d, ";");
1: +  }
1: +
1: +  /* pad at the end, if necessary */
1: +  if (is_struct) {
1: +    align = packed ? 1 : btf__align_of(d->btf, id);
1: +    btf_dump_emit_bit_padding(d, off, t->size * 8, 0, align, lvl + 1);
1: +  }
1: +
1: +  if (vlen)
1: +    btf_dump_printf(d, "\n");
1: +  btf_dump_printf(d, "%s}", pfx(lvl));
1: +  if (packed)
1: +    btf_dump_printf(d, " __attribute__((packed))");
1:  }
1:  
1:  static const char *missing_base_types[][2] = {
1: -	/*
1: -	 * GCC emits typedefs to its internal __PolyX_t types when compiling Arm
1: -	 * SIMD intrinsics. Alias them to standard base types.
1: -	 */
1: -	{ "__Poly8_t",		"unsigned char" },
1: -	{ "__Poly16_t",		"unsigned short" },
1: -	{ "__Poly64_t",		"unsigned long long" },
1: -	{ "__Poly128_t",	"unsigned __int128" },
1: +    /*
1: +     * GCC emits typedefs to its internal __PolyX_t types when compiling Arm
1: +     * SIMD intrinsics. Alias them to standard base types.
1: +     */
1: +    {"__Poly8_t", "unsigned char"},
1: +    {"__Poly16_t", "unsigned short"},
1: +    {"__Poly64_t", "unsigned long long"},
1: +    {"__Poly128_t", "unsigned __int128"},
1:  };
1:  
1:  static void btf_dump_emit_missing_aliases(struct btf_dump *d, __u32 id,
1: -					  const struct btf_type *t)
1: -{
1: -	const char *name = btf_dump_type_name(d, id);
1: -	int i;
1: -
1: -	for (i = 0; i < ARRAY_SIZE(missing_base_types); i++) {
1: -		if (strcmp(name, missing_base_types[i][0]) == 0) {
1: -			btf_dump_printf(d, "typedef %s %s;\n\n",
1: -					missing_base_types[i][1], name);
1: -			break;
1: -		}
1: -	}
1: +                                          const struct btf_type *t) {
1: +  const char *name = btf_dump_type_name(d, id);
1: +  int i;
1: +
1: +  for (i = 0; i < ARRAY_SIZE(missing_base_types); i++) {
1: +    if (strcmp(name, missing_base_types[i][0]) == 0) {
1: +      btf_dump_printf(d, "typedef %s %s;\n\n", missing_base_types[i][1], name);
1: +      break;
1: +    }
1: +  }
1:  }
1:  
1:  static void btf_dump_emit_enum_fwd(struct btf_dump *d, __u32 id,
1: -				   const struct btf_type *t)
1: -{
1: -	btf_dump_printf(d, "enum %s", btf_dump_type_name(d, id));
1: +                                   const struct btf_type *t) {
1: +  btf_dump_printf(d, "enum %s", btf_dump_type_name(d, id));
1:  }
1:  
1:  static void btf_dump_emit_enum_def(struct btf_dump *d, __u32 id,
1: -				   const struct btf_type *t,
1: -				   int lvl)
1: -{
1: -	const struct btf_enum *v = btf_enum(t);
1: -	__u16 vlen = btf_vlen(t);
1: -	const char *name;
1: -	size_t dup_cnt;
1: -	int i;
1: -
1: -	btf_dump_printf(d, "enum%s%s",
1: -			t->name_off ? " " : "",
1: -			btf_dump_type_name(d, id));
1: -
1: -	if (vlen) {
1: -		btf_dump_printf(d, " {");
1: -		for (i = 0; i < vlen; i++, v++) {
1: -			name = btf_name_of(d, v->name_off);
1: -			/* enumerators share namespace with typedef idents */
1: -			dup_cnt = btf_dump_name_dups(d, d->ident_names, name);
1: -			if (dup_cnt > 1) {
1: -				btf_dump_printf(d, "\n%s%s___%zu = %u,",
1: -						pfx(lvl + 1), name, dup_cnt,
1: -						(__u32)v->val);
1: -			} else {
1: -				btf_dump_printf(d, "\n%s%s = %u,",
1: -						pfx(lvl + 1), name,
1: -						(__u32)v->val);
1: -			}
1: -		}
1: -		btf_dump_printf(d, "\n%s}", pfx(lvl));
1: -	}
1: +                                   const struct btf_type *t, int lvl) {
1: +  const struct btf_enum *v = btf_enum(t);
1: +  __u16 vlen = btf_vlen(t);
1: +  const char *name;
1: +  size_t dup_cnt;
1: +  int i;
1: +
1: +  btf_dump_printf(d, "enum%s%s", t->name_off ? " " : "",
1: +                  btf_dump_type_name(d, id));
1: +
1: +  if (vlen) {
1: +    btf_dump_printf(d, " {");
1: +    for (i = 0; i < vlen; i++, v++) {
1: +      name = btf_name_of(d, v->name_off);
1: +      /* enumerators share namespace with typedef idents */
1: +      dup_cnt = btf_dump_name_dups(d, d->ident_names, name);
1: +      if (dup_cnt > 1) {
1: +        btf_dump_printf(d, "\n%s%s___%zu = %u,", pfx(lvl + 1), name, dup_cnt,
1: +                        (__u32)v->val);
1: +      } else {
1: +        btf_dump_printf(d, "\n%s%s = %u,", pfx(lvl + 1), name, (__u32)v->val);
1: +      }
1: +    }
1: +    btf_dump_printf(d, "\n%s}", pfx(lvl));
1: +  }
1:  }
1:  
1:  static void btf_dump_emit_fwd_def(struct btf_dump *d, __u32 id,
1: -				  const struct btf_type *t)
1: -{
1: -	const char *name = btf_dump_type_name(d, id);
1: -
1: -	if (btf_kflag(t))
1: -		btf_dump_printf(d, "union %s", name);
1: -	else
1: -		btf_dump_printf(d, "struct %s", name);
1: +                                  const struct btf_type *t) {
1: +  const char *name = btf_dump_type_name(d, id);
1: +
1: +  if (btf_kflag(t))
1: +    btf_dump_printf(d, "union %s", name);
1: +  else
1: +    btf_dump_printf(d, "struct %s", name);
1:  }
1:  
1:  static void btf_dump_emit_typedef_def(struct btf_dump *d, __u32 id,
1: -				     const struct btf_type *t, int lvl)
1: -{
1: -	const char *name = btf_dump_ident_name(d, id);
1: -
1: -	/*
1: -	 * Old GCC versions are emitting invalid typedef for __gnuc_va_list
1: -	 * pointing to VOID. This generates warnings from btf_dump() and
1: -	 * results in uncompilable header file, so we are fixing it up here
1: -	 * with valid typedef into __builtin_va_list.
1: -	 */
1: -	if (t->type == 0 && strcmp(name, "__gnuc_va_list") == 0) {
1: -		btf_dump_printf(d, "typedef __builtin_va_list __gnuc_va_list");
1: -		return;
1: -	}
1: -
1: -	btf_dump_printf(d, "typedef ");
1: -	btf_dump_emit_type_decl(d, t->type, name, lvl);
1: +                                      const struct btf_type *t, int lvl) {
1: +  const char *name = btf_dump_ident_name(d, id);
1: +
1: +  /*
1: +   * Old GCC versions are emitting invalid typedef for __gnuc_va_list
1: +   * pointing to VOID. This generates warnings from btf_dump() and
1: +   * results in uncompilable header file, so we are fixing it up here
1: +   * with valid typedef into __builtin_va_list.
1: +   */
1: +  if (t->type == 0 && strcmp(name, "__gnuc_va_list") == 0) {
1: +    btf_dump_printf(d, "typedef __builtin_va_list __gnuc_va_list");
1: +    return;
1: +  }
1: +
1: +  btf_dump_printf(d, "typedef ");
1: +  btf_dump_emit_type_decl(d, t->type, name, lvl);
1:  }
1:  
1: -static int btf_dump_push_decl_stack_id(struct btf_dump *d, __u32 id)
1: -{
1: -	__u32 *new_stack;
1: -	size_t new_cap;
1: +static int btf_dump_push_decl_stack_id(struct btf_dump *d, __u32 id) {
1: +  __u32 *new_stack;
1: +  size_t new_cap;
1:  
1: -	if (d->decl_stack_cnt >= d->decl_stack_cap) {
1: -		new_cap = max(16, d->decl_stack_cap * 3 / 2);
1: -		new_stack = libbpf_reallocarray(d->decl_stack, new_cap, sizeof(new_stack[0]));
1: -		if (!new_stack)
1: -			return -ENOMEM;
1: -		d->decl_stack = new_stack;
1: -		d->decl_stack_cap = new_cap;
1: -	}
1: +  if (d->decl_stack_cnt >= d->decl_stack_cap) {
1: +    new_cap = max(16, d->decl_stack_cap * 3 / 2);
1: +    new_stack =
1: +        libbpf_reallocarray(d->decl_stack, new_cap, sizeof(new_stack[0]));
1: +    if (!new_stack)
1: +      return -ENOMEM;
1: +    d->decl_stack = new_stack;
1: +    d->decl_stack_cap = new_cap;
1: +  }
1:  
1: -	d->decl_stack[d->decl_stack_cnt++] = id;
1: +  d->decl_stack[d->decl_stack_cnt++] = id;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -1069,376 +1031,366 @@ static int btf_dump_push_decl_stack_id(struct btf_dump *d, __u32 id)
1:   * processing type declaration chain.
1:   */
1:  int btf_dump__emit_type_decl(struct btf_dump *d, __u32 id,
1: -			     const struct btf_dump_emit_type_decl_opts *opts)
1: -{
1: -	const char *fname;
1: -	int lvl, err;
1: -
1: -	if (!OPTS_VALID(opts, btf_dump_emit_type_decl_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	err = btf_dump_resize(d);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	fname = OPTS_GET(opts, field_name, "");
1: -	lvl = OPTS_GET(opts, indent_level, 0);
1: -	d->strip_mods = OPTS_GET(opts, strip_mods, false);
1: -	btf_dump_emit_type_decl(d, id, fname, lvl);
1: -	d->strip_mods = false;
1: -	return 0;
1: +                             const struct btf_dump_emit_type_decl_opts *opts) {
1: +  const char *fname;
1: +  int lvl, err;
1: +
1: +  if (!OPTS_VALID(opts, btf_dump_emit_type_decl_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  err = btf_dump_resize(d);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  fname = OPTS_GET(opts, field_name, "");
1: +  lvl = OPTS_GET(opts, indent_level, 0);
1: +  d->strip_mods = OPTS_GET(opts, strip_mods, false);
1: +  btf_dump_emit_type_decl(d, id, fname, lvl);
1: +  d->strip_mods = false;
1: +  return 0;
1:  }
1:  
1:  static void btf_dump_emit_type_decl(struct btf_dump *d, __u32 id,
1: -				    const char *fname, int lvl)
1: -{
1: -	struct id_stack decl_stack;
1: -	const struct btf_type *t;
1: -	int err, stack_start;
1: -
1: -	stack_start = d->decl_stack_cnt;
1: -	for (;;) {
1: -		t = btf__type_by_id(d->btf, id);
1: -		if (d->strip_mods && btf_is_mod(t))
1: -			goto skip_mod;
1: -
1: -		err = btf_dump_push_decl_stack_id(d, id);
1: -		if (err < 0) {
1: -			/*
1: -			 * if we don't have enough memory for entire type decl
1: -			 * chain, restore stack, emit warning, and try to
1: -			 * proceed nevertheless
1: -			 */
1: -			pr_warn("not enough memory for decl stack:%d", err);
1: -			d->decl_stack_cnt = stack_start;
1: -			return;
1: -		}
1: -skip_mod:
1: -		/* VOID */
1: -		if (id == 0)
1: -			break;
1: -
1: -		switch (btf_kind(t)) {
1: -		case BTF_KIND_PTR:
1: -		case BTF_KIND_VOLATILE:
1: -		case BTF_KIND_CONST:
1: -		case BTF_KIND_RESTRICT:
1: -		case BTF_KIND_FUNC_PROTO:
1: -			id = t->type;
1: -			break;
1: -		case BTF_KIND_ARRAY:
1: -			id = btf_array(t)->type;
1: -			break;
1: -		case BTF_KIND_INT:
1: -		case BTF_KIND_ENUM:
1: -		case BTF_KIND_FWD:
1: -		case BTF_KIND_STRUCT:
1: -		case BTF_KIND_UNION:
1: -		case BTF_KIND_TYPEDEF:
1: -		case BTF_KIND_FLOAT:
1: -			goto done;
1: -		default:
1: -			pr_warn("unexpected type in decl chain, kind:%u, id:[%u]\n",
1: -				btf_kind(t), id);
1: -			goto done;
1: -		}
1: -	}
1: +                                    const char *fname, int lvl) {
1: +  struct id_stack decl_stack;
1: +  const struct btf_type *t;
1: +  int err, stack_start;
1: +
1: +  stack_start = d->decl_stack_cnt;
1: +  for (;;) {
1: +    t = btf__type_by_id(d->btf, id);
1: +    if (d->strip_mods && btf_is_mod(t))
1: +      goto skip_mod;
1: +
1: +    err = btf_dump_push_decl_stack_id(d, id);
1: +    if (err < 0) {
1: +      /*
1: +       * if we don't have enough memory for entire type decl
1: +       * chain, restore stack, emit warning, and try to
1: +       * proceed nevertheless
1: +       */
1: +      pr_warn("not enough memory for decl stack:%d", err);
1: +      d->decl_stack_cnt = stack_start;
1: +      return;
1: +    }
1: +  skip_mod:
1: +    /* VOID */
1: +    if (id == 0)
1: +      break;
1: +
1: +    switch (btf_kind(t)) {
1: +    case BTF_KIND_PTR:
1: +    case BTF_KIND_VOLATILE:
1: +    case BTF_KIND_CONST:
1: +    case BTF_KIND_RESTRICT:
1: +    case BTF_KIND_FUNC_PROTO:
1: +      id = t->type;
1: +      break;
1: +    case BTF_KIND_ARRAY:
1: +      id = btf_array(t)->type;
1: +      break;
1: +    case BTF_KIND_INT:
1: +    case BTF_KIND_ENUM:
1: +    case BTF_KIND_FWD:
1: +    case BTF_KIND_STRUCT:
1: +    case BTF_KIND_UNION:
1: +    case BTF_KIND_TYPEDEF:
1: +    case BTF_KIND_FLOAT:
1: +      goto done;
1: +    default:
1: +      pr_warn("unexpected type in decl chain, kind:%u, id:[%u]\n", btf_kind(t),
1: +              id);
1: +      goto done;
1: +    }
1: +  }
1:  done:
1: -	/*
1: -	 * We might be inside a chain of declarations (e.g., array of function
1: -	 * pointers returning anonymous (so inlined) structs, having another
1: -	 * array field). Each of those needs its own "stack frame" to handle
1: -	 * emitting of declarations. Those stack frames are non-overlapping
1: -	 * portions of shared btf_dump->decl_stack. To make it a bit nicer to
1: -	 * handle this set of nested stacks, we create a view corresponding to
1: -	 * our own "stack frame" and work with it as an independent stack.
1: -	 * We'll need to clean up after emit_type_chain() returns, though.
1: -	 */
1: -	decl_stack.ids = d->decl_stack + stack_start;
1: -	decl_stack.cnt = d->decl_stack_cnt - stack_start;
1: -	btf_dump_emit_type_chain(d, &decl_stack, fname, lvl);
1: -	/*
1: -	 * emit_type_chain() guarantees that it will pop its entire decl_stack
1: -	 * frame before returning. But it works with a read-only view into
1: -	 * decl_stack, so it doesn't actually pop anything from the
1: -	 * perspective of shared btf_dump->decl_stack, per se. We need to
1: -	 * reset decl_stack state to how it was before us to avoid it growing
1: -	 * all the time.
1: -	 */
1: -	d->decl_stack_cnt = stack_start;
1: +  /*
1: +   * We might be inside a chain of declarations (e.g., array of function
1: +   * pointers returning anonymous (so inlined) structs, having another
1: +   * array field). Each of those needs its own "stack frame" to handle
1: +   * emitting of declarations. Those stack frames are non-overlapping
1: +   * portions of shared btf_dump->decl_stack. To make it a bit nicer to
1: +   * handle this set of nested stacks, we create a view corresponding to
1: +   * our own "stack frame" and work with it as an independent stack.
1: +   * We'll need to clean up after emit_type_chain() returns, though.
1: +   */
1: +  decl_stack.ids = d->decl_stack + stack_start;
1: +  decl_stack.cnt = d->decl_stack_cnt - stack_start;
1: +  btf_dump_emit_type_chain(d, &decl_stack, fname, lvl);
1: +  /*
1: +   * emit_type_chain() guarantees that it will pop its entire decl_stack
1: +   * frame before returning. But it works with a read-only view into
1: +   * decl_stack, so it doesn't actually pop anything from the
1: +   * perspective of shared btf_dump->decl_stack, per se. We need to
1: +   * reset decl_stack state to how it was before us to avoid it growing
1: +   * all the time.
1: +   */
1: +  d->decl_stack_cnt = stack_start;
1:  }
1:  
1: -static void btf_dump_emit_mods(struct btf_dump *d, struct id_stack *decl_stack)
1: -{
1: -	const struct btf_type *t;
1: -	__u32 id;
1: -
1: -	while (decl_stack->cnt) {
1: -		id = decl_stack->ids[decl_stack->cnt - 1];
1: -		t = btf__type_by_id(d->btf, id);
1: -
1: -		switch (btf_kind(t)) {
1: -		case BTF_KIND_VOLATILE:
1: -			btf_dump_printf(d, "volatile ");
1: -			break;
1: -		case BTF_KIND_CONST:
1: -			btf_dump_printf(d, "const ");
1: -			break;
1: -		case BTF_KIND_RESTRICT:
1: -			btf_dump_printf(d, "restrict ");
1: -			break;
1: -		default:
1: -			return;
1: -		}
1: -		decl_stack->cnt--;
1: -	}
1: +static void btf_dump_emit_mods(struct btf_dump *d,
1: +                               struct id_stack *decl_stack) {
1: +  const struct btf_type *t;
1: +  __u32 id;
1: +
1: +  while (decl_stack->cnt) {
1: +    id = decl_stack->ids[decl_stack->cnt - 1];
1: +    t = btf__type_by_id(d->btf, id);
1: +
1: +    switch (btf_kind(t)) {
1: +    case BTF_KIND_VOLATILE:
1: +      btf_dump_printf(d, "volatile ");
1: +      break;
1: +    case BTF_KIND_CONST:
1: +      btf_dump_printf(d, "const ");
1: +      break;
1: +    case BTF_KIND_RESTRICT:
1: +      btf_dump_printf(d, "restrict ");
1: +      break;
1: +    default:
1: +      return;
1: +    }
1: +    decl_stack->cnt--;
1: +  }
1:  }
1:  
1: -static void btf_dump_drop_mods(struct btf_dump *d, struct id_stack *decl_stack)
1: -{
1: -	const struct btf_type *t;
1: -	__u32 id;
1: -
1: -	while (decl_stack->cnt) {
1: -		id = decl_stack->ids[decl_stack->cnt - 1];
1: -		t = btf__type_by_id(d->btf, id);
1: -		if (!btf_is_mod(t))
1: -			return;
1: -		decl_stack->cnt--;
1: -	}
1: +static void btf_dump_drop_mods(struct btf_dump *d,
1: +                               struct id_stack *decl_stack) {
1: +  const struct btf_type *t;
1: +  __u32 id;
1: +
1: +  while (decl_stack->cnt) {
1: +    id = decl_stack->ids[decl_stack->cnt - 1];
1: +    t = btf__type_by_id(d->btf, id);
1: +    if (!btf_is_mod(t))
1: +      return;
1: +    decl_stack->cnt--;
1: +  }
1:  }
1:  
1: -static void btf_dump_emit_name(const struct btf_dump *d,
1: -			       const char *name, bool last_was_ptr)
1: -{
1: -	bool separate = name[0] && !last_was_ptr;
1: +static void btf_dump_emit_name(const struct btf_dump *d, const char *name,
1: +                               bool last_was_ptr) {
1: +  bool separate = name[0] && !last_was_ptr;
1:  
1: -	btf_dump_printf(d, "%s%s", separate ? " " : "", name);
1: +  btf_dump_printf(d, "%s%s", separate ? " " : "", name);
1:  }
1:  
1: -static void btf_dump_emit_type_chain(struct btf_dump *d,
1: -				     struct id_stack *decls,
1: -				     const char *fname, int lvl)
1: -{
1: -	/*
1: -	 * last_was_ptr is used to determine if we need to separate pointer
1: -	 * asterisk (*) from previous part of type signature with space, so
1: -	 * that we get `int ***`, instead of `int * * *`. We default to true
1: -	 * for cases where we have single pointer in a chain. E.g., in ptr ->
1: -	 * func_proto case. func_proto will start a new emit_type_chain call
1: -	 * with just ptr, which should be emitted as (*) or (*<fname>), so we
1: -	 * don't want to prepend space for that last pointer.
1: -	 */
1: -	bool last_was_ptr = true;
1: -	const struct btf_type *t;
1: -	const char *name;
1: -	__u16 kind;
1: -	__u32 id;
1: -
1: -	while (decls->cnt) {
1: -		id = decls->ids[--decls->cnt];
1: -		if (id == 0) {
1: -			/* VOID is a special snowflake */
1: -			btf_dump_emit_mods(d, decls);
1: -			btf_dump_printf(d, "void");
1: -			last_was_ptr = false;
1: -			continue;
1: -		}
1: -
1: -		t = btf__type_by_id(d->btf, id);
1: -		kind = btf_kind(t);
1: -
1: -		switch (kind) {
1: -		case BTF_KIND_INT:
1: -		case BTF_KIND_FLOAT:
1: -			btf_dump_emit_mods(d, decls);
1: -			name = btf_name_of(d, t->name_off);
1: -			btf_dump_printf(d, "%s", name);
1: -			break;
1: -		case BTF_KIND_STRUCT:
1: -		case BTF_KIND_UNION:
1: -			btf_dump_emit_mods(d, decls);
1: -			/* inline anonymous struct/union */
1: -			if (t->name_off == 0)
1: -				btf_dump_emit_struct_def(d, id, t, lvl);
1: -			else
1: -				btf_dump_emit_struct_fwd(d, id, t);
1: -			break;
1: -		case BTF_KIND_ENUM:
1: -			btf_dump_emit_mods(d, decls);
1: -			/* inline anonymous enum */
1: -			if (t->name_off == 0)
1: -				btf_dump_emit_enum_def(d, id, t, lvl);
1: -			else
1: -				btf_dump_emit_enum_fwd(d, id, t);
1: -			break;
1: -		case BTF_KIND_FWD:
1: -			btf_dump_emit_mods(d, decls);
1: -			btf_dump_emit_fwd_def(d, id, t);
1: -			break;
1: -		case BTF_KIND_TYPEDEF:
1: -			btf_dump_emit_mods(d, decls);
1: -			btf_dump_printf(d, "%s", btf_dump_ident_name(d, id));
1: -			break;
1: -		case BTF_KIND_PTR:
1: -			btf_dump_printf(d, "%s", last_was_ptr ? "*" : " *");
1: -			break;
1: -		case BTF_KIND_VOLATILE:
1: -			btf_dump_printf(d, " volatile");
1: -			break;
1: -		case BTF_KIND_CONST:
1: -			btf_dump_printf(d, " const");
1: -			break;
1: -		case BTF_KIND_RESTRICT:
1: -			btf_dump_printf(d, " restrict");
1: -			break;
1: -		case BTF_KIND_ARRAY: {
1: -			const struct btf_array *a = btf_array(t);
1: -			const struct btf_type *next_t;
1: -			__u32 next_id;
1: -			bool multidim;
1: -			/*
1: -			 * GCC has a bug
1: -			 * (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=8354)
1: -			 * which causes it to emit extra const/volatile
1: -			 * modifiers for an array, if array's element type has
1: -			 * const/volatile modifiers. Clang doesn't do that.
1: -			 * In general, it doesn't seem very meaningful to have
1: -			 * a const/volatile modifier for array, so we are
1: -			 * going to silently skip them here.
1: -			 */
1: -			btf_dump_drop_mods(d, decls);
1: -
1: -			if (decls->cnt == 0) {
1: -				btf_dump_emit_name(d, fname, last_was_ptr);
1: -				btf_dump_printf(d, "[%u]", a->nelems);
1: -				return;
1: -			}
1: -
1: -			next_id = decls->ids[decls->cnt - 1];
1: -			next_t = btf__type_by_id(d->btf, next_id);
1: -			multidim = btf_is_array(next_t);
1: -			/* we need space if we have named non-pointer */
1: -			if (fname[0] && !last_was_ptr)
1: -				btf_dump_printf(d, " ");
1: -			/* no parentheses for multi-dimensional array */
1: -			if (!multidim)
1: -				btf_dump_printf(d, "(");
1: -			btf_dump_emit_type_chain(d, decls, fname, lvl);
1: -			if (!multidim)
1: -				btf_dump_printf(d, ")");
1: -			btf_dump_printf(d, "[%u]", a->nelems);
1: -			return;
1: -		}
1: -		case BTF_KIND_FUNC_PROTO: {
1: -			const struct btf_param *p = btf_params(t);
1: -			__u16 vlen = btf_vlen(t);
1: -			int i;
1: -
1: -			/*
1: -			 * GCC emits extra volatile qualifier for
1: -			 * __attribute__((noreturn)) function pointers. Clang
1: -			 * doesn't do it. It's a GCC quirk for backwards
1: -			 * compatibility with code written for GCC <2.5. So,
1: -			 * similarly to extra qualifiers for array, just drop
1: -			 * them, instead of handling them.
1: -			 */
1: -			btf_dump_drop_mods(d, decls);
1: -			if (decls->cnt) {
1: -				btf_dump_printf(d, " (");
1: -				btf_dump_emit_type_chain(d, decls, fname, lvl);
1: -				btf_dump_printf(d, ")");
1: -			} else {
1: -				btf_dump_emit_name(d, fname, last_was_ptr);
1: -			}
1: -			btf_dump_printf(d, "(");
1: -			/*
1: -			 * Clang for BPF target generates func_proto with no
1: -			 * args as a func_proto with a single void arg (e.g.,
1: -			 * `int (*f)(void)` vs just `int (*f)()`). We are
1: -			 * going to pretend there are no args for such case.
1: -			 */
1: -			if (vlen == 1 && p->type == 0) {
1: -				btf_dump_printf(d, ")");
1: -				return;
1: -			}
1: -
1: -			for (i = 0; i < vlen; i++, p++) {
1: -				if (i > 0)
1: -					btf_dump_printf(d, ", ");
1: -
1: -				/* last arg of type void is vararg */
1: -				if (i == vlen - 1 && p->type == 0) {
1: -					btf_dump_printf(d, "...");
1: -					break;
1: -				}
1: -
1: -				name = btf_name_of(d, p->name_off);
1: -				btf_dump_emit_type_decl(d, p->type, name, lvl);
1: -			}
1: -
1: -			btf_dump_printf(d, ")");
1: -			return;
1: -		}
1: -		default:
1: -			pr_warn("unexpected type in decl chain, kind:%u, id:[%u]\n",
1: -				kind, id);
1: -			return;
1: -		}
1: -
1: -		last_was_ptr = kind == BTF_KIND_PTR;
1: -	}
1: -
1: -	btf_dump_emit_name(d, fname, last_was_ptr);
1: +static void btf_dump_emit_type_chain(struct btf_dump *d, struct id_stack *decls,
1: +                                     const char *fname, int lvl) {
1: +  /*
1: +   * last_was_ptr is used to determine if we need to separate pointer
1: +   * asterisk (*) from previous part of type signature with space, so
1: +   * that we get `int ***`, instead of `int * * *`. We default to true
1: +   * for cases where we have single pointer in a chain. E.g., in ptr ->
1: +   * func_proto case. func_proto will start a new emit_type_chain call
1: +   * with just ptr, which should be emitted as (*) or (*<fname>), so we
1: +   * don't want to prepend space for that last pointer.
1: +   */
1: +  bool last_was_ptr = true;
1: +  const struct btf_type *t;
1: +  const char *name;
1: +  __u16 kind;
1: +  __u32 id;
1: +
1: +  while (decls->cnt) {
1: +    id = decls->ids[--decls->cnt];
1: +    if (id == 0) {
1: +      /* VOID is a special snowflake */
1: +      btf_dump_emit_mods(d, decls);
1: +      btf_dump_printf(d, "void");
1: +      last_was_ptr = false;
1: +      continue;
1: +    }
1: +
1: +    t = btf__type_by_id(d->btf, id);
1: +    kind = btf_kind(t);
1: +
1: +    switch (kind) {
1: +    case BTF_KIND_INT:
1: +    case BTF_KIND_FLOAT:
1: +      btf_dump_emit_mods(d, decls);
1: +      name = btf_name_of(d, t->name_off);
1: +      btf_dump_printf(d, "%s", name);
1: +      break;
1: +    case BTF_KIND_STRUCT:
1: +    case BTF_KIND_UNION:
1: +      btf_dump_emit_mods(d, decls);
1: +      /* inline anonymous struct/union */
1: +      if (t->name_off == 0)
1: +        btf_dump_emit_struct_def(d, id, t, lvl);
1: +      else
1: +        btf_dump_emit_struct_fwd(d, id, t);
1: +      break;
1: +    case BTF_KIND_ENUM:
1: +      btf_dump_emit_mods(d, decls);
1: +      /* inline anonymous enum */
1: +      if (t->name_off == 0)
1: +        btf_dump_emit_enum_def(d, id, t, lvl);
1: +      else
1: +        btf_dump_emit_enum_fwd(d, id, t);
1: +      break;
1: +    case BTF_KIND_FWD:
1: +      btf_dump_emit_mods(d, decls);
1: +      btf_dump_emit_fwd_def(d, id, t);
1: +      break;
1: +    case BTF_KIND_TYPEDEF:
1: +      btf_dump_emit_mods(d, decls);
1: +      btf_dump_printf(d, "%s", btf_dump_ident_name(d, id));
1: +      break;
1: +    case BTF_KIND_PTR:
1: +      btf_dump_printf(d, "%s", last_was_ptr ? "*" : " *");
1: +      break;
1: +    case BTF_KIND_VOLATILE:
1: +      btf_dump_printf(d, " volatile");
1: +      break;
1: +    case BTF_KIND_CONST:
1: +      btf_dump_printf(d, " const");
1: +      break;
1: +    case BTF_KIND_RESTRICT:
1: +      btf_dump_printf(d, " restrict");
1: +      break;
1: +    case BTF_KIND_ARRAY: {
1: +      const struct btf_array *a = btf_array(t);
1: +      const struct btf_type *next_t;
1: +      __u32 next_id;
1: +      bool multidim;
1: +      /*
1: +       * GCC has a bug
1: +       * (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=8354)
1: +       * which causes it to emit extra const/volatile
1: +       * modifiers for an array, if array's element type has
1: +       * const/volatile modifiers. Clang doesn't do that.
1: +       * In general, it doesn't seem very meaningful to have
1: +       * a const/volatile modifier for array, so we are
1: +       * going to silently skip them here.
1: +       */
1: +      btf_dump_drop_mods(d, decls);
1: +
1: +      if (decls->cnt == 0) {
1: +        btf_dump_emit_name(d, fname, last_was_ptr);
1: +        btf_dump_printf(d, "[%u]", a->nelems);
1: +        return;
1: +      }
1: +
1: +      next_id = decls->ids[decls->cnt - 1];
1: +      next_t = btf__type_by_id(d->btf, next_id);
1: +      multidim = btf_is_array(next_t);
1: +      /* we need space if we have named non-pointer */
1: +      if (fname[0] && !last_was_ptr)
1: +        btf_dump_printf(d, " ");
1: +      /* no parentheses for multi-dimensional array */
1: +      if (!multidim)
1: +        btf_dump_printf(d, "(");
1: +      btf_dump_emit_type_chain(d, decls, fname, lvl);
1: +      if (!multidim)
1: +        btf_dump_printf(d, ")");
1: +      btf_dump_printf(d, "[%u]", a->nelems);
1: +      return;
1: +    }
1: +    case BTF_KIND_FUNC_PROTO: {
1: +      const struct btf_param *p = btf_params(t);
1: +      __u16 vlen = btf_vlen(t);
1: +      int i;
1: +
1: +      /*
1: +       * GCC emits extra volatile qualifier for
1: +       * __attribute__((noreturn)) function pointers. Clang
1: +       * doesn't do it. It's a GCC quirk for backwards
1: +       * compatibility with code written for GCC <2.5. So,
1: +       * similarly to extra qualifiers for array, just drop
1: +       * them, instead of handling them.
1: +       */
1: +      btf_dump_drop_mods(d, decls);
1: +      if (decls->cnt) {
1: +        btf_dump_printf(d, " (");
1: +        btf_dump_emit_type_chain(d, decls, fname, lvl);
1: +        btf_dump_printf(d, ")");
1: +      } else {
1: +        btf_dump_emit_name(d, fname, last_was_ptr);
1: +      }
1: +      btf_dump_printf(d, "(");
1: +      /*
1: +       * Clang for BPF target generates func_proto with no
1: +       * args as a func_proto with a single void arg (e.g.,
1: +       * `int (*f)(void)` vs just `int (*f)()`). We are
1: +       * going to pretend there are no args for such case.
1: +       */
1: +      if (vlen == 1 && p->type == 0) {
1: +        btf_dump_printf(d, ")");
1: +        return;
1: +      }
1: +
1: +      for (i = 0; i < vlen; i++, p++) {
1: +        if (i > 0)
1: +          btf_dump_printf(d, ", ");
1: +
1: +        /* last arg of type void is vararg */
1: +        if (i == vlen - 1 && p->type == 0) {
1: +          btf_dump_printf(d, "...");
1: +          break;
1: +        }
1: +
1: +        name = btf_name_of(d, p->name_off);
1: +        btf_dump_emit_type_decl(d, p->type, name, lvl);
1: +      }
1: +
1: +      btf_dump_printf(d, ")");
1: +      return;
1: +    }
1: +    default:
1: +      pr_warn("unexpected type in decl chain, kind:%u, id:[%u]\n", kind, id);
1: +      return;
1: +    }
1: +
1: +    last_was_ptr = kind == BTF_KIND_PTR;
1: +  }
1: +
1: +  btf_dump_emit_name(d, fname, last_was_ptr);
1:  }
1:  
1:  /* return number of duplicates (occurrences) of a given name */
1:  static size_t btf_dump_name_dups(struct btf_dump *d, struct hashmap *name_map,
1: -				 const char *orig_name)
1: -{
1: -	size_t dup_cnt = 0;
1: +                                 const char *orig_name) {
1: +  size_t dup_cnt = 0;
1:  
1: -	hashmap__find(name_map, orig_name, (void **)&dup_cnt);
1: -	dup_cnt++;
1: -	hashmap__set(name_map, orig_name, (void *)dup_cnt, NULL, NULL);
1: +  hashmap__find(name_map, orig_name, (void **)&dup_cnt);
1: +  dup_cnt++;
1: +  hashmap__set(name_map, orig_name, (void *)dup_cnt, NULL, NULL);
1:  
1: -	return dup_cnt;
1: +  return dup_cnt;
1:  }
1:  
1:  static const char *btf_dump_resolve_name(struct btf_dump *d, __u32 id,
1: -					 struct hashmap *name_map)
1: -{
1: -	struct btf_dump_type_aux_state *s = &d->type_states[id];
1: -	const struct btf_type *t = btf__type_by_id(d->btf, id);
1: -	const char *orig_name = btf_name_of(d, t->name_off);
1: -	const char **cached_name = &d->cached_names[id];
1: -	size_t dup_cnt;
1: -
1: -	if (t->name_off == 0)
1: -		return "";
1: -
1: -	if (s->name_resolved)
1: -		return *cached_name ? *cached_name : orig_name;
1: -
1: -	dup_cnt = btf_dump_name_dups(d, name_map, orig_name);
1: -	if (dup_cnt > 1) {
1: -		const size_t max_len = 256;
1: -		char new_name[max_len];
1: -
1: -		snprintf(new_name, max_len, "%s___%zu", orig_name, dup_cnt);
1: -		*cached_name = strdup(new_name);
1: -	}
1: -
1: -	s->name_resolved = 1;
1: -	return *cached_name ? *cached_name : orig_name;
1: +                                         struct hashmap *name_map) {
1: +  struct btf_dump_type_aux_state *s = &d->type_states[id];
1: +  const struct btf_type *t = btf__type_by_id(d->btf, id);
1: +  const char *orig_name = btf_name_of(d, t->name_off);
1: +  const char **cached_name = &d->cached_names[id];
1: +  size_t dup_cnt;
1: +
1: +  if (t->name_off == 0)
1: +    return "";
1: +
1: +  if (s->name_resolved)
1: +    return *cached_name ? *cached_name : orig_name;
1: +
1: +  dup_cnt = btf_dump_name_dups(d, name_map, orig_name);
1: +  if (dup_cnt > 1) {
1: +    const size_t max_len = 256;
1: +    char new_name[max_len];
1: +
1: +    snprintf(new_name, max_len, "%s___%zu", orig_name, dup_cnt);
1: +    *cached_name = strdup(new_name);
1: +  }
1: +
1: +  s->name_resolved = 1;
1: +  return *cached_name ? *cached_name : orig_name;
1:  }
1:  
1: -static const char *btf_dump_type_name(struct btf_dump *d, __u32 id)
1: -{
1: -	return btf_dump_resolve_name(d, id, d->type_names);
1: +static const char *btf_dump_type_name(struct btf_dump *d, __u32 id) {
1: +  return btf_dump_resolve_name(d, id, d->type_names);
1:  }
1:  
1: -static const char *btf_dump_ident_name(struct btf_dump *d, __u32 id)
1: -{
1: -	return btf_dump_resolve_name(d, id, d->ident_names);
1: +static const char *btf_dump_ident_name(struct btf_dump *d, __u32 id) {
1: +  return btf_dump_resolve_name(d, id, d->ident_names);
1:  }
1: diff --git a/src/cc/libbpf/src/gen_loader.c b/src/cc/libbpf/src/gen_loader.c
1: index 8df718a6..6f195383 100644
1: --- a/src/cc/libbpf/src/gen_loader.c
1: +++ b/src/cc/libbpf/src/gen_loader.c
1: @@ -1,16 +1,16 @@
1:  // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
1:  /* Copyright (c) 2021 Facebook */
1: +#include <errno.h>
1: +#include <linux/filter.h>
1:  #include <stdio.h>
1:  #include <stdlib.h>
1:  #include <string.h>
1: -#include <errno.h>
1: -#include <linux/filter.h>
1: -#include "btf.h"
1:  #include "bpf.h"
1: +#include "bpf_gen_internal.h"
1: +#include "btf.h"
1: +#include "hashmap.h"
1:  #include "libbpf.h"
1:  #include "libbpf_internal.h"
1: -#include "hashmap.h"
1: -#include "bpf_gen_internal.h"
1:  #include "skel_internal.h"
1:  
1:  #define MAX_USED_MAPS 64
1: @@ -28,702 +28,683 @@
1:   *        All the bytes that loader prog will use for read/write.
1:   */
1:  struct loader_stack {
1: -	__u32 btf_fd;
1: -	__u32 map_fd[MAX_USED_MAPS];
1: -	__u32 prog_fd[MAX_USED_PROGS];
1: -	__u32 inner_map_fd;
1: +  __u32 btf_fd;
1: +  __u32 map_fd[MAX_USED_MAPS];
1: +  __u32 prog_fd[MAX_USED_PROGS];
1: +  __u32 inner_map_fd;
1:  };
1:  
1:  #define stack_off(field) \
1: -	(__s16)(-sizeof(struct loader_stack) + offsetof(struct loader_stack, field))
1: +  (__s16)(-sizeof(struct loader_stack) + offsetof(struct loader_stack, field))
1:  
1:  #define attr_field(attr, field) (attr + offsetof(union bpf_attr, field))
1:  
1: -static int realloc_insn_buf(struct bpf_gen *gen, __u32 size)
1: -{
1: -	size_t off = gen->insn_cur - gen->insn_start;
1: -	void *insn_start;
1: -
1: -	if (gen->error)
1: -		return gen->error;
1: -	if (size > INT32_MAX || off + size > INT32_MAX) {
1: -		gen->error = -ERANGE;
1: -		return -ERANGE;
1: -	}
1: -	insn_start = realloc(gen->insn_start, off + size);
1: -	if (!insn_start) {
1: -		gen->error = -ENOMEM;
1: -		free(gen->insn_start);
1: -		gen->insn_start = NULL;
1: -		return -ENOMEM;
1: -	}
1: -	gen->insn_start = insn_start;
1: -	gen->insn_cur = insn_start + off;
1: -	return 0;
1: -}
1: -
1: -static int realloc_data_buf(struct bpf_gen *gen, __u32 size)
1: -{
1: -	size_t off = gen->data_cur - gen->data_start;
1: -	void *data_start;
1: -
1: -	if (gen->error)
1: -		return gen->error;
1: -	if (size > INT32_MAX || off + size > INT32_MAX) {
1: -		gen->error = -ERANGE;
1: -		return -ERANGE;
1: -	}
1: -	data_start = realloc(gen->data_start, off + size);
1: -	if (!data_start) {
1: -		gen->error = -ENOMEM;
1: -		free(gen->data_start);
1: -		gen->data_start = NULL;
1: -		return -ENOMEM;
1: -	}
1: -	gen->data_start = data_start;
1: -	gen->data_cur = data_start + off;
1: -	return 0;
1: -}
1: -
1: -static void emit(struct bpf_gen *gen, struct bpf_insn insn)
1: -{
1: -	if (realloc_insn_buf(gen, sizeof(insn)))
1: -		return;
1: -	memcpy(gen->insn_cur, &insn, sizeof(insn));
1: -	gen->insn_cur += sizeof(insn);
1: -}
1: -
1: -static void emit2(struct bpf_gen *gen, struct bpf_insn insn1, struct bpf_insn insn2)
1: -{
1: -	emit(gen, insn1);
1: -	emit(gen, insn2);
1: -}
1: -
1: -void bpf_gen__init(struct bpf_gen *gen, int log_level)
1: -{
1: -	size_t stack_sz = sizeof(struct loader_stack);
1: -	int i;
1: -
1: -	gen->log_level = log_level;
1: -	/* save ctx pointer into R6 */
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_6, BPF_REG_1));
1: -
1: -	/* bzero stack */
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_1, BPF_REG_10));
1: -	emit(gen, BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -stack_sz));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_2, stack_sz));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_3, 0));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel));
1: -
1: -	/* jump over cleanup code */
1: -	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0,
1: -			      /* size of cleanup code below */
1: -			      (stack_sz / 4) * 3 + 2));
1: -
1: -	/* remember the label where all error branches will jump to */
1: -	gen->cleanup_label = gen->insn_cur - gen->insn_start;
1: -	/* emit cleanup code: close all temp FDs */
1: -	for (i = 0; i < stack_sz; i += 4) {
1: -		emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_10, -stack_sz + i));
1: -		emit(gen, BPF_JMP_IMM(BPF_JSLE, BPF_REG_1, 0, 1));
1: -		emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_close));
1: -	}
1: -	/* R7 contains the error code from sys_bpf. Copy it into R0 and exit. */
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_7));
1: -	emit(gen, BPF_EXIT_INSN());
1: -}
1: -
1: -static int add_data(struct bpf_gen *gen, const void *data, __u32 size)
1: -{
1: -	void *prev;
1: -
1: -	if (realloc_data_buf(gen, size))
1: -		return 0;
1: -	prev = gen->data_cur;
1: -	memcpy(gen->data_cur, data, size);
1: -	gen->data_cur += size;
1: -	return prev - gen->data_start;
1: -}
1: -
1: -static int insn_bytes_to_bpf_size(__u32 sz)
1: -{
1: -	switch (sz) {
1: -	case 8: return BPF_DW;
1: -	case 4: return BPF_W;
1: -	case 2: return BPF_H;
1: -	case 1: return BPF_B;
1: -	default: return -1;
1: -	}
1: +static int realloc_insn_buf(struct bpf_gen *gen, __u32 size) {
1: +  size_t off = gen->insn_cur - gen->insn_start;
1: +  void *insn_start;
1: +
1: +  if (gen->error)
1: +    return gen->error;
1: +  if (size > INT32_MAX || off + size > INT32_MAX) {
1: +    gen->error = -ERANGE;
1: +    return -ERANGE;
1: +  }
1: +  insn_start = realloc(gen->insn_start, off + size);
1: +  if (!insn_start) {
1: +    gen->error = -ENOMEM;
1: +    free(gen->insn_start);
1: +    gen->insn_start = NULL;
1: +    return -ENOMEM;
1: +  }
1: +  gen->insn_start = insn_start;
1: +  gen->insn_cur = insn_start + off;
1: +  return 0;
1: +}
1: +
1: +static int realloc_data_buf(struct bpf_gen *gen, __u32 size) {
1: +  size_t off = gen->data_cur - gen->data_start;
1: +  void *data_start;
1: +
1: +  if (gen->error)
1: +    return gen->error;
1: +  if (size > INT32_MAX || off + size > INT32_MAX) {
1: +    gen->error = -ERANGE;
1: +    return -ERANGE;
1: +  }
1: +  data_start = realloc(gen->data_start, off + size);
1: +  if (!data_start) {
1: +    gen->error = -ENOMEM;
1: +    free(gen->data_start);
1: +    gen->data_start = NULL;
1: +    return -ENOMEM;
1: +  }
1: +  gen->data_start = data_start;
1: +  gen->data_cur = data_start + off;
1: +  return 0;
1: +}
1: +
1: +static void emit(struct bpf_gen *gen, struct bpf_insn insn) {
1: +  if (realloc_insn_buf(gen, sizeof(insn)))
1: +    return;
1: +  memcpy(gen->insn_cur, &insn, sizeof(insn));
1: +  gen->insn_cur += sizeof(insn);
1: +}
1: +
1: +static void emit2(struct bpf_gen *gen, struct bpf_insn insn1,
1: +                  struct bpf_insn insn2) {
1: +  emit(gen, insn1);
1: +  emit(gen, insn2);
1: +}
1: +
1: +void bpf_gen__init(struct bpf_gen *gen, int log_level) {
1: +  size_t stack_sz = sizeof(struct loader_stack);
1: +  int i;
1: +
1: +  gen->log_level = log_level;
1: +  /* save ctx pointer into R6 */
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_6, BPF_REG_1));
1: +
1: +  /* bzero stack */
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_1, BPF_REG_10));
1: +  emit(gen, BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -stack_sz));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_2, stack_sz));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_3, 0));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel));
1: +
1: +  /* jump over cleanup code */
1: +  emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0,
1: +                        /* size of cleanup code below */
1: +                        (stack_sz / 4) * 3 + 2));
1: +
1: +  /* remember the label where all error branches will jump to */
1: +  gen->cleanup_label = gen->insn_cur - gen->insn_start;
1: +  /* emit cleanup code: close all temp FDs */
1: +  for (i = 0; i < stack_sz; i += 4) {
1: +    emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_10, -stack_sz + i));
1: +    emit(gen, BPF_JMP_IMM(BPF_JSLE, BPF_REG_1, 0, 1));
1: +    emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_close));
1: +  }
1: +  /* R7 contains the error code from sys_bpf. Copy it into R0 and exit. */
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_7));
1: +  emit(gen, BPF_EXIT_INSN());
1: +}
1: +
1: +static int add_data(struct bpf_gen *gen, const void *data, __u32 size) {
1: +  void *prev;
1: +
1: +  if (realloc_data_buf(gen, size))
1: +    return 0;
1: +  prev = gen->data_cur;
1: +  memcpy(gen->data_cur, data, size);
1: +  gen->data_cur += size;
1: +  return prev - gen->data_start;
1: +}
1: +
1: +static int insn_bytes_to_bpf_size(__u32 sz) {
1: +  switch (sz) {
1: +  case 8:
1: +    return BPF_DW;
1: +  case 4:
1: +    return BPF_W;
1: +  case 2:
1: +    return BPF_H;
1: +  case 1:
1: +    return BPF_B;
1: +  default:
1: +    return -1;
1: +  }
1:  }
1:  
1:  /* *(u64 *)(blob + off) = (u64)(void *)(blob + data) */
1: -static void emit_rel_store(struct bpf_gen *gen, int off, int data)
1: -{
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, data));
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, off));
1: -	emit(gen, BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0));
1: +static void emit_rel_store(struct bpf_gen *gen, int off, int data) {
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   data));
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   off));
1: +  emit(gen, BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0));
1:  }
1:  
1:  /* *(u64 *)(blob + off) = (u64)(void *)(%sp + stack_off) */
1: -static void emit_rel_store_sp(struct bpf_gen *gen, int off, int stack_off)
1: -{
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_10));
1: -	emit(gen, BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, stack_off));
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, off));
1: -	emit(gen, BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0));
1: +static void emit_rel_store_sp(struct bpf_gen *gen, int off, int stack_off) {
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_10));
1: +  emit(gen, BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, stack_off));
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   off));
1: +  emit(gen, BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0));
1:  }
1:  
1:  static void move_ctx2blob(struct bpf_gen *gen, int off, int size, int ctx_off,
1: -				   bool check_non_zero)
1: -{
1: -	emit(gen, BPF_LDX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_0, BPF_REG_6, ctx_off));
1: -	if (check_non_zero)
1: -		/* If value in ctx is zero don't update the blob.
1: -		 * For example: when ctx->map.max_entries == 0, keep default max_entries from bpf.c
1: -		 */
1: -		emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 3));
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, off));
1: -	emit(gen, BPF_STX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_1, BPF_REG_0, 0));
1: -}
1: -
1: -static void move_stack2blob(struct bpf_gen *gen, int off, int size, int stack_off)
1: -{
1: -	emit(gen, BPF_LDX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_0, BPF_REG_10, stack_off));
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, off));
1: -	emit(gen, BPF_STX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_1, BPF_REG_0, 0));
1: -}
1: -
1: -static void move_stack2ctx(struct bpf_gen *gen, int ctx_off, int size, int stack_off)
1: -{
1: -	emit(gen, BPF_LDX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_0, BPF_REG_10, stack_off));
1: -	emit(gen, BPF_STX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_6, BPF_REG_0, ctx_off));
1: -}
1: -
1: -static void emit_sys_bpf(struct bpf_gen *gen, int cmd, int attr, int attr_size)
1: -{
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_1, cmd));
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_2, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, attr));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_3, attr_size));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_bpf));
1: -	/* remember the result in R7 */
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_7, BPF_REG_0));
1: -}
1: -
1: -static bool is_simm16(__s64 value)
1: -{
1: -	return value == (__s64)(__s16)value;
1: -}
1: -
1: -static void emit_check_err(struct bpf_gen *gen)
1: -{
1: -	__s64 off = -(gen->insn_cur - gen->insn_start - gen->cleanup_label) / 8 - 1;
1: -
1: -	/* R7 contains result of last sys_bpf command.
1: -	 * if (R7 < 0) goto cleanup;
1: -	 */
1: -	if (is_simm16(off)) {
1: -		emit(gen, BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0, off));
1: -	} else {
1: -		gen->error = -ERANGE;
1: -		emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, -1));
1: -	}
1: +                          bool check_non_zero) {
1: +  emit(gen, BPF_LDX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_0, BPF_REG_6,
1: +                        ctx_off));
1: +  if (check_non_zero)
1: +    /* If value in ctx is zero don't update the blob.
1: +     * For example: when ctx->map.max_entries == 0, keep default max_entries
1: +     * from bpf.c
1: +     */
1: +    emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 3));
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   off));
1: +  emit(gen, BPF_STX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_1, BPF_REG_0, 0));
1: +}
1: +
1: +static void move_stack2blob(struct bpf_gen *gen, int off, int size,
1: +                            int stack_off) {
1: +  emit(gen, BPF_LDX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_0, BPF_REG_10,
1: +                        stack_off));
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   off));
1: +  emit(gen, BPF_STX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_1, BPF_REG_0, 0));
1: +}
1: +
1: +static void move_stack2ctx(struct bpf_gen *gen, int ctx_off, int size,
1: +                           int stack_off) {
1: +  emit(gen, BPF_LDX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_0, BPF_REG_10,
1: +                        stack_off));
1: +  emit(gen, BPF_STX_MEM(insn_bytes_to_bpf_size(size), BPF_REG_6, BPF_REG_0,
1: +                        ctx_off));
1: +}
1: +
1: +static void emit_sys_bpf(struct bpf_gen *gen, int cmd, int attr,
1: +                         int attr_size) {
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_1, cmd));
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_2, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   attr));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_3, attr_size));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_bpf));
1: +  /* remember the result in R7 */
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_7, BPF_REG_0));
1: +}
1: +
1: +static bool is_simm16(__s64 value) { return value == (__s64)(__s16)value; }
1: +
1: +static void emit_check_err(struct bpf_gen *gen) {
1: +  __s64 off = -(gen->insn_cur - gen->insn_start - gen->cleanup_label) / 8 - 1;
1: +
1: +  /* R7 contains result of last sys_bpf command.
1: +   * if (R7 < 0) goto cleanup;
1: +   */
1: +  if (is_simm16(off)) {
1: +    emit(gen, BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0, off));
1: +  } else {
1: +    gen->error = -ERANGE;
1: +    emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, -1));
1: +  }
1:  }
1:  
1:  /* reg1 and reg2 should not be R1 - R5. They can be R0, R6 - R10 */
1: -static void emit_debug(struct bpf_gen *gen, int reg1, int reg2,
1: -		       const char *fmt, va_list args)
1: -{
1: -	char buf[1024];
1: -	int addr, len, ret;
1: -
1: -	if (!gen->log_level)
1: -		return;
1: -	ret = vsnprintf(buf, sizeof(buf), fmt, args);
1: -	if (ret < 1024 - 7 && reg1 >= 0 && reg2 < 0)
1: -		/* The special case to accommodate common debug_ret():
1: -		 * to avoid specifying BPF_REG_7 and adding " r=%%d" to
1: -		 * prints explicitly.
1: -		 */
1: -		strcat(buf, " r=%d");
1: -	len = strlen(buf) + 1;
1: -	addr = add_data(gen, buf, len);
1: -
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, addr));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_2, len));
1: -	if (reg1 >= 0)
1: -		emit(gen, BPF_MOV64_REG(BPF_REG_3, reg1));
1: -	if (reg2 >= 0)
1: -		emit(gen, BPF_MOV64_REG(BPF_REG_4, reg2));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_trace_printk));
1: -}
1: -
1: -static void debug_regs(struct bpf_gen *gen, int reg1, int reg2, const char *fmt, ...)
1: -{
1: -	va_list args;
1: -
1: -	va_start(args, fmt);
1: -	emit_debug(gen, reg1, reg2, fmt, args);
1: -	va_end(args);
1: -}
1: -
1: -static void debug_ret(struct bpf_gen *gen, const char *fmt, ...)
1: -{
1: -	va_list args;
1: -
1: -	va_start(args, fmt);
1: -	emit_debug(gen, BPF_REG_7, -1, fmt, args);
1: -	va_end(args);
1: -}
1: -
1: -static void __emit_sys_close(struct bpf_gen *gen)
1: -{
1: -	emit(gen, BPF_JMP_IMM(BPF_JSLE, BPF_REG_1, 0,
1: -			      /* 2 is the number of the following insns
1: -			       * * 6 is additional insns in debug_regs
1: -			       */
1: -			      2 + (gen->log_level ? 6 : 0)));
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_9, BPF_REG_1));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_close));
1: -	debug_regs(gen, BPF_REG_9, BPF_REG_0, "close(%%d) = %%d");
1: -}
1: -
1: -static void emit_sys_close_stack(struct bpf_gen *gen, int stack_off)
1: -{
1: -	emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_10, stack_off));
1: -	__emit_sys_close(gen);
1: -}
1: -
1: -static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off)
1: -{
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, blob_off));
1: -	emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0));
1: -	__emit_sys_close(gen);
1: -}
1: -
1: -int bpf_gen__finish(struct bpf_gen *gen)
1: -{
1: -	int i;
1: -
1: -	emit_sys_close_stack(gen, stack_off(btf_fd));
1: -	for (i = 0; i < gen->nr_progs; i++)
1: -		move_stack2ctx(gen,
1: -			       sizeof(struct bpf_loader_ctx) +
1: -			       sizeof(struct bpf_map_desc) * gen->nr_maps +
1: -			       sizeof(struct bpf_prog_desc) * i +
1: -			       offsetof(struct bpf_prog_desc, prog_fd), 4,
1: -			       stack_off(prog_fd[i]));
1: -	for (i = 0; i < gen->nr_maps; i++)
1: -		move_stack2ctx(gen,
1: -			       sizeof(struct bpf_loader_ctx) +
1: -			       sizeof(struct bpf_map_desc) * i +
1: -			       offsetof(struct bpf_map_desc, map_fd), 4,
1: -			       stack_off(map_fd[i]));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_0, 0));
1: -	emit(gen, BPF_EXIT_INSN());
1: -	pr_debug("gen: finish %d\n", gen->error);
1: -	if (!gen->error) {
1: -		struct gen_loader_opts *opts = gen->opts;
1: -
1: -		opts->insns = gen->insn_start;
1: -		opts->insns_sz = gen->insn_cur - gen->insn_start;
1: -		opts->data = gen->data_start;
1: -		opts->data_sz = gen->data_cur - gen->data_start;
1: -	}
1: -	return gen->error;
1: -}
1: -
1: -void bpf_gen__free(struct bpf_gen *gen)
1: -{
1: -	if (!gen)
1: -		return;
1: -	free(gen->data_start);
1: -	free(gen->insn_start);
1: -	free(gen);
1: +static void emit_debug(struct bpf_gen *gen, int reg1, int reg2, const char *fmt,
1: +                       va_list args) {
1: +  char buf[1024];
1: +  int addr, len, ret;
1: +
1: +  if (!gen->log_level)
1: +    return;
1: +  ret = vsnprintf(buf, sizeof(buf), fmt, args);
1: +  if (ret < 1024 - 7 && reg1 >= 0 && reg2 < 0)
1: +    /* The special case to accommodate common debug_ret():
1: +     * to avoid specifying BPF_REG_7 and adding " r=%%d" to
1: +     * prints explicitly.
1: +     */
1: +    strcat(buf, " r=%d");
1: +  len = strlen(buf) + 1;
1: +  addr = add_data(gen, buf, len);
1: +
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   addr));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_2, len));
1: +  if (reg1 >= 0)
1: +    emit(gen, BPF_MOV64_REG(BPF_REG_3, reg1));
1: +  if (reg2 >= 0)
1: +    emit(gen, BPF_MOV64_REG(BPF_REG_4, reg2));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_trace_printk));
1: +}
1: +
1: +static void debug_regs(struct bpf_gen *gen, int reg1, int reg2, const char *fmt,
1: +                       ...) {
1: +  va_list args;
1: +
1: +  va_start(args, fmt);
1: +  emit_debug(gen, reg1, reg2, fmt, args);
1: +  va_end(args);
1: +}
1: +
1: +static void debug_ret(struct bpf_gen *gen, const char *fmt, ...) {
1: +  va_list args;
1: +
1: +  va_start(args, fmt);
1: +  emit_debug(gen, BPF_REG_7, -1, fmt, args);
1: +  va_end(args);
1: +}
1: +
1: +static void __emit_sys_close(struct bpf_gen *gen) {
1: +  emit(gen, BPF_JMP_IMM(BPF_JSLE, BPF_REG_1, 0,
1: +                        /* 2 is the number of the following insns
1: +                         * * 6 is additional insns in debug_regs
1: +                         */
1: +                        2 + (gen->log_level ? 6 : 0)));
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_9, BPF_REG_1));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_close));
1: +  debug_regs(gen, BPF_REG_9, BPF_REG_0, "close(%%d) = %%d");
1: +}
1: +
1: +static void emit_sys_close_stack(struct bpf_gen *gen, int stack_off) {
1: +  emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_10, stack_off));
1: +  __emit_sys_close(gen);
1: +}
1: +
1: +static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off) {
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   blob_off));
1: +  emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0));
1: +  __emit_sys_close(gen);
1: +}
1: +
1: +int bpf_gen__finish(struct bpf_gen *gen) {
1: +  int i;
1: +
1: +  emit_sys_close_stack(gen, stack_off(btf_fd));
1: +  for (i = 0; i < gen->nr_progs; i++)
1: +    move_stack2ctx(gen,
1: +                   sizeof(struct bpf_loader_ctx) +
1: +                       sizeof(struct bpf_map_desc) * gen->nr_maps +
1: +                       sizeof(struct bpf_prog_desc) * i +
1: +                       offsetof(struct bpf_prog_desc, prog_fd),
1: +                   4, stack_off(prog_fd[i]));
1: +  for (i = 0; i < gen->nr_maps; i++)
1: +    move_stack2ctx(gen,
1: +                   sizeof(struct bpf_loader_ctx) +
1: +                       sizeof(struct bpf_map_desc) * i +
1: +                       offsetof(struct bpf_map_desc, map_fd),
1: +                   4, stack_off(map_fd[i]));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_0, 0));
1: +  emit(gen, BPF_EXIT_INSN());
1: +  pr_debug("gen: finish %d\n", gen->error);
1: +  if (!gen->error) {
1: +    struct gen_loader_opts *opts = gen->opts;
1: +
1: +    opts->insns = gen->insn_start;
1: +    opts->insns_sz = gen->insn_cur - gen->insn_start;
1: +    opts->data = gen->data_start;
1: +    opts->data_sz = gen->data_cur - gen->data_start;
1: +  }
1: +  return gen->error;
1: +}
1: +
1: +void bpf_gen__free(struct bpf_gen *gen) {
1: +  if (!gen)
1: +    return;
1: +  free(gen->data_start);
1: +  free(gen->insn_start);
1: +  free(gen);
1:  }
1:  
1:  void bpf_gen__load_btf(struct bpf_gen *gen, const void *btf_raw_data,
1: -		       __u32 btf_raw_size)
1: -{
1: -	int attr_size = offsetofend(union bpf_attr, btf_log_level);
1: -	int btf_data, btf_load_attr;
1: -	union bpf_attr attr;
1: -
1: -	memset(&attr, 0, attr_size);
1: -	pr_debug("gen: load_btf: size %d\n", btf_raw_size);
1: -	btf_data = add_data(gen, btf_raw_data, btf_raw_size);
1: -
1: -	attr.btf_size = btf_raw_size;
1: -	btf_load_attr = add_data(gen, &attr, attr_size);
1: -
1: -	/* populate union bpf_attr with user provided log details */
1: -	move_ctx2blob(gen, attr_field(btf_load_attr, btf_log_level), 4,
1: -		      offsetof(struct bpf_loader_ctx, log_level), false);
1: -	move_ctx2blob(gen, attr_field(btf_load_attr, btf_log_size), 4,
1: -		      offsetof(struct bpf_loader_ctx, log_size), false);
1: -	move_ctx2blob(gen, attr_field(btf_load_attr, btf_log_buf), 8,
1: -		      offsetof(struct bpf_loader_ctx, log_buf), false);
1: -	/* populate union bpf_attr with a pointer to the BTF data */
1: -	emit_rel_store(gen, attr_field(btf_load_attr, btf), btf_data);
1: -	/* emit BTF_LOAD command */
1: -	emit_sys_bpf(gen, BPF_BTF_LOAD, btf_load_attr, attr_size);
1: -	debug_ret(gen, "btf_load size %d", btf_raw_size);
1: -	emit_check_err(gen);
1: -	/* remember btf_fd in the stack, if successful */
1: -	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7, stack_off(btf_fd)));
1: +                       __u32 btf_raw_size) {
1: +  int attr_size = offsetofend(union bpf_attr, btf_log_level);
1: +  int btf_data, btf_load_attr;
1: +  union bpf_attr attr;
1: +
1: +  memset(&attr, 0, attr_size);
1: +  pr_debug("gen: load_btf: size %d\n", btf_raw_size);
1: +  btf_data = add_data(gen, btf_raw_data, btf_raw_size);
1: +
1: +  attr.btf_size = btf_raw_size;
1: +  btf_load_attr = add_data(gen, &attr, attr_size);
1: +
1: +  /* populate union bpf_attr with user provided log details */
1: +  move_ctx2blob(gen, attr_field(btf_load_attr, btf_log_level), 4,
1: +                offsetof(struct bpf_loader_ctx, log_level), false);
1: +  move_ctx2blob(gen, attr_field(btf_load_attr, btf_log_size), 4,
1: +                offsetof(struct bpf_loader_ctx, log_size), false);
1: +  move_ctx2blob(gen, attr_field(btf_load_attr, btf_log_buf), 8,
1: +                offsetof(struct bpf_loader_ctx, log_buf), false);
1: +  /* populate union bpf_attr with a pointer to the BTF data */
1: +  emit_rel_store(gen, attr_field(btf_load_attr, btf), btf_data);
1: +  /* emit BTF_LOAD command */
1: +  emit_sys_bpf(gen, BPF_BTF_LOAD, btf_load_attr, attr_size);
1: +  debug_ret(gen, "btf_load size %d", btf_raw_size);
1: +  emit_check_err(gen);
1: +  /* remember btf_fd in the stack, if successful */
1: +  emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7, stack_off(btf_fd)));
1:  }
1:  
1:  void bpf_gen__map_create(struct bpf_gen *gen,
1: -			 struct bpf_create_map_attr *map_attr, int map_idx)
1: -{
1: -	int attr_size = offsetofend(union bpf_attr, btf_vmlinux_value_type_id);
1: -	bool close_inner_map_fd = false;
1: -	int map_create_attr;
1: -	union bpf_attr attr;
1: -
1: -	memset(&attr, 0, attr_size);
1: -	attr.map_type = map_attr->map_type;
1: -	attr.key_size = map_attr->key_size;
1: -	attr.value_size = map_attr->value_size;
1: -	attr.map_flags = map_attr->map_flags;
1: -	memcpy(attr.map_name, map_attr->name,
1: -	       min((unsigned)strlen(map_attr->name), BPF_OBJ_NAME_LEN - 1));
1: -	attr.numa_node = map_attr->numa_node;
1: -	attr.map_ifindex = map_attr->map_ifindex;
1: -	attr.max_entries = map_attr->max_entries;
1: -	switch (attr.map_type) {
1: -	case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
1: -	case BPF_MAP_TYPE_CGROUP_ARRAY:
1: -	case BPF_MAP_TYPE_STACK_TRACE:
1: -	case BPF_MAP_TYPE_ARRAY_OF_MAPS:
1: -	case BPF_MAP_TYPE_HASH_OF_MAPS:
1: -	case BPF_MAP_TYPE_DEVMAP:
1: -	case BPF_MAP_TYPE_DEVMAP_HASH:
1: -	case BPF_MAP_TYPE_CPUMAP:
1: -	case BPF_MAP_TYPE_XSKMAP:
1: -	case BPF_MAP_TYPE_SOCKMAP:
1: -	case BPF_MAP_TYPE_SOCKHASH:
1: -	case BPF_MAP_TYPE_QUEUE:
1: -	case BPF_MAP_TYPE_STACK:
1: -	case BPF_MAP_TYPE_RINGBUF:
1: -		break;
1: -	default:
1: -		attr.btf_key_type_id = map_attr->btf_key_type_id;
1: -		attr.btf_value_type_id = map_attr->btf_value_type_id;
1: -	}
1: -
1: -	pr_debug("gen: map_create: %s idx %d type %d value_type_id %d\n",
1: -		 attr.map_name, map_idx, map_attr->map_type, attr.btf_value_type_id);
1: -
1: -	map_create_attr = add_data(gen, &attr, attr_size);
1: -	if (attr.btf_value_type_id)
1: -		/* populate union bpf_attr with btf_fd saved in the stack earlier */
1: -		move_stack2blob(gen, attr_field(map_create_attr, btf_fd), 4,
1: -				stack_off(btf_fd));
1: -	switch (attr.map_type) {
1: -	case BPF_MAP_TYPE_ARRAY_OF_MAPS:
1: -	case BPF_MAP_TYPE_HASH_OF_MAPS:
1: -		move_stack2blob(gen, attr_field(map_create_attr, inner_map_fd), 4,
1: -				stack_off(inner_map_fd));
1: -		close_inner_map_fd = true;
1: -		break;
1: -	default:
1: -		break;
1: -	}
1: -	/* conditionally update max_entries */
1: -	if (map_idx >= 0)
1: -		move_ctx2blob(gen, attr_field(map_create_attr, max_entries), 4,
1: -			      sizeof(struct bpf_loader_ctx) +
1: -			      sizeof(struct bpf_map_desc) * map_idx +
1: -			      offsetof(struct bpf_map_desc, max_entries),
1: -			      true /* check that max_entries != 0 */);
1: -	/* emit MAP_CREATE command */
1: -	emit_sys_bpf(gen, BPF_MAP_CREATE, map_create_attr, attr_size);
1: -	debug_ret(gen, "map_create %s idx %d type %d value_size %d value_btf_id %d",
1: -		  attr.map_name, map_idx, map_attr->map_type, attr.value_size,
1: -		  attr.btf_value_type_id);
1: -	emit_check_err(gen);
1: -	/* remember map_fd in the stack, if successful */
1: -	if (map_idx < 0) {
1: -		/* This bpf_gen__map_create() function is called with map_idx >= 0
1: -		 * for all maps that libbpf loading logic tracks.
1: -		 * It's called with -1 to create an inner map.
1: -		 */
1: -		emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
1: -				      stack_off(inner_map_fd)));
1: -	} else if (map_idx != gen->nr_maps) {
1: -		gen->error = -EDOM; /* internal bug */
1: -		return;
1: -	} else {
1: -		emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
1: -				      stack_off(map_fd[map_idx])));
1: -		gen->nr_maps++;
1: -	}
1: -	if (close_inner_map_fd)
1: -		emit_sys_close_stack(gen, stack_off(inner_map_fd));
1: +                         struct bpf_create_map_attr *map_attr, int map_idx) {
1: +  int attr_size = offsetofend(union bpf_attr, btf_vmlinux_value_type_id);
1: +  bool close_inner_map_fd = false;
1: +  int map_create_attr;
1: +  union bpf_attr attr;
1: +
1: +  memset(&attr, 0, attr_size);
1: +  attr.map_type = map_attr->map_type;
1: +  attr.key_size = map_attr->key_size;
1: +  attr.value_size = map_attr->value_size;
1: +  attr.map_flags = map_attr->map_flags;
1: +  memcpy(attr.map_name, map_attr->name,
1: +         min((unsigned)strlen(map_attr->name), BPF_OBJ_NAME_LEN - 1));
1: +  attr.numa_node = map_attr->numa_node;
1: +  attr.map_ifindex = map_attr->map_ifindex;
1: +  attr.max_entries = map_attr->max_entries;
1: +  switch (attr.map_type) {
1: +  case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
1: +  case BPF_MAP_TYPE_CGROUP_ARRAY:
1: +  case BPF_MAP_TYPE_STACK_TRACE:
1: +  case BPF_MAP_TYPE_ARRAY_OF_MAPS:
1: +  case BPF_MAP_TYPE_HASH_OF_MAPS:
1: +  case BPF_MAP_TYPE_DEVMAP:
1: +  case BPF_MAP_TYPE_DEVMAP_HASH:
1: +  case BPF_MAP_TYPE_CPUMAP:
1: +  case BPF_MAP_TYPE_XSKMAP:
1: +  case BPF_MAP_TYPE_SOCKMAP:
1: +  case BPF_MAP_TYPE_SOCKHASH:
1: +  case BPF_MAP_TYPE_QUEUE:
1: +  case BPF_MAP_TYPE_STACK:
1: +  case BPF_MAP_TYPE_RINGBUF:
1: +    break;
1: +  default:
1: +    attr.btf_key_type_id = map_attr->btf_key_type_id;
1: +    attr.btf_value_type_id = map_attr->btf_value_type_id;
1: +  }
1: +
1: +  pr_debug("gen: map_create: %s idx %d type %d value_type_id %d\n",
1: +           attr.map_name, map_idx, map_attr->map_type, attr.btf_value_type_id);
1: +
1: +  map_create_attr = add_data(gen, &attr, attr_size);
1: +  if (attr.btf_value_type_id)
1: +    /* populate union bpf_attr with btf_fd saved in the stack earlier */
1: +    move_stack2blob(gen, attr_field(map_create_attr, btf_fd), 4,
1: +                    stack_off(btf_fd));
1: +  switch (attr.map_type) {
1: +  case BPF_MAP_TYPE_ARRAY_OF_MAPS:
1: +  case BPF_MAP_TYPE_HASH_OF_MAPS:
1: +    move_stack2blob(gen, attr_field(map_create_attr, inner_map_fd), 4,
1: +                    stack_off(inner_map_fd));
1: +    close_inner_map_fd = true;
1: +    break;
1: +  default:
1: +    break;
1: +  }
1: +  /* conditionally update max_entries */
1: +  if (map_idx >= 0)
1: +    move_ctx2blob(gen, attr_field(map_create_attr, max_entries), 4,
1: +                  sizeof(struct bpf_loader_ctx) +
1: +                      sizeof(struct bpf_map_desc) * map_idx +
1: +                      offsetof(struct bpf_map_desc, max_entries),
1: +                  true /* check that max_entries != 0 */);
1: +  /* emit MAP_CREATE command */
1: +  emit_sys_bpf(gen, BPF_MAP_CREATE, map_create_attr, attr_size);
1: +  debug_ret(gen, "map_create %s idx %d type %d value_size %d value_btf_id %d",
1: +            attr.map_name, map_idx, map_attr->map_type, attr.value_size,
1: +            attr.btf_value_type_id);
1: +  emit_check_err(gen);
1: +  /* remember map_fd in the stack, if successful */
1: +  if (map_idx < 0) {
1: +    /* This bpf_gen__map_create() function is called with map_idx >= 0
1: +     * for all maps that libbpf loading logic tracks.
1: +     * It's called with -1 to create an inner map.
1: +     */
1: +    emit(gen,
1: +         BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7, stack_off(inner_map_fd)));
1: +  } else if (map_idx != gen->nr_maps) {
1: +    gen->error = -EDOM; /* internal bug */
1: +    return;
1: +  } else {
1: +    emit(gen,
1: +         BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7, stack_off(map_fd[map_idx])));
1: +    gen->nr_maps++;
1: +  }
1: +  if (close_inner_map_fd)
1: +    emit_sys_close_stack(gen, stack_off(inner_map_fd));
1:  }
1:  
1:  void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *attach_name,
1: -				   enum bpf_attach_type type)
1: -{
1: -	const char *prefix;
1: -	int kind, ret;
1: -
1: -	btf_get_kernel_prefix_kind(type, &prefix, &kind);
1: -	gen->attach_kind = kind;
1: -	ret = snprintf(gen->attach_target, sizeof(gen->attach_target), "%s%s",
1: -		       prefix, attach_name);
1: -	if (ret == sizeof(gen->attach_target))
1: -		gen->error = -ENOSPC;
1: -}
1: -
1: -static void emit_find_attach_target(struct bpf_gen *gen)
1: -{
1: -	int name, len = strlen(gen->attach_target) + 1;
1: -
1: -	pr_debug("gen: find_attach_tgt %s %d\n", gen->attach_target, gen->attach_kind);
1: -	name = add_data(gen, gen->attach_target, len);
1: -
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, name));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_2, len));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_3, gen->attach_kind));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_4, 0));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_btf_find_by_name_kind));
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_7, BPF_REG_0));
1: -	debug_ret(gen, "find_by_name_kind(%s,%d)",
1: -		  gen->attach_target, gen->attach_kind);
1: -	emit_check_err(gen);
1: -	/* if successful, btf_id is in lower 32-bit of R7 and
1: -	 * btf_obj_fd is in upper 32-bit
1: -	 */
1: +                                   enum bpf_attach_type type) {
1: +  const char *prefix;
1: +  int kind, ret;
1: +
1: +  btf_get_kernel_prefix_kind(type, &prefix, &kind);
1: +  gen->attach_kind = kind;
1: +  ret = snprintf(gen->attach_target, sizeof(gen->attach_target), "%s%s", prefix,
1: +                 attach_name);
1: +  if (ret == sizeof(gen->attach_target))
1: +    gen->error = -ENOSPC;
1: +}
1: +
1: +static void emit_find_attach_target(struct bpf_gen *gen) {
1: +  int name, len = strlen(gen->attach_target) + 1;
1: +
1: +  pr_debug("gen: find_attach_tgt %s %d\n", gen->attach_target,
1: +           gen->attach_kind);
1: +  name = add_data(gen, gen->attach_target, len);
1: +
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   name));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_2, len));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_3, gen->attach_kind));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_4, 0));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_btf_find_by_name_kind));
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_7, BPF_REG_0));
1: +  debug_ret(gen, "find_by_name_kind(%s,%d)", gen->attach_target,
1: +            gen->attach_kind);
1: +  emit_check_err(gen);
1: +  /* if successful, btf_id is in lower 32-bit of R7 and
1: +   * btf_obj_fd is in upper 32-bit
1: +   */
1:  }
1:  
1:  void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, int kind,
1: -			    int insn_idx)
1: -{
1: -	struct ksym_relo_desc *relo;
1: -
1: -	relo = libbpf_reallocarray(gen->relos, gen->relo_cnt + 1, sizeof(*relo));
1: -	if (!relo) {
1: -		gen->error = -ENOMEM;
1: -		return;
1: -	}
1: -	gen->relos = relo;
1: -	relo += gen->relo_cnt;
1: -	relo->name = name;
1: -	relo->kind = kind;
1: -	relo->insn_idx = insn_idx;
1: -	gen->relo_cnt++;
1: -}
1: -
1: -static void emit_relo(struct bpf_gen *gen, struct ksym_relo_desc *relo, int insns)
1: -{
1: -	int name, insn, len = strlen(relo->name) + 1;
1: -
1: -	pr_debug("gen: emit_relo: %s at %d\n", relo->name, relo->insn_idx);
1: -	name = add_data(gen, relo->name, len);
1: -
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, name));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_2, len));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_3, relo->kind));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_4, 0));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_btf_find_by_name_kind));
1: -	emit(gen, BPF_MOV64_REG(BPF_REG_7, BPF_REG_0));
1: -	debug_ret(gen, "find_by_name_kind(%s,%d)", relo->name, relo->kind);
1: -	emit_check_err(gen);
1: -	/* store btf_id into insn[insn_idx].imm */
1: -	insn = insns + sizeof(struct bpf_insn) * relo->insn_idx +
1: -		offsetof(struct bpf_insn, imm);
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, insn));
1: -	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7, 0));
1: -	if (relo->kind == BTF_KIND_VAR) {
1: -		/* store btf_obj_fd into insn[insn_idx + 1].imm */
1: -		emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_7, 32));
1: -		emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7,
1: -				      sizeof(struct bpf_insn)));
1: -	}
1: -}
1: -
1: -static void emit_relos(struct bpf_gen *gen, int insns)
1: -{
1: -	int i;
1: -
1: -	for (i = 0; i < gen->relo_cnt; i++)
1: -		emit_relo(gen, gen->relos + i, insns);
1: -}
1: -
1: -static void cleanup_relos(struct bpf_gen *gen, int insns)
1: -{
1: -	int i, insn;
1: -
1: -	for (i = 0; i < gen->relo_cnt; i++) {
1: -		if (gen->relos[i].kind != BTF_KIND_VAR)
1: -			continue;
1: -		/* close fd recorded in insn[insn_idx + 1].imm */
1: -		insn = insns +
1: -			sizeof(struct bpf_insn) * (gen->relos[i].insn_idx + 1) +
1: -			offsetof(struct bpf_insn, imm);
1: -		emit_sys_close_blob(gen, insn);
1: -	}
1: -	if (gen->relo_cnt) {
1: -		free(gen->relos);
1: -		gen->relo_cnt = 0;
1: -		gen->relos = NULL;
1: -	}
1: +                            int insn_idx) {
1: +  struct ksym_relo_desc *relo;
1: +
1: +  relo = libbpf_reallocarray(gen->relos, gen->relo_cnt + 1, sizeof(*relo));
1: +  if (!relo) {
1: +    gen->error = -ENOMEM;
1: +    return;
1: +  }
1: +  gen->relos = relo;
1: +  relo += gen->relo_cnt;
1: +  relo->name = name;
1: +  relo->kind = kind;
1: +  relo->insn_idx = insn_idx;
1: +  gen->relo_cnt++;
1: +}
1: +
1: +static void emit_relo(struct bpf_gen *gen, struct ksym_relo_desc *relo,
1: +                      int insns) {
1: +  int name, insn, len = strlen(relo->name) + 1;
1: +
1: +  pr_debug("gen: emit_relo: %s at %d\n", relo->name, relo->insn_idx);
1: +  name = add_data(gen, relo->name, len);
1: +
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   name));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_2, len));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_3, relo->kind));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_4, 0));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_btf_find_by_name_kind));
1: +  emit(gen, BPF_MOV64_REG(BPF_REG_7, BPF_REG_0));
1: +  debug_ret(gen, "find_by_name_kind(%s,%d)", relo->name, relo->kind);
1: +  emit_check_err(gen);
1: +  /* store btf_id into insn[insn_idx].imm */
1: +  insn = insns + sizeof(struct bpf_insn) * relo->insn_idx +
1: +         offsetof(struct bpf_insn, imm);
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   insn));
1: +  emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7, 0));
1: +  if (relo->kind == BTF_KIND_VAR) {
1: +    /* store btf_obj_fd into insn[insn_idx + 1].imm */
1: +    emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_7, 32));
1: +    emit(gen,
1: +         BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7, sizeof(struct bpf_insn)));
1: +  }
1: +}
1: +
1: +static void emit_relos(struct bpf_gen *gen, int insns) {
1: +  int i;
1: +
1: +  for (i = 0; i < gen->relo_cnt; i++)
1: +    emit_relo(gen, gen->relos + i, insns);
1: +}
1: +
1: +static void cleanup_relos(struct bpf_gen *gen, int insns) {
1: +  int i, insn;
1: +
1: +  for (i = 0; i < gen->relo_cnt; i++) {
1: +    if (gen->relos[i].kind != BTF_KIND_VAR)
1: +      continue;
1: +    /* close fd recorded in insn[insn_idx + 1].imm */
1: +    insn = insns + sizeof(struct bpf_insn) * (gen->relos[i].insn_idx + 1) +
1: +           offsetof(struct bpf_insn, imm);
1: +    emit_sys_close_blob(gen, insn);
1: +  }
1: +  if (gen->relo_cnt) {
1: +    free(gen->relos);
1: +    gen->relo_cnt = 0;
1: +    gen->relos = NULL;
1: +  }
1:  }
1:  
1:  void bpf_gen__prog_load(struct bpf_gen *gen,
1: -			struct bpf_prog_load_params *load_attr, int prog_idx)
1: -{
1: -	int attr_size = offsetofend(union bpf_attr, fd_array);
1: -	int prog_load_attr, license, insns, func_info, line_info;
1: -	union bpf_attr attr;
1: -
1: -	memset(&attr, 0, attr_size);
1: -	pr_debug("gen: prog_load: type %d insns_cnt %zd\n",
1: -		 load_attr->prog_type, load_attr->insn_cnt);
1: -	/* add license string to blob of bytes */
1: -	license = add_data(gen, load_attr->license, strlen(load_attr->license) + 1);
1: -	/* add insns to blob of bytes */
1: -	insns = add_data(gen, load_attr->insns,
1: -			 load_attr->insn_cnt * sizeof(struct bpf_insn));
1: -
1: -	attr.prog_type = load_attr->prog_type;
1: -	attr.expected_attach_type = load_attr->expected_attach_type;
1: -	attr.attach_btf_id = load_attr->attach_btf_id;
1: -	attr.prog_ifindex = load_attr->prog_ifindex;
1: -	attr.kern_version = 0;
1: -	attr.insn_cnt = (__u32)load_attr->insn_cnt;
1: -	attr.prog_flags = load_attr->prog_flags;
1: -
1: -	attr.func_info_rec_size = load_attr->func_info_rec_size;
1: -	attr.func_info_cnt = load_attr->func_info_cnt;
1: -	func_info = add_data(gen, load_attr->func_info,
1: -			     attr.func_info_cnt * attr.func_info_rec_size);
1: -
1: -	attr.line_info_rec_size = load_attr->line_info_rec_size;
1: -	attr.line_info_cnt = load_attr->line_info_cnt;
1: -	line_info = add_data(gen, load_attr->line_info,
1: -			     attr.line_info_cnt * attr.line_info_rec_size);
1: -
1: -	memcpy(attr.prog_name, load_attr->name,
1: -	       min((unsigned)strlen(load_attr->name), BPF_OBJ_NAME_LEN - 1));
1: -	prog_load_attr = add_data(gen, &attr, attr_size);
1: -
1: -	/* populate union bpf_attr with a pointer to license */
1: -	emit_rel_store(gen, attr_field(prog_load_attr, license), license);
1: -
1: -	/* populate union bpf_attr with a pointer to instructions */
1: -	emit_rel_store(gen, attr_field(prog_load_attr, insns), insns);
1: -
1: -	/* populate union bpf_attr with a pointer to func_info */
1: -	emit_rel_store(gen, attr_field(prog_load_attr, func_info), func_info);
1: -
1: -	/* populate union bpf_attr with a pointer to line_info */
1: -	emit_rel_store(gen, attr_field(prog_load_attr, line_info), line_info);
1: -
1: -	/* populate union bpf_attr fd_array with a pointer to stack where map_fds are saved */
1: -	emit_rel_store_sp(gen, attr_field(prog_load_attr, fd_array),
1: -			  stack_off(map_fd[0]));
1: -
1: -	/* populate union bpf_attr with user provided log details */
1: -	move_ctx2blob(gen, attr_field(prog_load_attr, log_level), 4,
1: -		      offsetof(struct bpf_loader_ctx, log_level), false);
1: -	move_ctx2blob(gen, attr_field(prog_load_attr, log_size), 4,
1: -		      offsetof(struct bpf_loader_ctx, log_size), false);
1: -	move_ctx2blob(gen, attr_field(prog_load_attr, log_buf), 8,
1: -		      offsetof(struct bpf_loader_ctx, log_buf), false);
1: -	/* populate union bpf_attr with btf_fd saved in the stack earlier */
1: -	move_stack2blob(gen, attr_field(prog_load_attr, prog_btf_fd), 4,
1: -			stack_off(btf_fd));
1: -	if (gen->attach_kind) {
1: -		emit_find_attach_target(gen);
1: -		/* populate union bpf_attr with btf_id and btf_obj_fd found by helper */
1: -		emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE,
1: -						 0, 0, 0, prog_load_attr));
1: -		emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7,
1: -				      offsetof(union bpf_attr, attach_btf_id)));
1: -		emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_7, 32));
1: -		emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7,
1: -				      offsetof(union bpf_attr, attach_btf_obj_fd)));
1: -	}
1: -	emit_relos(gen, insns);
1: -	/* emit PROG_LOAD command */
1: -	emit_sys_bpf(gen, BPF_PROG_LOAD, prog_load_attr, attr_size);
1: -	debug_ret(gen, "prog_load %s insn_cnt %d", attr.prog_name, attr.insn_cnt);
1: -	/* successful or not, close btf module FDs used in extern ksyms and attach_btf_obj_fd */
1: -	cleanup_relos(gen, insns);
1: -	if (gen->attach_kind)
1: -		emit_sys_close_blob(gen,
1: -				    attr_field(prog_load_attr, attach_btf_obj_fd));
1: -	emit_check_err(gen);
1: -	/* remember prog_fd in the stack, if successful */
1: -	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
1: -			      stack_off(prog_fd[gen->nr_progs])));
1: -	gen->nr_progs++;
1: +                        struct bpf_prog_load_params *load_attr, int prog_idx) {
1: +  int attr_size = offsetofend(union bpf_attr, fd_array);
1: +  int prog_load_attr, license, insns, func_info, line_info;
1: +  union bpf_attr attr;
1: +
1: +  memset(&attr, 0, attr_size);
1: +  pr_debug("gen: prog_load: type %d insns_cnt %zd\n", load_attr->prog_type,
1: +           load_attr->insn_cnt);
1: +  /* add license string to blob of bytes */
1: +  license = add_data(gen, load_attr->license, strlen(load_attr->license) + 1);
1: +  /* add insns to blob of bytes */
1: +  insns = add_data(gen, load_attr->insns,
1: +                   load_attr->insn_cnt * sizeof(struct bpf_insn));
1: +
1: +  attr.prog_type = load_attr->prog_type;
1: +  attr.expected_attach_type = load_attr->expected_attach_type;
1: +  attr.attach_btf_id = load_attr->attach_btf_id;
1: +  attr.prog_ifindex = load_attr->prog_ifindex;
1: +  attr.kern_version = 0;
1: +  attr.insn_cnt = (__u32)load_attr->insn_cnt;
1: +  attr.prog_flags = load_attr->prog_flags;
1: +
1: +  attr.func_info_rec_size = load_attr->func_info_rec_size;
1: +  attr.func_info_cnt = load_attr->func_info_cnt;
1: +  func_info = add_data(gen, load_attr->func_info,
1: +                       attr.func_info_cnt * attr.func_info_rec_size);
1: +
1: +  attr.line_info_rec_size = load_attr->line_info_rec_size;
1: +  attr.line_info_cnt = load_attr->line_info_cnt;
1: +  line_info = add_data(gen, load_attr->line_info,
1: +                       attr.line_info_cnt * attr.line_info_rec_size);
1: +
1: +  memcpy(attr.prog_name, load_attr->name,
1: +         min((unsigned)strlen(load_attr->name), BPF_OBJ_NAME_LEN - 1));
1: +  prog_load_attr = add_data(gen, &attr, attr_size);
1: +
1: +  /* populate union bpf_attr with a pointer to license */
1: +  emit_rel_store(gen, attr_field(prog_load_attr, license), license);
1: +
1: +  /* populate union bpf_attr with a pointer to instructions */
1: +  emit_rel_store(gen, attr_field(prog_load_attr, insns), insns);
1: +
1: +  /* populate union bpf_attr with a pointer to func_info */
1: +  emit_rel_store(gen, attr_field(prog_load_attr, func_info), func_info);
1: +
1: +  /* populate union bpf_attr with a pointer to line_info */
1: +  emit_rel_store(gen, attr_field(prog_load_attr, line_info), line_info);
1: +
1: +  /* populate union bpf_attr fd_array with a pointer to stack where map_fds are
1: +   * saved */
1: +  emit_rel_store_sp(gen, attr_field(prog_load_attr, fd_array),
1: +                    stack_off(map_fd[0]));
1: +
1: +  /* populate union bpf_attr with user provided log details */
1: +  move_ctx2blob(gen, attr_field(prog_load_attr, log_level), 4,
1: +                offsetof(struct bpf_loader_ctx, log_level), false);
1: +  move_ctx2blob(gen, attr_field(prog_load_attr, log_size), 4,
1: +                offsetof(struct bpf_loader_ctx, log_size), false);
1: +  move_ctx2blob(gen, attr_field(prog_load_attr, log_buf), 8,
1: +                offsetof(struct bpf_loader_ctx, log_buf), false);
1: +  /* populate union bpf_attr with btf_fd saved in the stack earlier */
1: +  move_stack2blob(gen, attr_field(prog_load_attr, prog_btf_fd), 4,
1: +                  stack_off(btf_fd));
1: +  if (gen->attach_kind) {
1: +    emit_find_attach_target(gen);
1: +    /* populate union bpf_attr with btf_id and btf_obj_fd found by helper */
1: +    emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0,
1: +                                     0, prog_load_attr));
1: +    emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7,
1: +                          offsetof(union bpf_attr, attach_btf_id)));
1: +    emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_7, 32));
1: +    emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7,
1: +                          offsetof(union bpf_attr, attach_btf_obj_fd)));
1: +  }
1: +  emit_relos(gen, insns);
1: +  /* emit PROG_LOAD command */
1: +  emit_sys_bpf(gen, BPF_PROG_LOAD, prog_load_attr, attr_size);
1: +  debug_ret(gen, "prog_load %s insn_cnt %d", attr.prog_name, attr.insn_cnt);
1: +  /* successful or not, close btf module FDs used in extern ksyms and
1: +   * attach_btf_obj_fd */
1: +  cleanup_relos(gen, insns);
1: +  if (gen->attach_kind)
1: +    emit_sys_close_blob(gen, attr_field(prog_load_attr, attach_btf_obj_fd));
1: +  emit_check_err(gen);
1: +  /* remember prog_fd in the stack, if successful */
1: +  emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
1: +                        stack_off(prog_fd[gen->nr_progs])));
1: +  gen->nr_progs++;
1:  }
1:  
1:  void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *pvalue,
1: -			      __u32 value_size)
1: -{
1: -	int attr_size = offsetofend(union bpf_attr, flags);
1: -	int map_update_attr, value, key;
1: -	union bpf_attr attr;
1: -	int zero = 0;
1: -
1: -	memset(&attr, 0, attr_size);
1: -	pr_debug("gen: map_update_elem: idx %d\n", map_idx);
1: -
1: -	value = add_data(gen, pvalue, value_size);
1: -	key = add_data(gen, &zero, sizeof(zero));
1: -
1: -	/* if (map_desc[map_idx].initial_value)
1: -	 *    copy_from_user(value, initial_value, value_size);
1: -	 */
1: -	emit(gen, BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_6,
1: -			      sizeof(struct bpf_loader_ctx) +
1: -			      sizeof(struct bpf_map_desc) * map_idx +
1: -			      offsetof(struct bpf_map_desc, initial_value)));
1: -	emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_3, 0, 4));
1: -	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
1: -					 0, 0, 0, value));
1: -	emit(gen, BPF_MOV64_IMM(BPF_REG_2, value_size));
1: -	emit(gen, BPF_EMIT_CALL(BPF_FUNC_copy_from_user));
1: -
1: -	map_update_attr = add_data(gen, &attr, attr_size);
1: -	move_stack2blob(gen, attr_field(map_update_attr, map_fd), 4,
1: -			stack_off(map_fd[map_idx]));
1: -	emit_rel_store(gen, attr_field(map_update_attr, key), key);
1: -	emit_rel_store(gen, attr_field(map_update_attr, value), value);
1: -	/* emit MAP_UPDATE_ELEM command */
1: -	emit_sys_bpf(gen, BPF_MAP_UPDATE_ELEM, map_update_attr, attr_size);
1: -	debug_ret(gen, "update_elem idx %d value_size %d", map_idx, value_size);
1: -	emit_check_err(gen);
1: -}
1: -
1: -void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx)
1: -{
1: -	int attr_size = offsetofend(union bpf_attr, map_fd);
1: -	int map_freeze_attr;
1: -	union bpf_attr attr;
1: -
1: -	memset(&attr, 0, attr_size);
1: -	pr_debug("gen: map_freeze: idx %d\n", map_idx);
1: -	map_freeze_attr = add_data(gen, &attr, attr_size);
1: -	move_stack2blob(gen, attr_field(map_freeze_attr, map_fd), 4,
1: -			stack_off(map_fd[map_idx]));
1: -	/* emit MAP_FREEZE command */
1: -	emit_sys_bpf(gen, BPF_MAP_FREEZE, map_freeze_attr, attr_size);
1: -	debug_ret(gen, "map_freeze");
1: -	emit_check_err(gen);
1: +                              __u32 value_size) {
1: +  int attr_size = offsetofend(union bpf_attr, flags);
1: +  int map_update_attr, value, key;
1: +  union bpf_attr attr;
1: +  int zero = 0;
1: +
1: +  memset(&attr, 0, attr_size);
1: +  pr_debug("gen: map_update_elem: idx %d\n", map_idx);
1: +
1: +  value = add_data(gen, pvalue, value_size);
1: +  key = add_data(gen, &zero, sizeof(zero));
1: +
1: +  /* if (map_desc[map_idx].initial_value)
1: +   *    copy_from_user(value, initial_value, value_size);
1: +   */
1: +  emit(gen, BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_6,
1: +                        sizeof(struct bpf_loader_ctx) +
1: +                            sizeof(struct bpf_map_desc) * map_idx +
1: +                            offsetof(struct bpf_map_desc, initial_value)));
1: +  emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_3, 0, 4));
1: +  emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0,
1: +                                   value));
1: +  emit(gen, BPF_MOV64_IMM(BPF_REG_2, value_size));
1: +  emit(gen, BPF_EMIT_CALL(BPF_FUNC_copy_from_user));
1: +
1: +  map_update_attr = add_data(gen, &attr, attr_size);
1: +  move_stack2blob(gen, attr_field(map_update_attr, map_fd), 4,
1: +                  stack_off(map_fd[map_idx]));
1: +  emit_rel_store(gen, attr_field(map_update_attr, key), key);
1: +  emit_rel_store(gen, attr_field(map_update_attr, value), value);
1: +  /* emit MAP_UPDATE_ELEM command */
1: +  emit_sys_bpf(gen, BPF_MAP_UPDATE_ELEM, map_update_attr, attr_size);
1: +  debug_ret(gen, "update_elem idx %d value_size %d", map_idx, value_size);
1: +  emit_check_err(gen);
1: +}
1: +
1: +void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx) {
1: +  int attr_size = offsetofend(union bpf_attr, map_fd);
1: +  int map_freeze_attr;
1: +  union bpf_attr attr;
1: +
1: +  memset(&attr, 0, attr_size);
1: +  pr_debug("gen: map_freeze: idx %d\n", map_idx);
1: +  map_freeze_attr = add_data(gen, &attr, attr_size);
1: +  move_stack2blob(gen, attr_field(map_freeze_attr, map_fd), 4,
1: +                  stack_off(map_fd[map_idx]));
1: +  /* emit MAP_FREEZE command */
1: +  emit_sys_bpf(gen, BPF_MAP_FREEZE, map_freeze_attr, attr_size);
1: +  debug_ret(gen, "map_freeze");
1: +  emit_check_err(gen);
1:  }
1: diff --git a/src/cc/libbpf/src/hashmap.c b/src/cc/libbpf/src/hashmap.c
1: index 3c20b126..8a03c830 100644
1: --- a/src/cc/libbpf/src/hashmap.c
1: +++ b/src/cc/libbpf/src/hashmap.c
1: @@ -5,12 +5,12 @@
1:   *
1:   * Copyright (c) 2019 Facebook
1:   */
1: -#include <stdint.h>
1: -#include <stdlib.h>
1: -#include <stdio.h>
1: +#include "hashmap.h"
1:  #include <errno.h>
1:  #include <linux/err.h>
1: -#include "hashmap.h"
1: +#include <stdint.h>
1: +#include <stdio.h>
1: +#include <stdlib.h>
1:  
1:  /* make sure libbpf doesn't use kernel-only integer typedefs */
1:  #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
1: @@ -22,220 +22,196 @@
1:  #define HASHMAP_MIN_CAP_BITS 2
1:  
1:  static void hashmap_add_entry(struct hashmap_entry **pprev,
1: -			      struct hashmap_entry *entry)
1: -{
1: -	entry->next = *pprev;
1: -	*pprev = entry;
1: +                              struct hashmap_entry *entry) {
1: +  entry->next = *pprev;
1: +  *pprev = entry;
1:  }
1:  
1:  static void hashmap_del_entry(struct hashmap_entry **pprev,
1: -			      struct hashmap_entry *entry)
1: -{
1: -	*pprev = entry->next;
1: -	entry->next = NULL;
1: +                              struct hashmap_entry *entry) {
1: +  *pprev = entry->next;
1: +  entry->next = NULL;
1:  }
1:  
1:  void hashmap__init(struct hashmap *map, hashmap_hash_fn hash_fn,
1: -		   hashmap_equal_fn equal_fn, void *ctx)
1: -{
1: -	map->hash_fn = hash_fn;
1: -	map->equal_fn = equal_fn;
1: -	map->ctx = ctx;
1: -
1: -	map->buckets = NULL;
1: -	map->cap = 0;
1: -	map->cap_bits = 0;
1: -	map->sz = 0;
1: +                   hashmap_equal_fn equal_fn, void *ctx) {
1: +  map->hash_fn = hash_fn;
1: +  map->equal_fn = equal_fn;
1: +  map->ctx = ctx;
1: +
1: +  map->buckets = NULL;
1: +  map->cap = 0;
1: +  map->cap_bits = 0;
1: +  map->sz = 0;
1:  }
1:  
1: -struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,
1: -			     hashmap_equal_fn equal_fn,
1: -			     void *ctx)
1: -{
1: -	struct hashmap *map = malloc(sizeof(struct hashmap));
1: +struct hashmap *hashmap__new(hashmap_hash_fn hash_fn, hashmap_equal_fn equal_fn,
1: +                             void *ctx) {
1: +  struct hashmap *map = malloc(sizeof(struct hashmap));
1:  
1: -	if (!map)
1: -		return ERR_PTR(-ENOMEM);
1: -	hashmap__init(map, hash_fn, equal_fn, ctx);
1: -	return map;
1: +  if (!map)
1: +    return ERR_PTR(-ENOMEM);
1: +  hashmap__init(map, hash_fn, equal_fn, ctx);
1: +  return map;
1:  }
1:  
1: -void hashmap__clear(struct hashmap *map)
1: -{
1: -	struct hashmap_entry *cur, *tmp;
1: -	size_t bkt;
1: -
1: -	hashmap__for_each_entry_safe(map, cur, tmp, bkt) {
1: -		free(cur);
1: -	}
1: -	free(map->buckets);
1: -	map->buckets = NULL;
1: -	map->cap = map->cap_bits = map->sz = 0;
1: +void hashmap__clear(struct hashmap *map) {
1: +  struct hashmap_entry *cur, *tmp;
1: +  size_t bkt;
1: +
1: +  hashmap__for_each_entry_safe(map, cur, tmp, bkt) { free(cur); }
1: +  free(map->buckets);
1: +  map->buckets = NULL;
1: +  map->cap = map->cap_bits = map->sz = 0;
1:  }
1:  
1: -void hashmap__free(struct hashmap *map)
1: -{
1: -	if (!map)
1: -		return;
1: +void hashmap__free(struct hashmap *map) {
1: +  if (!map)
1: +    return;
1:  
1: -	hashmap__clear(map);
1: -	free(map);
1: +  hashmap__clear(map);
1: +  free(map);
1:  }
1:  
1: -size_t hashmap__size(const struct hashmap *map)
1: -{
1: -	return map->sz;
1: -}
1: +size_t hashmap__size(const struct hashmap *map) { return map->sz; }
1:  
1: -size_t hashmap__capacity(const struct hashmap *map)
1: -{
1: -	return map->cap;
1: -}
1: +size_t hashmap__capacity(const struct hashmap *map) { return map->cap; }
1:  
1: -static bool hashmap_needs_to_grow(struct hashmap *map)
1: -{
1: -	/* grow if empty or more than 75% filled */
1: -	return (map->cap == 0) || ((map->sz + 1) * 4 / 3 > map->cap);
1: +static bool hashmap_needs_to_grow(struct hashmap *map) {
1: +  /* grow if empty or more than 75% filled */
1: +  return (map->cap == 0) || ((map->sz + 1) * 4 / 3 > map->cap);
1:  }
1:  
1: -static int hashmap_grow(struct hashmap *map)
1: -{
1: -	struct hashmap_entry **new_buckets;
1: -	struct hashmap_entry *cur, *tmp;
1: -	size_t new_cap_bits, new_cap;
1: -	size_t h, bkt;
1: -
1: -	new_cap_bits = map->cap_bits + 1;
1: -	if (new_cap_bits < HASHMAP_MIN_CAP_BITS)
1: -		new_cap_bits = HASHMAP_MIN_CAP_BITS;
1: -
1: -	new_cap = 1UL << new_cap_bits;
1: -	new_buckets = calloc(new_cap, sizeof(new_buckets[0]));
1: -	if (!new_buckets)
1: -		return -ENOMEM;
1: -
1: -	hashmap__for_each_entry_safe(map, cur, tmp, bkt) {
1: -		h = hash_bits(map->hash_fn(cur->key, map->ctx), new_cap_bits);
1: -		hashmap_add_entry(&new_buckets[h], cur);
1: -	}
1: -
1: -	map->cap = new_cap;
1: -	map->cap_bits = new_cap_bits;
1: -	free(map->buckets);
1: -	map->buckets = new_buckets;
1: -
1: -	return 0;
1: +static int hashmap_grow(struct hashmap *map) {
1: +  struct hashmap_entry **new_buckets;
1: +  struct hashmap_entry *cur, *tmp;
1: +  size_t new_cap_bits, new_cap;
1: +  size_t h, bkt;
1: +
1: +  new_cap_bits = map->cap_bits + 1;
1: +  if (new_cap_bits < HASHMAP_MIN_CAP_BITS)
1: +    new_cap_bits = HASHMAP_MIN_CAP_BITS;
1: +
1: +  new_cap = 1UL << new_cap_bits;
1: +  new_buckets = calloc(new_cap, sizeof(new_buckets[0]));
1: +  if (!new_buckets)
1: +    return -ENOMEM;
1: +
1: +  hashmap__for_each_entry_safe(map, cur, tmp, bkt) {
1: +    h = hash_bits(map->hash_fn(cur->key, map->ctx), new_cap_bits);
1: +    hashmap_add_entry(&new_buckets[h], cur);
1: +  }
1: +
1: +  map->cap = new_cap;
1: +  map->cap_bits = new_cap_bits;
1: +  free(map->buckets);
1: +  map->buckets = new_buckets;
1: +
1: +  return 0;
1:  }
1:  
1: -static bool hashmap_find_entry(const struct hashmap *map,
1: -			       const void *key, size_t hash,
1: -			       struct hashmap_entry ***pprev,
1: -			       struct hashmap_entry **entry)
1: -{
1: -	struct hashmap_entry *cur, **prev_ptr;
1: -
1: -	if (!map->buckets)
1: -		return false;
1: -
1: -	for (prev_ptr = &map->buckets[hash], cur = *prev_ptr;
1: -	     cur;
1: -	     prev_ptr = &cur->next, cur = cur->next) {
1: -		if (map->equal_fn(cur->key, key, map->ctx)) {
1: -			if (pprev)
1: -				*pprev = prev_ptr;
1: -			*entry = cur;
1: -			return true;
1: -		}
1: -	}
1: -
1: -	return false;
1: +static bool hashmap_find_entry(const struct hashmap *map, const void *key,
1: +                               size_t hash, struct hashmap_entry ***pprev,
1: +                               struct hashmap_entry **entry) {
1: +  struct hashmap_entry *cur, **prev_ptr;
1: +
1: +  if (!map->buckets)
1: +    return false;
1: +
1: +  for (prev_ptr = &map->buckets[hash], cur = *prev_ptr; cur;
1: +       prev_ptr = &cur->next, cur = cur->next) {
1: +    if (map->equal_fn(cur->key, key, map->ctx)) {
1: +      if (pprev)
1: +        *pprev = prev_ptr;
1: +      *entry = cur;
1: +      return true;
1: +    }
1: +  }
1: +
1: +  return false;
1:  }
1:  
1:  int hashmap__insert(struct hashmap *map, const void *key, void *value,
1: -		    enum hashmap_insert_strategy strategy,
1: -		    const void **old_key, void **old_value)
1: -{
1: -	struct hashmap_entry *entry;
1: -	size_t h;
1: -	int err;
1: -
1: -	if (old_key)
1: -		*old_key = NULL;
1: -	if (old_value)
1: -		*old_value = NULL;
1: -
1: -	h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: -	if (strategy != HASHMAP_APPEND &&
1: -	    hashmap_find_entry(map, key, h, NULL, &entry)) {
1: -		if (old_key)
1: -			*old_key = entry->key;
1: -		if (old_value)
1: -			*old_value = entry->value;
1: -
1: -		if (strategy == HASHMAP_SET || strategy == HASHMAP_UPDATE) {
1: -			entry->key = key;
1: -			entry->value = value;
1: -			return 0;
1: -		} else if (strategy == HASHMAP_ADD) {
1: -			return -EEXIST;
1: -		}
1: -	}
1: -
1: -	if (strategy == HASHMAP_UPDATE)
1: -		return -ENOENT;
1: -
1: -	if (hashmap_needs_to_grow(map)) {
1: -		err = hashmap_grow(map);
1: -		if (err)
1: -			return err;
1: -		h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: -	}
1: -
1: -	entry = malloc(sizeof(struct hashmap_entry));
1: -	if (!entry)
1: -		return -ENOMEM;
1: -
1: -	entry->key = key;
1: -	entry->value = value;
1: -	hashmap_add_entry(&map->buckets[h], entry);
1: -	map->sz++;
1: -
1: -	return 0;
1: +                    enum hashmap_insert_strategy strategy, const void **old_key,
1: +                    void **old_value) {
1: +  struct hashmap_entry *entry;
1: +  size_t h;
1: +  int err;
1: +
1: +  if (old_key)
1: +    *old_key = NULL;
1: +  if (old_value)
1: +    *old_value = NULL;
1: +
1: +  h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: +  if (strategy != HASHMAP_APPEND &&
1: +      hashmap_find_entry(map, key, h, NULL, &entry)) {
1: +    if (old_key)
1: +      *old_key = entry->key;
1: +    if (old_value)
1: +      *old_value = entry->value;
1: +
1: +    if (strategy == HASHMAP_SET || strategy == HASHMAP_UPDATE) {
1: +      entry->key = key;
1: +      entry->value = value;
1: +      return 0;
1: +    } else if (strategy == HASHMAP_ADD) {
1: +      return -EEXIST;
1: +    }
1: +  }
1: +
1: +  if (strategy == HASHMAP_UPDATE)
1: +    return -ENOENT;
1: +
1: +  if (hashmap_needs_to_grow(map)) {
1: +    err = hashmap_grow(map);
1: +    if (err)
1: +      return err;
1: +    h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: +  }
1: +
1: +  entry = malloc(sizeof(struct hashmap_entry));
1: +  if (!entry)
1: +    return -ENOMEM;
1: +
1: +  entry->key = key;
1: +  entry->value = value;
1: +  hashmap_add_entry(&map->buckets[h], entry);
1: +  map->sz++;
1: +
1: +  return 0;
1:  }
1:  
1: -bool hashmap__find(const struct hashmap *map, const void *key, void **value)
1: -{
1: -	struct hashmap_entry *entry;
1: -	size_t h;
1: +bool hashmap__find(const struct hashmap *map, const void *key, void **value) {
1: +  struct hashmap_entry *entry;
1: +  size_t h;
1:  
1: -	h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: -	if (!hashmap_find_entry(map, key, h, NULL, &entry))
1: -		return false;
1: +  h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: +  if (!hashmap_find_entry(map, key, h, NULL, &entry))
1: +    return false;
1:  
1: -	if (value)
1: -		*value = entry->value;
1: -	return true;
1: +  if (value)
1: +    *value = entry->value;
1: +  return true;
1:  }
1:  
1: -bool hashmap__delete(struct hashmap *map, const void *key,
1: -		     const void **old_key, void **old_value)
1: -{
1: -	struct hashmap_entry **pprev, *entry;
1: -	size_t h;
1: +bool hashmap__delete(struct hashmap *map, const void *key, const void **old_key,
1: +                     void **old_value) {
1: +  struct hashmap_entry **pprev, *entry;
1: +  size_t h;
1:  
1: -	h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: -	if (!hashmap_find_entry(map, key, h, &pprev, &entry))
1: -		return false;
1: +  h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
1: +  if (!hashmap_find_entry(map, key, h, &pprev, &entry))
1: +    return false;
1:  
1: -	if (old_key)
1: -		*old_key = entry->key;
1: -	if (old_value)
1: -		*old_value = entry->value;
1: +  if (old_key)
1: +    *old_key = entry->key;
1: +  if (old_value)
1: +    *old_value = entry->value;
1:  
1: -	hashmap_del_entry(pprev, entry);
1: -	free(entry);
1: -	map->sz--;
1: +  hashmap_del_entry(pprev, entry);
1: +  free(entry);
1: +  map->sz--;
1:  
1: -	return true;
1: +  return true;
1:  }
1: -
1: diff --git a/src/cc/libbpf/src/hashmap.h b/src/cc/libbpf/src/hashmap.h
1: index 10a4c4cd..8517c10e 100644
1: --- a/src/cc/libbpf/src/hashmap.h
1: +++ b/src/cc/libbpf/src/hashmap.h
1: @@ -8,73 +8,66 @@
1:  #ifndef __LIBBPF_HASHMAP_H
1:  #define __LIBBPF_HASHMAP_H
1:  
1: +#include <limits.h>
1:  #include <stdbool.h>
1:  #include <stddef.h>
1: -#include <limits.h>
1:  
1: -static inline size_t hash_bits(size_t h, int bits)
1: -{
1: -	/* shuffle bits and return requested number of upper bits */
1: -	if (bits == 0)
1: -		return 0;
1: +static inline size_t hash_bits(size_t h, int bits) {
1: +  /* shuffle bits and return requested number of upper bits */
1: +  if (bits == 0)
1: +    return 0;
1:  
1:  #if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
1: -	/* LP64 case */
1: -	return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
1: +  /* LP64 case */
1: +  return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
1:  #elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
1: -	return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
1: +  return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
1:  #else
1: -#	error "Unsupported size_t size"
1: +#error "Unsupported size_t size"
1:  #endif
1:  }
1:  
1:  /* generic C-string hashing function */
1: -static inline size_t str_hash(const char *s)
1: -{
1: -	size_t h = 0;
1: -
1: -	while (*s) {
1: -		h = h * 31 + *s;
1: -		s++;
1: -	}
1: -	return h;
1: +static inline size_t str_hash(const char *s) {
1: +  size_t h = 0;
1: +
1: +  while (*s) {
1: +    h = h * 31 + *s;
1: +    s++;
1: +  }
1: +  return h;
1:  }
1:  
1:  typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);
1:  typedef bool (*hashmap_equal_fn)(const void *key1, const void *key2, void *ctx);
1:  
1:  struct hashmap_entry {
1: -	const void *key;
1: -	void *value;
1: -	struct hashmap_entry *next;
1: +  const void *key;
1: +  void *value;
1: +  struct hashmap_entry *next;
1:  };
1:  
1:  struct hashmap {
1: -	hashmap_hash_fn hash_fn;
1: -	hashmap_equal_fn equal_fn;
1: -	void *ctx;
1: -
1: -	struct hashmap_entry **buckets;
1: -	size_t cap;
1: -	size_t cap_bits;
1: -	size_t sz;
1: +  hashmap_hash_fn hash_fn;
1: +  hashmap_equal_fn equal_fn;
1: +  void *ctx;
1: +
1: +  struct hashmap_entry **buckets;
1: +  size_t cap;
1: +  size_t cap_bits;
1: +  size_t sz;
1:  };
1:  
1: -#define HASHMAP_INIT(hash_fn, equal_fn, ctx) {	\
1: -	.hash_fn = (hash_fn),			\
1: -	.equal_fn = (equal_fn),			\
1: -	.ctx = (ctx),				\
1: -	.buckets = NULL,			\
1: -	.cap = 0,				\
1: -	.cap_bits = 0,				\
1: -	.sz = 0,				\
1: -}
1: +#define HASHMAP_INIT(hash_fn, equal_fn, ctx)                    \
1: +  {                                                             \
1: +    .hash_fn = (hash_fn), .equal_fn = (equal_fn), .ctx = (ctx), \
1: +    .buckets = NULL, .cap = 0, .cap_bits = 0, .sz = 0,          \
1: +  }
1:  
1:  void hashmap__init(struct hashmap *map, hashmap_hash_fn hash_fn,
1: -		   hashmap_equal_fn equal_fn, void *ctx);
1: -struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,
1: -			     hashmap_equal_fn equal_fn,
1: -			     void *ctx);
1: +                   hashmap_equal_fn equal_fn, void *ctx);
1: +struct hashmap *hashmap__new(hashmap_hash_fn hash_fn, hashmap_equal_fn equal_fn,
1: +                             void *ctx);
1:  void hashmap__clear(struct hashmap *map);
1:  void hashmap__free(struct hashmap *map);
1:  
1: @@ -96,10 +89,10 @@ size_t hashmap__capacity(const struct hashmap *map);
1:   *   chain).
1:   */
1:  enum hashmap_insert_strategy {
1: -	HASHMAP_ADD,
1: -	HASHMAP_SET,
1: -	HASHMAP_UPDATE,
1: -	HASHMAP_APPEND,
1: +  HASHMAP_ADD,
1: +  HASHMAP_SET,
1: +  HASHMAP_UPDATE,
1: +  HASHMAP_APPEND,
1:  };
1:  
1:  /*
1: @@ -110,39 +103,33 @@ enum hashmap_insert_strategy {
1:   * management.
1:   */
1:  int hashmap__insert(struct hashmap *map, const void *key, void *value,
1: -		    enum hashmap_insert_strategy strategy,
1: -		    const void **old_key, void **old_value);
1: +                    enum hashmap_insert_strategy strategy, const void **old_key,
1: +                    void **old_value);
1:  
1: -static inline int hashmap__add(struct hashmap *map,
1: -			       const void *key, void *value)
1: -{
1: -	return hashmap__insert(map, key, value, HASHMAP_ADD, NULL, NULL);
1: +static inline int hashmap__add(struct hashmap *map, const void *key,
1: +                               void *value) {
1: +  return hashmap__insert(map, key, value, HASHMAP_ADD, NULL, NULL);
1:  }
1:  
1: -static inline int hashmap__set(struct hashmap *map,
1: -			       const void *key, void *value,
1: -			       const void **old_key, void **old_value)
1: -{
1: -	return hashmap__insert(map, key, value, HASHMAP_SET,
1: -			       old_key, old_value);
1: +static inline int hashmap__set(struct hashmap *map, const void *key,
1: +                               void *value, const void **old_key,
1: +                               void **old_value) {
1: +  return hashmap__insert(map, key, value, HASHMAP_SET, old_key, old_value);
1:  }
1:  
1: -static inline int hashmap__update(struct hashmap *map,
1: -				  const void *key, void *value,
1: -				  const void **old_key, void **old_value)
1: -{
1: -	return hashmap__insert(map, key, value, HASHMAP_UPDATE,
1: -			       old_key, old_value);
1: +static inline int hashmap__update(struct hashmap *map, const void *key,
1: +                                  void *value, const void **old_key,
1: +                                  void **old_value) {
1: +  return hashmap__insert(map, key, value, HASHMAP_UPDATE, old_key, old_value);
1:  }
1:  
1: -static inline int hashmap__append(struct hashmap *map,
1: -				  const void *key, void *value)
1: -{
1: -	return hashmap__insert(map, key, value, HASHMAP_APPEND, NULL, NULL);
1: +static inline int hashmap__append(struct hashmap *map, const void *key,
1: +                                  void *value) {
1: +  return hashmap__insert(map, key, value, HASHMAP_APPEND, NULL, NULL);
1:  }
1:  
1: -bool hashmap__delete(struct hashmap *map, const void *key,
1: -		     const void **old_key, void **old_value);
1: +bool hashmap__delete(struct hashmap *map, const void *key, const void **old_key,
1: +                     void **old_value);
1:  
1:  bool hashmap__find(const struct hashmap *map, const void *key, void **value);
1:  
1: @@ -152,9 +139,9 @@ bool hashmap__find(const struct hashmap *map, const void *key, void **value);
1:   * @cur: struct hashmap_entry * used as a loop cursor
1:   * @bkt: integer used as a bucket loop cursor
1:   */
1: -#define hashmap__for_each_entry(map, cur, bkt)				    \
1: -	for (bkt = 0; bkt < map->cap; bkt++)				    \
1: -		for (cur = map->buckets[bkt]; cur; cur = cur->next)
1: +#define hashmap__for_each_entry(map, cur, bkt) \
1: +  for (bkt = 0; bkt < map->cap; bkt++)         \
1: +    for (cur = map->buckets[bkt]; cur; cur = cur->next)
1:  
1:  /*
1:   * hashmap__for_each_entry_safe - iterate over all entries in hashmap, safe
1: @@ -164,11 +151,13 @@ bool hashmap__find(const struct hashmap *map, const void *key, void **value);
1:   * @tmp: struct hashmap_entry * used as a temporary next cursor storage
1:   * @bkt: integer used as a bucket loop cursor
1:   */
1: -#define hashmap__for_each_entry_safe(map, cur, tmp, bkt)		    \
1: -	for (bkt = 0; bkt < map->cap; bkt++)				    \
1: -		for (cur = map->buckets[bkt];				    \
1: -		     cur && ({tmp = cur->next; true; });		    \
1: -		     cur = tmp)
1: +#define hashmap__for_each_entry_safe(map, cur, tmp, bkt) \
1: +  for (bkt = 0; bkt < map->cap; bkt++)                   \
1: +    for (cur = map->buckets[bkt]; cur && ({              \
1: +                                    tmp = cur->next;     \
1: +                                    true;                \
1: +                                  });                    \
1: +         cur = tmp)
1:  
1:  /*
1:   * hashmap__for_each_key_entry - iterate over entries associated with given key
1: @@ -176,20 +165,24 @@ bool hashmap__find(const struct hashmap *map, const void *key, void **value);
1:   * @cur: struct hashmap_entry * used as a loop cursor
1:   * @key: key to iterate entries for
1:   */
1: -#define hashmap__for_each_key_entry(map, cur, _key)			    \
1: -	for (cur = map->buckets						    \
1: -		     ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), map->cap_bits)] \
1: -		     : NULL;						    \
1: -	     cur;							    \
1: -	     cur = cur->next)						    \
1: -		if (map->equal_fn(cur->key, (_key), map->ctx))
1: -
1: -#define hashmap__for_each_key_entry_safe(map, cur, tmp, _key)		    \
1: -	for (cur = map->buckets						    \
1: -		     ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), map->cap_bits)] \
1: -		     : NULL;						    \
1: -	     cur && ({ tmp = cur->next; true; });			    \
1: -	     cur = tmp)							    \
1: -		if (map->equal_fn(cur->key, (_key), map->ctx))
1: +#define hashmap__for_each_key_entry(map, cur, _key)                       \
1: +  for (cur = map->buckets                                                 \
1: +                 ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), \
1: +                                          map->cap_bits)]                 \
1: +                 : NULL;                                                  \
1: +       cur; cur = cur->next)                                              \
1: +    if (map->equal_fn(cur->key, (_key), map->ctx))
1: +
1: +#define hashmap__for_each_key_entry_safe(map, cur, tmp, _key)             \
1: +  for (cur = map->buckets                                                 \
1: +                 ? map->buckets[hash_bits(map->hash_fn((_key), map->ctx), \
1: +                                          map->cap_bits)]                 \
1: +                 : NULL;                                                  \
1: +       cur && ({                                                          \
1: +         tmp = cur->next;                                                 \
1: +         true;                                                            \
1: +       });                                                                \
1: +       cur = tmp)                                                         \
1: +    if (map->equal_fn(cur->key, (_key), map->ctx))
1:  
1:  #endif /* __LIBBPF_HASHMAP_H */
1: diff --git a/src/cc/libbpf/src/libbpf.c b/src/cc/libbpf/src/libbpf.c
1: index 48c0ade0..861e763d 100644
1: --- a/src/cc/libbpf/src/libbpf.c
1: +++ b/src/cc/libbpf/src/libbpf.c
1: @@ -13,51 +13,51 @@
1:  #ifndef _GNU_SOURCE
1:  #define _GNU_SOURCE
1:  #endif
1: -#include <stdlib.h>
1: -#include <stdio.h>
1: -#include <stdarg.h>
1: -#include <libgen.h>
1: -#include <inttypes.h>
1: -#include <limits.h>
1: -#include <string.h>
1: -#include <unistd.h>
1: +#include <asm/unistd.h>
1: +#include <ctype.h>
1:  #include <endian.h>
1: -#include <fcntl.h>
1:  #include <errno.h>
1: -#include <ctype.h>
1: -#include <asm/unistd.h>
1: -#include <linux/err.h>
1: -#include <linux/kernel.h>
1: +#include <fcntl.h>
1: +#include <gelf.h>
1: +#include <inttypes.h>
1: +#include <libelf.h>
1: +#include <libgen.h>
1: +#include <limits.h>
1:  #include <linux/bpf.h>
1:  #include <linux/btf.h>
1: +#include <linux/err.h>
1:  #include <linux/filter.h>
1: -#include <linux/list.h>
1: +#include <linux/kernel.h>
1:  #include <linux/limits.h>
1: +#include <linux/list.h>
1:  #include <linux/perf_event.h>
1:  #include <linux/ring_buffer.h>
1:  #include <linux/version.h>
1: +#include <stdarg.h>
1: +#include <stdio.h>
1: +#include <stdlib.h>
1: +#include <string.h>
1:  #include <sys/epoll.h>
1:  #include <sys/ioctl.h>
1:  #include <sys/mman.h>
1: +#include <sys/resource.h>
1:  #include <sys/stat.h>
1:  #include <sys/types.h>
1: -#include <sys/vfs.h>
1:  #include <sys/utsname.h>
1: -#include <sys/resource.h>
1: -#include <libelf.h>
1: -#include <gelf.h>
1: +#include <sys/vfs.h>
1: +#include <unistd.h>
1:  #include <zlib.h>
1:  
1: -#include "libbpf.h"
1:  #include "bpf.h"
1: +#include "bpf_gen_internal.h"
1:  #include "btf.h"
1: -#include "str_error.h"
1: -#include "libbpf_internal.h"
1:  #include "hashmap.h"
1: -#include "bpf_gen_internal.h"
1: +#include "libbpf.h"
1: +#include "libbpf_internal.h"
1: +#include "str_error.h"
1:  
1:  #ifndef BPF_FS_MAGIC
1: -#define BPF_FS_MAGIC		0xcafe4a11
1: +#define BPF_FS_MAGIC 0xcafe4a11
1:  #endif
1:  
1:  #define BPF_INSN_SZ (sizeof(struct bpf_insn))
1: @@ -67,168 +67,173 @@
1:   */
1:  #pragma GCC diagnostic ignored "-Wformat-nonliteral"
1:  
1: -#define __printf(a, b)	__attribute__((format(printf, a, b)))
1: +#define __printf(a, b) __attribute__((format(printf, a, b)))
1:  
1:  static struct bpf_map *bpf_object__add_map(struct bpf_object *obj);
1: -static bool prog_is_subprog(const struct bpf_object *obj, const struct bpf_program *prog);
1: +static bool prog_is_subprog(const struct bpf_object *obj,
1: +                            const struct bpf_program *prog);
1:  
1:  static int __base_pr(enum libbpf_print_level level, const char *format,
1: -		     va_list args)
1: -{
1: -	if (level == LIBBPF_DEBUG)
1: -		return 0;
1: +                     va_list args) {
1: +  if (level == LIBBPF_DEBUG)
1: +    return 0;
1:  
1: -	return vfprintf(stderr, format, args);
1: +  return vfprintf(stderr, format, args);
1:  }
1:  
1:  static libbpf_print_fn_t __libbpf_pr = __base_pr;
1:  
1: -libbpf_print_fn_t libbpf_set_print(libbpf_print_fn_t fn)
1: -{
1: -	libbpf_print_fn_t old_print_fn = __libbpf_pr;
1: +libbpf_print_fn_t libbpf_set_print(libbpf_print_fn_t fn) {
1: +  libbpf_print_fn_t old_print_fn = __libbpf_pr;
1:  
1: -	__libbpf_pr = fn;
1: -	return old_print_fn;
1: +  __libbpf_pr = fn;
1: +  return old_print_fn;
1:  }
1:  
1: -__printf(2, 3)
1: -void libbpf_print(enum libbpf_print_level level, const char *format, ...)
1: -{
1: -	va_list args;
1: +__printf(2, 3) void libbpf_print(enum libbpf_print_level level,
1: +                                 const char *format, ...) {
1: +  va_list args;
1:  
1: -	if (!__libbpf_pr)
1: -		return;
1: +  if (!__libbpf_pr)
1: +    return;
1:  
1: -	va_start(args, format);
1: -	__libbpf_pr(level, format, args);
1: -	va_end(args);
1: +  va_start(args, format);
1: +  __libbpf_pr(level, format, args);
1: +  va_end(args);
1:  }
1:  
1: -static void pr_perm_msg(int err)
1: -{
1: -	struct rlimit limit;
1: -	char buf[100];
1: +static void pr_perm_msg(int err) {
1: +  struct rlimit limit;
1: +  char buf[100];
1:  
1: -	if (err != -EPERM || geteuid() != 0)
1: -		return;
1: +  if (err != -EPERM || geteuid() != 0)
1: +    return;
1:  
1: -	err = getrlimit(RLIMIT_MEMLOCK, &limit);
1: -	if (err)
1: -		return;
1: +  err = getrlimit(RLIMIT_MEMLOCK, &limit);
1: +  if (err)
1: +    return;
1:  
1: -	if (limit.rlim_cur == RLIM_INFINITY)
1: -		return;
1: +  if (limit.rlim_cur == RLIM_INFINITY)
1: +    return;
1:  
1: -	if (limit.rlim_cur < 1024)
1: -		snprintf(buf, sizeof(buf), "%zu bytes", (size_t)limit.rlim_cur);
1: -	else if (limit.rlim_cur < 1024*1024)
1: -		snprintf(buf, sizeof(buf), "%.1f KiB", (double)limit.rlim_cur / 1024);
1: -	else
1: -		snprintf(buf, sizeof(buf), "%.1f MiB", (double)limit.rlim_cur / (1024*1024));
1: +  if (limit.rlim_cur < 1024)
1: +    snprintf(buf, sizeof(buf), "%zu bytes", (size_t)limit.rlim_cur);
1: +  else if (limit.rlim_cur < 1024 * 1024)
1: +    snprintf(buf, sizeof(buf), "%.1f KiB", (double)limit.rlim_cur / 1024);
1: +  else
1: +    snprintf(buf, sizeof(buf), "%.1f MiB",
1: +             (double)limit.rlim_cur / (1024 * 1024));
1:  
1: -	pr_warn("permission error while running as root; try raising 'ulimit -l'? current value: %s\n",
1: -		buf);
1: +  pr_warn(
1: +      "permission error while running as root; try raising 'ulimit -l'? "
1: +      "current value: %s\n",
1: +      buf);
1:  }
1:  
1: -#define STRERR_BUFSIZE  128
1: +#define STRERR_BUFSIZE 128
1:  
1:  /* Copied from tools/perf/util/util.h */
1:  #ifndef zfree
1: -# define zfree(ptr) ({ free(*ptr); *ptr = NULL; })
1: +#define zfree(ptr) \
1: +  ({               \
1: +    free(*ptr);    \
1: +    *ptr = NULL;   \
1: +  })
1:  #endif
1:  
1:  #ifndef zclose
1: -# define zclose(fd) ({			\
1: -	int ___err = 0;			\
1: -	if ((fd) >= 0)			\
1: -		___err = close((fd));	\
1: -	fd = -1;			\
1: -	___err; })
1: +#define zclose(fd)          \
1: +  ({                        \
1: +    int ___err = 0;         \
1: +    if ((fd) >= 0)          \
1: +      ___err = close((fd)); \
1: +    fd = -1;                \
1: +    ___err;                 \
1: +  })
1:  #endif
1:  
1: -static inline __u64 ptr_to_u64(const void *ptr)
1: -{
1: -	return (__u64) (unsigned long) ptr;
1: +static inline __u64 ptr_to_u64(const void *ptr) {
1: +  return (__u64)(unsigned long)ptr;
1:  }
1:  
1:  /* this goes away in libbpf 1.0 */
1:  enum libbpf_strict_mode libbpf_mode = LIBBPF_STRICT_NONE;
1:  
1: -int libbpf_set_strict_mode(enum libbpf_strict_mode mode)
1: -{
1: -	/* __LIBBPF_STRICT_LAST is the last power-of-2 value used + 1, so to
1: -	 * get all possible values we compensate last +1, and then (2*x - 1)
1: -	 * to get the bit mask
1: -	 */
1: -	if (mode != LIBBPF_STRICT_ALL
1: -	    && (mode & ~((__LIBBPF_STRICT_LAST - 1) * 2 - 1)))
1: -		return errno = EINVAL, -EINVAL;
1: +int libbpf_set_strict_mode(enum libbpf_strict_mode mode) {
1: +  /* __LIBBPF_STRICT_LAST is the last power-of-2 value used + 1, so to
1: +   * get all possible values we compensate last +1, and then (2*x - 1)
1: +   * to get the bit mask
1: +   */
1: +  if (mode != LIBBPF_STRICT_ALL &&
1: +      (mode & ~((__LIBBPF_STRICT_LAST - 1) * 2 - 1)))
1: +    return errno = EINVAL, -EINVAL;
1:  
1: -	libbpf_mode = mode;
1: -	return 0;
1: +  libbpf_mode = mode;
1: +  return 0;
1:  }
1:  
1:  enum kern_feature_id {
1: -	/* v4.14: kernel support for program & map names. */
1: -	FEAT_PROG_NAME,
1: -	/* v5.2: kernel support for global data sections. */
1: -	FEAT_GLOBAL_DATA,
1: -	/* BTF support */
1: -	FEAT_BTF,
1: -	/* BTF_KIND_FUNC and BTF_KIND_FUNC_PROTO support */
1: -	FEAT_BTF_FUNC,
1: -	/* BTF_KIND_VAR and BTF_KIND_DATASEC support */
1: -	FEAT_BTF_DATASEC,
1: -	/* BTF_FUNC_GLOBAL is supported */
1: -	FEAT_BTF_GLOBAL_FUNC,
1: -	/* BPF_F_MMAPABLE is supported for arrays */
1: -	FEAT_ARRAY_MMAP,
1: -	/* kernel support for expected_attach_type in BPF_PROG_LOAD */
1: -	FEAT_EXP_ATTACH_TYPE,
1: -	/* bpf_probe_read_{kernel,user}[_str] helpers */
1: -	FEAT_PROBE_READ_KERN,
1: -	/* BPF_PROG_BIND_MAP is supported */
1: -	FEAT_PROG_BIND_MAP,
1: -	/* Kernel support for module BTFs */
1: -	FEAT_MODULE_BTF,
1: -	/* BTF_KIND_FLOAT support */
1: -	FEAT_BTF_FLOAT,
1: -	__FEAT_CNT,
1: +  /* v4.14: kernel support for program & map names. */
1: +  FEAT_PROG_NAME,
1: +  /* v5.2: kernel support for global data sections. */
1: +  FEAT_GLOBAL_DATA,
1: +  /* BTF support */
1: +  FEAT_BTF,
1: +  /* BTF_KIND_FUNC and BTF_KIND_FUNC_PROTO support */
1: +  FEAT_BTF_FUNC,
1: +  /* BTF_KIND_VAR and BTF_KIND_DATASEC support */
1: +  FEAT_BTF_DATASEC,
1: +  /* BTF_FUNC_GLOBAL is supported */
1: +  FEAT_BTF_GLOBAL_FUNC,
1: +  /* BPF_F_MMAPABLE is supported for arrays */
1: +  FEAT_ARRAY_MMAP,
1: +  /* kernel support for expected_attach_type in BPF_PROG_LOAD */
1: +  FEAT_EXP_ATTACH_TYPE,
1: +  /* bpf_probe_read_{kernel,user}[_str] helpers */
1: +  FEAT_PROBE_READ_KERN,
1: +  /* BPF_PROG_BIND_MAP is supported */
1: +  FEAT_PROG_BIND_MAP,
1: +  /* Kernel support for module BTFs */
1: +  FEAT_MODULE_BTF,
1: +  /* BTF_KIND_FLOAT support */
1: +  FEAT_BTF_FLOAT,
1: +  __FEAT_CNT,
1:  };
1:  
1: -static bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id);
1: +static bool kernel_supports(const struct bpf_object *obj,
1: +                            enum kern_feature_id feat_id);
1:  
1:  enum reloc_type {
1: -	RELO_LD64,
1: -	RELO_CALL,
1: -	RELO_DATA,
1: -	RELO_EXTERN_VAR,
1: -	RELO_EXTERN_FUNC,
1: -	RELO_SUBPROG_ADDR,
1: +  RELO_LD64,
1: +  RELO_CALL,
1: +  RELO_DATA,
1: +  RELO_EXTERN_VAR,
1: +  RELO_EXTERN_FUNC,
1: +  RELO_SUBPROG_ADDR,
1:  };
1:  
1:  struct reloc_desc {
1: -	enum reloc_type type;
1: -	int insn_idx;
1: -	int map_idx;
1: -	int sym_off;
1: +  enum reloc_type type;
1: +  int insn_idx;
1: +  int map_idx;
1: +  int sym_off;
1:  };
1:  
1:  struct bpf_sec_def;
1:  
1:  typedef struct bpf_link *(*attach_fn_t)(const struct bpf_sec_def *sec,
1: -					struct bpf_program *prog);
1: +                                        struct bpf_program *prog);
1:  
1:  struct bpf_sec_def {
1: -	const char *sec;
1: -	size_t len;
1: -	enum bpf_prog_type prog_type;
1: -	enum bpf_attach_type expected_attach_type;
1: -	bool is_exp_attach_type_optional;
1: -	bool is_attachable;
1: -	bool is_attach_btf;
1: -	bool is_sleepable;
1: -	attach_fn_t attach_fn;
1: +  const char *sec;
1: +  size_t len;
1: +  enum bpf_prog_type prog_type;
1: +  enum bpf_attach_type expected_attach_type;
1: +  bool is_exp_attach_type_optional;
1: +  bool is_attachable;
1: +  bool is_attach_btf;
1: +  bool is_sleepable;
1: +  attach_fn_t attach_fn;
1:  };
1:  
1:  /*
1: @@ -236,97 +241,97 @@ struct bpf_sec_def {
1:   * linux/filter.h.
1:   */
1:  struct bpf_program {
1: -	const struct bpf_sec_def *sec_def;
1: -	char *sec_name;
1: -	size_t sec_idx;
1: -	/* this program's instruction offset (in number of instructions)
1: -	 * within its containing ELF section
1: -	 */
1: -	size_t sec_insn_off;
1: -	/* number of original instructions in ELF section belonging to this
1: -	 * program, not taking into account subprogram instructions possible
1: -	 * appended later during relocation
1: -	 */
1: -	size_t sec_insn_cnt;
1: -	/* Offset (in number of instructions) of the start of instruction
1: -	 * belonging to this BPF program  within its containing main BPF
1: -	 * program. For the entry-point (main) BPF program, this is always
1: -	 * zero. For a sub-program, this gets reset before each of main BPF
1: -	 * programs are processed and relocated and is used to determined
1: -	 * whether sub-program was already appended to the main program, and
1: -	 * if yes, at which instruction offset.
1: -	 */
1: -	size_t sub_insn_off;
1: -
1: -	char *name;
1: -	/* sec_name with / replaced by _; makes recursive pinning
1: -	 * in bpf_object__pin_programs easier
1: -	 */
1: -	char *pin_name;
1: -
1: -	/* instructions that belong to BPF program; insns[0] is located at
1: -	 * sec_insn_off instruction within its ELF section in ELF file, so
1: -	 * when mapping ELF file instruction index to the local instruction,
1: -	 * one needs to subtract sec_insn_off; and vice versa.
1: -	 */
1: -	struct bpf_insn *insns;
1: -	/* actual number of instruction in this BPF program's image; for
1: -	 * entry-point BPF programs this includes the size of main program
1: -	 * itself plus all the used sub-programs, appended at the end
1: -	 */
1: -	size_t insns_cnt;
1: -
1: -	struct reloc_desc *reloc_desc;
1: -	int nr_reloc;
1: -	int log_level;
1: -
1: -	struct {
1: -		int nr;
1: -		int *fds;
1: -	} instances;
1: -	bpf_program_prep_t preprocessor;
1: -
1: -	struct bpf_object *obj;
1: -	void *priv;
1: -	bpf_program_clear_priv_t clear_priv;
1: -
1: -	bool load;
1: -	bool mark_btf_static;
1: -	enum bpf_prog_type type;
1: -	enum bpf_attach_type expected_attach_type;
1: -	int prog_ifindex;
1: -	__u32 attach_btf_obj_fd;
1: -	__u32 attach_btf_id;
1: -	__u32 attach_prog_fd;
1: -	void *func_info;
1: -	__u32 func_info_rec_size;
1: -	__u32 func_info_cnt;
1: -
1: -	void *line_info;
1: -	__u32 line_info_rec_size;
1: -	__u32 line_info_cnt;
1: -	__u32 prog_flags;
1: +  const struct bpf_sec_def *sec_def;
1: +  char *sec_name;
1: +  size_t sec_idx;
1: +  /* this program's instruction offset (in number of instructions)
1: +   * within its containing ELF section
1: +   */
1: +  size_t sec_insn_off;
1: +  /* number of original instructions in ELF section belonging to this
1: +   * program, not taking into account subprogram instructions possible
1: +   * appended later during relocation
1: +   */
1: +  size_t sec_insn_cnt;
1: +  /* Offset (in number of instructions) of the start of instruction
1: +   * belonging to this BPF program  within its containing main BPF
1: +   * program. For the entry-point (main) BPF program, this is always
1: +   * zero. For a sub-program, this gets reset before each of main BPF
1: +   * programs are processed and relocated and is used to determined
1: +   * whether sub-program was already appended to the main program, and
1: +   * if yes, at which instruction offset.
1: +   */
1: +  size_t sub_insn_off;
1: +
1: +  char *name;
1: +  /* sec_name with / replaced by _; makes recursive pinning
1: +   * in bpf_object__pin_programs easier
1: +   */
1: +  char *pin_name;
1: +
1: +  /* instructions that belong to BPF program; insns[0] is located at
1: +   * sec_insn_off instruction within its ELF section in ELF file, so
1: +   * when mapping ELF file instruction index to the local instruction,
1: +   * one needs to subtract sec_insn_off; and vice versa.
1: +   */
1: +  struct bpf_insn *insns;
1: +  /* actual number of instruction in this BPF program's image; for
1: +   * entry-point BPF programs this includes the size of main program
1: +   * itself plus all the used sub-programs, appended at the end
1: +   */
1: +  size_t insns_cnt;
1: +
1: +  struct reloc_desc *reloc_desc;
1: +  int nr_reloc;
1: +  int log_level;
1: +
1: +  struct {
1: +    int nr;
1: +    int *fds;
1: +  } instances;
1: +  bpf_program_prep_t preprocessor;
1: +
1: +  struct bpf_object *obj;
1: +  void *priv;
1: +  bpf_program_clear_priv_t clear_priv;
1: +
1: +  bool load;
1: +  bool mark_btf_static;
1: +  enum bpf_prog_type type;
1: +  enum bpf_attach_type expected_attach_type;
1: +  int prog_ifindex;
1: +  __u32 attach_btf_obj_fd;
1: +  __u32 attach_btf_id;
1: +  __u32 attach_prog_fd;
1: +  void *func_info;
1: +  __u32 func_info_rec_size;
1: +  __u32 func_info_cnt;
1: +
1: +  void *line_info;
1: +  __u32 line_info_rec_size;
1: +  __u32 line_info_cnt;
1: +  __u32 prog_flags;
1:  };
1:  
1:  struct bpf_struct_ops {
1: -	const char *tname;
1: -	const struct btf_type *type;
1: -	struct bpf_program **progs;
1: -	__u32 *kern_func_off;
1: -	/* e.g. struct tcp_congestion_ops in bpf_prog's btf format */
1: -	void *data;
1: -	/* e.g. struct bpf_struct_ops_tcp_congestion_ops in
1: -	 *      btf_vmlinux's format.
1: -	 * struct bpf_struct_ops_tcp_congestion_ops {
1: -	 *	[... some other kernel fields ...]
1: -	 *	struct tcp_congestion_ops data;
1: -	 * }
1: -	 * kern_vdata-size == sizeof(struct bpf_struct_ops_tcp_congestion_ops)
1: -	 * bpf_map__init_kern_struct_ops() will populate the "kern_vdata"
1: -	 * from "data".
1: -	 */
1: -	void *kern_vdata;
1: -	__u32 type_id;
1: +  const char *tname;
1: +  const struct btf_type *type;
1: +  struct bpf_program **progs;
1: +  __u32 *kern_func_off;
1: +  /* e.g. struct tcp_congestion_ops in bpf_prog's btf format */
1: +  void *data;
1: +  /* e.g. struct bpf_struct_ops_tcp_congestion_ops in
1: +   *      btf_vmlinux's format.
1: +   * struct bpf_struct_ops_tcp_congestion_ops {
1: +   *	[... some other kernel fields ...]
1: +   *	struct tcp_congestion_ops data;
1: +   * }
1: +   * kern_vdata-size == sizeof(struct bpf_struct_ops_tcp_congestion_ops)
1: +   * bpf_map__init_kern_struct_ops() will populate the "kern_vdata"
1: +   * from "data".
1: +   */
1: +  void *kern_vdata;
1: +  __u32 type_id;
1:  };
1:  
1:  #define DATA_SEC ".data"
1: @@ -337,1662 +342,1637 @@ struct bpf_struct_ops {
1:  #define STRUCT_OPS_SEC ".struct_ops"
1:  
1:  enum libbpf_map_type {
1: -	LIBBPF_MAP_UNSPEC,
1: -	LIBBPF_MAP_DATA,
1: -	LIBBPF_MAP_BSS,
1: -	LIBBPF_MAP_RODATA,
1: -	LIBBPF_MAP_KCONFIG,
1: +  LIBBPF_MAP_UNSPEC,
1: +  LIBBPF_MAP_DATA,
1: +  LIBBPF_MAP_BSS,
1: +  LIBBPF_MAP_RODATA,
1: +  LIBBPF_MAP_KCONFIG,
1:  };
1:  
1: -static const char * const libbpf_type_to_btf_name[] = {
1: -	[LIBBPF_MAP_DATA]	= DATA_SEC,
1: -	[LIBBPF_MAP_BSS]	= BSS_SEC,
1: -	[LIBBPF_MAP_RODATA]	= RODATA_SEC,
1: -	[LIBBPF_MAP_KCONFIG]	= KCONFIG_SEC,
1: +static const char *const libbpf_type_to_btf_name[] = {
1: +        [LIBBPF_MAP_DATA] = DATA_SEC, [LIBBPF_MAP_BSS] = BSS_SEC,
1: +        [LIBBPF_MAP_RODATA] = RODATA_SEC, [LIBBPF_MAP_KCONFIG] = KCONFIG_SEC,
1:  };
1:  
1:  struct bpf_map {
1: -	char *name;
1: -	int fd;
1: -	int sec_idx;
1: -	size_t sec_offset;
1: -	int map_ifindex;
1: -	int inner_map_fd;
1: -	struct bpf_map_def def;
1: -	__u32 numa_node;
1: -	__u32 btf_var_idx;
1: -	__u32 btf_key_type_id;
1: -	__u32 btf_value_type_id;
1: -	__u32 btf_vmlinux_value_type_id;
1: -	void *priv;
1: -	bpf_map_clear_priv_t clear_priv;
1: -	enum libbpf_map_type libbpf_type;
1: -	void *mmaped;
1: -	struct bpf_struct_ops *st_ops;
1: -	struct bpf_map *inner_map;
1: -	void **init_slots;
1: -	int init_slots_sz;
1: -	char *pin_path;
1: -	bool pinned;
1: -	bool reused;
1: +  char *name;
1: +  int fd;
1: +  int sec_idx;
1: +  size_t sec_offset;
1: +  int map_ifindex;
1: +  int inner_map_fd;
1: +  struct bpf_map_def def;
1: +  __u32 numa_node;
1: +  __u32 btf_var_idx;
1: +  __u32 btf_key_type_id;
1: +  __u32 btf_value_type_id;
1: +  __u32 btf_vmlinux_value_type_id;
1: +  void *priv;
1: +  bpf_map_clear_priv_t clear_priv;
1: +  enum libbpf_map_type libbpf_type;
1: +  void *mmaped;
1: +  struct bpf_struct_ops *st_ops;
1: +  struct bpf_map *inner_map;
1: +  void **init_slots;
1: +  int init_slots_sz;
1: +  char *pin_path;
1: +  bool pinned;
1: +  bool reused;
1:  };
1:  
1:  enum extern_type {
1: -	EXT_UNKNOWN,
1: -	EXT_KCFG,
1: -	EXT_KSYM,
1: +  EXT_UNKNOWN,
1: +  EXT_KCFG,
1: +  EXT_KSYM,
1:  };
1:  
1:  enum kcfg_type {
1: -	KCFG_UNKNOWN,
1: -	KCFG_CHAR,
1: -	KCFG_BOOL,
1: -	KCFG_INT,
1: -	KCFG_TRISTATE,
1: -	KCFG_CHAR_ARR,
1: +  KCFG_UNKNOWN,
1: +  KCFG_CHAR,
1: +  KCFG_BOOL,
1: +  KCFG_INT,
1: +  KCFG_TRISTATE,
1: +  KCFG_CHAR_ARR,
1:  };
1:  
1:  struct extern_desc {
1: -	enum extern_type type;
1: -	int sym_idx;
1: -	int btf_id;
1: -	int sec_btf_id;
1: -	const char *name;
1: -	bool is_set;
1: -	bool is_weak;
1: -	union {
1: -		struct {
1: -			enum kcfg_type type;
1: -			int sz;
1: -			int align;
1: -			int data_off;
1: -			bool is_signed;
1: -		} kcfg;
1: -		struct {
1: -			unsigned long long addr;
1: -
1: -			/* target btf_id of the corresponding kernel var. */
1: -			int kernel_btf_obj_fd;
1: -			int kernel_btf_id;
1: -
1: -			/* local btf_id of the ksym extern's type. */
1: -			__u32 type_id;
1: -		} ksym;
1: -	};
1: +  enum extern_type type;
1: +  int sym_idx;
1: +  int btf_id;
1: +  int sec_btf_id;
1: +  const char *name;
1: +  bool is_set;
1: +  bool is_weak;
1: +  union {
1: +    struct {
1: +      enum kcfg_type type;
1: +      int sz;
1: +      int align;
1: +      int data_off;
1: +      bool is_signed;
1: +    } kcfg;
1: +    struct {
1: +      unsigned long long addr;
1: +
1: +      /* target btf_id of the corresponding kernel var. */
1: +      int kernel_btf_obj_fd;
1: +      int kernel_btf_id;
1: +
1: +      /* local btf_id of the ksym extern's type. */
1: +      __u32 type_id;
1: +    } ksym;
1: +  };
1:  };
1:  
1:  static LIST_HEAD(bpf_objects_list);
1:  
1:  struct module_btf {
1: -	struct btf *btf;
1: -	char *name;
1: -	__u32 id;
1: -	int fd;
1: +  struct btf *btf;
1: +  char *name;
1: +  __u32 id;
1: +  int fd;
1:  };
1:  
1:  struct bpf_object {
1: -	char name[BPF_OBJ_NAME_LEN];
1: -	char license[64];
1: -	__u32 kern_version;
1: -
1: -	struct bpf_program *programs;
1: -	size_t nr_programs;
1: -	struct bpf_map *maps;
1: -	size_t nr_maps;
1: -	size_t maps_cap;
1: -
1: -	char *kconfig;
1: -	struct extern_desc *externs;
1: -	int nr_extern;
1: -	int kconfig_map_idx;
1: -	int rodata_map_idx;
1: -
1: -	bool loaded;
1: -	bool has_subcalls;
1: -
1: -	struct bpf_gen *gen_loader;
1: -
1: -	/*
1: -	 * Information when doing elf related work. Only valid if fd
1: -	 * is valid.
1: -	 */
1: -	struct {
1: -		int fd;
1: -		const void *obj_buf;
1: -		size_t obj_buf_sz;
1: -		Elf *elf;
1: -		GElf_Ehdr ehdr;
1: -		Elf_Data *symbols;
1: -		Elf_Data *data;
1: -		Elf_Data *rodata;
1: -		Elf_Data *bss;
1: -		Elf_Data *st_ops_data;
1: -		size_t shstrndx; /* section index for section name strings */
1: -		size_t strtabidx;
1: -		struct {
1: -			GElf_Shdr shdr;
1: -			Elf_Data *data;
1: -		} *reloc_sects;
1: -		int nr_reloc_sects;
1: -		int maps_shndx;
1: -		int btf_maps_shndx;
1: -		__u32 btf_maps_sec_btf_id;
1: -		int text_shndx;
1: -		int symbols_shndx;
1: -		int data_shndx;
1: -		int rodata_shndx;
1: -		int bss_shndx;
1: -		int st_ops_shndx;
1: -	} efile;
1: -	/*
1: -	 * All loaded bpf_object is linked in a list, which is
1: -	 * hidden to caller. bpf_objects__<func> handlers deal with
1: -	 * all objects.
1: -	 */
1: -	struct list_head list;
1: -
1: -	struct btf *btf;
1: -	struct btf_ext *btf_ext;
1: -
1: -	/* Parse and load BTF vmlinux if any of the programs in the object need
1: -	 * it at load time.
1: -	 */
1: -	struct btf *btf_vmlinux;
1: -	/* vmlinux BTF override for CO-RE relocations */
1: -	struct btf *btf_vmlinux_override;
1: -	/* Lazily initialized kernel module BTFs */
1: -	struct module_btf *btf_modules;
1: -	bool btf_modules_loaded;
1: -	size_t btf_module_cnt;
1: -	size_t btf_module_cap;
1: -
1: -	void *priv;
1: -	bpf_object_clear_priv_t clear_priv;
1: -
1: -	char path[];
1: +  char name[BPF_OBJ_NAME_LEN];
1: +  char license[64];
1: +  __u32 kern_version;
1: +
1: +  struct bpf_program *programs;
1: +  size_t nr_programs;
1: +  struct bpf_map *maps;
1: +  size_t nr_maps;
1: +  size_t maps_cap;
1: +
1: +  char *kconfig;
1: +  struct extern_desc *externs;
1: +  int nr_extern;
1: +  int kconfig_map_idx;
1: +  int rodata_map_idx;
1: +
1: +  bool loaded;
1: +  bool has_subcalls;
1: +
1: +  struct bpf_gen *gen_loader;
1: +
1: +  /*
1: +   * Information when doing elf related work. Only valid if fd
1: +   * is valid.
1: +   */
1: +  struct {
1: +    int fd;
1: +    const void *obj_buf;
1: +    size_t obj_buf_sz;
1: +    Elf *elf;
1: +    GElf_Ehdr ehdr;
1: +    Elf_Data *symbols;
1: +    Elf_Data *data;
1: +    Elf_Data *rodata;
1: +    Elf_Data *bss;
1: +    Elf_Data *st_ops_data;
1: +    size_t shstrndx; /* section index for section name strings */
1: +    size_t strtabidx;
1: +    struct {
1: +      GElf_Shdr shdr;
1: +      Elf_Data *data;
1: +    } * reloc_sects;
1: +    int nr_reloc_sects;
1: +    int maps_shndx;
1: +    int btf_maps_shndx;
1: +    __u32 btf_maps_sec_btf_id;
1: +    int text_shndx;
1: +    int symbols_shndx;
1: +    int data_shndx;
1: +    int rodata_shndx;
1: +    int bss_shndx;
1: +    int st_ops_shndx;
1: +  } efile;
1: +  /*
1: +   * All loaded bpf_object is linked in a list, which is
1: +   * hidden to caller. bpf_objects__<func> handlers deal with
1: +   * all objects.
1: +   */
1: +  struct list_head list;
1: +
1: +  struct btf *btf;
1: +  struct btf_ext *btf_ext;
1: +
1: +  /* Parse and load BTF vmlinux if any of the programs in the object need
1: +   * it at load time.
1: +   */
1: +  struct btf *btf_vmlinux;
1: +  /* vmlinux BTF override for CO-RE relocations */
1: +  struct btf *btf_vmlinux_override;
1: +  /* Lazily initialized kernel module BTFs */
1: +  struct module_btf *btf_modules;
1: +  bool btf_modules_loaded;
1: +  size_t btf_module_cnt;
1: +  size_t btf_module_cap;
1: +
1: +  void *priv;
1: +  bpf_object_clear_priv_t clear_priv;
1: +
1: +  char path[];
1:  };
1: -#define obj_elf_valid(o)	((o)->efile.elf)
1: +#define obj_elf_valid(o) ((o)->efile.elf)
1:  
1:  static const char *elf_sym_str(const struct bpf_object *obj, size_t off);
1:  static const char *elf_sec_str(const struct bpf_object *obj, size_t off);
1:  static Elf_Scn *elf_sec_by_idx(const struct bpf_object *obj, size_t idx);
1:  static Elf_Scn *elf_sec_by_name(const struct bpf_object *obj, const char *name);
1: -static int elf_sec_hdr(const struct bpf_object *obj, Elf_Scn *scn, GElf_Shdr *hdr);
1: +static int elf_sec_hdr(const struct bpf_object *obj, Elf_Scn *scn,
1: +                       GElf_Shdr *hdr);
1:  static const char *elf_sec_name(const struct bpf_object *obj, Elf_Scn *scn);
1:  static Elf_Data *elf_sec_data(const struct bpf_object *obj, Elf_Scn *scn);
1:  
1: -void bpf_program__unload(struct bpf_program *prog)
1: -{
1: -	int i;
1: +void bpf_program__unload(struct bpf_program *prog) {
1: +  int i;
1:  
1: -	if (!prog)
1: -		return;
1: +  if (!prog)
1: +    return;
1:  
1: -	/*
1: -	 * If the object is opened but the program was never loaded,
1: -	 * it is possible that prog->instances.nr == -1.
1: -	 */
1: -	if (prog->instances.nr > 0) {
1: -		for (i = 0; i < prog->instances.nr; i++)
1: -			zclose(prog->instances.fds[i]);
1: -	} else if (prog->instances.nr != -1) {
1: -		pr_warn("Internal error: instances.nr is %d\n",
1: -			prog->instances.nr);
1: -	}
1: +  /*
1: +   * If the object is opened but the program was never loaded,
1: +   * it is possible that prog->instances.nr == -1.
1: +   */
1: +  if (prog->instances.nr > 0) {
1: +    for (i = 0; i < prog->instances.nr; i++)
1: +      zclose(prog->instances.fds[i]);
1: +  } else if (prog->instances.nr != -1) {
1: +    pr_warn("Internal error: instances.nr is %d\n", prog->instances.nr);
1: +  }
1:  
1: -	prog->instances.nr = -1;
1: -	zfree(&prog->instances.fds);
1: +  prog->instances.nr = -1;
1: +  zfree(&prog->instances.fds);
1:  
1: -	zfree(&prog->func_info);
1: -	zfree(&prog->line_info);
1: +  zfree(&prog->func_info);
1: +  zfree(&prog->line_info);
1:  }
1:  
1: -static void bpf_program__exit(struct bpf_program *prog)
1: -{
1: -	if (!prog)
1: -		return;
1: +static void bpf_program__exit(struct bpf_program *prog) {
1: +  if (!prog)
1: +    return;
1:  
1: -	if (prog->clear_priv)
1: -		prog->clear_priv(prog, prog->priv);
1: +  if (prog->clear_priv)
1: +    prog->clear_priv(prog, prog->priv);
1:  
1: -	prog->priv = NULL;
1: -	prog->clear_priv = NULL;
1: +  prog->priv = NULL;
1: +  prog->clear_priv = NULL;
1:  
1: -	bpf_program__unload(prog);
1: -	zfree(&prog->name);
1: -	zfree(&prog->sec_name);
1: -	zfree(&prog->pin_name);
1: -	zfree(&prog->insns);
1: -	zfree(&prog->reloc_desc);
1: +  bpf_program__unload(prog);
1: +  zfree(&prog->name);
1: +  zfree(&prog->sec_name);
1: +  zfree(&prog->pin_name);
1: +  zfree(&prog->insns);
1: +  zfree(&prog->reloc_desc);
1:  
1: -	prog->nr_reloc = 0;
1: -	prog->insns_cnt = 0;
1: -	prog->sec_idx = -1;
1: +  prog->nr_reloc = 0;
1: +  prog->insns_cnt = 0;
1: +  prog->sec_idx = -1;
1:  }
1:  
1: -static char *__bpf_program__pin_name(struct bpf_program *prog)
1: -{
1: -	char *name, *p;
1: +static char *__bpf_program__pin_name(struct bpf_program *prog) {
1: +  char *name, *p;
1:  
1: -	name = p = strdup(prog->sec_name);
1: -	while ((p = strchr(p, '/')))
1: -		*p = '_';
1: +  name = p = strdup(prog->sec_name);
1: +  while ((p = strchr(p, '/')))
1: +    *p = '_';
1:  
1: -	return name;
1: +  return name;
1:  }
1:  
1: -static bool insn_is_subprog_call(const struct bpf_insn *insn)
1: -{
1: -	return BPF_CLASS(insn->code) == BPF_JMP &&
1: -	       BPF_OP(insn->code) == BPF_CALL &&
1: -	       BPF_SRC(insn->code) == BPF_K &&
1: -	       insn->src_reg == BPF_PSEUDO_CALL &&
1: -	       insn->dst_reg == 0 &&
1: -	       insn->off == 0;
1: +static bool insn_is_subprog_call(const struct bpf_insn *insn) {
1: +  return BPF_CLASS(insn->code) == BPF_JMP && BPF_OP(insn->code) == BPF_CALL &&
1: +         BPF_SRC(insn->code) == BPF_K && insn->src_reg == BPF_PSEUDO_CALL &&
1: +         insn->dst_reg == 0 && insn->off == 0;
1:  }
1:  
1: -static bool is_ldimm64_insn(struct bpf_insn *insn)
1: -{
1: -	return insn->code == (BPF_LD | BPF_IMM | BPF_DW);
1: +static bool is_ldimm64_insn(struct bpf_insn *insn) {
1: +  return insn->code == (BPF_LD | BPF_IMM | BPF_DW);
1:  }
1:  
1: -static bool is_call_insn(const struct bpf_insn *insn)
1: -{
1: -	return insn->code == (BPF_JMP | BPF_CALL);
1: +static bool is_call_insn(const struct bpf_insn *insn) {
1: +  return insn->code == (BPF_JMP | BPF_CALL);
1:  }
1:  
1: -static bool insn_is_pseudo_func(struct bpf_insn *insn)
1: -{
1: -	return is_ldimm64_insn(insn) && insn->src_reg == BPF_PSEUDO_FUNC;
1: +static bool insn_is_pseudo_func(struct bpf_insn *insn) {
1: +  return is_ldimm64_insn(insn) && insn->src_reg == BPF_PSEUDO_FUNC;
1:  }
1:  
1: -static int
1: -bpf_object__init_prog(struct bpf_object *obj, struct bpf_program *prog,
1: -		      const char *name, size_t sec_idx, const char *sec_name,
1: -		      size_t sec_off, void *insn_data, size_t insn_data_sz)
1: -{
1: -	if (insn_data_sz == 0 || insn_data_sz % BPF_INSN_SZ || sec_off % BPF_INSN_SZ) {
1: -		pr_warn("sec '%s': corrupted program '%s', offset %zu, size %zu\n",
1: -			sec_name, name, sec_off, insn_data_sz);
1: -		return -EINVAL;
1: -	}
1: +static int bpf_object__init_prog(struct bpf_object *obj,
1: +                                 struct bpf_program *prog, const char *name,
1: +                                 size_t sec_idx, const char *sec_name,
1: +                                 size_t sec_off, void *insn_data,
1: +                                 size_t insn_data_sz) {
1: +  if (insn_data_sz == 0 || insn_data_sz % BPF_INSN_SZ ||
1: +      sec_off % BPF_INSN_SZ) {
1: +    pr_warn("sec '%s': corrupted program '%s', offset %zu, size %zu\n",
1: +            sec_name, name, sec_off, insn_data_sz);
1: +    return -EINVAL;
1: +  }
1:  
1: -	memset(prog, 0, sizeof(*prog));
1: -	prog->obj = obj;
1: +  memset(prog, 0, sizeof(*prog));
1: +  prog->obj = obj;
1:  
1: -	prog->sec_idx = sec_idx;
1: -	prog->sec_insn_off = sec_off / BPF_INSN_SZ;
1: -	prog->sec_insn_cnt = insn_data_sz / BPF_INSN_SZ;
1: -	/* insns_cnt can later be increased by appending used subprograms */
1: -	prog->insns_cnt = prog->sec_insn_cnt;
1: +  prog->sec_idx = sec_idx;
1: +  prog->sec_insn_off = sec_off / BPF_INSN_SZ;
1: +  prog->sec_insn_cnt = insn_data_sz / BPF_INSN_SZ;
1: +  /* insns_cnt can later be increased by appending used subprograms */
1: +  prog->insns_cnt = prog->sec_insn_cnt;
1:  
1: -	prog->type = BPF_PROG_TYPE_UNSPEC;
1: -	prog->load = true;
1: +  prog->type = BPF_PROG_TYPE_UNSPEC;
1: +  prog->load = true;
1:  
1: -	prog->instances.fds = NULL;
1: -	prog->instances.nr = -1;
1: +  prog->instances.fds = NULL;
1: +  prog->instances.nr = -1;
1:  
1: -	prog->sec_name = strdup(sec_name);
1: -	if (!prog->sec_name)
1: -		goto errout;
1: +  prog->sec_name = strdup(sec_name);
1: +  if (!prog->sec_name)
1: +    goto errout;
1:  
1: -	prog->name = strdup(name);
1: -	if (!prog->name)
1: -		goto errout;
1: +  prog->name = strdup(name);
1: +  if (!prog->name)
1: +    goto errout;
1:  
1: -	prog->pin_name = __bpf_program__pin_name(prog);
1: -	if (!prog->pin_name)
1: -		goto errout;
1: +  prog->pin_name = __bpf_program__pin_name(prog);
1: +  if (!prog->pin_name)
1: +    goto errout;
1:  
1: -	prog->insns = malloc(insn_data_sz);
1: -	if (!prog->insns)
1: -		goto errout;
1: -	memcpy(prog->insns, insn_data, insn_data_sz);
1: +  prog->insns = malloc(insn_data_sz);
1: +  if (!prog->insns)
1: +    goto errout;
1: +  memcpy(prog->insns, insn_data, insn_data_sz);
1:  
1: -	return 0;
1: +  return 0;
1:  errout:
1: -	pr_warn("sec '%s': failed to allocate memory for prog '%s'\n", sec_name, name);
1: -	bpf_program__exit(prog);
1: -	return -ENOMEM;
1: -}
1: -
1: -static int
1: -bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,
1: -			 const char *sec_name, int sec_idx)
1: -{
1: -	Elf_Data *symbols = obj->efile.symbols;
1: -	struct bpf_program *prog, *progs;
1: -	void *data = sec_data->d_buf;
1: -	size_t sec_sz = sec_data->d_size, sec_off, prog_sz, nr_syms;
1: -	int nr_progs, err, i;
1: -	const char *name;
1: -	GElf_Sym sym;
1: -
1: -	progs = obj->programs;
1: -	nr_progs = obj->nr_programs;
1: -	nr_syms = symbols->d_size / sizeof(GElf_Sym);
1: -	sec_off = 0;
1: -
1: -	for (i = 0; i < nr_syms; i++) {
1: -		if (!gelf_getsym(symbols, i, &sym))
1: -			continue;
1: -		if (sym.st_shndx != sec_idx)
1: -			continue;
1: -		if (GELF_ST_TYPE(sym.st_info) != STT_FUNC)
1: -			continue;
1: -
1: -		prog_sz = sym.st_size;
1: -		sec_off = sym.st_value;
1: -
1: -		name = elf_sym_str(obj, sym.st_name);
1: -		if (!name) {
1: -			pr_warn("sec '%s': failed to get symbol name for offset %zu\n",
1: -				sec_name, sec_off);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		if (sec_off + prog_sz > sec_sz) {
1: -			pr_warn("sec '%s': program at offset %zu crosses section boundary\n",
1: -				sec_name, sec_off);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		if (sec_idx != obj->efile.text_shndx && GELF_ST_BIND(sym.st_info) == STB_LOCAL) {
1: -			pr_warn("sec '%s': program '%s' is static and not supported\n", sec_name, name);
1: -			return -ENOTSUP;
1: -		}
1: -
1: -		pr_debug("sec '%s': found program '%s' at insn offset %zu (%zu bytes), code size %zu insns (%zu bytes)\n",
1: -			 sec_name, name, sec_off / BPF_INSN_SZ, sec_off, prog_sz / BPF_INSN_SZ, prog_sz);
1: -
1: -		progs = libbpf_reallocarray(progs, nr_progs + 1, sizeof(*progs));
1: -		if (!progs) {
1: -			/*
1: -			 * In this case the original obj->programs
1: -			 * is still valid, so don't need special treat for
1: -			 * bpf_close_object().
1: -			 */
1: -			pr_warn("sec '%s': failed to alloc memory for new program '%s'\n",
1: -				sec_name, name);
1: -			return -ENOMEM;
1: -		}
1: -		obj->programs = progs;
1: -
1: -		prog = &progs[nr_progs];
1: -
1: -		err = bpf_object__init_prog(obj, prog, name, sec_idx, sec_name,
1: -					    sec_off, data + sec_off, prog_sz);
1: -		if (err)
1: -			return err;
1: -
1: -		/* if function is a global/weak symbol, but has restricted
1: -		 * (STV_HIDDEN or STV_INTERNAL) visibility, mark its BTF FUNC
1: -		 * as static to enable more permissive BPF verification mode
1: -		 * with more outside context available to BPF verifier
1: -		 */
1: -		if (GELF_ST_BIND(sym.st_info) != STB_LOCAL
1: -		    && (GELF_ST_VISIBILITY(sym.st_other) == STV_HIDDEN
1: -			|| GELF_ST_VISIBILITY(sym.st_other) == STV_INTERNAL))
1: -			prog->mark_btf_static = true;
1: -
1: -		nr_progs++;
1: -		obj->nr_programs = nr_progs;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static __u32 get_kernel_version(void)
1: -{
1: -	__u32 major, minor, patch;
1: -	struct utsname info;
1: -
1: -	uname(&info);
1: -	if (sscanf(info.release, "%u.%u.%u", &major, &minor, &patch) != 3)
1: -		return 0;
1: -	return KERNEL_VERSION(major, minor, patch);
1: -}
1: -
1: -static const struct btf_member *
1: -find_member_by_offset(const struct btf_type *t, __u32 bit_offset)
1: -{
1: -	struct btf_member *m;
1: -	int i;
1: -
1: -	for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
1: -		if (btf_member_bit_offset(t, i) == bit_offset)
1: -			return m;
1: -	}
1: -
1: -	return NULL;
1: -}
1: -
1: -static const struct btf_member *
1: -find_member_by_name(const struct btf *btf, const struct btf_type *t,
1: -		    const char *name)
1: -{
1: -	struct btf_member *m;
1: -	int i;
1: -
1: -	for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
1: -		if (!strcmp(btf__name_by_offset(btf, m->name_off), name))
1: -			return m;
1: -	}
1: -
1: -	return NULL;
1: +  pr_warn("sec '%s': failed to allocate memory for prog '%s'\n", sec_name,
1: +          name);
1: +  bpf_program__exit(prog);
1: +  return -ENOMEM;
1: +}
1: +
1: +static int bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,
1: +                                    const char *sec_name, int sec_idx) {
1: +  Elf_Data *symbols = obj->efile.symbols;
1: +  struct bpf_program *prog, *progs;
1: +  void *data = sec_data->d_buf;
1: +  size_t sec_sz = sec_data->d_size, sec_off, prog_sz, nr_syms;
1: +  int nr_progs, err, i;
1: +  const char *name;
1: +  GElf_Sym sym;
1: +
1: +  progs = obj->programs;
1: +  nr_progs = obj->nr_programs;
1: +  nr_syms = symbols->d_size / sizeof(GElf_Sym);
1: +  sec_off = 0;
1: +
1: +  for (i = 0; i < nr_syms; i++) {
1: +    if (!gelf_getsym(symbols, i, &sym))
1: +      continue;
1: +    if (sym.st_shndx != sec_idx)
1: +      continue;
1: +    if (GELF_ST_TYPE(sym.st_info) != STT_FUNC)
1: +      continue;
1: +
1: +    prog_sz = sym.st_size;
1: +    sec_off = sym.st_value;
1: +
1: +    name = elf_sym_str(obj, sym.st_name);
1: +    if (!name) {
1: +      pr_warn("sec '%s': failed to get symbol name for offset %zu\n", sec_name,
1: +              sec_off);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    if (sec_off + prog_sz > sec_sz) {
1: +      pr_warn("sec '%s': program at offset %zu crosses section boundary\n",
1: +              sec_name, sec_off);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    if (sec_idx != obj->efile.text_shndx &&
1: +        GELF_ST_BIND(sym.st_info) == STB_LOCAL) {
1: +      pr_warn("sec '%s': program '%s' is static and not supported\n", sec_name,
1: +              name);
1: +      return -ENOTSUP;
1: +    }
1: +
1: +    pr_debug(
1: +        "sec '%s': found program '%s' at insn offset %zu (%zu bytes), code "
1: +        "size %zu insns (%zu bytes)\n",
1: +        sec_name, name, sec_off / BPF_INSN_SZ, sec_off, prog_sz / BPF_INSN_SZ,
1: +        prog_sz);
1: +
1: +    progs = libbpf_reallocarray(progs, nr_progs + 1, sizeof(*progs));
1: +    if (!progs) {
1: +      /*
1: +       * In this case the original obj->programs
1: +       * is still valid, so don't need special treat for
1: +       * bpf_close_object().
1: +       */
1: +      pr_warn("sec '%s': failed to alloc memory for new program '%s'\n",
1: +              sec_name, name);
1: +      return -ENOMEM;
1: +    }
1: +    obj->programs = progs;
1: +
1: +    prog = &progs[nr_progs];
1: +
1: +    err = bpf_object__init_prog(obj, prog, name, sec_idx, sec_name, sec_off,
1: +                                data + sec_off, prog_sz);
1: +    if (err)
1: +      return err;
1: +
1: +    /* if function is a global/weak symbol, but has restricted
1: +     * (STV_HIDDEN or STV_INTERNAL) visibility, mark its BTF FUNC
1: +     * as static to enable more permissive BPF verification mode
1: +     * with more outside context available to BPF verifier
1: +     */
1: +    if (GELF_ST_BIND(sym.st_info) != STB_LOCAL &&
1: +        (GELF_ST_VISIBILITY(sym.st_other) == STV_HIDDEN ||
1: +         GELF_ST_VISIBILITY(sym.st_other) == STV_INTERNAL))
1: +      prog->mark_btf_static = true;
1: +
1: +    nr_progs++;
1: +    obj->nr_programs = nr_progs;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static __u32 get_kernel_version(void) {
1: +  __u32 major, minor, patch;
1: +  struct utsname info;
1: +
1: +  uname(&info);
1: +  if (sscanf(info.release, "%u.%u.%u", &major, &minor, &patch) != 3)
1: +    return 0;
1: +  return KERNEL_VERSION(major, minor, patch);
1: +}
1: +
1: +static const struct btf_member *find_member_by_offset(const struct btf_type *t,
1: +                                                      __u32 bit_offset) {
1: +  struct btf_member *m;
1: +  int i;
1: +
1: +  for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
1: +    if (btf_member_bit_offset(t, i) == bit_offset)
1: +      return m;
1: +  }
1: +
1: +  return NULL;
1: +}
1: +
1: +static const struct btf_member *find_member_by_name(const struct btf *btf,
1: +                                                    const struct btf_type *t,
1: +                                                    const char *name) {
1: +  struct btf_member *m;
1: +  int i;
1: +
1: +  for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
1: +    if (!strcmp(btf__name_by_offset(btf, m->name_off), name))
1: +      return m;
1: +  }
1: +
1: +  return NULL;
1:  }
1:  
1:  #define STRUCT_OPS_VALUE_PREFIX "bpf_struct_ops_"
1:  static int find_btf_by_prefix_kind(const struct btf *btf, const char *prefix,
1: -				   const char *name, __u32 kind);
1: -
1: -static int
1: -find_struct_ops_kern_types(const struct btf *btf, const char *tname,
1: -			   const struct btf_type **type, __u32 *type_id,
1: -			   const struct btf_type **vtype, __u32 *vtype_id,
1: -			   const struct btf_member **data_member)
1: -{
1: -	const struct btf_type *kern_type, *kern_vtype;
1: -	const struct btf_member *kern_data_member;
1: -	__s32 kern_vtype_id, kern_type_id;
1: -	__u32 i;
1: -
1: -	kern_type_id = btf__find_by_name_kind(btf, tname, BTF_KIND_STRUCT);
1: -	if (kern_type_id < 0) {
1: -		pr_warn("struct_ops init_kern: struct %s is not found in kernel BTF\n",
1: -			tname);
1: -		return kern_type_id;
1: -	}
1: -	kern_type = btf__type_by_id(btf, kern_type_id);
1: -
1: -	/* Find the corresponding "map_value" type that will be used
1: -	 * in map_update(BPF_MAP_TYPE_STRUCT_OPS).  For example,
1: -	 * find "struct bpf_struct_ops_tcp_congestion_ops" from the
1: -	 * btf_vmlinux.
1: -	 */
1: -	kern_vtype_id = find_btf_by_prefix_kind(btf, STRUCT_OPS_VALUE_PREFIX,
1: -						tname, BTF_KIND_STRUCT);
1: -	if (kern_vtype_id < 0) {
1: -		pr_warn("struct_ops init_kern: struct %s%s is not found in kernel BTF\n",
1: -			STRUCT_OPS_VALUE_PREFIX, tname);
1: -		return kern_vtype_id;
1: -	}
1: -	kern_vtype = btf__type_by_id(btf, kern_vtype_id);
1: -
1: -	/* Find "struct tcp_congestion_ops" from
1: -	 * struct bpf_struct_ops_tcp_congestion_ops {
1: -	 *	[ ... ]
1: -	 *	struct tcp_congestion_ops data;
1: -	 * }
1: -	 */
1: -	kern_data_member = btf_members(kern_vtype);
1: -	for (i = 0; i < btf_vlen(kern_vtype); i++, kern_data_member++) {
1: -		if (kern_data_member->type == kern_type_id)
1: -			break;
1: -	}
1: -	if (i == btf_vlen(kern_vtype)) {
1: -		pr_warn("struct_ops init_kern: struct %s data is not found in struct %s%s\n",
1: -			tname, STRUCT_OPS_VALUE_PREFIX, tname);
1: -		return -EINVAL;
1: -	}
1: -
1: -	*type = kern_type;
1: -	*type_id = kern_type_id;
1: -	*vtype = kern_vtype;
1: -	*vtype_id = kern_vtype_id;
1: -	*data_member = kern_data_member;
1: -
1: -	return 0;
1: -}
1: -
1: -static bool bpf_map__is_struct_ops(const struct bpf_map *map)
1: -{
1: -	return map->def.type == BPF_MAP_TYPE_STRUCT_OPS;
1: +                                   const char *name, __u32 kind);
1: +
1: +static int find_struct_ops_kern_types(const struct btf *btf, const char *tname,
1: +                                      const struct btf_type **type,
1: +                                      __u32 *type_id,
1: +                                      const struct btf_type **vtype,
1: +                                      __u32 *vtype_id,
1: +                                      const struct btf_member **data_member) {
1: +  const struct btf_type *kern_type, *kern_vtype;
1: +  const struct btf_member *kern_data_member;
1: +  __s32 kern_vtype_id, kern_type_id;
1: +  __u32 i;
1: +
1: +  kern_type_id = btf__find_by_name_kind(btf, tname, BTF_KIND_STRUCT);
1: +  if (kern_type_id < 0) {
1: +    pr_warn("struct_ops init_kern: struct %s is not found in kernel BTF\n",
1: +            tname);
1: +    return kern_type_id;
1: +  }
1: +  kern_type = btf__type_by_id(btf, kern_type_id);
1: +
1: +  /* Find the corresponding "map_value" type that will be used
1: +   * in map_update(BPF_MAP_TYPE_STRUCT_OPS).  For example,
1: +   * find "struct bpf_struct_ops_tcp_congestion_ops" from the
1: +   * btf_vmlinux.
1: +   */
1: +  kern_vtype_id = find_btf_by_prefix_kind(btf, STRUCT_OPS_VALUE_PREFIX, tname,
1: +                                          BTF_KIND_STRUCT);
1: +  if (kern_vtype_id < 0) {
1: +    pr_warn("struct_ops init_kern: struct %s%s is not found in kernel BTF\n",
1: +            STRUCT_OPS_VALUE_PREFIX, tname);
1: +    return kern_vtype_id;
1: +  }
1: +  kern_vtype = btf__type_by_id(btf, kern_vtype_id);
1: +
1: +  /* Find "struct tcp_congestion_ops" from
1: +   * struct bpf_struct_ops_tcp_congestion_ops {
1: +   *	[ ... ]
1: +   *	struct tcp_congestion_ops data;
1: +   * }
1: +   */
1: +  kern_data_member = btf_members(kern_vtype);
1: +  for (i = 0; i < btf_vlen(kern_vtype); i++, kern_data_member++) {
1: +    if (kern_data_member->type == kern_type_id)
1: +      break;
1: +  }
1: +  if (i == btf_vlen(kern_vtype)) {
1: +    pr_warn(
1: +        "struct_ops init_kern: struct %s data is not found in struct %s%s\n",
1: +        tname, STRUCT_OPS_VALUE_PREFIX, tname);
1: +    return -EINVAL;
1: +  }
1: +
1: +  *type = kern_type;
1: +  *type_id = kern_type_id;
1: +  *vtype = kern_vtype;
1: +  *vtype_id = kern_vtype_id;
1: +  *data_member = kern_data_member;
1: +
1: +  return 0;
1: +}
1: +
1: +static bool bpf_map__is_struct_ops(const struct bpf_map *map) {
1: +  return map->def.type == BPF_MAP_TYPE_STRUCT_OPS;
1:  }
1:  
1:  /* Init the map's fields that depend on kern_btf */
1:  static int bpf_map__init_kern_struct_ops(struct bpf_map *map,
1: -					 const struct btf *btf,
1: -					 const struct btf *kern_btf)
1: -{
1: -	const struct btf_member *member, *kern_member, *kern_data_member;
1: -	const struct btf_type *type, *kern_type, *kern_vtype;
1: -	__u32 i, kern_type_id, kern_vtype_id, kern_data_off;
1: -	struct bpf_struct_ops *st_ops;
1: -	void *data, *kern_data;
1: -	const char *tname;
1: -	int err;
1: -
1: -	st_ops = map->st_ops;
1: -	type = st_ops->type;
1: -	tname = st_ops->tname;
1: -	err = find_struct_ops_kern_types(kern_btf, tname,
1: -					 &kern_type, &kern_type_id,
1: -					 &kern_vtype, &kern_vtype_id,
1: -					 &kern_data_member);
1: -	if (err)
1: -		return err;
1: -
1: -	pr_debug("struct_ops init_kern %s: type_id:%u kern_type_id:%u kern_vtype_id:%u\n",
1: -		 map->name, st_ops->type_id, kern_type_id, kern_vtype_id);
1: -
1: -	map->def.value_size = kern_vtype->size;
1: -	map->btf_vmlinux_value_type_id = kern_vtype_id;
1: -
1: -	st_ops->kern_vdata = calloc(1, kern_vtype->size);
1: -	if (!st_ops->kern_vdata)
1: -		return -ENOMEM;
1: -
1: -	data = st_ops->data;
1: -	kern_data_off = kern_data_member->offset / 8;
1: -	kern_data = st_ops->kern_vdata + kern_data_off;
1: -
1: -	member = btf_members(type);
1: -	for (i = 0; i < btf_vlen(type); i++, member++) {
1: -		const struct btf_type *mtype, *kern_mtype;
1: -		__u32 mtype_id, kern_mtype_id;
1: -		void *mdata, *kern_mdata;
1: -		__s64 msize, kern_msize;
1: -		__u32 moff, kern_moff;
1: -		__u32 kern_member_idx;
1: -		const char *mname;
1: -
1: -		mname = btf__name_by_offset(btf, member->name_off);
1: -		kern_member = find_member_by_name(kern_btf, kern_type, mname);
1: -		if (!kern_member) {
1: -			pr_warn("struct_ops init_kern %s: Cannot find member %s in kernel BTF\n",
1: -				map->name, mname);
1: -			return -ENOTSUP;
1: -		}
1: -
1: -		kern_member_idx = kern_member - btf_members(kern_type);
1: -		if (btf_member_bitfield_size(type, i) ||
1: -		    btf_member_bitfield_size(kern_type, kern_member_idx)) {
1: -			pr_warn("struct_ops init_kern %s: bitfield %s is not supported\n",
1: -				map->name, mname);
1: -			return -ENOTSUP;
1: -		}
1: -
1: -		moff = member->offset / 8;
1: -		kern_moff = kern_member->offset / 8;
1: -
1: -		mdata = data + moff;
1: -		kern_mdata = kern_data + kern_moff;
1: -
1: -		mtype = skip_mods_and_typedefs(btf, member->type, &mtype_id);
1: -		kern_mtype = skip_mods_and_typedefs(kern_btf, kern_member->type,
1: -						    &kern_mtype_id);
1: -		if (BTF_INFO_KIND(mtype->info) !=
1: -		    BTF_INFO_KIND(kern_mtype->info)) {
1: -			pr_warn("struct_ops init_kern %s: Unmatched member type %s %u != %u(kernel)\n",
1: -				map->name, mname, BTF_INFO_KIND(mtype->info),
1: -				BTF_INFO_KIND(kern_mtype->info));
1: -			return -ENOTSUP;
1: -		}
1: -
1: -		if (btf_is_ptr(mtype)) {
1: -			struct bpf_program *prog;
1: -
1: -			prog = st_ops->progs[i];
1: -			if (!prog)
1: -				continue;
1: -
1: -			kern_mtype = skip_mods_and_typedefs(kern_btf,
1: -							    kern_mtype->type,
1: -							    &kern_mtype_id);
1: -
1: -			/* mtype->type must be a func_proto which was
1: -			 * guaranteed in bpf_object__collect_st_ops_relos(),
1: -			 * so only check kern_mtype for func_proto here.
1: -			 */
1: -			if (!btf_is_func_proto(kern_mtype)) {
1: -				pr_warn("struct_ops init_kern %s: kernel member %s is not a func ptr\n",
1: -					map->name, mname);
1: -				return -ENOTSUP;
1: -			}
1: -
1: -			prog->attach_btf_id = kern_type_id;
1: -			prog->expected_attach_type = kern_member_idx;
1: -
1: -			st_ops->kern_func_off[i] = kern_data_off + kern_moff;
1: -
1: -			pr_debug("struct_ops init_kern %s: func ptr %s is set to prog %s from data(+%u) to kern_data(+%u)\n",
1: -				 map->name, mname, prog->name, moff,
1: -				 kern_moff);
1: -
1: -			continue;
1: -		}
1: -
1: -		msize = btf__resolve_size(btf, mtype_id);
1: -		kern_msize = btf__resolve_size(kern_btf, kern_mtype_id);
1: -		if (msize < 0 || kern_msize < 0 || msize != kern_msize) {
1: -			pr_warn("struct_ops init_kern %s: Error in size of member %s: %zd != %zd(kernel)\n",
1: -				map->name, mname, (ssize_t)msize,
1: -				(ssize_t)kern_msize);
1: -			return -ENOTSUP;
1: -		}
1: -
1: -		pr_debug("struct_ops init_kern %s: copy %s %u bytes from data(+%u) to kern_data(+%u)\n",
1: -			 map->name, mname, (unsigned int)msize,
1: -			 moff, kern_moff);
1: -		memcpy(kern_mdata, mdata, msize);
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__init_kern_struct_ops_maps(struct bpf_object *obj)
1: -{
1: -	struct bpf_map *map;
1: -	size_t i;
1: -	int err;
1: -
1: -	for (i = 0; i < obj->nr_maps; i++) {
1: -		map = &obj->maps[i];
1: -
1: -		if (!bpf_map__is_struct_ops(map))
1: -			continue;
1: -
1: -		err = bpf_map__init_kern_struct_ops(map, obj->btf,
1: -						    obj->btf_vmlinux);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__init_struct_ops_maps(struct bpf_object *obj)
1: -{
1: -	const struct btf_type *type, *datasec;
1: -	const struct btf_var_secinfo *vsi;
1: -	struct bpf_struct_ops *st_ops;
1: -	const char *tname, *var_name;
1: -	__s32 type_id, datasec_id;
1: -	const struct btf *btf;
1: -	struct bpf_map *map;
1: -	__u32 i;
1: -
1: -	if (obj->efile.st_ops_shndx == -1)
1: -		return 0;
1: -
1: -	btf = obj->btf;
1: -	datasec_id = btf__find_by_name_kind(btf, STRUCT_OPS_SEC,
1: -					    BTF_KIND_DATASEC);
1: -	if (datasec_id < 0) {
1: -		pr_warn("struct_ops init: DATASEC %s not found\n",
1: -			STRUCT_OPS_SEC);
1: -		return -EINVAL;
1: -	}
1: -
1: -	datasec = btf__type_by_id(btf, datasec_id);
1: -	vsi = btf_var_secinfos(datasec);
1: -	for (i = 0; i < btf_vlen(datasec); i++, vsi++) {
1: -		type = btf__type_by_id(obj->btf, vsi->type);
1: -		var_name = btf__name_by_offset(obj->btf, type->name_off);
1: -
1: -		type_id = btf__resolve_type(obj->btf, vsi->type);
1: -		if (type_id < 0) {
1: -			pr_warn("struct_ops init: Cannot resolve var type_id %u in DATASEC %s\n",
1: -				vsi->type, STRUCT_OPS_SEC);
1: -			return -EINVAL;
1: -		}
1: -
1: -		type = btf__type_by_id(obj->btf, type_id);
1: -		tname = btf__name_by_offset(obj->btf, type->name_off);
1: -		if (!tname[0]) {
1: -			pr_warn("struct_ops init: anonymous type is not supported\n");
1: -			return -ENOTSUP;
1: -		}
1: -		if (!btf_is_struct(type)) {
1: -			pr_warn("struct_ops init: %s is not a struct\n", tname);
1: -			return -EINVAL;
1: -		}
1: -
1: -		map = bpf_object__add_map(obj);
1: -		if (IS_ERR(map))
1: -			return PTR_ERR(map);
1: -
1: -		map->sec_idx = obj->efile.st_ops_shndx;
1: -		map->sec_offset = vsi->offset;
1: -		map->name = strdup(var_name);
1: -		if (!map->name)
1: -			return -ENOMEM;
1: -
1: -		map->def.type = BPF_MAP_TYPE_STRUCT_OPS;
1: -		map->def.key_size = sizeof(int);
1: -		map->def.value_size = type->size;
1: -		map->def.max_entries = 1;
1: -
1: -		map->st_ops = calloc(1, sizeof(*map->st_ops));
1: -		if (!map->st_ops)
1: -			return -ENOMEM;
1: -		st_ops = map->st_ops;
1: -		st_ops->data = malloc(type->size);
1: -		st_ops->progs = calloc(btf_vlen(type), sizeof(*st_ops->progs));
1: -		st_ops->kern_func_off = malloc(btf_vlen(type) *
1: -					       sizeof(*st_ops->kern_func_off));
1: -		if (!st_ops->data || !st_ops->progs || !st_ops->kern_func_off)
1: -			return -ENOMEM;
1: -
1: -		if (vsi->offset + type->size > obj->efile.st_ops_data->d_size) {
1: -			pr_warn("struct_ops init: var %s is beyond the end of DATASEC %s\n",
1: -				var_name, STRUCT_OPS_SEC);
1: -			return -EINVAL;
1: -		}
1: -
1: -		memcpy(st_ops->data,
1: -		       obj->efile.st_ops_data->d_buf + vsi->offset,
1: -		       type->size);
1: -		st_ops->tname = tname;
1: -		st_ops->type = type;
1: -		st_ops->type_id = type_id;
1: -
1: -		pr_debug("struct_ops init: struct %s(type_id=%u) %s found at offset %u\n",
1: -			 tname, type_id, var_name, vsi->offset);
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static struct bpf_object *bpf_object__new(const char *path,
1: -					  const void *obj_buf,
1: -					  size_t obj_buf_sz,
1: -					  const char *obj_name)
1: -{
1: -	struct bpf_object *obj;
1: -	char *end;
1: -
1: -	obj = calloc(1, sizeof(struct bpf_object) + strlen(path) + 1);
1: -	if (!obj) {
1: -		pr_warn("alloc memory failed for %s\n", path);
1: -		return ERR_PTR(-ENOMEM);
1: -	}
1: -
1: -	strcpy(obj->path, path);
1: -	if (obj_name) {
1: -		strncpy(obj->name, obj_name, sizeof(obj->name) - 1);
1: -		obj->name[sizeof(obj->name) - 1] = 0;
1: -	} else {
1: -		/* Using basename() GNU version which doesn't modify arg. */
1: -		strncpy(obj->name, basename((void *)path),
1: -			sizeof(obj->name) - 1);
1: -		end = strchr(obj->name, '.');
1: -		if (end)
1: -			*end = 0;
1: -	}
1: -
1: -	obj->efile.fd = -1;
1: -	/*
1: -	 * Caller of this function should also call
1: -	 * bpf_object__elf_finish() after data collection to return
1: -	 * obj_buf to user. If not, we should duplicate the buffer to
1: -	 * avoid user freeing them before elf finish.
1: -	 */
1: -	obj->efile.obj_buf = obj_buf;
1: -	obj->efile.obj_buf_sz = obj_buf_sz;
1: -	obj->efile.maps_shndx = -1;
1: -	obj->efile.btf_maps_shndx = -1;
1: -	obj->efile.data_shndx = -1;
1: -	obj->efile.rodata_shndx = -1;
1: -	obj->efile.bss_shndx = -1;
1: -	obj->efile.st_ops_shndx = -1;
1: -	obj->kconfig_map_idx = -1;
1: -	obj->rodata_map_idx = -1;
1: -
1: -	obj->kern_version = get_kernel_version();
1: -	obj->loaded = false;
1: -
1: -	INIT_LIST_HEAD(&obj->list);
1: -	list_add(&obj->list, &bpf_objects_list);
1: -	return obj;
1: -}
1: -
1: -static void bpf_object__elf_finish(struct bpf_object *obj)
1: -{
1: -	if (!obj_elf_valid(obj))
1: -		return;
1: -
1: -	if (obj->efile.elf) {
1: -		elf_end(obj->efile.elf);
1: -		obj->efile.elf = NULL;
1: -	}
1: -	obj->efile.symbols = NULL;
1: -	obj->efile.data = NULL;
1: -	obj->efile.rodata = NULL;
1: -	obj->efile.bss = NULL;
1: -	obj->efile.st_ops_data = NULL;
1: -
1: -	zfree(&obj->efile.reloc_sects);
1: -	obj->efile.nr_reloc_sects = 0;
1: -	zclose(obj->efile.fd);
1: -	obj->efile.obj_buf = NULL;
1: -	obj->efile.obj_buf_sz = 0;
1: -}
1: -
1: -static int bpf_object__elf_init(struct bpf_object *obj)
1: -{
1: -	int err = 0;
1: -	GElf_Ehdr *ep;
1: -
1: -	if (obj_elf_valid(obj)) {
1: -		pr_warn("elf: init internal error\n");
1: -		return -LIBBPF_ERRNO__LIBELF;
1: -	}
1: -
1: -	if (obj->efile.obj_buf_sz > 0) {
1: -		/*
1: -		 * obj_buf should have been validated by
1: -		 * bpf_object__open_buffer().
1: -		 */
1: -		obj->efile.elf = elf_memory((char *)obj->efile.obj_buf,
1: -					    obj->efile.obj_buf_sz);
1: -	} else {
1: -		obj->efile.fd = open(obj->path, O_RDONLY);
1: -		if (obj->efile.fd < 0) {
1: -			char errmsg[STRERR_BUFSIZE], *cp;
1: -
1: -			err = -errno;
1: -			cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: -			pr_warn("elf: failed to open %s: %s\n", obj->path, cp);
1: -			return err;
1: -		}
1: -
1: -		obj->efile.elf = elf_begin(obj->efile.fd, ELF_C_READ_MMAP, NULL);
1: -	}
1: -
1: -	if (!obj->efile.elf) {
1: -		pr_warn("elf: failed to open %s as ELF file: %s\n", obj->path, elf_errmsg(-1));
1: -		err = -LIBBPF_ERRNO__LIBELF;
1: -		goto errout;
1: -	}
1: -
1: -	if (!gelf_getehdr(obj->efile.elf, &obj->efile.ehdr)) {
1: -		pr_warn("elf: failed to get ELF header from %s: %s\n", obj->path, elf_errmsg(-1));
1: -		err = -LIBBPF_ERRNO__FORMAT;
1: -		goto errout;
1: -	}
1: -	ep = &obj->efile.ehdr;
1: -
1: -	if (elf_getshdrstrndx(obj->efile.elf, &obj->efile.shstrndx)) {
1: -		pr_warn("elf: failed to get section names section index for %s: %s\n",
1: -			obj->path, elf_errmsg(-1));
1: -		err = -LIBBPF_ERRNO__FORMAT;
1: -		goto errout;
1: -	}
1: -
1: -	/* Elf is corrupted/truncated, avoid calling elf_strptr. */
1: -	if (!elf_rawdata(elf_getscn(obj->efile.elf, obj->efile.shstrndx), NULL)) {
1: -		pr_warn("elf: failed to get section names strings from %s: %s\n",
1: -			obj->path, elf_errmsg(-1));
1: -		err = -LIBBPF_ERRNO__FORMAT;
1: -		goto errout;
1: -	}
1: -
1: -	/* Old LLVM set e_machine to EM_NONE */
1: -	if (ep->e_type != ET_REL ||
1: -	    (ep->e_machine && ep->e_machine != EM_BPF)) {
1: -		pr_warn("elf: %s is not a valid eBPF object file\n", obj->path);
1: -		err = -LIBBPF_ERRNO__FORMAT;
1: -		goto errout;
1: -	}
1: -
1: -	return 0;
1: +                                         const struct btf *btf,
1: +                                         const struct btf *kern_btf) {
1: +  const struct btf_member *member, *kern_member, *kern_data_member;
1: +  const struct btf_type *type, *kern_type, *kern_vtype;
1: +  __u32 i, kern_type_id, kern_vtype_id, kern_data_off;
1: +  struct bpf_struct_ops *st_ops;
1: +  void *data, *kern_data;
1: +  const char *tname;
1: +  int err;
1: +
1: +  st_ops = map->st_ops;
1: +  type = st_ops->type;
1: +  tname = st_ops->tname;
1: +  err = find_struct_ops_kern_types(kern_btf, tname, &kern_type, &kern_type_id,
1: +                                   &kern_vtype, &kern_vtype_id,
1: +                                   &kern_data_member);
1: +  if (err)
1: +    return err;
1: +
1: +  pr_debug(
1: +      "struct_ops init_kern %s: type_id:%u kern_type_id:%u kern_vtype_id:%u\n",
1: +      map->name, st_ops->type_id, kern_type_id, kern_vtype_id);
1: +
1: +  map->def.value_size = kern_vtype->size;
1: +  map->btf_vmlinux_value_type_id = kern_vtype_id;
1: +
1: +  st_ops->kern_vdata = calloc(1, kern_vtype->size);
1: +  if (!st_ops->kern_vdata)
1: +    return -ENOMEM;
1: +
1: +  data = st_ops->data;
1: +  kern_data_off = kern_data_member->offset / 8;
1: +  kern_data = st_ops->kern_vdata + kern_data_off;
1: +
1: +  member = btf_members(type);
1: +  for (i = 0; i < btf_vlen(type); i++, member++) {
1: +    const struct btf_type *mtype, *kern_mtype;
1: +    __u32 mtype_id, kern_mtype_id;
1: +    void *mdata, *kern_mdata;
1: +    __s64 msize, kern_msize;
1: +    __u32 moff, kern_moff;
1: +    __u32 kern_member_idx;
1: +    const char *mname;
1: +
1: +    mname = btf__name_by_offset(btf, member->name_off);
1: +    kern_member = find_member_by_name(kern_btf, kern_type, mname);
1: +    if (!kern_member) {
1: +      pr_warn("struct_ops init_kern %s: Cannot find member %s in kernel BTF\n",
1: +              map->name, mname);
1: +      return -ENOTSUP;
1: +    }
1: +
1: +    kern_member_idx = kern_member - btf_members(kern_type);
1: +    if (btf_member_bitfield_size(type, i) ||
1: +        btf_member_bitfield_size(kern_type, kern_member_idx)) {
1: +      pr_warn("struct_ops init_kern %s: bitfield %s is not supported\n",
1: +              map->name, mname);
1: +      return -ENOTSUP;
1: +    }
1: +
1: +    moff = member->offset / 8;
1: +    kern_moff = kern_member->offset / 8;
1: +
1: +    mdata = data + moff;
1: +    kern_mdata = kern_data + kern_moff;
1: +
1: +    mtype = skip_mods_and_typedefs(btf, member->type, &mtype_id);
1: +    kern_mtype =
1: +        skip_mods_and_typedefs(kern_btf, kern_member->type, &kern_mtype_id);
1: +    if (BTF_INFO_KIND(mtype->info) != BTF_INFO_KIND(kern_mtype->info)) {
1: +      pr_warn(
1: +          "struct_ops init_kern %s: Unmatched member type %s %u != "
1: +          "%u(kernel)\n",
1: +          map->name, mname, BTF_INFO_KIND(mtype->info),
1: +          BTF_INFO_KIND(kern_mtype->info));
1: +      return -ENOTSUP;
1: +    }
1: +
1: +    if (btf_is_ptr(mtype)) {
1: +      struct bpf_program *prog;
1: +
1: +      prog = st_ops->progs[i];
1: +      if (!prog)
1: +        continue;
1: +
1: +      kern_mtype =
1: +          skip_mods_and_typedefs(kern_btf, kern_mtype->type, &kern_mtype_id);
1: +
1: +      /* mtype->type must be a func_proto which was
1: +       * guaranteed in bpf_object__collect_st_ops_relos(),
1: +       * so only check kern_mtype for func_proto here.
1: +       */
1: +      if (!btf_is_func_proto(kern_mtype)) {
1: +        pr_warn("struct_ops init_kern %s: kernel member %s is not a func ptr\n",
1: +                map->name, mname);
1: +        return -ENOTSUP;
1: +      }
1: +
1: +      prog->attach_btf_id = kern_type_id;
1: +      prog->expected_attach_type = kern_member_idx;
1: +
1: +      st_ops->kern_func_off[i] = kern_data_off + kern_moff;
1: +
1: +      pr_debug(
1: +          "struct_ops init_kern %s: func ptr %s is set to prog %s from "
1: +          "data(+%u) to kern_data(+%u)\n",
1: +          map->name, mname, prog->name, moff, kern_moff);
1: +
1: +      continue;
1: +    }
1: +
1: +    msize = btf__resolve_size(btf, mtype_id);
1: +    kern_msize = btf__resolve_size(kern_btf, kern_mtype_id);
1: +    if (msize < 0 || kern_msize < 0 || msize != kern_msize) {
1: +      pr_warn(
1: +          "struct_ops init_kern %s: Error in size of member %s: %zd != "
1: +          "%zd(kernel)\n",
1: +          map->name, mname, (ssize_t)msize, (ssize_t)kern_msize);
1: +      return -ENOTSUP;
1: +    }
1: +
1: +    pr_debug(
1: +        "struct_ops init_kern %s: copy %s %u bytes from data(+%u) to "
1: +        "kern_data(+%u)\n",
1: +        map->name, mname, (unsigned int)msize, moff, kern_moff);
1: +    memcpy(kern_mdata, mdata, msize);
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__init_kern_struct_ops_maps(struct bpf_object *obj) {
1: +  struct bpf_map *map;
1: +  size_t i;
1: +  int err;
1: +
1: +  for (i = 0; i < obj->nr_maps; i++) {
1: +    map = &obj->maps[i];
1: +
1: +    if (!bpf_map__is_struct_ops(map))
1: +      continue;
1: +
1: +    err = bpf_map__init_kern_struct_ops(map, obj->btf, obj->btf_vmlinux);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__init_struct_ops_maps(struct bpf_object *obj) {
1: +  const struct btf_type *type, *datasec;
1: +  const struct btf_var_secinfo *vsi;
1: +  struct bpf_struct_ops *st_ops;
1: +  const char *tname, *var_name;
1: +  __s32 type_id, datasec_id;
1: +  const struct btf *btf;
1: +  struct bpf_map *map;
1: +  __u32 i;
1: +
1: +  if (obj->efile.st_ops_shndx == -1)
1: +    return 0;
1: +
1: +  btf = obj->btf;
1: +  datasec_id = btf__find_by_name_kind(btf, STRUCT_OPS_SEC, BTF_KIND_DATASEC);
1: +  if (datasec_id < 0) {
1: +    pr_warn("struct_ops init: DATASEC %s not found\n", STRUCT_OPS_SEC);
1: +    return -EINVAL;
1: +  }
1: +
1: +  datasec = btf__type_by_id(btf, datasec_id);
1: +  vsi = btf_var_secinfos(datasec);
1: +  for (i = 0; i < btf_vlen(datasec); i++, vsi++) {
1: +    type = btf__type_by_id(obj->btf, vsi->type);
1: +    var_name = btf__name_by_offset(obj->btf, type->name_off);
1: +
1: +    type_id = btf__resolve_type(obj->btf, vsi->type);
1: +    if (type_id < 0) {
1: +      pr_warn("struct_ops init: Cannot resolve var type_id %u in DATASEC %s\n",
1: +              vsi->type, STRUCT_OPS_SEC);
1: +      return -EINVAL;
1: +    }
1: +
1: +    type = btf__type_by_id(obj->btf, type_id);
1: +    tname = btf__name_by_offset(obj->btf, type->name_off);
1: +    if (!tname[0]) {
1: +      pr_warn("struct_ops init: anonymous type is not supported\n");
1: +      return -ENOTSUP;
1: +    }
1: +    if (!btf_is_struct(type)) {
1: +      pr_warn("struct_ops init: %s is not a struct\n", tname);
1: +      return -EINVAL;
1: +    }
1: +
1: +    map = bpf_object__add_map(obj);
1: +    if (IS_ERR(map))
1: +      return PTR_ERR(map);
1: +
1: +    map->sec_idx = obj->efile.st_ops_shndx;
1: +    map->sec_offset = vsi->offset;
1: +    map->name = strdup(var_name);
1: +    if (!map->name)
1: +      return -ENOMEM;
1: +
1: +    map->def.type = BPF_MAP_TYPE_STRUCT_OPS;
1: +    map->def.key_size = sizeof(int);
1: +    map->def.value_size = type->size;
1: +    map->def.max_entries = 1;
1: +
1: +    map->st_ops = calloc(1, sizeof(*map->st_ops));
1: +    if (!map->st_ops)
1: +      return -ENOMEM;
1: +    st_ops = map->st_ops;
1: +    st_ops->data = malloc(type->size);
1: +    st_ops->progs = calloc(btf_vlen(type), sizeof(*st_ops->progs));
1: +    st_ops->kern_func_off =
1: +        malloc(btf_vlen(type) * sizeof(*st_ops->kern_func_off));
1: +    if (!st_ops->data || !st_ops->progs || !st_ops->kern_func_off)
1: +      return -ENOMEM;
1: +
1: +    if (vsi->offset + type->size > obj->efile.st_ops_data->d_size) {
1: +      pr_warn("struct_ops init: var %s is beyond the end of DATASEC %s\n",
1: +              var_name, STRUCT_OPS_SEC);
1: +      return -EINVAL;
1: +    }
1: +
1: +    memcpy(st_ops->data, obj->efile.st_ops_data->d_buf + vsi->offset,
1: +           type->size);
1: +    st_ops->tname = tname;
1: +    st_ops->type = type;
1: +    st_ops->type_id = type_id;
1: +
1: +    pr_debug("struct_ops init: struct %s(type_id=%u) %s found at offset %u\n",
1: +             tname, type_id, var_name, vsi->offset);
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static struct bpf_object *bpf_object__new(const char *path, const void *obj_buf,
1: +                                          size_t obj_buf_sz,
1: +                                          const char *obj_name) {
1: +  struct bpf_object *obj;
1: +  char *end;
1: +
1: +  obj = calloc(1, sizeof(struct bpf_object) + strlen(path) + 1);
1: +  if (!obj) {
1: +    pr_warn("alloc memory failed for %s\n", path);
1: +    return ERR_PTR(-ENOMEM);
1: +  }
1: +
1: +  strcpy(obj->path, path);
1: +  if (obj_name) {
1: +    strncpy(obj->name, obj_name, sizeof(obj->name) - 1);
1: +    obj->name[sizeof(obj->name) - 1] = 0;
1: +  } else {
1: +    /* Using basename() GNU version which doesn't modify arg. */
1: +    strncpy(obj->name, basename((void *)path), sizeof(obj->name) - 1);
1: +    end = strchr(obj->name, '.');
1: +    if (end)
1: +      *end = 0;
1: +  }
1: +
1: +  obj->efile.fd = -1;
1: +  /*
1: +   * Caller of this function should also call
1: +   * bpf_object__elf_finish() after data collection to return
1: +   * obj_buf to user. If not, we should duplicate the buffer to
1: +   * avoid user freeing them before elf finish.
1: +   */
1: +  obj->efile.obj_buf = obj_buf;
1: +  obj->efile.obj_buf_sz = obj_buf_sz;
1: +  obj->efile.maps_shndx = -1;
1: +  obj->efile.btf_maps_shndx = -1;
1: +  obj->efile.data_shndx = -1;
1: +  obj->efile.rodata_shndx = -1;
1: +  obj->efile.bss_shndx = -1;
1: +  obj->efile.st_ops_shndx = -1;
1: +  obj->kconfig_map_idx = -1;
1: +  obj->rodata_map_idx = -1;
1: +
1: +  obj->kern_version = get_kernel_version();
1: +  obj->loaded = false;
1: +
1: +  INIT_LIST_HEAD(&obj->list);
1: +  list_add(&obj->list, &bpf_objects_list);
1: +  return obj;
1: +}
1: +
1: +static void bpf_object__elf_finish(struct bpf_object *obj) {
1: +  if (!obj_elf_valid(obj))
1: +    return;
1: +
1: +  if (obj->efile.elf) {
1: +    elf_end(obj->efile.elf);
1: +    obj->efile.elf = NULL;
1: +  }
1: +  obj->efile.symbols = NULL;
1: +  obj->efile.data = NULL;
1: +  obj->efile.rodata = NULL;
1: +  obj->efile.bss = NULL;
1: +  obj->efile.st_ops_data = NULL;
1: +
1: +  zfree(&obj->efile.reloc_sects);
1: +  obj->efile.nr_reloc_sects = 0;
1: +  zclose(obj->efile.fd);
1: +  obj->efile.obj_buf = NULL;
1: +  obj->efile.obj_buf_sz = 0;
1: +}
1: +
1: +static int bpf_object__elf_init(struct bpf_object *obj) {
1: +  int err = 0;
1: +  GElf_Ehdr *ep;
1: +
1: +  if (obj_elf_valid(obj)) {
1: +    pr_warn("elf: init internal error\n");
1: +    return -LIBBPF_ERRNO__LIBELF;
1: +  }
1: +
1: +  if (obj->efile.obj_buf_sz > 0) {
1: +    /*
1: +     * obj_buf should have been validated by
1: +     * bpf_object__open_buffer().
1: +     */
1: +    obj->efile.elf =
1: +        elf_memory((char *)obj->efile.obj_buf, obj->efile.obj_buf_sz);
1: +  } else {
1: +    obj->efile.fd = open(obj->path, O_RDONLY);
1: +    if (obj->efile.fd < 0) {
1: +      char errmsg[STRERR_BUFSIZE], *cp;
1: +
1: +      err = -errno;
1: +      cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: +      pr_warn("elf: failed to open %s: %s\n", obj->path, cp);
1: +      return err;
1: +    }
1: +
1: +    obj->efile.elf = elf_begin(obj->efile.fd, ELF_C_READ_MMAP, NULL);
1: +  }
1: +
1: +  if (!obj->efile.elf) {
1: +    pr_warn("elf: failed to open %s as ELF file: %s\n", obj->path,
1: +            elf_errmsg(-1));
1: +    err = -LIBBPF_ERRNO__LIBELF;
1: +    goto errout;
1: +  }
1: +
1: +  if (!gelf_getehdr(obj->efile.elf, &obj->efile.ehdr)) {
1: +    pr_warn("elf: failed to get ELF header from %s: %s\n", obj->path,
1: +            elf_errmsg(-1));
1: +    err = -LIBBPF_ERRNO__FORMAT;
1: +    goto errout;
1: +  }
1: +  ep = &obj->efile.ehdr;
1: +
1: +  if (elf_getshdrstrndx(obj->efile.elf, &obj->efile.shstrndx)) {
1: +    pr_warn("elf: failed to get section names section index for %s: %s\n",
1: +            obj->path, elf_errmsg(-1));
1: +    err = -LIBBPF_ERRNO__FORMAT;
1: +    goto errout;
1: +  }
1: +
1: +  /* Elf is corrupted/truncated, avoid calling elf_strptr. */
1: +  if (!elf_rawdata(elf_getscn(obj->efile.elf, obj->efile.shstrndx), NULL)) {
1: +    pr_warn("elf: failed to get section names strings from %s: %s\n", obj->path,
1: +            elf_errmsg(-1));
1: +    err = -LIBBPF_ERRNO__FORMAT;
1: +    goto errout;
1: +  }
1: +
1: +  /* Old LLVM set e_machine to EM_NONE */
1: +  if (ep->e_type != ET_REL || (ep->e_machine && ep->e_machine != EM_BPF)) {
1: +    pr_warn("elf: %s is not a valid eBPF object file\n", obj->path);
1: +    err = -LIBBPF_ERRNO__FORMAT;
1: +    goto errout;
1: +  }
1: +
1: +  return 0;
1:  errout:
1: -	bpf_object__elf_finish(obj);
1: -	return err;
1: +  bpf_object__elf_finish(obj);
1: +  return err;
1:  }
1:  
1: -static int bpf_object__check_endianness(struct bpf_object *obj)
1: -{
1: +static int bpf_object__check_endianness(struct bpf_object *obj) {
1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
1: -	if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2LSB)
1: -		return 0;
1: +  if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2LSB)
1: +    return 0;
1:  #elif __BYTE_ORDER == __BIG_ENDIAN
1: -	if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2MSB)
1: -		return 0;
1: +  if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2MSB)
1: +    return 0;
1:  #else
1: -# error "Unrecognized __BYTE_ORDER__"
1: +#error "Unrecognized __BYTE_ORDER__"
1:  #endif
1: -	pr_warn("elf: endianness mismatch in %s.\n", obj->path);
1: -	return -LIBBPF_ERRNO__ENDIAN;
1: +  pr_warn("elf: endianness mismatch in %s.\n", obj->path);
1: +  return -LIBBPF_ERRNO__ENDIAN;
1:  }
1:  
1: -static int
1: -bpf_object__init_license(struct bpf_object *obj, void *data, size_t size)
1: -{
1: -	memcpy(obj->license, data, min(size, sizeof(obj->license) - 1));
1: -	pr_debug("license of %s is %s\n", obj->path, obj->license);
1: -	return 0;
1: +static int bpf_object__init_license(struct bpf_object *obj, void *data,
1: +                                    size_t size) {
1: +  memcpy(obj->license, data, min(size, sizeof(obj->license) - 1));
1: +  pr_debug("license of %s is %s\n", obj->path, obj->license);
1: +  return 0;
1:  }
1:  
1: -static int
1: -bpf_object__init_kversion(struct bpf_object *obj, void *data, size_t size)
1: -{
1: -	__u32 kver;
1: +static int bpf_object__init_kversion(struct bpf_object *obj, void *data,
1: +                                     size_t size) {
1: +  __u32 kver;
1:  
1: -	if (size != sizeof(kver)) {
1: -		pr_warn("invalid kver section in %s\n", obj->path);
1: -		return -LIBBPF_ERRNO__FORMAT;
1: -	}
1: -	memcpy(&kver, data, sizeof(kver));
1: -	obj->kern_version = kver;
1: -	pr_debug("kernel version of %s is %x\n", obj->path, obj->kern_version);
1: -	return 0;
1: +  if (size != sizeof(kver)) {
1: +    pr_warn("invalid kver section in %s\n", obj->path);
1: +    return -LIBBPF_ERRNO__FORMAT;
1: +  }
1: +  memcpy(&kver, data, sizeof(kver));
1: +  obj->kern_version = kver;
1: +  pr_debug("kernel version of %s is %x\n", obj->path, obj->kern_version);
1: +  return 0;
1:  }
1:  
1: -static bool bpf_map_type__is_map_in_map(enum bpf_map_type type)
1: -{
1: -	if (type == BPF_MAP_TYPE_ARRAY_OF_MAPS ||
1: -	    type == BPF_MAP_TYPE_HASH_OF_MAPS)
1: -		return true;
1: -	return false;
1: +static bool bpf_map_type__is_map_in_map(enum bpf_map_type type) {
1: +  if (type == BPF_MAP_TYPE_ARRAY_OF_MAPS || type == BPF_MAP_TYPE_HASH_OF_MAPS)
1: +    return true;
1: +  return false;
1:  }
1:  
1:  int bpf_object__section_size(const struct bpf_object *obj, const char *name,
1: -			     __u32 *size)
1: -{
1: -	int ret = -ENOENT;
1: -
1: -	*size = 0;
1: -	if (!name) {
1: -		return -EINVAL;
1: -	} else if (!strcmp(name, DATA_SEC)) {
1: -		if (obj->efile.data)
1: -			*size = obj->efile.data->d_size;
1: -	} else if (!strcmp(name, BSS_SEC)) {
1: -		if (obj->efile.bss)
1: -			*size = obj->efile.bss->d_size;
1: -	} else if (!strcmp(name, RODATA_SEC)) {
1: -		if (obj->efile.rodata)
1: -			*size = obj->efile.rodata->d_size;
1: -	} else if (!strcmp(name, STRUCT_OPS_SEC)) {
1: -		if (obj->efile.st_ops_data)
1: -			*size = obj->efile.st_ops_data->d_size;
1: -	} else {
1: -		Elf_Scn *scn = elf_sec_by_name(obj, name);
1: -		Elf_Data *data = elf_sec_data(obj, scn);
1: -
1: -		if (data) {
1: -			ret = 0; /* found it */
1: -			*size = data->d_size;
1: -		}
1: -	}
1: -
1: -	return *size ? 0 : ret;
1: +                             __u32 *size) {
1: +  int ret = -ENOENT;
1: +
1: +  *size = 0;
1: +  if (!name) {
1: +    return -EINVAL;
1: +  } else if (!strcmp(name, DATA_SEC)) {
1: +    if (obj->efile.data)
1: +      *size = obj->efile.data->d_size;
1: +  } else if (!strcmp(name, BSS_SEC)) {
1: +    if (obj->efile.bss)
1: +      *size = obj->efile.bss->d_size;
1: +  } else if (!strcmp(name, RODATA_SEC)) {
1: +    if (obj->efile.rodata)
1: +      *size = obj->efile.rodata->d_size;
1: +  } else if (!strcmp(name, STRUCT_OPS_SEC)) {
1: +    if (obj->efile.st_ops_data)
1: +      *size = obj->efile.st_ops_data->d_size;
1: +  } else {
1: +    Elf_Scn *scn = elf_sec_by_name(obj, name);
1: +    Elf_Data *data = elf_sec_data(obj, scn);
1: +
1: +    if (data) {
1: +      ret = 0; /* found it */
1: +      *size = data->d_size;
1: +    }
1: +  }
1: +
1: +  return *size ? 0 : ret;
1:  }
1:  
1:  int bpf_object__variable_offset(const struct bpf_object *obj, const char *name,
1: -				__u32 *off)
1: -{
1: -	Elf_Data *symbols = obj->efile.symbols;
1: -	const char *sname;
1: -	size_t si;
1: -
1: -	if (!name || !off)
1: -		return -EINVAL;
1: -
1: -	for (si = 0; si < symbols->d_size / sizeof(GElf_Sym); si++) {
1: -		GElf_Sym sym;
1: -
1: -		if (!gelf_getsym(symbols, si, &sym))
1: -			continue;
1: -		if (GELF_ST_BIND(sym.st_info) != STB_GLOBAL ||
1: -		    GELF_ST_TYPE(sym.st_info) != STT_OBJECT)
1: -			continue;
1: -
1: -		sname = elf_sym_str(obj, sym.st_name);
1: -		if (!sname) {
1: -			pr_warn("failed to get sym name string for var %s\n",
1: -				name);
1: -			return -EIO;
1: -		}
1: -		if (strcmp(name, sname) == 0) {
1: -			*off = sym.st_value;
1: -			return 0;
1: -		}
1: -	}
1: -
1: -	return -ENOENT;
1: -}
1: -
1: -static struct bpf_map *bpf_object__add_map(struct bpf_object *obj)
1: -{
1: -	struct bpf_map *new_maps;
1: -	size_t new_cap;
1: -	int i;
1: -
1: -	if (obj->nr_maps < obj->maps_cap)
1: -		return &obj->maps[obj->nr_maps++];
1: -
1: -	new_cap = max((size_t)4, obj->maps_cap * 3 / 2);
1: -	new_maps = libbpf_reallocarray(obj->maps, new_cap, sizeof(*obj->maps));
1: -	if (!new_maps) {
1: -		pr_warn("alloc maps for object failed\n");
1: -		return ERR_PTR(-ENOMEM);
1: -	}
1: -
1: -	obj->maps_cap = new_cap;
1: -	obj->maps = new_maps;
1: -
1: -	/* zero out new maps */
1: -	memset(obj->maps + obj->nr_maps, 0,
1: -	       (obj->maps_cap - obj->nr_maps) * sizeof(*obj->maps));
1: -	/*
1: -	 * fill all fd with -1 so won't close incorrect fd (fd=0 is stdin)
1: -	 * when failure (zclose won't close negative fd)).
1: -	 */
1: -	for (i = obj->nr_maps; i < obj->maps_cap; i++) {
1: -		obj->maps[i].fd = -1;
1: -		obj->maps[i].inner_map_fd = -1;
1: -	}
1: -
1: -	return &obj->maps[obj->nr_maps++];
1: -}
1: -
1: -static size_t bpf_map_mmap_sz(const struct bpf_map *map)
1: -{
1: -	long page_sz = sysconf(_SC_PAGE_SIZE);
1: -	size_t map_sz;
1: -
1: -	map_sz = (size_t)roundup(map->def.value_size, 8) * map->def.max_entries;
1: -	map_sz = roundup(map_sz, page_sz);
1: -	return map_sz;
1: +                                __u32 *off) {
1: +  Elf_Data *symbols = obj->efile.symbols;
1: +  const char *sname;
1: +  size_t si;
1: +
1: +  if (!name || !off)
1: +    return -EINVAL;
1: +
1: +  for (si = 0; si < symbols->d_size / sizeof(GElf_Sym); si++) {
1: +    GElf_Sym sym;
1: +
1: +    if (!gelf_getsym(symbols, si, &sym))
1: +      continue;
1: +    if (GELF_ST_BIND(sym.st_info) != STB_GLOBAL ||
1: +        GELF_ST_TYPE(sym.st_info) != STT_OBJECT)
1: +      continue;
1: +
1: +    sname = elf_sym_str(obj, sym.st_name);
1: +    if (!sname) {
1: +      pr_warn("failed to get sym name string for var %s\n", name);
1: +      return -EIO;
1: +    }
1: +    if (strcmp(name, sname) == 0) {
1: +      *off = sym.st_value;
1: +      return 0;
1: +    }
1: +  }
1: +
1: +  return -ENOENT;
1: +}
1: +
1: +static struct bpf_map *bpf_object__add_map(struct bpf_object *obj) {
1: +  struct bpf_map *new_maps;
1: +  size_t new_cap;
1: +  int i;
1: +
1: +  if (obj->nr_maps < obj->maps_cap)
1: +    return &obj->maps[obj->nr_maps++];
1: +
1: +  new_cap = max((size_t)4, obj->maps_cap * 3 / 2);
1: +  new_maps = libbpf_reallocarray(obj->maps, new_cap, sizeof(*obj->maps));
1: +  if (!new_maps) {
1: +    pr_warn("alloc maps for object failed\n");
1: +    return ERR_PTR(-ENOMEM);
1: +  }
1: +
1: +  obj->maps_cap = new_cap;
1: +  obj->maps = new_maps;
1: +
1: +  /* zero out new maps */
1: +  memset(obj->maps + obj->nr_maps, 0,
1: +         (obj->maps_cap - obj->nr_maps) * sizeof(*obj->maps));
1: +  /*
1: +   * fill all fd with -1 so won't close incorrect fd (fd=0 is stdin)
1: +   * when failure (zclose won't close negative fd)).
1: +   */
1: +  for (i = obj->nr_maps; i < obj->maps_cap; i++) {
1: +    obj->maps[i].fd = -1;
1: +    obj->maps[i].inner_map_fd = -1;
1: +  }
1: +
1: +  return &obj->maps[obj->nr_maps++];
1: +}
1: +
1: +static size_t bpf_map_mmap_sz(const struct bpf_map *map) {
1: +  long page_sz = sysconf(_SC_PAGE_SIZE);
1: +  size_t map_sz;
1: +
1: +  map_sz = (size_t)roundup(map->def.value_size, 8) * map->def.max_entries;
1: +  map_sz = roundup(map_sz, page_sz);
1: +  return map_sz;
1:  }
1:  
1:  static char *internal_map_name(struct bpf_object *obj,
1: -			       enum libbpf_map_type type)
1: -{
1: -	char map_name[BPF_OBJ_NAME_LEN], *p;
1: -	const char *sfx = libbpf_type_to_btf_name[type];
1: -	int sfx_len = max((size_t)7, strlen(sfx));
1: -	int pfx_len = min((size_t)BPF_OBJ_NAME_LEN - sfx_len - 1,
1: -			  strlen(obj->name));
1: -
1: -	snprintf(map_name, sizeof(map_name), "%.*s%.*s", pfx_len, obj->name,
1: -		 sfx_len, libbpf_type_to_btf_name[type]);
1: -
1: -	/* sanitise map name to characters allowed by kernel */
1: -	for (p = map_name; *p && p < map_name + sizeof(map_name); p++)
1: -		if (!isalnum(*p) && *p != '_' && *p != '.')
1: -			*p = '_';
1: -
1: -	return strdup(map_name);
1: -}
1: -
1: -static int
1: -bpf_object__init_internal_map(struct bpf_object *obj, enum libbpf_map_type type,
1: -			      int sec_idx, void *data, size_t data_sz)
1: -{
1: -	struct bpf_map_def *def;
1: -	struct bpf_map *map;
1: -	int err;
1: -
1: -	map = bpf_object__add_map(obj);
1: -	if (IS_ERR(map))
1: -		return PTR_ERR(map);
1: -
1: -	map->libbpf_type = type;
1: -	map->sec_idx = sec_idx;
1: -	map->sec_offset = 0;
1: -	map->name = internal_map_name(obj, type);
1: -	if (!map->name) {
1: -		pr_warn("failed to alloc map name\n");
1: -		return -ENOMEM;
1: -	}
1: -
1: -	def = &map->def;
1: -	def->type = BPF_MAP_TYPE_ARRAY;
1: -	def->key_size = sizeof(int);
1: -	def->value_size = data_sz;
1: -	def->max_entries = 1;
1: -	def->map_flags = type == LIBBPF_MAP_RODATA || type == LIBBPF_MAP_KCONFIG
1: -			 ? BPF_F_RDONLY_PROG : 0;
1: -	def->map_flags |= BPF_F_MMAPABLE;
1: -
1: -	pr_debug("map '%s' (global data): at sec_idx %d, offset %zu, flags %x.\n",
1: -		 map->name, map->sec_idx, map->sec_offset, def->map_flags);
1: -
1: -	map->mmaped = mmap(NULL, bpf_map_mmap_sz(map), PROT_READ | PROT_WRITE,
1: -			   MAP_SHARED | MAP_ANONYMOUS, -1, 0);
1: -	if (map->mmaped == MAP_FAILED) {
1: -		err = -errno;
1: -		map->mmaped = NULL;
1: -		pr_warn("failed to alloc map '%s' content buffer: %d\n",
1: -			map->name, err);
1: -		zfree(&map->name);
1: -		return err;
1: -	}
1: -
1: -	if (data)
1: -		memcpy(map->mmaped, data, data_sz);
1: -
1: -	pr_debug("map %td is \"%s\"\n", map - obj->maps, map->name);
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__init_global_data_maps(struct bpf_object *obj)
1: -{
1: -	int err;
1: -
1: -	/*
1: -	 * Populate obj->maps with libbpf internal maps.
1: -	 */
1: -	if (obj->efile.data_shndx >= 0) {
1: -		err = bpf_object__init_internal_map(obj, LIBBPF_MAP_DATA,
1: -						    obj->efile.data_shndx,
1: -						    obj->efile.data->d_buf,
1: -						    obj->efile.data->d_size);
1: -		if (err)
1: -			return err;
1: -	}
1: -	if (obj->efile.rodata_shndx >= 0) {
1: -		err = bpf_object__init_internal_map(obj, LIBBPF_MAP_RODATA,
1: -						    obj->efile.rodata_shndx,
1: -						    obj->efile.rodata->d_buf,
1: -						    obj->efile.rodata->d_size);
1: -		if (err)
1: -			return err;
1: -
1: -		obj->rodata_map_idx = obj->nr_maps - 1;
1: -	}
1: -	if (obj->efile.bss_shndx >= 0) {
1: -		err = bpf_object__init_internal_map(obj, LIBBPF_MAP_BSS,
1: -						    obj->efile.bss_shndx,
1: -						    NULL,
1: -						    obj->efile.bss->d_size);
1: -		if (err)
1: -			return err;
1: -	}
1: -	return 0;
1: +                               enum libbpf_map_type type) {
1: +  char map_name[BPF_OBJ_NAME_LEN], *p;
1: +  const char *sfx = libbpf_type_to_btf_name[type];
1: +  int sfx_len = max((size_t)7, strlen(sfx));
1: +  int pfx_len = min((size_t)BPF_OBJ_NAME_LEN - sfx_len - 1, strlen(obj->name));
1: +
1: +  snprintf(map_name, sizeof(map_name), "%.*s%.*s", pfx_len, obj->name, sfx_len,
1: +           libbpf_type_to_btf_name[type]);
1: +
1: +  /* sanitise map name to characters allowed by kernel */
1: +  for (p = map_name; *p && p < map_name + sizeof(map_name); p++)
1: +    if (!isalnum(*p) && *p != '_' && *p != '.')
1: +      *p = '_';
1: +
1: +  return strdup(map_name);
1: +}
1: +
1: +static int bpf_object__init_internal_map(struct bpf_object *obj,
1: +                                         enum libbpf_map_type type, int sec_idx,
1: +                                         void *data, size_t data_sz) {
1: +  struct bpf_map_def *def;
1: +  struct bpf_map *map;
1: +  int err;
1: +
1: +  map = bpf_object__add_map(obj);
1: +  if (IS_ERR(map))
1: +    return PTR_ERR(map);
1: +
1: +  map->libbpf_type = type;
1: +  map->sec_idx = sec_idx;
1: +  map->sec_offset = 0;
1: +  map->name = internal_map_name(obj, type);
1: +  if (!map->name) {
1: +    pr_warn("failed to alloc map name\n");
1: +    return -ENOMEM;
1: +  }
1: +
1: +  def = &map->def;
1: +  def->type = BPF_MAP_TYPE_ARRAY;
1: +  def->key_size = sizeof(int);
1: +  def->value_size = data_sz;
1: +  def->max_entries = 1;
1: +  def->map_flags = type == LIBBPF_MAP_RODATA || type == LIBBPF_MAP_KCONFIG
1: +                       ? BPF_F_RDONLY_PROG
1: +                       : 0;
1: +  def->map_flags |= BPF_F_MMAPABLE;
1: +
1: +  pr_debug("map '%s' (global data): at sec_idx %d, offset %zu, flags %x.\n",
1: +           map->name, map->sec_idx, map->sec_offset, def->map_flags);
1: +
1: +  map->mmaped = mmap(NULL, bpf_map_mmap_sz(map), PROT_READ | PROT_WRITE,
1: +                     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
1: +  if (map->mmaped == MAP_FAILED) {
1: +    err = -errno;
1: +    map->mmaped = NULL;
1: +    pr_warn("failed to alloc map '%s' content buffer: %d\n", map->name, err);
1: +    zfree(&map->name);
1: +    return err;
1: +  }
1: +
1: +  if (data)
1: +    memcpy(map->mmaped, data, data_sz);
1: +
1: +  pr_debug("map %td is \"%s\"\n", map - obj->maps, map->name);
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__init_global_data_maps(struct bpf_object *obj) {
1: +  int err;
1: +
1: +  /*
1: +   * Populate obj->maps with libbpf internal maps.
1: +   */
1: +  if (obj->efile.data_shndx >= 0) {
1: +    err = bpf_object__init_internal_map(
1: +        obj, LIBBPF_MAP_DATA, obj->efile.data_shndx, obj->efile.data->d_buf,
1: +        obj->efile.data->d_size);
1: +    if (err)
1: +      return err;
1: +  }
1: +  if (obj->efile.rodata_shndx >= 0) {
1: +    err = bpf_object__init_internal_map(
1: +        obj, LIBBPF_MAP_RODATA, obj->efile.rodata_shndx,
1: +        obj->efile.rodata->d_buf, obj->efile.rodata->d_size);
1: +    if (err)
1: +      return err;
1: +
1: +    obj->rodata_map_idx = obj->nr_maps - 1;
1: +  }
1: +  if (obj->efile.bss_shndx >= 0) {
1: +    err =
1: +        bpf_object__init_internal_map(obj, LIBBPF_MAP_BSS, obj->efile.bss_shndx,
1: +                                      NULL, obj->efile.bss->d_size);
1: +    if (err)
1: +      return err;
1: +  }
1: +  return 0;
1:  }
1:  
1: -
1:  static struct extern_desc *find_extern_by_name(const struct bpf_object *obj,
1: -					       const void *name)
1: -{
1: -	int i;
1: +                                               const void *name) {
1: +  int i;
1:  
1: -	for (i = 0; i < obj->nr_extern; i++) {
1: -		if (strcmp(obj->externs[i].name, name) == 0)
1: -			return &obj->externs[i];
1: -	}
1: -	return NULL;
1: +  for (i = 0; i < obj->nr_extern; i++) {
1: +    if (strcmp(obj->externs[i].name, name) == 0)
1: +      return &obj->externs[i];
1: +  }
1: +  return NULL;
1:  }
1:  
1:  static int set_kcfg_value_tri(struct extern_desc *ext, void *ext_val,
1: -			      char value)
1: -{
1: -	switch (ext->kcfg.type) {
1: -	case KCFG_BOOL:
1: -		if (value == 'm') {
1: -			pr_warn("extern (kcfg) %s=%c should be tristate or char\n",
1: -				ext->name, value);
1: -			return -EINVAL;
1: -		}
1: -		*(bool *)ext_val = value == 'y' ? true : false;
1: -		break;
1: -	case KCFG_TRISTATE:
1: -		if (value == 'y')
1: -			*(enum libbpf_tristate *)ext_val = TRI_YES;
1: -		else if (value == 'm')
1: -			*(enum libbpf_tristate *)ext_val = TRI_MODULE;
1: -		else /* value == 'n' */
1: -			*(enum libbpf_tristate *)ext_val = TRI_NO;
1: -		break;
1: -	case KCFG_CHAR:
1: -		*(char *)ext_val = value;
1: -		break;
1: -	case KCFG_UNKNOWN:
1: -	case KCFG_INT:
1: -	case KCFG_CHAR_ARR:
1: -	default:
1: -		pr_warn("extern (kcfg) %s=%c should be bool, tristate, or char\n",
1: -			ext->name, value);
1: -		return -EINVAL;
1: -	}
1: -	ext->is_set = true;
1: -	return 0;
1: +                              char value) {
1: +  switch (ext->kcfg.type) {
1: +  case KCFG_BOOL:
1: +    if (value == 'm') {
1: +      pr_warn("extern (kcfg) %s=%c should be tristate or char\n", ext->name,
1: +              value);
1: +      return -EINVAL;
1: +    }
1: +    *(bool *)ext_val = value == 'y' ? true : false;
1: +    break;
1: +  case KCFG_TRISTATE:
1: +    if (value == 'y')
1: +      *(enum libbpf_tristate *)ext_val = TRI_YES;
1: +    else if (value == 'm')
1: +      *(enum libbpf_tristate *)ext_val = TRI_MODULE;
1: +    else /* value == 'n' */
1: +      *(enum libbpf_tristate *)ext_val = TRI_NO;
1: +    break;
1: +  case KCFG_CHAR:
1: +    *(char *)ext_val = value;
1: +    break;
1: +  case KCFG_UNKNOWN:
1: +  case KCFG_INT:
1: +  case KCFG_CHAR_ARR:
1: +  default:
1: +    pr_warn("extern (kcfg) %s=%c should be bool, tristate, or char\n",
1: +            ext->name, value);
1: +    return -EINVAL;
1: +  }
1: +  ext->is_set = true;
1: +  return 0;
1:  }
1:  
1:  static int set_kcfg_value_str(struct extern_desc *ext, char *ext_val,
1: -			      const char *value)
1: -{
1: -	size_t len;
1: -
1: -	if (ext->kcfg.type != KCFG_CHAR_ARR) {
1: -		pr_warn("extern (kcfg) %s=%s should be char array\n", ext->name, value);
1: -		return -EINVAL;
1: -	}
1: -
1: -	len = strlen(value);
1: -	if (value[len - 1] != '"') {
1: -		pr_warn("extern (kcfg) '%s': invalid string config '%s'\n",
1: -			ext->name, value);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* strip quotes */
1: -	len -= 2;
1: -	if (len >= ext->kcfg.sz) {
1: -		pr_warn("extern (kcfg) '%s': long string config %s of (%zu bytes) truncated to %d bytes\n",
1: -			ext->name, value, len, ext->kcfg.sz - 1);
1: -		len = ext->kcfg.sz - 1;
1: -	}
1: -	memcpy(ext_val, value + 1, len);
1: -	ext_val[len] = '\0';
1: -	ext->is_set = true;
1: -	return 0;
1: -}
1: -
1: -static int parse_u64(const char *value, __u64 *res)
1: -{
1: -	char *value_end;
1: -	int err;
1: -
1: -	errno = 0;
1: -	*res = strtoull(value, &value_end, 0);
1: -	if (errno) {
1: -		err = -errno;
1: -		pr_warn("failed to parse '%s' as integer: %d\n", value, err);
1: -		return err;
1: -	}
1: -	if (*value_end) {
1: -		pr_warn("failed to parse '%s' as integer completely\n", value);
1: -		return -EINVAL;
1: -	}
1: -	return 0;
1: -}
1: -
1: -static bool is_kcfg_value_in_range(const struct extern_desc *ext, __u64 v)
1: -{
1: -	int bit_sz = ext->kcfg.sz * 8;
1: -
1: -	if (ext->kcfg.sz == 8)
1: -		return true;
1: -
1: -	/* Validate that value stored in u64 fits in integer of `ext->sz`
1: -	 * bytes size without any loss of information. If the target integer
1: -	 * is signed, we rely on the following limits of integer type of
1: -	 * Y bits and subsequent transformation:
1: -	 *
1: -	 *     -2^(Y-1) <= X           <= 2^(Y-1) - 1
1: -	 *            0 <= X + 2^(Y-1) <= 2^Y - 1
1: -	 *            0 <= X + 2^(Y-1) <  2^Y
1: -	 *
1: -	 *  For unsigned target integer, check that all the (64 - Y) bits are
1: -	 *  zero.
1: -	 */
1: -	if (ext->kcfg.is_signed)
1: -		return v + (1ULL << (bit_sz - 1)) < (1ULL << bit_sz);
1: -	else
1: -		return (v >> bit_sz) == 0;
1: +                              const char *value) {
1: +  size_t len;
1: +
1: +  if (ext->kcfg.type != KCFG_CHAR_ARR) {
1: +    pr_warn("extern (kcfg) %s=%s should be char array\n", ext->name, value);
1: +    return -EINVAL;
1: +  }
1: +
1: +  len = strlen(value);
1: +  if (value[len - 1] != '"') {
1: +    pr_warn("extern (kcfg) '%s': invalid string config '%s'\n", ext->name,
1: +            value);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* strip quotes */
1: +  len -= 2;
1: +  if (len >= ext->kcfg.sz) {
1: +    pr_warn(
1: +        "extern (kcfg) '%s': long string config %s of (%zu bytes) truncated to "
1: +        "%d bytes\n",
1: +        ext->name, value, len, ext->kcfg.sz - 1);
1: +    len = ext->kcfg.sz - 1;
1: +  }
1: +  memcpy(ext_val, value + 1, len);
1: +  ext_val[len] = '\0';
1: +  ext->is_set = true;
1: +  return 0;
1: +}
1: +
1: +static int parse_u64(const char *value, __u64 *res) {
1: +  char *value_end;
1: +  int err;
1: +
1: +  errno = 0;
1: +  *res = strtoull(value, &value_end, 0);
1: +  if (errno) {
1: +    err = -errno;
1: +    pr_warn("failed to parse '%s' as integer: %d\n", value, err);
1: +    return err;
1: +  }
1: +  if (*value_end) {
1: +    pr_warn("failed to parse '%s' as integer completely\n", value);
1: +    return -EINVAL;
1: +  }
1: +  return 0;
1: +}
1: +
1: +static bool is_kcfg_value_in_range(const struct extern_desc *ext, __u64 v) {
1: +  int bit_sz = ext->kcfg.sz * 8;
1: +
1: +  if (ext->kcfg.sz == 8)
1: +    return true;
1: +
1: +  /* Validate that value stored in u64 fits in integer of `ext->sz`
1: +   * bytes size without any loss of information. If the target integer
1: +   * is signed, we rely on the following limits of integer type of
1: +   * Y bits and subsequent transformation:
1: +   *
1: +   *     -2^(Y-1) <= X           <= 2^(Y-1) - 1
1: +   *            0 <= X + 2^(Y-1) <= 2^Y - 1
1: +   *            0 <= X + 2^(Y-1) <  2^Y
1: +   *
1: +   *  For unsigned target integer, check that all the (64 - Y) bits are
1: +   *  zero.
1: +   */
1: +  if (ext->kcfg.is_signed)
1: +    return v + (1ULL << (bit_sz - 1)) < (1ULL << bit_sz);
1: +  else
1: +    return (v >> bit_sz) == 0;
1:  }
1:  
1:  static int set_kcfg_value_num(struct extern_desc *ext, void *ext_val,
1: -			      __u64 value)
1: -{
1: -	if (ext->kcfg.type != KCFG_INT && ext->kcfg.type != KCFG_CHAR) {
1: -		pr_warn("extern (kcfg) %s=%llu should be integer\n",
1: -			ext->name, (unsigned long long)value);
1: -		return -EINVAL;
1: -	}
1: -	if (!is_kcfg_value_in_range(ext, value)) {
1: -		pr_warn("extern (kcfg) %s=%llu value doesn't fit in %d bytes\n",
1: -			ext->name, (unsigned long long)value, ext->kcfg.sz);
1: -		return -ERANGE;
1: -	}
1: -	switch (ext->kcfg.sz) {
1: -		case 1: *(__u8 *)ext_val = value; break;
1: -		case 2: *(__u16 *)ext_val = value; break;
1: -		case 4: *(__u32 *)ext_val = value; break;
1: -		case 8: *(__u64 *)ext_val = value; break;
1: -		default:
1: -			return -EINVAL;
1: -	}
1: -	ext->is_set = true;
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__process_kconfig_line(struct bpf_object *obj,
1: -					    char *buf, void *data)
1: -{
1: -	struct extern_desc *ext;
1: -	char *sep, *value;
1: -	int len, err = 0;
1: -	void *ext_val;
1: -	__u64 num;
1: -
1: -	if (strncmp(buf, "CONFIG_", 7))
1: -		return 0;
1: -
1: -	sep = strchr(buf, '=');
1: -	if (!sep) {
1: -		pr_warn("failed to parse '%s': no separator\n", buf);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* Trim ending '\n' */
1: -	len = strlen(buf);
1: -	if (buf[len - 1] == '\n')
1: -		buf[len - 1] = '\0';
1: -	/* Split on '=' and ensure that a value is present. */
1: -	*sep = '\0';
1: -	if (!sep[1]) {
1: -		*sep = '=';
1: -		pr_warn("failed to parse '%s': no value\n", buf);
1: -		return -EINVAL;
1: -	}
1: -
1: -	ext = find_extern_by_name(obj, buf);
1: -	if (!ext || ext->is_set)
1: -		return 0;
1: -
1: -	ext_val = data + ext->kcfg.data_off;
1: -	value = sep + 1;
1: -
1: -	switch (*value) {
1: -	case 'y': case 'n': case 'm':
1: -		err = set_kcfg_value_tri(ext, ext_val, *value);
1: -		break;
1: -	case '"':
1: -		err = set_kcfg_value_str(ext, ext_val, value);
1: -		break;
1: -	default:
1: -		/* assume integer */
1: -		err = parse_u64(value, &num);
1: -		if (err) {
1: -			pr_warn("extern (kcfg) %s=%s should be integer\n",
1: -				ext->name, value);
1: -			return err;
1: -		}
1: -		err = set_kcfg_value_num(ext, ext_val, num);
1: -		break;
1: -	}
1: -	if (err)
1: -		return err;
1: -	pr_debug("extern (kcfg) %s=%s\n", ext->name, value);
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__read_kconfig_file(struct bpf_object *obj, void *data)
1: -{
1: -	char buf[PATH_MAX];
1: -	struct utsname uts;
1: -	int len, err = 0;
1: -	gzFile file;
1: -
1: -	uname(&uts);
1: -	len = snprintf(buf, PATH_MAX, "/boot/config-%s", uts.release);
1: -	if (len < 0)
1: -		return -EINVAL;
1: -	else if (len >= PATH_MAX)
1: -		return -ENAMETOOLONG;
1: -
1: -	/* gzopen also accepts uncompressed files. */
1: -	file = gzopen(buf, "r");
1: -	if (!file)
1: -		file = gzopen("/proc/config.gz", "r");
1: -
1: -	if (!file) {
1: -		pr_warn("failed to open system Kconfig\n");
1: -		return -ENOENT;
1: -	}
1: -
1: -	while (gzgets(file, buf, sizeof(buf))) {
1: -		err = bpf_object__process_kconfig_line(obj, buf, data);
1: -		if (err) {
1: -			pr_warn("error parsing system Kconfig line '%s': %d\n",
1: -				buf, err);
1: -			goto out;
1: -		}
1: -	}
1: +                              __u64 value) {
1: +  if (ext->kcfg.type != KCFG_INT && ext->kcfg.type != KCFG_CHAR) {
1: +    pr_warn("extern (kcfg) %s=%llu should be integer\n", ext->name,
1: +            (unsigned long long)value);
1: +    return -EINVAL;
1: +  }
1: +  if (!is_kcfg_value_in_range(ext, value)) {
1: +    pr_warn("extern (kcfg) %s=%llu value doesn't fit in %d bytes\n", ext->name,
1: +            (unsigned long long)value, ext->kcfg.sz);
1: +    return -ERANGE;
1: +  }
1: +  switch (ext->kcfg.sz) {
1: +  case 1:
1: +    *(__u8 *)ext_val = value;
1: +    break;
1: +  case 2:
1: +    *(__u16 *)ext_val = value;
1: +    break;
1: +  case 4:
1: +    *(__u32 *)ext_val = value;
1: +    break;
1: +  case 8:
1: +    *(__u64 *)ext_val = value;
1: +    break;
1: +  default:
1: +    return -EINVAL;
1: +  }
1: +  ext->is_set = true;
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__process_kconfig_line(struct bpf_object *obj, char *buf,
1: +                                            void *data) {
1: +  struct extern_desc *ext;
1: +  char *sep, *value;
1: +  int len, err = 0;
1: +  void *ext_val;
1: +  __u64 num;
1: +
1: +  if (strncmp(buf, "CONFIG_", 7))
1: +    return 0;
1: +
1: +  sep = strchr(buf, '=');
1: +  if (!sep) {
1: +    pr_warn("failed to parse '%s': no separator\n", buf);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* Trim ending '\n' */
1: +  len = strlen(buf);
1: +  if (buf[len - 1] == '\n')
1: +    buf[len - 1] = '\0';
1: +  /* Split on '=' and ensure that a value is present. */
1: +  *sep = '\0';
1: +  if (!sep[1]) {
1: +    *sep = '=';
1: +    pr_warn("failed to parse '%s': no value\n", buf);
1: +    return -EINVAL;
1: +  }
1: +
1: +  ext = find_extern_by_name(obj, buf);
1: +  if (!ext || ext->is_set)
1: +    return 0;
1: +
1: +  ext_val = data + ext->kcfg.data_off;
1: +  value = sep + 1;
1: +
1: +  switch (*value) {
1: +  case 'y':
1: +  case 'n':
1: +  case 'm':
1: +    err = set_kcfg_value_tri(ext, ext_val, *value);
1: +    break;
1: +  case '"':
1: +    err = set_kcfg_value_str(ext, ext_val, value);
1: +    break;
1: +  default:
1: +    /* assume integer */
1: +    err = parse_u64(value, &num);
1: +    if (err) {
1: +      pr_warn("extern (kcfg) %s=%s should be integer\n", ext->name, value);
1: +      return err;
1: +    }
1: +    err = set_kcfg_value_num(ext, ext_val, num);
1: +    break;
1: +  }
1: +  if (err)
1: +    return err;
1: +  pr_debug("extern (kcfg) %s=%s\n", ext->name, value);
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__read_kconfig_file(struct bpf_object *obj, void *data) {
1: +  char buf[PATH_MAX];
1: +  struct utsname uts;
1: +  int len, err = 0;
1: +  gzFile file;
1: +
1: +  uname(&uts);
1: +  len = snprintf(buf, PATH_MAX, "/boot/config-%s", uts.release);
1: +  if (len < 0)
1: +    return -EINVAL;
1: +  else if (len >= PATH_MAX)
1: +    return -ENAMETOOLONG;
1: +
1: +  /* gzopen also accepts uncompressed files. */
1: +  file = gzopen(buf, "r");
1: +  if (!file)
1: +    file = gzopen("/proc/config.gz", "r");
1: +
1: +  if (!file) {
1: +    pr_warn("failed to open system Kconfig\n");
1: +    return -ENOENT;
1: +  }
1: +
1: +  while (gzgets(file, buf, sizeof(buf))) {
1: +    err = bpf_object__process_kconfig_line(obj, buf, data);
1: +    if (err) {
1: +      pr_warn("error parsing system Kconfig line '%s': %d\n", buf, err);
1: +      goto out;
1: +    }
1: +  }
1:  
1:  out:
1: -	gzclose(file);
1: -	return err;
1: +  gzclose(file);
1: +  return err;
1:  }
1:  
1:  static int bpf_object__read_kconfig_mem(struct bpf_object *obj,
1: -					const char *config, void *data)
1: -{
1: -	char buf[PATH_MAX];
1: -	int err = 0;
1: -	FILE *file;
1: -
1: -	file = fmemopen((void *)config, strlen(config), "r");
1: -	if (!file) {
1: -		err = -errno;
1: -		pr_warn("failed to open in-memory Kconfig: %d\n", err);
1: -		return err;
1: -	}
1: -
1: -	while (fgets(buf, sizeof(buf), file)) {
1: -		err = bpf_object__process_kconfig_line(obj, buf, data);
1: -		if (err) {
1: -			pr_warn("error parsing in-memory Kconfig line '%s': %d\n",
1: -				buf, err);
1: -			break;
1: -		}
1: -	}
1: -
1: -	fclose(file);
1: -	return err;
1: -}
1: -
1: -static int bpf_object__init_kconfig_map(struct bpf_object *obj)
1: -{
1: -	struct extern_desc *last_ext = NULL, *ext;
1: -	size_t map_sz;
1: -	int i, err;
1: -
1: -	for (i = 0; i < obj->nr_extern; i++) {
1: -		ext = &obj->externs[i];
1: -		if (ext->type == EXT_KCFG)
1: -			last_ext = ext;
1: -	}
1: -
1: -	if (!last_ext)
1: -		return 0;
1: -
1: -	map_sz = last_ext->kcfg.data_off + last_ext->kcfg.sz;
1: -	err = bpf_object__init_internal_map(obj, LIBBPF_MAP_KCONFIG,
1: -					    obj->efile.symbols_shndx,
1: -					    NULL, map_sz);
1: -	if (err)
1: -		return err;
1: -
1: -	obj->kconfig_map_idx = obj->nr_maps - 1;
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__init_user_maps(struct bpf_object *obj, bool strict)
1: -{
1: -	Elf_Data *symbols = obj->efile.symbols;
1: -	int i, map_def_sz = 0, nr_maps = 0, nr_syms;
1: -	Elf_Data *data = NULL;
1: -	Elf_Scn *scn;
1: -
1: -	if (obj->efile.maps_shndx < 0)
1: -		return 0;
1: -
1: -	if (!symbols)
1: -		return -EINVAL;
1: -
1: -	scn = elf_sec_by_idx(obj, obj->efile.maps_shndx);
1: -	data = elf_sec_data(obj, scn);
1: -	if (!scn || !data) {
1: -		pr_warn("elf: failed to get legacy map definitions for %s\n",
1: -			obj->path);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/*
1: -	 * Count number of maps. Each map has a name.
1: -	 * Array of maps is not supported: only the first element is
1: -	 * considered.
1: -	 *
1: -	 * TODO: Detect array of map and report error.
1: -	 */
1: -	nr_syms = symbols->d_size / sizeof(GElf_Sym);
1: -	for (i = 0; i < nr_syms; i++) {
1: -		GElf_Sym sym;
1: -
1: -		if (!gelf_getsym(symbols, i, &sym))
1: -			continue;
1: -		if (sym.st_shndx != obj->efile.maps_shndx)
1: -			continue;
1: -		nr_maps++;
1: -	}
1: -	/* Assume equally sized map definitions */
1: -	pr_debug("elf: found %d legacy map definitions (%zd bytes) in %s\n",
1: -		 nr_maps, data->d_size, obj->path);
1: -
1: -	if (!data->d_size || nr_maps == 0 || (data->d_size % nr_maps) != 0) {
1: -		pr_warn("elf: unable to determine legacy map definition size in %s\n",
1: -			obj->path);
1: -		return -EINVAL;
1: -	}
1: -	map_def_sz = data->d_size / nr_maps;
1: -
1: -	/* Fill obj->maps using data in "maps" section.  */
1: -	for (i = 0; i < nr_syms; i++) {
1: -		GElf_Sym sym;
1: -		const char *map_name;
1: -		struct bpf_map_def *def;
1: -		struct bpf_map *map;
1: -
1: -		if (!gelf_getsym(symbols, i, &sym))
1: -			continue;
1: -		if (sym.st_shndx != obj->efile.maps_shndx)
1: -			continue;
1: -
1: -		map = bpf_object__add_map(obj);
1: -		if (IS_ERR(map))
1: -			return PTR_ERR(map);
1: -
1: -		map_name = elf_sym_str(obj, sym.st_name);
1: -		if (!map_name) {
1: -			pr_warn("failed to get map #%d name sym string for obj %s\n",
1: -				i, obj->path);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		if (GELF_ST_TYPE(sym.st_info) == STT_SECTION
1: -		    || GELF_ST_BIND(sym.st_info) == STB_LOCAL) {
1: -			pr_warn("map '%s' (legacy): static maps are not supported\n", map_name);
1: -			return -ENOTSUP;
1: -		}
1: -
1: -		map->libbpf_type = LIBBPF_MAP_UNSPEC;
1: -		map->sec_idx = sym.st_shndx;
1: -		map->sec_offset = sym.st_value;
1: -		pr_debug("map '%s' (legacy): at sec_idx %d, offset %zu.\n",
1: -			 map_name, map->sec_idx, map->sec_offset);
1: -		if (sym.st_value + map_def_sz > data->d_size) {
1: -			pr_warn("corrupted maps section in %s: last map \"%s\" too small\n",
1: -				obj->path, map_name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		map->name = strdup(map_name);
1: -		if (!map->name) {
1: -			pr_warn("failed to alloc map name\n");
1: -			return -ENOMEM;
1: -		}
1: -		pr_debug("map %d is \"%s\"\n", i, map->name);
1: -		def = (struct bpf_map_def *)(data->d_buf + sym.st_value);
1: -		/*
1: -		 * If the definition of the map in the object file fits in
1: -		 * bpf_map_def, copy it.  Any extra fields in our version
1: -		 * of bpf_map_def will default to zero as a result of the
1: -		 * calloc above.
1: -		 */
1: -		if (map_def_sz <= sizeof(struct bpf_map_def)) {
1: -			memcpy(&map->def, def, map_def_sz);
1: -		} else {
1: -			/*
1: -			 * Here the map structure being read is bigger than what
1: -			 * we expect, truncate if the excess bits are all zero.
1: -			 * If they are not zero, reject this map as
1: -			 * incompatible.
1: -			 */
1: -			char *b;
1: -
1: -			for (b = ((char *)def) + sizeof(struct bpf_map_def);
1: -			     b < ((char *)def) + map_def_sz; b++) {
1: -				if (*b != 0) {
1: -					pr_warn("maps section in %s: \"%s\" has unrecognized, non-zero options\n",
1: -						obj->path, map_name);
1: -					if (strict)
1: -						return -EINVAL;
1: -				}
1: -			}
1: -			memcpy(&map->def, def, sizeof(struct bpf_map_def));
1: -		}
1: -	}
1: -	return 0;
1: -}
1: -
1: -const struct btf_type *
1: -skip_mods_and_typedefs(const struct btf *btf, __u32 id, __u32 *res_id)
1: -{
1: -	const struct btf_type *t = btf__type_by_id(btf, id);
1: -
1: -	if (res_id)
1: -		*res_id = id;
1: -
1: -	while (btf_is_mod(t) || btf_is_typedef(t)) {
1: -		if (res_id)
1: -			*res_id = t->type;
1: -		t = btf__type_by_id(btf, t->type);
1: -	}
1: -
1: -	return t;
1: -}
1: -
1: -static const struct btf_type *
1: -resolve_func_ptr(const struct btf *btf, __u32 id, __u32 *res_id)
1: -{
1: -	const struct btf_type *t;
1: -
1: -	t = skip_mods_and_typedefs(btf, id, NULL);
1: -	if (!btf_is_ptr(t))
1: -		return NULL;
1: -
1: -	t = skip_mods_and_typedefs(btf, t->type, res_id);
1: -
1: -	return btf_is_func_proto(t) ? t : NULL;
1: -}
1: -
1: -static const char *__btf_kind_str(__u16 kind)
1: -{
1: -	switch (kind) {
1: -	case BTF_KIND_UNKN: return "void";
1: -	case BTF_KIND_INT: return "int";
1: -	case BTF_KIND_PTR: return "ptr";
1: -	case BTF_KIND_ARRAY: return "array";
1: -	case BTF_KIND_STRUCT: return "struct";
1: -	case BTF_KIND_UNION: return "union";
1: -	case BTF_KIND_ENUM: return "enum";
1: -	case BTF_KIND_FWD: return "fwd";
1: -	case BTF_KIND_TYPEDEF: return "typedef";
1: -	case BTF_KIND_VOLATILE: return "volatile";
1: -	case BTF_KIND_CONST: return "const";
1: -	case BTF_KIND_RESTRICT: return "restrict";
1: -	case BTF_KIND_FUNC: return "func";
1: -	case BTF_KIND_FUNC_PROTO: return "func_proto";
1: -	case BTF_KIND_VAR: return "var";
1: -	case BTF_KIND_DATASEC: return "datasec";
1: -	case BTF_KIND_FLOAT: return "float";
1: -	default: return "unknown";
1: -	}
1: -}
1: -
1: -const char *btf_kind_str(const struct btf_type *t)
1: -{
1: -	return __btf_kind_str(btf_kind(t));
1: +                                        const char *config, void *data) {
1: +  char buf[PATH_MAX];
1: +  int err = 0;
1: +  FILE *file;
1: +
1: +  file = fmemopen((void *)config, strlen(config), "r");
1: +  if (!file) {
1: +    err = -errno;
1: +    pr_warn("failed to open in-memory Kconfig: %d\n", err);
1: +    return err;
1: +  }
1: +
1: +  while (fgets(buf, sizeof(buf), file)) {
1: +    err = bpf_object__process_kconfig_line(obj, buf, data);
1: +    if (err) {
1: +      pr_warn("error parsing in-memory Kconfig line '%s': %d\n", buf, err);
1: +      break;
1: +    }
1: +  }
1: +
1: +  fclose(file);
1: +  return err;
1: +}
1: +
1: +static int bpf_object__init_kconfig_map(struct bpf_object *obj) {
1: +  struct extern_desc *last_ext = NULL, *ext;
1: +  size_t map_sz;
1: +  int i, err;
1: +
1: +  for (i = 0; i < obj->nr_extern; i++) {
1: +    ext = &obj->externs[i];
1: +    if (ext->type == EXT_KCFG)
1: +      last_ext = ext;
1: +  }
1: +
1: +  if (!last_ext)
1: +    return 0;
1: +
1: +  map_sz = last_ext->kcfg.data_off + last_ext->kcfg.sz;
1: +  err = bpf_object__init_internal_map(obj, LIBBPF_MAP_KCONFIG,
1: +                                      obj->efile.symbols_shndx, NULL, map_sz);
1: +  if (err)
1: +    return err;
1: +
1: +  obj->kconfig_map_idx = obj->nr_maps - 1;
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__init_user_maps(struct bpf_object *obj, bool strict) {
1: +  Elf_Data *symbols = obj->efile.symbols;
1: +  int i, map_def_sz = 0, nr_maps = 0, nr_syms;
1: +  Elf_Data *data = NULL;
1: +  Elf_Scn *scn;
1: +
1: +  if (obj->efile.maps_shndx < 0)
1: +    return 0;
1: +
1: +  if (!symbols)
1: +    return -EINVAL;
1: +
1: +  scn = elf_sec_by_idx(obj, obj->efile.maps_shndx);
1: +  data = elf_sec_data(obj, scn);
1: +  if (!scn || !data) {
1: +    pr_warn("elf: failed to get legacy map definitions for %s\n", obj->path);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /*
1: +   * Count number of maps. Each map has a name.
1: +   * Array of maps is not supported: only the first element is
1: +   * considered.
1: +   *
1: +   * TODO: Detect array of map and report error.
1: +   */
1: +  nr_syms = symbols->d_size / sizeof(GElf_Sym);
1: +  for (i = 0; i < nr_syms; i++) {
1: +    GElf_Sym sym;
1: +
1: +    if (!gelf_getsym(symbols, i, &sym))
1: +      continue;
1: +    if (sym.st_shndx != obj->efile.maps_shndx)
1: +      continue;
1: +    nr_maps++;
1: +  }
1: +  /* Assume equally sized map definitions */
1: +  pr_debug("elf: found %d legacy map definitions (%zd bytes) in %s\n", nr_maps,
1: +           data->d_size, obj->path);
1: +
1: +  if (!data->d_size || nr_maps == 0 || (data->d_size % nr_maps) != 0) {
1: +    pr_warn("elf: unable to determine legacy map definition size in %s\n",
1: +            obj->path);
1: +    return -EINVAL;
1: +  }
1: +  map_def_sz = data->d_size / nr_maps;
1: +
1: +  /* Fill obj->maps using data in "maps" section.  */
1: +  for (i = 0; i < nr_syms; i++) {
1: +    GElf_Sym sym;
1: +    const char *map_name;
1: +    struct bpf_map_def *def;
1: +    struct bpf_map *map;
1: +
1: +    if (!gelf_getsym(symbols, i, &sym))
1: +      continue;
1: +    if (sym.st_shndx != obj->efile.maps_shndx)
1: +      continue;
1: +
1: +    map = bpf_object__add_map(obj);
1: +    if (IS_ERR(map))
1: +      return PTR_ERR(map);
1: +
1: +    map_name = elf_sym_str(obj, sym.st_name);
1: +    if (!map_name) {
1: +      pr_warn("failed to get map #%d name sym string for obj %s\n", i,
1: +              obj->path);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    if (GELF_ST_TYPE(sym.st_info) == STT_SECTION ||
1: +        GELF_ST_BIND(sym.st_info) == STB_LOCAL) {
1: +      pr_warn("map '%s' (legacy): static maps are not supported\n", map_name);
1: +      return -ENOTSUP;
1: +    }
1: +
1: +    map->libbpf_type = LIBBPF_MAP_UNSPEC;
1: +    map->sec_idx = sym.st_shndx;
1: +    map->sec_offset = sym.st_value;
1: +    pr_debug("map '%s' (legacy): at sec_idx %d, offset %zu.\n", map_name,
1: +             map->sec_idx, map->sec_offset);
1: +    if (sym.st_value + map_def_sz > data->d_size) {
1: +      pr_warn("corrupted maps section in %s: last map \"%s\" too small\n",
1: +              obj->path, map_name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    map->name = strdup(map_name);
1: +    if (!map->name) {
1: +      pr_warn("failed to alloc map name\n");
1: +      return -ENOMEM;
1: +    }
1: +    pr_debug("map %d is \"%s\"\n", i, map->name);
1: +    def = (struct bpf_map_def *)(data->d_buf + sym.st_value);
1: +    /*
1: +     * If the definition of the map in the object file fits in
1: +     * bpf_map_def, copy it.  Any extra fields in our version
1: +     * of bpf_map_def will default to zero as a result of the
1: +     * calloc above.
1: +     */
1: +    if (map_def_sz <= sizeof(struct bpf_map_def)) {
1: +      memcpy(&map->def, def, map_def_sz);
1: +    } else {
1: +      /*
1: +       * Here the map structure being read is bigger than what
1: +       * we expect, truncate if the excess bits are all zero.
1: +       * If they are not zero, reject this map as
1: +       * incompatible.
1: +       */
1: +      char *b;
1: +
1: +      for (b = ((char *)def) + sizeof(struct bpf_map_def);
1: +           b < ((char *)def) + map_def_sz; b++) {
1: +        if (*b != 0) {
1: +          pr_warn(
1: +              "maps section in %s: \"%s\" has unrecognized, non-zero options\n",
1: +              obj->path, map_name);
1: +          if (strict)
1: +            return -EINVAL;
1: +        }
1: +      }
1: +      memcpy(&map->def, def, sizeof(struct bpf_map_def));
1: +    }
1: +  }
1: +  return 0;
1: +}
1: +
1: +const struct btf_type *skip_mods_and_typedefs(const struct btf *btf, __u32 id,
1: +                                              __u32 *res_id) {
1: +  const struct btf_type *t = btf__type_by_id(btf, id);
1: +
1: +  if (res_id)
1: +    *res_id = id;
1: +
1: +  while (btf_is_mod(t) || btf_is_typedef(t)) {
1: +    if (res_id)
1: +      *res_id = t->type;
1: +    t = btf__type_by_id(btf, t->type);
1: +  }
1: +
1: +  return t;
1: +}
1: +
1: +static const struct btf_type *resolve_func_ptr(const struct btf *btf, __u32 id,
1: +                                               __u32 *res_id) {
1: +  const struct btf_type *t;
1: +
1: +  t = skip_mods_and_typedefs(btf, id, NULL);
1: +  if (!btf_is_ptr(t))
1: +    return NULL;
1: +
1: +  t = skip_mods_and_typedefs(btf, t->type, res_id);
1: +
1: +  return btf_is_func_proto(t) ? t : NULL;
1: +}
1: +
1: +static const char *__btf_kind_str(__u16 kind) {
1: +  switch (kind) {
1: +  case BTF_KIND_UNKN:
1: +    return "void";
1: +  case BTF_KIND_INT:
1: +    return "int";
1: +  case BTF_KIND_PTR:
1: +    return "ptr";
1: +  case BTF_KIND_ARRAY:
1: +    return "array";
1: +  case BTF_KIND_STRUCT:
1: +    return "struct";
1: +  case BTF_KIND_UNION:
1: +    return "union";
1: +  case BTF_KIND_ENUM:
1: +    return "enum";
1: +  case BTF_KIND_FWD:
1: +    return "fwd";
1: +  case BTF_KIND_TYPEDEF:
1: +    return "typedef";
1: +  case BTF_KIND_VOLATILE:
1: +    return "volatile";
1: +  case BTF_KIND_CONST:
1: +    return "const";
1: +  case BTF_KIND_RESTRICT:
1: +    return "restrict";
1: +  case BTF_KIND_FUNC:
1: +    return "func";
1: +  case BTF_KIND_FUNC_PROTO:
1: +    return "func_proto";
1: +  case BTF_KIND_VAR:
1: +    return "var";
1: +  case BTF_KIND_DATASEC:
1: +    return "datasec";
1: +  case BTF_KIND_FLOAT:
1: +    return "float";
1: +  default:
1: +    return "unknown";
1: +  }
1: +}
1: +
1: +const char *btf_kind_str(const struct btf_type *t) {
1: +  return __btf_kind_str(btf_kind(t));
1:  }
1:  
1:  /*
1: @@ -2003,2781 +1983,2701 @@ const char *btf_kind_str(const struct btf_type *t)
1:   * type definition, while using only sizeof(void *) space in ELF data section.
1:   */
1:  static bool get_map_field_int(const char *map_name, const struct btf *btf,
1: -			      const struct btf_member *m, __u32 *res)
1: -{
1: -	const struct btf_type *t = skip_mods_and_typedefs(btf, m->type, NULL);
1: -	const char *name = btf__name_by_offset(btf, m->name_off);
1: -	const struct btf_array *arr_info;
1: -	const struct btf_type *arr_t;
1: -
1: -	if (!btf_is_ptr(t)) {
1: -		pr_warn("map '%s': attr '%s': expected PTR, got %s.\n",
1: -			map_name, name, btf_kind_str(t));
1: -		return false;
1: -	}
1: -
1: -	arr_t = btf__type_by_id(btf, t->type);
1: -	if (!arr_t) {
1: -		pr_warn("map '%s': attr '%s': type [%u] not found.\n",
1: -			map_name, name, t->type);
1: -		return false;
1: -	}
1: -	if (!btf_is_array(arr_t)) {
1: -		pr_warn("map '%s': attr '%s': expected ARRAY, got %s.\n",
1: -			map_name, name, btf_kind_str(arr_t));
1: -		return false;
1: -	}
1: -	arr_info = btf_array(arr_t);
1: -	*res = arr_info->nelems;
1: -	return true;
1: -}
1: -
1: -static int build_map_pin_path(struct bpf_map *map, const char *path)
1: -{
1: -	char buf[PATH_MAX];
1: -	int len;
1: -
1: -	if (!path)
1: -		path = "/sys/fs/bpf";
1: -
1: -	len = snprintf(buf, PATH_MAX, "%s/%s", path, bpf_map__name(map));
1: -	if (len < 0)
1: -		return -EINVAL;
1: -	else if (len >= PATH_MAX)
1: -		return -ENAMETOOLONG;
1: -
1: -	return bpf_map__set_pin_path(map, buf);
1: +                              const struct btf_member *m, __u32 *res) {
1: +  const struct btf_type *t = skip_mods_and_typedefs(btf, m->type, NULL);
1: +  const char *name = btf__name_by_offset(btf, m->name_off);
1: +  const struct btf_array *arr_info;
1: +  const struct btf_type *arr_t;
1: +
1: +  if (!btf_is_ptr(t)) {
1: +    pr_warn("map '%s': attr '%s': expected PTR, got %s.\n", map_name, name,
1: +            btf_kind_str(t));
1: +    return false;
1: +  }
1: +
1: +  arr_t = btf__type_by_id(btf, t->type);
1: +  if (!arr_t) {
1: +    pr_warn("map '%s': attr '%s': type [%u] not found.\n", map_name, name,
1: +            t->type);
1: +    return false;
1: +  }
1: +  if (!btf_is_array(arr_t)) {
1: +    pr_warn("map '%s': attr '%s': expected ARRAY, got %s.\n", map_name, name,
1: +            btf_kind_str(arr_t));
1: +    return false;
1: +  }
1: +  arr_info = btf_array(arr_t);
1: +  *res = arr_info->nelems;
1: +  return true;
1: +}
1: +
1: +static int build_map_pin_path(struct bpf_map *map, const char *path) {
1: +  char buf[PATH_MAX];
1: +  int len;
1: +
1: +  if (!path)
1: +    path = "/sys/fs/bpf";
1: +
1: +  len = snprintf(buf, PATH_MAX, "%s/%s", path, bpf_map__name(map));
1: +  if (len < 0)
1: +    return -EINVAL;
1: +  else if (len >= PATH_MAX)
1: +    return -ENAMETOOLONG;
1: +
1: +  return bpf_map__set_pin_path(map, buf);
1:  }
1:  
1:  int parse_btf_map_def(const char *map_name, struct btf *btf,
1: -		      const struct btf_type *def_t, bool strict,
1: -		      struct btf_map_def *map_def, struct btf_map_def *inner_def)
1: -{
1: -	const struct btf_type *t;
1: -	const struct btf_member *m;
1: -	bool is_inner = inner_def == NULL;
1: -	int vlen, i;
1: -
1: -	vlen = btf_vlen(def_t);
1: -	m = btf_members(def_t);
1: -	for (i = 0; i < vlen; i++, m++) {
1: -		const char *name = btf__name_by_offset(btf, m->name_off);
1: -
1: -		if (!name) {
1: -			pr_warn("map '%s': invalid field #%d.\n", map_name, i);
1: -			return -EINVAL;
1: -		}
1: -		if (strcmp(name, "type") == 0) {
1: -			if (!get_map_field_int(map_name, btf, m, &map_def->map_type))
1: -				return -EINVAL;
1: -			map_def->parts |= MAP_DEF_MAP_TYPE;
1: -		} else if (strcmp(name, "max_entries") == 0) {
1: -			if (!get_map_field_int(map_name, btf, m, &map_def->max_entries))
1: -				return -EINVAL;
1: -			map_def->parts |= MAP_DEF_MAX_ENTRIES;
1: -		} else if (strcmp(name, "map_flags") == 0) {
1: -			if (!get_map_field_int(map_name, btf, m, &map_def->map_flags))
1: -				return -EINVAL;
1: -			map_def->parts |= MAP_DEF_MAP_FLAGS;
1: -		} else if (strcmp(name, "numa_node") == 0) {
1: -			if (!get_map_field_int(map_name, btf, m, &map_def->numa_node))
1: -				return -EINVAL;
1: -			map_def->parts |= MAP_DEF_NUMA_NODE;
1: -		} else if (strcmp(name, "key_size") == 0) {
1: -			__u32 sz;
1: -
1: -			if (!get_map_field_int(map_name, btf, m, &sz))
1: -				return -EINVAL;
1: -			if (map_def->key_size && map_def->key_size != sz) {
1: -				pr_warn("map '%s': conflicting key size %u != %u.\n",
1: -					map_name, map_def->key_size, sz);
1: -				return -EINVAL;
1: -			}
1: -			map_def->key_size = sz;
1: -			map_def->parts |= MAP_DEF_KEY_SIZE;
1: -		} else if (strcmp(name, "key") == 0) {
1: -			__s64 sz;
1: -
1: -			t = btf__type_by_id(btf, m->type);
1: -			if (!t) {
1: -				pr_warn("map '%s': key type [%d] not found.\n",
1: -					map_name, m->type);
1: -				return -EINVAL;
1: -			}
1: -			if (!btf_is_ptr(t)) {
1: -				pr_warn("map '%s': key spec is not PTR: %s.\n",
1: -					map_name, btf_kind_str(t));
1: -				return -EINVAL;
1: -			}
1: -			sz = btf__resolve_size(btf, t->type);
1: -			if (sz < 0) {
1: -				pr_warn("map '%s': can't determine key size for type [%u]: %zd.\n",
1: -					map_name, t->type, (ssize_t)sz);
1: -				return sz;
1: -			}
1: -			if (map_def->key_size && map_def->key_size != sz) {
1: -				pr_warn("map '%s': conflicting key size %u != %zd.\n",
1: -					map_name, map_def->key_size, (ssize_t)sz);
1: -				return -EINVAL;
1: -			}
1: -			map_def->key_size = sz;
1: -			map_def->key_type_id = t->type;
1: -			map_def->parts |= MAP_DEF_KEY_SIZE | MAP_DEF_KEY_TYPE;
1: -		} else if (strcmp(name, "value_size") == 0) {
1: -			__u32 sz;
1: -
1: -			if (!get_map_field_int(map_name, btf, m, &sz))
1: -				return -EINVAL;
1: -			if (map_def->value_size && map_def->value_size != sz) {
1: -				pr_warn("map '%s': conflicting value size %u != %u.\n",
1: -					map_name, map_def->value_size, sz);
1: -				return -EINVAL;
1: -			}
1: -			map_def->value_size = sz;
1: -			map_def->parts |= MAP_DEF_VALUE_SIZE;
1: -		} else if (strcmp(name, "value") == 0) {
1: -			__s64 sz;
1: -
1: -			t = btf__type_by_id(btf, m->type);
1: -			if (!t) {
1: -				pr_warn("map '%s': value type [%d] not found.\n",
1: -					map_name, m->type);
1: -				return -EINVAL;
1: -			}
1: -			if (!btf_is_ptr(t)) {
1: -				pr_warn("map '%s': value spec is not PTR: %s.\n",
1: -					map_name, btf_kind_str(t));
1: -				return -EINVAL;
1: -			}
1: -			sz = btf__resolve_size(btf, t->type);
1: -			if (sz < 0) {
1: -				pr_warn("map '%s': can't determine value size for type [%u]: %zd.\n",
1: -					map_name, t->type, (ssize_t)sz);
1: -				return sz;
1: -			}
1: -			if (map_def->value_size && map_def->value_size != sz) {
1: -				pr_warn("map '%s': conflicting value size %u != %zd.\n",
1: -					map_name, map_def->value_size, (ssize_t)sz);
1: -				return -EINVAL;
1: -			}
1: -			map_def->value_size = sz;
1: -			map_def->value_type_id = t->type;
1: -			map_def->parts |= MAP_DEF_VALUE_SIZE | MAP_DEF_VALUE_TYPE;
1: -		}
1: -		else if (strcmp(name, "values") == 0) {
1: -			char inner_map_name[128];
1: -			int err;
1: -
1: -			if (is_inner) {
1: -				pr_warn("map '%s': multi-level inner maps not supported.\n",
1: -					map_name);
1: -				return -ENOTSUP;
1: -			}
1: -			if (i != vlen - 1) {
1: -				pr_warn("map '%s': '%s' member should be last.\n",
1: -					map_name, name);
1: -				return -EINVAL;
1: -			}
1: -			if (!bpf_map_type__is_map_in_map(map_def->map_type)) {
1: -				pr_warn("map '%s': should be map-in-map.\n",
1: -					map_name);
1: -				return -ENOTSUP;
1: -			}
1: -			if (map_def->value_size && map_def->value_size != 4) {
1: -				pr_warn("map '%s': conflicting value size %u != 4.\n",
1: -					map_name, map_def->value_size);
1: -				return -EINVAL;
1: -			}
1: -			map_def->value_size = 4;
1: -			t = btf__type_by_id(btf, m->type);
1: -			if (!t) {
1: -				pr_warn("map '%s': map-in-map inner type [%d] not found.\n",
1: -					map_name, m->type);
1: -				return -EINVAL;
1: -			}
1: -			if (!btf_is_array(t) || btf_array(t)->nelems) {
1: -				pr_warn("map '%s': map-in-map inner spec is not a zero-sized array.\n",
1: -					map_name);
1: -				return -EINVAL;
1: -			}
1: -			t = skip_mods_and_typedefs(btf, btf_array(t)->type, NULL);
1: -			if (!btf_is_ptr(t)) {
1: -				pr_warn("map '%s': map-in-map inner def is of unexpected kind %s.\n",
1: -					map_name, btf_kind_str(t));
1: -				return -EINVAL;
1: -			}
1: -			t = skip_mods_and_typedefs(btf, t->type, NULL);
1: -			if (!btf_is_struct(t)) {
1: -				pr_warn("map '%s': map-in-map inner def is of unexpected kind %s.\n",
1: -					map_name, btf_kind_str(t));
1: -				return -EINVAL;
1: -			}
1: -
1: -			snprintf(inner_map_name, sizeof(inner_map_name), "%s.inner", map_name);
1: -			err = parse_btf_map_def(inner_map_name, btf, t, strict, inner_def, NULL);
1: -			if (err)
1: -				return err;
1: -
1: -			map_def->parts |= MAP_DEF_INNER_MAP;
1: -		} else if (strcmp(name, "pinning") == 0) {
1: -			__u32 val;
1: -
1: -			if (is_inner) {
1: -				pr_warn("map '%s': inner def can't be pinned.\n", map_name);
1: -				return -EINVAL;
1: -			}
1: -			if (!get_map_field_int(map_name, btf, m, &val))
1: -				return -EINVAL;
1: -			if (val != LIBBPF_PIN_NONE && val != LIBBPF_PIN_BY_NAME) {
1: -				pr_warn("map '%s': invalid pinning value %u.\n",
1: -					map_name, val);
1: -				return -EINVAL;
1: -			}
1: -			map_def->pinning = val;
1: -			map_def->parts |= MAP_DEF_PINNING;
1: -		} else {
1: -			if (strict) {
1: -				pr_warn("map '%s': unknown field '%s'.\n", map_name, name);
1: -				return -ENOTSUP;
1: -			}
1: -			pr_debug("map '%s': ignoring unknown field '%s'.\n", map_name, name);
1: -		}
1: -	}
1: -
1: -	if (map_def->map_type == BPF_MAP_TYPE_UNSPEC) {
1: -		pr_warn("map '%s': map type isn't specified.\n", map_name);
1: -		return -EINVAL;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static void fill_map_from_def(struct bpf_map *map, const struct btf_map_def *def)
1: -{
1: -	map->def.type = def->map_type;
1: -	map->def.key_size = def->key_size;
1: -	map->def.value_size = def->value_size;
1: -	map->def.max_entries = def->max_entries;
1: -	map->def.map_flags = def->map_flags;
1: -
1: -	map->numa_node = def->numa_node;
1: -	map->btf_key_type_id = def->key_type_id;
1: -	map->btf_value_type_id = def->value_type_id;
1: -
1: -	if (def->parts & MAP_DEF_MAP_TYPE)
1: -		pr_debug("map '%s': found type = %u.\n", map->name, def->map_type);
1: -
1: -	if (def->parts & MAP_DEF_KEY_TYPE)
1: -		pr_debug("map '%s': found key [%u], sz = %u.\n",
1: -			 map->name, def->key_type_id, def->key_size);
1: -	else if (def->parts & MAP_DEF_KEY_SIZE)
1: -		pr_debug("map '%s': found key_size = %u.\n", map->name, def->key_size);
1: -
1: -	if (def->parts & MAP_DEF_VALUE_TYPE)
1: -		pr_debug("map '%s': found value [%u], sz = %u.\n",
1: -			 map->name, def->value_type_id, def->value_size);
1: -	else if (def->parts & MAP_DEF_VALUE_SIZE)
1: -		pr_debug("map '%s': found value_size = %u.\n", map->name, def->value_size);
1: -
1: -	if (def->parts & MAP_DEF_MAX_ENTRIES)
1: -		pr_debug("map '%s': found max_entries = %u.\n", map->name, def->max_entries);
1: -	if (def->parts & MAP_DEF_MAP_FLAGS)
1: -		pr_debug("map '%s': found map_flags = %u.\n", map->name, def->map_flags);
1: -	if (def->parts & MAP_DEF_PINNING)
1: -		pr_debug("map '%s': found pinning = %u.\n", map->name, def->pinning);
1: -	if (def->parts & MAP_DEF_NUMA_NODE)
1: -		pr_debug("map '%s': found numa_node = %u.\n", map->name, def->numa_node);
1: -
1: -	if (def->parts & MAP_DEF_INNER_MAP)
1: -		pr_debug("map '%s': found inner map definition.\n", map->name);
1: -}
1: -
1: -static const char *btf_var_linkage_str(__u32 linkage)
1: -{
1: -	switch (linkage) {
1: -	case BTF_VAR_STATIC: return "static";
1: -	case BTF_VAR_GLOBAL_ALLOCATED: return "global";
1: -	case BTF_VAR_GLOBAL_EXTERN: return "extern";
1: -	default: return "unknown";
1: -	}
1: +                      const struct btf_type *def_t, bool strict,
1: +                      struct btf_map_def *map_def,
1: +                      struct btf_map_def *inner_def) {
1: +  const struct btf_type *t;
1: +  const struct btf_member *m;
1: +  bool is_inner = inner_def == NULL;
1: +  int vlen, i;
1: +
1: +  vlen = btf_vlen(def_t);
1: +  m = btf_members(def_t);
1: +  for (i = 0; i < vlen; i++, m++) {
1: +    const char *name = btf__name_by_offset(btf, m->name_off);
1: +
1: +    if (!name) {
1: +      pr_warn("map '%s': invalid field #%d.\n", map_name, i);
1: +      return -EINVAL;
1: +    }
1: +    if (strcmp(name, "type") == 0) {
1: +      if (!get_map_field_int(map_name, btf, m, &map_def->map_type))
1: +        return -EINVAL;
1: +      map_def->parts |= MAP_DEF_MAP_TYPE;
1: +    } else if (strcmp(name, "max_entries") == 0) {
1: +      if (!get_map_field_int(map_name, btf, m, &map_def->max_entries))
1: +        return -EINVAL;
1: +      map_def->parts |= MAP_DEF_MAX_ENTRIES;
1: +    } else if (strcmp(name, "map_flags") == 0) {
1: +      if (!get_map_field_int(map_name, btf, m, &map_def->map_flags))
1: +        return -EINVAL;
1: +      map_def->parts |= MAP_DEF_MAP_FLAGS;
1: +    } else if (strcmp(name, "numa_node") == 0) {
1: +      if (!get_map_field_int(map_name, btf, m, &map_def->numa_node))
1: +        return -EINVAL;
1: +      map_def->parts |= MAP_DEF_NUMA_NODE;
1: +    } else if (strcmp(name, "key_size") == 0) {
1: +      __u32 sz;
1: +
1: +      if (!get_map_field_int(map_name, btf, m, &sz))
1: +        return -EINVAL;
1: +      if (map_def->key_size && map_def->key_size != sz) {
1: +        pr_warn("map '%s': conflicting key size %u != %u.\n", map_name,
1: +                map_def->key_size, sz);
1: +        return -EINVAL;
1: +      }
1: +      map_def->key_size = sz;
1: +      map_def->parts |= MAP_DEF_KEY_SIZE;
1: +    } else if (strcmp(name, "key") == 0) {
1: +      __s64 sz;
1: +
1: +      t = btf__type_by_id(btf, m->type);
1: +      if (!t) {
1: +        pr_warn("map '%s': key type [%d] not found.\n", map_name, m->type);
1: +        return -EINVAL;
1: +      }
1: +      if (!btf_is_ptr(t)) {
1: +        pr_warn("map '%s': key spec is not PTR: %s.\n", map_name,
1: +                btf_kind_str(t));
1: +        return -EINVAL;
1: +      }
1: +      sz = btf__resolve_size(btf, t->type);
1: +      if (sz < 0) {
1: +        pr_warn("map '%s': can't determine key size for type [%u]: %zd.\n",
1: +                map_name, t->type, (ssize_t)sz);
1: +        return sz;
1: +      }
1: +      if (map_def->key_size && map_def->key_size != sz) {
1: +        pr_warn("map '%s': conflicting key size %u != %zd.\n", map_name,
1: +                map_def->key_size, (ssize_t)sz);
1: +        return -EINVAL;
1: +      }
1: +      map_def->key_size = sz;
1: +      map_def->key_type_id = t->type;
1: +      map_def->parts |= MAP_DEF_KEY_SIZE | MAP_DEF_KEY_TYPE;
1: +    } else if (strcmp(name, "value_size") == 0) {
1: +      __u32 sz;
1: +
1: +      if (!get_map_field_int(map_name, btf, m, &sz))
1: +        return -EINVAL;
1: +      if (map_def->value_size && map_def->value_size != sz) {
1: +        pr_warn("map '%s': conflicting value size %u != %u.\n", map_name,
1: +                map_def->value_size, sz);
1: +        return -EINVAL;
1: +      }
1: +      map_def->value_size = sz;
1: +      map_def->parts |= MAP_DEF_VALUE_SIZE;
1: +    } else if (strcmp(name, "value") == 0) {
1: +      __s64 sz;
1: +
1: +      t = btf__type_by_id(btf, m->type);
1: +      if (!t) {
1: +        pr_warn("map '%s': value type [%d] not found.\n", map_name, m->type);
1: +        return -EINVAL;
1: +      }
1: +      if (!btf_is_ptr(t)) {
1: +        pr_warn("map '%s': value spec is not PTR: %s.\n", map_name,
1: +                btf_kind_str(t));
1: +        return -EINVAL;
1: +      }
1: +      sz = btf__resolve_size(btf, t->type);
1: +      if (sz < 0) {
1: +        pr_warn("map '%s': can't determine value size for type [%u]: %zd.\n",
1: +                map_name, t->type, (ssize_t)sz);
1: +        return sz;
1: +      }
1: +      if (map_def->value_size && map_def->value_size != sz) {
1: +        pr_warn("map '%s': conflicting value size %u != %zd.\n", map_name,
1: +                map_def->value_size, (ssize_t)sz);
1: +        return -EINVAL;
1: +      }
1: +      map_def->value_size = sz;
1: +      map_def->value_type_id = t->type;
1: +      map_def->parts |= MAP_DEF_VALUE_SIZE | MAP_DEF_VALUE_TYPE;
1: +    } else if (strcmp(name, "values") == 0) {
1: +      char inner_map_name[128];
1: +      int err;
1: +
1: +      if (is_inner) {
1: +        pr_warn("map '%s': multi-level inner maps not supported.\n", map_name);
1: +        return -ENOTSUP;
1: +      }
1: +      if (i != vlen - 1) {
1: +        pr_warn("map '%s': '%s' member should be last.\n", map_name, name);
1: +        return -EINVAL;
1: +      }
1: +      if (!bpf_map_type__is_map_in_map(map_def->map_type)) {
1: +        pr_warn("map '%s': should be map-in-map.\n", map_name);
1: +        return -ENOTSUP;
1: +      }
1: +      if (map_def->value_size && map_def->value_size != 4) {
1: +        pr_warn("map '%s': conflicting value size %u != 4.\n", map_name,
1: +                map_def->value_size);
1: +        return -EINVAL;
1: +      }
1: +      map_def->value_size = 4;
1: +      t = btf__type_by_id(btf, m->type);
1: +      if (!t) {
1: +        pr_warn("map '%s': map-in-map inner type [%d] not found.\n", map_name,
1: +                m->type);
1: +        return -EINVAL;
1: +      }
1: +      if (!btf_is_array(t) || btf_array(t)->nelems) {
1: +        pr_warn("map '%s': map-in-map inner spec is not a zero-sized array.\n",
1: +                map_name);
1: +        return -EINVAL;
1: +      }
1: +      t = skip_mods_and_typedefs(btf, btf_array(t)->type, NULL);
1: +      if (!btf_is_ptr(t)) {
1: +        pr_warn("map '%s': map-in-map inner def is of unexpected kind %s.\n",
1: +                map_name, btf_kind_str(t));
1: +        return -EINVAL;
1: +      }
1: +      t = skip_mods_and_typedefs(btf, t->type, NULL);
1: +      if (!btf_is_struct(t)) {
1: +        pr_warn("map '%s': map-in-map inner def is of unexpected kind %s.\n",
1: +                map_name, btf_kind_str(t));
1: +        return -EINVAL;
1: +      }
1: +
1: +      snprintf(inner_map_name, sizeof(inner_map_name), "%s.inner", map_name);
1: +      err = parse_btf_map_def(inner_map_name, btf, t, strict, inner_def, NULL);
1: +      if (err)
1: +        return err;
1: +
1: +      map_def->parts |= MAP_DEF_INNER_MAP;
1: +    } else if (strcmp(name, "pinning") == 0) {
1: +      __u32 val;
1: +
1: +      if (is_inner) {
1: +        pr_warn("map '%s': inner def can't be pinned.\n", map_name);
1: +        return -EINVAL;
1: +      }
1: +      if (!get_map_field_int(map_name, btf, m, &val))
1: +        return -EINVAL;
1: +      if (val != LIBBPF_PIN_NONE && val != LIBBPF_PIN_BY_NAME) {
1: +        pr_warn("map '%s': invalid pinning value %u.\n", map_name, val);
1: +        return -EINVAL;
1: +      }
1: +      map_def->pinning = val;
1: +      map_def->parts |= MAP_DEF_PINNING;
1: +    } else {
1: +      if (strict) {
1: +        pr_warn("map '%s': unknown field '%s'.\n", map_name, name);
1: +        return -ENOTSUP;
1: +      }
1: +      pr_debug("map '%s': ignoring unknown field '%s'.\n", map_name, name);
1: +    }
1: +  }
1: +
1: +  if (map_def->map_type == BPF_MAP_TYPE_UNSPEC) {
1: +    pr_warn("map '%s': map type isn't specified.\n", map_name);
1: +    return -EINVAL;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static void fill_map_from_def(struct bpf_map *map,
1: +                              const struct btf_map_def *def) {
1: +  map->def.type = def->map_type;
1: +  map->def.key_size = def->key_size;
1: +  map->def.value_size = def->value_size;
1: +  map->def.max_entries = def->max_entries;
1: +  map->def.map_flags = def->map_flags;
1: +
1: +  map->numa_node = def->numa_node;
1: +  map->btf_key_type_id = def->key_type_id;
1: +  map->btf_value_type_id = def->value_type_id;
1: +
1: +  if (def->parts & MAP_DEF_MAP_TYPE)
1: +    pr_debug("map '%s': found type = %u.\n", map->name, def->map_type);
1: +
1: +  if (def->parts & MAP_DEF_KEY_TYPE)
1: +    pr_debug("map '%s': found key [%u], sz = %u.\n", map->name,
1: +             def->key_type_id, def->key_size);
1: +  else if (def->parts & MAP_DEF_KEY_SIZE)
1: +    pr_debug("map '%s': found key_size = %u.\n", map->name, def->key_size);
1: +
1: +  if (def->parts & MAP_DEF_VALUE_TYPE)
1: +    pr_debug("map '%s': found value [%u], sz = %u.\n", map->name,
1: +             def->value_type_id, def->value_size);
1: +  else if (def->parts & MAP_DEF_VALUE_SIZE)
1: +    pr_debug("map '%s': found value_size = %u.\n", map->name, def->value_size);
1: +
1: +  if (def->parts & MAP_DEF_MAX_ENTRIES)
1: +    pr_debug("map '%s': found max_entries = %u.\n", map->name,
1: +             def->max_entries);
1: +  if (def->parts & MAP_DEF_MAP_FLAGS)
1: +    pr_debug("map '%s': found map_flags = %u.\n", map->name, def->map_flags);
1: +  if (def->parts & MAP_DEF_PINNING)
1: +    pr_debug("map '%s': found pinning = %u.\n", map->name, def->pinning);
1: +  if (def->parts & MAP_DEF_NUMA_NODE)
1: +    pr_debug("map '%s': found numa_node = %u.\n", map->name, def->numa_node);
1: +
1: +  if (def->parts & MAP_DEF_INNER_MAP)
1: +    pr_debug("map '%s': found inner map definition.\n", map->name);
1: +}
1: +
1: +static const char *btf_var_linkage_str(__u32 linkage) {
1: +  switch (linkage) {
1: +  case BTF_VAR_STATIC:
1: +    return "static";
1: +  case BTF_VAR_GLOBAL_ALLOCATED:
1: +    return "global";
1: +  case BTF_VAR_GLOBAL_EXTERN:
1: +    return "extern";
1: +  default:
1: +    return "unknown";
1: +  }
1:  }
1:  
1:  static int bpf_object__init_user_btf_map(struct bpf_object *obj,
1: -					 const struct btf_type *sec,
1: -					 int var_idx, int sec_idx,
1: -					 const Elf_Data *data, bool strict,
1: -					 const char *pin_root_path)
1: -{
1: -	struct btf_map_def map_def = {}, inner_def = {};
1: -	const struct btf_type *var, *def;
1: -	const struct btf_var_secinfo *vi;
1: -	const struct btf_var *var_extra;
1: -	const char *map_name;
1: -	struct bpf_map *map;
1: -	int err;
1: -
1: -	vi = btf_var_secinfos(sec) + var_idx;
1: -	var = btf__type_by_id(obj->btf, vi->type);
1: -	var_extra = btf_var(var);
1: -	map_name = btf__name_by_offset(obj->btf, var->name_off);
1: -
1: -	if (map_name == NULL || map_name[0] == '\0') {
1: -		pr_warn("map #%d: empty name.\n", var_idx);
1: -		return -EINVAL;
1: -	}
1: -	if ((__u64)vi->offset + vi->size > data->d_size) {
1: -		pr_warn("map '%s' BTF data is corrupted.\n", map_name);
1: -		return -EINVAL;
1: -	}
1: -	if (!btf_is_var(var)) {
1: -		pr_warn("map '%s': unexpected var kind %s.\n",
1: -			map_name, btf_kind_str(var));
1: -		return -EINVAL;
1: -	}
1: -	if (var_extra->linkage != BTF_VAR_GLOBAL_ALLOCATED) {
1: -		pr_warn("map '%s': unsupported map linkage %s.\n",
1: -			map_name, btf_var_linkage_str(var_extra->linkage));
1: -		return -EOPNOTSUPP;
1: -	}
1: -
1: -	def = skip_mods_and_typedefs(obj->btf, var->type, NULL);
1: -	if (!btf_is_struct(def)) {
1: -		pr_warn("map '%s': unexpected def kind %s.\n",
1: -			map_name, btf_kind_str(var));
1: -		return -EINVAL;
1: -	}
1: -	if (def->size > vi->size) {
1: -		pr_warn("map '%s': invalid def size.\n", map_name);
1: -		return -EINVAL;
1: -	}
1: -
1: -	map = bpf_object__add_map(obj);
1: -	if (IS_ERR(map))
1: -		return PTR_ERR(map);
1: -	map->name = strdup(map_name);
1: -	if (!map->name) {
1: -		pr_warn("map '%s': failed to alloc map name.\n", map_name);
1: -		return -ENOMEM;
1: -	}
1: -	map->libbpf_type = LIBBPF_MAP_UNSPEC;
1: -	map->def.type = BPF_MAP_TYPE_UNSPEC;
1: -	map->sec_idx = sec_idx;
1: -	map->sec_offset = vi->offset;
1: -	map->btf_var_idx = var_idx;
1: -	pr_debug("map '%s': at sec_idx %d, offset %zu.\n",
1: -		 map_name, map->sec_idx, map->sec_offset);
1: -
1: -	err = parse_btf_map_def(map->name, obj->btf, def, strict, &map_def, &inner_def);
1: -	if (err)
1: -		return err;
1: -
1: -	fill_map_from_def(map, &map_def);
1: -
1: -	if (map_def.pinning == LIBBPF_PIN_BY_NAME) {
1: -		err = build_map_pin_path(map, pin_root_path);
1: -		if (err) {
1: -			pr_warn("map '%s': couldn't build pin path.\n", map->name);
1: -			return err;
1: -		}
1: -	}
1: -
1: -	if (map_def.parts & MAP_DEF_INNER_MAP) {
1: -		map->inner_map = calloc(1, sizeof(*map->inner_map));
1: -		if (!map->inner_map)
1: -			return -ENOMEM;
1: -		map->inner_map->fd = -1;
1: -		map->inner_map->sec_idx = sec_idx;
1: -		map->inner_map->name = malloc(strlen(map_name) + sizeof(".inner") + 1);
1: -		if (!map->inner_map->name)
1: -			return -ENOMEM;
1: -		sprintf(map->inner_map->name, "%s.inner", map_name);
1: -
1: -		fill_map_from_def(map->inner_map, &inner_def);
1: -	}
1: -
1: -	return 0;
1: +                                         const struct btf_type *sec,
1: +                                         int var_idx, int sec_idx,
1: +                                         const Elf_Data *data, bool strict,
1: +                                         const char *pin_root_path) {
1: +  struct btf_map_def map_def = {}, inner_def = {};
1: +  const struct btf_type *var, *def;
1: +  const struct btf_var_secinfo *vi;
1: +  const struct btf_var *var_extra;
1: +  const char *map_name;
1: +  struct bpf_map *map;
1: +  int err;
1: +
1: +  vi = btf_var_secinfos(sec) + var_idx;
1: +  var = btf__type_by_id(obj->btf, vi->type);
1: +  var_extra = btf_var(var);
1: +  map_name = btf__name_by_offset(obj->btf, var->name_off);
1: +
1: +  if (map_name == NULL || map_name[0] == '\0') {
1: +    pr_warn("map #%d: empty name.\n", var_idx);
1: +    return -EINVAL;
1: +  }
1: +  if ((__u64)vi->offset + vi->size > data->d_size) {
1: +    pr_warn("map '%s' BTF data is corrupted.\n", map_name);
1: +    return -EINVAL;
1: +  }
1: +  if (!btf_is_var(var)) {
1: +    pr_warn("map '%s': unexpected var kind %s.\n", map_name, btf_kind_str(var));
1: +    return -EINVAL;
1: +  }
1: +  if (var_extra->linkage != BTF_VAR_GLOBAL_ALLOCATED) {
1: +    pr_warn("map '%s': unsupported map linkage %s.\n", map_name,
1: +            btf_var_linkage_str(var_extra->linkage));
1: +    return -EOPNOTSUPP;
1: +  }
1: +
1: +  def = skip_mods_and_typedefs(obj->btf, var->type, NULL);
1: +  if (!btf_is_struct(def)) {
1: +    pr_warn("map '%s': unexpected def kind %s.\n", map_name, btf_kind_str(var));
1: +    return -EINVAL;
1: +  }
1: +  if (def->size > vi->size) {
1: +    pr_warn("map '%s': invalid def size.\n", map_name);
1: +    return -EINVAL;
1: +  }
1: +
1: +  map = bpf_object__add_map(obj);
1: +  if (IS_ERR(map))
1: +    return PTR_ERR(map);
1: +  map->name = strdup(map_name);
1: +  if (!map->name) {
1: +    pr_warn("map '%s': failed to alloc map name.\n", map_name);
1: +    return -ENOMEM;
1: +  }
1: +  map->libbpf_type = LIBBPF_MAP_UNSPEC;
1: +  map->def.type = BPF_MAP_TYPE_UNSPEC;
1: +  map->sec_idx = sec_idx;
1: +  map->sec_offset = vi->offset;
1: +  map->btf_var_idx = var_idx;
1: +  pr_debug("map '%s': at sec_idx %d, offset %zu.\n", map_name, map->sec_idx,
1: +           map->sec_offset);
1: +
1: +  err =
1: +      parse_btf_map_def(map->name, obj->btf, def, strict, &map_def, &inner_def);
1: +  if (err)
1: +    return err;
1: +
1: +  fill_map_from_def(map, &map_def);
1: +
1: +  if (map_def.pinning == LIBBPF_PIN_BY_NAME) {
1: +    err = build_map_pin_path(map, pin_root_path);
1: +    if (err) {
1: +      pr_warn("map '%s': couldn't build pin path.\n", map->name);
1: +      return err;
1: +    }
1: +  }
1: +
1: +  if (map_def.parts & MAP_DEF_INNER_MAP) {
1: +    map->inner_map = calloc(1, sizeof(*map->inner_map));
1: +    if (!map->inner_map)
1: +      return -ENOMEM;
1: +    map->inner_map->fd = -1;
1: +    map->inner_map->sec_idx = sec_idx;
1: +    map->inner_map->name = malloc(strlen(map_name) + sizeof(".inner") + 1);
1: +    if (!map->inner_map->name)
1: +      return -ENOMEM;
1: +    sprintf(map->inner_map->name, "%s.inner", map_name);
1: +
1: +    fill_map_from_def(map->inner_map, &inner_def);
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  static int bpf_object__init_user_btf_maps(struct bpf_object *obj, bool strict,
1: -					  const char *pin_root_path)
1: -{
1: -	const struct btf_type *sec = NULL;
1: -	int nr_types, i, vlen, err;
1: -	const struct btf_type *t;
1: -	const char *name;
1: -	Elf_Data *data;
1: -	Elf_Scn *scn;
1: -
1: -	if (obj->efile.btf_maps_shndx < 0)
1: -		return 0;
1: -
1: -	scn = elf_sec_by_idx(obj, obj->efile.btf_maps_shndx);
1: -	data = elf_sec_data(obj, scn);
1: -	if (!scn || !data) {
1: -		pr_warn("elf: failed to get %s map definitions for %s\n",
1: -			MAPS_ELF_SEC, obj->path);
1: -		return -EINVAL;
1: -	}
1: -
1: -	nr_types = btf__get_nr_types(obj->btf);
1: -	for (i = 1; i <= nr_types; i++) {
1: -		t = btf__type_by_id(obj->btf, i);
1: -		if (!btf_is_datasec(t))
1: -			continue;
1: -		name = btf__name_by_offset(obj->btf, t->name_off);
1: -		if (strcmp(name, MAPS_ELF_SEC) == 0) {
1: -			sec = t;
1: -			obj->efile.btf_maps_sec_btf_id = i;
1: -			break;
1: -		}
1: -	}
1: -
1: -	if (!sec) {
1: -		pr_warn("DATASEC '%s' not found.\n", MAPS_ELF_SEC);
1: -		return -ENOENT;
1: -	}
1: -
1: -	vlen = btf_vlen(sec);
1: -	for (i = 0; i < vlen; i++) {
1: -		err = bpf_object__init_user_btf_map(obj, sec, i,
1: -						    obj->efile.btf_maps_shndx,
1: -						    data, strict,
1: -						    pin_root_path);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	return 0;
1: +                                          const char *pin_root_path) {
1: +  const struct btf_type *sec = NULL;
1: +  int nr_types, i, vlen, err;
1: +  const struct btf_type *t;
1: +  const char *name;
1: +  Elf_Data *data;
1: +  Elf_Scn *scn;
1: +
1: +  if (obj->efile.btf_maps_shndx < 0)
1: +    return 0;
1: +
1: +  scn = elf_sec_by_idx(obj, obj->efile.btf_maps_shndx);
1: +  data = elf_sec_data(obj, scn);
1: +  if (!scn || !data) {
1: +    pr_warn("elf: failed to get %s map definitions for %s\n", MAPS_ELF_SEC,
1: +            obj->path);
1: +    return -EINVAL;
1: +  }
1: +
1: +  nr_types = btf__get_nr_types(obj->btf);
1: +  for (i = 1; i <= nr_types; i++) {
1: +    t = btf__type_by_id(obj->btf, i);
1: +    if (!btf_is_datasec(t))
1: +      continue;
1: +    name = btf__name_by_offset(obj->btf, t->name_off);
1: +    if (strcmp(name, MAPS_ELF_SEC) == 0) {
1: +      sec = t;
1: +      obj->efile.btf_maps_sec_btf_id = i;
1: +      break;
1: +    }
1: +  }
1: +
1: +  if (!sec) {
1: +    pr_warn("DATASEC '%s' not found.\n", MAPS_ELF_SEC);
1: +    return -ENOENT;
1: +  }
1: +
1: +  vlen = btf_vlen(sec);
1: +  for (i = 0; i < vlen; i++) {
1: +    err = bpf_object__init_user_btf_map(obj, sec, i, obj->efile.btf_maps_shndx,
1: +                                        data, strict, pin_root_path);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  static int bpf_object__init_maps(struct bpf_object *obj,
1: -				 const struct bpf_object_open_opts *opts)
1: -{
1: -	const char *pin_root_path;
1: -	bool strict;
1: -	int err;
1: -
1: -	strict = !OPTS_GET(opts, relaxed_maps, false);
1: -	pin_root_path = OPTS_GET(opts, pin_root_path, NULL);
1: -
1: -	err = bpf_object__init_user_maps(obj, strict);
1: -	err = err ?: bpf_object__init_user_btf_maps(obj, strict, pin_root_path);
1: -	err = err ?: bpf_object__init_global_data_maps(obj);
1: -	err = err ?: bpf_object__init_kconfig_map(obj);
1: -	err = err ?: bpf_object__init_struct_ops_maps(obj);
1: -
1: -	return err;
1: -}
1: -
1: -static bool section_have_execinstr(struct bpf_object *obj, int idx)
1: -{
1: -	GElf_Shdr sh;
1: -
1: -	if (elf_sec_hdr(obj, elf_sec_by_idx(obj, idx), &sh))
1: -		return false;
1: -
1: -	return sh.sh_flags & SHF_EXECINSTR;
1: -}
1: -
1: -static bool btf_needs_sanitization(struct bpf_object *obj)
1: -{
1: -	bool has_func_global = kernel_supports(obj, FEAT_BTF_GLOBAL_FUNC);
1: -	bool has_datasec = kernel_supports(obj, FEAT_BTF_DATASEC);
1: -	bool has_float = kernel_supports(obj, FEAT_BTF_FLOAT);
1: -	bool has_func = kernel_supports(obj, FEAT_BTF_FUNC);
1: -
1: -	return !has_func || !has_datasec || !has_func_global || !has_float;
1: -}
1: -
1: -static void bpf_object__sanitize_btf(struct bpf_object *obj, struct btf *btf)
1: -{
1: -	bool has_func_global = kernel_supports(obj, FEAT_BTF_GLOBAL_FUNC);
1: -	bool has_datasec = kernel_supports(obj, FEAT_BTF_DATASEC);
1: -	bool has_float = kernel_supports(obj, FEAT_BTF_FLOAT);
1: -	bool has_func = kernel_supports(obj, FEAT_BTF_FUNC);
1: -	struct btf_type *t;
1: -	int i, j, vlen;
1: -
1: -	for (i = 1; i <= btf__get_nr_types(btf); i++) {
1: -		t = (struct btf_type *)btf__type_by_id(btf, i);
1: -
1: -		if (!has_datasec && btf_is_var(t)) {
1: -			/* replace VAR with INT */
1: -			t->info = BTF_INFO_ENC(BTF_KIND_INT, 0, 0);
1: -			/*
1: -			 * using size = 1 is the safest choice, 4 will be too
1: -			 * big and cause kernel BTF validation failure if
1: -			 * original variable took less than 4 bytes
1: -			 */
1: -			t->size = 1;
1: -			*(int *)(t + 1) = BTF_INT_ENC(0, 0, 8);
1: -		} else if (!has_datasec && btf_is_datasec(t)) {
1: -			/* replace DATASEC with STRUCT */
1: -			const struct btf_var_secinfo *v = btf_var_secinfos(t);
1: -			struct btf_member *m = btf_members(t);
1: -			struct btf_type *vt;
1: -			char *name;
1: -
1: -			name = (char *)btf__name_by_offset(btf, t->name_off);
1: -			while (*name) {
1: -				if (*name == '.')
1: -					*name = '_';
1: -				name++;
1: -			}
1: -
1: -			vlen = btf_vlen(t);
1: -			t->info = BTF_INFO_ENC(BTF_KIND_STRUCT, 0, vlen);
1: -			for (j = 0; j < vlen; j++, v++, m++) {
1: -				/* order of field assignments is important */
1: -				m->offset = v->offset * 8;
1: -				m->type = v->type;
1: -				/* preserve variable name as member name */
1: -				vt = (void *)btf__type_by_id(btf, v->type);
1: -				m->name_off = vt->name_off;
1: -			}
1: -		} else if (!has_func && btf_is_func_proto(t)) {
1: -			/* replace FUNC_PROTO with ENUM */
1: -			vlen = btf_vlen(t);
1: -			t->info = BTF_INFO_ENC(BTF_KIND_ENUM, 0, vlen);
1: -			t->size = sizeof(__u32); /* kernel enforced */
1: -		} else if (!has_func && btf_is_func(t)) {
1: -			/* replace FUNC with TYPEDEF */
1: -			t->info = BTF_INFO_ENC(BTF_KIND_TYPEDEF, 0, 0);
1: -		} else if (!has_func_global && btf_is_func(t)) {
1: -			/* replace BTF_FUNC_GLOBAL with BTF_FUNC_STATIC */
1: -			t->info = BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0);
1: -		} else if (!has_float && btf_is_float(t)) {
1: -			/* replace FLOAT with an equally-sized empty STRUCT;
1: -			 * since C compilers do not accept e.g. "float" as a
1: -			 * valid struct name, make it anonymous
1: -			 */
1: -			t->name_off = 0;
1: -			t->info = BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 0);
1: -		}
1: -	}
1: -}
1: -
1: -static bool libbpf_needs_btf(const struct bpf_object *obj)
1: -{
1: -	return obj->efile.btf_maps_shndx >= 0 ||
1: -	       obj->efile.st_ops_shndx >= 0 ||
1: -	       obj->nr_extern > 0;
1: -}
1: -
1: -static bool kernel_needs_btf(const struct bpf_object *obj)
1: -{
1: -	return obj->efile.st_ops_shndx >= 0;
1: -}
1: -
1: -static int bpf_object__init_btf(struct bpf_object *obj,
1: -				Elf_Data *btf_data,
1: -				Elf_Data *btf_ext_data)
1: -{
1: -	int err = -ENOENT;
1: -
1: -	if (btf_data) {
1: -		obj->btf = btf__new(btf_data->d_buf, btf_data->d_size);
1: -		err = libbpf_get_error(obj->btf);
1: -		if (err) {
1: -			obj->btf = NULL;
1: -			pr_warn("Error loading ELF section %s: %d.\n", BTF_ELF_SEC, err);
1: -			goto out;
1: -		}
1: -		/* enforce 8-byte pointers for BPF-targeted BTFs */
1: -		btf__set_pointer_size(obj->btf, 8);
1: -	}
1: -	if (btf_ext_data) {
1: -		if (!obj->btf) {
1: -			pr_debug("Ignore ELF section %s because its depending ELF section %s is not found.\n",
1: -				 BTF_EXT_ELF_SEC, BTF_ELF_SEC);
1: -			goto out;
1: -		}
1: -		obj->btf_ext = btf_ext__new(btf_ext_data->d_buf, btf_ext_data->d_size);
1: -		err = libbpf_get_error(obj->btf_ext);
1: -		if (err) {
1: -			pr_warn("Error loading ELF section %s: %d. Ignored and continue.\n",
1: -				BTF_EXT_ELF_SEC, err);
1: -			obj->btf_ext = NULL;
1: -			goto out;
1: -		}
1: -	}
1: +                                 const struct bpf_object_open_opts *opts) {
1: +  const char *pin_root_path;
1: +  bool strict;
1: +  int err;
1: +
1: +  strict = !OPTS_GET(opts, relaxed_maps, false);
1: +  pin_root_path = OPTS_GET(opts, pin_root_path, NULL);
1: +
1: +  err = bpf_object__init_user_maps(obj, strict);
1: +  err = err ?: bpf_object__init_user_btf_maps(obj, strict, pin_root_path);
1: +  err = err ?: bpf_object__init_global_data_maps(obj);
1: +  err = err ?: bpf_object__init_kconfig_map(obj);
1: +  err = err ?: bpf_object__init_struct_ops_maps(obj);
1: +
1: +  return err;
1: +}
1: +
1: +static bool section_have_execinstr(struct bpf_object *obj, int idx) {
1: +  GElf_Shdr sh;
1: +
1: +  if (elf_sec_hdr(obj, elf_sec_by_idx(obj, idx), &sh))
1: +    return false;
1: +
1: +  return sh.sh_flags & SHF_EXECINSTR;
1: +}
1: +
1: +static bool btf_needs_sanitization(struct bpf_object *obj) {
1: +  bool has_func_global = kernel_supports(obj, FEAT_BTF_GLOBAL_FUNC);
1: +  bool has_datasec = kernel_supports(obj, FEAT_BTF_DATASEC);
1: +  bool has_float = kernel_supports(obj, FEAT_BTF_FLOAT);
1: +  bool has_func = kernel_supports(obj, FEAT_BTF_FUNC);
1: +
1: +  return !has_func || !has_datasec || !has_func_global || !has_float;
1: +}
1: +
1: +static void bpf_object__sanitize_btf(struct bpf_object *obj, struct btf *btf) {
1: +  bool has_func_global = kernel_supports(obj, FEAT_BTF_GLOBAL_FUNC);
1: +  bool has_datasec = kernel_supports(obj, FEAT_BTF_DATASEC);
1: +  bool has_float = kernel_supports(obj, FEAT_BTF_FLOAT);
1: +  bool has_func = kernel_supports(obj, FEAT_BTF_FUNC);
1: +  struct btf_type *t;
1: +  int i, j, vlen;
1: +
1: +  for (i = 1; i <= btf__get_nr_types(btf); i++) {
1: +    t = (struct btf_type *)btf__type_by_id(btf, i);
1: +
1: +    if (!has_datasec && btf_is_var(t)) {
1: +      /* replace VAR with INT */
1: +      t->info = BTF_INFO_ENC(BTF_KIND_INT, 0, 0);
1: +      /*
1: +       * using size = 1 is the safest choice, 4 will be too
1: +       * big and cause kernel BTF validation failure if
1: +       * original variable took less than 4 bytes
1: +       */
1: +      t->size = 1;
1: +      *(int *)(t + 1) = BTF_INT_ENC(0, 0, 8);
1: +    } else if (!has_datasec && btf_is_datasec(t)) {
1: +      /* replace DATASEC with STRUCT */
1: +      const struct btf_var_secinfo *v = btf_var_secinfos(t);
1: +      struct btf_member *m = btf_members(t);
1: +      struct btf_type *vt;
1: +      char *name;
1: +
1: +      name = (char *)btf__name_by_offset(btf, t->name_off);
1: +      while (*name) {
1: +        if (*name == '.')
1: +          *name = '_';
1: +        name++;
1: +      }
1: +
1: +      vlen = btf_vlen(t);
1: +      t->info = BTF_INFO_ENC(BTF_KIND_STRUCT, 0, vlen);
1: +      for (j = 0; j < vlen; j++, v++, m++) {
1: +        /* order of field assignments is important */
1: +        m->offset = v->offset * 8;
1: +        m->type = v->type;
1: +        /* preserve variable name as member name */
1: +        vt = (void *)btf__type_by_id(btf, v->type);
1: +        m->name_off = vt->name_off;
1: +      }
1: +    } else if (!has_func && btf_is_func_proto(t)) {
1: +      /* replace FUNC_PROTO with ENUM */
1: +      vlen = btf_vlen(t);
1: +      t->info = BTF_INFO_ENC(BTF_KIND_ENUM, 0, vlen);
1: +      t->size = sizeof(__u32); /* kernel enforced */
1: +    } else if (!has_func && btf_is_func(t)) {
1: +      /* replace FUNC with TYPEDEF */
1: +      t->info = BTF_INFO_ENC(BTF_KIND_TYPEDEF, 0, 0);
1: +    } else if (!has_func_global && btf_is_func(t)) {
1: +      /* replace BTF_FUNC_GLOBAL with BTF_FUNC_STATIC */
1: +      t->info = BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0);
1: +    } else if (!has_float && btf_is_float(t)) {
1: +      /* replace FLOAT with an equally-sized empty STRUCT;
1: +       * since C compilers do not accept e.g. "float" as a
1: +       * valid struct name, make it anonymous
1: +       */
1: +      t->name_off = 0;
1: +      t->info = BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 0);
1: +    }
1: +  }
1: +}
1: +
1: +static bool libbpf_needs_btf(const struct bpf_object *obj) {
1: +  return obj->efile.btf_maps_shndx >= 0 || obj->efile.st_ops_shndx >= 0 ||
1: +         obj->nr_extern > 0;
1: +}
1: +
1: +static bool kernel_needs_btf(const struct bpf_object *obj) {
1: +  return obj->efile.st_ops_shndx >= 0;
1: +}
1: +
1: +static int bpf_object__init_btf(struct bpf_object *obj, Elf_Data *btf_data,
1: +                                Elf_Data *btf_ext_data) {
1: +  int err = -ENOENT;
1: +
1: +  if (btf_data) {
1: +    obj->btf = btf__new(btf_data->d_buf, btf_data->d_size);
1: +    err = libbpf_get_error(obj->btf);
1: +    if (err) {
1: +      obj->btf = NULL;
1: +      pr_warn("Error loading ELF section %s: %d.\n", BTF_ELF_SEC, err);
1: +      goto out;
1: +    }
1: +    /* enforce 8-byte pointers for BPF-targeted BTFs */
1: +    btf__set_pointer_size(obj->btf, 8);
1: +  }
1: +  if (btf_ext_data) {
1: +    if (!obj->btf) {
1: +      pr_debug(
1: +          "Ignore ELF section %s because its depending ELF section %s is not "
1: +          "found.\n",
1: +          BTF_EXT_ELF_SEC, BTF_ELF_SEC);
1: +      goto out;
1: +    }
1: +    obj->btf_ext = btf_ext__new(btf_ext_data->d_buf, btf_ext_data->d_size);
1: +    err = libbpf_get_error(obj->btf_ext);
1: +    if (err) {
1: +      pr_warn("Error loading ELF section %s: %d. Ignored and continue.\n",
1: +              BTF_EXT_ELF_SEC, err);
1: +      obj->btf_ext = NULL;
1: +      goto out;
1: +    }
1: +  }
1:  out:
1: -	if (err && libbpf_needs_btf(obj)) {
1: -		pr_warn("BTF is required, but is missing or corrupted.\n");
1: -		return err;
1: -	}
1: -	return 0;
1: +  if (err && libbpf_needs_btf(obj)) {
1: +    pr_warn("BTF is required, but is missing or corrupted.\n");
1: +    return err;
1: +  }
1: +  return 0;
1:  }
1:  
1: -static int bpf_object__finalize_btf(struct bpf_object *obj)
1: -{
1: -	int err;
1: -
1: -	if (!obj->btf)
1: -		return 0;
1: -
1: -	err = btf__finalize_data(obj, obj->btf);
1: -	if (err) {
1: -		pr_warn("Error finalizing %s: %d.\n", BTF_ELF_SEC, err);
1: -		return err;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static bool prog_needs_vmlinux_btf(struct bpf_program *prog)
1: -{
1: -	if (prog->type == BPF_PROG_TYPE_STRUCT_OPS ||
1: -	    prog->type == BPF_PROG_TYPE_LSM)
1: -		return true;
1: -
1: -	/* BPF_PROG_TYPE_TRACING programs which do not attach to other programs
1: -	 * also need vmlinux BTF
1: -	 */
1: -	if (prog->type == BPF_PROG_TYPE_TRACING && !prog->attach_prog_fd)
1: -		return true;
1: -
1: -	return false;
1: -}
1: -
1: -static bool obj_needs_vmlinux_btf(const struct bpf_object *obj)
1: -{
1: -	struct bpf_program *prog;
1: -	int i;
1: -
1: -	/* CO-RE relocations need kernel BTF */
1: -	if (obj->btf_ext && obj->btf_ext->core_relo_info.len)
1: -		return true;
1: -
1: -	/* Support for typed ksyms needs kernel BTF */
1: -	for (i = 0; i < obj->nr_extern; i++) {
1: -		const struct extern_desc *ext;
1: -
1: -		ext = &obj->externs[i];
1: -		if (ext->type == EXT_KSYM && ext->ksym.type_id)
1: -			return true;
1: -	}
1: -
1: -	bpf_object__for_each_program(prog, obj) {
1: -		if (!prog->load)
1: -			continue;
1: -		if (prog_needs_vmlinux_btf(prog))
1: -			return true;
1: -	}
1: -
1: -	return false;
1: -}
1: -
1: -static int bpf_object__load_vmlinux_btf(struct bpf_object *obj, bool force)
1: -{
1: -	int err;
1: -
1: -	/* btf_vmlinux could be loaded earlier */
1: -	if (obj->btf_vmlinux || obj->gen_loader)
1: -		return 0;
1: -
1: -	if (!force && !obj_needs_vmlinux_btf(obj))
1: -		return 0;
1: -
1: -	obj->btf_vmlinux = libbpf_find_kernel_btf();
1: -	err = libbpf_get_error(obj->btf_vmlinux);
1: -	if (err) {
1: -		pr_warn("Error loading vmlinux BTF: %d\n", err);
1: -		obj->btf_vmlinux = NULL;
1: -		return err;
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)
1: -{
1: -	struct btf *kern_btf = obj->btf;
1: -	bool btf_mandatory, sanitize;
1: -	int i, err = 0;
1: -
1: -	if (!obj->btf)
1: -		return 0;
1: -
1: -	if (!kernel_supports(obj, FEAT_BTF)) {
1: -		if (kernel_needs_btf(obj)) {
1: -			err = -EOPNOTSUPP;
1: -			goto report;
1: -		}
1: -		pr_debug("Kernel doesn't support BTF, skipping uploading it.\n");
1: -		return 0;
1: -	}
1: -
1: -	/* Even though some subprogs are global/weak, user might prefer more
1: -	 * permissive BPF verification process that BPF verifier performs for
1: -	 * static functions, taking into account more context from the caller
1: -	 * functions. In such case, they need to mark such subprogs with
1: -	 * __attribute__((visibility("hidden"))) and libbpf will adjust
1: -	 * corresponding FUNC BTF type to be marked as static and trigger more
1: -	 * involved BPF verification process.
1: -	 */
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		struct bpf_program *prog = &obj->programs[i];
1: -		struct btf_type *t;
1: -		const char *name;
1: -		int j, n;
1: -
1: -		if (!prog->mark_btf_static || !prog_is_subprog(obj, prog))
1: -			continue;
1: -
1: -		n = btf__get_nr_types(obj->btf);
1: -		for (j = 1; j <= n; j++) {
1: -			t = btf_type_by_id(obj->btf, j);
1: -			if (!btf_is_func(t) || btf_func_linkage(t) != BTF_FUNC_GLOBAL)
1: -				continue;
1: -
1: -			name = btf__str_by_offset(obj->btf, t->name_off);
1: -			if (strcmp(name, prog->name) != 0)
1: -				continue;
1: -
1: -			t->info = btf_type_info(BTF_KIND_FUNC, BTF_FUNC_STATIC, 0);
1: -			break;
1: -		}
1: -	}
1: -
1: -	sanitize = btf_needs_sanitization(obj);
1: -	if (sanitize) {
1: -		const void *raw_data;
1: -		__u32 sz;
1: -
1: -		/* clone BTF to sanitize a copy and leave the original intact */
1: -		raw_data = btf__get_raw_data(obj->btf, &sz);
1: -		kern_btf = btf__new(raw_data, sz);
1: -		err = libbpf_get_error(kern_btf);
1: -		if (err)
1: -			return err;
1: -
1: -		/* enforce 8-byte pointers for BPF-targeted BTFs */
1: -		btf__set_pointer_size(obj->btf, 8);
1: -		bpf_object__sanitize_btf(obj, kern_btf);
1: -	}
1: -
1: -	if (obj->gen_loader) {
1: -		__u32 raw_size = 0;
1: -		const void *raw_data = btf__get_raw_data(kern_btf, &raw_size);
1: -
1: -		if (!raw_data)
1: -			return -ENOMEM;
1: -		bpf_gen__load_btf(obj->gen_loader, raw_data, raw_size);
1: -		/* Pretend to have valid FD to pass various fd >= 0 checks.
1: -		 * This fd == 0 will not be used with any syscall and will be reset to -1 eventually.
1: -		 */
1: -		btf__set_fd(kern_btf, 0);
1: -	} else {
1: -		err = btf__load(kern_btf);
1: -	}
1: -	if (sanitize) {
1: -		if (!err) {
1: -			/* move fd to libbpf's BTF */
1: -			btf__set_fd(obj->btf, btf__fd(kern_btf));
1: -			btf__set_fd(kern_btf, -1);
1: -		}
1: -		btf__free(kern_btf);
1: -	}
1: +static int bpf_object__finalize_btf(struct bpf_object *obj) {
1: +  int err;
1: +
1: +  if (!obj->btf)
1: +    return 0;
1: +
1: +  err = btf__finalize_data(obj, obj->btf);
1: +  if (err) {
1: +    pr_warn("Error finalizing %s: %d.\n", BTF_ELF_SEC, err);
1: +    return err;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static bool prog_needs_vmlinux_btf(struct bpf_program *prog) {
1: +  if (prog->type == BPF_PROG_TYPE_STRUCT_OPS || prog->type == BPF_PROG_TYPE_LSM)
1: +    return true;
1: +
1: +  /* BPF_PROG_TYPE_TRACING programs which do not attach to other programs
1: +   * also need vmlinux BTF
1: +   */
1: +  if (prog->type == BPF_PROG_TYPE_TRACING && !prog->attach_prog_fd)
1: +    return true;
1: +
1: +  return false;
1: +}
1: +
1: +static bool obj_needs_vmlinux_btf(const struct bpf_object *obj) {
1: +  struct bpf_program *prog;
1: +  int i;
1: +
1: +  /* CO-RE relocations need kernel BTF */
1: +  if (obj->btf_ext && obj->btf_ext->core_relo_info.len)
1: +    return true;
1: +
1: +  /* Support for typed ksyms needs kernel BTF */
1: +  for (i = 0; i < obj->nr_extern; i++) {
1: +    const struct extern_desc *ext;
1: +
1: +    ext = &obj->externs[i];
1: +    if (ext->type == EXT_KSYM && ext->ksym.type_id)
1: +      return true;
1: +  }
1: +
1: +  bpf_object__for_each_program(prog, obj) {
1: +    if (!prog->load)
1: +      continue;
1: +    if (prog_needs_vmlinux_btf(prog))
1: +      return true;
1: +  }
1: +
1: +  return false;
1: +}
1: +
1: +static int bpf_object__load_vmlinux_btf(struct bpf_object *obj, bool force) {
1: +  int err;
1: +
1: +  /* btf_vmlinux could be loaded earlier */
1: +  if (obj->btf_vmlinux || obj->gen_loader)
1: +    return 0;
1: +
1: +  if (!force && !obj_needs_vmlinux_btf(obj))
1: +    return 0;
1: +
1: +  obj->btf_vmlinux = libbpf_find_kernel_btf();
1: +  err = libbpf_get_error(obj->btf_vmlinux);
1: +  if (err) {
1: +    pr_warn("Error loading vmlinux BTF: %d\n", err);
1: +    obj->btf_vmlinux = NULL;
1: +    return err;
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj) {
1: +  struct btf *kern_btf = obj->btf;
1: +  bool btf_mandatory, sanitize;
1: +  int i, err = 0;
1: +
1: +  if (!obj->btf)
1: +    return 0;
1: +
1: +  if (!kernel_supports(obj, FEAT_BTF)) {
1: +    if (kernel_needs_btf(obj)) {
1: +      err = -EOPNOTSUPP;
1: +      goto report;
1: +    }
1: +    pr_debug("Kernel doesn't support BTF, skipping uploading it.\n");
1: +    return 0;
1: +  }
1: +
1: +  /* Even though some subprogs are global/weak, user might prefer more
1: +   * permissive BPF verification process that BPF verifier performs for
1: +   * static functions, taking into account more context from the caller
1: +   * functions. In such case, they need to mark such subprogs with
1: +   * __attribute__((visibility("hidden"))) and libbpf will adjust
1: +   * corresponding FUNC BTF type to be marked as static and trigger more
1: +   * involved BPF verification process.
1: +   */
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    struct bpf_program *prog = &obj->programs[i];
1: +    struct btf_type *t;
1: +    const char *name;
1: +    int j, n;
1: +
1: +    if (!prog->mark_btf_static || !prog_is_subprog(obj, prog))
1: +      continue;
1: +
1: +    n = btf__get_nr_types(obj->btf);
1: +    for (j = 1; j <= n; j++) {
1: +      t = btf_type_by_id(obj->btf, j);
1: +      if (!btf_is_func(t) || btf_func_linkage(t) != BTF_FUNC_GLOBAL)
1: +        continue;
1: +
1: +      name = btf__str_by_offset(obj->btf, t->name_off);
1: +      if (strcmp(name, prog->name) != 0)
1: +        continue;
1: +
1: +      t->info = btf_type_info(BTF_KIND_FUNC, BTF_FUNC_STATIC, 0);
1: +      break;
1: +    }
1: +  }
1: +
1: +  sanitize = btf_needs_sanitization(obj);
1: +  if (sanitize) {
1: +    const void *raw_data;
1: +    __u32 sz;
1: +
1: +    /* clone BTF to sanitize a copy and leave the original intact */
1: +    raw_data = btf__get_raw_data(obj->btf, &sz);
1: +    kern_btf = btf__new(raw_data, sz);
1: +    err = libbpf_get_error(kern_btf);
1: +    if (err)
1: +      return err;
1: +
1: +    /* enforce 8-byte pointers for BPF-targeted BTFs */
1: +    btf__set_pointer_size(obj->btf, 8);
1: +    bpf_object__sanitize_btf(obj, kern_btf);
1: +  }
1: +
1: +  if (obj->gen_loader) {
1: +    __u32 raw_size = 0;
1: +    const void *raw_data = btf__get_raw_data(kern_btf, &raw_size);
1: +
1: +    if (!raw_data)
1: +      return -ENOMEM;
1: +    bpf_gen__load_btf(obj->gen_loader, raw_data, raw_size);
1: +    /* Pretend to have valid FD to pass various fd >= 0 checks.
1: +     * This fd == 0 will not be used with any syscall and will be reset to -1
1: +     * eventually.
1: +     */
1: +    btf__set_fd(kern_btf, 0);
1: +  } else {
1: +    err = btf__load(kern_btf);
1: +  }
1: +  if (sanitize) {
1: +    if (!err) {
1: +      /* move fd to libbpf's BTF */
1: +      btf__set_fd(obj->btf, btf__fd(kern_btf));
1: +      btf__set_fd(kern_btf, -1);
1: +    }
1: +    btf__free(kern_btf);
1: +  }
1:  report:
1: -	if (err) {
1: -		btf_mandatory = kernel_needs_btf(obj);
1: -		pr_warn("Error loading .BTF into kernel: %d. %s\n", err,
1: -			btf_mandatory ? "BTF is mandatory, can't proceed."
1: -				      : "BTF is optional, ignoring.");
1: -		if (!btf_mandatory)
1: -			err = 0;
1: -	}
1: -	return err;
1: +  if (err) {
1: +    btf_mandatory = kernel_needs_btf(obj);
1: +    pr_warn("Error loading .BTF into kernel: %d. %s\n", err,
1: +            btf_mandatory ? "BTF is mandatory, can't proceed."
1: +                          : "BTF is optional, ignoring.");
1: +    if (!btf_mandatory)
1: +      err = 0;
1: +  }
1: +  return err;
1:  }
1:  
1: -static const char *elf_sym_str(const struct bpf_object *obj, size_t off)
1: -{
1: -	const char *name;
1: +static const char *elf_sym_str(const struct bpf_object *obj, size_t off) {
1: +  const char *name;
1:  
1: -	name = elf_strptr(obj->efile.elf, obj->efile.strtabidx, off);
1: -	if (!name) {
1: -		pr_warn("elf: failed to get section name string at offset %zu from %s: %s\n",
1: -			off, obj->path, elf_errmsg(-1));
1: -		return NULL;
1: -	}
1: +  name = elf_strptr(obj->efile.elf, obj->efile.strtabidx, off);
1: +  if (!name) {
1: +    pr_warn(
1: +        "elf: failed to get section name string at offset %zu from %s: %s\n",
1: +        off, obj->path, elf_errmsg(-1));
1: +    return NULL;
1: +  }
1:  
1: -	return name;
1: +  return name;
1:  }
1:  
1: -static const char *elf_sec_str(const struct bpf_object *obj, size_t off)
1: -{
1: -	const char *name;
1: +static const char *elf_sec_str(const struct bpf_object *obj, size_t off) {
1: +  const char *name;
1:  
1: -	name = elf_strptr(obj->efile.elf, obj->efile.shstrndx, off);
1: -	if (!name) {
1: -		pr_warn("elf: failed to get section name string at offset %zu from %s: %s\n",
1: -			off, obj->path, elf_errmsg(-1));
1: -		return NULL;
1: -	}
1: +  name = elf_strptr(obj->efile.elf, obj->efile.shstrndx, off);
1: +  if (!name) {
1: +    pr_warn(
1: +        "elf: failed to get section name string at offset %zu from %s: %s\n",
1: +        off, obj->path, elf_errmsg(-1));
1: +    return NULL;
1: +  }
1:  
1: -	return name;
1: +  return name;
1:  }
1:  
1: -static Elf_Scn *elf_sec_by_idx(const struct bpf_object *obj, size_t idx)
1: -{
1: -	Elf_Scn *scn;
1: +static Elf_Scn *elf_sec_by_idx(const struct bpf_object *obj, size_t idx) {
1: +  Elf_Scn *scn;
1:  
1: -	scn = elf_getscn(obj->efile.elf, idx);
1: -	if (!scn) {
1: -		pr_warn("elf: failed to get section(%zu) from %s: %s\n",
1: -			idx, obj->path, elf_errmsg(-1));
1: -		return NULL;
1: -	}
1: -	return scn;
1: +  scn = elf_getscn(obj->efile.elf, idx);
1: +  if (!scn) {
1: +    pr_warn("elf: failed to get section(%zu) from %s: %s\n", idx, obj->path,
1: +            elf_errmsg(-1));
1: +    return NULL;
1: +  }
1: +  return scn;
1:  }
1:  
1: -static Elf_Scn *elf_sec_by_name(const struct bpf_object *obj, const char *name)
1: -{
1: -	Elf_Scn *scn = NULL;
1: -	Elf *elf = obj->efile.elf;
1: -	const char *sec_name;
1: +static Elf_Scn *elf_sec_by_name(const struct bpf_object *obj,
1: +                                const char *name) {
1: +  Elf_Scn *scn = NULL;
1: +  Elf *elf = obj->efile.elf;
1: +  const char *sec_name;
1:  
1: -	while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: -		sec_name = elf_sec_name(obj, scn);
1: -		if (!sec_name)
1: -			return NULL;
1: +  while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: +    sec_name = elf_sec_name(obj, scn);
1: +    if (!sec_name)
1: +      return NULL;
1:  
1: -		if (strcmp(sec_name, name) != 0)
1: -			continue;
1: +    if (strcmp(sec_name, name) != 0)
1: +      continue;
1:  
1: -		return scn;
1: -	}
1: -	return NULL;
1: +    return scn;
1: +  }
1: +  return NULL;
1:  }
1:  
1: -static int elf_sec_hdr(const struct bpf_object *obj, Elf_Scn *scn, GElf_Shdr *hdr)
1: -{
1: -	if (!scn)
1: -		return -EINVAL;
1: +static int elf_sec_hdr(const struct bpf_object *obj, Elf_Scn *scn,
1: +                       GElf_Shdr *hdr) {
1: +  if (!scn)
1: +    return -EINVAL;
1:  
1: -	if (gelf_getshdr(scn, hdr) != hdr) {
1: -		pr_warn("elf: failed to get section(%zu) header from %s: %s\n",
1: -			elf_ndxscn(scn), obj->path, elf_errmsg(-1));
1: -		return -EINVAL;
1: -	}
1: +  if (gelf_getshdr(scn, hdr) != hdr) {
1: +    pr_warn("elf: failed to get section(%zu) header from %s: %s\n",
1: +            elf_ndxscn(scn), obj->path, elf_errmsg(-1));
1: +    return -EINVAL;
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static const char *elf_sec_name(const struct bpf_object *obj, Elf_Scn *scn)
1: -{
1: -	const char *name;
1: -	GElf_Shdr sh;
1: +static const char *elf_sec_name(const struct bpf_object *obj, Elf_Scn *scn) {
1: +  const char *name;
1: +  GElf_Shdr sh;
1:  
1: -	if (!scn)
1: -		return NULL;
1: +  if (!scn)
1: +    return NULL;
1:  
1: -	if (elf_sec_hdr(obj, scn, &sh))
1: -		return NULL;
1: +  if (elf_sec_hdr(obj, scn, &sh))
1: +    return NULL;
1:  
1: -	name = elf_sec_str(obj, sh.sh_name);
1: -	if (!name) {
1: -		pr_warn("elf: failed to get section(%zu) name from %s: %s\n",
1: -			elf_ndxscn(scn), obj->path, elf_errmsg(-1));
1: -		return NULL;
1: -	}
1: +  name = elf_sec_str(obj, sh.sh_name);
1: +  if (!name) {
1: +    pr_warn("elf: failed to get section(%zu) name from %s: %s\n",
1: +            elf_ndxscn(scn), obj->path, elf_errmsg(-1));
1: +    return NULL;
1: +  }
1:  
1: -	return name;
1: +  return name;
1:  }
1:  
1: -static Elf_Data *elf_sec_data(const struct bpf_object *obj, Elf_Scn *scn)
1: -{
1: -	Elf_Data *data;
1: +static Elf_Data *elf_sec_data(const struct bpf_object *obj, Elf_Scn *scn) {
1: +  Elf_Data *data;
1:  
1: -	if (!scn)
1: -		return NULL;
1: +  if (!scn)
1: +    return NULL;
1:  
1: -	data = elf_getdata(scn, 0);
1: -	if (!data) {
1: -		pr_warn("elf: failed to get section(%zu) %s data from %s: %s\n",
1: -			elf_ndxscn(scn), elf_sec_name(obj, scn) ?: "<?>",
1: -			obj->path, elf_errmsg(-1));
1: -		return NULL;
1: -	}
1: +  data = elf_getdata(scn, 0);
1: +  if (!data) {
1: +    pr_warn("elf: failed to get section(%zu) %s data from %s: %s\n",
1: +            elf_ndxscn(scn), elf_sec_name(obj, scn) ?: "<?>", obj->path,
1: +            elf_errmsg(-1));
1: +    return NULL;
1: +  }
1:  
1: -	return data;
1: +  return data;
1:  }
1:  
1: -static bool is_sec_name_dwarf(const char *name)
1: -{
1: -	/* approximation, but the actual list is too long */
1: -	return strncmp(name, ".debug_", sizeof(".debug_") - 1) == 0;
1: +static bool is_sec_name_dwarf(const char *name) {
1: +  /* approximation, but the actual list is too long */
1: +  return strncmp(name, ".debug_", sizeof(".debug_") - 1) == 0;
1:  }
1:  
1: -static bool ignore_elf_section(GElf_Shdr *hdr, const char *name)
1: -{
1: -	/* no special handling of .strtab */
1: -	if (hdr->sh_type == SHT_STRTAB)
1: -		return true;
1: +static bool ignore_elf_section(GElf_Shdr *hdr, const char *name) {
1: +  /* no special handling of .strtab */
1: +  if (hdr->sh_type == SHT_STRTAB)
1: +    return true;
1: +
1: +  /* ignore .llvm_addrsig section as well */
1: +  if (hdr->sh_type == SHT_LLVM_ADDRSIG)
1: +    return true;
1:  
1: -	/* ignore .llvm_addrsig section as well */
1: -	if (hdr->sh_type == SHT_LLVM_ADDRSIG)
1: -		return true;
1: -
1: -	/* no subprograms will lead to an empty .text section, ignore it */
1: -	if (hdr->sh_type == SHT_PROGBITS && hdr->sh_size == 0 &&
1: -	    strcmp(name, ".text") == 0)
1: -		return true;
1: -
1: -	/* DWARF sections */
1: -	if (is_sec_name_dwarf(name))
1: -		return true;
1: -
1: -	if (strncmp(name, ".rel", sizeof(".rel") - 1) == 0) {
1: -		name += sizeof(".rel") - 1;
1: -		/* DWARF section relocations */
1: -		if (is_sec_name_dwarf(name))
1: -			return true;
1: -
1: -		/* .BTF and .BTF.ext don't need relocations */
1: -		if (strcmp(name, BTF_ELF_SEC) == 0 ||
1: -		    strcmp(name, BTF_EXT_ELF_SEC) == 0)
1: -			return true;
1: -	}
1: -
1: -	return false;
1: -}
1: -
1: -static int cmp_progs(const void *_a, const void *_b)
1: -{
1: -	const struct bpf_program *a = _a;
1: -	const struct bpf_program *b = _b;
1: -
1: -	if (a->sec_idx != b->sec_idx)
1: -		return a->sec_idx < b->sec_idx ? -1 : 1;
1: -
1: -	/* sec_insn_off can't be the same within the section */
1: -	return a->sec_insn_off < b->sec_insn_off ? -1 : 1;
1: -}
1: -
1: -static int bpf_object__elf_collect(struct bpf_object *obj)
1: -{
1: -	Elf *elf = obj->efile.elf;
1: -	Elf_Data *btf_ext_data = NULL;
1: -	Elf_Data *btf_data = NULL;
1: -	int idx = 0, err = 0;
1: -	const char *name;
1: -	Elf_Data *data;
1: -	Elf_Scn *scn;
1: -	GElf_Shdr sh;
1: -
1: -	/* a bunch of ELF parsing functionality depends on processing symbols,
1: -	 * so do the first pass and find the symbol table
1: -	 */
1: -	scn = NULL;
1: -	while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: -		if (elf_sec_hdr(obj, scn, &sh))
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -
1: -		if (sh.sh_type == SHT_SYMTAB) {
1: -			if (obj->efile.symbols) {
1: -				pr_warn("elf: multiple symbol tables in %s\n", obj->path);
1: -				return -LIBBPF_ERRNO__FORMAT;
1: -			}
1: -
1: -			data = elf_sec_data(obj, scn);
1: -			if (!data)
1: -				return -LIBBPF_ERRNO__FORMAT;
1: -
1: -			obj->efile.symbols = data;
1: -			obj->efile.symbols_shndx = elf_ndxscn(scn);
1: -			obj->efile.strtabidx = sh.sh_link;
1: -		}
1: -	}
1: -
1: -	scn = NULL;
1: -	while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: -		idx++;
1: -
1: -		if (elf_sec_hdr(obj, scn, &sh))
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -
1: -		name = elf_sec_str(obj, sh.sh_name);
1: -		if (!name)
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -
1: -		if (ignore_elf_section(&sh, name))
1: -			continue;
1: -
1: -		data = elf_sec_data(obj, scn);
1: -		if (!data)
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -
1: -		pr_debug("elf: section(%d) %s, size %ld, link %d, flags %lx, type=%d\n",
1: -			 idx, name, (unsigned long)data->d_size,
1: -			 (int)sh.sh_link, (unsigned long)sh.sh_flags,
1: -			 (int)sh.sh_type);
1: -
1: -		if (strcmp(name, "license") == 0) {
1: -			err = bpf_object__init_license(obj, data->d_buf, data->d_size);
1: -			if (err)
1: -				return err;
1: -		} else if (strcmp(name, "version") == 0) {
1: -			err = bpf_object__init_kversion(obj, data->d_buf, data->d_size);
1: -			if (err)
1: -				return err;
1: -		} else if (strcmp(name, "maps") == 0) {
1: -			obj->efile.maps_shndx = idx;
1: -		} else if (strcmp(name, MAPS_ELF_SEC) == 0) {
1: -			obj->efile.btf_maps_shndx = idx;
1: -		} else if (strcmp(name, BTF_ELF_SEC) == 0) {
1: -			btf_data = data;
1: -		} else if (strcmp(name, BTF_EXT_ELF_SEC) == 0) {
1: -			btf_ext_data = data;
1: -		} else if (sh.sh_type == SHT_SYMTAB) {
1: -			/* already processed during the first pass above */
1: -		} else if (sh.sh_type == SHT_PROGBITS && data->d_size > 0) {
1: -			if (sh.sh_flags & SHF_EXECINSTR) {
1: -				if (strcmp(name, ".text") == 0)
1: -					obj->efile.text_shndx = idx;
1: -				err = bpf_object__add_programs(obj, data, name, idx);
1: -				if (err)
1: -					return err;
1: -			} else if (strcmp(name, DATA_SEC) == 0) {
1: -				obj->efile.data = data;
1: -				obj->efile.data_shndx = idx;
1: -			} else if (strcmp(name, RODATA_SEC) == 0) {
1: -				obj->efile.rodata = data;
1: -				obj->efile.rodata_shndx = idx;
1: -			} else if (strcmp(name, STRUCT_OPS_SEC) == 0) {
1: -				obj->efile.st_ops_data = data;
1: -				obj->efile.st_ops_shndx = idx;
1: -			} else {
1: -				pr_info("elf: skipping unrecognized data section(%d) %s\n",
1: -					idx, name);
1: -			}
1: -		} else if (sh.sh_type == SHT_REL) {
1: -			int nr_sects = obj->efile.nr_reloc_sects;
1: -			void *sects = obj->efile.reloc_sects;
1: -			int sec = sh.sh_info; /* points to other section */
1: -
1: -			/* Only do relo for section with exec instructions */
1: -			if (!section_have_execinstr(obj, sec) &&
1: -			    strcmp(name, ".rel" STRUCT_OPS_SEC) &&
1: -			    strcmp(name, ".rel" MAPS_ELF_SEC)) {
1: -				pr_info("elf: skipping relo section(%d) %s for section(%d) %s\n",
1: -					idx, name, sec,
1: -					elf_sec_name(obj, elf_sec_by_idx(obj, sec)) ?: "<?>");
1: -				continue;
1: -			}
1: -
1: -			sects = libbpf_reallocarray(sects, nr_sects + 1,
1: -						    sizeof(*obj->efile.reloc_sects));
1: -			if (!sects)
1: -				return -ENOMEM;
1: -
1: -			obj->efile.reloc_sects = sects;
1: -			obj->efile.nr_reloc_sects++;
1: -
1: -			obj->efile.reloc_sects[nr_sects].shdr = sh;
1: -			obj->efile.reloc_sects[nr_sects].data = data;
1: -		} else if (sh.sh_type == SHT_NOBITS && strcmp(name, BSS_SEC) == 0) {
1: -			obj->efile.bss = data;
1: -			obj->efile.bss_shndx = idx;
1: -		} else {
1: -			pr_info("elf: skipping section(%d) %s (size %zu)\n", idx, name,
1: -				(size_t)sh.sh_size);
1: -		}
1: -	}
1: -
1: -	if (!obj->efile.strtabidx || obj->efile.strtabidx > idx) {
1: -		pr_warn("elf: symbol strings section missing or invalid in %s\n", obj->path);
1: -		return -LIBBPF_ERRNO__FORMAT;
1: -	}
1: -
1: -	/* sort BPF programs by section name and in-section instruction offset
1: -	 * for faster search */
1: -	qsort(obj->programs, obj->nr_programs, sizeof(*obj->programs), cmp_progs);
1: -
1: -	return bpf_object__init_btf(obj, btf_data, btf_ext_data);
1: -}
1: -
1: -static bool sym_is_extern(const GElf_Sym *sym)
1: -{
1: -	int bind = GELF_ST_BIND(sym->st_info);
1: -	/* externs are symbols w/ type=NOTYPE, bind=GLOBAL|WEAK, section=UND */
1: -	return sym->st_shndx == SHN_UNDEF &&
1: -	       (bind == STB_GLOBAL || bind == STB_WEAK) &&
1: -	       GELF_ST_TYPE(sym->st_info) == STT_NOTYPE;
1: -}
1: -
1: -static bool sym_is_subprog(const GElf_Sym *sym, int text_shndx)
1: -{
1: -	int bind = GELF_ST_BIND(sym->st_info);
1: -	int type = GELF_ST_TYPE(sym->st_info);
1: -
1: -	/* in .text section */
1: -	if (sym->st_shndx != text_shndx)
1: -		return false;
1: -
1: -	/* local function */
1: -	if (bind == STB_LOCAL && type == STT_SECTION)
1: -		return true;
1: -
1: -	/* global function */
1: -	return bind == STB_GLOBAL && type == STT_FUNC;
1: -}
1: -
1: -static int find_extern_btf_id(const struct btf *btf, const char *ext_name)
1: -{
1: -	const struct btf_type *t;
1: -	const char *tname;
1: -	int i, n;
1: -
1: -	if (!btf)
1: -		return -ESRCH;
1: -
1: -	n = btf__get_nr_types(btf);
1: -	for (i = 1; i <= n; i++) {
1: -		t = btf__type_by_id(btf, i);
1: -
1: -		if (!btf_is_var(t) && !btf_is_func(t))
1: -			continue;
1: -
1: -		tname = btf__name_by_offset(btf, t->name_off);
1: -		if (strcmp(tname, ext_name))
1: -			continue;
1: -
1: -		if (btf_is_var(t) &&
1: -		    btf_var(t)->linkage != BTF_VAR_GLOBAL_EXTERN)
1: -			return -EINVAL;
1: -
1: -		if (btf_is_func(t) && btf_func_linkage(t) != BTF_FUNC_EXTERN)
1: -			return -EINVAL;
1: +  /* no subprograms will lead to an empty .text section, ignore it */
1: +  if (hdr->sh_type == SHT_PROGBITS && hdr->sh_size == 0 &&
1: +      strcmp(name, ".text") == 0)
1: +    return true;
1: +
1: +  /* DWARF sections */
1: +  if (is_sec_name_dwarf(name))
1: +    return true;
1: +
1: +  if (strncmp(name, ".rel", sizeof(".rel") - 1) == 0) {
1: +    name += sizeof(".rel") - 1;
1: +    /* DWARF section relocations */
1: +    if (is_sec_name_dwarf(name))
1: +      return true;
1: +
1: +    /* .BTF and .BTF.ext don't need relocations */
1: +    if (strcmp(name, BTF_ELF_SEC) == 0 || strcmp(name, BTF_EXT_ELF_SEC) == 0)
1: +      return true;
1: +  }
1: +
1: +  return false;
1: +}
1: +
1: +static int cmp_progs(const void *_a, const void *_b) {
1: +  const struct bpf_program *a = _a;
1: +  const struct bpf_program *b = _b;
1: +
1: +  if (a->sec_idx != b->sec_idx)
1: +    return a->sec_idx < b->sec_idx ? -1 : 1;
1: +
1: +  /* sec_insn_off can't be the same within the section */
1: +  return a->sec_insn_off < b->sec_insn_off ? -1 : 1;
1: +}
1: +
1: +static int bpf_object__elf_collect(struct bpf_object *obj) {
1: +  Elf *elf = obj->efile.elf;
1: +  Elf_Data *btf_ext_data = NULL;
1: +  Elf_Data *btf_data = NULL;
1: +  int idx = 0, err = 0;
1: +  const char *name;
1: +  Elf_Data *data;
1: +  Elf_Scn *scn;
1: +  GElf_Shdr sh;
1: +
1: +  /* a bunch of ELF parsing functionality depends on processing symbols,
1: +   * so do the first pass and find the symbol table
1: +   */
1: +  scn = NULL;
1: +  while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: +    if (elf_sec_hdr(obj, scn, &sh))
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +
1: +    if (sh.sh_type == SHT_SYMTAB) {
1: +      if (obj->efile.symbols) {
1: +        pr_warn("elf: multiple symbol tables in %s\n", obj->path);
1: +        return -LIBBPF_ERRNO__FORMAT;
1: +      }
1: +
1: +      data = elf_sec_data(obj, scn);
1: +      if (!data)
1: +        return -LIBBPF_ERRNO__FORMAT;
1: +
1: +      obj->efile.symbols = data;
1: +      obj->efile.symbols_shndx = elf_ndxscn(scn);
1: +      obj->efile.strtabidx = sh.sh_link;
1: +    }
1: +  }
1: +
1: +  scn = NULL;
1: +  while ((scn = elf_nextscn(elf, scn)) != NULL) {
1: +    idx++;
1: +
1: +    if (elf_sec_hdr(obj, scn, &sh))
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +
1: +    name = elf_sec_str(obj, sh.sh_name);
1: +    if (!name)
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +
1: +    if (ignore_elf_section(&sh, name))
1: +      continue;
1: +
1: +    data = elf_sec_data(obj, scn);
1: +    if (!data)
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +
1: +    pr_debug("elf: section(%d) %s, size %ld, link %d, flags %lx, type=%d\n",
1: +             idx, name, (unsigned long)data->d_size, (int)sh.sh_link,
1: +             (unsigned long)sh.sh_flags, (int)sh.sh_type);
1: +
1: +    if (strcmp(name, "license") == 0) {
1: +      err = bpf_object__init_license(obj, data->d_buf, data->d_size);
1: +      if (err)
1: +        return err;
1: +    } else if (strcmp(name, "version") == 0) {
1: +      err = bpf_object__init_kversion(obj, data->d_buf, data->d_size);
1: +      if (err)
1: +        return err;
1: +    } else if (strcmp(name, "maps") == 0) {
1: +      obj->efile.maps_shndx = idx;
1: +    } else if (strcmp(name, MAPS_ELF_SEC) == 0) {
1: +      obj->efile.btf_maps_shndx = idx;
1: +    } else if (strcmp(name, BTF_ELF_SEC) == 0) {
1: +      btf_data = data;
1: +    } else if (strcmp(name, BTF_EXT_ELF_SEC) == 0) {
1: +      btf_ext_data = data;
1: +    } else if (sh.sh_type == SHT_SYMTAB) {
1: +      /* already processed during the first pass above */
1: +    } else if (sh.sh_type == SHT_PROGBITS && data->d_size > 0) {
1: +      if (sh.sh_flags & SHF_EXECINSTR) {
1: +        if (strcmp(name, ".text") == 0)
1: +          obj->efile.text_shndx = idx;
1: +        err = bpf_object__add_programs(obj, data, name, idx);
1: +        if (err)
1: +          return err;
1: +      } else if (strcmp(name, DATA_SEC) == 0) {
1: +        obj->efile.data = data;
1: +        obj->efile.data_shndx = idx;
1: +      } else if (strcmp(name, RODATA_SEC) == 0) {
1: +        obj->efile.rodata = data;
1: +        obj->efile.rodata_shndx = idx;
1: +      } else if (strcmp(name, STRUCT_OPS_SEC) == 0) {
1: +        obj->efile.st_ops_data = data;
1: +        obj->efile.st_ops_shndx = idx;
1: +      } else {
1: +        pr_info("elf: skipping unrecognized data section(%d) %s\n", idx, name);
1: +      }
1: +    } else if (sh.sh_type == SHT_REL) {
1: +      int nr_sects = obj->efile.nr_reloc_sects;
1: +      void *sects = obj->efile.reloc_sects;
1: +      int sec = sh.sh_info; /* points to other section */
1: +
1: +      /* Only do relo for section with exec instructions */
1: +      if (!section_have_execinstr(obj, sec) &&
1: +          strcmp(name, ".rel" STRUCT_OPS_SEC) &&
1: +          strcmp(name, ".rel" MAPS_ELF_SEC)) {
1: +        pr_info("elf: skipping relo section(%d) %s for section(%d) %s\n", idx,
1: +                name, sec,
1: +                elf_sec_name(obj, elf_sec_by_idx(obj, sec)) ?: "<?>");
1: +        continue;
1: +      }
1: +
1: +      sects = libbpf_reallocarray(sects, nr_sects + 1,
1: +                                  sizeof(*obj->efile.reloc_sects));
1: +      if (!sects)
1: +        return -ENOMEM;
1: +
1: +      obj->efile.reloc_sects = sects;
1: +      obj->efile.nr_reloc_sects++;
1: +
1: +      obj->efile.reloc_sects[nr_sects].shdr = sh;
1: +      obj->efile.reloc_sects[nr_sects].data = data;
1: +    } else if (sh.sh_type == SHT_NOBITS && strcmp(name, BSS_SEC) == 0) {
1: +      obj->efile.bss = data;
1: +      obj->efile.bss_shndx = idx;
1: +    } else {
1: +      pr_info("elf: skipping section(%d) %s (size %zu)\n", idx, name,
1: +              (size_t)sh.sh_size);
1: +    }
1: +  }
1: +
1: +  if (!obj->efile.strtabidx || obj->efile.strtabidx > idx) {
1: +    pr_warn("elf: symbol strings section missing or invalid in %s\n",
1: +            obj->path);
1: +    return -LIBBPF_ERRNO__FORMAT;
1: +  }
1: +
1: +  /* sort BPF programs by section name and in-section instruction offset
1: +   * for faster search */
1: +  qsort(obj->programs, obj->nr_programs, sizeof(*obj->programs), cmp_progs);
1: +
1: +  return bpf_object__init_btf(obj, btf_data, btf_ext_data);
1: +}
1: +
1: +static bool sym_is_extern(const GElf_Sym *sym) {
1: +  int bind = GELF_ST_BIND(sym->st_info);
1: +  /* externs are symbols w/ type=NOTYPE, bind=GLOBAL|WEAK, section=UND */
1: +  return sym->st_shndx == SHN_UNDEF &&
1: +         (bind == STB_GLOBAL || bind == STB_WEAK) &&
1: +         GELF_ST_TYPE(sym->st_info) == STT_NOTYPE;
1: +}
1: +
1: +static bool sym_is_subprog(const GElf_Sym *sym, int text_shndx) {
1: +  int bind = GELF_ST_BIND(sym->st_info);
1: +  int type = GELF_ST_TYPE(sym->st_info);
1: +
1: +  /* in .text section */
1: +  if (sym->st_shndx != text_shndx)
1: +    return false;
1: +
1: +  /* local function */
1: +  if (bind == STB_LOCAL && type == STT_SECTION)
1: +    return true;
1: +
1: +  /* global function */
1: +  return bind == STB_GLOBAL && type == STT_FUNC;
1: +}
1: +
1: +static int find_extern_btf_id(const struct btf *btf, const char *ext_name) {
1: +  const struct btf_type *t;
1: +  const char *tname;
1: +  int i, n;
1: +
1: +  if (!btf)
1: +    return -ESRCH;
1: +
1: +  n = btf__get_nr_types(btf);
1: +  for (i = 1; i <= n; i++) {
1: +    t = btf__type_by_id(btf, i);
1: +
1: +    if (!btf_is_var(t) && !btf_is_func(t))
1: +      continue;
1: +
1: +    tname = btf__name_by_offset(btf, t->name_off);
1: +    if (strcmp(tname, ext_name))
1: +      continue;
1: +
1: +    if (btf_is_var(t) && btf_var(t)->linkage != BTF_VAR_GLOBAL_EXTERN)
1: +      return -EINVAL;
1: +
1: +    if (btf_is_func(t) && btf_func_linkage(t) != BTF_FUNC_EXTERN)
1: +      return -EINVAL;
1:  
1: -		return i;
1: -	}
1: +    return i;
1: +  }
1:  
1: -	return -ENOENT;
1: +  return -ENOENT;
1:  }
1:  
1:  static int find_extern_sec_btf_id(struct btf *btf, int ext_btf_id) {
1: -	const struct btf_var_secinfo *vs;
1: -	const struct btf_type *t;
1: -	int i, j, n;
1: +  const struct btf_var_secinfo *vs;
1: +  const struct btf_type *t;
1: +  int i, j, n;
1:  
1: -	if (!btf)
1: -		return -ESRCH;
1: +  if (!btf)
1: +    return -ESRCH;
1:  
1: -	n = btf__get_nr_types(btf);
1: -	for (i = 1; i <= n; i++) {
1: -		t = btf__type_by_id(btf, i);
1: +  n = btf__get_nr_types(btf);
1: +  for (i = 1; i <= n; i++) {
1: +    t = btf__type_by_id(btf, i);
1:  
1: -		if (!btf_is_datasec(t))
1: -			continue;
1: +    if (!btf_is_datasec(t))
1: +      continue;
1:  
1: -		vs = btf_var_secinfos(t);
1: -		for (j = 0; j < btf_vlen(t); j++, vs++) {
1: -			if (vs->type == ext_btf_id)
1: -				return i;
1: -		}
1: -	}
1: +    vs = btf_var_secinfos(t);
1: +    for (j = 0; j < btf_vlen(t); j++, vs++) {
1: +      if (vs->type == ext_btf_id)
1: +        return i;
1: +    }
1: +  }
1:  
1: -	return -ENOENT;
1: +  return -ENOENT;
1:  }
1:  
1:  static enum kcfg_type find_kcfg_type(const struct btf *btf, int id,
1: -				     bool *is_signed)
1: -{
1: -	const struct btf_type *t;
1: -	const char *name;
1: -
1: -	t = skip_mods_and_typedefs(btf, id, NULL);
1: -	name = btf__name_by_offset(btf, t->name_off);
1: -
1: -	if (is_signed)
1: -		*is_signed = false;
1: -	switch (btf_kind(t)) {
1: -	case BTF_KIND_INT: {
1: -		int enc = btf_int_encoding(t);
1: -
1: -		if (enc & BTF_INT_BOOL)
1: -			return t->size == 1 ? KCFG_BOOL : KCFG_UNKNOWN;
1: -		if (is_signed)
1: -			*is_signed = enc & BTF_INT_SIGNED;
1: -		if (t->size == 1)
1: -			return KCFG_CHAR;
1: -		if (t->size < 1 || t->size > 8 || (t->size & (t->size - 1)))
1: -			return KCFG_UNKNOWN;
1: -		return KCFG_INT;
1: -	}
1: -	case BTF_KIND_ENUM:
1: -		if (t->size != 4)
1: -			return KCFG_UNKNOWN;
1: -		if (strcmp(name, "libbpf_tristate"))
1: -			return KCFG_UNKNOWN;
1: -		return KCFG_TRISTATE;
1: -	case BTF_KIND_ARRAY:
1: -		if (btf_array(t)->nelems == 0)
1: -			return KCFG_UNKNOWN;
1: -		if (find_kcfg_type(btf, btf_array(t)->type, NULL) != KCFG_CHAR)
1: -			return KCFG_UNKNOWN;
1: -		return KCFG_CHAR_ARR;
1: -	default:
1: -		return KCFG_UNKNOWN;
1: -	}
1: -}
1: -
1: -static int cmp_externs(const void *_a, const void *_b)
1: -{
1: -	const struct extern_desc *a = _a;
1: -	const struct extern_desc *b = _b;
1: -
1: -	if (a->type != b->type)
1: -		return a->type < b->type ? -1 : 1;
1: -
1: -	if (a->type == EXT_KCFG) {
1: -		/* descending order by alignment requirements */
1: -		if (a->kcfg.align != b->kcfg.align)
1: -			return a->kcfg.align > b->kcfg.align ? -1 : 1;
1: -		/* ascending order by size, within same alignment class */
1: -		if (a->kcfg.sz != b->kcfg.sz)
1: -			return a->kcfg.sz < b->kcfg.sz ? -1 : 1;
1: -	}
1: -
1: -	/* resolve ties by name */
1: -	return strcmp(a->name, b->name);
1: -}
1: -
1: -static int find_int_btf_id(const struct btf *btf)
1: -{
1: -	const struct btf_type *t;
1: -	int i, n;
1: -
1: -	n = btf__get_nr_types(btf);
1: -	for (i = 1; i <= n; i++) {
1: -		t = btf__type_by_id(btf, i);
1: -
1: -		if (btf_is_int(t) && btf_int_bits(t) == 32)
1: -			return i;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int add_dummy_ksym_var(struct btf *btf)
1: -{
1: -	int i, int_btf_id, sec_btf_id, dummy_var_btf_id;
1: -	const struct btf_var_secinfo *vs;
1: -	const struct btf_type *sec;
1: -
1: -	if (!btf)
1: -		return 0;
1: -
1: -	sec_btf_id = btf__find_by_name_kind(btf, KSYMS_SEC,
1: -					    BTF_KIND_DATASEC);
1: -	if (sec_btf_id < 0)
1: -		return 0;
1: -
1: -	sec = btf__type_by_id(btf, sec_btf_id);
1: -	vs = btf_var_secinfos(sec);
1: -	for (i = 0; i < btf_vlen(sec); i++, vs++) {
1: -		const struct btf_type *vt;
1: -
1: -		vt = btf__type_by_id(btf, vs->type);
1: -		if (btf_is_func(vt))
1: -			break;
1: -	}
1: -
1: -	/* No func in ksyms sec.  No need to add dummy var. */
1: -	if (i == btf_vlen(sec))
1: -		return 0;
1: -
1: -	int_btf_id = find_int_btf_id(btf);
1: -	dummy_var_btf_id = btf__add_var(btf,
1: -					"dummy_ksym",
1: -					BTF_VAR_GLOBAL_ALLOCATED,
1: -					int_btf_id);
1: -	if (dummy_var_btf_id < 0)
1: -		pr_warn("cannot create a dummy_ksym var\n");
1: -
1: -	return dummy_var_btf_id;
1: -}
1: -
1: -static int bpf_object__collect_externs(struct bpf_object *obj)
1: -{
1: -	struct btf_type *sec, *kcfg_sec = NULL, *ksym_sec = NULL;
1: -	const struct btf_type *t;
1: -	struct extern_desc *ext;
1: -	int i, n, off, dummy_var_btf_id;
1: -	const char *ext_name, *sec_name;
1: -	Elf_Scn *scn;
1: -	GElf_Shdr sh;
1: -
1: -	if (!obj->efile.symbols)
1: -		return 0;
1: -
1: -	scn = elf_sec_by_idx(obj, obj->efile.symbols_shndx);
1: -	if (elf_sec_hdr(obj, scn, &sh))
1: -		return -LIBBPF_ERRNO__FORMAT;
1: -
1: -	dummy_var_btf_id = add_dummy_ksym_var(obj->btf);
1: -	if (dummy_var_btf_id < 0)
1: -		return dummy_var_btf_id;
1: -
1: -	n = sh.sh_size / sh.sh_entsize;
1: -	pr_debug("looking for externs among %d symbols...\n", n);
1: -
1: -	for (i = 0; i < n; i++) {
1: -		GElf_Sym sym;
1: -
1: -		if (!gelf_getsym(obj->efile.symbols, i, &sym))
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		if (!sym_is_extern(&sym))
1: -			continue;
1: -		ext_name = elf_sym_str(obj, sym.st_name);
1: -		if (!ext_name || !ext_name[0])
1: -			continue;
1: -
1: -		ext = obj->externs;
1: -		ext = libbpf_reallocarray(ext, obj->nr_extern + 1, sizeof(*ext));
1: -		if (!ext)
1: -			return -ENOMEM;
1: -		obj->externs = ext;
1: -		ext = &ext[obj->nr_extern];
1: -		memset(ext, 0, sizeof(*ext));
1: -		obj->nr_extern++;
1: -
1: -		ext->btf_id = find_extern_btf_id(obj->btf, ext_name);
1: -		if (ext->btf_id <= 0) {
1: -			pr_warn("failed to find BTF for extern '%s': %d\n",
1: -				ext_name, ext->btf_id);
1: -			return ext->btf_id;
1: -		}
1: -		t = btf__type_by_id(obj->btf, ext->btf_id);
1: -		ext->name = btf__name_by_offset(obj->btf, t->name_off);
1: -		ext->sym_idx = i;
1: -		ext->is_weak = GELF_ST_BIND(sym.st_info) == STB_WEAK;
1: -
1: -		ext->sec_btf_id = find_extern_sec_btf_id(obj->btf, ext->btf_id);
1: -		if (ext->sec_btf_id <= 0) {
1: -			pr_warn("failed to find BTF for extern '%s' [%d] section: %d\n",
1: -				ext_name, ext->btf_id, ext->sec_btf_id);
1: -			return ext->sec_btf_id;
1: -		}
1: -		sec = (void *)btf__type_by_id(obj->btf, ext->sec_btf_id);
1: -		sec_name = btf__name_by_offset(obj->btf, sec->name_off);
1: -
1: -		if (strcmp(sec_name, KCONFIG_SEC) == 0) {
1: -			if (btf_is_func(t)) {
1: -				pr_warn("extern function %s is unsupported under %s section\n",
1: -					ext->name, KCONFIG_SEC);
1: -				return -ENOTSUP;
1: -			}
1: -			kcfg_sec = sec;
1: -			ext->type = EXT_KCFG;
1: -			ext->kcfg.sz = btf__resolve_size(obj->btf, t->type);
1: -			if (ext->kcfg.sz <= 0) {
1: -				pr_warn("failed to resolve size of extern (kcfg) '%s': %d\n",
1: -					ext_name, ext->kcfg.sz);
1: -				return ext->kcfg.sz;
1: -			}
1: -			ext->kcfg.align = btf__align_of(obj->btf, t->type);
1: -			if (ext->kcfg.align <= 0) {
1: -				pr_warn("failed to determine alignment of extern (kcfg) '%s': %d\n",
1: -					ext_name, ext->kcfg.align);
1: -				return -EINVAL;
1: -			}
1: -			ext->kcfg.type = find_kcfg_type(obj->btf, t->type,
1: -						        &ext->kcfg.is_signed);
1: -			if (ext->kcfg.type == KCFG_UNKNOWN) {
1: -				pr_warn("extern (kcfg) '%s' type is unsupported\n", ext_name);
1: -				return -ENOTSUP;
1: -			}
1: -		} else if (strcmp(sec_name, KSYMS_SEC) == 0) {
1: -			if (btf_is_func(t) && ext->is_weak) {
1: -				pr_warn("extern weak function %s is unsupported\n",
1: -					ext->name);
1: -				return -ENOTSUP;
1: -			}
1: -			ksym_sec = sec;
1: -			ext->type = EXT_KSYM;
1: -			skip_mods_and_typedefs(obj->btf, t->type,
1: -					       &ext->ksym.type_id);
1: -		} else {
1: -			pr_warn("unrecognized extern section '%s'\n", sec_name);
1: -			return -ENOTSUP;
1: -		}
1: -	}
1: -	pr_debug("collected %d externs total\n", obj->nr_extern);
1: -
1: -	if (!obj->nr_extern)
1: -		return 0;
1: -
1: -	/* sort externs by type, for kcfg ones also by (align, size, name) */
1: -	qsort(obj->externs, obj->nr_extern, sizeof(*ext), cmp_externs);
1: -
1: -	/* for .ksyms section, we need to turn all externs into allocated
1: -	 * variables in BTF to pass kernel verification; we do this by
1: -	 * pretending that each extern is a 8-byte variable
1: -	 */
1: -	if (ksym_sec) {
1: -		/* find existing 4-byte integer type in BTF to use for fake
1: -		 * extern variables in DATASEC
1: -		 */
1: -		int int_btf_id = find_int_btf_id(obj->btf);
1: -		/* For extern function, a dummy_var added earlier
1: -		 * will be used to replace the vs->type and
1: -		 * its name string will be used to refill
1: -		 * the missing param's name.
1: -		 */
1: -		const struct btf_type *dummy_var;
1: -
1: -		dummy_var = btf__type_by_id(obj->btf, dummy_var_btf_id);
1: -		for (i = 0; i < obj->nr_extern; i++) {
1: -			ext = &obj->externs[i];
1: -			if (ext->type != EXT_KSYM)
1: -				continue;
1: -			pr_debug("extern (ksym) #%d: symbol %d, name %s\n",
1: -				 i, ext->sym_idx, ext->name);
1: -		}
1: -
1: -		sec = ksym_sec;
1: -		n = btf_vlen(sec);
1: -		for (i = 0, off = 0; i < n; i++, off += sizeof(int)) {
1: -			struct btf_var_secinfo *vs = btf_var_secinfos(sec) + i;
1: -			struct btf_type *vt;
1: -
1: -			vt = (void *)btf__type_by_id(obj->btf, vs->type);
1: -			ext_name = btf__name_by_offset(obj->btf, vt->name_off);
1: -			ext = find_extern_by_name(obj, ext_name);
1: -			if (!ext) {
1: -				pr_warn("failed to find extern definition for BTF %s '%s'\n",
1: -					btf_kind_str(vt), ext_name);
1: -				return -ESRCH;
1: -			}
1: -			if (btf_is_func(vt)) {
1: -				const struct btf_type *func_proto;
1: -				struct btf_param *param;
1: -				int j;
1: -
1: -				func_proto = btf__type_by_id(obj->btf,
1: -							     vt->type);
1: -				param = btf_params(func_proto);
1: -				/* Reuse the dummy_var string if the
1: -				 * func proto does not have param name.
1: -				 */
1: -				for (j = 0; j < btf_vlen(func_proto); j++)
1: -					if (param[j].type && !param[j].name_off)
1: -						param[j].name_off =
1: -							dummy_var->name_off;
1: -				vs->type = dummy_var_btf_id;
1: -				vt->info &= ~0xffff;
1: -				vt->info |= BTF_FUNC_GLOBAL;
1: -			} else {
1: -				btf_var(vt)->linkage = BTF_VAR_GLOBAL_ALLOCATED;
1: -				vt->type = int_btf_id;
1: -			}
1: -			vs->offset = off;
1: -			vs->size = sizeof(int);
1: -		}
1: -		sec->size = off;
1: -	}
1: -
1: -	if (kcfg_sec) {
1: -		sec = kcfg_sec;
1: -		/* for kcfg externs calculate their offsets within a .kconfig map */
1: -		off = 0;
1: -		for (i = 0; i < obj->nr_extern; i++) {
1: -			ext = &obj->externs[i];
1: -			if (ext->type != EXT_KCFG)
1: -				continue;
1: -
1: -			ext->kcfg.data_off = roundup(off, ext->kcfg.align);
1: -			off = ext->kcfg.data_off + ext->kcfg.sz;
1: -			pr_debug("extern (kcfg) #%d: symbol %d, off %u, name %s\n",
1: -				 i, ext->sym_idx, ext->kcfg.data_off, ext->name);
1: -		}
1: -		sec->size = off;
1: -		n = btf_vlen(sec);
1: -		for (i = 0; i < n; i++) {
1: -			struct btf_var_secinfo *vs = btf_var_secinfos(sec) + i;
1: -
1: -			t = btf__type_by_id(obj->btf, vs->type);
1: -			ext_name = btf__name_by_offset(obj->btf, t->name_off);
1: -			ext = find_extern_by_name(obj, ext_name);
1: -			if (!ext) {
1: -				pr_warn("failed to find extern definition for BTF var '%s'\n",
1: -					ext_name);
1: -				return -ESRCH;
1: -			}
1: -			btf_var(t)->linkage = BTF_VAR_GLOBAL_ALLOCATED;
1: -			vs->offset = ext->kcfg.data_off;
1: -		}
1: -	}
1: -	return 0;
1: -}
1: -
1: -struct bpf_program *
1: -bpf_object__find_program_by_title(const struct bpf_object *obj,
1: -				  const char *title)
1: -{
1: -	struct bpf_program *pos;
1: -
1: -	bpf_object__for_each_program(pos, obj) {
1: -		if (pos->sec_name && !strcmp(pos->sec_name, title))
1: -			return pos;
1: -	}
1: -	return errno = ENOENT, NULL;
1: +                                     bool *is_signed) {
1: +  const struct btf_type *t;
1: +  const char *name;
1: +
1: +  t = skip_mods_and_typedefs(btf, id, NULL);
1: +  name = btf__name_by_offset(btf, t->name_off);
1: +
1: +  if (is_signed)
1: +    *is_signed = false;
1: +  switch (btf_kind(t)) {
1: +  case BTF_KIND_INT: {
1: +    int enc = btf_int_encoding(t);
1: +
1: +    if (enc & BTF_INT_BOOL)
1: +      return t->size == 1 ? KCFG_BOOL : KCFG_UNKNOWN;
1: +    if (is_signed)
1: +      *is_signed = enc & BTF_INT_SIGNED;
1: +    if (t->size == 1)
1: +      return KCFG_CHAR;
1: +    if (t->size < 1 || t->size > 8 || (t->size & (t->size - 1)))
1: +      return KCFG_UNKNOWN;
1: +    return KCFG_INT;
1: +  }
1: +  case BTF_KIND_ENUM:
1: +    if (t->size != 4)
1: +      return KCFG_UNKNOWN;
1: +    if (strcmp(name, "libbpf_tristate"))
1: +      return KCFG_UNKNOWN;
1: +    return KCFG_TRISTATE;
1: +  case BTF_KIND_ARRAY:
1: +    if (btf_array(t)->nelems == 0)
1: +      return KCFG_UNKNOWN;
1: +    if (find_kcfg_type(btf, btf_array(t)->type, NULL) != KCFG_CHAR)
1: +      return KCFG_UNKNOWN;
1: +    return KCFG_CHAR_ARR;
1: +  default:
1: +    return KCFG_UNKNOWN;
1: +  }
1: +}
1: +
1: +static int cmp_externs(const void *_a, const void *_b) {
1: +  const struct extern_desc *a = _a;
1: +  const struct extern_desc *b = _b;
1: +
1: +  if (a->type != b->type)
1: +    return a->type < b->type ? -1 : 1;
1: +
1: +  if (a->type == EXT_KCFG) {
1: +    /* descending order by alignment requirements */
1: +    if (a->kcfg.align != b->kcfg.align)
1: +      return a->kcfg.align > b->kcfg.align ? -1 : 1;
1: +    /* ascending order by size, within same alignment class */
1: +    if (a->kcfg.sz != b->kcfg.sz)
1: +      return a->kcfg.sz < b->kcfg.sz ? -1 : 1;
1: +  }
1: +
1: +  /* resolve ties by name */
1: +  return strcmp(a->name, b->name);
1: +}
1: +
1: +static int find_int_btf_id(const struct btf *btf) {
1: +  const struct btf_type *t;
1: +  int i, n;
1: +
1: +  n = btf__get_nr_types(btf);
1: +  for (i = 1; i <= n; i++) {
1: +    t = btf__type_by_id(btf, i);
1: +
1: +    if (btf_is_int(t) && btf_int_bits(t) == 32)
1: +      return i;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int add_dummy_ksym_var(struct btf *btf) {
1: +  int i, int_btf_id, sec_btf_id, dummy_var_btf_id;
1: +  const struct btf_var_secinfo *vs;
1: +  const struct btf_type *sec;
1: +
1: +  if (!btf)
1: +    return 0;
1: +
1: +  sec_btf_id = btf__find_by_name_kind(btf, KSYMS_SEC, BTF_KIND_DATASEC);
1: +  if (sec_btf_id < 0)
1: +    return 0;
1: +
1: +  sec = btf__type_by_id(btf, sec_btf_id);
1: +  vs = btf_var_secinfos(sec);
1: +  for (i = 0; i < btf_vlen(sec); i++, vs++) {
1: +    const struct btf_type *vt;
1: +
1: +    vt = btf__type_by_id(btf, vs->type);
1: +    if (btf_is_func(vt))
1: +      break;
1: +  }
1: +
1: +  /* No func in ksyms sec.  No need to add dummy var. */
1: +  if (i == btf_vlen(sec))
1: +    return 0;
1: +
1: +  int_btf_id = find_int_btf_id(btf);
1: +  dummy_var_btf_id =
1: +      btf__add_var(btf, "dummy_ksym", BTF_VAR_GLOBAL_ALLOCATED, int_btf_id);
1: +  if (dummy_var_btf_id < 0)
1: +    pr_warn("cannot create a dummy_ksym var\n");
1: +
1: +  return dummy_var_btf_id;
1: +}
1: +
1: +static int bpf_object__collect_externs(struct bpf_object *obj) {
1: +  struct btf_type *sec, *kcfg_sec = NULL, *ksym_sec = NULL;
1: +  const struct btf_type *t;
1: +  struct extern_desc *ext;
1: +  int i, n, off, dummy_var_btf_id;
1: +  const char *ext_name, *sec_name;
1: +  Elf_Scn *scn;
1: +  GElf_Shdr sh;
1: +
1: +  if (!obj->efile.symbols)
1: +    return 0;
1: +
1: +  scn = elf_sec_by_idx(obj, obj->efile.symbols_shndx);
1: +  if (elf_sec_hdr(obj, scn, &sh))
1: +    return -LIBBPF_ERRNO__FORMAT;
1: +
1: +  dummy_var_btf_id = add_dummy_ksym_var(obj->btf);
1: +  if (dummy_var_btf_id < 0)
1: +    return dummy_var_btf_id;
1: +
1: +  n = sh.sh_size / sh.sh_entsize;
1: +  pr_debug("looking for externs among %d symbols...\n", n);
1: +
1: +  for (i = 0; i < n; i++) {
1: +    GElf_Sym sym;
1: +
1: +    if (!gelf_getsym(obj->efile.symbols, i, &sym))
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    if (!sym_is_extern(&sym))
1: +      continue;
1: +    ext_name = elf_sym_str(obj, sym.st_name);
1: +    if (!ext_name || !ext_name[0])
1: +      continue;
1: +
1: +    ext = obj->externs;
1: +    ext = libbpf_reallocarray(ext, obj->nr_extern + 1, sizeof(*ext));
1: +    if (!ext)
1: +      return -ENOMEM;
1: +    obj->externs = ext;
1: +    ext = &ext[obj->nr_extern];
1: +    memset(ext, 0, sizeof(*ext));
1: +    obj->nr_extern++;
1: +
1: +    ext->btf_id = find_extern_btf_id(obj->btf, ext_name);
1: +    if (ext->btf_id <= 0) {
1: +      pr_warn("failed to find BTF for extern '%s': %d\n", ext_name,
1: +              ext->btf_id);
1: +      return ext->btf_id;
1: +    }
1: +    t = btf__type_by_id(obj->btf, ext->btf_id);
1: +    ext->name = btf__name_by_offset(obj->btf, t->name_off);
1: +    ext->sym_idx = i;
1: +    ext->is_weak = GELF_ST_BIND(sym.st_info) == STB_WEAK;
1: +
1: +    ext->sec_btf_id = find_extern_sec_btf_id(obj->btf, ext->btf_id);
1: +    if (ext->sec_btf_id <= 0) {
1: +      pr_warn("failed to find BTF for extern '%s' [%d] section: %d\n", ext_name,
1: +              ext->btf_id, ext->sec_btf_id);
1: +      return ext->sec_btf_id;
1: +    }
1: +    sec = (void *)btf__type_by_id(obj->btf, ext->sec_btf_id);
1: +    sec_name = btf__name_by_offset(obj->btf, sec->name_off);
1: +
1: +    if (strcmp(sec_name, KCONFIG_SEC) == 0) {
1: +      if (btf_is_func(t)) {
1: +        pr_warn("extern function %s is unsupported under %s section\n",
1: +                ext->name, KCONFIG_SEC);
1: +        return -ENOTSUP;
1: +      }
1: +      kcfg_sec = sec;
1: +      ext->type = EXT_KCFG;
1: +      ext->kcfg.sz = btf__resolve_size(obj->btf, t->type);
1: +      if (ext->kcfg.sz <= 0) {
1: +        pr_warn("failed to resolve size of extern (kcfg) '%s': %d\n", ext_name,
1: +                ext->kcfg.sz);
1: +        return ext->kcfg.sz;
1: +      }
1: +      ext->kcfg.align = btf__align_of(obj->btf, t->type);
1: +      if (ext->kcfg.align <= 0) {
1: +        pr_warn("failed to determine alignment of extern (kcfg) '%s': %d\n",
1: +                ext_name, ext->kcfg.align);
1: +        return -EINVAL;
1: +      }
1: +      ext->kcfg.type = find_kcfg_type(obj->btf, t->type, &ext->kcfg.is_signed);
1: +      if (ext->kcfg.type == KCFG_UNKNOWN) {
1: +        pr_warn("extern (kcfg) '%s' type is unsupported\n", ext_name);
1: +        return -ENOTSUP;
1: +      }
1: +    } else if (strcmp(sec_name, KSYMS_SEC) == 0) {
1: +      if (btf_is_func(t) && ext->is_weak) {
1: +        pr_warn("extern weak function %s is unsupported\n", ext->name);
1: +        return -ENOTSUP;
1: +      }
1: +      ksym_sec = sec;
1: +      ext->type = EXT_KSYM;
1: +      skip_mods_and_typedefs(obj->btf, t->type, &ext->ksym.type_id);
1: +    } else {
1: +      pr_warn("unrecognized extern section '%s'\n", sec_name);
1: +      return -ENOTSUP;
1: +    }
1: +  }
1: +  pr_debug("collected %d externs total\n", obj->nr_extern);
1: +
1: +  if (!obj->nr_extern)
1: +    return 0;
1: +
1: +  /* sort externs by type, for kcfg ones also by (align, size, name) */
1: +  qsort(obj->externs, obj->nr_extern, sizeof(*ext), cmp_externs);
1: +
1: +  /* for .ksyms section, we need to turn all externs into allocated
1: +   * variables in BTF to pass kernel verification; we do this by
1: +   * pretending that each extern is a 8-byte variable
1: +   */
1: +  if (ksym_sec) {
1: +    /* find existing 4-byte integer type in BTF to use for fake
1: +     * extern variables in DATASEC
1: +     */
1: +    int int_btf_id = find_int_btf_id(obj->btf);
1: +    /* For extern function, a dummy_var added earlier
1: +     * will be used to replace the vs->type and
1: +     * its name string will be used to refill
1: +     * the missing param's name.
1: +     */
1: +    const struct btf_type *dummy_var;
1: +
1: +    dummy_var = btf__type_by_id(obj->btf, dummy_var_btf_id);
1: +    for (i = 0; i < obj->nr_extern; i++) {
1: +      ext = &obj->externs[i];
1: +      if (ext->type != EXT_KSYM)
1: +        continue;
1: +      pr_debug("extern (ksym) #%d: symbol %d, name %s\n", i, ext->sym_idx,
1: +               ext->name);
1: +    }
1: +
1: +    sec = ksym_sec;
1: +    n = btf_vlen(sec);
1: +    for (i = 0, off = 0; i < n; i++, off += sizeof(int)) {
1: +      struct btf_var_secinfo *vs = btf_var_secinfos(sec) + i;
1: +      struct btf_type *vt;
1: +
1: +      vt = (void *)btf__type_by_id(obj->btf, vs->type);
1: +      ext_name = btf__name_by_offset(obj->btf, vt->name_off);
1: +      ext = find_extern_by_name(obj, ext_name);
1: +      if (!ext) {
1: +        pr_warn("failed to find extern definition for BTF %s '%s'\n",
1: +                btf_kind_str(vt), ext_name);
1: +        return -ESRCH;
1: +      }
1: +      if (btf_is_func(vt)) {
1: +        const struct btf_type *func_proto;
1: +        struct btf_param *param;
1: +        int j;
1: +
1: +        func_proto = btf__type_by_id(obj->btf, vt->type);
1: +        param = btf_params(func_proto);
1: +        /* Reuse the dummy_var string if the
1: +         * func proto does not have param name.
1: +         */
1: +        for (j = 0; j < btf_vlen(func_proto); j++)
1: +          if (param[j].type && !param[j].name_off)
1: +            param[j].name_off = dummy_var->name_off;
1: +        vs->type = dummy_var_btf_id;
1: +        vt->info &= ~0xffff;
1: +        vt->info |= BTF_FUNC_GLOBAL;
1: +      } else {
1: +        btf_var(vt)->linkage = BTF_VAR_GLOBAL_ALLOCATED;
1: +        vt->type = int_btf_id;
1: +      }
1: +      vs->offset = off;
1: +      vs->size = sizeof(int);
1: +    }
1: +    sec->size = off;
1: +  }
1: +
1: +  if (kcfg_sec) {
1: +    sec = kcfg_sec;
1: +    /* for kcfg externs calculate their offsets within a .kconfig map */
1: +    off = 0;
1: +    for (i = 0; i < obj->nr_extern; i++) {
1: +      ext = &obj->externs[i];
1: +      if (ext->type != EXT_KCFG)
1: +        continue;
1: +
1: +      ext->kcfg.data_off = roundup(off, ext->kcfg.align);
1: +      off = ext->kcfg.data_off + ext->kcfg.sz;
1: +      pr_debug("extern (kcfg) #%d: symbol %d, off %u, name %s\n", i,
1: +               ext->sym_idx, ext->kcfg.data_off, ext->name);
1: +    }
1: +    sec->size = off;
1: +    n = btf_vlen(sec);
1: +    for (i = 0; i < n; i++) {
1: +      struct btf_var_secinfo *vs = btf_var_secinfos(sec) + i;
1: +
1: +      t = btf__type_by_id(obj->btf, vs->type);
1: +      ext_name = btf__name_by_offset(obj->btf, t->name_off);
1: +      ext = find_extern_by_name(obj, ext_name);
1: +      if (!ext) {
1: +        pr_warn("failed to find extern definition for BTF var '%s'\n",
1: +                ext_name);
1: +        return -ESRCH;
1: +      }
1: +      btf_var(t)->linkage = BTF_VAR_GLOBAL_ALLOCATED;
1: +      vs->offset = ext->kcfg.data_off;
1: +    }
1: +  }
1: +  return 0;
1: +}
1: +
1: +struct bpf_program *bpf_object__find_program_by_title(
1: +    const struct bpf_object *obj, const char *title) {
1: +  struct bpf_program *pos;
1: +
1: +  bpf_object__for_each_program(pos, obj) {
1: +    if (pos->sec_name && !strcmp(pos->sec_name, title))
1: +      return pos;
1: +  }
1: +  return errno = ENOENT, NULL;
1:  }
1:  
1:  static bool prog_is_subprog(const struct bpf_object *obj,
1: -			    const struct bpf_program *prog)
1: -{
1: -	/* For legacy reasons, libbpf supports an entry-point BPF programs
1: -	 * without SEC() attribute, i.e., those in the .text section. But if
1: -	 * there are 2 or more such programs in the .text section, they all
1: -	 * must be subprograms called from entry-point BPF programs in
1: -	 * designated SEC()'tions, otherwise there is no way to distinguish
1: -	 * which of those programs should be loaded vs which are a subprogram.
1: -	 * Similarly, if there is a function/program in .text and at least one
1: -	 * other BPF program with custom SEC() attribute, then we just assume
1: -	 * .text programs are subprograms (even if they are not called from
1: -	 * other programs), because libbpf never explicitly supported mixing
1: -	 * SEC()-designated BPF programs and .text entry-point BPF programs.
1: -	 */
1: -	return prog->sec_idx == obj->efile.text_shndx && obj->nr_programs > 1;
1: -}
1: -
1: -struct bpf_program *
1: -bpf_object__find_program_by_name(const struct bpf_object *obj,
1: -				 const char *name)
1: -{
1: -	struct bpf_program *prog;
1: -
1: -	bpf_object__for_each_program(prog, obj) {
1: -		if (prog_is_subprog(obj, prog))
1: -			continue;
1: -		if (!strcmp(prog->name, name))
1: -			return prog;
1: -	}
1: -	return errno = ENOENT, NULL;
1: -}
1: -
1: -static bool bpf_object__shndx_is_data(const struct bpf_object *obj,
1: -				      int shndx)
1: -{
1: -	return shndx == obj->efile.data_shndx ||
1: -	       shndx == obj->efile.bss_shndx ||
1: -	       shndx == obj->efile.rodata_shndx;
1: -}
1: -
1: -static bool bpf_object__shndx_is_maps(const struct bpf_object *obj,
1: -				      int shndx)
1: -{
1: -	return shndx == obj->efile.maps_shndx ||
1: -	       shndx == obj->efile.btf_maps_shndx;
1: -}
1: -
1: -static enum libbpf_map_type
1: -bpf_object__section_to_libbpf_map_type(const struct bpf_object *obj, int shndx)
1: -{
1: -	if (shndx == obj->efile.data_shndx)
1: -		return LIBBPF_MAP_DATA;
1: -	else if (shndx == obj->efile.bss_shndx)
1: -		return LIBBPF_MAP_BSS;
1: -	else if (shndx == obj->efile.rodata_shndx)
1: -		return LIBBPF_MAP_RODATA;
1: -	else if (shndx == obj->efile.symbols_shndx)
1: -		return LIBBPF_MAP_KCONFIG;
1: -	else
1: -		return LIBBPF_MAP_UNSPEC;
1: +                            const struct bpf_program *prog) {
1: +  /* For legacy reasons, libbpf supports an entry-point BPF programs
1: +   * without SEC() attribute, i.e., those in the .text section. But if
1: +   * there are 2 or more such programs in the .text section, they all
1: +   * must be subprograms called from entry-point BPF programs in
1: +   * designated SEC()'tions, otherwise there is no way to distinguish
1: +   * which of those programs should be loaded vs which are a subprogram.
1: +   * Similarly, if there is a function/program in .text and at least one
1: +   * other BPF program with custom SEC() attribute, then we just assume
1: +   * .text programs are subprograms (even if they are not called from
1: +   * other programs), because libbpf never explicitly supported mixing
1: +   * SEC()-designated BPF programs and .text entry-point BPF programs.
1: +   */
1: +  return prog->sec_idx == obj->efile.text_shndx && obj->nr_programs > 1;
1: +}
1: +
1: +struct bpf_program *bpf_object__find_program_by_name(
1: +    const struct bpf_object *obj, const char *name) {
1: +  struct bpf_program *prog;
1: +
1: +  bpf_object__for_each_program(prog, obj) {
1: +    if (prog_is_subprog(obj, prog))
1: +      continue;
1: +    if (!strcmp(prog->name, name))
1: +      return prog;
1: +  }
1: +  return errno = ENOENT, NULL;
1: +}
1: +
1: +static bool bpf_object__shndx_is_data(const struct bpf_object *obj, int shndx) {
1: +  return shndx == obj->efile.data_shndx || shndx == obj->efile.bss_shndx ||
1: +         shndx == obj->efile.rodata_shndx;
1: +}
1: +
1: +static bool bpf_object__shndx_is_maps(const struct bpf_object *obj, int shndx) {
1: +  return shndx == obj->efile.maps_shndx || shndx == obj->efile.btf_maps_shndx;
1: +}
1: +
1: +static enum libbpf_map_type bpf_object__section_to_libbpf_map_type(
1: +    const struct bpf_object *obj, int shndx) {
1: +  if (shndx == obj->efile.data_shndx)
1: +    return LIBBPF_MAP_DATA;
1: +  else if (shndx == obj->efile.bss_shndx)
1: +    return LIBBPF_MAP_BSS;
1: +  else if (shndx == obj->efile.rodata_shndx)
1: +    return LIBBPF_MAP_RODATA;
1: +  else if (shndx == obj->efile.symbols_shndx)
1: +    return LIBBPF_MAP_KCONFIG;
1: +  else
1: +    return LIBBPF_MAP_UNSPEC;
1:  }
1:  
1:  static int bpf_program__record_reloc(struct bpf_program *prog,
1: -				     struct reloc_desc *reloc_desc,
1: -				     __u32 insn_idx, const char *sym_name,
1: -				     const GElf_Sym *sym, const GElf_Rel *rel)
1: -{
1: -	struct bpf_insn *insn = &prog->insns[insn_idx];
1: -	size_t map_idx, nr_maps = prog->obj->nr_maps;
1: -	struct bpf_object *obj = prog->obj;
1: -	__u32 shdr_idx = sym->st_shndx;
1: -	enum libbpf_map_type type;
1: -	const char *sym_sec_name;
1: -	struct bpf_map *map;
1: -
1: -	if (!is_call_insn(insn) && !is_ldimm64_insn(insn)) {
1: -		pr_warn("prog '%s': invalid relo against '%s' for insns[%d].code 0x%x\n",
1: -			prog->name, sym_name, insn_idx, insn->code);
1: -		return -LIBBPF_ERRNO__RELOC;
1: -	}
1: -
1: -	if (sym_is_extern(sym)) {
1: -		int sym_idx = GELF_R_SYM(rel->r_info);
1: -		int i, n = obj->nr_extern;
1: -		struct extern_desc *ext;
1: -
1: -		for (i = 0; i < n; i++) {
1: -			ext = &obj->externs[i];
1: -			if (ext->sym_idx == sym_idx)
1: -				break;
1: -		}
1: -		if (i >= n) {
1: -			pr_warn("prog '%s': extern relo failed to find extern for '%s' (%d)\n",
1: -				prog->name, sym_name, sym_idx);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		pr_debug("prog '%s': found extern #%d '%s' (sym %d) for insn #%u\n",
1: -			 prog->name, i, ext->name, ext->sym_idx, insn_idx);
1: -		if (insn->code == (BPF_JMP | BPF_CALL))
1: -			reloc_desc->type = RELO_EXTERN_FUNC;
1: -		else
1: -			reloc_desc->type = RELO_EXTERN_VAR;
1: -		reloc_desc->insn_idx = insn_idx;
1: -		reloc_desc->sym_off = i; /* sym_off stores extern index */
1: -		return 0;
1: -	}
1: -
1: -	/* sub-program call relocation */
1: -	if (is_call_insn(insn)) {
1: -		if (insn->src_reg != BPF_PSEUDO_CALL) {
1: -			pr_warn("prog '%s': incorrect bpf_call opcode\n", prog->name);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		/* text_shndx can be 0, if no default "main" program exists */
1: -		if (!shdr_idx || shdr_idx != obj->efile.text_shndx) {
1: -			sym_sec_name = elf_sec_name(obj, elf_sec_by_idx(obj, shdr_idx));
1: -			pr_warn("prog '%s': bad call relo against '%s' in section '%s'\n",
1: -				prog->name, sym_name, sym_sec_name);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		if (sym->st_value % BPF_INSN_SZ) {
1: -			pr_warn("prog '%s': bad call relo against '%s' at offset %zu\n",
1: -				prog->name, sym_name, (size_t)sym->st_value);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		reloc_desc->type = RELO_CALL;
1: -		reloc_desc->insn_idx = insn_idx;
1: -		reloc_desc->sym_off = sym->st_value;
1: -		return 0;
1: -	}
1: -
1: -	if (!shdr_idx || shdr_idx >= SHN_LORESERVE) {
1: -		pr_warn("prog '%s': invalid relo against '%s' in special section 0x%x; forgot to initialize global var?..\n",
1: -			prog->name, sym_name, shdr_idx);
1: -		return -LIBBPF_ERRNO__RELOC;
1: -	}
1: -
1: -	/* loading subprog addresses */
1: -	if (sym_is_subprog(sym, obj->efile.text_shndx)) {
1: -		/* global_func: sym->st_value = offset in the section, insn->imm = 0.
1: -		 * local_func: sym->st_value = 0, insn->imm = offset in the section.
1: -		 */
1: -		if ((sym->st_value % BPF_INSN_SZ) || (insn->imm % BPF_INSN_SZ)) {
1: -			pr_warn("prog '%s': bad subprog addr relo against '%s' at offset %zu+%d\n",
1: -				prog->name, sym_name, (size_t)sym->st_value, insn->imm);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -
1: -		reloc_desc->type = RELO_SUBPROG_ADDR;
1: -		reloc_desc->insn_idx = insn_idx;
1: -		reloc_desc->sym_off = sym->st_value;
1: -		return 0;
1: -	}
1: -
1: -	type = bpf_object__section_to_libbpf_map_type(obj, shdr_idx);
1: -	sym_sec_name = elf_sec_name(obj, elf_sec_by_idx(obj, shdr_idx));
1: -
1: -	/* generic map reference relocation */
1: -	if (type == LIBBPF_MAP_UNSPEC) {
1: -		if (!bpf_object__shndx_is_maps(obj, shdr_idx)) {
1: -			pr_warn("prog '%s': bad map relo against '%s' in section '%s'\n",
1: -				prog->name, sym_name, sym_sec_name);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		for (map_idx = 0; map_idx < nr_maps; map_idx++) {
1: -			map = &obj->maps[map_idx];
1: -			if (map->libbpf_type != type ||
1: -			    map->sec_idx != sym->st_shndx ||
1: -			    map->sec_offset != sym->st_value)
1: -				continue;
1: -			pr_debug("prog '%s': found map %zd (%s, sec %d, off %zu) for insn #%u\n",
1: -				 prog->name, map_idx, map->name, map->sec_idx,
1: -				 map->sec_offset, insn_idx);
1: -			break;
1: -		}
1: -		if (map_idx >= nr_maps) {
1: -			pr_warn("prog '%s': map relo failed to find map for section '%s', off %zu\n",
1: -				prog->name, sym_sec_name, (size_t)sym->st_value);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		reloc_desc->type = RELO_LD64;
1: -		reloc_desc->insn_idx = insn_idx;
1: -		reloc_desc->map_idx = map_idx;
1: -		reloc_desc->sym_off = 0; /* sym->st_value determines map_idx */
1: -		return 0;
1: -	}
1: -
1: -	/* global data map relocation */
1: -	if (!bpf_object__shndx_is_data(obj, shdr_idx)) {
1: -		pr_warn("prog '%s': bad data relo against section '%s'\n",
1: -			prog->name, sym_sec_name);
1: -		return -LIBBPF_ERRNO__RELOC;
1: -	}
1: -	for (map_idx = 0; map_idx < nr_maps; map_idx++) {
1: -		map = &obj->maps[map_idx];
1: -		if (map->libbpf_type != type)
1: -			continue;
1: -		pr_debug("prog '%s': found data map %zd (%s, sec %d, off %zu) for insn %u\n",
1: -			 prog->name, map_idx, map->name, map->sec_idx,
1: -			 map->sec_offset, insn_idx);
1: -		break;
1: -	}
1: -	if (map_idx >= nr_maps) {
1: -		pr_warn("prog '%s': data relo failed to find map for section '%s'\n",
1: -			prog->name, sym_sec_name);
1: -		return -LIBBPF_ERRNO__RELOC;
1: -	}
1: -
1: -	reloc_desc->type = RELO_DATA;
1: -	reloc_desc->insn_idx = insn_idx;
1: -	reloc_desc->map_idx = map_idx;
1: -	reloc_desc->sym_off = sym->st_value;
1: -	return 0;
1: -}
1: -
1: -static bool prog_contains_insn(const struct bpf_program *prog, size_t insn_idx)
1: -{
1: -	return insn_idx >= prog->sec_insn_off &&
1: -	       insn_idx < prog->sec_insn_off + prog->sec_insn_cnt;
1: +                                     struct reloc_desc *reloc_desc,
1: +                                     __u32 insn_idx, const char *sym_name,
1: +                                     const GElf_Sym *sym, const GElf_Rel *rel) {
1: +  struct bpf_insn *insn = &prog->insns[insn_idx];
1: +  size_t map_idx, nr_maps = prog->obj->nr_maps;
1: +  struct bpf_object *obj = prog->obj;
1: +  __u32 shdr_idx = sym->st_shndx;
1: +  enum libbpf_map_type type;
1: +  const char *sym_sec_name;
1: +  struct bpf_map *map;
1: +
1: +  if (!is_call_insn(insn) && !is_ldimm64_insn(insn)) {
1: +    pr_warn("prog '%s': invalid relo against '%s' for insns[%d].code 0x%x\n",
1: +            prog->name, sym_name, insn_idx, insn->code);
1: +    return -LIBBPF_ERRNO__RELOC;
1: +  }
1: +
1: +  if (sym_is_extern(sym)) {
1: +    int sym_idx = GELF_R_SYM(rel->r_info);
1: +    int i, n = obj->nr_extern;
1: +    struct extern_desc *ext;
1: +
1: +    for (i = 0; i < n; i++) {
1: +      ext = &obj->externs[i];
1: +      if (ext->sym_idx == sym_idx)
1: +        break;
1: +    }
1: +    if (i >= n) {
1: +      pr_warn("prog '%s': extern relo failed to find extern for '%s' (%d)\n",
1: +              prog->name, sym_name, sym_idx);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    pr_debug("prog '%s': found extern #%d '%s' (sym %d) for insn #%u\n",
1: +             prog->name, i, ext->name, ext->sym_idx, insn_idx);
1: +    if (insn->code == (BPF_JMP | BPF_CALL))
1: +      reloc_desc->type = RELO_EXTERN_FUNC;
1: +    else
1: +      reloc_desc->type = RELO_EXTERN_VAR;
1: +    reloc_desc->insn_idx = insn_idx;
1: +    reloc_desc->sym_off = i; /* sym_off stores extern index */
1: +    return 0;
1: +  }
1: +
1: +  /* sub-program call relocation */
1: +  if (is_call_insn(insn)) {
1: +    if (insn->src_reg != BPF_PSEUDO_CALL) {
1: +      pr_warn("prog '%s': incorrect bpf_call opcode\n", prog->name);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    /* text_shndx can be 0, if no default "main" program exists */
1: +    if (!shdr_idx || shdr_idx != obj->efile.text_shndx) {
1: +      sym_sec_name = elf_sec_name(obj, elf_sec_by_idx(obj, shdr_idx));
1: +      pr_warn("prog '%s': bad call relo against '%s' in section '%s'\n",
1: +              prog->name, sym_name, sym_sec_name);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    if (sym->st_value % BPF_INSN_SZ) {
1: +      pr_warn("prog '%s': bad call relo against '%s' at offset %zu\n",
1: +              prog->name, sym_name, (size_t)sym->st_value);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    reloc_desc->type = RELO_CALL;
1: +    reloc_desc->insn_idx = insn_idx;
1: +    reloc_desc->sym_off = sym->st_value;
1: +    return 0;
1: +  }
1: +
1: +  if (!shdr_idx || shdr_idx >= SHN_LORESERVE) {
1: +    pr_warn(
1: +        "prog '%s': invalid relo against '%s' in special section 0x%x; forgot "
1: +        "to initialize global var?..\n",
1: +        prog->name, sym_name, shdr_idx);
1: +    return -LIBBPF_ERRNO__RELOC;
1: +  }
1: +
1: +  /* loading subprog addresses */
1: +  if (sym_is_subprog(sym, obj->efile.text_shndx)) {
1: +    /* global_func: sym->st_value = offset in the section, insn->imm = 0.
1: +     * local_func: sym->st_value = 0, insn->imm = offset in the section.
1: +     */
1: +    if ((sym->st_value % BPF_INSN_SZ) || (insn->imm % BPF_INSN_SZ)) {
1: +      pr_warn(
1: +          "prog '%s': bad subprog addr relo against '%s' at offset %zu+%d\n",
1: +          prog->name, sym_name, (size_t)sym->st_value, insn->imm);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +
1: +    reloc_desc->type = RELO_SUBPROG_ADDR;
1: +    reloc_desc->insn_idx = insn_idx;
1: +    reloc_desc->sym_off = sym->st_value;
1: +    return 0;
1: +  }
1: +
1: +  type = bpf_object__section_to_libbpf_map_type(obj, shdr_idx);
1: +  sym_sec_name = elf_sec_name(obj, elf_sec_by_idx(obj, shdr_idx));
1: +
1: +  /* generic map reference relocation */
1: +  if (type == LIBBPF_MAP_UNSPEC) {
1: +    if (!bpf_object__shndx_is_maps(obj, shdr_idx)) {
1: +      pr_warn("prog '%s': bad map relo against '%s' in section '%s'\n",
1: +              prog->name, sym_name, sym_sec_name);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    for (map_idx = 0; map_idx < nr_maps; map_idx++) {
1: +      map = &obj->maps[map_idx];
1: +      if (map->libbpf_type != type || map->sec_idx != sym->st_shndx ||
1: +          map->sec_offset != sym->st_value)
1: +        continue;
1: +      pr_debug("prog '%s': found map %zd (%s, sec %d, off %zu) for insn #%u\n",
1: +               prog->name, map_idx, map->name, map->sec_idx, map->sec_offset,
1: +               insn_idx);
1: +      break;
1: +    }
1: +    if (map_idx >= nr_maps) {
1: +      pr_warn(
1: +          "prog '%s': map relo failed to find map for section '%s', off %zu\n",
1: +          prog->name, sym_sec_name, (size_t)sym->st_value);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    reloc_desc->type = RELO_LD64;
1: +    reloc_desc->insn_idx = insn_idx;
1: +    reloc_desc->map_idx = map_idx;
1: +    reloc_desc->sym_off = 0; /* sym->st_value determines map_idx */
1: +    return 0;
1: +  }
1: +
1: +  /* global data map relocation */
1: +  if (!bpf_object__shndx_is_data(obj, shdr_idx)) {
1: +    pr_warn("prog '%s': bad data relo against section '%s'\n", prog->name,
1: +            sym_sec_name);
1: +    return -LIBBPF_ERRNO__RELOC;
1: +  }
1: +  for (map_idx = 0; map_idx < nr_maps; map_idx++) {
1: +    map = &obj->maps[map_idx];
1: +    if (map->libbpf_type != type)
1: +      continue;
1: +    pr_debug(
1: +        "prog '%s': found data map %zd (%s, sec %d, off %zu) for insn %u\n",
1: +        prog->name, map_idx, map->name, map->sec_idx, map->sec_offset,
1: +        insn_idx);
1: +    break;
1: +  }
1: +  if (map_idx >= nr_maps) {
1: +    pr_warn("prog '%s': data relo failed to find map for section '%s'\n",
1: +            prog->name, sym_sec_name);
1: +    return -LIBBPF_ERRNO__RELOC;
1: +  }
1: +
1: +  reloc_desc->type = RELO_DATA;
1: +  reloc_desc->insn_idx = insn_idx;
1: +  reloc_desc->map_idx = map_idx;
1: +  reloc_desc->sym_off = sym->st_value;
1: +  return 0;
1: +}
1: +
1: +static bool prog_contains_insn(const struct bpf_program *prog,
1: +                               size_t insn_idx) {
1: +  return insn_idx >= prog->sec_insn_off &&
1: +         insn_idx < prog->sec_insn_off + prog->sec_insn_cnt;
1:  }
1:  
1:  static struct bpf_program *find_prog_by_sec_insn(const struct bpf_object *obj,
1: -						 size_t sec_idx, size_t insn_idx)
1: -{
1: -	int l = 0, r = obj->nr_programs - 1, m;
1: -	struct bpf_program *prog;
1: -
1: -	while (l < r) {
1: -		m = l + (r - l + 1) / 2;
1: -		prog = &obj->programs[m];
1: -
1: -		if (prog->sec_idx < sec_idx ||
1: -		    (prog->sec_idx == sec_idx && prog->sec_insn_off <= insn_idx))
1: -			l = m;
1: -		else
1: -			r = m - 1;
1: -	}
1: -	/* matching program could be at index l, but it still might be the
1: -	 * wrong one, so we need to double check conditions for the last time
1: -	 */
1: -	prog = &obj->programs[l];
1: -	if (prog->sec_idx == sec_idx && prog_contains_insn(prog, insn_idx))
1: -		return prog;
1: -	return NULL;
1: -}
1: -
1: -static int
1: -bpf_object__collect_prog_relos(struct bpf_object *obj, GElf_Shdr *shdr, Elf_Data *data)
1: -{
1: -	Elf_Data *symbols = obj->efile.symbols;
1: -	const char *relo_sec_name, *sec_name;
1: -	size_t sec_idx = shdr->sh_info;
1: -	struct bpf_program *prog;
1: -	struct reloc_desc *relos;
1: -	int err, i, nrels;
1: -	const char *sym_name;
1: -	__u32 insn_idx;
1: -	Elf_Scn *scn;
1: -	Elf_Data *scn_data;
1: -	GElf_Sym sym;
1: -	GElf_Rel rel;
1: -
1: -	scn = elf_sec_by_idx(obj, sec_idx);
1: -	scn_data = elf_sec_data(obj, scn);
1: -
1: -	relo_sec_name = elf_sec_str(obj, shdr->sh_name);
1: -	sec_name = elf_sec_name(obj, scn);
1: -	if (!relo_sec_name || !sec_name)
1: -		return -EINVAL;
1: -
1: -	pr_debug("sec '%s': collecting relocation for section(%zu) '%s'\n",
1: -		 relo_sec_name, sec_idx, sec_name);
1: -	nrels = shdr->sh_size / shdr->sh_entsize;
1: -
1: -	for (i = 0; i < nrels; i++) {
1: -		if (!gelf_getrel(data, i, &rel)) {
1: -			pr_warn("sec '%s': failed to get relo #%d\n", relo_sec_name, i);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -		if (!gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &sym)) {
1: -			pr_warn("sec '%s': symbol 0x%zx not found for relo #%d\n",
1: -				relo_sec_name, (size_t)GELF_R_SYM(rel.r_info), i);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		if (rel.r_offset % BPF_INSN_SZ || rel.r_offset >= scn_data->d_size) {
1: -			pr_warn("sec '%s': invalid offset 0x%zx for relo #%d\n",
1: -				relo_sec_name, (size_t)GELF_R_SYM(rel.r_info), i);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		insn_idx = rel.r_offset / BPF_INSN_SZ;
1: -		/* relocations against static functions are recorded as
1: -		 * relocations against the section that contains a function;
1: -		 * in such case, symbol will be STT_SECTION and sym.st_name
1: -		 * will point to empty string (0), so fetch section name
1: -		 * instead
1: -		 */
1: -		if (GELF_ST_TYPE(sym.st_info) == STT_SECTION && sym.st_name == 0)
1: -			sym_name = elf_sec_name(obj, elf_sec_by_idx(obj, sym.st_shndx));
1: -		else
1: -			sym_name = elf_sym_str(obj, sym.st_name);
1: -		sym_name = sym_name ?: "<?";
1: -
1: -		pr_debug("sec '%s': relo #%d: insn #%u against '%s'\n",
1: -			 relo_sec_name, i, insn_idx, sym_name);
1: -
1: -		prog = find_prog_by_sec_insn(obj, sec_idx, insn_idx);
1: -		if (!prog) {
1: -			pr_debug("sec '%s': relo #%d: couldn't find program in section '%s' for insn #%u, probably overridden weak function, skipping...\n",
1: -				relo_sec_name, i, sec_name, insn_idx);
1: -			continue;
1: -		}
1: -
1: -		relos = libbpf_reallocarray(prog->reloc_desc,
1: -					    prog->nr_reloc + 1, sizeof(*relos));
1: -		if (!relos)
1: -			return -ENOMEM;
1: -		prog->reloc_desc = relos;
1: -
1: -		/* adjust insn_idx to local BPF program frame of reference */
1: -		insn_idx -= prog->sec_insn_off;
1: -		err = bpf_program__record_reloc(prog, &relos[prog->nr_reloc],
1: -						insn_idx, sym_name, &sym, &rel);
1: -		if (err)
1: -			return err;
1: -
1: -		prog->nr_reloc++;
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int bpf_map_find_btf_info(struct bpf_object *obj, struct bpf_map *map)
1: -{
1: -	struct bpf_map_def *def = &map->def;
1: -	__u32 key_type_id = 0, value_type_id = 0;
1: -	int ret;
1: -
1: -	/* if it's BTF-defined map, we don't need to search for type IDs.
1: -	 * For struct_ops map, it does not need btf_key_type_id and
1: -	 * btf_value_type_id.
1: -	 */
1: -	if (map->sec_idx == obj->efile.btf_maps_shndx ||
1: -	    bpf_map__is_struct_ops(map))
1: -		return 0;
1: -
1: -	if (!bpf_map__is_internal(map)) {
1: -		ret = btf__get_map_kv_tids(obj->btf, map->name, def->key_size,
1: -					   def->value_size, &key_type_id,
1: -					   &value_type_id);
1: -	} else {
1: -		/*
1: -		 * LLVM annotates global data differently in BTF, that is,
1: -		 * only as '.data', '.bss' or '.rodata'.
1: -		 */
1: -		ret = btf__find_by_name(obj->btf,
1: -				libbpf_type_to_btf_name[map->libbpf_type]);
1: -	}
1: -	if (ret < 0)
1: -		return ret;
1: -
1: -	map->btf_key_type_id = key_type_id;
1: -	map->btf_value_type_id = bpf_map__is_internal(map) ?
1: -				 ret : value_type_id;
1: -	return 0;
1: -}
1: -
1: -int bpf_map__reuse_fd(struct bpf_map *map, int fd)
1: -{
1: -	struct bpf_map_info info = {};
1: -	__u32 len = sizeof(info);
1: -	int new_fd, err;
1: -	char *new_name;
1: -
1: -	err = bpf_obj_get_info_by_fd(fd, &info, &len);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	new_name = strdup(info.name);
1: -	if (!new_name)
1: -		return libbpf_err(-errno);
1: -
1: -	new_fd = open("/", O_RDONLY | O_CLOEXEC);
1: -	if (new_fd < 0) {
1: -		err = -errno;
1: -		goto err_free_new_name;
1: -	}
1: -
1: -	new_fd = dup3(fd, new_fd, O_CLOEXEC);
1: -	if (new_fd < 0) {
1: -		err = -errno;
1: -		goto err_close_new_fd;
1: -	}
1: -
1: -	err = zclose(map->fd);
1: -	if (err) {
1: -		err = -errno;
1: -		goto err_close_new_fd;
1: -	}
1: -	free(map->name);
1: -
1: -	map->fd = new_fd;
1: -	map->name = new_name;
1: -	map->def.type = info.type;
1: -	map->def.key_size = info.key_size;
1: -	map->def.value_size = info.value_size;
1: -	map->def.max_entries = info.max_entries;
1: -	map->def.map_flags = info.map_flags;
1: -	map->btf_key_type_id = info.btf_key_type_id;
1: -	map->btf_value_type_id = info.btf_value_type_id;
1: -	map->reused = true;
1: -
1: -	return 0;
1: +                                                 size_t sec_idx,
1: +                                                 size_t insn_idx) {
1: +  int l = 0, r = obj->nr_programs - 1, m;
1: +  struct bpf_program *prog;
1: +
1: +  while (l < r) {
1: +    m = l + (r - l + 1) / 2;
1: +    prog = &obj->programs[m];
1: +
1: +    if (prog->sec_idx < sec_idx ||
1: +        (prog->sec_idx == sec_idx && prog->sec_insn_off <= insn_idx))
1: +      l = m;
1: +    else
1: +      r = m - 1;
1: +  }
1: +  /* matching program could be at index l, but it still might be the
1: +   * wrong one, so we need to double check conditions for the last time
1: +   */
1: +  prog = &obj->programs[l];
1: +  if (prog->sec_idx == sec_idx && prog_contains_insn(prog, insn_idx))
1: +    return prog;
1: +  return NULL;
1: +}
1: +
1: +static int bpf_object__collect_prog_relos(struct bpf_object *obj,
1: +                                          GElf_Shdr *shdr, Elf_Data *data) {
1: +  Elf_Data *symbols = obj->efile.symbols;
1: +  const char *relo_sec_name, *sec_name;
1: +  size_t sec_idx = shdr->sh_info;
1: +  struct bpf_program *prog;
1: +  struct reloc_desc *relos;
1: +  int err, i, nrels;
1: +  const char *sym_name;
1: +  __u32 insn_idx;
1: +  Elf_Scn *scn;
1: +  Elf_Data *scn_data;
1: +  GElf_Sym sym;
1: +  GElf_Rel rel;
1: +
1: +  scn = elf_sec_by_idx(obj, sec_idx);
1: +  scn_data = elf_sec_data(obj, scn);
1: +
1: +  relo_sec_name = elf_sec_str(obj, shdr->sh_name);
1: +  sec_name = elf_sec_name(obj, scn);
1: +  if (!relo_sec_name || !sec_name)
1: +    return -EINVAL;
1: +
1: +  pr_debug("sec '%s': collecting relocation for section(%zu) '%s'\n",
1: +           relo_sec_name, sec_idx, sec_name);
1: +  nrels = shdr->sh_size / shdr->sh_entsize;
1: +
1: +  for (i = 0; i < nrels; i++) {
1: +    if (!gelf_getrel(data, i, &rel)) {
1: +      pr_warn("sec '%s': failed to get relo #%d\n", relo_sec_name, i);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +    if (!gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &sym)) {
1: +      pr_warn("sec '%s': symbol 0x%zx not found for relo #%d\n", relo_sec_name,
1: +              (size_t)GELF_R_SYM(rel.r_info), i);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    if (rel.r_offset % BPF_INSN_SZ || rel.r_offset >= scn_data->d_size) {
1: +      pr_warn("sec '%s': invalid offset 0x%zx for relo #%d\n", relo_sec_name,
1: +              (size_t)GELF_R_SYM(rel.r_info), i);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    insn_idx = rel.r_offset / BPF_INSN_SZ;
1: +    /* relocations against static functions are recorded as
1: +     * relocations against the section that contains a function;
1: +     * in such case, symbol will be STT_SECTION and sym.st_name
1: +     * will point to empty string (0), so fetch section name
1: +     * instead
1: +     */
1: +    if (GELF_ST_TYPE(sym.st_info) == STT_SECTION && sym.st_name == 0)
1: +      sym_name = elf_sec_name(obj, elf_sec_by_idx(obj, sym.st_shndx));
1: +    else
1: +      sym_name = elf_sym_str(obj, sym.st_name);
1: +    sym_name = sym_name ?: "<?";
1: +
1: +    pr_debug("sec '%s': relo #%d: insn #%u against '%s'\n", relo_sec_name, i,
1: +             insn_idx, sym_name);
1: +
1: +    prog = find_prog_by_sec_insn(obj, sec_idx, insn_idx);
1: +    if (!prog) {
1: +      pr_debug(
1: +          "sec '%s': relo #%d: couldn't find program in section '%s' for insn "
1: +          "#%u, probably overridden weak function, skipping...\n",
1: +          relo_sec_name, i, sec_name, insn_idx);
1: +      continue;
1: +    }
1: +
1: +    relos = libbpf_reallocarray(prog->reloc_desc, prog->nr_reloc + 1,
1: +                                sizeof(*relos));
1: +    if (!relos)
1: +      return -ENOMEM;
1: +    prog->reloc_desc = relos;
1: +
1: +    /* adjust insn_idx to local BPF program frame of reference */
1: +    insn_idx -= prog->sec_insn_off;
1: +    err = bpf_program__record_reloc(prog, &relos[prog->nr_reloc], insn_idx,
1: +                                    sym_name, &sym, &rel);
1: +    if (err)
1: +      return err;
1: +
1: +    prog->nr_reloc++;
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int bpf_map_find_btf_info(struct bpf_object *obj, struct bpf_map *map) {
1: +  struct bpf_map_def *def = &map->def;
1: +  __u32 key_type_id = 0, value_type_id = 0;
1: +  int ret;
1: +
1: +  /* if it's BTF-defined map, we don't need to search for type IDs.
1: +   * For struct_ops map, it does not need btf_key_type_id and
1: +   * btf_value_type_id.
1: +   */
1: +  if (map->sec_idx == obj->efile.btf_maps_shndx || bpf_map__is_struct_ops(map))
1: +    return 0;
1: +
1: +  if (!bpf_map__is_internal(map)) {
1: +    ret = btf__get_map_kv_tids(obj->btf, map->name, def->key_size,
1: +                               def->value_size, &key_type_id, &value_type_id);
1: +  } else {
1: +    /*
1: +     * LLVM annotates global data differently in BTF, that is,
1: +     * only as '.data', '.bss' or '.rodata'.
1: +     */
1: +    ret =
1: +        btf__find_by_name(obj->btf, libbpf_type_to_btf_name[map->libbpf_type]);
1: +  }
1: +  if (ret < 0)
1: +    return ret;
1: +
1: +  map->btf_key_type_id = key_type_id;
1: +  map->btf_value_type_id = bpf_map__is_internal(map) ? ret : value_type_id;
1: +  return 0;
1: +}
1: +
1: +int bpf_map__reuse_fd(struct bpf_map *map, int fd) {
1: +  struct bpf_map_info info = {};
1: +  __u32 len = sizeof(info);
1: +  int new_fd, err;
1: +  char *new_name;
1: +
1: +  err = bpf_obj_get_info_by_fd(fd, &info, &len);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  new_name = strdup(info.name);
1: +  if (!new_name)
1: +    return libbpf_err(-errno);
1: +
1: +  new_fd = open("/", O_RDONLY | O_CLOEXEC);
1: +  if (new_fd < 0) {
1: +    err = -errno;
1: +    goto err_free_new_name;
1: +  }
1: +
1: +  new_fd = dup3(fd, new_fd, O_CLOEXEC);
1: +  if (new_fd < 0) {
1: +    err = -errno;
1: +    goto err_close_new_fd;
1: +  }
1: +
1: +  err = zclose(map->fd);
1: +  if (err) {
1: +    err = -errno;
1: +    goto err_close_new_fd;
1: +  }
1: +  free(map->name);
1: +
1: +  map->fd = new_fd;
1: +  map->name = new_name;
1: +  map->def.type = info.type;
1: +  map->def.key_size = info.key_size;
1: +  map->def.value_size = info.value_size;
1: +  map->def.max_entries = info.max_entries;
1: +  map->def.map_flags = info.map_flags;
1: +  map->btf_key_type_id = info.btf_key_type_id;
1: +  map->btf_value_type_id = info.btf_value_type_id;
1: +  map->reused = true;
1: +
1: +  return 0;
1:  
1:  err_close_new_fd:
1: -	close(new_fd);
1: +  close(new_fd);
1:  err_free_new_name:
1: -	free(new_name);
1: -	return libbpf_err(err);
1: +  free(new_name);
1: +  return libbpf_err(err);
1:  }
1: -
1: -__u32 bpf_map__max_entries(const struct bpf_map *map)
1: -{
1: -	return map->def.max_entries;
1: -}
1: -
1: -struct bpf_map *bpf_map__inner_map(struct bpf_map *map)
1: -{
1: -	if (!bpf_map_type__is_map_in_map(map->def.type))
1: -		return errno = EINVAL, NULL;
1: -
1: -	return map->inner_map;
1: -}
1: -
1: -int bpf_map__set_max_entries(struct bpf_map *map, __u32 max_entries)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->def.max_entries = max_entries;
1: -	return 0;
1: -}
1: -
1: -int bpf_map__resize(struct bpf_map *map, __u32 max_entries)
1: -{
1: -	if (!map || !max_entries)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	return bpf_map__set_max_entries(map, max_entries);
1: -}
1: -
1: -static int
1: -bpf_object__probe_loading(struct bpf_object *obj)
1: -{
1: -	struct bpf_load_program_attr attr;
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	struct bpf_insn insns[] = {
1: -		BPF_MOV64_IMM(BPF_REG_0, 0),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -	int ret;
1: -
1: -	if (obj->gen_loader)
1: -		return 0;
1: -
1: -	/* make sure basic loading works */
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: -	attr.insns = insns;
1: -	attr.insns_cnt = ARRAY_SIZE(insns);
1: -	attr.license = "GPL";
1: -
1: -	ret = bpf_load_program_xattr(&attr, NULL, 0);
1: -	if (ret < 0) {
1: -		ret = errno;
1: -		cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
1: -		pr_warn("Error in %s():%s(%d). Couldn't load trivial BPF "
1: -			"program. Make sure your kernel supports BPF "
1: -			"(CONFIG_BPF_SYSCALL=y) and/or that RLIMIT_MEMLOCK is "
1: -			"set to big enough value.\n", __func__, cp, ret);
1: -		return -ret;
1: -	}
1: -	close(ret);
1: -
1: -	return 0;
1: -}
1: -
1: -static int probe_fd(int fd)
1: -{
1: -	if (fd >= 0)
1: -		close(fd);
1: -	return fd >= 0;
1: -}
1: -
1: -static int probe_kern_prog_name(void)
1: -{
1: -	struct bpf_load_program_attr attr;
1: -	struct bpf_insn insns[] = {
1: -		BPF_MOV64_IMM(BPF_REG_0, 0),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -	int ret;
1: -
1: -	/* make sure loading with name works */
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: -	attr.insns = insns;
1: -	attr.insns_cnt = ARRAY_SIZE(insns);
1: -	attr.license = "GPL";
1: -	attr.name = "test";
1: -	ret = bpf_load_program_xattr(&attr, NULL, 0);
1: -	return probe_fd(ret);
1: -}
1: -
1: -static int probe_kern_global_data(void)
1: -{
1: -	struct bpf_load_program_attr prg_attr;
1: -	struct bpf_create_map_attr map_attr;
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	struct bpf_insn insns[] = {
1: -		BPF_LD_MAP_VALUE(BPF_REG_1, 0, 16),
1: -		BPF_ST_MEM(BPF_DW, BPF_REG_1, 0, 42),
1: -		BPF_MOV64_IMM(BPF_REG_0, 0),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -	int ret, map;
1: -
1: -	memset(&map_attr, 0, sizeof(map_attr));
1: -	map_attr.map_type = BPF_MAP_TYPE_ARRAY;
1: -	map_attr.key_size = sizeof(int);
1: -	map_attr.value_size = 32;
1: -	map_attr.max_entries = 1;
1: -
1: -	map = bpf_create_map_xattr(&map_attr);
1: -	if (map < 0) {
1: -		ret = -errno;
1: -		cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
1: -		pr_warn("Error in %s():%s(%d). Couldn't create simple array map.\n",
1: -			__func__, cp, -ret);
1: -		return ret;
1: -	}
1: -
1: -	insns[0].imm = map;
1: -
1: -	memset(&prg_attr, 0, sizeof(prg_attr));
1: -	prg_attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: -	prg_attr.insns = insns;
1: -	prg_attr.insns_cnt = ARRAY_SIZE(insns);
1: -	prg_attr.license = "GPL";
1: -
1: -	ret = bpf_load_program_xattr(&prg_attr, NULL, 0);
1: -	close(map);
1: -	return probe_fd(ret);
1: -}
1: -
1: -static int probe_kern_btf(void)
1: -{
1: -	static const char strs[] = "\0int";
1: -	__u32 types[] = {
1: -		/* int */
1: -		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),
1: -	};
1: -
1: -	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
1: -					     strs, sizeof(strs)));
1: -}
1: -
1: -static int probe_kern_btf_func(void)
1: -{
1: -	static const char strs[] = "\0int\0x\0a";
1: -	/* void x(int a) {} */
1: -	__u32 types[] = {
1: -		/* int */
1: -		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
1: -		/* FUNC_PROTO */                                /* [2] */
1: -		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 0),
1: -		BTF_PARAM_ENC(7, 1),
1: -		/* FUNC x */                                    /* [3] */
1: -		BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0), 2),
1: -	};
1: -
1: -	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
1: -					     strs, sizeof(strs)));
1: -}
1: -
1: -static int probe_kern_btf_func_global(void)
1: -{
1: -	static const char strs[] = "\0int\0x\0a";
1: -	/* static void x(int a) {} */
1: -	__u32 types[] = {
1: -		/* int */
1: -		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
1: -		/* FUNC_PROTO */                                /* [2] */
1: -		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 0),
1: -		BTF_PARAM_ENC(7, 1),
1: -		/* FUNC x BTF_FUNC_GLOBAL */                    /* [3] */
1: -		BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, BTF_FUNC_GLOBAL), 2),
1: -	};
1: -
1: -	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
1: -					     strs, sizeof(strs)));
1: -}
1: -
1: -static int probe_kern_btf_datasec(void)
1: -{
1: -	static const char strs[] = "\0x\0.data";
1: -	/* static int a; */
1: -	__u32 types[] = {
1: -		/* int */
1: -		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
1: -		/* VAR x */                                     /* [2] */
1: -		BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_VAR, 0, 0), 1),
1: -		BTF_VAR_STATIC,
1: -		/* DATASEC val */                               /* [3] */
1: -		BTF_TYPE_ENC(3, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 1), 4),
1: -		BTF_VAR_SECINFO_ENC(2, 0, 4),
1: -	};
1: -
1: -	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
1: -					     strs, sizeof(strs)));
1: -}
1: -
1: -static int probe_kern_btf_float(void)
1: -{
1: -	static const char strs[] = "\0float";
1: -	__u32 types[] = {
1: -		/* float */
1: -		BTF_TYPE_FLOAT_ENC(1, 4),
1: -	};
1: -
1: -	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
1: -					     strs, sizeof(strs)));
1: -}
1: -
1: -static int probe_kern_array_mmap(void)
1: -{
1: -	struct bpf_create_map_attr attr = {
1: -		.map_type = BPF_MAP_TYPE_ARRAY,
1: -		.map_flags = BPF_F_MMAPABLE,
1: -		.key_size = sizeof(int),
1: -		.value_size = sizeof(int),
1: -		.max_entries = 1,
1: -	};
1: -
1: -	return probe_fd(bpf_create_map_xattr(&attr));
1: -}
1: -
1: -static int probe_kern_exp_attach_type(void)
1: -{
1: -	struct bpf_load_program_attr attr;
1: -	struct bpf_insn insns[] = {
1: -		BPF_MOV64_IMM(BPF_REG_0, 0),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	/* use any valid combination of program type and (optional)
1: -	 * non-zero expected attach type (i.e., not a BPF_CGROUP_INET_INGRESS)
1: -	 * to see if kernel supports expected_attach_type field for
1: -	 * BPF_PROG_LOAD command
1: -	 */
1: -	attr.prog_type = BPF_PROG_TYPE_CGROUP_SOCK;
1: -	attr.expected_attach_type = BPF_CGROUP_INET_SOCK_CREATE;
1: -	attr.insns = insns;
1: -	attr.insns_cnt = ARRAY_SIZE(insns);
1: -	attr.license = "GPL";
1: -
1: -	return probe_fd(bpf_load_program_xattr(&attr, NULL, 0));
1: -}
1: -
1: -static int probe_kern_probe_read_kernel(void)
1: -{
1: -	struct bpf_load_program_attr attr;
1: -	struct bpf_insn insns[] = {
1: -		BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),	/* r1 = r10 (fp) */
1: -		BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -8),	/* r1 += -8 */
1: -		BPF_MOV64_IMM(BPF_REG_2, 8),		/* r2 = 8 */
1: -		BPF_MOV64_IMM(BPF_REG_3, 0),		/* r3 = 0 */
1: -		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_probe_read_kernel),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_type = BPF_PROG_TYPE_KPROBE;
1: -	attr.insns = insns;
1: -	attr.insns_cnt = ARRAY_SIZE(insns);
1: -	attr.license = "GPL";
1: -
1: -	return probe_fd(bpf_load_program_xattr(&attr, NULL, 0));
1: -}
1: -
1: -static int probe_prog_bind_map(void)
1: -{
1: -	struct bpf_load_program_attr prg_attr;
1: -	struct bpf_create_map_attr map_attr;
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	struct bpf_insn insns[] = {
1: -		BPF_MOV64_IMM(BPF_REG_0, 0),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -	int ret, map, prog;
1: -
1: -	memset(&map_attr, 0, sizeof(map_attr));
1: -	map_attr.map_type = BPF_MAP_TYPE_ARRAY;
1: -	map_attr.key_size = sizeof(int);
1: -	map_attr.value_size = 32;
1: -	map_attr.max_entries = 1;
1: -
1: -	map = bpf_create_map_xattr(&map_attr);
1: -	if (map < 0) {
1: -		ret = -errno;
1: -		cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
1: -		pr_warn("Error in %s():%s(%d). Couldn't create simple array map.\n",
1: -			__func__, cp, -ret);
1: -		return ret;
1: -	}
1: -
1: -	memset(&prg_attr, 0, sizeof(prg_attr));
1: -	prg_attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: -	prg_attr.insns = insns;
1: -	prg_attr.insns_cnt = ARRAY_SIZE(insns);
1: -	prg_attr.license = "GPL";
1: -
1: -	prog = bpf_load_program_xattr(&prg_attr, NULL, 0);
1: -	if (prog < 0) {
1: -		close(map);
1: -		return 0;
1: -	}
1: -
1: -	ret = bpf_prog_bind_map(prog, map, NULL);
1: -
1: -	close(map);
1: -	close(prog);
1: -
1: -	return ret >= 0;
1: -}
1: -
1: -static int probe_module_btf(void)
1: -{
1: -	static const char strs[] = "\0int";
1: -	__u32 types[] = {
1: -		/* int */
1: -		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),
1: -	};
1: -	struct bpf_btf_info info;
1: -	__u32 len = sizeof(info);
1: -	char name[16];
1: -	int fd, err;
1: -
1: -	fd = libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs));
1: -	if (fd < 0)
1: -		return 0; /* BTF not supported at all */
1: -
1: -	memset(&info, 0, sizeof(info));
1: -	info.name = ptr_to_u64(name);
1: -	info.name_len = sizeof(name);
1: -
1: -	/* check that BPF_OBJ_GET_INFO_BY_FD supports specifying name pointer;
1: -	 * kernel's module BTF support coincides with support for
1: -	 * name/name_len fields in struct bpf_btf_info.
1: -	 */
1: -	err = bpf_obj_get_info_by_fd(fd, &info, &len);
1: -	close(fd);
1: -	return !err;
1: +
1: +__u32 bpf_map__max_entries(const struct bpf_map *map) {
1: +  return map->def.max_entries;
1: +}
1: +
1: +struct bpf_map *bpf_map__inner_map(struct bpf_map *map) {
1: +  if (!bpf_map_type__is_map_in_map(map->def.type))
1: +    return errno = EINVAL, NULL;
1: +
1: +  return map->inner_map;
1: +}
1: +
1: +int bpf_map__set_max_entries(struct bpf_map *map, __u32 max_entries) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->def.max_entries = max_entries;
1: +  return 0;
1: +}
1: +
1: +int bpf_map__resize(struct bpf_map *map, __u32 max_entries) {
1: +  if (!map || !max_entries)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  return bpf_map__set_max_entries(map, max_entries);
1: +}
1: +
1: +static int bpf_object__probe_loading(struct bpf_object *obj) {
1: +  struct bpf_load_program_attr attr;
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  struct bpf_insn insns[] = {
1: +      BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(),
1: +  };
1: +  int ret;
1: +
1: +  if (obj->gen_loader)
1: +    return 0;
1: +
1: +  /* make sure basic loading works */
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: +  attr.insns = insns;
1: +  attr.insns_cnt = ARRAY_SIZE(insns);
1: +  attr.license = "GPL";
1: +
1: +  ret = bpf_load_program_xattr(&attr, NULL, 0);
1: +  if (ret < 0) {
1: +    ret = errno;
1: +    cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
1: +    pr_warn(
1: +        "Error in %s():%s(%d). Couldn't load trivial BPF "
1: +        "program. Make sure your kernel supports BPF "
1: +        "(CONFIG_BPF_SYSCALL=y) and/or that RLIMIT_MEMLOCK is "
1: +        "set to big enough value.\n",
1: +        __func__, cp, ret);
1: +    return -ret;
1: +  }
1: +  close(ret);
1: +
1: +  return 0;
1: +}
1: +
1: +static int probe_fd(int fd) {
1: +  if (fd >= 0)
1: +    close(fd);
1: +  return fd >= 0;
1: +}
1: +
1: +static int probe_kern_prog_name(void) {
1: +  struct bpf_load_program_attr attr;
1: +  struct bpf_insn insns[] = {
1: +      BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(),
1: +  };
1: +  int ret;
1: +
1: +  /* make sure loading with name works */
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: +  attr.insns = insns;
1: +  attr.insns_cnt = ARRAY_SIZE(insns);
1: +  attr.license = "GPL";
1: +  attr.name = "test";
1: +  ret = bpf_load_program_xattr(&attr, NULL, 0);
1: +  return probe_fd(ret);
1: +}
1: +
1: +static int probe_kern_global_data(void) {
1: +  struct bpf_load_program_attr prg_attr;
1: +  struct bpf_create_map_attr map_attr;
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  struct bpf_insn insns[] = {
1: +      BPF_LD_MAP_VALUE(BPF_REG_1, 0, 16), BPF_ST_MEM(BPF_DW, BPF_REG_1, 0, 42),
1: +      BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(),
1: +  };
1: +  int ret, map;
1: +
1: +  memset(&map_attr, 0, sizeof(map_attr));
1: +  map_attr.map_type = BPF_MAP_TYPE_ARRAY;
1: +  map_attr.key_size = sizeof(int);
1: +  map_attr.value_size = 32;
1: +  map_attr.max_entries = 1;
1: +
1: +  map = bpf_create_map_xattr(&map_attr);
1: +  if (map < 0) {
1: +    ret = -errno;
1: +    cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
1: +    pr_warn("Error in %s():%s(%d). Couldn't create simple array map.\n",
1: +            __func__, cp, -ret);
1: +    return ret;
1: +  }
1: +
1: +  insns[0].imm = map;
1: +
1: +  memset(&prg_attr, 0, sizeof(prg_attr));
1: +  prg_attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: +  prg_attr.insns = insns;
1: +  prg_attr.insns_cnt = ARRAY_SIZE(insns);
1: +  prg_attr.license = "GPL";
1: +
1: +  ret = bpf_load_program_xattr(&prg_attr, NULL, 0);
1: +  close(map);
1: +  return probe_fd(ret);
1: +}
1: +
1: +static int probe_kern_btf(void) {
1: +  static const char strs[] = "\0int";
1: +  __u32 types[] = {
1: +      /* int */
1: +      BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),
1: +  };
1: +
1: +  return probe_fd(
1: +      libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs)));
1: +}
1: +
1: +static int probe_kern_btf_func(void) {
1: +  static const char strs[] = "\0int\0x\0a";
1: +  /* void x(int a) {} */
1: +  __u32 types[] = {
1: +      /* int */
1: +      BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
1: +      /* FUNC_PROTO */                               /* [2] */
1: +      BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 0),
1: +      BTF_PARAM_ENC(7, 1),
1: +      /* FUNC x */ /* [3] */
1: +      BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0), 2),
1: +  };
1: +
1: +  return probe_fd(
1: +      libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs)));
1: +}
1: +
1: +static int probe_kern_btf_func_global(void) {
1: +  static const char strs[] = "\0int\0x\0a";
1: +  /* static void x(int a) {} */
1: +  __u32 types[] = {
1: +      /* int */
1: +      BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
1: +      /* FUNC_PROTO */                               /* [2] */
1: +      BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 0),
1: +      BTF_PARAM_ENC(7, 1),
1: +      /* FUNC x BTF_FUNC_GLOBAL */ /* [3] */
1: +      BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, BTF_FUNC_GLOBAL), 2),
1: +  };
1: +
1: +  return probe_fd(
1: +      libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs)));
1: +}
1: +
1: +static int probe_kern_btf_datasec(void) {
1: +  static const char strs[] = "\0x\0.data";
1: +  /* static int a; */
1: +  __u32 types[] = {
1: +      /* int */
1: +      BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
1: +      /* VAR x */                                    /* [2] */
1: +      BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_VAR, 0, 0), 1),
1: +      BTF_VAR_STATIC,
1: +      /* DATASEC val */ /* [3] */
1: +      BTF_TYPE_ENC(3, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 1), 4),
1: +      BTF_VAR_SECINFO_ENC(2, 0, 4),
1: +  };
1: +
1: +  return probe_fd(
1: +      libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs)));
1: +}
1: +
1: +static int probe_kern_btf_float(void) {
1: +  static const char strs[] = "\0float";
1: +  __u32 types[] = {
1: +      /* float */
1: +      BTF_TYPE_FLOAT_ENC(1, 4),
1: +  };
1: +
1: +  return probe_fd(
1: +      libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs)));
1: +}
1: +
1: +static int probe_kern_array_mmap(void) {
1: +  struct bpf_create_map_attr attr = {
1: +      .map_type = BPF_MAP_TYPE_ARRAY,
1: +      .map_flags = BPF_F_MMAPABLE,
1: +      .key_size = sizeof(int),
1: +      .value_size = sizeof(int),
1: +      .max_entries = 1,
1: +  };
1: +
1: +  return probe_fd(bpf_create_map_xattr(&attr));
1: +}
1: +
1: +static int probe_kern_exp_attach_type(void) {
1: +  struct bpf_load_program_attr attr;
1: +  struct bpf_insn insns[] = {
1: +      BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(),
1: +  };
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  /* use any valid combination of program type and (optional)
1: +   * non-zero expected attach type (i.e., not a BPF_CGROUP_INET_INGRESS)
1: +   * to see if kernel supports expected_attach_type field for
1: +   * BPF_PROG_LOAD command
1: +   */
1: +  attr.prog_type = BPF_PROG_TYPE_CGROUP_SOCK;
1: +  attr.expected_attach_type = BPF_CGROUP_INET_SOCK_CREATE;
1: +  attr.insns = insns;
1: +  attr.insns_cnt = ARRAY_SIZE(insns);
1: +  attr.license = "GPL";
1: +
1: +  return probe_fd(bpf_load_program_xattr(&attr, NULL, 0));
1: +}
1: +
1: +static int probe_kern_probe_read_kernel(void) {
1: +  struct bpf_load_program_attr attr;
1: +  struct bpf_insn insns[] = {
1: +      BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),  /* r1 = r10 (fp) */
1: +      BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -8), /* r1 += -8 */
1: +      BPF_MOV64_IMM(BPF_REG_2, 8),           /* r2 = 8 */
1: +      BPF_MOV64_IMM(BPF_REG_3, 0),           /* r3 = 0 */
1: +      BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_probe_read_kernel),
1: +      BPF_EXIT_INSN(),
1: +  };
1: +
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_type = BPF_PROG_TYPE_KPROBE;
1: +  attr.insns = insns;
1: +  attr.insns_cnt = ARRAY_SIZE(insns);
1: +  attr.license = "GPL";
1: +
1: +  return probe_fd(bpf_load_program_xattr(&attr, NULL, 0));
1: +}
1: +
1: +static int probe_prog_bind_map(void) {
1: +  struct bpf_load_program_attr prg_attr;
1: +  struct bpf_create_map_attr map_attr;
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  struct bpf_insn insns[] = {
1: +      BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(),
1: +  };
1: +  int ret, map, prog;
1: +
1: +  memset(&map_attr, 0, sizeof(map_attr));
1: +  map_attr.map_type = BPF_MAP_TYPE_ARRAY;
1: +  map_attr.key_size = sizeof(int);
1: +  map_attr.value_size = 32;
1: +  map_attr.max_entries = 1;
1: +
1: +  map = bpf_create_map_xattr(&map_attr);
1: +  if (map < 0) {
1: +    ret = -errno;
1: +    cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
1: +    pr_warn("Error in %s():%s(%d). Couldn't create simple array map.\n",
1: +            __func__, cp, -ret);
1: +    return ret;
1: +  }
1: +
1: +  memset(&prg_attr, 0, sizeof(prg_attr));
1: +  prg_attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
1: +  prg_attr.insns = insns;
1: +  prg_attr.insns_cnt = ARRAY_SIZE(insns);
1: +  prg_attr.license = "GPL";
1: +
1: +  prog = bpf_load_program_xattr(&prg_attr, NULL, 0);
1: +  if (prog < 0) {
1: +    close(map);
1: +    return 0;
1: +  }
1: +
1: +  ret = bpf_prog_bind_map(prog, map, NULL);
1: +
1: +  close(map);
1: +  close(prog);
1: +
1: +  return ret >= 0;
1: +}
1: +
1: +static int probe_module_btf(void) {
1: +  static const char strs[] = "\0int";
1: +  __u32 types[] = {
1: +      /* int */
1: +      BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),
1: +  };
1: +  struct bpf_btf_info info;
1: +  __u32 len = sizeof(info);
1: +  char name[16];
1: +  int fd, err;
1: +
1: +  fd = libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs));
1: +  if (fd < 0)
1: +    return 0; /* BTF not supported at all */
1: +
1: +  memset(&info, 0, sizeof(info));
1: +  info.name = ptr_to_u64(name);
1: +  info.name_len = sizeof(name);
1: +
1: +  /* check that BPF_OBJ_GET_INFO_BY_FD supports specifying name pointer;
1: +   * kernel's module BTF support coincides with support for
1: +   * name/name_len fields in struct bpf_btf_info.
1: +   */
1: +  err = bpf_obj_get_info_by_fd(fd, &info, &len);
1: +  close(fd);
1: +  return !err;
1:  }
1:  
1:  enum kern_feature_result {
1: -	FEAT_UNKNOWN = 0,
1: -	FEAT_SUPPORTED = 1,
1: -	FEAT_MISSING = 2,
1: +  FEAT_UNKNOWN = 0,
1: +  FEAT_SUPPORTED = 1,
1: +  FEAT_MISSING = 2,
1:  };
1:  
1:  typedef int (*feature_probe_fn)(void);
1:  
1:  static struct kern_feature_desc {
1: -	const char *desc;
1: -	feature_probe_fn probe;
1: -	enum kern_feature_result res;
1: +  const char *desc;
1: +  feature_probe_fn probe;
1: +  enum kern_feature_result res;
1:  } feature_probes[__FEAT_CNT] = {
1: -	[FEAT_PROG_NAME] = {
1: -		"BPF program name", probe_kern_prog_name,
1: -	},
1: -	[FEAT_GLOBAL_DATA] = {
1: -		"global variables", probe_kern_global_data,
1: -	},
1: -	[FEAT_BTF] = {
1: -		"minimal BTF", probe_kern_btf,
1: -	},
1: -	[FEAT_BTF_FUNC] = {
1: -		"BTF functions", probe_kern_btf_func,
1: -	},
1: -	[FEAT_BTF_GLOBAL_FUNC] = {
1: -		"BTF global function", probe_kern_btf_func_global,
1: -	},
1: -	[FEAT_BTF_DATASEC] = {
1: -		"BTF data section and variable", probe_kern_btf_datasec,
1: -	},
1: -	[FEAT_ARRAY_MMAP] = {
1: -		"ARRAY map mmap()", probe_kern_array_mmap,
1: -	},
1: -	[FEAT_EXP_ATTACH_TYPE] = {
1: -		"BPF_PROG_LOAD expected_attach_type attribute",
1: -		probe_kern_exp_attach_type,
1: -	},
1: -	[FEAT_PROBE_READ_KERN] = {
1: -		"bpf_probe_read_kernel() helper", probe_kern_probe_read_kernel,
1: -	},
1: -	[FEAT_PROG_BIND_MAP] = {
1: -		"BPF_PROG_BIND_MAP support", probe_prog_bind_map,
1: -	},
1: -	[FEAT_MODULE_BTF] = {
1: -		"module BTF support", probe_module_btf,
1: -	},
1: -	[FEAT_BTF_FLOAT] = {
1: -		"BTF_KIND_FLOAT support", probe_kern_btf_float,
1: -	},
1: +        [FEAT_PROG_NAME] =
1: +            {
1: +                "BPF program name", probe_kern_prog_name,
1: +            },
1: +        [FEAT_GLOBAL_DATA] =
1: +            {
1: +                "global variables", probe_kern_global_data,
1: +            },
1: +        [FEAT_BTF] =
1: +            {
1: +                "minimal BTF", probe_kern_btf,
1: +            },
1: +        [FEAT_BTF_FUNC] =
1: +            {
1: +                "BTF functions", probe_kern_btf_func,
1: +            },
1: +        [FEAT_BTF_GLOBAL_FUNC] =
1: +            {
1: +                "BTF global function", probe_kern_btf_func_global,
1: +            },
1: +        [FEAT_BTF_DATASEC] =
1: +            {
1: +                "BTF data section and variable", probe_kern_btf_datasec,
1: +            },
1: +        [FEAT_ARRAY_MMAP] =
1: +            {
1: +                "ARRAY map mmap()", probe_kern_array_mmap,
1: +            },
1: +        [FEAT_EXP_ATTACH_TYPE] =
1: +            {
1: +                "BPF_PROG_LOAD expected_attach_type attribute",
1: +                probe_kern_exp_attach_type,
1: +            },
1: +        [FEAT_PROBE_READ_KERN] =
1: +            {
1: +                "bpf_probe_read_kernel() helper", probe_kern_probe_read_kernel,
1: +            },
1: +        [FEAT_PROG_BIND_MAP] =
1: +            {
1: +                "BPF_PROG_BIND_MAP support", probe_prog_bind_map,
1: +            },
1: +        [FEAT_MODULE_BTF] =
1: +            {
1: +                "module BTF support", probe_module_btf,
1: +            },
1: +        [FEAT_BTF_FLOAT] =
1: +            {
1: +                "BTF_KIND_FLOAT support", probe_kern_btf_float,
1: +            },
1:  };
1:  
1: -static bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id)
1: -{
1: -	struct kern_feature_desc *feat = &feature_probes[feat_id];
1: -	int ret;
1: -
1: -	if (obj->gen_loader)
1: -		/* To generate loader program assume the latest kernel
1: -		 * to avoid doing extra prog_load, map_create syscalls.
1: -		 */
1: -		return true;
1: -
1: -	if (READ_ONCE(feat->res) == FEAT_UNKNOWN) {
1: -		ret = feat->probe();
1: -		if (ret > 0) {
1: -			WRITE_ONCE(feat->res, FEAT_SUPPORTED);
1: -		} else if (ret == 0) {
1: -			WRITE_ONCE(feat->res, FEAT_MISSING);
1: -		} else {
1: -			pr_warn("Detection of kernel %s support failed: %d\n", feat->desc, ret);
1: -			WRITE_ONCE(feat->res, FEAT_MISSING);
1: -		}
1: -	}
1: -
1: -	return READ_ONCE(feat->res) == FEAT_SUPPORTED;
1: -}
1: -
1: -static bool map_is_reuse_compat(const struct bpf_map *map, int map_fd)
1: -{
1: -	struct bpf_map_info map_info = {};
1: -	char msg[STRERR_BUFSIZE];
1: -	__u32 map_info_len;
1: -
1: -	map_info_len = sizeof(map_info);
1: -
1: -	if (bpf_obj_get_info_by_fd(map_fd, &map_info, &map_info_len)) {
1: -		pr_warn("failed to get map info for map FD %d: %s\n",
1: -			map_fd, libbpf_strerror_r(errno, msg, sizeof(msg)));
1: -		return false;
1: -	}
1: -
1: -	return (map_info.type == map->def.type &&
1: -		map_info.key_size == map->def.key_size &&
1: -		map_info.value_size == map->def.value_size &&
1: -		map_info.max_entries == map->def.max_entries &&
1: -		map_info.map_flags == map->def.map_flags);
1: -}
1: -
1: -static int
1: -bpf_object__reuse_map(struct bpf_map *map)
1: -{
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	int err, pin_fd;
1: -
1: -	pin_fd = bpf_obj_get(map->pin_path);
1: -	if (pin_fd < 0) {
1: -		err = -errno;
1: -		if (err == -ENOENT) {
1: -			pr_debug("found no pinned map to reuse at '%s'\n",
1: -				 map->pin_path);
1: -			return 0;
1: -		}
1: -
1: -		cp = libbpf_strerror_r(-err, errmsg, sizeof(errmsg));
1: -		pr_warn("couldn't retrieve pinned map '%s': %s\n",
1: -			map->pin_path, cp);
1: -		return err;
1: -	}
1: -
1: -	if (!map_is_reuse_compat(map, pin_fd)) {
1: -		pr_warn("couldn't reuse pinned map at '%s': parameter mismatch\n",
1: -			map->pin_path);
1: -		close(pin_fd);
1: -		return -EINVAL;
1: -	}
1: -
1: -	err = bpf_map__reuse_fd(map, pin_fd);
1: -	if (err) {
1: -		close(pin_fd);
1: -		return err;
1: -	}
1: -	map->pinned = true;
1: -	pr_debug("reused pinned map at '%s'\n", map->pin_path);
1: -
1: -	return 0;
1: -}
1: -
1: -static int
1: -bpf_object__populate_internal_map(struct bpf_object *obj, struct bpf_map *map)
1: -{
1: -	enum libbpf_map_type map_type = map->libbpf_type;
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	int err, zero = 0;
1: -
1: -	if (obj->gen_loader) {
1: -		bpf_gen__map_update_elem(obj->gen_loader, map - obj->maps,
1: -					 map->mmaped, map->def.value_size);
1: -		if (map_type == LIBBPF_MAP_RODATA || map_type == LIBBPF_MAP_KCONFIG)
1: -			bpf_gen__map_freeze(obj->gen_loader, map - obj->maps);
1: -		return 0;
1: -	}
1: -	err = bpf_map_update_elem(map->fd, &zero, map->mmaped, 0);
1: -	if (err) {
1: -		err = -errno;
1: -		cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: -		pr_warn("Error setting initial map(%s) contents: %s\n",
1: -			map->name, cp);
1: -		return err;
1: -	}
1: -
1: -	/* Freeze .rodata and .kconfig map as read-only from syscall side. */
1: -	if (map_type == LIBBPF_MAP_RODATA || map_type == LIBBPF_MAP_KCONFIG) {
1: -		err = bpf_map_freeze(map->fd);
1: -		if (err) {
1: -			err = -errno;
1: -			cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: -			pr_warn("Error freezing map(%s) as read-only: %s\n",
1: -				map->name, cp);
1: -			return err;
1: -		}
1: -	}
1: -	return 0;
1: +static bool kernel_supports(const struct bpf_object *obj,
1: +                            enum kern_feature_id feat_id) {
1: +  struct kern_feature_desc *feat = &feature_probes[feat_id];
1: +  int ret;
1: +
1: +  if (obj->gen_loader)
1: +    /* To generate loader program assume the latest kernel
1: +     * to avoid doing extra prog_load, map_create syscalls.
1: +     */
1: +    return true;
1: +
1: +  if (READ_ONCE(feat->res) == FEAT_UNKNOWN) {
1: +    ret = feat->probe();
1: +    if (ret > 0) {
1: +      WRITE_ONCE(feat->res, FEAT_SUPPORTED);
1: +    } else if (ret == 0) {
1: +      WRITE_ONCE(feat->res, FEAT_MISSING);
1: +    } else {
1: +      pr_warn("Detection of kernel %s support failed: %d\n", feat->desc, ret);
1: +      WRITE_ONCE(feat->res, FEAT_MISSING);
1: +    }
1: +  }
1: +
1: +  return READ_ONCE(feat->res) == FEAT_SUPPORTED;
1: +}
1: +
1: +static bool map_is_reuse_compat(const struct bpf_map *map, int map_fd) {
1: +  struct bpf_map_info map_info = {};
1: +  char msg[STRERR_BUFSIZE];
1: +  __u32 map_info_len;
1: +
1: +  map_info_len = sizeof(map_info);
1: +
1: +  if (bpf_obj_get_info_by_fd(map_fd, &map_info, &map_info_len)) {
1: +    pr_warn("failed to get map info for map FD %d: %s\n", map_fd,
1: +            libbpf_strerror_r(errno, msg, sizeof(msg)));
1: +    return false;
1: +  }
1: +
1: +  return (map_info.type == map->def.type &&
1: +          map_info.key_size == map->def.key_size &&
1: +          map_info.value_size == map->def.value_size &&
1: +          map_info.max_entries == map->def.max_entries &&
1: +          map_info.map_flags == map->def.map_flags);
1: +}
1: +
1: +static int bpf_object__reuse_map(struct bpf_map *map) {
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  int err, pin_fd;
1: +
1: +  pin_fd = bpf_obj_get(map->pin_path);
1: +  if (pin_fd < 0) {
1: +    err = -errno;
1: +    if (err == -ENOENT) {
1: +      pr_debug("found no pinned map to reuse at '%s'\n", map->pin_path);
1: +      return 0;
1: +    }
1: +
1: +    cp = libbpf_strerror_r(-err, errmsg, sizeof(errmsg));
1: +    pr_warn("couldn't retrieve pinned map '%s': %s\n", map->pin_path, cp);
1: +    return err;
1: +  }
1: +
1: +  if (!map_is_reuse_compat(map, pin_fd)) {
1: +    pr_warn("couldn't reuse pinned map at '%s': parameter mismatch\n",
1: +            map->pin_path);
1: +    close(pin_fd);
1: +    return -EINVAL;
1: +  }
1: +
1: +  err = bpf_map__reuse_fd(map, pin_fd);
1: +  if (err) {
1: +    close(pin_fd);
1: +    return err;
1: +  }
1: +  map->pinned = true;
1: +  pr_debug("reused pinned map at '%s'\n", map->pin_path);
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__populate_internal_map(struct bpf_object *obj,
1: +                                             struct bpf_map *map) {
1: +  enum libbpf_map_type map_type = map->libbpf_type;
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  int err, zero = 0;
1: +
1: +  if (obj->gen_loader) {
1: +    bpf_gen__map_update_elem(obj->gen_loader, map - obj->maps, map->mmaped,
1: +                             map->def.value_size);
1: +    if (map_type == LIBBPF_MAP_RODATA || map_type == LIBBPF_MAP_KCONFIG)
1: +      bpf_gen__map_freeze(obj->gen_loader, map - obj->maps);
1: +    return 0;
1: +  }
1: +  err = bpf_map_update_elem(map->fd, &zero, map->mmaped, 0);
1: +  if (err) {
1: +    err = -errno;
1: +    cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: +    pr_warn("Error setting initial map(%s) contents: %s\n", map->name, cp);
1: +    return err;
1: +  }
1: +
1: +  /* Freeze .rodata and .kconfig map as read-only from syscall side. */
1: +  if (map_type == LIBBPF_MAP_RODATA || map_type == LIBBPF_MAP_KCONFIG) {
1: +    err = bpf_map_freeze(map->fd);
1: +    if (err) {
1: +      err = -errno;
1: +      cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: +      pr_warn("Error freezing map(%s) as read-only: %s\n", map->name, cp);
1: +      return err;
1: +    }
1: +  }
1: +  return 0;
1:  }
1:  
1:  static void bpf_map__destroy(struct bpf_map *map);
1:  
1: -static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map, bool is_inner)
1: -{
1: -	struct bpf_create_map_attr create_attr;
1: -	struct bpf_map_def *def = &map->def;
1: -
1: -	memset(&create_attr, 0, sizeof(create_attr));
1: -
1: -	if (kernel_supports(obj, FEAT_PROG_NAME))
1: -		create_attr.name = map->name;
1: -	create_attr.map_ifindex = map->map_ifindex;
1: -	create_attr.map_type = def->type;
1: -	create_attr.map_flags = def->map_flags;
1: -	create_attr.key_size = def->key_size;
1: -	create_attr.value_size = def->value_size;
1: -	create_attr.numa_node = map->numa_node;
1: -
1: -	if (def->type == BPF_MAP_TYPE_PERF_EVENT_ARRAY && !def->max_entries) {
1: -		int nr_cpus;
1: -
1: -		nr_cpus = libbpf_num_possible_cpus();
1: -		if (nr_cpus < 0) {
1: -			pr_warn("map '%s': failed to determine number of system CPUs: %d\n",
1: -				map->name, nr_cpus);
1: -			return nr_cpus;
1: -		}
1: -		pr_debug("map '%s': setting size to %d\n", map->name, nr_cpus);
1: -		create_attr.max_entries = nr_cpus;
1: -	} else {
1: -		create_attr.max_entries = def->max_entries;
1: -	}
1: -
1: -	if (bpf_map__is_struct_ops(map))
1: -		create_attr.btf_vmlinux_value_type_id =
1: -			map->btf_vmlinux_value_type_id;
1: -
1: -	create_attr.btf_fd = 0;
1: -	create_attr.btf_key_type_id = 0;
1: -	create_attr.btf_value_type_id = 0;
1: -	if (obj->btf && btf__fd(obj->btf) >= 0 && !bpf_map_find_btf_info(obj, map)) {
1: -		create_attr.btf_fd = btf__fd(obj->btf);
1: -		create_attr.btf_key_type_id = map->btf_key_type_id;
1: -		create_attr.btf_value_type_id = map->btf_value_type_id;
1: -	}
1: -
1: -	if (bpf_map_type__is_map_in_map(def->type)) {
1: -		if (map->inner_map) {
1: -			int err;
1: -
1: -			err = bpf_object__create_map(obj, map->inner_map, true);
1: -			if (err) {
1: -				pr_warn("map '%s': failed to create inner map: %d\n",
1: -					map->name, err);
1: -				return err;
1: -			}
1: -			map->inner_map_fd = bpf_map__fd(map->inner_map);
1: -		}
1: -		if (map->inner_map_fd >= 0)
1: -			create_attr.inner_map_fd = map->inner_map_fd;
1: -	}
1: -
1: -	if (obj->gen_loader) {
1: -		bpf_gen__map_create(obj->gen_loader, &create_attr, is_inner ? -1 : map - obj->maps);
1: -		/* Pretend to have valid FD to pass various fd >= 0 checks.
1: -		 * This fd == 0 will not be used with any syscall and will be reset to -1 eventually.
1: -		 */
1: -		map->fd = 0;
1: -	} else {
1: -		map->fd = bpf_create_map_xattr(&create_attr);
1: -	}
1: -	if (map->fd < 0 && (create_attr.btf_key_type_id ||
1: -			    create_attr.btf_value_type_id)) {
1: -		char *cp, errmsg[STRERR_BUFSIZE];
1: -		int err = -errno;
1: -
1: -		cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: -		pr_warn("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n",
1: -			map->name, cp, err);
1: -		create_attr.btf_fd = 0;
1: -		create_attr.btf_key_type_id = 0;
1: -		create_attr.btf_value_type_id = 0;
1: -		map->btf_key_type_id = 0;
1: -		map->btf_value_type_id = 0;
1: -		map->fd = bpf_create_map_xattr(&create_attr);
1: -	}
1: -
1: -	if (map->fd < 0)
1: -		return -errno;
1: -
1: -	if (bpf_map_type__is_map_in_map(def->type) && map->inner_map) {
1: -		if (obj->gen_loader)
1: -			map->inner_map->fd = -1;
1: -		bpf_map__destroy(map->inner_map);
1: -		zfree(&map->inner_map);
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int init_map_slots(struct bpf_object *obj, struct bpf_map *map)
1: -{
1: -	const struct bpf_map *targ_map;
1: -	unsigned int i;
1: -	int fd, err = 0;
1: -
1: -	for (i = 0; i < map->init_slots_sz; i++) {
1: -		if (!map->init_slots[i])
1: -			continue;
1: -
1: -		targ_map = map->init_slots[i];
1: -		fd = bpf_map__fd(targ_map);
1: -		if (obj->gen_loader) {
1: -			pr_warn("// TODO map_update_elem: idx %td key %d value==map_idx %td\n",
1: -				map - obj->maps, i, targ_map - obj->maps);
1: -			return -ENOTSUP;
1: -		} else {
1: -			err = bpf_map_update_elem(map->fd, &i, &fd, 0);
1: -		}
1: -		if (err) {
1: -			err = -errno;
1: -			pr_warn("map '%s': failed to initialize slot [%d] to map '%s' fd=%d: %d\n",
1: -				map->name, i, targ_map->name,
1: -				fd, err);
1: -			return err;
1: -		}
1: -		pr_debug("map '%s': slot [%d] set to map '%s' fd=%d\n",
1: -			 map->name, i, targ_map->name, fd);
1: -	}
1: -
1: -	zfree(&map->init_slots);
1: -	map->init_slots_sz = 0;
1: -
1: -	return 0;
1: -}
1: -
1: -static int
1: -bpf_object__create_maps(struct bpf_object *obj)
1: -{
1: -	struct bpf_map *map;
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	unsigned int i, j;
1: -	int err;
1: -
1: -	for (i = 0; i < obj->nr_maps; i++) {
1: -		map = &obj->maps[i];
1: -
1: -		if (map->pin_path) {
1: -			err = bpf_object__reuse_map(map);
1: -			if (err) {
1: -				pr_warn("map '%s': error reusing pinned map\n",
1: -					map->name);
1: -				goto err_out;
1: -			}
1: -		}
1: -
1: -		if (map->fd >= 0) {
1: -			pr_debug("map '%s': skipping creation (preset fd=%d)\n",
1: -				 map->name, map->fd);
1: -		} else {
1: -			err = bpf_object__create_map(obj, map, false);
1: -			if (err)
1: -				goto err_out;
1: -
1: -			pr_debug("map '%s': created successfully, fd=%d\n",
1: -				 map->name, map->fd);
1: -
1: -			if (bpf_map__is_internal(map)) {
1: -				err = bpf_object__populate_internal_map(obj, map);
1: -				if (err < 0) {
1: -					zclose(map->fd);
1: -					goto err_out;
1: -				}
1: -			}
1: -
1: -			if (map->init_slots_sz) {
1: -				err = init_map_slots(obj, map);
1: -				if (err < 0) {
1: -					zclose(map->fd);
1: -					goto err_out;
1: -				}
1: -			}
1: -		}
1: -
1: -		if (map->pin_path && !map->pinned) {
1: -			err = bpf_map__pin(map, NULL);
1: -			if (err) {
1: -				pr_warn("map '%s': failed to auto-pin at '%s': %d\n",
1: -					map->name, map->pin_path, err);
1: -				zclose(map->fd);
1: -				goto err_out;
1: -			}
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map,
1: +                                  bool is_inner) {
1: +  struct bpf_create_map_attr create_attr;
1: +  struct bpf_map_def *def = &map->def;
1: +
1: +  memset(&create_attr, 0, sizeof(create_attr));
1: +
1: +  if (kernel_supports(obj, FEAT_PROG_NAME))
1: +    create_attr.name = map->name;
1: +  create_attr.map_ifindex = map->map_ifindex;
1: +  create_attr.map_type = def->type;
1: +  create_attr.map_flags = def->map_flags;
1: +  create_attr.key_size = def->key_size;
1: +  create_attr.value_size = def->value_size;
1: +  create_attr.numa_node = map->numa_node;
1: +
1: +  if (def->type == BPF_MAP_TYPE_PERF_EVENT_ARRAY && !def->max_entries) {
1: +    int nr_cpus;
1: +
1: +    nr_cpus = libbpf_num_possible_cpus();
1: +    if (nr_cpus < 0) {
1: +      pr_warn("map '%s': failed to determine number of system CPUs: %d\n",
1: +              map->name, nr_cpus);
1: +      return nr_cpus;
1: +    }
1: +    pr_debug("map '%s': setting size to %d\n", map->name, nr_cpus);
1: +    create_attr.max_entries = nr_cpus;
1: +  } else {
1: +    create_attr.max_entries = def->max_entries;
1: +  }
1: +
1: +  if (bpf_map__is_struct_ops(map))
1: +    create_attr.btf_vmlinux_value_type_id = map->btf_vmlinux_value_type_id;
1: +
1: +  create_attr.btf_fd = 0;
1: +  create_attr.btf_key_type_id = 0;
1: +  create_attr.btf_value_type_id = 0;
1: +  if (obj->btf && btf__fd(obj->btf) >= 0 && !bpf_map_find_btf_info(obj, map)) {
1: +    create_attr.btf_fd = btf__fd(obj->btf);
1: +    create_attr.btf_key_type_id = map->btf_key_type_id;
1: +    create_attr.btf_value_type_id = map->btf_value_type_id;
1: +  }
1: +
1: +  if (bpf_map_type__is_map_in_map(def->type)) {
1: +    if (map->inner_map) {
1: +      int err;
1: +
1: +      err = bpf_object__create_map(obj, map->inner_map, true);
1: +      if (err) {
1: +        pr_warn("map '%s': failed to create inner map: %d\n", map->name, err);
1: +        return err;
1: +      }
1: +      map->inner_map_fd = bpf_map__fd(map->inner_map);
1: +    }
1: +    if (map->inner_map_fd >= 0)
1: +      create_attr.inner_map_fd = map->inner_map_fd;
1: +  }
1: +
1: +  if (obj->gen_loader) {
1: +    bpf_gen__map_create(obj->gen_loader, &create_attr,
1: +                        is_inner ? -1 : map - obj->maps);
1: +    /* Pretend to have valid FD to pass various fd >= 0 checks.
1: +     * This fd == 0 will not be used with any syscall and will be reset to -1
1: +     * eventually.
1: +     */
1: +    map->fd = 0;
1: +  } else {
1: +    map->fd = bpf_create_map_xattr(&create_attr);
1: +  }
1: +  if (map->fd < 0 &&
1: +      (create_attr.btf_key_type_id || create_attr.btf_value_type_id)) {
1: +    char *cp, errmsg[STRERR_BUFSIZE];
1: +    int err = -errno;
1: +
1: +    cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: +    pr_warn("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n",
1: +            map->name, cp, err);
1: +    create_attr.btf_fd = 0;
1: +    create_attr.btf_key_type_id = 0;
1: +    create_attr.btf_value_type_id = 0;
1: +    map->btf_key_type_id = 0;
1: +    map->btf_value_type_id = 0;
1: +    map->fd = bpf_create_map_xattr(&create_attr);
1: +  }
1: +
1: +  if (map->fd < 0)
1: +    return -errno;
1: +
1: +  if (bpf_map_type__is_map_in_map(def->type) && map->inner_map) {
1: +    if (obj->gen_loader)
1: +      map->inner_map->fd = -1;
1: +    bpf_map__destroy(map->inner_map);
1: +    zfree(&map->inner_map);
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int init_map_slots(struct bpf_object *obj, struct bpf_map *map) {
1: +  const struct bpf_map *targ_map;
1: +  unsigned int i;
1: +  int fd, err = 0;
1: +
1: +  for (i = 0; i < map->init_slots_sz; i++) {
1: +    if (!map->init_slots[i])
1: +      continue;
1: +
1: +    targ_map = map->init_slots[i];
1: +    fd = bpf_map__fd(targ_map);
1: +    if (obj->gen_loader) {
1: +      pr_warn("// TODO map_update_elem: idx %td key %d value==map_idx %td\n",
1: +              map - obj->maps, i, targ_map - obj->maps);
1: +      return -ENOTSUP;
1: +    } else {
1: +      err = bpf_map_update_elem(map->fd, &i, &fd, 0);
1: +    }
1: +    if (err) {
1: +      err = -errno;
1: +      pr_warn(
1: +          "map '%s': failed to initialize slot [%d] to map '%s' fd=%d: %d\n",
1: +          map->name, i, targ_map->name, fd, err);
1: +      return err;
1: +    }
1: +    pr_debug("map '%s': slot [%d] set to map '%s' fd=%d\n", map->name, i,
1: +             targ_map->name, fd);
1: +  }
1: +
1: +  zfree(&map->init_slots);
1: +  map->init_slots_sz = 0;
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__create_maps(struct bpf_object *obj) {
1: +  struct bpf_map *map;
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  unsigned int i, j;
1: +  int err;
1: +
1: +  for (i = 0; i < obj->nr_maps; i++) {
1: +    map = &obj->maps[i];
1: +
1: +    if (map->pin_path) {
1: +      err = bpf_object__reuse_map(map);
1: +      if (err) {
1: +        pr_warn("map '%s': error reusing pinned map\n", map->name);
1: +        goto err_out;
1: +      }
1: +    }
1: +
1: +    if (map->fd >= 0) {
1: +      pr_debug("map '%s': skipping creation (preset fd=%d)\n", map->name,
1: +               map->fd);
1: +    } else {
1: +      err = bpf_object__create_map(obj, map, false);
1: +      if (err)
1: +        goto err_out;
1: +
1: +      pr_debug("map '%s': created successfully, fd=%d\n", map->name, map->fd);
1: +
1: +      if (bpf_map__is_internal(map)) {
1: +        err = bpf_object__populate_internal_map(obj, map);
1: +        if (err < 0) {
1: +          zclose(map->fd);
1: +          goto err_out;
1: +        }
1: +      }
1: +
1: +      if (map->init_slots_sz) {
1: +        err = init_map_slots(obj, map);
1: +        if (err < 0) {
1: +          zclose(map->fd);
1: +          goto err_out;
1: +        }
1: +      }
1: +    }
1: +
1: +    if (map->pin_path && !map->pinned) {
1: +      err = bpf_map__pin(map, NULL);
1: +      if (err) {
1: +        pr_warn("map '%s': failed to auto-pin at '%s': %d\n", map->name,
1: +                map->pin_path, err);
1: +        zclose(map->fd);
1: +        goto err_out;
1: +      }
1: +    }
1: +  }
1: +
1: +  return 0;
1:  
1:  err_out:
1: -	cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: -	pr_warn("map '%s': failed to create: %s(%d)\n", map->name, cp, err);
1: -	pr_perm_msg(err);
1: -	for (j = 0; j < i; j++)
1: -		zclose(obj->maps[j].fd);
1: -	return err;
1: +  cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: +  pr_warn("map '%s': failed to create: %s(%d)\n", map->name, cp, err);
1: +  pr_perm_msg(err);
1: +  for (j = 0; j < i; j++)
1: +    zclose(obj->maps[j].fd);
1: +  return err;
1:  }
1:  
1:  #define BPF_CORE_SPEC_MAX_LEN 64
1:  
1:  /* represents BPF CO-RE field or array element accessor */
1:  struct bpf_core_accessor {
1: -	__u32 type_id;		/* struct/union type or array element type */
1: -	__u32 idx;		/* field index or array index */
1: -	const char *name;	/* field name or NULL for array accessor */
1: +  __u32 type_id;    /* struct/union type or array element type */
1: +  __u32 idx;        /* field index or array index */
1: +  const char *name; /* field name or NULL for array accessor */
1:  };
1:  
1:  struct bpf_core_spec {
1: -	const struct btf *btf;
1: -	/* high-level spec: named fields and array indices only */
1: -	struct bpf_core_accessor spec[BPF_CORE_SPEC_MAX_LEN];
1: -	/* original unresolved (no skip_mods_or_typedefs) root type ID */
1: -	__u32 root_type_id;
1: -	/* CO-RE relocation kind */
1: -	enum bpf_core_relo_kind relo_kind;
1: -	/* high-level spec length */
1: -	int len;
1: -	/* raw, low-level spec: 1-to-1 with accessor spec string */
1: -	int raw_spec[BPF_CORE_SPEC_MAX_LEN];
1: -	/* raw spec length */
1: -	int raw_len;
1: -	/* field bit offset represented by spec */
1: -	__u32 bit_offset;
1: +  const struct btf *btf;
1: +  /* high-level spec: named fields and array indices only */
1: +  struct bpf_core_accessor spec[BPF_CORE_SPEC_MAX_LEN];
1: +  /* original unresolved (no skip_mods_or_typedefs) root type ID */
1: +  __u32 root_type_id;
1: +  /* CO-RE relocation kind */
1: +  enum bpf_core_relo_kind relo_kind;
1: +  /* high-level spec length */
1: +  int len;
1: +  /* raw, low-level spec: 1-to-1 with accessor spec string */
1: +  int raw_spec[BPF_CORE_SPEC_MAX_LEN];
1: +  /* raw spec length */
1: +  int raw_len;
1: +  /* field bit offset represented by spec */
1: +  __u32 bit_offset;
1:  };
1:  
1: -static bool str_is_empty(const char *s)
1: -{
1: -	return !s || !s[0];
1: -}
1: +static bool str_is_empty(const char *s) { return !s || !s[0]; }
1:  
1:  static bool is_flex_arr(const struct btf *btf,
1: -			const struct bpf_core_accessor *acc,
1: -			const struct btf_array *arr)
1: -{
1: -	const struct btf_type *t;
1: -
1: -	/* not a flexible array, if not inside a struct or has non-zero size */
1: -	if (!acc->name || arr->nelems > 0)
1: -		return false;
1: -
1: -	/* has to be the last member of enclosing struct */
1: -	t = btf__type_by_id(btf, acc->type_id);
1: -	return acc->idx == btf_vlen(t) - 1;
1: -}
1: -
1: -static const char *core_relo_kind_str(enum bpf_core_relo_kind kind)
1: -{
1: -	switch (kind) {
1: -	case BPF_FIELD_BYTE_OFFSET: return "byte_off";
1: -	case BPF_FIELD_BYTE_SIZE: return "byte_sz";
1: -	case BPF_FIELD_EXISTS: return "field_exists";
1: -	case BPF_FIELD_SIGNED: return "signed";
1: -	case BPF_FIELD_LSHIFT_U64: return "lshift_u64";
1: -	case BPF_FIELD_RSHIFT_U64: return "rshift_u64";
1: -	case BPF_TYPE_ID_LOCAL: return "local_type_id";
1: -	case BPF_TYPE_ID_TARGET: return "target_type_id";
1: -	case BPF_TYPE_EXISTS: return "type_exists";
1: -	case BPF_TYPE_SIZE: return "type_size";
1: -	case BPF_ENUMVAL_EXISTS: return "enumval_exists";
1: -	case BPF_ENUMVAL_VALUE: return "enumval_value";
1: -	default: return "unknown";
1: -	}
1: -}
1: -
1: -static bool core_relo_is_field_based(enum bpf_core_relo_kind kind)
1: -{
1: -	switch (kind) {
1: -	case BPF_FIELD_BYTE_OFFSET:
1: -	case BPF_FIELD_BYTE_SIZE:
1: -	case BPF_FIELD_EXISTS:
1: -	case BPF_FIELD_SIGNED:
1: -	case BPF_FIELD_LSHIFT_U64:
1: -	case BPF_FIELD_RSHIFT_U64:
1: -		return true;
1: -	default:
1: -		return false;
1: -	}
1: -}
1: -
1: -static bool core_relo_is_type_based(enum bpf_core_relo_kind kind)
1: -{
1: -	switch (kind) {
1: -	case BPF_TYPE_ID_LOCAL:
1: -	case BPF_TYPE_ID_TARGET:
1: -	case BPF_TYPE_EXISTS:
1: -	case BPF_TYPE_SIZE:
1: -		return true;
1: -	default:
1: -		return false;
1: -	}
1: -}
1: -
1: -static bool core_relo_is_enumval_based(enum bpf_core_relo_kind kind)
1: -{
1: -	switch (kind) {
1: -	case BPF_ENUMVAL_EXISTS:
1: -	case BPF_ENUMVAL_VALUE:
1: -		return true;
1: -	default:
1: -		return false;
1: -	}
1: +                        const struct bpf_core_accessor *acc,
1: +                        const struct btf_array *arr) {
1: +  const struct btf_type *t;
1: +
1: +  /* not a flexible array, if not inside a struct or has non-zero size */
1: +  if (!acc->name || arr->nelems > 0)
1: +    return false;
1: +
1: +  /* has to be the last member of enclosing struct */
1: +  t = btf__type_by_id(btf, acc->type_id);
1: +  return acc->idx == btf_vlen(t) - 1;
1: +}
1: +
1: +static const char *core_relo_kind_str(enum bpf_core_relo_kind kind) {
1: +  switch (kind) {
1: +  case BPF_FIELD_BYTE_OFFSET:
1: +    return "byte_off";
1: +  case BPF_FIELD_BYTE_SIZE:
1: +    return "byte_sz";
1: +  case BPF_FIELD_EXISTS:
1: +    return "field_exists";
1: +  case BPF_FIELD_SIGNED:
1: +    return "signed";
1: +  case BPF_FIELD_LSHIFT_U64:
1: +    return "lshift_u64";
1: +  case BPF_FIELD_RSHIFT_U64:
1: +    return "rshift_u64";
1: +  case BPF_TYPE_ID_LOCAL:
1: +    return "local_type_id";
1: +  case BPF_TYPE_ID_TARGET:
1: +    return "target_type_id";
1: +  case BPF_TYPE_EXISTS:
1: +    return "type_exists";
1: +  case BPF_TYPE_SIZE:
1: +    return "type_size";
1: +  case BPF_ENUMVAL_EXISTS:
1: +    return "enumval_exists";
1: +  case BPF_ENUMVAL_VALUE:
1: +    return "enumval_value";
1: +  default:
1: +    return "unknown";
1: +  }
1: +}
1: +
1: +static bool core_relo_is_field_based(enum bpf_core_relo_kind kind) {
1: +  switch (kind) {
1: +  case BPF_FIELD_BYTE_OFFSET:
1: +  case BPF_FIELD_BYTE_SIZE:
1: +  case BPF_FIELD_EXISTS:
1: +  case BPF_FIELD_SIGNED:
1: +  case BPF_FIELD_LSHIFT_U64:
1: +  case BPF_FIELD_RSHIFT_U64:
1: +    return true;
1: +  default:
1: +    return false;
1: +  }
1: +}
1: +
1: +static bool core_relo_is_type_based(enum bpf_core_relo_kind kind) {
1: +  switch (kind) {
1: +  case BPF_TYPE_ID_LOCAL:
1: +  case BPF_TYPE_ID_TARGET:
1: +  case BPF_TYPE_EXISTS:
1: +  case BPF_TYPE_SIZE:
1: +    return true;
1: +  default:
1: +    return false;
1: +  }
1: +}
1: +
1: +static bool core_relo_is_enumval_based(enum bpf_core_relo_kind kind) {
1: +  switch (kind) {
1: +  case BPF_ENUMVAL_EXISTS:
1: +  case BPF_ENUMVAL_VALUE:
1: +    return true;
1: +  default:
1: +    return false;
1: +  }
1:  }
1:  
1:  /*
1: @@ -4817,380 +4717,373 @@ static bool core_relo_is_enumval_based(enum bpf_core_relo_kind kind)
1:   * Enum value-based relocations (ENUMVAL_EXISTS/ENUMVAL_VALUE) use access
1:   * string to specify enumerator's value index that need to be relocated.
1:   */
1: -static int bpf_core_parse_spec(const struct btf *btf,
1: -			       __u32 type_id,
1: -			       const char *spec_str,
1: -			       enum bpf_core_relo_kind relo_kind,
1: -			       struct bpf_core_spec *spec)
1: -{
1: -	int access_idx, parsed_len, i;
1: -	struct bpf_core_accessor *acc;
1: -	const struct btf_type *t;
1: -	const char *name;
1: -	__u32 id;
1: -	__s64 sz;
1: -
1: -	if (str_is_empty(spec_str) || *spec_str == ':')
1: -		return -EINVAL;
1: -
1: -	memset(spec, 0, sizeof(*spec));
1: -	spec->btf = btf;
1: -	spec->root_type_id = type_id;
1: -	spec->relo_kind = relo_kind;
1: -
1: -	/* type-based relocations don't have a field access string */
1: -	if (core_relo_is_type_based(relo_kind)) {
1: -		if (strcmp(spec_str, "0"))
1: -			return -EINVAL;
1: -		return 0;
1: -	}
1: -
1: -	/* parse spec_str="0:1:2:3:4" into array raw_spec=[0, 1, 2, 3, 4] */
1: -	while (*spec_str) {
1: -		if (*spec_str == ':')
1: -			++spec_str;
1: -		if (sscanf(spec_str, "%d%n", &access_idx, &parsed_len) != 1)
1: -			return -EINVAL;
1: -		if (spec->raw_len == BPF_CORE_SPEC_MAX_LEN)
1: -			return -E2BIG;
1: -		spec_str += parsed_len;
1: -		spec->raw_spec[spec->raw_len++] = access_idx;
1: -	}
1: -
1: -	if (spec->raw_len == 0)
1: -		return -EINVAL;
1: -
1: -	t = skip_mods_and_typedefs(btf, type_id, &id);
1: -	if (!t)
1: -		return -EINVAL;
1: -
1: -	access_idx = spec->raw_spec[0];
1: -	acc = &spec->spec[0];
1: -	acc->type_id = id;
1: -	acc->idx = access_idx;
1: -	spec->len++;
1: -
1: -	if (core_relo_is_enumval_based(relo_kind)) {
1: -		if (!btf_is_enum(t) || spec->raw_len > 1 || access_idx >= btf_vlen(t))
1: -			return -EINVAL;
1: -
1: -		/* record enumerator name in a first accessor */
1: -		acc->name = btf__name_by_offset(btf, btf_enum(t)[access_idx].name_off);
1: -		return 0;
1: -	}
1: -
1: -	if (!core_relo_is_field_based(relo_kind))
1: -		return -EINVAL;
1: -
1: -	sz = btf__resolve_size(btf, id);
1: -	if (sz < 0)
1: -		return sz;
1: -	spec->bit_offset = access_idx * sz * 8;
1: -
1: -	for (i = 1; i < spec->raw_len; i++) {
1: -		t = skip_mods_and_typedefs(btf, id, &id);
1: -		if (!t)
1: -			return -EINVAL;
1: -
1: -		access_idx = spec->raw_spec[i];
1: -		acc = &spec->spec[spec->len];
1: -
1: -		if (btf_is_composite(t)) {
1: -			const struct btf_member *m;
1: -			__u32 bit_offset;
1: -
1: -			if (access_idx >= btf_vlen(t))
1: -				return -EINVAL;
1: -
1: -			bit_offset = btf_member_bit_offset(t, access_idx);
1: -			spec->bit_offset += bit_offset;
1: -
1: -			m = btf_members(t) + access_idx;
1: -			if (m->name_off) {
1: -				name = btf__name_by_offset(btf, m->name_off);
1: -				if (str_is_empty(name))
1: -					return -EINVAL;
1: -
1: -				acc->type_id = id;
1: -				acc->idx = access_idx;
1: -				acc->name = name;
1: -				spec->len++;
1: -			}
1: -
1: -			id = m->type;
1: -		} else if (btf_is_array(t)) {
1: -			const struct btf_array *a = btf_array(t);
1: -			bool flex;
1: -
1: -			t = skip_mods_and_typedefs(btf, a->type, &id);
1: -			if (!t)
1: -				return -EINVAL;
1: -
1: -			flex = is_flex_arr(btf, acc - 1, a);
1: -			if (!flex && access_idx >= a->nelems)
1: -				return -EINVAL;
1: -
1: -			spec->spec[spec->len].type_id = id;
1: -			spec->spec[spec->len].idx = access_idx;
1: -			spec->len++;
1: -
1: -			sz = btf__resolve_size(btf, id);
1: -			if (sz < 0)
1: -				return sz;
1: -			spec->bit_offset += access_idx * sz * 8;
1: -		} else {
1: -			pr_warn("relo for [%u] %s (at idx %d) captures type [%d] of unexpected kind %s\n",
1: -				type_id, spec_str, i, id, btf_kind_str(t));
1: -			return -EINVAL;
1: -		}
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static bool bpf_core_is_flavor_sep(const char *s)
1: -{
1: -	/* check X___Y name pattern, where X and Y are not underscores */
1: -	return s[0] != '_' &&				      /* X */
1: -	       s[1] == '_' && s[2] == '_' && s[3] == '_' &&   /* ___ */
1: -	       s[4] != '_';				      /* Y */
1: +static int bpf_core_parse_spec(const struct btf *btf, __u32 type_id,
1: +                               const char *spec_str,
1: +                               enum bpf_core_relo_kind relo_kind,
1: +                               struct bpf_core_spec *spec) {
1: +  int access_idx, parsed_len, i;
1: +  struct bpf_core_accessor *acc;
1: +  const struct btf_type *t;
1: +  const char *name;
1: +  __u32 id;
1: +  __s64 sz;
1: +
1: +  if (str_is_empty(spec_str) || *spec_str == ':')
1: +    return -EINVAL;
1: +
1: +  memset(spec, 0, sizeof(*spec));
1: +  spec->btf = btf;
1: +  spec->root_type_id = type_id;
1: +  spec->relo_kind = relo_kind;
1: +
1: +  /* type-based relocations don't have a field access string */
1: +  if (core_relo_is_type_based(relo_kind)) {
1: +    if (strcmp(spec_str, "0"))
1: +      return -EINVAL;
1: +    return 0;
1: +  }
1: +
1: +  /* parse spec_str="0:1:2:3:4" into array raw_spec=[0, 1, 2, 3, 4] */
1: +  while (*spec_str) {
1: +    if (*spec_str == ':')
1: +      ++spec_str;
1: +    if (sscanf(spec_str, "%d%n", &access_idx, &parsed_len) != 1)
1: +      return -EINVAL;
1: +    if (spec->raw_len == BPF_CORE_SPEC_MAX_LEN)
1: +      return -E2BIG;
1: +    spec_str += parsed_len;
1: +    spec->raw_spec[spec->raw_len++] = access_idx;
1: +  }
1: +
1: +  if (spec->raw_len == 0)
1: +    return -EINVAL;
1: +
1: +  t = skip_mods_and_typedefs(btf, type_id, &id);
1: +  if (!t)
1: +    return -EINVAL;
1: +
1: +  access_idx = spec->raw_spec[0];
1: +  acc = &spec->spec[0];
1: +  acc->type_id = id;
1: +  acc->idx = access_idx;
1: +  spec->len++;
1: +
1: +  if (core_relo_is_enumval_based(relo_kind)) {
1: +    if (!btf_is_enum(t) || spec->raw_len > 1 || access_idx >= btf_vlen(t))
1: +      return -EINVAL;
1: +
1: +    /* record enumerator name in a first accessor */
1: +    acc->name = btf__name_by_offset(btf, btf_enum(t)[access_idx].name_off);
1: +    return 0;
1: +  }
1: +
1: +  if (!core_relo_is_field_based(relo_kind))
1: +    return -EINVAL;
1: +
1: +  sz = btf__resolve_size(btf, id);
1: +  if (sz < 0)
1: +    return sz;
1: +  spec->bit_offset = access_idx * sz * 8;
1: +
1: +  for (i = 1; i < spec->raw_len; i++) {
1: +    t = skip_mods_and_typedefs(btf, id, &id);
1: +    if (!t)
1: +      return -EINVAL;
1: +
1: +    access_idx = spec->raw_spec[i];
1: +    acc = &spec->spec[spec->len];
1: +
1: +    if (btf_is_composite(t)) {
1: +      const struct btf_member *m;
1: +      __u32 bit_offset;
1: +
1: +      if (access_idx >= btf_vlen(t))
1: +        return -EINVAL;
1: +
1: +      bit_offset = btf_member_bit_offset(t, access_idx);
1: +      spec->bit_offset += bit_offset;
1: +
1: +      m = btf_members(t) + access_idx;
1: +      if (m->name_off) {
1: +        name = btf__name_by_offset(btf, m->name_off);
1: +        if (str_is_empty(name))
1: +          return -EINVAL;
1: +
1: +        acc->type_id = id;
1: +        acc->idx = access_idx;
1: +        acc->name = name;
1: +        spec->len++;
1: +      }
1: +
1: +      id = m->type;
1: +    } else if (btf_is_array(t)) {
1: +      const struct btf_array *a = btf_array(t);
1: +      bool flex;
1: +
1: +      t = skip_mods_and_typedefs(btf, a->type, &id);
1: +      if (!t)
1: +        return -EINVAL;
1: +
1: +      flex = is_flex_arr(btf, acc - 1, a);
1: +      if (!flex && access_idx >= a->nelems)
1: +        return -EINVAL;
1: +
1: +      spec->spec[spec->len].type_id = id;
1: +      spec->spec[spec->len].idx = access_idx;
1: +      spec->len++;
1: +
1: +      sz = btf__resolve_size(btf, id);
1: +      if (sz < 0)
1: +        return sz;
1: +      spec->bit_offset += access_idx * sz * 8;
1: +    } else {
1: +      pr_warn(
1: +          "relo for [%u] %s (at idx %d) captures type [%d] of unexpected kind "
1: +          "%s\n",
1: +          type_id, spec_str, i, id, btf_kind_str(t));
1: +      return -EINVAL;
1: +    }
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static bool bpf_core_is_flavor_sep(const char *s) {
1: +  /* check X___Y name pattern, where X and Y are not underscores */
1: +  return s[0] != '_' &&                               /* X */
1: +         s[1] == '_' && s[2] == '_' && s[3] == '_' && /* ___ */
1: +         s[4] != '_';                                 /* Y */
1:  }
1:  
1:  /* Given 'some_struct_name___with_flavor' return the length of a name prefix
1:   * before last triple underscore. Struct name part after last triple
1:   * underscore is ignored by BPF CO-RE relocation during relocation matching.
1:   */
1: -static size_t bpf_core_essential_name_len(const char *name)
1: -{
1: -	size_t n = strlen(name);
1: -	int i;
1: -
1: -	for (i = n - 5; i >= 0; i--) {
1: -		if (bpf_core_is_flavor_sep(name + i))
1: -			return i + 1;
1: -	}
1: -	return n;
1: -}
1: -
1: -struct core_cand
1: -{
1: -	const struct btf *btf;
1: -	const struct btf_type *t;
1: -	const char *name;
1: -	__u32 id;
1: +static size_t bpf_core_essential_name_len(const char *name) {
1: +  size_t n = strlen(name);
1: +  int i;
1: +
1: +  for (i = n - 5; i >= 0; i--) {
1: +    if (bpf_core_is_flavor_sep(name + i))
1: +      return i + 1;
1: +  }
1: +  return n;
1: +}
1: +
1: +struct core_cand {
1: +  const struct btf *btf;
1: +  const struct btf_type *t;
1: +  const char *name;
1: +  __u32 id;
1:  };
1:  
1:  /* dynamically sized list of type IDs and its associated struct btf */
1:  struct core_cand_list {
1: -	struct core_cand *cands;
1: -	int len;
1: +  struct core_cand *cands;
1: +  int len;
1:  };
1:  
1: -static void bpf_core_free_cands(struct core_cand_list *cands)
1: -{
1: -	free(cands->cands);
1: -	free(cands);
1: +static void bpf_core_free_cands(struct core_cand_list *cands) {
1: +  free(cands->cands);
1: +  free(cands);
1:  }
1:  
1:  static int bpf_core_add_cands(struct core_cand *local_cand,
1: -			      size_t local_essent_len,
1: -			      const struct btf *targ_btf,
1: -			      const char *targ_btf_name,
1: -			      int targ_start_id,
1: -			      struct core_cand_list *cands)
1: -{
1: -	struct core_cand *new_cands, *cand;
1: -	const struct btf_type *t;
1: -	const char *targ_name;
1: -	size_t targ_essent_len;
1: -	int n, i;
1: -
1: -	n = btf__get_nr_types(targ_btf);
1: -	for (i = targ_start_id; i <= n; i++) {
1: -		t = btf__type_by_id(targ_btf, i);
1: -		if (btf_kind(t) != btf_kind(local_cand->t))
1: -			continue;
1: -
1: -		targ_name = btf__name_by_offset(targ_btf, t->name_off);
1: -		if (str_is_empty(targ_name))
1: -			continue;
1: -
1: -		targ_essent_len = bpf_core_essential_name_len(targ_name);
1: -		if (targ_essent_len != local_essent_len)
1: -			continue;
1: -
1: -		if (strncmp(local_cand->name, targ_name, local_essent_len) != 0)
1: -			continue;
1: -
1: -		pr_debug("CO-RE relocating [%d] %s %s: found target candidate [%d] %s %s in [%s]\n",
1: -			 local_cand->id, btf_kind_str(local_cand->t),
1: -			 local_cand->name, i, btf_kind_str(t), targ_name,
1: -			 targ_btf_name);
1: -		new_cands = libbpf_reallocarray(cands->cands, cands->len + 1,
1: -					      sizeof(*cands->cands));
1: -		if (!new_cands)
1: -			return -ENOMEM;
1: -
1: -		cand = &new_cands[cands->len];
1: -		cand->btf = targ_btf;
1: -		cand->t = t;
1: -		cand->name = targ_name;
1: -		cand->id = i;
1: -
1: -		cands->cands = new_cands;
1: -		cands->len++;
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int load_module_btfs(struct bpf_object *obj)
1: -{
1: -	struct bpf_btf_info info;
1: -	struct module_btf *mod_btf;
1: -	struct btf *btf;
1: -	char name[64];
1: -	__u32 id = 0, len;
1: -	int err, fd;
1: -
1: -	if (obj->btf_modules_loaded)
1: -		return 0;
1: -
1: -	if (obj->gen_loader)
1: -		return 0;
1: -
1: -	/* don't do this again, even if we find no module BTFs */
1: -	obj->btf_modules_loaded = true;
1: -
1: -	/* kernel too old to support module BTFs */
1: -	if (!kernel_supports(obj, FEAT_MODULE_BTF))
1: -		return 0;
1: -
1: -	while (true) {
1: -		err = bpf_btf_get_next_id(id, &id);
1: -		if (err && errno == ENOENT)
1: -			return 0;
1: -		if (err) {
1: -			err = -errno;
1: -			pr_warn("failed to iterate BTF objects: %d\n", err);
1: -			return err;
1: -		}
1: -
1: -		fd = bpf_btf_get_fd_by_id(id);
1: -		if (fd < 0) {
1: -			if (errno == ENOENT)
1: -				continue; /* expected race: BTF was unloaded */
1: -			err = -errno;
1: -			pr_warn("failed to get BTF object #%d FD: %d\n", id, err);
1: -			return err;
1: -		}
1: -
1: -		len = sizeof(info);
1: -		memset(&info, 0, sizeof(info));
1: -		info.name = ptr_to_u64(name);
1: -		info.name_len = sizeof(name);
1: -
1: -		err = bpf_obj_get_info_by_fd(fd, &info, &len);
1: -		if (err) {
1: -			err = -errno;
1: -			pr_warn("failed to get BTF object #%d info: %d\n", id, err);
1: -			goto err_out;
1: -		}
1: -
1: -		/* ignore non-module BTFs */
1: -		if (!info.kernel_btf || strcmp(name, "vmlinux") == 0) {
1: -			close(fd);
1: -			continue;
1: -		}
1: -
1: -		btf = btf_get_from_fd(fd, obj->btf_vmlinux);
1: -		err = libbpf_get_error(btf);
1: -		if (err) {
1: -			pr_warn("failed to load module [%s]'s BTF object #%d: %d\n",
1: -				name, id, err);
1: -			goto err_out;
1: -		}
1: -
1: -		err = libbpf_ensure_mem((void **)&obj->btf_modules, &obj->btf_module_cap,
1: -				        sizeof(*obj->btf_modules), obj->btf_module_cnt + 1);
1: -		if (err)
1: -			goto err_out;
1: -
1: -		mod_btf = &obj->btf_modules[obj->btf_module_cnt++];
1: -
1: -		mod_btf->btf = btf;
1: -		mod_btf->id = id;
1: -		mod_btf->fd = fd;
1: -		mod_btf->name = strdup(name);
1: -		if (!mod_btf->name) {
1: -			err = -ENOMEM;
1: -			goto err_out;
1: -		}
1: -		continue;
1: -
1: -err_out:
1: -		close(fd);
1: -		return err;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static struct core_cand_list *
1: -bpf_core_find_cands(struct bpf_object *obj, const struct btf *local_btf, __u32 local_type_id)
1: -{
1: -	struct core_cand local_cand = {};
1: -	struct core_cand_list *cands;
1: -	const struct btf *main_btf;
1: -	size_t local_essent_len;
1: -	int err, i;
1: -
1: -	local_cand.btf = local_btf;
1: -	local_cand.t = btf__type_by_id(local_btf, local_type_id);
1: -	if (!local_cand.t)
1: -		return ERR_PTR(-EINVAL);
1: -
1: -	local_cand.name = btf__name_by_offset(local_btf, local_cand.t->name_off);
1: -	if (str_is_empty(local_cand.name))
1: -		return ERR_PTR(-EINVAL);
1: -	local_essent_len = bpf_core_essential_name_len(local_cand.name);
1: -
1: -	cands = calloc(1, sizeof(*cands));
1: -	if (!cands)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	/* Attempt to find target candidates in vmlinux BTF first */
1: -	main_btf = obj->btf_vmlinux_override ?: obj->btf_vmlinux;
1: -	err = bpf_core_add_cands(&local_cand, local_essent_len, main_btf, "vmlinux", 1, cands);
1: -	if (err)
1: -		goto err_out;
1: -
1: -	/* if vmlinux BTF has any candidate, don't got for module BTFs */
1: -	if (cands->len)
1: -		return cands;
1: -
1: -	/* if vmlinux BTF was overridden, don't attempt to load module BTFs */
1: -	if (obj->btf_vmlinux_override)
1: -		return cands;
1: -
1: -	/* now look through module BTFs, trying to still find candidates */
1: -	err = load_module_btfs(obj);
1: -	if (err)
1: -		goto err_out;
1: -
1: -	for (i = 0; i < obj->btf_module_cnt; i++) {
1: -		err = bpf_core_add_cands(&local_cand, local_essent_len,
1: -					 obj->btf_modules[i].btf,
1: -					 obj->btf_modules[i].name,
1: -					 btf__get_nr_types(obj->btf_vmlinux) + 1,
1: -					 cands);
1: -		if (err)
1: -			goto err_out;
1: -	}
1: -
1: -	return cands;
1: +                              size_t local_essent_len,
1: +                              const struct btf *targ_btf,
1: +                              const char *targ_btf_name, int targ_start_id,
1: +                              struct core_cand_list *cands) {
1: +  struct core_cand *new_cands, *cand;
1: +  const struct btf_type *t;
1: +  const char *targ_name;
1: +  size_t targ_essent_len;
1: +  int n, i;
1: +
1: +  n = btf__get_nr_types(targ_btf);
1: +  for (i = targ_start_id; i <= n; i++) {
1: +    t = btf__type_by_id(targ_btf, i);
1: +    if (btf_kind(t) != btf_kind(local_cand->t))
1: +      continue;
1: +
1: +    targ_name = btf__name_by_offset(targ_btf, t->name_off);
1: +    if (str_is_empty(targ_name))
1: +      continue;
1: +
1: +    targ_essent_len = bpf_core_essential_name_len(targ_name);
1: +    if (targ_essent_len != local_essent_len)
1: +      continue;
1: +
1: +    if (strncmp(local_cand->name, targ_name, local_essent_len) != 0)
1: +      continue;
1: +
1: +    pr_debug(
1: +        "CO-RE relocating [%d] %s %s: found target candidate [%d] %s %s in "
1: +        "[%s]\n",
1: +        local_cand->id, btf_kind_str(local_cand->t), local_cand->name, i,
1: +        btf_kind_str(t), targ_name, targ_btf_name);
1: +    new_cands = libbpf_reallocarray(cands->cands, cands->len + 1,
1: +                                    sizeof(*cands->cands));
1: +    if (!new_cands)
1: +      return -ENOMEM;
1: +
1: +    cand = &new_cands[cands->len];
1: +    cand->btf = targ_btf;
1: +    cand->t = t;
1: +    cand->name = targ_name;
1: +    cand->id = i;
1: +
1: +    cands->cands = new_cands;
1: +    cands->len++;
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int load_module_btfs(struct bpf_object *obj) {
1: +  struct bpf_btf_info info;
1: +  struct module_btf *mod_btf;
1: +  struct btf *btf;
1: +  char name[64];
1: +  __u32 id = 0, len;
1: +  int err, fd;
1: +
1: +  if (obj->btf_modules_loaded)
1: +    return 0;
1: +
1: +  if (obj->gen_loader)
1: +    return 0;
1: +
1: +  /* don't do this again, even if we find no module BTFs */
1: +  obj->btf_modules_loaded = true;
1: +
1: +  /* kernel too old to support module BTFs */
1: +  if (!kernel_supports(obj, FEAT_MODULE_BTF))
1: +    return 0;
1: +
1: +  while (true) {
1: +    err = bpf_btf_get_next_id(id, &id);
1: +    if (err && errno == ENOENT)
1: +      return 0;
1: +    if (err) {
1: +      err = -errno;
1: +      pr_warn("failed to iterate BTF objects: %d\n", err);
1: +      return err;
1: +    }
1: +
1: +    fd = bpf_btf_get_fd_by_id(id);
1: +    if (fd < 0) {
1: +      if (errno == ENOENT)
1: +        continue; /* expected race: BTF was unloaded */
1: +      err = -errno;
1: +      pr_warn("failed to get BTF object #%d FD: %d\n", id, err);
1: +      return err;
1: +    }
1: +
1: +    len = sizeof(info);
1: +    memset(&info, 0, sizeof(info));
1: +    info.name = ptr_to_u64(name);
1: +    info.name_len = sizeof(name);
1: +
1: +    err = bpf_obj_get_info_by_fd(fd, &info, &len);
1: +    if (err) {
1: +      err = -errno;
1: +      pr_warn("failed to get BTF object #%d info: %d\n", id, err);
1: +      goto err_out;
1: +    }
1: +
1: +    /* ignore non-module BTFs */
1: +    if (!info.kernel_btf || strcmp(name, "vmlinux") == 0) {
1: +      close(fd);
1: +      continue;
1: +    }
1: +
1: +    btf = btf_get_from_fd(fd, obj->btf_vmlinux);
1: +    err = libbpf_get_error(btf);
1: +    if (err) {
1: +      pr_warn("failed to load module [%s]'s BTF object #%d: %d\n", name, id,
1: +              err);
1: +      goto err_out;
1: +    }
1: +
1: +    err = libbpf_ensure_mem((void **)&obj->btf_modules, &obj->btf_module_cap,
1: +                            sizeof(*obj->btf_modules), obj->btf_module_cnt + 1);
1: +    if (err)
1: +      goto err_out;
1: +
1: +    mod_btf = &obj->btf_modules[obj->btf_module_cnt++];
1: +
1: +    mod_btf->btf = btf;
1: +    mod_btf->id = id;
1: +    mod_btf->fd = fd;
1: +    mod_btf->name = strdup(name);
1: +    if (!mod_btf->name) {
1: +      err = -ENOMEM;
1: +      goto err_out;
1: +    }
1: +    continue;
1: +
1: +  err_out:
1: +    close(fd);
1: +    return err;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static struct core_cand_list *bpf_core_find_cands(struct bpf_object *obj,
1: +                                                  const struct btf *local_btf,
1: +                                                  __u32 local_type_id) {
1: +  struct core_cand local_cand = {};
1: +  struct core_cand_list *cands;
1: +  const struct btf *main_btf;
1: +  size_t local_essent_len;
1: +  int err, i;
1: +
1: +  local_cand.btf = local_btf;
1: +  local_cand.t = btf__type_by_id(local_btf, local_type_id);
1: +  if (!local_cand.t)
1: +    return ERR_PTR(-EINVAL);
1: +
1: +  local_cand.name = btf__name_by_offset(local_btf, local_cand.t->name_off);
1: +  if (str_is_empty(local_cand.name))
1: +    return ERR_PTR(-EINVAL);
1: +  local_essent_len = bpf_core_essential_name_len(local_cand.name);
1: +
1: +  cands = calloc(1, sizeof(*cands));
1: +  if (!cands)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  /* Attempt to find target candidates in vmlinux BTF first */
1: +  main_btf = obj->btf_vmlinux_override ?: obj->btf_vmlinux;
1: +  err = bpf_core_add_cands(&local_cand, local_essent_len, main_btf, "vmlinux",
1: +                           1, cands);
1: +  if (err)
1: +    goto err_out;
1: +
1: +  /* if vmlinux BTF has any candidate, don't got for module BTFs */
1: +  if (cands->len)
1: +    return cands;
1: +
1: +  /* if vmlinux BTF was overridden, don't attempt to load module BTFs */
1: +  if (obj->btf_vmlinux_override)
1: +    return cands;
1: +
1: +  /* now look through module BTFs, trying to still find candidates */
1: +  err = load_module_btfs(obj);
1: +  if (err)
1: +    goto err_out;
1: +
1: +  for (i = 0; i < obj->btf_module_cnt; i++) {
1: +    err = bpf_core_add_cands(&local_cand, local_essent_len,
1: +                             obj->btf_modules[i].btf, obj->btf_modules[i].name,
1: +                             btf__get_nr_types(obj->btf_vmlinux) + 1, cands);
1: +    if (err)
1: +      goto err_out;
1: +  }
1: +
1: +  return cands;
1:  err_out:
1: -	bpf_core_free_cands(cands);
1: -	return ERR_PTR(err);
1: +  bpf_core_free_cands(cands);
1: +  return ERR_PTR(err);
1:  }
1:  
1:  /* Check two types for compatibility for the purpose of field access
1: @@ -5211,57 +5104,54 @@ err_out:
1:   * more experience with using BPF CO-RE relocations.
1:   */
1:  static int bpf_core_fields_are_compat(const struct btf *local_btf,
1: -				      __u32 local_id,
1: -				      const struct btf *targ_btf,
1: -				      __u32 targ_id)
1: -{
1: -	const struct btf_type *local_type, *targ_type;
1: +                                      __u32 local_id,
1: +                                      const struct btf *targ_btf,
1: +                                      __u32 targ_id) {
1: +  const struct btf_type *local_type, *targ_type;
1:  
1:  recur:
1: -	local_type = skip_mods_and_typedefs(local_btf, local_id, &local_id);
1: -	targ_type = skip_mods_and_typedefs(targ_btf, targ_id, &targ_id);
1: -	if (!local_type || !targ_type)
1: -		return -EINVAL;
1: -
1: -	if (btf_is_composite(local_type) && btf_is_composite(targ_type))
1: -		return 1;
1: -	if (btf_kind(local_type) != btf_kind(targ_type))
1: -		return 0;
1: -
1: -	switch (btf_kind(local_type)) {
1: -	case BTF_KIND_PTR:
1: -	case BTF_KIND_FLOAT:
1: -		return 1;
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_ENUM: {
1: -		const char *local_name, *targ_name;
1: -		size_t local_len, targ_len;
1: -
1: -		local_name = btf__name_by_offset(local_btf,
1: -						 local_type->name_off);
1: -		targ_name = btf__name_by_offset(targ_btf, targ_type->name_off);
1: -		local_len = bpf_core_essential_name_len(local_name);
1: -		targ_len = bpf_core_essential_name_len(targ_name);
1: -		/* one of them is anonymous or both w/ same flavor-less names */
1: -		return local_len == 0 || targ_len == 0 ||
1: -		       (local_len == targ_len &&
1: -			strncmp(local_name, targ_name, local_len) == 0);
1: -	}
1: -	case BTF_KIND_INT:
1: -		/* just reject deprecated bitfield-like integers; all other
1: -		 * integers are by default compatible between each other
1: -		 */
1: -		return btf_int_offset(local_type) == 0 &&
1: -		       btf_int_offset(targ_type) == 0;
1: -	case BTF_KIND_ARRAY:
1: -		local_id = btf_array(local_type)->type;
1: -		targ_id = btf_array(targ_type)->type;
1: -		goto recur;
1: -	default:
1: -		pr_warn("unexpected kind %d relocated, local [%d], target [%d]\n",
1: -			btf_kind(local_type), local_id, targ_id);
1: -		return 0;
1: -	}
1: +  local_type = skip_mods_and_typedefs(local_btf, local_id, &local_id);
1: +  targ_type = skip_mods_and_typedefs(targ_btf, targ_id, &targ_id);
1: +  if (!local_type || !targ_type)
1: +    return -EINVAL;
1: +
1: +  if (btf_is_composite(local_type) && btf_is_composite(targ_type))
1: +    return 1;
1: +  if (btf_kind(local_type) != btf_kind(targ_type))
1: +    return 0;
1: +
1: +  switch (btf_kind(local_type)) {
1: +  case BTF_KIND_PTR:
1: +  case BTF_KIND_FLOAT:
1: +    return 1;
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_ENUM: {
1: +    const char *local_name, *targ_name;
1: +    size_t local_len, targ_len;
1: +
1: +    local_name = btf__name_by_offset(local_btf, local_type->name_off);
1: +    targ_name = btf__name_by_offset(targ_btf, targ_type->name_off);
1: +    local_len = bpf_core_essential_name_len(local_name);
1: +    targ_len = bpf_core_essential_name_len(targ_name);
1: +    /* one of them is anonymous or both w/ same flavor-less names */
1: +    return local_len == 0 || targ_len == 0 ||
1: +           (local_len == targ_len &&
1: +            strncmp(local_name, targ_name, local_len) == 0);
1: +  }
1: +  case BTF_KIND_INT:
1: +    /* just reject deprecated bitfield-like integers; all other
1: +     * integers are by default compatible between each other
1: +     */
1: +    return btf_int_offset(local_type) == 0 && btf_int_offset(targ_type) == 0;
1: +  case BTF_KIND_ARRAY:
1: +    local_id = btf_array(local_type)->type;
1: +    targ_id = btf_array(targ_type)->type;
1: +    goto recur;
1: +  default:
1: +    pr_warn("unexpected kind %d relocated, local [%d], target [%d]\n",
1: +            btf_kind(local_type), local_id, targ_id);
1: +    return 0;
1: +  }
1:  }
1:  
1:  /*
1: @@ -5281,75 +5171,71 @@ recur:
1:   * <0 is returned on error.
1:   */
1:  static int bpf_core_match_member(const struct btf *local_btf,
1: -				 const struct bpf_core_accessor *local_acc,
1: -				 const struct btf *targ_btf,
1: -				 __u32 targ_id,
1: -				 struct bpf_core_spec *spec,
1: -				 __u32 *next_targ_id)
1: -{
1: -	const struct btf_type *local_type, *targ_type;
1: -	const struct btf_member *local_member, *m;
1: -	const char *local_name, *targ_name;
1: -	__u32 local_id;
1: -	int i, n, found;
1: -
1: -	targ_type = skip_mods_and_typedefs(targ_btf, targ_id, &targ_id);
1: -	if (!targ_type)
1: -		return -EINVAL;
1: -	if (!btf_is_composite(targ_type))
1: -		return 0;
1: -
1: -	local_id = local_acc->type_id;
1: -	local_type = btf__type_by_id(local_btf, local_id);
1: -	local_member = btf_members(local_type) + local_acc->idx;
1: -	local_name = btf__name_by_offset(local_btf, local_member->name_off);
1: -
1: -	n = btf_vlen(targ_type);
1: -	m = btf_members(targ_type);
1: -	for (i = 0; i < n; i++, m++) {
1: -		__u32 bit_offset;
1: -
1: -		bit_offset = btf_member_bit_offset(targ_type, i);
1: -
1: -		/* too deep struct/union/array nesting */
1: -		if (spec->raw_len == BPF_CORE_SPEC_MAX_LEN)
1: -			return -E2BIG;
1: -
1: -		/* speculate this member will be the good one */
1: -		spec->bit_offset += bit_offset;
1: -		spec->raw_spec[spec->raw_len++] = i;
1: -
1: -		targ_name = btf__name_by_offset(targ_btf, m->name_off);
1: -		if (str_is_empty(targ_name)) {
1: -			/* embedded struct/union, we need to go deeper */
1: -			found = bpf_core_match_member(local_btf, local_acc,
1: -						      targ_btf, m->type,
1: -						      spec, next_targ_id);
1: -			if (found) /* either found or error */
1: -				return found;
1: -		} else if (strcmp(local_name, targ_name) == 0) {
1: -			/* matching named field */
1: -			struct bpf_core_accessor *targ_acc;
1: -
1: -			targ_acc = &spec->spec[spec->len++];
1: -			targ_acc->type_id = targ_id;
1: -			targ_acc->idx = i;
1: -			targ_acc->name = targ_name;
1: -
1: -			*next_targ_id = m->type;
1: -			found = bpf_core_fields_are_compat(local_btf,
1: -							   local_member->type,
1: -							   targ_btf, m->type);
1: -			if (!found)
1: -				spec->len--; /* pop accessor */
1: -			return found;
1: -		}
1: -		/* member turned out not to be what we looked for */
1: -		spec->bit_offset -= bit_offset;
1: -		spec->raw_len--;
1: -	}
1: -
1: -	return 0;
1: +                                 const struct bpf_core_accessor *local_acc,
1: +                                 const struct btf *targ_btf, __u32 targ_id,
1: +                                 struct bpf_core_spec *spec,
1: +                                 __u32 *next_targ_id) {
1: +  const struct btf_type *local_type, *targ_type;
1: +  const struct btf_member *local_member, *m;
1: +  const char *local_name, *targ_name;
1: +  __u32 local_id;
1: +  int i, n, found;
1: +
1: +  targ_type = skip_mods_and_typedefs(targ_btf, targ_id, &targ_id);
1: +  if (!targ_type)
1: +    return -EINVAL;
1: +  if (!btf_is_composite(targ_type))
1: +    return 0;
1: +
1: +  local_id = local_acc->type_id;
1: +  local_type = btf__type_by_id(local_btf, local_id);
1: +  local_member = btf_members(local_type) + local_acc->idx;
1: +  local_name = btf__name_by_offset(local_btf, local_member->name_off);
1: +
1: +  n = btf_vlen(targ_type);
1: +  m = btf_members(targ_type);
1: +  for (i = 0; i < n; i++, m++) {
1: +    __u32 bit_offset;
1: +
1: +    bit_offset = btf_member_bit_offset(targ_type, i);
1: +
1: +    /* too deep struct/union/array nesting */
1: +    if (spec->raw_len == BPF_CORE_SPEC_MAX_LEN)
1: +      return -E2BIG;
1: +
1: +    /* speculate this member will be the good one */
1: +    spec->bit_offset += bit_offset;
1: +    spec->raw_spec[spec->raw_len++] = i;
1: +
1: +    targ_name = btf__name_by_offset(targ_btf, m->name_off);
1: +    if (str_is_empty(targ_name)) {
1: +      /* embedded struct/union, we need to go deeper */
1: +      found = bpf_core_match_member(local_btf, local_acc, targ_btf, m->type,
1: +                                    spec, next_targ_id);
1: +      if (found) /* either found or error */
1: +        return found;
1: +    } else if (strcmp(local_name, targ_name) == 0) {
1: +      /* matching named field */
1: +      struct bpf_core_accessor *targ_acc;
1: +
1: +      targ_acc = &spec->spec[spec->len++];
1: +      targ_acc->type_id = targ_id;
1: +      targ_acc->idx = i;
1: +      targ_acc->name = targ_name;
1: +
1: +      *next_targ_id = m->type;
1: +      found = bpf_core_fields_are_compat(local_btf, local_member->type,
1: +                                         targ_btf, m->type);
1: +      if (!found)
1: +        spec->len--; /* pop accessor */
1: +      return found;
1: +    }
1: +    /* member turned out not to be what we looked for */
1: +    spec->bit_offset -= bit_offset;
1: +    spec->raw_len--;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  /* Check local and target types for compatibility. This check is used for
1: @@ -5371,79 +5257,79 @@ static int bpf_core_match_member(const struct btf *local_btf,
1:   * These rules are not set in stone and probably will be adjusted as we get
1:   * more experience with using BPF CO-RE relocations.
1:   */
1: -static int bpf_core_types_are_compat(const struct btf *local_btf, __u32 local_id,
1: -				     const struct btf *targ_btf, __u32 targ_id)
1: -{
1: -	const struct btf_type *local_type, *targ_type;
1: -	int depth = 32; /* max recursion depth */
1: -
1: -	/* caller made sure that names match (ignoring flavor suffix) */
1: -	local_type = btf__type_by_id(local_btf, local_id);
1: -	targ_type = btf__type_by_id(targ_btf, targ_id);
1: -	if (btf_kind(local_type) != btf_kind(targ_type))
1: -		return 0;
1: +static int bpf_core_types_are_compat(const struct btf *local_btf,
1: +                                     __u32 local_id, const struct btf *targ_btf,
1: +                                     __u32 targ_id) {
1: +  const struct btf_type *local_type, *targ_type;
1: +  int depth = 32; /* max recursion depth */
1: +
1: +  /* caller made sure that names match (ignoring flavor suffix) */
1: +  local_type = btf__type_by_id(local_btf, local_id);
1: +  targ_type = btf__type_by_id(targ_btf, targ_id);
1: +  if (btf_kind(local_type) != btf_kind(targ_type))
1: +    return 0;
1:  
1:  recur:
1: -	depth--;
1: -	if (depth < 0)
1: -		return -EINVAL;
1: -
1: -	local_type = skip_mods_and_typedefs(local_btf, local_id, &local_id);
1: -	targ_type = skip_mods_and_typedefs(targ_btf, targ_id, &targ_id);
1: -	if (!local_type || !targ_type)
1: -		return -EINVAL;
1: -
1: -	if (btf_kind(local_type) != btf_kind(targ_type))
1: -		return 0;
1: -
1: -	switch (btf_kind(local_type)) {
1: -	case BTF_KIND_UNKN:
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION:
1: -	case BTF_KIND_ENUM:
1: -	case BTF_KIND_FWD:
1: -		return 1;
1: -	case BTF_KIND_INT:
1: -		/* just reject deprecated bitfield-like integers; all other
1: -		 * integers are by default compatible between each other
1: -		 */
1: -		return btf_int_offset(local_type) == 0 && btf_int_offset(targ_type) == 0;
1: -	case BTF_KIND_PTR:
1: -		local_id = local_type->type;
1: -		targ_id = targ_type->type;
1: -		goto recur;
1: -	case BTF_KIND_ARRAY:
1: -		local_id = btf_array(local_type)->type;
1: -		targ_id = btf_array(targ_type)->type;
1: -		goto recur;
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		struct btf_param *local_p = btf_params(local_type);
1: -		struct btf_param *targ_p = btf_params(targ_type);
1: -		__u16 local_vlen = btf_vlen(local_type);
1: -		__u16 targ_vlen = btf_vlen(targ_type);
1: -		int i, err;
1: -
1: -		if (local_vlen != targ_vlen)
1: -			return 0;
1: -
1: -		for (i = 0; i < local_vlen; i++, local_p++, targ_p++) {
1: -			skip_mods_and_typedefs(local_btf, local_p->type, &local_id);
1: -			skip_mods_and_typedefs(targ_btf, targ_p->type, &targ_id);
1: -			err = bpf_core_types_are_compat(local_btf, local_id, targ_btf, targ_id);
1: -			if (err <= 0)
1: -				return err;
1: -		}
1: -
1: -		/* tail recurse for return type check */
1: -		skip_mods_and_typedefs(local_btf, local_type->type, &local_id);
1: -		skip_mods_and_typedefs(targ_btf, targ_type->type, &targ_id);
1: -		goto recur;
1: -	}
1: -	default:
1: -		pr_warn("unexpected kind %s relocated, local [%d], target [%d]\n",
1: -			btf_kind_str(local_type), local_id, targ_id);
1: -		return 0;
1: -	}
1: +  depth--;
1: +  if (depth < 0)
1: +    return -EINVAL;
1: +
1: +  local_type = skip_mods_and_typedefs(local_btf, local_id, &local_id);
1: +  targ_type = skip_mods_and_typedefs(targ_btf, targ_id, &targ_id);
1: +  if (!local_type || !targ_type)
1: +    return -EINVAL;
1: +
1: +  if (btf_kind(local_type) != btf_kind(targ_type))
1: +    return 0;
1: +
1: +  switch (btf_kind(local_type)) {
1: +  case BTF_KIND_UNKN:
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION:
1: +  case BTF_KIND_ENUM:
1: +  case BTF_KIND_FWD:
1: +    return 1;
1: +  case BTF_KIND_INT:
1: +    /* just reject deprecated bitfield-like integers; all other
1: +     * integers are by default compatible between each other
1: +     */
1: +    return btf_int_offset(local_type) == 0 && btf_int_offset(targ_type) == 0;
1: +  case BTF_KIND_PTR:
1: +    local_id = local_type->type;
1: +    targ_id = targ_type->type;
1: +    goto recur;
1: +  case BTF_KIND_ARRAY:
1: +    local_id = btf_array(local_type)->type;
1: +    targ_id = btf_array(targ_type)->type;
1: +    goto recur;
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    struct btf_param *local_p = btf_params(local_type);
1: +    struct btf_param *targ_p = btf_params(targ_type);
1: +    __u16 local_vlen = btf_vlen(local_type);
1: +    __u16 targ_vlen = btf_vlen(targ_type);
1: +    int i, err;
1: +
1: +    if (local_vlen != targ_vlen)
1: +      return 0;
1: +
1: +    for (i = 0; i < local_vlen; i++, local_p++, targ_p++) {
1: +      skip_mods_and_typedefs(local_btf, local_p->type, &local_id);
1: +      skip_mods_and_typedefs(targ_btf, targ_p->type, &targ_id);
1: +      err = bpf_core_types_are_compat(local_btf, local_id, targ_btf, targ_id);
1: +      if (err <= 0)
1: +        return err;
1: +    }
1: +
1: +    /* tail recurse for return type check */
1: +    skip_mods_and_typedefs(local_btf, local_type->type, &local_id);
1: +    skip_mods_and_typedefs(targ_btf, targ_type->type, &targ_id);
1: +    goto recur;
1: +  }
1: +  default:
1: +    pr_warn("unexpected kind %s relocated, local [%d], target [%d]\n",
1: +            btf_kind_str(local_type), local_id, targ_id);
1: +    return 0;
1: +  }
1:  }
1:  
1:  /*
1: @@ -5451,324 +5337,315 @@ recur:
1:   * target spec (high-level, low-level + bit offset).
1:   */
1:  static int bpf_core_spec_match(struct bpf_core_spec *local_spec,
1: -			       const struct btf *targ_btf, __u32 targ_id,
1: -			       struct bpf_core_spec *targ_spec)
1: -{
1: -	const struct btf_type *targ_type;
1: -	const struct bpf_core_accessor *local_acc;
1: -	struct bpf_core_accessor *targ_acc;
1: -	int i, sz, matched;
1: -
1: -	memset(targ_spec, 0, sizeof(*targ_spec));
1: -	targ_spec->btf = targ_btf;
1: -	targ_spec->root_type_id = targ_id;
1: -	targ_spec->relo_kind = local_spec->relo_kind;
1: -
1: -	if (core_relo_is_type_based(local_spec->relo_kind)) {
1: -		return bpf_core_types_are_compat(local_spec->btf,
1: -						 local_spec->root_type_id,
1: -						 targ_btf, targ_id);
1: -	}
1: -
1: -	local_acc = &local_spec->spec[0];
1: -	targ_acc = &targ_spec->spec[0];
1: -
1: -	if (core_relo_is_enumval_based(local_spec->relo_kind)) {
1: -		size_t local_essent_len, targ_essent_len;
1: -		const struct btf_enum *e;
1: -		const char *targ_name;
1: -
1: -		/* has to resolve to an enum */
1: -		targ_type = skip_mods_and_typedefs(targ_spec->btf, targ_id, &targ_id);
1: -		if (!btf_is_enum(targ_type))
1: -			return 0;
1: -
1: -		local_essent_len = bpf_core_essential_name_len(local_acc->name);
1: -
1: -		for (i = 0, e = btf_enum(targ_type); i < btf_vlen(targ_type); i++, e++) {
1: -			targ_name = btf__name_by_offset(targ_spec->btf, e->name_off);
1: -			targ_essent_len = bpf_core_essential_name_len(targ_name);
1: -			if (targ_essent_len != local_essent_len)
1: -				continue;
1: -			if (strncmp(local_acc->name, targ_name, local_essent_len) == 0) {
1: -				targ_acc->type_id = targ_id;
1: -				targ_acc->idx = i;
1: -				targ_acc->name = targ_name;
1: -				targ_spec->len++;
1: -				targ_spec->raw_spec[targ_spec->raw_len] = targ_acc->idx;
1: -				targ_spec->raw_len++;
1: -				return 1;
1: -			}
1: -		}
1: -		return 0;
1: -	}
1: -
1: -	if (!core_relo_is_field_based(local_spec->relo_kind))
1: -		return -EINVAL;
1: -
1: -	for (i = 0; i < local_spec->len; i++, local_acc++, targ_acc++) {
1: -		targ_type = skip_mods_and_typedefs(targ_spec->btf, targ_id,
1: -						   &targ_id);
1: -		if (!targ_type)
1: -			return -EINVAL;
1: -
1: -		if (local_acc->name) {
1: -			matched = bpf_core_match_member(local_spec->btf,
1: -							local_acc,
1: -							targ_btf, targ_id,
1: -							targ_spec, &targ_id);
1: -			if (matched <= 0)
1: -				return matched;
1: -		} else {
1: -			/* for i=0, targ_id is already treated as array element
1: -			 * type (because it's the original struct), for others
1: -			 * we should find array element type first
1: -			 */
1: -			if (i > 0) {
1: -				const struct btf_array *a;
1: -				bool flex;
1: -
1: -				if (!btf_is_array(targ_type))
1: -					return 0;
1: -
1: -				a = btf_array(targ_type);
1: -				flex = is_flex_arr(targ_btf, targ_acc - 1, a);
1: -				if (!flex && local_acc->idx >= a->nelems)
1: -					return 0;
1: -				if (!skip_mods_and_typedefs(targ_btf, a->type,
1: -							    &targ_id))
1: -					return -EINVAL;
1: -			}
1: -
1: -			/* too deep struct/union/array nesting */
1: -			if (targ_spec->raw_len == BPF_CORE_SPEC_MAX_LEN)
1: -				return -E2BIG;
1: -
1: -			targ_acc->type_id = targ_id;
1: -			targ_acc->idx = local_acc->idx;
1: -			targ_acc->name = NULL;
1: -			targ_spec->len++;
1: -			targ_spec->raw_spec[targ_spec->raw_len] = targ_acc->idx;
1: -			targ_spec->raw_len++;
1: -
1: -			sz = btf__resolve_size(targ_btf, targ_id);
1: -			if (sz < 0)
1: -				return sz;
1: -			targ_spec->bit_offset += local_acc->idx * sz * 8;
1: -		}
1: -	}
1: -
1: -	return 1;
1: +                               const struct btf *targ_btf, __u32 targ_id,
1: +                               struct bpf_core_spec *targ_spec) {
1: +  const struct btf_type *targ_type;
1: +  const struct bpf_core_accessor *local_acc;
1: +  struct bpf_core_accessor *targ_acc;
1: +  int i, sz, matched;
1: +
1: +  memset(targ_spec, 0, sizeof(*targ_spec));
1: +  targ_spec->btf = targ_btf;
1: +  targ_spec->root_type_id = targ_id;
1: +  targ_spec->relo_kind = local_spec->relo_kind;
1: +
1: +  if (core_relo_is_type_based(local_spec->relo_kind)) {
1: +    return bpf_core_types_are_compat(local_spec->btf, local_spec->root_type_id,
1: +                                     targ_btf, targ_id);
1: +  }
1: +
1: +  local_acc = &local_spec->spec[0];
1: +  targ_acc = &targ_spec->spec[0];
1: +
1: +  if (core_relo_is_enumval_based(local_spec->relo_kind)) {
1: +    size_t local_essent_len, targ_essent_len;
1: +    const struct btf_enum *e;
1: +    const char *targ_name;
1: +
1: +    /* has to resolve to an enum */
1: +    targ_type = skip_mods_and_typedefs(targ_spec->btf, targ_id, &targ_id);
1: +    if (!btf_is_enum(targ_type))
1: +      return 0;
1: +
1: +    local_essent_len = bpf_core_essential_name_len(local_acc->name);
1: +
1: +    for (i = 0, e = btf_enum(targ_type); i < btf_vlen(targ_type); i++, e++) {
1: +      targ_name = btf__name_by_offset(targ_spec->btf, e->name_off);
1: +      targ_essent_len = bpf_core_essential_name_len(targ_name);
1: +      if (targ_essent_len != local_essent_len)
1: +        continue;
1: +      if (strncmp(local_acc->name, targ_name, local_essent_len) == 0) {
1: +        targ_acc->type_id = targ_id;
1: +        targ_acc->idx = i;
1: +        targ_acc->name = targ_name;
1: +        targ_spec->len++;
1: +        targ_spec->raw_spec[targ_spec->raw_len] = targ_acc->idx;
1: +        targ_spec->raw_len++;
1: +        return 1;
1: +      }
1: +    }
1: +    return 0;
1: +  }
1: +
1: +  if (!core_relo_is_field_based(local_spec->relo_kind))
1: +    return -EINVAL;
1: +
1: +  for (i = 0; i < local_spec->len; i++, local_acc++, targ_acc++) {
1: +    targ_type = skip_mods_and_typedefs(targ_spec->btf, targ_id, &targ_id);
1: +    if (!targ_type)
1: +      return -EINVAL;
1: +
1: +    if (local_acc->name) {
1: +      matched = bpf_core_match_member(local_spec->btf, local_acc, targ_btf,
1: +                                      targ_id, targ_spec, &targ_id);
1: +      if (matched <= 0)
1: +        return matched;
1: +    } else {
1: +      /* for i=0, targ_id is already treated as array element
1: +       * type (because it's the original struct), for others
1: +       * we should find array element type first
1: +       */
1: +      if (i > 0) {
1: +        const struct btf_array *a;
1: +        bool flex;
1: +
1: +        if (!btf_is_array(targ_type))
1: +          return 0;
1: +
1: +        a = btf_array(targ_type);
1: +        flex = is_flex_arr(targ_btf, targ_acc - 1, a);
1: +        if (!flex && local_acc->idx >= a->nelems)
1: +          return 0;
1: +        if (!skip_mods_and_typedefs(targ_btf, a->type, &targ_id))
1: +          return -EINVAL;
1: +      }
1: +
1: +      /* too deep struct/union/array nesting */
1: +      if (targ_spec->raw_len == BPF_CORE_SPEC_MAX_LEN)
1: +        return -E2BIG;
1: +
1: +      targ_acc->type_id = targ_id;
1: +      targ_acc->idx = local_acc->idx;
1: +      targ_acc->name = NULL;
1: +      targ_spec->len++;
1: +      targ_spec->raw_spec[targ_spec->raw_len] = targ_acc->idx;
1: +      targ_spec->raw_len++;
1: +
1: +      sz = btf__resolve_size(targ_btf, targ_id);
1: +      if (sz < 0)
1: +        return sz;
1: +      targ_spec->bit_offset += local_acc->idx * sz * 8;
1: +    }
1: +  }
1: +
1: +  return 1;
1:  }
1:  
1:  static int bpf_core_calc_field_relo(const struct bpf_program *prog,
1: -				    const struct bpf_core_relo *relo,
1: -				    const struct bpf_core_spec *spec,
1: -				    __u32 *val, __u32 *field_sz, __u32 *type_id,
1: -				    bool *validate)
1: -{
1: -	const struct bpf_core_accessor *acc;
1: -	const struct btf_type *t;
1: -	__u32 byte_off, byte_sz, bit_off, bit_sz, field_type_id;
1: -	const struct btf_member *m;
1: -	const struct btf_type *mt;
1: -	bool bitfield;
1: -	__s64 sz;
1: -
1: -	*field_sz = 0;
1: -
1: -	if (relo->kind == BPF_FIELD_EXISTS) {
1: -		*val = spec ? 1 : 0;
1: -		return 0;
1: -	}
1: -
1: -	if (!spec)
1: -		return -EUCLEAN; /* request instruction poisoning */
1: -
1: -	acc = &spec->spec[spec->len - 1];
1: -	t = btf__type_by_id(spec->btf, acc->type_id);
1: -
1: -	/* a[n] accessor needs special handling */
1: -	if (!acc->name) {
1: -		if (relo->kind == BPF_FIELD_BYTE_OFFSET) {
1: -			*val = spec->bit_offset / 8;
1: -			/* remember field size for load/store mem size */
1: -			sz = btf__resolve_size(spec->btf, acc->type_id);
1: -			if (sz < 0)
1: -				return -EINVAL;
1: -			*field_sz = sz;
1: -			*type_id = acc->type_id;
1: -		} else if (relo->kind == BPF_FIELD_BYTE_SIZE) {
1: -			sz = btf__resolve_size(spec->btf, acc->type_id);
1: -			if (sz < 0)
1: -				return -EINVAL;
1: -			*val = sz;
1: -		} else {
1: -			pr_warn("prog '%s': relo %d at insn #%d can't be applied to array access\n",
1: -				prog->name, relo->kind, relo->insn_off / 8);
1: -			return -EINVAL;
1: -		}
1: -		if (validate)
1: -			*validate = true;
1: -		return 0;
1: -	}
1: -
1: -	m = btf_members(t) + acc->idx;
1: -	mt = skip_mods_and_typedefs(spec->btf, m->type, &field_type_id);
1: -	bit_off = spec->bit_offset;
1: -	bit_sz = btf_member_bitfield_size(t, acc->idx);
1: -
1: -	bitfield = bit_sz > 0;
1: -	if (bitfield) {
1: -		byte_sz = mt->size;
1: -		byte_off = bit_off / 8 / byte_sz * byte_sz;
1: -		/* figure out smallest int size necessary for bitfield load */
1: -		while (bit_off + bit_sz - byte_off * 8 > byte_sz * 8) {
1: -			if (byte_sz >= 8) {
1: -				/* bitfield can't be read with 64-bit read */
1: -				pr_warn("prog '%s': relo %d at insn #%d can't be satisfied for bitfield\n",
1: -					prog->name, relo->kind, relo->insn_off / 8);
1: -				return -E2BIG;
1: -			}
1: -			byte_sz *= 2;
1: -			byte_off = bit_off / 8 / byte_sz * byte_sz;
1: -		}
1: -	} else {
1: -		sz = btf__resolve_size(spec->btf, field_type_id);
1: -		if (sz < 0)
1: -			return -EINVAL;
1: -		byte_sz = sz;
1: -		byte_off = spec->bit_offset / 8;
1: -		bit_sz = byte_sz * 8;
1: -	}
1: -
1: -	/* for bitfields, all the relocatable aspects are ambiguous and we
1: -	 * might disagree with compiler, so turn off validation of expected
1: -	 * value, except for signedness
1: -	 */
1: -	if (validate)
1: -		*validate = !bitfield;
1: -
1: -	switch (relo->kind) {
1: -	case BPF_FIELD_BYTE_OFFSET:
1: -		*val = byte_off;
1: -		if (!bitfield) {
1: -			*field_sz = byte_sz;
1: -			*type_id = field_type_id;
1: -		}
1: -		break;
1: -	case BPF_FIELD_BYTE_SIZE:
1: -		*val = byte_sz;
1: -		break;
1: -	case BPF_FIELD_SIGNED:
1: -		/* enums will be assumed unsigned */
1: -		*val = btf_is_enum(mt) ||
1: -		       (btf_int_encoding(mt) & BTF_INT_SIGNED);
1: -		if (validate)
1: -			*validate = true; /* signedness is never ambiguous */
1: -		break;
1: -	case BPF_FIELD_LSHIFT_U64:
1: +                                    const struct bpf_core_relo *relo,
1: +                                    const struct bpf_core_spec *spec,
1: +                                    __u32 *val, __u32 *field_sz, __u32 *type_id,
1: +                                    bool *validate) {
1: +  const struct bpf_core_accessor *acc;
1: +  const struct btf_type *t;
1: +  __u32 byte_off, byte_sz, bit_off, bit_sz, field_type_id;
1: +  const struct btf_member *m;
1: +  const struct btf_type *mt;
1: +  bool bitfield;
1: +  __s64 sz;
1: +
1: +  *field_sz = 0;
1: +
1: +  if (relo->kind == BPF_FIELD_EXISTS) {
1: +    *val = spec ? 1 : 0;
1: +    return 0;
1: +  }
1: +
1: +  if (!spec)
1: +    return -EUCLEAN; /* request instruction poisoning */
1: +
1: +  acc = &spec->spec[spec->len - 1];
1: +  t = btf__type_by_id(spec->btf, acc->type_id);
1: +
1: +  /* a[n] accessor needs special handling */
1: +  if (!acc->name) {
1: +    if (relo->kind == BPF_FIELD_BYTE_OFFSET) {
1: +      *val = spec->bit_offset / 8;
1: +      /* remember field size for load/store mem size */
1: +      sz = btf__resolve_size(spec->btf, acc->type_id);
1: +      if (sz < 0)
1: +        return -EINVAL;
1: +      *field_sz = sz;
1: +      *type_id = acc->type_id;
1: +    } else if (relo->kind == BPF_FIELD_BYTE_SIZE) {
1: +      sz = btf__resolve_size(spec->btf, acc->type_id);
1: +      if (sz < 0)
1: +        return -EINVAL;
1: +      *val = sz;
1: +    } else {
1: +      pr_warn(
1: +          "prog '%s': relo %d at insn #%d can't be applied to array access\n",
1: +          prog->name, relo->kind, relo->insn_off / 8);
1: +      return -EINVAL;
1: +    }
1: +    if (validate)
1: +      *validate = true;
1: +    return 0;
1: +  }
1: +
1: +  m = btf_members(t) + acc->idx;
1: +  mt = skip_mods_and_typedefs(spec->btf, m->type, &field_type_id);
1: +  bit_off = spec->bit_offset;
1: +  bit_sz = btf_member_bitfield_size(t, acc->idx);
1: +
1: +  bitfield = bit_sz > 0;
1: +  if (bitfield) {
1: +    byte_sz = mt->size;
1: +    byte_off = bit_off / 8 / byte_sz * byte_sz;
1: +    /* figure out smallest int size necessary for bitfield load */
1: +    while (bit_off + bit_sz - byte_off * 8 > byte_sz * 8) {
1: +      if (byte_sz >= 8) {
1: +        /* bitfield can't be read with 64-bit read */
1: +        pr_warn(
1: +            "prog '%s': relo %d at insn #%d can't be satisfied for bitfield\n",
1: +            prog->name, relo->kind, relo->insn_off / 8);
1: +        return -E2BIG;
1: +      }
1: +      byte_sz *= 2;
1: +      byte_off = bit_off / 8 / byte_sz * byte_sz;
1: +    }
1: +  } else {
1: +    sz = btf__resolve_size(spec->btf, field_type_id);
1: +    if (sz < 0)
1: +      return -EINVAL;
1: +    byte_sz = sz;
1: +    byte_off = spec->bit_offset / 8;
1: +    bit_sz = byte_sz * 8;
1: +  }
1: +
1: +  /* for bitfields, all the relocatable aspects are ambiguous and we
1: +   * might disagree with compiler, so turn off validation of expected
1: +   * value, except for signedness
1: +   */
1: +  if (validate)
1: +    *validate = !bitfield;
1: +
1: +  switch (relo->kind) {
1: +  case BPF_FIELD_BYTE_OFFSET:
1: +    *val = byte_off;
1: +    if (!bitfield) {
1: +      *field_sz = byte_sz;
1: +      *type_id = field_type_id;
1: +    }
1: +    break;
1: +  case BPF_FIELD_BYTE_SIZE:
1: +    *val = byte_sz;
1: +    break;
1: +  case BPF_FIELD_SIGNED:
1: +    /* enums will be assumed unsigned */
1: +    *val = btf_is_enum(mt) || (btf_int_encoding(mt) & BTF_INT_SIGNED);
1: +    if (validate)
1: +      *validate = true; /* signedness is never ambiguous */
1: +    break;
1: +  case BPF_FIELD_LSHIFT_U64:
1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
1: -		*val = 64 - (bit_off + bit_sz - byte_off  * 8);
1: +    *val = 64 - (bit_off + bit_sz - byte_off * 8);
1:  #else
1: -		*val = (8 - byte_sz) * 8 + (bit_off - byte_off * 8);
1: +    *val = (8 - byte_sz) * 8 + (bit_off - byte_off * 8);
1:  #endif
1: -		break;
1: -	case BPF_FIELD_RSHIFT_U64:
1: -		*val = 64 - bit_sz;
1: -		if (validate)
1: -			*validate = true; /* right shift is never ambiguous */
1: -		break;
1: -	case BPF_FIELD_EXISTS:
1: -	default:
1: -		return -EOPNOTSUPP;
1: -	}
1: +    break;
1: +  case BPF_FIELD_RSHIFT_U64:
1: +    *val = 64 - bit_sz;
1: +    if (validate)
1: +      *validate = true; /* right shift is never ambiguous */
1: +    break;
1: +  case BPF_FIELD_EXISTS:
1: +  default:
1: +    return -EOPNOTSUPP;
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  static int bpf_core_calc_type_relo(const struct bpf_core_relo *relo,
1: -				   const struct bpf_core_spec *spec,
1: -				   __u32 *val)
1: -{
1: -	__s64 sz;
1: -
1: -	/* type-based relos return zero when target type is not found */
1: -	if (!spec) {
1: -		*val = 0;
1: -		return 0;
1: -	}
1: -
1: -	switch (relo->kind) {
1: -	case BPF_TYPE_ID_TARGET:
1: -		*val = spec->root_type_id;
1: -		break;
1: -	case BPF_TYPE_EXISTS:
1: -		*val = 1;
1: -		break;
1: -	case BPF_TYPE_SIZE:
1: -		sz = btf__resolve_size(spec->btf, spec->root_type_id);
1: -		if (sz < 0)
1: -			return -EINVAL;
1: -		*val = sz;
1: -		break;
1: -	case BPF_TYPE_ID_LOCAL:
1: -	/* BPF_TYPE_ID_LOCAL is handled specially and shouldn't get here */
1: -	default:
1: -		return -EOPNOTSUPP;
1: -	}
1: -
1: -	return 0;
1: +                                   const struct bpf_core_spec *spec,
1: +                                   __u32 *val) {
1: +  __s64 sz;
1: +
1: +  /* type-based relos return zero when target type is not found */
1: +  if (!spec) {
1: +    *val = 0;
1: +    return 0;
1: +  }
1: +
1: +  switch (relo->kind) {
1: +  case BPF_TYPE_ID_TARGET:
1: +    *val = spec->root_type_id;
1: +    break;
1: +  case BPF_TYPE_EXISTS:
1: +    *val = 1;
1: +    break;
1: +  case BPF_TYPE_SIZE:
1: +    sz = btf__resolve_size(spec->btf, spec->root_type_id);
1: +    if (sz < 0)
1: +      return -EINVAL;
1: +    *val = sz;
1: +    break;
1: +  case BPF_TYPE_ID_LOCAL:
1: +  /* BPF_TYPE_ID_LOCAL is handled specially and shouldn't get here */
1: +  default:
1: +    return -EOPNOTSUPP;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  static int bpf_core_calc_enumval_relo(const struct bpf_core_relo *relo,
1: -				      const struct bpf_core_spec *spec,
1: -				      __u32 *val)
1: -{
1: -	const struct btf_type *t;
1: -	const struct btf_enum *e;
1: -
1: -	switch (relo->kind) {
1: -	case BPF_ENUMVAL_EXISTS:
1: -		*val = spec ? 1 : 0;
1: -		break;
1: -	case BPF_ENUMVAL_VALUE:
1: -		if (!spec)
1: -			return -EUCLEAN; /* request instruction poisoning */
1: -		t = btf__type_by_id(spec->btf, spec->spec[0].type_id);
1: -		e = btf_enum(t) + spec->spec[0].idx;
1: -		*val = e->val;
1: -		break;
1: -	default:
1: -		return -EOPNOTSUPP;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -struct bpf_core_relo_res
1: -{
1: -	/* expected value in the instruction, unless validate == false */
1: -	__u32 orig_val;
1: -	/* new value that needs to be patched up to */
1: -	__u32 new_val;
1: -	/* relocation unsuccessful, poison instruction, but don't fail load */
1: -	bool poison;
1: -	/* some relocations can't be validated against orig_val */
1: -	bool validate;
1: -	/* for field byte offset relocations or the forms:
1: -	 *     *(T *)(rX + <off>) = rY
1: -	 *     rX = *(T *)(rY + <off>),
1: -	 * we remember original and resolved field size to adjust direct
1: -	 * memory loads of pointers and integers; this is necessary for 32-bit
1: -	 * host kernel architectures, but also allows to automatically
1: -	 * relocate fields that were resized from, e.g., u32 to u64, etc.
1: -	 */
1: -	bool fail_memsz_adjust;
1: -	__u32 orig_sz;
1: -	__u32 orig_type_id;
1: -	__u32 new_sz;
1: -	__u32 new_type_id;
1: +                                      const struct bpf_core_spec *spec,
1: +                                      __u32 *val) {
1: +  const struct btf_type *t;
1: +  const struct btf_enum *e;
1: +
1: +  switch (relo->kind) {
1: +  case BPF_ENUMVAL_EXISTS:
1: +    *val = spec ? 1 : 0;
1: +    break;
1: +  case BPF_ENUMVAL_VALUE:
1: +    if (!spec)
1: +      return -EUCLEAN; /* request instruction poisoning */
1: +    t = btf__type_by_id(spec->btf, spec->spec[0].type_id);
1: +    e = btf_enum(t) + spec->spec[0].idx;
1: +    *val = e->val;
1: +    break;
1: +  default:
1: +    return -EOPNOTSUPP;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +struct bpf_core_relo_res {
1: +  /* expected value in the instruction, unless validate == false */
1: +  __u32 orig_val;
1: +  /* new value that needs to be patched up to */
1: +  __u32 new_val;
1: +  /* relocation unsuccessful, poison instruction, but don't fail load */
1: +  bool poison;
1: +  /* some relocations can't be validated against orig_val */
1: +  bool validate;
1: +  /* for field byte offset relocations or the forms:
1: +   *     *(T *)(rX + <off>) = rY
1: +   *     rX = *(T *)(rY + <off>),
1: +   * we remember original and resolved field size to adjust direct
1: +   * memory loads of pointers and integers; this is necessary for 32-bit
1: +   * host kernel architectures, but also allows to automatically
1: +   * relocate fields that were resized from, e.g., u32 to u64, etc.
1: +   */
1: +  bool fail_memsz_adjust;
1: +  __u32 orig_sz;
1: +  __u32 orig_type_id;
1: +  __u32 new_sz;
1: +  __u32 new_type_id;
1:  };
1:  
1:  /* Calculate original and target relocation values, given local and target
1: @@ -5778,89 +5655,89 @@ struct bpf_core_relo_res
1:   * If instruction has to be poisoned, *poison will be set to true.
1:   */
1:  static int bpf_core_calc_relo(const struct bpf_program *prog,
1: -			      const struct bpf_core_relo *relo,
1: -			      int relo_idx,
1: -			      const struct bpf_core_spec *local_spec,
1: -			      const struct bpf_core_spec *targ_spec,
1: -			      struct bpf_core_relo_res *res)
1: -{
1: -	int err = -EOPNOTSUPP;
1: -
1: -	res->orig_val = 0;
1: -	res->new_val = 0;
1: -	res->poison = false;
1: -	res->validate = true;
1: -	res->fail_memsz_adjust = false;
1: -	res->orig_sz = res->new_sz = 0;
1: -	res->orig_type_id = res->new_type_id = 0;
1: -
1: -	if (core_relo_is_field_based(relo->kind)) {
1: -		err = bpf_core_calc_field_relo(prog, relo, local_spec,
1: -					       &res->orig_val, &res->orig_sz,
1: -					       &res->orig_type_id, &res->validate);
1: -		err = err ?: bpf_core_calc_field_relo(prog, relo, targ_spec,
1: -						      &res->new_val, &res->new_sz,
1: -						      &res->new_type_id, NULL);
1: -		if (err)
1: -			goto done;
1: -		/* Validate if it's safe to adjust load/store memory size.
1: -		 * Adjustments are performed only if original and new memory
1: -		 * sizes differ.
1: -		 */
1: -		res->fail_memsz_adjust = false;
1: -		if (res->orig_sz != res->new_sz) {
1: -			const struct btf_type *orig_t, *new_t;
1: -
1: -			orig_t = btf__type_by_id(local_spec->btf, res->orig_type_id);
1: -			new_t = btf__type_by_id(targ_spec->btf, res->new_type_id);
1: -
1: -			/* There are two use cases in which it's safe to
1: -			 * adjust load/store's mem size:
1: -			 *   - reading a 32-bit kernel pointer, while on BPF
1: -			 *   size pointers are always 64-bit; in this case
1: -			 *   it's safe to "downsize" instruction size due to
1: -			 *   pointer being treated as unsigned integer with
1: -			 *   zero-extended upper 32-bits;
1: -			 *   - reading unsigned integers, again due to
1: -			 *   zero-extension is preserving the value correctly.
1: -			 *
1: -			 * In all other cases it's incorrect to attempt to
1: -			 * load/store field because read value will be
1: -			 * incorrect, so we poison relocated instruction.
1: -			 */
1: -			if (btf_is_ptr(orig_t) && btf_is_ptr(new_t))
1: -				goto done;
1: -			if (btf_is_int(orig_t) && btf_is_int(new_t) &&
1: -			    btf_int_encoding(orig_t) != BTF_INT_SIGNED &&
1: -			    btf_int_encoding(new_t) != BTF_INT_SIGNED)
1: -				goto done;
1: -
1: -			/* mark as invalid mem size adjustment, but this will
1: -			 * only be checked for LDX/STX/ST insns
1: -			 */
1: -			res->fail_memsz_adjust = true;
1: -		}
1: -	} else if (core_relo_is_type_based(relo->kind)) {
1: -		err = bpf_core_calc_type_relo(relo, local_spec, &res->orig_val);
1: -		err = err ?: bpf_core_calc_type_relo(relo, targ_spec, &res->new_val);
1: -	} else if (core_relo_is_enumval_based(relo->kind)) {
1: -		err = bpf_core_calc_enumval_relo(relo, local_spec, &res->orig_val);
1: -		err = err ?: bpf_core_calc_enumval_relo(relo, targ_spec, &res->new_val);
1: -	}
1: +                              const struct bpf_core_relo *relo, int relo_idx,
1: +                              const struct bpf_core_spec *local_spec,
1: +                              const struct bpf_core_spec *targ_spec,
1: +                              struct bpf_core_relo_res *res) {
1: +  int err = -EOPNOTSUPP;
1: +
1: +  res->orig_val = 0;
1: +  res->new_val = 0;
1: +  res->poison = false;
1: +  res->validate = true;
1: +  res->fail_memsz_adjust = false;
1: +  res->orig_sz = res->new_sz = 0;
1: +  res->orig_type_id = res->new_type_id = 0;
1: +
1: +  if (core_relo_is_field_based(relo->kind)) {
1: +    err = bpf_core_calc_field_relo(prog, relo, local_spec, &res->orig_val,
1: +                                   &res->orig_sz, &res->orig_type_id,
1: +                                   &res->validate);
1: +    err =
1: +        err ?: bpf_core_calc_field_relo(prog, relo, targ_spec, &res->new_val,
1: +                                        &res->new_sz, &res->new_type_id, NULL);
1: +    if (err)
1: +      goto done;
1: +    /* Validate if it's safe to adjust load/store memory size.
1: +     * Adjustments are performed only if original and new memory
1: +     * sizes differ.
1: +     */
1: +    res->fail_memsz_adjust = false;
1: +    if (res->orig_sz != res->new_sz) {
1: +      const struct btf_type *orig_t, *new_t;
1: +
1: +      orig_t = btf__type_by_id(local_spec->btf, res->orig_type_id);
1: +      new_t = btf__type_by_id(targ_spec->btf, res->new_type_id);
1: +
1: +      /* There are two use cases in which it's safe to
1: +       * adjust load/store's mem size:
1: +       *   - reading a 32-bit kernel pointer, while on BPF
1: +       *   size pointers are always 64-bit; in this case
1: +       *   it's safe to "downsize" instruction size due to
1: +       *   pointer being treated as unsigned integer with
1: +       *   zero-extended upper 32-bits;
1: +       *   - reading unsigned integers, again due to
1: +       *   zero-extension is preserving the value correctly.
1: +       *
1: +       * In all other cases it's incorrect to attempt to
1: +       * load/store field because read value will be
1: +       * incorrect, so we poison relocated instruction.
1: +       */
1: +      if (btf_is_ptr(orig_t) && btf_is_ptr(new_t))
1: +        goto done;
1: +      if (btf_is_int(orig_t) && btf_is_int(new_t) &&
1: +          btf_int_encoding(orig_t) != BTF_INT_SIGNED &&
1: +          btf_int_encoding(new_t) != BTF_INT_SIGNED)
1: +        goto done;
1: +
1: +      /* mark as invalid mem size adjustment, but this will
1: +       * only be checked for LDX/STX/ST insns
1: +       */
1: +      res->fail_memsz_adjust = true;
1: +    }
1: +  } else if (core_relo_is_type_based(relo->kind)) {
1: +    err = bpf_core_calc_type_relo(relo, local_spec, &res->orig_val);
1: +    err = err ?: bpf_core_calc_type_relo(relo, targ_spec, &res->new_val);
1: +  } else if (core_relo_is_enumval_based(relo->kind)) {
1: +    err = bpf_core_calc_enumval_relo(relo, local_spec, &res->orig_val);
1: +    err = err ?: bpf_core_calc_enumval_relo(relo, targ_spec, &res->new_val);
1: +  }
1:  
1:  done:
1: -	if (err == -EUCLEAN) {
1: -		/* EUCLEAN is used to signal instruction poisoning request */
1: -		res->poison = true;
1: -		err = 0;
1: -	} else if (err == -EOPNOTSUPP) {
1: -		/* EOPNOTSUPP means unknown/unsupported relocation */
1: -		pr_warn("prog '%s': relo #%d: unrecognized CO-RE relocation %s (%d) at insn #%d\n",
1: -			prog->name, relo_idx, core_relo_kind_str(relo->kind),
1: -			relo->kind, relo->insn_off / 8);
1: -	}
1: -
1: -	return err;
1: +  if (err == -EUCLEAN) {
1: +    /* EUCLEAN is used to signal instruction poisoning request */
1: +    res->poison = true;
1: +    err = 0;
1: +  } else if (err == -EOPNOTSUPP) {
1: +    /* EOPNOTSUPP means unknown/unsupported relocation */
1: +    pr_warn(
1: +        "prog '%s': relo #%d: unrecognized CO-RE relocation %s (%d) at insn "
1: +        "#%d\n",
1: +        prog->name, relo_idx, core_relo_kind_str(relo->kind), relo->kind,
1: +        relo->insn_off / 8);
1: +  }
1: +
1: +  return err;
1:  }
1:  
1:  /*
1: @@ -5868,48 +5745,56 @@ done:
1:   * distinct signature.
1:   */
1:  static void bpf_core_poison_insn(struct bpf_program *prog, int relo_idx,
1: -				 int insn_idx, struct bpf_insn *insn)
1: -{
1: -	pr_debug("prog '%s': relo #%d: substituting insn #%d w/ invalid insn\n",
1: -		 prog->name, relo_idx, insn_idx);
1: -	insn->code = BPF_JMP | BPF_CALL;
1: -	insn->dst_reg = 0;
1: -	insn->src_reg = 0;
1: -	insn->off = 0;
1: -	/* if this instruction is reachable (not a dead code),
1: -	 * verifier will complain with the following message:
1: -	 * invalid func unknown#195896080
1: -	 */
1: -	insn->imm = 195896080; /* => 0xbad2310 => "bad relo" */
1: -}
1: -
1: -static int insn_bpf_size_to_bytes(struct bpf_insn *insn)
1: -{
1: -	switch (BPF_SIZE(insn->code)) {
1: -	case BPF_DW: return 8;
1: -	case BPF_W: return 4;
1: -	case BPF_H: return 2;
1: -	case BPF_B: return 1;
1: -	default: return -1;
1: -	}
1: -}
1: -
1: -static int insn_bytes_to_bpf_size(__u32 sz)
1: -{
1: -	switch (sz) {
1: -	case 8: return BPF_DW;
1: -	case 4: return BPF_W;
1: -	case 2: return BPF_H;
1: -	case 1: return BPF_B;
1: -	default: return -1;
1: -	}
1: +                                 int insn_idx, struct bpf_insn *insn) {
1: +  pr_debug("prog '%s': relo #%d: substituting insn #%d w/ invalid insn\n",
1: +           prog->name, relo_idx, insn_idx);
1: +  insn->code = BPF_JMP | BPF_CALL;
1: +  insn->dst_reg = 0;
1: +  insn->src_reg = 0;
1: +  insn->off = 0;
1: +  /* if this instruction is reachable (not a dead code),
1: +   * verifier will complain with the following message:
1: +   * invalid func unknown#195896080
1: +   */
1: +  insn->imm = 195896080; /* => 0xbad2310 => "bad relo" */
1: +}
1: +
1: +static int insn_bpf_size_to_bytes(struct bpf_insn *insn) {
1: +  switch (BPF_SIZE(insn->code)) {
1: +  case BPF_DW:
1: +    return 8;
1: +  case BPF_W:
1: +    return 4;
1: +  case BPF_H:
1: +    return 2;
1: +  case BPF_B:
1: +    return 1;
1: +  default:
1: +    return -1;
1: +  }
1: +}
1: +
1: +static int insn_bytes_to_bpf_size(__u32 sz) {
1: +  switch (sz) {
1: +  case 8:
1: +    return BPF_DW;
1: +  case 4:
1: +    return BPF_W;
1: +  case 2:
1: +    return BPF_H;
1: +  case 1:
1: +    return BPF_B;
1: +  default:
1: +    return -1;
1: +  }
1:  }
1:  
1:  /*
1:   * Patch relocatable BPF instruction.
1:   *
1:   * Patched value is determined by relocation kind and target specification.
1: - * For existence relocations target spec will be NULL if field/type is not found.
1: + * For existence relocations target spec will be NULL if field/type is not
1: + * found.
1:   * Expected insn->imm value is determined using relocation kind and local
1:   * spec, and is checked before patching instruction. If actual insn->imm value
1:   * is wrong, bail out with error.
1: @@ -5923,208 +5808,214 @@ static int insn_bytes_to_bpf_size(__u32 sz)
1:   * 6. *(T *)(rX + <off>) = <imm>, where T is one of {u8, u16, u32, u64}.
1:   */
1:  static int bpf_core_patch_insn(struct bpf_program *prog,
1: -			       const struct bpf_core_relo *relo,
1: -			       int relo_idx,
1: -			       const struct bpf_core_relo_res *res)
1: -{
1: -	__u32 orig_val, new_val;
1: -	struct bpf_insn *insn;
1: -	int insn_idx;
1: -	__u8 class;
1: -
1: -	if (relo->insn_off % BPF_INSN_SZ)
1: -		return -EINVAL;
1: -	insn_idx = relo->insn_off / BPF_INSN_SZ;
1: -	/* adjust insn_idx from section frame of reference to the local
1: -	 * program's frame of reference; (sub-)program code is not yet
1: -	 * relocated, so it's enough to just subtract in-section offset
1: -	 */
1: -	insn_idx = insn_idx - prog->sec_insn_off;
1: -	insn = &prog->insns[insn_idx];
1: -	class = BPF_CLASS(insn->code);
1: -
1: -	if (res->poison) {
1: -poison:
1: -		/* poison second part of ldimm64 to avoid confusing error from
1: -		 * verifier about "unknown opcode 00"
1: -		 */
1: -		if (is_ldimm64_insn(insn))
1: -			bpf_core_poison_insn(prog, relo_idx, insn_idx + 1, insn + 1);
1: -		bpf_core_poison_insn(prog, relo_idx, insn_idx, insn);
1: -		return 0;
1: -	}
1: -
1: -	orig_val = res->orig_val;
1: -	new_val = res->new_val;
1: -
1: -	switch (class) {
1: -	case BPF_ALU:
1: -	case BPF_ALU64:
1: -		if (BPF_SRC(insn->code) != BPF_K)
1: -			return -EINVAL;
1: -		if (res->validate && insn->imm != orig_val) {
1: -			pr_warn("prog '%s': relo #%d: unexpected insn #%d (ALU/ALU64) value: got %u, exp %u -> %u\n",
1: -				prog->name, relo_idx,
1: -				insn_idx, insn->imm, orig_val, new_val);
1: -			return -EINVAL;
1: -		}
1: -		orig_val = insn->imm;
1: -		insn->imm = new_val;
1: -		pr_debug("prog '%s': relo #%d: patched insn #%d (ALU/ALU64) imm %u -> %u\n",
1: -			 prog->name, relo_idx, insn_idx,
1: -			 orig_val, new_val);
1: -		break;
1: -	case BPF_LDX:
1: -	case BPF_ST:
1: -	case BPF_STX:
1: -		if (res->validate && insn->off != orig_val) {
1: -			pr_warn("prog '%s': relo #%d: unexpected insn #%d (LDX/ST/STX) value: got %u, exp %u -> %u\n",
1: -				prog->name, relo_idx, insn_idx, insn->off, orig_val, new_val);
1: -			return -EINVAL;
1: -		}
1: -		if (new_val > SHRT_MAX) {
1: -			pr_warn("prog '%s': relo #%d: insn #%d (LDX/ST/STX) value too big: %u\n",
1: -				prog->name, relo_idx, insn_idx, new_val);
1: -			return -ERANGE;
1: -		}
1: -		if (res->fail_memsz_adjust) {
1: -			pr_warn("prog '%s': relo #%d: insn #%d (LDX/ST/STX) accesses field incorrectly. "
1: -				"Make sure you are accessing pointers, unsigned integers, or fields of matching type and size.\n",
1: -				prog->name, relo_idx, insn_idx);
1: -			goto poison;
1: -		}
1: -
1: -		orig_val = insn->off;
1: -		insn->off = new_val;
1: -		pr_debug("prog '%s': relo #%d: patched insn #%d (LDX/ST/STX) off %u -> %u\n",
1: -			 prog->name, relo_idx, insn_idx, orig_val, new_val);
1: -
1: -		if (res->new_sz != res->orig_sz) {
1: -			int insn_bytes_sz, insn_bpf_sz;
1: -
1: -			insn_bytes_sz = insn_bpf_size_to_bytes(insn);
1: -			if (insn_bytes_sz != res->orig_sz) {
1: -				pr_warn("prog '%s': relo #%d: insn #%d (LDX/ST/STX) unexpected mem size: got %d, exp %u\n",
1: -					prog->name, relo_idx, insn_idx, insn_bytes_sz, res->orig_sz);
1: -				return -EINVAL;
1: -			}
1: -
1: -			insn_bpf_sz = insn_bytes_to_bpf_size(res->new_sz);
1: -			if (insn_bpf_sz < 0) {
1: -				pr_warn("prog '%s': relo #%d: insn #%d (LDX/ST/STX) invalid new mem size: %u\n",
1: -					prog->name, relo_idx, insn_idx, res->new_sz);
1: -				return -EINVAL;
1: -			}
1: -
1: -			insn->code = BPF_MODE(insn->code) | insn_bpf_sz | BPF_CLASS(insn->code);
1: -			pr_debug("prog '%s': relo #%d: patched insn #%d (LDX/ST/STX) mem_sz %u -> %u\n",
1: -				 prog->name, relo_idx, insn_idx, res->orig_sz, res->new_sz);
1: -		}
1: -		break;
1: -	case BPF_LD: {
1: -		__u64 imm;
1: -
1: -		if (!is_ldimm64_insn(insn) ||
1: -		    insn[0].src_reg != 0 || insn[0].off != 0 ||
1: -		    insn_idx + 1 >= prog->insns_cnt ||
1: -		    insn[1].code != 0 || insn[1].dst_reg != 0 ||
1: -		    insn[1].src_reg != 0 || insn[1].off != 0) {
1: -			pr_warn("prog '%s': relo #%d: insn #%d (LDIMM64) has unexpected form\n",
1: -				prog->name, relo_idx, insn_idx);
1: -			return -EINVAL;
1: -		}
1: -
1: -		imm = insn[0].imm + ((__u64)insn[1].imm << 32);
1: -		if (res->validate && imm != orig_val) {
1: -			pr_warn("prog '%s': relo #%d: unexpected insn #%d (LDIMM64) value: got %llu, exp %u -> %u\n",
1: -				prog->name, relo_idx,
1: -				insn_idx, (unsigned long long)imm,
1: -				orig_val, new_val);
1: -			return -EINVAL;
1: -		}
1: -
1: -		insn[0].imm = new_val;
1: -		insn[1].imm = 0; /* currently only 32-bit values are supported */
1: -		pr_debug("prog '%s': relo #%d: patched insn #%d (LDIMM64) imm64 %llu -> %u\n",
1: -			 prog->name, relo_idx, insn_idx,
1: -			 (unsigned long long)imm, new_val);
1: -		break;
1: -	}
1: -	default:
1: -		pr_warn("prog '%s': relo #%d: trying to relocate unrecognized insn #%d, code:0x%x, src:0x%x, dst:0x%x, off:0x%x, imm:0x%x\n",
1: -			prog->name, relo_idx, insn_idx, insn->code,
1: -			insn->src_reg, insn->dst_reg, insn->off, insn->imm);
1: -		return -EINVAL;
1: -	}
1: -
1: -	return 0;
1: +                               const struct bpf_core_relo *relo, int relo_idx,
1: +                               const struct bpf_core_relo_res *res) {
1: +  __u32 orig_val, new_val;
1: +  struct bpf_insn *insn;
1: +  int insn_idx;
1: +  __u8 class;
1: +
1: +  if (relo->insn_off % BPF_INSN_SZ)
1: +    return -EINVAL;
1: +  insn_idx = relo->insn_off / BPF_INSN_SZ;
1: +  /* adjust insn_idx from section frame of reference to the local
1: +   * program's frame of reference; (sub-)program code is not yet
1: +   * relocated, so it's enough to just subtract in-section offset
1: +   */
1: +  insn_idx = insn_idx - prog->sec_insn_off;
1: +  insn = &prog->insns[insn_idx];
1: +  class = BPF_CLASS(insn->code);
1: +
1: +  if (res->poison) {
1: +  poison:
1: +    /* poison second part of ldimm64 to avoid confusing error from
1: +     * verifier about "unknown opcode 00"
1: +     */
1: +    if (is_ldimm64_insn(insn))
1: +      bpf_core_poison_insn(prog, relo_idx, insn_idx + 1, insn + 1);
1: +    bpf_core_poison_insn(prog, relo_idx, insn_idx, insn);
1: +    return 0;
1: +  }
1: +
1: +  orig_val = res->orig_val;
1: +  new_val = res->new_val;
1: +
1: +  switch (class) {
1: +  case BPF_ALU:
1: +  case BPF_ALU64:
1: +    if (BPF_SRC(insn->code) != BPF_K)
1: +      return -EINVAL;
1: +    if (res->validate && insn->imm != orig_val) {
1: +      pr_warn(
1: +          "prog '%s': relo #%d: unexpected insn #%d (ALU/ALU64) value: got %u, "
1: +          "exp %u -> %u\n",
1: +          prog->name, relo_idx, insn_idx, insn->imm, orig_val, new_val);
1: +      return -EINVAL;
1: +    }
1: +    orig_val = insn->imm;
1: +    insn->imm = new_val;
1: +    pr_debug("prog '%s': relo #%d: patched insn #%d (ALU/ALU64) imm %u -> %u\n",
1: +             prog->name, relo_idx, insn_idx, orig_val, new_val);
1: +    break;
1: +  case BPF_LDX:
1: +  case BPF_ST:
1: +  case BPF_STX:
1: +    if (res->validate && insn->off != orig_val) {
1: +      pr_warn(
1: +          "prog '%s': relo #%d: unexpected insn #%d (LDX/ST/STX) value: got "
1: +          "%u, exp %u -> %u\n",
1: +          prog->name, relo_idx, insn_idx, insn->off, orig_val, new_val);
1: +      return -EINVAL;
1: +    }
1: +    if (new_val > SHRT_MAX) {
1: +      pr_warn("prog '%s': relo #%d: insn #%d (LDX/ST/STX) value too big: %u\n",
1: +              prog->name, relo_idx, insn_idx, new_val);
1: +      return -ERANGE;
1: +    }
1: +    if (res->fail_memsz_adjust) {
1: +      pr_warn(
1: +          "prog '%s': relo #%d: insn #%d (LDX/ST/STX) accesses field "
1: +          "incorrectly. "
1: +          "Make sure you are accessing pointers, unsigned integers, or fields "
1: +          "of matching type and size.\n",
1: +          prog->name, relo_idx, insn_idx);
1: +      goto poison;
1: +    }
1: +
1: +    orig_val = insn->off;
1: +    insn->off = new_val;
1: +    pr_debug(
1: +        "prog '%s': relo #%d: patched insn #%d (LDX/ST/STX) off %u -> %u\n",
1: +        prog->name, relo_idx, insn_idx, orig_val, new_val);
1: +
1: +    if (res->new_sz != res->orig_sz) {
1: +      int insn_bytes_sz, insn_bpf_sz;
1: +
1: +      insn_bytes_sz = insn_bpf_size_to_bytes(insn);
1: +      if (insn_bytes_sz != res->orig_sz) {
1: +        pr_warn(
1: +            "prog '%s': relo #%d: insn #%d (LDX/ST/STX) unexpected mem size: "
1: +            "got %d, exp %u\n",
1: +            prog->name, relo_idx, insn_idx, insn_bytes_sz, res->orig_sz);
1: +        return -EINVAL;
1: +      }
1: +
1: +      insn_bpf_sz = insn_bytes_to_bpf_size(res->new_sz);
1: +      if (insn_bpf_sz < 0) {
1: +        pr_warn(
1: +            "prog '%s': relo #%d: insn #%d (LDX/ST/STX) invalid new mem size: "
1: +            "%u\n",
1: +            prog->name, relo_idx, insn_idx, res->new_sz);
1: +        return -EINVAL;
1: +      }
1: +
1: +      insn->code = BPF_MODE(insn->code) | insn_bpf_sz | BPF_CLASS(insn->code);
1: +      pr_debug(
1: +          "prog '%s': relo #%d: patched insn #%d (LDX/ST/STX) mem_sz %u -> "
1: +          "%u\n",
1: +          prog->name, relo_idx, insn_idx, res->orig_sz, res->new_sz);
1: +    }
1: +    break;
1: +  case BPF_LD: {
1: +    __u64 imm;
1: +
1: +    if (!is_ldimm64_insn(insn) || insn[0].src_reg != 0 || insn[0].off != 0 ||
1: +        insn_idx + 1 >= prog->insns_cnt || insn[1].code != 0 ||
1: +        insn[1].dst_reg != 0 || insn[1].src_reg != 0 || insn[1].off != 0) {
1: +      pr_warn("prog '%s': relo #%d: insn #%d (LDIMM64) has unexpected form\n",
1: +              prog->name, relo_idx, insn_idx);
1: +      return -EINVAL;
1: +    }
1: +
1: +    imm = insn[0].imm + ((__u64)insn[1].imm << 32);
1: +    if (res->validate && imm != orig_val) {
1: +      pr_warn(
1: +          "prog '%s': relo #%d: unexpected insn #%d (LDIMM64) value: got %llu, "
1: +          "exp %u -> %u\n",
1: +          prog->name, relo_idx, insn_idx, (unsigned long long)imm, orig_val,
1: +          new_val);
1: +      return -EINVAL;
1: +    }
1: +
1: +    insn[0].imm = new_val;
1: +    insn[1].imm = 0; /* currently only 32-bit values are supported */
1: +    pr_debug(
1: +        "prog '%s': relo #%d: patched insn #%d (LDIMM64) imm64 %llu -> %u\n",
1: +        prog->name, relo_idx, insn_idx, (unsigned long long)imm, new_val);
1: +    break;
1: +  }
1: +  default:
1: +    pr_warn(
1: +        "prog '%s': relo #%d: trying to relocate unrecognized insn #%d, "
1: +        "code:0x%x, src:0x%x, dst:0x%x, off:0x%x, imm:0x%x\n",
1: +        prog->name, relo_idx, insn_idx, insn->code, insn->src_reg,
1: +        insn->dst_reg, insn->off, insn->imm);
1: +    return -EINVAL;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  /* Output spec definition in the format:
1:   * [<type-id>] (<type-name>) + <raw-spec> => <offset>@<spec>,
1:   * where <spec> is a C-syntax view of recorded field access, e.g.: x.a[3].b
1:   */
1: -static void bpf_core_dump_spec(int level, const struct bpf_core_spec *spec)
1: -{
1: -	const struct btf_type *t;
1: -	const struct btf_enum *e;
1: -	const char *s;
1: -	__u32 type_id;
1: -	int i;
1: +static void bpf_core_dump_spec(int level, const struct bpf_core_spec *spec) {
1: +  const struct btf_type *t;
1: +  const struct btf_enum *e;
1: +  const char *s;
1: +  __u32 type_id;
1: +  int i;
1:  
1: -	type_id = spec->root_type_id;
1: -	t = btf__type_by_id(spec->btf, type_id);
1: -	s = btf__name_by_offset(spec->btf, t->name_off);
1: +  type_id = spec->root_type_id;
1: +  t = btf__type_by_id(spec->btf, type_id);
1: +  s = btf__name_by_offset(spec->btf, t->name_off);
1:  
1: -	libbpf_print(level, "[%u] %s %s", type_id, btf_kind_str(t), str_is_empty(s) ? "<anon>" : s);
1: +  libbpf_print(level, "[%u] %s %s", type_id, btf_kind_str(t),
1: +               str_is_empty(s) ? "<anon>" : s);
1:  
1: -	if (core_relo_is_type_based(spec->relo_kind))
1: -		return;
1: +  if (core_relo_is_type_based(spec->relo_kind))
1: +    return;
1:  
1: -	if (core_relo_is_enumval_based(spec->relo_kind)) {
1: -		t = skip_mods_and_typedefs(spec->btf, type_id, NULL);
1: -		e = btf_enum(t) + spec->raw_spec[0];
1: -		s = btf__name_by_offset(spec->btf, e->name_off);
1: +  if (core_relo_is_enumval_based(spec->relo_kind)) {
1: +    t = skip_mods_and_typedefs(spec->btf, type_id, NULL);
1: +    e = btf_enum(t) + spec->raw_spec[0];
1: +    s = btf__name_by_offset(spec->btf, e->name_off);
1:  
1: -		libbpf_print(level, "::%s = %u", s, e->val);
1: -		return;
1: -	}
1: +    libbpf_print(level, "::%s = %u", s, e->val);
1: +    return;
1: +  }
1:  
1: -	if (core_relo_is_field_based(spec->relo_kind)) {
1: -		for (i = 0; i < spec->len; i++) {
1: -			if (spec->spec[i].name)
1: -				libbpf_print(level, ".%s", spec->spec[i].name);
1: -			else if (i > 0 || spec->spec[i].idx > 0)
1: -				libbpf_print(level, "[%u]", spec->spec[i].idx);
1: -		}
1: +  if (core_relo_is_field_based(spec->relo_kind)) {
1: +    for (i = 0; i < spec->len; i++) {
1: +      if (spec->spec[i].name)
1: +        libbpf_print(level, ".%s", spec->spec[i].name);
1: +      else if (i > 0 || spec->spec[i].idx > 0)
1: +        libbpf_print(level, "[%u]", spec->spec[i].idx);
1: +    }
1:  
1: -		libbpf_print(level, " (");
1: -		for (i = 0; i < spec->raw_len; i++)
1: -			libbpf_print(level, "%s%d", i == 0 ? "" : ":", spec->raw_spec[i]);
1: +    libbpf_print(level, " (");
1: +    for (i = 0; i < spec->raw_len; i++)
1: +      libbpf_print(level, "%s%d", i == 0 ? "" : ":", spec->raw_spec[i]);
1:  
1: -		if (spec->bit_offset % 8)
1: -			libbpf_print(level, " @ offset %u.%u)",
1: -				     spec->bit_offset / 8, spec->bit_offset % 8);
1: -		else
1: -			libbpf_print(level, " @ offset %u)", spec->bit_offset / 8);
1: -		return;
1: -	}
1: +    if (spec->bit_offset % 8)
1: +      libbpf_print(level, " @ offset %u.%u)", spec->bit_offset / 8,
1: +                   spec->bit_offset % 8);
1: +    else
1: +      libbpf_print(level, " @ offset %u)", spec->bit_offset / 8);
1: +    return;
1: +  }
1:  }
1:  
1: -static size_t bpf_core_hash_fn(const void *key, void *ctx)
1: -{
1: -	return (size_t)key;
1: +static size_t bpf_core_hash_fn(const void *key, void *ctx) {
1: +  return (size_t)key;
1:  }
1:  
1: -static bool bpf_core_equal_fn(const void *k1, const void *k2, void *ctx)
1: -{
1: -	return k1 == k2;
1: +static bool bpf_core_equal_fn(const void *k1, const void *k2, void *ctx) {
1: +  return k1 == k2;
1:  }
1:  
1: -static void *u32_as_hash_key(__u32 x)
1: -{
1: -	return (void *)(uintptr_t)x;
1: -}
1: +static void *u32_as_hash_key(__u32 x) { return (void *)(uintptr_t)x; }
1:  
1:  /*
1:   * CO-RE relocate single instruction.
1: @@ -6177,272 +6068,278 @@ static void *u32_as_hash_key(__u32 x)
1:   *    of the candidates are pruned due to structural incompatibility.
1:   */
1:  static int bpf_core_apply_relo(struct bpf_program *prog,
1: -			       const struct bpf_core_relo *relo,
1: -			       int relo_idx,
1: -			       const struct btf *local_btf,
1: -			       struct hashmap *cand_cache)
1: -{
1: -	struct bpf_core_spec local_spec, cand_spec, targ_spec = {};
1: -	const void *type_key = u32_as_hash_key(relo->type_id);
1: -	struct bpf_core_relo_res cand_res, targ_res;
1: -	const struct btf_type *local_type;
1: -	const char *local_name;
1: -	struct core_cand_list *cands = NULL;
1: -	__u32 local_id;
1: -	const char *spec_str;
1: -	int i, j, err;
1: -
1: -	local_id = relo->type_id;
1: -	local_type = btf__type_by_id(local_btf, local_id);
1: -	if (!local_type)
1: -		return -EINVAL;
1: -
1: -	local_name = btf__name_by_offset(local_btf, local_type->name_off);
1: -	if (!local_name)
1: -		return -EINVAL;
1: -
1: -	spec_str = btf__name_by_offset(local_btf, relo->access_str_off);
1: -	if (str_is_empty(spec_str))
1: -		return -EINVAL;
1: -
1: -	if (prog->obj->gen_loader) {
1: -		pr_warn("// TODO core_relo: prog %td insn[%d] %s %s kind %d\n",
1: -			prog - prog->obj->programs, relo->insn_off / 8,
1: -			local_name, spec_str, relo->kind);
1: -		return -ENOTSUP;
1: -	}
1: -	err = bpf_core_parse_spec(local_btf, local_id, spec_str, relo->kind, &local_spec);
1: -	if (err) {
1: -		pr_warn("prog '%s': relo #%d: parsing [%d] %s %s + %s failed: %d\n",
1: -			prog->name, relo_idx, local_id, btf_kind_str(local_type),
1: -			str_is_empty(local_name) ? "<anon>" : local_name,
1: -			spec_str, err);
1: -		return -EINVAL;
1: -	}
1: -
1: -	pr_debug("prog '%s': relo #%d: kind <%s> (%d), spec is ", prog->name,
1: -		 relo_idx, core_relo_kind_str(relo->kind), relo->kind);
1: -	bpf_core_dump_spec(LIBBPF_DEBUG, &local_spec);
1: -	libbpf_print(LIBBPF_DEBUG, "\n");
1: -
1: -	/* TYPE_ID_LOCAL relo is special and doesn't need candidate search */
1: -	if (relo->kind == BPF_TYPE_ID_LOCAL) {
1: -		targ_res.validate = true;
1: -		targ_res.poison = false;
1: -		targ_res.orig_val = local_spec.root_type_id;
1: -		targ_res.new_val = local_spec.root_type_id;
1: -		goto patch_insn;
1: -	}
1: -
1: -	/* libbpf doesn't support candidate search for anonymous types */
1: -	if (str_is_empty(spec_str)) {
1: -		pr_warn("prog '%s': relo #%d: <%s> (%d) relocation doesn't support anonymous types\n",
1: -			prog->name, relo_idx, core_relo_kind_str(relo->kind), relo->kind);
1: -		return -EOPNOTSUPP;
1: -	}
1: -
1: -	if (!hashmap__find(cand_cache, type_key, (void **)&cands)) {
1: -		cands = bpf_core_find_cands(prog->obj, local_btf, local_id);
1: -		if (IS_ERR(cands)) {
1: -			pr_warn("prog '%s': relo #%d: target candidate search failed for [%d] %s %s: %ld\n",
1: -				prog->name, relo_idx, local_id, btf_kind_str(local_type),
1: -				local_name, PTR_ERR(cands));
1: -			return PTR_ERR(cands);
1: -		}
1: -		err = hashmap__set(cand_cache, type_key, cands, NULL, NULL);
1: -		if (err) {
1: -			bpf_core_free_cands(cands);
1: -			return err;
1: -		}
1: -	}
1: -
1: -	for (i = 0, j = 0; i < cands->len; i++) {
1: -		err = bpf_core_spec_match(&local_spec, cands->cands[i].btf,
1: -					  cands->cands[i].id, &cand_spec);
1: -		if (err < 0) {
1: -			pr_warn("prog '%s': relo #%d: error matching candidate #%d ",
1: -				prog->name, relo_idx, i);
1: -			bpf_core_dump_spec(LIBBPF_WARN, &cand_spec);
1: -			libbpf_print(LIBBPF_WARN, ": %d\n", err);
1: -			return err;
1: -		}
1: -
1: -		pr_debug("prog '%s': relo #%d: %s candidate #%d ", prog->name,
1: -			 relo_idx, err == 0 ? "non-matching" : "matching", i);
1: -		bpf_core_dump_spec(LIBBPF_DEBUG, &cand_spec);
1: -		libbpf_print(LIBBPF_DEBUG, "\n");
1: -
1: -		if (err == 0)
1: -			continue;
1: -
1: -		err = bpf_core_calc_relo(prog, relo, relo_idx, &local_spec, &cand_spec, &cand_res);
1: -		if (err)
1: -			return err;
1: -
1: -		if (j == 0) {
1: -			targ_res = cand_res;
1: -			targ_spec = cand_spec;
1: -		} else if (cand_spec.bit_offset != targ_spec.bit_offset) {
1: -			/* if there are many field relo candidates, they
1: -			 * should all resolve to the same bit offset
1: -			 */
1: -			pr_warn("prog '%s': relo #%d: field offset ambiguity: %u != %u\n",
1: -				prog->name, relo_idx, cand_spec.bit_offset,
1: -				targ_spec.bit_offset);
1: -			return -EINVAL;
1: -		} else if (cand_res.poison != targ_res.poison || cand_res.new_val != targ_res.new_val) {
1: -			/* all candidates should result in the same relocation
1: -			 * decision and value, otherwise it's dangerous to
1: -			 * proceed due to ambiguity
1: -			 */
1: -			pr_warn("prog '%s': relo #%d: relocation decision ambiguity: %s %u != %s %u\n",
1: -				prog->name, relo_idx,
1: -				cand_res.poison ? "failure" : "success", cand_res.new_val,
1: -				targ_res.poison ? "failure" : "success", targ_res.new_val);
1: -			return -EINVAL;
1: -		}
1: -
1: -		cands->cands[j++] = cands->cands[i];
1: -	}
1: -
1: -	/*
1: -	 * For BPF_FIELD_EXISTS relo or when used BPF program has field
1: -	 * existence checks or kernel version/config checks, it's expected
1: -	 * that we might not find any candidates. In this case, if field
1: -	 * wasn't found in any candidate, the list of candidates shouldn't
1: -	 * change at all, we'll just handle relocating appropriately,
1: -	 * depending on relo's kind.
1: -	 */
1: -	if (j > 0)
1: -		cands->len = j;
1: -
1: -	/*
1: -	 * If no candidates were found, it might be both a programmer error,
1: -	 * as well as expected case, depending whether instruction w/
1: -	 * relocation is guarded in some way that makes it unreachable (dead
1: -	 * code) if relocation can't be resolved. This is handled in
1: -	 * bpf_core_patch_insn() uniformly by replacing that instruction with
1: -	 * BPF helper call insn (using invalid helper ID). If that instruction
1: -	 * is indeed unreachable, then it will be ignored and eliminated by
1: -	 * verifier. If it was an error, then verifier will complain and point
1: -	 * to a specific instruction number in its log.
1: -	 */
1: -	if (j == 0) {
1: -		pr_debug("prog '%s': relo #%d: no matching targets found\n",
1: -			 prog->name, relo_idx);
1: -
1: -		/* calculate single target relo result explicitly */
1: -		err = bpf_core_calc_relo(prog, relo, relo_idx, &local_spec, NULL, &targ_res);
1: -		if (err)
1: -			return err;
1: -	}
1: +                               const struct bpf_core_relo *relo, int relo_idx,
1: +                               const struct btf *local_btf,
1: +                               struct hashmap *cand_cache) {
1: +  struct bpf_core_spec local_spec, cand_spec, targ_spec = {};
1: +  const void *type_key = u32_as_hash_key(relo->type_id);
1: +  struct bpf_core_relo_res cand_res, targ_res;
1: +  const struct btf_type *local_type;
1: +  const char *local_name;
1: +  struct core_cand_list *cands = NULL;
1: +  __u32 local_id;
1: +  const char *spec_str;
1: +  int i, j, err;
1: +
1: +  local_id = relo->type_id;
1: +  local_type = btf__type_by_id(local_btf, local_id);
1: +  if (!local_type)
1: +    return -EINVAL;
1: +
1: +  local_name = btf__name_by_offset(local_btf, local_type->name_off);
1: +  if (!local_name)
1: +    return -EINVAL;
1: +
1: +  spec_str = btf__name_by_offset(local_btf, relo->access_str_off);
1: +  if (str_is_empty(spec_str))
1: +    return -EINVAL;
1: +
1: +  if (prog->obj->gen_loader) {
1: +    pr_warn("// TODO core_relo: prog %td insn[%d] %s %s kind %d\n",
1: +            prog - prog->obj->programs, relo->insn_off / 8, local_name,
1: +            spec_str, relo->kind);
1: +    return -ENOTSUP;
1: +  }
1: +  err = bpf_core_parse_spec(local_btf, local_id, spec_str, relo->kind,
1: +                            &local_spec);
1: +  if (err) {
1: +    pr_warn("prog '%s': relo #%d: parsing [%d] %s %s + %s failed: %d\n",
1: +            prog->name, relo_idx, local_id, btf_kind_str(local_type),
1: +            str_is_empty(local_name) ? "<anon>" : local_name, spec_str, err);
1: +    return -EINVAL;
1: +  }
1: +
1: +  pr_debug("prog '%s': relo #%d: kind <%s> (%d), spec is ", prog->name,
1: +           relo_idx, core_relo_kind_str(relo->kind), relo->kind);
1: +  bpf_core_dump_spec(LIBBPF_DEBUG, &local_spec);
1: +  libbpf_print(LIBBPF_DEBUG, "\n");
1: +
1: +  /* TYPE_ID_LOCAL relo is special and doesn't need candidate search */
1: +  if (relo->kind == BPF_TYPE_ID_LOCAL) {
1: +    targ_res.validate = true;
1: +    targ_res.poison = false;
1: +    targ_res.orig_val = local_spec.root_type_id;
1: +    targ_res.new_val = local_spec.root_type_id;
1: +    goto patch_insn;
1: +  }
1: +
1: +  /* libbpf doesn't support candidate search for anonymous types */
1: +  if (str_is_empty(spec_str)) {
1: +    pr_warn(
1: +        "prog '%s': relo #%d: <%s> (%d) relocation doesn't support anonymous "
1: +        "types\n",
1: +        prog->name, relo_idx, core_relo_kind_str(relo->kind), relo->kind);
1: +    return -EOPNOTSUPP;
1: +  }
1: +
1: +  if (!hashmap__find(cand_cache, type_key, (void **)&cands)) {
1: +    cands = bpf_core_find_cands(prog->obj, local_btf, local_id);
1: +    if (IS_ERR(cands)) {
1: +      pr_warn(
1: +          "prog '%s': relo #%d: target candidate search failed for [%d] %s %s: "
1: +          "%ld\n",
1: +          prog->name, relo_idx, local_id, btf_kind_str(local_type), local_name,
1: +          PTR_ERR(cands));
1: +      return PTR_ERR(cands);
1: +    }
1: +    err = hashmap__set(cand_cache, type_key, cands, NULL, NULL);
1: +    if (err) {
1: +      bpf_core_free_cands(cands);
1: +      return err;
1: +    }
1: +  }
1: +
1: +  for (i = 0, j = 0; i < cands->len; i++) {
1: +    err = bpf_core_spec_match(&local_spec, cands->cands[i].btf,
1: +                              cands->cands[i].id, &cand_spec);
1: +    if (err < 0) {
1: +      pr_warn("prog '%s': relo #%d: error matching candidate #%d ", prog->name,
1: +              relo_idx, i);
1: +      bpf_core_dump_spec(LIBBPF_WARN, &cand_spec);
1: +      libbpf_print(LIBBPF_WARN, ": %d\n", err);
1: +      return err;
1: +    }
1: +
1: +    pr_debug("prog '%s': relo #%d: %s candidate #%d ", prog->name, relo_idx,
1: +             err == 0 ? "non-matching" : "matching", i);
1: +    bpf_core_dump_spec(LIBBPF_DEBUG, &cand_spec);
1: +    libbpf_print(LIBBPF_DEBUG, "\n");
1: +
1: +    if (err == 0)
1: +      continue;
1: +
1: +    err = bpf_core_calc_relo(prog, relo, relo_idx, &local_spec, &cand_spec,
1: +                             &cand_res);
1: +    if (err)
1: +      return err;
1: +
1: +    if (j == 0) {
1: +      targ_res = cand_res;
1: +      targ_spec = cand_spec;
1: +    } else if (cand_spec.bit_offset != targ_spec.bit_offset) {
1: +      /* if there are many field relo candidates, they
1: +       * should all resolve to the same bit offset
1: +       */
1: +      pr_warn("prog '%s': relo #%d: field offset ambiguity: %u != %u\n",
1: +              prog->name, relo_idx, cand_spec.bit_offset, targ_spec.bit_offset);
1: +      return -EINVAL;
1: +    } else if (cand_res.poison != targ_res.poison ||
1: +               cand_res.new_val != targ_res.new_val) {
1: +      /* all candidates should result in the same relocation
1: +       * decision and value, otherwise it's dangerous to
1: +       * proceed due to ambiguity
1: +       */
1: +      pr_warn(
1: +          "prog '%s': relo #%d: relocation decision ambiguity: %s %u != %s "
1: +          "%u\n",
1: +          prog->name, relo_idx, cand_res.poison ? "failure" : "success",
1: +          cand_res.new_val, targ_res.poison ? "failure" : "success",
1: +          targ_res.new_val);
1: +      return -EINVAL;
1: +    }
1: +
1: +    cands->cands[j++] = cands->cands[i];
1: +  }
1: +
1: +  /*
1: +   * For BPF_FIELD_EXISTS relo or when used BPF program has field
1: +   * existence checks or kernel version/config checks, it's expected
1: +   * that we might not find any candidates. In this case, if field
1: +   * wasn't found in any candidate, the list of candidates shouldn't
1: +   * change at all, we'll just handle relocating appropriately,
1: +   * depending on relo's kind.
1: +   */
1: +  if (j > 0)
1: +    cands->len = j;
1: +
1: +  /*
1: +   * If no candidates were found, it might be both a programmer error,
1: +   * as well as expected case, depending whether instruction w/
1: +   * relocation is guarded in some way that makes it unreachable (dead
1: +   * code) if relocation can't be resolved. This is handled in
1: +   * bpf_core_patch_insn() uniformly by replacing that instruction with
1: +   * BPF helper call insn (using invalid helper ID). If that instruction
1: +   * is indeed unreachable, then it will be ignored and eliminated by
1: +   * verifier. If it was an error, then verifier will complain and point
1: +   * to a specific instruction number in its log.
1: +   */
1: +  if (j == 0) {
1: +    pr_debug("prog '%s': relo #%d: no matching targets found\n", prog->name,
1: +             relo_idx);
1: +
1: +    /* calculate single target relo result explicitly */
1: +    err =
1: +        bpf_core_calc_relo(prog, relo, relo_idx, &local_spec, NULL, &targ_res);
1: +    if (err)
1: +      return err;
1: +  }
1:  
1:  patch_insn:
1: -	/* bpf_core_patch_insn() should know how to handle missing targ_spec */
1: -	err = bpf_core_patch_insn(prog, relo, relo_idx, &targ_res);
1: -	if (err) {
1: -		pr_warn("prog '%s': relo #%d: failed to patch insn #%zu: %d\n",
1: -			prog->name, relo_idx, relo->insn_off / BPF_INSN_SZ, err);
1: -		return -EINVAL;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int
1: -bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path)
1: -{
1: -	const struct btf_ext_info_sec *sec;
1: -	const struct bpf_core_relo *rec;
1: -	const struct btf_ext_info *seg;
1: -	struct hashmap_entry *entry;
1: -	struct hashmap *cand_cache = NULL;
1: -	struct bpf_program *prog;
1: -	const char *sec_name;
1: -	int i, err = 0, insn_idx, sec_idx;
1: -
1: -	if (obj->btf_ext->core_relo_info.len == 0)
1: -		return 0;
1: -
1: -	if (targ_btf_path) {
1: -		obj->btf_vmlinux_override = btf__parse(targ_btf_path, NULL);
1: -		err = libbpf_get_error(obj->btf_vmlinux_override);
1: -		if (err) {
1: -			pr_warn("failed to parse target BTF: %d\n", err);
1: -			return err;
1: -		}
1: -	}
1: -
1: -	cand_cache = hashmap__new(bpf_core_hash_fn, bpf_core_equal_fn, NULL);
1: -	if (IS_ERR(cand_cache)) {
1: -		err = PTR_ERR(cand_cache);
1: -		goto out;
1: -	}
1: -
1: -	seg = &obj->btf_ext->core_relo_info;
1: -	for_each_btf_ext_sec(seg, sec) {
1: -		sec_name = btf__name_by_offset(obj->btf, sec->sec_name_off);
1: -		if (str_is_empty(sec_name)) {
1: -			err = -EINVAL;
1: -			goto out;
1: -		}
1: -		/* bpf_object's ELF is gone by now so it's not easy to find
1: -		 * section index by section name, but we can find *any*
1: -		 * bpf_program within desired section name and use it's
1: -		 * prog->sec_idx to do a proper search by section index and
1: -		 * instruction offset
1: -		 */
1: -		prog = NULL;
1: -		for (i = 0; i < obj->nr_programs; i++) {
1: -			prog = &obj->programs[i];
1: -			if (strcmp(prog->sec_name, sec_name) == 0)
1: -				break;
1: -		}
1: -		if (!prog) {
1: -			pr_warn("sec '%s': failed to find a BPF program\n", sec_name);
1: -			return -ENOENT;
1: -		}
1: -		sec_idx = prog->sec_idx;
1: -
1: -		pr_debug("sec '%s': found %d CO-RE relocations\n",
1: -			 sec_name, sec->num_info);
1: -
1: -		for_each_btf_ext_rec(seg, sec, i, rec) {
1: -			insn_idx = rec->insn_off / BPF_INSN_SZ;
1: -			prog = find_prog_by_sec_insn(obj, sec_idx, insn_idx);
1: -			if (!prog) {
1: -				pr_warn("sec '%s': failed to find program at insn #%d for CO-RE offset relocation #%d\n",
1: -					sec_name, insn_idx, i);
1: -				err = -EINVAL;
1: -				goto out;
1: -			}
1: -			/* no need to apply CO-RE relocation if the program is
1: -			 * not going to be loaded
1: -			 */
1: -			if (!prog->load)
1: -				continue;
1: -
1: -			err = bpf_core_apply_relo(prog, rec, i, obj->btf, cand_cache);
1: -			if (err) {
1: -				pr_warn("prog '%s': relo #%d: failed to relocate: %d\n",
1: -					prog->name, i, err);
1: -				goto out;
1: -			}
1: -		}
1: -	}
1: +  /* bpf_core_patch_insn() should know how to handle missing targ_spec */
1: +  err = bpf_core_patch_insn(prog, relo, relo_idx, &targ_res);
1: +  if (err) {
1: +    pr_warn("prog '%s': relo #%d: failed to patch insn #%zu: %d\n", prog->name,
1: +            relo_idx, relo->insn_off / BPF_INSN_SZ, err);
1: +    return -EINVAL;
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__relocate_core(struct bpf_object *obj,
1: +                                     const char *targ_btf_path) {
1: +  const struct btf_ext_info_sec *sec;
1: +  const struct bpf_core_relo *rec;
1: +  const struct btf_ext_info *seg;
1: +  struct hashmap_entry *entry;
1: +  struct hashmap *cand_cache = NULL;
1: +  struct bpf_program *prog;
1: +  const char *sec_name;
1: +  int i, err = 0, insn_idx, sec_idx;
1: +
1: +  if (obj->btf_ext->core_relo_info.len == 0)
1: +    return 0;
1: +
1: +  if (targ_btf_path) {
1: +    obj->btf_vmlinux_override = btf__parse(targ_btf_path, NULL);
1: +    err = libbpf_get_error(obj->btf_vmlinux_override);
1: +    if (err) {
1: +      pr_warn("failed to parse target BTF: %d\n", err);
1: +      return err;
1: +    }
1: +  }
1: +
1: +  cand_cache = hashmap__new(bpf_core_hash_fn, bpf_core_equal_fn, NULL);
1: +  if (IS_ERR(cand_cache)) {
1: +    err = PTR_ERR(cand_cache);
1: +    goto out;
1: +  }
1: +
1: +  seg = &obj->btf_ext->core_relo_info;
1: +  for_each_btf_ext_sec(seg, sec) {
1: +    sec_name = btf__name_by_offset(obj->btf, sec->sec_name_off);
1: +    if (str_is_empty(sec_name)) {
1: +      err = -EINVAL;
1: +      goto out;
1: +    }
1: +    /* bpf_object's ELF is gone by now so it's not easy to find
1: +     * section index by section name, but we can find *any*
1: +     * bpf_program within desired section name and use it's
1: +     * prog->sec_idx to do a proper search by section index and
1: +     * instruction offset
1: +     */
1: +    prog = NULL;
1: +    for (i = 0; i < obj->nr_programs; i++) {
1: +      prog = &obj->programs[i];
1: +      if (strcmp(prog->sec_name, sec_name) == 0)
1: +        break;
1: +    }
1: +    if (!prog) {
1: +      pr_warn("sec '%s': failed to find a BPF program\n", sec_name);
1: +      return -ENOENT;
1: +    }
1: +    sec_idx = prog->sec_idx;
1: +
1: +    pr_debug("sec '%s': found %d CO-RE relocations\n", sec_name, sec->num_info);
1: +
1: +    for_each_btf_ext_rec(seg, sec, i, rec) {
1: +      insn_idx = rec->insn_off / BPF_INSN_SZ;
1: +      prog = find_prog_by_sec_insn(obj, sec_idx, insn_idx);
1: +      if (!prog) {
1: +        pr_warn(
1: +            "sec '%s': failed to find program at insn #%d for CO-RE offset "
1: +            "relocation #%d\n",
1: +            sec_name, insn_idx, i);
1: +        err = -EINVAL;
1: +        goto out;
1: +      }
1: +      /* no need to apply CO-RE relocation if the program is
1: +       * not going to be loaded
1: +       */
1: +      if (!prog->load)
1: +        continue;
1: +
1: +      err = bpf_core_apply_relo(prog, rec, i, obj->btf, cand_cache);
1: +      if (err) {
1: +        pr_warn("prog '%s': relo #%d: failed to relocate: %d\n", prog->name, i,
1: +                err);
1: +        goto out;
1: +      }
1: +    }
1: +  }
1:  
1:  out:
1: -	/* obj->btf_vmlinux and module BTFs are freed after object load */
1: -	btf__free(obj->btf_vmlinux_override);
1: -	obj->btf_vmlinux_override = NULL;
1: +  /* obj->btf_vmlinux and module BTFs are freed after object load */
1: +  btf__free(obj->btf_vmlinux_override);
1: +  obj->btf_vmlinux_override = NULL;
1:  
1: -	if (!IS_ERR_OR_NULL(cand_cache)) {
1: -		hashmap__for_each_entry(cand_cache, entry, i) {
1: -			bpf_core_free_cands(entry->value);
1: -		}
1: -		hashmap__free(cand_cache);
1: -	}
1: -	return err;
1: +  if (!IS_ERR_OR_NULL(cand_cache)) {
1: +    hashmap__for_each_entry(cand_cache, entry, i) {
1: +      bpf_core_free_cands(entry->value);
1: +    }
1: +    hashmap__free(cand_cache);
1: +  }
1: +  return err;
1:  }
1:  
1:  /* Relocate data references within program code:
1: @@ -6450,389 +6347,386 @@ out:
1:   *  - global variable references;
1:   *  - extern references.
1:   */
1: -static int
1: -bpf_object__relocate_data(struct bpf_object *obj, struct bpf_program *prog)
1: -{
1: -	int i;
1: -
1: -	for (i = 0; i < prog->nr_reloc; i++) {
1: -		struct reloc_desc *relo = &prog->reloc_desc[i];
1: -		struct bpf_insn *insn = &prog->insns[relo->insn_idx];
1: -		struct extern_desc *ext;
1: -
1: -		switch (relo->type) {
1: -		case RELO_LD64:
1: -			if (obj->gen_loader) {
1: -				insn[0].src_reg = BPF_PSEUDO_MAP_IDX;
1: -				insn[0].imm = relo->map_idx;
1: -			} else {
1: -				insn[0].src_reg = BPF_PSEUDO_MAP_FD;
1: -				insn[0].imm = obj->maps[relo->map_idx].fd;
1: -			}
1: -			break;
1: -		case RELO_DATA:
1: -			insn[1].imm = insn[0].imm + relo->sym_off;
1: -			if (obj->gen_loader) {
1: -				insn[0].src_reg = BPF_PSEUDO_MAP_IDX_VALUE;
1: -				insn[0].imm = relo->map_idx;
1: -			} else {
1: -				insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;
1: -				insn[0].imm = obj->maps[relo->map_idx].fd;
1: -			}
1: -			break;
1: -		case RELO_EXTERN_VAR:
1: -			ext = &obj->externs[relo->sym_off];
1: -			if (ext->type == EXT_KCFG) {
1: -				if (obj->gen_loader) {
1: -					insn[0].src_reg = BPF_PSEUDO_MAP_IDX_VALUE;
1: -					insn[0].imm = obj->kconfig_map_idx;
1: -				} else {
1: -					insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;
1: -					insn[0].imm = obj->maps[obj->kconfig_map_idx].fd;
1: -				}
1: -				insn[1].imm = ext->kcfg.data_off;
1: -			} else /* EXT_KSYM */ {
1: -				if (ext->ksym.type_id) { /* typed ksyms */
1: -					insn[0].src_reg = BPF_PSEUDO_BTF_ID;
1: -					insn[0].imm = ext->ksym.kernel_btf_id;
1: -					insn[1].imm = ext->ksym.kernel_btf_obj_fd;
1: -				} else { /* typeless ksyms */
1: -					insn[0].imm = (__u32)ext->ksym.addr;
1: -					insn[1].imm = ext->ksym.addr >> 32;
1: -				}
1: -			}
1: -			break;
1: -		case RELO_EXTERN_FUNC:
1: -			ext = &obj->externs[relo->sym_off];
1: -			insn[0].src_reg = BPF_PSEUDO_KFUNC_CALL;
1: -			insn[0].imm = ext->ksym.kernel_btf_id;
1: -			break;
1: -		case RELO_SUBPROG_ADDR:
1: -			if (insn[0].src_reg != BPF_PSEUDO_FUNC) {
1: -				pr_warn("prog '%s': relo #%d: bad insn\n",
1: -					prog->name, i);
1: -				return -EINVAL;
1: -			}
1: -			/* handled already */
1: -			break;
1: -		case RELO_CALL:
1: -			/* handled already */
1: -			break;
1: -		default:
1: -			pr_warn("prog '%s': relo #%d: bad relo type %d\n",
1: -				prog->name, i, relo->type);
1: -			return -EINVAL;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int bpf_object__relocate_data(struct bpf_object *obj,
1: +                                     struct bpf_program *prog) {
1: +  int i;
1: +
1: +  for (i = 0; i < prog->nr_reloc; i++) {
1: +    struct reloc_desc *relo = &prog->reloc_desc[i];
1: +    struct bpf_insn *insn = &prog->insns[relo->insn_idx];
1: +    struct extern_desc *ext;
1: +
1: +    switch (relo->type) {
1: +    case RELO_LD64:
1: +      if (obj->gen_loader) {
1: +        insn[0].src_reg = BPF_PSEUDO_MAP_IDX;
1: +        insn[0].imm = relo->map_idx;
1: +      } else {
1: +        insn[0].src_reg = BPF_PSEUDO_MAP_FD;
1: +        insn[0].imm = obj->maps[relo->map_idx].fd;
1: +      }
1: +      break;
1: +    case RELO_DATA:
1: +      insn[1].imm = insn[0].imm + relo->sym_off;
1: +      if (obj->gen_loader) {
1: +        insn[0].src_reg = BPF_PSEUDO_MAP_IDX_VALUE;
1: +        insn[0].imm = relo->map_idx;
1: +      } else {
1: +        insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;
1: +        insn[0].imm = obj->maps[relo->map_idx].fd;
1: +      }
1: +      break;
1: +    case RELO_EXTERN_VAR:
1: +      ext = &obj->externs[relo->sym_off];
1: +      if (ext->type == EXT_KCFG) {
1: +        if (obj->gen_loader) {
1: +          insn[0].src_reg = BPF_PSEUDO_MAP_IDX_VALUE;
1: +          insn[0].imm = obj->kconfig_map_idx;
1: +        } else {
1: +          insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;
1: +          insn[0].imm = obj->maps[obj->kconfig_map_idx].fd;
1: +        }
1: +        insn[1].imm = ext->kcfg.data_off;
1: +      } else /* EXT_KSYM */ {
1: +        if (ext->ksym.type_id) { /* typed ksyms */
1: +          insn[0].src_reg = BPF_PSEUDO_BTF_ID;
1: +          insn[0].imm = ext->ksym.kernel_btf_id;
1: +          insn[1].imm = ext->ksym.kernel_btf_obj_fd;
1: +        } else { /* typeless ksyms */
1: +          insn[0].imm = (__u32)ext->ksym.addr;
1: +          insn[1].imm = ext->ksym.addr >> 32;
1: +        }
1: +      }
1: +      break;
1: +    case RELO_EXTERN_FUNC:
1: +      ext = &obj->externs[relo->sym_off];
1: +      insn[0].src_reg = BPF_PSEUDO_KFUNC_CALL;
1: +      insn[0].imm = ext->ksym.kernel_btf_id;
1: +      break;
1: +    case RELO_SUBPROG_ADDR:
1: +      if (insn[0].src_reg != BPF_PSEUDO_FUNC) {
1: +        pr_warn("prog '%s': relo #%d: bad insn\n", prog->name, i);
1: +        return -EINVAL;
1: +      }
1: +      /* handled already */
1: +      break;
1: +    case RELO_CALL:
1: +      /* handled already */
1: +      break;
1: +    default:
1: +      pr_warn("prog '%s': relo #%d: bad relo type %d\n", prog->name, i,
1: +              relo->type);
1: +      return -EINVAL;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  static int adjust_prog_btf_ext_info(const struct bpf_object *obj,
1: -				    const struct bpf_program *prog,
1: -				    const struct btf_ext_info *ext_info,
1: -				    void **prog_info, __u32 *prog_rec_cnt,
1: -				    __u32 *prog_rec_sz)
1: -{
1: -	void *copy_start = NULL, *copy_end = NULL;
1: -	void *rec, *rec_end, *new_prog_info;
1: -	const struct btf_ext_info_sec *sec;
1: -	size_t old_sz, new_sz;
1: -	const char *sec_name;
1: -	int i, off_adj;
1: -
1: -	for_each_btf_ext_sec(ext_info, sec) {
1: -		sec_name = btf__name_by_offset(obj->btf, sec->sec_name_off);
1: -		if (!sec_name)
1: -			return -EINVAL;
1: -		if (strcmp(sec_name, prog->sec_name) != 0)
1: -			continue;
1: -
1: -		for_each_btf_ext_rec(ext_info, sec, i, rec) {
1: -			__u32 insn_off = *(__u32 *)rec / BPF_INSN_SZ;
1: -
1: -			if (insn_off < prog->sec_insn_off)
1: -				continue;
1: -			if (insn_off >= prog->sec_insn_off + prog->sec_insn_cnt)
1: -				break;
1: -
1: -			if (!copy_start)
1: -				copy_start = rec;
1: -			copy_end = rec + ext_info->rec_size;
1: -		}
1: -
1: -		if (!copy_start)
1: -			return -ENOENT;
1: -
1: -		/* append func/line info of a given (sub-)program to the main
1: -		 * program func/line info
1: -		 */
1: -		old_sz = (size_t)(*prog_rec_cnt) * ext_info->rec_size;
1: -		new_sz = old_sz + (copy_end - copy_start);
1: -		new_prog_info = realloc(*prog_info, new_sz);
1: -		if (!new_prog_info)
1: -			return -ENOMEM;
1: -		*prog_info = new_prog_info;
1: -		*prog_rec_cnt = new_sz / ext_info->rec_size;
1: -		memcpy(new_prog_info + old_sz, copy_start, copy_end - copy_start);
1: -
1: -		/* Kernel instruction offsets are in units of 8-byte
1: -		 * instructions, while .BTF.ext instruction offsets generated
1: -		 * by Clang are in units of bytes. So convert Clang offsets
1: -		 * into kernel offsets and adjust offset according to program
1: -		 * relocated position.
1: -		 */
1: -		off_adj = prog->sub_insn_off - prog->sec_insn_off;
1: -		rec = new_prog_info + old_sz;
1: -		rec_end = new_prog_info + new_sz;
1: -		for (; rec < rec_end; rec += ext_info->rec_size) {
1: -			__u32 *insn_off = rec;
1: -
1: -			*insn_off = *insn_off / BPF_INSN_SZ + off_adj;
1: -		}
1: -		*prog_rec_sz = ext_info->rec_size;
1: -		return 0;
1: -	}
1: -
1: -	return -ENOENT;
1: -}
1: -
1: -static int
1: -reloc_prog_func_and_line_info(const struct bpf_object *obj,
1: -			      struct bpf_program *main_prog,
1: -			      const struct bpf_program *prog)
1: -{
1: -	int err;
1: -
1: -	/* no .BTF.ext relocation if .BTF.ext is missing or kernel doesn't
1: -	 * supprot func/line info
1: -	 */
1: -	if (!obj->btf_ext || !kernel_supports(obj, FEAT_BTF_FUNC))
1: -		return 0;
1: -
1: -	/* only attempt func info relocation if main program's func_info
1: -	 * relocation was successful
1: -	 */
1: -	if (main_prog != prog && !main_prog->func_info)
1: -		goto line_info;
1: -
1: -	err = adjust_prog_btf_ext_info(obj, prog, &obj->btf_ext->func_info,
1: -				       &main_prog->func_info,
1: -				       &main_prog->func_info_cnt,
1: -				       &main_prog->func_info_rec_size);
1: -	if (err) {
1: -		if (err != -ENOENT) {
1: -			pr_warn("prog '%s': error relocating .BTF.ext function info: %d\n",
1: -				prog->name, err);
1: -			return err;
1: -		}
1: -		if (main_prog->func_info) {
1: -			/*
1: -			 * Some info has already been found but has problem
1: -			 * in the last btf_ext reloc. Must have to error out.
1: -			 */
1: -			pr_warn("prog '%s': missing .BTF.ext function info.\n", prog->name);
1: -			return err;
1: -		}
1: -		/* Have problem loading the very first info. Ignore the rest. */
1: -		pr_warn("prog '%s': missing .BTF.ext function info for the main program, skipping all of .BTF.ext func info.\n",
1: -			prog->name);
1: -	}
1: +                                    const struct bpf_program *prog,
1: +                                    const struct btf_ext_info *ext_info,
1: +                                    void **prog_info, __u32 *prog_rec_cnt,
1: +                                    __u32 *prog_rec_sz) {
1: +  void *copy_start = NULL, *copy_end = NULL;
1: +  void *rec, *rec_end, *new_prog_info;
1: +  const struct btf_ext_info_sec *sec;
1: +  size_t old_sz, new_sz;
1: +  const char *sec_name;
1: +  int i, off_adj;
1: +
1: +  for_each_btf_ext_sec(ext_info, sec) {
1: +    sec_name = btf__name_by_offset(obj->btf, sec->sec_name_off);
1: +    if (!sec_name)
1: +      return -EINVAL;
1: +    if (strcmp(sec_name, prog->sec_name) != 0)
1: +      continue;
1: +
1: +    for_each_btf_ext_rec(ext_info, sec, i, rec) {
1: +      __u32 insn_off = *(__u32 *)rec / BPF_INSN_SZ;
1: +
1: +      if (insn_off < prog->sec_insn_off)
1: +        continue;
1: +      if (insn_off >= prog->sec_insn_off + prog->sec_insn_cnt)
1: +        break;
1: +
1: +      if (!copy_start)
1: +        copy_start = rec;
1: +      copy_end = rec + ext_info->rec_size;
1: +    }
1: +
1: +    if (!copy_start)
1: +      return -ENOENT;
1: +
1: +    /* append func/line info of a given (sub-)program to the main
1: +     * program func/line info
1: +     */
1: +    old_sz = (size_t)(*prog_rec_cnt) * ext_info->rec_size;
1: +    new_sz = old_sz + (copy_end - copy_start);
1: +    new_prog_info = realloc(*prog_info, new_sz);
1: +    if (!new_prog_info)
1: +      return -ENOMEM;
1: +    *prog_info = new_prog_info;
1: +    *prog_rec_cnt = new_sz / ext_info->rec_size;
1: +    memcpy(new_prog_info + old_sz, copy_start, copy_end - copy_start);
1: +
1: +    /* Kernel instruction offsets are in units of 8-byte
1: +     * instructions, while .BTF.ext instruction offsets generated
1: +     * by Clang are in units of bytes. So convert Clang offsets
1: +     * into kernel offsets and adjust offset according to program
1: +     * relocated position.
1: +     */
1: +    off_adj = prog->sub_insn_off - prog->sec_insn_off;
1: +    rec = new_prog_info + old_sz;
1: +    rec_end = new_prog_info + new_sz;
1: +    for (; rec < rec_end; rec += ext_info->rec_size) {
1: +      __u32 *insn_off = rec;
1: +
1: +      *insn_off = *insn_off / BPF_INSN_SZ + off_adj;
1: +    }
1: +    *prog_rec_sz = ext_info->rec_size;
1: +    return 0;
1: +  }
1: +
1: +  return -ENOENT;
1: +}
1: +
1: +static int reloc_prog_func_and_line_info(const struct bpf_object *obj,
1: +                                         struct bpf_program *main_prog,
1: +                                         const struct bpf_program *prog) {
1: +  int err;
1: +
1: +  /* no .BTF.ext relocation if .BTF.ext is missing or kernel doesn't
1: +   * supprot func/line info
1: +   */
1: +  if (!obj->btf_ext || !kernel_supports(obj, FEAT_BTF_FUNC))
1: +    return 0;
1: +
1: +  /* only attempt func info relocation if main program's func_info
1: +   * relocation was successful
1: +   */
1: +  if (main_prog != prog && !main_prog->func_info)
1: +    goto line_info;
1: +
1: +  err = adjust_prog_btf_ext_info(
1: +      obj, prog, &obj->btf_ext->func_info, &main_prog->func_info,
1: +      &main_prog->func_info_cnt, &main_prog->func_info_rec_size);
1: +  if (err) {
1: +    if (err != -ENOENT) {
1: +      pr_warn("prog '%s': error relocating .BTF.ext function info: %d\n",
1: +              prog->name, err);
1: +      return err;
1: +    }
1: +    if (main_prog->func_info) {
1: +      /*
1: +       * Some info has already been found but has problem
1: +       * in the last btf_ext reloc. Must have to error out.
1: +       */
1: +      pr_warn("prog '%s': missing .BTF.ext function info.\n", prog->name);
1: +      return err;
1: +    }
1: +    /* Have problem loading the very first info. Ignore the rest. */
1: +    pr_warn(
1: +        "prog '%s': missing .BTF.ext function info for the main program, "
1: +        "skipping all of .BTF.ext func info.\n",
1: +        prog->name);
1: +  }
1:  
1:  line_info:
1: -	/* don't relocate line info if main program's relocation failed */
1: -	if (main_prog != prog && !main_prog->line_info)
1: -		return 0;
1: -
1: -	err = adjust_prog_btf_ext_info(obj, prog, &obj->btf_ext->line_info,
1: -				       &main_prog->line_info,
1: -				       &main_prog->line_info_cnt,
1: -				       &main_prog->line_info_rec_size);
1: -	if (err) {
1: -		if (err != -ENOENT) {
1: -			pr_warn("prog '%s': error relocating .BTF.ext line info: %d\n",
1: -				prog->name, err);
1: -			return err;
1: -		}
1: -		if (main_prog->line_info) {
1: -			/*
1: -			 * Some info has already been found but has problem
1: -			 * in the last btf_ext reloc. Must have to error out.
1: -			 */
1: -			pr_warn("prog '%s': missing .BTF.ext line info.\n", prog->name);
1: -			return err;
1: -		}
1: -		/* Have problem loading the very first info. Ignore the rest. */
1: -		pr_warn("prog '%s': missing .BTF.ext line info for the main program, skipping all of .BTF.ext line info.\n",
1: -			prog->name);
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int cmp_relo_by_insn_idx(const void *key, const void *elem)
1: -{
1: -	size_t insn_idx = *(const size_t *)key;
1: -	const struct reloc_desc *relo = elem;
1: -
1: -	if (insn_idx == relo->insn_idx)
1: -		return 0;
1: -	return insn_idx < relo->insn_idx ? -1 : 1;
1: -}
1: -
1: -static struct reloc_desc *find_prog_insn_relo(const struct bpf_program *prog, size_t insn_idx)
1: -{
1: -	return bsearch(&insn_idx, prog->reloc_desc, prog->nr_reloc,
1: -		       sizeof(*prog->reloc_desc), cmp_relo_by_insn_idx);
1: -}
1: -
1: -static int append_subprog_relos(struct bpf_program *main_prog, struct bpf_program *subprog)
1: -{
1: -	int new_cnt = main_prog->nr_reloc + subprog->nr_reloc;
1: -	struct reloc_desc *relos;
1: -	int i;
1: -
1: -	if (main_prog == subprog)
1: -		return 0;
1: -	relos = libbpf_reallocarray(main_prog->reloc_desc, new_cnt, sizeof(*relos));
1: -	if (!relos)
1: -		return -ENOMEM;
1: -	memcpy(relos + main_prog->nr_reloc, subprog->reloc_desc,
1: -	       sizeof(*relos) * subprog->nr_reloc);
1: -
1: -	for (i = main_prog->nr_reloc; i < new_cnt; i++)
1: -		relos[i].insn_idx += subprog->sub_insn_off;
1: -	/* After insn_idx adjustment the 'relos' array is still sorted
1: -	 * by insn_idx and doesn't break bsearch.
1: -	 */
1: -	main_prog->reloc_desc = relos;
1: -	main_prog->nr_reloc = new_cnt;
1: -	return 0;
1: -}
1: -
1: -static int
1: -bpf_object__reloc_code(struct bpf_object *obj, struct bpf_program *main_prog,
1: -		       struct bpf_program *prog)
1: -{
1: -	size_t sub_insn_idx, insn_idx, new_cnt;
1: -	struct bpf_program *subprog;
1: -	struct bpf_insn *insns, *insn;
1: -	struct reloc_desc *relo;
1: -	int err;
1: -
1: -	err = reloc_prog_func_and_line_info(obj, main_prog, prog);
1: -	if (err)
1: -		return err;
1: -
1: -	for (insn_idx = 0; insn_idx < prog->sec_insn_cnt; insn_idx++) {
1: -		insn = &main_prog->insns[prog->sub_insn_off + insn_idx];
1: -		if (!insn_is_subprog_call(insn) && !insn_is_pseudo_func(insn))
1: -			continue;
1: -
1: -		relo = find_prog_insn_relo(prog, insn_idx);
1: -		if (relo && relo->type == RELO_EXTERN_FUNC)
1: -			/* kfunc relocations will be handled later
1: -			 * in bpf_object__relocate_data()
1: -			 */
1: -			continue;
1: -		if (relo && relo->type != RELO_CALL && relo->type != RELO_SUBPROG_ADDR) {
1: -			pr_warn("prog '%s': unexpected relo for insn #%zu, type %d\n",
1: -				prog->name, insn_idx, relo->type);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		if (relo) {
1: -			/* sub-program instruction index is a combination of
1: -			 * an offset of a symbol pointed to by relocation and
1: -			 * call instruction's imm field; for global functions,
1: -			 * call always has imm = -1, but for static functions
1: -			 * relocation is against STT_SECTION and insn->imm
1: -			 * points to a start of a static function
1: -			 *
1: -			 * for subprog addr relocation, the relo->sym_off + insn->imm is
1: -			 * the byte offset in the corresponding section.
1: -			 */
1: -			if (relo->type == RELO_CALL)
1: -				sub_insn_idx = relo->sym_off / BPF_INSN_SZ + insn->imm + 1;
1: -			else
1: -				sub_insn_idx = (relo->sym_off + insn->imm) / BPF_INSN_SZ;
1: -		} else if (insn_is_pseudo_func(insn)) {
1: -			/*
1: -			 * RELO_SUBPROG_ADDR relo is always emitted even if both
1: -			 * functions are in the same section, so it shouldn't reach here.
1: -			 */
1: -			pr_warn("prog '%s': missing subprog addr relo for insn #%zu\n",
1: -				prog->name, insn_idx);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		} else {
1: -			/* if subprogram call is to a static function within
1: -			 * the same ELF section, there won't be any relocation
1: -			 * emitted, but it also means there is no additional
1: -			 * offset necessary, insns->imm is relative to
1: -			 * instruction's original position within the section
1: -			 */
1: -			sub_insn_idx = prog->sec_insn_off + insn_idx + insn->imm + 1;
1: -		}
1: -
1: -		/* we enforce that sub-programs should be in .text section */
1: -		subprog = find_prog_by_sec_insn(obj, obj->efile.text_shndx, sub_insn_idx);
1: -		if (!subprog) {
1: -			pr_warn("prog '%s': no .text section found yet sub-program call exists\n",
1: -				prog->name);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -
1: -		/* if it's the first call instruction calling into this
1: -		 * subprogram (meaning this subprog hasn't been processed
1: -		 * yet) within the context of current main program:
1: -		 *   - append it at the end of main program's instructions blog;
1: -		 *   - process is recursively, while current program is put on hold;
1: -		 *   - if that subprogram calls some other not yet processes
1: -		 *   subprogram, same thing will happen recursively until
1: -		 *   there are no more unprocesses subprograms left to append
1: -		 *   and relocate.
1: -		 */
1: -		if (subprog->sub_insn_off == 0) {
1: -			subprog->sub_insn_off = main_prog->insns_cnt;
1: -
1: -			new_cnt = main_prog->insns_cnt + subprog->insns_cnt;
1: -			insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns));
1: -			if (!insns) {
1: -				pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name);
1: -				return -ENOMEM;
1: -			}
1: -			main_prog->insns = insns;
1: -			main_prog->insns_cnt = new_cnt;
1: -
1: -			memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns,
1: -			       subprog->insns_cnt * sizeof(*insns));
1: -
1: -			pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
1: -				 main_prog->name, subprog->insns_cnt, subprog->name);
1: -
1: -			/* The subprog insns are now appended. Append its relos too. */
1: -			err = append_subprog_relos(main_prog, subprog);
1: -			if (err)
1: -				return err;
1: -			err = bpf_object__reloc_code(obj, main_prog, subprog);
1: -			if (err)
1: -				return err;
1: -		}
1: -
1: -		/* main_prog->insns memory could have been re-allocated, so
1: -		 * calculate pointer again
1: -		 */
1: -		insn = &main_prog->insns[prog->sub_insn_off + insn_idx];
1: -		/* calculate correct instruction position within current main
1: -		 * prog; each main prog can have a different set of
1: -		 * subprograms appended (potentially in different order as
1: -		 * well), so position of any subprog can be different for
1: -		 * different main programs */
1: -		insn->imm = subprog->sub_insn_off - (prog->sub_insn_off + insn_idx) - 1;
1: -
1: -		pr_debug("prog '%s': insn #%zu relocated, imm %d points to subprog '%s' (now at %zu offset)\n",
1: -			 prog->name, insn_idx, insn->imm, subprog->name, subprog->sub_insn_off);
1: -	}
1: -
1: -	return 0;
1: +  /* don't relocate line info if main program's relocation failed */
1: +  if (main_prog != prog && !main_prog->line_info)
1: +    return 0;
1: +
1: +  err = adjust_prog_btf_ext_info(
1: +      obj, prog, &obj->btf_ext->line_info, &main_prog->line_info,
1: +      &main_prog->line_info_cnt, &main_prog->line_info_rec_size);
1: +  if (err) {
1: +    if (err != -ENOENT) {
1: +      pr_warn("prog '%s': error relocating .BTF.ext line info: %d\n",
1: +              prog->name, err);
1: +      return err;
1: +    }
1: +    if (main_prog->line_info) {
1: +      /*
1: +       * Some info has already been found but has problem
1: +       * in the last btf_ext reloc. Must have to error out.
1: +       */
1: +      pr_warn("prog '%s': missing .BTF.ext line info.\n", prog->name);
1: +      return err;
1: +    }
1: +    /* Have problem loading the very first info. Ignore the rest. */
1: +    pr_warn(
1: +        "prog '%s': missing .BTF.ext line info for the main program, skipping "
1: +        "all of .BTF.ext line info.\n",
1: +        prog->name);
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int cmp_relo_by_insn_idx(const void *key, const void *elem) {
1: +  size_t insn_idx = *(const size_t *)key;
1: +  const struct reloc_desc *relo = elem;
1: +
1: +  if (insn_idx == relo->insn_idx)
1: +    return 0;
1: +  return insn_idx < relo->insn_idx ? -1 : 1;
1: +}
1: +
1: +static struct reloc_desc *find_prog_insn_relo(const struct bpf_program *prog,
1: +                                              size_t insn_idx) {
1: +  return bsearch(&insn_idx, prog->reloc_desc, prog->nr_reloc,
1: +                 sizeof(*prog->reloc_desc), cmp_relo_by_insn_idx);
1: +}
1: +
1: +static int append_subprog_relos(struct bpf_program *main_prog,
1: +                                struct bpf_program *subprog) {
1: +  int new_cnt = main_prog->nr_reloc + subprog->nr_reloc;
1: +  struct reloc_desc *relos;
1: +  int i;
1: +
1: +  if (main_prog == subprog)
1: +    return 0;
1: +  relos = libbpf_reallocarray(main_prog->reloc_desc, new_cnt, sizeof(*relos));
1: +  if (!relos)
1: +    return -ENOMEM;
1: +  memcpy(relos + main_prog->nr_reloc, subprog->reloc_desc,
1: +         sizeof(*relos) * subprog->nr_reloc);
1: +
1: +  for (i = main_prog->nr_reloc; i < new_cnt; i++)
1: +    relos[i].insn_idx += subprog->sub_insn_off;
1: +  /* After insn_idx adjustment the 'relos' array is still sorted
1: +   * by insn_idx and doesn't break bsearch.
1: +   */
1: +  main_prog->reloc_desc = relos;
1: +  main_prog->nr_reloc = new_cnt;
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__reloc_code(struct bpf_object *obj,
1: +                                  struct bpf_program *main_prog,
1: +                                  struct bpf_program *prog) {
1: +  size_t sub_insn_idx, insn_idx, new_cnt;
1: +  struct bpf_program *subprog;
1: +  struct bpf_insn *insns, *insn;
1: +  struct reloc_desc *relo;
1: +  int err;
1: +
1: +  err = reloc_prog_func_and_line_info(obj, main_prog, prog);
1: +  if (err)
1: +    return err;
1: +
1: +  for (insn_idx = 0; insn_idx < prog->sec_insn_cnt; insn_idx++) {
1: +    insn = &main_prog->insns[prog->sub_insn_off + insn_idx];
1: +    if (!insn_is_subprog_call(insn) && !insn_is_pseudo_func(insn))
1: +      continue;
1: +
1: +    relo = find_prog_insn_relo(prog, insn_idx);
1: +    if (relo && relo->type == RELO_EXTERN_FUNC)
1: +      /* kfunc relocations will be handled later
1: +       * in bpf_object__relocate_data()
1: +       */
1: +      continue;
1: +    if (relo && relo->type != RELO_CALL && relo->type != RELO_SUBPROG_ADDR) {
1: +      pr_warn("prog '%s': unexpected relo for insn #%zu, type %d\n", prog->name,
1: +              insn_idx, relo->type);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    if (relo) {
1: +      /* sub-program instruction index is a combination of
1: +       * an offset of a symbol pointed to by relocation and
1: +       * call instruction's imm field; for global functions,
1: +       * call always has imm = -1, but for static functions
1: +       * relocation is against STT_SECTION and insn->imm
1: +       * points to a start of a static function
1: +       *
1: +       * for subprog addr relocation, the relo->sym_off + insn->imm is
1: +       * the byte offset in the corresponding section.
1: +       */
1: +      if (relo->type == RELO_CALL)
1: +        sub_insn_idx = relo->sym_off / BPF_INSN_SZ + insn->imm + 1;
1: +      else
1: +        sub_insn_idx = (relo->sym_off + insn->imm) / BPF_INSN_SZ;
1: +    } else if (insn_is_pseudo_func(insn)) {
1: +      /*
1: +       * RELO_SUBPROG_ADDR relo is always emitted even if both
1: +       * functions are in the same section, so it shouldn't reach here.
1: +       */
1: +      pr_warn("prog '%s': missing subprog addr relo for insn #%zu\n",
1: +              prog->name, insn_idx);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    } else {
1: +      /* if subprogram call is to a static function within
1: +       * the same ELF section, there won't be any relocation
1: +       * emitted, but it also means there is no additional
1: +       * offset necessary, insns->imm is relative to
1: +       * instruction's original position within the section
1: +       */
1: +      sub_insn_idx = prog->sec_insn_off + insn_idx + insn->imm + 1;
1: +    }
1: +
1: +    /* we enforce that sub-programs should be in .text section */
1: +    subprog = find_prog_by_sec_insn(obj, obj->efile.text_shndx, sub_insn_idx);
1: +    if (!subprog) {
1: +      pr_warn("prog '%s': no .text section found yet sub-program call exists\n",
1: +              prog->name);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +
1: +    /* if it's the first call instruction calling into this
1: +     * subprogram (meaning this subprog hasn't been processed
1: +     * yet) within the context of current main program:
1: +     *   - append it at the end of main program's instructions blog;
1: +     *   - process is recursively, while current program is put on hold;
1: +     *   - if that subprogram calls some other not yet processes
1: +     *   subprogram, same thing will happen recursively until
1: +     *   there are no more unprocesses subprograms left to append
1: +     *   and relocate.
1: +     */
1: +    if (subprog->sub_insn_off == 0) {
1: +      subprog->sub_insn_off = main_prog->insns_cnt;
1: +
1: +      new_cnt = main_prog->insns_cnt + subprog->insns_cnt;
1: +      insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns));
1: +      if (!insns) {
1: +        pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name);
1: +        return -ENOMEM;
1: +      }
1: +      main_prog->insns = insns;
1: +      main_prog->insns_cnt = new_cnt;
1: +
1: +      memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns,
1: +             subprog->insns_cnt * sizeof(*insns));
1: +
1: +      pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
1: +               main_prog->name, subprog->insns_cnt, subprog->name);
1: +
1: +      /* The subprog insns are now appended. Append its relos too. */
1: +      err = append_subprog_relos(main_prog, subprog);
1: +      if (err)
1: +        return err;
1: +      err = bpf_object__reloc_code(obj, main_prog, subprog);
1: +      if (err)
1: +        return err;
1: +    }
1: +
1: +    /* main_prog->insns memory could have been re-allocated, so
1: +     * calculate pointer again
1: +     */
1: +    insn = &main_prog->insns[prog->sub_insn_off + insn_idx];
1: +    /* calculate correct instruction position within current main
1: +     * prog; each main prog can have a different set of
1: +     * subprograms appended (potentially in different order as
1: +     * well), so position of any subprog can be different for
1: +     * different main programs */
1: +    insn->imm = subprog->sub_insn_off - (prog->sub_insn_off + insn_idx) - 1;
1: +
1: +    pr_debug(
1: +        "prog '%s': insn #%zu relocated, imm %d points to subprog '%s' (now at "
1: +        "%zu offset)\n",
1: +        prog->name, insn_idx, insn->imm, subprog->name, subprog->sub_insn_off);
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  /*
1: @@ -6916,2087 +6810,1981 @@ bpf_object__reloc_code(struct bpf_object *obj, struct bpf_program *main_prog,
1:   *
1:   * At this point we unwind recursion, relocate calls in subC, then in mainB.
1:   */
1: -static int
1: -bpf_object__relocate_calls(struct bpf_object *obj, struct bpf_program *prog)
1: -{
1: -	struct bpf_program *subprog;
1: -	int i, err;
1: -
1: -	/* mark all subprogs as not relocated (yet) within the context of
1: -	 * current main program
1: -	 */
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		subprog = &obj->programs[i];
1: -		if (!prog_is_subprog(obj, subprog))
1: -			continue;
1: -
1: -		subprog->sub_insn_off = 0;
1: -	}
1: -
1: -	err = bpf_object__reloc_code(obj, prog, prog);
1: -	if (err)
1: -		return err;
1: -
1: -
1: -	return 0;
1: -}
1: -
1: -static void
1: -bpf_object__free_relocs(struct bpf_object *obj)
1: -{
1: -	struct bpf_program *prog;
1: -	int i;
1: -
1: -	/* free up relocation descriptors */
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		prog = &obj->programs[i];
1: -		zfree(&prog->reloc_desc);
1: -		prog->nr_reloc = 0;
1: -	}
1: -}
1: -
1: -static int
1: -bpf_object__relocate(struct bpf_object *obj, const char *targ_btf_path)
1: -{
1: -	struct bpf_program *prog;
1: -	size_t i, j;
1: -	int err;
1: -
1: -	if (obj->btf_ext) {
1: -		err = bpf_object__relocate_core(obj, targ_btf_path);
1: -		if (err) {
1: -			pr_warn("failed to perform CO-RE relocations: %d\n",
1: -				err);
1: -			return err;
1: -		}
1: -	}
1: -
1: -	/* Before relocating calls pre-process relocations and mark
1: -	 * few ld_imm64 instructions that points to subprogs.
1: -	 * Otherwise bpf_object__reloc_code() later would have to consider
1: -	 * all ld_imm64 insns as relocation candidates. That would
1: -	 * reduce relocation speed, since amount of find_prog_insn_relo()
1: -	 * would increase and most of them will fail to find a relo.
1: -	 */
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		prog = &obj->programs[i];
1: -		for (j = 0; j < prog->nr_reloc; j++) {
1: -			struct reloc_desc *relo = &prog->reloc_desc[j];
1: -			struct bpf_insn *insn = &prog->insns[relo->insn_idx];
1: -
1: -			/* mark the insn, so it's recognized by insn_is_pseudo_func() */
1: -			if (relo->type == RELO_SUBPROG_ADDR)
1: -				insn[0].src_reg = BPF_PSEUDO_FUNC;
1: -		}
1: -	}
1: -
1: -	/* relocate subprogram calls and append used subprograms to main
1: -	 * programs; each copy of subprogram code needs to be relocated
1: -	 * differently for each main program, because its code location might
1: -	 * have changed.
1: -	 * Append subprog relos to main programs to allow data relos to be
1: -	 * processed after text is completely relocated.
1: -	 */
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		prog = &obj->programs[i];
1: -		/* sub-program's sub-calls are relocated within the context of
1: -		 * its main program only
1: -		 */
1: -		if (prog_is_subprog(obj, prog))
1: -			continue;
1: -
1: -		err = bpf_object__relocate_calls(obj, prog);
1: -		if (err) {
1: -			pr_warn("prog '%s': failed to relocate calls: %d\n",
1: -				prog->name, err);
1: -			return err;
1: -		}
1: -	}
1: -	/* Process data relos for main programs */
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		prog = &obj->programs[i];
1: -		if (prog_is_subprog(obj, prog))
1: -			continue;
1: -		err = bpf_object__relocate_data(obj, prog);
1: -		if (err) {
1: -			pr_warn("prog '%s': failed to relocate data references: %d\n",
1: -				prog->name, err);
1: -			return err;
1: -		}
1: -	}
1: -	if (!obj->gen_loader)
1: -		bpf_object__free_relocs(obj);
1: -	return 0;
1: +static int bpf_object__relocate_calls(struct bpf_object *obj,
1: +                                      struct bpf_program *prog) {
1: +  struct bpf_program *subprog;
1: +  int i, err;
1: +
1: +  /* mark all subprogs as not relocated (yet) within the context of
1: +   * current main program
1: +   */
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    subprog = &obj->programs[i];
1: +    if (!prog_is_subprog(obj, subprog))
1: +      continue;
1: +
1: +    subprog->sub_insn_off = 0;
1: +  }
1: +
1: +  err = bpf_object__reloc_code(obj, prog, prog);
1: +  if (err)
1: +    return err;
1: +
1: +  return 0;
1: +}
1: +
1: +static void bpf_object__free_relocs(struct bpf_object *obj) {
1: +  struct bpf_program *prog;
1: +  int i;
1: +
1: +  /* free up relocation descriptors */
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    prog = &obj->programs[i];
1: +    zfree(&prog->reloc_desc);
1: +    prog->nr_reloc = 0;
1: +  }
1: +}
1: +
1: +static int bpf_object__relocate(struct bpf_object *obj,
1: +                                const char *targ_btf_path) {
1: +  struct bpf_program *prog;
1: +  size_t i, j;
1: +  int err;
1: +
1: +  if (obj->btf_ext) {
1: +    err = bpf_object__relocate_core(obj, targ_btf_path);
1: +    if (err) {
1: +      pr_warn("failed to perform CO-RE relocations: %d\n", err);
1: +      return err;
1: +    }
1: +  }
1: +
1: +  /* Before relocating calls pre-process relocations and mark
1: +   * few ld_imm64 instructions that points to subprogs.
1: +   * Otherwise bpf_object__reloc_code() later would have to consider
1: +   * all ld_imm64 insns as relocation candidates. That would
1: +   * reduce relocation speed, since amount of find_prog_insn_relo()
1: +   * would increase and most of them will fail to find a relo.
1: +   */
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    prog = &obj->programs[i];
1: +    for (j = 0; j < prog->nr_reloc; j++) {
1: +      struct reloc_desc *relo = &prog->reloc_desc[j];
1: +      struct bpf_insn *insn = &prog->insns[relo->insn_idx];
1: +
1: +      /* mark the insn, so it's recognized by insn_is_pseudo_func() */
1: +      if (relo->type == RELO_SUBPROG_ADDR)
1: +        insn[0].src_reg = BPF_PSEUDO_FUNC;
1: +    }
1: +  }
1: +
1: +  /* relocate subprogram calls and append used subprograms to main
1: +   * programs; each copy of subprogram code needs to be relocated
1: +   * differently for each main program, because its code location might
1: +   * have changed.
1: +   * Append subprog relos to main programs to allow data relos to be
1: +   * processed after text is completely relocated.
1: +   */
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    prog = &obj->programs[i];
1: +    /* sub-program's sub-calls are relocated within the context of
1: +     * its main program only
1: +     */
1: +    if (prog_is_subprog(obj, prog))
1: +      continue;
1: +
1: +    err = bpf_object__relocate_calls(obj, prog);
1: +    if (err) {
1: +      pr_warn("prog '%s': failed to relocate calls: %d\n", prog->name, err);
1: +      return err;
1: +    }
1: +  }
1: +  /* Process data relos for main programs */
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    prog = &obj->programs[i];
1: +    if (prog_is_subprog(obj, prog))
1: +      continue;
1: +    err = bpf_object__relocate_data(obj, prog);
1: +    if (err) {
1: +      pr_warn("prog '%s': failed to relocate data references: %d\n", prog->name,
1: +              err);
1: +      return err;
1: +    }
1: +  }
1: +  if (!obj->gen_loader)
1: +    bpf_object__free_relocs(obj);
1: +  return 0;
1:  }
1:  
1:  static int bpf_object__collect_st_ops_relos(struct bpf_object *obj,
1: -					    GElf_Shdr *shdr, Elf_Data *data);
1: +                                            GElf_Shdr *shdr, Elf_Data *data);
1:  
1:  static int bpf_object__collect_map_relos(struct bpf_object *obj,
1: -					 GElf_Shdr *shdr, Elf_Data *data)
1: -{
1: -	const int bpf_ptr_sz = 8, host_ptr_sz = sizeof(void *);
1: -	int i, j, nrels, new_sz;
1: -	const struct btf_var_secinfo *vi = NULL;
1: -	const struct btf_type *sec, *var, *def;
1: -	struct bpf_map *map = NULL, *targ_map;
1: -	const struct btf_member *member;
1: -	const char *name, *mname;
1: -	Elf_Data *symbols;
1: -	unsigned int moff;
1: -	GElf_Sym sym;
1: -	GElf_Rel rel;
1: -	void *tmp;
1: -
1: -	if (!obj->efile.btf_maps_sec_btf_id || !obj->btf)
1: -		return -EINVAL;
1: -	sec = btf__type_by_id(obj->btf, obj->efile.btf_maps_sec_btf_id);
1: -	if (!sec)
1: -		return -EINVAL;
1: -
1: -	symbols = obj->efile.symbols;
1: -	nrels = shdr->sh_size / shdr->sh_entsize;
1: -	for (i = 0; i < nrels; i++) {
1: -		if (!gelf_getrel(data, i, &rel)) {
1: -			pr_warn(".maps relo #%d: failed to get ELF relo\n", i);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -		if (!gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &sym)) {
1: -			pr_warn(".maps relo #%d: symbol %zx not found\n",
1: -				i, (size_t)GELF_R_SYM(rel.r_info));
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -		name = elf_sym_str(obj, sym.st_name) ?: "<?>";
1: -		if (sym.st_shndx != obj->efile.btf_maps_shndx) {
1: -			pr_warn(".maps relo #%d: '%s' isn't a BTF-defined map\n",
1: -				i, name);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -
1: -		pr_debug(".maps relo #%d: for %zd value %zd rel.r_offset %zu name %d ('%s')\n",
1: -			 i, (ssize_t)(rel.r_info >> 32), (size_t)sym.st_value,
1: -			 (size_t)rel.r_offset, sym.st_name, name);
1: -
1: -		for (j = 0; j < obj->nr_maps; j++) {
1: -			map = &obj->maps[j];
1: -			if (map->sec_idx != obj->efile.btf_maps_shndx)
1: -				continue;
1: -
1: -			vi = btf_var_secinfos(sec) + map->btf_var_idx;
1: -			if (vi->offset <= rel.r_offset &&
1: -			    rel.r_offset + bpf_ptr_sz <= vi->offset + vi->size)
1: -				break;
1: -		}
1: -		if (j == obj->nr_maps) {
1: -			pr_warn(".maps relo #%d: cannot find map '%s' at rel.r_offset %zu\n",
1: -				i, name, (size_t)rel.r_offset);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (!bpf_map_type__is_map_in_map(map->def.type))
1: -			return -EINVAL;
1: -		if (map->def.type == BPF_MAP_TYPE_HASH_OF_MAPS &&
1: -		    map->def.key_size != sizeof(int)) {
1: -			pr_warn(".maps relo #%d: hash-of-maps '%s' should have key size %zu.\n",
1: -				i, map->name, sizeof(int));
1: -			return -EINVAL;
1: -		}
1: -
1: -		targ_map = bpf_object__find_map_by_name(obj, name);
1: -		if (!targ_map)
1: -			return -ESRCH;
1: -
1: -		var = btf__type_by_id(obj->btf, vi->type);
1: -		def = skip_mods_and_typedefs(obj->btf, var->type, NULL);
1: -		if (btf_vlen(def) == 0)
1: -			return -EINVAL;
1: -		member = btf_members(def) + btf_vlen(def) - 1;
1: -		mname = btf__name_by_offset(obj->btf, member->name_off);
1: -		if (strcmp(mname, "values"))
1: -			return -EINVAL;
1: -
1: -		moff = btf_member_bit_offset(def, btf_vlen(def) - 1) / 8;
1: -		if (rel.r_offset - vi->offset < moff)
1: -			return -EINVAL;
1: -
1: -		moff = rel.r_offset - vi->offset - moff;
1: -		/* here we use BPF pointer size, which is always 64 bit, as we
1: -		 * are parsing ELF that was built for BPF target
1: -		 */
1: -		if (moff % bpf_ptr_sz)
1: -			return -EINVAL;
1: -		moff /= bpf_ptr_sz;
1: -		if (moff >= map->init_slots_sz) {
1: -			new_sz = moff + 1;
1: -			tmp = libbpf_reallocarray(map->init_slots, new_sz, host_ptr_sz);
1: -			if (!tmp)
1: -				return -ENOMEM;
1: -			map->init_slots = tmp;
1: -			memset(map->init_slots + map->init_slots_sz, 0,
1: -			       (new_sz - map->init_slots_sz) * host_ptr_sz);
1: -			map->init_slots_sz = new_sz;
1: -		}
1: -		map->init_slots[moff] = targ_map;
1: -
1: -		pr_debug(".maps relo #%d: map '%s' slot [%d] points to map '%s'\n",
1: -			 i, map->name, moff, name);
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int cmp_relocs(const void *_a, const void *_b)
1: -{
1: -	const struct reloc_desc *a = _a;
1: -	const struct reloc_desc *b = _b;
1: -
1: -	if (a->insn_idx != b->insn_idx)
1: -		return a->insn_idx < b->insn_idx ? -1 : 1;
1: -
1: -	/* no two relocations should have the same insn_idx, but ... */
1: -	if (a->type != b->type)
1: -		return a->type < b->type ? -1 : 1;
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__collect_relos(struct bpf_object *obj)
1: -{
1: -	int i, err;
1: -
1: -	for (i = 0; i < obj->efile.nr_reloc_sects; i++) {
1: -		GElf_Shdr *shdr = &obj->efile.reloc_sects[i].shdr;
1: -		Elf_Data *data = obj->efile.reloc_sects[i].data;
1: -		int idx = shdr->sh_info;
1: -
1: -		if (shdr->sh_type != SHT_REL) {
1: -			pr_warn("internal error at %d\n", __LINE__);
1: -			return -LIBBPF_ERRNO__INTERNAL;
1: -		}
1: -
1: -		if (idx == obj->efile.st_ops_shndx)
1: -			err = bpf_object__collect_st_ops_relos(obj, shdr, data);
1: -		else if (idx == obj->efile.btf_maps_shndx)
1: -			err = bpf_object__collect_map_relos(obj, shdr, data);
1: -		else
1: -			err = bpf_object__collect_prog_relos(obj, shdr, data);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		struct bpf_program *p = &obj->programs[i];
1: -		
1: -		if (!p->nr_reloc)
1: -			continue;
1: -
1: -		qsort(p->reloc_desc, p->nr_reloc, sizeof(*p->reloc_desc), cmp_relocs);
1: -	}
1: -	return 0;
1: -}
1: -
1: -static bool insn_is_helper_call(struct bpf_insn *insn, enum bpf_func_id *func_id)
1: -{
1: -	if (BPF_CLASS(insn->code) == BPF_JMP &&
1: -	    BPF_OP(insn->code) == BPF_CALL &&
1: -	    BPF_SRC(insn->code) == BPF_K &&
1: -	    insn->src_reg == 0 &&
1: -	    insn->dst_reg == 0) {
1: -		    *func_id = insn->imm;
1: -		    return true;
1: -	}
1: -	return false;
1: -}
1: -
1: -static int bpf_object__sanitize_prog(struct bpf_object *obj, struct bpf_program *prog)
1: -{
1: -	struct bpf_insn *insn = prog->insns;
1: -	enum bpf_func_id func_id;
1: -	int i;
1: -
1: -	if (obj->gen_loader)
1: -		return 0;
1: -
1: -	for (i = 0; i < prog->insns_cnt; i++, insn++) {
1: -		if (!insn_is_helper_call(insn, &func_id))
1: -			continue;
1: -
1: -		/* on kernels that don't yet support
1: -		 * bpf_probe_read_{kernel,user}[_str] helpers, fall back
1: -		 * to bpf_probe_read() which works well for old kernels
1: -		 */
1: -		switch (func_id) {
1: -		case BPF_FUNC_probe_read_kernel:
1: -		case BPF_FUNC_probe_read_user:
1: -			if (!kernel_supports(obj, FEAT_PROBE_READ_KERN))
1: -				insn->imm = BPF_FUNC_probe_read;
1: -			break;
1: -		case BPF_FUNC_probe_read_kernel_str:
1: -		case BPF_FUNC_probe_read_user_str:
1: -			if (!kernel_supports(obj, FEAT_PROBE_READ_KERN))
1: -				insn->imm = BPF_FUNC_probe_read_str;
1: -			break;
1: -		default:
1: -			break;
1: -		}
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int
1: -load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,
1: -	     char *license, __u32 kern_version, int *pfd)
1: -{
1: -	struct bpf_prog_load_params load_attr = {};
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	size_t log_buf_size = 0;
1: -	char *log_buf = NULL;
1: -	int btf_fd, ret;
1: -
1: -	if (prog->type == BPF_PROG_TYPE_UNSPEC) {
1: -		/*
1: -		 * The program type must be set.  Most likely we couldn't find a proper
1: -		 * section definition at load time, and thus we didn't infer the type.
1: -		 */
1: -		pr_warn("prog '%s': missing BPF prog type, check ELF section name '%s'\n",
1: -			prog->name, prog->sec_name);
1: -		return -EINVAL;
1: -	}
1: -
1: -	if (!insns || !insns_cnt)
1: -		return -EINVAL;
1: -
1: -	load_attr.prog_type = prog->type;
1: -	/* old kernels might not support specifying expected_attach_type */
1: -	if (!kernel_supports(prog->obj, FEAT_EXP_ATTACH_TYPE) && prog->sec_def &&
1: -	    prog->sec_def->is_exp_attach_type_optional)
1: -		load_attr.expected_attach_type = 0;
1: -	else
1: -		load_attr.expected_attach_type = prog->expected_attach_type;
1: -	if (kernel_supports(prog->obj, FEAT_PROG_NAME))
1: -		load_attr.name = prog->name;
1: -	load_attr.insns = insns;
1: -	load_attr.insn_cnt = insns_cnt;
1: -	load_attr.license = license;
1: -	load_attr.attach_btf_id = prog->attach_btf_id;
1: -	if (prog->attach_prog_fd)
1: -		load_attr.attach_prog_fd = prog->attach_prog_fd;
1: -	else
1: -		load_attr.attach_btf_obj_fd = prog->attach_btf_obj_fd;
1: -	load_attr.attach_btf_id = prog->attach_btf_id;
1: -	load_attr.kern_version = kern_version;
1: -	load_attr.prog_ifindex = prog->prog_ifindex;
1: -
1: -	/* specify func_info/line_info only if kernel supports them */
1: -	btf_fd = bpf_object__btf_fd(prog->obj);
1: -	if (btf_fd >= 0 && kernel_supports(prog->obj, FEAT_BTF_FUNC)) {
1: -		load_attr.prog_btf_fd = btf_fd;
1: -		load_attr.func_info = prog->func_info;
1: -		load_attr.func_info_rec_size = prog->func_info_rec_size;
1: -		load_attr.func_info_cnt = prog->func_info_cnt;
1: -		load_attr.line_info = prog->line_info;
1: -		load_attr.line_info_rec_size = prog->line_info_rec_size;
1: -		load_attr.line_info_cnt = prog->line_info_cnt;
1: -	}
1: -	load_attr.log_level = prog->log_level;
1: -	load_attr.prog_flags = prog->prog_flags;
1: -
1: -	if (prog->obj->gen_loader) {
1: -		bpf_gen__prog_load(prog->obj->gen_loader, &load_attr,
1: -				   prog - prog->obj->programs);
1: -		*pfd = -1;
1: -		return 0;
1: -	}
1: +                                         GElf_Shdr *shdr, Elf_Data *data) {
1: +  const int bpf_ptr_sz = 8, host_ptr_sz = sizeof(void *);
1: +  int i, j, nrels, new_sz;
1: +  const struct btf_var_secinfo *vi = NULL;
1: +  const struct btf_type *sec, *var, *def;
1: +  struct bpf_map *map = NULL, *targ_map;
1: +  const struct btf_member *member;
1: +  const char *name, *mname;
1: +  Elf_Data *symbols;
1: +  unsigned int moff;
1: +  GElf_Sym sym;
1: +  GElf_Rel rel;
1: +  void *tmp;
1: +
1: +  if (!obj->efile.btf_maps_sec_btf_id || !obj->btf)
1: +    return -EINVAL;
1: +  sec = btf__type_by_id(obj->btf, obj->efile.btf_maps_sec_btf_id);
1: +  if (!sec)
1: +    return -EINVAL;
1: +
1: +  symbols = obj->efile.symbols;
1: +  nrels = shdr->sh_size / shdr->sh_entsize;
1: +  for (i = 0; i < nrels; i++) {
1: +    if (!gelf_getrel(data, i, &rel)) {
1: +      pr_warn(".maps relo #%d: failed to get ELF relo\n", i);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +    if (!gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &sym)) {
1: +      pr_warn(".maps relo #%d: symbol %zx not found\n", i,
1: +              (size_t)GELF_R_SYM(rel.r_info));
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +    name = elf_sym_str(obj, sym.st_name) ?: "<?>";
1: +    if (sym.st_shndx != obj->efile.btf_maps_shndx) {
1: +      pr_warn(".maps relo #%d: '%s' isn't a BTF-defined map\n", i, name);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +
1: +    pr_debug(
1: +        ".maps relo #%d: for %zd value %zd rel.r_offset %zu name %d ('%s')\n",
1: +        i, (ssize_t)(rel.r_info >> 32), (size_t)sym.st_value,
1: +        (size_t)rel.r_offset, sym.st_name, name);
1: +
1: +    for (j = 0; j < obj->nr_maps; j++) {
1: +      map = &obj->maps[j];
1: +      if (map->sec_idx != obj->efile.btf_maps_shndx)
1: +        continue;
1: +
1: +      vi = btf_var_secinfos(sec) + map->btf_var_idx;
1: +      if (vi->offset <= rel.r_offset &&
1: +          rel.r_offset + bpf_ptr_sz <= vi->offset + vi->size)
1: +        break;
1: +    }
1: +    if (j == obj->nr_maps) {
1: +      pr_warn(".maps relo #%d: cannot find map '%s' at rel.r_offset %zu\n", i,
1: +              name, (size_t)rel.r_offset);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (!bpf_map_type__is_map_in_map(map->def.type))
1: +      return -EINVAL;
1: +    if (map->def.type == BPF_MAP_TYPE_HASH_OF_MAPS &&
1: +        map->def.key_size != sizeof(int)) {
1: +      pr_warn(".maps relo #%d: hash-of-maps '%s' should have key size %zu.\n",
1: +              i, map->name, sizeof(int));
1: +      return -EINVAL;
1: +    }
1: +
1: +    targ_map = bpf_object__find_map_by_name(obj, name);
1: +    if (!targ_map)
1: +      return -ESRCH;
1: +
1: +    var = btf__type_by_id(obj->btf, vi->type);
1: +    def = skip_mods_and_typedefs(obj->btf, var->type, NULL);
1: +    if (btf_vlen(def) == 0)
1: +      return -EINVAL;
1: +    member = btf_members(def) + btf_vlen(def) - 1;
1: +    mname = btf__name_by_offset(obj->btf, member->name_off);
1: +    if (strcmp(mname, "values"))
1: +      return -EINVAL;
1: +
1: +    moff = btf_member_bit_offset(def, btf_vlen(def) - 1) / 8;
1: +    if (rel.r_offset - vi->offset < moff)
1: +      return -EINVAL;
1: +
1: +    moff = rel.r_offset - vi->offset - moff;
1: +    /* here we use BPF pointer size, which is always 64 bit, as we
1: +     * are parsing ELF that was built for BPF target
1: +     */
1: +    if (moff % bpf_ptr_sz)
1: +      return -EINVAL;
1: +    moff /= bpf_ptr_sz;
1: +    if (moff >= map->init_slots_sz) {
1: +      new_sz = moff + 1;
1: +      tmp = libbpf_reallocarray(map->init_slots, new_sz, host_ptr_sz);
1: +      if (!tmp)
1: +        return -ENOMEM;
1: +      map->init_slots = tmp;
1: +      memset(map->init_slots + map->init_slots_sz, 0,
1: +             (new_sz - map->init_slots_sz) * host_ptr_sz);
1: +      map->init_slots_sz = new_sz;
1: +    }
1: +    map->init_slots[moff] = targ_map;
1: +
1: +    pr_debug(".maps relo #%d: map '%s' slot [%d] points to map '%s'\n", i,
1: +             map->name, moff, name);
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +static int cmp_relocs(const void *_a, const void *_b) {
1: +  const struct reloc_desc *a = _a;
1: +  const struct reloc_desc *b = _b;
1: +
1: +  if (a->insn_idx != b->insn_idx)
1: +    return a->insn_idx < b->insn_idx ? -1 : 1;
1: +
1: +  /* no two relocations should have the same insn_idx, but ... */
1: +  if (a->type != b->type)
1: +    return a->type < b->type ? -1 : 1;
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__collect_relos(struct bpf_object *obj) {
1: +  int i, err;
1: +
1: +  for (i = 0; i < obj->efile.nr_reloc_sects; i++) {
1: +    GElf_Shdr *shdr = &obj->efile.reloc_sects[i].shdr;
1: +    Elf_Data *data = obj->efile.reloc_sects[i].data;
1: +    int idx = shdr->sh_info;
1: +
1: +    if (shdr->sh_type != SHT_REL) {
1: +      pr_warn("internal error at %d\n", __LINE__);
1: +      return -LIBBPF_ERRNO__INTERNAL;
1: +    }
1: +
1: +    if (idx == obj->efile.st_ops_shndx)
1: +      err = bpf_object__collect_st_ops_relos(obj, shdr, data);
1: +    else if (idx == obj->efile.btf_maps_shndx)
1: +      err = bpf_object__collect_map_relos(obj, shdr, data);
1: +    else
1: +      err = bpf_object__collect_prog_relos(obj, shdr, data);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    struct bpf_program *p = &obj->programs[i];
1: +
1: +    if (!p->nr_reloc)
1: +      continue;
1: +
1: +    qsort(p->reloc_desc, p->nr_reloc, sizeof(*p->reloc_desc), cmp_relocs);
1: +  }
1: +  return 0;
1: +}
1: +
1: +static bool insn_is_helper_call(struct bpf_insn *insn,
1: +                                enum bpf_func_id *func_id) {
1: +  if (BPF_CLASS(insn->code) == BPF_JMP && BPF_OP(insn->code) == BPF_CALL &&
1: +      BPF_SRC(insn->code) == BPF_K && insn->src_reg == 0 &&
1: +      insn->dst_reg == 0) {
1: +    *func_id = insn->imm;
1: +    return true;
1: +  }
1: +  return false;
1: +}
1: +
1: +static int bpf_object__sanitize_prog(struct bpf_object *obj,
1: +                                     struct bpf_program *prog) {
1: +  struct bpf_insn *insn = prog->insns;
1: +  enum bpf_func_id func_id;
1: +  int i;
1: +
1: +  if (obj->gen_loader)
1: +    return 0;
1: +
1: +  for (i = 0; i < prog->insns_cnt; i++, insn++) {
1: +    if (!insn_is_helper_call(insn, &func_id))
1: +      continue;
1: +
1: +    /* on kernels that don't yet support
1: +     * bpf_probe_read_{kernel,user}[_str] helpers, fall back
1: +     * to bpf_probe_read() which works well for old kernels
1: +     */
1: +    switch (func_id) {
1: +    case BPF_FUNC_probe_read_kernel:
1: +    case BPF_FUNC_probe_read_user:
1: +      if (!kernel_supports(obj, FEAT_PROBE_READ_KERN))
1: +        insn->imm = BPF_FUNC_probe_read;
1: +      break;
1: +    case BPF_FUNC_probe_read_kernel_str:
1: +    case BPF_FUNC_probe_read_user_str:
1: +      if (!kernel_supports(obj, FEAT_PROBE_READ_KERN))
1: +        insn->imm = BPF_FUNC_probe_read_str;
1: +      break;
1: +    default:
1: +      break;
1: +    }
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int load_program(struct bpf_program *prog, struct bpf_insn *insns,
1: +                        int insns_cnt, char *license, __u32 kern_version,
1: +                        int *pfd) {
1: +  struct bpf_prog_load_params load_attr = {};
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  size_t log_buf_size = 0;
1: +  char *log_buf = NULL;
1: +  int btf_fd, ret;
1: +
1: +  if (prog->type == BPF_PROG_TYPE_UNSPEC) {
1: +    /*
1: +     * The program type must be set.  Most likely we couldn't find a proper
1: +     * section definition at load time, and thus we didn't infer the type.
1: +     */
1: +    pr_warn("prog '%s': missing BPF prog type, check ELF section name '%s'\n",
1: +            prog->name, prog->sec_name);
1: +    return -EINVAL;
1: +  }
1: +
1: +  if (!insns || !insns_cnt)
1: +    return -EINVAL;
1: +
1: +  load_attr.prog_type = prog->type;
1: +  /* old kernels might not support specifying expected_attach_type */
1: +  if (!kernel_supports(prog->obj, FEAT_EXP_ATTACH_TYPE) && prog->sec_def &&
1: +      prog->sec_def->is_exp_attach_type_optional)
1: +    load_attr.expected_attach_type = 0;
1: +  else
1: +    load_attr.expected_attach_type = prog->expected_attach_type;
1: +  if (kernel_supports(prog->obj, FEAT_PROG_NAME))
1: +    load_attr.name = prog->name;
1: +  load_attr.insns = insns;
1: +  load_attr.insn_cnt = insns_cnt;
1: +  load_attr.license = license;
1: +  load_attr.attach_btf_id = prog->attach_btf_id;
1: +  if (prog->attach_prog_fd)
1: +    load_attr.attach_prog_fd = prog->attach_prog_fd;
1: +  else
1: +    load_attr.attach_btf_obj_fd = prog->attach_btf_obj_fd;
1: +  load_attr.attach_btf_id = prog->attach_btf_id;
1: +  load_attr.kern_version = kern_version;
1: +  load_attr.prog_ifindex = prog->prog_ifindex;
1: +
1: +  /* specify func_info/line_info only if kernel supports them */
1: +  btf_fd = bpf_object__btf_fd(prog->obj);
1: +  if (btf_fd >= 0 && kernel_supports(prog->obj, FEAT_BTF_FUNC)) {
1: +    load_attr.prog_btf_fd = btf_fd;
1: +    load_attr.func_info = prog->func_info;
1: +    load_attr.func_info_rec_size = prog->func_info_rec_size;
1: +    load_attr.func_info_cnt = prog->func_info_cnt;
1: +    load_attr.line_info = prog->line_info;
1: +    load_attr.line_info_rec_size = prog->line_info_rec_size;
1: +    load_attr.line_info_cnt = prog->line_info_cnt;
1: +  }
1: +  load_attr.log_level = prog->log_level;
1: +  load_attr.prog_flags = prog->prog_flags;
1: +
1: +  if (prog->obj->gen_loader) {
1: +    bpf_gen__prog_load(prog->obj->gen_loader, &load_attr,
1: +                       prog - prog->obj->programs);
1: +    *pfd = -1;
1: +    return 0;
1: +  }
1:  retry_load:
1: -	if (log_buf_size) {
1: -		log_buf = malloc(log_buf_size);
1: -		if (!log_buf)
1: -			return -ENOMEM;
1: -
1: -		*log_buf = 0;
1: -	}
1: -
1: -	load_attr.log_buf = log_buf;
1: -	load_attr.log_buf_sz = log_buf_size;
1: -	ret = libbpf__bpf_prog_load(&load_attr);
1: -
1: -	if (ret >= 0) {
1: -		if (log_buf && load_attr.log_level)
1: -			pr_debug("verifier log:\n%s", log_buf);
1: -
1: -		if (prog->obj->rodata_map_idx >= 0 &&
1: -		    kernel_supports(prog->obj, FEAT_PROG_BIND_MAP)) {
1: -			struct bpf_map *rodata_map =
1: -				&prog->obj->maps[prog->obj->rodata_map_idx];
1: -
1: -			if (bpf_prog_bind_map(ret, bpf_map__fd(rodata_map), NULL)) {
1: -				cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
1: -				pr_warn("prog '%s': failed to bind .rodata map: %s\n",
1: -					prog->name, cp);
1: -				/* Don't fail hard if can't bind rodata. */
1: -			}
1: -		}
1: -
1: -		*pfd = ret;
1: -		ret = 0;
1: -		goto out;
1: -	}
1: -
1: -	if (!log_buf || errno == ENOSPC) {
1: -		log_buf_size = max((size_t)BPF_LOG_BUF_SIZE,
1: -				   log_buf_size << 1);
1: -
1: -		free(log_buf);
1: -		goto retry_load;
1: -	}
1: -	ret = errno ? -errno : -LIBBPF_ERRNO__LOAD;
1: -	cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
1: -	pr_warn("load bpf program failed: %s\n", cp);
1: -	pr_perm_msg(ret);
1: -
1: -	if (log_buf && log_buf[0] != '\0') {
1: -		ret = -LIBBPF_ERRNO__VERIFY;
1: -		pr_warn("-- BEGIN DUMP LOG ---\n");
1: -		pr_warn("\n%s\n", log_buf);
1: -		pr_warn("-- END LOG --\n");
1: -	} else if (load_attr.insn_cnt >= BPF_MAXINSNS) {
1: -		pr_warn("Program too large (%zu insns), at most %d insns\n",
1: -			load_attr.insn_cnt, BPF_MAXINSNS);
1: -		ret = -LIBBPF_ERRNO__PROG2BIG;
1: -	} else if (load_attr.prog_type != BPF_PROG_TYPE_KPROBE) {
1: -		/* Wrong program type? */
1: -		int fd;
1: -
1: -		load_attr.prog_type = BPF_PROG_TYPE_KPROBE;
1: -		load_attr.expected_attach_type = 0;
1: -		load_attr.log_buf = NULL;
1: -		load_attr.log_buf_sz = 0;
1: -		fd = libbpf__bpf_prog_load(&load_attr);
1: -		if (fd >= 0) {
1: -			close(fd);
1: -			ret = -LIBBPF_ERRNO__PROGTYPE;
1: -			goto out;
1: -		}
1: -	}
1: +  if (log_buf_size) {
1: +    log_buf = malloc(log_buf_size);
1: +    if (!log_buf)
1: +      return -ENOMEM;
1: +
1: +    *log_buf = 0;
1: +  }
1: +
1: +  load_attr.log_buf = log_buf;
1: +  load_attr.log_buf_sz = log_buf_size;
1: +  ret = libbpf__bpf_prog_load(&load_attr);
1: +
1: +  if (ret >= 0) {
1: +    if (log_buf && load_attr.log_level)
1: +      pr_debug("verifier log:\n%s", log_buf);
1: +
1: +    if (prog->obj->rodata_map_idx >= 0 &&
1: +        kernel_supports(prog->obj, FEAT_PROG_BIND_MAP)) {
1: +      struct bpf_map *rodata_map = &prog->obj->maps[prog->obj->rodata_map_idx];
1: +
1: +      if (bpf_prog_bind_map(ret, bpf_map__fd(rodata_map), NULL)) {
1: +        cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
1: +        pr_warn("prog '%s': failed to bind .rodata map: %s\n", prog->name, cp);
1: +        /* Don't fail hard if can't bind rodata. */
1: +      }
1: +    }
1: +
1: +    *pfd = ret;
1: +    ret = 0;
1: +    goto out;
1: +  }
1: +
1: +  if (!log_buf || errno == ENOSPC) {
1: +    log_buf_size = max((size_t)BPF_LOG_BUF_SIZE, log_buf_size << 1);
1: +
1: +    free(log_buf);
1: +    goto retry_load;
1: +  }
1: +  ret = errno ? -errno : -LIBBPF_ERRNO__LOAD;
1: +  cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
1: +  pr_warn("load bpf program failed: %s\n", cp);
1: +  pr_perm_msg(ret);
1: +
1: +  if (log_buf && log_buf[0] != '\0') {
1: +    ret = -LIBBPF_ERRNO__VERIFY;
1: +    pr_warn("-- BEGIN DUMP LOG ---\n");
1: +    pr_warn("\n%s\n", log_buf);
1: +    pr_warn("-- END LOG --\n");
1: +  } else if (load_attr.insn_cnt >= BPF_MAXINSNS) {
1: +    pr_warn("Program too large (%zu insns), at most %d insns\n",
1: +            load_attr.insn_cnt, BPF_MAXINSNS);
1: +    ret = -LIBBPF_ERRNO__PROG2BIG;
1: +  } else if (load_attr.prog_type != BPF_PROG_TYPE_KPROBE) {
1: +    /* Wrong program type? */
1: +    int fd;
1: +
1: +    load_attr.prog_type = BPF_PROG_TYPE_KPROBE;
1: +    load_attr.expected_attach_type = 0;
1: +    load_attr.log_buf = NULL;
1: +    load_attr.log_buf_sz = 0;
1: +    fd = libbpf__bpf_prog_load(&load_attr);
1: +    if (fd >= 0) {
1: +      close(fd);
1: +      ret = -LIBBPF_ERRNO__PROGTYPE;
1: +      goto out;
1: +    }
1: +  }
1:  
1:  out:
1: -	free(log_buf);
1: -	return ret;
1: -}
1: -
1: -static int bpf_program__record_externs(struct bpf_program *prog)
1: -{
1: -	struct bpf_object *obj = prog->obj;
1: -	int i;
1: -
1: -	for (i = 0; i < prog->nr_reloc; i++) {
1: -		struct reloc_desc *relo = &prog->reloc_desc[i];
1: -		struct extern_desc *ext = &obj->externs[relo->sym_off];
1: -
1: -		switch (relo->type) {
1: -		case RELO_EXTERN_VAR:
1: -			if (ext->type != EXT_KSYM)
1: -				continue;
1: -			if (!ext->ksym.type_id) {
1: -				pr_warn("typeless ksym %s is not supported yet\n",
1: -					ext->name);
1: -				return -ENOTSUP;
1: -			}
1: -			bpf_gen__record_extern(obj->gen_loader, ext->name, BTF_KIND_VAR,
1: -					       relo->insn_idx);
1: -			break;
1: -		case RELO_EXTERN_FUNC:
1: -			bpf_gen__record_extern(obj->gen_loader, ext->name, BTF_KIND_FUNC,
1: -					       relo->insn_idx);
1: -			break;
1: -		default:
1: -			continue;
1: -		}
1: -	}
1: -	return 0;
1: -}
1: -
1: -static int libbpf_find_attach_btf_id(struct bpf_program *prog, int *btf_obj_fd, int *btf_type_id);
1: -
1: -int bpf_program__load(struct bpf_program *prog, char *license, __u32 kern_ver)
1: -{
1: -	int err = 0, fd, i;
1: -
1: -	if (prog->obj->loaded) {
1: -		pr_warn("prog '%s': can't load after object was loaded\n", prog->name);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if ((prog->type == BPF_PROG_TYPE_TRACING ||
1: -	     prog->type == BPF_PROG_TYPE_LSM ||
1: -	     prog->type == BPF_PROG_TYPE_EXT) && !prog->attach_btf_id) {
1: -		int btf_obj_fd = 0, btf_type_id = 0;
1: -
1: -		err = libbpf_find_attach_btf_id(prog, &btf_obj_fd, &btf_type_id);
1: -		if (err)
1: -			return libbpf_err(err);
1: -
1: -		prog->attach_btf_obj_fd = btf_obj_fd;
1: -		prog->attach_btf_id = btf_type_id;
1: -	}
1: -
1: -	if (prog->instances.nr < 0 || !prog->instances.fds) {
1: -		if (prog->preprocessor) {
1: -			pr_warn("Internal error: can't load program '%s'\n",
1: -				prog->name);
1: -			return libbpf_err(-LIBBPF_ERRNO__INTERNAL);
1: -		}
1: -
1: -		prog->instances.fds = malloc(sizeof(int));
1: -		if (!prog->instances.fds) {
1: -			pr_warn("Not enough memory for BPF fds\n");
1: -			return libbpf_err(-ENOMEM);
1: -		}
1: -		prog->instances.nr = 1;
1: -		prog->instances.fds[0] = -1;
1: -	}
1: -
1: -	if (!prog->preprocessor) {
1: -		if (prog->instances.nr != 1) {
1: -			pr_warn("prog '%s': inconsistent nr(%d) != 1\n",
1: -				prog->name, prog->instances.nr);
1: -		}
1: -		if (prog->obj->gen_loader)
1: -			bpf_program__record_externs(prog);
1: -		err = load_program(prog, prog->insns, prog->insns_cnt,
1: -				   license, kern_ver, &fd);
1: -		if (!err)
1: -			prog->instances.fds[0] = fd;
1: -		goto out;
1: -	}
1: -
1: -	for (i = 0; i < prog->instances.nr; i++) {
1: -		struct bpf_prog_prep_result result;
1: -		bpf_program_prep_t preprocessor = prog->preprocessor;
1: -
1: -		memset(&result, 0, sizeof(result));
1: -		err = preprocessor(prog, i, prog->insns,
1: -				   prog->insns_cnt, &result);
1: -		if (err) {
1: -			pr_warn("Preprocessing the %dth instance of program '%s' failed\n",
1: -				i, prog->name);
1: -			goto out;
1: -		}
1: -
1: -		if (!result.new_insn_ptr || !result.new_insn_cnt) {
1: -			pr_debug("Skip loading the %dth instance of program '%s'\n",
1: -				 i, prog->name);
1: -			prog->instances.fds[i] = -1;
1: -			if (result.pfd)
1: -				*result.pfd = -1;
1: -			continue;
1: -		}
1: -
1: -		err = load_program(prog, result.new_insn_ptr,
1: -				   result.new_insn_cnt, license, kern_ver, &fd);
1: -		if (err) {
1: -			pr_warn("Loading the %dth instance of program '%s' failed\n",
1: -				i, prog->name);
1: -			goto out;
1: -		}
1: -
1: -		if (result.pfd)
1: -			*result.pfd = fd;
1: -		prog->instances.fds[i] = fd;
1: -	}
1: +  free(log_buf);
1: +  return ret;
1: +}
1: +
1: +static int bpf_program__record_externs(struct bpf_program *prog) {
1: +  struct bpf_object *obj = prog->obj;
1: +  int i;
1: +
1: +  for (i = 0; i < prog->nr_reloc; i++) {
1: +    struct reloc_desc *relo = &prog->reloc_desc[i];
1: +    struct extern_desc *ext = &obj->externs[relo->sym_off];
1: +
1: +    switch (relo->type) {
1: +    case RELO_EXTERN_VAR:
1: +      if (ext->type != EXT_KSYM)
1: +        continue;
1: +      if (!ext->ksym.type_id) {
1: +        pr_warn("typeless ksym %s is not supported yet\n", ext->name);
1: +        return -ENOTSUP;
1: +      }
1: +      bpf_gen__record_extern(obj->gen_loader, ext->name, BTF_KIND_VAR,
1: +                             relo->insn_idx);
1: +      break;
1: +    case RELO_EXTERN_FUNC:
1: +      bpf_gen__record_extern(obj->gen_loader, ext->name, BTF_KIND_FUNC,
1: +                             relo->insn_idx);
1: +      break;
1: +    default:
1: +      continue;
1: +    }
1: +  }
1: +  return 0;
1: +}
1: +
1: +static int libbpf_find_attach_btf_id(struct bpf_program *prog, int *btf_obj_fd,
1: +                                     int *btf_type_id);
1: +
1: +int bpf_program__load(struct bpf_program *prog, char *license, __u32 kern_ver) {
1: +  int err = 0, fd, i;
1: +
1: +  if (prog->obj->loaded) {
1: +    pr_warn("prog '%s': can't load after object was loaded\n", prog->name);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if ((prog->type == BPF_PROG_TYPE_TRACING || prog->type == BPF_PROG_TYPE_LSM ||
1: +       prog->type == BPF_PROG_TYPE_EXT) &&
1: +      !prog->attach_btf_id) {
1: +    int btf_obj_fd = 0, btf_type_id = 0;
1: +
1: +    err = libbpf_find_attach_btf_id(prog, &btf_obj_fd, &btf_type_id);
1: +    if (err)
1: +      return libbpf_err(err);
1: +
1: +    prog->attach_btf_obj_fd = btf_obj_fd;
1: +    prog->attach_btf_id = btf_type_id;
1: +  }
1: +
1: +  if (prog->instances.nr < 0 || !prog->instances.fds) {
1: +    if (prog->preprocessor) {
1: +      pr_warn("Internal error: can't load program '%s'\n", prog->name);
1: +      return libbpf_err(-LIBBPF_ERRNO__INTERNAL);
1: +    }
1: +
1: +    prog->instances.fds = malloc(sizeof(int));
1: +    if (!prog->instances.fds) {
1: +      pr_warn("Not enough memory for BPF fds\n");
1: +      return libbpf_err(-ENOMEM);
1: +    }
1: +    prog->instances.nr = 1;
1: +    prog->instances.fds[0] = -1;
1: +  }
1: +
1: +  if (!prog->preprocessor) {
1: +    if (prog->instances.nr != 1) {
1: +      pr_warn("prog '%s': inconsistent nr(%d) != 1\n", prog->name,
1: +              prog->instances.nr);
1: +    }
1: +    if (prog->obj->gen_loader)
1: +      bpf_program__record_externs(prog);
1: +    err = load_program(prog, prog->insns, prog->insns_cnt, license, kern_ver,
1: +                       &fd);
1: +    if (!err)
1: +      prog->instances.fds[0] = fd;
1: +    goto out;
1: +  }
1: +
1: +  for (i = 0; i < prog->instances.nr; i++) {
1: +    struct bpf_prog_prep_result result;
1: +    bpf_program_prep_t preprocessor = prog->preprocessor;
1: +
1: +    memset(&result, 0, sizeof(result));
1: +    err = preprocessor(prog, i, prog->insns, prog->insns_cnt, &result);
1: +    if (err) {
1: +      pr_warn("Preprocessing the %dth instance of program '%s' failed\n", i,
1: +              prog->name);
1: +      goto out;
1: +    }
1: +
1: +    if (!result.new_insn_ptr || !result.new_insn_cnt) {
1: +      pr_debug("Skip loading the %dth instance of program '%s'\n", i,
1: +               prog->name);
1: +      prog->instances.fds[i] = -1;
1: +      if (result.pfd)
1: +        *result.pfd = -1;
1: +      continue;
1: +    }
1: +
1: +    err = load_program(prog, result.new_insn_ptr, result.new_insn_cnt, license,
1: +                       kern_ver, &fd);
1: +    if (err) {
1: +      pr_warn("Loading the %dth instance of program '%s' failed\n", i,
1: +              prog->name);
1: +      goto out;
1: +    }
1: +
1: +    if (result.pfd)
1: +      *result.pfd = fd;
1: +    prog->instances.fds[i] = fd;
1: +  }
1:  out:
1: -	if (err)
1: -		pr_warn("failed to load program '%s'\n", prog->name);
1: -	zfree(&prog->insns);
1: -	prog->insns_cnt = 0;
1: -	return libbpf_err(err);
1: -}
1: -
1: -static int
1: -bpf_object__load_progs(struct bpf_object *obj, int log_level)
1: -{
1: -	struct bpf_program *prog;
1: -	size_t i;
1: -	int err;
1: -
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		prog = &obj->programs[i];
1: -		err = bpf_object__sanitize_prog(obj, prog);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	for (i = 0; i < obj->nr_programs; i++) {
1: -		prog = &obj->programs[i];
1: -		if (prog_is_subprog(obj, prog))
1: -			continue;
1: -		if (!prog->load) {
1: -			pr_debug("prog '%s': skipped loading\n", prog->name);
1: -			continue;
1: -		}
1: -		prog->log_level |= log_level;
1: -		err = bpf_program__load(prog, obj->license, obj->kern_version);
1: -		if (err)
1: -			return err;
1: -	}
1: -	if (obj->gen_loader)
1: -		bpf_object__free_relocs(obj);
1: -	return 0;
1: +  if (err)
1: +    pr_warn("failed to load program '%s'\n", prog->name);
1: +  zfree(&prog->insns);
1: +  prog->insns_cnt = 0;
1: +  return libbpf_err(err);
1: +}
1: +
1: +static int bpf_object__load_progs(struct bpf_object *obj, int log_level) {
1: +  struct bpf_program *prog;
1: +  size_t i;
1: +  int err;
1: +
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    prog = &obj->programs[i];
1: +    err = bpf_object__sanitize_prog(obj, prog);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  for (i = 0; i < obj->nr_programs; i++) {
1: +    prog = &obj->programs[i];
1: +    if (prog_is_subprog(obj, prog))
1: +      continue;
1: +    if (!prog->load) {
1: +      pr_debug("prog '%s': skipped loading\n", prog->name);
1: +      continue;
1: +    }
1: +    prog->log_level |= log_level;
1: +    err = bpf_program__load(prog, obj->license, obj->kern_version);
1: +    if (err)
1: +      return err;
1: +  }
1: +  if (obj->gen_loader)
1: +    bpf_object__free_relocs(obj);
1: +  return 0;
1:  }
1:  
1:  static const struct bpf_sec_def *find_sec_def(const char *sec_name);
1:  
1: -static struct bpf_object *
1: -__bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz,
1: -		   const struct bpf_object_open_opts *opts)
1: -{
1: -	const char *obj_name, *kconfig;
1: -	struct bpf_program *prog;
1: -	struct bpf_object *obj;
1: -	char tmp_name[64];
1: -	int err;
1: -
1: -	if (elf_version(EV_CURRENT) == EV_NONE) {
1: -		pr_warn("failed to init libelf for %s\n",
1: -			path ? : "(mem buf)");
1: -		return ERR_PTR(-LIBBPF_ERRNO__LIBELF);
1: -	}
1: -
1: -	if (!OPTS_VALID(opts, bpf_object_open_opts))
1: -		return ERR_PTR(-EINVAL);
1: -
1: -	obj_name = OPTS_GET(opts, object_name, NULL);
1: -	if (obj_buf) {
1: -		if (!obj_name) {
1: -			snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx",
1: -				 (unsigned long)obj_buf,
1: -				 (unsigned long)obj_buf_sz);
1: -			obj_name = tmp_name;
1: -		}
1: -		path = obj_name;
1: -		pr_debug("loading object '%s' from buffer\n", obj_name);
1: -	}
1: -
1: -	obj = bpf_object__new(path, obj_buf, obj_buf_sz, obj_name);
1: -	if (IS_ERR(obj))
1: -		return obj;
1: -
1: -	kconfig = OPTS_GET(opts, kconfig, NULL);
1: -	if (kconfig) {
1: -		obj->kconfig = strdup(kconfig);
1: -		if (!obj->kconfig)
1: -			return ERR_PTR(-ENOMEM);
1: -	}
1: -
1: -	err = bpf_object__elf_init(obj);
1: -	err = err ? : bpf_object__check_endianness(obj);
1: -	err = err ? : bpf_object__elf_collect(obj);
1: -	err = err ? : bpf_object__collect_externs(obj);
1: -	err = err ? : bpf_object__finalize_btf(obj);
1: -	err = err ? : bpf_object__init_maps(obj, opts);
1: -	err = err ? : bpf_object__collect_relos(obj);
1: -	if (err)
1: -		goto out;
1: -	bpf_object__elf_finish(obj);
1: -
1: -	bpf_object__for_each_program(prog, obj) {
1: -		prog->sec_def = find_sec_def(prog->sec_name);
1: -		if (!prog->sec_def) {
1: -			/* couldn't guess, but user might manually specify */
1: -			pr_debug("prog '%s': unrecognized ELF section name '%s'\n",
1: -				prog->name, prog->sec_name);
1: -			continue;
1: -		}
1: -
1: -		if (prog->sec_def->is_sleepable)
1: -			prog->prog_flags |= BPF_F_SLEEPABLE;
1: -		bpf_program__set_type(prog, prog->sec_def->prog_type);
1: -		bpf_program__set_expected_attach_type(prog,
1: -				prog->sec_def->expected_attach_type);
1: -
1: -		if (prog->sec_def->prog_type == BPF_PROG_TYPE_TRACING ||
1: -		    prog->sec_def->prog_type == BPF_PROG_TYPE_EXT)
1: -			prog->attach_prog_fd = OPTS_GET(opts, attach_prog_fd, 0);
1: -	}
1: -
1: -	return obj;
1: +static struct bpf_object *__bpf_object__open(
1: +    const char *path, const void *obj_buf, size_t obj_buf_sz,
1: +    const struct bpf_object_open_opts *opts) {
1: +  const char *obj_name, *kconfig;
1: +  struct bpf_program *prog;
1: +  struct bpf_object *obj;
1: +  char tmp_name[64];
1: +  int err;
1: +
1: +  if (elf_version(EV_CURRENT) == EV_NONE) {
1: +    pr_warn("failed to init libelf for %s\n", path ?: "(mem buf)");
1: +    return ERR_PTR(-LIBBPF_ERRNO__LIBELF);
1: +  }
1: +
1: +  if (!OPTS_VALID(opts, bpf_object_open_opts))
1: +    return ERR_PTR(-EINVAL);
1: +
1: +  obj_name = OPTS_GET(opts, object_name, NULL);
1: +  if (obj_buf) {
1: +    if (!obj_name) {
1: +      snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx", (unsigned long)obj_buf,
1: +               (unsigned long)obj_buf_sz);
1: +      obj_name = tmp_name;
1: +    }
1: +    path = obj_name;
1: +    pr_debug("loading object '%s' from buffer\n", obj_name);
1: +  }
1: +
1: +  obj = bpf_object__new(path, obj_buf, obj_buf_sz, obj_name);
1: +  if (IS_ERR(obj))
1: +    return obj;
1: +
1: +  kconfig = OPTS_GET(opts, kconfig, NULL);
1: +  if (kconfig) {
1: +    obj->kconfig = strdup(kconfig);
1: +    if (!obj->kconfig)
1: +      return ERR_PTR(-ENOMEM);
1: +  }
1: +
1: +  err = bpf_object__elf_init(obj);
1: +  err = err ?: bpf_object__check_endianness(obj);
1: +  err = err ?: bpf_object__elf_collect(obj);
1: +  err = err ?: bpf_object__collect_externs(obj);
1: +  err = err ?: bpf_object__finalize_btf(obj);
1: +  err = err ?: bpf_object__init_maps(obj, opts);
1: +  err = err ?: bpf_object__collect_relos(obj);
1: +  if (err)
1: +    goto out;
1: +  bpf_object__elf_finish(obj);
1: +
1: +  bpf_object__for_each_program(prog, obj) {
1: +    prog->sec_def = find_sec_def(prog->sec_name);
1: +    if (!prog->sec_def) {
1: +      /* couldn't guess, but user might manually specify */
1: +      pr_debug("prog '%s': unrecognized ELF section name '%s'\n", prog->name,
1: +               prog->sec_name);
1: +      continue;
1: +    }
1: +
1: +    if (prog->sec_def->is_sleepable)
1: +      prog->prog_flags |= BPF_F_SLEEPABLE;
1: +    bpf_program__set_type(prog, prog->sec_def->prog_type);
1: +    bpf_program__set_expected_attach_type(prog,
1: +                                          prog->sec_def->expected_attach_type);
1: +
1: +    if (prog->sec_def->prog_type == BPF_PROG_TYPE_TRACING ||
1: +        prog->sec_def->prog_type == BPF_PROG_TYPE_EXT)
1: +      prog->attach_prog_fd = OPTS_GET(opts, attach_prog_fd, 0);
1: +  }
1: +
1: +  return obj;
1:  out:
1: -	bpf_object__close(obj);
1: -	return ERR_PTR(err);
1: +  bpf_object__close(obj);
1: +  return ERR_PTR(err);
1: +}
1: +
1: +static struct bpf_object *__bpf_object__open_xattr(
1: +    struct bpf_object_open_attr *attr, int flags) {
1: +  DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
1: +                      .relaxed_maps = flags & MAPS_RELAX_COMPAT, );
1: +
1: +  /* param validation */
1: +  if (!attr->file)
1: +    return NULL;
1: +
1: +  pr_debug("loading %s\n", attr->file);
1: +  return __bpf_object__open(attr->file, NULL, 0, &opts);
1: +}
1: +
1: +struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr) {
1: +  return libbpf_ptr(__bpf_object__open_xattr(attr, 0));
1:  }
1:  
1: -static struct bpf_object *
1: -__bpf_object__open_xattr(struct bpf_object_open_attr *attr, int flags)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
1: -		.relaxed_maps = flags & MAPS_RELAX_COMPAT,
1: -	);
1: +struct bpf_object *bpf_object__open(const char *path) {
1: +  struct bpf_object_open_attr attr = {
1: +      .file = path, .prog_type = BPF_PROG_TYPE_UNSPEC,
1: +  };
1: +
1: +  return libbpf_ptr(__bpf_object__open_xattr(&attr, 0));
1: +}
1:  
1: -	/* param validation */
1: -	if (!attr->file)
1: -		return NULL;
1: +struct bpf_object *bpf_object__open_file(
1: +    const char *path, const struct bpf_object_open_opts *opts) {
1: +  if (!path)
1: +    return libbpf_err_ptr(-EINVAL);
1:  
1: -	pr_debug("loading %s\n", attr->file);
1: -	return __bpf_object__open(attr->file, NULL, 0, &opts);
1: +  pr_debug("loading %s\n", path);
1: +
1: +  return libbpf_ptr(__bpf_object__open(path, NULL, 0, opts));
1:  }
1:  
1: -struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr)
1: -{
1: -	return libbpf_ptr(__bpf_object__open_xattr(attr, 0));
1: +struct bpf_object *bpf_object__open_mem(
1: +    const void *obj_buf, size_t obj_buf_sz,
1: +    const struct bpf_object_open_opts *opts) {
1: +  if (!obj_buf || obj_buf_sz == 0)
1: +    return libbpf_err_ptr(-EINVAL);
1: +
1: +  return libbpf_ptr(__bpf_object__open(NULL, obj_buf, obj_buf_sz, opts));
1: +}
1: +
1: +struct bpf_object *bpf_object__open_buffer(const void *obj_buf,
1: +                                           size_t obj_buf_sz,
1: +                                           const char *name) {
1: +  DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts, .object_name = name,
1: +                      /* wrong default, but backwards-compatible */
1: +                      .relaxed_maps = true, );
1: +
1: +  /* returning NULL is wrong, but backwards-compatible */
1: +  if (!obj_buf || obj_buf_sz == 0)
1: +    return errno = EINVAL, NULL;
1: +
1: +  return libbpf_ptr(__bpf_object__open(NULL, obj_buf, obj_buf_sz, &opts));
1:  }
1:  
1: -struct bpf_object *bpf_object__open(const char *path)
1: -{
1: -	struct bpf_object_open_attr attr = {
1: -		.file		= path,
1: -		.prog_type	= BPF_PROG_TYPE_UNSPEC,
1: -	};
1: +int bpf_object__unload(struct bpf_object *obj) {
1: +  size_t i;
1:  
1: -	return libbpf_ptr(__bpf_object__open_xattr(&attr, 0));
1: +  if (!obj)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  for (i = 0; i < obj->nr_maps; i++) {
1: +    zclose(obj->maps[i].fd);
1: +    if (obj->maps[i].st_ops)
1: +      zfree(&obj->maps[i].st_ops->kern_vdata);
1: +  }
1: +
1: +  for (i = 0; i < obj->nr_programs; i++)
1: +    bpf_program__unload(&obj->programs[i]);
1: +
1: +  return 0;
1:  }
1:  
1: -struct bpf_object *
1: -bpf_object__open_file(const char *path, const struct bpf_object_open_opts *opts)
1: -{
1: -	if (!path)
1: -		return libbpf_err_ptr(-EINVAL);
1: +static int bpf_object__sanitize_maps(struct bpf_object *obj) {
1: +  struct bpf_map *m;
1:  
1: -	pr_debug("loading %s\n", path);
1: +  bpf_object__for_each_map(m, obj) {
1: +    if (!bpf_map__is_internal(m))
1: +      continue;
1: +    if (!kernel_supports(obj, FEAT_GLOBAL_DATA)) {
1: +      pr_warn("kernel doesn't support global data\n");
1: +      return -ENOTSUP;
1: +    }
1: +    if (!kernel_supports(obj, FEAT_ARRAY_MMAP))
1: +      m->def.map_flags ^= BPF_F_MMAPABLE;
1: +  }
1:  
1: -	return libbpf_ptr(__bpf_object__open(path, NULL, 0, opts));
1: +  return 0;
1:  }
1:  
1: -struct bpf_object *
1: -bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz,
1: -		     const struct bpf_object_open_opts *opts)
1: -{
1: -	if (!obj_buf || obj_buf_sz == 0)
1: -		return libbpf_err_ptr(-EINVAL);
1: -
1: -	return libbpf_ptr(__bpf_object__open(NULL, obj_buf, obj_buf_sz, opts));
1: -}
1: -
1: -struct bpf_object *
1: -bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz,
1: -			const char *name)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
1: -		.object_name = name,
1: -		/* wrong default, but backwards-compatible */
1: -		.relaxed_maps = true,
1: -	);
1: -
1: -	/* returning NULL is wrong, but backwards-compatible */
1: -	if (!obj_buf || obj_buf_sz == 0)
1: -		return errno = EINVAL, NULL;
1: -
1: -	return libbpf_ptr(__bpf_object__open(NULL, obj_buf, obj_buf_sz, &opts));
1: -}
1: -
1: -int bpf_object__unload(struct bpf_object *obj)
1: -{
1: -	size_t i;
1: -
1: -	if (!obj)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	for (i = 0; i < obj->nr_maps; i++) {
1: -		zclose(obj->maps[i].fd);
1: -		if (obj->maps[i].st_ops)
1: -			zfree(&obj->maps[i].st_ops->kern_vdata);
1: -	}
1: -
1: -	for (i = 0; i < obj->nr_programs; i++)
1: -		bpf_program__unload(&obj->programs[i]);
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__sanitize_maps(struct bpf_object *obj)
1: -{
1: -	struct bpf_map *m;
1: -
1: -	bpf_object__for_each_map(m, obj) {
1: -		if (!bpf_map__is_internal(m))
1: -			continue;
1: -		if (!kernel_supports(obj, FEAT_GLOBAL_DATA)) {
1: -			pr_warn("kernel doesn't support global data\n");
1: -			return -ENOTSUP;
1: -		}
1: -		if (!kernel_supports(obj, FEAT_ARRAY_MMAP))
1: -			m->def.map_flags ^= BPF_F_MMAPABLE;
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__read_kallsyms_file(struct bpf_object *obj)
1: -{
1: -	char sym_type, sym_name[500];
1: -	unsigned long long sym_addr;
1: -	const struct btf_type *t;
1: -	struct extern_desc *ext;
1: -	int ret, err = 0;
1: -	FILE *f;
1: -
1: -	f = fopen("/proc/kallsyms", "r");
1: -	if (!f) {
1: -		err = -errno;
1: -		pr_warn("failed to open /proc/kallsyms: %d\n", err);
1: -		return err;
1: -	}
1: -
1: -	while (true) {
1: -		ret = fscanf(f, "%llx %c %499s%*[^\n]\n",
1: -			     &sym_addr, &sym_type, sym_name);
1: -		if (ret == EOF && feof(f))
1: -			break;
1: -		if (ret != 3) {
1: -			pr_warn("failed to read kallsyms entry: %d\n", ret);
1: -			err = -EINVAL;
1: -			goto out;
1: -		}
1: -
1: -		ext = find_extern_by_name(obj, sym_name);
1: -		if (!ext || ext->type != EXT_KSYM)
1: -			continue;
1: -
1: -		t = btf__type_by_id(obj->btf, ext->btf_id);
1: -		if (!btf_is_var(t))
1: -			continue;
1: -
1: -		if (ext->is_set && ext->ksym.addr != sym_addr) {
1: -			pr_warn("extern (ksym) '%s' resolution is ambiguous: 0x%llx or 0x%llx\n",
1: -				sym_name, ext->ksym.addr, sym_addr);
1: -			err = -EINVAL;
1: -			goto out;
1: -		}
1: -		if (!ext->is_set) {
1: -			ext->is_set = true;
1: -			ext->ksym.addr = sym_addr;
1: -			pr_debug("extern (ksym) %s=0x%llx\n", sym_name, sym_addr);
1: -		}
1: -	}
1: +static int bpf_object__read_kallsyms_file(struct bpf_object *obj) {
1: +  char sym_type, sym_name[500];
1: +  unsigned long long sym_addr;
1: +  const struct btf_type *t;
1: +  struct extern_desc *ext;
1: +  int ret, err = 0;
1: +  FILE *f;
1: +
1: +  f = fopen("/proc/kallsyms", "r");
1: +  if (!f) {
1: +    err = -errno;
1: +    pr_warn("failed to open /proc/kallsyms: %d\n", err);
1: +    return err;
1: +  }
1: +
1: +  while (true) {
1: +    ret = fscanf(f, "%llx %c %499s%*[^\n]\n", &sym_addr, &sym_type, sym_name);
1: +    if (ret == EOF && feof(f))
1: +      break;
1: +    if (ret != 3) {
1: +      pr_warn("failed to read kallsyms entry: %d\n", ret);
1: +      err = -EINVAL;
1: +      goto out;
1: +    }
1: +
1: +    ext = find_extern_by_name(obj, sym_name);
1: +    if (!ext || ext->type != EXT_KSYM)
1: +      continue;
1: +
1: +    t = btf__type_by_id(obj->btf, ext->btf_id);
1: +    if (!btf_is_var(t))
1: +      continue;
1: +
1: +    if (ext->is_set && ext->ksym.addr != sym_addr) {
1: +      pr_warn("extern (ksym) '%s' resolution is ambiguous: 0x%llx or 0x%llx\n",
1: +              sym_name, ext->ksym.addr, sym_addr);
1: +      err = -EINVAL;
1: +      goto out;
1: +    }
1: +    if (!ext->is_set) {
1: +      ext->is_set = true;
1: +      ext->ksym.addr = sym_addr;
1: +      pr_debug("extern (ksym) %s=0x%llx\n", sym_name, sym_addr);
1: +    }
1: +  }
1:  
1:  out:
1: -	fclose(f);
1: -	return err;
1: +  fclose(f);
1: +  return err;
1:  }
1:  
1:  static int find_ksym_btf_id(struct bpf_object *obj, const char *ksym_name,
1: -			    __u16 kind, struct btf **res_btf,
1: -			    int *res_btf_fd)
1: -{
1: -	int i, id, btf_fd, err;
1: -	struct btf *btf;
1: -
1: -	btf = obj->btf_vmlinux;
1: -	btf_fd = 0;
1: -	id = btf__find_by_name_kind(btf, ksym_name, kind);
1: -
1: -	if (id == -ENOENT) {
1: -		err = load_module_btfs(obj);
1: -		if (err)
1: -			return err;
1: -
1: -		for (i = 0; i < obj->btf_module_cnt; i++) {
1: -			btf = obj->btf_modules[i].btf;
1: -			/* we assume module BTF FD is always >0 */
1: -			btf_fd = obj->btf_modules[i].fd;
1: -			id = btf__find_by_name_kind(btf, ksym_name, kind);
1: -			if (id != -ENOENT)
1: -				break;
1: -		}
1: -	}
1: -	if (id <= 0) {
1: -		pr_warn("extern (%s ksym) '%s': failed to find BTF ID in kernel BTF(s).\n",
1: -			__btf_kind_str(kind), ksym_name);
1: -		return -ESRCH;
1: -	}
1: -
1: -	*res_btf = btf;
1: -	*res_btf_fd = btf_fd;
1: -	return id;
1: +                            __u16 kind, struct btf **res_btf, int *res_btf_fd) {
1: +  int i, id, btf_fd, err;
1: +  struct btf *btf;
1: +
1: +  btf = obj->btf_vmlinux;
1: +  btf_fd = 0;
1: +  id = btf__find_by_name_kind(btf, ksym_name, kind);
1: +
1: +  if (id == -ENOENT) {
1: +    err = load_module_btfs(obj);
1: +    if (err)
1: +      return err;
1: +
1: +    for (i = 0; i < obj->btf_module_cnt; i++) {
1: +      btf = obj->btf_modules[i].btf;
1: +      /* we assume module BTF FD is always >0 */
1: +      btf_fd = obj->btf_modules[i].fd;
1: +      id = btf__find_by_name_kind(btf, ksym_name, kind);
1: +      if (id != -ENOENT)
1: +        break;
1: +    }
1: +  }
1: +  if (id <= 0) {
1: +    pr_warn("extern (%s ksym) '%s': failed to find BTF ID in kernel BTF(s).\n",
1: +            __btf_kind_str(kind), ksym_name);
1: +    return -ESRCH;
1: +  }
1: +
1: +  *res_btf = btf;
1: +  *res_btf_fd = btf_fd;
1: +  return id;
1:  }
1:  
1:  static int bpf_object__resolve_ksym_var_btf_id(struct bpf_object *obj,
1: -					       struct extern_desc *ext)
1: -{
1: -	const struct btf_type *targ_var, *targ_type;
1: -	__u32 targ_type_id, local_type_id;
1: -	const char *targ_var_name;
1: -	int id, btf_fd = 0, err;
1: -	struct btf *btf = NULL;
1: -
1: -	id = find_ksym_btf_id(obj, ext->name, BTF_KIND_VAR, &btf, &btf_fd);
1: -	if (id < 0)
1: -		return id;
1: -
1: -	/* find local type_id */
1: -	local_type_id = ext->ksym.type_id;
1: -
1: -	/* find target type_id */
1: -	targ_var = btf__type_by_id(btf, id);
1: -	targ_var_name = btf__name_by_offset(btf, targ_var->name_off);
1: -	targ_type = skip_mods_and_typedefs(btf, targ_var->type, &targ_type_id);
1: -
1: -	err = bpf_core_types_are_compat(obj->btf, local_type_id,
1: -					btf, targ_type_id);
1: -	if (err <= 0) {
1: -		const struct btf_type *local_type;
1: -		const char *targ_name, *local_name;
1: -
1: -		local_type = btf__type_by_id(obj->btf, local_type_id);
1: -		local_name = btf__name_by_offset(obj->btf, local_type->name_off);
1: -		targ_name = btf__name_by_offset(btf, targ_type->name_off);
1: -
1: -		pr_warn("extern (var ksym) '%s': incompatible types, expected [%d] %s %s, but kernel has [%d] %s %s\n",
1: -			ext->name, local_type_id,
1: -			btf_kind_str(local_type), local_name, targ_type_id,
1: -			btf_kind_str(targ_type), targ_name);
1: -		return -EINVAL;
1: -	}
1: -
1: -	ext->is_set = true;
1: -	ext->ksym.kernel_btf_obj_fd = btf_fd;
1: -	ext->ksym.kernel_btf_id = id;
1: -	pr_debug("extern (var ksym) '%s': resolved to [%d] %s %s\n",
1: -		 ext->name, id, btf_kind_str(targ_var), targ_var_name);
1: -
1: -	return 0;
1: +                                               struct extern_desc *ext) {
1: +  const struct btf_type *targ_var, *targ_type;
1: +  __u32 targ_type_id, local_type_id;
1: +  const char *targ_var_name;
1: +  int id, btf_fd = 0, err;
1: +  struct btf *btf = NULL;
1: +
1: +  id = find_ksym_btf_id(obj, ext->name, BTF_KIND_VAR, &btf, &btf_fd);
1: +  if (id < 0)
1: +    return id;
1: +
1: +  /* find local type_id */
1: +  local_type_id = ext->ksym.type_id;
1: +
1: +  /* find target type_id */
1: +  targ_var = btf__type_by_id(btf, id);
1: +  targ_var_name = btf__name_by_offset(btf, targ_var->name_off);
1: +  targ_type = skip_mods_and_typedefs(btf, targ_var->type, &targ_type_id);
1: +
1: +  err = bpf_core_types_are_compat(obj->btf, local_type_id, btf, targ_type_id);
1: +  if (err <= 0) {
1: +    const struct btf_type *local_type;
1: +    const char *targ_name, *local_name;
1: +
1: +    local_type = btf__type_by_id(obj->btf, local_type_id);
1: +    local_name = btf__name_by_offset(obj->btf, local_type->name_off);
1: +    targ_name = btf__name_by_offset(btf, targ_type->name_off);
1: +
1: +    pr_warn(
1: +        "extern (var ksym) '%s': incompatible types, expected [%d] %s %s, but "
1: +        "kernel has [%d] %s %s\n",
1: +        ext->name, local_type_id, btf_kind_str(local_type), local_name,
1: +        targ_type_id, btf_kind_str(targ_type), targ_name);
1: +    return -EINVAL;
1: +  }
1: +
1: +  ext->is_set = true;
1: +  ext->ksym.kernel_btf_obj_fd = btf_fd;
1: +  ext->ksym.kernel_btf_id = id;
1: +  pr_debug("extern (var ksym) '%s': resolved to [%d] %s %s\n", ext->name, id,
1: +           btf_kind_str(targ_var), targ_var_name);
1: +
1: +  return 0;
1:  }
1:  
1:  static int bpf_object__resolve_ksym_func_btf_id(struct bpf_object *obj,
1: -						struct extern_desc *ext)
1: -{
1: -	int local_func_proto_id, kfunc_proto_id, kfunc_id;
1: -	const struct btf_type *kern_func;
1: -	struct btf *kern_btf = NULL;
1: -	int ret, kern_btf_fd = 0;
1: -
1: -	local_func_proto_id = ext->ksym.type_id;
1: -
1: -	kfunc_id = find_ksym_btf_id(obj, ext->name, BTF_KIND_FUNC,
1: -				    &kern_btf, &kern_btf_fd);
1: -	if (kfunc_id < 0) {
1: -		pr_warn("extern (func ksym) '%s': not found in kernel BTF\n",
1: -			ext->name);
1: -		return kfunc_id;
1: -	}
1: -
1: -	if (kern_btf != obj->btf_vmlinux) {
1: -		pr_warn("extern (func ksym) '%s': function in kernel module is not supported\n",
1: -			ext->name);
1: -		return -ENOTSUP;
1: -	}
1: -
1: -	kern_func = btf__type_by_id(kern_btf, kfunc_id);
1: -	kfunc_proto_id = kern_func->type;
1: -
1: -	ret = bpf_core_types_are_compat(obj->btf, local_func_proto_id,
1: -					kern_btf, kfunc_proto_id);
1: -	if (ret <= 0) {
1: -		pr_warn("extern (func ksym) '%s': func_proto [%d] incompatible with kernel [%d]\n",
1: -			ext->name, local_func_proto_id, kfunc_proto_id);
1: -		return -EINVAL;
1: -	}
1: -
1: -	ext->is_set = true;
1: -	ext->ksym.kernel_btf_obj_fd = kern_btf_fd;
1: -	ext->ksym.kernel_btf_id = kfunc_id;
1: -	pr_debug("extern (func ksym) '%s': resolved to kernel [%d]\n",
1: -		 ext->name, kfunc_id);
1: -
1: -	return 0;
1: -}
1: -
1: -static int bpf_object__resolve_ksyms_btf_id(struct bpf_object *obj)
1: -{
1: -	const struct btf_type *t;
1: -	struct extern_desc *ext;
1: -	int i, err;
1: -
1: -	for (i = 0; i < obj->nr_extern; i++) {
1: -		ext = &obj->externs[i];
1: -		if (ext->type != EXT_KSYM || !ext->ksym.type_id)
1: -			continue;
1: -
1: -		if (obj->gen_loader) {
1: -			ext->is_set = true;
1: -			ext->ksym.kernel_btf_obj_fd = 0;
1: -			ext->ksym.kernel_btf_id = 0;
1: -			continue;
1: -		}
1: -		t = btf__type_by_id(obj->btf, ext->btf_id);
1: -		if (btf_is_var(t))
1: -			err = bpf_object__resolve_ksym_var_btf_id(obj, ext);
1: -		else
1: -			err = bpf_object__resolve_ksym_func_btf_id(obj, ext);
1: -		if (err)
1: -			return err;
1: -	}
1: -	return 0;
1: +                                                struct extern_desc *ext) {
1: +  int local_func_proto_id, kfunc_proto_id, kfunc_id;
1: +  const struct btf_type *kern_func;
1: +  struct btf *kern_btf = NULL;
1: +  int ret, kern_btf_fd = 0;
1: +
1: +  local_func_proto_id = ext->ksym.type_id;
1: +
1: +  kfunc_id =
1: +      find_ksym_btf_id(obj, ext->name, BTF_KIND_FUNC, &kern_btf, &kern_btf_fd);
1: +  if (kfunc_id < 0) {
1: +    pr_warn("extern (func ksym) '%s': not found in kernel BTF\n", ext->name);
1: +    return kfunc_id;
1: +  }
1: +
1: +  if (kern_btf != obj->btf_vmlinux) {
1: +    pr_warn(
1: +        "extern (func ksym) '%s': function in kernel module is not supported\n",
1: +        ext->name);
1: +    return -ENOTSUP;
1: +  }
1: +
1: +  kern_func = btf__type_by_id(kern_btf, kfunc_id);
1: +  kfunc_proto_id = kern_func->type;
1: +
1: +  ret = bpf_core_types_are_compat(obj->btf, local_func_proto_id, kern_btf,
1: +                                  kfunc_proto_id);
1: +  if (ret <= 0) {
1: +    pr_warn(
1: +        "extern (func ksym) '%s': func_proto [%d] incompatible with kernel "
1: +        "[%d]\n",
1: +        ext->name, local_func_proto_id, kfunc_proto_id);
1: +    return -EINVAL;
1: +  }
1: +
1: +  ext->is_set = true;
1: +  ext->ksym.kernel_btf_obj_fd = kern_btf_fd;
1: +  ext->ksym.kernel_btf_id = kfunc_id;
1: +  pr_debug("extern (func ksym) '%s': resolved to kernel [%d]\n", ext->name,
1: +           kfunc_id);
1: +
1: +  return 0;
1: +}
1: +
1: +static int bpf_object__resolve_ksyms_btf_id(struct bpf_object *obj) {
1: +  const struct btf_type *t;
1: +  struct extern_desc *ext;
1: +  int i, err;
1: +
1: +  for (i = 0; i < obj->nr_extern; i++) {
1: +    ext = &obj->externs[i];
1: +    if (ext->type != EXT_KSYM || !ext->ksym.type_id)
1: +      continue;
1: +
1: +    if (obj->gen_loader) {
1: +      ext->is_set = true;
1: +      ext->ksym.kernel_btf_obj_fd = 0;
1: +      ext->ksym.kernel_btf_id = 0;
1: +      continue;
1: +    }
1: +    t = btf__type_by_id(obj->btf, ext->btf_id);
1: +    if (btf_is_var(t))
1: +      err = bpf_object__resolve_ksym_var_btf_id(obj, ext);
1: +    else
1: +      err = bpf_object__resolve_ksym_func_btf_id(obj, ext);
1: +    if (err)
1: +      return err;
1: +  }
1: +  return 0;
1:  }
1:  
1:  static int bpf_object__resolve_externs(struct bpf_object *obj,
1: -				       const char *extra_kconfig)
1: -{
1: -	bool need_config = false, need_kallsyms = false;
1: -	bool need_vmlinux_btf = false;
1: -	struct extern_desc *ext;
1: -	void *kcfg_data = NULL;
1: -	int err, i;
1: -
1: -	if (obj->nr_extern == 0)
1: -		return 0;
1: -
1: -	if (obj->kconfig_map_idx >= 0)
1: -		kcfg_data = obj->maps[obj->kconfig_map_idx].mmaped;
1: -
1: -	for (i = 0; i < obj->nr_extern; i++) {
1: -		ext = &obj->externs[i];
1: -
1: -		if (ext->type == EXT_KCFG &&
1: -		    strcmp(ext->name, "LINUX_KERNEL_VERSION") == 0) {
1: -			void *ext_val = kcfg_data + ext->kcfg.data_off;
1: -			__u32 kver = get_kernel_version();
1: -
1: -			if (!kver) {
1: -				pr_warn("failed to get kernel version\n");
1: -				return -EINVAL;
1: -			}
1: -			err = set_kcfg_value_num(ext, ext_val, kver);
1: -			if (err)
1: -				return err;
1: -			pr_debug("extern (kcfg) %s=0x%x\n", ext->name, kver);
1: -		} else if (ext->type == EXT_KCFG &&
1: -			   strncmp(ext->name, "CONFIG_", 7) == 0) {
1: -			need_config = true;
1: -		} else if (ext->type == EXT_KSYM) {
1: -			if (ext->ksym.type_id)
1: -				need_vmlinux_btf = true;
1: -			else
1: -				need_kallsyms = true;
1: -		} else {
1: -			pr_warn("unrecognized extern '%s'\n", ext->name);
1: -			return -EINVAL;
1: -		}
1: -	}
1: -	if (need_config && extra_kconfig) {
1: -		err = bpf_object__read_kconfig_mem(obj, extra_kconfig, kcfg_data);
1: -		if (err)
1: -			return -EINVAL;
1: -		need_config = false;
1: -		for (i = 0; i < obj->nr_extern; i++) {
1: -			ext = &obj->externs[i];
1: -			if (ext->type == EXT_KCFG && !ext->is_set) {
1: -				need_config = true;
1: -				break;
1: -			}
1: -		}
1: -	}
1: -	if (need_config) {
1: -		err = bpf_object__read_kconfig_file(obj, kcfg_data);
1: -		if (err)
1: -			return -EINVAL;
1: -	}
1: -	if (need_kallsyms) {
1: -		err = bpf_object__read_kallsyms_file(obj);
1: -		if (err)
1: -			return -EINVAL;
1: -	}
1: -	if (need_vmlinux_btf) {
1: -		err = bpf_object__resolve_ksyms_btf_id(obj);
1: -		if (err)
1: -			return -EINVAL;
1: -	}
1: -	for (i = 0; i < obj->nr_extern; i++) {
1: -		ext = &obj->externs[i];
1: -
1: -		if (!ext->is_set && !ext->is_weak) {
1: -			pr_warn("extern %s (strong) not resolved\n", ext->name);
1: -			return -ESRCH;
1: -		} else if (!ext->is_set) {
1: -			pr_debug("extern %s (weak) not resolved, defaulting to zero\n",
1: -				 ext->name);
1: -		}
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -int bpf_object__load_xattr(struct bpf_object_load_attr *attr)
1: -{
1: -	struct bpf_object *obj;
1: -	int err, i;
1: -
1: -	if (!attr)
1: -		return libbpf_err(-EINVAL);
1: -	obj = attr->obj;
1: -	if (!obj)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	if (obj->loaded) {
1: -		pr_warn("object '%s': load can't be attempted twice\n", obj->name);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (obj->gen_loader)
1: -		bpf_gen__init(obj->gen_loader, attr->log_level);
1: -
1: -	err = bpf_object__probe_loading(obj);
1: -	err = err ? : bpf_object__load_vmlinux_btf(obj, false);
1: -	err = err ? : bpf_object__resolve_externs(obj, obj->kconfig);
1: -	err = err ? : bpf_object__sanitize_and_load_btf(obj);
1: -	err = err ? : bpf_object__sanitize_maps(obj);
1: -	err = err ? : bpf_object__init_kern_struct_ops_maps(obj);
1: -	err = err ? : bpf_object__create_maps(obj);
1: -	err = err ? : bpf_object__relocate(obj, attr->target_btf_path);
1: -	err = err ? : bpf_object__load_progs(obj, attr->log_level);
1: -
1: -	if (obj->gen_loader) {
1: -		/* reset FDs */
1: -		btf__set_fd(obj->btf, -1);
1: -		for (i = 0; i < obj->nr_maps; i++)
1: -			obj->maps[i].fd = -1;
1: -		if (!err)
1: -			err = bpf_gen__finish(obj->gen_loader);
1: -	}
1: -
1: -	/* clean up module BTFs */
1: -	for (i = 0; i < obj->btf_module_cnt; i++) {
1: -		close(obj->btf_modules[i].fd);
1: -		btf__free(obj->btf_modules[i].btf);
1: -		free(obj->btf_modules[i].name);
1: -	}
1: -	free(obj->btf_modules);
1: -
1: -	/* clean up vmlinux BTF */
1: -	btf__free(obj->btf_vmlinux);
1: -	obj->btf_vmlinux = NULL;
1: -
1: -	obj->loaded = true; /* doesn't matter if successfully or not */
1: -
1: -	if (err)
1: -		goto out;
1: -
1: -	return 0;
1: +                                       const char *extra_kconfig) {
1: +  bool need_config = false, need_kallsyms = false;
1: +  bool need_vmlinux_btf = false;
1: +  struct extern_desc *ext;
1: +  void *kcfg_data = NULL;
1: +  int err, i;
1: +
1: +  if (obj->nr_extern == 0)
1: +    return 0;
1: +
1: +  if (obj->kconfig_map_idx >= 0)
1: +    kcfg_data = obj->maps[obj->kconfig_map_idx].mmaped;
1: +
1: +  for (i = 0; i < obj->nr_extern; i++) {
1: +    ext = &obj->externs[i];
1: +
1: +    if (ext->type == EXT_KCFG &&
1: +        strcmp(ext->name, "LINUX_KERNEL_VERSION") == 0) {
1: +      void *ext_val = kcfg_data + ext->kcfg.data_off;
1: +      __u32 kver = get_kernel_version();
1: +
1: +      if (!kver) {
1: +        pr_warn("failed to get kernel version\n");
1: +        return -EINVAL;
1: +      }
1: +      err = set_kcfg_value_num(ext, ext_val, kver);
1: +      if (err)
1: +        return err;
1: +      pr_debug("extern (kcfg) %s=0x%x\n", ext->name, kver);
1: +    } else if (ext->type == EXT_KCFG && strncmp(ext->name, "CONFIG_", 7) == 0) {
1: +      need_config = true;
1: +    } else if (ext->type == EXT_KSYM) {
1: +      if (ext->ksym.type_id)
1: +        need_vmlinux_btf = true;
1: +      else
1: +        need_kallsyms = true;
1: +    } else {
1: +      pr_warn("unrecognized extern '%s'\n", ext->name);
1: +      return -EINVAL;
1: +    }
1: +  }
1: +  if (need_config && extra_kconfig) {
1: +    err = bpf_object__read_kconfig_mem(obj, extra_kconfig, kcfg_data);
1: +    if (err)
1: +      return -EINVAL;
1: +    need_config = false;
1: +    for (i = 0; i < obj->nr_extern; i++) {
1: +      ext = &obj->externs[i];
1: +      if (ext->type == EXT_KCFG && !ext->is_set) {
1: +        need_config = true;
1: +        break;
1: +      }
1: +    }
1: +  }
1: +  if (need_config) {
1: +    err = bpf_object__read_kconfig_file(obj, kcfg_data);
1: +    if (err)
1: +      return -EINVAL;
1: +  }
1: +  if (need_kallsyms) {
1: +    err = bpf_object__read_kallsyms_file(obj);
1: +    if (err)
1: +      return -EINVAL;
1: +  }
1: +  if (need_vmlinux_btf) {
1: +    err = bpf_object__resolve_ksyms_btf_id(obj);
1: +    if (err)
1: +      return -EINVAL;
1: +  }
1: +  for (i = 0; i < obj->nr_extern; i++) {
1: +    ext = &obj->externs[i];
1: +
1: +    if (!ext->is_set && !ext->is_weak) {
1: +      pr_warn("extern %s (strong) not resolved\n", ext->name);
1: +      return -ESRCH;
1: +    } else if (!ext->is_set) {
1: +      pr_debug("extern %s (weak) not resolved, defaulting to zero\n",
1: +               ext->name);
1: +    }
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +int bpf_object__load_xattr(struct bpf_object_load_attr *attr) {
1: +  struct bpf_object *obj;
1: +  int err, i;
1: +
1: +  if (!attr)
1: +    return libbpf_err(-EINVAL);
1: +  obj = attr->obj;
1: +  if (!obj)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  if (obj->loaded) {
1: +    pr_warn("object '%s': load can't be attempted twice\n", obj->name);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (obj->gen_loader)
1: +    bpf_gen__init(obj->gen_loader, attr->log_level);
1: +
1: +  err = bpf_object__probe_loading(obj);
1: +  err = err ?: bpf_object__load_vmlinux_btf(obj, false);
1: +  err = err ?: bpf_object__resolve_externs(obj, obj->kconfig);
1: +  err = err ?: bpf_object__sanitize_and_load_btf(obj);
1: +  err = err ?: bpf_object__sanitize_maps(obj);
1: +  err = err ?: bpf_object__init_kern_struct_ops_maps(obj);
1: +  err = err ?: bpf_object__create_maps(obj);
1: +  err = err ?: bpf_object__relocate(obj, attr->target_btf_path);
1: +  err = err ?: bpf_object__load_progs(obj, attr->log_level);
1: +
1: +  if (obj->gen_loader) {
1: +    /* reset FDs */
1: +    btf__set_fd(obj->btf, -1);
1: +    for (i = 0; i < obj->nr_maps; i++)
1: +      obj->maps[i].fd = -1;
1: +    if (!err)
1: +      err = bpf_gen__finish(obj->gen_loader);
1: +  }
1: +
1: +  /* clean up module BTFs */
1: +  for (i = 0; i < obj->btf_module_cnt; i++) {
1: +    close(obj->btf_modules[i].fd);
1: +    btf__free(obj->btf_modules[i].btf);
1: +    free(obj->btf_modules[i].name);
1: +  }
1: +  free(obj->btf_modules);
1: +
1: +  /* clean up vmlinux BTF */
1: +  btf__free(obj->btf_vmlinux);
1: +  obj->btf_vmlinux = NULL;
1: +
1: +  obj->loaded = true; /* doesn't matter if successfully or not */
1: +
1: +  if (err)
1: +    goto out;
1: +
1: +  return 0;
1:  out:
1: -	/* unpin any maps that were auto-pinned during load */
1: -	for (i = 0; i < obj->nr_maps; i++)
1: -		if (obj->maps[i].pinned && !obj->maps[i].reused)
1: -			bpf_map__unpin(&obj->maps[i], NULL);
1: +  /* unpin any maps that were auto-pinned during load */
1: +  for (i = 0; i < obj->nr_maps; i++)
1: +    if (obj->maps[i].pinned && !obj->maps[i].reused)
1: +      bpf_map__unpin(&obj->maps[i], NULL);
1:  
1: -	bpf_object__unload(obj);
1: -	pr_warn("failed to load object '%s'\n", obj->path);
1: -	return libbpf_err(err);
1: +  bpf_object__unload(obj);
1: +  pr_warn("failed to load object '%s'\n", obj->path);
1: +  return libbpf_err(err);
1:  }
1:  
1: -int bpf_object__load(struct bpf_object *obj)
1: -{
1: -	struct bpf_object_load_attr attr = {
1: -		.obj = obj,
1: -	};
1: +int bpf_object__load(struct bpf_object *obj) {
1: +  struct bpf_object_load_attr attr = {
1: +      .obj = obj,
1: +  };
1:  
1: -	return bpf_object__load_xattr(&attr);
1: +  return bpf_object__load_xattr(&attr);
1:  }
1:  
1: -static int make_parent_dir(const char *path)
1: -{
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	char *dname, *dir;
1: -	int err = 0;
1: +static int make_parent_dir(const char *path) {
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  char *dname, *dir;
1: +  int err = 0;
1:  
1: -	dname = strdup(path);
1: -	if (dname == NULL)
1: -		return -ENOMEM;
1: +  dname = strdup(path);
1: +  if (dname == NULL)
1: +    return -ENOMEM;
1:  
1: -	dir = dirname(dname);
1: -	if (mkdir(dir, 0700) && errno != EEXIST)
1: -		err = -errno;
1: +  dir = dirname(dname);
1: +  if (mkdir(dir, 0700) && errno != EEXIST)
1: +    err = -errno;
1:  
1: -	free(dname);
1: -	if (err) {
1: -		cp = libbpf_strerror_r(-err, errmsg, sizeof(errmsg));
1: -		pr_warn("failed to mkdir %s: %s\n", path, cp);
1: -	}
1: -	return err;
1: +  free(dname);
1: +  if (err) {
1: +    cp = libbpf_strerror_r(-err, errmsg, sizeof(errmsg));
1: +    pr_warn("failed to mkdir %s: %s\n", path, cp);
1: +  }
1: +  return err;
1:  }
1:  
1: -static int check_path(const char *path)
1: -{
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	struct statfs st_fs;
1: -	char *dname, *dir;
1: -	int err = 0;
1: +static int check_path(const char *path) {
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  struct statfs st_fs;
1: +  char *dname, *dir;
1: +  int err = 0;
1:  
1: -	if (path == NULL)
1: -		return -EINVAL;
1: +  if (path == NULL)
1: +    return -EINVAL;
1:  
1: -	dname = strdup(path);
1: -	if (dname == NULL)
1: -		return -ENOMEM;
1: +  dname = strdup(path);
1: +  if (dname == NULL)
1: +    return -ENOMEM;
1:  
1: -	dir = dirname(dname);
1: -	if (statfs(dir, &st_fs)) {
1: -		cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
1: -		pr_warn("failed to statfs %s: %s\n", dir, cp);
1: -		err = -errno;
1: -	}
1: -	free(dname);
1: +  dir = dirname(dname);
1: +  if (statfs(dir, &st_fs)) {
1: +    cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
1: +    pr_warn("failed to statfs %s: %s\n", dir, cp);
1: +    err = -errno;
1: +  }
1: +  free(dname);
1:  
1: -	if (!err && st_fs.f_type != BPF_FS_MAGIC) {
1: -		pr_warn("specified path %s is not on BPF FS\n", path);
1: -		err = -EINVAL;
1: -	}
1: +  if (!err && st_fs.f_type != BPF_FS_MAGIC) {
1: +    pr_warn("specified path %s is not on BPF FS\n", path);
1: +    err = -EINVAL;
1: +  }
1:  
1: -	return err;
1: +  return err;
1:  }
1:  
1:  int bpf_program__pin_instance(struct bpf_program *prog, const char *path,
1: -			      int instance)
1: -{
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	int err;
1: +                              int instance) {
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  int err;
1:  
1: -	err = make_parent_dir(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = make_parent_dir(path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	err = check_path(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = check_path(path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	if (prog == NULL) {
1: -		pr_warn("invalid program pointer\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (prog == NULL) {
1: +    pr_warn("invalid program pointer\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	if (instance < 0 || instance >= prog->instances.nr) {
1: -		pr_warn("invalid prog instance %d of prog %s (max %d)\n",
1: -			instance, prog->name, prog->instances.nr);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (instance < 0 || instance >= prog->instances.nr) {
1: +    pr_warn("invalid prog instance %d of prog %s (max %d)\n", instance,
1: +            prog->name, prog->instances.nr);
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	if (bpf_obj_pin(prog->instances.fds[instance], path)) {
1: -		err = -errno;
1: -		cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: -		pr_warn("failed to pin program: %s\n", cp);
1: -		return libbpf_err(err);
1: -	}
1: -	pr_debug("pinned program '%s'\n", path);
1: +  if (bpf_obj_pin(prog->instances.fds[instance], path)) {
1: +    err = -errno;
1: +    cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
1: +    pr_warn("failed to pin program: %s\n", cp);
1: +    return libbpf_err(err);
1: +  }
1: +  pr_debug("pinned program '%s'\n", path);
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  int bpf_program__unpin_instance(struct bpf_program *prog, const char *path,
1: -				int instance)
1: -{
1: -	int err;
1: +                                int instance) {
1: +  int err;
1:  
1: -	err = check_path(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = check_path(path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	if (prog == NULL) {
1: -		pr_warn("invalid program pointer\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (prog == NULL) {
1: +    pr_warn("invalid program pointer\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	if (instance < 0 || instance >= prog->instances.nr) {
1: -		pr_warn("invalid prog instance %d of prog %s (max %d)\n",
1: -			instance, prog->name, prog->instances.nr);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (instance < 0 || instance >= prog->instances.nr) {
1: +    pr_warn("invalid prog instance %d of prog %s (max %d)\n", instance,
1: +            prog->name, prog->instances.nr);
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	err = unlink(path);
1: -	if (err != 0)
1: -		return libbpf_err(-errno);
1: +  err = unlink(path);
1: +  if (err != 0)
1: +    return libbpf_err(-errno);
1:  
1: -	pr_debug("unpinned program '%s'\n", path);
1: +  pr_debug("unpinned program '%s'\n", path);
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -int bpf_program__pin(struct bpf_program *prog, const char *path)
1: -{
1: -	int i, err;
1: +int bpf_program__pin(struct bpf_program *prog, const char *path) {
1: +  int i, err;
1:  
1: -	err = make_parent_dir(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = make_parent_dir(path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	err = check_path(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = check_path(path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	if (prog == NULL) {
1: -		pr_warn("invalid program pointer\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (prog == NULL) {
1: +    pr_warn("invalid program pointer\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	if (prog->instances.nr <= 0) {
1: -		pr_warn("no instances of prog %s to pin\n", prog->name);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (prog->instances.nr <= 0) {
1: +    pr_warn("no instances of prog %s to pin\n", prog->name);
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	if (prog->instances.nr == 1) {
1: -		/* don't create subdirs when pinning single instance */
1: -		return bpf_program__pin_instance(prog, path, 0);
1: -	}
1: +  if (prog->instances.nr == 1) {
1: +    /* don't create subdirs when pinning single instance */
1: +    return bpf_program__pin_instance(prog, path, 0);
1: +  }
1:  
1: -	for (i = 0; i < prog->instances.nr; i++) {
1: -		char buf[PATH_MAX];
1: -		int len;
1: +  for (i = 0; i < prog->instances.nr; i++) {
1: +    char buf[PATH_MAX];
1: +    int len;
1:  
1: -		len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
1: -		if (len < 0) {
1: -			err = -EINVAL;
1: -			goto err_unpin;
1: -		} else if (len >= PATH_MAX) {
1: -			err = -ENAMETOOLONG;
1: -			goto err_unpin;
1: -		}
1: +    len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
1: +    if (len < 0) {
1: +      err = -EINVAL;
1: +      goto err_unpin;
1: +    } else if (len >= PATH_MAX) {
1: +      err = -ENAMETOOLONG;
1: +      goto err_unpin;
1: +    }
1:  
1: -		err = bpf_program__pin_instance(prog, buf, i);
1: -		if (err)
1: -			goto err_unpin;
1: -	}
1: +    err = bpf_program__pin_instance(prog, buf, i);
1: +    if (err)
1: +      goto err_unpin;
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  
1:  err_unpin:
1: -	for (i = i - 1; i >= 0; i--) {
1: -		char buf[PATH_MAX];
1: -		int len;
1: -
1: -		len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
1: -		if (len < 0)
1: -			continue;
1: -		else if (len >= PATH_MAX)
1: -			continue;
1: -
1: -		bpf_program__unpin_instance(prog, buf, i);
1: -	}
1: -
1: -	rmdir(path);
1: -
1: -	return libbpf_err(err);
1: -}
1: -
1: -int bpf_program__unpin(struct bpf_program *prog, const char *path)
1: -{
1: -	int i, err;
1: -
1: -	err = check_path(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	if (prog == NULL) {
1: -		pr_warn("invalid program pointer\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (prog->instances.nr <= 0) {
1: -		pr_warn("no instances of prog %s to pin\n", prog->name);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (prog->instances.nr == 1) {
1: -		/* don't create subdirs when pinning single instance */
1: -		return bpf_program__unpin_instance(prog, path, 0);
1: -	}
1: -
1: -	for (i = 0; i < prog->instances.nr; i++) {
1: -		char buf[PATH_MAX];
1: -		int len;
1: -
1: -		len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
1: -		if (len < 0)
1: -			return libbpf_err(-EINVAL);
1: -		else if (len >= PATH_MAX)
1: -			return libbpf_err(-ENAMETOOLONG);
1: -
1: -		err = bpf_program__unpin_instance(prog, buf, i);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	err = rmdir(path);
1: -	if (err)
1: -		return libbpf_err(-errno);
1: -
1: -	return 0;
1: -}
1: -
1: -int bpf_map__pin(struct bpf_map *map, const char *path)
1: -{
1: -	char *cp, errmsg[STRERR_BUFSIZE];
1: -	int err;
1: -
1: -	if (map == NULL) {
1: -		pr_warn("invalid map pointer\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (map->pin_path) {
1: -		if (path && strcmp(path, map->pin_path)) {
1: -			pr_warn("map '%s' already has pin path '%s' different from '%s'\n",
1: -				bpf_map__name(map), map->pin_path, path);
1: -			return libbpf_err(-EINVAL);
1: -		} else if (map->pinned) {
1: -			pr_debug("map '%s' already pinned at '%s'; not re-pinning\n",
1: -				 bpf_map__name(map), map->pin_path);
1: -			return 0;
1: -		}
1: -	} else {
1: -		if (!path) {
1: -			pr_warn("missing a path to pin map '%s' at\n",
1: -				bpf_map__name(map));
1: -			return libbpf_err(-EINVAL);
1: -		} else if (map->pinned) {
1: -			pr_warn("map '%s' already pinned\n", bpf_map__name(map));
1: -			return libbpf_err(-EEXIST);
1: -		}
1: -
1: -		map->pin_path = strdup(path);
1: -		if (!map->pin_path) {
1: -			err = -errno;
1: -			goto out_err;
1: -		}
1: -	}
1: -
1: -	err = make_parent_dir(map->pin_path);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	err = check_path(map->pin_path);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	if (bpf_obj_pin(map->fd, map->pin_path)) {
1: -		err = -errno;
1: -		goto out_err;
1: -	}
1: -
1: -	map->pinned = true;
1: -	pr_debug("pinned map '%s'\n", map->pin_path);
1: -
1: -	return 0;
1: +  for (i = i - 1; i >= 0; i--) {
1: +    char buf[PATH_MAX];
1: +    int len;
1: +
1: +    len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
1: +    if (len < 0)
1: +      continue;
1: +    else if (len >= PATH_MAX)
1: +      continue;
1: +
1: +    bpf_program__unpin_instance(prog, buf, i);
1: +  }
1: +
1: +  rmdir(path);
1: +
1: +  return libbpf_err(err);
1: +}
1: +
1: +int bpf_program__unpin(struct bpf_program *prog, const char *path) {
1: +  int i, err;
1: +
1: +  err = check_path(path);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  if (prog == NULL) {
1: +    pr_warn("invalid program pointer\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (prog->instances.nr <= 0) {
1: +    pr_warn("no instances of prog %s to pin\n", prog->name);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (prog->instances.nr == 1) {
1: +    /* don't create subdirs when pinning single instance */
1: +    return bpf_program__unpin_instance(prog, path, 0);
1: +  }
1: +
1: +  for (i = 0; i < prog->instances.nr; i++) {
1: +    char buf[PATH_MAX];
1: +    int len;
1: +
1: +    len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
1: +    if (len < 0)
1: +      return libbpf_err(-EINVAL);
1: +    else if (len >= PATH_MAX)
1: +      return libbpf_err(-ENAMETOOLONG);
1: +
1: +    err = bpf_program__unpin_instance(prog, buf, i);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  err = rmdir(path);
1: +  if (err)
1: +    return libbpf_err(-errno);
1: +
1: +  return 0;
1: +}
1: +
1: +int bpf_map__pin(struct bpf_map *map, const char *path) {
1: +  char *cp, errmsg[STRERR_BUFSIZE];
1: +  int err;
1: +
1: +  if (map == NULL) {
1: +    pr_warn("invalid map pointer\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (map->pin_path) {
1: +    if (path && strcmp(path, map->pin_path)) {
1: +      pr_warn("map '%s' already has pin path '%s' different from '%s'\n",
1: +              bpf_map__name(map), map->pin_path, path);
1: +      return libbpf_err(-EINVAL);
1: +    } else if (map->pinned) {
1: +      pr_debug("map '%s' already pinned at '%s'; not re-pinning\n",
1: +               bpf_map__name(map), map->pin_path);
1: +      return 0;
1: +    }
1: +  } else {
1: +    if (!path) {
1: +      pr_warn("missing a path to pin map '%s' at\n", bpf_map__name(map));
1: +      return libbpf_err(-EINVAL);
1: +    } else if (map->pinned) {
1: +      pr_warn("map '%s' already pinned\n", bpf_map__name(map));
1: +      return libbpf_err(-EEXIST);
1: +    }
1: +
1: +    map->pin_path = strdup(path);
1: +    if (!map->pin_path) {
1: +      err = -errno;
1: +      goto out_err;
1: +    }
1: +  }
1: +
1: +  err = make_parent_dir(map->pin_path);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  err = check_path(map->pin_path);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  if (bpf_obj_pin(map->fd, map->pin_path)) {
1: +    err = -errno;
1: +    goto out_err;
1: +  }
1: +
1: +  map->pinned = true;
1: +  pr_debug("pinned map '%s'\n", map->pin_path);
1: +
1: +  return 0;
1:  
1:  out_err:
1: -	cp = libbpf_strerror_r(-err, errmsg, sizeof(errmsg));
1: -	pr_warn("failed to pin map: %s\n", cp);
1: -	return libbpf_err(err);
1: -}
1: -
1: -int bpf_map__unpin(struct bpf_map *map, const char *path)
1: -{
1: -	int err;
1: -
1: -	if (map == NULL) {
1: -		pr_warn("invalid map pointer\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	if (map->pin_path) {
1: -		if (path && strcmp(path, map->pin_path)) {
1: -			pr_warn("map '%s' already has pin path '%s' different from '%s'\n",
1: -				bpf_map__name(map), map->pin_path, path);
1: -			return libbpf_err(-EINVAL);
1: -		}
1: -		path = map->pin_path;
1: -	} else if (!path) {
1: -		pr_warn("no path to unpin map '%s' from\n",
1: -			bpf_map__name(map));
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	err = check_path(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	err = unlink(path);
1: -	if (err != 0)
1: -		return libbpf_err(-errno);
1: -
1: -	map->pinned = false;
1: -	pr_debug("unpinned map '%s' from '%s'\n", bpf_map__name(map), path);
1: -
1: -	return 0;
1: -}
1: -
1: -int bpf_map__set_pin_path(struct bpf_map *map, const char *path)
1: -{
1: -	char *new = NULL;
1: -
1: -	if (path) {
1: -		new = strdup(path);
1: -		if (!new)
1: -			return libbpf_err(-errno);
1: -	}
1: -
1: -	free(map->pin_path);
1: -	map->pin_path = new;
1: -	return 0;
1: -}
1: -
1: -const char *bpf_map__get_pin_path(const struct bpf_map *map)
1: -{
1: -	return map->pin_path;
1: -}
1: -
1: -bool bpf_map__is_pinned(const struct bpf_map *map)
1: -{
1: -	return map->pinned;
1: -}
1: -
1: -static void sanitize_pin_path(char *s)
1: -{
1: -	/* bpffs disallows periods in path names */
1: -	while (*s) {
1: -		if (*s == '.')
1: -			*s = '_';
1: -		s++;
1: -	}
1: -}
1: -
1: -int bpf_object__pin_maps(struct bpf_object *obj, const char *path)
1: -{
1: -	struct bpf_map *map;
1: -	int err;
1: -
1: -	if (!obj)
1: -		return libbpf_err(-ENOENT);
1: -
1: -	if (!obj->loaded) {
1: -		pr_warn("object not yet loaded; load it first\n");
1: -		return libbpf_err(-ENOENT);
1: -	}
1: -
1: -	bpf_object__for_each_map(map, obj) {
1: -		char *pin_path = NULL;
1: -		char buf[PATH_MAX];
1: -
1: -		if (path) {
1: -			int len;
1: -
1: -			len = snprintf(buf, PATH_MAX, "%s/%s", path,
1: -				       bpf_map__name(map));
1: -			if (len < 0) {
1: -				err = -EINVAL;
1: -				goto err_unpin_maps;
1: -			} else if (len >= PATH_MAX) {
1: -				err = -ENAMETOOLONG;
1: -				goto err_unpin_maps;
1: -			}
1: -			sanitize_pin_path(buf);
1: -			pin_path = buf;
1: -		} else if (!map->pin_path) {
1: -			continue;
1: -		}
1: -
1: -		err = bpf_map__pin(map, pin_path);
1: -		if (err)
1: -			goto err_unpin_maps;
1: -	}
1: -
1: -	return 0;
1: +  cp = libbpf_strerror_r(-err, errmsg, sizeof(errmsg));
1: +  pr_warn("failed to pin map: %s\n", cp);
1: +  return libbpf_err(err);
1: +}
1: +
1: +int bpf_map__unpin(struct bpf_map *map, const char *path) {
1: +  int err;
1: +
1: +  if (map == NULL) {
1: +    pr_warn("invalid map pointer\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  if (map->pin_path) {
1: +    if (path && strcmp(path, map->pin_path)) {
1: +      pr_warn("map '%s' already has pin path '%s' different from '%s'\n",
1: +              bpf_map__name(map), map->pin_path, path);
1: +      return libbpf_err(-EINVAL);
1: +    }
1: +    path = map->pin_path;
1: +  } else if (!path) {
1: +    pr_warn("no path to unpin map '%s' from\n", bpf_map__name(map));
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  err = check_path(path);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  err = unlink(path);
1: +  if (err != 0)
1: +    return libbpf_err(-errno);
1: +
1: +  map->pinned = false;
1: +  pr_debug("unpinned map '%s' from '%s'\n", bpf_map__name(map), path);
1: +
1: +  return 0;
1: +}
1: +
1: +int bpf_map__set_pin_path(struct bpf_map *map, const char *path) {
1: +  char *new = NULL;
1: +
1: +  if (path) {
1: +    new = strdup(path);
1: +    if (!new)
1: +      return libbpf_err(-errno);
1: +  }
1: +
1: +  free(map->pin_path);
1: +  map->pin_path = new;
1: +  return 0;
1: +}
1: +
1: +const char *bpf_map__get_pin_path(const struct bpf_map *map) {
1: +  return map->pin_path;
1: +}
1: +
1: +bool bpf_map__is_pinned(const struct bpf_map *map) { return map->pinned; }
1: +
1: +static void sanitize_pin_path(char *s) {
1: +  /* bpffs disallows periods in path names */
1: +  while (*s) {
1: +    if (*s == '.')
1: +      *s = '_';
1: +    s++;
1: +  }
1: +}
1: +
1: +int bpf_object__pin_maps(struct bpf_object *obj, const char *path) {
1: +  struct bpf_map *map;
1: +  int err;
1: +
1: +  if (!obj)
1: +    return libbpf_err(-ENOENT);
1: +
1: +  if (!obj->loaded) {
1: +    pr_warn("object not yet loaded; load it first\n");
1: +    return libbpf_err(-ENOENT);
1: +  }
1: +
1: +  bpf_object__for_each_map(map, obj) {
1: +    char *pin_path = NULL;
1: +    char buf[PATH_MAX];
1: +
1: +    if (path) {
1: +      int len;
1: +
1: +      len = snprintf(buf, PATH_MAX, "%s/%s", path, bpf_map__name(map));
1: +      if (len < 0) {
1: +        err = -EINVAL;
1: +        goto err_unpin_maps;
1: +      } else if (len >= PATH_MAX) {
1: +        err = -ENAMETOOLONG;
1: +        goto err_unpin_maps;
1: +      }
1: +      sanitize_pin_path(buf);
1: +      pin_path = buf;
1: +    } else if (!map->pin_path) {
1: +      continue;
1: +    }
1: +
1: +    err = bpf_map__pin(map, pin_path);
1: +    if (err)
1: +      goto err_unpin_maps;
1: +  }
1: +
1: +  return 0;
1:  
1:  err_unpin_maps:
1: -	while ((map = bpf_map__prev(map, obj))) {
1: -		if (!map->pin_path)
1: -			continue;
1: +  while ((map = bpf_map__prev(map, obj))) {
1: +    if (!map->pin_path)
1: +      continue;
1:  
1: -		bpf_map__unpin(map, NULL);
1: -	}
1: +    bpf_map__unpin(map, NULL);
1: +  }
1:  
1: -	return libbpf_err(err);
1: +  return libbpf_err(err);
1:  }
1:  
1: -int bpf_object__unpin_maps(struct bpf_object *obj, const char *path)
1: -{
1: -	struct bpf_map *map;
1: -	int err;
1: +int bpf_object__unpin_maps(struct bpf_object *obj, const char *path) {
1: +  struct bpf_map *map;
1: +  int err;
1:  
1: -	if (!obj)
1: -		return libbpf_err(-ENOENT);
1: +  if (!obj)
1: +    return libbpf_err(-ENOENT);
1:  
1: -	bpf_object__for_each_map(map, obj) {
1: -		char *pin_path = NULL;
1: -		char buf[PATH_MAX];
1: +  bpf_object__for_each_map(map, obj) {
1: +    char *pin_path = NULL;
1: +    char buf[PATH_MAX];
1:  
1: -		if (path) {
1: -			int len;
1: +    if (path) {
1: +      int len;
1:  
1: -			len = snprintf(buf, PATH_MAX, "%s/%s", path,
1: -				       bpf_map__name(map));
1: -			if (len < 0)
1: -				return libbpf_err(-EINVAL);
1: -			else if (len >= PATH_MAX)
1: -				return libbpf_err(-ENAMETOOLONG);
1: -			sanitize_pin_path(buf);
1: -			pin_path = buf;
1: -		} else if (!map->pin_path) {
1: -			continue;
1: -		}
1: +      len = snprintf(buf, PATH_MAX, "%s/%s", path, bpf_map__name(map));
1: +      if (len < 0)
1: +        return libbpf_err(-EINVAL);
1: +      else if (len >= PATH_MAX)
1: +        return libbpf_err(-ENAMETOOLONG);
1: +      sanitize_pin_path(buf);
1: +      pin_path = buf;
1: +    } else if (!map->pin_path) {
1: +      continue;
1: +    }
1:  
1: -		err = bpf_map__unpin(map, pin_path);
1: -		if (err)
1: -			return libbpf_err(err);
1: -	}
1: +    err = bpf_map__unpin(map, pin_path);
1: +    if (err)
1: +      return libbpf_err(err);
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -int bpf_object__pin_programs(struct bpf_object *obj, const char *path)
1: -{
1: -	struct bpf_program *prog;
1: -	int err;
1: +int bpf_object__pin_programs(struct bpf_object *obj, const char *path) {
1: +  struct bpf_program *prog;
1: +  int err;
1:  
1: -	if (!obj)
1: -		return libbpf_err(-ENOENT);
1: +  if (!obj)
1: +    return libbpf_err(-ENOENT);
1:  
1: -	if (!obj->loaded) {
1: -		pr_warn("object not yet loaded; load it first\n");
1: -		return libbpf_err(-ENOENT);
1: -	}
1: +  if (!obj->loaded) {
1: +    pr_warn("object not yet loaded; load it first\n");
1: +    return libbpf_err(-ENOENT);
1: +  }
1:  
1: -	bpf_object__for_each_program(prog, obj) {
1: -		char buf[PATH_MAX];
1: -		int len;
1: +  bpf_object__for_each_program(prog, obj) {
1: +    char buf[PATH_MAX];
1: +    int len;
1:  
1: -		len = snprintf(buf, PATH_MAX, "%s/%s", path,
1: -			       prog->pin_name);
1: -		if (len < 0) {
1: -			err = -EINVAL;
1: -			goto err_unpin_programs;
1: -		} else if (len >= PATH_MAX) {
1: -			err = -ENAMETOOLONG;
1: -			goto err_unpin_programs;
1: -		}
1: +    len = snprintf(buf, PATH_MAX, "%s/%s", path, prog->pin_name);
1: +    if (len < 0) {
1: +      err = -EINVAL;
1: +      goto err_unpin_programs;
1: +    } else if (len >= PATH_MAX) {
1: +      err = -ENAMETOOLONG;
1: +      goto err_unpin_programs;
1: +    }
1:  
1: -		err = bpf_program__pin(prog, buf);
1: -		if (err)
1: -			goto err_unpin_programs;
1: -	}
1: +    err = bpf_program__pin(prog, buf);
1: +    if (err)
1: +      goto err_unpin_programs;
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  
1:  err_unpin_programs:
1: -	while ((prog = bpf_program__prev(prog, obj))) {
1: -		char buf[PATH_MAX];
1: -		int len;
1: +  while ((prog = bpf_program__prev(prog, obj))) {
1: +    char buf[PATH_MAX];
1: +    int len;
1:  
1: -		len = snprintf(buf, PATH_MAX, "%s/%s", path,
1: -			       prog->pin_name);
1: -		if (len < 0)
1: -			continue;
1: -		else if (len >= PATH_MAX)
1: -			continue;
1: +    len = snprintf(buf, PATH_MAX, "%s/%s", path, prog->pin_name);
1: +    if (len < 0)
1: +      continue;
1: +    else if (len >= PATH_MAX)
1: +      continue;
1:  
1: -		bpf_program__unpin(prog, buf);
1: -	}
1: +    bpf_program__unpin(prog, buf);
1: +  }
1:  
1: -	return libbpf_err(err);
1: +  return libbpf_err(err);
1:  }
1:  
1: -int bpf_object__unpin_programs(struct bpf_object *obj, const char *path)
1: -{
1: -	struct bpf_program *prog;
1: -	int err;
1: +int bpf_object__unpin_programs(struct bpf_object *obj, const char *path) {
1: +  struct bpf_program *prog;
1: +  int err;
1:  
1: -	if (!obj)
1: -		return libbpf_err(-ENOENT);
1: +  if (!obj)
1: +    return libbpf_err(-ENOENT);
1:  
1: -	bpf_object__for_each_program(prog, obj) {
1: -		char buf[PATH_MAX];
1: -		int len;
1: +  bpf_object__for_each_program(prog, obj) {
1: +    char buf[PATH_MAX];
1: +    int len;
1:  
1: -		len = snprintf(buf, PATH_MAX, "%s/%s", path,
1: -			       prog->pin_name);
1: -		if (len < 0)
1: -			return libbpf_err(-EINVAL);
1: -		else if (len >= PATH_MAX)
1: -			return libbpf_err(-ENAMETOOLONG);
1: +    len = snprintf(buf, PATH_MAX, "%s/%s", path, prog->pin_name);
1: +    if (len < 0)
1: +      return libbpf_err(-EINVAL);
1: +    else if (len >= PATH_MAX)
1: +      return libbpf_err(-ENAMETOOLONG);
1:  
1: -		err = bpf_program__unpin(prog, buf);
1: -		if (err)
1: -			return libbpf_err(err);
1: -	}
1: +    err = bpf_program__unpin(prog, buf);
1: +    if (err)
1: +      return libbpf_err(err);
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -int bpf_object__pin(struct bpf_object *obj, const char *path)
1: -{
1: -	int err;
1: +int bpf_object__pin(struct bpf_object *obj, const char *path) {
1: +  int err;
1:  
1: -	err = bpf_object__pin_maps(obj, path);
1: -	if (err)
1: -		return libbpf_err(err);
1: +  err = bpf_object__pin_maps(obj, path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	err = bpf_object__pin_programs(obj, path);
1: -	if (err) {
1: -		bpf_object__unpin_maps(obj, path);
1: -		return libbpf_err(err);
1: -	}
1: +  err = bpf_object__pin_programs(obj, path);
1: +  if (err) {
1: +    bpf_object__unpin_maps(obj, path);
1: +    return libbpf_err(err);
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static void bpf_map__destroy(struct bpf_map *map)
1: -{
1: -	if (map->clear_priv)
1: -		map->clear_priv(map, map->priv);
1: -	map->priv = NULL;
1: -	map->clear_priv = NULL;
1: +static void bpf_map__destroy(struct bpf_map *map) {
1: +  if (map->clear_priv)
1: +    map->clear_priv(map, map->priv);
1: +  map->priv = NULL;
1: +  map->clear_priv = NULL;
1:  
1: -	if (map->inner_map) {
1: -		bpf_map__destroy(map->inner_map);
1: -		zfree(&map->inner_map);
1: -	}
1: +  if (map->inner_map) {
1: +    bpf_map__destroy(map->inner_map);
1: +    zfree(&map->inner_map);
1: +  }
1:  
1: -	zfree(&map->init_slots);
1: -	map->init_slots_sz = 0;
1: +  zfree(&map->init_slots);
1: +  map->init_slots_sz = 0;
1:  
1: -	if (map->mmaped) {
1: -		munmap(map->mmaped, bpf_map_mmap_sz(map));
1: -		map->mmaped = NULL;
1: -	}
1: +  if (map->mmaped) {
1: +    munmap(map->mmaped, bpf_map_mmap_sz(map));
1: +    map->mmaped = NULL;
1: +  }
1:  
1: -	if (map->st_ops) {
1: -		zfree(&map->st_ops->data);
1: -		zfree(&map->st_ops->progs);
1: -		zfree(&map->st_ops->kern_func_off);
1: -		zfree(&map->st_ops);
1: -	}
1: +  if (map->st_ops) {
1: +    zfree(&map->st_ops->data);
1: +    zfree(&map->st_ops->progs);
1: +    zfree(&map->st_ops->kern_func_off);
1: +    zfree(&map->st_ops);
1: +  }
1:  
1: -	zfree(&map->name);
1: -	zfree(&map->pin_path);
1: +  zfree(&map->name);
1: +  zfree(&map->pin_path);
1:  
1: -	if (map->fd >= 0)
1: -		zclose(map->fd);
1: +  if (map->fd >= 0)
1: +    zclose(map->fd);
1:  }
1:  
1: -void bpf_object__close(struct bpf_object *obj)
1: -{
1: -	size_t i;
1: +void bpf_object__close(struct bpf_object *obj) {
1: +  size_t i;
1:  
1: -	if (IS_ERR_OR_NULL(obj))
1: -		return;
1: +  if (IS_ERR_OR_NULL(obj))
1: +    return;
1:  
1: -	if (obj->clear_priv)
1: -		obj->clear_priv(obj, obj->priv);
1: +  if (obj->clear_priv)
1: +    obj->clear_priv(obj, obj->priv);
1:  
1: -	bpf_gen__free(obj->gen_loader);
1: -	bpf_object__elf_finish(obj);
1: -	bpf_object__unload(obj);
1: -	btf__free(obj->btf);
1: -	btf_ext__free(obj->btf_ext);
1: +  bpf_gen__free(obj->gen_loader);
1: +  bpf_object__elf_finish(obj);
1: +  bpf_object__unload(obj);
1: +  btf__free(obj->btf);
1: +  btf_ext__free(obj->btf_ext);
1:  
1: -	for (i = 0; i < obj->nr_maps; i++)
1: -		bpf_map__destroy(&obj->maps[i]);
1: +  for (i = 0; i < obj->nr_maps; i++)
1: +    bpf_map__destroy(&obj->maps[i]);
1:  
1: -	zfree(&obj->kconfig);
1: -	zfree(&obj->externs);
1: -	obj->nr_extern = 0;
1: +  zfree(&obj->kconfig);
1: +  zfree(&obj->externs);
1: +  obj->nr_extern = 0;
1:  
1: -	zfree(&obj->maps);
1: -	obj->nr_maps = 0;
1: +  zfree(&obj->maps);
1: +  obj->nr_maps = 0;
1:  
1: -	if (obj->programs && obj->nr_programs) {
1: -		for (i = 0; i < obj->nr_programs; i++)
1: -			bpf_program__exit(&obj->programs[i]);
1: -	}
1: -	zfree(&obj->programs);
1: +  if (obj->programs && obj->nr_programs) {
1: +    for (i = 0; i < obj->nr_programs; i++)
1: +      bpf_program__exit(&obj->programs[i]);
1: +  }
1: +  zfree(&obj->programs);
1:  
1: -	list_del(&obj->list);
1: -	free(obj);
1: +  list_del(&obj->list);
1: +  free(obj);
1:  }
1:  
1: -struct bpf_object *
1: -bpf_object__next(struct bpf_object *prev)
1: -{
1: -	struct bpf_object *next;
1: +struct bpf_object *bpf_object__next(struct bpf_object *prev) {
1: +  struct bpf_object *next;
1:  
1: -	if (!prev)
1: -		next = list_first_entry(&bpf_objects_list,
1: -					struct bpf_object,
1: -					list);
1: -	else
1: -		next = list_next_entry(prev, list);
1: +  if (!prev)
1: +    next = list_first_entry(&bpf_objects_list, struct bpf_object, list);
1: +  else
1: +    next = list_next_entry(prev, list);
1:  
1: -	/* Empty list is noticed here so don't need checking on entry. */
1: -	if (&next->list == &bpf_objects_list)
1: -		return NULL;
1: +  /* Empty list is noticed here so don't need checking on entry. */
1: +  if (&next->list == &bpf_objects_list)
1: +    return NULL;
1:  
1: -	return next;
1: +  return next;
1:  }
1:  
1: -const char *bpf_object__name(const struct bpf_object *obj)
1: -{
1: -	return obj ? obj->name : libbpf_err_ptr(-EINVAL);
1: +const char *bpf_object__name(const struct bpf_object *obj) {
1: +  return obj ? obj->name : libbpf_err_ptr(-EINVAL);
1:  }
1:  
1: -unsigned int bpf_object__kversion(const struct bpf_object *obj)
1: -{
1: -	return obj ? obj->kern_version : 0;
1: +unsigned int bpf_object__kversion(const struct bpf_object *obj) {
1: +  return obj ? obj->kern_version : 0;
1:  }
1:  
1: -struct btf *bpf_object__btf(const struct bpf_object *obj)
1: -{
1: -	return obj ? obj->btf : NULL;
1: +struct btf *bpf_object__btf(const struct bpf_object *obj) {
1: +  return obj ? obj->btf : NULL;
1:  }
1:  
1: -int bpf_object__btf_fd(const struct bpf_object *obj)
1: -{
1: -	return obj->btf ? btf__fd(obj->btf) : -1;
1: +int bpf_object__btf_fd(const struct bpf_object *obj) {
1: +  return obj->btf ? btf__fd(obj->btf) : -1;
1:  }
1:  
1: -int bpf_object__set_kversion(struct bpf_object *obj, __u32 kern_version)
1: -{
1: -	if (obj->loaded)
1: -		return libbpf_err(-EINVAL);
1: +int bpf_object__set_kversion(struct bpf_object *obj, __u32 kern_version) {
1: +  if (obj->loaded)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	obj->kern_version = kern_version;
1: +  obj->kern_version = kern_version;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  int bpf_object__set_priv(struct bpf_object *obj, void *priv,
1: -			 bpf_object_clear_priv_t clear_priv)
1: -{
1: -	if (obj->priv && obj->clear_priv)
1: -		obj->clear_priv(obj, obj->priv);
1: +                         bpf_object_clear_priv_t clear_priv) {
1: +  if (obj->priv && obj->clear_priv)
1: +    obj->clear_priv(obj, obj->priv);
1:  
1: -	obj->priv = priv;
1: -	obj->clear_priv = clear_priv;
1: -	return 0;
1: +  obj->priv = priv;
1: +  obj->clear_priv = clear_priv;
1: +  return 0;
1:  }
1:  
1: -void *bpf_object__priv(const struct bpf_object *obj)
1: -{
1: -	return obj ? obj->priv : libbpf_err_ptr(-EINVAL);
1: +void *bpf_object__priv(const struct bpf_object *obj) {
1: +  return obj ? obj->priv : libbpf_err_ptr(-EINVAL);
1:  }
1:  
1: -int bpf_object__gen_loader(struct bpf_object *obj, struct gen_loader_opts *opts)
1: -{
1: -	struct bpf_gen *gen;
1: +int bpf_object__gen_loader(struct bpf_object *obj,
1: +                           struct gen_loader_opts *opts) {
1: +  struct bpf_gen *gen;
1:  
1: -	if (!opts)
1: -		return -EFAULT;
1: -	if (!OPTS_VALID(opts, gen_loader_opts))
1: -		return -EINVAL;
1: -	gen = calloc(sizeof(*gen), 1);
1: -	if (!gen)
1: -		return -ENOMEM;
1: -	gen->opts = opts;
1: -	obj->gen_loader = gen;
1: -	return 0;
1: +  if (!opts)
1: +    return -EFAULT;
1: +  if (!OPTS_VALID(opts, gen_loader_opts))
1: +    return -EINVAL;
1: +  gen = calloc(sizeof(*gen), 1);
1: +  if (!gen)
1: +    return -ENOMEM;
1: +  gen->opts = opts;
1: +  obj->gen_loader = gen;
1: +  return 0;
1:  }
1:  
1: -static struct bpf_program *
1: -__bpf_program__iter(const struct bpf_program *p, const struct bpf_object *obj,
1: -		    bool forward)
1: -{
1: -	size_t nr_programs = obj->nr_programs;
1: -	ssize_t idx;
1: +static struct bpf_program *__bpf_program__iter(const struct bpf_program *p,
1: +                                               const struct bpf_object *obj,
1: +                                               bool forward) {
1: +  size_t nr_programs = obj->nr_programs;
1: +  ssize_t idx;
1:  
1: -	if (!nr_programs)
1: -		return NULL;
1: +  if (!nr_programs)
1: +    return NULL;
1:  
1: -	if (!p)
1: -		/* Iter from the beginning */
1: -		return forward ? &obj->programs[0] :
1: -			&obj->programs[nr_programs - 1];
1: +  if (!p)
1: +    /* Iter from the beginning */
1: +    return forward ? &obj->programs[0] : &obj->programs[nr_programs - 1];
1:  
1: -	if (p->obj != obj) {
1: -		pr_warn("error: program handler doesn't match object\n");
1: -		return errno = EINVAL, NULL;
1: -	}
1: +  if (p->obj != obj) {
1: +    pr_warn("error: program handler doesn't match object\n");
1: +    return errno = EINVAL, NULL;
1: +  }
1:  
1: -	idx = (p - obj->programs) + (forward ? 1 : -1);
1: -	if (idx >= obj->nr_programs || idx < 0)
1: -		return NULL;
1: -	return &obj->programs[idx];
1: +  idx = (p - obj->programs) + (forward ? 1 : -1);
1: +  if (idx >= obj->nr_programs || idx < 0)
1: +    return NULL;
1: +  return &obj->programs[idx];
1:  }
1:  
1: -struct bpf_program *
1: -bpf_program__next(struct bpf_program *prev, const struct bpf_object *obj)
1: -{
1: -	struct bpf_program *prog = prev;
1: +struct bpf_program *bpf_program__next(struct bpf_program *prev,
1: +                                      const struct bpf_object *obj) {
1: +  struct bpf_program *prog = prev;
1:  
1: -	do {
1: -		prog = __bpf_program__iter(prog, obj, true);
1: -	} while (prog && prog_is_subprog(obj, prog));
1: +  do {
1: +    prog = __bpf_program__iter(prog, obj, true);
1: +  } while (prog && prog_is_subprog(obj, prog));
1:  
1: -	return prog;
1: +  return prog;
1:  }
1:  
1: -struct bpf_program *
1: -bpf_program__prev(struct bpf_program *next, const struct bpf_object *obj)
1: -{
1: -	struct bpf_program *prog = next;
1: +struct bpf_program *bpf_program__prev(struct bpf_program *next,
1: +                                      const struct bpf_object *obj) {
1: +  struct bpf_program *prog = next;
1:  
1: -	do {
1: -		prog = __bpf_program__iter(prog, obj, false);
1: -	} while (prog && prog_is_subprog(obj, prog));
1: +  do {
1: +    prog = __bpf_program__iter(prog, obj, false);
1: +  } while (prog && prog_is_subprog(obj, prog));
1:  
1: -	return prog;
1: +  return prog;
1:  }
1:  
1:  int bpf_program__set_priv(struct bpf_program *prog, void *priv,
1: -			  bpf_program_clear_priv_t clear_priv)
1: -{
1: -	if (prog->priv && prog->clear_priv)
1: -		prog->clear_priv(prog, prog->priv);
1: +                          bpf_program_clear_priv_t clear_priv) {
1: +  if (prog->priv && prog->clear_priv)
1: +    prog->clear_priv(prog, prog->priv);
1:  
1: -	prog->priv = priv;
1: -	prog->clear_priv = clear_priv;
1: -	return 0;
1: +  prog->priv = priv;
1: +  prog->clear_priv = clear_priv;
1: +  return 0;
1:  }
1:  
1: -void *bpf_program__priv(const struct bpf_program *prog)
1: -{
1: -	return prog ? prog->priv : libbpf_err_ptr(-EINVAL);
1: +void *bpf_program__priv(const struct bpf_program *prog) {
1: +  return prog ? prog->priv : libbpf_err_ptr(-EINVAL);
1:  }
1:  
1: -void bpf_program__set_ifindex(struct bpf_program *prog, __u32 ifindex)
1: -{
1: -	prog->prog_ifindex = ifindex;
1: +void bpf_program__set_ifindex(struct bpf_program *prog, __u32 ifindex) {
1: +  prog->prog_ifindex = ifindex;
1:  }
1:  
1: -const char *bpf_program__name(const struct bpf_program *prog)
1: -{
1: -	return prog->name;
1: +const char *bpf_program__name(const struct bpf_program *prog) {
1: +  return prog->name;
1:  }
1:  
1: -const char *bpf_program__section_name(const struct bpf_program *prog)
1: -{
1: -	return prog->sec_name;
1: +const char *bpf_program__section_name(const struct bpf_program *prog) {
1: +  return prog->sec_name;
1:  }
1:  
1: -const char *bpf_program__title(const struct bpf_program *prog, bool needs_copy)
1: -{
1: -	const char *title;
1: +const char *bpf_program__title(const struct bpf_program *prog,
1: +                               bool needs_copy) {
1: +  const char *title;
1:  
1: -	title = prog->sec_name;
1: -	if (needs_copy) {
1: -		title = strdup(title);
1: -		if (!title) {
1: -			pr_warn("failed to strdup program title\n");
1: -			return libbpf_err_ptr(-ENOMEM);
1: -		}
1: -	}
1: +  title = prog->sec_name;
1: +  if (needs_copy) {
1: +    title = strdup(title);
1: +    if (!title) {
1: +      pr_warn("failed to strdup program title\n");
1: +      return libbpf_err_ptr(-ENOMEM);
1: +    }
1: +  }
1:  
1: -	return title;
1: +  return title;
1:  }
1:  
1: -bool bpf_program__autoload(const struct bpf_program *prog)
1: -{
1: -	return prog->load;
1: +bool bpf_program__autoload(const struct bpf_program *prog) {
1: +  return prog->load;
1:  }
1:  
1: -int bpf_program__set_autoload(struct bpf_program *prog, bool autoload)
1: -{
1: -	if (prog->obj->loaded)
1: -		return libbpf_err(-EINVAL);
1: +int bpf_program__set_autoload(struct bpf_program *prog, bool autoload) {
1: +  if (prog->obj->loaded)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	prog->load = autoload;
1: -	return 0;
1: +  prog->load = autoload;
1: +  return 0;
1:  }
1:  
1: -int bpf_program__fd(const struct bpf_program *prog)
1: -{
1: -	return bpf_program__nth_fd(prog, 0);
1: +int bpf_program__fd(const struct bpf_program *prog) {
1: +  return bpf_program__nth_fd(prog, 0);
1:  }
1:  
1: -size_t bpf_program__size(const struct bpf_program *prog)
1: -{
1: -	return prog->insns_cnt * BPF_INSN_SZ;
1: +size_t bpf_program__size(const struct bpf_program *prog) {
1: +  return prog->insns_cnt * BPF_INSN_SZ;
1:  }
1:  
1:  int bpf_program__set_prep(struct bpf_program *prog, int nr_instances,
1: -			  bpf_program_prep_t prep)
1: -{
1: -	int *instances_fds;
1: +                          bpf_program_prep_t prep) {
1: +  int *instances_fds;
1:  
1: -	if (nr_instances <= 0 || !prep)
1: -		return libbpf_err(-EINVAL);
1: +  if (nr_instances <= 0 || !prep)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (prog->instances.nr > 0 || prog->instances.fds) {
1: -		pr_warn("Can't set pre-processor after loading\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (prog->instances.nr > 0 || prog->instances.fds) {
1: +    pr_warn("Can't set pre-processor after loading\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	instances_fds = malloc(sizeof(int) * nr_instances);
1: -	if (!instances_fds) {
1: -		pr_warn("alloc memory failed for fds\n");
1: -		return libbpf_err(-ENOMEM);
1: -	}
1: +  instances_fds = malloc(sizeof(int) * nr_instances);
1: +  if (!instances_fds) {
1: +    pr_warn("alloc memory failed for fds\n");
1: +    return libbpf_err(-ENOMEM);
1: +  }
1:  
1: -	/* fill all fd with -1 */
1: -	memset(instances_fds, -1, sizeof(int) * nr_instances);
1: +  /* fill all fd with -1 */
1: +  memset(instances_fds, -1, sizeof(int) * nr_instances);
1:  
1: -	prog->instances.nr = nr_instances;
1: -	prog->instances.fds = instances_fds;
1: -	prog->preprocessor = prep;
1: -	return 0;
1: +  prog->instances.nr = nr_instances;
1: +  prog->instances.fds = instances_fds;
1: +  prog->preprocessor = prep;
1: +  return 0;
1:  }
1:  
1: -int bpf_program__nth_fd(const struct bpf_program *prog, int n)
1: -{
1: -	int fd;
1: +int bpf_program__nth_fd(const struct bpf_program *prog, int n) {
1: +  int fd;
1:  
1: -	if (!prog)
1: -		return libbpf_err(-EINVAL);
1: +  if (!prog)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (n >= prog->instances.nr || n < 0) {
1: -		pr_warn("Can't get the %dth fd from program %s: only %d instances\n",
1: -			n, prog->name, prog->instances.nr);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +  if (n >= prog->instances.nr || n < 0) {
1: +    pr_warn("Can't get the %dth fd from program %s: only %d instances\n", n,
1: +            prog->name, prog->instances.nr);
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  
1: -	fd = prog->instances.fds[n];
1: -	if (fd < 0) {
1: -		pr_warn("%dth instance of program '%s' is invalid\n",
1: -			n, prog->name);
1: -		return libbpf_err(-ENOENT);
1: -	}
1: +  fd = prog->instances.fds[n];
1: +  if (fd < 0) {
1: +    pr_warn("%dth instance of program '%s' is invalid\n", n, prog->name);
1: +    return libbpf_err(-ENOENT);
1: +  }
1:  
1: -	return fd;
1: +  return fd;
1:  }
1:  
1: -enum bpf_prog_type bpf_program__get_type(const struct bpf_program *prog)
1: -{
1: -	return prog->type;
1: +enum bpf_prog_type bpf_program__get_type(const struct bpf_program *prog) {
1: +  return prog->type;
1:  }
1:  
1: -void bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type)
1: -{
1: -	prog->type = type;
1: +void bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type) {
1: +  prog->type = type;
1:  }
1:  
1:  static bool bpf_program__is_type(const struct bpf_program *prog,
1: -				 enum bpf_prog_type type)
1: -{
1: -	return prog ? (prog->type == type) : false;
1: -}
1: -
1: -#define BPF_PROG_TYPE_FNS(NAME, TYPE)				\
1: -int bpf_program__set_##NAME(struct bpf_program *prog)		\
1: -{								\
1: -	if (!prog)						\
1: -		return libbpf_err(-EINVAL);			\
1: -	bpf_program__set_type(prog, TYPE);			\
1: -	return 0;						\
1: -}								\
1: -								\
1: -bool bpf_program__is_##NAME(const struct bpf_program *prog)	\
1: -{								\
1: -	return bpf_program__is_type(prog, TYPE);		\
1: -}								\
1: +                                 enum bpf_prog_type type) {
1: +  return prog ? (prog->type == type) : false;
1: +}
1: +
1: +#define BPF_PROG_TYPE_FNS(NAME, TYPE)                           \
1: +  int bpf_program__set_##NAME(struct bpf_program *prog) {       \
1: +    if (!prog)                                                  \
1: +      return libbpf_err(-EINVAL);                               \
1: +    bpf_program__set_type(prog, TYPE);                          \
1: +    return 0;                                                   \
1: +  }                                                             \
1: +                                                                \
1: +  bool bpf_program__is_##NAME(const struct bpf_program *prog) { \
1: +    return bpf_program__is_type(prog, TYPE);                    \
1: +  }
1:  
1:  BPF_PROG_TYPE_FNS(socket_filter, BPF_PROG_TYPE_SOCKET_FILTER);
1:  BPF_PROG_TYPE_FNS(lsm, BPF_PROG_TYPE_LSM);
1: @@ -9012,215 +8800,171 @@ BPF_PROG_TYPE_FNS(struct_ops, BPF_PROG_TYPE_STRUCT_OPS);
1:  BPF_PROG_TYPE_FNS(extension, BPF_PROG_TYPE_EXT);
1:  BPF_PROG_TYPE_FNS(sk_lookup, BPF_PROG_TYPE_SK_LOOKUP);
1:  
1: -enum bpf_attach_type
1: -bpf_program__get_expected_attach_type(const struct bpf_program *prog)
1: -{
1: -	return prog->expected_attach_type;
1: +enum bpf_attach_type bpf_program__get_expected_attach_type(
1: +    const struct bpf_program *prog) {
1: +  return prog->expected_attach_type;
1:  }
1:  
1:  void bpf_program__set_expected_attach_type(struct bpf_program *prog,
1: -					   enum bpf_attach_type type)
1: -{
1: -	prog->expected_attach_type = type;
1: -}
1: -
1: -#define BPF_PROG_SEC_IMPL(string, ptype, eatype, eatype_optional,	    \
1: -			  attachable, attach_btf)			    \
1: -	{								    \
1: -		.sec = string,						    \
1: -		.len = sizeof(string) - 1,				    \
1: -		.prog_type = ptype,					    \
1: -		.expected_attach_type = eatype,				    \
1: -		.is_exp_attach_type_optional = eatype_optional,		    \
1: -		.is_attachable = attachable,				    \
1: -		.is_attach_btf = attach_btf,				    \
1: -	}
1: +                                           enum bpf_attach_type type) {
1: +  prog->expected_attach_type = type;
1: +}
1: +
1: +#define BPF_PROG_SEC_IMPL(string, ptype, eatype, eatype_optional, attachable, \
1: +                          attach_btf)                                         \
1: +  {                                                                           \
1: +    .sec = string, .len = sizeof(string) - 1, .prog_type = ptype,             \
1: +    .expected_attach_type = eatype,                                           \
1: +    .is_exp_attach_type_optional = eatype_optional,                           \
1: +    .is_attachable = attachable, .is_attach_btf = attach_btf,                 \
1: +  }
1:  
1:  /* Programs that can NOT be attached. */
1:  #define BPF_PROG_SEC(string, ptype) BPF_PROG_SEC_IMPL(string, ptype, 0, 0, 0, 0)
1:  
1:  /* Programs that can be attached. */
1:  #define BPF_APROG_SEC(string, ptype, atype) \
1: -	BPF_PROG_SEC_IMPL(string, ptype, atype, true, 1, 0)
1: +  BPF_PROG_SEC_IMPL(string, ptype, atype, true, 1, 0)
1:  
1:  /* Programs that must specify expected attach type at load time. */
1:  #define BPF_EAPROG_SEC(string, ptype, eatype) \
1: -	BPF_PROG_SEC_IMPL(string, ptype, eatype, false, 1, 0)
1: +  BPF_PROG_SEC_IMPL(string, ptype, eatype, false, 1, 0)
1:  
1:  /* Programs that use BTF to identify attach point */
1:  #define BPF_PROG_BTF(string, ptype, eatype) \
1: -	BPF_PROG_SEC_IMPL(string, ptype, eatype, false, 0, 1)
1: +  BPF_PROG_SEC_IMPL(string, ptype, eatype, false, 0, 1)
1:  
1:  /* Programs that can be attached but attach type can't be identified by section
1:   * name. Kept for backward compatibility.
1:   */
1:  #define BPF_APROG_COMPAT(string, ptype) BPF_PROG_SEC(string, ptype)
1:  
1: -#define SEC_DEF(sec_pfx, ptype, ...) {					    \
1: -	.sec = sec_pfx,							    \
1: -	.len = sizeof(sec_pfx) - 1,					    \
1: -	.prog_type = BPF_PROG_TYPE_##ptype,				    \
1: -	__VA_ARGS__							    \
1: -}
1: +#define SEC_DEF(sec_pfx, ptype, ...)                \
1: +  {                                                 \
1: +    .sec = sec_pfx, .len = sizeof(sec_pfx) - 1,     \
1: +    .prog_type = BPF_PROG_TYPE_##ptype, __VA_ARGS__ \
1: +  }
1:  
1:  static struct bpf_link *attach_kprobe(const struct bpf_sec_def *sec,
1: -				      struct bpf_program *prog);
1: +                                      struct bpf_program *prog);
1:  static struct bpf_link *attach_tp(const struct bpf_sec_def *sec,
1: -				  struct bpf_program *prog);
1: +                                  struct bpf_program *prog);
1:  static struct bpf_link *attach_raw_tp(const struct bpf_sec_def *sec,
1: -				      struct bpf_program *prog);
1: +                                      struct bpf_program *prog);
1:  static struct bpf_link *attach_trace(const struct bpf_sec_def *sec,
1: -				     struct bpf_program *prog);
1: +                                     struct bpf_program *prog);
1:  static struct bpf_link *attach_lsm(const struct bpf_sec_def *sec,
1: -				   struct bpf_program *prog);
1: +                                   struct bpf_program *prog);
1:  static struct bpf_link *attach_iter(const struct bpf_sec_def *sec,
1: -				    struct bpf_program *prog);
1: +                                    struct bpf_program *prog);
1:  
1:  static const struct bpf_sec_def section_defs[] = {
1: -	BPF_PROG_SEC("socket",			BPF_PROG_TYPE_SOCKET_FILTER),
1: -	BPF_EAPROG_SEC("sk_reuseport/migrate",	BPF_PROG_TYPE_SK_REUSEPORT,
1: -						BPF_SK_REUSEPORT_SELECT_OR_MIGRATE),
1: -	BPF_EAPROG_SEC("sk_reuseport",		BPF_PROG_TYPE_SK_REUSEPORT,
1: -						BPF_SK_REUSEPORT_SELECT),
1: -	SEC_DEF("kprobe/", KPROBE,
1: -		.attach_fn = attach_kprobe),
1: -	BPF_PROG_SEC("uprobe/",			BPF_PROG_TYPE_KPROBE),
1: -	SEC_DEF("kretprobe/", KPROBE,
1: -		.attach_fn = attach_kprobe),
1: -	BPF_PROG_SEC("uretprobe/",		BPF_PROG_TYPE_KPROBE),
1: -	BPF_PROG_SEC("classifier",		BPF_PROG_TYPE_SCHED_CLS),
1: -	BPF_PROG_SEC("action",			BPF_PROG_TYPE_SCHED_ACT),
1: -	SEC_DEF("tracepoint/", TRACEPOINT,
1: -		.attach_fn = attach_tp),
1: -	SEC_DEF("tp/", TRACEPOINT,
1: -		.attach_fn = attach_tp),
1: -	SEC_DEF("raw_tracepoint/", RAW_TRACEPOINT,
1: -		.attach_fn = attach_raw_tp),
1: -	SEC_DEF("raw_tp/", RAW_TRACEPOINT,
1: -		.attach_fn = attach_raw_tp),
1: -	SEC_DEF("tp_btf/", TRACING,
1: -		.expected_attach_type = BPF_TRACE_RAW_TP,
1: -		.is_attach_btf = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("fentry/", TRACING,
1: -		.expected_attach_type = BPF_TRACE_FENTRY,
1: -		.is_attach_btf = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("fmod_ret/", TRACING,
1: -		.expected_attach_type = BPF_MODIFY_RETURN,
1: -		.is_attach_btf = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("fexit/", TRACING,
1: -		.expected_attach_type = BPF_TRACE_FEXIT,
1: -		.is_attach_btf = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("fentry.s/", TRACING,
1: -		.expected_attach_type = BPF_TRACE_FENTRY,
1: -		.is_attach_btf = true,
1: -		.is_sleepable = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("fmod_ret.s/", TRACING,
1: -		.expected_attach_type = BPF_MODIFY_RETURN,
1: -		.is_attach_btf = true,
1: -		.is_sleepable = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("fexit.s/", TRACING,
1: -		.expected_attach_type = BPF_TRACE_FEXIT,
1: -		.is_attach_btf = true,
1: -		.is_sleepable = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("freplace/", EXT,
1: -		.is_attach_btf = true,
1: -		.attach_fn = attach_trace),
1: -	SEC_DEF("lsm/", LSM,
1: -		.is_attach_btf = true,
1: -		.expected_attach_type = BPF_LSM_MAC,
1: -		.attach_fn = attach_lsm),
1: -	SEC_DEF("lsm.s/", LSM,
1: -		.is_attach_btf = true,
1: -		.is_sleepable = true,
1: -		.expected_attach_type = BPF_LSM_MAC,
1: -		.attach_fn = attach_lsm),
1: -	SEC_DEF("iter/", TRACING,
1: -		.expected_attach_type = BPF_TRACE_ITER,
1: -		.is_attach_btf = true,
1: -		.attach_fn = attach_iter),
1: -	SEC_DEF("syscall", SYSCALL,
1: -		.is_sleepable = true),
1: -	BPF_EAPROG_SEC("xdp_devmap/",		BPF_PROG_TYPE_XDP,
1: -						BPF_XDP_DEVMAP),
1: -	BPF_EAPROG_SEC("xdp_cpumap/",		BPF_PROG_TYPE_XDP,
1: -						BPF_XDP_CPUMAP),
1: -	BPF_APROG_SEC("xdp",			BPF_PROG_TYPE_XDP,
1: -						BPF_XDP),
1: -	BPF_PROG_SEC("perf_event",		BPF_PROG_TYPE_PERF_EVENT),
1: -	BPF_PROG_SEC("lwt_in",			BPF_PROG_TYPE_LWT_IN),
1: -	BPF_PROG_SEC("lwt_out",			BPF_PROG_TYPE_LWT_OUT),
1: -	BPF_PROG_SEC("lwt_xmit",		BPF_PROG_TYPE_LWT_XMIT),
1: -	BPF_PROG_SEC("lwt_seg6local",		BPF_PROG_TYPE_LWT_SEG6LOCAL),
1: -	BPF_APROG_SEC("cgroup_skb/ingress",	BPF_PROG_TYPE_CGROUP_SKB,
1: -						BPF_CGROUP_INET_INGRESS),
1: -	BPF_APROG_SEC("cgroup_skb/egress",	BPF_PROG_TYPE_CGROUP_SKB,
1: -						BPF_CGROUP_INET_EGRESS),
1: -	BPF_APROG_COMPAT("cgroup/skb",		BPF_PROG_TYPE_CGROUP_SKB),
1: -	BPF_EAPROG_SEC("cgroup/sock_create",	BPF_PROG_TYPE_CGROUP_SOCK,
1: -						BPF_CGROUP_INET_SOCK_CREATE),
1: -	BPF_EAPROG_SEC("cgroup/sock_release",	BPF_PROG_TYPE_CGROUP_SOCK,
1: -						BPF_CGROUP_INET_SOCK_RELEASE),
1: -	BPF_APROG_SEC("cgroup/sock",		BPF_PROG_TYPE_CGROUP_SOCK,
1: -						BPF_CGROUP_INET_SOCK_CREATE),
1: -	BPF_EAPROG_SEC("cgroup/post_bind4",	BPF_PROG_TYPE_CGROUP_SOCK,
1: -						BPF_CGROUP_INET4_POST_BIND),
1: -	BPF_EAPROG_SEC("cgroup/post_bind6",	BPF_PROG_TYPE_CGROUP_SOCK,
1: -						BPF_CGROUP_INET6_POST_BIND),
1: -	BPF_APROG_SEC("cgroup/dev",		BPF_PROG_TYPE_CGROUP_DEVICE,
1: -						BPF_CGROUP_DEVICE),
1: -	BPF_APROG_SEC("sockops",		BPF_PROG_TYPE_SOCK_OPS,
1: -						BPF_CGROUP_SOCK_OPS),
1: -	BPF_APROG_SEC("sk_skb/stream_parser",	BPF_PROG_TYPE_SK_SKB,
1: -						BPF_SK_SKB_STREAM_PARSER),
1: -	BPF_APROG_SEC("sk_skb/stream_verdict",	BPF_PROG_TYPE_SK_SKB,
1: -						BPF_SK_SKB_STREAM_VERDICT),
1: -	BPF_APROG_COMPAT("sk_skb",		BPF_PROG_TYPE_SK_SKB),
1: -	BPF_APROG_SEC("sk_msg",			BPF_PROG_TYPE_SK_MSG,
1: -						BPF_SK_MSG_VERDICT),
1: -	BPF_APROG_SEC("lirc_mode2",		BPF_PROG_TYPE_LIRC_MODE2,
1: -						BPF_LIRC_MODE2),
1: -	BPF_APROG_SEC("flow_dissector",		BPF_PROG_TYPE_FLOW_DISSECTOR,
1: -						BPF_FLOW_DISSECTOR),
1: -	BPF_EAPROG_SEC("cgroup/bind4",		BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET4_BIND),
1: -	BPF_EAPROG_SEC("cgroup/bind6",		BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET6_BIND),
1: -	BPF_EAPROG_SEC("cgroup/connect4",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET4_CONNECT),
1: -	BPF_EAPROG_SEC("cgroup/connect6",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET6_CONNECT),
1: -	BPF_EAPROG_SEC("cgroup/sendmsg4",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_UDP4_SENDMSG),
1: -	BPF_EAPROG_SEC("cgroup/sendmsg6",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_UDP6_SENDMSG),
1: -	BPF_EAPROG_SEC("cgroup/recvmsg4",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_UDP4_RECVMSG),
1: -	BPF_EAPROG_SEC("cgroup/recvmsg6",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_UDP6_RECVMSG),
1: -	BPF_EAPROG_SEC("cgroup/getpeername4",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET4_GETPEERNAME),
1: -	BPF_EAPROG_SEC("cgroup/getpeername6",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET6_GETPEERNAME),
1: -	BPF_EAPROG_SEC("cgroup/getsockname4",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET4_GETSOCKNAME),
1: -	BPF_EAPROG_SEC("cgroup/getsockname6",	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: -						BPF_CGROUP_INET6_GETSOCKNAME),
1: -	BPF_EAPROG_SEC("cgroup/sysctl",		BPF_PROG_TYPE_CGROUP_SYSCTL,
1: -						BPF_CGROUP_SYSCTL),
1: -	BPF_EAPROG_SEC("cgroup/getsockopt",	BPF_PROG_TYPE_CGROUP_SOCKOPT,
1: -						BPF_CGROUP_GETSOCKOPT),
1: -	BPF_EAPROG_SEC("cgroup/setsockopt",	BPF_PROG_TYPE_CGROUP_SOCKOPT,
1: -						BPF_CGROUP_SETSOCKOPT),
1: -	BPF_PROG_SEC("struct_ops",		BPF_PROG_TYPE_STRUCT_OPS),
1: -	BPF_EAPROG_SEC("sk_lookup/",		BPF_PROG_TYPE_SK_LOOKUP,
1: -						BPF_SK_LOOKUP),
1: +    BPF_PROG_SEC("socket", BPF_PROG_TYPE_SOCKET_FILTER),
1: +    BPF_EAPROG_SEC("sk_reuseport/migrate", BPF_PROG_TYPE_SK_REUSEPORT,
1: +                   BPF_SK_REUSEPORT_SELECT_OR_MIGRATE),
1: +    BPF_EAPROG_SEC("sk_reuseport", BPF_PROG_TYPE_SK_REUSEPORT,
1: +                   BPF_SK_REUSEPORT_SELECT),
1: +    SEC_DEF("kprobe/", KPROBE, .attach_fn = attach_kprobe),
1: +    BPF_PROG_SEC("uprobe/", BPF_PROG_TYPE_KPROBE),
1: +    SEC_DEF("kretprobe/", KPROBE, .attach_fn = attach_kprobe),
1: +    BPF_PROG_SEC("uretprobe/", BPF_PROG_TYPE_KPROBE),
1: +    BPF_PROG_SEC("classifier", BPF_PROG_TYPE_SCHED_CLS),
1: +    BPF_PROG_SEC("action", BPF_PROG_TYPE_SCHED_ACT),
1: +    SEC_DEF("tracepoint/", TRACEPOINT, .attach_fn = attach_tp),
1: +    SEC_DEF("tp/", TRACEPOINT, .attach_fn = attach_tp),
1: +    SEC_DEF("raw_tracepoint/", RAW_TRACEPOINT, .attach_fn = attach_raw_tp),
1: +    SEC_DEF("raw_tp/", RAW_TRACEPOINT, .attach_fn = attach_raw_tp),
1: +    SEC_DEF("tp_btf/", TRACING, .expected_attach_type = BPF_TRACE_RAW_TP,
1: +            .is_attach_btf = true, .attach_fn = attach_trace),
1: +    SEC_DEF("fentry/", TRACING, .expected_attach_type = BPF_TRACE_FENTRY,
1: +            .is_attach_btf = true, .attach_fn = attach_trace),
1: +    SEC_DEF("fmod_ret/", TRACING, .expected_attach_type = BPF_MODIFY_RETURN,
1: +            .is_attach_btf = true, .attach_fn = attach_trace),
1: +    SEC_DEF("fexit/", TRACING, .expected_attach_type = BPF_TRACE_FEXIT,
1: +            .is_attach_btf = true, .attach_fn = attach_trace),
1: +    SEC_DEF("fentry.s/", TRACING, .expected_attach_type = BPF_TRACE_FENTRY,
1: +            .is_attach_btf = true, .is_sleepable = true,
1: +            .attach_fn = attach_trace),
1: +    SEC_DEF("fmod_ret.s/", TRACING, .expected_attach_type = BPF_MODIFY_RETURN,
1: +            .is_attach_btf = true, .is_sleepable = true,
1: +            .attach_fn = attach_trace),
1: +    SEC_DEF("fexit.s/", TRACING, .expected_attach_type = BPF_TRACE_FEXIT,
1: +            .is_attach_btf = true, .is_sleepable = true,
1: +            .attach_fn = attach_trace),
1: +    SEC_DEF("freplace/", EXT, .is_attach_btf = true, .attach_fn = attach_trace),
1: +    SEC_DEF("lsm/", LSM, .is_attach_btf = true,
1: +            .expected_attach_type = BPF_LSM_MAC, .attach_fn = attach_lsm),
1: +    SEC_DEF("lsm.s/", LSM, .is_attach_btf = true, .is_sleepable = true,
1: +            .expected_attach_type = BPF_LSM_MAC, .attach_fn = attach_lsm),
1: +    SEC_DEF("iter/", TRACING, .expected_attach_type = BPF_TRACE_ITER,
1: +            .is_attach_btf = true, .attach_fn = attach_iter),
1: +    SEC_DEF("syscall", SYSCALL, .is_sleepable = true),
1: +    BPF_EAPROG_SEC("xdp_devmap/", BPF_PROG_TYPE_XDP, BPF_XDP_DEVMAP),
1: +    BPF_EAPROG_SEC("xdp_cpumap/", BPF_PROG_TYPE_XDP, BPF_XDP_CPUMAP),
1: +    BPF_APROG_SEC("xdp", BPF_PROG_TYPE_XDP, BPF_XDP),
1: +    BPF_PROG_SEC("perf_event", BPF_PROG_TYPE_PERF_EVENT),
1: +    BPF_PROG_SEC("lwt_in", BPF_PROG_TYPE_LWT_IN),
1: +    BPF_PROG_SEC("lwt_out", BPF_PROG_TYPE_LWT_OUT),
1: +    BPF_PROG_SEC("lwt_xmit", BPF_PROG_TYPE_LWT_XMIT),
1: +    BPF_PROG_SEC("lwt_seg6local", BPF_PROG_TYPE_LWT_SEG6LOCAL),
1: +    BPF_APROG_SEC("cgroup_skb/ingress", BPF_PROG_TYPE_CGROUP_SKB,
1: +                  BPF_CGROUP_INET_INGRESS),
1: +    BPF_APROG_SEC("cgroup_skb/egress", BPF_PROG_TYPE_CGROUP_SKB,
1: +                  BPF_CGROUP_INET_EGRESS),
1: +    BPF_APROG_COMPAT("cgroup/skb", BPF_PROG_TYPE_CGROUP_SKB),
1: +    BPF_EAPROG_SEC("cgroup/sock_create", BPF_PROG_TYPE_CGROUP_SOCK,
1: +                   BPF_CGROUP_INET_SOCK_CREATE),
1: +    BPF_EAPROG_SEC("cgroup/sock_release", BPF_PROG_TYPE_CGROUP_SOCK,
1: +                   BPF_CGROUP_INET_SOCK_RELEASE),
1: +    BPF_APROG_SEC("cgroup/sock", BPF_PROG_TYPE_CGROUP_SOCK,
1: +                  BPF_CGROUP_INET_SOCK_CREATE),
1: +    BPF_EAPROG_SEC("cgroup/post_bind4", BPF_PROG_TYPE_CGROUP_SOCK,
1: +                   BPF_CGROUP_INET4_POST_BIND),
1: +    BPF_EAPROG_SEC("cgroup/post_bind6", BPF_PROG_TYPE_CGROUP_SOCK,
1: +                   BPF_CGROUP_INET6_POST_BIND),
1: +    BPF_APROG_SEC("cgroup/dev", BPF_PROG_TYPE_CGROUP_DEVICE, BPF_CGROUP_DEVICE),
1: +    BPF_APROG_SEC("sockops", BPF_PROG_TYPE_SOCK_OPS, BPF_CGROUP_SOCK_OPS),
1: +    BPF_APROG_SEC("sk_skb/stream_parser", BPF_PROG_TYPE_SK_SKB,
1: +                  BPF_SK_SKB_STREAM_PARSER),
1: +    BPF_APROG_SEC("sk_skb/stream_verdict", BPF_PROG_TYPE_SK_SKB,
1: +                  BPF_SK_SKB_STREAM_VERDICT),
1: +    BPF_APROG_COMPAT("sk_skb", BPF_PROG_TYPE_SK_SKB),
1: +    BPF_APROG_SEC("sk_msg", BPF_PROG_TYPE_SK_MSG, BPF_SK_MSG_VERDICT),
1: +    BPF_APROG_SEC("lirc_mode2", BPF_PROG_TYPE_LIRC_MODE2, BPF_LIRC_MODE2),
1: +    BPF_APROG_SEC("flow_dissector", BPF_PROG_TYPE_FLOW_DISSECTOR,
1: +                  BPF_FLOW_DISSECTOR),
1: +    BPF_EAPROG_SEC("cgroup/bind4", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET4_BIND),
1: +    BPF_EAPROG_SEC("cgroup/bind6", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET6_BIND),
1: +    BPF_EAPROG_SEC("cgroup/connect4", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET4_CONNECT),
1: +    BPF_EAPROG_SEC("cgroup/connect6", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET6_CONNECT),
1: +    BPF_EAPROG_SEC("cgroup/sendmsg4", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_UDP4_SENDMSG),
1: +    BPF_EAPROG_SEC("cgroup/sendmsg6", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_UDP6_SENDMSG),
1: +    BPF_EAPROG_SEC("cgroup/recvmsg4", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_UDP4_RECVMSG),
1: +    BPF_EAPROG_SEC("cgroup/recvmsg6", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_UDP6_RECVMSG),
1: +    BPF_EAPROG_SEC("cgroup/getpeername4", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET4_GETPEERNAME),
1: +    BPF_EAPROG_SEC("cgroup/getpeername6", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET6_GETPEERNAME),
1: +    BPF_EAPROG_SEC("cgroup/getsockname4", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET4_GETSOCKNAME),
1: +    BPF_EAPROG_SEC("cgroup/getsockname6", BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
1: +                   BPF_CGROUP_INET6_GETSOCKNAME),
1: +    BPF_EAPROG_SEC("cgroup/sysctl", BPF_PROG_TYPE_CGROUP_SYSCTL,
1: +                   BPF_CGROUP_SYSCTL),
1: +    BPF_EAPROG_SEC("cgroup/getsockopt", BPF_PROG_TYPE_CGROUP_SOCKOPT,
1: +                   BPF_CGROUP_GETSOCKOPT),
1: +    BPF_EAPROG_SEC("cgroup/setsockopt", BPF_PROG_TYPE_CGROUP_SOCKOPT,
1: +                   BPF_CGROUP_SETSOCKOPT),
1: +    BPF_PROG_SEC("struct_ops", BPF_PROG_TYPE_STRUCT_OPS),
1: +    BPF_EAPROG_SEC("sk_lookup/", BPF_PROG_TYPE_SK_LOOKUP, BPF_SK_LOOKUP),
1:  };
1:  
1:  #undef BPF_PROG_SEC_IMPL
1: @@ -9232,203 +8976,201 @@ static const struct bpf_sec_def section_defs[] = {
1:  
1:  #define MAX_TYPE_NAME_SIZE 32
1:  
1: -static const struct bpf_sec_def *find_sec_def(const char *sec_name)
1: -{
1: -	int i, n = ARRAY_SIZE(section_defs);
1: +static const struct bpf_sec_def *find_sec_def(const char *sec_name) {
1: +  int i, n = ARRAY_SIZE(section_defs);
1:  
1: -	for (i = 0; i < n; i++) {
1: -		if (strncmp(sec_name,
1: -			    section_defs[i].sec, section_defs[i].len))
1: -			continue;
1: -		return &section_defs[i];
1: -	}
1: -	return NULL;
1: +  for (i = 0; i < n; i++) {
1: +    if (strncmp(sec_name, section_defs[i].sec, section_defs[i].len))
1: +      continue;
1: +    return &section_defs[i];
1: +  }
1: +  return NULL;
1:  }
1:  
1: -static char *libbpf_get_type_names(bool attach_type)
1: -{
1: -	int i, len = ARRAY_SIZE(section_defs) * MAX_TYPE_NAME_SIZE;
1: -	char *buf;
1: +static char *libbpf_get_type_names(bool attach_type) {
1: +  int i, len = ARRAY_SIZE(section_defs) * MAX_TYPE_NAME_SIZE;
1: +  char *buf;
1:  
1: -	buf = malloc(len);
1: -	if (!buf)
1: -		return NULL;
1: +  buf = malloc(len);
1: +  if (!buf)
1: +    return NULL;
1:  
1: -	buf[0] = '\0';
1: -	/* Forge string buf with all available names */
1: -	for (i = 0; i < ARRAY_SIZE(section_defs); i++) {
1: -		if (attach_type && !section_defs[i].is_attachable)
1: -			continue;
1: +  buf[0] = '\0';
1: +  /* Forge string buf with all available names */
1: +  for (i = 0; i < ARRAY_SIZE(section_defs); i++) {
1: +    if (attach_type && !section_defs[i].is_attachable)
1: +      continue;
1:  
1: -		if (strlen(buf) + strlen(section_defs[i].sec) + 2 > len) {
1: -			free(buf);
1: -			return NULL;
1: -		}
1: -		strcat(buf, " ");
1: -		strcat(buf, section_defs[i].sec);
1: -	}
1: +    if (strlen(buf) + strlen(section_defs[i].sec) + 2 > len) {
1: +      free(buf);
1: +      return NULL;
1: +    }
1: +    strcat(buf, " ");
1: +    strcat(buf, section_defs[i].sec);
1: +  }
1:  
1: -	return buf;
1: +  return buf;
1:  }
1:  
1:  int libbpf_prog_type_by_name(const char *name, enum bpf_prog_type *prog_type,
1: -			     enum bpf_attach_type *expected_attach_type)
1: -{
1: -	const struct bpf_sec_def *sec_def;
1: -	char *type_names;
1: +                             enum bpf_attach_type *expected_attach_type) {
1: +  const struct bpf_sec_def *sec_def;
1: +  char *type_names;
1:  
1: -	if (!name)
1: -		return libbpf_err(-EINVAL);
1: +  if (!name)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	sec_def = find_sec_def(name);
1: -	if (sec_def) {
1: -		*prog_type = sec_def->prog_type;
1: -		*expected_attach_type = sec_def->expected_attach_type;
1: -		return 0;
1: -	}
1: +  sec_def = find_sec_def(name);
1: +  if (sec_def) {
1: +    *prog_type = sec_def->prog_type;
1: +    *expected_attach_type = sec_def->expected_attach_type;
1: +    return 0;
1: +  }
1:  
1: -	pr_debug("failed to guess program type from ELF section '%s'\n", name);
1: -	type_names = libbpf_get_type_names(false);
1: -	if (type_names != NULL) {
1: -		pr_debug("supported section(type) names are:%s\n", type_names);
1: -		free(type_names);
1: -	}
1: +  pr_debug("failed to guess program type from ELF section '%s'\n", name);
1: +  type_names = libbpf_get_type_names(false);
1: +  if (type_names != NULL) {
1: +    pr_debug("supported section(type) names are:%s\n", type_names);
1: +    free(type_names);
1: +  }
1:  
1: -	return libbpf_err(-ESRCH);
1: +  return libbpf_err(-ESRCH);
1:  }
1:  
1:  static struct bpf_map *find_struct_ops_map_by_offset(struct bpf_object *obj,
1: -						     size_t offset)
1: -{
1: -	struct bpf_map *map;
1: -	size_t i;
1: +                                                     size_t offset) {
1: +  struct bpf_map *map;
1: +  size_t i;
1:  
1: -	for (i = 0; i < obj->nr_maps; i++) {
1: -		map = &obj->maps[i];
1: -		if (!bpf_map__is_struct_ops(map))
1: -			continue;
1: -		if (map->sec_offset <= offset &&
1: -		    offset - map->sec_offset < map->def.value_size)
1: -			return map;
1: -	}
1: +  for (i = 0; i < obj->nr_maps; i++) {
1: +    map = &obj->maps[i];
1: +    if (!bpf_map__is_struct_ops(map))
1: +      continue;
1: +    if (map->sec_offset <= offset &&
1: +        offset - map->sec_offset < map->def.value_size)
1: +      return map;
1: +  }
1:  
1: -	return NULL;
1: +  return NULL;
1:  }
1:  
1:  /* Collect the reloc from ELF and populate the st_ops->progs[] */
1:  static int bpf_object__collect_st_ops_relos(struct bpf_object *obj,
1: -					    GElf_Shdr *shdr, Elf_Data *data)
1: -{
1: -	const struct btf_member *member;
1: -	struct bpf_struct_ops *st_ops;
1: -	struct bpf_program *prog;
1: -	unsigned int shdr_idx;
1: -	const struct btf *btf;
1: -	struct bpf_map *map;
1: -	Elf_Data *symbols;
1: -	unsigned int moff, insn_idx;
1: -	const char *name;
1: -	__u32 member_idx;
1: -	GElf_Sym sym;
1: -	GElf_Rel rel;
1: -	int i, nrels;
1: -
1: -	symbols = obj->efile.symbols;
1: -	btf = obj->btf;
1: -	nrels = shdr->sh_size / shdr->sh_entsize;
1: -	for (i = 0; i < nrels; i++) {
1: -		if (!gelf_getrel(data, i, &rel)) {
1: -			pr_warn("struct_ops reloc: failed to get %d reloc\n", i);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		if (!gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &sym)) {
1: -			pr_warn("struct_ops reloc: symbol %zx not found\n",
1: -				(size_t)GELF_R_SYM(rel.r_info));
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -
1: -		name = elf_sym_str(obj, sym.st_name) ?: "<?>";
1: -		map = find_struct_ops_map_by_offset(obj, rel.r_offset);
1: -		if (!map) {
1: -			pr_warn("struct_ops reloc: cannot find map at rel.r_offset %zu\n",
1: -				(size_t)rel.r_offset);
1: -			return -EINVAL;
1: -		}
1: -
1: -		moff = rel.r_offset - map->sec_offset;
1: -		shdr_idx = sym.st_shndx;
1: -		st_ops = map->st_ops;
1: -		pr_debug("struct_ops reloc %s: for %lld value %lld shdr_idx %u rel.r_offset %zu map->sec_offset %zu name %d (\'%s\')\n",
1: -			 map->name,
1: -			 (long long)(rel.r_info >> 32),
1: -			 (long long)sym.st_value,
1: -			 shdr_idx, (size_t)rel.r_offset,
1: -			 map->sec_offset, sym.st_name, name);
1: -
1: -		if (shdr_idx >= SHN_LORESERVE) {
1: -			pr_warn("struct_ops reloc %s: rel.r_offset %zu shdr_idx %u unsupported non-static function\n",
1: -				map->name, (size_t)rel.r_offset, shdr_idx);
1: -			return -LIBBPF_ERRNO__RELOC;
1: -		}
1: -		if (sym.st_value % BPF_INSN_SZ) {
1: -			pr_warn("struct_ops reloc %s: invalid target program offset %llu\n",
1: -				map->name, (unsigned long long)sym.st_value);
1: -			return -LIBBPF_ERRNO__FORMAT;
1: -		}
1: -		insn_idx = sym.st_value / BPF_INSN_SZ;
1: -
1: -		member = find_member_by_offset(st_ops->type, moff * 8);
1: -		if (!member) {
1: -			pr_warn("struct_ops reloc %s: cannot find member at moff %u\n",
1: -				map->name, moff);
1: -			return -EINVAL;
1: -		}
1: -		member_idx = member - btf_members(st_ops->type);
1: -		name = btf__name_by_offset(btf, member->name_off);
1: -
1: -		if (!resolve_func_ptr(btf, member->type, NULL)) {
1: -			pr_warn("struct_ops reloc %s: cannot relocate non func ptr %s\n",
1: -				map->name, name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		prog = find_prog_by_sec_insn(obj, shdr_idx, insn_idx);
1: -		if (!prog) {
1: -			pr_warn("struct_ops reloc %s: cannot find prog at shdr_idx %u to relocate func ptr %s\n",
1: -				map->name, shdr_idx, name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (prog->type == BPF_PROG_TYPE_UNSPEC) {
1: -			const struct bpf_sec_def *sec_def;
1: -
1: -			sec_def = find_sec_def(prog->sec_name);
1: -			if (sec_def &&
1: -			    sec_def->prog_type != BPF_PROG_TYPE_STRUCT_OPS) {
1: -				/* for pr_warn */
1: -				prog->type = sec_def->prog_type;
1: -				goto invalid_prog;
1: -			}
1: -
1: -			prog->type = BPF_PROG_TYPE_STRUCT_OPS;
1: -			prog->attach_btf_id = st_ops->type_id;
1: -			prog->expected_attach_type = member_idx;
1: -		} else if (prog->type != BPF_PROG_TYPE_STRUCT_OPS ||
1: -			   prog->attach_btf_id != st_ops->type_id ||
1: -			   prog->expected_attach_type != member_idx) {
1: -			goto invalid_prog;
1: -		}
1: -		st_ops->progs[member_idx] = prog;
1: -	}
1: -
1: -	return 0;
1: +                                            GElf_Shdr *shdr, Elf_Data *data) {
1: +  const struct btf_member *member;
1: +  struct bpf_struct_ops *st_ops;
1: +  struct bpf_program *prog;
1: +  unsigned int shdr_idx;
1: +  const struct btf *btf;
1: +  struct bpf_map *map;
1: +  Elf_Data *symbols;
1: +  unsigned int moff, insn_idx;
1: +  const char *name;
1: +  __u32 member_idx;
1: +  GElf_Sym sym;
1: +  GElf_Rel rel;
1: +  int i, nrels;
1: +
1: +  symbols = obj->efile.symbols;
1: +  btf = obj->btf;
1: +  nrels = shdr->sh_size / shdr->sh_entsize;
1: +  for (i = 0; i < nrels; i++) {
1: +    if (!gelf_getrel(data, i, &rel)) {
1: +      pr_warn("struct_ops reloc: failed to get %d reloc\n", i);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    if (!gelf_getsym(symbols, GELF_R_SYM(rel.r_info), &sym)) {
1: +      pr_warn("struct_ops reloc: symbol %zx not found\n",
1: +              (size_t)GELF_R_SYM(rel.r_info));
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +
1: +    name = elf_sym_str(obj, sym.st_name) ?: "<?>";
1: +    map = find_struct_ops_map_by_offset(obj, rel.r_offset);
1: +    if (!map) {
1: +      pr_warn("struct_ops reloc: cannot find map at rel.r_offset %zu\n",
1: +              (size_t)rel.r_offset);
1: +      return -EINVAL;
1: +    }
1: +
1: +    moff = rel.r_offset - map->sec_offset;
1: +    shdr_idx = sym.st_shndx;
1: +    st_ops = map->st_ops;
1: +    pr_debug(
1: +        "struct_ops reloc %s: for %lld value %lld shdr_idx %u rel.r_offset %zu "
1: +        "map->sec_offset %zu name %d (\'%s\')\n",
1: +        map->name, (long long)(rel.r_info >> 32), (long long)sym.st_value,
1: +        shdr_idx, (size_t)rel.r_offset, map->sec_offset, sym.st_name, name);
1: +
1: +    if (shdr_idx >= SHN_LORESERVE) {
1: +      pr_warn(
1: +          "struct_ops reloc %s: rel.r_offset %zu shdr_idx %u unsupported "
1: +          "non-static function\n",
1: +          map->name, (size_t)rel.r_offset, shdr_idx);
1: +      return -LIBBPF_ERRNO__RELOC;
1: +    }
1: +    if (sym.st_value % BPF_INSN_SZ) {
1: +      pr_warn("struct_ops reloc %s: invalid target program offset %llu\n",
1: +              map->name, (unsigned long long)sym.st_value);
1: +      return -LIBBPF_ERRNO__FORMAT;
1: +    }
1: +    insn_idx = sym.st_value / BPF_INSN_SZ;
1: +
1: +    member = find_member_by_offset(st_ops->type, moff * 8);
1: +    if (!member) {
1: +      pr_warn("struct_ops reloc %s: cannot find member at moff %u\n", map->name,
1: +              moff);
1: +      return -EINVAL;
1: +    }
1: +    member_idx = member - btf_members(st_ops->type);
1: +    name = btf__name_by_offset(btf, member->name_off);
1: +
1: +    if (!resolve_func_ptr(btf, member->type, NULL)) {
1: +      pr_warn("struct_ops reloc %s: cannot relocate non func ptr %s\n",
1: +              map->name, name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    prog = find_prog_by_sec_insn(obj, shdr_idx, insn_idx);
1: +    if (!prog) {
1: +      pr_warn(
1: +          "struct_ops reloc %s: cannot find prog at shdr_idx %u to relocate "
1: +          "func ptr %s\n",
1: +          map->name, shdr_idx, name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (prog->type == BPF_PROG_TYPE_UNSPEC) {
1: +      const struct bpf_sec_def *sec_def;
1: +
1: +      sec_def = find_sec_def(prog->sec_name);
1: +      if (sec_def && sec_def->prog_type != BPF_PROG_TYPE_STRUCT_OPS) {
1: +        /* for pr_warn */
1: +        prog->type = sec_def->prog_type;
1: +        goto invalid_prog;
1: +      }
1: +
1: +      prog->type = BPF_PROG_TYPE_STRUCT_OPS;
1: +      prog->attach_btf_id = st_ops->type_id;
1: +      prog->expected_attach_type = member_idx;
1: +    } else if (prog->type != BPF_PROG_TYPE_STRUCT_OPS ||
1: +               prog->attach_btf_id != st_ops->type_id ||
1: +               prog->expected_attach_type != member_idx) {
1: +      goto invalid_prog;
1: +    }
1: +    st_ops->progs[member_idx] = prog;
1: +  }
1: +
1: +  return 0;
1:  
1:  invalid_prog:
1: -	pr_warn("struct_ops reloc %s: cannot use prog %s in sec %s with type %u attach_btf_id %u expected_attach_type %u for func ptr %s\n",
1: -		map->name, prog->name, prog->sec_name, prog->type,
1: -		prog->attach_btf_id, prog->expected_attach_type, name);
1: -	return -EINVAL;
1: +  pr_warn(
1: +      "struct_ops reloc %s: cannot use prog %s in sec %s with type %u "
1: +      "attach_btf_id %u expected_attach_type %u for func ptr %s\n",
1: +      map->name, prog->name, prog->sec_name, prog->type, prog->attach_btf_id,
1: +      prog->expected_attach_type, name);
1: +  return -EINVAL;
1:  }
1:  
1:  #define BTF_TRACE_PREFIX "btf_trace_"
1: @@ -9437,581 +9179,534 @@ invalid_prog:
1:  #define BTF_MAX_NAME_SIZE 128
1:  
1:  void btf_get_kernel_prefix_kind(enum bpf_attach_type attach_type,
1: -				const char **prefix, int *kind)
1: -{
1: -	switch (attach_type) {
1: -	case BPF_TRACE_RAW_TP:
1: -		*prefix = BTF_TRACE_PREFIX;
1: -		*kind = BTF_KIND_TYPEDEF;
1: -		break;
1: -	case BPF_LSM_MAC:
1: -		*prefix = BTF_LSM_PREFIX;
1: -		*kind = BTF_KIND_FUNC;
1: -		break;
1: -	case BPF_TRACE_ITER:
1: -		*prefix = BTF_ITER_PREFIX;
1: -		*kind = BTF_KIND_FUNC;
1: -		break;
1: -	default:
1: -		*prefix = "";
1: -		*kind = BTF_KIND_FUNC;
1: -	}
1: +                                const char **prefix, int *kind) {
1: +  switch (attach_type) {
1: +  case BPF_TRACE_RAW_TP:
1: +    *prefix = BTF_TRACE_PREFIX;
1: +    *kind = BTF_KIND_TYPEDEF;
1: +    break;
1: +  case BPF_LSM_MAC:
1: +    *prefix = BTF_LSM_PREFIX;
1: +    *kind = BTF_KIND_FUNC;
1: +    break;
1: +  case BPF_TRACE_ITER:
1: +    *prefix = BTF_ITER_PREFIX;
1: +    *kind = BTF_KIND_FUNC;
1: +    break;
1: +  default:
1: +    *prefix = "";
1: +    *kind = BTF_KIND_FUNC;
1: +  }
1:  }
1:  
1:  static int find_btf_by_prefix_kind(const struct btf *btf, const char *prefix,
1: -				   const char *name, __u32 kind)
1: -{
1: -	char btf_type_name[BTF_MAX_NAME_SIZE];
1: -	int ret;
1: -
1: -	ret = snprintf(btf_type_name, sizeof(btf_type_name),
1: -		       "%s%s", prefix, name);
1: -	/* snprintf returns the number of characters written excluding the
1: -	 * the terminating null. So, if >= BTF_MAX_NAME_SIZE are written, it
1: -	 * indicates truncation.
1: -	 */
1: -	if (ret < 0 || ret >= sizeof(btf_type_name))
1: -		return -ENAMETOOLONG;
1: -	return btf__find_by_name_kind(btf, btf_type_name, kind);
1: +                                   const char *name, __u32 kind) {
1: +  char btf_type_name[BTF_MAX_NAME_SIZE];
1: +  int ret;
1: +
1: +  ret = snprintf(btf_type_name, sizeof(btf_type_name), "%s%s", prefix, name);
1: +  /* snprintf returns the number of characters written excluding the
1: +   * the terminating null. So, if >= BTF_MAX_NAME_SIZE are written, it
1: +   * indicates truncation.
1: +   */
1: +  if (ret < 0 || ret >= sizeof(btf_type_name))
1: +    return -ENAMETOOLONG;
1: +  return btf__find_by_name_kind(btf, btf_type_name, kind);
1:  }
1:  
1:  static inline int find_attach_btf_id(struct btf *btf, const char *name,
1: -				     enum bpf_attach_type attach_type)
1: -{
1: -	const char *prefix;
1: -	int kind;
1: +                                     enum bpf_attach_type attach_type) {
1: +  const char *prefix;
1: +  int kind;
1:  
1: -	btf_get_kernel_prefix_kind(attach_type, &prefix, &kind);
1: -	return find_btf_by_prefix_kind(btf, prefix, name, kind);
1: +  btf_get_kernel_prefix_kind(attach_type, &prefix, &kind);
1: +  return find_btf_by_prefix_kind(btf, prefix, name, kind);
1:  }
1:  
1:  int libbpf_find_vmlinux_btf_id(const char *name,
1: -			       enum bpf_attach_type attach_type)
1: -{
1: -	struct btf *btf;
1: -	int err;
1: -
1: -	btf = libbpf_find_kernel_btf();
1: -	err = libbpf_get_error(btf);
1: -	if (err) {
1: -		pr_warn("vmlinux BTF is not found\n");
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	err = find_attach_btf_id(btf, name, attach_type);
1: -	if (err <= 0)
1: -		pr_warn("%s is not found in vmlinux BTF\n", name);
1: -
1: -	btf__free(btf);
1: -	return libbpf_err(err);
1: -}
1: -
1: -static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd)
1: -{
1: -	struct bpf_prog_info_linear *info_linear;
1: -	struct bpf_prog_info *info;
1: -	struct btf *btf = NULL;
1: -	int err = -EINVAL;
1: -
1: -	info_linear = bpf_program__get_prog_info_linear(attach_prog_fd, 0);
1: -	err = libbpf_get_error(info_linear);
1: -	if (err) {
1: -		pr_warn("failed get_prog_info_linear for FD %d\n",
1: -			attach_prog_fd);
1: -		return err;
1: -	}
1: -	info = &info_linear->info;
1: -	if (!info->btf_id) {
1: -		pr_warn("The target program doesn't have BTF\n");
1: -		goto out;
1: -	}
1: -	if (btf__get_from_id(info->btf_id, &btf)) {
1: -		pr_warn("Failed to get BTF of the program\n");
1: -		goto out;
1: -	}
1: -	err = btf__find_by_name_kind(btf, name, BTF_KIND_FUNC);
1: -	btf__free(btf);
1: -	if (err <= 0) {
1: -		pr_warn("%s is not found in prog's BTF\n", name);
1: -		goto out;
1: -	}
1: +                               enum bpf_attach_type attach_type) {
1: +  struct btf *btf;
1: +  int err;
1: +
1: +  btf = libbpf_find_kernel_btf();
1: +  err = libbpf_get_error(btf);
1: +  if (err) {
1: +    pr_warn("vmlinux BTF is not found\n");
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  err = find_attach_btf_id(btf, name, attach_type);
1: +  if (err <= 0)
1: +    pr_warn("%s is not found in vmlinux BTF\n", name);
1: +
1: +  btf__free(btf);
1: +  return libbpf_err(err);
1: +}
1: +
1: +static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd) {
1: +  struct bpf_prog_info_linear *info_linear;
1: +  struct bpf_prog_info *info;
1: +  struct btf *btf = NULL;
1: +  int err = -EINVAL;
1: +
1: +  info_linear = bpf_program__get_prog_info_linear(attach_prog_fd, 0);
1: +  err = libbpf_get_error(info_linear);
1: +  if (err) {
1: +    pr_warn("failed get_prog_info_linear for FD %d\n", attach_prog_fd);
1: +    return err;
1: +  }
1: +  info = &info_linear->info;
1: +  if (!info->btf_id) {
1: +    pr_warn("The target program doesn't have BTF\n");
1: +    goto out;
1: +  }
1: +  if (btf__get_from_id(info->btf_id, &btf)) {
1: +    pr_warn("Failed to get BTF of the program\n");
1: +    goto out;
1: +  }
1: +  err = btf__find_by_name_kind(btf, name, BTF_KIND_FUNC);
1: +  btf__free(btf);
1: +  if (err <= 0) {
1: +    pr_warn("%s is not found in prog's BTF\n", name);
1: +    goto out;
1: +  }
1:  out:
1: -	free(info_linear);
1: -	return err;
1: +  free(info_linear);
1: +  return err;
1:  }
1:  
1:  static int find_kernel_btf_id(struct bpf_object *obj, const char *attach_name,
1: -			      enum bpf_attach_type attach_type,
1: -			      int *btf_obj_fd, int *btf_type_id)
1: -{
1: -	int ret, i;
1: -
1: -	ret = find_attach_btf_id(obj->btf_vmlinux, attach_name, attach_type);
1: -	if (ret > 0) {
1: -		*btf_obj_fd = 0; /* vmlinux BTF */
1: -		*btf_type_id = ret;
1: -		return 0;
1: -	}
1: -	if (ret != -ENOENT)
1: -		return ret;
1: -
1: -	ret = load_module_btfs(obj);
1: -	if (ret)
1: -		return ret;
1: -
1: -	for (i = 0; i < obj->btf_module_cnt; i++) {
1: -		const struct module_btf *mod = &obj->btf_modules[i];
1: -
1: -		ret = find_attach_btf_id(mod->btf, attach_name, attach_type);
1: -		if (ret > 0) {
1: -			*btf_obj_fd = mod->fd;
1: -			*btf_type_id = ret;
1: -			return 0;
1: -		}
1: -		if (ret == -ENOENT)
1: -			continue;
1: -
1: -		return ret;
1: -	}
1: -
1: -	return -ESRCH;
1: -}
1: -
1: -static int libbpf_find_attach_btf_id(struct bpf_program *prog, int *btf_obj_fd, int *btf_type_id)
1: -{
1: -	enum bpf_attach_type attach_type = prog->expected_attach_type;
1: -	__u32 attach_prog_fd = prog->attach_prog_fd;
1: -	const char *name = prog->sec_name, *attach_name;
1: -	const struct bpf_sec_def *sec = NULL;
1: -	int i, err = 0;
1: -
1: -	if (!name)
1: -		return -EINVAL;
1: -
1: -	for (i = 0; i < ARRAY_SIZE(section_defs); i++) {
1: -		if (!section_defs[i].is_attach_btf)
1: -			continue;
1: -		if (strncmp(name, section_defs[i].sec, section_defs[i].len))
1: -			continue;
1: -
1: -		sec = &section_defs[i];
1: -		break;
1: -	}
1: -
1: -	if (!sec) {
1: -		pr_warn("failed to identify BTF ID based on ELF section name '%s'\n", name);
1: -		return -ESRCH;
1: -	}
1: -	attach_name = name + sec->len;
1: -
1: -	/* BPF program's BTF ID */
1: -	if (attach_prog_fd) {
1: -		err = libbpf_find_prog_btf_id(attach_name, attach_prog_fd);
1: -		if (err < 0) {
1: -			pr_warn("failed to find BPF program (FD %d) BTF ID for '%s': %d\n",
1: -				 attach_prog_fd, attach_name, err);
1: -			return err;
1: -		}
1: -		*btf_obj_fd = 0;
1: -		*btf_type_id = err;
1: -		return 0;
1: -	}
1: -
1: -	/* kernel/module BTF ID */
1: -	if (prog->obj->gen_loader) {
1: -		bpf_gen__record_attach_target(prog->obj->gen_loader, attach_name, attach_type);
1: -		*btf_obj_fd = 0;
1: -		*btf_type_id = 1;
1: -	} else {
1: -		err = find_kernel_btf_id(prog->obj, attach_name, attach_type, btf_obj_fd, btf_type_id);
1: -	}
1: -	if (err) {
1: -		pr_warn("failed to find kernel BTF type ID of '%s': %d\n", attach_name, err);
1: -		return err;
1: -	}
1: -	return 0;
1: +                              enum bpf_attach_type attach_type, int *btf_obj_fd,
1: +                              int *btf_type_id) {
1: +  int ret, i;
1: +
1: +  ret = find_attach_btf_id(obj->btf_vmlinux, attach_name, attach_type);
1: +  if (ret > 0) {
1: +    *btf_obj_fd = 0; /* vmlinux BTF */
1: +    *btf_type_id = ret;
1: +    return 0;
1: +  }
1: +  if (ret != -ENOENT)
1: +    return ret;
1: +
1: +  ret = load_module_btfs(obj);
1: +  if (ret)
1: +    return ret;
1: +
1: +  for (i = 0; i < obj->btf_module_cnt; i++) {
1: +    const struct module_btf *mod = &obj->btf_modules[i];
1: +
1: +    ret = find_attach_btf_id(mod->btf, attach_name, attach_type);
1: +    if (ret > 0) {
1: +      *btf_obj_fd = mod->fd;
1: +      *btf_type_id = ret;
1: +      return 0;
1: +    }
1: +    if (ret == -ENOENT)
1: +      continue;
1: +
1: +    return ret;
1: +  }
1: +
1: +  return -ESRCH;
1: +}
1: +
1: +static int libbpf_find_attach_btf_id(struct bpf_program *prog, int *btf_obj_fd,
1: +                                     int *btf_type_id) {
1: +  enum bpf_attach_type attach_type = prog->expected_attach_type;
1: +  __u32 attach_prog_fd = prog->attach_prog_fd;
1: +  const char *name = prog->sec_name, *attach_name;
1: +  const struct bpf_sec_def *sec = NULL;
1: +  int i, err = 0;
1: +
1: +  if (!name)
1: +    return -EINVAL;
1: +
1: +  for (i = 0; i < ARRAY_SIZE(section_defs); i++) {
1: +    if (!section_defs[i].is_attach_btf)
1: +      continue;
1: +    if (strncmp(name, section_defs[i].sec, section_defs[i].len))
1: +      continue;
1: +
1: +    sec = &section_defs[i];
1: +    break;
1: +  }
1: +
1: +  if (!sec) {
1: +    pr_warn("failed to identify BTF ID based on ELF section name '%s'\n", name);
1: +    return -ESRCH;
1: +  }
1: +  attach_name = name + sec->len;
1: +
1: +  /* BPF program's BTF ID */
1: +  if (attach_prog_fd) {
1: +    err = libbpf_find_prog_btf_id(attach_name, attach_prog_fd);
1: +    if (err < 0) {
1: +      pr_warn("failed to find BPF program (FD %d) BTF ID for '%s': %d\n",
1: +              attach_prog_fd, attach_name, err);
1: +      return err;
1: +    }
1: +    *btf_obj_fd = 0;
1: +    *btf_type_id = err;
1: +    return 0;
1: +  }
1: +
1: +  /* kernel/module BTF ID */
1: +  if (prog->obj->gen_loader) {
1: +    bpf_gen__record_attach_target(prog->obj->gen_loader, attach_name,
1: +                                  attach_type);
1: +    *btf_obj_fd = 0;
1: +    *btf_type_id = 1;
1: +  } else {
1: +    err = find_kernel_btf_id(prog->obj, attach_name, attach_type, btf_obj_fd,
1: +                             btf_type_id);
1: +  }
1: +  if (err) {
1: +    pr_warn("failed to find kernel BTF type ID of '%s': %d\n", attach_name,
1: +            err);
1: +    return err;
1: +  }
1: +  return 0;
1:  }
1:  
1:  int libbpf_attach_type_by_name(const char *name,
1: -			       enum bpf_attach_type *attach_type)
1: -{
1: -	char *type_names;
1: -	int i;
1: +                               enum bpf_attach_type *attach_type) {
1: +  char *type_names;
1: +  int i;
1:  
1: -	if (!name)
1: -		return libbpf_err(-EINVAL);
1: +  if (!name)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	for (i = 0; i < ARRAY_SIZE(section_defs); i++) {
1: -		if (strncmp(name, section_defs[i].sec, section_defs[i].len))
1: -			continue;
1: -		if (!section_defs[i].is_attachable)
1: -			return libbpf_err(-EINVAL);
1: -		*attach_type = section_defs[i].expected_attach_type;
1: -		return 0;
1: -	}
1: -	pr_debug("failed to guess attach type based on ELF section name '%s'\n", name);
1: -	type_names = libbpf_get_type_names(true);
1: -	if (type_names != NULL) {
1: -		pr_debug("attachable section(type) names are:%s\n", type_names);
1: -		free(type_names);
1: -	}
1: +  for (i = 0; i < ARRAY_SIZE(section_defs); i++) {
1: +    if (strncmp(name, section_defs[i].sec, section_defs[i].len))
1: +      continue;
1: +    if (!section_defs[i].is_attachable)
1: +      return libbpf_err(-EINVAL);
1: +    *attach_type = section_defs[i].expected_attach_type;
1: +    return 0;
1: +  }
1: +  pr_debug("failed to guess attach type based on ELF section name '%s'\n",
1: +           name);
1: +  type_names = libbpf_get_type_names(true);
1: +  if (type_names != NULL) {
1: +    pr_debug("attachable section(type) names are:%s\n", type_names);
1: +    free(type_names);
1: +  }
1:  
1: -	return libbpf_err(-EINVAL);
1: +  return libbpf_err(-EINVAL);
1:  }
1:  
1: -int bpf_map__fd(const struct bpf_map *map)
1: -{
1: -	return map ? map->fd : libbpf_err(-EINVAL);
1: +int bpf_map__fd(const struct bpf_map *map) {
1: +  return map ? map->fd : libbpf_err(-EINVAL);
1:  }
1:  
1: -const struct bpf_map_def *bpf_map__def(const struct bpf_map *map)
1: -{
1: -	return map ? &map->def : libbpf_err_ptr(-EINVAL);
1: +const struct bpf_map_def *bpf_map__def(const struct bpf_map *map) {
1: +  return map ? &map->def : libbpf_err_ptr(-EINVAL);
1:  }
1:  
1: -const char *bpf_map__name(const struct bpf_map *map)
1: -{
1: -	return map ? map->name : NULL;
1: +const char *bpf_map__name(const struct bpf_map *map) {
1: +  return map ? map->name : NULL;
1:  }
1:  
1: -enum bpf_map_type bpf_map__type(const struct bpf_map *map)
1: -{
1: -	return map->def.type;
1: +enum bpf_map_type bpf_map__type(const struct bpf_map *map) {
1: +  return map->def.type;
1:  }
1:  
1: -int bpf_map__set_type(struct bpf_map *map, enum bpf_map_type type)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->def.type = type;
1: -	return 0;
1: +int bpf_map__set_type(struct bpf_map *map, enum bpf_map_type type) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->def.type = type;
1: +  return 0;
1:  }
1:  
1: -__u32 bpf_map__map_flags(const struct bpf_map *map)
1: -{
1: -	return map->def.map_flags;
1: +__u32 bpf_map__map_flags(const struct bpf_map *map) {
1: +  return map->def.map_flags;
1:  }
1:  
1: -int bpf_map__set_map_flags(struct bpf_map *map, __u32 flags)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->def.map_flags = flags;
1: -	return 0;
1: +int bpf_map__set_map_flags(struct bpf_map *map, __u32 flags) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->def.map_flags = flags;
1: +  return 0;
1:  }
1:  
1: -__u32 bpf_map__numa_node(const struct bpf_map *map)
1: -{
1: -	return map->numa_node;
1: -}
1: +__u32 bpf_map__numa_node(const struct bpf_map *map) { return map->numa_node; }
1:  
1: -int bpf_map__set_numa_node(struct bpf_map *map, __u32 numa_node)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->numa_node = numa_node;
1: -	return 0;
1: +int bpf_map__set_numa_node(struct bpf_map *map, __u32 numa_node) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->numa_node = numa_node;
1: +  return 0;
1:  }
1:  
1: -__u32 bpf_map__key_size(const struct bpf_map *map)
1: -{
1: -	return map->def.key_size;
1: -}
1: +__u32 bpf_map__key_size(const struct bpf_map *map) { return map->def.key_size; }
1:  
1: -int bpf_map__set_key_size(struct bpf_map *map, __u32 size)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->def.key_size = size;
1: -	return 0;
1: +int bpf_map__set_key_size(struct bpf_map *map, __u32 size) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->def.key_size = size;
1: +  return 0;
1:  }
1:  
1: -__u32 bpf_map__value_size(const struct bpf_map *map)
1: -{
1: -	return map->def.value_size;
1: +__u32 bpf_map__value_size(const struct bpf_map *map) {
1: +  return map->def.value_size;
1:  }
1:  
1: -int bpf_map__set_value_size(struct bpf_map *map, __u32 size)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->def.value_size = size;
1: -	return 0;
1: +int bpf_map__set_value_size(struct bpf_map *map, __u32 size) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->def.value_size = size;
1: +  return 0;
1:  }
1:  
1: -__u32 bpf_map__btf_key_type_id(const struct bpf_map *map)
1: -{
1: -	return map ? map->btf_key_type_id : 0;
1: +__u32 bpf_map__btf_key_type_id(const struct bpf_map *map) {
1: +  return map ? map->btf_key_type_id : 0;
1:  }
1:  
1: -__u32 bpf_map__btf_value_type_id(const struct bpf_map *map)
1: -{
1: -	return map ? map->btf_value_type_id : 0;
1: +__u32 bpf_map__btf_value_type_id(const struct bpf_map *map) {
1: +  return map ? map->btf_value_type_id : 0;
1:  }
1:  
1:  int bpf_map__set_priv(struct bpf_map *map, void *priv,
1: -		     bpf_map_clear_priv_t clear_priv)
1: -{
1: -	if (!map)
1: -		return libbpf_err(-EINVAL);
1: +                      bpf_map_clear_priv_t clear_priv) {
1: +  if (!map)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (map->priv) {
1: -		if (map->clear_priv)
1: -			map->clear_priv(map, map->priv);
1: -	}
1: +  if (map->priv) {
1: +    if (map->clear_priv)
1: +      map->clear_priv(map, map->priv);
1: +  }
1:  
1: -	map->priv = priv;
1: -	map->clear_priv = clear_priv;
1: -	return 0;
1: +  map->priv = priv;
1: +  map->clear_priv = clear_priv;
1: +  return 0;
1:  }
1:  
1: -void *bpf_map__priv(const struct bpf_map *map)
1: -{
1: -	return map ? map->priv : libbpf_err_ptr(-EINVAL);
1: +void *bpf_map__priv(const struct bpf_map *map) {
1: +  return map ? map->priv : libbpf_err_ptr(-EINVAL);
1:  }
1:  
1: -int bpf_map__set_initial_value(struct bpf_map *map,
1: -			       const void *data, size_t size)
1: -{
1: -	if (!map->mmaped || map->libbpf_type == LIBBPF_MAP_KCONFIG ||
1: -	    size != map->def.value_size || map->fd >= 0)
1: -		return libbpf_err(-EINVAL);
1: +int bpf_map__set_initial_value(struct bpf_map *map, const void *data,
1: +                               size_t size) {
1: +  if (!map->mmaped || map->libbpf_type == LIBBPF_MAP_KCONFIG ||
1: +      size != map->def.value_size || map->fd >= 0)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	memcpy(map->mmaped, data, size);
1: -	return 0;
1: +  memcpy(map->mmaped, data, size);
1: +  return 0;
1:  }
1:  
1: -const void *bpf_map__initial_value(struct bpf_map *map, size_t *psize)
1: -{
1: -	if (!map->mmaped)
1: -		return NULL;
1: -	*psize = map->def.value_size;
1: -	return map->mmaped;
1: +const void *bpf_map__initial_value(struct bpf_map *map, size_t *psize) {
1: +  if (!map->mmaped)
1: +    return NULL;
1: +  *psize = map->def.value_size;
1: +  return map->mmaped;
1:  }
1:  
1: -bool bpf_map__is_offload_neutral(const struct bpf_map *map)
1: -{
1: -	return map->def.type == BPF_MAP_TYPE_PERF_EVENT_ARRAY;
1: +bool bpf_map__is_offload_neutral(const struct bpf_map *map) {
1: +  return map->def.type == BPF_MAP_TYPE_PERF_EVENT_ARRAY;
1:  }
1:  
1: -bool bpf_map__is_internal(const struct bpf_map *map)
1: -{
1: -	return map->libbpf_type != LIBBPF_MAP_UNSPEC;
1: +bool bpf_map__is_internal(const struct bpf_map *map) {
1: +  return map->libbpf_type != LIBBPF_MAP_UNSPEC;
1:  }
1:  
1: -__u32 bpf_map__ifindex(const struct bpf_map *map)
1: -{
1: -	return map->map_ifindex;
1: -}
1: +__u32 bpf_map__ifindex(const struct bpf_map *map) { return map->map_ifindex; }
1:  
1: -int bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex)
1: -{
1: -	if (map->fd >= 0)
1: -		return libbpf_err(-EBUSY);
1: -	map->map_ifindex = ifindex;
1: -	return 0;
1: +int bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex) {
1: +  if (map->fd >= 0)
1: +    return libbpf_err(-EBUSY);
1: +  map->map_ifindex = ifindex;
1: +  return 0;
1:  }
1:  
1: -int bpf_map__set_inner_map_fd(struct bpf_map *map, int fd)
1: -{
1: -	if (!bpf_map_type__is_map_in_map(map->def.type)) {
1: -		pr_warn("error: unsupported map type\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -	if (map->inner_map_fd != -1) {
1: -		pr_warn("error: inner_map_fd already specified\n");
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -	zfree(&map->inner_map);
1: -	map->inner_map_fd = fd;
1: -	return 0;
1: +int bpf_map__set_inner_map_fd(struct bpf_map *map, int fd) {
1: +  if (!bpf_map_type__is_map_in_map(map->def.type)) {
1: +    pr_warn("error: unsupported map type\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +  if (map->inner_map_fd != -1) {
1: +    pr_warn("error: inner_map_fd already specified\n");
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +  zfree(&map->inner_map);
1: +  map->inner_map_fd = fd;
1: +  return 0;
1:  }
1:  
1: -static struct bpf_map *
1: -__bpf_map__iter(const struct bpf_map *m, const struct bpf_object *obj, int i)
1: -{
1: -	ssize_t idx;
1: -	struct bpf_map *s, *e;
1: +static struct bpf_map *__bpf_map__iter(const struct bpf_map *m,
1: +                                       const struct bpf_object *obj, int i) {
1: +  ssize_t idx;
1: +  struct bpf_map *s, *e;
1:  
1: -	if (!obj || !obj->maps)
1: -		return errno = EINVAL, NULL;
1: +  if (!obj || !obj->maps)
1: +    return errno = EINVAL, NULL;
1:  
1: -	s = obj->maps;
1: -	e = obj->maps + obj->nr_maps;
1: +  s = obj->maps;
1: +  e = obj->maps + obj->nr_maps;
1:  
1: -	if ((m < s) || (m >= e)) {
1: -		pr_warn("error in %s: map handler doesn't belong to object\n",
1: -			 __func__);
1: -		return errno = EINVAL, NULL;
1: -	}
1: +  if ((m < s) || (m >= e)) {
1: +    pr_warn("error in %s: map handler doesn't belong to object\n", __func__);
1: +    return errno = EINVAL, NULL;
1: +  }
1:  
1: -	idx = (m - obj->maps) + i;
1: -	if (idx >= obj->nr_maps || idx < 0)
1: -		return NULL;
1: -	return &obj->maps[idx];
1: +  idx = (m - obj->maps) + i;
1: +  if (idx >= obj->nr_maps || idx < 0)
1: +    return NULL;
1: +  return &obj->maps[idx];
1:  }
1:  
1: -struct bpf_map *
1: -bpf_map__next(const struct bpf_map *prev, const struct bpf_object *obj)
1: -{
1: -	if (prev == NULL)
1: -		return obj->maps;
1: +struct bpf_map *bpf_map__next(const struct bpf_map *prev,
1: +                              const struct bpf_object *obj) {
1: +  if (prev == NULL)
1: +    return obj->maps;
1:  
1: -	return __bpf_map__iter(prev, obj, 1);
1: +  return __bpf_map__iter(prev, obj, 1);
1:  }
1:  
1: -struct bpf_map *
1: -bpf_map__prev(const struct bpf_map *next, const struct bpf_object *obj)
1: -{
1: -	if (next == NULL) {
1: -		if (!obj->nr_maps)
1: -			return NULL;
1: -		return obj->maps + obj->nr_maps - 1;
1: -	}
1: +struct bpf_map *bpf_map__prev(const struct bpf_map *next,
1: +                              const struct bpf_object *obj) {
1: +  if (next == NULL) {
1: +    if (!obj->nr_maps)
1: +      return NULL;
1: +    return obj->maps + obj->nr_maps - 1;
1: +  }
1:  
1: -	return __bpf_map__iter(next, obj, -1);
1: +  return __bpf_map__iter(next, obj, -1);
1:  }
1:  
1: -struct bpf_map *
1: -bpf_object__find_map_by_name(const struct bpf_object *obj, const char *name)
1: -{
1: -	struct bpf_map *pos;
1: +struct bpf_map *bpf_object__find_map_by_name(const struct bpf_object *obj,
1: +                                             const char *name) {
1: +  struct bpf_map *pos;
1:  
1: -	bpf_object__for_each_map(pos, obj) {
1: -		if (pos->name && !strcmp(pos->name, name))
1: -			return pos;
1: -	}
1: -	return errno = ENOENT, NULL;
1: +  bpf_object__for_each_map(pos, obj) {
1: +    if (pos->name && !strcmp(pos->name, name))
1: +      return pos;
1: +  }
1: +  return errno = ENOENT, NULL;
1:  }
1:  
1: -int
1: -bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name)
1: -{
1: -	return bpf_map__fd(bpf_object__find_map_by_name(obj, name));
1: +int bpf_object__find_map_fd_by_name(const struct bpf_object *obj,
1: +                                    const char *name) {
1: +  return bpf_map__fd(bpf_object__find_map_by_name(obj, name));
1:  }
1:  
1: -struct bpf_map *
1: -bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset)
1: -{
1: -	return libbpf_err_ptr(-ENOTSUP);
1: +struct bpf_map *bpf_object__find_map_by_offset(struct bpf_object *obj,
1: +                                               size_t offset) {
1: +  return libbpf_err_ptr(-ENOTSUP);
1:  }
1:  
1: -long libbpf_get_error(const void *ptr)
1: -{
1: -	if (!IS_ERR_OR_NULL(ptr))
1: -		return 0;
1: +long libbpf_get_error(const void *ptr) {
1: +  if (!IS_ERR_OR_NULL(ptr))
1: +    return 0;
1:  
1: -	if (IS_ERR(ptr))
1: -		errno = -PTR_ERR(ptr);
1: +  if (IS_ERR(ptr))
1: +    errno = -PTR_ERR(ptr);
1:  
1: -	/* If ptr == NULL, then errno should be already set by the failing
1: -	 * API, because libbpf never returns NULL on success and it now always
1: -	 * sets errno on error. So no extra errno handling for ptr == NULL
1: -	 * case.
1: -	 */
1: -	return -errno;
1: +  /* If ptr == NULL, then errno should be already set by the failing
1: +   * API, because libbpf never returns NULL on success and it now always
1: +   * sets errno on error. So no extra errno handling for ptr == NULL
1: +   * case.
1: +   */
1: +  return -errno;
1:  }
1:  
1:  int bpf_prog_load(const char *file, enum bpf_prog_type type,
1: -		  struct bpf_object **pobj, int *prog_fd)
1: -{
1: -	struct bpf_prog_load_attr attr;
1: +                  struct bpf_object **pobj, int *prog_fd) {
1: +  struct bpf_prog_load_attr attr;
1:  
1: -	memset(&attr, 0, sizeof(struct bpf_prog_load_attr));
1: -	attr.file = file;
1: -	attr.prog_type = type;
1: -	attr.expected_attach_type = 0;
1: +  memset(&attr, 0, sizeof(struct bpf_prog_load_attr));
1: +  attr.file = file;
1: +  attr.prog_type = type;
1: +  attr.expected_attach_type = 0;
1:  
1: -	return bpf_prog_load_xattr(&attr, pobj, prog_fd);
1: +  return bpf_prog_load_xattr(&attr, pobj, prog_fd);
1:  }
1:  
1:  int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,
1: -			struct bpf_object **pobj, int *prog_fd)
1: -{
1: -	struct bpf_object_open_attr open_attr = {};
1: -	struct bpf_program *prog, *first_prog = NULL;
1: -	struct bpf_object *obj;
1: -	struct bpf_map *map;
1: -	int err;
1: -
1: -	if (!attr)
1: -		return libbpf_err(-EINVAL);
1: -	if (!attr->file)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	open_attr.file = attr->file;
1: -	open_attr.prog_type = attr->prog_type;
1: -
1: -	obj = bpf_object__open_xattr(&open_attr);
1: -	err = libbpf_get_error(obj);
1: -	if (err)
1: -		return libbpf_err(-ENOENT);
1: -
1: -	bpf_object__for_each_program(prog, obj) {
1: -		enum bpf_attach_type attach_type = attr->expected_attach_type;
1: -		/*
1: -		 * to preserve backwards compatibility, bpf_prog_load treats
1: -		 * attr->prog_type, if specified, as an override to whatever
1: -		 * bpf_object__open guessed
1: -		 */
1: -		if (attr->prog_type != BPF_PROG_TYPE_UNSPEC) {
1: -			bpf_program__set_type(prog, attr->prog_type);
1: -			bpf_program__set_expected_attach_type(prog,
1: -							      attach_type);
1: -		}
1: -		if (bpf_program__get_type(prog) == BPF_PROG_TYPE_UNSPEC) {
1: -			/*
1: -			 * we haven't guessed from section name and user
1: -			 * didn't provide a fallback type, too bad...
1: -			 */
1: -			bpf_object__close(obj);
1: -			return libbpf_err(-EINVAL);
1: -		}
1: -
1: -		prog->prog_ifindex = attr->ifindex;
1: -		prog->log_level = attr->log_level;
1: -		prog->prog_flags |= attr->prog_flags;
1: -		if (!first_prog)
1: -			first_prog = prog;
1: -	}
1: -
1: -	bpf_object__for_each_map(map, obj) {
1: -		if (!bpf_map__is_offload_neutral(map))
1: -			map->map_ifindex = attr->ifindex;
1: -	}
1: -
1: -	if (!first_prog) {
1: -		pr_warn("object file doesn't contain bpf program\n");
1: -		bpf_object__close(obj);
1: -		return libbpf_err(-ENOENT);
1: -	}
1: -
1: -	err = bpf_object__load(obj);
1: -	if (err) {
1: -		bpf_object__close(obj);
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	*pobj = obj;
1: -	*prog_fd = bpf_program__fd(first_prog);
1: -	return 0;
1: +                        struct bpf_object **pobj, int *prog_fd) {
1: +  struct bpf_object_open_attr open_attr = {};
1: +  struct bpf_program *prog, *first_prog = NULL;
1: +  struct bpf_object *obj;
1: +  struct bpf_map *map;
1: +  int err;
1: +
1: +  if (!attr)
1: +    return libbpf_err(-EINVAL);
1: +  if (!attr->file)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  open_attr.file = attr->file;
1: +  open_attr.prog_type = attr->prog_type;
1: +
1: +  obj = bpf_object__open_xattr(&open_attr);
1: +  err = libbpf_get_error(obj);
1: +  if (err)
1: +    return libbpf_err(-ENOENT);
1: +
1: +  bpf_object__for_each_program(prog, obj) {
1: +    enum bpf_attach_type attach_type = attr->expected_attach_type;
1: +    /*
1: +     * to preserve backwards compatibility, bpf_prog_load treats
1: +     * attr->prog_type, if specified, as an override to whatever
1: +     * bpf_object__open guessed
1: +     */
1: +    if (attr->prog_type != BPF_PROG_TYPE_UNSPEC) {
1: +      bpf_program__set_type(prog, attr->prog_type);
1: +      bpf_program__set_expected_attach_type(prog, attach_type);
1: +    }
1: +    if (bpf_program__get_type(prog) == BPF_PROG_TYPE_UNSPEC) {
1: +      /*
1: +       * we haven't guessed from section name and user
1: +       * didn't provide a fallback type, too bad...
1: +       */
1: +      bpf_object__close(obj);
1: +      return libbpf_err(-EINVAL);
1: +    }
1: +
1: +    prog->prog_ifindex = attr->ifindex;
1: +    prog->log_level = attr->log_level;
1: +    prog->prog_flags |= attr->prog_flags;
1: +    if (!first_prog)
1: +      first_prog = prog;
1: +  }
1: +
1: +  bpf_object__for_each_map(map, obj) {
1: +    if (!bpf_map__is_offload_neutral(map))
1: +      map->map_ifindex = attr->ifindex;
1: +  }
1: +
1: +  if (!first_prog) {
1: +    pr_warn("object file doesn't contain bpf program\n");
1: +    bpf_object__close(obj);
1: +    return libbpf_err(-ENOENT);
1: +  }
1: +
1: +  err = bpf_object__load(obj);
1: +  if (err) {
1: +    bpf_object__close(obj);
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  *pobj = obj;
1: +  *prog_fd = bpf_program__fd(first_prog);
1: +  return 0;
1:  }
1:  
1:  struct bpf_link {
1: -	int (*detach)(struct bpf_link *link);
1: -	int (*destroy)(struct bpf_link *link);
1: -	char *pin_path;		/* NULL, if not pinned */
1: -	int fd;			/* hook FD, -1 if not applicable */
1: -	bool disconnected;
1: +  int (*detach)(struct bpf_link *link);
1: +  int (*destroy)(struct bpf_link *link);
1: +  char *pin_path; /* NULL, if not pinned */
1: +  int fd;         /* hook FD, -1 if not applicable */
1: +  bool disconnected;
1:  };
1:  
1:  /* Replace link's underlying BPF program with the new one */
1: -int bpf_link__update_program(struct bpf_link *link, struct bpf_program *prog)
1: -{
1: -	int ret;
1: -	
1: -	ret = bpf_link_update(bpf_link__fd(link), bpf_program__fd(prog), NULL);
1: -	return libbpf_err_errno(ret);
1: +int bpf_link__update_program(struct bpf_link *link, struct bpf_program *prog) {
1: +  int ret;
1: +
1: +  ret = bpf_link_update(bpf_link__fd(link), bpf_program__fd(prog), NULL);
1: +  return libbpf_err_errno(ret);
1:  }
1:  
1:  /* Release "ownership" of underlying BPF resource (typically, BPF program
1: @@ -10024,175 +9719,162 @@ int bpf_link__update_program(struct bpf_link *link, struct bpf_program *prog)
1:   * exit of userspace program doesn't trigger automatic detachment and clean up
1:   * inside the kernel.
1:   */
1: -void bpf_link__disconnect(struct bpf_link *link)
1: -{
1: -	link->disconnected = true;
1: -}
1: +void bpf_link__disconnect(struct bpf_link *link) { link->disconnected = true; }
1:  
1: -int bpf_link__destroy(struct bpf_link *link)
1: -{
1: -	int err = 0;
1: +int bpf_link__destroy(struct bpf_link *link) {
1: +  int err = 0;
1:  
1: -	if (IS_ERR_OR_NULL(link))
1: -		return 0;
1: +  if (IS_ERR_OR_NULL(link))
1: +    return 0;
1:  
1: -	if (!link->disconnected && link->detach)
1: -		err = link->detach(link);
1: -	if (link->destroy)
1: -		link->destroy(link);
1: -	if (link->pin_path)
1: -		free(link->pin_path);
1: -	free(link);
1: +  if (!link->disconnected && link->detach)
1: +    err = link->detach(link);
1: +  if (link->destroy)
1: +    link->destroy(link);
1: +  if (link->pin_path)
1: +    free(link->pin_path);
1: +  free(link);
1:  
1: -	return libbpf_err(err);
1: +  return libbpf_err(err);
1:  }
1:  
1: -int bpf_link__fd(const struct bpf_link *link)
1: -{
1: -	return link->fd;
1: +int bpf_link__fd(const struct bpf_link *link) { return link->fd; }
1: +
1: +const char *bpf_link__pin_path(const struct bpf_link *link) {
1: +  return link->pin_path;
1:  }
1:  
1: -const char *bpf_link__pin_path(const struct bpf_link *link)
1: -{
1: -	return link->pin_path;
1: +static int bpf_link__detach_fd(struct bpf_link *link) {
1: +  return libbpf_err_errno(close(link->fd));
1:  }
1:  
1: -static int bpf_link__detach_fd(struct bpf_link *link)
1: -{
1: -	return libbpf_err_errno(close(link->fd));
1: +struct bpf_link *bpf_link__open(const char *path) {
1: +  struct bpf_link *link;
1: +  int fd;
1: +
1: +  fd = bpf_obj_get(path);
1: +  if (fd < 0) {
1: +    fd = -errno;
1: +    pr_warn("failed to open link at %s: %d\n", path, fd);
1: +    return libbpf_err_ptr(fd);
1: +  }
1: +
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link) {
1: +    close(fd);
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  }
1: +  link->detach = &bpf_link__detach_fd;
1: +  link->fd = fd;
1: +
1: +  link->pin_path = strdup(path);
1: +  if (!link->pin_path) {
1: +    bpf_link__destroy(link);
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  }
1: +
1: +  return link;
1: +}
1: +
1: +int bpf_link__detach(struct bpf_link *link) {
1: +  return bpf_link_detach(link->fd) ? -errno : 0;
1:  }
1:  
1: -struct bpf_link *bpf_link__open(const char *path)
1: -{
1: -	struct bpf_link *link;
1: -	int fd;
1: +int bpf_link__pin(struct bpf_link *link, const char *path) {
1: +  int err;
1: +
1: +  if (link->pin_path)
1: +    return libbpf_err(-EBUSY);
1: +  err = make_parent_dir(path);
1: +  if (err)
1: +    return libbpf_err(err);
1: +  err = check_path(path);
1: +  if (err)
1: +    return libbpf_err(err);
1:  
1: -	fd = bpf_obj_get(path);
1: -	if (fd < 0) {
1: -		fd = -errno;
1: -		pr_warn("failed to open link at %s: %d\n", path, fd);
1: -		return libbpf_err_ptr(fd);
1: -	}
1: +  link->pin_path = strdup(path);
1: +  if (!link->pin_path)
1: +    return libbpf_err(-ENOMEM);
1:  
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link) {
1: -		close(fd);
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	}
1: -	link->detach = &bpf_link__detach_fd;
1: -	link->fd = fd;
1: +  if (bpf_obj_pin(link->fd, link->pin_path)) {
1: +    err = -errno;
1: +    zfree(&link->pin_path);
1: +    return libbpf_err(err);
1: +  }
1:  
1: -	link->pin_path = strdup(path);
1: -	if (!link->pin_path) {
1: -		bpf_link__destroy(link);
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	}
1: -
1: -	return link;
1: -}
1: -
1: -int bpf_link__detach(struct bpf_link *link)
1: -{
1: -	return bpf_link_detach(link->fd) ? -errno : 0;
1: -}
1: -
1: -int bpf_link__pin(struct bpf_link *link, const char *path)
1: -{
1: -	int err;
1: -
1: -	if (link->pin_path)
1: -		return libbpf_err(-EBUSY);
1: -	err = make_parent_dir(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: -	err = check_path(path);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	link->pin_path = strdup(path);
1: -	if (!link->pin_path)
1: -		return libbpf_err(-ENOMEM);
1: -
1: -	if (bpf_obj_pin(link->fd, link->pin_path)) {
1: -		err = -errno;
1: -		zfree(&link->pin_path);
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	pr_debug("link fd=%d: pinned at %s\n", link->fd, link->pin_path);
1: -	return 0;
1: -}
1: -
1: -int bpf_link__unpin(struct bpf_link *link)
1: -{
1: -	int err;
1: -
1: -	if (!link->pin_path)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	err = unlink(link->pin_path);
1: -	if (err != 0)
1: -		return libbpf_err_errno(err);
1: -
1: -	pr_debug("link fd=%d: unpinned from %s\n", link->fd, link->pin_path);
1: -	zfree(&link->pin_path);
1: -	return 0;
1: -}
1: -
1: -static int bpf_link__detach_perf_event(struct bpf_link *link)
1: -{
1: -	int err;
1: -
1: -	err = ioctl(link->fd, PERF_EVENT_IOC_DISABLE, 0);
1: -	if (err)
1: -		err = -errno;
1: -
1: -	close(link->fd);
1: -	return libbpf_err(err);
1: -}
1: -
1: -struct bpf_link *bpf_program__attach_perf_event(struct bpf_program *prog, int pfd)
1: -{
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int prog_fd, err;
1: -
1: -	if (pfd < 0) {
1: -		pr_warn("prog '%s': invalid perf event FD %d\n",
1: -			prog->name, pfd);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -	prog_fd = bpf_program__fd(prog);
1: -	if (prog_fd < 0) {
1: -		pr_warn("prog '%s': can't attach BPF program w/o FD (did you load it?)\n",
1: -			prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	link->detach = &bpf_link__detach_perf_event;
1: -	link->fd = pfd;
1: -
1: -	if (ioctl(pfd, PERF_EVENT_IOC_SET_BPF, prog_fd) < 0) {
1: -		err = -errno;
1: -		free(link);
1: -		pr_warn("prog '%s': failed to attach to pfd %d: %s\n",
1: -			prog->name, pfd, libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		if (err == -EPROTO)
1: -			pr_warn("prog '%s': try add PERF_SAMPLE_CALLCHAIN to or remove exclude_callchain_[kernel|user] from pfd %d\n",
1: -				prog->name, pfd);
1: -		return libbpf_err_ptr(err);
1: -	}
1: -	if (ioctl(pfd, PERF_EVENT_IOC_ENABLE, 0) < 0) {
1: -		err = -errno;
1: -		free(link);
1: -		pr_warn("prog '%s': failed to enable pfd %d: %s\n",
1: -			prog->name, pfd, libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(err);
1: -	}
1: -	return link;
1: +  pr_debug("link fd=%d: pinned at %s\n", link->fd, link->pin_path);
1: +  return 0;
1: +}
1: +
1: +int bpf_link__unpin(struct bpf_link *link) {
1: +  int err;
1: +
1: +  if (!link->pin_path)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  err = unlink(link->pin_path);
1: +  if (err != 0)
1: +    return libbpf_err_errno(err);
1: +
1: +  pr_debug("link fd=%d: unpinned from %s\n", link->fd, link->pin_path);
1: +  zfree(&link->pin_path);
1: +  return 0;
1: +}
1: +
1: +static int bpf_link__detach_perf_event(struct bpf_link *link) {
1: +  int err;
1: +
1: +  err = ioctl(link->fd, PERF_EVENT_IOC_DISABLE, 0);
1: +  if (err)
1: +    err = -errno;
1: +
1: +  close(link->fd);
1: +  return libbpf_err(err);
1: +}
1: +
1: +struct bpf_link *bpf_program__attach_perf_event(struct bpf_program *prog,
1: +                                                int pfd) {
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int prog_fd, err;
1: +
1: +  if (pfd < 0) {
1: +    pr_warn("prog '%s': invalid perf event FD %d\n", prog->name, pfd);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +  prog_fd = bpf_program__fd(prog);
1: +  if (prog_fd < 0) {
1: +    pr_warn("prog '%s': can't attach BPF program w/o FD (did you load it?)\n",
1: +            prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  link->detach = &bpf_link__detach_perf_event;
1: +  link->fd = pfd;
1: +
1: +  if (ioctl(pfd, PERF_EVENT_IOC_SET_BPF, prog_fd) < 0) {
1: +    err = -errno;
1: +    free(link);
1: +    pr_warn("prog '%s': failed to attach to pfd %d: %s\n", prog->name, pfd,
1: +            libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    if (err == -EPROTO)
1: +      pr_warn(
1: +          "prog '%s': try add PERF_SAMPLE_CALLCHAIN to or remove "
1: +          "exclude_callchain_[kernel|user] from pfd %d\n",
1: +          prog->name, pfd);
1: +    return libbpf_err_ptr(err);
1: +  }
1: +  if (ioctl(pfd, PERF_EVENT_IOC_ENABLE, 0) < 0) {
1: +    err = -errno;
1: +    free(link);
1: +    pr_warn("prog '%s': failed to enable pfd %d: %s\n", prog->name, pfd,
1: +            libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(err);
1: +  }
1: +  return link;
1:  }
1:  
1:  /*
1: @@ -10200,1019 +9882,961 @@ struct bpf_link *bpf_program__attach_perf_event(struct bpf_program *prog, int pf
1:   * given file using scanf format string fmt. If actual parsed value is
1:   * negative, the result might be indistinguishable from error
1:   */
1: -static int parse_uint_from_file(const char *file, const char *fmt)
1: -{
1: -	char buf[STRERR_BUFSIZE];
1: -	int err, ret;
1: -	FILE *f;
1: +static int parse_uint_from_file(const char *file, const char *fmt) {
1: +  char buf[STRERR_BUFSIZE];
1: +  int err, ret;
1: +  FILE *f;
1:  
1: -	f = fopen(file, "r");
1: -	if (!f) {
1: -		err = -errno;
1: -		pr_debug("failed to open '%s': %s\n", file,
1: -			 libbpf_strerror_r(err, buf, sizeof(buf)));
1: -		return err;
1: -	}
1: -	err = fscanf(f, fmt, &ret);
1: -	if (err != 1) {
1: -		err = err == EOF ? -EIO : -errno;
1: -		pr_debug("failed to parse '%s': %s\n", file,
1: -			libbpf_strerror_r(err, buf, sizeof(buf)));
1: -		fclose(f);
1: -		return err;
1: -	}
1: -	fclose(f);
1: -	return ret;
1: +  f = fopen(file, "r");
1: +  if (!f) {
1: +    err = -errno;
1: +    pr_debug("failed to open '%s': %s\n", file,
1: +             libbpf_strerror_r(err, buf, sizeof(buf)));
1: +    return err;
1: +  }
1: +  err = fscanf(f, fmt, &ret);
1: +  if (err != 1) {
1: +    err = err == EOF ? -EIO : -errno;
1: +    pr_debug("failed to parse '%s': %s\n", file,
1: +             libbpf_strerror_r(err, buf, sizeof(buf)));
1: +    fclose(f);
1: +    return err;
1: +  }
1: +  fclose(f);
1: +  return ret;
1:  }
1:  
1: -static int determine_kprobe_perf_type(void)
1: -{
1: -	const char *file = "/sys/bus/event_source/devices/kprobe/type";
1: +static int determine_kprobe_perf_type(void) {
1: +  const char *file = "/sys/bus/event_source/devices/kprobe/type";
1:  
1: -	return parse_uint_from_file(file, "%d\n");
1: +  return parse_uint_from_file(file, "%d\n");
1:  }
1:  
1: -static int determine_uprobe_perf_type(void)
1: -{
1: -	const char *file = "/sys/bus/event_source/devices/uprobe/type";
1: +static int determine_uprobe_perf_type(void) {
1: +  const char *file = "/sys/bus/event_source/devices/uprobe/type";
1:  
1: -	return parse_uint_from_file(file, "%d\n");
1: +  return parse_uint_from_file(file, "%d\n");
1:  }
1:  
1: -static int determine_kprobe_retprobe_bit(void)
1: -{
1: -	const char *file = "/sys/bus/event_source/devices/kprobe/format/retprobe";
1: +static int determine_kprobe_retprobe_bit(void) {
1: +  const char *file = "/sys/bus/event_source/devices/kprobe/format/retprobe";
1:  
1: -	return parse_uint_from_file(file, "config:%d\n");
1: +  return parse_uint_from_file(file, "config:%d\n");
1:  }
1:  
1: -static int determine_uprobe_retprobe_bit(void)
1: -{
1: -	const char *file = "/sys/bus/event_source/devices/uprobe/format/retprobe";
1: +static int determine_uprobe_retprobe_bit(void) {
1: +  const char *file = "/sys/bus/event_source/devices/uprobe/format/retprobe";
1:  
1: -	return parse_uint_from_file(file, "config:%d\n");
1: +  return parse_uint_from_file(file, "config:%d\n");
1:  }
1:  
1:  static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name,
1: -				 uint64_t offset, int pid)
1: -{
1: -	struct perf_event_attr attr = {};
1: -	char errmsg[STRERR_BUFSIZE];
1: -	int type, pfd, err;
1: -
1: -	type = uprobe ? determine_uprobe_perf_type()
1: -		      : determine_kprobe_perf_type();
1: -	if (type < 0) {
1: -		pr_warn("failed to determine %s perf type: %s\n",
1: -			uprobe ? "uprobe" : "kprobe",
1: -			libbpf_strerror_r(type, errmsg, sizeof(errmsg)));
1: -		return type;
1: -	}
1: -	if (retprobe) {
1: -		int bit = uprobe ? determine_uprobe_retprobe_bit()
1: -				 : determine_kprobe_retprobe_bit();
1: -
1: -		if (bit < 0) {
1: -			pr_warn("failed to determine %s retprobe bit: %s\n",
1: -				uprobe ? "uprobe" : "kprobe",
1: -				libbpf_strerror_r(bit, errmsg, sizeof(errmsg)));
1: -			return bit;
1: -		}
1: -		attr.config |= 1 << bit;
1: -	}
1: -	attr.size = sizeof(attr);
1: -	attr.type = type;
1: -	attr.config1 = ptr_to_u64(name); /* kprobe_func or uprobe_path */
1: -	attr.config2 = offset;		 /* kprobe_addr or probe_offset */
1: -
1: -	/* pid filter is meaningful only for uprobes */
1: -	pfd = syscall(__NR_perf_event_open, &attr,
1: -		      pid < 0 ? -1 : pid /* pid */,
1: -		      pid == -1 ? 0 : -1 /* cpu */,
1: -		      -1 /* group_fd */, PERF_FLAG_FD_CLOEXEC);
1: -	if (pfd < 0) {
1: -		err = -errno;
1: -		pr_warn("%s perf_event_open() failed: %s\n",
1: -			uprobe ? "uprobe" : "kprobe",
1: -			libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		return err;
1: -	}
1: -	return pfd;
1: +                                 uint64_t offset, int pid) {
1: +  struct perf_event_attr attr = {};
1: +  char errmsg[STRERR_BUFSIZE];
1: +  int type, pfd, err;
1: +
1: +  type = uprobe ? determine_uprobe_perf_type() : determine_kprobe_perf_type();
1: +  if (type < 0) {
1: +    pr_warn("failed to determine %s perf type: %s\n",
1: +            uprobe ? "uprobe" : "kprobe",
1: +            libbpf_strerror_r(type, errmsg, sizeof(errmsg)));
1: +    return type;
1: +  }
1: +  if (retprobe) {
1: +    int bit = uprobe ? determine_uprobe_retprobe_bit()
1: +                     : determine_kprobe_retprobe_bit();
1: +
1: +    if (bit < 0) {
1: +      pr_warn("failed to determine %s retprobe bit: %s\n",
1: +              uprobe ? "uprobe" : "kprobe",
1: +              libbpf_strerror_r(bit, errmsg, sizeof(errmsg)));
1: +      return bit;
1: +    }
1: +    attr.config |= 1 << bit;
1: +  }
1: +  attr.size = sizeof(attr);
1: +  attr.type = type;
1: +  attr.config1 = ptr_to_u64(name); /* kprobe_func or uprobe_path */
1: +  attr.config2 = offset;           /* kprobe_addr or probe_offset */
1: +
1: +  /* pid filter is meaningful only for uprobes */
1: +  pfd = syscall(__NR_perf_event_open, &attr, pid < 0 ? -1 : pid /* pid */,
1: +                pid == -1 ? 0 : -1 /* cpu */, -1 /* group_fd */,
1: +                PERF_FLAG_FD_CLOEXEC);
1: +  if (pfd < 0) {
1: +    err = -errno;
1: +    pr_warn("%s perf_event_open() failed: %s\n", uprobe ? "uprobe" : "kprobe",
1: +            libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    return err;
1: +  }
1: +  return pfd;
1:  }
1:  
1:  struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog,
1: -					    bool retprobe,
1: -					    const char *func_name)
1: -{
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int pfd, err;
1: -
1: -	pfd = perf_event_open_probe(false /* uprobe */, retprobe, func_name,
1: -				    0 /* offset */, -1 /* pid */);
1: -	if (pfd < 0) {
1: -		pr_warn("prog '%s': failed to create %s '%s' perf event: %s\n",
1: -			prog->name, retprobe ? "kretprobe" : "kprobe", func_name,
1: -			libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(pfd);
1: -	}
1: -	link = bpf_program__attach_perf_event(prog, pfd);
1: -	err = libbpf_get_error(link);
1: -	if (err) {
1: -		close(pfd);
1: -		pr_warn("prog '%s': failed to attach to %s '%s': %s\n",
1: -			prog->name, retprobe ? "kretprobe" : "kprobe", func_name,
1: -			libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(err);
1: -	}
1: -	return link;
1: +                                            bool retprobe,
1: +                                            const char *func_name) {
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int pfd, err;
1: +
1: +  pfd = perf_event_open_probe(false /* uprobe */, retprobe, func_name,
1: +                              0 /* offset */, -1 /* pid */);
1: +  if (pfd < 0) {
1: +    pr_warn("prog '%s': failed to create %s '%s' perf event: %s\n", prog->name,
1: +            retprobe ? "kretprobe" : "kprobe", func_name,
1: +            libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(pfd);
1: +  }
1: +  link = bpf_program__attach_perf_event(prog, pfd);
1: +  err = libbpf_get_error(link);
1: +  if (err) {
1: +    close(pfd);
1: +    pr_warn("prog '%s': failed to attach to %s '%s': %s\n", prog->name,
1: +            retprobe ? "kretprobe" : "kprobe", func_name,
1: +            libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(err);
1: +  }
1: +  return link;
1:  }
1:  
1:  static struct bpf_link *attach_kprobe(const struct bpf_sec_def *sec,
1: -				      struct bpf_program *prog)
1: -{
1: -	const char *func_name;
1: -	bool retprobe;
1: +                                      struct bpf_program *prog) {
1: +  const char *func_name;
1: +  bool retprobe;
1:  
1: -	func_name = prog->sec_name + sec->len;
1: -	retprobe = strcmp(sec->sec, "kretprobe/") == 0;
1: +  func_name = prog->sec_name + sec->len;
1: +  retprobe = strcmp(sec->sec, "kretprobe/") == 0;
1:  
1: -	return bpf_program__attach_kprobe(prog, retprobe, func_name);
1: +  return bpf_program__attach_kprobe(prog, retprobe, func_name);
1:  }
1:  
1:  struct bpf_link *bpf_program__attach_uprobe(struct bpf_program *prog,
1: -					    bool retprobe, pid_t pid,
1: -					    const char *binary_path,
1: -					    size_t func_offset)
1: -{
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int pfd, err;
1: -
1: -	pfd = perf_event_open_probe(true /* uprobe */, retprobe,
1: -				    binary_path, func_offset, pid);
1: -	if (pfd < 0) {
1: -		pr_warn("prog '%s': failed to create %s '%s:0x%zx' perf event: %s\n",
1: -			prog->name, retprobe ? "uretprobe" : "uprobe",
1: -			binary_path, func_offset,
1: -			libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(pfd);
1: -	}
1: -	link = bpf_program__attach_perf_event(prog, pfd);
1: -	err = libbpf_get_error(link);
1: -	if (err) {
1: -		close(pfd);
1: -		pr_warn("prog '%s': failed to attach to %s '%s:0x%zx': %s\n",
1: -			prog->name, retprobe ? "uretprobe" : "uprobe",
1: -			binary_path, func_offset,
1: -			libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(err);
1: -	}
1: -	return link;
1: +                                            bool retprobe, pid_t pid,
1: +                                            const char *binary_path,
1: +                                            size_t func_offset) {
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int pfd, err;
1: +
1: +  pfd = perf_event_open_probe(true /* uprobe */, retprobe, binary_path,
1: +                              func_offset, pid);
1: +  if (pfd < 0) {
1: +    pr_warn("prog '%s': failed to create %s '%s:0x%zx' perf event: %s\n",
1: +            prog->name, retprobe ? "uretprobe" : "uprobe", binary_path,
1: +            func_offset, libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(pfd);
1: +  }
1: +  link = bpf_program__attach_perf_event(prog, pfd);
1: +  err = libbpf_get_error(link);
1: +  if (err) {
1: +    close(pfd);
1: +    pr_warn("prog '%s': failed to attach to %s '%s:0x%zx': %s\n", prog->name,
1: +            retprobe ? "uretprobe" : "uprobe", binary_path, func_offset,
1: +            libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(err);
1: +  }
1: +  return link;
1:  }
1:  
1:  static int determine_tracepoint_id(const char *tp_category,
1: -				   const char *tp_name)
1: -{
1: -	char file[PATH_MAX];
1: -	int ret;
1: -
1: -	ret = snprintf(file, sizeof(file),
1: -		       "/sys/kernel/debug/tracing/events/%s/%s/id",
1: -		       tp_category, tp_name);
1: -	if (ret < 0)
1: -		return -errno;
1: -	if (ret >= sizeof(file)) {
1: -		pr_debug("tracepoint %s/%s path is too long\n",
1: -			 tp_category, tp_name);
1: -		return -E2BIG;
1: -	}
1: -	return parse_uint_from_file(file, "%d\n");
1: +                                   const char *tp_name) {
1: +  char file[PATH_MAX];
1: +  int ret;
1: +
1: +  ret =
1: +      snprintf(file, sizeof(file), "/sys/kernel/debug/tracing/events/%s/%s/id",
1: +               tp_category, tp_name);
1: +  if (ret < 0)
1: +    return -errno;
1: +  if (ret >= sizeof(file)) {
1: +    pr_debug("tracepoint %s/%s path is too long\n", tp_category, tp_name);
1: +    return -E2BIG;
1: +  }
1: +  return parse_uint_from_file(file, "%d\n");
1:  }
1:  
1:  static int perf_event_open_tracepoint(const char *tp_category,
1: -				      const char *tp_name)
1: -{
1: -	struct perf_event_attr attr = {};
1: -	char errmsg[STRERR_BUFSIZE];
1: -	int tp_id, pfd, err;
1: -
1: -	tp_id = determine_tracepoint_id(tp_category, tp_name);
1: -	if (tp_id < 0) {
1: -		pr_warn("failed to determine tracepoint '%s/%s' perf event ID: %s\n",
1: -			tp_category, tp_name,
1: -			libbpf_strerror_r(tp_id, errmsg, sizeof(errmsg)));
1: -		return tp_id;
1: -	}
1: -
1: -	attr.type = PERF_TYPE_TRACEPOINT;
1: -	attr.size = sizeof(attr);
1: -	attr.config = tp_id;
1: -
1: -	pfd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, 0 /* cpu */,
1: -		      -1 /* group_fd */, PERF_FLAG_FD_CLOEXEC);
1: -	if (pfd < 0) {
1: -		err = -errno;
1: -		pr_warn("tracepoint '%s/%s' perf_event_open() failed: %s\n",
1: -			tp_category, tp_name,
1: -			libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		return err;
1: -	}
1: -	return pfd;
1: +                                      const char *tp_name) {
1: +  struct perf_event_attr attr = {};
1: +  char errmsg[STRERR_BUFSIZE];
1: +  int tp_id, pfd, err;
1: +
1: +  tp_id = determine_tracepoint_id(tp_category, tp_name);
1: +  if (tp_id < 0) {
1: +    pr_warn("failed to determine tracepoint '%s/%s' perf event ID: %s\n",
1: +            tp_category, tp_name,
1: +            libbpf_strerror_r(tp_id, errmsg, sizeof(errmsg)));
1: +    return tp_id;
1: +  }
1: +
1: +  attr.type = PERF_TYPE_TRACEPOINT;
1: +  attr.size = sizeof(attr);
1: +  attr.config = tp_id;
1: +
1: +  pfd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, 0 /* cpu */,
1: +                -1 /* group_fd */, PERF_FLAG_FD_CLOEXEC);
1: +  if (pfd < 0) {
1: +    err = -errno;
1: +    pr_warn("tracepoint '%s/%s' perf_event_open() failed: %s\n", tp_category,
1: +            tp_name, libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    return err;
1: +  }
1: +  return pfd;
1:  }
1:  
1:  struct bpf_link *bpf_program__attach_tracepoint(struct bpf_program *prog,
1: -						const char *tp_category,
1: -						const char *tp_name)
1: -{
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int pfd, err;
1: -
1: -	pfd = perf_event_open_tracepoint(tp_category, tp_name);
1: -	if (pfd < 0) {
1: -		pr_warn("prog '%s': failed to create tracepoint '%s/%s' perf event: %s\n",
1: -			prog->name, tp_category, tp_name,
1: -			libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(pfd);
1: -	}
1: -	link = bpf_program__attach_perf_event(prog, pfd);
1: -	err = libbpf_get_error(link);
1: -	if (err) {
1: -		close(pfd);
1: -		pr_warn("prog '%s': failed to attach to tracepoint '%s/%s': %s\n",
1: -			prog->name, tp_category, tp_name,
1: -			libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(err);
1: -	}
1: -	return link;
1: +                                                const char *tp_category,
1: +                                                const char *tp_name) {
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int pfd, err;
1: +
1: +  pfd = perf_event_open_tracepoint(tp_category, tp_name);
1: +  if (pfd < 0) {
1: +    pr_warn("prog '%s': failed to create tracepoint '%s/%s' perf event: %s\n",
1: +            prog->name, tp_category, tp_name,
1: +            libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(pfd);
1: +  }
1: +  link = bpf_program__attach_perf_event(prog, pfd);
1: +  err = libbpf_get_error(link);
1: +  if (err) {
1: +    close(pfd);
1: +    pr_warn("prog '%s': failed to attach to tracepoint '%s/%s': %s\n",
1: +            prog->name, tp_category, tp_name,
1: +            libbpf_strerror_r(err, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(err);
1: +  }
1: +  return link;
1:  }
1:  
1:  static struct bpf_link *attach_tp(const struct bpf_sec_def *sec,
1: -				  struct bpf_program *prog)
1: -{
1: -	char *sec_name, *tp_cat, *tp_name;
1: -	struct bpf_link *link;
1: -
1: -	sec_name = strdup(prog->sec_name);
1: -	if (!sec_name)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -
1: -	/* extract "tp/<category>/<name>" */
1: -	tp_cat = sec_name + sec->len;
1: -	tp_name = strchr(tp_cat, '/');
1: -	if (!tp_name) {
1: -		free(sec_name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -	*tp_name = '\0';
1: -	tp_name++;
1: -
1: -	link = bpf_program__attach_tracepoint(prog, tp_cat, tp_name);
1: -	free(sec_name);
1: -	return link;
1: +                                  struct bpf_program *prog) {
1: +  char *sec_name, *tp_cat, *tp_name;
1: +  struct bpf_link *link;
1: +
1: +  sec_name = strdup(prog->sec_name);
1: +  if (!sec_name)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +
1: +  /* extract "tp/<category>/<name>" */
1: +  tp_cat = sec_name + sec->len;
1: +  tp_name = strchr(tp_cat, '/');
1: +  if (!tp_name) {
1: +    free(sec_name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +  *tp_name = '\0';
1: +  tp_name++;
1: +
1: +  link = bpf_program__attach_tracepoint(prog, tp_cat, tp_name);
1: +  free(sec_name);
1: +  return link;
1:  }
1:  
1:  struct bpf_link *bpf_program__attach_raw_tracepoint(struct bpf_program *prog,
1: -						    const char *tp_name)
1: -{
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int prog_fd, pfd;
1: -
1: -	prog_fd = bpf_program__fd(prog);
1: -	if (prog_fd < 0) {
1: -		pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	link->detach = &bpf_link__detach_fd;
1: -
1: -	pfd = bpf_raw_tracepoint_open(tp_name, prog_fd);
1: -	if (pfd < 0) {
1: -		pfd = -errno;
1: -		free(link);
1: -		pr_warn("prog '%s': failed to attach to raw tracepoint '%s': %s\n",
1: -			prog->name, tp_name, libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(pfd);
1: -	}
1: -	link->fd = pfd;
1: -	return link;
1: +                                                    const char *tp_name) {
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int prog_fd, pfd;
1: +
1: +  prog_fd = bpf_program__fd(prog);
1: +  if (prog_fd < 0) {
1: +    pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  link->detach = &bpf_link__detach_fd;
1: +
1: +  pfd = bpf_raw_tracepoint_open(tp_name, prog_fd);
1: +  if (pfd < 0) {
1: +    pfd = -errno;
1: +    free(link);
1: +    pr_warn("prog '%s': failed to attach to raw tracepoint '%s': %s\n",
1: +            prog->name, tp_name,
1: +            libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(pfd);
1: +  }
1: +  link->fd = pfd;
1: +  return link;
1:  }
1:  
1:  static struct bpf_link *attach_raw_tp(const struct bpf_sec_def *sec,
1: -				      struct bpf_program *prog)
1: -{
1: -	const char *tp_name = prog->sec_name + sec->len;
1: +                                      struct bpf_program *prog) {
1: +  const char *tp_name = prog->sec_name + sec->len;
1:  
1: -	return bpf_program__attach_raw_tracepoint(prog, tp_name);
1: +  return bpf_program__attach_raw_tracepoint(prog, tp_name);
1:  }
1:  
1:  /* Common logic for all BPF program types that attach to a btf_id */
1: -static struct bpf_link *bpf_program__attach_btf_id(struct bpf_program *prog)
1: -{
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int prog_fd, pfd;
1: +static struct bpf_link *bpf_program__attach_btf_id(struct bpf_program *prog) {
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int prog_fd, pfd;
1:  
1: -	prog_fd = bpf_program__fd(prog);
1: -	if (prog_fd < 0) {
1: -		pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: +  prog_fd = bpf_program__fd(prog);
1: +  if (prog_fd < 0) {
1: +    pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1:  
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	link->detach = &bpf_link__detach_fd;
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  link->detach = &bpf_link__detach_fd;
1:  
1: -	pfd = bpf_raw_tracepoint_open(NULL, prog_fd);
1: -	if (pfd < 0) {
1: -		pfd = -errno;
1: -		free(link);
1: -		pr_warn("prog '%s': failed to attach: %s\n",
1: -			prog->name, libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(pfd);
1: -	}
1: -	link->fd = pfd;
1: -	return (struct bpf_link *)link;
1: +  pfd = bpf_raw_tracepoint_open(NULL, prog_fd);
1: +  if (pfd < 0) {
1: +    pfd = -errno;
1: +    free(link);
1: +    pr_warn("prog '%s': failed to attach: %s\n", prog->name,
1: +            libbpf_strerror_r(pfd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(pfd);
1: +  }
1: +  link->fd = pfd;
1: +  return (struct bpf_link *)link;
1:  }
1:  
1: -struct bpf_link *bpf_program__attach_trace(struct bpf_program *prog)
1: -{
1: -	return bpf_program__attach_btf_id(prog);
1: +struct bpf_link *bpf_program__attach_trace(struct bpf_program *prog) {
1: +  return bpf_program__attach_btf_id(prog);
1:  }
1:  
1: -struct bpf_link *bpf_program__attach_lsm(struct bpf_program *prog)
1: -{
1: -	return bpf_program__attach_btf_id(prog);
1: +struct bpf_link *bpf_program__attach_lsm(struct bpf_program *prog) {
1: +  return bpf_program__attach_btf_id(prog);
1:  }
1:  
1:  static struct bpf_link *attach_trace(const struct bpf_sec_def *sec,
1: -				     struct bpf_program *prog)
1: -{
1: -	return bpf_program__attach_trace(prog);
1: +                                     struct bpf_program *prog) {
1: +  return bpf_program__attach_trace(prog);
1:  }
1:  
1:  static struct bpf_link *attach_lsm(const struct bpf_sec_def *sec,
1: -				   struct bpf_program *prog)
1: -{
1: -	return bpf_program__attach_lsm(prog);
1: -}
1: -
1: -static struct bpf_link *
1: -bpf_program__attach_fd(struct bpf_program *prog, int target_fd, int btf_id,
1: -		       const char *target_name)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_link_create_opts, opts,
1: -			    .target_btf_id = btf_id);
1: -	enum bpf_attach_type attach_type;
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int prog_fd, link_fd;
1: -
1: -	prog_fd = bpf_program__fd(prog);
1: -	if (prog_fd < 0) {
1: -		pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	link->detach = &bpf_link__detach_fd;
1: -
1: -	attach_type = bpf_program__get_expected_attach_type(prog);
1: -	link_fd = bpf_link_create(prog_fd, target_fd, attach_type, &opts);
1: -	if (link_fd < 0) {
1: -		link_fd = -errno;
1: -		free(link);
1: -		pr_warn("prog '%s': failed to attach to %s: %s\n",
1: -			prog->name, target_name,
1: -			libbpf_strerror_r(link_fd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(link_fd);
1: -	}
1: -	link->fd = link_fd;
1: -	return link;
1: -}
1: -
1: -struct bpf_link *
1: -bpf_program__attach_cgroup(struct bpf_program *prog, int cgroup_fd)
1: -{
1: -	return bpf_program__attach_fd(prog, cgroup_fd, 0, "cgroup");
1: -}
1: -
1: -struct bpf_link *
1: -bpf_program__attach_netns(struct bpf_program *prog, int netns_fd)
1: -{
1: -	return bpf_program__attach_fd(prog, netns_fd, 0, "netns");
1: -}
1: -
1: -struct bpf_link *bpf_program__attach_xdp(struct bpf_program *prog, int ifindex)
1: -{
1: -	/* target_fd/target_ifindex use the same field in LINK_CREATE */
1: -	return bpf_program__attach_fd(prog, ifindex, 0, "xdp");
1: +                                   struct bpf_program *prog) {
1: +  return bpf_program__attach_lsm(prog);
1: +}
1: +
1: +static struct bpf_link *bpf_program__attach_fd(struct bpf_program *prog,
1: +                                               int target_fd, int btf_id,
1: +                                               const char *target_name) {
1: +  DECLARE_LIBBPF_OPTS(bpf_link_create_opts, opts, .target_btf_id = btf_id);
1: +  enum bpf_attach_type attach_type;
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int prog_fd, link_fd;
1: +
1: +  prog_fd = bpf_program__fd(prog);
1: +  if (prog_fd < 0) {
1: +    pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  link->detach = &bpf_link__detach_fd;
1: +
1: +  attach_type = bpf_program__get_expected_attach_type(prog);
1: +  link_fd = bpf_link_create(prog_fd, target_fd, attach_type, &opts);
1: +  if (link_fd < 0) {
1: +    link_fd = -errno;
1: +    free(link);
1: +    pr_warn("prog '%s': failed to attach to %s: %s\n", prog->name, target_name,
1: +            libbpf_strerror_r(link_fd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(link_fd);
1: +  }
1: +  link->fd = link_fd;
1: +  return link;
1: +}
1: +
1: +struct bpf_link *bpf_program__attach_cgroup(struct bpf_program *prog,
1: +                                            int cgroup_fd) {
1: +  return bpf_program__attach_fd(prog, cgroup_fd, 0, "cgroup");
1: +}
1: +
1: +struct bpf_link *bpf_program__attach_netns(struct bpf_program *prog,
1: +                                           int netns_fd) {
1: +  return bpf_program__attach_fd(prog, netns_fd, 0, "netns");
1: +}
1: +
1: +struct bpf_link *bpf_program__attach_xdp(struct bpf_program *prog,
1: +                                         int ifindex) {
1: +  /* target_fd/target_ifindex use the same field in LINK_CREATE */
1: +  return bpf_program__attach_fd(prog, ifindex, 0, "xdp");
1:  }
1:  
1:  struct bpf_link *bpf_program__attach_freplace(struct bpf_program *prog,
1: -					      int target_fd,
1: -					      const char *attach_func_name)
1: -{
1: -	int btf_id;
1: -
1: -	if (!!target_fd != !!attach_func_name) {
1: -		pr_warn("prog '%s': supply none or both of target_fd and attach_func_name\n",
1: -			prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -
1: -	if (prog->type != BPF_PROG_TYPE_EXT) {
1: -		pr_warn("prog '%s': only BPF_PROG_TYPE_EXT can attach as freplace",
1: -			prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -
1: -	if (target_fd) {
1: -		btf_id = libbpf_find_prog_btf_id(attach_func_name, target_fd);
1: -		if (btf_id < 0)
1: -			return libbpf_err_ptr(btf_id);
1: -
1: -		return bpf_program__attach_fd(prog, target_fd, btf_id, "freplace");
1: -	} else {
1: -		/* no target, so use raw_tracepoint_open for compatibility
1: -		 * with old kernels
1: -		 */
1: -		return bpf_program__attach_trace(prog);
1: -	}
1: -}
1: -
1: -struct bpf_link *
1: -bpf_program__attach_iter(struct bpf_program *prog,
1: -			 const struct bpf_iter_attach_opts *opts)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_link_create_opts, link_create_opts);
1: -	char errmsg[STRERR_BUFSIZE];
1: -	struct bpf_link *link;
1: -	int prog_fd, link_fd;
1: -	__u32 target_fd = 0;
1: -
1: -	if (!OPTS_VALID(opts, bpf_iter_attach_opts))
1: -		return libbpf_err_ptr(-EINVAL);
1: -
1: -	link_create_opts.iter_info = OPTS_GET(opts, link_info, (void *)0);
1: -	link_create_opts.iter_info_len = OPTS_GET(opts, link_info_len, 0);
1: -
1: -	prog_fd = bpf_program__fd(prog);
1: -	if (prog_fd < 0) {
1: -		pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: -		return libbpf_err_ptr(-EINVAL);
1: -	}
1: -
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -	link->detach = &bpf_link__detach_fd;
1: -
1: -	link_fd = bpf_link_create(prog_fd, target_fd, BPF_TRACE_ITER,
1: -				  &link_create_opts);
1: -	if (link_fd < 0) {
1: -		link_fd = -errno;
1: -		free(link);
1: -		pr_warn("prog '%s': failed to attach to iterator: %s\n",
1: -			prog->name, libbpf_strerror_r(link_fd, errmsg, sizeof(errmsg)));
1: -		return libbpf_err_ptr(link_fd);
1: -	}
1: -	link->fd = link_fd;
1: -	return link;
1: +                                              int target_fd,
1: +                                              const char *attach_func_name) {
1: +  int btf_id;
1: +
1: +  if (!!target_fd != !!attach_func_name) {
1: +    pr_warn(
1: +        "prog '%s': supply none or both of target_fd and attach_func_name\n",
1: +        prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +
1: +  if (prog->type != BPF_PROG_TYPE_EXT) {
1: +    pr_warn("prog '%s': only BPF_PROG_TYPE_EXT can attach as freplace",
1: +            prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +
1: +  if (target_fd) {
1: +    btf_id = libbpf_find_prog_btf_id(attach_func_name, target_fd);
1: +    if (btf_id < 0)
1: +      return libbpf_err_ptr(btf_id);
1: +
1: +    return bpf_program__attach_fd(prog, target_fd, btf_id, "freplace");
1: +  } else {
1: +    /* no target, so use raw_tracepoint_open for compatibility
1: +     * with old kernels
1: +     */
1: +    return bpf_program__attach_trace(prog);
1: +  }
1: +}
1: +
1: +struct bpf_link *bpf_program__attach_iter(
1: +    struct bpf_program *prog, const struct bpf_iter_attach_opts *opts) {
1: +  DECLARE_LIBBPF_OPTS(bpf_link_create_opts, link_create_opts);
1: +  char errmsg[STRERR_BUFSIZE];
1: +  struct bpf_link *link;
1: +  int prog_fd, link_fd;
1: +  __u32 target_fd = 0;
1: +
1: +  if (!OPTS_VALID(opts, bpf_iter_attach_opts))
1: +    return libbpf_err_ptr(-EINVAL);
1: +
1: +  link_create_opts.iter_info = OPTS_GET(opts, link_info, (void *)0);
1: +  link_create_opts.iter_info_len = OPTS_GET(opts, link_info_len, 0);
1: +
1: +  prog_fd = bpf_program__fd(prog);
1: +  if (prog_fd < 0) {
1: +    pr_warn("prog '%s': can't attach before loaded\n", prog->name);
1: +    return libbpf_err_ptr(-EINVAL);
1: +  }
1: +
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +  link->detach = &bpf_link__detach_fd;
1: +
1: +  link_fd =
1: +      bpf_link_create(prog_fd, target_fd, BPF_TRACE_ITER, &link_create_opts);
1: +  if (link_fd < 0) {
1: +    link_fd = -errno;
1: +    free(link);
1: +    pr_warn("prog '%s': failed to attach to iterator: %s\n", prog->name,
1: +            libbpf_strerror_r(link_fd, errmsg, sizeof(errmsg)));
1: +    return libbpf_err_ptr(link_fd);
1: +  }
1: +  link->fd = link_fd;
1: +  return link;
1:  }
1:  
1:  static struct bpf_link *attach_iter(const struct bpf_sec_def *sec,
1: -				    struct bpf_program *prog)
1: -{
1: -	return bpf_program__attach_iter(prog, NULL);
1: -}
1: -
1: -struct bpf_link *bpf_program__attach(struct bpf_program *prog)
1: -{
1: -	const struct bpf_sec_def *sec_def;
1: -
1: -	sec_def = find_sec_def(prog->sec_name);
1: -	if (!sec_def || !sec_def->attach_fn)
1: -		return libbpf_err_ptr(-ESRCH);
1: -
1: -	return sec_def->attach_fn(sec_def, prog);
1: +                                    struct bpf_program *prog) {
1: +  return bpf_program__attach_iter(prog, NULL);
1:  }
1:  
1: -static int bpf_link__detach_struct_ops(struct bpf_link *link)
1: -{
1: -	__u32 zero = 0;
1: +struct bpf_link *bpf_program__attach(struct bpf_program *prog) {
1: +  const struct bpf_sec_def *sec_def;
1: +
1: +  sec_def = find_sec_def(prog->sec_name);
1: +  if (!sec_def || !sec_def->attach_fn)
1: +    return libbpf_err_ptr(-ESRCH);
1:  
1: -	if (bpf_map_delete_elem(link->fd, &zero))
1: -		return -errno;
1: +  return sec_def->attach_fn(sec_def, prog);
1: +}
1:  
1: -	return 0;
1: +static int bpf_link__detach_struct_ops(struct bpf_link *link) {
1: +  __u32 zero = 0;
1: +
1: +  if (bpf_map_delete_elem(link->fd, &zero))
1: +    return -errno;
1: +
1: +  return 0;
1:  }
1:  
1: -struct bpf_link *bpf_map__attach_struct_ops(struct bpf_map *map)
1: -{
1: -	struct bpf_struct_ops *st_ops;
1: -	struct bpf_link *link;
1: -	__u32 i, zero = 0;
1: -	int err;
1: +struct bpf_link *bpf_map__attach_struct_ops(struct bpf_map *map) {
1: +  struct bpf_struct_ops *st_ops;
1: +  struct bpf_link *link;
1: +  __u32 i, zero = 0;
1: +  int err;
1:  
1: -	if (!bpf_map__is_struct_ops(map) || map->fd == -1)
1: -		return libbpf_err_ptr(-EINVAL);
1: +  if (!bpf_map__is_struct_ops(map) || map->fd == -1)
1: +    return libbpf_err_ptr(-EINVAL);
1:  
1: -	link = calloc(1, sizeof(*link));
1: -	if (!link)
1: -		return libbpf_err_ptr(-EINVAL);
1: +  link = calloc(1, sizeof(*link));
1: +  if (!link)
1: +    return libbpf_err_ptr(-EINVAL);
1:  
1: -	st_ops = map->st_ops;
1: -	for (i = 0; i < btf_vlen(st_ops->type); i++) {
1: -		struct bpf_program *prog = st_ops->progs[i];
1: -		void *kern_data;
1: -		int prog_fd;
1: +  st_ops = map->st_ops;
1: +  for (i = 0; i < btf_vlen(st_ops->type); i++) {
1: +    struct bpf_program *prog = st_ops->progs[i];
1: +    void *kern_data;
1: +    int prog_fd;
1:  
1: -		if (!prog)
1: -			continue;
1: +    if (!prog)
1: +      continue;
1:  
1: -		prog_fd = bpf_program__fd(prog);
1: -		kern_data = st_ops->kern_vdata + st_ops->kern_func_off[i];
1: -		*(unsigned long *)kern_data = prog_fd;
1: -	}
1: +    prog_fd = bpf_program__fd(prog);
1: +    kern_data = st_ops->kern_vdata + st_ops->kern_func_off[i];
1: +    *(unsigned long *)kern_data = prog_fd;
1: +  }
1:  
1: -	err = bpf_map_update_elem(map->fd, &zero, st_ops->kern_vdata, 0);
1: -	if (err) {
1: -		err = -errno;
1: -		free(link);
1: -		return libbpf_err_ptr(err);
1: -	}
1: +  err = bpf_map_update_elem(map->fd, &zero, st_ops->kern_vdata, 0);
1: +  if (err) {
1: +    err = -errno;
1: +    free(link);
1: +    return libbpf_err_ptr(err);
1: +  }
1:  
1: -	link->detach = bpf_link__detach_struct_ops;
1: -	link->fd = map->fd;
1: +  link->detach = bpf_link__detach_struct_ops;
1: +  link->fd = map->fd;
1:  
1: -	return link;
1: +  return link;
1:  }
1:  
1: -enum bpf_perf_event_ret
1: -bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
1: -			   void **copy_mem, size_t *copy_size,
1: -			   bpf_perf_event_print_t fn, void *private_data)
1: -{
1: -	struct perf_event_mmap_page *header = mmap_mem;
1: -	__u64 data_head = ring_buffer_read_head(header);
1: -	__u64 data_tail = header->data_tail;
1: -	void *base = ((__u8 *)header) + page_size;
1: -	int ret = LIBBPF_PERF_EVENT_CONT;
1: -	struct perf_event_header *ehdr;
1: -	size_t ehdr_size;
1: +enum bpf_perf_event_ret bpf_perf_event_read_simple(
1: +    void *mmap_mem, size_t mmap_size, size_t page_size, void **copy_mem,
1: +    size_t *copy_size, bpf_perf_event_print_t fn, void *private_data) {
1: +  struct perf_event_mmap_page *header = mmap_mem;
1: +  __u64 data_head = ring_buffer_read_head(header);
1: +  __u64 data_tail = header->data_tail;
1: +  void *base = ((__u8 *)header) + page_size;
1: +  int ret = LIBBPF_PERF_EVENT_CONT;
1: +  struct perf_event_header *ehdr;
1: +  size_t ehdr_size;
1:  
1: -	while (data_head != data_tail) {
1: -		ehdr = base + (data_tail & (mmap_size - 1));
1: -		ehdr_size = ehdr->size;
1: +  while (data_head != data_tail) {
1: +    ehdr = base + (data_tail & (mmap_size - 1));
1: +    ehdr_size = ehdr->size;
1:  
1: -		if (((void *)ehdr) + ehdr_size > base + mmap_size) {
1: -			void *copy_start = ehdr;
1: -			size_t len_first = base + mmap_size - copy_start;
1: -			size_t len_secnd = ehdr_size - len_first;
1: +    if (((void *)ehdr) + ehdr_size > base + mmap_size) {
1: +      void *copy_start = ehdr;
1: +      size_t len_first = base + mmap_size - copy_start;
1: +      size_t len_secnd = ehdr_size - len_first;
1:  
1: -			if (*copy_size < ehdr_size) {
1: -				free(*copy_mem);
1: -				*copy_mem = malloc(ehdr_size);
1: -				if (!*copy_mem) {
1: -					*copy_size = 0;
1: -					ret = LIBBPF_PERF_EVENT_ERROR;
1: -					break;
1: -				}
1: -				*copy_size = ehdr_size;
1: -			}
1: +      if (*copy_size < ehdr_size) {
1: +        free(*copy_mem);
1: +        *copy_mem = malloc(ehdr_size);
1: +        if (!*copy_mem) {
1: +          *copy_size = 0;
1: +          ret = LIBBPF_PERF_EVENT_ERROR;
1: +          break;
1: +        }
1: +        *copy_size = ehdr_size;
1: +      }
1:  
1: -			memcpy(*copy_mem, copy_start, len_first);
1: -			memcpy(*copy_mem + len_first, base, len_secnd);
1: -			ehdr = *copy_mem;
1: -		}
1: +      memcpy(*copy_mem, copy_start, len_first);
1: +      memcpy(*copy_mem + len_first, base, len_secnd);
1: +      ehdr = *copy_mem;
1: +    }
1:  
1: -		ret = fn(ehdr, private_data);
1: -		data_tail += ehdr_size;
1: -		if (ret != LIBBPF_PERF_EVENT_CONT)
1: -			break;
1: -	}
1: -
1: -	ring_buffer_write_tail(header, data_tail);
1: -	return libbpf_err(ret);
1: +    ret = fn(ehdr, private_data);
1: +    data_tail += ehdr_size;
1: +    if (ret != LIBBPF_PERF_EVENT_CONT)
1: +      break;
1: +  }
1: +
1: +  ring_buffer_write_tail(header, data_tail);
1: +  return libbpf_err(ret);
1:  }
1:  
1:  struct perf_buffer;
1:  
1:  struct perf_buffer_params {
1: -	struct perf_event_attr *attr;
1: -	/* if event_cb is specified, it takes precendence */
1: -	perf_buffer_event_fn event_cb;
1: -	/* sample_cb and lost_cb are higher-level common-case callbacks */
1: -	perf_buffer_sample_fn sample_cb;
1: -	perf_buffer_lost_fn lost_cb;
1: -	void *ctx;
1: -	int cpu_cnt;
1: -	int *cpus;
1: -	int *map_keys;
1: +  struct perf_event_attr *attr;
1: +  /* if event_cb is specified, it takes precendence */
1: +  perf_buffer_event_fn event_cb;
1: +  /* sample_cb and lost_cb are higher-level common-case callbacks */
1: +  perf_buffer_sample_fn sample_cb;
1: +  perf_buffer_lost_fn lost_cb;
1: +  void *ctx;
1: +  int cpu_cnt;
1: +  int *cpus;
1: +  int *map_keys;
1:  };
1:  
1:  struct perf_cpu_buf {
1: -	struct perf_buffer *pb;
1: -	void *base; /* mmap()'ed memory */
1: -	void *buf; /* for reconstructing segmented data */
1: -	size_t buf_size;
1: -	int fd;
1: -	int cpu;
1: -	int map_key;
1: +  struct perf_buffer *pb;
1: +  void *base; /* mmap()'ed memory */
1: +  void *buf;  /* for reconstructing segmented data */
1: +  size_t buf_size;
1: +  int fd;
1: +  int cpu;
1: +  int map_key;
1:  };
1:  
1:  struct perf_buffer {
1: -	perf_buffer_event_fn event_cb;
1: -	perf_buffer_sample_fn sample_cb;
1: -	perf_buffer_lost_fn lost_cb;
1: -	void *ctx; /* passed into callbacks */
1: -
1: -	size_t page_size;
1: -	size_t mmap_size;
1: -	struct perf_cpu_buf **cpu_bufs;
1: -	struct epoll_event *events;
1: -	int cpu_cnt; /* number of allocated CPU buffers */
1: -	int epoll_fd; /* perf event FD */
1: -	int map_fd; /* BPF_MAP_TYPE_PERF_EVENT_ARRAY BPF map FD */
1: +  perf_buffer_event_fn event_cb;
1: +  perf_buffer_sample_fn sample_cb;
1: +  perf_buffer_lost_fn lost_cb;
1: +  void *ctx; /* passed into callbacks */
1: +
1: +  size_t page_size;
1: +  size_t mmap_size;
1: +  struct perf_cpu_buf **cpu_bufs;
1: +  struct epoll_event *events;
1: +  int cpu_cnt;  /* number of allocated CPU buffers */
1: +  int epoll_fd; /* perf event FD */
1: +  int map_fd;   /* BPF_MAP_TYPE_PERF_EVENT_ARRAY BPF map FD */
1:  };
1:  
1:  static void perf_buffer__free_cpu_buf(struct perf_buffer *pb,
1: -				      struct perf_cpu_buf *cpu_buf)
1: -{
1: -	if (!cpu_buf)
1: -		return;
1: -	if (cpu_buf->base &&
1: -	    munmap(cpu_buf->base, pb->mmap_size + pb->page_size))
1: -		pr_warn("failed to munmap cpu_buf #%d\n", cpu_buf->cpu);
1: -	if (cpu_buf->fd >= 0) {
1: -		ioctl(cpu_buf->fd, PERF_EVENT_IOC_DISABLE, 0);
1: -		close(cpu_buf->fd);
1: -	}
1: -	free(cpu_buf->buf);
1: -	free(cpu_buf);
1: -}
1: -
1: -void perf_buffer__free(struct perf_buffer *pb)
1: -{
1: -	int i;
1: -
1: -	if (IS_ERR_OR_NULL(pb))
1: -		return;
1: -	if (pb->cpu_bufs) {
1: -		for (i = 0; i < pb->cpu_cnt; i++) {
1: -			struct perf_cpu_buf *cpu_buf = pb->cpu_bufs[i];
1: -
1: -			if (!cpu_buf)
1: -				continue;
1: -
1: -			bpf_map_delete_elem(pb->map_fd, &cpu_buf->map_key);
1: -			perf_buffer__free_cpu_buf(pb, cpu_buf);
1: -		}
1: -		free(pb->cpu_bufs);
1: -	}
1: -	if (pb->epoll_fd >= 0)
1: -		close(pb->epoll_fd);
1: -	free(pb->events);
1: -	free(pb);
1: -}
1: -
1: -static struct perf_cpu_buf *
1: -perf_buffer__open_cpu_buf(struct perf_buffer *pb, struct perf_event_attr *attr,
1: -			  int cpu, int map_key)
1: -{
1: -	struct perf_cpu_buf *cpu_buf;
1: -	char msg[STRERR_BUFSIZE];
1: -	int err;
1: -
1: -	cpu_buf = calloc(1, sizeof(*cpu_buf));
1: -	if (!cpu_buf)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	cpu_buf->pb = pb;
1: -	cpu_buf->cpu = cpu;
1: -	cpu_buf->map_key = map_key;
1: -
1: -	cpu_buf->fd = syscall(__NR_perf_event_open, attr, -1 /* pid */, cpu,
1: -			      -1, PERF_FLAG_FD_CLOEXEC);
1: -	if (cpu_buf->fd < 0) {
1: -		err = -errno;
1: -		pr_warn("failed to open perf buffer event on cpu #%d: %s\n",
1: -			cpu, libbpf_strerror_r(err, msg, sizeof(msg)));
1: -		goto error;
1: -	}
1: -
1: -	cpu_buf->base = mmap(NULL, pb->mmap_size + pb->page_size,
1: -			     PROT_READ | PROT_WRITE, MAP_SHARED,
1: -			     cpu_buf->fd, 0);
1: -	if (cpu_buf->base == MAP_FAILED) {
1: -		cpu_buf->base = NULL;
1: -		err = -errno;
1: -		pr_warn("failed to mmap perf buffer on cpu #%d: %s\n",
1: -			cpu, libbpf_strerror_r(err, msg, sizeof(msg)));
1: -		goto error;
1: -	}
1: -
1: -	if (ioctl(cpu_buf->fd, PERF_EVENT_IOC_ENABLE, 0) < 0) {
1: -		err = -errno;
1: -		pr_warn("failed to enable perf buffer event on cpu #%d: %s\n",
1: -			cpu, libbpf_strerror_r(err, msg, sizeof(msg)));
1: -		goto error;
1: -	}
1: -
1: -	return cpu_buf;
1: +                                      struct perf_cpu_buf *cpu_buf) {
1: +  if (!cpu_buf)
1: +    return;
1: +  if (cpu_buf->base && munmap(cpu_buf->base, pb->mmap_size + pb->page_size))
1: +    pr_warn("failed to munmap cpu_buf #%d\n", cpu_buf->cpu);
1: +  if (cpu_buf->fd >= 0) {
1: +    ioctl(cpu_buf->fd, PERF_EVENT_IOC_DISABLE, 0);
1: +    close(cpu_buf->fd);
1: +  }
1: +  free(cpu_buf->buf);
1: +  free(cpu_buf);
1: +}
1: +
1: +void perf_buffer__free(struct perf_buffer *pb) {
1: +  int i;
1: +
1: +  if (IS_ERR_OR_NULL(pb))
1: +    return;
1: +  if (pb->cpu_bufs) {
1: +    for (i = 0; i < pb->cpu_cnt; i++) {
1: +      struct perf_cpu_buf *cpu_buf = pb->cpu_bufs[i];
1: +
1: +      if (!cpu_buf)
1: +        continue;
1: +
1: +      bpf_map_delete_elem(pb->map_fd, &cpu_buf->map_key);
1: +      perf_buffer__free_cpu_buf(pb, cpu_buf);
1: +    }
1: +    free(pb->cpu_bufs);
1: +  }
1: +  if (pb->epoll_fd >= 0)
1: +    close(pb->epoll_fd);
1: +  free(pb->events);
1: +  free(pb);
1: +}
1: +
1: +static struct perf_cpu_buf *perf_buffer__open_cpu_buf(
1: +    struct perf_buffer *pb, struct perf_event_attr *attr, int cpu,
1: +    int map_key) {
1: +  struct perf_cpu_buf *cpu_buf;
1: +  char msg[STRERR_BUFSIZE];
1: +  int err;
1: +
1: +  cpu_buf = calloc(1, sizeof(*cpu_buf));
1: +  if (!cpu_buf)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  cpu_buf->pb = pb;
1: +  cpu_buf->cpu = cpu;
1: +  cpu_buf->map_key = map_key;
1: +
1: +  cpu_buf->fd = syscall(__NR_perf_event_open, attr, -1 /* pid */, cpu, -1,
1: +                        PERF_FLAG_FD_CLOEXEC);
1: +  if (cpu_buf->fd < 0) {
1: +    err = -errno;
1: +    pr_warn("failed to open perf buffer event on cpu #%d: %s\n", cpu,
1: +            libbpf_strerror_r(err, msg, sizeof(msg)));
1: +    goto error;
1: +  }
1: +
1: +  cpu_buf->base = mmap(NULL, pb->mmap_size + pb->page_size,
1: +                       PROT_READ | PROT_WRITE, MAP_SHARED, cpu_buf->fd, 0);
1: +  if (cpu_buf->base == MAP_FAILED) {
1: +    cpu_buf->base = NULL;
1: +    err = -errno;
1: +    pr_warn("failed to mmap perf buffer on cpu #%d: %s\n", cpu,
1: +            libbpf_strerror_r(err, msg, sizeof(msg)));
1: +    goto error;
1: +  }
1: +
1: +  if (ioctl(cpu_buf->fd, PERF_EVENT_IOC_ENABLE, 0) < 0) {
1: +    err = -errno;
1: +    pr_warn("failed to enable perf buffer event on cpu #%d: %s\n", cpu,
1: +            libbpf_strerror_r(err, msg, sizeof(msg)));
1: +    goto error;
1: +  }
1: +
1: +  return cpu_buf;
1:  
1:  error:
1: -	perf_buffer__free_cpu_buf(pb, cpu_buf);
1: -	return (struct perf_cpu_buf *)ERR_PTR(err);
1: +  perf_buffer__free_cpu_buf(pb, cpu_buf);
1: +  return (struct perf_cpu_buf *)ERR_PTR(err);
1:  }
1:  
1:  static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt,
1: -					      struct perf_buffer_params *p);
1: +                                              struct perf_buffer_params *p);
1:  
1:  struct perf_buffer *perf_buffer__new(int map_fd, size_t page_cnt,
1: -				     const struct perf_buffer_opts *opts)
1: -{
1: -	struct perf_buffer_params p = {};
1: -	struct perf_event_attr attr = { 0, };
1: +                                     const struct perf_buffer_opts *opts) {
1: +  struct perf_buffer_params p = {};
1: +  struct perf_event_attr attr = {
1: +      0,
1: +  };
1:  
1: -	attr.config = PERF_COUNT_SW_BPF_OUTPUT;
1: -	attr.type = PERF_TYPE_SOFTWARE;
1: -	attr.sample_type = PERF_SAMPLE_RAW;
1: -	attr.sample_period = 1;
1: -	attr.wakeup_events = 1;
1: +  attr.config = PERF_COUNT_SW_BPF_OUTPUT;
1: +  attr.type = PERF_TYPE_SOFTWARE;
1: +  attr.sample_type = PERF_SAMPLE_RAW;
1: +  attr.sample_period = 1;
1: +  attr.wakeup_events = 1;
1:  
1: -	p.attr = &attr;
1: -	p.sample_cb = opts ? opts->sample_cb : NULL;
1: -	p.lost_cb = opts ? opts->lost_cb : NULL;
1: -	p.ctx = opts ? opts->ctx : NULL;
1: +  p.attr = &attr;
1: +  p.sample_cb = opts ? opts->sample_cb : NULL;
1: +  p.lost_cb = opts ? opts->lost_cb : NULL;
1: +  p.ctx = opts ? opts->ctx : NULL;
1:  
1: -	return libbpf_ptr(__perf_buffer__new(map_fd, page_cnt, &p));
1: +  return libbpf_ptr(__perf_buffer__new(map_fd, page_cnt, &p));
1:  }
1:  
1: -struct perf_buffer *
1: -perf_buffer__new_raw(int map_fd, size_t page_cnt,
1: -		     const struct perf_buffer_raw_opts *opts)
1: -{
1: -	struct perf_buffer_params p = {};
1: +struct perf_buffer *perf_buffer__new_raw(
1: +    int map_fd, size_t page_cnt, const struct perf_buffer_raw_opts *opts) {
1: +  struct perf_buffer_params p = {};
1:  
1: -	p.attr = opts->attr;
1: -	p.event_cb = opts->event_cb;
1: -	p.ctx = opts->ctx;
1: -	p.cpu_cnt = opts->cpu_cnt;
1: -	p.cpus = opts->cpus;
1: -	p.map_keys = opts->map_keys;
1: +  p.attr = opts->attr;
1: +  p.event_cb = opts->event_cb;
1: +  p.ctx = opts->ctx;
1: +  p.cpu_cnt = opts->cpu_cnt;
1: +  p.cpus = opts->cpus;
1: +  p.map_keys = opts->map_keys;
1:  
1: -	return libbpf_ptr(__perf_buffer__new(map_fd, page_cnt, &p));
1: +  return libbpf_ptr(__perf_buffer__new(map_fd, page_cnt, &p));
1:  }
1:  
1:  static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt,
1: -					      struct perf_buffer_params *p)
1: -{
1: -	const char *online_cpus_file = "/sys/devices/system/cpu/online";
1: -	struct bpf_map_info map;
1: -	char msg[STRERR_BUFSIZE];
1: -	struct perf_buffer *pb;
1: -	bool *online = NULL;
1: -	__u32 map_info_len;
1: -	int err, i, j, n;
1: -
1: -	if (page_cnt & (page_cnt - 1)) {
1: -		pr_warn("page count should be power of two, but is %zu\n",
1: -			page_cnt);
1: -		return ERR_PTR(-EINVAL);
1: -	}
1: -
1: -	/* best-effort sanity checks */
1: -	memset(&map, 0, sizeof(map));
1: -	map_info_len = sizeof(map);
1: -	err = bpf_obj_get_info_by_fd(map_fd, &map, &map_info_len);
1: -	if (err) {
1: -		err = -errno;
1: -		/* if BPF_OBJ_GET_INFO_BY_FD is supported, will return
1: -		 * -EBADFD, -EFAULT, or -E2BIG on real error
1: -		 */
1: -		if (err != -EINVAL) {
1: -			pr_warn("failed to get map info for map FD %d: %s\n",
1: -				map_fd, libbpf_strerror_r(err, msg, sizeof(msg)));
1: -			return ERR_PTR(err);
1: -		}
1: -		pr_debug("failed to get map info for FD %d; API not supported? Ignoring...\n",
1: -			 map_fd);
1: -	} else {
1: -		if (map.type != BPF_MAP_TYPE_PERF_EVENT_ARRAY) {
1: -			pr_warn("map '%s' should be BPF_MAP_TYPE_PERF_EVENT_ARRAY\n",
1: -				map.name);
1: -			return ERR_PTR(-EINVAL);
1: -		}
1: -	}
1: -
1: -	pb = calloc(1, sizeof(*pb));
1: -	if (!pb)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	pb->event_cb = p->event_cb;
1: -	pb->sample_cb = p->sample_cb;
1: -	pb->lost_cb = p->lost_cb;
1: -	pb->ctx = p->ctx;
1: -
1: -	pb->page_size = getpagesize();
1: -	pb->mmap_size = pb->page_size * page_cnt;
1: -	pb->map_fd = map_fd;
1: -
1: -	pb->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
1: -	if (pb->epoll_fd < 0) {
1: -		err = -errno;
1: -		pr_warn("failed to create epoll instance: %s\n",
1: -			libbpf_strerror_r(err, msg, sizeof(msg)));
1: -		goto error;
1: -	}
1: -
1: -	if (p->cpu_cnt > 0) {
1: -		pb->cpu_cnt = p->cpu_cnt;
1: -	} else {
1: -		pb->cpu_cnt = libbpf_num_possible_cpus();
1: -		if (pb->cpu_cnt < 0) {
1: -			err = pb->cpu_cnt;
1: -			goto error;
1: -		}
1: -		if (map.max_entries && map.max_entries < pb->cpu_cnt)
1: -			pb->cpu_cnt = map.max_entries;
1: -	}
1: -
1: -	pb->events = calloc(pb->cpu_cnt, sizeof(*pb->events));
1: -	if (!pb->events) {
1: -		err = -ENOMEM;
1: -		pr_warn("failed to allocate events: out of memory\n");
1: -		goto error;
1: -	}
1: -	pb->cpu_bufs = calloc(pb->cpu_cnt, sizeof(*pb->cpu_bufs));
1: -	if (!pb->cpu_bufs) {
1: -		err = -ENOMEM;
1: -		pr_warn("failed to allocate buffers: out of memory\n");
1: -		goto error;
1: -	}
1: -
1: -	err = parse_cpu_mask_file(online_cpus_file, &online, &n);
1: -	if (err) {
1: -		pr_warn("failed to get online CPU mask: %d\n", err);
1: -		goto error;
1: -	}
1: -
1: -	for (i = 0, j = 0; i < pb->cpu_cnt; i++) {
1: -		struct perf_cpu_buf *cpu_buf;
1: -		int cpu, map_key;
1: -
1: -		cpu = p->cpu_cnt > 0 ? p->cpus[i] : i;
1: -		map_key = p->cpu_cnt > 0 ? p->map_keys[i] : i;
1: -
1: -		/* in case user didn't explicitly requested particular CPUs to
1: -		 * be attached to, skip offline/not present CPUs
1: -		 */
1: -		if (p->cpu_cnt <= 0 && (cpu >= n || !online[cpu]))
1: -			continue;
1: -
1: -		cpu_buf = perf_buffer__open_cpu_buf(pb, p->attr, cpu, map_key);
1: -		if (IS_ERR(cpu_buf)) {
1: -			err = PTR_ERR(cpu_buf);
1: -			goto error;
1: -		}
1: -
1: -		pb->cpu_bufs[j] = cpu_buf;
1: -
1: -		err = bpf_map_update_elem(pb->map_fd, &map_key,
1: -					  &cpu_buf->fd, 0);
1: -		if (err) {
1: -			err = -errno;
1: -			pr_warn("failed to set cpu #%d, key %d -> perf FD %d: %s\n",
1: -				cpu, map_key, cpu_buf->fd,
1: -				libbpf_strerror_r(err, msg, sizeof(msg)));
1: -			goto error;
1: -		}
1: -
1: -		pb->events[j].events = EPOLLIN;
1: -		pb->events[j].data.ptr = cpu_buf;
1: -		if (epoll_ctl(pb->epoll_fd, EPOLL_CTL_ADD, cpu_buf->fd,
1: -			      &pb->events[j]) < 0) {
1: -			err = -errno;
1: -			pr_warn("failed to epoll_ctl cpu #%d perf FD %d: %s\n",
1: -				cpu, cpu_buf->fd,
1: -				libbpf_strerror_r(err, msg, sizeof(msg)));
1: -			goto error;
1: -		}
1: -		j++;
1: -	}
1: -	pb->cpu_cnt = j;
1: -	free(online);
1: -
1: -	return pb;
1: +                                              struct perf_buffer_params *p) {
1: +  const char *online_cpus_file = "/sys/devices/system/cpu/online";
1: +  struct bpf_map_info map;
1: +  char msg[STRERR_BUFSIZE];
1: +  struct perf_buffer *pb;
1: +  bool *online = NULL;
1: +  __u32 map_info_len;
1: +  int err, i, j, n;
1: +
1: +  if (page_cnt & (page_cnt - 1)) {
1: +    pr_warn("page count should be power of two, but is %zu\n", page_cnt);
1: +    return ERR_PTR(-EINVAL);
1: +  }
1: +
1: +  /* best-effort sanity checks */
1: +  memset(&map, 0, sizeof(map));
1: +  map_info_len = sizeof(map);
1: +  err = bpf_obj_get_info_by_fd(map_fd, &map, &map_info_len);
1: +  if (err) {
1: +    err = -errno;
1: +    /* if BPF_OBJ_GET_INFO_BY_FD is supported, will return
1: +     * -EBADFD, -EFAULT, or -E2BIG on real error
1: +     */
1: +    if (err != -EINVAL) {
1: +      pr_warn("failed to get map info for map FD %d: %s\n", map_fd,
1: +              libbpf_strerror_r(err, msg, sizeof(msg)));
1: +      return ERR_PTR(err);
1: +    }
1: +    pr_debug(
1: +        "failed to get map info for FD %d; API not supported? Ignoring...\n",
1: +        map_fd);
1: +  } else {
1: +    if (map.type != BPF_MAP_TYPE_PERF_EVENT_ARRAY) {
1: +      pr_warn("map '%s' should be BPF_MAP_TYPE_PERF_EVENT_ARRAY\n", map.name);
1: +      return ERR_PTR(-EINVAL);
1: +    }
1: +  }
1: +
1: +  pb = calloc(1, sizeof(*pb));
1: +  if (!pb)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  pb->event_cb = p->event_cb;
1: +  pb->sample_cb = p->sample_cb;
1: +  pb->lost_cb = p->lost_cb;
1: +  pb->ctx = p->ctx;
1: +
1: +  pb->page_size = getpagesize();
1: +  pb->mmap_size = pb->page_size * page_cnt;
1: +  pb->map_fd = map_fd;
1: +
1: +  pb->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
1: +  if (pb->epoll_fd < 0) {
1: +    err = -errno;
1: +    pr_warn("failed to create epoll instance: %s\n",
1: +            libbpf_strerror_r(err, msg, sizeof(msg)));
1: +    goto error;
1: +  }
1: +
1: +  if (p->cpu_cnt > 0) {
1: +    pb->cpu_cnt = p->cpu_cnt;
1: +  } else {
1: +    pb->cpu_cnt = libbpf_num_possible_cpus();
1: +    if (pb->cpu_cnt < 0) {
1: +      err = pb->cpu_cnt;
1: +      goto error;
1: +    }
1: +    if (map.max_entries && map.max_entries < pb->cpu_cnt)
1: +      pb->cpu_cnt = map.max_entries;
1: +  }
1: +
1: +  pb->events = calloc(pb->cpu_cnt, sizeof(*pb->events));
1: +  if (!pb->events) {
1: +    err = -ENOMEM;
1: +    pr_warn("failed to allocate events: out of memory\n");
1: +    goto error;
1: +  }
1: +  pb->cpu_bufs = calloc(pb->cpu_cnt, sizeof(*pb->cpu_bufs));
1: +  if (!pb->cpu_bufs) {
1: +    err = -ENOMEM;
1: +    pr_warn("failed to allocate buffers: out of memory\n");
1: +    goto error;
1: +  }
1: +
1: +  err = parse_cpu_mask_file(online_cpus_file, &online, &n);
1: +  if (err) {
1: +    pr_warn("failed to get online CPU mask: %d\n", err);
1: +    goto error;
1: +  }
1: +
1: +  for (i = 0, j = 0; i < pb->cpu_cnt; i++) {
1: +    struct perf_cpu_buf *cpu_buf;
1: +    int cpu, map_key;
1: +
1: +    cpu = p->cpu_cnt > 0 ? p->cpus[i] : i;
1: +    map_key = p->cpu_cnt > 0 ? p->map_keys[i] : i;
1: +
1: +    /* in case user didn't explicitly requested particular CPUs to
1: +     * be attached to, skip offline/not present CPUs
1: +     */
1: +    if (p->cpu_cnt <= 0 && (cpu >= n || !online[cpu]))
1: +      continue;
1: +
1: +    cpu_buf = perf_buffer__open_cpu_buf(pb, p->attr, cpu, map_key);
1: +    if (IS_ERR(cpu_buf)) {
1: +      err = PTR_ERR(cpu_buf);
1: +      goto error;
1: +    }
1: +
1: +    pb->cpu_bufs[j] = cpu_buf;
1: +
1: +    err = bpf_map_update_elem(pb->map_fd, &map_key, &cpu_buf->fd, 0);
1: +    if (err) {
1: +      err = -errno;
1: +      pr_warn("failed to set cpu #%d, key %d -> perf FD %d: %s\n", cpu, map_key,
1: +              cpu_buf->fd, libbpf_strerror_r(err, msg, sizeof(msg)));
1: +      goto error;
1: +    }
1: +
1: +    pb->events[j].events = EPOLLIN;
1: +    pb->events[j].data.ptr = cpu_buf;
1: +    if (epoll_ctl(pb->epoll_fd, EPOLL_CTL_ADD, cpu_buf->fd, &pb->events[j]) <
1: +        0) {
1: +      err = -errno;
1: +      pr_warn("failed to epoll_ctl cpu #%d perf FD %d: %s\n", cpu, cpu_buf->fd,
1: +              libbpf_strerror_r(err, msg, sizeof(msg)));
1: +      goto error;
1: +    }
1: +    j++;
1: +  }
1: +  pb->cpu_cnt = j;
1: +  free(online);
1: +
1: +  return pb;
1:  
1:  error:
1: -	free(online);
1: -	if (pb)
1: -		perf_buffer__free(pb);
1: -	return ERR_PTR(err);
1: +  free(online);
1: +  if (pb)
1: +    perf_buffer__free(pb);
1: +  return ERR_PTR(err);
1:  }
1:  
1:  struct perf_sample_raw {
1: -	struct perf_event_header header;
1: -	uint32_t size;
1: -	char data[];
1: +  struct perf_event_header header;
1: +  uint32_t size;
1: +  char data[];
1:  };
1:  
1:  struct perf_sample_lost {
1: -	struct perf_event_header header;
1: -	uint64_t id;
1: -	uint64_t lost;
1: -	uint64_t sample_id;
1: +  struct perf_event_header header;
1: +  uint64_t id;
1: +  uint64_t lost;
1: +  uint64_t sample_id;
1:  };
1:  
1: -static enum bpf_perf_event_ret
1: -perf_buffer__process_record(struct perf_event_header *e, void *ctx)
1: -{
1: -	struct perf_cpu_buf *cpu_buf = ctx;
1: -	struct perf_buffer *pb = cpu_buf->pb;
1: -	void *data = e;
1: -
1: -	/* user wants full control over parsing perf event */
1: -	if (pb->event_cb)
1: -		return pb->event_cb(pb->ctx, cpu_buf->cpu, e);
1: -
1: -	switch (e->type) {
1: -	case PERF_RECORD_SAMPLE: {
1: -		struct perf_sample_raw *s = data;
1: -
1: -		if (pb->sample_cb)
1: -			pb->sample_cb(pb->ctx, cpu_buf->cpu, s->data, s->size);
1: -		break;
1: -	}
1: -	case PERF_RECORD_LOST: {
1: -		struct perf_sample_lost *s = data;
1: -
1: -		if (pb->lost_cb)
1: -			pb->lost_cb(pb->ctx, cpu_buf->cpu, s->lost);
1: -		break;
1: -	}
1: -	default:
1: -		pr_warn("unknown perf sample type %d\n", e->type);
1: -		return LIBBPF_PERF_EVENT_ERROR;
1: -	}
1: -	return LIBBPF_PERF_EVENT_CONT;
1: +static enum bpf_perf_event_ret perf_buffer__process_record(
1: +    struct perf_event_header *e, void *ctx) {
1: +  struct perf_cpu_buf *cpu_buf = ctx;
1: +  struct perf_buffer *pb = cpu_buf->pb;
1: +  void *data = e;
1: +
1: +  /* user wants full control over parsing perf event */
1: +  if (pb->event_cb)
1: +    return pb->event_cb(pb->ctx, cpu_buf->cpu, e);
1: +
1: +  switch (e->type) {
1: +  case PERF_RECORD_SAMPLE: {
1: +    struct perf_sample_raw *s = data;
1: +
1: +    if (pb->sample_cb)
1: +      pb->sample_cb(pb->ctx, cpu_buf->cpu, s->data, s->size);
1: +    break;
1: +  }
1: +  case PERF_RECORD_LOST: {
1: +    struct perf_sample_lost *s = data;
1: +
1: +    if (pb->lost_cb)
1: +      pb->lost_cb(pb->ctx, cpu_buf->cpu, s->lost);
1: +    break;
1: +  }
1: +  default:
1: +    pr_warn("unknown perf sample type %d\n", e->type);
1: +    return LIBBPF_PERF_EVENT_ERROR;
1: +  }
1: +  return LIBBPF_PERF_EVENT_CONT;
1:  }
1:  
1:  static int perf_buffer__process_records(struct perf_buffer *pb,
1: -					struct perf_cpu_buf *cpu_buf)
1: -{
1: -	enum bpf_perf_event_ret ret;
1: +                                        struct perf_cpu_buf *cpu_buf) {
1: +  enum bpf_perf_event_ret ret;
1:  
1: -	ret = bpf_perf_event_read_simple(cpu_buf->base, pb->mmap_size,
1: -					 pb->page_size, &cpu_buf->buf,
1: -					 &cpu_buf->buf_size,
1: -					 perf_buffer__process_record, cpu_buf);
1: -	if (ret != LIBBPF_PERF_EVENT_CONT)
1: -		return ret;
1: -	return 0;
1: +  ret = bpf_perf_event_read_simple(cpu_buf->base, pb->mmap_size, pb->page_size,
1: +                                   &cpu_buf->buf, &cpu_buf->buf_size,
1: +                                   perf_buffer__process_record, cpu_buf);
1: +  if (ret != LIBBPF_PERF_EVENT_CONT)
1: +    return ret;
1: +  return 0;
1:  }
1:  
1: -int perf_buffer__epoll_fd(const struct perf_buffer *pb)
1: -{
1: -	return pb->epoll_fd;
1: -}
1: +int perf_buffer__epoll_fd(const struct perf_buffer *pb) { return pb->epoll_fd; }
1:  
1: -int perf_buffer__poll(struct perf_buffer *pb, int timeout_ms)
1: -{
1: -	int i, cnt, err;
1: +int perf_buffer__poll(struct perf_buffer *pb, int timeout_ms) {
1: +  int i, cnt, err;
1:  
1: -	cnt = epoll_wait(pb->epoll_fd, pb->events, pb->cpu_cnt, timeout_ms);
1: -	if (cnt < 0)
1: -		return libbpf_err_errno(cnt);
1: +  cnt = epoll_wait(pb->epoll_fd, pb->events, pb->cpu_cnt, timeout_ms);
1: +  if (cnt < 0)
1: +    return libbpf_err_errno(cnt);
1:  
1: -	for (i = 0; i < cnt; i++) {
1: -		struct perf_cpu_buf *cpu_buf = pb->events[i].data.ptr;
1: +  for (i = 0; i < cnt; i++) {
1: +    struct perf_cpu_buf *cpu_buf = pb->events[i].data.ptr;
1:  
1: -		err = perf_buffer__process_records(pb, cpu_buf);
1: -		if (err) {
1: -			pr_warn("error while processing records: %d\n", err);
1: -			return libbpf_err(err);
1: -		}
1: -	}
1: -	return cnt;
1: +    err = perf_buffer__process_records(pb, cpu_buf);
1: +    if (err) {
1: +      pr_warn("error while processing records: %d\n", err);
1: +      return libbpf_err(err);
1: +    }
1: +  }
1: +  return cnt;
1:  }
1:  
1:  /* Return number of PERF_EVENT_ARRAY map slots set up by this perf_buffer
1:   * manager.
1:   */
1: -size_t perf_buffer__buffer_cnt(const struct perf_buffer *pb)
1: -{
1: -	return pb->cpu_cnt;
1: +size_t perf_buffer__buffer_cnt(const struct perf_buffer *pb) {
1: +  return pb->cpu_cnt;
1:  }
1:  
1:  /*
1: @@ -11220,18 +10844,17 @@ size_t perf_buffer__buffer_cnt(const struct perf_buffer *pb)
1:   * PERF_EVENT_ARRAY BPF map. This FD can be polled for new data using
1:   * select()/poll()/epoll() Linux syscalls.
1:   */
1: -int perf_buffer__buffer_fd(const struct perf_buffer *pb, size_t buf_idx)
1: -{
1: -	struct perf_cpu_buf *cpu_buf;
1: +int perf_buffer__buffer_fd(const struct perf_buffer *pb, size_t buf_idx) {
1: +  struct perf_cpu_buf *cpu_buf;
1:  
1: -	if (buf_idx >= pb->cpu_cnt)
1: -		return libbpf_err(-EINVAL);
1: +  if (buf_idx >= pb->cpu_cnt)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	cpu_buf = pb->cpu_bufs[buf_idx];
1: -	if (!cpu_buf)
1: -		return libbpf_err(-ENOENT);
1: +  cpu_buf = pb->cpu_bufs[buf_idx];
1: +  if (!cpu_buf)
1: +    return libbpf_err(-ENOENT);
1:  
1: -	return cpu_buf->fd;
1: +  return cpu_buf->fd;
1:  }
1:  
1:  /*
1: @@ -11242,586 +10865,562 @@ int perf_buffer__buffer_fd(const struct perf_buffer *pb, size_t buf_idx)
1:   *   - 0 on success;
1:   *   - <0 on failure.
1:   */
1: -int perf_buffer__consume_buffer(struct perf_buffer *pb, size_t buf_idx)
1: -{
1: -	struct perf_cpu_buf *cpu_buf;
1: +int perf_buffer__consume_buffer(struct perf_buffer *pb, size_t buf_idx) {
1: +  struct perf_cpu_buf *cpu_buf;
1:  
1: -	if (buf_idx >= pb->cpu_cnt)
1: -		return libbpf_err(-EINVAL);
1: +  if (buf_idx >= pb->cpu_cnt)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	cpu_buf = pb->cpu_bufs[buf_idx];
1: -	if (!cpu_buf)
1: -		return libbpf_err(-ENOENT);
1: +  cpu_buf = pb->cpu_bufs[buf_idx];
1: +  if (!cpu_buf)
1: +    return libbpf_err(-ENOENT);
1:  
1: -	return perf_buffer__process_records(pb, cpu_buf);
1: +  return perf_buffer__process_records(pb, cpu_buf);
1:  }
1:  
1: -int perf_buffer__consume(struct perf_buffer *pb)
1: -{
1: -	int i, err;
1: +int perf_buffer__consume(struct perf_buffer *pb) {
1: +  int i, err;
1:  
1: -	for (i = 0; i < pb->cpu_cnt; i++) {
1: -		struct perf_cpu_buf *cpu_buf = pb->cpu_bufs[i];
1: +  for (i = 0; i < pb->cpu_cnt; i++) {
1: +    struct perf_cpu_buf *cpu_buf = pb->cpu_bufs[i];
1:  
1: -		if (!cpu_buf)
1: -			continue;
1: +    if (!cpu_buf)
1: +      continue;
1:  
1: -		err = perf_buffer__process_records(pb, cpu_buf);
1: -		if (err) {
1: -			pr_warn("perf_buffer: failed to process records in buffer #%d: %d\n", i, err);
1: -			return libbpf_err(err);
1: -		}
1: -	}
1: -	return 0;
1: +    err = perf_buffer__process_records(pb, cpu_buf);
1: +    if (err) {
1: +      pr_warn("perf_buffer: failed to process records in buffer #%d: %d\n", i,
1: +              err);
1: +      return libbpf_err(err);
1: +    }
1: +  }
1: +  return 0;
1:  }
1:  
1:  struct bpf_prog_info_array_desc {
1: -	int	array_offset;	/* e.g. offset of jited_prog_insns */
1: -	int	count_offset;	/* e.g. offset of jited_prog_len */
1: -	int	size_offset;	/* > 0: offset of rec size,
1: -				 * < 0: fix size of -size_offset
1: -				 */
1: +  int array_offset; /* e.g. offset of jited_prog_insns */
1: +  int count_offset; /* e.g. offset of jited_prog_len */
1: +  int size_offset;  /* > 0: offset of rec size,
1: +                     * < 0: fix size of -size_offset
1: +                     */
1:  };
1:  
1:  static struct bpf_prog_info_array_desc bpf_prog_info_array_desc[] = {
1: -	[BPF_PROG_INFO_JITED_INSNS] = {
1: -		offsetof(struct bpf_prog_info, jited_prog_insns),
1: -		offsetof(struct bpf_prog_info, jited_prog_len),
1: -		-1,
1: -	},
1: -	[BPF_PROG_INFO_XLATED_INSNS] = {
1: -		offsetof(struct bpf_prog_info, xlated_prog_insns),
1: -		offsetof(struct bpf_prog_info, xlated_prog_len),
1: -		-1,
1: -	},
1: -	[BPF_PROG_INFO_MAP_IDS] = {
1: -		offsetof(struct bpf_prog_info, map_ids),
1: -		offsetof(struct bpf_prog_info, nr_map_ids),
1: -		-(int)sizeof(__u32),
1: -	},
1: -	[BPF_PROG_INFO_JITED_KSYMS] = {
1: -		offsetof(struct bpf_prog_info, jited_ksyms),
1: -		offsetof(struct bpf_prog_info, nr_jited_ksyms),
1: -		-(int)sizeof(__u64),
1: -	},
1: -	[BPF_PROG_INFO_JITED_FUNC_LENS] = {
1: -		offsetof(struct bpf_prog_info, jited_func_lens),
1: -		offsetof(struct bpf_prog_info, nr_jited_func_lens),
1: -		-(int)sizeof(__u32),
1: -	},
1: -	[BPF_PROG_INFO_FUNC_INFO] = {
1: -		offsetof(struct bpf_prog_info, func_info),
1: -		offsetof(struct bpf_prog_info, nr_func_info),
1: -		offsetof(struct bpf_prog_info, func_info_rec_size),
1: -	},
1: -	[BPF_PROG_INFO_LINE_INFO] = {
1: -		offsetof(struct bpf_prog_info, line_info),
1: -		offsetof(struct bpf_prog_info, nr_line_info),
1: -		offsetof(struct bpf_prog_info, line_info_rec_size),
1: -	},
1: -	[BPF_PROG_INFO_JITED_LINE_INFO] = {
1: -		offsetof(struct bpf_prog_info, jited_line_info),
1: -		offsetof(struct bpf_prog_info, nr_jited_line_info),
1: -		offsetof(struct bpf_prog_info, jited_line_info_rec_size),
1: -	},
1: -	[BPF_PROG_INFO_PROG_TAGS] = {
1: -		offsetof(struct bpf_prog_info, prog_tags),
1: -		offsetof(struct bpf_prog_info, nr_prog_tags),
1: -		-(int)sizeof(__u8) * BPF_TAG_SIZE,
1: -	},
1: +        [BPF_PROG_INFO_JITED_INSNS] =
1: +            {
1: +                offsetof(struct bpf_prog_info, jited_prog_insns),
1: +                offsetof(struct bpf_prog_info, jited_prog_len), -1,
1: +            },
1: +        [BPF_PROG_INFO_XLATED_INSNS] =
1: +            {
1: +                offsetof(struct bpf_prog_info, xlated_prog_insns),
1: +                offsetof(struct bpf_prog_info, xlated_prog_len), -1,
1: +            },
1: +        [BPF_PROG_INFO_MAP_IDS] =
1: +            {
1: +                offsetof(struct bpf_prog_info, map_ids),
1: +                offsetof(struct bpf_prog_info, nr_map_ids), -(int)sizeof(__u32),
1: +            },
1: +        [BPF_PROG_INFO_JITED_KSYMS] =
1: +            {
1: +                offsetof(struct bpf_prog_info, jited_ksyms),
1: +                offsetof(struct bpf_prog_info, nr_jited_ksyms),
1: +                -(int)sizeof(__u64),
1: +            },
1: +        [BPF_PROG_INFO_JITED_FUNC_LENS] =
1: +            {
1: +                offsetof(struct bpf_prog_info, jited_func_lens),
1: +                offsetof(struct bpf_prog_info, nr_jited_func_lens),
1: +                -(int)sizeof(__u32),
1: +            },
1: +        [BPF_PROG_INFO_FUNC_INFO] =
1: +            {
1: +                offsetof(struct bpf_prog_info, func_info),
1: +                offsetof(struct bpf_prog_info, nr_func_info),
1: +                offsetof(struct bpf_prog_info, func_info_rec_size),
1: +            },
1: +        [BPF_PROG_INFO_LINE_INFO] =
1: +            {
1: +                offsetof(struct bpf_prog_info, line_info),
1: +                offsetof(struct bpf_prog_info, nr_line_info),
1: +                offsetof(struct bpf_prog_info, line_info_rec_size),
1: +            },
1: +        [BPF_PROG_INFO_JITED_LINE_INFO] =
1: +            {
1: +                offsetof(struct bpf_prog_info, jited_line_info),
1: +                offsetof(struct bpf_prog_info, nr_jited_line_info),
1: +                offsetof(struct bpf_prog_info, jited_line_info_rec_size),
1: +            },
1: +        [BPF_PROG_INFO_PROG_TAGS] =
1: +            {
1: +                offsetof(struct bpf_prog_info, prog_tags),
1: +                offsetof(struct bpf_prog_info, nr_prog_tags),
1: +                -(int)sizeof(__u8) * BPF_TAG_SIZE,
1: +            },
1:  
1:  };
1:  
1:  static __u32 bpf_prog_info_read_offset_u32(struct bpf_prog_info *info,
1: -					   int offset)
1: -{
1: -	__u32 *array = (__u32 *)info;
1: +                                           int offset) {
1: +  __u32 *array = (__u32 *)info;
1:  
1: -	if (offset >= 0)
1: -		return array[offset / sizeof(__u32)];
1: -	return -(int)offset;
1: +  if (offset >= 0)
1: +    return array[offset / sizeof(__u32)];
1: +  return -(int)offset;
1:  }
1:  
1:  static __u64 bpf_prog_info_read_offset_u64(struct bpf_prog_info *info,
1: -					   int offset)
1: -{
1: -	__u64 *array = (__u64 *)info;
1: +                                           int offset) {
1: +  __u64 *array = (__u64 *)info;
1:  
1: -	if (offset >= 0)
1: -		return array[offset / sizeof(__u64)];
1: -	return -(int)offset;
1: +  if (offset >= 0)
1: +    return array[offset / sizeof(__u64)];
1: +  return -(int)offset;
1:  }
1:  
1:  static void bpf_prog_info_set_offset_u32(struct bpf_prog_info *info, int offset,
1: -					 __u32 val)
1: -{
1: -	__u32 *array = (__u32 *)info;
1: +                                         __u32 val) {
1: +  __u32 *array = (__u32 *)info;
1:  
1: -	if (offset >= 0)
1: -		array[offset / sizeof(__u32)] = val;
1: +  if (offset >= 0)
1: +    array[offset / sizeof(__u32)] = val;
1:  }
1:  
1:  static void bpf_prog_info_set_offset_u64(struct bpf_prog_info *info, int offset,
1: -					 __u64 val)
1: -{
1: -	__u64 *array = (__u64 *)info;
1: -
1: -	if (offset >= 0)
1: -		array[offset / sizeof(__u64)] = val;
1: -}
1: -
1: -struct bpf_prog_info_linear *
1: -bpf_program__get_prog_info_linear(int fd, __u64 arrays)
1: -{
1: -	struct bpf_prog_info_linear *info_linear;
1: -	struct bpf_prog_info info = {};
1: -	__u32 info_len = sizeof(info);
1: -	__u32 data_len = 0;
1: -	int i, err;
1: -	void *ptr;
1: -
1: -	if (arrays >> BPF_PROG_INFO_LAST_ARRAY)
1: -		return libbpf_err_ptr(-EINVAL);
1: -
1: -	/* step 1: get array dimensions */
1: -	err = bpf_obj_get_info_by_fd(fd, &info, &info_len);
1: -	if (err) {
1: -		pr_debug("can't get prog info: %s", strerror(errno));
1: -		return libbpf_err_ptr(-EFAULT);
1: -	}
1: -
1: -	/* step 2: calculate total size of all arrays */
1: -	for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: -		bool include_array = (arrays & (1UL << i)) > 0;
1: -		struct bpf_prog_info_array_desc *desc;
1: -		__u32 count, size;
1: -
1: -		desc = bpf_prog_info_array_desc + i;
1: -
1: -		/* kernel is too old to support this field */
1: -		if (info_len < desc->array_offset + sizeof(__u32) ||
1: -		    info_len < desc->count_offset + sizeof(__u32) ||
1: -		    (desc->size_offset > 0 && info_len < desc->size_offset))
1: -			include_array = false;
1: -
1: -		if (!include_array) {
1: -			arrays &= ~(1UL << i);	/* clear the bit */
1: -			continue;
1: -		}
1: -
1: -		count = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
1: -		size  = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
1: -
1: -		data_len += count * size;
1: -	}
1: -
1: -	/* step 3: allocate continuous memory */
1: -	data_len = roundup(data_len, sizeof(__u64));
1: -	info_linear = malloc(sizeof(struct bpf_prog_info_linear) + data_len);
1: -	if (!info_linear)
1: -		return libbpf_err_ptr(-ENOMEM);
1: -
1: -	/* step 4: fill data to info_linear->info */
1: -	info_linear->arrays = arrays;
1: -	memset(&info_linear->info, 0, sizeof(info));
1: -	ptr = info_linear->data;
1: -
1: -	for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: -		struct bpf_prog_info_array_desc *desc;
1: -		__u32 count, size;
1: -
1: -		if ((arrays & (1UL << i)) == 0)
1: -			continue;
1: -
1: -		desc  = bpf_prog_info_array_desc + i;
1: -		count = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
1: -		size  = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
1: -		bpf_prog_info_set_offset_u32(&info_linear->info,
1: -					     desc->count_offset, count);
1: -		bpf_prog_info_set_offset_u32(&info_linear->info,
1: -					     desc->size_offset, size);
1: -		bpf_prog_info_set_offset_u64(&info_linear->info,
1: -					     desc->array_offset,
1: -					     ptr_to_u64(ptr));
1: -		ptr += count * size;
1: -	}
1: -
1: -	/* step 5: call syscall again to get required arrays */
1: -	err = bpf_obj_get_info_by_fd(fd, &info_linear->info, &info_len);
1: -	if (err) {
1: -		pr_debug("can't get prog info: %s", strerror(errno));
1: -		free(info_linear);
1: -		return libbpf_err_ptr(-EFAULT);
1: -	}
1: -
1: -	/* step 6: verify the data */
1: -	for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: -		struct bpf_prog_info_array_desc *desc;
1: -		__u32 v1, v2;
1: -
1: -		if ((arrays & (1UL << i)) == 0)
1: -			continue;
1: -
1: -		desc = bpf_prog_info_array_desc + i;
1: -		v1 = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
1: -		v2 = bpf_prog_info_read_offset_u32(&info_linear->info,
1: -						   desc->count_offset);
1: -		if (v1 != v2)
1: -			pr_warn("%s: mismatch in element count\n", __func__);
1: -
1: -		v1 = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
1: -		v2 = bpf_prog_info_read_offset_u32(&info_linear->info,
1: -						   desc->size_offset);
1: -		if (v1 != v2)
1: -			pr_warn("%s: mismatch in rec size\n", __func__);
1: -	}
1: -
1: -	/* step 7: update info_len and data_len */
1: -	info_linear->info_len = sizeof(struct bpf_prog_info);
1: -	info_linear->data_len = data_len;
1: -
1: -	return info_linear;
1: -}
1: -
1: -void bpf_program__bpil_addr_to_offs(struct bpf_prog_info_linear *info_linear)
1: -{
1: -	int i;
1: -
1: -	for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: -		struct bpf_prog_info_array_desc *desc;
1: -		__u64 addr, offs;
1: -
1: -		if ((info_linear->arrays & (1UL << i)) == 0)
1: -			continue;
1: -
1: -		desc = bpf_prog_info_array_desc + i;
1: -		addr = bpf_prog_info_read_offset_u64(&info_linear->info,
1: -						     desc->array_offset);
1: -		offs = addr - ptr_to_u64(info_linear->data);
1: -		bpf_prog_info_set_offset_u64(&info_linear->info,
1: -					     desc->array_offset, offs);
1: -	}
1: -}
1: -
1: -void bpf_program__bpil_offs_to_addr(struct bpf_prog_info_linear *info_linear)
1: -{
1: -	int i;
1: -
1: -	for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: -		struct bpf_prog_info_array_desc *desc;
1: -		__u64 addr, offs;
1: -
1: -		if ((info_linear->arrays & (1UL << i)) == 0)
1: -			continue;
1: -
1: -		desc = bpf_prog_info_array_desc + i;
1: -		offs = bpf_prog_info_read_offset_u64(&info_linear->info,
1: -						     desc->array_offset);
1: -		addr = offs + ptr_to_u64(info_linear->data);
1: -		bpf_prog_info_set_offset_u64(&info_linear->info,
1: -					     desc->array_offset, addr);
1: -	}
1: -}
1: -
1: -int bpf_program__set_attach_target(struct bpf_program *prog,
1: -				   int attach_prog_fd,
1: -				   const char *attach_func_name)
1: -{
1: -	int btf_obj_fd = 0, btf_id = 0, err;
1: -
1: -	if (!prog || attach_prog_fd < 0 || !attach_func_name)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	if (prog->obj->loaded)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	if (attach_prog_fd) {
1: -		btf_id = libbpf_find_prog_btf_id(attach_func_name,
1: -						 attach_prog_fd);
1: -		if (btf_id < 0)
1: -			return libbpf_err(btf_id);
1: -	} else {
1: -		/* load btf_vmlinux, if not yet */
1: -		err = bpf_object__load_vmlinux_btf(prog->obj, true);
1: -		if (err)
1: -			return libbpf_err(err);
1: -		err = find_kernel_btf_id(prog->obj, attach_func_name,
1: -					 prog->expected_attach_type,
1: -					 &btf_obj_fd, &btf_id);
1: -		if (err)
1: -			return libbpf_err(err);
1: -	}
1: -
1: -	prog->attach_btf_id = btf_id;
1: -	prog->attach_btf_obj_fd = btf_obj_fd;
1: -	prog->attach_prog_fd = attach_prog_fd;
1: -	return 0;
1: -}
1: -
1: -int parse_cpu_mask_str(const char *s, bool **mask, int *mask_sz)
1: -{
1: -	int err = 0, n, len, start, end = -1;
1: -	bool *tmp;
1: -
1: -	*mask = NULL;
1: -	*mask_sz = 0;
1: -
1: -	/* Each sub string separated by ',' has format \d+-\d+ or \d+ */
1: -	while (*s) {
1: -		if (*s == ',' || *s == '\n') {
1: -			s++;
1: -			continue;
1: -		}
1: -		n = sscanf(s, "%d%n-%d%n", &start, &len, &end, &len);
1: -		if (n <= 0 || n > 2) {
1: -			pr_warn("Failed to get CPU range %s: %d\n", s, n);
1: -			err = -EINVAL;
1: -			goto cleanup;
1: -		} else if (n == 1) {
1: -			end = start;
1: -		}
1: -		if (start < 0 || start > end) {
1: -			pr_warn("Invalid CPU range [%d,%d] in %s\n",
1: -				start, end, s);
1: -			err = -EINVAL;
1: -			goto cleanup;
1: -		}
1: -		tmp = realloc(*mask, end + 1);
1: -		if (!tmp) {
1: -			err = -ENOMEM;
1: -			goto cleanup;
1: -		}
1: -		*mask = tmp;
1: -		memset(tmp + *mask_sz, 0, start - *mask_sz);
1: -		memset(tmp + start, 1, end - start + 1);
1: -		*mask_sz = end + 1;
1: -		s += len;
1: -	}
1: -	if (!*mask_sz) {
1: -		pr_warn("Empty CPU range\n");
1: -		return -EINVAL;
1: -	}
1: -	return 0;
1: +                                         __u64 val) {
1: +  __u64 *array = (__u64 *)info;
1: +
1: +  if (offset >= 0)
1: +    array[offset / sizeof(__u64)] = val;
1: +}
1: +
1: +struct bpf_prog_info_linear *bpf_program__get_prog_info_linear(int fd,
1: +                                                               __u64 arrays) {
1: +  struct bpf_prog_info_linear *info_linear;
1: +  struct bpf_prog_info info = {};
1: +  __u32 info_len = sizeof(info);
1: +  __u32 data_len = 0;
1: +  int i, err;
1: +  void *ptr;
1: +
1: +  if (arrays >> BPF_PROG_INFO_LAST_ARRAY)
1: +    return libbpf_err_ptr(-EINVAL);
1: +
1: +  /* step 1: get array dimensions */
1: +  err = bpf_obj_get_info_by_fd(fd, &info, &info_len);
1: +  if (err) {
1: +    pr_debug("can't get prog info: %s", strerror(errno));
1: +    return libbpf_err_ptr(-EFAULT);
1: +  }
1: +
1: +  /* step 2: calculate total size of all arrays */
1: +  for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: +    bool include_array = (arrays & (1UL << i)) > 0;
1: +    struct bpf_prog_info_array_desc *desc;
1: +    __u32 count, size;
1: +
1: +    desc = bpf_prog_info_array_desc + i;
1: +
1: +    /* kernel is too old to support this field */
1: +    if (info_len < desc->array_offset + sizeof(__u32) ||
1: +        info_len < desc->count_offset + sizeof(__u32) ||
1: +        (desc->size_offset > 0 && info_len < desc->size_offset))
1: +      include_array = false;
1: +
1: +    if (!include_array) {
1: +      arrays &= ~(1UL << i); /* clear the bit */
1: +      continue;
1: +    }
1: +
1: +    count = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
1: +    size = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
1: +
1: +    data_len += count * size;
1: +  }
1: +
1: +  /* step 3: allocate continuous memory */
1: +  data_len = roundup(data_len, sizeof(__u64));
1: +  info_linear = malloc(sizeof(struct bpf_prog_info_linear) + data_len);
1: +  if (!info_linear)
1: +    return libbpf_err_ptr(-ENOMEM);
1: +
1: +  /* step 4: fill data to info_linear->info */
1: +  info_linear->arrays = arrays;
1: +  memset(&info_linear->info, 0, sizeof(info));
1: +  ptr = info_linear->data;
1: +
1: +  for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: +    struct bpf_prog_info_array_desc *desc;
1: +    __u32 count, size;
1: +
1: +    if ((arrays & (1UL << i)) == 0)
1: +      continue;
1: +
1: +    desc = bpf_prog_info_array_desc + i;
1: +    count = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
1: +    size = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
1: +    bpf_prog_info_set_offset_u32(&info_linear->info, desc->count_offset, count);
1: +    bpf_prog_info_set_offset_u32(&info_linear->info, desc->size_offset, size);
1: +    bpf_prog_info_set_offset_u64(&info_linear->info, desc->array_offset,
1: +                                 ptr_to_u64(ptr));
1: +    ptr += count * size;
1: +  }
1: +
1: +  /* step 5: call syscall again to get required arrays */
1: +  err = bpf_obj_get_info_by_fd(fd, &info_linear->info, &info_len);
1: +  if (err) {
1: +    pr_debug("can't get prog info: %s", strerror(errno));
1: +    free(info_linear);
1: +    return libbpf_err_ptr(-EFAULT);
1: +  }
1: +
1: +  /* step 6: verify the data */
1: +  for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: +    struct bpf_prog_info_array_desc *desc;
1: +    __u32 v1, v2;
1: +
1: +    if ((arrays & (1UL << i)) == 0)
1: +      continue;
1: +
1: +    desc = bpf_prog_info_array_desc + i;
1: +    v1 = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
1: +    v2 = bpf_prog_info_read_offset_u32(&info_linear->info, desc->count_offset);
1: +    if (v1 != v2)
1: +      pr_warn("%s: mismatch in element count\n", __func__);
1: +
1: +    v1 = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
1: +    v2 = bpf_prog_info_read_offset_u32(&info_linear->info, desc->size_offset);
1: +    if (v1 != v2)
1: +      pr_warn("%s: mismatch in rec size\n", __func__);
1: +  }
1: +
1: +  /* step 7: update info_len and data_len */
1: +  info_linear->info_len = sizeof(struct bpf_prog_info);
1: +  info_linear->data_len = data_len;
1: +
1: +  return info_linear;
1: +}
1: +
1: +void bpf_program__bpil_addr_to_offs(struct bpf_prog_info_linear *info_linear) {
1: +  int i;
1: +
1: +  for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: +    struct bpf_prog_info_array_desc *desc;
1: +    __u64 addr, offs;
1: +
1: +    if ((info_linear->arrays & (1UL << i)) == 0)
1: +      continue;
1: +
1: +    desc = bpf_prog_info_array_desc + i;
1: +    addr =
1: +        bpf_prog_info_read_offset_u64(&info_linear->info, desc->array_offset);
1: +    offs = addr - ptr_to_u64(info_linear->data);
1: +    bpf_prog_info_set_offset_u64(&info_linear->info, desc->array_offset, offs);
1: +  }
1: +}
1: +
1: +void bpf_program__bpil_offs_to_addr(struct bpf_prog_info_linear *info_linear) {
1: +  int i;
1: +
1: +  for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
1: +    struct bpf_prog_info_array_desc *desc;
1: +    __u64 addr, offs;
1: +
1: +    if ((info_linear->arrays & (1UL << i)) == 0)
1: +      continue;
1: +
1: +    desc = bpf_prog_info_array_desc + i;
1: +    offs =
1: +        bpf_prog_info_read_offset_u64(&info_linear->info, desc->array_offset);
1: +    addr = offs + ptr_to_u64(info_linear->data);
1: +    bpf_prog_info_set_offset_u64(&info_linear->info, desc->array_offset, addr);
1: +  }
1: +}
1: +
1: +int bpf_program__set_attach_target(struct bpf_program *prog, int attach_prog_fd,
1: +                                   const char *attach_func_name) {
1: +  int btf_obj_fd = 0, btf_id = 0, err;
1: +
1: +  if (!prog || attach_prog_fd < 0 || !attach_func_name)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  if (prog->obj->loaded)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  if (attach_prog_fd) {
1: +    btf_id = libbpf_find_prog_btf_id(attach_func_name, attach_prog_fd);
1: +    if (btf_id < 0)
1: +      return libbpf_err(btf_id);
1: +  } else {
1: +    /* load btf_vmlinux, if not yet */
1: +    err = bpf_object__load_vmlinux_btf(prog->obj, true);
1: +    if (err)
1: +      return libbpf_err(err);
1: +    err = find_kernel_btf_id(prog->obj, attach_func_name,
1: +                             prog->expected_attach_type, &btf_obj_fd, &btf_id);
1: +    if (err)
1: +      return libbpf_err(err);
1: +  }
1: +
1: +  prog->attach_btf_id = btf_id;
1: +  prog->attach_btf_obj_fd = btf_obj_fd;
1: +  prog->attach_prog_fd = attach_prog_fd;
1: +  return 0;
1: +}
1: +
1: +int parse_cpu_mask_str(const char *s, bool **mask, int *mask_sz) {
1: +  int err = 0, n, len, start, end = -1;
1: +  bool *tmp;
1: +
1: +  *mask = NULL;
1: +  *mask_sz = 0;
1: +
1: +  /* Each sub string separated by ',' has format \d+-\d+ or \d+ */
1: +  while (*s) {
1: +    if (*s == ',' || *s == '\n') {
1: +      s++;
1: +      continue;
1: +    }
1: +    n = sscanf(s, "%d%n-%d%n", &start, &len, &end, &len);
1: +    if (n <= 0 || n > 2) {
1: +      pr_warn("Failed to get CPU range %s: %d\n", s, n);
1: +      err = -EINVAL;
1: +      goto cleanup;
1: +    } else if (n == 1) {
1: +      end = start;
1: +    }
1: +    if (start < 0 || start > end) {
1: +      pr_warn("Invalid CPU range [%d,%d] in %s\n", start, end, s);
1: +      err = -EINVAL;
1: +      goto cleanup;
1: +    }
1: +    tmp = realloc(*mask, end + 1);
1: +    if (!tmp) {
1: +      err = -ENOMEM;
1: +      goto cleanup;
1: +    }
1: +    *mask = tmp;
1: +    memset(tmp + *mask_sz, 0, start - *mask_sz);
1: +    memset(tmp + start, 1, end - start + 1);
1: +    *mask_sz = end + 1;
1: +    s += len;
1: +  }
1: +  if (!*mask_sz) {
1: +    pr_warn("Empty CPU range\n");
1: +    return -EINVAL;
1: +  }
1: +  return 0;
1:  cleanup:
1: -	free(*mask);
1: -	*mask = NULL;
1: -	return err;
1: -}
1: -
1: -int parse_cpu_mask_file(const char *fcpu, bool **mask, int *mask_sz)
1: -{
1: -	int fd, err = 0, len;
1: -	char buf[128];
1: -
1: -	fd = open(fcpu, O_RDONLY);
1: -	if (fd < 0) {
1: -		err = -errno;
1: -		pr_warn("Failed to open cpu mask file %s: %d\n", fcpu, err);
1: -		return err;
1: -	}
1: -	len = read(fd, buf, sizeof(buf));
1: -	close(fd);
1: -	if (len <= 0) {
1: -		err = len ? -errno : -EINVAL;
1: -		pr_warn("Failed to read cpu mask from %s: %d\n", fcpu, err);
1: -		return err;
1: -	}
1: -	if (len >= sizeof(buf)) {
1: -		pr_warn("CPU mask is too big in file %s\n", fcpu);
1: -		return -E2BIG;
1: -	}
1: -	buf[len] = '\0';
1: -
1: -	return parse_cpu_mask_str(buf, mask, mask_sz);
1: -}
1: -
1: -int libbpf_num_possible_cpus(void)
1: -{
1: -	static const char *fcpu = "/sys/devices/system/cpu/possible";
1: -	static int cpus;
1: -	int err, n, i, tmp_cpus;
1: -	bool *mask;
1: -
1: -	tmp_cpus = READ_ONCE(cpus);
1: -	if (tmp_cpus > 0)
1: -		return tmp_cpus;
1: -
1: -	err = parse_cpu_mask_file(fcpu, &mask, &n);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	tmp_cpus = 0;
1: -	for (i = 0; i < n; i++) {
1: -		if (mask[i])
1: -			tmp_cpus++;
1: -	}
1: -	free(mask);
1: -
1: -	WRITE_ONCE(cpus, tmp_cpus);
1: -	return tmp_cpus;
1: +  free(*mask);
1: +  *mask = NULL;
1: +  return err;
1: +}
1: +
1: +int parse_cpu_mask_file(const char *fcpu, bool **mask, int *mask_sz) {
1: +  int fd, err = 0, len;
1: +  char buf[128];
1: +
1: +  fd = open(fcpu, O_RDONLY);
1: +  if (fd < 0) {
1: +    err = -errno;
1: +    pr_warn("Failed to open cpu mask file %s: %d\n", fcpu, err);
1: +    return err;
1: +  }
1: +  len = read(fd, buf, sizeof(buf));
1: +  close(fd);
1: +  if (len <= 0) {
1: +    err = len ? -errno : -EINVAL;
1: +    pr_warn("Failed to read cpu mask from %s: %d\n", fcpu, err);
1: +    return err;
1: +  }
1: +  if (len >= sizeof(buf)) {
1: +    pr_warn("CPU mask is too big in file %s\n", fcpu);
1: +    return -E2BIG;
1: +  }
1: +  buf[len] = '\0';
1: +
1: +  return parse_cpu_mask_str(buf, mask, mask_sz);
1: +}
1: +
1: +int libbpf_num_possible_cpus(void) {
1: +  static const char *fcpu = "/sys/devices/system/cpu/possible";
1: +  static int cpus;
1: +  int err, n, i, tmp_cpus;
1: +  bool *mask;
1: +
1: +  tmp_cpus = READ_ONCE(cpus);
1: +  if (tmp_cpus > 0)
1: +    return tmp_cpus;
1: +
1: +  err = parse_cpu_mask_file(fcpu, &mask, &n);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  tmp_cpus = 0;
1: +  for (i = 0; i < n; i++) {
1: +    if (mask[i])
1: +      tmp_cpus++;
1: +  }
1: +  free(mask);
1: +
1: +  WRITE_ONCE(cpus, tmp_cpus);
1: +  return tmp_cpus;
1:  }
1:  
1:  int bpf_object__open_skeleton(struct bpf_object_skeleton *s,
1: -			      const struct bpf_object_open_opts *opts)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_object_open_opts, skel_opts,
1: -		.object_name = s->name,
1: -	);
1: -	struct bpf_object *obj;
1: -	int i, err;
1: -
1: -	/* Attempt to preserve opts->object_name, unless overriden by user
1: -	 * explicitly. Overwriting object name for skeletons is discouraged,
1: -	 * as it breaks global data maps, because they contain object name
1: -	 * prefix as their own map name prefix. When skeleton is generated,
1: -	 * bpftool is making an assumption that this name will stay the same.
1: -	 */
1: -	if (opts) {
1: -		memcpy(&skel_opts, opts, sizeof(*opts));
1: -		if (!opts->object_name)
1: -			skel_opts.object_name = s->name;
1: -	}
1: -
1: -	obj = bpf_object__open_mem(s->data, s->data_sz, &skel_opts);
1: -	err = libbpf_get_error(obj);
1: -	if (err) {
1: -		pr_warn("failed to initialize skeleton BPF object '%s': %d\n",
1: -			s->name, err);
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	*s->obj = obj;
1: -
1: -	for (i = 0; i < s->map_cnt; i++) {
1: -		struct bpf_map **map = s->maps[i].map;
1: -		const char *name = s->maps[i].name;
1: -		void **mmaped = s->maps[i].mmaped;
1: -
1: -		*map = bpf_object__find_map_by_name(obj, name);
1: -		if (!*map) {
1: -			pr_warn("failed to find skeleton map '%s'\n", name);
1: -			return libbpf_err(-ESRCH);
1: -		}
1: -
1: -		/* externs shouldn't be pre-setup from user code */
1: -		if (mmaped && (*map)->libbpf_type != LIBBPF_MAP_KCONFIG)
1: -			*mmaped = (*map)->mmaped;
1: -	}
1: -
1: -	for (i = 0; i < s->prog_cnt; i++) {
1: -		struct bpf_program **prog = s->progs[i].prog;
1: -		const char *name = s->progs[i].name;
1: -
1: -		*prog = bpf_object__find_program_by_name(obj, name);
1: -		if (!*prog) {
1: -			pr_warn("failed to find skeleton program '%s'\n", name);
1: -			return libbpf_err(-ESRCH);
1: -		}
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -int bpf_object__load_skeleton(struct bpf_object_skeleton *s)
1: -{
1: -	int i, err;
1: -
1: -	err = bpf_object__load(*s->obj);
1: -	if (err) {
1: -		pr_warn("failed to load BPF skeleton '%s': %d\n", s->name, err);
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	for (i = 0; i < s->map_cnt; i++) {
1: -		struct bpf_map *map = *s->maps[i].map;
1: -		size_t mmap_sz = bpf_map_mmap_sz(map);
1: -		int prot, map_fd = bpf_map__fd(map);
1: -		void **mmaped = s->maps[i].mmaped;
1: -
1: -		if (!mmaped)
1: -			continue;
1: -
1: -		if (!(map->def.map_flags & BPF_F_MMAPABLE)) {
1: -			*mmaped = NULL;
1: -			continue;
1: -		}
1: -
1: -		if (map->def.map_flags & BPF_F_RDONLY_PROG)
1: -			prot = PROT_READ;
1: -		else
1: -			prot = PROT_READ | PROT_WRITE;
1: -
1: -		/* Remap anonymous mmap()-ed "map initialization image" as
1: -		 * a BPF map-backed mmap()-ed memory, but preserving the same
1: -		 * memory address. This will cause kernel to change process'
1: -		 * page table to point to a different piece of kernel memory,
1: -		 * but from userspace point of view memory address (and its
1: -		 * contents, being identical at this point) will stay the
1: -		 * same. This mapping will be released by bpf_object__close()
1: -		 * as per normal clean up procedure, so we don't need to worry
1: -		 * about it from skeleton's clean up perspective.
1: -		 */
1: -		*mmaped = mmap(map->mmaped, mmap_sz, prot,
1: -				MAP_SHARED | MAP_FIXED, map_fd, 0);
1: -		if (*mmaped == MAP_FAILED) {
1: -			err = -errno;
1: -			*mmaped = NULL;
1: -			pr_warn("failed to re-mmap() map '%s': %d\n",
1: -				 bpf_map__name(map), err);
1: -			return libbpf_err(err);
1: -		}
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -int bpf_object__attach_skeleton(struct bpf_object_skeleton *s)
1: -{
1: -	int i, err;
1: -
1: -	for (i = 0; i < s->prog_cnt; i++) {
1: -		struct bpf_program *prog = *s->progs[i].prog;
1: -		struct bpf_link **link = s->progs[i].link;
1: -		const struct bpf_sec_def *sec_def;
1: -
1: -		if (!prog->load)
1: -			continue;
1: -
1: -		sec_def = find_sec_def(prog->sec_name);
1: -		if (!sec_def || !sec_def->attach_fn)
1: -			continue;
1: -
1: -		*link = sec_def->attach_fn(sec_def, prog);
1: -		err = libbpf_get_error(*link);
1: -		if (err) {
1: -			pr_warn("failed to auto-attach program '%s': %d\n",
1: -				bpf_program__name(prog), err);
1: -			return libbpf_err(err);
1: -		}
1: -	}
1: -
1: -	return 0;
1: -}
1: -
1: -void bpf_object__detach_skeleton(struct bpf_object_skeleton *s)
1: -{
1: -	int i;
1: -
1: -	for (i = 0; i < s->prog_cnt; i++) {
1: -		struct bpf_link **link = s->progs[i].link;
1: -
1: -		bpf_link__destroy(*link);
1: -		*link = NULL;
1: -	}
1: -}
1: -
1: -void bpf_object__destroy_skeleton(struct bpf_object_skeleton *s)
1: -{
1: -	if (s->progs)
1: -		bpf_object__detach_skeleton(s);
1: -	if (s->obj)
1: -		bpf_object__close(*s->obj);
1: -	free(s->maps);
1: -	free(s->progs);
1: -	free(s);
1: +                              const struct bpf_object_open_opts *opts) {
1: +  DECLARE_LIBBPF_OPTS(bpf_object_open_opts, skel_opts,
1: +                      .object_name = s->name, );
1: +  struct bpf_object *obj;
1: +  int i, err;
1: +
1: +  /* Attempt to preserve opts->object_name, unless overriden by user
1: +   * explicitly. Overwriting object name for skeletons is discouraged,
1: +   * as it breaks global data maps, because they contain object name
1: +   * prefix as their own map name prefix. When skeleton is generated,
1: +   * bpftool is making an assumption that this name will stay the same.
1: +   */
1: +  if (opts) {
1: +    memcpy(&skel_opts, opts, sizeof(*opts));
1: +    if (!opts->object_name)
1: +      skel_opts.object_name = s->name;
1: +  }
1: +
1: +  obj = bpf_object__open_mem(s->data, s->data_sz, &skel_opts);
1: +  err = libbpf_get_error(obj);
1: +  if (err) {
1: +    pr_warn("failed to initialize skeleton BPF object '%s': %d\n", s->name,
1: +            err);
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  *s->obj = obj;
1: +
1: +  for (i = 0; i < s->map_cnt; i++) {
1: +    struct bpf_map **map = s->maps[i].map;
1: +    const char *name = s->maps[i].name;
1: +    void **mmaped = s->maps[i].mmaped;
1: +
1: +    *map = bpf_object__find_map_by_name(obj, name);
1: +    if (!*map) {
1: +      pr_warn("failed to find skeleton map '%s'\n", name);
1: +      return libbpf_err(-ESRCH);
1: +    }
1: +
1: +    /* externs shouldn't be pre-setup from user code */
1: +    if (mmaped && (*map)->libbpf_type != LIBBPF_MAP_KCONFIG)
1: +      *mmaped = (*map)->mmaped;
1: +  }
1: +
1: +  for (i = 0; i < s->prog_cnt; i++) {
1: +    struct bpf_program **prog = s->progs[i].prog;
1: +    const char *name = s->progs[i].name;
1: +
1: +    *prog = bpf_object__find_program_by_name(obj, name);
1: +    if (!*prog) {
1: +      pr_warn("failed to find skeleton program '%s'\n", name);
1: +      return libbpf_err(-ESRCH);
1: +    }
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +int bpf_object__load_skeleton(struct bpf_object_skeleton *s) {
1: +  int i, err;
1: +
1: +  err = bpf_object__load(*s->obj);
1: +  if (err) {
1: +    pr_warn("failed to load BPF skeleton '%s': %d\n", s->name, err);
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  for (i = 0; i < s->map_cnt; i++) {
1: +    struct bpf_map *map = *s->maps[i].map;
1: +    size_t mmap_sz = bpf_map_mmap_sz(map);
1: +    int prot, map_fd = bpf_map__fd(map);
1: +    void **mmaped = s->maps[i].mmaped;
1: +
1: +    if (!mmaped)
1: +      continue;
1: +
1: +    if (!(map->def.map_flags & BPF_F_MMAPABLE)) {
1: +      *mmaped = NULL;
1: +      continue;
1: +    }
1: +
1: +    if (map->def.map_flags & BPF_F_RDONLY_PROG)
1: +      prot = PROT_READ;
1: +    else
1: +      prot = PROT_READ | PROT_WRITE;
1: +
1: +    /* Remap anonymous mmap()-ed "map initialization image" as
1: +     * a BPF map-backed mmap()-ed memory, but preserving the same
1: +     * memory address. This will cause kernel to change process'
1: +     * page table to point to a different piece of kernel memory,
1: +     * but from userspace point of view memory address (and its
1: +     * contents, being identical at this point) will stay the
1: +     * same. This mapping will be released by bpf_object__close()
1: +     * as per normal clean up procedure, so we don't need to worry
1: +     * about it from skeleton's clean up perspective.
1: +     */
1: +    *mmaped =
1: +        mmap(map->mmaped, mmap_sz, prot, MAP_SHARED | MAP_FIXED, map_fd, 0);
1: +    if (*mmaped == MAP_FAILED) {
1: +      err = -errno;
1: +      *mmaped = NULL;
1: +      pr_warn("failed to re-mmap() map '%s': %d\n", bpf_map__name(map), err);
1: +      return libbpf_err(err);
1: +    }
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +int bpf_object__attach_skeleton(struct bpf_object_skeleton *s) {
1: +  int i, err;
1: +
1: +  for (i = 0; i < s->prog_cnt; i++) {
1: +    struct bpf_program *prog = *s->progs[i].prog;
1: +    struct bpf_link **link = s->progs[i].link;
1: +    const struct bpf_sec_def *sec_def;
1: +
1: +    if (!prog->load)
1: +      continue;
1: +
1: +    sec_def = find_sec_def(prog->sec_name);
1: +    if (!sec_def || !sec_def->attach_fn)
1: +      continue;
1: +
1: +    *link = sec_def->attach_fn(sec_def, prog);
1: +    err = libbpf_get_error(*link);
1: +    if (err) {
1: +      pr_warn("failed to auto-attach program '%s': %d\n",
1: +              bpf_program__name(prog), err);
1: +      return libbpf_err(err);
1: +    }
1: +  }
1: +
1: +  return 0;
1: +}
1: +
1: +void bpf_object__detach_skeleton(struct bpf_object_skeleton *s) {
1: +  int i;
1: +
1: +  for (i = 0; i < s->prog_cnt; i++) {
1: +    struct bpf_link **link = s->progs[i].link;
1: +
1: +    bpf_link__destroy(*link);
1: +    *link = NULL;
1: +  }
1: +}
1: +
1: +void bpf_object__destroy_skeleton(struct bpf_object_skeleton *s) {
1: +  if (s->progs)
1: +    bpf_object__detach_skeleton(s);
1: +  if (s->obj)
1: +    bpf_object__close(*s->obj);
1: +  free(s->maps);
1: +  free(s->progs);
1: +  free(s);
1:  }
1: diff --git a/src/cc/libbpf/src/libbpf.h b/src/cc/libbpf/src/libbpf.h
1: index 6e61342b..e3574f7a 100644
1: --- a/src/cc/libbpf/src/libbpf.h
1: +++ b/src/cc/libbpf/src/libbpf.h
1: @@ -10,12 +10,12 @@
1:  #ifndef __LIBBPF_LIBBPF_H
1:  #define __LIBBPF_LIBBPF_H
1:  
1: +#include <linux/bpf.h>
1:  #include <stdarg.h>
1: -#include <stdio.h>
1: -#include <stdint.h>
1:  #include <stdbool.h>
1: +#include <stdint.h>
1: +#include <stdio.h>
1:  #include <sys/types.h>  // for size_t
1: -#include <linux/bpf.h>
1:  
1:  #include "libbpf_common.h"
1:  #include "libbpf_legacy.h"
1: @@ -25,36 +25,36 @@ extern "C" {
1:  #endif
1:  
1:  enum libbpf_errno {
1: -	__LIBBPF_ERRNO__START = 4000,
1: -
1: -	/* Something wrong in libelf */
1: -	LIBBPF_ERRNO__LIBELF = __LIBBPF_ERRNO__START,
1: -	LIBBPF_ERRNO__FORMAT,	/* BPF object format invalid */
1: -	LIBBPF_ERRNO__KVERSION,	/* Incorrect or no 'version' section */
1: -	LIBBPF_ERRNO__ENDIAN,	/* Endian mismatch */
1: -	LIBBPF_ERRNO__INTERNAL,	/* Internal error in libbpf */
1: -	LIBBPF_ERRNO__RELOC,	/* Relocation failed */
1: -	LIBBPF_ERRNO__LOAD,	/* Load program failure for unknown reason */
1: -	LIBBPF_ERRNO__VERIFY,	/* Kernel verifier blocks program loading */
1: -	LIBBPF_ERRNO__PROG2BIG,	/* Program too big */
1: -	LIBBPF_ERRNO__KVER,	/* Incorrect kernel version */
1: -	LIBBPF_ERRNO__PROGTYPE,	/* Kernel doesn't support this program type */
1: -	LIBBPF_ERRNO__WRNGPID,	/* Wrong pid in netlink message */
1: -	LIBBPF_ERRNO__INVSEQ,	/* Invalid netlink sequence */
1: -	LIBBPF_ERRNO__NLPARSE,	/* netlink parsing error */
1: -	__LIBBPF_ERRNO__END,
1: +  __LIBBPF_ERRNO__START = 4000,
1: +
1: +  /* Something wrong in libelf */
1: +  LIBBPF_ERRNO__LIBELF = __LIBBPF_ERRNO__START,
1: +  LIBBPF_ERRNO__FORMAT,   /* BPF object format invalid */
1: +  LIBBPF_ERRNO__KVERSION, /* Incorrect or no 'version' section */
1: +  LIBBPF_ERRNO__ENDIAN,   /* Endian mismatch */
1: +  LIBBPF_ERRNO__INTERNAL, /* Internal error in libbpf */
1: +  LIBBPF_ERRNO__RELOC,    /* Relocation failed */
1: +  LIBBPF_ERRNO__LOAD,     /* Load program failure for unknown reason */
1: +  LIBBPF_ERRNO__VERIFY,   /* Kernel verifier blocks program loading */
1: +  LIBBPF_ERRNO__PROG2BIG, /* Program too big */
1: +  LIBBPF_ERRNO__KVER,     /* Incorrect kernel version */
1: +  LIBBPF_ERRNO__PROGTYPE, /* Kernel doesn't support this program type */
1: +  LIBBPF_ERRNO__WRNGPID,  /* Wrong pid in netlink message */
1: +  LIBBPF_ERRNO__INVSEQ,   /* Invalid netlink sequence */
1: +  LIBBPF_ERRNO__NLPARSE,  /* netlink parsing error */
1: +  __LIBBPF_ERRNO__END,
1:  };
1:  
1:  LIBBPF_API int libbpf_strerror(int err, char *buf, size_t size);
1:  
1:  enum libbpf_print_level {
1: -        LIBBPF_WARN,
1: -        LIBBPF_INFO,
1: -        LIBBPF_DEBUG,
1: +  LIBBPF_WARN,
1: +  LIBBPF_INFO,
1: +  LIBBPF_DEBUG,
1:  };
1:  
1: -typedef int (*libbpf_print_fn_t)(enum libbpf_print_level level,
1: -				 const char *, va_list ap);
1: +typedef int (*libbpf_print_fn_t)(enum libbpf_print_level level, const char *,
1: +                                 va_list ap);
1:  
1:  LIBBPF_API libbpf_print_fn_t libbpf_set_print(libbpf_print_fn_t fn);
1:  
1: @@ -62,59 +62,59 @@ LIBBPF_API libbpf_print_fn_t libbpf_set_print(libbpf_print_fn_t fn);
1:  struct bpf_object;
1:  
1:  struct bpf_object_open_attr {
1: -	const char *file;
1: -	enum bpf_prog_type prog_type;
1: +  const char *file;
1: +  enum bpf_prog_type prog_type;
1:  };
1:  
1:  struct bpf_object_open_opts {
1: -	/* size of this struct, for forward/backward compatiblity */
1: -	size_t sz;
1: -	/* object name override, if provided:
1: -	 * - for object open from file, this will override setting object
1: -	 *   name from file path's base name;
1: -	 * - for object open from memory buffer, this will specify an object
1: -	 *   name and will override default "<addr>-<buf-size>" name;
1: -	 */
1: -	const char *object_name;
1: -	/* parse map definitions non-strictly, allowing extra attributes/data */
1: -	bool relaxed_maps;
1: -	/* DEPRECATED: handle CO-RE relocations non-strictly, allowing failures.
1: -	 * Value is ignored. Relocations always are processed non-strictly.
1: -	 * Non-relocatable instructions are replaced with invalid ones to
1: -	 * prevent accidental errors.
1: -	 * */
1: -	bool relaxed_core_relocs;
1: -	/* maps that set the 'pinning' attribute in their definition will have
1: -	 * their pin_path attribute set to a file in this directory, and be
1: -	 * auto-pinned to that path on load; defaults to "/sys/fs/bpf".
1: -	 */
1: -	const char *pin_root_path;
1: -	__u32 attach_prog_fd;
1: -	/* Additional kernel config content that augments and overrides
1: -	 * system Kconfig for CONFIG_xxx externs.
1: -	 */
1: -	const char *kconfig;
1: +  /* size of this struct, for forward/backward compatiblity */
1: +  size_t sz;
1: +  /* object name override, if provided:
1: +   * - for object open from file, this will override setting object
1: +   *   name from file path's base name;
1: +   * - for object open from memory buffer, this will specify an object
1: +   *   name and will override default "<addr>-<buf-size>" name;
1: +   */
1: +  const char *object_name;
1: +  /* parse map definitions non-strictly, allowing extra attributes/data */
1: +  bool relaxed_maps;
1: +  /* DEPRECATED: handle CO-RE relocations non-strictly, allowing failures.
1: +   * Value is ignored. Relocations always are processed non-strictly.
1: +   * Non-relocatable instructions are replaced with invalid ones to
1: +   * prevent accidental errors.
1: +   * */
1: +  bool relaxed_core_relocs;
1: +  /* maps that set the 'pinning' attribute in their definition will have
1: +   * their pin_path attribute set to a file in this directory, and be
1: +   * auto-pinned to that path on load; defaults to "/sys/fs/bpf".
1: +   */
1: +  const char *pin_root_path;
1: +  __u32 attach_prog_fd;
1: +  /* Additional kernel config content that augments and overrides
1: +   * system Kconfig for CONFIG_xxx externs.
1: +   */
1: +  const char *kconfig;
1:  };
1:  #define bpf_object_open_opts__last_field kconfig
1:  
1:  LIBBPF_API struct bpf_object *bpf_object__open(const char *path);
1: -LIBBPF_API struct bpf_object *
1: -bpf_object__open_file(const char *path, const struct bpf_object_open_opts *opts);
1: -LIBBPF_API struct bpf_object *
1: -bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz,
1: -		     const struct bpf_object_open_opts *opts);
1: +LIBBPF_API struct bpf_object *bpf_object__open_file(
1: +    const char *path, const struct bpf_object_open_opts *opts);
1: +LIBBPF_API struct bpf_object *bpf_object__open_mem(
1: +    const void *obj_buf, size_t obj_buf_sz,
1: +    const struct bpf_object_open_opts *opts);
1:  
1:  /* deprecated bpf_object__open variants */
1: -LIBBPF_API struct bpf_object *
1: -bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz,
1: -			const char *name);
1: -LIBBPF_API struct bpf_object *
1: -bpf_object__open_xattr(struct bpf_object_open_attr *attr);
1: +LIBBPF_API struct bpf_object *bpf_object__open_buffer(const void *obj_buf,
1: +                                                      size_t obj_buf_sz,
1: +                                                      const char *name);
1: +LIBBPF_API struct bpf_object *bpf_object__open_xattr(
1: +    struct bpf_object_open_attr *attr);
1:  
1:  enum libbpf_pin_type {
1: -	LIBBPF_PIN_NONE,
1: -	/* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
1: -	LIBBPF_PIN_BY_NAME,
1: +  LIBBPF_PIN_NONE,
1: +  /* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
1: +  LIBBPF_PIN_BY_NAME,
1:  };
1:  
1:  /* pin_maps and unpin_maps can both be called with a NULL path, in which case
1: @@ -122,19 +122,18 @@ enum libbpf_pin_type {
1:   * don't have a pin_path set).
1:   */
1:  LIBBPF_API int bpf_object__pin_maps(struct bpf_object *obj, const char *path);
1: -LIBBPF_API int bpf_object__unpin_maps(struct bpf_object *obj,
1: -				      const char *path);
1: +LIBBPF_API int bpf_object__unpin_maps(struct bpf_object *obj, const char *path);
1:  LIBBPF_API int bpf_object__pin_programs(struct bpf_object *obj,
1: -					const char *path);
1: +                                        const char *path);
1:  LIBBPF_API int bpf_object__unpin_programs(struct bpf_object *obj,
1: -					  const char *path);
1: +                                          const char *path);
1:  LIBBPF_API int bpf_object__pin(struct bpf_object *object, const char *path);
1:  LIBBPF_API void bpf_object__close(struct bpf_object *object);
1:  
1:  struct bpf_object_load_attr {
1: -	struct bpf_object *obj;
1: -	int log_level;
1: -	const char *target_btf_path;
1: +  struct bpf_object *obj;
1: +  int log_level;
1: +  const char *target_btf_path;
1:  };
1:  
1:  /* Load/unload object into/from kernel */
1: @@ -144,80 +143,78 @@ LIBBPF_API int bpf_object__unload(struct bpf_object *obj);
1:  
1:  LIBBPF_API const char *bpf_object__name(const struct bpf_object *obj);
1:  LIBBPF_API unsigned int bpf_object__kversion(const struct bpf_object *obj);
1: -LIBBPF_API int bpf_object__set_kversion(struct bpf_object *obj, __u32 kern_version);
1: +LIBBPF_API int bpf_object__set_kversion(struct bpf_object *obj,
1: +                                        __u32 kern_version);
1:  
1:  struct btf;
1:  LIBBPF_API struct btf *bpf_object__btf(const struct bpf_object *obj);
1:  LIBBPF_API int bpf_object__btf_fd(const struct bpf_object *obj);
1:  
1: -LIBBPF_API struct bpf_program *
1: -bpf_object__find_program_by_title(const struct bpf_object *obj,
1: -				  const char *title);
1: -LIBBPF_API struct bpf_program *
1: -bpf_object__find_program_by_name(const struct bpf_object *obj,
1: -				 const char *name);
1: +LIBBPF_API struct bpf_program *bpf_object__find_program_by_title(
1: +    const struct bpf_object *obj, const char *title);
1: +LIBBPF_API struct bpf_program *bpf_object__find_program_by_name(
1: +    const struct bpf_object *obj, const char *name);
1:  
1:  LIBBPF_API struct bpf_object *bpf_object__next(struct bpf_object *prev);
1: -#define bpf_object__for_each_safe(pos, tmp)			\
1: -	for ((pos) = bpf_object__next(NULL),		\
1: -		(tmp) = bpf_object__next(pos);		\
1: -	     (pos) != NULL;				\
1: -	     (pos) = (tmp), (tmp) = bpf_object__next(tmp))
1: +#define bpf_object__for_each_safe(pos, tmp)                           \
1: +  for ((pos) = bpf_object__next(NULL), (tmp) = bpf_object__next(pos); \
1: +       (pos) != NULL; (pos) = (tmp), (tmp) = bpf_object__next(tmp))
1:  
1:  typedef void (*bpf_object_clear_priv_t)(struct bpf_object *, void *);
1:  LIBBPF_API int bpf_object__set_priv(struct bpf_object *obj, void *priv,
1: -				    bpf_object_clear_priv_t clear_priv);
1: +                                    bpf_object_clear_priv_t clear_priv);
1:  LIBBPF_API void *bpf_object__priv(const struct bpf_object *prog);
1:  
1: -LIBBPF_API int
1: -libbpf_prog_type_by_name(const char *name, enum bpf_prog_type *prog_type,
1: -			 enum bpf_attach_type *expected_attach_type);
1: +LIBBPF_API int libbpf_prog_type_by_name(
1: +    const char *name, enum bpf_prog_type *prog_type,
1: +    enum bpf_attach_type *expected_attach_type);
1:  LIBBPF_API int libbpf_attach_type_by_name(const char *name,
1: -					  enum bpf_attach_type *attach_type);
1: +                                          enum bpf_attach_type *attach_type);
1:  LIBBPF_API int libbpf_find_vmlinux_btf_id(const char *name,
1: -					  enum bpf_attach_type attach_type);
1: +                                          enum bpf_attach_type attach_type);
1:  
1:  /* Accessors of bpf_program */
1:  struct bpf_program;
1:  LIBBPF_API struct bpf_program *bpf_program__next(struct bpf_program *prog,
1: -						 const struct bpf_object *obj);
1: +                                                 const struct bpf_object *obj);
1:  
1: -#define bpf_object__for_each_program(pos, obj)		\
1: -	for ((pos) = bpf_program__next(NULL, (obj));	\
1: -	     (pos) != NULL;				\
1: -	     (pos) = bpf_program__next((pos), (obj)))
1: +#define bpf_object__for_each_program(pos, obj)                \
1: +  for ((pos) = bpf_program__next(NULL, (obj)); (pos) != NULL; \
1: +       (pos) = bpf_program__next((pos), (obj)))
1:  
1:  LIBBPF_API struct bpf_program *bpf_program__prev(struct bpf_program *prog,
1: -						 const struct bpf_object *obj);
1: +                                                 const struct bpf_object *obj);
1:  
1:  typedef void (*bpf_program_clear_priv_t)(struct bpf_program *, void *);
1:  
1:  LIBBPF_API int bpf_program__set_priv(struct bpf_program *prog, void *priv,
1: -				     bpf_program_clear_priv_t clear_priv);
1: +                                     bpf_program_clear_priv_t clear_priv);
1:  
1:  LIBBPF_API void *bpf_program__priv(const struct bpf_program *prog);
1:  LIBBPF_API void bpf_program__set_ifindex(struct bpf_program *prog,
1: -					 __u32 ifindex);
1: +                                         __u32 ifindex);
1:  
1:  LIBBPF_API const char *bpf_program__name(const struct bpf_program *prog);
1: -LIBBPF_API const char *bpf_program__section_name(const struct bpf_program *prog);
1: -LIBBPF_API LIBBPF_DEPRECATED("BPF program title is confusing term; please use bpf_program__section_name() instead")
1: -const char *bpf_program__title(const struct bpf_program *prog, bool needs_copy);
1: +LIBBPF_API const char *bpf_program__section_name(
1: +    const struct bpf_program *prog);
1: +LIBBPF_API LIBBPF_DEPRECATED(
1: +    "BPF program title is confusing term; please use "
1: +    "bpf_program__section_name() instead") const
1: +    char *bpf_program__title(const struct bpf_program *prog, bool needs_copy);
1:  LIBBPF_API bool bpf_program__autoload(const struct bpf_program *prog);
1: -LIBBPF_API int bpf_program__set_autoload(struct bpf_program *prog, bool autoload);
1: +LIBBPF_API int bpf_program__set_autoload(struct bpf_program *prog,
1: +                                         bool autoload);
1:  
1:  /* returns program size in bytes */
1:  LIBBPF_API size_t bpf_program__size(const struct bpf_program *prog);
1:  
1:  LIBBPF_API int bpf_program__load(struct bpf_program *prog, char *license,
1: -				 __u32 kern_version);
1: +                                 __u32 kern_version);
1:  LIBBPF_API int bpf_program__fd(const struct bpf_program *prog);
1:  LIBBPF_API int bpf_program__pin_instance(struct bpf_program *prog,
1: -					 const char *path,
1: -					 int instance);
1: +                                         const char *path, int instance);
1:  LIBBPF_API int bpf_program__unpin_instance(struct bpf_program *prog,
1: -					   const char *path,
1: -					   int instance);
1: +                                           const char *path, int instance);
1:  LIBBPF_API int bpf_program__pin(struct bpf_program *prog, const char *path);
1:  LIBBPF_API int bpf_program__unpin(struct bpf_program *prog, const char *path);
1:  LIBBPF_API void bpf_program__unload(struct bpf_program *prog);
1: @@ -230,57 +227,49 @@ LIBBPF_API const char *bpf_link__pin_path(const struct bpf_link *link);
1:  LIBBPF_API int bpf_link__pin(struct bpf_link *link, const char *path);
1:  LIBBPF_API int bpf_link__unpin(struct bpf_link *link);
1:  LIBBPF_API int bpf_link__update_program(struct bpf_link *link,
1: -					struct bpf_program *prog);
1: +                                        struct bpf_program *prog);
1:  LIBBPF_API void bpf_link__disconnect(struct bpf_link *link);
1:  LIBBPF_API int bpf_link__detach(struct bpf_link *link);
1:  LIBBPF_API int bpf_link__destroy(struct bpf_link *link);
1:  
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach(struct bpf_program *prog);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_perf_event(struct bpf_program *prog, int pfd);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_kprobe(struct bpf_program *prog, bool retprobe,
1: -			   const char *func_name);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_uprobe(struct bpf_program *prog, bool retprobe,
1: -			   pid_t pid, const char *binary_path,
1: -			   size_t func_offset);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_tracepoint(struct bpf_program *prog,
1: -			       const char *tp_category,
1: -			       const char *tp_name);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_raw_tracepoint(struct bpf_program *prog,
1: -				   const char *tp_name);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_trace(struct bpf_program *prog);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_lsm(struct bpf_program *prog);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_cgroup(struct bpf_program *prog, int cgroup_fd);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_netns(struct bpf_program *prog, int netns_fd);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_xdp(struct bpf_program *prog, int ifindex);
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_freplace(struct bpf_program *prog,
1: -			     int target_fd, const char *attach_func_name);
1: +LIBBPF_API struct bpf_link *bpf_program__attach(struct bpf_program *prog);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_perf_event(
1: +    struct bpf_program *prog, int pfd);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog,
1: +                                                       bool retprobe,
1: +                                                       const char *func_name);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_uprobe(struct bpf_program *prog,
1: +                                                       bool retprobe, pid_t pid,
1: +                                                       const char *binary_path,
1: +                                                       size_t func_offset);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_tracepoint(
1: +    struct bpf_program *prog, const char *tp_category, const char *tp_name);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_raw_tracepoint(
1: +    struct bpf_program *prog, const char *tp_name);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_trace(struct bpf_program *prog);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_lsm(struct bpf_program *prog);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_cgroup(struct bpf_program *prog,
1: +                                                       int cgroup_fd);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_netns(struct bpf_program *prog,
1: +                                                      int netns_fd);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_xdp(struct bpf_program *prog,
1: +                                                    int ifindex);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_freplace(
1: +    struct bpf_program *prog, int target_fd, const char *attach_func_name);
1:  
1:  struct bpf_map;
1:  
1:  LIBBPF_API struct bpf_link *bpf_map__attach_struct_ops(struct bpf_map *map);
1:  
1:  struct bpf_iter_attach_opts {
1: -	size_t sz; /* size of this struct for forward/backward compatibility */
1: -	union bpf_iter_link_info *link_info;
1: -	__u32 link_info_len;
1: +  size_t sz; /* size of this struct for forward/backward compatibility */
1: +  union bpf_iter_link_info *link_info;
1: +  __u32 link_info_len;
1:  };
1:  #define bpf_iter_attach_opts__last_field link_info_len
1:  
1: -LIBBPF_API struct bpf_link *
1: -bpf_program__attach_iter(struct bpf_program *prog,
1: -			 const struct bpf_iter_attach_opts *opts);
1: +LIBBPF_API struct bpf_link *bpf_program__attach_iter(
1: +    struct bpf_program *prog, const struct bpf_iter_attach_opts *opts);
1:  
1:  struct bpf_insn;
1:  
1: @@ -314,15 +303,15 @@ struct bpf_insn;
1:   */
1:  
1:  struct bpf_prog_prep_result {
1: -	/*
1: -	 * If not NULL, load new instruction array.
1: -	 * If set to NULL, don't load this instance.
1: -	 */
1: -	struct bpf_insn *new_insn_ptr;
1: -	int new_insn_cnt;
1: -
1: -	/* If not NULL, result FD is written to it. */
1: -	int *pfd;
1: +  /*
1: +   * If not NULL, load new instruction array.
1: +   * If set to NULL, don't load this instance.
1: +   */
1: +  struct bpf_insn *new_insn_ptr;
1: +  int new_insn_cnt;
1: +
1: +  /* If not NULL, result FD is written to it. */
1: +  int *pfd;
1:  };
1:  
1:  /*
1: @@ -338,11 +327,11 @@ struct bpf_prog_prep_result {
1:   *  - Non-zero:	pre-processing error, stop loading.
1:   */
1:  typedef int (*bpf_program_prep_t)(struct bpf_program *prog, int n,
1: -				  struct bpf_insn *insns, int insns_cnt,
1: -				  struct bpf_prog_prep_result *res);
1: +                                  struct bpf_insn *insns, int insns_cnt,
1: +                                  struct bpf_prog_prep_result *res);
1:  
1:  LIBBPF_API int bpf_program__set_prep(struct bpf_program *prog, int nr_instance,
1: -				     bpf_program_prep_t prep);
1: +                                     bpf_program_prep_t prep);
1:  
1:  LIBBPF_API int bpf_program__nth_fd(const struct bpf_program *prog, int n);
1:  
1: @@ -363,19 +352,19 @@ LIBBPF_API int bpf_program__set_struct_ops(struct bpf_program *prog);
1:  LIBBPF_API int bpf_program__set_extension(struct bpf_program *prog);
1:  LIBBPF_API int bpf_program__set_sk_lookup(struct bpf_program *prog);
1:  
1: -LIBBPF_API enum bpf_prog_type bpf_program__get_type(const struct bpf_program *prog);
1: +LIBBPF_API enum bpf_prog_type bpf_program__get_type(
1: +    const struct bpf_program *prog);
1:  LIBBPF_API void bpf_program__set_type(struct bpf_program *prog,
1: -				      enum bpf_prog_type type);
1: +                                      enum bpf_prog_type type);
1:  
1: -LIBBPF_API enum bpf_attach_type
1: -bpf_program__get_expected_attach_type(const struct bpf_program *prog);
1: -LIBBPF_API void
1: -bpf_program__set_expected_attach_type(struct bpf_program *prog,
1: -				      enum bpf_attach_type type);
1: +LIBBPF_API enum bpf_attach_type bpf_program__get_expected_attach_type(
1: +    const struct bpf_program *prog);
1: +LIBBPF_API void bpf_program__set_expected_attach_type(
1: +    struct bpf_program *prog, enum bpf_attach_type type);
1:  
1: -LIBBPF_API int
1: -bpf_program__set_attach_target(struct bpf_program *prog, int attach_prog_fd,
1: -			       const char *attach_func_name);
1: +LIBBPF_API int bpf_program__set_attach_target(struct bpf_program *prog,
1: +                                              int attach_prog_fd,
1: +                                              const char *attach_func_name);
1:  
1:  LIBBPF_API bool bpf_program__is_socket_filter(const struct bpf_program *prog);
1:  LIBBPF_API bool bpf_program__is_tracepoint(const struct bpf_program *prog);
1: @@ -398,40 +387,39 @@ LIBBPF_API bool bpf_program__is_sk_lookup(const struct bpf_program *prog);
1:   * if -Werror is set.
1:   */
1:  struct bpf_map_def {
1: -	unsigned int type;
1: -	unsigned int key_size;
1: -	unsigned int value_size;
1: -	unsigned int max_entries;
1: -	unsigned int map_flags;
1: +  unsigned int type;
1: +  unsigned int key_size;
1: +  unsigned int value_size;
1: +  unsigned int max_entries;
1: +  unsigned int map_flags;
1:  };
1:  
1:  /*
1:   * The 'struct bpf_map' in include/linux/bpf.h is internal to the kernel,
1:   * so no need to worry about a name clash.
1:   */
1: -LIBBPF_API struct bpf_map *
1: -bpf_object__find_map_by_name(const struct bpf_object *obj, const char *name);
1: +LIBBPF_API struct bpf_map *bpf_object__find_map_by_name(
1: +    const struct bpf_object *obj, const char *name);
1:  
1: -LIBBPF_API int
1: -bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name);
1: +LIBBPF_API int bpf_object__find_map_fd_by_name(const struct bpf_object *obj,
1: +                                               const char *name);
1:  
1:  /*
1:   * Get bpf_map through the offset of corresponding struct bpf_map_def
1:   * in the BPF object file.
1:   */
1: -LIBBPF_API struct bpf_map *
1: -bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset);
1: -
1: -LIBBPF_API struct bpf_map *
1: -bpf_map__next(const struct bpf_map *map, const struct bpf_object *obj);
1: -#define bpf_object__for_each_map(pos, obj)		\
1: -	for ((pos) = bpf_map__next(NULL, (obj));	\
1: -	     (pos) != NULL;				\
1: -	     (pos) = bpf_map__next((pos), (obj)))
1: +LIBBPF_API struct bpf_map *bpf_object__find_map_by_offset(
1: +    struct bpf_object *obj, size_t offset);
1: +
1: +LIBBPF_API struct bpf_map *bpf_map__next(const struct bpf_map *map,
1: +                                         const struct bpf_object *obj);
1: +#define bpf_object__for_each_map(pos, obj)                \
1: +  for ((pos) = bpf_map__next(NULL, (obj)); (pos) != NULL; \
1: +       (pos) = bpf_map__next((pos), (obj)))
1:  #define bpf_map__for_each bpf_object__for_each_map
1:  
1: -LIBBPF_API struct bpf_map *
1: -bpf_map__prev(const struct bpf_map *map, const struct bpf_object *obj);
1: +LIBBPF_API struct bpf_map *bpf_map__prev(const struct bpf_map *map,
1: +                                         const struct bpf_object *obj);
1:  
1:  /* get/set map FD */
1:  LIBBPF_API int bpf_map__fd(const struct bpf_map *map);
1: @@ -468,11 +456,12 @@ LIBBPF_API int bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex);
1:  
1:  typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);
1:  LIBBPF_API int bpf_map__set_priv(struct bpf_map *map, void *priv,
1: -				 bpf_map_clear_priv_t clear_priv);
1: +                                 bpf_map_clear_priv_t clear_priv);
1:  LIBBPF_API void *bpf_map__priv(const struct bpf_map *map);
1: -LIBBPF_API int bpf_map__set_initial_value(struct bpf_map *map,
1: -					  const void *data, size_t size);
1: -LIBBPF_API const void *bpf_map__initial_value(struct bpf_map *map, size_t *psize);
1: +LIBBPF_API int bpf_map__set_initial_value(struct bpf_map *map, const void *data,
1: +                                          size_t size);
1: +LIBBPF_API const void *bpf_map__initial_value(struct bpf_map *map,
1: +                                              size_t *psize);
1:  LIBBPF_API bool bpf_map__is_offload_neutral(const struct bpf_map *map);
1:  LIBBPF_API bool bpf_map__is_internal(const struct bpf_map *map);
1:  LIBBPF_API int bpf_map__set_pin_path(struct bpf_map *map, const char *path);
1: @@ -487,84 +476,83 @@ LIBBPF_API struct bpf_map *bpf_map__inner_map(struct bpf_map *map);
1:  LIBBPF_API long libbpf_get_error(const void *ptr);
1:  
1:  struct bpf_prog_load_attr {
1: -	const char *file;
1: -	enum bpf_prog_type prog_type;
1: -	enum bpf_attach_type expected_attach_type;
1: -	int ifindex;
1: -	int log_level;
1: -	int prog_flags;
1: +  const char *file;
1: +  enum bpf_prog_type prog_type;
1: +  enum bpf_attach_type expected_attach_type;
1: +  int ifindex;
1: +  int log_level;
1: +  int prog_flags;
1:  };
1:  
1:  LIBBPF_API int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,
1: -				   struct bpf_object **pobj, int *prog_fd);
1: +                                   struct bpf_object **pobj, int *prog_fd);
1:  LIBBPF_API int bpf_prog_load(const char *file, enum bpf_prog_type type,
1: -			     struct bpf_object **pobj, int *prog_fd);
1: +                             struct bpf_object **pobj, int *prog_fd);
1:  
1:  /* XDP related API */
1:  struct xdp_link_info {
1: -	__u32 prog_id;
1: -	__u32 drv_prog_id;
1: -	__u32 hw_prog_id;
1: -	__u32 skb_prog_id;
1: -	__u8 attach_mode;
1: +  __u32 prog_id;
1: +  __u32 drv_prog_id;
1: +  __u32 hw_prog_id;
1: +  __u32 skb_prog_id;
1: +  __u8 attach_mode;
1:  };
1:  
1:  struct bpf_xdp_set_link_opts {
1: -	size_t sz;
1: -	int old_fd;
1: -	size_t :0;
1: +  size_t sz;
1: +  int old_fd;
1: +  size_t : 0;
1:  };
1:  #define bpf_xdp_set_link_opts__last_field old_fd
1:  
1:  LIBBPF_API int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags);
1: -LIBBPF_API int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags,
1: -					const struct bpf_xdp_set_link_opts *opts);
1: +LIBBPF_API int bpf_set_link_xdp_fd_opts(
1: +    int ifindex, int fd, __u32 flags, const struct bpf_xdp_set_link_opts *opts);
1:  LIBBPF_API int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags);
1:  LIBBPF_API int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info,
1: -				     size_t info_size, __u32 flags);
1: +                                     size_t info_size, __u32 flags);
1:  
1:  /* TC related API */
1:  enum bpf_tc_attach_point {
1: -	BPF_TC_INGRESS = 1 << 0,
1: -	BPF_TC_EGRESS  = 1 << 1,
1: -	BPF_TC_CUSTOM  = 1 << 2,
1: +  BPF_TC_INGRESS = 1 << 0,
1: +  BPF_TC_EGRESS = 1 << 1,
1: +  BPF_TC_CUSTOM = 1 << 2,
1:  };
1:  
1: -#define BPF_TC_PARENT(a, b) 	\
1: -	((((a) << 16) & 0xFFFF0000U) | ((b) & 0x0000FFFFU))
1: +#define BPF_TC_PARENT(a, b) ((((a) << 16) & 0xFFFF0000U) | ((b)&0x0000FFFFU))
1:  
1:  enum bpf_tc_flags {
1: -	BPF_TC_F_REPLACE = 1 << 0,
1: +  BPF_TC_F_REPLACE = 1 << 0,
1:  };
1:  
1:  struct bpf_tc_hook {
1: -	size_t sz;
1: -	int ifindex;
1: -	enum bpf_tc_attach_point attach_point;
1: -	__u32 parent;
1: -	size_t :0;
1: +  size_t sz;
1: +  int ifindex;
1: +  enum bpf_tc_attach_point attach_point;
1: +  __u32 parent;
1: +  size_t : 0;
1:  };
1:  #define bpf_tc_hook__last_field parent
1:  
1:  struct bpf_tc_opts {
1: -	size_t sz;
1: -	int prog_fd;
1: -	__u32 flags;
1: -	__u32 prog_id;
1: -	__u32 handle;
1: -	__u32 priority;
1: -	size_t :0;
1: +  size_t sz;
1: +  int prog_fd;
1: +  __u32 flags;
1: +  __u32 prog_id;
1: +  __u32 handle;
1: +  __u32 priority;
1: +  size_t : 0;
1:  };
1:  #define bpf_tc_opts__last_field priority
1:  
1:  LIBBPF_API int bpf_tc_hook_create(struct bpf_tc_hook *hook);
1:  LIBBPF_API int bpf_tc_hook_destroy(struct bpf_tc_hook *hook);
1:  LIBBPF_API int bpf_tc_attach(const struct bpf_tc_hook *hook,
1: -			     struct bpf_tc_opts *opts);
1: +                             struct bpf_tc_opts *opts);
1:  LIBBPF_API int bpf_tc_detach(const struct bpf_tc_hook *hook,
1: -			     const struct bpf_tc_opts *opts);
1: +                             const struct bpf_tc_opts *opts);
1:  LIBBPF_API int bpf_tc_query(const struct bpf_tc_hook *hook,
1: -			    struct bpf_tc_opts *opts);
1: +                            struct bpf_tc_opts *opts);
1:  
1:  /* Ring buffer APIs */
1:  struct ring_buffer;
1: @@ -572,17 +560,17 @@ struct ring_buffer;
1:  typedef int (*ring_buffer_sample_fn)(void *ctx, void *data, size_t size);
1:  
1:  struct ring_buffer_opts {
1: -	size_t sz; /* size of this struct, for forward/backward compatiblity */
1: +  size_t sz; /* size of this struct, for forward/backward compatiblity */
1:  };
1:  
1:  #define ring_buffer_opts__last_field sz
1:  
1: -LIBBPF_API struct ring_buffer *
1: -ring_buffer__new(int map_fd, ring_buffer_sample_fn sample_cb, void *ctx,
1: -		 const struct ring_buffer_opts *opts);
1: +LIBBPF_API struct ring_buffer *ring_buffer__new(
1: +    int map_fd, ring_buffer_sample_fn sample_cb, void *ctx,
1: +    const struct ring_buffer_opts *opts);
1:  LIBBPF_API void ring_buffer__free(struct ring_buffer *rb);
1:  LIBBPF_API int ring_buffer__add(struct ring_buffer *rb, int map_fd,
1: -				ring_buffer_sample_fn sample_cb, void *ctx);
1: +                                ring_buffer_sample_fn sample_cb, void *ctx);
1:  LIBBPF_API int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms);
1:  LIBBPF_API int ring_buffer__consume(struct ring_buffer *rb);
1:  LIBBPF_API int ring_buffer__epoll_fd(const struct ring_buffer *rb);
1: @@ -590,85 +578,82 @@ LIBBPF_API int ring_buffer__epoll_fd(const struct ring_buffer *rb);
1:  /* Perf buffer APIs */
1:  struct perf_buffer;
1:  
1: -typedef void (*perf_buffer_sample_fn)(void *ctx, int cpu,
1: -				      void *data, __u32 size);
1: +typedef void (*perf_buffer_sample_fn)(void *ctx, int cpu, void *data,
1: +                                      __u32 size);
1:  typedef void (*perf_buffer_lost_fn)(void *ctx, int cpu, __u64 cnt);
1:  
1:  /* common use perf buffer options */
1:  struct perf_buffer_opts {
1: -	/* if specified, sample_cb is called for each sample */
1: -	perf_buffer_sample_fn sample_cb;
1: -	/* if specified, lost_cb is called for each batch of lost samples */
1: -	perf_buffer_lost_fn lost_cb;
1: -	/* ctx is provided to sample_cb and lost_cb */
1: -	void *ctx;
1: +  /* if specified, sample_cb is called for each sample */
1: +  perf_buffer_sample_fn sample_cb;
1: +  /* if specified, lost_cb is called for each batch of lost samples */
1: +  perf_buffer_lost_fn lost_cb;
1: +  /* ctx is provided to sample_cb and lost_cb */
1: +  void *ctx;
1:  };
1:  
1: -LIBBPF_API struct perf_buffer *
1: -perf_buffer__new(int map_fd, size_t page_cnt,
1: -		 const struct perf_buffer_opts *opts);
1: +LIBBPF_API struct perf_buffer *perf_buffer__new(
1: +    int map_fd, size_t page_cnt, const struct perf_buffer_opts *opts);
1:  
1:  enum bpf_perf_event_ret {
1: -	LIBBPF_PERF_EVENT_DONE	= 0,
1: -	LIBBPF_PERF_EVENT_ERROR	= -1,
1: -	LIBBPF_PERF_EVENT_CONT	= -2,
1: +  LIBBPF_PERF_EVENT_DONE = 0,
1: +  LIBBPF_PERF_EVENT_ERROR = -1,
1: +  LIBBPF_PERF_EVENT_CONT = -2,
1:  };
1:  
1:  struct perf_event_header;
1:  
1: -typedef enum bpf_perf_event_ret
1: -(*perf_buffer_event_fn)(void *ctx, int cpu, struct perf_event_header *event);
1: +typedef enum bpf_perf_event_ret (*perf_buffer_event_fn)(
1: +    void *ctx, int cpu, struct perf_event_header *event);
1:  
1:  /* raw perf buffer options, giving most power and control */
1:  struct perf_buffer_raw_opts {
1: -	/* perf event attrs passed directly into perf_event_open() */
1: -	struct perf_event_attr *attr;
1: -	/* raw event callback */
1: -	perf_buffer_event_fn event_cb;
1: -	/* ctx is provided to event_cb */
1: -	void *ctx;
1: -	/* if cpu_cnt == 0, open all on all possible CPUs (up to the number of
1: -	 * max_entries of given PERF_EVENT_ARRAY map)
1: -	 */
1: -	int cpu_cnt;
1: -	/* if cpu_cnt > 0, cpus is an array of CPUs to open ring buffers on */
1: -	int *cpus;
1: -	/* if cpu_cnt > 0, map_keys specify map keys to set per-CPU FDs for */
1: -	int *map_keys;
1: +  /* perf event attrs passed directly into perf_event_open() */
1: +  struct perf_event_attr *attr;
1: +  /* raw event callback */
1: +  perf_buffer_event_fn event_cb;
1: +  /* ctx is provided to event_cb */
1: +  void *ctx;
1: +  /* if cpu_cnt == 0, open all on all possible CPUs (up to the number of
1: +   * max_entries of given PERF_EVENT_ARRAY map)
1: +   */
1: +  int cpu_cnt;
1: +  /* if cpu_cnt > 0, cpus is an array of CPUs to open ring buffers on */
1: +  int *cpus;
1: +  /* if cpu_cnt > 0, map_keys specify map keys to set per-CPU FDs for */
1: +  int *map_keys;
1:  };
1:  
1: -LIBBPF_API struct perf_buffer *
1: -perf_buffer__new_raw(int map_fd, size_t page_cnt,
1: -		     const struct perf_buffer_raw_opts *opts);
1: +LIBBPF_API struct perf_buffer *perf_buffer__new_raw(
1: +    int map_fd, size_t page_cnt, const struct perf_buffer_raw_opts *opts);
1:  
1:  LIBBPF_API void perf_buffer__free(struct perf_buffer *pb);
1:  LIBBPF_API int perf_buffer__epoll_fd(const struct perf_buffer *pb);
1:  LIBBPF_API int perf_buffer__poll(struct perf_buffer *pb, int timeout_ms);
1:  LIBBPF_API int perf_buffer__consume(struct perf_buffer *pb);
1: -LIBBPF_API int perf_buffer__consume_buffer(struct perf_buffer *pb, size_t buf_idx);
1: +LIBBPF_API int perf_buffer__consume_buffer(struct perf_buffer *pb,
1: +                                           size_t buf_idx);
1:  LIBBPF_API size_t perf_buffer__buffer_cnt(const struct perf_buffer *pb);
1: -LIBBPF_API int perf_buffer__buffer_fd(const struct perf_buffer *pb, size_t buf_idx);
1: +LIBBPF_API int perf_buffer__buffer_fd(const struct perf_buffer *pb,
1: +                                      size_t buf_idx);
1:  
1: -typedef enum bpf_perf_event_ret
1: -	(*bpf_perf_event_print_t)(struct perf_event_header *hdr,
1: -				  void *private_data);
1: -LIBBPF_API enum bpf_perf_event_ret
1: -bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
1: -			   void **copy_mem, size_t *copy_size,
1: -			   bpf_perf_event_print_t fn, void *private_data);
1: +typedef enum bpf_perf_event_ret (*bpf_perf_event_print_t)(
1: +    struct perf_event_header *hdr, void *private_data);
1: +LIBBPF_API enum bpf_perf_event_ret bpf_perf_event_read_simple(
1: +    void *mmap_mem, size_t mmap_size, size_t page_size, void **copy_mem,
1: +    size_t *copy_size, bpf_perf_event_print_t fn, void *private_data);
1:  
1:  struct bpf_prog_linfo;
1:  struct bpf_prog_info;
1:  
1:  LIBBPF_API void bpf_prog_linfo__free(struct bpf_prog_linfo *prog_linfo);
1: -LIBBPF_API struct bpf_prog_linfo *
1: -bpf_prog_linfo__new(const struct bpf_prog_info *info);
1: -LIBBPF_API const struct bpf_line_info *
1: -bpf_prog_linfo__lfind_addr_func(const struct bpf_prog_linfo *prog_linfo,
1: -				__u64 addr, __u32 func_idx, __u32 nr_skip);
1: -LIBBPF_API const struct bpf_line_info *
1: -bpf_prog_linfo__lfind(const struct bpf_prog_linfo *prog_linfo,
1: -		      __u32 insn_off, __u32 nr_skip);
1: +LIBBPF_API struct bpf_prog_linfo *bpf_prog_linfo__new(
1: +    const struct bpf_prog_info *info);
1: +LIBBPF_API const struct bpf_line_info *bpf_prog_linfo__lfind_addr_func(
1: +    const struct bpf_prog_linfo *prog_linfo, __u64 addr, __u32 func_idx,
1: +    __u32 nr_skip);
1: +LIBBPF_API const struct bpf_line_info *bpf_prog_linfo__lfind(
1: +    const struct bpf_prog_linfo *prog_linfo, __u32 insn_off, __u32 nr_skip);
1:  
1:  /*
1:   * Probe for supported system features
1: @@ -679,10 +664,10 @@ bpf_prog_linfo__lfind(const struct bpf_prog_linfo *prog_linfo,
1:   * to adjust that limit with setrlimit().
1:   */
1:  LIBBPF_API bool bpf_probe_prog_type(enum bpf_prog_type prog_type,
1: -				    __u32 ifindex);
1: +                                    __u32 ifindex);
1:  LIBBPF_API bool bpf_probe_map_type(enum bpf_map_type map_type, __u32 ifindex);
1:  LIBBPF_API bool bpf_probe_helper(enum bpf_func_id id,
1: -				 enum bpf_prog_type prog_type, __u32 ifindex);
1: +                                 enum bpf_prog_type prog_type, __u32 ifindex);
1:  LIBBPF_API bool bpf_probe_large_insn_limit(__u32 ifindex);
1:  
1:  /*
1: @@ -715,38 +700,38 @@ LIBBPF_API bool bpf_probe_large_insn_limit(__u32 ifindex);
1:   *   bpf_program__bpil_offs_to_addr(info_linear);
1:   */
1:  enum bpf_prog_info_array {
1: -	BPF_PROG_INFO_FIRST_ARRAY = 0,
1: -	BPF_PROG_INFO_JITED_INSNS = 0,
1: -	BPF_PROG_INFO_XLATED_INSNS,
1: -	BPF_PROG_INFO_MAP_IDS,
1: -	BPF_PROG_INFO_JITED_KSYMS,
1: -	BPF_PROG_INFO_JITED_FUNC_LENS,
1: -	BPF_PROG_INFO_FUNC_INFO,
1: -	BPF_PROG_INFO_LINE_INFO,
1: -	BPF_PROG_INFO_JITED_LINE_INFO,
1: -	BPF_PROG_INFO_PROG_TAGS,
1: -	BPF_PROG_INFO_LAST_ARRAY,
1: +  BPF_PROG_INFO_FIRST_ARRAY = 0,
1: +  BPF_PROG_INFO_JITED_INSNS = 0,
1: +  BPF_PROG_INFO_XLATED_INSNS,
1: +  BPF_PROG_INFO_MAP_IDS,
1: +  BPF_PROG_INFO_JITED_KSYMS,
1: +  BPF_PROG_INFO_JITED_FUNC_LENS,
1: +  BPF_PROG_INFO_FUNC_INFO,
1: +  BPF_PROG_INFO_LINE_INFO,
1: +  BPF_PROG_INFO_JITED_LINE_INFO,
1: +  BPF_PROG_INFO_PROG_TAGS,
1: +  BPF_PROG_INFO_LAST_ARRAY,
1:  };
1:  
1:  struct bpf_prog_info_linear {
1: -	/* size of struct bpf_prog_info, when the tool is compiled */
1: -	__u32			info_len;
1: -	/* total bytes allocated for data, round up to 8 bytes */
1: -	__u32			data_len;
1: -	/* which arrays are included in data */
1: -	__u64			arrays;
1: -	struct bpf_prog_info	info;
1: -	__u8			data[];
1: +  /* size of struct bpf_prog_info, when the tool is compiled */
1: +  __u32 info_len;
1: +  /* total bytes allocated for data, round up to 8 bytes */
1: +  __u32 data_len;
1: +  /* which arrays are included in data */
1: +  __u64 arrays;
1: +  struct bpf_prog_info info;
1: +  __u8 data[];
1:  };
1:  
1: -LIBBPF_API struct bpf_prog_info_linear *
1: -bpf_program__get_prog_info_linear(int fd, __u64 arrays);
1: +LIBBPF_API struct bpf_prog_info_linear *bpf_program__get_prog_info_linear(
1: +    int fd, __u64 arrays);
1:  
1: -LIBBPF_API void
1: -bpf_program__bpil_addr_to_offs(struct bpf_prog_info_linear *info_linear);
1: +LIBBPF_API void bpf_program__bpil_addr_to_offs(
1: +    struct bpf_prog_info_linear *info_linear);
1:  
1: -LIBBPF_API void
1: -bpf_program__bpil_offs_to_addr(struct bpf_prog_info_linear *info_linear);
1: +LIBBPF_API void bpf_program__bpil_offs_to_addr(
1: +    struct bpf_prog_info_linear *info_linear);
1:  
1:  /*
1:   * A helper function to get the number of possible CPUs before looking up
1: @@ -765,79 +750,79 @@ bpf_program__bpil_offs_to_addr(struct bpf_prog_info_linear *info_linear);
1:  LIBBPF_API int libbpf_num_possible_cpus(void);
1:  
1:  struct bpf_map_skeleton {
1: -	const char *name;
1: -	struct bpf_map **map;
1: -	void **mmaped;
1: +  const char *name;
1: +  struct bpf_map **map;
1: +  void **mmaped;
1:  };
1:  
1:  struct bpf_prog_skeleton {
1: -	const char *name;
1: -	struct bpf_program **prog;
1: -	struct bpf_link **link;
1: +  const char *name;
1: +  struct bpf_program **prog;
1: +  struct bpf_link **link;
1:  };
1:  
1:  struct bpf_object_skeleton {
1: -	size_t sz; /* size of this struct, for forward/backward compatibility */
1: +  size_t sz; /* size of this struct, for forward/backward compatibility */
1:  
1: -	const char *name;
1: -	void *data;
1: -	size_t data_sz;
1: +  const char *name;
1: +  void *data;
1: +  size_t data_sz;
1:  
1: -	struct bpf_object **obj;
1: +  struct bpf_object **obj;
1:  
1: -	int map_cnt;
1: -	int map_skel_sz; /* sizeof(struct bpf_skeleton_map) */
1: -	struct bpf_map_skeleton *maps;
1: +  int map_cnt;
1: +  int map_skel_sz; /* sizeof(struct bpf_skeleton_map) */
1: +  struct bpf_map_skeleton *maps;
1:  
1: -	int prog_cnt;
1: -	int prog_skel_sz; /* sizeof(struct bpf_skeleton_prog) */
1: -	struct bpf_prog_skeleton *progs;
1: +  int prog_cnt;
1: +  int prog_skel_sz; /* sizeof(struct bpf_skeleton_prog) */
1: +  struct bpf_prog_skeleton *progs;
1:  };
1:  
1: -LIBBPF_API int
1: -bpf_object__open_skeleton(struct bpf_object_skeleton *s,
1: -			  const struct bpf_object_open_opts *opts);
1: +LIBBPF_API int bpf_object__open_skeleton(
1: +    struct bpf_object_skeleton *s, const struct bpf_object_open_opts *opts);
1:  LIBBPF_API int bpf_object__load_skeleton(struct bpf_object_skeleton *s);
1:  LIBBPF_API int bpf_object__attach_skeleton(struct bpf_object_skeleton *s);
1:  LIBBPF_API void bpf_object__detach_skeleton(struct bpf_object_skeleton *s);
1:  LIBBPF_API void bpf_object__destroy_skeleton(struct bpf_object_skeleton *s);
1:  
1:  struct gen_loader_opts {
1: -	size_t sz; /* size of this struct, for forward/backward compatiblity */
1: -	const char *data;
1: -	const char *insns;
1: -	__u32 data_sz;
1: -	__u32 insns_sz;
1: +  size_t sz; /* size of this struct, for forward/backward compatiblity */
1: +  const char *data;
1: +  const char *insns;
1: +  __u32 data_sz;
1: +  __u32 insns_sz;
1:  };
1:  
1:  #define gen_loader_opts__last_field insns_sz
1:  LIBBPF_API int bpf_object__gen_loader(struct bpf_object *obj,
1: -				      struct gen_loader_opts *opts);
1: +                                      struct gen_loader_opts *opts);
1:  
1:  enum libbpf_tristate {
1: -	TRI_NO = 0,
1: -	TRI_YES = 1,
1: -	TRI_MODULE = 2,
1: +  TRI_NO = 0,
1: +  TRI_YES = 1,
1: +  TRI_MODULE = 2,
1:  };
1:  
1:  struct bpf_linker_opts {
1: -	/* size of this struct, for forward/backward compatiblity */
1: -	size_t sz;
1: +  /* size of this struct, for forward/backward compatiblity */
1: +  size_t sz;
1:  };
1:  #define bpf_linker_opts__last_field sz
1:  
1:  struct bpf_linker_file_opts {
1: -	/* size of this struct, for forward/backward compatiblity */
1: -	size_t sz;
1: +  /* size of this struct, for forward/backward compatiblity */
1: +  size_t sz;
1:  };
1:  #define bpf_linker_file_opts__last_field sz
1:  
1:  struct bpf_linker;
1:  
1: -LIBBPF_API struct bpf_linker *bpf_linker__new(const char *filename, struct bpf_linker_opts *opts);
1: +LIBBPF_API struct bpf_linker *bpf_linker__new(const char *filename,
1: +                                              struct bpf_linker_opts *opts);
1:  LIBBPF_API int bpf_linker__add_file(struct bpf_linker *linker,
1: -				    const char *filename,
1: -				    const struct bpf_linker_file_opts *opts);
1: +                                    const char *filename,
1: +                                    const struct bpf_linker_file_opts *opts);
1:  LIBBPF_API int bpf_linker__finalize(struct bpf_linker *linker);
1:  LIBBPF_API void bpf_linker__free(struct bpf_linker *linker);
1:  
1: diff --git a/src/cc/libbpf/src/libbpf_common.h b/src/cc/libbpf/src/libbpf_common.h
1: index 947d8bd8..e9f61847 100644
1: --- a/src/cc/libbpf/src/libbpf_common.h
1: +++ b/src/cc/libbpf/src/libbpf_common.h
1: @@ -30,13 +30,10 @@
1:   * including any extra padding, it with memset() and then assigns initial
1:   * values provided by users in struct initializer-syntax as varargs.
1:   */
1: -#define DECLARE_LIBBPF_OPTS(TYPE, NAME, ...)				    \
1: -	struct TYPE NAME = ({ 						    \
1: -		memset(&NAME, 0, sizeof(struct TYPE));			    \
1: -		(struct TYPE) {						    \
1: -			.sz = sizeof(struct TYPE),			    \
1: -			__VA_ARGS__					    \
1: -		};							    \
1: -	})
1: +#define DECLARE_LIBBPF_OPTS(TYPE, NAME, ...)               \
1: +  struct TYPE NAME = ({                                    \
1: +    memset(&NAME, 0, sizeof(struct TYPE));                 \
1: +    (struct TYPE){.sz = sizeof(struct TYPE), __VA_ARGS__}; \
1: +  })
1:  
1:  #endif /* __LIBBPF_LIBBPF_COMMON_H */
1: diff --git a/src/cc/libbpf/src/libbpf_errno.c b/src/cc/libbpf/src/libbpf_errno.c
1: index 96f67a77..7537be1e 100644
1: --- a/src/cc/libbpf/src/libbpf_errno.c
1: +++ b/src/cc/libbpf/src/libbpf_errno.c
1: @@ -17,51 +17,50 @@
1:  /* make sure libbpf doesn't use kernel-only integer typedefs */
1:  #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
1:  
1: -#define ERRNO_OFFSET(e)		((e) - __LIBBPF_ERRNO__START)
1: -#define ERRCODE_OFFSET(c)	ERRNO_OFFSET(LIBBPF_ERRNO__##c)
1: -#define NR_ERRNO	(__LIBBPF_ERRNO__END - __LIBBPF_ERRNO__START)
1: +#define ERRNO_OFFSET(e) ((e)-__LIBBPF_ERRNO__START)
1: +#define ERRCODE_OFFSET(c) ERRNO_OFFSET(LIBBPF_ERRNO__##c)
1: +#define NR_ERRNO (__LIBBPF_ERRNO__END - __LIBBPF_ERRNO__START)
1:  
1:  static const char *libbpf_strerror_table[NR_ERRNO] = {
1: -	[ERRCODE_OFFSET(LIBELF)]	= "Something wrong in libelf",
1: -	[ERRCODE_OFFSET(FORMAT)]	= "BPF object format invalid",
1: -	[ERRCODE_OFFSET(KVERSION)]	= "'version' section incorrect or lost",
1: -	[ERRCODE_OFFSET(ENDIAN)]	= "Endian mismatch",
1: -	[ERRCODE_OFFSET(INTERNAL)]	= "Internal error in libbpf",
1: -	[ERRCODE_OFFSET(RELOC)]		= "Relocation failed",
1: -	[ERRCODE_OFFSET(VERIFY)]	= "Kernel verifier blocks program loading",
1: -	[ERRCODE_OFFSET(PROG2BIG)]	= "Program too big",
1: -	[ERRCODE_OFFSET(KVER)]		= "Incorrect kernel version",
1: -	[ERRCODE_OFFSET(PROGTYPE)]	= "Kernel doesn't support this program type",
1: -	[ERRCODE_OFFSET(WRNGPID)]	= "Wrong pid in netlink message",
1: -	[ERRCODE_OFFSET(INVSEQ)]	= "Invalid netlink sequence",
1: -	[ERRCODE_OFFSET(NLPARSE)]	= "Incorrect netlink message parsing",
1: +        [ERRCODE_OFFSET(LIBELF)] = "Something wrong in libelf",
1: +        [ERRCODE_OFFSET(FORMAT)] = "BPF object format invalid",
1: +        [ERRCODE_OFFSET(KVERSION)] = "'version' section incorrect or lost",
1: +        [ERRCODE_OFFSET(ENDIAN)] = "Endian mismatch",
1: +        [ERRCODE_OFFSET(INTERNAL)] = "Internal error in libbpf",
1: +        [ERRCODE_OFFSET(RELOC)] = "Relocation failed",
1: +        [ERRCODE_OFFSET(VERIFY)] = "Kernel verifier blocks program loading",
1: +        [ERRCODE_OFFSET(PROG2BIG)] = "Program too big",
1: +        [ERRCODE_OFFSET(KVER)] = "Incorrect kernel version",
1: +        [ERRCODE_OFFSET(PROGTYPE)] = "Kernel doesn't support this program type",
1: +        [ERRCODE_OFFSET(WRNGPID)] = "Wrong pid in netlink message",
1: +        [ERRCODE_OFFSET(INVSEQ)] = "Invalid netlink sequence",
1: +        [ERRCODE_OFFSET(NLPARSE)] = "Incorrect netlink message parsing",
1:  };
1:  
1: -int libbpf_strerror(int err, char *buf, size_t size)
1: -{
1: -	if (!buf || !size)
1: -		return libbpf_err(-EINVAL);
1: +int libbpf_strerror(int err, char *buf, size_t size) {
1: +  if (!buf || !size)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	err = err > 0 ? err : -err;
1: +  err = err > 0 ? err : -err;
1:  
1: -	if (err < __LIBBPF_ERRNO__START) {
1: -		int ret;
1: +  if (err < __LIBBPF_ERRNO__START) {
1: +    int ret;
1:  
1: -		ret = strerror_r(err, buf, size);
1: -		buf[size - 1] = '\0';
1: -		return libbpf_err_errno(ret);
1: -	}
1: +    ret = strerror_r(err, buf, size);
1: +    buf[size - 1] = '\0';
1: +    return libbpf_err_errno(ret);
1: +  }
1:  
1: -	if (err < __LIBBPF_ERRNO__END) {
1: -		const char *msg;
1: +  if (err < __LIBBPF_ERRNO__END) {
1: +    const char *msg;
1:  
1: -		msg = libbpf_strerror_table[ERRNO_OFFSET(err)];
1: -		snprintf(buf, size, "%s", msg);
1: -		buf[size - 1] = '\0';
1: -		return 0;
1: -	}
1: +    msg = libbpf_strerror_table[ERRNO_OFFSET(err)];
1: +    snprintf(buf, size, "%s", msg);
1: +    buf[size - 1] = '\0';
1: +    return 0;
1: +  }
1:  
1: -	snprintf(buf, size, "Unknown libbpf error %d", err);
1: -	buf[size - 1] = '\0';
1: -	return libbpf_err(-ENOENT);
1: +  snprintf(buf, size, "Unknown libbpf error %d", err);
1: +  buf[size - 1] = '\0';
1: +  return libbpf_err(-ENOENT);
1:  }
1: diff --git a/src/cc/libbpf/src/libbpf_internal.h b/src/cc/libbpf/src/libbpf_internal.h
1: index 016ca7cb..6f433d19 100644
1: --- a/src/cc/libbpf/src/libbpf_internal.h
1: +++ b/src/cc/libbpf/src/libbpf_internal.h
1: @@ -9,10 +9,10 @@
1:  #ifndef __LIBBPF_LIBBPF_INTERNAL_H
1:  #define __LIBBPF_LIBBPF_INTERNAL_H
1:  
1: -#include <stdlib.h>
1: -#include <limits.h>
1:  #include <errno.h>
1: +#include <limits.h>
1:  #include <linux/err.h>
1: +#include <stdlib.h>
1:  #include "libbpf_legacy.h"
1:  
1:  /* make sure libbpf doesn't use kernel-only integer typedefs */
1: @@ -21,8 +21,8 @@
1:  /* prevent accidental re-addition of reallocarray() */
1:  #pragma GCC poison reallocarray
1:  
1: -#include "libbpf.h"
1:  #include "btf.h"
1: +#include "libbpf.h"
1:  
1:  #ifndef EM_BPF
1:  #define EM_BPF 247
1: @@ -52,22 +52,22 @@
1:  
1:  /* Older libelf all end up in this expression, for both 32 and 64 bit */
1:  #ifndef GELF_ST_VISIBILITY
1: -#define GELF_ST_VISIBILITY(o) ((o) & 0x03)
1: +#define GELF_ST_VISIBILITY(o) ((o)&0x03)
1:  #endif
1:  
1:  #define BTF_INFO_ENC(kind, kind_flag, vlen) \
1: -	((!!(kind_flag) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN))
1: +  ((!!(kind_flag) << 31) | ((kind) << 24) | ((vlen)&BTF_MAX_VLEN))
1:  #define BTF_TYPE_ENC(name, info, size_or_type) (name), (info), (size_or_type)
1:  #define BTF_INT_ENC(encoding, bits_offset, nr_bits) \
1: -	((encoding) << 24 | (bits_offset) << 16 | (nr_bits))
1: +  ((encoding) << 24 | (bits_offset) << 16 | (nr_bits))
1:  #define BTF_TYPE_INT_ENC(name, encoding, bits_offset, bits, sz) \
1: -	BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_INT, 0, 0), sz), \
1: -	BTF_INT_ENC(encoding, bits_offset, bits)
1: +  BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_INT, 0, 0), sz)      \
1: +  , BTF_INT_ENC(encoding, bits_offset, bits)
1:  #define BTF_MEMBER_ENC(name, type, bits_offset) (name), (type), (bits_offset)
1:  #define BTF_PARAM_ENC(name, type) (name), (type)
1:  #define BTF_VAR_SECINFO_ENC(type, offset, size) (type), (offset), (size)
1:  #define BTF_TYPE_FLOAT_ENC(name, sz) \
1: -	BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz)
1: +  BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz)
1:  
1:  #ifndef likely
1:  #define likely(x) __builtin_expect(!!(x), 1)
1: @@ -76,14 +76,14 @@
1:  #define unlikely(x) __builtin_expect(!!(x), 0)
1:  #endif
1:  #ifndef min
1: -# define min(x, y) ((x) < (y) ? (x) : (y))
1: +#define min(x, y) ((x) < (y) ? (x) : (y))
1:  #endif
1:  #ifndef max
1: -# define max(x, y) ((x) < (y) ? (y) : (x))
1: +#define max(x, y) ((x) < (y) ? (y) : (x))
1:  #endif
1:  #ifndef offsetofend
1: -# define offsetofend(TYPE, FIELD) \
1: -	(offsetof(TYPE, FIELD) + sizeof(((TYPE *)0)->FIELD))
1: +#define offsetofend(TYPE, FIELD) \
1: +  (offsetof(TYPE, FIELD) + sizeof(((TYPE *)0)->FIELD))
1:  #endif
1:  
1:  /* Symbol versioning is different between static and shared library.
1: @@ -91,29 +91,27 @@
1:   * only the symbol of the new version is needed for static library.
1:   */
1:  #ifdef SHARED
1: -# define COMPAT_VERSION(internal_name, api_name, version) \
1: -	asm(".symver " #internal_name "," #api_name "@" #version);
1: -# define DEFAULT_VERSION(internal_name, api_name, version) \
1: -	asm(".symver " #internal_name "," #api_name "@@" #version);
1: +#define COMPAT_VERSION(internal_name, api_name, version) \
1: +  asm(".symver " #internal_name "," #api_name "@" #version);
1: +#define DEFAULT_VERSION(internal_name, api_name, version) \
1: +  asm(".symver " #internal_name "," #api_name "@@" #version);
1:  #else
1: -# define COMPAT_VERSION(internal_name, api_name, version)
1: -# define DEFAULT_VERSION(internal_name, api_name, version) \
1: -	extern typeof(internal_name) api_name \
1: -	__attribute__((alias(#internal_name)));
1: +#define COMPAT_VERSION(internal_name, api_name, version)
1: +#define DEFAULT_VERSION(internal_name, api_name, version) \
1: +  extern typeof(internal_name) api_name __attribute__((alias(#internal_name)));
1:  #endif
1:  
1: -extern void libbpf_print(enum libbpf_print_level level,
1: -			 const char *format, ...)
1: -	__attribute__((format(printf, 2, 3)));
1: +extern void libbpf_print(enum libbpf_print_level level, const char *format, ...)
1: +    __attribute__((format(printf, 2, 3)));
1:  
1: -#define __pr(level, fmt, ...)	\
1: -do {				\
1: -	libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__);	\
1: -} while (0)
1: +#define __pr(level, fmt, ...)                           \
1: +  do {                                                  \
1: +    libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__); \
1: +  } while (0)
1:  
1: -#define pr_warn(fmt, ...)	__pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)
1: -#define pr_info(fmt, ...)	__pr(LIBBPF_INFO, fmt, ##__VA_ARGS__)
1: -#define pr_debug(fmt, ...)	__pr(LIBBPF_DEBUG, fmt, ##__VA_ARGS__)
1: +#define pr_warn(fmt, ...) __pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)
1: +#define pr_info(fmt, ...) __pr(LIBBPF_INFO, fmt, ##__VA_ARGS__)
1: +#define pr_debug(fmt, ...) __pr(LIBBPF_DEBUG, fmt, ##__VA_ARGS__)
1:  
1:  #ifndef __has_builtin
1:  #define __has_builtin(x) 0
1: @@ -127,19 +125,18 @@ do {				\
1:   * it's trivial to implement libbpf-specific internal version and use it
1:   * throughout libbpf.
1:   */
1: -static inline void *libbpf_reallocarray(void *ptr, size_t nmemb, size_t size)
1: -{
1: -	size_t total;
1: +static inline void *libbpf_reallocarray(void *ptr, size_t nmemb, size_t size) {
1: +  size_t total;
1:  
1:  #if __has_builtin(__builtin_mul_overflow)
1: -	if (unlikely(__builtin_mul_overflow(nmemb, size, &total)))
1: -		return NULL;
1: +  if (unlikely(__builtin_mul_overflow(nmemb, size, &total)))
1: +    return NULL;
1:  #else
1: -	if (size == 0 || nmemb > ULONG_MAX / size)
1: -		return NULL;
1: -	total = nmemb * size;
1: +  if (size == 0 || nmemb > ULONG_MAX / size)
1: +    return NULL;
1: +  total = nmemb * size;
1:  #endif
1: -	return realloc(ptr, total);
1: +  return realloc(ptr, total);
1:  }
1:  
1:  struct btf;
1: @@ -147,154 +144,150 @@ struct btf_type;
1:  
1:  struct btf_type *btf_type_by_id(struct btf *btf, __u32 type_id);
1:  const char *btf_kind_str(const struct btf_type *t);
1: -const struct btf_type *skip_mods_and_typedefs(const struct btf *btf, __u32 id, __u32 *res_id);
1: +const struct btf_type *skip_mods_and_typedefs(const struct btf *btf, __u32 id,
1: +                                              __u32 *res_id);
1:  
1: -static inline enum btf_func_linkage btf_func_linkage(const struct btf_type *t)
1: -{
1: -	return (enum btf_func_linkage)(int)btf_vlen(t);
1: +static inline enum btf_func_linkage btf_func_linkage(const struct btf_type *t) {
1: +  return (enum btf_func_linkage)(int)btf_vlen(t);
1:  }
1:  
1: -static inline __u32 btf_type_info(int kind, int vlen, int kflag)
1: -{
1: -	return (kflag << 31) | (kind << 24) | vlen;
1: +static inline __u32 btf_type_info(int kind, int vlen, int kflag) {
1: +  return (kflag << 31) | (kind << 24) | vlen;
1:  }
1:  
1:  enum map_def_parts {
1: -	MAP_DEF_MAP_TYPE	= 0x001,
1: -	MAP_DEF_KEY_TYPE	= 0x002,
1: -	MAP_DEF_KEY_SIZE	= 0x004,
1: -	MAP_DEF_VALUE_TYPE	= 0x008,
1: -	MAP_DEF_VALUE_SIZE	= 0x010,
1: -	MAP_DEF_MAX_ENTRIES	= 0x020,
1: -	MAP_DEF_MAP_FLAGS	= 0x040,
1: -	MAP_DEF_NUMA_NODE	= 0x080,
1: -	MAP_DEF_PINNING		= 0x100,
1: -	MAP_DEF_INNER_MAP	= 0x200,
1: -
1: -	MAP_DEF_ALL		= 0x3ff, /* combination of all above */
1: +  MAP_DEF_MAP_TYPE = 0x001,
1: +  MAP_DEF_KEY_TYPE = 0x002,
1: +  MAP_DEF_KEY_SIZE = 0x004,
1: +  MAP_DEF_VALUE_TYPE = 0x008,
1: +  MAP_DEF_VALUE_SIZE = 0x010,
1: +  MAP_DEF_MAX_ENTRIES = 0x020,
1: +  MAP_DEF_MAP_FLAGS = 0x040,
1: +  MAP_DEF_NUMA_NODE = 0x080,
1: +  MAP_DEF_PINNING = 0x100,
1: +  MAP_DEF_INNER_MAP = 0x200,
1: +
1: +  MAP_DEF_ALL = 0x3ff, /* combination of all above */
1:  };
1:  
1:  struct btf_map_def {
1: -	enum map_def_parts parts;
1: -	__u32 map_type;
1: -	__u32 key_type_id;
1: -	__u32 key_size;
1: -	__u32 value_type_id;
1: -	__u32 value_size;
1: -	__u32 max_entries;
1: -	__u32 map_flags;
1: -	__u32 numa_node;
1: -	__u32 pinning;
1: +  enum map_def_parts parts;
1: +  __u32 map_type;
1: +  __u32 key_type_id;
1: +  __u32 key_size;
1: +  __u32 value_type_id;
1: +  __u32 value_size;
1: +  __u32 max_entries;
1: +  __u32 map_flags;
1: +  __u32 numa_node;
1: +  __u32 pinning;
1:  };
1:  
1:  int parse_btf_map_def(const char *map_name, struct btf *btf,
1: -		      const struct btf_type *def_t, bool strict,
1: -		      struct btf_map_def *map_def, struct btf_map_def *inner_def);
1: +                      const struct btf_type *def_t, bool strict,
1: +                      struct btf_map_def *map_def,
1: +                      struct btf_map_def *inner_def);
1:  
1:  void *libbpf_add_mem(void **data, size_t *cap_cnt, size_t elem_sz,
1: -		     size_t cur_cnt, size_t max_cnt, size_t add_cnt);
1: -int libbpf_ensure_mem(void **data, size_t *cap_cnt, size_t elem_sz, size_t need_cnt);
1: -
1: -static inline bool libbpf_validate_opts(const char *opts,
1: -					size_t opts_sz, size_t user_sz,
1: -					const char *type_name)
1: -{
1: -	if (user_sz < sizeof(size_t)) {
1: -		pr_warn("%s size (%zu) is too small\n", type_name, user_sz);
1: -		return false;
1: -	}
1: -	if (user_sz > opts_sz) {
1: -		size_t i;
1: -
1: -		for (i = opts_sz; i < user_sz; i++) {
1: -			if (opts[i]) {
1: -				pr_warn("%s has non-zero extra bytes\n",
1: -					type_name);
1: -				return false;
1: -			}
1: -		}
1: -	}
1: -	return true;
1: +                     size_t cur_cnt, size_t max_cnt, size_t add_cnt);
1: +int libbpf_ensure_mem(void **data, size_t *cap_cnt, size_t elem_sz,
1: +                      size_t need_cnt);
1: +
1: +static inline bool libbpf_validate_opts(const char *opts, size_t opts_sz,
1: +                                        size_t user_sz, const char *type_name) {
1: +  if (user_sz < sizeof(size_t)) {
1: +    pr_warn("%s size (%zu) is too small\n", type_name, user_sz);
1: +    return false;
1: +  }
1: +  if (user_sz > opts_sz) {
1: +    size_t i;
1: +
1: +    for (i = opts_sz; i < user_sz; i++) {
1: +      if (opts[i]) {
1: +        pr_warn("%s has non-zero extra bytes\n", type_name);
1: +        return false;
1: +      }
1: +    }
1: +  }
1: +  return true;
1:  }
1:  
1: -#define OPTS_VALID(opts, type)						      \
1: -	(!(opts) || libbpf_validate_opts((const char *)opts,		      \
1: -					 offsetofend(struct type,	      \
1: -						     type##__last_field),     \
1: -					 (opts)->sz, #type))
1: +#define OPTS_VALID(opts, type)                                        \
1: +  (!(opts) ||                                                         \
1: +   libbpf_validate_opts((const char *)opts,                           \
1: +                        offsetofend(struct type, type##__last_field), \
1: +                        (opts)->sz, #type))
1:  #define OPTS_HAS(opts, field) \
1: -	((opts) && opts->sz >= offsetofend(typeof(*(opts)), field))
1: +  ((opts) && opts->sz >= offsetofend(typeof(*(opts)), field))
1:  #define OPTS_GET(opts, field, fallback_value) \
1: -	(OPTS_HAS(opts, field) ? (opts)->field : fallback_value)
1: -#define OPTS_SET(opts, field, value)		\
1: -	do {					\
1: -		if (OPTS_HAS(opts, field))	\
1: -			(opts)->field = value;	\
1: -	} while (0)
1: +  (OPTS_HAS(opts, field) ? (opts)->field : fallback_value)
1: +#define OPTS_SET(opts, field, value) \
1: +  do {                               \
1: +    if (OPTS_HAS(opts, field))       \
1: +      (opts)->field = value;         \
1: +  } while (0)
1:  
1:  int parse_cpu_mask_str(const char *s, bool **mask, int *mask_sz);
1:  int parse_cpu_mask_file(const char *fcpu, bool **mask, int *mask_sz);
1:  int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
1: -			 const char *str_sec, size_t str_len);
1: +                         const char *str_sec, size_t str_len);
1:  
1:  struct bpf_prog_load_params {
1: -	enum bpf_prog_type prog_type;
1: -	enum bpf_attach_type expected_attach_type;
1: -	const char *name;
1: -	const struct bpf_insn *insns;
1: -	size_t insn_cnt;
1: -	const char *license;
1: -	__u32 kern_version;
1: -	__u32 attach_prog_fd;
1: -	__u32 attach_btf_obj_fd;
1: -	__u32 attach_btf_id;
1: -	__u32 prog_ifindex;
1: -	__u32 prog_btf_fd;
1: -	__u32 prog_flags;
1: -
1: -	__u32 func_info_rec_size;
1: -	const void *func_info;
1: -	__u32 func_info_cnt;
1: -
1: -	__u32 line_info_rec_size;
1: -	const void *line_info;
1: -	__u32 line_info_cnt;
1: -
1: -	__u32 log_level;
1: -	char *log_buf;
1: -	size_t log_buf_sz;
1: +  enum bpf_prog_type prog_type;
1: +  enum bpf_attach_type expected_attach_type;
1: +  const char *name;
1: +  const struct bpf_insn *insns;
1: +  size_t insn_cnt;
1: +  const char *license;
1: +  __u32 kern_version;
1: +  __u32 attach_prog_fd;
1: +  __u32 attach_btf_obj_fd;
1: +  __u32 attach_btf_id;
1: +  __u32 prog_ifindex;
1: +  __u32 prog_btf_fd;
1: +  __u32 prog_flags;
1: +
1: +  __u32 func_info_rec_size;
1: +  const void *func_info;
1: +  __u32 func_info_cnt;
1: +
1: +  __u32 line_info_rec_size;
1: +  const void *line_info;
1: +  __u32 line_info_cnt;
1: +
1: +  __u32 log_level;
1: +  char *log_buf;
1: +  size_t log_buf_sz;
1:  };
1:  
1:  int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr);
1:  
1:  int bpf_object__section_size(const struct bpf_object *obj, const char *name,
1: -			     __u32 *size);
1: +                             __u32 *size);
1:  int bpf_object__variable_offset(const struct bpf_object *obj, const char *name,
1: -				__u32 *off);
1: +                                __u32 *off);
1:  struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf);
1:  void btf_get_kernel_prefix_kind(enum bpf_attach_type attach_type,
1: -				const char **prefix, int *kind);
1: +                                const char **prefix, int *kind);
1:  
1:  struct btf_ext_info {
1: -	/*
1: -	 * info points to the individual info section (e.g. func_info and
1: -	 * line_info) from the .BTF.ext. It does not include the __u32 rec_size.
1: -	 */
1: -	void *info;
1: -	__u32 rec_size;
1: -	__u32 len;
1: +  /*
1: +   * info points to the individual info section (e.g. func_info and
1: +   * line_info) from the .BTF.ext. It does not include the __u32 rec_size.
1: +   */
1: +  void *info;
1: +  __u32 rec_size;
1: +  __u32 len;
1:  };
1:  
1: -#define for_each_btf_ext_sec(seg, sec)					\
1: -	for (sec = (seg)->info;						\
1: -	     (void *)sec < (seg)->info + (seg)->len;			\
1: -	     sec = (void *)sec + sizeof(struct btf_ext_info_sec) +	\
1: -		   (seg)->rec_size * sec->num_info)
1: +#define for_each_btf_ext_sec(seg, sec)                            \
1: +  for (sec = (seg)->info; (void *)sec < (seg)->info + (seg)->len; \
1: +       sec = (void *)sec + sizeof(struct btf_ext_info_sec) +      \
1: +             (seg)->rec_size * sec->num_info)
1:  
1: -#define for_each_btf_ext_rec(seg, sec, i, rec)				\
1: -	for (i = 0, rec = (void *)&(sec)->data;				\
1: -	     i < (sec)->num_info;					\
1: -	     i++, rec = (void *)rec + (seg)->rec_size)
1: +#define for_each_btf_ext_rec(seg, sec, i, rec)                 \
1: +  for (i = 0, rec = (void *)&(sec)->data; i < (sec)->num_info; \
1: +       i++, rec = (void *)rec + (seg)->rec_size)
1:  
1:  /*
1:   * The .BTF.ext ELF section layout defined as
1: @@ -318,70 +311,70 @@ struct btf_ext_info {
1:   * kernel will handle the func_info properly based on its contents.
1:   */
1:  struct btf_ext_header {
1: -	__u16	magic;
1: -	__u8	version;
1: -	__u8	flags;
1: -	__u32	hdr_len;
1: -
1: -	/* All offsets are in bytes relative to the end of this header */
1: -	__u32	func_info_off;
1: -	__u32	func_info_len;
1: -	__u32	line_info_off;
1: -	__u32	line_info_len;
1: -
1: -	/* optional part of .BTF.ext header */
1: -	__u32	core_relo_off;
1: -	__u32	core_relo_len;
1: +  __u16 magic;
1: +  __u8 version;
1: +  __u8 flags;
1: +  __u32 hdr_len;
1: +
1: +  /* All offsets are in bytes relative to the end of this header */
1: +  __u32 func_info_off;
1: +  __u32 func_info_len;
1: +  __u32 line_info_off;
1: +  __u32 line_info_len;
1: +
1: +  /* optional part of .BTF.ext header */
1: +  __u32 core_relo_off;
1: +  __u32 core_relo_len;
1:  };
1:  
1:  struct btf_ext {
1: -	union {
1: -		struct btf_ext_header *hdr;
1: -		void *data;
1: -	};
1: -	struct btf_ext_info func_info;
1: -	struct btf_ext_info line_info;
1: -	struct btf_ext_info core_relo_info;
1: -	__u32 data_size;
1: +  union {
1: +    struct btf_ext_header *hdr;
1: +    void *data;
1: +  };
1: +  struct btf_ext_info func_info;
1: +  struct btf_ext_info line_info;
1: +  struct btf_ext_info core_relo_info;
1: +  __u32 data_size;
1:  };
1:  
1:  struct btf_ext_info_sec {
1: -	__u32	sec_name_off;
1: -	__u32	num_info;
1: -	/* Followed by num_info * record_size number of bytes */
1: -	__u8	data[];
1: +  __u32 sec_name_off;
1: +  __u32 num_info;
1: +  /* Followed by num_info * record_size number of bytes */
1: +  __u8 data[];
1:  };
1:  
1:  /* The minimum bpf_func_info checked by the loader */
1:  struct bpf_func_info_min {
1: -	__u32   insn_off;
1: -	__u32   type_id;
1: +  __u32 insn_off;
1: +  __u32 type_id;
1:  };
1:  
1:  /* The minimum bpf_line_info checked by the loader */
1:  struct bpf_line_info_min {
1: -	__u32	insn_off;
1: -	__u32	file_name_off;
1: -	__u32	line_off;
1: -	__u32	line_col;
1: +  __u32 insn_off;
1: +  __u32 file_name_off;
1: +  __u32 line_off;
1: +  __u32 line_col;
1:  };
1:  
1:  /* bpf_core_relo_kind encodes which aspect of captured field/type/enum value
1:   * has to be adjusted by relocations.
1:   */
1:  enum bpf_core_relo_kind {
1: -	BPF_FIELD_BYTE_OFFSET = 0,	/* field byte offset */
1: -	BPF_FIELD_BYTE_SIZE = 1,	/* field size in bytes */
1: -	BPF_FIELD_EXISTS = 2,		/* field existence in target kernel */
1: -	BPF_FIELD_SIGNED = 3,		/* field signedness (0 - unsigned, 1 - signed) */
1: -	BPF_FIELD_LSHIFT_U64 = 4,	/* bitfield-specific left bitshift */
1: -	BPF_FIELD_RSHIFT_U64 = 5,	/* bitfield-specific right bitshift */
1: -	BPF_TYPE_ID_LOCAL = 6,		/* type ID in local BPF object */
1: -	BPF_TYPE_ID_TARGET = 7,		/* type ID in target kernel */
1: -	BPF_TYPE_EXISTS = 8,		/* type existence in target kernel */
1: -	BPF_TYPE_SIZE = 9,		/* type size in bytes */
1: -	BPF_ENUMVAL_EXISTS = 10,	/* enum value existence in target kernel */
1: -	BPF_ENUMVAL_VALUE = 11,		/* enum value integer value */
1: +  BPF_FIELD_BYTE_OFFSET = 0, /* field byte offset */
1: +  BPF_FIELD_BYTE_SIZE = 1,   /* field size in bytes */
1: +  BPF_FIELD_EXISTS = 2,      /* field existence in target kernel */
1: +  BPF_FIELD_SIGNED = 3,      /* field signedness (0 - unsigned, 1 - signed) */
1: +  BPF_FIELD_LSHIFT_U64 = 4,  /* bitfield-specific left bitshift */
1: +  BPF_FIELD_RSHIFT_U64 = 5,  /* bitfield-specific right bitshift */
1: +  BPF_TYPE_ID_LOCAL = 6,     /* type ID in local BPF object */
1: +  BPF_TYPE_ID_TARGET = 7,    /* type ID in target kernel */
1: +  BPF_TYPE_EXISTS = 8,       /* type existence in target kernel */
1: +  BPF_TYPE_SIZE = 9,         /* type size in bytes */
1: +  BPF_ENUMVAL_EXISTS = 10,   /* enum value existence in target kernel */
1: +  BPF_ENUMVAL_VALUE = 11,    /* enum value integer value */
1:  };
1:  
1:  /* The minimum bpf_core_relo checked by the loader
1: @@ -412,7 +405,7 @@ enum bpf_core_relo_kind {
1:   *
1:   *   struct sample *s = ...;
1:   *   int x = &s->a;     // encoded as "0:0" (a is field #0)
1: - *   int y = &s->b[5];  // encoded as "0:1:0:5" (anon struct is field #1, 
1: + *   int y = &s->b[5];  // encoded as "0:1:0:5" (anon struct is field #1,
1:   *                      // b is field #0 inside anon struct, accessing elem #5)
1:   *   int z = &s[10]->b; // encoded as "10:1" (ptr is used as an array)
1:   *
1: @@ -431,67 +424,67 @@ enum bpf_core_relo_kind {
1:   *   [0] https://llvm.org/docs/LangRef.html#getelementptr-instruction
1:   */
1:  struct bpf_core_relo {
1: -	__u32   insn_off;
1: -	__u32   type_id;
1: -	__u32   access_str_off;
1: -	enum bpf_core_relo_kind kind;
1: +  __u32 insn_off;
1: +  __u32 type_id;
1: +  __u32 access_str_off;
1: +  enum bpf_core_relo_kind kind;
1:  };
1:  
1:  typedef int (*type_id_visit_fn)(__u32 *type_id, void *ctx);
1:  typedef int (*str_off_visit_fn)(__u32 *str_off, void *ctx);
1: -int btf_type_visit_type_ids(struct btf_type *t, type_id_visit_fn visit, void *ctx);
1: -int btf_type_visit_str_offs(struct btf_type *t, str_off_visit_fn visit, void *ctx);
1: -int btf_ext_visit_type_ids(struct btf_ext *btf_ext, type_id_visit_fn visit, void *ctx);
1: -int btf_ext_visit_str_offs(struct btf_ext *btf_ext, str_off_visit_fn visit, void *ctx);
1: +int btf_type_visit_type_ids(struct btf_type *t, type_id_visit_fn visit,
1: +                            void *ctx);
1: +int btf_type_visit_str_offs(struct btf_type *t, str_off_visit_fn visit,
1: +                            void *ctx);
1: +int btf_ext_visit_type_ids(struct btf_ext *btf_ext, type_id_visit_fn visit,
1: +                           void *ctx);
1: +int btf_ext_visit_str_offs(struct btf_ext *btf_ext, str_off_visit_fn visit,
1: +                           void *ctx);
1:  
1:  extern enum libbpf_strict_mode libbpf_mode;
1:  
1:  /* handle direct returned errors */
1: -static inline int libbpf_err(int ret)
1: -{
1: -	if (ret < 0)
1: -		errno = -ret;
1: -	return ret;
1: +static inline int libbpf_err(int ret) {
1: +  if (ret < 0)
1: +    errno = -ret;
1: +  return ret;
1:  }
1:  
1:  /* handle errno-based (e.g., syscall or libc) errors according to libbpf's
1:   * strict mode settings
1:   */
1: -static inline int libbpf_err_errno(int ret)
1: -{
1: -	if (libbpf_mode & LIBBPF_STRICT_DIRECT_ERRS)
1: -		/* errno is already assumed to be set on error */
1: -		return ret < 0 ? -errno : ret;
1: -
1: -	/* legacy: on error return -1 directly and don't touch errno */
1: -	return ret;
1: +static inline int libbpf_err_errno(int ret) {
1: +  if (libbpf_mode & LIBBPF_STRICT_DIRECT_ERRS)
1: +    /* errno is already assumed to be set on error */
1: +    return ret < 0 ? -errno : ret;
1: +
1: +  /* legacy: on error return -1 directly and don't touch errno */
1: +  return ret;
1:  }
1:  
1:  /* handle error for pointer-returning APIs, err is assumed to be < 0 always */
1: -static inline void *libbpf_err_ptr(int err)
1: -{
1: -	/* set errno on error, this doesn't break anything */
1: -	errno = -err;
1: +static inline void *libbpf_err_ptr(int err) {
1: +  /* set errno on error, this doesn't break anything */
1: +  errno = -err;
1:  
1: -	if (libbpf_mode & LIBBPF_STRICT_CLEAN_PTRS)
1: -		return NULL;
1: +  if (libbpf_mode & LIBBPF_STRICT_CLEAN_PTRS)
1: +    return NULL;
1:  
1: -	/* legacy: encode err as ptr */
1: -	return ERR_PTR(err);
1: +  /* legacy: encode err as ptr */
1: +  return ERR_PTR(err);
1:  }
1:  
1:  /* handle pointer-returning APIs' error handling */
1: -static inline void *libbpf_ptr(void *ret)
1: -{
1: -	/* set errno on error, this doesn't break anything */
1: -	if (IS_ERR(ret))
1: -		errno = -PTR_ERR(ret);
1: +static inline void *libbpf_ptr(void *ret) {
1: +  /* set errno on error, this doesn't break anything */
1: +  if (IS_ERR(ret))
1: +    errno = -PTR_ERR(ret);
1:  
1: -	if (libbpf_mode & LIBBPF_STRICT_CLEAN_PTRS)
1: -		return IS_ERR(ret) ? NULL : ret;
1: +  if (libbpf_mode & LIBBPF_STRICT_CLEAN_PTRS)
1: +    return IS_ERR(ret) ? NULL : ret;
1:  
1: -	/* legacy: pass-through original pointer */
1: -	return ret;
1: +  /* legacy: pass-through original pointer */
1: +  return ret;
1:  }
1:  
1:  #endif /* __LIBBPF_LIBBPF_INTERNAL_H */
1: diff --git a/src/cc/libbpf/src/libbpf_legacy.h b/src/cc/libbpf/src/libbpf_legacy.h
1: index df0d03dc..3dc1891f 100644
1: --- a/src/cc/libbpf/src/libbpf_legacy.h
1: +++ b/src/cc/libbpf/src/libbpf_legacy.h
1: @@ -3,7 +3,8 @@
1:  /*
1:   * Libbpf legacy APIs (either discouraged or deprecated, as mentioned in [0])
1:   *
1: - *   [0] https://docs.google.com/document/d/1UyjTZuPFWiPFyKk1tV5an11_iaRuec6U-ZESZ54nNTY
1: + *   [0]
1: + * https://docs.google.com/document/d/1UyjTZuPFWiPFyKk1tV5an11_iaRuec6U-ZESZ54nNTY
1:   *
1:   * Copyright (C) 2021 Facebook
1:   */
1: @@ -21,37 +22,36 @@ extern "C" {
1:  #endif
1:  
1:  enum libbpf_strict_mode {
1: -	/* Turn on all supported strict features of libbpf to simulate libbpf
1: -	 * v1.0 behavior.
1: -	 * This will be the default behavior in libbpf v1.0.
1: -	 */
1: -	LIBBPF_STRICT_ALL = 0xffffffff,
1: -
1: -	/*
1: -	 * Disable any libbpf 1.0 behaviors. This is the default before libbpf
1: -	 * v1.0. It won't be supported anymore in v1.0, please update your
1: -	 * code so that it handles LIBBPF_STRICT_ALL mode before libbpf v1.0.
1: -	 */
1: -	LIBBPF_STRICT_NONE = 0x00,
1: -	/*
1: -	 * Return NULL pointers on error, not ERR_PTR(err).
1: -	 * Additionally, libbpf also always sets errno to corresponding Exx
1: -	 * (positive) error code.
1: -	 */
1: -	LIBBPF_STRICT_CLEAN_PTRS = 0x01,
1: -	/*
1: -	 * Return actual error codes from low-level APIs directly, not just -1.
1: -	 * Additionally, libbpf also always sets errno to corresponding Exx
1: -	 * (positive) error code.
1: -	 */
1: -	LIBBPF_STRICT_DIRECT_ERRS = 0x02,
1: -
1: -	__LIBBPF_STRICT_LAST,
1: +  /* Turn on all supported strict features of libbpf to simulate libbpf
1: +   * v1.0 behavior.
1: +   * This will be the default behavior in libbpf v1.0.
1: +   */
1: +  LIBBPF_STRICT_ALL = 0xffffffff,
1: +
1: +  /*
1: +   * Disable any libbpf 1.0 behaviors. This is the default before libbpf
1: +   * v1.0. It won't be supported anymore in v1.0, please update your
1: +   * code so that it handles LIBBPF_STRICT_ALL mode before libbpf v1.0.
1: +   */
1: +  LIBBPF_STRICT_NONE = 0x00,
1: +  /*
1: +   * Return NULL pointers on error, not ERR_PTR(err).
1: +   * Additionally, libbpf also always sets errno to corresponding Exx
1: +   * (positive) error code.
1: +   */
1: +  LIBBPF_STRICT_CLEAN_PTRS = 0x01,
1: +  /*
1: +   * Return actual error codes from low-level APIs directly, not just -1.
1: +   * Additionally, libbpf also always sets errno to corresponding Exx
1: +   * (positive) error code.
1: +   */
1: +  LIBBPF_STRICT_DIRECT_ERRS = 0x02,
1: +
1: +  __LIBBPF_STRICT_LAST,
1:  };
1:  
1:  LIBBPF_API int libbpf_set_strict_mode(enum libbpf_strict_mode mode);
1:  
1: -
1:  #ifdef __cplusplus
1:  } /* extern "C" */
1:  #endif
1: diff --git a/src/cc/libbpf/src/libbpf_probes.c b/src/cc/libbpf/src/libbpf_probes.c
1: index ecaae292..840fc6a4 100644
1: --- a/src/cc/libbpf/src/libbpf_probes.c
1: +++ b/src/cc/libbpf/src/libbpf_probes.c
1: @@ -3,11 +3,11 @@
1:  
1:  #include <errno.h>
1:  #include <fcntl.h>
1: -#include <string.h>
1: -#include <stdlib.h>
1: -#include <unistd.h>
1:  #include <net/if.h>
1: +#include <stdlib.h>
1: +#include <string.h>
1:  #include <sys/utsname.h>
1: +#include <unistd.h>
1:  
1:  #include <linux/btf.h>
1:  #include <linux/filter.h>
1: @@ -17,323 +17,304 @@
1:  #include "libbpf.h"
1:  #include "libbpf_internal.h"
1:  
1: -static bool grep(const char *buffer, const char *pattern)
1: -{
1: -	return !!strstr(buffer, pattern);
1: +static bool grep(const char *buffer, const char *pattern) {
1: +  return !!strstr(buffer, pattern);
1:  }
1:  
1: -static int get_vendor_id(int ifindex)
1: -{
1: -	char ifname[IF_NAMESIZE], path[64], buf[8];
1: -	ssize_t len;
1: -	int fd;
1: +static int get_vendor_id(int ifindex) {
1: +  char ifname[IF_NAMESIZE], path[64], buf[8];
1: +  ssize_t len;
1: +  int fd;
1:  
1: -	if (!if_indextoname(ifindex, ifname))
1: -		return -1;
1: +  if (!if_indextoname(ifindex, ifname))
1: +    return -1;
1:  
1: -	snprintf(path, sizeof(path), "/sys/class/net/%s/device/vendor", ifname);
1: +  snprintf(path, sizeof(path), "/sys/class/net/%s/device/vendor", ifname);
1:  
1: -	fd = open(path, O_RDONLY);
1: -	if (fd < 0)
1: -		return -1;
1: +  fd = open(path, O_RDONLY);
1: +  if (fd < 0)
1: +    return -1;
1:  
1: -	len = read(fd, buf, sizeof(buf));
1: -	close(fd);
1: -	if (len < 0)
1: -		return -1;
1: -	if (len >= (ssize_t)sizeof(buf))
1: -		return -1;
1: -	buf[len] = '\0';
1: +  len = read(fd, buf, sizeof(buf));
1: +  close(fd);
1: +  if (len < 0)
1: +    return -1;
1: +  if (len >= (ssize_t)sizeof(buf))
1: +    return -1;
1: +  buf[len] = '\0';
1:  
1: -	return strtol(buf, NULL, 0);
1: +  return strtol(buf, NULL, 0);
1:  }
1:  
1: -static int get_kernel_version(void)
1: -{
1: -	int version, subversion, patchlevel;
1: -	struct utsname utsn;
1: +static int get_kernel_version(void) {
1: +  int version, subversion, patchlevel;
1: +  struct utsname utsn;
1:  
1: -	/* Return 0 on failure, and attempt to probe with empty kversion */
1: -	if (uname(&utsn))
1: -		return 0;
1: +  /* Return 0 on failure, and attempt to probe with empty kversion */
1: +  if (uname(&utsn))
1: +    return 0;
1:  
1: -	if (sscanf(utsn.release, "%d.%d.%d",
1: -		   &version, &subversion, &patchlevel) != 3)
1: -		return 0;
1: +  if (sscanf(utsn.release, "%d.%d.%d", &version, &subversion, &patchlevel) != 3)
1: +    return 0;
1:  
1: -	return (version << 16) + (subversion << 8) + patchlevel;
1: +  return (version << 16) + (subversion << 8) + patchlevel;
1:  }
1:  
1: -static void
1: -probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns,
1: -	   size_t insns_cnt, char *buf, size_t buf_len, __u32 ifindex)
1: -{
1: -	struct bpf_load_program_attr xattr = {};
1: -	int fd;
1: -
1: -	switch (prog_type) {
1: -	case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
1: -		xattr.expected_attach_type = BPF_CGROUP_INET4_CONNECT;
1: -		break;
1: -	case BPF_PROG_TYPE_SK_LOOKUP:
1: -		xattr.expected_attach_type = BPF_SK_LOOKUP;
1: -		break;
1: -	case BPF_PROG_TYPE_KPROBE:
1: -		xattr.kern_version = get_kernel_version();
1: -		break;
1: -	case BPF_PROG_TYPE_UNSPEC:
1: -	case BPF_PROG_TYPE_SOCKET_FILTER:
1: -	case BPF_PROG_TYPE_SCHED_CLS:
1: -	case BPF_PROG_TYPE_SCHED_ACT:
1: -	case BPF_PROG_TYPE_TRACEPOINT:
1: -	case BPF_PROG_TYPE_XDP:
1: -	case BPF_PROG_TYPE_PERF_EVENT:
1: -	case BPF_PROG_TYPE_CGROUP_SKB:
1: -	case BPF_PROG_TYPE_CGROUP_SOCK:
1: -	case BPF_PROG_TYPE_LWT_IN:
1: -	case BPF_PROG_TYPE_LWT_OUT:
1: -	case BPF_PROG_TYPE_LWT_XMIT:
1: -	case BPF_PROG_TYPE_SOCK_OPS:
1: -	case BPF_PROG_TYPE_SK_SKB:
1: -	case BPF_PROG_TYPE_CGROUP_DEVICE:
1: -	case BPF_PROG_TYPE_SK_MSG:
1: -	case BPF_PROG_TYPE_RAW_TRACEPOINT:
1: -	case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
1: -	case BPF_PROG_TYPE_LWT_SEG6LOCAL:
1: -	case BPF_PROG_TYPE_LIRC_MODE2:
1: -	case BPF_PROG_TYPE_SK_REUSEPORT:
1: -	case BPF_PROG_TYPE_FLOW_DISSECTOR:
1: -	case BPF_PROG_TYPE_CGROUP_SYSCTL:
1: -	case BPF_PROG_TYPE_CGROUP_SOCKOPT:
1: -	case BPF_PROG_TYPE_TRACING:
1: -	case BPF_PROG_TYPE_STRUCT_OPS:
1: -	case BPF_PROG_TYPE_EXT:
1: -	case BPF_PROG_TYPE_LSM:
1: -	default:
1: -		break;
1: -	}
1: -
1: -	xattr.prog_type = prog_type;
1: -	xattr.insns = insns;
1: -	xattr.insns_cnt = insns_cnt;
1: -	xattr.license = "GPL";
1: -	xattr.prog_ifindex = ifindex;
1: -
1: -	fd = bpf_load_program_xattr(&xattr, buf, buf_len);
1: -	if (fd >= 0)
1: -		close(fd);
1: +static void probe_load(enum bpf_prog_type prog_type,
1: +                       const struct bpf_insn *insns, size_t insns_cnt,
1: +                       char *buf, size_t buf_len, __u32 ifindex) {
1: +  struct bpf_load_program_attr xattr = {};
1: +  int fd;
1: +
1: +  switch (prog_type) {
1: +  case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
1: +    xattr.expected_attach_type = BPF_CGROUP_INET4_CONNECT;
1: +    break;
1: +  case BPF_PROG_TYPE_SK_LOOKUP:
1: +    xattr.expected_attach_type = BPF_SK_LOOKUP;
1: +    break;
1: +  case BPF_PROG_TYPE_KPROBE:
1: +    xattr.kern_version = get_kernel_version();
1: +    break;
1: +  case BPF_PROG_TYPE_UNSPEC:
1: +  case BPF_PROG_TYPE_SOCKET_FILTER:
1: +  case BPF_PROG_TYPE_SCHED_CLS:
1: +  case BPF_PROG_TYPE_SCHED_ACT:
1: +  case BPF_PROG_TYPE_TRACEPOINT:
1: +  case BPF_PROG_TYPE_XDP:
1: +  case BPF_PROG_TYPE_PERF_EVENT:
1: +  case BPF_PROG_TYPE_CGROUP_SKB:
1: +  case BPF_PROG_TYPE_CGROUP_SOCK:
1: +  case BPF_PROG_TYPE_LWT_IN:
1: +  case BPF_PROG_TYPE_LWT_OUT:
1: +  case BPF_PROG_TYPE_LWT_XMIT:
1: +  case BPF_PROG_TYPE_SOCK_OPS:
1: +  case BPF_PROG_TYPE_SK_SKB:
1: +  case BPF_PROG_TYPE_CGROUP_DEVICE:
1: +  case BPF_PROG_TYPE_SK_MSG:
1: +  case BPF_PROG_TYPE_RAW_TRACEPOINT:
1: +  case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
1: +  case BPF_PROG_TYPE_LWT_SEG6LOCAL:
1: +  case BPF_PROG_TYPE_LIRC_MODE2:
1: +  case BPF_PROG_TYPE_SK_REUSEPORT:
1: +  case BPF_PROG_TYPE_FLOW_DISSECTOR:
1: +  case BPF_PROG_TYPE_CGROUP_SYSCTL:
1: +  case BPF_PROG_TYPE_CGROUP_SOCKOPT:
1: +  case BPF_PROG_TYPE_TRACING:
1: +  case BPF_PROG_TYPE_STRUCT_OPS:
1: +  case BPF_PROG_TYPE_EXT:
1: +  case BPF_PROG_TYPE_LSM:
1: +  default:
1: +    break;
1: +  }
1: +
1: +  xattr.prog_type = prog_type;
1: +  xattr.insns = insns;
1: +  xattr.insns_cnt = insns_cnt;
1: +  xattr.license = "GPL";
1: +  xattr.prog_ifindex = ifindex;
1: +
1: +  fd = bpf_load_program_xattr(&xattr, buf, buf_len);
1: +  if (fd >= 0)
1: +    close(fd);
1:  }
1:  
1: -bool bpf_probe_prog_type(enum bpf_prog_type prog_type, __u32 ifindex)
1: -{
1: -	struct bpf_insn insns[2] = {
1: -		BPF_MOV64_IMM(BPF_REG_0, 0),
1: -		BPF_EXIT_INSN()
1: -	};
1: +bool bpf_probe_prog_type(enum bpf_prog_type prog_type, __u32 ifindex) {
1: +  struct bpf_insn insns[2] = {BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN()};
1:  
1: -	if (ifindex && prog_type == BPF_PROG_TYPE_SCHED_CLS)
1: -		/* nfp returns -EINVAL on exit(0) with TC offload */
1: -		insns[0].imm = 2;
1: +  if (ifindex && prog_type == BPF_PROG_TYPE_SCHED_CLS)
1: +    /* nfp returns -EINVAL on exit(0) with TC offload */
1: +    insns[0].imm = 2;
1:  
1: -	errno = 0;
1: -	probe_load(prog_type, insns, ARRAY_SIZE(insns), NULL, 0, ifindex);
1: +  errno = 0;
1: +  probe_load(prog_type, insns, ARRAY_SIZE(insns), NULL, 0, ifindex);
1:  
1: -	return errno != EINVAL && errno != EOPNOTSUPP;
1: +  return errno != EINVAL && errno != EOPNOTSUPP;
1:  }
1:  
1:  int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
1: -			 const char *str_sec, size_t str_len)
1: -{
1: -	struct btf_header hdr = {
1: -		.magic = BTF_MAGIC,
1: -		.version = BTF_VERSION,
1: -		.hdr_len = sizeof(struct btf_header),
1: -		.type_len = types_len,
1: -		.str_off = types_len,
1: -		.str_len = str_len,
1: -	};
1: -	int btf_fd, btf_len;
1: -	__u8 *raw_btf;
1: -
1: -	btf_len = hdr.hdr_len + hdr.type_len + hdr.str_len;
1: -	raw_btf = malloc(btf_len);
1: -	if (!raw_btf)
1: -		return -ENOMEM;
1: -
1: -	memcpy(raw_btf, &hdr, sizeof(hdr));
1: -	memcpy(raw_btf + hdr.hdr_len, raw_types, hdr.type_len);
1: -	memcpy(raw_btf + hdr.hdr_len + hdr.type_len, str_sec, hdr.str_len);
1: -
1: -	btf_fd = bpf_load_btf(raw_btf, btf_len, NULL, 0, false);
1: -
1: -	free(raw_btf);
1: -	return btf_fd;
1: +                         const char *str_sec, size_t str_len) {
1: +  struct btf_header hdr = {
1: +      .magic = BTF_MAGIC,
1: +      .version = BTF_VERSION,
1: +      .hdr_len = sizeof(struct btf_header),
1: +      .type_len = types_len,
1: +      .str_off = types_len,
1: +      .str_len = str_len,
1: +  };
1: +  int btf_fd, btf_len;
1: +  __u8 *raw_btf;
1: +
1: +  btf_len = hdr.hdr_len + hdr.type_len + hdr.str_len;
1: +  raw_btf = malloc(btf_len);
1: +  if (!raw_btf)
1: +    return -ENOMEM;
1: +
1: +  memcpy(raw_btf, &hdr, sizeof(hdr));
1: +  memcpy(raw_btf + hdr.hdr_len, raw_types, hdr.type_len);
1: +  memcpy(raw_btf + hdr.hdr_len + hdr.type_len, str_sec, hdr.str_len);
1: +
1: +  btf_fd = bpf_load_btf(raw_btf, btf_len, NULL, 0, false);
1: +
1: +  free(raw_btf);
1: +  return btf_fd;
1:  }
1:  
1: -static int load_local_storage_btf(void)
1: -{
1: -	const char strs[] = "\0bpf_spin_lock\0val\0cnt\0l";
1: -	/* struct bpf_spin_lock {
1: -	 *   int val;
1: -	 * };
1: -	 * struct val {
1: -	 *   int cnt;
1: -	 *   struct bpf_spin_lock l;
1: -	 * };
1: -	 */
1: -	__u32 types[] = {
1: -		/* int */
1: -		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
1: -		/* struct bpf_spin_lock */                      /* [2] */
1: -		BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), 4),
1: -		BTF_MEMBER_ENC(15, 1, 0), /* int val; */
1: -		/* struct val */                                /* [3] */
1: -		BTF_TYPE_ENC(15, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 2), 8),
1: -		BTF_MEMBER_ENC(19, 1, 0), /* int cnt; */
1: -		BTF_MEMBER_ENC(23, 2, 32),/* struct bpf_spin_lock l; */
1: -	};
1: -
1: -	return libbpf__load_raw_btf((char *)types, sizeof(types),
1: -				     strs, sizeof(strs));
1: +static int load_local_storage_btf(void) {
1: +  const char strs[] = "\0bpf_spin_lock\0val\0cnt\0l";
1: +  /* struct bpf_spin_lock {
1: +   *   int val;
1: +   * };
1: +   * struct val {
1: +   *   int cnt;
1: +   *   struct bpf_spin_lock l;
1: +   * };
1: +   */
1: +  __u32 types[] = {
1: +      /* int */
1: +      BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
1: +      /* struct bpf_spin_lock */                     /* [2] */
1: +      BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 1), 4),
1: +      BTF_MEMBER_ENC(15, 1, 0), /* int val; */
1: +      /* struct val */          /* [3] */
1: +      BTF_TYPE_ENC(15, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 2), 8),
1: +      BTF_MEMBER_ENC(19, 1, 0),  /* int cnt; */
1: +      BTF_MEMBER_ENC(23, 2, 32), /* struct bpf_spin_lock l; */
1: +  };
1: +
1: +  return libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs));
1:  }
1:  
1: -bool bpf_probe_map_type(enum bpf_map_type map_type, __u32 ifindex)
1: -{
1: -	int key_size, value_size, max_entries, map_flags;
1: -	__u32 btf_key_type_id = 0, btf_value_type_id = 0;
1: -	struct bpf_create_map_attr attr = {};
1: -	int fd = -1, btf_fd = -1, fd_inner;
1: -
1: -	key_size	= sizeof(__u32);
1: -	value_size	= sizeof(__u32);
1: -	max_entries	= 1;
1: -	map_flags	= 0;
1: -
1: -	switch (map_type) {
1: -	case BPF_MAP_TYPE_STACK_TRACE:
1: -		value_size	= sizeof(__u64);
1: -		break;
1: -	case BPF_MAP_TYPE_LPM_TRIE:
1: -		key_size	= sizeof(__u64);
1: -		value_size	= sizeof(__u64);
1: -		map_flags	= BPF_F_NO_PREALLOC;
1: -		break;
1: -	case BPF_MAP_TYPE_CGROUP_STORAGE:
1: -	case BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE:
1: -		key_size	= sizeof(struct bpf_cgroup_storage_key);
1: -		value_size	= sizeof(__u64);
1: -		max_entries	= 0;
1: -		break;
1: -	case BPF_MAP_TYPE_QUEUE:
1: -	case BPF_MAP_TYPE_STACK:
1: -		key_size	= 0;
1: -		break;
1: -	case BPF_MAP_TYPE_SK_STORAGE:
1: -	case BPF_MAP_TYPE_INODE_STORAGE:
1: -	case BPF_MAP_TYPE_TASK_STORAGE:
1: -		btf_key_type_id = 1;
1: -		btf_value_type_id = 3;
1: -		value_size = 8;
1: -		max_entries = 0;
1: -		map_flags = BPF_F_NO_PREALLOC;
1: -		btf_fd = load_local_storage_btf();
1: -		if (btf_fd < 0)
1: -			return false;
1: -		break;
1: -	case BPF_MAP_TYPE_RINGBUF:
1: -		key_size = 0;
1: -		value_size = 0;
1: -		max_entries = 4096;
1: -		break;
1: -	case BPF_MAP_TYPE_UNSPEC:
1: -	case BPF_MAP_TYPE_HASH:
1: -	case BPF_MAP_TYPE_ARRAY:
1: -	case BPF_MAP_TYPE_PROG_ARRAY:
1: -	case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
1: -	case BPF_MAP_TYPE_PERCPU_HASH:
1: -	case BPF_MAP_TYPE_PERCPU_ARRAY:
1: -	case BPF_MAP_TYPE_CGROUP_ARRAY:
1: -	case BPF_MAP_TYPE_LRU_HASH:
1: -	case BPF_MAP_TYPE_LRU_PERCPU_HASH:
1: -	case BPF_MAP_TYPE_ARRAY_OF_MAPS:
1: -	case BPF_MAP_TYPE_HASH_OF_MAPS:
1: -	case BPF_MAP_TYPE_DEVMAP:
1: -	case BPF_MAP_TYPE_DEVMAP_HASH:
1: -	case BPF_MAP_TYPE_SOCKMAP:
1: -	case BPF_MAP_TYPE_CPUMAP:
1: -	case BPF_MAP_TYPE_XSKMAP:
1: -	case BPF_MAP_TYPE_SOCKHASH:
1: -	case BPF_MAP_TYPE_REUSEPORT_SOCKARRAY:
1: -	case BPF_MAP_TYPE_STRUCT_OPS:
1: -	default:
1: -		break;
1: -	}
1: -
1: -	if (map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS ||
1: -	    map_type == BPF_MAP_TYPE_HASH_OF_MAPS) {
1: -		/* TODO: probe for device, once libbpf has a function to create
1: -		 * map-in-map for offload
1: -		 */
1: -		if (ifindex)
1: -			return false;
1: -
1: -		fd_inner = bpf_create_map(BPF_MAP_TYPE_HASH,
1: -					  sizeof(__u32), sizeof(__u32), 1, 0);
1: -		if (fd_inner < 0)
1: -			return false;
1: -		fd = bpf_create_map_in_map(map_type, NULL, sizeof(__u32),
1: -					   fd_inner, 1, 0);
1: -		close(fd_inner);
1: -	} else {
1: -		/* Note: No other restriction on map type probes for offload */
1: -		attr.map_type = map_type;
1: -		attr.key_size = key_size;
1: -		attr.value_size = value_size;
1: -		attr.max_entries = max_entries;
1: -		attr.map_flags = map_flags;
1: -		attr.map_ifindex = ifindex;
1: -		if (btf_fd >= 0) {
1: -			attr.btf_fd = btf_fd;
1: -			attr.btf_key_type_id = btf_key_type_id;
1: -			attr.btf_value_type_id = btf_value_type_id;
1: -		}
1: -
1: -		fd = bpf_create_map_xattr(&attr);
1: -	}
1: -	if (fd >= 0)
1: -		close(fd);
1: -	if (btf_fd >= 0)
1: -		close(btf_fd);
1: -
1: -	return fd >= 0;
1: +bool bpf_probe_map_type(enum bpf_map_type map_type, __u32 ifindex) {
1: +  int key_size, value_size, max_entries, map_flags;
1: +  __u32 btf_key_type_id = 0, btf_value_type_id = 0;
1: +  struct bpf_create_map_attr attr = {};
1: +  int fd = -1, btf_fd = -1, fd_inner;
1: +
1: +  key_size = sizeof(__u32);
1: +  value_size = sizeof(__u32);
1: +  max_entries = 1;
1: +  map_flags = 0;
1: +
1: +  switch (map_type) {
1: +  case BPF_MAP_TYPE_STACK_TRACE:
1: +    value_size = sizeof(__u64);
1: +    break;
1: +  case BPF_MAP_TYPE_LPM_TRIE:
1: +    key_size = sizeof(__u64);
1: +    value_size = sizeof(__u64);
1: +    map_flags = BPF_F_NO_PREALLOC;
1: +    break;
1: +  case BPF_MAP_TYPE_CGROUP_STORAGE:
1: +  case BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE:
1: +    key_size = sizeof(struct bpf_cgroup_storage_key);
1: +    value_size = sizeof(__u64);
1: +    max_entries = 0;
1: +    break;
1: +  case BPF_MAP_TYPE_QUEUE:
1: +  case BPF_MAP_TYPE_STACK:
1: +    key_size = 0;
1: +    break;
1: +  case BPF_MAP_TYPE_SK_STORAGE:
1: +  case BPF_MAP_TYPE_INODE_STORAGE:
1: +  case BPF_MAP_TYPE_TASK_STORAGE:
1: +    btf_key_type_id = 1;
1: +    btf_value_type_id = 3;
1: +    value_size = 8;
1: +    max_entries = 0;
1: +    map_flags = BPF_F_NO_PREALLOC;
1: +    btf_fd = load_local_storage_btf();
1: +    if (btf_fd < 0)
1: +      return false;
1: +    break;
1: +  case BPF_MAP_TYPE_RINGBUF:
1: +    key_size = 0;
1: +    value_size = 0;
1: +    max_entries = 4096;
1: +    break;
1: +  case BPF_MAP_TYPE_UNSPEC:
1: +  case BPF_MAP_TYPE_HASH:
1: +  case BPF_MAP_TYPE_ARRAY:
1: +  case BPF_MAP_TYPE_PROG_ARRAY:
1: +  case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
1: +  case BPF_MAP_TYPE_PERCPU_HASH:
1: +  case BPF_MAP_TYPE_PERCPU_ARRAY:
1: +  case BPF_MAP_TYPE_CGROUP_ARRAY:
1: +  case BPF_MAP_TYPE_LRU_HASH:
1: +  case BPF_MAP_TYPE_LRU_PERCPU_HASH:
1: +  case BPF_MAP_TYPE_ARRAY_OF_MAPS:
1: +  case BPF_MAP_TYPE_HASH_OF_MAPS:
1: +  case BPF_MAP_TYPE_DEVMAP:
1: +  case BPF_MAP_TYPE_DEVMAP_HASH:
1: +  case BPF_MAP_TYPE_SOCKMAP:
1: +  case BPF_MAP_TYPE_CPUMAP:
1: +  case BPF_MAP_TYPE_XSKMAP:
1: +  case BPF_MAP_TYPE_SOCKHASH:
1: +  case BPF_MAP_TYPE_REUSEPORT_SOCKARRAY:
1: +  case BPF_MAP_TYPE_STRUCT_OPS:
1: +  default:
1: +    break;
1: +  }
1: +
1: +  if (map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS ||
1: +      map_type == BPF_MAP_TYPE_HASH_OF_MAPS) {
1: +    /* TODO: probe for device, once libbpf has a function to create
1: +     * map-in-map for offload
1: +     */
1: +    if (ifindex)
1: +      return false;
1: +
1: +    fd_inner =
1: +        bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(__u32), sizeof(__u32), 1, 0);
1: +    if (fd_inner < 0)
1: +      return false;
1: +    fd = bpf_create_map_in_map(map_type, NULL, sizeof(__u32), fd_inner, 1, 0);
1: +    close(fd_inner);
1: +  } else {
1: +    /* Note: No other restriction on map type probes for offload */
1: +    attr.map_type = map_type;
1: +    attr.key_size = key_size;
1: +    attr.value_size = value_size;
1: +    attr.max_entries = max_entries;
1: +    attr.map_flags = map_flags;
1: +    attr.map_ifindex = ifindex;
1: +    if (btf_fd >= 0) {
1: +      attr.btf_fd = btf_fd;
1: +      attr.btf_key_type_id = btf_key_type_id;
1: +      attr.btf_value_type_id = btf_value_type_id;
1: +    }
1: +
1: +    fd = bpf_create_map_xattr(&attr);
1: +  }
1: +  if (fd >= 0)
1: +    close(fd);
1: +  if (btf_fd >= 0)
1: +    close(btf_fd);
1: +
1: +  return fd >= 0;
1:  }
1:  
1:  bool bpf_probe_helper(enum bpf_func_id id, enum bpf_prog_type prog_type,
1: -		      __u32 ifindex)
1: -{
1: -	struct bpf_insn insns[2] = {
1: -		BPF_EMIT_CALL(id),
1: -		BPF_EXIT_INSN()
1: -	};
1: -	char buf[4096] = {};
1: -	bool res;
1: -
1: -	probe_load(prog_type, insns, ARRAY_SIZE(insns), buf, sizeof(buf),
1: -		   ifindex);
1: -	res = !grep(buf, "invalid func ") && !grep(buf, "unknown func ");
1: -
1: -	if (ifindex) {
1: -		switch (get_vendor_id(ifindex)) {
1: -		case 0x19ee: /* Netronome specific */
1: -			res = res && !grep(buf, "not supported by FW") &&
1: -				!grep(buf, "unsupported function id");
1: -			break;
1: -		default:
1: -			break;
1: -		}
1: -	}
1: -
1: -	return res;
1: +                      __u32 ifindex) {
1: +  struct bpf_insn insns[2] = {BPF_EMIT_CALL(id), BPF_EXIT_INSN()};
1: +  char buf[4096] = {};
1: +  bool res;
1: +
1: +  probe_load(prog_type, insns, ARRAY_SIZE(insns), buf, sizeof(buf), ifindex);
1: +  res = !grep(buf, "invalid func ") && !grep(buf, "unknown func ");
1: +
1: +  if (ifindex) {
1: +    switch (get_vendor_id(ifindex)) {
1: +    case 0x19ee: /* Netronome specific */
1: +      res = res && !grep(buf, "not supported by FW") &&
1: +            !grep(buf, "unsupported function id");
1: +      break;
1: +    default:
1: +      break;
1: +    }
1: +  }
1: +
1: +  return res;
1:  }
1:  
1:  /*
1: @@ -341,18 +322,17 @@ bool bpf_probe_helper(enum bpf_func_id id, enum bpf_prog_type prog_type,
1:   *
1:   * c04c0d2b968a ("bpf: increase complexity limit and maximum program size")
1:   */
1: -bool bpf_probe_large_insn_limit(__u32 ifindex)
1: -{
1: -	struct bpf_insn insns[BPF_MAXINSNS + 1];
1: -	int i;
1: +bool bpf_probe_large_insn_limit(__u32 ifindex) {
1: +  struct bpf_insn insns[BPF_MAXINSNS + 1];
1: +  int i;
1:  
1: -	for (i = 0; i < BPF_MAXINSNS; i++)
1: -		insns[i] = BPF_MOV64_IMM(BPF_REG_0, 1);
1: -	insns[BPF_MAXINSNS] = BPF_EXIT_INSN();
1: +  for (i = 0; i < BPF_MAXINSNS; i++)
1: +    insns[i] = BPF_MOV64_IMM(BPF_REG_0, 1);
1: +  insns[BPF_MAXINSNS] = BPF_EXIT_INSN();
1:  
1: -	errno = 0;
1: -	probe_load(BPF_PROG_TYPE_SCHED_CLS, insns, ARRAY_SIZE(insns), NULL, 0,
1: -		   ifindex);
1: +  errno = 0;
1: +  probe_load(BPF_PROG_TYPE_SCHED_CLS, insns, ARRAY_SIZE(insns), NULL, 0,
1: +             ifindex);
1:  
1: -	return errno != E2BIG && errno != EINVAL;
1: +  return errno != E2BIG && errno != EINVAL;
1:  }
1: diff --git a/src/cc/libbpf/src/linker.c b/src/cc/libbpf/src/linker.c
1: index 10911a8c..50fb1d94 100644
1: --- a/src/cc/libbpf/src/linker.c
1: +++ b/src/cc/libbpf/src/linker.c
1: @@ -4,2889 +4,2903 @@
1:   *
1:   * Copyright (c) 2021 Facebook
1:   */
1: +#include <elf.h>
1: +#include <errno.h>
1: +#include <fcntl.h>
1: +#include <gelf.h>
1: +#include <libelf.h>
1: +#include <linux/btf.h>
1: +#include <linux/err.h>
1:  #include <stdbool.h>
1:  #include <stddef.h>
1:  #include <stdio.h>
1:  #include <stdlib.h>
1:  #include <string.h>
1:  #include <unistd.h>
1: -#include <errno.h>
1: -#include <linux/err.h>
1: -#include <linux/btf.h>
1: -#include <elf.h>
1: -#include <libelf.h>
1: -#include <gelf.h>
1: -#include <fcntl.h>
1: -#include "libbpf.h"
1:  #include "btf.h"
1: +#include "libbpf.h"
1:  #include "libbpf_internal.h"
1:  #include "strset.h"
1:  
1:  #define BTF_EXTERN_SEC ".extern"
1:  
1:  struct src_sec {
1: -	const char *sec_name;
1: -	/* positional (not necessarily ELF) index in an array of sections */
1: -	int id;
1: -	/* positional (not necessarily ELF) index of a matching section in a final object file */
1: -	int dst_id;
1: -	/* section data offset in a matching output section */
1: -	int dst_off;
1: -	/* whether section is omitted from the final ELF file */
1: -	bool skipped;
1: -	/* whether section is an ephemeral section, not mapped to an ELF section */
1: -	bool ephemeral;
1: -
1: -	/* ELF info */
1: -	size_t sec_idx;
1: -	Elf_Scn *scn;
1: -	Elf64_Shdr *shdr;
1: -	Elf_Data *data;
1: -
1: -	/* corresponding BTF DATASEC type ID */
1: -	int sec_type_id;
1: +  const char *sec_name;
1: +  /* positional (not necessarily ELF) index in an array of sections */
1: +  int id;
1: +  /* positional (not necessarily ELF) index of a matching section in a final
1: +   * object file */
1: +  int dst_id;
1: +  /* section data offset in a matching output section */
1: +  int dst_off;
1: +  /* whether section is omitted from the final ELF file */
1: +  bool skipped;
1: +  /* whether section is an ephemeral section, not mapped to an ELF section */
1: +  bool ephemeral;
1: +
1: +  /* ELF info */
1: +  size_t sec_idx;
1: +  Elf_Scn *scn;
1: +  Elf64_Shdr *shdr;
1: +  Elf_Data *data;
1: +
1: +  /* corresponding BTF DATASEC type ID */
1: +  int sec_type_id;
1:  };
1:  
1:  struct src_obj {
1: -	const char *filename;
1: -	int fd;
1: -	Elf *elf;
1: -	/* Section header strings section index */
1: -	size_t shstrs_sec_idx;
1: -	/* SYMTAB section index */
1: -	size_t symtab_sec_idx;
1: -
1: -	struct btf *btf;
1: -	struct btf_ext *btf_ext;
1: -
1: -	/* List of sections (including ephemeral). Slot zero is unused. */
1: -	struct src_sec *secs;
1: -	int sec_cnt;
1: -
1: -	/* mapping of symbol indices from src to dst ELF */
1: -	int *sym_map;
1: -	/* mapping from the src BTF type IDs to dst ones */
1: -	int *btf_type_map;
1: +  const char *filename;
1: +  int fd;
1: +  Elf *elf;
1: +  /* Section header strings section index */
1: +  size_t shstrs_sec_idx;
1: +  /* SYMTAB section index */
1: +  size_t symtab_sec_idx;
1: +
1: +  struct btf *btf;
1: +  struct btf_ext *btf_ext;
1: +
1: +  /* List of sections (including ephemeral). Slot zero is unused. */
1: +  struct src_sec *secs;
1: +  int sec_cnt;
1: +
1: +  /* mapping of symbol indices from src to dst ELF */
1: +  int *sym_map;
1: +  /* mapping from the src BTF type IDs to dst ones */
1: +  int *btf_type_map;
1:  };
1:  
1:  /* single .BTF.ext data section */
1:  struct btf_ext_sec_data {
1: -	size_t rec_cnt;
1: -	__u32 rec_sz;
1: -	void *recs;
1: +  size_t rec_cnt;
1: +  __u32 rec_sz;
1: +  void *recs;
1:  };
1:  
1:  struct glob_sym {
1: -	/* ELF symbol index */
1: -	int sym_idx;
1: -	/* associated section id for .ksyms, .kconfig, etc, but not .extern */
1: -	int sec_id;
1: -	/* extern name offset in STRTAB */
1: -	int name_off;
1: -	/* optional associated BTF type ID */
1: -	int btf_id;
1: -	/* BTF type ID to which VAR/FUNC type is pointing to; used for
1: -	 * rewriting types when extern VAR/FUNC is resolved to a concrete
1: -	 * definition
1: -	 */
1: -	int underlying_btf_id;
1: -	/* sec_var index in the corresponding dst_sec, if exists */
1: -	int var_idx;
1: -
1: -	/* extern or resolved/global symbol */
1: -	bool is_extern;
1: -	/* weak or strong symbol, never goes back from strong to weak */
1: -	bool is_weak;
1: +  /* ELF symbol index */
1: +  int sym_idx;
1: +  /* associated section id for .ksyms, .kconfig, etc, but not .extern */
1: +  int sec_id;
1: +  /* extern name offset in STRTAB */
1: +  int name_off;
1: +  /* optional associated BTF type ID */
1: +  int btf_id;
1: +  /* BTF type ID to which VAR/FUNC type is pointing to; used for
1: +   * rewriting types when extern VAR/FUNC is resolved to a concrete
1: +   * definition
1: +   */
1: +  int underlying_btf_id;
1: +  /* sec_var index in the corresponding dst_sec, if exists */
1: +  int var_idx;
1: +
1: +  /* extern or resolved/global symbol */
1: +  bool is_extern;
1: +  /* weak or strong symbol, never goes back from strong to weak */
1: +  bool is_weak;
1:  };
1:  
1:  struct dst_sec {
1: -	char *sec_name;
1: -	/* positional (not necessarily ELF) index in an array of sections */
1: -	int id;
1: -
1: -	bool ephemeral;
1: -
1: -	/* ELF info */
1: -	size_t sec_idx;
1: -	Elf_Scn *scn;
1: -	Elf64_Shdr *shdr;
1: -	Elf_Data *data;
1: -
1: -	/* final output section size */
1: -	int sec_sz;
1: -	/* final output contents of the section */
1: -	void *raw_data;
1: -
1: -	/* corresponding STT_SECTION symbol index in SYMTAB */
1: -	int sec_sym_idx;
1: -
1: -	/* section's DATASEC variable info, emitted on BTF finalization */
1: -	bool has_btf;
1: -	int sec_var_cnt;
1: -	struct btf_var_secinfo *sec_vars;
1: -
1: -	/* section's .BTF.ext data */
1: -	struct btf_ext_sec_data func_info;
1: -	struct btf_ext_sec_data line_info;
1: -	struct btf_ext_sec_data core_relo_info;
1: +  char *sec_name;
1: +  /* positional (not necessarily ELF) index in an array of sections */
1: +  int id;
1: +
1: +  bool ephemeral;
1: +
1: +  /* ELF info */
1: +  size_t sec_idx;
1: +  Elf_Scn *scn;
1: +  Elf64_Shdr *shdr;
1: +  Elf_Data *data;
1: +
1: +  /* final output section size */
1: +  int sec_sz;
1: +  /* final output contents of the section */
1: +  void *raw_data;
1: +
1: +  /* corresponding STT_SECTION symbol index in SYMTAB */
1: +  int sec_sym_idx;
1: +
1: +  /* section's DATASEC variable info, emitted on BTF finalization */
1: +  bool has_btf;
1: +  int sec_var_cnt;
1: +  struct btf_var_secinfo *sec_vars;
1: +
1: +  /* section's .BTF.ext data */
1: +  struct btf_ext_sec_data func_info;
1: +  struct btf_ext_sec_data line_info;
1: +  struct btf_ext_sec_data core_relo_info;
1:  };
1:  
1:  struct bpf_linker {
1: -	char *filename;
1: -	int fd;
1: -	Elf *elf;
1: -	Elf64_Ehdr *elf_hdr;
1: +  char *filename;
1: +  int fd;
1: +  Elf *elf;
1: +  Elf64_Ehdr *elf_hdr;
1:  
1: -	/* Output sections metadata */
1: -	struct dst_sec *secs;
1: -	int sec_cnt;
1: +  /* Output sections metadata */
1: +  struct dst_sec *secs;
1: +  int sec_cnt;
1:  
1: -	struct strset *strtab_strs; /* STRTAB unique strings */
1: -	size_t strtab_sec_idx; /* STRTAB section index */
1: -	size_t symtab_sec_idx; /* SYMTAB section index */
1: +  struct strset *strtab_strs; /* STRTAB unique strings */
1: +  size_t strtab_sec_idx;      /* STRTAB section index */
1: +  size_t symtab_sec_idx;      /* SYMTAB section index */
1:  
1: -	struct btf *btf;
1: -	struct btf_ext *btf_ext;
1: +  struct btf *btf;
1: +  struct btf_ext *btf_ext;
1:  
1: -	/* global (including extern) ELF symbols */
1: -	int glob_sym_cnt;
1: -	struct glob_sym *glob_syms;
1: +  /* global (including extern) ELF symbols */
1: +  int glob_sym_cnt;
1: +  struct glob_sym *glob_syms;
1:  };
1:  
1: -#define pr_warn_elf(fmt, ...)									\
1: -	libbpf_print(LIBBPF_WARN, "libbpf: " fmt ": %s\n", ##__VA_ARGS__, elf_errmsg(-1))
1: +#define pr_warn_elf(fmt, ...)                                       \
1: +  libbpf_print(LIBBPF_WARN, "libbpf: " fmt ": %s\n", ##__VA_ARGS__, \
1: +               elf_errmsg(-1))
1:  
1:  static int init_output_elf(struct bpf_linker *linker, const char *file);
1:  
1:  static int linker_load_obj_file(struct bpf_linker *linker, const char *filename,
1: -				const struct bpf_linker_file_opts *opts,
1: -				struct src_obj *obj);
1: +                                const struct bpf_linker_file_opts *opts,
1: +                                struct src_obj *obj);
1:  static int linker_sanity_check_elf(struct src_obj *obj);
1: -static int linker_sanity_check_elf_symtab(struct src_obj *obj, struct src_sec *sec);
1: -static int linker_sanity_check_elf_relos(struct src_obj *obj, struct src_sec *sec);
1: +static int linker_sanity_check_elf_symtab(struct src_obj *obj,
1: +                                          struct src_sec *sec);
1: +static int linker_sanity_check_elf_relos(struct src_obj *obj,
1: +                                         struct src_sec *sec);
1:  static int linker_sanity_check_btf(struct src_obj *obj);
1:  static int linker_sanity_check_btf_ext(struct src_obj *obj);
1:  static int linker_fixup_btf(struct src_obj *obj);
1: -static int linker_append_sec_data(struct bpf_linker *linker, struct src_obj *obj);
1: -static int linker_append_elf_syms(struct bpf_linker *linker, struct src_obj *obj);
1: +static int linker_append_sec_data(struct bpf_linker *linker,
1: +                                  struct src_obj *obj);
1: +static int linker_append_elf_syms(struct bpf_linker *linker,
1: +                                  struct src_obj *obj);
1:  static int linker_append_elf_sym(struct bpf_linker *linker, struct src_obj *obj,
1: -				 Elf64_Sym *sym, const char *sym_name, int src_sym_idx);
1: -static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *obj);
1: +                                 Elf64_Sym *sym, const char *sym_name,
1: +                                 int src_sym_idx);
1: +static int linker_append_elf_relos(struct bpf_linker *linker,
1: +                                   struct src_obj *obj);
1:  static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj);
1: -static int linker_append_btf_ext(struct bpf_linker *linker, struct src_obj *obj);
1: +static int linker_append_btf_ext(struct bpf_linker *linker,
1: +                                 struct src_obj *obj);
1:  
1:  static int finalize_btf(struct bpf_linker *linker);
1:  static int finalize_btf_ext(struct bpf_linker *linker);
1:  
1: -void bpf_linker__free(struct bpf_linker *linker)
1: -{
1: -	int i;
1: +void bpf_linker__free(struct bpf_linker *linker) {
1: +  int i;
1:  
1: -	if (!linker)
1: -		return;
1: +  if (!linker)
1: +    return;
1:  
1: -	free(linker->filename);
1: +  free(linker->filename);
1:  
1: -	if (linker->elf)
1: -		elf_end(linker->elf);
1: +  if (linker->elf)
1: +    elf_end(linker->elf);
1:  
1: -	if (linker->fd >= 0)
1: -		close(linker->fd);
1: +  if (linker->fd >= 0)
1: +    close(linker->fd);
1:  
1: -	strset__free(linker->strtab_strs);
1: +  strset__free(linker->strtab_strs);
1:  
1: -	btf__free(linker->btf);
1: -	btf_ext__free(linker->btf_ext);
1: +  btf__free(linker->btf);
1: +  btf_ext__free(linker->btf_ext);
1:  
1: -	for (i = 1; i < linker->sec_cnt; i++) {
1: -		struct dst_sec *sec = &linker->secs[i];
1: +  for (i = 1; i < linker->sec_cnt; i++) {
1: +    struct dst_sec *sec = &linker->secs[i];
1:  
1: -		free(sec->sec_name);
1: -		free(sec->raw_data);
1: -		free(sec->sec_vars);
1: +    free(sec->sec_name);
1: +    free(sec->raw_data);
1: +    free(sec->sec_vars);
1:  
1: -		free(sec->func_info.recs);
1: -		free(sec->line_info.recs);
1: -		free(sec->core_relo_info.recs);
1: -	}
1: -	free(linker->secs);
1: +    free(sec->func_info.recs);
1: +    free(sec->line_info.recs);
1: +    free(sec->core_relo_info.recs);
1: +  }
1: +  free(linker->secs);
1:  
1: -	free(linker);
1: +  free(linker);
1:  }
1:  
1: -struct bpf_linker *bpf_linker__new(const char *filename, struct bpf_linker_opts *opts)
1: -{
1: -	struct bpf_linker *linker;
1: -	int err;
1: +struct bpf_linker *bpf_linker__new(const char *filename,
1: +                                   struct bpf_linker_opts *opts) {
1: +  struct bpf_linker *linker;
1: +  int err;
1:  
1: -	if (!OPTS_VALID(opts, bpf_linker_opts))
1: -		return errno = EINVAL, NULL;
1: +  if (!OPTS_VALID(opts, bpf_linker_opts))
1: +    return errno = EINVAL, NULL;
1:  
1: -	if (elf_version(EV_CURRENT) == EV_NONE) {
1: -		pr_warn_elf("libelf initialization failed");
1: -		return errno = EINVAL, NULL;
1: -	}
1: +  if (elf_version(EV_CURRENT) == EV_NONE) {
1: +    pr_warn_elf("libelf initialization failed");
1: +    return errno = EINVAL, NULL;
1: +  }
1:  
1: -	linker = calloc(1, sizeof(*linker));
1: -	if (!linker)
1: -		return errno = ENOMEM, NULL;
1: +  linker = calloc(1, sizeof(*linker));
1: +  if (!linker)
1: +    return errno = ENOMEM, NULL;
1:  
1: -	linker->fd = -1;
1: +  linker->fd = -1;
1:  
1: -	err = init_output_elf(linker, filename);
1: -	if (err)
1: -		goto err_out;
1: +  err = init_output_elf(linker, filename);
1: +  if (err)
1: +    goto err_out;
1:  
1: -	return linker;
1: +  return linker;
1:  
1:  err_out:
1: -	bpf_linker__free(linker);
1: -	return errno = -err, NULL;
1: +  bpf_linker__free(linker);
1: +  return errno = -err, NULL;
1:  }
1:  
1: -static struct dst_sec *add_dst_sec(struct bpf_linker *linker, const char *sec_name)
1: -{
1: -	struct dst_sec *secs = linker->secs, *sec;
1: -	size_t new_cnt = linker->sec_cnt ? linker->sec_cnt + 1 : 2;
1: +static struct dst_sec *add_dst_sec(struct bpf_linker *linker,
1: +                                   const char *sec_name) {
1: +  struct dst_sec *secs = linker->secs, *sec;
1: +  size_t new_cnt = linker->sec_cnt ? linker->sec_cnt + 1 : 2;
1:  
1: -	secs = libbpf_reallocarray(secs, new_cnt, sizeof(*secs));
1: -	if (!secs)
1: -		return NULL;
1: +  secs = libbpf_reallocarray(secs, new_cnt, sizeof(*secs));
1: +  if (!secs)
1: +    return NULL;
1:  
1: -	/* zero out newly allocated memory */
1: -	memset(secs + linker->sec_cnt, 0, (new_cnt - linker->sec_cnt) * sizeof(*secs));
1: +  /* zero out newly allocated memory */
1: +  memset(secs + linker->sec_cnt, 0,
1: +         (new_cnt - linker->sec_cnt) * sizeof(*secs));
1:  
1: -	linker->secs = secs;
1: -	linker->sec_cnt = new_cnt;
1: +  linker->secs = secs;
1: +  linker->sec_cnt = new_cnt;
1:  
1: -	sec = &linker->secs[new_cnt - 1];
1: -	sec->id = new_cnt - 1;
1: -	sec->sec_name = strdup(sec_name);
1: -	if (!sec->sec_name)
1: -		return NULL;
1: +  sec = &linker->secs[new_cnt - 1];
1: +  sec->id = new_cnt - 1;
1: +  sec->sec_name = strdup(sec_name);
1: +  if (!sec->sec_name)
1: +    return NULL;
1:  
1: -	return sec;
1: +  return sec;
1:  }
1:  
1: -static Elf64_Sym *add_new_sym(struct bpf_linker *linker, size_t *sym_idx)
1: -{
1: -	struct dst_sec *symtab = &linker->secs[linker->symtab_sec_idx];
1: -	Elf64_Sym *syms, *sym;
1: -	size_t sym_cnt = symtab->sec_sz / sizeof(*sym);
1: +static Elf64_Sym *add_new_sym(struct bpf_linker *linker, size_t *sym_idx) {
1: +  struct dst_sec *symtab = &linker->secs[linker->symtab_sec_idx];
1: +  Elf64_Sym *syms, *sym;
1: +  size_t sym_cnt = symtab->sec_sz / sizeof(*sym);
1:  
1: -	syms = libbpf_reallocarray(symtab->raw_data, sym_cnt + 1, sizeof(*sym));
1: -	if (!syms)
1: -		return NULL;
1: +  syms = libbpf_reallocarray(symtab->raw_data, sym_cnt + 1, sizeof(*sym));
1: +  if (!syms)
1: +    return NULL;
1:  
1: -	sym = &syms[sym_cnt];
1: -	memset(sym, 0, sizeof(*sym));
1: +  sym = &syms[sym_cnt];
1: +  memset(sym, 0, sizeof(*sym));
1:  
1: -	symtab->raw_data = syms;
1: -	symtab->sec_sz += sizeof(*sym);
1: -	symtab->shdr->sh_size += sizeof(*sym);
1: -	symtab->data->d_size += sizeof(*sym);
1: +  symtab->raw_data = syms;
1: +  symtab->sec_sz += sizeof(*sym);
1: +  symtab->shdr->sh_size += sizeof(*sym);
1: +  symtab->data->d_size += sizeof(*sym);
1:  
1: -	if (sym_idx)
1: -		*sym_idx = sym_cnt;
1: +  if (sym_idx)
1: +    *sym_idx = sym_cnt;
1:  
1: -	return sym;
1: +  return sym;
1:  }
1:  
1: -static int init_output_elf(struct bpf_linker *linker, const char *file)
1: -{
1: -	int err, str_off;
1: -	Elf64_Sym *init_sym;
1: -	struct dst_sec *sec;
1: -
1: -	linker->filename = strdup(file);
1: -	if (!linker->filename)
1: -		return -ENOMEM;
1: -
1: -	linker->fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
1: -	if (linker->fd < 0) {
1: -		err = -errno;
1: -		pr_warn("failed to create '%s': %d\n", file, err);
1: -		return err;
1: -	}
1: -
1: -	linker->elf = elf_begin(linker->fd, ELF_C_WRITE, NULL);
1: -	if (!linker->elf) {
1: -		pr_warn_elf("failed to create ELF object");
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* ELF header */
1: -	linker->elf_hdr = elf64_newehdr(linker->elf);
1: -	if (!linker->elf_hdr) {
1: -		pr_warn_elf("failed to create ELF header");
1: -		return -EINVAL;
1: -	}
1: -
1: -	linker->elf_hdr->e_machine = EM_BPF;
1: -	linker->elf_hdr->e_type = ET_REL;
1: +static int init_output_elf(struct bpf_linker *linker, const char *file) {
1: +  int err, str_off;
1: +  Elf64_Sym *init_sym;
1: +  struct dst_sec *sec;
1: +
1: +  linker->filename = strdup(file);
1: +  if (!linker->filename)
1: +    return -ENOMEM;
1: +
1: +  linker->fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
1: +  if (linker->fd < 0) {
1: +    err = -errno;
1: +    pr_warn("failed to create '%s': %d\n", file, err);
1: +    return err;
1: +  }
1: +
1: +  linker->elf = elf_begin(linker->fd, ELF_C_WRITE, NULL);
1: +  if (!linker->elf) {
1: +    pr_warn_elf("failed to create ELF object");
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* ELF header */
1: +  linker->elf_hdr = elf64_newehdr(linker->elf);
1: +  if (!linker->elf_hdr) {
1: +    pr_warn_elf("failed to create ELF header");
1: +    return -EINVAL;
1: +  }
1: +
1: +  linker->elf_hdr->e_machine = EM_BPF;
1: +  linker->elf_hdr->e_type = ET_REL;
1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
1: -	linker->elf_hdr->e_ident[EI_DATA] = ELFDATA2LSB;
1: +  linker->elf_hdr->e_ident[EI_DATA] = ELFDATA2LSB;
1:  #elif __BYTE_ORDER == __BIG_ENDIAN
1: -	linker->elf_hdr->e_ident[EI_DATA] = ELFDATA2MSB;
1: +  linker->elf_hdr->e_ident[EI_DATA] = ELFDATA2MSB;
1:  #else
1:  #error "Unknown __BYTE_ORDER"
1:  #endif
1:  
1: -	/* STRTAB */
1: -	/* initialize strset with an empty string to conform to ELF */
1: -	linker->strtab_strs = strset__new(INT_MAX, "", sizeof(""));
1: -	if (libbpf_get_error(linker->strtab_strs))
1: -		return libbpf_get_error(linker->strtab_strs);
1: -
1: -	sec = add_dst_sec(linker, ".strtab");
1: -	if (!sec)
1: -		return -ENOMEM;
1: -
1: -	sec->scn = elf_newscn(linker->elf);
1: -	if (!sec->scn) {
1: -		pr_warn_elf("failed to create STRTAB section");
1: -		return -EINVAL;
1: -	}
1: -
1: -	sec->shdr = elf64_getshdr(sec->scn);
1: -	if (!sec->shdr)
1: -		return -EINVAL;
1: -
1: -	sec->data = elf_newdata(sec->scn);
1: -	if (!sec->data) {
1: -		pr_warn_elf("failed to create STRTAB data");
1: -		return -EINVAL;
1: -	}
1: -
1: -	str_off = strset__add_str(linker->strtab_strs, sec->sec_name);
1: -	if (str_off < 0)
1: -		return str_off;
1: -
1: -	sec->sec_idx = elf_ndxscn(sec->scn);
1: -	linker->elf_hdr->e_shstrndx = sec->sec_idx;
1: -	linker->strtab_sec_idx = sec->sec_idx;
1: -
1: -	sec->shdr->sh_name = str_off;
1: -	sec->shdr->sh_type = SHT_STRTAB;
1: -	sec->shdr->sh_flags = SHF_STRINGS;
1: -	sec->shdr->sh_offset = 0;
1: -	sec->shdr->sh_link = 0;
1: -	sec->shdr->sh_info = 0;
1: -	sec->shdr->sh_addralign = 1;
1: -	sec->shdr->sh_size = sec->sec_sz = 0;
1: -	sec->shdr->sh_entsize = 0;
1: -
1: -	/* SYMTAB */
1: -	sec = add_dst_sec(linker, ".symtab");
1: -	if (!sec)
1: -		return -ENOMEM;
1: -
1: -	sec->scn = elf_newscn(linker->elf);
1: -	if (!sec->scn) {
1: -		pr_warn_elf("failed to create SYMTAB section");
1: -		return -EINVAL;
1: -	}
1: -
1: -	sec->shdr = elf64_getshdr(sec->scn);
1: -	if (!sec->shdr)
1: -		return -EINVAL;
1: -
1: -	sec->data = elf_newdata(sec->scn);
1: -	if (!sec->data) {
1: -		pr_warn_elf("failed to create SYMTAB data");
1: -		return -EINVAL;
1: -	}
1: -
1: -	str_off = strset__add_str(linker->strtab_strs, sec->sec_name);
1: -	if (str_off < 0)
1: -		return str_off;
1: -
1: -	sec->sec_idx = elf_ndxscn(sec->scn);
1: -	linker->symtab_sec_idx = sec->sec_idx;
1: -
1: -	sec->shdr->sh_name = str_off;
1: -	sec->shdr->sh_type = SHT_SYMTAB;
1: -	sec->shdr->sh_flags = 0;
1: -	sec->shdr->sh_offset = 0;
1: -	sec->shdr->sh_link = linker->strtab_sec_idx;
1: -	/* sh_info should be one greater than the index of the last local
1: -	 * symbol (i.e., binding is STB_LOCAL). But why and who cares?
1: -	 */
1: -	sec->shdr->sh_info = 0;
1: -	sec->shdr->sh_addralign = 8;
1: -	sec->shdr->sh_entsize = sizeof(Elf64_Sym);
1: -
1: -	/* .BTF */
1: -	linker->btf = btf__new_empty();
1: -	err = libbpf_get_error(linker->btf);
1: -	if (err)
1: -		return err;
1: -
1: -	/* add the special all-zero symbol */
1: -	init_sym = add_new_sym(linker, NULL);
1: -	if (!init_sym)
1: -		return -EINVAL;
1: -
1: -	init_sym->st_name = 0;
1: -	init_sym->st_info = 0;
1: -	init_sym->st_other = 0;
1: -	init_sym->st_shndx = SHN_UNDEF;
1: -	init_sym->st_value = 0;
1: -	init_sym->st_size = 0;
1: -
1: -	return 0;
1: +  /* STRTAB */
1: +  /* initialize strset with an empty string to conform to ELF */
1: +  linker->strtab_strs = strset__new(INT_MAX, "", sizeof(""));
1: +  if (libbpf_get_error(linker->strtab_strs))
1: +    return libbpf_get_error(linker->strtab_strs);
1: +
1: +  sec = add_dst_sec(linker, ".strtab");
1: +  if (!sec)
1: +    return -ENOMEM;
1: +
1: +  sec->scn = elf_newscn(linker->elf);
1: +  if (!sec->scn) {
1: +    pr_warn_elf("failed to create STRTAB section");
1: +    return -EINVAL;
1: +  }
1: +
1: +  sec->shdr = elf64_getshdr(sec->scn);
1: +  if (!sec->shdr)
1: +    return -EINVAL;
1: +
1: +  sec->data = elf_newdata(sec->scn);
1: +  if (!sec->data) {
1: +    pr_warn_elf("failed to create STRTAB data");
1: +    return -EINVAL;
1: +  }
1: +
1: +  str_off = strset__add_str(linker->strtab_strs, sec->sec_name);
1: +  if (str_off < 0)
1: +    return str_off;
1: +
1: +  sec->sec_idx = elf_ndxscn(sec->scn);
1: +  linker->elf_hdr->e_shstrndx = sec->sec_idx;
1: +  linker->strtab_sec_idx = sec->sec_idx;
1: +
1: +  sec->shdr->sh_name = str_off;
1: +  sec->shdr->sh_type = SHT_STRTAB;
1: +  sec->shdr->sh_flags = SHF_STRINGS;
1: +  sec->shdr->sh_offset = 0;
1: +  sec->shdr->sh_link = 0;
1: +  sec->shdr->sh_info = 0;
1: +  sec->shdr->sh_addralign = 1;
1: +  sec->shdr->sh_size = sec->sec_sz = 0;
1: +  sec->shdr->sh_entsize = 0;
1: +
1: +  /* SYMTAB */
1: +  sec = add_dst_sec(linker, ".symtab");
1: +  if (!sec)
1: +    return -ENOMEM;
1: +
1: +  sec->scn = elf_newscn(linker->elf);
1: +  if (!sec->scn) {
1: +    pr_warn_elf("failed to create SYMTAB section");
1: +    return -EINVAL;
1: +  }
1: +
1: +  sec->shdr = elf64_getshdr(sec->scn);
1: +  if (!sec->shdr)
1: +    return -EINVAL;
1: +
1: +  sec->data = elf_newdata(sec->scn);
1: +  if (!sec->data) {
1: +    pr_warn_elf("failed to create SYMTAB data");
1: +    return -EINVAL;
1: +  }
1: +
1: +  str_off = strset__add_str(linker->strtab_strs, sec->sec_name);
1: +  if (str_off < 0)
1: +    return str_off;
1: +
1: +  sec->sec_idx = elf_ndxscn(sec->scn);
1: +  linker->symtab_sec_idx = sec->sec_idx;
1: +
1: +  sec->shdr->sh_name = str_off;
1: +  sec->shdr->sh_type = SHT_SYMTAB;
1: +  sec->shdr->sh_flags = 0;
1: +  sec->shdr->sh_offset = 0;
1: +  sec->shdr->sh_link = linker->strtab_sec_idx;
1: +  /* sh_info should be one greater than the index of the last local
1: +   * symbol (i.e., binding is STB_LOCAL). But why and who cares?
1: +   */
1: +  sec->shdr->sh_info = 0;
1: +  sec->shdr->sh_addralign = 8;
1: +  sec->shdr->sh_entsize = sizeof(Elf64_Sym);
1: +
1: +  /* .BTF */
1: +  linker->btf = btf__new_empty();
1: +  err = libbpf_get_error(linker->btf);
1: +  if (err)
1: +    return err;
1: +
1: +  /* add the special all-zero symbol */
1: +  init_sym = add_new_sym(linker, NULL);
1: +  if (!init_sym)
1: +    return -EINVAL;
1: +
1: +  init_sym->st_name = 0;
1: +  init_sym->st_info = 0;
1: +  init_sym->st_other = 0;
1: +  init_sym->st_shndx = SHN_UNDEF;
1: +  init_sym->st_value = 0;
1: +  init_sym->st_size = 0;
1: +
1: +  return 0;
1:  }
1:  
1:  int bpf_linker__add_file(struct bpf_linker *linker, const char *filename,
1: -			 const struct bpf_linker_file_opts *opts)
1: -{
1: -	struct src_obj obj = {};
1: -	int err = 0;
1: -
1: -	if (!OPTS_VALID(opts, bpf_linker_file_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	if (!linker->elf)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	err = err ?: linker_load_obj_file(linker, filename, opts, &obj);
1: -	err = err ?: linker_append_sec_data(linker, &obj);
1: -	err = err ?: linker_append_elf_syms(linker, &obj);
1: -	err = err ?: linker_append_elf_relos(linker, &obj);
1: -	err = err ?: linker_append_btf(linker, &obj);
1: -	err = err ?: linker_append_btf_ext(linker, &obj);
1: -
1: -	/* free up src_obj resources */
1: -	free(obj.btf_type_map);
1: -	btf__free(obj.btf);
1: -	btf_ext__free(obj.btf_ext);
1: -	free(obj.secs);
1: -	free(obj.sym_map);
1: -	if (obj.elf)
1: -		elf_end(obj.elf);
1: -	if (obj.fd >= 0)
1: -		close(obj.fd);
1: -
1: -	return libbpf_err(err);
1: +                         const struct bpf_linker_file_opts *opts) {
1: +  struct src_obj obj = {};
1: +  int err = 0;
1: +
1: +  if (!OPTS_VALID(opts, bpf_linker_file_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  if (!linker->elf)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  err = err ?: linker_load_obj_file(linker, filename, opts, &obj);
1: +  err = err ?: linker_append_sec_data(linker, &obj);
1: +  err = err ?: linker_append_elf_syms(linker, &obj);
1: +  err = err ?: linker_append_elf_relos(linker, &obj);
1: +  err = err ?: linker_append_btf(linker, &obj);
1: +  err = err ?: linker_append_btf_ext(linker, &obj);
1: +
1: +  /* free up src_obj resources */
1: +  free(obj.btf_type_map);
1: +  btf__free(obj.btf);
1: +  btf_ext__free(obj.btf_ext);
1: +  free(obj.secs);
1: +  free(obj.sym_map);
1: +  if (obj.elf)
1: +    elf_end(obj.elf);
1: +  if (obj.fd >= 0)
1: +    close(obj.fd);
1: +
1: +  return libbpf_err(err);
1:  }
1:  
1: -static bool is_dwarf_sec_name(const char *name)
1: -{
1: -	/* approximation, but the actual list is too long */
1: -	return strncmp(name, ".debug_", sizeof(".debug_") - 1) == 0;
1: +static bool is_dwarf_sec_name(const char *name) {
1: +  /* approximation, but the actual list is too long */
1: +  return strncmp(name, ".debug_", sizeof(".debug_") - 1) == 0;
1:  }
1:  
1: -static bool is_ignored_sec(struct src_sec *sec)
1: -{
1: -	Elf64_Shdr *shdr = sec->shdr;
1: -	const char *name = sec->sec_name;
1: -
1: -	/* no special handling of .strtab */
1: -	if (shdr->sh_type == SHT_STRTAB)
1: -		return true;
1: -
1: -	/* ignore .llvm_addrsig section as well */
1: -	if (shdr->sh_type == SHT_LLVM_ADDRSIG)
1: -		return true;
1: -
1: -	/* no subprograms will lead to an empty .text section, ignore it */
1: -	if (shdr->sh_type == SHT_PROGBITS && shdr->sh_size == 0 &&
1: -	    strcmp(sec->sec_name, ".text") == 0)
1: -		return true;
1: -
1: -	/* DWARF sections */
1: -	if (is_dwarf_sec_name(sec->sec_name))
1: -		return true;
1: -
1: -	if (strncmp(name, ".rel", sizeof(".rel") - 1) == 0) {
1: -		name += sizeof(".rel") - 1;
1: -		/* DWARF section relocations */
1: -		if (is_dwarf_sec_name(name))
1: -			return true;
1: -
1: -		/* .BTF and .BTF.ext don't need relocations */
1: -		if (strcmp(name, BTF_ELF_SEC) == 0 ||
1: -		    strcmp(name, BTF_EXT_ELF_SEC) == 0)
1: -			return true;
1: -	}
1: -
1: -	return false;
1: +static bool is_ignored_sec(struct src_sec *sec) {
1: +  Elf64_Shdr *shdr = sec->shdr;
1: +  const char *name = sec->sec_name;
1: +
1: +  /* no special handling of .strtab */
1: +  if (shdr->sh_type == SHT_STRTAB)
1: +    return true;
1: +
1: +  /* ignore .llvm_addrsig section as well */
1: +  if (shdr->sh_type == SHT_LLVM_ADDRSIG)
1: +    return true;
1: +
1: +  /* no subprograms will lead to an empty .text section, ignore it */
1: +  if (shdr->sh_type == SHT_PROGBITS && shdr->sh_size == 0 &&
1: +      strcmp(sec->sec_name, ".text") == 0)
1: +    return true;
1: +
1: +  /* DWARF sections */
1: +  if (is_dwarf_sec_name(sec->sec_name))
1: +    return true;
1: +
1: +  if (strncmp(name, ".rel", sizeof(".rel") - 1) == 0) {
1: +    name += sizeof(".rel") - 1;
1: +    /* DWARF section relocations */
1: +    if (is_dwarf_sec_name(name))
1: +      return true;
1: +
1: +    /* .BTF and .BTF.ext don't need relocations */
1: +    if (strcmp(name, BTF_ELF_SEC) == 0 || strcmp(name, BTF_EXT_ELF_SEC) == 0)
1: +      return true;
1: +  }
1: +
1: +  return false;
1:  }
1:  
1: -static struct src_sec *add_src_sec(struct src_obj *obj, const char *sec_name)
1: -{
1: -	struct src_sec *secs = obj->secs, *sec;
1: -	size_t new_cnt = obj->sec_cnt ? obj->sec_cnt + 1 : 2;
1: +static struct src_sec *add_src_sec(struct src_obj *obj, const char *sec_name) {
1: +  struct src_sec *secs = obj->secs, *sec;
1: +  size_t new_cnt = obj->sec_cnt ? obj->sec_cnt + 1 : 2;
1:  
1: -	secs = libbpf_reallocarray(secs, new_cnt, sizeof(*secs));
1: -	if (!secs)
1: -		return NULL;
1: +  secs = libbpf_reallocarray(secs, new_cnt, sizeof(*secs));
1: +  if (!secs)
1: +    return NULL;
1:  
1: -	/* zero out newly allocated memory */
1: -	memset(secs + obj->sec_cnt, 0, (new_cnt - obj->sec_cnt) * sizeof(*secs));
1: +  /* zero out newly allocated memory */
1: +  memset(secs + obj->sec_cnt, 0, (new_cnt - obj->sec_cnt) * sizeof(*secs));
1:  
1: -	obj->secs = secs;
1: -	obj->sec_cnt = new_cnt;
1: +  obj->secs = secs;
1: +  obj->sec_cnt = new_cnt;
1:  
1: -	sec = &obj->secs[new_cnt - 1];
1: -	sec->id = new_cnt - 1;
1: -	sec->sec_name = sec_name;
1: +  sec = &obj->secs[new_cnt - 1];
1: +  sec->id = new_cnt - 1;
1: +  sec->sec_name = sec_name;
1:  
1: -	return sec;
1: +  return sec;
1:  }
1:  
1:  static int linker_load_obj_file(struct bpf_linker *linker, const char *filename,
1: -				const struct bpf_linker_file_opts *opts,
1: -				struct src_obj *obj)
1: -{
1: +                                const struct bpf_linker_file_opts *opts,
1: +                                struct src_obj *obj) {
1:  #if __BYTE_ORDER == __LITTLE_ENDIAN
1: -	const int host_endianness = ELFDATA2LSB;
1: +  const int host_endianness = ELFDATA2LSB;
1:  #elif __BYTE_ORDER == __BIG_ENDIAN
1: -	const int host_endianness = ELFDATA2MSB;
1: +  const int host_endianness = ELFDATA2MSB;
1:  #else
1:  #error "Unknown __BYTE_ORDER"
1:  #endif
1: -	int err = 0;
1: -	Elf_Scn *scn;
1: -	Elf_Data *data;
1: -	Elf64_Ehdr *ehdr;
1: -	Elf64_Shdr *shdr;
1: -	struct src_sec *sec;
1: -
1: -	pr_debug("linker: adding object file '%s'...\n", filename);
1: -
1: -	obj->filename = filename;
1: -
1: -	obj->fd = open(filename, O_RDONLY);
1: -	if (obj->fd < 0) {
1: -		err = -errno;
1: -		pr_warn("failed to open file '%s': %d\n", filename, err);
1: -		return err;
1: -	}
1: -	obj->elf = elf_begin(obj->fd, ELF_C_READ_MMAP, NULL);
1: -	if (!obj->elf) {
1: -		err = -errno;
1: -		pr_warn_elf("failed to parse ELF file '%s'", filename);
1: -		return err;
1: -	}
1: -
1: -	/* Sanity check ELF file high-level properties */
1: -	ehdr = elf64_getehdr(obj->elf);
1: -	if (!ehdr) {
1: -		err = -errno;
1: -		pr_warn_elf("failed to get ELF header for %s", filename);
1: -		return err;
1: -	}
1: -	if (ehdr->e_ident[EI_DATA] != host_endianness) {
1: -		err = -EOPNOTSUPP;
1: -		pr_warn_elf("unsupported byte order of ELF file %s", filename);
1: -		return err;
1: -	}
1: -	if (ehdr->e_type != ET_REL
1: -	    || ehdr->e_machine != EM_BPF
1: -	    || ehdr->e_ident[EI_CLASS] != ELFCLASS64) {
1: -		err = -EOPNOTSUPP;
1: -		pr_warn_elf("unsupported kind of ELF file %s", filename);
1: -		return err;
1: -	}
1: -
1: -	if (elf_getshdrstrndx(obj->elf, &obj->shstrs_sec_idx)) {
1: -		err = -errno;
1: -		pr_warn_elf("failed to get SHSTRTAB section index for %s", filename);
1: -		return err;
1: -	}
1: -
1: -	scn = NULL;
1: -	while ((scn = elf_nextscn(obj->elf, scn)) != NULL) {
1: -		size_t sec_idx = elf_ndxscn(scn);
1: -		const char *sec_name;
1: -
1: -		shdr = elf64_getshdr(scn);
1: -		if (!shdr) {
1: -			err = -errno;
1: -			pr_warn_elf("failed to get section #%zu header for %s",
1: -				    sec_idx, filename);
1: -			return err;
1: -		}
1: -
1: -		sec_name = elf_strptr(obj->elf, obj->shstrs_sec_idx, shdr->sh_name);
1: -		if (!sec_name) {
1: -			err = -errno;
1: -			pr_warn_elf("failed to get section #%zu name for %s",
1: -				    sec_idx, filename);
1: -			return err;
1: -		}
1: -
1: -		data = elf_getdata(scn, 0);
1: -		if (!data) {
1: -			err = -errno;
1: -			pr_warn_elf("failed to get section #%zu (%s) data from %s",
1: -				    sec_idx, sec_name, filename);
1: -			return err;
1: -		}
1: -
1: -		sec = add_src_sec(obj, sec_name);
1: -		if (!sec)
1: -			return -ENOMEM;
1: -
1: -		sec->scn = scn;
1: -		sec->shdr = shdr;
1: -		sec->data = data;
1: -		sec->sec_idx = elf_ndxscn(scn);
1: -
1: -		if (is_ignored_sec(sec)) {
1: -			sec->skipped = true;
1: -			continue;
1: -		}
1: -
1: -		switch (shdr->sh_type) {
1: -		case SHT_SYMTAB:
1: -			if (obj->symtab_sec_idx) {
1: -				err = -EOPNOTSUPP;
1: -				pr_warn("multiple SYMTAB sections found, not supported\n");
1: -				return err;
1: -			}
1: -			obj->symtab_sec_idx = sec_idx;
1: -			break;
1: -		case SHT_STRTAB:
1: -			/* we'll construct our own string table */
1: -			break;
1: -		case SHT_PROGBITS:
1: -			if (strcmp(sec_name, BTF_ELF_SEC) == 0) {
1: -				obj->btf = btf__new(data->d_buf, shdr->sh_size);
1: -				err = libbpf_get_error(obj->btf);
1: -				if (err) {
1: -					pr_warn("failed to parse .BTF from %s: %d\n", filename, err);
1: -					return err;
1: -				}
1: -				sec->skipped = true;
1: -				continue;
1: -			}
1: -			if (strcmp(sec_name, BTF_EXT_ELF_SEC) == 0) {
1: -				obj->btf_ext = btf_ext__new(data->d_buf, shdr->sh_size);
1: -				err = libbpf_get_error(obj->btf_ext);
1: -				if (err) {
1: -					pr_warn("failed to parse .BTF.ext from '%s': %d\n", filename, err);
1: -					return err;
1: -				}
1: -				sec->skipped = true;
1: -				continue;
1: -			}
1: -
1: -			/* data & code */
1: -			break;
1: -		case SHT_NOBITS:
1: -			/* BSS */
1: -			break;
1: -		case SHT_REL:
1: -			/* relocations */
1: -			break;
1: -		default:
1: -			pr_warn("unrecognized section #%zu (%s) in %s\n",
1: -				sec_idx, sec_name, filename);
1: -			err = -EINVAL;
1: -			return err;
1: -		}
1: -	}
1: -
1: -	err = err ?: linker_sanity_check_elf(obj);
1: -	err = err ?: linker_sanity_check_btf(obj);
1: -	err = err ?: linker_sanity_check_btf_ext(obj);
1: -	err = err ?: linker_fixup_btf(obj);
1: -
1: -	return err;
1: -}
1: -
1: -static bool is_pow_of_2(size_t x)
1: -{
1: -	return x && (x & (x - 1)) == 0;
1: +  int err = 0;
1: +  Elf_Scn *scn;
1: +  Elf_Data *data;
1: +  Elf64_Ehdr *ehdr;
1: +  Elf64_Shdr *shdr;
1: +  struct src_sec *sec;
1: +
1: +  pr_debug("linker: adding object file '%s'...\n", filename);
1: +
1: +  obj->filename = filename;
1: +
1: +  obj->fd = open(filename, O_RDONLY);
1: +  if (obj->fd < 0) {
1: +    err = -errno;
1: +    pr_warn("failed to open file '%s': %d\n", filename, err);
1: +    return err;
1: +  }
1: +  obj->elf = elf_begin(obj->fd, ELF_C_READ_MMAP, NULL);
1: +  if (!obj->elf) {
1: +    err = -errno;
1: +    pr_warn_elf("failed to parse ELF file '%s'", filename);
1: +    return err;
1: +  }
1: +
1: +  /* Sanity check ELF file high-level properties */
1: +  ehdr = elf64_getehdr(obj->elf);
1: +  if (!ehdr) {
1: +    err = -errno;
1: +    pr_warn_elf("failed to get ELF header for %s", filename);
1: +    return err;
1: +  }
1: +  if (ehdr->e_ident[EI_DATA] != host_endianness) {
1: +    err = -EOPNOTSUPP;
1: +    pr_warn_elf("unsupported byte order of ELF file %s", filename);
1: +    return err;
1: +  }
1: +  if (ehdr->e_type != ET_REL || ehdr->e_machine != EM_BPF ||
1: +      ehdr->e_ident[EI_CLASS] != ELFCLASS64) {
1: +    err = -EOPNOTSUPP;
1: +    pr_warn_elf("unsupported kind of ELF file %s", filename);
1: +    return err;
1: +  }
1: +
1: +  if (elf_getshdrstrndx(obj->elf, &obj->shstrs_sec_idx)) {
1: +    err = -errno;
1: +    pr_warn_elf("failed to get SHSTRTAB section index for %s", filename);
1: +    return err;
1: +  }
1: +
1: +  scn = NULL;
1: +  while ((scn = elf_nextscn(obj->elf, scn)) != NULL) {
1: +    size_t sec_idx = elf_ndxscn(scn);
1: +    const char *sec_name;
1: +
1: +    shdr = elf64_getshdr(scn);
1: +    if (!shdr) {
1: +      err = -errno;
1: +      pr_warn_elf("failed to get section #%zu header for %s", sec_idx,
1: +                  filename);
1: +      return err;
1: +    }
1: +
1: +    sec_name = elf_strptr(obj->elf, obj->shstrs_sec_idx, shdr->sh_name);
1: +    if (!sec_name) {
1: +      err = -errno;
1: +      pr_warn_elf("failed to get section #%zu name for %s", sec_idx, filename);
1: +      return err;
1: +    }
1: +
1: +    data = elf_getdata(scn, 0);
1: +    if (!data) {
1: +      err = -errno;
1: +      pr_warn_elf("failed to get section #%zu (%s) data from %s", sec_idx,
1: +                  sec_name, filename);
1: +      return err;
1: +    }
1: +
1: +    sec = add_src_sec(obj, sec_name);
1: +    if (!sec)
1: +      return -ENOMEM;
1: +
1: +    sec->scn = scn;
1: +    sec->shdr = shdr;
1: +    sec->data = data;
1: +    sec->sec_idx = elf_ndxscn(scn);
1: +
1: +    if (is_ignored_sec(sec)) {
1: +      sec->skipped = true;
1: +      continue;
1: +    }
1: +
1: +    switch (shdr->sh_type) {
1: +    case SHT_SYMTAB:
1: +      if (obj->symtab_sec_idx) {
1: +        err = -EOPNOTSUPP;
1: +        pr_warn("multiple SYMTAB sections found, not supported\n");
1: +        return err;
1: +      }
1: +      obj->symtab_sec_idx = sec_idx;
1: +      break;
1: +    case SHT_STRTAB:
1: +      /* we'll construct our own string table */
1: +      break;
1: +    case SHT_PROGBITS:
1: +      if (strcmp(sec_name, BTF_ELF_SEC) == 0) {
1: +        obj->btf = btf__new(data->d_buf, shdr->sh_size);
1: +        err = libbpf_get_error(obj->btf);
1: +        if (err) {
1: +          pr_warn("failed to parse .BTF from %s: %d\n", filename, err);
1: +          return err;
1: +        }
1: +        sec->skipped = true;
1: +        continue;
1: +      }
1: +      if (strcmp(sec_name, BTF_EXT_ELF_SEC) == 0) {
1: +        obj->btf_ext = btf_ext__new(data->d_buf, shdr->sh_size);
1: +        err = libbpf_get_error(obj->btf_ext);
1: +        if (err) {
1: +          pr_warn("failed to parse .BTF.ext from '%s': %d\n", filename, err);
1: +          return err;
1: +        }
1: +        sec->skipped = true;
1: +        continue;
1: +      }
1: +
1: +      /* data & code */
1: +      break;
1: +    case SHT_NOBITS:
1: +      /* BSS */
1: +      break;
1: +    case SHT_REL:
1: +      /* relocations */
1: +      break;
1: +    default:
1: +      pr_warn("unrecognized section #%zu (%s) in %s\n", sec_idx, sec_name,
1: +              filename);
1: +      err = -EINVAL;
1: +      return err;
1: +    }
1: +  }
1: +
1: +  err = err ?: linker_sanity_check_elf(obj);
1: +  err = err ?: linker_sanity_check_btf(obj);
1: +  err = err ?: linker_sanity_check_btf_ext(obj);
1: +  err = err ?: linker_fixup_btf(obj);
1: +
1: +  return err;
1:  }
1:  
1: -static int linker_sanity_check_elf(struct src_obj *obj)
1: -{
1: -	struct src_sec *sec;
1: -	int i, err;
1: -
1: -	if (!obj->symtab_sec_idx) {
1: -		pr_warn("ELF is missing SYMTAB section in %s\n", obj->filename);
1: -		return -EINVAL;
1: -	}
1: -	if (!obj->shstrs_sec_idx) {
1: -		pr_warn("ELF is missing section headers STRTAB section in %s\n", obj->filename);
1: -		return -EINVAL;
1: -	}
1: -
1: -	for (i = 1; i < obj->sec_cnt; i++) {
1: -		sec = &obj->secs[i];
1: -
1: -		if (sec->sec_name[0] == '\0') {
1: -			pr_warn("ELF section #%zu has empty name in %s\n", sec->sec_idx, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign))
1: -			return -EINVAL;
1: -		if (sec->shdr->sh_addralign != sec->data->d_align)
1: -			return -EINVAL;
1: -
1: -		if (sec->shdr->sh_size != sec->data->d_size)
1: -			return -EINVAL;
1: -
1: -		switch (sec->shdr->sh_type) {
1: -		case SHT_SYMTAB:
1: -			err = linker_sanity_check_elf_symtab(obj, sec);
1: -			if (err)
1: -				return err;
1: -			break;
1: -		case SHT_STRTAB:
1: -			break;
1: -		case SHT_PROGBITS:
1: -			if (sec->shdr->sh_flags & SHF_EXECINSTR) {
1: -				if (sec->shdr->sh_size % sizeof(struct bpf_insn) != 0)
1: -					return -EINVAL;
1: -			}
1: -			break;
1: -		case SHT_NOBITS:
1: -			break;
1: -		case SHT_REL:
1: -			err = linker_sanity_check_elf_relos(obj, sec);
1: -			if (err)
1: -				return err;
1: -			break;
1: -		case SHT_LLVM_ADDRSIG:
1: -			break;
1: -		default:
1: -			pr_warn("ELF section #%zu (%s) has unrecognized type %zu in %s\n",
1: -				sec->sec_idx, sec->sec_name, (size_t)sec->shdr->sh_type, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static bool is_pow_of_2(size_t x) { return x && (x & (x - 1)) == 0; }
1: +
1: +static int linker_sanity_check_elf(struct src_obj *obj) {
1: +  struct src_sec *sec;
1: +  int i, err;
1: +
1: +  if (!obj->symtab_sec_idx) {
1: +    pr_warn("ELF is missing SYMTAB section in %s\n", obj->filename);
1: +    return -EINVAL;
1: +  }
1: +  if (!obj->shstrs_sec_idx) {
1: +    pr_warn("ELF is missing section headers STRTAB section in %s\n",
1: +            obj->filename);
1: +    return -EINVAL;
1: +  }
1: +
1: +  for (i = 1; i < obj->sec_cnt; i++) {
1: +    sec = &obj->secs[i];
1: +
1: +    if (sec->sec_name[0] == '\0') {
1: +      pr_warn("ELF section #%zu has empty name in %s\n", sec->sec_idx,
1: +              obj->filename);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign))
1: +      return -EINVAL;
1: +    if (sec->shdr->sh_addralign != sec->data->d_align)
1: +      return -EINVAL;
1: +
1: +    if (sec->shdr->sh_size != sec->data->d_size)
1: +      return -EINVAL;
1: +
1: +    switch (sec->shdr->sh_type) {
1: +    case SHT_SYMTAB:
1: +      err = linker_sanity_check_elf_symtab(obj, sec);
1: +      if (err)
1: +        return err;
1: +      break;
1: +    case SHT_STRTAB:
1: +      break;
1: +    case SHT_PROGBITS:
1: +      if (sec->shdr->sh_flags & SHF_EXECINSTR) {
1: +        if (sec->shdr->sh_size % sizeof(struct bpf_insn) != 0)
1: +          return -EINVAL;
1: +      }
1: +      break;
1: +    case SHT_NOBITS:
1: +      break;
1: +    case SHT_REL:
1: +      err = linker_sanity_check_elf_relos(obj, sec);
1: +      if (err)
1: +        return err;
1: +      break;
1: +    case SHT_LLVM_ADDRSIG:
1: +      break;
1: +    default:
1: +      pr_warn("ELF section #%zu (%s) has unrecognized type %zu in %s\n",
1: +              sec->sec_idx, sec->sec_name, (size_t)sec->shdr->sh_type,
1: +              obj->filename);
1: +      return -EINVAL;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static int linker_sanity_check_elf_symtab(struct src_obj *obj, struct src_sec *sec)
1: -{
1: -	struct src_sec *link_sec;
1: -	Elf64_Sym *sym;
1: -	int i, n;
1: -
1: -	if (sec->shdr->sh_entsize != sizeof(Elf64_Sym))
1: -		return -EINVAL;
1: -	if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
1: -		return -EINVAL;
1: -
1: -	if (!sec->shdr->sh_link || sec->shdr->sh_link >= obj->sec_cnt) {
1: -		pr_warn("ELF SYMTAB section #%zu points to missing STRTAB section #%zu in %s\n",
1: -			sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
1: -		return -EINVAL;
1: -	}
1: -	link_sec = &obj->secs[sec->shdr->sh_link];
1: -	if (link_sec->shdr->sh_type != SHT_STRTAB) {
1: -		pr_warn("ELF SYMTAB section #%zu points to invalid STRTAB section #%zu in %s\n",
1: -			sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
1: -		return -EINVAL;
1: -	}
1: -
1: -	n = sec->shdr->sh_size / sec->shdr->sh_entsize;
1: -	sym = sec->data->d_buf;
1: -	for (i = 0; i < n; i++, sym++) {
1: -		int sym_type = ELF64_ST_TYPE(sym->st_info);
1: -		int sym_bind = ELF64_ST_BIND(sym->st_info);
1: -		int sym_vis = ELF64_ST_VISIBILITY(sym->st_other);
1: -
1: -		if (i == 0) {
1: -			if (sym->st_name != 0 || sym->st_info != 0
1: -			    || sym->st_other != 0 || sym->st_shndx != 0
1: -			    || sym->st_value != 0 || sym->st_size != 0) {
1: -				pr_warn("ELF sym #0 is invalid in %s\n", obj->filename);
1: -				return -EINVAL;
1: -			}
1: -			continue;
1: -		}
1: -		if (sym_bind != STB_LOCAL && sym_bind != STB_GLOBAL && sym_bind != STB_WEAK) {
1: -			pr_warn("ELF sym #%d in section #%zu has unsupported symbol binding %d\n",
1: -				i, sec->sec_idx, sym_bind);
1: -			return -EINVAL;
1: -		}
1: -		if (sym_vis != STV_DEFAULT && sym_vis != STV_HIDDEN) {
1: -			pr_warn("ELF sym #%d in section #%zu has unsupported symbol visibility %d\n",
1: -				i, sec->sec_idx, sym_vis);
1: -			return -EINVAL;
1: -		}
1: -		if (sym->st_shndx == 0) {
1: -			if (sym_type != STT_NOTYPE || sym_bind == STB_LOCAL
1: -			    || sym->st_value != 0 || sym->st_size != 0) {
1: -				pr_warn("ELF sym #%d is invalid extern symbol in %s\n",
1: -					i, obj->filename);
1: -
1: -				return -EINVAL;
1: -			}
1: -			continue;
1: -		}
1: -		if (sym->st_shndx < SHN_LORESERVE && sym->st_shndx >= obj->sec_cnt) {
1: -			pr_warn("ELF sym #%d in section #%zu points to missing section #%zu in %s\n",
1: -				i, sec->sec_idx, (size_t)sym->st_shndx, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -		if (sym_type == STT_SECTION) {
1: -			if (sym->st_value != 0)
1: -				return -EINVAL;
1: -			continue;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int linker_sanity_check_elf_symtab(struct src_obj *obj,
1: +                                          struct src_sec *sec) {
1: +  struct src_sec *link_sec;
1: +  Elf64_Sym *sym;
1: +  int i, n;
1: +
1: +  if (sec->shdr->sh_entsize != sizeof(Elf64_Sym))
1: +    return -EINVAL;
1: +  if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
1: +    return -EINVAL;
1: +
1: +  if (!sec->shdr->sh_link || sec->shdr->sh_link >= obj->sec_cnt) {
1: +    pr_warn(
1: +        "ELF SYMTAB section #%zu points to missing STRTAB section #%zu in %s\n",
1: +        sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
1: +    return -EINVAL;
1: +  }
1: +  link_sec = &obj->secs[sec->shdr->sh_link];
1: +  if (link_sec->shdr->sh_type != SHT_STRTAB) {
1: +    pr_warn(
1: +        "ELF SYMTAB section #%zu points to invalid STRTAB section #%zu in %s\n",
1: +        sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
1: +    return -EINVAL;
1: +  }
1: +
1: +  n = sec->shdr->sh_size / sec->shdr->sh_entsize;
1: +  sym = sec->data->d_buf;
1: +  for (i = 0; i < n; i++, sym++) {
1: +    int sym_type = ELF64_ST_TYPE(sym->st_info);
1: +    int sym_bind = ELF64_ST_BIND(sym->st_info);
1: +    int sym_vis = ELF64_ST_VISIBILITY(sym->st_other);
1: +
1: +    if (i == 0) {
1: +      if (sym->st_name != 0 || sym->st_info != 0 || sym->st_other != 0 ||
1: +          sym->st_shndx != 0 || sym->st_value != 0 || sym->st_size != 0) {
1: +        pr_warn("ELF sym #0 is invalid in %s\n", obj->filename);
1: +        return -EINVAL;
1: +      }
1: +      continue;
1: +    }
1: +    if (sym_bind != STB_LOCAL && sym_bind != STB_GLOBAL &&
1: +        sym_bind != STB_WEAK) {
1: +      pr_warn("ELF sym #%d in section #%zu has unsupported symbol binding %d\n",
1: +              i, sec->sec_idx, sym_bind);
1: +      return -EINVAL;
1: +    }
1: +    if (sym_vis != STV_DEFAULT && sym_vis != STV_HIDDEN) {
1: +      pr_warn(
1: +          "ELF sym #%d in section #%zu has unsupported symbol visibility %d\n",
1: +          i, sec->sec_idx, sym_vis);
1: +      return -EINVAL;
1: +    }
1: +    if (sym->st_shndx == 0) {
1: +      if (sym_type != STT_NOTYPE || sym_bind == STB_LOCAL ||
1: +          sym->st_value != 0 || sym->st_size != 0) {
1: +        pr_warn("ELF sym #%d is invalid extern symbol in %s\n", i,
1: +                obj->filename);
1: +
1: +        return -EINVAL;
1: +      }
1: +      continue;
1: +    }
1: +    if (sym->st_shndx < SHN_LORESERVE && sym->st_shndx >= obj->sec_cnt) {
1: +      pr_warn(
1: +          "ELF sym #%d in section #%zu points to missing section #%zu in %s\n",
1: +          i, sec->sec_idx, (size_t)sym->st_shndx, obj->filename);
1: +      return -EINVAL;
1: +    }
1: +    if (sym_type == STT_SECTION) {
1: +      if (sym->st_value != 0)
1: +        return -EINVAL;
1: +      continue;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static int linker_sanity_check_elf_relos(struct src_obj *obj, struct src_sec *sec)
1: -{
1: -	struct src_sec *link_sec, *sym_sec;
1: -	Elf64_Rel *relo;
1: -	int i, n;
1: -
1: -	if (sec->shdr->sh_entsize != sizeof(Elf64_Rel))
1: -		return -EINVAL;
1: -	if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
1: -		return -EINVAL;
1: -
1: -	/* SHT_REL's sh_link should point to SYMTAB */
1: -	if (sec->shdr->sh_link != obj->symtab_sec_idx) {
1: -		pr_warn("ELF relo section #%zu points to invalid SYMTAB section #%zu in %s\n",
1: -			sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* SHT_REL's sh_info points to relocated section */
1: -	if (!sec->shdr->sh_info || sec->shdr->sh_info >= obj->sec_cnt) {
1: -		pr_warn("ELF relo section #%zu points to missing section #%zu in %s\n",
1: -			sec->sec_idx, (size_t)sec->shdr->sh_info, obj->filename);
1: -		return -EINVAL;
1: -	}
1: -	link_sec = &obj->secs[sec->shdr->sh_info];
1: -
1: -	/* .rel<secname> -> <secname> pattern is followed */
1: -	if (strncmp(sec->sec_name, ".rel", sizeof(".rel") - 1) != 0
1: -	    || strcmp(sec->sec_name + sizeof(".rel") - 1, link_sec->sec_name) != 0) {
1: -		pr_warn("ELF relo section #%zu name has invalid name in %s\n",
1: -			sec->sec_idx, obj->filename);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* don't further validate relocations for ignored sections */
1: -	if (link_sec->skipped)
1: -		return 0;
1: -
1: -	/* relocatable section is data or instructions */
1: -	if (link_sec->shdr->sh_type != SHT_PROGBITS && link_sec->shdr->sh_type != SHT_NOBITS) {
1: -		pr_warn("ELF relo section #%zu points to invalid section #%zu in %s\n",
1: -			sec->sec_idx, (size_t)sec->shdr->sh_info, obj->filename);
1: -		return -EINVAL;
1: -	}
1: -
1: -	/* check sanity of each relocation */
1: -	n = sec->shdr->sh_size / sec->shdr->sh_entsize;
1: -	relo = sec->data->d_buf;
1: -	sym_sec = &obj->secs[obj->symtab_sec_idx];
1: -	for (i = 0; i < n; i++, relo++) {
1: -		size_t sym_idx = ELF64_R_SYM(relo->r_info);
1: -		size_t sym_type = ELF64_R_TYPE(relo->r_info);
1: -
1: -		if (sym_type != R_BPF_64_64 && sym_type != R_BPF_64_32 &&
1: -		    sym_type != R_BPF_64_ABS64 && sym_type != R_BPF_64_ABS32) {
1: -			pr_warn("ELF relo #%d in section #%zu has unexpected type %zu in %s\n",
1: -				i, sec->sec_idx, sym_type, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (!sym_idx || sym_idx * sizeof(Elf64_Sym) >= sym_sec->shdr->sh_size) {
1: -			pr_warn("ELF relo #%d in section #%zu points to invalid symbol #%zu in %s\n",
1: -				i, sec->sec_idx, sym_idx, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (link_sec->shdr->sh_flags & SHF_EXECINSTR) {
1: -			if (relo->r_offset % sizeof(struct bpf_insn) != 0) {
1: -				pr_warn("ELF relo #%d in section #%zu points to missing symbol #%zu in %s\n",
1: -					i, sec->sec_idx, sym_idx, obj->filename);
1: -				return -EINVAL;
1: -			}
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int linker_sanity_check_elf_relos(struct src_obj *obj,
1: +                                         struct src_sec *sec) {
1: +  struct src_sec *link_sec, *sym_sec;
1: +  Elf64_Rel *relo;
1: +  int i, n;
1: +
1: +  if (sec->shdr->sh_entsize != sizeof(Elf64_Rel))
1: +    return -EINVAL;
1: +  if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
1: +    return -EINVAL;
1: +
1: +  /* SHT_REL's sh_link should point to SYMTAB */
1: +  if (sec->shdr->sh_link != obj->symtab_sec_idx) {
1: +    pr_warn(
1: +        "ELF relo section #%zu points to invalid SYMTAB section #%zu in %s\n",
1: +        sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* SHT_REL's sh_info points to relocated section */
1: +  if (!sec->shdr->sh_info || sec->shdr->sh_info >= obj->sec_cnt) {
1: +    pr_warn("ELF relo section #%zu points to missing section #%zu in %s\n",
1: +            sec->sec_idx, (size_t)sec->shdr->sh_info, obj->filename);
1: +    return -EINVAL;
1: +  }
1: +  link_sec = &obj->secs[sec->shdr->sh_info];
1: +
1: +  /* .rel<secname> -> <secname> pattern is followed */
1: +  if (strncmp(sec->sec_name, ".rel", sizeof(".rel") - 1) != 0 ||
1: +      strcmp(sec->sec_name + sizeof(".rel") - 1, link_sec->sec_name) != 0) {
1: +    pr_warn("ELF relo section #%zu name has invalid name in %s\n", sec->sec_idx,
1: +            obj->filename);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* don't further validate relocations for ignored sections */
1: +  if (link_sec->skipped)
1: +    return 0;
1: +
1: +  /* relocatable section is data or instructions */
1: +  if (link_sec->shdr->sh_type != SHT_PROGBITS &&
1: +      link_sec->shdr->sh_type != SHT_NOBITS) {
1: +    pr_warn("ELF relo section #%zu points to invalid section #%zu in %s\n",
1: +            sec->sec_idx, (size_t)sec->shdr->sh_info, obj->filename);
1: +    return -EINVAL;
1: +  }
1: +
1: +  /* check sanity of each relocation */
1: +  n = sec->shdr->sh_size / sec->shdr->sh_entsize;
1: +  relo = sec->data->d_buf;
1: +  sym_sec = &obj->secs[obj->symtab_sec_idx];
1: +  for (i = 0; i < n; i++, relo++) {
1: +    size_t sym_idx = ELF64_R_SYM(relo->r_info);
1: +    size_t sym_type = ELF64_R_TYPE(relo->r_info);
1: +
1: +    if (sym_type != R_BPF_64_64 && sym_type != R_BPF_64_32 &&
1: +        sym_type != R_BPF_64_ABS64 && sym_type != R_BPF_64_ABS32) {
1: +      pr_warn("ELF relo #%d in section #%zu has unexpected type %zu in %s\n", i,
1: +              sec->sec_idx, sym_type, obj->filename);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (!sym_idx || sym_idx * sizeof(Elf64_Sym) >= sym_sec->shdr->sh_size) {
1: +      pr_warn(
1: +          "ELF relo #%d in section #%zu points to invalid symbol #%zu in %s\n",
1: +          i, sec->sec_idx, sym_idx, obj->filename);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (link_sec->shdr->sh_flags & SHF_EXECINSTR) {
1: +      if (relo->r_offset % sizeof(struct bpf_insn) != 0) {
1: +        pr_warn(
1: +            "ELF relo #%d in section #%zu points to missing symbol #%zu in "
1: +            "%s\n",
1: +            i, sec->sec_idx, sym_idx, obj->filename);
1: +        return -EINVAL;
1: +      }
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static int check_btf_type_id(__u32 *type_id, void *ctx)
1: -{
1: -	struct btf *btf = ctx;
1: +static int check_btf_type_id(__u32 *type_id, void *ctx) {
1: +  struct btf *btf = ctx;
1:  
1: -	if (*type_id > btf__get_nr_types(btf))
1: -		return -EINVAL;
1: +  if (*type_id > btf__get_nr_types(btf))
1: +    return -EINVAL;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int check_btf_str_off(__u32 *str_off, void *ctx)
1: -{
1: -	struct btf *btf = ctx;
1: -	const char *s;
1: +static int check_btf_str_off(__u32 *str_off, void *ctx) {
1: +  struct btf *btf = ctx;
1: +  const char *s;
1:  
1: -	s = btf__str_by_offset(btf, *str_off);
1: +  s = btf__str_by_offset(btf, *str_off);
1:  
1: -	if (!s)
1: -		return -EINVAL;
1: +  if (!s)
1: +    return -EINVAL;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int linker_sanity_check_btf(struct src_obj *obj)
1: -{
1: -	struct btf_type *t;
1: -	int i, n, err = 0;
1: +static int linker_sanity_check_btf(struct src_obj *obj) {
1: +  struct btf_type *t;
1: +  int i, n, err = 0;
1:  
1: -	if (!obj->btf)
1: -		return 0;
1: +  if (!obj->btf)
1: +    return 0;
1:  
1: -	n = btf__get_nr_types(obj->btf);
1: -	for (i = 1; i <= n; i++) {
1: -		t = btf_type_by_id(obj->btf, i);
1: +  n = btf__get_nr_types(obj->btf);
1: +  for (i = 1; i <= n; i++) {
1: +    t = btf_type_by_id(obj->btf, i);
1:  
1: -		err = err ?: btf_type_visit_type_ids(t, check_btf_type_id, obj->btf);
1: -		err = err ?: btf_type_visit_str_offs(t, check_btf_str_off, obj->btf);
1: -		if (err)
1: -			return err;
1: -	}
1: +    err = err ?: btf_type_visit_type_ids(t, check_btf_type_id, obj->btf);
1: +    err = err ?: btf_type_visit_str_offs(t, check_btf_str_off, obj->btf);
1: +    if (err)
1: +      return err;
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int linker_sanity_check_btf_ext(struct src_obj *obj)
1: -{
1: -	int err = 0;
1: +static int linker_sanity_check_btf_ext(struct src_obj *obj) {
1: +  int err = 0;
1:  
1: -	if (!obj->btf_ext)
1: -		return 0;
1: +  if (!obj->btf_ext)
1: +    return 0;
1:  
1: -	/* can't use .BTF.ext without .BTF */
1: -	if (!obj->btf)
1: -		return -EINVAL;
1: +  /* can't use .BTF.ext without .BTF */
1: +  if (!obj->btf)
1: +    return -EINVAL;
1:  
1: -	err = err ?: btf_ext_visit_type_ids(obj->btf_ext, check_btf_type_id, obj->btf);
1: -	err = err ?: btf_ext_visit_str_offs(obj->btf_ext, check_btf_str_off, obj->btf);
1: -	if (err)
1: -		return err;
1: +  err =
1: +      err ?: btf_ext_visit_type_ids(obj->btf_ext, check_btf_type_id, obj->btf);
1: +  err =
1: +      err ?: btf_ext_visit_str_offs(obj->btf_ext, check_btf_str_off, obj->btf);
1: +  if (err)
1: +    return err;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int init_sec(struct bpf_linker *linker, struct dst_sec *dst_sec, struct src_sec *src_sec)
1: -{
1: -	Elf_Scn *scn;
1: -	Elf_Data *data;
1: -	Elf64_Shdr *shdr;
1: -	int name_off;
1: -
1: -	dst_sec->sec_sz = 0;
1: -	dst_sec->sec_idx = 0;
1: -	dst_sec->ephemeral = src_sec->ephemeral;
1: -
1: -	/* ephemeral sections are just thin section shells lacking most parts */
1: -	if (src_sec->ephemeral)
1: -		return 0;
1: -
1: -	scn = elf_newscn(linker->elf);
1: -	if (!scn)
1: -		return -ENOMEM;
1: -	data = elf_newdata(scn);
1: -	if (!data)
1: -		return -ENOMEM;
1: -	shdr = elf64_getshdr(scn);
1: -	if (!shdr)
1: -		return -ENOMEM;
1: -
1: -	dst_sec->scn = scn;
1: -	dst_sec->shdr = shdr;
1: -	dst_sec->data = data;
1: -	dst_sec->sec_idx = elf_ndxscn(scn);
1: -
1: -	name_off = strset__add_str(linker->strtab_strs, src_sec->sec_name);
1: -	if (name_off < 0)
1: -		return name_off;
1: -
1: -	shdr->sh_name = name_off;
1: -	shdr->sh_type = src_sec->shdr->sh_type;
1: -	shdr->sh_flags = src_sec->shdr->sh_flags;
1: -	shdr->sh_size = 0;
1: -	/* sh_link and sh_info have different meaning for different types of
1: -	 * sections, so we leave it up to the caller code to fill them in, if
1: -	 * necessary
1: -	 */
1: -	shdr->sh_link = 0;
1: -	shdr->sh_info = 0;
1: -	shdr->sh_addralign = src_sec->shdr->sh_addralign;
1: -	shdr->sh_entsize = src_sec->shdr->sh_entsize;
1: -
1: -	data->d_type = src_sec->data->d_type;
1: -	data->d_size = 0;
1: -	data->d_buf = NULL;
1: -	data->d_align = src_sec->data->d_align;
1: -	data->d_off = 0;
1: -
1: -	return 0;
1: +static int init_sec(struct bpf_linker *linker, struct dst_sec *dst_sec,
1: +                    struct src_sec *src_sec) {
1: +  Elf_Scn *scn;
1: +  Elf_Data *data;
1: +  Elf64_Shdr *shdr;
1: +  int name_off;
1: +
1: +  dst_sec->sec_sz = 0;
1: +  dst_sec->sec_idx = 0;
1: +  dst_sec->ephemeral = src_sec->ephemeral;
1: +
1: +  /* ephemeral sections are just thin section shells lacking most parts */
1: +  if (src_sec->ephemeral)
1: +    return 0;
1: +
1: +  scn = elf_newscn(linker->elf);
1: +  if (!scn)
1: +    return -ENOMEM;
1: +  data = elf_newdata(scn);
1: +  if (!data)
1: +    return -ENOMEM;
1: +  shdr = elf64_getshdr(scn);
1: +  if (!shdr)
1: +    return -ENOMEM;
1: +
1: +  dst_sec->scn = scn;
1: +  dst_sec->shdr = shdr;
1: +  dst_sec->data = data;
1: +  dst_sec->sec_idx = elf_ndxscn(scn);
1: +
1: +  name_off = strset__add_str(linker->strtab_strs, src_sec->sec_name);
1: +  if (name_off < 0)
1: +    return name_off;
1: +
1: +  shdr->sh_name = name_off;
1: +  shdr->sh_type = src_sec->shdr->sh_type;
1: +  shdr->sh_flags = src_sec->shdr->sh_flags;
1: +  shdr->sh_size = 0;
1: +  /* sh_link and sh_info have different meaning for different types of
1: +   * sections, so we leave it up to the caller code to fill them in, if
1: +   * necessary
1: +   */
1: +  shdr->sh_link = 0;
1: +  shdr->sh_info = 0;
1: +  shdr->sh_addralign = src_sec->shdr->sh_addralign;
1: +  shdr->sh_entsize = src_sec->shdr->sh_entsize;
1: +
1: +  data->d_type = src_sec->data->d_type;
1: +  data->d_size = 0;
1: +  data->d_buf = NULL;
1: +  data->d_align = src_sec->data->d_align;
1: +  data->d_off = 0;
1: +
1: +  return 0;
1:  }
1:  
1: -static struct dst_sec *find_dst_sec_by_name(struct bpf_linker *linker, const char *sec_name)
1: -{
1: -	struct dst_sec *sec;
1: -	int i;
1: +static struct dst_sec *find_dst_sec_by_name(struct bpf_linker *linker,
1: +                                            const char *sec_name) {
1: +  struct dst_sec *sec;
1: +  int i;
1:  
1: -	for (i = 1; i < linker->sec_cnt; i++) {
1: -		sec = &linker->secs[i];
1: +  for (i = 1; i < linker->sec_cnt; i++) {
1: +    sec = &linker->secs[i];
1:  
1: -		if (strcmp(sec->sec_name, sec_name) == 0)
1: -			return sec;
1: -	}
1: +    if (strcmp(sec->sec_name, sec_name) == 0)
1: +      return sec;
1: +  }
1:  
1: -	return NULL;
1: +  return NULL;
1:  }
1:  
1: -static bool secs_match(struct dst_sec *dst, struct src_sec *src)
1: -{
1: -	if (dst->ephemeral || src->ephemeral)
1: -		return true;
1: -
1: -	if (dst->shdr->sh_type != src->shdr->sh_type) {
1: -		pr_warn("sec %s types mismatch\n", dst->sec_name);
1: -		return false;
1: -	}
1: -	if (dst->shdr->sh_flags != src->shdr->sh_flags) {
1: -		pr_warn("sec %s flags mismatch\n", dst->sec_name);
1: -		return false;
1: -	}
1: -	if (dst->shdr->sh_entsize != src->shdr->sh_entsize) {
1: -		pr_warn("sec %s entsize mismatch\n", dst->sec_name);
1: -		return false;
1: -	}
1: -
1: -	return true;
1: +static bool secs_match(struct dst_sec *dst, struct src_sec *src) {
1: +  if (dst->ephemeral || src->ephemeral)
1: +    return true;
1: +
1: +  if (dst->shdr->sh_type != src->shdr->sh_type) {
1: +    pr_warn("sec %s types mismatch\n", dst->sec_name);
1: +    return false;
1: +  }
1: +  if (dst->shdr->sh_flags != src->shdr->sh_flags) {
1: +    pr_warn("sec %s flags mismatch\n", dst->sec_name);
1: +    return false;
1: +  }
1: +  if (dst->shdr->sh_entsize != src->shdr->sh_entsize) {
1: +    pr_warn("sec %s entsize mismatch\n", dst->sec_name);
1: +    return false;
1: +  }
1: +
1: +  return true;
1:  }
1:  
1: -static bool sec_content_is_same(struct dst_sec *dst_sec, struct src_sec *src_sec)
1: -{
1: -	if (dst_sec->sec_sz != src_sec->shdr->sh_size)
1: -		return false;
1: -	if (memcmp(dst_sec->raw_data, src_sec->data->d_buf, dst_sec->sec_sz) != 0)
1: -		return false;
1: -	return true;
1: +static bool sec_content_is_same(struct dst_sec *dst_sec,
1: +                                struct src_sec *src_sec) {
1: +  if (dst_sec->sec_sz != src_sec->shdr->sh_size)
1: +    return false;
1: +  if (memcmp(dst_sec->raw_data, src_sec->data->d_buf, dst_sec->sec_sz) != 0)
1: +    return false;
1: +  return true;
1:  }
1:  
1: -static int extend_sec(struct bpf_linker *linker, struct dst_sec *dst, struct src_sec *src)
1: -{
1: -	void *tmp;
1: -	size_t dst_align, src_align;
1: -	size_t dst_align_sz, dst_final_sz;
1: -	int err;
1: -
1: -	/* Ephemeral source section doesn't contribute anything to ELF
1: -	 * section data.
1: -	 */
1: -	if (src->ephemeral)
1: -		return 0;
1: -
1: -	/* Some sections (like .maps) can contain both externs (and thus be
1: -	 * ephemeral) and non-externs (map definitions). So it's possible that
1: -	 * it has to be "upgraded" from ephemeral to non-ephemeral when the
1: -	 * first non-ephemeral entity appears. In such case, we add ELF
1: -	 * section, data, etc.
1: -	 */
1: -	if (dst->ephemeral) {
1: -		err = init_sec(linker, dst, src);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	dst_align = dst->shdr->sh_addralign;
1: -	src_align = src->shdr->sh_addralign;
1: -	if (dst_align == 0)
1: -		dst_align = 1;
1: -	if (dst_align < src_align)
1: -		dst_align = src_align;
1: -
1: -	dst_align_sz = (dst->sec_sz + dst_align - 1) / dst_align * dst_align;
1: -
1: -	/* no need to re-align final size */
1: -	dst_final_sz = dst_align_sz + src->shdr->sh_size;
1: -
1: -	if (src->shdr->sh_type != SHT_NOBITS) {
1: -		tmp = realloc(dst->raw_data, dst_final_sz);
1: -		if (!tmp)
1: -			return -ENOMEM;
1: -		dst->raw_data = tmp;
1: -
1: -		/* pad dst section, if it's alignment forced size increase */
1: -		memset(dst->raw_data + dst->sec_sz, 0, dst_align_sz - dst->sec_sz);
1: -		/* now copy src data at a properly aligned offset */
1: -		memcpy(dst->raw_data + dst_align_sz, src->data->d_buf, src->shdr->sh_size);
1: -	}
1: -
1: -	dst->sec_sz = dst_final_sz;
1: -	dst->shdr->sh_size = dst_final_sz;
1: -	dst->data->d_size = dst_final_sz;
1: -
1: -	dst->shdr->sh_addralign = dst_align;
1: -	dst->data->d_align = dst_align;
1: -
1: -	src->dst_off = dst_align_sz;
1: -
1: -	return 0;
1: +static int extend_sec(struct bpf_linker *linker, struct dst_sec *dst,
1: +                      struct src_sec *src) {
1: +  void *tmp;
1: +  size_t dst_align, src_align;
1: +  size_t dst_align_sz, dst_final_sz;
1: +  int err;
1: +
1: +  /* Ephemeral source section doesn't contribute anything to ELF
1: +   * section data.
1: +   */
1: +  if (src->ephemeral)
1: +    return 0;
1: +
1: +  /* Some sections (like .maps) can contain both externs (and thus be
1: +   * ephemeral) and non-externs (map definitions). So it's possible that
1: +   * it has to be "upgraded" from ephemeral to non-ephemeral when the
1: +   * first non-ephemeral entity appears. In such case, we add ELF
1: +   * section, data, etc.
1: +   */
1: +  if (dst->ephemeral) {
1: +    err = init_sec(linker, dst, src);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  dst_align = dst->shdr->sh_addralign;
1: +  src_align = src->shdr->sh_addralign;
1: +  if (dst_align == 0)
1: +    dst_align = 1;
1: +  if (dst_align < src_align)
1: +    dst_align = src_align;
1: +
1: +  dst_align_sz = (dst->sec_sz + dst_align - 1) / dst_align * dst_align;
1: +
1: +  /* no need to re-align final size */
1: +  dst_final_sz = dst_align_sz + src->shdr->sh_size;
1: +
1: +  if (src->shdr->sh_type != SHT_NOBITS) {
1: +    tmp = realloc(dst->raw_data, dst_final_sz);
1: +    if (!tmp)
1: +      return -ENOMEM;
1: +    dst->raw_data = tmp;
1: +
1: +    /* pad dst section, if it's alignment forced size increase */
1: +    memset(dst->raw_data + dst->sec_sz, 0, dst_align_sz - dst->sec_sz);
1: +    /* now copy src data at a properly aligned offset */
1: +    memcpy(dst->raw_data + dst_align_sz, src->data->d_buf, src->shdr->sh_size);
1: +  }
1: +
1: +  dst->sec_sz = dst_final_sz;
1: +  dst->shdr->sh_size = dst_final_sz;
1: +  dst->data->d_size = dst_final_sz;
1: +
1: +  dst->shdr->sh_addralign = dst_align;
1: +  dst->data->d_align = dst_align;
1: +
1: +  src->dst_off = dst_align_sz;
1: +
1: +  return 0;
1:  }
1:  
1: -static bool is_data_sec(struct src_sec *sec)
1: -{
1: -	if (!sec || sec->skipped)
1: -		return false;
1: -	/* ephemeral sections are data sections, e.g., .kconfig, .ksyms */
1: -	if (sec->ephemeral)
1: -		return true;
1: -	return sec->shdr->sh_type == SHT_PROGBITS || sec->shdr->sh_type == SHT_NOBITS;
1: +static bool is_data_sec(struct src_sec *sec) {
1: +  if (!sec || sec->skipped)
1: +    return false;
1: +  /* ephemeral sections are data sections, e.g., .kconfig, .ksyms */
1: +  if (sec->ephemeral)
1: +    return true;
1: +  return sec->shdr->sh_type == SHT_PROGBITS || sec->shdr->sh_type == SHT_NOBITS;
1:  }
1:  
1: -static bool is_relo_sec(struct src_sec *sec)
1: -{
1: -	if (!sec || sec->skipped || sec->ephemeral)
1: -		return false;
1: -	return sec->shdr->sh_type == SHT_REL;
1: +static bool is_relo_sec(struct src_sec *sec) {
1: +  if (!sec || sec->skipped || sec->ephemeral)
1: +    return false;
1: +  return sec->shdr->sh_type == SHT_REL;
1:  }
1:  
1: -static int linker_append_sec_data(struct bpf_linker *linker, struct src_obj *obj)
1: -{
1: -	int i, err;
1: -
1: -	for (i = 1; i < obj->sec_cnt; i++) {
1: -		struct src_sec *src_sec;
1: -		struct dst_sec *dst_sec;
1: -
1: -		src_sec = &obj->secs[i];
1: -		if (!is_data_sec(src_sec))
1: -			continue;
1: -
1: -		dst_sec = find_dst_sec_by_name(linker, src_sec->sec_name);
1: -		if (!dst_sec) {
1: -			dst_sec = add_dst_sec(linker, src_sec->sec_name);
1: -			if (!dst_sec)
1: -				return -ENOMEM;
1: -			err = init_sec(linker, dst_sec, src_sec);
1: -			if (err) {
1: -				pr_warn("failed to init section '%s'\n", src_sec->sec_name);
1: -				return err;
1: -			}
1: -		} else {
1: -			if (!secs_match(dst_sec, src_sec)) {
1: -				pr_warn("ELF sections %s are incompatible\n", src_sec->sec_name);
1: -				return -1;
1: -			}
1: -
1: -			/* "license" and "version" sections are deduped */
1: -			if (strcmp(src_sec->sec_name, "license") == 0
1: -			    || strcmp(src_sec->sec_name, "version") == 0) {
1: -				if (!sec_content_is_same(dst_sec, src_sec)) {
1: -					pr_warn("non-identical contents of section '%s' are not supported\n", src_sec->sec_name);
1: -					return -EINVAL;
1: -				}
1: -				src_sec->skipped = true;
1: -				src_sec->dst_id = dst_sec->id;
1: -				continue;
1: -			}
1: -		}
1: -
1: -		/* record mapped section index */
1: -		src_sec->dst_id = dst_sec->id;
1: -
1: -		err = extend_sec(linker, dst_sec, src_sec);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	return 0;
1: +static int linker_append_sec_data(struct bpf_linker *linker,
1: +                                  struct src_obj *obj) {
1: +  int i, err;
1: +
1: +  for (i = 1; i < obj->sec_cnt; i++) {
1: +    struct src_sec *src_sec;
1: +    struct dst_sec *dst_sec;
1: +
1: +    src_sec = &obj->secs[i];
1: +    if (!is_data_sec(src_sec))
1: +      continue;
1: +
1: +    dst_sec = find_dst_sec_by_name(linker, src_sec->sec_name);
1: +    if (!dst_sec) {
1: +      dst_sec = add_dst_sec(linker, src_sec->sec_name);
1: +      if (!dst_sec)
1: +        return -ENOMEM;
1: +      err = init_sec(linker, dst_sec, src_sec);
1: +      if (err) {
1: +        pr_warn("failed to init section '%s'\n", src_sec->sec_name);
1: +        return err;
1: +      }
1: +    } else {
1: +      if (!secs_match(dst_sec, src_sec)) {
1: +        pr_warn("ELF sections %s are incompatible\n", src_sec->sec_name);
1: +        return -1;
1: +      }
1: +
1: +      /* "license" and "version" sections are deduped */
1: +      if (strcmp(src_sec->sec_name, "license") == 0 ||
1: +          strcmp(src_sec->sec_name, "version") == 0) {
1: +        if (!sec_content_is_same(dst_sec, src_sec)) {
1: +          pr_warn("non-identical contents of section '%s' are not supported\n",
1: +                  src_sec->sec_name);
1: +          return -EINVAL;
1: +        }
1: +        src_sec->skipped = true;
1: +        src_sec->dst_id = dst_sec->id;
1: +        continue;
1: +      }
1: +    }
1: +
1: +    /* record mapped section index */
1: +    src_sec->dst_id = dst_sec->id;
1: +
1: +    err = extend_sec(linker, dst_sec, src_sec);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static int linker_append_elf_syms(struct bpf_linker *linker, struct src_obj *obj)
1: -{
1: -	struct src_sec *symtab = &obj->secs[obj->symtab_sec_idx];
1: -	Elf64_Sym *sym = symtab->data->d_buf;
1: -	int i, n = symtab->shdr->sh_size / symtab->shdr->sh_entsize, err;
1: -	int str_sec_idx = symtab->shdr->sh_link;
1: -	const char *sym_name;
1: -
1: -	obj->sym_map = calloc(n + 1, sizeof(*obj->sym_map));
1: -	if (!obj->sym_map)
1: -		return -ENOMEM;
1: -
1: -	for (i = 0; i < n; i++, sym++) {
1: -		/* We already validated all-zero symbol #0 and we already
1: -		 * appended it preventively to the final SYMTAB, so skip it.
1: -		 */
1: -		if (i == 0)
1: -			continue;
1: -
1: -		sym_name = elf_strptr(obj->elf, str_sec_idx, sym->st_name);
1: -		if (!sym_name) {
1: -			pr_warn("can't fetch symbol name for symbol #%d in '%s'\n", i, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -
1: -		err = linker_append_elf_sym(linker, obj, sym, sym_name, i);
1: -		if (err)
1: -			return err;
1: -	}
1: -
1: -	return 0;
1: +static int linker_append_elf_syms(struct bpf_linker *linker,
1: +                                  struct src_obj *obj) {
1: +  struct src_sec *symtab = &obj->secs[obj->symtab_sec_idx];
1: +  Elf64_Sym *sym = symtab->data->d_buf;
1: +  int i, n = symtab->shdr->sh_size / symtab->shdr->sh_entsize, err;
1: +  int str_sec_idx = symtab->shdr->sh_link;
1: +  const char *sym_name;
1: +
1: +  obj->sym_map = calloc(n + 1, sizeof(*obj->sym_map));
1: +  if (!obj->sym_map)
1: +    return -ENOMEM;
1: +
1: +  for (i = 0; i < n; i++, sym++) {
1: +    /* We already validated all-zero symbol #0 and we already
1: +     * appended it preventively to the final SYMTAB, so skip it.
1: +     */
1: +    if (i == 0)
1: +      continue;
1: +
1: +    sym_name = elf_strptr(obj->elf, str_sec_idx, sym->st_name);
1: +    if (!sym_name) {
1: +      pr_warn("can't fetch symbol name for symbol #%d in '%s'\n", i,
1: +              obj->filename);
1: +      return -EINVAL;
1: +    }
1: +
1: +    err = linker_append_elf_sym(linker, obj, sym, sym_name, i);
1: +    if (err)
1: +      return err;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static Elf64_Sym *get_sym_by_idx(struct bpf_linker *linker, size_t sym_idx)
1: -{
1: -	struct dst_sec *symtab = &linker->secs[linker->symtab_sec_idx];
1: -	Elf64_Sym *syms = symtab->raw_data;
1: +static Elf64_Sym *get_sym_by_idx(struct bpf_linker *linker, size_t sym_idx) {
1: +  struct dst_sec *symtab = &linker->secs[linker->symtab_sec_idx];
1: +  Elf64_Sym *syms = symtab->raw_data;
1:  
1: -	return &syms[sym_idx];
1: +  return &syms[sym_idx];
1:  }
1:  
1: -static struct glob_sym *find_glob_sym(struct bpf_linker *linker, const char *sym_name)
1: -{
1: -	struct glob_sym *glob_sym;
1: -	const char *name;
1: -	int i;
1: +static struct glob_sym *find_glob_sym(struct bpf_linker *linker,
1: +                                      const char *sym_name) {
1: +  struct glob_sym *glob_sym;
1: +  const char *name;
1: +  int i;
1:  
1: -	for (i = 0; i < linker->glob_sym_cnt; i++) {
1: -		glob_sym = &linker->glob_syms[i];
1: -		name = strset__data(linker->strtab_strs) + glob_sym->name_off;
1: +  for (i = 0; i < linker->glob_sym_cnt; i++) {
1: +    glob_sym = &linker->glob_syms[i];
1: +    name = strset__data(linker->strtab_strs) + glob_sym->name_off;
1:  
1: -		if (strcmp(name, sym_name) == 0)
1: -			return glob_sym;
1: -	}
1: +    if (strcmp(name, sym_name) == 0)
1: +      return glob_sym;
1: +  }
1:  
1: -	return NULL;
1: +  return NULL;
1:  }
1:  
1: -static struct glob_sym *add_glob_sym(struct bpf_linker *linker)
1: -{
1: -	struct glob_sym *syms, *sym;
1: +static struct glob_sym *add_glob_sym(struct bpf_linker *linker) {
1: +  struct glob_sym *syms, *sym;
1:  
1: -	syms = libbpf_reallocarray(linker->glob_syms, linker->glob_sym_cnt + 1,
1: -				   sizeof(*linker->glob_syms));
1: -	if (!syms)
1: -		return NULL;
1: +  syms = libbpf_reallocarray(linker->glob_syms, linker->glob_sym_cnt + 1,
1: +                             sizeof(*linker->glob_syms));
1: +  if (!syms)
1: +    return NULL;
1:  
1: -	sym = &syms[linker->glob_sym_cnt];
1: -	memset(sym, 0, sizeof(*sym));
1: -	sym->var_idx = -1;
1: +  sym = &syms[linker->glob_sym_cnt];
1: +  memset(sym, 0, sizeof(*sym));
1: +  sym->var_idx = -1;
1:  
1: -	linker->glob_syms = syms;
1: -	linker->glob_sym_cnt++;
1: +  linker->glob_syms = syms;
1: +  linker->glob_sym_cnt++;
1:  
1: -	return sym;
1: +  return sym;
1:  }
1:  
1:  static bool glob_sym_btf_matches(const char *sym_name, bool exact,
1: -				 const struct btf *btf1, __u32 id1,
1: -				 const struct btf *btf2, __u32 id2)
1: -{
1: -	const struct btf_type *t1, *t2;
1: -	bool is_static1, is_static2;
1: -	const char *n1, *n2;
1: -	int i, n;
1: +                                 const struct btf *btf1, __u32 id1,
1: +                                 const struct btf *btf2, __u32 id2) {
1: +  const struct btf_type *t1, *t2;
1: +  bool is_static1, is_static2;
1: +  const char *n1, *n2;
1: +  int i, n;
1:  
1:  recur:
1: -	n1 = n2 = NULL;
1: -	t1 = skip_mods_and_typedefs(btf1, id1, &id1);
1: -	t2 = skip_mods_and_typedefs(btf2, id2, &id2);
1: -
1: -	/* check if only one side is FWD, otherwise handle with common logic */
1: -	if (!exact && btf_is_fwd(t1) != btf_is_fwd(t2)) {
1: -		n1 = btf__str_by_offset(btf1, t1->name_off);
1: -		n2 = btf__str_by_offset(btf2, t2->name_off);
1: -		if (strcmp(n1, n2) != 0) {
1: -			pr_warn("global '%s': incompatible forward declaration names '%s' and '%s'\n",
1: -				sym_name, n1, n2);
1: -			return false;
1: -		}
1: -		/* validate if FWD kind matches concrete kind */
1: -		if (btf_is_fwd(t1)) {
1: -			if (btf_kflag(t1) && btf_is_union(t2))
1: -				return true;
1: -			if (!btf_kflag(t1) && btf_is_struct(t2))
1: -				return true;
1: -			pr_warn("global '%s': incompatible %s forward declaration and concrete kind %s\n",
1: -				sym_name, btf_kflag(t1) ? "union" : "struct", btf_kind_str(t2));
1: -		} else {
1: -			if (btf_kflag(t2) && btf_is_union(t1))
1: -				return true;
1: -			if (!btf_kflag(t2) && btf_is_struct(t1))
1: -				return true;
1: -			pr_warn("global '%s': incompatible %s forward declaration and concrete kind %s\n",
1: -				sym_name, btf_kflag(t2) ? "union" : "struct", btf_kind_str(t1));
1: -		}
1: -		return false;
1: -	}
1: -
1: -	if (btf_kind(t1) != btf_kind(t2)) {
1: -		pr_warn("global '%s': incompatible BTF kinds %s and %s\n",
1: -			sym_name, btf_kind_str(t1), btf_kind_str(t2));
1: -		return false;
1: -	}
1: -
1: -	switch (btf_kind(t1)) {
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION:
1: -	case BTF_KIND_ENUM:
1: -	case BTF_KIND_FWD:
1: -	case BTF_KIND_FUNC:
1: -	case BTF_KIND_VAR:
1: -		n1 = btf__str_by_offset(btf1, t1->name_off);
1: -		n2 = btf__str_by_offset(btf2, t2->name_off);
1: -		if (strcmp(n1, n2) != 0) {
1: -			pr_warn("global '%s': incompatible %s names '%s' and '%s'\n",
1: -				sym_name, btf_kind_str(t1), n1, n2);
1: -			return false;
1: -		}
1: -		break;
1: -	default:
1: -		break;
1: -	}
1: -
1: -	switch (btf_kind(t1)) {
1: -	case BTF_KIND_UNKN: /* void */
1: -	case BTF_KIND_FWD:
1: -		return true;
1: -	case BTF_KIND_INT:
1: -	case BTF_KIND_FLOAT:
1: -	case BTF_KIND_ENUM:
1: -		/* ignore encoding for int and enum values for enum */
1: -		if (t1->size != t2->size) {
1: -			pr_warn("global '%s': incompatible %s '%s' size %u and %u\n",
1: -				sym_name, btf_kind_str(t1), n1, t1->size, t2->size);
1: -			return false;
1: -		}
1: -		return true;
1: -	case BTF_KIND_PTR:
1: -		/* just validate overall shape of the referenced type, so no
1: -		 * contents comparison for struct/union, and allowd fwd vs
1: -		 * struct/union
1: -		 */
1: -		exact = false;
1: -		id1 = t1->type;
1: -		id2 = t2->type;
1: -		goto recur;
1: -	case BTF_KIND_ARRAY:
1: -		/* ignore index type and array size */
1: -		id1 = btf_array(t1)->type;
1: -		id2 = btf_array(t2)->type;
1: -		goto recur;
1: -	case BTF_KIND_FUNC:
1: -		/* extern and global linkages are compatible */
1: -		is_static1 = btf_func_linkage(t1) == BTF_FUNC_STATIC;
1: -		is_static2 = btf_func_linkage(t2) == BTF_FUNC_STATIC;
1: -		if (is_static1 != is_static2) {
1: -			pr_warn("global '%s': incompatible func '%s' linkage\n", sym_name, n1);
1: -			return false;
1: -		}
1: -
1: -		id1 = t1->type;
1: -		id2 = t2->type;
1: -		goto recur;
1: -	case BTF_KIND_VAR:
1: -		/* extern and global linkages are compatible */
1: -		is_static1 = btf_var(t1)->linkage == BTF_VAR_STATIC;
1: -		is_static2 = btf_var(t2)->linkage == BTF_VAR_STATIC;
1: -		if (is_static1 != is_static2) {
1: -			pr_warn("global '%s': incompatible var '%s' linkage\n", sym_name, n1);
1: -			return false;
1: -		}
1: -
1: -		id1 = t1->type;
1: -		id2 = t2->type;
1: -		goto recur;
1: -	case BTF_KIND_STRUCT:
1: -	case BTF_KIND_UNION: {
1: -		const struct btf_member *m1, *m2;
1: -
1: -		if (!exact)
1: -			return true;
1: -
1: -		if (btf_vlen(t1) != btf_vlen(t2)) {
1: -			pr_warn("global '%s': incompatible number of %s fields %u and %u\n",
1: -				sym_name, btf_kind_str(t1), btf_vlen(t1), btf_vlen(t2));
1: -			return false;
1: -		}
1: -
1: -		n = btf_vlen(t1);
1: -		m1 = btf_members(t1);
1: -		m2 = btf_members(t2);
1: -		for (i = 0; i < n; i++, m1++, m2++) {
1: -			n1 = btf__str_by_offset(btf1, m1->name_off);
1: -			n2 = btf__str_by_offset(btf2, m2->name_off);
1: -			if (strcmp(n1, n2) != 0) {
1: -				pr_warn("global '%s': incompatible field #%d names '%s' and '%s'\n",
1: -					sym_name, i, n1, n2);
1: -				return false;
1: -			}
1: -			if (m1->offset != m2->offset) {
1: -				pr_warn("global '%s': incompatible field #%d ('%s') offsets\n",
1: -					sym_name, i, n1);
1: -				return false;
1: -			}
1: -			if (!glob_sym_btf_matches(sym_name, exact, btf1, m1->type, btf2, m2->type))
1: -				return false;
1: -		}
1: -
1: -		return true;
1: -	}
1: -	case BTF_KIND_FUNC_PROTO: {
1: -		const struct btf_param *m1, *m2;
1: -
1: -		if (btf_vlen(t1) != btf_vlen(t2)) {
1: -			pr_warn("global '%s': incompatible number of %s params %u and %u\n",
1: -				sym_name, btf_kind_str(t1), btf_vlen(t1), btf_vlen(t2));
1: -			return false;
1: -		}
1: -
1: -		n = btf_vlen(t1);
1: -		m1 = btf_params(t1);
1: -		m2 = btf_params(t2);
1: -		for (i = 0; i < n; i++, m1++, m2++) {
1: -			/* ignore func arg names */
1: -			if (!glob_sym_btf_matches(sym_name, exact, btf1, m1->type, btf2, m2->type))
1: -				return false;
1: -		}
1: -
1: -		/* now check return type as well */
1: -		id1 = t1->type;
1: -		id2 = t2->type;
1: -		goto recur;
1: -	}
1: -
1: -	/* skip_mods_and_typedefs() make this impossible */
1: -	case BTF_KIND_TYPEDEF:
1: -	case BTF_KIND_VOLATILE:
1: -	case BTF_KIND_CONST:
1: -	case BTF_KIND_RESTRICT:
1: -	/* DATASECs are never compared with each other */
1: -	case BTF_KIND_DATASEC:
1: -	default:
1: -		pr_warn("global '%s': unsupported BTF kind %s\n",
1: -			sym_name, btf_kind_str(t1));
1: -		return false;
1: -	}
1: +  n1 = n2 = NULL;
1: +  t1 = skip_mods_and_typedefs(btf1, id1, &id1);
1: +  t2 = skip_mods_and_typedefs(btf2, id2, &id2);
1: +
1: +  /* check if only one side is FWD, otherwise handle with common logic */
1: +  if (!exact && btf_is_fwd(t1) != btf_is_fwd(t2)) {
1: +    n1 = btf__str_by_offset(btf1, t1->name_off);
1: +    n2 = btf__str_by_offset(btf2, t2->name_off);
1: +    if (strcmp(n1, n2) != 0) {
1: +      pr_warn(
1: +          "global '%s': incompatible forward declaration names '%s' and '%s'\n",
1: +          sym_name, n1, n2);
1: +      return false;
1: +    }
1: +    /* validate if FWD kind matches concrete kind */
1: +    if (btf_is_fwd(t1)) {
1: +      if (btf_kflag(t1) && btf_is_union(t2))
1: +        return true;
1: +      if (!btf_kflag(t1) && btf_is_struct(t2))
1: +        return true;
1: +      pr_warn(
1: +          "global '%s': incompatible %s forward declaration and concrete kind "
1: +          "%s\n",
1: +          sym_name, btf_kflag(t1) ? "union" : "struct", btf_kind_str(t2));
1: +    } else {
1: +      if (btf_kflag(t2) && btf_is_union(t1))
1: +        return true;
1: +      if (!btf_kflag(t2) && btf_is_struct(t1))
1: +        return true;
1: +      pr_warn(
1: +          "global '%s': incompatible %s forward declaration and concrete kind "
1: +          "%s\n",
1: +          sym_name, btf_kflag(t2) ? "union" : "struct", btf_kind_str(t1));
1: +    }
1: +    return false;
1: +  }
1: +
1: +  if (btf_kind(t1) != btf_kind(t2)) {
1: +    pr_warn("global '%s': incompatible BTF kinds %s and %s\n", sym_name,
1: +            btf_kind_str(t1), btf_kind_str(t2));
1: +    return false;
1: +  }
1: +
1: +  switch (btf_kind(t1)) {
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION:
1: +  case BTF_KIND_ENUM:
1: +  case BTF_KIND_FWD:
1: +  case BTF_KIND_FUNC:
1: +  case BTF_KIND_VAR:
1: +    n1 = btf__str_by_offset(btf1, t1->name_off);
1: +    n2 = btf__str_by_offset(btf2, t2->name_off);
1: +    if (strcmp(n1, n2) != 0) {
1: +      pr_warn("global '%s': incompatible %s names '%s' and '%s'\n", sym_name,
1: +              btf_kind_str(t1), n1, n2);
1: +      return false;
1: +    }
1: +    break;
1: +  default:
1: +    break;
1: +  }
1: +
1: +  switch (btf_kind(t1)) {
1: +  case BTF_KIND_UNKN: /* void */
1: +  case BTF_KIND_FWD:
1: +    return true;
1: +  case BTF_KIND_INT:
1: +  case BTF_KIND_FLOAT:
1: +  case BTF_KIND_ENUM:
1: +    /* ignore encoding for int and enum values for enum */
1: +    if (t1->size != t2->size) {
1: +      pr_warn("global '%s': incompatible %s '%s' size %u and %u\n", sym_name,
1: +              btf_kind_str(t1), n1, t1->size, t2->size);
1: +      return false;
1: +    }
1: +    return true;
1: +  case BTF_KIND_PTR:
1: +    /* just validate overall shape of the referenced type, so no
1: +     * contents comparison for struct/union, and allowd fwd vs
1: +     * struct/union
1: +     */
1: +    exact = false;
1: +    id1 = t1->type;
1: +    id2 = t2->type;
1: +    goto recur;
1: +  case BTF_KIND_ARRAY:
1: +    /* ignore index type and array size */
1: +    id1 = btf_array(t1)->type;
1: +    id2 = btf_array(t2)->type;
1: +    goto recur;
1: +  case BTF_KIND_FUNC:
1: +    /* extern and global linkages are compatible */
1: +    is_static1 = btf_func_linkage(t1) == BTF_FUNC_STATIC;
1: +    is_static2 = btf_func_linkage(t2) == BTF_FUNC_STATIC;
1: +    if (is_static1 != is_static2) {
1: +      pr_warn("global '%s': incompatible func '%s' linkage\n", sym_name, n1);
1: +      return false;
1: +    }
1: +
1: +    id1 = t1->type;
1: +    id2 = t2->type;
1: +    goto recur;
1: +  case BTF_KIND_VAR:
1: +    /* extern and global linkages are compatible */
1: +    is_static1 = btf_var(t1)->linkage == BTF_VAR_STATIC;
1: +    is_static2 = btf_var(t2)->linkage == BTF_VAR_STATIC;
1: +    if (is_static1 != is_static2) {
1: +      pr_warn("global '%s': incompatible var '%s' linkage\n", sym_name, n1);
1: +      return false;
1: +    }
1: +
1: +    id1 = t1->type;
1: +    id2 = t2->type;
1: +    goto recur;
1: +  case BTF_KIND_STRUCT:
1: +  case BTF_KIND_UNION: {
1: +    const struct btf_member *m1, *m2;
1: +
1: +    if (!exact)
1: +      return true;
1: +
1: +    if (btf_vlen(t1) != btf_vlen(t2)) {
1: +      pr_warn("global '%s': incompatible number of %s fields %u and %u\n",
1: +              sym_name, btf_kind_str(t1), btf_vlen(t1), btf_vlen(t2));
1: +      return false;
1: +    }
1: +
1: +    n = btf_vlen(t1);
1: +    m1 = btf_members(t1);
1: +    m2 = btf_members(t2);
1: +    for (i = 0; i < n; i++, m1++, m2++) {
1: +      n1 = btf__str_by_offset(btf1, m1->name_off);
1: +      n2 = btf__str_by_offset(btf2, m2->name_off);
1: +      if (strcmp(n1, n2) != 0) {
1: +        pr_warn("global '%s': incompatible field #%d names '%s' and '%s'\n",
1: +                sym_name, i, n1, n2);
1: +        return false;
1: +      }
1: +      if (m1->offset != m2->offset) {
1: +        pr_warn("global '%s': incompatible field #%d ('%s') offsets\n",
1: +                sym_name, i, n1);
1: +        return false;
1: +      }
1: +      if (!glob_sym_btf_matches(sym_name, exact, btf1, m1->type, btf2,
1: +                                m2->type))
1: +        return false;
1: +    }
1: +
1: +    return true;
1: +  }
1: +  case BTF_KIND_FUNC_PROTO: {
1: +    const struct btf_param *m1, *m2;
1: +
1: +    if (btf_vlen(t1) != btf_vlen(t2)) {
1: +      pr_warn("global '%s': incompatible number of %s params %u and %u\n",
1: +              sym_name, btf_kind_str(t1), btf_vlen(t1), btf_vlen(t2));
1: +      return false;
1: +    }
1: +
1: +    n = btf_vlen(t1);
1: +    m1 = btf_params(t1);
1: +    m2 = btf_params(t2);
1: +    for (i = 0; i < n; i++, m1++, m2++) {
1: +      /* ignore func arg names */
1: +      if (!glob_sym_btf_matches(sym_name, exact, btf1, m1->type, btf2,
1: +                                m2->type))
1: +        return false;
1: +    }
1: +
1: +    /* now check return type as well */
1: +    id1 = t1->type;
1: +    id2 = t2->type;
1: +    goto recur;
1: +  }
1: +
1: +  /* skip_mods_and_typedefs() make this impossible */
1: +  case BTF_KIND_TYPEDEF:
1: +  case BTF_KIND_VOLATILE:
1: +  case BTF_KIND_CONST:
1: +  case BTF_KIND_RESTRICT:
1: +  /* DATASECs are never compared with each other */
1: +  case BTF_KIND_DATASEC:
1: +  default:
1: +    pr_warn("global '%s': unsupported BTF kind %s\n", sym_name,
1: +            btf_kind_str(t1));
1: +    return false;
1: +  }
1:  }
1:  
1: -static bool map_defs_match(const char *sym_name,
1: -			   const struct btf *main_btf,
1: -			   const struct btf_map_def *main_def,
1: -			   const struct btf_map_def *main_inner_def,
1: -			   const struct btf *extra_btf,
1: -			   const struct btf_map_def *extra_def,
1: -			   const struct btf_map_def *extra_inner_def)
1: -{
1: -	const char *reason;
1: -
1: -	if (main_def->map_type != extra_def->map_type) {
1: -		reason = "type";
1: -		goto mismatch;
1: -	}
1: -
1: -	/* check key type/size match */
1: -	if (main_def->key_size != extra_def->key_size) {
1: -		reason = "key_size";
1: -		goto mismatch;
1: -	}
1: -	if (!!main_def->key_type_id != !!extra_def->key_type_id) {
1: -		reason = "key type";
1: -		goto mismatch;
1: -	}
1: -	if ((main_def->parts & MAP_DEF_KEY_TYPE)
1: -	     && !glob_sym_btf_matches(sym_name, true /*exact*/,
1: -				      main_btf, main_def->key_type_id,
1: -				      extra_btf, extra_def->key_type_id)) {
1: -		reason = "key type";
1: -		goto mismatch;
1: -	}
1: -
1: -	/* validate value type/size match */
1: -	if (main_def->value_size != extra_def->value_size) {
1: -		reason = "value_size";
1: -		goto mismatch;
1: -	}
1: -	if (!!main_def->value_type_id != !!extra_def->value_type_id) {
1: -		reason = "value type";
1: -		goto mismatch;
1: -	}
1: -	if ((main_def->parts & MAP_DEF_VALUE_TYPE)
1: -	     && !glob_sym_btf_matches(sym_name, true /*exact*/,
1: -				      main_btf, main_def->value_type_id,
1: -				      extra_btf, extra_def->value_type_id)) {
1: -		reason = "key type";
1: -		goto mismatch;
1: -	}
1: -
1: -	if (main_def->max_entries != extra_def->max_entries) {
1: -		reason = "max_entries";
1: -		goto mismatch;
1: -	}
1: -	if (main_def->map_flags != extra_def->map_flags) {
1: -		reason = "map_flags";
1: -		goto mismatch;
1: -	}
1: -	if (main_def->numa_node != extra_def->numa_node) {
1: -		reason = "numa_node";
1: -		goto mismatch;
1: -	}
1: -	if (main_def->pinning != extra_def->pinning) {
1: -		reason = "pinning";
1: -		goto mismatch;
1: -	}
1: -
1: -	if ((main_def->parts & MAP_DEF_INNER_MAP) != (extra_def->parts & MAP_DEF_INNER_MAP)) {
1: -		reason = "inner map";
1: -		goto mismatch;
1: -	}
1: -
1: -	if (main_def->parts & MAP_DEF_INNER_MAP) {
1: -		char inner_map_name[128];
1: -
1: -		snprintf(inner_map_name, sizeof(inner_map_name), "%s.inner", sym_name);
1: -
1: -		return map_defs_match(inner_map_name,
1: -				      main_btf, main_inner_def, NULL,
1: -				      extra_btf, extra_inner_def, NULL);
1: -	}
1: -
1: -	return true;
1: +static bool map_defs_match(const char *sym_name, const struct btf *main_btf,
1: +                           const struct btf_map_def *main_def,
1: +                           const struct btf_map_def *main_inner_def,
1: +                           const struct btf *extra_btf,
1: +                           const struct btf_map_def *extra_def,
1: +                           const struct btf_map_def *extra_inner_def) {
1: +  const char *reason;
1: +
1: +  if (main_def->map_type != extra_def->map_type) {
1: +    reason = "type";
1: +    goto mismatch;
1: +  }
1: +
1: +  /* check key type/size match */
1: +  if (main_def->key_size != extra_def->key_size) {
1: +    reason = "key_size";
1: +    goto mismatch;
1: +  }
1: +  if (!!main_def->key_type_id != !!extra_def->key_type_id) {
1: +    reason = "key type";
1: +    goto mismatch;
1: +  }
1: +  if ((main_def->parts & MAP_DEF_KEY_TYPE) &&
1: +      !glob_sym_btf_matches(sym_name, true /*exact*/, main_btf,
1: +                            main_def->key_type_id, extra_btf,
1: +                            extra_def->key_type_id)) {
1: +    reason = "key type";
1: +    goto mismatch;
1: +  }
1: +
1: +  /* validate value type/size match */
1: +  if (main_def->value_size != extra_def->value_size) {
1: +    reason = "value_size";
1: +    goto mismatch;
1: +  }
1: +  if (!!main_def->value_type_id != !!extra_def->value_type_id) {
1: +    reason = "value type";
1: +    goto mismatch;
1: +  }
1: +  if ((main_def->parts & MAP_DEF_VALUE_TYPE) &&
1: +      !glob_sym_btf_matches(sym_name, true /*exact*/, main_btf,
1: +                            main_def->value_type_id, extra_btf,
1: +                            extra_def->value_type_id)) {
1: +    reason = "key type";
1: +    goto mismatch;
1: +  }
1: +
1: +  if (main_def->max_entries != extra_def->max_entries) {
1: +    reason = "max_entries";
1: +    goto mismatch;
1: +  }
1: +  if (main_def->map_flags != extra_def->map_flags) {
1: +    reason = "map_flags";
1: +    goto mismatch;
1: +  }
1: +  if (main_def->numa_node != extra_def->numa_node) {
1: +    reason = "numa_node";
1: +    goto mismatch;
1: +  }
1: +  if (main_def->pinning != extra_def->pinning) {
1: +    reason = "pinning";
1: +    goto mismatch;
1: +  }
1: +
1: +  if ((main_def->parts & MAP_DEF_INNER_MAP) !=
1: +      (extra_def->parts & MAP_DEF_INNER_MAP)) {
1: +    reason = "inner map";
1: +    goto mismatch;
1: +  }
1: +
1: +  if (main_def->parts & MAP_DEF_INNER_MAP) {
1: +    char inner_map_name[128];
1: +
1: +    snprintf(inner_map_name, sizeof(inner_map_name), "%s.inner", sym_name);
1: +
1: +    return map_defs_match(inner_map_name, main_btf, main_inner_def, NULL,
1: +                          extra_btf, extra_inner_def, NULL);
1: +  }
1: +
1: +  return true;
1:  
1:  mismatch:
1: -	pr_warn("global '%s': map %s mismatch\n", sym_name, reason);
1: -	return false;
1: +  pr_warn("global '%s': map %s mismatch\n", sym_name, reason);
1: +  return false;
1:  }
1:  
1: -static bool glob_map_defs_match(const char *sym_name,
1: -				struct bpf_linker *linker, struct glob_sym *glob_sym,
1: -				struct src_obj *obj, Elf64_Sym *sym, int btf_id)
1: -{
1: -	struct btf_map_def dst_def = {}, dst_inner_def = {};
1: -	struct btf_map_def src_def = {}, src_inner_def = {};
1: -	const struct btf_type *t;
1: -	int err;
1: -
1: -	t = btf__type_by_id(obj->btf, btf_id);
1: -	if (!btf_is_var(t)) {
1: -		pr_warn("global '%s': invalid map definition type [%d]\n", sym_name, btf_id);
1: -		return false;
1: -	}
1: -	t = skip_mods_and_typedefs(obj->btf, t->type, NULL);
1: -
1: -	err = parse_btf_map_def(sym_name, obj->btf, t, true /*strict*/, &src_def, &src_inner_def);
1: -	if (err) {
1: -		pr_warn("global '%s': invalid map definition\n", sym_name);
1: -		return false;
1: -	}
1: -
1: -	/* re-parse existing map definition */
1: -	t = btf__type_by_id(linker->btf, glob_sym->btf_id);
1: -	t = skip_mods_and_typedefs(linker->btf, t->type, NULL);
1: -	err = parse_btf_map_def(sym_name, linker->btf, t, true /*strict*/, &dst_def, &dst_inner_def);
1: -	if (err) {
1: -		/* this should not happen, because we already validated it */
1: -		pr_warn("global '%s': invalid dst map definition\n", sym_name);
1: -		return false;
1: -	}
1: -
1: -	/* Currently extern map definition has to be complete and match
1: -	 * concrete map definition exactly. This restriction might be lifted
1: -	 * in the future.
1: -	 */
1: -	return map_defs_match(sym_name, linker->btf, &dst_def, &dst_inner_def,
1: -			      obj->btf, &src_def, &src_inner_def);
1: +static bool glob_map_defs_match(const char *sym_name, struct bpf_linker *linker,
1: +                                struct glob_sym *glob_sym, struct src_obj *obj,
1: +                                Elf64_Sym *sym, int btf_id) {
1: +  struct btf_map_def dst_def = {}, dst_inner_def = {};
1: +  struct btf_map_def src_def = {}, src_inner_def = {};
1: +  const struct btf_type *t;
1: +  int err;
1: +
1: +  t = btf__type_by_id(obj->btf, btf_id);
1: +  if (!btf_is_var(t)) {
1: +    pr_warn("global '%s': invalid map definition type [%d]\n", sym_name,
1: +            btf_id);
1: +    return false;
1: +  }
1: +  t = skip_mods_and_typedefs(obj->btf, t->type, NULL);
1: +
1: +  err = parse_btf_map_def(sym_name, obj->btf, t, true /*strict*/, &src_def,
1: +                          &src_inner_def);
1: +  if (err) {
1: +    pr_warn("global '%s': invalid map definition\n", sym_name);
1: +    return false;
1: +  }
1: +
1: +  /* re-parse existing map definition */
1: +  t = btf__type_by_id(linker->btf, glob_sym->btf_id);
1: +  t = skip_mods_and_typedefs(linker->btf, t->type, NULL);
1: +  err = parse_btf_map_def(sym_name, linker->btf, t, true /*strict*/, &dst_def,
1: +                          &dst_inner_def);
1: +  if (err) {
1: +    /* this should not happen, because we already validated it */
1: +    pr_warn("global '%s': invalid dst map definition\n", sym_name);
1: +    return false;
1: +  }
1: +
1: +  /* Currently extern map definition has to be complete and match
1: +   * concrete map definition exactly. This restriction might be lifted
1: +   * in the future.
1: +   */
1: +  return map_defs_match(sym_name, linker->btf, &dst_def, &dst_inner_def,
1: +                        obj->btf, &src_def, &src_inner_def);
1:  }
1:  
1: -static bool glob_syms_match(const char *sym_name,
1: -			    struct bpf_linker *linker, struct glob_sym *glob_sym,
1: -			    struct src_obj *obj, Elf64_Sym *sym, size_t sym_idx, int btf_id)
1: -{
1: -	const struct btf_type *src_t;
1: -
1: -	/* if we are dealing with externs, BTF types describing both global
1: -	 * and extern VARs/FUNCs should be completely present in all files
1: -	 */
1: -	if (!glob_sym->btf_id || !btf_id) {
1: -		pr_warn("BTF info is missing for global symbol '%s'\n", sym_name);
1: -		return false;
1: -	}
1: -
1: -	src_t = btf__type_by_id(obj->btf, btf_id);
1: -	if (!btf_is_var(src_t) && !btf_is_func(src_t)) {
1: -		pr_warn("only extern variables and functions are supported, but got '%s' for '%s'\n",
1: -			btf_kind_str(src_t), sym_name);
1: -		return false;
1: -	}
1: -
1: -	/* deal with .maps definitions specially */
1: -	if (glob_sym->sec_id && strcmp(linker->secs[glob_sym->sec_id].sec_name, MAPS_ELF_SEC) == 0)
1: -		return glob_map_defs_match(sym_name, linker, glob_sym, obj, sym, btf_id);
1: -
1: -	if (!glob_sym_btf_matches(sym_name, true /*exact*/,
1: -				  linker->btf, glob_sym->btf_id, obj->btf, btf_id))
1: -		return false;
1: -
1: -	return true;
1: +static bool glob_syms_match(const char *sym_name, struct bpf_linker *linker,
1: +                            struct glob_sym *glob_sym, struct src_obj *obj,
1: +                            Elf64_Sym *sym, size_t sym_idx, int btf_id) {
1: +  const struct btf_type *src_t;
1: +
1: +  /* if we are dealing with externs, BTF types describing both global
1: +   * and extern VARs/FUNCs should be completely present in all files
1: +   */
1: +  if (!glob_sym->btf_id || !btf_id) {
1: +    pr_warn("BTF info is missing for global symbol '%s'\n", sym_name);
1: +    return false;
1: +  }
1: +
1: +  src_t = btf__type_by_id(obj->btf, btf_id);
1: +  if (!btf_is_var(src_t) && !btf_is_func(src_t)) {
1: +    pr_warn(
1: +        "only extern variables and functions are supported, but got '%s' for "
1: +        "'%s'\n",
1: +        btf_kind_str(src_t), sym_name);
1: +    return false;
1: +  }
1: +
1: +  /* deal with .maps definitions specially */
1: +  if (glob_sym->sec_id &&
1: +      strcmp(linker->secs[glob_sym->sec_id].sec_name, MAPS_ELF_SEC) == 0)
1: +    return glob_map_defs_match(sym_name, linker, glob_sym, obj, sym, btf_id);
1: +
1: +  if (!glob_sym_btf_matches(sym_name, true /*exact*/, linker->btf,
1: +                            glob_sym->btf_id, obj->btf, btf_id))
1: +    return false;
1: +
1: +  return true;
1:  }
1:  
1: -static bool btf_is_non_static(const struct btf_type *t)
1: -{
1: -	return (btf_is_var(t) && btf_var(t)->linkage != BTF_VAR_STATIC)
1: -	       || (btf_is_func(t) && btf_func_linkage(t) != BTF_FUNC_STATIC);
1: +static bool btf_is_non_static(const struct btf_type *t) {
1: +  return (btf_is_var(t) && btf_var(t)->linkage != BTF_VAR_STATIC) ||
1: +         (btf_is_func(t) && btf_func_linkage(t) != BTF_FUNC_STATIC);
1:  }
1:  
1: -static int find_glob_sym_btf(struct src_obj *obj, Elf64_Sym *sym, const char *sym_name,
1: -			     int *out_btf_sec_id, int *out_btf_id)
1: -{
1: -	int i, j, n = btf__get_nr_types(obj->btf), m, btf_id = 0;
1: -	const struct btf_type *t;
1: -	const struct btf_var_secinfo *vi;
1: -	const char *name;
1: -
1: -	for (i = 1; i <= n; i++) {
1: -		t = btf__type_by_id(obj->btf, i);
1: -
1: -		/* some global and extern FUNCs and VARs might not be associated with any
1: -		 * DATASEC, so try to detect them in the same pass
1: -		 */
1: -		if (btf_is_non_static(t)) {
1: -			name = btf__str_by_offset(obj->btf, t->name_off);
1: -			if (strcmp(name, sym_name) != 0)
1: -				continue;
1: -
1: -			/* remember and still try to find DATASEC */
1: -			btf_id = i;
1: -			continue;
1: -		}
1: -
1: -		if (!btf_is_datasec(t))
1: -			continue;
1: -
1: -		vi = btf_var_secinfos(t);
1: -		for (j = 0, m = btf_vlen(t); j < m; j++, vi++) {
1: -			t = btf__type_by_id(obj->btf, vi->type);
1: -			name = btf__str_by_offset(obj->btf, t->name_off);
1: -
1: -			if (strcmp(name, sym_name) != 0)
1: -				continue;
1: -			if (btf_is_var(t) && btf_var(t)->linkage == BTF_VAR_STATIC)
1: -				continue;
1: -			if (btf_is_func(t) && btf_func_linkage(t) == BTF_FUNC_STATIC)
1: -				continue;
1: -
1: -			if (btf_id && btf_id != vi->type) {
1: -				pr_warn("global/extern '%s' BTF is ambiguous: both types #%d and #%u match\n",
1: -					sym_name, btf_id, vi->type);
1: -				return -EINVAL;
1: -			}
1: -
1: -			*out_btf_sec_id = i;
1: -			*out_btf_id = vi->type;
1: -
1: -			return 0;
1: -		}
1: -	}
1: -
1: -	/* free-floating extern or global FUNC */
1: -	if (btf_id) {
1: -		*out_btf_sec_id = 0;
1: -		*out_btf_id = btf_id;
1: -		return 0;
1: -	}
1: -
1: -	pr_warn("failed to find BTF info for global/extern symbol '%s'\n", sym_name);
1: -	return -ENOENT;
1: +static int find_glob_sym_btf(struct src_obj *obj, Elf64_Sym *sym,
1: +                             const char *sym_name, int *out_btf_sec_id,
1: +                             int *out_btf_id) {
1: +  int i, j, n = btf__get_nr_types(obj->btf), m, btf_id = 0;
1: +  const struct btf_type *t;
1: +  const struct btf_var_secinfo *vi;
1: +  const char *name;
1: +
1: +  for (i = 1; i <= n; i++) {
1: +    t = btf__type_by_id(obj->btf, i);
1: +
1: +    /* some global and extern FUNCs and VARs might not be associated with any
1: +     * DATASEC, so try to detect them in the same pass
1: +     */
1: +    if (btf_is_non_static(t)) {
1: +      name = btf__str_by_offset(obj->btf, t->name_off);
1: +      if (strcmp(name, sym_name) != 0)
1: +        continue;
1: +
1: +      /* remember and still try to find DATASEC */
1: +      btf_id = i;
1: +      continue;
1: +    }
1: +
1: +    if (!btf_is_datasec(t))
1: +      continue;
1: +
1: +    vi = btf_var_secinfos(t);
1: +    for (j = 0, m = btf_vlen(t); j < m; j++, vi++) {
1: +      t = btf__type_by_id(obj->btf, vi->type);
1: +      name = btf__str_by_offset(obj->btf, t->name_off);
1: +
1: +      if (strcmp(name, sym_name) != 0)
1: +        continue;
1: +      if (btf_is_var(t) && btf_var(t)->linkage == BTF_VAR_STATIC)
1: +        continue;
1: +      if (btf_is_func(t) && btf_func_linkage(t) == BTF_FUNC_STATIC)
1: +        continue;
1: +
1: +      if (btf_id && btf_id != vi->type) {
1: +        pr_warn(
1: +            "global/extern '%s' BTF is ambiguous: both types #%d and #%u "
1: +            "match\n",
1: +            sym_name, btf_id, vi->type);
1: +        return -EINVAL;
1: +      }
1: +
1: +      *out_btf_sec_id = i;
1: +      *out_btf_id = vi->type;
1: +
1: +      return 0;
1: +    }
1: +  }
1: +
1: +  /* free-floating extern or global FUNC */
1: +  if (btf_id) {
1: +    *out_btf_sec_id = 0;
1: +    *out_btf_id = btf_id;
1: +    return 0;
1: +  }
1: +
1: +  pr_warn("failed to find BTF info for global/extern symbol '%s'\n", sym_name);
1: +  return -ENOENT;
1:  }
1:  
1: -static struct src_sec *find_src_sec_by_name(struct src_obj *obj, const char *sec_name)
1: -{
1: -	struct src_sec *sec;
1: -	int i;
1: +static struct src_sec *find_src_sec_by_name(struct src_obj *obj,
1: +                                            const char *sec_name) {
1: +  struct src_sec *sec;
1: +  int i;
1:  
1: -	for (i = 1; i < obj->sec_cnt; i++) {
1: -		sec = &obj->secs[i];
1: +  for (i = 1; i < obj->sec_cnt; i++) {
1: +    sec = &obj->secs[i];
1:  
1: -		if (strcmp(sec->sec_name, sec_name) == 0)
1: -			return sec;
1: -	}
1: +    if (strcmp(sec->sec_name, sec_name) == 0)
1: +      return sec;
1: +  }
1:  
1: -	return NULL;
1: +  return NULL;
1:  }
1:  
1:  static int complete_extern_btf_info(struct btf *dst_btf, int dst_id,
1: -				    struct btf *src_btf, int src_id)
1: -{
1: -	struct btf_type *dst_t = btf_type_by_id(dst_btf, dst_id);
1: -	struct btf_type *src_t = btf_type_by_id(src_btf, src_id);
1: -	struct btf_param *src_p, *dst_p;
1: -	const char *s;
1: -	int i, n, off;
1: -
1: -	/* We already made sure that source and destination types (FUNC or
1: -	 * VAR) match in terms of types and argument names.
1: -	 */
1: -	if (btf_is_var(dst_t)) {
1: -		btf_var(dst_t)->linkage = BTF_VAR_GLOBAL_ALLOCATED;
1: -		return 0;
1: -	}
1: -
1: -	dst_t->info = btf_type_info(BTF_KIND_FUNC, BTF_FUNC_GLOBAL, 0);
1: -
1: -	/* now onto FUNC_PROTO types */
1: -	src_t = btf_type_by_id(src_btf, src_t->type);
1: -	dst_t = btf_type_by_id(dst_btf, dst_t->type);
1: -
1: -	/* Fill in all the argument names, which for extern FUNCs are missing.
1: -	 * We'll end up with two copies of FUNCs/VARs for externs, but that
1: -	 * will be taken care of by BTF dedup at the very end.
1: -	 * It might be that BTF types for extern in one file has less/more BTF
1: -	 * information (e.g., FWD instead of full STRUCT/UNION information),
1: -	 * but that should be (in most cases, subject to BTF dedup rules)
1: -	 * handled and resolved by BTF dedup algorithm as well, so we won't
1: -	 * worry about it. Our only job is to make sure that argument names
1: -	 * are populated on both sides, otherwise BTF dedup will pedantically
1: -	 * consider them different.
1: -	 */
1: -	src_p = btf_params(src_t);
1: -	dst_p = btf_params(dst_t);
1: -	for (i = 0, n = btf_vlen(dst_t); i < n; i++, src_p++, dst_p++) {
1: -		if (!src_p->name_off)
1: -			continue;
1: -
1: -		/* src_btf has more complete info, so add name to dst_btf */
1: -		s = btf__str_by_offset(src_btf, src_p->name_off);
1: -		off = btf__add_str(dst_btf, s);
1: -		if (off < 0)
1: -			return off;
1: -		dst_p->name_off = off;
1: -	}
1: -	return 0;
1: +                                    struct btf *src_btf, int src_id) {
1: +  struct btf_type *dst_t = btf_type_by_id(dst_btf, dst_id);
1: +  struct btf_type *src_t = btf_type_by_id(src_btf, src_id);
1: +  struct btf_param *src_p, *dst_p;
1: +  const char *s;
1: +  int i, n, off;
1: +
1: +  /* We already made sure that source and destination types (FUNC or
1: +   * VAR) match in terms of types and argument names.
1: +   */
1: +  if (btf_is_var(dst_t)) {
1: +    btf_var(dst_t)->linkage = BTF_VAR_GLOBAL_ALLOCATED;
1: +    return 0;
1: +  }
1: +
1: +  dst_t->info = btf_type_info(BTF_KIND_FUNC, BTF_FUNC_GLOBAL, 0);
1: +
1: +  /* now onto FUNC_PROTO types */
1: +  src_t = btf_type_by_id(src_btf, src_t->type);
1: +  dst_t = btf_type_by_id(dst_btf, dst_t->type);
1: +
1: +  /* Fill in all the argument names, which for extern FUNCs are missing.
1: +   * We'll end up with two copies of FUNCs/VARs for externs, but that
1: +   * will be taken care of by BTF dedup at the very end.
1: +   * It might be that BTF types for extern in one file has less/more BTF
1: +   * information (e.g., FWD instead of full STRUCT/UNION information),
1: +   * but that should be (in most cases, subject to BTF dedup rules)
1: +   * handled and resolved by BTF dedup algorithm as well, so we won't
1: +   * worry about it. Our only job is to make sure that argument names
1: +   * are populated on both sides, otherwise BTF dedup will pedantically
1: +   * consider them different.
1: +   */
1: +  src_p = btf_params(src_t);
1: +  dst_p = btf_params(dst_t);
1: +  for (i = 0, n = btf_vlen(dst_t); i < n; i++, src_p++, dst_p++) {
1: +    if (!src_p->name_off)
1: +      continue;
1: +
1: +    /* src_btf has more complete info, so add name to dst_btf */
1: +    s = btf__str_by_offset(src_btf, src_p->name_off);
1: +    off = btf__add_str(dst_btf, s);
1: +    if (off < 0)
1: +      return off;
1: +    dst_p->name_off = off;
1: +  }
1: +  return 0;
1:  }
1:  
1: -static void sym_update_bind(Elf64_Sym *sym, int sym_bind)
1: -{
1: -	sym->st_info = ELF64_ST_INFO(sym_bind, ELF64_ST_TYPE(sym->st_info));
1: +static void sym_update_bind(Elf64_Sym *sym, int sym_bind) {
1: +  sym->st_info = ELF64_ST_INFO(sym_bind, ELF64_ST_TYPE(sym->st_info));
1:  }
1:  
1: -static void sym_update_type(Elf64_Sym *sym, int sym_type)
1: -{
1: -	sym->st_info = ELF64_ST_INFO(ELF64_ST_BIND(sym->st_info), sym_type);
1: +static void sym_update_type(Elf64_Sym *sym, int sym_type) {
1: +  sym->st_info = ELF64_ST_INFO(ELF64_ST_BIND(sym->st_info), sym_type);
1:  }
1:  
1: -static void sym_update_visibility(Elf64_Sym *sym, int sym_vis)
1: -{
1: -	/* libelf doesn't provide setters for ST_VISIBILITY,
1: -	 * but it is stored in the lower 2 bits of st_other
1: -	 */
1: -	sym->st_other &= ~0x03;
1: -	sym->st_other |= sym_vis;
1: +static void sym_update_visibility(Elf64_Sym *sym, int sym_vis) {
1: +  /* libelf doesn't provide setters for ST_VISIBILITY,
1: +   * but it is stored in the lower 2 bits of st_other
1: +   */
1: +  sym->st_other &= ~0x03;
1: +  sym->st_other |= sym_vis;
1:  }
1:  
1:  static int linker_append_elf_sym(struct bpf_linker *linker, struct src_obj *obj,
1: -				 Elf64_Sym *sym, const char *sym_name, int src_sym_idx)
1: -{
1: -	struct src_sec *src_sec = NULL;
1: -	struct dst_sec *dst_sec = NULL;
1: -	struct glob_sym *glob_sym = NULL;
1: -	int name_off, sym_type, sym_bind, sym_vis, err;
1: -	int btf_sec_id = 0, btf_id = 0;
1: -	size_t dst_sym_idx;
1: -	Elf64_Sym *dst_sym;
1: -	bool sym_is_extern;
1: -
1: -	sym_type = ELF64_ST_TYPE(sym->st_info);
1: -	sym_bind = ELF64_ST_BIND(sym->st_info);
1: -	sym_vis = ELF64_ST_VISIBILITY(sym->st_other);
1: -	sym_is_extern = sym->st_shndx == SHN_UNDEF;
1: -
1: -	if (sym_is_extern) {
1: -		if (!obj->btf) {
1: -			pr_warn("externs without BTF info are not supported\n");
1: -			return -ENOTSUP;
1: -		}
1: -	} else if (sym->st_shndx < SHN_LORESERVE) {
1: -		src_sec = &obj->secs[sym->st_shndx];
1: -		if (src_sec->skipped)
1: -			return 0;
1: -		dst_sec = &linker->secs[src_sec->dst_id];
1: -
1: -		/* allow only one STT_SECTION symbol per section */
1: -		if (sym_type == STT_SECTION && dst_sec->sec_sym_idx) {
1: -			obj->sym_map[src_sym_idx] = dst_sec->sec_sym_idx;
1: -			return 0;
1: -		}
1: -	}
1: -
1: -	if (sym_bind == STB_LOCAL)
1: -		goto add_sym;
1: -
1: -	/* find matching BTF info */
1: -	err = find_glob_sym_btf(obj, sym, sym_name, &btf_sec_id, &btf_id);
1: -	if (err)
1: -		return err;
1: -
1: -	if (sym_is_extern && btf_sec_id) {
1: -		const char *sec_name = NULL;
1: -		const struct btf_type *t;
1: -
1: -		t = btf__type_by_id(obj->btf, btf_sec_id);
1: -		sec_name = btf__str_by_offset(obj->btf, t->name_off);
1: -
1: -		/* Clang puts unannotated extern vars into
1: -		 * '.extern' BTF DATASEC. Treat them the same
1: -		 * as unannotated extern funcs (which are
1: -		 * currently not put into any DATASECs).
1: -		 * Those don't have associated src_sec/dst_sec.
1: -		 */
1: -		if (strcmp(sec_name, BTF_EXTERN_SEC) != 0) {
1: -			src_sec = find_src_sec_by_name(obj, sec_name);
1: -			if (!src_sec) {
1: -				pr_warn("failed to find matching ELF sec '%s'\n", sec_name);
1: -				return -ENOENT;
1: -			}
1: -			dst_sec = &linker->secs[src_sec->dst_id];
1: -		}
1: -	}
1: -
1: -	glob_sym = find_glob_sym(linker, sym_name);
1: -	if (glob_sym) {
1: -		/* Preventively resolve to existing symbol. This is
1: -		 * needed for further relocation symbol remapping in
1: -		 * the next step of linking.
1: -		 */
1: -		obj->sym_map[src_sym_idx] = glob_sym->sym_idx;
1: -
1: -		/* If both symbols are non-externs, at least one of
1: -		 * them has to be STB_WEAK, otherwise they are in
1: -		 * a conflict with each other.
1: -		 */
1: -		if (!sym_is_extern && !glob_sym->is_extern
1: -		    && !glob_sym->is_weak && sym_bind != STB_WEAK) {
1: -			pr_warn("conflicting non-weak symbol #%d (%s) definition in '%s'\n",
1: -				src_sym_idx, sym_name, obj->filename);
1: -			return -EINVAL;
1: -		}
1: -
1: -		if (!glob_syms_match(sym_name, linker, glob_sym, obj, sym, src_sym_idx, btf_id))
1: -			return -EINVAL;
1: -
1: -		dst_sym = get_sym_by_idx(linker, glob_sym->sym_idx);
1: -
1: -		/* If new symbol is strong, then force dst_sym to be strong as
1: -		 * well; this way a mix of weak and non-weak extern
1: -		 * definitions will end up being strong.
1: -		 */
1: -		if (sym_bind == STB_GLOBAL) {
1: -			/* We still need to preserve type (NOTYPE or
1: -			 * OBJECT/FUNC, depending on whether the symbol is
1: -			 * extern or not)
1: -			 */
1: -			sym_update_bind(dst_sym, STB_GLOBAL);
1: -			glob_sym->is_weak = false;
1: -		}
1: -
1: -		/* Non-default visibility is "contaminating", with stricter
1: -		 * visibility overwriting more permissive ones, even if more
1: -		 * permissive visibility comes from just an extern definition.
1: -		 * Currently only STV_DEFAULT and STV_HIDDEN are allowed and
1: -		 * ensured by ELF symbol sanity checks above.
1: -		 */
1: -		if (sym_vis > ELF64_ST_VISIBILITY(dst_sym->st_other))
1: -			sym_update_visibility(dst_sym, sym_vis);
1: -
1: -		/* If the new symbol is extern, then regardless if
1: -		 * existing symbol is extern or resolved global, just
1: -		 * keep the existing one untouched.
1: -		 */
1: -		if (sym_is_extern)
1: -			return 0;
1: -
1: -		/* If existing symbol is a strong resolved symbol, bail out,
1: -		 * because we lost resolution battle have nothing to
1: -		 * contribute. We already checked abover that there is no
1: -		 * strong-strong conflict. We also already tightened binding
1: -		 * and visibility, so nothing else to contribute at that point.
1: -		 */
1: -		if (!glob_sym->is_extern && sym_bind == STB_WEAK)
1: -			return 0;
1: -
1: -		/* At this point, new symbol is strong non-extern,
1: -		 * so overwrite glob_sym with new symbol information.
1: -		 * Preserve binding and visibility.
1: -		 */
1: -		sym_update_type(dst_sym, sym_type);
1: -		dst_sym->st_shndx = dst_sec->sec_idx;
1: -		dst_sym->st_value = src_sec->dst_off + sym->st_value;
1: -		dst_sym->st_size = sym->st_size;
1: -
1: -		/* see comment below about dst_sec->id vs dst_sec->sec_idx */
1: -		glob_sym->sec_id = dst_sec->id;
1: -		glob_sym->is_extern = false;
1: -
1: -		if (complete_extern_btf_info(linker->btf, glob_sym->btf_id,
1: -					     obj->btf, btf_id))
1: -			return -EINVAL;
1: -
1: -		/* request updating VAR's/FUNC's underlying BTF type when appending BTF type */
1: -		glob_sym->underlying_btf_id = 0;
1: -
1: -		obj->sym_map[src_sym_idx] = glob_sym->sym_idx;
1: -		return 0;
1: -	}
1: +                                 Elf64_Sym *sym, const char *sym_name,
1: +                                 int src_sym_idx) {
1: +  struct src_sec *src_sec = NULL;
1: +  struct dst_sec *dst_sec = NULL;
1: +  struct glob_sym *glob_sym = NULL;
1: +  int name_off, sym_type, sym_bind, sym_vis, err;
1: +  int btf_sec_id = 0, btf_id = 0;
1: +  size_t dst_sym_idx;
1: +  Elf64_Sym *dst_sym;
1: +  bool sym_is_extern;
1: +
1: +  sym_type = ELF64_ST_TYPE(sym->st_info);
1: +  sym_bind = ELF64_ST_BIND(sym->st_info);
1: +  sym_vis = ELF64_ST_VISIBILITY(sym->st_other);
1: +  sym_is_extern = sym->st_shndx == SHN_UNDEF;
1: +
1: +  if (sym_is_extern) {
1: +    if (!obj->btf) {
1: +      pr_warn("externs without BTF info are not supported\n");
1: +      return -ENOTSUP;
1: +    }
1: +  } else if (sym->st_shndx < SHN_LORESERVE) {
1: +    src_sec = &obj->secs[sym->st_shndx];
1: +    if (src_sec->skipped)
1: +      return 0;
1: +    dst_sec = &linker->secs[src_sec->dst_id];
1: +
1: +    /* allow only one STT_SECTION symbol per section */
1: +    if (sym_type == STT_SECTION && dst_sec->sec_sym_idx) {
1: +      obj->sym_map[src_sym_idx] = dst_sec->sec_sym_idx;
1: +      return 0;
1: +    }
1: +  }
1: +
1: +  if (sym_bind == STB_LOCAL)
1: +    goto add_sym;
1: +
1: +  /* find matching BTF info */
1: +  err = find_glob_sym_btf(obj, sym, sym_name, &btf_sec_id, &btf_id);
1: +  if (err)
1: +    return err;
1: +
1: +  if (sym_is_extern && btf_sec_id) {
1: +    const char *sec_name = NULL;
1: +    const struct btf_type *t;
1: +
1: +    t = btf__type_by_id(obj->btf, btf_sec_id);
1: +    sec_name = btf__str_by_offset(obj->btf, t->name_off);
1: +
1: +    /* Clang puts unannotated extern vars into
1: +     * '.extern' BTF DATASEC. Treat them the same
1: +     * as unannotated extern funcs (which are
1: +     * currently not put into any DATASECs).
1: +     * Those don't have associated src_sec/dst_sec.
1: +     */
1: +    if (strcmp(sec_name, BTF_EXTERN_SEC) != 0) {
1: +      src_sec = find_src_sec_by_name(obj, sec_name);
1: +      if (!src_sec) {
1: +        pr_warn("failed to find matching ELF sec '%s'\n", sec_name);
1: +        return -ENOENT;
1: +      }
1: +      dst_sec = &linker->secs[src_sec->dst_id];
1: +    }
1: +  }
1: +
1: +  glob_sym = find_glob_sym(linker, sym_name);
1: +  if (glob_sym) {
1: +    /* Preventively resolve to existing symbol. This is
1: +     * needed for further relocation symbol remapping in
1: +     * the next step of linking.
1: +     */
1: +    obj->sym_map[src_sym_idx] = glob_sym->sym_idx;
1: +
1: +    /* If both symbols are non-externs, at least one of
1: +     * them has to be STB_WEAK, otherwise they are in
1: +     * a conflict with each other.
1: +     */
1: +    if (!sym_is_extern && !glob_sym->is_extern && !glob_sym->is_weak &&
1: +        sym_bind != STB_WEAK) {
1: +      pr_warn("conflicting non-weak symbol #%d (%s) definition in '%s'\n",
1: +              src_sym_idx, sym_name, obj->filename);
1: +      return -EINVAL;
1: +    }
1: +
1: +    if (!glob_syms_match(sym_name, linker, glob_sym, obj, sym, src_sym_idx,
1: +                         btf_id))
1: +      return -EINVAL;
1: +
1: +    dst_sym = get_sym_by_idx(linker, glob_sym->sym_idx);
1: +
1: +    /* If new symbol is strong, then force dst_sym to be strong as
1: +     * well; this way a mix of weak and non-weak extern
1: +     * definitions will end up being strong.
1: +     */
1: +    if (sym_bind == STB_GLOBAL) {
1: +      /* We still need to preserve type (NOTYPE or
1: +       * OBJECT/FUNC, depending on whether the symbol is
1: +       * extern or not)
1: +       */
1: +      sym_update_bind(dst_sym, STB_GLOBAL);
1: +      glob_sym->is_weak = false;
1: +    }
1: +
1: +    /* Non-default visibility is "contaminating", with stricter
1: +     * visibility overwriting more permissive ones, even if more
1: +     * permissive visibility comes from just an extern definition.
1: +     * Currently only STV_DEFAULT and STV_HIDDEN are allowed and
1: +     * ensured by ELF symbol sanity checks above.
1: +     */
1: +    if (sym_vis > ELF64_ST_VISIBILITY(dst_sym->st_other))
1: +      sym_update_visibility(dst_sym, sym_vis);
1: +
1: +    /* If the new symbol is extern, then regardless if
1: +     * existing symbol is extern or resolved global, just
1: +     * keep the existing one untouched.
1: +     */
1: +    if (sym_is_extern)
1: +      return 0;
1: +
1: +    /* If existing symbol is a strong resolved symbol, bail out,
1: +     * because we lost resolution battle have nothing to
1: +     * contribute. We already checked abover that there is no
1: +     * strong-strong conflict. We also already tightened binding
1: +     * and visibility, so nothing else to contribute at that point.
1: +     */
1: +    if (!glob_sym->is_extern && sym_bind == STB_WEAK)
1: +      return 0;
1: +
1: +    /* At this point, new symbol is strong non-extern,
1: +     * so overwrite glob_sym with new symbol information.
1: +     * Preserve binding and visibility.
1: +     */
1: +    sym_update_type(dst_sym, sym_type);
1: +    dst_sym->st_shndx = dst_sec->sec_idx;
1: +    dst_sym->st_value = src_sec->dst_off + sym->st_value;
1: +    dst_sym->st_size = sym->st_size;
1: +
1: +    /* see comment below about dst_sec->id vs dst_sec->sec_idx */
1: +    glob_sym->sec_id = dst_sec->id;
1: +    glob_sym->is_extern = false;
1: +
1: +    if (complete_extern_btf_info(linker->btf, glob_sym->btf_id, obj->btf,
1: +                                 btf_id))
1: +      return -EINVAL;
1: +
1: +    /* request updating VAR's/FUNC's underlying BTF type when appending BTF type
1: +     */
1: +    glob_sym->underlying_btf_id = 0;
1: +
1: +    obj->sym_map[src_sym_idx] = glob_sym->sym_idx;
1: +    return 0;
1: +  }
1:  
1:  add_sym:
1: -	name_off = strset__add_str(linker->strtab_strs, sym_name);
1: -	if (name_off < 0)
1: -		return name_off;
1: -
1: -	dst_sym = add_new_sym(linker, &dst_sym_idx);
1: -	if (!dst_sym)
1: -		return -ENOMEM;
1: -
1: -	dst_sym->st_name = name_off;
1: -	dst_sym->st_info = sym->st_info;
1: -	dst_sym->st_other = sym->st_other;
1: -	dst_sym->st_shndx = dst_sec ? dst_sec->sec_idx : sym->st_shndx;
1: -	dst_sym->st_value = (src_sec ? src_sec->dst_off : 0) + sym->st_value;
1: -	dst_sym->st_size = sym->st_size;
1: -
1: -	obj->sym_map[src_sym_idx] = dst_sym_idx;
1: -
1: -	if (sym_type == STT_SECTION && dst_sym) {
1: -		dst_sec->sec_sym_idx = dst_sym_idx;
1: -		dst_sym->st_value = 0;
1: -	}
1: -
1: -	if (sym_bind != STB_LOCAL) {
1: -		glob_sym = add_glob_sym(linker);
1: -		if (!glob_sym)
1: -			return -ENOMEM;
1: -
1: -		glob_sym->sym_idx = dst_sym_idx;
1: -		/* we use dst_sec->id (and not dst_sec->sec_idx), because
1: -		 * ephemeral sections (.kconfig, .ksyms, etc) don't have
1: -		 * sec_idx (as they don't have corresponding ELF section), but
1: -		 * still have id. .extern doesn't have even ephemeral section
1: -		 * associated with it, so dst_sec->id == dst_sec->sec_idx == 0.
1: -		 */
1: -		glob_sym->sec_id = dst_sec ? dst_sec->id : 0;
1: -		glob_sym->name_off = name_off;
1: -		/* we will fill btf_id in during BTF merging step */
1: -		glob_sym->btf_id = 0;
1: -		glob_sym->is_extern = sym_is_extern;
1: -		glob_sym->is_weak = sym_bind == STB_WEAK;
1: -	}
1: -
1: -	return 0;
1: +  name_off = strset__add_str(linker->strtab_strs, sym_name);
1: +  if (name_off < 0)
1: +    return name_off;
1: +
1: +  dst_sym = add_new_sym(linker, &dst_sym_idx);
1: +  if (!dst_sym)
1: +    return -ENOMEM;
1: +
1: +  dst_sym->st_name = name_off;
1: +  dst_sym->st_info = sym->st_info;
1: +  dst_sym->st_other = sym->st_other;
1: +  dst_sym->st_shndx = dst_sec ? dst_sec->sec_idx : sym->st_shndx;
1: +  dst_sym->st_value = (src_sec ? src_sec->dst_off : 0) + sym->st_value;
1: +  dst_sym->st_size = sym->st_size;
1: +
1: +  obj->sym_map[src_sym_idx] = dst_sym_idx;
1: +
1: +  if (sym_type == STT_SECTION && dst_sym) {
1: +    dst_sec->sec_sym_idx = dst_sym_idx;
1: +    dst_sym->st_value = 0;
1: +  }
1: +
1: +  if (sym_bind != STB_LOCAL) {
1: +    glob_sym = add_glob_sym(linker);
1: +    if (!glob_sym)
1: +      return -ENOMEM;
1: +
1: +    glob_sym->sym_idx = dst_sym_idx;
1: +    /* we use dst_sec->id (and not dst_sec->sec_idx), because
1: +     * ephemeral sections (.kconfig, .ksyms, etc) don't have
1: +     * sec_idx (as they don't have corresponding ELF section), but
1: +     * still have id. .extern doesn't have even ephemeral section
1: +     * associated with it, so dst_sec->id == dst_sec->sec_idx == 0.
1: +     */
1: +    glob_sym->sec_id = dst_sec ? dst_sec->id : 0;
1: +    glob_sym->name_off = name_off;
1: +    /* we will fill btf_id in during BTF merging step */
1: +    glob_sym->btf_id = 0;
1: +    glob_sym->is_extern = sym_is_extern;
1: +    glob_sym->is_weak = sym_bind == STB_WEAK;
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *obj)
1: -{
1: -	struct src_sec *src_symtab = &obj->secs[obj->symtab_sec_idx];
1: -	struct dst_sec *dst_symtab = &linker->secs[linker->symtab_sec_idx];
1: -	int i, err;
1: -
1: -	for (i = 1; i < obj->sec_cnt; i++) {
1: -		struct src_sec *src_sec, *src_linked_sec;
1: -		struct dst_sec *dst_sec, *dst_linked_sec;
1: -		Elf64_Rel *src_rel, *dst_rel;
1: -		int j, n;
1: -
1: -		src_sec = &obj->secs[i];
1: -		if (!is_relo_sec(src_sec))
1: -			continue;
1: -
1: -		/* shdr->sh_info points to relocatable section */
1: -		src_linked_sec = &obj->secs[src_sec->shdr->sh_info];
1: -		if (src_linked_sec->skipped)
1: -			continue;
1: -
1: -		dst_sec = find_dst_sec_by_name(linker, src_sec->sec_name);
1: -		if (!dst_sec) {
1: -			dst_sec = add_dst_sec(linker, src_sec->sec_name);
1: -			if (!dst_sec)
1: -				return -ENOMEM;
1: -			err = init_sec(linker, dst_sec, src_sec);
1: -			if (err) {
1: -				pr_warn("failed to init section '%s'\n", src_sec->sec_name);
1: -				return err;
1: -			}
1: -		} else if (!secs_match(dst_sec, src_sec)) {
1: -			pr_warn("sections %s are not compatible\n", src_sec->sec_name);
1: -			return -1;
1: -		}
1: -
1: -		/* shdr->sh_link points to SYMTAB */
1: -		dst_sec->shdr->sh_link = linker->symtab_sec_idx;
1: -
1: -		/* shdr->sh_info points to relocated section */
1: -		dst_linked_sec = &linker->secs[src_linked_sec->dst_id];
1: -		dst_sec->shdr->sh_info = dst_linked_sec->sec_idx;
1: -
1: -		src_sec->dst_id = dst_sec->id;
1: -		err = extend_sec(linker, dst_sec, src_sec);
1: -		if (err)
1: -			return err;
1: -
1: -		src_rel = src_sec->data->d_buf;
1: -		dst_rel = dst_sec->raw_data + src_sec->dst_off;
1: -		n = src_sec->shdr->sh_size / src_sec->shdr->sh_entsize;
1: -		for (j = 0; j < n; j++, src_rel++, dst_rel++) {
1: -			size_t src_sym_idx = ELF64_R_SYM(src_rel->r_info);
1: -			size_t sym_type = ELF64_R_TYPE(src_rel->r_info);
1: -			Elf64_Sym *src_sym, *dst_sym;
1: -			size_t dst_sym_idx;
1: -
1: -			src_sym_idx = ELF64_R_SYM(src_rel->r_info);
1: -			src_sym = src_symtab->data->d_buf + sizeof(*src_sym) * src_sym_idx;
1: -
1: -			dst_sym_idx = obj->sym_map[src_sym_idx];
1: -			dst_sym = dst_symtab->raw_data + sizeof(*dst_sym) * dst_sym_idx;
1: -			dst_rel->r_offset += src_linked_sec->dst_off;
1: -			sym_type = ELF64_R_TYPE(src_rel->r_info);
1: -			dst_rel->r_info = ELF64_R_INFO(dst_sym_idx, sym_type);
1: -
1: -			if (ELF64_ST_TYPE(src_sym->st_info) == STT_SECTION) {
1: -				struct src_sec *sec = &obj->secs[src_sym->st_shndx];
1: -				struct bpf_insn *insn;
1: -
1: -				if (src_linked_sec->shdr->sh_flags & SHF_EXECINSTR) {
1: -					/* calls to the very first static function inside
1: -					 * .text section at offset 0 will
1: -					 * reference section symbol, not the
1: -					 * function symbol. Fix that up,
1: -					 * otherwise it won't be possible to
1: -					 * relocate calls to two different
1: -					 * static functions with the same name
1: -					 * (rom two different object files)
1: -					 */
1: -					insn = dst_linked_sec->raw_data + dst_rel->r_offset;
1: -					if (insn->code == (BPF_JMP | BPF_CALL))
1: -						insn->imm += sec->dst_off / sizeof(struct bpf_insn);
1: -					else
1: -						insn->imm += sec->dst_off;
1: -				} else {
1: -					pr_warn("relocation against STT_SECTION in non-exec section is not supported!\n");
1: -					return -EINVAL;
1: -				}
1: -			}
1: -
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int linker_append_elf_relos(struct bpf_linker *linker,
1: +                                   struct src_obj *obj) {
1: +  struct src_sec *src_symtab = &obj->secs[obj->symtab_sec_idx];
1: +  struct dst_sec *dst_symtab = &linker->secs[linker->symtab_sec_idx];
1: +  int i, err;
1: +
1: +  for (i = 1; i < obj->sec_cnt; i++) {
1: +    struct src_sec *src_sec, *src_linked_sec;
1: +    struct dst_sec *dst_sec, *dst_linked_sec;
1: +    Elf64_Rel *src_rel, *dst_rel;
1: +    int j, n;
1: +
1: +    src_sec = &obj->secs[i];
1: +    if (!is_relo_sec(src_sec))
1: +      continue;
1: +
1: +    /* shdr->sh_info points to relocatable section */
1: +    src_linked_sec = &obj->secs[src_sec->shdr->sh_info];
1: +    if (src_linked_sec->skipped)
1: +      continue;
1: +
1: +    dst_sec = find_dst_sec_by_name(linker, src_sec->sec_name);
1: +    if (!dst_sec) {
1: +      dst_sec = add_dst_sec(linker, src_sec->sec_name);
1: +      if (!dst_sec)
1: +        return -ENOMEM;
1: +      err = init_sec(linker, dst_sec, src_sec);
1: +      if (err) {
1: +        pr_warn("failed to init section '%s'\n", src_sec->sec_name);
1: +        return err;
1: +      }
1: +    } else if (!secs_match(dst_sec, src_sec)) {
1: +      pr_warn("sections %s are not compatible\n", src_sec->sec_name);
1: +      return -1;
1: +    }
1: +
1: +    /* shdr->sh_link points to SYMTAB */
1: +    dst_sec->shdr->sh_link = linker->symtab_sec_idx;
1: +
1: +    /* shdr->sh_info points to relocated section */
1: +    dst_linked_sec = &linker->secs[src_linked_sec->dst_id];
1: +    dst_sec->shdr->sh_info = dst_linked_sec->sec_idx;
1: +
1: +    src_sec->dst_id = dst_sec->id;
1: +    err = extend_sec(linker, dst_sec, src_sec);
1: +    if (err)
1: +      return err;
1: +
1: +    src_rel = src_sec->data->d_buf;
1: +    dst_rel = dst_sec->raw_data + src_sec->dst_off;
1: +    n = src_sec->shdr->sh_size / src_sec->shdr->sh_entsize;
1: +    for (j = 0; j < n; j++, src_rel++, dst_rel++) {
1: +      size_t src_sym_idx = ELF64_R_SYM(src_rel->r_info);
1: +      size_t sym_type = ELF64_R_TYPE(src_rel->r_info);
1: +      Elf64_Sym *src_sym, *dst_sym;
1: +      size_t dst_sym_idx;
1: +
1: +      src_sym_idx = ELF64_R_SYM(src_rel->r_info);
1: +      src_sym = src_symtab->data->d_buf + sizeof(*src_sym) * src_sym_idx;
1: +
1: +      dst_sym_idx = obj->sym_map[src_sym_idx];
1: +      dst_sym = dst_symtab->raw_data + sizeof(*dst_sym) * dst_sym_idx;
1: +      dst_rel->r_offset += src_linked_sec->dst_off;
1: +      sym_type = ELF64_R_TYPE(src_rel->r_info);
1: +      dst_rel->r_info = ELF64_R_INFO(dst_sym_idx, sym_type);
1: +
1: +      if (ELF64_ST_TYPE(src_sym->st_info) == STT_SECTION) {
1: +        struct src_sec *sec = &obj->secs[src_sym->st_shndx];
1: +        struct bpf_insn *insn;
1: +
1: +        if (src_linked_sec->shdr->sh_flags & SHF_EXECINSTR) {
1: +          /* calls to the very first static function inside
1: +           * .text section at offset 0 will
1: +           * reference section symbol, not the
1: +           * function symbol. Fix that up,
1: +           * otherwise it won't be possible to
1: +           * relocate calls to two different
1: +           * static functions with the same name
1: +           * (rom two different object files)
1: +           */
1: +          insn = dst_linked_sec->raw_data + dst_rel->r_offset;
1: +          if (insn->code == (BPF_JMP | BPF_CALL))
1: +            insn->imm += sec->dst_off / sizeof(struct bpf_insn);
1: +          else
1: +            insn->imm += sec->dst_off;
1: +        } else {
1: +          pr_warn(
1: +              "relocation against STT_SECTION in non-exec section is not "
1: +              "supported!\n");
1: +          return -EINVAL;
1: +        }
1: +      }
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  static Elf64_Sym *find_sym_by_name(struct src_obj *obj, size_t sec_idx,
1: -				   int sym_type, const char *sym_name)
1: -{
1: -	struct src_sec *symtab = &obj->secs[obj->symtab_sec_idx];
1: -	Elf64_Sym *sym = symtab->data->d_buf;
1: -	int i, n = symtab->shdr->sh_size / symtab->shdr->sh_entsize;
1: -	int str_sec_idx = symtab->shdr->sh_link;
1: -	const char *name;
1: -
1: -	for (i = 0; i < n; i++, sym++) {
1: -		if (sym->st_shndx != sec_idx)
1: -			continue;
1: -		if (ELF64_ST_TYPE(sym->st_info) != sym_type)
1: -			continue;
1: -
1: -		name = elf_strptr(obj->elf, str_sec_idx, sym->st_name);
1: -		if (!name)
1: -			return NULL;
1: -
1: -		if (strcmp(sym_name, name) != 0)
1: -			continue;
1: -
1: -		return sym;
1: -	}
1: -
1: -	return NULL;
1: +                                   int sym_type, const char *sym_name) {
1: +  struct src_sec *symtab = &obj->secs[obj->symtab_sec_idx];
1: +  Elf64_Sym *sym = symtab->data->d_buf;
1: +  int i, n = symtab->shdr->sh_size / symtab->shdr->sh_entsize;
1: +  int str_sec_idx = symtab->shdr->sh_link;
1: +  const char *name;
1: +
1: +  for (i = 0; i < n; i++, sym++) {
1: +    if (sym->st_shndx != sec_idx)
1: +      continue;
1: +    if (ELF64_ST_TYPE(sym->st_info) != sym_type)
1: +      continue;
1: +
1: +    name = elf_strptr(obj->elf, str_sec_idx, sym->st_name);
1: +    if (!name)
1: +      return NULL;
1: +
1: +    if (strcmp(sym_name, name) != 0)
1: +      continue;
1: +
1: +    return sym;
1: +  }
1: +
1: +  return NULL;
1:  }
1:  
1: -static int linker_fixup_btf(struct src_obj *obj)
1: -{
1: -	const char *sec_name;
1: -	struct src_sec *sec;
1: -	int i, j, n, m;
1: -
1: -	if (!obj->btf)
1: -		return 0;
1: -
1: -	n = btf__get_nr_types(obj->btf);
1: -	for (i = 1; i <= n; i++) {
1: -		struct btf_var_secinfo *vi;
1: -		struct btf_type *t;
1: -
1: -		t = btf_type_by_id(obj->btf, i);
1: -		if (btf_kind(t) != BTF_KIND_DATASEC)
1: -			continue;
1: -
1: -		sec_name = btf__str_by_offset(obj->btf, t->name_off);
1: -		sec = find_src_sec_by_name(obj, sec_name);
1: -		if (sec) {
1: -			/* record actual section size, unless ephemeral */
1: -			if (sec->shdr)
1: -				t->size = sec->shdr->sh_size;
1: -		} else {
1: -			/* BTF can have some sections that are not represented
1: -			 * in ELF, e.g., .kconfig, .ksyms, .extern, which are used
1: -			 * for special extern variables.
1: -			 *
1: -			 * For all but one such special (ephemeral)
1: -			 * sections, we pre-create "section shells" to be able
1: -			 * to keep track of extra per-section metadata later
1: -			 * (e.g., those BTF extern variables).
1: -			 *
1: -			 * .extern is even more special, though, because it
1: -			 * contains extern variables that need to be resolved
1: -			 * by static linker, not libbpf and kernel. When such
1: -			 * externs are resolved, we are going to remove them
1: -			 * from .extern BTF section and might end up not
1: -			 * needing it at all. Each resolved extern should have
1: -			 * matching non-extern VAR/FUNC in other sections.
1: -			 *
1: -			 * We do support leaving some of the externs
1: -			 * unresolved, though, to support cases of building
1: -			 * libraries, which will later be linked against final
1: -			 * BPF applications. So if at finalization we still
1: -			 * see unresolved externs, we'll create .extern
1: -			 * section on our own.
1: -			 */
1: -			if (strcmp(sec_name, BTF_EXTERN_SEC) == 0)
1: -				continue;
1: -
1: -			sec = add_src_sec(obj, sec_name);
1: -			if (!sec)
1: -				return -ENOMEM;
1: -
1: -			sec->ephemeral = true;
1: -			sec->sec_idx = 0; /* will match UNDEF shndx in ELF */
1: -		}
1: -
1: -		/* remember ELF section and its BTF type ID match */
1: -		sec->sec_type_id = i;
1: -
1: -		/* fix up variable offsets */
1: -		vi = btf_var_secinfos(t);
1: -		for (j = 0, m = btf_vlen(t); j < m; j++, vi++) {
1: -			const struct btf_type *vt = btf__type_by_id(obj->btf, vi->type);
1: -			const char *var_name = btf__str_by_offset(obj->btf, vt->name_off);
1: -			int var_linkage = btf_var(vt)->linkage;
1: -			Elf64_Sym *sym;
1: -
1: -			/* no need to patch up static or extern vars */
1: -			if (var_linkage != BTF_VAR_GLOBAL_ALLOCATED)
1: -				continue;
1: -
1: -			sym = find_sym_by_name(obj, sec->sec_idx, STT_OBJECT, var_name);
1: -			if (!sym) {
1: -				pr_warn("failed to find symbol for variable '%s' in section '%s'\n", var_name, sec_name);
1: -				return -ENOENT;
1: -			}
1: -
1: -			vi->offset = sym->st_value;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int linker_fixup_btf(struct src_obj *obj) {
1: +  const char *sec_name;
1: +  struct src_sec *sec;
1: +  int i, j, n, m;
1: +
1: +  if (!obj->btf)
1: +    return 0;
1: +
1: +  n = btf__get_nr_types(obj->btf);
1: +  for (i = 1; i <= n; i++) {
1: +    struct btf_var_secinfo *vi;
1: +    struct btf_type *t;
1: +
1: +    t = btf_type_by_id(obj->btf, i);
1: +    if (btf_kind(t) != BTF_KIND_DATASEC)
1: +      continue;
1: +
1: +    sec_name = btf__str_by_offset(obj->btf, t->name_off);
1: +    sec = find_src_sec_by_name(obj, sec_name);
1: +    if (sec) {
1: +      /* record actual section size, unless ephemeral */
1: +      if (sec->shdr)
1: +        t->size = sec->shdr->sh_size;
1: +    } else {
1: +      /* BTF can have some sections that are not represented
1: +       * in ELF, e.g., .kconfig, .ksyms, .extern, which are used
1: +       * for special extern variables.
1: +       *
1: +       * For all but one such special (ephemeral)
1: +       * sections, we pre-create "section shells" to be able
1: +       * to keep track of extra per-section metadata later
1: +       * (e.g., those BTF extern variables).
1: +       *
1: +       * .extern is even more special, though, because it
1: +       * contains extern variables that need to be resolved
1: +       * by static linker, not libbpf and kernel. When such
1: +       * externs are resolved, we are going to remove them
1: +       * from .extern BTF section and might end up not
1: +       * needing it at all. Each resolved extern should have
1: +       * matching non-extern VAR/FUNC in other sections.
1: +       *
1: +       * We do support leaving some of the externs
1: +       * unresolved, though, to support cases of building
1: +       * libraries, which will later be linked against final
1: +       * BPF applications. So if at finalization we still
1: +       * see unresolved externs, we'll create .extern
1: +       * section on our own.
1: +       */
1: +      if (strcmp(sec_name, BTF_EXTERN_SEC) == 0)
1: +        continue;
1: +
1: +      sec = add_src_sec(obj, sec_name);
1: +      if (!sec)
1: +        return -ENOMEM;
1: +
1: +      sec->ephemeral = true;
1: +      sec->sec_idx = 0; /* will match UNDEF shndx in ELF */
1: +    }
1: +
1: +    /* remember ELF section and its BTF type ID match */
1: +    sec->sec_type_id = i;
1: +
1: +    /* fix up variable offsets */
1: +    vi = btf_var_secinfos(t);
1: +    for (j = 0, m = btf_vlen(t); j < m; j++, vi++) {
1: +      const struct btf_type *vt = btf__type_by_id(obj->btf, vi->type);
1: +      const char *var_name = btf__str_by_offset(obj->btf, vt->name_off);
1: +      int var_linkage = btf_var(vt)->linkage;
1: +      Elf64_Sym *sym;
1: +
1: +      /* no need to patch up static or extern vars */
1: +      if (var_linkage != BTF_VAR_GLOBAL_ALLOCATED)
1: +        continue;
1: +
1: +      sym = find_sym_by_name(obj, sec->sec_idx, STT_OBJECT, var_name);
1: +      if (!sym) {
1: +        pr_warn("failed to find symbol for variable '%s' in section '%s'\n",
1: +                var_name, sec_name);
1: +        return -ENOENT;
1: +      }
1: +
1: +      vi->offset = sym->st_value;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static int remap_type_id(__u32 *type_id, void *ctx)
1: -{
1: -	int *id_map = ctx;
1: -	int new_id = id_map[*type_id];
1: +static int remap_type_id(__u32 *type_id, void *ctx) {
1: +  int *id_map = ctx;
1: +  int new_id = id_map[*type_id];
1:  
1: -	/* Error out if the type wasn't remapped. Ignore VOID which stays VOID. */
1: -	if (new_id == 0 && *type_id != 0) {
1: -		pr_warn("failed to find new ID mapping for original BTF type ID %u\n", *type_id);
1: -		return -EINVAL;
1: -	}
1: +  /* Error out if the type wasn't remapped. Ignore VOID which stays VOID. */
1: +  if (new_id == 0 && *type_id != 0) {
1: +    pr_warn("failed to find new ID mapping for original BTF type ID %u\n",
1: +            *type_id);
1: +    return -EINVAL;
1: +  }
1:  
1: -	*type_id = id_map[*type_id];
1: +  *type_id = id_map[*type_id];
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj)
1: -{
1: -	const struct btf_type *t;
1: -	int i, j, n, start_id, id;
1: -	const char *name;
1: -
1: -	if (!obj->btf)
1: -		return 0;
1: -
1: -	start_id = btf__get_nr_types(linker->btf) + 1;
1: -	n = btf__get_nr_types(obj->btf);
1: -
1: -	obj->btf_type_map = calloc(n + 1, sizeof(int));
1: -	if (!obj->btf_type_map)
1: -		return -ENOMEM;
1: -
1: -	for (i = 1; i <= n; i++) {
1: -		struct glob_sym *glob_sym = NULL;
1: -
1: -		t = btf__type_by_id(obj->btf, i);
1: -
1: -		/* DATASECs are handled specially below */
1: -		if (btf_kind(t) == BTF_KIND_DATASEC)
1: -			continue;
1: -
1: -		if (btf_is_non_static(t)) {
1: -			/* there should be glob_sym already */
1: -			name = btf__str_by_offset(obj->btf, t->name_off);
1: -			glob_sym = find_glob_sym(linker, name);
1: -
1: -			/* VARs without corresponding glob_sym are those that
1: -			 * belong to skipped/deduplicated sections (i.e.,
1: -			 * license and version), so just skip them
1: -			 */
1: -			if (!glob_sym)
1: -				continue;
1: -
1: -			/* linker_append_elf_sym() might have requested
1: -			 * updating underlying type ID, if extern was resolved
1: -			 * to strong symbol or weak got upgraded to non-weak
1: -			 */
1: -			if (glob_sym->underlying_btf_id == 0)
1: -				glob_sym->underlying_btf_id = -t->type;
1: -
1: -			/* globals from previous object files that match our
1: -			 * VAR/FUNC already have a corresponding associated
1: -			 * BTF type, so just make sure to use it
1: -			 */
1: -			if (glob_sym->btf_id) {
1: -				/* reuse existing BTF type for global var/func */
1: -				obj->btf_type_map[i] = glob_sym->btf_id;
1: -				continue;
1: -			}
1: -		}
1: -
1: -		id = btf__add_type(linker->btf, obj->btf, t);
1: -		if (id < 0) {
1: -			pr_warn("failed to append BTF type #%d from file '%s'\n", i, obj->filename);
1: -			return id;
1: -		}
1: -
1: -		obj->btf_type_map[i] = id;
1: -
1: -		/* record just appended BTF type for var/func */
1: -		if (glob_sym) {
1: -			glob_sym->btf_id = id;
1: -			glob_sym->underlying_btf_id = -t->type;
1: -		}
1: -	}
1: -
1: -	/* remap all the types except DATASECs */
1: -	n = btf__get_nr_types(linker->btf);
1: -	for (i = start_id; i <= n; i++) {
1: -		struct btf_type *dst_t = btf_type_by_id(linker->btf, i);
1: -
1: -		if (btf_type_visit_type_ids(dst_t, remap_type_id, obj->btf_type_map))
1: -			return -EINVAL;
1: -	}
1: -
1: -	/* Rewrite VAR/FUNC underlying types (i.e., FUNC's FUNC_PROTO and VAR's
1: -	 * actual type), if necessary
1: -	 */
1: -	for (i = 0; i < linker->glob_sym_cnt; i++) {
1: -		struct glob_sym *glob_sym = &linker->glob_syms[i];
1: -		struct btf_type *glob_t;
1: -
1: -		if (glob_sym->underlying_btf_id >= 0)
1: -			continue;
1: -
1: -		glob_sym->underlying_btf_id = obj->btf_type_map[-glob_sym->underlying_btf_id];
1: -
1: -		glob_t = btf_type_by_id(linker->btf, glob_sym->btf_id);
1: -		glob_t->type = glob_sym->underlying_btf_id;
1: -	}
1: -
1: -	/* append DATASEC info */
1: -	for (i = 1; i < obj->sec_cnt; i++) {
1: -		struct src_sec *src_sec;
1: -		struct dst_sec *dst_sec;
1: -		const struct btf_var_secinfo *src_var;
1: -		struct btf_var_secinfo *dst_var;
1: -
1: -		src_sec = &obj->secs[i];
1: -		if (!src_sec->sec_type_id || src_sec->skipped)
1: -			continue;
1: -		dst_sec = &linker->secs[src_sec->dst_id];
1: -
1: -		/* Mark section as having BTF regardless of the presence of
1: -		 * variables. In some cases compiler might generate empty BTF
1: -		 * with no variables information. E.g., when promoting local
1: -		 * array/structure variable initial values and BPF object
1: -		 * file otherwise has no read-only static variables in
1: -		 * .rodata. We need to preserve such empty BTF and just set
1: -		 * correct section size.
1: -		 */
1: -		dst_sec->has_btf = true;
1: -
1: -		t = btf__type_by_id(obj->btf, src_sec->sec_type_id);
1: -		src_var = btf_var_secinfos(t);
1: -		n = btf_vlen(t);
1: -		for (j = 0; j < n; j++, src_var++) {
1: -			void *sec_vars = dst_sec->sec_vars;
1: -			int new_id = obj->btf_type_map[src_var->type];
1: -			struct glob_sym *glob_sym = NULL;
1: -
1: -			t = btf_type_by_id(linker->btf, new_id);
1: -			if (btf_is_non_static(t)) {
1: -				name = btf__str_by_offset(linker->btf, t->name_off);
1: -				glob_sym = find_glob_sym(linker, name);
1: -				if (glob_sym->sec_id != dst_sec->id) {
1: -					pr_warn("global '%s': section mismatch %d vs %d\n",
1: -						name, glob_sym->sec_id, dst_sec->id);
1: -					return -EINVAL;
1: -				}
1: -			}
1: -
1: -			/* If there is already a member (VAR or FUNC) mapped
1: -			 * to the same type, don't add a duplicate entry.
1: -			 * This will happen when multiple object files define
1: -			 * the same extern VARs/FUNCs.
1: -			 */
1: -			if (glob_sym && glob_sym->var_idx >= 0) {
1: -				__s64 sz;
1: -
1: -				dst_var = &dst_sec->sec_vars[glob_sym->var_idx];
1: -				/* Because underlying BTF type might have
1: -				 * changed, so might its size have changed, so
1: -				 * re-calculate and update it in sec_var.
1: -				 */
1: -				sz = btf__resolve_size(linker->btf, glob_sym->underlying_btf_id);
1: -				if (sz < 0) {
1: -					pr_warn("global '%s': failed to resolve size of underlying type: %d\n",
1: -						name, (int)sz);
1: -					return -EINVAL;
1: -				}
1: -				dst_var->size = sz;
1: -				continue;
1: -			}
1: -
1: -			sec_vars = libbpf_reallocarray(sec_vars,
1: -						       dst_sec->sec_var_cnt + 1,
1: -						       sizeof(*dst_sec->sec_vars));
1: -			if (!sec_vars)
1: -				return -ENOMEM;
1: -
1: -			dst_sec->sec_vars = sec_vars;
1: -			dst_sec->sec_var_cnt++;
1: -
1: -			dst_var = &dst_sec->sec_vars[dst_sec->sec_var_cnt - 1];
1: -			dst_var->type = obj->btf_type_map[src_var->type];
1: -			dst_var->size = src_var->size;
1: -			dst_var->offset = src_sec->dst_off + src_var->offset;
1: -
1: -			if (glob_sym)
1: -				glob_sym->var_idx = dst_sec->sec_var_cnt - 1;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj) {
1: +  const struct btf_type *t;
1: +  int i, j, n, start_id, id;
1: +  const char *name;
1: +
1: +  if (!obj->btf)
1: +    return 0;
1: +
1: +  start_id = btf__get_nr_types(linker->btf) + 1;
1: +  n = btf__get_nr_types(obj->btf);
1: +
1: +  obj->btf_type_map = calloc(n + 1, sizeof(int));
1: +  if (!obj->btf_type_map)
1: +    return -ENOMEM;
1: +
1: +  for (i = 1; i <= n; i++) {
1: +    struct glob_sym *glob_sym = NULL;
1: +
1: +    t = btf__type_by_id(obj->btf, i);
1: +
1: +    /* DATASECs are handled specially below */
1: +    if (btf_kind(t) == BTF_KIND_DATASEC)
1: +      continue;
1: +
1: +    if (btf_is_non_static(t)) {
1: +      /* there should be glob_sym already */
1: +      name = btf__str_by_offset(obj->btf, t->name_off);
1: +      glob_sym = find_glob_sym(linker, name);
1: +
1: +      /* VARs without corresponding glob_sym are those that
1: +       * belong to skipped/deduplicated sections (i.e.,
1: +       * license and version), so just skip them
1: +       */
1: +      if (!glob_sym)
1: +        continue;
1: +
1: +      /* linker_append_elf_sym() might have requested
1: +       * updating underlying type ID, if extern was resolved
1: +       * to strong symbol or weak got upgraded to non-weak
1: +       */
1: +      if (glob_sym->underlying_btf_id == 0)
1: +        glob_sym->underlying_btf_id = -t->type;
1: +
1: +      /* globals from previous object files that match our
1: +       * VAR/FUNC already have a corresponding associated
1: +       * BTF type, so just make sure to use it
1: +       */
1: +      if (glob_sym->btf_id) {
1: +        /* reuse existing BTF type for global var/func */
1: +        obj->btf_type_map[i] = glob_sym->btf_id;
1: +        continue;
1: +      }
1: +    }
1: +
1: +    id = btf__add_type(linker->btf, obj->btf, t);
1: +    if (id < 0) {
1: +      pr_warn("failed to append BTF type #%d from file '%s'\n", i,
1: +              obj->filename);
1: +      return id;
1: +    }
1: +
1: +    obj->btf_type_map[i] = id;
1: +
1: +    /* record just appended BTF type for var/func */
1: +    if (glob_sym) {
1: +      glob_sym->btf_id = id;
1: +      glob_sym->underlying_btf_id = -t->type;
1: +    }
1: +  }
1: +
1: +  /* remap all the types except DATASECs */
1: +  n = btf__get_nr_types(linker->btf);
1: +  for (i = start_id; i <= n; i++) {
1: +    struct btf_type *dst_t = btf_type_by_id(linker->btf, i);
1: +
1: +    if (btf_type_visit_type_ids(dst_t, remap_type_id, obj->btf_type_map))
1: +      return -EINVAL;
1: +  }
1: +
1: +  /* Rewrite VAR/FUNC underlying types (i.e., FUNC's FUNC_PROTO and VAR's
1: +   * actual type), if necessary
1: +   */
1: +  for (i = 0; i < linker->glob_sym_cnt; i++) {
1: +    struct glob_sym *glob_sym = &linker->glob_syms[i];
1: +    struct btf_type *glob_t;
1: +
1: +    if (glob_sym->underlying_btf_id >= 0)
1: +      continue;
1: +
1: +    glob_sym->underlying_btf_id =
1: +        obj->btf_type_map[-glob_sym->underlying_btf_id];
1: +
1: +    glob_t = btf_type_by_id(linker->btf, glob_sym->btf_id);
1: +    glob_t->type = glob_sym->underlying_btf_id;
1: +  }
1: +
1: +  /* append DATASEC info */
1: +  for (i = 1; i < obj->sec_cnt; i++) {
1: +    struct src_sec *src_sec;
1: +    struct dst_sec *dst_sec;
1: +    const struct btf_var_secinfo *src_var;
1: +    struct btf_var_secinfo *dst_var;
1: +
1: +    src_sec = &obj->secs[i];
1: +    if (!src_sec->sec_type_id || src_sec->skipped)
1: +      continue;
1: +    dst_sec = &linker->secs[src_sec->dst_id];
1: +
1: +    /* Mark section as having BTF regardless of the presence of
1: +     * variables. In some cases compiler might generate empty BTF
1: +     * with no variables information. E.g., when promoting local
1: +     * array/structure variable initial values and BPF object
1: +     * file otherwise has no read-only static variables in
1: +     * .rodata. We need to preserve such empty BTF and just set
1: +     * correct section size.
1: +     */
1: +    dst_sec->has_btf = true;
1: +
1: +    t = btf__type_by_id(obj->btf, src_sec->sec_type_id);
1: +    src_var = btf_var_secinfos(t);
1: +    n = btf_vlen(t);
1: +    for (j = 0; j < n; j++, src_var++) {
1: +      void *sec_vars = dst_sec->sec_vars;
1: +      int new_id = obj->btf_type_map[src_var->type];
1: +      struct glob_sym *glob_sym = NULL;
1: +
1: +      t = btf_type_by_id(linker->btf, new_id);
1: +      if (btf_is_non_static(t)) {
1: +        name = btf__str_by_offset(linker->btf, t->name_off);
1: +        glob_sym = find_glob_sym(linker, name);
1: +        if (glob_sym->sec_id != dst_sec->id) {
1: +          pr_warn("global '%s': section mismatch %d vs %d\n", name,
1: +                  glob_sym->sec_id, dst_sec->id);
1: +          return -EINVAL;
1: +        }
1: +      }
1: +
1: +      /* If there is already a member (VAR or FUNC) mapped
1: +       * to the same type, don't add a duplicate entry.
1: +       * This will happen when multiple object files define
1: +       * the same extern VARs/FUNCs.
1: +       */
1: +      if (glob_sym && glob_sym->var_idx >= 0) {
1: +        __s64 sz;
1: +
1: +        dst_var = &dst_sec->sec_vars[glob_sym->var_idx];
1: +        /* Because underlying BTF type might have
1: +         * changed, so might its size have changed, so
1: +         * re-calculate and update it in sec_var.
1: +         */
1: +        sz = btf__resolve_size(linker->btf, glob_sym->underlying_btf_id);
1: +        if (sz < 0) {
1: +          pr_warn(
1: +              "global '%s': failed to resolve size of underlying type: %d\n",
1: +              name, (int)sz);
1: +          return -EINVAL;
1: +        }
1: +        dst_var->size = sz;
1: +        continue;
1: +      }
1: +
1: +      sec_vars = libbpf_reallocarray(sec_vars, dst_sec->sec_var_cnt + 1,
1: +                                     sizeof(*dst_sec->sec_vars));
1: +      if (!sec_vars)
1: +        return -ENOMEM;
1: +
1: +      dst_sec->sec_vars = sec_vars;
1: +      dst_sec->sec_var_cnt++;
1: +
1: +      dst_var = &dst_sec->sec_vars[dst_sec->sec_var_cnt - 1];
1: +      dst_var->type = obj->btf_type_map[src_var->type];
1: +      dst_var->size = src_var->size;
1: +      dst_var->offset = src_sec->dst_off + src_var->offset;
1: +
1: +      if (glob_sym)
1: +        glob_sym->var_idx = dst_sec->sec_var_cnt - 1;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -static void *add_btf_ext_rec(struct btf_ext_sec_data *ext_data, const void *src_rec)
1: -{
1: -	void *tmp;
1: +static void *add_btf_ext_rec(struct btf_ext_sec_data *ext_data,
1: +                             const void *src_rec) {
1: +  void *tmp;
1:  
1: -	tmp = libbpf_reallocarray(ext_data->recs, ext_data->rec_cnt + 1, ext_data->rec_sz);
1: -	if (!tmp)
1: -		return NULL;
1: -	ext_data->recs = tmp;
1: +  tmp = libbpf_reallocarray(ext_data->recs, ext_data->rec_cnt + 1,
1: +                            ext_data->rec_sz);
1: +  if (!tmp)
1: +    return NULL;
1: +  ext_data->recs = tmp;
1:  
1: -	tmp += ext_data->rec_cnt * ext_data->rec_sz;
1: -	memcpy(tmp, src_rec, ext_data->rec_sz);
1: +  tmp += ext_data->rec_cnt * ext_data->rec_sz;
1: +  memcpy(tmp, src_rec, ext_data->rec_sz);
1:  
1: -	ext_data->rec_cnt++;
1: +  ext_data->rec_cnt++;
1:  
1: -	return tmp;
1: +  return tmp;
1:  }
1:  
1: -static int linker_append_btf_ext(struct bpf_linker *linker, struct src_obj *obj)
1: -{
1: -	const struct btf_ext_info_sec *ext_sec;
1: -	const char *sec_name, *s;
1: -	struct src_sec *src_sec;
1: -	struct dst_sec *dst_sec;
1: -	int rec_sz, str_off, i;
1: -
1: -	if (!obj->btf_ext)
1: -		return 0;
1: -
1: -	rec_sz = obj->btf_ext->func_info.rec_size;
1: -	for_each_btf_ext_sec(&obj->btf_ext->func_info, ext_sec) {
1: -		struct bpf_func_info_min *src_rec, *dst_rec;
1: -
1: -		sec_name = btf__name_by_offset(obj->btf, ext_sec->sec_name_off);
1: -		src_sec = find_src_sec_by_name(obj, sec_name);
1: -		if (!src_sec) {
1: -			pr_warn("can't find section '%s' referenced from .BTF.ext\n", sec_name);
1: -			return -EINVAL;
1: -		}
1: -		dst_sec = &linker->secs[src_sec->dst_id];
1: -
1: -		if (dst_sec->func_info.rec_sz == 0)
1: -			dst_sec->func_info.rec_sz = rec_sz;
1: -		if (dst_sec->func_info.rec_sz != rec_sz) {
1: -			pr_warn("incompatible .BTF.ext record sizes for section '%s'\n", sec_name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		for_each_btf_ext_rec(&obj->btf_ext->func_info, ext_sec, i, src_rec) {
1: -			dst_rec = add_btf_ext_rec(&dst_sec->func_info, src_rec);
1: -			if (!dst_rec)
1: -				return -ENOMEM;
1: -
1: -			dst_rec->insn_off += src_sec->dst_off;
1: -			dst_rec->type_id = obj->btf_type_map[dst_rec->type_id];
1: -		}
1: -	}
1: -
1: -	rec_sz = obj->btf_ext->line_info.rec_size;
1: -	for_each_btf_ext_sec(&obj->btf_ext->line_info, ext_sec) {
1: -		struct bpf_line_info_min *src_rec, *dst_rec;
1: -
1: -		sec_name = btf__name_by_offset(obj->btf, ext_sec->sec_name_off);
1: -		src_sec = find_src_sec_by_name(obj, sec_name);
1: -		if (!src_sec) {
1: -			pr_warn("can't find section '%s' referenced from .BTF.ext\n", sec_name);
1: -			return -EINVAL;
1: -		}
1: -		dst_sec = &linker->secs[src_sec->dst_id];
1: -
1: -		if (dst_sec->line_info.rec_sz == 0)
1: -			dst_sec->line_info.rec_sz = rec_sz;
1: -		if (dst_sec->line_info.rec_sz != rec_sz) {
1: -			pr_warn("incompatible .BTF.ext record sizes for section '%s'\n", sec_name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		for_each_btf_ext_rec(&obj->btf_ext->line_info, ext_sec, i, src_rec) {
1: -			dst_rec = add_btf_ext_rec(&dst_sec->line_info, src_rec);
1: -			if (!dst_rec)
1: -				return -ENOMEM;
1: -
1: -			dst_rec->insn_off += src_sec->dst_off;
1: -
1: -			s = btf__str_by_offset(obj->btf, src_rec->file_name_off);
1: -			str_off = btf__add_str(linker->btf, s);
1: -			if (str_off < 0)
1: -				return -ENOMEM;
1: -			dst_rec->file_name_off = str_off;
1: -
1: -			s = btf__str_by_offset(obj->btf, src_rec->line_off);
1: -			str_off = btf__add_str(linker->btf, s);
1: -			if (str_off < 0)
1: -				return -ENOMEM;
1: -			dst_rec->line_off = str_off;
1: -
1: -			/* dst_rec->line_col is fine */
1: -		}
1: -	}
1: -
1: -	rec_sz = obj->btf_ext->core_relo_info.rec_size;
1: -	for_each_btf_ext_sec(&obj->btf_ext->core_relo_info, ext_sec) {
1: -		struct bpf_core_relo *src_rec, *dst_rec;
1: -
1: -		sec_name = btf__name_by_offset(obj->btf, ext_sec->sec_name_off);
1: -		src_sec = find_src_sec_by_name(obj, sec_name);
1: -		if (!src_sec) {
1: -			pr_warn("can't find section '%s' referenced from .BTF.ext\n", sec_name);
1: -			return -EINVAL;
1: -		}
1: -		dst_sec = &linker->secs[src_sec->dst_id];
1: -
1: -		if (dst_sec->core_relo_info.rec_sz == 0)
1: -			dst_sec->core_relo_info.rec_sz = rec_sz;
1: -		if (dst_sec->core_relo_info.rec_sz != rec_sz) {
1: -			pr_warn("incompatible .BTF.ext record sizes for section '%s'\n", sec_name);
1: -			return -EINVAL;
1: -		}
1: -
1: -		for_each_btf_ext_rec(&obj->btf_ext->core_relo_info, ext_sec, i, src_rec) {
1: -			dst_rec = add_btf_ext_rec(&dst_sec->core_relo_info, src_rec);
1: -			if (!dst_rec)
1: -				return -ENOMEM;
1: -
1: -			dst_rec->insn_off += src_sec->dst_off;
1: -			dst_rec->type_id = obj->btf_type_map[dst_rec->type_id];
1: -
1: -			s = btf__str_by_offset(obj->btf, src_rec->access_str_off);
1: -			str_off = btf__add_str(linker->btf, s);
1: -			if (str_off < 0)
1: -				return -ENOMEM;
1: -			dst_rec->access_str_off = str_off;
1: -
1: -			/* dst_rec->kind is fine */
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int linker_append_btf_ext(struct bpf_linker *linker,
1: +                                 struct src_obj *obj) {
1: +  const struct btf_ext_info_sec *ext_sec;
1: +  const char *sec_name, *s;
1: +  struct src_sec *src_sec;
1: +  struct dst_sec *dst_sec;
1: +  int rec_sz, str_off, i;
1: +
1: +  if (!obj->btf_ext)
1: +    return 0;
1: +
1: +  rec_sz = obj->btf_ext->func_info.rec_size;
1: +  for_each_btf_ext_sec(&obj->btf_ext->func_info, ext_sec) {
1: +    struct bpf_func_info_min *src_rec, *dst_rec;
1: +
1: +    sec_name = btf__name_by_offset(obj->btf, ext_sec->sec_name_off);
1: +    src_sec = find_src_sec_by_name(obj, sec_name);
1: +    if (!src_sec) {
1: +      pr_warn("can't find section '%s' referenced from .BTF.ext\n", sec_name);
1: +      return -EINVAL;
1: +    }
1: +    dst_sec = &linker->secs[src_sec->dst_id];
1: +
1: +    if (dst_sec->func_info.rec_sz == 0)
1: +      dst_sec->func_info.rec_sz = rec_sz;
1: +    if (dst_sec->func_info.rec_sz != rec_sz) {
1: +      pr_warn("incompatible .BTF.ext record sizes for section '%s'\n",
1: +              sec_name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    for_each_btf_ext_rec(&obj->btf_ext->func_info, ext_sec, i, src_rec) {
1: +      dst_rec = add_btf_ext_rec(&dst_sec->func_info, src_rec);
1: +      if (!dst_rec)
1: +        return -ENOMEM;
1: +
1: +      dst_rec->insn_off += src_sec->dst_off;
1: +      dst_rec->type_id = obj->btf_type_map[dst_rec->type_id];
1: +    }
1: +  }
1: +
1: +  rec_sz = obj->btf_ext->line_info.rec_size;
1: +  for_each_btf_ext_sec(&obj->btf_ext->line_info, ext_sec) {
1: +    struct bpf_line_info_min *src_rec, *dst_rec;
1: +
1: +    sec_name = btf__name_by_offset(obj->btf, ext_sec->sec_name_off);
1: +    src_sec = find_src_sec_by_name(obj, sec_name);
1: +    if (!src_sec) {
1: +      pr_warn("can't find section '%s' referenced from .BTF.ext\n", sec_name);
1: +      return -EINVAL;
1: +    }
1: +    dst_sec = &linker->secs[src_sec->dst_id];
1: +
1: +    if (dst_sec->line_info.rec_sz == 0)
1: +      dst_sec->line_info.rec_sz = rec_sz;
1: +    if (dst_sec->line_info.rec_sz != rec_sz) {
1: +      pr_warn("incompatible .BTF.ext record sizes for section '%s'\n",
1: +              sec_name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    for_each_btf_ext_rec(&obj->btf_ext->line_info, ext_sec, i, src_rec) {
1: +      dst_rec = add_btf_ext_rec(&dst_sec->line_info, src_rec);
1: +      if (!dst_rec)
1: +        return -ENOMEM;
1: +
1: +      dst_rec->insn_off += src_sec->dst_off;
1: +
1: +      s = btf__str_by_offset(obj->btf, src_rec->file_name_off);
1: +      str_off = btf__add_str(linker->btf, s);
1: +      if (str_off < 0)
1: +        return -ENOMEM;
1: +      dst_rec->file_name_off = str_off;
1: +
1: +      s = btf__str_by_offset(obj->btf, src_rec->line_off);
1: +      str_off = btf__add_str(linker->btf, s);
1: +      if (str_off < 0)
1: +        return -ENOMEM;
1: +      dst_rec->line_off = str_off;
1: +
1: +      /* dst_rec->line_col is fine */
1: +    }
1: +  }
1: +
1: +  rec_sz = obj->btf_ext->core_relo_info.rec_size;
1: +  for_each_btf_ext_sec(&obj->btf_ext->core_relo_info, ext_sec) {
1: +    struct bpf_core_relo *src_rec, *dst_rec;
1: +
1: +    sec_name = btf__name_by_offset(obj->btf, ext_sec->sec_name_off);
1: +    src_sec = find_src_sec_by_name(obj, sec_name);
1: +    if (!src_sec) {
1: +      pr_warn("can't find section '%s' referenced from .BTF.ext\n", sec_name);
1: +      return -EINVAL;
1: +    }
1: +    dst_sec = &linker->secs[src_sec->dst_id];
1: +
1: +    if (dst_sec->core_relo_info.rec_sz == 0)
1: +      dst_sec->core_relo_info.rec_sz = rec_sz;
1: +    if (dst_sec->core_relo_info.rec_sz != rec_sz) {
1: +      pr_warn("incompatible .BTF.ext record sizes for section '%s'\n",
1: +              sec_name);
1: +      return -EINVAL;
1: +    }
1: +
1: +    for_each_btf_ext_rec(&obj->btf_ext->core_relo_info, ext_sec, i, src_rec) {
1: +      dst_rec = add_btf_ext_rec(&dst_sec->core_relo_info, src_rec);
1: +      if (!dst_rec)
1: +        return -ENOMEM;
1: +
1: +      dst_rec->insn_off += src_sec->dst_off;
1: +      dst_rec->type_id = obj->btf_type_map[dst_rec->type_id];
1: +
1: +      s = btf__str_by_offset(obj->btf, src_rec->access_str_off);
1: +      str_off = btf__add_str(linker->btf, s);
1: +      if (str_off < 0)
1: +        return -ENOMEM;
1: +      dst_rec->access_str_off = str_off;
1: +
1: +      /* dst_rec->kind is fine */
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1: -int bpf_linker__finalize(struct bpf_linker *linker)
1: -{
1: -	struct dst_sec *sec;
1: -	size_t strs_sz;
1: -	const void *strs;
1: -	int err, i;
1: -
1: -	if (!linker->elf)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	err = finalize_btf(linker);
1: -	if (err)
1: -		return libbpf_err(err);
1: -
1: -	/* Finalize strings */
1: -	strs_sz = strset__data_size(linker->strtab_strs);
1: -	strs = strset__data(linker->strtab_strs);
1: -
1: -	sec = &linker->secs[linker->strtab_sec_idx];
1: -	sec->data->d_align = 1;
1: -	sec->data->d_off = 0LL;
1: -	sec->data->d_buf = (void *)strs;
1: -	sec->data->d_type = ELF_T_BYTE;
1: -	sec->data->d_size = strs_sz;
1: -	sec->shdr->sh_size = strs_sz;
1: -
1: -	for (i = 1; i < linker->sec_cnt; i++) {
1: -		sec = &linker->secs[i];
1: -
1: -		/* STRTAB is handled specially above */
1: -		if (sec->sec_idx == linker->strtab_sec_idx)
1: -			continue;
1: -
1: -		/* special ephemeral sections (.ksyms, .kconfig, etc) */
1: -		if (!sec->scn)
1: -			continue;
1: -
1: -		sec->data->d_buf = sec->raw_data;
1: -	}
1: -
1: -	/* Finalize ELF layout */
1: -	if (elf_update(linker->elf, ELF_C_NULL) < 0) {
1: -		err = -errno;
1: -		pr_warn_elf("failed to finalize ELF layout");
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	/* Write out final ELF contents */
1: -	if (elf_update(linker->elf, ELF_C_WRITE) < 0) {
1: -		err = -errno;
1: -		pr_warn_elf("failed to write ELF contents");
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	elf_end(linker->elf);
1: -	close(linker->fd);
1: -
1: -	linker->elf = NULL;
1: -	linker->fd = -1;
1: -
1: -	return 0;
1: +int bpf_linker__finalize(struct bpf_linker *linker) {
1: +  struct dst_sec *sec;
1: +  size_t strs_sz;
1: +  const void *strs;
1: +  int err, i;
1: +
1: +  if (!linker->elf)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  err = finalize_btf(linker);
1: +  if (err)
1: +    return libbpf_err(err);
1: +
1: +  /* Finalize strings */
1: +  strs_sz = strset__data_size(linker->strtab_strs);
1: +  strs = strset__data(linker->strtab_strs);
1: +
1: +  sec = &linker->secs[linker->strtab_sec_idx];
1: +  sec->data->d_align = 1;
1: +  sec->data->d_off = 0LL;
1: +  sec->data->d_buf = (void *)strs;
1: +  sec->data->d_type = ELF_T_BYTE;
1: +  sec->data->d_size = strs_sz;
1: +  sec->shdr->sh_size = strs_sz;
1: +
1: +  for (i = 1; i < linker->sec_cnt; i++) {
1: +    sec = &linker->secs[i];
1: +
1: +    /* STRTAB is handled specially above */
1: +    if (sec->sec_idx == linker->strtab_sec_idx)
1: +      continue;
1: +
1: +    /* special ephemeral sections (.ksyms, .kconfig, etc) */
1: +    if (!sec->scn)
1: +      continue;
1: +
1: +    sec->data->d_buf = sec->raw_data;
1: +  }
1: +
1: +  /* Finalize ELF layout */
1: +  if (elf_update(linker->elf, ELF_C_NULL) < 0) {
1: +    err = -errno;
1: +    pr_warn_elf("failed to finalize ELF layout");
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  /* Write out final ELF contents */
1: +  if (elf_update(linker->elf, ELF_C_WRITE) < 0) {
1: +    err = -errno;
1: +    pr_warn_elf("failed to write ELF contents");
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  elf_end(linker->elf);
1: +  close(linker->fd);
1: +
1: +  linker->elf = NULL;
1: +  linker->fd = -1;
1: +
1: +  return 0;
1:  }
1:  
1:  static int emit_elf_data_sec(struct bpf_linker *linker, const char *sec_name,
1: -			     size_t align, const void *raw_data, size_t raw_sz)
1: -{
1: -	Elf_Scn *scn;
1: -	Elf_Data *data;
1: -	Elf64_Shdr *shdr;
1: -	int name_off;
1: -
1: -	name_off = strset__add_str(linker->strtab_strs, sec_name);
1: -	if (name_off < 0)
1: -		return name_off;
1: -
1: -	scn = elf_newscn(linker->elf);
1: -	if (!scn)
1: -		return -ENOMEM;
1: -	data = elf_newdata(scn);
1: -	if (!data)
1: -		return -ENOMEM;
1: -	shdr = elf64_getshdr(scn);
1: -	if (!shdr)
1: -		return -EINVAL;
1: -
1: -	shdr->sh_name = name_off;
1: -	shdr->sh_type = SHT_PROGBITS;
1: -	shdr->sh_flags = 0;
1: -	shdr->sh_size = raw_sz;
1: -	shdr->sh_link = 0;
1: -	shdr->sh_info = 0;
1: -	shdr->sh_addralign = align;
1: -	shdr->sh_entsize = 0;
1: -
1: -	data->d_type = ELF_T_BYTE;
1: -	data->d_size = raw_sz;
1: -	data->d_buf = (void *)raw_data;
1: -	data->d_align = align;
1: -	data->d_off = 0;
1: -
1: -	return 0;
1: +                             size_t align, const void *raw_data,
1: +                             size_t raw_sz) {
1: +  Elf_Scn *scn;
1: +  Elf_Data *data;
1: +  Elf64_Shdr *shdr;
1: +  int name_off;
1: +
1: +  name_off = strset__add_str(linker->strtab_strs, sec_name);
1: +  if (name_off < 0)
1: +    return name_off;
1: +
1: +  scn = elf_newscn(linker->elf);
1: +  if (!scn)
1: +    return -ENOMEM;
1: +  data = elf_newdata(scn);
1: +  if (!data)
1: +    return -ENOMEM;
1: +  shdr = elf64_getshdr(scn);
1: +  if (!shdr)
1: +    return -EINVAL;
1: +
1: +  shdr->sh_name = name_off;
1: +  shdr->sh_type = SHT_PROGBITS;
1: +  shdr->sh_flags = 0;
1: +  shdr->sh_size = raw_sz;
1: +  shdr->sh_link = 0;
1: +  shdr->sh_info = 0;
1: +  shdr->sh_addralign = align;
1: +  shdr->sh_entsize = 0;
1: +
1: +  data->d_type = ELF_T_BYTE;
1: +  data->d_size = raw_sz;
1: +  data->d_buf = (void *)raw_data;
1: +  data->d_align = align;
1: +  data->d_off = 0;
1: +
1: +  return 0;
1:  }
1:  
1: -static int finalize_btf(struct bpf_linker *linker)
1: -{
1: -	struct btf *btf = linker->btf;
1: -	const void *raw_data;
1: -	int i, j, id, err;
1: -	__u32 raw_sz;
1: -
1: -	/* bail out if no BTF data was produced */
1: -	if (btf__get_nr_types(linker->btf) == 0)
1: -		return 0;
1: -
1: -	for (i = 1; i < linker->sec_cnt; i++) {
1: -		struct dst_sec *sec = &linker->secs[i];
1: -
1: -		if (!sec->has_btf)
1: -			continue;
1: -
1: -		id = btf__add_datasec(btf, sec->sec_name, sec->sec_sz);
1: -		if (id < 0) {
1: -			pr_warn("failed to add consolidated BTF type for datasec '%s': %d\n",
1: -				sec->sec_name, id);
1: -			return id;
1: -		}
1: -
1: -		for (j = 0; j < sec->sec_var_cnt; j++) {
1: -			struct btf_var_secinfo *vi = &sec->sec_vars[j];
1: -
1: -			if (btf__add_datasec_var_info(btf, vi->type, vi->offset, vi->size))
1: -				return -EINVAL;
1: -		}
1: -	}
1: -
1: -	err = finalize_btf_ext(linker);
1: -	if (err) {
1: -		pr_warn(".BTF.ext generation failed: %d\n", err);
1: -		return err;
1: -	}
1: -
1: -	err = btf__dedup(linker->btf, linker->btf_ext, NULL);
1: -	if (err) {
1: -		pr_warn("BTF dedup failed: %d\n", err);
1: -		return err;
1: -	}
1: -
1: -	/* Emit .BTF section */
1: -	raw_data = btf__get_raw_data(linker->btf, &raw_sz);
1: -	if (!raw_data)
1: -		return -ENOMEM;
1: -
1: -	err = emit_elf_data_sec(linker, BTF_ELF_SEC, 8, raw_data, raw_sz);
1: -	if (err) {
1: -		pr_warn("failed to write out .BTF ELF section: %d\n", err);
1: -		return err;
1: -	}
1: -
1: -	/* Emit .BTF.ext section */
1: -	if (linker->btf_ext) {
1: -		raw_data = btf_ext__get_raw_data(linker->btf_ext, &raw_sz);
1: -		if (!raw_data)
1: -			return -ENOMEM;
1: -
1: -		err = emit_elf_data_sec(linker, BTF_EXT_ELF_SEC, 8, raw_data, raw_sz);
1: -		if (err) {
1: -			pr_warn("failed to write out .BTF.ext ELF section: %d\n", err);
1: -			return err;
1: -		}
1: -	}
1: -
1: -	return 0;
1: +static int finalize_btf(struct bpf_linker *linker) {
1: +  struct btf *btf = linker->btf;
1: +  const void *raw_data;
1: +  int i, j, id, err;
1: +  __u32 raw_sz;
1: +
1: +  /* bail out if no BTF data was produced */
1: +  if (btf__get_nr_types(linker->btf) == 0)
1: +    return 0;
1: +
1: +  for (i = 1; i < linker->sec_cnt; i++) {
1: +    struct dst_sec *sec = &linker->secs[i];
1: +
1: +    if (!sec->has_btf)
1: +      continue;
1: +
1: +    id = btf__add_datasec(btf, sec->sec_name, sec->sec_sz);
1: +    if (id < 0) {
1: +      pr_warn("failed to add consolidated BTF type for datasec '%s': %d\n",
1: +              sec->sec_name, id);
1: +      return id;
1: +    }
1: +
1: +    for (j = 0; j < sec->sec_var_cnt; j++) {
1: +      struct btf_var_secinfo *vi = &sec->sec_vars[j];
1: +
1: +      if (btf__add_datasec_var_info(btf, vi->type, vi->offset, vi->size))
1: +        return -EINVAL;
1: +    }
1: +  }
1: +
1: +  err = finalize_btf_ext(linker);
1: +  if (err) {
1: +    pr_warn(".BTF.ext generation failed: %d\n", err);
1: +    return err;
1: +  }
1: +
1: +  err = btf__dedup(linker->btf, linker->btf_ext, NULL);
1: +  if (err) {
1: +    pr_warn("BTF dedup failed: %d\n", err);
1: +    return err;
1: +  }
1: +
1: +  /* Emit .BTF section */
1: +  raw_data = btf__get_raw_data(linker->btf, &raw_sz);
1: +  if (!raw_data)
1: +    return -ENOMEM;
1: +
1: +  err = emit_elf_data_sec(linker, BTF_ELF_SEC, 8, raw_data, raw_sz);
1: +  if (err) {
1: +    pr_warn("failed to write out .BTF ELF section: %d\n", err);
1: +    return err;
1: +  }
1: +
1: +  /* Emit .BTF.ext section */
1: +  if (linker->btf_ext) {
1: +    raw_data = btf_ext__get_raw_data(linker->btf_ext, &raw_sz);
1: +    if (!raw_data)
1: +      return -ENOMEM;
1: +
1: +    err = emit_elf_data_sec(linker, BTF_EXT_ELF_SEC, 8, raw_data, raw_sz);
1: +    if (err) {
1: +      pr_warn("failed to write out .BTF.ext ELF section: %d\n", err);
1: +      return err;
1: +    }
1: +  }
1: +
1: +  return 0;
1:  }
1:  
1:  static int emit_btf_ext_data(struct bpf_linker *linker, void *output,
1: -			     const char *sec_name, struct btf_ext_sec_data *sec_data)
1: -{
1: -	struct btf_ext_info_sec *sec_info;
1: -	void *cur = output;
1: -	int str_off;
1: -	size_t sz;
1: -
1: -	if (!sec_data->rec_cnt)
1: -		return 0;
1: -
1: -	str_off = btf__add_str(linker->btf, sec_name);
1: -	if (str_off < 0)
1: -		return -ENOMEM;
1: -
1: -	sec_info = cur;
1: -	sec_info->sec_name_off = str_off;
1: -	sec_info->num_info = sec_data->rec_cnt;
1: -	cur += sizeof(struct btf_ext_info_sec);
1: -
1: -	sz = sec_data->rec_cnt * sec_data->rec_sz;
1: -	memcpy(cur, sec_data->recs, sz);
1: -	cur += sz;
1: -
1: -	return cur - output;
1: +                             const char *sec_name,
1: +                             struct btf_ext_sec_data *sec_data) {
1: +  struct btf_ext_info_sec *sec_info;
1: +  void *cur = output;
1: +  int str_off;
1: +  size_t sz;
1: +
1: +  if (!sec_data->rec_cnt)
1: +    return 0;
1: +
1: +  str_off = btf__add_str(linker->btf, sec_name);
1: +  if (str_off < 0)
1: +    return -ENOMEM;
1: +
1: +  sec_info = cur;
1: +  sec_info->sec_name_off = str_off;
1: +  sec_info->num_info = sec_data->rec_cnt;
1: +  cur += sizeof(struct btf_ext_info_sec);
1: +
1: +  sz = sec_data->rec_cnt * sec_data->rec_sz;
1: +  memcpy(cur, sec_data->recs, sz);
1: +  cur += sz;
1: +
1: +  return cur - output;
1:  }
1:  
1: -static int finalize_btf_ext(struct bpf_linker *linker)
1: -{
1: -	size_t funcs_sz = 0, lines_sz = 0, core_relos_sz = 0, total_sz = 0;
1: -	size_t func_rec_sz = 0, line_rec_sz = 0, core_relo_rec_sz = 0;
1: -	struct btf_ext_header *hdr;
1: -	void *data, *cur;
1: -	int i, err, sz;
1: -
1: -	/* validate that all sections have the same .BTF.ext record sizes
1: -	 * and calculate total data size for each type of data (func info,
1: -	 * line info, core relos)
1: -	 */
1: -	for (i = 1; i < linker->sec_cnt; i++) {
1: -		struct dst_sec *sec = &linker->secs[i];
1: -
1: -		if (sec->func_info.rec_cnt) {
1: -			if (func_rec_sz == 0)
1: -				func_rec_sz = sec->func_info.rec_sz;
1: -			if (func_rec_sz != sec->func_info.rec_sz) {
1: -				pr_warn("mismatch in func_info record size %zu != %u\n",
1: -					func_rec_sz, sec->func_info.rec_sz);
1: -				return -EINVAL;
1: -			}
1: -
1: -			funcs_sz += sizeof(struct btf_ext_info_sec) + func_rec_sz * sec->func_info.rec_cnt;
1: -		}
1: -		if (sec->line_info.rec_cnt) {
1: -			if (line_rec_sz == 0)
1: -				line_rec_sz = sec->line_info.rec_sz;
1: -			if (line_rec_sz != sec->line_info.rec_sz) {
1: -				pr_warn("mismatch in line_info record size %zu != %u\n",
1: -					line_rec_sz, sec->line_info.rec_sz);
1: -				return -EINVAL;
1: -			}
1: -
1: -			lines_sz += sizeof(struct btf_ext_info_sec) + line_rec_sz * sec->line_info.rec_cnt;
1: -		}
1: -		if (sec->core_relo_info.rec_cnt) {
1: -			if (core_relo_rec_sz == 0)
1: -				core_relo_rec_sz = sec->core_relo_info.rec_sz;
1: -			if (core_relo_rec_sz != sec->core_relo_info.rec_sz) {
1: -				pr_warn("mismatch in core_relo_info record size %zu != %u\n",
1: -					core_relo_rec_sz, sec->core_relo_info.rec_sz);
1: -				return -EINVAL;
1: -			}
1: -
1: -			core_relos_sz += sizeof(struct btf_ext_info_sec) + core_relo_rec_sz * sec->core_relo_info.rec_cnt;
1: -		}
1: -	}
1: -
1: -	if (!funcs_sz && !lines_sz && !core_relos_sz)
1: -		return 0;
1: -
1: -	total_sz += sizeof(struct btf_ext_header);
1: -	if (funcs_sz) {
1: -		funcs_sz += sizeof(__u32); /* record size prefix */
1: -		total_sz += funcs_sz;
1: -	}
1: -	if (lines_sz) {
1: -		lines_sz += sizeof(__u32); /* record size prefix */
1: -		total_sz += lines_sz;
1: -	}
1: -	if (core_relos_sz) {
1: -		core_relos_sz += sizeof(__u32); /* record size prefix */
1: -		total_sz += core_relos_sz;
1: -	}
1: -
1: -	cur = data = calloc(1, total_sz);
1: -	if (!data)
1: -		return -ENOMEM;
1: -
1: -	hdr = cur;
1: -	hdr->magic = BTF_MAGIC;
1: -	hdr->version = BTF_VERSION;
1: -	hdr->flags = 0;
1: -	hdr->hdr_len = sizeof(struct btf_ext_header);
1: -	cur += sizeof(struct btf_ext_header);
1: -
1: -	/* All offsets are in bytes relative to the end of this header */
1: -	hdr->func_info_off = 0;
1: -	hdr->func_info_len = funcs_sz;
1: -	hdr->line_info_off = funcs_sz;
1: -	hdr->line_info_len = lines_sz;
1: -	hdr->core_relo_off = funcs_sz + lines_sz;
1: -	hdr->core_relo_len = core_relos_sz;
1: -
1: -	if (funcs_sz) {
1: -		*(__u32 *)cur = func_rec_sz;
1: -		cur += sizeof(__u32);
1: -
1: -		for (i = 1; i < linker->sec_cnt; i++) {
1: -			struct dst_sec *sec = &linker->secs[i];
1: -
1: -			sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->func_info);
1: -			if (sz < 0) {
1: -				err = sz;
1: -				goto out;
1: -			}
1: -
1: -			cur += sz;
1: -		}
1: -	}
1: -
1: -	if (lines_sz) {
1: -		*(__u32 *)cur = line_rec_sz;
1: -		cur += sizeof(__u32);
1: -
1: -		for (i = 1; i < linker->sec_cnt; i++) {
1: -			struct dst_sec *sec = &linker->secs[i];
1: -
1: -			sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->line_info);
1: -			if (sz < 0) {
1: -				err = sz;
1: -				goto out;
1: -			}
1: -
1: -			cur += sz;
1: -		}
1: -	}
1: -
1: -	if (core_relos_sz) {
1: -		*(__u32 *)cur = core_relo_rec_sz;
1: -		cur += sizeof(__u32);
1: -
1: -		for (i = 1; i < linker->sec_cnt; i++) {
1: -			struct dst_sec *sec = &linker->secs[i];
1: -
1: -			sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->core_relo_info);
1: -			if (sz < 0) {
1: -				err = sz;
1: -				goto out;
1: -			}
1: -
1: -			cur += sz;
1: -		}
1: -	}
1: -
1: -	linker->btf_ext = btf_ext__new(data, total_sz);
1: -	err = libbpf_get_error(linker->btf_ext);
1: -	if (err) {
1: -		linker->btf_ext = NULL;
1: -		pr_warn("failed to parse final .BTF.ext data: %d\n", err);
1: -		goto out;
1: -	}
1: +static int finalize_btf_ext(struct bpf_linker *linker) {
1: +  size_t funcs_sz = 0, lines_sz = 0, core_relos_sz = 0, total_sz = 0;
1: +  size_t func_rec_sz = 0, line_rec_sz = 0, core_relo_rec_sz = 0;
1: +  struct btf_ext_header *hdr;
1: +  void *data, *cur;
1: +  int i, err, sz;
1: +
1: +  /* validate that all sections have the same .BTF.ext record sizes
1: +   * and calculate total data size for each type of data (func info,
1: +   * line info, core relos)
1: +   */
1: +  for (i = 1; i < linker->sec_cnt; i++) {
1: +    struct dst_sec *sec = &linker->secs[i];
1: +
1: +    if (sec->func_info.rec_cnt) {
1: +      if (func_rec_sz == 0)
1: +        func_rec_sz = sec->func_info.rec_sz;
1: +      if (func_rec_sz != sec->func_info.rec_sz) {
1: +        pr_warn("mismatch in func_info record size %zu != %u\n", func_rec_sz,
1: +                sec->func_info.rec_sz);
1: +        return -EINVAL;
1: +      }
1: +
1: +      funcs_sz += sizeof(struct btf_ext_info_sec) +
1: +                  func_rec_sz * sec->func_info.rec_cnt;
1: +    }
1: +    if (sec->line_info.rec_cnt) {
1: +      if (line_rec_sz == 0)
1: +        line_rec_sz = sec->line_info.rec_sz;
1: +      if (line_rec_sz != sec->line_info.rec_sz) {
1: +        pr_warn("mismatch in line_info record size %zu != %u\n", line_rec_sz,
1: +                sec->line_info.rec_sz);
1: +        return -EINVAL;
1: +      }
1: +
1: +      lines_sz += sizeof(struct btf_ext_info_sec) +
1: +                  line_rec_sz * sec->line_info.rec_cnt;
1: +    }
1: +    if (sec->core_relo_info.rec_cnt) {
1: +      if (core_relo_rec_sz == 0)
1: +        core_relo_rec_sz = sec->core_relo_info.rec_sz;
1: +      if (core_relo_rec_sz != sec->core_relo_info.rec_sz) {
1: +        pr_warn("mismatch in core_relo_info record size %zu != %u\n",
1: +                core_relo_rec_sz, sec->core_relo_info.rec_sz);
1: +        return -EINVAL;
1: +      }
1: +
1: +      core_relos_sz += sizeof(struct btf_ext_info_sec) +
1: +                       core_relo_rec_sz * sec->core_relo_info.rec_cnt;
1: +    }
1: +  }
1: +
1: +  if (!funcs_sz && !lines_sz && !core_relos_sz)
1: +    return 0;
1: +
1: +  total_sz += sizeof(struct btf_ext_header);
1: +  if (funcs_sz) {
1: +    funcs_sz += sizeof(__u32); /* record size prefix */
1: +    total_sz += funcs_sz;
1: +  }
1: +  if (lines_sz) {
1: +    lines_sz += sizeof(__u32); /* record size prefix */
1: +    total_sz += lines_sz;
1: +  }
1: +  if (core_relos_sz) {
1: +    core_relos_sz += sizeof(__u32); /* record size prefix */
1: +    total_sz += core_relos_sz;
1: +  }
1: +
1: +  cur = data = calloc(1, total_sz);
1: +  if (!data)
1: +    return -ENOMEM;
1: +
1: +  hdr = cur;
1: +  hdr->magic = BTF_MAGIC;
1: +  hdr->version = BTF_VERSION;
1: +  hdr->flags = 0;
1: +  hdr->hdr_len = sizeof(struct btf_ext_header);
1: +  cur += sizeof(struct btf_ext_header);
1: +
1: +  /* All offsets are in bytes relative to the end of this header */
1: +  hdr->func_info_off = 0;
1: +  hdr->func_info_len = funcs_sz;
1: +  hdr->line_info_off = funcs_sz;
1: +  hdr->line_info_len = lines_sz;
1: +  hdr->core_relo_off = funcs_sz + lines_sz;
1: +  hdr->core_relo_len = core_relos_sz;
1: +
1: +  if (funcs_sz) {
1: +    *(__u32 *)cur = func_rec_sz;
1: +    cur += sizeof(__u32);
1: +
1: +    for (i = 1; i < linker->sec_cnt; i++) {
1: +      struct dst_sec *sec = &linker->secs[i];
1: +
1: +      sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->func_info);
1: +      if (sz < 0) {
1: +        err = sz;
1: +        goto out;
1: +      }
1: +
1: +      cur += sz;
1: +    }
1: +  }
1: +
1: +  if (lines_sz) {
1: +    *(__u32 *)cur = line_rec_sz;
1: +    cur += sizeof(__u32);
1: +
1: +    for (i = 1; i < linker->sec_cnt; i++) {
1: +      struct dst_sec *sec = &linker->secs[i];
1: +
1: +      sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->line_info);
1: +      if (sz < 0) {
1: +        err = sz;
1: +        goto out;
1: +      }
1: +
1: +      cur += sz;
1: +    }
1: +  }
1: +
1: +  if (core_relos_sz) {
1: +    *(__u32 *)cur = core_relo_rec_sz;
1: +    cur += sizeof(__u32);
1: +
1: +    for (i = 1; i < linker->sec_cnt; i++) {
1: +      struct dst_sec *sec = &linker->secs[i];
1: +
1: +      sz = emit_btf_ext_data(linker, cur, sec->sec_name, &sec->core_relo_info);
1: +      if (sz < 0) {
1: +        err = sz;
1: +        goto out;
1: +      }
1: +
1: +      cur += sz;
1: +    }
1: +  }
1: +
1: +  linker->btf_ext = btf_ext__new(data, total_sz);
1: +  err = libbpf_get_error(linker->btf_ext);
1: +  if (err) {
1: +    linker->btf_ext = NULL;
1: +    pr_warn("failed to parse final .BTF.ext data: %d\n", err);
1: +    goto out;
1: +  }
1:  
1:  out:
1: -	free(data);
1: -	return err;
1: +  free(data);
1: +  return err;
1:  }
1: diff --git a/src/cc/libbpf/src/netlink.c b/src/cc/libbpf/src/netlink.c
1: index cf9381f0..f73eaeda 100644
1: --- a/src/cc/libbpf/src/netlink.c
1: +++ b/src/cc/libbpf/src/netlink.c
1: @@ -1,17 +1,17 @@
1:  // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
1:  /* Copyright (c) 2018 Facebook */
1:  
1: -#include <stdlib.h>
1: -#include <memory.h>
1: -#include <unistd.h>
1:  #include <arpa/inet.h>
1: +#include <errno.h>
1:  #include <linux/bpf.h>
1:  #include <linux/if_ether.h>
1:  #include <linux/pkt_cls.h>
1:  #include <linux/rtnetlink.h>
1: +#include <memory.h>
1: +#include <stdlib.h>
1:  #include <sys/socket.h>
1: -#include <errno.h>
1:  #include <time.h>
1: +#include <unistd.h>
1:  
1:  #include "bpf.h"
1:  #include "libbpf.h"
1: @@ -25,761 +25,722 @@
1:  typedef int (*libbpf_dump_nlmsg_t)(void *cookie, void *msg, struct nlattr **tb);
1:  
1:  typedef int (*__dump_nlmsg_t)(struct nlmsghdr *nlmsg, libbpf_dump_nlmsg_t,
1: -			      void *cookie);
1: +                              void *cookie);
1:  
1:  struct xdp_id_md {
1: -	int ifindex;
1: -	__u32 flags;
1: -	struct xdp_link_info info;
1: +  int ifindex;
1: +  __u32 flags;
1: +  struct xdp_link_info info;
1:  };
1:  
1: -static int libbpf_netlink_open(__u32 *nl_pid)
1: -{
1: -	struct sockaddr_nl sa;
1: -	socklen_t addrlen;
1: -	int one = 1, ret;
1: -	int sock;
1: +static int libbpf_netlink_open(__u32 *nl_pid) {
1: +  struct sockaddr_nl sa;
1: +  socklen_t addrlen;
1: +  int one = 1, ret;
1: +  int sock;
1:  
1: -	memset(&sa, 0, sizeof(sa));
1: -	sa.nl_family = AF_NETLINK;
1: +  memset(&sa, 0, sizeof(sa));
1: +  sa.nl_family = AF_NETLINK;
1:  
1: -	sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
1: -	if (sock < 0)
1: -		return -errno;
1: +  sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
1: +  if (sock < 0)
1: +    return -errno;
1:  
1: -	if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK,
1: -		       &one, sizeof(one)) < 0) {
1: -		pr_warn("Netlink error reporting not supported\n");
1: -	}
1: +  if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, &one, sizeof(one)) < 0) {
1: +    pr_warn("Netlink error reporting not supported\n");
1: +  }
1:  
1: -	if (bind(sock, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
1: -		ret = -errno;
1: -		goto cleanup;
1: -	}
1: +  if (bind(sock, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
1: +    ret = -errno;
1: +    goto cleanup;
1: +  }
1:  
1: -	addrlen = sizeof(sa);
1: -	if (getsockname(sock, (struct sockaddr *)&sa, &addrlen) < 0) {
1: -		ret = -errno;
1: -		goto cleanup;
1: -	}
1: +  addrlen = sizeof(sa);
1: +  if (getsockname(sock, (struct sockaddr *)&sa, &addrlen) < 0) {
1: +    ret = -errno;
1: +    goto cleanup;
1: +  }
1:  
1: -	if (addrlen != sizeof(sa)) {
1: -		ret = -LIBBPF_ERRNO__INTERNAL;
1: -		goto cleanup;
1: -	}
1: +  if (addrlen != sizeof(sa)) {
1: +    ret = -LIBBPF_ERRNO__INTERNAL;
1: +    goto cleanup;
1: +  }
1:  
1: -	*nl_pid = sa.nl_pid;
1: -	return sock;
1: +  *nl_pid = sa.nl_pid;
1: +  return sock;
1:  
1:  cleanup:
1: -	close(sock);
1: -	return ret;
1: +  close(sock);
1: +  return ret;
1:  }
1:  
1: -static void libbpf_netlink_close(int sock)
1: -{
1: -	close(sock);
1: -}
1: +static void libbpf_netlink_close(int sock) { close(sock); }
1:  
1:  enum {
1: -	NL_CONT,
1: -	NL_NEXT,
1: -	NL_DONE,
1: +  NL_CONT,
1: +  NL_NEXT,
1: +  NL_DONE,
1:  };
1:  
1:  static int libbpf_netlink_recv(int sock, __u32 nl_pid, int seq,
1: -			       __dump_nlmsg_t _fn, libbpf_dump_nlmsg_t fn,
1: -			       void *cookie)
1: -{
1: -	bool multipart = true;
1: -	struct nlmsgerr *err;
1: -	struct nlmsghdr *nh;
1: -	char buf[4096];
1: -	int len, ret;
1: -
1: -	while (multipart) {
1: -start:
1: -		multipart = false;
1: -		len = recv(sock, buf, sizeof(buf), 0);
1: -		if (len < 0) {
1: -			ret = -errno;
1: -			goto done;
1: -		}
1: -
1: -		if (len == 0)
1: -			break;
1: -
1: -		for (nh = (struct nlmsghdr *)buf; NLMSG_OK(nh, len);
1: -		     nh = NLMSG_NEXT(nh, len)) {
1: -			if (nh->nlmsg_pid != nl_pid) {
1: -				ret = -LIBBPF_ERRNO__WRNGPID;
1: -				goto done;
1: -			}
1: -			if (nh->nlmsg_seq != seq) {
1: -				ret = -LIBBPF_ERRNO__INVSEQ;
1: -				goto done;
1: -			}
1: -			if (nh->nlmsg_flags & NLM_F_MULTI)
1: -				multipart = true;
1: -			switch (nh->nlmsg_type) {
1: -			case NLMSG_ERROR:
1: -				err = (struct nlmsgerr *)NLMSG_DATA(nh);
1: -				if (!err->error)
1: -					continue;
1: -				ret = err->error;
1: -				libbpf_nla_dump_errormsg(nh);
1: -				goto done;
1: -			case NLMSG_DONE:
1: -				return 0;
1: -			default:
1: -				break;
1: -			}
1: -			if (_fn) {
1: -				ret = _fn(nh, fn, cookie);
1: -				switch (ret) {
1: -				case NL_CONT:
1: -					break;
1: -				case NL_NEXT:
1: -					goto start;
1: -				case NL_DONE:
1: -					return 0;
1: -				default:
1: -					return ret;
1: -				}
1: -			}
1: -		}
1: -	}
1: -	ret = 0;
1: +                               __dump_nlmsg_t _fn, libbpf_dump_nlmsg_t fn,
1: +                               void *cookie) {
1: +  bool multipart = true;
1: +  struct nlmsgerr *err;
1: +  struct nlmsghdr *nh;
1: +  char buf[4096];
1: +  int len, ret;
1: +
1: +  while (multipart) {
1: +  start:
1: +    multipart = false;
1: +    len = recv(sock, buf, sizeof(buf), 0);
1: +    if (len < 0) {
1: +      ret = -errno;
1: +      goto done;
1: +    }
1: +
1: +    if (len == 0)
1: +      break;
1: +
1: +    for (nh = (struct nlmsghdr *)buf; NLMSG_OK(nh, len);
1: +         nh = NLMSG_NEXT(nh, len)) {
1: +      if (nh->nlmsg_pid != nl_pid) {
1: +        ret = -LIBBPF_ERRNO__WRNGPID;
1: +        goto done;
1: +      }
1: +      if (nh->nlmsg_seq != seq) {
1: +        ret = -LIBBPF_ERRNO__INVSEQ;
1: +        goto done;
1: +      }
1: +      if (nh->nlmsg_flags & NLM_F_MULTI)
1: +        multipart = true;
1: +      switch (nh->nlmsg_type) {
1: +      case NLMSG_ERROR:
1: +        err = (struct nlmsgerr *)NLMSG_DATA(nh);
1: +        if (!err->error)
1: +          continue;
1: +        ret = err->error;
1: +        libbpf_nla_dump_errormsg(nh);
1: +        goto done;
1: +      case NLMSG_DONE:
1: +        return 0;
1: +      default:
1: +        break;
1: +      }
1: +      if (_fn) {
1: +        ret = _fn(nh, fn, cookie);
1: +        switch (ret) {
1: +        case NL_CONT:
1: +          break;
1: +        case NL_NEXT:
1: +          goto start;
1: +        case NL_DONE:
1: +          return 0;
1: +        default:
1: +          return ret;
1: +        }
1: +      }
1: +    }
1: +  }
1: +  ret = 0;
1:  done:
1: -	return ret;
1: +  return ret;
1:  }
1:  
1:  static int libbpf_netlink_send_recv(struct nlmsghdr *nh,
1: -				    __dump_nlmsg_t parse_msg,
1: -				    libbpf_dump_nlmsg_t parse_attr,
1: -				    void *cookie)
1: -{
1: -	__u32 nl_pid = 0;
1: -	int sock, ret;
1: -
1: -	sock = libbpf_netlink_open(&nl_pid);
1: -	if (sock < 0)
1: -		return sock;
1: -
1: -	nh->nlmsg_pid = 0;
1: -	nh->nlmsg_seq = time(NULL);
1: -
1: -	if (send(sock, nh, nh->nlmsg_len, 0) < 0) {
1: -		ret = -errno;
1: -		goto out;
1: -	}
1: -
1: -	ret = libbpf_netlink_recv(sock, nl_pid, nh->nlmsg_seq,
1: -				  parse_msg, parse_attr, cookie);
1: +                                    __dump_nlmsg_t parse_msg,
1: +                                    libbpf_dump_nlmsg_t parse_attr,
1: +                                    void *cookie) {
1: +  __u32 nl_pid = 0;
1: +  int sock, ret;
1: +
1: +  sock = libbpf_netlink_open(&nl_pid);
1: +  if (sock < 0)
1: +    return sock;
1: +
1: +  nh->nlmsg_pid = 0;
1: +  nh->nlmsg_seq = time(NULL);
1: +
1: +  if (send(sock, nh, nh->nlmsg_len, 0) < 0) {
1: +    ret = -errno;
1: +    goto out;
1: +  }
1: +
1: +  ret = libbpf_netlink_recv(sock, nl_pid, nh->nlmsg_seq, parse_msg, parse_attr,
1: +                            cookie);
1:  out:
1: -	libbpf_netlink_close(sock);
1: -	return ret;
1: +  libbpf_netlink_close(sock);
1: +  return ret;
1:  }
1:  
1:  static int __bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd,
1: -					 __u32 flags)
1: -{
1: -	struct nlattr *nla;
1: -	int ret;
1: -	struct {
1: -		struct nlmsghdr  nh;
1: -		struct ifinfomsg ifinfo;
1: -		char             attrbuf[64];
1: -	} req;
1: -
1: -	memset(&req, 0, sizeof(req));
1: -	req.nh.nlmsg_len      = NLMSG_LENGTH(sizeof(struct ifinfomsg));
1: -	req.nh.nlmsg_flags    = NLM_F_REQUEST | NLM_F_ACK;
1: -	req.nh.nlmsg_type     = RTM_SETLINK;
1: -	req.ifinfo.ifi_family = AF_UNSPEC;
1: -	req.ifinfo.ifi_index  = ifindex;
1: -
1: -	nla = nlattr_begin_nested(&req.nh, sizeof(req), IFLA_XDP);
1: -	if (!nla)
1: -		return -EMSGSIZE;
1: -	ret = nlattr_add(&req.nh, sizeof(req), IFLA_XDP_FD, &fd, sizeof(fd));
1: -	if (ret < 0)
1: -		return ret;
1: -	if (flags) {
1: -		ret = nlattr_add(&req.nh, sizeof(req), IFLA_XDP_FLAGS, &flags,
1: -				 sizeof(flags));
1: -		if (ret < 0)
1: -			return ret;
1: -	}
1: -	if (flags & XDP_FLAGS_REPLACE) {
1: -		ret = nlattr_add(&req.nh, sizeof(req), IFLA_XDP_EXPECTED_FD,
1: -				 &old_fd, sizeof(old_fd));
1: -		if (ret < 0)
1: -			return ret;
1: -	}
1: -	nlattr_end_nested(&req.nh, nla);
1: -
1: -	return libbpf_netlink_send_recv(&req.nh, NULL, NULL, NULL);
1: +                                         __u32 flags) {
1: +  struct nlattr *nla;
1: +  int ret;
1: +  struct {
1: +    struct nlmsghdr nh;
1: +    struct ifinfomsg ifinfo;
1: +    char attrbuf[64];
1: +  } req;
1: +
1: +  memset(&req, 0, sizeof(req));
1: +  req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
1: +  req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
1: +  req.nh.nlmsg_type = RTM_SETLINK;
1: +  req.ifinfo.ifi_family = AF_UNSPEC;
1: +  req.ifinfo.ifi_index = ifindex;
1: +
1: +  nla = nlattr_begin_nested(&req.nh, sizeof(req), IFLA_XDP);
1: +  if (!nla)
1: +    return -EMSGSIZE;
1: +  ret = nlattr_add(&req.nh, sizeof(req), IFLA_XDP_FD, &fd, sizeof(fd));
1: +  if (ret < 0)
1: +    return ret;
1: +  if (flags) {
1: +    ret =
1: +        nlattr_add(&req.nh, sizeof(req), IFLA_XDP_FLAGS, &flags, sizeof(flags));
1: +    if (ret < 0)
1: +      return ret;
1: +  }
1: +  if (flags & XDP_FLAGS_REPLACE) {
1: +    ret = nlattr_add(&req.nh, sizeof(req), IFLA_XDP_EXPECTED_FD, &old_fd,
1: +                     sizeof(old_fd));
1: +    if (ret < 0)
1: +      return ret;
1: +  }
1: +  nlattr_end_nested(&req.nh, nla);
1: +
1: +  return libbpf_netlink_send_recv(&req.nh, NULL, NULL, NULL);
1:  }
1:  
1:  int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags,
1: -			     const struct bpf_xdp_set_link_opts *opts)
1: -{
1: -	int old_fd = -1, ret;
1: +                             const struct bpf_xdp_set_link_opts *opts) {
1: +  int old_fd = -1, ret;
1:  
1: -	if (!OPTS_VALID(opts, bpf_xdp_set_link_opts))
1: -		return libbpf_err(-EINVAL);
1: +  if (!OPTS_VALID(opts, bpf_xdp_set_link_opts))
1: +    return libbpf_err(-EINVAL);
1:  
1: -	if (OPTS_HAS(opts, old_fd)) {
1: -		old_fd = OPTS_GET(opts, old_fd, -1);
1: -		flags |= XDP_FLAGS_REPLACE;
1: -	}
1: +  if (OPTS_HAS(opts, old_fd)) {
1: +    old_fd = OPTS_GET(opts, old_fd, -1);
1: +    flags |= XDP_FLAGS_REPLACE;
1: +  }
1:  
1: -	ret = __bpf_set_link_xdp_fd_replace(ifindex, fd, old_fd, flags);
1: -	return libbpf_err(ret);
1: +  ret = __bpf_set_link_xdp_fd_replace(ifindex, fd, old_fd, flags);
1: +  return libbpf_err(ret);
1:  }
1:  
1: -int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags)
1: -{
1: -	int ret;
1: +int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) {
1: +  int ret;
1:  
1: -	ret = __bpf_set_link_xdp_fd_replace(ifindex, fd, 0, flags);
1: -	return libbpf_err(ret);
1: +  ret = __bpf_set_link_xdp_fd_replace(ifindex, fd, 0, flags);
1: +  return libbpf_err(ret);
1:  }
1:  
1:  static int __dump_link_nlmsg(struct nlmsghdr *nlh,
1: -			     libbpf_dump_nlmsg_t dump_link_nlmsg, void *cookie)
1: -{
1: -	struct nlattr *tb[IFLA_MAX + 1], *attr;
1: -	struct ifinfomsg *ifi = NLMSG_DATA(nlh);
1: -	int len;
1: +                             libbpf_dump_nlmsg_t dump_link_nlmsg,
1: +                             void *cookie) {
1: +  struct nlattr *tb[IFLA_MAX + 1], *attr;
1: +  struct ifinfomsg *ifi = NLMSG_DATA(nlh);
1: +  int len;
1:  
1: -	len = nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*ifi));
1: -	attr = (struct nlattr *) ((void *) ifi + NLMSG_ALIGN(sizeof(*ifi)));
1: +  len = nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*ifi));
1: +  attr = (struct nlattr *)((void *)ifi + NLMSG_ALIGN(sizeof(*ifi)));
1:  
1: -	if (libbpf_nla_parse(tb, IFLA_MAX, attr, len, NULL) != 0)
1: -		return -LIBBPF_ERRNO__NLPARSE;
1: +  if (libbpf_nla_parse(tb, IFLA_MAX, attr, len, NULL) != 0)
1: +    return -LIBBPF_ERRNO__NLPARSE;
1:  
1: -	return dump_link_nlmsg(cookie, ifi, tb);
1: +  return dump_link_nlmsg(cookie, ifi, tb);
1:  }
1:  
1: -static int get_xdp_info(void *cookie, void *msg, struct nlattr **tb)
1: -{
1: -	struct nlattr *xdp_tb[IFLA_XDP_MAX + 1];
1: -	struct xdp_id_md *xdp_id = cookie;
1: -	struct ifinfomsg *ifinfo = msg;
1: -	int ret;
1: +static int get_xdp_info(void *cookie, void *msg, struct nlattr **tb) {
1: +  struct nlattr *xdp_tb[IFLA_XDP_MAX + 1];
1: +  struct xdp_id_md *xdp_id = cookie;
1: +  struct ifinfomsg *ifinfo = msg;
1: +  int ret;
1:  
1: -	if (xdp_id->ifindex && xdp_id->ifindex != ifinfo->ifi_index)
1: -		return 0;
1: +  if (xdp_id->ifindex && xdp_id->ifindex != ifinfo->ifi_index)
1: +    return 0;
1:  
1: -	if (!tb[IFLA_XDP])
1: -		return 0;
1: +  if (!tb[IFLA_XDP])
1: +    return 0;
1:  
1: -	ret = libbpf_nla_parse_nested(xdp_tb, IFLA_XDP_MAX, tb[IFLA_XDP], NULL);
1: -	if (ret)
1: -		return ret;
1: +  ret = libbpf_nla_parse_nested(xdp_tb, IFLA_XDP_MAX, tb[IFLA_XDP], NULL);
1: +  if (ret)
1: +    return ret;
1:  
1: -	if (!xdp_tb[IFLA_XDP_ATTACHED])
1: -		return 0;
1: +  if (!xdp_tb[IFLA_XDP_ATTACHED])
1: +    return 0;
1:  
1: -	xdp_id->info.attach_mode = libbpf_nla_getattr_u8(
1: -		xdp_tb[IFLA_XDP_ATTACHED]);
1: +  xdp_id->info.attach_mode = libbpf_nla_getattr_u8(xdp_tb[IFLA_XDP_ATTACHED]);
1:  
1: -	if (xdp_id->info.attach_mode == XDP_ATTACHED_NONE)
1: -		return 0;
1: +  if (xdp_id->info.attach_mode == XDP_ATTACHED_NONE)
1: +    return 0;
1:  
1: -	if (xdp_tb[IFLA_XDP_PROG_ID])
1: -		xdp_id->info.prog_id = libbpf_nla_getattr_u32(
1: -			xdp_tb[IFLA_XDP_PROG_ID]);
1: +  if (xdp_tb[IFLA_XDP_PROG_ID])
1: +    xdp_id->info.prog_id = libbpf_nla_getattr_u32(xdp_tb[IFLA_XDP_PROG_ID]);
1:  
1: -	if (xdp_tb[IFLA_XDP_SKB_PROG_ID])
1: -		xdp_id->info.skb_prog_id = libbpf_nla_getattr_u32(
1: -			xdp_tb[IFLA_XDP_SKB_PROG_ID]);
1: +  if (xdp_tb[IFLA_XDP_SKB_PROG_ID])
1: +    xdp_id->info.skb_prog_id =
1: +        libbpf_nla_getattr_u32(xdp_tb[IFLA_XDP_SKB_PROG_ID]);
1:  
1: -	if (xdp_tb[IFLA_XDP_DRV_PROG_ID])
1: -		xdp_id->info.drv_prog_id = libbpf_nla_getattr_u32(
1: -			xdp_tb[IFLA_XDP_DRV_PROG_ID]);
1: +  if (xdp_tb[IFLA_XDP_DRV_PROG_ID])
1: +    xdp_id->info.drv_prog_id =
1: +        libbpf_nla_getattr_u32(xdp_tb[IFLA_XDP_DRV_PROG_ID]);
1:  
1: -	if (xdp_tb[IFLA_XDP_HW_PROG_ID])
1: -		xdp_id->info.hw_prog_id = libbpf_nla_getattr_u32(
1: -			xdp_tb[IFLA_XDP_HW_PROG_ID]);
1: +  if (xdp_tb[IFLA_XDP_HW_PROG_ID])
1: +    xdp_id->info.hw_prog_id =
1: +        libbpf_nla_getattr_u32(xdp_tb[IFLA_XDP_HW_PROG_ID]);
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1:  int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info,
1: -			  size_t info_size, __u32 flags)
1: -{
1: -	struct xdp_id_md xdp_id = {};
1: -	__u32 mask;
1: -	int ret;
1: -	struct {
1: -		struct nlmsghdr  nh;
1: -		struct ifinfomsg ifm;
1: -	} req = {
1: -		.nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
1: -		.nh.nlmsg_type  = RTM_GETLINK,
1: -		.nh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
1: -		.ifm.ifi_family = AF_PACKET,
1: -	};
1: -
1: -	if (flags & ~XDP_FLAGS_MASK || !info_size)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	/* Check whether the single {HW,DRV,SKB} mode is set */
1: -	flags &= (XDP_FLAGS_SKB_MODE | XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE);
1: -	mask = flags - 1;
1: -	if (flags && flags & mask)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	xdp_id.ifindex = ifindex;
1: -	xdp_id.flags = flags;
1: -
1: -	ret = libbpf_netlink_send_recv(&req.nh, __dump_link_nlmsg,
1: -				       get_xdp_info, &xdp_id);
1: -	if (!ret) {
1: -		size_t sz = min(info_size, sizeof(xdp_id.info));
1: -
1: -		memcpy(info, &xdp_id.info, sz);
1: -		memset((void *) info + sz, 0, info_size - sz);
1: -	}
1: -
1: -	return libbpf_err(ret);
1: +                          size_t info_size, __u32 flags) {
1: +  struct xdp_id_md xdp_id = {};
1: +  __u32 mask;
1: +  int ret;
1: +  struct {
1: +    struct nlmsghdr nh;
1: +    struct ifinfomsg ifm;
1: +  } req = {
1: +      .nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
1: +      .nh.nlmsg_type = RTM_GETLINK,
1: +      .nh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
1: +      .ifm.ifi_family = AF_PACKET,
1: +  };
1: +
1: +  if (flags & ~XDP_FLAGS_MASK || !info_size)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  /* Check whether the single {HW,DRV,SKB} mode is set */
1: +  flags &= (XDP_FLAGS_SKB_MODE | XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE);
1: +  mask = flags - 1;
1: +  if (flags && flags & mask)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  xdp_id.ifindex = ifindex;
1: +  xdp_id.flags = flags;
1: +
1: +  ret = libbpf_netlink_send_recv(&req.nh, __dump_link_nlmsg, get_xdp_info,
1: +                                 &xdp_id);
1: +  if (!ret) {
1: +    size_t sz = min(info_size, sizeof(xdp_id.info));
1: +
1: +    memcpy(info, &xdp_id.info, sz);
1: +    memset((void *)info + sz, 0, info_size - sz);
1: +  }
1: +
1: +  return libbpf_err(ret);
1:  }
1:  
1: -static __u32 get_xdp_id(struct xdp_link_info *info, __u32 flags)
1: -{
1: -	flags &= XDP_FLAGS_MODES;
1: +static __u32 get_xdp_id(struct xdp_link_info *info, __u32 flags) {
1: +  flags &= XDP_FLAGS_MODES;
1:  
1: -	if (info->attach_mode != XDP_ATTACHED_MULTI && !flags)
1: -		return info->prog_id;
1: -	if (flags & XDP_FLAGS_DRV_MODE)
1: -		return info->drv_prog_id;
1: -	if (flags & XDP_FLAGS_HW_MODE)
1: -		return info->hw_prog_id;
1: -	if (flags & XDP_FLAGS_SKB_MODE)
1: -		return info->skb_prog_id;
1: +  if (info->attach_mode != XDP_ATTACHED_MULTI && !flags)
1: +    return info->prog_id;
1: +  if (flags & XDP_FLAGS_DRV_MODE)
1: +    return info->drv_prog_id;
1: +  if (flags & XDP_FLAGS_HW_MODE)
1: +    return info->hw_prog_id;
1: +  if (flags & XDP_FLAGS_SKB_MODE)
1: +    return info->skb_prog_id;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags)
1: -{
1: -	struct xdp_link_info info;
1: -	int ret;
1: +int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags) {
1: +  struct xdp_link_info info;
1: +  int ret;
1:  
1: -	ret = bpf_get_link_xdp_info(ifindex, &info, sizeof(info), flags);
1: -	if (!ret)
1: -		*prog_id = get_xdp_id(&info, flags);
1: +  ret = bpf_get_link_xdp_info(ifindex, &info, sizeof(info), flags);
1: +  if (!ret)
1: +    *prog_id = get_xdp_id(&info, flags);
1:  
1: -	return libbpf_err(ret);
1: +  return libbpf_err(ret);
1:  }
1:  
1:  typedef int (*qdisc_config_t)(struct nlmsghdr *nh, struct tcmsg *t,
1: -			      size_t maxsz);
1: +                              size_t maxsz);
1:  
1: -static int clsact_config(struct nlmsghdr *nh, struct tcmsg *t, size_t maxsz)
1: -{
1: -	t->tcm_parent = TC_H_CLSACT;
1: -	t->tcm_handle = TC_H_MAKE(TC_H_CLSACT, 0);
1: +static int clsact_config(struct nlmsghdr *nh, struct tcmsg *t, size_t maxsz) {
1: +  t->tcm_parent = TC_H_CLSACT;
1: +  t->tcm_handle = TC_H_MAKE(TC_H_CLSACT, 0);
1:  
1: -	return nlattr_add(nh, maxsz, TCA_KIND, "clsact", sizeof("clsact"));
1: +  return nlattr_add(nh, maxsz, TCA_KIND, "clsact", sizeof("clsact"));
1:  }
1:  
1:  static int attach_point_to_config(struct bpf_tc_hook *hook,
1: -				  qdisc_config_t *config)
1: -{
1: -	switch (OPTS_GET(hook, attach_point, 0)) {
1: -	case BPF_TC_INGRESS:
1: -	case BPF_TC_EGRESS:
1: -	case BPF_TC_INGRESS | BPF_TC_EGRESS:
1: -		if (OPTS_GET(hook, parent, 0))
1: -			return -EINVAL;
1: -		*config = &clsact_config;
1: -		return 0;
1: -	case BPF_TC_CUSTOM:
1: -		return -EOPNOTSUPP;
1: -	default:
1: -		return -EINVAL;
1: -	}
1: +                                  qdisc_config_t *config) {
1: +  switch (OPTS_GET(hook, attach_point, 0)) {
1: +  case BPF_TC_INGRESS:
1: +  case BPF_TC_EGRESS:
1: +  case BPF_TC_INGRESS | BPF_TC_EGRESS:
1: +    if (OPTS_GET(hook, parent, 0))
1: +      return -EINVAL;
1: +    *config = &clsact_config;
1: +    return 0;
1: +  case BPF_TC_CUSTOM:
1: +    return -EOPNOTSUPP;
1: +  default:
1: +    return -EINVAL;
1: +  }
1:  }
1:  
1:  static int tc_get_tcm_parent(enum bpf_tc_attach_point attach_point,
1: -			     __u32 *parent)
1: -{
1: -	switch (attach_point) {
1: -	case BPF_TC_INGRESS:
1: -	case BPF_TC_EGRESS:
1: -		if (*parent)
1: -			return -EINVAL;
1: -		*parent = TC_H_MAKE(TC_H_CLSACT,
1: -				    attach_point == BPF_TC_INGRESS ?
1: -				    TC_H_MIN_INGRESS : TC_H_MIN_EGRESS);
1: -		break;
1: -	case BPF_TC_CUSTOM:
1: -		if (!*parent)
1: -			return -EINVAL;
1: -		break;
1: -	default:
1: -		return -EINVAL;
1: -	}
1: -	return 0;
1: +                             __u32 *parent) {
1: +  switch (attach_point) {
1: +  case BPF_TC_INGRESS:
1: +  case BPF_TC_EGRESS:
1: +    if (*parent)
1: +      return -EINVAL;
1: +    *parent = TC_H_MAKE(
1: +        TC_H_CLSACT,
1: +        attach_point == BPF_TC_INGRESS ? TC_H_MIN_INGRESS : TC_H_MIN_EGRESS);
1: +    break;
1: +  case BPF_TC_CUSTOM:
1: +    if (!*parent)
1: +      return -EINVAL;
1: +    break;
1: +  default:
1: +    return -EINVAL;
1: +  }
1: +  return 0;
1:  }
1:  
1: -static int tc_qdisc_modify(struct bpf_tc_hook *hook, int cmd, int flags)
1: -{
1: -	qdisc_config_t config;
1: -	int ret;
1: -	struct {
1: -		struct nlmsghdr nh;
1: -		struct tcmsg tc;
1: -		char buf[256];
1: -	} req;
1: -
1: -	ret = attach_point_to_config(hook, &config);
1: -	if (ret < 0)
1: -		return ret;
1: -
1: -	memset(&req, 0, sizeof(req));
1: -	req.nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct tcmsg));
1: -	req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | flags;
1: -	req.nh.nlmsg_type  = cmd;
1: -	req.tc.tcm_family  = AF_UNSPEC;
1: -	req.tc.tcm_ifindex = OPTS_GET(hook, ifindex, 0);
1: -
1: -	ret = config(&req.nh, &req.tc, sizeof(req));
1: -	if (ret < 0)
1: -		return ret;
1: -
1: -	return libbpf_netlink_send_recv(&req.nh, NULL, NULL, NULL);
1: +static int tc_qdisc_modify(struct bpf_tc_hook *hook, int cmd, int flags) {
1: +  qdisc_config_t config;
1: +  int ret;
1: +  struct {
1: +    struct nlmsghdr nh;
1: +    struct tcmsg tc;
1: +    char buf[256];
1: +  } req;
1: +
1: +  ret = attach_point_to_config(hook, &config);
1: +  if (ret < 0)
1: +    return ret;
1: +
1: +  memset(&req, 0, sizeof(req));
1: +  req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcmsg));
1: +  req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | flags;
1: +  req.nh.nlmsg_type = cmd;
1: +  req.tc.tcm_family = AF_UNSPEC;
1: +  req.tc.tcm_ifindex = OPTS_GET(hook, ifindex, 0);
1: +
1: +  ret = config(&req.nh, &req.tc, sizeof(req));
1: +  if (ret < 0)
1: +    return ret;
1: +
1: +  return libbpf_netlink_send_recv(&req.nh, NULL, NULL, NULL);
1:  }
1:  
1: -static int tc_qdisc_create_excl(struct bpf_tc_hook *hook)
1: -{
1: -	return tc_qdisc_modify(hook, RTM_NEWQDISC, NLM_F_CREATE | NLM_F_EXCL);
1: +static int tc_qdisc_create_excl(struct bpf_tc_hook *hook) {
1: +  return tc_qdisc_modify(hook, RTM_NEWQDISC, NLM_F_CREATE | NLM_F_EXCL);
1:  }
1:  
1: -static int tc_qdisc_delete(struct bpf_tc_hook *hook)
1: -{
1: -	return tc_qdisc_modify(hook, RTM_DELQDISC, 0);
1: +static int tc_qdisc_delete(struct bpf_tc_hook *hook) {
1: +  return tc_qdisc_modify(hook, RTM_DELQDISC, 0);
1:  }
1:  
1: -int bpf_tc_hook_create(struct bpf_tc_hook *hook)
1: -{
1: -	int ret;
1: +int bpf_tc_hook_create(struct bpf_tc_hook *hook) {
1: +  int ret;
1:  
1: -	if (!hook || !OPTS_VALID(hook, bpf_tc_hook) ||
1: -	    OPTS_GET(hook, ifindex, 0) <= 0)
1: -		return libbpf_err(-EINVAL);
1: +  if (!hook || !OPTS_VALID(hook, bpf_tc_hook) ||
1: +      OPTS_GET(hook, ifindex, 0) <= 0)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	ret = tc_qdisc_create_excl(hook);
1: -	return libbpf_err(ret);
1: +  ret = tc_qdisc_create_excl(hook);
1: +  return libbpf_err(ret);
1:  }
1:  
1:  static int __bpf_tc_detach(const struct bpf_tc_hook *hook,
1: -			   const struct bpf_tc_opts *opts,
1: -			   const bool flush);
1: -
1: -int bpf_tc_hook_destroy(struct bpf_tc_hook *hook)
1: -{
1: -	if (!hook || !OPTS_VALID(hook, bpf_tc_hook) ||
1: -	    OPTS_GET(hook, ifindex, 0) <= 0)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	switch (OPTS_GET(hook, attach_point, 0)) {
1: -	case BPF_TC_INGRESS:
1: -	case BPF_TC_EGRESS:
1: -		return libbpf_err(__bpf_tc_detach(hook, NULL, true));
1: -	case BPF_TC_INGRESS | BPF_TC_EGRESS:
1: -		return libbpf_err(tc_qdisc_delete(hook));
1: -	case BPF_TC_CUSTOM:
1: -		return libbpf_err(-EOPNOTSUPP);
1: -	default:
1: -		return libbpf_err(-EINVAL);
1: -	}
1: +                           const struct bpf_tc_opts *opts, const bool flush);
1: +
1: +int bpf_tc_hook_destroy(struct bpf_tc_hook *hook) {
1: +  if (!hook || !OPTS_VALID(hook, bpf_tc_hook) ||
1: +      OPTS_GET(hook, ifindex, 0) <= 0)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  switch (OPTS_GET(hook, attach_point, 0)) {
1: +  case BPF_TC_INGRESS:
1: +  case BPF_TC_EGRESS:
1: +    return libbpf_err(__bpf_tc_detach(hook, NULL, true));
1: +  case BPF_TC_INGRESS | BPF_TC_EGRESS:
1: +    return libbpf_err(tc_qdisc_delete(hook));
1: +  case BPF_TC_CUSTOM:
1: +    return libbpf_err(-EOPNOTSUPP);
1: +  default:
1: +    return libbpf_err(-EINVAL);
1: +  }
1:  }
1:  
1:  struct bpf_cb_ctx {
1: -	struct bpf_tc_opts *opts;
1: -	bool processed;
1: +  struct bpf_tc_opts *opts;
1: +  bool processed;
1:  };
1:  
1:  static int __get_tc_info(void *cookie, struct tcmsg *tc, struct nlattr **tb,
1: -			 bool unicast)
1: -{
1: -	struct nlattr *tbb[TCA_BPF_MAX + 1];
1: -	struct bpf_cb_ctx *info = cookie;
1: -
1: -	if (!info || !info->opts)
1: -		return -EINVAL;
1: -	if (unicast && info->processed)
1: -		return -EINVAL;
1: -	if (!tb[TCA_OPTIONS])
1: -		return NL_CONT;
1: -
1: -	libbpf_nla_parse_nested(tbb, TCA_BPF_MAX, tb[TCA_OPTIONS], NULL);
1: -	if (!tbb[TCA_BPF_ID])
1: -		return -EINVAL;
1: -
1: -	OPTS_SET(info->opts, prog_id, libbpf_nla_getattr_u32(tbb[TCA_BPF_ID]));
1: -	OPTS_SET(info->opts, handle, tc->tcm_handle);
1: -	OPTS_SET(info->opts, priority, TC_H_MAJ(tc->tcm_info) >> 16);
1: -
1: -	info->processed = true;
1: -	return unicast ? NL_NEXT : NL_DONE;
1: +                         bool unicast) {
1: +  struct nlattr *tbb[TCA_BPF_MAX + 1];
1: +  struct bpf_cb_ctx *info = cookie;
1: +
1: +  if (!info || !info->opts)
1: +    return -EINVAL;
1: +  if (unicast && info->processed)
1: +    return -EINVAL;
1: +  if (!tb[TCA_OPTIONS])
1: +    return NL_CONT;
1: +
1: +  libbpf_nla_parse_nested(tbb, TCA_BPF_MAX, tb[TCA_OPTIONS], NULL);
1: +  if (!tbb[TCA_BPF_ID])
1: +    return -EINVAL;
1: +
1: +  OPTS_SET(info->opts, prog_id, libbpf_nla_getattr_u32(tbb[TCA_BPF_ID]));
1: +  OPTS_SET(info->opts, handle, tc->tcm_handle);
1: +  OPTS_SET(info->opts, priority, TC_H_MAJ(tc->tcm_info) >> 16);
1: +
1: +  info->processed = true;
1: +  return unicast ? NL_NEXT : NL_DONE;
1:  }
1:  
1:  static int get_tc_info(struct nlmsghdr *nh, libbpf_dump_nlmsg_t fn,
1: -		       void *cookie)
1: -{
1: -	struct tcmsg *tc = NLMSG_DATA(nh);
1: -	struct nlattr *tb[TCA_MAX + 1];
1: -
1: -	libbpf_nla_parse(tb, TCA_MAX,
1: -			 (struct nlattr *)((char *)tc + NLMSG_ALIGN(sizeof(*tc))),
1: -			 NLMSG_PAYLOAD(nh, sizeof(*tc)), NULL);
1: -	if (!tb[TCA_KIND])
1: -		return NL_CONT;
1: -	return __get_tc_info(cookie, tc, tb, nh->nlmsg_flags & NLM_F_ECHO);
1: +                       void *cookie) {
1: +  struct tcmsg *tc = NLMSG_DATA(nh);
1: +  struct nlattr *tb[TCA_MAX + 1];
1: +
1: +  libbpf_nla_parse(tb, TCA_MAX,
1: +                   (struct nlattr *)((char *)tc + NLMSG_ALIGN(sizeof(*tc))),
1: +                   NLMSG_PAYLOAD(nh, sizeof(*tc)), NULL);
1: +  if (!tb[TCA_KIND])
1: +    return NL_CONT;
1: +  return __get_tc_info(cookie, tc, tb, nh->nlmsg_flags & NLM_F_ECHO);
1:  }
1:  
1: -static int tc_add_fd_and_name(struct nlmsghdr *nh, size_t maxsz, int fd)
1: -{
1: -	struct bpf_prog_info info = {};
1: -	__u32 info_len = sizeof(info);
1: -	char name[256];
1: -	int len, ret;
1: -
1: -	ret = bpf_obj_get_info_by_fd(fd, &info, &info_len);
1: -	if (ret < 0)
1: -		return ret;
1: -
1: -	ret = nlattr_add(nh, maxsz, TCA_BPF_FD, &fd, sizeof(fd));
1: -	if (ret < 0)
1: -		return ret;
1: -	len = snprintf(name, sizeof(name), "%s:[%u]", info.name, info.id);
1: -	if (len < 0)
1: -		return -errno;
1: -	if (len >= sizeof(name))
1: -		return -ENAMETOOLONG;
1: -	return nlattr_add(nh, maxsz, TCA_BPF_NAME, name, len + 1);
1: +static int tc_add_fd_and_name(struct nlmsghdr *nh, size_t maxsz, int fd) {
1: +  struct bpf_prog_info info = {};
1: +  __u32 info_len = sizeof(info);
1: +  char name[256];
1: +  int len, ret;
1: +
1: +  ret = bpf_obj_get_info_by_fd(fd, &info, &info_len);
1: +  if (ret < 0)
1: +    return ret;
1: +
1: +  ret = nlattr_add(nh, maxsz, TCA_BPF_FD, &fd, sizeof(fd));
1: +  if (ret < 0)
1: +    return ret;
1: +  len = snprintf(name, sizeof(name), "%s:[%u]", info.name, info.id);
1: +  if (len < 0)
1: +    return -errno;
1: +  if (len >= sizeof(name))
1: +    return -ENAMETOOLONG;
1: +  return nlattr_add(nh, maxsz, TCA_BPF_NAME, name, len + 1);
1:  }
1:  
1: -int bpf_tc_attach(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts)
1: -{
1: -	__u32 protocol, bpf_flags, handle, priority, parent, prog_id, flags;
1: -	int ret, ifindex, attach_point, prog_fd;
1: -	struct bpf_cb_ctx info = {};
1: -	struct nlattr *nla;
1: -	struct {
1: -		struct nlmsghdr nh;
1: -		struct tcmsg tc;
1: -		char buf[256];
1: -	} req;
1: -
1: -	if (!hook || !opts ||
1: -	    !OPTS_VALID(hook, bpf_tc_hook) ||
1: -	    !OPTS_VALID(opts, bpf_tc_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	ifindex      = OPTS_GET(hook, ifindex, 0);
1: -	parent       = OPTS_GET(hook, parent, 0);
1: -	attach_point = OPTS_GET(hook, attach_point, 0);
1: -
1: -	handle       = OPTS_GET(opts, handle, 0);
1: -	priority     = OPTS_GET(opts, priority, 0);
1: -	prog_fd      = OPTS_GET(opts, prog_fd, 0);
1: -	prog_id      = OPTS_GET(opts, prog_id, 0);
1: -	flags        = OPTS_GET(opts, flags, 0);
1: -
1: -	if (ifindex <= 0 || !prog_fd || prog_id)
1: -		return libbpf_err(-EINVAL);
1: -	if (priority > UINT16_MAX)
1: -		return libbpf_err(-EINVAL);
1: -	if (flags & ~BPF_TC_F_REPLACE)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	flags = (flags & BPF_TC_F_REPLACE) ? NLM_F_REPLACE : NLM_F_EXCL;
1: -	protocol = ETH_P_ALL;
1: -
1: -	memset(&req, 0, sizeof(req));
1: -	req.nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct tcmsg));
1: -	req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE |
1: -			     NLM_F_ECHO | flags;
1: -	req.nh.nlmsg_type  = RTM_NEWTFILTER;
1: -	req.tc.tcm_family  = AF_UNSPEC;
1: -	req.tc.tcm_ifindex = ifindex;
1: -	req.tc.tcm_handle  = handle;
1: -	req.tc.tcm_info    = TC_H_MAKE(priority << 16, htons(protocol));
1: -
1: -	ret = tc_get_tcm_parent(attach_point, &parent);
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	req.tc.tcm_parent = parent;
1: -
1: -	ret = nlattr_add(&req.nh, sizeof(req), TCA_KIND, "bpf", sizeof("bpf"));
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	nla = nlattr_begin_nested(&req.nh, sizeof(req), TCA_OPTIONS);
1: -	if (!nla)
1: -		return libbpf_err(-EMSGSIZE);
1: -	ret = tc_add_fd_and_name(&req.nh, sizeof(req), prog_fd);
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	bpf_flags = TCA_BPF_FLAG_ACT_DIRECT;
1: -	ret = nlattr_add(&req.nh, sizeof(req), TCA_BPF_FLAGS, &bpf_flags,
1: -			 sizeof(bpf_flags));
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	nlattr_end_nested(&req.nh, nla);
1: -
1: -	info.opts = opts;
1: -
1: -	ret = libbpf_netlink_send_recv(&req.nh, get_tc_info, NULL, &info);
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	if (!info.processed)
1: -		return libbpf_err(-ENOENT);
1: -	return ret;
1: +int bpf_tc_attach(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts) {
1: +  __u32 protocol, bpf_flags, handle, priority, parent, prog_id, flags;
1: +  int ret, ifindex, attach_point, prog_fd;
1: +  struct bpf_cb_ctx info = {};
1: +  struct nlattr *nla;
1: +  struct {
1: +    struct nlmsghdr nh;
1: +    struct tcmsg tc;
1: +    char buf[256];
1: +  } req;
1: +
1: +  if (!hook || !opts || !OPTS_VALID(hook, bpf_tc_hook) ||
1: +      !OPTS_VALID(opts, bpf_tc_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  ifindex = OPTS_GET(hook, ifindex, 0);
1: +  parent = OPTS_GET(hook, parent, 0);
1: +  attach_point = OPTS_GET(hook, attach_point, 0);
1: +
1: +  handle = OPTS_GET(opts, handle, 0);
1: +  priority = OPTS_GET(opts, priority, 0);
1: +  prog_fd = OPTS_GET(opts, prog_fd, 0);
1: +  prog_id = OPTS_GET(opts, prog_id, 0);
1: +  flags = OPTS_GET(opts, flags, 0);
1: +
1: +  if (ifindex <= 0 || !prog_fd || prog_id)
1: +    return libbpf_err(-EINVAL);
1: +  if (priority > UINT16_MAX)
1: +    return libbpf_err(-EINVAL);
1: +  if (flags & ~BPF_TC_F_REPLACE)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  flags = (flags & BPF_TC_F_REPLACE) ? NLM_F_REPLACE : NLM_F_EXCL;
1: +  protocol = ETH_P_ALL;
1: +
1: +  memset(&req, 0, sizeof(req));
1: +  req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcmsg));
1: +  req.nh.nlmsg_flags =
1: +      NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE | NLM_F_ECHO | flags;
1: +  req.nh.nlmsg_type = RTM_NEWTFILTER;
1: +  req.tc.tcm_family = AF_UNSPEC;
1: +  req.tc.tcm_ifindex = ifindex;
1: +  req.tc.tcm_handle = handle;
1: +  req.tc.tcm_info = TC_H_MAKE(priority << 16, htons(protocol));
1: +
1: +  ret = tc_get_tcm_parent(attach_point, &parent);
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  req.tc.tcm_parent = parent;
1: +
1: +  ret = nlattr_add(&req.nh, sizeof(req), TCA_KIND, "bpf", sizeof("bpf"));
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  nla = nlattr_begin_nested(&req.nh, sizeof(req), TCA_OPTIONS);
1: +  if (!nla)
1: +    return libbpf_err(-EMSGSIZE);
1: +  ret = tc_add_fd_and_name(&req.nh, sizeof(req), prog_fd);
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  bpf_flags = TCA_BPF_FLAG_ACT_DIRECT;
1: +  ret = nlattr_add(&req.nh, sizeof(req), TCA_BPF_FLAGS, &bpf_flags,
1: +                   sizeof(bpf_flags));
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  nlattr_end_nested(&req.nh, nla);
1: +
1: +  info.opts = opts;
1: +
1: +  ret = libbpf_netlink_send_recv(&req.nh, get_tc_info, NULL, &info);
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  if (!info.processed)
1: +    return libbpf_err(-ENOENT);
1: +  return ret;
1:  }
1:  
1:  static int __bpf_tc_detach(const struct bpf_tc_hook *hook,
1: -			   const struct bpf_tc_opts *opts,
1: -			   const bool flush)
1: -{
1: -	__u32 protocol = 0, handle, priority, parent, prog_id, flags;
1: -	int ret, ifindex, attach_point, prog_fd;
1: -	struct {
1: -		struct nlmsghdr nh;
1: -		struct tcmsg tc;
1: -		char buf[256];
1: -	} req;
1: -
1: -	if (!hook ||
1: -	    !OPTS_VALID(hook, bpf_tc_hook) ||
1: -	    !OPTS_VALID(opts, bpf_tc_opts))
1: -		return -EINVAL;
1: -
1: -	ifindex      = OPTS_GET(hook, ifindex, 0);
1: -	parent       = OPTS_GET(hook, parent, 0);
1: -	attach_point = OPTS_GET(hook, attach_point, 0);
1: -
1: -	handle       = OPTS_GET(opts, handle, 0);
1: -	priority     = OPTS_GET(opts, priority, 0);
1: -	prog_fd      = OPTS_GET(opts, prog_fd, 0);
1: -	prog_id      = OPTS_GET(opts, prog_id, 0);
1: -	flags        = OPTS_GET(opts, flags, 0);
1: -
1: -	if (ifindex <= 0 || flags || prog_fd || prog_id)
1: -		return -EINVAL;
1: -	if (priority > UINT16_MAX)
1: -		return -EINVAL;
1: -	if (!flush) {
1: -		if (!handle || !priority)
1: -			return -EINVAL;
1: -		protocol = ETH_P_ALL;
1: -	} else {
1: -		if (handle || priority)
1: -			return -EINVAL;
1: -	}
1: -
1: -	memset(&req, 0, sizeof(req));
1: -	req.nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct tcmsg));
1: -	req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
1: -	req.nh.nlmsg_type  = RTM_DELTFILTER;
1: -	req.tc.tcm_family  = AF_UNSPEC;
1: -	req.tc.tcm_ifindex = ifindex;
1: -	if (!flush) {
1: -		req.tc.tcm_handle = handle;
1: -		req.tc.tcm_info   = TC_H_MAKE(priority << 16, htons(protocol));
1: -	}
1: -
1: -	ret = tc_get_tcm_parent(attach_point, &parent);
1: -	if (ret < 0)
1: -		return ret;
1: -	req.tc.tcm_parent = parent;
1: -
1: -	if (!flush) {
1: -		ret = nlattr_add(&req.nh, sizeof(req), TCA_KIND,
1: -				 "bpf", sizeof("bpf"));
1: -		if (ret < 0)
1: -			return ret;
1: -	}
1: -
1: -	return libbpf_netlink_send_recv(&req.nh, NULL, NULL, NULL);
1: +                           const struct bpf_tc_opts *opts, const bool flush) {
1: +  __u32 protocol = 0, handle, priority, parent, prog_id, flags;
1: +  int ret, ifindex, attach_point, prog_fd;
1: +  struct {
1: +    struct nlmsghdr nh;
1: +    struct tcmsg tc;
1: +    char buf[256];
1: +  } req;
1: +
1: +  if (!hook || !OPTS_VALID(hook, bpf_tc_hook) || !OPTS_VALID(opts, bpf_tc_opts))
1: +    return -EINVAL;
1: +
1: +  ifindex = OPTS_GET(hook, ifindex, 0);
1: +  parent = OPTS_GET(hook, parent, 0);
1: +  attach_point = OPTS_GET(hook, attach_point, 0);
1: +
1: +  handle = OPTS_GET(opts, handle, 0);
1: +  priority = OPTS_GET(opts, priority, 0);
1: +  prog_fd = OPTS_GET(opts, prog_fd, 0);
1: +  prog_id = OPTS_GET(opts, prog_id, 0);
1: +  flags = OPTS_GET(opts, flags, 0);
1: +
1: +  if (ifindex <= 0 || flags || prog_fd || prog_id)
1: +    return -EINVAL;
1: +  if (priority > UINT16_MAX)
1: +    return -EINVAL;
1: +  if (!flush) {
1: +    if (!handle || !priority)
1: +      return -EINVAL;
1: +    protocol = ETH_P_ALL;
1: +  } else {
1: +    if (handle || priority)
1: +      return -EINVAL;
1: +  }
1: +
1: +  memset(&req, 0, sizeof(req));
1: +  req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcmsg));
1: +  req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
1: +  req.nh.nlmsg_type = RTM_DELTFILTER;
1: +  req.tc.tcm_family = AF_UNSPEC;
1: +  req.tc.tcm_ifindex = ifindex;
1: +  if (!flush) {
1: +    req.tc.tcm_handle = handle;
1: +    req.tc.tcm_info = TC_H_MAKE(priority << 16, htons(protocol));
1: +  }
1: +
1: +  ret = tc_get_tcm_parent(attach_point, &parent);
1: +  if (ret < 0)
1: +    return ret;
1: +  req.tc.tcm_parent = parent;
1: +
1: +  if (!flush) {
1: +    ret = nlattr_add(&req.nh, sizeof(req), TCA_KIND, "bpf", sizeof("bpf"));
1: +    if (ret < 0)
1: +      return ret;
1: +  }
1: +
1: +  return libbpf_netlink_send_recv(&req.nh, NULL, NULL, NULL);
1:  }
1:  
1:  int bpf_tc_detach(const struct bpf_tc_hook *hook,
1: -		  const struct bpf_tc_opts *opts)
1: -{
1: -	int ret;
1: +                  const struct bpf_tc_opts *opts) {
1: +  int ret;
1:  
1: -	if (!opts)
1: -		return libbpf_err(-EINVAL);
1: +  if (!opts)
1: +    return libbpf_err(-EINVAL);
1:  
1: -	ret = __bpf_tc_detach(hook, opts, false);
1: -	return libbpf_err(ret);
1: +  ret = __bpf_tc_detach(hook, opts, false);
1: +  return libbpf_err(ret);
1:  }
1:  
1: -int bpf_tc_query(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts)
1: -{
1: -	__u32 protocol, handle, priority, parent, prog_id, flags;
1: -	int ret, ifindex, attach_point, prog_fd;
1: -	struct bpf_cb_ctx info = {};
1: -	struct {
1: -		struct nlmsghdr nh;
1: -		struct tcmsg tc;
1: -		char buf[256];
1: -	} req;
1: -
1: -	if (!hook || !opts ||
1: -	    !OPTS_VALID(hook, bpf_tc_hook) ||
1: -	    !OPTS_VALID(opts, bpf_tc_opts))
1: -		return libbpf_err(-EINVAL);
1: -
1: -	ifindex      = OPTS_GET(hook, ifindex, 0);
1: -	parent       = OPTS_GET(hook, parent, 0);
1: -	attach_point = OPTS_GET(hook, attach_point, 0);
1: -
1: -	handle       = OPTS_GET(opts, handle, 0);
1: -	priority     = OPTS_GET(opts, priority, 0);
1: -	prog_fd      = OPTS_GET(opts, prog_fd, 0);
1: -	prog_id      = OPTS_GET(opts, prog_id, 0);
1: -	flags        = OPTS_GET(opts, flags, 0);
1: -
1: -	if (ifindex <= 0 || flags || prog_fd || prog_id ||
1: -	    !handle || !priority)
1: -		return libbpf_err(-EINVAL);
1: -	if (priority > UINT16_MAX)
1: -		return libbpf_err(-EINVAL);
1: -
1: -	protocol = ETH_P_ALL;
1: -
1: -	memset(&req, 0, sizeof(req));
1: -	req.nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct tcmsg));
1: -	req.nh.nlmsg_flags = NLM_F_REQUEST;
1: -	req.nh.nlmsg_type  = RTM_GETTFILTER;
1: -	req.tc.tcm_family  = AF_UNSPEC;
1: -	req.tc.tcm_ifindex = ifindex;
1: -	req.tc.tcm_handle  = handle;
1: -	req.tc.tcm_info    = TC_H_MAKE(priority << 16, htons(protocol));
1: -
1: -	ret = tc_get_tcm_parent(attach_point, &parent);
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	req.tc.tcm_parent = parent;
1: -
1: -	ret = nlattr_add(&req.nh, sizeof(req), TCA_KIND, "bpf", sizeof("bpf"));
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -
1: -	info.opts = opts;
1: -
1: -	ret = libbpf_netlink_send_recv(&req.nh, get_tc_info, NULL, &info);
1: -	if (ret < 0)
1: -		return libbpf_err(ret);
1: -	if (!info.processed)
1: -		return libbpf_err(-ENOENT);
1: -	return ret;
1: +int bpf_tc_query(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts) {
1: +  __u32 protocol, handle, priority, parent, prog_id, flags;
1: +  int ret, ifindex, attach_point, prog_fd;
1: +  struct bpf_cb_ctx info = {};
1: +  struct {
1: +    struct nlmsghdr nh;
1: +    struct tcmsg tc;
1: +    char buf[256];
1: +  } req;
1: +
1: +  if (!hook || !opts || !OPTS_VALID(hook, bpf_tc_hook) ||
1: +      !OPTS_VALID(opts, bpf_tc_opts))
1: +    return libbpf_err(-EINVAL);
1: +
1: +  ifindex = OPTS_GET(hook, ifindex, 0);
1: +  parent = OPTS_GET(hook, parent, 0);
1: +  attach_point = OPTS_GET(hook, attach_point, 0);
1: +
1: +  handle = OPTS_GET(opts, handle, 0);
1: +  priority = OPTS_GET(opts, priority, 0);
1: +  prog_fd = OPTS_GET(opts, prog_fd, 0);
1: +  prog_id = OPTS_GET(opts, prog_id, 0);
1: +  flags = OPTS_GET(opts, flags, 0);
1: +
1: +  if (ifindex <= 0 || flags || prog_fd || prog_id || !handle || !priority)
1: +    return libbpf_err(-EINVAL);
1: +  if (priority > UINT16_MAX)
1: +    return libbpf_err(-EINVAL);
1: +
1: +  protocol = ETH_P_ALL;
1: +
1: +  memset(&req, 0, sizeof(req));
1: +  req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcmsg));
1: +  req.nh.nlmsg_flags = NLM_F_REQUEST;
1: +  req.nh.nlmsg_type = RTM_GETTFILTER;
1: +  req.tc.tcm_family = AF_UNSPEC;
1: +  req.tc.tcm_ifindex = ifindex;
1: +  req.tc.tcm_handle = handle;
1: +  req.tc.tcm_info = TC_H_MAKE(priority << 16, htons(protocol));
1: +
1: +  ret = tc_get_tcm_parent(attach_point, &parent);
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  req.tc.tcm_parent = parent;
1: +
1: +  ret = nlattr_add(&req.nh, sizeof(req), TCA_KIND, "bpf", sizeof("bpf"));
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +
1: +  info.opts = opts;
1: +
1: +  ret = libbpf_netlink_send_recv(&req.nh, get_tc_info, NULL, &info);
1: +  if (ret < 0)
1: +    return libbpf_err(ret);
1: +  if (!info.processed)
1: +    return libbpf_err(-ENOENT);
1: +  return ret;
1:  }
1: diff --git a/src/cc/libbpf/src/nlattr.c b/src/cc/libbpf/src/nlattr.c
1: index b607fa98..51ef2aa7 100644
1: --- a/src/cc/libbpf/src/nlattr.c
1: +++ b/src/cc/libbpf/src/nlattr.c
1: @@ -6,81 +6,75 @@
1:   * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
1:   */
1:  
1: +#include "nlattr.h"
1:  #include <errno.h>
1: -#include <string.h>
1: -#include <stdio.h>
1:  #include <linux/rtnetlink.h>
1: -#include "nlattr.h"
1: +#include <stdio.h>
1: +#include <string.h>
1:  #include "libbpf_internal.h"
1:  
1: -static uint16_t nla_attr_minlen[LIBBPF_NLA_TYPE_MAX+1] = {
1: -	[LIBBPF_NLA_U8]		= sizeof(uint8_t),
1: -	[LIBBPF_NLA_U16]	= sizeof(uint16_t),
1: -	[LIBBPF_NLA_U32]	= sizeof(uint32_t),
1: -	[LIBBPF_NLA_U64]	= sizeof(uint64_t),
1: -	[LIBBPF_NLA_STRING]	= 1,
1: -	[LIBBPF_NLA_FLAG]	= 0,
1: +static uint16_t nla_attr_minlen[LIBBPF_NLA_TYPE_MAX + 1] = {
1: +        [LIBBPF_NLA_U8] = sizeof(uint8_t),
1: +        [LIBBPF_NLA_U16] = sizeof(uint16_t),
1: +        [LIBBPF_NLA_U32] = sizeof(uint32_t),
1: +        [LIBBPF_NLA_U64] = sizeof(uint64_t),
1: +        [LIBBPF_NLA_STRING] = 1,
1: +        [LIBBPF_NLA_FLAG] = 0,
1:  };
1:  
1: -static struct nlattr *nla_next(const struct nlattr *nla, int *remaining)
1: -{
1: -	int totlen = NLA_ALIGN(nla->nla_len);
1: +static struct nlattr *nla_next(const struct nlattr *nla, int *remaining) {
1: +  int totlen = NLA_ALIGN(nla->nla_len);
1:  
1: -	*remaining -= totlen;
1: -	return (struct nlattr *) ((char *) nla + totlen);
1: +  *remaining -= totlen;
1: +  return (struct nlattr *)((char *)nla + totlen);
1:  }
1:  
1: -static int nla_ok(const struct nlattr *nla, int remaining)
1: -{
1: -	return remaining >= sizeof(*nla) &&
1: -	       nla->nla_len >= sizeof(*nla) &&
1: -	       nla->nla_len <= remaining;
1: +static int nla_ok(const struct nlattr *nla, int remaining) {
1: +  return remaining >= sizeof(*nla) && nla->nla_len >= sizeof(*nla) &&
1: +         nla->nla_len <= remaining;
1:  }
1:  
1: -static int nla_type(const struct nlattr *nla)
1: -{
1: -	return nla->nla_type & NLA_TYPE_MASK;
1: +static int nla_type(const struct nlattr *nla) {
1: +  return nla->nla_type & NLA_TYPE_MASK;
1:  }
1:  
1:  static int validate_nla(struct nlattr *nla, int maxtype,
1: -			struct libbpf_nla_policy *policy)
1: -{
1: -	struct libbpf_nla_policy *pt;
1: -	unsigned int minlen = 0;
1: -	int type = nla_type(nla);
1: +                        struct libbpf_nla_policy *policy) {
1: +  struct libbpf_nla_policy *pt;
1: +  unsigned int minlen = 0;
1: +  int type = nla_type(nla);
1:  
1: -	if (type < 0 || type > maxtype)
1: -		return 0;
1: +  if (type < 0 || type > maxtype)
1: +    return 0;
1:  
1: -	pt = &policy[type];
1: +  pt = &policy[type];
1:  
1: -	if (pt->type > LIBBPF_NLA_TYPE_MAX)
1: -		return 0;
1: +  if (pt->type > LIBBPF_NLA_TYPE_MAX)
1: +    return 0;
1:  
1: -	if (pt->minlen)
1: -		minlen = pt->minlen;
1: -	else if (pt->type != LIBBPF_NLA_UNSPEC)
1: -		minlen = nla_attr_minlen[pt->type];
1: +  if (pt->minlen)
1: +    minlen = pt->minlen;
1: +  else if (pt->type != LIBBPF_NLA_UNSPEC)
1: +    minlen = nla_attr_minlen[pt->type];
1:  
1: -	if (libbpf_nla_len(nla) < minlen)
1: -		return -1;
1: +  if (libbpf_nla_len(nla) < minlen)
1: +    return -1;
1:  
1: -	if (pt->maxlen && libbpf_nla_len(nla) > pt->maxlen)
1: -		return -1;
1: +  if (pt->maxlen && libbpf_nla_len(nla) > pt->maxlen)
1: +    return -1;
1:  
1: -	if (pt->type == LIBBPF_NLA_STRING) {
1: -		char *data = libbpf_nla_data(nla);
1: +  if (pt->type == LIBBPF_NLA_STRING) {
1: +    char *data = libbpf_nla_data(nla);
1:  
1: -		if (data[libbpf_nla_len(nla) - 1] != '\0')
1: -			return -1;
1: -	}
1: +    if (data[libbpf_nla_len(nla) - 1] != '\0')
1: +      return -1;
1: +  }
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static inline int nlmsg_len(const struct nlmsghdr *nlh)
1: -{
1: -	return nlh->nlmsg_len - NLMSG_HDRLEN;
1: +static inline int nlmsg_len(const struct nlmsghdr *nlh) {
1: +  return nlh->nlmsg_len - NLMSG_HDRLEN;
1:  }
1:  
1:  /**
1: @@ -102,35 +96,36 @@ static inline int nlmsg_len(const struct nlmsghdr *nlh)
1:   * @return 0 on success or a negative error code.
1:   */
1:  int libbpf_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head,
1: -		     int len, struct libbpf_nla_policy *policy)
1: -{
1: -	struct nlattr *nla;
1: -	int rem, err;
1: +                     int len, struct libbpf_nla_policy *policy) {
1: +  struct nlattr *nla;
1: +  int rem, err;
1:  
1: -	memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));
1: +  memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));
1:  
1: -	libbpf_nla_for_each_attr(nla, head, len, rem) {
1: -		int type = nla_type(nla);
1: +  libbpf_nla_for_each_attr(nla, head, len, rem) {
1: +    int type = nla_type(nla);
1:  
1: -		if (type > maxtype)
1: -			continue;
1: +    if (type > maxtype)
1: +      continue;
1:  
1: -		if (policy) {
1: -			err = validate_nla(nla, maxtype, policy);
1: -			if (err < 0)
1: -				goto errout;
1: -		}
1: +    if (policy) {
1: +      err = validate_nla(nla, maxtype, policy);
1: +      if (err < 0)
1: +        goto errout;
1: +    }
1:  
1: -		if (tb[type])
1: -			pr_warn("Attribute of type %#x found multiple times in message, "
1: -				"previous attribute is being ignored.\n", type);
1: +    if (tb[type])
1: +      pr_warn(
1: +          "Attribute of type %#x found multiple times in message, "
1: +          "previous attribute is being ignored.\n",
1: +          type);
1:  
1: -		tb[type] = nla;
1: -	}
1: +    tb[type] = nla;
1: +  }
1:  
1: -	err = 0;
1: +  err = 0;
1:  errout:
1: -	return err;
1: +  return err;
1:  }
1:  
1:  /**
1: @@ -147,49 +142,46 @@ errout:
1:   * @return 0 on success or a negative error code.
1:   */
1:  int libbpf_nla_parse_nested(struct nlattr *tb[], int maxtype,
1: -			    struct nlattr *nla,
1: -			    struct libbpf_nla_policy *policy)
1: -{
1: -	return libbpf_nla_parse(tb, maxtype, libbpf_nla_data(nla),
1: -				libbpf_nla_len(nla), policy);
1: +                            struct nlattr *nla,
1: +                            struct libbpf_nla_policy *policy) {
1: +  return libbpf_nla_parse(tb, maxtype, libbpf_nla_data(nla),
1: +                          libbpf_nla_len(nla), policy);
1:  }
1:  
1:  /* dump netlink extended ack error message */
1: -int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh)
1: -{
1: -	struct libbpf_nla_policy extack_policy[NLMSGERR_ATTR_MAX + 1] = {
1: -		[NLMSGERR_ATTR_MSG]	= { .type = LIBBPF_NLA_STRING },
1: -		[NLMSGERR_ATTR_OFFS]	= { .type = LIBBPF_NLA_U32 },
1: -	};
1: -	struct nlattr *tb[NLMSGERR_ATTR_MAX + 1], *attr;
1: -	struct nlmsgerr *err;
1: -	char *errmsg = NULL;
1: -	int hlen, alen;
1: -
1: -	/* no TLVs, nothing to do here */
1: -	if (!(nlh->nlmsg_flags & NLM_F_ACK_TLVS))
1: -		return 0;
1: -
1: -	err = (struct nlmsgerr *)NLMSG_DATA(nlh);
1: -	hlen = sizeof(*err);
1: -
1: -	/* if NLM_F_CAPPED is set then the inner err msg was capped */
1: -	if (!(nlh->nlmsg_flags & NLM_F_CAPPED))
1: -		hlen += nlmsg_len(&err->msg);
1: -
1: -	attr = (struct nlattr *) ((void *) err + hlen);
1: -	alen = nlh->nlmsg_len - hlen;
1: -
1: -	if (libbpf_nla_parse(tb, NLMSGERR_ATTR_MAX, attr, alen,
1: -			     extack_policy) != 0) {
1: -		pr_warn("Failed to parse extended error attributes\n");
1: -		return 0;
1: -	}
1: -
1: -	if (tb[NLMSGERR_ATTR_MSG])
1: -		errmsg = (char *) libbpf_nla_data(tb[NLMSGERR_ATTR_MSG]);
1: -
1: -	pr_warn("Kernel error message: %s\n", errmsg);
1: -
1: -	return 0;
1: +int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh) {
1: +  struct libbpf_nla_policy extack_policy[NLMSGERR_ATTR_MAX + 1] = {
1: +          [NLMSGERR_ATTR_MSG] = {.type = LIBBPF_NLA_STRING},
1: +          [NLMSGERR_ATTR_OFFS] = {.type = LIBBPF_NLA_U32},
1: +  };
1: +  struct nlattr *tb[NLMSGERR_ATTR_MAX + 1], *attr;
1: +  struct nlmsgerr *err;
1: +  char *errmsg = NULL;
1: +  int hlen, alen;
1: +
1: +  /* no TLVs, nothing to do here */
1: +  if (!(nlh->nlmsg_flags & NLM_F_ACK_TLVS))
1: +    return 0;
1: +
1: +  err = (struct nlmsgerr *)NLMSG_DATA(nlh);
1: +  hlen = sizeof(*err);
1: +
1: +  /* if NLM_F_CAPPED is set then the inner err msg was capped */
1: +  if (!(nlh->nlmsg_flags & NLM_F_CAPPED))
1: +    hlen += nlmsg_len(&err->msg);
1: +
1: +  attr = (struct nlattr *)((void *)err + hlen);
1: +  alen = nlh->nlmsg_len - hlen;
1: +
1: +  if (libbpf_nla_parse(tb, NLMSGERR_ATTR_MAX, attr, alen, extack_policy) != 0) {
1: +    pr_warn("Failed to parse extended error attributes\n");
1: +    return 0;
1: +  }
1: +
1: +  if (tb[NLMSGERR_ATTR_MSG])
1: +    errmsg = (char *)libbpf_nla_data(tb[NLMSGERR_ATTR_MSG]);
1: +
1: +  pr_warn("Kernel error message: %s\n", errmsg);
1: +
1: +  return 0;
1:  }
1: diff --git a/src/cc/libbpf/src/nlattr.h b/src/cc/libbpf/src/nlattr.h
1: index 3c780ab6..897b95ee 100644
1: --- a/src/cc/libbpf/src/nlattr.h
1: +++ b/src/cc/libbpf/src/nlattr.h
1: @@ -9,10 +9,10 @@
1:  #ifndef __LIBBPF_NLATTR_H
1:  #define __LIBBPF_NLATTR_H
1:  
1: -#include <stdint.h>
1: -#include <string.h>
1:  #include <errno.h>
1:  #include <linux/netlink.h>
1: +#include <stdint.h>
1: +#include <string.h>
1:  
1:  /* avoid multiple definition of netlink features */
1:  #define __LINUX_NETLINK_H
1: @@ -21,16 +21,16 @@
1:   * Standard attribute types to specify validation policy
1:   */
1:  enum {
1: -	LIBBPF_NLA_UNSPEC,	/**< Unspecified type, binary data chunk */
1: -	LIBBPF_NLA_U8,		/**< 8 bit integer */
1: -	LIBBPF_NLA_U16,		/**< 16 bit integer */
1: -	LIBBPF_NLA_U32,		/**< 32 bit integer */
1: -	LIBBPF_NLA_U64,		/**< 64 bit integer */
1: -	LIBBPF_NLA_STRING,	/**< NUL terminated character string */
1: -	LIBBPF_NLA_FLAG,	/**< Flag */
1: -	LIBBPF_NLA_MSECS,	/**< Micro seconds (64bit) */
1: -	LIBBPF_NLA_NESTED,	/**< Nested attributes */
1: -	__LIBBPF_NLA_TYPE_MAX,
1: +  LIBBPF_NLA_UNSPEC, /**< Unspecified type, binary data chunk */
1: +  LIBBPF_NLA_U8,     /**< 8 bit integer */
1: +  LIBBPF_NLA_U16,    /**< 16 bit integer */
1: +  LIBBPF_NLA_U32,    /**< 32 bit integer */
1: +  LIBBPF_NLA_U64,    /**< 64 bit integer */
1: +  LIBBPF_NLA_STRING, /**< NUL terminated character string */
1: +  LIBBPF_NLA_FLAG,   /**< Flag */
1: +  LIBBPF_NLA_MSECS,  /**< Micro seconds (64bit) */
1: +  LIBBPF_NLA_NESTED, /**< Nested attributes */
1: +  __LIBBPF_NLA_TYPE_MAX,
1:  };
1:  
1:  #define LIBBPF_NLA_TYPE_MAX (__LIBBPF_NLA_TYPE_MAX - 1)
1: @@ -42,14 +42,14 @@ enum {
1:   * See section @core_doc{core_attr_parse,Attribute Parsing} for more details.
1:   */
1:  struct libbpf_nla_policy {
1: -	/** Type of attribute or LIBBPF_NLA_UNSPEC */
1: -	uint16_t	type;
1: +  /** Type of attribute or LIBBPF_NLA_UNSPEC */
1: +  uint16_t type;
1:  
1: -	/** Minimal length of payload required */
1: -	uint16_t	minlen;
1: +  /** Minimal length of payload required */
1: +  uint16_t minlen;
1:  
1: -	/** Maximal length of payload allowed */
1: -	uint16_t	maxlen;
1: +  /** Maximal length of payload allowed */
1: +  uint16_t maxlen;
1:  };
1:  
1:  /**
1: @@ -61,94 +61,82 @@ struct libbpf_nla_policy {
1:   * @arg rem	initialized to len, holds bytes currently remaining in stream
1:   */
1:  #define libbpf_nla_for_each_attr(pos, head, len, rem) \
1: -	for (pos = head, rem = len; \
1: -	     nla_ok(pos, rem); \
1: -	     pos = nla_next(pos, &(rem)))
1: +  for (pos = head, rem = len; nla_ok(pos, rem); pos = nla_next(pos, &(rem)))
1:  
1:  /**
1:   * libbpf_nla_data - head of payload
1:   * @nla: netlink attribute
1:   */
1: -static inline void *libbpf_nla_data(const struct nlattr *nla)
1: -{
1: -	return (char *) nla + NLA_HDRLEN;
1: +static inline void *libbpf_nla_data(const struct nlattr *nla) {
1: +  return (char *)nla + NLA_HDRLEN;
1:  }
1:  
1: -static inline uint8_t libbpf_nla_getattr_u8(const struct nlattr *nla)
1: -{
1: -	return *(uint8_t *)libbpf_nla_data(nla);
1: +static inline uint8_t libbpf_nla_getattr_u8(const struct nlattr *nla) {
1: +  return *(uint8_t *)libbpf_nla_data(nla);
1:  }
1:  
1: -static inline uint32_t libbpf_nla_getattr_u32(const struct nlattr *nla)
1: -{
1: -	return *(uint32_t *)libbpf_nla_data(nla);
1: +static inline uint32_t libbpf_nla_getattr_u32(const struct nlattr *nla) {
1: +  return *(uint32_t *)libbpf_nla_data(nla);
1:  }
1:  
1: -static inline const char *libbpf_nla_getattr_str(const struct nlattr *nla)
1: -{
1: -	return (const char *)libbpf_nla_data(nla);
1: +static inline const char *libbpf_nla_getattr_str(const struct nlattr *nla) {
1: +  return (const char *)libbpf_nla_data(nla);
1:  }
1:  
1:  /**
1:   * libbpf_nla_len - length of payload
1:   * @nla: netlink attribute
1:   */
1: -static inline int libbpf_nla_len(const struct nlattr *nla)
1: -{
1: -	return nla->nla_len - NLA_HDRLEN;
1: +static inline int libbpf_nla_len(const struct nlattr *nla) {
1: +  return nla->nla_len - NLA_HDRLEN;
1:  }
1:  
1:  int libbpf_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head,
1: -		     int len, struct libbpf_nla_policy *policy);
1: +                     int len, struct libbpf_nla_policy *policy);
1:  int libbpf_nla_parse_nested(struct nlattr *tb[], int maxtype,
1: -			    struct nlattr *nla,
1: -			    struct libbpf_nla_policy *policy);
1: +                            struct nlattr *nla,
1: +                            struct libbpf_nla_policy *policy);
1:  
1:  int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh);
1:  
1: -static inline struct nlattr *nla_data(struct nlattr *nla)
1: -{
1: -	return (struct nlattr *)((char *)nla + NLA_HDRLEN);
1: +static inline struct nlattr *nla_data(struct nlattr *nla) {
1: +  return (struct nlattr *)((char *)nla + NLA_HDRLEN);
1:  }
1:  
1: -static inline struct nlattr *nh_tail(struct nlmsghdr *nh)
1: -{
1: -	return (struct nlattr *)((char *)nh + NLMSG_ALIGN(nh->nlmsg_len));
1: +static inline struct nlattr *nh_tail(struct nlmsghdr *nh) {
1: +  return (struct nlattr *)((char *)nh + NLMSG_ALIGN(nh->nlmsg_len));
1:  }
1:  
1:  static inline int nlattr_add(struct nlmsghdr *nh, size_t maxsz, int type,
1: -			     const void *data, int len)
1: -{
1: -	struct nlattr *nla;
1: -
1: -	if (NLMSG_ALIGN(nh->nlmsg_len) + NLA_ALIGN(NLA_HDRLEN + len) > maxsz)
1: -		return -EMSGSIZE;
1: -	if (!!data != !!len)
1: -		return -EINVAL;
1: -
1: -	nla = nh_tail(nh);
1: -	nla->nla_type = type;
1: -	nla->nla_len = NLA_HDRLEN + len;
1: -	if (data)
1: -		memcpy(nla_data(nla), data, len);
1: -	nh->nlmsg_len = NLMSG_ALIGN(nh->nlmsg_len) + NLA_ALIGN(nla->nla_len);
1: -	return 0;
1: +                             const void *data, int len) {
1: +  struct nlattr *nla;
1: +
1: +  if (NLMSG_ALIGN(nh->nlmsg_len) + NLA_ALIGN(NLA_HDRLEN + len) > maxsz)
1: +    return -EMSGSIZE;
1: +  if (!!data != !!len)
1: +    return -EINVAL;
1: +
1: +  nla = nh_tail(nh);
1: +  nla->nla_type = type;
1: +  nla->nla_len = NLA_HDRLEN + len;
1: +  if (data)
1: +    memcpy(nla_data(nla), data, len);
1: +  nh->nlmsg_len = NLMSG_ALIGN(nh->nlmsg_len) + NLA_ALIGN(nla->nla_len);
1: +  return 0;
1:  }
1:  
1:  static inline struct nlattr *nlattr_begin_nested(struct nlmsghdr *nh,
1: -						 size_t maxsz, int type)
1: -{
1: -	struct nlattr *tail;
1: -
1: -	tail = nh_tail(nh);
1: -	if (nlattr_add(nh, maxsz, type | NLA_F_NESTED, NULL, 0))
1: -		return NULL;
1: -	return tail;
1: +                                                 size_t maxsz, int type) {
1: +  struct nlattr *tail;
1: +
1: +  tail = nh_tail(nh);
1: +  if (nlattr_add(nh, maxsz, type | NLA_F_NESTED, NULL, 0))
1: +    return NULL;
1: +  return tail;
1:  }
1:  
1: -static inline void nlattr_end_nested(struct nlmsghdr *nh, struct nlattr *tail)
1: -{
1: -	tail->nla_len = (char *)nh_tail(nh) - (char *)tail;
1: +static inline void nlattr_end_nested(struct nlmsghdr *nh, struct nlattr *tail) {
1: +  tail->nla_len = (char *)nh_tail(nh) - (char *)tail;
1:  }
1:  
1:  #endif /* __LIBBPF_NLATTR_H */
1: diff --git a/src/cc/libbpf/src/ringbuf.c b/src/cc/libbpf/src/ringbuf.c
1: index 8bc117bc..5a89c079 100644
1: --- a/src/cc/libbpf/src/ringbuf.c
1: +++ b/src/cc/libbpf/src/ringbuf.c
1: @@ -7,242 +7,232 @@
1:  #ifndef _GNU_SOURCE
1:  #define _GNU_SOURCE
1:  #endif
1: -#include <stdlib.h>
1: -#include <stdio.h>
1: +#include <asm/barrier.h>
1:  #include <errno.h>
1: -#include <unistd.h>
1: -#include <linux/err.h>
1:  #include <linux/bpf.h>
1: -#include <asm/barrier.h>
1: -#include <sys/mman.h>
1: +#include <linux/err.h>
1: +#include <stdio.h>
1: +#include <stdlib.h>
1:  #include <sys/epoll.h>
1: +#include <sys/mman.h>
1: +#include <unistd.h>
1:  
1: +#include "bpf.h"
1:  #include "libbpf.h"
1:  #include "libbpf_internal.h"
1: -#include "bpf.h"
1:  
1:  struct ring {
1: -	ring_buffer_sample_fn sample_cb;
1: -	void *ctx;
1: -	void *data;
1: -	unsigned long *consumer_pos;
1: -	unsigned long *producer_pos;
1: -	unsigned long mask;
1: -	int map_fd;
1: +  ring_buffer_sample_fn sample_cb;
1: +  void *ctx;
1: +  void *data;
1: +  unsigned long *consumer_pos;
1: +  unsigned long *producer_pos;
1: +  unsigned long mask;
1: +  int map_fd;
1:  };
1:  
1:  struct ring_buffer {
1: -	struct epoll_event *events;
1: -	struct ring *rings;
1: -	size_t page_size;
1: -	int epoll_fd;
1: -	int ring_cnt;
1: +  struct epoll_event *events;
1: +  struct ring *rings;
1: +  size_t page_size;
1: +  int epoll_fd;
1: +  int ring_cnt;
1:  };
1:  
1: -static void ringbuf_unmap_ring(struct ring_buffer *rb, struct ring *r)
1: -{
1: -	if (r->consumer_pos) {
1: -		munmap(r->consumer_pos, rb->page_size);
1: -		r->consumer_pos = NULL;
1: -	}
1: -	if (r->producer_pos) {
1: -		munmap(r->producer_pos, rb->page_size + 2 * (r->mask + 1));
1: -		r->producer_pos = NULL;
1: -	}
1: +static void ringbuf_unmap_ring(struct ring_buffer *rb, struct ring *r) {
1: +  if (r->consumer_pos) {
1: +    munmap(r->consumer_pos, rb->page_size);
1: +    r->consumer_pos = NULL;
1: +  }
1: +  if (r->producer_pos) {
1: +    munmap(r->producer_pos, rb->page_size + 2 * (r->mask + 1));
1: +    r->producer_pos = NULL;
1: +  }
1:  }
1:  
1:  /* Add extra RINGBUF maps to this ring buffer manager */
1:  int ring_buffer__add(struct ring_buffer *rb, int map_fd,
1: -		     ring_buffer_sample_fn sample_cb, void *ctx)
1: -{
1: -	struct bpf_map_info info;
1: -	__u32 len = sizeof(info);
1: -	struct epoll_event *e;
1: -	struct ring *r;
1: -	void *tmp;
1: -	int err;
1: -
1: -	memset(&info, 0, sizeof(info));
1: -
1: -	err = bpf_obj_get_info_by_fd(map_fd, &info, &len);
1: -	if (err) {
1: -		err = -errno;
1: -		pr_warn("ringbuf: failed to get map info for fd=%d: %d\n",
1: -			map_fd, err);
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	if (info.type != BPF_MAP_TYPE_RINGBUF) {
1: -		pr_warn("ringbuf: map fd=%d is not BPF_MAP_TYPE_RINGBUF\n",
1: -			map_fd);
1: -		return libbpf_err(-EINVAL);
1: -	}
1: -
1: -	tmp = libbpf_reallocarray(rb->rings, rb->ring_cnt + 1, sizeof(*rb->rings));
1: -	if (!tmp)
1: -		return libbpf_err(-ENOMEM);
1: -	rb->rings = tmp;
1: -
1: -	tmp = libbpf_reallocarray(rb->events, rb->ring_cnt + 1, sizeof(*rb->events));
1: -	if (!tmp)
1: -		return libbpf_err(-ENOMEM);
1: -	rb->events = tmp;
1: -
1: -	r = &rb->rings[rb->ring_cnt];
1: -	memset(r, 0, sizeof(*r));
1: -
1: -	r->map_fd = map_fd;
1: -	r->sample_cb = sample_cb;
1: -	r->ctx = ctx;
1: -	r->mask = info.max_entries - 1;
1: -
1: -	/* Map writable consumer page */
1: -	tmp = mmap(NULL, rb->page_size, PROT_READ | PROT_WRITE, MAP_SHARED,
1: -		   map_fd, 0);
1: -	if (tmp == MAP_FAILED) {
1: -		err = -errno;
1: -		pr_warn("ringbuf: failed to mmap consumer page for map fd=%d: %d\n",
1: -			map_fd, err);
1: -		return libbpf_err(err);
1: -	}
1: -	r->consumer_pos = tmp;
1: -
1: -	/* Map read-only producer page and data pages. We map twice as big
1: -	 * data size to allow simple reading of samples that wrap around the
1: -	 * end of a ring buffer. See kernel implementation for details.
1: -	 * */
1: -	tmp = mmap(NULL, rb->page_size + 2 * info.max_entries, PROT_READ,
1: -		   MAP_SHARED, map_fd, rb->page_size);
1: -	if (tmp == MAP_FAILED) {
1: -		err = -errno;
1: -		ringbuf_unmap_ring(rb, r);
1: -		pr_warn("ringbuf: failed to mmap data pages for map fd=%d: %d\n",
1: -			map_fd, err);
1: -		return libbpf_err(err);
1: -	}
1: -	r->producer_pos = tmp;
1: -	r->data = tmp + rb->page_size;
1: -
1: -	e = &rb->events[rb->ring_cnt];
1: -	memset(e, 0, sizeof(*e));
1: -
1: -	e->events = EPOLLIN;
1: -	e->data.fd = rb->ring_cnt;
1: -	if (epoll_ctl(rb->epoll_fd, EPOLL_CTL_ADD, map_fd, e) < 0) {
1: -		err = -errno;
1: -		ringbuf_unmap_ring(rb, r);
1: -		pr_warn("ringbuf: failed to epoll add map fd=%d: %d\n",
1: -			map_fd, err);
1: -		return libbpf_err(err);
1: -	}
1: -
1: -	rb->ring_cnt++;
1: -	return 0;
1: +                     ring_buffer_sample_fn sample_cb, void *ctx) {
1: +  struct bpf_map_info info;
1: +  __u32 len = sizeof(info);
1: +  struct epoll_event *e;
1: +  struct ring *r;
1: +  void *tmp;
1: +  int err;
1: +
1: +  memset(&info, 0, sizeof(info));
1: +
1: +  err = bpf_obj_get_info_by_fd(map_fd, &info, &len);
1: +  if (err) {
1: +    err = -errno;
1: +    pr_warn("ringbuf: failed to get map info for fd=%d: %d\n", map_fd, err);
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  if (info.type != BPF_MAP_TYPE_RINGBUF) {
1: +    pr_warn("ringbuf: map fd=%d is not BPF_MAP_TYPE_RINGBUF\n", map_fd);
1: +    return libbpf_err(-EINVAL);
1: +  }
1: +
1: +  tmp = libbpf_reallocarray(rb->rings, rb->ring_cnt + 1, sizeof(*rb->rings));
1: +  if (!tmp)
1: +    return libbpf_err(-ENOMEM);
1: +  rb->rings = tmp;
1: +
1: +  tmp = libbpf_reallocarray(rb->events, rb->ring_cnt + 1, sizeof(*rb->events));
1: +  if (!tmp)
1: +    return libbpf_err(-ENOMEM);
1: +  rb->events = tmp;
1: +
1: +  r = &rb->rings[rb->ring_cnt];
1: +  memset(r, 0, sizeof(*r));
1: +
1: +  r->map_fd = map_fd;
1: +  r->sample_cb = sample_cb;
1: +  r->ctx = ctx;
1: +  r->mask = info.max_entries - 1;
1: +
1: +  /* Map writable consumer page */
1: +  tmp =
1: +      mmap(NULL, rb->page_size, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0);
1: +  if (tmp == MAP_FAILED) {
1: +    err = -errno;
1: +    pr_warn("ringbuf: failed to mmap consumer page for map fd=%d: %d\n", map_fd,
1: +            err);
1: +    return libbpf_err(err);
1: +  }
1: +  r->consumer_pos = tmp;
1: +
1: +  /* Map read-only producer page and data pages. We map twice as big
1: +   * data size to allow simple reading of samples that wrap around the
1: +   * end of a ring buffer. See kernel implementation for details.
1: +   * */
1: +  tmp = mmap(NULL, rb->page_size + 2 * info.max_entries, PROT_READ, MAP_SHARED,
1: +             map_fd, rb->page_size);
1: +  if (tmp == MAP_FAILED) {
1: +    err = -errno;
1: +    ringbuf_unmap_ring(rb, r);
1: +    pr_warn("ringbuf: failed to mmap data pages for map fd=%d: %d\n", map_fd,
1: +            err);
1: +    return libbpf_err(err);
1: +  }
1: +  r->producer_pos = tmp;
1: +  r->data = tmp + rb->page_size;
1: +
1: +  e = &rb->events[rb->ring_cnt];
1: +  memset(e, 0, sizeof(*e));
1: +
1: +  e->events = EPOLLIN;
1: +  e->data.fd = rb->ring_cnt;
1: +  if (epoll_ctl(rb->epoll_fd, EPOLL_CTL_ADD, map_fd, e) < 0) {
1: +    err = -errno;
1: +    ringbuf_unmap_ring(rb, r);
1: +    pr_warn("ringbuf: failed to epoll add map fd=%d: %d\n", map_fd, err);
1: +    return libbpf_err(err);
1: +  }
1: +
1: +  rb->ring_cnt++;
1: +  return 0;
1:  }
1:  
1: -void ring_buffer__free(struct ring_buffer *rb)
1: -{
1: -	int i;
1: +void ring_buffer__free(struct ring_buffer *rb) {
1: +  int i;
1:  
1: -	if (!rb)
1: -		return;
1: +  if (!rb)
1: +    return;
1:  
1: -	for (i = 0; i < rb->ring_cnt; ++i)
1: -		ringbuf_unmap_ring(rb, &rb->rings[i]);
1: -	if (rb->epoll_fd >= 0)
1: -		close(rb->epoll_fd);
1: +  for (i = 0; i < rb->ring_cnt; ++i)
1: +    ringbuf_unmap_ring(rb, &rb->rings[i]);
1: +  if (rb->epoll_fd >= 0)
1: +    close(rb->epoll_fd);
1:  
1: -	free(rb->events);
1: -	free(rb->rings);
1: -	free(rb);
1: +  free(rb->events);
1: +  free(rb->rings);
1: +  free(rb);
1:  }
1:  
1: -struct ring_buffer *
1: -ring_buffer__new(int map_fd, ring_buffer_sample_fn sample_cb, void *ctx,
1: -		 const struct ring_buffer_opts *opts)
1: -{
1: -	struct ring_buffer *rb;
1: -	int err;
1: +struct ring_buffer *ring_buffer__new(int map_fd,
1: +                                     ring_buffer_sample_fn sample_cb, void *ctx,
1: +                                     const struct ring_buffer_opts *opts) {
1: +  struct ring_buffer *rb;
1: +  int err;
1:  
1: -	if (!OPTS_VALID(opts, ring_buffer_opts))
1: -		return errno = EINVAL, NULL;
1: +  if (!OPTS_VALID(opts, ring_buffer_opts))
1: +    return errno = EINVAL, NULL;
1:  
1: -	rb = calloc(1, sizeof(*rb));
1: -	if (!rb)
1: -		return errno = ENOMEM, NULL;
1: +  rb = calloc(1, sizeof(*rb));
1: +  if (!rb)
1: +    return errno = ENOMEM, NULL;
1:  
1: -	rb->page_size = getpagesize();
1: +  rb->page_size = getpagesize();
1:  
1: -	rb->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
1: -	if (rb->epoll_fd < 0) {
1: -		err = -errno;
1: -		pr_warn("ringbuf: failed to create epoll instance: %d\n", err);
1: -		goto err_out;
1: -	}
1: +  rb->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
1: +  if (rb->epoll_fd < 0) {
1: +    err = -errno;
1: +    pr_warn("ringbuf: failed to create epoll instance: %d\n", err);
1: +    goto err_out;
1: +  }
1:  
1: -	err = ring_buffer__add(rb, map_fd, sample_cb, ctx);
1: -	if (err)
1: -		goto err_out;
1: +  err = ring_buffer__add(rb, map_fd, sample_cb, ctx);
1: +  if (err)
1: +    goto err_out;
1:  
1: -	return rb;
1: +  return rb;
1:  
1:  err_out:
1: -	ring_buffer__free(rb);
1: -	return errno = -err, NULL;
1: +  ring_buffer__free(rb);
1: +  return errno = -err, NULL;
1:  }
1:  
1: -static inline int roundup_len(__u32 len)
1: -{
1: -	/* clear out top 2 bits (discard and busy, if set) */
1: -	len <<= 2;
1: -	len >>= 2;
1: -	/* add length prefix */
1: -	len += BPF_RINGBUF_HDR_SZ;
1: -	/* round up to 8 byte alignment */
1: -	return (len + 7) / 8 * 8;
1: +static inline int roundup_len(__u32 len) {
1: +  /* clear out top 2 bits (discard and busy, if set) */
1: +  len <<= 2;
1: +  len >>= 2;
1: +  /* add length prefix */
1: +  len += BPF_RINGBUF_HDR_SZ;
1: +  /* round up to 8 byte alignment */
1: +  return (len + 7) / 8 * 8;
1:  }
1:  
1: -static int64_t ringbuf_process_ring(struct ring* r)
1: -{
1: -	int *len_ptr, len, err;
1: -	/* 64-bit to avoid overflow in case of extreme application behavior */
1: -	int64_t cnt = 0;
1: -	unsigned long cons_pos, prod_pos;
1: -	bool got_new_data;
1: -	void *sample;
1: -
1: -	cons_pos = smp_load_acquire(r->consumer_pos);
1: -	do {
1: -		got_new_data = false;
1: -		prod_pos = smp_load_acquire(r->producer_pos);
1: -		while (cons_pos < prod_pos) {
1: -			len_ptr = r->data + (cons_pos & r->mask);
1: -			len = smp_load_acquire(len_ptr);
1: -
1: -			/* sample not committed yet, bail out for now */
1: -			if (len & BPF_RINGBUF_BUSY_BIT)
1: -				goto done;
1: -
1: -			got_new_data = true;
1: -			cons_pos += roundup_len(len);
1: -
1: -			if ((len & BPF_RINGBUF_DISCARD_BIT) == 0) {
1: -				sample = (void *)len_ptr + BPF_RINGBUF_HDR_SZ;
1: -				err = r->sample_cb(r->ctx, sample, len);
1: -				if (err < 0) {
1: -					/* update consumer pos and bail out */
1: -					smp_store_release(r->consumer_pos,
1: -							  cons_pos);
1: -					return err;
1: -				}
1: -				cnt++;
1: -			}
1: -
1: -			smp_store_release(r->consumer_pos, cons_pos);
1: -		}
1: -	} while (got_new_data);
1: +static int64_t ringbuf_process_ring(struct ring *r) {
1: +  int *len_ptr, len, err;
1: +  /* 64-bit to avoid overflow in case of extreme application behavior */
1: +  int64_t cnt = 0;
1: +  unsigned long cons_pos, prod_pos;
1: +  bool got_new_data;
1: +  void *sample;
1: +
1: +  cons_pos = smp_load_acquire(r->consumer_pos);
1: +  do {
1: +    got_new_data = false;
1: +    prod_pos = smp_load_acquire(r->producer_pos);
1: +    while (cons_pos < prod_pos) {
1: +      len_ptr = r->data + (cons_pos & r->mask);
1: +      len = smp_load_acquire(len_ptr);
1: +
1: +      /* sample not committed yet, bail out for now */
1: +      if (len & BPF_RINGBUF_BUSY_BIT)
1: +        goto done;
1: +
1: +      got_new_data = true;
1: +      cons_pos += roundup_len(len);
1: +
1: +      if ((len & BPF_RINGBUF_DISCARD_BIT) == 0) {
1: +        sample = (void *)len_ptr + BPF_RINGBUF_HDR_SZ;
1: +        err = r->sample_cb(r->ctx, sample, len);
1: +        if (err < 0) {
1: +          /* update consumer pos and bail out */
1: +          smp_store_release(r->consumer_pos, cons_pos);
1: +          return err;
1: +        }
1: +        cnt++;
1: +      }
1: +
1: +      smp_store_release(r->consumer_pos, cons_pos);
1: +    }
1: +  } while (got_new_data);
1:  done:
1: -	return cnt;
1: +  return cnt;
1:  }
1:  
1:  /* Consume available ring buffer(s) data without event polling.
1: @@ -250,53 +240,48 @@ done:
1:   * INT_MAX, whichever is less), or negative number if any of the callbacks
1:   * return error.
1:   */
1: -int ring_buffer__consume(struct ring_buffer *rb)
1: -{
1: -	int64_t err, res = 0;
1: -	int i;
1: -
1: -	for (i = 0; i < rb->ring_cnt; i++) {
1: -		struct ring *ring = &rb->rings[i];
1: -
1: -		err = ringbuf_process_ring(ring);
1: -		if (err < 0)
1: -			return libbpf_err(err);
1: -		res += err;
1: -	}
1: -	if (res > INT_MAX)
1: -		return INT_MAX;
1: -	return res;
1: +int ring_buffer__consume(struct ring_buffer *rb) {
1: +  int64_t err, res = 0;
1: +  int i;
1: +
1: +  for (i = 0; i < rb->ring_cnt; i++) {
1: +    struct ring *ring = &rb->rings[i];
1: +
1: +    err = ringbuf_process_ring(ring);
1: +    if (err < 0)
1: +      return libbpf_err(err);
1: +    res += err;
1: +  }
1: +  if (res > INT_MAX)
1: +    return INT_MAX;
1: +  return res;
1:  }
1:  
1:  /* Poll for available data and consume records, if any are available.
1:   * Returns number of records consumed (or INT_MAX, whichever is less), or
1:   * negative number, if any of the registered callbacks returned error.
1:   */
1: -int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms)
1: -{
1: -	int i, cnt;
1: -	int64_t err, res = 0;
1: -
1: -	cnt = epoll_wait(rb->epoll_fd, rb->events, rb->ring_cnt, timeout_ms);
1: -	if (cnt < 0)
1: -		return libbpf_err(-errno);
1: -
1: -	for (i = 0; i < cnt; i++) {
1: -		__u32 ring_id = rb->events[i].data.fd;
1: -		struct ring *ring = &rb->rings[ring_id];
1: -
1: -		err = ringbuf_process_ring(ring);
1: -		if (err < 0)
1: -			return libbpf_err(err);
1: -		res += err;
1: -	}
1: -	if (res > INT_MAX)
1: -		return INT_MAX;
1: -	return res;
1: +int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms) {
1: +  int i, cnt;
1: +  int64_t err, res = 0;
1: +
1: +  cnt = epoll_wait(rb->epoll_fd, rb->events, rb->ring_cnt, timeout_ms);
1: +  if (cnt < 0)
1: +    return libbpf_err(-errno);
1: +
1: +  for (i = 0; i < cnt; i++) {
1: +    __u32 ring_id = rb->events[i].data.fd;
1: +    struct ring *ring = &rb->rings[ring_id];
1: +
1: +    err = ringbuf_process_ring(ring);
1: +    if (err < 0)
1: +      return libbpf_err(err);
1: +    res += err;
1: +  }
1: +  if (res > INT_MAX)
1: +    return INT_MAX;
1: +  return res;
1:  }
1:  
1:  /* Get an fd that can be used to sleep until data is available in the ring(s) */
1: -int ring_buffer__epoll_fd(const struct ring_buffer *rb)
1: -{
1: -	return rb->epoll_fd;
1: -}
1: +int ring_buffer__epoll_fd(const struct ring_buffer *rb) { return rb->epoll_fd; }
1: diff --git a/src/cc/libbpf/src/skel_internal.h b/src/cc/libbpf/src/skel_internal.h
1: index b22b50c1..fb25a0de 100644
1: --- a/src/cc/libbpf/src/skel_internal.h
1: +++ b/src/cc/libbpf/src/skel_internal.h
1: @@ -3,121 +3,119 @@
1:  #ifndef __SKEL_INTERNAL_H
1:  #define __SKEL_INTERNAL_H
1:  
1: -#include <unistd.h>
1: -#include <sys/syscall.h>
1:  #include <sys/mman.h>
1: +#include <sys/syscall.h>
1: +#include <unistd.h>
1:  
1:  /* This file is a base header for auto-generated *.lskel.h files.
1: - * Its contents will change and may become part of auto-generation in the future.
1: + * Its contents will change and may become part of auto-generation in the
1: + * future.
1:   *
1:   * The layout of bpf_[map|prog]_desc and bpf_loader_ctx is feature dependent
1:   * and will change from one version of libbpf to another and features
1:   * requested during loader program generation.
1:   */
1:  struct bpf_map_desc {
1: -	union {
1: -		/* input for the loader prog */
1: -		struct {
1: -			__aligned_u64 initial_value;
1: -			__u32 max_entries;
1: -		};
1: -		/* output of the loader prog */
1: -		struct {
1: -			int map_fd;
1: -		};
1: -	};
1: +  union {
1: +    /* input for the loader prog */
1: +    struct {
1: +      __aligned_u64 initial_value;
1: +      __u32 max_entries;
1: +    };
1: +    /* output of the loader prog */
1: +    struct {
1: +      int map_fd;
1: +    };
1: +  };
1:  };
1:  struct bpf_prog_desc {
1: -	int prog_fd;
1: +  int prog_fd;
1:  };
1:  
1:  struct bpf_loader_ctx {
1: -	size_t sz;
1: -	__u32 log_level;
1: -	__u32 log_size;
1: -	__u64 log_buf;
1: +  size_t sz;
1: +  __u32 log_level;
1: +  __u32 log_size;
1: +  __u64 log_buf;
1:  };
1:  
1:  struct bpf_load_and_run_opts {
1: -	struct bpf_loader_ctx *ctx;
1: -	const void *data;
1: -	const void *insns;
1: -	__u32 data_sz;
1: -	__u32 insns_sz;
1: -	const char *errstr;
1: +  struct bpf_loader_ctx *ctx;
1: +  const void *data;
1: +  const void *insns;
1: +  __u32 data_sz;
1: +  __u32 insns_sz;
1: +  const char *errstr;
1:  };
1:  
1:  static inline int skel_sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
1: -			  unsigned int size)
1: -{
1: -	return syscall(__NR_bpf, cmd, attr, size);
1: +                               unsigned int size) {
1: +  return syscall(__NR_bpf, cmd, attr, size);
1:  }
1:  
1: -static inline int skel_closenz(int fd)
1: -{
1: -	if (fd > 0)
1: -		return close(fd);
1: -	return -EINVAL;
1: +static inline int skel_closenz(int fd) {
1: +  if (fd > 0)
1: +    return close(fd);
1: +  return -EINVAL;
1:  }
1:  
1: -static inline int bpf_load_and_run(struct bpf_load_and_run_opts *opts)
1: -{
1: -	int map_fd = -1, prog_fd = -1, key = 0, err;
1: -	union bpf_attr attr;
1: +static inline int bpf_load_and_run(struct bpf_load_and_run_opts *opts) {
1: +  int map_fd = -1, prog_fd = -1, key = 0, err;
1: +  union bpf_attr attr;
1:  
1: -	map_fd = bpf_create_map_name(BPF_MAP_TYPE_ARRAY, "__loader.map", 4,
1: -				     opts->data_sz, 1, 0);
1: -	if (map_fd < 0) {
1: -		opts->errstr = "failed to create loader map";
1: -		err = -errno;
1: -		goto out;
1: -	}
1: +  map_fd = bpf_create_map_name(BPF_MAP_TYPE_ARRAY, "__loader.map", 4,
1: +                               opts->data_sz, 1, 0);
1: +  if (map_fd < 0) {
1: +    opts->errstr = "failed to create loader map";
1: +    err = -errno;
1: +    goto out;
1: +  }
1:  
1: -	err = bpf_map_update_elem(map_fd, &key, opts->data, 0);
1: -	if (err < 0) {
1: -		opts->errstr = "failed to update loader map";
1: -		err = -errno;
1: -		goto out;
1: -	}
1: +  err = bpf_map_update_elem(map_fd, &key, opts->data, 0);
1: +  if (err < 0) {
1: +    opts->errstr = "failed to update loader map";
1: +    err = -errno;
1: +    goto out;
1: +  }
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.prog_type = BPF_PROG_TYPE_SYSCALL;
1: -	attr.insns = (long) opts->insns;
1: -	attr.insn_cnt = opts->insns_sz / sizeof(struct bpf_insn);
1: -	attr.license = (long) "Dual BSD/GPL";
1: -	memcpy(attr.prog_name, "__loader.prog", sizeof("__loader.prog"));
1: -	attr.fd_array = (long) &map_fd;
1: -	attr.log_level = opts->ctx->log_level;
1: -	attr.log_size = opts->ctx->log_size;
1: -	attr.log_buf = opts->ctx->log_buf;
1: -	attr.prog_flags = BPF_F_SLEEPABLE;
1: -	prog_fd = skel_sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
1: -	if (prog_fd < 0) {
1: -		opts->errstr = "failed to load loader prog";
1: -		err = -errno;
1: -		goto out;
1: -	}
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.prog_type = BPF_PROG_TYPE_SYSCALL;
1: +  attr.insns = (long)opts->insns;
1: +  attr.insn_cnt = opts->insns_sz / sizeof(struct bpf_insn);
1: +  attr.license = (long)"Dual BSD/GPL";
1: +  memcpy(attr.prog_name, "__loader.prog", sizeof("__loader.prog"));
1: +  attr.fd_array = (long)&map_fd;
1: +  attr.log_level = opts->ctx->log_level;
1: +  attr.log_size = opts->ctx->log_size;
1: +  attr.log_buf = opts->ctx->log_buf;
1: +  attr.prog_flags = BPF_F_SLEEPABLE;
1: +  prog_fd = skel_sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
1: +  if (prog_fd < 0) {
1: +    opts->errstr = "failed to load loader prog";
1: +    err = -errno;
1: +    goto out;
1: +  }
1:  
1: -	memset(&attr, 0, sizeof(attr));
1: -	attr.test.prog_fd = prog_fd;
1: -	attr.test.ctx_in = (long) opts->ctx;
1: -	attr.test.ctx_size_in = opts->ctx->sz;
1: -	err = skel_sys_bpf(BPF_PROG_RUN, &attr, sizeof(attr));
1: -	if (err < 0 || (int)attr.test.retval < 0) {
1: -		opts->errstr = "failed to execute loader prog";
1: -		if (err < 0)
1: -			err = -errno;
1: -		else
1: -			err = (int)attr.test.retval;
1: -		goto out;
1: -	}
1: -	err = 0;
1: +  memset(&attr, 0, sizeof(attr));
1: +  attr.test.prog_fd = prog_fd;
1: +  attr.test.ctx_in = (long)opts->ctx;
1: +  attr.test.ctx_size_in = opts->ctx->sz;
1: +  err = skel_sys_bpf(BPF_PROG_RUN, &attr, sizeof(attr));
1: +  if (err < 0 || (int)attr.test.retval < 0) {
1: +    opts->errstr = "failed to execute loader prog";
1: +    if (err < 0)
1: +      err = -errno;
1: +    else
1: +      err = (int)attr.test.retval;
1: +    goto out;
1: +  }
1: +  err = 0;
1:  out:
1: -	if (map_fd >= 0)
1: -		close(map_fd);
1: -	if (prog_fd >= 0)
1: -		close(prog_fd);
1: -	return err;
1: +  if (map_fd >= 0)
1: +    close(map_fd);
1: +  if (prog_fd >= 0)
1: +    close(prog_fd);
1: +  return err;
1:  }
1:  
1:  #endif
1: diff --git a/src/cc/libbpf/src/str_error.c b/src/cc/libbpf/src/str_error.c
1: index 146da019..08bc4461 100644
1: --- a/src/cc/libbpf/src/str_error.c
1: +++ b/src/cc/libbpf/src/str_error.c
1: @@ -1,8 +1,8 @@
1:  // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
1:  #undef _GNU_SOURCE
1: -#include <string.h>
1: -#include <stdio.h>
1:  #include "str_error.h"
1: +#include <stdio.h>
1: +#include <string.h>
1:  
1:  /* make sure libbpf doesn't use kernel-only integer typedefs */
1:  #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
1: @@ -12,10 +12,9 @@
1:   * libc, while checking strerror_r() return to avoid having to check this in
1:   * all places calling it.
1:   */
1: -char *libbpf_strerror_r(int err, char *dst, int len)
1: -{
1: -	int ret = strerror_r(err < 0 ? -err : err, dst, len);
1: -	if (ret)
1: -		snprintf(dst, len, "ERROR: strerror_r(%d)=%d", err, ret);
1: -	return dst;
1: +char *libbpf_strerror_r(int err, char *dst, int len) {
1: +  int ret = strerror_r(err < 0 ? -err : err, dst, len);
1: +  if (ret)
1: +    snprintf(dst, len, "ERROR: strerror_r(%d)=%d", err, ret);
1: +  return dst;
1:  }
1: diff --git a/src/cc/libbpf/src/strset.c b/src/cc/libbpf/src/strset.c
1: index 1fb8b49d..7719264f 100644
1: --- a/src/cc/libbpf/src/strset.c
1: +++ b/src/cc/libbpf/src/strset.c
1: @@ -1,109 +1,102 @@
1:  // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
1:  /* Copyright (c) 2021 Facebook */
1: -#include <stdint.h>
1: -#include <stdlib.h>
1: -#include <stdio.h>
1: +#include "strset.h"
1:  #include <errno.h>
1:  #include <linux/err.h>
1: +#include <stdint.h>
1: +#include <stdio.h>
1: +#include <stdlib.h>
1:  #include "hashmap.h"
1:  #include "libbpf_internal.h"
1: -#include "strset.h"
1:  
1:  struct strset {
1: -	void *strs_data;
1: -	size_t strs_data_len;
1: -	size_t strs_data_cap;
1: -	size_t strs_data_max_len;
1: +  void *strs_data;
1: +  size_t strs_data_len;
1: +  size_t strs_data_cap;
1: +  size_t strs_data_max_len;
1:  
1: -	/* lookup index for each unique string in strings set */
1: -	struct hashmap *strs_hash;
1: +  /* lookup index for each unique string in strings set */
1: +  struct hashmap *strs_hash;
1:  };
1:  
1: -static size_t strset_hash_fn(const void *key, void *ctx)
1: -{
1: -	const struct strset *s = ctx;
1: -	const char *str = s->strs_data + (long)key;
1: +static size_t strset_hash_fn(const void *key, void *ctx) {
1: +  const struct strset *s = ctx;
1: +  const char *str = s->strs_data + (long)key;
1:  
1: -	return str_hash(str);
1: +  return str_hash(str);
1:  }
1:  
1: -static bool strset_equal_fn(const void *key1, const void *key2, void *ctx)
1: -{
1: -	const struct strset *s = ctx;
1: -	const char *str1 = s->strs_data + (long)key1;
1: -	const char *str2 = s->strs_data + (long)key2;
1: +static bool strset_equal_fn(const void *key1, const void *key2, void *ctx) {
1: +  const struct strset *s = ctx;
1: +  const char *str1 = s->strs_data + (long)key1;
1: +  const char *str2 = s->strs_data + (long)key2;
1:  
1: -	return strcmp(str1, str2) == 0;
1: +  return strcmp(str1, str2) == 0;
1:  }
1:  
1: -struct strset *strset__new(size_t max_data_sz, const char *init_data, size_t init_data_sz)
1: -{
1: -	struct strset *set = calloc(1, sizeof(*set));
1: -	struct hashmap *hash;
1: -	int err = -ENOMEM;
1: -
1: -	if (!set)
1: -		return ERR_PTR(-ENOMEM);
1: -
1: -	hash = hashmap__new(strset_hash_fn, strset_equal_fn, set);
1: -	if (IS_ERR(hash))
1: -		goto err_out;
1: -
1: -	set->strs_data_max_len = max_data_sz;
1: -	set->strs_hash = hash;
1: -
1: -	if (init_data) {
1: -		long off;
1: -
1: -		set->strs_data = malloc(init_data_sz);
1: -		if (!set->strs_data)
1: -			goto err_out;
1: -
1: -		memcpy(set->strs_data, init_data, init_data_sz);
1: -		set->strs_data_len = init_data_sz;
1: -		set->strs_data_cap = init_data_sz;
1: -
1: -		for (off = 0; off < set->strs_data_len; off += strlen(set->strs_data + off) + 1) {
1: -			/* hashmap__add() returns EEXIST if string with the same
1: -			 * content already is in the hash map
1: -			 */
1: -			err = hashmap__add(hash, (void *)off, (void *)off);
1: -			if (err == -EEXIST)
1: -				continue; /* duplicate */
1: -			if (err)
1: -				goto err_out;
1: -		}
1: -	}
1: -
1: -	return set;
1: +struct strset *strset__new(size_t max_data_sz, const char *init_data,
1: +                           size_t init_data_sz) {
1: +  struct strset *set = calloc(1, sizeof(*set));
1: +  struct hashmap *hash;
1: +  int err = -ENOMEM;
1: +
1: +  if (!set)
1: +    return ERR_PTR(-ENOMEM);
1: +
1: +  hash = hashmap__new(strset_hash_fn, strset_equal_fn, set);
1: +  if (IS_ERR(hash))
1: +    goto err_out;
1: +
1: +  set->strs_data_max_len = max_data_sz;
1: +  set->strs_hash = hash;
1: +
1: +  if (init_data) {
1: +    long off;
1: +
1: +    set->strs_data = malloc(init_data_sz);
1: +    if (!set->strs_data)
1: +      goto err_out;
1: +
1: +    memcpy(set->strs_data, init_data, init_data_sz);
1: +    set->strs_data_len = init_data_sz;
1: +    set->strs_data_cap = init_data_sz;
1: +
1: +    for (off = 0; off < set->strs_data_len;
1: +         off += strlen(set->strs_data + off) + 1) {
1: +      /* hashmap__add() returns EEXIST if string with the same
1: +       * content already is in the hash map
1: +       */
1: +      err = hashmap__add(hash, (void *)off, (void *)off);
1: +      if (err == -EEXIST)
1: +        continue; /* duplicate */
1: +      if (err)
1: +        goto err_out;
1: +    }
1: +  }
1: +
1: +  return set;
1:  err_out:
1: -	strset__free(set);
1: -	return ERR_PTR(err);
1: +  strset__free(set);
1: +  return ERR_PTR(err);
1:  }
1:  
1: -void strset__free(struct strset *set)
1: -{
1: -	if (IS_ERR_OR_NULL(set))
1: -		return;
1: +void strset__free(struct strset *set) {
1: +  if (IS_ERR_OR_NULL(set))
1: +    return;
1:  
1: -	hashmap__free(set->strs_hash);
1: -	free(set->strs_data);
1: +  hashmap__free(set->strs_hash);
1: +  free(set->strs_data);
1:  }
1:  
1: -size_t strset__data_size(const struct strset *set)
1: -{
1: -	return set->strs_data_len;
1: +size_t strset__data_size(const struct strset *set) {
1: +  return set->strs_data_len;
1:  }
1:  
1: -const char *strset__data(const struct strset *set)
1: -{
1: -	return set->strs_data;
1: -}
1: +const char *strset__data(const struct strset *set) { return set->strs_data; }
1:  
1: -static void *strset_add_str_mem(struct strset *set, size_t add_sz)
1: -{
1: -	return libbpf_add_mem(&set->strs_data, &set->strs_data_cap, 1,
1: -			      set->strs_data_len, set->strs_data_max_len, add_sz);
1: +static void *strset_add_str_mem(struct strset *set, size_t add_sz) {
1: +  return libbpf_add_mem(&set->strs_data, &set->strs_data_cap, 1,
1: +                        set->strs_data_len, set->strs_data_max_len, add_sz);
1:  }
1:  
1:  /* Find string offset that corresponds to a given string *s*.
1: @@ -112,24 +105,23 @@ static void *strset_add_str_mem(struct strset *set, size_t add_sz)
1:   *   - -ENOENT, if string is not in the string data;
1:   *   - <0, on any other error.
1:   */
1: -int strset__find_str(struct strset *set, const char *s)
1: -{
1: -	long old_off, new_off, len;
1: -	void *p;
1: +int strset__find_str(struct strset *set, const char *s) {
1: +  long old_off, new_off, len;
1: +  void *p;
1:  
1: -	/* see strset__add_str() for why we do this */
1: -	len = strlen(s) + 1;
1: -	p = strset_add_str_mem(set, len);
1: -	if (!p)
1: -		return -ENOMEM;
1: +  /* see strset__add_str() for why we do this */
1: +  len = strlen(s) + 1;
1: +  p = strset_add_str_mem(set, len);
1: +  if (!p)
1: +    return -ENOMEM;
1:  
1: -	new_off = set->strs_data_len;
1: -	memcpy(p, s, len);
1: +  new_off = set->strs_data_len;
1: +  memcpy(p, s, len);
1:  
1: -	if (hashmap__find(set->strs_hash, (void *)new_off, (void **)&old_off))
1: -		return old_off;
1: +  if (hashmap__find(set->strs_hash, (void *)new_off, (void **)&old_off))
1: +    return old_off;
1:  
1: -	return -ENOENT;
1: +  return -ENOENT;
1:  }
1:  
1:  /* Add a string s to the string data. If the string already exists, return its
1: @@ -138,39 +130,38 @@ int strset__find_str(struct strset *set, const char *s)
1:   *   - > 0 offset into string data, on success;
1:   *   - < 0, on error.
1:   */
1: -int strset__add_str(struct strset *set, const char *s)
1: -{
1: -	long old_off, new_off, len;
1: -	void *p;
1: -	int err;
1: -
1: -	/* Hashmap keys are always offsets within set->strs_data, so to even
1: -	 * look up some string from the "outside", we need to first append it
1: -	 * at the end, so that it can be addressed with an offset. Luckily,
1: -	 * until set->strs_data_len is incremented, that string is just a piece
1: -	 * of garbage for the rest of the code, so no harm, no foul. On the
1: -	 * other hand, if the string is unique, it's already appended and
1: -	 * ready to be used, only a simple set->strs_data_len increment away.
1: -	 */
1: -	len = strlen(s) + 1;
1: -	p = strset_add_str_mem(set, len);
1: -	if (!p)
1: -		return -ENOMEM;
1: -
1: -	new_off = set->strs_data_len;
1: -	memcpy(p, s, len);
1: -
1: -	/* Now attempt to add the string, but only if the string with the same
1: -	 * contents doesn't exist already (HASHMAP_ADD strategy). If such
1: -	 * string exists, we'll get its offset in old_off (that's old_key).
1: -	 */
1: -	err = hashmap__insert(set->strs_hash, (void *)new_off, (void *)new_off,
1: -			      HASHMAP_ADD, (const void **)&old_off, NULL);
1: -	if (err == -EEXIST)
1: -		return old_off; /* duplicated string, return existing offset */
1: -	if (err)
1: -		return err;
1: -
1: -	set->strs_data_len += len; /* new unique string, adjust data length */
1: -	return new_off;
1: +int strset__add_str(struct strset *set, const char *s) {
1: +  long old_off, new_off, len;
1: +  void *p;
1: +  int err;
1: +
1: +  /* Hashmap keys are always offsets within set->strs_data, so to even
1: +   * look up some string from the "outside", we need to first append it
1: +   * at the end, so that it can be addressed with an offset. Luckily,
1: +   * until set->strs_data_len is incremented, that string is just a piece
1: +   * of garbage for the rest of the code, so no harm, no foul. On the
1: +   * other hand, if the string is unique, it's already appended and
1: +   * ready to be used, only a simple set->strs_data_len increment away.
1: +   */
1: +  len = strlen(s) + 1;
1: +  p = strset_add_str_mem(set, len);
1: +  if (!p)
1: +    return -ENOMEM;
1: +
1: +  new_off = set->strs_data_len;
1: +  memcpy(p, s, len);
1: +
1: +  /* Now attempt to add the string, but only if the string with the same
1: +   * contents doesn't exist already (HASHMAP_ADD strategy). If such
1: +   * string exists, we'll get its offset in old_off (that's old_key).
1: +   */
1: +  err = hashmap__insert(set->strs_hash, (void *)new_off, (void *)new_off,
1: +                        HASHMAP_ADD, (const void **)&old_off, NULL);
1: +  if (err == -EEXIST)
1: +    return old_off; /* duplicated string, return existing offset */
1: +  if (err)
1: +    return err;
1: +
1: +  set->strs_data_len += len; /* new unique string, adjust data length */
1: +  return new_off;
1:  }
1: diff --git a/src/cc/libbpf/src/strset.h b/src/cc/libbpf/src/strset.h
1: index b6ddf77a..39b432df 100644
1: --- a/src/cc/libbpf/src/strset.h
1: +++ b/src/cc/libbpf/src/strset.h
1: @@ -9,7 +9,8 @@
1:  
1:  struct strset;
1:  
1: -struct strset *strset__new(size_t max_data_sz, const char *init_data, size_t init_data_sz);
1: +struct strset *strset__new(size_t max_data_sz, const char *init_data,
1: +                           size_t init_data_sz);
1:  void strset__free(struct strset *set);
1:  
1:  const char *strset__data(const struct strset *set);
1: diff --git a/src/cc/libbpf/src/xsk.c b/src/cc/libbpf/src/xsk.c
1: index e9b619aa..06a542c5 100644
1: --- a/src/cc/libbpf/src/xsk.c
1: +++ b/src/cc/libbpf/src/xsk.c
1: @@ -8,27 +8,27 @@
1:   * Author(s): Magnus Karlsson <magnus.karlsson@intel.com>
1:   */
1:  
1: -#include <errno.h>
1: -#include <stdlib.h>
1: -#include <string.h>
1: -#include <unistd.h>
1:  #include <arpa/inet.h>
1:  #include <asm/barrier.h>
1: +#include <errno.h>
1:  #include <linux/compiler.h>
1:  #include <linux/ethtool.h>
1:  #include <linux/filter.h>
1:  #include <linux/if_ether.h>
1: +#include <linux/if_link.h>
1:  #include <linux/if_packet.h>
1:  #include <linux/if_xdp.h>
1:  #include <linux/kernel.h>
1:  #include <linux/list.h>
1:  #include <linux/sockios.h>
1:  #include <net/if.h>
1: +#include <stdlib.h>
1: +#include <string.h>
1:  #include <sys/ioctl.h>
1:  #include <sys/mman.h>
1:  #include <sys/socket.h>
1:  #include <sys/types.h>
1: -#include <linux/if_link.h>
1: +#include <unistd.h>
1:  
1:  #include "bpf.h"
1:  #include "libbpf.h"
1: @@ -36,1231 +36,1189 @@
1:  #include "xsk.h"
1:  
1:  #ifndef SOL_XDP
1: - #define SOL_XDP 283
1: +#define SOL_XDP 283
1:  #endif
1:  
1:  #ifndef AF_XDP
1: - #define AF_XDP 44
1: +#define AF_XDP 44
1:  #endif
1:  
1:  #ifndef PF_XDP
1: - #define PF_XDP AF_XDP
1: +#define PF_XDP AF_XDP
1:  #endif
1:  
1:  enum xsk_prog {
1: -	XSK_PROG_FALLBACK,
1: -	XSK_PROG_REDIRECT_FLAGS,
1: +  XSK_PROG_FALLBACK,
1: +  XSK_PROG_REDIRECT_FLAGS,
1:  };
1:  
1:  struct xsk_umem {
1: -	struct xsk_ring_prod *fill_save;
1: -	struct xsk_ring_cons *comp_save;
1: -	char *umem_area;
1: -	struct xsk_umem_config config;
1: -	int fd;
1: -	int refcount;
1: -	struct list_head ctx_list;
1: -	bool rx_ring_setup_done;
1: -	bool tx_ring_setup_done;
1: +  struct xsk_ring_prod *fill_save;
1: +  struct xsk_ring_cons *comp_save;
1: +  char *umem_area;
1: +  struct xsk_umem_config config;
1: +  int fd;
1: +  int refcount;
1: +  struct list_head ctx_list;
1: +  bool rx_ring_setup_done;
1: +  bool tx_ring_setup_done;
1:  };
1:  
1:  struct xsk_ctx {
1: -	struct xsk_ring_prod *fill;
1: -	struct xsk_ring_cons *comp;
1: -	__u32 queue_id;
1: -	struct xsk_umem *umem;
1: -	int refcount;
1: -	int ifindex;
1: -	struct list_head list;
1: -	int prog_fd;
1: -	int link_fd;
1: -	int xsks_map_fd;
1: -	char ifname[IFNAMSIZ];
1: -	bool has_bpf_link;
1: +  struct xsk_ring_prod *fill;
1: +  struct xsk_ring_cons *comp;
1: +  __u32 queue_id;
1: +  struct xsk_umem *umem;
1: +  int refcount;
1: +  int ifindex;
1: +  struct list_head list;
1: +  int prog_fd;
1: +  int link_fd;
1: +  int xsks_map_fd;
1: +  char ifname[IFNAMSIZ];
1: +  bool has_bpf_link;
1:  };
1:  
1:  struct xsk_socket {
1: -	struct xsk_ring_cons *rx;
1: -	struct xsk_ring_prod *tx;
1: -	__u64 outstanding_tx;
1: -	struct xsk_ctx *ctx;
1: -	struct xsk_socket_config config;
1: -	int fd;
1: +  struct xsk_ring_cons *rx;
1: +  struct xsk_ring_prod *tx;
1: +  __u64 outstanding_tx;
1: +  struct xsk_ctx *ctx;
1: +  struct xsk_socket_config config;
1: +  int fd;
1:  };
1:  
1:  struct xsk_nl_info {
1: -	bool xdp_prog_attached;
1: -	int ifindex;
1: -	int fd;
1: +  bool xdp_prog_attached;
1: +  int ifindex;
1: +  int fd;
1:  };
1:  
1:  /* Up until and including Linux 5.3 */
1:  struct xdp_ring_offset_v1 {
1: -	__u64 producer;
1: -	__u64 consumer;
1: -	__u64 desc;
1: +  __u64 producer;
1: +  __u64 consumer;
1: +  __u64 desc;
1:  };
1:  
1:  /* Up until and including Linux 5.3 */
1:  struct xdp_mmap_offsets_v1 {
1: -	struct xdp_ring_offset_v1 rx;
1: -	struct xdp_ring_offset_v1 tx;
1: -	struct xdp_ring_offset_v1 fr;
1: -	struct xdp_ring_offset_v1 cr;
1: +  struct xdp_ring_offset_v1 rx;
1: +  struct xdp_ring_offset_v1 tx;
1: +  struct xdp_ring_offset_v1 fr;
1: +  struct xdp_ring_offset_v1 cr;
1:  };
1:  
1: -int xsk_umem__fd(const struct xsk_umem *umem)
1: -{
1: -	return umem ? umem->fd : -EINVAL;
1: +int xsk_umem__fd(const struct xsk_umem *umem) {
1: +  return umem ? umem->fd : -EINVAL;
1:  }
1:  
1: -int xsk_socket__fd(const struct xsk_socket *xsk)
1: -{
1: -	return xsk ? xsk->fd : -EINVAL;
1: +int xsk_socket__fd(const struct xsk_socket *xsk) {
1: +  return xsk ? xsk->fd : -EINVAL;
1:  }
1:  
1: -static bool xsk_page_aligned(void *buffer)
1: -{
1: -	unsigned long addr = (unsigned long)buffer;
1: +static bool xsk_page_aligned(void *buffer) {
1: +  unsigned long addr = (unsigned long)buffer;
1:  
1: -	return !(addr & (getpagesize() - 1));
1: +  return !(addr & (getpagesize() - 1));
1:  }
1:  
1:  static void xsk_set_umem_config(struct xsk_umem_config *cfg,
1: -				const struct xsk_umem_config *usr_cfg)
1: -{
1: -	if (!usr_cfg) {
1: -		cfg->fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;
1: -		cfg->comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;
1: -		cfg->frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;
1: -		cfg->frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM;
1: -		cfg->flags = XSK_UMEM__DEFAULT_FLAGS;
1: -		return;
1: -	}
1: -
1: -	cfg->fill_size = usr_cfg->fill_size;
1: -	cfg->comp_size = usr_cfg->comp_size;
1: -	cfg->frame_size = usr_cfg->frame_size;
1: -	cfg->frame_headroom = usr_cfg->frame_headroom;
1: -	cfg->flags = usr_cfg->flags;
1: +                                const struct xsk_umem_config *usr_cfg) {
1: +  if (!usr_cfg) {
1: +    cfg->fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;
1: +    cfg->comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;
1: +    cfg->frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;
1: +    cfg->frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM;
1: +    cfg->flags = XSK_UMEM__DEFAULT_FLAGS;
1: +    return;
1: +  }
1: +
1: +  cfg->fill_size = usr_cfg->fill_size;
1: +  cfg->comp_size = usr_cfg->comp_size;
1: +  cfg->frame_size = usr_cfg->frame_size;
1: +  cfg->frame_headroom = usr_cfg->frame_headroom;
1: +  cfg->flags = usr_cfg->flags;
1:  }
1:  
1:  static int xsk_set_xdp_socket_config(struct xsk_socket_config *cfg,
1: -				     const struct xsk_socket_config *usr_cfg)
1: -{
1: -	if (!usr_cfg) {
1: -		cfg->rx_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;
1: -		cfg->tx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;
1: -		cfg->libbpf_flags = 0;
1: -		cfg->xdp_flags = 0;
1: -		cfg->bind_flags = 0;
1: -		return 0;
1: -	}
1: -
1: -	if (usr_cfg->libbpf_flags & ~XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD)
1: -		return -EINVAL;
1: -
1: -	cfg->rx_size = usr_cfg->rx_size;
1: -	cfg->tx_size = usr_cfg->tx_size;
1: -	cfg->libbpf_flags = usr_cfg->libbpf_flags;
1: -	cfg->xdp_flags = usr_cfg->xdp_flags;
1: -	cfg->bind_flags = usr_cfg->bind_flags;
1: -
1: -	return 0;
1: +                                     const struct xsk_socket_config *usr_cfg) {
1: +  if (!usr_cfg) {
1: +    cfg->rx_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;
1: +    cfg->tx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;
1: +    cfg->libbpf_flags = 0;
1: +    cfg->xdp_flags = 0;
1: +    cfg->bind_flags = 0;
1: +    return 0;
1: +  }
1: +
1: +  if (usr_cfg->libbpf_flags & ~XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD)
1: +    return -EINVAL;
1: +
1: +  cfg->rx_size = usr_cfg->rx_size;
1: +  cfg->tx_size = usr_cfg->tx_size;
1: +  cfg->libbpf_flags = usr_cfg->libbpf_flags;
1: +  cfg->xdp_flags = usr_cfg->xdp_flags;
1: +  cfg->bind_flags = usr_cfg->bind_flags;
1: +
1: +  return 0;
1:  }
1:  
1: -static void xsk_mmap_offsets_v1(struct xdp_mmap_offsets *off)
1: -{
1: -	struct xdp_mmap_offsets_v1 off_v1;
1: -
1: -	/* getsockopt on a kernel <= 5.3 has no flags fields.
1: -	 * Copy over the offsets to the correct places in the >=5.4 format
1: -	 * and put the flags where they would have been on that kernel.
1: -	 */
1: -	memcpy(&off_v1, off, sizeof(off_v1));
1: -
1: -	off->rx.producer = off_v1.rx.producer;
1: -	off->rx.consumer = off_v1.rx.consumer;
1: -	off->rx.desc = off_v1.rx.desc;
1: -	off->rx.flags = off_v1.rx.consumer + sizeof(__u32);
1: -
1: -	off->tx.producer = off_v1.tx.producer;
1: -	off->tx.consumer = off_v1.tx.consumer;
1: -	off->tx.desc = off_v1.tx.desc;
1: -	off->tx.flags = off_v1.tx.consumer + sizeof(__u32);
1: -
1: -	off->fr.producer = off_v1.fr.producer;
1: -	off->fr.consumer = off_v1.fr.consumer;
1: -	off->fr.desc = off_v1.fr.desc;
1: -	off->fr.flags = off_v1.fr.consumer + sizeof(__u32);
1: -
1: -	off->cr.producer = off_v1.cr.producer;
1: -	off->cr.consumer = off_v1.cr.consumer;
1: -	off->cr.desc = off_v1.cr.desc;
1: -	off->cr.flags = off_v1.cr.consumer + sizeof(__u32);
1: +static void xsk_mmap_offsets_v1(struct xdp_mmap_offsets *off) {
1: +  struct xdp_mmap_offsets_v1 off_v1;
1: +
1: +  /* getsockopt on a kernel <= 5.3 has no flags fields.
1: +   * Copy over the offsets to the correct places in the >=5.4 format
1: +   * and put the flags where they would have been on that kernel.
1: +   */
1: +  memcpy(&off_v1, off, sizeof(off_v1));
1: +
1: +  off->rx.producer = off_v1.rx.producer;
1: +  off->rx.consumer = off_v1.rx.consumer;
1: +  off->rx.desc = off_v1.rx.desc;
1: +  off->rx.flags = off_v1.rx.consumer + sizeof(__u32);
1: +
1: +  off->tx.producer = off_v1.tx.producer;
1: +  off->tx.consumer = off_v1.tx.consumer;
1: +  off->tx.desc = off_v1.tx.desc;
1: +  off->tx.flags = off_v1.tx.consumer + sizeof(__u32);
1: +
1: +  off->fr.producer = off_v1.fr.producer;
1: +  off->fr.consumer = off_v1.fr.consumer;
1: +  off->fr.desc = off_v1.fr.desc;
1: +  off->fr.flags = off_v1.fr.consumer + sizeof(__u32);
1: +
1: +  off->cr.producer = off_v1.cr.producer;
1: +  off->cr.consumer = off_v1.cr.consumer;
1: +  off->cr.desc = off_v1.cr.desc;
1: +  off->cr.flags = off_v1.cr.consumer + sizeof(__u32);
1:  }
1:  
1: -static int xsk_get_mmap_offsets(int fd, struct xdp_mmap_offsets *off)
1: -{
1: -	socklen_t optlen;
1: -	int err;
1: +static int xsk_get_mmap_offsets(int fd, struct xdp_mmap_offsets *off) {
1: +  socklen_t optlen;
1: +  int err;
1:  
1: -	optlen = sizeof(*off);
1: -	err = getsockopt(fd, SOL_XDP, XDP_MMAP_OFFSETS, off, &optlen);
1: -	if (err)
1: -		return err;
1: +  optlen = sizeof(*off);
1: +  err = getsockopt(fd, SOL_XDP, XDP_MMAP_OFFSETS, off, &optlen);
1: +  if (err)
1: +    return err;
1:  
1: -	if (optlen == sizeof(*off))
1: -		return 0;
1: +  if (optlen == sizeof(*off))
1: +    return 0;
1:  
1: -	if (optlen == sizeof(struct xdp_mmap_offsets_v1)) {
1: -		xsk_mmap_offsets_v1(off);
1: -		return 0;
1: -	}
1: +  if (optlen == sizeof(struct xdp_mmap_offsets_v1)) {
1: +    xsk_mmap_offsets_v1(off);
1: +    return 0;
1: +  }
1:  
1: -	return -EINVAL;
1: +  return -EINVAL;
1:  }
1:  
1:  static int xsk_create_umem_rings(struct xsk_umem *umem, int fd,
1: -				 struct xsk_ring_prod *fill,
1: -				 struct xsk_ring_cons *comp)
1: -{
1: -	struct xdp_mmap_offsets off;
1: -	void *map;
1: -	int err;
1: -
1: -	err = setsockopt(fd, SOL_XDP, XDP_UMEM_FILL_RING,
1: -			 &umem->config.fill_size,
1: -			 sizeof(umem->config.fill_size));
1: -	if (err)
1: -		return -errno;
1: -
1: -	err = setsockopt(fd, SOL_XDP, XDP_UMEM_COMPLETION_RING,
1: -			 &umem->config.comp_size,
1: -			 sizeof(umem->config.comp_size));
1: -	if (err)
1: -		return -errno;
1: -
1: -	err = xsk_get_mmap_offsets(fd, &off);
1: -	if (err)
1: -		return -errno;
1: -
1: -	map = mmap(NULL, off.fr.desc + umem->config.fill_size * sizeof(__u64),
1: -		   PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
1: -		   XDP_UMEM_PGOFF_FILL_RING);
1: -	if (map == MAP_FAILED)
1: -		return -errno;
1: -
1: -	fill->mask = umem->config.fill_size - 1;
1: -	fill->size = umem->config.fill_size;
1: -	fill->producer = map + off.fr.producer;
1: -	fill->consumer = map + off.fr.consumer;
1: -	fill->flags = map + off.fr.flags;
1: -	fill->ring = map + off.fr.desc;
1: -	fill->cached_cons = umem->config.fill_size;
1: -
1: -	map = mmap(NULL, off.cr.desc + umem->config.comp_size * sizeof(__u64),
1: -		   PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
1: -		   XDP_UMEM_PGOFF_COMPLETION_RING);
1: -	if (map == MAP_FAILED) {
1: -		err = -errno;
1: -		goto out_mmap;
1: -	}
1: -
1: -	comp->mask = umem->config.comp_size - 1;
1: -	comp->size = umem->config.comp_size;
1: -	comp->producer = map + off.cr.producer;
1: -	comp->consumer = map + off.cr.consumer;
1: -	comp->flags = map + off.cr.flags;
1: -	comp->ring = map + off.cr.desc;
1: -
1: -	return 0;
1: +                                 struct xsk_ring_prod *fill,
1: +                                 struct xsk_ring_cons *comp) {
1: +  struct xdp_mmap_offsets off;
1: +  void *map;
1: +  int err;
1: +
1: +  err = setsockopt(fd, SOL_XDP, XDP_UMEM_FILL_RING, &umem->config.fill_size,
1: +                   sizeof(umem->config.fill_size));
1: +  if (err)
1: +    return -errno;
1: +
1: +  err = setsockopt(fd, SOL_XDP, XDP_UMEM_COMPLETION_RING,
1: +                   &umem->config.comp_size, sizeof(umem->config.comp_size));
1: +  if (err)
1: +    return -errno;
1: +
1: +  err = xsk_get_mmap_offsets(fd, &off);
1: +  if (err)
1: +    return -errno;
1: +
1: +  map = mmap(NULL, off.fr.desc + umem->config.fill_size * sizeof(__u64),
1: +             PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
1: +             XDP_UMEM_PGOFF_FILL_RING);
1: +  if (map == MAP_FAILED)
1: +    return -errno;
1: +
1: +  fill->mask = umem->config.fill_size - 1;
1: +  fill->size = umem->config.fill_size;
1: +  fill->producer = map + off.fr.producer;
1: +  fill->consumer = map + off.fr.consumer;
1: +  fill->flags = map + off.fr.flags;
1: +  fill->ring = map + off.fr.desc;
1: +  fill->cached_cons = umem->config.fill_size;
1: +
1: +  map = mmap(NULL, off.cr.desc + umem->config.comp_size * sizeof(__u64),
1: +             PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
1: +             XDP_UMEM_PGOFF_COMPLETION_RING);
1: +  if (map == MAP_FAILED) {
1: +    err = -errno;
1: +    goto out_mmap;
1: +  }
1: +
1: +  comp->mask = umem->config.comp_size - 1;
1: +  comp->size = umem->config.comp_size;
1: +  comp->producer = map + off.cr.producer;
1: +  comp->consumer = map + off.cr.consumer;
1: +  comp->flags = map + off.cr.flags;
1: +  comp->ring = map + off.cr.desc;
1: +
1: +  return 0;
1:  
1:  out_mmap:
1: -	munmap(map, off.fr.desc + umem->config.fill_size * sizeof(__u64));
1: -	return err;
1: +  munmap(map, off.fr.desc + umem->config.fill_size * sizeof(__u64));
1: +  return err;
1:  }
1:  
1:  int xsk_umem__create_v0_0_4(struct xsk_umem **umem_ptr, void *umem_area,
1: -			    __u64 size, struct xsk_ring_prod *fill,
1: -			    struct xsk_ring_cons *comp,
1: -			    const struct xsk_umem_config *usr_config)
1: -{
1: -	struct xdp_umem_reg mr;
1: -	struct xsk_umem *umem;
1: -	int err;
1: -
1: -	if (!umem_area || !umem_ptr || !fill || !comp)
1: -		return -EFAULT;
1: -	if (!size && !xsk_page_aligned(umem_area))
1: -		return -EINVAL;
1: -
1: -	umem = calloc(1, sizeof(*umem));
1: -	if (!umem)
1: -		return -ENOMEM;
1: -
1: -	umem->fd = socket(AF_XDP, SOCK_RAW, 0);
1: -	if (umem->fd < 0) {
1: -		err = -errno;
1: -		goto out_umem_alloc;
1: -	}
1: -
1: -	umem->umem_area = umem_area;
1: -	INIT_LIST_HEAD(&umem->ctx_list);
1: -	xsk_set_umem_config(&umem->config, usr_config);
1: -
1: -	memset(&mr, 0, sizeof(mr));
1: -	mr.addr = (uintptr_t)umem_area;
1: -	mr.len = size;
1: -	mr.chunk_size = umem->config.frame_size;
1: -	mr.headroom = umem->config.frame_headroom;
1: -	mr.flags = umem->config.flags;
1: -
1: -	err = setsockopt(umem->fd, SOL_XDP, XDP_UMEM_REG, &mr, sizeof(mr));
1: -	if (err) {
1: -		err = -errno;
1: -		goto out_socket;
1: -	}
1: -
1: -	err = xsk_create_umem_rings(umem, umem->fd, fill, comp);
1: -	if (err)
1: -		goto out_socket;
1: -
1: -	umem->fill_save = fill;
1: -	umem->comp_save = comp;
1: -	*umem_ptr = umem;
1: -	return 0;
1: +                            __u64 size, struct xsk_ring_prod *fill,
1: +                            struct xsk_ring_cons *comp,
1: +                            const struct xsk_umem_config *usr_config) {
1: +  struct xdp_umem_reg mr;
1: +  struct xsk_umem *umem;
1: +  int err;
1: +
1: +  if (!umem_area || !umem_ptr || !fill || !comp)
1: +    return -EFAULT;
1: +  if (!size && !xsk_page_aligned(umem_area))
1: +    return -EINVAL;
1: +
1: +  umem = calloc(1, sizeof(*umem));
1: +  if (!umem)
1: +    return -ENOMEM;
1: +
1: +  umem->fd = socket(AF_XDP, SOCK_RAW, 0);
1: +  if (umem->fd < 0) {
1: +    err = -errno;
1: +    goto out_umem_alloc;
1: +  }
1: +
1: +  umem->umem_area = umem_area;
1: +  INIT_LIST_HEAD(&umem->ctx_list);
1: +  xsk_set_umem_config(&umem->config, usr_config);
1: +
1: +  memset(&mr, 0, sizeof(mr));
1: +  mr.addr = (uintptr_t)umem_area;
1: +  mr.len = size;
1: +  mr.chunk_size = umem->config.frame_size;
1: +  mr.headroom = umem->config.frame_headroom;
1: +  mr.flags = umem->config.flags;
1: +
1: +  err = setsockopt(umem->fd, SOL_XDP, XDP_UMEM_REG, &mr, sizeof(mr));
1: +  if (err) {
1: +    err = -errno;
1: +    goto out_socket;
1: +  }
1: +
1: +  err = xsk_create_umem_rings(umem, umem->fd, fill, comp);
1: +  if (err)
1: +    goto out_socket;
1: +
1: +  umem->fill_save = fill;
1: +  umem->comp_save = comp;
1: +  *umem_ptr = umem;
1: +  return 0;
1:  
1:  out_socket:
1: -	close(umem->fd);
1: +  close(umem->fd);
1:  out_umem_alloc:
1: -	free(umem);
1: -	return err;
1: +  free(umem);
1: +  return err;
1:  }
1:  
1:  struct xsk_umem_config_v1 {
1: -	__u32 fill_size;
1: -	__u32 comp_size;
1: -	__u32 frame_size;
1: -	__u32 frame_headroom;
1: +  __u32 fill_size;
1: +  __u32 comp_size;
1: +  __u32 frame_size;
1: +  __u32 frame_headroom;
1:  };
1:  
1:  int xsk_umem__create_v0_0_2(struct xsk_umem **umem_ptr, void *umem_area,
1: -			    __u64 size, struct xsk_ring_prod *fill,
1: -			    struct xsk_ring_cons *comp,
1: -			    const struct xsk_umem_config *usr_config)
1: -{
1: -	struct xsk_umem_config config;
1: +                            __u64 size, struct xsk_ring_prod *fill,
1: +                            struct xsk_ring_cons *comp,
1: +                            const struct xsk_umem_config *usr_config) {
1: +  struct xsk_umem_config config;
1:  
1: -	memcpy(&config, usr_config, sizeof(struct xsk_umem_config_v1));
1: -	config.flags = 0;
1: +  memcpy(&config, usr_config, sizeof(struct xsk_umem_config_v1));
1: +  config.flags = 0;
1:  
1: -	return xsk_umem__create_v0_0_4(umem_ptr, umem_area, size, fill, comp,
1: -					&config);
1: +  return xsk_umem__create_v0_0_4(umem_ptr, umem_area, size, fill, comp,
1: +                                 &config);
1:  }
1: -COMPAT_VERSION(xsk_umem__create_v0_0_2, xsk_umem__create, LIBBPF_0.0.2)
1: -DEFAULT_VERSION(xsk_umem__create_v0_0_4, xsk_umem__create, LIBBPF_0.0.4)
1: -
1: -static enum xsk_prog get_xsk_prog(void)
1: -{
1: -	enum xsk_prog detected = XSK_PROG_FALLBACK;
1: -	struct bpf_load_program_attr prog_attr;
1: -	struct bpf_create_map_attr map_attr;
1: -	__u32 size_out, retval, duration;
1: -	char data_in = 0, data_out;
1: -	struct bpf_insn insns[] = {
1: -		BPF_LD_MAP_FD(BPF_REG_1, 0),
1: -		BPF_MOV64_IMM(BPF_REG_2, 0),
1: -		BPF_MOV64_IMM(BPF_REG_3, XDP_PASS),
1: -		BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -	int prog_fd, map_fd, ret;
1: -
1: -	memset(&map_attr, 0, sizeof(map_attr));
1: -	map_attr.map_type = BPF_MAP_TYPE_XSKMAP;
1: -	map_attr.key_size = sizeof(int);
1: -	map_attr.value_size = sizeof(int);
1: -	map_attr.max_entries = 1;
1: -
1: -	map_fd = bpf_create_map_xattr(&map_attr);
1: -	if (map_fd < 0)
1: -		return detected;
1: -
1: -	insns[0].imm = map_fd;
1: -
1: -	memset(&prog_attr, 0, sizeof(prog_attr));
1: -	prog_attr.prog_type = BPF_PROG_TYPE_XDP;
1: -	prog_attr.insns = insns;
1: -	prog_attr.insns_cnt = ARRAY_SIZE(insns);
1: -	prog_attr.license = "GPL";
1: -
1: -	prog_fd = bpf_load_program_xattr(&prog_attr, NULL, 0);
1: -	if (prog_fd < 0) {
1: -		close(map_fd);
1: -		return detected;
1: -	}
1: -
1: -	ret = bpf_prog_test_run(prog_fd, 0, &data_in, 1, &data_out, &size_out, &retval, &duration);
1: -	if (!ret && retval == XDP_PASS)
1: -		detected = XSK_PROG_REDIRECT_FLAGS;
1: -	close(prog_fd);
1: -	close(map_fd);
1: -	return detected;
1: +COMPAT_VERSION(xsk_umem__create_v0_0_2, xsk_umem__create, LIBBPF_0 .0.2)
1: +DEFAULT_VERSION(xsk_umem__create_v0_0_4, xsk_umem__create, LIBBPF_0 .0.4)
1: +
1: +static enum xsk_prog get_xsk_prog(void) {
1: +  enum xsk_prog detected = XSK_PROG_FALLBACK;
1: +  struct bpf_load_program_attr prog_attr;
1: +  struct bpf_create_map_attr map_attr;
1: +  __u32 size_out, retval, duration;
1: +  char data_in = 0, data_out;
1: +  struct bpf_insn insns[] = {
1: +      BPF_LD_MAP_FD(BPF_REG_1, 0),
1: +      BPF_MOV64_IMM(BPF_REG_2, 0),
1: +      BPF_MOV64_IMM(BPF_REG_3, XDP_PASS),
1: +      BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: +      BPF_EXIT_INSN(),
1: +  };
1: +  int prog_fd, map_fd, ret;
1: +
1: +  memset(&map_attr, 0, sizeof(map_attr));
1: +  map_attr.map_type = BPF_MAP_TYPE_XSKMAP;
1: +  map_attr.key_size = sizeof(int);
1: +  map_attr.value_size = sizeof(int);
1: +  map_attr.max_entries = 1;
1: +
1: +  map_fd = bpf_create_map_xattr(&map_attr);
1: +  if (map_fd < 0)
1: +    return detected;
1: +
1: +  insns[0].imm = map_fd;
1: +
1: +  memset(&prog_attr, 0, sizeof(prog_attr));
1: +  prog_attr.prog_type = BPF_PROG_TYPE_XDP;
1: +  prog_attr.insns = insns;
1: +  prog_attr.insns_cnt = ARRAY_SIZE(insns);
1: +  prog_attr.license = "GPL";
1: +
1: +  prog_fd = bpf_load_program_xattr(&prog_attr, NULL, 0);
1: +  if (prog_fd < 0) {
1: +    close(map_fd);
1: +    return detected;
1: +  }
1: +
1: +  ret = bpf_prog_test_run(prog_fd, 0, &data_in, 1, &data_out, &size_out,
1: +                          &retval, &duration);
1: +  if (!ret && retval == XDP_PASS)
1: +    detected = XSK_PROG_REDIRECT_FLAGS;
1: +  close(prog_fd);
1: +  close(map_fd);
1: +  return detected;
1:  }
1:  
1: -static int xsk_load_xdp_prog(struct xsk_socket *xsk)
1: -{
1: -	static const int log_buf_size = 16 * 1024;
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	char log_buf[log_buf_size];
1: -	int prog_fd;
1: -
1: -	/* This is the fallback C-program:
1: -	 * SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx)
1: -	 * {
1: -	 *     int ret, index = ctx->rx_queue_index;
1: -	 *
1: -	 *     // A set entry here means that the correspnding queue_id
1: -	 *     // has an active AF_XDP socket bound to it.
1: -	 *     ret = bpf_redirect_map(&xsks_map, index, XDP_PASS);
1: -	 *     if (ret > 0)
1: -	 *         return ret;
1: -	 *
1: -	 *     // Fallback for pre-5.3 kernels, not supporting default
1: -	 *     // action in the flags parameter.
1: -	 *     if (bpf_map_lookup_elem(&xsks_map, &index))
1: -	 *         return bpf_redirect_map(&xsks_map, index, 0);
1: -	 *     return XDP_PASS;
1: -	 * }
1: -	 */
1: -	struct bpf_insn prog[] = {
1: -		/* r2 = *(u32 *)(r1 + 16) */
1: -		BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 16),
1: -		/* *(u32 *)(r10 - 4) = r2 */
1: -		BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_2, -4),
1: -		/* r1 = xskmap[] */
1: -		BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: -		/* r3 = XDP_PASS */
1: -		BPF_MOV64_IMM(BPF_REG_3, 2),
1: -		/* call bpf_redirect_map */
1: -		BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: -		/* if w0 != 0 goto pc+13 */
1: -		BPF_JMP32_IMM(BPF_JSGT, BPF_REG_0, 0, 13),
1: -		/* r2 = r10 */
1: -		BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
1: -		/* r2 += -4 */
1: -		BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -4),
1: -		/* r1 = xskmap[] */
1: -		BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: -		/* call bpf_map_lookup_elem */
1: -		BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
1: -		/* r1 = r0 */
1: -		BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
1: -		/* r0 = XDP_PASS */
1: -		BPF_MOV64_IMM(BPF_REG_0, 2),
1: -		/* if r1 == 0 goto pc+5 */
1: -		BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 0, 5),
1: -		/* r2 = *(u32 *)(r10 - 4) */
1: -		BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_10, -4),
1: -		/* r1 = xskmap[] */
1: -		BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: -		/* r3 = 0 */
1: -		BPF_MOV64_IMM(BPF_REG_3, 0),
1: -		/* call bpf_redirect_map */
1: -		BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: -		/* The jumps are to this instruction */
1: -		BPF_EXIT_INSN(),
1: -	};
1: -
1: -	/* This is the post-5.3 kernel C-program:
1: -	 * SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx)
1: -	 * {
1: -	 *     return bpf_redirect_map(&xsks_map, ctx->rx_queue_index, XDP_PASS);
1: -	 * }
1: -	 */
1: -	struct bpf_insn prog_redirect_flags[] = {
1: -		/* r2 = *(u32 *)(r1 + 16) */
1: -		BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 16),
1: -		/* r1 = xskmap[] */
1: -		BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: -		/* r3 = XDP_PASS */
1: -		BPF_MOV64_IMM(BPF_REG_3, 2),
1: -		/* call bpf_redirect_map */
1: -		BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: -		BPF_EXIT_INSN(),
1: -	};
1: -	size_t insns_cnt[] = {sizeof(prog) / sizeof(struct bpf_insn),
1: -			      sizeof(prog_redirect_flags) / sizeof(struct bpf_insn),
1: -	};
1: -	struct bpf_insn *progs[] = {prog, prog_redirect_flags};
1: -	enum xsk_prog option = get_xsk_prog();
1: -
1: -	prog_fd = bpf_load_program(BPF_PROG_TYPE_XDP, progs[option], insns_cnt[option],
1: -				   "LGPL-2.1 or BSD-2-Clause", 0, log_buf,
1: -				   log_buf_size);
1: -	if (prog_fd < 0) {
1: -		pr_warn("BPF log buffer:\n%s", log_buf);
1: -		return prog_fd;
1: -	}
1: -
1: -	ctx->prog_fd = prog_fd;
1: -	return 0;
1: +static int xsk_load_xdp_prog(struct xsk_socket *xsk) {
1: +  static const int log_buf_size = 16 * 1024;
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  char log_buf[log_buf_size];
1: +  int prog_fd;
1: +
1: +  /* This is the fallback C-program:
1: +   * SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx)
1: +   * {
1: +   *     int ret, index = ctx->rx_queue_index;
1: +   *
1: +   *     // A set entry here means that the correspnding queue_id
1: +   *     // has an active AF_XDP socket bound to it.
1: +   *     ret = bpf_redirect_map(&xsks_map, index, XDP_PASS);
1: +   *     if (ret > 0)
1: +   *         return ret;
1: +   *
1: +   *     // Fallback for pre-5.3 kernels, not supporting default
1: +   *     // action in the flags parameter.
1: +   *     if (bpf_map_lookup_elem(&xsks_map, &index))
1: +   *         return bpf_redirect_map(&xsks_map, index, 0);
1: +   *     return XDP_PASS;
1: +   * }
1: +   */
1: +  struct bpf_insn prog[] = {
1: +      /* r2 = *(u32 *)(r1 + 16) */
1: +      BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 16),
1: +      /* *(u32 *)(r10 - 4) = r2 */
1: +      BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_2, -4),
1: +      /* r1 = xskmap[] */
1: +      BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: +      /* r3 = XDP_PASS */
1: +      BPF_MOV64_IMM(BPF_REG_3, 2),
1: +      /* call bpf_redirect_map */
1: +      BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: +      /* if w0 != 0 goto pc+13 */
1: +      BPF_JMP32_IMM(BPF_JSGT, BPF_REG_0, 0, 13),
1: +      /* r2 = r10 */
1: +      BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
1: +      /* r2 += -4 */
1: +      BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -4),
1: +      /* r1 = xskmap[] */
1: +      BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: +      /* call bpf_map_lookup_elem */
1: +      BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
1: +      /* r1 = r0 */
1: +      BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
1: +      /* r0 = XDP_PASS */
1: +      BPF_MOV64_IMM(BPF_REG_0, 2),
1: +      /* if r1 == 0 goto pc+5 */
1: +      BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 0, 5),
1: +      /* r2 = *(u32 *)(r10 - 4) */
1: +      BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_10, -4),
1: +      /* r1 = xskmap[] */
1: +      BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: +      /* r3 = 0 */
1: +      BPF_MOV64_IMM(BPF_REG_3, 0),
1: +      /* call bpf_redirect_map */
1: +      BPF_EMIT_CALL(BPF_FUNC_redirect_map),
1: +      /* The jumps are to this instruction */
1: +      BPF_EXIT_INSN(),
1: +  };
1: +
1: +  /* This is the post-5.3 kernel C-program:
1: +   * SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx)
1: +   * {
1: +   *     return bpf_redirect_map(&xsks_map, ctx->rx_queue_index, XDP_PASS);
1: +   * }
1: +   */
1: +  struct bpf_insn prog_redirect_flags[] = {
1: +      /* r2 = *(u32 *)(r1 + 16) */
1: +      BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 16),
1: +      /* r1 = xskmap[] */
1: +      BPF_LD_MAP_FD(BPF_REG_1, ctx->xsks_map_fd),
1: +      /* r3 = XDP_PASS */
1: +      BPF_MOV64_IMM(BPF_REG_3, 2),
1: +      /* call bpf_redirect_map */
1: +      BPF_EMIT_CALL(BPF_FUNC_redirect_map), BPF_EXIT_INSN(),
1: +  };
1: +  size_t insns_cnt[] = {
1: +      sizeof(prog) / sizeof(struct bpf_insn),
1: +      sizeof(prog_redirect_flags) / sizeof(struct bpf_insn),
1: +  };
1: +  struct bpf_insn *progs[] = {prog, prog_redirect_flags};
1: +  enum xsk_prog option = get_xsk_prog();
1: +
1: +  prog_fd =
1: +      bpf_load_program(BPF_PROG_TYPE_XDP, progs[option], insns_cnt[option],
1: +                       "LGPL-2.1 or BSD-2-Clause", 0, log_buf, log_buf_size);
1: +  if (prog_fd < 0) {
1: +    pr_warn("BPF log buffer:\n%s", log_buf);
1: +    return prog_fd;
1: +  }
1: +
1: +  ctx->prog_fd = prog_fd;
1: +  return 0;
1:  }
1:  
1: -static int xsk_create_bpf_link(struct xsk_socket *xsk)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_link_create_opts, opts);
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	__u32 prog_id = 0;
1: -	int link_fd;
1: -	int err;
1: -
1: -	err = bpf_get_link_xdp_id(ctx->ifindex, &prog_id, xsk->config.xdp_flags);
1: -	if (err) {
1: -		pr_warn("getting XDP prog id failed\n");
1: -		return err;
1: -	}
1: -
1: -	/* if there's a netlink-based XDP prog loaded on interface, bail out
1: -	 * and ask user to do the removal by himself
1: -	 */
1: -	if (prog_id) {
1: -		pr_warn("Netlink-based XDP prog detected, please unload it in order to launch AF_XDP prog\n");
1: -		return -EINVAL;
1: -	}
1: -
1: -	opts.flags = xsk->config.xdp_flags & ~(XDP_FLAGS_UPDATE_IF_NOEXIST | XDP_FLAGS_REPLACE);
1: -
1: -	link_fd = bpf_link_create(ctx->prog_fd, ctx->ifindex, BPF_XDP, &opts);
1: -	if (link_fd < 0) {
1: -		pr_warn("bpf_link_create failed: %s\n", strerror(errno));
1: -		return link_fd;
1: -	}
1: -
1: -	ctx->link_fd = link_fd;
1: -	return 0;
1: +static int xsk_create_bpf_link(struct xsk_socket *xsk) {
1: +  DECLARE_LIBBPF_OPTS(bpf_link_create_opts, opts);
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  __u32 prog_id = 0;
1: +  int link_fd;
1: +  int err;
1: +
1: +  err = bpf_get_link_xdp_id(ctx->ifindex, &prog_id, xsk->config.xdp_flags);
1: +  if (err) {
1: +    pr_warn("getting XDP prog id failed\n");
1: +    return err;
1: +  }
1: +
1: +  /* if there's a netlink-based XDP prog loaded on interface, bail out
1: +   * and ask user to do the removal by himself
1: +   */
1: +  if (prog_id) {
1: +    pr_warn(
1: +        "Netlink-based XDP prog detected, please unload it in order to launch "
1: +        "AF_XDP prog\n");
1: +    return -EINVAL;
1: +  }
1: +
1: +  opts.flags = xsk->config.xdp_flags &
1: +               ~(XDP_FLAGS_UPDATE_IF_NOEXIST | XDP_FLAGS_REPLACE);
1: +
1: +  link_fd = bpf_link_create(ctx->prog_fd, ctx->ifindex, BPF_XDP, &opts);
1: +  if (link_fd < 0) {
1: +    pr_warn("bpf_link_create failed: %s\n", strerror(errno));
1: +    return link_fd;
1: +  }
1: +
1: +  ctx->link_fd = link_fd;
1: +  return 0;
1:  }
1:  
1: -static int xsk_get_max_queues(struct xsk_socket *xsk)
1: -{
1: -	struct ethtool_channels channels = { .cmd = ETHTOOL_GCHANNELS };
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	struct ifreq ifr = {};
1: -	int fd, err, ret;
1: -
1: -	fd = socket(AF_LOCAL, SOCK_DGRAM, 0);
1: -	if (fd < 0)
1: -		return -errno;
1: -
1: -	ifr.ifr_data = (void *)&channels;
1: -	memcpy(ifr.ifr_name, ctx->ifname, IFNAMSIZ - 1);
1: -	ifr.ifr_name[IFNAMSIZ - 1] = '\0';
1: -	err = ioctl(fd, SIOCETHTOOL, &ifr);
1: -	if (err && errno != EOPNOTSUPP) {
1: -		ret = -errno;
1: -		goto out;
1: -	}
1: -
1: -	if (err) {
1: -		/* If the device says it has no channels, then all traffic
1: -		 * is sent to a single stream, so max queues = 1.
1: -		 */
1: -		ret = 1;
1: -	} else {
1: -		/* Take the max of rx, tx, combined. Drivers return
1: -		 * the number of channels in different ways.
1: -		 */
1: -		ret = max(channels.max_rx, channels.max_tx);
1: -		ret = max(ret, (int)channels.max_combined);
1: -	}
1: +static int xsk_get_max_queues(struct xsk_socket *xsk) {
1: +  struct ethtool_channels channels = {.cmd = ETHTOOL_GCHANNELS};
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  struct ifreq ifr = {};
1: +  int fd, err, ret;
1: +
1: +  fd = socket(AF_LOCAL, SOCK_DGRAM, 0);
1: +  if (fd < 0)
1: +    return -errno;
1: +
1: +  ifr.ifr_data = (void *)&channels;
1: +  memcpy(ifr.ifr_name, ctx->ifname, IFNAMSIZ - 1);
1: +  ifr.ifr_name[IFNAMSIZ - 1] = '\0';
1: +  err = ioctl(fd, SIOCETHTOOL, &ifr);
1: +  if (err && errno != EOPNOTSUPP) {
1: +    ret = -errno;
1: +    goto out;
1: +  }
1: +
1: +  if (err) {
1: +    /* If the device says it has no channels, then all traffic
1: +     * is sent to a single stream, so max queues = 1.
1: +     */
1: +    ret = 1;
1: +  } else {
1: +    /* Take the max of rx, tx, combined. Drivers return
1: +     * the number of channels in different ways.
1: +     */
1: +    ret = max(channels.max_rx, channels.max_tx);
1: +    ret = max(ret, (int)channels.max_combined);
1: +  }
1:  
1:  out:
1: -	close(fd);
1: -	return ret;
1: +  close(fd);
1: +  return ret;
1:  }
1:  
1: -static int xsk_create_bpf_maps(struct xsk_socket *xsk)
1: -{
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	int max_queues;
1: -	int fd;
1: +static int xsk_create_bpf_maps(struct xsk_socket *xsk) {
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  int max_queues;
1: +  int fd;
1:  
1: -	max_queues = xsk_get_max_queues(xsk);
1: -	if (max_queues < 0)
1: -		return max_queues;
1: +  max_queues = xsk_get_max_queues(xsk);
1: +  if (max_queues < 0)
1: +    return max_queues;
1:  
1: -	fd = bpf_create_map_name(BPF_MAP_TYPE_XSKMAP, "xsks_map",
1: -				 sizeof(int), sizeof(int), max_queues, 0);
1: -	if (fd < 0)
1: -		return fd;
1: +  fd = bpf_create_map_name(BPF_MAP_TYPE_XSKMAP, "xsks_map", sizeof(int),
1: +                           sizeof(int), max_queues, 0);
1: +  if (fd < 0)
1: +    return fd;
1:  
1: -	ctx->xsks_map_fd = fd;
1: +  ctx->xsks_map_fd = fd;
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static void xsk_delete_bpf_maps(struct xsk_socket *xsk)
1: -{
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: +static void xsk_delete_bpf_maps(struct xsk_socket *xsk) {
1: +  struct xsk_ctx *ctx = xsk->ctx;
1:  
1: -	bpf_map_delete_elem(ctx->xsks_map_fd, &ctx->queue_id);
1: -	close(ctx->xsks_map_fd);
1: +  bpf_map_delete_elem(ctx->xsks_map_fd, &ctx->queue_id);
1: +  close(ctx->xsks_map_fd);
1:  }
1:  
1: -static int xsk_lookup_bpf_maps(struct xsk_socket *xsk)
1: -{
1: -	__u32 i, *map_ids, num_maps, prog_len = sizeof(struct bpf_prog_info);
1: -	__u32 map_len = sizeof(struct bpf_map_info);
1: -	struct bpf_prog_info prog_info = {};
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	struct bpf_map_info map_info;
1: -	int fd, err;
1: +static int xsk_lookup_bpf_maps(struct xsk_socket *xsk) {
1: +  __u32 i, *map_ids, num_maps, prog_len = sizeof(struct bpf_prog_info);
1: +  __u32 map_len = sizeof(struct bpf_map_info);
1: +  struct bpf_prog_info prog_info = {};
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  struct bpf_map_info map_info;
1: +  int fd, err;
1:  
1: -	err = bpf_obj_get_info_by_fd(ctx->prog_fd, &prog_info, &prog_len);
1: -	if (err)
1: -		return err;
1: +  err = bpf_obj_get_info_by_fd(ctx->prog_fd, &prog_info, &prog_len);
1: +  if (err)
1: +    return err;
1:  
1: -	num_maps = prog_info.nr_map_ids;
1: +  num_maps = prog_info.nr_map_ids;
1:  
1: -	map_ids = calloc(prog_info.nr_map_ids, sizeof(*map_ids));
1: -	if (!map_ids)
1: -		return -ENOMEM;
1: +  map_ids = calloc(prog_info.nr_map_ids, sizeof(*map_ids));
1: +  if (!map_ids)
1: +    return -ENOMEM;
1:  
1: -	memset(&prog_info, 0, prog_len);
1: -	prog_info.nr_map_ids = num_maps;
1: -	prog_info.map_ids = (__u64)(unsigned long)map_ids;
1: +  memset(&prog_info, 0, prog_len);
1: +  prog_info.nr_map_ids = num_maps;
1: +  prog_info.map_ids = (__u64)(unsigned long)map_ids;
1:  
1: -	err = bpf_obj_get_info_by_fd(ctx->prog_fd, &prog_info, &prog_len);
1: -	if (err)
1: -		goto out_map_ids;
1: +  err = bpf_obj_get_info_by_fd(ctx->prog_fd, &prog_info, &prog_len);
1: +  if (err)
1: +    goto out_map_ids;
1:  
1: -	ctx->xsks_map_fd = -1;
1: +  ctx->xsks_map_fd = -1;
1:  
1: -	for (i = 0; i < prog_info.nr_map_ids; i++) {
1: -		fd = bpf_map_get_fd_by_id(map_ids[i]);
1: -		if (fd < 0)
1: -			continue;
1: +  for (i = 0; i < prog_info.nr_map_ids; i++) {
1: +    fd = bpf_map_get_fd_by_id(map_ids[i]);
1: +    if (fd < 0)
1: +      continue;
1:  
1: -		memset(&map_info, 0, map_len);
1: -		err = bpf_obj_get_info_by_fd(fd, &map_info, &map_len);
1: -		if (err) {
1: -			close(fd);
1: -			continue;
1: -		}
1: +    memset(&map_info, 0, map_len);
1: +    err = bpf_obj_get_info_by_fd(fd, &map_info, &map_len);
1: +    if (err) {
1: +      close(fd);
1: +      continue;
1: +    }
1:  
1: -		if (!strncmp(map_info.name, "xsks_map", sizeof(map_info.name))) {
1: -			ctx->xsks_map_fd = fd;
1: -			break;
1: -		}
1: +    if (!strncmp(map_info.name, "xsks_map", sizeof(map_info.name))) {
1: +      ctx->xsks_map_fd = fd;
1: +      break;
1: +    }
1:  
1: -		close(fd);
1: -	}
1: +    close(fd);
1: +  }
1:  
1: -	if (ctx->xsks_map_fd == -1)
1: -		err = -ENOENT;
1: +  if (ctx->xsks_map_fd == -1)
1: +    err = -ENOENT;
1:  
1:  out_map_ids:
1: -	free(map_ids);
1: -	return err;
1: +  free(map_ids);
1: +  return err;
1:  }
1:  
1: -static int xsk_set_bpf_maps(struct xsk_socket *xsk)
1: -{
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: +static int xsk_set_bpf_maps(struct xsk_socket *xsk) {
1: +  struct xsk_ctx *ctx = xsk->ctx;
1:  
1: -	return bpf_map_update_elem(ctx->xsks_map_fd, &ctx->queue_id,
1: -				   &xsk->fd, 0);
1: +  return bpf_map_update_elem(ctx->xsks_map_fd, &ctx->queue_id, &xsk->fd, 0);
1:  }
1:  
1: -static int xsk_link_lookup(int ifindex, __u32 *prog_id, int *link_fd)
1: -{
1: -	struct bpf_link_info link_info;
1: -	__u32 link_len;
1: -	__u32 id = 0;
1: -	int err;
1: -	int fd;
1: -
1: -	while (true) {
1: -		err = bpf_link_get_next_id(id, &id);
1: -		if (err) {
1: -			if (errno == ENOENT) {
1: -				err = 0;
1: -				break;
1: -			}
1: -			pr_warn("can't get next link: %s\n", strerror(errno));
1: -			break;
1: -		}
1: -
1: -		fd = bpf_link_get_fd_by_id(id);
1: -		if (fd < 0) {
1: -			if (errno == ENOENT)
1: -				continue;
1: -			pr_warn("can't get link by id (%u): %s\n", id, strerror(errno));
1: -			err = -errno;
1: -			break;
1: -		}
1: -
1: -		link_len = sizeof(struct bpf_link_info);
1: -		memset(&link_info, 0, link_len);
1: -		err = bpf_obj_get_info_by_fd(fd, &link_info, &link_len);
1: -		if (err) {
1: -			pr_warn("can't get link info: %s\n", strerror(errno));
1: -			close(fd);
1: -			break;
1: -		}
1: -		if (link_info.type == BPF_LINK_TYPE_XDP) {
1: -			if (link_info.xdp.ifindex == ifindex) {
1: -				*link_fd = fd;
1: -				if (prog_id)
1: -					*prog_id = link_info.prog_id;
1: -				break;
1: -			}
1: -		}
1: -		close(fd);
1: -	}
1: -
1: -	return err;
1: +static int xsk_link_lookup(int ifindex, __u32 *prog_id, int *link_fd) {
1: +  struct bpf_link_info link_info;
1: +  __u32 link_len;
1: +  __u32 id = 0;
1: +  int err;
1: +  int fd;
1: +
1: +  while (true) {
1: +    err = bpf_link_get_next_id(id, &id);
1: +    if (err) {
1: +      if (errno == ENOENT) {
1: +        err = 0;
1: +        break;
1: +      }
1: +      pr_warn("can't get next link: %s\n", strerror(errno));
1: +      break;
1: +    }
1: +
1: +    fd = bpf_link_get_fd_by_id(id);
1: +    if (fd < 0) {
1: +      if (errno == ENOENT)
1: +        continue;
1: +      pr_warn("can't get link by id (%u): %s\n", id, strerror(errno));
1: +      err = -errno;
1: +      break;
1: +    }
1: +
1: +    link_len = sizeof(struct bpf_link_info);
1: +    memset(&link_info, 0, link_len);
1: +    err = bpf_obj_get_info_by_fd(fd, &link_info, &link_len);
1: +    if (err) {
1: +      pr_warn("can't get link info: %s\n", strerror(errno));
1: +      close(fd);
1: +      break;
1: +    }
1: +    if (link_info.type == BPF_LINK_TYPE_XDP) {
1: +      if (link_info.xdp.ifindex == ifindex) {
1: +        *link_fd = fd;
1: +        if (prog_id)
1: +          *prog_id = link_info.prog_id;
1: +        break;
1: +      }
1: +    }
1: +    close(fd);
1: +  }
1: +
1: +  return err;
1:  }
1:  
1: -static bool xsk_probe_bpf_link(void)
1: -{
1: -	DECLARE_LIBBPF_OPTS(bpf_link_create_opts, opts,
1: -			    .flags = XDP_FLAGS_SKB_MODE);
1: -	struct bpf_load_program_attr prog_attr;
1: -	struct bpf_insn insns[2] = {
1: -		BPF_MOV64_IMM(BPF_REG_0, XDP_PASS),
1: -		BPF_EXIT_INSN()
1: -	};
1: -	int prog_fd, link_fd = -1;
1: -	int ifindex_lo = 1;
1: -	bool ret = false;
1: -	int err;
1: -
1: -	err = xsk_link_lookup(ifindex_lo, NULL, &link_fd);
1: -	if (err)
1: -		return ret;
1: -
1: -	if (link_fd >= 0)
1: -		return true;
1: -
1: -	memset(&prog_attr, 0, sizeof(prog_attr));
1: -	prog_attr.prog_type = BPF_PROG_TYPE_XDP;
1: -	prog_attr.insns = insns;
1: -	prog_attr.insns_cnt = ARRAY_SIZE(insns);
1: -	prog_attr.license = "GPL";
1: -
1: -	prog_fd = bpf_load_program_xattr(&prog_attr, NULL, 0);
1: -	if (prog_fd < 0)
1: -		return ret;
1: -
1: -	link_fd = bpf_link_create(prog_fd, ifindex_lo, BPF_XDP, &opts);
1: -	close(prog_fd);
1: -
1: -	if (link_fd >= 0) {
1: -		ret = true;
1: -		close(link_fd);
1: -	}
1: -
1: -	return ret;
1: +static bool xsk_probe_bpf_link(void) {
1: +  DECLARE_LIBBPF_OPTS(bpf_link_create_opts, opts, .flags = XDP_FLAGS_SKB_MODE);
1: +  struct bpf_load_program_attr prog_attr;
1: +  struct bpf_insn insns[2] = {BPF_MOV64_IMM(BPF_REG_0, XDP_PASS),
1: +                              BPF_EXIT_INSN()};
1: +  int prog_fd, link_fd = -1;
1: +  int ifindex_lo = 1;
1: +  bool ret = false;
1: +  int err;
1: +
1: +  err = xsk_link_lookup(ifindex_lo, NULL, &link_fd);
1: +  if (err)
1: +    return ret;
1: +
1: +  if (link_fd >= 0)
1: +    return true;
1: +
1: +  memset(&prog_attr, 0, sizeof(prog_attr));
1: +  prog_attr.prog_type = BPF_PROG_TYPE_XDP;
1: +  prog_attr.insns = insns;
1: +  prog_attr.insns_cnt = ARRAY_SIZE(insns);
1: +  prog_attr.license = "GPL";
1: +
1: +  prog_fd = bpf_load_program_xattr(&prog_attr, NULL, 0);
1: +  if (prog_fd < 0)
1: +    return ret;
1: +
1: +  link_fd = bpf_link_create(prog_fd, ifindex_lo, BPF_XDP, &opts);
1: +  close(prog_fd);
1: +
1: +  if (link_fd >= 0) {
1: +    ret = true;
1: +    close(link_fd);
1: +  }
1: +
1: +  return ret;
1:  }
1:  
1: -static int xsk_create_xsk_struct(int ifindex, struct xsk_socket *xsk)
1: -{
1: -	char ifname[IFNAMSIZ];
1: -	struct xsk_ctx *ctx;
1: -	char *interface;
1: +static int xsk_create_xsk_struct(int ifindex, struct xsk_socket *xsk) {
1: +  char ifname[IFNAMSIZ];
1: +  struct xsk_ctx *ctx;
1: +  char *interface;
1:  
1: -	ctx = calloc(1, sizeof(*ctx));
1: -	if (!ctx)
1: -		return -ENOMEM;
1: +  ctx = calloc(1, sizeof(*ctx));
1: +  if (!ctx)
1: +    return -ENOMEM;
1:  
1: -	interface = if_indextoname(ifindex, &ifname[0]);
1: -	if (!interface) {
1: -		free(ctx);
1: -		return -errno;
1: -	}
1: +  interface = if_indextoname(ifindex, &ifname[0]);
1: +  if (!interface) {
1: +    free(ctx);
1: +    return -errno;
1: +  }
1:  
1: -	ctx->ifindex = ifindex;
1: -	memcpy(ctx->ifname, ifname, IFNAMSIZ -1);
1: -	ctx->ifname[IFNAMSIZ - 1] = 0;
1: +  ctx->ifindex = ifindex;
1: +  memcpy(ctx->ifname, ifname, IFNAMSIZ - 1);
1: +  ctx->ifname[IFNAMSIZ - 1] = 0;
1:  
1: -	xsk->ctx = ctx;
1: -	xsk->ctx->has_bpf_link = xsk_probe_bpf_link();
1: +  xsk->ctx = ctx;
1: +  xsk->ctx->has_bpf_link = xsk_probe_bpf_link();
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -static int xsk_init_xdp_res(struct xsk_socket *xsk,
1: -			    int *xsks_map_fd)
1: -{
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	int err;
1: +static int xsk_init_xdp_res(struct xsk_socket *xsk, int *xsks_map_fd) {
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  int err;
1:  
1: -	err = xsk_create_bpf_maps(xsk);
1: -	if (err)
1: -		return err;
1: +  err = xsk_create_bpf_maps(xsk);
1: +  if (err)
1: +    return err;
1:  
1: -	err = xsk_load_xdp_prog(xsk);
1: -	if (err)
1: -		goto err_load_xdp_prog;
1: +  err = xsk_load_xdp_prog(xsk);
1: +  if (err)
1: +    goto err_load_xdp_prog;
1:  
1: -	if (ctx->has_bpf_link)
1: -		err = xsk_create_bpf_link(xsk);
1: -	else
1: -		err = bpf_set_link_xdp_fd(xsk->ctx->ifindex, ctx->prog_fd,
1: -					  xsk->config.xdp_flags);
1: +  if (ctx->has_bpf_link)
1: +    err = xsk_create_bpf_link(xsk);
1: +  else
1: +    err = bpf_set_link_xdp_fd(xsk->ctx->ifindex, ctx->prog_fd,
1: +                              xsk->config.xdp_flags);
1:  
1: -	if (err)
1: -		goto err_attach_xdp_prog;
1: +  if (err)
1: +    goto err_attach_xdp_prog;
1:  
1: -	if (!xsk->rx)
1: -		return err;
1: +  if (!xsk->rx)
1: +    return err;
1:  
1: -	err = xsk_set_bpf_maps(xsk);
1: -	if (err)
1: -		goto err_set_bpf_maps;
1: +  err = xsk_set_bpf_maps(xsk);
1: +  if (err)
1: +    goto err_set_bpf_maps;
1:  
1: -	return err;
1: +  return err;
1:  
1:  err_set_bpf_maps:
1: -	if (ctx->has_bpf_link)
1: -		close(ctx->link_fd);
1: -	else
1: -		bpf_set_link_xdp_fd(ctx->ifindex, -1, 0);
1: +  if (ctx->has_bpf_link)
1: +    close(ctx->link_fd);
1: +  else
1: +    bpf_set_link_xdp_fd(ctx->ifindex, -1, 0);
1:  err_attach_xdp_prog:
1: -	close(ctx->prog_fd);
1: +  close(ctx->prog_fd);
1:  err_load_xdp_prog:
1: -	xsk_delete_bpf_maps(xsk);
1: -	return err;
1: +  xsk_delete_bpf_maps(xsk);
1: +  return err;
1:  }
1:  
1: -static int xsk_lookup_xdp_res(struct xsk_socket *xsk, int *xsks_map_fd, int prog_id)
1: -{
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	int err;
1: +static int xsk_lookup_xdp_res(struct xsk_socket *xsk, int *xsks_map_fd,
1: +                              int prog_id) {
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  int err;
1:  
1: -	ctx->prog_fd = bpf_prog_get_fd_by_id(prog_id);
1: -	if (ctx->prog_fd < 0) {
1: -		err = -errno;
1: -		goto err_prog_fd;
1: -	}
1: -	err = xsk_lookup_bpf_maps(xsk);
1: -	if (err)
1: -		goto err_lookup_maps;
1: +  ctx->prog_fd = bpf_prog_get_fd_by_id(prog_id);
1: +  if (ctx->prog_fd < 0) {
1: +    err = -errno;
1: +    goto err_prog_fd;
1: +  }
1: +  err = xsk_lookup_bpf_maps(xsk);
1: +  if (err)
1: +    goto err_lookup_maps;
1:  
1: -	if (!xsk->rx)
1: -		return err;
1: +  if (!xsk->rx)
1: +    return err;
1:  
1: -	err = xsk_set_bpf_maps(xsk);
1: -	if (err)
1: -		goto err_set_maps;
1: +  err = xsk_set_bpf_maps(xsk);
1: +  if (err)
1: +    goto err_set_maps;
1:  
1: -	return err;
1: +  return err;
1:  
1:  err_set_maps:
1: -	close(ctx->xsks_map_fd);
1: +  close(ctx->xsks_map_fd);
1:  err_lookup_maps:
1: -	close(ctx->prog_fd);
1: +  close(ctx->prog_fd);
1:  err_prog_fd:
1: -	if (ctx->has_bpf_link)
1: -		close(ctx->link_fd);
1: -	return err;
1: +  if (ctx->has_bpf_link)
1: +    close(ctx->link_fd);
1: +  return err;
1:  }
1:  
1: -static int __xsk_setup_xdp_prog(struct xsk_socket *_xdp, int *xsks_map_fd)
1: -{
1: -	struct xsk_socket *xsk = _xdp;
1: -	struct xsk_ctx *ctx = xsk->ctx;
1: -	__u32 prog_id = 0;
1: -	int err;
1: +static int __xsk_setup_xdp_prog(struct xsk_socket *_xdp, int *xsks_map_fd) {
1: +  struct xsk_socket *xsk = _xdp;
1: +  struct xsk_ctx *ctx = xsk->ctx;
1: +  __u32 prog_id = 0;
1: +  int err;
1:  
1: -	if (ctx->has_bpf_link)
1: -		err = xsk_link_lookup(ctx->ifindex, &prog_id, &ctx->link_fd);
1: -	else
1: -		err = bpf_get_link_xdp_id(ctx->ifindex, &prog_id, xsk->config.xdp_flags);
1: +  if (ctx->has_bpf_link)
1: +    err = xsk_link_lookup(ctx->ifindex, &prog_id, &ctx->link_fd);
1: +  else
1: +    err = bpf_get_link_xdp_id(ctx->ifindex, &prog_id, xsk->config.xdp_flags);
1:  
1: -	if (err)
1: -		return err;
1: +  if (err)
1: +    return err;
1:  
1: -	err = !prog_id ? xsk_init_xdp_res(xsk, xsks_map_fd) :
1: -			 xsk_lookup_xdp_res(xsk, xsks_map_fd, prog_id);
1: +  err = !prog_id ? xsk_init_xdp_res(xsk, xsks_map_fd)
1: +                 : xsk_lookup_xdp_res(xsk, xsks_map_fd, prog_id);
1:  
1: -	if (!err && xsks_map_fd)
1: -		*xsks_map_fd = ctx->xsks_map_fd;
1: +  if (!err && xsks_map_fd)
1: +    *xsks_map_fd = ctx->xsks_map_fd;
1:  
1: -	return err;
1: +  return err;
1:  }
1:  
1:  static struct xsk_ctx *xsk_get_ctx(struct xsk_umem *umem, int ifindex,
1: -				   __u32 queue_id)
1: -{
1: -	struct xsk_ctx *ctx;
1: +                                   __u32 queue_id) {
1: +  struct xsk_ctx *ctx;
1:  
1: -	if (list_empty(&umem->ctx_list))
1: -		return NULL;
1: +  if (list_empty(&umem->ctx_list))
1: +    return NULL;
1:  
1: -	list_for_each_entry(ctx, &umem->ctx_list, list) {
1: -		if (ctx->ifindex == ifindex && ctx->queue_id == queue_id) {
1: -			ctx->refcount++;
1: -			return ctx;
1: -		}
1: -	}
1: +  list_for_each_entry(ctx, &umem->ctx_list, list) {
1: +    if (ctx->ifindex == ifindex && ctx->queue_id == queue_id) {
1: +      ctx->refcount++;
1: +      return ctx;
1: +    }
1: +  }
1:  
1: -	return NULL;
1: +  return NULL;
1:  }
1:  
1: -static void xsk_put_ctx(struct xsk_ctx *ctx, bool unmap)
1: -{
1: -	struct xsk_umem *umem = ctx->umem;
1: -	struct xdp_mmap_offsets off;
1: -	int err;
1: +static void xsk_put_ctx(struct xsk_ctx *ctx, bool unmap) {
1: +  struct xsk_umem *umem = ctx->umem;
1: +  struct xdp_mmap_offsets off;
1: +  int err;
1:  
1: -	if (--ctx->refcount)
1: -		return;
1: +  if (--ctx->refcount)
1: +    return;
1:  
1: -	if (!unmap)
1: -		goto out_free;
1: +  if (!unmap)
1: +    goto out_free;
1:  
1: -	err = xsk_get_mmap_offsets(umem->fd, &off);
1: -	if (err)
1: -		goto out_free;
1: +  err = xsk_get_mmap_offsets(umem->fd, &off);
1: +  if (err)
1: +    goto out_free;
1:  
1: -	munmap(ctx->fill->ring - off.fr.desc, off.fr.desc + umem->config.fill_size *
1: -	       sizeof(__u64));
1: -	munmap(ctx->comp->ring - off.cr.desc, off.cr.desc + umem->config.comp_size *
1: -	       sizeof(__u64));
1: +  munmap(ctx->fill->ring - off.fr.desc,
1: +         off.fr.desc + umem->config.fill_size * sizeof(__u64));
1: +  munmap(ctx->comp->ring - off.cr.desc,
1: +         off.cr.desc + umem->config.comp_size * sizeof(__u64));
1:  
1:  out_free:
1: -	list_del(&ctx->list);
1: -	free(ctx);
1: +  list_del(&ctx->list);
1: +  free(ctx);
1:  }
1:  
1:  static struct xsk_ctx *xsk_create_ctx(struct xsk_socket *xsk,
1: -				      struct xsk_umem *umem, int ifindex,
1: -				      const char *ifname, __u32 queue_id,
1: -				      struct xsk_ring_prod *fill,
1: -				      struct xsk_ring_cons *comp)
1: -{
1: -	struct xsk_ctx *ctx;
1: -	int err;
1: -
1: -	ctx = calloc(1, sizeof(*ctx));
1: -	if (!ctx)
1: -		return NULL;
1: -
1: -	if (!umem->fill_save) {
1: -		err = xsk_create_umem_rings(umem, xsk->fd, fill, comp);
1: -		if (err) {
1: -			free(ctx);
1: -			return NULL;
1: -		}
1: -	} else if (umem->fill_save != fill || umem->comp_save != comp) {
1: -		/* Copy over rings to new structs. */
1: -		memcpy(fill, umem->fill_save, sizeof(*fill));
1: -		memcpy(comp, umem->comp_save, sizeof(*comp));
1: -	}
1: -
1: -	ctx->ifindex = ifindex;
1: -	ctx->refcount = 1;
1: -	ctx->umem = umem;
1: -	ctx->queue_id = queue_id;
1: -	memcpy(ctx->ifname, ifname, IFNAMSIZ - 1);
1: -	ctx->ifname[IFNAMSIZ - 1] = '\0';
1: -
1: -	ctx->fill = fill;
1: -	ctx->comp = comp;
1: -	list_add(&ctx->list, &umem->ctx_list);
1: -	return ctx;
1: +                                      struct xsk_umem *umem, int ifindex,
1: +                                      const char *ifname, __u32 queue_id,
1: +                                      struct xsk_ring_prod *fill,
1: +                                      struct xsk_ring_cons *comp) {
1: +  struct xsk_ctx *ctx;
1: +  int err;
1: +
1: +  ctx = calloc(1, sizeof(*ctx));
1: +  if (!ctx)
1: +    return NULL;
1: +
1: +  if (!umem->fill_save) {
1: +    err = xsk_create_umem_rings(umem, xsk->fd, fill, comp);
1: +    if (err) {
1: +      free(ctx);
1: +      return NULL;
1: +    }
1: +  } else if (umem->fill_save != fill || umem->comp_save != comp) {
1: +    /* Copy over rings to new structs. */
1: +    memcpy(fill, umem->fill_save, sizeof(*fill));
1: +    memcpy(comp, umem->comp_save, sizeof(*comp));
1: +  }
1: +
1: +  ctx->ifindex = ifindex;
1: +  ctx->refcount = 1;
1: +  ctx->umem = umem;
1: +  ctx->queue_id = queue_id;
1: +  memcpy(ctx->ifname, ifname, IFNAMSIZ - 1);
1: +  ctx->ifname[IFNAMSIZ - 1] = '\0';
1: +
1: +  ctx->fill = fill;
1: +  ctx->comp = comp;
1: +  list_add(&ctx->list, &umem->ctx_list);
1: +  return ctx;
1:  }
1:  
1: -static void xsk_destroy_xsk_struct(struct xsk_socket *xsk)
1: -{
1: -	free(xsk->ctx);
1: -	free(xsk);
1: +static void xsk_destroy_xsk_struct(struct xsk_socket *xsk) {
1: +  free(xsk->ctx);
1: +  free(xsk);
1:  }
1:  
1: -int xsk_socket__update_xskmap(struct xsk_socket *xsk, int fd)
1: -{
1: -	xsk->ctx->xsks_map_fd = fd;
1: -	return xsk_set_bpf_maps(xsk);
1: +int xsk_socket__update_xskmap(struct xsk_socket *xsk, int fd) {
1: +  xsk->ctx->xsks_map_fd = fd;
1: +  return xsk_set_bpf_maps(xsk);
1:  }
1:  
1: -int xsk_setup_xdp_prog(int ifindex, int *xsks_map_fd)
1: -{
1: -	struct xsk_socket *xsk;
1: -	int res;
1: +int xsk_setup_xdp_prog(int ifindex, int *xsks_map_fd) {
1: +  struct xsk_socket *xsk;
1: +  int res;
1:  
1: -	xsk = calloc(1, sizeof(*xsk));
1: -	if (!xsk)
1: -		return -ENOMEM;
1: +  xsk = calloc(1, sizeof(*xsk));
1: +  if (!xsk)
1: +    return -ENOMEM;
1:  
1: -	res = xsk_create_xsk_struct(ifindex, xsk);
1: -	if (res) {
1: -		free(xsk);
1: -		return -EINVAL;
1: -	}
1: +  res = xsk_create_xsk_struct(ifindex, xsk);
1: +  if (res) {
1: +    free(xsk);
1: +    return -EINVAL;
1: +  }
1:  
1: -	res = __xsk_setup_xdp_prog(xsk, xsks_map_fd);
1: +  res = __xsk_setup_xdp_prog(xsk, xsks_map_fd);
1:  
1: -	xsk_destroy_xsk_struct(xsk);
1: +  xsk_destroy_xsk_struct(xsk);
1:  
1: -	return res;
1: +  return res;
1:  }
1:  
1: -int xsk_socket__create_shared(struct xsk_socket **xsk_ptr,
1: -			      const char *ifname,
1: -			      __u32 queue_id, struct xsk_umem *umem,
1: -			      struct xsk_ring_cons *rx,
1: -			      struct xsk_ring_prod *tx,
1: -			      struct xsk_ring_prod *fill,
1: -			      struct xsk_ring_cons *comp,
1: -			      const struct xsk_socket_config *usr_config)
1: -{
1: -	bool unmap, rx_setup_done = false, tx_setup_done = false;
1: -	void *rx_map = NULL, *tx_map = NULL;
1: -	struct sockaddr_xdp sxdp = {};
1: -	struct xdp_mmap_offsets off;
1: -	struct xsk_socket *xsk;
1: -	struct xsk_ctx *ctx;
1: -	int err, ifindex;
1: -
1: -	if (!umem || !xsk_ptr || !(rx || tx))
1: -		return -EFAULT;
1: -
1: -	unmap = umem->fill_save != fill;
1: -
1: -	xsk = calloc(1, sizeof(*xsk));
1: -	if (!xsk)
1: -		return -ENOMEM;
1: -
1: -	err = xsk_set_xdp_socket_config(&xsk->config, usr_config);
1: -	if (err)
1: -		goto out_xsk_alloc;
1: -
1: -	xsk->outstanding_tx = 0;
1: -	ifindex = if_nametoindex(ifname);
1: -	if (!ifindex) {
1: -		err = -errno;
1: -		goto out_xsk_alloc;
1: -	}
1: -
1: -	if (umem->refcount++ > 0) {
1: -		xsk->fd = socket(AF_XDP, SOCK_RAW, 0);
1: -		if (xsk->fd < 0) {
1: -			err = -errno;
1: -			goto out_xsk_alloc;
1: -		}
1: -	} else {
1: -		xsk->fd = umem->fd;
1: -		rx_setup_done = umem->rx_ring_setup_done;
1: -		tx_setup_done = umem->tx_ring_setup_done;
1: -	}
1: -
1: -	ctx = xsk_get_ctx(umem, ifindex, queue_id);
1: -	if (!ctx) {
1: -		if (!fill || !comp) {
1: -			err = -EFAULT;
1: -			goto out_socket;
1: -		}
1: -
1: -		ctx = xsk_create_ctx(xsk, umem, ifindex, ifname, queue_id,
1: -				     fill, comp);
1: -		if (!ctx) {
1: -			err = -ENOMEM;
1: -			goto out_socket;
1: -		}
1: -	}
1: -	xsk->ctx = ctx;
1: -	xsk->ctx->has_bpf_link = xsk_probe_bpf_link();
1: -
1: -	if (rx && !rx_setup_done) {
1: -		err = setsockopt(xsk->fd, SOL_XDP, XDP_RX_RING,
1: -				 &xsk->config.rx_size,
1: -				 sizeof(xsk->config.rx_size));
1: -		if (err) {
1: -			err = -errno;
1: -			goto out_put_ctx;
1: -		}
1: -		if (xsk->fd == umem->fd)
1: -			umem->rx_ring_setup_done = true;
1: -	}
1: -	if (tx && !tx_setup_done) {
1: -		err = setsockopt(xsk->fd, SOL_XDP, XDP_TX_RING,
1: -				 &xsk->config.tx_size,
1: -				 sizeof(xsk->config.tx_size));
1: -		if (err) {
1: -			err = -errno;
1: -			goto out_put_ctx;
1: -		}
1: -		if (xsk->fd == umem->fd)
1: -			umem->tx_ring_setup_done = true;
1: -	}
1: -
1: -	err = xsk_get_mmap_offsets(xsk->fd, &off);
1: -	if (err) {
1: -		err = -errno;
1: -		goto out_put_ctx;
1: -	}
1: -
1: -	if (rx) {
1: -		rx_map = mmap(NULL, off.rx.desc +
1: -			      xsk->config.rx_size * sizeof(struct xdp_desc),
1: -			      PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE,
1: -			      xsk->fd, XDP_PGOFF_RX_RING);
1: -		if (rx_map == MAP_FAILED) {
1: -			err = -errno;
1: -			goto out_put_ctx;
1: -		}
1: -
1: -		rx->mask = xsk->config.rx_size - 1;
1: -		rx->size = xsk->config.rx_size;
1: -		rx->producer = rx_map + off.rx.producer;
1: -		rx->consumer = rx_map + off.rx.consumer;
1: -		rx->flags = rx_map + off.rx.flags;
1: -		rx->ring = rx_map + off.rx.desc;
1: -		rx->cached_prod = *rx->producer;
1: -		rx->cached_cons = *rx->consumer;
1: -	}
1: -	xsk->rx = rx;
1: -
1: -	if (tx) {
1: -		tx_map = mmap(NULL, off.tx.desc +
1: -			      xsk->config.tx_size * sizeof(struct xdp_desc),
1: -			      PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE,
1: -			      xsk->fd, XDP_PGOFF_TX_RING);
1: -		if (tx_map == MAP_FAILED) {
1: -			err = -errno;
1: -			goto out_mmap_rx;
1: -		}
1: -
1: -		tx->mask = xsk->config.tx_size - 1;
1: -		tx->size = xsk->config.tx_size;
1: -		tx->producer = tx_map + off.tx.producer;
1: -		tx->consumer = tx_map + off.tx.consumer;
1: -		tx->flags = tx_map + off.tx.flags;
1: -		tx->ring = tx_map + off.tx.desc;
1: -		tx->cached_prod = *tx->producer;
1: -		/* cached_cons is r->size bigger than the real consumer pointer
1: -		 * See xsk_prod_nb_free
1: -		 */
1: -		tx->cached_cons = *tx->consumer + xsk->config.tx_size;
1: -	}
1: -	xsk->tx = tx;
1: -
1: -	sxdp.sxdp_family = PF_XDP;
1: -	sxdp.sxdp_ifindex = ctx->ifindex;
1: -	sxdp.sxdp_queue_id = ctx->queue_id;
1: -	if (umem->refcount > 1) {
1: -		sxdp.sxdp_flags |= XDP_SHARED_UMEM;
1: -		sxdp.sxdp_shared_umem_fd = umem->fd;
1: -	} else {
1: -		sxdp.sxdp_flags = xsk->config.bind_flags;
1: -	}
1: -
1: -	err = bind(xsk->fd, (struct sockaddr *)&sxdp, sizeof(sxdp));
1: -	if (err) {
1: -		err = -errno;
1: -		goto out_mmap_tx;
1: -	}
1: -
1: -	ctx->prog_fd = -1;
1: -
1: -	if (!(xsk->config.libbpf_flags & XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD)) {
1: -		err = __xsk_setup_xdp_prog(xsk, NULL);
1: -		if (err)
1: -			goto out_mmap_tx;
1: -	}
1: -
1: -	*xsk_ptr = xsk;
1: -	umem->fill_save = NULL;
1: -	umem->comp_save = NULL;
1: -	return 0;
1: +int xsk_socket__create_shared(struct xsk_socket **xsk_ptr, const char *ifname,
1: +                              __u32 queue_id, struct xsk_umem *umem,
1: +                              struct xsk_ring_cons *rx,
1: +                              struct xsk_ring_prod *tx,
1: +                              struct xsk_ring_prod *fill,
1: +                              struct xsk_ring_cons *comp,
1: +                              const struct xsk_socket_config *usr_config) {
1: +  bool unmap, rx_setup_done = false, tx_setup_done = false;
1: +  void *rx_map = NULL, *tx_map = NULL;
1: +  struct sockaddr_xdp sxdp = {};
1: +  struct xdp_mmap_offsets off;
1: +  struct xsk_socket *xsk;
1: +  struct xsk_ctx *ctx;
1: +  int err, ifindex;
1: +
1: +  if (!umem || !xsk_ptr || !(rx || tx))
1: +    return -EFAULT;
1: +
1: +  unmap = umem->fill_save != fill;
1: +
1: +  xsk = calloc(1, sizeof(*xsk));
1: +  if (!xsk)
1: +    return -ENOMEM;
1: +
1: +  err = xsk_set_xdp_socket_config(&xsk->config, usr_config);
1: +  if (err)
1: +    goto out_xsk_alloc;
1: +
1: +  xsk->outstanding_tx = 0;
1: +  ifindex = if_nametoindex(ifname);
1: +  if (!ifindex) {
1: +    err = -errno;
1: +    goto out_xsk_alloc;
1: +  }
1: +
1: +  if (umem->refcount++ > 0) {
1: +    xsk->fd = socket(AF_XDP, SOCK_RAW, 0);
1: +    if (xsk->fd < 0) {
1: +      err = -errno;
1: +      goto out_xsk_alloc;
1: +    }
1: +  } else {
1: +    xsk->fd = umem->fd;
1: +    rx_setup_done = umem->rx_ring_setup_done;
1: +    tx_setup_done = umem->tx_ring_setup_done;
1: +  }
1: +
1: +  ctx = xsk_get_ctx(umem, ifindex, queue_id);
1: +  if (!ctx) {
1: +    if (!fill || !comp) {
1: +      err = -EFAULT;
1: +      goto out_socket;
1: +    }
1: +
1: +    ctx = xsk_create_ctx(xsk, umem, ifindex, ifname, queue_id, fill, comp);
1: +    if (!ctx) {
1: +      err = -ENOMEM;
1: +      goto out_socket;
1: +    }
1: +  }
1: +  xsk->ctx = ctx;
1: +  xsk->ctx->has_bpf_link = xsk_probe_bpf_link();
1: +
1: +  if (rx && !rx_setup_done) {
1: +    err = setsockopt(xsk->fd, SOL_XDP, XDP_RX_RING, &xsk->config.rx_size,
1: +                     sizeof(xsk->config.rx_size));
1: +    if (err) {
1: +      err = -errno;
1: +      goto out_put_ctx;
1: +    }
1: +    if (xsk->fd == umem->fd)
1: +      umem->rx_ring_setup_done = true;
1: +  }
1: +  if (tx && !tx_setup_done) {
1: +    err = setsockopt(xsk->fd, SOL_XDP, XDP_TX_RING, &xsk->config.tx_size,
1: +                     sizeof(xsk->config.tx_size));
1: +    if (err) {
1: +      err = -errno;
1: +      goto out_put_ctx;
1: +    }
1: +    if (xsk->fd == umem->fd)
1: +      umem->tx_ring_setup_done = true;
1: +  }
1: +
1: +  err = xsk_get_mmap_offsets(xsk->fd, &off);
1: +  if (err) {
1: +    err = -errno;
1: +    goto out_put_ctx;
1: +  }
1: +
1: +  if (rx) {
1: +    rx_map =
1: +        mmap(NULL, off.rx.desc + xsk->config.rx_size * sizeof(struct xdp_desc),
1: +             PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, xsk->fd,
1: +             XDP_PGOFF_RX_RING);
1: +    if (rx_map == MAP_FAILED) {
1: +      err = -errno;
1: +      goto out_put_ctx;
1: +    }
1: +
1: +    rx->mask = xsk->config.rx_size - 1;
1: +    rx->size = xsk->config.rx_size;
1: +    rx->producer = rx_map + off.rx.producer;
1: +    rx->consumer = rx_map + off.rx.consumer;
1: +    rx->flags = rx_map + off.rx.flags;
1: +    rx->ring = rx_map + off.rx.desc;
1: +    rx->cached_prod = *rx->producer;
1: +    rx->cached_cons = *rx->consumer;
1: +  }
1: +  xsk->rx = rx;
1: +
1: +  if (tx) {
1: +    tx_map =
1: +        mmap(NULL, off.tx.desc + xsk->config.tx_size * sizeof(struct xdp_desc),
1: +             PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, xsk->fd,
1: +             XDP_PGOFF_TX_RING);
1: +    if (tx_map == MAP_FAILED) {
1: +      err = -errno;
1: +      goto out_mmap_rx;
1: +    }
1: +
1: +    tx->mask = xsk->config.tx_size - 1;
1: +    tx->size = xsk->config.tx_size;
1: +    tx->producer = tx_map + off.tx.producer;
1: +    tx->consumer = tx_map + off.tx.consumer;
1: +    tx->flags = tx_map + off.tx.flags;
1: +    tx->ring = tx_map + off.tx.desc;
1: +    tx->cached_prod = *tx->producer;
1: +    /* cached_cons is r->size bigger than the real consumer pointer
1: +     * See xsk_prod_nb_free
1: +     */
1: +    tx->cached_cons = *tx->consumer + xsk->config.tx_size;
1: +  }
1: +  xsk->tx = tx;
1: +
1: +  sxdp.sxdp_family = PF_XDP;
1: +  sxdp.sxdp_ifindex = ctx->ifindex;
1: +  sxdp.sxdp_queue_id = ctx->queue_id;
1: +  if (umem->refcount > 1) {
1: +    sxdp.sxdp_flags |= XDP_SHARED_UMEM;
1: +    sxdp.sxdp_shared_umem_fd = umem->fd;
1: +  } else {
1: +    sxdp.sxdp_flags = xsk->config.bind_flags;
1: +  }
1: +
1: +  err = bind(xsk->fd, (struct sockaddr *)&sxdp, sizeof(sxdp));
1: +  if (err) {
1: +    err = -errno;
1: +    goto out_mmap_tx;
1: +  }
1: +
1: +  ctx->prog_fd = -1;
1: +
1: +  if (!(xsk->config.libbpf_flags & XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD)) {
1: +    err = __xsk_setup_xdp_prog(xsk, NULL);
1: +    if (err)
1: +      goto out_mmap_tx;
1: +  }
1: +
1: +  *xsk_ptr = xsk;
1: +  umem->fill_save = NULL;
1: +  umem->comp_save = NULL;
1: +  return 0;
1:  
1:  out_mmap_tx:
1: -	if (tx)
1: -		munmap(tx_map, off.tx.desc +
1: -		       xsk->config.tx_size * sizeof(struct xdp_desc));
1: +  if (tx)
1: +    munmap(tx_map, off.tx.desc + xsk->config.tx_size * sizeof(struct xdp_desc));
1:  out_mmap_rx:
1: -	if (rx)
1: -		munmap(rx_map, off.rx.desc +
1: -		       xsk->config.rx_size * sizeof(struct xdp_desc));
1: +  if (rx)
1: +    munmap(rx_map, off.rx.desc + xsk->config.rx_size * sizeof(struct xdp_desc));
1:  out_put_ctx:
1: -	xsk_put_ctx(ctx, unmap);
1: +  xsk_put_ctx(ctx, unmap);
1:  out_socket:
1: -	if (--umem->refcount)
1: -		close(xsk->fd);
1: +  if (--umem->refcount)
1: +    close(xsk->fd);
1:  out_xsk_alloc:
1: -	free(xsk);
1: -	return err;
1: +  free(xsk);
1: +  return err;
1:  }
1:  
1:  int xsk_socket__create(struct xsk_socket **xsk_ptr, const char *ifname,
1: -		       __u32 queue_id, struct xsk_umem *umem,
1: -		       struct xsk_ring_cons *rx, struct xsk_ring_prod *tx,
1: -		       const struct xsk_socket_config *usr_config)
1: -{
1: -	if (!umem)
1: -		return -EFAULT;
1: -
1: -	return xsk_socket__create_shared(xsk_ptr, ifname, queue_id, umem,
1: -					 rx, tx, umem->fill_save,
1: -					 umem->comp_save, usr_config);
1: +                       __u32 queue_id, struct xsk_umem *umem,
1: +                       struct xsk_ring_cons *rx, struct xsk_ring_prod *tx,
1: +                       const struct xsk_socket_config *usr_config) {
1: +  if (!umem)
1: +    return -EFAULT;
1: +
1: +  return xsk_socket__create_shared(xsk_ptr, ifname, queue_id, umem, rx, tx,
1: +                                   umem->fill_save, umem->comp_save,
1: +                                   usr_config);
1:  }
1:  
1: -int xsk_umem__delete(struct xsk_umem *umem)
1: -{
1: -	if (!umem)
1: -		return 0;
1: +int xsk_umem__delete(struct xsk_umem *umem) {
1: +  if (!umem)
1: +    return 0;
1:  
1: -	if (umem->refcount)
1: -		return -EBUSY;
1: +  if (umem->refcount)
1: +    return -EBUSY;
1:  
1: -	close(umem->fd);
1: -	free(umem);
1: +  close(umem->fd);
1: +  free(umem);
1:  
1: -	return 0;
1: +  return 0;
1:  }
1:  
1: -void xsk_socket__delete(struct xsk_socket *xsk)
1: -{
1: -	size_t desc_sz = sizeof(struct xdp_desc);
1: -	struct xdp_mmap_offsets off;
1: -	struct xsk_umem *umem;
1: -	struct xsk_ctx *ctx;
1: -	int err;
1: -
1: -	if (!xsk)
1: -		return;
1: -
1: -	ctx = xsk->ctx;
1: -	umem = ctx->umem;
1: -	if (ctx->prog_fd != -1) {
1: -		xsk_delete_bpf_maps(xsk);
1: -		close(ctx->prog_fd);
1: -		if (ctx->has_bpf_link)
1: -			close(ctx->link_fd);
1: -	}
1: -
1: -	err = xsk_get_mmap_offsets(xsk->fd, &off);
1: -	if (!err) {
1: -		if (xsk->rx) {
1: -			munmap(xsk->rx->ring - off.rx.desc,
1: -			       off.rx.desc + xsk->config.rx_size * desc_sz);
1: -		}
1: -		if (xsk->tx) {
1: -			munmap(xsk->tx->ring - off.tx.desc,
1: -			       off.tx.desc + xsk->config.tx_size * desc_sz);
1: -		}
1: -	}
1: -
1: -	xsk_put_ctx(ctx, true);
1: -
1: -	umem->refcount--;
1: -	/* Do not close an fd that also has an associated umem connected
1: -	 * to it.
1: -	 */
1: -	if (xsk->fd != umem->fd)
1: -		close(xsk->fd);
1: -	free(xsk);
1: +void xsk_socket__delete(struct xsk_socket *xsk) {
1: +  size_t desc_sz = sizeof(struct xdp_desc);
1: +  struct xdp_mmap_offsets off;
1: +  struct xsk_umem *umem;
1: +  struct xsk_ctx *ctx;
1: +  int err;
1: +
1: +  if (!xsk)
1: +    return;
1: +
1: +  ctx = xsk->ctx;
1: +  umem = ctx->umem;
1: +  if (ctx->prog_fd != -1) {
1: +    xsk_delete_bpf_maps(xsk);
1: +    close(ctx->prog_fd);
1: +    if (ctx->has_bpf_link)
1: +      close(ctx->link_fd);
1: +  }
1: +
1: +  err = xsk_get_mmap_offsets(xsk->fd, &off);
1: +  if (!err) {
1: +    if (xsk->rx) {
1: +      munmap(xsk->rx->ring - off.rx.desc,
1: +             off.rx.desc + xsk->config.rx_size * desc_sz);
1: +    }
1: +    if (xsk->tx) {
1: +      munmap(xsk->tx->ring - off.tx.desc,
1: +             off.tx.desc + xsk->config.tx_size * desc_sz);
1: +    }
1: +  }
1: +
1: +  xsk_put_ctx(ctx, true);
1: +
1: +  umem->refcount--;
1: +  /* Do not close an fd that also has an associated umem connected
1: +   * to it.
1: +   */
1: +  if (xsk->fd != umem->fd)
1: +    close(xsk->fd);
1: +  free(xsk);
1:  }
1: diff --git a/src/cc/libbpf/src/xsk.h b/src/cc/libbpf/src/xsk.h
1: index 01c12dca..7823c405 100644
1: --- a/src/cc/libbpf/src/xsk.h
1: +++ b/src/cc/libbpf/src/xsk.h
1: @@ -12,10 +12,10 @@
1:  #ifndef __LIBBPF_XSK_H
1:  #define __LIBBPF_XSK_H
1:  
1: -#include <stdio.h>
1: -#include <stdint.h>
1: -#include <stdbool.h>
1:  #include <linux/if_xdp.h>
1: +#include <stdbool.h>
1: +#include <stdint.h>
1: +#include <stdio.h>
1:  
1:  #include "libbpf.h"
1:  
1: @@ -34,72 +34,71 @@ extern "C" {
1:  #define __XSK_WRITE_ONCE(x, v) (*(volatile typeof(x) *)&x) = (v)
1:  
1:  #if defined(__i386__) || defined(__x86_64__)
1: -# define libbpf_smp_store_release(p, v)					\
1: -	do {								\
1: -		asm volatile("" : : : "memory");			\
1: -		__XSK_WRITE_ONCE(*p, v);				\
1: -	} while (0)
1: -# define libbpf_smp_load_acquire(p)					\
1: -	({								\
1: -		typeof(*p) ___p1 = __XSK_READ_ONCE(*p);			\
1: -		asm volatile("" : : : "memory");			\
1: -		___p1;							\
1: -	})
1: +#define libbpf_smp_store_release(p, v) \
1: +  do {                                 \
1: +    asm volatile("" : : : "memory");   \
1: +    __XSK_WRITE_ONCE(*p, v);           \
1: +  } while (0)
1: +#define libbpf_smp_load_acquire(p)          \
1: +  ({                                        \
1: +    typeof(*p) ___p1 = __XSK_READ_ONCE(*p); \
1: +    asm volatile("" : : : "memory");        \
1: +    ___p1;                                  \
1: +  })
1:  #elif defined(__aarch64__)
1: -# define libbpf_smp_store_release(p, v)					\
1: -		asm volatile ("stlr %w1, %0" : "=Q" (*p) : "r" (v) : "memory")
1: -# define libbpf_smp_load_acquire(p)					\
1: -	({								\
1: -		typeof(*p) ___p1;					\
1: -		asm volatile ("ldar %w0, %1"				\
1: -			      : "=r" (___p1) : "Q" (*p) : "memory");	\
1: -		___p1;							\
1: -	})
1: +#define libbpf_smp_store_release(p, v) \
1: +  asm volatile("stlr %w1, %0" : "=Q"(*p) : "r"(v) : "memory")
1: +#define libbpf_smp_load_acquire(p)                                   \
1: +  ({                                                                 \
1: +    typeof(*p) ___p1;                                                \
1: +    asm volatile("ldar %w0, %1" : "=r"(___p1) : "Q"(*p) : "memory"); \
1: +    ___p1;                                                           \
1: +  })
1:  #elif defined(__riscv)
1: -# define libbpf_smp_store_release(p, v)					\
1: -	do {								\
1: -		asm volatile ("fence rw,w" : : : "memory");		\
1: -		__XSK_WRITE_ONCE(*p, v);				\
1: -	} while (0)
1: -# define libbpf_smp_load_acquire(p)					\
1: -	({								\
1: -		typeof(*p) ___p1 = __XSK_READ_ONCE(*p);			\
1: -		asm volatile ("fence r,rw" : : : "memory");		\
1: -		___p1;							\
1: -	})
1: +#define libbpf_smp_store_release(p, v)         \
1: +  do {                                         \
1: +    asm volatile("fence rw,w" : : : "memory"); \
1: +    __XSK_WRITE_ONCE(*p, v);                   \
1: +  } while (0)
1: +#define libbpf_smp_load_acquire(p)             \
1: +  ({                                           \
1: +    typeof(*p) ___p1 = __XSK_READ_ONCE(*p);    \
1: +    asm volatile("fence r,rw" : : : "memory"); \
1: +    ___p1;                                     \
1: +  })
1:  #endif
1:  
1:  #ifndef libbpf_smp_store_release
1: -#define libbpf_smp_store_release(p, v)					\
1: -	do {								\
1: -		__sync_synchronize();					\
1: -		__XSK_WRITE_ONCE(*p, v);				\
1: -	} while (0)
1: +#define libbpf_smp_store_release(p, v) \
1: +  do {                                 \
1: +    __sync_synchronize();              \
1: +    __XSK_WRITE_ONCE(*p, v);           \
1: +  } while (0)
1:  #endif
1:  
1:  #ifndef libbpf_smp_load_acquire
1: -#define libbpf_smp_load_acquire(p)					\
1: -	({								\
1: -		typeof(*p) ___p1 = __XSK_READ_ONCE(*p);			\
1: -		__sync_synchronize();					\
1: -		___p1;							\
1: -	})
1: +#define libbpf_smp_load_acquire(p)          \
1: +  ({                                        \
1: +    typeof(*p) ___p1 = __XSK_READ_ONCE(*p); \
1: +    __sync_synchronize();                   \
1: +    ___p1;                                  \
1: +  })
1:  #endif
1:  
1:  /* LIBRARY INTERNAL -- END */
1:  
1:  /* Do not access these members directly. Use the functions below. */
1:  #define DEFINE_XSK_RING(name) \
1: -struct name { \
1: -	__u32 cached_prod; \
1: -	__u32 cached_cons; \
1: -	__u32 mask; \
1: -	__u32 size; \
1: -	__u32 *producer; \
1: -	__u32 *consumer; \
1: -	void *ring; \
1: -	__u32 *flags; \
1: -}
1: +  struct name {               \
1: +    __u32 cached_prod;        \
1: +    __u32 cached_cons;        \
1: +    __u32 mask;               \
1: +    __u32 size;               \
1: +    __u32 *producer;          \
1: +    __u32 *consumer;          \
1: +    void *ring;               \
1: +    __u32 *flags;             \
1: +  }
1:  
1:  DEFINE_XSK_RING(xsk_ring_prod);
1:  DEFINE_XSK_RING(xsk_ring_cons);
1: @@ -112,204 +111,181 @@ struct xsk_umem;
1:  struct xsk_socket;
1:  
1:  static inline __u64 *xsk_ring_prod__fill_addr(struct xsk_ring_prod *fill,
1: -					      __u32 idx)
1: -{
1: -	__u64 *addrs = (__u64 *)fill->ring;
1: +                                              __u32 idx) {
1: +  __u64 *addrs = (__u64 *)fill->ring;
1:  
1: -	return &addrs[idx & fill->mask];
1: +  return &addrs[idx & fill->mask];
1:  }
1:  
1: -static inline const __u64 *
1: -xsk_ring_cons__comp_addr(const struct xsk_ring_cons *comp, __u32 idx)
1: -{
1: -	const __u64 *addrs = (const __u64 *)comp->ring;
1: +static inline const __u64 *xsk_ring_cons__comp_addr(
1: +    const struct xsk_ring_cons *comp, __u32 idx) {
1: +  const __u64 *addrs = (const __u64 *)comp->ring;
1:  
1: -	return &addrs[idx & comp->mask];
1: +  return &addrs[idx & comp->mask];
1:  }
1:  
1:  static inline struct xdp_desc *xsk_ring_prod__tx_desc(struct xsk_ring_prod *tx,
1: -						      __u32 idx)
1: -{
1: -	struct xdp_desc *descs = (struct xdp_desc *)tx->ring;
1: +                                                      __u32 idx) {
1: +  struct xdp_desc *descs = (struct xdp_desc *)tx->ring;
1:  
1: -	return &descs[idx & tx->mask];
1: +  return &descs[idx & tx->mask];
1:  }
1:  
1: -static inline const struct xdp_desc *
1: -xsk_ring_cons__rx_desc(const struct xsk_ring_cons *rx, __u32 idx)
1: -{
1: -	const struct xdp_desc *descs = (const struct xdp_desc *)rx->ring;
1: +static inline const struct xdp_desc *xsk_ring_cons__rx_desc(
1: +    const struct xsk_ring_cons *rx, __u32 idx) {
1: +  const struct xdp_desc *descs = (const struct xdp_desc *)rx->ring;
1:  
1: -	return &descs[idx & rx->mask];
1: +  return &descs[idx & rx->mask];
1:  }
1:  
1: -static inline int xsk_ring_prod__needs_wakeup(const struct xsk_ring_prod *r)
1: -{
1: -	return *r->flags & XDP_RING_NEED_WAKEUP;
1: +static inline int xsk_ring_prod__needs_wakeup(const struct xsk_ring_prod *r) {
1: +  return *r->flags & XDP_RING_NEED_WAKEUP;
1:  }
1:  
1: -static inline __u32 xsk_prod_nb_free(struct xsk_ring_prod *r, __u32 nb)
1: -{
1: -	__u32 free_entries = r->cached_cons - r->cached_prod;
1: +static inline __u32 xsk_prod_nb_free(struct xsk_ring_prod *r, __u32 nb) {
1: +  __u32 free_entries = r->cached_cons - r->cached_prod;
1:  
1: -	if (free_entries >= nb)
1: -		return free_entries;
1: +  if (free_entries >= nb)
1: +    return free_entries;
1:  
1: -	/* Refresh the local tail pointer.
1: -	 * cached_cons is r->size bigger than the real consumer pointer so
1: -	 * that this addition can be avoided in the more frequently
1: -	 * executed code that computs free_entries in the beginning of
1: -	 * this function. Without this optimization it whould have been
1: -	 * free_entries = r->cached_prod - r->cached_cons + r->size.
1: -	 */
1: -	r->cached_cons = libbpf_smp_load_acquire(r->consumer);
1: -	r->cached_cons += r->size;
1: +  /* Refresh the local tail pointer.
1: +   * cached_cons is r->size bigger than the real consumer pointer so
1: +   * that this addition can be avoided in the more frequently
1: +   * executed code that computs free_entries in the beginning of
1: +   * this function. Without this optimization it whould have been
1: +   * free_entries = r->cached_prod - r->cached_cons + r->size.
1: +   */
1: +  r->cached_cons = libbpf_smp_load_acquire(r->consumer);
1: +  r->cached_cons += r->size;
1:  
1: -	return r->cached_cons - r->cached_prod;
1: +  return r->cached_cons - r->cached_prod;
1:  }
1:  
1: -static inline __u32 xsk_cons_nb_avail(struct xsk_ring_cons *r, __u32 nb)
1: -{
1: -	__u32 entries = r->cached_prod - r->cached_cons;
1: +static inline __u32 xsk_cons_nb_avail(struct xsk_ring_cons *r, __u32 nb) {
1: +  __u32 entries = r->cached_prod - r->cached_cons;
1:  
1: -	if (entries == 0) {
1: -		r->cached_prod = libbpf_smp_load_acquire(r->producer);
1: -		entries = r->cached_prod - r->cached_cons;
1: -	}
1: +  if (entries == 0) {
1: +    r->cached_prod = libbpf_smp_load_acquire(r->producer);
1: +    entries = r->cached_prod - r->cached_cons;
1: +  }
1:  
1: -	return (entries > nb) ? nb : entries;
1: +  return (entries > nb) ? nb : entries;
1:  }
1:  
1: -static inline __u32 xsk_ring_prod__reserve(struct xsk_ring_prod *prod, __u32 nb, __u32 *idx)
1: -{
1: -	if (xsk_prod_nb_free(prod, nb) < nb)
1: -		return 0;
1: +static inline __u32 xsk_ring_prod__reserve(struct xsk_ring_prod *prod, __u32 nb,
1: +                                           __u32 *idx) {
1: +  if (xsk_prod_nb_free(prod, nb) < nb)
1: +    return 0;
1:  
1: -	*idx = prod->cached_prod;
1: -	prod->cached_prod += nb;
1: +  *idx = prod->cached_prod;
1: +  prod->cached_prod += nb;
1:  
1: -	return nb;
1: +  return nb;
1:  }
1:  
1: -static inline void xsk_ring_prod__submit(struct xsk_ring_prod *prod, __u32 nb)
1: -{
1: -	/* Make sure everything has been written to the ring before indicating
1: -	 * this to the kernel by writing the producer pointer.
1: -	 */
1: -	libbpf_smp_store_release(prod->producer, *prod->producer + nb);
1: +static inline void xsk_ring_prod__submit(struct xsk_ring_prod *prod, __u32 nb) {
1: +  /* Make sure everything has been written to the ring before indicating
1: +   * this to the kernel by writing the producer pointer.
1: +   */
1: +  libbpf_smp_store_release(prod->producer, *prod->producer + nb);
1:  }
1:  
1: -static inline __u32 xsk_ring_cons__peek(struct xsk_ring_cons *cons, __u32 nb, __u32 *idx)
1: -{
1: -	__u32 entries = xsk_cons_nb_avail(cons, nb);
1: +static inline __u32 xsk_ring_cons__peek(struct xsk_ring_cons *cons, __u32 nb,
1: +                                        __u32 *idx) {
1: +  __u32 entries = xsk_cons_nb_avail(cons, nb);
1:  
1: -	if (entries > 0) {
1: -		*idx = cons->cached_cons;
1: -		cons->cached_cons += entries;
1: -	}
1: +  if (entries > 0) {
1: +    *idx = cons->cached_cons;
1: +    cons->cached_cons += entries;
1: +  }
1:  
1: -	return entries;
1: +  return entries;
1:  }
1:  
1: -static inline void xsk_ring_cons__cancel(struct xsk_ring_cons *cons, __u32 nb)
1: -{
1: -	cons->cached_cons -= nb;
1: +static inline void xsk_ring_cons__cancel(struct xsk_ring_cons *cons, __u32 nb) {
1: +  cons->cached_cons -= nb;
1:  }
1:  
1: -static inline void xsk_ring_cons__release(struct xsk_ring_cons *cons, __u32 nb)
1: -{
1: -	/* Make sure data has been read before indicating we are done
1: -	 * with the entries by updating the consumer pointer.
1: -	 */
1: -	libbpf_smp_store_release(cons->consumer, *cons->consumer + nb);
1: -
1: +static inline void xsk_ring_cons__release(struct xsk_ring_cons *cons,
1: +                                          __u32 nb) {
1: +  /* Make sure data has been read before indicating we are done
1: +   * with the entries by updating the consumer pointer.
1: +   */
1: +  libbpf_smp_store_release(cons->consumer, *cons->consumer + nb);
1:  }
1:  
1: -static inline void *xsk_umem__get_data(void *umem_area, __u64 addr)
1: -{
1: -	return &((char *)umem_area)[addr];
1: +static inline void *xsk_umem__get_data(void *umem_area, __u64 addr) {
1: +  return &((char *)umem_area)[addr];
1:  }
1:  
1: -static inline __u64 xsk_umem__extract_addr(__u64 addr)
1: -{
1: -	return addr & XSK_UNALIGNED_BUF_ADDR_MASK;
1: +static inline __u64 xsk_umem__extract_addr(__u64 addr) {
1: +  return addr & XSK_UNALIGNED_BUF_ADDR_MASK;
1:  }
1:  
1: -static inline __u64 xsk_umem__extract_offset(__u64 addr)
1: -{
1: -	return addr >> XSK_UNALIGNED_BUF_OFFSET_SHIFT;
1: +static inline __u64 xsk_umem__extract_offset(__u64 addr) {
1: +  return addr >> XSK_UNALIGNED_BUF_OFFSET_SHIFT;
1:  }
1:  
1: -static inline __u64 xsk_umem__add_offset_to_addr(__u64 addr)
1: -{
1: -	return xsk_umem__extract_addr(addr) + xsk_umem__extract_offset(addr);
1: +static inline __u64 xsk_umem__add_offset_to_addr(__u64 addr) {
1: +  return xsk_umem__extract_addr(addr) + xsk_umem__extract_offset(addr);
1:  }
1:  
1:  LIBBPF_API int xsk_umem__fd(const struct xsk_umem *umem);
1:  LIBBPF_API int xsk_socket__fd(const struct xsk_socket *xsk);
1:  
1: -#define XSK_RING_CONS__DEFAULT_NUM_DESCS      2048
1: -#define XSK_RING_PROD__DEFAULT_NUM_DESCS      2048
1: -#define XSK_UMEM__DEFAULT_FRAME_SHIFT    12 /* 4096 bytes */
1: -#define XSK_UMEM__DEFAULT_FRAME_SIZE     (1 << XSK_UMEM__DEFAULT_FRAME_SHIFT)
1: +#define XSK_RING_CONS__DEFAULT_NUM_DESCS 2048
1: +#define XSK_RING_PROD__DEFAULT_NUM_DESCS 2048
1: +#define XSK_UMEM__DEFAULT_FRAME_SHIFT 12 /* 4096 bytes */
1: +#define XSK_UMEM__DEFAULT_FRAME_SIZE (1 << XSK_UMEM__DEFAULT_FRAME_SHIFT)
1:  #define XSK_UMEM__DEFAULT_FRAME_HEADROOM 0
1:  #define XSK_UMEM__DEFAULT_FLAGS 0
1:  
1:  struct xsk_umem_config {
1: -	__u32 fill_size;
1: -	__u32 comp_size;
1: -	__u32 frame_size;
1: -	__u32 frame_headroom;
1: -	__u32 flags;
1: +  __u32 fill_size;
1: +  __u32 comp_size;
1: +  __u32 frame_size;
1: +  __u32 frame_headroom;
1: +  __u32 flags;
1:  };
1:  
1: -LIBBPF_API int xsk_setup_xdp_prog(int ifindex,
1: -				  int *xsks_map_fd);
1: +LIBBPF_API int xsk_setup_xdp_prog(int ifindex, int *xsks_map_fd);
1:  LIBBPF_API int xsk_socket__update_xskmap(struct xsk_socket *xsk,
1: -					 int xsks_map_fd);
1: +                                         int xsks_map_fd);
1:  
1:  /* Flags for the libbpf_flags field. */
1:  #define XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD (1 << 0)
1:  
1:  struct xsk_socket_config {
1: -	__u32 rx_size;
1: -	__u32 tx_size;
1: -	__u32 libbpf_flags;
1: -	__u32 xdp_flags;
1: -	__u16 bind_flags;
1: +  __u32 rx_size;
1: +  __u32 tx_size;
1: +  __u32 libbpf_flags;
1: +  __u32 xdp_flags;
1: +  __u16 bind_flags;
1:  };
1:  
1:  /* Set config to NULL to get the default configuration. */
1: -LIBBPF_API int xsk_umem__create(struct xsk_umem **umem,
1: -				void *umem_area, __u64 size,
1: -				struct xsk_ring_prod *fill,
1: -				struct xsk_ring_cons *comp,
1: -				const struct xsk_umem_config *config);
1: -LIBBPF_API int xsk_umem__create_v0_0_2(struct xsk_umem **umem,
1: -				       void *umem_area, __u64 size,
1: -				       struct xsk_ring_prod *fill,
1: -				       struct xsk_ring_cons *comp,
1: -				       const struct xsk_umem_config *config);
1: -LIBBPF_API int xsk_umem__create_v0_0_4(struct xsk_umem **umem,
1: -				       void *umem_area, __u64 size,
1: -				       struct xsk_ring_prod *fill,
1: -				       struct xsk_ring_cons *comp,
1: -				       const struct xsk_umem_config *config);
1: -LIBBPF_API int xsk_socket__create(struct xsk_socket **xsk,
1: -				  const char *ifname, __u32 queue_id,
1: -				  struct xsk_umem *umem,
1: -				  struct xsk_ring_cons *rx,
1: -				  struct xsk_ring_prod *tx,
1: -				  const struct xsk_socket_config *config);
1: -LIBBPF_API int
1: -xsk_socket__create_shared(struct xsk_socket **xsk_ptr,
1: -			  const char *ifname,
1: -			  __u32 queue_id, struct xsk_umem *umem,
1: -			  struct xsk_ring_cons *rx,
1: -			  struct xsk_ring_prod *tx,
1: -			  struct xsk_ring_prod *fill,
1: -			  struct xsk_ring_cons *comp,
1: -			  const struct xsk_socket_config *config);
1: +LIBBPF_API int xsk_umem__create(struct xsk_umem **umem, void *umem_area,
1: +                                __u64 size, struct xsk_ring_prod *fill,
1: +                                struct xsk_ring_cons *comp,
1: +                                const struct xsk_umem_config *config);
1: +LIBBPF_API int xsk_umem__create_v0_0_2(struct xsk_umem **umem, void *umem_area,
1: +                                       __u64 size, struct xsk_ring_prod *fill,
1: +                                       struct xsk_ring_cons *comp,
1: +                                       const struct xsk_umem_config *config);
1: +LIBBPF_API int xsk_umem__create_v0_0_4(struct xsk_umem **umem, void *umem_area,
1: +                                       __u64 size, struct xsk_ring_prod *fill,
1: +                                       struct xsk_ring_cons *comp,
1: +                                       const struct xsk_umem_config *config);
1: +LIBBPF_API int xsk_socket__create(struct xsk_socket **xsk, const char *ifname,
1: +                                  __u32 queue_id, struct xsk_umem *umem,
1: +                                  struct xsk_ring_cons *rx,
1: +                                  struct xsk_ring_prod *tx,
1: +                                  const struct xsk_socket_config *config);
1: +LIBBPF_API int xsk_socket__create_shared(
1: +    struct xsk_socket **xsk_ptr, const char *ifname, __u32 queue_id,
1: +    struct xsk_umem *umem, struct xsk_ring_cons *rx, struct xsk_ring_prod *tx,
1: +    struct xsk_ring_prod *fill, struct xsk_ring_cons *comp,
1: +    const struct xsk_socket_config *config);
1:  
1:  /* Returns 0 for success and -EBUSY if the umem is still in use. */
1:  LIBBPF_API int xsk_umem__delete(struct xsk_umem *umem);
1: diff --git a/src/cc/libbpf/travis-ci/vmtest/vmlinux.h b/src/cc/libbpf/travis-ci/vmtest/vmlinux.h
1: index 3a9a0227..d9cff005 100644
1: --- a/src/cc/libbpf/travis-ci/vmtest/vmlinux.h
1: +++ b/src/cc/libbpf/travis-ci/vmtest/vmlinux.h
1: @@ -2,7 +2,8 @@
1:  #define __VMLINUX_H__
1:  
1:  #ifndef BPF_NO_PRESERVE_ACCESS_INDEX
1: -#pragma clang attribute push (__attribute__((preserve_access_index)), apply_to = record)
1: +#pragma clang attribute push(__attribute__((preserve_access_index)), \
1: +                                           apply_to = record)
1:  #endif
1:  
1:  typedef unsigned char __u8;
1: @@ -30,8 +31,8 @@ typedef __s64 s64;
1:  typedef __u64 u64;
1:  
1:  enum {
1: -	false = 0,
1: -	true = 1,
1: +  false = 0,
1: +  true = 1,
1:  };
1:  
1:  typedef long int __kernel_long_t;
1: @@ -98,33 +99,29 @@ typedef unsigned int fmode_t;
1:  
1:  typedef u64 phys_addr_t;
1:  
1: -typedef struct {
1: -	int counter;
1: -} atomic_t;
1: +typedef struct { int counter; } atomic_t;
1:  
1: -typedef struct {
1: -	s64 counter;
1: -} atomic64_t;
1: +typedef struct { s64 counter; } atomic64_t;
1:  
1:  struct list_head {
1: -	struct list_head *next;
1: -	struct list_head *prev;
1: +  struct list_head *next;
1: +  struct list_head *prev;
1:  };
1:  
1:  struct hlist_node;
1:  
1:  struct hlist_head {
1: -	struct hlist_node *first;
1: +  struct hlist_node *first;
1:  };
1:  
1:  struct hlist_node {
1: -	struct hlist_node *next;
1: -	struct hlist_node **pprev;
1: +  struct hlist_node *next;
1: +  struct hlist_node **pprev;
1:  };
1:  
1:  struct callback_head {
1: -	struct callback_head *next;
1: -	void (*func)(struct callback_head *);
1: +  struct callback_head *next;
1: +  void (*func)(struct callback_head *);
1:  };
1:  
1:  struct lock_class_key {};
1: @@ -140,85 +137,85 @@ struct super_block;
1:  struct module;
1:  
1:  struct file_system_type {
1: -	const char *name;
1: -	int fs_flags;
1: -	int (*init_fs_context)(struct fs_context *);
1: -	const struct fs_parameter_spec *parameters;
1: -	struct dentry * (*mount)(struct file_system_type *, int, const char *, void *);
1: -	void (*kill_sb)(struct super_block *);
1: -	struct module *owner;
1: -	struct file_system_type *next;
1: -	struct hlist_head fs_supers;
1: -	struct lock_class_key s_lock_key;
1: -	struct lock_class_key s_umount_key;
1: -	struct lock_class_key s_vfs_rename_key;
1: -	struct lock_class_key s_writers_key[3];
1: -	struct lock_class_key i_lock_key;
1: -	struct lock_class_key i_mutex_key;
1: -	struct lock_class_key i_mutex_dir_key;
1: +  const char *name;
1: +  int fs_flags;
1: +  int (*init_fs_context)(struct fs_context *);
1: +  const struct fs_parameter_spec *parameters;
1: +  struct dentry *(*mount)(struct file_system_type *, int, const char *, void *);
1: +  void (*kill_sb)(struct super_block *);
1: +  struct module *owner;
1: +  struct file_system_type *next;
1: +  struct hlist_head fs_supers;
1: +  struct lock_class_key s_lock_key;
1: +  struct lock_class_key s_umount_key;
1: +  struct lock_class_key s_vfs_rename_key;
1: +  struct lock_class_key s_writers_key[3];
1: +  struct lock_class_key i_lock_key;
1: +  struct lock_class_key i_mutex_key;
1: +  struct lock_class_key i_mutex_dir_key;
1:  };
1:  
1:  struct qspinlock {
1: -	union {
1: -		atomic_t val;
1: -		struct {
1: -			u8 locked;
1: -			u8 pending;
1: -		};
1: -		struct {
1: -			u16 locked_pending;
1: -			u16 tail;
1: -		};
1: -	};
1: +  union {
1: +    atomic_t val;
1: +    struct {
1: +      u8 locked;
1: +      u8 pending;
1: +    };
1: +    struct {
1: +      u16 locked_pending;
1: +      u16 tail;
1: +    };
1: +  };
1:  };
1:  
1:  typedef struct qspinlock arch_spinlock_t;
1:  
1:  struct qrwlock {
1: -	union {
1: -		atomic_t cnts;
1: -		struct {
1: -			u8 wlocked;
1: -			u8 __lstate[3];
1: -		};
1: -	};
1: -	arch_spinlock_t wait_lock;
1: +  union {
1: +    atomic_t cnts;
1: +    struct {
1: +      u8 wlocked;
1: +      u8 __lstate[3];
1: +    };
1: +  };
1: +  arch_spinlock_t wait_lock;
1:  };
1:  
1:  typedef struct qrwlock arch_rwlock_t;
1:  
1:  struct raw_spinlock {
1: -	arch_spinlock_t raw_lock;
1: -	unsigned int magic;
1: -	unsigned int owner_cpu;
1: -	void *owner;
1: +  arch_spinlock_t raw_lock;
1: +  unsigned int magic;
1: +  unsigned int owner_cpu;
1: +  void *owner;
1:  };
1:  
1:  typedef struct raw_spinlock raw_spinlock_t;
1:  
1:  struct spinlock {
1: -	union {
1: -		struct raw_spinlock rlock;
1: -	};
1: +  union {
1: +    struct raw_spinlock rlock;
1: +  };
1:  };
1:  
1:  typedef struct spinlock spinlock_t;
1:  
1:  typedef struct {
1: -	arch_rwlock_t raw_lock;
1: -	unsigned int magic;
1: -	unsigned int owner_cpu;
1: -	void *owner;
1: +  arch_rwlock_t raw_lock;
1: +  unsigned int magic;
1: +  unsigned int owner_cpu;
1: +  void *owner;
1:  } rwlock_t;
1:  
1:  struct ratelimit_state {
1: -	raw_spinlock_t lock;
1: -	int interval;
1: -	int burst;
1: -	int printed;
1: -	int missed;
1: -	long unsigned int begin;
1: -	long unsigned int flags;
1: +  raw_spinlock_t lock;
1: +  int interval;
1: +  int burst;
1: +  int printed;
1: +  int missed;
1: +  long unsigned int begin;
1: +  long unsigned int flags;
1:  };
1:  
1:  typedef void *fl_owner_t;
1: @@ -246,389 +243,389 @@ struct pipe_inode_info;
1:  struct seq_file;
1:  
1:  struct file_operations {
1: -	struct module *owner;
1: -	loff_t (*llseek)(struct file *, loff_t, int);
1: -	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
1: -	ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
1: -	ssize_t (*read_iter)(struct kiocb *, struct iov_iter *);
1: -	ssize_t (*write_iter)(struct kiocb *, struct iov_iter *);
1: -	int (*iopoll)(struct kiocb *, bool);
1: -	int (*iterate)(struct file *, struct dir_context *);
1: -	int (*iterate_shared)(struct file *, struct dir_context *);
1: -	__poll_t (*poll)(struct file *, struct poll_table_struct *);
1: -	long int (*unlocked_ioctl)(struct file *, unsigned int, long unsigned int);
1: -	long int (*compat_ioctl)(struct file *, unsigned int, long unsigned int);
1: -	int (*mmap)(struct file *, struct vm_area_struct *);
1: -	long unsigned int mmap_supported_flags;
1: -	int (*open)(struct inode *, struct file *);
1: -	int (*flush)(struct file *, fl_owner_t);
1: -	int (*release)(struct inode *, struct file *);
1: -	int (*fsync)(struct file *, loff_t, loff_t, int);
1: -	int (*fasync)(int, struct file *, int);
1: -	int (*lock)(struct file *, int, struct file_lock *);
1: -	ssize_t (*sendpage)(struct file *, struct page *, int, size_t, loff_t *, int);
1: -	long unsigned int (*get_unmapped_area)(struct file *, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: -	int (*check_flags)(int);
1: -	int (*flock)(struct file *, int, struct file_lock *);
1: -	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
1: -	ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
1: -	int (*setlease)(struct file *, long int, struct file_lock **, void **);
1: -	long int (*fallocate)(struct file *, int, loff_t, loff_t);
1: -	void (*show_fdinfo)(struct seq_file *, struct file *);
1: -	ssize_t (*copy_file_range)(struct file *, loff_t, struct file *, loff_t, size_t, unsigned int);
1: -	loff_t (*remap_file_range)(struct file *, loff_t, struct file *, loff_t, loff_t, unsigned int);
1: -	int (*fadvise)(struct file *, loff_t, loff_t, int);
1: +  struct module *owner;
1: +  loff_t (*llseek)(struct file *, loff_t, int);
1: +  ssize_t (*read)(struct file *, char *, size_t, loff_t *);
1: +  ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
1: +  ssize_t (*read_iter)(struct kiocb *, struct iov_iter *);
1: +  ssize_t (*write_iter)(struct kiocb *, struct iov_iter *);
1: +  int (*iopoll)(struct kiocb *, bool);
1: +  int (*iterate)(struct file *, struct dir_context *);
1: +  int (*iterate_shared)(struct file *, struct dir_context *);
1: +  __poll_t (*poll)(struct file *, struct poll_table_struct *);
1: +  long int (*unlocked_ioctl)(struct file *, unsigned int, long unsigned int);
1: +  long int (*compat_ioctl)(struct file *, unsigned int, long unsigned int);
1: +  int (*mmap)(struct file *, struct vm_area_struct *);
1: +  long unsigned int mmap_supported_flags;
1: +  int (*open)(struct inode *, struct file *);
1: +  int (*flush)(struct file *, fl_owner_t);
1: +  int (*release)(struct inode *, struct file *);
1: +  int (*fsync)(struct file *, loff_t, loff_t, int);
1: +  int (*fasync)(int, struct file *, int);
1: +  int (*lock)(struct file *, int, struct file_lock *);
1: +  ssize_t (*sendpage)(struct file *, struct page *, int, size_t, loff_t *, int);
1: +  long unsigned int (*get_unmapped_area)(struct file *, long unsigned int,
1: +                                         long unsigned int, long unsigned int,
1: +                                         long unsigned int);
1: +  int (*check_flags)(int);
1: +  int (*flock)(struct file *, int, struct file_lock *);
1: +  ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *,
1: +                          size_t, unsigned int);
1: +  ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *,
1: +                         size_t, unsigned int);
1: +  int (*setlease)(struct file *, long int, struct file_lock **, void **);
1: +  long int (*fallocate)(struct file *, int, loff_t, loff_t);
1: +  void (*show_fdinfo)(struct seq_file *, struct file *);
1: +  ssize_t (*copy_file_range)(struct file *, loff_t, struct file *, loff_t,
1: +                             size_t, unsigned int);
1: +  loff_t (*remap_file_range)(struct file *, loff_t, struct file *, loff_t,
1: +                             loff_t, unsigned int);
1: +  int (*fadvise)(struct file *, loff_t, loff_t, int);
1:  };
1:  
1:  typedef __s64 time64_t;
1:  
1:  struct __kernel_timespec {
1: -	__kernel_time64_t tv_sec;
1: -	long long int tv_nsec;
1: +  __kernel_time64_t tv_sec;
1: +  long long int tv_nsec;
1:  };
1:  
1:  struct timespec64 {
1: -	time64_t tv_sec;
1: -	long int tv_nsec;
1: +  time64_t tv_sec;
1: +  long int tv_nsec;
1:  };
1:  
1:  enum timespec_type {
1: -	TT_NONE = 0,
1: -	TT_NATIVE = 1,
1: -	TT_COMPAT = 2,
1: +  TT_NONE = 0,
1: +  TT_NATIVE = 1,
1: +  TT_COMPAT = 2,
1:  };
1:  
1:  typedef s32 old_time32_t;
1:  
1:  struct old_timespec32 {
1: -	old_time32_t tv_sec;
1: -	s32 tv_nsec;
1: +  old_time32_t tv_sec;
1: +  s32 tv_nsec;
1:  };
1:  
1:  struct pollfd;
1:  
1:  struct restart_block {
1: -	long int (*fn)(struct restart_block *);
1: -	union {
1: -		struct {
1: -			u32 *uaddr;
1: -			u32 val;
1: -			u32 flags;
1: -			u32 bitset;
1: -			u64 time;
1: -			u32 *uaddr2;
1: -		} futex;
1: -		struct {
1: -			clockid_t clockid;
1: -			enum timespec_type type;
1: -			union {
1: -				struct __kernel_timespec *rmtp;
1: -				struct old_timespec32 *compat_rmtp;
1: -			};
1: -			u64 expires;
1: -		} nanosleep;
1: -		struct {
1: -			struct pollfd *ufds;
1: -			int nfds;
1: -			int has_timeout;
1: -			long unsigned int tv_sec;
1: -			long unsigned int tv_nsec;
1: -		} poll;
1: -	};
1: +  long int (*fn)(struct restart_block *);
1: +  union {
1: +    struct {
1: +      u32 *uaddr;
1: +      u32 val;
1: +      u32 flags;
1: +      u32 bitset;
1: +      u64 time;
1: +      u32 *uaddr2;
1: +    } futex;
1: +    struct {
1: +      clockid_t clockid;
1: +      enum timespec_type type;
1: +      union {
1: +        struct __kernel_timespec *rmtp;
1: +        struct old_timespec32 *compat_rmtp;
1: +      };
1: +      u64 expires;
1: +    } nanosleep;
1: +    struct {
1: +      struct pollfd *ufds;
1: +      int nfds;
1: +      int has_timeout;
1: +      long unsigned int tv_sec;
1: +      long unsigned int tv_nsec;
1: +    } poll;
1: +  };
1:  };
1:  
1:  struct thread_info {
1: -	long unsigned int flags;
1: -	u32 status;
1: +  long unsigned int flags;
1: +  u32 status;
1:  };
1:  
1:  struct refcount_struct {
1: -	atomic_t refs;
1: +  atomic_t refs;
1:  };
1:  
1:  typedef struct refcount_struct refcount_t;
1:  
1:  struct llist_node {
1: -	struct llist_node *next;
1: +  struct llist_node *next;
1:  };
1:  
1:  struct __call_single_node {
1: -	struct llist_node llist;
1: -	union {
1: -		unsigned int u_flags;
1: -		atomic_t a_flags;
1: -	};
1: -	u16 src;
1: -	u16 dst;
1: +  struct llist_node llist;
1: +  union {
1: +    unsigned int u_flags;
1: +    atomic_t a_flags;
1: +  };
1: +  u16 src;
1: +  u16 dst;
1:  };
1:  
1:  struct load_weight {
1: -	long unsigned int weight;
1: -	u32 inv_weight;
1: +  long unsigned int weight;
1: +  u32 inv_weight;
1:  };
1:  
1:  struct rb_node {
1: -	long unsigned int __rb_parent_color;
1: -	struct rb_node *rb_right;
1: -	struct rb_node *rb_left;
1: +  long unsigned int __rb_parent_color;
1: +  struct rb_node *rb_right;
1: +  struct rb_node *rb_left;
1:  };
1:  
1:  struct sched_statistics {
1: -	u64 wait_start;
1: -	u64 wait_max;
1: -	u64 wait_count;
1: -	u64 wait_sum;
1: -	u64 iowait_count;
1: -	u64 iowait_sum;
1: -	u64 sleep_start;
1: -	u64 sleep_max;
1: -	s64 sum_sleep_runtime;
1: -	u64 block_start;
1: -	u64 block_max;
1: -	u64 exec_max;
1: -	u64 slice_max;
1: -	u64 nr_migrations_cold;
1: -	u64 nr_failed_migrations_affine;
1: -	u64 nr_failed_migrations_running;
1: -	u64 nr_failed_migrations_hot;
1: -	u64 nr_forced_migrations;
1: -	u64 nr_wakeups;
1: -	u64 nr_wakeups_sync;
1: -	u64 nr_wakeups_migrate;
1: -	u64 nr_wakeups_local;
1: -	u64 nr_wakeups_remote;
1: -	u64 nr_wakeups_affine;
1: -	u64 nr_wakeups_affine_attempts;
1: -	u64 nr_wakeups_passive;
1: -	u64 nr_wakeups_idle;
1: +  u64 wait_start;
1: +  u64 wait_max;
1: +  u64 wait_count;
1: +  u64 wait_sum;
1: +  u64 iowait_count;
1: +  u64 iowait_sum;
1: +  u64 sleep_start;
1: +  u64 sleep_max;
1: +  s64 sum_sleep_runtime;
1: +  u64 block_start;
1: +  u64 block_max;
1: +  u64 exec_max;
1: +  u64 slice_max;
1: +  u64 nr_migrations_cold;
1: +  u64 nr_failed_migrations_affine;
1: +  u64 nr_failed_migrations_running;
1: +  u64 nr_failed_migrations_hot;
1: +  u64 nr_forced_migrations;
1: +  u64 nr_wakeups;
1: +  u64 nr_wakeups_sync;
1: +  u64 nr_wakeups_migrate;
1: +  u64 nr_wakeups_local;
1: +  u64 nr_wakeups_remote;
1: +  u64 nr_wakeups_affine;
1: +  u64 nr_wakeups_affine_attempts;
1: +  u64 nr_wakeups_passive;
1: +  u64 nr_wakeups_idle;
1:  };
1:  
1:  struct util_est {
1: -	unsigned int enqueued;
1: -	unsigned int ewma;
1: +  unsigned int enqueued;
1: +  unsigned int ewma;
1:  };
1:  
1:  struct sched_avg {
1: -	u64 last_update_time;
1: -	u64 load_sum;
1: -	u64 runnable_sum;
1: -	u32 util_sum;
1: -	u32 period_contrib;
1: -	long unsigned int load_avg;
1: -	long unsigned int runnable_avg;
1: -	long unsigned int util_avg;
1: -	struct util_est util_est;
1: +  u64 last_update_time;
1: +  u64 load_sum;
1: +  u64 runnable_sum;
1: +  u32 util_sum;
1: +  u32 period_contrib;
1: +  long unsigned int load_avg;
1: +  long unsigned int runnable_avg;
1: +  long unsigned int util_avg;
1: +  struct util_est util_est;
1:  };
1:  
1:  struct cfs_rq;
1:  
1:  struct sched_entity {
1: -	struct load_weight load;
1: -	struct rb_node run_node;
1: -	struct list_head group_node;
1: -	unsigned int on_rq;
1: -	u64 exec_start;
1: -	u64 sum_exec_runtime;
1: -	u64 vruntime;
1: -	u64 prev_sum_exec_runtime;
1: -	u64 nr_migrations;
1: -	struct sched_statistics statistics;
1: -	int depth;
1: -	struct sched_entity *parent;
1: -	struct cfs_rq *cfs_rq;
1: -	struct cfs_rq *my_q;
1: -	long unsigned int runnable_weight;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct sched_avg avg;
1: +  struct load_weight load;
1: +  struct rb_node run_node;
1: +  struct list_head group_node;
1: +  unsigned int on_rq;
1: +  u64 exec_start;
1: +  u64 sum_exec_runtime;
1: +  u64 vruntime;
1: +  u64 prev_sum_exec_runtime;
1: +  u64 nr_migrations;
1: +  struct sched_statistics statistics;
1: +  int depth;
1: +  struct sched_entity *parent;
1: +  struct cfs_rq *cfs_rq;
1: +  struct cfs_rq *my_q;
1: +  long unsigned int runnable_weight;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct sched_avg avg;
1:  };
1:  
1:  struct sched_rt_entity {
1: -	struct list_head run_list;
1: -	long unsigned int timeout;
1: -	long unsigned int watchdog_stamp;
1: -	unsigned int time_slice;
1: -	short unsigned int on_rq;
1: -	short unsigned int on_list;
1: -	struct sched_rt_entity *back;
1: +  struct list_head run_list;
1: +  long unsigned int timeout;
1: +  long unsigned int watchdog_stamp;
1: +  unsigned int time_slice;
1: +  short unsigned int on_rq;
1: +  short unsigned int on_list;
1: +  struct sched_rt_entity *back;
1:  };
1:  
1:  typedef s64 ktime_t;
1:  
1:  struct timerqueue_node {
1: -	struct rb_node node;
1: -	ktime_t expires;
1: +  struct rb_node node;
1: +  ktime_t expires;
1:  };
1:  
1:  enum hrtimer_restart {
1: -	HRTIMER_NORESTART = 0,
1: -	HRTIMER_RESTART = 1,
1: +  HRTIMER_NORESTART = 0,
1: +  HRTIMER_RESTART = 1,
1:  };
1:  
1:  struct hrtimer_clock_base;
1:  
1:  struct hrtimer {
1: -	struct timerqueue_node node;
1: -	ktime_t _softexpires;
1: -	enum hrtimer_restart (*function)(struct hrtimer *);
1: -	struct hrtimer_clock_base *base;
1: -	u8 state;
1: -	u8 is_rel;
1: -	u8 is_soft;
1: -	u8 is_hard;
1: +  struct timerqueue_node node;
1: +  ktime_t _softexpires;
1: +  enum hrtimer_restart (*function)(struct hrtimer *);
1: +  struct hrtimer_clock_base *base;
1: +  u8 state;
1: +  u8 is_rel;
1: +  u8 is_soft;
1: +  u8 is_hard;
1:  };
1:  
1:  struct sched_dl_entity {
1: -	struct rb_node rb_node;
1: -	u64 dl_runtime;
1: -	u64 dl_deadline;
1: -	u64 dl_period;
1: -	u64 dl_bw;
1: -	u64 dl_density;
1: -	s64 runtime;
1: -	u64 deadline;
1: -	unsigned int flags;
1: -	unsigned int dl_throttled: 1;
1: -	unsigned int dl_boosted: 1;
1: -	unsigned int dl_yielded: 1;
1: -	unsigned int dl_non_contending: 1;
1: -	unsigned int dl_overrun: 1;
1: -	struct hrtimer dl_timer;
1: -	struct hrtimer inactive_timer;
1: +  struct rb_node rb_node;
1: +  u64 dl_runtime;
1: +  u64 dl_deadline;
1: +  u64 dl_period;
1: +  u64 dl_bw;
1: +  u64 dl_density;
1: +  s64 runtime;
1: +  u64 deadline;
1: +  unsigned int flags;
1: +  unsigned int dl_throttled : 1;
1: +  unsigned int dl_boosted : 1;
1: +  unsigned int dl_yielded : 1;
1: +  unsigned int dl_non_contending : 1;
1: +  unsigned int dl_overrun : 1;
1: +  struct hrtimer dl_timer;
1: +  struct hrtimer inactive_timer;
1:  };
1:  
1:  struct cpumask {
1: -	long unsigned int bits[2];
1: +  long unsigned int bits[2];
1:  };
1:  
1:  typedef struct cpumask cpumask_t;
1:  
1:  union rcu_special {
1: -	struct {
1: -		u8 blocked;
1: -		u8 need_qs;
1: -		u8 exp_hint;
1: -		u8 need_mb;
1: -	} b;
1: -	u32 s;
1: +  struct {
1: +    u8 blocked;
1: +    u8 need_qs;
1: +    u8 exp_hint;
1: +    u8 need_mb;
1: +  } b;
1: +  u32 s;
1:  };
1:  
1:  struct sched_info {
1: -	long unsigned int pcount;
1: -	long long unsigned int run_delay;
1: -	long long unsigned int last_arrival;
1: -	long long unsigned int last_queued;
1: +  long unsigned int pcount;
1: +  long long unsigned int run_delay;
1: +  long long unsigned int last_arrival;
1: +  long long unsigned int last_queued;
1:  };
1:  
1:  struct plist_node {
1: -	int prio;
1: -	struct list_head prio_list;
1: -	struct list_head node_list;
1: +  int prio;
1: +  struct list_head prio_list;
1: +  struct list_head node_list;
1:  };
1:  
1:  struct vmacache {
1: -	u64 seqnum;
1: -	struct vm_area_struct *vmas[4];
1: +  u64 seqnum;
1: +  struct vm_area_struct *vmas[4];
1:  };
1:  
1:  struct task_rss_stat {
1: -	int events;
1: -	int count[4];
1: +  int events;
1: +  int count[4];
1:  };
1:  
1:  struct prev_cputime {
1: -	u64 utime;
1: -	u64 stime;
1: -	raw_spinlock_t lock;
1: +  u64 utime;
1: +  u64 stime;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct rb_root {
1: -	struct rb_node *rb_node;
1: +  struct rb_node *rb_node;
1:  };
1:  
1:  struct rb_root_cached {
1: -	struct rb_root rb_root;
1: -	struct rb_node *rb_leftmost;
1: +  struct rb_root rb_root;
1: +  struct rb_node *rb_leftmost;
1:  };
1:  
1:  struct timerqueue_head {
1: -	struct rb_root_cached rb_root;
1: +  struct rb_root_cached rb_root;
1:  };
1:  
1:  struct posix_cputimer_base {
1: -	u64 nextevt;
1: -	struct timerqueue_head tqhead;
1: +  u64 nextevt;
1: +  struct timerqueue_head tqhead;
1:  };
1:  
1:  struct posix_cputimers {
1: -	struct posix_cputimer_base bases[3];
1: -	unsigned int timers_active;
1: -	unsigned int expiry_active;
1: +  struct posix_cputimer_base bases[3];
1: +  unsigned int timers_active;
1: +  unsigned int expiry_active;
1:  };
1:  
1:  struct posix_cputimers_work {
1: -	struct callback_head work;
1: -	unsigned int scheduled;
1: +  struct callback_head work;
1: +  unsigned int scheduled;
1:  };
1:  
1:  struct sem_undo_list;
1:  
1:  struct sysv_sem {
1: -	struct sem_undo_list *undo_list;
1: +  struct sem_undo_list *undo_list;
1:  };
1:  
1:  struct sysv_shm {
1: -	struct list_head shm_clist;
1: +  struct list_head shm_clist;
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int sig[1];
1: -} sigset_t;
1: +typedef struct { long unsigned int sig[1]; } sigset_t;
1:  
1:  struct sigpending {
1: -	struct list_head list;
1: -	sigset_t signal;
1: +  struct list_head list;
1: +  sigset_t signal;
1:  };
1:  
1: -typedef struct {
1: -	uid_t val;
1: -} kuid_t;
1: +typedef struct { uid_t val; } kuid_t;
1:  
1:  struct seccomp_filter;
1:  
1:  struct seccomp {
1: -	int mode;
1: -	atomic_t filter_count;
1: -	struct seccomp_filter *filter;
1: +  int mode;
1: +  atomic_t filter_count;
1: +  struct seccomp_filter *filter;
1:  };
1:  
1:  struct wake_q_node {
1: -	struct wake_q_node *next;
1: +  struct wake_q_node *next;
1:  };
1:  
1:  struct task_io_accounting {
1: -	u64 rchar;
1: -	u64 wchar;
1: -	u64 syscr;
1: -	u64 syscw;
1: -	u64 read_bytes;
1: -	u64 write_bytes;
1: -	u64 cancelled_write_bytes;
1: +  u64 rchar;
1: +  u64 wchar;
1: +  u64 syscr;
1: +  u64 syscw;
1: +  u64 read_bytes;
1: +  u64 write_bytes;
1: +  u64 cancelled_write_bytes;
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int bits[1];
1: -} nodemask_t;
1: +typedef struct { long unsigned int bits[1]; } nodemask_t;
1:  
1:  struct seqcount {
1: -	unsigned int sequence;
1: +  unsigned int sequence;
1:  };
1:  
1:  typedef struct seqcount seqcount_t;
1:  
1:  struct seqcount_spinlock {
1: -	seqcount_t seqcount;
1: +  seqcount_t seqcount;
1:  };
1:  
1:  typedef struct seqcount_spinlock seqcount_spinlock_t;
1: @@ -636,140 +633,140 @@ typedef struct seqcount_spinlock seqcount_spinlock_t;
1:  typedef atomic64_t atomic_long_t;
1:  
1:  struct optimistic_spin_queue {
1: -	atomic_t tail;
1: +  atomic_t tail;
1:  };
1:  
1:  struct mutex {
1: -	atomic_long_t owner;
1: -	spinlock_t wait_lock;
1: -	struct optimistic_spin_queue osq;
1: -	struct list_head wait_list;
1: -	void *magic;
1: +  atomic_long_t owner;
1: +  spinlock_t wait_lock;
1: +  struct optimistic_spin_queue osq;
1: +  struct list_head wait_list;
1: +  void *magic;
1:  };
1:  
1:  struct arch_tlbflush_unmap_batch {
1: -	struct cpumask cpumask;
1: +  struct cpumask cpumask;
1:  };
1:  
1:  struct tlbflush_unmap_batch {
1: -	struct arch_tlbflush_unmap_batch arch;
1: -	bool flush_required;
1: -	bool writable;
1: +  struct arch_tlbflush_unmap_batch arch;
1: +  bool flush_required;
1: +  bool writable;
1:  };
1:  
1:  struct page_frag {
1: -	struct page *page;
1: -	__u32 offset;
1: -	__u32 size;
1: +  struct page *page;
1: +  __u32 offset;
1: +  __u32 size;
1:  };
1:  
1:  struct desc_struct {
1: -	u16 limit0;
1: -	u16 base0;
1: -	u16 base1: 8;
1: -	u16 type: 4;
1: -	u16 s: 1;
1: -	u16 dpl: 2;
1: -	u16 p: 1;
1: -	u16 limit1: 4;
1: -	u16 avl: 1;
1: -	u16 l: 1;
1: -	u16 d: 1;
1: -	u16 g: 1;
1: -	u16 base2: 8;
1: +  u16 limit0;
1: +  u16 base0;
1: +  u16 base1 : 8;
1: +  u16 type : 4;
1: +  u16 s : 1;
1: +  u16 dpl : 2;
1: +  u16 p : 1;
1: +  u16 limit1 : 4;
1: +  u16 avl : 1;
1: +  u16 l : 1;
1: +  u16 d : 1;
1: +  u16 g : 1;
1: +  u16 base2 : 8;
1:  };
1:  
1:  struct fregs_state {
1: -	u32 cwd;
1: -	u32 swd;
1: -	u32 twd;
1: -	u32 fip;
1: -	u32 fcs;
1: -	u32 foo;
1: -	u32 fos;
1: -	u32 st_space[20];
1: -	u32 status;
1: +  u32 cwd;
1: +  u32 swd;
1: +  u32 twd;
1: +  u32 fip;
1: +  u32 fcs;
1: +  u32 foo;
1: +  u32 fos;
1: +  u32 st_space[20];
1: +  u32 status;
1:  };
1:  
1:  struct fxregs_state {
1: -	u16 cwd;
1: -	u16 swd;
1: -	u16 twd;
1: -	u16 fop;
1: -	union {
1: -		struct {
1: -			u64 rip;
1: -			u64 rdp;
1: -		};
1: -		struct {
1: -			u32 fip;
1: -			u32 fcs;
1: -			u32 foo;
1: -			u32 fos;
1: -		};
1: -	};
1: -	u32 mxcsr;
1: -	u32 mxcsr_mask;
1: -	u32 st_space[32];
1: -	u32 xmm_space[64];
1: -	u32 padding[12];
1: -	union {
1: -		u32 padding1[12];
1: -		u32 sw_reserved[12];
1: -	};
1: +  u16 cwd;
1: +  u16 swd;
1: +  u16 twd;
1: +  u16 fop;
1: +  union {
1: +    struct {
1: +      u64 rip;
1: +      u64 rdp;
1: +    };
1: +    struct {
1: +      u32 fip;
1: +      u32 fcs;
1: +      u32 foo;
1: +      u32 fos;
1: +    };
1: +  };
1: +  u32 mxcsr;
1: +  u32 mxcsr_mask;
1: +  u32 st_space[32];
1: +  u32 xmm_space[64];
1: +  u32 padding[12];
1: +  union {
1: +    u32 padding1[12];
1: +    u32 sw_reserved[12];
1: +  };
1:  };
1:  
1:  struct math_emu_info;
1:  
1:  struct swregs_state {
1: -	u32 cwd;
1: -	u32 swd;
1: -	u32 twd;
1: -	u32 fip;
1: -	u32 fcs;
1: -	u32 foo;
1: -	u32 fos;
1: -	u32 st_space[20];
1: -	u8 ftop;
1: -	u8 changed;
1: -	u8 lookahead;
1: -	u8 no_update;
1: -	u8 rm;
1: -	u8 alimit;
1: -	struct math_emu_info *info;
1: -	u32 entry_eip;
1: +  u32 cwd;
1: +  u32 swd;
1: +  u32 twd;
1: +  u32 fip;
1: +  u32 fcs;
1: +  u32 foo;
1: +  u32 fos;
1: +  u32 st_space[20];
1: +  u8 ftop;
1: +  u8 changed;
1: +  u8 lookahead;
1: +  u8 no_update;
1: +  u8 rm;
1: +  u8 alimit;
1: +  struct math_emu_info *info;
1: +  u32 entry_eip;
1:  };
1:  
1:  struct xstate_header {
1: -	u64 xfeatures;
1: -	u64 xcomp_bv;
1: -	u64 reserved[6];
1: +  u64 xfeatures;
1: +  u64 xcomp_bv;
1: +  u64 reserved[6];
1:  };
1:  
1:  struct xregs_state {
1: -	struct fxregs_state i387;
1: -	struct xstate_header header;
1: -	u8 extended_state_area[0];
1: +  struct fxregs_state i387;
1: +  struct xstate_header header;
1: +  u8 extended_state_area[0];
1:  };
1:  
1:  union fpregs_state {
1: -	struct fregs_state fsave;
1: -	struct fxregs_state fxsave;
1: -	struct swregs_state soft;
1: -	struct xregs_state xsave;
1: -	u8 __padding[4096];
1: +  struct fregs_state fsave;
1: +  struct fxregs_state fxsave;
1: +  struct swregs_state soft;
1: +  struct xregs_state xsave;
1: +  u8 __padding[4096];
1:  };
1:  
1:  struct fpu {
1: -	unsigned int last_cpu;
1: -	long unsigned int avx512_timestamp;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	union fpregs_state state;
1: +  unsigned int last_cpu;
1: +  long unsigned int avx512_timestamp;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  union fpregs_state state;
1:  };
1:  
1:  struct perf_event;
1: @@ -777,30 +774,30 @@ struct perf_event;
1:  struct io_bitmap;
1:  
1:  struct thread_struct {
1: -	struct desc_struct tls_array[3];
1: -	long unsigned int sp;
1: -	short unsigned int es;
1: -	short unsigned int ds;
1: -	short unsigned int fsindex;
1: -	short unsigned int gsindex;
1: -	long unsigned int fsbase;
1: -	long unsigned int gsbase;
1: -	struct perf_event *ptrace_bps[4];
1: -	long unsigned int virtual_dr6;
1: -	long unsigned int ptrace_dr7;
1: -	long unsigned int cr2;
1: -	long unsigned int trap_nr;
1: -	long unsigned int error_code;
1: -	struct io_bitmap *io_bitmap;
1: -	long unsigned int iopl_emul;
1: -	unsigned int sig_on_uaccess_err: 1;
1: -	long: 63;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct fpu fpu;
1: +  struct desc_struct tls_array[3];
1: +  long unsigned int sp;
1: +  short unsigned int es;
1: +  short unsigned int ds;
1: +  short unsigned int fsindex;
1: +  short unsigned int gsindex;
1: +  long unsigned int fsbase;
1: +  long unsigned int gsbase;
1: +  struct perf_event *ptrace_bps[4];
1: +  long unsigned int virtual_dr6;
1: +  long unsigned int ptrace_dr7;
1: +  long unsigned int cr2;
1: +  long unsigned int trap_nr;
1: +  long unsigned int error_code;
1: +  struct io_bitmap *io_bitmap;
1: +  long unsigned int iopl_emul;
1: +  unsigned int sig_on_uaccess_err : 1;
1: +  long : 63;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct fpu fpu;
1:  };
1:  
1:  struct sched_class;
1: @@ -882,559 +879,559 @@ struct uprobe_task;
1:  struct vm_struct;
1:  
1:  struct task_struct {
1: -	struct thread_info thread_info;
1: -	volatile long int state;
1: -	void *stack;
1: -	refcount_t usage;
1: -	unsigned int flags;
1: -	unsigned int ptrace;
1: -	int on_cpu;
1: -	struct __call_single_node wake_entry;
1: -	unsigned int cpu;
1: -	unsigned int wakee_flips;
1: -	long unsigned int wakee_flip_decay_ts;
1: -	struct task_struct *last_wakee;
1: -	int recent_used_cpu;
1: -	int wake_cpu;
1: -	int on_rq;
1: -	int prio;
1: -	int static_prio;
1: -	int normal_prio;
1: -	unsigned int rt_priority;
1: -	const struct sched_class *sched_class;
1: -	struct sched_entity se;
1: -	struct sched_rt_entity rt;
1: -	struct task_group *sched_task_group;
1: -	struct sched_dl_entity dl;
1: -	struct hlist_head preempt_notifiers;
1: -	unsigned int btrace_seq;
1: -	unsigned int policy;
1: -	int nr_cpus_allowed;
1: -	const cpumask_t *cpus_ptr;
1: -	cpumask_t cpus_mask;
1: -	int trc_reader_nesting;
1: -	int trc_ipi_to_cpu;
1: -	union rcu_special trc_reader_special;
1: -	bool trc_reader_checked;
1: -	struct list_head trc_holdout_list;
1: -	struct sched_info sched_info;
1: -	struct list_head tasks;
1: -	struct plist_node pushable_tasks;
1: -	struct rb_node pushable_dl_tasks;
1: -	struct mm_struct *mm;
1: -	struct mm_struct *active_mm;
1: -	struct vmacache vmacache;
1: -	struct task_rss_stat rss_stat;
1: -	int exit_state;
1: -	int exit_code;
1: -	int exit_signal;
1: -	int pdeath_signal;
1: -	long unsigned int jobctl;
1: -	unsigned int personality;
1: -	unsigned int sched_reset_on_fork: 1;
1: -	unsigned int sched_contributes_to_load: 1;
1: -	unsigned int sched_migrated: 1;
1: -	unsigned int sched_remote_wakeup: 1;
1: -	unsigned int sched_psi_wake_requeue: 1;
1: -	int: 27;
1: -	unsigned int in_execve: 1;
1: -	unsigned int in_iowait: 1;
1: -	unsigned int restore_sigmask: 1;
1: -	unsigned int in_user_fault: 1;
1: -	unsigned int brk_randomized: 1;
1: -	unsigned int no_cgroup_migration: 1;
1: -	unsigned int frozen: 1;
1: -	unsigned int use_memdelay: 1;
1: -	unsigned int in_memstall: 1;
1: -	long unsigned int atomic_flags;
1: -	struct restart_block restart_block;
1: -	pid_t pid;
1: -	pid_t tgid;
1: -	struct task_struct *real_parent;
1: -	struct task_struct *parent;
1: -	struct list_head children;
1: -	struct list_head sibling;
1: -	struct task_struct *group_leader;
1: -	struct list_head ptraced;
1: -	struct list_head ptrace_entry;
1: -	struct pid *thread_pid;
1: -	struct hlist_node pid_links[4];
1: -	struct list_head thread_group;
1: -	struct list_head thread_node;
1: -	struct completion *vfork_done;
1: -	int *set_child_tid;
1: -	int *clear_child_tid;
1: -	u64 utime;
1: -	u64 stime;
1: -	u64 gtime;
1: -	struct prev_cputime prev_cputime;
1: -	long unsigned int nvcsw;
1: -	long unsigned int nivcsw;
1: -	u64 start_time;
1: -	u64 start_boottime;
1: -	long unsigned int min_flt;
1: -	long unsigned int maj_flt;
1: -	struct posix_cputimers posix_cputimers;
1: -	struct posix_cputimers_work posix_cputimers_work;
1: -	const struct cred *ptracer_cred;
1: -	const struct cred *real_cred;
1: -	const struct cred *cred;
1: -	struct key *cached_requested_key;
1: -	char comm[16];
1: -	struct nameidata *nameidata;
1: -	struct sysv_sem sysvsem;
1: -	struct sysv_shm sysvshm;
1: -	long unsigned int last_switch_count;
1: -	long unsigned int last_switch_time;
1: -	struct fs_struct *fs;
1: -	struct files_struct *files;
1: -	struct io_uring_task *io_uring;
1: -	struct nsproxy *nsproxy;
1: -	struct signal_struct *signal;
1: -	struct sighand_struct *sighand;
1: -	sigset_t blocked;
1: -	sigset_t real_blocked;
1: -	sigset_t saved_sigmask;
1: -	struct sigpending pending;
1: -	long unsigned int sas_ss_sp;
1: -	size_t sas_ss_size;
1: -	unsigned int sas_ss_flags;
1: -	struct callback_head *task_works;
1: -	struct audit_context *audit_context;
1: -	kuid_t loginuid;
1: -	unsigned int sessionid;
1: -	struct seccomp seccomp;
1: -	u64 parent_exec_id;
1: -	u64 self_exec_id;
1: -	spinlock_t alloc_lock;
1: -	raw_spinlock_t pi_lock;
1: -	struct wake_q_node wake_q;
1: -	struct rb_root_cached pi_waiters;
1: -	struct task_struct *pi_top_task;
1: -	struct rt_mutex_waiter *pi_blocked_on;
1: -	struct mutex_waiter *blocked_on;
1: -	int non_block_count;
1: -	void *journal_info;
1: -	struct bio_list *bio_list;
1: -	struct blk_plug *plug;
1: -	struct reclaim_state *reclaim_state;
1: -	struct backing_dev_info *backing_dev_info;
1: -	struct io_context *io_context;
1: -	struct capture_control *capture_control;
1: -	long unsigned int ptrace_message;
1: -	kernel_siginfo_t *last_siginfo;
1: -	struct task_io_accounting ioac;
1: -	unsigned int psi_flags;
1: -	u64 acct_rss_mem1;
1: -	u64 acct_vm_mem1;
1: -	u64 acct_timexpd;
1: -	nodemask_t mems_allowed;
1: -	seqcount_spinlock_t mems_allowed_seq;
1: -	int cpuset_mem_spread_rotor;
1: -	int cpuset_slab_spread_rotor;
1: -	struct css_set *cgroups;
1: -	struct list_head cg_list;
1: -	struct robust_list_head *robust_list;
1: -	struct compat_robust_list_head *compat_robust_list;
1: -	struct list_head pi_state_list;
1: -	struct futex_pi_state *pi_state_cache;
1: -	struct mutex futex_exit_mutex;
1: -	unsigned int futex_state;
1: -	struct perf_event_context *perf_event_ctxp[2];
1: -	struct mutex perf_event_mutex;
1: -	struct list_head perf_event_list;
1: -	struct mempolicy *mempolicy;
1: -	short int il_prev;
1: -	short int pref_node_fork;
1: -	int numa_scan_seq;
1: -	unsigned int numa_scan_period;
1: -	unsigned int numa_scan_period_max;
1: -	int numa_preferred_nid;
1: -	long unsigned int numa_migrate_retry;
1: -	u64 node_stamp;
1: -	u64 last_task_numa_placement;
1: -	u64 last_sum_exec_runtime;
1: -	struct callback_head numa_work;
1: -	struct numa_group *numa_group;
1: -	long unsigned int *numa_faults;
1: -	long unsigned int total_numa_faults;
1: -	long unsigned int numa_faults_locality[3];
1: -	long unsigned int numa_pages_migrated;
1: -	struct rseq *rseq;
1: -	u32 rseq_sig;
1: -	long unsigned int rseq_event_mask;
1: -	struct tlbflush_unmap_batch tlb_ubc;
1: -	union {
1: -		refcount_t rcu_users;
1: -		struct callback_head rcu;
1: -	};
1: -	struct pipe_inode_info *splice_pipe;
1: -	struct page_frag task_frag;
1: -	struct task_delay_info *delays;
1: -	int make_it_fail;
1: -	unsigned int fail_nth;
1: -	int nr_dirtied;
1: -	int nr_dirtied_pause;
1: -	long unsigned int dirty_paused_when;
1: -	u64 timer_slack_ns;
1: -	u64 default_timer_slack_ns;
1: -	int curr_ret_stack;
1: -	int curr_ret_depth;
1: -	struct ftrace_ret_stack *ret_stack;
1: -	long long unsigned int ftrace_timestamp;
1: -	atomic_t trace_overrun;
1: -	atomic_t tracing_graph_pause;
1: -	long unsigned int trace;
1: -	long unsigned int trace_recursion;
1: -	struct mem_cgroup *memcg_in_oom;
1: -	gfp_t memcg_oom_gfp_mask;
1: -	int memcg_oom_order;
1: -	unsigned int memcg_nr_pages_over_high;
1: -	struct mem_cgroup *active_memcg;
1: -	struct request_queue *throttle_queue;
1: -	struct uprobe_task *utask;
1: -	unsigned int sequential_io;
1: -	unsigned int sequential_io_avg;
1: -	long unsigned int task_state_change;
1: -	int pagefault_disabled;
1: -	struct task_struct *oom_reaper_list;
1: -	struct vm_struct *stack_vm_area;
1: -	refcount_t stack_refcount;
1: -	void *security;
1: -	void *mce_vaddr;
1: -	__u64 mce_kflags;
1: -	u64 mce_addr;
1: -	__u64 mce_ripv: 1;
1: -	__u64 mce_whole_page: 1;
1: -	__u64 __mce_reserved: 62;
1: -	struct callback_head mce_kill_me;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct thread_struct thread;
1: +  struct thread_info thread_info;
1: +  volatile long int state;
1: +  void *stack;
1: +  refcount_t usage;
1: +  unsigned int flags;
1: +  unsigned int ptrace;
1: +  int on_cpu;
1: +  struct __call_single_node wake_entry;
1: +  unsigned int cpu;
1: +  unsigned int wakee_flips;
1: +  long unsigned int wakee_flip_decay_ts;
1: +  struct task_struct *last_wakee;
1: +  int recent_used_cpu;
1: +  int wake_cpu;
1: +  int on_rq;
1: +  int prio;
1: +  int static_prio;
1: +  int normal_prio;
1: +  unsigned int rt_priority;
1: +  const struct sched_class *sched_class;
1: +  struct sched_entity se;
1: +  struct sched_rt_entity rt;
1: +  struct task_group *sched_task_group;
1: +  struct sched_dl_entity dl;
1: +  struct hlist_head preempt_notifiers;
1: +  unsigned int btrace_seq;
1: +  unsigned int policy;
1: +  int nr_cpus_allowed;
1: +  const cpumask_t *cpus_ptr;
1: +  cpumask_t cpus_mask;
1: +  int trc_reader_nesting;
1: +  int trc_ipi_to_cpu;
1: +  union rcu_special trc_reader_special;
1: +  bool trc_reader_checked;
1: +  struct list_head trc_holdout_list;
1: +  struct sched_info sched_info;
1: +  struct list_head tasks;
1: +  struct plist_node pushable_tasks;
1: +  struct rb_node pushable_dl_tasks;
1: +  struct mm_struct *mm;
1: +  struct mm_struct *active_mm;
1: +  struct vmacache vmacache;
1: +  struct task_rss_stat rss_stat;
1: +  int exit_state;
1: +  int exit_code;
1: +  int exit_signal;
1: +  int pdeath_signal;
1: +  long unsigned int jobctl;
1: +  unsigned int personality;
1: +  unsigned int sched_reset_on_fork : 1;
1: +  unsigned int sched_contributes_to_load : 1;
1: +  unsigned int sched_migrated : 1;
1: +  unsigned int sched_remote_wakeup : 1;
1: +  unsigned int sched_psi_wake_requeue : 1;
1: +  int : 27;
1: +  unsigned int in_execve : 1;
1: +  unsigned int in_iowait : 1;
1: +  unsigned int restore_sigmask : 1;
1: +  unsigned int in_user_fault : 1;
1: +  unsigned int brk_randomized : 1;
1: +  unsigned int no_cgroup_migration : 1;
1: +  unsigned int frozen : 1;
1: +  unsigned int use_memdelay : 1;
1: +  unsigned int in_memstall : 1;
1: +  long unsigned int atomic_flags;
1: +  struct restart_block restart_block;
1: +  pid_t pid;
1: +  pid_t tgid;
1: +  struct task_struct *real_parent;
1: +  struct task_struct *parent;
1: +  struct list_head children;
1: +  struct list_head sibling;
1: +  struct task_struct *group_leader;
1: +  struct list_head ptraced;
1: +  struct list_head ptrace_entry;
1: +  struct pid *thread_pid;
1: +  struct hlist_node pid_links[4];
1: +  struct list_head thread_group;
1: +  struct list_head thread_node;
1: +  struct completion *vfork_done;
1: +  int *set_child_tid;
1: +  int *clear_child_tid;
1: +  u64 utime;
1: +  u64 stime;
1: +  u64 gtime;
1: +  struct prev_cputime prev_cputime;
1: +  long unsigned int nvcsw;
1: +  long unsigned int nivcsw;
1: +  u64 start_time;
1: +  u64 start_boottime;
1: +  long unsigned int min_flt;
1: +  long unsigned int maj_flt;
1: +  struct posix_cputimers posix_cputimers;
1: +  struct posix_cputimers_work posix_cputimers_work;
1: +  const struct cred *ptracer_cred;
1: +  const struct cred *real_cred;
1: +  const struct cred *cred;
1: +  struct key *cached_requested_key;
1: +  char comm[16];
1: +  struct nameidata *nameidata;
1: +  struct sysv_sem sysvsem;
1: +  struct sysv_shm sysvshm;
1: +  long unsigned int last_switch_count;
1: +  long unsigned int last_switch_time;
1: +  struct fs_struct *fs;
1: +  struct files_struct *files;
1: +  struct io_uring_task *io_uring;
1: +  struct nsproxy *nsproxy;
1: +  struct signal_struct *signal;
1: +  struct sighand_struct *sighand;
1: +  sigset_t blocked;
1: +  sigset_t real_blocked;
1: +  sigset_t saved_sigmask;
1: +  struct sigpending pending;
1: +  long unsigned int sas_ss_sp;
1: +  size_t sas_ss_size;
1: +  unsigned int sas_ss_flags;
1: +  struct callback_head *task_works;
1: +  struct audit_context *audit_context;
1: +  kuid_t loginuid;
1: +  unsigned int sessionid;
1: +  struct seccomp seccomp;
1: +  u64 parent_exec_id;
1: +  u64 self_exec_id;
1: +  spinlock_t alloc_lock;
1: +  raw_spinlock_t pi_lock;
1: +  struct wake_q_node wake_q;
1: +  struct rb_root_cached pi_waiters;
1: +  struct task_struct *pi_top_task;
1: +  struct rt_mutex_waiter *pi_blocked_on;
1: +  struct mutex_waiter *blocked_on;
1: +  int non_block_count;
1: +  void *journal_info;
1: +  struct bio_list *bio_list;
1: +  struct blk_plug *plug;
1: +  struct reclaim_state *reclaim_state;
1: +  struct backing_dev_info *backing_dev_info;
1: +  struct io_context *io_context;
1: +  struct capture_control *capture_control;
1: +  long unsigned int ptrace_message;
1: +  kernel_siginfo_t *last_siginfo;
1: +  struct task_io_accounting ioac;
1: +  unsigned int psi_flags;
1: +  u64 acct_rss_mem1;
1: +  u64 acct_vm_mem1;
1: +  u64 acct_timexpd;
1: +  nodemask_t mems_allowed;
1: +  seqcount_spinlock_t mems_allowed_seq;
1: +  int cpuset_mem_spread_rotor;
1: +  int cpuset_slab_spread_rotor;
1: +  struct css_set *cgroups;
1: +  struct list_head cg_list;
1: +  struct robust_list_head *robust_list;
1: +  struct compat_robust_list_head *compat_robust_list;
1: +  struct list_head pi_state_list;
1: +  struct futex_pi_state *pi_state_cache;
1: +  struct mutex futex_exit_mutex;
1: +  unsigned int futex_state;
1: +  struct perf_event_context *perf_event_ctxp[2];
1: +  struct mutex perf_event_mutex;
1: +  struct list_head perf_event_list;
1: +  struct mempolicy *mempolicy;
1: +  short int il_prev;
1: +  short int pref_node_fork;
1: +  int numa_scan_seq;
1: +  unsigned int numa_scan_period;
1: +  unsigned int numa_scan_period_max;
1: +  int numa_preferred_nid;
1: +  long unsigned int numa_migrate_retry;
1: +  u64 node_stamp;
1: +  u64 last_task_numa_placement;
1: +  u64 last_sum_exec_runtime;
1: +  struct callback_head numa_work;
1: +  struct numa_group *numa_group;
1: +  long unsigned int *numa_faults;
1: +  long unsigned int total_numa_faults;
1: +  long unsigned int numa_faults_locality[3];
1: +  long unsigned int numa_pages_migrated;
1: +  struct rseq *rseq;
1: +  u32 rseq_sig;
1: +  long unsigned int rseq_event_mask;
1: +  struct tlbflush_unmap_batch tlb_ubc;
1: +  union {
1: +    refcount_t rcu_users;
1: +    struct callback_head rcu;
1: +  };
1: +  struct pipe_inode_info *splice_pipe;
1: +  struct page_frag task_frag;
1: +  struct task_delay_info *delays;
1: +  int make_it_fail;
1: +  unsigned int fail_nth;
1: +  int nr_dirtied;
1: +  int nr_dirtied_pause;
1: +  long unsigned int dirty_paused_when;
1: +  u64 timer_slack_ns;
1: +  u64 default_timer_slack_ns;
1: +  int curr_ret_stack;
1: +  int curr_ret_depth;
1: +  struct ftrace_ret_stack *ret_stack;
1: +  long long unsigned int ftrace_timestamp;
1: +  atomic_t trace_overrun;
1: +  atomic_t tracing_graph_pause;
1: +  long unsigned int trace;
1: +  long unsigned int trace_recursion;
1: +  struct mem_cgroup *memcg_in_oom;
1: +  gfp_t memcg_oom_gfp_mask;
1: +  int memcg_oom_order;
1: +  unsigned int memcg_nr_pages_over_high;
1: +  struct mem_cgroup *active_memcg;
1: +  struct request_queue *throttle_queue;
1: +  struct uprobe_task *utask;
1: +  unsigned int sequential_io;
1: +  unsigned int sequential_io_avg;
1: +  long unsigned int task_state_change;
1: +  int pagefault_disabled;
1: +  struct task_struct *oom_reaper_list;
1: +  struct vm_struct *stack_vm_area;
1: +  refcount_t stack_refcount;
1: +  void *security;
1: +  void *mce_vaddr;
1: +  __u64 mce_kflags;
1: +  u64 mce_addr;
1: +  __u64 mce_ripv : 1;
1: +  __u64 mce_whole_page : 1;
1: +  __u64 __mce_reserved : 62;
1: +  struct callback_head mce_kill_me;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct thread_struct thread;
1:  };
1:  
1:  struct screen_info {
1: -	__u8 orig_x;
1: -	__u8 orig_y;
1: -	__u16 ext_mem_k;
1: -	__u16 orig_video_page;
1: -	__u8 orig_video_mode;
1: -	__u8 orig_video_cols;
1: -	__u8 flags;
1: -	__u8 unused2;
1: -	__u16 orig_video_ega_bx;
1: -	__u16 unused3;
1: -	__u8 orig_video_lines;
1: -	__u8 orig_video_isVGA;
1: -	__u16 orig_video_points;
1: -	__u16 lfb_width;
1: -	__u16 lfb_height;
1: -	__u16 lfb_depth;
1: -	__u32 lfb_base;
1: -	__u32 lfb_size;
1: -	__u16 cl_magic;
1: -	__u16 cl_offset;
1: -	__u16 lfb_linelength;
1: -	__u8 red_size;
1: -	__u8 red_pos;
1: -	__u8 green_size;
1: -	__u8 green_pos;
1: -	__u8 blue_size;
1: -	__u8 blue_pos;
1: -	__u8 rsvd_size;
1: -	__u8 rsvd_pos;
1: -	__u16 vesapm_seg;
1: -	__u16 vesapm_off;
1: -	__u16 pages;
1: -	__u16 vesa_attributes;
1: -	__u32 capabilities;
1: -	__u32 ext_lfb_base;
1: -	__u8 _reserved[2];
1: +  __u8 orig_x;
1: +  __u8 orig_y;
1: +  __u16 ext_mem_k;
1: +  __u16 orig_video_page;
1: +  __u8 orig_video_mode;
1: +  __u8 orig_video_cols;
1: +  __u8 flags;
1: +  __u8 unused2;
1: +  __u16 orig_video_ega_bx;
1: +  __u16 unused3;
1: +  __u8 orig_video_lines;
1: +  __u8 orig_video_isVGA;
1: +  __u16 orig_video_points;
1: +  __u16 lfb_width;
1: +  __u16 lfb_height;
1: +  __u16 lfb_depth;
1: +  __u32 lfb_base;
1: +  __u32 lfb_size;
1: +  __u16 cl_magic;
1: +  __u16 cl_offset;
1: +  __u16 lfb_linelength;
1: +  __u8 red_size;
1: +  __u8 red_pos;
1: +  __u8 green_size;
1: +  __u8 green_pos;
1: +  __u8 blue_size;
1: +  __u8 blue_pos;
1: +  __u8 rsvd_size;
1: +  __u8 rsvd_pos;
1: +  __u16 vesapm_seg;
1: +  __u16 vesapm_off;
1: +  __u16 pages;
1: +  __u16 vesa_attributes;
1: +  __u32 capabilities;
1: +  __u32 ext_lfb_base;
1: +  __u8 _reserved[2];
1:  } __attribute__((packed));
1:  
1:  struct apm_bios_info {
1: -	__u16 version;
1: -	__u16 cseg;
1: -	__u32 offset;
1: -	__u16 cseg_16;
1: -	__u16 dseg;
1: -	__u16 flags;
1: -	__u16 cseg_len;
1: -	__u16 cseg_16_len;
1: -	__u16 dseg_len;
1: +  __u16 version;
1: +  __u16 cseg;
1: +  __u32 offset;
1: +  __u16 cseg_16;
1: +  __u16 dseg;
1: +  __u16 flags;
1: +  __u16 cseg_len;
1: +  __u16 cseg_16_len;
1: +  __u16 dseg_len;
1:  };
1:  
1:  struct edd_device_params {
1: -	__u16 length;
1: -	__u16 info_flags;
1: -	__u32 num_default_cylinders;
1: -	__u32 num_default_heads;
1: -	__u32 sectors_per_track;
1: -	__u64 number_of_sectors;
1: -	__u16 bytes_per_sector;
1: -	__u32 dpte_ptr;
1: -	__u16 key;
1: -	__u8 device_path_info_length;
1: -	__u8 reserved2;
1: -	__u16 reserved3;
1: -	__u8 host_bus_type[4];
1: -	__u8 interface_type[8];
1: -	union {
1: -		struct {
1: -			__u16 base_address;
1: -			__u16 reserved1;
1: -			__u32 reserved2;
1: -		} isa;
1: -		struct {
1: -			__u8 bus;
1: -			__u8 slot;
1: -			__u8 function;
1: -			__u8 channel;
1: -			__u32 reserved;
1: -		} pci;
1: -		struct {
1: -			__u64 reserved;
1: -		} ibnd;
1: -		struct {
1: -			__u64 reserved;
1: -		} xprs;
1: -		struct {
1: -			__u64 reserved;
1: -		} htpt;
1: -		struct {
1: -			__u64 reserved;
1: -		} unknown;
1: -	} interface_path;
1: -	union {
1: -		struct {
1: -			__u8 device;
1: -			__u8 reserved1;
1: -			__u16 reserved2;
1: -			__u32 reserved3;
1: -			__u64 reserved4;
1: -		} ata;
1: -		struct {
1: -			__u8 device;
1: -			__u8 lun;
1: -			__u8 reserved1;
1: -			__u8 reserved2;
1: -			__u32 reserved3;
1: -			__u64 reserved4;
1: -		} atapi;
1: -		struct {
1: -			__u16 id;
1: -			__u64 lun;
1: -			__u16 reserved1;
1: -			__u32 reserved2;
1: -		} __attribute__((packed)) scsi;
1: -		struct {
1: -			__u64 serial_number;
1: -			__u64 reserved;
1: -		} usb;
1: -		struct {
1: -			__u64 eui;
1: -			__u64 reserved;
1: -		} i1394;
1: -		struct {
1: -			__u64 wwid;
1: -			__u64 lun;
1: -		} fibre;
1: -		struct {
1: -			__u64 identity_tag;
1: -			__u64 reserved;
1: -		} i2o;
1: -		struct {
1: -			__u32 array_number;
1: -			__u32 reserved1;
1: -			__u64 reserved2;
1: -		} raid;
1: -		struct {
1: -			__u8 device;
1: -			__u8 reserved1;
1: -			__u16 reserved2;
1: -			__u32 reserved3;
1: -			__u64 reserved4;
1: -		} sata;
1: -		struct {
1: -			__u64 reserved1;
1: -			__u64 reserved2;
1: -		} unknown;
1: -	} device_path;
1: -	__u8 reserved4;
1: -	__u8 checksum;
1: +  __u16 length;
1: +  __u16 info_flags;
1: +  __u32 num_default_cylinders;
1: +  __u32 num_default_heads;
1: +  __u32 sectors_per_track;
1: +  __u64 number_of_sectors;
1: +  __u16 bytes_per_sector;
1: +  __u32 dpte_ptr;
1: +  __u16 key;
1: +  __u8 device_path_info_length;
1: +  __u8 reserved2;
1: +  __u16 reserved3;
1: +  __u8 host_bus_type[4];
1: +  __u8 interface_type[8];
1: +  union {
1: +    struct {
1: +      __u16 base_address;
1: +      __u16 reserved1;
1: +      __u32 reserved2;
1: +    } isa;
1: +    struct {
1: +      __u8 bus;
1: +      __u8 slot;
1: +      __u8 function;
1: +      __u8 channel;
1: +      __u32 reserved;
1: +    } pci;
1: +    struct {
1: +      __u64 reserved;
1: +    } ibnd;
1: +    struct {
1: +      __u64 reserved;
1: +    } xprs;
1: +    struct {
1: +      __u64 reserved;
1: +    } htpt;
1: +    struct {
1: +      __u64 reserved;
1: +    } unknown;
1: +  } interface_path;
1: +  union {
1: +    struct {
1: +      __u8 device;
1: +      __u8 reserved1;
1: +      __u16 reserved2;
1: +      __u32 reserved3;
1: +      __u64 reserved4;
1: +    } ata;
1: +    struct {
1: +      __u8 device;
1: +      __u8 lun;
1: +      __u8 reserved1;
1: +      __u8 reserved2;
1: +      __u32 reserved3;
1: +      __u64 reserved4;
1: +    } atapi;
1: +    struct {
1: +      __u16 id;
1: +      __u64 lun;
1: +      __u16 reserved1;
1: +      __u32 reserved2;
1: +    } __attribute__((packed)) scsi;
1: +    struct {
1: +      __u64 serial_number;
1: +      __u64 reserved;
1: +    } usb;
1: +    struct {
1: +      __u64 eui;
1: +      __u64 reserved;
1: +    } i1394;
1: +    struct {
1: +      __u64 wwid;
1: +      __u64 lun;
1: +    } fibre;
1: +    struct {
1: +      __u64 identity_tag;
1: +      __u64 reserved;
1: +    } i2o;
1: +    struct {
1: +      __u32 array_number;
1: +      __u32 reserved1;
1: +      __u64 reserved2;
1: +    } raid;
1: +    struct {
1: +      __u8 device;
1: +      __u8 reserved1;
1: +      __u16 reserved2;
1: +      __u32 reserved3;
1: +      __u64 reserved4;
1: +    } sata;
1: +    struct {
1: +      __u64 reserved1;
1: +      __u64 reserved2;
1: +    } unknown;
1: +  } device_path;
1: +  __u8 reserved4;
1: +  __u8 checksum;
1:  } __attribute__((packed));
1:  
1:  struct edd_info {
1: -	__u8 device;
1: -	__u8 version;
1: -	__u16 interface_support;
1: -	__u16 legacy_max_cylinder;
1: -	__u8 legacy_max_head;
1: -	__u8 legacy_sectors_per_track;
1: -	struct edd_device_params params;
1: +  __u8 device;
1: +  __u8 version;
1: +  __u16 interface_support;
1: +  __u16 legacy_max_cylinder;
1: +  __u8 legacy_max_head;
1: +  __u8 legacy_sectors_per_track;
1: +  struct edd_device_params params;
1:  } __attribute__((packed));
1:  
1:  struct ist_info {
1: -	__u32 signature;
1: -	__u32 command;
1: -	__u32 event;
1: -	__u32 perf_level;
1: +  __u32 signature;
1: +  __u32 command;
1: +  __u32 event;
1: +  __u32 perf_level;
1:  };
1:  
1:  struct edid_info {
1: -	unsigned char dummy[128];
1: +  unsigned char dummy[128];
1:  };
1:  
1:  struct setup_header {
1: -	__u8 setup_sects;
1: -	__u16 root_flags;
1: -	__u32 syssize;
1: -	__u16 ram_size;
1: -	__u16 vid_mode;
1: -	__u16 root_dev;
1: -	__u16 boot_flag;
1: -	__u16 jump;
1: -	__u32 header;
1: -	__u16 version;
1: -	__u32 realmode_swtch;
1: -	__u16 start_sys_seg;
1: -	__u16 kernel_version;
1: -	__u8 type_of_loader;
1: -	__u8 loadflags;
1: -	__u16 setup_move_size;
1: -	__u32 code32_start;
1: -	__u32 ramdisk_image;
1: -	__u32 ramdisk_size;
1: -	__u32 bootsect_kludge;
1: -	__u16 heap_end_ptr;
1: -	__u8 ext_loader_ver;
1: -	__u8 ext_loader_type;
1: -	__u32 cmd_line_ptr;
1: -	__u32 initrd_addr_max;
1: -	__u32 kernel_alignment;
1: -	__u8 relocatable_kernel;
1: -	__u8 min_alignment;
1: -	__u16 xloadflags;
1: -	__u32 cmdline_size;
1: -	__u32 hardware_subarch;
1: -	__u64 hardware_subarch_data;
1: -	__u32 payload_offset;
1: -	__u32 payload_length;
1: -	__u64 setup_data;
1: -	__u64 pref_address;
1: -	__u32 init_size;
1: -	__u32 handover_offset;
1: -	__u32 kernel_info_offset;
1: +  __u8 setup_sects;
1: +  __u16 root_flags;
1: +  __u32 syssize;
1: +  __u16 ram_size;
1: +  __u16 vid_mode;
1: +  __u16 root_dev;
1: +  __u16 boot_flag;
1: +  __u16 jump;
1: +  __u32 header;
1: +  __u16 version;
1: +  __u32 realmode_swtch;
1: +  __u16 start_sys_seg;
1: +  __u16 kernel_version;
1: +  __u8 type_of_loader;
1: +  __u8 loadflags;
1: +  __u16 setup_move_size;
1: +  __u32 code32_start;
1: +  __u32 ramdisk_image;
1: +  __u32 ramdisk_size;
1: +  __u32 bootsect_kludge;
1: +  __u16 heap_end_ptr;
1: +  __u8 ext_loader_ver;
1: +  __u8 ext_loader_type;
1: +  __u32 cmd_line_ptr;
1: +  __u32 initrd_addr_max;
1: +  __u32 kernel_alignment;
1: +  __u8 relocatable_kernel;
1: +  __u8 min_alignment;
1: +  __u16 xloadflags;
1: +  __u32 cmdline_size;
1: +  __u32 hardware_subarch;
1: +  __u64 hardware_subarch_data;
1: +  __u32 payload_offset;
1: +  __u32 payload_length;
1: +  __u64 setup_data;
1: +  __u64 pref_address;
1: +  __u32 init_size;
1: +  __u32 handover_offset;
1: +  __u32 kernel_info_offset;
1:  } __attribute__((packed));
1:  
1:  struct sys_desc_table {
1: -	__u16 length;
1: -	__u8 table[14];
1: +  __u16 length;
1: +  __u8 table[14];
1:  };
1:  
1:  struct olpc_ofw_header {
1: -	__u32 ofw_magic;
1: -	__u32 ofw_version;
1: -	__u32 cif_handler;
1: -	__u32 irq_desc_table;
1: +  __u32 ofw_magic;
1: +  __u32 ofw_version;
1: +  __u32 cif_handler;
1: +  __u32 irq_desc_table;
1:  };
1:  
1:  struct efi_info {
1: -	__u32 efi_loader_signature;
1: -	__u32 efi_systab;
1: -	__u32 efi_memdesc_size;
1: -	__u32 efi_memdesc_version;
1: -	__u32 efi_memmap;
1: -	__u32 efi_memmap_size;
1: -	__u32 efi_systab_hi;
1: -	__u32 efi_memmap_hi;
1: +  __u32 efi_loader_signature;
1: +  __u32 efi_systab;
1: +  __u32 efi_memdesc_size;
1: +  __u32 efi_memdesc_version;
1: +  __u32 efi_memmap;
1: +  __u32 efi_memmap_size;
1: +  __u32 efi_systab_hi;
1: +  __u32 efi_memmap_hi;
1:  };
1:  
1:  struct boot_e820_entry {
1: -	__u64 addr;
1: -	__u64 size;
1: -	__u32 type;
1: +  __u64 addr;
1: +  __u64 size;
1: +  __u32 type;
1:  } __attribute__((packed));
1:  
1:  struct boot_params {
1: -	struct screen_info screen_info;
1: -	struct apm_bios_info apm_bios_info;
1: -	__u8 _pad2[4];
1: -	__u64 tboot_addr;
1: -	struct ist_info ist_info;
1: -	__u64 acpi_rsdp_addr;
1: -	__u8 _pad3[8];
1: -	__u8 hd0_info[16];
1: -	__u8 hd1_info[16];
1: -	struct sys_desc_table sys_desc_table;
1: -	struct olpc_ofw_header olpc_ofw_header;
1: -	__u32 ext_ramdisk_image;
1: -	__u32 ext_ramdisk_size;
1: -	__u32 ext_cmd_line_ptr;
1: -	__u8 _pad4[116];
1: -	struct edid_info edid_info;
1: -	struct efi_info efi_info;
1: -	__u32 alt_mem_k;
1: -	__u32 scratch;
1: -	__u8 e820_entries;
1: -	__u8 eddbuf_entries;
1: -	__u8 edd_mbr_sig_buf_entries;
1: -	__u8 kbd_status;
1: -	__u8 secure_boot;
1: -	__u8 _pad5[2];
1: -	__u8 sentinel;
1: -	__u8 _pad6[1];
1: -	struct setup_header hdr;
1: -	__u8 _pad7[36];
1: -	__u32 edd_mbr_sig_buffer[16];
1: -	struct boot_e820_entry e820_table[128];
1: -	__u8 _pad8[48];
1: -	struct edd_info eddbuf[6];
1: -	__u8 _pad9[276];
1: +  struct screen_info screen_info;
1: +  struct apm_bios_info apm_bios_info;
1: +  __u8 _pad2[4];
1: +  __u64 tboot_addr;
1: +  struct ist_info ist_info;
1: +  __u64 acpi_rsdp_addr;
1: +  __u8 _pad3[8];
1: +  __u8 hd0_info[16];
1: +  __u8 hd1_info[16];
1: +  struct sys_desc_table sys_desc_table;
1: +  struct olpc_ofw_header olpc_ofw_header;
1: +  __u32 ext_ramdisk_image;
1: +  __u32 ext_ramdisk_size;
1: +  __u32 ext_cmd_line_ptr;
1: +  __u8 _pad4[116];
1: +  struct edid_info edid_info;
1: +  struct efi_info efi_info;
1: +  __u32 alt_mem_k;
1: +  __u32 scratch;
1: +  __u8 e820_entries;
1: +  __u8 eddbuf_entries;
1: +  __u8 edd_mbr_sig_buf_entries;
1: +  __u8 kbd_status;
1: +  __u8 secure_boot;
1: +  __u8 _pad5[2];
1: +  __u8 sentinel;
1: +  __u8 _pad6[1];
1: +  struct setup_header hdr;
1: +  __u8 _pad7[36];
1: +  __u32 edd_mbr_sig_buffer[16];
1: +  struct boot_e820_entry e820_table[128];
1: +  __u8 _pad8[48];
1: +  struct edd_info eddbuf[6];
1: +  __u8 _pad9[276];
1:  } __attribute__((packed));
1:  
1:  enum x86_hardware_subarch {
1: -	X86_SUBARCH_PC = 0,
1: -	X86_SUBARCH_LGUEST = 1,
1: -	X86_SUBARCH_XEN = 2,
1: -	X86_SUBARCH_INTEL_MID = 3,
1: -	X86_SUBARCH_CE4100 = 4,
1: -	X86_NR_SUBARCHS = 5,
1: +  X86_SUBARCH_PC = 0,
1: +  X86_SUBARCH_LGUEST = 1,
1: +  X86_SUBARCH_XEN = 2,
1: +  X86_SUBARCH_INTEL_MID = 3,
1: +  X86_SUBARCH_CE4100 = 4,
1: +  X86_NR_SUBARCHS = 5,
1:  };
1:  
1:  struct range {
1: -	u64 start;
1: -	u64 end;
1: +  u64 start;
1: +  u64 end;
1:  };
1:  
1:  struct pt_regs {
1: -	long unsigned int r15;
1: -	long unsigned int r14;
1: -	long unsigned int r13;
1: -	long unsigned int r12;
1: -	long unsigned int bp;
1: -	long unsigned int bx;
1: -	long unsigned int r11;
1: -	long unsigned int r10;
1: -	long unsigned int r9;
1: -	long unsigned int r8;
1: -	long unsigned int ax;
1: -	long unsigned int cx;
1: -	long unsigned int dx;
1: -	long unsigned int si;
1: -	long unsigned int di;
1: -	long unsigned int orig_ax;
1: -	long unsigned int ip;
1: -	long unsigned int cs;
1: -	long unsigned int flags;
1: -	long unsigned int sp;
1: -	long unsigned int ss;
1: +  long unsigned int r15;
1: +  long unsigned int r14;
1: +  long unsigned int r13;
1: +  long unsigned int r12;
1: +  long unsigned int bp;
1: +  long unsigned int bx;
1: +  long unsigned int r11;
1: +  long unsigned int r10;
1: +  long unsigned int r9;
1: +  long unsigned int r8;
1: +  long unsigned int ax;
1: +  long unsigned int cx;
1: +  long unsigned int dx;
1: +  long unsigned int si;
1: +  long unsigned int di;
1: +  long unsigned int orig_ax;
1: +  long unsigned int ip;
1: +  long unsigned int cs;
1: +  long unsigned int flags;
1: +  long unsigned int sp;
1: +  long unsigned int ss;
1:  };
1:  
1:  struct math_emu_info {
1: -	long int ___orig_eip;
1: -	struct pt_regs *regs;
1: +  long int ___orig_eip;
1: +  struct pt_regs *regs;
1:  };
1:  
1:  typedef long unsigned int pteval_t;
1: @@ -1449,31 +1446,21 @@ typedef long unsigned int pgdval_t;
1:  
1:  typedef long unsigned int pgprotval_t;
1:  
1: -typedef struct {
1: -	pteval_t pte;
1: -} pte_t;
1: +typedef struct { pteval_t pte; } pte_t;
1:  
1:  struct pgprot {
1: -	pgprotval_t pgprot;
1: +  pgprotval_t pgprot;
1:  };
1:  
1:  typedef struct pgprot pgprot_t;
1:  
1: -typedef struct {
1: -	pgdval_t pgd;
1: -} pgd_t;
1: +typedef struct { pgdval_t pgd; } pgd_t;
1:  
1: -typedef struct {
1: -	pgd_t pgd;
1: -} p4d_t;
1: +typedef struct { pgd_t pgd; } p4d_t;
1:  
1: -typedef struct {
1: -	pudval_t pud;
1: -} pud_t;
1: +typedef struct { pudval_t pud; } pud_t;
1:  
1: -typedef struct {
1: -	pmdval_t pmd;
1: -} pmd_t;
1: +typedef struct { pmdval_t pmd; } pmd_t;
1:  
1:  typedef struct page *pgtable_t;
1:  
1: @@ -1484,140 +1471,140 @@ struct kmem_cache;
1:  struct dev_pagemap;
1:  
1:  struct page {
1: -	long unsigned int flags;
1: -	union {
1: -		struct {
1: -			struct list_head lru;
1: -			struct address_space *mapping;
1: -			long unsigned int index;
1: -			long unsigned int private;
1: -		};
1: -		struct {
1: -			dma_addr_t dma_addr;
1: -		};
1: -		struct {
1: -			union {
1: -				struct list_head slab_list;
1: -				struct {
1: -					struct page *next;
1: -					int pages;
1: -					int pobjects;
1: -				};
1: -			};
1: -			struct kmem_cache *slab_cache;
1: -			void *freelist;
1: -			union {
1: -				void *s_mem;
1: -				long unsigned int counters;
1: -				struct {
1: -					unsigned int inuse: 16;
1: -					unsigned int objects: 15;
1: -					unsigned int frozen: 1;
1: -				};
1: -			};
1: -		};
1: -		struct {
1: -			long unsigned int compound_head;
1: -			unsigned char compound_dtor;
1: -			unsigned char compound_order;
1: -			atomic_t compound_mapcount;
1: -			unsigned int compound_nr;
1: -		};
1: -		struct {
1: -			long unsigned int _compound_pad_1;
1: -			atomic_t hpage_pinned_refcount;
1: -			struct list_head deferred_list;
1: -		};
1: -		struct {
1: -			long unsigned int _pt_pad_1;
1: -			pgtable_t pmd_huge_pte;
1: -			long unsigned int _pt_pad_2;
1: -			union {
1: -				struct mm_struct *pt_mm;
1: -				atomic_t pt_frag_refcount;
1: -			};
1: -			spinlock_t *ptl;
1: -		};
1: -		struct {
1: -			struct dev_pagemap *pgmap;
1: -			void *zone_device_data;
1: -		};
1: -		struct callback_head callback_head;
1: -	};
1: -	union {
1: -		atomic_t _mapcount;
1: -		unsigned int page_type;
1: -		unsigned int active;
1: -		int units;
1: -	};
1: -	atomic_t _refcount;
1: -	long unsigned int memcg_data;
1: +  long unsigned int flags;
1: +  union {
1: +    struct {
1: +      struct list_head lru;
1: +      struct address_space *mapping;
1: +      long unsigned int index;
1: +      long unsigned int private;
1: +    };
1: +    struct {
1: +      dma_addr_t dma_addr;
1: +    };
1: +    struct {
1: +      union {
1: +        struct list_head slab_list;
1: +        struct {
1: +          struct page *next;
1: +          int pages;
1: +          int pobjects;
1: +        };
1: +      };
1: +      struct kmem_cache *slab_cache;
1: +      void *freelist;
1: +      union {
1: +        void *s_mem;
1: +        long unsigned int counters;
1: +        struct {
1: +          unsigned int inuse : 16;
1: +          unsigned int objects : 15;
1: +          unsigned int frozen : 1;
1: +        };
1: +      };
1: +    };
1: +    struct {
1: +      long unsigned int compound_head;
1: +      unsigned char compound_dtor;
1: +      unsigned char compound_order;
1: +      atomic_t compound_mapcount;
1: +      unsigned int compound_nr;
1: +    };
1: +    struct {
1: +      long unsigned int _compound_pad_1;
1: +      atomic_t hpage_pinned_refcount;
1: +      struct list_head deferred_list;
1: +    };
1: +    struct {
1: +      long unsigned int _pt_pad_1;
1: +      pgtable_t pmd_huge_pte;
1: +      long unsigned int _pt_pad_2;
1: +      union {
1: +        struct mm_struct *pt_mm;
1: +        atomic_t pt_frag_refcount;
1: +      };
1: +      spinlock_t *ptl;
1: +    };
1: +    struct {
1: +      struct dev_pagemap *pgmap;
1: +      void *zone_device_data;
1: +    };
1: +    struct callback_head callback_head;
1: +  };
1: +  union {
1: +    atomic_t _mapcount;
1: +    unsigned int page_type;
1: +    unsigned int active;
1: +    int units;
1: +  };
1: +  atomic_t _refcount;
1: +  long unsigned int memcg_data;
1:  };
1:  
1:  struct idt_bits {
1: -	u16 ist: 3;
1: -	u16 zero: 5;
1: -	u16 type: 5;
1: -	u16 dpl: 2;
1: -	u16 p: 1;
1: +  u16 ist : 3;
1: +  u16 zero : 5;
1: +  u16 type : 5;
1: +  u16 dpl : 2;
1: +  u16 p : 1;
1:  };
1:  
1:  struct gate_struct {
1: -	u16 offset_low;
1: -	u16 segment;
1: -	struct idt_bits bits;
1: -	u16 offset_middle;
1: -	u32 offset_high;
1: -	u32 reserved;
1: +  u16 offset_low;
1: +  u16 segment;
1: +  struct idt_bits bits;
1: +  u16 offset_middle;
1: +  u32 offset_high;
1: +  u32 reserved;
1:  };
1:  
1:  typedef struct gate_struct gate_desc;
1:  
1:  struct desc_ptr {
1: -	short unsigned int size;
1: -	long unsigned int address;
1: +  short unsigned int size;
1: +  long unsigned int address;
1:  } __attribute__((packed));
1:  
1:  enum {
1: -	UNAME26 = 131072,
1: -	ADDR_NO_RANDOMIZE = 262144,
1: -	FDPIC_FUNCPTRS = 524288,
1: -	MMAP_PAGE_ZERO = 1048576,
1: -	ADDR_COMPAT_LAYOUT = 2097152,
1: -	READ_IMPLIES_EXEC = 4194304,
1: -	ADDR_LIMIT_32BIT = 8388608,
1: -	SHORT_INODE = 16777216,
1: -	WHOLE_SECONDS = 33554432,
1: -	STICKY_TIMEOUTS = 67108864,
1: -	ADDR_LIMIT_3GB = 134217728,
1: +  UNAME26 = 131072,
1: +  ADDR_NO_RANDOMIZE = 262144,
1: +  FDPIC_FUNCPTRS = 524288,
1: +  MMAP_PAGE_ZERO = 1048576,
1: +  ADDR_COMPAT_LAYOUT = 2097152,
1: +  READ_IMPLIES_EXEC = 4194304,
1: +  ADDR_LIMIT_32BIT = 8388608,
1: +  SHORT_INODE = 16777216,
1: +  WHOLE_SECONDS = 33554432,
1: +  STICKY_TIMEOUTS = 67108864,
1: +  ADDR_LIMIT_3GB = 134217728,
1:  };
1:  
1:  enum tlb_infos {
1: -	ENTRIES = 0,
1: -	NR_INFO = 1,
1: +  ENTRIES = 0,
1: +  NR_INFO = 1,
1:  };
1:  
1:  enum pcpu_fc {
1: -	PCPU_FC_AUTO = 0,
1: -	PCPU_FC_EMBED = 1,
1: -	PCPU_FC_PAGE = 2,
1: -	PCPU_FC_NR = 3,
1: +  PCPU_FC_AUTO = 0,
1: +  PCPU_FC_EMBED = 1,
1: +  PCPU_FC_PAGE = 2,
1: +  PCPU_FC_NR = 3,
1:  };
1:  
1:  struct vm_struct {
1: -	struct vm_struct *next;
1: -	void *addr;
1: -	long unsigned int size;
1: -	long unsigned int flags;
1: -	struct page **pages;
1: -	unsigned int nr_pages;
1: -	phys_addr_t phys_addr;
1: -	const void *caller;
1: +  struct vm_struct *next;
1: +  void *addr;
1: +  long unsigned int size;
1: +  long unsigned int flags;
1: +  struct page **pages;
1: +  unsigned int nr_pages;
1: +  phys_addr_t phys_addr;
1: +  const void *caller;
1:  };
1:  
1:  struct wait_queue_head {
1: -	spinlock_t lock;
1: -	struct list_head head;
1: +  spinlock_t lock;
1: +  struct list_head head;
1:  };
1:  
1:  typedef struct wait_queue_head wait_queue_head_t;
1: @@ -1627,58 +1614,58 @@ struct ww_acquire_ctx;
1:  struct ww_class;
1:  
1:  struct ww_mutex {
1: -	struct mutex base;
1: -	struct ww_acquire_ctx *ctx;
1: -	struct ww_class *ww_class;
1: +  struct mutex base;
1: +  struct ww_acquire_ctx *ctx;
1: +  struct ww_class *ww_class;
1:  };
1:  
1:  struct ww_acquire_ctx {
1: -	struct task_struct *task;
1: -	long unsigned int stamp;
1: -	unsigned int acquired;
1: -	short unsigned int wounded;
1: -	short unsigned int is_wait_die;
1: -	unsigned int done_acquire;
1: -	struct ww_class *ww_class;
1: -	struct ww_mutex *contending_lock;
1: +  struct task_struct *task;
1: +  long unsigned int stamp;
1: +  unsigned int acquired;
1: +  short unsigned int wounded;
1: +  short unsigned int is_wait_die;
1: +  unsigned int done_acquire;
1: +  struct ww_class *ww_class;
1: +  struct ww_mutex *contending_lock;
1:  };
1:  
1:  struct ww_class {
1: -	atomic_long_t stamp;
1: -	struct lock_class_key acquire_key;
1: -	struct lock_class_key mutex_key;
1: -	const char *acquire_name;
1: -	const char *mutex_name;
1: -	unsigned int is_wait_die;
1: +  atomic_long_t stamp;
1: +  struct lock_class_key acquire_key;
1: +  struct lock_class_key mutex_key;
1: +  const char *acquire_name;
1: +  const char *mutex_name;
1: +  unsigned int is_wait_die;
1:  };
1:  
1:  struct mutex_waiter {
1: -	struct list_head list;
1: -	struct task_struct *task;
1: -	struct ww_acquire_ctx *ww_ctx;
1: -	void *magic;
1: +  struct list_head list;
1: +  struct task_struct *task;
1: +  struct ww_acquire_ctx *ww_ctx;
1: +  void *magic;
1:  };
1:  
1:  struct seqcount_raw_spinlock {
1: -	seqcount_t seqcount;
1: +  seqcount_t seqcount;
1:  };
1:  
1:  typedef struct seqcount_raw_spinlock seqcount_raw_spinlock_t;
1:  
1:  typedef struct {
1: -	seqcount_spinlock_t seqcount;
1: -	spinlock_t lock;
1: +  seqcount_spinlock_t seqcount;
1: +  spinlock_t lock;
1:  } seqlock_t;
1:  
1:  enum node_states {
1: -	N_POSSIBLE = 0,
1: -	N_ONLINE = 1,
1: -	N_NORMAL_MEMORY = 2,
1: -	N_HIGH_MEMORY = 2,
1: -	N_MEMORY = 3,
1: -	N_CPU = 4,
1: -	N_GENERIC_INITIATOR = 5,
1: -	NR_NODE_STATES = 6,
1: +  N_POSSIBLE = 0,
1: +  N_ONLINE = 1,
1: +  N_NORMAL_MEMORY = 2,
1: +  N_HIGH_MEMORY = 2,
1: +  N_MEMORY = 3,
1: +  N_CPU = 4,
1: +  N_GENERIC_INITIATOR = 5,
1: +  NR_NODE_STATES = 6,
1:  };
1:  
1:  struct vm_userfaultfd_ctx {};
1: @@ -1688,58 +1675,58 @@ struct anon_vma;
1:  struct vm_operations_struct;
1:  
1:  struct vm_area_struct {
1: -	long unsigned int vm_start;
1: -	long unsigned int vm_end;
1: -	struct vm_area_struct *vm_next;
1: -	struct vm_area_struct *vm_prev;
1: -	struct rb_node vm_rb;
1: -	long unsigned int rb_subtree_gap;
1: -	struct mm_struct *vm_mm;
1: -	pgprot_t vm_page_prot;
1: -	long unsigned int vm_flags;
1: -	struct {
1: -		struct rb_node rb;
1: -		long unsigned int rb_subtree_last;
1: -	} shared;
1: -	struct list_head anon_vma_chain;
1: -	struct anon_vma *anon_vma;
1: -	const struct vm_operations_struct *vm_ops;
1: -	long unsigned int vm_pgoff;
1: -	struct file *vm_file;
1: -	void *vm_private_data;
1: -	atomic_long_t swap_readahead_info;
1: -	struct mempolicy *vm_policy;
1: -	struct vm_userfaultfd_ctx vm_userfaultfd_ctx;
1: -};
1: -
1: -enum {
1: -	MM_FILEPAGES = 0,
1: -	MM_ANONPAGES = 1,
1: -	MM_SWAPENTS = 2,
1: -	MM_SHMEMPAGES = 3,
1: -	NR_MM_COUNTERS = 4,
1: +  long unsigned int vm_start;
1: +  long unsigned int vm_end;
1: +  struct vm_area_struct *vm_next;
1: +  struct vm_area_struct *vm_prev;
1: +  struct rb_node vm_rb;
1: +  long unsigned int rb_subtree_gap;
1: +  struct mm_struct *vm_mm;
1: +  pgprot_t vm_page_prot;
1: +  long unsigned int vm_flags;
1: +  struct {
1: +    struct rb_node rb;
1: +    long unsigned int rb_subtree_last;
1: +  } shared;
1: +  struct list_head anon_vma_chain;
1: +  struct anon_vma *anon_vma;
1: +  const struct vm_operations_struct *vm_ops;
1: +  long unsigned int vm_pgoff;
1: +  struct file *vm_file;
1: +  void *vm_private_data;
1: +  atomic_long_t swap_readahead_info;
1: +  struct mempolicy *vm_policy;
1: +  struct vm_userfaultfd_ctx vm_userfaultfd_ctx;
1: +};
1: +
1: +enum {
1: +  MM_FILEPAGES = 0,
1: +  MM_ANONPAGES = 1,
1: +  MM_SWAPENTS = 2,
1: +  MM_SHMEMPAGES = 3,
1: +  NR_MM_COUNTERS = 4,
1:  };
1:  
1:  struct mm_rss_stat {
1: -	atomic_long_t count[4];
1: +  atomic_long_t count[4];
1:  };
1:  
1:  struct rw_semaphore {
1: -	atomic_long_t count;
1: -	atomic_long_t owner;
1: -	struct optimistic_spin_queue osq;
1: -	raw_spinlock_t wait_lock;
1: -	struct list_head wait_list;
1: +  atomic_long_t count;
1: +  atomic_long_t owner;
1: +  struct optimistic_spin_queue osq;
1: +  raw_spinlock_t wait_lock;
1: +  struct list_head wait_list;
1:  };
1:  
1:  struct swait_queue_head {
1: -	raw_spinlock_t lock;
1: -	struct list_head task_list;
1: +  raw_spinlock_t lock;
1: +  struct list_head task_list;
1:  };
1:  
1:  struct completion {
1: -	unsigned int done;
1: -	struct swait_queue_head wait;
1: +  unsigned int done;
1: +  struct swait_queue_head wait;
1:  };
1:  
1:  struct ldt_struct;
1: @@ -1747,21 +1734,21 @@ struct ldt_struct;
1:  struct vdso_image;
1:  
1:  typedef struct {
1: -	u64 ctx_id;
1: -	atomic64_t tlb_gen;
1: -	struct rw_semaphore ldt_usr_sem;
1: -	struct ldt_struct *ldt;
1: -	short unsigned int ia32_compat;
1: -	struct mutex lock;
1: -	void *vdso;
1: -	const struct vdso_image *vdso_image;
1: -	atomic_t perf_rdpmc_allowed;
1: +  u64 ctx_id;
1: +  atomic64_t tlb_gen;
1: +  struct rw_semaphore ldt_usr_sem;
1: +  struct ldt_struct *ldt;
1: +  short unsigned int ia32_compat;
1: +  struct mutex lock;
1: +  void *vdso;
1: +  const struct vdso_image *vdso_image;
1: +  atomic_t perf_rdpmc_allowed;
1:  } mm_context_t;
1:  
1:  struct xol_area;
1:  
1:  struct uprobes_state {
1: -	struct xol_area *xol_area;
1: +  struct xol_area *xol_area;
1:  };
1:  
1:  struct work_struct;
1: @@ -1769,9 +1756,9 @@ struct work_struct;
1:  typedef void (*work_func_t)(struct work_struct *);
1:  
1:  struct work_struct {
1: -	atomic_long_t data;
1: -	struct list_head entry;
1: -	work_func_t func;
1: +  atomic_long_t data;
1: +  struct list_head entry;
1: +  work_func_t func;
1:  };
1:  
1:  struct linux_binfmt;
1: @@ -1785,84 +1772,86 @@ struct user_namespace;
1:  struct mmu_notifier_subscriptions;
1:  
1:  struct mm_struct {
1: -	struct {
1: -		struct vm_area_struct *mmap;
1: -		struct rb_root mm_rb;
1: -		u64 vmacache_seqnum;
1: -		long unsigned int (*get_unmapped_area)(struct file *, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: -		long unsigned int mmap_base;
1: -		long unsigned int mmap_legacy_base;
1: -		long unsigned int mmap_compat_base;
1: -		long unsigned int mmap_compat_legacy_base;
1: -		long unsigned int task_size;
1: -		long unsigned int highest_vm_end;
1: -		pgd_t *pgd;
1: -		atomic_t membarrier_state;
1: -		atomic_t mm_users;
1: -		atomic_t mm_count;
1: -		atomic_t has_pinned;
1: -		atomic_long_t pgtables_bytes;
1: -		int map_count;
1: -		spinlock_t page_table_lock;
1: -		struct rw_semaphore mmap_lock;
1: -		struct list_head mmlist;
1: -		long unsigned int hiwater_rss;
1: -		long unsigned int hiwater_vm;
1: -		long unsigned int total_vm;
1: -		long unsigned int locked_vm;
1: -		atomic64_t pinned_vm;
1: -		long unsigned int data_vm;
1: -		long unsigned int exec_vm;
1: -		long unsigned int stack_vm;
1: -		long unsigned int def_flags;
1: -		spinlock_t arg_lock;
1: -		long unsigned int start_code;
1: -		long unsigned int end_code;
1: -		long unsigned int start_data;
1: -		long unsigned int end_data;
1: -		long unsigned int start_brk;
1: -		long unsigned int brk;
1: -		long unsigned int start_stack;
1: -		long unsigned int arg_start;
1: -		long unsigned int arg_end;
1: -		long unsigned int env_start;
1: -		long unsigned int env_end;
1: -		long unsigned int saved_auxv[46];
1: -		struct mm_rss_stat rss_stat;
1: -		struct linux_binfmt *binfmt;
1: -		mm_context_t context;
1: -		long unsigned int flags;
1: -		struct core_state *core_state;
1: -		spinlock_t ioctx_lock;
1: -		struct kioctx_table *ioctx_table;
1: -		struct task_struct *owner;
1: -		struct user_namespace *user_ns;
1: -		struct file *exe_file;
1: -		struct mmu_notifier_subscriptions *notifier_subscriptions;
1: -		long unsigned int numa_next_scan;
1: -		long unsigned int numa_scan_offset;
1: -		int numa_scan_seq;
1: -		atomic_t tlb_flush_pending;
1: -		bool tlb_flush_batched;
1: -		struct uprobes_state uprobes_state;
1: -		atomic_long_t hugetlb_usage;
1: -		struct work_struct async_put_work;
1: -		u32 pasid;
1: -	};
1: -	long unsigned int cpu_bitmap[0];
1: +  struct {
1: +    struct vm_area_struct *mmap;
1: +    struct rb_root mm_rb;
1: +    u64 vmacache_seqnum;
1: +    long unsigned int (*get_unmapped_area)(struct file *, long unsigned int,
1: +                                           long unsigned int, long unsigned int,
1: +                                           long unsigned int);
1: +    long unsigned int mmap_base;
1: +    long unsigned int mmap_legacy_base;
1: +    long unsigned int mmap_compat_base;
1: +    long unsigned int mmap_compat_legacy_base;
1: +    long unsigned int task_size;
1: +    long unsigned int highest_vm_end;
1: +    pgd_t *pgd;
1: +    atomic_t membarrier_state;
1: +    atomic_t mm_users;
1: +    atomic_t mm_count;
1: +    atomic_t has_pinned;
1: +    atomic_long_t pgtables_bytes;
1: +    int map_count;
1: +    spinlock_t page_table_lock;
1: +    struct rw_semaphore mmap_lock;
1: +    struct list_head mmlist;
1: +    long unsigned int hiwater_rss;
1: +    long unsigned int hiwater_vm;
1: +    long unsigned int total_vm;
1: +    long unsigned int locked_vm;
1: +    atomic64_t pinned_vm;
1: +    long unsigned int data_vm;
1: +    long unsigned int exec_vm;
1: +    long unsigned int stack_vm;
1: +    long unsigned int def_flags;
1: +    spinlock_t arg_lock;
1: +    long unsigned int start_code;
1: +    long unsigned int end_code;
1: +    long unsigned int start_data;
1: +    long unsigned int end_data;
1: +    long unsigned int start_brk;
1: +    long unsigned int brk;
1: +    long unsigned int start_stack;
1: +    long unsigned int arg_start;
1: +    long unsigned int arg_end;
1: +    long unsigned int env_start;
1: +    long unsigned int env_end;
1: +    long unsigned int saved_auxv[46];
1: +    struct mm_rss_stat rss_stat;
1: +    struct linux_binfmt *binfmt;
1: +    mm_context_t context;
1: +    long unsigned int flags;
1: +    struct core_state *core_state;
1: +    spinlock_t ioctx_lock;
1: +    struct kioctx_table *ioctx_table;
1: +    struct task_struct *owner;
1: +    struct user_namespace *user_ns;
1: +    struct file *exe_file;
1: +    struct mmu_notifier_subscriptions *notifier_subscriptions;
1: +    long unsigned int numa_next_scan;
1: +    long unsigned int numa_scan_offset;
1: +    int numa_scan_seq;
1: +    atomic_t tlb_flush_pending;
1: +    bool tlb_flush_batched;
1: +    struct uprobes_state uprobes_state;
1: +    atomic_long_t hugetlb_usage;
1: +    struct work_struct async_put_work;
1: +    u32 pasid;
1: +  };
1: +  long unsigned int cpu_bitmap[0];
1:  };
1:  
1:  struct arch_uprobe_task {
1: -	long unsigned int saved_scratch_register;
1: -	unsigned int saved_trap_nr;
1: -	unsigned int saved_tf;
1: +  long unsigned int saved_scratch_register;
1: +  unsigned int saved_trap_nr;
1: +  unsigned int saved_tf;
1:  };
1:  
1:  enum uprobe_task_state {
1: -	UTASK_RUNNING = 0,
1: -	UTASK_SSTEP = 1,
1: -	UTASK_SSTEP_ACK = 2,
1: -	UTASK_SSTEP_TRAPPED = 3,
1: +  UTASK_RUNNING = 0,
1: +  UTASK_SSTEP = 1,
1: +  UTASK_SSTEP_ACK = 2,
1: +  UTASK_SSTEP_TRAPPED = 3,
1:  };
1:  
1:  struct uprobe;
1: @@ -1870,53 +1859,53 @@ struct uprobe;
1:  struct return_instance;
1:  
1:  struct uprobe_task {
1: -	enum uprobe_task_state state;
1: -	union {
1: -		struct {
1: -			struct arch_uprobe_task autask;
1: -			long unsigned int vaddr;
1: -		};
1: -		struct {
1: -			struct callback_head dup_xol_work;
1: -			long unsigned int dup_xol_addr;
1: -		};
1: -	};
1: -	struct uprobe *active_uprobe;
1: -	long unsigned int xol_vaddr;
1: -	struct return_instance *return_instances;
1: -	unsigned int depth;
1: +  enum uprobe_task_state state;
1: +  union {
1: +    struct {
1: +      struct arch_uprobe_task autask;
1: +      long unsigned int vaddr;
1: +    };
1: +    struct {
1: +      struct callback_head dup_xol_work;
1: +      long unsigned int dup_xol_addr;
1: +    };
1: +  };
1: +  struct uprobe *active_uprobe;
1: +  long unsigned int xol_vaddr;
1: +  struct return_instance *return_instances;
1: +  unsigned int depth;
1:  };
1:  
1:  struct return_instance {
1: -	struct uprobe *uprobe;
1: -	long unsigned int func;
1: -	long unsigned int stack;
1: -	long unsigned int orig_ret_vaddr;
1: -	bool chained;
1: -	struct return_instance *next;
1: +  struct uprobe *uprobe;
1: +  long unsigned int func;
1: +  long unsigned int stack;
1: +  long unsigned int orig_ret_vaddr;
1: +  bool chained;
1: +  struct return_instance *next;
1:  };
1:  
1:  struct vdso_image {
1: -	void *data;
1: -	long unsigned int size;
1: -	long unsigned int alt;
1: -	long unsigned int alt_len;
1: -	long int sym_vvar_start;
1: -	long int sym_vvar_page;
1: -	long int sym_pvclock_page;
1: -	long int sym_hvclock_page;
1: -	long int sym_timens_page;
1: -	long int sym_VDSO32_NOTE_MASK;
1: -	long int sym___kernel_sigreturn;
1: -	long int sym___kernel_rt_sigreturn;
1: -	long int sym___kernel_vsyscall;
1: -	long int sym_int80_landing_pad;
1: +  void *data;
1: +  long unsigned int size;
1: +  long unsigned int alt;
1: +  long unsigned int alt_len;
1: +  long int sym_vvar_start;
1: +  long int sym_vvar_page;
1: +  long int sym_pvclock_page;
1: +  long int sym_hvclock_page;
1: +  long int sym_timens_page;
1: +  long int sym_VDSO32_NOTE_MASK;
1: +  long int sym___kernel_sigreturn;
1: +  long int sym___kernel_rt_sigreturn;
1: +  long int sym___kernel_vsyscall;
1: +  long int sym_int80_landing_pad;
1:  };
1:  
1:  struct xarray {
1: -	spinlock_t xa_lock;
1: -	gfp_t xa_flags;
1: -	void *xa_head;
1: +  spinlock_t xa_lock;
1: +  gfp_t xa_flags;
1: +  void *xa_head;
1:  };
1:  
1:  typedef u32 errseq_t;
1: @@ -1924,408 +1913,407 @@ typedef u32 errseq_t;
1:  struct address_space_operations;
1:  
1:  struct address_space {
1: -	struct inode *host;
1: -	struct xarray i_pages;
1: -	gfp_t gfp_mask;
1: -	atomic_t i_mmap_writable;
1: -	struct rb_root_cached i_mmap;
1: -	struct rw_semaphore i_mmap_rwsem;
1: -	long unsigned int nrpages;
1: -	long unsigned int nrexceptional;
1: -	long unsigned int writeback_index;
1: -	const struct address_space_operations *a_ops;
1: -	long unsigned int flags;
1: -	errseq_t wb_err;
1: -	spinlock_t private_lock;
1: -	struct list_head private_list;
1: -	void *private_data;
1: +  struct inode *host;
1: +  struct xarray i_pages;
1: +  gfp_t gfp_mask;
1: +  atomic_t i_mmap_writable;
1: +  struct rb_root_cached i_mmap;
1: +  struct rw_semaphore i_mmap_rwsem;
1: +  long unsigned int nrpages;
1: +  long unsigned int nrexceptional;
1: +  long unsigned int writeback_index;
1: +  const struct address_space_operations *a_ops;
1: +  long unsigned int flags;
1: +  errseq_t wb_err;
1: +  spinlock_t private_lock;
1: +  struct list_head private_list;
1: +  void *private_data;
1:  };
1:  
1:  struct vmem_altmap {
1: -	const long unsigned int base_pfn;
1: -	const long unsigned int end_pfn;
1: -	const long unsigned int reserve;
1: -	long unsigned int free;
1: -	long unsigned int align;
1: -	long unsigned int alloc;
1: +  const long unsigned int base_pfn;
1: +  const long unsigned int end_pfn;
1: +  const long unsigned int reserve;
1: +  long unsigned int free;
1: +  long unsigned int align;
1: +  long unsigned int alloc;
1:  };
1:  
1:  struct percpu_ref_data;
1:  
1:  struct percpu_ref {
1: -	long unsigned int percpu_count_ptr;
1: -	struct percpu_ref_data *data;
1: +  long unsigned int percpu_count_ptr;
1: +  struct percpu_ref_data *data;
1:  };
1:  
1:  enum memory_type {
1: -	MEMORY_DEVICE_PRIVATE = 1,
1: -	MEMORY_DEVICE_FS_DAX = 2,
1: -	MEMORY_DEVICE_GENERIC = 3,
1: -	MEMORY_DEVICE_PCI_P2PDMA = 4,
1: +  MEMORY_DEVICE_PRIVATE = 1,
1: +  MEMORY_DEVICE_FS_DAX = 2,
1: +  MEMORY_DEVICE_GENERIC = 3,
1: +  MEMORY_DEVICE_PCI_P2PDMA = 4,
1:  };
1:  
1:  struct dev_pagemap_ops;
1:  
1:  struct dev_pagemap {
1: -	struct vmem_altmap altmap;
1: -	struct percpu_ref *ref;
1: -	struct percpu_ref internal_ref;
1: -	struct completion done;
1: -	enum memory_type type;
1: -	unsigned int flags;
1: -	const struct dev_pagemap_ops *ops;
1: -	void *owner;
1: -	int nr_range;
1: -	union {
1: -		struct range range;
1: -		struct range ranges[0];
1: -	};
1: +  struct vmem_altmap altmap;
1: +  struct percpu_ref *ref;
1: +  struct percpu_ref internal_ref;
1: +  struct completion done;
1: +  enum memory_type type;
1: +  unsigned int flags;
1: +  const struct dev_pagemap_ops *ops;
1: +  void *owner;
1: +  int nr_range;
1: +  union {
1: +    struct range range;
1: +    struct range ranges[0];
1: +  };
1:  };
1:  
1:  struct vfsmount;
1:  
1:  struct path {
1: -	struct vfsmount *mnt;
1: -	struct dentry *dentry;
1: +  struct vfsmount *mnt;
1: +  struct dentry *dentry;
1:  };
1:  
1:  enum rw_hint {
1: -	WRITE_LIFE_NOT_SET = 0,
1: -	WRITE_LIFE_NONE = 1,
1: -	WRITE_LIFE_SHORT = 2,
1: -	WRITE_LIFE_MEDIUM = 3,
1: -	WRITE_LIFE_LONG = 4,
1: -	WRITE_LIFE_EXTREME = 5,
1: +  WRITE_LIFE_NOT_SET = 0,
1: +  WRITE_LIFE_NONE = 1,
1: +  WRITE_LIFE_SHORT = 2,
1: +  WRITE_LIFE_MEDIUM = 3,
1: +  WRITE_LIFE_LONG = 4,
1: +  WRITE_LIFE_EXTREME = 5,
1:  };
1:  
1:  enum pid_type {
1: -	PIDTYPE_PID = 0,
1: -	PIDTYPE_TGID = 1,
1: -	PIDTYPE_PGID = 2,
1: -	PIDTYPE_SID = 3,
1: -	PIDTYPE_MAX = 4,
1: +  PIDTYPE_PID = 0,
1: +  PIDTYPE_TGID = 1,
1: +  PIDTYPE_PGID = 2,
1: +  PIDTYPE_SID = 3,
1: +  PIDTYPE_MAX = 4,
1:  };
1:  
1:  struct fown_struct {
1: -	rwlock_t lock;
1: -	struct pid *pid;
1: -	enum pid_type pid_type;
1: -	kuid_t uid;
1: -	kuid_t euid;
1: -	int signum;
1: +  rwlock_t lock;
1: +  struct pid *pid;
1: +  enum pid_type pid_type;
1: +  kuid_t uid;
1: +  kuid_t euid;
1: +  int signum;
1:  };
1:  
1:  struct file_ra_state {
1: -	long unsigned int start;
1: -	unsigned int size;
1: -	unsigned int async_size;
1: -	unsigned int ra_pages;
1: -	unsigned int mmap_miss;
1: -	loff_t prev_pos;
1: +  long unsigned int start;
1: +  unsigned int size;
1: +  unsigned int async_size;
1: +  unsigned int ra_pages;
1: +  unsigned int mmap_miss;
1: +  loff_t prev_pos;
1:  };
1:  
1:  struct file {
1: -	union {
1: -		struct llist_node fu_llist;
1: -		struct callback_head fu_rcuhead;
1: -	} f_u;
1: -	struct path f_path;
1: -	struct inode *f_inode;
1: -	const struct file_operations *f_op;
1: -	spinlock_t f_lock;
1: -	enum rw_hint f_write_hint;
1: -	atomic_long_t f_count;
1: -	unsigned int f_flags;
1: -	fmode_t f_mode;
1: -	struct mutex f_pos_lock;
1: -	loff_t f_pos;
1: -	struct fown_struct f_owner;
1: -	const struct cred *f_cred;
1: -	struct file_ra_state f_ra;
1: -	u64 f_version;
1: -	void *f_security;
1: -	void *private_data;
1: -	struct list_head f_ep_links;
1: -	struct list_head f_tfile_llink;
1: -	struct address_space *f_mapping;
1: -	errseq_t f_wb_err;
1: -	errseq_t f_sb_err;
1: +  union {
1: +    struct llist_node fu_llist;
1: +    struct callback_head fu_rcuhead;
1: +  } f_u;
1: +  struct path f_path;
1: +  struct inode *f_inode;
1: +  const struct file_operations *f_op;
1: +  spinlock_t f_lock;
1: +  enum rw_hint f_write_hint;
1: +  atomic_long_t f_count;
1: +  unsigned int f_flags;
1: +  fmode_t f_mode;
1: +  struct mutex f_pos_lock;
1: +  loff_t f_pos;
1: +  struct fown_struct f_owner;
1: +  const struct cred *f_cred;
1: +  struct file_ra_state f_ra;
1: +  u64 f_version;
1: +  void *f_security;
1: +  void *private_data;
1: +  struct list_head f_ep_links;
1: +  struct list_head f_tfile_llink;
1: +  struct address_space *f_mapping;
1: +  errseq_t f_wb_err;
1: +  errseq_t f_sb_err;
1:  };
1:  
1:  typedef unsigned int vm_fault_t;
1:  
1:  enum page_entry_size {
1: -	PE_SIZE_PTE = 0,
1: -	PE_SIZE_PMD = 1,
1: -	PE_SIZE_PUD = 2,
1: +  PE_SIZE_PTE = 0,
1: +  PE_SIZE_PMD = 1,
1: +  PE_SIZE_PUD = 2,
1:  };
1:  
1:  struct vm_fault;
1:  
1:  struct vm_operations_struct {
1: -	void (*open)(struct vm_area_struct *);
1: -	void (*close)(struct vm_area_struct *);
1: -	int (*split)(struct vm_area_struct *, long unsigned int);
1: -	int (*mremap)(struct vm_area_struct *);
1: -	vm_fault_t (*fault)(struct vm_fault *);
1: -	vm_fault_t (*huge_fault)(struct vm_fault *, enum page_entry_size);
1: -	void (*map_pages)(struct vm_fault *, long unsigned int, long unsigned int);
1: -	long unsigned int (*pagesize)(struct vm_area_struct *);
1: -	vm_fault_t (*page_mkwrite)(struct vm_fault *);
1: -	vm_fault_t (*pfn_mkwrite)(struct vm_fault *);
1: -	int (*access)(struct vm_area_struct *, long unsigned int, void *, int, int);
1: -	const char * (*name)(struct vm_area_struct *);
1: -	int (*set_policy)(struct vm_area_struct *, struct mempolicy *);
1: -	struct mempolicy * (*get_policy)(struct vm_area_struct *, long unsigned int);
1: -	struct page * (*find_special_page)(struct vm_area_struct *, long unsigned int);
1: +  void (*open)(struct vm_area_struct *);
1: +  void (*close)(struct vm_area_struct *);
1: +  int (*split)(struct vm_area_struct *, long unsigned int);
1: +  int (*mremap)(struct vm_area_struct *);
1: +  vm_fault_t (*fault)(struct vm_fault *);
1: +  vm_fault_t (*huge_fault)(struct vm_fault *, enum page_entry_size);
1: +  void (*map_pages)(struct vm_fault *, long unsigned int, long unsigned int);
1: +  long unsigned int (*pagesize)(struct vm_area_struct *);
1: +  vm_fault_t (*page_mkwrite)(struct vm_fault *);
1: +  vm_fault_t (*pfn_mkwrite)(struct vm_fault *);
1: +  int (*access)(struct vm_area_struct *, long unsigned int, void *, int, int);
1: +  const char *(*name)(struct vm_area_struct *);
1: +  int (*set_policy)(struct vm_area_struct *, struct mempolicy *);
1: +  struct mempolicy *(*get_policy)(struct vm_area_struct *, long unsigned int);
1: +  struct page *(*find_special_page)(struct vm_area_struct *, long unsigned int);
1:  };
1:  
1:  struct core_thread {
1: -	struct task_struct *task;
1: -	struct core_thread *next;
1: +  struct task_struct *task;
1: +  struct core_thread *next;
1:  };
1:  
1:  struct core_state {
1: -	atomic_t nr_threads;
1: -	struct core_thread dumper;
1: -	struct completion startup;
1: +  atomic_t nr_threads;
1: +  struct core_thread dumper;
1: +  struct completion startup;
1:  };
1:  
1:  struct vm_fault {
1: -	struct vm_area_struct *vma;
1: -	unsigned int flags;
1: -	gfp_t gfp_mask;
1: -	long unsigned int pgoff;
1: -	long unsigned int address;
1: -	pmd_t *pmd;
1: -	pud_t *pud;
1: -	pte_t orig_pte;
1: -	struct page *cow_page;
1: -	struct page *page;
1: -	pte_t *pte;
1: -	spinlock_t *ptl;
1: -	pgtable_t prealloc_pte;
1: +  struct vm_area_struct *vma;
1: +  unsigned int flags;
1: +  gfp_t gfp_mask;
1: +  long unsigned int pgoff;
1: +  long unsigned int address;
1: +  pmd_t *pmd;
1: +  pud_t *pud;
1: +  pte_t orig_pte;
1: +  struct page *cow_page;
1: +  struct page *page;
1: +  pte_t *pte;
1: +  spinlock_t *ptl;
1: +  pgtable_t prealloc_pte;
1:  };
1:  
1:  enum migratetype {
1: -	MIGRATE_UNMOVABLE = 0,
1: -	MIGRATE_MOVABLE = 1,
1: -	MIGRATE_RECLAIMABLE = 2,
1: -	MIGRATE_PCPTYPES = 3,
1: -	MIGRATE_HIGHATOMIC = 3,
1: -	MIGRATE_CMA = 4,
1: -	MIGRATE_ISOLATE = 5,
1: -	MIGRATE_TYPES = 6,
1: +  MIGRATE_UNMOVABLE = 0,
1: +  MIGRATE_MOVABLE = 1,
1: +  MIGRATE_RECLAIMABLE = 2,
1: +  MIGRATE_PCPTYPES = 3,
1: +  MIGRATE_HIGHATOMIC = 3,
1: +  MIGRATE_CMA = 4,
1: +  MIGRATE_ISOLATE = 5,
1: +  MIGRATE_TYPES = 6,
1:  };
1:  
1:  enum numa_stat_item {
1: -	NUMA_HIT = 0,
1: -	NUMA_MISS = 1,
1: -	NUMA_FOREIGN = 2,
1: -	NUMA_INTERLEAVE_HIT = 3,
1: -	NUMA_LOCAL = 4,
1: -	NUMA_OTHER = 5,
1: -	NR_VM_NUMA_STAT_ITEMS = 6,
1: +  NUMA_HIT = 0,
1: +  NUMA_MISS = 1,
1: +  NUMA_FOREIGN = 2,
1: +  NUMA_INTERLEAVE_HIT = 3,
1: +  NUMA_LOCAL = 4,
1: +  NUMA_OTHER = 5,
1: +  NR_VM_NUMA_STAT_ITEMS = 6,
1:  };
1:  
1:  enum zone_stat_item {
1: -	NR_FREE_PAGES = 0,
1: -	NR_ZONE_LRU_BASE = 1,
1: -	NR_ZONE_INACTIVE_ANON = 1,
1: -	NR_ZONE_ACTIVE_ANON = 2,
1: -	NR_ZONE_INACTIVE_FILE = 3,
1: -	NR_ZONE_ACTIVE_FILE = 4,
1: -	NR_ZONE_UNEVICTABLE = 5,
1: -	NR_ZONE_WRITE_PENDING = 6,
1: -	NR_MLOCK = 7,
1: -	NR_PAGETABLE = 8,
1: -	NR_BOUNCE = 9,
1: -	NR_FREE_CMA_PAGES = 10,
1: -	NR_VM_ZONE_STAT_ITEMS = 11,
1: +  NR_FREE_PAGES = 0,
1: +  NR_ZONE_LRU_BASE = 1,
1: +  NR_ZONE_INACTIVE_ANON = 1,
1: +  NR_ZONE_ACTIVE_ANON = 2,
1: +  NR_ZONE_INACTIVE_FILE = 3,
1: +  NR_ZONE_ACTIVE_FILE = 4,
1: +  NR_ZONE_UNEVICTABLE = 5,
1: +  NR_ZONE_WRITE_PENDING = 6,
1: +  NR_MLOCK = 7,
1: +  NR_PAGETABLE = 8,
1: +  NR_BOUNCE = 9,
1: +  NR_FREE_CMA_PAGES = 10,
1: +  NR_VM_ZONE_STAT_ITEMS = 11,
1:  };
1:  
1:  enum node_stat_item {
1: -	NR_LRU_BASE = 0,
1: -	NR_INACTIVE_ANON = 0,
1: -	NR_ACTIVE_ANON = 1,
1: -	NR_INACTIVE_FILE = 2,
1: -	NR_ACTIVE_FILE = 3,
1: -	NR_UNEVICTABLE = 4,
1: -	NR_SLAB_RECLAIMABLE_B = 5,
1: -	NR_SLAB_UNRECLAIMABLE_B = 6,
1: -	NR_ISOLATED_ANON = 7,
1: -	NR_ISOLATED_FILE = 8,
1: -	WORKINGSET_NODES = 9,
1: -	WORKINGSET_REFAULT_BASE = 10,
1: -	WORKINGSET_REFAULT_ANON = 10,
1: -	WORKINGSET_REFAULT_FILE = 11,
1: -	WORKINGSET_ACTIVATE_BASE = 12,
1: -	WORKINGSET_ACTIVATE_ANON = 12,
1: -	WORKINGSET_ACTIVATE_FILE = 13,
1: -	WORKINGSET_RESTORE_BASE = 14,
1: -	WORKINGSET_RESTORE_ANON = 14,
1: -	WORKINGSET_RESTORE_FILE = 15,
1: -	WORKINGSET_NODERECLAIM = 16,
1: -	NR_ANON_MAPPED = 17,
1: -	NR_FILE_MAPPED = 18,
1: -	NR_FILE_PAGES = 19,
1: -	NR_FILE_DIRTY = 20,
1: -	NR_WRITEBACK = 21,
1: -	NR_WRITEBACK_TEMP = 22,
1: -	NR_SHMEM = 23,
1: -	NR_SHMEM_THPS = 24,
1: -	NR_SHMEM_PMDMAPPED = 25,
1: -	NR_FILE_THPS = 26,
1: -	NR_FILE_PMDMAPPED = 27,
1: -	NR_ANON_THPS = 28,
1: -	NR_VMSCAN_WRITE = 29,
1: -	NR_VMSCAN_IMMEDIATE = 30,
1: -	NR_DIRTIED = 31,
1: -	NR_WRITTEN = 32,
1: -	NR_KERNEL_MISC_RECLAIMABLE = 33,
1: -	NR_FOLL_PIN_ACQUIRED = 34,
1: -	NR_FOLL_PIN_RELEASED = 35,
1: -	NR_KERNEL_STACK_KB = 36,
1: -	NR_VM_NODE_STAT_ITEMS = 37,
1: +  NR_LRU_BASE = 0,
1: +  NR_INACTIVE_ANON = 0,
1: +  NR_ACTIVE_ANON = 1,
1: +  NR_INACTIVE_FILE = 2,
1: +  NR_ACTIVE_FILE = 3,
1: +  NR_UNEVICTABLE = 4,
1: +  NR_SLAB_RECLAIMABLE_B = 5,
1: +  NR_SLAB_UNRECLAIMABLE_B = 6,
1: +  NR_ISOLATED_ANON = 7,
1: +  NR_ISOLATED_FILE = 8,
1: +  WORKINGSET_NODES = 9,
1: +  WORKINGSET_REFAULT_BASE = 10,
1: +  WORKINGSET_REFAULT_ANON = 10,
1: +  WORKINGSET_REFAULT_FILE = 11,
1: +  WORKINGSET_ACTIVATE_BASE = 12,
1: +  WORKINGSET_ACTIVATE_ANON = 12,
1: +  WORKINGSET_ACTIVATE_FILE = 13,
1: +  WORKINGSET_RESTORE_BASE = 14,
1: +  WORKINGSET_RESTORE_ANON = 14,
1: +  WORKINGSET_RESTORE_FILE = 15,
1: +  WORKINGSET_NODERECLAIM = 16,
1: +  NR_ANON_MAPPED = 17,
1: +  NR_FILE_MAPPED = 18,
1: +  NR_FILE_PAGES = 19,
1: +  NR_FILE_DIRTY = 20,
1: +  NR_WRITEBACK = 21,
1: +  NR_WRITEBACK_TEMP = 22,
1: +  NR_SHMEM = 23,
1: +  NR_SHMEM_THPS = 24,
1: +  NR_SHMEM_PMDMAPPED = 25,
1: +  NR_FILE_THPS = 26,
1: +  NR_FILE_PMDMAPPED = 27,
1: +  NR_ANON_THPS = 28,
1: +  NR_VMSCAN_WRITE = 29,
1: +  NR_VMSCAN_IMMEDIATE = 30,
1: +  NR_DIRTIED = 31,
1: +  NR_WRITTEN = 32,
1: +  NR_KERNEL_MISC_RECLAIMABLE = 33,
1: +  NR_FOLL_PIN_ACQUIRED = 34,
1: +  NR_FOLL_PIN_RELEASED = 35,
1: +  NR_KERNEL_STACK_KB = 36,
1: +  NR_VM_NODE_STAT_ITEMS = 37,
1:  };
1:  
1:  enum lru_list {
1: -	LRU_INACTIVE_ANON = 0,
1: -	LRU_ACTIVE_ANON = 1,
1: -	LRU_INACTIVE_FILE = 2,
1: -	LRU_ACTIVE_FILE = 3,
1: -	LRU_UNEVICTABLE = 4,
1: -	NR_LRU_LISTS = 5,
1: +  LRU_INACTIVE_ANON = 0,
1: +  LRU_ACTIVE_ANON = 1,
1: +  LRU_INACTIVE_FILE = 2,
1: +  LRU_ACTIVE_FILE = 3,
1: +  LRU_UNEVICTABLE = 4,
1: +  NR_LRU_LISTS = 5,
1:  };
1:  
1:  typedef unsigned int isolate_mode_t;
1:  
1:  enum zone_watermarks {
1: -	WMARK_MIN = 0,
1: -	WMARK_LOW = 1,
1: -	WMARK_HIGH = 2,
1: -	NR_WMARK = 3,
1: +  WMARK_MIN = 0,
1: +  WMARK_LOW = 1,
1: +  WMARK_HIGH = 2,
1: +  NR_WMARK = 3,
1:  };
1:  
1:  enum {
1: -	ZONELIST_FALLBACK = 0,
1: -	ZONELIST_NOFALLBACK = 1,
1: -	MAX_ZONELISTS = 2,
1: +  ZONELIST_FALLBACK = 0,
1: +  ZONELIST_NOFALLBACK = 1,
1: +  MAX_ZONELISTS = 2,
1:  };
1:  
1:  typedef void percpu_ref_func_t(struct percpu_ref *);
1:  
1:  struct percpu_ref_data {
1: -	atomic_long_t count;
1: -	percpu_ref_func_t *release;
1: -	percpu_ref_func_t *confirm_switch;
1: -	bool force_atomic: 1;
1: -	bool allow_reinit: 1;
1: -	struct callback_head rcu;
1: -	struct percpu_ref *ref;
1: +  atomic_long_t count;
1: +  percpu_ref_func_t *release;
1: +  percpu_ref_func_t *confirm_switch;
1: +  bool force_atomic : 1;
1: +  bool allow_reinit : 1;
1: +  struct callback_head rcu;
1: +  struct percpu_ref *ref;
1:  };
1:  
1:  struct shrink_control {
1: -	gfp_t gfp_mask;
1: -	int nid;
1: -	long unsigned int nr_to_scan;
1: -	long unsigned int nr_scanned;
1: -	struct mem_cgroup *memcg;
1: +  gfp_t gfp_mask;
1: +  int nid;
1: +  long unsigned int nr_to_scan;
1: +  long unsigned int nr_scanned;
1: +  struct mem_cgroup *memcg;
1:  };
1:  
1:  struct shrinker {
1: -	long unsigned int (*count_objects)(struct shrinker *, struct shrink_control *);
1: -	long unsigned int (*scan_objects)(struct shrinker *, struct shrink_control *);
1: -	long int batch;
1: -	int seeks;
1: -	unsigned int flags;
1: -	struct list_head list;
1: -	int id;
1: -	atomic_long_t *nr_deferred;
1: +  long unsigned int (*count_objects)(struct shrinker *,
1: +                                     struct shrink_control *);
1: +  long unsigned int (*scan_objects)(struct shrinker *, struct shrink_control *);
1: +  long int batch;
1: +  int seeks;
1: +  unsigned int flags;
1: +  struct list_head list;
1: +  int id;
1: +  atomic_long_t *nr_deferred;
1:  };
1:  
1:  struct rlimit {
1: -	__kernel_ulong_t rlim_cur;
1: -	__kernel_ulong_t rlim_max;
1: +  __kernel_ulong_t rlim_cur;
1: +  __kernel_ulong_t rlim_max;
1:  };
1:  
1:  struct dev_pagemap_ops {
1: -	void (*page_free)(struct page *);
1: -	void (*kill)(struct dev_pagemap *);
1: -	void (*cleanup)(struct dev_pagemap *);
1: -	vm_fault_t (*migrate_to_ram)(struct vm_fault *);
1: +  void (*page_free)(struct page *);
1: +  void (*kill)(struct dev_pagemap *);
1: +  void (*cleanup)(struct dev_pagemap *);
1: +  vm_fault_t (*migrate_to_ram)(struct vm_fault *);
1:  };
1:  
1:  struct pid_namespace;
1:  
1:  struct upid {
1: -	int nr;
1: -	struct pid_namespace *ns;
1: +  int nr;
1: +  struct pid_namespace *ns;
1:  };
1:  
1:  struct pid {
1: -	refcount_t count;
1: -	unsigned int level;
1: -	spinlock_t lock;
1: -	struct hlist_head tasks[4];
1: -	struct hlist_head inodes;
1: -	wait_queue_head_t wait_pidfd;
1: -	struct callback_head rcu;
1: -	struct upid numbers[1];
1: +  refcount_t count;
1: +  unsigned int level;
1: +  spinlock_t lock;
1: +  struct hlist_head tasks[4];
1: +  struct hlist_head inodes;
1: +  wait_queue_head_t wait_pidfd;
1: +  struct callback_head rcu;
1: +  struct upid numbers[1];
1:  };
1:  
1: -typedef struct {
1: -	gid_t val;
1: -} kgid_t;
1: +typedef struct { gid_t val; } kgid_t;
1:  
1:  struct hrtimer_cpu_base;
1:  
1:  struct hrtimer_clock_base {
1: -	struct hrtimer_cpu_base *cpu_base;
1: -	unsigned int index;
1: -	clockid_t clockid;
1: -	seqcount_raw_spinlock_t seq;
1: -	struct hrtimer *running;
1: -	struct timerqueue_head active;
1: -	ktime_t (*get_time)();
1: -	ktime_t offset;
1: +  struct hrtimer_cpu_base *cpu_base;
1: +  unsigned int index;
1: +  clockid_t clockid;
1: +  seqcount_raw_spinlock_t seq;
1: +  struct hrtimer *running;
1: +  struct timerqueue_head active;
1: +  ktime_t (*get_time)();
1: +  ktime_t offset;
1:  };
1:  
1:  struct hrtimer_cpu_base {
1: -	raw_spinlock_t lock;
1: -	unsigned int cpu;
1: -	unsigned int active_bases;
1: -	unsigned int clock_was_set_seq;
1: -	unsigned int hres_active: 1;
1: -	unsigned int in_hrtirq: 1;
1: -	unsigned int hang_detected: 1;
1: -	unsigned int softirq_activated: 1;
1: -	unsigned int nr_events;
1: -	short unsigned int nr_retries;
1: -	short unsigned int nr_hangs;
1: -	unsigned int max_hang_time;
1: -	ktime_t expires_next;
1: -	struct hrtimer *next_timer;
1: -	ktime_t softirq_expires_next;
1: -	struct hrtimer *softirq_next_timer;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct hrtimer_clock_base clock_base[8];
1: +  raw_spinlock_t lock;
1: +  unsigned int cpu;
1: +  unsigned int active_bases;
1: +  unsigned int clock_was_set_seq;
1: +  unsigned int hres_active : 1;
1: +  unsigned int in_hrtirq : 1;
1: +  unsigned int hang_detected : 1;
1: +  unsigned int softirq_activated : 1;
1: +  unsigned int nr_events;
1: +  short unsigned int nr_retries;
1: +  short unsigned int nr_hangs;
1: +  unsigned int max_hang_time;
1: +  ktime_t expires_next;
1: +  struct hrtimer *next_timer;
1: +  ktime_t softirq_expires_next;
1: +  struct hrtimer *softirq_next_timer;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct hrtimer_clock_base clock_base[8];
1:  };
1:  
1:  enum hrtimer_base_type {
1: -	HRTIMER_BASE_MONOTONIC = 0,
1: -	HRTIMER_BASE_REALTIME = 1,
1: -	HRTIMER_BASE_BOOTTIME = 2,
1: -	HRTIMER_BASE_TAI = 3,
1: -	HRTIMER_BASE_MONOTONIC_SOFT = 4,
1: -	HRTIMER_BASE_REALTIME_SOFT = 5,
1: -	HRTIMER_BASE_BOOTTIME_SOFT = 6,
1: -	HRTIMER_BASE_TAI_SOFT = 7,
1: -	HRTIMER_MAX_CLOCK_BASES = 8,
1: +  HRTIMER_BASE_MONOTONIC = 0,
1: +  HRTIMER_BASE_REALTIME = 1,
1: +  HRTIMER_BASE_BOOTTIME = 2,
1: +  HRTIMER_BASE_TAI = 3,
1: +  HRTIMER_BASE_MONOTONIC_SOFT = 4,
1: +  HRTIMER_BASE_REALTIME_SOFT = 5,
1: +  HRTIMER_BASE_BOOTTIME_SOFT = 6,
1: +  HRTIMER_BASE_TAI_SOFT = 7,
1: +  HRTIMER_MAX_CLOCK_BASES = 8,
1:  };
1:  
1:  typedef void __signalfn_t(int);
1: @@ -2337,119 +2325,119 @@ typedef void __restorefn_t();
1:  typedef __restorefn_t *__sigrestore_t;
1:  
1:  union sigval {
1: -	int sival_int;
1: -	void *sival_ptr;
1: +  int sival_int;
1: +  void *sival_ptr;
1:  };
1:  
1:  typedef union sigval sigval_t;
1:  
1:  union __sifields {
1: -	struct {
1: -		__kernel_pid_t _pid;
1: -		__kernel_uid32_t _uid;
1: -	} _kill;
1: -	struct {
1: -		__kernel_timer_t _tid;
1: -		int _overrun;
1: -		sigval_t _sigval;
1: -		int _sys_private;
1: -	} _timer;
1: -	struct {
1: -		__kernel_pid_t _pid;
1: -		__kernel_uid32_t _uid;
1: -		sigval_t _sigval;
1: -	} _rt;
1: -	struct {
1: -		__kernel_pid_t _pid;
1: -		__kernel_uid32_t _uid;
1: -		int _status;
1: -		__kernel_clock_t _utime;
1: -		__kernel_clock_t _stime;
1: -	} _sigchld;
1: -	struct {
1: -		void *_addr;
1: -		union {
1: -			short int _addr_lsb;
1: -			struct {
1: -				char _dummy_bnd[8];
1: -				void *_lower;
1: -				void *_upper;
1: -			} _addr_bnd;
1: -			struct {
1: -				char _dummy_pkey[8];
1: -				__u32 _pkey;
1: -			} _addr_pkey;
1: -		};
1: -	} _sigfault;
1: -	struct {
1: -		long int _band;
1: -		int _fd;
1: -	} _sigpoll;
1: -	struct {
1: -		void *_call_addr;
1: -		int _syscall;
1: -		unsigned int _arch;
1: -	} _sigsys;
1: +  struct {
1: +    __kernel_pid_t _pid;
1: +    __kernel_uid32_t _uid;
1: +  } _kill;
1: +  struct {
1: +    __kernel_timer_t _tid;
1: +    int _overrun;
1: +    sigval_t _sigval;
1: +    int _sys_private;
1: +  } _timer;
1: +  struct {
1: +    __kernel_pid_t _pid;
1: +    __kernel_uid32_t _uid;
1: +    sigval_t _sigval;
1: +  } _rt;
1: +  struct {
1: +    __kernel_pid_t _pid;
1: +    __kernel_uid32_t _uid;
1: +    int _status;
1: +    __kernel_clock_t _utime;
1: +    __kernel_clock_t _stime;
1: +  } _sigchld;
1: +  struct {
1: +    void *_addr;
1: +    union {
1: +      short int _addr_lsb;
1: +      struct {
1: +        char _dummy_bnd[8];
1: +        void *_lower;
1: +        void *_upper;
1: +      } _addr_bnd;
1: +      struct {
1: +        char _dummy_pkey[8];
1: +        __u32 _pkey;
1: +      } _addr_pkey;
1: +    };
1: +  } _sigfault;
1: +  struct {
1: +    long int _band;
1: +    int _fd;
1: +  } _sigpoll;
1: +  struct {
1: +    void *_call_addr;
1: +    int _syscall;
1: +    unsigned int _arch;
1: +  } _sigsys;
1:  };
1:  
1:  struct kernel_siginfo {
1: -	struct {
1: -		int si_signo;
1: -		int si_errno;
1: -		int si_code;
1: -		union __sifields _sifields;
1: -	};
1: +  struct {
1: +    int si_signo;
1: +    int si_errno;
1: +    int si_code;
1: +    union __sifields _sifields;
1: +  };
1:  };
1:  
1:  struct user_struct {
1: -	refcount_t __count;
1: -	atomic_t processes;
1: -	atomic_t sigpending;
1: -	atomic_long_t epoll_watches;
1: -	long unsigned int mq_bytes;
1: -	long unsigned int locked_shm;
1: -	long unsigned int unix_inflight;
1: -	atomic_long_t pipe_bufs;
1: -	struct hlist_node uidhash_node;
1: -	kuid_t uid;
1: -	atomic_long_t locked_vm;
1: -	struct ratelimit_state ratelimit;
1: +  refcount_t __count;
1: +  atomic_t processes;
1: +  atomic_t sigpending;
1: +  atomic_long_t epoll_watches;
1: +  long unsigned int mq_bytes;
1: +  long unsigned int locked_shm;
1: +  long unsigned int unix_inflight;
1: +  atomic_long_t pipe_bufs;
1: +  struct hlist_node uidhash_node;
1: +  kuid_t uid;
1: +  atomic_long_t locked_vm;
1: +  struct ratelimit_state ratelimit;
1:  };
1:  
1:  struct sigaction {
1: -	__sighandler_t sa_handler;
1: -	long unsigned int sa_flags;
1: -	__sigrestore_t sa_restorer;
1: -	sigset_t sa_mask;
1: +  __sighandler_t sa_handler;
1: +  long unsigned int sa_flags;
1: +  __sigrestore_t sa_restorer;
1: +  sigset_t sa_mask;
1:  };
1:  
1:  struct k_sigaction {
1: -	struct sigaction sa;
1: +  struct sigaction sa;
1:  };
1:  
1:  struct cpu_itimer {
1: -	u64 expires;
1: -	u64 incr;
1: +  u64 expires;
1: +  u64 incr;
1:  };
1:  
1:  struct task_cputime_atomic {
1: -	atomic64_t utime;
1: -	atomic64_t stime;
1: -	atomic64_t sum_exec_runtime;
1: +  atomic64_t utime;
1: +  atomic64_t stime;
1: +  atomic64_t sum_exec_runtime;
1:  };
1:  
1:  struct thread_group_cputimer {
1: -	struct task_cputime_atomic cputime_atomic;
1: +  struct task_cputime_atomic cputime_atomic;
1:  };
1:  
1:  struct pacct_struct {
1: -	int ac_flag;
1: -	long int ac_exitcode;
1: -	long unsigned int ac_mem;
1: -	u64 ac_utime;
1: -	u64 ac_stime;
1: -	long unsigned int ac_minflt;
1: -	long unsigned int ac_majflt;
1: +  int ac_flag;
1: +  long int ac_exitcode;
1: +  long unsigned int ac_mem;
1: +  u64 ac_utime;
1: +  u64 ac_stime;
1: +  long unsigned int ac_minflt;
1: +  long unsigned int ac_majflt;
1:  };
1:  
1:  struct tty_struct;
1: @@ -2459,92 +2447,92 @@ struct taskstats;
1:  struct tty_audit_buf;
1:  
1:  struct signal_struct {
1: -	refcount_t sigcnt;
1: -	atomic_t live;
1: -	int nr_threads;
1: -	struct list_head thread_head;
1: -	wait_queue_head_t wait_chldexit;
1: -	struct task_struct *curr_target;
1: -	struct sigpending shared_pending;
1: -	struct hlist_head multiprocess;
1: -	int group_exit_code;
1: -	int notify_count;
1: -	struct task_struct *group_exit_task;
1: -	int group_stop_count;
1: -	unsigned int flags;
1: -	unsigned int is_child_subreaper: 1;
1: -	unsigned int has_child_subreaper: 1;
1: -	int posix_timer_id;
1: -	struct list_head posix_timers;
1: -	struct hrtimer real_timer;
1: -	ktime_t it_real_incr;
1: -	struct cpu_itimer it[2];
1: -	struct thread_group_cputimer cputimer;
1: -	struct posix_cputimers posix_cputimers;
1: -	struct pid *pids[4];
1: -	struct pid *tty_old_pgrp;
1: -	int leader;
1: -	struct tty_struct *tty;
1: -	seqlock_t stats_lock;
1: -	u64 utime;
1: -	u64 stime;
1: -	u64 cutime;
1: -	u64 cstime;
1: -	u64 gtime;
1: -	u64 cgtime;
1: -	struct prev_cputime prev_cputime;
1: -	long unsigned int nvcsw;
1: -	long unsigned int nivcsw;
1: -	long unsigned int cnvcsw;
1: -	long unsigned int cnivcsw;
1: -	long unsigned int min_flt;
1: -	long unsigned int maj_flt;
1: -	long unsigned int cmin_flt;
1: -	long unsigned int cmaj_flt;
1: -	long unsigned int inblock;
1: -	long unsigned int oublock;
1: -	long unsigned int cinblock;
1: -	long unsigned int coublock;
1: -	long unsigned int maxrss;
1: -	long unsigned int cmaxrss;
1: -	struct task_io_accounting ioac;
1: -	long long unsigned int sum_sched_runtime;
1: -	struct rlimit rlim[16];
1: -	struct pacct_struct pacct;
1: -	struct taskstats *stats;
1: -	unsigned int audit_tty;
1: -	struct tty_audit_buf *tty_audit_buf;
1: -	bool oom_flag_origin;
1: -	short int oom_score_adj;
1: -	short int oom_score_adj_min;
1: -	struct mm_struct *oom_mm;
1: -	struct mutex cred_guard_mutex;
1: -	struct mutex exec_update_mutex;
1: +  refcount_t sigcnt;
1: +  atomic_t live;
1: +  int nr_threads;
1: +  struct list_head thread_head;
1: +  wait_queue_head_t wait_chldexit;
1: +  struct task_struct *curr_target;
1: +  struct sigpending shared_pending;
1: +  struct hlist_head multiprocess;
1: +  int group_exit_code;
1: +  int notify_count;
1: +  struct task_struct *group_exit_task;
1: +  int group_stop_count;
1: +  unsigned int flags;
1: +  unsigned int is_child_subreaper : 1;
1: +  unsigned int has_child_subreaper : 1;
1: +  int posix_timer_id;
1: +  struct list_head posix_timers;
1: +  struct hrtimer real_timer;
1: +  ktime_t it_real_incr;
1: +  struct cpu_itimer it[2];
1: +  struct thread_group_cputimer cputimer;
1: +  struct posix_cputimers posix_cputimers;
1: +  struct pid *pids[4];
1: +  struct pid *tty_old_pgrp;
1: +  int leader;
1: +  struct tty_struct *tty;
1: +  seqlock_t stats_lock;
1: +  u64 utime;
1: +  u64 stime;
1: +  u64 cutime;
1: +  u64 cstime;
1: +  u64 gtime;
1: +  u64 cgtime;
1: +  struct prev_cputime prev_cputime;
1: +  long unsigned int nvcsw;
1: +  long unsigned int nivcsw;
1: +  long unsigned int cnvcsw;
1: +  long unsigned int cnivcsw;
1: +  long unsigned int min_flt;
1: +  long unsigned int maj_flt;
1: +  long unsigned int cmin_flt;
1: +  long unsigned int cmaj_flt;
1: +  long unsigned int inblock;
1: +  long unsigned int oublock;
1: +  long unsigned int cinblock;
1: +  long unsigned int coublock;
1: +  long unsigned int maxrss;
1: +  long unsigned int cmaxrss;
1: +  struct task_io_accounting ioac;
1: +  long long unsigned int sum_sched_runtime;
1: +  struct rlimit rlim[16];
1: +  struct pacct_struct pacct;
1: +  struct taskstats *stats;
1: +  unsigned int audit_tty;
1: +  struct tty_audit_buf *tty_audit_buf;
1: +  bool oom_flag_origin;
1: +  short int oom_score_adj;
1: +  short int oom_score_adj_min;
1: +  struct mm_struct *oom_mm;
1: +  struct mutex cred_guard_mutex;
1: +  struct mutex exec_update_mutex;
1:  };
1:  
1:  enum rseq_cs_flags_bit {
1: -	RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0,
1: -	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1,
1: -	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2,
1: +  RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0,
1: +  RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1,
1: +  RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2,
1:  };
1:  
1:  struct rseq {
1: -	__u32 cpu_id_start;
1: -	__u32 cpu_id;
1: -	union {
1: -		__u64 ptr64;
1: -		__u64 ptr;
1: -	} rseq_cs;
1: -	__u32 flags;
1: -	long: 32;
1: -	long: 64;
1: +  __u32 cpu_id_start;
1: +  __u32 cpu_id;
1: +  union {
1: +    __u64 ptr64;
1: +    __u64 ptr;
1: +  } rseq_cs;
1: +  __u32 flags;
1: +  long : 32;
1: +  long : 64;
1:  };
1:  
1:  enum perf_event_task_context {
1: -	perf_invalid_context = 4294967295,
1: -	perf_hw_context = 0,
1: -	perf_sw_context = 1,
1: -	perf_nr_task_contexts = 2,
1: +  perf_invalid_context = 4294967295,
1: +  perf_hw_context = 0,
1: +  perf_sw_context = 1,
1: +  perf_nr_task_contexts = 2,
1:  };
1:  
1:  struct rq;
1: @@ -2552,34 +2540,34 @@ struct rq;
1:  struct rq_flags;
1:  
1:  struct sched_class {
1: -	void (*enqueue_task)(struct rq *, struct task_struct *, int);
1: -	void (*dequeue_task)(struct rq *, struct task_struct *, int);
1: -	void (*yield_task)(struct rq *);
1: -	bool (*yield_to_task)(struct rq *, struct task_struct *);
1: -	void (*check_preempt_curr)(struct rq *, struct task_struct *, int);
1: -	struct task_struct * (*pick_next_task)(struct rq *);
1: -	void (*put_prev_task)(struct rq *, struct task_struct *);
1: -	void (*set_next_task)(struct rq *, struct task_struct *, bool);
1: -	int (*balance)(struct rq *, struct task_struct *, struct rq_flags *);
1: -	int (*select_task_rq)(struct task_struct *, int, int, int);
1: -	void (*migrate_task_rq)(struct task_struct *, int);
1: -	void (*task_woken)(struct rq *, struct task_struct *);
1: -	void (*set_cpus_allowed)(struct task_struct *, const struct cpumask *);
1: -	void (*rq_online)(struct rq *);
1: -	void (*rq_offline)(struct rq *);
1: -	void (*task_tick)(struct rq *, struct task_struct *, int);
1: -	void (*task_fork)(struct task_struct *);
1: -	void (*task_dead)(struct task_struct *);
1: -	void (*switched_from)(struct rq *, struct task_struct *);
1: -	void (*switched_to)(struct rq *, struct task_struct *);
1: -	void (*prio_changed)(struct rq *, struct task_struct *, int);
1: -	unsigned int (*get_rr_interval)(struct rq *, struct task_struct *);
1: -	void (*update_curr)(struct rq *);
1: -	void (*task_change_group)(struct task_struct *, int);
1: +  void (*enqueue_task)(struct rq *, struct task_struct *, int);
1: +  void (*dequeue_task)(struct rq *, struct task_struct *, int);
1: +  void (*yield_task)(struct rq *);
1: +  bool (*yield_to_task)(struct rq *, struct task_struct *);
1: +  void (*check_preempt_curr)(struct rq *, struct task_struct *, int);
1: +  struct task_struct *(*pick_next_task)(struct rq *);
1: +  void (*put_prev_task)(struct rq *, struct task_struct *);
1: +  void (*set_next_task)(struct rq *, struct task_struct *, bool);
1: +  int (*balance)(struct rq *, struct task_struct *, struct rq_flags *);
1: +  int (*select_task_rq)(struct task_struct *, int, int, int);
1: +  void (*migrate_task_rq)(struct task_struct *, int);
1: +  void (*task_woken)(struct rq *, struct task_struct *);
1: +  void (*set_cpus_allowed)(struct task_struct *, const struct cpumask *);
1: +  void (*rq_online)(struct rq *);
1: +  void (*rq_offline)(struct rq *);
1: +  void (*task_tick)(struct rq *, struct task_struct *, int);
1: +  void (*task_fork)(struct task_struct *);
1: +  void (*task_dead)(struct task_struct *);
1: +  void (*switched_from)(struct rq *, struct task_struct *);
1: +  void (*switched_to)(struct rq *, struct task_struct *);
1: +  void (*prio_changed)(struct rq *, struct task_struct *, int);
1: +  unsigned int (*get_rr_interval)(struct rq *, struct task_struct *);
1: +  void (*update_curr)(struct rq *);
1: +  void (*task_change_group)(struct task_struct *, int);
1:  };
1:  
1:  struct kernel_cap_struct {
1: -	__u32 cap[2];
1: +  __u32 cap[2];
1:  };
1:  
1:  typedef struct kernel_cap_struct kernel_cap_t;
1: @@ -2587,37 +2575,37 @@ typedef struct kernel_cap_struct kernel_cap_t;
1:  struct group_info;
1:  
1:  struct cred {
1: -	atomic_t usage;
1: -	atomic_t subscribers;
1: -	void *put_addr;
1: -	unsigned int magic;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	kuid_t suid;
1: -	kgid_t sgid;
1: -	kuid_t euid;
1: -	kgid_t egid;
1: -	kuid_t fsuid;
1: -	kgid_t fsgid;
1: -	unsigned int securebits;
1: -	kernel_cap_t cap_inheritable;
1: -	kernel_cap_t cap_permitted;
1: -	kernel_cap_t cap_effective;
1: -	kernel_cap_t cap_bset;
1: -	kernel_cap_t cap_ambient;
1: -	unsigned char jit_keyring;
1: -	struct key *session_keyring;
1: -	struct key *process_keyring;
1: -	struct key *thread_keyring;
1: -	struct key *request_key_auth;
1: -	void *security;
1: -	struct user_struct *user;
1: -	struct user_namespace *user_ns;
1: -	struct group_info *group_info;
1: -	union {
1: -		int non_rcu;
1: -		struct callback_head rcu;
1: -	};
1: +  atomic_t usage;
1: +  atomic_t subscribers;
1: +  void *put_addr;
1: +  unsigned int magic;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  kuid_t suid;
1: +  kgid_t sgid;
1: +  kuid_t euid;
1: +  kgid_t egid;
1: +  kuid_t fsuid;
1: +  kgid_t fsgid;
1: +  unsigned int securebits;
1: +  kernel_cap_t cap_inheritable;
1: +  kernel_cap_t cap_permitted;
1: +  kernel_cap_t cap_effective;
1: +  kernel_cap_t cap_bset;
1: +  kernel_cap_t cap_ambient;
1: +  unsigned char jit_keyring;
1: +  struct key *session_keyring;
1: +  struct key *process_keyring;
1: +  struct key *thread_keyring;
1: +  struct key *request_key_auth;
1: +  void *security;
1: +  struct user_struct *user;
1: +  struct user_namespace *user_ns;
1: +  struct group_info *group_info;
1: +  union {
1: +    int non_rcu;
1: +    struct callback_head rcu;
1: +  };
1:  };
1:  
1:  typedef int32_t key_serial_t;
1: @@ -2629,29 +2617,29 @@ struct key_type;
1:  struct key_tag;
1:  
1:  struct keyring_index_key {
1: -	long unsigned int hash;
1: -	union {
1: -		struct {
1: -			u16 desc_len;
1: -			char desc[6];
1: -		};
1: -		long unsigned int x;
1: -	};
1: -	struct key_type *type;
1: -	struct key_tag *domain_tag;
1: -	const char *description;
1: +  long unsigned int hash;
1: +  union {
1: +    struct {
1: +      u16 desc_len;
1: +      char desc[6];
1: +    };
1: +    long unsigned int x;
1: +  };
1: +  struct key_type *type;
1: +  struct key_tag *domain_tag;
1: +  const char *description;
1:  };
1:  
1:  union key_payload {
1: -	void *rcu_data0;
1: -	void *data[4];
1: +  void *rcu_data0;
1: +  void *data[4];
1:  };
1:  
1:  struct assoc_array_ptr;
1:  
1:  struct assoc_array {
1: -	struct assoc_array_ptr *root;
1: -	long unsigned int nr_leaves_on_tree;
1: +  struct assoc_array_ptr *root;
1: +  long unsigned int nr_leaves_on_tree;
1:  };
1:  
1:  struct key_user;
1: @@ -2659,145 +2647,145 @@ struct key_user;
1:  struct key_restriction;
1:  
1:  struct key {
1: -	refcount_t usage;
1: -	key_serial_t serial;
1: -	union {
1: -		struct list_head graveyard_link;
1: -		struct rb_node serial_node;
1: -	};
1: -	struct rw_semaphore sem;
1: -	struct key_user *user;
1: -	void *security;
1: -	union {
1: -		time64_t expiry;
1: -		time64_t revoked_at;
1: -	};
1: -	time64_t last_used_at;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	key_perm_t perm;
1: -	short unsigned int quotalen;
1: -	short unsigned int datalen;
1: -	short int state;
1: -	long unsigned int flags;
1: -	union {
1: -		struct keyring_index_key index_key;
1: -		struct {
1: -			long unsigned int hash;
1: -			long unsigned int len_desc;
1: -			struct key_type *type;
1: -			struct key_tag *domain_tag;
1: -			char *description;
1: -		};
1: -	};
1: -	union {
1: -		union key_payload payload;
1: -		struct {
1: -			struct list_head name_link;
1: -			struct assoc_array keys;
1: -		};
1: -	};
1: -	struct key_restriction *restrict_link;
1: +  refcount_t usage;
1: +  key_serial_t serial;
1: +  union {
1: +    struct list_head graveyard_link;
1: +    struct rb_node serial_node;
1: +  };
1: +  struct rw_semaphore sem;
1: +  struct key_user *user;
1: +  void *security;
1: +  union {
1: +    time64_t expiry;
1: +    time64_t revoked_at;
1: +  };
1: +  time64_t last_used_at;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  key_perm_t perm;
1: +  short unsigned int quotalen;
1: +  short unsigned int datalen;
1: +  short int state;
1: +  long unsigned int flags;
1: +  union {
1: +    struct keyring_index_key index_key;
1: +    struct {
1: +      long unsigned int hash;
1: +      long unsigned int len_desc;
1: +      struct key_type *type;
1: +      struct key_tag *domain_tag;
1: +      char *description;
1: +    };
1: +  };
1: +  union {
1: +    union key_payload payload;
1: +    struct {
1: +      struct list_head name_link;
1: +      struct assoc_array keys;
1: +    };
1: +  };
1: +  struct key_restriction *restrict_link;
1:  };
1:  
1:  struct sighand_struct {
1: -	spinlock_t siglock;
1: -	refcount_t count;
1: -	wait_queue_head_t signalfd_wqh;
1: -	struct k_sigaction action[64];
1: +  spinlock_t siglock;
1: +  refcount_t count;
1: +  wait_queue_head_t signalfd_wqh;
1: +  struct k_sigaction action[64];
1:  };
1:  
1:  struct io_cq;
1:  
1:  struct io_context {
1: -	atomic_long_t refcount;
1: -	atomic_t active_ref;
1: -	atomic_t nr_tasks;
1: -	spinlock_t lock;
1: -	short unsigned int ioprio;
1: -	struct xarray icq_tree;
1: -	struct io_cq *icq_hint;
1: -	struct hlist_head icq_list;
1: -	struct work_struct release_work;
1: +  atomic_long_t refcount;
1: +  atomic_t active_ref;
1: +  atomic_t nr_tasks;
1: +  spinlock_t lock;
1: +  short unsigned int ioprio;
1: +  struct xarray icq_tree;
1: +  struct io_cq *icq_hint;
1: +  struct hlist_head icq_list;
1: +  struct work_struct release_work;
1:  };
1:  
1:  enum rseq_event_mask_bits {
1: -	RSEQ_EVENT_PREEMPT_BIT = 0,
1: -	RSEQ_EVENT_SIGNAL_BIT = 1,
1: -	RSEQ_EVENT_MIGRATE_BIT = 2,
1: +  RSEQ_EVENT_PREEMPT_BIT = 0,
1: +  RSEQ_EVENT_SIGNAL_BIT = 1,
1: +  RSEQ_EVENT_MIGRATE_BIT = 2,
1:  };
1:  
1:  enum fixed_addresses {
1: -	VSYSCALL_PAGE = 511,
1: -	FIX_DBGP_BASE = 512,
1: -	FIX_EARLYCON_MEM_BASE = 513,
1: -	FIX_APIC_BASE = 514,
1: -	FIX_IO_APIC_BASE_0 = 515,
1: -	FIX_IO_APIC_BASE_END = 642,
1: -	__end_of_permanent_fixed_addresses = 643,
1: -	FIX_BTMAP_END = 1024,
1: -	FIX_BTMAP_BEGIN = 1535,
1: -	FIX_TBOOT_BASE = 1536,
1: -	__end_of_fixed_addresses = 1537,
1: +  VSYSCALL_PAGE = 511,
1: +  FIX_DBGP_BASE = 512,
1: +  FIX_EARLYCON_MEM_BASE = 513,
1: +  FIX_APIC_BASE = 514,
1: +  FIX_IO_APIC_BASE_0 = 515,
1: +  FIX_IO_APIC_BASE_END = 642,
1: +  __end_of_permanent_fixed_addresses = 643,
1: +  FIX_BTMAP_END = 1024,
1: +  FIX_BTMAP_BEGIN = 1535,
1: +  FIX_TBOOT_BASE = 1536,
1: +  __end_of_fixed_addresses = 1537,
1:  };
1:  
1:  struct hlist_bl_node;
1:  
1:  struct hlist_bl_head {
1: -	struct hlist_bl_node *first;
1: +  struct hlist_bl_node *first;
1:  };
1:  
1:  struct hlist_bl_node {
1: -	struct hlist_bl_node *next;
1: -	struct hlist_bl_node **pprev;
1: +  struct hlist_bl_node *next;
1: +  struct hlist_bl_node **pprev;
1:  };
1:  
1:  struct lockref {
1: -	union {
1: -		struct {
1: -			spinlock_t lock;
1: -			int count;
1: -		};
1: -	};
1: +  union {
1: +    struct {
1: +      spinlock_t lock;
1: +      int count;
1: +    };
1: +  };
1:  };
1:  
1:  struct qstr {
1: -	union {
1: -		struct {
1: -			u32 hash;
1: -			u32 len;
1: -		};
1: -		u64 hash_len;
1: -	};
1: -	const unsigned char *name;
1: +  union {
1: +    struct {
1: +      u32 hash;
1: +      u32 len;
1: +    };
1: +    u64 hash_len;
1: +  };
1: +  const unsigned char *name;
1:  };
1:  
1:  struct dentry_operations;
1:  
1:  struct dentry {
1: -	unsigned int d_flags;
1: -	seqcount_spinlock_t d_seq;
1: -	struct hlist_bl_node d_hash;
1: -	struct dentry *d_parent;
1: -	struct qstr d_name;
1: -	struct inode *d_inode;
1: -	unsigned char d_iname[32];
1: -	struct lockref d_lockref;
1: -	const struct dentry_operations *d_op;
1: -	struct super_block *d_sb;
1: -	long unsigned int d_time;
1: -	void *d_fsdata;
1: -	union {
1: -		struct list_head d_lru;
1: -		wait_queue_head_t *d_wait;
1: -	};
1: -	struct list_head d_child;
1: -	struct list_head d_subdirs;
1: -	union {
1: -		struct hlist_node d_alias;
1: -		struct hlist_bl_node d_in_lookup_hash;
1: -		struct callback_head d_rcu;
1: -	} d_u;
1: +  unsigned int d_flags;
1: +  seqcount_spinlock_t d_seq;
1: +  struct hlist_bl_node d_hash;
1: +  struct dentry *d_parent;
1: +  struct qstr d_name;
1: +  struct inode *d_inode;
1: +  unsigned char d_iname[32];
1: +  struct lockref d_lockref;
1: +  const struct dentry_operations *d_op;
1: +  struct super_block *d_sb;
1: +  long unsigned int d_time;
1: +  void *d_fsdata;
1: +  union {
1: +    struct list_head d_lru;
1: +    wait_queue_head_t *d_wait;
1: +  };
1: +  struct list_head d_child;
1: +  struct list_head d_subdirs;
1: +  union {
1: +    struct hlist_node d_alias;
1: +    struct hlist_bl_node d_in_lookup_hash;
1: +    struct callback_head d_rcu;
1: +  } d_u;
1:  };
1:  
1:  struct posix_acl;
1: @@ -2815,92 +2803,93 @@ struct cdev;
1:  struct fsnotify_mark_connector;
1:  
1:  struct inode {
1: -	umode_t i_mode;
1: -	short unsigned int i_opflags;
1: -	kuid_t i_uid;
1: -	kgid_t i_gid;
1: -	unsigned int i_flags;
1: -	struct posix_acl *i_acl;
1: -	struct posix_acl *i_default_acl;
1: -	const struct inode_operations *i_op;
1: -	struct super_block *i_sb;
1: -	struct address_space *i_mapping;
1: -	void *i_security;
1: -	long unsigned int i_ino;
1: -	union {
1: -		const unsigned int i_nlink;
1: -		unsigned int __i_nlink;
1: -	};
1: -	dev_t i_rdev;
1: -	loff_t i_size;
1: -	struct timespec64 i_atime;
1: -	struct timespec64 i_mtime;
1: -	struct timespec64 i_ctime;
1: -	spinlock_t i_lock;
1: -	short unsigned int i_bytes;
1: -	u8 i_blkbits;
1: -	u8 i_write_hint;
1: -	blkcnt_t i_blocks;
1: -	long unsigned int i_state;
1: -	struct rw_semaphore i_rwsem;
1: -	long unsigned int dirtied_when;
1: -	long unsigned int dirtied_time_when;
1: -	struct hlist_node i_hash;
1: -	struct list_head i_io_list;
1: -	struct bdi_writeback *i_wb;
1: -	int i_wb_frn_winner;
1: -	u16 i_wb_frn_avg_time;
1: -	u16 i_wb_frn_history;
1: -	struct list_head i_lru;
1: -	struct list_head i_sb_list;
1: -	struct list_head i_wb_list;
1: -	union {
1: -		struct hlist_head i_dentry;
1: -		struct callback_head i_rcu;
1: -	};
1: -	atomic64_t i_version;
1: -	atomic64_t i_sequence;
1: -	atomic_t i_count;
1: -	atomic_t i_dio_count;
1: -	atomic_t i_writecount;
1: -	atomic_t i_readcount;
1: -	union {
1: -		const struct file_operations *i_fop;
1: -		void (*free_inode)(struct inode *);
1: -	};
1: -	struct file_lock_context *i_flctx;
1: -	struct address_space i_data;
1: -	struct list_head i_devices;
1: -	union {
1: -		struct pipe_inode_info *i_pipe;
1: -		struct block_device *i_bdev;
1: -		struct cdev *i_cdev;
1: -		char *i_link;
1: -		unsigned int i_dir_seq;
1: -	};
1: -	__u32 i_generation;
1: -	__u32 i_fsnotify_mask;
1: -	struct fsnotify_mark_connector *i_fsnotify_marks;
1: -	void *i_private;
1: +  umode_t i_mode;
1: +  short unsigned int i_opflags;
1: +  kuid_t i_uid;
1: +  kgid_t i_gid;
1: +  unsigned int i_flags;
1: +  struct posix_acl *i_acl;
1: +  struct posix_acl *i_default_acl;
1: +  const struct inode_operations *i_op;
1: +  struct super_block *i_sb;
1: +  struct address_space *i_mapping;
1: +  void *i_security;
1: +  long unsigned int i_ino;
1: +  union {
1: +    const unsigned int i_nlink;
1: +    unsigned int __i_nlink;
1: +  };
1: +  dev_t i_rdev;
1: +  loff_t i_size;
1: +  struct timespec64 i_atime;
1: +  struct timespec64 i_mtime;
1: +  struct timespec64 i_ctime;
1: +  spinlock_t i_lock;
1: +  short unsigned int i_bytes;
1: +  u8 i_blkbits;
1: +  u8 i_write_hint;
1: +  blkcnt_t i_blocks;
1: +  long unsigned int i_state;
1: +  struct rw_semaphore i_rwsem;
1: +  long unsigned int dirtied_when;
1: +  long unsigned int dirtied_time_when;
1: +  struct hlist_node i_hash;
1: +  struct list_head i_io_list;
1: +  struct bdi_writeback *i_wb;
1: +  int i_wb_frn_winner;
1: +  u16 i_wb_frn_avg_time;
1: +  u16 i_wb_frn_history;
1: +  struct list_head i_lru;
1: +  struct list_head i_sb_list;
1: +  struct list_head i_wb_list;
1: +  union {
1: +    struct hlist_head i_dentry;
1: +    struct callback_head i_rcu;
1: +  };
1: +  atomic64_t i_version;
1: +  atomic64_t i_sequence;
1: +  atomic_t i_count;
1: +  atomic_t i_dio_count;
1: +  atomic_t i_writecount;
1: +  atomic_t i_readcount;
1: +  union {
1: +    const struct file_operations *i_fop;
1: +    void (*free_inode)(struct inode *);
1: +  };
1: +  struct file_lock_context *i_flctx;
1: +  struct address_space i_data;
1: +  struct list_head i_devices;
1: +  union {
1: +    struct pipe_inode_info *i_pipe;
1: +    struct block_device *i_bdev;
1: +    struct cdev *i_cdev;
1: +    char *i_link;
1: +    unsigned int i_dir_seq;
1: +  };
1: +  __u32 i_generation;
1: +  __u32 i_fsnotify_mask;
1: +  struct fsnotify_mark_connector *i_fsnotify_marks;
1: +  void *i_private;
1:  };
1:  
1:  struct dentry_operations {
1: -	int (*d_revalidate)(struct dentry *, unsigned int);
1: -	int (*d_weak_revalidate)(struct dentry *, unsigned int);
1: -	int (*d_hash)(const struct dentry *, struct qstr *);
1: -	int (*d_compare)(const struct dentry *, unsigned int, const char *, const struct qstr *);
1: -	int (*d_delete)(const struct dentry *);
1: -	int (*d_init)(struct dentry *);
1: -	void (*d_release)(struct dentry *);
1: -	void (*d_prune)(struct dentry *);
1: -	void (*d_iput)(struct dentry *, struct inode *);
1: -	char * (*d_dname)(struct dentry *, char *, int);
1: -	struct vfsmount * (*d_automount)(struct path *);
1: -	int (*d_manage)(const struct path *, bool);
1: -	struct dentry * (*d_real)(struct dentry *, const struct inode *);
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  int (*d_revalidate)(struct dentry *, unsigned int);
1: +  int (*d_weak_revalidate)(struct dentry *, unsigned int);
1: +  int (*d_hash)(const struct dentry *, struct qstr *);
1: +  int (*d_compare)(const struct dentry *, unsigned int, const char *,
1: +                   const struct qstr *);
1: +  int (*d_delete)(const struct dentry *);
1: +  int (*d_init)(struct dentry *);
1: +  void (*d_release)(struct dentry *);
1: +  void (*d_prune)(struct dentry *);
1: +  void (*d_iput)(struct dentry *, struct inode *);
1: +  char *(*d_dname)(struct dentry *, char *, int);
1: +  struct vfsmount *(*d_automount)(struct path *);
1: +  int (*d_manage)(const struct path *, bool);
1: +  struct dentry *(*d_real)(struct dentry *, const struct inode *);
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct mtd_info;
1: @@ -2910,63 +2899,61 @@ typedef long long int qsize_t;
1:  struct quota_format_type;
1:  
1:  struct mem_dqinfo {
1: -	struct quota_format_type *dqi_format;
1: -	int dqi_fmt_id;
1: -	struct list_head dqi_dirty_list;
1: -	long unsigned int dqi_flags;
1: -	unsigned int dqi_bgrace;
1: -	unsigned int dqi_igrace;
1: -	qsize_t dqi_max_spc_limit;
1: -	qsize_t dqi_max_ino_limit;
1: -	void *dqi_priv;
1: +  struct quota_format_type *dqi_format;
1: +  int dqi_fmt_id;
1: +  struct list_head dqi_dirty_list;
1: +  long unsigned int dqi_flags;
1: +  unsigned int dqi_bgrace;
1: +  unsigned int dqi_igrace;
1: +  qsize_t dqi_max_spc_limit;
1: +  qsize_t dqi_max_ino_limit;
1: +  void *dqi_priv;
1:  };
1:  
1:  struct quota_format_ops;
1:  
1:  struct quota_info {
1: -	unsigned int flags;
1: -	struct rw_semaphore dqio_sem;
1: -	struct inode *files[3];
1: -	struct mem_dqinfo info[3];
1: -	const struct quota_format_ops *ops[3];
1: +  unsigned int flags;
1: +  struct rw_semaphore dqio_sem;
1: +  struct inode *files[3];
1: +  struct mem_dqinfo info[3];
1: +  const struct quota_format_ops *ops[3];
1:  };
1:  
1:  struct rcu_sync {
1: -	int gp_state;
1: -	int gp_count;
1: -	wait_queue_head_t gp_wait;
1: -	struct callback_head cb_head;
1: +  int gp_state;
1: +  int gp_count;
1: +  wait_queue_head_t gp_wait;
1: +  struct callback_head cb_head;
1:  };
1:  
1:  struct rcuwait {
1: -	struct task_struct *task;
1: +  struct task_struct *task;
1:  };
1:  
1:  struct percpu_rw_semaphore {
1: -	struct rcu_sync rss;
1: -	unsigned int *read_count;
1: -	struct rcuwait writer;
1: -	wait_queue_head_t waiters;
1: -	atomic_t block;
1: +  struct rcu_sync rss;
1: +  unsigned int *read_count;
1: +  struct rcuwait writer;
1: +  wait_queue_head_t waiters;
1: +  atomic_t block;
1:  };
1:  
1:  struct sb_writers {
1: -	int frozen;
1: -	wait_queue_head_t wait_unfrozen;
1: -	struct percpu_rw_semaphore rw_sem[3];
1: +  int frozen;
1: +  wait_queue_head_t wait_unfrozen;
1: +  struct percpu_rw_semaphore rw_sem[3];
1:  };
1:  
1: -typedef struct {
1: -	__u8 b[16];
1: -} uuid_t;
1: +typedef struct { __u8 b[16]; } uuid_t;
1:  
1:  struct list_lru_node;
1:  
1:  struct list_lru {
1: -	struct list_lru_node *node;
1: -	struct list_head list;
1: -	int shrinker_id;
1: -	bool memcg_aware;
1: +  struct list_lru_node *node;
1: +  struct list_head list;
1: +  int shrinker_id;
1: +  bool memcg_aware;
1:  };
1:  
1:  struct super_operations;
1: @@ -2982,125 +2969,125 @@ struct xattr_handler;
1:  struct workqueue_struct;
1:  
1:  struct super_block {
1: -	struct list_head s_list;
1: -	dev_t s_dev;
1: -	unsigned char s_blocksize_bits;
1: -	long unsigned int s_blocksize;
1: -	loff_t s_maxbytes;
1: -	struct file_system_type *s_type;
1: -	const struct super_operations *s_op;
1: -	const struct dquot_operations *dq_op;
1: -	const struct quotactl_ops *s_qcop;
1: -	const struct export_operations *s_export_op;
1: -	long unsigned int s_flags;
1: -	long unsigned int s_iflags;
1: -	long unsigned int s_magic;
1: -	struct dentry *s_root;
1: -	struct rw_semaphore s_umount;
1: -	int s_count;
1: -	atomic_t s_active;
1: -	void *s_security;
1: -	const struct xattr_handler **s_xattr;
1: -	struct hlist_bl_head s_roots;
1: -	struct list_head s_mounts;
1: -	struct block_device *s_bdev;
1: -	struct backing_dev_info *s_bdi;
1: -	struct mtd_info *s_mtd;
1: -	struct hlist_node s_instances;
1: -	unsigned int s_quota_types;
1: -	struct quota_info s_dquot;
1: -	struct sb_writers s_writers;
1: -	void *s_fs_info;
1: -	u32 s_time_gran;
1: -	time64_t s_time_min;
1: -	time64_t s_time_max;
1: -	__u32 s_fsnotify_mask;
1: -	struct fsnotify_mark_connector *s_fsnotify_marks;
1: -	char s_id[32];
1: -	uuid_t s_uuid;
1: -	unsigned int s_max_links;
1: -	fmode_t s_mode;
1: -	struct mutex s_vfs_rename_mutex;
1: -	const char *s_subtype;
1: -	const struct dentry_operations *s_d_op;
1: -	int cleancache_poolid;
1: -	struct shrinker s_shrink;
1: -	atomic_long_t s_remove_count;
1: -	atomic_long_t s_fsnotify_inode_refs;
1: -	int s_readonly_remount;
1: -	errseq_t s_wb_err;
1: -	struct workqueue_struct *s_dio_done_wq;
1: -	struct hlist_head s_pins;
1: -	struct user_namespace *s_user_ns;
1: -	struct list_lru s_dentry_lru;
1: -	struct list_lru s_inode_lru;
1: -	struct callback_head rcu;
1: -	struct work_struct destroy_work;
1: -	struct mutex s_sync_lock;
1: -	int s_stack_depth;
1: -	long: 32;
1: -	long: 64;
1: -	spinlock_t s_inode_list_lock;
1: -	struct list_head s_inodes;
1: -	spinlock_t s_inode_wblist_lock;
1: -	struct list_head s_inodes_wb;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct list_head s_list;
1: +  dev_t s_dev;
1: +  unsigned char s_blocksize_bits;
1: +  long unsigned int s_blocksize;
1: +  loff_t s_maxbytes;
1: +  struct file_system_type *s_type;
1: +  const struct super_operations *s_op;
1: +  const struct dquot_operations *dq_op;
1: +  const struct quotactl_ops *s_qcop;
1: +  const struct export_operations *s_export_op;
1: +  long unsigned int s_flags;
1: +  long unsigned int s_iflags;
1: +  long unsigned int s_magic;
1: +  struct dentry *s_root;
1: +  struct rw_semaphore s_umount;
1: +  int s_count;
1: +  atomic_t s_active;
1: +  void *s_security;
1: +  const struct xattr_handler **s_xattr;
1: +  struct hlist_bl_head s_roots;
1: +  struct list_head s_mounts;
1: +  struct block_device *s_bdev;
1: +  struct backing_dev_info *s_bdi;
1: +  struct mtd_info *s_mtd;
1: +  struct hlist_node s_instances;
1: +  unsigned int s_quota_types;
1: +  struct quota_info s_dquot;
1: +  struct sb_writers s_writers;
1: +  void *s_fs_info;
1: +  u32 s_time_gran;
1: +  time64_t s_time_min;
1: +  time64_t s_time_max;
1: +  __u32 s_fsnotify_mask;
1: +  struct fsnotify_mark_connector *s_fsnotify_marks;
1: +  char s_id[32];
1: +  uuid_t s_uuid;
1: +  unsigned int s_max_links;
1: +  fmode_t s_mode;
1: +  struct mutex s_vfs_rename_mutex;
1: +  const char *s_subtype;
1: +  const struct dentry_operations *s_d_op;
1: +  int cleancache_poolid;
1: +  struct shrinker s_shrink;
1: +  atomic_long_t s_remove_count;
1: +  atomic_long_t s_fsnotify_inode_refs;
1: +  int s_readonly_remount;
1: +  errseq_t s_wb_err;
1: +  struct workqueue_struct *s_dio_done_wq;
1: +  struct hlist_head s_pins;
1: +  struct user_namespace *s_user_ns;
1: +  struct list_lru s_dentry_lru;
1: +  struct list_lru s_inode_lru;
1: +  struct callback_head rcu;
1: +  struct work_struct destroy_work;
1: +  struct mutex s_sync_lock;
1: +  int s_stack_depth;
1: +  long : 32;
1: +  long : 64;
1: +  spinlock_t s_inode_list_lock;
1: +  struct list_head s_inodes;
1: +  spinlock_t s_inode_wblist_lock;
1: +  struct list_head s_inodes_wb;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct kstat {
1: -	u32 result_mask;
1: -	umode_t mode;
1: -	unsigned int nlink;
1: -	uint32_t blksize;
1: -	u64 attributes;
1: -	u64 attributes_mask;
1: -	u64 ino;
1: -	dev_t dev;
1: -	dev_t rdev;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	loff_t size;
1: -	struct timespec64 atime;
1: -	struct timespec64 mtime;
1: -	struct timespec64 ctime;
1: -	struct timespec64 btime;
1: -	u64 blocks;
1: -	u64 mnt_id;
1: +  u32 result_mask;
1: +  umode_t mode;
1: +  unsigned int nlink;
1: +  uint32_t blksize;
1: +  u64 attributes;
1: +  u64 attributes_mask;
1: +  u64 ino;
1: +  dev_t dev;
1: +  dev_t rdev;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  loff_t size;
1: +  struct timespec64 atime;
1: +  struct timespec64 mtime;
1: +  struct timespec64 ctime;
1: +  struct timespec64 btime;
1: +  u64 blocks;
1: +  u64 mnt_id;
1:  };
1:  
1:  struct list_lru_one {
1: -	struct list_head list;
1: -	long int nr_items;
1: +  struct list_head list;
1: +  long int nr_items;
1:  };
1:  
1:  struct list_lru_memcg {
1: -	struct callback_head rcu;
1: -	struct list_lru_one *lru[0];
1: +  struct callback_head rcu;
1: +  struct list_lru_one *lru[0];
1:  };
1:  
1:  struct list_lru_node {
1: -	spinlock_t lock;
1: -	struct list_lru_one lru;
1: -	struct list_lru_memcg *memcg_lrus;
1: -	long int nr_items;
1: +  spinlock_t lock;
1: +  struct list_lru_one lru;
1: +  struct list_lru_memcg *memcg_lrus;
1: +  long int nr_items;
1:  };
1:  
1:  enum migrate_mode {
1: -	MIGRATE_ASYNC = 0,
1: -	MIGRATE_SYNC_LIGHT = 1,
1: -	MIGRATE_SYNC = 2,
1: -	MIGRATE_SYNC_NO_COPY = 3,
1: +  MIGRATE_ASYNC = 0,
1: +  MIGRATE_SYNC_LIGHT = 1,
1: +  MIGRATE_SYNC = 2,
1: +  MIGRATE_SYNC_NO_COPY = 3,
1:  };
1:  
1:  struct key_tag {
1: -	struct callback_head rcu;
1: -	refcount_t usage;
1: -	bool removed;
1: +  struct callback_head rcu;
1: +  refcount_t usage;
1: +  bool removed;
1:  };
1:  
1:  typedef int (*request_key_actor_t)(struct key *, void *);
1: @@ -3114,248 +3101,250 @@ struct kernel_pkey_params;
1:  struct kernel_pkey_query;
1:  
1:  struct key_type {
1: -	const char *name;
1: -	size_t def_datalen;
1: -	unsigned int flags;
1: -	int (*vet_description)(const char *);
1: -	int (*preparse)(struct key_preparsed_payload *);
1: -	void (*free_preparse)(struct key_preparsed_payload *);
1: -	int (*instantiate)(struct key *, struct key_preparsed_payload *);
1: -	int (*update)(struct key *, struct key_preparsed_payload *);
1: -	int (*match_preparse)(struct key_match_data *);
1: -	void (*match_free)(struct key_match_data *);
1: -	void (*revoke)(struct key *);
1: -	void (*destroy)(struct key *);
1: -	void (*describe)(const struct key *, struct seq_file *);
1: -	long int (*read)(const struct key *, char *, size_t);
1: -	request_key_actor_t request_key;
1: -	struct key_restriction * (*lookup_restriction)(const char *);
1: -	int (*asym_query)(const struct kernel_pkey_params *, struct kernel_pkey_query *);
1: -	int (*asym_eds_op)(struct kernel_pkey_params *, const void *, void *);
1: -	int (*asym_verify_signature)(struct kernel_pkey_params *, const void *, const void *);
1: -	struct list_head link;
1: -	struct lock_class_key lock_class;
1: -};
1: -
1: -typedef int (*key_restrict_link_func_t)(struct key *, const struct key_type *, const union key_payload *, struct key *);
1: +  const char *name;
1: +  size_t def_datalen;
1: +  unsigned int flags;
1: +  int (*vet_description)(const char *);
1: +  int (*preparse)(struct key_preparsed_payload *);
1: +  void (*free_preparse)(struct key_preparsed_payload *);
1: +  int (*instantiate)(struct key *, struct key_preparsed_payload *);
1: +  int (*update)(struct key *, struct key_preparsed_payload *);
1: +  int (*match_preparse)(struct key_match_data *);
1: +  void (*match_free)(struct key_match_data *);
1: +  void (*revoke)(struct key *);
1: +  void (*destroy)(struct key *);
1: +  void (*describe)(const struct key *, struct seq_file *);
1: +  long int (*read)(const struct key *, char *, size_t);
1: +  request_key_actor_t request_key;
1: +  struct key_restriction *(*lookup_restriction)(const char *);
1: +  int (*asym_query)(const struct kernel_pkey_params *,
1: +                    struct kernel_pkey_query *);
1: +  int (*asym_eds_op)(struct kernel_pkey_params *, const void *, void *);
1: +  int (*asym_verify_signature)(struct kernel_pkey_params *, const void *,
1: +                               const void *);
1: +  struct list_head link;
1: +  struct lock_class_key lock_class;
1: +};
1: +
1: +typedef int (*key_restrict_link_func_t)(struct key *, const struct key_type *,
1: +                                        const union key_payload *,
1: +                                        struct key *);
1:  
1:  struct key_restriction {
1: -	key_restrict_link_func_t check;
1: -	struct key *key;
1: -	struct key_type *keytype;
1: +  key_restrict_link_func_t check;
1: +  struct key *key;
1: +  struct key_type *keytype;
1:  };
1:  
1:  struct group_info {
1: -	atomic_t usage;
1: -	int ngroups;
1: -	kgid_t gid[0];
1: +  atomic_t usage;
1: +  int ngroups;
1: +  kgid_t gid[0];
1:  };
1:  
1:  struct delayed_call {
1: -	void (*fn)(void *);
1: -	void *arg;
1: +  void (*fn)(void *);
1: +  void *arg;
1:  };
1:  
1:  struct io_cq {
1: -	struct request_queue *q;
1: -	struct io_context *ioc;
1: -	union {
1: -		struct list_head q_node;
1: -		struct kmem_cache *__rcu_icq_cache;
1: -	};
1: -	union {
1: -		struct hlist_node ioc_node;
1: -		struct callback_head __rcu_head;
1: -	};
1: -	unsigned int flags;
1: +  struct request_queue *q;
1: +  struct io_context *ioc;
1: +  union {
1: +    struct list_head q_node;
1: +    struct kmem_cache *__rcu_icq_cache;
1: +  };
1: +  union {
1: +    struct hlist_node ioc_node;
1: +    struct callback_head __rcu_head;
1: +  };
1: +  unsigned int flags;
1:  };
1:  
1:  struct wait_page_queue;
1:  
1:  struct kiocb {
1: -	struct file *ki_filp;
1: -	loff_t ki_pos;
1: -	void (*ki_complete)(struct kiocb *, long int, long int);
1: -	void *private;
1: -	int ki_flags;
1: -	u16 ki_hint;
1: -	u16 ki_ioprio;
1: -	union {
1: -		unsigned int ki_cookie;
1: -		struct wait_page_queue *ki_waitq;
1: -	};
1: +  struct file *ki_filp;
1: +  loff_t ki_pos;
1: +  void (*ki_complete)(struct kiocb *, long int, long int);
1: +  void *private;
1: +  int ki_flags;
1: +  u16 ki_hint;
1: +  u16 ki_ioprio;
1: +  union {
1: +    unsigned int ki_cookie;
1: +    struct wait_page_queue *ki_waitq;
1: +  };
1:  };
1:  
1:  struct iattr {
1: -	unsigned int ia_valid;
1: -	umode_t ia_mode;
1: -	kuid_t ia_uid;
1: -	kgid_t ia_gid;
1: -	loff_t ia_size;
1: -	struct timespec64 ia_atime;
1: -	struct timespec64 ia_mtime;
1: -	struct timespec64 ia_ctime;
1: -	struct file *ia_file;
1: +  unsigned int ia_valid;
1: +  umode_t ia_mode;
1: +  kuid_t ia_uid;
1: +  kgid_t ia_gid;
1: +  loff_t ia_size;
1: +  struct timespec64 ia_atime;
1: +  struct timespec64 ia_mtime;
1: +  struct timespec64 ia_ctime;
1: +  struct file *ia_file;
1:  };
1:  
1:  typedef __kernel_uid32_t projid_t;
1:  
1: -typedef struct {
1: -	projid_t val;
1: -} kprojid_t;
1: +typedef struct { projid_t val; } kprojid_t;
1:  
1:  enum quota_type {
1: -	USRQUOTA = 0,
1: -	GRPQUOTA = 1,
1: -	PRJQUOTA = 2,
1: +  USRQUOTA = 0,
1: +  GRPQUOTA = 1,
1: +  PRJQUOTA = 2,
1:  };
1:  
1:  struct kqid {
1: -	union {
1: -		kuid_t uid;
1: -		kgid_t gid;
1: -		kprojid_t projid;
1: -	};
1: -	enum quota_type type;
1: +  union {
1: +    kuid_t uid;
1: +    kgid_t gid;
1: +    kprojid_t projid;
1: +  };
1: +  enum quota_type type;
1:  };
1:  
1:  struct mem_dqblk {
1: -	qsize_t dqb_bhardlimit;
1: -	qsize_t dqb_bsoftlimit;
1: -	qsize_t dqb_curspace;
1: -	qsize_t dqb_rsvspace;
1: -	qsize_t dqb_ihardlimit;
1: -	qsize_t dqb_isoftlimit;
1: -	qsize_t dqb_curinodes;
1: -	time64_t dqb_btime;
1: -	time64_t dqb_itime;
1: +  qsize_t dqb_bhardlimit;
1: +  qsize_t dqb_bsoftlimit;
1: +  qsize_t dqb_curspace;
1: +  qsize_t dqb_rsvspace;
1: +  qsize_t dqb_ihardlimit;
1: +  qsize_t dqb_isoftlimit;
1: +  qsize_t dqb_curinodes;
1: +  time64_t dqb_btime;
1: +  time64_t dqb_itime;
1:  };
1:  
1:  struct dquot {
1: -	struct hlist_node dq_hash;
1: -	struct list_head dq_inuse;
1: -	struct list_head dq_free;
1: -	struct list_head dq_dirty;
1: -	struct mutex dq_lock;
1: -	spinlock_t dq_dqb_lock;
1: -	atomic_t dq_count;
1: -	struct super_block *dq_sb;
1: -	struct kqid dq_id;
1: -	loff_t dq_off;
1: -	long unsigned int dq_flags;
1: -	struct mem_dqblk dq_dqb;
1: +  struct hlist_node dq_hash;
1: +  struct list_head dq_inuse;
1: +  struct list_head dq_free;
1: +  struct list_head dq_dirty;
1: +  struct mutex dq_lock;
1: +  spinlock_t dq_dqb_lock;
1: +  atomic_t dq_count;
1: +  struct super_block *dq_sb;
1: +  struct kqid dq_id;
1: +  loff_t dq_off;
1: +  long unsigned int dq_flags;
1: +  struct mem_dqblk dq_dqb;
1:  };
1:  
1:  enum {
1: -	DQF_ROOT_SQUASH_B = 0,
1: -	DQF_SYS_FILE_B = 16,
1: -	DQF_PRIVATE = 17,
1: +  DQF_ROOT_SQUASH_B = 0,
1: +  DQF_SYS_FILE_B = 16,
1: +  DQF_PRIVATE = 17,
1:  };
1:  
1:  struct quota_format_type {
1: -	int qf_fmt_id;
1: -	const struct quota_format_ops *qf_ops;
1: -	struct module *qf_owner;
1: -	struct quota_format_type *qf_next;
1: +  int qf_fmt_id;
1: +  const struct quota_format_ops *qf_ops;
1: +  struct module *qf_owner;
1: +  struct quota_format_type *qf_next;
1:  };
1:  
1:  enum {
1: -	DQST_LOOKUPS = 0,
1: -	DQST_DROPS = 1,
1: -	DQST_READS = 2,
1: -	DQST_WRITES = 3,
1: -	DQST_CACHE_HITS = 4,
1: -	DQST_ALLOC_DQUOTS = 5,
1: -	DQST_FREE_DQUOTS = 6,
1: -	DQST_SYNCS = 7,
1: -	_DQST_DQSTAT_LAST = 8,
1: +  DQST_LOOKUPS = 0,
1: +  DQST_DROPS = 1,
1: +  DQST_READS = 2,
1: +  DQST_WRITES = 3,
1: +  DQST_CACHE_HITS = 4,
1: +  DQST_ALLOC_DQUOTS = 5,
1: +  DQST_FREE_DQUOTS = 6,
1: +  DQST_SYNCS = 7,
1: +  _DQST_DQSTAT_LAST = 8,
1:  };
1:  
1:  struct quota_format_ops {
1: -	int (*check_quota_file)(struct super_block *, int);
1: -	int (*read_file_info)(struct super_block *, int);
1: -	int (*write_file_info)(struct super_block *, int);
1: -	int (*free_file_info)(struct super_block *, int);
1: -	int (*read_dqblk)(struct dquot *);
1: -	int (*commit_dqblk)(struct dquot *);
1: -	int (*release_dqblk)(struct dquot *);
1: -	int (*get_next_id)(struct super_block *, struct kqid *);
1: +  int (*check_quota_file)(struct super_block *, int);
1: +  int (*read_file_info)(struct super_block *, int);
1: +  int (*write_file_info)(struct super_block *, int);
1: +  int (*free_file_info)(struct super_block *, int);
1: +  int (*read_dqblk)(struct dquot *);
1: +  int (*commit_dqblk)(struct dquot *);
1: +  int (*release_dqblk)(struct dquot *);
1: +  int (*get_next_id)(struct super_block *, struct kqid *);
1:  };
1:  
1:  struct dquot_operations {
1: -	int (*write_dquot)(struct dquot *);
1: -	struct dquot * (*alloc_dquot)(struct super_block *, int);
1: -	void (*destroy_dquot)(struct dquot *);
1: -	int (*acquire_dquot)(struct dquot *);
1: -	int (*release_dquot)(struct dquot *);
1: -	int (*mark_dirty)(struct dquot *);
1: -	int (*write_info)(struct super_block *, int);
1: -	qsize_t * (*get_reserved_space)(struct inode *);
1: -	int (*get_projid)(struct inode *, kprojid_t *);
1: -	int (*get_inode_usage)(struct inode *, qsize_t *);
1: -	int (*get_next_id)(struct super_block *, struct kqid *);
1: +  int (*write_dquot)(struct dquot *);
1: +  struct dquot *(*alloc_dquot)(struct super_block *, int);
1: +  void (*destroy_dquot)(struct dquot *);
1: +  int (*acquire_dquot)(struct dquot *);
1: +  int (*release_dquot)(struct dquot *);
1: +  int (*mark_dirty)(struct dquot *);
1: +  int (*write_info)(struct super_block *, int);
1: +  qsize_t *(*get_reserved_space)(struct inode *);
1: +  int (*get_projid)(struct inode *, kprojid_t *);
1: +  int (*get_inode_usage)(struct inode *, qsize_t *);
1: +  int (*get_next_id)(struct super_block *, struct kqid *);
1:  };
1:  
1:  struct qc_dqblk {
1: -	int d_fieldmask;
1: -	u64 d_spc_hardlimit;
1: -	u64 d_spc_softlimit;
1: -	u64 d_ino_hardlimit;
1: -	u64 d_ino_softlimit;
1: -	u64 d_space;
1: -	u64 d_ino_count;
1: -	s64 d_ino_timer;
1: -	s64 d_spc_timer;
1: -	int d_ino_warns;
1: -	int d_spc_warns;
1: -	u64 d_rt_spc_hardlimit;
1: -	u64 d_rt_spc_softlimit;
1: -	u64 d_rt_space;
1: -	s64 d_rt_spc_timer;
1: -	int d_rt_spc_warns;
1: +  int d_fieldmask;
1: +  u64 d_spc_hardlimit;
1: +  u64 d_spc_softlimit;
1: +  u64 d_ino_hardlimit;
1: +  u64 d_ino_softlimit;
1: +  u64 d_space;
1: +  u64 d_ino_count;
1: +  s64 d_ino_timer;
1: +  s64 d_spc_timer;
1: +  int d_ino_warns;
1: +  int d_spc_warns;
1: +  u64 d_rt_spc_hardlimit;
1: +  u64 d_rt_spc_softlimit;
1: +  u64 d_rt_space;
1: +  s64 d_rt_spc_timer;
1: +  int d_rt_spc_warns;
1:  };
1:  
1:  struct qc_type_state {
1: -	unsigned int flags;
1: -	unsigned int spc_timelimit;
1: -	unsigned int ino_timelimit;
1: -	unsigned int rt_spc_timelimit;
1: -	unsigned int spc_warnlimit;
1: -	unsigned int ino_warnlimit;
1: -	unsigned int rt_spc_warnlimit;
1: -	long long unsigned int ino;
1: -	blkcnt_t blocks;
1: -	blkcnt_t nextents;
1: +  unsigned int flags;
1: +  unsigned int spc_timelimit;
1: +  unsigned int ino_timelimit;
1: +  unsigned int rt_spc_timelimit;
1: +  unsigned int spc_warnlimit;
1: +  unsigned int ino_warnlimit;
1: +  unsigned int rt_spc_warnlimit;
1: +  long long unsigned int ino;
1: +  blkcnt_t blocks;
1: +  blkcnt_t nextents;
1:  };
1:  
1:  struct qc_state {
1: -	unsigned int s_incoredqs;
1: -	struct qc_type_state s_state[3];
1: +  unsigned int s_incoredqs;
1: +  struct qc_type_state s_state[3];
1:  };
1:  
1:  struct qc_info {
1: -	int i_fieldmask;
1: -	unsigned int i_flags;
1: -	unsigned int i_spc_timelimit;
1: -	unsigned int i_ino_timelimit;
1: -	unsigned int i_rt_spc_timelimit;
1: -	unsigned int i_spc_warnlimit;
1: -	unsigned int i_ino_warnlimit;
1: -	unsigned int i_rt_spc_warnlimit;
1: +  int i_fieldmask;
1: +  unsigned int i_flags;
1: +  unsigned int i_spc_timelimit;
1: +  unsigned int i_ino_timelimit;
1: +  unsigned int i_rt_spc_timelimit;
1: +  unsigned int i_spc_warnlimit;
1: +  unsigned int i_ino_warnlimit;
1: +  unsigned int i_rt_spc_warnlimit;
1:  };
1:  
1:  struct quotactl_ops {
1: -	int (*quota_on)(struct super_block *, int, int, const struct path *);
1: -	int (*quota_off)(struct super_block *, int);
1: -	int (*quota_enable)(struct super_block *, unsigned int);
1: -	int (*quota_disable)(struct super_block *, unsigned int);
1: -	int (*quota_sync)(struct super_block *, int);
1: -	int (*set_info)(struct super_block *, int, struct qc_info *);
1: -	int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
1: -	int (*get_nextdqblk)(struct super_block *, struct kqid *, struct qc_dqblk *);
1: -	int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
1: -	int (*get_state)(struct super_block *, struct qc_state *);
1: -	int (*rm_xquota)(struct super_block *, unsigned int);
1: +  int (*quota_on)(struct super_block *, int, int, const struct path *);
1: +  int (*quota_off)(struct super_block *, int);
1: +  int (*quota_enable)(struct super_block *, unsigned int);
1: +  int (*quota_disable)(struct super_block *, unsigned int);
1: +  int (*quota_sync)(struct super_block *, int);
1: +  int (*set_info)(struct super_block *, int, struct qc_info *);
1: +  int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
1: +  int (*get_nextdqblk)(struct super_block *, struct kqid *, struct qc_dqblk *);
1: +  int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
1: +  int (*get_state)(struct super_block *, struct qc_state *);
1: +  int (*rm_xquota)(struct super_block *, unsigned int);
1:  };
1:  
1:  struct writeback_control;
1: @@ -3365,83 +3354,91 @@ struct readahead_control;
1:  struct swap_info_struct;
1:  
1:  struct address_space_operations {
1: -	int (*writepage)(struct page *, struct writeback_control *);
1: -	int (*readpage)(struct file *, struct page *);
1: -	int (*writepages)(struct address_space *, struct writeback_control *);
1: -	int (*set_page_dirty)(struct page *);
1: -	int (*readpages)(struct file *, struct address_space *, struct list_head *, unsigned int);
1: -	void (*readahead)(struct readahead_control *);
1: -	int (*write_begin)(struct file *, struct address_space *, loff_t, unsigned int, unsigned int, struct page **, void **);
1: -	int (*write_end)(struct file *, struct address_space *, loff_t, unsigned int, unsigned int, struct page *, void *);
1: -	sector_t (*bmap)(struct address_space *, sector_t);
1: -	void (*invalidatepage)(struct page *, unsigned int, unsigned int);
1: -	int (*releasepage)(struct page *, gfp_t);
1: -	void (*freepage)(struct page *);
1: -	ssize_t (*direct_IO)(struct kiocb *, struct iov_iter *);
1: -	int (*migratepage)(struct address_space *, struct page *, struct page *, enum migrate_mode);
1: -	bool (*isolate_page)(struct page *, isolate_mode_t);
1: -	void (*putback_page)(struct page *);
1: -	int (*launder_page)(struct page *);
1: -	int (*is_partially_uptodate)(struct page *, long unsigned int, long unsigned int);
1: -	void (*is_dirty_writeback)(struct page *, bool *, bool *);
1: -	int (*error_remove_page)(struct address_space *, struct page *);
1: -	int (*swap_activate)(struct swap_info_struct *, struct file *, sector_t *);
1: -	void (*swap_deactivate)(struct file *);
1: +  int (*writepage)(struct page *, struct writeback_control *);
1: +  int (*readpage)(struct file *, struct page *);
1: +  int (*writepages)(struct address_space *, struct writeback_control *);
1: +  int (*set_page_dirty)(struct page *);
1: +  int (*readpages)(struct file *, struct address_space *, struct list_head *,
1: +                   unsigned int);
1: +  void (*readahead)(struct readahead_control *);
1: +  int (*write_begin)(struct file *, struct address_space *, loff_t,
1: +                     unsigned int, unsigned int, struct page **, void **);
1: +  int (*write_end)(struct file *, struct address_space *, loff_t, unsigned int,
1: +                   unsigned int, struct page *, void *);
1: +  sector_t (*bmap)(struct address_space *, sector_t);
1: +  void (*invalidatepage)(struct page *, unsigned int, unsigned int);
1: +  int (*releasepage)(struct page *, gfp_t);
1: +  void (*freepage)(struct page *);
1: +  ssize_t (*direct_IO)(struct kiocb *, struct iov_iter *);
1: +  int (*migratepage)(struct address_space *, struct page *, struct page *,
1: +                     enum migrate_mode);
1: +  bool (*isolate_page)(struct page *, isolate_mode_t);
1: +  void (*putback_page)(struct page *);
1: +  int (*launder_page)(struct page *);
1: +  int (*is_partially_uptodate)(struct page *, long unsigned int,
1: +                               long unsigned int);
1: +  void (*is_dirty_writeback)(struct page *, bool *, bool *);
1: +  int (*error_remove_page)(struct address_space *, struct page *);
1: +  int (*swap_activate)(struct swap_info_struct *, struct file *, sector_t *);
1: +  void (*swap_deactivate)(struct file *);
1:  };
1:  
1:  struct fiemap_extent_info;
1:  
1:  struct inode_operations {
1: -	struct dentry * (*lookup)(struct inode *, struct dentry *, unsigned int);
1: -	const char * (*get_link)(struct dentry *, struct inode *, struct delayed_call *);
1: -	int (*permission)(struct inode *, int);
1: -	struct posix_acl * (*get_acl)(struct inode *, int);
1: -	int (*readlink)(struct dentry *, char *, int);
1: -	int (*create)(struct inode *, struct dentry *, umode_t, bool);
1: -	int (*link)(struct dentry *, struct inode *, struct dentry *);
1: -	int (*unlink)(struct inode *, struct dentry *);
1: -	int (*symlink)(struct inode *, struct dentry *, const char *);
1: -	int (*mkdir)(struct inode *, struct dentry *, umode_t);
1: -	int (*rmdir)(struct inode *, struct dentry *);
1: -	int (*mknod)(struct inode *, struct dentry *, umode_t, dev_t);
1: -	int (*rename)(struct inode *, struct dentry *, struct inode *, struct dentry *, unsigned int);
1: -	int (*setattr)(struct dentry *, struct iattr *);
1: -	int (*getattr)(const struct path *, struct kstat *, u32, unsigned int);
1: -	ssize_t (*listxattr)(struct dentry *, char *, size_t);
1: -	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64, u64);
1: -	int (*update_time)(struct inode *, struct timespec64 *, int);
1: -	int (*atomic_open)(struct inode *, struct dentry *, struct file *, unsigned int, umode_t);
1: -	int (*tmpfile)(struct inode *, struct dentry *, umode_t);
1: -	int (*set_acl)(struct inode *, struct posix_acl *, int);
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct dentry *(*lookup)(struct inode *, struct dentry *, unsigned int);
1: +  const char *(*get_link)(struct dentry *, struct inode *,
1: +                          struct delayed_call *);
1: +  int (*permission)(struct inode *, int);
1: +  struct posix_acl *(*get_acl)(struct inode *, int);
1: +  int (*readlink)(struct dentry *, char *, int);
1: +  int (*create)(struct inode *, struct dentry *, umode_t, bool);
1: +  int (*link)(struct dentry *, struct inode *, struct dentry *);
1: +  int (*unlink)(struct inode *, struct dentry *);
1: +  int (*symlink)(struct inode *, struct dentry *, const char *);
1: +  int (*mkdir)(struct inode *, struct dentry *, umode_t);
1: +  int (*rmdir)(struct inode *, struct dentry *);
1: +  int (*mknod)(struct inode *, struct dentry *, umode_t, dev_t);
1: +  int (*rename)(struct inode *, struct dentry *, struct inode *,
1: +                struct dentry *, unsigned int);
1: +  int (*setattr)(struct dentry *, struct iattr *);
1: +  int (*getattr)(const struct path *, struct kstat *, u32, unsigned int);
1: +  ssize_t (*listxattr)(struct dentry *, char *, size_t);
1: +  int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64, u64);
1: +  int (*update_time)(struct inode *, struct timespec64 *, int);
1: +  int (*atomic_open)(struct inode *, struct dentry *, struct file *,
1: +                     unsigned int, umode_t);
1: +  int (*tmpfile)(struct inode *, struct dentry *, umode_t);
1: +  int (*set_acl)(struct inode *, struct posix_acl *, int);
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct file_lock_context {
1: -	spinlock_t flc_lock;
1: -	struct list_head flc_flock;
1: -	struct list_head flc_posix;
1: -	struct list_head flc_lease;
1: +  spinlock_t flc_lock;
1: +  struct list_head flc_flock;
1: +  struct list_head flc_posix;
1: +  struct list_head flc_lease;
1:  };
1:  
1:  struct file_lock_operations {
1: -	void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
1: -	void (*fl_release_private)(struct file_lock *);
1: +  void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
1: +  void (*fl_release_private)(struct file_lock *);
1:  };
1:  
1:  struct nlm_lockowner;
1:  
1:  struct nfs_lock_info {
1: -	u32 state;
1: -	struct nlm_lockowner *owner;
1: -	struct list_head list;
1: +  u32 state;
1: +  struct nlm_lockowner *owner;
1: +  struct list_head list;
1:  };
1:  
1:  struct nfs4_lock_state;
1:  
1:  struct nfs4_lock_info {
1: -	struct nfs4_lock_state *owner;
1: +  struct nfs4_lock_state *owner;
1:  };
1:  
1:  struct fasync_struct;
1: @@ -3449,93 +3446,95 @@ struct fasync_struct;
1:  struct lock_manager_operations;
1:  
1:  struct file_lock {
1: -	struct file_lock *fl_blocker;
1: -	struct list_head fl_list;
1: -	struct hlist_node fl_link;
1: -	struct list_head fl_blocked_requests;
1: -	struct list_head fl_blocked_member;
1: -	fl_owner_t fl_owner;
1: -	unsigned int fl_flags;
1: -	unsigned char fl_type;
1: -	unsigned int fl_pid;
1: -	int fl_link_cpu;
1: -	wait_queue_head_t fl_wait;
1: -	struct file *fl_file;
1: -	loff_t fl_start;
1: -	loff_t fl_end;
1: -	struct fasync_struct *fl_fasync;
1: -	long unsigned int fl_break_time;
1: -	long unsigned int fl_downgrade_time;
1: -	const struct file_lock_operations *fl_ops;
1: -	const struct lock_manager_operations *fl_lmops;
1: -	union {
1: -		struct nfs_lock_info nfs_fl;
1: -		struct nfs4_lock_info nfs4_fl;
1: -		struct {
1: -			struct list_head link;
1: -			int state;
1: -			unsigned int debug_id;
1: -		} afs;
1: -	} fl_u;
1: +  struct file_lock *fl_blocker;
1: +  struct list_head fl_list;
1: +  struct hlist_node fl_link;
1: +  struct list_head fl_blocked_requests;
1: +  struct list_head fl_blocked_member;
1: +  fl_owner_t fl_owner;
1: +  unsigned int fl_flags;
1: +  unsigned char fl_type;
1: +  unsigned int fl_pid;
1: +  int fl_link_cpu;
1: +  wait_queue_head_t fl_wait;
1: +  struct file *fl_file;
1: +  loff_t fl_start;
1: +  loff_t fl_end;
1: +  struct fasync_struct *fl_fasync;
1: +  long unsigned int fl_break_time;
1: +  long unsigned int fl_downgrade_time;
1: +  const struct file_lock_operations *fl_ops;
1: +  const struct lock_manager_operations *fl_lmops;
1: +  union {
1: +    struct nfs_lock_info nfs_fl;
1: +    struct nfs4_lock_info nfs4_fl;
1: +    struct {
1: +      struct list_head link;
1: +      int state;
1: +      unsigned int debug_id;
1: +    } afs;
1: +  } fl_u;
1:  };
1:  
1:  struct lock_manager_operations {
1: -	fl_owner_t (*lm_get_owner)(fl_owner_t);
1: -	void (*lm_put_owner)(fl_owner_t);
1: -	void (*lm_notify)(struct file_lock *);
1: -	int (*lm_grant)(struct file_lock *, int);
1: -	bool (*lm_break)(struct file_lock *);
1: -	int (*lm_change)(struct file_lock *, int, struct list_head *);
1: -	void (*lm_setup)(struct file_lock *, void **);
1: -	bool (*lm_breaker_owns_lease)(struct file_lock *);
1: +  fl_owner_t (*lm_get_owner)(fl_owner_t);
1: +  void (*lm_put_owner)(fl_owner_t);
1: +  void (*lm_notify)(struct file_lock *);
1: +  int (*lm_grant)(struct file_lock *, int);
1: +  bool (*lm_break)(struct file_lock *);
1: +  int (*lm_change)(struct file_lock *, int, struct list_head *);
1: +  void (*lm_setup)(struct file_lock *, void **);
1: +  bool (*lm_breaker_owns_lease)(struct file_lock *);
1:  };
1:  
1:  struct fasync_struct {
1: -	rwlock_t fa_lock;
1: -	int magic;
1: -	int fa_fd;
1: -	struct fasync_struct *fa_next;
1: -	struct file *fa_file;
1: -	struct callback_head fa_rcu;
1: +  rwlock_t fa_lock;
1: +  int magic;
1: +  int fa_fd;
1: +  struct fasync_struct *fa_next;
1: +  struct file *fa_file;
1: +  struct callback_head fa_rcu;
1:  };
1:  
1:  enum {
1: -	SB_UNFROZEN = 0,
1: -	SB_FREEZE_WRITE = 1,
1: -	SB_FREEZE_PAGEFAULT = 2,
1: -	SB_FREEZE_FS = 3,
1: -	SB_FREEZE_COMPLETE = 4,
1: +  SB_UNFROZEN = 0,
1: +  SB_FREEZE_WRITE = 1,
1: +  SB_FREEZE_PAGEFAULT = 2,
1: +  SB_FREEZE_FS = 3,
1: +  SB_FREEZE_COMPLETE = 4,
1:  };
1:  
1:  struct kstatfs;
1:  
1:  struct super_operations {
1: -	struct inode * (*alloc_inode)(struct super_block *);
1: -	void (*destroy_inode)(struct inode *);
1: -	void (*free_inode)(struct inode *);
1: -	void (*dirty_inode)(struct inode *, int);
1: -	int (*write_inode)(struct inode *, struct writeback_control *);
1: -	int (*drop_inode)(struct inode *);
1: -	void (*evict_inode)(struct inode *);
1: -	void (*put_super)(struct super_block *);
1: -	int (*sync_fs)(struct super_block *, int);
1: -	int (*freeze_super)(struct super_block *);
1: -	int (*freeze_fs)(struct super_block *);
1: -	int (*thaw_super)(struct super_block *);
1: -	int (*unfreeze_fs)(struct super_block *);
1: -	int (*statfs)(struct dentry *, struct kstatfs *);
1: -	int (*remount_fs)(struct super_block *, int *, char *);
1: -	void (*umount_begin)(struct super_block *);
1: -	int (*show_options)(struct seq_file *, struct dentry *);
1: -	int (*show_devname)(struct seq_file *, struct dentry *);
1: -	int (*show_path)(struct seq_file *, struct dentry *);
1: -	int (*show_stats)(struct seq_file *, struct dentry *);
1: -	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
1: -	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
1: -	struct dquot ** (*get_dquots)(struct inode *);
1: -	int (*bdev_try_to_free_page)(struct super_block *, struct page *, gfp_t);
1: -	long int (*nr_cached_objects)(struct super_block *, struct shrink_control *);
1: -	long int (*free_cached_objects)(struct super_block *, struct shrink_control *);
1: +  struct inode *(*alloc_inode)(struct super_block *);
1: +  void (*destroy_inode)(struct inode *);
1: +  void (*free_inode)(struct inode *);
1: +  void (*dirty_inode)(struct inode *, int);
1: +  int (*write_inode)(struct inode *, struct writeback_control *);
1: +  int (*drop_inode)(struct inode *);
1: +  void (*evict_inode)(struct inode *);
1: +  void (*put_super)(struct super_block *);
1: +  int (*sync_fs)(struct super_block *, int);
1: +  int (*freeze_super)(struct super_block *);
1: +  int (*freeze_fs)(struct super_block *);
1: +  int (*thaw_super)(struct super_block *);
1: +  int (*unfreeze_fs)(struct super_block *);
1: +  int (*statfs)(struct dentry *, struct kstatfs *);
1: +  int (*remount_fs)(struct super_block *, int *, char *);
1: +  void (*umount_begin)(struct super_block *);
1: +  int (*show_options)(struct seq_file *, struct dentry *);
1: +  int (*show_devname)(struct seq_file *, struct dentry *);
1: +  int (*show_path)(struct seq_file *, struct dentry *);
1: +  int (*show_stats)(struct seq_file *, struct dentry *);
1: +  ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
1: +  ssize_t (*quota_write)(struct super_block *, int, const char *, size_t,
1: +                         loff_t);
1: +  struct dquot **(*get_dquots)(struct inode *);
1: +  int (*bdev_try_to_free_page)(struct super_block *, struct page *, gfp_t);
1: +  long int (*nr_cached_objects)(struct super_block *, struct shrink_control *);
1: +  long int (*free_cached_objects)(struct super_block *,
1: +                                  struct shrink_control *);
1:  };
1:  
1:  struct iomap;
1: @@ -3543,31 +3542,34 @@ struct iomap;
1:  struct fid;
1:  
1:  struct export_operations {
1: -	int (*encode_fh)(struct inode *, __u32 *, int *, struct inode *);
1: -	struct dentry * (*fh_to_dentry)(struct super_block *, struct fid *, int, int);
1: -	struct dentry * (*fh_to_parent)(struct super_block *, struct fid *, int, int);
1: -	int (*get_name)(struct dentry *, char *, struct dentry *);
1: -	struct dentry * (*get_parent)(struct dentry *);
1: -	int (*commit_metadata)(struct inode *);
1: -	int (*get_uuid)(struct super_block *, u8 *, u32 *, u64 *);
1: -	int (*map_blocks)(struct inode *, loff_t, u64, struct iomap *, bool, u32 *);
1: -	int (*commit_blocks)(struct inode *, struct iomap *, int, struct iattr *);
1: +  int (*encode_fh)(struct inode *, __u32 *, int *, struct inode *);
1: +  struct dentry *(*fh_to_dentry)(struct super_block *, struct fid *, int, int);
1: +  struct dentry *(*fh_to_parent)(struct super_block *, struct fid *, int, int);
1: +  int (*get_name)(struct dentry *, char *, struct dentry *);
1: +  struct dentry *(*get_parent)(struct dentry *);
1: +  int (*commit_metadata)(struct inode *);
1: +  int (*get_uuid)(struct super_block *, u8 *, u32 *, u64 *);
1: +  int (*map_blocks)(struct inode *, loff_t, u64, struct iomap *, bool, u32 *);
1: +  int (*commit_blocks)(struct inode *, struct iomap *, int, struct iattr *);
1:  };
1:  
1:  struct xattr_handler {
1: -	const char *name;
1: -	const char *prefix;
1: -	int flags;
1: -	bool (*list)(struct dentry *);
1: -	int (*get)(const struct xattr_handler *, struct dentry *, struct inode *, const char *, void *, size_t);
1: -	int (*set)(const struct xattr_handler *, struct dentry *, struct inode *, const char *, const void *, size_t, int);
1: +  const char *name;
1: +  const char *prefix;
1: +  int flags;
1: +  bool (*list)(struct dentry *);
1: +  int (*get)(const struct xattr_handler *, struct dentry *, struct inode *,
1: +             const char *, void *, size_t);
1: +  int (*set)(const struct xattr_handler *, struct dentry *, struct inode *,
1: +             const char *, const void *, size_t, int);
1:  };
1:  
1: -typedef int (*filldir_t)(struct dir_context *, const char *, int, loff_t, u64, unsigned int);
1: +typedef int (*filldir_t)(struct dir_context *, const char *, int, loff_t, u64,
1: +                         unsigned int);
1:  
1:  struct dir_context {
1: -	filldir_t actor;
1: -	loff_t pos;
1: +  filldir_t actor;
1: +  loff_t pos;
1:  };
1:  
1:  struct p_log;
1: @@ -3576,215 +3578,216 @@ struct fs_parameter;
1:  
1:  struct fs_parse_result;
1:  
1: -typedef int fs_param_type(struct p_log *, const struct fs_parameter_spec *, struct fs_parameter *, struct fs_parse_result *);
1: +typedef int fs_param_type(struct p_log *, const struct fs_parameter_spec *,
1: +                          struct fs_parameter *, struct fs_parse_result *);
1:  
1:  struct fs_parameter_spec {
1: -	const char *name;
1: -	fs_param_type *type;
1: -	u8 opt;
1: -	short unsigned int flags;
1: -	const void *data;
1: +  const char *name;
1: +  fs_param_type *type;
1: +  u8 opt;
1: +  short unsigned int flags;
1: +  const void *data;
1:  };
1:  
1:  enum compound_dtor_id {
1: -	NULL_COMPOUND_DTOR = 0,
1: -	COMPOUND_PAGE_DTOR = 1,
1: -	HUGETLB_PAGE_DTOR = 2,
1: -	TRANSHUGE_PAGE_DTOR = 3,
1: -	NR_COMPOUND_DTORS = 4,
1: +  NULL_COMPOUND_DTOR = 0,
1: +  COMPOUND_PAGE_DTOR = 1,
1: +  HUGETLB_PAGE_DTOR = 2,
1: +  TRANSHUGE_PAGE_DTOR = 3,
1: +  NR_COMPOUND_DTORS = 4,
1:  };
1:  
1:  enum vm_event_item {
1: -	PGPGIN = 0,
1: -	PGPGOUT = 1,
1: -	PSWPIN = 2,
1: -	PSWPOUT = 3,
1: -	PGALLOC_DMA = 4,
1: -	PGALLOC_DMA32 = 5,
1: -	PGALLOC_NORMAL = 6,
1: -	PGALLOC_MOVABLE = 7,
1: -	ALLOCSTALL_DMA = 8,
1: -	ALLOCSTALL_DMA32 = 9,
1: -	ALLOCSTALL_NORMAL = 10,
1: -	ALLOCSTALL_MOVABLE = 11,
1: -	PGSCAN_SKIP_DMA = 12,
1: -	PGSCAN_SKIP_DMA32 = 13,
1: -	PGSCAN_SKIP_NORMAL = 14,
1: -	PGSCAN_SKIP_MOVABLE = 15,
1: -	PGFREE = 16,
1: -	PGACTIVATE = 17,
1: -	PGDEACTIVATE = 18,
1: -	PGLAZYFREE = 19,
1: -	PGFAULT = 20,
1: -	PGMAJFAULT = 21,
1: -	PGLAZYFREED = 22,
1: -	PGREFILL = 23,
1: -	PGREUSE = 24,
1: -	PGSTEAL_KSWAPD = 25,
1: -	PGSTEAL_DIRECT = 26,
1: -	PGSCAN_KSWAPD = 27,
1: -	PGSCAN_DIRECT = 28,
1: -	PGSCAN_DIRECT_THROTTLE = 29,
1: -	PGSCAN_ANON = 30,
1: -	PGSCAN_FILE = 31,
1: -	PGSTEAL_ANON = 32,
1: -	PGSTEAL_FILE = 33,
1: -	PGSCAN_ZONE_RECLAIM_FAILED = 34,
1: -	PGINODESTEAL = 35,
1: -	SLABS_SCANNED = 36,
1: -	KSWAPD_INODESTEAL = 37,
1: -	KSWAPD_LOW_WMARK_HIT_QUICKLY = 38,
1: -	KSWAPD_HIGH_WMARK_HIT_QUICKLY = 39,
1: -	PAGEOUTRUN = 40,
1: -	PGROTATED = 41,
1: -	DROP_PAGECACHE = 42,
1: -	DROP_SLAB = 43,
1: -	OOM_KILL = 44,
1: -	NUMA_PTE_UPDATES = 45,
1: -	NUMA_HUGE_PTE_UPDATES = 46,
1: -	NUMA_HINT_FAULTS = 47,
1: -	NUMA_HINT_FAULTS_LOCAL = 48,
1: -	NUMA_PAGE_MIGRATE = 49,
1: -	PGMIGRATE_SUCCESS = 50,
1: -	PGMIGRATE_FAIL = 51,
1: -	THP_MIGRATION_SUCCESS = 52,
1: -	THP_MIGRATION_FAIL = 53,
1: -	THP_MIGRATION_SPLIT = 54,
1: -	COMPACTMIGRATE_SCANNED = 55,
1: -	COMPACTFREE_SCANNED = 56,
1: -	COMPACTISOLATED = 57,
1: -	COMPACTSTALL = 58,
1: -	COMPACTFAIL = 59,
1: -	COMPACTSUCCESS = 60,
1: -	KCOMPACTD_WAKE = 61,
1: -	KCOMPACTD_MIGRATE_SCANNED = 62,
1: -	KCOMPACTD_FREE_SCANNED = 63,
1: -	HTLB_BUDDY_PGALLOC = 64,
1: -	HTLB_BUDDY_PGALLOC_FAIL = 65,
1: -	UNEVICTABLE_PGCULLED = 66,
1: -	UNEVICTABLE_PGSCANNED = 67,
1: -	UNEVICTABLE_PGRESCUED = 68,
1: -	UNEVICTABLE_PGMLOCKED = 69,
1: -	UNEVICTABLE_PGMUNLOCKED = 70,
1: -	UNEVICTABLE_PGCLEARED = 71,
1: -	UNEVICTABLE_PGSTRANDED = 72,
1: -	THP_FAULT_ALLOC = 73,
1: -	THP_FAULT_FALLBACK = 74,
1: -	THP_FAULT_FALLBACK_CHARGE = 75,
1: -	THP_COLLAPSE_ALLOC = 76,
1: -	THP_COLLAPSE_ALLOC_FAILED = 77,
1: -	THP_FILE_ALLOC = 78,
1: -	THP_FILE_FALLBACK = 79,
1: -	THP_FILE_FALLBACK_CHARGE = 80,
1: -	THP_FILE_MAPPED = 81,
1: -	THP_SPLIT_PAGE = 82,
1: -	THP_SPLIT_PAGE_FAILED = 83,
1: -	THP_DEFERRED_SPLIT_PAGE = 84,
1: -	THP_SPLIT_PMD = 85,
1: -	THP_SPLIT_PUD = 86,
1: -	THP_ZERO_PAGE_ALLOC = 87,
1: -	THP_ZERO_PAGE_ALLOC_FAILED = 88,
1: -	THP_SWPOUT = 89,
1: -	THP_SWPOUT_FALLBACK = 90,
1: -	BALLOON_INFLATE = 91,
1: -	BALLOON_DEFLATE = 92,
1: -	BALLOON_MIGRATE = 93,
1: -	SWAP_RA = 94,
1: -	SWAP_RA_HIT = 95,
1: -	NR_VM_EVENT_ITEMS = 96,
1: +  PGPGIN = 0,
1: +  PGPGOUT = 1,
1: +  PSWPIN = 2,
1: +  PSWPOUT = 3,
1: +  PGALLOC_DMA = 4,
1: +  PGALLOC_DMA32 = 5,
1: +  PGALLOC_NORMAL = 6,
1: +  PGALLOC_MOVABLE = 7,
1: +  ALLOCSTALL_DMA = 8,
1: +  ALLOCSTALL_DMA32 = 9,
1: +  ALLOCSTALL_NORMAL = 10,
1: +  ALLOCSTALL_MOVABLE = 11,
1: +  PGSCAN_SKIP_DMA = 12,
1: +  PGSCAN_SKIP_DMA32 = 13,
1: +  PGSCAN_SKIP_NORMAL = 14,
1: +  PGSCAN_SKIP_MOVABLE = 15,
1: +  PGFREE = 16,
1: +  PGACTIVATE = 17,
1: +  PGDEACTIVATE = 18,
1: +  PGLAZYFREE = 19,
1: +  PGFAULT = 20,
1: +  PGMAJFAULT = 21,
1: +  PGLAZYFREED = 22,
1: +  PGREFILL = 23,
1: +  PGREUSE = 24,
1: +  PGSTEAL_KSWAPD = 25,
1: +  PGSTEAL_DIRECT = 26,
1: +  PGSCAN_KSWAPD = 27,
1: +  PGSCAN_DIRECT = 28,
1: +  PGSCAN_DIRECT_THROTTLE = 29,
1: +  PGSCAN_ANON = 30,
1: +  PGSCAN_FILE = 31,
1: +  PGSTEAL_ANON = 32,
1: +  PGSTEAL_FILE = 33,
1: +  PGSCAN_ZONE_RECLAIM_FAILED = 34,
1: +  PGINODESTEAL = 35,
1: +  SLABS_SCANNED = 36,
1: +  KSWAPD_INODESTEAL = 37,
1: +  KSWAPD_LOW_WMARK_HIT_QUICKLY = 38,
1: +  KSWAPD_HIGH_WMARK_HIT_QUICKLY = 39,
1: +  PAGEOUTRUN = 40,
1: +  PGROTATED = 41,
1: +  DROP_PAGECACHE = 42,
1: +  DROP_SLAB = 43,
1: +  OOM_KILL = 44,
1: +  NUMA_PTE_UPDATES = 45,
1: +  NUMA_HUGE_PTE_UPDATES = 46,
1: +  NUMA_HINT_FAULTS = 47,
1: +  NUMA_HINT_FAULTS_LOCAL = 48,
1: +  NUMA_PAGE_MIGRATE = 49,
1: +  PGMIGRATE_SUCCESS = 50,
1: +  PGMIGRATE_FAIL = 51,
1: +  THP_MIGRATION_SUCCESS = 52,
1: +  THP_MIGRATION_FAIL = 53,
1: +  THP_MIGRATION_SPLIT = 54,
1: +  COMPACTMIGRATE_SCANNED = 55,
1: +  COMPACTFREE_SCANNED = 56,
1: +  COMPACTISOLATED = 57,
1: +  COMPACTSTALL = 58,
1: +  COMPACTFAIL = 59,
1: +  COMPACTSUCCESS = 60,
1: +  KCOMPACTD_WAKE = 61,
1: +  KCOMPACTD_MIGRATE_SCANNED = 62,
1: +  KCOMPACTD_FREE_SCANNED = 63,
1: +  HTLB_BUDDY_PGALLOC = 64,
1: +  HTLB_BUDDY_PGALLOC_FAIL = 65,
1: +  UNEVICTABLE_PGCULLED = 66,
1: +  UNEVICTABLE_PGSCANNED = 67,
1: +  UNEVICTABLE_PGRESCUED = 68,
1: +  UNEVICTABLE_PGMLOCKED = 69,
1: +  UNEVICTABLE_PGMUNLOCKED = 70,
1: +  UNEVICTABLE_PGCLEARED = 71,
1: +  UNEVICTABLE_PGSTRANDED = 72,
1: +  THP_FAULT_ALLOC = 73,
1: +  THP_FAULT_FALLBACK = 74,
1: +  THP_FAULT_FALLBACK_CHARGE = 75,
1: +  THP_COLLAPSE_ALLOC = 76,
1: +  THP_COLLAPSE_ALLOC_FAILED = 77,
1: +  THP_FILE_ALLOC = 78,
1: +  THP_FILE_FALLBACK = 79,
1: +  THP_FILE_FALLBACK_CHARGE = 80,
1: +  THP_FILE_MAPPED = 81,
1: +  THP_SPLIT_PAGE = 82,
1: +  THP_SPLIT_PAGE_FAILED = 83,
1: +  THP_DEFERRED_SPLIT_PAGE = 84,
1: +  THP_SPLIT_PMD = 85,
1: +  THP_SPLIT_PUD = 86,
1: +  THP_ZERO_PAGE_ALLOC = 87,
1: +  THP_ZERO_PAGE_ALLOC_FAILED = 88,
1: +  THP_SWPOUT = 89,
1: +  THP_SWPOUT_FALLBACK = 90,
1: +  BALLOON_INFLATE = 91,
1: +  BALLOON_DEFLATE = 92,
1: +  BALLOON_MIGRATE = 93,
1: +  SWAP_RA = 94,
1: +  SWAP_RA_HIT = 95,
1: +  NR_VM_EVENT_ITEMS = 96,
1:  };
1:  
1:  struct tlb_context {
1: -	u64 ctx_id;
1: -	u64 tlb_gen;
1: +  u64 ctx_id;
1: +  u64 tlb_gen;
1:  };
1:  
1:  struct tlb_state {
1: -	struct mm_struct *loaded_mm;
1: -	union {
1: -		struct mm_struct *last_user_mm;
1: -		long unsigned int last_user_mm_ibpb;
1: -	};
1: -	u16 loaded_mm_asid;
1: -	u16 next_asid;
1: -	bool is_lazy;
1: -	bool invalidate_other;
1: -	short unsigned int user_pcid_flush_mask;
1: -	long unsigned int cr4;
1: -	struct tlb_context ctxs[6];
1: +  struct mm_struct *loaded_mm;
1: +  union {
1: +    struct mm_struct *last_user_mm;
1: +    long unsigned int last_user_mm_ibpb;
1: +  };
1: +  u16 loaded_mm_asid;
1: +  u16 next_asid;
1: +  bool is_lazy;
1: +  bool invalidate_other;
1: +  short unsigned int user_pcid_flush_mask;
1: +  long unsigned int cr4;
1: +  struct tlb_context ctxs[6];
1:  };
1:  
1:  struct boot_params_to_save {
1: -	unsigned int start;
1: -	unsigned int len;
1: +  unsigned int start;
1: +  unsigned int len;
1:  };
1:  
1:  enum cpu_idle_type {
1: -	CPU_IDLE = 0,
1: -	CPU_NOT_IDLE = 1,
1: -	CPU_NEWLY_IDLE = 2,
1: -	CPU_MAX_IDLE_TYPES = 3,
1: +  CPU_IDLE = 0,
1: +  CPU_NOT_IDLE = 1,
1: +  CPU_NEWLY_IDLE = 2,
1: +  CPU_MAX_IDLE_TYPES = 3,
1:  };
1:  
1:  enum {
1: -	__SD_BALANCE_NEWIDLE = 0,
1: -	__SD_BALANCE_EXEC = 1,
1: -	__SD_BALANCE_FORK = 2,
1: -	__SD_BALANCE_WAKE = 3,
1: -	__SD_WAKE_AFFINE = 4,
1: -	__SD_ASYM_CPUCAPACITY = 5,
1: -	__SD_SHARE_CPUCAPACITY = 6,
1: -	__SD_SHARE_PKG_RESOURCES = 7,
1: -	__SD_SERIALIZE = 8,
1: -	__SD_ASYM_PACKING = 9,
1: -	__SD_PREFER_SIBLING = 10,
1: -	__SD_OVERLAP = 11,
1: -	__SD_NUMA = 12,
1: -	__SD_FLAG_CNT = 13,
1: +  __SD_BALANCE_NEWIDLE = 0,
1: +  __SD_BALANCE_EXEC = 1,
1: +  __SD_BALANCE_FORK = 2,
1: +  __SD_BALANCE_WAKE = 3,
1: +  __SD_WAKE_AFFINE = 4,
1: +  __SD_ASYM_CPUCAPACITY = 5,
1: +  __SD_SHARE_CPUCAPACITY = 6,
1: +  __SD_SHARE_PKG_RESOURCES = 7,
1: +  __SD_SERIALIZE = 8,
1: +  __SD_ASYM_PACKING = 9,
1: +  __SD_PREFER_SIBLING = 10,
1: +  __SD_OVERLAP = 11,
1: +  __SD_NUMA = 12,
1: +  __SD_FLAG_CNT = 13,
1:  };
1:  
1:  struct x86_legacy_devices {
1: -	int pnpbios;
1: +  int pnpbios;
1:  };
1:  
1:  enum x86_legacy_i8042_state {
1: -	X86_LEGACY_I8042_PLATFORM_ABSENT = 0,
1: -	X86_LEGACY_I8042_FIRMWARE_ABSENT = 1,
1: -	X86_LEGACY_I8042_EXPECTED_PRESENT = 2,
1: +  X86_LEGACY_I8042_PLATFORM_ABSENT = 0,
1: +  X86_LEGACY_I8042_FIRMWARE_ABSENT = 1,
1: +  X86_LEGACY_I8042_EXPECTED_PRESENT = 2,
1:  };
1:  
1:  struct x86_legacy_features {
1: -	enum x86_legacy_i8042_state i8042;
1: -	int rtc;
1: -	int warm_reset;
1: -	int no_vga;
1: -	int reserve_bios_regions;
1: -	struct x86_legacy_devices devices;
1: +  enum x86_legacy_i8042_state i8042;
1: +  int rtc;
1: +  int warm_reset;
1: +  int no_vga;
1: +  int reserve_bios_regions;
1: +  struct x86_legacy_devices devices;
1:  };
1:  
1:  struct ghcb;
1:  
1:  struct x86_hyper_runtime {
1: -	void (*pin_vcpu)(int);
1: -	void (*sev_es_hcall_prepare)(struct ghcb *, struct pt_regs *);
1: -	bool (*sev_es_hcall_finish)(struct ghcb *, struct pt_regs *);
1: +  void (*pin_vcpu)(int);
1: +  void (*sev_es_hcall_prepare)(struct ghcb *, struct pt_regs *);
1: +  bool (*sev_es_hcall_finish)(struct ghcb *, struct pt_regs *);
1:  };
1:  
1:  struct x86_platform_ops {
1: -	long unsigned int (*calibrate_cpu)();
1: -	long unsigned int (*calibrate_tsc)();
1: -	void (*get_wallclock)(struct timespec64 *);
1: -	int (*set_wallclock)(const struct timespec64 *);
1: -	void (*iommu_shutdown)();
1: -	bool (*is_untracked_pat_range)(u64, u64);
1: -	void (*nmi_init)();
1: -	unsigned char (*get_nmi_reason)();
1: -	void (*save_sched_clock_state)();
1: -	void (*restore_sched_clock_state)();
1: -	void (*apic_post_init)();
1: -	struct x86_legacy_features legacy;
1: -	void (*set_legacy_features)();
1: -	struct x86_hyper_runtime hyper;
1: +  long unsigned int (*calibrate_cpu)();
1: +  long unsigned int (*calibrate_tsc)();
1: +  void (*get_wallclock)(struct timespec64 *);
1: +  int (*set_wallclock)(const struct timespec64 *);
1: +  void (*iommu_shutdown)();
1: +  bool (*is_untracked_pat_range)(u64, u64);
1: +  void (*nmi_init)();
1: +  unsigned char (*get_nmi_reason)();
1: +  void (*save_sched_clock_state)();
1: +  void (*restore_sched_clock_state)();
1: +  void (*apic_post_init)();
1: +  struct x86_legacy_features legacy;
1: +  void (*set_legacy_features)();
1: +  struct x86_hyper_runtime hyper;
1:  };
1:  
1:  typedef signed char __s8;
1: @@ -3798,9 +3801,9 @@ typedef __s16 s16;
1:  typedef long unsigned int irq_hw_number_t;
1:  
1:  struct kernel_symbol {
1: -	int value_offset;
1: -	int name_offset;
1: -	int namespace_offset;
1: +  int value_offset;
1: +  int name_offset;
1: +  int namespace_offset;
1:  };
1:  
1:  typedef int (*initcall_t)();
1: @@ -3808,70 +3811,70 @@ typedef int (*initcall_t)();
1:  typedef int initcall_entry_t;
1:  
1:  struct obs_kernel_param {
1: -	const char *str;
1: -	int (*setup_func)(char *);
1: -	int early;
1: +  const char *str;
1: +  int (*setup_func)(char *);
1: +  int early;
1:  };
1:  
1:  struct lockdep_map {};
1:  
1:  enum system_states {
1: -	SYSTEM_BOOTING = 0,
1: -	SYSTEM_SCHEDULING = 1,
1: -	SYSTEM_RUNNING = 2,
1: -	SYSTEM_HALT = 3,
1: -	SYSTEM_POWER_OFF = 4,
1: -	SYSTEM_RESTART = 5,
1: -	SYSTEM_SUSPEND = 6,
1: +  SYSTEM_BOOTING = 0,
1: +  SYSTEM_SCHEDULING = 1,
1: +  SYSTEM_RUNNING = 2,
1: +  SYSTEM_HALT = 3,
1: +  SYSTEM_POWER_OFF = 4,
1: +  SYSTEM_RESTART = 5,
1: +  SYSTEM_SUSPEND = 6,
1:  };
1:  
1:  struct jump_entry {
1: -	s32 code;
1: -	s32 target;
1: -	long int key;
1: +  s32 code;
1: +  s32 target;
1: +  long int key;
1:  };
1:  
1:  struct static_key_mod;
1:  
1:  struct static_key {
1: -	atomic_t enabled;
1: -	union {
1: -		long unsigned int type;
1: -		struct jump_entry *entries;
1: -		struct static_key_mod *next;
1: -	};
1: +  atomic_t enabled;
1: +  union {
1: +    long unsigned int type;
1: +    struct jump_entry *entries;
1: +    struct static_key_mod *next;
1: +  };
1:  };
1:  
1:  struct static_key_false {
1: -	struct static_key key;
1: +  struct static_key key;
1:  };
1:  
1:  struct bug_entry {
1: -	int bug_addr_disp;
1: -	int file_disp;
1: -	short unsigned int line;
1: -	short unsigned int flags;
1: +  int bug_addr_disp;
1: +  int file_disp;
1: +  short unsigned int line;
1: +  short unsigned int flags;
1:  };
1:  
1:  typedef struct cpumask cpumask_var_t[1];
1:  
1:  struct tracepoint_func {
1: -	void *func;
1: -	void *data;
1: -	int prio;
1: +  void *func;
1: +  void *data;
1: +  int prio;
1:  };
1:  
1:  struct static_call_key;
1:  
1:  struct tracepoint {
1: -	const char *name;
1: -	struct static_key key;
1: -	struct static_call_key *static_call_key;
1: -	void *static_call_tramp;
1: -	void *iterator;
1: -	int (*regfunc)();
1: -	void (*unregfunc)();
1: -	struct tracepoint_func *funcs;
1: +  const char *name;
1: +  struct static_key key;
1: +  struct static_call_key *static_call_key;
1: +  void *static_call_tramp;
1: +  void *iterator;
1: +  int (*regfunc)();
1: +  void (*unregfunc)();
1: +  struct tracepoint_func *funcs;
1:  };
1:  
1:  struct static_call_mod;
1: @@ -3879,247 +3882,246 @@ struct static_call_mod;
1:  struct static_call_site;
1:  
1:  struct static_call_key {
1: -	void *func;
1: -	union {
1: -		long unsigned int type;
1: -		struct static_call_mod *mods;
1: -		struct static_call_site *sites;
1: -	};
1: +  void *func;
1: +  union {
1: +    long unsigned int type;
1: +    struct static_call_mod *mods;
1: +    struct static_call_site *sites;
1: +  };
1:  };
1:  
1:  typedef const int tracepoint_ptr_t;
1:  
1:  struct bpf_raw_event_map {
1: -	struct tracepoint *tp;
1: -	void *bpf_func;
1: -	u32 num_args;
1: -	u32 writable_size;
1: -	long: 64;
1: +  struct tracepoint *tp;
1: +  void *bpf_func;
1: +  u32 num_args;
1: +  u32 writable_size;
1: +  long : 64;
1:  };
1:  
1:  struct orc_entry {
1: -	s16 sp_offset;
1: -	s16 bp_offset;
1: -	unsigned int sp_reg: 4;
1: -	unsigned int bp_reg: 4;
1: -	unsigned int type: 2;
1: -	unsigned int end: 1;
1: +  s16 sp_offset;
1: +  s16 bp_offset;
1: +  unsigned int sp_reg : 4;
1: +  unsigned int bp_reg : 4;
1: +  unsigned int type : 2;
1: +  unsigned int end : 1;
1:  } __attribute__((packed));
1:  
1:  struct seq_operations {
1: -	void * (*start)(struct seq_file *, loff_t *);
1: -	void (*stop)(struct seq_file *, void *);
1: -	void * (*next)(struct seq_file *, void *, loff_t *);
1: -	int (*show)(struct seq_file *, void *);
1: +  void *(*start)(struct seq_file *, loff_t *);
1: +  void (*stop)(struct seq_file *, void *);
1: +  void *(*next)(struct seq_file *, void *, loff_t *);
1: +  int (*show)(struct seq_file *, void *);
1:  };
1:  
1:  enum perf_event_state {
1: -	PERF_EVENT_STATE_DEAD = 4294967292,
1: -	PERF_EVENT_STATE_EXIT = 4294967293,
1: -	PERF_EVENT_STATE_ERROR = 4294967294,
1: -	PERF_EVENT_STATE_OFF = 4294967295,
1: -	PERF_EVENT_STATE_INACTIVE = 0,
1: -	PERF_EVENT_STATE_ACTIVE = 1,
1: +  PERF_EVENT_STATE_DEAD = 4294967292,
1: +  PERF_EVENT_STATE_EXIT = 4294967293,
1: +  PERF_EVENT_STATE_ERROR = 4294967294,
1: +  PERF_EVENT_STATE_OFF = 4294967295,
1: +  PERF_EVENT_STATE_INACTIVE = 0,
1: +  PERF_EVENT_STATE_ACTIVE = 1,
1:  };
1:  
1: -typedef struct {
1: -	atomic_long_t a;
1: -} local_t;
1: +typedef struct { atomic_long_t a; } local_t;
1:  
1: -typedef struct {
1: -	local_t a;
1: -} local64_t;
1: +typedef struct { local_t a; } local64_t;
1:  
1:  struct perf_event_attr {
1: -	__u32 type;
1: -	__u32 size;
1: -	__u64 config;
1: -	union {
1: -		__u64 sample_period;
1: -		__u64 sample_freq;
1: -	};
1: -	__u64 sample_type;
1: -	__u64 read_format;
1: -	__u64 disabled: 1;
1: -	__u64 inherit: 1;
1: -	__u64 pinned: 1;
1: -	__u64 exclusive: 1;
1: -	__u64 exclude_user: 1;
1: -	__u64 exclude_kernel: 1;
1: -	__u64 exclude_hv: 1;
1: -	__u64 exclude_idle: 1;
1: -	__u64 mmap: 1;
1: -	__u64 comm: 1;
1: -	__u64 freq: 1;
1: -	__u64 inherit_stat: 1;
1: -	__u64 enable_on_exec: 1;
1: -	__u64 task: 1;
1: -	__u64 watermark: 1;
1: -	__u64 precise_ip: 2;
1: -	__u64 mmap_data: 1;
1: -	__u64 sample_id_all: 1;
1: -	__u64 exclude_host: 1;
1: -	__u64 exclude_guest: 1;
1: -	__u64 exclude_callchain_kernel: 1;
1: -	__u64 exclude_callchain_user: 1;
1: -	__u64 mmap2: 1;
1: -	__u64 comm_exec: 1;
1: -	__u64 use_clockid: 1;
1: -	__u64 context_switch: 1;
1: -	__u64 write_backward: 1;
1: -	__u64 namespaces: 1;
1: -	__u64 ksymbol: 1;
1: -	__u64 bpf_event: 1;
1: -	__u64 aux_output: 1;
1: -	__u64 cgroup: 1;
1: -	__u64 text_poke: 1;
1: -	__u64 __reserved_1: 30;
1: -	union {
1: -		__u32 wakeup_events;
1: -		__u32 wakeup_watermark;
1: -	};
1: -	__u32 bp_type;
1: -	union {
1: -		__u64 bp_addr;
1: -		__u64 kprobe_func;
1: -		__u64 uprobe_path;
1: -		__u64 config1;
1: -	};
1: -	union {
1: -		__u64 bp_len;
1: -		__u64 kprobe_addr;
1: -		__u64 probe_offset;
1: -		__u64 config2;
1: -	};
1: -	__u64 branch_sample_type;
1: -	__u64 sample_regs_user;
1: -	__u32 sample_stack_user;
1: -	__s32 clockid;
1: -	__u64 sample_regs_intr;
1: -	__u32 aux_watermark;
1: -	__u16 sample_max_stack;
1: -	__u16 __reserved_2;
1: -	__u32 aux_sample_size;
1: -	__u32 __reserved_3;
1: +  __u32 type;
1: +  __u32 size;
1: +  __u64 config;
1: +  union {
1: +    __u64 sample_period;
1: +    __u64 sample_freq;
1: +  };
1: +  __u64 sample_type;
1: +  __u64 read_format;
1: +  __u64 disabled : 1;
1: +  __u64 inherit : 1;
1: +  __u64 pinned : 1;
1: +  __u64 exclusive : 1;
1: +  __u64 exclude_user : 1;
1: +  __u64 exclude_kernel : 1;
1: +  __u64 exclude_hv : 1;
1: +  __u64 exclude_idle : 1;
1: +  __u64 mmap : 1;
1: +  __u64 comm : 1;
1: +  __u64 freq : 1;
1: +  __u64 inherit_stat : 1;
1: +  __u64 enable_on_exec : 1;
1: +  __u64 task : 1;
1: +  __u64 watermark : 1;
1: +  __u64 precise_ip : 2;
1: +  __u64 mmap_data : 1;
1: +  __u64 sample_id_all : 1;
1: +  __u64 exclude_host : 1;
1: +  __u64 exclude_guest : 1;
1: +  __u64 exclude_callchain_kernel : 1;
1: +  __u64 exclude_callchain_user : 1;
1: +  __u64 mmap2 : 1;
1: +  __u64 comm_exec : 1;
1: +  __u64 use_clockid : 1;
1: +  __u64 context_switch : 1;
1: +  __u64 write_backward : 1;
1: +  __u64 namespaces : 1;
1: +  __u64 ksymbol : 1;
1: +  __u64 bpf_event : 1;
1: +  __u64 aux_output : 1;
1: +  __u64 cgroup : 1;
1: +  __u64 text_poke : 1;
1: +  __u64 __reserved_1 : 30;
1: +  union {
1: +    __u32 wakeup_events;
1: +    __u32 wakeup_watermark;
1: +  };
1: +  __u32 bp_type;
1: +  union {
1: +    __u64 bp_addr;
1: +    __u64 kprobe_func;
1: +    __u64 uprobe_path;
1: +    __u64 config1;
1: +  };
1: +  union {
1: +    __u64 bp_len;
1: +    __u64 kprobe_addr;
1: +    __u64 probe_offset;
1: +    __u64 config2;
1: +  };
1: +  __u64 branch_sample_type;
1: +  __u64 sample_regs_user;
1: +  __u32 sample_stack_user;
1: +  __s32 clockid;
1: +  __u64 sample_regs_intr;
1: +  __u32 aux_watermark;
1: +  __u16 sample_max_stack;
1: +  __u16 __reserved_2;
1: +  __u32 aux_sample_size;
1: +  __u32 __reserved_3;
1:  };
1:  
1:  struct hw_perf_event_extra {
1: -	u64 config;
1: -	unsigned int reg;
1: -	int alloc;
1: -	int idx;
1: +  u64 config;
1: +  unsigned int reg;
1: +  int alloc;
1: +  int idx;
1:  };
1:  
1:  struct arch_hw_breakpoint {
1: -	long unsigned int address;
1: -	long unsigned int mask;
1: -	u8 len;
1: -	u8 type;
1: +  long unsigned int address;
1: +  long unsigned int mask;
1: +  u8 len;
1: +  u8 type;
1:  };
1:  
1:  struct hw_perf_event {
1: -	union {
1: -		struct {
1: -			u64 config;
1: -			u64 last_tag;
1: -			long unsigned int config_base;
1: -			long unsigned int event_base;
1: -			int event_base_rdpmc;
1: -			int idx;
1: -			int last_cpu;
1: -			int flags;
1: -			struct hw_perf_event_extra extra_reg;
1: -			struct hw_perf_event_extra branch_reg;
1: -		};
1: -		struct {
1: -			struct hrtimer hrtimer;
1: -		};
1: -		struct {
1: -			struct list_head tp_list;
1: -		};
1: -		struct {
1: -			u64 pwr_acc;
1: -			u64 ptsc;
1: -		};
1: -		struct {
1: -			struct arch_hw_breakpoint info;
1: -			struct list_head bp_list;
1: -		};
1: -		struct {
1: -			u8 iommu_bank;
1: -			u8 iommu_cntr;
1: -			u16 padding;
1: -			u64 conf;
1: -			u64 conf1;
1: -		};
1: -	};
1: -	struct task_struct *target;
1: -	void *addr_filters;
1: -	long unsigned int addr_filters_gen;
1: -	int state;
1: -	local64_t prev_count;
1: -	u64 sample_period;
1: -	union {
1: -		struct {
1: -			u64 last_period;
1: -			local64_t period_left;
1: -		};
1: -		struct {
1: -			u64 saved_metric;
1: -			u64 saved_slots;
1: -		};
1: -	};
1: -	u64 interrupts_seq;
1: -	u64 interrupts;
1: -	u64 freq_time_stamp;
1: -	u64 freq_count_stamp;
1: +  union {
1: +    struct {
1: +      u64 config;
1: +      u64 last_tag;
1: +      long unsigned int config_base;
1: +      long unsigned int event_base;
1: +      int event_base_rdpmc;
1: +      int idx;
1: +      int last_cpu;
1: +      int flags;
1: +      struct hw_perf_event_extra extra_reg;
1: +      struct hw_perf_event_extra branch_reg;
1: +    };
1: +    struct {
1: +      struct hrtimer hrtimer;
1: +    };
1: +    struct {
1: +      struct list_head tp_list;
1: +    };
1: +    struct {
1: +      u64 pwr_acc;
1: +      u64 ptsc;
1: +    };
1: +    struct {
1: +      struct arch_hw_breakpoint info;
1: +      struct list_head bp_list;
1: +    };
1: +    struct {
1: +      u8 iommu_bank;
1: +      u8 iommu_cntr;
1: +      u16 padding;
1: +      u64 conf;
1: +      u64 conf1;
1: +    };
1: +  };
1: +  struct task_struct *target;
1: +  void *addr_filters;
1: +  long unsigned int addr_filters_gen;
1: +  int state;
1: +  local64_t prev_count;
1: +  u64 sample_period;
1: +  union {
1: +    struct {
1: +      u64 last_period;
1: +      local64_t period_left;
1: +    };
1: +    struct {
1: +      u64 saved_metric;
1: +      u64 saved_slots;
1: +    };
1: +  };
1: +  u64 interrupts_seq;
1: +  u64 interrupts;
1: +  u64 freq_time_stamp;
1: +  u64 freq_count_stamp;
1:  };
1:  
1:  struct irq_work {
1: -	union {
1: -		struct __call_single_node node;
1: -		struct {
1: -			struct llist_node llnode;
1: -			atomic_t flags;
1: -		};
1: -	};
1: -	void (*func)(struct irq_work *);
1: +  union {
1: +    struct __call_single_node node;
1: +    struct {
1: +      struct llist_node llnode;
1: +      atomic_t flags;
1: +    };
1: +  };
1: +  void (*func)(struct irq_work *);
1:  };
1:  
1:  struct perf_addr_filters_head {
1: -	struct list_head list;
1: -	raw_spinlock_t lock;
1: -	unsigned int nr_file_filters;
1: +  struct list_head list;
1: +  raw_spinlock_t lock;
1: +  unsigned int nr_file_filters;
1:  };
1:  
1:  struct perf_sample_data;
1:  
1: -typedef void (*perf_overflow_handler_t)(struct perf_event *, struct perf_sample_data *, struct pt_regs *);
1: +typedef void (*perf_overflow_handler_t)(struct perf_event *,
1: +                                        struct perf_sample_data *,
1: +                                        struct pt_regs *);
1:  
1:  struct ftrace_ops;
1:  
1: -typedef void (*ftrace_func_t)(long unsigned int, long unsigned int, struct ftrace_ops *, struct pt_regs *);
1: +typedef void (*ftrace_func_t)(long unsigned int, long unsigned int,
1: +                              struct ftrace_ops *, struct pt_regs *);
1:  
1:  struct ftrace_hash;
1:  
1:  struct ftrace_ops_hash {
1: -	struct ftrace_hash *notrace_hash;
1: -	struct ftrace_hash *filter_hash;
1: -	struct mutex regex_lock;
1: +  struct ftrace_hash *notrace_hash;
1: +  struct ftrace_hash *filter_hash;
1: +  struct mutex regex_lock;
1:  };
1:  
1:  struct ftrace_ops {
1: -	ftrace_func_t func;
1: -	struct ftrace_ops *next;
1: -	long unsigned int flags;
1: -	void *private;
1: -	ftrace_func_t saved_func;
1: -	struct ftrace_ops_hash local_hash;
1: -	struct ftrace_ops_hash *func_hash;
1: -	struct ftrace_ops_hash old_hash;
1: -	long unsigned int trampoline;
1: -	long unsigned int trampoline_size;
1: -	struct list_head list;
1: +  ftrace_func_t func;
1: +  struct ftrace_ops *next;
1: +  long unsigned int flags;
1: +  void *private;
1: +  ftrace_func_t saved_func;
1: +  struct ftrace_ops_hash local_hash;
1: +  struct ftrace_ops_hash *func_hash;
1: +  struct ftrace_ops_hash old_hash;
1: +  long unsigned int trampoline;
1: +  long unsigned int trampoline_size;
1: +  struct list_head list;
1:  };
1:  
1:  struct pmu;
1: @@ -4137,101 +4139,101 @@ struct event_filter;
1:  struct perf_cgroup;
1:  
1:  struct perf_event {
1: -	struct list_head event_entry;
1: -	struct list_head sibling_list;
1: -	struct list_head active_list;
1: -	struct rb_node group_node;
1: -	u64 group_index;
1: -	struct list_head migrate_entry;
1: -	struct hlist_node hlist_entry;
1: -	struct list_head active_entry;
1: -	int nr_siblings;
1: -	int event_caps;
1: -	int group_caps;
1: -	struct perf_event *group_leader;
1: -	struct pmu *pmu;
1: -	void *pmu_private;
1: -	enum perf_event_state state;
1: -	unsigned int attach_state;
1: -	local64_t count;
1: -	atomic64_t child_count;
1: -	u64 total_time_enabled;
1: -	u64 total_time_running;
1: -	u64 tstamp;
1: -	u64 shadow_ctx_time;
1: -	struct perf_event_attr attr;
1: -	u16 header_size;
1: -	u16 id_header_size;
1: -	u16 read_size;
1: -	struct hw_perf_event hw;
1: -	struct perf_event_context *ctx;
1: -	atomic_long_t refcount;
1: -	atomic64_t child_total_time_enabled;
1: -	atomic64_t child_total_time_running;
1: -	struct mutex child_mutex;
1: -	struct list_head child_list;
1: -	struct perf_event *parent;
1: -	int oncpu;
1: -	int cpu;
1: -	struct list_head owner_entry;
1: -	struct task_struct *owner;
1: -	struct mutex mmap_mutex;
1: -	atomic_t mmap_count;
1: -	struct perf_buffer *rb;
1: -	struct list_head rb_entry;
1: -	long unsigned int rcu_batches;
1: -	int rcu_pending;
1: -	wait_queue_head_t waitq;
1: -	struct fasync_struct *fasync;
1: -	int pending_wakeup;
1: -	int pending_kill;
1: -	int pending_disable;
1: -	struct irq_work pending;
1: -	atomic_t event_limit;
1: -	struct perf_addr_filters_head addr_filters;
1: -	struct perf_addr_filter_range *addr_filter_ranges;
1: -	long unsigned int addr_filters_gen;
1: -	struct perf_event *aux_event;
1: -	void (*destroy)(struct perf_event *);
1: -	struct callback_head callback_head;
1: -	struct pid_namespace *ns;
1: -	u64 id;
1: -	u64 (*clock)();
1: -	perf_overflow_handler_t overflow_handler;
1: -	void *overflow_handler_context;
1: -	perf_overflow_handler_t orig_overflow_handler;
1: -	struct bpf_prog *prog;
1: -	struct trace_event_call *tp_event;
1: -	struct event_filter *filter;
1: -	struct ftrace_ops ftrace_ops;
1: -	struct perf_cgroup *cgrp;
1: -	void *security;
1: -	struct list_head sb_list;
1: +  struct list_head event_entry;
1: +  struct list_head sibling_list;
1: +  struct list_head active_list;
1: +  struct rb_node group_node;
1: +  u64 group_index;
1: +  struct list_head migrate_entry;
1: +  struct hlist_node hlist_entry;
1: +  struct list_head active_entry;
1: +  int nr_siblings;
1: +  int event_caps;
1: +  int group_caps;
1: +  struct perf_event *group_leader;
1: +  struct pmu *pmu;
1: +  void *pmu_private;
1: +  enum perf_event_state state;
1: +  unsigned int attach_state;
1: +  local64_t count;
1: +  atomic64_t child_count;
1: +  u64 total_time_enabled;
1: +  u64 total_time_running;
1: +  u64 tstamp;
1: +  u64 shadow_ctx_time;
1: +  struct perf_event_attr attr;
1: +  u16 header_size;
1: +  u16 id_header_size;
1: +  u16 read_size;
1: +  struct hw_perf_event hw;
1: +  struct perf_event_context *ctx;
1: +  atomic_long_t refcount;
1: +  atomic64_t child_total_time_enabled;
1: +  atomic64_t child_total_time_running;
1: +  struct mutex child_mutex;
1: +  struct list_head child_list;
1: +  struct perf_event *parent;
1: +  int oncpu;
1: +  int cpu;
1: +  struct list_head owner_entry;
1: +  struct task_struct *owner;
1: +  struct mutex mmap_mutex;
1: +  atomic_t mmap_count;
1: +  struct perf_buffer *rb;
1: +  struct list_head rb_entry;
1: +  long unsigned int rcu_batches;
1: +  int rcu_pending;
1: +  wait_queue_head_t waitq;
1: +  struct fasync_struct *fasync;
1: +  int pending_wakeup;
1: +  int pending_kill;
1: +  int pending_disable;
1: +  struct irq_work pending;
1: +  atomic_t event_limit;
1: +  struct perf_addr_filters_head addr_filters;
1: +  struct perf_addr_filter_range *addr_filter_ranges;
1: +  long unsigned int addr_filters_gen;
1: +  struct perf_event *aux_event;
1: +  void (*destroy)(struct perf_event *);
1: +  struct callback_head callback_head;
1: +  struct pid_namespace *ns;
1: +  u64 id;
1: +  u64 (*clock)();
1: +  perf_overflow_handler_t overflow_handler;
1: +  void *overflow_handler_context;
1: +  perf_overflow_handler_t orig_overflow_handler;
1: +  struct bpf_prog *prog;
1: +  struct trace_event_call *tp_event;
1: +  struct event_filter *filter;
1: +  struct ftrace_ops ftrace_ops;
1: +  struct perf_cgroup *cgrp;
1: +  void *security;
1: +  struct list_head sb_list;
1:  };
1:  
1:  struct uid_gid_extent {
1: -	u32 first;
1: -	u32 lower_first;
1: -	u32 count;
1: +  u32 first;
1: +  u32 lower_first;
1: +  u32 count;
1:  };
1:  
1:  struct uid_gid_map {
1: -	u32 nr_extents;
1: -	union {
1: -		struct uid_gid_extent extent[5];
1: -		struct {
1: -			struct uid_gid_extent *forward;
1: -			struct uid_gid_extent *reverse;
1: -		};
1: -	};
1: +  u32 nr_extents;
1: +  union {
1: +    struct uid_gid_extent extent[5];
1: +    struct {
1: +      struct uid_gid_extent *forward;
1: +      struct uid_gid_extent *reverse;
1: +    };
1: +  };
1:  };
1:  
1:  struct proc_ns_operations;
1:  
1:  struct ns_common {
1: -	atomic_long_t stashed;
1: -	const struct proc_ns_operations *ops;
1: -	unsigned int inum;
1: +  atomic_long_t stashed;
1: +  const struct proc_ns_operations *ops;
1: +  unsigned int inum;
1:  };
1:  
1:  struct ctl_table;
1: @@ -4245,134 +4247,135 @@ struct ctl_dir;
1:  struct ctl_node;
1:  
1:  struct ctl_table_header {
1: -	union {
1: -		struct {
1: -			struct ctl_table *ctl_table;
1: -			int used;
1: -			int count;
1: -			int nreg;
1: -		};
1: -		struct callback_head rcu;
1: -	};
1: -	struct completion *unregistering;
1: -	struct ctl_table *ctl_table_arg;
1: -	struct ctl_table_root *root;
1: -	struct ctl_table_set *set;
1: -	struct ctl_dir *parent;
1: -	struct ctl_node *node;
1: -	struct hlist_head inodes;
1: +  union {
1: +    struct {
1: +      struct ctl_table *ctl_table;
1: +      int used;
1: +      int count;
1: +      int nreg;
1: +    };
1: +    struct callback_head rcu;
1: +  };
1: +  struct completion *unregistering;
1: +  struct ctl_table *ctl_table_arg;
1: +  struct ctl_table_root *root;
1: +  struct ctl_table_set *set;
1: +  struct ctl_dir *parent;
1: +  struct ctl_node *node;
1: +  struct hlist_head inodes;
1:  };
1:  
1:  struct ctl_dir {
1: -	struct ctl_table_header header;
1: -	struct rb_root root;
1: +  struct ctl_table_header header;
1: +  struct rb_root root;
1:  };
1:  
1:  struct ctl_table_set {
1: -	int (*is_seen)(struct ctl_table_set *);
1: -	struct ctl_dir dir;
1: +  int (*is_seen)(struct ctl_table_set *);
1: +  struct ctl_dir dir;
1:  };
1:  
1:  struct ucounts;
1:  
1:  struct user_namespace {
1: -	struct uid_gid_map uid_map;
1: -	struct uid_gid_map gid_map;
1: -	struct uid_gid_map projid_map;
1: -	atomic_t count;
1: -	struct user_namespace *parent;
1: -	int level;
1: -	kuid_t owner;
1: -	kgid_t group;
1: -	struct ns_common ns;
1: -	long unsigned int flags;
1: -	struct list_head keyring_name_list;
1: -	struct key *user_keyring_register;
1: -	struct rw_semaphore keyring_sem;
1: -	struct work_struct work;
1: -	struct ctl_table_set set;
1: -	struct ctl_table_header *sysctls;
1: -	struct ucounts *ucounts;
1: -	int ucount_max[10];
1: +  struct uid_gid_map uid_map;
1: +  struct uid_gid_map gid_map;
1: +  struct uid_gid_map projid_map;
1: +  atomic_t count;
1: +  struct user_namespace *parent;
1: +  int level;
1: +  kuid_t owner;
1: +  kgid_t group;
1: +  struct ns_common ns;
1: +  long unsigned int flags;
1: +  struct list_head keyring_name_list;
1: +  struct key *user_keyring_register;
1: +  struct rw_semaphore keyring_sem;
1: +  struct work_struct work;
1: +  struct ctl_table_set set;
1: +  struct ctl_table_header *sysctls;
1: +  struct ucounts *ucounts;
1: +  int ucount_max[10];
1:  };
1:  
1:  struct pollfd {
1: -	int fd;
1: -	short int events;
1: -	short int revents;
1: +  int fd;
1: +  short int events;
1: +  short int revents;
1:  };
1:  
1:  typedef void (*smp_call_func_t)(void *);
1:  
1:  struct __call_single_data {
1: -	union {
1: -		struct __call_single_node node;
1: -		struct {
1: -			struct llist_node llist;
1: -			unsigned int flags;
1: -			u16 src;
1: -			u16 dst;
1: -		};
1: -	};
1: -	smp_call_func_t func;
1: -	void *info;
1: +  union {
1: +    struct __call_single_node node;
1: +    struct {
1: +      struct llist_node llist;
1: +      unsigned int flags;
1: +      u16 src;
1: +      u16 dst;
1: +    };
1: +  };
1: +  smp_call_func_t func;
1: +  void *info;
1:  };
1:  
1:  struct smp_ops {
1: -	void (*smp_prepare_boot_cpu)();
1: -	void (*smp_prepare_cpus)(unsigned int);
1: -	void (*smp_cpus_done)(unsigned int);
1: -	void (*stop_other_cpus)(int);
1: -	void (*crash_stop_other_cpus)();
1: -	void (*smp_send_reschedule)(int);
1: -	int (*cpu_up)(unsigned int, struct task_struct *);
1: -	int (*cpu_disable)();
1: -	void (*cpu_die)(unsigned int);
1: -	void (*play_dead)();
1: -	void (*send_call_func_ipi)(const struct cpumask *);
1: -	void (*send_call_func_single_ipi)(int);
1: +  void (*smp_prepare_boot_cpu)();
1: +  void (*smp_prepare_cpus)(unsigned int);
1: +  void (*smp_cpus_done)(unsigned int);
1: +  void (*stop_other_cpus)(int);
1: +  void (*crash_stop_other_cpus)();
1: +  void (*smp_send_reschedule)(int);
1: +  int (*cpu_up)(unsigned int, struct task_struct *);
1: +  int (*cpu_disable)();
1: +  void (*cpu_die)(unsigned int);
1: +  void (*play_dead)();
1: +  void (*send_call_func_ipi)(const struct cpumask *);
1: +  void (*send_call_func_single_ipi)(int);
1:  };
1:  
1:  struct wait_queue_entry;
1:  
1: -typedef int (*wait_queue_func_t)(struct wait_queue_entry *, unsigned int, int, void *);
1: +typedef int (*wait_queue_func_t)(struct wait_queue_entry *, unsigned int, int,
1: +                                 void *);
1:  
1:  struct wait_queue_entry {
1: -	unsigned int flags;
1: -	void *private;
1: -	wait_queue_func_t func;
1: -	struct list_head entry;
1: +  unsigned int flags;
1: +  void *private;
1: +  wait_queue_func_t func;
1: +  struct list_head entry;
1:  };
1:  
1:  typedef struct wait_queue_entry wait_queue_entry_t;
1:  
1:  struct timer_list {
1: -	struct hlist_node entry;
1: -	long unsigned int expires;
1: -	void (*function)(struct timer_list *);
1: -	u32 flags;
1: +  struct hlist_node entry;
1: +  long unsigned int expires;
1: +  void (*function)(struct timer_list *);
1: +  u32 flags;
1:  };
1:  
1:  struct delayed_work {
1: -	struct work_struct work;
1: -	struct timer_list timer;
1: -	struct workqueue_struct *wq;
1: -	int cpu;
1: +  struct work_struct work;
1: +  struct timer_list timer;
1: +  struct workqueue_struct *wq;
1: +  int cpu;
1:  };
1:  
1:  struct rcu_work {
1: -	struct work_struct work;
1: -	struct callback_head rcu;
1: -	struct workqueue_struct *wq;
1: +  struct work_struct work;
1: +  struct callback_head rcu;
1: +  struct workqueue_struct *wq;
1:  };
1:  
1:  struct rcu_segcblist {
1: -	struct callback_head *head;
1: -	struct callback_head **tails[4];
1: -	long unsigned int gp_seq[4];
1: -	long int len;
1: -	u8 enabled;
1: -	u8 offloaded;
1: +  struct callback_head *head;
1: +  struct callback_head **tails[4];
1: +  long unsigned int gp_seq[4];
1: +  long int len;
1: +  u8 enabled;
1: +  u8 offloaded;
1:  };
1:  
1:  struct srcu_node;
1: @@ -4380,76 +4383,76 @@ struct srcu_node;
1:  struct srcu_struct;
1:  
1:  struct srcu_data {
1: -	long unsigned int srcu_lock_count[2];
1: -	long unsigned int srcu_unlock_count[2];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	spinlock_t lock;
1: -	struct rcu_segcblist srcu_cblist;
1: -	long unsigned int srcu_gp_seq_needed;
1: -	long unsigned int srcu_gp_seq_needed_exp;
1: -	bool srcu_cblist_invoking;
1: -	struct timer_list delay_work;
1: -	struct work_struct work;
1: -	struct callback_head srcu_barrier_head;
1: -	struct srcu_node *mynode;
1: -	long unsigned int grpmask;
1: -	int cpu;
1: -	struct srcu_struct *ssp;
1: +  long unsigned int srcu_lock_count[2];
1: +  long unsigned int srcu_unlock_count[2];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  spinlock_t lock;
1: +  struct rcu_segcblist srcu_cblist;
1: +  long unsigned int srcu_gp_seq_needed;
1: +  long unsigned int srcu_gp_seq_needed_exp;
1: +  bool srcu_cblist_invoking;
1: +  struct timer_list delay_work;
1: +  struct work_struct work;
1: +  struct callback_head srcu_barrier_head;
1: +  struct srcu_node *mynode;
1: +  long unsigned int grpmask;
1: +  int cpu;
1: +  struct srcu_struct *ssp;
1:  };
1:  
1:  struct srcu_node {
1: -	spinlock_t lock;
1: -	long unsigned int srcu_have_cbs[4];
1: -	long unsigned int srcu_data_have_cbs[4];
1: -	long unsigned int srcu_gp_seq_needed_exp;
1: -	struct srcu_node *srcu_parent;
1: -	int grplo;
1: -	int grphi;
1: +  spinlock_t lock;
1: +  long unsigned int srcu_have_cbs[4];
1: +  long unsigned int srcu_data_have_cbs[4];
1: +  long unsigned int srcu_gp_seq_needed_exp;
1: +  struct srcu_node *srcu_parent;
1: +  int grplo;
1: +  int grphi;
1:  };
1:  
1:  struct srcu_struct {
1: -	struct srcu_node node[9];
1: -	struct srcu_node *level[3];
1: -	struct mutex srcu_cb_mutex;
1: -	spinlock_t lock;
1: -	struct mutex srcu_gp_mutex;
1: -	unsigned int srcu_idx;
1: -	long unsigned int srcu_gp_seq;
1: -	long unsigned int srcu_gp_seq_needed;
1: -	long unsigned int srcu_gp_seq_needed_exp;
1: -	long unsigned int srcu_last_gp_end;
1: -	struct srcu_data *sda;
1: -	long unsigned int srcu_barrier_seq;
1: -	struct mutex srcu_barrier_mutex;
1: -	struct completion srcu_barrier_completion;
1: -	atomic_t srcu_barrier_cpu_cnt;
1: -	struct delayed_work work;
1: +  struct srcu_node node[9];
1: +  struct srcu_node *level[3];
1: +  struct mutex srcu_cb_mutex;
1: +  spinlock_t lock;
1: +  struct mutex srcu_gp_mutex;
1: +  unsigned int srcu_idx;
1: +  long unsigned int srcu_gp_seq;
1: +  long unsigned int srcu_gp_seq_needed;
1: +  long unsigned int srcu_gp_seq_needed_exp;
1: +  long unsigned int srcu_last_gp_end;
1: +  struct srcu_data *sda;
1: +  long unsigned int srcu_barrier_seq;
1: +  struct mutex srcu_barrier_mutex;
1: +  struct completion srcu_barrier_completion;
1: +  atomic_t srcu_barrier_cpu_cnt;
1: +  struct delayed_work work;
1:  };
1:  
1:  struct anon_vma {
1: -	struct anon_vma *root;
1: -	struct rw_semaphore rwsem;
1: -	atomic_t refcount;
1: -	unsigned int degree;
1: -	struct anon_vma *parent;
1: -	struct rb_root_cached rb_root;
1: +  struct anon_vma *root;
1: +  struct rw_semaphore rwsem;
1: +  atomic_t refcount;
1: +  unsigned int degree;
1: +  struct anon_vma *parent;
1: +  struct rb_root_cached rb_root;
1:  };
1:  
1:  struct mempolicy {
1: -	atomic_t refcnt;
1: -	short unsigned int mode;
1: -	short unsigned int flags;
1: -	union {
1: -		short int preferred_node;
1: -		nodemask_t nodes;
1: -	} v;
1: -	union {
1: -		nodemask_t cpuset_mems_allowed;
1: -		nodemask_t user_nodemask;
1: -	} w;
1: +  atomic_t refcnt;
1: +  short unsigned int mode;
1: +  short unsigned int flags;
1: +  union {
1: +    short int preferred_node;
1: +    nodemask_t nodes;
1: +  } v;
1: +  union {
1: +    nodemask_t cpuset_mems_allowed;
1: +    nodemask_t user_nodemask;
1: +  } w;
1:  };
1:  
1:  struct linux_binprm;
1: @@ -4457,186 +4460,186 @@ struct linux_binprm;
1:  struct coredump_params;
1:  
1:  struct linux_binfmt {
1: -	struct list_head lh;
1: -	struct module *module;
1: -	int (*load_binary)(struct linux_binprm *);
1: -	int (*load_shlib)(struct file *);
1: -	int (*core_dump)(struct coredump_params *);
1: -	long unsigned int min_coredump;
1: +  struct list_head lh;
1: +  struct module *module;
1: +  int (*load_binary)(struct linux_binprm *);
1: +  int (*load_shlib)(struct file *);
1: +  int (*core_dump)(struct coredump_params *);
1: +  long unsigned int min_coredump;
1:  };
1:  
1:  struct free_area {
1: -	struct list_head free_list[6];
1: -	long unsigned int nr_free;
1: +  struct list_head free_list[6];
1: +  long unsigned int nr_free;
1:  };
1:  
1:  struct zone_padding {
1: -	char x[0];
1: +  char x[0];
1:  };
1:  
1:  struct pglist_data;
1:  
1:  struct lruvec {
1: -	struct list_head lists[5];
1: -	long unsigned int anon_cost;
1: -	long unsigned int file_cost;
1: -	atomic_long_t nonresident_age;
1: -	long unsigned int refaults[2];
1: -	long unsigned int flags;
1: -	struct pglist_data *pgdat;
1: +  struct list_head lists[5];
1: +  long unsigned int anon_cost;
1: +  long unsigned int file_cost;
1: +  atomic_long_t nonresident_age;
1: +  long unsigned int refaults[2];
1: +  long unsigned int flags;
1: +  struct pglist_data *pgdat;
1:  };
1:  
1:  struct per_cpu_pageset;
1:  
1:  struct zone {
1: -	long unsigned int _watermark[3];
1: -	long unsigned int watermark_boost;
1: -	long unsigned int nr_reserved_highatomic;
1: -	long int lowmem_reserve[4];
1: -	int node;
1: -	struct pglist_data *zone_pgdat;
1: -	struct per_cpu_pageset *pageset;
1: -	long unsigned int zone_start_pfn;
1: -	atomic_long_t managed_pages;
1: -	long unsigned int spanned_pages;
1: -	long unsigned int present_pages;
1: -	const char *name;
1: -	long unsigned int nr_isolate_pageblock;
1: -	int initialized;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct zone_padding _pad1_;
1: -	struct free_area free_area[11];
1: -	long unsigned int flags;
1: -	spinlock_t lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct zone_padding _pad2_;
1: -	long unsigned int percpu_drift_mark;
1: -	long unsigned int compact_cached_free_pfn;
1: -	long unsigned int compact_cached_migrate_pfn[2];
1: -	long unsigned int compact_init_migrate_pfn;
1: -	long unsigned int compact_init_free_pfn;
1: -	unsigned int compact_considered;
1: -	unsigned int compact_defer_shift;
1: -	int compact_order_failed;
1: -	bool compact_blockskip_flush;
1: -	bool contiguous;
1: -	short: 16;
1: -	struct zone_padding _pad3_;
1: -	atomic_long_t vm_stat[11];
1: -	atomic_long_t vm_numa_stat[6];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  long unsigned int _watermark[3];
1: +  long unsigned int watermark_boost;
1: +  long unsigned int nr_reserved_highatomic;
1: +  long int lowmem_reserve[4];
1: +  int node;
1: +  struct pglist_data *zone_pgdat;
1: +  struct per_cpu_pageset *pageset;
1: +  long unsigned int zone_start_pfn;
1: +  atomic_long_t managed_pages;
1: +  long unsigned int spanned_pages;
1: +  long unsigned int present_pages;
1: +  const char *name;
1: +  long unsigned int nr_isolate_pageblock;
1: +  int initialized;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct zone_padding _pad1_;
1: +  struct free_area free_area[11];
1: +  long unsigned int flags;
1: +  spinlock_t lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct zone_padding _pad2_;
1: +  long unsigned int percpu_drift_mark;
1: +  long unsigned int compact_cached_free_pfn;
1: +  long unsigned int compact_cached_migrate_pfn[2];
1: +  long unsigned int compact_init_migrate_pfn;
1: +  long unsigned int compact_init_free_pfn;
1: +  unsigned int compact_considered;
1: +  unsigned int compact_defer_shift;
1: +  int compact_order_failed;
1: +  bool compact_blockskip_flush;
1: +  bool contiguous;
1: +  short : 16;
1: +  struct zone_padding _pad3_;
1: +  atomic_long_t vm_stat[11];
1: +  atomic_long_t vm_numa_stat[6];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct zoneref {
1: -	struct zone *zone;
1: -	int zone_idx;
1: +  struct zone *zone;
1: +  int zone_idx;
1:  };
1:  
1:  struct zonelist {
1: -	struct zoneref _zonerefs[257];
1: +  struct zoneref _zonerefs[257];
1:  };
1:  
1:  enum zone_type {
1: -	ZONE_DMA = 0,
1: -	ZONE_DMA32 = 1,
1: -	ZONE_NORMAL = 2,
1: -	ZONE_MOVABLE = 3,
1: -	__MAX_NR_ZONES = 4,
1: +  ZONE_DMA = 0,
1: +  ZONE_DMA32 = 1,
1: +  ZONE_NORMAL = 2,
1: +  ZONE_MOVABLE = 3,
1: +  __MAX_NR_ZONES = 4,
1:  };
1:  
1:  struct deferred_split {
1: -	spinlock_t split_queue_lock;
1: -	struct list_head split_queue;
1: -	long unsigned int split_queue_len;
1: +  spinlock_t split_queue_lock;
1: +  struct list_head split_queue;
1: +  long unsigned int split_queue_len;
1:  };
1:  
1:  struct per_cpu_nodestat;
1:  
1:  struct pglist_data {
1: -	struct zone node_zones[4];
1: -	struct zonelist node_zonelists[2];
1: -	int nr_zones;
1: -	long unsigned int node_start_pfn;
1: -	long unsigned int node_present_pages;
1: -	long unsigned int node_spanned_pages;
1: -	int node_id;
1: -	wait_queue_head_t kswapd_wait;
1: -	wait_queue_head_t pfmemalloc_wait;
1: -	struct task_struct *kswapd;
1: -	int kswapd_order;
1: -	enum zone_type kswapd_highest_zoneidx;
1: -	int kswapd_failures;
1: -	int kcompactd_max_order;
1: -	enum zone_type kcompactd_highest_zoneidx;
1: -	wait_queue_head_t kcompactd_wait;
1: -	struct task_struct *kcompactd;
1: -	long unsigned int totalreserve_pages;
1: -	long unsigned int min_unmapped_pages;
1: -	long unsigned int min_slab_pages;
1: -	struct zone_padding _pad1_;
1: -	spinlock_t lru_lock;
1: -	struct deferred_split deferred_split_queue;
1: -	struct lruvec __lruvec;
1: -	long unsigned int flags;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct zone_padding _pad2_;
1: -	struct per_cpu_nodestat *per_cpu_nodestats;
1: -	atomic_long_t vm_stat[37];
1: -	long: 64;
1: -	long: 64;
1: +  struct zone node_zones[4];
1: +  struct zonelist node_zonelists[2];
1: +  int nr_zones;
1: +  long unsigned int node_start_pfn;
1: +  long unsigned int node_present_pages;
1: +  long unsigned int node_spanned_pages;
1: +  int node_id;
1: +  wait_queue_head_t kswapd_wait;
1: +  wait_queue_head_t pfmemalloc_wait;
1: +  struct task_struct *kswapd;
1: +  int kswapd_order;
1: +  enum zone_type kswapd_highest_zoneidx;
1: +  int kswapd_failures;
1: +  int kcompactd_max_order;
1: +  enum zone_type kcompactd_highest_zoneidx;
1: +  wait_queue_head_t kcompactd_wait;
1: +  struct task_struct *kcompactd;
1: +  long unsigned int totalreserve_pages;
1: +  long unsigned int min_unmapped_pages;
1: +  long unsigned int min_slab_pages;
1: +  struct zone_padding _pad1_;
1: +  spinlock_t lru_lock;
1: +  struct deferred_split deferred_split_queue;
1: +  struct lruvec __lruvec;
1: +  long unsigned int flags;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct zone_padding _pad2_;
1: +  struct per_cpu_nodestat *per_cpu_nodestats;
1: +  atomic_long_t vm_stat[37];
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct per_cpu_pages {
1: -	int count;
1: -	int high;
1: -	int batch;
1: -	struct list_head lists[3];
1: +  int count;
1: +  int high;
1: +  int batch;
1: +  struct list_head lists[3];
1:  };
1:  
1:  struct per_cpu_pageset {
1: -	struct per_cpu_pages pcp;
1: -	s8 expire;
1: -	u16 vm_numa_stat_diff[6];
1: -	s8 stat_threshold;
1: -	s8 vm_stat_diff[11];
1: +  struct per_cpu_pages pcp;
1: +  s8 expire;
1: +  u16 vm_numa_stat_diff[6];
1: +  s8 stat_threshold;
1: +  s8 vm_stat_diff[11];
1:  };
1:  
1:  struct per_cpu_nodestat {
1: -	s8 stat_threshold;
1: -	s8 vm_node_stat_diff[37];
1: +  s8 stat_threshold;
1: +  s8 vm_node_stat_diff[37];
1:  };
1:  
1:  enum irq_domain_bus_token {
1: -	DOMAIN_BUS_ANY = 0,
1: -	DOMAIN_BUS_WIRED = 1,
1: -	DOMAIN_BUS_GENERIC_MSI = 2,
1: -	DOMAIN_BUS_PCI_MSI = 3,
1: -	DOMAIN_BUS_PLATFORM_MSI = 4,
1: -	DOMAIN_BUS_NEXUS = 5,
1: -	DOMAIN_BUS_IPI = 6,
1: -	DOMAIN_BUS_FSL_MC_MSI = 7,
1: -	DOMAIN_BUS_TI_SCI_INTA_MSI = 8,
1: -	DOMAIN_BUS_WAKEUP = 9,
1: -	DOMAIN_BUS_VMD_MSI = 10,
1: +  DOMAIN_BUS_ANY = 0,
1: +  DOMAIN_BUS_WIRED = 1,
1: +  DOMAIN_BUS_GENERIC_MSI = 2,
1: +  DOMAIN_BUS_PCI_MSI = 3,
1: +  DOMAIN_BUS_PLATFORM_MSI = 4,
1: +  DOMAIN_BUS_NEXUS = 5,
1: +  DOMAIN_BUS_IPI = 6,
1: +  DOMAIN_BUS_FSL_MC_MSI = 7,
1: +  DOMAIN_BUS_TI_SCI_INTA_MSI = 8,
1: +  DOMAIN_BUS_WAKEUP = 9,
1: +  DOMAIN_BUS_VMD_MSI = 10,
1:  };
1:  
1:  struct irq_domain_ops;
1: @@ -4646,22 +4649,22 @@ struct fwnode_handle;
1:  struct irq_domain_chip_generic;
1:  
1:  struct irq_domain {
1: -	struct list_head link;
1: -	const char *name;
1: -	const struct irq_domain_ops *ops;
1: -	void *host_data;
1: -	unsigned int flags;
1: -	unsigned int mapcount;
1: -	struct fwnode_handle *fwnode;
1: -	enum irq_domain_bus_token bus_token;
1: -	struct irq_domain_chip_generic *gc;
1: -	struct irq_domain *parent;
1: -	irq_hw_number_t hwirq_max;
1: -	unsigned int revmap_direct_max_irq;
1: -	unsigned int revmap_size;
1: -	struct xarray revmap_tree;
1: -	struct mutex revmap_tree_mutex;
1: -	unsigned int linear_revmap[0];
1: +  struct list_head link;
1: +  const char *name;
1: +  const struct irq_domain_ops *ops;
1: +  void *host_data;
1: +  unsigned int flags;
1: +  unsigned int mapcount;
1: +  struct fwnode_handle *fwnode;
1: +  enum irq_domain_bus_token bus_token;
1: +  struct irq_domain_chip_generic *gc;
1: +  struct irq_domain *parent;
1: +  irq_hw_number_t hwirq_max;
1: +  unsigned int revmap_direct_max_irq;
1: +  unsigned int revmap_size;
1: +  struct xarray revmap_tree;
1: +  struct mutex revmap_tree_mutex;
1: +  unsigned int linear_revmap[0];
1:  };
1:  
1:  typedef int proc_handler(struct ctl_table *, int, void *, size_t *, loff_t *);
1: @@ -4669,38 +4672,39 @@ typedef int proc_handler(struct ctl_table *, int, void *, size_t *, loff_t *);
1:  struct ctl_table_poll;
1:  
1:  struct ctl_table {
1: -	const char *procname;
1: -	void *data;
1: -	int maxlen;
1: -	umode_t mode;
1: -	struct ctl_table *child;
1: -	proc_handler *proc_handler;
1: -	struct ctl_table_poll *poll;
1: -	void *extra1;
1: -	void *extra2;
1: +  const char *procname;
1: +  void *data;
1: +  int maxlen;
1: +  umode_t mode;
1: +  struct ctl_table *child;
1: +  proc_handler *proc_handler;
1: +  struct ctl_table_poll *poll;
1: +  void *extra1;
1: +  void *extra2;
1:  };
1:  
1:  struct ctl_table_poll {
1: -	atomic_t event;
1: -	wait_queue_head_t wait;
1: +  atomic_t event;
1: +  wait_queue_head_t wait;
1:  };
1:  
1:  struct ctl_node {
1: -	struct rb_node node;
1: -	struct ctl_table_header *header;
1: +  struct rb_node node;
1: +  struct ctl_table_header *header;
1:  };
1:  
1:  struct ctl_table_root {
1: -	struct ctl_table_set default_set;
1: -	struct ctl_table_set * (*lookup)(struct ctl_table_root *);
1: -	void (*set_ownership)(struct ctl_table_header *, struct ctl_table *, kuid_t *, kgid_t *);
1: -	int (*permissions)(struct ctl_table_header *, struct ctl_table *);
1: +  struct ctl_table_set default_set;
1: +  struct ctl_table_set *(*lookup)(struct ctl_table_root *);
1: +  void (*set_ownership)(struct ctl_table_header *, struct ctl_table *, kuid_t *,
1: +                        kgid_t *);
1: +  int (*permissions)(struct ctl_table_header *, struct ctl_table *);
1:  };
1:  
1:  enum umh_disable_depth {
1: -	UMH_ENABLED = 0,
1: -	UMH_FREEZING = 1,
1: -	UMH_DISABLED = 2,
1: +  UMH_ENABLED = 0,
1: +  UMH_FREEZING = 1,
1: +  UMH_DISABLED = 2,
1:  };
1:  
1:  typedef __u64 Elf64_Addr;
1: @@ -4712,28 +4716,28 @@ typedef __u32 Elf64_Word;
1:  typedef __u64 Elf64_Xword;
1:  
1:  struct elf64_sym {
1: -	Elf64_Word st_name;
1: -	unsigned char st_info;
1: -	unsigned char st_other;
1: -	Elf64_Half st_shndx;
1: -	Elf64_Addr st_value;
1: -	Elf64_Xword st_size;
1: +  Elf64_Word st_name;
1: +  unsigned char st_info;
1: +  unsigned char st_other;
1: +  Elf64_Half st_shndx;
1: +  Elf64_Addr st_value;
1: +  Elf64_Xword st_size;
1:  };
1:  
1:  typedef struct elf64_sym Elf64_Sym;
1:  
1:  struct idr {
1: -	struct xarray idr_rt;
1: -	unsigned int idr_base;
1: -	unsigned int idr_next;
1: +  struct xarray idr_rt;
1: +  unsigned int idr_base;
1: +  unsigned int idr_next;
1:  };
1:  
1:  struct kernfs_root;
1:  
1:  struct kernfs_elem_dir {
1: -	long unsigned int subdirs;
1: -	struct rb_root children;
1: -	struct kernfs_root *root;
1: +  long unsigned int subdirs;
1: +  struct rb_root children;
1: +  struct kernfs_root *root;
1:  };
1:  
1:  struct kernfs_node;
1: @@ -4741,18 +4745,18 @@ struct kernfs_node;
1:  struct kernfs_syscall_ops;
1:  
1:  struct kernfs_root {
1: -	struct kernfs_node *kn;
1: -	unsigned int flags;
1: -	struct idr ino_idr;
1: -	u32 last_id_lowbits;
1: -	u32 id_highbits;
1: -	struct kernfs_syscall_ops *syscall_ops;
1: -	struct list_head supers;
1: -	wait_queue_head_t deactivate_waitq;
1: +  struct kernfs_node *kn;
1: +  unsigned int flags;
1: +  struct idr ino_idr;
1: +  u32 last_id_lowbits;
1: +  u32 id_highbits;
1: +  struct kernfs_syscall_ops *syscall_ops;
1: +  struct list_head supers;
1: +  wait_queue_head_t deactivate_waitq;
1:  };
1:  
1:  struct kernfs_elem_symlink {
1: -	struct kernfs_node *target_kn;
1: +  struct kernfs_node *target_kn;
1:  };
1:  
1:  struct kernfs_ops;
1: @@ -4760,117 +4764,119 @@ struct kernfs_ops;
1:  struct kernfs_open_node;
1:  
1:  struct kernfs_elem_attr {
1: -	const struct kernfs_ops *ops;
1: -	struct kernfs_open_node *open;
1: -	loff_t size;
1: -	struct kernfs_node *notify_next;
1: +  const struct kernfs_ops *ops;
1: +  struct kernfs_open_node *open;
1: +  loff_t size;
1: +  struct kernfs_node *notify_next;
1:  };
1:  
1:  struct kernfs_iattrs;
1:  
1:  struct kernfs_node {
1: -	atomic_t count;
1: -	atomic_t active;
1: -	struct kernfs_node *parent;
1: -	const char *name;
1: -	struct rb_node rb;
1: -	const void *ns;
1: -	unsigned int hash;
1: -	union {
1: -		struct kernfs_elem_dir dir;
1: -		struct kernfs_elem_symlink symlink;
1: -		struct kernfs_elem_attr attr;
1: -	};
1: -	void *priv;
1: -	u64 id;
1: -	short unsigned int flags;
1: -	umode_t mode;
1: -	struct kernfs_iattrs *iattr;
1: +  atomic_t count;
1: +  atomic_t active;
1: +  struct kernfs_node *parent;
1: +  const char *name;
1: +  struct rb_node rb;
1: +  const void *ns;
1: +  unsigned int hash;
1: +  union {
1: +    struct kernfs_elem_dir dir;
1: +    struct kernfs_elem_symlink symlink;
1: +    struct kernfs_elem_attr attr;
1: +  };
1: +  void *priv;
1: +  u64 id;
1: +  short unsigned int flags;
1: +  umode_t mode;
1: +  struct kernfs_iattrs *iattr;
1:  };
1:  
1:  struct kernfs_open_file;
1:  
1:  struct kernfs_ops {
1: -	int (*open)(struct kernfs_open_file *);
1: -	void (*release)(struct kernfs_open_file *);
1: -	int (*seq_show)(struct seq_file *, void *);
1: -	void * (*seq_start)(struct seq_file *, loff_t *);
1: -	void * (*seq_next)(struct seq_file *, void *, loff_t *);
1: -	void (*seq_stop)(struct seq_file *, void *);
1: -	ssize_t (*read)(struct kernfs_open_file *, char *, size_t, loff_t);
1: -	size_t atomic_write_len;
1: -	bool prealloc;
1: -	ssize_t (*write)(struct kernfs_open_file *, char *, size_t, loff_t);
1: -	__poll_t (*poll)(struct kernfs_open_file *, struct poll_table_struct *);
1: -	int (*mmap)(struct kernfs_open_file *, struct vm_area_struct *);
1: +  int (*open)(struct kernfs_open_file *);
1: +  void (*release)(struct kernfs_open_file *);
1: +  int (*seq_show)(struct seq_file *, void *);
1: +  void *(*seq_start)(struct seq_file *, loff_t *);
1: +  void *(*seq_next)(struct seq_file *, void *, loff_t *);
1: +  void (*seq_stop)(struct seq_file *, void *);
1: +  ssize_t (*read)(struct kernfs_open_file *, char *, size_t, loff_t);
1: +  size_t atomic_write_len;
1: +  bool prealloc;
1: +  ssize_t (*write)(struct kernfs_open_file *, char *, size_t, loff_t);
1: +  __poll_t (*poll)(struct kernfs_open_file *, struct poll_table_struct *);
1: +  int (*mmap)(struct kernfs_open_file *, struct vm_area_struct *);
1:  };
1:  
1:  struct kernfs_syscall_ops {
1: -	int (*show_options)(struct seq_file *, struct kernfs_root *);
1: -	int (*mkdir)(struct kernfs_node *, const char *, umode_t);
1: -	int (*rmdir)(struct kernfs_node *);
1: -	int (*rename)(struct kernfs_node *, struct kernfs_node *, const char *);
1: -	int (*show_path)(struct seq_file *, struct kernfs_node *, struct kernfs_root *);
1: +  int (*show_options)(struct seq_file *, struct kernfs_root *);
1: +  int (*mkdir)(struct kernfs_node *, const char *, umode_t);
1: +  int (*rmdir)(struct kernfs_node *);
1: +  int (*rename)(struct kernfs_node *, struct kernfs_node *, const char *);
1: +  int (*show_path)(struct seq_file *, struct kernfs_node *,
1: +                   struct kernfs_root *);
1:  };
1:  
1:  struct seq_file {
1: -	char *buf;
1: -	size_t size;
1: -	size_t from;
1: -	size_t count;
1: -	size_t pad_until;
1: -	loff_t index;
1: -	loff_t read_pos;
1: -	struct mutex lock;
1: -	const struct seq_operations *op;
1: -	int poll_event;
1: -	const struct file *file;
1: -	void *private;
1: +  char *buf;
1: +  size_t size;
1: +  size_t from;
1: +  size_t count;
1: +  size_t pad_until;
1: +  loff_t index;
1: +  loff_t read_pos;
1: +  struct mutex lock;
1: +  const struct seq_operations *op;
1: +  int poll_event;
1: +  const struct file *file;
1: +  void *private;
1:  };
1:  
1:  struct kernfs_open_file {
1: -	struct kernfs_node *kn;
1: -	struct file *file;
1: -	struct seq_file *seq_file;
1: -	void *priv;
1: -	struct mutex mutex;
1: -	struct mutex prealloc_mutex;
1: -	int event;
1: -	struct list_head list;
1: -	char *prealloc_buf;
1: -	size_t atomic_write_len;
1: -	bool mmapped: 1;
1: -	bool released: 1;
1: -	const struct vm_operations_struct *vm_ops;
1: -};
1: -
1: -typedef void (*poll_queue_proc)(struct file *, wait_queue_head_t *, struct poll_table_struct *);
1: +  struct kernfs_node *kn;
1: +  struct file *file;
1: +  struct seq_file *seq_file;
1: +  void *priv;
1: +  struct mutex mutex;
1: +  struct mutex prealloc_mutex;
1: +  int event;
1: +  struct list_head list;
1: +  char *prealloc_buf;
1: +  size_t atomic_write_len;
1: +  bool mmapped : 1;
1: +  bool released : 1;
1: +  const struct vm_operations_struct *vm_ops;
1: +};
1: +
1: +typedef void (*poll_queue_proc)(struct file *, wait_queue_head_t *,
1: +                                struct poll_table_struct *);
1:  
1:  struct poll_table_struct {
1: -	poll_queue_proc _qproc;
1: -	__poll_t _key;
1: +  poll_queue_proc _qproc;
1: +  __poll_t _key;
1:  };
1:  
1:  enum kobj_ns_type {
1: -	KOBJ_NS_TYPE_NONE = 0,
1: -	KOBJ_NS_TYPE_NET = 1,
1: -	KOBJ_NS_TYPES = 2,
1: +  KOBJ_NS_TYPE_NONE = 0,
1: +  KOBJ_NS_TYPE_NET = 1,
1: +  KOBJ_NS_TYPES = 2,
1:  };
1:  
1:  struct sock;
1:  
1:  struct kobj_ns_type_operations {
1: -	enum kobj_ns_type type;
1: -	bool (*current_may_mount)();
1: -	void * (*grab_current_ns)();
1: -	const void * (*netlink_ns)(struct sock *);
1: -	const void * (*initial_ns)();
1: -	void (*drop_ns)(void *);
1: +  enum kobj_ns_type type;
1: +  bool (*current_may_mount)();
1: +  void *(*grab_current_ns)();
1: +  const void *(*netlink_ns)(struct sock *);
1: +  const void *(*initial_ns)();
1: +  void (*drop_ns)(void *);
1:  };
1:  
1:  struct attribute {
1: -	const char *name;
1: -	umode_t mode;
1: +  const char *name;
1: +  umode_t mode;
1:  };
1:  
1:  struct kobject;
1: @@ -4878,15 +4884,15 @@ struct kobject;
1:  struct bin_attribute;
1:  
1:  struct attribute_group {
1: -	const char *name;
1: -	umode_t (*is_visible)(struct kobject *, struct attribute *, int);
1: -	umode_t (*is_bin_visible)(struct kobject *, struct bin_attribute *, int);
1: -	struct attribute **attrs;
1: -	struct bin_attribute **bin_attrs;
1: +  const char *name;
1: +  umode_t (*is_visible)(struct kobject *, struct attribute *, int);
1: +  umode_t (*is_bin_visible)(struct kobject *, struct bin_attribute *, int);
1: +  struct attribute **attrs;
1: +  struct bin_attribute **bin_attrs;
1:  };
1:  
1:  struct kref {
1: -	refcount_t refcount;
1: +  refcount_t refcount;
1:  };
1:  
1:  struct kset;
1: @@ -4894,74 +4900,78 @@ struct kset;
1:  struct kobj_type;
1:  
1:  struct kobject {
1: -	const char *name;
1: -	struct list_head entry;
1: -	struct kobject *parent;
1: -	struct kset *kset;
1: -	struct kobj_type *ktype;
1: -	struct kernfs_node *sd;
1: -	struct kref kref;
1: -	unsigned int state_initialized: 1;
1: -	unsigned int state_in_sysfs: 1;
1: -	unsigned int state_add_uevent_sent: 1;
1: -	unsigned int state_remove_uevent_sent: 1;
1: -	unsigned int uevent_suppress: 1;
1: +  const char *name;
1: +  struct list_head entry;
1: +  struct kobject *parent;
1: +  struct kset *kset;
1: +  struct kobj_type *ktype;
1: +  struct kernfs_node *sd;
1: +  struct kref kref;
1: +  unsigned int state_initialized : 1;
1: +  unsigned int state_in_sysfs : 1;
1: +  unsigned int state_add_uevent_sent : 1;
1: +  unsigned int state_remove_uevent_sent : 1;
1: +  unsigned int uevent_suppress : 1;
1:  };
1:  
1:  struct bin_attribute {
1: -	struct attribute attr;
1: -	size_t size;
1: -	void *private;
1: -	ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *, char *, loff_t, size_t);
1: -	ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *, char *, loff_t, size_t);
1: -	int (*mmap)(struct file *, struct kobject *, struct bin_attribute *, struct vm_area_struct *);
1: +  struct attribute attr;
1: +  size_t size;
1: +  void *private;
1: +  ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *,
1: +                  char *, loff_t, size_t);
1: +  ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *,
1: +                   char *, loff_t, size_t);
1: +  int (*mmap)(struct file *, struct kobject *, struct bin_attribute *,
1: +              struct vm_area_struct *);
1:  };
1:  
1:  struct sysfs_ops {
1: -	ssize_t (*show)(struct kobject *, struct attribute *, char *);
1: -	ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
1: +  ssize_t (*show)(struct kobject *, struct attribute *, char *);
1: +  ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
1:  };
1:  
1:  struct kset_uevent_ops;
1:  
1:  struct kset {
1: -	struct list_head list;
1: -	spinlock_t list_lock;
1: -	struct kobject kobj;
1: -	const struct kset_uevent_ops *uevent_ops;
1: +  struct list_head list;
1: +  spinlock_t list_lock;
1: +  struct kobject kobj;
1: +  const struct kset_uevent_ops *uevent_ops;
1:  };
1:  
1:  struct kobj_type {
1: -	void (*release)(struct kobject *);
1: -	const struct sysfs_ops *sysfs_ops;
1: -	struct attribute **default_attrs;
1: -	const struct attribute_group **default_groups;
1: -	const struct kobj_ns_type_operations * (*child_ns_type)(struct kobject *);
1: -	const void * (*namespace)(struct kobject *);
1: -	void (*get_ownership)(struct kobject *, kuid_t *, kgid_t *);
1: +  void (*release)(struct kobject *);
1: +  const struct sysfs_ops *sysfs_ops;
1: +  struct attribute **default_attrs;
1: +  const struct attribute_group **default_groups;
1: +  const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *);
1: +  const void *(*namespace)(struct kobject *);
1: +  void (*get_ownership)(struct kobject *, kuid_t *, kgid_t *);
1:  };
1:  
1:  struct kobj_uevent_env {
1: -	char *argv[3];
1: -	char *envp[64];
1: -	int envp_idx;
1: -	char buf[2048];
1: -	int buflen;
1: +  char *argv[3];
1: +  char *envp[64];
1: +  int envp_idx;
1: +  char buf[2048];
1: +  int buflen;
1:  };
1:  
1:  struct kset_uevent_ops {
1: -	int (* const filter)(struct kset *, struct kobject *);
1: -	const char * (* const name)(struct kset *, struct kobject *);
1: -	int (* const uevent)(struct kset *, struct kobject *, struct kobj_uevent_env *);
1: +  int (*const filter)(struct kset *, struct kobject *);
1: +  const char *(*const name)(struct kset *, struct kobject *);
1: +  int (*const uevent)(struct kset *, struct kobject *,
1: +                      struct kobj_uevent_env *);
1:  };
1:  
1:  struct kernel_param;
1:  
1:  struct kernel_param_ops {
1: -	unsigned int flags;
1: -	int (*set)(const char *, const struct kernel_param *);
1: -	int (*get)(char *, const struct kernel_param *);
1: -	void (*free)(void *);
1: +  unsigned int flags;
1: +  int (*set)(const char *, const struct kernel_param *);
1: +  int (*get)(char *, const struct kernel_param *);
1: +  void (*free)(void *);
1:  };
1:  
1:  struct kparam_string;
1: @@ -4969,78 +4979,78 @@ struct kparam_string;
1:  struct kparam_array;
1:  
1:  struct kernel_param {
1: -	const char *name;
1: -	struct module *mod;
1: -	const struct kernel_param_ops *ops;
1: -	const u16 perm;
1: -	s8 level;
1: -	u8 flags;
1: -	union {
1: -		void *arg;
1: -		const struct kparam_string *str;
1: -		const struct kparam_array *arr;
1: -	};
1: +  const char *name;
1: +  struct module *mod;
1: +  const struct kernel_param_ops *ops;
1: +  const u16 perm;
1: +  s8 level;
1: +  u8 flags;
1: +  union {
1: +    void *arg;
1: +    const struct kparam_string *str;
1: +    const struct kparam_array *arr;
1: +  };
1:  };
1:  
1:  struct kparam_string {
1: -	unsigned int maxlen;
1: -	char *string;
1: +  unsigned int maxlen;
1: +  char *string;
1:  };
1:  
1:  struct kparam_array {
1: -	unsigned int max;
1: -	unsigned int elemsize;
1: -	unsigned int *num;
1: -	const struct kernel_param_ops *ops;
1: -	void *elem;
1: +  unsigned int max;
1: +  unsigned int elemsize;
1: +  unsigned int *num;
1: +  const struct kernel_param_ops *ops;
1: +  void *elem;
1:  };
1:  
1:  enum module_state {
1: -	MODULE_STATE_LIVE = 0,
1: -	MODULE_STATE_COMING = 1,
1: -	MODULE_STATE_GOING = 2,
1: -	MODULE_STATE_UNFORMED = 3,
1: +  MODULE_STATE_LIVE = 0,
1: +  MODULE_STATE_COMING = 1,
1: +  MODULE_STATE_GOING = 2,
1: +  MODULE_STATE_UNFORMED = 3,
1:  };
1:  
1:  struct module_param_attrs;
1:  
1:  struct module_kobject {
1: -	struct kobject kobj;
1: -	struct module *mod;
1: -	struct kobject *drivers_dir;
1: -	struct module_param_attrs *mp;
1: -	struct completion *kobj_completion;
1: +  struct kobject kobj;
1: +  struct module *mod;
1: +  struct kobject *drivers_dir;
1: +  struct module_param_attrs *mp;
1: +  struct completion *kobj_completion;
1:  };
1:  
1:  struct latch_tree_node {
1: -	struct rb_node node[2];
1: +  struct rb_node node[2];
1:  };
1:  
1:  struct mod_tree_node {
1: -	struct module *mod;
1: -	struct latch_tree_node node;
1: +  struct module *mod;
1: +  struct latch_tree_node node;
1:  };
1:  
1:  struct module_layout {
1: -	void *base;
1: -	unsigned int size;
1: -	unsigned int text_size;
1: -	unsigned int ro_size;
1: -	unsigned int ro_after_init_size;
1: -	struct mod_tree_node mtn;
1: +  void *base;
1: +  unsigned int size;
1: +  unsigned int text_size;
1: +  unsigned int ro_size;
1: +  unsigned int ro_after_init_size;
1: +  struct mod_tree_node mtn;
1:  };
1:  
1:  struct mod_arch_specific {
1: -	unsigned int num_orcs;
1: -	int *orc_unwind_ip;
1: -	struct orc_entry *orc_unwind;
1: +  unsigned int num_orcs;
1: +  int *orc_unwind_ip;
1: +  struct orc_entry *orc_unwind;
1:  };
1:  
1:  struct mod_kallsyms {
1: -	Elf64_Sym *symtab;
1: -	unsigned int num_symtab;
1: -	char *strtab;
1: -	char *typetab;
1: +  Elf64_Sym *symtab;
1: +  unsigned int num_symtab;
1: +  char *strtab;
1: +  char *typetab;
1:  };
1:  
1:  struct module_attribute;
1: @@ -5056,118 +5066,119 @@ struct trace_eval_map;
1:  struct error_injection_entry;
1:  
1:  struct module {
1: -	enum module_state state;
1: -	struct list_head list;
1: -	char name[56];
1: -	struct module_kobject mkobj;
1: -	struct module_attribute *modinfo_attrs;
1: -	const char *version;
1: -	const char *srcversion;
1: -	struct kobject *holders_dir;
1: -	const struct kernel_symbol *syms;
1: -	const s32 *crcs;
1: -	unsigned int num_syms;
1: -	struct mutex param_lock;
1: -	struct kernel_param *kp;
1: -	unsigned int num_kp;
1: -	unsigned int num_gpl_syms;
1: -	const struct kernel_symbol *gpl_syms;
1: -	const s32 *gpl_crcs;
1: -	bool using_gplonly_symbols;
1: -	bool sig_ok;
1: -	bool async_probe_requested;
1: -	const struct kernel_symbol *gpl_future_syms;
1: -	const s32 *gpl_future_crcs;
1: -	unsigned int num_gpl_future_syms;
1: -	unsigned int num_exentries;
1: -	struct exception_table_entry *extable;
1: -	int (*init)();
1: -	long: 64;
1: -	struct module_layout core_layout;
1: -	struct module_layout init_layout;
1: -	struct mod_arch_specific arch;
1: -	long unsigned int taints;
1: -	unsigned int num_bugs;
1: -	struct list_head bug_list;
1: -	struct bug_entry *bug_table;
1: -	struct mod_kallsyms *kallsyms;
1: -	struct mod_kallsyms core_kallsyms;
1: -	struct module_sect_attrs *sect_attrs;
1: -	struct module_notes_attrs *notes_attrs;
1: -	char *args;
1: -	void *percpu;
1: -	unsigned int percpu_size;
1: -	void *noinstr_text_start;
1: -	unsigned int noinstr_text_size;
1: -	unsigned int num_tracepoints;
1: -	tracepoint_ptr_t *tracepoints_ptrs;
1: -	unsigned int num_srcu_structs;
1: -	struct srcu_struct **srcu_struct_ptrs;
1: -	unsigned int num_bpf_raw_events;
1: -	struct bpf_raw_event_map *bpf_raw_events;
1: -	unsigned int btf_data_size;
1: -	void *btf_data;
1: -	struct jump_entry *jump_entries;
1: -	unsigned int num_jump_entries;
1: -	unsigned int num_trace_bprintk_fmt;
1: -	const char **trace_bprintk_fmt_start;
1: -	struct trace_event_call **trace_events;
1: -	unsigned int num_trace_events;
1: -	struct trace_eval_map **trace_evals;
1: -	unsigned int num_trace_evals;
1: -	unsigned int num_ftrace_callsites;
1: -	long unsigned int *ftrace_callsites;
1: -	void *kprobes_text_start;
1: -	unsigned int kprobes_text_size;
1: -	long unsigned int *kprobe_blacklist;
1: -	unsigned int num_kprobe_blacklist;
1: -	int num_static_call_sites;
1: -	struct static_call_site *static_call_sites;
1: -	struct list_head source_list;
1: -	struct list_head target_list;
1: -	void (*exit)();
1: -	atomic_t refcnt;
1: -	struct error_injection_entry *ei_funcs;
1: -	unsigned int num_ei_funcs;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  enum module_state state;
1: +  struct list_head list;
1: +  char name[56];
1: +  struct module_kobject mkobj;
1: +  struct module_attribute *modinfo_attrs;
1: +  const char *version;
1: +  const char *srcversion;
1: +  struct kobject *holders_dir;
1: +  const struct kernel_symbol *syms;
1: +  const s32 *crcs;
1: +  unsigned int num_syms;
1: +  struct mutex param_lock;
1: +  struct kernel_param *kp;
1: +  unsigned int num_kp;
1: +  unsigned int num_gpl_syms;
1: +  const struct kernel_symbol *gpl_syms;
1: +  const s32 *gpl_crcs;
1: +  bool using_gplonly_symbols;
1: +  bool sig_ok;
1: +  bool async_probe_requested;
1: +  const struct kernel_symbol *gpl_future_syms;
1: +  const s32 *gpl_future_crcs;
1: +  unsigned int num_gpl_future_syms;
1: +  unsigned int num_exentries;
1: +  struct exception_table_entry *extable;
1: +  int (*init)();
1: +  long : 64;
1: +  struct module_layout core_layout;
1: +  struct module_layout init_layout;
1: +  struct mod_arch_specific arch;
1: +  long unsigned int taints;
1: +  unsigned int num_bugs;
1: +  struct list_head bug_list;
1: +  struct bug_entry *bug_table;
1: +  struct mod_kallsyms *kallsyms;
1: +  struct mod_kallsyms core_kallsyms;
1: +  struct module_sect_attrs *sect_attrs;
1: +  struct module_notes_attrs *notes_attrs;
1: +  char *args;
1: +  void *percpu;
1: +  unsigned int percpu_size;
1: +  void *noinstr_text_start;
1: +  unsigned int noinstr_text_size;
1: +  unsigned int num_tracepoints;
1: +  tracepoint_ptr_t *tracepoints_ptrs;
1: +  unsigned int num_srcu_structs;
1: +  struct srcu_struct **srcu_struct_ptrs;
1: +  unsigned int num_bpf_raw_events;
1: +  struct bpf_raw_event_map *bpf_raw_events;
1: +  unsigned int btf_data_size;
1: +  void *btf_data;
1: +  struct jump_entry *jump_entries;
1: +  unsigned int num_jump_entries;
1: +  unsigned int num_trace_bprintk_fmt;
1: +  const char **trace_bprintk_fmt_start;
1: +  struct trace_event_call **trace_events;
1: +  unsigned int num_trace_events;
1: +  struct trace_eval_map **trace_evals;
1: +  unsigned int num_trace_evals;
1: +  unsigned int num_ftrace_callsites;
1: +  long unsigned int *ftrace_callsites;
1: +  void *kprobes_text_start;
1: +  unsigned int kprobes_text_size;
1: +  long unsigned int *kprobe_blacklist;
1: +  unsigned int num_kprobe_blacklist;
1: +  int num_static_call_sites;
1: +  struct static_call_site *static_call_sites;
1: +  struct list_head source_list;
1: +  struct list_head target_list;
1: +  void (*exit)();
1: +  atomic_t refcnt;
1: +  struct error_injection_entry *ei_funcs;
1: +  unsigned int num_ei_funcs;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct error_injection_entry {
1: -	long unsigned int addr;
1: -	int etype;
1: +  long unsigned int addr;
1: +  int etype;
1:  };
1:  
1:  struct static_call_site {
1: -	s32 addr;
1: -	s32 key;
1: +  s32 addr;
1: +  s32 key;
1:  };
1:  
1:  struct module_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct module_attribute *, struct module_kobject *, char *);
1: -	ssize_t (*store)(struct module_attribute *, struct module_kobject *, const char *, size_t);
1: -	void (*setup)(struct module *, const char *);
1: -	int (*test)(struct module *);
1: -	void (*free)(struct module *);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct module_attribute *, struct module_kobject *, char *);
1: +  ssize_t (*store)(struct module_attribute *, struct module_kobject *,
1: +                   const char *, size_t);
1: +  void (*setup)(struct module *, const char *);
1: +  int (*test)(struct module *);
1: +  void (*free)(struct module *);
1:  };
1:  
1:  struct exception_table_entry {
1: -	int insn;
1: -	int fixup;
1: -	int handler;
1: +  int insn;
1: +  int fixup;
1: +  int handler;
1:  };
1:  
1:  struct trace_event_functions;
1:  
1:  struct trace_event {
1: -	struct hlist_node node;
1: -	struct list_head list;
1: -	int type;
1: -	struct trace_event_functions *funcs;
1: +  struct hlist_node node;
1: +  struct list_head list;
1: +  int type;
1: +  struct trace_event_functions *funcs;
1:  };
1:  
1:  struct trace_event_class;
1: @@ -5175,28 +5186,28 @@ struct trace_event_class;
1:  struct bpf_prog_array;
1:  
1:  struct trace_event_call {
1: -	struct list_head list;
1: -	struct trace_event_class *class;
1: -	union {
1: -		char *name;
1: -		struct tracepoint *tp;
1: -	};
1: -	struct trace_event event;
1: -	char *print_fmt;
1: -	struct event_filter *filter;
1: -	void *mod;
1: -	void *data;
1: -	int flags;
1: -	int perf_refcount;
1: -	struct hlist_head *perf_events;
1: -	struct bpf_prog_array *prog_array;
1: -	int (*perf_perm)(struct trace_event_call *, struct perf_event *);
1: +  struct list_head list;
1: +  struct trace_event_class *class;
1: +  union {
1: +    char *name;
1: +    struct tracepoint *tp;
1: +  };
1: +  struct trace_event event;
1: +  char *print_fmt;
1: +  struct event_filter *filter;
1: +  void *mod;
1: +  void *data;
1: +  int flags;
1: +  int perf_refcount;
1: +  struct hlist_head *perf_events;
1: +  struct bpf_prog_array *prog_array;
1: +  int (*perf_perm)(struct trace_event_call *, struct perf_event *);
1:  };
1:  
1:  struct trace_eval_map {
1: -	const char *system;
1: -	const char *eval_string;
1: -	long unsigned int eval_value;
1: +  const char *system;
1: +  const char *eval_string;
1: +  long unsigned int eval_value;
1:  };
1:  
1:  struct cgroup;
1: @@ -5204,109 +5215,109 @@ struct cgroup;
1:  struct cgroup_subsys;
1:  
1:  struct cgroup_subsys_state {
1: -	struct cgroup *cgroup;
1: -	struct cgroup_subsys *ss;
1: -	struct percpu_ref refcnt;
1: -	struct list_head sibling;
1: -	struct list_head children;
1: -	struct list_head rstat_css_node;
1: -	int id;
1: -	unsigned int flags;
1: -	u64 serial_nr;
1: -	atomic_t online_cnt;
1: -	struct work_struct destroy_work;
1: -	struct rcu_work destroy_rwork;
1: -	struct cgroup_subsys_state *parent;
1: +  struct cgroup *cgroup;
1: +  struct cgroup_subsys *ss;
1: +  struct percpu_ref refcnt;
1: +  struct list_head sibling;
1: +  struct list_head children;
1: +  struct list_head rstat_css_node;
1: +  int id;
1: +  unsigned int flags;
1: +  u64 serial_nr;
1: +  atomic_t online_cnt;
1: +  struct work_struct destroy_work;
1: +  struct rcu_work destroy_rwork;
1: +  struct cgroup_subsys_state *parent;
1:  };
1:  
1:  struct mem_cgroup_id {
1: -	int id;
1: -	refcount_t ref;
1: +  int id;
1: +  refcount_t ref;
1:  };
1:  
1:  struct page_counter {
1: -	atomic_long_t usage;
1: -	long unsigned int min;
1: -	long unsigned int low;
1: -	long unsigned int high;
1: -	long unsigned int max;
1: -	struct page_counter *parent;
1: -	long unsigned int emin;
1: -	atomic_long_t min_usage;
1: -	atomic_long_t children_min_usage;
1: -	long unsigned int elow;
1: -	atomic_long_t low_usage;
1: -	atomic_long_t children_low_usage;
1: -	long unsigned int watermark;
1: -	long unsigned int failcnt;
1: +  atomic_long_t usage;
1: +  long unsigned int min;
1: +  long unsigned int low;
1: +  long unsigned int high;
1: +  long unsigned int max;
1: +  struct page_counter *parent;
1: +  long unsigned int emin;
1: +  atomic_long_t min_usage;
1: +  atomic_long_t children_min_usage;
1: +  long unsigned int elow;
1: +  atomic_long_t low_usage;
1: +  atomic_long_t children_low_usage;
1: +  long unsigned int watermark;
1: +  long unsigned int failcnt;
1:  };
1:  
1:  struct vmpressure {
1: -	long unsigned int scanned;
1: -	long unsigned int reclaimed;
1: -	long unsigned int tree_scanned;
1: -	long unsigned int tree_reclaimed;
1: -	spinlock_t sr_lock;
1: -	struct list_head events;
1: -	struct mutex events_lock;
1: -	struct work_struct work;
1: +  long unsigned int scanned;
1: +  long unsigned int reclaimed;
1: +  long unsigned int tree_scanned;
1: +  long unsigned int tree_reclaimed;
1: +  spinlock_t sr_lock;
1: +  struct list_head events;
1: +  struct mutex events_lock;
1: +  struct work_struct work;
1:  };
1:  
1:  struct cgroup_file {
1: -	struct kernfs_node *kn;
1: -	long unsigned int notified_at;
1: -	struct timer_list notify_timer;
1: +  struct kernfs_node *kn;
1: +  long unsigned int notified_at;
1: +  struct timer_list notify_timer;
1:  };
1:  
1:  struct mem_cgroup_threshold_ary;
1:  
1:  struct mem_cgroup_thresholds {
1: -	struct mem_cgroup_threshold_ary *primary;
1: -	struct mem_cgroup_threshold_ary *spare;
1: +  struct mem_cgroup_threshold_ary *primary;
1: +  struct mem_cgroup_threshold_ary *spare;
1:  };
1:  
1:  struct memcg_padding {
1: -	char x[0];
1: +  char x[0];
1:  };
1:  
1:  enum memcg_kmem_state {
1: -	KMEM_NONE = 0,
1: -	KMEM_ALLOCATED = 1,
1: -	KMEM_ONLINE = 2,
1: +  KMEM_NONE = 0,
1: +  KMEM_ALLOCATED = 1,
1: +  KMEM_ONLINE = 2,
1:  };
1:  
1:  struct percpu_counter {
1: -	raw_spinlock_t lock;
1: -	s64 count;
1: -	struct list_head list;
1: -	s32 *counters;
1: +  raw_spinlock_t lock;
1: +  s64 count;
1: +  struct list_head list;
1: +  s32 *counters;
1:  };
1:  
1:  struct fprop_global {
1: -	struct percpu_counter events;
1: -	unsigned int period;
1: -	seqcount_t sequence;
1: +  struct percpu_counter events;
1: +  unsigned int period;
1: +  seqcount_t sequence;
1:  };
1:  
1:  struct wb_domain {
1: -	spinlock_t lock;
1: -	struct fprop_global completions;
1: -	struct timer_list period_timer;
1: -	long unsigned int period_time;
1: -	long unsigned int dirty_limit_tstamp;
1: -	long unsigned int dirty_limit;
1: +  spinlock_t lock;
1: +  struct fprop_global completions;
1: +  struct timer_list period_timer;
1: +  long unsigned int period_time;
1: +  long unsigned int dirty_limit_tstamp;
1: +  long unsigned int dirty_limit;
1:  };
1:  
1:  struct wb_completion {
1: -	atomic_t cnt;
1: -	wait_queue_head_t *waitq;
1: +  atomic_t cnt;
1: +  wait_queue_head_t *waitq;
1:  };
1:  
1:  struct memcg_cgwb_frn {
1: -	u64 bdi_id;
1: -	int memcg_id;
1: -	u64 at;
1: -	struct wb_completion done;
1: +  u64 bdi_id;
1: +  int memcg_id;
1: +  u64 at;
1: +  struct wb_completion done;
1:  };
1:  
1:  struct memcg_vmstats_percpu;
1: @@ -5316,94 +5327,94 @@ struct obj_cgroup;
1:  struct mem_cgroup_per_node;
1:  
1:  struct mem_cgroup {
1: -	struct cgroup_subsys_state css;
1: -	struct mem_cgroup_id id;
1: -	struct page_counter memory;
1: -	union {
1: -		struct page_counter swap;
1: -		struct page_counter memsw;
1: -	};
1: -	struct page_counter kmem;
1: -	struct page_counter tcpmem;
1: -	struct work_struct high_work;
1: -	long unsigned int soft_limit;
1: -	struct vmpressure vmpressure;
1: -	bool use_hierarchy;
1: -	bool oom_group;
1: -	bool oom_lock;
1: -	int under_oom;
1: -	int swappiness;
1: -	int oom_kill_disable;
1: -	struct cgroup_file events_file;
1: -	struct cgroup_file events_local_file;
1: -	struct cgroup_file swap_events_file;
1: -	struct mutex thresholds_lock;
1: -	struct mem_cgroup_thresholds thresholds;
1: -	struct mem_cgroup_thresholds memsw_thresholds;
1: -	struct list_head oom_notify;
1: -	long unsigned int move_charge_at_immigrate;
1: -	spinlock_t move_lock;
1: -	long unsigned int move_lock_flags;
1: -	long: 64;
1: -	long: 64;
1: -	struct memcg_padding _pad1_;
1: -	atomic_t moving_account;
1: -	struct task_struct *move_lock_task;
1: -	struct memcg_vmstats_percpu *vmstats_local;
1: -	struct memcg_vmstats_percpu *vmstats_percpu;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct memcg_padding _pad2_;
1: -	atomic_long_t vmstats[40];
1: -	atomic_long_t vmevents[96];
1: -	atomic_long_t memory_events[8];
1: -	atomic_long_t memory_events_local[8];
1: -	long unsigned int socket_pressure;
1: -	bool tcpmem_active;
1: -	int tcpmem_pressure;
1: -	int kmemcg_id;
1: -	enum memcg_kmem_state kmem_state;
1: -	struct obj_cgroup *objcg;
1: -	struct list_head objcg_list;
1: -	struct list_head cgwb_list;
1: -	struct wb_domain cgwb_domain;
1: -	struct memcg_cgwb_frn cgwb_frn[4];
1: -	struct list_head event_list;
1: -	spinlock_t event_list_lock;
1: -	struct deferred_split deferred_split_queue;
1: -	struct mem_cgroup_per_node *nodeinfo[0];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct cgroup_subsys_state css;
1: +  struct mem_cgroup_id id;
1: +  struct page_counter memory;
1: +  union {
1: +    struct page_counter swap;
1: +    struct page_counter memsw;
1: +  };
1: +  struct page_counter kmem;
1: +  struct page_counter tcpmem;
1: +  struct work_struct high_work;
1: +  long unsigned int soft_limit;
1: +  struct vmpressure vmpressure;
1: +  bool use_hierarchy;
1: +  bool oom_group;
1: +  bool oom_lock;
1: +  int under_oom;
1: +  int swappiness;
1: +  int oom_kill_disable;
1: +  struct cgroup_file events_file;
1: +  struct cgroup_file events_local_file;
1: +  struct cgroup_file swap_events_file;
1: +  struct mutex thresholds_lock;
1: +  struct mem_cgroup_thresholds thresholds;
1: +  struct mem_cgroup_thresholds memsw_thresholds;
1: +  struct list_head oom_notify;
1: +  long unsigned int move_charge_at_immigrate;
1: +  spinlock_t move_lock;
1: +  long unsigned int move_lock_flags;
1: +  long : 64;
1: +  long : 64;
1: +  struct memcg_padding _pad1_;
1: +  atomic_t moving_account;
1: +  struct task_struct *move_lock_task;
1: +  struct memcg_vmstats_percpu *vmstats_local;
1: +  struct memcg_vmstats_percpu *vmstats_percpu;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct memcg_padding _pad2_;
1: +  atomic_long_t vmstats[40];
1: +  atomic_long_t vmevents[96];
1: +  atomic_long_t memory_events[8];
1: +  atomic_long_t memory_events_local[8];
1: +  long unsigned int socket_pressure;
1: +  bool tcpmem_active;
1: +  int tcpmem_pressure;
1: +  int kmemcg_id;
1: +  enum memcg_kmem_state kmem_state;
1: +  struct obj_cgroup *objcg;
1: +  struct list_head objcg_list;
1: +  struct list_head cgwb_list;
1: +  struct wb_domain cgwb_domain;
1: +  struct memcg_cgwb_frn cgwb_frn[4];
1: +  struct list_head event_list;
1: +  spinlock_t event_list_lock;
1: +  struct deferred_split deferred_split_queue;
1: +  struct mem_cgroup_per_node *nodeinfo[0];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct fs_pin;
1:  
1:  struct pid_namespace {
1: -	struct kref kref;
1: -	struct idr idr;
1: -	struct callback_head rcu;
1: -	unsigned int pid_allocated;
1: -	struct task_struct *child_reaper;
1: -	struct kmem_cache *pid_cachep;
1: -	unsigned int level;
1: -	struct pid_namespace *parent;
1: -	struct fs_pin *bacct;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	int reboot;
1: -	struct ns_common ns;
1: +  struct kref kref;
1: +  struct idr idr;
1: +  struct callback_head rcu;
1: +  unsigned int pid_allocated;
1: +  struct task_struct *child_reaper;
1: +  struct kmem_cache *pid_cachep;
1: +  unsigned int level;
1: +  struct pid_namespace *parent;
1: +  struct fs_pin *bacct;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  int reboot;
1: +  struct ns_common ns;
1:  };
1:  
1:  struct task_cputime {
1: -	u64 stime;
1: -	u64 utime;
1: -	long long unsigned int sum_exec_runtime;
1: +  u64 stime;
1: +  u64 utime;
1: +  long long unsigned int sum_exec_runtime;
1:  };
1:  
1:  struct uts_namespace;
1: @@ -5419,273 +5430,273 @@ struct time_namespace;
1:  struct cgroup_namespace;
1:  
1:  struct nsproxy {
1: -	atomic_t count;
1: -	struct uts_namespace *uts_ns;
1: -	struct ipc_namespace *ipc_ns;
1: -	struct mnt_namespace *mnt_ns;
1: -	struct pid_namespace *pid_ns_for_children;
1: -	struct net *net_ns;
1: -	struct time_namespace *time_ns;
1: -	struct time_namespace *time_ns_for_children;
1: -	struct cgroup_namespace *cgroup_ns;
1: +  atomic_t count;
1: +  struct uts_namespace *uts_ns;
1: +  struct ipc_namespace *ipc_ns;
1: +  struct mnt_namespace *mnt_ns;
1: +  struct pid_namespace *pid_ns_for_children;
1: +  struct net *net_ns;
1: +  struct time_namespace *time_ns;
1: +  struct time_namespace *time_ns_for_children;
1: +  struct cgroup_namespace *cgroup_ns;
1:  };
1:  
1:  struct bio;
1:  
1:  struct bio_list {
1: -	struct bio *head;
1: -	struct bio *tail;
1: +  struct bio *head;
1: +  struct bio *tail;
1:  };
1:  
1:  struct blk_plug {
1: -	struct list_head mq_list;
1: -	struct list_head cb_list;
1: -	short unsigned int rq_count;
1: -	bool multiple_queues;
1: -	bool nowait;
1: +  struct list_head mq_list;
1: +  struct list_head cb_list;
1: +  short unsigned int rq_count;
1: +  bool multiple_queues;
1: +  bool nowait;
1:  };
1:  
1:  struct reclaim_state {
1: -	long unsigned int reclaimed_slab;
1: +  long unsigned int reclaimed_slab;
1:  };
1:  
1:  struct fprop_local_percpu {
1: -	struct percpu_counter events;
1: -	unsigned int period;
1: -	raw_spinlock_t lock;
1: +  struct percpu_counter events;
1: +  unsigned int period;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  enum wb_reason {
1: -	WB_REASON_BACKGROUND = 0,
1: -	WB_REASON_VMSCAN = 1,
1: -	WB_REASON_SYNC = 2,
1: -	WB_REASON_PERIODIC = 3,
1: -	WB_REASON_LAPTOP_TIMER = 4,
1: -	WB_REASON_FS_FREE_SPACE = 5,
1: -	WB_REASON_FORKER_THREAD = 6,
1: -	WB_REASON_FOREIGN_FLUSH = 7,
1: -	WB_REASON_MAX = 8,
1: +  WB_REASON_BACKGROUND = 0,
1: +  WB_REASON_VMSCAN = 1,
1: +  WB_REASON_SYNC = 2,
1: +  WB_REASON_PERIODIC = 3,
1: +  WB_REASON_LAPTOP_TIMER = 4,
1: +  WB_REASON_FS_FREE_SPACE = 5,
1: +  WB_REASON_FORKER_THREAD = 6,
1: +  WB_REASON_FOREIGN_FLUSH = 7,
1: +  WB_REASON_MAX = 8,
1:  };
1:  
1:  struct bdi_writeback {
1: -	struct backing_dev_info *bdi;
1: -	long unsigned int state;
1: -	long unsigned int last_old_flush;
1: -	struct list_head b_dirty;
1: -	struct list_head b_io;
1: -	struct list_head b_more_io;
1: -	struct list_head b_dirty_time;
1: -	spinlock_t list_lock;
1: -	struct percpu_counter stat[4];
1: -	long unsigned int congested;
1: -	long unsigned int bw_time_stamp;
1: -	long unsigned int dirtied_stamp;
1: -	long unsigned int written_stamp;
1: -	long unsigned int write_bandwidth;
1: -	long unsigned int avg_write_bandwidth;
1: -	long unsigned int dirty_ratelimit;
1: -	long unsigned int balanced_dirty_ratelimit;
1: -	struct fprop_local_percpu completions;
1: -	int dirty_exceeded;
1: -	enum wb_reason start_all_reason;
1: -	spinlock_t work_lock;
1: -	struct list_head work_list;
1: -	struct delayed_work dwork;
1: -	long unsigned int dirty_sleep;
1: -	struct list_head bdi_node;
1: -	struct percpu_ref refcnt;
1: -	struct fprop_local_percpu memcg_completions;
1: -	struct cgroup_subsys_state *memcg_css;
1: -	struct cgroup_subsys_state *blkcg_css;
1: -	struct list_head memcg_node;
1: -	struct list_head blkcg_node;
1: -	union {
1: -		struct work_struct release_work;
1: -		struct callback_head rcu;
1: -	};
1: +  struct backing_dev_info *bdi;
1: +  long unsigned int state;
1: +  long unsigned int last_old_flush;
1: +  struct list_head b_dirty;
1: +  struct list_head b_io;
1: +  struct list_head b_more_io;
1: +  struct list_head b_dirty_time;
1: +  spinlock_t list_lock;
1: +  struct percpu_counter stat[4];
1: +  long unsigned int congested;
1: +  long unsigned int bw_time_stamp;
1: +  long unsigned int dirtied_stamp;
1: +  long unsigned int written_stamp;
1: +  long unsigned int write_bandwidth;
1: +  long unsigned int avg_write_bandwidth;
1: +  long unsigned int dirty_ratelimit;
1: +  long unsigned int balanced_dirty_ratelimit;
1: +  struct fprop_local_percpu completions;
1: +  int dirty_exceeded;
1: +  enum wb_reason start_all_reason;
1: +  spinlock_t work_lock;
1: +  struct list_head work_list;
1: +  struct delayed_work dwork;
1: +  long unsigned int dirty_sleep;
1: +  struct list_head bdi_node;
1: +  struct percpu_ref refcnt;
1: +  struct fprop_local_percpu memcg_completions;
1: +  struct cgroup_subsys_state *memcg_css;
1: +  struct cgroup_subsys_state *blkcg_css;
1: +  struct list_head memcg_node;
1: +  struct list_head blkcg_node;
1: +  union {
1: +    struct work_struct release_work;
1: +    struct callback_head rcu;
1: +  };
1:  };
1:  
1:  struct device;
1:  
1:  struct backing_dev_info {
1: -	u64 id;
1: -	struct rb_node rb_node;
1: -	struct list_head bdi_list;
1: -	long unsigned int ra_pages;
1: -	long unsigned int io_pages;
1: -	struct kref refcnt;
1: -	unsigned int capabilities;
1: -	unsigned int min_ratio;
1: -	unsigned int max_ratio;
1: -	unsigned int max_prop_frac;
1: -	atomic_long_t tot_write_bandwidth;
1: -	struct bdi_writeback wb;
1: -	struct list_head wb_list;
1: -	struct xarray cgwb_tree;
1: -	struct mutex cgwb_release_mutex;
1: -	struct rw_semaphore wb_switch_rwsem;
1: -	wait_queue_head_t wb_waitq;
1: -	struct device *dev;
1: -	char dev_name[64];
1: -	struct device *owner;
1: -	struct timer_list laptop_mode_wb_timer;
1: -	struct dentry *debug_dir;
1: +  u64 id;
1: +  struct rb_node rb_node;
1: +  struct list_head bdi_list;
1: +  long unsigned int ra_pages;
1: +  long unsigned int io_pages;
1: +  struct kref refcnt;
1: +  unsigned int capabilities;
1: +  unsigned int min_ratio;
1: +  unsigned int max_ratio;
1: +  unsigned int max_prop_frac;
1: +  atomic_long_t tot_write_bandwidth;
1: +  struct bdi_writeback wb;
1: +  struct list_head wb_list;
1: +  struct xarray cgwb_tree;
1: +  struct mutex cgwb_release_mutex;
1: +  struct rw_semaphore wb_switch_rwsem;
1: +  wait_queue_head_t wb_waitq;
1: +  struct device *dev;
1: +  char dev_name[64];
1: +  struct device *owner;
1: +  struct timer_list laptop_mode_wb_timer;
1: +  struct dentry *debug_dir;
1:  };
1:  
1:  struct css_set {
1: -	struct cgroup_subsys_state *subsys[10];
1: -	refcount_t refcount;
1: -	struct css_set *dom_cset;
1: -	struct cgroup *dfl_cgrp;
1: -	int nr_tasks;
1: -	struct list_head tasks;
1: -	struct list_head mg_tasks;
1: -	struct list_head dying_tasks;
1: -	struct list_head task_iters;
1: -	struct list_head e_cset_node[10];
1: -	struct list_head threaded_csets;
1: -	struct list_head threaded_csets_node;
1: -	struct hlist_node hlist;
1: -	struct list_head cgrp_links;
1: -	struct list_head mg_preload_node;
1: -	struct list_head mg_node;
1: -	struct cgroup *mg_src_cgrp;
1: -	struct cgroup *mg_dst_cgrp;
1: -	struct css_set *mg_dst_cset;
1: -	bool dead;
1: -	struct callback_head callback_head;
1: +  struct cgroup_subsys_state *subsys[10];
1: +  refcount_t refcount;
1: +  struct css_set *dom_cset;
1: +  struct cgroup *dfl_cgrp;
1: +  int nr_tasks;
1: +  struct list_head tasks;
1: +  struct list_head mg_tasks;
1: +  struct list_head dying_tasks;
1: +  struct list_head task_iters;
1: +  struct list_head e_cset_node[10];
1: +  struct list_head threaded_csets;
1: +  struct list_head threaded_csets_node;
1: +  struct hlist_node hlist;
1: +  struct list_head cgrp_links;
1: +  struct list_head mg_preload_node;
1: +  struct list_head mg_node;
1: +  struct cgroup *mg_src_cgrp;
1: +  struct cgroup *mg_dst_cgrp;
1: +  struct css_set *mg_dst_cset;
1: +  bool dead;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  typedef u32 compat_uptr_t;
1:  
1:  struct compat_robust_list {
1: -	compat_uptr_t next;
1: +  compat_uptr_t next;
1:  };
1:  
1:  typedef s32 compat_long_t;
1:  
1:  struct compat_robust_list_head {
1: -	struct compat_robust_list list;
1: -	compat_long_t futex_offset;
1: -	compat_uptr_t list_op_pending;
1: +  struct compat_robust_list list;
1: +  compat_long_t futex_offset;
1: +  compat_uptr_t list_op_pending;
1:  };
1:  
1:  struct perf_event_groups {
1: -	struct rb_root tree;
1: -	u64 index;
1: +  struct rb_root tree;
1: +  u64 index;
1:  };
1:  
1:  struct perf_event_context {
1: -	struct pmu *pmu;
1: -	raw_spinlock_t lock;
1: -	struct mutex mutex;
1: -	struct list_head active_ctx_list;
1: -	struct perf_event_groups pinned_groups;
1: -	struct perf_event_groups flexible_groups;
1: -	struct list_head event_list;
1: -	struct list_head pinned_active;
1: -	struct list_head flexible_active;
1: -	int nr_events;
1: -	int nr_active;
1: -	int is_active;
1: -	int nr_stat;
1: -	int nr_freq;
1: -	int rotate_disable;
1: -	int rotate_necessary;
1: -	refcount_t refcount;
1: -	struct task_struct *task;
1: -	u64 time;
1: -	u64 timestamp;
1: -	struct perf_event_context *parent_ctx;
1: -	u64 parent_gen;
1: -	u64 generation;
1: -	int pin_count;
1: -	int nr_cgroups;
1: -	void *task_ctx_data;
1: -	struct callback_head callback_head;
1: +  struct pmu *pmu;
1: +  raw_spinlock_t lock;
1: +  struct mutex mutex;
1: +  struct list_head active_ctx_list;
1: +  struct perf_event_groups pinned_groups;
1: +  struct perf_event_groups flexible_groups;
1: +  struct list_head event_list;
1: +  struct list_head pinned_active;
1: +  struct list_head flexible_active;
1: +  int nr_events;
1: +  int nr_active;
1: +  int is_active;
1: +  int nr_stat;
1: +  int nr_freq;
1: +  int rotate_disable;
1: +  int rotate_necessary;
1: +  refcount_t refcount;
1: +  struct task_struct *task;
1: +  u64 time;
1: +  u64 timestamp;
1: +  struct perf_event_context *parent_ctx;
1: +  u64 parent_gen;
1: +  u64 generation;
1: +  int pin_count;
1: +  int nr_cgroups;
1: +  void *task_ctx_data;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct task_delay_info {
1: -	raw_spinlock_t lock;
1: -	unsigned int flags;
1: -	u64 blkio_start;
1: -	u64 blkio_delay;
1: -	u64 swapin_delay;
1: -	u32 blkio_count;
1: -	u32 swapin_count;
1: -	u64 freepages_start;
1: -	u64 freepages_delay;
1: -	u64 thrashing_start;
1: -	u64 thrashing_delay;
1: -	u32 freepages_count;
1: -	u32 thrashing_count;
1: +  raw_spinlock_t lock;
1: +  unsigned int flags;
1: +  u64 blkio_start;
1: +  u64 blkio_delay;
1: +  u64 swapin_delay;
1: +  u32 blkio_count;
1: +  u32 swapin_count;
1: +  u64 freepages_start;
1: +  u64 freepages_delay;
1: +  u64 thrashing_start;
1: +  u64 thrashing_delay;
1: +  u32 freepages_count;
1: +  u32 thrashing_count;
1:  };
1:  
1:  struct ftrace_ret_stack {
1: -	long unsigned int ret;
1: -	long unsigned int func;
1: -	long long unsigned int calltime;
1: -	long unsigned int *retp;
1: +  long unsigned int ret;
1: +  long unsigned int func;
1: +  long long unsigned int calltime;
1: +  long unsigned int *retp;
1:  };
1:  
1:  enum rpm_status {
1: -	RPM_ACTIVE = 0,
1: -	RPM_RESUMING = 1,
1: -	RPM_SUSPENDED = 2,
1: -	RPM_SUSPENDING = 3,
1: +  RPM_ACTIVE = 0,
1: +  RPM_RESUMING = 1,
1: +  RPM_SUSPENDED = 2,
1: +  RPM_SUSPENDING = 3,
1:  };
1:  
1:  struct blk_rq_stat {
1: -	u64 mean;
1: -	u64 min;
1: -	u64 max;
1: -	u32 nr_samples;
1: -	u64 batch;
1: +  u64 mean;
1: +  u64 min;
1: +  u64 max;
1: +  u32 nr_samples;
1: +  u64 batch;
1:  };
1:  
1:  enum blk_zoned_model {
1: -	BLK_ZONED_NONE = 0,
1: -	BLK_ZONED_HA = 1,
1: -	BLK_ZONED_HM = 2,
1: +  BLK_ZONED_NONE = 0,
1: +  BLK_ZONED_HA = 1,
1: +  BLK_ZONED_HM = 2,
1:  };
1:  
1:  struct queue_limits {
1: -	long unsigned int bounce_pfn;
1: -	long unsigned int seg_boundary_mask;
1: -	long unsigned int virt_boundary_mask;
1: -	unsigned int max_hw_sectors;
1: -	unsigned int max_dev_sectors;
1: -	unsigned int chunk_sectors;
1: -	unsigned int max_sectors;
1: -	unsigned int max_segment_size;
1: -	unsigned int physical_block_size;
1: -	unsigned int logical_block_size;
1: -	unsigned int alignment_offset;
1: -	unsigned int io_min;
1: -	unsigned int io_opt;
1: -	unsigned int max_discard_sectors;
1: -	unsigned int max_hw_discard_sectors;
1: -	unsigned int max_write_same_sectors;
1: -	unsigned int max_write_zeroes_sectors;
1: -	unsigned int max_zone_append_sectors;
1: -	unsigned int discard_granularity;
1: -	unsigned int discard_alignment;
1: -	short unsigned int max_segments;
1: -	short unsigned int max_integrity_segments;
1: -	short unsigned int max_discard_segments;
1: -	unsigned char misaligned;
1: -	unsigned char discard_misaligned;
1: -	unsigned char raid_partial_stripes_expensive;
1: -	enum blk_zoned_model zoned;
1: +  long unsigned int bounce_pfn;
1: +  long unsigned int seg_boundary_mask;
1: +  long unsigned int virt_boundary_mask;
1: +  unsigned int max_hw_sectors;
1: +  unsigned int max_dev_sectors;
1: +  unsigned int chunk_sectors;
1: +  unsigned int max_sectors;
1: +  unsigned int max_segment_size;
1: +  unsigned int physical_block_size;
1: +  unsigned int logical_block_size;
1: +  unsigned int alignment_offset;
1: +  unsigned int io_min;
1: +  unsigned int io_opt;
1: +  unsigned int max_discard_sectors;
1: +  unsigned int max_hw_discard_sectors;
1: +  unsigned int max_write_same_sectors;
1: +  unsigned int max_write_zeroes_sectors;
1: +  unsigned int max_zone_append_sectors;
1: +  unsigned int discard_granularity;
1: +  unsigned int discard_alignment;
1: +  short unsigned int max_segments;
1: +  short unsigned int max_integrity_segments;
1: +  short unsigned int max_discard_segments;
1: +  unsigned char misaligned;
1: +  unsigned char discard_misaligned;
1: +  unsigned char raid_partial_stripes_expensive;
1: +  enum blk_zoned_model zoned;
1:  };
1:  
1:  struct bsg_ops;
1:  
1:  struct bsg_class_device {
1: -	struct device *class_dev;
1: -	int minor;
1: -	struct request_queue *queue;
1: -	const struct bsg_ops *ops;
1: +  struct device *class_dev;
1: +  int minor;
1: +  struct request_queue *queue;
1: +  const struct bsg_ops *ops;
1:  };
1:  
1:  typedef void *mempool_alloc_t(gfp_t, void *);
1: @@ -5693,27 +5704,27 @@ typedef void *mempool_alloc_t(gfp_t, void *);
1:  typedef void mempool_free_t(void *, void *);
1:  
1:  struct mempool_s {
1: -	spinlock_t lock;
1: -	int min_nr;
1: -	int curr_nr;
1: -	void **elements;
1: -	void *pool_data;
1: -	mempool_alloc_t *alloc;
1: -	mempool_free_t *free;
1: -	wait_queue_head_t wait;
1: +  spinlock_t lock;
1: +  int min_nr;
1: +  int curr_nr;
1: +  void **elements;
1: +  void *pool_data;
1: +  mempool_alloc_t *alloc;
1: +  mempool_free_t *free;
1: +  wait_queue_head_t wait;
1:  };
1:  
1:  typedef struct mempool_s mempool_t;
1:  
1:  struct bio_set {
1: -	struct kmem_cache *bio_slab;
1: -	unsigned int front_pad;
1: -	mempool_t bio_pool;
1: -	mempool_t bvec_pool;
1: -	spinlock_t rescue_lock;
1: -	struct bio_list rescue_list;
1: -	struct work_struct rescue_work;
1: -	struct workqueue_struct *rescue_workqueue;
1: +  struct kmem_cache *bio_slab;
1: +  unsigned int front_pad;
1: +  mempool_t bio_pool;
1: +  mempool_t bvec_pool;
1: +  spinlock_t rescue_lock;
1: +  struct bio_list rescue_list;
1: +  struct work_struct rescue_work;
1: +  struct workqueue_struct *rescue_workqueue;
1:  };
1:  
1:  struct request;
1: @@ -5743,118 +5754,118 @@ struct throtl_data;
1:  struct blk_mq_tag_set;
1:  
1:  struct request_queue {
1: -	struct request *last_merge;
1: -	struct elevator_queue *elevator;
1: -	struct percpu_ref q_usage_counter;
1: -	struct blk_queue_stats *stats;
1: -	struct rq_qos *rq_qos;
1: -	const struct blk_mq_ops *mq_ops;
1: -	struct blk_mq_ctx *queue_ctx;
1: -	unsigned int queue_depth;
1: -	struct blk_mq_hw_ctx **queue_hw_ctx;
1: -	unsigned int nr_hw_queues;
1: -	struct backing_dev_info *backing_dev_info;
1: -	void *queuedata;
1: -	long unsigned int queue_flags;
1: -	atomic_t pm_only;
1: -	int id;
1: -	gfp_t bounce_gfp;
1: -	spinlock_t queue_lock;
1: -	struct kobject kobj;
1: -	struct kobject *mq_kobj;
1: -	struct device *dev;
1: -	enum rpm_status rpm_status;
1: -	unsigned int nr_pending;
1: -	long unsigned int nr_requests;
1: -	unsigned int dma_pad_mask;
1: -	unsigned int dma_alignment;
1: -	unsigned int rq_timeout;
1: -	int poll_nsec;
1: -	struct blk_stat_callback *poll_cb;
1: -	struct blk_rq_stat poll_stat[16];
1: -	struct timer_list timeout;
1: -	struct work_struct timeout_work;
1: -	atomic_t nr_active_requests_shared_sbitmap;
1: -	struct list_head icq_list;
1: -	long unsigned int blkcg_pols[1];
1: -	struct blkcg_gq *root_blkg;
1: -	struct list_head blkg_list;
1: -	struct queue_limits limits;
1: -	unsigned int required_elevator_features;
1: -	unsigned int sg_timeout;
1: -	unsigned int sg_reserved_size;
1: -	int node;
1: -	struct mutex debugfs_mutex;
1: -	struct blk_trace *blk_trace;
1: -	struct blk_flush_queue *fq;
1: -	struct list_head requeue_list;
1: -	spinlock_t requeue_lock;
1: -	struct delayed_work requeue_work;
1: -	struct mutex sysfs_lock;
1: -	struct mutex sysfs_dir_lock;
1: -	struct list_head unused_hctx_list;
1: -	spinlock_t unused_hctx_lock;
1: -	int mq_freeze_depth;
1: -	struct bsg_class_device bsg_dev;
1: -	struct throtl_data *td;
1: -	struct callback_head callback_head;
1: -	wait_queue_head_t mq_freeze_wq;
1: -	struct mutex mq_freeze_lock;
1: -	struct blk_mq_tag_set *tag_set;
1: -	struct list_head tag_set_list;
1: -	struct bio_set bio_split;
1: -	struct dentry *debugfs_dir;
1: -	struct dentry *sched_debugfs_dir;
1: -	struct dentry *rqos_debugfs_dir;
1: -	bool mq_sysfs_init_done;
1: -	size_t cmd_size;
1: -	u64 write_hints[5];
1: +  struct request *last_merge;
1: +  struct elevator_queue *elevator;
1: +  struct percpu_ref q_usage_counter;
1: +  struct blk_queue_stats *stats;
1: +  struct rq_qos *rq_qos;
1: +  const struct blk_mq_ops *mq_ops;
1: +  struct blk_mq_ctx *queue_ctx;
1: +  unsigned int queue_depth;
1: +  struct blk_mq_hw_ctx **queue_hw_ctx;
1: +  unsigned int nr_hw_queues;
1: +  struct backing_dev_info *backing_dev_info;
1: +  void *queuedata;
1: +  long unsigned int queue_flags;
1: +  atomic_t pm_only;
1: +  int id;
1: +  gfp_t bounce_gfp;
1: +  spinlock_t queue_lock;
1: +  struct kobject kobj;
1: +  struct kobject *mq_kobj;
1: +  struct device *dev;
1: +  enum rpm_status rpm_status;
1: +  unsigned int nr_pending;
1: +  long unsigned int nr_requests;
1: +  unsigned int dma_pad_mask;
1: +  unsigned int dma_alignment;
1: +  unsigned int rq_timeout;
1: +  int poll_nsec;
1: +  struct blk_stat_callback *poll_cb;
1: +  struct blk_rq_stat poll_stat[16];
1: +  struct timer_list timeout;
1: +  struct work_struct timeout_work;
1: +  atomic_t nr_active_requests_shared_sbitmap;
1: +  struct list_head icq_list;
1: +  long unsigned int blkcg_pols[1];
1: +  struct blkcg_gq *root_blkg;
1: +  struct list_head blkg_list;
1: +  struct queue_limits limits;
1: +  unsigned int required_elevator_features;
1: +  unsigned int sg_timeout;
1: +  unsigned int sg_reserved_size;
1: +  int node;
1: +  struct mutex debugfs_mutex;
1: +  struct blk_trace *blk_trace;
1: +  struct blk_flush_queue *fq;
1: +  struct list_head requeue_list;
1: +  spinlock_t requeue_lock;
1: +  struct delayed_work requeue_work;
1: +  struct mutex sysfs_lock;
1: +  struct mutex sysfs_dir_lock;
1: +  struct list_head unused_hctx_list;
1: +  spinlock_t unused_hctx_lock;
1: +  int mq_freeze_depth;
1: +  struct bsg_class_device bsg_dev;
1: +  struct throtl_data *td;
1: +  struct callback_head callback_head;
1: +  wait_queue_head_t mq_freeze_wq;
1: +  struct mutex mq_freeze_lock;
1: +  struct blk_mq_tag_set *tag_set;
1: +  struct list_head tag_set_list;
1: +  struct bio_set bio_split;
1: +  struct dentry *debugfs_dir;
1: +  struct dentry *sched_debugfs_dir;
1: +  struct dentry *rqos_debugfs_dir;
1: +  bool mq_sysfs_init_done;
1: +  size_t cmd_size;
1: +  u64 write_hints[5];
1:  };
1:  
1:  struct cgroup_base_stat {
1: -	struct task_cputime cputime;
1: +  struct task_cputime cputime;
1:  };
1:  
1:  struct psi_group_cpu;
1:  
1:  struct psi_group {
1: -	struct mutex avgs_lock;
1: -	struct psi_group_cpu *pcpu;
1: -	u64 avg_total[5];
1: -	u64 avg_last_update;
1: -	u64 avg_next_update;
1: -	struct delayed_work avgs_work;
1: -	u64 total[10];
1: -	long unsigned int avg[15];
1: -	struct task_struct *poll_task;
1: -	struct timer_list poll_timer;
1: -	wait_queue_head_t poll_wait;
1: -	atomic_t poll_wakeup;
1: -	struct mutex trigger_lock;
1: -	struct list_head triggers;
1: -	u32 nr_triggers[5];
1: -	u32 poll_states;
1: -	u64 poll_min_period;
1: -	u64 polling_total[5];
1: -	u64 polling_next_update;
1: -	u64 polling_until;
1: +  struct mutex avgs_lock;
1: +  struct psi_group_cpu *pcpu;
1: +  u64 avg_total[5];
1: +  u64 avg_last_update;
1: +  u64 avg_next_update;
1: +  struct delayed_work avgs_work;
1: +  u64 total[10];
1: +  long unsigned int avg[15];
1: +  struct task_struct *poll_task;
1: +  struct timer_list poll_timer;
1: +  wait_queue_head_t poll_wait;
1: +  atomic_t poll_wakeup;
1: +  struct mutex trigger_lock;
1: +  struct list_head triggers;
1: +  u32 nr_triggers[5];
1: +  u32 poll_states;
1: +  u64 poll_min_period;
1: +  u64 polling_total[5];
1: +  u64 polling_next_update;
1: +  u64 polling_until;
1:  };
1:  
1:  struct cgroup_bpf {
1: -	struct bpf_prog_array *effective[38];
1: -	struct list_head progs[38];
1: -	u32 flags[38];
1: -	struct list_head storages;
1: -	struct bpf_prog_array *inactive;
1: -	struct percpu_ref refcnt;
1: -	struct work_struct release_work;
1: +  struct bpf_prog_array *effective[38];
1: +  struct list_head progs[38];
1: +  u32 flags[38];
1: +  struct list_head storages;
1: +  struct bpf_prog_array *inactive;
1: +  struct percpu_ref refcnt;
1: +  struct work_struct release_work;
1:  };
1:  
1:  struct cgroup_freezer_state {
1: -	bool freeze;
1: -	int e_freeze;
1: -	int nr_frozen_descendants;
1: -	int nr_frozen_tasks;
1: +  bool freeze;
1: +  int e_freeze;
1: +  int nr_frozen_descendants;
1: +  int nr_frozen_tasks;
1:  };
1:  
1:  struct cgroup_root;
1: @@ -5862,141 +5873,139 @@ struct cgroup_root;
1:  struct cgroup_rstat_cpu;
1:  
1:  struct cgroup {
1: -	struct cgroup_subsys_state self;
1: -	long unsigned int flags;
1: -	int level;
1: -	int max_depth;
1: -	int nr_descendants;
1: -	int nr_dying_descendants;
1: -	int max_descendants;
1: -	int nr_populated_csets;
1: -	int nr_populated_domain_children;
1: -	int nr_populated_threaded_children;
1: -	int nr_threaded_children;
1: -	struct kernfs_node *kn;
1: -	struct cgroup_file procs_file;
1: -	struct cgroup_file events_file;
1: -	u16 subtree_control;
1: -	u16 subtree_ss_mask;
1: -	u16 old_subtree_control;
1: -	u16 old_subtree_ss_mask;
1: -	struct cgroup_subsys_state *subsys[10];
1: -	struct cgroup_root *root;
1: -	struct list_head cset_links;
1: -	struct list_head e_csets[10];
1: -	struct cgroup *dom_cgrp;
1: -	struct cgroup *old_dom_cgrp;
1: -	struct cgroup_rstat_cpu *rstat_cpu;
1: -	struct list_head rstat_css_list;
1: -	struct cgroup_base_stat last_bstat;
1: -	struct cgroup_base_stat bstat;
1: -	struct prev_cputime prev_cputime;
1: -	struct list_head pidlists;
1: -	struct mutex pidlist_mutex;
1: -	wait_queue_head_t offline_waitq;
1: -	struct work_struct release_agent_work;
1: -	struct psi_group psi;
1: -	struct cgroup_bpf bpf;
1: -	atomic_t congestion_count;
1: -	struct cgroup_freezer_state freezer;
1: -	u64 ancestor_ids[0];
1: +  struct cgroup_subsys_state self;
1: +  long unsigned int flags;
1: +  int level;
1: +  int max_depth;
1: +  int nr_descendants;
1: +  int nr_dying_descendants;
1: +  int max_descendants;
1: +  int nr_populated_csets;
1: +  int nr_populated_domain_children;
1: +  int nr_populated_threaded_children;
1: +  int nr_threaded_children;
1: +  struct kernfs_node *kn;
1: +  struct cgroup_file procs_file;
1: +  struct cgroup_file events_file;
1: +  u16 subtree_control;
1: +  u16 subtree_ss_mask;
1: +  u16 old_subtree_control;
1: +  u16 old_subtree_ss_mask;
1: +  struct cgroup_subsys_state *subsys[10];
1: +  struct cgroup_root *root;
1: +  struct list_head cset_links;
1: +  struct list_head e_csets[10];
1: +  struct cgroup *dom_cgrp;
1: +  struct cgroup *old_dom_cgrp;
1: +  struct cgroup_rstat_cpu *rstat_cpu;
1: +  struct list_head rstat_css_list;
1: +  struct cgroup_base_stat last_bstat;
1: +  struct cgroup_base_stat bstat;
1: +  struct prev_cputime prev_cputime;
1: +  struct list_head pidlists;
1: +  struct mutex pidlist_mutex;
1: +  wait_queue_head_t offline_waitq;
1: +  struct work_struct release_agent_work;
1: +  struct psi_group psi;
1: +  struct cgroup_bpf bpf;
1: +  atomic_t congestion_count;
1: +  struct cgroup_freezer_state freezer;
1: +  u64 ancestor_ids[0];
1:  };
1:  
1:  struct taskstats {
1: -	__u16 version;
1: -	__u32 ac_exitcode;
1: -	__u8 ac_flag;
1: -	__u8 ac_nice;
1: -	__u64 cpu_count;
1: -	__u64 cpu_delay_total;
1: -	__u64 blkio_count;
1: -	__u64 blkio_delay_total;
1: -	__u64 swapin_count;
1: -	__u64 swapin_delay_total;
1: -	__u64 cpu_run_real_total;
1: -	__u64 cpu_run_virtual_total;
1: -	char ac_comm[32];
1: -	__u8 ac_sched;
1: -	__u8 ac_pad[3];
1: -	int: 32;
1: -	__u32 ac_uid;
1: -	__u32 ac_gid;
1: -	__u32 ac_pid;
1: -	__u32 ac_ppid;
1: -	__u32 ac_btime;
1: -	__u64 ac_etime;
1: -	__u64 ac_utime;
1: -	__u64 ac_stime;
1: -	__u64 ac_minflt;
1: -	__u64 ac_majflt;
1: -	__u64 coremem;
1: -	__u64 virtmem;
1: -	__u64 hiwater_rss;
1: -	__u64 hiwater_vm;
1: -	__u64 read_char;
1: -	__u64 write_char;
1: -	__u64 read_syscalls;
1: -	__u64 write_syscalls;
1: -	__u64 read_bytes;
1: -	__u64 write_bytes;
1: -	__u64 cancelled_write_bytes;
1: -	__u64 nvcsw;
1: -	__u64 nivcsw;
1: -	__u64 ac_utimescaled;
1: -	__u64 ac_stimescaled;
1: -	__u64 cpu_scaled_run_real_total;
1: -	__u64 freepages_count;
1: -	__u64 freepages_delay_total;
1: -	__u64 thrashing_count;
1: -	__u64 thrashing_delay_total;
1: -	__u64 ac_btime64;
1: -};
1: -
1: -typedef struct {
1: -	__u8 b[16];
1: -} guid_t;
1: +  __u16 version;
1: +  __u32 ac_exitcode;
1: +  __u8 ac_flag;
1: +  __u8 ac_nice;
1: +  __u64 cpu_count;
1: +  __u64 cpu_delay_total;
1: +  __u64 blkio_count;
1: +  __u64 blkio_delay_total;
1: +  __u64 swapin_count;
1: +  __u64 swapin_delay_total;
1: +  __u64 cpu_run_real_total;
1: +  __u64 cpu_run_virtual_total;
1: +  char ac_comm[32];
1: +  __u8 ac_sched;
1: +  __u8 ac_pad[3];
1: +  int : 32;
1: +  __u32 ac_uid;
1: +  __u32 ac_gid;
1: +  __u32 ac_pid;
1: +  __u32 ac_ppid;
1: +  __u32 ac_btime;
1: +  __u64 ac_etime;
1: +  __u64 ac_utime;
1: +  __u64 ac_stime;
1: +  __u64 ac_minflt;
1: +  __u64 ac_majflt;
1: +  __u64 coremem;
1: +  __u64 virtmem;
1: +  __u64 hiwater_rss;
1: +  __u64 hiwater_vm;
1: +  __u64 read_char;
1: +  __u64 write_char;
1: +  __u64 read_syscalls;
1: +  __u64 write_syscalls;
1: +  __u64 read_bytes;
1: +  __u64 write_bytes;
1: +  __u64 cancelled_write_bytes;
1: +  __u64 nvcsw;
1: +  __u64 nivcsw;
1: +  __u64 ac_utimescaled;
1: +  __u64 ac_stimescaled;
1: +  __u64 cpu_scaled_run_real_total;
1: +  __u64 freepages_count;
1: +  __u64 freepages_delay_total;
1: +  __u64 thrashing_count;
1: +  __u64 thrashing_delay_total;
1: +  __u64 ac_btime64;
1: +};
1: +
1: +typedef struct { __u8 b[16]; } guid_t;
1:  
1:  struct wait_page_queue {
1: -	struct page *page;
1: -	int bit_nr;
1: -	wait_queue_entry_t wait;
1: +  struct page *page;
1: +  int bit_nr;
1: +  wait_queue_entry_t wait;
1:  };
1:  
1:  enum writeback_sync_modes {
1: -	WB_SYNC_NONE = 0,
1: -	WB_SYNC_ALL = 1,
1: +  WB_SYNC_NONE = 0,
1: +  WB_SYNC_ALL = 1,
1:  };
1:  
1:  struct writeback_control {
1: -	long int nr_to_write;
1: -	long int pages_skipped;
1: -	loff_t range_start;
1: -	loff_t range_end;
1: -	enum writeback_sync_modes sync_mode;
1: -	unsigned int for_kupdate: 1;
1: -	unsigned int for_background: 1;
1: -	unsigned int tagged_writepages: 1;
1: -	unsigned int for_reclaim: 1;
1: -	unsigned int range_cyclic: 1;
1: -	unsigned int for_sync: 1;
1: -	unsigned int no_cgroup_owner: 1;
1: -	unsigned int punt_to_cgroup: 1;
1: -	struct bdi_writeback *wb;
1: -	struct inode *inode;
1: -	int wb_id;
1: -	int wb_lcand_id;
1: -	int wb_tcand_id;
1: -	size_t wb_bytes;
1: -	size_t wb_lcand_bytes;
1: -	size_t wb_tcand_bytes;
1: +  long int nr_to_write;
1: +  long int pages_skipped;
1: +  loff_t range_start;
1: +  loff_t range_end;
1: +  enum writeback_sync_modes sync_mode;
1: +  unsigned int for_kupdate : 1;
1: +  unsigned int for_background : 1;
1: +  unsigned int tagged_writepages : 1;
1: +  unsigned int for_reclaim : 1;
1: +  unsigned int range_cyclic : 1;
1: +  unsigned int for_sync : 1;
1: +  unsigned int no_cgroup_owner : 1;
1: +  unsigned int punt_to_cgroup : 1;
1: +  struct bdi_writeback *wb;
1: +  struct inode *inode;
1: +  int wb_id;
1: +  int wb_lcand_id;
1: +  int wb_tcand_id;
1: +  size_t wb_bytes;
1: +  size_t wb_lcand_bytes;
1: +  size_t wb_tcand_bytes;
1:  };
1:  
1:  struct readahead_control {
1: -	struct file *file;
1: -	struct address_space *mapping;
1: -	long unsigned int _index;
1: -	unsigned int _nr_pages;
1: -	unsigned int _batch_count;
1: +  struct file *file;
1: +  struct address_space *mapping;
1: +  long unsigned int _index;
1: +  unsigned int _nr_pages;
1: +  unsigned int _batch_count;
1:  };
1:  
1:  struct iovec;
1: @@ -6006,63 +6015,63 @@ struct kvec;
1:  struct bio_vec;
1:  
1:  struct iov_iter {
1: -	unsigned int type;
1: -	size_t iov_offset;
1: -	size_t count;
1: -	union {
1: -		const struct iovec *iov;
1: -		const struct kvec *kvec;
1: -		const struct bio_vec *bvec;
1: -		struct pipe_inode_info *pipe;
1: -	};
1: -	union {
1: -		long unsigned int nr_segs;
1: -		struct {
1: -			unsigned int head;
1: -			unsigned int start_head;
1: -		};
1: -	};
1: +  unsigned int type;
1: +  size_t iov_offset;
1: +  size_t count;
1: +  union {
1: +    const struct iovec *iov;
1: +    const struct kvec *kvec;
1: +    const struct bio_vec *bvec;
1: +    struct pipe_inode_info *pipe;
1: +  };
1: +  union {
1: +    long unsigned int nr_segs;
1: +    struct {
1: +      unsigned int head;
1: +      unsigned int start_head;
1: +    };
1: +  };
1:  };
1:  
1:  struct swap_cluster_info {
1: -	spinlock_t lock;
1: -	unsigned int data: 24;
1: -	unsigned int flags: 8;
1: +  spinlock_t lock;
1: +  unsigned int data : 24;
1: +  unsigned int flags : 8;
1:  };
1:  
1:  struct swap_cluster_list {
1: -	struct swap_cluster_info head;
1: -	struct swap_cluster_info tail;
1: +  struct swap_cluster_info head;
1: +  struct swap_cluster_info tail;
1:  };
1:  
1:  struct percpu_cluster;
1:  
1:  struct swap_info_struct {
1: -	long unsigned int flags;
1: -	short int prio;
1: -	struct plist_node list;
1: -	signed char type;
1: -	unsigned int max;
1: -	unsigned char *swap_map;
1: -	struct swap_cluster_info *cluster_info;
1: -	struct swap_cluster_list free_clusters;
1: -	unsigned int lowest_bit;
1: -	unsigned int highest_bit;
1: -	unsigned int pages;
1: -	unsigned int inuse_pages;
1: -	unsigned int cluster_next;
1: -	unsigned int cluster_nr;
1: -	unsigned int *cluster_next_cpu;
1: -	struct percpu_cluster *percpu_cluster;
1: -	struct rb_root swap_extent_root;
1: -	struct block_device *bdev;
1: -	struct file *swap_file;
1: -	unsigned int old_block_size;
1: -	spinlock_t lock;
1: -	spinlock_t cont_lock;
1: -	struct work_struct discard_work;
1: -	struct swap_cluster_list discard_clusters;
1: -	struct plist_node avail_lists[0];
1: +  long unsigned int flags;
1: +  short int prio;
1: +  struct plist_node list;
1: +  signed char type;
1: +  unsigned int max;
1: +  unsigned char *swap_map;
1: +  struct swap_cluster_info *cluster_info;
1: +  struct swap_cluster_list free_clusters;
1: +  unsigned int lowest_bit;
1: +  unsigned int highest_bit;
1: +  unsigned int pages;
1: +  unsigned int inuse_pages;
1: +  unsigned int cluster_next;
1: +  unsigned int cluster_nr;
1: +  unsigned int *cluster_next_cpu;
1: +  struct percpu_cluster *percpu_cluster;
1: +  struct rb_root swap_extent_root;
1: +  struct block_device *bdev;
1: +  struct file *swap_file;
1: +  unsigned int old_block_size;
1: +  spinlock_t lock;
1: +  spinlock_t cont_lock;
1: +  struct work_struct discard_work;
1: +  struct swap_cluster_list discard_clusters;
1: +  struct plist_node avail_lists[0];
1:  };
1:  
1:  struct hd_struct;
1: @@ -6070,234 +6079,234 @@ struct hd_struct;
1:  struct gendisk;
1:  
1:  struct block_device {
1: -	dev_t bd_dev;
1: -	int bd_openers;
1: -	struct inode *bd_inode;
1: -	struct super_block *bd_super;
1: -	struct mutex bd_mutex;
1: -	void *bd_claiming;
1: -	void *bd_holder;
1: -	int bd_holders;
1: -	bool bd_write_holder;
1: -	struct list_head bd_holder_disks;
1: -	struct block_device *bd_contains;
1: -	u8 bd_partno;
1: -	struct hd_struct *bd_part;
1: -	unsigned int bd_part_count;
1: -	spinlock_t bd_size_lock;
1: -	struct gendisk *bd_disk;
1: -	struct backing_dev_info *bd_bdi;
1: -	int bd_fsfreeze_count;
1: -	struct mutex bd_fsfreeze_mutex;
1: +  dev_t bd_dev;
1: +  int bd_openers;
1: +  struct inode *bd_inode;
1: +  struct super_block *bd_super;
1: +  struct mutex bd_mutex;
1: +  void *bd_claiming;
1: +  void *bd_holder;
1: +  int bd_holders;
1: +  bool bd_write_holder;
1: +  struct list_head bd_holder_disks;
1: +  struct block_device *bd_contains;
1: +  u8 bd_partno;
1: +  struct hd_struct *bd_part;
1: +  unsigned int bd_part_count;
1: +  spinlock_t bd_size_lock;
1: +  struct gendisk *bd_disk;
1: +  struct backing_dev_info *bd_bdi;
1: +  int bd_fsfreeze_count;
1: +  struct mutex bd_fsfreeze_mutex;
1:  };
1:  
1:  struct cdev {
1: -	struct kobject kobj;
1: -	struct module *owner;
1: -	const struct file_operations *ops;
1: -	struct list_head list;
1: -	dev_t dev;
1: -	unsigned int count;
1: +  struct kobject kobj;
1: +  struct module *owner;
1: +  const struct file_operations *ops;
1: +  struct list_head list;
1: +  dev_t dev;
1: +  unsigned int count;
1:  };
1:  
1:  struct fc_log;
1:  
1:  struct p_log {
1: -	const char *prefix;
1: -	struct fc_log *log;
1: +  const char *prefix;
1: +  struct fc_log *log;
1:  };
1:  
1:  enum fs_context_purpose {
1: -	FS_CONTEXT_FOR_MOUNT = 0,
1: -	FS_CONTEXT_FOR_SUBMOUNT = 1,
1: -	FS_CONTEXT_FOR_RECONFIGURE = 2,
1: +  FS_CONTEXT_FOR_MOUNT = 0,
1: +  FS_CONTEXT_FOR_SUBMOUNT = 1,
1: +  FS_CONTEXT_FOR_RECONFIGURE = 2,
1:  };
1:  
1:  enum fs_context_phase {
1: -	FS_CONTEXT_CREATE_PARAMS = 0,
1: -	FS_CONTEXT_CREATING = 1,
1: -	FS_CONTEXT_AWAITING_MOUNT = 2,
1: -	FS_CONTEXT_AWAITING_RECONF = 3,
1: -	FS_CONTEXT_RECONF_PARAMS = 4,
1: -	FS_CONTEXT_RECONFIGURING = 5,
1: -	FS_CONTEXT_FAILED = 6,
1: +  FS_CONTEXT_CREATE_PARAMS = 0,
1: +  FS_CONTEXT_CREATING = 1,
1: +  FS_CONTEXT_AWAITING_MOUNT = 2,
1: +  FS_CONTEXT_AWAITING_RECONF = 3,
1: +  FS_CONTEXT_RECONF_PARAMS = 4,
1: +  FS_CONTEXT_RECONFIGURING = 5,
1: +  FS_CONTEXT_FAILED = 6,
1:  };
1:  
1:  struct fs_context_operations;
1:  
1:  struct fs_context {
1: -	const struct fs_context_operations *ops;
1: -	struct mutex uapi_mutex;
1: -	struct file_system_type *fs_type;
1: -	void *fs_private;
1: -	void *sget_key;
1: -	struct dentry *root;
1: -	struct user_namespace *user_ns;
1: -	struct net *net_ns;
1: -	const struct cred *cred;
1: -	struct p_log log;
1: -	const char *source;
1: -	void *security;
1: -	void *s_fs_info;
1: -	unsigned int sb_flags;
1: -	unsigned int sb_flags_mask;
1: -	unsigned int s_iflags;
1: -	unsigned int lsm_flags;
1: -	enum fs_context_purpose purpose: 8;
1: -	enum fs_context_phase phase: 8;
1: -	bool need_free: 1;
1: -	bool global: 1;
1: -	bool oldapi: 1;
1: +  const struct fs_context_operations *ops;
1: +  struct mutex uapi_mutex;
1: +  struct file_system_type *fs_type;
1: +  void *fs_private;
1: +  void *sget_key;
1: +  struct dentry *root;
1: +  struct user_namespace *user_ns;
1: +  struct net *net_ns;
1: +  const struct cred *cred;
1: +  struct p_log log;
1: +  const char *source;
1: +  void *security;
1: +  void *s_fs_info;
1: +  unsigned int sb_flags;
1: +  unsigned int sb_flags_mask;
1: +  unsigned int s_iflags;
1: +  unsigned int lsm_flags;
1: +  enum fs_context_purpose purpose : 8;
1: +  enum fs_context_phase phase : 8;
1: +  bool need_free : 1;
1: +  bool global : 1;
1: +  bool oldapi : 1;
1:  };
1:  
1:  struct audit_names;
1:  
1:  struct filename {
1: -	const char *name;
1: -	const char *uptr;
1: -	int refcnt;
1: -	struct audit_names *aname;
1: -	const char iname[0];
1: +  const char *name;
1: +  const char *uptr;
1: +  int refcnt;
1: +  struct audit_names *aname;
1: +  const char iname[0];
1:  };
1:  
1:  typedef u8 blk_status_t;
1:  
1:  struct bvec_iter {
1: -	sector_t bi_sector;
1: -	unsigned int bi_size;
1: -	unsigned int bi_idx;
1: -	unsigned int bi_bvec_done;
1: +  sector_t bi_sector;
1: +  unsigned int bi_size;
1: +  unsigned int bi_idx;
1: +  unsigned int bi_bvec_done;
1:  };
1:  
1:  typedef void bio_end_io_t(struct bio *);
1:  
1:  struct bio_issue {
1: -	u64 value;
1: +  u64 value;
1:  };
1:  
1:  struct bio_vec {
1: -	struct page *bv_page;
1: -	unsigned int bv_len;
1: -	unsigned int bv_offset;
1: +  struct page *bv_page;
1: +  unsigned int bv_len;
1: +  unsigned int bv_offset;
1:  };
1:  
1:  struct bio {
1: -	struct bio *bi_next;
1: -	struct gendisk *bi_disk;
1: -	unsigned int bi_opf;
1: -	short unsigned int bi_flags;
1: -	short unsigned int bi_ioprio;
1: -	short unsigned int bi_write_hint;
1: -	blk_status_t bi_status;
1: -	u8 bi_partno;
1: -	atomic_t __bi_remaining;
1: -	struct bvec_iter bi_iter;
1: -	bio_end_io_t *bi_end_io;
1: -	void *bi_private;
1: -	struct blkcg_gq *bi_blkg;
1: -	struct bio_issue bi_issue;
1: -	union {	};
1: -	short unsigned int bi_vcnt;
1: -	short unsigned int bi_max_vecs;
1: -	atomic_t __bi_cnt;
1: -	struct bio_vec *bi_io_vec;
1: -	struct bio_set *bi_pool;
1: -	struct bio_vec bi_inline_vecs[0];
1: +  struct bio *bi_next;
1: +  struct gendisk *bi_disk;
1: +  unsigned int bi_opf;
1: +  short unsigned int bi_flags;
1: +  short unsigned int bi_ioprio;
1: +  short unsigned int bi_write_hint;
1: +  blk_status_t bi_status;
1: +  u8 bi_partno;
1: +  atomic_t __bi_remaining;
1: +  struct bvec_iter bi_iter;
1: +  bio_end_io_t *bi_end_io;
1: +  void *bi_private;
1: +  struct blkcg_gq *bi_blkg;
1: +  struct bio_issue bi_issue;
1: +  union {};
1: +  short unsigned int bi_vcnt;
1: +  short unsigned int bi_max_vecs;
1: +  atomic_t __bi_cnt;
1: +  struct bio_vec *bi_io_vec;
1: +  struct bio_set *bi_pool;
1: +  struct bio_vec bi_inline_vecs[0];
1:  };
1:  
1:  struct linux_binprm {
1: -	struct vm_area_struct *vma;
1: -	long unsigned int vma_pages;
1: -	struct mm_struct *mm;
1: -	long unsigned int p;
1: -	long unsigned int argmin;
1: -	unsigned int have_execfd: 1;
1: -	unsigned int execfd_creds: 1;
1: -	unsigned int secureexec: 1;
1: -	unsigned int point_of_no_return: 1;
1: -	struct file *executable;
1: -	struct file *interpreter;
1: -	struct file *file;
1: -	struct cred *cred;
1: -	int unsafe;
1: -	unsigned int per_clear;
1: -	int argc;
1: -	int envc;
1: -	const char *filename;
1: -	const char *interp;
1: -	const char *fdpath;
1: -	unsigned int interp_flags;
1: -	int execfd;
1: -	long unsigned int loader;
1: -	long unsigned int exec;
1: -	struct rlimit rlim_stack;
1: -	char buf[256];
1: +  struct vm_area_struct *vma;
1: +  long unsigned int vma_pages;
1: +  struct mm_struct *mm;
1: +  long unsigned int p;
1: +  long unsigned int argmin;
1: +  unsigned int have_execfd : 1;
1: +  unsigned int execfd_creds : 1;
1: +  unsigned int secureexec : 1;
1: +  unsigned int point_of_no_return : 1;
1: +  struct file *executable;
1: +  struct file *interpreter;
1: +  struct file *file;
1: +  struct cred *cred;
1: +  int unsafe;
1: +  unsigned int per_clear;
1: +  int argc;
1: +  int envc;
1: +  const char *filename;
1: +  const char *interp;
1: +  const char *fdpath;
1: +  unsigned int interp_flags;
1: +  int execfd;
1: +  long unsigned int loader;
1: +  long unsigned int exec;
1: +  struct rlimit rlim_stack;
1: +  char buf[256];
1:  };
1:  
1:  struct coredump_params {
1: -	const kernel_siginfo_t *siginfo;
1: -	struct pt_regs *regs;
1: -	struct file *file;
1: -	long unsigned int limit;
1: -	long unsigned int mm_flags;
1: -	loff_t written;
1: -	loff_t pos;
1: +  const kernel_siginfo_t *siginfo;
1: +  struct pt_regs *regs;
1: +  struct file *file;
1: +  long unsigned int limit;
1: +  long unsigned int mm_flags;
1: +  loff_t written;
1: +  loff_t pos;
1:  };
1:  
1:  struct pm_message {
1: -	int event;
1: +  int event;
1:  };
1:  
1:  typedef struct pm_message pm_message_t;
1:  
1:  struct dev_pm_ops {
1: -	int (*prepare)(struct device *);
1: -	void (*complete)(struct device *);
1: -	int (*suspend)(struct device *);
1: -	int (*resume)(struct device *);
1: -	int (*freeze)(struct device *);
1: -	int (*thaw)(struct device *);
1: -	int (*poweroff)(struct device *);
1: -	int (*restore)(struct device *);
1: -	int (*suspend_late)(struct device *);
1: -	int (*resume_early)(struct device *);
1: -	int (*freeze_late)(struct device *);
1: -	int (*thaw_early)(struct device *);
1: -	int (*poweroff_late)(struct device *);
1: -	int (*restore_early)(struct device *);
1: -	int (*suspend_noirq)(struct device *);
1: -	int (*resume_noirq)(struct device *);
1: -	int (*freeze_noirq)(struct device *);
1: -	int (*thaw_noirq)(struct device *);
1: -	int (*poweroff_noirq)(struct device *);
1: -	int (*restore_noirq)(struct device *);
1: -	int (*runtime_suspend)(struct device *);
1: -	int (*runtime_resume)(struct device *);
1: -	int (*runtime_idle)(struct device *);
1: +  int (*prepare)(struct device *);
1: +  void (*complete)(struct device *);
1: +  int (*suspend)(struct device *);
1: +  int (*resume)(struct device *);
1: +  int (*freeze)(struct device *);
1: +  int (*thaw)(struct device *);
1: +  int (*poweroff)(struct device *);
1: +  int (*restore)(struct device *);
1: +  int (*suspend_late)(struct device *);
1: +  int (*resume_early)(struct device *);
1: +  int (*freeze_late)(struct device *);
1: +  int (*thaw_early)(struct device *);
1: +  int (*poweroff_late)(struct device *);
1: +  int (*restore_early)(struct device *);
1: +  int (*suspend_noirq)(struct device *);
1: +  int (*resume_noirq)(struct device *);
1: +  int (*freeze_noirq)(struct device *);
1: +  int (*thaw_noirq)(struct device *);
1: +  int (*poweroff_noirq)(struct device *);
1: +  int (*restore_noirq)(struct device *);
1: +  int (*runtime_suspend)(struct device *);
1: +  int (*runtime_resume)(struct device *);
1: +  int (*runtime_idle)(struct device *);
1:  };
1:  
1:  enum dl_dev_state {
1: -	DL_DEV_NO_DRIVER = 0,
1: -	DL_DEV_PROBING = 1,
1: -	DL_DEV_DRIVER_BOUND = 2,
1: -	DL_DEV_UNBINDING = 3,
1: +  DL_DEV_NO_DRIVER = 0,
1: +  DL_DEV_PROBING = 1,
1: +  DL_DEV_DRIVER_BOUND = 2,
1: +  DL_DEV_UNBINDING = 3,
1:  };
1:  
1:  struct dev_links_info {
1: -	struct list_head suppliers;
1: -	struct list_head consumers;
1: -	struct list_head needs_suppliers;
1: -	struct list_head defer_hook;
1: -	bool need_for_probe;
1: -	enum dl_dev_state status;
1: +  struct list_head suppliers;
1: +  struct list_head consumers;
1: +  struct list_head needs_suppliers;
1: +  struct list_head defer_hook;
1: +  bool need_for_probe;
1: +  enum dl_dev_state status;
1:  };
1:  
1:  enum rpm_request {
1: -	RPM_REQ_NONE = 0,
1: -	RPM_REQ_IDLE = 1,
1: -	RPM_REQ_SUSPEND = 2,
1: -	RPM_REQ_AUTOSUSPEND = 3,
1: -	RPM_REQ_RESUME = 4,
1: +  RPM_REQ_NONE = 0,
1: +  RPM_REQ_IDLE = 1,
1: +  RPM_REQ_SUSPEND = 2,
1: +  RPM_REQ_AUTOSUSPEND = 3,
1: +  RPM_REQ_RESUME = 4,
1:  };
1:  
1:  struct wakeup_source;
1: @@ -6309,57 +6318,57 @@ struct pm_subsys_data;
1:  struct dev_pm_qos;
1:  
1:  struct dev_pm_info {
1: -	pm_message_t power_state;
1: -	unsigned int can_wakeup: 1;
1: -	unsigned int async_suspend: 1;
1: -	bool in_dpm_list: 1;
1: -	bool is_prepared: 1;
1: -	bool is_suspended: 1;
1: -	bool is_noirq_suspended: 1;
1: -	bool is_late_suspended: 1;
1: -	bool no_pm: 1;
1: -	bool early_init: 1;
1: -	bool direct_complete: 1;
1: -	u32 driver_flags;
1: -	spinlock_t lock;
1: -	struct list_head entry;
1: -	struct completion completion;
1: -	struct wakeup_source *wakeup;
1: -	bool wakeup_path: 1;
1: -	bool syscore: 1;
1: -	bool no_pm_callbacks: 1;
1: -	unsigned int must_resume: 1;
1: -	unsigned int may_skip_resume: 1;
1: -	struct hrtimer suspend_timer;
1: -	u64 timer_expires;
1: -	struct work_struct work;
1: -	wait_queue_head_t wait_queue;
1: -	struct wake_irq *wakeirq;
1: -	atomic_t usage_count;
1: -	atomic_t child_count;
1: -	unsigned int disable_depth: 3;
1: -	unsigned int idle_notification: 1;
1: -	unsigned int request_pending: 1;
1: -	unsigned int deferred_resume: 1;
1: -	unsigned int runtime_auto: 1;
1: -	bool ignore_children: 1;
1: -	unsigned int no_callbacks: 1;
1: -	unsigned int irq_safe: 1;
1: -	unsigned int use_autosuspend: 1;
1: -	unsigned int timer_autosuspends: 1;
1: -	unsigned int memalloc_noio: 1;
1: -	unsigned int links_count;
1: -	enum rpm_request request;
1: -	enum rpm_status runtime_status;
1: -	int runtime_error;
1: -	int autosuspend_delay;
1: -	u64 last_busy;
1: -	u64 active_time;
1: -	u64 suspended_time;
1: -	u64 accounting_timestamp;
1: -	struct pm_subsys_data *subsys_data;
1: -	void (*set_latency_tolerance)(struct device *, s32);
1: -	struct dev_pm_qos *qos;
1: +  pm_message_t power_state;
1: +  unsigned int can_wakeup : 1;
1: +  unsigned int async_suspend : 1;
1: +  bool in_dpm_list : 1;
1: +  bool is_prepared : 1;
1: +  bool is_suspended : 1;
1: +  bool is_noirq_suspended : 1;
1: +  bool is_late_suspended : 1;
1: +  bool no_pm : 1;
1: +  bool early_init : 1;
1: +  bool direct_complete : 1;
1: +  u32 driver_flags;
1: +  spinlock_t lock;
1: +  struct list_head entry;
1: +  struct completion completion;
1: +  struct wakeup_source *wakeup;
1: +  bool wakeup_path : 1;
1: +  bool syscore : 1;
1: +  bool no_pm_callbacks : 1;
1: +  unsigned int must_resume : 1;
1: +  unsigned int may_skip_resume : 1;
1: +  struct hrtimer suspend_timer;
1: +  u64 timer_expires;
1: +  struct work_struct work;
1: +  wait_queue_head_t wait_queue;
1: +  struct wake_irq *wakeirq;
1: +  atomic_t usage_count;
1: +  atomic_t child_count;
1: +  unsigned int disable_depth : 3;
1: +  unsigned int idle_notification : 1;
1: +  unsigned int request_pending : 1;
1: +  unsigned int deferred_resume : 1;
1: +  unsigned int runtime_auto : 1;
1: +  bool ignore_children : 1;
1: +  unsigned int no_callbacks : 1;
1: +  unsigned int irq_safe : 1;
1: +  unsigned int use_autosuspend : 1;
1: +  unsigned int timer_autosuspends : 1;
1: +  unsigned int memalloc_noio : 1;
1: +  unsigned int links_count;
1: +  enum rpm_request request;
1: +  enum rpm_status runtime_status;
1: +  int runtime_error;
1: +  int autosuspend_delay;
1: +  u64 last_busy;
1: +  u64 active_time;
1: +  u64 suspended_time;
1: +  u64 accounting_timestamp;
1: +  struct pm_subsys_data *subsys_data;
1: +  void (*set_latency_tolerance)(struct device *, s32);
1: +  struct dev_pm_qos *qos;
1:  };
1:  
1:  struct dev_archdata {};
1: @@ -6391,84 +6400,84 @@ struct iommu_group;
1:  struct dev_iommu;
1:  
1:  struct device {
1: -	struct kobject kobj;
1: -	struct device *parent;
1: -	struct device_private *p;
1: -	const char *init_name;
1: -	const struct device_type *type;
1: -	struct bus_type *bus;
1: -	struct device_driver *driver;
1: -	void *platform_data;
1: -	void *driver_data;
1: -	struct mutex mutex;
1: -	struct dev_links_info links;
1: -	struct dev_pm_info power;
1: -	struct dev_pm_domain *pm_domain;
1: -	struct irq_domain *msi_domain;
1: -	struct list_head msi_list;
1: -	const struct dma_map_ops *dma_ops;
1: -	u64 *dma_mask;
1: -	u64 coherent_dma_mask;
1: -	u64 bus_dma_limit;
1: -	const struct bus_dma_region *dma_range_map;
1: -	struct device_dma_parameters *dma_parms;
1: -	struct list_head dma_pools;
1: -	struct cma *cma_area;
1: -	struct dev_archdata archdata;
1: -	struct device_node *of_node;
1: -	struct fwnode_handle *fwnode;
1: -	int numa_node;
1: -	dev_t devt;
1: -	u32 id;
1: -	spinlock_t devres_lock;
1: -	struct list_head devres_head;
1: -	struct class *class;
1: -	const struct attribute_group **groups;
1: -	void (*release)(struct device *);
1: -	struct iommu_group *iommu_group;
1: -	struct dev_iommu *iommu;
1: -	bool offline_disabled: 1;
1: -	bool offline: 1;
1: -	bool of_node_reused: 1;
1: -	bool state_synced: 1;
1: +  struct kobject kobj;
1: +  struct device *parent;
1: +  struct device_private *p;
1: +  const char *init_name;
1: +  const struct device_type *type;
1: +  struct bus_type *bus;
1: +  struct device_driver *driver;
1: +  void *platform_data;
1: +  void *driver_data;
1: +  struct mutex mutex;
1: +  struct dev_links_info links;
1: +  struct dev_pm_info power;
1: +  struct dev_pm_domain *pm_domain;
1: +  struct irq_domain *msi_domain;
1: +  struct list_head msi_list;
1: +  const struct dma_map_ops *dma_ops;
1: +  u64 *dma_mask;
1: +  u64 coherent_dma_mask;
1: +  u64 bus_dma_limit;
1: +  const struct bus_dma_region *dma_range_map;
1: +  struct device_dma_parameters *dma_parms;
1: +  struct list_head dma_pools;
1: +  struct cma *cma_area;
1: +  struct dev_archdata archdata;
1: +  struct device_node *of_node;
1: +  struct fwnode_handle *fwnode;
1: +  int numa_node;
1: +  dev_t devt;
1: +  u32 id;
1: +  spinlock_t devres_lock;
1: +  struct list_head devres_head;
1: +  struct class *class;
1: +  const struct attribute_group **groups;
1: +  void (*release)(struct device *);
1: +  struct iommu_group *iommu_group;
1: +  struct dev_iommu *iommu;
1: +  bool offline_disabled : 1;
1: +  bool offline : 1;
1: +  bool of_node_reused : 1;
1: +  bool state_synced : 1;
1:  };
1:  
1:  struct pm_subsys_data {
1: -	spinlock_t lock;
1: -	unsigned int refcount;
1: -	struct list_head clock_list;
1: +  spinlock_t lock;
1: +  unsigned int refcount;
1: +  struct list_head clock_list;
1:  };
1:  
1:  struct wakeup_source {
1: -	const char *name;
1: -	int id;
1: -	struct list_head entry;
1: -	spinlock_t lock;
1: -	struct wake_irq *wakeirq;
1: -	struct timer_list timer;
1: -	long unsigned int timer_expires;
1: -	ktime_t total_time;
1: -	ktime_t max_time;
1: -	ktime_t last_time;
1: -	ktime_t start_prevent_time;
1: -	ktime_t prevent_sleep_time;
1: -	long unsigned int event_count;
1: -	long unsigned int active_count;
1: -	long unsigned int relax_count;
1: -	long unsigned int expire_count;
1: -	long unsigned int wakeup_count;
1: -	struct device *dev;
1: -	bool active: 1;
1: -	bool autosleep_enabled: 1;
1: +  const char *name;
1: +  int id;
1: +  struct list_head entry;
1: +  spinlock_t lock;
1: +  struct wake_irq *wakeirq;
1: +  struct timer_list timer;
1: +  long unsigned int timer_expires;
1: +  ktime_t total_time;
1: +  ktime_t max_time;
1: +  ktime_t last_time;
1: +  ktime_t start_prevent_time;
1: +  ktime_t prevent_sleep_time;
1: +  long unsigned int event_count;
1: +  long unsigned int active_count;
1: +  long unsigned int relax_count;
1: +  long unsigned int expire_count;
1: +  long unsigned int wakeup_count;
1: +  struct device *dev;
1: +  bool active : 1;
1: +  bool autosleep_enabled : 1;
1:  };
1:  
1:  struct dev_pm_domain {
1: -	struct dev_pm_ops ops;
1: -	int (*start)(struct device *);
1: -	void (*detach)(struct device *, bool);
1: -	int (*activate)(struct device *);
1: -	void (*sync)(struct device *);
1: -	void (*dismiss)(struct device *);
1: +  struct dev_pm_ops ops;
1: +  int (*start)(struct device *);
1: +  void (*detach)(struct device *, bool);
1: +  int (*activate)(struct device *);
1: +  void (*sync)(struct device *);
1: +  void (*dismiss)(struct device *);
1:  };
1:  
1:  struct iommu_ops;
1: @@ -6476,35 +6485,35 @@ struct iommu_ops;
1:  struct subsys_private;
1:  
1:  struct bus_type {
1: -	const char *name;
1: -	const char *dev_name;
1: -	struct device *dev_root;
1: -	const struct attribute_group **bus_groups;
1: -	const struct attribute_group **dev_groups;
1: -	const struct attribute_group **drv_groups;
1: -	int (*match)(struct device *, struct device_driver *);
1: -	int (*uevent)(struct device *, struct kobj_uevent_env *);
1: -	int (*probe)(struct device *);
1: -	void (*sync_state)(struct device *);
1: -	int (*remove)(struct device *);
1: -	void (*shutdown)(struct device *);
1: -	int (*online)(struct device *);
1: -	int (*offline)(struct device *);
1: -	int (*suspend)(struct device *, pm_message_t);
1: -	int (*resume)(struct device *);
1: -	int (*num_vf)(struct device *);
1: -	int (*dma_configure)(struct device *);
1: -	const struct dev_pm_ops *pm;
1: -	const struct iommu_ops *iommu_ops;
1: -	struct subsys_private *p;
1: -	struct lock_class_key lock_key;
1: -	bool need_parent_lock;
1: +  const char *name;
1: +  const char *dev_name;
1: +  struct device *dev_root;
1: +  const struct attribute_group **bus_groups;
1: +  const struct attribute_group **dev_groups;
1: +  const struct attribute_group **drv_groups;
1: +  int (*match)(struct device *, struct device_driver *);
1: +  int (*uevent)(struct device *, struct kobj_uevent_env *);
1: +  int (*probe)(struct device *);
1: +  void (*sync_state)(struct device *);
1: +  int (*remove)(struct device *);
1: +  void (*shutdown)(struct device *);
1: +  int (*online)(struct device *);
1: +  int (*offline)(struct device *);
1: +  int (*suspend)(struct device *, pm_message_t);
1: +  int (*resume)(struct device *);
1: +  int (*num_vf)(struct device *);
1: +  int (*dma_configure)(struct device *);
1: +  const struct dev_pm_ops *pm;
1: +  const struct iommu_ops *iommu_ops;
1: +  struct subsys_private *p;
1: +  struct lock_class_key lock_key;
1: +  bool need_parent_lock;
1:  };
1:  
1:  enum probe_type {
1: -	PROBE_DEFAULT_STRATEGY = 0,
1: -	PROBE_PREFER_ASYNCHRONOUS = 1,
1: -	PROBE_FORCE_SYNCHRONOUS = 2,
1: +  PROBE_DEFAULT_STRATEGY = 0,
1: +  PROBE_PREFER_ASYNCHRONOUS = 1,
1: +  PROBE_FORCE_SYNCHRONOUS = 2,
1:  };
1:  
1:  struct of_device_id;
1: @@ -6514,48 +6523,48 @@ struct acpi_device_id;
1:  struct driver_private;
1:  
1:  struct device_driver {
1: -	const char *name;
1: -	struct bus_type *bus;
1: -	struct module *owner;
1: -	const char *mod_name;
1: -	bool suppress_bind_attrs;
1: -	enum probe_type probe_type;
1: -	const struct of_device_id *of_match_table;
1: -	const struct acpi_device_id *acpi_match_table;
1: -	int (*probe)(struct device *);
1: -	void (*sync_state)(struct device *);
1: -	int (*remove)(struct device *);
1: -	void (*shutdown)(struct device *);
1: -	int (*suspend)(struct device *, pm_message_t);
1: -	int (*resume)(struct device *);
1: -	const struct attribute_group **groups;
1: -	const struct attribute_group **dev_groups;
1: -	const struct dev_pm_ops *pm;
1: -	void (*coredump)(struct device *);
1: -	struct driver_private *p;
1: +  const char *name;
1: +  struct bus_type *bus;
1: +  struct module *owner;
1: +  const char *mod_name;
1: +  bool suppress_bind_attrs;
1: +  enum probe_type probe_type;
1: +  const struct of_device_id *of_match_table;
1: +  const struct acpi_device_id *acpi_match_table;
1: +  int (*probe)(struct device *);
1: +  void (*sync_state)(struct device *);
1: +  int (*remove)(struct device *);
1: +  void (*shutdown)(struct device *);
1: +  int (*suspend)(struct device *, pm_message_t);
1: +  int (*resume)(struct device *);
1: +  const struct attribute_group **groups;
1: +  const struct attribute_group **dev_groups;
1: +  const struct dev_pm_ops *pm;
1: +  void (*coredump)(struct device *);
1: +  struct driver_private *p;
1:  };
1:  
1:  enum iommu_cap {
1: -	IOMMU_CAP_CACHE_COHERENCY = 0,
1: -	IOMMU_CAP_INTR_REMAP = 1,
1: -	IOMMU_CAP_NOEXEC = 2,
1: +  IOMMU_CAP_CACHE_COHERENCY = 0,
1: +  IOMMU_CAP_INTR_REMAP = 1,
1: +  IOMMU_CAP_NOEXEC = 2,
1:  };
1:  
1:  enum iommu_attr {
1: -	DOMAIN_ATTR_GEOMETRY = 0,
1: -	DOMAIN_ATTR_PAGING = 1,
1: -	DOMAIN_ATTR_WINDOWS = 2,
1: -	DOMAIN_ATTR_FSL_PAMU_STASH = 3,
1: -	DOMAIN_ATTR_FSL_PAMU_ENABLE = 4,
1: -	DOMAIN_ATTR_FSL_PAMUV1 = 5,
1: -	DOMAIN_ATTR_NESTING = 6,
1: -	DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE = 7,
1: -	DOMAIN_ATTR_MAX = 8,
1: +  DOMAIN_ATTR_GEOMETRY = 0,
1: +  DOMAIN_ATTR_PAGING = 1,
1: +  DOMAIN_ATTR_WINDOWS = 2,
1: +  DOMAIN_ATTR_FSL_PAMU_STASH = 3,
1: +  DOMAIN_ATTR_FSL_PAMU_ENABLE = 4,
1: +  DOMAIN_ATTR_FSL_PAMUV1 = 5,
1: +  DOMAIN_ATTR_NESTING = 6,
1: +  DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE = 7,
1: +  DOMAIN_ATTR_MAX = 8,
1:  };
1:  
1:  enum iommu_dev_features {
1: -	IOMMU_DEV_FEAT_AUX = 0,
1: -	IOMMU_DEV_FEAT_SVA = 1,
1: +  IOMMU_DEV_FEAT_AUX = 0,
1: +  IOMMU_DEV_FEAT_SVA = 1,
1:  };
1:  
1:  struct iommu_domain;
1: @@ -6579,102 +6588,109 @@ struct iommu_cache_invalidate_info;
1:  struct iommu_gpasid_bind_data;
1:  
1:  struct iommu_ops {
1: -	bool (*capable)(enum iommu_cap);
1: -	struct iommu_domain * (*domain_alloc)(unsigned int);
1: -	void (*domain_free)(struct iommu_domain *);
1: -	int (*attach_dev)(struct iommu_domain *, struct device *);
1: -	void (*detach_dev)(struct iommu_domain *, struct device *);
1: -	int (*map)(struct iommu_domain *, long unsigned int, phys_addr_t, size_t, int, gfp_t);
1: -	size_t (*unmap)(struct iommu_domain *, long unsigned int, size_t, struct iommu_iotlb_gather *);
1: -	void (*flush_iotlb_all)(struct iommu_domain *);
1: -	void (*iotlb_sync_map)(struct iommu_domain *);
1: -	void (*iotlb_sync)(struct iommu_domain *, struct iommu_iotlb_gather *);
1: -	phys_addr_t (*iova_to_phys)(struct iommu_domain *, dma_addr_t);
1: -	struct iommu_device * (*probe_device)(struct device *);
1: -	void (*release_device)(struct device *);
1: -	void (*probe_finalize)(struct device *);
1: -	struct iommu_group * (*device_group)(struct device *);
1: -	int (*domain_get_attr)(struct iommu_domain *, enum iommu_attr, void *);
1: -	int (*domain_set_attr)(struct iommu_domain *, enum iommu_attr, void *);
1: -	void (*get_resv_regions)(struct device *, struct list_head *);
1: -	void (*put_resv_regions)(struct device *, struct list_head *);
1: -	void (*apply_resv_region)(struct device *, struct iommu_domain *, struct iommu_resv_region *);
1: -	int (*domain_window_enable)(struct iommu_domain *, u32, phys_addr_t, u64, int);
1: -	void (*domain_window_disable)(struct iommu_domain *, u32);
1: -	int (*of_xlate)(struct device *, struct of_phandle_args *);
1: -	bool (*is_attach_deferred)(struct iommu_domain *, struct device *);
1: -	bool (*dev_has_feat)(struct device *, enum iommu_dev_features);
1: -	bool (*dev_feat_enabled)(struct device *, enum iommu_dev_features);
1: -	int (*dev_enable_feat)(struct device *, enum iommu_dev_features);
1: -	int (*dev_disable_feat)(struct device *, enum iommu_dev_features);
1: -	int (*aux_attach_dev)(struct iommu_domain *, struct device *);
1: -	void (*aux_detach_dev)(struct iommu_domain *, struct device *);
1: -	int (*aux_get_pasid)(struct iommu_domain *, struct device *);
1: -	struct iommu_sva * (*sva_bind)(struct device *, struct mm_struct *, void *);
1: -	void (*sva_unbind)(struct iommu_sva *);
1: -	u32 (*sva_get_pasid)(struct iommu_sva *);
1: -	int (*page_response)(struct device *, struct iommu_fault_event *, struct iommu_page_response *);
1: -	int (*cache_invalidate)(struct iommu_domain *, struct device *, struct iommu_cache_invalidate_info *);
1: -	int (*sva_bind_gpasid)(struct iommu_domain *, struct device *, struct iommu_gpasid_bind_data *);
1: -	int (*sva_unbind_gpasid)(struct device *, u32);
1: -	int (*def_domain_type)(struct device *);
1: -	long unsigned int pgsize_bitmap;
1: -	struct module *owner;
1: +  bool (*capable)(enum iommu_cap);
1: +  struct iommu_domain *(*domain_alloc)(unsigned int);
1: +  void (*domain_free)(struct iommu_domain *);
1: +  int (*attach_dev)(struct iommu_domain *, struct device *);
1: +  void (*detach_dev)(struct iommu_domain *, struct device *);
1: +  int (*map)(struct iommu_domain *, long unsigned int, phys_addr_t, size_t, int,
1: +             gfp_t);
1: +  size_t (*unmap)(struct iommu_domain *, long unsigned int, size_t,
1: +                  struct iommu_iotlb_gather *);
1: +  void (*flush_iotlb_all)(struct iommu_domain *);
1: +  void (*iotlb_sync_map)(struct iommu_domain *);
1: +  void (*iotlb_sync)(struct iommu_domain *, struct iommu_iotlb_gather *);
1: +  phys_addr_t (*iova_to_phys)(struct iommu_domain *, dma_addr_t);
1: +  struct iommu_device *(*probe_device)(struct device *);
1: +  void (*release_device)(struct device *);
1: +  void (*probe_finalize)(struct device *);
1: +  struct iommu_group *(*device_group)(struct device *);
1: +  int (*domain_get_attr)(struct iommu_domain *, enum iommu_attr, void *);
1: +  int (*domain_set_attr)(struct iommu_domain *, enum iommu_attr, void *);
1: +  void (*get_resv_regions)(struct device *, struct list_head *);
1: +  void (*put_resv_regions)(struct device *, struct list_head *);
1: +  void (*apply_resv_region)(struct device *, struct iommu_domain *,
1: +                            struct iommu_resv_region *);
1: +  int (*domain_window_enable)(struct iommu_domain *, u32, phys_addr_t, u64,
1: +                              int);
1: +  void (*domain_window_disable)(struct iommu_domain *, u32);
1: +  int (*of_xlate)(struct device *, struct of_phandle_args *);
1: +  bool (*is_attach_deferred)(struct iommu_domain *, struct device *);
1: +  bool (*dev_has_feat)(struct device *, enum iommu_dev_features);
1: +  bool (*dev_feat_enabled)(struct device *, enum iommu_dev_features);
1: +  int (*dev_enable_feat)(struct device *, enum iommu_dev_features);
1: +  int (*dev_disable_feat)(struct device *, enum iommu_dev_features);
1: +  int (*aux_attach_dev)(struct iommu_domain *, struct device *);
1: +  void (*aux_detach_dev)(struct iommu_domain *, struct device *);
1: +  int (*aux_get_pasid)(struct iommu_domain *, struct device *);
1: +  struct iommu_sva *(*sva_bind)(struct device *, struct mm_struct *, void *);
1: +  void (*sva_unbind)(struct iommu_sva *);
1: +  u32 (*sva_get_pasid)(struct iommu_sva *);
1: +  int (*page_response)(struct device *, struct iommu_fault_event *,
1: +                       struct iommu_page_response *);
1: +  int (*cache_invalidate)(struct iommu_domain *, struct device *,
1: +                          struct iommu_cache_invalidate_info *);
1: +  int (*sva_bind_gpasid)(struct iommu_domain *, struct device *,
1: +                         struct iommu_gpasid_bind_data *);
1: +  int (*sva_unbind_gpasid)(struct device *, u32);
1: +  int (*def_domain_type)(struct device *);
1: +  long unsigned int pgsize_bitmap;
1: +  struct module *owner;
1:  };
1:  
1:  struct device_type {
1: -	const char *name;
1: -	const struct attribute_group **groups;
1: -	int (*uevent)(struct device *, struct kobj_uevent_env *);
1: -	char * (*devnode)(struct device *, umode_t *, kuid_t *, kgid_t *);
1: -	void (*release)(struct device *);
1: -	const struct dev_pm_ops *pm;
1: +  const char *name;
1: +  const struct attribute_group **groups;
1: +  int (*uevent)(struct device *, struct kobj_uevent_env *);
1: +  char *(*devnode)(struct device *, umode_t *, kuid_t *, kgid_t *);
1: +  void (*release)(struct device *);
1: +  const struct dev_pm_ops *pm;
1:  };
1:  
1:  struct class {
1: -	const char *name;
1: -	struct module *owner;
1: -	const struct attribute_group **class_groups;
1: -	const struct attribute_group **dev_groups;
1: -	struct kobject *dev_kobj;
1: -	int (*dev_uevent)(struct device *, struct kobj_uevent_env *);
1: -	char * (*devnode)(struct device *, umode_t *);
1: -	void (*class_release)(struct class *);
1: -	void (*dev_release)(struct device *);
1: -	int (*shutdown_pre)(struct device *);
1: -	const struct kobj_ns_type_operations *ns_type;
1: -	const void * (*namespace)(struct device *);
1: -	void (*get_ownership)(struct device *, kuid_t *, kgid_t *);
1: -	const struct dev_pm_ops *pm;
1: -	struct subsys_private *p;
1: +  const char *name;
1: +  struct module *owner;
1: +  const struct attribute_group **class_groups;
1: +  const struct attribute_group **dev_groups;
1: +  struct kobject *dev_kobj;
1: +  int (*dev_uevent)(struct device *, struct kobj_uevent_env *);
1: +  char *(*devnode)(struct device *, umode_t *);
1: +  void (*class_release)(struct class *);
1: +  void (*dev_release)(struct device *);
1: +  int (*shutdown_pre)(struct device *);
1: +  const struct kobj_ns_type_operations *ns_type;
1: +  const void *(*namespace)(struct device *);
1: +  void (*get_ownership)(struct device *, kuid_t *, kgid_t *);
1: +  const struct dev_pm_ops *pm;
1: +  struct subsys_private *p;
1:  };
1:  
1:  struct of_device_id {
1: -	char name[32];
1: -	char type[32];
1: -	char compatible[128];
1: -	const void *data;
1: +  char name[32];
1: +  char type[32];
1: +  char compatible[128];
1: +  const void *data;
1:  };
1:  
1:  typedef long unsigned int kernel_ulong_t;
1:  
1:  struct acpi_device_id {
1: -	__u8 id[9];
1: -	kernel_ulong_t driver_data;
1: -	__u32 cls;
1: -	__u32 cls_msk;
1: +  __u8 id[9];
1: +  kernel_ulong_t driver_data;
1: +  __u32 cls;
1: +  __u32 cls_msk;
1:  };
1:  
1:  struct device_dma_parameters {
1: -	unsigned int max_segment_size;
1: -	long unsigned int segment_boundary_mask;
1: +  unsigned int max_segment_size;
1: +  long unsigned int segment_boundary_mask;
1:  };
1:  
1:  enum dma_data_direction {
1: -	DMA_BIDIRECTIONAL = 0,
1: -	DMA_TO_DEVICE = 1,
1: -	DMA_FROM_DEVICE = 2,
1: -	DMA_NONE = 3,
1: +  DMA_BIDIRECTIONAL = 0,
1: +  DMA_TO_DEVICE = 1,
1: +  DMA_FROM_DEVICE = 2,
1: +  DMA_NONE = 3,
1:  };
1:  
1:  struct sg_table;
1: @@ -6682,36 +6698,53 @@ struct sg_table;
1:  struct scatterlist;
1:  
1:  struct dma_map_ops {
1: -	void * (*alloc)(struct device *, size_t, dma_addr_t *, gfp_t, long unsigned int);
1: -	void (*free)(struct device *, size_t, void *, dma_addr_t, long unsigned int);
1: -	struct page * (*alloc_pages)(struct device *, size_t, dma_addr_t *, enum dma_data_direction, gfp_t);
1: -	void (*free_pages)(struct device *, size_t, struct page *, dma_addr_t, enum dma_data_direction);
1: -	void * (*alloc_noncoherent)(struct device *, size_t, dma_addr_t *, enum dma_data_direction, gfp_t);
1: -	void (*free_noncoherent)(struct device *, size_t, void *, dma_addr_t, enum dma_data_direction);
1: -	int (*mmap)(struct device *, struct vm_area_struct *, void *, dma_addr_t, size_t, long unsigned int);
1: -	int (*get_sgtable)(struct device *, struct sg_table *, void *, dma_addr_t, size_t, long unsigned int);
1: -	dma_addr_t (*map_page)(struct device *, struct page *, long unsigned int, size_t, enum dma_data_direction, long unsigned int);
1: -	void (*unmap_page)(struct device *, dma_addr_t, size_t, enum dma_data_direction, long unsigned int);
1: -	int (*map_sg)(struct device *, struct scatterlist *, int, enum dma_data_direction, long unsigned int);
1: -	void (*unmap_sg)(struct device *, struct scatterlist *, int, enum dma_data_direction, long unsigned int);
1: -	dma_addr_t (*map_resource)(struct device *, phys_addr_t, size_t, enum dma_data_direction, long unsigned int);
1: -	void (*unmap_resource)(struct device *, dma_addr_t, size_t, enum dma_data_direction, long unsigned int);
1: -	void (*sync_single_for_cpu)(struct device *, dma_addr_t, size_t, enum dma_data_direction);
1: -	void (*sync_single_for_device)(struct device *, dma_addr_t, size_t, enum dma_data_direction);
1: -	void (*sync_sg_for_cpu)(struct device *, struct scatterlist *, int, enum dma_data_direction);
1: -	void (*sync_sg_for_device)(struct device *, struct scatterlist *, int, enum dma_data_direction);
1: -	void (*cache_sync)(struct device *, void *, size_t, enum dma_data_direction);
1: -	int (*dma_supported)(struct device *, u64);
1: -	u64 (*get_required_mask)(struct device *);
1: -	size_t (*max_mapping_size)(struct device *);
1: -	long unsigned int (*get_merge_boundary)(struct device *);
1: +  void *(*alloc)(struct device *, size_t, dma_addr_t *, gfp_t,
1: +                 long unsigned int);
1: +  void (*free)(struct device *, size_t, void *, dma_addr_t, long unsigned int);
1: +  struct page *(*alloc_pages)(struct device *, size_t, dma_addr_t *,
1: +                              enum dma_data_direction, gfp_t);
1: +  void (*free_pages)(struct device *, size_t, struct page *, dma_addr_t,
1: +                     enum dma_data_direction);
1: +  void *(*alloc_noncoherent)(struct device *, size_t, dma_addr_t *,
1: +                             enum dma_data_direction, gfp_t);
1: +  void (*free_noncoherent)(struct device *, size_t, void *, dma_addr_t,
1: +                           enum dma_data_direction);
1: +  int (*mmap)(struct device *, struct vm_area_struct *, void *, dma_addr_t,
1: +              size_t, long unsigned int);
1: +  int (*get_sgtable)(struct device *, struct sg_table *, void *, dma_addr_t,
1: +                     size_t, long unsigned int);
1: +  dma_addr_t (*map_page)(struct device *, struct page *, long unsigned int,
1: +                         size_t, enum dma_data_direction, long unsigned int);
1: +  void (*unmap_page)(struct device *, dma_addr_t, size_t,
1: +                     enum dma_data_direction, long unsigned int);
1: +  int (*map_sg)(struct device *, struct scatterlist *, int,
1: +                enum dma_data_direction, long unsigned int);
1: +  void (*unmap_sg)(struct device *, struct scatterlist *, int,
1: +                   enum dma_data_direction, long unsigned int);
1: +  dma_addr_t (*map_resource)(struct device *, phys_addr_t, size_t,
1: +                             enum dma_data_direction, long unsigned int);
1: +  void (*unmap_resource)(struct device *, dma_addr_t, size_t,
1: +                         enum dma_data_direction, long unsigned int);
1: +  void (*sync_single_for_cpu)(struct device *, dma_addr_t, size_t,
1: +                              enum dma_data_direction);
1: +  void (*sync_single_for_device)(struct device *, dma_addr_t, size_t,
1: +                                 enum dma_data_direction);
1: +  void (*sync_sg_for_cpu)(struct device *, struct scatterlist *, int,
1: +                          enum dma_data_direction);
1: +  void (*sync_sg_for_device)(struct device *, struct scatterlist *, int,
1: +                             enum dma_data_direction);
1: +  void (*cache_sync)(struct device *, void *, size_t, enum dma_data_direction);
1: +  int (*dma_supported)(struct device *, u64);
1: +  u64 (*get_required_mask)(struct device *);
1: +  size_t (*max_mapping_size)(struct device *);
1: +  long unsigned int (*get_merge_boundary)(struct device *);
1:  };
1:  
1:  struct bus_dma_region {
1: -	phys_addr_t cpu_start;
1: -	dma_addr_t dma_start;
1: -	u64 size;
1: -	u64 offset;
1: +  phys_addr_t cpu_start;
1: +  dma_addr_t dma_start;
1: +  u64 size;
1: +  u64 offset;
1:  };
1:  
1:  typedef u32 phandle;
1: @@ -6719,316 +6752,316 @@ typedef u32 phandle;
1:  struct fwnode_operations;
1:  
1:  struct fwnode_handle {
1: -	struct fwnode_handle *secondary;
1: -	const struct fwnode_operations *ops;
1: -	struct device *dev;
1: +  struct fwnode_handle *secondary;
1: +  const struct fwnode_operations *ops;
1: +  struct device *dev;
1:  };
1:  
1:  struct property;
1:  
1:  struct device_node {
1: -	const char *name;
1: -	phandle phandle;
1: -	const char *full_name;
1: -	struct fwnode_handle fwnode;
1: -	struct property *properties;
1: -	struct property *deadprops;
1: -	struct device_node *parent;
1: -	struct device_node *child;
1: -	struct device_node *sibling;
1: -	long unsigned int _flags;
1: -	void *data;
1: +  const char *name;
1: +  phandle phandle;
1: +  const char *full_name;
1: +  struct fwnode_handle fwnode;
1: +  struct property *properties;
1: +  struct property *deadprops;
1: +  struct device_node *parent;
1: +  struct device_node *child;
1: +  struct device_node *sibling;
1: +  long unsigned int _flags;
1: +  void *data;
1:  };
1:  
1:  enum cpuhp_state {
1: -	CPUHP_INVALID = 4294967295,
1: -	CPUHP_OFFLINE = 0,
1: -	CPUHP_CREATE_THREADS = 1,
1: -	CPUHP_PERF_PREPARE = 2,
1: -	CPUHP_PERF_X86_PREPARE = 3,
1: -	CPUHP_PERF_X86_AMD_UNCORE_PREP = 4,
1: -	CPUHP_PERF_POWER = 5,
1: -	CPUHP_PERF_SUPERH = 6,
1: -	CPUHP_X86_HPET_DEAD = 7,
1: -	CPUHP_X86_APB_DEAD = 8,
1: -	CPUHP_X86_MCE_DEAD = 9,
1: -	CPUHP_VIRT_NET_DEAD = 10,
1: -	CPUHP_SLUB_DEAD = 11,
1: -	CPUHP_DEBUG_OBJ_DEAD = 12,
1: -	CPUHP_MM_WRITEBACK_DEAD = 13,
1: -	CPUHP_MM_VMSTAT_DEAD = 14,
1: -	CPUHP_SOFTIRQ_DEAD = 15,
1: -	CPUHP_NET_MVNETA_DEAD = 16,
1: -	CPUHP_CPUIDLE_DEAD = 17,
1: -	CPUHP_ARM64_FPSIMD_DEAD = 18,
1: -	CPUHP_ARM_OMAP_WAKE_DEAD = 19,
1: -	CPUHP_IRQ_POLL_DEAD = 20,
1: -	CPUHP_BLOCK_SOFTIRQ_DEAD = 21,
1: -	CPUHP_ACPI_CPUDRV_DEAD = 22,
1: -	CPUHP_S390_PFAULT_DEAD = 23,
1: -	CPUHP_BLK_MQ_DEAD = 24,
1: -	CPUHP_FS_BUFF_DEAD = 25,
1: -	CPUHP_PRINTK_DEAD = 26,
1: -	CPUHP_MM_MEMCQ_DEAD = 27,
1: -	CPUHP_PERCPU_CNT_DEAD = 28,
1: -	CPUHP_RADIX_DEAD = 29,
1: -	CPUHP_PAGE_ALLOC_DEAD = 30,
1: -	CPUHP_NET_DEV_DEAD = 31,
1: -	CPUHP_PCI_XGENE_DEAD = 32,
1: -	CPUHP_IOMMU_INTEL_DEAD = 33,
1: -	CPUHP_LUSTRE_CFS_DEAD = 34,
1: -	CPUHP_AP_ARM_CACHE_B15_RAC_DEAD = 35,
1: -	CPUHP_PADATA_DEAD = 36,
1: -	CPUHP_WORKQUEUE_PREP = 37,
1: -	CPUHP_POWER_NUMA_PREPARE = 38,
1: -	CPUHP_HRTIMERS_PREPARE = 39,
1: -	CPUHP_PROFILE_PREPARE = 40,
1: -	CPUHP_X2APIC_PREPARE = 41,
1: -	CPUHP_SMPCFD_PREPARE = 42,
1: -	CPUHP_RELAY_PREPARE = 43,
1: -	CPUHP_SLAB_PREPARE = 44,
1: -	CPUHP_MD_RAID5_PREPARE = 45,
1: -	CPUHP_RCUTREE_PREP = 46,
1: -	CPUHP_CPUIDLE_COUPLED_PREPARE = 47,
1: -	CPUHP_POWERPC_PMAC_PREPARE = 48,
1: -	CPUHP_POWERPC_MMU_CTX_PREPARE = 49,
1: -	CPUHP_XEN_PREPARE = 50,
1: -	CPUHP_XEN_EVTCHN_PREPARE = 51,
1: -	CPUHP_ARM_SHMOBILE_SCU_PREPARE = 52,
1: -	CPUHP_SH_SH3X_PREPARE = 53,
1: -	CPUHP_NET_FLOW_PREPARE = 54,
1: -	CPUHP_TOPOLOGY_PREPARE = 55,
1: -	CPUHP_NET_IUCV_PREPARE = 56,
1: -	CPUHP_ARM_BL_PREPARE = 57,
1: -	CPUHP_TRACE_RB_PREPARE = 58,
1: -	CPUHP_MM_ZS_PREPARE = 59,
1: -	CPUHP_MM_ZSWP_MEM_PREPARE = 60,
1: -	CPUHP_MM_ZSWP_POOL_PREPARE = 61,
1: -	CPUHP_KVM_PPC_BOOK3S_PREPARE = 62,
1: -	CPUHP_ZCOMP_PREPARE = 63,
1: -	CPUHP_TIMERS_PREPARE = 64,
1: -	CPUHP_MIPS_SOC_PREPARE = 65,
1: -	CPUHP_BP_PREPARE_DYN = 66,
1: -	CPUHP_BP_PREPARE_DYN_END = 86,
1: -	CPUHP_BRINGUP_CPU = 87,
1: -	CPUHP_AP_IDLE_DEAD = 88,
1: -	CPUHP_AP_OFFLINE = 89,
1: -	CPUHP_AP_SCHED_STARTING = 90,
1: -	CPUHP_AP_RCUTREE_DYING = 91,
1: -	CPUHP_AP_CPU_PM_STARTING = 92,
1: -	CPUHP_AP_IRQ_GIC_STARTING = 93,
1: -	CPUHP_AP_IRQ_HIP04_STARTING = 94,
1: -	CPUHP_AP_IRQ_ARMADA_XP_STARTING = 95,
1: -	CPUHP_AP_IRQ_BCM2836_STARTING = 96,
1: -	CPUHP_AP_IRQ_MIPS_GIC_STARTING = 97,
1: -	CPUHP_AP_IRQ_RISCV_STARTING = 98,
1: -	CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING = 99,
1: -	CPUHP_AP_ARM_MVEBU_COHERENCY = 100,
1: -	CPUHP_AP_MICROCODE_LOADER = 101,
1: -	CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING = 102,
1: -	CPUHP_AP_PERF_X86_STARTING = 103,
1: -	CPUHP_AP_PERF_X86_AMD_IBS_STARTING = 104,
1: -	CPUHP_AP_PERF_X86_CQM_STARTING = 105,
1: -	CPUHP_AP_PERF_X86_CSTATE_STARTING = 106,
1: -	CPUHP_AP_PERF_XTENSA_STARTING = 107,
1: -	CPUHP_AP_MIPS_OP_LOONGSON3_STARTING = 108,
1: -	CPUHP_AP_ARM_SDEI_STARTING = 109,
1: -	CPUHP_AP_ARM_VFP_STARTING = 110,
1: -	CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING = 111,
1: -	CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING = 112,
1: -	CPUHP_AP_PERF_ARM_ACPI_STARTING = 113,
1: -	CPUHP_AP_PERF_ARM_STARTING = 114,
1: -	CPUHP_AP_ARM_L2X0_STARTING = 115,
1: -	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING = 116,
1: -	CPUHP_AP_ARM_ARCH_TIMER_STARTING = 117,
1: -	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING = 118,
1: -	CPUHP_AP_JCORE_TIMER_STARTING = 119,
1: -	CPUHP_AP_ARM_TWD_STARTING = 120,
1: -	CPUHP_AP_QCOM_TIMER_STARTING = 121,
1: -	CPUHP_AP_TEGRA_TIMER_STARTING = 122,
1: -	CPUHP_AP_ARMADA_TIMER_STARTING = 123,
1: -	CPUHP_AP_MARCO_TIMER_STARTING = 124,
1: -	CPUHP_AP_MIPS_GIC_TIMER_STARTING = 125,
1: -	CPUHP_AP_ARC_TIMER_STARTING = 126,
1: -	CPUHP_AP_RISCV_TIMER_STARTING = 127,
1: -	CPUHP_AP_CLINT_TIMER_STARTING = 128,
1: -	CPUHP_AP_CSKY_TIMER_STARTING = 129,
1: -	CPUHP_AP_HYPERV_TIMER_STARTING = 130,
1: -	CPUHP_AP_KVM_STARTING = 131,
1: -	CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING = 132,
1: -	CPUHP_AP_KVM_ARM_VGIC_STARTING = 133,
1: -	CPUHP_AP_KVM_ARM_TIMER_STARTING = 134,
1: -	CPUHP_AP_DUMMY_TIMER_STARTING = 135,
1: -	CPUHP_AP_ARM_XEN_STARTING = 136,
1: -	CPUHP_AP_ARM_CORESIGHT_STARTING = 137,
1: -	CPUHP_AP_ARM_CORESIGHT_CTI_STARTING = 138,
1: -	CPUHP_AP_ARM64_ISNDEP_STARTING = 139,
1: -	CPUHP_AP_SMPCFD_DYING = 140,
1: -	CPUHP_AP_X86_TBOOT_DYING = 141,
1: -	CPUHP_AP_ARM_CACHE_B15_RAC_DYING = 142,
1: -	CPUHP_AP_ONLINE = 143,
1: -	CPUHP_TEARDOWN_CPU = 144,
1: -	CPUHP_AP_ONLINE_IDLE = 145,
1: -	CPUHP_AP_SMPBOOT_THREADS = 146,
1: -	CPUHP_AP_X86_VDSO_VMA_ONLINE = 147,
1: -	CPUHP_AP_IRQ_AFFINITY_ONLINE = 148,
1: -	CPUHP_AP_BLK_MQ_ONLINE = 149,
1: -	CPUHP_AP_ARM_MVEBU_SYNC_CLOCKS = 150,
1: -	CPUHP_AP_X86_INTEL_EPB_ONLINE = 151,
1: -	CPUHP_AP_PERF_ONLINE = 152,
1: -	CPUHP_AP_PERF_X86_ONLINE = 153,
1: -	CPUHP_AP_PERF_X86_UNCORE_ONLINE = 154,
1: -	CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE = 155,
1: -	CPUHP_AP_PERF_X86_AMD_POWER_ONLINE = 156,
1: -	CPUHP_AP_PERF_X86_RAPL_ONLINE = 157,
1: -	CPUHP_AP_PERF_X86_CQM_ONLINE = 158,
1: -	CPUHP_AP_PERF_X86_CSTATE_ONLINE = 159,
1: -	CPUHP_AP_PERF_S390_CF_ONLINE = 160,
1: -	CPUHP_AP_PERF_S390_SF_ONLINE = 161,
1: -	CPUHP_AP_PERF_ARM_CCI_ONLINE = 162,
1: -	CPUHP_AP_PERF_ARM_CCN_ONLINE = 163,
1: -	CPUHP_AP_PERF_ARM_HISI_DDRC_ONLINE = 164,
1: -	CPUHP_AP_PERF_ARM_HISI_HHA_ONLINE = 165,
1: -	CPUHP_AP_PERF_ARM_HISI_L3_ONLINE = 166,
1: -	CPUHP_AP_PERF_ARM_L2X0_ONLINE = 167,
1: -	CPUHP_AP_PERF_ARM_QCOM_L2_ONLINE = 168,
1: -	CPUHP_AP_PERF_ARM_QCOM_L3_ONLINE = 169,
1: -	CPUHP_AP_PERF_ARM_APM_XGENE_ONLINE = 170,
1: -	CPUHP_AP_PERF_ARM_CAVIUM_TX2_UNCORE_ONLINE = 171,
1: -	CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE = 172,
1: -	CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE = 173,
1: -	CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE = 174,
1: -	CPUHP_AP_PERF_POWERPC_TRACE_IMC_ONLINE = 175,
1: -	CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE = 176,
1: -	CPUHP_AP_PERF_POWERPC_HV_GPCI_ONLINE = 177,
1: -	CPUHP_AP_WATCHDOG_ONLINE = 178,
1: -	CPUHP_AP_WORKQUEUE_ONLINE = 179,
1: -	CPUHP_AP_RCUTREE_ONLINE = 180,
1: -	CPUHP_AP_BASE_CACHEINFO_ONLINE = 181,
1: -	CPUHP_AP_ONLINE_DYN = 182,
1: -	CPUHP_AP_ONLINE_DYN_END = 212,
1: -	CPUHP_AP_X86_HPET_ONLINE = 213,
1: -	CPUHP_AP_X86_KVM_CLK_ONLINE = 214,
1: -	CPUHP_AP_ACTIVE = 215,
1: -	CPUHP_ONLINE = 216,
1: +  CPUHP_INVALID = 4294967295,
1: +  CPUHP_OFFLINE = 0,
1: +  CPUHP_CREATE_THREADS = 1,
1: +  CPUHP_PERF_PREPARE = 2,
1: +  CPUHP_PERF_X86_PREPARE = 3,
1: +  CPUHP_PERF_X86_AMD_UNCORE_PREP = 4,
1: +  CPUHP_PERF_POWER = 5,
1: +  CPUHP_PERF_SUPERH = 6,
1: +  CPUHP_X86_HPET_DEAD = 7,
1: +  CPUHP_X86_APB_DEAD = 8,
1: +  CPUHP_X86_MCE_DEAD = 9,
1: +  CPUHP_VIRT_NET_DEAD = 10,
1: +  CPUHP_SLUB_DEAD = 11,
1: +  CPUHP_DEBUG_OBJ_DEAD = 12,
1: +  CPUHP_MM_WRITEBACK_DEAD = 13,
1: +  CPUHP_MM_VMSTAT_DEAD = 14,
1: +  CPUHP_SOFTIRQ_DEAD = 15,
1: +  CPUHP_NET_MVNETA_DEAD = 16,
1: +  CPUHP_CPUIDLE_DEAD = 17,
1: +  CPUHP_ARM64_FPSIMD_DEAD = 18,
1: +  CPUHP_ARM_OMAP_WAKE_DEAD = 19,
1: +  CPUHP_IRQ_POLL_DEAD = 20,
1: +  CPUHP_BLOCK_SOFTIRQ_DEAD = 21,
1: +  CPUHP_ACPI_CPUDRV_DEAD = 22,
1: +  CPUHP_S390_PFAULT_DEAD = 23,
1: +  CPUHP_BLK_MQ_DEAD = 24,
1: +  CPUHP_FS_BUFF_DEAD = 25,
1: +  CPUHP_PRINTK_DEAD = 26,
1: +  CPUHP_MM_MEMCQ_DEAD = 27,
1: +  CPUHP_PERCPU_CNT_DEAD = 28,
1: +  CPUHP_RADIX_DEAD = 29,
1: +  CPUHP_PAGE_ALLOC_DEAD = 30,
1: +  CPUHP_NET_DEV_DEAD = 31,
1: +  CPUHP_PCI_XGENE_DEAD = 32,
1: +  CPUHP_IOMMU_INTEL_DEAD = 33,
1: +  CPUHP_LUSTRE_CFS_DEAD = 34,
1: +  CPUHP_AP_ARM_CACHE_B15_RAC_DEAD = 35,
1: +  CPUHP_PADATA_DEAD = 36,
1: +  CPUHP_WORKQUEUE_PREP = 37,
1: +  CPUHP_POWER_NUMA_PREPARE = 38,
1: +  CPUHP_HRTIMERS_PREPARE = 39,
1: +  CPUHP_PROFILE_PREPARE = 40,
1: +  CPUHP_X2APIC_PREPARE = 41,
1: +  CPUHP_SMPCFD_PREPARE = 42,
1: +  CPUHP_RELAY_PREPARE = 43,
1: +  CPUHP_SLAB_PREPARE = 44,
1: +  CPUHP_MD_RAID5_PREPARE = 45,
1: +  CPUHP_RCUTREE_PREP = 46,
1: +  CPUHP_CPUIDLE_COUPLED_PREPARE = 47,
1: +  CPUHP_POWERPC_PMAC_PREPARE = 48,
1: +  CPUHP_POWERPC_MMU_CTX_PREPARE = 49,
1: +  CPUHP_XEN_PREPARE = 50,
1: +  CPUHP_XEN_EVTCHN_PREPARE = 51,
1: +  CPUHP_ARM_SHMOBILE_SCU_PREPARE = 52,
1: +  CPUHP_SH_SH3X_PREPARE = 53,
1: +  CPUHP_NET_FLOW_PREPARE = 54,
1: +  CPUHP_TOPOLOGY_PREPARE = 55,
1: +  CPUHP_NET_IUCV_PREPARE = 56,
1: +  CPUHP_ARM_BL_PREPARE = 57,
1: +  CPUHP_TRACE_RB_PREPARE = 58,
1: +  CPUHP_MM_ZS_PREPARE = 59,
1: +  CPUHP_MM_ZSWP_MEM_PREPARE = 60,
1: +  CPUHP_MM_ZSWP_POOL_PREPARE = 61,
1: +  CPUHP_KVM_PPC_BOOK3S_PREPARE = 62,
1: +  CPUHP_ZCOMP_PREPARE = 63,
1: +  CPUHP_TIMERS_PREPARE = 64,
1: +  CPUHP_MIPS_SOC_PREPARE = 65,
1: +  CPUHP_BP_PREPARE_DYN = 66,
1: +  CPUHP_BP_PREPARE_DYN_END = 86,
1: +  CPUHP_BRINGUP_CPU = 87,
1: +  CPUHP_AP_IDLE_DEAD = 88,
1: +  CPUHP_AP_OFFLINE = 89,
1: +  CPUHP_AP_SCHED_STARTING = 90,
1: +  CPUHP_AP_RCUTREE_DYING = 91,
1: +  CPUHP_AP_CPU_PM_STARTING = 92,
1: +  CPUHP_AP_IRQ_GIC_STARTING = 93,
1: +  CPUHP_AP_IRQ_HIP04_STARTING = 94,
1: +  CPUHP_AP_IRQ_ARMADA_XP_STARTING = 95,
1: +  CPUHP_AP_IRQ_BCM2836_STARTING = 96,
1: +  CPUHP_AP_IRQ_MIPS_GIC_STARTING = 97,
1: +  CPUHP_AP_IRQ_RISCV_STARTING = 98,
1: +  CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING = 99,
1: +  CPUHP_AP_ARM_MVEBU_COHERENCY = 100,
1: +  CPUHP_AP_MICROCODE_LOADER = 101,
1: +  CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING = 102,
1: +  CPUHP_AP_PERF_X86_STARTING = 103,
1: +  CPUHP_AP_PERF_X86_AMD_IBS_STARTING = 104,
1: +  CPUHP_AP_PERF_X86_CQM_STARTING = 105,
1: +  CPUHP_AP_PERF_X86_CSTATE_STARTING = 106,
1: +  CPUHP_AP_PERF_XTENSA_STARTING = 107,
1: +  CPUHP_AP_MIPS_OP_LOONGSON3_STARTING = 108,
1: +  CPUHP_AP_ARM_SDEI_STARTING = 109,
1: +  CPUHP_AP_ARM_VFP_STARTING = 110,
1: +  CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING = 111,
1: +  CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING = 112,
1: +  CPUHP_AP_PERF_ARM_ACPI_STARTING = 113,
1: +  CPUHP_AP_PERF_ARM_STARTING = 114,
1: +  CPUHP_AP_ARM_L2X0_STARTING = 115,
1: +  CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING = 116,
1: +  CPUHP_AP_ARM_ARCH_TIMER_STARTING = 117,
1: +  CPUHP_AP_ARM_GLOBAL_TIMER_STARTING = 118,
1: +  CPUHP_AP_JCORE_TIMER_STARTING = 119,
1: +  CPUHP_AP_ARM_TWD_STARTING = 120,
1: +  CPUHP_AP_QCOM_TIMER_STARTING = 121,
1: +  CPUHP_AP_TEGRA_TIMER_STARTING = 122,
1: +  CPUHP_AP_ARMADA_TIMER_STARTING = 123,
1: +  CPUHP_AP_MARCO_TIMER_STARTING = 124,
1: +  CPUHP_AP_MIPS_GIC_TIMER_STARTING = 125,
1: +  CPUHP_AP_ARC_TIMER_STARTING = 126,
1: +  CPUHP_AP_RISCV_TIMER_STARTING = 127,
1: +  CPUHP_AP_CLINT_TIMER_STARTING = 128,
1: +  CPUHP_AP_CSKY_TIMER_STARTING = 129,
1: +  CPUHP_AP_HYPERV_TIMER_STARTING = 130,
1: +  CPUHP_AP_KVM_STARTING = 131,
1: +  CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING = 132,
1: +  CPUHP_AP_KVM_ARM_VGIC_STARTING = 133,
1: +  CPUHP_AP_KVM_ARM_TIMER_STARTING = 134,
1: +  CPUHP_AP_DUMMY_TIMER_STARTING = 135,
1: +  CPUHP_AP_ARM_XEN_STARTING = 136,
1: +  CPUHP_AP_ARM_CORESIGHT_STARTING = 137,
1: +  CPUHP_AP_ARM_CORESIGHT_CTI_STARTING = 138,
1: +  CPUHP_AP_ARM64_ISNDEP_STARTING = 139,
1: +  CPUHP_AP_SMPCFD_DYING = 140,
1: +  CPUHP_AP_X86_TBOOT_DYING = 141,
1: +  CPUHP_AP_ARM_CACHE_B15_RAC_DYING = 142,
1: +  CPUHP_AP_ONLINE = 143,
1: +  CPUHP_TEARDOWN_CPU = 144,
1: +  CPUHP_AP_ONLINE_IDLE = 145,
1: +  CPUHP_AP_SMPBOOT_THREADS = 146,
1: +  CPUHP_AP_X86_VDSO_VMA_ONLINE = 147,
1: +  CPUHP_AP_IRQ_AFFINITY_ONLINE = 148,
1: +  CPUHP_AP_BLK_MQ_ONLINE = 149,
1: +  CPUHP_AP_ARM_MVEBU_SYNC_CLOCKS = 150,
1: +  CPUHP_AP_X86_INTEL_EPB_ONLINE = 151,
1: +  CPUHP_AP_PERF_ONLINE = 152,
1: +  CPUHP_AP_PERF_X86_ONLINE = 153,
1: +  CPUHP_AP_PERF_X86_UNCORE_ONLINE = 154,
1: +  CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE = 155,
1: +  CPUHP_AP_PERF_X86_AMD_POWER_ONLINE = 156,
1: +  CPUHP_AP_PERF_X86_RAPL_ONLINE = 157,
1: +  CPUHP_AP_PERF_X86_CQM_ONLINE = 158,
1: +  CPUHP_AP_PERF_X86_CSTATE_ONLINE = 159,
1: +  CPUHP_AP_PERF_S390_CF_ONLINE = 160,
1: +  CPUHP_AP_PERF_S390_SF_ONLINE = 161,
1: +  CPUHP_AP_PERF_ARM_CCI_ONLINE = 162,
1: +  CPUHP_AP_PERF_ARM_CCN_ONLINE = 163,
1: +  CPUHP_AP_PERF_ARM_HISI_DDRC_ONLINE = 164,
1: +  CPUHP_AP_PERF_ARM_HISI_HHA_ONLINE = 165,
1: +  CPUHP_AP_PERF_ARM_HISI_L3_ONLINE = 166,
1: +  CPUHP_AP_PERF_ARM_L2X0_ONLINE = 167,
1: +  CPUHP_AP_PERF_ARM_QCOM_L2_ONLINE = 168,
1: +  CPUHP_AP_PERF_ARM_QCOM_L3_ONLINE = 169,
1: +  CPUHP_AP_PERF_ARM_APM_XGENE_ONLINE = 170,
1: +  CPUHP_AP_PERF_ARM_CAVIUM_TX2_UNCORE_ONLINE = 171,
1: +  CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE = 172,
1: +  CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE = 173,
1: +  CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE = 174,
1: +  CPUHP_AP_PERF_POWERPC_TRACE_IMC_ONLINE = 175,
1: +  CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE = 176,
1: +  CPUHP_AP_PERF_POWERPC_HV_GPCI_ONLINE = 177,
1: +  CPUHP_AP_WATCHDOG_ONLINE = 178,
1: +  CPUHP_AP_WORKQUEUE_ONLINE = 179,
1: +  CPUHP_AP_RCUTREE_ONLINE = 180,
1: +  CPUHP_AP_BASE_CACHEINFO_ONLINE = 181,
1: +  CPUHP_AP_ONLINE_DYN = 182,
1: +  CPUHP_AP_ONLINE_DYN_END = 212,
1: +  CPUHP_AP_X86_HPET_ONLINE = 213,
1: +  CPUHP_AP_X86_KVM_CLK_ONLINE = 214,
1: +  CPUHP_AP_ACTIVE = 215,
1: +  CPUHP_ONLINE = 216,
1:  };
1:  
1:  struct static_call_mod {
1: -	struct static_call_mod *next;
1: -	struct module *mod;
1: -	struct static_call_site *sites;
1: +  struct static_call_mod *next;
1: +  struct module *mod;
1: +  struct static_call_site *sites;
1:  };
1:  
1:  struct ring_buffer_event {
1: -	u32 type_len: 5;
1: -	u32 time_delta: 27;
1: -	u32 array[0];
1: +  u32 type_len : 5;
1: +  u32 time_delta : 27;
1: +  u32 array[0];
1:  };
1:  
1:  struct seq_buf {
1: -	char *buffer;
1: -	size_t size;
1: -	size_t len;
1: -	loff_t readpos;
1: +  char *buffer;
1: +  size_t size;
1: +  size_t len;
1: +  loff_t readpos;
1:  };
1:  
1:  struct trace_seq {
1: -	unsigned char buffer[4096];
1: -	struct seq_buf seq;
1: -	int full;
1: +  unsigned char buffer[4096];
1: +  struct seq_buf seq;
1: +  int full;
1:  };
1:  
1:  enum perf_sw_ids {
1: -	PERF_COUNT_SW_CPU_CLOCK = 0,
1: -	PERF_COUNT_SW_TASK_CLOCK = 1,
1: -	PERF_COUNT_SW_PAGE_FAULTS = 2,
1: -	PERF_COUNT_SW_CONTEXT_SWITCHES = 3,
1: -	PERF_COUNT_SW_CPU_MIGRATIONS = 4,
1: -	PERF_COUNT_SW_PAGE_FAULTS_MIN = 5,
1: -	PERF_COUNT_SW_PAGE_FAULTS_MAJ = 6,
1: -	PERF_COUNT_SW_ALIGNMENT_FAULTS = 7,
1: -	PERF_COUNT_SW_EMULATION_FAULTS = 8,
1: -	PERF_COUNT_SW_DUMMY = 9,
1: -	PERF_COUNT_SW_BPF_OUTPUT = 10,
1: -	PERF_COUNT_SW_MAX = 11,
1: +  PERF_COUNT_SW_CPU_CLOCK = 0,
1: +  PERF_COUNT_SW_TASK_CLOCK = 1,
1: +  PERF_COUNT_SW_PAGE_FAULTS = 2,
1: +  PERF_COUNT_SW_CONTEXT_SWITCHES = 3,
1: +  PERF_COUNT_SW_CPU_MIGRATIONS = 4,
1: +  PERF_COUNT_SW_PAGE_FAULTS_MIN = 5,
1: +  PERF_COUNT_SW_PAGE_FAULTS_MAJ = 6,
1: +  PERF_COUNT_SW_ALIGNMENT_FAULTS = 7,
1: +  PERF_COUNT_SW_EMULATION_FAULTS = 8,
1: +  PERF_COUNT_SW_DUMMY = 9,
1: +  PERF_COUNT_SW_BPF_OUTPUT = 10,
1: +  PERF_COUNT_SW_MAX = 11,
1:  };
1:  
1:  union perf_mem_data_src {
1: -	__u64 val;
1: -	struct {
1: -		__u64 mem_op: 5;
1: -		__u64 mem_lvl: 14;
1: -		__u64 mem_snoop: 5;
1: -		__u64 mem_lock: 2;
1: -		__u64 mem_dtlb: 7;
1: -		__u64 mem_lvl_num: 4;
1: -		__u64 mem_remote: 1;
1: -		__u64 mem_snoopx: 2;
1: -		__u64 mem_rsvd: 24;
1: -	};
1: +  __u64 val;
1: +  struct {
1: +    __u64 mem_op : 5;
1: +    __u64 mem_lvl : 14;
1: +    __u64 mem_snoop : 5;
1: +    __u64 mem_lock : 2;
1: +    __u64 mem_dtlb : 7;
1: +    __u64 mem_lvl_num : 4;
1: +    __u64 mem_remote : 1;
1: +    __u64 mem_snoopx : 2;
1: +    __u64 mem_rsvd : 24;
1: +  };
1:  };
1:  
1:  struct perf_branch_entry {
1: -	__u64 from;
1: -	__u64 to;
1: -	__u64 mispred: 1;
1: -	__u64 predicted: 1;
1: -	__u64 in_tx: 1;
1: -	__u64 abort: 1;
1: -	__u64 cycles: 16;
1: -	__u64 type: 4;
1: -	__u64 reserved: 40;
1: +  __u64 from;
1: +  __u64 to;
1: +  __u64 mispred : 1;
1: +  __u64 predicted : 1;
1: +  __u64 in_tx : 1;
1: +  __u64 abort : 1;
1: +  __u64 cycles : 16;
1: +  __u64 type : 4;
1: +  __u64 reserved : 40;
1:  };
1:  
1:  struct new_utsname {
1: -	char sysname[65];
1: -	char nodename[65];
1: -	char release[65];
1: -	char version[65];
1: -	char machine[65];
1: -	char domainname[65];
1: +  char sysname[65];
1: +  char nodename[65];
1: +  char release[65];
1: +  char version[65];
1: +  char machine[65];
1: +  char domainname[65];
1:  };
1:  
1:  struct uts_namespace {
1: -	struct kref kref;
1: -	struct new_utsname name;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	struct ns_common ns;
1: +  struct kref kref;
1: +  struct new_utsname name;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  struct ns_common ns;
1:  };
1:  
1:  struct cgroup_namespace {
1: -	refcount_t count;
1: -	struct ns_common ns;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	struct css_set *root_cset;
1: +  refcount_t count;
1: +  struct ns_common ns;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  struct css_set *root_cset;
1:  };
1:  
1:  struct nsset {
1: -	unsigned int flags;
1: -	struct nsproxy *nsproxy;
1: -	struct fs_struct *fs;
1: -	const struct cred *cred;
1: +  unsigned int flags;
1: +  struct nsproxy *nsproxy;
1: +  struct fs_struct *fs;
1: +  const struct cred *cred;
1:  };
1:  
1:  struct proc_ns_operations {
1: -	const char *name;
1: -	const char *real_ns_name;
1: -	int type;
1: -	struct ns_common * (*get)(struct task_struct *);
1: -	void (*put)(struct ns_common *);
1: -	int (*install)(struct nsset *, struct ns_common *);
1: -	struct user_namespace * (*owner)(struct ns_common *);
1: -	struct ns_common * (*get_parent)(struct ns_common *);
1: +  const char *name;
1: +  const char *real_ns_name;
1: +  int type;
1: +  struct ns_common *(*get)(struct task_struct *);
1: +  void (*put)(struct ns_common *);
1: +  int (*install)(struct nsset *, struct ns_common *);
1: +  struct user_namespace *(*owner)(struct ns_common *);
1: +  struct ns_common *(*get_parent)(struct ns_common *);
1:  };
1:  
1:  struct ucounts {
1: -	struct hlist_node node;
1: -	struct user_namespace *ns;
1: -	kuid_t uid;
1: -	int count;
1: -	atomic_t ucount[10];
1: +  struct hlist_node node;
1: +  struct user_namespace *ns;
1: +  kuid_t uid;
1: +  int count;
1: +  atomic_t ucount[10];
1:  };
1:  
1:  struct perf_cpu_context;
1: @@ -7036,81 +7069,83 @@ struct perf_cpu_context;
1:  struct perf_output_handle;
1:  
1:  struct pmu {
1: -	struct list_head entry;
1: -	struct module *module;
1: -	struct device *dev;
1: -	const struct attribute_group **attr_groups;
1: -	const struct attribute_group **attr_update;
1: -	const char *name;
1: -	int type;
1: -	int capabilities;
1: -	int *pmu_disable_count;
1: -	struct perf_cpu_context *pmu_cpu_context;
1: -	atomic_t exclusive_cnt;
1: -	int task_ctx_nr;
1: -	int hrtimer_interval_ms;
1: -	unsigned int nr_addr_filters;
1: -	void (*pmu_enable)(struct pmu *);
1: -	void (*pmu_disable)(struct pmu *);
1: -	int (*event_init)(struct perf_event *);
1: -	void (*event_mapped)(struct perf_event *, struct mm_struct *);
1: -	void (*event_unmapped)(struct perf_event *, struct mm_struct *);
1: -	int (*add)(struct perf_event *, int);
1: -	void (*del)(struct perf_event *, int);
1: -	void (*start)(struct perf_event *, int);
1: -	void (*stop)(struct perf_event *, int);
1: -	void (*read)(struct perf_event *);
1: -	void (*start_txn)(struct pmu *, unsigned int);
1: -	int (*commit_txn)(struct pmu *);
1: -	void (*cancel_txn)(struct pmu *);
1: -	int (*event_idx)(struct perf_event *);
1: -	void (*sched_task)(struct perf_event_context *, bool);
1: -	struct kmem_cache *task_ctx_cache;
1: -	void (*swap_task_ctx)(struct perf_event_context *, struct perf_event_context *);
1: -	void * (*setup_aux)(struct perf_event *, void **, int, bool);
1: -	void (*free_aux)(void *);
1: -	long int (*snapshot_aux)(struct perf_event *, struct perf_output_handle *, long unsigned int);
1: -	int (*addr_filters_validate)(struct list_head *);
1: -	void (*addr_filters_sync)(struct perf_event *);
1: -	int (*aux_output_match)(struct perf_event *);
1: -	int (*filter_match)(struct perf_event *);
1: -	int (*check_period)(struct perf_event *, u64);
1: +  struct list_head entry;
1: +  struct module *module;
1: +  struct device *dev;
1: +  const struct attribute_group **attr_groups;
1: +  const struct attribute_group **attr_update;
1: +  const char *name;
1: +  int type;
1: +  int capabilities;
1: +  int *pmu_disable_count;
1: +  struct perf_cpu_context *pmu_cpu_context;
1: +  atomic_t exclusive_cnt;
1: +  int task_ctx_nr;
1: +  int hrtimer_interval_ms;
1: +  unsigned int nr_addr_filters;
1: +  void (*pmu_enable)(struct pmu *);
1: +  void (*pmu_disable)(struct pmu *);
1: +  int (*event_init)(struct perf_event *);
1: +  void (*event_mapped)(struct perf_event *, struct mm_struct *);
1: +  void (*event_unmapped)(struct perf_event *, struct mm_struct *);
1: +  int (*add)(struct perf_event *, int);
1: +  void (*del)(struct perf_event *, int);
1: +  void (*start)(struct perf_event *, int);
1: +  void (*stop)(struct perf_event *, int);
1: +  void (*read)(struct perf_event *);
1: +  void (*start_txn)(struct pmu *, unsigned int);
1: +  int (*commit_txn)(struct pmu *);
1: +  void (*cancel_txn)(struct pmu *);
1: +  int (*event_idx)(struct perf_event *);
1: +  void (*sched_task)(struct perf_event_context *, bool);
1: +  struct kmem_cache *task_ctx_cache;
1: +  void (*swap_task_ctx)(struct perf_event_context *,
1: +                        struct perf_event_context *);
1: +  void *(*setup_aux)(struct perf_event *, void **, int, bool);
1: +  void (*free_aux)(void *);
1: +  long int (*snapshot_aux)(struct perf_event *, struct perf_output_handle *,
1: +                           long unsigned int);
1: +  int (*addr_filters_validate)(struct list_head *);
1: +  void (*addr_filters_sync)(struct perf_event *);
1: +  int (*aux_output_match)(struct perf_event *);
1: +  int (*filter_match)(struct perf_event *);
1: +  int (*check_period)(struct perf_event *, u64);
1:  };
1:  
1:  struct iovec {
1: -	void *iov_base;
1: -	__kernel_size_t iov_len;
1: +  void *iov_base;
1: +  __kernel_size_t iov_len;
1:  };
1:  
1:  struct kvec {
1: -	void *iov_base;
1: -	size_t iov_len;
1: +  void *iov_base;
1: +  size_t iov_len;
1:  };
1:  
1:  struct perf_regs {
1: -	__u64 abi;
1: -	struct pt_regs *regs;
1: +  __u64 abi;
1: +  struct pt_regs *regs;
1:  };
1:  
1:  struct u64_stats_sync {};
1:  
1:  struct bpf_cgroup_storage_key {
1: -	__u64 cgroup_inode_id;
1: -	__u32 attach_type;
1: +  __u64 cgroup_inode_id;
1: +  __u32 attach_type;
1:  };
1:  
1:  enum kmalloc_cache_type {
1: -	KMALLOC_NORMAL = 0,
1: -	KMALLOC_RECLAIM = 1,
1: -	KMALLOC_DMA = 2,
1: -	NR_KMALLOC_TYPES = 3,
1: +  KMALLOC_NORMAL = 0,
1: +  KMALLOC_RECLAIM = 1,
1: +  KMALLOC_DMA = 2,
1: +  NR_KMALLOC_TYPES = 3,
1:  };
1:  
1:  struct bpf_cgroup_storage;
1:  
1:  struct bpf_prog_array_item {
1: -	struct bpf_prog *prog;
1: -	struct bpf_cgroup_storage *cgroup_storage[2];
1: +  struct bpf_prog *prog;
1: +  struct bpf_cgroup_storage *cgroup_storage[2];
1:  };
1:  
1:  struct bpf_storage_buffer;
1: @@ -7118,38 +7153,38 @@ struct bpf_storage_buffer;
1:  struct bpf_cgroup_storage_map;
1:  
1:  struct bpf_cgroup_storage {
1: -	union {
1: -		struct bpf_storage_buffer *buf;
1: -		void *percpu_buf;
1: -	};
1: -	struct bpf_cgroup_storage_map *map;
1: -	struct bpf_cgroup_storage_key key;
1: -	struct list_head list_map;
1: -	struct list_head list_cg;
1: -	struct rb_node node;
1: -	struct callback_head rcu;
1: +  union {
1: +    struct bpf_storage_buffer *buf;
1: +    void *percpu_buf;
1: +  };
1: +  struct bpf_cgroup_storage_map *map;
1: +  struct bpf_cgroup_storage_key key;
1: +  struct list_head list_map;
1: +  struct list_head list_cg;
1: +  struct rb_node node;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct bpf_prog_array {
1: -	struct callback_head rcu;
1: -	struct bpf_prog_array_item items[0];
1: +  struct callback_head rcu;
1: +  struct bpf_prog_array_item items[0];
1:  };
1:  
1:  struct bpf_storage_buffer {
1: -	struct callback_head rcu;
1: -	char data[0];
1: +  struct callback_head rcu;
1: +  char data[0];
1:  };
1:  
1:  struct psi_group_cpu {
1: -	seqcount_t seq;
1: -	unsigned int tasks[4];
1: -	u32 state_mask;
1: -	u32 times[6];
1: -	u64 state_start;
1: -	long: 64;
1: -	u32 times_prev[12];
1: -	long: 64;
1: -	long: 64;
1: +  seqcount_t seq;
1: +  unsigned int tasks[4];
1: +  u32 state_mask;
1: +  u32 times[6];
1: +  u64 state_start;
1: +  long : 64;
1: +  u32 times_prev[12];
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct cgroup_taskset;
1: @@ -7157,200 +7192,201 @@ struct cgroup_taskset;
1:  struct cftype;
1:  
1:  struct cgroup_subsys {
1: -	struct cgroup_subsys_state * (*css_alloc)(struct cgroup_subsys_state *);
1: -	int (*css_online)(struct cgroup_subsys_state *);
1: -	void (*css_offline)(struct cgroup_subsys_state *);
1: -	void (*css_released)(struct cgroup_subsys_state *);
1: -	void (*css_free)(struct cgroup_subsys_state *);
1: -	void (*css_reset)(struct cgroup_subsys_state *);
1: -	void (*css_rstat_flush)(struct cgroup_subsys_state *, int);
1: -	int (*css_extra_stat_show)(struct seq_file *, struct cgroup_subsys_state *);
1: -	int (*can_attach)(struct cgroup_taskset *);
1: -	void (*cancel_attach)(struct cgroup_taskset *);
1: -	void (*attach)(struct cgroup_taskset *);
1: -	void (*post_attach)();
1: -	int (*can_fork)(struct task_struct *, struct css_set *);
1: -	void (*cancel_fork)(struct task_struct *, struct css_set *);
1: -	void (*fork)(struct task_struct *);
1: -	void (*exit)(struct task_struct *);
1: -	void (*release)(struct task_struct *);
1: -	void (*bind)(struct cgroup_subsys_state *);
1: -	bool early_init: 1;
1: -	bool implicit_on_dfl: 1;
1: -	bool threaded: 1;
1: -	bool broken_hierarchy: 1;
1: -	bool warned_broken_hierarchy: 1;
1: -	int id;
1: -	const char *name;
1: -	const char *legacy_name;
1: -	struct cgroup_root *root;
1: -	struct idr css_idr;
1: -	struct list_head cfts;
1: -	struct cftype *dfl_cftypes;
1: -	struct cftype *legacy_cftypes;
1: -	unsigned int depends_on;
1: +  struct cgroup_subsys_state *(*css_alloc)(struct cgroup_subsys_state *);
1: +  int (*css_online)(struct cgroup_subsys_state *);
1: +  void (*css_offline)(struct cgroup_subsys_state *);
1: +  void (*css_released)(struct cgroup_subsys_state *);
1: +  void (*css_free)(struct cgroup_subsys_state *);
1: +  void (*css_reset)(struct cgroup_subsys_state *);
1: +  void (*css_rstat_flush)(struct cgroup_subsys_state *, int);
1: +  int (*css_extra_stat_show)(struct seq_file *, struct cgroup_subsys_state *);
1: +  int (*can_attach)(struct cgroup_taskset *);
1: +  void (*cancel_attach)(struct cgroup_taskset *);
1: +  void (*attach)(struct cgroup_taskset *);
1: +  void (*post_attach)();
1: +  int (*can_fork)(struct task_struct *, struct css_set *);
1: +  void (*cancel_fork)(struct task_struct *, struct css_set *);
1: +  void (*fork)(struct task_struct *);
1: +  void (*exit)(struct task_struct *);
1: +  void (*release)(struct task_struct *);
1: +  void (*bind)(struct cgroup_subsys_state *);
1: +  bool early_init : 1;
1: +  bool implicit_on_dfl : 1;
1: +  bool threaded : 1;
1: +  bool broken_hierarchy : 1;
1: +  bool warned_broken_hierarchy : 1;
1: +  int id;
1: +  const char *name;
1: +  const char *legacy_name;
1: +  struct cgroup_root *root;
1: +  struct idr css_idr;
1: +  struct list_head cfts;
1: +  struct cftype *dfl_cftypes;
1: +  struct cftype *legacy_cftypes;
1: +  unsigned int depends_on;
1:  };
1:  
1:  struct cgroup_rstat_cpu {
1: -	struct u64_stats_sync bsync;
1: -	struct cgroup_base_stat bstat;
1: -	struct cgroup_base_stat last_bstat;
1: -	struct cgroup *updated_children;
1: -	struct cgroup *updated_next;
1: +  struct u64_stats_sync bsync;
1: +  struct cgroup_base_stat bstat;
1: +  struct cgroup_base_stat last_bstat;
1: +  struct cgroup *updated_children;
1: +  struct cgroup *updated_next;
1:  };
1:  
1:  struct cgroup_root {
1: -	struct kernfs_root *kf_root;
1: -	unsigned int subsys_mask;
1: -	int hierarchy_id;
1: -	struct cgroup cgrp;
1: -	u64 cgrp_ancestor_id_storage;
1: -	atomic_t nr_cgrps;
1: -	struct list_head root_list;
1: -	unsigned int flags;
1: -	char release_agent_path[4096];
1: -	char name[64];
1: +  struct kernfs_root *kf_root;
1: +  unsigned int subsys_mask;
1: +  int hierarchy_id;
1: +  struct cgroup cgrp;
1: +  u64 cgrp_ancestor_id_storage;
1: +  atomic_t nr_cgrps;
1: +  struct list_head root_list;
1: +  unsigned int flags;
1: +  char release_agent_path[4096];
1: +  char name[64];
1:  };
1:  
1:  struct cftype {
1: -	char name[64];
1: -	long unsigned int private;
1: -	size_t max_write_len;
1: -	unsigned int flags;
1: -	unsigned int file_offset;
1: -	struct cgroup_subsys *ss;
1: -	struct list_head node;
1: -	struct kernfs_ops *kf_ops;
1: -	int (*open)(struct kernfs_open_file *);
1: -	void (*release)(struct kernfs_open_file *);
1: -	u64 (*read_u64)(struct cgroup_subsys_state *, struct cftype *);
1: -	s64 (*read_s64)(struct cgroup_subsys_state *, struct cftype *);
1: -	int (*seq_show)(struct seq_file *, void *);
1: -	void * (*seq_start)(struct seq_file *, loff_t *);
1: -	void * (*seq_next)(struct seq_file *, void *, loff_t *);
1: -	void (*seq_stop)(struct seq_file *, void *);
1: -	int (*write_u64)(struct cgroup_subsys_state *, struct cftype *, u64);
1: -	int (*write_s64)(struct cgroup_subsys_state *, struct cftype *, s64);
1: -	ssize_t (*write)(struct kernfs_open_file *, char *, size_t, loff_t);
1: -	__poll_t (*poll)(struct kernfs_open_file *, struct poll_table_struct *);
1: +  char name[64];
1: +  long unsigned int private;
1: +  size_t max_write_len;
1: +  unsigned int flags;
1: +  unsigned int file_offset;
1: +  struct cgroup_subsys *ss;
1: +  struct list_head node;
1: +  struct kernfs_ops *kf_ops;
1: +  int (*open)(struct kernfs_open_file *);
1: +  void (*release)(struct kernfs_open_file *);
1: +  u64 (*read_u64)(struct cgroup_subsys_state *, struct cftype *);
1: +  s64 (*read_s64)(struct cgroup_subsys_state *, struct cftype *);
1: +  int (*seq_show)(struct seq_file *, void *);
1: +  void *(*seq_start)(struct seq_file *, loff_t *);
1: +  void *(*seq_next)(struct seq_file *, void *, loff_t *);
1: +  void (*seq_stop)(struct seq_file *, void *);
1: +  int (*write_u64)(struct cgroup_subsys_state *, struct cftype *, u64);
1: +  int (*write_s64)(struct cgroup_subsys_state *, struct cftype *, s64);
1: +  ssize_t (*write)(struct kernfs_open_file *, char *, size_t, loff_t);
1: +  __poll_t (*poll)(struct kernfs_open_file *, struct poll_table_struct *);
1:  };
1:  
1:  struct perf_callchain_entry {
1: -	__u64 nr;
1: -	__u64 ip[0];
1: +  __u64 nr;
1: +  __u64 ip[0];
1:  };
1:  
1: -typedef long unsigned int (*perf_copy_f)(void *, const void *, long unsigned int, long unsigned int);
1: +typedef long unsigned int (*perf_copy_f)(void *, const void *,
1: +                                         long unsigned int, long unsigned int);
1:  
1:  struct perf_raw_frag {
1: -	union {
1: -		struct perf_raw_frag *next;
1: -		long unsigned int pad;
1: -	};
1: -	perf_copy_f copy;
1: -	void *data;
1: -	u32 size;
1: +  union {
1: +    struct perf_raw_frag *next;
1: +    long unsigned int pad;
1: +  };
1: +  perf_copy_f copy;
1: +  void *data;
1: +  u32 size;
1:  } __attribute__((packed));
1:  
1:  struct perf_raw_record {
1: -	struct perf_raw_frag frag;
1: -	u32 size;
1: +  struct perf_raw_frag frag;
1: +  u32 size;
1:  };
1:  
1:  struct perf_branch_stack {
1: -	__u64 nr;
1: -	__u64 hw_idx;
1: -	struct perf_branch_entry entries[0];
1: +  __u64 nr;
1: +  __u64 hw_idx;
1: +  struct perf_branch_entry entries[0];
1:  };
1:  
1:  struct perf_cpu_context {
1: -	struct perf_event_context ctx;
1: -	struct perf_event_context *task_ctx;
1: -	int active_oncpu;
1: -	int exclusive;
1: -	raw_spinlock_t hrtimer_lock;
1: -	struct hrtimer hrtimer;
1: -	ktime_t hrtimer_interval;
1: -	unsigned int hrtimer_active;
1: -	struct perf_cgroup *cgrp;
1: -	struct list_head cgrp_cpuctx_entry;
1: -	int sched_cb_usage;
1: -	int online;
1: -	int heap_size;
1: -	struct perf_event **heap;
1: -	struct perf_event *heap_default[2];
1: +  struct perf_event_context ctx;
1: +  struct perf_event_context *task_ctx;
1: +  int active_oncpu;
1: +  int exclusive;
1: +  raw_spinlock_t hrtimer_lock;
1: +  struct hrtimer hrtimer;
1: +  ktime_t hrtimer_interval;
1: +  unsigned int hrtimer_active;
1: +  struct perf_cgroup *cgrp;
1: +  struct list_head cgrp_cpuctx_entry;
1: +  int sched_cb_usage;
1: +  int online;
1: +  int heap_size;
1: +  struct perf_event **heap;
1: +  struct perf_event *heap_default[2];
1:  };
1:  
1:  struct perf_output_handle {
1: -	struct perf_event *event;
1: -	struct perf_buffer *rb;
1: -	long unsigned int wakeup;
1: -	long unsigned int size;
1: -	u64 aux_flags;
1: -	union {
1: -		void *addr;
1: -		long unsigned int head;
1: -	};
1: -	int page;
1: +  struct perf_event *event;
1: +  struct perf_buffer *rb;
1: +  long unsigned int wakeup;
1: +  long unsigned int size;
1: +  u64 aux_flags;
1: +  union {
1: +    void *addr;
1: +    long unsigned int head;
1: +  };
1: +  int page;
1:  };
1:  
1:  struct perf_addr_filter_range {
1: -	long unsigned int start;
1: -	long unsigned int size;
1: +  long unsigned int start;
1: +  long unsigned int size;
1:  };
1:  
1:  struct perf_sample_data {
1: -	u64 addr;
1: -	struct perf_raw_record *raw;
1: -	struct perf_branch_stack *br_stack;
1: -	u64 period;
1: -	u64 weight;
1: -	u64 txn;
1: -	union perf_mem_data_src data_src;
1: -	u64 type;
1: -	u64 ip;
1: -	struct {
1: -		u32 pid;
1: -		u32 tid;
1: -	} tid_entry;
1: -	u64 time;
1: -	u64 id;
1: -	u64 stream_id;
1: -	struct {
1: -		u32 cpu;
1: -		u32 reserved;
1: -	} cpu_entry;
1: -	struct perf_callchain_entry *callchain;
1: -	u64 aux_size;
1: -	struct perf_regs regs_user;
1: -	struct pt_regs regs_user_copy;
1: -	struct perf_regs regs_intr;
1: -	u64 stack_user_size;
1: -	u64 phys_addr;
1: -	u64 cgroup;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u64 addr;
1: +  struct perf_raw_record *raw;
1: +  struct perf_branch_stack *br_stack;
1: +  u64 period;
1: +  u64 weight;
1: +  u64 txn;
1: +  union perf_mem_data_src data_src;
1: +  u64 type;
1: +  u64 ip;
1: +  struct {
1: +    u32 pid;
1: +    u32 tid;
1: +  } tid_entry;
1: +  u64 time;
1: +  u64 id;
1: +  u64 stream_id;
1: +  struct {
1: +    u32 cpu;
1: +    u32 reserved;
1: +  } cpu_entry;
1: +  struct perf_callchain_entry *callchain;
1: +  u64 aux_size;
1: +  struct perf_regs regs_user;
1: +  struct pt_regs regs_user_copy;
1: +  struct perf_regs regs_intr;
1: +  u64 stack_user_size;
1: +  u64 phys_addr;
1: +  u64 cgroup;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct perf_cgroup_info;
1:  
1:  struct perf_cgroup {
1: -	struct cgroup_subsys_state css;
1: -	struct perf_cgroup_info *info;
1: +  struct cgroup_subsys_state css;
1: +  struct perf_cgroup_info *info;
1:  };
1:  
1:  struct perf_cgroup_info {
1: -	u64 time;
1: -	u64 timestamp;
1: +  u64 time;
1: +  u64 timestamp;
1:  };
1:  
1:  struct trace_entry {
1: -	short unsigned int type;
1: -	unsigned char flags;
1: -	unsigned char preempt_count;
1: -	int pid;
1: +  short unsigned int type;
1: +  unsigned char flags;
1: +  unsigned char preempt_count;
1: +  int pid;
1:  };
1:  
1:  struct trace_array;
1: @@ -7362,80 +7398,81 @@ struct array_buffer;
1:  struct ring_buffer_iter;
1:  
1:  struct trace_iterator {
1: -	struct trace_array *tr;
1: -	struct tracer *trace;
1: -	struct array_buffer *array_buffer;
1: -	void *private;
1: -	int cpu_file;
1: -	struct mutex mutex;
1: -	struct ring_buffer_iter **buffer_iter;
1: -	long unsigned int iter_flags;
1: -	void *temp;
1: -	unsigned int temp_size;
1: -	struct trace_seq tmp_seq;
1: -	cpumask_var_t started;
1: -	bool snapshot;
1: -	struct trace_seq seq;
1: -	struct trace_entry *ent;
1: -	long unsigned int lost_events;
1: -	int leftover;
1: -	int ent_size;
1: -	int cpu;
1: -	u64 ts;
1: -	loff_t pos;
1: -	long int idx;
1: +  struct trace_array *tr;
1: +  struct tracer *trace;
1: +  struct array_buffer *array_buffer;
1: +  void *private;
1: +  int cpu_file;
1: +  struct mutex mutex;
1: +  struct ring_buffer_iter **buffer_iter;
1: +  long unsigned int iter_flags;
1: +  void *temp;
1: +  unsigned int temp_size;
1: +  struct trace_seq tmp_seq;
1: +  cpumask_var_t started;
1: +  bool snapshot;
1: +  struct trace_seq seq;
1: +  struct trace_entry *ent;
1: +  long unsigned int lost_events;
1: +  int leftover;
1: +  int ent_size;
1: +  int cpu;
1: +  u64 ts;
1: +  loff_t pos;
1: +  long int idx;
1:  };
1:  
1:  enum print_line_t {
1: -	TRACE_TYPE_PARTIAL_LINE = 0,
1: -	TRACE_TYPE_HANDLED = 1,
1: -	TRACE_TYPE_UNHANDLED = 2,
1: -	TRACE_TYPE_NO_CONSUME = 3,
1: +  TRACE_TYPE_PARTIAL_LINE = 0,
1: +  TRACE_TYPE_HANDLED = 1,
1: +  TRACE_TYPE_UNHANDLED = 2,
1: +  TRACE_TYPE_NO_CONSUME = 3,
1:  };
1:  
1: -typedef enum print_line_t (*trace_print_func)(struct trace_iterator *, int, struct trace_event *);
1: +typedef enum print_line_t (*trace_print_func)(struct trace_iterator *, int,
1: +                                              struct trace_event *);
1:  
1:  struct trace_event_functions {
1: -	trace_print_func trace;
1: -	trace_print_func raw;
1: -	trace_print_func hex;
1: -	trace_print_func binary;
1: +  trace_print_func trace;
1: +  trace_print_func raw;
1: +  trace_print_func hex;
1: +  trace_print_func binary;
1:  };
1:  
1:  enum trace_reg {
1: -	TRACE_REG_REGISTER = 0,
1: -	TRACE_REG_UNREGISTER = 1,
1: -	TRACE_REG_PERF_REGISTER = 2,
1: -	TRACE_REG_PERF_UNREGISTER = 3,
1: -	TRACE_REG_PERF_OPEN = 4,
1: -	TRACE_REG_PERF_CLOSE = 5,
1: -	TRACE_REG_PERF_ADD = 6,
1: -	TRACE_REG_PERF_DEL = 7,
1: +  TRACE_REG_REGISTER = 0,
1: +  TRACE_REG_UNREGISTER = 1,
1: +  TRACE_REG_PERF_REGISTER = 2,
1: +  TRACE_REG_PERF_UNREGISTER = 3,
1: +  TRACE_REG_PERF_OPEN = 4,
1: +  TRACE_REG_PERF_CLOSE = 5,
1: +  TRACE_REG_PERF_ADD = 6,
1: +  TRACE_REG_PERF_DEL = 7,
1:  };
1:  
1:  struct trace_event_fields {
1: -	const char *type;
1: -	union {
1: -		struct {
1: -			const char *name;
1: -			const int size;
1: -			const int align;
1: -			const int is_signed;
1: -			const int filter_type;
1: -		};
1: -		int (*define_fields)(struct trace_event_call *);
1: -	};
1: +  const char *type;
1: +  union {
1: +    struct {
1: +      const char *name;
1: +      const int size;
1: +      const int align;
1: +      const int is_signed;
1: +      const int filter_type;
1: +    };
1: +    int (*define_fields)(struct trace_event_call *);
1: +  };
1:  };
1:  
1:  struct trace_event_class {
1: -	const char *system;
1: -	void *probe;
1: -	void *perf_probe;
1: -	int (*reg)(struct trace_event_call *, enum trace_reg, void *);
1: -	struct trace_event_fields *fields_array;
1: -	struct list_head * (*get_fields)(struct trace_event_call *);
1: -	struct list_head fields;
1: -	int (*raw_init)(struct trace_event_call *);
1: +  const char *system;
1: +  void *probe;
1: +  void *perf_probe;
1: +  int (*reg)(struct trace_event_call *, enum trace_reg, void *);
1: +  struct trace_event_fields *fields_array;
1: +  struct list_head *(*get_fields)(struct trace_event_call *);
1: +  struct list_head fields;
1: +  int (*raw_init)(struct trace_event_call *);
1:  };
1:  
1:  struct trace_buffer;
1: @@ -7443,86 +7480,86 @@ struct trace_buffer;
1:  struct trace_event_file;
1:  
1:  struct trace_event_buffer {
1: -	struct trace_buffer *buffer;
1: -	struct ring_buffer_event *event;
1: -	struct trace_event_file *trace_file;
1: -	void *entry;
1: -	long unsigned int flags;
1: -	int pc;
1: -	struct pt_regs *regs;
1: +  struct trace_buffer *buffer;
1: +  struct ring_buffer_event *event;
1: +  struct trace_event_file *trace_file;
1: +  void *entry;
1: +  long unsigned int flags;
1: +  int pc;
1: +  struct pt_regs *regs;
1:  };
1:  
1:  struct trace_subsystem_dir;
1:  
1:  struct trace_event_file {
1: -	struct list_head list;
1: -	struct trace_event_call *event_call;
1: -	struct event_filter *filter;
1: -	struct dentry *dir;
1: -	struct trace_array *tr;
1: -	struct trace_subsystem_dir *system;
1: -	struct list_head triggers;
1: -	long unsigned int flags;
1: -	atomic_t sm_ref;
1: -	atomic_t tm_ref;
1: +  struct list_head list;
1: +  struct trace_event_call *event_call;
1: +  struct event_filter *filter;
1: +  struct dentry *dir;
1: +  struct trace_array *tr;
1: +  struct trace_subsystem_dir *system;
1: +  struct list_head triggers;
1: +  long unsigned int flags;
1: +  atomic_t sm_ref;
1: +  atomic_t tm_ref;
1:  };
1:  
1:  enum {
1: -	TRACE_EVENT_FL_FILTERED_BIT = 0,
1: -	TRACE_EVENT_FL_CAP_ANY_BIT = 1,
1: -	TRACE_EVENT_FL_NO_SET_FILTER_BIT = 2,
1: -	TRACE_EVENT_FL_IGNORE_ENABLE_BIT = 3,
1: -	TRACE_EVENT_FL_TRACEPOINT_BIT = 4,
1: -	TRACE_EVENT_FL_KPROBE_BIT = 5,
1: -	TRACE_EVENT_FL_UPROBE_BIT = 6,
1: +  TRACE_EVENT_FL_FILTERED_BIT = 0,
1: +  TRACE_EVENT_FL_CAP_ANY_BIT = 1,
1: +  TRACE_EVENT_FL_NO_SET_FILTER_BIT = 2,
1: +  TRACE_EVENT_FL_IGNORE_ENABLE_BIT = 3,
1: +  TRACE_EVENT_FL_TRACEPOINT_BIT = 4,
1: +  TRACE_EVENT_FL_KPROBE_BIT = 5,
1: +  TRACE_EVENT_FL_UPROBE_BIT = 6,
1:  };
1:  
1:  enum {
1: -	TRACE_EVENT_FL_FILTERED = 1,
1: -	TRACE_EVENT_FL_CAP_ANY = 2,
1: -	TRACE_EVENT_FL_NO_SET_FILTER = 4,
1: -	TRACE_EVENT_FL_IGNORE_ENABLE = 8,
1: -	TRACE_EVENT_FL_TRACEPOINT = 16,
1: -	TRACE_EVENT_FL_KPROBE = 32,
1: -	TRACE_EVENT_FL_UPROBE = 64,
1: +  TRACE_EVENT_FL_FILTERED = 1,
1: +  TRACE_EVENT_FL_CAP_ANY = 2,
1: +  TRACE_EVENT_FL_NO_SET_FILTER = 4,
1: +  TRACE_EVENT_FL_IGNORE_ENABLE = 8,
1: +  TRACE_EVENT_FL_TRACEPOINT = 16,
1: +  TRACE_EVENT_FL_KPROBE = 32,
1: +  TRACE_EVENT_FL_UPROBE = 64,
1:  };
1:  
1:  enum {
1: -	EVENT_FILE_FL_ENABLED_BIT = 0,
1: -	EVENT_FILE_FL_RECORDED_CMD_BIT = 1,
1: -	EVENT_FILE_FL_RECORDED_TGID_BIT = 2,
1: -	EVENT_FILE_FL_FILTERED_BIT = 3,
1: -	EVENT_FILE_FL_NO_SET_FILTER_BIT = 4,
1: -	EVENT_FILE_FL_SOFT_MODE_BIT = 5,
1: -	EVENT_FILE_FL_SOFT_DISABLED_BIT = 6,
1: -	EVENT_FILE_FL_TRIGGER_MODE_BIT = 7,
1: -	EVENT_FILE_FL_TRIGGER_COND_BIT = 8,
1: -	EVENT_FILE_FL_PID_FILTER_BIT = 9,
1: -	EVENT_FILE_FL_WAS_ENABLED_BIT = 10,
1: +  EVENT_FILE_FL_ENABLED_BIT = 0,
1: +  EVENT_FILE_FL_RECORDED_CMD_BIT = 1,
1: +  EVENT_FILE_FL_RECORDED_TGID_BIT = 2,
1: +  EVENT_FILE_FL_FILTERED_BIT = 3,
1: +  EVENT_FILE_FL_NO_SET_FILTER_BIT = 4,
1: +  EVENT_FILE_FL_SOFT_MODE_BIT = 5,
1: +  EVENT_FILE_FL_SOFT_DISABLED_BIT = 6,
1: +  EVENT_FILE_FL_TRIGGER_MODE_BIT = 7,
1: +  EVENT_FILE_FL_TRIGGER_COND_BIT = 8,
1: +  EVENT_FILE_FL_PID_FILTER_BIT = 9,
1: +  EVENT_FILE_FL_WAS_ENABLED_BIT = 10,
1:  };
1:  
1:  enum {
1: -	EVENT_FILE_FL_ENABLED = 1,
1: -	EVENT_FILE_FL_RECORDED_CMD = 2,
1: -	EVENT_FILE_FL_RECORDED_TGID = 4,
1: -	EVENT_FILE_FL_FILTERED = 8,
1: -	EVENT_FILE_FL_NO_SET_FILTER = 16,
1: -	EVENT_FILE_FL_SOFT_MODE = 32,
1: -	EVENT_FILE_FL_SOFT_DISABLED = 64,
1: -	EVENT_FILE_FL_TRIGGER_MODE = 128,
1: -	EVENT_FILE_FL_TRIGGER_COND = 256,
1: -	EVENT_FILE_FL_PID_FILTER = 512,
1: -	EVENT_FILE_FL_WAS_ENABLED = 1024,
1: +  EVENT_FILE_FL_ENABLED = 1,
1: +  EVENT_FILE_FL_RECORDED_CMD = 2,
1: +  EVENT_FILE_FL_RECORDED_TGID = 4,
1: +  EVENT_FILE_FL_FILTERED = 8,
1: +  EVENT_FILE_FL_NO_SET_FILTER = 16,
1: +  EVENT_FILE_FL_SOFT_MODE = 32,
1: +  EVENT_FILE_FL_SOFT_DISABLED = 64,
1: +  EVENT_FILE_FL_TRIGGER_MODE = 128,
1: +  EVENT_FILE_FL_TRIGGER_COND = 256,
1: +  EVENT_FILE_FL_PID_FILTER = 512,
1: +  EVENT_FILE_FL_WAS_ENABLED = 1024,
1:  };
1:  
1:  enum {
1: -	FILTER_OTHER = 0,
1: -	FILTER_STATIC_STRING = 1,
1: -	FILTER_DYN_STRING = 2,
1: -	FILTER_PTR_STRING = 3,
1: -	FILTER_TRACE_FN = 4,
1: -	FILTER_COMM = 5,
1: -	FILTER_CPU = 6,
1: +  FILTER_OTHER = 0,
1: +  FILTER_STATIC_STRING = 1,
1: +  FILTER_DYN_STRING = 2,
1: +  FILTER_PTR_STRING = 3,
1: +  FILTER_TRACE_FN = 4,
1: +  FILTER_COMM = 5,
1: +  FILTER_CPU = 6,
1:  };
1:  
1:  struct fwnode_reference_args;
1: @@ -7530,72 +7567,86 @@ struct fwnode_reference_args;
1:  struct fwnode_endpoint;
1:  
1:  struct fwnode_operations {
1: -	struct fwnode_handle * (*get)(struct fwnode_handle *);
1: -	void (*put)(struct fwnode_handle *);
1: -	bool (*device_is_available)(const struct fwnode_handle *);
1: -	const void * (*device_get_match_data)(const struct fwnode_handle *, const struct device *);
1: -	bool (*property_present)(const struct fwnode_handle *, const char *);
1: -	int (*property_read_int_array)(const struct fwnode_handle *, const char *, unsigned int, void *, size_t);
1: -	int (*property_read_string_array)(const struct fwnode_handle *, const char *, const char **, size_t);
1: -	const char * (*get_name)(const struct fwnode_handle *);
1: -	const char * (*get_name_prefix)(const struct fwnode_handle *);
1: -	struct fwnode_handle * (*get_parent)(const struct fwnode_handle *);
1: -	struct fwnode_handle * (*get_next_child_node)(const struct fwnode_handle *, struct fwnode_handle *);
1: -	struct fwnode_handle * (*get_named_child_node)(const struct fwnode_handle *, const char *);
1: -	int (*get_reference_args)(const struct fwnode_handle *, const char *, const char *, unsigned int, unsigned int, struct fwnode_reference_args *);
1: -	struct fwnode_handle * (*graph_get_next_endpoint)(const struct fwnode_handle *, struct fwnode_handle *);
1: -	struct fwnode_handle * (*graph_get_remote_endpoint)(const struct fwnode_handle *);
1: -	struct fwnode_handle * (*graph_get_port_parent)(struct fwnode_handle *);
1: -	int (*graph_parse_endpoint)(const struct fwnode_handle *, struct fwnode_endpoint *);
1: -	int (*add_links)(const struct fwnode_handle *, struct device *);
1: +  struct fwnode_handle *(*get)(struct fwnode_handle *);
1: +  void (*put)(struct fwnode_handle *);
1: +  bool (*device_is_available)(const struct fwnode_handle *);
1: +  const void *(*device_get_match_data)(const struct fwnode_handle *,
1: +                                       const struct device *);
1: +  bool (*property_present)(const struct fwnode_handle *, const char *);
1: +  int (*property_read_int_array)(const struct fwnode_handle *, const char *,
1: +                                 unsigned int, void *, size_t);
1: +  int (*property_read_string_array)(const struct fwnode_handle *, const char *,
1: +                                    const char **, size_t);
1: +  const char *(*get_name)(const struct fwnode_handle *);
1: +  const char *(*get_name_prefix)(const struct fwnode_handle *);
1: +  struct fwnode_handle *(*get_parent)(const struct fwnode_handle *);
1: +  struct fwnode_handle *(*get_next_child_node)(const struct fwnode_handle *,
1: +                                               struct fwnode_handle *);
1: +  struct fwnode_handle *(*get_named_child_node)(const struct fwnode_handle *,
1: +                                                const char *);
1: +  int (*get_reference_args)(const struct fwnode_handle *, const char *,
1: +                            const char *, unsigned int, unsigned int,
1: +                            struct fwnode_reference_args *);
1: +  struct fwnode_handle *(*graph_get_next_endpoint)(const struct fwnode_handle *,
1: +                                                   struct fwnode_handle *);
1: +  struct fwnode_handle *(*graph_get_remote_endpoint)(
1: +      const struct fwnode_handle *);
1: +  struct fwnode_handle *(*graph_get_port_parent)(struct fwnode_handle *);
1: +  int (*graph_parse_endpoint)(const struct fwnode_handle *,
1: +                              struct fwnode_endpoint *);
1: +  int (*add_links)(const struct fwnode_handle *, struct device *);
1:  };
1:  
1:  struct fwnode_endpoint {
1: -	unsigned int port;
1: -	unsigned int id;
1: -	const struct fwnode_handle *local_fwnode;
1: +  unsigned int port;
1: +  unsigned int id;
1: +  const struct fwnode_handle *local_fwnode;
1:  };
1:  
1:  struct fwnode_reference_args {
1: -	struct fwnode_handle *fwnode;
1: -	unsigned int nargs;
1: -	u64 args[8];
1: +  struct fwnode_handle *fwnode;
1: +  unsigned int nargs;
1: +  u64 args[8];
1:  };
1:  
1:  struct property {
1: -	char *name;
1: -	int length;
1: -	void *value;
1: -	struct property *next;
1: +  char *name;
1: +  int length;
1: +  void *value;
1: +  struct property *next;
1:  };
1:  
1:  struct irq_fwspec {
1: -	struct fwnode_handle *fwnode;
1: -	int param_count;
1: -	u32 param[16];
1: +  struct fwnode_handle *fwnode;
1: +  int param_count;
1: +  u32 param[16];
1:  };
1:  
1:  struct irq_data;
1:  
1:  struct irq_domain_ops {
1: -	int (*match)(struct irq_domain *, struct device_node *, enum irq_domain_bus_token);
1: -	int (*select)(struct irq_domain *, struct irq_fwspec *, enum irq_domain_bus_token);
1: -	int (*map)(struct irq_domain *, unsigned int, irq_hw_number_t);
1: -	void (*unmap)(struct irq_domain *, unsigned int);
1: -	int (*xlate)(struct irq_domain *, struct device_node *, const u32 *, unsigned int, long unsigned int *, unsigned int *);
1: -	int (*alloc)(struct irq_domain *, unsigned int, unsigned int, void *);
1: -	void (*free)(struct irq_domain *, unsigned int, unsigned int);
1: -	int (*activate)(struct irq_domain *, struct irq_data *, bool);
1: -	void (*deactivate)(struct irq_domain *, struct irq_data *);
1: -	int (*translate)(struct irq_domain *, struct irq_fwspec *, long unsigned int *, unsigned int *);
1: +  int (*match)(struct irq_domain *, struct device_node *,
1: +               enum irq_domain_bus_token);
1: +  int (*select)(struct irq_domain *, struct irq_fwspec *,
1: +                enum irq_domain_bus_token);
1: +  int (*map)(struct irq_domain *, unsigned int, irq_hw_number_t);
1: +  void (*unmap)(struct irq_domain *, unsigned int);
1: +  int (*xlate)(struct irq_domain *, struct device_node *, const u32 *,
1: +               unsigned int, long unsigned int *, unsigned int *);
1: +  int (*alloc)(struct irq_domain *, unsigned int, unsigned int, void *);
1: +  void (*free)(struct irq_domain *, unsigned int, unsigned int);
1: +  int (*activate)(struct irq_domain *, struct irq_data *, bool);
1: +  void (*deactivate)(struct irq_domain *, struct irq_data *);
1: +  int (*translate)(struct irq_domain *, struct irq_fwspec *,
1: +                   long unsigned int *, unsigned int *);
1:  };
1:  
1:  enum wb_stat_item {
1: -	WB_RECLAIMABLE = 0,
1: -	WB_WRITEBACK = 1,
1: -	WB_DIRTIED = 2,
1: -	WB_WRITTEN = 3,
1: -	NR_WB_STAT_ITEMS = 4,
1: +  WB_RECLAIMABLE = 0,
1: +  WB_WRITEBACK = 1,
1: +  WB_DIRTIED = 2,
1: +  WB_WRITTEN = 3,
1: +  NR_WB_STAT_ITEMS = 4,
1:  };
1:  
1:  struct disk_stats;
1: @@ -7603,17 +7654,17 @@ struct disk_stats;
1:  struct partition_meta_info;
1:  
1:  struct hd_struct {
1: -	sector_t start_sect;
1: -	sector_t nr_sects;
1: -	long unsigned int stamp;
1: -	struct disk_stats *dkstats;
1: -	struct percpu_ref ref;
1: -	struct device __dev;
1: -	struct kobject *holder_dir;
1: -	int policy;
1: -	int partno;
1: -	struct partition_meta_info *info;
1: -	struct rcu_work rcu_work;
1: +  sector_t start_sect;
1: +  sector_t nr_sects;
1: +  long unsigned int stamp;
1: +  struct disk_stats *dkstats;
1: +  struct percpu_ref ref;
1: +  struct device __dev;
1: +  struct kobject *holder_dir;
1: +  int policy;
1: +  int partno;
1: +  struct partition_meta_info *info;
1: +  struct rcu_work rcu_work;
1:  };
1:  
1:  struct disk_part_tbl;
1: @@ -7629,39 +7680,39 @@ struct cdrom_device_info;
1:  struct badblocks;
1:  
1:  struct gendisk {
1: -	int major;
1: -	int first_minor;
1: -	int minors;
1: -	char disk_name[32];
1: -	short unsigned int events;
1: -	short unsigned int event_flags;
1: -	struct disk_part_tbl *part_tbl;
1: -	struct hd_struct part0;
1: -	const struct block_device_operations *fops;
1: -	struct request_queue *queue;
1: -	void *private_data;
1: -	int flags;
1: -	long unsigned int state;
1: -	struct rw_semaphore lookup_sem;
1: -	struct kobject *slave_dir;
1: -	struct timer_rand_state *random;
1: -	atomic_t sync_io;
1: -	struct disk_events *ev;
1: -	struct cdrom_device_info *cdi;
1: -	int node_id;
1: -	struct badblocks *bb;
1: -	struct lockdep_map lockdep_map;
1: +  int major;
1: +  int first_minor;
1: +  int minors;
1: +  char disk_name[32];
1: +  short unsigned int events;
1: +  short unsigned int event_flags;
1: +  struct disk_part_tbl *part_tbl;
1: +  struct hd_struct part0;
1: +  const struct block_device_operations *fops;
1: +  struct request_queue *queue;
1: +  void *private_data;
1: +  int flags;
1: +  long unsigned int state;
1: +  struct rw_semaphore lookup_sem;
1: +  struct kobject *slave_dir;
1: +  struct timer_rand_state *random;
1: +  atomic_t sync_io;
1: +  struct disk_events *ev;
1: +  struct cdrom_device_info *cdi;
1: +  int node_id;
1: +  struct badblocks *bb;
1: +  struct lockdep_map lockdep_map;
1:  };
1:  
1:  struct blkg_iostat {
1: -	u64 bytes[3];
1: -	u64 ios[3];
1: +  u64 bytes[3];
1: +  u64 ios[3];
1:  };
1:  
1:  struct blkg_iostat_set {
1: -	struct u64_stats_sync sync;
1: -	struct blkg_iostat cur;
1: -	struct blkg_iostat last;
1: +  struct u64_stats_sync sync;
1: +  struct blkg_iostat cur;
1: +  struct blkg_iostat last;
1:  };
1:  
1:  struct blkcg;
1: @@ -7669,39 +7720,39 @@ struct blkcg;
1:  struct blkg_policy_data;
1:  
1:  struct blkcg_gq {
1: -	struct request_queue *q;
1: -	struct list_head q_node;
1: -	struct hlist_node blkcg_node;
1: -	struct blkcg *blkcg;
1: -	struct blkcg_gq *parent;
1: -	struct percpu_ref refcnt;
1: -	bool online;
1: -	struct blkg_iostat_set *iostat_cpu;
1: -	struct blkg_iostat_set iostat;
1: -	struct blkg_policy_data *pd[5];
1: -	spinlock_t async_bio_lock;
1: -	struct bio_list async_bios;
1: -	struct work_struct async_bio_work;
1: -	atomic_t use_delay;
1: -	atomic64_t delay_nsec;
1: -	atomic64_t delay_start;
1: -	u64 last_delay;
1: -	int last_use;
1: -	struct callback_head callback_head;
1: +  struct request_queue *q;
1: +  struct list_head q_node;
1: +  struct hlist_node blkcg_node;
1: +  struct blkcg *blkcg;
1: +  struct blkcg_gq *parent;
1: +  struct percpu_ref refcnt;
1: +  bool online;
1: +  struct blkg_iostat_set *iostat_cpu;
1: +  struct blkg_iostat_set iostat;
1: +  struct blkg_policy_data *pd[5];
1: +  spinlock_t async_bio_lock;
1: +  struct bio_list async_bios;
1: +  struct work_struct async_bio_work;
1: +  atomic_t use_delay;
1: +  atomic64_t delay_nsec;
1: +  atomic64_t delay_start;
1: +  u64 last_delay;
1: +  int last_use;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  typedef unsigned int blk_qc_t;
1:  
1:  struct partition_meta_info {
1: -	char uuid[37];
1: -	u8 volname[64];
1: +  char uuid[37];
1: +  u8 volname[64];
1:  };
1:  
1:  struct disk_part_tbl {
1: -	struct callback_head callback_head;
1: -	int len;
1: -	struct hd_struct *last_lookup;
1: -	struct hd_struct *part[0];
1: +  struct callback_head callback_head;
1: +  int len;
1: +  struct hd_struct *last_lookup;
1: +  struct hd_struct *part[0];
1:  };
1:  
1:  struct blk_zone;
1: @@ -7713,64 +7764,66 @@ struct hd_geometry;
1:  struct pr_ops;
1:  
1:  struct block_device_operations {
1: -	blk_qc_t (*submit_bio)(struct bio *);
1: -	int (*open)(struct block_device *, fmode_t);
1: -	void (*release)(struct gendisk *, fmode_t);
1: -	int (*rw_page)(struct block_device *, sector_t, struct page *, unsigned int);
1: -	int (*ioctl)(struct block_device *, fmode_t, unsigned int, long unsigned int);
1: -	int (*compat_ioctl)(struct block_device *, fmode_t, unsigned int, long unsigned int);
1: -	unsigned int (*check_events)(struct gendisk *, unsigned int);
1: -	void (*unlock_native_capacity)(struct gendisk *);
1: -	int (*revalidate_disk)(struct gendisk *);
1: -	int (*getgeo)(struct block_device *, struct hd_geometry *);
1: -	void (*swap_slot_free_notify)(struct block_device *, long unsigned int);
1: -	int (*report_zones)(struct gendisk *, sector_t, unsigned int, report_zones_cb, void *);
1: -	char * (*devnode)(struct gendisk *, umode_t *);
1: -	struct module *owner;
1: -	const struct pr_ops *pr_ops;
1: +  blk_qc_t (*submit_bio)(struct bio *);
1: +  int (*open)(struct block_device *, fmode_t);
1: +  void (*release)(struct gendisk *, fmode_t);
1: +  int (*rw_page)(struct block_device *, sector_t, struct page *, unsigned int);
1: +  int (*ioctl)(struct block_device *, fmode_t, unsigned int, long unsigned int);
1: +  int (*compat_ioctl)(struct block_device *, fmode_t, unsigned int,
1: +                      long unsigned int);
1: +  unsigned int (*check_events)(struct gendisk *, unsigned int);
1: +  void (*unlock_native_capacity)(struct gendisk *);
1: +  int (*revalidate_disk)(struct gendisk *);
1: +  int (*getgeo)(struct block_device *, struct hd_geometry *);
1: +  void (*swap_slot_free_notify)(struct block_device *, long unsigned int);
1: +  int (*report_zones)(struct gendisk *, sector_t, unsigned int, report_zones_cb,
1: +                      void *);
1: +  char *(*devnode)(struct gendisk *, umode_t *);
1: +  struct module *owner;
1: +  const struct pr_ops *pr_ops;
1:  };
1:  
1:  struct sg_io_v4 {
1: -	__s32 guard;
1: -	__u32 protocol;
1: -	__u32 subprotocol;
1: -	__u32 request_len;
1: -	__u64 request;
1: -	__u64 request_tag;
1: -	__u32 request_attr;
1: -	__u32 request_priority;
1: -	__u32 request_extra;
1: -	__u32 max_response_len;
1: -	__u64 response;
1: -	__u32 dout_iovec_count;
1: -	__u32 dout_xfer_len;
1: -	__u32 din_iovec_count;
1: -	__u32 din_xfer_len;
1: -	__u64 dout_xferp;
1: -	__u64 din_xferp;
1: -	__u32 timeout;
1: -	__u32 flags;
1: -	__u64 usr_ptr;
1: -	__u32 spare_in;
1: -	__u32 driver_status;
1: -	__u32 transport_status;
1: -	__u32 device_status;
1: -	__u32 retry_delay;
1: -	__u32 info;
1: -	__u32 duration;
1: -	__u32 response_len;
1: -	__s32 din_resid;
1: -	__s32 dout_resid;
1: -	__u64 generated_tag;
1: -	__u32 spare_out;
1: -	__u32 padding;
1: +  __s32 guard;
1: +  __u32 protocol;
1: +  __u32 subprotocol;
1: +  __u32 request_len;
1: +  __u64 request;
1: +  __u64 request_tag;
1: +  __u32 request_attr;
1: +  __u32 request_priority;
1: +  __u32 request_extra;
1: +  __u32 max_response_len;
1: +  __u64 response;
1: +  __u32 dout_iovec_count;
1: +  __u32 dout_xfer_len;
1: +  __u32 din_iovec_count;
1: +  __u32 din_xfer_len;
1: +  __u64 dout_xferp;
1: +  __u64 din_xferp;
1: +  __u32 timeout;
1: +  __u32 flags;
1: +  __u64 usr_ptr;
1: +  __u32 spare_in;
1: +  __u32 driver_status;
1: +  __u32 transport_status;
1: +  __u32 device_status;
1: +  __u32 retry_delay;
1: +  __u32 info;
1: +  __u32 duration;
1: +  __u32 response_len;
1: +  __s32 din_resid;
1: +  __s32 dout_resid;
1: +  __u64 generated_tag;
1: +  __u32 spare_out;
1: +  __u32 padding;
1:  };
1:  
1:  struct bsg_ops {
1: -	int (*check_proto)(struct sg_io_v4 *);
1: -	int (*fill_hdr)(struct request *, struct sg_io_v4 *, fmode_t);
1: -	int (*complete_rq)(struct request *, struct sg_io_v4 *);
1: -	void (*free_rq)(struct request *);
1: +  int (*check_proto)(struct sg_io_v4 *);
1: +  int (*fill_hdr)(struct request *, struct sg_io_v4 *, fmode_t);
1: +  int (*complete_rq)(struct request *, struct sg_io_v4 *);
1: +  void (*free_rq)(struct request *);
1:  };
1:  
1:  typedef __u32 req_flags_t;
1: @@ -7778,83 +7831,83 @@ typedef __u32 req_flags_t;
1:  typedef void rq_end_io_fn(struct request *, blk_status_t);
1:  
1:  enum mq_rq_state {
1: -	MQ_RQ_IDLE = 0,
1: -	MQ_RQ_IN_FLIGHT = 1,
1: -	MQ_RQ_COMPLETE = 2,
1: +  MQ_RQ_IDLE = 0,
1: +  MQ_RQ_IN_FLIGHT = 1,
1: +  MQ_RQ_COMPLETE = 2,
1:  };
1:  
1:  struct request {
1: -	struct request_queue *q;
1: -	struct blk_mq_ctx *mq_ctx;
1: -	struct blk_mq_hw_ctx *mq_hctx;
1: -	unsigned int cmd_flags;
1: -	req_flags_t rq_flags;
1: -	int tag;
1: -	int internal_tag;
1: -	unsigned int __data_len;
1: -	sector_t __sector;
1: -	struct bio *bio;
1: -	struct bio *biotail;
1: -	struct list_head queuelist;
1: -	union {
1: -		struct hlist_node hash;
1: -		struct list_head ipi_list;
1: -	};
1: -	union {
1: -		struct rb_node rb_node;
1: -		struct bio_vec special_vec;
1: -		void *completion_data;
1: -		int error_count;
1: -	};
1: -	union {
1: -		struct {
1: -			struct io_cq *icq;
1: -			void *priv[2];
1: -		} elv;
1: -		struct {
1: -			unsigned int seq;
1: -			struct list_head list;
1: -			rq_end_io_fn *saved_end_io;
1: -		} flush;
1: -	};
1: -	struct gendisk *rq_disk;
1: -	struct hd_struct *part;
1: -	u64 start_time_ns;
1: -	u64 io_start_time_ns;
1: -	short unsigned int stats_sectors;
1: -	short unsigned int nr_phys_segments;
1: -	short unsigned int write_hint;
1: -	short unsigned int ioprio;
1: -	enum mq_rq_state state;
1: -	refcount_t ref;
1: -	unsigned int timeout;
1: -	long unsigned int deadline;
1: -	union {
1: -		struct __call_single_data csd;
1: -		u64 fifo_time;
1: -	};
1: -	rq_end_io_fn *end_io;
1: -	void *end_io_data;
1: +  struct request_queue *q;
1: +  struct blk_mq_ctx *mq_ctx;
1: +  struct blk_mq_hw_ctx *mq_hctx;
1: +  unsigned int cmd_flags;
1: +  req_flags_t rq_flags;
1: +  int tag;
1: +  int internal_tag;
1: +  unsigned int __data_len;
1: +  sector_t __sector;
1: +  struct bio *bio;
1: +  struct bio *biotail;
1: +  struct list_head queuelist;
1: +  union {
1: +    struct hlist_node hash;
1: +    struct list_head ipi_list;
1: +  };
1: +  union {
1: +    struct rb_node rb_node;
1: +    struct bio_vec special_vec;
1: +    void *completion_data;
1: +    int error_count;
1: +  };
1: +  union {
1: +    struct {
1: +      struct io_cq *icq;
1: +      void *priv[2];
1: +    } elv;
1: +    struct {
1: +      unsigned int seq;
1: +      struct list_head list;
1: +      rq_end_io_fn *saved_end_io;
1: +    } flush;
1: +  };
1: +  struct gendisk *rq_disk;
1: +  struct hd_struct *part;
1: +  u64 start_time_ns;
1: +  u64 io_start_time_ns;
1: +  short unsigned int stats_sectors;
1: +  short unsigned int nr_phys_segments;
1: +  short unsigned int write_hint;
1: +  short unsigned int ioprio;
1: +  enum mq_rq_state state;
1: +  refcount_t ref;
1: +  unsigned int timeout;
1: +  long unsigned int deadline;
1: +  union {
1: +    struct __call_single_data csd;
1: +    u64 fifo_time;
1: +  };
1: +  rq_end_io_fn *end_io;
1: +  void *end_io_data;
1:  };
1:  
1:  struct blk_zone {
1: -	__u64 start;
1: -	__u64 len;
1: -	__u64 wp;
1: -	__u8 type;
1: -	__u8 cond;
1: -	__u8 non_seq;
1: -	__u8 reset;
1: -	__u8 resv[4];
1: -	__u64 capacity;
1: -	__u8 reserved[24];
1: +  __u64 start;
1: +  __u64 len;
1: +  __u64 wp;
1: +  __u8 type;
1: +  __u8 cond;
1: +  __u8 non_seq;
1: +  __u8 reset;
1: +  __u8 resv[4];
1: +  __u64 capacity;
1: +  __u8 reserved[24];
1:  };
1:  
1:  enum elv_merge {
1: -	ELEVATOR_NO_MERGE = 0,
1: -	ELEVATOR_FRONT_MERGE = 1,
1: -	ELEVATOR_BACK_MERGE = 2,
1: -	ELEVATOR_DISCARD_MERGE = 3,
1: +  ELEVATOR_NO_MERGE = 0,
1: +  ELEVATOR_FRONT_MERGE = 1,
1: +  ELEVATOR_BACK_MERGE = 2,
1: +  ELEVATOR_DISCARD_MERGE = 3,
1:  };
1:  
1:  struct elevator_type;
1: @@ -7862,28 +7915,30 @@ struct elevator_type;
1:  struct blk_mq_alloc_data;
1:  
1:  struct elevator_mq_ops {
1: -	int (*init_sched)(struct request_queue *, struct elevator_type *);
1: -	void (*exit_sched)(struct elevator_queue *);
1: -	int (*init_hctx)(struct blk_mq_hw_ctx *, unsigned int);
1: -	void (*exit_hctx)(struct blk_mq_hw_ctx *, unsigned int);
1: -	void (*depth_updated)(struct blk_mq_hw_ctx *);
1: -	bool (*allow_merge)(struct request_queue *, struct request *, struct bio *);
1: -	bool (*bio_merge)(struct blk_mq_hw_ctx *, struct bio *, unsigned int);
1: -	int (*request_merge)(struct request_queue *, struct request **, struct bio *);
1: -	void (*request_merged)(struct request_queue *, struct request *, enum elv_merge);
1: -	void (*requests_merged)(struct request_queue *, struct request *, struct request *);
1: -	void (*limit_depth)(unsigned int, struct blk_mq_alloc_data *);
1: -	void (*prepare_request)(struct request *);
1: -	void (*finish_request)(struct request *);
1: -	void (*insert_requests)(struct blk_mq_hw_ctx *, struct list_head *, bool);
1: -	struct request * (*dispatch_request)(struct blk_mq_hw_ctx *);
1: -	bool (*has_work)(struct blk_mq_hw_ctx *);
1: -	void (*completed_request)(struct request *, u64);
1: -	void (*requeue_request)(struct request *);
1: -	struct request * (*former_request)(struct request_queue *, struct request *);
1: -	struct request * (*next_request)(struct request_queue *, struct request *);
1: -	void (*init_icq)(struct io_cq *);
1: -	void (*exit_icq)(struct io_cq *);
1: +  int (*init_sched)(struct request_queue *, struct elevator_type *);
1: +  void (*exit_sched)(struct elevator_queue *);
1: +  int (*init_hctx)(struct blk_mq_hw_ctx *, unsigned int);
1: +  void (*exit_hctx)(struct blk_mq_hw_ctx *, unsigned int);
1: +  void (*depth_updated)(struct blk_mq_hw_ctx *);
1: +  bool (*allow_merge)(struct request_queue *, struct request *, struct bio *);
1: +  bool (*bio_merge)(struct blk_mq_hw_ctx *, struct bio *, unsigned int);
1: +  int (*request_merge)(struct request_queue *, struct request **, struct bio *);
1: +  void (*request_merged)(struct request_queue *, struct request *,
1: +                         enum elv_merge);
1: +  void (*requests_merged)(struct request_queue *, struct request *,
1: +                          struct request *);
1: +  void (*limit_depth)(unsigned int, struct blk_mq_alloc_data *);
1: +  void (*prepare_request)(struct request *);
1: +  void (*finish_request)(struct request *);
1: +  void (*insert_requests)(struct blk_mq_hw_ctx *, struct list_head *, bool);
1: +  struct request *(*dispatch_request)(struct blk_mq_hw_ctx *);
1: +  bool (*has_work)(struct blk_mq_hw_ctx *);
1: +  void (*completed_request)(struct request *, u64);
1: +  void (*requeue_request)(struct request *);
1: +  struct request *(*former_request)(struct request_queue *, struct request *);
1: +  struct request *(*next_request)(struct request_queue *, struct request *);
1: +  void (*init_icq)(struct io_cq *);
1: +  void (*exit_icq)(struct io_cq *);
1:  };
1:  
1:  struct elv_fs_entry;
1: @@ -7891,116 +7946,118 @@ struct elv_fs_entry;
1:  struct blk_mq_debugfs_attr;
1:  
1:  struct elevator_type {
1: -	struct kmem_cache *icq_cache;
1: -	struct elevator_mq_ops ops;
1: -	size_t icq_size;
1: -	size_t icq_align;
1: -	struct elv_fs_entry *elevator_attrs;
1: -	const char *elevator_name;
1: -	const char *elevator_alias;
1: -	const unsigned int elevator_features;
1: -	struct module *elevator_owner;
1: -	const struct blk_mq_debugfs_attr *queue_debugfs_attrs;
1: -	const struct blk_mq_debugfs_attr *hctx_debugfs_attrs;
1: -	char icq_cache_name[22];
1: -	struct list_head list;
1: +  struct kmem_cache *icq_cache;
1: +  struct elevator_mq_ops ops;
1: +  size_t icq_size;
1: +  size_t icq_align;
1: +  struct elv_fs_entry *elevator_attrs;
1: +  const char *elevator_name;
1: +  const char *elevator_alias;
1: +  const unsigned int elevator_features;
1: +  struct module *elevator_owner;
1: +  const struct blk_mq_debugfs_attr *queue_debugfs_attrs;
1: +  const struct blk_mq_debugfs_attr *hctx_debugfs_attrs;
1: +  char icq_cache_name[22];
1: +  struct list_head list;
1:  };
1:  
1:  struct elevator_queue {
1: -	struct elevator_type *type;
1: -	void *elevator_data;
1: -	struct kobject kobj;
1: -	struct mutex sysfs_lock;
1: -	unsigned int registered: 1;
1: -	struct hlist_head hash[64];
1: +  struct elevator_type *type;
1: +  void *elevator_data;
1: +  struct kobject kobj;
1: +  struct mutex sysfs_lock;
1: +  unsigned int registered : 1;
1: +  struct hlist_head hash[64];
1:  };
1:  
1:  struct elv_fs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct elevator_queue *, char *);
1: -	ssize_t (*store)(struct elevator_queue *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct elevator_queue *, char *);
1: +  ssize_t (*store)(struct elevator_queue *, const char *, size_t);
1:  };
1:  
1:  struct blk_mq_debugfs_attr {
1: -	const char *name;
1: -	umode_t mode;
1: -	int (*show)(void *, struct seq_file *);
1: -	ssize_t (*write)(void *, const char *, size_t, loff_t *);
1: -	const struct seq_operations *seq_ops;
1: +  const char *name;
1: +  umode_t mode;
1: +  int (*show)(void *, struct seq_file *);
1: +  ssize_t (*write)(void *, const char *, size_t, loff_t *);
1: +  const struct seq_operations *seq_ops;
1:  };
1:  
1:  enum blk_eh_timer_return {
1: -	BLK_EH_DONE = 0,
1: -	BLK_EH_RESET_TIMER = 1,
1: +  BLK_EH_DONE = 0,
1: +  BLK_EH_RESET_TIMER = 1,
1:  };
1:  
1:  struct blk_mq_queue_data;
1:  
1:  struct blk_mq_ops {
1: -	blk_status_t (*queue_rq)(struct blk_mq_hw_ctx *, const struct blk_mq_queue_data *);
1: -	void (*commit_rqs)(struct blk_mq_hw_ctx *);
1: -	bool (*get_budget)(struct request_queue *);
1: -	void (*put_budget)(struct request_queue *);
1: -	enum blk_eh_timer_return (*timeout)(struct request *, bool);
1: -	int (*poll)(struct blk_mq_hw_ctx *);
1: -	void (*complete)(struct request *);
1: -	int (*init_hctx)(struct blk_mq_hw_ctx *, void *, unsigned int);
1: -	void (*exit_hctx)(struct blk_mq_hw_ctx *, unsigned int);
1: -	int (*init_request)(struct blk_mq_tag_set *, struct request *, unsigned int, unsigned int);
1: -	void (*exit_request)(struct blk_mq_tag_set *, struct request *, unsigned int);
1: -	void (*initialize_rq_fn)(struct request *);
1: -	void (*cleanup_rq)(struct request *);
1: -	bool (*busy)(struct request_queue *);
1: -	int (*map_queues)(struct blk_mq_tag_set *);
1: -	void (*show_rq)(struct seq_file *, struct request *);
1: +  blk_status_t (*queue_rq)(struct blk_mq_hw_ctx *,
1: +                           const struct blk_mq_queue_data *);
1: +  void (*commit_rqs)(struct blk_mq_hw_ctx *);
1: +  bool (*get_budget)(struct request_queue *);
1: +  void (*put_budget)(struct request_queue *);
1: +  enum blk_eh_timer_return (*timeout)(struct request *, bool);
1: +  int (*poll)(struct blk_mq_hw_ctx *);
1: +  void (*complete)(struct request *);
1: +  int (*init_hctx)(struct blk_mq_hw_ctx *, void *, unsigned int);
1: +  void (*exit_hctx)(struct blk_mq_hw_ctx *, unsigned int);
1: +  int (*init_request)(struct blk_mq_tag_set *, struct request *, unsigned int,
1: +                      unsigned int);
1: +  void (*exit_request)(struct blk_mq_tag_set *, struct request *, unsigned int);
1: +  void (*initialize_rq_fn)(struct request *);
1: +  void (*cleanup_rq)(struct request *);
1: +  bool (*busy)(struct request_queue *);
1: +  int (*map_queues)(struct blk_mq_tag_set *);
1: +  void (*show_rq)(struct seq_file *, struct request *);
1:  };
1:  
1:  enum pr_type {
1: -	PR_WRITE_EXCLUSIVE = 1,
1: -	PR_EXCLUSIVE_ACCESS = 2,
1: -	PR_WRITE_EXCLUSIVE_REG_ONLY = 3,
1: -	PR_EXCLUSIVE_ACCESS_REG_ONLY = 4,
1: -	PR_WRITE_EXCLUSIVE_ALL_REGS = 5,
1: -	PR_EXCLUSIVE_ACCESS_ALL_REGS = 6,
1: +  PR_WRITE_EXCLUSIVE = 1,
1: +  PR_EXCLUSIVE_ACCESS = 2,
1: +  PR_WRITE_EXCLUSIVE_REG_ONLY = 3,
1: +  PR_EXCLUSIVE_ACCESS_REG_ONLY = 4,
1: +  PR_WRITE_EXCLUSIVE_ALL_REGS = 5,
1: +  PR_EXCLUSIVE_ACCESS_ALL_REGS = 6,
1:  };
1:  
1:  struct pr_ops {
1: -	int (*pr_register)(struct block_device *, u64, u64, u32);
1: -	int (*pr_reserve)(struct block_device *, u64, enum pr_type, u32);
1: -	int (*pr_release)(struct block_device *, u64, enum pr_type);
1: -	int (*pr_preempt)(struct block_device *, u64, u64, enum pr_type, bool);
1: -	int (*pr_clear)(struct block_device *, u64);
1: +  int (*pr_register)(struct block_device *, u64, u64, u32);
1: +  int (*pr_reserve)(struct block_device *, u64, enum pr_type, u32);
1: +  int (*pr_release)(struct block_device *, u64, enum pr_type);
1: +  int (*pr_preempt)(struct block_device *, u64, u64, enum pr_type, bool);
1: +  int (*pr_clear)(struct block_device *, u64);
1:  };
1:  
1:  enum blkg_iostat_type {
1: -	BLKG_IOSTAT_READ = 0,
1: -	BLKG_IOSTAT_WRITE = 1,
1: -	BLKG_IOSTAT_DISCARD = 2,
1: -	BLKG_IOSTAT_NR = 3,
1: +  BLKG_IOSTAT_READ = 0,
1: +  BLKG_IOSTAT_WRITE = 1,
1: +  BLKG_IOSTAT_DISCARD = 2,
1: +  BLKG_IOSTAT_NR = 3,
1:  };
1:  
1:  struct blkcg_policy_data;
1:  
1:  struct blkcg {
1: -	struct cgroup_subsys_state css;
1: -	spinlock_t lock;
1: -	refcount_t online_pin;
1: -	struct xarray blkg_tree;
1: -	struct blkcg_gq *blkg_hint;
1: -	struct hlist_head blkg_list;
1: -	struct blkcg_policy_data *cpd[5];
1: -	struct list_head all_blkcgs_node;
1: -	struct list_head cgwb_list;
1: +  struct cgroup_subsys_state css;
1: +  spinlock_t lock;
1: +  refcount_t online_pin;
1: +  struct xarray blkg_tree;
1: +  struct blkcg_gq *blkg_hint;
1: +  struct hlist_head blkg_list;
1: +  struct blkcg_policy_data *cpd[5];
1: +  struct list_head all_blkcgs_node;
1: +  struct list_head cgwb_list;
1:  };
1:  
1:  struct blkcg_policy_data {
1: -	struct blkcg *blkcg;
1: -	int plid;
1: +  struct blkcg *blkcg;
1: +  int plid;
1:  };
1:  
1:  struct blkg_policy_data {
1: -	struct blkcg_gq *blkg;
1: -	int plid;
1: +  struct blkcg_gq *blkg;
1: +  int plid;
1:  };
1:  
1:  typedef long unsigned int efi_status_t;
1: @@ -8012,311 +8069,325 @@ typedef u16 efi_char16_t;
1:  typedef guid_t efi_guid_t;
1:  
1:  typedef struct {
1: -	u64 signature;
1: -	u32 revision;
1: -	u32 headersize;
1: -	u32 crc32;
1: -	u32 reserved;
1: +  u64 signature;
1: +  u32 revision;
1: +  u32 headersize;
1: +  u32 crc32;
1: +  u32 reserved;
1:  } efi_table_hdr_t;
1:  
1:  typedef struct {
1: -	u32 type;
1: -	u32 pad;
1: -	u64 phys_addr;
1: -	u64 virt_addr;
1: -	u64 num_pages;
1: -	u64 attribute;
1: +  u32 type;
1: +  u32 pad;
1: +  u64 phys_addr;
1: +  u64 virt_addr;
1: +  u64 num_pages;
1: +  u64 attribute;
1:  } efi_memory_desc_t;
1:  
1:  typedef struct {
1: -	efi_guid_t guid;
1: -	u32 headersize;
1: -	u32 flags;
1: -	u32 imagesize;
1: +  efi_guid_t guid;
1: +  u32 headersize;
1: +  u32 flags;
1: +  u32 imagesize;
1:  } efi_capsule_header_t;
1:  
1:  typedef struct {
1: -	u16 year;
1: -	u8 month;
1: -	u8 day;
1: -	u8 hour;
1: -	u8 minute;
1: -	u8 second;
1: -	u8 pad1;
1: -	u32 nanosecond;
1: -	s16 timezone;
1: -	u8 daylight;
1: -	u8 pad2;
1: +  u16 year;
1: +  u8 month;
1: +  u8 day;
1: +  u8 hour;
1: +  u8 minute;
1: +  u8 second;
1: +  u8 pad1;
1: +  u32 nanosecond;
1: +  s16 timezone;
1: +  u8 daylight;
1: +  u8 pad2;
1:  } efi_time_t;
1:  
1:  typedef struct {
1: -	u32 resolution;
1: -	u32 accuracy;
1: -	u8 sets_to_zero;
1: +  u32 resolution;
1: +  u32 accuracy;
1: +  u8 sets_to_zero;
1:  } efi_time_cap_t;
1:  
1:  typedef struct {
1: -	efi_table_hdr_t hdr;
1: -	u32 get_time;
1: -	u32 set_time;
1: -	u32 get_wakeup_time;
1: -	u32 set_wakeup_time;
1: -	u32 set_virtual_address_map;
1: -	u32 convert_pointer;
1: -	u32 get_variable;
1: -	u32 get_next_variable;
1: -	u32 set_variable;
1: -	u32 get_next_high_mono_count;
1: -	u32 reset_system;
1: -	u32 update_capsule;
1: -	u32 query_capsule_caps;
1: -	u32 query_variable_info;
1: +  efi_table_hdr_t hdr;
1: +  u32 get_time;
1: +  u32 set_time;
1: +  u32 get_wakeup_time;
1: +  u32 set_wakeup_time;
1: +  u32 set_virtual_address_map;
1: +  u32 convert_pointer;
1: +  u32 get_variable;
1: +  u32 get_next_variable;
1: +  u32 set_variable;
1: +  u32 get_next_high_mono_count;
1: +  u32 reset_system;
1: +  u32 update_capsule;
1: +  u32 query_capsule_caps;
1: +  u32 query_variable_info;
1:  } efi_runtime_services_32_t;
1:  
1:  typedef efi_status_t efi_get_time_t(efi_time_t *, efi_time_cap_t *);
1:  
1:  typedef efi_status_t efi_set_time_t(efi_time_t *);
1:  
1: -typedef efi_status_t efi_get_wakeup_time_t(efi_bool_t *, efi_bool_t *, efi_time_t *);
1: +typedef efi_status_t efi_get_wakeup_time_t(efi_bool_t *, efi_bool_t *,
1: +                                           efi_time_t *);
1:  
1:  typedef efi_status_t efi_set_wakeup_time_t(efi_bool_t, efi_time_t *);
1:  
1: -typedef efi_status_t efi_get_variable_t(efi_char16_t *, efi_guid_t *, u32 *, long unsigned int *, void *);
1: +typedef efi_status_t efi_get_variable_t(efi_char16_t *, efi_guid_t *, u32 *,
1: +                                        long unsigned int *, void *);
1:  
1: -typedef efi_status_t efi_get_next_variable_t(long unsigned int *, efi_char16_t *, efi_guid_t *);
1: +typedef efi_status_t efi_get_next_variable_t(long unsigned int *,
1: +                                             efi_char16_t *, efi_guid_t *);
1:  
1: -typedef efi_status_t efi_set_variable_t(efi_char16_t *, efi_guid_t *, u32, long unsigned int, void *);
1: +typedef efi_status_t efi_set_variable_t(efi_char16_t *, efi_guid_t *, u32,
1: +                                        long unsigned int, void *);
1:  
1:  typedef efi_status_t efi_get_next_high_mono_count_t(u32 *);
1:  
1: -typedef void efi_reset_system_t(int, efi_status_t, long unsigned int, efi_char16_t *);
1: +typedef void efi_reset_system_t(int, efi_status_t, long unsigned int,
1: +                                efi_char16_t *);
1:  
1:  typedef efi_status_t efi_query_variable_info_t(u32, u64 *, u64 *, u64 *);
1:  
1: -typedef efi_status_t efi_update_capsule_t(efi_capsule_header_t **, long unsigned int, long unsigned int);
1: +typedef efi_status_t efi_update_capsule_t(efi_capsule_header_t **,
1: +                                          long unsigned int, long unsigned int);
1:  
1: -typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **, long unsigned int, u64 *, int *);
1: +typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **,
1: +                                              long unsigned int, u64 *, int *);
1:  
1:  typedef union {
1: -	struct {
1: -		efi_table_hdr_t hdr;
1: -		efi_status_t (*get_time)(efi_time_t *, efi_time_cap_t *);
1: -		efi_status_t (*set_time)(efi_time_t *);
1: -		efi_status_t (*get_wakeup_time)(efi_bool_t *, efi_bool_t *, efi_time_t *);
1: -		efi_status_t (*set_wakeup_time)(efi_bool_t, efi_time_t *);
1: -		efi_status_t (*set_virtual_address_map)(long unsigned int, long unsigned int, u32, efi_memory_desc_t *);
1: -		void *convert_pointer;
1: -		efi_status_t (*get_variable)(efi_char16_t *, efi_guid_t *, u32 *, long unsigned int *, void *);
1: -		efi_status_t (*get_next_variable)(long unsigned int *, efi_char16_t *, efi_guid_t *);
1: -		efi_status_t (*set_variable)(efi_char16_t *, efi_guid_t *, u32, long unsigned int, void *);
1: -		efi_status_t (*get_next_high_mono_count)(u32 *);
1: -		void (*reset_system)(int, efi_status_t, long unsigned int, efi_char16_t *);
1: -		efi_status_t (*update_capsule)(efi_capsule_header_t **, long unsigned int, long unsigned int);
1: -		efi_status_t (*query_capsule_caps)(efi_capsule_header_t **, long unsigned int, u64 *, int *);
1: -		efi_status_t (*query_variable_info)(u32, u64 *, u64 *, u64 *);
1: -	};
1: -	efi_runtime_services_32_t mixed_mode;
1: +  struct {
1: +    efi_table_hdr_t hdr;
1: +    efi_status_t (*get_time)(efi_time_t *, efi_time_cap_t *);
1: +    efi_status_t (*set_time)(efi_time_t *);
1: +    efi_status_t (*get_wakeup_time)(efi_bool_t *, efi_bool_t *, efi_time_t *);
1: +    efi_status_t (*set_wakeup_time)(efi_bool_t, efi_time_t *);
1: +    efi_status_t (*set_virtual_address_map)(long unsigned int,
1: +                                            long unsigned int, u32,
1: +                                            efi_memory_desc_t *);
1: +    void *convert_pointer;
1: +    efi_status_t (*get_variable)(efi_char16_t *, efi_guid_t *, u32 *,
1: +                                 long unsigned int *, void *);
1: +    efi_status_t (*get_next_variable)(long unsigned int *, efi_char16_t *,
1: +                                      efi_guid_t *);
1: +    efi_status_t (*set_variable)(efi_char16_t *, efi_guid_t *, u32,
1: +                                 long unsigned int, void *);
1: +    efi_status_t (*get_next_high_mono_count)(u32 *);
1: +    void (*reset_system)(int, efi_status_t, long unsigned int, efi_char16_t *);
1: +    efi_status_t (*update_capsule)(efi_capsule_header_t **, long unsigned int,
1: +                                   long unsigned int);
1: +    efi_status_t (*query_capsule_caps)(efi_capsule_header_t **,
1: +                                       long unsigned int, u64 *, int *);
1: +    efi_status_t (*query_variable_info)(u32, u64 *, u64 *, u64 *);
1: +  };
1: +  efi_runtime_services_32_t mixed_mode;
1:  } efi_runtime_services_t;
1:  
1:  struct efi_memory_map {
1: -	phys_addr_t phys_map;
1: -	void *map;
1: -	void *map_end;
1: -	int nr_map;
1: -	long unsigned int desc_version;
1: -	long unsigned int desc_size;
1: -	long unsigned int flags;
1: +  phys_addr_t phys_map;
1: +  void *map;
1: +  void *map_end;
1: +  int nr_map;
1: +  long unsigned int desc_version;
1: +  long unsigned int desc_size;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct efi {
1: -	const efi_runtime_services_t *runtime;
1: -	unsigned int runtime_version;
1: -	unsigned int runtime_supported_mask;
1: -	long unsigned int acpi;
1: -	long unsigned int acpi20;
1: -	long unsigned int smbios;
1: -	long unsigned int smbios3;
1: -	long unsigned int esrt;
1: -	long unsigned int tpm_log;
1: -	long unsigned int tpm_final_log;
1: -	long unsigned int mokvar_table;
1: -	efi_get_time_t *get_time;
1: -	efi_set_time_t *set_time;
1: -	efi_get_wakeup_time_t *get_wakeup_time;
1: -	efi_set_wakeup_time_t *set_wakeup_time;
1: -	efi_get_variable_t *get_variable;
1: -	efi_get_next_variable_t *get_next_variable;
1: -	efi_set_variable_t *set_variable;
1: -	efi_set_variable_t *set_variable_nonblocking;
1: -	efi_query_variable_info_t *query_variable_info;
1: -	efi_query_variable_info_t *query_variable_info_nonblocking;
1: -	efi_update_capsule_t *update_capsule;
1: -	efi_query_capsule_caps_t *query_capsule_caps;
1: -	efi_get_next_high_mono_count_t *get_next_high_mono_count;
1: -	efi_reset_system_t *reset_system;
1: -	struct efi_memory_map memmap;
1: -	long unsigned int flags;
1: +  const efi_runtime_services_t *runtime;
1: +  unsigned int runtime_version;
1: +  unsigned int runtime_supported_mask;
1: +  long unsigned int acpi;
1: +  long unsigned int acpi20;
1: +  long unsigned int smbios;
1: +  long unsigned int smbios3;
1: +  long unsigned int esrt;
1: +  long unsigned int tpm_log;
1: +  long unsigned int tpm_final_log;
1: +  long unsigned int mokvar_table;
1: +  efi_get_time_t *get_time;
1: +  efi_set_time_t *set_time;
1: +  efi_get_wakeup_time_t *get_wakeup_time;
1: +  efi_set_wakeup_time_t *set_wakeup_time;
1: +  efi_get_variable_t *get_variable;
1: +  efi_get_next_variable_t *get_next_variable;
1: +  efi_set_variable_t *set_variable;
1: +  efi_set_variable_t *set_variable_nonblocking;
1: +  efi_query_variable_info_t *query_variable_info;
1: +  efi_query_variable_info_t *query_variable_info_nonblocking;
1: +  efi_update_capsule_t *update_capsule;
1: +  efi_query_capsule_caps_t *query_capsule_caps;
1: +  efi_get_next_high_mono_count_t *get_next_high_mono_count;
1: +  efi_reset_system_t *reset_system;
1: +  struct efi_memory_map memmap;
1: +  long unsigned int flags;
1:  };
1:  
1:  enum memcg_stat_item {
1: -	MEMCG_SWAP = 37,
1: -	MEMCG_SOCK = 38,
1: -	MEMCG_PERCPU_B = 39,
1: -	MEMCG_NR_STAT = 40,
1: +  MEMCG_SWAP = 37,
1: +  MEMCG_SOCK = 38,
1: +  MEMCG_PERCPU_B = 39,
1: +  MEMCG_NR_STAT = 40,
1:  };
1:  
1:  enum memcg_memory_event {
1: -	MEMCG_LOW = 0,
1: -	MEMCG_HIGH = 1,
1: -	MEMCG_MAX = 2,
1: -	MEMCG_OOM = 3,
1: -	MEMCG_OOM_KILL = 4,
1: -	MEMCG_SWAP_HIGH = 5,
1: -	MEMCG_SWAP_MAX = 6,
1: -	MEMCG_SWAP_FAIL = 7,
1: -	MEMCG_NR_MEMORY_EVENTS = 8,
1: +  MEMCG_LOW = 0,
1: +  MEMCG_HIGH = 1,
1: +  MEMCG_MAX = 2,
1: +  MEMCG_OOM = 3,
1: +  MEMCG_OOM_KILL = 4,
1: +  MEMCG_SWAP_HIGH = 5,
1: +  MEMCG_SWAP_MAX = 6,
1: +  MEMCG_SWAP_FAIL = 7,
1: +  MEMCG_NR_MEMORY_EVENTS = 8,
1:  };
1:  
1:  enum mem_cgroup_events_target {
1: -	MEM_CGROUP_TARGET_THRESH = 0,
1: -	MEM_CGROUP_TARGET_SOFTLIMIT = 1,
1: -	MEM_CGROUP_NTARGETS = 2,
1: +  MEM_CGROUP_TARGET_THRESH = 0,
1: +  MEM_CGROUP_TARGET_SOFTLIMIT = 1,
1: +  MEM_CGROUP_NTARGETS = 2,
1:  };
1:  
1:  struct memcg_vmstats_percpu {
1: -	long int stat[40];
1: -	long unsigned int events[96];
1: -	long unsigned int nr_page_events;
1: -	long unsigned int targets[2];
1: +  long int stat[40];
1: +  long unsigned int events[96];
1: +  long unsigned int nr_page_events;
1: +  long unsigned int targets[2];
1:  };
1:  
1:  struct mem_cgroup_reclaim_iter {
1: -	struct mem_cgroup *position;
1: -	unsigned int generation;
1: +  struct mem_cgroup *position;
1: +  unsigned int generation;
1:  };
1:  
1:  struct lruvec_stat {
1: -	long int count[37];
1: +  long int count[37];
1:  };
1:  
1:  struct memcg_shrinker_map {
1: -	struct callback_head rcu;
1: -	long unsigned int map[0];
1: +  struct callback_head rcu;
1: +  long unsigned int map[0];
1:  };
1:  
1:  struct mem_cgroup_per_node {
1: -	struct lruvec lruvec;
1: -	struct lruvec_stat *lruvec_stat_local;
1: -	struct lruvec_stat *lruvec_stat_cpu;
1: -	atomic_long_t lruvec_stat[37];
1: -	long unsigned int lru_zone_size[20];
1: -	struct mem_cgroup_reclaim_iter iter;
1: -	struct memcg_shrinker_map *shrinker_map;
1: -	struct rb_node tree_node;
1: -	long unsigned int usage_in_excess;
1: -	bool on_tree;
1: -	struct mem_cgroup *memcg;
1: +  struct lruvec lruvec;
1: +  struct lruvec_stat *lruvec_stat_local;
1: +  struct lruvec_stat *lruvec_stat_cpu;
1: +  atomic_long_t lruvec_stat[37];
1: +  long unsigned int lru_zone_size[20];
1: +  struct mem_cgroup_reclaim_iter iter;
1: +  struct memcg_shrinker_map *shrinker_map;
1: +  struct rb_node tree_node;
1: +  long unsigned int usage_in_excess;
1: +  bool on_tree;
1: +  struct mem_cgroup *memcg;
1:  };
1:  
1:  struct eventfd_ctx;
1:  
1:  struct mem_cgroup_threshold {
1: -	struct eventfd_ctx *eventfd;
1: -	long unsigned int threshold;
1: +  struct eventfd_ctx *eventfd;
1: +  long unsigned int threshold;
1:  };
1:  
1:  struct mem_cgroup_threshold_ary {
1: -	int current_threshold;
1: -	unsigned int size;
1: -	struct mem_cgroup_threshold entries[0];
1: +  int current_threshold;
1: +  unsigned int size;
1: +  struct mem_cgroup_threshold entries[0];
1:  };
1:  
1:  struct obj_cgroup {
1: -	struct percpu_ref refcnt;
1: -	struct mem_cgroup *memcg;
1: -	atomic_t nr_charged_bytes;
1: -	union {
1: -		struct list_head list;
1: -		struct callback_head rcu;
1: -	};
1: +  struct percpu_ref refcnt;
1: +  struct mem_cgroup *memcg;
1: +  atomic_t nr_charged_bytes;
1: +  union {
1: +    struct list_head list;
1: +    struct callback_head rcu;
1: +  };
1:  };
1:  
1:  struct percpu_cluster {
1: -	struct swap_cluster_info index;
1: -	unsigned int next;
1: +  struct swap_cluster_info index;
1: +  unsigned int next;
1:  };
1:  
1:  enum fs_value_type {
1: -	fs_value_is_undefined = 0,
1: -	fs_value_is_flag = 1,
1: -	fs_value_is_string = 2,
1: -	fs_value_is_blob = 3,
1: -	fs_value_is_filename = 4,
1: -	fs_value_is_file = 5,
1: +  fs_value_is_undefined = 0,
1: +  fs_value_is_flag = 1,
1: +  fs_value_is_string = 2,
1: +  fs_value_is_blob = 3,
1: +  fs_value_is_filename = 4,
1: +  fs_value_is_file = 5,
1:  };
1:  
1:  struct fs_parameter {
1: -	const char *key;
1: -	enum fs_value_type type: 8;
1: -	union {
1: -		char *string;
1: -		void *blob;
1: -		struct filename *name;
1: -		struct file *file;
1: -	};
1: -	size_t size;
1: -	int dirfd;
1: +  const char *key;
1: +  enum fs_value_type type : 8;
1: +  union {
1: +    char *string;
1: +    void *blob;
1: +    struct filename *name;
1: +    struct file *file;
1: +  };
1: +  size_t size;
1: +  int dirfd;
1:  };
1:  
1:  struct fc_log {
1: -	refcount_t usage;
1: -	u8 head;
1: -	u8 tail;
1: -	u8 need_free;
1: -	struct module *owner;
1: -	char *buffer[8];
1: +  refcount_t usage;
1: +  u8 head;
1: +  u8 tail;
1: +  u8 need_free;
1: +  struct module *owner;
1: +  char *buffer[8];
1:  };
1:  
1:  struct fs_context_operations {
1: -	void (*free)(struct fs_context *);
1: -	int (*dup)(struct fs_context *, struct fs_context *);
1: -	int (*parse_param)(struct fs_context *, struct fs_parameter *);
1: -	int (*parse_monolithic)(struct fs_context *, void *);
1: -	int (*get_tree)(struct fs_context *);
1: -	int (*reconfigure)(struct fs_context *);
1: +  void (*free)(struct fs_context *);
1: +  int (*dup)(struct fs_context *, struct fs_context *);
1: +  int (*parse_param)(struct fs_context *, struct fs_parameter *);
1: +  int (*parse_monolithic)(struct fs_context *, void *);
1: +  int (*get_tree)(struct fs_context *);
1: +  int (*reconfigure)(struct fs_context *);
1:  };
1:  
1:  struct fs_parse_result {
1: -	bool negated;
1: -	union {
1: -		bool boolean;
1: -		int int_32;
1: -		unsigned int uint_32;
1: -		u64 uint_64;
1: -	};
1: +  bool negated;
1: +  union {
1: +    bool boolean;
1: +    int int_32;
1: +    unsigned int uint_32;
1: +    u64 uint_64;
1: +  };
1:  };
1:  
1:  struct trace_event_raw_initcall_level {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_level;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_level;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_initcall_start {
1: -	struct trace_entry ent;
1: -	initcall_t func;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  initcall_t func;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_initcall_finish {
1: -	struct trace_entry ent;
1: -	initcall_t func;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  initcall_t func;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_initcall_level {
1: -	u32 level;
1: +  u32 level;
1:  };
1:  
1:  struct trace_event_data_offsets_initcall_start {};
1: @@ -8330,26 +8401,26 @@ typedef void (*btf_trace_initcall_start)(void *, initcall_t);
1:  typedef void (*btf_trace_initcall_finish)(void *, initcall_t, int);
1:  
1:  struct blacklist_entry {
1: -	struct list_head next;
1: -	char *buf;
1: +  struct list_head next;
1: +  char *buf;
1:  };
1:  
1:  typedef __u32 Elf32_Word;
1:  
1:  struct elf32_note {
1: -	Elf32_Word n_namesz;
1: -	Elf32_Word n_descsz;
1: -	Elf32_Word n_type;
1: +  Elf32_Word n_namesz;
1: +  Elf32_Word n_descsz;
1: +  Elf32_Word n_type;
1:  };
1:  
1:  enum {
1: -	PROC_ROOT_INO = 1,
1: -	PROC_IPC_INIT_INO = 4026531839,
1: -	PROC_UTS_INIT_INO = 4026531838,
1: -	PROC_USER_INIT_INO = 4026531837,
1: -	PROC_PID_INIT_INO = 4026531836,
1: -	PROC_CGROUP_INIT_INO = 4026531835,
1: -	PROC_TIME_INIT_INO = 4026531834,
1: +  PROC_ROOT_INO = 1,
1: +  PROC_IPC_INIT_INO = 4026531839,
1: +  PROC_UTS_INIT_INO = 4026531838,
1: +  PROC_USER_INIT_INO = 4026531837,
1: +  PROC_PID_INIT_INO = 4026531836,
1: +  PROC_CGROUP_INIT_INO = 4026531835,
1: +  PROC_TIME_INIT_INO = 4026531834,
1:  };
1:  
1:  typedef __u16 __le16;
1: @@ -8365,47 +8436,46 @@ typedef __u32 __wsum;
1:  typedef unsigned int slab_flags_t;
1:  
1:  struct llist_head {
1: -	struct llist_node *first;
1: +  struct llist_node *first;
1:  };
1:  
1:  struct notifier_block;
1:  
1: -typedef int (*notifier_fn_t)(struct notifier_block *, long unsigned int, void *);
1: +typedef int (*notifier_fn_t)(struct notifier_block *, long unsigned int,
1: +                             void *);
1:  
1:  struct notifier_block {
1: -	notifier_fn_t notifier_call;
1: -	struct notifier_block *next;
1: -	int priority;
1: +  notifier_fn_t notifier_call;
1: +  struct notifier_block *next;
1: +  int priority;
1:  };
1:  
1:  struct blocking_notifier_head {
1: -	struct rw_semaphore rwsem;
1: -	struct notifier_block *head;
1: +  struct rw_semaphore rwsem;
1: +  struct notifier_block *head;
1:  };
1:  
1:  struct raw_notifier_head {
1: -	struct notifier_block *head;
1: +  struct notifier_block *head;
1:  };
1:  
1:  typedef __u64 __addrpair;
1:  
1:  typedef __u32 __portpair;
1:  
1: -typedef struct {
1: -	struct net *net;
1: -} possible_net_t;
1: +typedef struct { struct net *net; } possible_net_t;
1:  
1:  struct in6_addr {
1: -	union {
1: -		__u8 u6_addr8[16];
1: -		__be16 u6_addr16[8];
1: -		__be32 u6_addr32[4];
1: -	} in6_u;
1: +  union {
1: +    __u8 u6_addr8[16];
1: +    __be16 u6_addr16[8];
1: +    __be32 u6_addr32[4];
1: +  } in6_u;
1:  };
1:  
1:  struct hlist_nulls_node {
1: -	struct hlist_nulls_node *next;
1: -	struct hlist_nulls_node **pprev;
1: +  struct hlist_nulls_node *next;
1: +  struct hlist_nulls_node **pprev;
1:  };
1:  
1:  struct proto;
1: @@ -8413,95 +8483,95 @@ struct proto;
1:  struct inet_timewait_death_row;
1:  
1:  struct sock_common {
1: -	union {
1: -		__addrpair skc_addrpair;
1: -		struct {
1: -			__be32 skc_daddr;
1: -			__be32 skc_rcv_saddr;
1: -		};
1: -	};
1: -	union {
1: -		unsigned int skc_hash;
1: -		__u16 skc_u16hashes[2];
1: -	};
1: -	union {
1: -		__portpair skc_portpair;
1: -		struct {
1: -			__be16 skc_dport;
1: -			__u16 skc_num;
1: -		};
1: -	};
1: -	short unsigned int skc_family;
1: -	volatile unsigned char skc_state;
1: -	unsigned char skc_reuse: 4;
1: -	unsigned char skc_reuseport: 1;
1: -	unsigned char skc_ipv6only: 1;
1: -	unsigned char skc_net_refcnt: 1;
1: -	int skc_bound_dev_if;
1: -	union {
1: -		struct hlist_node skc_bind_node;
1: -		struct hlist_node skc_portaddr_node;
1: -	};
1: -	struct proto *skc_prot;
1: -	possible_net_t skc_net;
1: -	struct in6_addr skc_v6_daddr;
1: -	struct in6_addr skc_v6_rcv_saddr;
1: -	atomic64_t skc_cookie;
1: -	union {
1: -		long unsigned int skc_flags;
1: -		struct sock *skc_listener;
1: -		struct inet_timewait_death_row *skc_tw_dr;
1: -	};
1: -	int skc_dontcopy_begin[0];
1: -	union {
1: -		struct hlist_node skc_node;
1: -		struct hlist_nulls_node skc_nulls_node;
1: -	};
1: -	short unsigned int skc_tx_queue_mapping;
1: -	short unsigned int skc_rx_queue_mapping;
1: -	union {
1: -		int skc_incoming_cpu;
1: -		u32 skc_rcv_wnd;
1: -		u32 skc_tw_rcv_nxt;
1: -	};
1: -	refcount_t skc_refcnt;
1: -	int skc_dontcopy_end[0];
1: -	union {
1: -		u32 skc_rxhash;
1: -		u32 skc_window_clamp;
1: -		u32 skc_tw_snd_nxt;
1: -	};
1: +  union {
1: +    __addrpair skc_addrpair;
1: +    struct {
1: +      __be32 skc_daddr;
1: +      __be32 skc_rcv_saddr;
1: +    };
1: +  };
1: +  union {
1: +    unsigned int skc_hash;
1: +    __u16 skc_u16hashes[2];
1: +  };
1: +  union {
1: +    __portpair skc_portpair;
1: +    struct {
1: +      __be16 skc_dport;
1: +      __u16 skc_num;
1: +    };
1: +  };
1: +  short unsigned int skc_family;
1: +  volatile unsigned char skc_state;
1: +  unsigned char skc_reuse : 4;
1: +  unsigned char skc_reuseport : 1;
1: +  unsigned char skc_ipv6only : 1;
1: +  unsigned char skc_net_refcnt : 1;
1: +  int skc_bound_dev_if;
1: +  union {
1: +    struct hlist_node skc_bind_node;
1: +    struct hlist_node skc_portaddr_node;
1: +  };
1: +  struct proto *skc_prot;
1: +  possible_net_t skc_net;
1: +  struct in6_addr skc_v6_daddr;
1: +  struct in6_addr skc_v6_rcv_saddr;
1: +  atomic64_t skc_cookie;
1: +  union {
1: +    long unsigned int skc_flags;
1: +    struct sock *skc_listener;
1: +    struct inet_timewait_death_row *skc_tw_dr;
1: +  };
1: +  int skc_dontcopy_begin[0];
1: +  union {
1: +    struct hlist_node skc_node;
1: +    struct hlist_nulls_node skc_nulls_node;
1: +  };
1: +  short unsigned int skc_tx_queue_mapping;
1: +  short unsigned int skc_rx_queue_mapping;
1: +  union {
1: +    int skc_incoming_cpu;
1: +    u32 skc_rcv_wnd;
1: +    u32 skc_tw_rcv_nxt;
1: +  };
1: +  refcount_t skc_refcnt;
1: +  int skc_dontcopy_end[0];
1: +  union {
1: +    u32 skc_rxhash;
1: +    u32 skc_window_clamp;
1: +    u32 skc_tw_snd_nxt;
1: +  };
1:  };
1:  
1:  typedef struct {
1: -	spinlock_t slock;
1: -	int owned;
1: -	wait_queue_head_t wq;
1: +  spinlock_t slock;
1: +  int owned;
1: +  wait_queue_head_t wq;
1:  } socket_lock_t;
1:  
1:  struct sk_buff;
1:  
1:  struct sk_buff_head {
1: -	struct sk_buff *next;
1: -	struct sk_buff *prev;
1: -	__u32 qlen;
1: -	spinlock_t lock;
1: +  struct sk_buff *next;
1: +  struct sk_buff *prev;
1: +  __u32 qlen;
1: +  spinlock_t lock;
1:  };
1:  
1:  typedef u64 netdev_features_t;
1:  
1:  struct sock_cgroup_data {
1: -	union {
1: -		struct {
1: -			u8 is_data: 1;
1: -			u8 no_refcnt: 1;
1: -			u8 unused: 6;
1: -			u8 padding;
1: -			u16 prioidx;
1: -			u32 classid;
1: -		};
1: -		u64 val;
1: -	};
1: +  union {
1: +    struct {
1: +      u8 is_data : 1;
1: +      u8 no_refcnt : 1;
1: +      u8 unused : 6;
1: +      u8 padding;
1: +      u16 prioidx;
1: +      u32 classid;
1: +    };
1: +    u64 val;
1: +  };
1:  };
1:  
1:  struct sk_filter;
1: @@ -8519,116 +8589,116 @@ struct sock_reuseport;
1:  struct bpf_local_storage;
1:  
1:  struct sock {
1: -	struct sock_common __sk_common;
1: -	socket_lock_t sk_lock;
1: -	atomic_t sk_drops;
1: -	int sk_rcvlowat;
1: -	struct sk_buff_head sk_error_queue;
1: -	struct sk_buff *sk_rx_skb_cache;
1: -	struct sk_buff_head sk_receive_queue;
1: -	struct {
1: -		atomic_t rmem_alloc;
1: -		int len;
1: -		struct sk_buff *head;
1: -		struct sk_buff *tail;
1: -	} sk_backlog;
1: -	int sk_forward_alloc;
1: -	unsigned int sk_ll_usec;
1: -	unsigned int sk_napi_id;
1: -	int sk_rcvbuf;
1: -	struct sk_filter *sk_filter;
1: -	union {
1: -		struct socket_wq *sk_wq;
1: -		struct socket_wq *sk_wq_raw;
1: -	};
1: -	struct xfrm_policy *sk_policy[2];
1: -	struct dst_entry *sk_rx_dst;
1: -	struct dst_entry *sk_dst_cache;
1: -	atomic_t sk_omem_alloc;
1: -	int sk_sndbuf;
1: -	int sk_wmem_queued;
1: -	refcount_t sk_wmem_alloc;
1: -	long unsigned int sk_tsq_flags;
1: -	union {
1: -		struct sk_buff *sk_send_head;
1: -		struct rb_root tcp_rtx_queue;
1: -	};
1: -	struct sk_buff *sk_tx_skb_cache;
1: -	struct sk_buff_head sk_write_queue;
1: -	__s32 sk_peek_off;
1: -	int sk_write_pending;
1: -	__u32 sk_dst_pending_confirm;
1: -	u32 sk_pacing_status;
1: -	long int sk_sndtimeo;
1: -	struct timer_list sk_timer;
1: -	__u32 sk_priority;
1: -	__u32 sk_mark;
1: -	long unsigned int sk_pacing_rate;
1: -	long unsigned int sk_max_pacing_rate;
1: -	struct page_frag sk_frag;
1: -	netdev_features_t sk_route_caps;
1: -	netdev_features_t sk_route_nocaps;
1: -	netdev_features_t sk_route_forced_caps;
1: -	int sk_gso_type;
1: -	unsigned int sk_gso_max_size;
1: -	gfp_t sk_allocation;
1: -	__u32 sk_txhash;
1: -	u8 sk_padding: 1;
1: -	u8 sk_kern_sock: 1;
1: -	u8 sk_no_check_tx: 1;
1: -	u8 sk_no_check_rx: 1;
1: -	u8 sk_userlocks: 4;
1: -	u8 sk_pacing_shift;
1: -	u16 sk_type;
1: -	u16 sk_protocol;
1: -	u16 sk_gso_max_segs;
1: -	long unsigned int sk_lingertime;
1: -	struct proto *sk_prot_creator;
1: -	rwlock_t sk_callback_lock;
1: -	int sk_err;
1: -	int sk_err_soft;
1: -	u32 sk_ack_backlog;
1: -	u32 sk_max_ack_backlog;
1: -	kuid_t sk_uid;
1: -	u8 sk_prefer_busy_poll;
1: -	u16 sk_busy_poll_budget;
1: -	struct pid *sk_peer_pid;
1: -	const struct cred *sk_peer_cred;
1: -	long int sk_rcvtimeo;
1: -	ktime_t sk_stamp;
1: -	u16 sk_tsflags;
1: -	u8 sk_shutdown;
1: -	u32 sk_tskey;
1: -	atomic_t sk_zckey;
1: -	u8 sk_clockid;
1: -	u8 sk_txtime_deadline_mode: 1;
1: -	u8 sk_txtime_report_errors: 1;
1: -	u8 sk_txtime_unused: 6;
1: -	struct socket *sk_socket;
1: -	void *sk_user_data;
1: -	void *sk_security;
1: -	struct sock_cgroup_data sk_cgrp_data;
1: -	struct mem_cgroup *sk_memcg;
1: -	void (*sk_state_change)(struct sock *);
1: -	void (*sk_data_ready)(struct sock *);
1: -	void (*sk_write_space)(struct sock *);
1: -	void (*sk_error_report)(struct sock *);
1: -	int (*sk_backlog_rcv)(struct sock *, struct sk_buff *);
1: -	void (*sk_destruct)(struct sock *);
1: -	struct sock_reuseport *sk_reuseport_cb;
1: -	struct bpf_local_storage *sk_bpf_storage;
1: -	struct callback_head sk_rcu;
1: +  struct sock_common __sk_common;
1: +  socket_lock_t sk_lock;
1: +  atomic_t sk_drops;
1: +  int sk_rcvlowat;
1: +  struct sk_buff_head sk_error_queue;
1: +  struct sk_buff *sk_rx_skb_cache;
1: +  struct sk_buff_head sk_receive_queue;
1: +  struct {
1: +    atomic_t rmem_alloc;
1: +    int len;
1: +    struct sk_buff *head;
1: +    struct sk_buff *tail;
1: +  } sk_backlog;
1: +  int sk_forward_alloc;
1: +  unsigned int sk_ll_usec;
1: +  unsigned int sk_napi_id;
1: +  int sk_rcvbuf;
1: +  struct sk_filter *sk_filter;
1: +  union {
1: +    struct socket_wq *sk_wq;
1: +    struct socket_wq *sk_wq_raw;
1: +  };
1: +  struct xfrm_policy *sk_policy[2];
1: +  struct dst_entry *sk_rx_dst;
1: +  struct dst_entry *sk_dst_cache;
1: +  atomic_t sk_omem_alloc;
1: +  int sk_sndbuf;
1: +  int sk_wmem_queued;
1: +  refcount_t sk_wmem_alloc;
1: +  long unsigned int sk_tsq_flags;
1: +  union {
1: +    struct sk_buff *sk_send_head;
1: +    struct rb_root tcp_rtx_queue;
1: +  };
1: +  struct sk_buff *sk_tx_skb_cache;
1: +  struct sk_buff_head sk_write_queue;
1: +  __s32 sk_peek_off;
1: +  int sk_write_pending;
1: +  __u32 sk_dst_pending_confirm;
1: +  u32 sk_pacing_status;
1: +  long int sk_sndtimeo;
1: +  struct timer_list sk_timer;
1: +  __u32 sk_priority;
1: +  __u32 sk_mark;
1: +  long unsigned int sk_pacing_rate;
1: +  long unsigned int sk_max_pacing_rate;
1: +  struct page_frag sk_frag;
1: +  netdev_features_t sk_route_caps;
1: +  netdev_features_t sk_route_nocaps;
1: +  netdev_features_t sk_route_forced_caps;
1: +  int sk_gso_type;
1: +  unsigned int sk_gso_max_size;
1: +  gfp_t sk_allocation;
1: +  __u32 sk_txhash;
1: +  u8 sk_padding : 1;
1: +  u8 sk_kern_sock : 1;
1: +  u8 sk_no_check_tx : 1;
1: +  u8 sk_no_check_rx : 1;
1: +  u8 sk_userlocks : 4;
1: +  u8 sk_pacing_shift;
1: +  u16 sk_type;
1: +  u16 sk_protocol;
1: +  u16 sk_gso_max_segs;
1: +  long unsigned int sk_lingertime;
1: +  struct proto *sk_prot_creator;
1: +  rwlock_t sk_callback_lock;
1: +  int sk_err;
1: +  int sk_err_soft;
1: +  u32 sk_ack_backlog;
1: +  u32 sk_max_ack_backlog;
1: +  kuid_t sk_uid;
1: +  u8 sk_prefer_busy_poll;
1: +  u16 sk_busy_poll_budget;
1: +  struct pid *sk_peer_pid;
1: +  const struct cred *sk_peer_cred;
1: +  long int sk_rcvtimeo;
1: +  ktime_t sk_stamp;
1: +  u16 sk_tsflags;
1: +  u8 sk_shutdown;
1: +  u32 sk_tskey;
1: +  atomic_t sk_zckey;
1: +  u8 sk_clockid;
1: +  u8 sk_txtime_deadline_mode : 1;
1: +  u8 sk_txtime_report_errors : 1;
1: +  u8 sk_txtime_unused : 6;
1: +  struct socket *sk_socket;
1: +  void *sk_user_data;
1: +  void *sk_security;
1: +  struct sock_cgroup_data sk_cgrp_data;
1: +  struct mem_cgroup *sk_memcg;
1: +  void (*sk_state_change)(struct sock *);
1: +  void (*sk_data_ready)(struct sock *);
1: +  void (*sk_write_space)(struct sock *);
1: +  void (*sk_error_report)(struct sock *);
1: +  int (*sk_backlog_rcv)(struct sock *, struct sk_buff *);
1: +  void (*sk_destruct)(struct sock *);
1: +  struct sock_reuseport *sk_reuseport_cb;
1: +  struct bpf_local_storage *sk_bpf_storage;
1: +  struct callback_head sk_rcu;
1:  };
1:  
1:  struct rhash_head {
1: -	struct rhash_head *next;
1: +  struct rhash_head *next;
1:  };
1:  
1:  struct rhashtable;
1:  
1:  struct rhashtable_compare_arg {
1: -	struct rhashtable *ht;
1: -	const void *key;
1: +  struct rhashtable *ht;
1: +  const void *key;
1:  };
1:  
1:  typedef u32 (*rht_hashfn_t)(const void *, u32, u32);
1: @@ -8638,63 +8708,63 @@ typedef u32 (*rht_obj_hashfn_t)(const void *, u32, u32);
1:  typedef int (*rht_obj_cmpfn_t)(struct rhashtable_compare_arg *, const void *);
1:  
1:  struct rhashtable_params {
1: -	u16 nelem_hint;
1: -	u16 key_len;
1: -	u16 key_offset;
1: -	u16 head_offset;
1: -	unsigned int max_size;
1: -	u16 min_size;
1: -	bool automatic_shrinking;
1: -	rht_hashfn_t hashfn;
1: -	rht_obj_hashfn_t obj_hashfn;
1: -	rht_obj_cmpfn_t obj_cmpfn;
1: +  u16 nelem_hint;
1: +  u16 key_len;
1: +  u16 key_offset;
1: +  u16 head_offset;
1: +  unsigned int max_size;
1: +  u16 min_size;
1: +  bool automatic_shrinking;
1: +  rht_hashfn_t hashfn;
1: +  rht_obj_hashfn_t obj_hashfn;
1: +  rht_obj_cmpfn_t obj_cmpfn;
1:  };
1:  
1:  struct bucket_table;
1:  
1:  struct rhashtable {
1: -	struct bucket_table *tbl;
1: -	unsigned int key_len;
1: -	unsigned int max_elems;
1: -	struct rhashtable_params p;
1: -	bool rhlist;
1: -	struct work_struct run_work;
1: -	struct mutex mutex;
1: -	spinlock_t lock;
1: -	atomic_t nelems;
1: +  struct bucket_table *tbl;
1: +  unsigned int key_len;
1: +  unsigned int max_elems;
1: +  struct rhashtable_params p;
1: +  bool rhlist;
1: +  struct work_struct run_work;
1: +  struct mutex mutex;
1: +  spinlock_t lock;
1: +  atomic_t nelems;
1:  };
1:  
1:  struct fs_struct {
1: -	int users;
1: -	spinlock_t lock;
1: -	seqcount_spinlock_t seq;
1: -	int umask;
1: -	int in_exec;
1: -	struct path root;
1: -	struct path pwd;
1: +  int users;
1: +  spinlock_t lock;
1: +  seqcount_spinlock_t seq;
1: +  int umask;
1: +  int in_exec;
1: +  struct path root;
1: +  struct path pwd;
1:  };
1:  
1:  struct pipe_buffer;
1:  
1:  struct pipe_inode_info {
1: -	struct mutex mutex;
1: -	wait_queue_head_t rd_wait;
1: -	wait_queue_head_t wr_wait;
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	unsigned int max_usage;
1: -	unsigned int ring_size;
1: -	unsigned int nr_accounted;
1: -	unsigned int readers;
1: -	unsigned int writers;
1: -	unsigned int files;
1: -	unsigned int r_counter;
1: -	unsigned int w_counter;
1: -	struct page *tmp_page;
1: -	struct fasync_struct *fasync_readers;
1: -	struct fasync_struct *fasync_writers;
1: -	struct pipe_buffer *bufs;
1: -	struct user_struct *user;
1: +  struct mutex mutex;
1: +  wait_queue_head_t rd_wait;
1: +  wait_queue_head_t wr_wait;
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  unsigned int max_usage;
1: +  unsigned int ring_size;
1: +  unsigned int nr_accounted;
1: +  unsigned int readers;
1: +  unsigned int writers;
1: +  unsigned int files;
1: +  unsigned int r_counter;
1: +  unsigned int w_counter;
1: +  struct page *tmp_page;
1: +  struct fasync_struct *fasync_readers;
1: +  struct fasync_struct *fasync_writers;
1: +  struct pipe_buffer *bufs;
1: +  struct user_struct *user;
1:  };
1:  
1:  typedef short unsigned int __kernel_sa_family_t;
1: @@ -8702,132 +8772,130 @@ typedef short unsigned int __kernel_sa_family_t;
1:  typedef __kernel_sa_family_t sa_family_t;
1:  
1:  struct sockaddr {
1: -	sa_family_t sa_family;
1: -	char sa_data[14];
1: +  sa_family_t sa_family;
1: +  char sa_data[14];
1:  };
1:  
1:  struct msghdr {
1: -	void *msg_name;
1: -	int msg_namelen;
1: -	struct iov_iter msg_iter;
1: -	union {
1: -		void *msg_control;
1: -		void *msg_control_user;
1: -	};
1: -	bool msg_control_is_user: 1;
1: -	__kernel_size_t msg_controllen;
1: -	unsigned int msg_flags;
1: -	struct kiocb *msg_iocb;
1: +  void *msg_name;
1: +  int msg_namelen;
1: +  struct iov_iter msg_iter;
1: +  union {
1: +    void *msg_control;
1: +    void *msg_control_user;
1: +  };
1: +  bool msg_control_is_user : 1;
1: +  __kernel_size_t msg_controllen;
1: +  unsigned int msg_flags;
1: +  struct kiocb *msg_iocb;
1:  };
1:  
1:  typedef struct {
1: -	unsigned int clock_rate;
1: -	unsigned int clock_type;
1: -	short unsigned int loopback;
1: +  unsigned int clock_rate;
1: +  unsigned int clock_type;
1: +  short unsigned int loopback;
1:  } sync_serial_settings;
1:  
1:  typedef struct {
1: -	unsigned int clock_rate;
1: -	unsigned int clock_type;
1: -	short unsigned int loopback;
1: -	unsigned int slot_map;
1: +  unsigned int clock_rate;
1: +  unsigned int clock_type;
1: +  short unsigned int loopback;
1: +  unsigned int slot_map;
1:  } te1_settings;
1:  
1:  typedef struct {
1: -	short unsigned int encoding;
1: -	short unsigned int parity;
1: +  short unsigned int encoding;
1: +  short unsigned int parity;
1:  } raw_hdlc_proto;
1:  
1:  typedef struct {
1: -	unsigned int t391;
1: -	unsigned int t392;
1: -	unsigned int n391;
1: -	unsigned int n392;
1: -	unsigned int n393;
1: -	short unsigned int lmi;
1: -	short unsigned int dce;
1: +  unsigned int t391;
1: +  unsigned int t392;
1: +  unsigned int n391;
1: +  unsigned int n392;
1: +  unsigned int n393;
1: +  short unsigned int lmi;
1: +  short unsigned int dce;
1:  } fr_proto;
1:  
1: -typedef struct {
1: -	unsigned int dlci;
1: -} fr_proto_pvc;
1: +typedef struct { unsigned int dlci; } fr_proto_pvc;
1:  
1:  typedef struct {
1: -	unsigned int dlci;
1: -	char master[16];
1: +  unsigned int dlci;
1: +  char master[16];
1:  } fr_proto_pvc_info;
1:  
1:  typedef struct {
1: -	unsigned int interval;
1: -	unsigned int timeout;
1: +  unsigned int interval;
1: +  unsigned int timeout;
1:  } cisco_proto;
1:  
1:  typedef struct {
1: -	short unsigned int dce;
1: -	unsigned int modulo;
1: -	unsigned int window;
1: -	unsigned int t1;
1: -	unsigned int t2;
1: -	unsigned int n2;
1: +  short unsigned int dce;
1: +  unsigned int modulo;
1: +  unsigned int window;
1: +  unsigned int t1;
1: +  unsigned int t2;
1: +  unsigned int n2;
1:  } x25_hdlc_proto;
1:  
1:  struct ifmap {
1: -	long unsigned int mem_start;
1: -	long unsigned int mem_end;
1: -	short unsigned int base_addr;
1: -	unsigned char irq;
1: -	unsigned char dma;
1: -	unsigned char port;
1: +  long unsigned int mem_start;
1: +  long unsigned int mem_end;
1: +  short unsigned int base_addr;
1: +  unsigned char irq;
1: +  unsigned char dma;
1: +  unsigned char port;
1:  };
1:  
1:  struct if_settings {
1: -	unsigned int type;
1: -	unsigned int size;
1: -	union {
1: -		raw_hdlc_proto *raw_hdlc;
1: -		cisco_proto *cisco;
1: -		fr_proto *fr;
1: -		fr_proto_pvc *fr_pvc;
1: -		fr_proto_pvc_info *fr_pvc_info;
1: -		x25_hdlc_proto *x25;
1: -		sync_serial_settings *sync;
1: -		te1_settings *te1;
1: -	} ifs_ifsu;
1: +  unsigned int type;
1: +  unsigned int size;
1: +  union {
1: +    raw_hdlc_proto *raw_hdlc;
1: +    cisco_proto *cisco;
1: +    fr_proto *fr;
1: +    fr_proto_pvc *fr_pvc;
1: +    fr_proto_pvc_info *fr_pvc_info;
1: +    x25_hdlc_proto *x25;
1: +    sync_serial_settings *sync;
1: +    te1_settings *te1;
1: +  } ifs_ifsu;
1:  };
1:  
1:  struct ifreq {
1: -	union {
1: -		char ifrn_name[16];
1: -	} ifr_ifrn;
1: -	union {
1: -		struct sockaddr ifru_addr;
1: -		struct sockaddr ifru_dstaddr;
1: -		struct sockaddr ifru_broadaddr;
1: -		struct sockaddr ifru_netmask;
1: -		struct sockaddr ifru_hwaddr;
1: -		short int ifru_flags;
1: -		int ifru_ivalue;
1: -		int ifru_mtu;
1: -		struct ifmap ifru_map;
1: -		char ifru_slave[16];
1: -		char ifru_newname[16];
1: -		void *ifru_data;
1: -		struct if_settings ifru_settings;
1: -	} ifr_ifru;
1: +  union {
1: +    char ifrn_name[16];
1: +  } ifr_ifrn;
1: +  union {
1: +    struct sockaddr ifru_addr;
1: +    struct sockaddr ifru_dstaddr;
1: +    struct sockaddr ifru_broadaddr;
1: +    struct sockaddr ifru_netmask;
1: +    struct sockaddr ifru_hwaddr;
1: +    short int ifru_flags;
1: +    int ifru_ivalue;
1: +    int ifru_mtu;
1: +    struct ifmap ifru_map;
1: +    char ifru_slave[16];
1: +    char ifru_newname[16];
1: +    void *ifru_data;
1: +    struct if_settings ifru_settings;
1: +  } ifr_ifru;
1:  };
1:  
1:  struct vfsmount {
1: -	struct dentry *mnt_root;
1: -	struct super_block *mnt_sb;
1: -	int mnt_flags;
1: +  struct dentry *mnt_root;
1: +  struct super_block *mnt_sb;
1: +  int mnt_flags;
1:  };
1:  
1:  struct ld_semaphore {
1: -	atomic_long_t count;
1: -	raw_spinlock_t wait_lock;
1: -	unsigned int wait_readers;
1: -	struct list_head read_wait;
1: -	struct list_head write_wait;
1: +  atomic_long_t count;
1: +  raw_spinlock_t wait_lock;
1: +  unsigned int wait_readers;
1: +  struct list_head read_wait;
1: +  struct list_head write_wait;
1:  };
1:  
1:  typedef unsigned int tcflag_t;
1: @@ -8837,21 +8905,21 @@ typedef unsigned char cc_t;
1:  typedef unsigned int speed_t;
1:  
1:  struct ktermios {
1: -	tcflag_t c_iflag;
1: -	tcflag_t c_oflag;
1: -	tcflag_t c_cflag;
1: -	tcflag_t c_lflag;
1: -	cc_t c_line;
1: -	cc_t c_cc[19];
1: -	speed_t c_ispeed;
1: -	speed_t c_ospeed;
1: +  tcflag_t c_iflag;
1: +  tcflag_t c_oflag;
1: +  tcflag_t c_cflag;
1: +  tcflag_t c_lflag;
1: +  cc_t c_line;
1: +  cc_t c_cc[19];
1: +  speed_t c_ispeed;
1: +  speed_t c_ospeed;
1:  };
1:  
1:  struct winsize {
1: -	short unsigned int ws_row;
1: -	short unsigned int ws_col;
1: -	short unsigned int ws_xpixel;
1: -	short unsigned int ws_ypixel;
1: +  short unsigned int ws_row;
1: +  short unsigned int ws_col;
1: +  short unsigned int ws_xpixel;
1: +  short unsigned int ws_ypixel;
1:  };
1:  
1:  struct tty_driver;
1: @@ -8865,88 +8933,88 @@ struct termiox;
1:  struct tty_port;
1:  
1:  struct tty_struct {
1: -	int magic;
1: -	struct kref kref;
1: -	struct device *dev;
1: -	struct tty_driver *driver;
1: -	const struct tty_operations *ops;
1: -	int index;
1: -	struct ld_semaphore ldisc_sem;
1: -	struct tty_ldisc *ldisc;
1: -	struct mutex atomic_write_lock;
1: -	struct mutex legacy_mutex;
1: -	struct mutex throttle_mutex;
1: -	struct rw_semaphore termios_rwsem;
1: -	struct mutex winsize_mutex;
1: -	spinlock_t ctrl_lock;
1: -	spinlock_t flow_lock;
1: -	struct ktermios termios;
1: -	struct ktermios termios_locked;
1: -	struct termiox *termiox;
1: -	char name[64];
1: -	struct pid *pgrp;
1: -	struct pid *session;
1: -	long unsigned int flags;
1: -	int count;
1: -	struct winsize winsize;
1: -	long unsigned int stopped: 1;
1: -	long unsigned int flow_stopped: 1;
1: -	int: 30;
1: -	long unsigned int unused: 62;
1: -	int hw_stopped;
1: -	long unsigned int ctrl_status: 8;
1: -	long unsigned int packet: 1;
1: -	int: 23;
1: -	long unsigned int unused_ctrl: 55;
1: -	unsigned int receive_room;
1: -	int flow_change;
1: -	struct tty_struct *link;
1: -	struct fasync_struct *fasync;
1: -	wait_queue_head_t write_wait;
1: -	wait_queue_head_t read_wait;
1: -	struct work_struct hangup_work;
1: -	void *disc_data;
1: -	void *driver_data;
1: -	spinlock_t files_lock;
1: -	struct list_head tty_files;
1: -	int closing;
1: -	unsigned char *write_buf;
1: -	int write_cnt;
1: -	struct work_struct SAK_work;
1: -	struct tty_port *port;
1: +  int magic;
1: +  struct kref kref;
1: +  struct device *dev;
1: +  struct tty_driver *driver;
1: +  const struct tty_operations *ops;
1: +  int index;
1: +  struct ld_semaphore ldisc_sem;
1: +  struct tty_ldisc *ldisc;
1: +  struct mutex atomic_write_lock;
1: +  struct mutex legacy_mutex;
1: +  struct mutex throttle_mutex;
1: +  struct rw_semaphore termios_rwsem;
1: +  struct mutex winsize_mutex;
1: +  spinlock_t ctrl_lock;
1: +  spinlock_t flow_lock;
1: +  struct ktermios termios;
1: +  struct ktermios termios_locked;
1: +  struct termiox *termiox;
1: +  char name[64];
1: +  struct pid *pgrp;
1: +  struct pid *session;
1: +  long unsigned int flags;
1: +  int count;
1: +  struct winsize winsize;
1: +  long unsigned int stopped : 1;
1: +  long unsigned int flow_stopped : 1;
1: +  int : 30;
1: +  long unsigned int unused : 62;
1: +  int hw_stopped;
1: +  long unsigned int ctrl_status : 8;
1: +  long unsigned int packet : 1;
1: +  int : 23;
1: +  long unsigned int unused_ctrl : 55;
1: +  unsigned int receive_room;
1: +  int flow_change;
1: +  struct tty_struct *link;
1: +  struct fasync_struct *fasync;
1: +  wait_queue_head_t write_wait;
1: +  wait_queue_head_t read_wait;
1: +  struct work_struct hangup_work;
1: +  void *disc_data;
1: +  void *driver_data;
1: +  spinlock_t files_lock;
1: +  struct list_head tty_files;
1: +  int closing;
1: +  unsigned char *write_buf;
1: +  int write_cnt;
1: +  struct work_struct SAK_work;
1: +  struct tty_port *port;
1:  };
1:  
1:  typedef struct {
1: -	size_t written;
1: -	size_t count;
1: -	union {
1: -		char *buf;
1: -		void *data;
1: -	} arg;
1: -	int error;
1: +  size_t written;
1: +  size_t count;
1: +  union {
1: +    char *buf;
1: +    void *data;
1: +  } arg;
1: +  int error;
1:  } read_descriptor_t;
1:  
1:  struct posix_acl_entry {
1: -	short int e_tag;
1: -	short unsigned int e_perm;
1: -	union {
1: -		kuid_t e_uid;
1: -		kgid_t e_gid;
1: -	};
1: +  short int e_tag;
1: +  short unsigned int e_perm;
1: +  union {
1: +    kuid_t e_uid;
1: +    kgid_t e_gid;
1: +  };
1:  };
1:  
1:  struct posix_acl {
1: -	refcount_t a_refcount;
1: -	struct callback_head a_rcu;
1: -	unsigned int a_count;
1: -	struct posix_acl_entry a_entries[0];
1: +  refcount_t a_refcount;
1: +  struct callback_head a_rcu;
1: +  unsigned int a_count;
1: +  struct posix_acl_entry a_entries[0];
1:  };
1:  
1:  struct termiox {
1: -	__u16 x_hflag;
1: -	__u16 x_cflag;
1: -	__u16 x_rflag[5];
1: -	__u16 x_sflag;
1: +  __u16 x_hflag;
1: +  __u16 x_cflag;
1: +  __u16 x_rflag[5];
1: +  __u16 x_sflag;
1:  };
1:  
1:  struct serial_icounter_struct;
1: @@ -8954,92 +9022,93 @@ struct serial_icounter_struct;
1:  struct serial_struct;
1:  
1:  struct tty_operations {
1: -	struct tty_struct * (*lookup)(struct tty_driver *, struct file *, int);
1: -	int (*install)(struct tty_driver *, struct tty_struct *);
1: -	void (*remove)(struct tty_driver *, struct tty_struct *);
1: -	int (*open)(struct tty_struct *, struct file *);
1: -	void (*close)(struct tty_struct *, struct file *);
1: -	void (*shutdown)(struct tty_struct *);
1: -	void (*cleanup)(struct tty_struct *);
1: -	int (*write)(struct tty_struct *, const unsigned char *, int);
1: -	int (*put_char)(struct tty_struct *, unsigned char);
1: -	void (*flush_chars)(struct tty_struct *);
1: -	int (*write_room)(struct tty_struct *);
1: -	int (*chars_in_buffer)(struct tty_struct *);
1: -	int (*ioctl)(struct tty_struct *, unsigned int, long unsigned int);
1: -	long int (*compat_ioctl)(struct tty_struct *, unsigned int, long unsigned int);
1: -	void (*set_termios)(struct tty_struct *, struct ktermios *);
1: -	void (*throttle)(struct tty_struct *);
1: -	void (*unthrottle)(struct tty_struct *);
1: -	void (*stop)(struct tty_struct *);
1: -	void (*start)(struct tty_struct *);
1: -	void (*hangup)(struct tty_struct *);
1: -	int (*break_ctl)(struct tty_struct *, int);
1: -	void (*flush_buffer)(struct tty_struct *);
1: -	void (*set_ldisc)(struct tty_struct *);
1: -	void (*wait_until_sent)(struct tty_struct *, int);
1: -	void (*send_xchar)(struct tty_struct *, char);
1: -	int (*tiocmget)(struct tty_struct *);
1: -	int (*tiocmset)(struct tty_struct *, unsigned int, unsigned int);
1: -	int (*resize)(struct tty_struct *, struct winsize *);
1: -	int (*set_termiox)(struct tty_struct *, struct termiox *);
1: -	int (*get_icount)(struct tty_struct *, struct serial_icounter_struct *);
1: -	int (*get_serial)(struct tty_struct *, struct serial_struct *);
1: -	int (*set_serial)(struct tty_struct *, struct serial_struct *);
1: -	void (*show_fdinfo)(struct tty_struct *, struct seq_file *);
1: -	int (*proc_show)(struct seq_file *, void *);
1: +  struct tty_struct *(*lookup)(struct tty_driver *, struct file *, int);
1: +  int (*install)(struct tty_driver *, struct tty_struct *);
1: +  void (*remove)(struct tty_driver *, struct tty_struct *);
1: +  int (*open)(struct tty_struct *, struct file *);
1: +  void (*close)(struct tty_struct *, struct file *);
1: +  void (*shutdown)(struct tty_struct *);
1: +  void (*cleanup)(struct tty_struct *);
1: +  int (*write)(struct tty_struct *, const unsigned char *, int);
1: +  int (*put_char)(struct tty_struct *, unsigned char);
1: +  void (*flush_chars)(struct tty_struct *);
1: +  int (*write_room)(struct tty_struct *);
1: +  int (*chars_in_buffer)(struct tty_struct *);
1: +  int (*ioctl)(struct tty_struct *, unsigned int, long unsigned int);
1: +  long int (*compat_ioctl)(struct tty_struct *, unsigned int,
1: +                           long unsigned int);
1: +  void (*set_termios)(struct tty_struct *, struct ktermios *);
1: +  void (*throttle)(struct tty_struct *);
1: +  void (*unthrottle)(struct tty_struct *);
1: +  void (*stop)(struct tty_struct *);
1: +  void (*start)(struct tty_struct *);
1: +  void (*hangup)(struct tty_struct *);
1: +  int (*break_ctl)(struct tty_struct *, int);
1: +  void (*flush_buffer)(struct tty_struct *);
1: +  void (*set_ldisc)(struct tty_struct *);
1: +  void (*wait_until_sent)(struct tty_struct *, int);
1: +  void (*send_xchar)(struct tty_struct *, char);
1: +  int (*tiocmget)(struct tty_struct *);
1: +  int (*tiocmset)(struct tty_struct *, unsigned int, unsigned int);
1: +  int (*resize)(struct tty_struct *, struct winsize *);
1: +  int (*set_termiox)(struct tty_struct *, struct termiox *);
1: +  int (*get_icount)(struct tty_struct *, struct serial_icounter_struct *);
1: +  int (*get_serial)(struct tty_struct *, struct serial_struct *);
1: +  int (*set_serial)(struct tty_struct *, struct serial_struct *);
1: +  void (*show_fdinfo)(struct tty_struct *, struct seq_file *);
1: +  int (*proc_show)(struct seq_file *, void *);
1:  };
1:  
1:  struct proc_dir_entry;
1:  
1:  struct tty_driver {
1: -	int magic;
1: -	struct kref kref;
1: -	struct cdev **cdevs;
1: -	struct module *owner;
1: -	const char *driver_name;
1: -	const char *name;
1: -	int name_base;
1: -	int major;
1: -	int minor_start;
1: -	unsigned int num;
1: -	short int type;
1: -	short int subtype;
1: -	struct ktermios init_termios;
1: -	long unsigned int flags;
1: -	struct proc_dir_entry *proc_entry;
1: -	struct tty_driver *other;
1: -	struct tty_struct **ttys;
1: -	struct tty_port **ports;
1: -	struct ktermios **termios;
1: -	void *driver_state;
1: -	const struct tty_operations *ops;
1: -	struct list_head tty_drivers;
1: +  int magic;
1: +  struct kref kref;
1: +  struct cdev **cdevs;
1: +  struct module *owner;
1: +  const char *driver_name;
1: +  const char *name;
1: +  int name_base;
1: +  int major;
1: +  int minor_start;
1: +  unsigned int num;
1: +  short int type;
1: +  short int subtype;
1: +  struct ktermios init_termios;
1: +  long unsigned int flags;
1: +  struct proc_dir_entry *proc_entry;
1: +  struct tty_driver *other;
1: +  struct tty_struct **ttys;
1: +  struct tty_port **ports;
1: +  struct ktermios **termios;
1: +  void *driver_state;
1: +  const struct tty_operations *ops;
1: +  struct list_head tty_drivers;
1:  };
1:  
1:  struct tty_buffer {
1: -	union {
1: -		struct tty_buffer *next;
1: -		struct llist_node free;
1: -	};
1: -	int used;
1: -	int size;
1: -	int commit;
1: -	int read;
1: -	int flags;
1: -	long unsigned int data[0];
1: +  union {
1: +    struct tty_buffer *next;
1: +    struct llist_node free;
1: +  };
1: +  int used;
1: +  int size;
1: +  int commit;
1: +  int read;
1: +  int flags;
1: +  long unsigned int data[0];
1:  };
1:  
1:  struct tty_bufhead {
1: -	struct tty_buffer *head;
1: -	struct work_struct work;
1: -	struct mutex lock;
1: -	atomic_t priority;
1: -	struct tty_buffer sentinel;
1: -	struct llist_head free;
1: -	atomic_t mem_used;
1: -	int mem_limit;
1: -	struct tty_buffer *tail;
1: +  struct tty_buffer *head;
1: +  struct work_struct work;
1: +  struct mutex lock;
1: +  atomic_t priority;
1: +  struct tty_buffer sentinel;
1: +  struct llist_head free;
1: +  atomic_t mem_used;
1: +  int mem_limit;
1: +  struct tty_buffer *tail;
1:  };
1:  
1:  struct tty_port_operations;
1: @@ -9047,78 +9116,83 @@ struct tty_port_operations;
1:  struct tty_port_client_operations;
1:  
1:  struct tty_port {
1: -	struct tty_bufhead buf;
1: -	struct tty_struct *tty;
1: -	struct tty_struct *itty;
1: -	const struct tty_port_operations *ops;
1: -	const struct tty_port_client_operations *client_ops;
1: -	spinlock_t lock;
1: -	int blocked_open;
1: -	int count;
1: -	wait_queue_head_t open_wait;
1: -	wait_queue_head_t delta_msr_wait;
1: -	long unsigned int flags;
1: -	long unsigned int iflags;
1: -	unsigned char console: 1;
1: -	unsigned char low_latency: 1;
1: -	struct mutex mutex;
1: -	struct mutex buf_mutex;
1: -	unsigned char *xmit_buf;
1: -	unsigned int close_delay;
1: -	unsigned int closing_wait;
1: -	int drain_delay;
1: -	struct kref kref;
1: -	void *client_data;
1: +  struct tty_bufhead buf;
1: +  struct tty_struct *tty;
1: +  struct tty_struct *itty;
1: +  const struct tty_port_operations *ops;
1: +  const struct tty_port_client_operations *client_ops;
1: +  spinlock_t lock;
1: +  int blocked_open;
1: +  int count;
1: +  wait_queue_head_t open_wait;
1: +  wait_queue_head_t delta_msr_wait;
1: +  long unsigned int flags;
1: +  long unsigned int iflags;
1: +  unsigned char console : 1;
1: +  unsigned char low_latency : 1;
1: +  struct mutex mutex;
1: +  struct mutex buf_mutex;
1: +  unsigned char *xmit_buf;
1: +  unsigned int close_delay;
1: +  unsigned int closing_wait;
1: +  int drain_delay;
1: +  struct kref kref;
1: +  void *client_data;
1:  };
1:  
1:  struct tty_ldisc_ops {
1: -	int magic;
1: -	char *name;
1: -	int num;
1: -	int flags;
1: -	int (*open)(struct tty_struct *);
1: -	void (*close)(struct tty_struct *);
1: -	void (*flush_buffer)(struct tty_struct *);
1: -	ssize_t (*read)(struct tty_struct *, struct file *, unsigned char *, size_t);
1: -	ssize_t (*write)(struct tty_struct *, struct file *, const unsigned char *, size_t);
1: -	int (*ioctl)(struct tty_struct *, struct file *, unsigned int, long unsigned int);
1: -	int (*compat_ioctl)(struct tty_struct *, struct file *, unsigned int, long unsigned int);
1: -	void (*set_termios)(struct tty_struct *, struct ktermios *);
1: -	__poll_t (*poll)(struct tty_struct *, struct file *, struct poll_table_struct *);
1: -	int (*hangup)(struct tty_struct *);
1: -	void (*receive_buf)(struct tty_struct *, const unsigned char *, char *, int);
1: -	void (*write_wakeup)(struct tty_struct *);
1: -	void (*dcd_change)(struct tty_struct *, unsigned int);
1: -	int (*receive_buf2)(struct tty_struct *, const unsigned char *, char *, int);
1: -	struct module *owner;
1: -	int refcount;
1: +  int magic;
1: +  char *name;
1: +  int num;
1: +  int flags;
1: +  int (*open)(struct tty_struct *);
1: +  void (*close)(struct tty_struct *);
1: +  void (*flush_buffer)(struct tty_struct *);
1: +  ssize_t (*read)(struct tty_struct *, struct file *, unsigned char *, size_t);
1: +  ssize_t (*write)(struct tty_struct *, struct file *, const unsigned char *,
1: +                   size_t);
1: +  int (*ioctl)(struct tty_struct *, struct file *, unsigned int,
1: +               long unsigned int);
1: +  int (*compat_ioctl)(struct tty_struct *, struct file *, unsigned int,
1: +                      long unsigned int);
1: +  void (*set_termios)(struct tty_struct *, struct ktermios *);
1: +  __poll_t (*poll)(struct tty_struct *, struct file *,
1: +                   struct poll_table_struct *);
1: +  int (*hangup)(struct tty_struct *);
1: +  void (*receive_buf)(struct tty_struct *, const unsigned char *, char *, int);
1: +  void (*write_wakeup)(struct tty_struct *);
1: +  void (*dcd_change)(struct tty_struct *, unsigned int);
1: +  int (*receive_buf2)(struct tty_struct *, const unsigned char *, char *, int);
1: +  struct module *owner;
1: +  int refcount;
1:  };
1:  
1:  struct tty_ldisc {
1: -	struct tty_ldisc_ops *ops;
1: -	struct tty_struct *tty;
1: +  struct tty_ldisc_ops *ops;
1: +  struct tty_struct *tty;
1:  };
1:  
1:  struct tty_port_operations {
1: -	int (*carrier_raised)(struct tty_port *);
1: -	void (*dtr_rts)(struct tty_port *, int);
1: -	void (*shutdown)(struct tty_port *);
1: -	int (*activate)(struct tty_port *, struct tty_struct *);
1: -	void (*destruct)(struct tty_port *);
1: +  int (*carrier_raised)(struct tty_port *);
1: +  void (*dtr_rts)(struct tty_port *, int);
1: +  void (*shutdown)(struct tty_port *);
1: +  int (*activate)(struct tty_port *, struct tty_struct *);
1: +  void (*destruct)(struct tty_port *);
1:  };
1:  
1:  struct tty_port_client_operations {
1: -	int (*receive_buf)(struct tty_port *, const unsigned char *, const unsigned char *, size_t);
1: -	void (*write_wakeup)(struct tty_port *);
1: +  int (*receive_buf)(struct tty_port *, const unsigned char *,
1: +                     const unsigned char *, size_t);
1: +  void (*write_wakeup)(struct tty_port *);
1:  };
1:  
1:  struct prot_inuse;
1:  
1:  struct netns_core {
1: -	struct ctl_table_header *sysctl_hdr;
1: -	int sysctl_somaxconn;
1: -	int *sock_inuse;
1: -	struct prot_inuse *prot_inuse;
1: +  struct ctl_table_header *sysctl_hdr;
1: +  int sysctl_somaxconn;
1: +  int *sock_inuse;
1: +  struct prot_inuse *prot_inuse;
1:  };
1:  
1:  struct tcp_mib;
1: @@ -9140,77 +9214,75 @@ struct icmpv6msg_mib;
1:  struct linux_tls_mib;
1:  
1:  struct netns_mib {
1: -	struct tcp_mib *tcp_statistics;
1: -	struct ipstats_mib *ip_statistics;
1: -	struct linux_mib *net_statistics;
1: -	struct udp_mib *udp_statistics;
1: -	struct udp_mib *udplite_statistics;
1: -	struct icmp_mib *icmp_statistics;
1: -	struct icmpmsg_mib *icmpmsg_statistics;
1: -	struct proc_dir_entry *proc_net_devsnmp6;
1: -	struct udp_mib *udp_stats_in6;
1: -	struct udp_mib *udplite_stats_in6;
1: -	struct ipstats_mib *ipv6_statistics;
1: -	struct icmpv6_mib *icmpv6_statistics;
1: -	struct icmpv6msg_mib *icmpv6msg_statistics;
1: -	struct linux_tls_mib *tls_statistics;
1: +  struct tcp_mib *tcp_statistics;
1: +  struct ipstats_mib *ip_statistics;
1: +  struct linux_mib *net_statistics;
1: +  struct udp_mib *udp_statistics;
1: +  struct udp_mib *udplite_statistics;
1: +  struct icmp_mib *icmp_statistics;
1: +  struct icmpmsg_mib *icmpmsg_statistics;
1: +  struct proc_dir_entry *proc_net_devsnmp6;
1: +  struct udp_mib *udp_stats_in6;
1: +  struct udp_mib *udplite_stats_in6;
1: +  struct ipstats_mib *ipv6_statistics;
1: +  struct icmpv6_mib *icmpv6_statistics;
1: +  struct icmpv6msg_mib *icmpv6msg_statistics;
1: +  struct linux_tls_mib *tls_statistics;
1:  };
1:  
1:  struct netns_packet {
1: -	struct mutex sklist_lock;
1: -	struct hlist_head sklist;
1: +  struct mutex sklist_lock;
1: +  struct hlist_head sklist;
1:  };
1:  
1:  struct netns_unix {
1: -	int sysctl_max_dgram_qlen;
1: -	struct ctl_table_header *ctl;
1: +  int sysctl_max_dgram_qlen;
1: +  struct ctl_table_header *ctl;
1:  };
1:  
1:  struct netns_nexthop {
1: -	struct rb_root rb_root;
1: -	struct hlist_head *devhash;
1: -	unsigned int seq;
1: -	u32 last_id_allocated;
1: -	struct blocking_notifier_head notifier_chain;
1: +  struct rb_root rb_root;
1: +  struct hlist_head *devhash;
1: +  unsigned int seq;
1: +  u32 last_id_allocated;
1: +  struct blocking_notifier_head notifier_chain;
1:  };
1:  
1:  struct local_ports {
1: -	seqlock_t lock;
1: -	int range[2];
1: -	bool warned;
1: +  seqlock_t lock;
1: +  int range[2];
1: +  bool warned;
1:  };
1:  
1:  struct inet_hashinfo;
1:  
1:  struct inet_timewait_death_row {
1: -	atomic_t tw_count;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct inet_hashinfo *hashinfo;
1: -	int sysctl_max_tw_buckets;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  atomic_t tw_count;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct inet_hashinfo *hashinfo;
1: +  int sysctl_max_tw_buckets;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ping_group_range {
1: -	seqlock_t lock;
1: -	kgid_t range[2];
1: +  seqlock_t lock;
1: +  kgid_t range[2];
1:  };
1:  
1: -typedef struct {
1: -	u64 key[2];
1: -} siphash_key_t;
1: +typedef struct { u64 key[2]; } siphash_key_t;
1:  
1:  struct ipv4_devconf;
1:  
1: @@ -9235,190 +9307,190 @@ struct mr_table;
1:  struct fib_notifier_ops;
1:  
1:  struct netns_ipv4 {
1: -	struct ctl_table_header *forw_hdr;
1: -	struct ctl_table_header *frags_hdr;
1: -	struct ctl_table_header *ipv4_hdr;
1: -	struct ctl_table_header *route_hdr;
1: -	struct ctl_table_header *xfrm4_hdr;
1: -	struct ipv4_devconf *devconf_all;
1: -	struct ipv4_devconf *devconf_dflt;
1: -	struct ip_ra_chain *ra_chain;
1: -	struct mutex ra_mutex;
1: -	struct fib_rules_ops *rules_ops;
1: -	bool fib_has_custom_rules;
1: -	unsigned int fib_rules_require_fldissect;
1: -	struct fib_table *fib_main;
1: -	struct fib_table *fib_default;
1: -	bool fib_has_custom_local_routes;
1: -	int fib_num_tclassid_users;
1: -	struct hlist_head *fib_table_hash;
1: -	bool fib_offload_disabled;
1: -	struct sock *fibnl;
1: -	struct sock **icmp_sk;
1: -	struct sock *mc_autojoin_sk;
1: -	struct inet_peer_base *peers;
1: -	struct sock **tcp_sk;
1: -	struct fqdir *fqdir;
1: -	struct xt_table *iptable_filter;
1: -	struct xt_table *iptable_mangle;
1: -	struct xt_table *iptable_raw;
1: -	struct xt_table *arptable_filter;
1: -	struct xt_table *iptable_security;
1: -	struct xt_table *nat_table;
1: -	int sysctl_icmp_echo_ignore_all;
1: -	int sysctl_icmp_echo_ignore_broadcasts;
1: -	int sysctl_icmp_ignore_bogus_error_responses;
1: -	int sysctl_icmp_ratelimit;
1: -	int sysctl_icmp_ratemask;
1: -	int sysctl_icmp_errors_use_inbound_ifaddr;
1: -	struct local_ports ip_local_ports;
1: -	int sysctl_tcp_ecn;
1: -	int sysctl_tcp_ecn_fallback;
1: -	int sysctl_ip_default_ttl;
1: -	int sysctl_ip_no_pmtu_disc;
1: -	int sysctl_ip_fwd_use_pmtu;
1: -	int sysctl_ip_fwd_update_priority;
1: -	int sysctl_ip_nonlocal_bind;
1: -	int sysctl_ip_autobind_reuse;
1: -	int sysctl_ip_dynaddr;
1: -	int sysctl_ip_early_demux;
1: -	int sysctl_tcp_early_demux;
1: -	int sysctl_udp_early_demux;
1: -	int sysctl_nexthop_compat_mode;
1: -	int sysctl_fwmark_reflect;
1: -	int sysctl_tcp_fwmark_accept;
1: -	int sysctl_tcp_mtu_probing;
1: -	int sysctl_tcp_mtu_probe_floor;
1: -	int sysctl_tcp_base_mss;
1: -	int sysctl_tcp_min_snd_mss;
1: -	int sysctl_tcp_probe_threshold;
1: -	u32 sysctl_tcp_probe_interval;
1: -	int sysctl_tcp_keepalive_time;
1: -	int sysctl_tcp_keepalive_probes;
1: -	int sysctl_tcp_keepalive_intvl;
1: -	int sysctl_tcp_syn_retries;
1: -	int sysctl_tcp_synack_retries;
1: -	int sysctl_tcp_syncookies;
1: -	int sysctl_tcp_reordering;
1: -	int sysctl_tcp_retries1;
1: -	int sysctl_tcp_retries2;
1: -	int sysctl_tcp_orphan_retries;
1: -	int sysctl_tcp_fin_timeout;
1: -	unsigned int sysctl_tcp_notsent_lowat;
1: -	int sysctl_tcp_tw_reuse;
1: -	int sysctl_tcp_sack;
1: -	int sysctl_tcp_window_scaling;
1: -	int sysctl_tcp_timestamps;
1: -	int sysctl_tcp_early_retrans;
1: -	int sysctl_tcp_recovery;
1: -	int sysctl_tcp_thin_linear_timeouts;
1: -	int sysctl_tcp_slow_start_after_idle;
1: -	int sysctl_tcp_retrans_collapse;
1: -	int sysctl_tcp_stdurg;
1: -	int sysctl_tcp_rfc1337;
1: -	int sysctl_tcp_abort_on_overflow;
1: -	int sysctl_tcp_fack;
1: -	int sysctl_tcp_max_reordering;
1: -	int sysctl_tcp_dsack;
1: -	int sysctl_tcp_app_win;
1: -	int sysctl_tcp_adv_win_scale;
1: -	int sysctl_tcp_frto;
1: -	int sysctl_tcp_nometrics_save;
1: -	int sysctl_tcp_no_ssthresh_metrics_save;
1: -	int sysctl_tcp_moderate_rcvbuf;
1: -	int sysctl_tcp_tso_win_divisor;
1: -	int sysctl_tcp_workaround_signed_windows;
1: -	int sysctl_tcp_limit_output_bytes;
1: -	int sysctl_tcp_challenge_ack_limit;
1: -	int sysctl_tcp_min_tso_segs;
1: -	int sysctl_tcp_min_rtt_wlen;
1: -	int sysctl_tcp_autocorking;
1: -	int sysctl_tcp_invalid_ratelimit;
1: -	int sysctl_tcp_pacing_ss_ratio;
1: -	int sysctl_tcp_pacing_ca_ratio;
1: -	int sysctl_tcp_wmem[3];
1: -	int sysctl_tcp_rmem[3];
1: -	int sysctl_tcp_comp_sack_nr;
1: -	long unsigned int sysctl_tcp_comp_sack_delay_ns;
1: -	long unsigned int sysctl_tcp_comp_sack_slack_ns;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct inet_timewait_death_row tcp_death_row;
1: -	int sysctl_max_syn_backlog;
1: -	int sysctl_tcp_fastopen;
1: -	const struct tcp_congestion_ops *tcp_congestion_control;
1: -	struct tcp_fastopen_context *tcp_fastopen_ctx;
1: -	spinlock_t tcp_fastopen_ctx_lock;
1: -	unsigned int sysctl_tcp_fastopen_blackhole_timeout;
1: -	atomic_t tfo_active_disable_times;
1: -	long unsigned int tfo_active_disable_stamp;
1: -	int sysctl_tcp_reflect_tos;
1: -	int sysctl_udp_wmem_min;
1: -	int sysctl_udp_rmem_min;
1: -	int sysctl_igmp_max_memberships;
1: -	int sysctl_igmp_max_msf;
1: -	int sysctl_igmp_llm_reports;
1: -	int sysctl_igmp_qrv;
1: -	struct ping_group_range ping_group_range;
1: -	atomic_t dev_addr_genid;
1: -	long unsigned int *sysctl_local_reserved_ports;
1: -	int sysctl_ip_prot_sock;
1: -	struct mr_table *mrt;
1: -	int sysctl_fib_multipath_use_neigh;
1: -	int sysctl_fib_multipath_hash_policy;
1: -	struct fib_notifier_ops *notifier_ops;
1: -	unsigned int fib_seq;
1: -	struct fib_notifier_ops *ipmr_notifier_ops;
1: -	unsigned int ipmr_seq;
1: -	atomic_t rt_genid;
1: -	siphash_key_t ip_id_key;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct ctl_table_header *forw_hdr;
1: +  struct ctl_table_header *frags_hdr;
1: +  struct ctl_table_header *ipv4_hdr;
1: +  struct ctl_table_header *route_hdr;
1: +  struct ctl_table_header *xfrm4_hdr;
1: +  struct ipv4_devconf *devconf_all;
1: +  struct ipv4_devconf *devconf_dflt;
1: +  struct ip_ra_chain *ra_chain;
1: +  struct mutex ra_mutex;
1: +  struct fib_rules_ops *rules_ops;
1: +  bool fib_has_custom_rules;
1: +  unsigned int fib_rules_require_fldissect;
1: +  struct fib_table *fib_main;
1: +  struct fib_table *fib_default;
1: +  bool fib_has_custom_local_routes;
1: +  int fib_num_tclassid_users;
1: +  struct hlist_head *fib_table_hash;
1: +  bool fib_offload_disabled;
1: +  struct sock *fibnl;
1: +  struct sock **icmp_sk;
1: +  struct sock *mc_autojoin_sk;
1: +  struct inet_peer_base *peers;
1: +  struct sock **tcp_sk;
1: +  struct fqdir *fqdir;
1: +  struct xt_table *iptable_filter;
1: +  struct xt_table *iptable_mangle;
1: +  struct xt_table *iptable_raw;
1: +  struct xt_table *arptable_filter;
1: +  struct xt_table *iptable_security;
1: +  struct xt_table *nat_table;
1: +  int sysctl_icmp_echo_ignore_all;
1: +  int sysctl_icmp_echo_ignore_broadcasts;
1: +  int sysctl_icmp_ignore_bogus_error_responses;
1: +  int sysctl_icmp_ratelimit;
1: +  int sysctl_icmp_ratemask;
1: +  int sysctl_icmp_errors_use_inbound_ifaddr;
1: +  struct local_ports ip_local_ports;
1: +  int sysctl_tcp_ecn;
1: +  int sysctl_tcp_ecn_fallback;
1: +  int sysctl_ip_default_ttl;
1: +  int sysctl_ip_no_pmtu_disc;
1: +  int sysctl_ip_fwd_use_pmtu;
1: +  int sysctl_ip_fwd_update_priority;
1: +  int sysctl_ip_nonlocal_bind;
1: +  int sysctl_ip_autobind_reuse;
1: +  int sysctl_ip_dynaddr;
1: +  int sysctl_ip_early_demux;
1: +  int sysctl_tcp_early_demux;
1: +  int sysctl_udp_early_demux;
1: +  int sysctl_nexthop_compat_mode;
1: +  int sysctl_fwmark_reflect;
1: +  int sysctl_tcp_fwmark_accept;
1: +  int sysctl_tcp_mtu_probing;
1: +  int sysctl_tcp_mtu_probe_floor;
1: +  int sysctl_tcp_base_mss;
1: +  int sysctl_tcp_min_snd_mss;
1: +  int sysctl_tcp_probe_threshold;
1: +  u32 sysctl_tcp_probe_interval;
1: +  int sysctl_tcp_keepalive_time;
1: +  int sysctl_tcp_keepalive_probes;
1: +  int sysctl_tcp_keepalive_intvl;
1: +  int sysctl_tcp_syn_retries;
1: +  int sysctl_tcp_synack_retries;
1: +  int sysctl_tcp_syncookies;
1: +  int sysctl_tcp_reordering;
1: +  int sysctl_tcp_retries1;
1: +  int sysctl_tcp_retries2;
1: +  int sysctl_tcp_orphan_retries;
1: +  int sysctl_tcp_fin_timeout;
1: +  unsigned int sysctl_tcp_notsent_lowat;
1: +  int sysctl_tcp_tw_reuse;
1: +  int sysctl_tcp_sack;
1: +  int sysctl_tcp_window_scaling;
1: +  int sysctl_tcp_timestamps;
1: +  int sysctl_tcp_early_retrans;
1: +  int sysctl_tcp_recovery;
1: +  int sysctl_tcp_thin_linear_timeouts;
1: +  int sysctl_tcp_slow_start_after_idle;
1: +  int sysctl_tcp_retrans_collapse;
1: +  int sysctl_tcp_stdurg;
1: +  int sysctl_tcp_rfc1337;
1: +  int sysctl_tcp_abort_on_overflow;
1: +  int sysctl_tcp_fack;
1: +  int sysctl_tcp_max_reordering;
1: +  int sysctl_tcp_dsack;
1: +  int sysctl_tcp_app_win;
1: +  int sysctl_tcp_adv_win_scale;
1: +  int sysctl_tcp_frto;
1: +  int sysctl_tcp_nometrics_save;
1: +  int sysctl_tcp_no_ssthresh_metrics_save;
1: +  int sysctl_tcp_moderate_rcvbuf;
1: +  int sysctl_tcp_tso_win_divisor;
1: +  int sysctl_tcp_workaround_signed_windows;
1: +  int sysctl_tcp_limit_output_bytes;
1: +  int sysctl_tcp_challenge_ack_limit;
1: +  int sysctl_tcp_min_tso_segs;
1: +  int sysctl_tcp_min_rtt_wlen;
1: +  int sysctl_tcp_autocorking;
1: +  int sysctl_tcp_invalid_ratelimit;
1: +  int sysctl_tcp_pacing_ss_ratio;
1: +  int sysctl_tcp_pacing_ca_ratio;
1: +  int sysctl_tcp_wmem[3];
1: +  int sysctl_tcp_rmem[3];
1: +  int sysctl_tcp_comp_sack_nr;
1: +  long unsigned int sysctl_tcp_comp_sack_delay_ns;
1: +  long unsigned int sysctl_tcp_comp_sack_slack_ns;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct inet_timewait_death_row tcp_death_row;
1: +  int sysctl_max_syn_backlog;
1: +  int sysctl_tcp_fastopen;
1: +  const struct tcp_congestion_ops *tcp_congestion_control;
1: +  struct tcp_fastopen_context *tcp_fastopen_ctx;
1: +  spinlock_t tcp_fastopen_ctx_lock;
1: +  unsigned int sysctl_tcp_fastopen_blackhole_timeout;
1: +  atomic_t tfo_active_disable_times;
1: +  long unsigned int tfo_active_disable_stamp;
1: +  int sysctl_tcp_reflect_tos;
1: +  int sysctl_udp_wmem_min;
1: +  int sysctl_udp_rmem_min;
1: +  int sysctl_igmp_max_memberships;
1: +  int sysctl_igmp_max_msf;
1: +  int sysctl_igmp_llm_reports;
1: +  int sysctl_igmp_qrv;
1: +  struct ping_group_range ping_group_range;
1: +  atomic_t dev_addr_genid;
1: +  long unsigned int *sysctl_local_reserved_ports;
1: +  int sysctl_ip_prot_sock;
1: +  struct mr_table *mrt;
1: +  int sysctl_fib_multipath_use_neigh;
1: +  int sysctl_fib_multipath_hash_policy;
1: +  struct fib_notifier_ops *notifier_ops;
1: +  unsigned int fib_seq;
1: +  struct fib_notifier_ops *ipmr_notifier_ops;
1: +  unsigned int ipmr_seq;
1: +  atomic_t rt_genid;
1: +  siphash_key_t ip_id_key;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct netns_sysctl_ipv6 {
1: -	struct ctl_table_header *hdr;
1: -	struct ctl_table_header *route_hdr;
1: -	struct ctl_table_header *icmp_hdr;
1: -	struct ctl_table_header *frags_hdr;
1: -	struct ctl_table_header *xfrm6_hdr;
1: -	int bindv6only;
1: -	int flush_delay;
1: -	int ip6_rt_max_size;
1: -	int ip6_rt_gc_min_interval;
1: -	int ip6_rt_gc_timeout;
1: -	int ip6_rt_gc_interval;
1: -	int ip6_rt_gc_elasticity;
1: -	int ip6_rt_mtu_expires;
1: -	int ip6_rt_min_advmss;
1: -	int multipath_hash_policy;
1: -	int flowlabel_consistency;
1: -	int auto_flowlabels;
1: -	int icmpv6_time;
1: -	int icmpv6_echo_ignore_all;
1: -	int icmpv6_echo_ignore_multicast;
1: -	int icmpv6_echo_ignore_anycast;
1: -	long unsigned int icmpv6_ratemask[4];
1: -	long unsigned int *icmpv6_ratemask_ptr;
1: -	int anycast_src_echo_reply;
1: -	int ip_nonlocal_bind;
1: -	int fwmark_reflect;
1: -	int idgen_retries;
1: -	int idgen_delay;
1: -	int flowlabel_state_ranges;
1: -	int flowlabel_reflect;
1: -	int max_dst_opts_cnt;
1: -	int max_hbh_opts_cnt;
1: -	int max_dst_opts_len;
1: -	int max_hbh_opts_len;
1: -	int seg6_flowlabel;
1: -	bool skip_notify_on_dev_down;
1: +  struct ctl_table_header *hdr;
1: +  struct ctl_table_header *route_hdr;
1: +  struct ctl_table_header *icmp_hdr;
1: +  struct ctl_table_header *frags_hdr;
1: +  struct ctl_table_header *xfrm6_hdr;
1: +  int bindv6only;
1: +  int flush_delay;
1: +  int ip6_rt_max_size;
1: +  int ip6_rt_gc_min_interval;
1: +  int ip6_rt_gc_timeout;
1: +  int ip6_rt_gc_interval;
1: +  int ip6_rt_gc_elasticity;
1: +  int ip6_rt_mtu_expires;
1: +  int ip6_rt_min_advmss;
1: +  int multipath_hash_policy;
1: +  int flowlabel_consistency;
1: +  int auto_flowlabels;
1: +  int icmpv6_time;
1: +  int icmpv6_echo_ignore_all;
1: +  int icmpv6_echo_ignore_multicast;
1: +  int icmpv6_echo_ignore_anycast;
1: +  long unsigned int icmpv6_ratemask[4];
1: +  long unsigned int *icmpv6_ratemask_ptr;
1: +  int anycast_src_echo_reply;
1: +  int ip_nonlocal_bind;
1: +  int fwmark_reflect;
1: +  int idgen_retries;
1: +  int idgen_delay;
1: +  int flowlabel_state_ranges;
1: +  int flowlabel_reflect;
1: +  int max_dst_opts_cnt;
1: +  int max_hbh_opts_cnt;
1: +  int max_dst_opts_len;
1: +  int max_hbh_opts_len;
1: +  int seg6_flowlabel;
1: +  bool skip_notify_on_dev_down;
1:  };
1:  
1:  struct net_device;
1: @@ -9426,25 +9498,27 @@ struct net_device;
1:  struct neighbour;
1:  
1:  struct dst_ops {
1: -	short unsigned int family;
1: -	unsigned int gc_thresh;
1: -	int (*gc)(struct dst_ops *);
1: -	struct dst_entry * (*check)(struct dst_entry *, __u32);
1: -	unsigned int (*default_advmss)(const struct dst_entry *);
1: -	unsigned int (*mtu)(const struct dst_entry *);
1: -	u32 * (*cow_metrics)(struct dst_entry *, long unsigned int);
1: -	void (*destroy)(struct dst_entry *);
1: -	void (*ifdown)(struct dst_entry *, struct net_device *, int);
1: -	struct dst_entry * (*negative_advice)(struct dst_entry *);
1: -	void (*link_failure)(struct sk_buff *);
1: -	void (*update_pmtu)(struct dst_entry *, struct sock *, struct sk_buff *, u32, bool);
1: -	void (*redirect)(struct dst_entry *, struct sock *, struct sk_buff *);
1: -	int (*local_out)(struct net *, struct sock *, struct sk_buff *);
1: -	struct neighbour * (*neigh_lookup)(const struct dst_entry *, struct sk_buff *, const void *);
1: -	void (*confirm_neigh)(const struct dst_entry *, const void *);
1: -	struct kmem_cache *kmem_cachep;
1: -	struct percpu_counter pcpuc_entries;
1: -	long: 64;
1: +  short unsigned int family;
1: +  unsigned int gc_thresh;
1: +  int (*gc)(struct dst_ops *);
1: +  struct dst_entry *(*check)(struct dst_entry *, __u32);
1: +  unsigned int (*default_advmss)(const struct dst_entry *);
1: +  unsigned int (*mtu)(const struct dst_entry *);
1: +  u32 *(*cow_metrics)(struct dst_entry *, long unsigned int);
1: +  void (*destroy)(struct dst_entry *);
1: +  void (*ifdown)(struct dst_entry *, struct net_device *, int);
1: +  struct dst_entry *(*negative_advice)(struct dst_entry *);
1: +  void (*link_failure)(struct sk_buff *);
1: +  void (*update_pmtu)(struct dst_entry *, struct sock *, struct sk_buff *, u32,
1: +                      bool);
1: +  void (*redirect)(struct dst_entry *, struct sock *, struct sk_buff *);
1: +  int (*local_out)(struct net *, struct sock *, struct sk_buff *);
1: +  struct neighbour *(*neigh_lookup)(const struct dst_entry *, struct sk_buff *,
1: +                                    const void *);
1: +  void (*confirm_neigh)(const struct dst_entry *, const void *);
1: +  struct kmem_cache *kmem_cachep;
1: +  struct percpu_counter pcpuc_entries;
1: +  long : 64;
1:  };
1:  
1:  struct ipv6_devconf;
1: @@ -9460,111 +9534,111 @@ struct fib6_table;
1:  struct seg6_pernet_data;
1:  
1:  struct netns_ipv6 {
1: -	struct netns_sysctl_ipv6 sysctl;
1: -	struct ipv6_devconf *devconf_all;
1: -	struct ipv6_devconf *devconf_dflt;
1: -	struct inet_peer_base *peers;
1: -	struct fqdir *fqdir;
1: -	struct xt_table *ip6table_filter;
1: -	struct xt_table *ip6table_mangle;
1: -	struct xt_table *ip6table_raw;
1: -	struct xt_table *ip6table_security;
1: -	struct xt_table *ip6table_nat;
1: -	struct fib6_info *fib6_null_entry;
1: -	struct rt6_info *ip6_null_entry;
1: -	struct rt6_statistics *rt6_stats;
1: -	struct timer_list ip6_fib_timer;
1: -	struct hlist_head *fib_table_hash;
1: -	struct fib6_table *fib6_main_tbl;
1: -	struct list_head fib6_walkers;
1: -	long: 64;
1: -	long: 64;
1: -	struct dst_ops ip6_dst_ops;
1: -	rwlock_t fib6_walker_lock;
1: -	spinlock_t fib6_gc_lock;
1: -	unsigned int ip6_rt_gc_expire;
1: -	long unsigned int ip6_rt_last_gc;
1: -	unsigned int fib6_rules_require_fldissect;
1: -	bool fib6_has_custom_rules;
1: -	unsigned int fib6_routes_require_src;
1: -	struct rt6_info *ip6_prohibit_entry;
1: -	struct rt6_info *ip6_blk_hole_entry;
1: -	struct fib6_table *fib6_local_tbl;
1: -	struct fib_rules_ops *fib6_rules_ops;
1: -	struct sock **icmp_sk;
1: -	struct sock *ndisc_sk;
1: -	struct sock *tcp_sk;
1: -	struct sock *igmp_sk;
1: -	struct sock *mc_autojoin_sk;
1: -	atomic_t dev_addr_genid;
1: -	atomic_t fib6_sernum;
1: -	struct seg6_pernet_data *seg6_data;
1: -	struct fib_notifier_ops *notifier_ops;
1: -	struct fib_notifier_ops *ip6mr_notifier_ops;
1: -	unsigned int ipmr_seq;
1: -	struct {
1: -		struct hlist_head head;
1: -		spinlock_t lock;
1: -		u32 seq;
1: -	} ip6addrlbl_table;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct netns_sysctl_ipv6 sysctl;
1: +  struct ipv6_devconf *devconf_all;
1: +  struct ipv6_devconf *devconf_dflt;
1: +  struct inet_peer_base *peers;
1: +  struct fqdir *fqdir;
1: +  struct xt_table *ip6table_filter;
1: +  struct xt_table *ip6table_mangle;
1: +  struct xt_table *ip6table_raw;
1: +  struct xt_table *ip6table_security;
1: +  struct xt_table *ip6table_nat;
1: +  struct fib6_info *fib6_null_entry;
1: +  struct rt6_info *ip6_null_entry;
1: +  struct rt6_statistics *rt6_stats;
1: +  struct timer_list ip6_fib_timer;
1: +  struct hlist_head *fib_table_hash;
1: +  struct fib6_table *fib6_main_tbl;
1: +  struct list_head fib6_walkers;
1: +  long : 64;
1: +  long : 64;
1: +  struct dst_ops ip6_dst_ops;
1: +  rwlock_t fib6_walker_lock;
1: +  spinlock_t fib6_gc_lock;
1: +  unsigned int ip6_rt_gc_expire;
1: +  long unsigned int ip6_rt_last_gc;
1: +  unsigned int fib6_rules_require_fldissect;
1: +  bool fib6_has_custom_rules;
1: +  unsigned int fib6_routes_require_src;
1: +  struct rt6_info *ip6_prohibit_entry;
1: +  struct rt6_info *ip6_blk_hole_entry;
1: +  struct fib6_table *fib6_local_tbl;
1: +  struct fib_rules_ops *fib6_rules_ops;
1: +  struct sock **icmp_sk;
1: +  struct sock *ndisc_sk;
1: +  struct sock *tcp_sk;
1: +  struct sock *igmp_sk;
1: +  struct sock *mc_autojoin_sk;
1: +  atomic_t dev_addr_genid;
1: +  atomic_t fib6_sernum;
1: +  struct seg6_pernet_data *seg6_data;
1: +  struct fib_notifier_ops *notifier_ops;
1: +  struct fib_notifier_ops *ip6mr_notifier_ops;
1: +  unsigned int ipmr_seq;
1: +  struct {
1: +    struct hlist_head head;
1: +    spinlock_t lock;
1: +    u32 seq;
1: +  } ip6addrlbl_table;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sctp_mib;
1:  
1:  struct netns_sctp {
1: -	struct sctp_mib *sctp_statistics;
1: -	struct proc_dir_entry *proc_net_sctp;
1: -	struct ctl_table_header *sysctl_header;
1: -	struct sock *ctl_sock;
1: -	struct sock *udp4_sock;
1: -	struct sock *udp6_sock;
1: -	int udp_port;
1: -	int encap_port;
1: -	struct list_head local_addr_list;
1: -	struct list_head addr_waitq;
1: -	struct timer_list addr_wq_timer;
1: -	struct list_head auto_asconf_splist;
1: -	spinlock_t addr_wq_lock;
1: -	spinlock_t local_addr_lock;
1: -	unsigned int rto_initial;
1: -	unsigned int rto_min;
1: -	unsigned int rto_max;
1: -	int rto_alpha;
1: -	int rto_beta;
1: -	int max_burst;
1: -	int cookie_preserve_enable;
1: -	char *sctp_hmac_alg;
1: -	unsigned int valid_cookie_life;
1: -	unsigned int sack_timeout;
1: -	unsigned int hb_interval;
1: -	int max_retrans_association;
1: -	int max_retrans_path;
1: -	int max_retrans_init;
1: -	int pf_retrans;
1: -	int ps_retrans;
1: -	int pf_enable;
1: -	int pf_expose;
1: -	int sndbuf_policy;
1: -	int rcvbuf_policy;
1: -	int default_auto_asconf;
1: -	int addip_enable;
1: -	int addip_noauth;
1: -	int prsctp_enable;
1: -	int reconf_enable;
1: -	int auth_enable;
1: -	int intl_enable;
1: -	int ecn_enable;
1: -	int scope_policy;
1: -	int rwnd_upd_shift;
1: -	long unsigned int max_autoclose;
1: +  struct sctp_mib *sctp_statistics;
1: +  struct proc_dir_entry *proc_net_sctp;
1: +  struct ctl_table_header *sysctl_header;
1: +  struct sock *ctl_sock;
1: +  struct sock *udp4_sock;
1: +  struct sock *udp6_sock;
1: +  int udp_port;
1: +  int encap_port;
1: +  struct list_head local_addr_list;
1: +  struct list_head addr_waitq;
1: +  struct timer_list addr_wq_timer;
1: +  struct list_head auto_asconf_splist;
1: +  spinlock_t addr_wq_lock;
1: +  spinlock_t local_addr_lock;
1: +  unsigned int rto_initial;
1: +  unsigned int rto_min;
1: +  unsigned int rto_max;
1: +  int rto_alpha;
1: +  int rto_beta;
1: +  int max_burst;
1: +  int cookie_preserve_enable;
1: +  char *sctp_hmac_alg;
1: +  unsigned int valid_cookie_life;
1: +  unsigned int sack_timeout;
1: +  unsigned int hb_interval;
1: +  int max_retrans_association;
1: +  int max_retrans_path;
1: +  int max_retrans_init;
1: +  int pf_retrans;
1: +  int ps_retrans;
1: +  int pf_enable;
1: +  int pf_expose;
1: +  int sndbuf_policy;
1: +  int rcvbuf_policy;
1: +  int default_auto_asconf;
1: +  int addip_enable;
1: +  int addip_noauth;
1: +  int prsctp_enable;
1: +  int reconf_enable;
1: +  int auth_enable;
1: +  int intl_enable;
1: +  int ecn_enable;
1: +  int scope_policy;
1: +  int rwnd_upd_shift;
1: +  long unsigned int max_autoclose;
1:  };
1:  
1:  struct netns_dccp {
1: -	struct sock *v4_ctl_sk;
1: -	struct sock *v6_ctl_sk;
1: +  struct sock *v4_ctl_sk;
1: +  struct sock *v6_ctl_sk;
1:  };
1:  
1:  struct nf_queue_handler;
1: @@ -9574,90 +9648,90 @@ struct nf_logger;
1:  struct nf_hook_entries;
1:  
1:  struct netns_nf {
1: -	struct proc_dir_entry *proc_netfilter;
1: -	const struct nf_queue_handler *queue_handler;
1: -	const struct nf_logger *nf_loggers[13];
1: -	struct ctl_table_header *nf_log_dir_header;
1: -	struct nf_hook_entries *hooks_ipv4[5];
1: -	struct nf_hook_entries *hooks_ipv6[5];
1: -	struct nf_hook_entries *hooks_arp[3];
1: -	struct nf_hook_entries *hooks_bridge[5];
1: -	struct nf_hook_entries *hooks_decnet[7];
1: -	bool defrag_ipv6;
1: +  struct proc_dir_entry *proc_netfilter;
1: +  const struct nf_queue_handler *queue_handler;
1: +  const struct nf_logger *nf_loggers[13];
1: +  struct ctl_table_header *nf_log_dir_header;
1: +  struct nf_hook_entries *hooks_ipv4[5];
1: +  struct nf_hook_entries *hooks_ipv6[5];
1: +  struct nf_hook_entries *hooks_arp[3];
1: +  struct nf_hook_entries *hooks_bridge[5];
1: +  struct nf_hook_entries *hooks_decnet[7];
1: +  bool defrag_ipv6;
1:  };
1:  
1:  struct ebt_table;
1:  
1:  struct netns_xt {
1: -	struct list_head tables[13];
1: -	bool notrack_deprecated_warning;
1: -	bool clusterip_deprecated_warning;
1: -	struct ebt_table *broute_table;
1: -	struct ebt_table *frame_filter;
1: -	struct ebt_table *frame_nat;
1: +  struct list_head tables[13];
1: +  bool notrack_deprecated_warning;
1: +  bool clusterip_deprecated_warning;
1: +  struct ebt_table *broute_table;
1: +  struct ebt_table *frame_filter;
1: +  struct ebt_table *frame_nat;
1:  };
1:  
1:  struct netns_nf_frag {
1: -	struct fqdir *fqdir;
1: +  struct fqdir *fqdir;
1:  };
1:  
1:  struct netns_bpf {
1: -	struct bpf_prog_array *run_array[2];
1: -	struct bpf_prog *progs[2];
1: -	struct list_head links[2];
1: +  struct bpf_prog_array *run_array[2];
1: +  struct bpf_prog *progs[2];
1: +  struct list_head links[2];
1:  };
1:  
1:  struct xfrm_policy_hash {
1: -	struct hlist_head *table;
1: -	unsigned int hmask;
1: -	u8 dbits4;
1: -	u8 sbits4;
1: -	u8 dbits6;
1: -	u8 sbits6;
1: +  struct hlist_head *table;
1: +  unsigned int hmask;
1: +  u8 dbits4;
1: +  u8 sbits4;
1: +  u8 dbits6;
1: +  u8 sbits6;
1:  };
1:  
1:  struct xfrm_policy_hthresh {
1: -	struct work_struct work;
1: -	seqlock_t lock;
1: -	u8 lbits4;
1: -	u8 rbits4;
1: -	u8 lbits6;
1: -	u8 rbits6;
1: +  struct work_struct work;
1: +  seqlock_t lock;
1: +  u8 lbits4;
1: +  u8 rbits4;
1: +  u8 lbits6;
1: +  u8 rbits6;
1:  };
1:  
1:  struct netns_xfrm {
1: -	struct list_head state_all;
1: -	struct hlist_head *state_bydst;
1: -	struct hlist_head *state_bysrc;
1: -	struct hlist_head *state_byspi;
1: -	unsigned int state_hmask;
1: -	unsigned int state_num;
1: -	struct work_struct state_hash_work;
1: -	struct list_head policy_all;
1: -	struct hlist_head *policy_byidx;
1: -	unsigned int policy_idx_hmask;
1: -	struct hlist_head policy_inexact[3];
1: -	struct xfrm_policy_hash policy_bydst[3];
1: -	unsigned int policy_count[6];
1: -	struct work_struct policy_hash_work;
1: -	struct xfrm_policy_hthresh policy_hthresh;
1: -	struct list_head inexact_bins;
1: -	struct sock *nlsk;
1: -	struct sock *nlsk_stash;
1: -	u32 sysctl_aevent_etime;
1: -	u32 sysctl_aevent_rseqth;
1: -	int sysctl_larval_drop;
1: -	u32 sysctl_acq_expires;
1: -	struct ctl_table_header *sysctl_hdr;
1: -	long: 64;
1: -	long: 64;
1: -	struct dst_ops xfrm4_dst_ops;
1: -	struct dst_ops xfrm6_dst_ops;
1: -	spinlock_t xfrm_state_lock;
1: -	spinlock_t xfrm_policy_lock;
1: -	struct mutex xfrm_cfg_mutex;
1: -	long: 64;
1: -	long: 64;
1: +  struct list_head state_all;
1: +  struct hlist_head *state_bydst;
1: +  struct hlist_head *state_bysrc;
1: +  struct hlist_head *state_byspi;
1: +  unsigned int state_hmask;
1: +  unsigned int state_num;
1: +  struct work_struct state_hash_work;
1: +  struct list_head policy_all;
1: +  struct hlist_head *policy_byidx;
1: +  unsigned int policy_idx_hmask;
1: +  struct hlist_head policy_inexact[3];
1: +  struct xfrm_policy_hash policy_bydst[3];
1: +  unsigned int policy_count[6];
1: +  struct work_struct policy_hash_work;
1: +  struct xfrm_policy_hthresh policy_hthresh;
1: +  struct list_head inexact_bins;
1: +  struct sock *nlsk;
1: +  struct sock *nlsk_stash;
1: +  u32 sysctl_aevent_etime;
1: +  u32 sysctl_aevent_rseqth;
1: +  int sysctl_larval_drop;
1: +  u32 sysctl_acq_expires;
1: +  struct ctl_table_header *sysctl_hdr;
1: +  long : 64;
1: +  long : 64;
1: +  struct dst_ops xfrm4_dst_ops;
1: +  struct dst_ops xfrm6_dst_ops;
1: +  spinlock_t xfrm_state_lock;
1: +  spinlock_t xfrm_policy_lock;
1: +  struct mutex xfrm_cfg_mutex;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct netns_ipvs;
1: @@ -9665,16 +9739,16 @@ struct netns_ipvs;
1:  struct mpls_route;
1:  
1:  struct netns_mpls {
1: -	int ip_ttl_propagate;
1: -	int default_ttl;
1: -	size_t platform_labels;
1: -	struct mpls_route **platform_label;
1: -	struct ctl_table_header *ctl;
1: +  int ip_ttl_propagate;
1: +  int default_ttl;
1: +  size_t platform_labels;
1: +  struct mpls_route **platform_label;
1: +  struct ctl_table_header *ctl;
1:  };
1:  
1:  struct netns_xdp {
1: -	struct mutex lock;
1: -	struct hlist_head list;
1: +  struct mutex lock;
1: +  struct hlist_head list;
1:  };
1:  
1:  struct uevent_sock;
1: @@ -9682,367 +9756,365 @@ struct uevent_sock;
1:  struct net_generic;
1:  
1:  struct net {
1: -	refcount_t passive;
1: -	refcount_t count;
1: -	spinlock_t rules_mod_lock;
1: -	unsigned int dev_unreg_count;
1: -	unsigned int dev_base_seq;
1: -	int ifindex;
1: -	spinlock_t nsid_lock;
1: -	atomic_t fnhe_genid;
1: -	struct list_head list;
1: -	struct list_head exit_list;
1: -	struct llist_node cleanup_list;
1: -	struct key_tag *key_domain;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	struct idr netns_ids;
1: -	struct ns_common ns;
1: -	struct list_head dev_base_head;
1: -	struct proc_dir_entry *proc_net;
1: -	struct proc_dir_entry *proc_net_stat;
1: -	struct ctl_table_set sysctls;
1: -	struct sock *rtnl;
1: -	struct sock *genl_sock;
1: -	struct uevent_sock *uevent_sock;
1: -	struct hlist_head *dev_name_head;
1: -	struct hlist_head *dev_index_head;
1: -	struct raw_notifier_head netdev_chain;
1: -	u32 hash_mix;
1: -	struct net_device *loopback_dev;
1: -	struct list_head rules_ops;
1: -	struct netns_core core;
1: -	struct netns_mib mib;
1: -	struct netns_packet packet;
1: -	struct netns_unix unx;
1: -	struct netns_nexthop nexthop;
1: -	long: 64;
1: -	long: 64;
1: -	struct netns_ipv4 ipv4;
1: -	struct netns_ipv6 ipv6;
1: -	struct netns_sctp sctp;
1: -	struct netns_dccp dccp;
1: -	struct netns_nf nf;
1: -	struct netns_xt xt;
1: -	struct netns_nf_frag nf_frag;
1: -	struct ctl_table_header *nf_frag_frags_hdr;
1: -	struct sock *nfnl;
1: -	struct sock *nfnl_stash;
1: -	struct net_generic *gen;
1: -	struct netns_bpf bpf;
1: -	struct netns_xfrm xfrm;
1: -	atomic64_t net_cookie;
1: -	struct netns_ipvs *ipvs;
1: -	struct netns_mpls mpls;
1: -	struct netns_xdp xdp;
1: -	struct sock *diag_nlsk;
1: -};
1: -
1: -typedef struct {
1: -	local64_t v;
1: -} u64_stats_t;
1: +  refcount_t passive;
1: +  refcount_t count;
1: +  spinlock_t rules_mod_lock;
1: +  unsigned int dev_unreg_count;
1: +  unsigned int dev_base_seq;
1: +  int ifindex;
1: +  spinlock_t nsid_lock;
1: +  atomic_t fnhe_genid;
1: +  struct list_head list;
1: +  struct list_head exit_list;
1: +  struct llist_node cleanup_list;
1: +  struct key_tag *key_domain;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  struct idr netns_ids;
1: +  struct ns_common ns;
1: +  struct list_head dev_base_head;
1: +  struct proc_dir_entry *proc_net;
1: +  struct proc_dir_entry *proc_net_stat;
1: +  struct ctl_table_set sysctls;
1: +  struct sock *rtnl;
1: +  struct sock *genl_sock;
1: +  struct uevent_sock *uevent_sock;
1: +  struct hlist_head *dev_name_head;
1: +  struct hlist_head *dev_index_head;
1: +  struct raw_notifier_head netdev_chain;
1: +  u32 hash_mix;
1: +  struct net_device *loopback_dev;
1: +  struct list_head rules_ops;
1: +  struct netns_core core;
1: +  struct netns_mib mib;
1: +  struct netns_packet packet;
1: +  struct netns_unix unx;
1: +  struct netns_nexthop nexthop;
1: +  long : 64;
1: +  long : 64;
1: +  struct netns_ipv4 ipv4;
1: +  struct netns_ipv6 ipv6;
1: +  struct netns_sctp sctp;
1: +  struct netns_dccp dccp;
1: +  struct netns_nf nf;
1: +  struct netns_xt xt;
1: +  struct netns_nf_frag nf_frag;
1: +  struct ctl_table_header *nf_frag_frags_hdr;
1: +  struct sock *nfnl;
1: +  struct sock *nfnl_stash;
1: +  struct net_generic *gen;
1: +  struct netns_bpf bpf;
1: +  struct netns_xfrm xfrm;
1: +  atomic64_t net_cookie;
1: +  struct netns_ipvs *ipvs;
1: +  struct netns_mpls mpls;
1: +  struct netns_xdp xdp;
1: +  struct sock *diag_nlsk;
1: +};
1: +
1: +typedef struct { local64_t v; } u64_stats_t;
1:  
1:  struct bpf_insn {
1: -	__u8 code;
1: -	__u8 dst_reg: 4;
1: -	__u8 src_reg: 4;
1: -	__s16 off;
1: -	__s32 imm;
1: +  __u8 code;
1: +  __u8 dst_reg : 4;
1: +  __u8 src_reg : 4;
1: +  __s16 off;
1: +  __s32 imm;
1:  };
1:  
1:  enum bpf_map_type {
1: -	BPF_MAP_TYPE_UNSPEC = 0,
1: -	BPF_MAP_TYPE_HASH = 1,
1: -	BPF_MAP_TYPE_ARRAY = 2,
1: -	BPF_MAP_TYPE_PROG_ARRAY = 3,
1: -	BPF_MAP_TYPE_PERF_EVENT_ARRAY = 4,
1: -	BPF_MAP_TYPE_PERCPU_HASH = 5,
1: -	BPF_MAP_TYPE_PERCPU_ARRAY = 6,
1: -	BPF_MAP_TYPE_STACK_TRACE = 7,
1: -	BPF_MAP_TYPE_CGROUP_ARRAY = 8,
1: -	BPF_MAP_TYPE_LRU_HASH = 9,
1: -	BPF_MAP_TYPE_LRU_PERCPU_HASH = 10,
1: -	BPF_MAP_TYPE_LPM_TRIE = 11,
1: -	BPF_MAP_TYPE_ARRAY_OF_MAPS = 12,
1: -	BPF_MAP_TYPE_HASH_OF_MAPS = 13,
1: -	BPF_MAP_TYPE_DEVMAP = 14,
1: -	BPF_MAP_TYPE_SOCKMAP = 15,
1: -	BPF_MAP_TYPE_CPUMAP = 16,
1: -	BPF_MAP_TYPE_XSKMAP = 17,
1: -	BPF_MAP_TYPE_SOCKHASH = 18,
1: -	BPF_MAP_TYPE_CGROUP_STORAGE = 19,
1: -	BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 20,
1: -	BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 21,
1: -	BPF_MAP_TYPE_QUEUE = 22,
1: -	BPF_MAP_TYPE_STACK = 23,
1: -	BPF_MAP_TYPE_SK_STORAGE = 24,
1: -	BPF_MAP_TYPE_DEVMAP_HASH = 25,
1: -	BPF_MAP_TYPE_STRUCT_OPS = 26,
1: -	BPF_MAP_TYPE_RINGBUF = 27,
1: -	BPF_MAP_TYPE_INODE_STORAGE = 28,
1: -	BPF_MAP_TYPE_TASK_STORAGE = 29,
1: +  BPF_MAP_TYPE_UNSPEC = 0,
1: +  BPF_MAP_TYPE_HASH = 1,
1: +  BPF_MAP_TYPE_ARRAY = 2,
1: +  BPF_MAP_TYPE_PROG_ARRAY = 3,
1: +  BPF_MAP_TYPE_PERF_EVENT_ARRAY = 4,
1: +  BPF_MAP_TYPE_PERCPU_HASH = 5,
1: +  BPF_MAP_TYPE_PERCPU_ARRAY = 6,
1: +  BPF_MAP_TYPE_STACK_TRACE = 7,
1: +  BPF_MAP_TYPE_CGROUP_ARRAY = 8,
1: +  BPF_MAP_TYPE_LRU_HASH = 9,
1: +  BPF_MAP_TYPE_LRU_PERCPU_HASH = 10,
1: +  BPF_MAP_TYPE_LPM_TRIE = 11,
1: +  BPF_MAP_TYPE_ARRAY_OF_MAPS = 12,
1: +  BPF_MAP_TYPE_HASH_OF_MAPS = 13,
1: +  BPF_MAP_TYPE_DEVMAP = 14,
1: +  BPF_MAP_TYPE_SOCKMAP = 15,
1: +  BPF_MAP_TYPE_CPUMAP = 16,
1: +  BPF_MAP_TYPE_XSKMAP = 17,
1: +  BPF_MAP_TYPE_SOCKHASH = 18,
1: +  BPF_MAP_TYPE_CGROUP_STORAGE = 19,
1: +  BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 20,
1: +  BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 21,
1: +  BPF_MAP_TYPE_QUEUE = 22,
1: +  BPF_MAP_TYPE_STACK = 23,
1: +  BPF_MAP_TYPE_SK_STORAGE = 24,
1: +  BPF_MAP_TYPE_DEVMAP_HASH = 25,
1: +  BPF_MAP_TYPE_STRUCT_OPS = 26,
1: +  BPF_MAP_TYPE_RINGBUF = 27,
1: +  BPF_MAP_TYPE_INODE_STORAGE = 28,
1: +  BPF_MAP_TYPE_TASK_STORAGE = 29,
1:  };
1:  
1:  enum bpf_prog_type {
1: -	BPF_PROG_TYPE_UNSPEC = 0,
1: -	BPF_PROG_TYPE_SOCKET_FILTER = 1,
1: -	BPF_PROG_TYPE_KPROBE = 2,
1: -	BPF_PROG_TYPE_SCHED_CLS = 3,
1: -	BPF_PROG_TYPE_SCHED_ACT = 4,
1: -	BPF_PROG_TYPE_TRACEPOINT = 5,
1: -	BPF_PROG_TYPE_XDP = 6,
1: -	BPF_PROG_TYPE_PERF_EVENT = 7,
1: -	BPF_PROG_TYPE_CGROUP_SKB = 8,
1: -	BPF_PROG_TYPE_CGROUP_SOCK = 9,
1: -	BPF_PROG_TYPE_LWT_IN = 10,
1: -	BPF_PROG_TYPE_LWT_OUT = 11,
1: -	BPF_PROG_TYPE_LWT_XMIT = 12,
1: -	BPF_PROG_TYPE_SOCK_OPS = 13,
1: -	BPF_PROG_TYPE_SK_SKB = 14,
1: -	BPF_PROG_TYPE_CGROUP_DEVICE = 15,
1: -	BPF_PROG_TYPE_SK_MSG = 16,
1: -	BPF_PROG_TYPE_RAW_TRACEPOINT = 17,
1: -	BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 18,
1: -	BPF_PROG_TYPE_LWT_SEG6LOCAL = 19,
1: -	BPF_PROG_TYPE_LIRC_MODE2 = 20,
1: -	BPF_PROG_TYPE_SK_REUSEPORT = 21,
1: -	BPF_PROG_TYPE_FLOW_DISSECTOR = 22,
1: -	BPF_PROG_TYPE_CGROUP_SYSCTL = 23,
1: -	BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE = 24,
1: -	BPF_PROG_TYPE_CGROUP_SOCKOPT = 25,
1: -	BPF_PROG_TYPE_TRACING = 26,
1: -	BPF_PROG_TYPE_STRUCT_OPS = 27,
1: -	BPF_PROG_TYPE_EXT = 28,
1: -	BPF_PROG_TYPE_LSM = 29,
1: -	BPF_PROG_TYPE_SK_LOOKUP = 30,
1: +  BPF_PROG_TYPE_UNSPEC = 0,
1: +  BPF_PROG_TYPE_SOCKET_FILTER = 1,
1: +  BPF_PROG_TYPE_KPROBE = 2,
1: +  BPF_PROG_TYPE_SCHED_CLS = 3,
1: +  BPF_PROG_TYPE_SCHED_ACT = 4,
1: +  BPF_PROG_TYPE_TRACEPOINT = 5,
1: +  BPF_PROG_TYPE_XDP = 6,
1: +  BPF_PROG_TYPE_PERF_EVENT = 7,
1: +  BPF_PROG_TYPE_CGROUP_SKB = 8,
1: +  BPF_PROG_TYPE_CGROUP_SOCK = 9,
1: +  BPF_PROG_TYPE_LWT_IN = 10,
1: +  BPF_PROG_TYPE_LWT_OUT = 11,
1: +  BPF_PROG_TYPE_LWT_XMIT = 12,
1: +  BPF_PROG_TYPE_SOCK_OPS = 13,
1: +  BPF_PROG_TYPE_SK_SKB = 14,
1: +  BPF_PROG_TYPE_CGROUP_DEVICE = 15,
1: +  BPF_PROG_TYPE_SK_MSG = 16,
1: +  BPF_PROG_TYPE_RAW_TRACEPOINT = 17,
1: +  BPF_PROG_TYPE_CGROUP_SOCK_ADDR = 18,
1: +  BPF_PROG_TYPE_LWT_SEG6LOCAL = 19,
1: +  BPF_PROG_TYPE_LIRC_MODE2 = 20,
1: +  BPF_PROG_TYPE_SK_REUSEPORT = 21,
1: +  BPF_PROG_TYPE_FLOW_DISSECTOR = 22,
1: +  BPF_PROG_TYPE_CGROUP_SYSCTL = 23,
1: +  BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE = 24,
1: +  BPF_PROG_TYPE_CGROUP_SOCKOPT = 25,
1: +  BPF_PROG_TYPE_TRACING = 26,
1: +  BPF_PROG_TYPE_STRUCT_OPS = 27,
1: +  BPF_PROG_TYPE_EXT = 28,
1: +  BPF_PROG_TYPE_LSM = 29,
1: +  BPF_PROG_TYPE_SK_LOOKUP = 30,
1:  };
1:  
1:  enum bpf_attach_type {
1: -	BPF_CGROUP_INET_INGRESS = 0,
1: -	BPF_CGROUP_INET_EGRESS = 1,
1: -	BPF_CGROUP_INET_SOCK_CREATE = 2,
1: -	BPF_CGROUP_SOCK_OPS = 3,
1: -	BPF_SK_SKB_STREAM_PARSER = 4,
1: -	BPF_SK_SKB_STREAM_VERDICT = 5,
1: -	BPF_CGROUP_DEVICE = 6,
1: -	BPF_SK_MSG_VERDICT = 7,
1: -	BPF_CGROUP_INET4_BIND = 8,
1: -	BPF_CGROUP_INET6_BIND = 9,
1: -	BPF_CGROUP_INET4_CONNECT = 10,
1: -	BPF_CGROUP_INET6_CONNECT = 11,
1: -	BPF_CGROUP_INET4_POST_BIND = 12,
1: -	BPF_CGROUP_INET6_POST_BIND = 13,
1: -	BPF_CGROUP_UDP4_SENDMSG = 14,
1: -	BPF_CGROUP_UDP6_SENDMSG = 15,
1: -	BPF_LIRC_MODE2 = 16,
1: -	BPF_FLOW_DISSECTOR = 17,
1: -	BPF_CGROUP_SYSCTL = 18,
1: -	BPF_CGROUP_UDP4_RECVMSG = 19,
1: -	BPF_CGROUP_UDP6_RECVMSG = 20,
1: -	BPF_CGROUP_GETSOCKOPT = 21,
1: -	BPF_CGROUP_SETSOCKOPT = 22,
1: -	BPF_TRACE_RAW_TP = 23,
1: -	BPF_TRACE_FENTRY = 24,
1: -	BPF_TRACE_FEXIT = 25,
1: -	BPF_MODIFY_RETURN = 26,
1: -	BPF_LSM_MAC = 27,
1: -	BPF_TRACE_ITER = 28,
1: -	BPF_CGROUP_INET4_GETPEERNAME = 29,
1: -	BPF_CGROUP_INET6_GETPEERNAME = 30,
1: -	BPF_CGROUP_INET4_GETSOCKNAME = 31,
1: -	BPF_CGROUP_INET6_GETSOCKNAME = 32,
1: -	BPF_XDP_DEVMAP = 33,
1: -	BPF_CGROUP_INET_SOCK_RELEASE = 34,
1: -	BPF_XDP_CPUMAP = 35,
1: -	BPF_SK_LOOKUP = 36,
1: -	BPF_XDP = 37,
1: -	__MAX_BPF_ATTACH_TYPE = 38,
1: +  BPF_CGROUP_INET_INGRESS = 0,
1: +  BPF_CGROUP_INET_EGRESS = 1,
1: +  BPF_CGROUP_INET_SOCK_CREATE = 2,
1: +  BPF_CGROUP_SOCK_OPS = 3,
1: +  BPF_SK_SKB_STREAM_PARSER = 4,
1: +  BPF_SK_SKB_STREAM_VERDICT = 5,
1: +  BPF_CGROUP_DEVICE = 6,
1: +  BPF_SK_MSG_VERDICT = 7,
1: +  BPF_CGROUP_INET4_BIND = 8,
1: +  BPF_CGROUP_INET6_BIND = 9,
1: +  BPF_CGROUP_INET4_CONNECT = 10,
1: +  BPF_CGROUP_INET6_CONNECT = 11,
1: +  BPF_CGROUP_INET4_POST_BIND = 12,
1: +  BPF_CGROUP_INET6_POST_BIND = 13,
1: +  BPF_CGROUP_UDP4_SENDMSG = 14,
1: +  BPF_CGROUP_UDP6_SENDMSG = 15,
1: +  BPF_LIRC_MODE2 = 16,
1: +  BPF_FLOW_DISSECTOR = 17,
1: +  BPF_CGROUP_SYSCTL = 18,
1: +  BPF_CGROUP_UDP4_RECVMSG = 19,
1: +  BPF_CGROUP_UDP6_RECVMSG = 20,
1: +  BPF_CGROUP_GETSOCKOPT = 21,
1: +  BPF_CGROUP_SETSOCKOPT = 22,
1: +  BPF_TRACE_RAW_TP = 23,
1: +  BPF_TRACE_FENTRY = 24,
1: +  BPF_TRACE_FEXIT = 25,
1: +  BPF_MODIFY_RETURN = 26,
1: +  BPF_LSM_MAC = 27,
1: +  BPF_TRACE_ITER = 28,
1: +  BPF_CGROUP_INET4_GETPEERNAME = 29,
1: +  BPF_CGROUP_INET6_GETPEERNAME = 30,
1: +  BPF_CGROUP_INET4_GETSOCKNAME = 31,
1: +  BPF_CGROUP_INET6_GETSOCKNAME = 32,
1: +  BPF_XDP_DEVMAP = 33,
1: +  BPF_CGROUP_INET_SOCK_RELEASE = 34,
1: +  BPF_XDP_CPUMAP = 35,
1: +  BPF_SK_LOOKUP = 36,
1: +  BPF_XDP = 37,
1: +  __MAX_BPF_ATTACH_TYPE = 38,
1:  };
1:  
1:  union bpf_attr {
1: -	struct {
1: -		__u32 map_type;
1: -		__u32 key_size;
1: -		__u32 value_size;
1: -		__u32 max_entries;
1: -		__u32 map_flags;
1: -		__u32 inner_map_fd;
1: -		__u32 numa_node;
1: -		char map_name[16];
1: -		__u32 map_ifindex;
1: -		__u32 btf_fd;
1: -		__u32 btf_key_type_id;
1: -		__u32 btf_value_type_id;
1: -		__u32 btf_vmlinux_value_type_id;
1: -	};
1: -	struct {
1: -		__u32 map_fd;
1: -		__u64 key;
1: -		union {
1: -			__u64 value;
1: -			__u64 next_key;
1: -		};
1: -		__u64 flags;
1: -	};
1: -	struct {
1: -		__u64 in_batch;
1: -		__u64 out_batch;
1: -		__u64 keys;
1: -		__u64 values;
1: -		__u32 count;
1: -		__u32 map_fd;
1: -		__u64 elem_flags;
1: -		__u64 flags;
1: -	} batch;
1: -	struct {
1: -		__u32 prog_type;
1: -		__u32 insn_cnt;
1: -		__u64 insns;
1: -		__u64 license;
1: -		__u32 log_level;
1: -		__u32 log_size;
1: -		__u64 log_buf;
1: -		__u32 kern_version;
1: -		__u32 prog_flags;
1: -		char prog_name[16];
1: -		__u32 prog_ifindex;
1: -		__u32 expected_attach_type;
1: -		__u32 prog_btf_fd;
1: -		__u32 func_info_rec_size;
1: -		__u64 func_info;
1: -		__u32 func_info_cnt;
1: -		__u32 line_info_rec_size;
1: -		__u64 line_info;
1: -		__u32 line_info_cnt;
1: -		__u32 attach_btf_id;
1: -		union {
1: -			__u32 attach_prog_fd;
1: -			__u32 attach_btf_obj_fd;
1: -		};
1: -	};
1: -	struct {
1: -		__u64 pathname;
1: -		__u32 bpf_fd;
1: -		__u32 file_flags;
1: -	};
1: -	struct {
1: -		__u32 target_fd;
1: -		__u32 attach_bpf_fd;
1: -		__u32 attach_type;
1: -		__u32 attach_flags;
1: -		__u32 replace_bpf_fd;
1: -	};
1: -	struct {
1: -		__u32 prog_fd;
1: -		__u32 retval;
1: -		__u32 data_size_in;
1: -		__u32 data_size_out;
1: -		__u64 data_in;
1: -		__u64 data_out;
1: -		__u32 repeat;
1: -		__u32 duration;
1: -		__u32 ctx_size_in;
1: -		__u32 ctx_size_out;
1: -		__u64 ctx_in;
1: -		__u64 ctx_out;
1: -		__u32 flags;
1: -		__u32 cpu;
1: -	} test;
1: -	struct {
1: -		union {
1: -			__u32 start_id;
1: -			__u32 prog_id;
1: -			__u32 map_id;
1: -			__u32 btf_id;
1: -			__u32 link_id;
1: -		};
1: -		__u32 next_id;
1: -		__u32 open_flags;
1: -	};
1: -	struct {
1: -		__u32 bpf_fd;
1: -		__u32 info_len;
1: -		__u64 info;
1: -	} info;
1: -	struct {
1: -		__u32 target_fd;
1: -		__u32 attach_type;
1: -		__u32 query_flags;
1: -		__u32 attach_flags;
1: -		__u64 prog_ids;
1: -		__u32 prog_cnt;
1: -	} query;
1: -	struct {
1: -		__u64 name;
1: -		__u32 prog_fd;
1: -	} raw_tracepoint;
1: -	struct {
1: -		__u64 btf;
1: -		__u64 btf_log_buf;
1: -		__u32 btf_size;
1: -		__u32 btf_log_size;
1: -		__u32 btf_log_level;
1: -	};
1: -	struct {
1: -		__u32 pid;
1: -		__u32 fd;
1: -		__u32 flags;
1: -		__u32 buf_len;
1: -		__u64 buf;
1: -		__u32 prog_id;
1: -		__u32 fd_type;
1: -		__u64 probe_offset;
1: -		__u64 probe_addr;
1: -	} task_fd_query;
1: -	struct {
1: -		__u32 prog_fd;
1: -		union {
1: -			__u32 target_fd;
1: -			__u32 target_ifindex;
1: -		};
1: -		__u32 attach_type;
1: -		__u32 flags;
1: -		union {
1: -			__u32 target_btf_id;
1: -			struct {
1: -				__u64 iter_info;
1: -				__u32 iter_info_len;
1: -			};
1: -		};
1: -	} link_create;
1: -	struct {
1: -		__u32 link_fd;
1: -		__u32 new_prog_fd;
1: -		__u32 flags;
1: -		__u32 old_prog_fd;
1: -	} link_update;
1: -	struct {
1: -		__u32 link_fd;
1: -	} link_detach;
1: -	struct {
1: -		__u32 type;
1: -	} enable_stats;
1: -	struct {
1: -		__u32 link_fd;
1: -		__u32 flags;
1: -	} iter_create;
1: -	struct {
1: -		__u32 prog_fd;
1: -		__u32 map_fd;
1: -		__u32 flags;
1: -	} prog_bind_map;
1: +  struct {
1: +    __u32 map_type;
1: +    __u32 key_size;
1: +    __u32 value_size;
1: +    __u32 max_entries;
1: +    __u32 map_flags;
1: +    __u32 inner_map_fd;
1: +    __u32 numa_node;
1: +    char map_name[16];
1: +    __u32 map_ifindex;
1: +    __u32 btf_fd;
1: +    __u32 btf_key_type_id;
1: +    __u32 btf_value_type_id;
1: +    __u32 btf_vmlinux_value_type_id;
1: +  };
1: +  struct {
1: +    __u32 map_fd;
1: +    __u64 key;
1: +    union {
1: +      __u64 value;
1: +      __u64 next_key;
1: +    };
1: +    __u64 flags;
1: +  };
1: +  struct {
1: +    __u64 in_batch;
1: +    __u64 out_batch;
1: +    __u64 keys;
1: +    __u64 values;
1: +    __u32 count;
1: +    __u32 map_fd;
1: +    __u64 elem_flags;
1: +    __u64 flags;
1: +  } batch;
1: +  struct {
1: +    __u32 prog_type;
1: +    __u32 insn_cnt;
1: +    __u64 insns;
1: +    __u64 license;
1: +    __u32 log_level;
1: +    __u32 log_size;
1: +    __u64 log_buf;
1: +    __u32 kern_version;
1: +    __u32 prog_flags;
1: +    char prog_name[16];
1: +    __u32 prog_ifindex;
1: +    __u32 expected_attach_type;
1: +    __u32 prog_btf_fd;
1: +    __u32 func_info_rec_size;
1: +    __u64 func_info;
1: +    __u32 func_info_cnt;
1: +    __u32 line_info_rec_size;
1: +    __u64 line_info;
1: +    __u32 line_info_cnt;
1: +    __u32 attach_btf_id;
1: +    union {
1: +      __u32 attach_prog_fd;
1: +      __u32 attach_btf_obj_fd;
1: +    };
1: +  };
1: +  struct {
1: +    __u64 pathname;
1: +    __u32 bpf_fd;
1: +    __u32 file_flags;
1: +  };
1: +  struct {
1: +    __u32 target_fd;
1: +    __u32 attach_bpf_fd;
1: +    __u32 attach_type;
1: +    __u32 attach_flags;
1: +    __u32 replace_bpf_fd;
1: +  };
1: +  struct {
1: +    __u32 prog_fd;
1: +    __u32 retval;
1: +    __u32 data_size_in;
1: +    __u32 data_size_out;
1: +    __u64 data_in;
1: +    __u64 data_out;
1: +    __u32 repeat;
1: +    __u32 duration;
1: +    __u32 ctx_size_in;
1: +    __u32 ctx_size_out;
1: +    __u64 ctx_in;
1: +    __u64 ctx_out;
1: +    __u32 flags;
1: +    __u32 cpu;
1: +  } test;
1: +  struct {
1: +    union {
1: +      __u32 start_id;
1: +      __u32 prog_id;
1: +      __u32 map_id;
1: +      __u32 btf_id;
1: +      __u32 link_id;
1: +    };
1: +    __u32 next_id;
1: +    __u32 open_flags;
1: +  };
1: +  struct {
1: +    __u32 bpf_fd;
1: +    __u32 info_len;
1: +    __u64 info;
1: +  } info;
1: +  struct {
1: +    __u32 target_fd;
1: +    __u32 attach_type;
1: +    __u32 query_flags;
1: +    __u32 attach_flags;
1: +    __u64 prog_ids;
1: +    __u32 prog_cnt;
1: +  } query;
1: +  struct {
1: +    __u64 name;
1: +    __u32 prog_fd;
1: +  } raw_tracepoint;
1: +  struct {
1: +    __u64 btf;
1: +    __u64 btf_log_buf;
1: +    __u32 btf_size;
1: +    __u32 btf_log_size;
1: +    __u32 btf_log_level;
1: +  };
1: +  struct {
1: +    __u32 pid;
1: +    __u32 fd;
1: +    __u32 flags;
1: +    __u32 buf_len;
1: +    __u64 buf;
1: +    __u32 prog_id;
1: +    __u32 fd_type;
1: +    __u64 probe_offset;
1: +    __u64 probe_addr;
1: +  } task_fd_query;
1: +  struct {
1: +    __u32 prog_fd;
1: +    union {
1: +      __u32 target_fd;
1: +      __u32 target_ifindex;
1: +    };
1: +    __u32 attach_type;
1: +    __u32 flags;
1: +    union {
1: +      __u32 target_btf_id;
1: +      struct {
1: +        __u64 iter_info;
1: +        __u32 iter_info_len;
1: +      };
1: +    };
1: +  } link_create;
1: +  struct {
1: +    __u32 link_fd;
1: +    __u32 new_prog_fd;
1: +    __u32 flags;
1: +    __u32 old_prog_fd;
1: +  } link_update;
1: +  struct {
1: +    __u32 link_fd;
1: +  } link_detach;
1: +  struct {
1: +    __u32 type;
1: +  } enable_stats;
1: +  struct {
1: +    __u32 link_fd;
1: +    __u32 flags;
1: +  } iter_create;
1: +  struct {
1: +    __u32 prog_fd;
1: +    __u32 map_fd;
1: +    __u32 flags;
1: +  } prog_bind_map;
1:  };
1:  
1:  struct bpf_func_info {
1: -	__u32 insn_off;
1: -	__u32 type_id;
1: +  __u32 insn_off;
1: +  __u32 type_id;
1:  };
1:  
1:  struct bpf_line_info {
1: -	__u32 insn_off;
1: -	__u32 file_name_off;
1: -	__u32 line_off;
1: -	__u32 line_col;
1: +  __u32 insn_off;
1: +  __u32 file_name_off;
1: +  __u32 line_off;
1: +  __u32 line_col;
1:  };
1:  
1:  struct bpf_iter_aux_info;
1: @@ -10052,16 +10124,16 @@ typedef int (*bpf_iter_init_seq_priv_t)(void *, struct bpf_iter_aux_info *);
1:  struct bpf_map;
1:  
1:  struct bpf_iter_aux_info {
1: -	struct bpf_map *map;
1: +  struct bpf_map *map;
1:  };
1:  
1:  typedef void (*bpf_iter_fini_seq_priv_t)(void *);
1:  
1:  struct bpf_iter_seq_info {
1: -	const struct seq_operations *seq_ops;
1: -	bpf_iter_init_seq_priv_t init_seq_private;
1: -	bpf_iter_fini_seq_priv_t fini_seq_private;
1: -	u32 seq_priv_size;
1: +  const struct seq_operations *seq_ops;
1: +  bpf_iter_init_seq_priv_t init_seq_private;
1: +  bpf_iter_fini_seq_priv_t fini_seq_private;
1: +  u32 seq_priv_size;
1:  };
1:  
1:  struct btf;
1: @@ -10073,133 +10145,141 @@ struct bpf_prog_aux;
1:  struct bpf_local_storage_map;
1:  
1:  struct bpf_map_ops {
1: -	int (*map_alloc_check)(union bpf_attr *);
1: -	struct bpf_map * (*map_alloc)(union bpf_attr *);
1: -	void (*map_release)(struct bpf_map *, struct file *);
1: -	void (*map_free)(struct bpf_map *);
1: -	int (*map_get_next_key)(struct bpf_map *, void *, void *);
1: -	void (*map_release_uref)(struct bpf_map *);
1: -	void * (*map_lookup_elem_sys_only)(struct bpf_map *, void *);
1: -	int (*map_lookup_batch)(struct bpf_map *, const union bpf_attr *, union bpf_attr *);
1: -	int (*map_lookup_and_delete_batch)(struct bpf_map *, const union bpf_attr *, union bpf_attr *);
1: -	int (*map_update_batch)(struct bpf_map *, const union bpf_attr *, union bpf_attr *);
1: -	int (*map_delete_batch)(struct bpf_map *, const union bpf_attr *, union bpf_attr *);
1: -	void * (*map_lookup_elem)(struct bpf_map *, void *);
1: -	int (*map_update_elem)(struct bpf_map *, void *, void *, u64);
1: -	int (*map_delete_elem)(struct bpf_map *, void *);
1: -	int (*map_push_elem)(struct bpf_map *, void *, u64);
1: -	int (*map_pop_elem)(struct bpf_map *, void *);
1: -	int (*map_peek_elem)(struct bpf_map *, void *);
1: -	void * (*map_fd_get_ptr)(struct bpf_map *, struct file *, int);
1: -	void (*map_fd_put_ptr)(void *);
1: -	int (*map_gen_lookup)(struct bpf_map *, struct bpf_insn *);
1: -	u32 (*map_fd_sys_lookup_elem)(void *);
1: -	void (*map_seq_show_elem)(struct bpf_map *, void *, struct seq_file *);
1: -	int (*map_check_btf)(const struct bpf_map *, const struct btf *, const struct btf_type *, const struct btf_type *);
1: -	int (*map_poke_track)(struct bpf_map *, struct bpf_prog_aux *);
1: -	void (*map_poke_untrack)(struct bpf_map *, struct bpf_prog_aux *);
1: -	void (*map_poke_run)(struct bpf_map *, u32, struct bpf_prog *, struct bpf_prog *);
1: -	int (*map_direct_value_addr)(const struct bpf_map *, u64 *, u32);
1: -	int (*map_direct_value_meta)(const struct bpf_map *, u64, u32 *);
1: -	int (*map_mmap)(struct bpf_map *, struct vm_area_struct *);
1: -	__poll_t (*map_poll)(struct bpf_map *, struct file *, struct poll_table_struct *);
1: -	int (*map_local_storage_charge)(struct bpf_local_storage_map *, void *, u32);
1: -	void (*map_local_storage_uncharge)(struct bpf_local_storage_map *, void *, u32);
1: -	struct bpf_local_storage ** (*map_owner_storage_ptr)(void *);
1: -	bool (*map_meta_equal)(const struct bpf_map *, const struct bpf_map *);
1: -	const char * const map_btf_name;
1: -	int *map_btf_id;
1: -	const struct bpf_iter_seq_info *iter_seq_info;
1: +  int (*map_alloc_check)(union bpf_attr *);
1: +  struct bpf_map *(*map_alloc)(union bpf_attr *);
1: +  void (*map_release)(struct bpf_map *, struct file *);
1: +  void (*map_free)(struct bpf_map *);
1: +  int (*map_get_next_key)(struct bpf_map *, void *, void *);
1: +  void (*map_release_uref)(struct bpf_map *);
1: +  void *(*map_lookup_elem_sys_only)(struct bpf_map *, void *);
1: +  int (*map_lookup_batch)(struct bpf_map *, const union bpf_attr *,
1: +                          union bpf_attr *);
1: +  int (*map_lookup_and_delete_batch)(struct bpf_map *, const union bpf_attr *,
1: +                                     union bpf_attr *);
1: +  int (*map_update_batch)(struct bpf_map *, const union bpf_attr *,
1: +                          union bpf_attr *);
1: +  int (*map_delete_batch)(struct bpf_map *, const union bpf_attr *,
1: +                          union bpf_attr *);
1: +  void *(*map_lookup_elem)(struct bpf_map *, void *);
1: +  int (*map_update_elem)(struct bpf_map *, void *, void *, u64);
1: +  int (*map_delete_elem)(struct bpf_map *, void *);
1: +  int (*map_push_elem)(struct bpf_map *, void *, u64);
1: +  int (*map_pop_elem)(struct bpf_map *, void *);
1: +  int (*map_peek_elem)(struct bpf_map *, void *);
1: +  void *(*map_fd_get_ptr)(struct bpf_map *, struct file *, int);
1: +  void (*map_fd_put_ptr)(void *);
1: +  int (*map_gen_lookup)(struct bpf_map *, struct bpf_insn *);
1: +  u32 (*map_fd_sys_lookup_elem)(void *);
1: +  void (*map_seq_show_elem)(struct bpf_map *, void *, struct seq_file *);
1: +  int (*map_check_btf)(const struct bpf_map *, const struct btf *,
1: +                       const struct btf_type *, const struct btf_type *);
1: +  int (*map_poke_track)(struct bpf_map *, struct bpf_prog_aux *);
1: +  void (*map_poke_untrack)(struct bpf_map *, struct bpf_prog_aux *);
1: +  void (*map_poke_run)(struct bpf_map *, u32, struct bpf_prog *,
1: +                       struct bpf_prog *);
1: +  int (*map_direct_value_addr)(const struct bpf_map *, u64 *, u32);
1: +  int (*map_direct_value_meta)(const struct bpf_map *, u64, u32 *);
1: +  int (*map_mmap)(struct bpf_map *, struct vm_area_struct *);
1: +  __poll_t (*map_poll)(struct bpf_map *, struct file *,
1: +                       struct poll_table_struct *);
1: +  int (*map_local_storage_charge)(struct bpf_local_storage_map *, void *, u32);
1: +  void (*map_local_storage_uncharge)(struct bpf_local_storage_map *, void *,
1: +                                     u32);
1: +  struct bpf_local_storage **(*map_owner_storage_ptr)(void *);
1: +  bool (*map_meta_equal)(const struct bpf_map *, const struct bpf_map *);
1: +  const char *const map_btf_name;
1: +  int *map_btf_id;
1: +  const struct bpf_iter_seq_info *iter_seq_info;
1:  };
1:  
1:  struct bpf_map {
1: -	const struct bpf_map_ops *ops;
1: -	struct bpf_map *inner_map_meta;
1: -	void *security;
1: -	enum bpf_map_type map_type;
1: -	u32 key_size;
1: -	u32 value_size;
1: -	u32 max_entries;
1: -	u32 map_flags;
1: -	int spin_lock_off;
1: -	u32 id;
1: -	int numa_node;
1: -	u32 btf_key_type_id;
1: -	u32 btf_value_type_id;
1: -	struct btf *btf;
1: -	struct mem_cgroup *memcg;
1: -	char name[16];
1: -	u32 btf_vmlinux_value_type_id;
1: -	bool bypass_spec_v1;
1: -	bool frozen;
1: -	long: 16;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	atomic64_t refcnt;
1: -	atomic64_t usercnt;
1: -	struct work_struct work;
1: -	struct mutex freeze_mutex;
1: -	u64 writecnt;
1: -	long: 64;
1: +  const struct bpf_map_ops *ops;
1: +  struct bpf_map *inner_map_meta;
1: +  void *security;
1: +  enum bpf_map_type map_type;
1: +  u32 key_size;
1: +  u32 value_size;
1: +  u32 max_entries;
1: +  u32 map_flags;
1: +  int spin_lock_off;
1: +  u32 id;
1: +  int numa_node;
1: +  u32 btf_key_type_id;
1: +  u32 btf_value_type_id;
1: +  struct btf *btf;
1: +  struct mem_cgroup *memcg;
1: +  char name[16];
1: +  u32 btf_vmlinux_value_type_id;
1: +  bool bypass_spec_v1;
1: +  bool frozen;
1: +  long : 16;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  atomic64_t refcnt;
1: +  atomic64_t usercnt;
1: +  struct work_struct work;
1: +  struct mutex freeze_mutex;
1: +  u64 writecnt;
1: +  long : 64;
1:  };
1:  
1:  struct btf_header {
1: -	__u16 magic;
1: -	__u8 version;
1: -	__u8 flags;
1: -	__u32 hdr_len;
1: -	__u32 type_off;
1: -	__u32 type_len;
1: -	__u32 str_off;
1: -	__u32 str_len;
1: +  __u16 magic;
1: +  __u8 version;
1: +  __u8 flags;
1: +  __u32 hdr_len;
1: +  __u32 type_off;
1: +  __u32 type_len;
1: +  __u32 str_off;
1: +  __u32 str_len;
1:  };
1:  
1:  struct btf {
1: -	void *data;
1: -	struct btf_type **types;
1: -	u32 *resolved_ids;
1: -	u32 *resolved_sizes;
1: -	const char *strings;
1: -	void *nohdr_data;
1: -	struct btf_header hdr;
1: -	u32 nr_types;
1: -	u32 types_size;
1: -	u32 data_size;
1: -	refcount_t refcnt;
1: -	u32 id;
1: -	struct callback_head rcu;
1: -	struct btf *base_btf;
1: -	u32 start_id;
1: -	u32 start_str_off;
1: -	char name[56];
1: -	bool kernel_btf;
1: +  void *data;
1: +  struct btf_type **types;
1: +  u32 *resolved_ids;
1: +  u32 *resolved_sizes;
1: +  const char *strings;
1: +  void *nohdr_data;
1: +  struct btf_header hdr;
1: +  u32 nr_types;
1: +  u32 types_size;
1: +  u32 data_size;
1: +  refcount_t refcnt;
1: +  u32 id;
1: +  struct callback_head rcu;
1: +  struct btf *base_btf;
1: +  u32 start_id;
1: +  u32 start_str_off;
1: +  char name[56];
1: +  bool kernel_btf;
1:  };
1:  
1:  struct btf_type {
1: -	__u32 name_off;
1: -	__u32 info;
1: -	union {
1: -		__u32 size;
1: -		__u32 type;
1: -	};
1: +  __u32 name_off;
1: +  __u32 info;
1: +  union {
1: +    __u32 size;
1: +    __u32 type;
1: +  };
1:  };
1:  
1:  enum bpf_tramp_prog_type {
1: -	BPF_TRAMP_FENTRY = 0,
1: -	BPF_TRAMP_FEXIT = 1,
1: -	BPF_TRAMP_MODIFY_RETURN = 2,
1: -	BPF_TRAMP_MAX = 3,
1: -	BPF_TRAMP_REPLACE = 4,
1: +  BPF_TRAMP_FENTRY = 0,
1: +  BPF_TRAMP_FEXIT = 1,
1: +  BPF_TRAMP_MODIFY_RETURN = 2,
1: +  BPF_TRAMP_MAX = 3,
1: +  BPF_TRAMP_REPLACE = 4,
1:  };
1:  
1:  struct bpf_ksym {
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	char name[128];
1: -	struct list_head lnode;
1: -	struct latch_tree_node tnode;
1: -	bool prog;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  char name[128];
1: +  struct list_head lnode;
1: +  struct latch_tree_node tnode;
1: +  bool prog;
1:  };
1:  
1:  struct bpf_ctx_arg_aux;
1: @@ -10217,151 +10297,151 @@ struct bpf_func_info_aux;
1:  struct bpf_prog_stats;
1:  
1:  struct bpf_prog_aux {
1: -	atomic64_t refcnt;
1: -	u32 used_map_cnt;
1: -	u32 max_ctx_offset;
1: -	u32 max_pkt_offset;
1: -	u32 max_tp_access;
1: -	u32 stack_depth;
1: -	u32 id;
1: -	u32 func_cnt;
1: -	u32 func_idx;
1: -	u32 attach_btf_id;
1: -	u32 ctx_arg_info_size;
1: -	u32 max_rdonly_access;
1: -	u32 max_rdwr_access;
1: -	struct btf *attach_btf;
1: -	const struct bpf_ctx_arg_aux *ctx_arg_info;
1: -	struct mutex dst_mutex;
1: -	struct bpf_prog *dst_prog;
1: -	struct bpf_trampoline *dst_trampoline;
1: -	enum bpf_prog_type saved_dst_prog_type;
1: -	enum bpf_attach_type saved_dst_attach_type;
1: -	bool verifier_zext;
1: -	bool offload_requested;
1: -	bool attach_btf_trace;
1: -	bool func_proto_unreliable;
1: -	bool sleepable;
1: -	bool tail_call_reachable;
1: -	enum bpf_tramp_prog_type trampoline_prog_type;
1: -	struct hlist_node tramp_hlist;
1: -	const struct btf_type *attach_func_proto;
1: -	const char *attach_func_name;
1: -	struct bpf_prog **func;
1: -	void *jit_data;
1: -	struct bpf_jit_poke_descriptor *poke_tab;
1: -	u32 size_poke_tab;
1: -	struct bpf_ksym ksym;
1: -	const struct bpf_prog_ops *ops;
1: -	struct bpf_map **used_maps;
1: -	struct mutex used_maps_mutex;
1: -	struct bpf_prog *prog;
1: -	struct user_struct *user;
1: -	u64 load_time;
1: -	struct bpf_map *cgroup_storage[2];
1: -	char name[16];
1: -	void *security;
1: -	struct bpf_prog_offload *offload;
1: -	struct btf *btf;
1: -	struct bpf_func_info *func_info;
1: -	struct bpf_func_info_aux *func_info_aux;
1: -	struct bpf_line_info *linfo;
1: -	void **jited_linfo;
1: -	u32 func_info_cnt;
1: -	u32 nr_linfo;
1: -	u32 linfo_idx;
1: -	u32 num_exentries;
1: -	struct exception_table_entry *extable;
1: -	struct bpf_prog_stats *stats;
1: -	union {
1: -		struct work_struct work;
1: -		struct callback_head rcu;
1: -	};
1: +  atomic64_t refcnt;
1: +  u32 used_map_cnt;
1: +  u32 max_ctx_offset;
1: +  u32 max_pkt_offset;
1: +  u32 max_tp_access;
1: +  u32 stack_depth;
1: +  u32 id;
1: +  u32 func_cnt;
1: +  u32 func_idx;
1: +  u32 attach_btf_id;
1: +  u32 ctx_arg_info_size;
1: +  u32 max_rdonly_access;
1: +  u32 max_rdwr_access;
1: +  struct btf *attach_btf;
1: +  const struct bpf_ctx_arg_aux *ctx_arg_info;
1: +  struct mutex dst_mutex;
1: +  struct bpf_prog *dst_prog;
1: +  struct bpf_trampoline *dst_trampoline;
1: +  enum bpf_prog_type saved_dst_prog_type;
1: +  enum bpf_attach_type saved_dst_attach_type;
1: +  bool verifier_zext;
1: +  bool offload_requested;
1: +  bool attach_btf_trace;
1: +  bool func_proto_unreliable;
1: +  bool sleepable;
1: +  bool tail_call_reachable;
1: +  enum bpf_tramp_prog_type trampoline_prog_type;
1: +  struct hlist_node tramp_hlist;
1: +  const struct btf_type *attach_func_proto;
1: +  const char *attach_func_name;
1: +  struct bpf_prog **func;
1: +  void *jit_data;
1: +  struct bpf_jit_poke_descriptor *poke_tab;
1: +  u32 size_poke_tab;
1: +  struct bpf_ksym ksym;
1: +  const struct bpf_prog_ops *ops;
1: +  struct bpf_map **used_maps;
1: +  struct mutex used_maps_mutex;
1: +  struct bpf_prog *prog;
1: +  struct user_struct *user;
1: +  u64 load_time;
1: +  struct bpf_map *cgroup_storage[2];
1: +  char name[16];
1: +  void *security;
1: +  struct bpf_prog_offload *offload;
1: +  struct btf *btf;
1: +  struct bpf_func_info *func_info;
1: +  struct bpf_func_info_aux *func_info_aux;
1: +  struct bpf_line_info *linfo;
1: +  void **jited_linfo;
1: +  u32 func_info_cnt;
1: +  u32 nr_linfo;
1: +  u32 linfo_idx;
1: +  u32 num_exentries;
1: +  struct exception_table_entry *extable;
1: +  struct bpf_prog_stats *stats;
1: +  union {
1: +    struct work_struct work;
1: +    struct callback_head rcu;
1: +  };
1:  };
1:  
1:  struct sock_filter {
1: -	__u16 code;
1: -	__u8 jt;
1: -	__u8 jf;
1: -	__u32 k;
1: +  __u16 code;
1: +  __u8 jt;
1: +  __u8 jf;
1: +  __u32 k;
1:  };
1:  
1:  struct sock_fprog_kern;
1:  
1:  struct bpf_prog {
1: -	u16 pages;
1: -	u16 jited: 1;
1: -	u16 jit_requested: 1;
1: -	u16 gpl_compatible: 1;
1: -	u16 cb_access: 1;
1: -	u16 dst_needed: 1;
1: -	u16 blinded: 1;
1: -	u16 is_func: 1;
1: -	u16 kprobe_override: 1;
1: -	u16 has_callchain_buf: 1;
1: -	u16 enforce_expected_attach_type: 1;
1: -	u16 call_get_stack: 1;
1: -	enum bpf_prog_type type;
1: -	enum bpf_attach_type expected_attach_type;
1: -	u32 len;
1: -	u32 jited_len;
1: -	u8 tag[8];
1: -	struct bpf_prog_aux *aux;
1: -	struct sock_fprog_kern *orig_prog;
1: -	unsigned int (*bpf_func)(const void *, const struct bpf_insn *);
1: -	struct sock_filter insns[0];
1: -	struct bpf_insn insnsi[0];
1: +  u16 pages;
1: +  u16 jited : 1;
1: +  u16 jit_requested : 1;
1: +  u16 gpl_compatible : 1;
1: +  u16 cb_access : 1;
1: +  u16 dst_needed : 1;
1: +  u16 blinded : 1;
1: +  u16 is_func : 1;
1: +  u16 kprobe_override : 1;
1: +  u16 has_callchain_buf : 1;
1: +  u16 enforce_expected_attach_type : 1;
1: +  u16 call_get_stack : 1;
1: +  enum bpf_prog_type type;
1: +  enum bpf_attach_type expected_attach_type;
1: +  u32 len;
1: +  u32 jited_len;
1: +  u8 tag[8];
1: +  struct bpf_prog_aux *aux;
1: +  struct sock_fprog_kern *orig_prog;
1: +  unsigned int (*bpf_func)(const void *, const struct bpf_insn *);
1: +  struct sock_filter insns[0];
1: +  struct bpf_insn insnsi[0];
1:  };
1:  
1:  struct bpf_offloaded_map;
1:  
1:  struct bpf_map_dev_ops {
1: -	int (*map_get_next_key)(struct bpf_offloaded_map *, void *, void *);
1: -	int (*map_lookup_elem)(struct bpf_offloaded_map *, void *, void *);
1: -	int (*map_update_elem)(struct bpf_offloaded_map *, void *, void *, u64);
1: -	int (*map_delete_elem)(struct bpf_offloaded_map *, void *);
1: +  int (*map_get_next_key)(struct bpf_offloaded_map *, void *, void *);
1: +  int (*map_lookup_elem)(struct bpf_offloaded_map *, void *, void *);
1: +  int (*map_update_elem)(struct bpf_offloaded_map *, void *, void *, u64);
1: +  int (*map_delete_elem)(struct bpf_offloaded_map *, void *);
1:  };
1:  
1:  struct bpf_offloaded_map {
1: -	struct bpf_map map;
1: -	struct net_device *netdev;
1: -	const struct bpf_map_dev_ops *dev_ops;
1: -	void *dev_priv;
1: -	struct list_head offloads;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct net_device *netdev;
1: +  const struct bpf_map_dev_ops *dev_ops;
1: +  void *dev_priv;
1: +  struct list_head offloads;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct net_device_stats {
1: -	long unsigned int rx_packets;
1: -	long unsigned int tx_packets;
1: -	long unsigned int rx_bytes;
1: -	long unsigned int tx_bytes;
1: -	long unsigned int rx_errors;
1: -	long unsigned int tx_errors;
1: -	long unsigned int rx_dropped;
1: -	long unsigned int tx_dropped;
1: -	long unsigned int multicast;
1: -	long unsigned int collisions;
1: -	long unsigned int rx_length_errors;
1: -	long unsigned int rx_over_errors;
1: -	long unsigned int rx_crc_errors;
1: -	long unsigned int rx_frame_errors;
1: -	long unsigned int rx_fifo_errors;
1: -	long unsigned int rx_missed_errors;
1: -	long unsigned int tx_aborted_errors;
1: -	long unsigned int tx_carrier_errors;
1: -	long unsigned int tx_fifo_errors;
1: -	long unsigned int tx_heartbeat_errors;
1: -	long unsigned int tx_window_errors;
1: -	long unsigned int rx_compressed;
1: -	long unsigned int tx_compressed;
1: +  long unsigned int rx_packets;
1: +  long unsigned int tx_packets;
1: +  long unsigned int rx_bytes;
1: +  long unsigned int tx_bytes;
1: +  long unsigned int rx_errors;
1: +  long unsigned int tx_errors;
1: +  long unsigned int rx_dropped;
1: +  long unsigned int tx_dropped;
1: +  long unsigned int multicast;
1: +  long unsigned int collisions;
1: +  long unsigned int rx_length_errors;
1: +  long unsigned int rx_over_errors;
1: +  long unsigned int rx_crc_errors;
1: +  long unsigned int rx_frame_errors;
1: +  long unsigned int rx_fifo_errors;
1: +  long unsigned int rx_missed_errors;
1: +  long unsigned int tx_aborted_errors;
1: +  long unsigned int tx_carrier_errors;
1: +  long unsigned int tx_fifo_errors;
1: +  long unsigned int tx_heartbeat_errors;
1: +  long unsigned int tx_window_errors;
1: +  long unsigned int rx_compressed;
1: +  long unsigned int tx_compressed;
1:  };
1:  
1:  struct netdev_hw_addr_list {
1: -	struct list_head list;
1: -	int count;
1: +  struct list_head list;
1: +  int count;
1:  };
1:  
1:  struct tipc_bearer;
1: @@ -10369,10 +10449,10 @@ struct tipc_bearer;
1:  struct dn_dev;
1:  
1:  enum rx_handler_result {
1: -	RX_HANDLER_CONSUMED = 0,
1: -	RX_HANDLER_ANOTHER = 1,
1: -	RX_HANDLER_EXACT = 2,
1: -	RX_HANDLER_PASS = 3,
1: +  RX_HANDLER_CONSUMED = 0,
1: +  RX_HANDLER_ANOTHER = 1,
1: +  RX_HANDLER_EXACT = 2,
1: +  RX_HANDLER_PASS = 3,
1:  };
1:  
1:  typedef enum rx_handler_result rx_handler_result_t;
1: @@ -10382,8 +10462,8 @@ typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **);
1:  struct pcpu_dstats;
1:  
1:  struct netdev_tc_txq {
1: -	u16 count;
1: -	u16 offset;
1: +  u16 count;
1: +  u16 offset;
1:  };
1:  
1:  struct sfp_bus;
1: @@ -10391,8 +10471,8 @@ struct sfp_bus;
1:  struct bpf_xdp_link;
1:  
1:  struct bpf_xdp_entity {
1: -	struct bpf_prog *prog;
1: -	struct bpf_xdp_link *link;
1: +  struct bpf_prog *prog;
1: +  struct bpf_xdp_link *link;
1:  };
1:  
1:  struct netdev_name_node;
1: @@ -10448,271 +10528,271 @@ struct udp_tunnel_nic_info;
1:  struct udp_tunnel_nic;
1:  
1:  struct net_device {
1: -	char name[16];
1: -	struct netdev_name_node *name_node;
1: -	struct dev_ifalias *ifalias;
1: -	long unsigned int mem_end;
1: -	long unsigned int mem_start;
1: -	long unsigned int base_addr;
1: -	int irq;
1: -	long unsigned int state;
1: -	struct list_head dev_list;
1: -	struct list_head napi_list;
1: -	struct list_head unreg_list;
1: -	struct list_head close_list;
1: -	struct list_head ptype_all;
1: -	struct list_head ptype_specific;
1: -	struct {
1: -		struct list_head upper;
1: -		struct list_head lower;
1: -	} adj_list;
1: -	netdev_features_t features;
1: -	netdev_features_t hw_features;
1: -	netdev_features_t wanted_features;
1: -	netdev_features_t vlan_features;
1: -	netdev_features_t hw_enc_features;
1: -	netdev_features_t mpls_features;
1: -	netdev_features_t gso_partial_features;
1: -	int ifindex;
1: -	int group;
1: -	struct net_device_stats stats;
1: -	atomic_long_t rx_dropped;
1: -	atomic_long_t tx_dropped;
1: -	atomic_long_t rx_nohandler;
1: -	atomic_t carrier_up_count;
1: -	atomic_t carrier_down_count;
1: -	const struct net_device_ops *netdev_ops;
1: -	const struct ethtool_ops *ethtool_ops;
1: -	const struct ndisc_ops *ndisc_ops;
1: -	const struct header_ops *header_ops;
1: -	unsigned int flags;
1: -	unsigned int priv_flags;
1: -	short unsigned int gflags;
1: -	short unsigned int padded;
1: -	unsigned char operstate;
1: -	unsigned char link_mode;
1: -	unsigned char if_port;
1: -	unsigned char dma;
1: -	unsigned int mtu;
1: -	unsigned int min_mtu;
1: -	unsigned int max_mtu;
1: -	short unsigned int type;
1: -	short unsigned int hard_header_len;
1: -	unsigned char min_header_len;
1: -	unsigned char name_assign_type;
1: -	short unsigned int needed_headroom;
1: -	short unsigned int needed_tailroom;
1: -	unsigned char perm_addr[32];
1: -	unsigned char addr_assign_type;
1: -	unsigned char addr_len;
1: -	unsigned char upper_level;
1: -	unsigned char lower_level;
1: -	short unsigned int neigh_priv_len;
1: -	short unsigned int dev_id;
1: -	short unsigned int dev_port;
1: -	spinlock_t addr_list_lock;
1: -	struct netdev_hw_addr_list uc;
1: -	struct netdev_hw_addr_list mc;
1: -	struct netdev_hw_addr_list dev_addrs;
1: -	struct kset *queues_kset;
1: -	unsigned int promiscuity;
1: -	unsigned int allmulti;
1: -	bool uc_promisc;
1: -	struct vlan_info *vlan_info;
1: -	struct tipc_bearer *tipc_ptr;
1: -	void *atalk_ptr;
1: -	struct in_device *ip_ptr;
1: -	struct dn_dev *dn_ptr;
1: -	struct inet6_dev *ip6_ptr;
1: -	struct wireless_dev *ieee80211_ptr;
1: -	struct wpan_dev *ieee802154_ptr;
1: -	unsigned char *dev_addr;
1: -	struct netdev_rx_queue *_rx;
1: -	unsigned int num_rx_queues;
1: -	unsigned int real_num_rx_queues;
1: -	struct bpf_prog *xdp_prog;
1: -	long unsigned int gro_flush_timeout;
1: -	int napi_defer_hard_irqs;
1: -	rx_handler_func_t *rx_handler;
1: -	void *rx_handler_data;
1: -	struct mini_Qdisc *miniq_ingress;
1: -	struct netdev_queue *ingress_queue;
1: -	struct nf_hook_entries *nf_hooks_ingress;
1: -	unsigned char broadcast[32];
1: -	struct cpu_rmap *rx_cpu_rmap;
1: -	struct hlist_node index_hlist;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct netdev_queue *_tx;
1: -	unsigned int num_tx_queues;
1: -	unsigned int real_num_tx_queues;
1: -	struct Qdisc *qdisc;
1: -	unsigned int tx_queue_len;
1: -	spinlock_t tx_global_lock;
1: -	struct xdp_dev_bulk_queue *xdp_bulkq;
1: -	struct xps_dev_maps *xps_cpus_map;
1: -	struct xps_dev_maps *xps_rxqs_map;
1: -	struct mini_Qdisc *miniq_egress;
1: -	struct hlist_head qdisc_hash[16];
1: -	struct timer_list watchdog_timer;
1: -	int watchdog_timeo;
1: -	u32 proto_down_reason;
1: -	struct list_head todo_list;
1: -	int *pcpu_refcnt;
1: -	struct list_head link_watch_list;
1: -	enum {
1: -		NETREG_UNINITIALIZED = 0,
1: -		NETREG_REGISTERED = 1,
1: -		NETREG_UNREGISTERING = 2,
1: -		NETREG_UNREGISTERED = 3,
1: -		NETREG_RELEASED = 4,
1: -		NETREG_DUMMY = 5,
1: -	} reg_state: 8;
1: -	bool dismantle;
1: -	enum {
1: -		RTNL_LINK_INITIALIZED = 0,
1: -		RTNL_LINK_INITIALIZING = 1,
1: -	} rtnl_link_state: 16;
1: -	bool needs_free_netdev;
1: -	void (*priv_destructor)(struct net_device *);
1: -	struct netpoll_info *npinfo;
1: -	possible_net_t nd_net;
1: -	union {
1: -		void *ml_priv;
1: -		struct pcpu_lstats *lstats;
1: -		struct pcpu_sw_netstats *tstats;
1: -		struct pcpu_dstats *dstats;
1: -	};
1: -	struct device dev;
1: -	const struct attribute_group *sysfs_groups[4];
1: -	const struct attribute_group *sysfs_rx_queue_group;
1: -	const struct rtnl_link_ops *rtnl_link_ops;
1: -	unsigned int gso_max_size;
1: -	u16 gso_max_segs;
1: -	const struct dcbnl_rtnl_ops *dcbnl_ops;
1: -	s16 num_tc;
1: -	struct netdev_tc_txq tc_to_txq[16];
1: -	u8 prio_tc_map[16];
1: -	struct phy_device *phydev;
1: -	struct sfp_bus *sfp_bus;
1: -	struct lock_class_key *qdisc_tx_busylock;
1: -	struct lock_class_key *qdisc_running_key;
1: -	bool proto_down;
1: -	unsigned int wol_enabled: 1;
1: -	struct list_head net_notifier_list;
1: -	const struct udp_tunnel_nic_info *udp_tunnel_nic_info;
1: -	struct udp_tunnel_nic *udp_tunnel_nic;
1: -	struct bpf_xdp_entity xdp_state[3];
1: -	long: 64;
1: +  char name[16];
1: +  struct netdev_name_node *name_node;
1: +  struct dev_ifalias *ifalias;
1: +  long unsigned int mem_end;
1: +  long unsigned int mem_start;
1: +  long unsigned int base_addr;
1: +  int irq;
1: +  long unsigned int state;
1: +  struct list_head dev_list;
1: +  struct list_head napi_list;
1: +  struct list_head unreg_list;
1: +  struct list_head close_list;
1: +  struct list_head ptype_all;
1: +  struct list_head ptype_specific;
1: +  struct {
1: +    struct list_head upper;
1: +    struct list_head lower;
1: +  } adj_list;
1: +  netdev_features_t features;
1: +  netdev_features_t hw_features;
1: +  netdev_features_t wanted_features;
1: +  netdev_features_t vlan_features;
1: +  netdev_features_t hw_enc_features;
1: +  netdev_features_t mpls_features;
1: +  netdev_features_t gso_partial_features;
1: +  int ifindex;
1: +  int group;
1: +  struct net_device_stats stats;
1: +  atomic_long_t rx_dropped;
1: +  atomic_long_t tx_dropped;
1: +  atomic_long_t rx_nohandler;
1: +  atomic_t carrier_up_count;
1: +  atomic_t carrier_down_count;
1: +  const struct net_device_ops *netdev_ops;
1: +  const struct ethtool_ops *ethtool_ops;
1: +  const struct ndisc_ops *ndisc_ops;
1: +  const struct header_ops *header_ops;
1: +  unsigned int flags;
1: +  unsigned int priv_flags;
1: +  short unsigned int gflags;
1: +  short unsigned int padded;
1: +  unsigned char operstate;
1: +  unsigned char link_mode;
1: +  unsigned char if_port;
1: +  unsigned char dma;
1: +  unsigned int mtu;
1: +  unsigned int min_mtu;
1: +  unsigned int max_mtu;
1: +  short unsigned int type;
1: +  short unsigned int hard_header_len;
1: +  unsigned char min_header_len;
1: +  unsigned char name_assign_type;
1: +  short unsigned int needed_headroom;
1: +  short unsigned int needed_tailroom;
1: +  unsigned char perm_addr[32];
1: +  unsigned char addr_assign_type;
1: +  unsigned char addr_len;
1: +  unsigned char upper_level;
1: +  unsigned char lower_level;
1: +  short unsigned int neigh_priv_len;
1: +  short unsigned int dev_id;
1: +  short unsigned int dev_port;
1: +  spinlock_t addr_list_lock;
1: +  struct netdev_hw_addr_list uc;
1: +  struct netdev_hw_addr_list mc;
1: +  struct netdev_hw_addr_list dev_addrs;
1: +  struct kset *queues_kset;
1: +  unsigned int promiscuity;
1: +  unsigned int allmulti;
1: +  bool uc_promisc;
1: +  struct vlan_info *vlan_info;
1: +  struct tipc_bearer *tipc_ptr;
1: +  void *atalk_ptr;
1: +  struct in_device *ip_ptr;
1: +  struct dn_dev *dn_ptr;
1: +  struct inet6_dev *ip6_ptr;
1: +  struct wireless_dev *ieee80211_ptr;
1: +  struct wpan_dev *ieee802154_ptr;
1: +  unsigned char *dev_addr;
1: +  struct netdev_rx_queue *_rx;
1: +  unsigned int num_rx_queues;
1: +  unsigned int real_num_rx_queues;
1: +  struct bpf_prog *xdp_prog;
1: +  long unsigned int gro_flush_timeout;
1: +  int napi_defer_hard_irqs;
1: +  rx_handler_func_t *rx_handler;
1: +  void *rx_handler_data;
1: +  struct mini_Qdisc *miniq_ingress;
1: +  struct netdev_queue *ingress_queue;
1: +  struct nf_hook_entries *nf_hooks_ingress;
1: +  unsigned char broadcast[32];
1: +  struct cpu_rmap *rx_cpu_rmap;
1: +  struct hlist_node index_hlist;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct netdev_queue *_tx;
1: +  unsigned int num_tx_queues;
1: +  unsigned int real_num_tx_queues;
1: +  struct Qdisc *qdisc;
1: +  unsigned int tx_queue_len;
1: +  spinlock_t tx_global_lock;
1: +  struct xdp_dev_bulk_queue *xdp_bulkq;
1: +  struct xps_dev_maps *xps_cpus_map;
1: +  struct xps_dev_maps *xps_rxqs_map;
1: +  struct mini_Qdisc *miniq_egress;
1: +  struct hlist_head qdisc_hash[16];
1: +  struct timer_list watchdog_timer;
1: +  int watchdog_timeo;
1: +  u32 proto_down_reason;
1: +  struct list_head todo_list;
1: +  int *pcpu_refcnt;
1: +  struct list_head link_watch_list;
1: +  enum {
1: +    NETREG_UNINITIALIZED = 0,
1: +    NETREG_REGISTERED = 1,
1: +    NETREG_UNREGISTERING = 2,
1: +    NETREG_UNREGISTERED = 3,
1: +    NETREG_RELEASED = 4,
1: +    NETREG_DUMMY = 5,
1: +  } reg_state : 8;
1: +  bool dismantle;
1: +  enum {
1: +    RTNL_LINK_INITIALIZED = 0,
1: +    RTNL_LINK_INITIALIZING = 1,
1: +  } rtnl_link_state : 16;
1: +  bool needs_free_netdev;
1: +  void (*priv_destructor)(struct net_device *);
1: +  struct netpoll_info *npinfo;
1: +  possible_net_t nd_net;
1: +  union {
1: +    void *ml_priv;
1: +    struct pcpu_lstats *lstats;
1: +    struct pcpu_sw_netstats *tstats;
1: +    struct pcpu_dstats *dstats;
1: +  };
1: +  struct device dev;
1: +  const struct attribute_group *sysfs_groups[4];
1: +  const struct attribute_group *sysfs_rx_queue_group;
1: +  const struct rtnl_link_ops *rtnl_link_ops;
1: +  unsigned int gso_max_size;
1: +  u16 gso_max_segs;
1: +  const struct dcbnl_rtnl_ops *dcbnl_ops;
1: +  s16 num_tc;
1: +  struct netdev_tc_txq tc_to_txq[16];
1: +  u8 prio_tc_map[16];
1: +  struct phy_device *phydev;
1: +  struct sfp_bus *sfp_bus;
1: +  struct lock_class_key *qdisc_tx_busylock;
1: +  struct lock_class_key *qdisc_running_key;
1: +  bool proto_down;
1: +  unsigned int wol_enabled : 1;
1: +  struct list_head net_notifier_list;
1: +  const struct udp_tunnel_nic_info *udp_tunnel_nic_info;
1: +  struct udp_tunnel_nic *udp_tunnel_nic;
1: +  struct bpf_xdp_entity xdp_state[3];
1: +  long : 64;
1:  };
1:  
1:  enum bpf_reg_type {
1: -	NOT_INIT = 0,
1: -	SCALAR_VALUE = 1,
1: -	PTR_TO_CTX = 2,
1: -	CONST_PTR_TO_MAP = 3,
1: -	PTR_TO_MAP_VALUE = 4,
1: -	PTR_TO_MAP_VALUE_OR_NULL = 5,
1: -	PTR_TO_STACK = 6,
1: -	PTR_TO_PACKET_META = 7,
1: -	PTR_TO_PACKET = 8,
1: -	PTR_TO_PACKET_END = 9,
1: -	PTR_TO_FLOW_KEYS = 10,
1: -	PTR_TO_SOCKET = 11,
1: -	PTR_TO_SOCKET_OR_NULL = 12,
1: -	PTR_TO_SOCK_COMMON = 13,
1: -	PTR_TO_SOCK_COMMON_OR_NULL = 14,
1: -	PTR_TO_TCP_SOCK = 15,
1: -	PTR_TO_TCP_SOCK_OR_NULL = 16,
1: -	PTR_TO_TP_BUFFER = 17,
1: -	PTR_TO_XDP_SOCK = 18,
1: -	PTR_TO_BTF_ID = 19,
1: -	PTR_TO_BTF_ID_OR_NULL = 20,
1: -	PTR_TO_MEM = 21,
1: -	PTR_TO_MEM_OR_NULL = 22,
1: -	PTR_TO_RDONLY_BUF = 23,
1: -	PTR_TO_RDONLY_BUF_OR_NULL = 24,
1: -	PTR_TO_RDWR_BUF = 25,
1: -	PTR_TO_RDWR_BUF_OR_NULL = 26,
1: -	PTR_TO_PERCPU_BTF_ID = 27,
1: +  NOT_INIT = 0,
1: +  SCALAR_VALUE = 1,
1: +  PTR_TO_CTX = 2,
1: +  CONST_PTR_TO_MAP = 3,
1: +  PTR_TO_MAP_VALUE = 4,
1: +  PTR_TO_MAP_VALUE_OR_NULL = 5,
1: +  PTR_TO_STACK = 6,
1: +  PTR_TO_PACKET_META = 7,
1: +  PTR_TO_PACKET = 8,
1: +  PTR_TO_PACKET_END = 9,
1: +  PTR_TO_FLOW_KEYS = 10,
1: +  PTR_TO_SOCKET = 11,
1: +  PTR_TO_SOCKET_OR_NULL = 12,
1: +  PTR_TO_SOCK_COMMON = 13,
1: +  PTR_TO_SOCK_COMMON_OR_NULL = 14,
1: +  PTR_TO_TCP_SOCK = 15,
1: +  PTR_TO_TCP_SOCK_OR_NULL = 16,
1: +  PTR_TO_TP_BUFFER = 17,
1: +  PTR_TO_XDP_SOCK = 18,
1: +  PTR_TO_BTF_ID = 19,
1: +  PTR_TO_BTF_ID_OR_NULL = 20,
1: +  PTR_TO_MEM = 21,
1: +  PTR_TO_MEM_OR_NULL = 22,
1: +  PTR_TO_RDONLY_BUF = 23,
1: +  PTR_TO_RDONLY_BUF_OR_NULL = 24,
1: +  PTR_TO_RDWR_BUF = 25,
1: +  PTR_TO_RDWR_BUF_OR_NULL = 26,
1: +  PTR_TO_PERCPU_BTF_ID = 27,
1:  };
1:  
1:  struct bpf_prog_ops {
1: -	int (*test_run)(struct bpf_prog *, const union bpf_attr *, union bpf_attr *);
1: +  int (*test_run)(struct bpf_prog *, const union bpf_attr *, union bpf_attr *);
1:  };
1:  
1:  struct bpf_offload_dev;
1:  
1:  struct bpf_prog_offload {
1: -	struct bpf_prog *prog;
1: -	struct net_device *netdev;
1: -	struct bpf_offload_dev *offdev;
1: -	void *dev_priv;
1: -	struct list_head offloads;
1: -	bool dev_state;
1: -	bool opt_failed;
1: -	void *jited_image;
1: -	u32 jited_len;
1: +  struct bpf_prog *prog;
1: +  struct net_device *netdev;
1: +  struct bpf_offload_dev *offdev;
1: +  void *dev_priv;
1: +  struct list_head offloads;
1: +  bool dev_state;
1: +  bool opt_failed;
1: +  void *jited_image;
1: +  u32 jited_len;
1:  };
1:  
1:  struct bpf_prog_stats {
1: -	u64 cnt;
1: -	u64 nsecs;
1: -	struct u64_stats_sync syncp;
1: +  u64 cnt;
1: +  u64 nsecs;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct btf_func_model {
1: -	u8 ret_size;
1: -	u8 nr_args;
1: -	u8 arg_size[12];
1: +  u8 ret_size;
1: +  u8 nr_args;
1: +  u8 arg_size[12];
1:  };
1:  
1:  struct bpf_trampoline {
1: -	struct hlist_node hlist;
1: -	struct mutex mutex;
1: -	refcount_t refcnt;
1: -	u64 key;
1: -	struct {
1: -		struct btf_func_model model;
1: -		void *addr;
1: -		bool ftrace_managed;
1: -	} func;
1: -	struct bpf_prog *extension_prog;
1: -	struct hlist_head progs_hlist[3];
1: -	int progs_cnt[3];
1: -	void *image;
1: -	u64 selector;
1: -	struct bpf_ksym ksym;
1: +  struct hlist_node hlist;
1: +  struct mutex mutex;
1: +  refcount_t refcnt;
1: +  u64 key;
1: +  struct {
1: +    struct btf_func_model model;
1: +    void *addr;
1: +    bool ftrace_managed;
1: +  } func;
1: +  struct bpf_prog *extension_prog;
1: +  struct hlist_head progs_hlist[3];
1: +  int progs_cnt[3];
1: +  void *image;
1: +  u64 selector;
1: +  struct bpf_ksym ksym;
1:  };
1:  
1:  struct bpf_func_info_aux {
1: -	u16 linkage;
1: -	bool unreliable;
1: +  u16 linkage;
1: +  bool unreliable;
1:  };
1:  
1:  struct bpf_jit_poke_descriptor {
1: -	void *tailcall_target;
1: -	void *tailcall_bypass;
1: -	void *bypass_addr;
1: -	union {
1: -		struct {
1: -			struct bpf_map *map;
1: -			u32 key;
1: -		} tail_call;
1: -	};
1: -	bool tailcall_target_stable;
1: -	u8 adj_off;
1: -	u16 reason;
1: -	u32 insn_idx;
1: +  void *tailcall_target;
1: +  void *tailcall_bypass;
1: +  void *bypass_addr;
1: +  union {
1: +    struct {
1: +      struct bpf_map *map;
1: +      u32 key;
1: +    } tail_call;
1: +  };
1: +  bool tailcall_target_stable;
1: +  u8 adj_off;
1: +  u16 reason;
1: +  u32 insn_idx;
1:  };
1:  
1:  struct bpf_ctx_arg_aux {
1: -	u32 offset;
1: -	enum bpf_reg_type reg_type;
1: -	u32 btf_id;
1: +  u32 offset;
1: +  enum bpf_reg_type reg_type;
1: +  u32 btf_id;
1:  };
1:  
1:  typedef unsigned int sk_buff_data_t;
1: @@ -10720,325 +10800,325 @@ typedef unsigned int sk_buff_data_t;
1:  struct skb_ext;
1:  
1:  struct sk_buff {
1: -	union {
1: -		struct {
1: -			struct sk_buff *next;
1: -			struct sk_buff *prev;
1: -			union {
1: -				struct net_device *dev;
1: -				long unsigned int dev_scratch;
1: -			};
1: -		};
1: -		struct rb_node rbnode;
1: -		struct list_head list;
1: -	};
1: -	union {
1: -		struct sock *sk;
1: -		int ip_defrag_offset;
1: -	};
1: -	union {
1: -		ktime_t tstamp;
1: -		u64 skb_mstamp_ns;
1: -	};
1: -	char cb[48];
1: -	union {
1: -		struct {
1: -			long unsigned int _skb_refdst;
1: -			void (*destructor)(struct sk_buff *);
1: -		};
1: -		struct list_head tcp_tsorted_anchor;
1: -	};
1: -	unsigned int len;
1: -	unsigned int data_len;
1: -	__u16 mac_len;
1: -	__u16 hdr_len;
1: -	__u16 queue_mapping;
1: -	__u8 __cloned_offset[0];
1: -	__u8 cloned: 1;
1: -	__u8 nohdr: 1;
1: -	__u8 fclone: 2;
1: -	__u8 peeked: 1;
1: -	__u8 head_frag: 1;
1: -	__u8 pfmemalloc: 1;
1: -	__u8 active_extensions;
1: -	__u32 headers_start[0];
1: -	__u8 __pkt_type_offset[0];
1: -	__u8 pkt_type: 3;
1: -	__u8 ignore_df: 1;
1: -	__u8 nf_trace: 1;
1: -	__u8 ip_summed: 2;
1: -	__u8 ooo_okay: 1;
1: -	__u8 l4_hash: 1;
1: -	__u8 sw_hash: 1;
1: -	__u8 wifi_acked_valid: 1;
1: -	__u8 wifi_acked: 1;
1: -	__u8 no_fcs: 1;
1: -	__u8 encapsulation: 1;
1: -	__u8 encap_hdr_csum: 1;
1: -	__u8 csum_valid: 1;
1: -	__u8 __pkt_vlan_present_offset[0];
1: -	__u8 vlan_present: 1;
1: -	__u8 csum_complete_sw: 1;
1: -	__u8 csum_level: 2;
1: -	__u8 csum_not_inet: 1;
1: -	__u8 dst_pending_confirm: 1;
1: -	__u8 ndisc_nodetype: 2;
1: -	__u8 ipvs_property: 1;
1: -	__u8 inner_protocol_type: 1;
1: -	__u8 remcsum_offload: 1;
1: -	__u8 tc_skip_classify: 1;
1: -	__u8 tc_at_ingress: 1;
1: -	__u8 redirected: 1;
1: -	__u8 from_ingress: 1;
1: -	__u16 tc_index;
1: -	union {
1: -		__wsum csum;
1: -		struct {
1: -			__u16 csum_start;
1: -			__u16 csum_offset;
1: -		};
1: -	};
1: -	__u32 priority;
1: -	int skb_iif;
1: -	__u32 hash;
1: -	__be16 vlan_proto;
1: -	__u16 vlan_tci;
1: -	union {
1: -		unsigned int napi_id;
1: -		unsigned int sender_cpu;
1: -	};
1: -	__u32 secmark;
1: -	union {
1: -		__u32 mark;
1: -		__u32 reserved_tailroom;
1: -	};
1: -	union {
1: -		__be16 inner_protocol;
1: -		__u8 inner_ipproto;
1: -	};
1: -	__u16 inner_transport_header;
1: -	__u16 inner_network_header;
1: -	__u16 inner_mac_header;
1: -	__be16 protocol;
1: -	__u16 transport_header;
1: -	__u16 network_header;
1: -	__u16 mac_header;
1: -	__u32 headers_end[0];
1: -	sk_buff_data_t tail;
1: -	sk_buff_data_t end;
1: -	unsigned char *head;
1: -	unsigned char *data;
1: -	unsigned int truesize;
1: -	refcount_t users;
1: -	struct skb_ext *extensions;
1: -};
1: -
1: -enum {
1: -	Root_NFS = 255,
1: -	Root_CIFS = 254,
1: -	Root_RAM0 = 1048576,
1: -	Root_RAM1 = 1048577,
1: -	Root_FD0 = 2097152,
1: -	Root_HDA1 = 3145729,
1: -	Root_HDA2 = 3145730,
1: -	Root_SDA1 = 8388609,
1: -	Root_SDA2 = 8388610,
1: -	Root_HDC1 = 23068673,
1: -	Root_SR0 = 11534336,
1: +  union {
1: +    struct {
1: +      struct sk_buff *next;
1: +      struct sk_buff *prev;
1: +      union {
1: +        struct net_device *dev;
1: +        long unsigned int dev_scratch;
1: +      };
1: +    };
1: +    struct rb_node rbnode;
1: +    struct list_head list;
1: +  };
1: +  union {
1: +    struct sock *sk;
1: +    int ip_defrag_offset;
1: +  };
1: +  union {
1: +    ktime_t tstamp;
1: +    u64 skb_mstamp_ns;
1: +  };
1: +  char cb[48];
1: +  union {
1: +    struct {
1: +      long unsigned int _skb_refdst;
1: +      void (*destructor)(struct sk_buff *);
1: +    };
1: +    struct list_head tcp_tsorted_anchor;
1: +  };
1: +  unsigned int len;
1: +  unsigned int data_len;
1: +  __u16 mac_len;
1: +  __u16 hdr_len;
1: +  __u16 queue_mapping;
1: +  __u8 __cloned_offset[0];
1: +  __u8 cloned : 1;
1: +  __u8 nohdr : 1;
1: +  __u8 fclone : 2;
1: +  __u8 peeked : 1;
1: +  __u8 head_frag : 1;
1: +  __u8 pfmemalloc : 1;
1: +  __u8 active_extensions;
1: +  __u32 headers_start[0];
1: +  __u8 __pkt_type_offset[0];
1: +  __u8 pkt_type : 3;
1: +  __u8 ignore_df : 1;
1: +  __u8 nf_trace : 1;
1: +  __u8 ip_summed : 2;
1: +  __u8 ooo_okay : 1;
1: +  __u8 l4_hash : 1;
1: +  __u8 sw_hash : 1;
1: +  __u8 wifi_acked_valid : 1;
1: +  __u8 wifi_acked : 1;
1: +  __u8 no_fcs : 1;
1: +  __u8 encapsulation : 1;
1: +  __u8 encap_hdr_csum : 1;
1: +  __u8 csum_valid : 1;
1: +  __u8 __pkt_vlan_present_offset[0];
1: +  __u8 vlan_present : 1;
1: +  __u8 csum_complete_sw : 1;
1: +  __u8 csum_level : 2;
1: +  __u8 csum_not_inet : 1;
1: +  __u8 dst_pending_confirm : 1;
1: +  __u8 ndisc_nodetype : 2;
1: +  __u8 ipvs_property : 1;
1: +  __u8 inner_protocol_type : 1;
1: +  __u8 remcsum_offload : 1;
1: +  __u8 tc_skip_classify : 1;
1: +  __u8 tc_at_ingress : 1;
1: +  __u8 redirected : 1;
1: +  __u8 from_ingress : 1;
1: +  __u16 tc_index;
1: +  union {
1: +    __wsum csum;
1: +    struct {
1: +      __u16 csum_start;
1: +      __u16 csum_offset;
1: +    };
1: +  };
1: +  __u32 priority;
1: +  int skb_iif;
1: +  __u32 hash;
1: +  __be16 vlan_proto;
1: +  __u16 vlan_tci;
1: +  union {
1: +    unsigned int napi_id;
1: +    unsigned int sender_cpu;
1: +  };
1: +  __u32 secmark;
1: +  union {
1: +    __u32 mark;
1: +    __u32 reserved_tailroom;
1: +  };
1: +  union {
1: +    __be16 inner_protocol;
1: +    __u8 inner_ipproto;
1: +  };
1: +  __u16 inner_transport_header;
1: +  __u16 inner_network_header;
1: +  __u16 inner_mac_header;
1: +  __be16 protocol;
1: +  __u16 transport_header;
1: +  __u16 network_header;
1: +  __u16 mac_header;
1: +  __u32 headers_end[0];
1: +  sk_buff_data_t tail;
1: +  sk_buff_data_t end;
1: +  unsigned char *head;
1: +  unsigned char *data;
1: +  unsigned int truesize;
1: +  refcount_t users;
1: +  struct skb_ext *extensions;
1: +};
1: +
1: +enum {
1: +  Root_NFS = 255,
1: +  Root_CIFS = 254,
1: +  Root_RAM0 = 1048576,
1: +  Root_RAM1 = 1048577,
1: +  Root_FD0 = 2097152,
1: +  Root_HDA1 = 3145729,
1: +  Root_HDA2 = 3145730,
1: +  Root_SDA1 = 8388609,
1: +  Root_SDA2 = 8388610,
1: +  Root_HDC1 = 23068673,
1: +  Root_SR0 = 11534336,
1:  };
1:  
1:  struct ethhdr {
1: -	unsigned char h_dest[6];
1: -	unsigned char h_source[6];
1: -	__be16 h_proto;
1: +  unsigned char h_dest[6];
1: +  unsigned char h_source[6];
1: +  __be16 h_proto;
1:  };
1:  
1:  struct flowi_tunnel {
1: -	__be64 tun_id;
1: +  __be64 tun_id;
1:  };
1:  
1:  struct flowi_common {
1: -	int flowic_oif;
1: -	int flowic_iif;
1: -	__u32 flowic_mark;
1: -	__u8 flowic_tos;
1: -	__u8 flowic_scope;
1: -	__u8 flowic_proto;
1: -	__u8 flowic_flags;
1: -	__u32 flowic_secid;
1: -	kuid_t flowic_uid;
1: -	struct flowi_tunnel flowic_tun_key;
1: -	__u32 flowic_multipath_hash;
1: +  int flowic_oif;
1: +  int flowic_iif;
1: +  __u32 flowic_mark;
1: +  __u8 flowic_tos;
1: +  __u8 flowic_scope;
1: +  __u8 flowic_proto;
1: +  __u8 flowic_flags;
1: +  __u32 flowic_secid;
1: +  kuid_t flowic_uid;
1: +  struct flowi_tunnel flowic_tun_key;
1: +  __u32 flowic_multipath_hash;
1:  };
1:  
1:  union flowi_uli {
1: -	struct {
1: -		__be16 dport;
1: -		__be16 sport;
1: -	} ports;
1: -	struct {
1: -		__u8 type;
1: -		__u8 code;
1: -	} icmpt;
1: -	struct {
1: -		__le16 dport;
1: -		__le16 sport;
1: -	} dnports;
1: -	__be32 spi;
1: -	__be32 gre_key;
1: -	struct {
1: -		__u8 type;
1: -	} mht;
1: +  struct {
1: +    __be16 dport;
1: +    __be16 sport;
1: +  } ports;
1: +  struct {
1: +    __u8 type;
1: +    __u8 code;
1: +  } icmpt;
1: +  struct {
1: +    __le16 dport;
1: +    __le16 sport;
1: +  } dnports;
1: +  __be32 spi;
1: +  __be32 gre_key;
1: +  struct {
1: +    __u8 type;
1: +  } mht;
1:  };
1:  
1:  struct flowi4 {
1: -	struct flowi_common __fl_common;
1: -	__be32 saddr;
1: -	__be32 daddr;
1: -	union flowi_uli uli;
1: +  struct flowi_common __fl_common;
1: +  __be32 saddr;
1: +  __be32 daddr;
1: +  union flowi_uli uli;
1:  };
1:  
1:  struct flowi6 {
1: -	struct flowi_common __fl_common;
1: -	struct in6_addr daddr;
1: -	struct in6_addr saddr;
1: -	__be32 flowlabel;
1: -	union flowi_uli uli;
1: -	__u32 mp_hash;
1: +  struct flowi_common __fl_common;
1: +  struct in6_addr daddr;
1: +  struct in6_addr saddr;
1: +  __be32 flowlabel;
1: +  union flowi_uli uli;
1: +  __u32 mp_hash;
1:  };
1:  
1:  struct flowidn {
1: -	struct flowi_common __fl_common;
1: -	__le16 daddr;
1: -	__le16 saddr;
1: -	union flowi_uli uli;
1: +  struct flowi_common __fl_common;
1: +  __le16 daddr;
1: +  __le16 saddr;
1: +  union flowi_uli uli;
1:  };
1:  
1:  struct flowi {
1: -	union {
1: -		struct flowi_common __fl_common;
1: -		struct flowi4 ip4;
1: -		struct flowi6 ip6;
1: -		struct flowidn dn;
1: -	} u;
1: +  union {
1: +    struct flowi_common __fl_common;
1: +    struct flowi4 ip4;
1: +    struct flowi6 ip6;
1: +    struct flowidn dn;
1: +  } u;
1:  };
1:  
1:  struct ipstats_mib {
1: -	u64 mibs[37];
1: -	struct u64_stats_sync syncp;
1: +  u64 mibs[37];
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct icmp_mib {
1: -	long unsigned int mibs[28];
1: +  long unsigned int mibs[28];
1:  };
1:  
1:  struct icmpmsg_mib {
1: -	atomic_long_t mibs[512];
1: +  atomic_long_t mibs[512];
1:  };
1:  
1:  struct icmpv6_mib {
1: -	long unsigned int mibs[6];
1: +  long unsigned int mibs[6];
1:  };
1:  
1:  struct icmpv6_mib_device {
1: -	atomic_long_t mibs[6];
1: +  atomic_long_t mibs[6];
1:  };
1:  
1:  struct icmpv6msg_mib {
1: -	atomic_long_t mibs[512];
1: +  atomic_long_t mibs[512];
1:  };
1:  
1:  struct icmpv6msg_mib_device {
1: -	atomic_long_t mibs[512];
1: +  atomic_long_t mibs[512];
1:  };
1:  
1:  struct tcp_mib {
1: -	long unsigned int mibs[16];
1: +  long unsigned int mibs[16];
1:  };
1:  
1:  struct udp_mib {
1: -	long unsigned int mibs[10];
1: +  long unsigned int mibs[10];
1:  };
1:  
1:  struct linux_mib {
1: -	long unsigned int mibs[124];
1: +  long unsigned int mibs[124];
1:  };
1:  
1:  struct linux_tls_mib {
1: -	long unsigned int mibs[11];
1: +  long unsigned int mibs[11];
1:  };
1:  
1:  struct inet_frags;
1:  
1:  struct fqdir {
1: -	long int high_thresh;
1: -	long int low_thresh;
1: -	int timeout;
1: -	int max_dist;
1: -	struct inet_frags *f;
1: -	struct net *net;
1: -	bool dead;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	struct rhashtable rhashtable;
1: -	atomic_long_t mem;
1: -	struct work_struct destroy_work;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  long int high_thresh;
1: +  long int low_thresh;
1: +  int timeout;
1: +  int max_dist;
1: +  struct inet_frags *f;
1: +  struct net *net;
1: +  bool dead;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  struct rhashtable rhashtable;
1: +  atomic_long_t mem;
1: +  struct work_struct destroy_work;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct inet_frag_queue;
1:  
1:  struct inet_frags {
1: -	unsigned int qsize;
1: -	void (*constructor)(struct inet_frag_queue *, const void *);
1: -	void (*destructor)(struct inet_frag_queue *);
1: -	void (*frag_expire)(struct timer_list *);
1: -	struct kmem_cache *frags_cachep;
1: -	const char *frags_cache_name;
1: -	struct rhashtable_params rhash_params;
1: -	refcount_t refcnt;
1: -	struct completion completion;
1: +  unsigned int qsize;
1: +  void (*constructor)(struct inet_frag_queue *, const void *);
1: +  void (*destructor)(struct inet_frag_queue *);
1: +  void (*frag_expire)(struct timer_list *);
1: +  struct kmem_cache *frags_cachep;
1: +  const char *frags_cache_name;
1: +  struct rhashtable_params rhash_params;
1: +  refcount_t refcnt;
1: +  struct completion completion;
1:  };
1:  
1:  struct frag_v4_compare_key {
1: -	__be32 saddr;
1: -	__be32 daddr;
1: -	u32 user;
1: -	u32 vif;
1: -	__be16 id;
1: -	u16 protocol;
1: +  __be32 saddr;
1: +  __be32 daddr;
1: +  u32 user;
1: +  u32 vif;
1: +  __be16 id;
1: +  u16 protocol;
1:  };
1:  
1:  struct frag_v6_compare_key {
1: -	struct in6_addr saddr;
1: -	struct in6_addr daddr;
1: -	u32 user;
1: -	__be32 id;
1: -	u32 iif;
1: +  struct in6_addr saddr;
1: +  struct in6_addr daddr;
1: +  u32 user;
1: +  __be32 id;
1: +  u32 iif;
1:  };
1:  
1:  struct inet_frag_queue {
1: -	struct rhash_head node;
1: -	union {
1: -		struct frag_v4_compare_key v4;
1: -		struct frag_v6_compare_key v6;
1: -	} key;
1: -	struct timer_list timer;
1: -	spinlock_t lock;
1: -	refcount_t refcnt;
1: -	struct rb_root rb_fragments;
1: -	struct sk_buff *fragments_tail;
1: -	struct sk_buff *last_run_head;
1: -	ktime_t stamp;
1: -	int len;
1: -	int meat;
1: -	__u8 flags;
1: -	u16 max_size;
1: -	struct fqdir *fqdir;
1: -	struct callback_head rcu;
1: +  struct rhash_head node;
1: +  union {
1: +    struct frag_v4_compare_key v4;
1: +    struct frag_v6_compare_key v6;
1: +  } key;
1: +  struct timer_list timer;
1: +  spinlock_t lock;
1: +  refcount_t refcnt;
1: +  struct rb_root rb_fragments;
1: +  struct sk_buff *fragments_tail;
1: +  struct sk_buff *last_run_head;
1: +  ktime_t stamp;
1: +  int len;
1: +  int meat;
1: +  __u8 flags;
1: +  u16 max_size;
1: +  struct fqdir *fqdir;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct fib_rule;
1: @@ -11054,37 +11134,39 @@ struct netlink_ext_ack;
1:  struct nla_policy;
1:  
1:  struct fib_rules_ops {
1: -	int family;
1: -	struct list_head list;
1: -	int rule_size;
1: -	int addr_size;
1: -	int unresolved_rules;
1: -	int nr_goto_rules;
1: -	unsigned int fib_rules_seq;
1: -	int (*action)(struct fib_rule *, struct flowi *, int, struct fib_lookup_arg *);
1: -	bool (*suppress)(struct fib_rule *, struct fib_lookup_arg *);
1: -	int (*match)(struct fib_rule *, struct flowi *, int);
1: -	int (*configure)(struct fib_rule *, struct sk_buff *, struct fib_rule_hdr *, struct nlattr **, struct netlink_ext_ack *);
1: -	int (*delete)(struct fib_rule *);
1: -	int (*compare)(struct fib_rule *, struct fib_rule_hdr *, struct nlattr **);
1: -	int (*fill)(struct fib_rule *, struct sk_buff *, struct fib_rule_hdr *);
1: -	size_t (*nlmsg_payload)(struct fib_rule *);
1: -	void (*flush_cache)(struct fib_rules_ops *);
1: -	int nlgroup;
1: -	const struct nla_policy *policy;
1: -	struct list_head rules_list;
1: -	struct module *owner;
1: -	struct net *fro_net;
1: -	struct callback_head rcu;
1: +  int family;
1: +  struct list_head list;
1: +  int rule_size;
1: +  int addr_size;
1: +  int unresolved_rules;
1: +  int nr_goto_rules;
1: +  unsigned int fib_rules_seq;
1: +  int (*action)(struct fib_rule *, struct flowi *, int,
1: +                struct fib_lookup_arg *);
1: +  bool (*suppress)(struct fib_rule *, struct fib_lookup_arg *);
1: +  int (*match)(struct fib_rule *, struct flowi *, int);
1: +  int (*configure)(struct fib_rule *, struct sk_buff *, struct fib_rule_hdr *,
1: +                   struct nlattr **, struct netlink_ext_ack *);
1: +  int (*delete)(struct fib_rule *);
1: +  int (*compare)(struct fib_rule *, struct fib_rule_hdr *, struct nlattr **);
1: +  int (*fill)(struct fib_rule *, struct sk_buff *, struct fib_rule_hdr *);
1: +  size_t (*nlmsg_payload)(struct fib_rule *);
1: +  void (*flush_cache)(struct fib_rules_ops *);
1: +  int nlgroup;
1: +  const struct nla_policy *policy;
1: +  struct list_head rules_list;
1: +  struct module *owner;
1: +  struct net *fro_net;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum tcp_ca_event {
1: -	CA_EVENT_TX_START = 0,
1: -	CA_EVENT_CWND_RESTART = 1,
1: -	CA_EVENT_COMPLETE_CWR = 2,
1: -	CA_EVENT_LOSS = 3,
1: -	CA_EVENT_ECN_NO_CE = 4,
1: -	CA_EVENT_ECN_IS_CE = 5,
1: +  CA_EVENT_TX_START = 0,
1: +  CA_EVENT_CWND_RESTART = 1,
1: +  CA_EVENT_COMPLETE_CWR = 2,
1: +  CA_EVENT_LOSS = 3,
1: +  CA_EVENT_ECN_NO_CE = 4,
1: +  CA_EVENT_ECN_IS_CE = 5,
1:  };
1:  
1:  struct ack_sample;
1: @@ -11094,33 +11176,34 @@ struct rate_sample;
1:  union tcp_cc_info;
1:  
1:  struct tcp_congestion_ops {
1: -	struct list_head list;
1: -	u32 key;
1: -	u32 flags;
1: -	void (*init)(struct sock *);
1: -	void (*release)(struct sock *);
1: -	u32 (*ssthresh)(struct sock *);
1: -	void (*cong_avoid)(struct sock *, u32, u32);
1: -	void (*set_state)(struct sock *, u8);
1: -	void (*cwnd_event)(struct sock *, enum tcp_ca_event);
1: -	void (*in_ack_event)(struct sock *, u32);
1: -	u32 (*undo_cwnd)(struct sock *);
1: -	void (*pkts_acked)(struct sock *, const struct ack_sample *);
1: -	u32 (*min_tso_segs)(struct sock *);
1: -	u32 (*sndbuf_expand)(struct sock *);
1: -	void (*cong_control)(struct sock *, const struct rate_sample *);
1: -	size_t (*get_info)(struct sock *, u32, int *, union tcp_cc_info *);
1: -	char name[16];
1: -	struct module *owner;
1: +  struct list_head list;
1: +  u32 key;
1: +  u32 flags;
1: +  void (*init)(struct sock *);
1: +  void (*release)(struct sock *);
1: +  u32 (*ssthresh)(struct sock *);
1: +  void (*cong_avoid)(struct sock *, u32, u32);
1: +  void (*set_state)(struct sock *, u8);
1: +  void (*cwnd_event)(struct sock *, enum tcp_ca_event);
1: +  void (*in_ack_event)(struct sock *, u32);
1: +  u32 (*undo_cwnd)(struct sock *);
1: +  void (*pkts_acked)(struct sock *, const struct ack_sample *);
1: +  u32 (*min_tso_segs)(struct sock *);
1: +  u32 (*sndbuf_expand)(struct sock *);
1: +  void (*cong_control)(struct sock *, const struct rate_sample *);
1: +  size_t (*get_info)(struct sock *, u32, int *, union tcp_cc_info *);
1: +  char name[16];
1: +  struct module *owner;
1:  };
1:  
1:  struct fib_notifier_ops {
1: -	int family;
1: -	struct list_head list;
1: -	unsigned int (*fib_seq_read)(struct net *);
1: -	int (*fib_dump)(struct net *, struct notifier_block *, struct netlink_ext_ack *);
1: -	struct module *owner;
1: -	struct callback_head rcu;
1: +  int family;
1: +  struct list_head list;
1: +  unsigned int (*fib_seq_read)(struct net *);
1: +  int (*fib_dump)(struct net *, struct notifier_block *,
1: +                  struct netlink_ext_ack *);
1: +  struct module *owner;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct xfrm_state;
1: @@ -11128,31 +11211,31 @@ struct xfrm_state;
1:  struct lwtunnel_state;
1:  
1:  struct dst_entry {
1: -	struct net_device *dev;
1: -	struct dst_ops *ops;
1: -	long unsigned int _metrics;
1: -	long unsigned int expires;
1: -	struct xfrm_state *xfrm;
1: -	int (*input)(struct sk_buff *);
1: -	int (*output)(struct net *, struct sock *, struct sk_buff *);
1: -	short unsigned int flags;
1: -	short int obsolete;
1: -	short unsigned int header_len;
1: -	short unsigned int trailer_len;
1: -	atomic_t __refcnt;
1: -	int __use;
1: -	long unsigned int lastuse;
1: -	struct lwtunnel_state *lwtstate;
1: -	struct callback_head callback_head;
1: -	short int error;
1: -	short int __pad;
1: -	__u32 tclassid;
1: +  struct net_device *dev;
1: +  struct dst_ops *ops;
1: +  long unsigned int _metrics;
1: +  long unsigned int expires;
1: +  struct xfrm_state *xfrm;
1: +  int (*input)(struct sk_buff *);
1: +  int (*output)(struct net *, struct sock *, struct sk_buff *);
1: +  short unsigned int flags;
1: +  short int obsolete;
1: +  short unsigned int header_len;
1: +  short unsigned int trailer_len;
1: +  atomic_t __refcnt;
1: +  int __use;
1: +  long unsigned int lastuse;
1: +  struct lwtunnel_state *lwtstate;
1: +  struct callback_head callback_head;
1: +  short int error;
1: +  short int __pad;
1: +  __u32 tclassid;
1:  };
1:  
1:  struct hh_cache {
1: -	unsigned int hh_len;
1: -	seqlock_t hh_lock;
1: -	long unsigned int hh_data[12];
1: +  unsigned int hh_len;
1: +  seqlock_t hh_lock;
1: +  long unsigned int hh_data[12];
1:  };
1:  
1:  struct neigh_table;
1: @@ -11162,849 +11245,866 @@ struct neigh_parms;
1:  struct neigh_ops;
1:  
1:  struct neighbour {
1: -	struct neighbour *next;
1: -	struct neigh_table *tbl;
1: -	struct neigh_parms *parms;
1: -	long unsigned int confirmed;
1: -	long unsigned int updated;
1: -	rwlock_t lock;
1: -	refcount_t refcnt;
1: -	unsigned int arp_queue_len_bytes;
1: -	struct sk_buff_head arp_queue;
1: -	struct timer_list timer;
1: -	long unsigned int used;
1: -	atomic_t probes;
1: -	__u8 flags;
1: -	__u8 nud_state;
1: -	__u8 type;
1: -	__u8 dead;
1: -	u8 protocol;
1: -	seqlock_t ha_lock;
1: -	unsigned char ha[32];
1: -	struct hh_cache hh;
1: -	int (*output)(struct neighbour *, struct sk_buff *);
1: -	const struct neigh_ops *ops;
1: -	struct list_head gc_list;
1: -	struct callback_head rcu;
1: -	struct net_device *dev;
1: -	u8 primary_key[0];
1: +  struct neighbour *next;
1: +  struct neigh_table *tbl;
1: +  struct neigh_parms *parms;
1: +  long unsigned int confirmed;
1: +  long unsigned int updated;
1: +  rwlock_t lock;
1: +  refcount_t refcnt;
1: +  unsigned int arp_queue_len_bytes;
1: +  struct sk_buff_head arp_queue;
1: +  struct timer_list timer;
1: +  long unsigned int used;
1: +  atomic_t probes;
1: +  __u8 flags;
1: +  __u8 nud_state;
1: +  __u8 type;
1: +  __u8 dead;
1: +  u8 protocol;
1: +  seqlock_t ha_lock;
1: +  unsigned char ha[32];
1: +  struct hh_cache hh;
1: +  int (*output)(struct neighbour *, struct sk_buff *);
1: +  const struct neigh_ops *ops;
1: +  struct list_head gc_list;
1: +  struct callback_head rcu;
1: +  struct net_device *dev;
1: +  u8 primary_key[0];
1:  };
1:  
1:  struct ipv6_stable_secret {
1: -	bool initialized;
1: -	struct in6_addr secret;
1: +  bool initialized;
1: +  struct in6_addr secret;
1:  };
1:  
1:  struct ipv6_devconf {
1: -	__s32 forwarding;
1: -	__s32 hop_limit;
1: -	__s32 mtu6;
1: -	__s32 accept_ra;
1: -	__s32 accept_redirects;
1: -	__s32 autoconf;
1: -	__s32 dad_transmits;
1: -	__s32 rtr_solicits;
1: -	__s32 rtr_solicit_interval;
1: -	__s32 rtr_solicit_max_interval;
1: -	__s32 rtr_solicit_delay;
1: -	__s32 force_mld_version;
1: -	__s32 mldv1_unsolicited_report_interval;
1: -	__s32 mldv2_unsolicited_report_interval;
1: -	__s32 use_tempaddr;
1: -	__s32 temp_valid_lft;
1: -	__s32 temp_prefered_lft;
1: -	__s32 regen_max_retry;
1: -	__s32 max_desync_factor;
1: -	__s32 max_addresses;
1: -	__s32 accept_ra_defrtr;
1: -	__s32 accept_ra_min_hop_limit;
1: -	__s32 accept_ra_pinfo;
1: -	__s32 ignore_routes_with_linkdown;
1: -	__s32 accept_ra_rtr_pref;
1: -	__s32 rtr_probe_interval;
1: -	__s32 accept_ra_rt_info_min_plen;
1: -	__s32 accept_ra_rt_info_max_plen;
1: -	__s32 proxy_ndp;
1: -	__s32 accept_source_route;
1: -	__s32 accept_ra_from_local;
1: -	__s32 disable_ipv6;
1: -	__s32 drop_unicast_in_l2_multicast;
1: -	__s32 accept_dad;
1: -	__s32 force_tllao;
1: -	__s32 ndisc_notify;
1: -	__s32 suppress_frag_ndisc;
1: -	__s32 accept_ra_mtu;
1: -	__s32 drop_unsolicited_na;
1: -	struct ipv6_stable_secret stable_secret;
1: -	__s32 use_oif_addrs_only;
1: -	__s32 keep_addr_on_down;
1: -	__s32 seg6_enabled;
1: -	__u32 enhanced_dad;
1: -	__u32 addr_gen_mode;
1: -	__s32 disable_policy;
1: -	__s32 ndisc_tclass;
1: -	__s32 rpl_seg_enabled;
1: -	struct ctl_table_header *sysctl_header;
1: +  __s32 forwarding;
1: +  __s32 hop_limit;
1: +  __s32 mtu6;
1: +  __s32 accept_ra;
1: +  __s32 accept_redirects;
1: +  __s32 autoconf;
1: +  __s32 dad_transmits;
1: +  __s32 rtr_solicits;
1: +  __s32 rtr_solicit_interval;
1: +  __s32 rtr_solicit_max_interval;
1: +  __s32 rtr_solicit_delay;
1: +  __s32 force_mld_version;
1: +  __s32 mldv1_unsolicited_report_interval;
1: +  __s32 mldv2_unsolicited_report_interval;
1: +  __s32 use_tempaddr;
1: +  __s32 temp_valid_lft;
1: +  __s32 temp_prefered_lft;
1: +  __s32 regen_max_retry;
1: +  __s32 max_desync_factor;
1: +  __s32 max_addresses;
1: +  __s32 accept_ra_defrtr;
1: +  __s32 accept_ra_min_hop_limit;
1: +  __s32 accept_ra_pinfo;
1: +  __s32 ignore_routes_with_linkdown;
1: +  __s32 accept_ra_rtr_pref;
1: +  __s32 rtr_probe_interval;
1: +  __s32 accept_ra_rt_info_min_plen;
1: +  __s32 accept_ra_rt_info_max_plen;
1: +  __s32 proxy_ndp;
1: +  __s32 accept_source_route;
1: +  __s32 accept_ra_from_local;
1: +  __s32 disable_ipv6;
1: +  __s32 drop_unicast_in_l2_multicast;
1: +  __s32 accept_dad;
1: +  __s32 force_tllao;
1: +  __s32 ndisc_notify;
1: +  __s32 suppress_frag_ndisc;
1: +  __s32 accept_ra_mtu;
1: +  __s32 drop_unsolicited_na;
1: +  struct ipv6_stable_secret stable_secret;
1: +  __s32 use_oif_addrs_only;
1: +  __s32 keep_addr_on_down;
1: +  __s32 seg6_enabled;
1: +  __u32 enhanced_dad;
1: +  __u32 addr_gen_mode;
1: +  __s32 disable_policy;
1: +  __s32 ndisc_tclass;
1: +  __s32 rpl_seg_enabled;
1: +  struct ctl_table_header *sysctl_header;
1:  };
1:  
1:  struct nf_queue_entry;
1:  
1:  struct nf_queue_handler {
1: -	int (*outfn)(struct nf_queue_entry *, unsigned int);
1: -	void (*nf_hook_drop)(struct net *);
1: +  int (*outfn)(struct nf_queue_entry *, unsigned int);
1: +  void (*nf_hook_drop)(struct net *);
1:  };
1:  
1:  enum nf_log_type {
1: -	NF_LOG_TYPE_LOG = 0,
1: -	NF_LOG_TYPE_ULOG = 1,
1: -	NF_LOG_TYPE_MAX = 2,
1: +  NF_LOG_TYPE_LOG = 0,
1: +  NF_LOG_TYPE_ULOG = 1,
1: +  NF_LOG_TYPE_MAX = 2,
1:  };
1:  
1:  typedef u8 u_int8_t;
1:  
1:  struct nf_loginfo;
1:  
1: -typedef void nf_logfn(struct net *, u_int8_t, unsigned int, const struct sk_buff *, const struct net_device *, const struct net_device *, const struct nf_loginfo *, const char *);
1: +typedef void nf_logfn(struct net *, u_int8_t, unsigned int,
1: +                      const struct sk_buff *, const struct net_device *,
1: +                      const struct net_device *, const struct nf_loginfo *,
1: +                      const char *);
1:  
1:  struct nf_logger {
1: -	char *name;
1: -	enum nf_log_type type;
1: -	nf_logfn *logfn;
1: -	struct module *me;
1: +  char *name;
1: +  enum nf_log_type type;
1: +  nf_logfn *logfn;
1: +  struct module *me;
1:  };
1:  
1:  typedef struct {
1: -	union {
1: -		void *kernel;
1: -		void *user;
1: -	};
1: -	bool is_kernel: 1;
1: +  union {
1: +    void *kernel;
1: +    void *user;
1: +  };
1: +  bool is_kernel : 1;
1:  } sockptr_t;
1:  
1:  typedef enum {
1: -	SS_FREE = 0,
1: -	SS_UNCONNECTED = 1,
1: -	SS_CONNECTING = 2,
1: -	SS_CONNECTED = 3,
1: -	SS_DISCONNECTING = 4,
1: +  SS_FREE = 0,
1: +  SS_UNCONNECTED = 1,
1: +  SS_CONNECTING = 2,
1: +  SS_CONNECTED = 3,
1: +  SS_DISCONNECTING = 4,
1:  } socket_state;
1:  
1:  struct socket_wq {
1: -	wait_queue_head_t wait;
1: -	struct fasync_struct *fasync_list;
1: -	long unsigned int flags;
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  wait_queue_head_t wait;
1: +  struct fasync_struct *fasync_list;
1: +  long unsigned int flags;
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct proto_ops;
1:  
1:  struct socket {
1: -	socket_state state;
1: -	short int type;
1: -	long unsigned int flags;
1: -	struct file *file;
1: -	struct sock *sk;
1: -	const struct proto_ops *ops;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct socket_wq wq;
1: +  socket_state state;
1: +  short int type;
1: +  long unsigned int flags;
1: +  struct file *file;
1: +  struct sock *sk;
1: +  const struct proto_ops *ops;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct socket_wq wq;
1:  };
1:  
1: -typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *, unsigned int, size_t);
1: +typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *,
1: +                               unsigned int, size_t);
1:  
1:  struct proto_ops {
1: -	int family;
1: -	unsigned int flags;
1: -	struct module *owner;
1: -	int (*release)(struct socket *);
1: -	int (*bind)(struct socket *, struct sockaddr *, int);
1: -	int (*connect)(struct socket *, struct sockaddr *, int, int);
1: -	int (*socketpair)(struct socket *, struct socket *);
1: -	int (*accept)(struct socket *, struct socket *, int, bool);
1: -	int (*getname)(struct socket *, struct sockaddr *, int);
1: -	__poll_t (*poll)(struct file *, struct socket *, struct poll_table_struct *);
1: -	int (*ioctl)(struct socket *, unsigned int, long unsigned int);
1: -	int (*compat_ioctl)(struct socket *, unsigned int, long unsigned int);
1: -	int (*gettstamp)(struct socket *, void *, bool, bool);
1: -	int (*listen)(struct socket *, int);
1: -	int (*shutdown)(struct socket *, int);
1: -	int (*setsockopt)(struct socket *, int, int, sockptr_t, unsigned int);
1: -	int (*getsockopt)(struct socket *, int, int, char *, int *);
1: -	void (*show_fdinfo)(struct seq_file *, struct socket *);
1: -	int (*sendmsg)(struct socket *, struct msghdr *, size_t);
1: -	int (*recvmsg)(struct socket *, struct msghdr *, size_t, int);
1: -	int (*mmap)(struct file *, struct socket *, struct vm_area_struct *);
1: -	ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int);
1: -	ssize_t (*splice_read)(struct socket *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
1: -	int (*set_peek_off)(struct sock *, int);
1: -	int (*peek_len)(struct socket *);
1: -	int (*read_sock)(struct sock *, read_descriptor_t *, sk_read_actor_t);
1: -	int (*sendpage_locked)(struct sock *, struct page *, int, size_t, int);
1: -	int (*sendmsg_locked)(struct sock *, struct msghdr *, size_t);
1: -	int (*set_rcvlowat)(struct sock *, int);
1: +  int family;
1: +  unsigned int flags;
1: +  struct module *owner;
1: +  int (*release)(struct socket *);
1: +  int (*bind)(struct socket *, struct sockaddr *, int);
1: +  int (*connect)(struct socket *, struct sockaddr *, int, int);
1: +  int (*socketpair)(struct socket *, struct socket *);
1: +  int (*accept)(struct socket *, struct socket *, int, bool);
1: +  int (*getname)(struct socket *, struct sockaddr *, int);
1: +  __poll_t (*poll)(struct file *, struct socket *, struct poll_table_struct *);
1: +  int (*ioctl)(struct socket *, unsigned int, long unsigned int);
1: +  int (*compat_ioctl)(struct socket *, unsigned int, long unsigned int);
1: +  int (*gettstamp)(struct socket *, void *, bool, bool);
1: +  int (*listen)(struct socket *, int);
1: +  int (*shutdown)(struct socket *, int);
1: +  int (*setsockopt)(struct socket *, int, int, sockptr_t, unsigned int);
1: +  int (*getsockopt)(struct socket *, int, int, char *, int *);
1: +  void (*show_fdinfo)(struct seq_file *, struct socket *);
1: +  int (*sendmsg)(struct socket *, struct msghdr *, size_t);
1: +  int (*recvmsg)(struct socket *, struct msghdr *, size_t, int);
1: +  int (*mmap)(struct file *, struct socket *, struct vm_area_struct *);
1: +  ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int);
1: +  ssize_t (*splice_read)(struct socket *, loff_t *, struct pipe_inode_info *,
1: +                         size_t, unsigned int);
1: +  int (*set_peek_off)(struct sock *, int);
1: +  int (*peek_len)(struct socket *);
1: +  int (*read_sock)(struct sock *, read_descriptor_t *, sk_read_actor_t);
1: +  int (*sendpage_locked)(struct sock *, struct page *, int, size_t, int);
1: +  int (*sendmsg_locked)(struct sock *, struct msghdr *, size_t);
1: +  int (*set_rcvlowat)(struct sock *, int);
1:  };
1:  
1:  struct pipe_buf_operations;
1:  
1:  struct pipe_buffer {
1: -	struct page *page;
1: -	unsigned int offset;
1: -	unsigned int len;
1: -	const struct pipe_buf_operations *ops;
1: -	unsigned int flags;
1: -	long unsigned int private;
1: +  struct page *page;
1: +  unsigned int offset;
1: +  unsigned int len;
1: +  const struct pipe_buf_operations *ops;
1: +  unsigned int flags;
1: +  long unsigned int private;
1:  };
1:  
1:  struct pipe_buf_operations {
1: -	int (*confirm)(struct pipe_inode_info *, struct pipe_buffer *);
1: -	void (*release)(struct pipe_inode_info *, struct pipe_buffer *);
1: -	bool (*try_steal)(struct pipe_inode_info *, struct pipe_buffer *);
1: -	bool (*get)(struct pipe_inode_info *, struct pipe_buffer *);
1: +  int (*confirm)(struct pipe_inode_info *, struct pipe_buffer *);
1: +  void (*release)(struct pipe_inode_info *, struct pipe_buffer *);
1: +  bool (*try_steal)(struct pipe_inode_info *, struct pipe_buffer *);
1: +  bool (*get)(struct pipe_inode_info *, struct pipe_buffer *);
1:  };
1:  
1:  struct skb_ext {
1: -	refcount_t refcnt;
1: -	u8 offset[2];
1: -	u8 chunks;
1: -	char: 8;
1: -	char data[0];
1: +  refcount_t refcnt;
1: +  u8 offset[2];
1: +  u8 chunks;
1: +  char : 8;
1: +  char data[0];
1:  };
1:  
1:  struct dql {
1: -	unsigned int num_queued;
1: -	unsigned int adj_limit;
1: -	unsigned int last_obj_cnt;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	unsigned int limit;
1: -	unsigned int num_completed;
1: -	unsigned int prev_ovlimit;
1: -	unsigned int prev_num_queued;
1: -	unsigned int prev_last_obj_cnt;
1: -	unsigned int lowest_slack;
1: -	long unsigned int slack_start_time;
1: -	unsigned int max_limit;
1: -	unsigned int min_limit;
1: -	unsigned int slack_hold_time;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: +  unsigned int num_queued;
1: +  unsigned int adj_limit;
1: +  unsigned int last_obj_cnt;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  unsigned int limit;
1: +  unsigned int num_completed;
1: +  unsigned int prev_ovlimit;
1: +  unsigned int prev_num_queued;
1: +  unsigned int prev_last_obj_cnt;
1: +  unsigned int lowest_slack;
1: +  long unsigned int slack_start_time;
1: +  unsigned int max_limit;
1: +  unsigned int min_limit;
1: +  unsigned int slack_hold_time;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ethtool_drvinfo {
1: -	__u32 cmd;
1: -	char driver[32];
1: -	char version[32];
1: -	char fw_version[32];
1: -	char bus_info[32];
1: -	char erom_version[32];
1: -	char reserved2[12];
1: -	__u32 n_priv_flags;
1: -	__u32 n_stats;
1: -	__u32 testinfo_len;
1: -	__u32 eedump_len;
1: -	__u32 regdump_len;
1: +  __u32 cmd;
1: +  char driver[32];
1: +  char version[32];
1: +  char fw_version[32];
1: +  char bus_info[32];
1: +  char erom_version[32];
1: +  char reserved2[12];
1: +  __u32 n_priv_flags;
1: +  __u32 n_stats;
1: +  __u32 testinfo_len;
1: +  __u32 eedump_len;
1: +  __u32 regdump_len;
1:  };
1:  
1:  struct ethtool_wolinfo {
1: -	__u32 cmd;
1: -	__u32 supported;
1: -	__u32 wolopts;
1: -	__u8 sopass[6];
1: +  __u32 cmd;
1: +  __u32 supported;
1: +  __u32 wolopts;
1: +  __u8 sopass[6];
1:  };
1:  
1:  struct ethtool_tunable {
1: -	__u32 cmd;
1: -	__u32 id;
1: -	__u32 type_id;
1: -	__u32 len;
1: -	void *data[0];
1: +  __u32 cmd;
1: +  __u32 id;
1: +  __u32 type_id;
1: +  __u32 len;
1: +  void *data[0];
1:  };
1:  
1:  struct ethtool_regs {
1: -	__u32 cmd;
1: -	__u32 version;
1: -	__u32 len;
1: -	__u8 data[0];
1: +  __u32 cmd;
1: +  __u32 version;
1: +  __u32 len;
1: +  __u8 data[0];
1:  };
1:  
1:  struct ethtool_eeprom {
1: -	__u32 cmd;
1: -	__u32 magic;
1: -	__u32 offset;
1: -	__u32 len;
1: -	__u8 data[0];
1: +  __u32 cmd;
1: +  __u32 magic;
1: +  __u32 offset;
1: +  __u32 len;
1: +  __u8 data[0];
1:  };
1:  
1:  struct ethtool_eee {
1: -	__u32 cmd;
1: -	__u32 supported;
1: -	__u32 advertised;
1: -	__u32 lp_advertised;
1: -	__u32 eee_active;
1: -	__u32 eee_enabled;
1: -	__u32 tx_lpi_enabled;
1: -	__u32 tx_lpi_timer;
1: -	__u32 reserved[2];
1: +  __u32 cmd;
1: +  __u32 supported;
1: +  __u32 advertised;
1: +  __u32 lp_advertised;
1: +  __u32 eee_active;
1: +  __u32 eee_enabled;
1: +  __u32 tx_lpi_enabled;
1: +  __u32 tx_lpi_timer;
1: +  __u32 reserved[2];
1:  };
1:  
1:  struct ethtool_modinfo {
1: -	__u32 cmd;
1: -	__u32 type;
1: -	__u32 eeprom_len;
1: -	__u32 reserved[8];
1: +  __u32 cmd;
1: +  __u32 type;
1: +  __u32 eeprom_len;
1: +  __u32 reserved[8];
1:  };
1:  
1:  struct ethtool_coalesce {
1: -	__u32 cmd;
1: -	__u32 rx_coalesce_usecs;
1: -	__u32 rx_max_coalesced_frames;
1: -	__u32 rx_coalesce_usecs_irq;
1: -	__u32 rx_max_coalesced_frames_irq;
1: -	__u32 tx_coalesce_usecs;
1: -	__u32 tx_max_coalesced_frames;
1: -	__u32 tx_coalesce_usecs_irq;
1: -	__u32 tx_max_coalesced_frames_irq;
1: -	__u32 stats_block_coalesce_usecs;
1: -	__u32 use_adaptive_rx_coalesce;
1: -	__u32 use_adaptive_tx_coalesce;
1: -	__u32 pkt_rate_low;
1: -	__u32 rx_coalesce_usecs_low;
1: -	__u32 rx_max_coalesced_frames_low;
1: -	__u32 tx_coalesce_usecs_low;
1: -	__u32 tx_max_coalesced_frames_low;
1: -	__u32 pkt_rate_high;
1: -	__u32 rx_coalesce_usecs_high;
1: -	__u32 rx_max_coalesced_frames_high;
1: -	__u32 tx_coalesce_usecs_high;
1: -	__u32 tx_max_coalesced_frames_high;
1: -	__u32 rate_sample_interval;
1: +  __u32 cmd;
1: +  __u32 rx_coalesce_usecs;
1: +  __u32 rx_max_coalesced_frames;
1: +  __u32 rx_coalesce_usecs_irq;
1: +  __u32 rx_max_coalesced_frames_irq;
1: +  __u32 tx_coalesce_usecs;
1: +  __u32 tx_max_coalesced_frames;
1: +  __u32 tx_coalesce_usecs_irq;
1: +  __u32 tx_max_coalesced_frames_irq;
1: +  __u32 stats_block_coalesce_usecs;
1: +  __u32 use_adaptive_rx_coalesce;
1: +  __u32 use_adaptive_tx_coalesce;
1: +  __u32 pkt_rate_low;
1: +  __u32 rx_coalesce_usecs_low;
1: +  __u32 rx_max_coalesced_frames_low;
1: +  __u32 tx_coalesce_usecs_low;
1: +  __u32 tx_max_coalesced_frames_low;
1: +  __u32 pkt_rate_high;
1: +  __u32 rx_coalesce_usecs_high;
1: +  __u32 rx_max_coalesced_frames_high;
1: +  __u32 tx_coalesce_usecs_high;
1: +  __u32 tx_max_coalesced_frames_high;
1: +  __u32 rate_sample_interval;
1:  };
1:  
1:  struct ethtool_ringparam {
1: -	__u32 cmd;
1: -	__u32 rx_max_pending;
1: -	__u32 rx_mini_max_pending;
1: -	__u32 rx_jumbo_max_pending;
1: -	__u32 tx_max_pending;
1: -	__u32 rx_pending;
1: -	__u32 rx_mini_pending;
1: -	__u32 rx_jumbo_pending;
1: -	__u32 tx_pending;
1: +  __u32 cmd;
1: +  __u32 rx_max_pending;
1: +  __u32 rx_mini_max_pending;
1: +  __u32 rx_jumbo_max_pending;
1: +  __u32 tx_max_pending;
1: +  __u32 rx_pending;
1: +  __u32 rx_mini_pending;
1: +  __u32 rx_jumbo_pending;
1: +  __u32 tx_pending;
1:  };
1:  
1:  struct ethtool_channels {
1: -	__u32 cmd;
1: -	__u32 max_rx;
1: -	__u32 max_tx;
1: -	__u32 max_other;
1: -	__u32 max_combined;
1: -	__u32 rx_count;
1: -	__u32 tx_count;
1: -	__u32 other_count;
1: -	__u32 combined_count;
1: +  __u32 cmd;
1: +  __u32 max_rx;
1: +  __u32 max_tx;
1: +  __u32 max_other;
1: +  __u32 max_combined;
1: +  __u32 rx_count;
1: +  __u32 tx_count;
1: +  __u32 other_count;
1: +  __u32 combined_count;
1:  };
1:  
1:  struct ethtool_pauseparam {
1: -	__u32 cmd;
1: -	__u32 autoneg;
1: -	__u32 rx_pause;
1: -	__u32 tx_pause;
1: +  __u32 cmd;
1: +  __u32 autoneg;
1: +  __u32 rx_pause;
1: +  __u32 tx_pause;
1:  };
1:  
1:  enum ethtool_link_ext_state {
1: -	ETHTOOL_LINK_EXT_STATE_AUTONEG = 0,
1: -	ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE = 1,
1: -	ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH = 2,
1: -	ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY = 3,
1: -	ETHTOOL_LINK_EXT_STATE_NO_CABLE = 4,
1: -	ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE = 5,
1: -	ETHTOOL_LINK_EXT_STATE_EEPROM_ISSUE = 6,
1: -	ETHTOOL_LINK_EXT_STATE_CALIBRATION_FAILURE = 7,
1: -	ETHTOOL_LINK_EXT_STATE_POWER_BUDGET_EXCEEDED = 8,
1: -	ETHTOOL_LINK_EXT_STATE_OVERHEAT = 9,
1: +  ETHTOOL_LINK_EXT_STATE_AUTONEG = 0,
1: +  ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE = 1,
1: +  ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH = 2,
1: +  ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY = 3,
1: +  ETHTOOL_LINK_EXT_STATE_NO_CABLE = 4,
1: +  ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE = 5,
1: +  ETHTOOL_LINK_EXT_STATE_EEPROM_ISSUE = 6,
1: +  ETHTOOL_LINK_EXT_STATE_CALIBRATION_FAILURE = 7,
1: +  ETHTOOL_LINK_EXT_STATE_POWER_BUDGET_EXCEEDED = 8,
1: +  ETHTOOL_LINK_EXT_STATE_OVERHEAT = 9,
1:  };
1:  
1:  enum ethtool_link_ext_substate_autoneg {
1: -	ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_PARTNER_DETECTED = 1,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_AN_ACK_NOT_RECEIVED = 2,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_AN_NEXT_PAGE_EXCHANGE_FAILED = 3,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_PARTNER_DETECTED_FORCE_MODE = 4,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_AN_FEC_MISMATCH_DURING_OVERRIDE = 5,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_HCD = 6,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_PARTNER_DETECTED = 1,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_AN_ACK_NOT_RECEIVED = 2,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_AN_NEXT_PAGE_EXCHANGE_FAILED = 3,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_PARTNER_DETECTED_FORCE_MODE = 4,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_AN_FEC_MISMATCH_DURING_OVERRIDE = 5,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_HCD = 6,
1:  };
1:  
1:  enum ethtool_link_ext_substate_link_training {
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_FRAME_LOCK_NOT_ACQUIRED = 1,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_INHIBIT_TIMEOUT = 2,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_PARTNER_DID_NOT_SET_RECEIVER_READY = 3,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LT_REMOTE_FAULT = 4,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_FRAME_LOCK_NOT_ACQUIRED = 1,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_INHIBIT_TIMEOUT = 2,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_PARTNER_DID_NOT_SET_RECEIVER_READY = 3,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LT_REMOTE_FAULT = 4,
1:  };
1:  
1:  enum ethtool_link_ext_substate_link_logical_mismatch {
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_BLOCK_LOCK = 1,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_AM_LOCK = 2,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_GET_ALIGN_STATUS = 3,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LLM_FC_FEC_IS_NOT_LOCKED = 4,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_LLM_RS_FEC_IS_NOT_LOCKED = 5,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_BLOCK_LOCK = 1,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_AM_LOCK = 2,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_GET_ALIGN_STATUS = 3,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LLM_FC_FEC_IS_NOT_LOCKED = 4,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_LLM_RS_FEC_IS_NOT_LOCKED = 5,
1:  };
1:  
1:  enum ethtool_link_ext_substate_bad_signal_integrity {
1: -	ETHTOOL_LINK_EXT_SUBSTATE_BSI_LARGE_NUMBER_OF_PHYSICAL_ERRORS = 1,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_BSI_UNSUPPORTED_RATE = 2,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_BSI_LARGE_NUMBER_OF_PHYSICAL_ERRORS = 1,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_BSI_UNSUPPORTED_RATE = 2,
1:  };
1:  
1:  enum ethtool_link_ext_substate_cable_issue {
1: -	ETHTOOL_LINK_EXT_SUBSTATE_CI_UNSUPPORTED_CABLE = 1,
1: -	ETHTOOL_LINK_EXT_SUBSTATE_CI_CABLE_TEST_FAILURE = 2,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_CI_UNSUPPORTED_CABLE = 1,
1: +  ETHTOOL_LINK_EXT_SUBSTATE_CI_CABLE_TEST_FAILURE = 2,
1:  };
1:  
1:  struct ethtool_test {
1: -	__u32 cmd;
1: -	__u32 flags;
1: -	__u32 reserved;
1: -	__u32 len;
1: -	__u64 data[0];
1: +  __u32 cmd;
1: +  __u32 flags;
1: +  __u32 reserved;
1: +  __u32 len;
1: +  __u64 data[0];
1:  };
1:  
1:  struct ethtool_stats {
1: -	__u32 cmd;
1: -	__u32 n_stats;
1: -	__u64 data[0];
1: +  __u32 cmd;
1: +  __u32 n_stats;
1: +  __u64 data[0];
1:  };
1:  
1:  struct ethtool_tcpip4_spec {
1: -	__be32 ip4src;
1: -	__be32 ip4dst;
1: -	__be16 psrc;
1: -	__be16 pdst;
1: -	__u8 tos;
1: +  __be32 ip4src;
1: +  __be32 ip4dst;
1: +  __be16 psrc;
1: +  __be16 pdst;
1: +  __u8 tos;
1:  };
1:  
1:  struct ethtool_ah_espip4_spec {
1: -	__be32 ip4src;
1: -	__be32 ip4dst;
1: -	__be32 spi;
1: -	__u8 tos;
1: +  __be32 ip4src;
1: +  __be32 ip4dst;
1: +  __be32 spi;
1: +  __u8 tos;
1:  };
1:  
1:  struct ethtool_usrip4_spec {
1: -	__be32 ip4src;
1: -	__be32 ip4dst;
1: -	__be32 l4_4_bytes;
1: -	__u8 tos;
1: -	__u8 ip_ver;
1: -	__u8 proto;
1: +  __be32 ip4src;
1: +  __be32 ip4dst;
1: +  __be32 l4_4_bytes;
1: +  __u8 tos;
1: +  __u8 ip_ver;
1: +  __u8 proto;
1:  };
1:  
1:  struct ethtool_tcpip6_spec {
1: -	__be32 ip6src[4];
1: -	__be32 ip6dst[4];
1: -	__be16 psrc;
1: -	__be16 pdst;
1: -	__u8 tclass;
1: +  __be32 ip6src[4];
1: +  __be32 ip6dst[4];
1: +  __be16 psrc;
1: +  __be16 pdst;
1: +  __u8 tclass;
1:  };
1:  
1:  struct ethtool_ah_espip6_spec {
1: -	__be32 ip6src[4];
1: -	__be32 ip6dst[4];
1: -	__be32 spi;
1: -	__u8 tclass;
1: +  __be32 ip6src[4];
1: +  __be32 ip6dst[4];
1: +  __be32 spi;
1: +  __u8 tclass;
1:  };
1:  
1:  struct ethtool_usrip6_spec {
1: -	__be32 ip6src[4];
1: -	__be32 ip6dst[4];
1: -	__be32 l4_4_bytes;
1: -	__u8 tclass;
1: -	__u8 l4_proto;
1: +  __be32 ip6src[4];
1: +  __be32 ip6dst[4];
1: +  __be32 l4_4_bytes;
1: +  __u8 tclass;
1: +  __u8 l4_proto;
1:  };
1:  
1:  union ethtool_flow_union {
1: -	struct ethtool_tcpip4_spec tcp_ip4_spec;
1: -	struct ethtool_tcpip4_spec udp_ip4_spec;
1: -	struct ethtool_tcpip4_spec sctp_ip4_spec;
1: -	struct ethtool_ah_espip4_spec ah_ip4_spec;
1: -	struct ethtool_ah_espip4_spec esp_ip4_spec;
1: -	struct ethtool_usrip4_spec usr_ip4_spec;
1: -	struct ethtool_tcpip6_spec tcp_ip6_spec;
1: -	struct ethtool_tcpip6_spec udp_ip6_spec;
1: -	struct ethtool_tcpip6_spec sctp_ip6_spec;
1: -	struct ethtool_ah_espip6_spec ah_ip6_spec;
1: -	struct ethtool_ah_espip6_spec esp_ip6_spec;
1: -	struct ethtool_usrip6_spec usr_ip6_spec;
1: -	struct ethhdr ether_spec;
1: -	__u8 hdata[52];
1: +  struct ethtool_tcpip4_spec tcp_ip4_spec;
1: +  struct ethtool_tcpip4_spec udp_ip4_spec;
1: +  struct ethtool_tcpip4_spec sctp_ip4_spec;
1: +  struct ethtool_ah_espip4_spec ah_ip4_spec;
1: +  struct ethtool_ah_espip4_spec esp_ip4_spec;
1: +  struct ethtool_usrip4_spec usr_ip4_spec;
1: +  struct ethtool_tcpip6_spec tcp_ip6_spec;
1: +  struct ethtool_tcpip6_spec udp_ip6_spec;
1: +  struct ethtool_tcpip6_spec sctp_ip6_spec;
1: +  struct ethtool_ah_espip6_spec ah_ip6_spec;
1: +  struct ethtool_ah_espip6_spec esp_ip6_spec;
1: +  struct ethtool_usrip6_spec usr_ip6_spec;
1: +  struct ethhdr ether_spec;
1: +  __u8 hdata[52];
1:  };
1:  
1:  struct ethtool_flow_ext {
1: -	__u8 padding[2];
1: -	unsigned char h_dest[6];
1: -	__be16 vlan_etype;
1: -	__be16 vlan_tci;
1: -	__be32 data[2];
1: +  __u8 padding[2];
1: +  unsigned char h_dest[6];
1: +  __be16 vlan_etype;
1: +  __be16 vlan_tci;
1: +  __be32 data[2];
1:  };
1:  
1:  struct ethtool_rx_flow_spec {
1: -	__u32 flow_type;
1: -	union ethtool_flow_union h_u;
1: -	struct ethtool_flow_ext h_ext;
1: -	union ethtool_flow_union m_u;
1: -	struct ethtool_flow_ext m_ext;
1: -	__u64 ring_cookie;
1: -	__u32 location;
1: +  __u32 flow_type;
1: +  union ethtool_flow_union h_u;
1: +  struct ethtool_flow_ext h_ext;
1: +  union ethtool_flow_union m_u;
1: +  struct ethtool_flow_ext m_ext;
1: +  __u64 ring_cookie;
1: +  __u32 location;
1:  };
1:  
1:  struct ethtool_rxnfc {
1: -	__u32 cmd;
1: -	__u32 flow_type;
1: -	__u64 data;
1: -	struct ethtool_rx_flow_spec fs;
1: -	union {
1: -		__u32 rule_cnt;
1: -		__u32 rss_context;
1: -	};
1: -	__u32 rule_locs[0];
1: +  __u32 cmd;
1: +  __u32 flow_type;
1: +  __u64 data;
1: +  struct ethtool_rx_flow_spec fs;
1: +  union {
1: +    __u32 rule_cnt;
1: +    __u32 rss_context;
1: +  };
1: +  __u32 rule_locs[0];
1:  };
1:  
1:  struct ethtool_flash {
1: -	__u32 cmd;
1: -	__u32 region;
1: -	char data[128];
1: +  __u32 cmd;
1: +  __u32 region;
1: +  char data[128];
1:  };
1:  
1:  struct ethtool_dump {
1: -	__u32 cmd;
1: -	__u32 version;
1: -	__u32 flag;
1: -	__u32 len;
1: -	__u8 data[0];
1: +  __u32 cmd;
1: +  __u32 version;
1: +  __u32 flag;
1: +  __u32 len;
1: +  __u8 data[0];
1:  };
1:  
1:  struct ethtool_ts_info {
1: -	__u32 cmd;
1: -	__u32 so_timestamping;
1: -	__s32 phc_index;
1: -	__u32 tx_types;
1: -	__u32 tx_reserved[3];
1: -	__u32 rx_filters;
1: -	__u32 rx_reserved[3];
1: +  __u32 cmd;
1: +  __u32 so_timestamping;
1: +  __s32 phc_index;
1: +  __u32 tx_types;
1: +  __u32 tx_reserved[3];
1: +  __u32 rx_filters;
1: +  __u32 rx_reserved[3];
1:  };
1:  
1:  struct ethtool_fecparam {
1: -	__u32 cmd;
1: -	__u32 active_fec;
1: -	__u32 fec;
1: -	__u32 reserved;
1: +  __u32 cmd;
1: +  __u32 active_fec;
1: +  __u32 fec;
1: +  __u32 reserved;
1:  };
1:  
1:  struct ethtool_link_settings {
1: -	__u32 cmd;
1: -	__u32 speed;
1: -	__u8 duplex;
1: -	__u8 port;
1: -	__u8 phy_address;
1: -	__u8 autoneg;
1: -	__u8 mdio_support;
1: -	__u8 eth_tp_mdix;
1: -	__u8 eth_tp_mdix_ctrl;
1: -	__s8 link_mode_masks_nwords;
1: -	__u8 transceiver;
1: -	__u8 master_slave_cfg;
1: -	__u8 master_slave_state;
1: -	__u8 reserved1[1];
1: -	__u32 reserved[7];
1: -	__u32 link_mode_masks[0];
1: +  __u32 cmd;
1: +  __u32 speed;
1: +  __u8 duplex;
1: +  __u8 port;
1: +  __u8 phy_address;
1: +  __u8 autoneg;
1: +  __u8 mdio_support;
1: +  __u8 eth_tp_mdix;
1: +  __u8 eth_tp_mdix_ctrl;
1: +  __s8 link_mode_masks_nwords;
1: +  __u8 transceiver;
1: +  __u8 master_slave_cfg;
1: +  __u8 master_slave_state;
1: +  __u8 reserved1[1];
1: +  __u32 reserved[7];
1: +  __u32 link_mode_masks[0];
1:  };
1:  
1:  enum ethtool_phys_id_state {
1: -	ETHTOOL_ID_INACTIVE = 0,
1: -	ETHTOOL_ID_ACTIVE = 1,
1: -	ETHTOOL_ID_ON = 2,
1: -	ETHTOOL_ID_OFF = 3,
1: +  ETHTOOL_ID_INACTIVE = 0,
1: +  ETHTOOL_ID_ACTIVE = 1,
1: +  ETHTOOL_ID_ON = 2,
1: +  ETHTOOL_ID_OFF = 3,
1:  };
1:  
1:  struct ethtool_link_ext_state_info {
1: -	enum ethtool_link_ext_state link_ext_state;
1: -	union {
1: -		enum ethtool_link_ext_substate_autoneg autoneg;
1: -		enum ethtool_link_ext_substate_link_training link_training;
1: -		enum ethtool_link_ext_substate_link_logical_mismatch link_logical_mismatch;
1: -		enum ethtool_link_ext_substate_bad_signal_integrity bad_signal_integrity;
1: -		enum ethtool_link_ext_substate_cable_issue cable_issue;
1: -		u8 __link_ext_substate;
1: -	};
1: +  enum ethtool_link_ext_state link_ext_state;
1: +  union {
1: +    enum ethtool_link_ext_substate_autoneg autoneg;
1: +    enum ethtool_link_ext_substate_link_training link_training;
1: +    enum ethtool_link_ext_substate_link_logical_mismatch link_logical_mismatch;
1: +    enum ethtool_link_ext_substate_bad_signal_integrity bad_signal_integrity;
1: +    enum ethtool_link_ext_substate_cable_issue cable_issue;
1: +    u8 __link_ext_substate;
1: +  };
1:  };
1:  
1:  struct ethtool_link_ksettings {
1: -	struct ethtool_link_settings base;
1: -	struct {
1: -		long unsigned int supported[2];
1: -		long unsigned int advertising[2];
1: -		long unsigned int lp_advertising[2];
1: -	} link_modes;
1: +  struct ethtool_link_settings base;
1: +  struct {
1: +    long unsigned int supported[2];
1: +    long unsigned int advertising[2];
1: +    long unsigned int lp_advertising[2];
1: +  } link_modes;
1:  };
1:  
1:  struct ethtool_pause_stats {
1: -	u64 tx_pause_frames;
1: -	u64 rx_pause_frames;
1: +  u64 tx_pause_frames;
1: +  u64 rx_pause_frames;
1:  };
1:  
1:  struct ethtool_ops {
1: -	u32 supported_coalesce_params;
1: -	void (*get_drvinfo)(struct net_device *, struct ethtool_drvinfo *);
1: -	int (*get_regs_len)(struct net_device *);
1: -	void (*get_regs)(struct net_device *, struct ethtool_regs *, void *);
1: -	void (*get_wol)(struct net_device *, struct ethtool_wolinfo *);
1: -	int (*set_wol)(struct net_device *, struct ethtool_wolinfo *);
1: -	u32 (*get_msglevel)(struct net_device *);
1: -	void (*set_msglevel)(struct net_device *, u32);
1: -	int (*nway_reset)(struct net_device *);
1: -	u32 (*get_link)(struct net_device *);
1: -	int (*get_link_ext_state)(struct net_device *, struct ethtool_link_ext_state_info *);
1: -	int (*get_eeprom_len)(struct net_device *);
1: -	int (*get_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
1: -	int (*set_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
1: -	int (*get_coalesce)(struct net_device *, struct ethtool_coalesce *);
1: -	int (*set_coalesce)(struct net_device *, struct ethtool_coalesce *);
1: -	void (*get_ringparam)(struct net_device *, struct ethtool_ringparam *);
1: -	int (*set_ringparam)(struct net_device *, struct ethtool_ringparam *);
1: -	void (*get_pause_stats)(struct net_device *, struct ethtool_pause_stats *);
1: -	void (*get_pauseparam)(struct net_device *, struct ethtool_pauseparam *);
1: -	int (*set_pauseparam)(struct net_device *, struct ethtool_pauseparam *);
1: -	void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
1: -	void (*get_strings)(struct net_device *, u32, u8 *);
1: -	int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state);
1: -	void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
1: -	int (*begin)(struct net_device *);
1: -	void (*complete)(struct net_device *);
1: -	u32 (*get_priv_flags)(struct net_device *);
1: -	int (*set_priv_flags)(struct net_device *, u32);
1: -	int (*get_sset_count)(struct net_device *, int);
1: -	int (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, u32 *);
1: -	int (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
1: -	int (*flash_device)(struct net_device *, struct ethtool_flash *);
1: -	int (*reset)(struct net_device *, u32 *);
1: -	u32 (*get_rxfh_key_size)(struct net_device *);
1: -	u32 (*get_rxfh_indir_size)(struct net_device *);
1: -	int (*get_rxfh)(struct net_device *, u32 *, u8 *, u8 *);
1: -	int (*set_rxfh)(struct net_device *, const u32 *, const u8 *, const u8);
1: -	int (*get_rxfh_context)(struct net_device *, u32 *, u8 *, u8 *, u32);
1: -	int (*set_rxfh_context)(struct net_device *, const u32 *, const u8 *, const u8, u32 *, bool);
1: -	void (*get_channels)(struct net_device *, struct ethtool_channels *);
1: -	int (*set_channels)(struct net_device *, struct ethtool_channels *);
1: -	int (*get_dump_flag)(struct net_device *, struct ethtool_dump *);
1: -	int (*get_dump_data)(struct net_device *, struct ethtool_dump *, void *);
1: -	int (*set_dump)(struct net_device *, struct ethtool_dump *);
1: -	int (*get_ts_info)(struct net_device *, struct ethtool_ts_info *);
1: -	int (*get_module_info)(struct net_device *, struct ethtool_modinfo *);
1: -	int (*get_module_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
1: -	int (*get_eee)(struct net_device *, struct ethtool_eee *);
1: -	int (*set_eee)(struct net_device *, struct ethtool_eee *);
1: -	int (*get_tunable)(struct net_device *, const struct ethtool_tunable *, void *);
1: -	int (*set_tunable)(struct net_device *, const struct ethtool_tunable *, const void *);
1: -	int (*get_per_queue_coalesce)(struct net_device *, u32, struct ethtool_coalesce *);
1: -	int (*set_per_queue_coalesce)(struct net_device *, u32, struct ethtool_coalesce *);
1: -	int (*get_link_ksettings)(struct net_device *, struct ethtool_link_ksettings *);
1: -	int (*set_link_ksettings)(struct net_device *, const struct ethtool_link_ksettings *);
1: -	int (*get_fecparam)(struct net_device *, struct ethtool_fecparam *);
1: -	int (*set_fecparam)(struct net_device *, struct ethtool_fecparam *);
1: -	void (*get_ethtool_phy_stats)(struct net_device *, struct ethtool_stats *, u64 *);
1: -	int (*get_phy_tunable)(struct net_device *, const struct ethtool_tunable *, void *);
1: -	int (*set_phy_tunable)(struct net_device *, const struct ethtool_tunable *, const void *);
1: +  u32 supported_coalesce_params;
1: +  void (*get_drvinfo)(struct net_device *, struct ethtool_drvinfo *);
1: +  int (*get_regs_len)(struct net_device *);
1: +  void (*get_regs)(struct net_device *, struct ethtool_regs *, void *);
1: +  void (*get_wol)(struct net_device *, struct ethtool_wolinfo *);
1: +  int (*set_wol)(struct net_device *, struct ethtool_wolinfo *);
1: +  u32 (*get_msglevel)(struct net_device *);
1: +  void (*set_msglevel)(struct net_device *, u32);
1: +  int (*nway_reset)(struct net_device *);
1: +  u32 (*get_link)(struct net_device *);
1: +  int (*get_link_ext_state)(struct net_device *,
1: +                            struct ethtool_link_ext_state_info *);
1: +  int (*get_eeprom_len)(struct net_device *);
1: +  int (*get_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
1: +  int (*set_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
1: +  int (*get_coalesce)(struct net_device *, struct ethtool_coalesce *);
1: +  int (*set_coalesce)(struct net_device *, struct ethtool_coalesce *);
1: +  void (*get_ringparam)(struct net_device *, struct ethtool_ringparam *);
1: +  int (*set_ringparam)(struct net_device *, struct ethtool_ringparam *);
1: +  void (*get_pause_stats)(struct net_device *, struct ethtool_pause_stats *);
1: +  void (*get_pauseparam)(struct net_device *, struct ethtool_pauseparam *);
1: +  int (*set_pauseparam)(struct net_device *, struct ethtool_pauseparam *);
1: +  void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
1: +  void (*get_strings)(struct net_device *, u32, u8 *);
1: +  int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state);
1: +  void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
1: +  int (*begin)(struct net_device *);
1: +  void (*complete)(struct net_device *);
1: +  u32 (*get_priv_flags)(struct net_device *);
1: +  int (*set_priv_flags)(struct net_device *, u32);
1: +  int (*get_sset_count)(struct net_device *, int);
1: +  int (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, u32 *);
1: +  int (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
1: +  int (*flash_device)(struct net_device *, struct ethtool_flash *);
1: +  int (*reset)(struct net_device *, u32 *);
1: +  u32 (*get_rxfh_key_size)(struct net_device *);
1: +  u32 (*get_rxfh_indir_size)(struct net_device *);
1: +  int (*get_rxfh)(struct net_device *, u32 *, u8 *, u8 *);
1: +  int (*set_rxfh)(struct net_device *, const u32 *, const u8 *, const u8);
1: +  int (*get_rxfh_context)(struct net_device *, u32 *, u8 *, u8 *, u32);
1: +  int (*set_rxfh_context)(struct net_device *, const u32 *, const u8 *,
1: +                          const u8, u32 *, bool);
1: +  void (*get_channels)(struct net_device *, struct ethtool_channels *);
1: +  int (*set_channels)(struct net_device *, struct ethtool_channels *);
1: +  int (*get_dump_flag)(struct net_device *, struct ethtool_dump *);
1: +  int (*get_dump_data)(struct net_device *, struct ethtool_dump *, void *);
1: +  int (*set_dump)(struct net_device *, struct ethtool_dump *);
1: +  int (*get_ts_info)(struct net_device *, struct ethtool_ts_info *);
1: +  int (*get_module_info)(struct net_device *, struct ethtool_modinfo *);
1: +  int (*get_module_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
1: +  int (*get_eee)(struct net_device *, struct ethtool_eee *);
1: +  int (*set_eee)(struct net_device *, struct ethtool_eee *);
1: +  int (*get_tunable)(struct net_device *, const struct ethtool_tunable *,
1: +                     void *);
1: +  int (*set_tunable)(struct net_device *, const struct ethtool_tunable *,
1: +                     const void *);
1: +  int (*get_per_queue_coalesce)(struct net_device *, u32,
1: +                                struct ethtool_coalesce *);
1: +  int (*set_per_queue_coalesce)(struct net_device *, u32,
1: +                                struct ethtool_coalesce *);
1: +  int (*get_link_ksettings)(struct net_device *,
1: +                            struct ethtool_link_ksettings *);
1: +  int (*set_link_ksettings)(struct net_device *,
1: +                            const struct ethtool_link_ksettings *);
1: +  int (*get_fecparam)(struct net_device *, struct ethtool_fecparam *);
1: +  int (*set_fecparam)(struct net_device *, struct ethtool_fecparam *);
1: +  void (*get_ethtool_phy_stats)(struct net_device *, struct ethtool_stats *,
1: +                                u64 *);
1: +  int (*get_phy_tunable)(struct net_device *, const struct ethtool_tunable *,
1: +                         void *);
1: +  int (*set_phy_tunable)(struct net_device *, const struct ethtool_tunable *,
1: +                         const void *);
1:  };
1:  
1:  struct netlink_ext_ack {
1: -	const char *_msg;
1: -	const struct nlattr *bad_attr;
1: -	const struct nla_policy *policy;
1: -	u8 cookie[20];
1: -	u8 cookie_len;
1: +  const char *_msg;
1: +  const struct nlattr *bad_attr;
1: +  const struct nla_policy *policy;
1: +  u8 cookie[20];
1: +  u8 cookie_len;
1:  };
1:  
1:  struct ieee_ets {
1: -	__u8 willing;
1: -	__u8 ets_cap;
1: -	__u8 cbs;
1: -	__u8 tc_tx_bw[8];
1: -	__u8 tc_rx_bw[8];
1: -	__u8 tc_tsa[8];
1: -	__u8 prio_tc[8];
1: -	__u8 tc_reco_bw[8];
1: -	__u8 tc_reco_tsa[8];
1: -	__u8 reco_prio_tc[8];
1: +  __u8 willing;
1: +  __u8 ets_cap;
1: +  __u8 cbs;
1: +  __u8 tc_tx_bw[8];
1: +  __u8 tc_rx_bw[8];
1: +  __u8 tc_tsa[8];
1: +  __u8 prio_tc[8];
1: +  __u8 tc_reco_bw[8];
1: +  __u8 tc_reco_tsa[8];
1: +  __u8 reco_prio_tc[8];
1:  };
1:  
1:  struct ieee_maxrate {
1: -	__u64 tc_maxrate[8];
1: +  __u64 tc_maxrate[8];
1:  };
1:  
1:  struct ieee_qcn {
1: -	__u8 rpg_enable[8];
1: -	__u32 rppp_max_rps[8];
1: -	__u32 rpg_time_reset[8];
1: -	__u32 rpg_byte_reset[8];
1: -	__u32 rpg_threshold[8];
1: -	__u32 rpg_max_rate[8];
1: -	__u32 rpg_ai_rate[8];
1: -	__u32 rpg_hai_rate[8];
1: -	__u32 rpg_gd[8];
1: -	__u32 rpg_min_dec_fac[8];
1: -	__u32 rpg_min_rate[8];
1: -	__u32 cndd_state_machine[8];
1: +  __u8 rpg_enable[8];
1: +  __u32 rppp_max_rps[8];
1: +  __u32 rpg_time_reset[8];
1: +  __u32 rpg_byte_reset[8];
1: +  __u32 rpg_threshold[8];
1: +  __u32 rpg_max_rate[8];
1: +  __u32 rpg_ai_rate[8];
1: +  __u32 rpg_hai_rate[8];
1: +  __u32 rpg_gd[8];
1: +  __u32 rpg_min_dec_fac[8];
1: +  __u32 rpg_min_rate[8];
1: +  __u32 cndd_state_machine[8];
1:  };
1:  
1:  struct ieee_qcn_stats {
1: -	__u64 rppp_rp_centiseconds[8];
1: -	__u32 rppp_created_rps[8];
1: +  __u64 rppp_rp_centiseconds[8];
1: +  __u32 rppp_created_rps[8];
1:  };
1:  
1:  struct ieee_pfc {
1: -	__u8 pfc_cap;
1: -	__u8 pfc_en;
1: -	__u8 mbc;
1: -	__u16 delay;
1: -	__u64 requests[8];
1: -	__u64 indications[8];
1: +  __u8 pfc_cap;
1: +  __u8 pfc_en;
1: +  __u8 mbc;
1: +  __u16 delay;
1: +  __u64 requests[8];
1: +  __u64 indications[8];
1:  };
1:  
1:  struct dcbnl_buffer {
1: -	__u8 prio2buffer[8];
1: -	__u32 buffer_size[8];
1: -	__u32 total_size;
1: +  __u8 prio2buffer[8];
1: +  __u32 buffer_size[8];
1: +  __u32 total_size;
1:  };
1:  
1:  struct cee_pg {
1: -	__u8 willing;
1: -	__u8 error;
1: -	__u8 pg_en;
1: -	__u8 tcs_supported;
1: -	__u8 pg_bw[8];
1: -	__u8 prio_pg[8];
1: +  __u8 willing;
1: +  __u8 error;
1: +  __u8 pg_en;
1: +  __u8 tcs_supported;
1: +  __u8 pg_bw[8];
1: +  __u8 prio_pg[8];
1:  };
1:  
1:  struct cee_pfc {
1: -	__u8 willing;
1: -	__u8 error;
1: -	__u8 pfc_en;
1: -	__u8 tcs_supported;
1: +  __u8 willing;
1: +  __u8 error;
1: +  __u8 pfc_en;
1: +  __u8 tcs_supported;
1:  };
1:  
1:  struct dcb_app {
1: -	__u8 selector;
1: -	__u8 priority;
1: -	__u16 protocol;
1: +  __u8 selector;
1: +  __u8 priority;
1: +  __u16 protocol;
1:  };
1:  
1:  struct dcb_peer_app_info {
1: -	__u8 willing;
1: -	__u8 error;
1: +  __u8 willing;
1: +  __u8 error;
1:  };
1:  
1:  struct dcbnl_rtnl_ops {
1: -	int (*ieee_getets)(struct net_device *, struct ieee_ets *);
1: -	int (*ieee_setets)(struct net_device *, struct ieee_ets *);
1: -	int (*ieee_getmaxrate)(struct net_device *, struct ieee_maxrate *);
1: -	int (*ieee_setmaxrate)(struct net_device *, struct ieee_maxrate *);
1: -	int (*ieee_getqcn)(struct net_device *, struct ieee_qcn *);
1: -	int (*ieee_setqcn)(struct net_device *, struct ieee_qcn *);
1: -	int (*ieee_getqcnstats)(struct net_device *, struct ieee_qcn_stats *);
1: -	int (*ieee_getpfc)(struct net_device *, struct ieee_pfc *);
1: -	int (*ieee_setpfc)(struct net_device *, struct ieee_pfc *);
1: -	int (*ieee_getapp)(struct net_device *, struct dcb_app *);
1: -	int (*ieee_setapp)(struct net_device *, struct dcb_app *);
1: -	int (*ieee_delapp)(struct net_device *, struct dcb_app *);
1: -	int (*ieee_peer_getets)(struct net_device *, struct ieee_ets *);
1: -	int (*ieee_peer_getpfc)(struct net_device *, struct ieee_pfc *);
1: -	u8 (*getstate)(struct net_device *);
1: -	u8 (*setstate)(struct net_device *, u8);
1: -	void (*getpermhwaddr)(struct net_device *, u8 *);
1: -	void (*setpgtccfgtx)(struct net_device *, int, u8, u8, u8, u8);
1: -	void (*setpgbwgcfgtx)(struct net_device *, int, u8);
1: -	void (*setpgtccfgrx)(struct net_device *, int, u8, u8, u8, u8);
1: -	void (*setpgbwgcfgrx)(struct net_device *, int, u8);
1: -	void (*getpgtccfgtx)(struct net_device *, int, u8 *, u8 *, u8 *, u8 *);
1: -	void (*getpgbwgcfgtx)(struct net_device *, int, u8 *);
1: -	void (*getpgtccfgrx)(struct net_device *, int, u8 *, u8 *, u8 *, u8 *);
1: -	void (*getpgbwgcfgrx)(struct net_device *, int, u8 *);
1: -	void (*setpfccfg)(struct net_device *, int, u8);
1: -	void (*getpfccfg)(struct net_device *, int, u8 *);
1: -	u8 (*setall)(struct net_device *);
1: -	u8 (*getcap)(struct net_device *, int, u8 *);
1: -	int (*getnumtcs)(struct net_device *, int, u8 *);
1: -	int (*setnumtcs)(struct net_device *, int, u8);
1: -	u8 (*getpfcstate)(struct net_device *);
1: -	void (*setpfcstate)(struct net_device *, u8);
1: -	void (*getbcncfg)(struct net_device *, int, u32 *);
1: -	void (*setbcncfg)(struct net_device *, int, u32);
1: -	void (*getbcnrp)(struct net_device *, int, u8 *);
1: -	void (*setbcnrp)(struct net_device *, int, u8);
1: -	int (*setapp)(struct net_device *, u8, u16, u8);
1: -	int (*getapp)(struct net_device *, u8, u16);
1: -	u8 (*getfeatcfg)(struct net_device *, int, u8 *);
1: -	u8 (*setfeatcfg)(struct net_device *, int, u8);
1: -	u8 (*getdcbx)(struct net_device *);
1: -	u8 (*setdcbx)(struct net_device *, u8);
1: -	int (*peer_getappinfo)(struct net_device *, struct dcb_peer_app_info *, u16 *);
1: -	int (*peer_getapptable)(struct net_device *, struct dcb_app *);
1: -	int (*cee_peer_getpg)(struct net_device *, struct cee_pg *);
1: -	int (*cee_peer_getpfc)(struct net_device *, struct cee_pfc *);
1: -	int (*dcbnl_getbuffer)(struct net_device *, struct dcbnl_buffer *);
1: -	int (*dcbnl_setbuffer)(struct net_device *, struct dcbnl_buffer *);
1: +  int (*ieee_getets)(struct net_device *, struct ieee_ets *);
1: +  int (*ieee_setets)(struct net_device *, struct ieee_ets *);
1: +  int (*ieee_getmaxrate)(struct net_device *, struct ieee_maxrate *);
1: +  int (*ieee_setmaxrate)(struct net_device *, struct ieee_maxrate *);
1: +  int (*ieee_getqcn)(struct net_device *, struct ieee_qcn *);
1: +  int (*ieee_setqcn)(struct net_device *, struct ieee_qcn *);
1: +  int (*ieee_getqcnstats)(struct net_device *, struct ieee_qcn_stats *);
1: +  int (*ieee_getpfc)(struct net_device *, struct ieee_pfc *);
1: +  int (*ieee_setpfc)(struct net_device *, struct ieee_pfc *);
1: +  int (*ieee_getapp)(struct net_device *, struct dcb_app *);
1: +  int (*ieee_setapp)(struct net_device *, struct dcb_app *);
1: +  int (*ieee_delapp)(struct net_device *, struct dcb_app *);
1: +  int (*ieee_peer_getets)(struct net_device *, struct ieee_ets *);
1: +  int (*ieee_peer_getpfc)(struct net_device *, struct ieee_pfc *);
1: +  u8 (*getstate)(struct net_device *);
1: +  u8 (*setstate)(struct net_device *, u8);
1: +  void (*getpermhwaddr)(struct net_device *, u8 *);
1: +  void (*setpgtccfgtx)(struct net_device *, int, u8, u8, u8, u8);
1: +  void (*setpgbwgcfgtx)(struct net_device *, int, u8);
1: +  void (*setpgtccfgrx)(struct net_device *, int, u8, u8, u8, u8);
1: +  void (*setpgbwgcfgrx)(struct net_device *, int, u8);
1: +  void (*getpgtccfgtx)(struct net_device *, int, u8 *, u8 *, u8 *, u8 *);
1: +  void (*getpgbwgcfgtx)(struct net_device *, int, u8 *);
1: +  void (*getpgtccfgrx)(struct net_device *, int, u8 *, u8 *, u8 *, u8 *);
1: +  void (*getpgbwgcfgrx)(struct net_device *, int, u8 *);
1: +  void (*setpfccfg)(struct net_device *, int, u8);
1: +  void (*getpfccfg)(struct net_device *, int, u8 *);
1: +  u8 (*setall)(struct net_device *);
1: +  u8 (*getcap)(struct net_device *, int, u8 *);
1: +  int (*getnumtcs)(struct net_device *, int, u8 *);
1: +  int (*setnumtcs)(struct net_device *, int, u8);
1: +  u8 (*getpfcstate)(struct net_device *);
1: +  void (*setpfcstate)(struct net_device *, u8);
1: +  void (*getbcncfg)(struct net_device *, int, u32 *);
1: +  void (*setbcncfg)(struct net_device *, int, u32);
1: +  void (*getbcnrp)(struct net_device *, int, u8 *);
1: +  void (*setbcnrp)(struct net_device *, int, u8);
1: +  int (*setapp)(struct net_device *, u8, u16, u8);
1: +  int (*getapp)(struct net_device *, u8, u16);
1: +  u8 (*getfeatcfg)(struct net_device *, int, u8 *);
1: +  u8 (*setfeatcfg)(struct net_device *, int, u8);
1: +  u8 (*getdcbx)(struct net_device *);
1: +  u8 (*setdcbx)(struct net_device *, u8);
1: +  int (*peer_getappinfo)(struct net_device *, struct dcb_peer_app_info *,
1: +                         u16 *);
1: +  int (*peer_getapptable)(struct net_device *, struct dcb_app *);
1: +  int (*cee_peer_getpg)(struct net_device *, struct cee_pg *);
1: +  int (*cee_peer_getpfc)(struct net_device *, struct cee_pfc *);
1: +  int (*dcbnl_getbuffer)(struct net_device *, struct dcbnl_buffer *);
1: +  int (*dcbnl_setbuffer)(struct net_device *, struct dcbnl_buffer *);
1:  };
1:  
1:  struct xdp_mem_info {
1: -	u32 type;
1: -	u32 id;
1: +  u32 type;
1: +  u32 id;
1:  };
1:  
1:  struct xdp_rxq_info {
1: -	struct net_device *dev;
1: -	u32 queue_index;
1: -	u32 reg_state;
1: -	struct xdp_mem_info mem;
1: -	unsigned int napi_id;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct net_device *dev;
1: +  u32 queue_index;
1: +  u32 reg_state;
1: +  struct xdp_mem_info mem;
1: +  unsigned int napi_id;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct xdp_frame {
1: -	void *data;
1: -	u16 len;
1: -	u16 headroom;
1: -	u32 metasize: 8;
1: -	u32 frame_sz: 24;
1: -	struct xdp_mem_info mem;
1: -	struct net_device *dev_rx;
1: +  void *data;
1: +  u16 len;
1: +  u16 headroom;
1: +  u32 metasize : 8;
1: +  u32 frame_sz : 24;
1: +  struct xdp_mem_info mem;
1: +  struct net_device *dev_rx;
1:  };
1:  
1:  struct nlmsghdr {
1: -	__u32 nlmsg_len;
1: -	__u16 nlmsg_type;
1: -	__u16 nlmsg_flags;
1: -	__u32 nlmsg_seq;
1: -	__u32 nlmsg_pid;
1: +  __u32 nlmsg_len;
1: +  __u16 nlmsg_type;
1: +  __u16 nlmsg_flags;
1: +  __u32 nlmsg_seq;
1: +  __u32 nlmsg_pid;
1:  };
1:  
1:  struct nlattr {
1: -	__u16 nla_len;
1: -	__u16 nla_type;
1: +  __u16 nla_len;
1: +  __u16 nla_type;
1:  };
1:  
1:  struct netlink_range_validation;
1: @@ -12012,192 +12112,194 @@ struct netlink_range_validation;
1:  struct netlink_range_validation_signed;
1:  
1:  struct nla_policy {
1: -	u8 type;
1: -	u8 validation_type;
1: -	u16 len;
1: -	union {
1: -		const u32 bitfield32_valid;
1: -		const u32 mask;
1: -		const char *reject_message;
1: -		const struct nla_policy *nested_policy;
1: -		struct netlink_range_validation *range;
1: -		struct netlink_range_validation_signed *range_signed;
1: -		struct {
1: -			s16 min;
1: -			s16 max;
1: -		};
1: -		int (*validate)(const struct nlattr *, struct netlink_ext_ack *);
1: -		u16 strict_start_type;
1: -	};
1: +  u8 type;
1: +  u8 validation_type;
1: +  u16 len;
1: +  union {
1: +    const u32 bitfield32_valid;
1: +    const u32 mask;
1: +    const char *reject_message;
1: +    const struct nla_policy *nested_policy;
1: +    struct netlink_range_validation *range;
1: +    struct netlink_range_validation_signed *range_signed;
1: +    struct {
1: +      s16 min;
1: +      s16 max;
1: +    };
1: +    int (*validate)(const struct nlattr *, struct netlink_ext_ack *);
1: +    u16 strict_start_type;
1: +  };
1:  };
1:  
1:  struct netlink_callback {
1: -	struct sk_buff *skb;
1: -	const struct nlmsghdr *nlh;
1: -	int (*dump)(struct sk_buff *, struct netlink_callback *);
1: -	int (*done)(struct netlink_callback *);
1: -	void *data;
1: -	struct module *module;
1: -	struct netlink_ext_ack *extack;
1: -	u16 family;
1: -	u16 answer_flags;
1: -	u32 min_dump_alloc;
1: -	unsigned int prev_seq;
1: -	unsigned int seq;
1: -	bool strict_check;
1: -	union {
1: -		u8 ctx[48];
1: -		long int args[6];
1: -	};
1: +  struct sk_buff *skb;
1: +  const struct nlmsghdr *nlh;
1: +  int (*dump)(struct sk_buff *, struct netlink_callback *);
1: +  int (*done)(struct netlink_callback *);
1: +  void *data;
1: +  struct module *module;
1: +  struct netlink_ext_ack *extack;
1: +  u16 family;
1: +  u16 answer_flags;
1: +  u32 min_dump_alloc;
1: +  unsigned int prev_seq;
1: +  unsigned int seq;
1: +  bool strict_check;
1: +  union {
1: +    u8 ctx[48];
1: +    long int args[6];
1: +  };
1:  };
1:  
1:  struct ndmsg {
1: -	__u8 ndm_family;
1: -	__u8 ndm_pad1;
1: -	__u16 ndm_pad2;
1: -	__s32 ndm_ifindex;
1: -	__u16 ndm_state;
1: -	__u8 ndm_flags;
1: -	__u8 ndm_type;
1: +  __u8 ndm_family;
1: +  __u8 ndm_pad1;
1: +  __u16 ndm_pad2;
1: +  __s32 ndm_ifindex;
1: +  __u16 ndm_state;
1: +  __u8 ndm_flags;
1: +  __u8 ndm_type;
1:  };
1:  
1:  struct rtnl_link_stats64 {
1: -	__u64 rx_packets;
1: -	__u64 tx_packets;
1: -	__u64 rx_bytes;
1: -	__u64 tx_bytes;
1: -	__u64 rx_errors;
1: -	__u64 tx_errors;
1: -	__u64 rx_dropped;
1: -	__u64 tx_dropped;
1: -	__u64 multicast;
1: -	__u64 collisions;
1: -	__u64 rx_length_errors;
1: -	__u64 rx_over_errors;
1: -	__u64 rx_crc_errors;
1: -	__u64 rx_frame_errors;
1: -	__u64 rx_fifo_errors;
1: -	__u64 rx_missed_errors;
1: -	__u64 tx_aborted_errors;
1: -	__u64 tx_carrier_errors;
1: -	__u64 tx_fifo_errors;
1: -	__u64 tx_heartbeat_errors;
1: -	__u64 tx_window_errors;
1: -	__u64 rx_compressed;
1: -	__u64 tx_compressed;
1: -	__u64 rx_nohandler;
1: +  __u64 rx_packets;
1: +  __u64 tx_packets;
1: +  __u64 rx_bytes;
1: +  __u64 tx_bytes;
1: +  __u64 rx_errors;
1: +  __u64 tx_errors;
1: +  __u64 rx_dropped;
1: +  __u64 tx_dropped;
1: +  __u64 multicast;
1: +  __u64 collisions;
1: +  __u64 rx_length_errors;
1: +  __u64 rx_over_errors;
1: +  __u64 rx_crc_errors;
1: +  __u64 rx_frame_errors;
1: +  __u64 rx_fifo_errors;
1: +  __u64 rx_missed_errors;
1: +  __u64 tx_aborted_errors;
1: +  __u64 tx_carrier_errors;
1: +  __u64 tx_fifo_errors;
1: +  __u64 tx_heartbeat_errors;
1: +  __u64 tx_window_errors;
1: +  __u64 rx_compressed;
1: +  __u64 tx_compressed;
1: +  __u64 rx_nohandler;
1:  };
1:  
1:  struct ifla_vf_guid {
1: -	__u32 vf;
1: -	__u64 guid;
1: +  __u32 vf;
1: +  __u64 guid;
1:  };
1:  
1:  struct ifla_vf_stats {
1: -	__u64 rx_packets;
1: -	__u64 tx_packets;
1: -	__u64 rx_bytes;
1: -	__u64 tx_bytes;
1: -	__u64 broadcast;
1: -	__u64 multicast;
1: -	__u64 rx_dropped;
1: -	__u64 tx_dropped;
1: +  __u64 rx_packets;
1: +  __u64 tx_packets;
1: +  __u64 rx_bytes;
1: +  __u64 tx_bytes;
1: +  __u64 broadcast;
1: +  __u64 multicast;
1: +  __u64 rx_dropped;
1: +  __u64 tx_dropped;
1:  };
1:  
1:  struct ifla_vf_info {
1: -	__u32 vf;
1: -	__u8 mac[32];
1: -	__u32 vlan;
1: -	__u32 qos;
1: -	__u32 spoofchk;
1: -	__u32 linkstate;
1: -	__u32 min_tx_rate;
1: -	__u32 max_tx_rate;
1: -	__u32 rss_query_en;
1: -	__u32 trusted;
1: -	__be16 vlan_proto;
1: +  __u32 vf;
1: +  __u8 mac[32];
1: +  __u32 vlan;
1: +  __u32 qos;
1: +  __u32 spoofchk;
1: +  __u32 linkstate;
1: +  __u32 min_tx_rate;
1: +  __u32 max_tx_rate;
1: +  __u32 rss_query_en;
1: +  __u32 trusted;
1: +  __be16 vlan_proto;
1:  };
1:  
1:  struct tc_stats {
1: -	__u64 bytes;
1: -	__u32 packets;
1: -	__u32 drops;
1: -	__u32 overlimits;
1: -	__u32 bps;
1: -	__u32 pps;
1: -	__u32 qlen;
1: -	__u32 backlog;
1: +  __u64 bytes;
1: +  __u32 packets;
1: +  __u32 drops;
1: +  __u32 overlimits;
1: +  __u32 bps;
1: +  __u32 pps;
1: +  __u32 qlen;
1: +  __u32 backlog;
1:  };
1:  
1:  struct tc_sizespec {
1: -	unsigned char cell_log;
1: -	unsigned char size_log;
1: -	short int cell_align;
1: -	int overhead;
1: -	unsigned int linklayer;
1: -	unsigned int mpu;
1: -	unsigned int mtu;
1: -	unsigned int tsize;
1: +  unsigned char cell_log;
1: +  unsigned char size_log;
1: +  short int cell_align;
1: +  int overhead;
1: +  unsigned int linklayer;
1: +  unsigned int mpu;
1: +  unsigned int mtu;
1: +  unsigned int tsize;
1:  };
1:  
1:  enum netdev_tx {
1: -	__NETDEV_TX_MIN = 2147483648,
1: -	NETDEV_TX_OK = 0,
1: -	NETDEV_TX_BUSY = 16,
1: +  __NETDEV_TX_MIN = 2147483648,
1: +  NETDEV_TX_OK = 0,
1: +  NETDEV_TX_BUSY = 16,
1:  };
1:  
1:  typedef enum netdev_tx netdev_tx_t;
1:  
1:  struct header_ops {
1: -	int (*create)(struct sk_buff *, struct net_device *, short unsigned int, const void *, const void *, unsigned int);
1: -	int (*parse)(const struct sk_buff *, unsigned char *);
1: -	int (*cache)(const struct neighbour *, struct hh_cache *, __be16);
1: -	void (*cache_update)(struct hh_cache *, const struct net_device *, const unsigned char *);
1: -	bool (*validate)(const char *, unsigned int);
1: -	__be16 (*parse_protocol)(const struct sk_buff *);
1: +  int (*create)(struct sk_buff *, struct net_device *, short unsigned int,
1: +                const void *, const void *, unsigned int);
1: +  int (*parse)(const struct sk_buff *, unsigned char *);
1: +  int (*cache)(const struct neighbour *, struct hh_cache *, __be16);
1: +  void (*cache_update)(struct hh_cache *, const struct net_device *,
1: +                       const unsigned char *);
1: +  bool (*validate)(const char *, unsigned int);
1: +  __be16 (*parse_protocol)(const struct sk_buff *);
1:  };
1:  
1:  struct xsk_buff_pool;
1:  
1:  struct netdev_queue {
1: -	struct net_device *dev;
1: -	struct Qdisc *qdisc;
1: -	struct Qdisc *qdisc_sleeping;
1: -	struct kobject kobj;
1: -	int numa_node;
1: -	long unsigned int tx_maxrate;
1: -	long unsigned int trans_timeout;
1: -	struct net_device *sb_dev;
1: -	struct xsk_buff_pool *pool;
1: -	spinlock_t _xmit_lock;
1: -	int xmit_lock_owner;
1: -	long unsigned int trans_start;
1: -	long unsigned int state;
1: -	long: 64;
1: -	long: 64;
1: -	struct dql dql;
1: +  struct net_device *dev;
1: +  struct Qdisc *qdisc;
1: +  struct Qdisc *qdisc_sleeping;
1: +  struct kobject kobj;
1: +  int numa_node;
1: +  long unsigned int tx_maxrate;
1: +  long unsigned int trans_timeout;
1: +  struct net_device *sb_dev;
1: +  struct xsk_buff_pool *pool;
1: +  spinlock_t _xmit_lock;
1: +  int xmit_lock_owner;
1: +  long unsigned int trans_start;
1: +  long unsigned int state;
1: +  long : 64;
1: +  long : 64;
1: +  struct dql dql;
1:  };
1:  
1:  struct net_rate_estimator;
1:  
1:  struct qdisc_skb_head {
1: -	struct sk_buff *head;
1: -	struct sk_buff *tail;
1: -	__u32 qlen;
1: -	spinlock_t lock;
1: +  struct sk_buff *head;
1: +  struct sk_buff *tail;
1: +  __u32 qlen;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct gnet_stats_basic_packed {
1: -	__u64 bytes;
1: -	__u64 packets;
1: +  __u64 bytes;
1: +  __u64 packets;
1:  };
1:  
1:  struct gnet_stats_queue {
1: -	__u32 qlen;
1: -	__u32 backlog;
1: -	__u32 drops;
1: -	__u32 requeues;
1: -	__u32 overlimits;
1: +  __u32 qlen;
1: +  __u32 backlog;
1: +  __u32 drops;
1: +  __u32 requeues;
1: +  __u32 overlimits;
1:  };
1:  
1:  struct Qdisc_ops;
1: @@ -12207,166 +12309,166 @@ struct qdisc_size_table;
1:  struct gnet_stats_basic_cpu;
1:  
1:  struct Qdisc {
1: -	int (*enqueue)(struct sk_buff *, struct Qdisc *, struct sk_buff **);
1: -	struct sk_buff * (*dequeue)(struct Qdisc *);
1: -	unsigned int flags;
1: -	u32 limit;
1: -	const struct Qdisc_ops *ops;
1: -	struct qdisc_size_table *stab;
1: -	struct hlist_node hash;
1: -	u32 handle;
1: -	u32 parent;
1: -	struct netdev_queue *dev_queue;
1: -	struct net_rate_estimator *rate_est;
1: -	struct gnet_stats_basic_cpu *cpu_bstats;
1: -	struct gnet_stats_queue *cpu_qstats;
1: -	int pad;
1: -	refcount_t refcnt;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct sk_buff_head gso_skb;
1: -	struct qdisc_skb_head q;
1: -	struct gnet_stats_basic_packed bstats;
1: -	seqcount_t running;
1: -	struct gnet_stats_queue qstats;
1: -	long unsigned int state;
1: -	struct Qdisc *next_sched;
1: -	struct sk_buff_head skb_bad_txq;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	spinlock_t busylock;
1: -	spinlock_t seqlock;
1: -	bool empty;
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long int privdata[0];
1: +  int (*enqueue)(struct sk_buff *, struct Qdisc *, struct sk_buff **);
1: +  struct sk_buff *(*dequeue)(struct Qdisc *);
1: +  unsigned int flags;
1: +  u32 limit;
1: +  const struct Qdisc_ops *ops;
1: +  struct qdisc_size_table *stab;
1: +  struct hlist_node hash;
1: +  u32 handle;
1: +  u32 parent;
1: +  struct netdev_queue *dev_queue;
1: +  struct net_rate_estimator *rate_est;
1: +  struct gnet_stats_basic_cpu *cpu_bstats;
1: +  struct gnet_stats_queue *cpu_qstats;
1: +  int pad;
1: +  refcount_t refcnt;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct sk_buff_head gso_skb;
1: +  struct qdisc_skb_head q;
1: +  struct gnet_stats_basic_packed bstats;
1: +  seqcount_t running;
1: +  struct gnet_stats_queue qstats;
1: +  long unsigned int state;
1: +  struct Qdisc *next_sched;
1: +  struct sk_buff_head skb_bad_txq;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  spinlock_t busylock;
1: +  spinlock_t seqlock;
1: +  bool empty;
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long int privdata[0];
1:  };
1:  
1:  struct rps_map {
1: -	unsigned int len;
1: -	struct callback_head rcu;
1: -	u16 cpus[0];
1: +  unsigned int len;
1: +  struct callback_head rcu;
1: +  u16 cpus[0];
1:  };
1:  
1:  struct rps_dev_flow {
1: -	u16 cpu;
1: -	u16 filter;
1: -	unsigned int last_qtail;
1: +  u16 cpu;
1: +  u16 filter;
1: +  unsigned int last_qtail;
1:  };
1:  
1:  struct rps_dev_flow_table {
1: -	unsigned int mask;
1: -	struct callback_head rcu;
1: -	struct rps_dev_flow flows[0];
1: +  unsigned int mask;
1: +  struct callback_head rcu;
1: +  struct rps_dev_flow flows[0];
1:  };
1:  
1:  struct netdev_rx_queue {
1: -	struct rps_map *rps_map;
1: -	struct rps_dev_flow_table *rps_flow_table;
1: -	struct kobject kobj;
1: -	struct net_device *dev;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct xdp_rxq_info xdp_rxq;
1: -	struct xsk_buff_pool *pool;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct rps_map *rps_map;
1: +  struct rps_dev_flow_table *rps_flow_table;
1: +  struct kobject kobj;
1: +  struct net_device *dev;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct xdp_rxq_info xdp_rxq;
1: +  struct xsk_buff_pool *pool;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct xps_map {
1: -	unsigned int len;
1: -	unsigned int alloc_len;
1: -	struct callback_head rcu;
1: -	u16 queues[0];
1: +  unsigned int len;
1: +  unsigned int alloc_len;
1: +  struct callback_head rcu;
1: +  u16 queues[0];
1:  };
1:  
1:  struct xps_dev_maps {
1: -	struct callback_head rcu;
1: -	struct xps_map *attr_map[0];
1: +  struct callback_head rcu;
1: +  struct xps_map *attr_map[0];
1:  };
1:  
1:  struct netdev_phys_item_id {
1: -	unsigned char id[32];
1: -	unsigned char id_len;
1: +  unsigned char id[32];
1: +  unsigned char id_len;
1:  };
1:  
1:  enum tc_setup_type {
1: -	TC_SETUP_QDISC_MQPRIO = 0,
1: -	TC_SETUP_CLSU32 = 1,
1: -	TC_SETUP_CLSFLOWER = 2,
1: -	TC_SETUP_CLSMATCHALL = 3,
1: -	TC_SETUP_CLSBPF = 4,
1: -	TC_SETUP_BLOCK = 5,
1: -	TC_SETUP_QDISC_CBS = 6,
1: -	TC_SETUP_QDISC_RED = 7,
1: -	TC_SETUP_QDISC_PRIO = 8,
1: -	TC_SETUP_QDISC_MQ = 9,
1: -	TC_SETUP_QDISC_ETF = 10,
1: -	TC_SETUP_ROOT_QDISC = 11,
1: -	TC_SETUP_QDISC_GRED = 12,
1: -	TC_SETUP_QDISC_TAPRIO = 13,
1: -	TC_SETUP_FT = 14,
1: -	TC_SETUP_QDISC_ETS = 15,
1: -	TC_SETUP_QDISC_TBF = 16,
1: -	TC_SETUP_QDISC_FIFO = 17,
1: +  TC_SETUP_QDISC_MQPRIO = 0,
1: +  TC_SETUP_CLSU32 = 1,
1: +  TC_SETUP_CLSFLOWER = 2,
1: +  TC_SETUP_CLSMATCHALL = 3,
1: +  TC_SETUP_CLSBPF = 4,
1: +  TC_SETUP_BLOCK = 5,
1: +  TC_SETUP_QDISC_CBS = 6,
1: +  TC_SETUP_QDISC_RED = 7,
1: +  TC_SETUP_QDISC_PRIO = 8,
1: +  TC_SETUP_QDISC_MQ = 9,
1: +  TC_SETUP_QDISC_ETF = 10,
1: +  TC_SETUP_ROOT_QDISC = 11,
1: +  TC_SETUP_QDISC_GRED = 12,
1: +  TC_SETUP_QDISC_TAPRIO = 13,
1: +  TC_SETUP_FT = 14,
1: +  TC_SETUP_QDISC_ETS = 15,
1: +  TC_SETUP_QDISC_TBF = 16,
1: +  TC_SETUP_QDISC_FIFO = 17,
1:  };
1:  
1:  enum bpf_netdev_command {
1: -	XDP_SETUP_PROG = 0,
1: -	XDP_SETUP_PROG_HW = 1,
1: -	BPF_OFFLOAD_MAP_ALLOC = 2,
1: -	BPF_OFFLOAD_MAP_FREE = 3,
1: -	XDP_SETUP_XSK_POOL = 4,
1: +  XDP_SETUP_PROG = 0,
1: +  XDP_SETUP_PROG_HW = 1,
1: +  BPF_OFFLOAD_MAP_ALLOC = 2,
1: +  BPF_OFFLOAD_MAP_FREE = 3,
1: +  XDP_SETUP_XSK_POOL = 4,
1:  };
1:  
1:  struct netdev_bpf {
1: -	enum bpf_netdev_command command;
1: -	union {
1: -		struct {
1: -			u32 flags;
1: -			struct bpf_prog *prog;
1: -			struct netlink_ext_ack *extack;
1: -		};
1: -		struct {
1: -			struct bpf_offloaded_map *offmap;
1: -		};
1: -		struct {
1: -			struct xsk_buff_pool *pool;
1: -			u16 queue_id;
1: -		} xsk;
1: -	};
1: +  enum bpf_netdev_command command;
1: +  union {
1: +    struct {
1: +      u32 flags;
1: +      struct bpf_prog *prog;
1: +      struct netlink_ext_ack *extack;
1: +    };
1: +    struct {
1: +      struct bpf_offloaded_map *offmap;
1: +    };
1: +    struct {
1: +      struct xsk_buff_pool *pool;
1: +      u16 queue_id;
1: +    } xsk;
1: +  };
1:  };
1:  
1:  struct dev_ifalias {
1: -	struct callback_head rcuhead;
1: -	char ifalias[0];
1: +  struct callback_head rcuhead;
1: +  char ifalias[0];
1:  };
1:  
1:  struct netdev_name_node {
1: -	struct hlist_node hlist;
1: -	struct list_head list;
1: -	struct net_device *dev;
1: -	const char *name;
1: +  struct hlist_node hlist;
1: +  struct list_head list;
1: +  struct net_device *dev;
1: +  const char *name;
1:  };
1:  
1:  struct udp_tunnel_info;
1: @@ -12376,108 +12478,123 @@ struct devlink_port;
1:  struct ip_tunnel_parm;
1:  
1:  struct net_device_ops {
1: -	int (*ndo_init)(struct net_device *);
1: -	void (*ndo_uninit)(struct net_device *);
1: -	int (*ndo_open)(struct net_device *);
1: -	int (*ndo_stop)(struct net_device *);
1: -	netdev_tx_t (*ndo_start_xmit)(struct sk_buff *, struct net_device *);
1: -	netdev_features_t (*ndo_features_check)(struct sk_buff *, struct net_device *, netdev_features_t);
1: -	u16 (*ndo_select_queue)(struct net_device *, struct sk_buff *, struct net_device *);
1: -	void (*ndo_change_rx_flags)(struct net_device *, int);
1: -	void (*ndo_set_rx_mode)(struct net_device *);
1: -	int (*ndo_set_mac_address)(struct net_device *, void *);
1: -	int (*ndo_validate_addr)(struct net_device *);
1: -	int (*ndo_do_ioctl)(struct net_device *, struct ifreq *, int);
1: -	int (*ndo_set_config)(struct net_device *, struct ifmap *);
1: -	int (*ndo_change_mtu)(struct net_device *, int);
1: -	int (*ndo_neigh_setup)(struct net_device *, struct neigh_parms *);
1: -	void (*ndo_tx_timeout)(struct net_device *, unsigned int);
1: -	void (*ndo_get_stats64)(struct net_device *, struct rtnl_link_stats64 *);
1: -	bool (*ndo_has_offload_stats)(const struct net_device *, int);
1: -	int (*ndo_get_offload_stats)(int, const struct net_device *, void *);
1: -	struct net_device_stats * (*ndo_get_stats)(struct net_device *);
1: -	int (*ndo_vlan_rx_add_vid)(struct net_device *, __be16, u16);
1: -	int (*ndo_vlan_rx_kill_vid)(struct net_device *, __be16, u16);
1: -	void (*ndo_poll_controller)(struct net_device *);
1: -	int (*ndo_netpoll_setup)(struct net_device *, struct netpoll_info *);
1: -	void (*ndo_netpoll_cleanup)(struct net_device *);
1: -	int (*ndo_set_vf_mac)(struct net_device *, int, u8 *);
1: -	int (*ndo_set_vf_vlan)(struct net_device *, int, u16, u8, __be16);
1: -	int (*ndo_set_vf_rate)(struct net_device *, int, int, int);
1: -	int (*ndo_set_vf_spoofchk)(struct net_device *, int, bool);
1: -	int (*ndo_set_vf_trust)(struct net_device *, int, bool);
1: -	int (*ndo_get_vf_config)(struct net_device *, int, struct ifla_vf_info *);
1: -	int (*ndo_set_vf_link_state)(struct net_device *, int, int);
1: -	int (*ndo_get_vf_stats)(struct net_device *, int, struct ifla_vf_stats *);
1: -	int (*ndo_set_vf_port)(struct net_device *, int, struct nlattr **);
1: -	int (*ndo_get_vf_port)(struct net_device *, int, struct sk_buff *);
1: -	int (*ndo_get_vf_guid)(struct net_device *, int, struct ifla_vf_guid *, struct ifla_vf_guid *);
1: -	int (*ndo_set_vf_guid)(struct net_device *, int, u64, int);
1: -	int (*ndo_set_vf_rss_query_en)(struct net_device *, int, bool);
1: -	int (*ndo_setup_tc)(struct net_device *, enum tc_setup_type, void *);
1: -	int (*ndo_rx_flow_steer)(struct net_device *, const struct sk_buff *, u16, u32);
1: -	int (*ndo_add_slave)(struct net_device *, struct net_device *, struct netlink_ext_ack *);
1: -	int (*ndo_del_slave)(struct net_device *, struct net_device *);
1: -	struct net_device * (*ndo_get_xmit_slave)(struct net_device *, struct sk_buff *, bool);
1: -	netdev_features_t (*ndo_fix_features)(struct net_device *, netdev_features_t);
1: -	int (*ndo_set_features)(struct net_device *, netdev_features_t);
1: -	int (*ndo_neigh_construct)(struct net_device *, struct neighbour *);
1: -	void (*ndo_neigh_destroy)(struct net_device *, struct neighbour *);
1: -	int (*ndo_fdb_add)(struct ndmsg *, struct nlattr **, struct net_device *, const unsigned char *, u16, u16, struct netlink_ext_ack *);
1: -	int (*ndo_fdb_del)(struct ndmsg *, struct nlattr **, struct net_device *, const unsigned char *, u16);
1: -	int (*ndo_fdb_dump)(struct sk_buff *, struct netlink_callback *, struct net_device *, struct net_device *, int *);
1: -	int (*ndo_fdb_get)(struct sk_buff *, struct nlattr **, struct net_device *, const unsigned char *, u16, u32, u32, struct netlink_ext_ack *);
1: -	int (*ndo_bridge_setlink)(struct net_device *, struct nlmsghdr *, u16, struct netlink_ext_ack *);
1: -	int (*ndo_bridge_getlink)(struct sk_buff *, u32, u32, struct net_device *, u32, int);
1: -	int (*ndo_bridge_dellink)(struct net_device *, struct nlmsghdr *, u16);
1: -	int (*ndo_change_carrier)(struct net_device *, bool);
1: -	int (*ndo_get_phys_port_id)(struct net_device *, struct netdev_phys_item_id *);
1: -	int (*ndo_get_port_parent_id)(struct net_device *, struct netdev_phys_item_id *);
1: -	int (*ndo_get_phys_port_name)(struct net_device *, char *, size_t);
1: -	void (*ndo_udp_tunnel_add)(struct net_device *, struct udp_tunnel_info *);
1: -	void (*ndo_udp_tunnel_del)(struct net_device *, struct udp_tunnel_info *);
1: -	void * (*ndo_dfwd_add_station)(struct net_device *, struct net_device *);
1: -	void (*ndo_dfwd_del_station)(struct net_device *, void *);
1: -	int (*ndo_set_tx_maxrate)(struct net_device *, int, u32);
1: -	int (*ndo_get_iflink)(const struct net_device *);
1: -	int (*ndo_change_proto_down)(struct net_device *, bool);
1: -	int (*ndo_fill_metadata_dst)(struct net_device *, struct sk_buff *);
1: -	void (*ndo_set_rx_headroom)(struct net_device *, int);
1: -	int (*ndo_bpf)(struct net_device *, struct netdev_bpf *);
1: -	int (*ndo_xdp_xmit)(struct net_device *, int, struct xdp_frame **, u32);
1: -	int (*ndo_xsk_wakeup)(struct net_device *, u32, u32);
1: -	struct devlink_port * (*ndo_get_devlink_port)(struct net_device *);
1: -	int (*ndo_tunnel_ctl)(struct net_device *, struct ip_tunnel_parm *, int);
1: -	struct net_device * (*ndo_get_peer_dev)(struct net_device *);
1: +  int (*ndo_init)(struct net_device *);
1: +  void (*ndo_uninit)(struct net_device *);
1: +  int (*ndo_open)(struct net_device *);
1: +  int (*ndo_stop)(struct net_device *);
1: +  netdev_tx_t (*ndo_start_xmit)(struct sk_buff *, struct net_device *);
1: +  netdev_features_t (*ndo_features_check)(struct sk_buff *, struct net_device *,
1: +                                          netdev_features_t);
1: +  u16 (*ndo_select_queue)(struct net_device *, struct sk_buff *,
1: +                          struct net_device *);
1: +  void (*ndo_change_rx_flags)(struct net_device *, int);
1: +  void (*ndo_set_rx_mode)(struct net_device *);
1: +  int (*ndo_set_mac_address)(struct net_device *, void *);
1: +  int (*ndo_validate_addr)(struct net_device *);
1: +  int (*ndo_do_ioctl)(struct net_device *, struct ifreq *, int);
1: +  int (*ndo_set_config)(struct net_device *, struct ifmap *);
1: +  int (*ndo_change_mtu)(struct net_device *, int);
1: +  int (*ndo_neigh_setup)(struct net_device *, struct neigh_parms *);
1: +  void (*ndo_tx_timeout)(struct net_device *, unsigned int);
1: +  void (*ndo_get_stats64)(struct net_device *, struct rtnl_link_stats64 *);
1: +  bool (*ndo_has_offload_stats)(const struct net_device *, int);
1: +  int (*ndo_get_offload_stats)(int, const struct net_device *, void *);
1: +  struct net_device_stats *(*ndo_get_stats)(struct net_device *);
1: +  int (*ndo_vlan_rx_add_vid)(struct net_device *, __be16, u16);
1: +  int (*ndo_vlan_rx_kill_vid)(struct net_device *, __be16, u16);
1: +  void (*ndo_poll_controller)(struct net_device *);
1: +  int (*ndo_netpoll_setup)(struct net_device *, struct netpoll_info *);
1: +  void (*ndo_netpoll_cleanup)(struct net_device *);
1: +  int (*ndo_set_vf_mac)(struct net_device *, int, u8 *);
1: +  int (*ndo_set_vf_vlan)(struct net_device *, int, u16, u8, __be16);
1: +  int (*ndo_set_vf_rate)(struct net_device *, int, int, int);
1: +  int (*ndo_set_vf_spoofchk)(struct net_device *, int, bool);
1: +  int (*ndo_set_vf_trust)(struct net_device *, int, bool);
1: +  int (*ndo_get_vf_config)(struct net_device *, int, struct ifla_vf_info *);
1: +  int (*ndo_set_vf_link_state)(struct net_device *, int, int);
1: +  int (*ndo_get_vf_stats)(struct net_device *, int, struct ifla_vf_stats *);
1: +  int (*ndo_set_vf_port)(struct net_device *, int, struct nlattr **);
1: +  int (*ndo_get_vf_port)(struct net_device *, int, struct sk_buff *);
1: +  int (*ndo_get_vf_guid)(struct net_device *, int, struct ifla_vf_guid *,
1: +                         struct ifla_vf_guid *);
1: +  int (*ndo_set_vf_guid)(struct net_device *, int, u64, int);
1: +  int (*ndo_set_vf_rss_query_en)(struct net_device *, int, bool);
1: +  int (*ndo_setup_tc)(struct net_device *, enum tc_setup_type, void *);
1: +  int (*ndo_rx_flow_steer)(struct net_device *, const struct sk_buff *, u16,
1: +                           u32);
1: +  int (*ndo_add_slave)(struct net_device *, struct net_device *,
1: +                       struct netlink_ext_ack *);
1: +  int (*ndo_del_slave)(struct net_device *, struct net_device *);
1: +  struct net_device *(*ndo_get_xmit_slave)(struct net_device *,
1: +                                           struct sk_buff *, bool);
1: +  netdev_features_t (*ndo_fix_features)(struct net_device *, netdev_features_t);
1: +  int (*ndo_set_features)(struct net_device *, netdev_features_t);
1: +  int (*ndo_neigh_construct)(struct net_device *, struct neighbour *);
1: +  void (*ndo_neigh_destroy)(struct net_device *, struct neighbour *);
1: +  int (*ndo_fdb_add)(struct ndmsg *, struct nlattr **, struct net_device *,
1: +                     const unsigned char *, u16, u16, struct netlink_ext_ack *);
1: +  int (*ndo_fdb_del)(struct ndmsg *, struct nlattr **, struct net_device *,
1: +                     const unsigned char *, u16);
1: +  int (*ndo_fdb_dump)(struct sk_buff *, struct netlink_callback *,
1: +                      struct net_device *, struct net_device *, int *);
1: +  int (*ndo_fdb_get)(struct sk_buff *, struct nlattr **, struct net_device *,
1: +                     const unsigned char *, u16, u32, u32,
1: +                     struct netlink_ext_ack *);
1: +  int (*ndo_bridge_setlink)(struct net_device *, struct nlmsghdr *, u16,
1: +                            struct netlink_ext_ack *);
1: +  int (*ndo_bridge_getlink)(struct sk_buff *, u32, u32, struct net_device *,
1: +                            u32, int);
1: +  int (*ndo_bridge_dellink)(struct net_device *, struct nlmsghdr *, u16);
1: +  int (*ndo_change_carrier)(struct net_device *, bool);
1: +  int (*ndo_get_phys_port_id)(struct net_device *,
1: +                              struct netdev_phys_item_id *);
1: +  int (*ndo_get_port_parent_id)(struct net_device *,
1: +                                struct netdev_phys_item_id *);
1: +  int (*ndo_get_phys_port_name)(struct net_device *, char *, size_t);
1: +  void (*ndo_udp_tunnel_add)(struct net_device *, struct udp_tunnel_info *);
1: +  void (*ndo_udp_tunnel_del)(struct net_device *, struct udp_tunnel_info *);
1: +  void *(*ndo_dfwd_add_station)(struct net_device *, struct net_device *);
1: +  void (*ndo_dfwd_del_station)(struct net_device *, void *);
1: +  int (*ndo_set_tx_maxrate)(struct net_device *, int, u32);
1: +  int (*ndo_get_iflink)(const struct net_device *);
1: +  int (*ndo_change_proto_down)(struct net_device *, bool);
1: +  int (*ndo_fill_metadata_dst)(struct net_device *, struct sk_buff *);
1: +  void (*ndo_set_rx_headroom)(struct net_device *, int);
1: +  int (*ndo_bpf)(struct net_device *, struct netdev_bpf *);
1: +  int (*ndo_xdp_xmit)(struct net_device *, int, struct xdp_frame **, u32);
1: +  int (*ndo_xsk_wakeup)(struct net_device *, u32, u32);
1: +  struct devlink_port *(*ndo_get_devlink_port)(struct net_device *);
1: +  int (*ndo_tunnel_ctl)(struct net_device *, struct ip_tunnel_parm *, int);
1: +  struct net_device *(*ndo_get_peer_dev)(struct net_device *);
1:  };
1:  
1:  struct neigh_parms {
1: -	possible_net_t net;
1: -	struct net_device *dev;
1: -	struct list_head list;
1: -	int (*neigh_setup)(struct neighbour *);
1: -	struct neigh_table *tbl;
1: -	void *sysctl_table;
1: -	int dead;
1: -	refcount_t refcnt;
1: -	struct callback_head callback_head;
1: -	int reachable_time;
1: -	int data[13];
1: -	long unsigned int data_state[1];
1: +  possible_net_t net;
1: +  struct net_device *dev;
1: +  struct list_head list;
1: +  int (*neigh_setup)(struct neighbour *);
1: +  struct neigh_table *tbl;
1: +  void *sysctl_table;
1: +  int dead;
1: +  refcount_t refcnt;
1: +  struct callback_head callback_head;
1: +  int reachable_time;
1: +  int data[13];
1: +  long unsigned int data_state[1];
1:  };
1:  
1:  struct pcpu_lstats {
1: -	u64_stats_t packets;
1: -	u64_stats_t bytes;
1: -	struct u64_stats_sync syncp;
1: +  u64_stats_t packets;
1: +  u64_stats_t bytes;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct pcpu_sw_netstats {
1: -	u64 rx_packets;
1: -	u64 rx_bytes;
1: -	u64 tx_packets;
1: -	u64 tx_bytes;
1: -	struct u64_stats_sync syncp;
1: +  u64 rx_packets;
1: +  u64 rx_bytes;
1: +  u64 tx_packets;
1: +  u64 tx_bytes;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct nd_opt_hdr;
1: @@ -12487,19 +12604,26 @@ struct ndisc_options;
1:  struct prefix_info;
1:  
1:  struct ndisc_ops {
1: -	int (*is_useropt)(u8);
1: -	int (*parse_options)(const struct net_device *, struct nd_opt_hdr *, struct ndisc_options *);
1: -	void (*update)(const struct net_device *, struct neighbour *, u32, u8, const struct ndisc_options *);
1: -	int (*opt_addr_space)(const struct net_device *, u8, struct neighbour *, u8 *, u8 **);
1: -	void (*fill_addr_option)(const struct net_device *, struct sk_buff *, u8, const u8 *);
1: -	void (*prefix_rcv_add_addr)(struct net *, struct net_device *, const struct prefix_info *, struct inet6_dev *, struct in6_addr *, int, u32, bool, bool, __u32, u32, bool);
1: +  int (*is_useropt)(u8);
1: +  int (*parse_options)(const struct net_device *, struct nd_opt_hdr *,
1: +                       struct ndisc_options *);
1: +  void (*update)(const struct net_device *, struct neighbour *, u32, u8,
1: +                 const struct ndisc_options *);
1: +  int (*opt_addr_space)(const struct net_device *, u8, struct neighbour *, u8 *,
1: +                        u8 **);
1: +  void (*fill_addr_option)(const struct net_device *, struct sk_buff *, u8,
1: +                           const u8 *);
1: +  void (*prefix_rcv_add_addr)(struct net *, struct net_device *,
1: +                              const struct prefix_info *, struct inet6_dev *,
1: +                              struct in6_addr *, int, u32, bool, bool, __u32,
1: +                              u32, bool);
1:  };
1:  
1:  struct ipv6_devstat {
1: -	struct proc_dir_entry *proc_dir_entry;
1: -	struct ipstats_mib *ipv6;
1: -	struct icmpv6_mib_device *icmpv6dev;
1: -	struct icmpv6msg_mib_device *icmpv6msgdev;
1: +  struct proc_dir_entry *proc_dir_entry;
1: +  struct ipstats_mib *ipv6;
1: +  struct icmpv6_mib_device *icmpv6dev;
1: +  struct icmpv6msg_mib_device *icmpv6msgdev;
1:  };
1:  
1:  struct ifmcaddr6;
1: @@ -12507,38 +12631,38 @@ struct ifmcaddr6;
1:  struct ifacaddr6;
1:  
1:  struct inet6_dev {
1: -	struct net_device *dev;
1: -	struct list_head addr_list;
1: -	struct ifmcaddr6 *mc_list;
1: -	struct ifmcaddr6 *mc_tomb;
1: -	spinlock_t mc_lock;
1: -	unsigned char mc_qrv;
1: -	unsigned char mc_gq_running;
1: -	unsigned char mc_ifc_count;
1: -	unsigned char mc_dad_count;
1: -	long unsigned int mc_v1_seen;
1: -	long unsigned int mc_qi;
1: -	long unsigned int mc_qri;
1: -	long unsigned int mc_maxdelay;
1: -	struct timer_list mc_gq_timer;
1: -	struct timer_list mc_ifc_timer;
1: -	struct timer_list mc_dad_timer;
1: -	struct ifacaddr6 *ac_list;
1: -	rwlock_t lock;
1: -	refcount_t refcnt;
1: -	__u32 if_flags;
1: -	int dead;
1: -	u32 desync_factor;
1: -	struct list_head tempaddr_list;
1: -	struct in6_addr token;
1: -	struct neigh_parms *nd_parms;
1: -	struct ipv6_devconf cnf;
1: -	struct ipv6_devstat stats;
1: -	struct timer_list rs_timer;
1: -	__s32 rs_interval;
1: -	__u8 rs_probes;
1: -	long unsigned int tstamp;
1: -	struct callback_head rcu;
1: +  struct net_device *dev;
1: +  struct list_head addr_list;
1: +  struct ifmcaddr6 *mc_list;
1: +  struct ifmcaddr6 *mc_tomb;
1: +  spinlock_t mc_lock;
1: +  unsigned char mc_qrv;
1: +  unsigned char mc_gq_running;
1: +  unsigned char mc_ifc_count;
1: +  unsigned char mc_dad_count;
1: +  long unsigned int mc_v1_seen;
1: +  long unsigned int mc_qi;
1: +  long unsigned int mc_qri;
1: +  long unsigned int mc_maxdelay;
1: +  struct timer_list mc_gq_timer;
1: +  struct timer_list mc_ifc_timer;
1: +  struct timer_list mc_dad_timer;
1: +  struct ifacaddr6 *ac_list;
1: +  rwlock_t lock;
1: +  refcount_t refcnt;
1: +  __u32 if_flags;
1: +  int dead;
1: +  u32 desync_factor;
1: +  struct list_head tempaddr_list;
1: +  struct in6_addr token;
1: +  struct neigh_parms *nd_parms;
1: +  struct ipv6_devconf cnf;
1: +  struct ipv6_devstat stats;
1: +  struct timer_list rs_timer;
1: +  __s32 rs_interval;
1: +  __u8 rs_probes;
1: +  long unsigned int tstamp;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_proto;
1: @@ -12546,205 +12670,218 @@ struct tcf_proto;
1:  struct tcf_block;
1:  
1:  struct mini_Qdisc {
1: -	struct tcf_proto *filter_list;
1: -	struct tcf_block *block;
1: -	struct gnet_stats_basic_cpu *cpu_bstats;
1: -	struct gnet_stats_queue *cpu_qstats;
1: -	struct callback_head rcu;
1: +  struct tcf_proto *filter_list;
1: +  struct tcf_block *block;
1: +  struct gnet_stats_basic_cpu *cpu_bstats;
1: +  struct gnet_stats_queue *cpu_qstats;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct rtnl_link_ops {
1: -	struct list_head list;
1: -	const char *kind;
1: -	size_t priv_size;
1: -	void (*setup)(struct net_device *);
1: -	unsigned int maxtype;
1: -	const struct nla_policy *policy;
1: -	int (*validate)(struct nlattr **, struct nlattr **, struct netlink_ext_ack *);
1: -	int (*newlink)(struct net *, struct net_device *, struct nlattr **, struct nlattr **, struct netlink_ext_ack *);
1: -	int (*changelink)(struct net_device *, struct nlattr **, struct nlattr **, struct netlink_ext_ack *);
1: -	void (*dellink)(struct net_device *, struct list_head *);
1: -	size_t (*get_size)(const struct net_device *);
1: -	int (*fill_info)(struct sk_buff *, const struct net_device *);
1: -	size_t (*get_xstats_size)(const struct net_device *);
1: -	int (*fill_xstats)(struct sk_buff *, const struct net_device *);
1: -	unsigned int (*get_num_tx_queues)();
1: -	unsigned int (*get_num_rx_queues)();
1: -	unsigned int slave_maxtype;
1: -	const struct nla_policy *slave_policy;
1: -	int (*slave_changelink)(struct net_device *, struct net_device *, struct nlattr **, struct nlattr **, struct netlink_ext_ack *);
1: -	size_t (*get_slave_size)(const struct net_device *, const struct net_device *);
1: -	int (*fill_slave_info)(struct sk_buff *, const struct net_device *, const struct net_device *);
1: -	struct net * (*get_link_net)(const struct net_device *);
1: -	size_t (*get_linkxstats_size)(const struct net_device *, int);
1: -	int (*fill_linkxstats)(struct sk_buff *, const struct net_device *, int *, int);
1: +  struct list_head list;
1: +  const char *kind;
1: +  size_t priv_size;
1: +  void (*setup)(struct net_device *);
1: +  unsigned int maxtype;
1: +  const struct nla_policy *policy;
1: +  int (*validate)(struct nlattr **, struct nlattr **, struct netlink_ext_ack *);
1: +  int (*newlink)(struct net *, struct net_device *, struct nlattr **,
1: +                 struct nlattr **, struct netlink_ext_ack *);
1: +  int (*changelink)(struct net_device *, struct nlattr **, struct nlattr **,
1: +                    struct netlink_ext_ack *);
1: +  void (*dellink)(struct net_device *, struct list_head *);
1: +  size_t (*get_size)(const struct net_device *);
1: +  int (*fill_info)(struct sk_buff *, const struct net_device *);
1: +  size_t (*get_xstats_size)(const struct net_device *);
1: +  int (*fill_xstats)(struct sk_buff *, const struct net_device *);
1: +  unsigned int (*get_num_tx_queues)();
1: +  unsigned int (*get_num_rx_queues)();
1: +  unsigned int slave_maxtype;
1: +  const struct nla_policy *slave_policy;
1: +  int (*slave_changelink)(struct net_device *, struct net_device *,
1: +                          struct nlattr **, struct nlattr **,
1: +                          struct netlink_ext_ack *);
1: +  size_t (*get_slave_size)(const struct net_device *,
1: +                           const struct net_device *);
1: +  int (*fill_slave_info)(struct sk_buff *, const struct net_device *,
1: +                         const struct net_device *);
1: +  struct net *(*get_link_net)(const struct net_device *);
1: +  size_t (*get_linkxstats_size)(const struct net_device *, int);
1: +  int (*fill_linkxstats)(struct sk_buff *, const struct net_device *, int *,
1: +                         int);
1:  };
1:  
1:  struct udp_tunnel_nic_table_info {
1: -	unsigned int n_entries;
1: -	unsigned int tunnel_types;
1: +  unsigned int n_entries;
1: +  unsigned int tunnel_types;
1:  };
1:  
1:  struct udp_tunnel_nic_shared;
1:  
1:  struct udp_tunnel_nic_info {
1: -	int (*set_port)(struct net_device *, unsigned int, unsigned int, struct udp_tunnel_info *);
1: -	int (*unset_port)(struct net_device *, unsigned int, unsigned int, struct udp_tunnel_info *);
1: -	int (*sync_table)(struct net_device *, unsigned int);
1: -	struct udp_tunnel_nic_shared *shared;
1: -	unsigned int flags;
1: -	struct udp_tunnel_nic_table_info tables[4];
1: -};
1: -
1: -enum {
1: -	RTAX_UNSPEC = 0,
1: -	RTAX_LOCK = 1,
1: -	RTAX_MTU = 2,
1: -	RTAX_WINDOW = 3,
1: -	RTAX_RTT = 4,
1: -	RTAX_RTTVAR = 5,
1: -	RTAX_SSTHRESH = 6,
1: -	RTAX_CWND = 7,
1: -	RTAX_ADVMSS = 8,
1: -	RTAX_REORDERING = 9,
1: -	RTAX_HOPLIMIT = 10,
1: -	RTAX_INITCWND = 11,
1: -	RTAX_FEATURES = 12,
1: -	RTAX_RTO_MIN = 13,
1: -	RTAX_INITRWND = 14,
1: -	RTAX_QUICKACK = 15,
1: -	RTAX_CC_ALGO = 16,
1: -	RTAX_FASTOPEN_NO_COOKIE = 17,
1: -	__RTAX_MAX = 18,
1: +  int (*set_port)(struct net_device *, unsigned int, unsigned int,
1: +                  struct udp_tunnel_info *);
1: +  int (*unset_port)(struct net_device *, unsigned int, unsigned int,
1: +                    struct udp_tunnel_info *);
1: +  int (*sync_table)(struct net_device *, unsigned int);
1: +  struct udp_tunnel_nic_shared *shared;
1: +  unsigned int flags;
1: +  struct udp_tunnel_nic_table_info tables[4];
1: +};
1: +
1: +enum {
1: +  RTAX_UNSPEC = 0,
1: +  RTAX_LOCK = 1,
1: +  RTAX_MTU = 2,
1: +  RTAX_WINDOW = 3,
1: +  RTAX_RTT = 4,
1: +  RTAX_RTTVAR = 5,
1: +  RTAX_SSTHRESH = 6,
1: +  RTAX_CWND = 7,
1: +  RTAX_ADVMSS = 8,
1: +  RTAX_REORDERING = 9,
1: +  RTAX_HOPLIMIT = 10,
1: +  RTAX_INITCWND = 11,
1: +  RTAX_FEATURES = 12,
1: +  RTAX_RTO_MIN = 13,
1: +  RTAX_INITRWND = 14,
1: +  RTAX_QUICKACK = 15,
1: +  RTAX_CC_ALGO = 16,
1: +  RTAX_FASTOPEN_NO_COOKIE = 17,
1: +  __RTAX_MAX = 18,
1:  };
1:  
1:  struct tcmsg {
1: -	unsigned char tcm_family;
1: -	unsigned char tcm__pad1;
1: -	short unsigned int tcm__pad2;
1: -	int tcm_ifindex;
1: -	__u32 tcm_handle;
1: -	__u32 tcm_parent;
1: -	__u32 tcm_info;
1: +  unsigned char tcm_family;
1: +  unsigned char tcm__pad1;
1: +  short unsigned int tcm__pad2;
1: +  int tcm_ifindex;
1: +  __u32 tcm_handle;
1: +  __u32 tcm_parent;
1: +  __u32 tcm_info;
1:  };
1:  
1:  struct gnet_stats_basic_cpu {
1: -	struct gnet_stats_basic_packed bstats;
1: -	struct u64_stats_sync syncp;
1: +  struct gnet_stats_basic_packed bstats;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct gnet_dump {
1: -	spinlock_t *lock;
1: -	struct sk_buff *skb;
1: -	struct nlattr *tail;
1: -	int compat_tc_stats;
1: -	int compat_xstats;
1: -	int padattr;
1: -	void *xstats;
1: -	int xstats_len;
1: -	struct tc_stats tc_stats;
1: +  spinlock_t *lock;
1: +  struct sk_buff *skb;
1: +  struct nlattr *tail;
1: +  int compat_tc_stats;
1: +  int compat_xstats;
1: +  int padattr;
1: +  void *xstats;
1: +  int xstats_len;
1: +  struct tc_stats tc_stats;
1:  };
1:  
1:  struct netlink_range_validation {
1: -	u64 min;
1: -	u64 max;
1: +  u64 min;
1: +  u64 max;
1:  };
1:  
1:  struct netlink_range_validation_signed {
1: -	s64 min;
1: -	s64 max;
1: +  s64 min;
1: +  s64 max;
1:  };
1:  
1:  enum flow_action_hw_stats_bit {
1: -	FLOW_ACTION_HW_STATS_IMMEDIATE_BIT = 0,
1: -	FLOW_ACTION_HW_STATS_DELAYED_BIT = 1,
1: -	FLOW_ACTION_HW_STATS_DISABLED_BIT = 2,
1: -	FLOW_ACTION_HW_STATS_NUM_BITS = 3,
1: +  FLOW_ACTION_HW_STATS_IMMEDIATE_BIT = 0,
1: +  FLOW_ACTION_HW_STATS_DELAYED_BIT = 1,
1: +  FLOW_ACTION_HW_STATS_DISABLED_BIT = 2,
1: +  FLOW_ACTION_HW_STATS_NUM_BITS = 3,
1:  };
1:  
1:  struct flow_block {
1: -	struct list_head cb_list;
1: +  struct list_head cb_list;
1:  };
1:  
1:  typedef int flow_setup_cb_t(enum tc_setup_type, void *, void *);
1:  
1:  struct qdisc_size_table {
1: -	struct callback_head rcu;
1: -	struct list_head list;
1: -	struct tc_sizespec szopts;
1: -	int refcnt;
1: -	u16 data[0];
1: +  struct callback_head rcu;
1: +  struct list_head list;
1: +  struct tc_sizespec szopts;
1: +  int refcnt;
1: +  u16 data[0];
1:  };
1:  
1:  struct Qdisc_class_ops;
1:  
1:  struct Qdisc_ops {
1: -	struct Qdisc_ops *next;
1: -	const struct Qdisc_class_ops *cl_ops;
1: -	char id[16];
1: -	int priv_size;
1: -	unsigned int static_flags;
1: -	int (*enqueue)(struct sk_buff *, struct Qdisc *, struct sk_buff **);
1: -	struct sk_buff * (*dequeue)(struct Qdisc *);
1: -	struct sk_buff * (*peek)(struct Qdisc *);
1: -	int (*init)(struct Qdisc *, struct nlattr *, struct netlink_ext_ack *);
1: -	void (*reset)(struct Qdisc *);
1: -	void (*destroy)(struct Qdisc *);
1: -	int (*change)(struct Qdisc *, struct nlattr *, struct netlink_ext_ack *);
1: -	void (*attach)(struct Qdisc *);
1: -	int (*change_tx_queue_len)(struct Qdisc *, unsigned int);
1: -	int (*dump)(struct Qdisc *, struct sk_buff *);
1: -	int (*dump_stats)(struct Qdisc *, struct gnet_dump *);
1: -	void (*ingress_block_set)(struct Qdisc *, u32);
1: -	void (*egress_block_set)(struct Qdisc *, u32);
1: -	u32 (*ingress_block_get)(struct Qdisc *);
1: -	u32 (*egress_block_get)(struct Qdisc *);
1: -	struct module *owner;
1: +  struct Qdisc_ops *next;
1: +  const struct Qdisc_class_ops *cl_ops;
1: +  char id[16];
1: +  int priv_size;
1: +  unsigned int static_flags;
1: +  int (*enqueue)(struct sk_buff *, struct Qdisc *, struct sk_buff **);
1: +  struct sk_buff *(*dequeue)(struct Qdisc *);
1: +  struct sk_buff *(*peek)(struct Qdisc *);
1: +  int (*init)(struct Qdisc *, struct nlattr *, struct netlink_ext_ack *);
1: +  void (*reset)(struct Qdisc *);
1: +  void (*destroy)(struct Qdisc *);
1: +  int (*change)(struct Qdisc *, struct nlattr *, struct netlink_ext_ack *);
1: +  void (*attach)(struct Qdisc *);
1: +  int (*change_tx_queue_len)(struct Qdisc *, unsigned int);
1: +  int (*dump)(struct Qdisc *, struct sk_buff *);
1: +  int (*dump_stats)(struct Qdisc *, struct gnet_dump *);
1: +  void (*ingress_block_set)(struct Qdisc *, u32);
1: +  void (*egress_block_set)(struct Qdisc *, u32);
1: +  u32 (*ingress_block_get)(struct Qdisc *);
1: +  u32 (*egress_block_get)(struct Qdisc *);
1: +  struct module *owner;
1:  };
1:  
1:  struct qdisc_walker;
1:  
1:  struct Qdisc_class_ops {
1: -	unsigned int flags;
1: -	struct netdev_queue * (*select_queue)(struct Qdisc *, struct tcmsg *);
1: -	int (*graft)(struct Qdisc *, long unsigned int, struct Qdisc *, struct Qdisc **, struct netlink_ext_ack *);
1: -	struct Qdisc * (*leaf)(struct Qdisc *, long unsigned int);
1: -	void (*qlen_notify)(struct Qdisc *, long unsigned int);
1: -	long unsigned int (*find)(struct Qdisc *, u32);
1: -	int (*change)(struct Qdisc *, u32, u32, struct nlattr **, long unsigned int *, struct netlink_ext_ack *);
1: -	int (*delete)(struct Qdisc *, long unsigned int);
1: -	void (*walk)(struct Qdisc *, struct qdisc_walker *);
1: -	struct tcf_block * (*tcf_block)(struct Qdisc *, long unsigned int, struct netlink_ext_ack *);
1: -	long unsigned int (*bind_tcf)(struct Qdisc *, long unsigned int, u32);
1: -	void (*unbind_tcf)(struct Qdisc *, long unsigned int);
1: -	int (*dump)(struct Qdisc *, long unsigned int, struct sk_buff *, struct tcmsg *);
1: -	int (*dump_stats)(struct Qdisc *, long unsigned int, struct gnet_dump *);
1: +  unsigned int flags;
1: +  struct netdev_queue *(*select_queue)(struct Qdisc *, struct tcmsg *);
1: +  int (*graft)(struct Qdisc *, long unsigned int, struct Qdisc *,
1: +               struct Qdisc **, struct netlink_ext_ack *);
1: +  struct Qdisc *(*leaf)(struct Qdisc *, long unsigned int);
1: +  void (*qlen_notify)(struct Qdisc *, long unsigned int);
1: +  long unsigned int (*find)(struct Qdisc *, u32);
1: +  int (*change)(struct Qdisc *, u32, u32, struct nlattr **, long unsigned int *,
1: +                struct netlink_ext_ack *);
1: +  int (*delete)(struct Qdisc *, long unsigned int);
1: +  void (*walk)(struct Qdisc *, struct qdisc_walker *);
1: +  struct tcf_block *(*tcf_block)(struct Qdisc *, long unsigned int,
1: +                                 struct netlink_ext_ack *);
1: +  long unsigned int (*bind_tcf)(struct Qdisc *, long unsigned int, u32);
1: +  void (*unbind_tcf)(struct Qdisc *, long unsigned int);
1: +  int (*dump)(struct Qdisc *, long unsigned int, struct sk_buff *,
1: +              struct tcmsg *);
1: +  int (*dump_stats)(struct Qdisc *, long unsigned int, struct gnet_dump *);
1:  };
1:  
1:  struct tcf_chain;
1:  
1:  struct tcf_block {
1: -	struct mutex lock;
1: -	struct list_head chain_list;
1: -	u32 index;
1: -	u32 classid;
1: -	refcount_t refcnt;
1: -	struct net *net;
1: -	struct Qdisc *q;
1: -	struct rw_semaphore cb_lock;
1: -	struct flow_block flow_block;
1: -	struct list_head owner_list;
1: -	bool keep_dst;
1: -	atomic_t offloadcnt;
1: -	unsigned int nooffloaddevcnt;
1: -	unsigned int lockeddevcnt;
1: -	struct {
1: -		struct tcf_chain *chain;
1: -		struct list_head filter_chain_list;
1: -	} chain0;
1: -	struct callback_head rcu;
1: -	struct hlist_head proto_destroy_ht[128];
1: -	struct mutex proto_destroy_lock;
1: +  struct mutex lock;
1: +  struct list_head chain_list;
1: +  u32 index;
1: +  u32 classid;
1: +  refcount_t refcnt;
1: +  struct net *net;
1: +  struct Qdisc *q;
1: +  struct rw_semaphore cb_lock;
1: +  struct flow_block flow_block;
1: +  struct list_head owner_list;
1: +  bool keep_dst;
1: +  atomic_t offloadcnt;
1: +  unsigned int nooffloaddevcnt;
1: +  unsigned int lockeddevcnt;
1: +  struct {
1: +    struct tcf_chain *chain;
1: +    struct list_head filter_chain_list;
1: +  } chain0;
1: +  struct callback_head rcu;
1: +  struct hlist_head proto_destroy_ht[128];
1: +  struct mutex proto_destroy_lock;
1:  };
1:  
1:  struct tcf_result;
1: @@ -12752,110 +12889,119 @@ struct tcf_result;
1:  struct tcf_proto_ops;
1:  
1:  struct tcf_proto {
1: -	struct tcf_proto *next;
1: -	void *root;
1: -	int (*classify)(struct sk_buff *, const struct tcf_proto *, struct tcf_result *);
1: -	__be16 protocol;
1: -	u32 prio;
1: -	void *data;
1: -	const struct tcf_proto_ops *ops;
1: -	struct tcf_chain *chain;
1: -	spinlock_t lock;
1: -	bool deleting;
1: -	refcount_t refcnt;
1: -	struct callback_head rcu;
1: -	struct hlist_node destroy_ht_node;
1: +  struct tcf_proto *next;
1: +  void *root;
1: +  int (*classify)(struct sk_buff *, const struct tcf_proto *,
1: +                  struct tcf_result *);
1: +  __be16 protocol;
1: +  u32 prio;
1: +  void *data;
1: +  const struct tcf_proto_ops *ops;
1: +  struct tcf_chain *chain;
1: +  spinlock_t lock;
1: +  bool deleting;
1: +  refcount_t refcnt;
1: +  struct callback_head rcu;
1: +  struct hlist_node destroy_ht_node;
1:  };
1:  
1:  struct tcf_result {
1: -	union {
1: -		struct {
1: -			long unsigned int class;
1: -			u32 classid;
1: -		};
1: -		const struct tcf_proto *goto_tp;
1: -		struct {
1: -			bool ingress;
1: -			struct gnet_stats_queue *qstats;
1: -		};
1: -	};
1: +  union {
1: +    struct {
1: +      long unsigned int class;
1: +      u32 classid;
1: +    };
1: +    const struct tcf_proto *goto_tp;
1: +    struct {
1: +      bool ingress;
1: +      struct gnet_stats_queue *qstats;
1: +    };
1: +  };
1:  };
1:  
1:  struct tcf_walker;
1:  
1:  struct tcf_proto_ops {
1: -	struct list_head head;
1: -	char kind[16];
1: -	int (*classify)(struct sk_buff *, const struct tcf_proto *, struct tcf_result *);
1: -	int (*init)(struct tcf_proto *);
1: -	void (*destroy)(struct tcf_proto *, bool, struct netlink_ext_ack *);
1: -	void * (*get)(struct tcf_proto *, u32);
1: -	void (*put)(struct tcf_proto *, void *);
1: -	int (*change)(struct net *, struct sk_buff *, struct tcf_proto *, long unsigned int, u32, struct nlattr **, void **, bool, bool, struct netlink_ext_ack *);
1: -	int (*delete)(struct tcf_proto *, void *, bool *, bool, struct netlink_ext_ack *);
1: -	bool (*delete_empty)(struct tcf_proto *);
1: -	void (*walk)(struct tcf_proto *, struct tcf_walker *, bool);
1: -	int (*reoffload)(struct tcf_proto *, bool, flow_setup_cb_t *, void *, struct netlink_ext_ack *);
1: -	void (*hw_add)(struct tcf_proto *, void *);
1: -	void (*hw_del)(struct tcf_proto *, void *);
1: -	void (*bind_class)(void *, u32, long unsigned int, void *, long unsigned int);
1: -	void * (*tmplt_create)(struct net *, struct tcf_chain *, struct nlattr **, struct netlink_ext_ack *);
1: -	void (*tmplt_destroy)(void *);
1: -	int (*dump)(struct net *, struct tcf_proto *, void *, struct sk_buff *, struct tcmsg *, bool);
1: -	int (*terse_dump)(struct net *, struct tcf_proto *, void *, struct sk_buff *, struct tcmsg *, bool);
1: -	int (*tmplt_dump)(struct sk_buff *, struct net *, void *);
1: -	struct module *owner;
1: -	int flags;
1: +  struct list_head head;
1: +  char kind[16];
1: +  int (*classify)(struct sk_buff *, const struct tcf_proto *,
1: +                  struct tcf_result *);
1: +  int (*init)(struct tcf_proto *);
1: +  void (*destroy)(struct tcf_proto *, bool, struct netlink_ext_ack *);
1: +  void *(*get)(struct tcf_proto *, u32);
1: +  void (*put)(struct tcf_proto *, void *);
1: +  int (*change)(struct net *, struct sk_buff *, struct tcf_proto *,
1: +                long unsigned int, u32, struct nlattr **, void **, bool, bool,
1: +                struct netlink_ext_ack *);
1: +  int (*delete)(struct tcf_proto *, void *, bool *, bool,
1: +                struct netlink_ext_ack *);
1: +  bool (*delete_empty)(struct tcf_proto *);
1: +  void (*walk)(struct tcf_proto *, struct tcf_walker *, bool);
1: +  int (*reoffload)(struct tcf_proto *, bool, flow_setup_cb_t *, void *,
1: +                   struct netlink_ext_ack *);
1: +  void (*hw_add)(struct tcf_proto *, void *);
1: +  void (*hw_del)(struct tcf_proto *, void *);
1: +  void (*bind_class)(void *, u32, long unsigned int, void *, long unsigned int);
1: +  void *(*tmplt_create)(struct net *, struct tcf_chain *, struct nlattr **,
1: +                        struct netlink_ext_ack *);
1: +  void (*tmplt_destroy)(void *);
1: +  int (*dump)(struct net *, struct tcf_proto *, void *, struct sk_buff *,
1: +              struct tcmsg *, bool);
1: +  int (*terse_dump)(struct net *, struct tcf_proto *, void *, struct sk_buff *,
1: +                    struct tcmsg *, bool);
1: +  int (*tmplt_dump)(struct sk_buff *, struct net *, void *);
1: +  struct module *owner;
1: +  int flags;
1:  };
1:  
1:  struct tcf_chain {
1: -	struct mutex filter_chain_lock;
1: -	struct tcf_proto *filter_chain;
1: -	struct list_head list;
1: -	struct tcf_block *block;
1: -	u32 index;
1: -	unsigned int refcnt;
1: -	unsigned int action_refcnt;
1: -	bool explicitly_created;
1: -	bool flushing;
1: -	const struct tcf_proto_ops *tmplt_ops;
1: -	void *tmplt_priv;
1: -	struct callback_head rcu;
1: +  struct mutex filter_chain_lock;
1: +  struct tcf_proto *filter_chain;
1: +  struct list_head list;
1: +  struct tcf_block *block;
1: +  u32 index;
1: +  unsigned int refcnt;
1: +  unsigned int action_refcnt;
1: +  bool explicitly_created;
1: +  bool flushing;
1: +  const struct tcf_proto_ops *tmplt_ops;
1: +  void *tmplt_priv;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct sock_fprog_kern {
1: -	u16 len;
1: -	struct sock_filter *filter;
1: +  u16 len;
1: +  struct sock_filter *filter;
1:  };
1:  
1:  struct sk_filter {
1: -	refcount_t refcnt;
1: -	struct callback_head rcu;
1: -	struct bpf_prog *prog;
1: -};
1: -
1: -enum {
1: -	NEIGH_VAR_MCAST_PROBES = 0,
1: -	NEIGH_VAR_UCAST_PROBES = 1,
1: -	NEIGH_VAR_APP_PROBES = 2,
1: -	NEIGH_VAR_MCAST_REPROBES = 3,
1: -	NEIGH_VAR_RETRANS_TIME = 4,
1: -	NEIGH_VAR_BASE_REACHABLE_TIME = 5,
1: -	NEIGH_VAR_DELAY_PROBE_TIME = 6,
1: -	NEIGH_VAR_GC_STALETIME = 7,
1: -	NEIGH_VAR_QUEUE_LEN_BYTES = 8,
1: -	NEIGH_VAR_PROXY_QLEN = 9,
1: -	NEIGH_VAR_ANYCAST_DELAY = 10,
1: -	NEIGH_VAR_PROXY_DELAY = 11,
1: -	NEIGH_VAR_LOCKTIME = 12,
1: -	NEIGH_VAR_QUEUE_LEN = 13,
1: -	NEIGH_VAR_RETRANS_TIME_MS = 14,
1: -	NEIGH_VAR_BASE_REACHABLE_TIME_MS = 15,
1: -	NEIGH_VAR_GC_INTERVAL = 16,
1: -	NEIGH_VAR_GC_THRESH1 = 17,
1: -	NEIGH_VAR_GC_THRESH2 = 18,
1: -	NEIGH_VAR_GC_THRESH3 = 19,
1: -	NEIGH_VAR_MAX = 20,
1: +  refcount_t refcnt;
1: +  struct callback_head rcu;
1: +  struct bpf_prog *prog;
1: +};
1: +
1: +enum {
1: +  NEIGH_VAR_MCAST_PROBES = 0,
1: +  NEIGH_VAR_UCAST_PROBES = 1,
1: +  NEIGH_VAR_APP_PROBES = 2,
1: +  NEIGH_VAR_MCAST_REPROBES = 3,
1: +  NEIGH_VAR_RETRANS_TIME = 4,
1: +  NEIGH_VAR_BASE_REACHABLE_TIME = 5,
1: +  NEIGH_VAR_DELAY_PROBE_TIME = 6,
1: +  NEIGH_VAR_GC_STALETIME = 7,
1: +  NEIGH_VAR_QUEUE_LEN_BYTES = 8,
1: +  NEIGH_VAR_PROXY_QLEN = 9,
1: +  NEIGH_VAR_ANYCAST_DELAY = 10,
1: +  NEIGH_VAR_PROXY_DELAY = 11,
1: +  NEIGH_VAR_LOCKTIME = 12,
1: +  NEIGH_VAR_QUEUE_LEN = 13,
1: +  NEIGH_VAR_RETRANS_TIME_MS = 14,
1: +  NEIGH_VAR_BASE_REACHABLE_TIME_MS = 15,
1: +  NEIGH_VAR_GC_INTERVAL = 16,
1: +  NEIGH_VAR_GC_THRESH1 = 17,
1: +  NEIGH_VAR_GC_THRESH2 = 18,
1: +  NEIGH_VAR_GC_THRESH3 = 19,
1: +  NEIGH_VAR_MAX = 20,
1:  };
1:  
1:  struct pneigh_entry;
1: @@ -12865,150 +13011,150 @@ struct neigh_statistics;
1:  struct neigh_hash_table;
1:  
1:  struct neigh_table {
1: -	int family;
1: -	unsigned int entry_size;
1: -	unsigned int key_len;
1: -	__be16 protocol;
1: -	__u32 (*hash)(const void *, const struct net_device *, __u32 *);
1: -	bool (*key_eq)(const struct neighbour *, const void *);
1: -	int (*constructor)(struct neighbour *);
1: -	int (*pconstructor)(struct pneigh_entry *);
1: -	void (*pdestructor)(struct pneigh_entry *);
1: -	void (*proxy_redo)(struct sk_buff *);
1: -	bool (*allow_add)(const struct net_device *, struct netlink_ext_ack *);
1: -	char *id;
1: -	struct neigh_parms parms;
1: -	struct list_head parms_list;
1: -	int gc_interval;
1: -	int gc_thresh1;
1: -	int gc_thresh2;
1: -	int gc_thresh3;
1: -	long unsigned int last_flush;
1: -	struct delayed_work gc_work;
1: -	struct timer_list proxy_timer;
1: -	struct sk_buff_head proxy_queue;
1: -	atomic_t entries;
1: -	atomic_t gc_entries;
1: -	struct list_head gc_list;
1: -	rwlock_t lock;
1: -	long unsigned int last_rand;
1: -	struct neigh_statistics *stats;
1: -	struct neigh_hash_table *nht;
1: -	struct pneigh_entry **phash_buckets;
1: +  int family;
1: +  unsigned int entry_size;
1: +  unsigned int key_len;
1: +  __be16 protocol;
1: +  __u32 (*hash)(const void *, const struct net_device *, __u32 *);
1: +  bool (*key_eq)(const struct neighbour *, const void *);
1: +  int (*constructor)(struct neighbour *);
1: +  int (*pconstructor)(struct pneigh_entry *);
1: +  void (*pdestructor)(struct pneigh_entry *);
1: +  void (*proxy_redo)(struct sk_buff *);
1: +  bool (*allow_add)(const struct net_device *, struct netlink_ext_ack *);
1: +  char *id;
1: +  struct neigh_parms parms;
1: +  struct list_head parms_list;
1: +  int gc_interval;
1: +  int gc_thresh1;
1: +  int gc_thresh2;
1: +  int gc_thresh3;
1: +  long unsigned int last_flush;
1: +  struct delayed_work gc_work;
1: +  struct timer_list proxy_timer;
1: +  struct sk_buff_head proxy_queue;
1: +  atomic_t entries;
1: +  atomic_t gc_entries;
1: +  struct list_head gc_list;
1: +  rwlock_t lock;
1: +  long unsigned int last_rand;
1: +  struct neigh_statistics *stats;
1: +  struct neigh_hash_table *nht;
1: +  struct pneigh_entry **phash_buckets;
1:  };
1:  
1:  struct neigh_statistics {
1: -	long unsigned int allocs;
1: -	long unsigned int destroys;
1: -	long unsigned int hash_grows;
1: -	long unsigned int res_failed;
1: -	long unsigned int lookups;
1: -	long unsigned int hits;
1: -	long unsigned int rcv_probes_mcast;
1: -	long unsigned int rcv_probes_ucast;
1: -	long unsigned int periodic_gc_runs;
1: -	long unsigned int forced_gc_runs;
1: -	long unsigned int unres_discards;
1: -	long unsigned int table_fulls;
1: +  long unsigned int allocs;
1: +  long unsigned int destroys;
1: +  long unsigned int hash_grows;
1: +  long unsigned int res_failed;
1: +  long unsigned int lookups;
1: +  long unsigned int hits;
1: +  long unsigned int rcv_probes_mcast;
1: +  long unsigned int rcv_probes_ucast;
1: +  long unsigned int periodic_gc_runs;
1: +  long unsigned int forced_gc_runs;
1: +  long unsigned int unres_discards;
1: +  long unsigned int table_fulls;
1:  };
1:  
1:  struct neigh_ops {
1: -	int family;
1: -	void (*solicit)(struct neighbour *, struct sk_buff *);
1: -	void (*error_report)(struct neighbour *, struct sk_buff *);
1: -	int (*output)(struct neighbour *, struct sk_buff *);
1: -	int (*connected_output)(struct neighbour *, struct sk_buff *);
1: +  int family;
1: +  void (*solicit)(struct neighbour *, struct sk_buff *);
1: +  void (*error_report)(struct neighbour *, struct sk_buff *);
1: +  int (*output)(struct neighbour *, struct sk_buff *);
1: +  int (*connected_output)(struct neighbour *, struct sk_buff *);
1:  };
1:  
1:  struct pneigh_entry {
1: -	struct pneigh_entry *next;
1: -	possible_net_t net;
1: -	struct net_device *dev;
1: -	u8 flags;
1: -	u8 protocol;
1: -	u8 key[0];
1: +  struct pneigh_entry *next;
1: +  possible_net_t net;
1: +  struct net_device *dev;
1: +  u8 flags;
1: +  u8 protocol;
1: +  u8 key[0];
1:  };
1:  
1:  struct neigh_hash_table {
1: -	struct neighbour **hash_buckets;
1: -	unsigned int hash_shift;
1: -	__u32 hash_rnd[4];
1: -	struct callback_head rcu;
1: +  struct neighbour **hash_buckets;
1: +  unsigned int hash_shift;
1: +  __u32 hash_rnd[4];
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum {
1: -	TCP_ESTABLISHED = 1,
1: -	TCP_SYN_SENT = 2,
1: -	TCP_SYN_RECV = 3,
1: -	TCP_FIN_WAIT1 = 4,
1: -	TCP_FIN_WAIT2 = 5,
1: -	TCP_TIME_WAIT = 6,
1: -	TCP_CLOSE = 7,
1: -	TCP_CLOSE_WAIT = 8,
1: -	TCP_LAST_ACK = 9,
1: -	TCP_LISTEN = 10,
1: -	TCP_CLOSING = 11,
1: -	TCP_NEW_SYN_RECV = 12,
1: -	TCP_MAX_STATES = 13,
1: +  TCP_ESTABLISHED = 1,
1: +  TCP_SYN_SENT = 2,
1: +  TCP_SYN_RECV = 3,
1: +  TCP_FIN_WAIT1 = 4,
1: +  TCP_FIN_WAIT2 = 5,
1: +  TCP_TIME_WAIT = 6,
1: +  TCP_CLOSE = 7,
1: +  TCP_CLOSE_WAIT = 8,
1: +  TCP_LAST_ACK = 9,
1: +  TCP_LISTEN = 10,
1: +  TCP_CLOSING = 11,
1: +  TCP_NEW_SYN_RECV = 12,
1: +  TCP_MAX_STATES = 13,
1:  };
1:  
1:  struct fib_rule_hdr {
1: -	__u8 family;
1: -	__u8 dst_len;
1: -	__u8 src_len;
1: -	__u8 tos;
1: -	__u8 table;
1: -	__u8 res1;
1: -	__u8 res2;
1: -	__u8 action;
1: -	__u32 flags;
1: +  __u8 family;
1: +  __u8 dst_len;
1: +  __u8 src_len;
1: +  __u8 tos;
1: +  __u8 table;
1: +  __u8 res1;
1: +  __u8 res2;
1: +  __u8 action;
1: +  __u32 flags;
1:  };
1:  
1:  struct fib_rule_port_range {
1: -	__u16 start;
1: -	__u16 end;
1: +  __u16 start;
1: +  __u16 end;
1:  };
1:  
1:  struct fib_kuid_range {
1: -	kuid_t start;
1: -	kuid_t end;
1: +  kuid_t start;
1: +  kuid_t end;
1:  };
1:  
1:  struct fib_rule {
1: -	struct list_head list;
1: -	int iifindex;
1: -	int oifindex;
1: -	u32 mark;
1: -	u32 mark_mask;
1: -	u32 flags;
1: -	u32 table;
1: -	u8 action;
1: -	u8 l3mdev;
1: -	u8 proto;
1: -	u8 ip_proto;
1: -	u32 target;
1: -	__be64 tun_id;
1: -	struct fib_rule *ctarget;
1: -	struct net *fr_net;
1: -	refcount_t refcnt;
1: -	u32 pref;
1: -	int suppress_ifgroup;
1: -	int suppress_prefixlen;
1: -	char iifname[16];
1: -	char oifname[16];
1: -	struct fib_kuid_range uid_range;
1: -	struct fib_rule_port_range sport_range;
1: -	struct fib_rule_port_range dport_range;
1: -	struct callback_head rcu;
1: +  struct list_head list;
1: +  int iifindex;
1: +  int oifindex;
1: +  u32 mark;
1: +  u32 mark_mask;
1: +  u32 flags;
1: +  u32 table;
1: +  u8 action;
1: +  u8 l3mdev;
1: +  u8 proto;
1: +  u8 ip_proto;
1: +  u32 target;
1: +  __be64 tun_id;
1: +  struct fib_rule *ctarget;
1: +  struct net *fr_net;
1: +  refcount_t refcnt;
1: +  u32 pref;
1: +  int suppress_ifgroup;
1: +  int suppress_prefixlen;
1: +  char iifname[16];
1: +  char oifname[16];
1: +  struct fib_kuid_range uid_range;
1: +  struct fib_rule_port_range sport_range;
1: +  struct fib_rule_port_range dport_range;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct fib_lookup_arg {
1: -	void *lookup_ptr;
1: -	const void *lookup_data;
1: -	void *result;
1: -	struct fib_rule *rule;
1: -	u32 table;
1: -	int flags;
1: +  void *lookup_ptr;
1: +  const void *lookup_data;
1: +  void *result;
1: +  struct fib_rule *rule;
1: +  u32 table;
1: +  int flags;
1:  };
1:  
1:  struct smc_hashinfo;
1: @@ -13022,321 +13168,322 @@ struct udp_table;
1:  struct raw_hashinfo;
1:  
1:  struct proto {
1: -	void (*close)(struct sock *, long int);
1: -	int (*pre_connect)(struct sock *, struct sockaddr *, int);
1: -	int (*connect)(struct sock *, struct sockaddr *, int);
1: -	int (*disconnect)(struct sock *, int);
1: -	struct sock * (*accept)(struct sock *, int, int *, bool);
1: -	int (*ioctl)(struct sock *, int, long unsigned int);
1: -	int (*init)(struct sock *);
1: -	void (*destroy)(struct sock *);
1: -	void (*shutdown)(struct sock *, int);
1: -	int (*setsockopt)(struct sock *, int, int, sockptr_t, unsigned int);
1: -	int (*getsockopt)(struct sock *, int, int, char *, int *);
1: -	void (*keepalive)(struct sock *, int);
1: -	int (*compat_ioctl)(struct sock *, unsigned int, long unsigned int);
1: -	int (*sendmsg)(struct sock *, struct msghdr *, size_t);
1: -	int (*recvmsg)(struct sock *, struct msghdr *, size_t, int, int, int *);
1: -	int (*sendpage)(struct sock *, struct page *, int, size_t, int);
1: -	int (*bind)(struct sock *, struct sockaddr *, int);
1: -	int (*bind_add)(struct sock *, struct sockaddr *, int);
1: -	int (*backlog_rcv)(struct sock *, struct sk_buff *);
1: -	void (*release_cb)(struct sock *);
1: -	int (*hash)(struct sock *);
1: -	void (*unhash)(struct sock *);
1: -	void (*rehash)(struct sock *);
1: -	int (*get_port)(struct sock *, short unsigned int);
1: -	unsigned int inuse_idx;
1: -	bool (*stream_memory_free)(const struct sock *, int);
1: -	bool (*stream_memory_read)(const struct sock *);
1: -	void (*enter_memory_pressure)(struct sock *);
1: -	void (*leave_memory_pressure)(struct sock *);
1: -	atomic_long_t *memory_allocated;
1: -	struct percpu_counter *sockets_allocated;
1: -	long unsigned int *memory_pressure;
1: -	long int *sysctl_mem;
1: -	int *sysctl_wmem;
1: -	int *sysctl_rmem;
1: -	u32 sysctl_wmem_offset;
1: -	u32 sysctl_rmem_offset;
1: -	int max_header;
1: -	bool no_autobind;
1: -	struct kmem_cache *slab;
1: -	unsigned int obj_size;
1: -	slab_flags_t slab_flags;
1: -	unsigned int useroffset;
1: -	unsigned int usersize;
1: -	struct percpu_counter *orphan_count;
1: -	struct request_sock_ops *rsk_prot;
1: -	struct timewait_sock_ops *twsk_prot;
1: -	union {
1: -		struct inet_hashinfo *hashinfo;
1: -		struct udp_table *udp_table;
1: -		struct raw_hashinfo *raw_hash;
1: -		struct smc_hashinfo *smc_hash;
1: -	} h;
1: -	struct module *owner;
1: -	char name[32];
1: -	struct list_head node;
1: -	int (*diag_destroy)(struct sock *, int);
1: +  void (*close)(struct sock *, long int);
1: +  int (*pre_connect)(struct sock *, struct sockaddr *, int);
1: +  int (*connect)(struct sock *, struct sockaddr *, int);
1: +  int (*disconnect)(struct sock *, int);
1: +  struct sock *(*accept)(struct sock *, int, int *, bool);
1: +  int (*ioctl)(struct sock *, int, long unsigned int);
1: +  int (*init)(struct sock *);
1: +  void (*destroy)(struct sock *);
1: +  void (*shutdown)(struct sock *, int);
1: +  int (*setsockopt)(struct sock *, int, int, sockptr_t, unsigned int);
1: +  int (*getsockopt)(struct sock *, int, int, char *, int *);
1: +  void (*keepalive)(struct sock *, int);
1: +  int (*compat_ioctl)(struct sock *, unsigned int, long unsigned int);
1: +  int (*sendmsg)(struct sock *, struct msghdr *, size_t);
1: +  int (*recvmsg)(struct sock *, struct msghdr *, size_t, int, int, int *);
1: +  int (*sendpage)(struct sock *, struct page *, int, size_t, int);
1: +  int (*bind)(struct sock *, struct sockaddr *, int);
1: +  int (*bind_add)(struct sock *, struct sockaddr *, int);
1: +  int (*backlog_rcv)(struct sock *, struct sk_buff *);
1: +  void (*release_cb)(struct sock *);
1: +  int (*hash)(struct sock *);
1: +  void (*unhash)(struct sock *);
1: +  void (*rehash)(struct sock *);
1: +  int (*get_port)(struct sock *, short unsigned int);
1: +  unsigned int inuse_idx;
1: +  bool (*stream_memory_free)(const struct sock *, int);
1: +  bool (*stream_memory_read)(const struct sock *);
1: +  void (*enter_memory_pressure)(struct sock *);
1: +  void (*leave_memory_pressure)(struct sock *);
1: +  atomic_long_t *memory_allocated;
1: +  struct percpu_counter *sockets_allocated;
1: +  long unsigned int *memory_pressure;
1: +  long int *sysctl_mem;
1: +  int *sysctl_wmem;
1: +  int *sysctl_rmem;
1: +  u32 sysctl_wmem_offset;
1: +  u32 sysctl_rmem_offset;
1: +  int max_header;
1: +  bool no_autobind;
1: +  struct kmem_cache *slab;
1: +  unsigned int obj_size;
1: +  slab_flags_t slab_flags;
1: +  unsigned int useroffset;
1: +  unsigned int usersize;
1: +  struct percpu_counter *orphan_count;
1: +  struct request_sock_ops *rsk_prot;
1: +  struct timewait_sock_ops *twsk_prot;
1: +  union {
1: +    struct inet_hashinfo *hashinfo;
1: +    struct udp_table *udp_table;
1: +    struct raw_hashinfo *raw_hash;
1: +    struct smc_hashinfo *smc_hash;
1: +  } h;
1: +  struct module *owner;
1: +  char name[32];
1: +  struct list_head node;
1: +  int (*diag_destroy)(struct sock *, int);
1:  };
1:  
1:  struct request_sock;
1:  
1:  struct request_sock_ops {
1: -	int family;
1: -	unsigned int obj_size;
1: -	struct kmem_cache *slab;
1: -	char *slab_name;
1: -	int (*rtx_syn_ack)(const struct sock *, struct request_sock *);
1: -	void (*send_ack)(const struct sock *, struct sk_buff *, struct request_sock *);
1: -	void (*send_reset)(const struct sock *, struct sk_buff *);
1: -	void (*destructor)(struct request_sock *);
1: -	void (*syn_ack_timeout)(const struct request_sock *);
1: +  int family;
1: +  unsigned int obj_size;
1: +  struct kmem_cache *slab;
1: +  char *slab_name;
1: +  int (*rtx_syn_ack)(const struct sock *, struct request_sock *);
1: +  void (*send_ack)(const struct sock *, struct sk_buff *,
1: +                   struct request_sock *);
1: +  void (*send_reset)(const struct sock *, struct sk_buff *);
1: +  void (*destructor)(struct request_sock *);
1: +  void (*syn_ack_timeout)(const struct request_sock *);
1:  };
1:  
1:  struct timewait_sock_ops {
1: -	struct kmem_cache *twsk_slab;
1: -	char *twsk_slab_name;
1: -	unsigned int twsk_obj_size;
1: -	int (*twsk_unique)(struct sock *, struct sock *, void *);
1: -	void (*twsk_destructor)(struct sock *);
1: +  struct kmem_cache *twsk_slab;
1: +  char *twsk_slab_name;
1: +  unsigned int twsk_obj_size;
1: +  int (*twsk_unique)(struct sock *, struct sock *, void *);
1: +  void (*twsk_destructor)(struct sock *);
1:  };
1:  
1:  struct saved_syn;
1:  
1:  struct request_sock {
1: -	struct sock_common __req_common;
1: -	struct request_sock *dl_next;
1: -	u16 mss;
1: -	u8 num_retrans;
1: -	u8 syncookie: 1;
1: -	u8 num_timeout: 7;
1: -	u32 ts_recent;
1: -	struct timer_list rsk_timer;
1: -	const struct request_sock_ops *rsk_ops;
1: -	struct sock *sk;
1: -	struct saved_syn *saved_syn;
1: -	u32 secid;
1: -	u32 peer_secid;
1: +  struct sock_common __req_common;
1: +  struct request_sock *dl_next;
1: +  u16 mss;
1: +  u8 num_retrans;
1: +  u8 syncookie : 1;
1: +  u8 num_timeout : 7;
1: +  u32 ts_recent;
1: +  struct timer_list rsk_timer;
1: +  const struct request_sock_ops *rsk_ops;
1: +  struct sock *sk;
1: +  struct saved_syn *saved_syn;
1: +  u32 secid;
1: +  u32 peer_secid;
1:  };
1:  
1:  struct saved_syn {
1: -	u32 mac_hdrlen;
1: -	u32 network_hdrlen;
1: -	u32 tcp_hdrlen;
1: -	u8 data[0];
1: +  u32 mac_hdrlen;
1: +  u32 network_hdrlen;
1: +  u32 tcp_hdrlen;
1: +  u8 data[0];
1:  };
1:  
1:  enum tsq_enum {
1: -	TSQ_THROTTLED = 0,
1: -	TSQ_QUEUED = 1,
1: -	TCP_TSQ_DEFERRED = 2,
1: -	TCP_WRITE_TIMER_DEFERRED = 3,
1: -	TCP_DELACK_TIMER_DEFERRED = 4,
1: -	TCP_MTU_REDUCED_DEFERRED = 5,
1: +  TSQ_THROTTLED = 0,
1: +  TSQ_QUEUED = 1,
1: +  TCP_TSQ_DEFERRED = 2,
1: +  TCP_WRITE_TIMER_DEFERRED = 3,
1: +  TCP_DELACK_TIMER_DEFERRED = 4,
1: +  TCP_MTU_REDUCED_DEFERRED = 5,
1:  };
1:  
1:  struct ip6_sf_list {
1: -	struct ip6_sf_list *sf_next;
1: -	struct in6_addr sf_addr;
1: -	long unsigned int sf_count[2];
1: -	unsigned char sf_gsresp;
1: -	unsigned char sf_oldin;
1: -	unsigned char sf_crcount;
1: +  struct ip6_sf_list *sf_next;
1: +  struct in6_addr sf_addr;
1: +  long unsigned int sf_count[2];
1: +  unsigned char sf_gsresp;
1: +  unsigned char sf_oldin;
1: +  unsigned char sf_crcount;
1:  };
1:  
1:  struct ifmcaddr6 {
1: -	struct in6_addr mca_addr;
1: -	struct inet6_dev *idev;
1: -	struct ifmcaddr6 *next;
1: -	struct ip6_sf_list *mca_sources;
1: -	struct ip6_sf_list *mca_tomb;
1: -	unsigned int mca_sfmode;
1: -	unsigned char mca_crcount;
1: -	long unsigned int mca_sfcount[2];
1: -	struct timer_list mca_timer;
1: -	unsigned int mca_flags;
1: -	int mca_users;
1: -	refcount_t mca_refcnt;
1: -	spinlock_t mca_lock;
1: -	long unsigned int mca_cstamp;
1: -	long unsigned int mca_tstamp;
1: +  struct in6_addr mca_addr;
1: +  struct inet6_dev *idev;
1: +  struct ifmcaddr6 *next;
1: +  struct ip6_sf_list *mca_sources;
1: +  struct ip6_sf_list *mca_tomb;
1: +  unsigned int mca_sfmode;
1: +  unsigned char mca_crcount;
1: +  long unsigned int mca_sfcount[2];
1: +  struct timer_list mca_timer;
1: +  unsigned int mca_flags;
1: +  int mca_users;
1: +  refcount_t mca_refcnt;
1: +  spinlock_t mca_lock;
1: +  long unsigned int mca_cstamp;
1: +  long unsigned int mca_tstamp;
1:  };
1:  
1:  struct ifacaddr6 {
1: -	struct in6_addr aca_addr;
1: -	struct fib6_info *aca_rt;
1: -	struct ifacaddr6 *aca_next;
1: -	struct hlist_node aca_addr_lst;
1: -	int aca_users;
1: -	refcount_t aca_refcnt;
1: -	long unsigned int aca_cstamp;
1: -	long unsigned int aca_tstamp;
1: -	struct callback_head rcu;
1: -};
1: -
1: -enum {
1: -	__ND_OPT_PREFIX_INFO_END = 0,
1: -	ND_OPT_SOURCE_LL_ADDR = 1,
1: -	ND_OPT_TARGET_LL_ADDR = 2,
1: -	ND_OPT_PREFIX_INFO = 3,
1: -	ND_OPT_REDIRECT_HDR = 4,
1: -	ND_OPT_MTU = 5,
1: -	ND_OPT_NONCE = 14,
1: -	__ND_OPT_ARRAY_MAX = 15,
1: -	ND_OPT_ROUTE_INFO = 24,
1: -	ND_OPT_RDNSS = 25,
1: -	ND_OPT_DNSSL = 31,
1: -	ND_OPT_6CO = 34,
1: -	ND_OPT_CAPTIVE_PORTAL = 37,
1: -	ND_OPT_PREF64 = 38,
1: -	__ND_OPT_MAX = 39,
1: +  struct in6_addr aca_addr;
1: +  struct fib6_info *aca_rt;
1: +  struct ifacaddr6 *aca_next;
1: +  struct hlist_node aca_addr_lst;
1: +  int aca_users;
1: +  refcount_t aca_refcnt;
1: +  long unsigned int aca_cstamp;
1: +  long unsigned int aca_tstamp;
1: +  struct callback_head rcu;
1: +};
1: +
1: +enum {
1: +  __ND_OPT_PREFIX_INFO_END = 0,
1: +  ND_OPT_SOURCE_LL_ADDR = 1,
1: +  ND_OPT_TARGET_LL_ADDR = 2,
1: +  ND_OPT_PREFIX_INFO = 3,
1: +  ND_OPT_REDIRECT_HDR = 4,
1: +  ND_OPT_MTU = 5,
1: +  ND_OPT_NONCE = 14,
1: +  __ND_OPT_ARRAY_MAX = 15,
1: +  ND_OPT_ROUTE_INFO = 24,
1: +  ND_OPT_RDNSS = 25,
1: +  ND_OPT_DNSSL = 31,
1: +  ND_OPT_6CO = 34,
1: +  ND_OPT_CAPTIVE_PORTAL = 37,
1: +  ND_OPT_PREF64 = 38,
1: +  __ND_OPT_MAX = 39,
1:  };
1:  
1:  struct nd_opt_hdr {
1: -	__u8 nd_opt_type;
1: -	__u8 nd_opt_len;
1: +  __u8 nd_opt_type;
1: +  __u8 nd_opt_len;
1:  };
1:  
1:  struct ndisc_options {
1: -	struct nd_opt_hdr *nd_opt_array[15];
1: -	struct nd_opt_hdr *nd_opts_ri;
1: -	struct nd_opt_hdr *nd_opts_ri_end;
1: -	struct nd_opt_hdr *nd_useropts;
1: -	struct nd_opt_hdr *nd_useropts_end;
1: +  struct nd_opt_hdr *nd_opt_array[15];
1: +  struct nd_opt_hdr *nd_opts_ri;
1: +  struct nd_opt_hdr *nd_opts_ri_end;
1: +  struct nd_opt_hdr *nd_useropts;
1: +  struct nd_opt_hdr *nd_useropts_end;
1:  };
1:  
1:  struct prefix_info {
1: -	__u8 type;
1: -	__u8 length;
1: -	__u8 prefix_len;
1: -	__u8 reserved: 6;
1: -	__u8 autoconf: 1;
1: -	__u8 onlink: 1;
1: -	__be32 valid;
1: -	__be32 prefered;
1: -	__be32 reserved2;
1: -	struct in6_addr prefix;
1: +  __u8 type;
1: +  __u8 length;
1: +  __u8 prefix_len;
1: +  __u8 reserved : 6;
1: +  __u8 autoconf : 1;
1: +  __u8 onlink : 1;
1: +  __be32 valid;
1: +  __be32 prefered;
1: +  __be32 reserved2;
1: +  struct in6_addr prefix;
1:  };
1:  
1:  enum nfs_opnum4 {
1: -	OP_ACCESS = 3,
1: -	OP_CLOSE = 4,
1: -	OP_COMMIT = 5,
1: -	OP_CREATE = 6,
1: -	OP_DELEGPURGE = 7,
1: -	OP_DELEGRETURN = 8,
1: -	OP_GETATTR = 9,
1: -	OP_GETFH = 10,
1: -	OP_LINK = 11,
1: -	OP_LOCK = 12,
1: -	OP_LOCKT = 13,
1: -	OP_LOCKU = 14,
1: -	OP_LOOKUP = 15,
1: -	OP_LOOKUPP = 16,
1: -	OP_NVERIFY = 17,
1: -	OP_OPEN = 18,
1: -	OP_OPENATTR = 19,
1: -	OP_OPEN_CONFIRM = 20,
1: -	OP_OPEN_DOWNGRADE = 21,
1: -	OP_PUTFH = 22,
1: -	OP_PUTPUBFH = 23,
1: -	OP_PUTROOTFH = 24,
1: -	OP_READ = 25,
1: -	OP_READDIR = 26,
1: -	OP_READLINK = 27,
1: -	OP_REMOVE = 28,
1: -	OP_RENAME = 29,
1: -	OP_RENEW = 30,
1: -	OP_RESTOREFH = 31,
1: -	OP_SAVEFH = 32,
1: -	OP_SECINFO = 33,
1: -	OP_SETATTR = 34,
1: -	OP_SETCLIENTID = 35,
1: -	OP_SETCLIENTID_CONFIRM = 36,
1: -	OP_VERIFY = 37,
1: -	OP_WRITE = 38,
1: -	OP_RELEASE_LOCKOWNER = 39,
1: -	OP_BACKCHANNEL_CTL = 40,
1: -	OP_BIND_CONN_TO_SESSION = 41,
1: -	OP_EXCHANGE_ID = 42,
1: -	OP_CREATE_SESSION = 43,
1: -	OP_DESTROY_SESSION = 44,
1: -	OP_FREE_STATEID = 45,
1: -	OP_GET_DIR_DELEGATION = 46,
1: -	OP_GETDEVICEINFO = 47,
1: -	OP_GETDEVICELIST = 48,
1: -	OP_LAYOUTCOMMIT = 49,
1: -	OP_LAYOUTGET = 50,
1: -	OP_LAYOUTRETURN = 51,
1: -	OP_SECINFO_NO_NAME = 52,
1: -	OP_SEQUENCE = 53,
1: -	OP_SET_SSV = 54,
1: -	OP_TEST_STATEID = 55,
1: -	OP_WANT_DELEGATION = 56,
1: -	OP_DESTROY_CLIENTID = 57,
1: -	OP_RECLAIM_COMPLETE = 58,
1: -	OP_ALLOCATE = 59,
1: -	OP_COPY = 60,
1: -	OP_COPY_NOTIFY = 61,
1: -	OP_DEALLOCATE = 62,
1: -	OP_IO_ADVISE = 63,
1: -	OP_LAYOUTERROR = 64,
1: -	OP_LAYOUTSTATS = 65,
1: -	OP_OFFLOAD_CANCEL = 66,
1: -	OP_OFFLOAD_STATUS = 67,
1: -	OP_READ_PLUS = 68,
1: -	OP_SEEK = 69,
1: -	OP_WRITE_SAME = 70,
1: -	OP_CLONE = 71,
1: -	OP_GETXATTR = 72,
1: -	OP_SETXATTR = 73,
1: -	OP_LISTXATTRS = 74,
1: -	OP_REMOVEXATTR = 75,
1: -	OP_ILLEGAL = 10044,
1: +  OP_ACCESS = 3,
1: +  OP_CLOSE = 4,
1: +  OP_COMMIT = 5,
1: +  OP_CREATE = 6,
1: +  OP_DELEGPURGE = 7,
1: +  OP_DELEGRETURN = 8,
1: +  OP_GETATTR = 9,
1: +  OP_GETFH = 10,
1: +  OP_LINK = 11,
1: +  OP_LOCK = 12,
1: +  OP_LOCKT = 13,
1: +  OP_LOCKU = 14,
1: +  OP_LOOKUP = 15,
1: +  OP_LOOKUPP = 16,
1: +  OP_NVERIFY = 17,
1: +  OP_OPEN = 18,
1: +  OP_OPENATTR = 19,
1: +  OP_OPEN_CONFIRM = 20,
1: +  OP_OPEN_DOWNGRADE = 21,
1: +  OP_PUTFH = 22,
1: +  OP_PUTPUBFH = 23,
1: +  OP_PUTROOTFH = 24,
1: +  OP_READ = 25,
1: +  OP_READDIR = 26,
1: +  OP_READLINK = 27,
1: +  OP_REMOVE = 28,
1: +  OP_RENAME = 29,
1: +  OP_RENEW = 30,
1: +  OP_RESTOREFH = 31,
1: +  OP_SAVEFH = 32,
1: +  OP_SECINFO = 33,
1: +  OP_SETATTR = 34,
1: +  OP_SETCLIENTID = 35,
1: +  OP_SETCLIENTID_CONFIRM = 36,
1: +  OP_VERIFY = 37,
1: +  OP_WRITE = 38,
1: +  OP_RELEASE_LOCKOWNER = 39,
1: +  OP_BACKCHANNEL_CTL = 40,
1: +  OP_BIND_CONN_TO_SESSION = 41,
1: +  OP_EXCHANGE_ID = 42,
1: +  OP_CREATE_SESSION = 43,
1: +  OP_DESTROY_SESSION = 44,
1: +  OP_FREE_STATEID = 45,
1: +  OP_GET_DIR_DELEGATION = 46,
1: +  OP_GETDEVICEINFO = 47,
1: +  OP_GETDEVICELIST = 48,
1: +  OP_LAYOUTCOMMIT = 49,
1: +  OP_LAYOUTGET = 50,
1: +  OP_LAYOUTRETURN = 51,
1: +  OP_SECINFO_NO_NAME = 52,
1: +  OP_SEQUENCE = 53,
1: +  OP_SET_SSV = 54,
1: +  OP_TEST_STATEID = 55,
1: +  OP_WANT_DELEGATION = 56,
1: +  OP_DESTROY_CLIENTID = 57,
1: +  OP_RECLAIM_COMPLETE = 58,
1: +  OP_ALLOCATE = 59,
1: +  OP_COPY = 60,
1: +  OP_COPY_NOTIFY = 61,
1: +  OP_DEALLOCATE = 62,
1: +  OP_IO_ADVISE = 63,
1: +  OP_LAYOUTERROR = 64,
1: +  OP_LAYOUTSTATS = 65,
1: +  OP_OFFLOAD_CANCEL = 66,
1: +  OP_OFFLOAD_STATUS = 67,
1: +  OP_READ_PLUS = 68,
1: +  OP_SEEK = 69,
1: +  OP_WRITE_SAME = 70,
1: +  OP_CLONE = 71,
1: +  OP_GETXATTR = 72,
1: +  OP_SETXATTR = 73,
1: +  OP_LISTXATTRS = 74,
1: +  OP_REMOVEXATTR = 75,
1: +  OP_ILLEGAL = 10044,
1:  };
1:  
1:  enum perf_branch_sample_type_shift {
1: -	PERF_SAMPLE_BRANCH_USER_SHIFT = 0,
1: -	PERF_SAMPLE_BRANCH_KERNEL_SHIFT = 1,
1: -	PERF_SAMPLE_BRANCH_HV_SHIFT = 2,
1: -	PERF_SAMPLE_BRANCH_ANY_SHIFT = 3,
1: -	PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT = 4,
1: -	PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT = 5,
1: -	PERF_SAMPLE_BRANCH_IND_CALL_SHIFT = 6,
1: -	PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT = 7,
1: -	PERF_SAMPLE_BRANCH_IN_TX_SHIFT = 8,
1: -	PERF_SAMPLE_BRANCH_NO_TX_SHIFT = 9,
1: -	PERF_SAMPLE_BRANCH_COND_SHIFT = 10,
1: -	PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT = 11,
1: -	PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT = 12,
1: -	PERF_SAMPLE_BRANCH_CALL_SHIFT = 13,
1: -	PERF_SAMPLE_BRANCH_NO_FLAGS_SHIFT = 14,
1: -	PERF_SAMPLE_BRANCH_NO_CYCLES_SHIFT = 15,
1: -	PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16,
1: -	PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17,
1: -	PERF_SAMPLE_BRANCH_MAX_SHIFT = 18,
1: +  PERF_SAMPLE_BRANCH_USER_SHIFT = 0,
1: +  PERF_SAMPLE_BRANCH_KERNEL_SHIFT = 1,
1: +  PERF_SAMPLE_BRANCH_HV_SHIFT = 2,
1: +  PERF_SAMPLE_BRANCH_ANY_SHIFT = 3,
1: +  PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT = 4,
1: +  PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT = 5,
1: +  PERF_SAMPLE_BRANCH_IND_CALL_SHIFT = 6,
1: +  PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT = 7,
1: +  PERF_SAMPLE_BRANCH_IN_TX_SHIFT = 8,
1: +  PERF_SAMPLE_BRANCH_NO_TX_SHIFT = 9,
1: +  PERF_SAMPLE_BRANCH_COND_SHIFT = 10,
1: +  PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT = 11,
1: +  PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT = 12,
1: +  PERF_SAMPLE_BRANCH_CALL_SHIFT = 13,
1: +  PERF_SAMPLE_BRANCH_NO_FLAGS_SHIFT = 14,
1: +  PERF_SAMPLE_BRANCH_NO_CYCLES_SHIFT = 15,
1: +  PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16,
1: +  PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17,
1: +  PERF_SAMPLE_BRANCH_MAX_SHIFT = 18,
1:  };
1:  
1:  enum exception_stack_ordering {
1: -	ESTACK_DF = 0,
1: -	ESTACK_NMI = 1,
1: -	ESTACK_DB = 2,
1: -	ESTACK_MCE = 3,
1: -	ESTACK_VC = 4,
1: -	ESTACK_VC2 = 5,
1: -	N_EXCEPTION_STACKS = 6,
1: +  ESTACK_DF = 0,
1: +  ESTACK_NMI = 1,
1: +  ESTACK_DB = 2,
1: +  ESTACK_MCE = 3,
1: +  ESTACK_VC = 4,
1: +  ESTACK_VC2 = 5,
1: +  N_EXCEPTION_STACKS = 6,
1:  };
1:  
1:  enum {
1: -	TSK_TRACE_FL_TRACE_BIT = 0,
1: -	TSK_TRACE_FL_GRAPH_BIT = 1,
1: +  TSK_TRACE_FL_TRACE_BIT = 0,
1: +  TSK_TRACE_FL_GRAPH_BIT = 1,
1:  };
1:  
1:  struct uuidcmp {
1: -	const char *uuid;
1: -	int len;
1: +  const char *uuid;
1: +  int len;
1:  };
1:  
1:  typedef __u32 __le32;
1: @@ -13344,796 +13491,800 @@ typedef __u32 __le32;
1:  typedef __u64 __le64;
1:  
1:  struct minix_super_block {
1: -	__u16 s_ninodes;
1: -	__u16 s_nzones;
1: -	__u16 s_imap_blocks;
1: -	__u16 s_zmap_blocks;
1: -	__u16 s_firstdatazone;
1: -	__u16 s_log_zone_size;
1: -	__u32 s_max_size;
1: -	__u16 s_magic;
1: -	__u16 s_state;
1: -	__u32 s_zones;
1: +  __u16 s_ninodes;
1: +  __u16 s_nzones;
1: +  __u16 s_imap_blocks;
1: +  __u16 s_zmap_blocks;
1: +  __u16 s_firstdatazone;
1: +  __u16 s_log_zone_size;
1: +  __u32 s_max_size;
1: +  __u16 s_magic;
1: +  __u16 s_state;
1: +  __u32 s_zones;
1:  };
1:  
1:  struct romfs_super_block {
1: -	__be32 word0;
1: -	__be32 word1;
1: -	__be32 size;
1: -	__be32 checksum;
1: -	char name[0];
1: +  __be32 word0;
1: +  __be32 word1;
1: +  __be32 size;
1: +  __be32 checksum;
1: +  char name[0];
1:  };
1:  
1:  struct cramfs_inode {
1: -	__u32 mode: 16;
1: -	__u32 uid: 16;
1: -	__u32 size: 24;
1: -	__u32 gid: 8;
1: -	__u32 namelen: 6;
1: -	__u32 offset: 26;
1: +  __u32 mode : 16;
1: +  __u32 uid : 16;
1: +  __u32 size : 24;
1: +  __u32 gid : 8;
1: +  __u32 namelen : 6;
1: +  __u32 offset : 26;
1:  };
1:  
1:  struct cramfs_info {
1: -	__u32 crc;
1: -	__u32 edition;
1: -	__u32 blocks;
1: -	__u32 files;
1: +  __u32 crc;
1: +  __u32 edition;
1: +  __u32 blocks;
1: +  __u32 files;
1:  };
1:  
1:  struct cramfs_super {
1: -	__u32 magic;
1: -	__u32 size;
1: -	__u32 flags;
1: -	__u32 future;
1: -	__u8 signature[16];
1: -	struct cramfs_info fsid;
1: -	__u8 name[16];
1: -	struct cramfs_inode root;
1: +  __u32 magic;
1: +  __u32 size;
1: +  __u32 flags;
1: +  __u32 future;
1: +  __u8 signature[16];
1: +  struct cramfs_info fsid;
1: +  __u8 name[16];
1: +  struct cramfs_inode root;
1:  };
1:  
1:  struct squashfs_super_block {
1: -	__le32 s_magic;
1: -	__le32 inodes;
1: -	__le32 mkfs_time;
1: -	__le32 block_size;
1: -	__le32 fragments;
1: -	__le16 compression;
1: -	__le16 block_log;
1: -	__le16 flags;
1: -	__le16 no_ids;
1: -	__le16 s_major;
1: -	__le16 s_minor;
1: -	__le64 root_inode;
1: -	__le64 bytes_used;
1: -	__le64 id_table_start;
1: -	__le64 xattr_id_table_start;
1: -	__le64 inode_table_start;
1: -	__le64 directory_table_start;
1: -	__le64 fragment_table_start;
1: -	__le64 lookup_table_start;
1: -};
1: -
1: -typedef int (*decompress_fn)(unsigned char *, long int, long int (*)(void *, long unsigned int), long int (*)(void *, long unsigned int), unsigned char *, long int *, void (*)(char *));
1: +  __le32 s_magic;
1: +  __le32 inodes;
1: +  __le32 mkfs_time;
1: +  __le32 block_size;
1: +  __le32 fragments;
1: +  __le16 compression;
1: +  __le16 block_log;
1: +  __le16 flags;
1: +  __le16 no_ids;
1: +  __le16 s_major;
1: +  __le16 s_minor;
1: +  __le64 root_inode;
1: +  __le64 bytes_used;
1: +  __le64 id_table_start;
1: +  __le64 xattr_id_table_start;
1: +  __le64 inode_table_start;
1: +  __le64 directory_table_start;
1: +  __le64 fragment_table_start;
1: +  __le64 lookup_table_start;
1: +};
1: +
1: +typedef int (*decompress_fn)(unsigned char *, long int,
1: +                             long int (*)(void *, long unsigned int),
1: +                             long int (*)(void *, long unsigned int),
1: +                             unsigned char *, long int *, void (*)(char *));
1:  
1:  struct subprocess_info {
1: -	struct work_struct work;
1: -	struct completion *complete;
1: -	const char *path;
1: -	char **argv;
1: -	char **envp;
1: -	int wait;
1: -	int retval;
1: -	int (*init)(struct subprocess_info *, struct cred *);
1: -	void (*cleanup)(struct subprocess_info *);
1: -	void *data;
1: +  struct work_struct work;
1: +  struct completion *complete;
1: +  const char *path;
1: +  char **argv;
1: +  char **envp;
1: +  int wait;
1: +  int retval;
1: +  int (*init)(struct subprocess_info *, struct cred *);
1: +  void (*cleanup)(struct subprocess_info *);
1: +  void *data;
1:  };
1:  
1:  typedef phys_addr_t resource_size_t;
1:  
1:  struct resource {
1: -	resource_size_t start;
1: -	resource_size_t end;
1: -	const char *name;
1: -	long unsigned int flags;
1: -	long unsigned int desc;
1: -	struct resource *parent;
1: -	struct resource *sibling;
1: -	struct resource *child;
1: +  resource_size_t start;
1: +  resource_size_t end;
1: +  const char *name;
1: +  long unsigned int flags;
1: +  long unsigned int desc;
1: +  struct resource *parent;
1: +  struct resource *sibling;
1: +  struct resource *child;
1:  };
1:  
1:  struct hash {
1: -	int ino;
1: -	int minor;
1: -	int major;
1: -	umode_t mode;
1: -	struct hash *next;
1: -	char name[4098];
1: +  int ino;
1: +  int minor;
1: +  int major;
1: +  umode_t mode;
1: +  struct hash *next;
1: +  char name[4098];
1:  };
1:  
1:  struct dir_entry {
1: -	struct list_head list;
1: -	char *name;
1: -	time64_t mtime;
1: +  struct list_head list;
1: +  char *name;
1: +  time64_t mtime;
1:  };
1:  
1:  enum state {
1: -	Start = 0,
1: -	Collect = 1,
1: -	GotHeader = 2,
1: -	SkipIt = 3,
1: -	GotName = 4,
1: -	CopyFile = 5,
1: -	GotSymlink = 6,
1: -	Reset = 7,
1: +  Start = 0,
1: +  Collect = 1,
1: +  GotHeader = 2,
1: +  SkipIt = 3,
1: +  GotName = 4,
1: +  CopyFile = 5,
1: +  GotSymlink = 6,
1: +  Reset = 7,
1:  };
1:  
1:  enum ucount_type {
1: -	UCOUNT_USER_NAMESPACES = 0,
1: -	UCOUNT_PID_NAMESPACES = 1,
1: -	UCOUNT_UTS_NAMESPACES = 2,
1: -	UCOUNT_IPC_NAMESPACES = 3,
1: -	UCOUNT_NET_NAMESPACES = 4,
1: -	UCOUNT_MNT_NAMESPACES = 5,
1: -	UCOUNT_CGROUP_NAMESPACES = 6,
1: -	UCOUNT_TIME_NAMESPACES = 7,
1: -	UCOUNT_INOTIFY_INSTANCES = 8,
1: -	UCOUNT_INOTIFY_WATCHES = 9,
1: -	UCOUNT_COUNTS = 10,
1: +  UCOUNT_USER_NAMESPACES = 0,
1: +  UCOUNT_PID_NAMESPACES = 1,
1: +  UCOUNT_UTS_NAMESPACES = 2,
1: +  UCOUNT_IPC_NAMESPACES = 3,
1: +  UCOUNT_NET_NAMESPACES = 4,
1: +  UCOUNT_MNT_NAMESPACES = 5,
1: +  UCOUNT_CGROUP_NAMESPACES = 6,
1: +  UCOUNT_TIME_NAMESPACES = 7,
1: +  UCOUNT_INOTIFY_INSTANCES = 8,
1: +  UCOUNT_INOTIFY_WATCHES = 9,
1: +  UCOUNT_COUNTS = 10,
1:  };
1:  
1:  enum flow_dissector_key_id {
1: -	FLOW_DISSECTOR_KEY_CONTROL = 0,
1: -	FLOW_DISSECTOR_KEY_BASIC = 1,
1: -	FLOW_DISSECTOR_KEY_IPV4_ADDRS = 2,
1: -	FLOW_DISSECTOR_KEY_IPV6_ADDRS = 3,
1: -	FLOW_DISSECTOR_KEY_PORTS = 4,
1: -	FLOW_DISSECTOR_KEY_PORTS_RANGE = 5,
1: -	FLOW_DISSECTOR_KEY_ICMP = 6,
1: -	FLOW_DISSECTOR_KEY_ETH_ADDRS = 7,
1: -	FLOW_DISSECTOR_KEY_TIPC = 8,
1: -	FLOW_DISSECTOR_KEY_ARP = 9,
1: -	FLOW_DISSECTOR_KEY_VLAN = 10,
1: -	FLOW_DISSECTOR_KEY_FLOW_LABEL = 11,
1: -	FLOW_DISSECTOR_KEY_GRE_KEYID = 12,
1: -	FLOW_DISSECTOR_KEY_MPLS_ENTROPY = 13,
1: -	FLOW_DISSECTOR_KEY_ENC_KEYID = 14,
1: -	FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS = 15,
1: -	FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS = 16,
1: -	FLOW_DISSECTOR_KEY_ENC_CONTROL = 17,
1: -	FLOW_DISSECTOR_KEY_ENC_PORTS = 18,
1: -	FLOW_DISSECTOR_KEY_MPLS = 19,
1: -	FLOW_DISSECTOR_KEY_TCP = 20,
1: -	FLOW_DISSECTOR_KEY_IP = 21,
1: -	FLOW_DISSECTOR_KEY_CVLAN = 22,
1: -	FLOW_DISSECTOR_KEY_ENC_IP = 23,
1: -	FLOW_DISSECTOR_KEY_ENC_OPTS = 24,
1: -	FLOW_DISSECTOR_KEY_META = 25,
1: -	FLOW_DISSECTOR_KEY_CT = 26,
1: -	FLOW_DISSECTOR_KEY_HASH = 27,
1: -	FLOW_DISSECTOR_KEY_MAX = 28,
1: -};
1: -
1: -enum {
1: -	IPSTATS_MIB_NUM = 0,
1: -	IPSTATS_MIB_INPKTS = 1,
1: -	IPSTATS_MIB_INOCTETS = 2,
1: -	IPSTATS_MIB_INDELIVERS = 3,
1: -	IPSTATS_MIB_OUTFORWDATAGRAMS = 4,
1: -	IPSTATS_MIB_OUTPKTS = 5,
1: -	IPSTATS_MIB_OUTOCTETS = 6,
1: -	IPSTATS_MIB_INHDRERRORS = 7,
1: -	IPSTATS_MIB_INTOOBIGERRORS = 8,
1: -	IPSTATS_MIB_INNOROUTES = 9,
1: -	IPSTATS_MIB_INADDRERRORS = 10,
1: -	IPSTATS_MIB_INUNKNOWNPROTOS = 11,
1: -	IPSTATS_MIB_INTRUNCATEDPKTS = 12,
1: -	IPSTATS_MIB_INDISCARDS = 13,
1: -	IPSTATS_MIB_OUTDISCARDS = 14,
1: -	IPSTATS_MIB_OUTNOROUTES = 15,
1: -	IPSTATS_MIB_REASMTIMEOUT = 16,
1: -	IPSTATS_MIB_REASMREQDS = 17,
1: -	IPSTATS_MIB_REASMOKS = 18,
1: -	IPSTATS_MIB_REASMFAILS = 19,
1: -	IPSTATS_MIB_FRAGOKS = 20,
1: -	IPSTATS_MIB_FRAGFAILS = 21,
1: -	IPSTATS_MIB_FRAGCREATES = 22,
1: -	IPSTATS_MIB_INMCASTPKTS = 23,
1: -	IPSTATS_MIB_OUTMCASTPKTS = 24,
1: -	IPSTATS_MIB_INBCASTPKTS = 25,
1: -	IPSTATS_MIB_OUTBCASTPKTS = 26,
1: -	IPSTATS_MIB_INMCASTOCTETS = 27,
1: -	IPSTATS_MIB_OUTMCASTOCTETS = 28,
1: -	IPSTATS_MIB_INBCASTOCTETS = 29,
1: -	IPSTATS_MIB_OUTBCASTOCTETS = 30,
1: -	IPSTATS_MIB_CSUMERRORS = 31,
1: -	IPSTATS_MIB_NOECTPKTS = 32,
1: -	IPSTATS_MIB_ECT1PKTS = 33,
1: -	IPSTATS_MIB_ECT0PKTS = 34,
1: -	IPSTATS_MIB_CEPKTS = 35,
1: -	IPSTATS_MIB_REASM_OVERLAPS = 36,
1: -	__IPSTATS_MIB_MAX = 37,
1: -};
1: -
1: -enum {
1: -	ICMP_MIB_NUM = 0,
1: -	ICMP_MIB_INMSGS = 1,
1: -	ICMP_MIB_INERRORS = 2,
1: -	ICMP_MIB_INDESTUNREACHS = 3,
1: -	ICMP_MIB_INTIMEEXCDS = 4,
1: -	ICMP_MIB_INPARMPROBS = 5,
1: -	ICMP_MIB_INSRCQUENCHS = 6,
1: -	ICMP_MIB_INREDIRECTS = 7,
1: -	ICMP_MIB_INECHOS = 8,
1: -	ICMP_MIB_INECHOREPS = 9,
1: -	ICMP_MIB_INTIMESTAMPS = 10,
1: -	ICMP_MIB_INTIMESTAMPREPS = 11,
1: -	ICMP_MIB_INADDRMASKS = 12,
1: -	ICMP_MIB_INADDRMASKREPS = 13,
1: -	ICMP_MIB_OUTMSGS = 14,
1: -	ICMP_MIB_OUTERRORS = 15,
1: -	ICMP_MIB_OUTDESTUNREACHS = 16,
1: -	ICMP_MIB_OUTTIMEEXCDS = 17,
1: -	ICMP_MIB_OUTPARMPROBS = 18,
1: -	ICMP_MIB_OUTSRCQUENCHS = 19,
1: -	ICMP_MIB_OUTREDIRECTS = 20,
1: -	ICMP_MIB_OUTECHOS = 21,
1: -	ICMP_MIB_OUTECHOREPS = 22,
1: -	ICMP_MIB_OUTTIMESTAMPS = 23,
1: -	ICMP_MIB_OUTTIMESTAMPREPS = 24,
1: -	ICMP_MIB_OUTADDRMASKS = 25,
1: -	ICMP_MIB_OUTADDRMASKREPS = 26,
1: -	ICMP_MIB_CSUMERRORS = 27,
1: -	__ICMP_MIB_MAX = 28,
1: -};
1: -
1: -enum {
1: -	ICMP6_MIB_NUM = 0,
1: -	ICMP6_MIB_INMSGS = 1,
1: -	ICMP6_MIB_INERRORS = 2,
1: -	ICMP6_MIB_OUTMSGS = 3,
1: -	ICMP6_MIB_OUTERRORS = 4,
1: -	ICMP6_MIB_CSUMERRORS = 5,
1: -	__ICMP6_MIB_MAX = 6,
1: -};
1: -
1: -enum {
1: -	TCP_MIB_NUM = 0,
1: -	TCP_MIB_RTOALGORITHM = 1,
1: -	TCP_MIB_RTOMIN = 2,
1: -	TCP_MIB_RTOMAX = 3,
1: -	TCP_MIB_MAXCONN = 4,
1: -	TCP_MIB_ACTIVEOPENS = 5,
1: -	TCP_MIB_PASSIVEOPENS = 6,
1: -	TCP_MIB_ATTEMPTFAILS = 7,
1: -	TCP_MIB_ESTABRESETS = 8,
1: -	TCP_MIB_CURRESTAB = 9,
1: -	TCP_MIB_INSEGS = 10,
1: -	TCP_MIB_OUTSEGS = 11,
1: -	TCP_MIB_RETRANSSEGS = 12,
1: -	TCP_MIB_INERRS = 13,
1: -	TCP_MIB_OUTRSTS = 14,
1: -	TCP_MIB_CSUMERRORS = 15,
1: -	__TCP_MIB_MAX = 16,
1: -};
1: -
1: -enum {
1: -	UDP_MIB_NUM = 0,
1: -	UDP_MIB_INDATAGRAMS = 1,
1: -	UDP_MIB_NOPORTS = 2,
1: -	UDP_MIB_INERRORS = 3,
1: -	UDP_MIB_OUTDATAGRAMS = 4,
1: -	UDP_MIB_RCVBUFERRORS = 5,
1: -	UDP_MIB_SNDBUFERRORS = 6,
1: -	UDP_MIB_CSUMERRORS = 7,
1: -	UDP_MIB_IGNOREDMULTI = 8,
1: -	UDP_MIB_MEMERRORS = 9,
1: -	__UDP_MIB_MAX = 10,
1: -};
1: -
1: -enum {
1: -	LINUX_MIB_NUM = 0,
1: -	LINUX_MIB_SYNCOOKIESSENT = 1,
1: -	LINUX_MIB_SYNCOOKIESRECV = 2,
1: -	LINUX_MIB_SYNCOOKIESFAILED = 3,
1: -	LINUX_MIB_EMBRYONICRSTS = 4,
1: -	LINUX_MIB_PRUNECALLED = 5,
1: -	LINUX_MIB_RCVPRUNED = 6,
1: -	LINUX_MIB_OFOPRUNED = 7,
1: -	LINUX_MIB_OUTOFWINDOWICMPS = 8,
1: -	LINUX_MIB_LOCKDROPPEDICMPS = 9,
1: -	LINUX_MIB_ARPFILTER = 10,
1: -	LINUX_MIB_TIMEWAITED = 11,
1: -	LINUX_MIB_TIMEWAITRECYCLED = 12,
1: -	LINUX_MIB_TIMEWAITKILLED = 13,
1: -	LINUX_MIB_PAWSACTIVEREJECTED = 14,
1: -	LINUX_MIB_PAWSESTABREJECTED = 15,
1: -	LINUX_MIB_DELAYEDACKS = 16,
1: -	LINUX_MIB_DELAYEDACKLOCKED = 17,
1: -	LINUX_MIB_DELAYEDACKLOST = 18,
1: -	LINUX_MIB_LISTENOVERFLOWS = 19,
1: -	LINUX_MIB_LISTENDROPS = 20,
1: -	LINUX_MIB_TCPHPHITS = 21,
1: -	LINUX_MIB_TCPPUREACKS = 22,
1: -	LINUX_MIB_TCPHPACKS = 23,
1: -	LINUX_MIB_TCPRENORECOVERY = 24,
1: -	LINUX_MIB_TCPSACKRECOVERY = 25,
1: -	LINUX_MIB_TCPSACKRENEGING = 26,
1: -	LINUX_MIB_TCPSACKREORDER = 27,
1: -	LINUX_MIB_TCPRENOREORDER = 28,
1: -	LINUX_MIB_TCPTSREORDER = 29,
1: -	LINUX_MIB_TCPFULLUNDO = 30,
1: -	LINUX_MIB_TCPPARTIALUNDO = 31,
1: -	LINUX_MIB_TCPDSACKUNDO = 32,
1: -	LINUX_MIB_TCPLOSSUNDO = 33,
1: -	LINUX_MIB_TCPLOSTRETRANSMIT = 34,
1: -	LINUX_MIB_TCPRENOFAILURES = 35,
1: -	LINUX_MIB_TCPSACKFAILURES = 36,
1: -	LINUX_MIB_TCPLOSSFAILURES = 37,
1: -	LINUX_MIB_TCPFASTRETRANS = 38,
1: -	LINUX_MIB_TCPSLOWSTARTRETRANS = 39,
1: -	LINUX_MIB_TCPTIMEOUTS = 40,
1: -	LINUX_MIB_TCPLOSSPROBES = 41,
1: -	LINUX_MIB_TCPLOSSPROBERECOVERY = 42,
1: -	LINUX_MIB_TCPRENORECOVERYFAIL = 43,
1: -	LINUX_MIB_TCPSACKRECOVERYFAIL = 44,
1: -	LINUX_MIB_TCPRCVCOLLAPSED = 45,
1: -	LINUX_MIB_TCPDSACKOLDSENT = 46,
1: -	LINUX_MIB_TCPDSACKOFOSENT = 47,
1: -	LINUX_MIB_TCPDSACKRECV = 48,
1: -	LINUX_MIB_TCPDSACKOFORECV = 49,
1: -	LINUX_MIB_TCPABORTONDATA = 50,
1: -	LINUX_MIB_TCPABORTONCLOSE = 51,
1: -	LINUX_MIB_TCPABORTONMEMORY = 52,
1: -	LINUX_MIB_TCPABORTONTIMEOUT = 53,
1: -	LINUX_MIB_TCPABORTONLINGER = 54,
1: -	LINUX_MIB_TCPABORTFAILED = 55,
1: -	LINUX_MIB_TCPMEMORYPRESSURES = 56,
1: -	LINUX_MIB_TCPMEMORYPRESSURESCHRONO = 57,
1: -	LINUX_MIB_TCPSACKDISCARD = 58,
1: -	LINUX_MIB_TCPDSACKIGNOREDOLD = 59,
1: -	LINUX_MIB_TCPDSACKIGNOREDNOUNDO = 60,
1: -	LINUX_MIB_TCPSPURIOUSRTOS = 61,
1: -	LINUX_MIB_TCPMD5NOTFOUND = 62,
1: -	LINUX_MIB_TCPMD5UNEXPECTED = 63,
1: -	LINUX_MIB_TCPMD5FAILURE = 64,
1: -	LINUX_MIB_SACKSHIFTED = 65,
1: -	LINUX_MIB_SACKMERGED = 66,
1: -	LINUX_MIB_SACKSHIFTFALLBACK = 67,
1: -	LINUX_MIB_TCPBACKLOGDROP = 68,
1: -	LINUX_MIB_PFMEMALLOCDROP = 69,
1: -	LINUX_MIB_TCPMINTTLDROP = 70,
1: -	LINUX_MIB_TCPDEFERACCEPTDROP = 71,
1: -	LINUX_MIB_IPRPFILTER = 72,
1: -	LINUX_MIB_TCPTIMEWAITOVERFLOW = 73,
1: -	LINUX_MIB_TCPREQQFULLDOCOOKIES = 74,
1: -	LINUX_MIB_TCPREQQFULLDROP = 75,
1: -	LINUX_MIB_TCPRETRANSFAIL = 76,
1: -	LINUX_MIB_TCPRCVCOALESCE = 77,
1: -	LINUX_MIB_TCPBACKLOGCOALESCE = 78,
1: -	LINUX_MIB_TCPOFOQUEUE = 79,
1: -	LINUX_MIB_TCPOFODROP = 80,
1: -	LINUX_MIB_TCPOFOMERGE = 81,
1: -	LINUX_MIB_TCPCHALLENGEACK = 82,
1: -	LINUX_MIB_TCPSYNCHALLENGE = 83,
1: -	LINUX_MIB_TCPFASTOPENACTIVE = 84,
1: -	LINUX_MIB_TCPFASTOPENACTIVEFAIL = 85,
1: -	LINUX_MIB_TCPFASTOPENPASSIVE = 86,
1: -	LINUX_MIB_TCPFASTOPENPASSIVEFAIL = 87,
1: -	LINUX_MIB_TCPFASTOPENLISTENOVERFLOW = 88,
1: -	LINUX_MIB_TCPFASTOPENCOOKIEREQD = 89,
1: -	LINUX_MIB_TCPFASTOPENBLACKHOLE = 90,
1: -	LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES = 91,
1: -	LINUX_MIB_BUSYPOLLRXPACKETS = 92,
1: -	LINUX_MIB_TCPAUTOCORKING = 93,
1: -	LINUX_MIB_TCPFROMZEROWINDOWADV = 94,
1: -	LINUX_MIB_TCPTOZEROWINDOWADV = 95,
1: -	LINUX_MIB_TCPWANTZEROWINDOWADV = 96,
1: -	LINUX_MIB_TCPSYNRETRANS = 97,
1: -	LINUX_MIB_TCPORIGDATASENT = 98,
1: -	LINUX_MIB_TCPHYSTARTTRAINDETECT = 99,
1: -	LINUX_MIB_TCPHYSTARTTRAINCWND = 100,
1: -	LINUX_MIB_TCPHYSTARTDELAYDETECT = 101,
1: -	LINUX_MIB_TCPHYSTARTDELAYCWND = 102,
1: -	LINUX_MIB_TCPACKSKIPPEDSYNRECV = 103,
1: -	LINUX_MIB_TCPACKSKIPPEDPAWS = 104,
1: -	LINUX_MIB_TCPACKSKIPPEDSEQ = 105,
1: -	LINUX_MIB_TCPACKSKIPPEDFINWAIT2 = 106,
1: -	LINUX_MIB_TCPACKSKIPPEDTIMEWAIT = 107,
1: -	LINUX_MIB_TCPACKSKIPPEDCHALLENGE = 108,
1: -	LINUX_MIB_TCPWINPROBE = 109,
1: -	LINUX_MIB_TCPKEEPALIVE = 110,
1: -	LINUX_MIB_TCPMTUPFAIL = 111,
1: -	LINUX_MIB_TCPMTUPSUCCESS = 112,
1: -	LINUX_MIB_TCPDELIVERED = 113,
1: -	LINUX_MIB_TCPDELIVEREDCE = 114,
1: -	LINUX_MIB_TCPACKCOMPRESSED = 115,
1: -	LINUX_MIB_TCPZEROWINDOWDROP = 116,
1: -	LINUX_MIB_TCPRCVQDROP = 117,
1: -	LINUX_MIB_TCPWQUEUETOOBIG = 118,
1: -	LINUX_MIB_TCPFASTOPENPASSIVEALTKEY = 119,
1: -	LINUX_MIB_TCPTIMEOUTREHASH = 120,
1: -	LINUX_MIB_TCPDUPLICATEDATAREHASH = 121,
1: -	LINUX_MIB_TCPDSACKRECVSEGS = 122,
1: -	LINUX_MIB_TCPDSACKIGNOREDDUBIOUS = 123,
1: -	__LINUX_MIB_MAX = 124,
1: -};
1: -
1: -enum {
1: -	LINUX_MIB_XFRMNUM = 0,
1: -	LINUX_MIB_XFRMINERROR = 1,
1: -	LINUX_MIB_XFRMINBUFFERERROR = 2,
1: -	LINUX_MIB_XFRMINHDRERROR = 3,
1: -	LINUX_MIB_XFRMINNOSTATES = 4,
1: -	LINUX_MIB_XFRMINSTATEPROTOERROR = 5,
1: -	LINUX_MIB_XFRMINSTATEMODEERROR = 6,
1: -	LINUX_MIB_XFRMINSTATESEQERROR = 7,
1: -	LINUX_MIB_XFRMINSTATEEXPIRED = 8,
1: -	LINUX_MIB_XFRMINSTATEMISMATCH = 9,
1: -	LINUX_MIB_XFRMINSTATEINVALID = 10,
1: -	LINUX_MIB_XFRMINTMPLMISMATCH = 11,
1: -	LINUX_MIB_XFRMINNOPOLS = 12,
1: -	LINUX_MIB_XFRMINPOLBLOCK = 13,
1: -	LINUX_MIB_XFRMINPOLERROR = 14,
1: -	LINUX_MIB_XFRMOUTERROR = 15,
1: -	LINUX_MIB_XFRMOUTBUNDLEGENERROR = 16,
1: -	LINUX_MIB_XFRMOUTBUNDLECHECKERROR = 17,
1: -	LINUX_MIB_XFRMOUTNOSTATES = 18,
1: -	LINUX_MIB_XFRMOUTSTATEPROTOERROR = 19,
1: -	LINUX_MIB_XFRMOUTSTATEMODEERROR = 20,
1: -	LINUX_MIB_XFRMOUTSTATESEQERROR = 21,
1: -	LINUX_MIB_XFRMOUTSTATEEXPIRED = 22,
1: -	LINUX_MIB_XFRMOUTPOLBLOCK = 23,
1: -	LINUX_MIB_XFRMOUTPOLDEAD = 24,
1: -	LINUX_MIB_XFRMOUTPOLERROR = 25,
1: -	LINUX_MIB_XFRMFWDHDRERROR = 26,
1: -	LINUX_MIB_XFRMOUTSTATEINVALID = 27,
1: -	LINUX_MIB_XFRMACQUIREERROR = 28,
1: -	__LINUX_MIB_XFRMMAX = 29,
1: -};
1: -
1: -enum {
1: -	LINUX_MIB_TLSNUM = 0,
1: -	LINUX_MIB_TLSCURRTXSW = 1,
1: -	LINUX_MIB_TLSCURRRXSW = 2,
1: -	LINUX_MIB_TLSCURRTXDEVICE = 3,
1: -	LINUX_MIB_TLSCURRRXDEVICE = 4,
1: -	LINUX_MIB_TLSTXSW = 5,
1: -	LINUX_MIB_TLSRXSW = 6,
1: -	LINUX_MIB_TLSTXDEVICE = 7,
1: -	LINUX_MIB_TLSRXDEVICE = 8,
1: -	LINUX_MIB_TLSDECRYPTERROR = 9,
1: -	LINUX_MIB_TLSRXDEVICERESYNC = 10,
1: -	__LINUX_MIB_TLSMAX = 11,
1: +  FLOW_DISSECTOR_KEY_CONTROL = 0,
1: +  FLOW_DISSECTOR_KEY_BASIC = 1,
1: +  FLOW_DISSECTOR_KEY_IPV4_ADDRS = 2,
1: +  FLOW_DISSECTOR_KEY_IPV6_ADDRS = 3,
1: +  FLOW_DISSECTOR_KEY_PORTS = 4,
1: +  FLOW_DISSECTOR_KEY_PORTS_RANGE = 5,
1: +  FLOW_DISSECTOR_KEY_ICMP = 6,
1: +  FLOW_DISSECTOR_KEY_ETH_ADDRS = 7,
1: +  FLOW_DISSECTOR_KEY_TIPC = 8,
1: +  FLOW_DISSECTOR_KEY_ARP = 9,
1: +  FLOW_DISSECTOR_KEY_VLAN = 10,
1: +  FLOW_DISSECTOR_KEY_FLOW_LABEL = 11,
1: +  FLOW_DISSECTOR_KEY_GRE_KEYID = 12,
1: +  FLOW_DISSECTOR_KEY_MPLS_ENTROPY = 13,
1: +  FLOW_DISSECTOR_KEY_ENC_KEYID = 14,
1: +  FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS = 15,
1: +  FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS = 16,
1: +  FLOW_DISSECTOR_KEY_ENC_CONTROL = 17,
1: +  FLOW_DISSECTOR_KEY_ENC_PORTS = 18,
1: +  FLOW_DISSECTOR_KEY_MPLS = 19,
1: +  FLOW_DISSECTOR_KEY_TCP = 20,
1: +  FLOW_DISSECTOR_KEY_IP = 21,
1: +  FLOW_DISSECTOR_KEY_CVLAN = 22,
1: +  FLOW_DISSECTOR_KEY_ENC_IP = 23,
1: +  FLOW_DISSECTOR_KEY_ENC_OPTS = 24,
1: +  FLOW_DISSECTOR_KEY_META = 25,
1: +  FLOW_DISSECTOR_KEY_CT = 26,
1: +  FLOW_DISSECTOR_KEY_HASH = 27,
1: +  FLOW_DISSECTOR_KEY_MAX = 28,
1: +};
1: +
1: +enum {
1: +  IPSTATS_MIB_NUM = 0,
1: +  IPSTATS_MIB_INPKTS = 1,
1: +  IPSTATS_MIB_INOCTETS = 2,
1: +  IPSTATS_MIB_INDELIVERS = 3,
1: +  IPSTATS_MIB_OUTFORWDATAGRAMS = 4,
1: +  IPSTATS_MIB_OUTPKTS = 5,
1: +  IPSTATS_MIB_OUTOCTETS = 6,
1: +  IPSTATS_MIB_INHDRERRORS = 7,
1: +  IPSTATS_MIB_INTOOBIGERRORS = 8,
1: +  IPSTATS_MIB_INNOROUTES = 9,
1: +  IPSTATS_MIB_INADDRERRORS = 10,
1: +  IPSTATS_MIB_INUNKNOWNPROTOS = 11,
1: +  IPSTATS_MIB_INTRUNCATEDPKTS = 12,
1: +  IPSTATS_MIB_INDISCARDS = 13,
1: +  IPSTATS_MIB_OUTDISCARDS = 14,
1: +  IPSTATS_MIB_OUTNOROUTES = 15,
1: +  IPSTATS_MIB_REASMTIMEOUT = 16,
1: +  IPSTATS_MIB_REASMREQDS = 17,
1: +  IPSTATS_MIB_REASMOKS = 18,
1: +  IPSTATS_MIB_REASMFAILS = 19,
1: +  IPSTATS_MIB_FRAGOKS = 20,
1: +  IPSTATS_MIB_FRAGFAILS = 21,
1: +  IPSTATS_MIB_FRAGCREATES = 22,
1: +  IPSTATS_MIB_INMCASTPKTS = 23,
1: +  IPSTATS_MIB_OUTMCASTPKTS = 24,
1: +  IPSTATS_MIB_INBCASTPKTS = 25,
1: +  IPSTATS_MIB_OUTBCASTPKTS = 26,
1: +  IPSTATS_MIB_INMCASTOCTETS = 27,
1: +  IPSTATS_MIB_OUTMCASTOCTETS = 28,
1: +  IPSTATS_MIB_INBCASTOCTETS = 29,
1: +  IPSTATS_MIB_OUTBCASTOCTETS = 30,
1: +  IPSTATS_MIB_CSUMERRORS = 31,
1: +  IPSTATS_MIB_NOECTPKTS = 32,
1: +  IPSTATS_MIB_ECT1PKTS = 33,
1: +  IPSTATS_MIB_ECT0PKTS = 34,
1: +  IPSTATS_MIB_CEPKTS = 35,
1: +  IPSTATS_MIB_REASM_OVERLAPS = 36,
1: +  __IPSTATS_MIB_MAX = 37,
1: +};
1: +
1: +enum {
1: +  ICMP_MIB_NUM = 0,
1: +  ICMP_MIB_INMSGS = 1,
1: +  ICMP_MIB_INERRORS = 2,
1: +  ICMP_MIB_INDESTUNREACHS = 3,
1: +  ICMP_MIB_INTIMEEXCDS = 4,
1: +  ICMP_MIB_INPARMPROBS = 5,
1: +  ICMP_MIB_INSRCQUENCHS = 6,
1: +  ICMP_MIB_INREDIRECTS = 7,
1: +  ICMP_MIB_INECHOS = 8,
1: +  ICMP_MIB_INECHOREPS = 9,
1: +  ICMP_MIB_INTIMESTAMPS = 10,
1: +  ICMP_MIB_INTIMESTAMPREPS = 11,
1: +  ICMP_MIB_INADDRMASKS = 12,
1: +  ICMP_MIB_INADDRMASKREPS = 13,
1: +  ICMP_MIB_OUTMSGS = 14,
1: +  ICMP_MIB_OUTERRORS = 15,
1: +  ICMP_MIB_OUTDESTUNREACHS = 16,
1: +  ICMP_MIB_OUTTIMEEXCDS = 17,
1: +  ICMP_MIB_OUTPARMPROBS = 18,
1: +  ICMP_MIB_OUTSRCQUENCHS = 19,
1: +  ICMP_MIB_OUTREDIRECTS = 20,
1: +  ICMP_MIB_OUTECHOS = 21,
1: +  ICMP_MIB_OUTECHOREPS = 22,
1: +  ICMP_MIB_OUTTIMESTAMPS = 23,
1: +  ICMP_MIB_OUTTIMESTAMPREPS = 24,
1: +  ICMP_MIB_OUTADDRMASKS = 25,
1: +  ICMP_MIB_OUTADDRMASKREPS = 26,
1: +  ICMP_MIB_CSUMERRORS = 27,
1: +  __ICMP_MIB_MAX = 28,
1: +};
1: +
1: +enum {
1: +  ICMP6_MIB_NUM = 0,
1: +  ICMP6_MIB_INMSGS = 1,
1: +  ICMP6_MIB_INERRORS = 2,
1: +  ICMP6_MIB_OUTMSGS = 3,
1: +  ICMP6_MIB_OUTERRORS = 4,
1: +  ICMP6_MIB_CSUMERRORS = 5,
1: +  __ICMP6_MIB_MAX = 6,
1: +};
1: +
1: +enum {
1: +  TCP_MIB_NUM = 0,
1: +  TCP_MIB_RTOALGORITHM = 1,
1: +  TCP_MIB_RTOMIN = 2,
1: +  TCP_MIB_RTOMAX = 3,
1: +  TCP_MIB_MAXCONN = 4,
1: +  TCP_MIB_ACTIVEOPENS = 5,
1: +  TCP_MIB_PASSIVEOPENS = 6,
1: +  TCP_MIB_ATTEMPTFAILS = 7,
1: +  TCP_MIB_ESTABRESETS = 8,
1: +  TCP_MIB_CURRESTAB = 9,
1: +  TCP_MIB_INSEGS = 10,
1: +  TCP_MIB_OUTSEGS = 11,
1: +  TCP_MIB_RETRANSSEGS = 12,
1: +  TCP_MIB_INERRS = 13,
1: +  TCP_MIB_OUTRSTS = 14,
1: +  TCP_MIB_CSUMERRORS = 15,
1: +  __TCP_MIB_MAX = 16,
1: +};
1: +
1: +enum {
1: +  UDP_MIB_NUM = 0,
1: +  UDP_MIB_INDATAGRAMS = 1,
1: +  UDP_MIB_NOPORTS = 2,
1: +  UDP_MIB_INERRORS = 3,
1: +  UDP_MIB_OUTDATAGRAMS = 4,
1: +  UDP_MIB_RCVBUFERRORS = 5,
1: +  UDP_MIB_SNDBUFERRORS = 6,
1: +  UDP_MIB_CSUMERRORS = 7,
1: +  UDP_MIB_IGNOREDMULTI = 8,
1: +  UDP_MIB_MEMERRORS = 9,
1: +  __UDP_MIB_MAX = 10,
1: +};
1: +
1: +enum {
1: +  LINUX_MIB_NUM = 0,
1: +  LINUX_MIB_SYNCOOKIESSENT = 1,
1: +  LINUX_MIB_SYNCOOKIESRECV = 2,
1: +  LINUX_MIB_SYNCOOKIESFAILED = 3,
1: +  LINUX_MIB_EMBRYONICRSTS = 4,
1: +  LINUX_MIB_PRUNECALLED = 5,
1: +  LINUX_MIB_RCVPRUNED = 6,
1: +  LINUX_MIB_OFOPRUNED = 7,
1: +  LINUX_MIB_OUTOFWINDOWICMPS = 8,
1: +  LINUX_MIB_LOCKDROPPEDICMPS = 9,
1: +  LINUX_MIB_ARPFILTER = 10,
1: +  LINUX_MIB_TIMEWAITED = 11,
1: +  LINUX_MIB_TIMEWAITRECYCLED = 12,
1: +  LINUX_MIB_TIMEWAITKILLED = 13,
1: +  LINUX_MIB_PAWSACTIVEREJECTED = 14,
1: +  LINUX_MIB_PAWSESTABREJECTED = 15,
1: +  LINUX_MIB_DELAYEDACKS = 16,
1: +  LINUX_MIB_DELAYEDACKLOCKED = 17,
1: +  LINUX_MIB_DELAYEDACKLOST = 18,
1: +  LINUX_MIB_LISTENOVERFLOWS = 19,
1: +  LINUX_MIB_LISTENDROPS = 20,
1: +  LINUX_MIB_TCPHPHITS = 21,
1: +  LINUX_MIB_TCPPUREACKS = 22,
1: +  LINUX_MIB_TCPHPACKS = 23,
1: +  LINUX_MIB_TCPRENORECOVERY = 24,
1: +  LINUX_MIB_TCPSACKRECOVERY = 25,
1: +  LINUX_MIB_TCPSACKRENEGING = 26,
1: +  LINUX_MIB_TCPSACKREORDER = 27,
1: +  LINUX_MIB_TCPRENOREORDER = 28,
1: +  LINUX_MIB_TCPTSREORDER = 29,
1: +  LINUX_MIB_TCPFULLUNDO = 30,
1: +  LINUX_MIB_TCPPARTIALUNDO = 31,
1: +  LINUX_MIB_TCPDSACKUNDO = 32,
1: +  LINUX_MIB_TCPLOSSUNDO = 33,
1: +  LINUX_MIB_TCPLOSTRETRANSMIT = 34,
1: +  LINUX_MIB_TCPRENOFAILURES = 35,
1: +  LINUX_MIB_TCPSACKFAILURES = 36,
1: +  LINUX_MIB_TCPLOSSFAILURES = 37,
1: +  LINUX_MIB_TCPFASTRETRANS = 38,
1: +  LINUX_MIB_TCPSLOWSTARTRETRANS = 39,
1: +  LINUX_MIB_TCPTIMEOUTS = 40,
1: +  LINUX_MIB_TCPLOSSPROBES = 41,
1: +  LINUX_MIB_TCPLOSSPROBERECOVERY = 42,
1: +  LINUX_MIB_TCPRENORECOVERYFAIL = 43,
1: +  LINUX_MIB_TCPSACKRECOVERYFAIL = 44,
1: +  LINUX_MIB_TCPRCVCOLLAPSED = 45,
1: +  LINUX_MIB_TCPDSACKOLDSENT = 46,
1: +  LINUX_MIB_TCPDSACKOFOSENT = 47,
1: +  LINUX_MIB_TCPDSACKRECV = 48,
1: +  LINUX_MIB_TCPDSACKOFORECV = 49,
1: +  LINUX_MIB_TCPABORTONDATA = 50,
1: +  LINUX_MIB_TCPABORTONCLOSE = 51,
1: +  LINUX_MIB_TCPABORTONMEMORY = 52,
1: +  LINUX_MIB_TCPABORTONTIMEOUT = 53,
1: +  LINUX_MIB_TCPABORTONLINGER = 54,
1: +  LINUX_MIB_TCPABORTFAILED = 55,
1: +  LINUX_MIB_TCPMEMORYPRESSURES = 56,
1: +  LINUX_MIB_TCPMEMORYPRESSURESCHRONO = 57,
1: +  LINUX_MIB_TCPSACKDISCARD = 58,
1: +  LINUX_MIB_TCPDSACKIGNOREDOLD = 59,
1: +  LINUX_MIB_TCPDSACKIGNOREDNOUNDO = 60,
1: +  LINUX_MIB_TCPSPURIOUSRTOS = 61,
1: +  LINUX_MIB_TCPMD5NOTFOUND = 62,
1: +  LINUX_MIB_TCPMD5UNEXPECTED = 63,
1: +  LINUX_MIB_TCPMD5FAILURE = 64,
1: +  LINUX_MIB_SACKSHIFTED = 65,
1: +  LINUX_MIB_SACKMERGED = 66,
1: +  LINUX_MIB_SACKSHIFTFALLBACK = 67,
1: +  LINUX_MIB_TCPBACKLOGDROP = 68,
1: +  LINUX_MIB_PFMEMALLOCDROP = 69,
1: +  LINUX_MIB_TCPMINTTLDROP = 70,
1: +  LINUX_MIB_TCPDEFERACCEPTDROP = 71,
1: +  LINUX_MIB_IPRPFILTER = 72,
1: +  LINUX_MIB_TCPTIMEWAITOVERFLOW = 73,
1: +  LINUX_MIB_TCPREQQFULLDOCOOKIES = 74,
1: +  LINUX_MIB_TCPREQQFULLDROP = 75,
1: +  LINUX_MIB_TCPRETRANSFAIL = 76,
1: +  LINUX_MIB_TCPRCVCOALESCE = 77,
1: +  LINUX_MIB_TCPBACKLOGCOALESCE = 78,
1: +  LINUX_MIB_TCPOFOQUEUE = 79,
1: +  LINUX_MIB_TCPOFODROP = 80,
1: +  LINUX_MIB_TCPOFOMERGE = 81,
1: +  LINUX_MIB_TCPCHALLENGEACK = 82,
1: +  LINUX_MIB_TCPSYNCHALLENGE = 83,
1: +  LINUX_MIB_TCPFASTOPENACTIVE = 84,
1: +  LINUX_MIB_TCPFASTOPENACTIVEFAIL = 85,
1: +  LINUX_MIB_TCPFASTOPENPASSIVE = 86,
1: +  LINUX_MIB_TCPFASTOPENPASSIVEFAIL = 87,
1: +  LINUX_MIB_TCPFASTOPENLISTENOVERFLOW = 88,
1: +  LINUX_MIB_TCPFASTOPENCOOKIEREQD = 89,
1: +  LINUX_MIB_TCPFASTOPENBLACKHOLE = 90,
1: +  LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES = 91,
1: +  LINUX_MIB_BUSYPOLLRXPACKETS = 92,
1: +  LINUX_MIB_TCPAUTOCORKING = 93,
1: +  LINUX_MIB_TCPFROMZEROWINDOWADV = 94,
1: +  LINUX_MIB_TCPTOZEROWINDOWADV = 95,
1: +  LINUX_MIB_TCPWANTZEROWINDOWADV = 96,
1: +  LINUX_MIB_TCPSYNRETRANS = 97,
1: +  LINUX_MIB_TCPORIGDATASENT = 98,
1: +  LINUX_MIB_TCPHYSTARTTRAINDETECT = 99,
1: +  LINUX_MIB_TCPHYSTARTTRAINCWND = 100,
1: +  LINUX_MIB_TCPHYSTARTDELAYDETECT = 101,
1: +  LINUX_MIB_TCPHYSTARTDELAYCWND = 102,
1: +  LINUX_MIB_TCPACKSKIPPEDSYNRECV = 103,
1: +  LINUX_MIB_TCPACKSKIPPEDPAWS = 104,
1: +  LINUX_MIB_TCPACKSKIPPEDSEQ = 105,
1: +  LINUX_MIB_TCPACKSKIPPEDFINWAIT2 = 106,
1: +  LINUX_MIB_TCPACKSKIPPEDTIMEWAIT = 107,
1: +  LINUX_MIB_TCPACKSKIPPEDCHALLENGE = 108,
1: +  LINUX_MIB_TCPWINPROBE = 109,
1: +  LINUX_MIB_TCPKEEPALIVE = 110,
1: +  LINUX_MIB_TCPMTUPFAIL = 111,
1: +  LINUX_MIB_TCPMTUPSUCCESS = 112,
1: +  LINUX_MIB_TCPDELIVERED = 113,
1: +  LINUX_MIB_TCPDELIVEREDCE = 114,
1: +  LINUX_MIB_TCPACKCOMPRESSED = 115,
1: +  LINUX_MIB_TCPZEROWINDOWDROP = 116,
1: +  LINUX_MIB_TCPRCVQDROP = 117,
1: +  LINUX_MIB_TCPWQUEUETOOBIG = 118,
1: +  LINUX_MIB_TCPFASTOPENPASSIVEALTKEY = 119,
1: +  LINUX_MIB_TCPTIMEOUTREHASH = 120,
1: +  LINUX_MIB_TCPDUPLICATEDATAREHASH = 121,
1: +  LINUX_MIB_TCPDSACKRECVSEGS = 122,
1: +  LINUX_MIB_TCPDSACKIGNOREDDUBIOUS = 123,
1: +  __LINUX_MIB_MAX = 124,
1: +};
1: +
1: +enum {
1: +  LINUX_MIB_XFRMNUM = 0,
1: +  LINUX_MIB_XFRMINERROR = 1,
1: +  LINUX_MIB_XFRMINBUFFERERROR = 2,
1: +  LINUX_MIB_XFRMINHDRERROR = 3,
1: +  LINUX_MIB_XFRMINNOSTATES = 4,
1: +  LINUX_MIB_XFRMINSTATEPROTOERROR = 5,
1: +  LINUX_MIB_XFRMINSTATEMODEERROR = 6,
1: +  LINUX_MIB_XFRMINSTATESEQERROR = 7,
1: +  LINUX_MIB_XFRMINSTATEEXPIRED = 8,
1: +  LINUX_MIB_XFRMINSTATEMISMATCH = 9,
1: +  LINUX_MIB_XFRMINSTATEINVALID = 10,
1: +  LINUX_MIB_XFRMINTMPLMISMATCH = 11,
1: +  LINUX_MIB_XFRMINNOPOLS = 12,
1: +  LINUX_MIB_XFRMINPOLBLOCK = 13,
1: +  LINUX_MIB_XFRMINPOLERROR = 14,
1: +  LINUX_MIB_XFRMOUTERROR = 15,
1: +  LINUX_MIB_XFRMOUTBUNDLEGENERROR = 16,
1: +  LINUX_MIB_XFRMOUTBUNDLECHECKERROR = 17,
1: +  LINUX_MIB_XFRMOUTNOSTATES = 18,
1: +  LINUX_MIB_XFRMOUTSTATEPROTOERROR = 19,
1: +  LINUX_MIB_XFRMOUTSTATEMODEERROR = 20,
1: +  LINUX_MIB_XFRMOUTSTATESEQERROR = 21,
1: +  LINUX_MIB_XFRMOUTSTATEEXPIRED = 22,
1: +  LINUX_MIB_XFRMOUTPOLBLOCK = 23,
1: +  LINUX_MIB_XFRMOUTPOLDEAD = 24,
1: +  LINUX_MIB_XFRMOUTPOLERROR = 25,
1: +  LINUX_MIB_XFRMFWDHDRERROR = 26,
1: +  LINUX_MIB_XFRMOUTSTATEINVALID = 27,
1: +  LINUX_MIB_XFRMACQUIREERROR = 28,
1: +  __LINUX_MIB_XFRMMAX = 29,
1: +};
1: +
1: +enum {
1: +  LINUX_MIB_TLSNUM = 0,
1: +  LINUX_MIB_TLSCURRTXSW = 1,
1: +  LINUX_MIB_TLSCURRRXSW = 2,
1: +  LINUX_MIB_TLSCURRTXDEVICE = 3,
1: +  LINUX_MIB_TLSCURRRXDEVICE = 4,
1: +  LINUX_MIB_TLSTXSW = 5,
1: +  LINUX_MIB_TLSRXSW = 6,
1: +  LINUX_MIB_TLSTXDEVICE = 7,
1: +  LINUX_MIB_TLSRXDEVICE = 8,
1: +  LINUX_MIB_TLSDECRYPTERROR = 9,
1: +  LINUX_MIB_TLSRXDEVICERESYNC = 10,
1: +  __LINUX_MIB_TLSMAX = 11,
1:  };
1:  
1:  enum nf_inet_hooks {
1: -	NF_INET_PRE_ROUTING = 0,
1: -	NF_INET_LOCAL_IN = 1,
1: -	NF_INET_FORWARD = 2,
1: -	NF_INET_LOCAL_OUT = 3,
1: -	NF_INET_POST_ROUTING = 4,
1: -	NF_INET_NUMHOOKS = 5,
1: -	NF_INET_INGRESS = 5,
1: +  NF_INET_PRE_ROUTING = 0,
1: +  NF_INET_LOCAL_IN = 1,
1: +  NF_INET_FORWARD = 2,
1: +  NF_INET_LOCAL_OUT = 3,
1: +  NF_INET_POST_ROUTING = 4,
1: +  NF_INET_NUMHOOKS = 5,
1: +  NF_INET_INGRESS = 5,
1:  };
1:  
1:  enum {
1: -	NFPROTO_UNSPEC = 0,
1: -	NFPROTO_INET = 1,
1: -	NFPROTO_IPV4 = 2,
1: -	NFPROTO_ARP = 3,
1: -	NFPROTO_NETDEV = 5,
1: -	NFPROTO_BRIDGE = 7,
1: -	NFPROTO_IPV6 = 10,
1: -	NFPROTO_DECNET = 12,
1: -	NFPROTO_NUMPROTO = 13,
1: +  NFPROTO_UNSPEC = 0,
1: +  NFPROTO_INET = 1,
1: +  NFPROTO_IPV4 = 2,
1: +  NFPROTO_ARP = 3,
1: +  NFPROTO_NETDEV = 5,
1: +  NFPROTO_BRIDGE = 7,
1: +  NFPROTO_IPV6 = 10,
1: +  NFPROTO_DECNET = 12,
1: +  NFPROTO_NUMPROTO = 13,
1:  };
1:  
1:  enum {
1: -	XFRM_POLICY_IN = 0,
1: -	XFRM_POLICY_OUT = 1,
1: -	XFRM_POLICY_FWD = 2,
1: -	XFRM_POLICY_MASK = 3,
1: -	XFRM_POLICY_MAX = 3,
1: +  XFRM_POLICY_IN = 0,
1: +  XFRM_POLICY_OUT = 1,
1: +  XFRM_POLICY_FWD = 2,
1: +  XFRM_POLICY_MASK = 3,
1: +  XFRM_POLICY_MAX = 3,
1:  };
1:  
1:  enum netns_bpf_attach_type {
1: -	NETNS_BPF_INVALID = 4294967295,
1: -	NETNS_BPF_FLOW_DISSECTOR = 0,
1: -	NETNS_BPF_SK_LOOKUP = 1,
1: -	MAX_NETNS_BPF_ATTACH_TYPE = 2,
1: +  NETNS_BPF_INVALID = 4294967295,
1: +  NETNS_BPF_FLOW_DISSECTOR = 0,
1: +  NETNS_BPF_SK_LOOKUP = 1,
1: +  MAX_NETNS_BPF_ATTACH_TYPE = 2,
1:  };
1:  
1:  enum skb_ext_id {
1: -	SKB_EXT_BRIDGE_NF = 0,
1: -	SKB_EXT_SEC_PATH = 1,
1: -	SKB_EXT_NUM = 2,
1: +  SKB_EXT_BRIDGE_NF = 0,
1: +  SKB_EXT_SEC_PATH = 1,
1: +  SKB_EXT_NUM = 2,
1:  };
1:  
1:  enum audit_ntp_type {
1: -	AUDIT_NTP_OFFSET = 0,
1: -	AUDIT_NTP_FREQ = 1,
1: -	AUDIT_NTP_STATUS = 2,
1: -	AUDIT_NTP_TAI = 3,
1: -	AUDIT_NTP_TICK = 4,
1: -	AUDIT_NTP_ADJUST = 5,
1: -	AUDIT_NTP_NVALS = 6,
1: +  AUDIT_NTP_OFFSET = 0,
1: +  AUDIT_NTP_FREQ = 1,
1: +  AUDIT_NTP_STATUS = 2,
1: +  AUDIT_NTP_TAI = 3,
1: +  AUDIT_NTP_TICK = 4,
1: +  AUDIT_NTP_ADJUST = 5,
1: +  AUDIT_NTP_NVALS = 6,
1:  };
1:  
1:  typedef long int (*sys_call_ptr_t)(const struct pt_regs *);
1:  
1:  struct io_bitmap {
1: -	u64 sequence;
1: -	refcount_t refcnt;
1: -	unsigned int max;
1: -	long unsigned int bitmap[1024];
1: +  u64 sequence;
1: +  refcount_t refcnt;
1: +  unsigned int max;
1: +  long unsigned int bitmap[1024];
1:  };
1:  
1:  enum {
1: -	EI_ETYPE_NONE = 0,
1: -	EI_ETYPE_NULL = 1,
1: -	EI_ETYPE_ERRNO = 2,
1: -	EI_ETYPE_ERRNO_NULL = 3,
1: -	EI_ETYPE_TRUE = 4,
1: +  EI_ETYPE_NONE = 0,
1: +  EI_ETYPE_NULL = 1,
1: +  EI_ETYPE_ERRNO = 2,
1: +  EI_ETYPE_ERRNO_NULL = 3,
1: +  EI_ETYPE_TRUE = 4,
1:  };
1:  
1:  struct syscall_metadata {
1: -	const char *name;
1: -	int syscall_nr;
1: -	int nb_args;
1: -	const char **types;
1: -	const char **args;
1: -	struct list_head enter_fields;
1: -	struct trace_event_call *enter_event;
1: -	struct trace_event_call *exit_event;
1: +  const char *name;
1: +  int syscall_nr;
1: +  int nb_args;
1: +  const char **types;
1: +  const char **args;
1: +  struct list_head enter_fields;
1: +  struct trace_event_call *enter_event;
1: +  struct trace_event_call *exit_event;
1:  };
1:  
1:  struct alt_instr {
1: -	s32 instr_offset;
1: -	s32 repl_offset;
1: -	u16 cpuid;
1: -	u8 instrlen;
1: -	u8 replacementlen;
1: -	u8 padlen;
1: +  s32 instr_offset;
1: +  s32 repl_offset;
1: +  u16 cpuid;
1: +  u8 instrlen;
1: +  u8 replacementlen;
1: +  u8 padlen;
1:  } __attribute__((packed));
1:  
1:  struct timens_offset {
1: -	s64 sec;
1: -	u64 nsec;
1: +  s64 sec;
1: +  u64 nsec;
1:  };
1:  
1:  enum vm_fault_reason {
1: -	VM_FAULT_OOM = 1,
1: -	VM_FAULT_SIGBUS = 2,
1: -	VM_FAULT_MAJOR = 4,
1: -	VM_FAULT_WRITE = 8,
1: -	VM_FAULT_HWPOISON = 16,
1: -	VM_FAULT_HWPOISON_LARGE = 32,
1: -	VM_FAULT_SIGSEGV = 64,
1: -	VM_FAULT_NOPAGE = 256,
1: -	VM_FAULT_LOCKED = 512,
1: -	VM_FAULT_RETRY = 1024,
1: -	VM_FAULT_FALLBACK = 2048,
1: -	VM_FAULT_DONE_COW = 4096,
1: -	VM_FAULT_NEEDDSYNC = 8192,
1: -	VM_FAULT_HINDEX_MASK = 983040,
1: +  VM_FAULT_OOM = 1,
1: +  VM_FAULT_SIGBUS = 2,
1: +  VM_FAULT_MAJOR = 4,
1: +  VM_FAULT_WRITE = 8,
1: +  VM_FAULT_HWPOISON = 16,
1: +  VM_FAULT_HWPOISON_LARGE = 32,
1: +  VM_FAULT_SIGSEGV = 64,
1: +  VM_FAULT_NOPAGE = 256,
1: +  VM_FAULT_LOCKED = 512,
1: +  VM_FAULT_RETRY = 1024,
1: +  VM_FAULT_FALLBACK = 2048,
1: +  VM_FAULT_DONE_COW = 4096,
1: +  VM_FAULT_NEEDDSYNC = 8192,
1: +  VM_FAULT_HINDEX_MASK = 983040,
1:  };
1:  
1:  struct vm_special_mapping {
1: -	const char *name;
1: -	struct page **pages;
1: -	vm_fault_t (*fault)(const struct vm_special_mapping *, struct vm_area_struct *, struct vm_fault *);
1: -	int (*mremap)(const struct vm_special_mapping *, struct vm_area_struct *);
1: +  const char *name;
1: +  struct page **pages;
1: +  vm_fault_t (*fault)(const struct vm_special_mapping *,
1: +                      struct vm_area_struct *, struct vm_fault *);
1: +  int (*mremap)(const struct vm_special_mapping *, struct vm_area_struct *);
1:  };
1:  
1:  struct timens_offsets {
1: -	struct timespec64 monotonic;
1: -	struct timespec64 boottime;
1: +  struct timespec64 monotonic;
1: +  struct timespec64 boottime;
1:  };
1:  
1:  struct time_namespace {
1: -	struct kref kref;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	struct ns_common ns;
1: -	struct timens_offsets offsets;
1: -	struct page *vvar_page;
1: -	bool frozen_offsets;
1: +  struct kref kref;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  struct ns_common ns;
1: +  struct timens_offsets offsets;
1: +  struct page *vvar_page;
1: +  bool frozen_offsets;
1:  };
1:  
1:  struct pvclock_vcpu_time_info {
1: -	u32 version;
1: -	u32 pad0;
1: -	u64 tsc_timestamp;
1: -	u64 system_time;
1: -	u32 tsc_to_system_mul;
1: -	s8 tsc_shift;
1: -	u8 flags;
1: -	u8 pad[2];
1: +  u32 version;
1: +  u32 pad0;
1: +  u64 tsc_timestamp;
1: +  u64 system_time;
1: +  u32 tsc_to_system_mul;
1: +  s8 tsc_shift;
1: +  u8 flags;
1: +  u8 pad[2];
1:  };
1:  
1:  struct pvclock_vsyscall_time_info {
1: -	struct pvclock_vcpu_time_info pvti;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct pvclock_vcpu_time_info pvti;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum vdso_clock_mode {
1: -	VDSO_CLOCKMODE_NONE = 0,
1: -	VDSO_CLOCKMODE_TSC = 1,
1: -	VDSO_CLOCKMODE_PVCLOCK = 2,
1: -	VDSO_CLOCKMODE_HVCLOCK = 3,
1: -	VDSO_CLOCKMODE_MAX = 4,
1: -	VDSO_CLOCKMODE_TIMENS = 2147483647,
1: +  VDSO_CLOCKMODE_NONE = 0,
1: +  VDSO_CLOCKMODE_TSC = 1,
1: +  VDSO_CLOCKMODE_PVCLOCK = 2,
1: +  VDSO_CLOCKMODE_HVCLOCK = 3,
1: +  VDSO_CLOCKMODE_MAX = 4,
1: +  VDSO_CLOCKMODE_TIMENS = 2147483647,
1:  };
1:  
1:  struct arch_vdso_data {};
1:  
1:  struct vdso_timestamp {
1: -	u64 sec;
1: -	u64 nsec;
1: +  u64 sec;
1: +  u64 nsec;
1:  };
1:  
1:  struct vdso_data {
1: -	u32 seq;
1: -	s32 clock_mode;
1: -	u64 cycle_last;
1: -	u64 mask;
1: -	u32 mult;
1: -	u32 shift;
1: -	union {
1: -		struct vdso_timestamp basetime[12];
1: -		struct timens_offset offset[12];
1: -	};
1: -	s32 tz_minuteswest;
1: -	s32 tz_dsttime;
1: -	u32 hrtimer_res;
1: -	u32 __unused;
1: -	struct arch_vdso_data arch_data;
1: +  u32 seq;
1: +  s32 clock_mode;
1: +  u64 cycle_last;
1: +  u64 mask;
1: +  u32 mult;
1: +  u32 shift;
1: +  union {
1: +    struct vdso_timestamp basetime[12];
1: +    struct timens_offset offset[12];
1: +  };
1: +  s32 tz_minuteswest;
1: +  s32 tz_dsttime;
1: +  u32 hrtimer_res;
1: +  u32 __unused;
1: +  struct arch_vdso_data arch_data;
1:  };
1:  
1:  struct ms_hyperv_tsc_page {
1: -	volatile u32 tsc_sequence;
1: -	u32 reserved1;
1: -	volatile u64 tsc_scale;
1: -	volatile s64 tsc_offset;
1: +  volatile u32 tsc_sequence;
1: +  u32 reserved1;
1: +  volatile u64 tsc_scale;
1: +  volatile s64 tsc_offset;
1:  };
1:  
1:  enum {
1: -	TASKSTATS_CMD_UNSPEC = 0,
1: -	TASKSTATS_CMD_GET = 1,
1: -	TASKSTATS_CMD_NEW = 2,
1: -	__TASKSTATS_CMD_MAX = 3,
1: +  TASKSTATS_CMD_UNSPEC = 0,
1: +  TASKSTATS_CMD_GET = 1,
1: +  TASKSTATS_CMD_NEW = 2,
1: +  __TASKSTATS_CMD_MAX = 3,
1:  };
1:  
1:  enum {
1: -	HI_SOFTIRQ = 0,
1: -	TIMER_SOFTIRQ = 1,
1: -	NET_TX_SOFTIRQ = 2,
1: -	NET_RX_SOFTIRQ = 3,
1: -	BLOCK_SOFTIRQ = 4,
1: -	IRQ_POLL_SOFTIRQ = 5,
1: -	TASKLET_SOFTIRQ = 6,
1: -	SCHED_SOFTIRQ = 7,
1: -	HRTIMER_SOFTIRQ = 8,
1: -	RCU_SOFTIRQ = 9,
1: -	NR_SOFTIRQS = 10,
1: +  HI_SOFTIRQ = 0,
1: +  TIMER_SOFTIRQ = 1,
1: +  NET_TX_SOFTIRQ = 2,
1: +  NET_RX_SOFTIRQ = 3,
1: +  BLOCK_SOFTIRQ = 4,
1: +  IRQ_POLL_SOFTIRQ = 5,
1: +  TASKLET_SOFTIRQ = 6,
1: +  SCHED_SOFTIRQ = 7,
1: +  HRTIMER_SOFTIRQ = 8,
1: +  RCU_SOFTIRQ = 9,
1: +  NR_SOFTIRQS = 10,
1:  };
1:  
1:  enum cpu_usage_stat {
1: -	CPUTIME_USER = 0,
1: -	CPUTIME_NICE = 1,
1: -	CPUTIME_SYSTEM = 2,
1: -	CPUTIME_SOFTIRQ = 3,
1: -	CPUTIME_IRQ = 4,
1: -	CPUTIME_IDLE = 5,
1: -	CPUTIME_IOWAIT = 6,
1: -	CPUTIME_STEAL = 7,
1: -	CPUTIME_GUEST = 8,
1: -	CPUTIME_GUEST_NICE = 9,
1: -	NR_STATS = 10,
1: +  CPUTIME_USER = 0,
1: +  CPUTIME_NICE = 1,
1: +  CPUTIME_SYSTEM = 2,
1: +  CPUTIME_SOFTIRQ = 3,
1: +  CPUTIME_IRQ = 4,
1: +  CPUTIME_IDLE = 5,
1: +  CPUTIME_IOWAIT = 6,
1: +  CPUTIME_STEAL = 7,
1: +  CPUTIME_GUEST = 8,
1: +  CPUTIME_GUEST_NICE = 9,
1: +  NR_STATS = 10,
1:  };
1:  
1:  enum bpf_cgroup_storage_type {
1: -	BPF_CGROUP_STORAGE_SHARED = 0,
1: -	BPF_CGROUP_STORAGE_PERCPU = 1,
1: -	__BPF_CGROUP_STORAGE_MAX = 2,
1: +  BPF_CGROUP_STORAGE_SHARED = 0,
1: +  BPF_CGROUP_STORAGE_PERCPU = 1,
1: +  __BPF_CGROUP_STORAGE_MAX = 2,
1:  };
1:  
1:  enum psi_task_count {
1: -	NR_IOWAIT = 0,
1: -	NR_MEMSTALL = 1,
1: -	NR_RUNNING = 2,
1: -	NR_ONCPU = 3,
1: -	NR_PSI_TASK_COUNTS = 4,
1: +  NR_IOWAIT = 0,
1: +  NR_MEMSTALL = 1,
1: +  NR_RUNNING = 2,
1: +  NR_ONCPU = 3,
1: +  NR_PSI_TASK_COUNTS = 4,
1:  };
1:  
1:  enum psi_states {
1: -	PSI_IO_SOME = 0,
1: -	PSI_IO_FULL = 1,
1: -	PSI_MEM_SOME = 2,
1: -	PSI_MEM_FULL = 3,
1: -	PSI_CPU_SOME = 4,
1: -	PSI_NONIDLE = 5,
1: -	NR_PSI_STATES = 6,
1: +  PSI_IO_SOME = 0,
1: +  PSI_IO_FULL = 1,
1: +  PSI_MEM_SOME = 2,
1: +  PSI_MEM_FULL = 3,
1: +  PSI_CPU_SOME = 4,
1: +  PSI_NONIDLE = 5,
1: +  NR_PSI_STATES = 6,
1:  };
1:  
1:  enum psi_aggregators {
1: -	PSI_AVGS = 0,
1: -	PSI_POLL = 1,
1: -	NR_PSI_AGGREGATORS = 2,
1: +  PSI_AVGS = 0,
1: +  PSI_POLL = 1,
1: +  NR_PSI_AGGREGATORS = 2,
1:  };
1:  
1:  enum cgroup_subsys_id {
1: -	cpuset_cgrp_id = 0,
1: -	cpu_cgrp_id = 1,
1: -	cpuacct_cgrp_id = 2,
1: -	io_cgrp_id = 3,
1: -	memory_cgrp_id = 4,
1: -	devices_cgrp_id = 5,
1: -	freezer_cgrp_id = 6,
1: -	net_cls_cgrp_id = 7,
1: -	perf_event_cgrp_id = 8,
1: -	hugetlb_cgrp_id = 9,
1: -	CGROUP_SUBSYS_COUNT = 10,
1: +  cpuset_cgrp_id = 0,
1: +  cpu_cgrp_id = 1,
1: +  cpuacct_cgrp_id = 2,
1: +  io_cgrp_id = 3,
1: +  memory_cgrp_id = 4,
1: +  devices_cgrp_id = 5,
1: +  freezer_cgrp_id = 6,
1: +  net_cls_cgrp_id = 7,
1: +  perf_event_cgrp_id = 8,
1: +  hugetlb_cgrp_id = 9,
1: +  CGROUP_SUBSYS_COUNT = 10,
1:  };
1:  
1:  struct cpuinfo_x86 {
1: -	__u8 x86;
1: -	__u8 x86_vendor;
1: -	__u8 x86_model;
1: -	__u8 x86_stepping;
1: -	int x86_tlbsize;
1: -	__u32 vmx_capability[3];
1: -	__u8 x86_virt_bits;
1: -	__u8 x86_phys_bits;
1: -	__u8 x86_coreid_bits;
1: -	__u8 cu_id;
1: -	__u32 extended_cpuid_level;
1: -	int cpuid_level;
1: -	union {
1: -		__u32 x86_capability[20];
1: -		long unsigned int x86_capability_alignment;
1: -	};
1: -	char x86_vendor_id[16];
1: -	char x86_model_id[64];
1: -	unsigned int x86_cache_size;
1: -	int x86_cache_alignment;
1: -	int x86_cache_max_rmid;
1: -	int x86_cache_occ_scale;
1: -	int x86_cache_mbm_width_offset;
1: -	int x86_power;
1: -	long unsigned int loops_per_jiffy;
1: -	u16 x86_max_cores;
1: -	u16 apicid;
1: -	u16 initial_apicid;
1: -	u16 x86_clflush_size;
1: -	u16 booted_cores;
1: -	u16 phys_proc_id;
1: -	u16 logical_proc_id;
1: -	u16 cpu_core_id;
1: -	u16 cpu_die_id;
1: -	u16 logical_die_id;
1: -	u16 cpu_index;
1: -	u32 microcode;
1: -	u8 x86_cache_bits;
1: -	unsigned int initialized: 1;
1: +  __u8 x86;
1: +  __u8 x86_vendor;
1: +  __u8 x86_model;
1: +  __u8 x86_stepping;
1: +  int x86_tlbsize;
1: +  __u32 vmx_capability[3];
1: +  __u8 x86_virt_bits;
1: +  __u8 x86_phys_bits;
1: +  __u8 x86_coreid_bits;
1: +  __u8 cu_id;
1: +  __u32 extended_cpuid_level;
1: +  int cpuid_level;
1: +  union {
1: +    __u32 x86_capability[20];
1: +    long unsigned int x86_capability_alignment;
1: +  };
1: +  char x86_vendor_id[16];
1: +  char x86_model_id[64];
1: +  unsigned int x86_cache_size;
1: +  int x86_cache_alignment;
1: +  int x86_cache_max_rmid;
1: +  int x86_cache_occ_scale;
1: +  int x86_cache_mbm_width_offset;
1: +  int x86_power;
1: +  long unsigned int loops_per_jiffy;
1: +  u16 x86_max_cores;
1: +  u16 apicid;
1: +  u16 initial_apicid;
1: +  u16 x86_clflush_size;
1: +  u16 booted_cores;
1: +  u16 phys_proc_id;
1: +  u16 logical_proc_id;
1: +  u16 cpu_core_id;
1: +  u16 cpu_die_id;
1: +  u16 logical_die_id;
1: +  u16 cpu_index;
1: +  u32 microcode;
1: +  u8 x86_cache_bits;
1: +  unsigned int initialized : 1;
1:  };
1:  
1:  enum x86_pf_error_code {
1: -	X86_PF_PROT = 1,
1: -	X86_PF_WRITE = 2,
1: -	X86_PF_USER = 4,
1: -	X86_PF_RSVD = 8,
1: -	X86_PF_INSTR = 16,
1: -	X86_PF_PK = 32,
1: +  X86_PF_PROT = 1,
1: +  X86_PF_WRITE = 2,
1: +  X86_PF_USER = 4,
1: +  X86_PF_RSVD = 8,
1: +  X86_PF_INSTR = 16,
1: +  X86_PF_PK = 32,
1:  };
1:  
1:  struct trace_event_raw_emulate_vsyscall {
1: -	struct trace_entry ent;
1: -	int nr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_emulate_vsyscall {};
1: @@ -14141,1714 +14292,1718 @@ struct trace_event_data_offsets_emulate_vsyscall {};
1:  typedef void (*btf_trace_emulate_vsyscall)(void *, int);
1:  
1:  enum {
1: -	EMULATE = 0,
1: -	XONLY = 1,
1: -	NONE = 2,
1: +  EMULATE = 0,
1: +  XONLY = 1,
1: +  NONE = 2,
1:  };
1:  
1:  enum perf_type_id {
1: -	PERF_TYPE_HARDWARE = 0,
1: -	PERF_TYPE_SOFTWARE = 1,
1: -	PERF_TYPE_TRACEPOINT = 2,
1: -	PERF_TYPE_HW_CACHE = 3,
1: -	PERF_TYPE_RAW = 4,
1: -	PERF_TYPE_BREAKPOINT = 5,
1: -	PERF_TYPE_MAX = 6,
1: +  PERF_TYPE_HARDWARE = 0,
1: +  PERF_TYPE_SOFTWARE = 1,
1: +  PERF_TYPE_TRACEPOINT = 2,
1: +  PERF_TYPE_HW_CACHE = 3,
1: +  PERF_TYPE_RAW = 4,
1: +  PERF_TYPE_BREAKPOINT = 5,
1: +  PERF_TYPE_MAX = 6,
1:  };
1:  
1:  enum perf_hw_id {
1: -	PERF_COUNT_HW_CPU_CYCLES = 0,
1: -	PERF_COUNT_HW_INSTRUCTIONS = 1,
1: -	PERF_COUNT_HW_CACHE_REFERENCES = 2,
1: -	PERF_COUNT_HW_CACHE_MISSES = 3,
1: -	PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 4,
1: -	PERF_COUNT_HW_BRANCH_MISSES = 5,
1: -	PERF_COUNT_HW_BUS_CYCLES = 6,
1: -	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 7,
1: -	PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 8,
1: -	PERF_COUNT_HW_REF_CPU_CYCLES = 9,
1: -	PERF_COUNT_HW_MAX = 10,
1: +  PERF_COUNT_HW_CPU_CYCLES = 0,
1: +  PERF_COUNT_HW_INSTRUCTIONS = 1,
1: +  PERF_COUNT_HW_CACHE_REFERENCES = 2,
1: +  PERF_COUNT_HW_CACHE_MISSES = 3,
1: +  PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 4,
1: +  PERF_COUNT_HW_BRANCH_MISSES = 5,
1: +  PERF_COUNT_HW_BUS_CYCLES = 6,
1: +  PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 7,
1: +  PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 8,
1: +  PERF_COUNT_HW_REF_CPU_CYCLES = 9,
1: +  PERF_COUNT_HW_MAX = 10,
1:  };
1:  
1:  enum perf_hw_cache_id {
1: -	PERF_COUNT_HW_CACHE_L1D = 0,
1: -	PERF_COUNT_HW_CACHE_L1I = 1,
1: -	PERF_COUNT_HW_CACHE_LL = 2,
1: -	PERF_COUNT_HW_CACHE_DTLB = 3,
1: -	PERF_COUNT_HW_CACHE_ITLB = 4,
1: -	PERF_COUNT_HW_CACHE_BPU = 5,
1: -	PERF_COUNT_HW_CACHE_NODE = 6,
1: -	PERF_COUNT_HW_CACHE_MAX = 7,
1: +  PERF_COUNT_HW_CACHE_L1D = 0,
1: +  PERF_COUNT_HW_CACHE_L1I = 1,
1: +  PERF_COUNT_HW_CACHE_LL = 2,
1: +  PERF_COUNT_HW_CACHE_DTLB = 3,
1: +  PERF_COUNT_HW_CACHE_ITLB = 4,
1: +  PERF_COUNT_HW_CACHE_BPU = 5,
1: +  PERF_COUNT_HW_CACHE_NODE = 6,
1: +  PERF_COUNT_HW_CACHE_MAX = 7,
1:  };
1:  
1:  enum perf_hw_cache_op_id {
1: -	PERF_COUNT_HW_CACHE_OP_READ = 0,
1: -	PERF_COUNT_HW_CACHE_OP_WRITE = 1,
1: -	PERF_COUNT_HW_CACHE_OP_PREFETCH = 2,
1: -	PERF_COUNT_HW_CACHE_OP_MAX = 3,
1: +  PERF_COUNT_HW_CACHE_OP_READ = 0,
1: +  PERF_COUNT_HW_CACHE_OP_WRITE = 1,
1: +  PERF_COUNT_HW_CACHE_OP_PREFETCH = 2,
1: +  PERF_COUNT_HW_CACHE_OP_MAX = 3,
1:  };
1:  
1:  enum perf_hw_cache_op_result_id {
1: -	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0,
1: -	PERF_COUNT_HW_CACHE_RESULT_MISS = 1,
1: -	PERF_COUNT_HW_CACHE_RESULT_MAX = 2,
1: +  PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0,
1: +  PERF_COUNT_HW_CACHE_RESULT_MISS = 1,
1: +  PERF_COUNT_HW_CACHE_RESULT_MAX = 2,
1:  };
1:  
1:  enum perf_event_sample_format {
1: -	PERF_SAMPLE_IP = 1,
1: -	PERF_SAMPLE_TID = 2,
1: -	PERF_SAMPLE_TIME = 4,
1: -	PERF_SAMPLE_ADDR = 8,
1: -	PERF_SAMPLE_READ = 16,
1: -	PERF_SAMPLE_CALLCHAIN = 32,
1: -	PERF_SAMPLE_ID = 64,
1: -	PERF_SAMPLE_CPU = 128,
1: -	PERF_SAMPLE_PERIOD = 256,
1: -	PERF_SAMPLE_STREAM_ID = 512,
1: -	PERF_SAMPLE_RAW = 1024,
1: -	PERF_SAMPLE_BRANCH_STACK = 2048,
1: -	PERF_SAMPLE_REGS_USER = 4096,
1: -	PERF_SAMPLE_STACK_USER = 8192,
1: -	PERF_SAMPLE_WEIGHT = 16384,
1: -	PERF_SAMPLE_DATA_SRC = 32768,
1: -	PERF_SAMPLE_IDENTIFIER = 65536,
1: -	PERF_SAMPLE_TRANSACTION = 131072,
1: -	PERF_SAMPLE_REGS_INTR = 262144,
1: -	PERF_SAMPLE_PHYS_ADDR = 524288,
1: -	PERF_SAMPLE_AUX = 1048576,
1: -	PERF_SAMPLE_CGROUP = 2097152,
1: -	PERF_SAMPLE_MAX = 4194304,
1: -	__PERF_SAMPLE_CALLCHAIN_EARLY = 0,
1: +  PERF_SAMPLE_IP = 1,
1: +  PERF_SAMPLE_TID = 2,
1: +  PERF_SAMPLE_TIME = 4,
1: +  PERF_SAMPLE_ADDR = 8,
1: +  PERF_SAMPLE_READ = 16,
1: +  PERF_SAMPLE_CALLCHAIN = 32,
1: +  PERF_SAMPLE_ID = 64,
1: +  PERF_SAMPLE_CPU = 128,
1: +  PERF_SAMPLE_PERIOD = 256,
1: +  PERF_SAMPLE_STREAM_ID = 512,
1: +  PERF_SAMPLE_RAW = 1024,
1: +  PERF_SAMPLE_BRANCH_STACK = 2048,
1: +  PERF_SAMPLE_REGS_USER = 4096,
1: +  PERF_SAMPLE_STACK_USER = 8192,
1: +  PERF_SAMPLE_WEIGHT = 16384,
1: +  PERF_SAMPLE_DATA_SRC = 32768,
1: +  PERF_SAMPLE_IDENTIFIER = 65536,
1: +  PERF_SAMPLE_TRANSACTION = 131072,
1: +  PERF_SAMPLE_REGS_INTR = 262144,
1: +  PERF_SAMPLE_PHYS_ADDR = 524288,
1: +  PERF_SAMPLE_AUX = 1048576,
1: +  PERF_SAMPLE_CGROUP = 2097152,
1: +  PERF_SAMPLE_MAX = 4194304,
1: +  __PERF_SAMPLE_CALLCHAIN_EARLY = 0,
1:  };
1:  
1:  enum perf_branch_sample_type {
1: -	PERF_SAMPLE_BRANCH_USER = 1,
1: -	PERF_SAMPLE_BRANCH_KERNEL = 2,
1: -	PERF_SAMPLE_BRANCH_HV = 4,
1: -	PERF_SAMPLE_BRANCH_ANY = 8,
1: -	PERF_SAMPLE_BRANCH_ANY_CALL = 16,
1: -	PERF_SAMPLE_BRANCH_ANY_RETURN = 32,
1: -	PERF_SAMPLE_BRANCH_IND_CALL = 64,
1: -	PERF_SAMPLE_BRANCH_ABORT_TX = 128,
1: -	PERF_SAMPLE_BRANCH_IN_TX = 256,
1: -	PERF_SAMPLE_BRANCH_NO_TX = 512,
1: -	PERF_SAMPLE_BRANCH_COND = 1024,
1: -	PERF_SAMPLE_BRANCH_CALL_STACK = 2048,
1: -	PERF_SAMPLE_BRANCH_IND_JUMP = 4096,
1: -	PERF_SAMPLE_BRANCH_CALL = 8192,
1: -	PERF_SAMPLE_BRANCH_NO_FLAGS = 16384,
1: -	PERF_SAMPLE_BRANCH_NO_CYCLES = 32768,
1: -	PERF_SAMPLE_BRANCH_TYPE_SAVE = 65536,
1: -	PERF_SAMPLE_BRANCH_HW_INDEX = 131072,
1: -	PERF_SAMPLE_BRANCH_MAX = 262144,
1: +  PERF_SAMPLE_BRANCH_USER = 1,
1: +  PERF_SAMPLE_BRANCH_KERNEL = 2,
1: +  PERF_SAMPLE_BRANCH_HV = 4,
1: +  PERF_SAMPLE_BRANCH_ANY = 8,
1: +  PERF_SAMPLE_BRANCH_ANY_CALL = 16,
1: +  PERF_SAMPLE_BRANCH_ANY_RETURN = 32,
1: +  PERF_SAMPLE_BRANCH_IND_CALL = 64,
1: +  PERF_SAMPLE_BRANCH_ABORT_TX = 128,
1: +  PERF_SAMPLE_BRANCH_IN_TX = 256,
1: +  PERF_SAMPLE_BRANCH_NO_TX = 512,
1: +  PERF_SAMPLE_BRANCH_COND = 1024,
1: +  PERF_SAMPLE_BRANCH_CALL_STACK = 2048,
1: +  PERF_SAMPLE_BRANCH_IND_JUMP = 4096,
1: +  PERF_SAMPLE_BRANCH_CALL = 8192,
1: +  PERF_SAMPLE_BRANCH_NO_FLAGS = 16384,
1: +  PERF_SAMPLE_BRANCH_NO_CYCLES = 32768,
1: +  PERF_SAMPLE_BRANCH_TYPE_SAVE = 65536,
1: +  PERF_SAMPLE_BRANCH_HW_INDEX = 131072,
1: +  PERF_SAMPLE_BRANCH_MAX = 262144,
1:  };
1:  
1:  struct perf_event_mmap_page {
1: -	__u32 version;
1: -	__u32 compat_version;
1: -	__u32 lock;
1: -	__u32 index;
1: -	__s64 offset;
1: -	__u64 time_enabled;
1: -	__u64 time_running;
1: -	union {
1: -		__u64 capabilities;
1: -		struct {
1: -			__u64 cap_bit0: 1;
1: -			__u64 cap_bit0_is_deprecated: 1;
1: -			__u64 cap_user_rdpmc: 1;
1: -			__u64 cap_user_time: 1;
1: -			__u64 cap_user_time_zero: 1;
1: -			__u64 cap_user_time_short: 1;
1: -			__u64 cap_____res: 58;
1: -		};
1: -	};
1: -	__u16 pmc_width;
1: -	__u16 time_shift;
1: -	__u32 time_mult;
1: -	__u64 time_offset;
1: -	__u64 time_zero;
1: -	__u32 size;
1: -	__u32 __reserved_1;
1: -	__u64 time_cycles;
1: -	__u64 time_mask;
1: -	__u8 __reserved[928];
1: -	__u64 data_head;
1: -	__u64 data_tail;
1: -	__u64 data_offset;
1: -	__u64 data_size;
1: -	__u64 aux_head;
1: -	__u64 aux_tail;
1: -	__u64 aux_offset;
1: -	__u64 aux_size;
1: +  __u32 version;
1: +  __u32 compat_version;
1: +  __u32 lock;
1: +  __u32 index;
1: +  __s64 offset;
1: +  __u64 time_enabled;
1: +  __u64 time_running;
1: +  union {
1: +    __u64 capabilities;
1: +    struct {
1: +      __u64 cap_bit0 : 1;
1: +      __u64 cap_bit0_is_deprecated : 1;
1: +      __u64 cap_user_rdpmc : 1;
1: +      __u64 cap_user_time : 1;
1: +      __u64 cap_user_time_zero : 1;
1: +      __u64 cap_user_time_short : 1;
1: +      __u64 cap_____res : 58;
1: +    };
1: +  };
1: +  __u16 pmc_width;
1: +  __u16 time_shift;
1: +  __u32 time_mult;
1: +  __u64 time_offset;
1: +  __u64 time_zero;
1: +  __u32 size;
1: +  __u32 __reserved_1;
1: +  __u64 time_cycles;
1: +  __u64 time_mask;
1: +  __u8 __reserved[928];
1: +  __u64 data_head;
1: +  __u64 data_tail;
1: +  __u64 data_offset;
1: +  __u64 data_size;
1: +  __u64 aux_head;
1: +  __u64 aux_tail;
1: +  __u64 aux_offset;
1: +  __u64 aux_size;
1:  };
1:  
1:  struct ldt_struct {
1: -	struct desc_struct *entries;
1: -	unsigned int nr_entries;
1: -	int slot;
1: +  struct desc_struct *entries;
1: +  unsigned int nr_entries;
1: +  int slot;
1:  };
1:  
1:  struct physid_mask {
1: -	long unsigned int mask[512];
1: +  long unsigned int mask[512];
1:  };
1:  
1:  typedef struct physid_mask physid_mask_t;
1:  
1:  struct x86_pmu_capability {
1: -	int version;
1: -	int num_counters_gp;
1: -	int num_counters_fixed;
1: -	int bit_width_gp;
1: -	int bit_width_fixed;
1: -	unsigned int events_mask;
1: -	int events_mask_len;
1: +  int version;
1: +  int num_counters_gp;
1: +  int num_counters_fixed;
1: +  int bit_width_gp;
1: +  int bit_width_fixed;
1: +  unsigned int events_mask;
1: +  int events_mask_len;
1:  };
1:  
1:  struct debug_store {
1: -	u64 bts_buffer_base;
1: -	u64 bts_index;
1: -	u64 bts_absolute_maximum;
1: -	u64 bts_interrupt_threshold;
1: -	u64 pebs_buffer_base;
1: -	u64 pebs_index;
1: -	u64 pebs_absolute_maximum;
1: -	u64 pebs_interrupt_threshold;
1: -	u64 pebs_event_reset[12];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u64 bts_buffer_base;
1: +  u64 bts_index;
1: +  u64 bts_absolute_maximum;
1: +  u64 bts_interrupt_threshold;
1: +  u64 pebs_buffer_base;
1: +  u64 pebs_index;
1: +  u64 pebs_absolute_maximum;
1: +  u64 pebs_interrupt_threshold;
1: +  u64 pebs_event_reset[12];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum stack_type {
1: -	STACK_TYPE_UNKNOWN = 0,
1: -	STACK_TYPE_TASK = 1,
1: -	STACK_TYPE_IRQ = 2,
1: -	STACK_TYPE_SOFTIRQ = 3,
1: -	STACK_TYPE_ENTRY = 4,
1: -	STACK_TYPE_EXCEPTION = 5,
1: -	STACK_TYPE_EXCEPTION_LAST = 10,
1: +  STACK_TYPE_UNKNOWN = 0,
1: +  STACK_TYPE_TASK = 1,
1: +  STACK_TYPE_IRQ = 2,
1: +  STACK_TYPE_SOFTIRQ = 3,
1: +  STACK_TYPE_ENTRY = 4,
1: +  STACK_TYPE_EXCEPTION = 5,
1: +  STACK_TYPE_EXCEPTION_LAST = 10,
1:  };
1:  
1:  struct stack_info {
1: -	enum stack_type type;
1: -	long unsigned int *begin;
1: -	long unsigned int *end;
1: -	long unsigned int *next_sp;
1: +  enum stack_type type;
1: +  long unsigned int *begin;
1: +  long unsigned int *end;
1: +  long unsigned int *next_sp;
1:  };
1:  
1:  struct stack_frame {
1: -	struct stack_frame *next_frame;
1: -	long unsigned int return_address;
1: +  struct stack_frame *next_frame;
1: +  long unsigned int return_address;
1:  };
1:  
1:  struct stack_frame_ia32 {
1: -	u32 next_frame;
1: -	u32 return_address;
1: +  u32 next_frame;
1: +  u32 return_address;
1:  };
1:  
1:  struct perf_guest_switch_msr {
1: -	unsigned int msr;
1: -	u64 host;
1: -	u64 guest;
1: +  unsigned int msr;
1: +  u64 host;
1: +  u64 guest;
1:  };
1:  
1:  struct perf_guest_info_callbacks {
1: -	int (*is_in_guest)();
1: -	int (*is_user_mode)();
1: -	long unsigned int (*get_guest_ip)();
1: -	void (*handle_intel_pt_intr)();
1: +  int (*is_in_guest)();
1: +  int (*is_user_mode)();
1: +  long unsigned int (*get_guest_ip)();
1: +  void (*handle_intel_pt_intr)();
1:  };
1:  
1:  struct device_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct device *, struct device_attribute *, char *);
1: -	ssize_t (*store)(struct device *, struct device_attribute *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct device *, struct device_attribute *, char *);
1: +  ssize_t (*store)(struct device *, struct device_attribute *, const char *,
1: +                   size_t);
1:  };
1:  
1:  enum perf_event_x86_regs {
1: -	PERF_REG_X86_AX = 0,
1: -	PERF_REG_X86_BX = 1,
1: -	PERF_REG_X86_CX = 2,
1: -	PERF_REG_X86_DX = 3,
1: -	PERF_REG_X86_SI = 4,
1: -	PERF_REG_X86_DI = 5,
1: -	PERF_REG_X86_BP = 6,
1: -	PERF_REG_X86_SP = 7,
1: -	PERF_REG_X86_IP = 8,
1: -	PERF_REG_X86_FLAGS = 9,
1: -	PERF_REG_X86_CS = 10,
1: -	PERF_REG_X86_SS = 11,
1: -	PERF_REG_X86_DS = 12,
1: -	PERF_REG_X86_ES = 13,
1: -	PERF_REG_X86_FS = 14,
1: -	PERF_REG_X86_GS = 15,
1: -	PERF_REG_X86_R8 = 16,
1: -	PERF_REG_X86_R9 = 17,
1: -	PERF_REG_X86_R10 = 18,
1: -	PERF_REG_X86_R11 = 19,
1: -	PERF_REG_X86_R12 = 20,
1: -	PERF_REG_X86_R13 = 21,
1: -	PERF_REG_X86_R14 = 22,
1: -	PERF_REG_X86_R15 = 23,
1: -	PERF_REG_X86_32_MAX = 16,
1: -	PERF_REG_X86_64_MAX = 24,
1: -	PERF_REG_X86_XMM0 = 32,
1: -	PERF_REG_X86_XMM1 = 34,
1: -	PERF_REG_X86_XMM2 = 36,
1: -	PERF_REG_X86_XMM3 = 38,
1: -	PERF_REG_X86_XMM4 = 40,
1: -	PERF_REG_X86_XMM5 = 42,
1: -	PERF_REG_X86_XMM6 = 44,
1: -	PERF_REG_X86_XMM7 = 46,
1: -	PERF_REG_X86_XMM8 = 48,
1: -	PERF_REG_X86_XMM9 = 50,
1: -	PERF_REG_X86_XMM10 = 52,
1: -	PERF_REG_X86_XMM11 = 54,
1: -	PERF_REG_X86_XMM12 = 56,
1: -	PERF_REG_X86_XMM13 = 58,
1: -	PERF_REG_X86_XMM14 = 60,
1: -	PERF_REG_X86_XMM15 = 62,
1: -	PERF_REG_X86_XMM_MAX = 64,
1: +  PERF_REG_X86_AX = 0,
1: +  PERF_REG_X86_BX = 1,
1: +  PERF_REG_X86_CX = 2,
1: +  PERF_REG_X86_DX = 3,
1: +  PERF_REG_X86_SI = 4,
1: +  PERF_REG_X86_DI = 5,
1: +  PERF_REG_X86_BP = 6,
1: +  PERF_REG_X86_SP = 7,
1: +  PERF_REG_X86_IP = 8,
1: +  PERF_REG_X86_FLAGS = 9,
1: +  PERF_REG_X86_CS = 10,
1: +  PERF_REG_X86_SS = 11,
1: +  PERF_REG_X86_DS = 12,
1: +  PERF_REG_X86_ES = 13,
1: +  PERF_REG_X86_FS = 14,
1: +  PERF_REG_X86_GS = 15,
1: +  PERF_REG_X86_R8 = 16,
1: +  PERF_REG_X86_R9 = 17,
1: +  PERF_REG_X86_R10 = 18,
1: +  PERF_REG_X86_R11 = 19,
1: +  PERF_REG_X86_R12 = 20,
1: +  PERF_REG_X86_R13 = 21,
1: +  PERF_REG_X86_R14 = 22,
1: +  PERF_REG_X86_R15 = 23,
1: +  PERF_REG_X86_32_MAX = 16,
1: +  PERF_REG_X86_64_MAX = 24,
1: +  PERF_REG_X86_XMM0 = 32,
1: +  PERF_REG_X86_XMM1 = 34,
1: +  PERF_REG_X86_XMM2 = 36,
1: +  PERF_REG_X86_XMM3 = 38,
1: +  PERF_REG_X86_XMM4 = 40,
1: +  PERF_REG_X86_XMM5 = 42,
1: +  PERF_REG_X86_XMM6 = 44,
1: +  PERF_REG_X86_XMM7 = 46,
1: +  PERF_REG_X86_XMM8 = 48,
1: +  PERF_REG_X86_XMM9 = 50,
1: +  PERF_REG_X86_XMM10 = 52,
1: +  PERF_REG_X86_XMM11 = 54,
1: +  PERF_REG_X86_XMM12 = 56,
1: +  PERF_REG_X86_XMM13 = 58,
1: +  PERF_REG_X86_XMM14 = 60,
1: +  PERF_REG_X86_XMM15 = 62,
1: +  PERF_REG_X86_XMM_MAX = 64,
1:  };
1:  
1:  typedef struct {
1: -	u16 __softirq_pending;
1: -	u8 kvm_cpu_l1tf_flush_l1d;
1: -	unsigned int __nmi_count;
1: -	unsigned int apic_timer_irqs;
1: -	unsigned int irq_spurious_count;
1: -	unsigned int icr_read_retry_count;
1: -	unsigned int kvm_posted_intr_ipis;
1: -	unsigned int kvm_posted_intr_wakeup_ipis;
1: -	unsigned int kvm_posted_intr_nested_ipis;
1: -	unsigned int x86_platform_ipis;
1: -	unsigned int apic_perf_irqs;
1: -	unsigned int apic_irq_work_irqs;
1: -	unsigned int irq_resched_count;
1: -	unsigned int irq_call_count;
1: -	unsigned int irq_tlb_count;
1: -	unsigned int irq_thermal_count;
1: -	unsigned int irq_threshold_count;
1: -	unsigned int irq_deferred_error_count;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u16 __softirq_pending;
1: +  u8 kvm_cpu_l1tf_flush_l1d;
1: +  unsigned int __nmi_count;
1: +  unsigned int apic_timer_irqs;
1: +  unsigned int irq_spurious_count;
1: +  unsigned int icr_read_retry_count;
1: +  unsigned int kvm_posted_intr_ipis;
1: +  unsigned int kvm_posted_intr_wakeup_ipis;
1: +  unsigned int kvm_posted_intr_nested_ipis;
1: +  unsigned int x86_platform_ipis;
1: +  unsigned int apic_perf_irqs;
1: +  unsigned int apic_irq_work_irqs;
1: +  unsigned int irq_resched_count;
1: +  unsigned int irq_call_count;
1: +  unsigned int irq_tlb_count;
1: +  unsigned int irq_thermal_count;
1: +  unsigned int irq_threshold_count;
1: +  unsigned int irq_deferred_error_count;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  } irq_cpustat_t;
1:  
1:  struct perf_callchain_entry_ctx {
1: -	struct perf_callchain_entry *entry;
1: -	u32 max_stack;
1: -	u32 nr;
1: -	short int contexts;
1: -	bool contexts_maxed;
1: +  struct perf_callchain_entry *entry;
1: +  u32 max_stack;
1: +  u32 nr;
1: +  short int contexts;
1: +  bool contexts_maxed;
1:  };
1:  
1:  struct perf_pmu_events_attr {
1: -	struct device_attribute attr;
1: -	u64 id;
1: -	const char *event_str;
1: +  struct device_attribute attr;
1: +  u64 id;
1: +  const char *event_str;
1:  };
1:  
1:  struct perf_pmu_events_ht_attr {
1: -	struct device_attribute attr;
1: -	u64 id;
1: -	const char *event_str_ht;
1: -	const char *event_str_noht;
1: +  struct device_attribute attr;
1: +  u64 id;
1: +  const char *event_str_ht;
1: +  const char *event_str_noht;
1:  };
1:  
1:  struct apic {
1: -	void (*eoi_write)(u32, u32);
1: -	void (*native_eoi_write)(u32, u32);
1: -	void (*write)(u32, u32);
1: -	u32 (*read)(u32);
1: -	void (*wait_icr_idle)();
1: -	u32 (*safe_wait_icr_idle)();
1: -	void (*send_IPI)(int, int);
1: -	void (*send_IPI_mask)(const struct cpumask *, int);
1: -	void (*send_IPI_mask_allbutself)(const struct cpumask *, int);
1: -	void (*send_IPI_allbutself)(int);
1: -	void (*send_IPI_all)(int);
1: -	void (*send_IPI_self)(int);
1: -	u32 dest_logical;
1: -	u32 disable_esr;
1: -	u32 irq_delivery_mode;
1: -	u32 irq_dest_mode;
1: -	u32 (*calc_dest_apicid)(unsigned int);
1: -	u64 (*icr_read)();
1: -	void (*icr_write)(u32, u32);
1: -	int (*probe)();
1: -	int (*acpi_madt_oem_check)(char *, char *);
1: -	int (*apic_id_valid)(u32);
1: -	int (*apic_id_registered)();
1: -	bool (*check_apicid_used)(physid_mask_t *, int);
1: -	void (*init_apic_ldr)();
1: -	void (*ioapic_phys_id_map)(physid_mask_t *, physid_mask_t *);
1: -	void (*setup_apic_routing)();
1: -	int (*cpu_present_to_apicid)(int);
1: -	void (*apicid_to_cpu_present)(int, physid_mask_t *);
1: -	int (*check_phys_apicid_present)(int);
1: -	int (*phys_pkg_id)(int, int);
1: -	u32 (*get_apic_id)(long unsigned int);
1: -	u32 (*set_apic_id)(unsigned int);
1: -	int (*wakeup_secondary_cpu)(int, long unsigned int);
1: -	void (*inquire_remote_apic)(int);
1: -	char *name;
1: -};
1: -
1: -enum {
1: -	NMI_LOCAL = 0,
1: -	NMI_UNKNOWN = 1,
1: -	NMI_SERR = 2,
1: -	NMI_IO_CHECK = 3,
1: -	NMI_MAX = 4,
1: +  void (*eoi_write)(u32, u32);
1: +  void (*native_eoi_write)(u32, u32);
1: +  void (*write)(u32, u32);
1: +  u32 (*read)(u32);
1: +  void (*wait_icr_idle)();
1: +  u32 (*safe_wait_icr_idle)();
1: +  void (*send_IPI)(int, int);
1: +  void (*send_IPI_mask)(const struct cpumask *, int);
1: +  void (*send_IPI_mask_allbutself)(const struct cpumask *, int);
1: +  void (*send_IPI_allbutself)(int);
1: +  void (*send_IPI_all)(int);
1: +  void (*send_IPI_self)(int);
1: +  u32 dest_logical;
1: +  u32 disable_esr;
1: +  u32 irq_delivery_mode;
1: +  u32 irq_dest_mode;
1: +  u32 (*calc_dest_apicid)(unsigned int);
1: +  u64 (*icr_read)();
1: +  void (*icr_write)(u32, u32);
1: +  int (*probe)();
1: +  int (*acpi_madt_oem_check)(char *, char *);
1: +  int (*apic_id_valid)(u32);
1: +  int (*apic_id_registered)();
1: +  bool (*check_apicid_used)(physid_mask_t *, int);
1: +  void (*init_apic_ldr)();
1: +  void (*ioapic_phys_id_map)(physid_mask_t *, physid_mask_t *);
1: +  void (*setup_apic_routing)();
1: +  int (*cpu_present_to_apicid)(int);
1: +  void (*apicid_to_cpu_present)(int, physid_mask_t *);
1: +  int (*check_phys_apicid_present)(int);
1: +  int (*phys_pkg_id)(int, int);
1: +  u32 (*get_apic_id)(long unsigned int);
1: +  u32 (*set_apic_id)(unsigned int);
1: +  int (*wakeup_secondary_cpu)(int, long unsigned int);
1: +  void (*inquire_remote_apic)(int);
1: +  char *name;
1: +};
1: +
1: +enum {
1: +  NMI_LOCAL = 0,
1: +  NMI_UNKNOWN = 1,
1: +  NMI_SERR = 2,
1: +  NMI_IO_CHECK = 3,
1: +  NMI_MAX = 4,
1:  };
1:  
1:  typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
1:  
1:  struct nmiaction {
1: -	struct list_head list;
1: -	nmi_handler_t handler;
1: -	u64 max_duration;
1: -	long unsigned int flags;
1: -	const char *name;
1: +  struct list_head list;
1: +  nmi_handler_t handler;
1: +  u64 max_duration;
1: +  long unsigned int flags;
1: +  const char *name;
1:  };
1:  
1:  struct gdt_page {
1: -	struct desc_struct gdt[16];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct desc_struct gdt[16];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct cyc2ns_data {
1: -	u32 cyc2ns_mul;
1: -	u32 cyc2ns_shift;
1: -	u64 cyc2ns_offset;
1: +  u32 cyc2ns_mul;
1: +  u32 cyc2ns_shift;
1: +  u64 cyc2ns_offset;
1:  };
1:  
1:  struct unwind_state {
1: -	struct stack_info stack_info;
1: -	long unsigned int stack_mask;
1: -	struct task_struct *task;
1: -	int graph_idx;
1: -	bool error;
1: -	bool signal;
1: -	bool full_regs;
1: -	long unsigned int sp;
1: -	long unsigned int bp;
1: -	long unsigned int ip;
1: -	struct pt_regs *regs;
1: -	struct pt_regs *prev_regs;
1: +  struct stack_info stack_info;
1: +  long unsigned int stack_mask;
1: +  struct task_struct *task;
1: +  int graph_idx;
1: +  bool error;
1: +  bool signal;
1: +  bool full_regs;
1: +  long unsigned int sp;
1: +  long unsigned int bp;
1: +  long unsigned int ip;
1: +  struct pt_regs *regs;
1: +  struct pt_regs *prev_regs;
1:  };
1:  
1:  enum extra_reg_type {
1: -	EXTRA_REG_NONE = 4294967295,
1: -	EXTRA_REG_RSP_0 = 0,
1: -	EXTRA_REG_RSP_1 = 1,
1: -	EXTRA_REG_LBR = 2,
1: -	EXTRA_REG_LDLAT = 3,
1: -	EXTRA_REG_FE = 4,
1: -	EXTRA_REG_MAX = 5,
1: +  EXTRA_REG_NONE = 4294967295,
1: +  EXTRA_REG_RSP_0 = 0,
1: +  EXTRA_REG_RSP_1 = 1,
1: +  EXTRA_REG_LBR = 2,
1: +  EXTRA_REG_LDLAT = 3,
1: +  EXTRA_REG_FE = 4,
1: +  EXTRA_REG_MAX = 5,
1:  };
1:  
1:  struct event_constraint {
1: -	union {
1: -		long unsigned int idxmsk[1];
1: -		u64 idxmsk64;
1: -	};
1: -	u64 code;
1: -	u64 cmask;
1: -	int weight;
1: -	int overlap;
1: -	int flags;
1: -	unsigned int size;
1: +  union {
1: +    long unsigned int idxmsk[1];
1: +    u64 idxmsk64;
1: +  };
1: +  u64 code;
1: +  u64 cmask;
1: +  int weight;
1: +  int overlap;
1: +  int flags;
1: +  unsigned int size;
1:  };
1:  
1:  struct amd_nb {
1: -	int nb_id;
1: -	int refcnt;
1: -	struct perf_event *owners[64];
1: -	struct event_constraint event_constraints[64];
1: +  int nb_id;
1: +  int refcnt;
1: +  struct perf_event *owners[64];
1: +  struct event_constraint event_constraints[64];
1:  };
1:  
1:  struct er_account {
1: -	raw_spinlock_t lock;
1: -	u64 config;
1: -	u64 reg;
1: -	atomic_t ref;
1: +  raw_spinlock_t lock;
1: +  u64 config;
1: +  u64 reg;
1: +  atomic_t ref;
1:  };
1:  
1:  struct intel_shared_regs {
1: -	struct er_account regs[5];
1: -	int refcnt;
1: -	unsigned int core_id;
1: +  struct er_account regs[5];
1: +  int refcnt;
1: +  unsigned int core_id;
1:  };
1:  
1:  enum intel_excl_state_type {
1: -	INTEL_EXCL_UNUSED = 0,
1: -	INTEL_EXCL_SHARED = 1,
1: -	INTEL_EXCL_EXCLUSIVE = 2,
1: +  INTEL_EXCL_UNUSED = 0,
1: +  INTEL_EXCL_SHARED = 1,
1: +  INTEL_EXCL_EXCLUSIVE = 2,
1:  };
1:  
1:  struct intel_excl_states {
1: -	enum intel_excl_state_type state[64];
1: -	bool sched_started;
1: +  enum intel_excl_state_type state[64];
1: +  bool sched_started;
1:  };
1:  
1:  struct intel_excl_cntrs {
1: -	raw_spinlock_t lock;
1: -	struct intel_excl_states states[2];
1: -	union {
1: -		u16 has_exclusive[2];
1: -		u32 exclusive_present;
1: -	};
1: -	int refcnt;
1: -	unsigned int core_id;
1: +  raw_spinlock_t lock;
1: +  struct intel_excl_states states[2];
1: +  union {
1: +    u16 has_exclusive[2];
1: +    u32 exclusive_present;
1: +  };
1: +  int refcnt;
1: +  unsigned int core_id;
1:  };
1:  
1:  enum {
1: -	X86_PERF_KFREE_SHARED = 0,
1: -	X86_PERF_KFREE_EXCL = 1,
1: -	X86_PERF_KFREE_MAX = 2,
1: +  X86_PERF_KFREE_SHARED = 0,
1: +  X86_PERF_KFREE_EXCL = 1,
1: +  X86_PERF_KFREE_MAX = 2,
1:  };
1:  
1:  struct cpu_hw_events {
1: -	struct perf_event *events[64];
1: -	long unsigned int active_mask[1];
1: -	long unsigned int running[1];
1: -	int enabled;
1: -	int n_events;
1: -	int n_added;
1: -	int n_txn;
1: -	int n_txn_pair;
1: -	int n_txn_metric;
1: -	int assign[64];
1: -	u64 tags[64];
1: -	struct perf_event *event_list[64];
1: -	struct event_constraint *event_constraint[64];
1: -	int n_excl;
1: -	unsigned int txn_flags;
1: -	int is_fake;
1: -	struct debug_store *ds;
1: -	void *ds_pebs_vaddr;
1: -	void *ds_bts_vaddr;
1: -	u64 pebs_enabled;
1: -	int n_pebs;
1: -	int n_large_pebs;
1: -	int n_pebs_via_pt;
1: -	int pebs_output;
1: -	u64 pebs_data_cfg;
1: -	u64 active_pebs_data_cfg;
1: -	int pebs_record_size;
1: -	int lbr_users;
1: -	int lbr_pebs_users;
1: -	struct perf_branch_stack lbr_stack;
1: -	struct perf_branch_entry lbr_entries[32];
1: -	union {
1: -		struct er_account *lbr_sel;
1: -		struct er_account *lbr_ctl;
1: -	};
1: -	u64 br_sel;
1: -	void *last_task_ctx;
1: -	int last_log_id;
1: -	int lbr_select;
1: -	void *lbr_xsave;
1: -	u64 intel_ctrl_guest_mask;
1: -	u64 intel_ctrl_host_mask;
1: -	struct perf_guest_switch_msr guest_switch_msrs[64];
1: -	u64 intel_cp_status;
1: -	struct intel_shared_regs *shared_regs;
1: -	struct event_constraint *constraint_list;
1: -	struct intel_excl_cntrs *excl_cntrs;
1: -	int excl_thread_id;
1: -	u64 tfa_shadow;
1: -	int n_metric;
1: -	struct amd_nb *amd_nb;
1: -	u64 perf_ctr_virt_mask;
1: -	int n_pair;
1: -	void *kfree_on_online[2];
1: +  struct perf_event *events[64];
1: +  long unsigned int active_mask[1];
1: +  long unsigned int running[1];
1: +  int enabled;
1: +  int n_events;
1: +  int n_added;
1: +  int n_txn;
1: +  int n_txn_pair;
1: +  int n_txn_metric;
1: +  int assign[64];
1: +  u64 tags[64];
1: +  struct perf_event *event_list[64];
1: +  struct event_constraint *event_constraint[64];
1: +  int n_excl;
1: +  unsigned int txn_flags;
1: +  int is_fake;
1: +  struct debug_store *ds;
1: +  void *ds_pebs_vaddr;
1: +  void *ds_bts_vaddr;
1: +  u64 pebs_enabled;
1: +  int n_pebs;
1: +  int n_large_pebs;
1: +  int n_pebs_via_pt;
1: +  int pebs_output;
1: +  u64 pebs_data_cfg;
1: +  u64 active_pebs_data_cfg;
1: +  int pebs_record_size;
1: +  int lbr_users;
1: +  int lbr_pebs_users;
1: +  struct perf_branch_stack lbr_stack;
1: +  struct perf_branch_entry lbr_entries[32];
1: +  union {
1: +    struct er_account *lbr_sel;
1: +    struct er_account *lbr_ctl;
1: +  };
1: +  u64 br_sel;
1: +  void *last_task_ctx;
1: +  int last_log_id;
1: +  int lbr_select;
1: +  void *lbr_xsave;
1: +  u64 intel_ctrl_guest_mask;
1: +  u64 intel_ctrl_host_mask;
1: +  struct perf_guest_switch_msr guest_switch_msrs[64];
1: +  u64 intel_cp_status;
1: +  struct intel_shared_regs *shared_regs;
1: +  struct event_constraint *constraint_list;
1: +  struct intel_excl_cntrs *excl_cntrs;
1: +  int excl_thread_id;
1: +  u64 tfa_shadow;
1: +  int n_metric;
1: +  struct amd_nb *amd_nb;
1: +  u64 perf_ctr_virt_mask;
1: +  int n_pair;
1: +  void *kfree_on_online[2];
1:  };
1:  
1:  struct extra_reg {
1: -	unsigned int event;
1: -	unsigned int msr;
1: -	u64 config_mask;
1: -	u64 valid_mask;
1: -	int idx;
1: -	bool extra_msr_access;
1: +  unsigned int event;
1: +  unsigned int msr;
1: +  u64 config_mask;
1: +  u64 valid_mask;
1: +  int idx;
1: +  bool extra_msr_access;
1:  };
1:  
1:  union perf_capabilities {
1: -	struct {
1: -		u64 lbr_format: 6;
1: -		u64 pebs_trap: 1;
1: -		u64 pebs_arch_reg: 1;
1: -		u64 pebs_format: 4;
1: -		u64 smm_freeze: 1;
1: -		u64 full_width_write: 1;
1: -		u64 pebs_baseline: 1;
1: -		u64 perf_metrics: 1;
1: -		u64 pebs_output_pt_available: 1;
1: -	};
1: -	u64 capabilities;
1: +  struct {
1: +    u64 lbr_format : 6;
1: +    u64 pebs_trap : 1;
1: +    u64 pebs_arch_reg : 1;
1: +    u64 pebs_format : 4;
1: +    u64 smm_freeze : 1;
1: +    u64 full_width_write : 1;
1: +    u64 pebs_baseline : 1;
1: +    u64 perf_metrics : 1;
1: +    u64 pebs_output_pt_available : 1;
1: +  };
1: +  u64 capabilities;
1:  };
1:  
1:  struct x86_pmu_quirk {
1: -	struct x86_pmu_quirk *next;
1: -	void (*func)();
1: +  struct x86_pmu_quirk *next;
1: +  void (*func)();
1:  };
1:  
1:  enum {
1: -	x86_lbr_exclusive_lbr = 0,
1: -	x86_lbr_exclusive_bts = 1,
1: -	x86_lbr_exclusive_pt = 2,
1: -	x86_lbr_exclusive_max = 3,
1: +  x86_lbr_exclusive_lbr = 0,
1: +  x86_lbr_exclusive_bts = 1,
1: +  x86_lbr_exclusive_pt = 2,
1: +  x86_lbr_exclusive_max = 3,
1:  };
1:  
1:  struct x86_pmu {
1: -	const char *name;
1: -	int version;
1: -	int (*handle_irq)(struct pt_regs *);
1: -	void (*disable_all)();
1: -	void (*enable_all)(int);
1: -	void (*enable)(struct perf_event *);
1: -	void (*disable)(struct perf_event *);
1: -	void (*add)(struct perf_event *);
1: -	void (*del)(struct perf_event *);
1: -	void (*read)(struct perf_event *);
1: -	int (*hw_config)(struct perf_event *);
1: -	int (*schedule_events)(struct cpu_hw_events *, int, int *);
1: -	unsigned int eventsel;
1: -	unsigned int perfctr;
1: -	int (*addr_offset)(int, bool);
1: -	int (*rdpmc_index)(int);
1: -	u64 (*event_map)(int);
1: -	int max_events;
1: -	int num_counters;
1: -	int num_counters_fixed;
1: -	int cntval_bits;
1: -	u64 cntval_mask;
1: -	union {
1: -		long unsigned int events_maskl;
1: -		long unsigned int events_mask[1];
1: -	};
1: -	int events_mask_len;
1: -	int apic;
1: -	u64 max_period;
1: -	struct event_constraint * (*get_event_constraints)(struct cpu_hw_events *, int, struct perf_event *);
1: -	void (*put_event_constraints)(struct cpu_hw_events *, struct perf_event *);
1: -	void (*start_scheduling)(struct cpu_hw_events *);
1: -	void (*commit_scheduling)(struct cpu_hw_events *, int, int);
1: -	void (*stop_scheduling)(struct cpu_hw_events *);
1: -	struct event_constraint *event_constraints;
1: -	struct x86_pmu_quirk *quirks;
1: -	int perfctr_second_write;
1: -	u64 (*limit_period)(struct perf_event *, u64);
1: -	unsigned int late_ack: 1;
1: -	unsigned int enabled_ack: 1;
1: -	unsigned int counter_freezing: 1;
1: -	int attr_rdpmc_broken;
1: -	int attr_rdpmc;
1: -	struct attribute **format_attrs;
1: -	ssize_t (*events_sysfs_show)(char *, u64);
1: -	const struct attribute_group **attr_update;
1: -	long unsigned int attr_freeze_on_smi;
1: -	int (*cpu_prepare)(int);
1: -	void (*cpu_starting)(int);
1: -	void (*cpu_dying)(int);
1: -	void (*cpu_dead)(int);
1: -	void (*check_microcode)();
1: -	void (*sched_task)(struct perf_event_context *, bool);
1: -	u64 intel_ctrl;
1: -	union perf_capabilities intel_cap;
1: -	unsigned int bts: 1;
1: -	unsigned int bts_active: 1;
1: -	unsigned int pebs: 1;
1: -	unsigned int pebs_active: 1;
1: -	unsigned int pebs_broken: 1;
1: -	unsigned int pebs_prec_dist: 1;
1: -	unsigned int pebs_no_tlb: 1;
1: -	unsigned int pebs_no_isolation: 1;
1: -	int pebs_record_size;
1: -	int pebs_buffer_size;
1: -	int max_pebs_events;
1: -	void (*drain_pebs)(struct pt_regs *);
1: -	struct event_constraint *pebs_constraints;
1: -	void (*pebs_aliases)(struct perf_event *);
1: -	long unsigned int large_pebs_flags;
1: -	u64 rtm_abort_event;
1: -	unsigned int lbr_tos;
1: -	unsigned int lbr_from;
1: -	unsigned int lbr_to;
1: -	unsigned int lbr_info;
1: -	unsigned int lbr_nr;
1: -	union {
1: -		u64 lbr_sel_mask;
1: -		u64 lbr_ctl_mask;
1: -	};
1: -	union {
1: -		const int *lbr_sel_map;
1: -		int *lbr_ctl_map;
1: -	};
1: -	bool lbr_double_abort;
1: -	bool lbr_pt_coexist;
1: -	unsigned int lbr_depth_mask: 8;
1: -	unsigned int lbr_deep_c_reset: 1;
1: -	unsigned int lbr_lip: 1;
1: -	unsigned int lbr_cpl: 1;
1: -	unsigned int lbr_filter: 1;
1: -	unsigned int lbr_call_stack: 1;
1: -	unsigned int lbr_mispred: 1;
1: -	unsigned int lbr_timed_lbr: 1;
1: -	unsigned int lbr_br_type: 1;
1: -	void (*lbr_reset)();
1: -	void (*lbr_read)(struct cpu_hw_events *);
1: -	void (*lbr_save)(void *);
1: -	void (*lbr_restore)(void *);
1: -	atomic_t lbr_exclusive[3];
1: -	u64 (*update_topdown_event)(struct perf_event *);
1: -	int (*set_topdown_event_period)(struct perf_event *);
1: -	void (*swap_task_ctx)(struct perf_event_context *, struct perf_event_context *);
1: -	unsigned int amd_nb_constraints: 1;
1: -	u64 perf_ctr_pair_en;
1: -	struct extra_reg *extra_regs;
1: -	unsigned int flags;
1: -	struct perf_guest_switch_msr * (*guest_get_msrs)(int *);
1: -	int (*check_period)(struct perf_event *, u64);
1: -	int (*aux_output_match)(struct perf_event *);
1: +  const char *name;
1: +  int version;
1: +  int (*handle_irq)(struct pt_regs *);
1: +  void (*disable_all)();
1: +  void (*enable_all)(int);
1: +  void (*enable)(struct perf_event *);
1: +  void (*disable)(struct perf_event *);
1: +  void (*add)(struct perf_event *);
1: +  void (*del)(struct perf_event *);
1: +  void (*read)(struct perf_event *);
1: +  int (*hw_config)(struct perf_event *);
1: +  int (*schedule_events)(struct cpu_hw_events *, int, int *);
1: +  unsigned int eventsel;
1: +  unsigned int perfctr;
1: +  int (*addr_offset)(int, bool);
1: +  int (*rdpmc_index)(int);
1: +  u64 (*event_map)(int);
1: +  int max_events;
1: +  int num_counters;
1: +  int num_counters_fixed;
1: +  int cntval_bits;
1: +  u64 cntval_mask;
1: +  union {
1: +    long unsigned int events_maskl;
1: +    long unsigned int events_mask[1];
1: +  };
1: +  int events_mask_len;
1: +  int apic;
1: +  u64 max_period;
1: +  struct event_constraint *(*get_event_constraints)(struct cpu_hw_events *, int,
1: +                                                    struct perf_event *);
1: +  void (*put_event_constraints)(struct cpu_hw_events *, struct perf_event *);
1: +  void (*start_scheduling)(struct cpu_hw_events *);
1: +  void (*commit_scheduling)(struct cpu_hw_events *, int, int);
1: +  void (*stop_scheduling)(struct cpu_hw_events *);
1: +  struct event_constraint *event_constraints;
1: +  struct x86_pmu_quirk *quirks;
1: +  int perfctr_second_write;
1: +  u64 (*limit_period)(struct perf_event *, u64);
1: +  unsigned int late_ack : 1;
1: +  unsigned int enabled_ack : 1;
1: +  unsigned int counter_freezing : 1;
1: +  int attr_rdpmc_broken;
1: +  int attr_rdpmc;
1: +  struct attribute **format_attrs;
1: +  ssize_t (*events_sysfs_show)(char *, u64);
1: +  const struct attribute_group **attr_update;
1: +  long unsigned int attr_freeze_on_smi;
1: +  int (*cpu_prepare)(int);
1: +  void (*cpu_starting)(int);
1: +  void (*cpu_dying)(int);
1: +  void (*cpu_dead)(int);
1: +  void (*check_microcode)();
1: +  void (*sched_task)(struct perf_event_context *, bool);
1: +  u64 intel_ctrl;
1: +  union perf_capabilities intel_cap;
1: +  unsigned int bts : 1;
1: +  unsigned int bts_active : 1;
1: +  unsigned int pebs : 1;
1: +  unsigned int pebs_active : 1;
1: +  unsigned int pebs_broken : 1;
1: +  unsigned int pebs_prec_dist : 1;
1: +  unsigned int pebs_no_tlb : 1;
1: +  unsigned int pebs_no_isolation : 1;
1: +  int pebs_record_size;
1: +  int pebs_buffer_size;
1: +  int max_pebs_events;
1: +  void (*drain_pebs)(struct pt_regs *);
1: +  struct event_constraint *pebs_constraints;
1: +  void (*pebs_aliases)(struct perf_event *);
1: +  long unsigned int large_pebs_flags;
1: +  u64 rtm_abort_event;
1: +  unsigned int lbr_tos;
1: +  unsigned int lbr_from;
1: +  unsigned int lbr_to;
1: +  unsigned int lbr_info;
1: +  unsigned int lbr_nr;
1: +  union {
1: +    u64 lbr_sel_mask;
1: +    u64 lbr_ctl_mask;
1: +  };
1: +  union {
1: +    const int *lbr_sel_map;
1: +    int *lbr_ctl_map;
1: +  };
1: +  bool lbr_double_abort;
1: +  bool lbr_pt_coexist;
1: +  unsigned int lbr_depth_mask : 8;
1: +  unsigned int lbr_deep_c_reset : 1;
1: +  unsigned int lbr_lip : 1;
1: +  unsigned int lbr_cpl : 1;
1: +  unsigned int lbr_filter : 1;
1: +  unsigned int lbr_call_stack : 1;
1: +  unsigned int lbr_mispred : 1;
1: +  unsigned int lbr_timed_lbr : 1;
1: +  unsigned int lbr_br_type : 1;
1: +  void (*lbr_reset)();
1: +  void (*lbr_read)(struct cpu_hw_events *);
1: +  void (*lbr_save)(void *);
1: +  void (*lbr_restore)(void *);
1: +  atomic_t lbr_exclusive[3];
1: +  u64 (*update_topdown_event)(struct perf_event *);
1: +  int (*set_topdown_event_period)(struct perf_event *);
1: +  void (*swap_task_ctx)(struct perf_event_context *,
1: +                        struct perf_event_context *);
1: +  unsigned int amd_nb_constraints : 1;
1: +  u64 perf_ctr_pair_en;
1: +  struct extra_reg *extra_regs;
1: +  unsigned int flags;
1: +  struct perf_guest_switch_msr *(*guest_get_msrs)(int *);
1: +  int (*check_period)(struct perf_event *, u64);
1: +  int (*aux_output_match)(struct perf_event *);
1:  };
1:  
1:  struct sched_state {
1: -	int weight;
1: -	int event;
1: -	int counter;
1: -	int unassigned;
1: -	int nr_gp;
1: -	u64 used;
1: +  int weight;
1: +  int event;
1: +  int counter;
1: +  int unassigned;
1: +  int nr_gp;
1: +  u64 used;
1:  };
1:  
1:  struct perf_sched {
1: -	int max_weight;
1: -	int max_events;
1: -	int max_gp;
1: -	int saved_states;
1: -	struct event_constraint **constraints;
1: -	struct sched_state state;
1: -	struct sched_state saved[2];
1: +  int max_weight;
1: +  int max_events;
1: +  int max_gp;
1: +  int saved_states;
1: +  struct event_constraint **constraints;
1: +  struct sched_state state;
1: +  struct sched_state saved[2];
1:  };
1:  
1:  struct perf_msr {
1: -	u64 msr;
1: -	struct attribute_group *grp;
1: -	bool (*test)(int, void *);
1: -	bool no_check;
1: +  u64 msr;
1: +  struct attribute_group *grp;
1: +  bool (*test)(int, void *);
1: +  bool no_check;
1:  };
1:  
1:  struct kobj_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct kobject *, struct kobj_attribute *, char *);
1: -	ssize_t (*store)(struct kobject *, struct kobj_attribute *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct kobject *, struct kobj_attribute *, char *);
1: +  ssize_t (*store)(struct kobject *, struct kobj_attribute *, const char *,
1: +                   size_t);
1:  };
1:  
1:  struct amd_uncore {
1: -	int id;
1: -	int refcnt;
1: -	int cpu;
1: -	int num_counters;
1: -	int rdpmc_base;
1: -	u32 msr_base;
1: -	cpumask_t *active_mask;
1: -	struct pmu *pmu;
1: -	struct perf_event *events[6];
1: -	struct hlist_node node;
1: +  int id;
1: +  int refcnt;
1: +  int cpu;
1: +  int num_counters;
1: +  int rdpmc_base;
1: +  u32 msr_base;
1: +  cpumask_t *active_mask;
1: +  struct pmu *pmu;
1: +  struct perf_event *events[6];
1: +  struct hlist_node node;
1:  };
1:  
1:  typedef int pci_power_t;
1: @@ -15870,138 +16025,138 @@ struct pci_vpd;
1:  struct pci_sriov;
1:  
1:  struct pci_dev {
1: -	struct list_head bus_list;
1: -	struct pci_bus *bus;
1: -	struct pci_bus *subordinate;
1: -	void *sysdata;
1: -	struct proc_dir_entry *procent;
1: -	struct pci_slot *slot;
1: -	unsigned int devfn;
1: -	short unsigned int vendor;
1: -	short unsigned int device;
1: -	short unsigned int subsystem_vendor;
1: -	short unsigned int subsystem_device;
1: -	unsigned int class;
1: -	u8 revision;
1: -	u8 hdr_type;
1: -	u8 pcie_cap;
1: -	u8 msi_cap;
1: -	u8 msix_cap;
1: -	u8 pcie_mpss: 3;
1: -	u8 rom_base_reg;
1: -	u8 pin;
1: -	u16 pcie_flags_reg;
1: -	long unsigned int *dma_alias_mask;
1: -	struct pci_driver *driver;
1: -	u64 dma_mask;
1: -	struct device_dma_parameters dma_parms;
1: -	pci_power_t current_state;
1: -	unsigned int imm_ready: 1;
1: -	u8 pm_cap;
1: -	unsigned int pme_support: 5;
1: -	unsigned int pme_poll: 1;
1: -	unsigned int d1_support: 1;
1: -	unsigned int d2_support: 1;
1: -	unsigned int no_d1d2: 1;
1: -	unsigned int no_d3cold: 1;
1: -	unsigned int bridge_d3: 1;
1: -	unsigned int d3cold_allowed: 1;
1: -	unsigned int mmio_always_on: 1;
1: -	unsigned int wakeup_prepared: 1;
1: -	unsigned int runtime_d3cold: 1;
1: -	unsigned int skip_bus_pm: 1;
1: -	unsigned int ignore_hotplug: 1;
1: -	unsigned int hotplug_user_indicators: 1;
1: -	unsigned int clear_retrain_link: 1;
1: -	unsigned int d3hot_delay;
1: -	unsigned int d3cold_delay;
1: -	struct pcie_link_state *link_state;
1: -	unsigned int ltr_path: 1;
1: -	int l1ss;
1: -	unsigned int eetlp_prefix_path: 1;
1: -	pci_channel_state_t error_state;
1: -	struct device dev;
1: -	int cfg_size;
1: -	unsigned int irq;
1: -	struct resource resource[17];
1: -	bool match_driver;
1: -	unsigned int transparent: 1;
1: -	unsigned int io_window: 1;
1: -	unsigned int pref_window: 1;
1: -	unsigned int pref_64_window: 1;
1: -	unsigned int multifunction: 1;
1: -	unsigned int is_busmaster: 1;
1: -	unsigned int no_msi: 1;
1: -	unsigned int no_64bit_msi: 1;
1: -	unsigned int block_cfg_access: 1;
1: -	unsigned int broken_parity_status: 1;
1: -	unsigned int irq_reroute_variant: 2;
1: -	unsigned int msi_enabled: 1;
1: -	unsigned int msix_enabled: 1;
1: -	unsigned int ari_enabled: 1;
1: -	unsigned int ats_enabled: 1;
1: -	unsigned int pasid_enabled: 1;
1: -	unsigned int pri_enabled: 1;
1: -	unsigned int is_managed: 1;
1: -	unsigned int needs_freset: 1;
1: -	unsigned int state_saved: 1;
1: -	unsigned int is_physfn: 1;
1: -	unsigned int is_virtfn: 1;
1: -	unsigned int reset_fn: 1;
1: -	unsigned int is_hotplug_bridge: 1;
1: -	unsigned int shpc_managed: 1;
1: -	unsigned int is_thunderbolt: 1;
1: -	unsigned int untrusted: 1;
1: -	unsigned int external_facing: 1;
1: -	unsigned int broken_intx_masking: 1;
1: -	unsigned int io_window_1k: 1;
1: -	unsigned int irq_managed: 1;
1: -	unsigned int non_compliant_bars: 1;
1: -	unsigned int is_probed: 1;
1: -	unsigned int link_active_reporting: 1;
1: -	unsigned int no_vf_scan: 1;
1: -	unsigned int no_command_memory: 1;
1: -	pci_dev_flags_t dev_flags;
1: -	atomic_t enable_cnt;
1: -	u32 saved_config_space[16];
1: -	struct hlist_head saved_cap_space;
1: -	struct bin_attribute *rom_attr;
1: -	int rom_attr_enabled;
1: -	struct bin_attribute *res_attr[17];
1: -	struct bin_attribute *res_attr_wc[17];
1: -	const struct attribute_group **msi_irq_groups;
1: -	struct pci_vpd *vpd;
1: -	union {
1: -		struct pci_sriov *sriov;
1: -		struct pci_dev *physfn;
1: -	};
1: -	u16 ats_cap;
1: -	u8 ats_stu;
1: -	u16 acs_cap;
1: -	phys_addr_t rom;
1: -	size_t romlen;
1: -	char *driver_override;
1: -	long unsigned int priv_flags;
1: +  struct list_head bus_list;
1: +  struct pci_bus *bus;
1: +  struct pci_bus *subordinate;
1: +  void *sysdata;
1: +  struct proc_dir_entry *procent;
1: +  struct pci_slot *slot;
1: +  unsigned int devfn;
1: +  short unsigned int vendor;
1: +  short unsigned int device;
1: +  short unsigned int subsystem_vendor;
1: +  short unsigned int subsystem_device;
1: +  unsigned int class;
1: +  u8 revision;
1: +  u8 hdr_type;
1: +  u8 pcie_cap;
1: +  u8 msi_cap;
1: +  u8 msix_cap;
1: +  u8 pcie_mpss : 3;
1: +  u8 rom_base_reg;
1: +  u8 pin;
1: +  u16 pcie_flags_reg;
1: +  long unsigned int *dma_alias_mask;
1: +  struct pci_driver *driver;
1: +  u64 dma_mask;
1: +  struct device_dma_parameters dma_parms;
1: +  pci_power_t current_state;
1: +  unsigned int imm_ready : 1;
1: +  u8 pm_cap;
1: +  unsigned int pme_support : 5;
1: +  unsigned int pme_poll : 1;
1: +  unsigned int d1_support : 1;
1: +  unsigned int d2_support : 1;
1: +  unsigned int no_d1d2 : 1;
1: +  unsigned int no_d3cold : 1;
1: +  unsigned int bridge_d3 : 1;
1: +  unsigned int d3cold_allowed : 1;
1: +  unsigned int mmio_always_on : 1;
1: +  unsigned int wakeup_prepared : 1;
1: +  unsigned int runtime_d3cold : 1;
1: +  unsigned int skip_bus_pm : 1;
1: +  unsigned int ignore_hotplug : 1;
1: +  unsigned int hotplug_user_indicators : 1;
1: +  unsigned int clear_retrain_link : 1;
1: +  unsigned int d3hot_delay;
1: +  unsigned int d3cold_delay;
1: +  struct pcie_link_state *link_state;
1: +  unsigned int ltr_path : 1;
1: +  int l1ss;
1: +  unsigned int eetlp_prefix_path : 1;
1: +  pci_channel_state_t error_state;
1: +  struct device dev;
1: +  int cfg_size;
1: +  unsigned int irq;
1: +  struct resource resource[17];
1: +  bool match_driver;
1: +  unsigned int transparent : 1;
1: +  unsigned int io_window : 1;
1: +  unsigned int pref_window : 1;
1: +  unsigned int pref_64_window : 1;
1: +  unsigned int multifunction : 1;
1: +  unsigned int is_busmaster : 1;
1: +  unsigned int no_msi : 1;
1: +  unsigned int no_64bit_msi : 1;
1: +  unsigned int block_cfg_access : 1;
1: +  unsigned int broken_parity_status : 1;
1: +  unsigned int irq_reroute_variant : 2;
1: +  unsigned int msi_enabled : 1;
1: +  unsigned int msix_enabled : 1;
1: +  unsigned int ari_enabled : 1;
1: +  unsigned int ats_enabled : 1;
1: +  unsigned int pasid_enabled : 1;
1: +  unsigned int pri_enabled : 1;
1: +  unsigned int is_managed : 1;
1: +  unsigned int needs_freset : 1;
1: +  unsigned int state_saved : 1;
1: +  unsigned int is_physfn : 1;
1: +  unsigned int is_virtfn : 1;
1: +  unsigned int reset_fn : 1;
1: +  unsigned int is_hotplug_bridge : 1;
1: +  unsigned int shpc_managed : 1;
1: +  unsigned int is_thunderbolt : 1;
1: +  unsigned int untrusted : 1;
1: +  unsigned int external_facing : 1;
1: +  unsigned int broken_intx_masking : 1;
1: +  unsigned int io_window_1k : 1;
1: +  unsigned int irq_managed : 1;
1: +  unsigned int non_compliant_bars : 1;
1: +  unsigned int is_probed : 1;
1: +  unsigned int link_active_reporting : 1;
1: +  unsigned int no_vf_scan : 1;
1: +  unsigned int no_command_memory : 1;
1: +  pci_dev_flags_t dev_flags;
1: +  atomic_t enable_cnt;
1: +  u32 saved_config_space[16];
1: +  struct hlist_head saved_cap_space;
1: +  struct bin_attribute *rom_attr;
1: +  int rom_attr_enabled;
1: +  struct bin_attribute *res_attr[17];
1: +  struct bin_attribute *res_attr_wc[17];
1: +  const struct attribute_group **msi_irq_groups;
1: +  struct pci_vpd *vpd;
1: +  union {
1: +    struct pci_sriov *sriov;
1: +    struct pci_dev *physfn;
1: +  };
1: +  u16 ats_cap;
1: +  u8 ats_stu;
1: +  u16 acs_cap;
1: +  phys_addr_t rom;
1: +  size_t romlen;
1: +  char *driver_override;
1: +  long unsigned int priv_flags;
1:  };
1:  
1:  struct pci_device_id {
1: -	__u32 vendor;
1: -	__u32 device;
1: -	__u32 subvendor;
1: -	__u32 subdevice;
1: -	__u32 class;
1: -	__u32 class_mask;
1: -	kernel_ulong_t driver_data;
1: +  __u32 vendor;
1: +  __u32 device;
1: +  __u32 subvendor;
1: +  __u32 subdevice;
1: +  __u32 class;
1: +  __u32 class_mask;
1: +  kernel_ulong_t driver_data;
1:  };
1:  
1:  struct hotplug_slot;
1:  
1:  struct pci_slot {
1: -	struct pci_bus *bus;
1: -	struct list_head list;
1: -	struct hotplug_slot *hotplug;
1: -	unsigned char number;
1: -	struct kobject kobj;
1: +  struct pci_bus *bus;
1: +  struct list_head list;
1: +  struct hotplug_slot *hotplug;
1: +  unsigned char number;
1: +  struct kobject kobj;
1:  };
1:  
1:  typedef short unsigned int pci_bus_flags_t;
1: @@ -16011,1366 +16166,1366 @@ struct pci_ops;
1:  struct msi_controller;
1:  
1:  struct pci_bus {
1: -	struct list_head node;
1: -	struct pci_bus *parent;
1: -	struct list_head children;
1: -	struct list_head devices;
1: -	struct pci_dev *self;
1: -	struct list_head slots;
1: -	struct resource *resource[4];
1: -	struct list_head resources;
1: -	struct resource busn_res;
1: -	struct pci_ops *ops;
1: -	struct msi_controller *msi;
1: -	void *sysdata;
1: -	struct proc_dir_entry *procdir;
1: -	unsigned char number;
1: -	unsigned char primary;
1: -	unsigned char max_bus_speed;
1: -	unsigned char cur_bus_speed;
1: -	char name[48];
1: -	short unsigned int bridge_ctl;
1: -	pci_bus_flags_t bus_flags;
1: -	struct device *bridge;
1: -	struct device dev;
1: -	struct bin_attribute *legacy_io;
1: -	struct bin_attribute *legacy_mem;
1: -	unsigned int is_added: 1;
1: -};
1: -
1: -enum {
1: -	PCI_STD_RESOURCES = 0,
1: -	PCI_STD_RESOURCE_END = 5,
1: -	PCI_ROM_RESOURCE = 6,
1: -	PCI_IOV_RESOURCES = 7,
1: -	PCI_IOV_RESOURCE_END = 12,
1: -	PCI_BRIDGE_RESOURCES = 13,
1: -	PCI_BRIDGE_RESOURCE_END = 16,
1: -	PCI_NUM_RESOURCES = 17,
1: -	DEVICE_COUNT_RESOURCE = 17,
1: +  struct list_head node;
1: +  struct pci_bus *parent;
1: +  struct list_head children;
1: +  struct list_head devices;
1: +  struct pci_dev *self;
1: +  struct list_head slots;
1: +  struct resource *resource[4];
1: +  struct list_head resources;
1: +  struct resource busn_res;
1: +  struct pci_ops *ops;
1: +  struct msi_controller *msi;
1: +  void *sysdata;
1: +  struct proc_dir_entry *procdir;
1: +  unsigned char number;
1: +  unsigned char primary;
1: +  unsigned char max_bus_speed;
1: +  unsigned char cur_bus_speed;
1: +  char name[48];
1: +  short unsigned int bridge_ctl;
1: +  pci_bus_flags_t bus_flags;
1: +  struct device *bridge;
1: +  struct device dev;
1: +  struct bin_attribute *legacy_io;
1: +  struct bin_attribute *legacy_mem;
1: +  unsigned int is_added : 1;
1: +};
1: +
1: +enum {
1: +  PCI_STD_RESOURCES = 0,
1: +  PCI_STD_RESOURCE_END = 5,
1: +  PCI_ROM_RESOURCE = 6,
1: +  PCI_IOV_RESOURCES = 7,
1: +  PCI_IOV_RESOURCE_END = 12,
1: +  PCI_BRIDGE_RESOURCES = 13,
1: +  PCI_BRIDGE_RESOURCE_END = 16,
1: +  PCI_NUM_RESOURCES = 17,
1: +  DEVICE_COUNT_RESOURCE = 17,
1:  };
1:  
1:  typedef unsigned int pcie_reset_state_t;
1:  
1:  struct pci_dynids {
1: -	spinlock_t lock;
1: -	struct list_head list;
1: +  spinlock_t lock;
1: +  struct list_head list;
1:  };
1:  
1:  struct pci_error_handlers;
1:  
1:  struct pci_driver {
1: -	struct list_head node;
1: -	const char *name;
1: -	const struct pci_device_id *id_table;
1: -	int (*probe)(struct pci_dev *, const struct pci_device_id *);
1: -	void (*remove)(struct pci_dev *);
1: -	int (*suspend)(struct pci_dev *, pm_message_t);
1: -	int (*resume)(struct pci_dev *);
1: -	void (*shutdown)(struct pci_dev *);
1: -	int (*sriov_configure)(struct pci_dev *, int);
1: -	const struct pci_error_handlers *err_handler;
1: -	const struct attribute_group **groups;
1: -	struct device_driver driver;
1: -	struct pci_dynids dynids;
1: +  struct list_head node;
1: +  const char *name;
1: +  const struct pci_device_id *id_table;
1: +  int (*probe)(struct pci_dev *, const struct pci_device_id *);
1: +  void (*remove)(struct pci_dev *);
1: +  int (*suspend)(struct pci_dev *, pm_message_t);
1: +  int (*resume)(struct pci_dev *);
1: +  void (*shutdown)(struct pci_dev *);
1: +  int (*sriov_configure)(struct pci_dev *, int);
1: +  const struct pci_error_handlers *err_handler;
1: +  const struct attribute_group **groups;
1: +  struct device_driver driver;
1: +  struct pci_dynids dynids;
1:  };
1:  
1:  struct pci_ops {
1: -	int (*add_bus)(struct pci_bus *);
1: -	void (*remove_bus)(struct pci_bus *);
1: -	void * (*map_bus)(struct pci_bus *, unsigned int, int);
1: -	int (*read)(struct pci_bus *, unsigned int, int, int, u32 *);
1: -	int (*write)(struct pci_bus *, unsigned int, int, int, u32);
1: +  int (*add_bus)(struct pci_bus *);
1: +  void (*remove_bus)(struct pci_bus *);
1: +  void *(*map_bus)(struct pci_bus *, unsigned int, int);
1: +  int (*read)(struct pci_bus *, unsigned int, int, int, u32 *);
1: +  int (*write)(struct pci_bus *, unsigned int, int, int, u32);
1:  };
1:  
1:  typedef unsigned int pci_ers_result_t;
1:  
1:  struct pci_error_handlers {
1: -	pci_ers_result_t (*error_detected)(struct pci_dev *, pci_channel_state_t);
1: -	pci_ers_result_t (*mmio_enabled)(struct pci_dev *);
1: -	pci_ers_result_t (*slot_reset)(struct pci_dev *);
1: -	void (*reset_prepare)(struct pci_dev *);
1: -	void (*reset_done)(struct pci_dev *);
1: -	void (*resume)(struct pci_dev *);
1: +  pci_ers_result_t (*error_detected)(struct pci_dev *, pci_channel_state_t);
1: +  pci_ers_result_t (*mmio_enabled)(struct pci_dev *);
1: +  pci_ers_result_t (*slot_reset)(struct pci_dev *);
1: +  void (*reset_prepare)(struct pci_dev *);
1: +  void (*reset_done)(struct pci_dev *);
1: +  void (*resume)(struct pci_dev *);
1:  };
1:  
1:  struct syscore_ops {
1: -	struct list_head node;
1: -	int (*suspend)();
1: -	void (*resume)();
1: -	void (*shutdown)();
1: +  struct list_head node;
1: +  int (*suspend)();
1: +  void (*resume)();
1: +  void (*shutdown)();
1:  };
1:  
1:  enum ibs_states {
1: -	IBS_ENABLED = 0,
1: -	IBS_STARTED = 1,
1: -	IBS_STOPPING = 2,
1: -	IBS_STOPPED = 3,
1: -	IBS_MAX_STATES = 4,
1: +  IBS_ENABLED = 0,
1: +  IBS_STARTED = 1,
1: +  IBS_STOPPING = 2,
1: +  IBS_STOPPED = 3,
1: +  IBS_MAX_STATES = 4,
1:  };
1:  
1:  struct cpu_perf_ibs {
1: -	struct perf_event *event;
1: -	long unsigned int state[1];
1: +  struct perf_event *event;
1: +  long unsigned int state[1];
1:  };
1:  
1:  struct perf_ibs {
1: -	struct pmu pmu;
1: -	unsigned int msr;
1: -	u64 config_mask;
1: -	u64 cnt_mask;
1: -	u64 enable_mask;
1: -	u64 valid_mask;
1: -	u64 max_period;
1: -	long unsigned int offset_mask[1];
1: -	int offset_max;
1: -	unsigned int fetch_count_reset_broken: 1;
1: -	struct cpu_perf_ibs *pcpu;
1: -	struct attribute **format_attrs;
1: -	struct attribute_group format_group;
1: -	const struct attribute_group *attr_groups[2];
1: -	u64 (*get_count)(u64);
1: +  struct pmu pmu;
1: +  unsigned int msr;
1: +  u64 config_mask;
1: +  u64 cnt_mask;
1: +  u64 enable_mask;
1: +  u64 valid_mask;
1: +  u64 max_period;
1: +  long unsigned int offset_mask[1];
1: +  int offset_max;
1: +  unsigned int fetch_count_reset_broken : 1;
1: +  struct cpu_perf_ibs *pcpu;
1: +  struct attribute **format_attrs;
1: +  struct attribute_group format_group;
1: +  const struct attribute_group *attr_groups[2];
1: +  u64 (*get_count)(u64);
1:  };
1:  
1:  struct perf_ibs_data {
1: -	u32 size;
1: -	union {
1: -		u32 data[0];
1: -		u32 caps;
1: -	};
1: -	u64 regs[8];
1: +  u32 size;
1: +  union {
1: +    u32 data[0];
1: +    u32 caps;
1: +  };
1: +  u64 regs[8];
1:  };
1:  
1:  enum perf_msr_id {
1: -	PERF_MSR_TSC = 0,
1: -	PERF_MSR_APERF = 1,
1: -	PERF_MSR_MPERF = 2,
1: -	PERF_MSR_PPERF = 3,
1: -	PERF_MSR_SMI = 4,
1: -	PERF_MSR_PTSC = 5,
1: -	PERF_MSR_IRPERF = 6,
1: -	PERF_MSR_THERM = 7,
1: -	PERF_MSR_EVENT_MAX = 8,
1: +  PERF_MSR_TSC = 0,
1: +  PERF_MSR_APERF = 1,
1: +  PERF_MSR_MPERF = 2,
1: +  PERF_MSR_PPERF = 3,
1: +  PERF_MSR_SMI = 4,
1: +  PERF_MSR_PTSC = 5,
1: +  PERF_MSR_IRPERF = 6,
1: +  PERF_MSR_THERM = 7,
1: +  PERF_MSR_EVENT_MAX = 8,
1:  };
1:  
1:  enum lockdep_wait_type {
1: -	LD_WAIT_INV = 0,
1: -	LD_WAIT_FREE = 1,
1: -	LD_WAIT_SPIN = 2,
1: -	LD_WAIT_CONFIG = 2,
1: -	LD_WAIT_SLEEP = 3,
1: -	LD_WAIT_MAX = 4,
1: +  LD_WAIT_INV = 0,
1: +  LD_WAIT_FREE = 1,
1: +  LD_WAIT_SPIN = 2,
1: +  LD_WAIT_CONFIG = 2,
1: +  LD_WAIT_SLEEP = 3,
1: +  LD_WAIT_MAX = 4,
1:  };
1:  
1:  struct x86_cpu_desc {
1: -	u8 x86_family;
1: -	u8 x86_vendor;
1: -	u8 x86_model;
1: -	u8 x86_stepping;
1: -	u32 x86_microcode_rev;
1: +  u8 x86_family;
1: +  u8 x86_vendor;
1: +  u8 x86_model;
1: +  u8 x86_stepping;
1: +  u32 x86_microcode_rev;
1:  };
1:  
1:  union cpuid10_eax {
1: -	struct {
1: -		unsigned int version_id: 8;
1: -		unsigned int num_counters: 8;
1: -		unsigned int bit_width: 8;
1: -		unsigned int mask_length: 8;
1: -	} split;
1: -	unsigned int full;
1: +  struct {
1: +    unsigned int version_id : 8;
1: +    unsigned int num_counters : 8;
1: +    unsigned int bit_width : 8;
1: +    unsigned int mask_length : 8;
1: +  } split;
1: +  unsigned int full;
1:  };
1:  
1:  union cpuid10_ebx {
1: -	struct {
1: -		unsigned int no_unhalted_core_cycles: 1;
1: -		unsigned int no_instructions_retired: 1;
1: -		unsigned int no_unhalted_reference_cycles: 1;
1: -		unsigned int no_llc_reference: 1;
1: -		unsigned int no_llc_misses: 1;
1: -		unsigned int no_branch_instruction_retired: 1;
1: -		unsigned int no_branch_misses_retired: 1;
1: -	} split;
1: -	unsigned int full;
1: +  struct {
1: +    unsigned int no_unhalted_core_cycles : 1;
1: +    unsigned int no_instructions_retired : 1;
1: +    unsigned int no_unhalted_reference_cycles : 1;
1: +    unsigned int no_llc_reference : 1;
1: +    unsigned int no_llc_misses : 1;
1: +    unsigned int no_branch_instruction_retired : 1;
1: +    unsigned int no_branch_misses_retired : 1;
1: +  } split;
1: +  unsigned int full;
1:  };
1:  
1:  union cpuid10_edx {
1: -	struct {
1: -		unsigned int num_counters_fixed: 5;
1: -		unsigned int bit_width_fixed: 8;
1: -		unsigned int reserved: 19;
1: -	} split;
1: -	unsigned int full;
1: +  struct {
1: +    unsigned int num_counters_fixed : 5;
1: +    unsigned int bit_width_fixed : 8;
1: +    unsigned int reserved : 19;
1: +  } split;
1: +  unsigned int full;
1:  };
1:  
1:  enum {
1: -	LBR_FORMAT_32 = 0,
1: -	LBR_FORMAT_LIP = 1,
1: -	LBR_FORMAT_EIP = 2,
1: -	LBR_FORMAT_EIP_FLAGS = 3,
1: -	LBR_FORMAT_EIP_FLAGS2 = 4,
1: -	LBR_FORMAT_INFO = 5,
1: -	LBR_FORMAT_TIME = 6,
1: -	LBR_FORMAT_MAX_KNOWN = 6,
1: +  LBR_FORMAT_32 = 0,
1: +  LBR_FORMAT_LIP = 1,
1: +  LBR_FORMAT_EIP = 2,
1: +  LBR_FORMAT_EIP_FLAGS = 3,
1: +  LBR_FORMAT_EIP_FLAGS2 = 4,
1: +  LBR_FORMAT_INFO = 5,
1: +  LBR_FORMAT_TIME = 6,
1: +  LBR_FORMAT_MAX_KNOWN = 6,
1:  };
1:  
1:  union x86_pmu_config {
1: -	struct {
1: -		u64 event: 8;
1: -		u64 umask: 8;
1: -		u64 usr: 1;
1: -		u64 os: 1;
1: -		u64 edge: 1;
1: -		u64 pc: 1;
1: -		u64 interrupt: 1;
1: -		u64 __reserved1: 1;
1: -		u64 en: 1;
1: -		u64 inv: 1;
1: -		u64 cmask: 8;
1: -		u64 event2: 4;
1: -		u64 __reserved2: 4;
1: -		u64 go: 1;
1: -		u64 ho: 1;
1: -	} bits;
1: -	u64 value;
1: +  struct {
1: +    u64 event : 8;
1: +    u64 umask : 8;
1: +    u64 usr : 1;
1: +    u64 os : 1;
1: +    u64 edge : 1;
1: +    u64 pc : 1;
1: +    u64 interrupt : 1;
1: +    u64 __reserved1 : 1;
1: +    u64 en : 1;
1: +    u64 inv : 1;
1: +    u64 cmask : 8;
1: +    u64 event2 : 4;
1: +    u64 __reserved2 : 4;
1: +    u64 go : 1;
1: +    u64 ho : 1;
1: +  } bits;
1: +  u64 value;
1:  };
1:  
1:  enum pageflags {
1: -	PG_locked = 0,
1: -	PG_referenced = 1,
1: -	PG_uptodate = 2,
1: -	PG_dirty = 3,
1: -	PG_lru = 4,
1: -	PG_active = 5,
1: -	PG_workingset = 6,
1: -	PG_waiters = 7,
1: -	PG_error = 8,
1: -	PG_slab = 9,
1: -	PG_owner_priv_1 = 10,
1: -	PG_arch_1 = 11,
1: -	PG_reserved = 12,
1: -	PG_private = 13,
1: -	PG_private_2 = 14,
1: -	PG_writeback = 15,
1: -	PG_head = 16,
1: -	PG_mappedtodisk = 17,
1: -	PG_reclaim = 18,
1: -	PG_swapbacked = 19,
1: -	PG_unevictable = 20,
1: -	PG_mlocked = 21,
1: -	PG_uncached = 22,
1: -	PG_hwpoison = 23,
1: -	PG_arch_2 = 24,
1: -	__NR_PAGEFLAGS = 25,
1: -	PG_checked = 10,
1: -	PG_swapcache = 10,
1: -	PG_fscache = 14,
1: -	PG_pinned = 10,
1: -	PG_savepinned = 3,
1: -	PG_foreign = 10,
1: -	PG_xen_remapped = 10,
1: -	PG_slob_free = 13,
1: -	PG_double_map = 6,
1: -	PG_isolated = 18,
1: -	PG_reported = 2,
1: +  PG_locked = 0,
1: +  PG_referenced = 1,
1: +  PG_uptodate = 2,
1: +  PG_dirty = 3,
1: +  PG_lru = 4,
1: +  PG_active = 5,
1: +  PG_workingset = 6,
1: +  PG_waiters = 7,
1: +  PG_error = 8,
1: +  PG_slab = 9,
1: +  PG_owner_priv_1 = 10,
1: +  PG_arch_1 = 11,
1: +  PG_reserved = 12,
1: +  PG_private = 13,
1: +  PG_private_2 = 14,
1: +  PG_writeback = 15,
1: +  PG_head = 16,
1: +  PG_mappedtodisk = 17,
1: +  PG_reclaim = 18,
1: +  PG_swapbacked = 19,
1: +  PG_unevictable = 20,
1: +  PG_mlocked = 21,
1: +  PG_uncached = 22,
1: +  PG_hwpoison = 23,
1: +  PG_arch_2 = 24,
1: +  __NR_PAGEFLAGS = 25,
1: +  PG_checked = 10,
1: +  PG_swapcache = 10,
1: +  PG_fscache = 14,
1: +  PG_pinned = 10,
1: +  PG_savepinned = 3,
1: +  PG_foreign = 10,
1: +  PG_xen_remapped = 10,
1: +  PG_slob_free = 13,
1: +  PG_double_map = 6,
1: +  PG_isolated = 18,
1: +  PG_reported = 2,
1:  };
1:  
1:  struct bts_ctx {
1: -	struct perf_output_handle handle;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct debug_store ds_back;
1: -	int state;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -};
1: -
1: -enum {
1: -	BTS_STATE_STOPPED = 0,
1: -	BTS_STATE_INACTIVE = 1,
1: -	BTS_STATE_ACTIVE = 2,
1: +  struct perf_output_handle handle;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct debug_store ds_back;
1: +  int state;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +};
1: +
1: +enum {
1: +  BTS_STATE_STOPPED = 0,
1: +  BTS_STATE_INACTIVE = 1,
1: +  BTS_STATE_ACTIVE = 2,
1:  };
1:  
1:  struct bts_phys {
1: -	struct page *page;
1: -	long unsigned int size;
1: -	long unsigned int offset;
1: -	long unsigned int displacement;
1: +  struct page *page;
1: +  long unsigned int size;
1: +  long unsigned int offset;
1: +  long unsigned int displacement;
1:  };
1:  
1:  struct bts_buffer {
1: -	size_t real_size;
1: -	unsigned int nr_pages;
1: -	unsigned int nr_bufs;
1: -	unsigned int cur_buf;
1: -	bool snapshot;
1: -	local_t data_size;
1: -	local_t head;
1: -	long unsigned int end;
1: -	void **data_pages;
1: -	struct bts_phys buf[0];
1: +  size_t real_size;
1: +  unsigned int nr_pages;
1: +  unsigned int nr_bufs;
1: +  unsigned int cur_buf;
1: +  bool snapshot;
1: +  local_t data_size;
1: +  local_t head;
1: +  long unsigned int end;
1: +  void **data_pages;
1: +  struct bts_phys buf[0];
1:  };
1:  
1:  struct lbr_entry {
1: -	u64 from;
1: -	u64 to;
1: -	u64 info;
1: +  u64 from;
1: +  u64 to;
1: +  u64 info;
1:  };
1:  
1:  struct pebs_basic {
1: -	u64 format_size;
1: -	u64 ip;
1: -	u64 applicable_counters;
1: -	u64 tsc;
1: +  u64 format_size;
1: +  u64 ip;
1: +  u64 applicable_counters;
1: +  u64 tsc;
1:  };
1:  
1:  struct pebs_meminfo {
1: -	u64 address;
1: -	u64 aux;
1: -	u64 latency;
1: -	u64 tsx_tuning;
1: +  u64 address;
1: +  u64 aux;
1: +  u64 latency;
1: +  u64 tsx_tuning;
1:  };
1:  
1:  struct pebs_gprs {
1: -	u64 flags;
1: -	u64 ip;
1: -	u64 ax;
1: -	u64 cx;
1: -	u64 dx;
1: -	u64 bx;
1: -	u64 sp;
1: -	u64 bp;
1: -	u64 si;
1: -	u64 di;
1: -	u64 r8;
1: -	u64 r9;
1: -	u64 r10;
1: -	u64 r11;
1: -	u64 r12;
1: -	u64 r13;
1: -	u64 r14;
1: -	u64 r15;
1: +  u64 flags;
1: +  u64 ip;
1: +  u64 ax;
1: +  u64 cx;
1: +  u64 dx;
1: +  u64 bx;
1: +  u64 sp;
1: +  u64 bp;
1: +  u64 si;
1: +  u64 di;
1: +  u64 r8;
1: +  u64 r9;
1: +  u64 r10;
1: +  u64 r11;
1: +  u64 r12;
1: +  u64 r13;
1: +  u64 r14;
1: +  u64 r15;
1:  };
1:  
1:  struct pebs_xmm {
1: -	u64 xmm[32];
1: +  u64 xmm[32];
1:  };
1:  
1:  struct x86_perf_regs {
1: -	struct pt_regs regs;
1: -	u64 *xmm_regs;
1: +  struct pt_regs regs;
1: +  u64 *xmm_regs;
1:  };
1:  
1:  typedef unsigned int insn_attr_t;
1: @@ -17380,788 +17535,788 @@ typedef unsigned char insn_byte_t;
1:  typedef int insn_value_t;
1:  
1:  struct insn_field {
1: -	union {
1: -		insn_value_t value;
1: -		insn_byte_t bytes[4];
1: -	};
1: -	unsigned char got;
1: -	unsigned char nbytes;
1: +  union {
1: +    insn_value_t value;
1: +    insn_byte_t bytes[4];
1: +  };
1: +  unsigned char got;
1: +  unsigned char nbytes;
1:  };
1:  
1:  struct insn {
1: -	struct insn_field prefixes;
1: -	struct insn_field rex_prefix;
1: -	struct insn_field vex_prefix;
1: -	struct insn_field opcode;
1: -	struct insn_field modrm;
1: -	struct insn_field sib;
1: -	struct insn_field displacement;
1: -	union {
1: -		struct insn_field immediate;
1: -		struct insn_field moffset1;
1: -		struct insn_field immediate1;
1: -	};
1: -	union {
1: -		struct insn_field moffset2;
1: -		struct insn_field immediate2;
1: -	};
1: -	int emulate_prefix_size;
1: -	insn_attr_t attr;
1: -	unsigned char opnd_bytes;
1: -	unsigned char addr_bytes;
1: -	unsigned char length;
1: -	unsigned char x86_64;
1: -	const insn_byte_t *kaddr;
1: -	const insn_byte_t *end_kaddr;
1: -	const insn_byte_t *next_byte;
1: -};
1: -
1: -enum {
1: -	PERF_TXN_ELISION = 1,
1: -	PERF_TXN_TRANSACTION = 2,
1: -	PERF_TXN_SYNC = 4,
1: -	PERF_TXN_ASYNC = 8,
1: -	PERF_TXN_RETRY = 16,
1: -	PERF_TXN_CONFLICT = 32,
1: -	PERF_TXN_CAPACITY_WRITE = 64,
1: -	PERF_TXN_CAPACITY_READ = 128,
1: -	PERF_TXN_MAX = 256,
1: -	PERF_TXN_ABORT_MASK = 0,
1: -	PERF_TXN_ABORT_SHIFT = 32,
1: +  struct insn_field prefixes;
1: +  struct insn_field rex_prefix;
1: +  struct insn_field vex_prefix;
1: +  struct insn_field opcode;
1: +  struct insn_field modrm;
1: +  struct insn_field sib;
1: +  struct insn_field displacement;
1: +  union {
1: +    struct insn_field immediate;
1: +    struct insn_field moffset1;
1: +    struct insn_field immediate1;
1: +  };
1: +  union {
1: +    struct insn_field moffset2;
1: +    struct insn_field immediate2;
1: +  };
1: +  int emulate_prefix_size;
1: +  insn_attr_t attr;
1: +  unsigned char opnd_bytes;
1: +  unsigned char addr_bytes;
1: +  unsigned char length;
1: +  unsigned char x86_64;
1: +  const insn_byte_t *kaddr;
1: +  const insn_byte_t *end_kaddr;
1: +  const insn_byte_t *next_byte;
1: +};
1: +
1: +enum {
1: +  PERF_TXN_ELISION = 1,
1: +  PERF_TXN_TRANSACTION = 2,
1: +  PERF_TXN_SYNC = 4,
1: +  PERF_TXN_ASYNC = 8,
1: +  PERF_TXN_RETRY = 16,
1: +  PERF_TXN_CONFLICT = 32,
1: +  PERF_TXN_CAPACITY_WRITE = 64,
1: +  PERF_TXN_CAPACITY_READ = 128,
1: +  PERF_TXN_MAX = 256,
1: +  PERF_TXN_ABORT_MASK = 0,
1: +  PERF_TXN_ABORT_SHIFT = 32,
1:  };
1:  
1:  struct perf_event_header {
1: -	__u32 type;
1: -	__u16 misc;
1: -	__u16 size;
1: +  __u32 type;
1: +  __u16 misc;
1: +  __u16 size;
1:  };
1:  
1:  union intel_x86_pebs_dse {
1: -	u64 val;
1: -	struct {
1: -		unsigned int ld_dse: 4;
1: -		unsigned int ld_stlb_miss: 1;
1: -		unsigned int ld_locked: 1;
1: -		unsigned int ld_reserved: 26;
1: -	};
1: -	struct {
1: -		unsigned int st_l1d_hit: 1;
1: -		unsigned int st_reserved1: 3;
1: -		unsigned int st_stlb_miss: 1;
1: -		unsigned int st_locked: 1;
1: -		unsigned int st_reserved2: 26;
1: -	};
1: +  u64 val;
1: +  struct {
1: +    unsigned int ld_dse : 4;
1: +    unsigned int ld_stlb_miss : 1;
1: +    unsigned int ld_locked : 1;
1: +    unsigned int ld_reserved : 26;
1: +  };
1: +  struct {
1: +    unsigned int st_l1d_hit : 1;
1: +    unsigned int st_reserved1 : 3;
1: +    unsigned int st_stlb_miss : 1;
1: +    unsigned int st_locked : 1;
1: +    unsigned int st_reserved2 : 26;
1: +  };
1:  };
1:  
1:  struct pebs_record_core {
1: -	u64 flags;
1: -	u64 ip;
1: -	u64 ax;
1: -	u64 bx;
1: -	u64 cx;
1: -	u64 dx;
1: -	u64 si;
1: -	u64 di;
1: -	u64 bp;
1: -	u64 sp;
1: -	u64 r8;
1: -	u64 r9;
1: -	u64 r10;
1: -	u64 r11;
1: -	u64 r12;
1: -	u64 r13;
1: -	u64 r14;
1: -	u64 r15;
1: +  u64 flags;
1: +  u64 ip;
1: +  u64 ax;
1: +  u64 bx;
1: +  u64 cx;
1: +  u64 dx;
1: +  u64 si;
1: +  u64 di;
1: +  u64 bp;
1: +  u64 sp;
1: +  u64 r8;
1: +  u64 r9;
1: +  u64 r10;
1: +  u64 r11;
1: +  u64 r12;
1: +  u64 r13;
1: +  u64 r14;
1: +  u64 r15;
1:  };
1:  
1:  struct pebs_record_nhm {
1: -	u64 flags;
1: -	u64 ip;
1: -	u64 ax;
1: -	u64 bx;
1: -	u64 cx;
1: -	u64 dx;
1: -	u64 si;
1: -	u64 di;
1: -	u64 bp;
1: -	u64 sp;
1: -	u64 r8;
1: -	u64 r9;
1: -	u64 r10;
1: -	u64 r11;
1: -	u64 r12;
1: -	u64 r13;
1: -	u64 r14;
1: -	u64 r15;
1: -	u64 status;
1: -	u64 dla;
1: -	u64 dse;
1: -	u64 lat;
1: +  u64 flags;
1: +  u64 ip;
1: +  u64 ax;
1: +  u64 bx;
1: +  u64 cx;
1: +  u64 dx;
1: +  u64 si;
1: +  u64 di;
1: +  u64 bp;
1: +  u64 sp;
1: +  u64 r8;
1: +  u64 r9;
1: +  u64 r10;
1: +  u64 r11;
1: +  u64 r12;
1: +  u64 r13;
1: +  u64 r14;
1: +  u64 r15;
1: +  u64 status;
1: +  u64 dla;
1: +  u64 dse;
1: +  u64 lat;
1:  };
1:  
1:  union hsw_tsx_tuning {
1: -	struct {
1: -		u32 cycles_last_block: 32;
1: -		u32 hle_abort: 1;
1: -		u32 rtm_abort: 1;
1: -		u32 instruction_abort: 1;
1: -		u32 non_instruction_abort: 1;
1: -		u32 retry: 1;
1: -		u32 data_conflict: 1;
1: -		u32 capacity_writes: 1;
1: -		u32 capacity_reads: 1;
1: -	};
1: -	u64 value;
1: +  struct {
1: +    u32 cycles_last_block : 32;
1: +    u32 hle_abort : 1;
1: +    u32 rtm_abort : 1;
1: +    u32 instruction_abort : 1;
1: +    u32 non_instruction_abort : 1;
1: +    u32 retry : 1;
1: +    u32 data_conflict : 1;
1: +    u32 capacity_writes : 1;
1: +    u32 capacity_reads : 1;
1: +  };
1: +  u64 value;
1:  };
1:  
1:  struct pebs_record_skl {
1: -	u64 flags;
1: -	u64 ip;
1: -	u64 ax;
1: -	u64 bx;
1: -	u64 cx;
1: -	u64 dx;
1: -	u64 si;
1: -	u64 di;
1: -	u64 bp;
1: -	u64 sp;
1: -	u64 r8;
1: -	u64 r9;
1: -	u64 r10;
1: -	u64 r11;
1: -	u64 r12;
1: -	u64 r13;
1: -	u64 r14;
1: -	u64 r15;
1: -	u64 status;
1: -	u64 dla;
1: -	u64 dse;
1: -	u64 lat;
1: -	u64 real_ip;
1: -	u64 tsx_tuning;
1: -	u64 tsc;
1: +  u64 flags;
1: +  u64 ip;
1: +  u64 ax;
1: +  u64 bx;
1: +  u64 cx;
1: +  u64 dx;
1: +  u64 si;
1: +  u64 di;
1: +  u64 bp;
1: +  u64 sp;
1: +  u64 r8;
1: +  u64 r9;
1: +  u64 r10;
1: +  u64 r11;
1: +  u64 r12;
1: +  u64 r13;
1: +  u64 r14;
1: +  u64 r15;
1: +  u64 status;
1: +  u64 dla;
1: +  u64 dse;
1: +  u64 lat;
1: +  u64 real_ip;
1: +  u64 tsx_tuning;
1: +  u64 tsc;
1:  };
1:  
1:  struct bts_record {
1: -	u64 from;
1: -	u64 to;
1: -	u64 flags;
1: +  u64 from;
1: +  u64 to;
1: +  u64 flags;
1:  };
1:  
1:  enum {
1: -	PERF_BR_UNKNOWN = 0,
1: -	PERF_BR_COND = 1,
1: -	PERF_BR_UNCOND = 2,
1: -	PERF_BR_IND = 3,
1: -	PERF_BR_CALL = 4,
1: -	PERF_BR_IND_CALL = 5,
1: -	PERF_BR_RET = 6,
1: -	PERF_BR_SYSCALL = 7,
1: -	PERF_BR_SYSRET = 8,
1: -	PERF_BR_COND_CALL = 9,
1: -	PERF_BR_COND_RET = 10,
1: -	PERF_BR_MAX = 11,
1: +  PERF_BR_UNKNOWN = 0,
1: +  PERF_BR_COND = 1,
1: +  PERF_BR_UNCOND = 2,
1: +  PERF_BR_IND = 3,
1: +  PERF_BR_CALL = 4,
1: +  PERF_BR_IND_CALL = 5,
1: +  PERF_BR_RET = 6,
1: +  PERF_BR_SYSCALL = 7,
1: +  PERF_BR_SYSRET = 8,
1: +  PERF_BR_COND_CALL = 9,
1: +  PERF_BR_COND_RET = 10,
1: +  PERF_BR_MAX = 11,
1:  };
1:  
1:  enum xfeature {
1: -	XFEATURE_FP = 0,
1: -	XFEATURE_SSE = 1,
1: -	XFEATURE_YMM = 2,
1: -	XFEATURE_BNDREGS = 3,
1: -	XFEATURE_BNDCSR = 4,
1: -	XFEATURE_OPMASK = 5,
1: -	XFEATURE_ZMM_Hi256 = 6,
1: -	XFEATURE_Hi16_ZMM = 7,
1: -	XFEATURE_PT_UNIMPLEMENTED_SO_FAR = 8,
1: -	XFEATURE_PKRU = 9,
1: -	XFEATURE_PASID = 10,
1: -	XFEATURE_RSRVD_COMP_11 = 11,
1: -	XFEATURE_RSRVD_COMP_12 = 12,
1: -	XFEATURE_RSRVD_COMP_13 = 13,
1: -	XFEATURE_RSRVD_COMP_14 = 14,
1: -	XFEATURE_LBR = 15,
1: -	XFEATURE_MAX = 16,
1: +  XFEATURE_FP = 0,
1: +  XFEATURE_SSE = 1,
1: +  XFEATURE_YMM = 2,
1: +  XFEATURE_BNDREGS = 3,
1: +  XFEATURE_BNDCSR = 4,
1: +  XFEATURE_OPMASK = 5,
1: +  XFEATURE_ZMM_Hi256 = 6,
1: +  XFEATURE_Hi16_ZMM = 7,
1: +  XFEATURE_PT_UNIMPLEMENTED_SO_FAR = 8,
1: +  XFEATURE_PKRU = 9,
1: +  XFEATURE_PASID = 10,
1: +  XFEATURE_RSRVD_COMP_11 = 11,
1: +  XFEATURE_RSRVD_COMP_12 = 12,
1: +  XFEATURE_RSRVD_COMP_13 = 13,
1: +  XFEATURE_RSRVD_COMP_14 = 14,
1: +  XFEATURE_LBR = 15,
1: +  XFEATURE_MAX = 16,
1:  };
1:  
1:  struct arch_lbr_state {
1: -	u64 lbr_ctl;
1: -	u64 lbr_depth;
1: -	u64 ler_from;
1: -	u64 ler_to;
1: -	u64 ler_info;
1: -	struct lbr_entry entries[0];
1: +  u64 lbr_ctl;
1: +  u64 lbr_depth;
1: +  u64 ler_from;
1: +  u64 ler_to;
1: +  u64 ler_info;
1: +  struct lbr_entry entries[0];
1:  };
1:  
1:  union cpuid28_eax {
1: -	struct {
1: -		unsigned int lbr_depth_mask: 8;
1: -		unsigned int reserved: 22;
1: -		unsigned int lbr_deep_c_reset: 1;
1: -		unsigned int lbr_lip: 1;
1: -	} split;
1: -	unsigned int full;
1: +  struct {
1: +    unsigned int lbr_depth_mask : 8;
1: +    unsigned int reserved : 22;
1: +    unsigned int lbr_deep_c_reset : 1;
1: +    unsigned int lbr_lip : 1;
1: +  } split;
1: +  unsigned int full;
1:  };
1:  
1:  union cpuid28_ebx {
1: -	struct {
1: -		unsigned int lbr_cpl: 1;
1: -		unsigned int lbr_filter: 1;
1: -		unsigned int lbr_call_stack: 1;
1: -	} split;
1: -	unsigned int full;
1: +  struct {
1: +    unsigned int lbr_cpl : 1;
1: +    unsigned int lbr_filter : 1;
1: +    unsigned int lbr_call_stack : 1;
1: +  } split;
1: +  unsigned int full;
1:  };
1:  
1:  union cpuid28_ecx {
1: -	struct {
1: -		unsigned int lbr_mispred: 1;
1: -		unsigned int lbr_timed_lbr: 1;
1: -		unsigned int lbr_br_type: 1;
1: -	} split;
1: -	unsigned int full;
1: +  struct {
1: +    unsigned int lbr_mispred : 1;
1: +    unsigned int lbr_timed_lbr : 1;
1: +    unsigned int lbr_br_type : 1;
1: +  } split;
1: +  unsigned int full;
1:  };
1:  
1:  struct x86_pmu_lbr {
1: -	unsigned int nr;
1: -	unsigned int from;
1: -	unsigned int to;
1: -	unsigned int info;
1: +  unsigned int nr;
1: +  unsigned int from;
1: +  unsigned int to;
1: +  unsigned int info;
1:  };
1:  
1:  struct x86_perf_task_context_opt {
1: -	int lbr_callstack_users;
1: -	int lbr_stack_state;
1: -	int log_id;
1: +  int lbr_callstack_users;
1: +  int lbr_stack_state;
1: +  int log_id;
1:  };
1:  
1:  struct x86_perf_task_context {
1: -	u64 lbr_sel;
1: -	int tos;
1: -	int valid_lbrs;
1: -	struct x86_perf_task_context_opt opt;
1: -	struct lbr_entry lbr[32];
1: +  u64 lbr_sel;
1: +  int tos;
1: +  int valid_lbrs;
1: +  struct x86_perf_task_context_opt opt;
1: +  struct lbr_entry lbr[32];
1:  };
1:  
1:  struct x86_perf_task_context_arch_lbr {
1: -	struct x86_perf_task_context_opt opt;
1: -	struct lbr_entry entries[0];
1: +  struct x86_perf_task_context_opt opt;
1: +  struct lbr_entry entries[0];
1:  };
1:  
1:  struct x86_perf_task_context_arch_lbr_xsave {
1: -	struct x86_perf_task_context_opt opt;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	union {
1: -		struct xregs_state xsave;
1: -		struct {
1: -			struct fxregs_state i387;
1: -			struct xstate_header header;
1: -			struct arch_lbr_state lbr;
1: -			long: 64;
1: -			long: 64;
1: -			long: 64;
1: -		};
1: -	};
1: -};
1: -
1: -enum {
1: -	X86_BR_NONE = 0,
1: -	X86_BR_USER = 1,
1: -	X86_BR_KERNEL = 2,
1: -	X86_BR_CALL = 4,
1: -	X86_BR_RET = 8,
1: -	X86_BR_SYSCALL = 16,
1: -	X86_BR_SYSRET = 32,
1: -	X86_BR_INT = 64,
1: -	X86_BR_IRET = 128,
1: -	X86_BR_JCC = 256,
1: -	X86_BR_JMP = 512,
1: -	X86_BR_IRQ = 1024,
1: -	X86_BR_IND_CALL = 2048,
1: -	X86_BR_ABORT = 4096,
1: -	X86_BR_IN_TX = 8192,
1: -	X86_BR_NO_TX = 16384,
1: -	X86_BR_ZERO_CALL = 32768,
1: -	X86_BR_CALL_STACK = 65536,
1: -	X86_BR_IND_JMP = 131072,
1: -	X86_BR_TYPE_SAVE = 262144,
1: -};
1: -
1: -enum {
1: -	LBR_NONE = 0,
1: -	LBR_VALID = 1,
1: -};
1: -
1: -enum {
1: -	ARCH_LBR_BR_TYPE_JCC = 0,
1: -	ARCH_LBR_BR_TYPE_NEAR_IND_JMP = 1,
1: -	ARCH_LBR_BR_TYPE_NEAR_REL_JMP = 2,
1: -	ARCH_LBR_BR_TYPE_NEAR_IND_CALL = 3,
1: -	ARCH_LBR_BR_TYPE_NEAR_REL_CALL = 4,
1: -	ARCH_LBR_BR_TYPE_NEAR_RET = 5,
1: -	ARCH_LBR_BR_TYPE_KNOWN_MAX = 5,
1: -	ARCH_LBR_BR_TYPE_MAP_MAX = 16,
1: +  struct x86_perf_task_context_opt opt;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  union {
1: +    struct xregs_state xsave;
1: +    struct {
1: +      struct fxregs_state i387;
1: +      struct xstate_header header;
1: +      struct arch_lbr_state lbr;
1: +      long : 64;
1: +      long : 64;
1: +      long : 64;
1: +    };
1: +  };
1: +};
1: +
1: +enum {
1: +  X86_BR_NONE = 0,
1: +  X86_BR_USER = 1,
1: +  X86_BR_KERNEL = 2,
1: +  X86_BR_CALL = 4,
1: +  X86_BR_RET = 8,
1: +  X86_BR_SYSCALL = 16,
1: +  X86_BR_SYSRET = 32,
1: +  X86_BR_INT = 64,
1: +  X86_BR_IRET = 128,
1: +  X86_BR_JCC = 256,
1: +  X86_BR_JMP = 512,
1: +  X86_BR_IRQ = 1024,
1: +  X86_BR_IND_CALL = 2048,
1: +  X86_BR_ABORT = 4096,
1: +  X86_BR_IN_TX = 8192,
1: +  X86_BR_NO_TX = 16384,
1: +  X86_BR_ZERO_CALL = 32768,
1: +  X86_BR_CALL_STACK = 65536,
1: +  X86_BR_IND_JMP = 131072,
1: +  X86_BR_TYPE_SAVE = 262144,
1: +};
1: +
1: +enum {
1: +  LBR_NONE = 0,
1: +  LBR_VALID = 1,
1: +};
1: +
1: +enum {
1: +  ARCH_LBR_BR_TYPE_JCC = 0,
1: +  ARCH_LBR_BR_TYPE_NEAR_IND_JMP = 1,
1: +  ARCH_LBR_BR_TYPE_NEAR_REL_JMP = 2,
1: +  ARCH_LBR_BR_TYPE_NEAR_IND_CALL = 3,
1: +  ARCH_LBR_BR_TYPE_NEAR_REL_CALL = 4,
1: +  ARCH_LBR_BR_TYPE_NEAR_RET = 5,
1: +  ARCH_LBR_BR_TYPE_KNOWN_MAX = 5,
1: +  ARCH_LBR_BR_TYPE_MAP_MAX = 16,
1:  };
1:  
1:  enum P4_EVENTS {
1: -	P4_EVENT_TC_DELIVER_MODE = 0,
1: -	P4_EVENT_BPU_FETCH_REQUEST = 1,
1: -	P4_EVENT_ITLB_REFERENCE = 2,
1: -	P4_EVENT_MEMORY_CANCEL = 3,
1: -	P4_EVENT_MEMORY_COMPLETE = 4,
1: -	P4_EVENT_LOAD_PORT_REPLAY = 5,
1: -	P4_EVENT_STORE_PORT_REPLAY = 6,
1: -	P4_EVENT_MOB_LOAD_REPLAY = 7,
1: -	P4_EVENT_PAGE_WALK_TYPE = 8,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE = 9,
1: -	P4_EVENT_IOQ_ALLOCATION = 10,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES = 11,
1: -	P4_EVENT_FSB_DATA_ACTIVITY = 12,
1: -	P4_EVENT_BSQ_ALLOCATION = 13,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES = 14,
1: -	P4_EVENT_SSE_INPUT_ASSIST = 15,
1: -	P4_EVENT_PACKED_SP_UOP = 16,
1: -	P4_EVENT_PACKED_DP_UOP = 17,
1: -	P4_EVENT_SCALAR_SP_UOP = 18,
1: -	P4_EVENT_SCALAR_DP_UOP = 19,
1: -	P4_EVENT_64BIT_MMX_UOP = 20,
1: -	P4_EVENT_128BIT_MMX_UOP = 21,
1: -	P4_EVENT_X87_FP_UOP = 22,
1: -	P4_EVENT_TC_MISC = 23,
1: -	P4_EVENT_GLOBAL_POWER_EVENTS = 24,
1: -	P4_EVENT_TC_MS_XFER = 25,
1: -	P4_EVENT_UOP_QUEUE_WRITES = 26,
1: -	P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE = 27,
1: -	P4_EVENT_RETIRED_BRANCH_TYPE = 28,
1: -	P4_EVENT_RESOURCE_STALL = 29,
1: -	P4_EVENT_WC_BUFFER = 30,
1: -	P4_EVENT_B2B_CYCLES = 31,
1: -	P4_EVENT_BNR = 32,
1: -	P4_EVENT_SNOOP = 33,
1: -	P4_EVENT_RESPONSE = 34,
1: -	P4_EVENT_FRONT_END_EVENT = 35,
1: -	P4_EVENT_EXECUTION_EVENT = 36,
1: -	P4_EVENT_REPLAY_EVENT = 37,
1: -	P4_EVENT_INSTR_RETIRED = 38,
1: -	P4_EVENT_UOPS_RETIRED = 39,
1: -	P4_EVENT_UOP_TYPE = 40,
1: -	P4_EVENT_BRANCH_RETIRED = 41,
1: -	P4_EVENT_MISPRED_BRANCH_RETIRED = 42,
1: -	P4_EVENT_X87_ASSIST = 43,
1: -	P4_EVENT_MACHINE_CLEAR = 44,
1: -	P4_EVENT_INSTR_COMPLETED = 45,
1: +  P4_EVENT_TC_DELIVER_MODE = 0,
1: +  P4_EVENT_BPU_FETCH_REQUEST = 1,
1: +  P4_EVENT_ITLB_REFERENCE = 2,
1: +  P4_EVENT_MEMORY_CANCEL = 3,
1: +  P4_EVENT_MEMORY_COMPLETE = 4,
1: +  P4_EVENT_LOAD_PORT_REPLAY = 5,
1: +  P4_EVENT_STORE_PORT_REPLAY = 6,
1: +  P4_EVENT_MOB_LOAD_REPLAY = 7,
1: +  P4_EVENT_PAGE_WALK_TYPE = 8,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE = 9,
1: +  P4_EVENT_IOQ_ALLOCATION = 10,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES = 11,
1: +  P4_EVENT_FSB_DATA_ACTIVITY = 12,
1: +  P4_EVENT_BSQ_ALLOCATION = 13,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES = 14,
1: +  P4_EVENT_SSE_INPUT_ASSIST = 15,
1: +  P4_EVENT_PACKED_SP_UOP = 16,
1: +  P4_EVENT_PACKED_DP_UOP = 17,
1: +  P4_EVENT_SCALAR_SP_UOP = 18,
1: +  P4_EVENT_SCALAR_DP_UOP = 19,
1: +  P4_EVENT_64BIT_MMX_UOP = 20,
1: +  P4_EVENT_128BIT_MMX_UOP = 21,
1: +  P4_EVENT_X87_FP_UOP = 22,
1: +  P4_EVENT_TC_MISC = 23,
1: +  P4_EVENT_GLOBAL_POWER_EVENTS = 24,
1: +  P4_EVENT_TC_MS_XFER = 25,
1: +  P4_EVENT_UOP_QUEUE_WRITES = 26,
1: +  P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE = 27,
1: +  P4_EVENT_RETIRED_BRANCH_TYPE = 28,
1: +  P4_EVENT_RESOURCE_STALL = 29,
1: +  P4_EVENT_WC_BUFFER = 30,
1: +  P4_EVENT_B2B_CYCLES = 31,
1: +  P4_EVENT_BNR = 32,
1: +  P4_EVENT_SNOOP = 33,
1: +  P4_EVENT_RESPONSE = 34,
1: +  P4_EVENT_FRONT_END_EVENT = 35,
1: +  P4_EVENT_EXECUTION_EVENT = 36,
1: +  P4_EVENT_REPLAY_EVENT = 37,
1: +  P4_EVENT_INSTR_RETIRED = 38,
1: +  P4_EVENT_UOPS_RETIRED = 39,
1: +  P4_EVENT_UOP_TYPE = 40,
1: +  P4_EVENT_BRANCH_RETIRED = 41,
1: +  P4_EVENT_MISPRED_BRANCH_RETIRED = 42,
1: +  P4_EVENT_X87_ASSIST = 43,
1: +  P4_EVENT_MACHINE_CLEAR = 44,
1: +  P4_EVENT_INSTR_COMPLETED = 45,
1:  };
1:  
1:  enum P4_EVENT_OPCODES {
1: -	P4_EVENT_TC_DELIVER_MODE_OPCODE = 257,
1: -	P4_EVENT_BPU_FETCH_REQUEST_OPCODE = 768,
1: -	P4_EVENT_ITLB_REFERENCE_OPCODE = 6147,
1: -	P4_EVENT_MEMORY_CANCEL_OPCODE = 517,
1: -	P4_EVENT_MEMORY_COMPLETE_OPCODE = 2050,
1: -	P4_EVENT_LOAD_PORT_REPLAY_OPCODE = 1026,
1: -	P4_EVENT_STORE_PORT_REPLAY_OPCODE = 1282,
1: -	P4_EVENT_MOB_LOAD_REPLAY_OPCODE = 770,
1: -	P4_EVENT_PAGE_WALK_TYPE_OPCODE = 260,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE_OPCODE = 3079,
1: -	P4_EVENT_IOQ_ALLOCATION_OPCODE = 774,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES_OPCODE = 6662,
1: -	P4_EVENT_FSB_DATA_ACTIVITY_OPCODE = 5894,
1: -	P4_EVENT_BSQ_ALLOCATION_OPCODE = 1287,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES_OPCODE = 1543,
1: -	P4_EVENT_SSE_INPUT_ASSIST_OPCODE = 13313,
1: -	P4_EVENT_PACKED_SP_UOP_OPCODE = 2049,
1: -	P4_EVENT_PACKED_DP_UOP_OPCODE = 3073,
1: -	P4_EVENT_SCALAR_SP_UOP_OPCODE = 2561,
1: -	P4_EVENT_SCALAR_DP_UOP_OPCODE = 3585,
1: -	P4_EVENT_64BIT_MMX_UOP_OPCODE = 513,
1: -	P4_EVENT_128BIT_MMX_UOP_OPCODE = 6657,
1: -	P4_EVENT_X87_FP_UOP_OPCODE = 1025,
1: -	P4_EVENT_TC_MISC_OPCODE = 1537,
1: -	P4_EVENT_GLOBAL_POWER_EVENTS_OPCODE = 4870,
1: -	P4_EVENT_TC_MS_XFER_OPCODE = 1280,
1: -	P4_EVENT_UOP_QUEUE_WRITES_OPCODE = 2304,
1: -	P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE_OPCODE = 1282,
1: -	P4_EVENT_RETIRED_BRANCH_TYPE_OPCODE = 1026,
1: -	P4_EVENT_RESOURCE_STALL_OPCODE = 257,
1: -	P4_EVENT_WC_BUFFER_OPCODE = 1285,
1: -	P4_EVENT_B2B_CYCLES_OPCODE = 5635,
1: -	P4_EVENT_BNR_OPCODE = 2051,
1: -	P4_EVENT_SNOOP_OPCODE = 1539,
1: -	P4_EVENT_RESPONSE_OPCODE = 1027,
1: -	P4_EVENT_FRONT_END_EVENT_OPCODE = 2053,
1: -	P4_EVENT_EXECUTION_EVENT_OPCODE = 3077,
1: -	P4_EVENT_REPLAY_EVENT_OPCODE = 2309,
1: -	P4_EVENT_INSTR_RETIRED_OPCODE = 516,
1: -	P4_EVENT_UOPS_RETIRED_OPCODE = 260,
1: -	P4_EVENT_UOP_TYPE_OPCODE = 514,
1: -	P4_EVENT_BRANCH_RETIRED_OPCODE = 1541,
1: -	P4_EVENT_MISPRED_BRANCH_RETIRED_OPCODE = 772,
1: -	P4_EVENT_X87_ASSIST_OPCODE = 773,
1: -	P4_EVENT_MACHINE_CLEAR_OPCODE = 517,
1: -	P4_EVENT_INSTR_COMPLETED_OPCODE = 1796,
1: +  P4_EVENT_TC_DELIVER_MODE_OPCODE = 257,
1: +  P4_EVENT_BPU_FETCH_REQUEST_OPCODE = 768,
1: +  P4_EVENT_ITLB_REFERENCE_OPCODE = 6147,
1: +  P4_EVENT_MEMORY_CANCEL_OPCODE = 517,
1: +  P4_EVENT_MEMORY_COMPLETE_OPCODE = 2050,
1: +  P4_EVENT_LOAD_PORT_REPLAY_OPCODE = 1026,
1: +  P4_EVENT_STORE_PORT_REPLAY_OPCODE = 1282,
1: +  P4_EVENT_MOB_LOAD_REPLAY_OPCODE = 770,
1: +  P4_EVENT_PAGE_WALK_TYPE_OPCODE = 260,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE_OPCODE = 3079,
1: +  P4_EVENT_IOQ_ALLOCATION_OPCODE = 774,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES_OPCODE = 6662,
1: +  P4_EVENT_FSB_DATA_ACTIVITY_OPCODE = 5894,
1: +  P4_EVENT_BSQ_ALLOCATION_OPCODE = 1287,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES_OPCODE = 1543,
1: +  P4_EVENT_SSE_INPUT_ASSIST_OPCODE = 13313,
1: +  P4_EVENT_PACKED_SP_UOP_OPCODE = 2049,
1: +  P4_EVENT_PACKED_DP_UOP_OPCODE = 3073,
1: +  P4_EVENT_SCALAR_SP_UOP_OPCODE = 2561,
1: +  P4_EVENT_SCALAR_DP_UOP_OPCODE = 3585,
1: +  P4_EVENT_64BIT_MMX_UOP_OPCODE = 513,
1: +  P4_EVENT_128BIT_MMX_UOP_OPCODE = 6657,
1: +  P4_EVENT_X87_FP_UOP_OPCODE = 1025,
1: +  P4_EVENT_TC_MISC_OPCODE = 1537,
1: +  P4_EVENT_GLOBAL_POWER_EVENTS_OPCODE = 4870,
1: +  P4_EVENT_TC_MS_XFER_OPCODE = 1280,
1: +  P4_EVENT_UOP_QUEUE_WRITES_OPCODE = 2304,
1: +  P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE_OPCODE = 1282,
1: +  P4_EVENT_RETIRED_BRANCH_TYPE_OPCODE = 1026,
1: +  P4_EVENT_RESOURCE_STALL_OPCODE = 257,
1: +  P4_EVENT_WC_BUFFER_OPCODE = 1285,
1: +  P4_EVENT_B2B_CYCLES_OPCODE = 5635,
1: +  P4_EVENT_BNR_OPCODE = 2051,
1: +  P4_EVENT_SNOOP_OPCODE = 1539,
1: +  P4_EVENT_RESPONSE_OPCODE = 1027,
1: +  P4_EVENT_FRONT_END_EVENT_OPCODE = 2053,
1: +  P4_EVENT_EXECUTION_EVENT_OPCODE = 3077,
1: +  P4_EVENT_REPLAY_EVENT_OPCODE = 2309,
1: +  P4_EVENT_INSTR_RETIRED_OPCODE = 516,
1: +  P4_EVENT_UOPS_RETIRED_OPCODE = 260,
1: +  P4_EVENT_UOP_TYPE_OPCODE = 514,
1: +  P4_EVENT_BRANCH_RETIRED_OPCODE = 1541,
1: +  P4_EVENT_MISPRED_BRANCH_RETIRED_OPCODE = 772,
1: +  P4_EVENT_X87_ASSIST_OPCODE = 773,
1: +  P4_EVENT_MACHINE_CLEAR_OPCODE = 517,
1: +  P4_EVENT_INSTR_COMPLETED_OPCODE = 1796,
1:  };
1:  
1:  enum P4_ESCR_EMASKS {
1: -	P4_EVENT_TC_DELIVER_MODE__DD = 512,
1: -	P4_EVENT_TC_DELIVER_MODE__DB = 1024,
1: -	P4_EVENT_TC_DELIVER_MODE__DI = 2048,
1: -	P4_EVENT_TC_DELIVER_MODE__BD = 4096,
1: -	P4_EVENT_TC_DELIVER_MODE__BB = 8192,
1: -	P4_EVENT_TC_DELIVER_MODE__BI = 16384,
1: -	P4_EVENT_TC_DELIVER_MODE__ID = 32768,
1: -	P4_EVENT_BPU_FETCH_REQUEST__TCMISS = 512,
1: -	P4_EVENT_ITLB_REFERENCE__HIT = 512,
1: -	P4_EVENT_ITLB_REFERENCE__MISS = 1024,
1: -	P4_EVENT_ITLB_REFERENCE__HIT_UK = 2048,
1: -	P4_EVENT_MEMORY_CANCEL__ST_RB_FULL = 2048,
1: -	P4_EVENT_MEMORY_CANCEL__64K_CONF = 4096,
1: -	P4_EVENT_MEMORY_COMPLETE__LSC = 512,
1: -	P4_EVENT_MEMORY_COMPLETE__SSC = 1024,
1: -	P4_EVENT_LOAD_PORT_REPLAY__SPLIT_LD = 1024,
1: -	P4_EVENT_STORE_PORT_REPLAY__SPLIT_ST = 1024,
1: -	P4_EVENT_MOB_LOAD_REPLAY__NO_STA = 1024,
1: -	P4_EVENT_MOB_LOAD_REPLAY__NO_STD = 4096,
1: -	P4_EVENT_MOB_LOAD_REPLAY__PARTIAL_DATA = 8192,
1: -	P4_EVENT_MOB_LOAD_REPLAY__UNALGN_ADDR = 16384,
1: -	P4_EVENT_PAGE_WALK_TYPE__DTMISS = 512,
1: -	P4_EVENT_PAGE_WALK_TYPE__ITMISS = 1024,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_HITS = 512,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_HITE = 1024,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_HITM = 2048,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_HITS = 4096,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_HITE = 8192,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_HITM = 16384,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_MISS = 131072,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_MISS = 262144,
1: -	P4_EVENT_BSQ_CACHE_REFERENCE__WR_2ndL_MISS = 524288,
1: -	P4_EVENT_IOQ_ALLOCATION__DEFAULT = 512,
1: -	P4_EVENT_IOQ_ALLOCATION__ALL_READ = 16384,
1: -	P4_EVENT_IOQ_ALLOCATION__ALL_WRITE = 32768,
1: -	P4_EVENT_IOQ_ALLOCATION__MEM_UC = 65536,
1: -	P4_EVENT_IOQ_ALLOCATION__MEM_WC = 131072,
1: -	P4_EVENT_IOQ_ALLOCATION__MEM_WT = 262144,
1: -	P4_EVENT_IOQ_ALLOCATION__MEM_WP = 524288,
1: -	P4_EVENT_IOQ_ALLOCATION__MEM_WB = 1048576,
1: -	P4_EVENT_IOQ_ALLOCATION__OWN = 4194304,
1: -	P4_EVENT_IOQ_ALLOCATION__OTHER = 8388608,
1: -	P4_EVENT_IOQ_ALLOCATION__PREFETCH = 16777216,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__DEFAULT = 512,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__ALL_READ = 16384,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__ALL_WRITE = 32768,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_UC = 65536,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WC = 131072,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WT = 262144,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WP = 524288,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WB = 1048576,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__OWN = 4194304,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__OTHER = 8388608,
1: -	P4_EVENT_IOQ_ACTIVE_ENTRIES__PREFETCH = 16777216,
1: -	P4_EVENT_FSB_DATA_ACTIVITY__DRDY_DRV = 512,
1: -	P4_EVENT_FSB_DATA_ACTIVITY__DRDY_OWN = 1024,
1: -	P4_EVENT_FSB_DATA_ACTIVITY__DRDY_OTHER = 2048,
1: -	P4_EVENT_FSB_DATA_ACTIVITY__DBSY_DRV = 4096,
1: -	P4_EVENT_FSB_DATA_ACTIVITY__DBSY_OWN = 8192,
1: -	P4_EVENT_FSB_DATA_ACTIVITY__DBSY_OTHER = 16384,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_TYPE0 = 512,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_TYPE1 = 1024,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_LEN0 = 2048,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_LEN1 = 4096,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_IO_TYPE = 16384,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_LOCK_TYPE = 32768,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_CACHE_TYPE = 65536,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_SPLIT_TYPE = 131072,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_DEM_TYPE = 262144,
1: -	P4_EVENT_BSQ_ALLOCATION__REQ_ORD_TYPE = 524288,
1: -	P4_EVENT_BSQ_ALLOCATION__MEM_TYPE0 = 1048576,
1: -	P4_EVENT_BSQ_ALLOCATION__MEM_TYPE1 = 2097152,
1: -	P4_EVENT_BSQ_ALLOCATION__MEM_TYPE2 = 4194304,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_TYPE0 = 512,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_TYPE1 = 1024,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_LEN0 = 2048,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_LEN1 = 4096,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_IO_TYPE = 16384,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_LOCK_TYPE = 32768,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_CACHE_TYPE = 65536,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_SPLIT_TYPE = 131072,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_DEM_TYPE = 262144,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_ORD_TYPE = 524288,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__MEM_TYPE0 = 1048576,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__MEM_TYPE1 = 2097152,
1: -	P4_EVENT_BSQ_ACTIVE_ENTRIES__MEM_TYPE2 = 4194304,
1: -	P4_EVENT_SSE_INPUT_ASSIST__ALL = 16777216,
1: -	P4_EVENT_PACKED_SP_UOP__ALL = 16777216,
1: -	P4_EVENT_PACKED_DP_UOP__ALL = 16777216,
1: -	P4_EVENT_SCALAR_SP_UOP__ALL = 16777216,
1: -	P4_EVENT_SCALAR_DP_UOP__ALL = 16777216,
1: -	P4_EVENT_64BIT_MMX_UOP__ALL = 16777216,
1: -	P4_EVENT_128BIT_MMX_UOP__ALL = 16777216,
1: -	P4_EVENT_X87_FP_UOP__ALL = 16777216,
1: -	P4_EVENT_TC_MISC__FLUSH = 8192,
1: -	P4_EVENT_GLOBAL_POWER_EVENTS__RUNNING = 512,
1: -	P4_EVENT_TC_MS_XFER__CISC = 512,
1: -	P4_EVENT_UOP_QUEUE_WRITES__FROM_TC_BUILD = 512,
1: -	P4_EVENT_UOP_QUEUE_WRITES__FROM_TC_DELIVER = 1024,
1: -	P4_EVENT_UOP_QUEUE_WRITES__FROM_ROM = 2048,
1: -	P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__CONDITIONAL = 1024,
1: -	P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__CALL = 2048,
1: -	P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__RETURN = 4096,
1: -	P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__INDIRECT = 8192,
1: -	P4_EVENT_RETIRED_BRANCH_TYPE__CONDITIONAL = 1024,
1: -	P4_EVENT_RETIRED_BRANCH_TYPE__CALL = 2048,
1: -	P4_EVENT_RETIRED_BRANCH_TYPE__RETURN = 4096,
1: -	P4_EVENT_RETIRED_BRANCH_TYPE__INDIRECT = 8192,
1: -	P4_EVENT_RESOURCE_STALL__SBFULL = 16384,
1: -	P4_EVENT_WC_BUFFER__WCB_EVICTS = 512,
1: -	P4_EVENT_WC_BUFFER__WCB_FULL_EVICTS = 1024,
1: -	P4_EVENT_FRONT_END_EVENT__NBOGUS = 512,
1: -	P4_EVENT_FRONT_END_EVENT__BOGUS = 1024,
1: -	P4_EVENT_EXECUTION_EVENT__NBOGUS0 = 512,
1: -	P4_EVENT_EXECUTION_EVENT__NBOGUS1 = 1024,
1: -	P4_EVENT_EXECUTION_EVENT__NBOGUS2 = 2048,
1: -	P4_EVENT_EXECUTION_EVENT__NBOGUS3 = 4096,
1: -	P4_EVENT_EXECUTION_EVENT__BOGUS0 = 8192,
1: -	P4_EVENT_EXECUTION_EVENT__BOGUS1 = 16384,
1: -	P4_EVENT_EXECUTION_EVENT__BOGUS2 = 32768,
1: -	P4_EVENT_EXECUTION_EVENT__BOGUS3 = 65536,
1: -	P4_EVENT_REPLAY_EVENT__NBOGUS = 512,
1: -	P4_EVENT_REPLAY_EVENT__BOGUS = 1024,
1: -	P4_EVENT_INSTR_RETIRED__NBOGUSNTAG = 512,
1: -	P4_EVENT_INSTR_RETIRED__NBOGUSTAG = 1024,
1: -	P4_EVENT_INSTR_RETIRED__BOGUSNTAG = 2048,
1: -	P4_EVENT_INSTR_RETIRED__BOGUSTAG = 4096,
1: -	P4_EVENT_UOPS_RETIRED__NBOGUS = 512,
1: -	P4_EVENT_UOPS_RETIRED__BOGUS = 1024,
1: -	P4_EVENT_UOP_TYPE__TAGLOADS = 1024,
1: -	P4_EVENT_UOP_TYPE__TAGSTORES = 2048,
1: -	P4_EVENT_BRANCH_RETIRED__MMNP = 512,
1: -	P4_EVENT_BRANCH_RETIRED__MMNM = 1024,
1: -	P4_EVENT_BRANCH_RETIRED__MMTP = 2048,
1: -	P4_EVENT_BRANCH_RETIRED__MMTM = 4096,
1: -	P4_EVENT_MISPRED_BRANCH_RETIRED__NBOGUS = 512,
1: -	P4_EVENT_X87_ASSIST__FPSU = 512,
1: -	P4_EVENT_X87_ASSIST__FPSO = 1024,
1: -	P4_EVENT_X87_ASSIST__POAO = 2048,
1: -	P4_EVENT_X87_ASSIST__POAU = 4096,
1: -	P4_EVENT_X87_ASSIST__PREA = 8192,
1: -	P4_EVENT_MACHINE_CLEAR__CLEAR = 512,
1: -	P4_EVENT_MACHINE_CLEAR__MOCLEAR = 1024,
1: -	P4_EVENT_MACHINE_CLEAR__SMCLEAR = 2048,
1: -	P4_EVENT_INSTR_COMPLETED__NBOGUS = 512,
1: -	P4_EVENT_INSTR_COMPLETED__BOGUS = 1024,
1: +  P4_EVENT_TC_DELIVER_MODE__DD = 512,
1: +  P4_EVENT_TC_DELIVER_MODE__DB = 1024,
1: +  P4_EVENT_TC_DELIVER_MODE__DI = 2048,
1: +  P4_EVENT_TC_DELIVER_MODE__BD = 4096,
1: +  P4_EVENT_TC_DELIVER_MODE__BB = 8192,
1: +  P4_EVENT_TC_DELIVER_MODE__BI = 16384,
1: +  P4_EVENT_TC_DELIVER_MODE__ID = 32768,
1: +  P4_EVENT_BPU_FETCH_REQUEST__TCMISS = 512,
1: +  P4_EVENT_ITLB_REFERENCE__HIT = 512,
1: +  P4_EVENT_ITLB_REFERENCE__MISS = 1024,
1: +  P4_EVENT_ITLB_REFERENCE__HIT_UK = 2048,
1: +  P4_EVENT_MEMORY_CANCEL__ST_RB_FULL = 2048,
1: +  P4_EVENT_MEMORY_CANCEL__64K_CONF = 4096,
1: +  P4_EVENT_MEMORY_COMPLETE__LSC = 512,
1: +  P4_EVENT_MEMORY_COMPLETE__SSC = 1024,
1: +  P4_EVENT_LOAD_PORT_REPLAY__SPLIT_LD = 1024,
1: +  P4_EVENT_STORE_PORT_REPLAY__SPLIT_ST = 1024,
1: +  P4_EVENT_MOB_LOAD_REPLAY__NO_STA = 1024,
1: +  P4_EVENT_MOB_LOAD_REPLAY__NO_STD = 4096,
1: +  P4_EVENT_MOB_LOAD_REPLAY__PARTIAL_DATA = 8192,
1: +  P4_EVENT_MOB_LOAD_REPLAY__UNALGN_ADDR = 16384,
1: +  P4_EVENT_PAGE_WALK_TYPE__DTMISS = 512,
1: +  P4_EVENT_PAGE_WALK_TYPE__ITMISS = 1024,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_HITS = 512,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_HITE = 1024,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_HITM = 2048,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_HITS = 4096,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_HITE = 8192,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_HITM = 16384,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_2ndL_MISS = 131072,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__RD_3rdL_MISS = 262144,
1: +  P4_EVENT_BSQ_CACHE_REFERENCE__WR_2ndL_MISS = 524288,
1: +  P4_EVENT_IOQ_ALLOCATION__DEFAULT = 512,
1: +  P4_EVENT_IOQ_ALLOCATION__ALL_READ = 16384,
1: +  P4_EVENT_IOQ_ALLOCATION__ALL_WRITE = 32768,
1: +  P4_EVENT_IOQ_ALLOCATION__MEM_UC = 65536,
1: +  P4_EVENT_IOQ_ALLOCATION__MEM_WC = 131072,
1: +  P4_EVENT_IOQ_ALLOCATION__MEM_WT = 262144,
1: +  P4_EVENT_IOQ_ALLOCATION__MEM_WP = 524288,
1: +  P4_EVENT_IOQ_ALLOCATION__MEM_WB = 1048576,
1: +  P4_EVENT_IOQ_ALLOCATION__OWN = 4194304,
1: +  P4_EVENT_IOQ_ALLOCATION__OTHER = 8388608,
1: +  P4_EVENT_IOQ_ALLOCATION__PREFETCH = 16777216,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__DEFAULT = 512,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__ALL_READ = 16384,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__ALL_WRITE = 32768,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_UC = 65536,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WC = 131072,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WT = 262144,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WP = 524288,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__MEM_WB = 1048576,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__OWN = 4194304,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__OTHER = 8388608,
1: +  P4_EVENT_IOQ_ACTIVE_ENTRIES__PREFETCH = 16777216,
1: +  P4_EVENT_FSB_DATA_ACTIVITY__DRDY_DRV = 512,
1: +  P4_EVENT_FSB_DATA_ACTIVITY__DRDY_OWN = 1024,
1: +  P4_EVENT_FSB_DATA_ACTIVITY__DRDY_OTHER = 2048,
1: +  P4_EVENT_FSB_DATA_ACTIVITY__DBSY_DRV = 4096,
1: +  P4_EVENT_FSB_DATA_ACTIVITY__DBSY_OWN = 8192,
1: +  P4_EVENT_FSB_DATA_ACTIVITY__DBSY_OTHER = 16384,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_TYPE0 = 512,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_TYPE1 = 1024,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_LEN0 = 2048,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_LEN1 = 4096,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_IO_TYPE = 16384,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_LOCK_TYPE = 32768,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_CACHE_TYPE = 65536,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_SPLIT_TYPE = 131072,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_DEM_TYPE = 262144,
1: +  P4_EVENT_BSQ_ALLOCATION__REQ_ORD_TYPE = 524288,
1: +  P4_EVENT_BSQ_ALLOCATION__MEM_TYPE0 = 1048576,
1: +  P4_EVENT_BSQ_ALLOCATION__MEM_TYPE1 = 2097152,
1: +  P4_EVENT_BSQ_ALLOCATION__MEM_TYPE2 = 4194304,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_TYPE0 = 512,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_TYPE1 = 1024,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_LEN0 = 2048,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_LEN1 = 4096,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_IO_TYPE = 16384,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_LOCK_TYPE = 32768,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_CACHE_TYPE = 65536,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_SPLIT_TYPE = 131072,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_DEM_TYPE = 262144,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__REQ_ORD_TYPE = 524288,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__MEM_TYPE0 = 1048576,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__MEM_TYPE1 = 2097152,
1: +  P4_EVENT_BSQ_ACTIVE_ENTRIES__MEM_TYPE2 = 4194304,
1: +  P4_EVENT_SSE_INPUT_ASSIST__ALL = 16777216,
1: +  P4_EVENT_PACKED_SP_UOP__ALL = 16777216,
1: +  P4_EVENT_PACKED_DP_UOP__ALL = 16777216,
1: +  P4_EVENT_SCALAR_SP_UOP__ALL = 16777216,
1: +  P4_EVENT_SCALAR_DP_UOP__ALL = 16777216,
1: +  P4_EVENT_64BIT_MMX_UOP__ALL = 16777216,
1: +  P4_EVENT_128BIT_MMX_UOP__ALL = 16777216,
1: +  P4_EVENT_X87_FP_UOP__ALL = 16777216,
1: +  P4_EVENT_TC_MISC__FLUSH = 8192,
1: +  P4_EVENT_GLOBAL_POWER_EVENTS__RUNNING = 512,
1: +  P4_EVENT_TC_MS_XFER__CISC = 512,
1: +  P4_EVENT_UOP_QUEUE_WRITES__FROM_TC_BUILD = 512,
1: +  P4_EVENT_UOP_QUEUE_WRITES__FROM_TC_DELIVER = 1024,
1: +  P4_EVENT_UOP_QUEUE_WRITES__FROM_ROM = 2048,
1: +  P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__CONDITIONAL = 1024,
1: +  P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__CALL = 2048,
1: +  P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__RETURN = 4096,
1: +  P4_EVENT_RETIRED_MISPRED_BRANCH_TYPE__INDIRECT = 8192,
1: +  P4_EVENT_RETIRED_BRANCH_TYPE__CONDITIONAL = 1024,
1: +  P4_EVENT_RETIRED_BRANCH_TYPE__CALL = 2048,
1: +  P4_EVENT_RETIRED_BRANCH_TYPE__RETURN = 4096,
1: +  P4_EVENT_RETIRED_BRANCH_TYPE__INDIRECT = 8192,
1: +  P4_EVENT_RESOURCE_STALL__SBFULL = 16384,
1: +  P4_EVENT_WC_BUFFER__WCB_EVICTS = 512,
1: +  P4_EVENT_WC_BUFFER__WCB_FULL_EVICTS = 1024,
1: +  P4_EVENT_FRONT_END_EVENT__NBOGUS = 512,
1: +  P4_EVENT_FRONT_END_EVENT__BOGUS = 1024,
1: +  P4_EVENT_EXECUTION_EVENT__NBOGUS0 = 512,
1: +  P4_EVENT_EXECUTION_EVENT__NBOGUS1 = 1024,
1: +  P4_EVENT_EXECUTION_EVENT__NBOGUS2 = 2048,
1: +  P4_EVENT_EXECUTION_EVENT__NBOGUS3 = 4096,
1: +  P4_EVENT_EXECUTION_EVENT__BOGUS0 = 8192,
1: +  P4_EVENT_EXECUTION_EVENT__BOGUS1 = 16384,
1: +  P4_EVENT_EXECUTION_EVENT__BOGUS2 = 32768,
1: +  P4_EVENT_EXECUTION_EVENT__BOGUS3 = 65536,
1: +  P4_EVENT_REPLAY_EVENT__NBOGUS = 512,
1: +  P4_EVENT_REPLAY_EVENT__BOGUS = 1024,
1: +  P4_EVENT_INSTR_RETIRED__NBOGUSNTAG = 512,
1: +  P4_EVENT_INSTR_RETIRED__NBOGUSTAG = 1024,
1: +  P4_EVENT_INSTR_RETIRED__BOGUSNTAG = 2048,
1: +  P4_EVENT_INSTR_RETIRED__BOGUSTAG = 4096,
1: +  P4_EVENT_UOPS_RETIRED__NBOGUS = 512,
1: +  P4_EVENT_UOPS_RETIRED__BOGUS = 1024,
1: +  P4_EVENT_UOP_TYPE__TAGLOADS = 1024,
1: +  P4_EVENT_UOP_TYPE__TAGSTORES = 2048,
1: +  P4_EVENT_BRANCH_RETIRED__MMNP = 512,
1: +  P4_EVENT_BRANCH_RETIRED__MMNM = 1024,
1: +  P4_EVENT_BRANCH_RETIRED__MMTP = 2048,
1: +  P4_EVENT_BRANCH_RETIRED__MMTM = 4096,
1: +  P4_EVENT_MISPRED_BRANCH_RETIRED__NBOGUS = 512,
1: +  P4_EVENT_X87_ASSIST__FPSU = 512,
1: +  P4_EVENT_X87_ASSIST__FPSO = 1024,
1: +  P4_EVENT_X87_ASSIST__POAO = 2048,
1: +  P4_EVENT_X87_ASSIST__POAU = 4096,
1: +  P4_EVENT_X87_ASSIST__PREA = 8192,
1: +  P4_EVENT_MACHINE_CLEAR__CLEAR = 512,
1: +  P4_EVENT_MACHINE_CLEAR__MOCLEAR = 1024,
1: +  P4_EVENT_MACHINE_CLEAR__SMCLEAR = 2048,
1: +  P4_EVENT_INSTR_COMPLETED__NBOGUS = 512,
1: +  P4_EVENT_INSTR_COMPLETED__BOGUS = 1024,
1:  };
1:  
1:  enum P4_PEBS_METRIC {
1: -	P4_PEBS_METRIC__none = 0,
1: -	P4_PEBS_METRIC__1stl_cache_load_miss_retired = 1,
1: -	P4_PEBS_METRIC__2ndl_cache_load_miss_retired = 2,
1: -	P4_PEBS_METRIC__dtlb_load_miss_retired = 3,
1: -	P4_PEBS_METRIC__dtlb_store_miss_retired = 4,
1: -	P4_PEBS_METRIC__dtlb_all_miss_retired = 5,
1: -	P4_PEBS_METRIC__tagged_mispred_branch = 6,
1: -	P4_PEBS_METRIC__mob_load_replay_retired = 7,
1: -	P4_PEBS_METRIC__split_load_retired = 8,
1: -	P4_PEBS_METRIC__split_store_retired = 9,
1: -	P4_PEBS_METRIC__max = 10,
1: +  P4_PEBS_METRIC__none = 0,
1: +  P4_PEBS_METRIC__1stl_cache_load_miss_retired = 1,
1: +  P4_PEBS_METRIC__2ndl_cache_load_miss_retired = 2,
1: +  P4_PEBS_METRIC__dtlb_load_miss_retired = 3,
1: +  P4_PEBS_METRIC__dtlb_store_miss_retired = 4,
1: +  P4_PEBS_METRIC__dtlb_all_miss_retired = 5,
1: +  P4_PEBS_METRIC__tagged_mispred_branch = 6,
1: +  P4_PEBS_METRIC__mob_load_replay_retired = 7,
1: +  P4_PEBS_METRIC__split_load_retired = 8,
1: +  P4_PEBS_METRIC__split_store_retired = 9,
1: +  P4_PEBS_METRIC__max = 10,
1:  };
1:  
1:  struct p4_event_bind {
1: -	unsigned int opcode;
1: -	unsigned int escr_msr[2];
1: -	unsigned int escr_emask;
1: -	unsigned int shared;
1: -	char cntr[6];
1: +  unsigned int opcode;
1: +  unsigned int escr_msr[2];
1: +  unsigned int escr_emask;
1: +  unsigned int shared;
1: +  char cntr[6];
1:  };
1:  
1:  struct p4_pebs_bind {
1: -	unsigned int metric_pebs;
1: -	unsigned int metric_vert;
1: +  unsigned int metric_pebs;
1: +  unsigned int metric_vert;
1:  };
1:  
1:  struct p4_event_alias {
1: -	u64 original;
1: -	u64 alternative;
1: +  u64 original;
1: +  u64 alternative;
1:  };
1:  
1:  enum cpuid_regs_idx {
1: -	CPUID_EAX = 0,
1: -	CPUID_EBX = 1,
1: -	CPUID_ECX = 2,
1: -	CPUID_EDX = 3,
1: +  CPUID_EAX = 0,
1: +  CPUID_EBX = 1,
1: +  CPUID_ECX = 2,
1: +  CPUID_EDX = 3,
1:  };
1:  
1:  struct dev_ext_attribute {
1: -	struct device_attribute attr;
1: -	void *var;
1: +  struct device_attribute attr;
1: +  void *var;
1:  };
1:  
1:  enum pt_capabilities {
1: -	PT_CAP_max_subleaf = 0,
1: -	PT_CAP_cr3_filtering = 1,
1: -	PT_CAP_psb_cyc = 2,
1: -	PT_CAP_ip_filtering = 3,
1: -	PT_CAP_mtc = 4,
1: -	PT_CAP_ptwrite = 5,
1: -	PT_CAP_power_event_trace = 6,
1: -	PT_CAP_topa_output = 7,
1: -	PT_CAP_topa_multiple_entries = 8,
1: -	PT_CAP_single_range_output = 9,
1: -	PT_CAP_output_subsys = 10,
1: -	PT_CAP_payloads_lip = 11,
1: -	PT_CAP_num_address_ranges = 12,
1: -	PT_CAP_mtc_periods = 13,
1: -	PT_CAP_cycle_thresholds = 14,
1: -	PT_CAP_psb_periods = 15,
1: +  PT_CAP_max_subleaf = 0,
1: +  PT_CAP_cr3_filtering = 1,
1: +  PT_CAP_psb_cyc = 2,
1: +  PT_CAP_ip_filtering = 3,
1: +  PT_CAP_mtc = 4,
1: +  PT_CAP_ptwrite = 5,
1: +  PT_CAP_power_event_trace = 6,
1: +  PT_CAP_topa_output = 7,
1: +  PT_CAP_topa_multiple_entries = 8,
1: +  PT_CAP_single_range_output = 9,
1: +  PT_CAP_output_subsys = 10,
1: +  PT_CAP_payloads_lip = 11,
1: +  PT_CAP_num_address_ranges = 12,
1: +  PT_CAP_mtc_periods = 13,
1: +  PT_CAP_cycle_thresholds = 14,
1: +  PT_CAP_psb_periods = 15,
1:  };
1:  
1:  enum perf_addr_filter_action_t {
1: -	PERF_ADDR_FILTER_ACTION_STOP = 0,
1: -	PERF_ADDR_FILTER_ACTION_START = 1,
1: -	PERF_ADDR_FILTER_ACTION_FILTER = 2,
1: +  PERF_ADDR_FILTER_ACTION_STOP = 0,
1: +  PERF_ADDR_FILTER_ACTION_START = 1,
1: +  PERF_ADDR_FILTER_ACTION_FILTER = 2,
1:  };
1:  
1:  struct perf_addr_filter {
1: -	struct list_head entry;
1: -	struct path path;
1: -	long unsigned int offset;
1: -	long unsigned int size;
1: -	enum perf_addr_filter_action_t action;
1: +  struct list_head entry;
1: +  struct path path;
1: +  long unsigned int offset;
1: +  long unsigned int size;
1: +  enum perf_addr_filter_action_t action;
1:  };
1:  
1:  struct topa_entry {
1: -	u64 end: 1;
1: -	u64 rsvd0: 1;
1: -	u64 intr: 1;
1: -	u64 rsvd1: 1;
1: -	u64 stop: 1;
1: -	u64 rsvd2: 1;
1: -	u64 size: 4;
1: -	u64 rsvd3: 2;
1: -	u64 base: 36;
1: -	u64 rsvd4: 16;
1: +  u64 end : 1;
1: +  u64 rsvd0 : 1;
1: +  u64 intr : 1;
1: +  u64 rsvd1 : 1;
1: +  u64 stop : 1;
1: +  u64 rsvd2 : 1;
1: +  u64 size : 4;
1: +  u64 rsvd3 : 2;
1: +  u64 base : 36;
1: +  u64 rsvd4 : 16;
1:  };
1:  
1:  struct pt_pmu {
1: -	struct pmu pmu;
1: -	u32 caps[8];
1: -	bool vmx;
1: -	bool branch_en_always_on;
1: -	long unsigned int max_nonturbo_ratio;
1: -	unsigned int tsc_art_num;
1: -	unsigned int tsc_art_den;
1: +  struct pmu pmu;
1: +  u32 caps[8];
1: +  bool vmx;
1: +  bool branch_en_always_on;
1: +  long unsigned int max_nonturbo_ratio;
1: +  unsigned int tsc_art_num;
1: +  unsigned int tsc_art_den;
1:  };
1:  
1:  struct topa;
1:  
1:  struct pt_buffer {
1: -	struct list_head tables;
1: -	struct topa *first;
1: -	struct topa *last;
1: -	struct topa *cur;
1: -	unsigned int cur_idx;
1: -	size_t output_off;
1: -	long unsigned int nr_pages;
1: -	local_t data_size;
1: -	local64_t head;
1: -	bool snapshot;
1: -	bool single;
1: -	long int stop_pos;
1: -	long int intr_pos;
1: -	struct topa_entry *stop_te;
1: -	struct topa_entry *intr_te;
1: -	void **data_pages;
1: +  struct list_head tables;
1: +  struct topa *first;
1: +  struct topa *last;
1: +  struct topa *cur;
1: +  unsigned int cur_idx;
1: +  size_t output_off;
1: +  long unsigned int nr_pages;
1: +  local_t data_size;
1: +  local64_t head;
1: +  bool snapshot;
1: +  bool single;
1: +  long int stop_pos;
1: +  long int intr_pos;
1: +  struct topa_entry *stop_te;
1: +  struct topa_entry *intr_te;
1: +  void **data_pages;
1:  };
1:  
1:  struct topa {
1: -	struct list_head list;
1: -	u64 offset;
1: -	size_t size;
1: -	int last;
1: -	unsigned int z_count;
1: +  struct list_head list;
1: +  u64 offset;
1: +  size_t size;
1: +  int last;
1: +  unsigned int z_count;
1:  };
1:  
1:  struct pt_filter {
1: -	long unsigned int msr_a;
1: -	long unsigned int msr_b;
1: -	long unsigned int config;
1: +  long unsigned int msr_a;
1: +  long unsigned int msr_b;
1: +  long unsigned int config;
1:  };
1:  
1:  struct pt_filters {
1: -	struct pt_filter filter[4];
1: -	unsigned int nr_filters;
1: +  struct pt_filter filter[4];
1: +  unsigned int nr_filters;
1:  };
1:  
1:  struct pt {
1: -	struct perf_output_handle handle;
1: -	struct pt_filters filters;
1: -	int handle_nmi;
1: -	int vmx_on;
1: -	u64 output_base;
1: -	u64 output_mask;
1: +  struct perf_output_handle handle;
1: +  struct pt_filters filters;
1: +  int handle_nmi;
1: +  int vmx_on;
1: +  u64 output_base;
1: +  u64 output_mask;
1:  };
1:  
1:  struct pt_cap_desc {
1: -	const char *name;
1: -	u32 leaf;
1: -	u8 reg;
1: -	u32 mask;
1: +  const char *name;
1: +  u32 leaf;
1: +  u8 reg;
1: +  u32 mask;
1:  };
1:  
1:  struct pt_address_range {
1: -	long unsigned int msr_a;
1: -	long unsigned int msr_b;
1: -	unsigned int reg_off;
1: +  long unsigned int msr_a;
1: +  long unsigned int msr_b;
1: +  unsigned int reg_off;
1:  };
1:  
1:  struct topa_page {
1: -	struct topa_entry table[507];
1: -	struct topa topa;
1: +  struct topa_entry table[507];
1: +  struct topa topa;
1:  };
1:  
1:  typedef void (*exitcall_t)();
1:  
1:  struct x86_cpu_id {
1: -	__u16 vendor;
1: -	__u16 family;
1: -	__u16 model;
1: -	__u16 steppings;
1: -	__u16 feature;
1: -	kernel_ulong_t driver_data;
1: +  __u16 vendor;
1: +  __u16 family;
1: +  __u16 model;
1: +  __u16 steppings;
1: +  __u16 feature;
1: +  kernel_ulong_t driver_data;
1:  };
1:  
1:  enum hrtimer_mode {
1: -	HRTIMER_MODE_ABS = 0,
1: -	HRTIMER_MODE_REL = 1,
1: -	HRTIMER_MODE_PINNED = 2,
1: -	HRTIMER_MODE_SOFT = 4,
1: -	HRTIMER_MODE_HARD = 8,
1: -	HRTIMER_MODE_ABS_PINNED = 2,
1: -	HRTIMER_MODE_REL_PINNED = 3,
1: -	HRTIMER_MODE_ABS_SOFT = 4,
1: -	HRTIMER_MODE_REL_SOFT = 5,
1: -	HRTIMER_MODE_ABS_PINNED_SOFT = 6,
1: -	HRTIMER_MODE_REL_PINNED_SOFT = 7,
1: -	HRTIMER_MODE_ABS_HARD = 8,
1: -	HRTIMER_MODE_REL_HARD = 9,
1: -	HRTIMER_MODE_ABS_PINNED_HARD = 10,
1: -	HRTIMER_MODE_REL_PINNED_HARD = 11,
1: +  HRTIMER_MODE_ABS = 0,
1: +  HRTIMER_MODE_REL = 1,
1: +  HRTIMER_MODE_PINNED = 2,
1: +  HRTIMER_MODE_SOFT = 4,
1: +  HRTIMER_MODE_HARD = 8,
1: +  HRTIMER_MODE_ABS_PINNED = 2,
1: +  HRTIMER_MODE_REL_PINNED = 3,
1: +  HRTIMER_MODE_ABS_SOFT = 4,
1: +  HRTIMER_MODE_REL_SOFT = 5,
1: +  HRTIMER_MODE_ABS_PINNED_SOFT = 6,
1: +  HRTIMER_MODE_REL_PINNED_SOFT = 7,
1: +  HRTIMER_MODE_ABS_HARD = 8,
1: +  HRTIMER_MODE_REL_HARD = 9,
1: +  HRTIMER_MODE_ABS_PINNED_HARD = 10,
1: +  HRTIMER_MODE_REL_PINNED_HARD = 11,
1:  };
1:  
1:  struct acpi_device;
1:  
1:  struct pci_sysdata {
1: -	int domain;
1: -	int node;
1: -	struct acpi_device *companion;
1: -	void *iommu;
1: -	void *fwnode;
1: +  int domain;
1: +  int node;
1: +  struct acpi_device *companion;
1: +  void *iommu;
1: +  void *fwnode;
1:  };
1:  
1:  struct pci_extra_dev {
1: -	struct pci_dev *dev[4];
1: +  struct pci_dev *dev[4];
1:  };
1:  
1:  struct intel_uncore_pmu;
1: @@ -18173,909 +18328,908 @@ struct uncore_event_desc;
1:  struct freerunning_counters;
1:  
1:  struct intel_uncore_type {
1: -	const char *name;
1: -	int num_counters;
1: -	int num_boxes;
1: -	int perf_ctr_bits;
1: -	int fixed_ctr_bits;
1: -	int num_freerunning_types;
1: -	unsigned int perf_ctr;
1: -	unsigned int event_ctl;
1: -	unsigned int event_mask;
1: -	unsigned int event_mask_ext;
1: -	unsigned int fixed_ctr;
1: -	unsigned int fixed_ctl;
1: -	unsigned int box_ctl;
1: -	union {
1: -		unsigned int msr_offset;
1: -		unsigned int mmio_offset;
1: -	};
1: -	unsigned int mmio_map_size;
1: -	unsigned int num_shared_regs: 8;
1: -	unsigned int single_fixed: 1;
1: -	unsigned int pair_ctr_ctl: 1;
1: -	unsigned int *msr_offsets;
1: -	struct event_constraint unconstrainted;
1: -	struct event_constraint *constraints;
1: -	struct intel_uncore_pmu *pmus;
1: -	struct intel_uncore_ops *ops;
1: -	struct uncore_event_desc *event_descs;
1: -	struct freerunning_counters *freerunning;
1: -	const struct attribute_group *attr_groups[4];
1: -	const struct attribute_group **attr_update;
1: -	struct pmu *pmu;
1: -	u64 *topology;
1: -	int (*set_mapping)(struct intel_uncore_type *);
1: -	void (*cleanup_mapping)(struct intel_uncore_type *);
1: +  const char *name;
1: +  int num_counters;
1: +  int num_boxes;
1: +  int perf_ctr_bits;
1: +  int fixed_ctr_bits;
1: +  int num_freerunning_types;
1: +  unsigned int perf_ctr;
1: +  unsigned int event_ctl;
1: +  unsigned int event_mask;
1: +  unsigned int event_mask_ext;
1: +  unsigned int fixed_ctr;
1: +  unsigned int fixed_ctl;
1: +  unsigned int box_ctl;
1: +  union {
1: +    unsigned int msr_offset;
1: +    unsigned int mmio_offset;
1: +  };
1: +  unsigned int mmio_map_size;
1: +  unsigned int num_shared_regs : 8;
1: +  unsigned int single_fixed : 1;
1: +  unsigned int pair_ctr_ctl : 1;
1: +  unsigned int *msr_offsets;
1: +  struct event_constraint unconstrainted;
1: +  struct event_constraint *constraints;
1: +  struct intel_uncore_pmu *pmus;
1: +  struct intel_uncore_ops *ops;
1: +  struct uncore_event_desc *event_descs;
1: +  struct freerunning_counters *freerunning;
1: +  const struct attribute_group *attr_groups[4];
1: +  const struct attribute_group **attr_update;
1: +  struct pmu *pmu;
1: +  u64 *topology;
1: +  int (*set_mapping)(struct intel_uncore_type *);
1: +  void (*cleanup_mapping)(struct intel_uncore_type *);
1:  };
1:  
1:  struct intel_uncore_box;
1:  
1:  struct intel_uncore_pmu {
1: -	struct pmu pmu;
1: -	char name[32];
1: -	int pmu_idx;
1: -	int func_id;
1: -	bool registered;
1: -	atomic_t activeboxes;
1: -	struct intel_uncore_type *type;
1: -	struct intel_uncore_box **boxes;
1: +  struct pmu pmu;
1: +  char name[32];
1: +  int pmu_idx;
1: +  int func_id;
1: +  bool registered;
1: +  atomic_t activeboxes;
1: +  struct intel_uncore_type *type;
1: +  struct intel_uncore_box **boxes;
1:  };
1:  
1:  struct intel_uncore_ops {
1: -	void (*init_box)(struct intel_uncore_box *);
1: -	void (*exit_box)(struct intel_uncore_box *);
1: -	void (*disable_box)(struct intel_uncore_box *);
1: -	void (*enable_box)(struct intel_uncore_box *);
1: -	void (*disable_event)(struct intel_uncore_box *, struct perf_event *);
1: -	void (*enable_event)(struct intel_uncore_box *, struct perf_event *);
1: -	u64 (*read_counter)(struct intel_uncore_box *, struct perf_event *);
1: -	int (*hw_config)(struct intel_uncore_box *, struct perf_event *);
1: -	struct event_constraint * (*get_constraint)(struct intel_uncore_box *, struct perf_event *);
1: -	void (*put_constraint)(struct intel_uncore_box *, struct perf_event *);
1: +  void (*init_box)(struct intel_uncore_box *);
1: +  void (*exit_box)(struct intel_uncore_box *);
1: +  void (*disable_box)(struct intel_uncore_box *);
1: +  void (*enable_box)(struct intel_uncore_box *);
1: +  void (*disable_event)(struct intel_uncore_box *, struct perf_event *);
1: +  void (*enable_event)(struct intel_uncore_box *, struct perf_event *);
1: +  u64 (*read_counter)(struct intel_uncore_box *, struct perf_event *);
1: +  int (*hw_config)(struct intel_uncore_box *, struct perf_event *);
1: +  struct event_constraint *(*get_constraint)(struct intel_uncore_box *,
1: +                                             struct perf_event *);
1: +  void (*put_constraint)(struct intel_uncore_box *, struct perf_event *);
1:  };
1:  
1:  struct uncore_event_desc {
1: -	struct kobj_attribute attr;
1: -	const char *config;
1: +  struct kobj_attribute attr;
1: +  const char *config;
1:  };
1:  
1:  struct freerunning_counters {
1: -	unsigned int counter_base;
1: -	unsigned int counter_offset;
1: -	unsigned int box_offset;
1: -	unsigned int num_counters;
1: -	unsigned int bits;
1: -	unsigned int *box_offsets;
1: +  unsigned int counter_base;
1: +  unsigned int counter_offset;
1: +  unsigned int box_offset;
1: +  unsigned int num_counters;
1: +  unsigned int bits;
1: +  unsigned int *box_offsets;
1:  };
1:  
1:  struct intel_uncore_extra_reg {
1: -	raw_spinlock_t lock;
1: -	u64 config;
1: -	u64 config1;
1: -	u64 config2;
1: -	atomic_t ref;
1: +  raw_spinlock_t lock;
1: +  u64 config;
1: +  u64 config1;
1: +  u64 config2;
1: +  atomic_t ref;
1:  };
1:  
1:  struct intel_uncore_box {
1: -	int pci_phys_id;
1: -	int dieid;
1: -	int n_active;
1: -	int n_events;
1: -	int cpu;
1: -	long unsigned int flags;
1: -	atomic_t refcnt;
1: -	struct perf_event *events[10];
1: -	struct perf_event *event_list[10];
1: -	struct event_constraint *event_constraint[10];
1: -	long unsigned int active_mask[1];
1: -	u64 tags[10];
1: -	struct pci_dev *pci_dev;
1: -	struct intel_uncore_pmu *pmu;
1: -	u64 hrtimer_duration;
1: -	struct hrtimer hrtimer;
1: -	struct list_head list;
1: -	struct list_head active_list;
1: -	void *io_addr;
1: -	struct intel_uncore_extra_reg shared_regs[0];
1: +  int pci_phys_id;
1: +  int dieid;
1: +  int n_active;
1: +  int n_events;
1: +  int cpu;
1: +  long unsigned int flags;
1: +  atomic_t refcnt;
1: +  struct perf_event *events[10];
1: +  struct perf_event *event_list[10];
1: +  struct event_constraint *event_constraint[10];
1: +  long unsigned int active_mask[1];
1: +  u64 tags[10];
1: +  struct pci_dev *pci_dev;
1: +  struct intel_uncore_pmu *pmu;
1: +  u64 hrtimer_duration;
1: +  struct hrtimer hrtimer;
1: +  struct list_head list;
1: +  struct list_head active_list;
1: +  void *io_addr;
1: +  struct intel_uncore_extra_reg shared_regs[0];
1:  };
1:  
1:  struct pci2phy_map {
1: -	struct list_head list;
1: -	int segment;
1: -	int pbus_to_physid[256];
1: +  struct list_head list;
1: +  int segment;
1: +  int pbus_to_physid[256];
1:  };
1:  
1:  struct intel_uncore_init_fun {
1: -	void (*cpu_init)();
1: -	int (*pci_init)();
1: -	void (*mmio_init)();
1: +  void (*cpu_init)();
1: +  int (*pci_init)();
1: +  void (*mmio_init)();
1:  };
1:  
1:  enum {
1: -	EXTRA_REG_NHMEX_M_FILTER = 0,
1: -	EXTRA_REG_NHMEX_M_DSP = 1,
1: -	EXTRA_REG_NHMEX_M_ISS = 2,
1: -	EXTRA_REG_NHMEX_M_MAP = 3,
1: -	EXTRA_REG_NHMEX_M_MSC_THR = 4,
1: -	EXTRA_REG_NHMEX_M_PGT = 5,
1: -	EXTRA_REG_NHMEX_M_PLD = 6,
1: -	EXTRA_REG_NHMEX_M_ZDP_CTL_FVC = 7,
1: +  EXTRA_REG_NHMEX_M_FILTER = 0,
1: +  EXTRA_REG_NHMEX_M_DSP = 1,
1: +  EXTRA_REG_NHMEX_M_ISS = 2,
1: +  EXTRA_REG_NHMEX_M_MAP = 3,
1: +  EXTRA_REG_NHMEX_M_MSC_THR = 4,
1: +  EXTRA_REG_NHMEX_M_PGT = 5,
1: +  EXTRA_REG_NHMEX_M_PLD = 6,
1: +  EXTRA_REG_NHMEX_M_ZDP_CTL_FVC = 7,
1:  };
1:  
1:  enum {
1: -	SNB_PCI_UNCORE_IMC = 0,
1: +  SNB_PCI_UNCORE_IMC = 0,
1:  };
1:  
1:  enum perf_snb_uncore_imc_freerunning_types {
1: -	SNB_PCI_UNCORE_IMC_DATA_READS = 0,
1: -	SNB_PCI_UNCORE_IMC_DATA_WRITES = 1,
1: -	SNB_PCI_UNCORE_IMC_GT_REQUESTS = 2,
1: -	SNB_PCI_UNCORE_IMC_IA_REQUESTS = 3,
1: -	SNB_PCI_UNCORE_IMC_IO_REQUESTS = 4,
1: -	SNB_PCI_UNCORE_IMC_FREERUNNING_TYPE_MAX = 5,
1: +  SNB_PCI_UNCORE_IMC_DATA_READS = 0,
1: +  SNB_PCI_UNCORE_IMC_DATA_WRITES = 1,
1: +  SNB_PCI_UNCORE_IMC_GT_REQUESTS = 2,
1: +  SNB_PCI_UNCORE_IMC_IA_REQUESTS = 3,
1: +  SNB_PCI_UNCORE_IMC_IO_REQUESTS = 4,
1: +  SNB_PCI_UNCORE_IMC_FREERUNNING_TYPE_MAX = 5,
1:  };
1:  
1:  struct imc_uncore_pci_dev {
1: -	__u32 pci_id;
1: -	struct pci_driver *driver;
1: +  __u32 pci_id;
1: +  struct pci_driver *driver;
1:  };
1:  
1:  enum perf_tgl_uncore_imc_freerunning_types {
1: -	TGL_MMIO_UNCORE_IMC_DATA_TOTAL = 0,
1: -	TGL_MMIO_UNCORE_IMC_DATA_READ = 1,
1: -	TGL_MMIO_UNCORE_IMC_DATA_WRITE = 2,
1: -	TGL_MMIO_UNCORE_IMC_FREERUNNING_TYPE_MAX = 3,
1: +  TGL_MMIO_UNCORE_IMC_DATA_TOTAL = 0,
1: +  TGL_MMIO_UNCORE_IMC_DATA_READ = 1,
1: +  TGL_MMIO_UNCORE_IMC_DATA_WRITE = 2,
1: +  TGL_MMIO_UNCORE_IMC_FREERUNNING_TYPE_MAX = 3,
1:  };
1:  
1:  enum {
1: -	SNBEP_PCI_QPI_PORT0_FILTER = 0,
1: -	SNBEP_PCI_QPI_PORT1_FILTER = 1,
1: -	BDX_PCI_QPI_PORT2_FILTER = 2,
1: -	HSWEP_PCI_PCU_3 = 3,
1: +  SNBEP_PCI_QPI_PORT0_FILTER = 0,
1: +  SNBEP_PCI_QPI_PORT1_FILTER = 1,
1: +  BDX_PCI_QPI_PORT2_FILTER = 2,
1: +  HSWEP_PCI_PCU_3 = 3,
1:  };
1:  
1:  enum {
1: -	SNBEP_PCI_UNCORE_HA = 0,
1: -	SNBEP_PCI_UNCORE_IMC = 1,
1: -	SNBEP_PCI_UNCORE_QPI = 2,
1: -	SNBEP_PCI_UNCORE_R2PCIE = 3,
1: -	SNBEP_PCI_UNCORE_R3QPI = 4,
1: +  SNBEP_PCI_UNCORE_HA = 0,
1: +  SNBEP_PCI_UNCORE_IMC = 1,
1: +  SNBEP_PCI_UNCORE_QPI = 2,
1: +  SNBEP_PCI_UNCORE_R2PCIE = 3,
1: +  SNBEP_PCI_UNCORE_R3QPI = 4,
1:  };
1:  
1:  enum {
1: -	IVBEP_PCI_UNCORE_HA = 0,
1: -	IVBEP_PCI_UNCORE_IMC = 1,
1: -	IVBEP_PCI_UNCORE_IRP = 2,
1: -	IVBEP_PCI_UNCORE_QPI = 3,
1: -	IVBEP_PCI_UNCORE_R2PCIE = 4,
1: -	IVBEP_PCI_UNCORE_R3QPI = 5,
1: +  IVBEP_PCI_UNCORE_HA = 0,
1: +  IVBEP_PCI_UNCORE_IMC = 1,
1: +  IVBEP_PCI_UNCORE_IRP = 2,
1: +  IVBEP_PCI_UNCORE_QPI = 3,
1: +  IVBEP_PCI_UNCORE_R2PCIE = 4,
1: +  IVBEP_PCI_UNCORE_R3QPI = 5,
1:  };
1:  
1:  enum {
1: -	KNL_PCI_UNCORE_MC_UCLK = 0,
1: -	KNL_PCI_UNCORE_MC_DCLK = 1,
1: -	KNL_PCI_UNCORE_EDC_UCLK = 2,
1: -	KNL_PCI_UNCORE_EDC_ECLK = 3,
1: -	KNL_PCI_UNCORE_M2PCIE = 4,
1: -	KNL_PCI_UNCORE_IRP = 5,
1: +  KNL_PCI_UNCORE_MC_UCLK = 0,
1: +  KNL_PCI_UNCORE_MC_DCLK = 1,
1: +  KNL_PCI_UNCORE_EDC_UCLK = 2,
1: +  KNL_PCI_UNCORE_EDC_ECLK = 3,
1: +  KNL_PCI_UNCORE_M2PCIE = 4,
1: +  KNL_PCI_UNCORE_IRP = 5,
1:  };
1:  
1:  enum {
1: -	HSWEP_PCI_UNCORE_HA = 0,
1: -	HSWEP_PCI_UNCORE_IMC = 1,
1: -	HSWEP_PCI_UNCORE_IRP = 2,
1: -	HSWEP_PCI_UNCORE_QPI = 3,
1: -	HSWEP_PCI_UNCORE_R2PCIE = 4,
1: -	HSWEP_PCI_UNCORE_R3QPI = 5,
1: +  HSWEP_PCI_UNCORE_HA = 0,
1: +  HSWEP_PCI_UNCORE_IMC = 1,
1: +  HSWEP_PCI_UNCORE_IRP = 2,
1: +  HSWEP_PCI_UNCORE_QPI = 3,
1: +  HSWEP_PCI_UNCORE_R2PCIE = 4,
1: +  HSWEP_PCI_UNCORE_R3QPI = 5,
1:  };
1:  
1:  enum {
1: -	BDX_PCI_UNCORE_HA = 0,
1: -	BDX_PCI_UNCORE_IMC = 1,
1: -	BDX_PCI_UNCORE_IRP = 2,
1: -	BDX_PCI_UNCORE_QPI = 3,
1: -	BDX_PCI_UNCORE_R2PCIE = 4,
1: -	BDX_PCI_UNCORE_R3QPI = 5,
1: +  BDX_PCI_UNCORE_HA = 0,
1: +  BDX_PCI_UNCORE_IMC = 1,
1: +  BDX_PCI_UNCORE_IRP = 2,
1: +  BDX_PCI_UNCORE_QPI = 3,
1: +  BDX_PCI_UNCORE_R2PCIE = 4,
1: +  BDX_PCI_UNCORE_R3QPI = 5,
1:  };
1:  
1:  enum perf_uncore_iio_freerunning_type_id {
1: -	SKX_IIO_MSR_IOCLK = 0,
1: -	SKX_IIO_MSR_BW = 1,
1: -	SKX_IIO_MSR_UTIL = 2,
1: -	SKX_IIO_FREERUNNING_TYPE_MAX = 3,
1: +  SKX_IIO_MSR_IOCLK = 0,
1: +  SKX_IIO_MSR_BW = 1,
1: +  SKX_IIO_MSR_UTIL = 2,
1: +  SKX_IIO_FREERUNNING_TYPE_MAX = 3,
1:  };
1:  
1:  enum {
1: -	SKX_PCI_UNCORE_IMC = 0,
1: -	SKX_PCI_UNCORE_M2M = 1,
1: -	SKX_PCI_UNCORE_UPI = 2,
1: -	SKX_PCI_UNCORE_M2PCIE = 3,
1: -	SKX_PCI_UNCORE_M3UPI = 4,
1: +  SKX_PCI_UNCORE_IMC = 0,
1: +  SKX_PCI_UNCORE_M2M = 1,
1: +  SKX_PCI_UNCORE_UPI = 2,
1: +  SKX_PCI_UNCORE_M2PCIE = 3,
1: +  SKX_PCI_UNCORE_M3UPI = 4,
1:  };
1:  
1:  enum perf_uncore_snr_iio_freerunning_type_id {
1: -	SNR_IIO_MSR_IOCLK = 0,
1: -	SNR_IIO_MSR_BW_IN = 1,
1: -	SNR_IIO_FREERUNNING_TYPE_MAX = 2,
1: +  SNR_IIO_MSR_IOCLK = 0,
1: +  SNR_IIO_MSR_BW_IN = 1,
1: +  SNR_IIO_FREERUNNING_TYPE_MAX = 2,
1:  };
1:  
1:  enum {
1: -	SNR_PCI_UNCORE_M2M = 0,
1: -	SNR_PCI_UNCORE_PCIE3 = 1,
1: +  SNR_PCI_UNCORE_M2M = 0,
1: +  SNR_PCI_UNCORE_PCIE3 = 1,
1:  };
1:  
1:  enum perf_uncore_snr_imc_freerunning_type_id {
1: -	SNR_IMC_DCLK = 0,
1: -	SNR_IMC_DDR = 1,
1: -	SNR_IMC_FREERUNNING_TYPE_MAX = 2,
1: +  SNR_IMC_DCLK = 0,
1: +  SNR_IMC_DDR = 1,
1: +  SNR_IMC_FREERUNNING_TYPE_MAX = 2,
1:  };
1:  
1:  enum perf_uncore_icx_iio_freerunning_type_id {
1: -	ICX_IIO_MSR_IOCLK = 0,
1: -	ICX_IIO_MSR_BW_IN = 1,
1: -	ICX_IIO_FREERUNNING_TYPE_MAX = 2,
1: +  ICX_IIO_MSR_IOCLK = 0,
1: +  ICX_IIO_MSR_BW_IN = 1,
1: +  ICX_IIO_FREERUNNING_TYPE_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ICX_PCI_UNCORE_M2M = 0,
1: -	ICX_PCI_UNCORE_UPI = 1,
1: -	ICX_PCI_UNCORE_M3UPI = 2,
1: +  ICX_PCI_UNCORE_M2M = 0,
1: +  ICX_PCI_UNCORE_UPI = 1,
1: +  ICX_PCI_UNCORE_M3UPI = 2,
1:  };
1:  
1:  enum perf_uncore_icx_imc_freerunning_type_id {
1: -	ICX_IMC_DCLK = 0,
1: -	ICX_IMC_DDR = 1,
1: -	ICX_IMC_DDRT = 2,
1: -	ICX_IMC_FREERUNNING_TYPE_MAX = 3,
1: +  ICX_IMC_DCLK = 0,
1: +  ICX_IMC_DDR = 1,
1: +  ICX_IMC_DDRT = 2,
1: +  ICX_IMC_FREERUNNING_TYPE_MAX = 3,
1:  };
1:  
1:  struct real_mode_header {
1: -	u32 text_start;
1: -	u32 ro_end;
1: -	u32 trampoline_start;
1: -	u32 trampoline_header;
1: -	u32 trampoline_pgd;
1: -	u32 wakeup_start;
1: -	u32 wakeup_header;
1: -	u32 machine_real_restart_asm;
1: -	u32 machine_real_restart_seg;
1: +  u32 text_start;
1: +  u32 ro_end;
1: +  u32 trampoline_start;
1: +  u32 trampoline_header;
1: +  u32 trampoline_pgd;
1: +  u32 wakeup_start;
1: +  u32 wakeup_header;
1: +  u32 machine_real_restart_asm;
1: +  u32 machine_real_restart_seg;
1:  };
1:  
1:  struct trampoline_header {
1: -	u64 start;
1: -	u64 efer;
1: -	u32 cr4;
1: -	u32 flags;
1: +  u64 start;
1: +  u64 efer;
1: +  u32 cr4;
1: +  u32 flags;
1:  };
1:  
1:  struct pkru_state {
1: -	u32 pkru;
1: -	u32 pad;
1: +  u32 pkru;
1: +  u32 pad;
1:  };
1:  
1:  struct x86_hw_tss {
1: -	u32 reserved1;
1: -	u64 sp0;
1: -	u64 sp1;
1: -	u64 sp2;
1: -	u64 reserved2;
1: -	u64 ist[7];
1: -	u32 reserved3;
1: -	u32 reserved4;
1: -	u16 reserved5;
1: -	u16 io_bitmap_base;
1: +  u32 reserved1;
1: +  u64 sp0;
1: +  u64 sp1;
1: +  u64 sp2;
1: +  u64 reserved2;
1: +  u64 ist[7];
1: +  u32 reserved3;
1: +  u32 reserved4;
1: +  u16 reserved5;
1: +  u16 io_bitmap_base;
1:  } __attribute__((packed));
1:  
1:  struct x86_io_bitmap {
1: -	u64 prev_sequence;
1: -	unsigned int prev_max;
1: -	long unsigned int bitmap[1025];
1: -	long unsigned int mapall[1025];
1: +  u64 prev_sequence;
1: +  unsigned int prev_max;
1: +  long unsigned int bitmap[1025];
1: +  long unsigned int mapall[1025];
1:  };
1:  
1:  struct tss_struct {
1: -	struct x86_hw_tss x86_tss;
1: -	struct x86_io_bitmap io_bitmap;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct x86_hw_tss x86_tss;
1: +  struct x86_io_bitmap io_bitmap;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum show_regs_mode {
1: -	SHOW_REGS_SHORT = 0,
1: -	SHOW_REGS_USER = 1,
1: -	SHOW_REGS_ALL = 2,
1: +  SHOW_REGS_SHORT = 0,
1: +  SHOW_REGS_USER = 1,
1: +  SHOW_REGS_ALL = 2,
1:  };
1:  
1:  enum which_selector {
1: -	FS = 0,
1: -	GS = 1,
1: +  FS = 0,
1: +  GS = 1,
1:  };
1:  
1:  struct sigcontext_64 {
1: -	__u64 r8;
1: -	__u64 r9;
1: -	__u64 r10;
1: -	__u64 r11;
1: -	__u64 r12;
1: -	__u64 r13;
1: -	__u64 r14;
1: -	__u64 r15;
1: -	__u64 di;
1: -	__u64 si;
1: -	__u64 bp;
1: -	__u64 bx;
1: -	__u64 dx;
1: -	__u64 ax;
1: -	__u64 cx;
1: -	__u64 sp;
1: -	__u64 ip;
1: -	__u64 flags;
1: -	__u16 cs;
1: -	__u16 gs;
1: -	__u16 fs;
1: -	__u16 ss;
1: -	__u64 err;
1: -	__u64 trapno;
1: -	__u64 oldmask;
1: -	__u64 cr2;
1: -	__u64 fpstate;
1: -	__u64 reserved1[8];
1: +  __u64 r8;
1: +  __u64 r9;
1: +  __u64 r10;
1: +  __u64 r11;
1: +  __u64 r12;
1: +  __u64 r13;
1: +  __u64 r14;
1: +  __u64 r15;
1: +  __u64 di;
1: +  __u64 si;
1: +  __u64 bp;
1: +  __u64 bx;
1: +  __u64 dx;
1: +  __u64 ax;
1: +  __u64 cx;
1: +  __u64 sp;
1: +  __u64 ip;
1: +  __u64 flags;
1: +  __u16 cs;
1: +  __u16 gs;
1: +  __u16 fs;
1: +  __u16 ss;
1: +  __u64 err;
1: +  __u64 trapno;
1: +  __u64 oldmask;
1: +  __u64 cr2;
1: +  __u64 fpstate;
1: +  __u64 reserved1[8];
1:  };
1:  
1:  struct sigaltstack {
1: -	void *ss_sp;
1: -	int ss_flags;
1: -	size_t ss_size;
1: +  void *ss_sp;
1: +  int ss_flags;
1: +  size_t ss_size;
1:  };
1:  
1:  typedef struct sigaltstack stack_t;
1:  
1:  struct siginfo {
1: -	union {
1: -		struct {
1: -			int si_signo;
1: -			int si_errno;
1: -			int si_code;
1: -			union __sifields _sifields;
1: -		};
1: -		int _si_pad[32];
1: -	};
1: +  union {
1: +    struct {
1: +      int si_signo;
1: +      int si_errno;
1: +      int si_code;
1: +      union __sifields _sifields;
1: +    };
1: +    int _si_pad[32];
1: +  };
1:  };
1:  
1:  struct ksignal {
1: -	struct k_sigaction ka;
1: -	kernel_siginfo_t info;
1: -	int sig;
1: +  struct k_sigaction ka;
1: +  kernel_siginfo_t info;
1: +  int sig;
1:  };
1:  
1:  struct __large_struct {
1: -	long unsigned int buf[100];
1: +  long unsigned int buf[100];
1:  };
1:  
1:  typedef u32 compat_sigset_word;
1:  
1: -typedef struct {
1: -	compat_sigset_word sig[2];
1: -} compat_sigset_t;
1: +typedef struct { compat_sigset_word sig[2]; } compat_sigset_t;
1:  
1:  struct ucontext {
1: -	long unsigned int uc_flags;
1: -	struct ucontext *uc_link;
1: -	stack_t uc_stack;
1: -	struct sigcontext_64 uc_mcontext;
1: -	sigset_t uc_sigmask;
1: +  long unsigned int uc_flags;
1: +  struct ucontext *uc_link;
1: +  stack_t uc_stack;
1: +  struct sigcontext_64 uc_mcontext;
1: +  sigset_t uc_sigmask;
1:  };
1:  
1:  struct kernel_vm86_regs {
1: -	struct pt_regs pt;
1: -	short unsigned int es;
1: -	short unsigned int __esh;
1: -	short unsigned int ds;
1: -	short unsigned int __dsh;
1: -	short unsigned int fs;
1: -	short unsigned int __fsh;
1: -	short unsigned int gs;
1: -	short unsigned int __gsh;
1: +  struct pt_regs pt;
1: +  short unsigned int es;
1: +  short unsigned int __esh;
1: +  short unsigned int ds;
1: +  short unsigned int __dsh;
1: +  short unsigned int fs;
1: +  short unsigned int __fsh;
1: +  short unsigned int gs;
1: +  short unsigned int __gsh;
1:  };
1:  
1:  struct rt_sigframe {
1: -	char *pretcode;
1: -	struct ucontext uc;
1: -	struct siginfo info;
1: +  char *pretcode;
1: +  struct ucontext uc;
1: +  struct siginfo info;
1:  };
1:  
1:  typedef struct siginfo siginfo_t;
1: @@ -19091,160 +19245,161 @@ typedef s32 compat_int_t;
1:  typedef u32 __compat_uid32_t;
1:  
1:  union compat_sigval {
1: -	compat_int_t sival_int;
1: -	compat_uptr_t sival_ptr;
1: +  compat_int_t sival_int;
1: +  compat_uptr_t sival_ptr;
1:  };
1:  
1:  typedef union compat_sigval compat_sigval_t;
1:  
1:  struct compat_siginfo {
1: -	int si_signo;
1: -	int si_errno;
1: -	int si_code;
1: -	union {
1: -		int _pad[29];
1: -		struct {
1: -			compat_pid_t _pid;
1: -			__compat_uid32_t _uid;
1: -		} _kill;
1: -		struct {
1: -			compat_timer_t _tid;
1: -			int _overrun;
1: -			compat_sigval_t _sigval;
1: -		} _timer;
1: -		struct {
1: -			compat_pid_t _pid;
1: -			__compat_uid32_t _uid;
1: -			compat_sigval_t _sigval;
1: -		} _rt;
1: -		struct {
1: -			compat_pid_t _pid;
1: -			__compat_uid32_t _uid;
1: -			int _status;
1: -			compat_clock_t _utime;
1: -			compat_clock_t _stime;
1: -		} _sigchld;
1: -		struct {
1: -			compat_uptr_t _addr;
1: -			union {
1: -				short int _addr_lsb;
1: -				struct {
1: -					char _dummy_bnd[4];
1: -					compat_uptr_t _lower;
1: -					compat_uptr_t _upper;
1: -				} _addr_bnd;
1: -				struct {
1: -					char _dummy_pkey[4];
1: -					u32 _pkey;
1: -				} _addr_pkey;
1: -			};
1: -		} _sigfault;
1: -		struct {
1: -			compat_long_t _band;
1: -			int _fd;
1: -		} _sigpoll;
1: -		struct {
1: -			compat_uptr_t _call_addr;
1: -			int _syscall;
1: -			unsigned int _arch;
1: -		} _sigsys;
1: -	} _sifields;
1: +  int si_signo;
1: +  int si_errno;
1: +  int si_code;
1: +  union {
1: +    int _pad[29];
1: +    struct {
1: +      compat_pid_t _pid;
1: +      __compat_uid32_t _uid;
1: +    } _kill;
1: +    struct {
1: +      compat_timer_t _tid;
1: +      int _overrun;
1: +      compat_sigval_t _sigval;
1: +    } _timer;
1: +    struct {
1: +      compat_pid_t _pid;
1: +      __compat_uid32_t _uid;
1: +      compat_sigval_t _sigval;
1: +    } _rt;
1: +    struct {
1: +      compat_pid_t _pid;
1: +      __compat_uid32_t _uid;
1: +      int _status;
1: +      compat_clock_t _utime;
1: +      compat_clock_t _stime;
1: +    } _sigchld;
1: +    struct {
1: +      compat_uptr_t _addr;
1: +      union {
1: +        short int _addr_lsb;
1: +        struct {
1: +          char _dummy_bnd[4];
1: +          compat_uptr_t _lower;
1: +          compat_uptr_t _upper;
1: +        } _addr_bnd;
1: +        struct {
1: +          char _dummy_pkey[4];
1: +          u32 _pkey;
1: +        } _addr_pkey;
1: +      };
1: +    } _sigfault;
1: +    struct {
1: +      compat_long_t _band;
1: +      int _fd;
1: +    } _sigpoll;
1: +    struct {
1: +      compat_uptr_t _call_addr;
1: +      int _syscall;
1: +      unsigned int _arch;
1: +    } _sigsys;
1: +  } _sifields;
1:  };
1:  
1:  typedef struct compat_siginfo compat_siginfo_t;
1:  
1:  enum bug_trap_type {
1: -	BUG_TRAP_TYPE_NONE = 0,
1: -	BUG_TRAP_TYPE_WARN = 1,
1: -	BUG_TRAP_TYPE_BUG = 2,
1: +  BUG_TRAP_TYPE_NONE = 0,
1: +  BUG_TRAP_TYPE_WARN = 1,
1: +  BUG_TRAP_TYPE_BUG = 2,
1:  };
1:  
1:  typedef u8 kprobe_opcode_t;
1:  
1:  struct arch_specific_insn {
1: -	kprobe_opcode_t *insn;
1: -	bool boostable;
1: -	bool if_modifier;
1: -	int tp_len;
1: +  kprobe_opcode_t *insn;
1: +  bool boostable;
1: +  bool if_modifier;
1: +  int tp_len;
1:  };
1:  
1:  struct kprobe;
1:  
1:  typedef int (*kprobe_pre_handler_t)(struct kprobe *, struct pt_regs *);
1:  
1: -typedef void (*kprobe_post_handler_t)(struct kprobe *, struct pt_regs *, long unsigned int);
1: +typedef void (*kprobe_post_handler_t)(struct kprobe *, struct pt_regs *,
1: +                                      long unsigned int);
1:  
1:  typedef int (*kprobe_fault_handler_t)(struct kprobe *, struct pt_regs *, int);
1:  
1:  struct kprobe {
1: -	struct hlist_node hlist;
1: -	struct list_head list;
1: -	long unsigned int nmissed;
1: -	kprobe_opcode_t *addr;
1: -	const char *symbol_name;
1: -	unsigned int offset;
1: -	kprobe_pre_handler_t pre_handler;
1: -	kprobe_post_handler_t post_handler;
1: -	kprobe_fault_handler_t fault_handler;
1: -	kprobe_opcode_t opcode;
1: -	struct arch_specific_insn ainsn;
1: -	u32 flags;
1: +  struct hlist_node hlist;
1: +  struct list_head list;
1: +  long unsigned int nmissed;
1: +  kprobe_opcode_t *addr;
1: +  const char *symbol_name;
1: +  unsigned int offset;
1: +  kprobe_pre_handler_t pre_handler;
1: +  kprobe_post_handler_t post_handler;
1: +  kprobe_fault_handler_t fault_handler;
1: +  kprobe_opcode_t opcode;
1: +  struct arch_specific_insn ainsn;
1: +  u32 flags;
1:  };
1:  
1:  enum die_val {
1: -	DIE_OOPS = 1,
1: -	DIE_INT3 = 2,
1: -	DIE_DEBUG = 3,
1: -	DIE_PANIC = 4,
1: -	DIE_NMI = 5,
1: -	DIE_DIE = 6,
1: -	DIE_KERNELDEBUG = 7,
1: -	DIE_TRAP = 8,
1: -	DIE_GPF = 9,
1: -	DIE_CALL = 10,
1: -	DIE_PAGE_FAULT = 11,
1: -	DIE_NMIUNKNOWN = 12,
1: +  DIE_OOPS = 1,
1: +  DIE_INT3 = 2,
1: +  DIE_DEBUG = 3,
1: +  DIE_PANIC = 4,
1: +  DIE_NMI = 5,
1: +  DIE_DIE = 6,
1: +  DIE_KERNELDEBUG = 7,
1: +  DIE_TRAP = 8,
1: +  DIE_GPF = 9,
1: +  DIE_CALL = 10,
1: +  DIE_PAGE_FAULT = 11,
1: +  DIE_NMIUNKNOWN = 12,
1:  };
1:  
1:  struct irqentry_state {
1: -	bool exit_rcu;
1: +  bool exit_rcu;
1:  };
1:  
1:  typedef struct irqentry_state irqentry_state_t;
1:  
1:  enum kernel_gp_hint {
1: -	GP_NO_HINT = 0,
1: -	GP_NON_CANONICAL = 1,
1: -	GP_CANONICAL = 2,
1: +  GP_NO_HINT = 0,
1: +  GP_NON_CANONICAL = 1,
1: +  GP_CANONICAL = 2,
1:  };
1:  
1:  struct bad_iret_stack {
1: -	void *error_entry_ret;
1: -	struct pt_regs regs;
1: +  void *error_entry_ret;
1: +  struct pt_regs regs;
1:  };
1:  
1:  enum {
1: -	GATE_INTERRUPT = 14,
1: -	GATE_TRAP = 15,
1: -	GATE_CALL = 12,
1: -	GATE_TASK = 5,
1: +  GATE_INTERRUPT = 14,
1: +  GATE_TRAP = 15,
1: +  GATE_CALL = 12,
1: +  GATE_TASK = 5,
1:  };
1:  
1:  struct idt_data {
1: -	unsigned int vector;
1: -	unsigned int segment;
1: -	struct idt_bits bits;
1: -	const void *addr;
1: +  unsigned int vector;
1: +  unsigned int segment;
1: +  struct idt_bits bits;
1: +  const void *addr;
1:  };
1:  
1:  struct irq_stack {
1: -	char stack[16384];
1: +  char stack[16384];
1:  };
1:  
1:  enum irqreturn {
1: -	IRQ_NONE = 0,
1: -	IRQ_HANDLED = 1,
1: -	IRQ_WAKE_THREAD = 2,
1: +  IRQ_NONE = 0,
1: +  IRQ_HANDLED = 1,
1: +  IRQ_WAKE_THREAD = 2,
1:  };
1:  
1:  typedef enum irqreturn irqreturn_t;
1: @@ -19252,38 +19407,38 @@ typedef enum irqreturn irqreturn_t;
1:  typedef irqreturn_t (*irq_handler_t)(int, void *);
1:  
1:  struct irqaction {
1: -	irq_handler_t handler;
1: -	void *dev_id;
1: -	void *percpu_dev_id;
1: -	struct irqaction *next;
1: -	irq_handler_t thread_fn;
1: -	struct task_struct *thread;
1: -	struct irqaction *secondary;
1: -	unsigned int irq;
1: -	unsigned int flags;
1: -	long unsigned int thread_flags;
1: -	long unsigned int thread_mask;
1: -	const char *name;
1: -	struct proc_dir_entry *dir;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  irq_handler_t handler;
1: +  void *dev_id;
1: +  void *percpu_dev_id;
1: +  struct irqaction *next;
1: +  irq_handler_t thread_fn;
1: +  struct task_struct *thread;
1: +  struct irqaction *secondary;
1: +  unsigned int irq;
1: +  unsigned int flags;
1: +  long unsigned int thread_flags;
1: +  long unsigned int thread_mask;
1: +  const char *name;
1: +  struct proc_dir_entry *dir;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct irq_affinity_notify {
1: -	unsigned int irq;
1: -	struct kref kref;
1: -	struct work_struct work;
1: -	void (*notify)(struct irq_affinity_notify *, const cpumask_t *);
1: -	void (*release)(struct kref *);
1: +  unsigned int irq;
1: +  struct kref kref;
1: +  struct work_struct work;
1: +  void (*notify)(struct irq_affinity_notify *, const cpumask_t *);
1: +  void (*release)(struct kref *);
1:  };
1:  
1:  enum irqchip_irq_state {
1: -	IRQCHIP_STATE_PENDING = 0,
1: -	IRQCHIP_STATE_ACTIVE = 1,
1: -	IRQCHIP_STATE_MASKED = 2,
1: -	IRQCHIP_STATE_LINE_LEVEL = 3,
1: +  IRQCHIP_STATE_PENDING = 0,
1: +  IRQCHIP_STATE_ACTIVE = 1,
1: +  IRQCHIP_STATE_MASKED = 2,
1: +  IRQCHIP_STATE_LINE_LEVEL = 3,
1:  };
1:  
1:  struct irq_desc;
1: @@ -19293,190 +19448,191 @@ typedef void (*irq_flow_handler_t)(struct irq_desc *);
1:  struct msi_desc;
1:  
1:  struct irq_common_data {
1: -	unsigned int state_use_accessors;
1: -	unsigned int node;
1: -	void *handler_data;
1: -	struct msi_desc *msi_desc;
1: -	cpumask_var_t affinity;
1: -	cpumask_var_t effective_affinity;
1: +  unsigned int state_use_accessors;
1: +  unsigned int node;
1: +  void *handler_data;
1: +  struct msi_desc *msi_desc;
1: +  cpumask_var_t affinity;
1: +  cpumask_var_t effective_affinity;
1:  };
1:  
1:  struct irq_chip;
1:  
1:  struct irq_data {
1: -	u32 mask;
1: -	unsigned int irq;
1: -	long unsigned int hwirq;
1: -	struct irq_common_data *common;
1: -	struct irq_chip *chip;
1: -	struct irq_domain *domain;
1: -	struct irq_data *parent_data;
1: -	void *chip_data;
1: +  u32 mask;
1: +  unsigned int irq;
1: +  long unsigned int hwirq;
1: +  struct irq_common_data *common;
1: +  struct irq_chip *chip;
1: +  struct irq_domain *domain;
1: +  struct irq_data *parent_data;
1: +  void *chip_data;
1:  };
1:  
1:  struct irq_desc {
1: -	struct irq_common_data irq_common_data;
1: -	struct irq_data irq_data;
1: -	unsigned int *kstat_irqs;
1: -	irq_flow_handler_t handle_irq;
1: -	struct irqaction *action;
1: -	unsigned int status_use_accessors;
1: -	unsigned int core_internal_state__do_not_mess_with_it;
1: -	unsigned int depth;
1: -	unsigned int wake_depth;
1: -	unsigned int tot_count;
1: -	unsigned int irq_count;
1: -	long unsigned int last_unhandled;
1: -	unsigned int irqs_unhandled;
1: -	atomic_t threads_handled;
1: -	int threads_handled_last;
1: -	raw_spinlock_t lock;
1: -	struct cpumask *percpu_enabled;
1: -	const struct cpumask *percpu_affinity;
1: -	const struct cpumask *affinity_hint;
1: -	struct irq_affinity_notify *affinity_notify;
1: -	cpumask_var_t pending_mask;
1: -	long unsigned int threads_oneshot;
1: -	atomic_t threads_active;
1: -	wait_queue_head_t wait_for_threads;
1: -	unsigned int nr_actions;
1: -	unsigned int no_suspend_depth;
1: -	unsigned int cond_suspend_depth;
1: -	unsigned int force_resume_depth;
1: -	struct proc_dir_entry *dir;
1: -	struct callback_head rcu;
1: -	struct kobject kobj;
1: -	struct mutex request_mutex;
1: -	int parent_irq;
1: -	struct module *owner;
1: -	const char *name;
1: -	long: 64;
1: +  struct irq_common_data irq_common_data;
1: +  struct irq_data irq_data;
1: +  unsigned int *kstat_irqs;
1: +  irq_flow_handler_t handle_irq;
1: +  struct irqaction *action;
1: +  unsigned int status_use_accessors;
1: +  unsigned int core_internal_state__do_not_mess_with_it;
1: +  unsigned int depth;
1: +  unsigned int wake_depth;
1: +  unsigned int tot_count;
1: +  unsigned int irq_count;
1: +  long unsigned int last_unhandled;
1: +  unsigned int irqs_unhandled;
1: +  atomic_t threads_handled;
1: +  int threads_handled_last;
1: +  raw_spinlock_t lock;
1: +  struct cpumask *percpu_enabled;
1: +  const struct cpumask *percpu_affinity;
1: +  const struct cpumask *affinity_hint;
1: +  struct irq_affinity_notify *affinity_notify;
1: +  cpumask_var_t pending_mask;
1: +  long unsigned int threads_oneshot;
1: +  atomic_t threads_active;
1: +  wait_queue_head_t wait_for_threads;
1: +  unsigned int nr_actions;
1: +  unsigned int no_suspend_depth;
1: +  unsigned int cond_suspend_depth;
1: +  unsigned int force_resume_depth;
1: +  struct proc_dir_entry *dir;
1: +  struct callback_head rcu;
1: +  struct kobject kobj;
1: +  struct mutex request_mutex;
1: +  int parent_irq;
1: +  struct module *owner;
1: +  const char *name;
1: +  long : 64;
1:  };
1:  
1:  struct msi_msg;
1:  
1:  struct irq_chip {
1: -	struct device *parent_device;
1: -	const char *name;
1: -	unsigned int (*irq_startup)(struct irq_data *);
1: -	void (*irq_shutdown)(struct irq_data *);
1: -	void (*irq_enable)(struct irq_data *);
1: -	void (*irq_disable)(struct irq_data *);
1: -	void (*irq_ack)(struct irq_data *);
1: -	void (*irq_mask)(struct irq_data *);
1: -	void (*irq_mask_ack)(struct irq_data *);
1: -	void (*irq_unmask)(struct irq_data *);
1: -	void (*irq_eoi)(struct irq_data *);
1: -	int (*irq_set_affinity)(struct irq_data *, const struct cpumask *, bool);
1: -	int (*irq_retrigger)(struct irq_data *);
1: -	int (*irq_set_type)(struct irq_data *, unsigned int);
1: -	int (*irq_set_wake)(struct irq_data *, unsigned int);
1: -	void (*irq_bus_lock)(struct irq_data *);
1: -	void (*irq_bus_sync_unlock)(struct irq_data *);
1: -	void (*irq_cpu_online)(struct irq_data *);
1: -	void (*irq_cpu_offline)(struct irq_data *);
1: -	void (*irq_suspend)(struct irq_data *);
1: -	void (*irq_resume)(struct irq_data *);
1: -	void (*irq_pm_shutdown)(struct irq_data *);
1: -	void (*irq_calc_mask)(struct irq_data *);
1: -	void (*irq_print_chip)(struct irq_data *, struct seq_file *);
1: -	int (*irq_request_resources)(struct irq_data *);
1: -	void (*irq_release_resources)(struct irq_data *);
1: -	void (*irq_compose_msi_msg)(struct irq_data *, struct msi_msg *);
1: -	void (*irq_write_msi_msg)(struct irq_data *, struct msi_msg *);
1: -	int (*irq_get_irqchip_state)(struct irq_data *, enum irqchip_irq_state, bool *);
1: -	int (*irq_set_irqchip_state)(struct irq_data *, enum irqchip_irq_state, bool);
1: -	int (*irq_set_vcpu_affinity)(struct irq_data *, void *);
1: -	void (*ipi_send_single)(struct irq_data *, unsigned int);
1: -	void (*ipi_send_mask)(struct irq_data *, const struct cpumask *);
1: -	int (*irq_nmi_setup)(struct irq_data *);
1: -	void (*irq_nmi_teardown)(struct irq_data *);
1: -	long unsigned int flags;
1: +  struct device *parent_device;
1: +  const char *name;
1: +  unsigned int (*irq_startup)(struct irq_data *);
1: +  void (*irq_shutdown)(struct irq_data *);
1: +  void (*irq_enable)(struct irq_data *);
1: +  void (*irq_disable)(struct irq_data *);
1: +  void (*irq_ack)(struct irq_data *);
1: +  void (*irq_mask)(struct irq_data *);
1: +  void (*irq_mask_ack)(struct irq_data *);
1: +  void (*irq_unmask)(struct irq_data *);
1: +  void (*irq_eoi)(struct irq_data *);
1: +  int (*irq_set_affinity)(struct irq_data *, const struct cpumask *, bool);
1: +  int (*irq_retrigger)(struct irq_data *);
1: +  int (*irq_set_type)(struct irq_data *, unsigned int);
1: +  int (*irq_set_wake)(struct irq_data *, unsigned int);
1: +  void (*irq_bus_lock)(struct irq_data *);
1: +  void (*irq_bus_sync_unlock)(struct irq_data *);
1: +  void (*irq_cpu_online)(struct irq_data *);
1: +  void (*irq_cpu_offline)(struct irq_data *);
1: +  void (*irq_suspend)(struct irq_data *);
1: +  void (*irq_resume)(struct irq_data *);
1: +  void (*irq_pm_shutdown)(struct irq_data *);
1: +  void (*irq_calc_mask)(struct irq_data *);
1: +  void (*irq_print_chip)(struct irq_data *, struct seq_file *);
1: +  int (*irq_request_resources)(struct irq_data *);
1: +  void (*irq_release_resources)(struct irq_data *);
1: +  void (*irq_compose_msi_msg)(struct irq_data *, struct msi_msg *);
1: +  void (*irq_write_msi_msg)(struct irq_data *, struct msi_msg *);
1: +  int (*irq_get_irqchip_state)(struct irq_data *, enum irqchip_irq_state,
1: +                               bool *);
1: +  int (*irq_set_irqchip_state)(struct irq_data *, enum irqchip_irq_state, bool);
1: +  int (*irq_set_vcpu_affinity)(struct irq_data *, void *);
1: +  void (*ipi_send_single)(struct irq_data *, unsigned int);
1: +  void (*ipi_send_mask)(struct irq_data *, const struct cpumask *);
1: +  int (*irq_nmi_setup)(struct irq_data *);
1: +  void (*irq_nmi_teardown)(struct irq_data *);
1: +  long unsigned int flags;
1:  };
1:  
1:  typedef struct irq_desc *vector_irq_t[256];
1:  
1:  struct trace_event_raw_x86_irq_vector {
1: -	struct trace_entry ent;
1: -	int vector;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int vector;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_config {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	unsigned int vector;
1: -	unsigned int cpu;
1: -	unsigned int apicdest;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  unsigned int vector;
1: +  unsigned int cpu;
1: +  unsigned int apicdest;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_mod {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	unsigned int vector;
1: -	unsigned int cpu;
1: -	unsigned int prev_vector;
1: -	unsigned int prev_cpu;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  unsigned int vector;
1: +  unsigned int cpu;
1: +  unsigned int prev_vector;
1: +  unsigned int prev_cpu;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_reserve {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_alloc {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	unsigned int vector;
1: -	bool reserved;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  unsigned int vector;
1: +  bool reserved;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_alloc_managed {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	unsigned int vector;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  unsigned int vector;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_activate {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	bool is_managed;
1: -	bool can_reserve;
1: -	bool reserve;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  bool is_managed;
1: +  bool can_reserve;
1: +  bool reserve;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_teardown {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	bool is_managed;
1: -	bool has_reserved;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  bool is_managed;
1: +  bool has_reserved;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_setup {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	bool is_legacy;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  bool is_legacy;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_vector_free_moved {
1: -	struct trace_entry ent;
1: -	unsigned int irq;
1: -	unsigned int cpu;
1: -	unsigned int vector;
1: -	bool is_managed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int irq;
1: +  unsigned int cpu;
1: +  unsigned int vector;
1: +  bool is_managed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_x86_irq_vector {};
1: @@ -19543,355 +19699,365 @@ typedef void (*btf_trace_thermal_apic_entry)(void *, int);
1:  
1:  typedef void (*btf_trace_thermal_apic_exit)(void *, int);
1:  
1: -typedef void (*btf_trace_vector_config)(void *, unsigned int, unsigned int, unsigned int, unsigned int);
1: +typedef void (*btf_trace_vector_config)(void *, unsigned int, unsigned int,
1: +                                        unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_vector_update)(void *, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int);
1: +typedef void (*btf_trace_vector_update)(void *, unsigned int, unsigned int,
1: +                                        unsigned int, unsigned int,
1: +                                        unsigned int);
1:  
1: -typedef void (*btf_trace_vector_clear)(void *, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int);
1: +typedef void (*btf_trace_vector_clear)(void *, unsigned int, unsigned int,
1: +                                       unsigned int, unsigned int,
1: +                                       unsigned int);
1:  
1:  typedef void (*btf_trace_vector_reserve_managed)(void *, unsigned int, int);
1:  
1:  typedef void (*btf_trace_vector_reserve)(void *, unsigned int, int);
1:  
1: -typedef void (*btf_trace_vector_alloc)(void *, unsigned int, unsigned int, bool, int);
1: +typedef void (*btf_trace_vector_alloc)(void *, unsigned int, unsigned int, bool,
1: +                                       int);
1:  
1: -typedef void (*btf_trace_vector_alloc_managed)(void *, unsigned int, unsigned int, int);
1: +typedef void (*btf_trace_vector_alloc_managed)(void *, unsigned int,
1: +                                               unsigned int, int);
1:  
1: -typedef void (*btf_trace_vector_activate)(void *, unsigned int, bool, bool, bool);
1: +typedef void (*btf_trace_vector_activate)(void *, unsigned int, bool, bool,
1: +                                          bool);
1:  
1: -typedef void (*btf_trace_vector_deactivate)(void *, unsigned int, bool, bool, bool);
1: +typedef void (*btf_trace_vector_deactivate)(void *, unsigned int, bool, bool,
1: +                                            bool);
1:  
1:  typedef void (*btf_trace_vector_teardown)(void *, unsigned int, bool, bool);
1:  
1:  typedef void (*btf_trace_vector_setup)(void *, unsigned int, bool, int);
1:  
1: -typedef void (*btf_trace_vector_free_moved)(void *, unsigned int, unsigned int, unsigned int, bool);
1: +typedef void (*btf_trace_vector_free_moved)(void *, unsigned int, unsigned int,
1: +                                            unsigned int, bool);
1:  
1:  struct cea_exception_stacks {
1: -	char DF_stack_guard[4096];
1: -	char DF_stack[4096];
1: -	char NMI_stack_guard[4096];
1: -	char NMI_stack[4096];
1: -	char DB_stack_guard[4096];
1: -	char DB_stack[4096];
1: -	char MCE_stack_guard[4096];
1: -	char MCE_stack[4096];
1: -	char VC_stack_guard[4096];
1: -	char VC_stack[4096];
1: -	char VC2_stack_guard[4096];
1: -	char VC2_stack[4096];
1: -	char IST_top_guard[4096];
1: +  char DF_stack_guard[4096];
1: +  char DF_stack[4096];
1: +  char NMI_stack_guard[4096];
1: +  char NMI_stack[4096];
1: +  char DB_stack_guard[4096];
1: +  char DB_stack[4096];
1: +  char MCE_stack_guard[4096];
1: +  char MCE_stack[4096];
1: +  char VC_stack_guard[4096];
1: +  char VC_stack[4096];
1: +  char VC2_stack_guard[4096];
1: +  char VC2_stack[4096];
1: +  char IST_top_guard[4096];
1:  };
1:  
1:  struct estack_pages {
1: -	u32 offs;
1: -	u16 size;
1: -	u16 type;
1: +  u32 offs;
1: +  u16 size;
1: +  u16 type;
1:  };
1:  
1:  struct clocksource {
1: -	u64 (*read)(struct clocksource *);
1: -	u64 mask;
1: -	u32 mult;
1: -	u32 shift;
1: -	u64 max_idle_ns;
1: -	u32 maxadj;
1: -	u64 max_cycles;
1: -	const char *name;
1: -	struct list_head list;
1: -	int rating;
1: -	enum vdso_clock_mode vdso_clock_mode;
1: -	long unsigned int flags;
1: -	int (*enable)(struct clocksource *);
1: -	void (*disable)(struct clocksource *);
1: -	void (*suspend)(struct clocksource *);
1: -	void (*resume)(struct clocksource *);
1: -	void (*mark_unstable)(struct clocksource *);
1: -	void (*tick_stable)(struct clocksource *);
1: -	struct list_head wd_list;
1: -	u64 cs_last;
1: -	u64 wd_last;
1: -	struct module *owner;
1: +  u64 (*read)(struct clocksource *);
1: +  u64 mask;
1: +  u32 mult;
1: +  u32 shift;
1: +  u64 max_idle_ns;
1: +  u32 maxadj;
1: +  u64 max_cycles;
1: +  const char *name;
1: +  struct list_head list;
1: +  int rating;
1: +  enum vdso_clock_mode vdso_clock_mode;
1: +  long unsigned int flags;
1: +  int (*enable)(struct clocksource *);
1: +  void (*disable)(struct clocksource *);
1: +  void (*suspend)(struct clocksource *);
1: +  void (*resume)(struct clocksource *);
1: +  void (*mark_unstable)(struct clocksource *);
1: +  void (*tick_stable)(struct clocksource *);
1: +  struct list_head wd_list;
1: +  u64 cs_last;
1: +  u64 wd_last;
1: +  struct module *owner;
1:  };
1:  
1:  struct x86_init_mpparse {
1: -	void (*setup_ioapic_ids)();
1: -	void (*find_smp_config)();
1: -	void (*get_smp_config)(unsigned int);
1: +  void (*setup_ioapic_ids)();
1: +  void (*find_smp_config)();
1: +  void (*get_smp_config)(unsigned int);
1:  };
1:  
1:  struct x86_init_resources {
1: -	void (*probe_roms)();
1: -	void (*reserve_resources)();
1: -	char * (*memory_setup)();
1: +  void (*probe_roms)();
1: +  void (*reserve_resources)();
1: +  char *(*memory_setup)();
1:  };
1:  
1:  struct x86_init_irqs {
1: -	void (*pre_vector_init)();
1: -	void (*intr_init)();
1: -	void (*intr_mode_select)();
1: -	void (*intr_mode_init)();
1: -	struct irq_domain * (*create_pci_msi_domain)();
1: +  void (*pre_vector_init)();
1: +  void (*intr_init)();
1: +  void (*intr_mode_select)();
1: +  void (*intr_mode_init)();
1: +  struct irq_domain *(*create_pci_msi_domain)();
1:  };
1:  
1:  struct x86_init_oem {
1: -	void (*arch_setup)();
1: -	void (*banner)();
1: +  void (*arch_setup)();
1: +  void (*banner)();
1:  };
1:  
1:  struct x86_init_paging {
1: -	void (*pagetable_init)();
1: +  void (*pagetable_init)();
1:  };
1:  
1:  struct x86_init_timers {
1: -	void (*setup_percpu_clockev)();
1: -	void (*timer_init)();
1: -	void (*wallclock_init)();
1: +  void (*setup_percpu_clockev)();
1: +  void (*timer_init)();
1: +  void (*wallclock_init)();
1:  };
1:  
1:  struct x86_init_iommu {
1: -	int (*iommu_init)();
1: +  int (*iommu_init)();
1:  };
1:  
1:  struct x86_init_pci {
1: -	int (*arch_init)();
1: -	int (*init)();
1: -	void (*init_irq)();
1: -	void (*fixup_irqs)();
1: +  int (*arch_init)();
1: +  int (*init)();
1: +  void (*init_irq)();
1: +  void (*fixup_irqs)();
1:  };
1:  
1:  struct x86_hyper_init {
1: -	void (*init_platform)();
1: -	void (*guest_late_init)();
1: -	bool (*x2apic_available)();
1: -	void (*init_mem_mapping)();
1: -	void (*init_after_bootmem)();
1: +  void (*init_platform)();
1: +  void (*guest_late_init)();
1: +  bool (*x2apic_available)();
1: +  void (*init_mem_mapping)();
1: +  void (*init_after_bootmem)();
1:  };
1:  
1:  struct x86_init_acpi {
1: -	void (*set_root_pointer)(u64);
1: -	u64 (*get_root_pointer)();
1: -	void (*reduced_hw_early_init)();
1: +  void (*set_root_pointer)(u64);
1: +  u64 (*get_root_pointer)();
1: +  void (*reduced_hw_early_init)();
1:  };
1:  
1:  struct x86_init_ops {
1: -	struct x86_init_resources resources;
1: -	struct x86_init_mpparse mpparse;
1: -	struct x86_init_irqs irqs;
1: -	struct x86_init_oem oem;
1: -	struct x86_init_paging paging;
1: -	struct x86_init_timers timers;
1: -	struct x86_init_iommu iommu;
1: -	struct x86_init_pci pci;
1: -	struct x86_hyper_init hyper;
1: -	struct x86_init_acpi acpi;
1: +  struct x86_init_resources resources;
1: +  struct x86_init_mpparse mpparse;
1: +  struct x86_init_irqs irqs;
1: +  struct x86_init_oem oem;
1: +  struct x86_init_paging paging;
1: +  struct x86_init_timers timers;
1: +  struct x86_init_iommu iommu;
1: +  struct x86_init_pci pci;
1: +  struct x86_hyper_init hyper;
1: +  struct x86_init_acpi acpi;
1:  };
1:  
1:  enum clock_event_state {
1: -	CLOCK_EVT_STATE_DETACHED = 0,
1: -	CLOCK_EVT_STATE_SHUTDOWN = 1,
1: -	CLOCK_EVT_STATE_PERIODIC = 2,
1: -	CLOCK_EVT_STATE_ONESHOT = 3,
1: -	CLOCK_EVT_STATE_ONESHOT_STOPPED = 4,
1: +  CLOCK_EVT_STATE_DETACHED = 0,
1: +  CLOCK_EVT_STATE_SHUTDOWN = 1,
1: +  CLOCK_EVT_STATE_PERIODIC = 2,
1: +  CLOCK_EVT_STATE_ONESHOT = 3,
1: +  CLOCK_EVT_STATE_ONESHOT_STOPPED = 4,
1:  };
1:  
1:  struct clock_event_device {
1: -	void (*event_handler)(struct clock_event_device *);
1: -	int (*set_next_event)(long unsigned int, struct clock_event_device *);
1: -	int (*set_next_ktime)(ktime_t, struct clock_event_device *);
1: -	ktime_t next_event;
1: -	u64 max_delta_ns;
1: -	u64 min_delta_ns;
1: -	u32 mult;
1: -	u32 shift;
1: -	enum clock_event_state state_use_accessors;
1: -	unsigned int features;
1: -	long unsigned int retries;
1: -	int (*set_state_periodic)(struct clock_event_device *);
1: -	int (*set_state_oneshot)(struct clock_event_device *);
1: -	int (*set_state_oneshot_stopped)(struct clock_event_device *);
1: -	int (*set_state_shutdown)(struct clock_event_device *);
1: -	int (*tick_resume)(struct clock_event_device *);
1: -	void (*broadcast)(const struct cpumask *);
1: -	void (*suspend)(struct clock_event_device *);
1: -	void (*resume)(struct clock_event_device *);
1: -	long unsigned int min_delta_ticks;
1: -	long unsigned int max_delta_ticks;
1: -	const char *name;
1: -	int rating;
1: -	int irq;
1: -	int bound_on;
1: -	const struct cpumask *cpumask;
1: -	struct list_head list;
1: -	struct module *owner;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  void (*event_handler)(struct clock_event_device *);
1: +  int (*set_next_event)(long unsigned int, struct clock_event_device *);
1: +  int (*set_next_ktime)(ktime_t, struct clock_event_device *);
1: +  ktime_t next_event;
1: +  u64 max_delta_ns;
1: +  u64 min_delta_ns;
1: +  u32 mult;
1: +  u32 shift;
1: +  enum clock_event_state state_use_accessors;
1: +  unsigned int features;
1: +  long unsigned int retries;
1: +  int (*set_state_periodic)(struct clock_event_device *);
1: +  int (*set_state_oneshot)(struct clock_event_device *);
1: +  int (*set_state_oneshot_stopped)(struct clock_event_device *);
1: +  int (*set_state_shutdown)(struct clock_event_device *);
1: +  int (*tick_resume)(struct clock_event_device *);
1: +  void (*broadcast)(const struct cpumask *);
1: +  void (*suspend)(struct clock_event_device *);
1: +  void (*resume)(struct clock_event_device *);
1: +  long unsigned int min_delta_ticks;
1: +  long unsigned int max_delta_ticks;
1: +  const char *name;
1: +  int rating;
1: +  int irq;
1: +  int bound_on;
1: +  const struct cpumask *cpumask;
1: +  struct list_head list;
1: +  struct module *owner;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct irq_affinity_desc {
1: -	struct cpumask mask;
1: -	unsigned int is_managed: 1;
1: +  struct cpumask mask;
1: +  unsigned int is_managed : 1;
1:  };
1:  
1:  struct msi_msg {
1: -	u32 address_lo;
1: -	u32 address_hi;
1: -	u32 data;
1: +  u32 address_lo;
1: +  u32 address_hi;
1: +  u32 data;
1:  };
1:  
1:  struct platform_msi_priv_data;
1:  
1:  struct platform_msi_desc {
1: -	struct platform_msi_priv_data *msi_priv_data;
1: -	u16 msi_index;
1: +  struct platform_msi_priv_data *msi_priv_data;
1: +  u16 msi_index;
1:  };
1:  
1:  struct fsl_mc_msi_desc {
1: -	u16 msi_index;
1: +  u16 msi_index;
1:  };
1:  
1:  struct ti_sci_inta_msi_desc {
1: -	u16 dev_index;
1: +  u16 dev_index;
1:  };
1:  
1:  struct msi_desc {
1: -	struct list_head list;
1: -	unsigned int irq;
1: -	unsigned int nvec_used;
1: -	struct device *dev;
1: -	struct msi_msg msg;
1: -	struct irq_affinity_desc *affinity;
1: -	void (*write_msi_msg)(struct msi_desc *, void *);
1: -	void *write_msi_msg_data;
1: -	union {
1: -		struct {
1: -			u32 masked;
1: -			struct {
1: -				u8 is_msix: 1;
1: -				u8 multiple: 3;
1: -				u8 multi_cap: 3;
1: -				u8 maskbit: 1;
1: -				u8 is_64: 1;
1: -				u8 is_virtual: 1;
1: -				u16 entry_nr;
1: -				unsigned int default_irq;
1: -			} msi_attrib;
1: -			union {
1: -				u8 mask_pos;
1: -				void *mask_base;
1: -			};
1: -		};
1: -		struct platform_msi_desc platform;
1: -		struct fsl_mc_msi_desc fsl_mc;
1: -		struct ti_sci_inta_msi_desc inta;
1: -	};
1: +  struct list_head list;
1: +  unsigned int irq;
1: +  unsigned int nvec_used;
1: +  struct device *dev;
1: +  struct msi_msg msg;
1: +  struct irq_affinity_desc *affinity;
1: +  void (*write_msi_msg)(struct msi_desc *, void *);
1: +  void *write_msi_msg_data;
1: +  union {
1: +    struct {
1: +      u32 masked;
1: +      struct {
1: +        u8 is_msix : 1;
1: +        u8 multiple : 3;
1: +        u8 multi_cap : 3;
1: +        u8 maskbit : 1;
1: +        u8 is_64 : 1;
1: +        u8 is_virtual : 1;
1: +        u16 entry_nr;
1: +        unsigned int default_irq;
1: +      } msi_attrib;
1: +      union {
1: +        u8 mask_pos;
1: +        void *mask_base;
1: +      };
1: +    };
1: +    struct platform_msi_desc platform;
1: +    struct fsl_mc_msi_desc fsl_mc;
1: +    struct ti_sci_inta_msi_desc inta;
1: +  };
1:  };
1:  
1:  struct irq_chip_regs {
1: -	long unsigned int enable;
1: -	long unsigned int disable;
1: -	long unsigned int mask;
1: -	long unsigned int ack;
1: -	long unsigned int eoi;
1: -	long unsigned int type;
1: -	long unsigned int polarity;
1: +  long unsigned int enable;
1: +  long unsigned int disable;
1: +  long unsigned int mask;
1: +  long unsigned int ack;
1: +  long unsigned int eoi;
1: +  long unsigned int type;
1: +  long unsigned int polarity;
1:  };
1:  
1:  struct irq_chip_type {
1: -	struct irq_chip chip;
1: -	struct irq_chip_regs regs;
1: -	irq_flow_handler_t handler;
1: -	u32 type;
1: -	u32 mask_cache_priv;
1: -	u32 *mask_cache;
1: +  struct irq_chip chip;
1: +  struct irq_chip_regs regs;
1: +  irq_flow_handler_t handler;
1: +  u32 type;
1: +  u32 mask_cache_priv;
1: +  u32 *mask_cache;
1:  };
1:  
1:  struct irq_chip_generic {
1: -	raw_spinlock_t lock;
1: -	void *reg_base;
1: -	u32 (*reg_readl)(void *);
1: -	void (*reg_writel)(u32, void *);
1: -	void (*suspend)(struct irq_chip_generic *);
1: -	void (*resume)(struct irq_chip_generic *);
1: -	unsigned int irq_base;
1: -	unsigned int irq_cnt;
1: -	u32 mask_cache;
1: -	u32 type_cache;
1: -	u32 polarity_cache;
1: -	u32 wake_enabled;
1: -	u32 wake_active;
1: -	unsigned int num_ct;
1: -	void *private;
1: -	long unsigned int installed;
1: -	long unsigned int unused;
1: -	struct irq_domain *domain;
1: -	struct list_head list;
1: -	struct irq_chip_type chip_types[0];
1: +  raw_spinlock_t lock;
1: +  void *reg_base;
1: +  u32 (*reg_readl)(void *);
1: +  void (*reg_writel)(u32, void *);
1: +  void (*suspend)(struct irq_chip_generic *);
1: +  void (*resume)(struct irq_chip_generic *);
1: +  unsigned int irq_base;
1: +  unsigned int irq_cnt;
1: +  u32 mask_cache;
1: +  u32 type_cache;
1: +  u32 polarity_cache;
1: +  u32 wake_enabled;
1: +  u32 wake_active;
1: +  unsigned int num_ct;
1: +  void *private;
1: +  long unsigned int installed;
1: +  long unsigned int unused;
1: +  struct irq_domain *domain;
1: +  struct list_head list;
1: +  struct irq_chip_type chip_types[0];
1:  };
1:  
1:  enum irq_gc_flags {
1: -	IRQ_GC_INIT_MASK_CACHE = 1,
1: -	IRQ_GC_INIT_NESTED_LOCK = 2,
1: -	IRQ_GC_MASK_CACHE_PER_TYPE = 4,
1: -	IRQ_GC_NO_MASK = 8,
1: -	IRQ_GC_BE_IO = 16,
1: +  IRQ_GC_INIT_MASK_CACHE = 1,
1: +  IRQ_GC_INIT_NESTED_LOCK = 2,
1: +  IRQ_GC_MASK_CACHE_PER_TYPE = 4,
1: +  IRQ_GC_NO_MASK = 8,
1: +  IRQ_GC_BE_IO = 16,
1:  };
1:  
1:  struct irq_domain_chip_generic {
1: -	unsigned int irqs_per_chip;
1: -	unsigned int num_chips;
1: -	unsigned int irq_flags_to_clear;
1: -	unsigned int irq_flags_to_set;
1: -	enum irq_gc_flags gc_flags;
1: -	struct irq_chip_generic *gc[0];
1: +  unsigned int irqs_per_chip;
1: +  unsigned int num_chips;
1: +  unsigned int irq_flags_to_clear;
1: +  unsigned int irq_flags_to_set;
1: +  enum irq_gc_flags gc_flags;
1: +  struct irq_chip_generic *gc[0];
1:  };
1:  
1:  enum refcount_saturation_type {
1: -	REFCOUNT_ADD_NOT_ZERO_OVF = 0,
1: -	REFCOUNT_ADD_OVF = 1,
1: -	REFCOUNT_ADD_UAF = 2,
1: -	REFCOUNT_SUB_UAF = 3,
1: -	REFCOUNT_DEC_LEAK = 4,
1: +  REFCOUNT_ADD_NOT_ZERO_OVF = 0,
1: +  REFCOUNT_ADD_OVF = 1,
1: +  REFCOUNT_ADD_UAF = 2,
1: +  REFCOUNT_SUB_UAF = 3,
1: +  REFCOUNT_DEC_LEAK = 4,
1:  };
1:  
1:  enum lockdown_reason {
1: -	LOCKDOWN_NONE = 0,
1: -	LOCKDOWN_MODULE_SIGNATURE = 1,
1: -	LOCKDOWN_DEV_MEM = 2,
1: -	LOCKDOWN_EFI_TEST = 3,
1: -	LOCKDOWN_KEXEC = 4,
1: -	LOCKDOWN_HIBERNATION = 5,
1: -	LOCKDOWN_PCI_ACCESS = 6,
1: -	LOCKDOWN_IOPORT = 7,
1: -	LOCKDOWN_MSR = 8,
1: -	LOCKDOWN_ACPI_TABLES = 9,
1: -	LOCKDOWN_PCMCIA_CIS = 10,
1: -	LOCKDOWN_TIOCSSERIAL = 11,
1: -	LOCKDOWN_MODULE_PARAMETERS = 12,
1: -	LOCKDOWN_MMIOTRACE = 13,
1: -	LOCKDOWN_DEBUGFS = 14,
1: -	LOCKDOWN_XMON_WR = 15,
1: -	LOCKDOWN_INTEGRITY_MAX = 16,
1: -	LOCKDOWN_KCORE = 17,
1: -	LOCKDOWN_KPROBES = 18,
1: -	LOCKDOWN_BPF_READ = 19,
1: -	LOCKDOWN_PERF = 20,
1: -	LOCKDOWN_TRACEFS = 21,
1: -	LOCKDOWN_XMON_RW = 22,
1: -	LOCKDOWN_CONFIDENTIALITY_MAX = 23,
1: +  LOCKDOWN_NONE = 0,
1: +  LOCKDOWN_MODULE_SIGNATURE = 1,
1: +  LOCKDOWN_DEV_MEM = 2,
1: +  LOCKDOWN_EFI_TEST = 3,
1: +  LOCKDOWN_KEXEC = 4,
1: +  LOCKDOWN_HIBERNATION = 5,
1: +  LOCKDOWN_PCI_ACCESS = 6,
1: +  LOCKDOWN_IOPORT = 7,
1: +  LOCKDOWN_MSR = 8,
1: +  LOCKDOWN_ACPI_TABLES = 9,
1: +  LOCKDOWN_PCMCIA_CIS = 10,
1: +  LOCKDOWN_TIOCSSERIAL = 11,
1: +  LOCKDOWN_MODULE_PARAMETERS = 12,
1: +  LOCKDOWN_MMIOTRACE = 13,
1: +  LOCKDOWN_DEBUGFS = 14,
1: +  LOCKDOWN_XMON_WR = 15,
1: +  LOCKDOWN_INTEGRITY_MAX = 16,
1: +  LOCKDOWN_KCORE = 17,
1: +  LOCKDOWN_KPROBES = 18,
1: +  LOCKDOWN_BPF_READ = 19,
1: +  LOCKDOWN_PERF = 20,
1: +  LOCKDOWN_TRACEFS = 21,
1: +  LOCKDOWN_XMON_RW = 22,
1: +  LOCKDOWN_CONFIDENTIALITY_MAX = 23,
1:  };
1:  
1:  enum lockdep_ok {
1: -	LOCKDEP_STILL_OK = 0,
1: -	LOCKDEP_NOW_UNRELIABLE = 1,
1: +  LOCKDEP_STILL_OK = 0,
1: +  LOCKDEP_NOW_UNRELIABLE = 1,
1:  };
1:  
1:  struct entry_stack {
1: -	char stack[4096];
1: +  char stack[4096];
1:  };
1:  
1:  typedef long unsigned int uintptr_t;
1: @@ -19899,11 +20065,11 @@ typedef long unsigned int uintptr_t;
1:  typedef u64 uint64_t;
1:  
1:  struct trace_event_raw_nmi_handler {
1: -	struct trace_entry ent;
1: -	void *handler;
1: -	s64 delta_ns;
1: -	int handled;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *handler;
1: +  s64 delta_ns;
1: +  int handled;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_nmi_handler {};
1: @@ -19911,95 +20077,95 @@ struct trace_event_data_offsets_nmi_handler {};
1:  typedef void (*btf_trace_nmi_handler)(void *, void *, s64, int);
1:  
1:  struct nmi_desc {
1: -	raw_spinlock_t lock;
1: -	struct list_head head;
1: +  raw_spinlock_t lock;
1: +  struct list_head head;
1:  };
1:  
1:  struct nmi_stats {
1: -	unsigned int normal;
1: -	unsigned int unknown;
1: -	unsigned int external;
1: -	unsigned int swallow;
1: +  unsigned int normal;
1: +  unsigned int unknown;
1: +  unsigned int external;
1: +  unsigned int swallow;
1:  };
1:  
1:  enum nmi_states {
1: -	NMI_NOT_RUNNING = 0,
1: -	NMI_EXECUTING = 1,
1: -	NMI_LATCHED = 2,
1: +  NMI_NOT_RUNNING = 0,
1: +  NMI_EXECUTING = 1,
1: +  NMI_LATCHED = 2,
1:  };
1:  
1:  enum {
1: -	DESC_TSS = 9,
1: -	DESC_LDT = 2,
1: -	DESCTYPE_S = 16,
1: +  DESC_TSS = 9,
1: +  DESC_LDT = 2,
1: +  DESCTYPE_S = 16,
1:  };
1:  
1:  struct ldttss_desc {
1: -	u16 limit0;
1: -	u16 base0;
1: -	u16 base1: 8;
1: -	u16 type: 5;
1: -	u16 dpl: 2;
1: -	u16 p: 1;
1: -	u16 limit1: 4;
1: -	u16 zero0: 3;
1: -	u16 g: 1;
1: -	u16 base2: 8;
1: -	u32 base3;
1: -	u32 zero1;
1: +  u16 limit0;
1: +  u16 base0;
1: +  u16 base1 : 8;
1: +  u16 type : 5;
1: +  u16 dpl : 2;
1: +  u16 p : 1;
1: +  u16 limit1 : 4;
1: +  u16 zero0 : 3;
1: +  u16 g : 1;
1: +  u16 base2 : 8;
1: +  u32 base3;
1: +  u32 zero1;
1:  };
1:  
1:  typedef struct ldttss_desc ldt_desc;
1:  
1:  struct user_desc {
1: -	unsigned int entry_number;
1: -	unsigned int base_addr;
1: -	unsigned int limit;
1: -	unsigned int seg_32bit: 1;
1: -	unsigned int contents: 2;
1: -	unsigned int read_exec_only: 1;
1: -	unsigned int limit_in_pages: 1;
1: -	unsigned int seg_not_present: 1;
1: -	unsigned int useable: 1;
1: -	unsigned int lm: 1;
1: +  unsigned int entry_number;
1: +  unsigned int base_addr;
1: +  unsigned int limit;
1: +  unsigned int seg_32bit : 1;
1: +  unsigned int contents : 2;
1: +  unsigned int read_exec_only : 1;
1: +  unsigned int limit_in_pages : 1;
1: +  unsigned int seg_not_present : 1;
1: +  unsigned int useable : 1;
1: +  unsigned int lm : 1;
1:  };
1:  
1:  struct mmu_gather_batch {
1: -	struct mmu_gather_batch *next;
1: -	unsigned int nr;
1: -	unsigned int max;
1: -	struct page *pages[0];
1: +  struct mmu_gather_batch *next;
1: +  unsigned int nr;
1: +  unsigned int max;
1: +  struct page *pages[0];
1:  };
1:  
1:  struct mmu_gather {
1: -	struct mm_struct *mm;
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	unsigned int fullmm: 1;
1: -	unsigned int need_flush_all: 1;
1: -	unsigned int freed_tables: 1;
1: -	unsigned int cleared_ptes: 1;
1: -	unsigned int cleared_pmds: 1;
1: -	unsigned int cleared_puds: 1;
1: -	unsigned int cleared_p4ds: 1;
1: -	unsigned int vma_exec: 1;
1: -	unsigned int vma_huge: 1;
1: -	unsigned int batch_count;
1: -	struct mmu_gather_batch *active;
1: -	struct mmu_gather_batch local;
1: -	struct page *__pages[8];
1: +  struct mm_struct *mm;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  unsigned int fullmm : 1;
1: +  unsigned int need_flush_all : 1;
1: +  unsigned int freed_tables : 1;
1: +  unsigned int cleared_ptes : 1;
1: +  unsigned int cleared_pmds : 1;
1: +  unsigned int cleared_puds : 1;
1: +  unsigned int cleared_p4ds : 1;
1: +  unsigned int vma_exec : 1;
1: +  unsigned int vma_huge : 1;
1: +  unsigned int batch_count;
1: +  struct mmu_gather_batch *active;
1: +  struct mmu_gather_batch local;
1: +  struct page *__pages[8];
1:  };
1:  
1:  enum con_scroll {
1: -	SM_UP = 0,
1: -	SM_DOWN = 1,
1: +  SM_UP = 0,
1: +  SM_DOWN = 1,
1:  };
1:  
1:  enum vc_intensity {
1: -	VCI_HALF_BRIGHT = 0,
1: -	VCI_NORMAL = 1,
1: -	VCI_BOLD = 2,
1: -	VCI_MASK = 3,
1: +  VCI_HALF_BRIGHT = 0,
1: +  VCI_NORMAL = 1,
1: +  VCI_BOLD = 2,
1: +  VCI_MASK = 3,
1:  };
1:  
1:  struct vc_data;
1: @@ -20007,61 +20173,65 @@ struct vc_data;
1:  struct console_font;
1:  
1:  struct consw {
1: -	struct module *owner;
1: -	const char * (*con_startup)();
1: -	void (*con_init)(struct vc_data *, int);
1: -	void (*con_deinit)(struct vc_data *);
1: -	void (*con_clear)(struct vc_data *, int, int, int, int);
1: -	void (*con_putc)(struct vc_data *, int, int, int);
1: -	void (*con_putcs)(struct vc_data *, const short unsigned int *, int, int, int);
1: -	void (*con_cursor)(struct vc_data *, int);
1: -	bool (*con_scroll)(struct vc_data *, unsigned int, unsigned int, enum con_scroll, unsigned int);
1: -	int (*con_switch)(struct vc_data *);
1: -	int (*con_blank)(struct vc_data *, int, int);
1: -	int (*con_font_set)(struct vc_data *, struct console_font *, unsigned int);
1: -	int (*con_font_get)(struct vc_data *, struct console_font *);
1: -	int (*con_font_default)(struct vc_data *, struct console_font *, char *);
1: -	int (*con_font_copy)(struct vc_data *, int);
1: -	int (*con_resize)(struct vc_data *, unsigned int, unsigned int, unsigned int);
1: -	void (*con_set_palette)(struct vc_data *, const unsigned char *);
1: -	void (*con_scrolldelta)(struct vc_data *, int);
1: -	int (*con_set_origin)(struct vc_data *);
1: -	void (*con_save_screen)(struct vc_data *);
1: -	u8 (*con_build_attr)(struct vc_data *, u8, enum vc_intensity, bool, bool, bool, bool);
1: -	void (*con_invert_region)(struct vc_data *, u16 *, int);
1: -	u16 * (*con_screen_pos)(const struct vc_data *, int);
1: -	long unsigned int (*con_getxy)(struct vc_data *, long unsigned int, int *, int *);
1: -	void (*con_flush_scrollback)(struct vc_data *);
1: -	int (*con_debug_enter)(struct vc_data *);
1: -	int (*con_debug_leave)(struct vc_data *);
1: +  struct module *owner;
1: +  const char *(*con_startup)();
1: +  void (*con_init)(struct vc_data *, int);
1: +  void (*con_deinit)(struct vc_data *);
1: +  void (*con_clear)(struct vc_data *, int, int, int, int);
1: +  void (*con_putc)(struct vc_data *, int, int, int);
1: +  void (*con_putcs)(struct vc_data *, const short unsigned int *, int, int,
1: +                    int);
1: +  void (*con_cursor)(struct vc_data *, int);
1: +  bool (*con_scroll)(struct vc_data *, unsigned int, unsigned int,
1: +                     enum con_scroll, unsigned int);
1: +  int (*con_switch)(struct vc_data *);
1: +  int (*con_blank)(struct vc_data *, int, int);
1: +  int (*con_font_set)(struct vc_data *, struct console_font *, unsigned int);
1: +  int (*con_font_get)(struct vc_data *, struct console_font *);
1: +  int (*con_font_default)(struct vc_data *, struct console_font *, char *);
1: +  int (*con_font_copy)(struct vc_data *, int);
1: +  int (*con_resize)(struct vc_data *, unsigned int, unsigned int, unsigned int);
1: +  void (*con_set_palette)(struct vc_data *, const unsigned char *);
1: +  void (*con_scrolldelta)(struct vc_data *, int);
1: +  int (*con_set_origin)(struct vc_data *);
1: +  void (*con_save_screen)(struct vc_data *);
1: +  u8 (*con_build_attr)(struct vc_data *, u8, enum vc_intensity, bool, bool,
1: +                       bool, bool);
1: +  void (*con_invert_region)(struct vc_data *, u16 *, int);
1: +  u16 *(*con_screen_pos)(const struct vc_data *, int);
1: +  long unsigned int (*con_getxy)(struct vc_data *, long unsigned int, int *,
1: +                                 int *);
1: +  void (*con_flush_scrollback)(struct vc_data *);
1: +  int (*con_debug_enter)(struct vc_data *);
1: +  int (*con_debug_leave)(struct vc_data *);
1:  };
1:  
1:  struct vc_state {
1: -	unsigned int x;
1: -	unsigned int y;
1: -	unsigned char color;
1: -	unsigned char Gx_charset[2];
1: -	unsigned int charset: 1;
1: -	enum vc_intensity intensity;
1: -	bool italic;
1: -	bool underline;
1: -	bool blink;
1: -	bool reverse;
1: +  unsigned int x;
1: +  unsigned int y;
1: +  unsigned char color;
1: +  unsigned char Gx_charset[2];
1: +  unsigned int charset : 1;
1: +  enum vc_intensity intensity;
1: +  bool italic;
1: +  bool underline;
1: +  bool blink;
1: +  bool reverse;
1:  };
1:  
1:  struct console_font {
1: -	unsigned int width;
1: -	unsigned int height;
1: -	unsigned int charcount;
1: -	unsigned char *data;
1: +  unsigned int width;
1: +  unsigned int height;
1: +  unsigned int charcount;
1: +  unsigned char *data;
1:  };
1:  
1:  struct vt_mode {
1: -	char mode;
1: -	char waitv;
1: -	short int relsig;
1: -	short int acqsig;
1: -	short int frsig;
1: +  char mode;
1: +  char waitv;
1: +  short int relsig;
1: +  short int acqsig;
1: +  short int frsig;
1:  };
1:  
1:  struct uni_pagedir;
1: @@ -20069,324 +20239,323 @@ struct uni_pagedir;
1:  struct uni_screen;
1:  
1:  struct vc_data {
1: -	struct tty_port port;
1: -	struct vc_state state;
1: -	struct vc_state saved_state;
1: -	short unsigned int vc_num;
1: -	unsigned int vc_cols;
1: -	unsigned int vc_rows;
1: -	unsigned int vc_size_row;
1: -	unsigned int vc_scan_lines;
1: -	long unsigned int vc_origin;
1: -	long unsigned int vc_scr_end;
1: -	long unsigned int vc_visible_origin;
1: -	unsigned int vc_top;
1: -	unsigned int vc_bottom;
1: -	const struct consw *vc_sw;
1: -	short unsigned int *vc_screenbuf;
1: -	unsigned int vc_screenbuf_size;
1: -	unsigned char vc_mode;
1: -	unsigned char vc_attr;
1: -	unsigned char vc_def_color;
1: -	unsigned char vc_ulcolor;
1: -	unsigned char vc_itcolor;
1: -	unsigned char vc_halfcolor;
1: -	unsigned int vc_cursor_type;
1: -	short unsigned int vc_complement_mask;
1: -	short unsigned int vc_s_complement_mask;
1: -	long unsigned int vc_pos;
1: -	short unsigned int vc_hi_font_mask;
1: -	struct console_font vc_font;
1: -	short unsigned int vc_video_erase_char;
1: -	unsigned int vc_state;
1: -	unsigned int vc_npar;
1: -	unsigned int vc_par[16];
1: -	struct vt_mode vt_mode;
1: -	struct pid *vt_pid;
1: -	int vt_newvt;
1: -	wait_queue_head_t paste_wait;
1: -	unsigned int vc_disp_ctrl: 1;
1: -	unsigned int vc_toggle_meta: 1;
1: -	unsigned int vc_decscnm: 1;
1: -	unsigned int vc_decom: 1;
1: -	unsigned int vc_decawm: 1;
1: -	unsigned int vc_deccm: 1;
1: -	unsigned int vc_decim: 1;
1: -	unsigned int vc_priv: 3;
1: -	unsigned int vc_need_wrap: 1;
1: -	unsigned int vc_can_do_color: 1;
1: -	unsigned int vc_report_mouse: 2;
1: -	unsigned char vc_utf: 1;
1: -	unsigned char vc_utf_count;
1: -	int vc_utf_char;
1: -	long unsigned int vc_tab_stop[4];
1: -	unsigned char vc_palette[48];
1: -	short unsigned int *vc_translate;
1: -	unsigned int vc_resize_user;
1: -	unsigned int vc_bell_pitch;
1: -	unsigned int vc_bell_duration;
1: -	short unsigned int vc_cur_blink_ms;
1: -	struct vc_data **vc_display_fg;
1: -	struct uni_pagedir *vc_uni_pagedir;
1: -	struct uni_pagedir **vc_uni_pagedir_loc;
1: -	struct uni_screen *vc_uni_screen;
1: +  struct tty_port port;
1: +  struct vc_state state;
1: +  struct vc_state saved_state;
1: +  short unsigned int vc_num;
1: +  unsigned int vc_cols;
1: +  unsigned int vc_rows;
1: +  unsigned int vc_size_row;
1: +  unsigned int vc_scan_lines;
1: +  long unsigned int vc_origin;
1: +  long unsigned int vc_scr_end;
1: +  long unsigned int vc_visible_origin;
1: +  unsigned int vc_top;
1: +  unsigned int vc_bottom;
1: +  const struct consw *vc_sw;
1: +  short unsigned int *vc_screenbuf;
1: +  unsigned int vc_screenbuf_size;
1: +  unsigned char vc_mode;
1: +  unsigned char vc_attr;
1: +  unsigned char vc_def_color;
1: +  unsigned char vc_ulcolor;
1: +  unsigned char vc_itcolor;
1: +  unsigned char vc_halfcolor;
1: +  unsigned int vc_cursor_type;
1: +  short unsigned int vc_complement_mask;
1: +  short unsigned int vc_s_complement_mask;
1: +  long unsigned int vc_pos;
1: +  short unsigned int vc_hi_font_mask;
1: +  struct console_font vc_font;
1: +  short unsigned int vc_video_erase_char;
1: +  unsigned int vc_state;
1: +  unsigned int vc_npar;
1: +  unsigned int vc_par[16];
1: +  struct vt_mode vt_mode;
1: +  struct pid *vt_pid;
1: +  int vt_newvt;
1: +  wait_queue_head_t paste_wait;
1: +  unsigned int vc_disp_ctrl : 1;
1: +  unsigned int vc_toggle_meta : 1;
1: +  unsigned int vc_decscnm : 1;
1: +  unsigned int vc_decom : 1;
1: +  unsigned int vc_decawm : 1;
1: +  unsigned int vc_deccm : 1;
1: +  unsigned int vc_decim : 1;
1: +  unsigned int vc_priv : 3;
1: +  unsigned int vc_need_wrap : 1;
1: +  unsigned int vc_can_do_color : 1;
1: +  unsigned int vc_report_mouse : 2;
1: +  unsigned char vc_utf : 1;
1: +  unsigned char vc_utf_count;
1: +  int vc_utf_char;
1: +  long unsigned int vc_tab_stop[4];
1: +  unsigned char vc_palette[48];
1: +  short unsigned int *vc_translate;
1: +  unsigned int vc_resize_user;
1: +  unsigned int vc_bell_pitch;
1: +  unsigned int vc_bell_duration;
1: +  short unsigned int vc_cur_blink_ms;
1: +  struct vc_data **vc_display_fg;
1: +  struct uni_pagedir *vc_uni_pagedir;
1: +  struct uni_pagedir **vc_uni_pagedir_loc;
1: +  struct uni_screen *vc_uni_screen;
1:  };
1:  
1:  struct edd {
1: -	unsigned int mbr_signature[16];
1: -	struct edd_info edd_info[6];
1: -	unsigned char mbr_signature_nr;
1: -	unsigned char edd_info_nr;
1: +  unsigned int mbr_signature[16];
1: +  struct edd_info edd_info[6];
1: +  unsigned char mbr_signature_nr;
1: +  unsigned char edd_info_nr;
1:  };
1:  
1:  struct setup_data {
1: -	__u64 next;
1: -	__u32 type;
1: -	__u32 len;
1: -	__u8 data[0];
1: +  __u64 next;
1: +  __u32 type;
1: +  __u32 len;
1: +  __u8 data[0];
1:  };
1:  
1:  struct setup_indirect {
1: -	__u32 type;
1: -	__u32 reserved;
1: -	__u64 len;
1: -	__u64 addr;
1: +  __u32 type;
1: +  __u32 reserved;
1: +  __u64 len;
1: +  __u64 addr;
1:  };
1:  
1:  struct atomic_notifier_head {
1: -	spinlock_t lock;
1: -	struct notifier_block *head;
1: +  spinlock_t lock;
1: +  struct notifier_block *head;
1:  };
1:  
1:  struct scatterlist {
1: -	long unsigned int page_link;
1: -	unsigned int offset;
1: -	unsigned int length;
1: -	dma_addr_t dma_address;
1: -	unsigned int dma_length;
1: +  long unsigned int page_link;
1: +  unsigned int offset;
1: +  unsigned int length;
1: +  dma_addr_t dma_address;
1: +  unsigned int dma_length;
1:  };
1:  
1:  struct sg_table {
1: -	struct scatterlist *sgl;
1: -	unsigned int nents;
1: -	unsigned int orig_nents;
1: +  struct scatterlist *sgl;
1: +  unsigned int nents;
1: +  unsigned int orig_nents;
1:  };
1:  
1:  enum efi_secureboot_mode {
1: -	efi_secureboot_mode_unset = 0,
1: -	efi_secureboot_mode_unknown = 1,
1: -	efi_secureboot_mode_disabled = 2,
1: -	efi_secureboot_mode_enabled = 3,
1: +  efi_secureboot_mode_unset = 0,
1: +  efi_secureboot_mode_unknown = 1,
1: +  efi_secureboot_mode_disabled = 2,
1: +  efi_secureboot_mode_enabled = 3,
1:  };
1:  
1:  enum xen_domain_type {
1: -	XEN_NATIVE = 0,
1: -	XEN_PV_DOMAIN = 1,
1: -	XEN_HVM_DOMAIN = 2,
1: +  XEN_NATIVE = 0,
1: +  XEN_PV_DOMAIN = 1,
1: +  XEN_HVM_DOMAIN = 2,
1:  };
1:  
1:  enum e820_type {
1: -	E820_TYPE_RAM = 1,
1: -	E820_TYPE_RESERVED = 2,
1: -	E820_TYPE_ACPI = 3,
1: -	E820_TYPE_NVS = 4,
1: -	E820_TYPE_UNUSABLE = 5,
1: -	E820_TYPE_PMEM = 7,
1: -	E820_TYPE_PRAM = 12,
1: -	E820_TYPE_SOFT_RESERVED = 4026531839,
1: -	E820_TYPE_RESERVED_KERN = 128,
1: +  E820_TYPE_RAM = 1,
1: +  E820_TYPE_RESERVED = 2,
1: +  E820_TYPE_ACPI = 3,
1: +  E820_TYPE_NVS = 4,
1: +  E820_TYPE_UNUSABLE = 5,
1: +  E820_TYPE_PMEM = 7,
1: +  E820_TYPE_PRAM = 12,
1: +  E820_TYPE_SOFT_RESERVED = 4026531839,
1: +  E820_TYPE_RESERVED_KERN = 128,
1:  };
1:  
1:  struct e820_entry {
1: -	u64 addr;
1: -	u64 size;
1: -	enum e820_type type;
1: +  u64 addr;
1: +  u64 size;
1: +  enum e820_type type;
1:  } __attribute__((packed));
1:  
1:  struct e820_table {
1: -	__u32 nr_entries;
1: -	struct e820_entry entries[320];
1: +  __u32 nr_entries;
1: +  struct e820_entry entries[320];
1:  } __attribute__((packed));
1:  
1:  struct x86_cpuinit_ops {
1: -	void (*setup_percpu_clockev)();
1: -	void (*early_percpu_clock_init)();
1: -	void (*fixup_cpu_id)(struct cpuinfo_x86 *, int);
1: +  void (*setup_percpu_clockev)();
1: +  void (*early_percpu_clock_init)();
1: +  void (*fixup_cpu_id)(struct cpuinfo_x86 *, int);
1:  };
1:  
1:  struct x86_msi_ops {
1: -	void (*restore_msi_irqs)(struct pci_dev *);
1: +  void (*restore_msi_irqs)(struct pci_dev *);
1:  };
1:  
1:  struct x86_apic_ops {
1: -	unsigned int (*io_apic_read)(unsigned int, unsigned int);
1: -	void (*restore)();
1: +  unsigned int (*io_apic_read)(unsigned int, unsigned int);
1: +  void (*restore)();
1:  };
1:  
1:  struct msi_controller {
1: -	struct module *owner;
1: -	struct device *dev;
1: -	struct device_node *of_node;
1: -	struct list_head list;
1: -	int (*setup_irq)(struct msi_controller *, struct pci_dev *, struct msi_desc *);
1: -	int (*setup_irqs)(struct msi_controller *, struct pci_dev *, int, int);
1: -	void (*teardown_irq)(struct msi_controller *, unsigned int);
1: +  struct module *owner;
1: +  struct device *dev;
1: +  struct device_node *of_node;
1: +  struct list_head list;
1: +  int (*setup_irq)(struct msi_controller *, struct pci_dev *,
1: +                   struct msi_desc *);
1: +  int (*setup_irqs)(struct msi_controller *, struct pci_dev *, int, int);
1: +  void (*teardown_irq)(struct msi_controller *, unsigned int);
1:  };
1:  
1:  struct legacy_pic {
1: -	int nr_legacy_irqs;
1: -	struct irq_chip *chip;
1: -	void (*mask)(unsigned int);
1: -	void (*unmask)(unsigned int);
1: -	void (*mask_all)();
1: -	void (*restore_mask)();
1: -	void (*init)(int);
1: -	int (*probe)();
1: -	int (*irq_pending)(unsigned int);
1: -	void (*make_irq)(unsigned int);
1: +  int nr_legacy_irqs;
1: +  struct irq_chip *chip;
1: +  void (*mask)(unsigned int);
1: +  void (*unmask)(unsigned int);
1: +  void (*mask_all)();
1: +  void (*restore_mask)();
1: +  void (*init)(int);
1: +  int (*probe)();
1: +  int (*irq_pending)(unsigned int);
1: +  void (*make_irq)(unsigned int);
1:  };
1:  
1:  enum jump_label_type {
1: -	JUMP_LABEL_NOP = 0,
1: -	JUMP_LABEL_JMP = 1,
1: +  JUMP_LABEL_NOP = 0,
1: +  JUMP_LABEL_JMP = 1,
1:  };
1:  
1:  union text_poke_insn {
1: -	u8 text[5];
1: -	struct {
1: -		u8 opcode;
1: -		s32 disp;
1: -	} __attribute__((packed));
1: +  u8 text[5];
1: +  struct {
1: +    u8 opcode;
1: +    s32 disp;
1: +  } __attribute__((packed));
1:  };
1:  
1:  enum {
1: -	JL_STATE_START = 0,
1: -	JL_STATE_NO_UPDATE = 1,
1: -	JL_STATE_UPDATE = 2,
1: +  JL_STATE_START = 0,
1: +  JL_STATE_NO_UPDATE = 1,
1: +  JL_STATE_UPDATE = 2,
1:  };
1:  
1:  typedef short unsigned int __kernel_old_uid_t;
1:  
1:  typedef short unsigned int __kernel_old_gid_t;
1:  
1: -typedef struct {
1: -	int val[2];
1: -} __kernel_fsid_t;
1: +typedef struct { int val[2]; } __kernel_fsid_t;
1:  
1:  typedef __kernel_old_uid_t old_uid_t;
1:  
1:  typedef __kernel_old_gid_t old_gid_t;
1:  
1:  struct kernel_clone_args {
1: -	u64 flags;
1: -	int *pidfd;
1: -	int *child_tid;
1: -	int *parent_tid;
1: -	int exit_signal;
1: -	long unsigned int stack;
1: -	long unsigned int stack_size;
1: -	long unsigned int tls;
1: -	pid_t *set_tid;
1: -	size_t set_tid_size;
1: -	int cgroup;
1: -	struct cgroup *cgrp;
1: -	struct css_set *cset;
1: +  u64 flags;
1: +  int *pidfd;
1: +  int *child_tid;
1: +  int *parent_tid;
1: +  int exit_signal;
1: +  long unsigned int stack;
1: +  long unsigned int stack_size;
1: +  long unsigned int tls;
1: +  pid_t *set_tid;
1: +  size_t set_tid_size;
1: +  int cgroup;
1: +  struct cgroup *cgrp;
1: +  struct css_set *cset;
1:  };
1:  
1:  struct kstatfs {
1: -	long int f_type;
1: -	long int f_bsize;
1: -	u64 f_blocks;
1: -	u64 f_bfree;
1: -	u64 f_bavail;
1: -	u64 f_files;
1: -	u64 f_ffree;
1: -	__kernel_fsid_t f_fsid;
1: -	long int f_namelen;
1: -	long int f_frsize;
1: -	long int f_flags;
1: -	long int f_spare[4];
1: +  long int f_type;
1: +  long int f_bsize;
1: +  u64 f_blocks;
1: +  u64 f_bfree;
1: +  u64 f_bavail;
1: +  u64 f_files;
1: +  u64 f_ffree;
1: +  __kernel_fsid_t f_fsid;
1: +  long int f_namelen;
1: +  long int f_frsize;
1: +  long int f_flags;
1: +  long int f_spare[4];
1:  };
1:  
1:  struct stat64 {
1: -	long long unsigned int st_dev;
1: -	unsigned char __pad0[4];
1: -	unsigned int __st_ino;
1: -	unsigned int st_mode;
1: -	unsigned int st_nlink;
1: -	unsigned int st_uid;
1: -	unsigned int st_gid;
1: -	long long unsigned int st_rdev;
1: -	unsigned char __pad3[4];
1: -	long long int st_size;
1: -	unsigned int st_blksize;
1: -	long long int st_blocks;
1: -	unsigned int st_atime;
1: -	unsigned int st_atime_nsec;
1: -	unsigned int st_mtime;
1: -	unsigned int st_mtime_nsec;
1: -	unsigned int st_ctime;
1: -	unsigned int st_ctime_nsec;
1: -	long long unsigned int st_ino;
1: +  long long unsigned int st_dev;
1: +  unsigned char __pad0[4];
1: +  unsigned int __st_ino;
1: +  unsigned int st_mode;
1: +  unsigned int st_nlink;
1: +  unsigned int st_uid;
1: +  unsigned int st_gid;
1: +  long long unsigned int st_rdev;
1: +  unsigned char __pad3[4];
1: +  long long int st_size;
1: +  unsigned int st_blksize;
1: +  long long int st_blocks;
1: +  unsigned int st_atime;
1: +  unsigned int st_atime_nsec;
1: +  unsigned int st_mtime;
1: +  unsigned int st_mtime_nsec;
1: +  unsigned int st_ctime;
1: +  unsigned int st_ctime_nsec;
1: +  long long unsigned int st_ino;
1:  } __attribute__((packed));
1:  
1:  struct mmap_arg_struct32 {
1: -	unsigned int addr;
1: -	unsigned int len;
1: -	unsigned int prot;
1: -	unsigned int flags;
1: -	unsigned int fd;
1: -	unsigned int offset;
1: +  unsigned int addr;
1: +  unsigned int len;
1: +  unsigned int prot;
1: +  unsigned int flags;
1: +  unsigned int fd;
1: +  unsigned int offset;
1:  };
1:  
1:  struct vm_unmapped_area_info {
1: -	long unsigned int flags;
1: -	long unsigned int length;
1: -	long unsigned int low_limit;
1: -	long unsigned int high_limit;
1: -	long unsigned int align_mask;
1: -	long unsigned int align_offset;
1: +  long unsigned int flags;
1: +  long unsigned int length;
1: +  long unsigned int low_limit;
1: +  long unsigned int high_limit;
1: +  long unsigned int align_mask;
1: +  long unsigned int align_offset;
1:  };
1:  
1:  enum align_flags {
1: -	ALIGN_VA_32 = 1,
1: -	ALIGN_VA_64 = 2,
1: +  ALIGN_VA_32 = 1,
1: +  ALIGN_VA_64 = 2,
1:  };
1:  
1:  struct va_alignment {
1: -	int flags;
1: -	long unsigned int mask;
1: -	long unsigned int bits;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  int flags;
1: +  long unsigned int mask;
1: +  long unsigned int bits;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum {
1: -	MEMREMAP_WB = 1,
1: -	MEMREMAP_WT = 2,
1: -	MEMREMAP_WC = 4,
1: -	MEMREMAP_ENC = 8,
1: -	MEMREMAP_DEC = 16,
1: +  MEMREMAP_WB = 1,
1: +  MEMREMAP_WT = 2,
1: +  MEMREMAP_WC = 4,
1: +  MEMREMAP_ENC = 8,
1: +  MEMREMAP_DEC = 16,
1:  };
1:  
1:  enum {
1: -	IORES_DESC_NONE = 0,
1: -	IORES_DESC_CRASH_KERNEL = 1,
1: -	IORES_DESC_ACPI_TABLES = 2,
1: -	IORES_DESC_ACPI_NV_STORAGE = 3,
1: -	IORES_DESC_PERSISTENT_MEMORY = 4,
1: -	IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5,
1: -	IORES_DESC_DEVICE_PRIVATE_MEMORY = 6,
1: -	IORES_DESC_RESERVED = 7,
1: -	IORES_DESC_SOFT_RESERVED = 8,
1: +  IORES_DESC_NONE = 0,
1: +  IORES_DESC_CRASH_KERNEL = 1,
1: +  IORES_DESC_ACPI_TABLES = 2,
1: +  IORES_DESC_ACPI_NV_STORAGE = 3,
1: +  IORES_DESC_PERSISTENT_MEMORY = 4,
1: +  IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5,
1: +  IORES_DESC_DEVICE_PRIVATE_MEMORY = 6,
1: +  IORES_DESC_RESERVED = 7,
1: +  IORES_DESC_SOFT_RESERVED = 8,
1:  };
1:  
1:  struct change_member {
1: -	struct e820_entry *entry;
1: -	long long unsigned int addr;
1: +  struct e820_entry *entry;
1: +  long long unsigned int addr;
1:  };
1:  
1:  struct iommu_fault_param;
1: @@ -20394,296 +20563,295 @@ struct iommu_fault_param;
1:  struct iommu_fwspec;
1:  
1:  struct dev_iommu {
1: -	struct mutex lock;
1: -	struct iommu_fault_param *fault_param;
1: -	struct iommu_fwspec *fwspec;
1: -	struct iommu_device *iommu_dev;
1: -	void *priv;
1: +  struct mutex lock;
1: +  struct iommu_fault_param *fault_param;
1: +  struct iommu_fwspec *fwspec;
1: +  struct iommu_device *iommu_dev;
1: +  void *priv;
1:  };
1:  
1:  struct of_phandle_args {
1: -	struct device_node *np;
1: -	int args_count;
1: -	uint32_t args[16];
1: +  struct device_node *np;
1: +  int args_count;
1: +  uint32_t args[16];
1:  };
1:  
1:  struct iommu_fault_unrecoverable {
1: -	__u32 reason;
1: -	__u32 flags;
1: -	__u32 pasid;
1: -	__u32 perm;
1: -	__u64 addr;
1: -	__u64 fetch_addr;
1: +  __u32 reason;
1: +  __u32 flags;
1: +  __u32 pasid;
1: +  __u32 perm;
1: +  __u64 addr;
1: +  __u64 fetch_addr;
1:  };
1:  
1:  struct iommu_fault_page_request {
1: -	__u32 flags;
1: -	__u32 pasid;
1: -	__u32 grpid;
1: -	__u32 perm;
1: -	__u64 addr;
1: -	__u64 private_data[2];
1: +  __u32 flags;
1: +  __u32 pasid;
1: +  __u32 grpid;
1: +  __u32 perm;
1: +  __u64 addr;
1: +  __u64 private_data[2];
1:  };
1:  
1:  struct iommu_fault {
1: -	__u32 type;
1: -	__u32 padding;
1: -	union {
1: -		struct iommu_fault_unrecoverable event;
1: -		struct iommu_fault_page_request prm;
1: -		__u8 padding2[56];
1: -	};
1: +  __u32 type;
1: +  __u32 padding;
1: +  union {
1: +    struct iommu_fault_unrecoverable event;
1: +    struct iommu_fault_page_request prm;
1: +    __u8 padding2[56];
1: +  };
1:  };
1:  
1:  struct iommu_page_response {
1: -	__u32 argsz;
1: -	__u32 version;
1: -	__u32 flags;
1: -	__u32 pasid;
1: -	__u32 grpid;
1: -	__u32 code;
1: +  __u32 argsz;
1: +  __u32 version;
1: +  __u32 flags;
1: +  __u32 pasid;
1: +  __u32 grpid;
1: +  __u32 code;
1:  };
1:  
1:  struct iommu_inv_addr_info {
1: -	__u32 flags;
1: -	__u32 archid;
1: -	__u64 pasid;
1: -	__u64 addr;
1: -	__u64 granule_size;
1: -	__u64 nb_granules;
1: +  __u32 flags;
1: +  __u32 archid;
1: +  __u64 pasid;
1: +  __u64 addr;
1: +  __u64 granule_size;
1: +  __u64 nb_granules;
1:  };
1:  
1:  struct iommu_inv_pasid_info {
1: -	__u32 flags;
1: -	__u32 archid;
1: -	__u64 pasid;
1: +  __u32 flags;
1: +  __u32 archid;
1: +  __u64 pasid;
1:  };
1:  
1:  struct iommu_cache_invalidate_info {
1: -	__u32 argsz;
1: -	__u32 version;
1: -	__u8 cache;
1: -	__u8 granularity;
1: -	__u8 padding[6];
1: -	union {
1: -		struct iommu_inv_pasid_info pasid_info;
1: -		struct iommu_inv_addr_info addr_info;
1: -	} granu;
1: +  __u32 argsz;
1: +  __u32 version;
1: +  __u8 cache;
1: +  __u8 granularity;
1: +  __u8 padding[6];
1: +  union {
1: +    struct iommu_inv_pasid_info pasid_info;
1: +    struct iommu_inv_addr_info addr_info;
1: +  } granu;
1:  };
1:  
1:  struct iommu_gpasid_bind_data_vtd {
1: -	__u64 flags;
1: -	__u32 pat;
1: -	__u32 emt;
1: +  __u64 flags;
1: +  __u32 pat;
1: +  __u32 emt;
1:  };
1:  
1:  struct iommu_gpasid_bind_data {
1: -	__u32 argsz;
1: -	__u32 version;
1: -	__u32 format;
1: -	__u32 addr_width;
1: -	__u64 flags;
1: -	__u64 gpgd;
1: -	__u64 hpasid;
1: -	__u64 gpasid;
1: -	__u8 padding[8];
1: -	union {
1: -		struct iommu_gpasid_bind_data_vtd vtd;
1: -	} vendor;
1: -};
1: -
1: -typedef int (*iommu_fault_handler_t)(struct iommu_domain *, struct device *, long unsigned int, int, void *);
1: +  __u32 argsz;
1: +  __u32 version;
1: +  __u32 format;
1: +  __u32 addr_width;
1: +  __u64 flags;
1: +  __u64 gpgd;
1: +  __u64 hpasid;
1: +  __u64 gpasid;
1: +  __u8 padding[8];
1: +  union {
1: +    struct iommu_gpasid_bind_data_vtd vtd;
1: +  } vendor;
1: +};
1: +
1: +typedef int (*iommu_fault_handler_t)(struct iommu_domain *, struct device *,
1: +                                     long unsigned int, int, void *);
1:  
1:  struct iommu_domain_geometry {
1: -	dma_addr_t aperture_start;
1: -	dma_addr_t aperture_end;
1: -	bool force_aperture;
1: +  dma_addr_t aperture_start;
1: +  dma_addr_t aperture_end;
1: +  bool force_aperture;
1:  };
1:  
1:  struct iommu_domain {
1: -	unsigned int type;
1: -	const struct iommu_ops *ops;
1: -	long unsigned int pgsize_bitmap;
1: -	iommu_fault_handler_t handler;
1: -	void *handler_token;
1: -	struct iommu_domain_geometry geometry;
1: -	void *iova_cookie;
1: +  unsigned int type;
1: +  const struct iommu_ops *ops;
1: +  long unsigned int pgsize_bitmap;
1: +  iommu_fault_handler_t handler;
1: +  void *handler_token;
1: +  struct iommu_domain_geometry geometry;
1: +  void *iova_cookie;
1:  };
1:  
1:  typedef int (*iommu_dev_fault_handler_t)(struct iommu_fault *, void *);
1:  
1:  enum iommu_resv_type {
1: -	IOMMU_RESV_DIRECT = 0,
1: -	IOMMU_RESV_DIRECT_RELAXABLE = 1,
1: -	IOMMU_RESV_RESERVED = 2,
1: -	IOMMU_RESV_MSI = 3,
1: -	IOMMU_RESV_SW_MSI = 4,
1: +  IOMMU_RESV_DIRECT = 0,
1: +  IOMMU_RESV_DIRECT_RELAXABLE = 1,
1: +  IOMMU_RESV_RESERVED = 2,
1: +  IOMMU_RESV_MSI = 3,
1: +  IOMMU_RESV_SW_MSI = 4,
1:  };
1:  
1:  struct iommu_resv_region {
1: -	struct list_head list;
1: -	phys_addr_t start;
1: -	size_t length;
1: -	int prot;
1: -	enum iommu_resv_type type;
1: +  struct list_head list;
1: +  phys_addr_t start;
1: +  size_t length;
1: +  int prot;
1: +  enum iommu_resv_type type;
1:  };
1:  
1:  struct iommu_iotlb_gather {
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	size_t pgsize;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  size_t pgsize;
1:  };
1:  
1:  struct iommu_device {
1: -	struct list_head list;
1: -	const struct iommu_ops *ops;
1: -	struct fwnode_handle *fwnode;
1: -	struct device *dev;
1: +  struct list_head list;
1: +  const struct iommu_ops *ops;
1: +  struct fwnode_handle *fwnode;
1: +  struct device *dev;
1:  };
1:  
1:  struct iommu_sva {
1: -	struct device *dev;
1: +  struct device *dev;
1:  };
1:  
1:  struct iommu_fault_event {
1: -	struct iommu_fault fault;
1: -	struct list_head list;
1: +  struct iommu_fault fault;
1: +  struct list_head list;
1:  };
1:  
1:  struct iommu_fault_param {
1: -	iommu_dev_fault_handler_t handler;
1: -	void *data;
1: -	struct list_head faults;
1: -	struct mutex lock;
1: +  iommu_dev_fault_handler_t handler;
1: +  void *data;
1: +  struct list_head faults;
1: +  struct mutex lock;
1:  };
1:  
1:  struct iommu_fwspec {
1: -	const struct iommu_ops *ops;
1: -	struct fwnode_handle *iommu_fwnode;
1: -	u32 flags;
1: -	u32 num_pasid_bits;
1: -	unsigned int num_ids;
1: -	u32 ids[0];
1: +  const struct iommu_ops *ops;
1: +  struct fwnode_handle *iommu_fwnode;
1: +  u32 flags;
1: +  u32 num_pasid_bits;
1: +  unsigned int num_ids;
1: +  u32 ids[0];
1:  };
1:  
1:  struct iommu_table_entry {
1: -	initcall_t detect;
1: -	initcall_t depend;
1: -	void (*early_init)();
1: -	void (*late_init)();
1: -	int flags;
1: +  initcall_t detect;
1: +  initcall_t depend;
1: +  void (*early_init)();
1: +  void (*late_init)();
1: +  int flags;
1:  };
1:  
1:  enum dmi_field {
1: -	DMI_NONE = 0,
1: -	DMI_BIOS_VENDOR = 1,
1: -	DMI_BIOS_VERSION = 2,
1: -	DMI_BIOS_DATE = 3,
1: -	DMI_BIOS_RELEASE = 4,
1: -	DMI_EC_FIRMWARE_RELEASE = 5,
1: -	DMI_SYS_VENDOR = 6,
1: -	DMI_PRODUCT_NAME = 7,
1: -	DMI_PRODUCT_VERSION = 8,
1: -	DMI_PRODUCT_SERIAL = 9,
1: -	DMI_PRODUCT_UUID = 10,
1: -	DMI_PRODUCT_SKU = 11,
1: -	DMI_PRODUCT_FAMILY = 12,
1: -	DMI_BOARD_VENDOR = 13,
1: -	DMI_BOARD_NAME = 14,
1: -	DMI_BOARD_VERSION = 15,
1: -	DMI_BOARD_SERIAL = 16,
1: -	DMI_BOARD_ASSET_TAG = 17,
1: -	DMI_CHASSIS_VENDOR = 18,
1: -	DMI_CHASSIS_TYPE = 19,
1: -	DMI_CHASSIS_VERSION = 20,
1: -	DMI_CHASSIS_SERIAL = 21,
1: -	DMI_CHASSIS_ASSET_TAG = 22,
1: -	DMI_STRING_MAX = 23,
1: -	DMI_OEM_STRING = 24,
1: -};
1: -
1: -enum {
1: -	NONE_FORCE_HPET_RESUME = 0,
1: -	OLD_ICH_FORCE_HPET_RESUME = 1,
1: -	ICH_FORCE_HPET_RESUME = 2,
1: -	VT8237_FORCE_HPET_RESUME = 3,
1: -	NVIDIA_FORCE_HPET_RESUME = 4,
1: -	ATI_FORCE_HPET_RESUME = 5,
1: +  DMI_NONE = 0,
1: +  DMI_BIOS_VENDOR = 1,
1: +  DMI_BIOS_VERSION = 2,
1: +  DMI_BIOS_DATE = 3,
1: +  DMI_BIOS_RELEASE = 4,
1: +  DMI_EC_FIRMWARE_RELEASE = 5,
1: +  DMI_SYS_VENDOR = 6,
1: +  DMI_PRODUCT_NAME = 7,
1: +  DMI_PRODUCT_VERSION = 8,
1: +  DMI_PRODUCT_SERIAL = 9,
1: +  DMI_PRODUCT_UUID = 10,
1: +  DMI_PRODUCT_SKU = 11,
1: +  DMI_PRODUCT_FAMILY = 12,
1: +  DMI_BOARD_VENDOR = 13,
1: +  DMI_BOARD_NAME = 14,
1: +  DMI_BOARD_VERSION = 15,
1: +  DMI_BOARD_SERIAL = 16,
1: +  DMI_BOARD_ASSET_TAG = 17,
1: +  DMI_CHASSIS_VENDOR = 18,
1: +  DMI_CHASSIS_TYPE = 19,
1: +  DMI_CHASSIS_VERSION = 20,
1: +  DMI_CHASSIS_SERIAL = 21,
1: +  DMI_CHASSIS_ASSET_TAG = 22,
1: +  DMI_STRING_MAX = 23,
1: +  DMI_OEM_STRING = 24,
1: +};
1: +
1: +enum {
1: +  NONE_FORCE_HPET_RESUME = 0,
1: +  OLD_ICH_FORCE_HPET_RESUME = 1,
1: +  ICH_FORCE_HPET_RESUME = 2,
1: +  VT8237_FORCE_HPET_RESUME = 3,
1: +  NVIDIA_FORCE_HPET_RESUME = 4,
1: +  ATI_FORCE_HPET_RESUME = 5,
1:  };
1:  
1:  enum meminit_context {
1: -	MEMINIT_EARLY = 0,
1: -	MEMINIT_HOTPLUG = 1,
1: +  MEMINIT_EARLY = 0,
1: +  MEMINIT_HOTPLUG = 1,
1:  };
1:  
1:  struct cpu {
1: -	int node_id;
1: -	int hotpluggable;
1: -	struct device dev;
1: +  int node_id;
1: +  int hotpluggable;
1: +  struct device dev;
1:  };
1:  
1:  struct x86_cpu {
1: -	struct cpu cpu;
1: +  struct cpu cpu;
1:  };
1:  
1:  typedef int (*cmp_func_t)(const void *, const void *);
1:  
1:  struct die_args {
1: -	struct pt_regs *regs;
1: -	const char *str;
1: -	long int err;
1: -	int trapnr;
1: -	int signr;
1: +  struct pt_regs *regs;
1: +  const char *str;
1: +  long int err;
1: +  int trapnr;
1: +  int signr;
1:  };
1:  
1:  struct smp_alt_module {
1: -	struct module *mod;
1: -	char *name;
1: -	const s32 *locks;
1: -	const s32 *locks_end;
1: -	u8 *text;
1: -	u8 *text_end;
1: -	struct list_head next;
1: +  struct module *mod;
1: +  char *name;
1: +  const s32 *locks;
1: +  const s32 *locks_end;
1: +  u8 *text;
1: +  u8 *text_end;
1: +  struct list_head next;
1:  };
1:  
1: -typedef struct {
1: -	struct mm_struct *mm;
1: -} temp_mm_state_t;
1: +typedef struct { struct mm_struct *mm; } temp_mm_state_t;
1:  
1:  struct text_poke_loc {
1: -	s32 rel_addr;
1: -	s32 rel32;
1: -	u8 opcode;
1: -	const u8 text[5];
1: -	u8 old;
1: +  s32 rel_addr;
1: +  s32 rel32;
1: +  u8 opcode;
1: +  const u8 text[5];
1: +  u8 old;
1:  };
1:  
1:  struct bp_patching_desc {
1: -	struct text_poke_loc *vec;
1: -	int nr_entries;
1: -	atomic_t refs;
1: +  struct text_poke_loc *vec;
1: +  int nr_entries;
1: +  atomic_t refs;
1:  };
1:  
1:  struct paravirt_patch_site;
1:  
1:  enum {
1: -	HW_BREAKPOINT_LEN_1 = 1,
1: -	HW_BREAKPOINT_LEN_2 = 2,
1: -	HW_BREAKPOINT_LEN_3 = 3,
1: -	HW_BREAKPOINT_LEN_4 = 4,
1: -	HW_BREAKPOINT_LEN_5 = 5,
1: -	HW_BREAKPOINT_LEN_6 = 6,
1: -	HW_BREAKPOINT_LEN_7 = 7,
1: -	HW_BREAKPOINT_LEN_8 = 8,
1: +  HW_BREAKPOINT_LEN_1 = 1,
1: +  HW_BREAKPOINT_LEN_2 = 2,
1: +  HW_BREAKPOINT_LEN_3 = 3,
1: +  HW_BREAKPOINT_LEN_4 = 4,
1: +  HW_BREAKPOINT_LEN_5 = 5,
1: +  HW_BREAKPOINT_LEN_6 = 6,
1: +  HW_BREAKPOINT_LEN_7 = 7,
1: +  HW_BREAKPOINT_LEN_8 = 8,
1:  };
1:  
1:  enum {
1: -	HW_BREAKPOINT_EMPTY = 0,
1: -	HW_BREAKPOINT_R = 1,
1: -	HW_BREAKPOINT_W = 2,
1: -	HW_BREAKPOINT_RW = 3,
1: -	HW_BREAKPOINT_X = 4,
1: -	HW_BREAKPOINT_INVALID = 7,
1: +  HW_BREAKPOINT_EMPTY = 0,
1: +  HW_BREAKPOINT_R = 1,
1: +  HW_BREAKPOINT_W = 2,
1: +  HW_BREAKPOINT_RW = 3,
1: +  HW_BREAKPOINT_X = 4,
1: +  HW_BREAKPOINT_INVALID = 7,
1:  };
1:  
1:  typedef unsigned int u_int;
1: @@ -20691,93 +20859,91 @@ typedef unsigned int u_int;
1:  typedef long long unsigned int cycles_t;
1:  
1:  struct system_counterval_t {
1: -	u64 cycles;
1: -	struct clocksource *cs;
1: -};
1: -
1: -enum {
1: -	WORK_STRUCT_PENDING_BIT = 0,
1: -	WORK_STRUCT_DELAYED_BIT = 1,
1: -	WORK_STRUCT_PWQ_BIT = 2,
1: -	WORK_STRUCT_LINKED_BIT = 3,
1: -	WORK_STRUCT_COLOR_SHIFT = 4,
1: -	WORK_STRUCT_COLOR_BITS = 4,
1: -	WORK_STRUCT_PENDING = 1,
1: -	WORK_STRUCT_DELAYED = 2,
1: -	WORK_STRUCT_PWQ = 4,
1: -	WORK_STRUCT_LINKED = 8,
1: -	WORK_STRUCT_STATIC = 0,
1: -	WORK_NR_COLORS = 15,
1: -	WORK_NO_COLOR = 15,
1: -	WORK_CPU_UNBOUND = 128,
1: -	WORK_STRUCT_FLAG_BITS = 8,
1: -	WORK_OFFQ_FLAG_BASE = 4,
1: -	__WORK_OFFQ_CANCELING = 4,
1: -	WORK_OFFQ_CANCELING = 16,
1: -	WORK_OFFQ_FLAG_BITS = 1,
1: -	WORK_OFFQ_POOL_SHIFT = 5,
1: -	WORK_OFFQ_LEFT = 59,
1: -	WORK_OFFQ_POOL_BITS = 31,
1: -	WORK_OFFQ_POOL_NONE = 2147483647,
1: -	WORK_STRUCT_FLAG_MASK = 255,
1: -	WORK_STRUCT_WQ_DATA_MASK = 4294967040,
1: -	WORK_STRUCT_NO_POOL = 4294967264,
1: -	WORK_BUSY_PENDING = 1,
1: -	WORK_BUSY_RUNNING = 2,
1: -	WORKER_DESC_LEN = 24,
1: +  u64 cycles;
1: +  struct clocksource *cs;
1: +};
1: +
1: +enum {
1: +  WORK_STRUCT_PENDING_BIT = 0,
1: +  WORK_STRUCT_DELAYED_BIT = 1,
1: +  WORK_STRUCT_PWQ_BIT = 2,
1: +  WORK_STRUCT_LINKED_BIT = 3,
1: +  WORK_STRUCT_COLOR_SHIFT = 4,
1: +  WORK_STRUCT_COLOR_BITS = 4,
1: +  WORK_STRUCT_PENDING = 1,
1: +  WORK_STRUCT_DELAYED = 2,
1: +  WORK_STRUCT_PWQ = 4,
1: +  WORK_STRUCT_LINKED = 8,
1: +  WORK_STRUCT_STATIC = 0,
1: +  WORK_NR_COLORS = 15,
1: +  WORK_NO_COLOR = 15,
1: +  WORK_CPU_UNBOUND = 128,
1: +  WORK_STRUCT_FLAG_BITS = 8,
1: +  WORK_OFFQ_FLAG_BASE = 4,
1: +  __WORK_OFFQ_CANCELING = 4,
1: +  WORK_OFFQ_CANCELING = 16,
1: +  WORK_OFFQ_FLAG_BITS = 1,
1: +  WORK_OFFQ_POOL_SHIFT = 5,
1: +  WORK_OFFQ_LEFT = 59,
1: +  WORK_OFFQ_POOL_BITS = 31,
1: +  WORK_OFFQ_POOL_NONE = 2147483647,
1: +  WORK_STRUCT_FLAG_MASK = 255,
1: +  WORK_STRUCT_WQ_DATA_MASK = 4294967040,
1: +  WORK_STRUCT_NO_POOL = 4294967264,
1: +  WORK_BUSY_PENDING = 1,
1: +  WORK_BUSY_RUNNING = 2,
1: +  WORKER_DESC_LEN = 24,
1:  };
1:  
1:  struct plist_head {
1: -	struct list_head node_list;
1: +  struct list_head node_list;
1:  };
1:  
1: -typedef struct {
1: -	seqcount_t seqcount;
1: -} seqcount_latch_t;
1: +typedef struct { seqcount_t seqcount; } seqcount_latch_t;
1:  
1:  enum pm_qos_type {
1: -	PM_QOS_UNITIALIZED = 0,
1: -	PM_QOS_MAX = 1,
1: -	PM_QOS_MIN = 2,
1: +  PM_QOS_UNITIALIZED = 0,
1: +  PM_QOS_MAX = 1,
1: +  PM_QOS_MIN = 2,
1:  };
1:  
1:  struct pm_qos_constraints {
1: -	struct plist_head list;
1: -	s32 target_value;
1: -	s32 default_value;
1: -	s32 no_constraint_value;
1: -	enum pm_qos_type type;
1: -	struct blocking_notifier_head *notifiers;
1: +  struct plist_head list;
1: +  s32 target_value;
1: +  s32 default_value;
1: +  s32 no_constraint_value;
1: +  enum pm_qos_type type;
1: +  struct blocking_notifier_head *notifiers;
1:  };
1:  
1:  enum freq_qos_req_type {
1: -	FREQ_QOS_MIN = 1,
1: -	FREQ_QOS_MAX = 2,
1: +  FREQ_QOS_MIN = 1,
1: +  FREQ_QOS_MAX = 2,
1:  };
1:  
1:  struct freq_constraints {
1: -	struct pm_qos_constraints min_freq;
1: -	struct blocking_notifier_head min_freq_notifiers;
1: -	struct pm_qos_constraints max_freq;
1: -	struct blocking_notifier_head max_freq_notifiers;
1: +  struct pm_qos_constraints min_freq;
1: +  struct blocking_notifier_head min_freq_notifiers;
1: +  struct pm_qos_constraints max_freq;
1: +  struct blocking_notifier_head max_freq_notifiers;
1:  };
1:  
1:  struct freq_qos_request {
1: -	enum freq_qos_req_type type;
1: -	struct plist_node pnode;
1: -	struct freq_constraints *qos;
1: +  enum freq_qos_req_type type;
1: +  struct plist_node pnode;
1: +  struct freq_constraints *qos;
1:  };
1:  
1:  enum cpufreq_table_sorting {
1: -	CPUFREQ_TABLE_UNSORTED = 0,
1: -	CPUFREQ_TABLE_SORTED_ASCENDING = 1,
1: -	CPUFREQ_TABLE_SORTED_DESCENDING = 2,
1: +  CPUFREQ_TABLE_UNSORTED = 0,
1: +  CPUFREQ_TABLE_SORTED_ASCENDING = 1,
1: +  CPUFREQ_TABLE_SORTED_DESCENDING = 2,
1:  };
1:  
1:  struct cpufreq_cpuinfo {
1: -	unsigned int max_freq;
1: -	unsigned int min_freq;
1: -	unsigned int transition_latency;
1: +  unsigned int max_freq;
1: +  unsigned int min_freq;
1: +  unsigned int transition_latency;
1:  };
1:  
1:  struct clk;
1: @@ -20791,106 +20957,106 @@ struct cpufreq_stats;
1:  struct thermal_cooling_device;
1:  
1:  struct cpufreq_policy {
1: -	cpumask_var_t cpus;
1: -	cpumask_var_t related_cpus;
1: -	cpumask_var_t real_cpus;
1: -	unsigned int shared_type;
1: -	unsigned int cpu;
1: -	struct clk *clk;
1: -	struct cpufreq_cpuinfo cpuinfo;
1: -	unsigned int min;
1: -	unsigned int max;
1: -	unsigned int cur;
1: -	unsigned int restore_freq;
1: -	unsigned int suspend_freq;
1: -	unsigned int policy;
1: -	unsigned int last_policy;
1: -	struct cpufreq_governor *governor;
1: -	void *governor_data;
1: -	char last_governor[16];
1: -	struct work_struct update;
1: -	struct freq_constraints constraints;
1: -	struct freq_qos_request *min_freq_req;
1: -	struct freq_qos_request *max_freq_req;
1: -	struct cpufreq_frequency_table *freq_table;
1: -	enum cpufreq_table_sorting freq_table_sorted;
1: -	struct list_head policy_list;
1: -	struct kobject kobj;
1: -	struct completion kobj_unregister;
1: -	struct rw_semaphore rwsem;
1: -	bool fast_switch_possible;
1: -	bool fast_switch_enabled;
1: -	bool strict_target;
1: -	unsigned int transition_delay_us;
1: -	bool dvfs_possible_from_any_cpu;
1: -	unsigned int cached_target_freq;
1: -	unsigned int cached_resolved_idx;
1: -	bool transition_ongoing;
1: -	spinlock_t transition_lock;
1: -	wait_queue_head_t transition_wait;
1: -	struct task_struct *transition_task;
1: -	struct cpufreq_stats *stats;
1: -	void *driver_data;
1: -	struct thermal_cooling_device *cdev;
1: -	struct notifier_block nb_min;
1: -	struct notifier_block nb_max;
1: +  cpumask_var_t cpus;
1: +  cpumask_var_t related_cpus;
1: +  cpumask_var_t real_cpus;
1: +  unsigned int shared_type;
1: +  unsigned int cpu;
1: +  struct clk *clk;
1: +  struct cpufreq_cpuinfo cpuinfo;
1: +  unsigned int min;
1: +  unsigned int max;
1: +  unsigned int cur;
1: +  unsigned int restore_freq;
1: +  unsigned int suspend_freq;
1: +  unsigned int policy;
1: +  unsigned int last_policy;
1: +  struct cpufreq_governor *governor;
1: +  void *governor_data;
1: +  char last_governor[16];
1: +  struct work_struct update;
1: +  struct freq_constraints constraints;
1: +  struct freq_qos_request *min_freq_req;
1: +  struct freq_qos_request *max_freq_req;
1: +  struct cpufreq_frequency_table *freq_table;
1: +  enum cpufreq_table_sorting freq_table_sorted;
1: +  struct list_head policy_list;
1: +  struct kobject kobj;
1: +  struct completion kobj_unregister;
1: +  struct rw_semaphore rwsem;
1: +  bool fast_switch_possible;
1: +  bool fast_switch_enabled;
1: +  bool strict_target;
1: +  unsigned int transition_delay_us;
1: +  bool dvfs_possible_from_any_cpu;
1: +  unsigned int cached_target_freq;
1: +  unsigned int cached_resolved_idx;
1: +  bool transition_ongoing;
1: +  spinlock_t transition_lock;
1: +  wait_queue_head_t transition_wait;
1: +  struct task_struct *transition_task;
1: +  struct cpufreq_stats *stats;
1: +  void *driver_data;
1: +  struct thermal_cooling_device *cdev;
1: +  struct notifier_block nb_min;
1: +  struct notifier_block nb_max;
1:  };
1:  
1:  struct cpufreq_governor {
1: -	char name[16];
1: -	int (*init)(struct cpufreq_policy *);
1: -	void (*exit)(struct cpufreq_policy *);
1: -	int (*start)(struct cpufreq_policy *);
1: -	void (*stop)(struct cpufreq_policy *);
1: -	void (*limits)(struct cpufreq_policy *);
1: -	ssize_t (*show_setspeed)(struct cpufreq_policy *, char *);
1: -	int (*store_setspeed)(struct cpufreq_policy *, unsigned int);
1: -	struct list_head governor_list;
1: -	struct module *owner;
1: -	u8 flags;
1: +  char name[16];
1: +  int (*init)(struct cpufreq_policy *);
1: +  void (*exit)(struct cpufreq_policy *);
1: +  int (*start)(struct cpufreq_policy *);
1: +  void (*stop)(struct cpufreq_policy *);
1: +  void (*limits)(struct cpufreq_policy *);
1: +  ssize_t (*show_setspeed)(struct cpufreq_policy *, char *);
1: +  int (*store_setspeed)(struct cpufreq_policy *, unsigned int);
1: +  struct list_head governor_list;
1: +  struct module *owner;
1: +  u8 flags;
1:  };
1:  
1:  struct cpufreq_frequency_table {
1: -	unsigned int flags;
1: -	unsigned int driver_data;
1: -	unsigned int frequency;
1: +  unsigned int flags;
1: +  unsigned int driver_data;
1: +  unsigned int frequency;
1:  };
1:  
1:  struct cpufreq_freqs {
1: -	struct cpufreq_policy *policy;
1: -	unsigned int old;
1: -	unsigned int new;
1: -	u8 flags;
1: +  struct cpufreq_policy *policy;
1: +  unsigned int old;
1: +  unsigned int new;
1: +  u8 flags;
1:  };
1:  
1:  struct cyc2ns {
1: -	struct cyc2ns_data data[2];
1: -	seqcount_latch_t seq;
1: +  struct cyc2ns_data data[2];
1: +  seqcount_latch_t seq;
1:  };
1:  
1:  struct muldiv {
1: -	u32 multiplier;
1: -	u32 divider;
1: +  u32 multiplier;
1: +  u32 divider;
1:  };
1:  
1:  struct freq_desc {
1: -	bool use_msr_plat;
1: -	struct muldiv muldiv[16];
1: -	u32 freqs[16];
1: -	u32 mask;
1: +  bool use_msr_plat;
1: +  struct muldiv muldiv[16];
1: +  u32 freqs[16];
1: +  u32 mask;
1:  };
1:  
1:  struct dmi_strmatch {
1: -	unsigned char slot: 7;
1: -	unsigned char exact_match: 1;
1: -	char substr[79];
1: +  unsigned char slot : 7;
1: +  unsigned char exact_match : 1;
1: +  char substr[79];
1:  };
1:  
1:  struct dmi_system_id {
1: -	int (*callback)(const struct dmi_system_id *);
1: -	const char *ident;
1: -	struct dmi_strmatch matches[4];
1: -	void *driver_data;
1: +  int (*callback)(const struct dmi_system_id *);
1: +  const char *ident;
1: +  struct dmi_strmatch matches[4];
1: +  void *driver_data;
1:  };
1:  
1:  struct pdev_archdata {};
1: @@ -20900,127 +21066,127 @@ struct mfd_cell;
1:  struct platform_device_id;
1:  
1:  struct platform_device {
1: -	const char *name;
1: -	int id;
1: -	bool id_auto;
1: -	struct device dev;
1: -	u64 platform_dma_mask;
1: -	struct device_dma_parameters dma_parms;
1: -	u32 num_resources;
1: -	struct resource *resource;
1: -	const struct platform_device_id *id_entry;
1: -	char *driver_override;
1: -	struct mfd_cell *mfd_cell;
1: -	struct pdev_archdata archdata;
1: +  const char *name;
1: +  int id;
1: +  bool id_auto;
1: +  struct device dev;
1: +  u64 platform_dma_mask;
1: +  struct device_dma_parameters dma_parms;
1: +  u32 num_resources;
1: +  struct resource *resource;
1: +  const struct platform_device_id *id_entry;
1: +  char *driver_override;
1: +  struct mfd_cell *mfd_cell;
1: +  struct pdev_archdata archdata;
1:  };
1:  
1:  struct platform_device_id {
1: -	char name[20];
1: -	kernel_ulong_t driver_data;
1: +  char name[20];
1: +  kernel_ulong_t driver_data;
1:  };
1:  
1:  struct rtc_time {
1: -	int tm_sec;
1: -	int tm_min;
1: -	int tm_hour;
1: -	int tm_mday;
1: -	int tm_mon;
1: -	int tm_year;
1: -	int tm_wday;
1: -	int tm_yday;
1: -	int tm_isdst;
1: +  int tm_sec;
1: +  int tm_min;
1: +  int tm_hour;
1: +  int tm_mday;
1: +  int tm_mon;
1: +  int tm_year;
1: +  int tm_wday;
1: +  int tm_yday;
1: +  int tm_isdst;
1:  };
1:  
1:  struct pnp_device_id {
1: -	__u8 id[8];
1: -	kernel_ulong_t driver_data;
1: +  __u8 id[8];
1: +  kernel_ulong_t driver_data;
1:  };
1:  
1:  struct pnp_card_device_id {
1: -	__u8 id[8];
1: -	kernel_ulong_t driver_data;
1: -	struct {
1: -		__u8 id[8];
1: -	} devs[8];
1: +  __u8 id[8];
1: +  kernel_ulong_t driver_data;
1: +  struct {
1: +    __u8 id[8];
1: +  } devs[8];
1:  };
1:  
1:  struct acpi_table_header {
1: -	char signature[4];
1: -	u32 length;
1: -	u8 revision;
1: -	u8 checksum;
1: -	char oem_id[6];
1: -	char oem_table_id[8];
1: -	u32 oem_revision;
1: -	char asl_compiler_id[4];
1: -	u32 asl_compiler_revision;
1: +  char signature[4];
1: +  u32 length;
1: +  u8 revision;
1: +  u8 checksum;
1: +  char oem_id[6];
1: +  char oem_table_id[8];
1: +  u32 oem_revision;
1: +  char asl_compiler_id[4];
1: +  u32 asl_compiler_revision;
1:  };
1:  
1:  struct acpi_generic_address {
1: -	u8 space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 access_width;
1: -	u64 address;
1: +  u8 space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 access_width;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct acpi_table_fadt {
1: -	struct acpi_table_header header;
1: -	u32 facs;
1: -	u32 dsdt;
1: -	u8 model;
1: -	u8 preferred_profile;
1: -	u16 sci_interrupt;
1: -	u32 smi_command;
1: -	u8 acpi_enable;
1: -	u8 acpi_disable;
1: -	u8 s4_bios_request;
1: -	u8 pstate_control;
1: -	u32 pm1a_event_block;
1: -	u32 pm1b_event_block;
1: -	u32 pm1a_control_block;
1: -	u32 pm1b_control_block;
1: -	u32 pm2_control_block;
1: -	u32 pm_timer_block;
1: -	u32 gpe0_block;
1: -	u32 gpe1_block;
1: -	u8 pm1_event_length;
1: -	u8 pm1_control_length;
1: -	u8 pm2_control_length;
1: -	u8 pm_timer_length;
1: -	u8 gpe0_block_length;
1: -	u8 gpe1_block_length;
1: -	u8 gpe1_base;
1: -	u8 cst_control;
1: -	u16 c2_latency;
1: -	u16 c3_latency;
1: -	u16 flush_size;
1: -	u16 flush_stride;
1: -	u8 duty_offset;
1: -	u8 duty_width;
1: -	u8 day_alarm;
1: -	u8 month_alarm;
1: -	u8 century;
1: -	u16 boot_flags;
1: -	u8 reserved;
1: -	u32 flags;
1: -	struct acpi_generic_address reset_register;
1: -	u8 reset_value;
1: -	u16 arm_boot_flags;
1: -	u8 minor_revision;
1: -	u64 Xfacs;
1: -	u64 Xdsdt;
1: -	struct acpi_generic_address xpm1a_event_block;
1: -	struct acpi_generic_address xpm1b_event_block;
1: -	struct acpi_generic_address xpm1a_control_block;
1: -	struct acpi_generic_address xpm1b_control_block;
1: -	struct acpi_generic_address xpm2_control_block;
1: -	struct acpi_generic_address xpm_timer_block;
1: -	struct acpi_generic_address xgpe0_block;
1: -	struct acpi_generic_address xgpe1_block;
1: -	struct acpi_generic_address sleep_control;
1: -	struct acpi_generic_address sleep_status;
1: -	u64 hypervisor_id;
1: +  struct acpi_table_header header;
1: +  u32 facs;
1: +  u32 dsdt;
1: +  u8 model;
1: +  u8 preferred_profile;
1: +  u16 sci_interrupt;
1: +  u32 smi_command;
1: +  u8 acpi_enable;
1: +  u8 acpi_disable;
1: +  u8 s4_bios_request;
1: +  u8 pstate_control;
1: +  u32 pm1a_event_block;
1: +  u32 pm1b_event_block;
1: +  u32 pm1a_control_block;
1: +  u32 pm1b_control_block;
1: +  u32 pm2_control_block;
1: +  u32 pm_timer_block;
1: +  u32 gpe0_block;
1: +  u32 gpe1_block;
1: +  u8 pm1_event_length;
1: +  u8 pm1_control_length;
1: +  u8 pm2_control_length;
1: +  u8 pm_timer_length;
1: +  u8 gpe0_block_length;
1: +  u8 gpe1_block_length;
1: +  u8 gpe1_base;
1: +  u8 cst_control;
1: +  u16 c2_latency;
1: +  u16 c3_latency;
1: +  u16 flush_size;
1: +  u16 flush_stride;
1: +  u8 duty_offset;
1: +  u8 duty_width;
1: +  u8 day_alarm;
1: +  u8 month_alarm;
1: +  u8 century;
1: +  u16 boot_flags;
1: +  u8 reserved;
1: +  u32 flags;
1: +  struct acpi_generic_address reset_register;
1: +  u8 reset_value;
1: +  u16 arm_boot_flags;
1: +  u8 minor_revision;
1: +  u64 Xfacs;
1: +  u64 Xdsdt;
1: +  struct acpi_generic_address xpm1a_event_block;
1: +  struct acpi_generic_address xpm1b_event_block;
1: +  struct acpi_generic_address xpm1a_control_block;
1: +  struct acpi_generic_address xpm1b_control_block;
1: +  struct acpi_generic_address xpm2_control_block;
1: +  struct acpi_generic_address xpm_timer_block;
1: +  struct acpi_generic_address xgpe0_block;
1: +  struct acpi_generic_address xgpe1_block;
1: +  struct acpi_generic_address sleep_control;
1: +  struct acpi_generic_address sleep_status;
1: +  u64 hypervisor_id;
1:  } __attribute__((packed));
1:  
1:  struct pnp_protocol;
1: @@ -21028,197 +21194,197 @@ struct pnp_protocol;
1:  struct pnp_id;
1:  
1:  struct pnp_card {
1: -	struct device dev;
1: -	unsigned char number;
1: -	struct list_head global_list;
1: -	struct list_head protocol_list;
1: -	struct list_head devices;
1: -	struct pnp_protocol *protocol;
1: -	struct pnp_id *id;
1: -	char name[50];
1: -	unsigned char pnpver;
1: -	unsigned char productver;
1: -	unsigned int serial;
1: -	unsigned char checksum;
1: -	struct proc_dir_entry *procdir;
1: +  struct device dev;
1: +  unsigned char number;
1: +  struct list_head global_list;
1: +  struct list_head protocol_list;
1: +  struct list_head devices;
1: +  struct pnp_protocol *protocol;
1: +  struct pnp_id *id;
1: +  char name[50];
1: +  unsigned char pnpver;
1: +  unsigned char productver;
1: +  unsigned int serial;
1: +  unsigned char checksum;
1: +  struct proc_dir_entry *procdir;
1:  };
1:  
1:  struct pnp_dev;
1:  
1:  struct pnp_protocol {
1: -	struct list_head protocol_list;
1: -	char *name;
1: -	int (*get)(struct pnp_dev *);
1: -	int (*set)(struct pnp_dev *);
1: -	int (*disable)(struct pnp_dev *);
1: -	bool (*can_wakeup)(struct pnp_dev *);
1: -	int (*suspend)(struct pnp_dev *, pm_message_t);
1: -	int (*resume)(struct pnp_dev *);
1: -	unsigned char number;
1: -	struct device dev;
1: -	struct list_head cards;
1: -	struct list_head devices;
1: +  struct list_head protocol_list;
1: +  char *name;
1: +  int (*get)(struct pnp_dev *);
1: +  int (*set)(struct pnp_dev *);
1: +  int (*disable)(struct pnp_dev *);
1: +  bool (*can_wakeup)(struct pnp_dev *);
1: +  int (*suspend)(struct pnp_dev *, pm_message_t);
1: +  int (*resume)(struct pnp_dev *);
1: +  unsigned char number;
1: +  struct device dev;
1: +  struct list_head cards;
1: +  struct list_head devices;
1:  };
1:  
1:  struct pnp_id {
1: -	char id[8];
1: -	struct pnp_id *next;
1: +  char id[8];
1: +  struct pnp_id *next;
1:  };
1:  
1:  struct pnp_card_driver;
1:  
1:  struct pnp_card_link {
1: -	struct pnp_card *card;
1: -	struct pnp_card_driver *driver;
1: -	void *driver_data;
1: -	pm_message_t pm_state;
1: +  struct pnp_card *card;
1: +  struct pnp_card_driver *driver;
1: +  void *driver_data;
1: +  pm_message_t pm_state;
1:  };
1:  
1:  struct pnp_driver {
1: -	const char *name;
1: -	const struct pnp_device_id *id_table;
1: -	unsigned int flags;
1: -	int (*probe)(struct pnp_dev *, const struct pnp_device_id *);
1: -	void (*remove)(struct pnp_dev *);
1: -	void (*shutdown)(struct pnp_dev *);
1: -	int (*suspend)(struct pnp_dev *, pm_message_t);
1: -	int (*resume)(struct pnp_dev *);
1: -	struct device_driver driver;
1: +  const char *name;
1: +  const struct pnp_device_id *id_table;
1: +  unsigned int flags;
1: +  int (*probe)(struct pnp_dev *, const struct pnp_device_id *);
1: +  void (*remove)(struct pnp_dev *);
1: +  void (*shutdown)(struct pnp_dev *);
1: +  int (*suspend)(struct pnp_dev *, pm_message_t);
1: +  int (*resume)(struct pnp_dev *);
1: +  struct device_driver driver;
1:  };
1:  
1:  struct pnp_card_driver {
1: -	struct list_head global_list;
1: -	char *name;
1: -	const struct pnp_card_device_id *id_table;
1: -	unsigned int flags;
1: -	int (*probe)(struct pnp_card_link *, const struct pnp_card_device_id *);
1: -	void (*remove)(struct pnp_card_link *);
1: -	int (*suspend)(struct pnp_card_link *, pm_message_t);
1: -	int (*resume)(struct pnp_card_link *);
1: -	struct pnp_driver link;
1: +  struct list_head global_list;
1: +  char *name;
1: +  const struct pnp_card_device_id *id_table;
1: +  unsigned int flags;
1: +  int (*probe)(struct pnp_card_link *, const struct pnp_card_device_id *);
1: +  void (*remove)(struct pnp_card_link *);
1: +  int (*suspend)(struct pnp_card_link *, pm_message_t);
1: +  int (*resume)(struct pnp_card_link *);
1: +  struct pnp_driver link;
1:  };
1:  
1:  struct pnp_dev {
1: -	struct device dev;
1: -	u64 dma_mask;
1: -	unsigned int number;
1: -	int status;
1: -	struct list_head global_list;
1: -	struct list_head protocol_list;
1: -	struct list_head card_list;
1: -	struct list_head rdev_list;
1: -	struct pnp_protocol *protocol;
1: -	struct pnp_card *card;
1: -	struct pnp_driver *driver;
1: -	struct pnp_card_link *card_link;
1: -	struct pnp_id *id;
1: -	int active;
1: -	int capabilities;
1: -	unsigned int num_dependent_sets;
1: -	struct list_head resources;
1: -	struct list_head options;
1: -	char name[50];
1: -	int flags;
1: -	struct proc_dir_entry *procent;
1: -	void *data;
1: +  struct device dev;
1: +  u64 dma_mask;
1: +  unsigned int number;
1: +  int status;
1: +  struct list_head global_list;
1: +  struct list_head protocol_list;
1: +  struct list_head card_list;
1: +  struct list_head rdev_list;
1: +  struct pnp_protocol *protocol;
1: +  struct pnp_card *card;
1: +  struct pnp_driver *driver;
1: +  struct pnp_card_link *card_link;
1: +  struct pnp_id *id;
1: +  int active;
1: +  int capabilities;
1: +  unsigned int num_dependent_sets;
1: +  struct list_head resources;
1: +  struct list_head options;
1: +  char name[50];
1: +  int flags;
1: +  struct proc_dir_entry *procent;
1: +  void *data;
1:  };
1:  
1:  enum insn_type {
1: -	CALL = 0,
1: -	NOP = 1,
1: -	JMP = 2,
1: -	RET = 3,
1: +  CALL = 0,
1: +  NOP = 1,
1: +  JMP = 2,
1: +  RET = 3,
1:  };
1:  
1:  typedef struct ldttss_desc tss_desc;
1:  
1:  enum idle_boot_override {
1: -	IDLE_NO_OVERRIDE = 0,
1: -	IDLE_HALT = 1,
1: -	IDLE_NOMWAIT = 2,
1: -	IDLE_POLL = 3,
1: +  IDLE_NO_OVERRIDE = 0,
1: +  IDLE_HALT = 1,
1: +  IDLE_NOMWAIT = 2,
1: +  IDLE_POLL = 3,
1:  };
1:  
1:  struct pm_qos_flags {
1: -	struct list_head list;
1: -	s32 effective_flags;
1: +  struct list_head list;
1: +  s32 effective_flags;
1:  };
1:  
1:  struct dev_pm_qos_request;
1:  
1:  struct dev_pm_qos {
1: -	struct pm_qos_constraints resume_latency;
1: -	struct pm_qos_constraints latency_tolerance;
1: -	struct freq_constraints freq;
1: -	struct pm_qos_flags flags;
1: -	struct dev_pm_qos_request *resume_latency_req;
1: -	struct dev_pm_qos_request *latency_tolerance_req;
1: -	struct dev_pm_qos_request *flags_req;
1: +  struct pm_qos_constraints resume_latency;
1: +  struct pm_qos_constraints latency_tolerance;
1: +  struct freq_constraints freq;
1: +  struct pm_qos_flags flags;
1: +  struct dev_pm_qos_request *resume_latency_req;
1: +  struct dev_pm_qos_request *latency_tolerance_req;
1: +  struct dev_pm_qos_request *flags_req;
1:  };
1:  
1:  enum tick_broadcast_mode {
1: -	TICK_BROADCAST_OFF = 0,
1: -	TICK_BROADCAST_ON = 1,
1: -	TICK_BROADCAST_FORCE = 2,
1: +  TICK_BROADCAST_OFF = 0,
1: +  TICK_BROADCAST_ON = 1,
1: +  TICK_BROADCAST_FORCE = 2,
1:  };
1:  
1:  enum tick_broadcast_state {
1: -	TICK_BROADCAST_EXIT = 0,
1: -	TICK_BROADCAST_ENTER = 1,
1: +  TICK_BROADCAST_EXIT = 0,
1: +  TICK_BROADCAST_ENTER = 1,
1:  };
1:  
1:  struct pm_qos_flags_request {
1: -	struct list_head node;
1: -	s32 flags;
1: +  struct list_head node;
1: +  s32 flags;
1:  };
1:  
1:  enum dev_pm_qos_req_type {
1: -	DEV_PM_QOS_RESUME_LATENCY = 1,
1: -	DEV_PM_QOS_LATENCY_TOLERANCE = 2,
1: -	DEV_PM_QOS_MIN_FREQUENCY = 3,
1: -	DEV_PM_QOS_MAX_FREQUENCY = 4,
1: -	DEV_PM_QOS_FLAGS = 5,
1: +  DEV_PM_QOS_RESUME_LATENCY = 1,
1: +  DEV_PM_QOS_LATENCY_TOLERANCE = 2,
1: +  DEV_PM_QOS_MIN_FREQUENCY = 3,
1: +  DEV_PM_QOS_MAX_FREQUENCY = 4,
1: +  DEV_PM_QOS_FLAGS = 5,
1:  };
1:  
1:  struct dev_pm_qos_request {
1: -	enum dev_pm_qos_req_type type;
1: -	union {
1: -		struct plist_node pnode;
1: -		struct pm_qos_flags_request flr;
1: -		struct freq_qos_request freq;
1: -	} data;
1: -	struct device *dev;
1: +  enum dev_pm_qos_req_type type;
1: +  union {
1: +    struct plist_node pnode;
1: +    struct pm_qos_flags_request flr;
1: +    struct freq_qos_request freq;
1: +  } data;
1: +  struct device *dev;
1:  };
1:  
1:  struct inactive_task_frame {
1: -	long unsigned int r15;
1: -	long unsigned int r14;
1: -	long unsigned int r13;
1: -	long unsigned int r12;
1: -	long unsigned int bx;
1: -	long unsigned int bp;
1: -	long unsigned int ret_addr;
1: +  long unsigned int r15;
1: +  long unsigned int r14;
1: +  long unsigned int r13;
1: +  long unsigned int r12;
1: +  long unsigned int bx;
1: +  long unsigned int bp;
1: +  long unsigned int ret_addr;
1:  };
1:  
1:  struct fork_frame {
1: -	struct inactive_task_frame frame;
1: -	struct pt_regs regs;
1: +  struct inactive_task_frame frame;
1: +  struct pt_regs regs;
1:  };
1:  
1:  struct ssb_state {
1: -	struct ssb_state *shared_state;
1: -	raw_spinlock_t lock;
1: -	unsigned int disable_state;
1: -	long unsigned int local_state;
1: +  struct ssb_state *shared_state;
1: +  raw_spinlock_t lock;
1: +  unsigned int disable_state;
1: +  long unsigned int local_state;
1:  };
1:  
1:  struct trace_event_raw_x86_fpu {
1: -	struct trace_entry ent;
1: -	struct fpu *fpu;
1: -	bool load_fpu;
1: -	u64 xfeatures;
1: -	u64 xcomp_bv;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct fpu *fpu;
1: +  bool load_fpu;
1: +  u64 xfeatures;
1: +  u64 xcomp_bv;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_x86_fpu {};
1: @@ -21246,716 +21412,721 @@ typedef void (*btf_trace_x86_fpu_copy_dst)(void *, struct fpu *);
1:  typedef void (*btf_trace_x86_fpu_xstate_check_failed)(void *, struct fpu *);
1:  
1:  struct _fpreg {
1: -	__u16 significand[4];
1: -	__u16 exponent;
1: +  __u16 significand[4];
1: +  __u16 exponent;
1:  };
1:  
1:  struct _fpxreg {
1: -	__u16 significand[4];
1: -	__u16 exponent;
1: -	__u16 padding[3];
1: +  __u16 significand[4];
1: +  __u16 exponent;
1: +  __u16 padding[3];
1:  };
1:  
1:  struct user_i387_ia32_struct {
1: -	u32 cwd;
1: -	u32 swd;
1: -	u32 twd;
1: -	u32 fip;
1: -	u32 fcs;
1: -	u32 foo;
1: -	u32 fos;
1: -	u32 st_space[20];
1: +  u32 cwd;
1: +  u32 swd;
1: +  u32 twd;
1: +  u32 fip;
1: +  u32 fcs;
1: +  u32 foo;
1: +  u32 fos;
1: +  u32 st_space[20];
1:  };
1:  
1:  struct membuf {
1: -	void *p;
1: -	size_t left;
1: +  void *p;
1: +  size_t left;
1:  };
1:  
1:  struct user_regset;
1:  
1: -typedef int user_regset_active_fn(struct task_struct *, const struct user_regset *);
1: +typedef int user_regset_active_fn(struct task_struct *,
1: +                                  const struct user_regset *);
1:  
1: -typedef int user_regset_get2_fn(struct task_struct *, const struct user_regset *, struct membuf);
1: +typedef int user_regset_get2_fn(struct task_struct *,
1: +                                const struct user_regset *, struct membuf);
1:  
1: -typedef int user_regset_set_fn(struct task_struct *, const struct user_regset *, unsigned int, unsigned int, const void *, const void *);
1: +typedef int user_regset_set_fn(struct task_struct *, const struct user_regset *,
1: +                               unsigned int, unsigned int, const void *,
1: +                               const void *);
1:  
1: -typedef int user_regset_writeback_fn(struct task_struct *, const struct user_regset *, int);
1: +typedef int user_regset_writeback_fn(struct task_struct *,
1: +                                     const struct user_regset *, int);
1:  
1:  struct user_regset {
1: -	user_regset_get2_fn *regset_get;
1: -	user_regset_set_fn *set;
1: -	user_regset_active_fn *active;
1: -	user_regset_writeback_fn *writeback;
1: -	unsigned int n;
1: -	unsigned int size;
1: -	unsigned int align;
1: -	unsigned int bias;
1: -	unsigned int core_note_type;
1: +  user_regset_get2_fn *regset_get;
1: +  user_regset_set_fn *set;
1: +  user_regset_active_fn *active;
1: +  user_regset_writeback_fn *writeback;
1: +  unsigned int n;
1: +  unsigned int size;
1: +  unsigned int align;
1: +  unsigned int bias;
1: +  unsigned int core_note_type;
1:  };
1:  
1:  struct _fpx_sw_bytes {
1: -	__u32 magic1;
1: -	__u32 extended_size;
1: -	__u64 xfeatures;
1: -	__u32 xstate_size;
1: -	__u32 padding[7];
1: +  __u32 magic1;
1: +  __u32 extended_size;
1: +  __u64 xfeatures;
1: +  __u32 xstate_size;
1: +  __u32 padding[7];
1:  };
1:  
1:  struct _xmmreg {
1: -	__u32 element[4];
1: +  __u32 element[4];
1:  };
1:  
1:  struct _fpstate_32 {
1: -	__u32 cw;
1: -	__u32 sw;
1: -	__u32 tag;
1: -	__u32 ipoff;
1: -	__u32 cssel;
1: -	__u32 dataoff;
1: -	__u32 datasel;
1: -	struct _fpreg _st[8];
1: -	__u16 status;
1: -	__u16 magic;
1: -	__u32 _fxsr_env[6];
1: -	__u32 mxcsr;
1: -	__u32 reserved;
1: -	struct _fpxreg _fxsr_st[8];
1: -	struct _xmmreg _xmm[8];
1: -	union {
1: -		__u32 padding1[44];
1: -		__u32 padding[44];
1: -	};
1: -	union {
1: -		__u32 padding2[12];
1: -		struct _fpx_sw_bytes sw_reserved;
1: -	};
1: +  __u32 cw;
1: +  __u32 sw;
1: +  __u32 tag;
1: +  __u32 ipoff;
1: +  __u32 cssel;
1: +  __u32 dataoff;
1: +  __u32 datasel;
1: +  struct _fpreg _st[8];
1: +  __u16 status;
1: +  __u16 magic;
1: +  __u32 _fxsr_env[6];
1: +  __u32 mxcsr;
1: +  __u32 reserved;
1: +  struct _fpxreg _fxsr_st[8];
1: +  struct _xmmreg _xmm[8];
1: +  union {
1: +    __u32 padding1[44];
1: +    __u32 padding[44];
1: +  };
1: +  union {
1: +    __u32 padding2[12];
1: +    struct _fpx_sw_bytes sw_reserved;
1: +  };
1:  };
1:  
1:  struct ia32_pasid_state {
1: -	u64 pasid;
1: +  u64 pasid;
1:  };
1:  
1:  typedef u32 compat_ulong_t;
1:  
1:  struct user_regset_view {
1: -	const char *name;
1: -	const struct user_regset *regsets;
1: -	unsigned int n;
1: -	u32 e_flags;
1: -	u16 e_machine;
1: -	u8 ei_osabi;
1: +  const char *name;
1: +  const struct user_regset *regsets;
1: +  unsigned int n;
1: +  u32 e_flags;
1: +  u16 e_machine;
1: +  u8 ei_osabi;
1:  };
1:  
1:  enum x86_regset {
1: -	REGSET_GENERAL = 0,
1: -	REGSET_FP = 1,
1: -	REGSET_XFP = 2,
1: -	REGSET_IOPERM64 = 2,
1: -	REGSET_XSTATE = 3,
1: -	REGSET_TLS = 4,
1: -	REGSET_IOPERM32 = 5,
1: +  REGSET_GENERAL = 0,
1: +  REGSET_FP = 1,
1: +  REGSET_XFP = 2,
1: +  REGSET_IOPERM64 = 2,
1: +  REGSET_XSTATE = 3,
1: +  REGSET_TLS = 4,
1: +  REGSET_IOPERM32 = 5,
1:  };
1:  
1:  struct pt_regs_offset {
1: -	const char *name;
1: -	int offset;
1: +  const char *name;
1: +  int offset;
1:  };
1:  
1:  typedef u8 uint8_t;
1:  
1:  enum {
1: -	TB_SHUTDOWN_REBOOT = 0,
1: -	TB_SHUTDOWN_S5 = 1,
1: -	TB_SHUTDOWN_S4 = 2,
1: -	TB_SHUTDOWN_S3 = 3,
1: -	TB_SHUTDOWN_HALT = 4,
1: -	TB_SHUTDOWN_WFS = 5,
1: +  TB_SHUTDOWN_REBOOT = 0,
1: +  TB_SHUTDOWN_S5 = 1,
1: +  TB_SHUTDOWN_S4 = 2,
1: +  TB_SHUTDOWN_S3 = 3,
1: +  TB_SHUTDOWN_HALT = 4,
1: +  TB_SHUTDOWN_WFS = 5,
1:  };
1:  
1:  struct tboot_mac_region {
1: -	u64 start;
1: -	u32 size;
1: +  u64 start;
1: +  u32 size;
1:  } __attribute__((packed));
1:  
1:  struct tboot_acpi_generic_address {
1: -	u8 space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 access_width;
1: -	u64 address;
1: +  u8 space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 access_width;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct tboot_acpi_sleep_info {
1: -	struct tboot_acpi_generic_address pm1a_cnt_blk;
1: -	struct tboot_acpi_generic_address pm1b_cnt_blk;
1: -	struct tboot_acpi_generic_address pm1a_evt_blk;
1: -	struct tboot_acpi_generic_address pm1b_evt_blk;
1: -	u16 pm1a_cnt_val;
1: -	u16 pm1b_cnt_val;
1: -	u64 wakeup_vector;
1: -	u32 vector_width;
1: -	u64 kernel_s3_resume_vector;
1: +  struct tboot_acpi_generic_address pm1a_cnt_blk;
1: +  struct tboot_acpi_generic_address pm1b_cnt_blk;
1: +  struct tboot_acpi_generic_address pm1a_evt_blk;
1: +  struct tboot_acpi_generic_address pm1b_evt_blk;
1: +  u16 pm1a_cnt_val;
1: +  u16 pm1b_cnt_val;
1: +  u64 wakeup_vector;
1: +  u32 vector_width;
1: +  u64 kernel_s3_resume_vector;
1:  } __attribute__((packed));
1:  
1:  struct tboot {
1: -	u8 uuid[16];
1: -	u32 version;
1: -	u32 log_addr;
1: -	u32 shutdown_entry;
1: -	u32 shutdown_type;
1: -	struct tboot_acpi_sleep_info acpi_sinfo;
1: -	u32 tboot_base;
1: -	u32 tboot_size;
1: -	u8 num_mac_regions;
1: -	struct tboot_mac_region mac_regions[32];
1: -	u8 s3_key[64];
1: -	u8 reserved_align[3];
1: -	u32 num_in_wfs;
1: +  u8 uuid[16];
1: +  u32 version;
1: +  u32 log_addr;
1: +  u32 shutdown_entry;
1: +  u32 shutdown_type;
1: +  struct tboot_acpi_sleep_info acpi_sinfo;
1: +  u32 tboot_base;
1: +  u32 tboot_size;
1: +  u8 num_mac_regions;
1: +  struct tboot_mac_region mac_regions[32];
1: +  u8 s3_key[64];
1: +  u8 reserved_align[3];
1: +  u32 num_in_wfs;
1:  } __attribute__((packed));
1:  
1:  struct sha1_hash {
1: -	u8 hash[20];
1: +  u8 hash[20];
1:  };
1:  
1:  struct sinit_mle_data {
1: -	u32 version;
1: -	struct sha1_hash bios_acm_id;
1: -	u32 edx_senter_flags;
1: -	u64 mseg_valid;
1: -	struct sha1_hash sinit_hash;
1: -	struct sha1_hash mle_hash;
1: -	struct sha1_hash stm_hash;
1: -	struct sha1_hash lcp_policy_hash;
1: -	u32 lcp_policy_control;
1: -	u32 rlp_wakeup_addr;
1: -	u32 reserved;
1: -	u32 num_mdrs;
1: -	u32 mdrs_off;
1: -	u32 num_vtd_dmars;
1: -	u32 vtd_dmars_off;
1: +  u32 version;
1: +  struct sha1_hash bios_acm_id;
1: +  u32 edx_senter_flags;
1: +  u64 mseg_valid;
1: +  struct sha1_hash sinit_hash;
1: +  struct sha1_hash mle_hash;
1: +  struct sha1_hash stm_hash;
1: +  struct sha1_hash lcp_policy_hash;
1: +  u32 lcp_policy_control;
1: +  u32 rlp_wakeup_addr;
1: +  u32 reserved;
1: +  u32 num_mdrs;
1: +  u32 mdrs_off;
1: +  u32 num_vtd_dmars;
1: +  u32 vtd_dmars_off;
1:  } __attribute__((packed));
1:  
1:  typedef bool (*stack_trace_consume_fn)(void *, long unsigned int);
1:  
1:  struct stack_frame_user {
1: -	const void *next_fp;
1: -	long unsigned int ret_addr;
1: +  const void *next_fp;
1: +  long unsigned int ret_addr;
1:  };
1:  
1:  enum cache_type {
1: -	CACHE_TYPE_NOCACHE = 0,
1: -	CACHE_TYPE_INST = 1,
1: -	CACHE_TYPE_DATA = 2,
1: -	CACHE_TYPE_SEPARATE = 3,
1: -	CACHE_TYPE_UNIFIED = 4,
1: +  CACHE_TYPE_NOCACHE = 0,
1: +  CACHE_TYPE_INST = 1,
1: +  CACHE_TYPE_DATA = 2,
1: +  CACHE_TYPE_SEPARATE = 3,
1: +  CACHE_TYPE_UNIFIED = 4,
1:  };
1:  
1:  struct cacheinfo {
1: -	unsigned int id;
1: -	enum cache_type type;
1: -	unsigned int level;
1: -	unsigned int coherency_line_size;
1: -	unsigned int number_of_sets;
1: -	unsigned int ways_of_associativity;
1: -	unsigned int physical_line_partition;
1: -	unsigned int size;
1: -	cpumask_t shared_cpu_map;
1: -	unsigned int attributes;
1: -	void *fw_token;
1: -	bool disable_sysfs;
1: -	void *priv;
1: +  unsigned int id;
1: +  enum cache_type type;
1: +  unsigned int level;
1: +  unsigned int coherency_line_size;
1: +  unsigned int number_of_sets;
1: +  unsigned int ways_of_associativity;
1: +  unsigned int physical_line_partition;
1: +  unsigned int size;
1: +  cpumask_t shared_cpu_map;
1: +  unsigned int attributes;
1: +  void *fw_token;
1: +  bool disable_sysfs;
1: +  void *priv;
1:  };
1:  
1:  struct cpu_cacheinfo {
1: -	struct cacheinfo *info_list;
1: -	unsigned int num_levels;
1: -	unsigned int num_leaves;
1: -	bool cpu_map_populated;
1: +  struct cacheinfo *info_list;
1: +  unsigned int num_levels;
1: +  unsigned int num_leaves;
1: +  bool cpu_map_populated;
1:  };
1:  
1:  struct amd_l3_cache {
1: -	unsigned int indices;
1: -	u8 subcaches[4];
1: +  unsigned int indices;
1: +  u8 subcaches[4];
1:  };
1:  
1:  struct threshold_block {
1: -	unsigned int block;
1: -	unsigned int bank;
1: -	unsigned int cpu;
1: -	u32 address;
1: -	u16 interrupt_enable;
1: -	bool interrupt_capable;
1: -	u16 threshold_limit;
1: -	struct kobject kobj;
1: -	struct list_head miscj;
1: +  unsigned int block;
1: +  unsigned int bank;
1: +  unsigned int cpu;
1: +  u32 address;
1: +  u16 interrupt_enable;
1: +  bool interrupt_capable;
1: +  u16 threshold_limit;
1: +  struct kobject kobj;
1: +  struct list_head miscj;
1:  };
1:  
1:  struct threshold_bank {
1: -	struct kobject *kobj;
1: -	struct threshold_block *blocks;
1: -	refcount_t cpus;
1: -	unsigned int shared;
1: +  struct kobject *kobj;
1: +  struct threshold_block *blocks;
1: +  refcount_t cpus;
1: +  unsigned int shared;
1:  };
1:  
1:  struct amd_northbridge {
1: -	struct pci_dev *root;
1: -	struct pci_dev *misc;
1: -	struct pci_dev *link;
1: -	struct amd_l3_cache l3_cache;
1: -	struct threshold_bank *bank4;
1: +  struct pci_dev *root;
1: +  struct pci_dev *misc;
1: +  struct pci_dev *link;
1: +  struct amd_l3_cache l3_cache;
1: +  struct threshold_bank *bank4;
1:  };
1:  
1:  struct _cache_table {
1: -	unsigned char descriptor;
1: -	char cache_type;
1: -	short int size;
1: +  unsigned char descriptor;
1: +  char cache_type;
1: +  short int size;
1:  };
1:  
1:  enum _cache_type {
1: -	CTYPE_NULL = 0,
1: -	CTYPE_DATA = 1,
1: -	CTYPE_INST = 2,
1: -	CTYPE_UNIFIED = 3,
1: +  CTYPE_NULL = 0,
1: +  CTYPE_DATA = 1,
1: +  CTYPE_INST = 2,
1: +  CTYPE_UNIFIED = 3,
1:  };
1:  
1:  union _cpuid4_leaf_eax {
1: -	struct {
1: -		enum _cache_type type: 5;
1: -		unsigned int level: 3;
1: -		unsigned int is_self_initializing: 1;
1: -		unsigned int is_fully_associative: 1;
1: -		unsigned int reserved: 4;
1: -		unsigned int num_threads_sharing: 12;
1: -		unsigned int num_cores_on_die: 6;
1: -	} split;
1: -	u32 full;
1: +  struct {
1: +    enum _cache_type type : 5;
1: +    unsigned int level : 3;
1: +    unsigned int is_self_initializing : 1;
1: +    unsigned int is_fully_associative : 1;
1: +    unsigned int reserved : 4;
1: +    unsigned int num_threads_sharing : 12;
1: +    unsigned int num_cores_on_die : 6;
1: +  } split;
1: +  u32 full;
1:  };
1:  
1:  union _cpuid4_leaf_ebx {
1: -	struct {
1: -		unsigned int coherency_line_size: 12;
1: -		unsigned int physical_line_partition: 10;
1: -		unsigned int ways_of_associativity: 10;
1: -	} split;
1: -	u32 full;
1: +  struct {
1: +    unsigned int coherency_line_size : 12;
1: +    unsigned int physical_line_partition : 10;
1: +    unsigned int ways_of_associativity : 10;
1: +  } split;
1: +  u32 full;
1:  };
1:  
1:  union _cpuid4_leaf_ecx {
1: -	struct {
1: -		unsigned int number_of_sets: 32;
1: -	} split;
1: -	u32 full;
1: +  struct {
1: +    unsigned int number_of_sets : 32;
1: +  } split;
1: +  u32 full;
1:  };
1:  
1:  struct _cpuid4_info_regs {
1: -	union _cpuid4_leaf_eax eax;
1: -	union _cpuid4_leaf_ebx ebx;
1: -	union _cpuid4_leaf_ecx ecx;
1: -	unsigned int id;
1: -	long unsigned int size;
1: -	struct amd_northbridge *nb;
1: +  union _cpuid4_leaf_eax eax;
1: +  union _cpuid4_leaf_ebx ebx;
1: +  union _cpuid4_leaf_ecx ecx;
1: +  unsigned int id;
1: +  long unsigned int size;
1: +  struct amd_northbridge *nb;
1:  };
1:  
1:  union l1_cache {
1: -	struct {
1: -		unsigned int line_size: 8;
1: -		unsigned int lines_per_tag: 8;
1: -		unsigned int assoc: 8;
1: -		unsigned int size_in_kb: 8;
1: -	};
1: -	unsigned int val;
1: +  struct {
1: +    unsigned int line_size : 8;
1: +    unsigned int lines_per_tag : 8;
1: +    unsigned int assoc : 8;
1: +    unsigned int size_in_kb : 8;
1: +  };
1: +  unsigned int val;
1:  };
1:  
1:  union l2_cache {
1: -	struct {
1: -		unsigned int line_size: 8;
1: -		unsigned int lines_per_tag: 4;
1: -		unsigned int assoc: 4;
1: -		unsigned int size_in_kb: 16;
1: -	};
1: -	unsigned int val;
1: +  struct {
1: +    unsigned int line_size : 8;
1: +    unsigned int lines_per_tag : 4;
1: +    unsigned int assoc : 4;
1: +    unsigned int size_in_kb : 16;
1: +  };
1: +  unsigned int val;
1:  };
1:  
1:  union l3_cache {
1: -	struct {
1: -		unsigned int line_size: 8;
1: -		unsigned int lines_per_tag: 4;
1: -		unsigned int assoc: 4;
1: -		unsigned int res: 2;
1: -		unsigned int size_encoded: 14;
1: -	};
1: -	unsigned int val;
1: +  struct {
1: +    unsigned int line_size : 8;
1: +    unsigned int lines_per_tag : 4;
1: +    unsigned int assoc : 4;
1: +    unsigned int res : 2;
1: +    unsigned int size_encoded : 14;
1: +  };
1: +  unsigned int val;
1:  };
1:  
1:  struct cpuid_bit {
1: -	u16 feature;
1: -	u8 reg;
1: -	u8 bit;
1: -	u32 level;
1: -	u32 sub_leaf;
1: +  u16 feature;
1: +  u8 reg;
1: +  u8 bit;
1: +  u32 level;
1: +  u32 sub_leaf;
1:  };
1:  
1:  struct fixed_percpu_data {
1: -	char gs_base[40];
1: -	long unsigned int stack_canary;
1: +  char gs_base[40];
1: +  long unsigned int stack_canary;
1:  };
1:  
1:  enum cpuid_leafs {
1: -	CPUID_1_EDX = 0,
1: -	CPUID_8000_0001_EDX = 1,
1: -	CPUID_8086_0001_EDX = 2,
1: -	CPUID_LNX_1 = 3,
1: -	CPUID_1_ECX = 4,
1: -	CPUID_C000_0001_EDX = 5,
1: -	CPUID_8000_0001_ECX = 6,
1: -	CPUID_LNX_2 = 7,
1: -	CPUID_LNX_3 = 8,
1: -	CPUID_7_0_EBX = 9,
1: -	CPUID_D_1_EAX = 10,
1: -	CPUID_LNX_4 = 11,
1: -	CPUID_7_1_EAX = 12,
1: -	CPUID_8000_0008_EBX = 13,
1: -	CPUID_6_EAX = 14,
1: -	CPUID_8000_000A_EDX = 15,
1: -	CPUID_7_ECX = 16,
1: -	CPUID_8000_0007_EBX = 17,
1: -	CPUID_7_EDX = 18,
1: +  CPUID_1_EDX = 0,
1: +  CPUID_8000_0001_EDX = 1,
1: +  CPUID_8086_0001_EDX = 2,
1: +  CPUID_LNX_1 = 3,
1: +  CPUID_1_ECX = 4,
1: +  CPUID_C000_0001_EDX = 5,
1: +  CPUID_8000_0001_ECX = 6,
1: +  CPUID_LNX_2 = 7,
1: +  CPUID_LNX_3 = 8,
1: +  CPUID_7_0_EBX = 9,
1: +  CPUID_D_1_EAX = 10,
1: +  CPUID_LNX_4 = 11,
1: +  CPUID_7_1_EAX = 12,
1: +  CPUID_8000_0008_EBX = 13,
1: +  CPUID_6_EAX = 14,
1: +  CPUID_8000_000A_EDX = 15,
1: +  CPUID_7_ECX = 16,
1: +  CPUID_8000_0007_EBX = 17,
1: +  CPUID_7_EDX = 18,
1:  };
1:  
1:  struct cpu_dev {
1: -	const char *c_vendor;
1: -	const char *c_ident[2];
1: -	void (*c_early_init)(struct cpuinfo_x86 *);
1: -	void (*c_bsp_init)(struct cpuinfo_x86 *);
1: -	void (*c_init)(struct cpuinfo_x86 *);
1: -	void (*c_identify)(struct cpuinfo_x86 *);
1: -	void (*c_detect_tlb)(struct cpuinfo_x86 *);
1: -	int c_x86_vendor;
1: +  const char *c_vendor;
1: +  const char *c_ident[2];
1: +  void (*c_early_init)(struct cpuinfo_x86 *);
1: +  void (*c_bsp_init)(struct cpuinfo_x86 *);
1: +  void (*c_init)(struct cpuinfo_x86 *);
1: +  void (*c_identify)(struct cpuinfo_x86 *);
1: +  void (*c_detect_tlb)(struct cpuinfo_x86 *);
1: +  int c_x86_vendor;
1:  };
1:  
1:  struct cpuid_dependent_feature {
1: -	u32 feature;
1: -	u32 level;
1: +  u32 feature;
1: +  u32 level;
1:  };
1:  
1:  enum spectre_v2_mitigation {
1: -	SPECTRE_V2_NONE = 0,
1: -	SPECTRE_V2_RETPOLINE_GENERIC = 1,
1: -	SPECTRE_V2_RETPOLINE_AMD = 2,
1: -	SPECTRE_V2_IBRS_ENHANCED = 3,
1: +  SPECTRE_V2_NONE = 0,
1: +  SPECTRE_V2_RETPOLINE_GENERIC = 1,
1: +  SPECTRE_V2_RETPOLINE_AMD = 2,
1: +  SPECTRE_V2_IBRS_ENHANCED = 3,
1:  };
1:  
1:  enum spectre_v2_user_mitigation {
1: -	SPECTRE_V2_USER_NONE = 0,
1: -	SPECTRE_V2_USER_STRICT = 1,
1: -	SPECTRE_V2_USER_STRICT_PREFERRED = 2,
1: -	SPECTRE_V2_USER_PRCTL = 3,
1: -	SPECTRE_V2_USER_SECCOMP = 4,
1: +  SPECTRE_V2_USER_NONE = 0,
1: +  SPECTRE_V2_USER_STRICT = 1,
1: +  SPECTRE_V2_USER_STRICT_PREFERRED = 2,
1: +  SPECTRE_V2_USER_PRCTL = 3,
1: +  SPECTRE_V2_USER_SECCOMP = 4,
1:  };
1:  
1:  enum ssb_mitigation {
1: -	SPEC_STORE_BYPASS_NONE = 0,
1: -	SPEC_STORE_BYPASS_DISABLE = 1,
1: -	SPEC_STORE_BYPASS_PRCTL = 2,
1: -	SPEC_STORE_BYPASS_SECCOMP = 3,
1: +  SPEC_STORE_BYPASS_NONE = 0,
1: +  SPEC_STORE_BYPASS_DISABLE = 1,
1: +  SPEC_STORE_BYPASS_PRCTL = 2,
1: +  SPEC_STORE_BYPASS_SECCOMP = 3,
1:  };
1:  
1:  enum l1tf_mitigations {
1: -	L1TF_MITIGATION_OFF = 0,
1: -	L1TF_MITIGATION_FLUSH_NOWARN = 1,
1: -	L1TF_MITIGATION_FLUSH = 2,
1: -	L1TF_MITIGATION_FLUSH_NOSMT = 3,
1: -	L1TF_MITIGATION_FULL = 4,
1: -	L1TF_MITIGATION_FULL_FORCE = 5,
1: +  L1TF_MITIGATION_OFF = 0,
1: +  L1TF_MITIGATION_FLUSH_NOWARN = 1,
1: +  L1TF_MITIGATION_FLUSH = 2,
1: +  L1TF_MITIGATION_FLUSH_NOSMT = 3,
1: +  L1TF_MITIGATION_FULL = 4,
1: +  L1TF_MITIGATION_FULL_FORCE = 5,
1:  };
1:  
1:  enum mds_mitigations {
1: -	MDS_MITIGATION_OFF = 0,
1: -	MDS_MITIGATION_FULL = 1,
1: -	MDS_MITIGATION_VMWERV = 2,
1: +  MDS_MITIGATION_OFF = 0,
1: +  MDS_MITIGATION_FULL = 1,
1: +  MDS_MITIGATION_VMWERV = 2,
1:  };
1:  
1:  enum cpuhp_smt_control {
1: -	CPU_SMT_ENABLED = 0,
1: -	CPU_SMT_DISABLED = 1,
1: -	CPU_SMT_FORCE_DISABLED = 2,
1: -	CPU_SMT_NOT_SUPPORTED = 3,
1: -	CPU_SMT_NOT_IMPLEMENTED = 4,
1: +  CPU_SMT_ENABLED = 0,
1: +  CPU_SMT_DISABLED = 1,
1: +  CPU_SMT_FORCE_DISABLED = 2,
1: +  CPU_SMT_NOT_SUPPORTED = 3,
1: +  CPU_SMT_NOT_IMPLEMENTED = 4,
1:  };
1:  
1:  enum vmx_l1d_flush_state {
1: -	VMENTER_L1D_FLUSH_AUTO = 0,
1: -	VMENTER_L1D_FLUSH_NEVER = 1,
1: -	VMENTER_L1D_FLUSH_COND = 2,
1: -	VMENTER_L1D_FLUSH_ALWAYS = 3,
1: -	VMENTER_L1D_FLUSH_EPT_DISABLED = 4,
1: -	VMENTER_L1D_FLUSH_NOT_REQUIRED = 5,
1: +  VMENTER_L1D_FLUSH_AUTO = 0,
1: +  VMENTER_L1D_FLUSH_NEVER = 1,
1: +  VMENTER_L1D_FLUSH_COND = 2,
1: +  VMENTER_L1D_FLUSH_ALWAYS = 3,
1: +  VMENTER_L1D_FLUSH_EPT_DISABLED = 4,
1: +  VMENTER_L1D_FLUSH_NOT_REQUIRED = 5,
1:  };
1:  
1:  enum x86_hypervisor_type {
1: -	X86_HYPER_NATIVE = 0,
1: -	X86_HYPER_VMWARE = 1,
1: -	X86_HYPER_MS_HYPERV = 2,
1: -	X86_HYPER_XEN_PV = 3,
1: -	X86_HYPER_XEN_HVM = 4,
1: -	X86_HYPER_KVM = 5,
1: -	X86_HYPER_JAILHOUSE = 6,
1: -	X86_HYPER_ACRN = 7,
1: +  X86_HYPER_NATIVE = 0,
1: +  X86_HYPER_VMWARE = 1,
1: +  X86_HYPER_MS_HYPERV = 2,
1: +  X86_HYPER_XEN_PV = 3,
1: +  X86_HYPER_XEN_HVM = 4,
1: +  X86_HYPER_KVM = 5,
1: +  X86_HYPER_JAILHOUSE = 6,
1: +  X86_HYPER_ACRN = 7,
1:  };
1:  
1:  enum taa_mitigations {
1: -	TAA_MITIGATION_OFF = 0,
1: -	TAA_MITIGATION_UCODE_NEEDED = 1,
1: -	TAA_MITIGATION_VERW = 2,
1: -	TAA_MITIGATION_TSX_DISABLED = 3,
1: +  TAA_MITIGATION_OFF = 0,
1: +  TAA_MITIGATION_UCODE_NEEDED = 1,
1: +  TAA_MITIGATION_VERW = 2,
1: +  TAA_MITIGATION_TSX_DISABLED = 3,
1:  };
1:  
1:  enum srbds_mitigations {
1: -	SRBDS_MITIGATION_OFF = 0,
1: -	SRBDS_MITIGATION_UCODE_NEEDED = 1,
1: -	SRBDS_MITIGATION_FULL = 2,
1: -	SRBDS_MITIGATION_TSX_OFF = 3,
1: -	SRBDS_MITIGATION_HYPERVISOR = 4,
1: +  SRBDS_MITIGATION_OFF = 0,
1: +  SRBDS_MITIGATION_UCODE_NEEDED = 1,
1: +  SRBDS_MITIGATION_FULL = 2,
1: +  SRBDS_MITIGATION_TSX_OFF = 3,
1: +  SRBDS_MITIGATION_HYPERVISOR = 4,
1:  };
1:  
1:  enum spectre_v1_mitigation {
1: -	SPECTRE_V1_MITIGATION_NONE = 0,
1: -	SPECTRE_V1_MITIGATION_AUTO = 1,
1: +  SPECTRE_V1_MITIGATION_NONE = 0,
1: +  SPECTRE_V1_MITIGATION_AUTO = 1,
1:  };
1:  
1:  enum spectre_v2_mitigation_cmd {
1: -	SPECTRE_V2_CMD_NONE = 0,
1: -	SPECTRE_V2_CMD_AUTO = 1,
1: -	SPECTRE_V2_CMD_FORCE = 2,
1: -	SPECTRE_V2_CMD_RETPOLINE = 3,
1: -	SPECTRE_V2_CMD_RETPOLINE_GENERIC = 4,
1: -	SPECTRE_V2_CMD_RETPOLINE_AMD = 5,
1: +  SPECTRE_V2_CMD_NONE = 0,
1: +  SPECTRE_V2_CMD_AUTO = 1,
1: +  SPECTRE_V2_CMD_FORCE = 2,
1: +  SPECTRE_V2_CMD_RETPOLINE = 3,
1: +  SPECTRE_V2_CMD_RETPOLINE_GENERIC = 4,
1: +  SPECTRE_V2_CMD_RETPOLINE_AMD = 5,
1:  };
1:  
1:  enum spectre_v2_user_cmd {
1: -	SPECTRE_V2_USER_CMD_NONE = 0,
1: -	SPECTRE_V2_USER_CMD_AUTO = 1,
1: -	SPECTRE_V2_USER_CMD_FORCE = 2,
1: -	SPECTRE_V2_USER_CMD_PRCTL = 3,
1: -	SPECTRE_V2_USER_CMD_PRCTL_IBPB = 4,
1: -	SPECTRE_V2_USER_CMD_SECCOMP = 5,
1: -	SPECTRE_V2_USER_CMD_SECCOMP_IBPB = 6,
1: +  SPECTRE_V2_USER_CMD_NONE = 0,
1: +  SPECTRE_V2_USER_CMD_AUTO = 1,
1: +  SPECTRE_V2_USER_CMD_FORCE = 2,
1: +  SPECTRE_V2_USER_CMD_PRCTL = 3,
1: +  SPECTRE_V2_USER_CMD_PRCTL_IBPB = 4,
1: +  SPECTRE_V2_USER_CMD_SECCOMP = 5,
1: +  SPECTRE_V2_USER_CMD_SECCOMP_IBPB = 6,
1:  };
1:  
1:  enum ssb_mitigation_cmd {
1: -	SPEC_STORE_BYPASS_CMD_NONE = 0,
1: -	SPEC_STORE_BYPASS_CMD_AUTO = 1,
1: -	SPEC_STORE_BYPASS_CMD_ON = 2,
1: -	SPEC_STORE_BYPASS_CMD_PRCTL = 3,
1: -	SPEC_STORE_BYPASS_CMD_SECCOMP = 4,
1: +  SPEC_STORE_BYPASS_CMD_NONE = 0,
1: +  SPEC_STORE_BYPASS_CMD_AUTO = 1,
1: +  SPEC_STORE_BYPASS_CMD_ON = 2,
1: +  SPEC_STORE_BYPASS_CMD_PRCTL = 3,
1: +  SPEC_STORE_BYPASS_CMD_SECCOMP = 4,
1:  };
1:  
1:  enum hk_flags {
1: -	HK_FLAG_TIMER = 1,
1: -	HK_FLAG_RCU = 2,
1: -	HK_FLAG_MISC = 4,
1: -	HK_FLAG_SCHED = 8,
1: -	HK_FLAG_TICK = 16,
1: -	HK_FLAG_DOMAIN = 32,
1: -	HK_FLAG_WQ = 64,
1: -	HK_FLAG_MANAGED_IRQ = 128,
1: -	HK_FLAG_KTHREAD = 256,
1: +  HK_FLAG_TIMER = 1,
1: +  HK_FLAG_RCU = 2,
1: +  HK_FLAG_MISC = 4,
1: +  HK_FLAG_SCHED = 8,
1: +  HK_FLAG_TICK = 16,
1: +  HK_FLAG_DOMAIN = 32,
1: +  HK_FLAG_WQ = 64,
1: +  HK_FLAG_MANAGED_IRQ = 128,
1: +  HK_FLAG_KTHREAD = 256,
1:  };
1:  
1:  struct aperfmperf_sample {
1: -	unsigned int khz;
1: -	ktime_t time;
1: -	u64 aperf;
1: -	u64 mperf;
1: +  unsigned int khz;
1: +  ktime_t time;
1: +  u64 aperf;
1: +  u64 mperf;
1:  };
1:  
1:  struct cpuid_dep {
1: -	unsigned int feature;
1: -	unsigned int depends;
1: +  unsigned int feature;
1: +  unsigned int depends;
1:  };
1:  
1:  enum vmx_feature_leafs {
1: -	MISC_FEATURES = 0,
1: -	PRIMARY_CTLS = 1,
1: -	SECONDARY_CTLS = 2,
1: -	NR_VMX_FEATURE_WORDS = 3,
1: +  MISC_FEATURES = 0,
1: +  PRIMARY_CTLS = 1,
1: +  SECONDARY_CTLS = 2,
1: +  NR_VMX_FEATURE_WORDS = 3,
1:  };
1:  
1:  struct _tlb_table {
1: -	unsigned char descriptor;
1: -	char tlb_type;
1: -	unsigned int entries;
1: -	char info[128];
1: +  unsigned char descriptor;
1: +  char tlb_type;
1: +  unsigned int entries;
1: +  char info[128];
1:  };
1:  
1:  enum tsx_ctrl_states {
1: -	TSX_CTRL_ENABLE = 0,
1: -	TSX_CTRL_DISABLE = 1,
1: -	TSX_CTRL_NOT_SUPPORTED = 2,
1: +  TSX_CTRL_ENABLE = 0,
1: +  TSX_CTRL_DISABLE = 1,
1: +  TSX_CTRL_NOT_SUPPORTED = 2,
1:  };
1:  
1:  enum split_lock_detect_state {
1: -	sld_off = 0,
1: -	sld_warn = 1,
1: -	sld_fatal = 2,
1: +  sld_off = 0,
1: +  sld_warn = 1,
1: +  sld_fatal = 2,
1:  };
1:  
1:  struct sku_microcode {
1: -	u8 model;
1: -	u8 stepping;
1: -	u32 microcode;
1: +  u8 model;
1: +  u8 stepping;
1: +  u32 microcode;
1:  };
1:  
1:  struct cpuid_regs {
1: -	u32 eax;
1: -	u32 ebx;
1: -	u32 ecx;
1: -	u32 edx;
1: +  u32 eax;
1: +  u32 ebx;
1: +  u32 ecx;
1: +  u32 edx;
1:  };
1:  
1:  enum pconfig_target {
1: -	INVALID_TARGET = 0,
1: -	MKTME_TARGET = 1,
1: -	PCONFIG_TARGET_NR = 2,
1: +  INVALID_TARGET = 0,
1: +  MKTME_TARGET = 1,
1: +  PCONFIG_TARGET_NR = 2,
1:  };
1:  
1:  enum {
1: -	PCONFIG_CPUID_SUBLEAF_INVALID = 0,
1: -	PCONFIG_CPUID_SUBLEAF_TARGETID = 1,
1: +  PCONFIG_CPUID_SUBLEAF_INVALID = 0,
1: +  PCONFIG_CPUID_SUBLEAF_TARGETID = 1,
1:  };
1:  
1:  enum task_work_notify_mode {
1: -	TWA_NONE = 0,
1: -	TWA_RESUME = 1,
1: -	TWA_SIGNAL = 2,
1: +  TWA_NONE = 0,
1: +  TWA_RESUME = 1,
1: +  TWA_SIGNAL = 2,
1:  };
1:  
1:  enum mf_flags {
1: -	MF_COUNT_INCREASED = 1,
1: -	MF_ACTION_REQUIRED = 2,
1: -	MF_MUST_KILL = 4,
1: -	MF_SOFT_OFFLINE = 8,
1: +  MF_COUNT_INCREASED = 1,
1: +  MF_ACTION_REQUIRED = 2,
1: +  MF_MUST_KILL = 4,
1: +  MF_SOFT_OFFLINE = 8,
1:  };
1:  
1:  struct mce {
1: -	__u64 status;
1: -	__u64 misc;
1: -	__u64 addr;
1: -	__u64 mcgstatus;
1: -	__u64 ip;
1: -	__u64 tsc;
1: -	__u64 time;
1: -	__u8 cpuvendor;
1: -	__u8 inject_flags;
1: -	__u8 severity;
1: -	__u8 pad;
1: -	__u32 cpuid;
1: -	__u8 cs;
1: -	__u8 bank;
1: -	__u8 cpu;
1: -	__u8 finished;
1: -	__u32 extcpu;
1: -	__u32 socketid;
1: -	__u32 apicid;
1: -	__u64 mcgcap;
1: -	__u64 synd;
1: -	__u64 ipid;
1: -	__u64 ppin;
1: -	__u32 microcode;
1: -	__u64 kflags;
1: +  __u64 status;
1: +  __u64 misc;
1: +  __u64 addr;
1: +  __u64 mcgstatus;
1: +  __u64 ip;
1: +  __u64 tsc;
1: +  __u64 time;
1: +  __u8 cpuvendor;
1: +  __u8 inject_flags;
1: +  __u8 severity;
1: +  __u8 pad;
1: +  __u32 cpuid;
1: +  __u8 cs;
1: +  __u8 bank;
1: +  __u8 cpu;
1: +  __u8 finished;
1: +  __u32 extcpu;
1: +  __u32 socketid;
1: +  __u32 apicid;
1: +  __u64 mcgcap;
1: +  __u64 synd;
1: +  __u64 ipid;
1: +  __u64 ppin;
1: +  __u32 microcode;
1: +  __u64 kflags;
1:  };
1:  
1:  enum mce_notifier_prios {
1: -	MCE_PRIO_LOWEST = 0,
1: -	MCE_PRIO_MCELOG = 1,
1: -	MCE_PRIO_EDAC = 2,
1: -	MCE_PRIO_NFIT = 3,
1: -	MCE_PRIO_EXTLOG = 4,
1: -	MCE_PRIO_UC = 5,
1: -	MCE_PRIO_EARLY = 6,
1: -	MCE_PRIO_CEC = 7,
1: +  MCE_PRIO_LOWEST = 0,
1: +  MCE_PRIO_MCELOG = 1,
1: +  MCE_PRIO_EDAC = 2,
1: +  MCE_PRIO_NFIT = 3,
1: +  MCE_PRIO_EXTLOG = 4,
1: +  MCE_PRIO_UC = 5,
1: +  MCE_PRIO_EARLY = 6,
1: +  MCE_PRIO_CEC = 7,
1:  };
1:  
1:  typedef long unsigned int mce_banks_t[1];
1:  
1:  enum mcp_flags {
1: -	MCP_TIMESTAMP = 1,
1: -	MCP_UC = 2,
1: -	MCP_DONTLOG = 4,
1: +  MCP_TIMESTAMP = 1,
1: +  MCP_UC = 2,
1: +  MCP_DONTLOG = 4,
1:  };
1:  
1:  enum severity_level {
1: -	MCE_NO_SEVERITY = 0,
1: -	MCE_DEFERRED_SEVERITY = 1,
1: -	MCE_UCNA_SEVERITY = 1,
1: -	MCE_KEEP_SEVERITY = 2,
1: -	MCE_SOME_SEVERITY = 3,
1: -	MCE_AO_SEVERITY = 4,
1: -	MCE_UC_SEVERITY = 5,
1: -	MCE_AR_SEVERITY = 6,
1: -	MCE_PANIC_SEVERITY = 7,
1: +  MCE_NO_SEVERITY = 0,
1: +  MCE_DEFERRED_SEVERITY = 1,
1: +  MCE_UCNA_SEVERITY = 1,
1: +  MCE_KEEP_SEVERITY = 2,
1: +  MCE_SOME_SEVERITY = 3,
1: +  MCE_AO_SEVERITY = 4,
1: +  MCE_UC_SEVERITY = 5,
1: +  MCE_AR_SEVERITY = 6,
1: +  MCE_PANIC_SEVERITY = 7,
1:  };
1:  
1:  struct mce_evt_llist {
1: -	struct llist_node llnode;
1: -	struct mce mce;
1: +  struct llist_node llnode;
1: +  struct mce mce;
1:  };
1:  
1:  struct mca_config {
1: -	bool dont_log_ce;
1: -	bool cmci_disabled;
1: -	bool ignore_ce;
1: -	bool print_all;
1: -	__u64 lmce_disabled: 1;
1: -	__u64 disabled: 1;
1: -	__u64 ser: 1;
1: -	__u64 recovery: 1;
1: -	__u64 bios_cmci_threshold: 1;
1: -	int: 27;
1: -	__u64 __reserved: 59;
1: -	s8 bootlog;
1: -	int tolerant;
1: -	int monarch_timeout;
1: -	int panic_timeout;
1: -	u32 rip_msr;
1: +  bool dont_log_ce;
1: +  bool cmci_disabled;
1: +  bool ignore_ce;
1: +  bool print_all;
1: +  __u64 lmce_disabled : 1;
1: +  __u64 disabled : 1;
1: +  __u64 ser : 1;
1: +  __u64 recovery : 1;
1: +  __u64 bios_cmci_threshold : 1;
1: +  int : 27;
1: +  __u64 __reserved : 59;
1: +  s8 bootlog;
1: +  int tolerant;
1: +  int monarch_timeout;
1: +  int panic_timeout;
1: +  u32 rip_msr;
1:  };
1:  
1:  struct mce_vendor_flags {
1: -	__u64 overflow_recov: 1;
1: -	__u64 succor: 1;
1: -	__u64 smca: 1;
1: -	__u64 amd_threshold: 1;
1: -	__u64 __reserved_0: 60;
1: +  __u64 overflow_recov : 1;
1: +  __u64 succor : 1;
1: +  __u64 smca : 1;
1: +  __u64 amd_threshold : 1;
1: +  __u64 __reserved_0 : 60;
1:  };
1:  
1:  struct mca_msr_regs {
1: -	u32 (*ctl)(int);
1: -	u32 (*status)(int);
1: -	u32 (*addr)(int);
1: -	u32 (*misc)(int);
1: +  u32 (*ctl)(int);
1: +  u32 (*status)(int);
1: +  u32 (*addr)(int);
1: +  u32 (*misc)(int);
1:  };
1:  
1:  struct trace_event_raw_mce_record {
1: -	struct trace_entry ent;
1: -	u64 mcgcap;
1: -	u64 mcgstatus;
1: -	u64 status;
1: -	u64 addr;
1: -	u64 misc;
1: -	u64 synd;
1: -	u64 ipid;
1: -	u64 ip;
1: -	u64 tsc;
1: -	u64 walltime;
1: -	u32 cpu;
1: -	u32 cpuid;
1: -	u32 apicid;
1: -	u32 socketid;
1: -	u8 cs;
1: -	u8 bank;
1: -	u8 cpuvendor;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u64 mcgcap;
1: +  u64 mcgstatus;
1: +  u64 status;
1: +  u64 addr;
1: +  u64 misc;
1: +  u64 synd;
1: +  u64 ipid;
1: +  u64 ip;
1: +  u64 tsc;
1: +  u64 walltime;
1: +  u32 cpu;
1: +  u32 cpuid;
1: +  u32 apicid;
1: +  u32 socketid;
1: +  u8 cs;
1: +  u8 bank;
1: +  u8 cpuvendor;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mce_record {};
1: @@ -21963,282 +22134,290 @@ struct trace_event_data_offsets_mce_record {};
1:  typedef void (*btf_trace_mce_record)(void *, struct mce *);
1:  
1:  struct mce_bank {
1: -	u64 ctl;
1: -	bool init;
1: +  u64 ctl;
1: +  bool init;
1:  };
1:  
1:  struct mce_bank_dev {
1: -	struct device_attribute attr;
1: -	char attrname[16];
1: -	u8 bank;
1: +  struct device_attribute attr;
1: +  char attrname[16];
1: +  u8 bank;
1:  };
1:  
1:  enum handler_type {
1: -	EX_HANDLER_NONE = 0,
1: -	EX_HANDLER_FAULT = 1,
1: -	EX_HANDLER_UACCESS = 2,
1: -	EX_HANDLER_OTHER = 3,
1: +  EX_HANDLER_NONE = 0,
1: +  EX_HANDLER_FAULT = 1,
1: +  EX_HANDLER_UACCESS = 2,
1: +  EX_HANDLER_OTHER = 3,
1:  };
1:  
1:  enum context {
1: -	IN_KERNEL = 1,
1: -	IN_USER = 2,
1: -	IN_KERNEL_RECOV = 3,
1: +  IN_KERNEL = 1,
1: +  IN_USER = 2,
1: +  IN_KERNEL_RECOV = 3,
1:  };
1:  
1:  enum ser {
1: -	SER_REQUIRED = 1,
1: -	NO_SER = 2,
1: +  SER_REQUIRED = 1,
1: +  NO_SER = 2,
1:  };
1:  
1:  enum exception {
1: -	EXCP_CONTEXT = 1,
1: -	NO_EXCP = 2,
1: +  EXCP_CONTEXT = 1,
1: +  NO_EXCP = 2,
1:  };
1:  
1:  struct severity {
1: -	u64 mask;
1: -	u64 result;
1: -	unsigned char sev;
1: -	unsigned char mcgmask;
1: -	unsigned char mcgres;
1: -	unsigned char ser;
1: -	unsigned char context;
1: -	unsigned char excp;
1: -	unsigned char covered;
1: -	unsigned char cpu_model;
1: -	unsigned char cpu_minstepping;
1: -	unsigned char bank_lo;
1: -	unsigned char bank_hi;
1: -	char *msg;
1: +  u64 mask;
1: +  u64 result;
1: +  unsigned char sev;
1: +  unsigned char mcgmask;
1: +  unsigned char mcgres;
1: +  unsigned char ser;
1: +  unsigned char context;
1: +  unsigned char excp;
1: +  unsigned char covered;
1: +  unsigned char cpu_model;
1: +  unsigned char cpu_minstepping;
1: +  unsigned char bank_lo;
1: +  unsigned char bank_hi;
1: +  char *msg;
1:  };
1:  
1:  struct gen_pool;
1:  
1: -typedef long unsigned int (*genpool_algo_t)(long unsigned int *, long unsigned int, long unsigned int, unsigned int, void *, struct gen_pool *, long unsigned int);
1: +typedef long unsigned int (*genpool_algo_t)(long unsigned int *,
1: +                                            long unsigned int,
1: +                                            long unsigned int, unsigned int,
1: +                                            void *, struct gen_pool *,
1: +                                            long unsigned int);
1:  
1:  struct gen_pool {
1: -	spinlock_t lock;
1: -	struct list_head chunks;
1: -	int min_alloc_order;
1: -	genpool_algo_t algo;
1: -	void *data;
1: -	const char *name;
1: +  spinlock_t lock;
1: +  struct list_head chunks;
1: +  int min_alloc_order;
1: +  genpool_algo_t algo;
1: +  void *data;
1: +  const char *name;
1:  };
1:  
1:  enum {
1: -	CMCI_STORM_NONE = 0,
1: -	CMCI_STORM_ACTIVE = 1,
1: -	CMCI_STORM_SUBSIDED = 2,
1: +  CMCI_STORM_NONE = 0,
1: +  CMCI_STORM_ACTIVE = 1,
1: +  CMCI_STORM_SUBSIDED = 2,
1:  };
1:  
1:  enum kobject_action {
1: -	KOBJ_ADD = 0,
1: -	KOBJ_REMOVE = 1,
1: -	KOBJ_CHANGE = 2,
1: -	KOBJ_MOVE = 3,
1: -	KOBJ_ONLINE = 4,
1: -	KOBJ_OFFLINE = 5,
1: -	KOBJ_BIND = 6,
1: -	KOBJ_UNBIND = 7,
1: +  KOBJ_ADD = 0,
1: +  KOBJ_REMOVE = 1,
1: +  KOBJ_CHANGE = 2,
1: +  KOBJ_MOVE = 3,
1: +  KOBJ_ONLINE = 4,
1: +  KOBJ_OFFLINE = 5,
1: +  KOBJ_BIND = 6,
1: +  KOBJ_UNBIND = 7,
1:  };
1:  
1:  enum smca_bank_types {
1: -	SMCA_LS = 0,
1: -	SMCA_LS_V2 = 1,
1: -	SMCA_IF = 2,
1: -	SMCA_L2_CACHE = 3,
1: -	SMCA_DE = 4,
1: -	SMCA_RESERVED = 5,
1: -	SMCA_EX = 6,
1: -	SMCA_FP = 7,
1: -	SMCA_L3_CACHE = 8,
1: -	SMCA_CS = 9,
1: -	SMCA_CS_V2 = 10,
1: -	SMCA_PIE = 11,
1: -	SMCA_UMC = 12,
1: -	SMCA_PB = 13,
1: -	SMCA_PSP = 14,
1: -	SMCA_PSP_V2 = 15,
1: -	SMCA_SMU = 16,
1: -	SMCA_SMU_V2 = 17,
1: -	SMCA_MP5 = 18,
1: -	SMCA_NBIO = 19,
1: -	SMCA_PCIE = 20,
1: -	N_SMCA_BANK_TYPES = 21,
1: +  SMCA_LS = 0,
1: +  SMCA_LS_V2 = 1,
1: +  SMCA_IF = 2,
1: +  SMCA_L2_CACHE = 3,
1: +  SMCA_DE = 4,
1: +  SMCA_RESERVED = 5,
1: +  SMCA_EX = 6,
1: +  SMCA_FP = 7,
1: +  SMCA_L3_CACHE = 8,
1: +  SMCA_CS = 9,
1: +  SMCA_CS_V2 = 10,
1: +  SMCA_PIE = 11,
1: +  SMCA_UMC = 12,
1: +  SMCA_PB = 13,
1: +  SMCA_PSP = 14,
1: +  SMCA_PSP_V2 = 15,
1: +  SMCA_SMU = 16,
1: +  SMCA_SMU_V2 = 17,
1: +  SMCA_MP5 = 18,
1: +  SMCA_NBIO = 19,
1: +  SMCA_PCIE = 20,
1: +  N_SMCA_BANK_TYPES = 21,
1:  };
1:  
1:  struct smca_hwid {
1: -	unsigned int bank_type;
1: -	u32 hwid_mcatype;
1: -	u8 count;
1: +  unsigned int bank_type;
1: +  u32 hwid_mcatype;
1: +  u8 count;
1:  };
1:  
1:  struct smca_bank {
1: -	struct smca_hwid *hwid;
1: -	u32 id;
1: -	u8 sysfs_id;
1: +  struct smca_hwid *hwid;
1: +  u32 id;
1: +  u8 sysfs_id;
1:  };
1:  
1:  struct smca_bank_name {
1: -	const char *name;
1: -	const char *long_name;
1: +  const char *name;
1: +  const char *long_name;
1:  };
1:  
1:  struct thresh_restart {
1: -	struct threshold_block *b;
1: -	int reset;
1: -	int set_lvt_off;
1: -	int lvt_off;
1: -	u16 old_limit;
1: +  struct threshold_block *b;
1: +  int reset;
1: +  int set_lvt_off;
1: +  int lvt_off;
1: +  u16 old_limit;
1:  };
1:  
1:  struct threshold_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct threshold_block *, char *);
1: -	ssize_t (*store)(struct threshold_block *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct threshold_block *, char *);
1: +  ssize_t (*store)(struct threshold_block *, const char *, size_t);
1:  };
1:  
1:  struct _thermal_state {
1: -	u64 next_check;
1: -	u64 last_interrupt_time;
1: -	struct delayed_work therm_work;
1: -	long unsigned int count;
1: -	long unsigned int last_count;
1: -	long unsigned int max_time_ms;
1: -	long unsigned int total_time_ms;
1: -	bool rate_control_active;
1: -	bool new_event;
1: -	u8 level;
1: -	u8 sample_index;
1: -	u8 sample_count;
1: -	u8 average;
1: -	u8 baseline_temp;
1: -	u8 temp_samples[3];
1: +  u64 next_check;
1: +  u64 last_interrupt_time;
1: +  struct delayed_work therm_work;
1: +  long unsigned int count;
1: +  long unsigned int last_count;
1: +  long unsigned int max_time_ms;
1: +  long unsigned int total_time_ms;
1: +  bool rate_control_active;
1: +  bool new_event;
1: +  u8 level;
1: +  u8 sample_index;
1: +  u8 sample_count;
1: +  u8 average;
1: +  u8 baseline_temp;
1: +  u8 temp_samples[3];
1:  };
1:  
1:  struct thermal_state {
1: -	struct _thermal_state core_throttle;
1: -	struct _thermal_state core_power_limit;
1: -	struct _thermal_state package_throttle;
1: -	struct _thermal_state package_power_limit;
1: -	struct _thermal_state core_thresh0;
1: -	struct _thermal_state core_thresh1;
1: -	struct _thermal_state pkg_thresh0;
1: -	struct _thermal_state pkg_thresh1;
1: +  struct _thermal_state core_throttle;
1: +  struct _thermal_state core_power_limit;
1: +  struct _thermal_state package_throttle;
1: +  struct _thermal_state package_power_limit;
1: +  struct _thermal_state core_thresh0;
1: +  struct _thermal_state core_thresh1;
1: +  struct _thermal_state pkg_thresh0;
1: +  struct _thermal_state pkg_thresh1;
1:  };
1:  
1:  typedef __u8 mtrr_type;
1:  
1:  struct mtrr_ops {
1: -	u32 vendor;
1: -	u32 use_intel_if;
1: -	void (*set)(unsigned int, long unsigned int, long unsigned int, mtrr_type);
1: -	void (*set_all)();
1: -	void (*get)(unsigned int, long unsigned int *, long unsigned int *, mtrr_type *);
1: -	int (*get_free_region)(long unsigned int, long unsigned int, int);
1: -	int (*validate_add_page)(long unsigned int, long unsigned int, unsigned int);
1: -	int (*have_wrcomb)();
1: +  u32 vendor;
1: +  u32 use_intel_if;
1: +  void (*set)(unsigned int, long unsigned int, long unsigned int, mtrr_type);
1: +  void (*set_all)();
1: +  void (*get)(unsigned int, long unsigned int *, long unsigned int *,
1: +              mtrr_type *);
1: +  int (*get_free_region)(long unsigned int, long unsigned int, int);
1: +  int (*validate_add_page)(long unsigned int, long unsigned int, unsigned int);
1: +  int (*have_wrcomb)();
1:  };
1:  
1:  struct set_mtrr_data {
1: -	long unsigned int smp_base;
1: -	long unsigned int smp_size;
1: -	unsigned int smp_reg;
1: -	mtrr_type smp_type;
1: +  long unsigned int smp_base;
1: +  long unsigned int smp_size;
1: +  unsigned int smp_reg;
1: +  mtrr_type smp_type;
1:  };
1:  
1:  struct mtrr_value {
1: -	mtrr_type ltype;
1: -	long unsigned int lbase;
1: -	long unsigned int lsize;
1: +  mtrr_type ltype;
1: +  long unsigned int lbase;
1: +  long unsigned int lsize;
1:  };
1:  
1:  struct proc_ops {
1: -	unsigned int proc_flags;
1: -	int (*proc_open)(struct inode *, struct file *);
1: -	ssize_t (*proc_read)(struct file *, char *, size_t, loff_t *);
1: -	ssize_t (*proc_read_iter)(struct kiocb *, struct iov_iter *);
1: -	ssize_t (*proc_write)(struct file *, const char *, size_t, loff_t *);
1: -	loff_t (*proc_lseek)(struct file *, loff_t, int);
1: -	int (*proc_release)(struct inode *, struct file *);
1: -	__poll_t (*proc_poll)(struct file *, struct poll_table_struct *);
1: -	long int (*proc_ioctl)(struct file *, unsigned int, long unsigned int);
1: -	long int (*proc_compat_ioctl)(struct file *, unsigned int, long unsigned int);
1: -	int (*proc_mmap)(struct file *, struct vm_area_struct *);
1: -	long unsigned int (*proc_get_unmapped_area)(struct file *, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: +  unsigned int proc_flags;
1: +  int (*proc_open)(struct inode *, struct file *);
1: +  ssize_t (*proc_read)(struct file *, char *, size_t, loff_t *);
1: +  ssize_t (*proc_read_iter)(struct kiocb *, struct iov_iter *);
1: +  ssize_t (*proc_write)(struct file *, const char *, size_t, loff_t *);
1: +  loff_t (*proc_lseek)(struct file *, loff_t, int);
1: +  int (*proc_release)(struct inode *, struct file *);
1: +  __poll_t (*proc_poll)(struct file *, struct poll_table_struct *);
1: +  long int (*proc_ioctl)(struct file *, unsigned int, long unsigned int);
1: +  long int (*proc_compat_ioctl)(struct file *, unsigned int, long unsigned int);
1: +  int (*proc_mmap)(struct file *, struct vm_area_struct *);
1: +  long unsigned int (*proc_get_unmapped_area)(struct file *, long unsigned int,
1: +                                              long unsigned int,
1: +                                              long unsigned int,
1: +                                              long unsigned int);
1:  };
1:  
1:  struct mtrr_sentry {
1: -	__u64 base;
1: -	__u32 size;
1: -	__u32 type;
1: +  __u64 base;
1: +  __u32 size;
1: +  __u32 type;
1:  };
1:  
1:  struct mtrr_gentry {
1: -	__u64 base;
1: -	__u32 size;
1: -	__u32 regnum;
1: -	__u32 type;
1: -	__u32 _pad;
1: +  __u64 base;
1: +  __u32 size;
1: +  __u32 regnum;
1: +  __u32 type;
1: +  __u32 _pad;
1:  };
1:  
1:  typedef u32 compat_uint_t;
1:  
1:  struct mtrr_sentry32 {
1: -	compat_ulong_t base;
1: -	compat_uint_t size;
1: -	compat_uint_t type;
1: +  compat_ulong_t base;
1: +  compat_uint_t size;
1: +  compat_uint_t type;
1:  };
1:  
1:  struct mtrr_gentry32 {
1: -	compat_ulong_t regnum;
1: -	compat_uint_t base;
1: -	compat_uint_t size;
1: -	compat_uint_t type;
1: +  compat_ulong_t regnum;
1: +  compat_uint_t base;
1: +  compat_uint_t size;
1: +  compat_uint_t type;
1:  };
1:  
1:  struct mtrr_var_range {
1: -	__u32 base_lo;
1: -	__u32 base_hi;
1: -	__u32 mask_lo;
1: -	__u32 mask_hi;
1: +  __u32 base_lo;
1: +  __u32 base_hi;
1: +  __u32 mask_lo;
1: +  __u32 mask_hi;
1:  };
1:  
1:  struct mtrr_state_type {
1: -	struct mtrr_var_range var_ranges[256];
1: -	mtrr_type fixed_ranges[88];
1: -	unsigned char enabled;
1: -	unsigned char have_fixed;
1: -	mtrr_type def_type;
1: +  struct mtrr_var_range var_ranges[256];
1: +  mtrr_type fixed_ranges[88];
1: +  unsigned char enabled;
1: +  unsigned char have_fixed;
1: +  mtrr_type def_type;
1:  };
1:  
1:  struct fixed_range_block {
1: -	int base_msr;
1: -	int ranges;
1: +  int base_msr;
1: +  int ranges;
1:  };
1:  
1:  struct var_mtrr_range_state {
1: -	long unsigned int base_pfn;
1: -	long unsigned int size_pfn;
1: -	mtrr_type type;
1: +  long unsigned int base_pfn;
1: +  long unsigned int size_pfn;
1: +  mtrr_type type;
1:  };
1:  
1:  struct mpc_intsrc {
1: -	unsigned char type;
1: -	unsigned char irqtype;
1: -	short unsigned int irqflag;
1: -	unsigned char srcbus;
1: -	unsigned char srcbusirq;
1: -	unsigned char dstapic;
1: -	unsigned char dstirq;
1: +  unsigned char type;
1: +  unsigned char irqtype;
1: +  short unsigned int irqflag;
1: +  unsigned char srcbus;
1: +  unsigned char srcbusirq;
1: +  unsigned char dstapic;
1: +  unsigned char dstirq;
1:  };
1:  
1:  enum mp_irq_source_types {
1: -	mp_INT = 0,
1: -	mp_NMI = 1,
1: -	mp_SMI = 2,
1: -	mp_ExtINT = 3,
1: +  mp_INT = 0,
1: +  mp_NMI = 1,
1: +  mp_SMI = 2,
1: +  mp_ExtINT = 3,
1:  };
1:  
1:  typedef u64 acpi_physical_address;
1: @@ -22250,907 +22429,908 @@ typedef void *acpi_handle;
1:  typedef u8 acpi_adr_space_type;
1:  
1:  struct acpi_subtable_header {
1: -	u8 type;
1: -	u8 length;
1: +  u8 type;
1: +  u8 length;
1:  };
1:  
1:  struct acpi_table_boot {
1: -	struct acpi_table_header header;
1: -	u8 cmos_index;
1: -	u8 reserved[3];
1: +  struct acpi_table_header header;
1: +  u8 cmos_index;
1: +  u8 reserved[3];
1:  };
1:  
1:  struct acpi_hmat_structure {
1: -	u16 type;
1: -	u16 reserved;
1: -	u32 length;
1: +  u16 type;
1: +  u16 reserved;
1: +  u32 length;
1:  };
1:  
1:  struct acpi_table_hpet {
1: -	struct acpi_table_header header;
1: -	u32 id;
1: -	struct acpi_generic_address address;
1: -	u8 sequence;
1: -	u16 minimum_tick;
1: -	u8 flags;
1: +  struct acpi_table_header header;
1: +  u32 id;
1: +  struct acpi_generic_address address;
1: +  u8 sequence;
1: +  u16 minimum_tick;
1: +  u8 flags;
1:  } __attribute__((packed));
1:  
1:  struct acpi_table_madt {
1: -	struct acpi_table_header header;
1: -	u32 address;
1: -	u32 flags;
1: +  struct acpi_table_header header;
1: +  u32 address;
1: +  u32 flags;
1:  };
1:  
1:  enum acpi_madt_type {
1: -	ACPI_MADT_TYPE_LOCAL_APIC = 0,
1: -	ACPI_MADT_TYPE_IO_APIC = 1,
1: -	ACPI_MADT_TYPE_INTERRUPT_OVERRIDE = 2,
1: -	ACPI_MADT_TYPE_NMI_SOURCE = 3,
1: -	ACPI_MADT_TYPE_LOCAL_APIC_NMI = 4,
1: -	ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE = 5,
1: -	ACPI_MADT_TYPE_IO_SAPIC = 6,
1: -	ACPI_MADT_TYPE_LOCAL_SAPIC = 7,
1: -	ACPI_MADT_TYPE_INTERRUPT_SOURCE = 8,
1: -	ACPI_MADT_TYPE_LOCAL_X2APIC = 9,
1: -	ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10,
1: -	ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11,
1: -	ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12,
1: -	ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13,
1: -	ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14,
1: -	ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15,
1: -	ACPI_MADT_TYPE_RESERVED = 16,
1: +  ACPI_MADT_TYPE_LOCAL_APIC = 0,
1: +  ACPI_MADT_TYPE_IO_APIC = 1,
1: +  ACPI_MADT_TYPE_INTERRUPT_OVERRIDE = 2,
1: +  ACPI_MADT_TYPE_NMI_SOURCE = 3,
1: +  ACPI_MADT_TYPE_LOCAL_APIC_NMI = 4,
1: +  ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE = 5,
1: +  ACPI_MADT_TYPE_IO_SAPIC = 6,
1: +  ACPI_MADT_TYPE_LOCAL_SAPIC = 7,
1: +  ACPI_MADT_TYPE_INTERRUPT_SOURCE = 8,
1: +  ACPI_MADT_TYPE_LOCAL_X2APIC = 9,
1: +  ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10,
1: +  ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11,
1: +  ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12,
1: +  ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13,
1: +  ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14,
1: +  ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15,
1: +  ACPI_MADT_TYPE_RESERVED = 16,
1:  };
1:  
1:  struct acpi_madt_local_apic {
1: -	struct acpi_subtable_header header;
1: -	u8 processor_id;
1: -	u8 id;
1: -	u32 lapic_flags;
1: +  struct acpi_subtable_header header;
1: +  u8 processor_id;
1: +  u8 id;
1: +  u32 lapic_flags;
1:  };
1:  
1:  struct acpi_madt_io_apic {
1: -	struct acpi_subtable_header header;
1: -	u8 id;
1: -	u8 reserved;
1: -	u32 address;
1: -	u32 global_irq_base;
1: +  struct acpi_subtable_header header;
1: +  u8 id;
1: +  u8 reserved;
1: +  u32 address;
1: +  u32 global_irq_base;
1:  };
1:  
1:  struct acpi_madt_interrupt_override {
1: -	struct acpi_subtable_header header;
1: -	u8 bus;
1: -	u8 source_irq;
1: -	u32 global_irq;
1: -	u16 inti_flags;
1: +  struct acpi_subtable_header header;
1: +  u8 bus;
1: +  u8 source_irq;
1: +  u32 global_irq;
1: +  u16 inti_flags;
1:  } __attribute__((packed));
1:  
1:  struct acpi_madt_nmi_source {
1: -	struct acpi_subtable_header header;
1: -	u16 inti_flags;
1: -	u32 global_irq;
1: +  struct acpi_subtable_header header;
1: +  u16 inti_flags;
1: +  u32 global_irq;
1:  };
1:  
1:  struct acpi_madt_local_apic_nmi {
1: -	struct acpi_subtable_header header;
1: -	u8 processor_id;
1: -	u16 inti_flags;
1: -	u8 lint;
1: +  struct acpi_subtable_header header;
1: +  u8 processor_id;
1: +  u16 inti_flags;
1: +  u8 lint;
1:  } __attribute__((packed));
1:  
1:  struct acpi_madt_local_apic_override {
1: -	struct acpi_subtable_header header;
1: -	u16 reserved;
1: -	u64 address;
1: +  struct acpi_subtable_header header;
1: +  u16 reserved;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct acpi_madt_local_sapic {
1: -	struct acpi_subtable_header header;
1: -	u8 processor_id;
1: -	u8 id;
1: -	u8 eid;
1: -	u8 reserved[3];
1: -	u32 lapic_flags;
1: -	u32 uid;
1: -	char uid_string[1];
1: +  struct acpi_subtable_header header;
1: +  u8 processor_id;
1: +  u8 id;
1: +  u8 eid;
1: +  u8 reserved[3];
1: +  u32 lapic_flags;
1: +  u32 uid;
1: +  char uid_string[1];
1:  } __attribute__((packed));
1:  
1:  struct acpi_madt_local_x2apic {
1: -	struct acpi_subtable_header header;
1: -	u16 reserved;
1: -	u32 local_apic_id;
1: -	u32 lapic_flags;
1: -	u32 uid;
1: +  struct acpi_subtable_header header;
1: +  u16 reserved;
1: +  u32 local_apic_id;
1: +  u32 lapic_flags;
1: +  u32 uid;
1:  };
1:  
1:  struct acpi_madt_local_x2apic_nmi {
1: -	struct acpi_subtable_header header;
1: -	u16 inti_flags;
1: -	u32 uid;
1: -	u8 lint;
1: -	u8 reserved[3];
1: +  struct acpi_subtable_header header;
1: +  u16 inti_flags;
1: +  u32 uid;
1: +  u8 lint;
1: +  u8 reserved[3];
1:  };
1:  
1:  enum acpi_irq_model_id {
1: -	ACPI_IRQ_MODEL_PIC = 0,
1: -	ACPI_IRQ_MODEL_IOAPIC = 1,
1: -	ACPI_IRQ_MODEL_IOSAPIC = 2,
1: -	ACPI_IRQ_MODEL_PLATFORM = 3,
1: -	ACPI_IRQ_MODEL_GIC = 4,
1: -	ACPI_IRQ_MODEL_COUNT = 5,
1: +  ACPI_IRQ_MODEL_PIC = 0,
1: +  ACPI_IRQ_MODEL_IOAPIC = 1,
1: +  ACPI_IRQ_MODEL_IOSAPIC = 2,
1: +  ACPI_IRQ_MODEL_PLATFORM = 3,
1: +  ACPI_IRQ_MODEL_GIC = 4,
1: +  ACPI_IRQ_MODEL_COUNT = 5,
1:  };
1:  
1:  union acpi_subtable_headers {
1: -	struct acpi_subtable_header common;
1: -	struct acpi_hmat_structure hmat;
1: +  struct acpi_subtable_header common;
1: +  struct acpi_hmat_structure hmat;
1:  };
1:  
1: -typedef int (*acpi_tbl_entry_handler)(union acpi_subtable_headers *, const long unsigned int);
1: +typedef int (*acpi_tbl_entry_handler)(union acpi_subtable_headers *,
1: +                                      const long unsigned int);
1:  
1:  struct acpi_subtable_proc {
1: -	int id;
1: -	acpi_tbl_entry_handler handler;
1: -	int count;
1: +  int id;
1: +  acpi_tbl_entry_handler handler;
1: +  int count;
1:  };
1:  
1:  typedef u32 phys_cpuid_t;
1:  
1:  enum irq_alloc_type {
1: -	X86_IRQ_ALLOC_TYPE_IOAPIC = 1,
1: -	X86_IRQ_ALLOC_TYPE_HPET = 2,
1: -	X86_IRQ_ALLOC_TYPE_PCI_MSI = 3,
1: -	X86_IRQ_ALLOC_TYPE_PCI_MSIX = 4,
1: -	X86_IRQ_ALLOC_TYPE_DMAR = 5,
1: -	X86_IRQ_ALLOC_TYPE_UV = 6,
1: -	X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT = 7,
1: -	X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT = 8,
1: +  X86_IRQ_ALLOC_TYPE_IOAPIC = 1,
1: +  X86_IRQ_ALLOC_TYPE_HPET = 2,
1: +  X86_IRQ_ALLOC_TYPE_PCI_MSI = 3,
1: +  X86_IRQ_ALLOC_TYPE_PCI_MSIX = 4,
1: +  X86_IRQ_ALLOC_TYPE_DMAR = 5,
1: +  X86_IRQ_ALLOC_TYPE_UV = 6,
1: +  X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT = 7,
1: +  X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT = 8,
1:  };
1:  
1:  struct IO_APIC_route_entry;
1:  
1:  struct ioapic_alloc_info {
1: -	int pin;
1: -	int node;
1: -	u32 trigger: 1;
1: -	u32 polarity: 1;
1: -	u32 valid: 1;
1: -	struct IO_APIC_route_entry *entry;
1: +  int pin;
1: +  int node;
1: +  u32 trigger : 1;
1: +  u32 polarity : 1;
1: +  u32 valid : 1;
1: +  struct IO_APIC_route_entry *entry;
1:  };
1:  
1:  struct IO_APIC_route_entry {
1: -	__u32 vector: 8;
1: -	__u32 delivery_mode: 3;
1: -	__u32 dest_mode: 1;
1: -	__u32 delivery_status: 1;
1: -	__u32 polarity: 1;
1: -	__u32 irr: 1;
1: -	__u32 trigger: 1;
1: -	__u32 mask: 1;
1: -	__u32 __reserved_2: 15;
1: -	__u32 __reserved_3: 24;
1: -	__u32 dest: 8;
1: +  __u32 vector : 8;
1: +  __u32 delivery_mode : 3;
1: +  __u32 dest_mode : 1;
1: +  __u32 delivery_status : 1;
1: +  __u32 polarity : 1;
1: +  __u32 irr : 1;
1: +  __u32 trigger : 1;
1: +  __u32 mask : 1;
1: +  __u32 __reserved_2 : 15;
1: +  __u32 __reserved_3 : 24;
1: +  __u32 dest : 8;
1:  };
1:  
1:  struct uv_alloc_info {
1: -	int limit;
1: -	int blade;
1: -	long unsigned int offset;
1: -	char *name;
1: +  int limit;
1: +  int blade;
1: +  long unsigned int offset;
1: +  char *name;
1:  };
1:  
1:  struct irq_alloc_info {
1: -	enum irq_alloc_type type;
1: -	u32 flags;
1: -	u32 devid;
1: -	irq_hw_number_t hwirq;
1: -	const struct cpumask *mask;
1: -	struct msi_desc *desc;
1: -	void *data;
1: -	union {
1: -		struct ioapic_alloc_info ioapic;
1: -		struct uv_alloc_info uv;
1: -	};
1: +  enum irq_alloc_type type;
1: +  u32 flags;
1: +  u32 devid;
1: +  irq_hw_number_t hwirq;
1: +  const struct cpumask *mask;
1: +  struct msi_desc *desc;
1: +  void *data;
1: +  union {
1: +    struct ioapic_alloc_info ioapic;
1: +    struct uv_alloc_info uv;
1: +  };
1:  };
1:  
1:  struct serial_icounter_struct {
1: -	int cts;
1: -	int dsr;
1: -	int rng;
1: -	int dcd;
1: -	int rx;
1: -	int tx;
1: -	int frame;
1: -	int overrun;
1: -	int parity;
1: -	int brk;
1: -	int buf_overrun;
1: -	int reserved[9];
1: +  int cts;
1: +  int dsr;
1: +  int rng;
1: +  int dcd;
1: +  int rx;
1: +  int tx;
1: +  int frame;
1: +  int overrun;
1: +  int parity;
1: +  int brk;
1: +  int buf_overrun;
1: +  int reserved[9];
1:  };
1:  
1:  struct serial_struct {
1: -	int type;
1: -	int line;
1: -	unsigned int port;
1: -	int irq;
1: -	int flags;
1: -	int xmit_fifo_size;
1: -	int custom_divisor;
1: -	int baud_base;
1: -	short unsigned int close_delay;
1: -	char io_type;
1: -	char reserved_char[1];
1: -	int hub6;
1: -	short unsigned int closing_wait;
1: -	short unsigned int closing_wait2;
1: -	unsigned char *iomem_base;
1: -	short unsigned int iomem_reg_shift;
1: -	unsigned int port_high;
1: -	long unsigned int iomap_base;
1: +  int type;
1: +  int line;
1: +  unsigned int port;
1: +  int irq;
1: +  int flags;
1: +  int xmit_fifo_size;
1: +  int custom_divisor;
1: +  int baud_base;
1: +  short unsigned int close_delay;
1: +  char io_type;
1: +  char reserved_char[1];
1: +  int hub6;
1: +  short unsigned int closing_wait;
1: +  short unsigned int closing_wait2;
1: +  unsigned char *iomem_base;
1: +  short unsigned int iomem_reg_shift;
1: +  unsigned int port_high;
1: +  long unsigned int iomap_base;
1:  };
1:  
1:  enum ioapic_domain_type {
1: -	IOAPIC_DOMAIN_INVALID = 0,
1: -	IOAPIC_DOMAIN_LEGACY = 1,
1: -	IOAPIC_DOMAIN_STRICT = 2,
1: -	IOAPIC_DOMAIN_DYNAMIC = 3,
1: +  IOAPIC_DOMAIN_INVALID = 0,
1: +  IOAPIC_DOMAIN_LEGACY = 1,
1: +  IOAPIC_DOMAIN_STRICT = 2,
1: +  IOAPIC_DOMAIN_DYNAMIC = 3,
1:  };
1:  
1:  struct ioapic_domain_cfg {
1: -	enum ioapic_domain_type type;
1: -	const struct irq_domain_ops *ops;
1: -	struct device_node *dev;
1: +  enum ioapic_domain_type type;
1: +  const struct irq_domain_ops *ops;
1: +  struct device_node *dev;
1:  };
1:  
1:  struct wakeup_header {
1: -	u16 video_mode;
1: -	u32 pmode_entry;
1: -	u16 pmode_cs;
1: -	u32 pmode_cr0;
1: -	u32 pmode_cr3;
1: -	u32 pmode_cr4;
1: -	u32 pmode_efer_low;
1: -	u32 pmode_efer_high;
1: -	u64 pmode_gdt;
1: -	u32 pmode_misc_en_low;
1: -	u32 pmode_misc_en_high;
1: -	u32 pmode_behavior;
1: -	u32 realmode_flags;
1: -	u32 real_magic;
1: -	u32 signature;
1: +  u16 video_mode;
1: +  u32 pmode_entry;
1: +  u16 pmode_cs;
1: +  u32 pmode_cr0;
1: +  u32 pmode_cr3;
1: +  u32 pmode_cr4;
1: +  u32 pmode_efer_low;
1: +  u32 pmode_efer_high;
1: +  u64 pmode_gdt;
1: +  u32 pmode_misc_en_low;
1: +  u32 pmode_misc_en_high;
1: +  u32 pmode_behavior;
1: +  u32 realmode_flags;
1: +  u32 real_magic;
1: +  u32 signature;
1:  } __attribute__((packed));
1:  
1:  struct cpc_reg {
1: -	u8 descriptor;
1: -	u16 length;
1: -	u8 space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 access_width;
1: -	u64 address;
1: +  u8 descriptor;
1: +  u16 length;
1: +  u8 space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 access_width;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct acpi_power_register {
1: -	u8 descriptor;
1: -	u16 length;
1: -	u8 space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 access_size;
1: -	u64 address;
1: +  u8 descriptor;
1: +  u16 length;
1: +  u8 space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 access_size;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct acpi_processor_cx {
1: -	u8 valid;
1: -	u8 type;
1: -	u32 address;
1: -	u8 entry_method;
1: -	u8 index;
1: -	u32 latency;
1: -	u8 bm_sts_skip;
1: -	char desc[32];
1: +  u8 valid;
1: +  u8 type;
1: +  u32 address;
1: +  u8 entry_method;
1: +  u8 index;
1: +  u32 latency;
1: +  u8 bm_sts_skip;
1: +  char desc[32];
1:  };
1:  
1:  struct acpi_processor_flags {
1: -	u8 power: 1;
1: -	u8 performance: 1;
1: -	u8 throttling: 1;
1: -	u8 limit: 1;
1: -	u8 bm_control: 1;
1: -	u8 bm_check: 1;
1: -	u8 has_cst: 1;
1: -	u8 has_lpi: 1;
1: -	u8 power_setup_done: 1;
1: -	u8 bm_rld_set: 1;
1: -	u8 need_hotplug_init: 1;
1: +  u8 power : 1;
1: +  u8 performance : 1;
1: +  u8 throttling : 1;
1: +  u8 limit : 1;
1: +  u8 bm_control : 1;
1: +  u8 bm_check : 1;
1: +  u8 has_cst : 1;
1: +  u8 has_lpi : 1;
1: +  u8 power_setup_done : 1;
1: +  u8 bm_rld_set : 1;
1: +  u8 need_hotplug_init : 1;
1:  };
1:  
1:  struct cstate_entry {
1: -	struct {
1: -		unsigned int eax;
1: -		unsigned int ecx;
1: -	} states[8];
1: +  struct {
1: +    unsigned int eax;
1: +    unsigned int ecx;
1: +  } states[8];
1:  };
1:  
1:  enum reboot_mode {
1: -	REBOOT_UNDEFINED = 4294967295,
1: -	REBOOT_COLD = 0,
1: -	REBOOT_WARM = 1,
1: -	REBOOT_HARD = 2,
1: -	REBOOT_SOFT = 3,
1: -	REBOOT_GPIO = 4,
1: +  REBOOT_UNDEFINED = 4294967295,
1: +  REBOOT_COLD = 0,
1: +  REBOOT_WARM = 1,
1: +  REBOOT_HARD = 2,
1: +  REBOOT_SOFT = 3,
1: +  REBOOT_GPIO = 4,
1:  };
1:  
1:  enum reboot_type {
1: -	BOOT_TRIPLE = 116,
1: -	BOOT_KBD = 107,
1: -	BOOT_BIOS = 98,
1: -	BOOT_ACPI = 97,
1: -	BOOT_EFI = 101,
1: -	BOOT_CF9_FORCE = 112,
1: -	BOOT_CF9_SAFE = 113,
1: +  BOOT_TRIPLE = 116,
1: +  BOOT_KBD = 107,
1: +  BOOT_BIOS = 98,
1: +  BOOT_ACPI = 97,
1: +  BOOT_EFI = 101,
1: +  BOOT_CF9_FORCE = 112,
1: +  BOOT_CF9_SAFE = 113,
1:  };
1:  
1:  struct vmcb_seg {
1: -	u16 selector;
1: -	u16 attrib;
1: -	u32 limit;
1: -	u64 base;
1: +  u16 selector;
1: +  u16 attrib;
1: +  u32 limit;
1: +  u64 base;
1:  };
1:  
1:  struct vmcb_save_area {
1: -	struct vmcb_seg es;
1: -	struct vmcb_seg cs;
1: -	struct vmcb_seg ss;
1: -	struct vmcb_seg ds;
1: -	struct vmcb_seg fs;
1: -	struct vmcb_seg gs;
1: -	struct vmcb_seg gdtr;
1: -	struct vmcb_seg ldtr;
1: -	struct vmcb_seg idtr;
1: -	struct vmcb_seg tr;
1: -	u8 reserved_1[43];
1: -	u8 cpl;
1: -	u8 reserved_2[4];
1: -	u64 efer;
1: -	u8 reserved_3[112];
1: -	u64 cr4;
1: -	u64 cr3;
1: -	u64 cr0;
1: -	u64 dr7;
1: -	u64 dr6;
1: -	u64 rflags;
1: -	u64 rip;
1: -	u8 reserved_4[88];
1: -	u64 rsp;
1: -	u8 reserved_5[24];
1: -	u64 rax;
1: -	u64 star;
1: -	u64 lstar;
1: -	u64 cstar;
1: -	u64 sfmask;
1: -	u64 kernel_gs_base;
1: -	u64 sysenter_cs;
1: -	u64 sysenter_esp;
1: -	u64 sysenter_eip;
1: -	u64 cr2;
1: -	u8 reserved_6[32];
1: -	u64 g_pat;
1: -	u64 dbgctl;
1: -	u64 br_from;
1: -	u64 br_to;
1: -	u64 last_excp_from;
1: -	u64 last_excp_to;
1: -	u8 reserved_7[104];
1: -	u64 reserved_8;
1: -	u64 rcx;
1: -	u64 rdx;
1: -	u64 rbx;
1: -	u64 reserved_9;
1: -	u64 rbp;
1: -	u64 rsi;
1: -	u64 rdi;
1: -	u64 r8;
1: -	u64 r9;
1: -	u64 r10;
1: -	u64 r11;
1: -	u64 r12;
1: -	u64 r13;
1: -	u64 r14;
1: -	u64 r15;
1: -	u8 reserved_10[16];
1: -	u64 sw_exit_code;
1: -	u64 sw_exit_info_1;
1: -	u64 sw_exit_info_2;
1: -	u64 sw_scratch;
1: -	u8 reserved_11[56];
1: -	u64 xcr0;
1: -	u8 valid_bitmap[16];
1: -	u64 x87_state_gpa;
1: +  struct vmcb_seg es;
1: +  struct vmcb_seg cs;
1: +  struct vmcb_seg ss;
1: +  struct vmcb_seg ds;
1: +  struct vmcb_seg fs;
1: +  struct vmcb_seg gs;
1: +  struct vmcb_seg gdtr;
1: +  struct vmcb_seg ldtr;
1: +  struct vmcb_seg idtr;
1: +  struct vmcb_seg tr;
1: +  u8 reserved_1[43];
1: +  u8 cpl;
1: +  u8 reserved_2[4];
1: +  u64 efer;
1: +  u8 reserved_3[112];
1: +  u64 cr4;
1: +  u64 cr3;
1: +  u64 cr0;
1: +  u64 dr7;
1: +  u64 dr6;
1: +  u64 rflags;
1: +  u64 rip;
1: +  u8 reserved_4[88];
1: +  u64 rsp;
1: +  u8 reserved_5[24];
1: +  u64 rax;
1: +  u64 star;
1: +  u64 lstar;
1: +  u64 cstar;
1: +  u64 sfmask;
1: +  u64 kernel_gs_base;
1: +  u64 sysenter_cs;
1: +  u64 sysenter_esp;
1: +  u64 sysenter_eip;
1: +  u64 cr2;
1: +  u8 reserved_6[32];
1: +  u64 g_pat;
1: +  u64 dbgctl;
1: +  u64 br_from;
1: +  u64 br_to;
1: +  u64 last_excp_from;
1: +  u64 last_excp_to;
1: +  u8 reserved_7[104];
1: +  u64 reserved_8;
1: +  u64 rcx;
1: +  u64 rdx;
1: +  u64 rbx;
1: +  u64 reserved_9;
1: +  u64 rbp;
1: +  u64 rsi;
1: +  u64 rdi;
1: +  u64 r8;
1: +  u64 r9;
1: +  u64 r10;
1: +  u64 r11;
1: +  u64 r12;
1: +  u64 r13;
1: +  u64 r14;
1: +  u64 r15;
1: +  u8 reserved_10[16];
1: +  u64 sw_exit_code;
1: +  u64 sw_exit_info_1;
1: +  u64 sw_exit_info_2;
1: +  u64 sw_scratch;
1: +  u8 reserved_11[56];
1: +  u64 xcr0;
1: +  u8 valid_bitmap[16];
1: +  u64 x87_state_gpa;
1:  };
1:  
1:  struct ghcb {
1: -	struct vmcb_save_area save;
1: -	u8 reserved_save[1016];
1: -	u8 shared_buffer[2032];
1: -	u8 reserved_1[10];
1: -	u16 protocol_version;
1: -	u32 ghcb_usage;
1: +  struct vmcb_save_area save;
1: +  u8 reserved_save[1016];
1: +  u8 shared_buffer[2032];
1: +  u8 reserved_1[10];
1: +  u16 protocol_version;
1: +  u32 ghcb_usage;
1:  };
1:  
1:  struct machine_ops {
1: -	void (*restart)(char *);
1: -	void (*halt)();
1: -	void (*power_off)();
1: -	void (*shutdown)();
1: -	void (*crash_shutdown)(struct pt_regs *);
1: -	void (*emergency_restart)();
1: +  void (*restart)(char *);
1: +  void (*halt)();
1: +  void (*power_off)();
1: +  void (*shutdown)();
1: +  void (*crash_shutdown)(struct pt_regs *);
1: +  void (*emergency_restart)();
1:  };
1:  
1:  typedef void (*nmi_shootdown_cb)(int, struct pt_regs *);
1:  
1:  enum intercept_words {
1: -	INTERCEPT_CR = 0,
1: -	INTERCEPT_DR = 1,
1: -	INTERCEPT_EXCEPTION = 2,
1: -	INTERCEPT_WORD3 = 3,
1: -	INTERCEPT_WORD4 = 4,
1: -	INTERCEPT_WORD5 = 5,
1: -	MAX_INTERCEPT = 6,
1: +  INTERCEPT_CR = 0,
1: +  INTERCEPT_DR = 1,
1: +  INTERCEPT_EXCEPTION = 2,
1: +  INTERCEPT_WORD3 = 3,
1: +  INTERCEPT_WORD4 = 4,
1: +  INTERCEPT_WORD5 = 5,
1: +  MAX_INTERCEPT = 6,
1:  };
1:  
1:  enum allow_write_msrs {
1: -	MSR_WRITES_ON = 0,
1: -	MSR_WRITES_OFF = 1,
1: -	MSR_WRITES_DEFAULT = 2,
1: +  MSR_WRITES_ON = 0,
1: +  MSR_WRITES_OFF = 1,
1: +  MSR_WRITES_DEFAULT = 2,
1:  };
1:  
1:  typedef struct __call_single_data call_single_data_t;
1:  
1:  struct cpuid_regs_done {
1: -	struct cpuid_regs regs;
1: -	struct completion done;
1: +  struct cpuid_regs regs;
1: +  struct completion done;
1:  };
1:  
1:  struct intel_early_ops {
1: -	resource_size_t (*stolen_size)(int, int, int);
1: -	resource_size_t (*stolen_base)(int, int, int, resource_size_t);
1: +  resource_size_t (*stolen_size)(int, int, int);
1: +  resource_size_t (*stolen_base)(int, int, int, resource_size_t);
1:  };
1:  
1:  struct chipset {
1: -	u32 vendor;
1: -	u32 device;
1: -	u32 class;
1: -	u32 class_mask;
1: -	u32 flags;
1: -	void (*f)(int, int, int);
1: -};
1: -
1: -enum {
1: -	SD_BALANCE_NEWIDLE = 1,
1: -	SD_BALANCE_EXEC = 2,
1: -	SD_BALANCE_FORK = 4,
1: -	SD_BALANCE_WAKE = 8,
1: -	SD_WAKE_AFFINE = 16,
1: -	SD_ASYM_CPUCAPACITY = 32,
1: -	SD_SHARE_CPUCAPACITY = 64,
1: -	SD_SHARE_PKG_RESOURCES = 128,
1: -	SD_SERIALIZE = 256,
1: -	SD_ASYM_PACKING = 512,
1: -	SD_PREFER_SIBLING = 1024,
1: -	SD_OVERLAP = 2048,
1: -	SD_NUMA = 4096,
1: +  u32 vendor;
1: +  u32 device;
1: +  u32 class;
1: +  u32 class_mask;
1: +  u32 flags;
1: +  void (*f)(int, int, int);
1: +};
1: +
1: +enum {
1: +  SD_BALANCE_NEWIDLE = 1,
1: +  SD_BALANCE_EXEC = 2,
1: +  SD_BALANCE_FORK = 4,
1: +  SD_BALANCE_WAKE = 8,
1: +  SD_WAKE_AFFINE = 16,
1: +  SD_ASYM_CPUCAPACITY = 32,
1: +  SD_SHARE_CPUCAPACITY = 64,
1: +  SD_SHARE_PKG_RESOURCES = 128,
1: +  SD_SERIALIZE = 256,
1: +  SD_ASYM_PACKING = 512,
1: +  SD_PREFER_SIBLING = 1024,
1: +  SD_OVERLAP = 2048,
1: +  SD_NUMA = 4096,
1:  };
1:  
1:  struct sched_domain_shared {
1: -	atomic_t ref;
1: -	atomic_t nr_busy_cpus;
1: -	int has_idle_cores;
1: +  atomic_t ref;
1: +  atomic_t nr_busy_cpus;
1: +  int has_idle_cores;
1:  };
1:  
1:  struct sched_group;
1:  
1:  struct sched_domain {
1: -	struct sched_domain *parent;
1: -	struct sched_domain *child;
1: -	struct sched_group *groups;
1: -	long unsigned int min_interval;
1: -	long unsigned int max_interval;
1: -	unsigned int busy_factor;
1: -	unsigned int imbalance_pct;
1: -	unsigned int cache_nice_tries;
1: -	int nohz_idle;
1: -	int flags;
1: -	int level;
1: -	long unsigned int last_balance;
1: -	unsigned int balance_interval;
1: -	unsigned int nr_balance_failed;
1: -	u64 max_newidle_lb_cost;
1: -	long unsigned int next_decay_max_lb_cost;
1: -	u64 avg_scan_cost;
1: -	unsigned int lb_count[3];
1: -	unsigned int lb_failed[3];
1: -	unsigned int lb_balanced[3];
1: -	unsigned int lb_imbalance[3];
1: -	unsigned int lb_gained[3];
1: -	unsigned int lb_hot_gained[3];
1: -	unsigned int lb_nobusyg[3];
1: -	unsigned int lb_nobusyq[3];
1: -	unsigned int alb_count;
1: -	unsigned int alb_failed;
1: -	unsigned int alb_pushed;
1: -	unsigned int sbe_count;
1: -	unsigned int sbe_balanced;
1: -	unsigned int sbe_pushed;
1: -	unsigned int sbf_count;
1: -	unsigned int sbf_balanced;
1: -	unsigned int sbf_pushed;
1: -	unsigned int ttwu_wake_remote;
1: -	unsigned int ttwu_move_affine;
1: -	unsigned int ttwu_move_balance;
1: -	char *name;
1: -	union {
1: -		void *private;
1: -		struct callback_head rcu;
1: -	};
1: -	struct sched_domain_shared *shared;
1: -	unsigned int span_weight;
1: -	long unsigned int span[0];
1: -};
1: -
1: -typedef const struct cpumask * (*sched_domain_mask_f)(int);
1: +  struct sched_domain *parent;
1: +  struct sched_domain *child;
1: +  struct sched_group *groups;
1: +  long unsigned int min_interval;
1: +  long unsigned int max_interval;
1: +  unsigned int busy_factor;
1: +  unsigned int imbalance_pct;
1: +  unsigned int cache_nice_tries;
1: +  int nohz_idle;
1: +  int flags;
1: +  int level;
1: +  long unsigned int last_balance;
1: +  unsigned int balance_interval;
1: +  unsigned int nr_balance_failed;
1: +  u64 max_newidle_lb_cost;
1: +  long unsigned int next_decay_max_lb_cost;
1: +  u64 avg_scan_cost;
1: +  unsigned int lb_count[3];
1: +  unsigned int lb_failed[3];
1: +  unsigned int lb_balanced[3];
1: +  unsigned int lb_imbalance[3];
1: +  unsigned int lb_gained[3];
1: +  unsigned int lb_hot_gained[3];
1: +  unsigned int lb_nobusyg[3];
1: +  unsigned int lb_nobusyq[3];
1: +  unsigned int alb_count;
1: +  unsigned int alb_failed;
1: +  unsigned int alb_pushed;
1: +  unsigned int sbe_count;
1: +  unsigned int sbe_balanced;
1: +  unsigned int sbe_pushed;
1: +  unsigned int sbf_count;
1: +  unsigned int sbf_balanced;
1: +  unsigned int sbf_pushed;
1: +  unsigned int ttwu_wake_remote;
1: +  unsigned int ttwu_move_affine;
1: +  unsigned int ttwu_move_balance;
1: +  char *name;
1: +  union {
1: +    void *private;
1: +    struct callback_head rcu;
1: +  };
1: +  struct sched_domain_shared *shared;
1: +  unsigned int span_weight;
1: +  long unsigned int span[0];
1: +};
1: +
1: +typedef const struct cpumask *(*sched_domain_mask_f)(int);
1:  
1:  typedef int (*sched_domain_flags_f)();
1:  
1:  struct sched_group_capacity;
1:  
1:  struct sd_data {
1: -	struct sched_domain **sd;
1: -	struct sched_domain_shared **sds;
1: -	struct sched_group **sg;
1: -	struct sched_group_capacity **sgc;
1: +  struct sched_domain **sd;
1: +  struct sched_domain_shared **sds;
1: +  struct sched_group **sg;
1: +  struct sched_group_capacity **sgc;
1:  };
1:  
1:  struct sched_domain_topology_level {
1: -	sched_domain_mask_f mask;
1: -	sched_domain_flags_f sd_flags;
1: -	int flags;
1: -	int numa_level;
1: -	struct sd_data data;
1: -	char *name;
1: +  sched_domain_mask_f mask;
1: +  sched_domain_flags_f sd_flags;
1: +  int flags;
1: +  int numa_level;
1: +  struct sd_data data;
1: +  char *name;
1:  };
1:  
1:  enum apic_intr_mode_id {
1: -	APIC_PIC = 0,
1: -	APIC_VIRTUAL_WIRE = 1,
1: -	APIC_VIRTUAL_WIRE_NO_CONFIG = 2,
1: -	APIC_SYMMETRIC_IO = 3,
1: -	APIC_SYMMETRIC_IO_NO_ROUTING = 4,
1: +  APIC_PIC = 0,
1: +  APIC_VIRTUAL_WIRE = 1,
1: +  APIC_VIRTUAL_WIRE_NO_CONFIG = 2,
1: +  APIC_SYMMETRIC_IO = 3,
1: +  APIC_SYMMETRIC_IO_NO_ROUTING = 4,
1:  };
1:  
1:  struct tsc_adjust {
1: -	s64 bootval;
1: -	s64 adjusted;
1: -	long unsigned int nextcheck;
1: -	bool warned;
1: +  s64 bootval;
1: +  s64 adjusted;
1: +  long unsigned int nextcheck;
1: +  bool warned;
1:  };
1:  
1:  enum {
1: -	DUMP_PREFIX_NONE = 0,
1: -	DUMP_PREFIX_ADDRESS = 1,
1: -	DUMP_PREFIX_OFFSET = 2,
1: +  DUMP_PREFIX_NONE = 0,
1: +  DUMP_PREFIX_ADDRESS = 1,
1: +  DUMP_PREFIX_OFFSET = 2,
1:  };
1:  
1:  struct mpf_intel {
1: -	char signature[4];
1: -	unsigned int physptr;
1: -	unsigned char length;
1: -	unsigned char specification;
1: -	unsigned char checksum;
1: -	unsigned char feature1;
1: -	unsigned char feature2;
1: -	unsigned char feature3;
1: -	unsigned char feature4;
1: -	unsigned char feature5;
1: +  char signature[4];
1: +  unsigned int physptr;
1: +  unsigned char length;
1: +  unsigned char specification;
1: +  unsigned char checksum;
1: +  unsigned char feature1;
1: +  unsigned char feature2;
1: +  unsigned char feature3;
1: +  unsigned char feature4;
1: +  unsigned char feature5;
1:  };
1:  
1:  struct mpc_table {
1: -	char signature[4];
1: -	short unsigned int length;
1: -	char spec;
1: -	char checksum;
1: -	char oem[8];
1: -	char productid[12];
1: -	unsigned int oemptr;
1: -	short unsigned int oemsize;
1: -	short unsigned int oemcount;
1: -	unsigned int lapic;
1: -	unsigned int reserved;
1: +  char signature[4];
1: +  short unsigned int length;
1: +  char spec;
1: +  char checksum;
1: +  char oem[8];
1: +  char productid[12];
1: +  unsigned int oemptr;
1: +  short unsigned int oemsize;
1: +  short unsigned int oemcount;
1: +  unsigned int lapic;
1: +  unsigned int reserved;
1:  };
1:  
1:  struct mpc_cpu {
1: -	unsigned char type;
1: -	unsigned char apicid;
1: -	unsigned char apicver;
1: -	unsigned char cpuflag;
1: -	unsigned int cpufeature;
1: -	unsigned int featureflag;
1: -	unsigned int reserved[2];
1: +  unsigned char type;
1: +  unsigned char apicid;
1: +  unsigned char apicver;
1: +  unsigned char cpuflag;
1: +  unsigned int cpufeature;
1: +  unsigned int featureflag;
1: +  unsigned int reserved[2];
1:  };
1:  
1:  struct mpc_bus {
1: -	unsigned char type;
1: -	unsigned char busid;
1: -	unsigned char bustype[6];
1: +  unsigned char type;
1: +  unsigned char busid;
1: +  unsigned char bustype[6];
1:  };
1:  
1:  struct mpc_ioapic {
1: -	unsigned char type;
1: -	unsigned char apicid;
1: -	unsigned char apicver;
1: -	unsigned char flags;
1: -	unsigned int apicaddr;
1: +  unsigned char type;
1: +  unsigned char apicid;
1: +  unsigned char apicver;
1: +  unsigned char flags;
1: +  unsigned int apicaddr;
1:  };
1:  
1:  struct mpc_lintsrc {
1: -	unsigned char type;
1: -	unsigned char irqtype;
1: -	short unsigned int irqflag;
1: -	unsigned char srcbusid;
1: -	unsigned char srcbusirq;
1: -	unsigned char destapic;
1: -	unsigned char destapiclint;
1: +  unsigned char type;
1: +  unsigned char irqtype;
1: +  short unsigned int irqflag;
1: +  unsigned char srcbusid;
1: +  unsigned char srcbusirq;
1: +  unsigned char destapic;
1: +  unsigned char destapiclint;
1:  };
1:  
1:  enum page_cache_mode {
1: -	_PAGE_CACHE_MODE_WB = 0,
1: -	_PAGE_CACHE_MODE_WC = 1,
1: -	_PAGE_CACHE_MODE_UC_MINUS = 2,
1: -	_PAGE_CACHE_MODE_UC = 3,
1: -	_PAGE_CACHE_MODE_WT = 4,
1: -	_PAGE_CACHE_MODE_WP = 5,
1: -	_PAGE_CACHE_MODE_NUM = 8,
1: +  _PAGE_CACHE_MODE_WB = 0,
1: +  _PAGE_CACHE_MODE_WC = 1,
1: +  _PAGE_CACHE_MODE_UC_MINUS = 2,
1: +  _PAGE_CACHE_MODE_UC = 3,
1: +  _PAGE_CACHE_MODE_WT = 4,
1: +  _PAGE_CACHE_MODE_WP = 5,
1: +  _PAGE_CACHE_MODE_NUM = 8,
1:  };
1:  
1:  enum {
1: -	IRQ_REMAP_XAPIC_MODE = 0,
1: -	IRQ_REMAP_X2APIC_MODE = 1,
1: +  IRQ_REMAP_XAPIC_MODE = 0,
1: +  IRQ_REMAP_X2APIC_MODE = 1,
1:  };
1:  
1:  union apic_ir {
1: -	long unsigned int map[4];
1: -	u32 regs[8];
1: +  long unsigned int map[4];
1: +  u32 regs[8];
1:  };
1:  
1:  enum {
1: -	X2APIC_OFF = 0,
1: -	X2APIC_ON = 1,
1: -	X2APIC_DISABLED = 2,
1: +  X2APIC_OFF = 0,
1: +  X2APIC_ON = 1,
1: +  X2APIC_DISABLED = 2,
1:  };
1:  
1:  enum ioapic_irq_destination_types {
1: -	dest_Fixed = 0,
1: -	dest_LowestPrio = 1,
1: -	dest_SMI = 2,
1: -	dest__reserved_1 = 3,
1: -	dest_NMI = 4,
1: -	dest_INIT = 5,
1: -	dest__reserved_2 = 6,
1: -	dest_ExtINT = 7,
1: -};
1: -
1: -enum {
1: -	IRQ_SET_MASK_OK = 0,
1: -	IRQ_SET_MASK_OK_NOCOPY = 1,
1: -	IRQ_SET_MASK_OK_DONE = 2,
1: -};
1: -
1: -enum {
1: -	IRQD_TRIGGER_MASK = 15,
1: -	IRQD_SETAFFINITY_PENDING = 256,
1: -	IRQD_ACTIVATED = 512,
1: -	IRQD_NO_BALANCING = 1024,
1: -	IRQD_PER_CPU = 2048,
1: -	IRQD_AFFINITY_SET = 4096,
1: -	IRQD_LEVEL = 8192,
1: -	IRQD_WAKEUP_STATE = 16384,
1: -	IRQD_MOVE_PCNTXT = 32768,
1: -	IRQD_IRQ_DISABLED = 65536,
1: -	IRQD_IRQ_MASKED = 131072,
1: -	IRQD_IRQ_INPROGRESS = 262144,
1: -	IRQD_WAKEUP_ARMED = 524288,
1: -	IRQD_FORWARDED_TO_VCPU = 1048576,
1: -	IRQD_AFFINITY_MANAGED = 2097152,
1: -	IRQD_IRQ_STARTED = 4194304,
1: -	IRQD_MANAGED_SHUTDOWN = 8388608,
1: -	IRQD_SINGLE_TARGET = 16777216,
1: -	IRQD_DEFAULT_TRIGGER_SET = 33554432,
1: -	IRQD_CAN_RESERVE = 67108864,
1: -	IRQD_MSI_NOMASK_QUIRK = 134217728,
1: -	IRQD_HANDLE_ENFORCE_IRQCTX = 268435456,
1: -	IRQD_AFFINITY_ON_ACTIVATE = 536870912,
1: -	IRQD_IRQ_ENABLED_ON_SUSPEND = 1073741824,
1: +  dest_Fixed = 0,
1: +  dest_LowestPrio = 1,
1: +  dest_SMI = 2,
1: +  dest__reserved_1 = 3,
1: +  dest_NMI = 4,
1: +  dest_INIT = 5,
1: +  dest__reserved_2 = 6,
1: +  dest_ExtINT = 7,
1: +};
1: +
1: +enum {
1: +  IRQ_SET_MASK_OK = 0,
1: +  IRQ_SET_MASK_OK_NOCOPY = 1,
1: +  IRQ_SET_MASK_OK_DONE = 2,
1: +};
1: +
1: +enum {
1: +  IRQD_TRIGGER_MASK = 15,
1: +  IRQD_SETAFFINITY_PENDING = 256,
1: +  IRQD_ACTIVATED = 512,
1: +  IRQD_NO_BALANCING = 1024,
1: +  IRQD_PER_CPU = 2048,
1: +  IRQD_AFFINITY_SET = 4096,
1: +  IRQD_LEVEL = 8192,
1: +  IRQD_WAKEUP_STATE = 16384,
1: +  IRQD_MOVE_PCNTXT = 32768,
1: +  IRQD_IRQ_DISABLED = 65536,
1: +  IRQD_IRQ_MASKED = 131072,
1: +  IRQD_IRQ_INPROGRESS = 262144,
1: +  IRQD_WAKEUP_ARMED = 524288,
1: +  IRQD_FORWARDED_TO_VCPU = 1048576,
1: +  IRQD_AFFINITY_MANAGED = 2097152,
1: +  IRQD_IRQ_STARTED = 4194304,
1: +  IRQD_MANAGED_SHUTDOWN = 8388608,
1: +  IRQD_SINGLE_TARGET = 16777216,
1: +  IRQD_DEFAULT_TRIGGER_SET = 33554432,
1: +  IRQD_CAN_RESERVE = 67108864,
1: +  IRQD_MSI_NOMASK_QUIRK = 134217728,
1: +  IRQD_HANDLE_ENFORCE_IRQCTX = 268435456,
1: +  IRQD_AFFINITY_ON_ACTIVATE = 536870912,
1: +  IRQD_IRQ_ENABLED_ON_SUSPEND = 1073741824,
1:  };
1:  
1:  struct irq_cfg {
1: -	unsigned int dest_apicid;
1: -	unsigned int vector;
1: +  unsigned int dest_apicid;
1: +  unsigned int vector;
1:  };
1:  
1:  enum {
1: -	IRQCHIP_FWNODE_REAL = 0,
1: -	IRQCHIP_FWNODE_NAMED = 1,
1: -	IRQCHIP_FWNODE_NAMED_ID = 2,
1: +  IRQCHIP_FWNODE_REAL = 0,
1: +  IRQCHIP_FWNODE_NAMED = 1,
1: +  IRQCHIP_FWNODE_NAMED_ID = 2,
1:  };
1:  
1:  enum {
1: -	X86_IRQ_ALLOC_CONTIGUOUS_VECTORS = 1,
1: -	X86_IRQ_ALLOC_LEGACY = 2,
1: +  X86_IRQ_ALLOC_CONTIGUOUS_VECTORS = 1,
1: +  X86_IRQ_ALLOC_LEGACY = 2,
1:  };
1:  
1:  struct apic_chip_data {
1: -	struct irq_cfg hw_irq_cfg;
1: -	unsigned int vector;
1: -	unsigned int prev_vector;
1: -	unsigned int cpu;
1: -	unsigned int prev_cpu;
1: -	unsigned int irq;
1: -	struct hlist_node clist;
1: -	unsigned int move_in_progress: 1;
1: -	unsigned int is_managed: 1;
1: -	unsigned int can_reserve: 1;
1: -	unsigned int has_reserved: 1;
1: +  struct irq_cfg hw_irq_cfg;
1: +  unsigned int vector;
1: +  unsigned int prev_vector;
1: +  unsigned int cpu;
1: +  unsigned int prev_cpu;
1: +  unsigned int irq;
1: +  struct hlist_node clist;
1: +  unsigned int move_in_progress : 1;
1: +  unsigned int is_managed : 1;
1: +  unsigned int can_reserve : 1;
1: +  unsigned int has_reserved : 1;
1:  };
1:  
1:  struct irq_matrix;
1:  
1:  enum {
1: -	IRQ_TYPE_NONE = 0,
1: -	IRQ_TYPE_EDGE_RISING = 1,
1: -	IRQ_TYPE_EDGE_FALLING = 2,
1: -	IRQ_TYPE_EDGE_BOTH = 3,
1: -	IRQ_TYPE_LEVEL_HIGH = 4,
1: -	IRQ_TYPE_LEVEL_LOW = 8,
1: -	IRQ_TYPE_LEVEL_MASK = 12,
1: -	IRQ_TYPE_SENSE_MASK = 15,
1: -	IRQ_TYPE_DEFAULT = 15,
1: -	IRQ_TYPE_PROBE = 16,
1: -	IRQ_LEVEL = 256,
1: -	IRQ_PER_CPU = 512,
1: -	IRQ_NOPROBE = 1024,
1: -	IRQ_NOREQUEST = 2048,
1: -	IRQ_NOAUTOEN = 4096,
1: -	IRQ_NO_BALANCING = 8192,
1: -	IRQ_MOVE_PCNTXT = 16384,
1: -	IRQ_NESTED_THREAD = 32768,
1: -	IRQ_NOTHREAD = 65536,
1: -	IRQ_PER_CPU_DEVID = 131072,
1: -	IRQ_IS_POLLED = 262144,
1: -	IRQ_DISABLE_UNLAZY = 524288,
1: -	IRQ_HIDDEN = 1048576,
1: -};
1: -
1: -enum {
1: -	IRQCHIP_SET_TYPE_MASKED = 1,
1: -	IRQCHIP_EOI_IF_HANDLED = 2,
1: -	IRQCHIP_MASK_ON_SUSPEND = 4,
1: -	IRQCHIP_ONOFFLINE_ENABLED = 8,
1: -	IRQCHIP_SKIP_SET_WAKE = 16,
1: -	IRQCHIP_ONESHOT_SAFE = 32,
1: -	IRQCHIP_EOI_THREADED = 64,
1: -	IRQCHIP_SUPPORTS_LEVEL_MSI = 128,
1: -	IRQCHIP_SUPPORTS_NMI = 256,
1: -	IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND = 512,
1: +  IRQ_TYPE_NONE = 0,
1: +  IRQ_TYPE_EDGE_RISING = 1,
1: +  IRQ_TYPE_EDGE_FALLING = 2,
1: +  IRQ_TYPE_EDGE_BOTH = 3,
1: +  IRQ_TYPE_LEVEL_HIGH = 4,
1: +  IRQ_TYPE_LEVEL_LOW = 8,
1: +  IRQ_TYPE_LEVEL_MASK = 12,
1: +  IRQ_TYPE_SENSE_MASK = 15,
1: +  IRQ_TYPE_DEFAULT = 15,
1: +  IRQ_TYPE_PROBE = 16,
1: +  IRQ_LEVEL = 256,
1: +  IRQ_PER_CPU = 512,
1: +  IRQ_NOPROBE = 1024,
1: +  IRQ_NOREQUEST = 2048,
1: +  IRQ_NOAUTOEN = 4096,
1: +  IRQ_NO_BALANCING = 8192,
1: +  IRQ_MOVE_PCNTXT = 16384,
1: +  IRQ_NESTED_THREAD = 32768,
1: +  IRQ_NOTHREAD = 65536,
1: +  IRQ_PER_CPU_DEVID = 131072,
1: +  IRQ_IS_POLLED = 262144,
1: +  IRQ_DISABLE_UNLAZY = 524288,
1: +  IRQ_HIDDEN = 1048576,
1: +};
1: +
1: +enum {
1: +  IRQCHIP_SET_TYPE_MASKED = 1,
1: +  IRQCHIP_EOI_IF_HANDLED = 2,
1: +  IRQCHIP_MASK_ON_SUSPEND = 4,
1: +  IRQCHIP_ONOFFLINE_ENABLED = 8,
1: +  IRQCHIP_SKIP_SET_WAKE = 16,
1: +  IRQCHIP_ONESHOT_SAFE = 32,
1: +  IRQCHIP_EOI_THREADED = 64,
1: +  IRQCHIP_SUPPORTS_LEVEL_MSI = 128,
1: +  IRQCHIP_SUPPORTS_NMI = 256,
1: +  IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND = 512,
1:  };
1:  
1:  struct clock_event_device___2;
1:  
1:  union IO_APIC_reg_00 {
1: -	u32 raw;
1: -	struct {
1: -		u32 __reserved_2: 14;
1: -		u32 LTS: 1;
1: -		u32 delivery_type: 1;
1: -		u32 __reserved_1: 8;
1: -		u32 ID: 8;
1: -	} bits;
1: +  u32 raw;
1: +  struct {
1: +    u32 __reserved_2 : 14;
1: +    u32 LTS : 1;
1: +    u32 delivery_type : 1;
1: +    u32 __reserved_1 : 8;
1: +    u32 ID : 8;
1: +  } bits;
1:  };
1:  
1:  union IO_APIC_reg_01 {
1: -	u32 raw;
1: -	struct {
1: -		u32 version: 8;
1: -		u32 __reserved_2: 7;
1: -		u32 PRQ: 1;
1: -		u32 entries: 8;
1: -		u32 __reserved_1: 8;
1: -	} bits;
1: +  u32 raw;
1: +  struct {
1: +    u32 version : 8;
1: +    u32 __reserved_2 : 7;
1: +    u32 PRQ : 1;
1: +    u32 entries : 8;
1: +    u32 __reserved_1 : 8;
1: +  } bits;
1:  };
1:  
1:  union IO_APIC_reg_02 {
1: -	u32 raw;
1: -	struct {
1: -		u32 __reserved_2: 24;
1: -		u32 arbitration: 4;
1: -		u32 __reserved_1: 4;
1: -	} bits;
1: +  u32 raw;
1: +  struct {
1: +    u32 __reserved_2 : 24;
1: +    u32 arbitration : 4;
1: +    u32 __reserved_1 : 4;
1: +  } bits;
1:  };
1:  
1:  union IO_APIC_reg_03 {
1: -	u32 raw;
1: -	struct {
1: -		u32 boot_DT: 1;
1: -		u32 __reserved_1: 31;
1: -	} bits;
1: +  u32 raw;
1: +  struct {
1: +    u32 boot_DT : 1;
1: +    u32 __reserved_1 : 31;
1: +  } bits;
1:  };
1:  
1:  struct IR_IO_APIC_route_entry {
1: -	__u64 vector: 8;
1: -	__u64 zero: 3;
1: -	__u64 index2: 1;
1: -	__u64 delivery_status: 1;
1: -	__u64 polarity: 1;
1: -	__u64 irr: 1;
1: -	__u64 trigger: 1;
1: -	__u64 mask: 1;
1: -	__u64 reserved: 31;
1: -	__u64 format: 1;
1: -	__u64 index: 15;
1: +  __u64 vector : 8;
1: +  __u64 zero : 3;
1: +  __u64 index2 : 1;
1: +  __u64 delivery_status : 1;
1: +  __u64 polarity : 1;
1: +  __u64 irr : 1;
1: +  __u64 trigger : 1;
1: +  __u64 mask : 1;
1: +  __u64 reserved : 31;
1: +  __u64 format : 1;
1: +  __u64 index : 15;
1:  };
1:  
1:  struct irq_pin_list {
1: -	struct list_head list;
1: -	int apic;
1: -	int pin;
1: +  struct list_head list;
1: +  int apic;
1: +  int pin;
1:  };
1:  
1:  struct mp_chip_data {
1: -	struct list_head irq_2_pin;
1: -	struct IO_APIC_route_entry entry;
1: -	int trigger;
1: -	int polarity;
1: -	u32 count;
1: -	bool isa_irq;
1: +  struct list_head irq_2_pin;
1: +  struct IO_APIC_route_entry entry;
1: +  int trigger;
1: +  int polarity;
1: +  u32 count;
1: +  bool isa_irq;
1:  };
1:  
1:  struct mp_ioapic_gsi {
1: -	u32 gsi_base;
1: -	u32 gsi_end;
1: +  u32 gsi_base;
1: +  u32 gsi_end;
1:  };
1:  
1:  struct ioapic {
1: -	int nr_registers;
1: -	struct IO_APIC_route_entry *saved_registers;
1: -	struct mpc_ioapic mp_config;
1: -	struct mp_ioapic_gsi gsi_config;
1: -	struct ioapic_domain_cfg irqdomain_cfg;
1: -	struct irq_domain *irqdomain;
1: -	struct resource *iomem_res;
1: +  int nr_registers;
1: +  struct IO_APIC_route_entry *saved_registers;
1: +  struct mpc_ioapic mp_config;
1: +  struct mp_ioapic_gsi gsi_config;
1: +  struct ioapic_domain_cfg irqdomain_cfg;
1: +  struct irq_domain *irqdomain;
1: +  struct resource *iomem_res;
1:  };
1:  
1:  struct io_apic {
1: -	unsigned int index;
1: -	unsigned int unused[3];
1: -	unsigned int data;
1: -	unsigned int unused2[11];
1: -	unsigned int eoi;
1: +  unsigned int index;
1: +  unsigned int unused[3];
1: +  unsigned int data;
1: +  unsigned int unused2[11];
1: +  unsigned int eoi;
1:  };
1:  
1:  union entry_union {
1: -	struct {
1: -		u32 w1;
1: -		u32 w2;
1: -	};
1: -	struct IO_APIC_route_entry entry;
1: +  struct {
1: +    u32 w1;
1: +    u32 w2;
1: +  };
1: +  struct IO_APIC_route_entry entry;
1:  };
1:  
1:  enum {
1: -	IRQ_DOMAIN_FLAG_HIERARCHY = 1,
1: -	IRQ_DOMAIN_NAME_ALLOCATED = 2,
1: -	IRQ_DOMAIN_FLAG_IPI_PER_CPU = 4,
1: -	IRQ_DOMAIN_FLAG_IPI_SINGLE = 8,
1: -	IRQ_DOMAIN_FLAG_MSI = 16,
1: -	IRQ_DOMAIN_FLAG_MSI_REMAP = 32,
1: -	IRQ_DOMAIN_MSI_NOMASK_QUIRK = 64,
1: -	IRQ_DOMAIN_FLAG_NONCORE = 65536,
1: +  IRQ_DOMAIN_FLAG_HIERARCHY = 1,
1: +  IRQ_DOMAIN_NAME_ALLOCATED = 2,
1: +  IRQ_DOMAIN_FLAG_IPI_PER_CPU = 4,
1: +  IRQ_DOMAIN_FLAG_IPI_SINGLE = 8,
1: +  IRQ_DOMAIN_FLAG_MSI = 16,
1: +  IRQ_DOMAIN_FLAG_MSI_REMAP = 32,
1: +  IRQ_DOMAIN_MSI_NOMASK_QUIRK = 64,
1: +  IRQ_DOMAIN_FLAG_NONCORE = 65536,
1:  };
1:  
1:  typedef struct irq_alloc_info msi_alloc_info_t;
1: @@ -23158,236 +23338,240 @@ typedef struct irq_alloc_info msi_alloc_info_t;
1:  struct msi_domain_info;
1:  
1:  struct msi_domain_ops {
1: -	irq_hw_number_t (*get_hwirq)(struct msi_domain_info *, msi_alloc_info_t *);
1: -	int (*msi_init)(struct irq_domain *, struct msi_domain_info *, unsigned int, irq_hw_number_t, msi_alloc_info_t *);
1: -	void (*msi_free)(struct irq_domain *, struct msi_domain_info *, unsigned int);
1: -	int (*msi_check)(struct irq_domain *, struct msi_domain_info *, struct device *);
1: -	int (*msi_prepare)(struct irq_domain *, struct device *, int, msi_alloc_info_t *);
1: -	void (*msi_finish)(msi_alloc_info_t *, int);
1: -	void (*set_desc)(msi_alloc_info_t *, struct msi_desc *);
1: -	int (*handle_error)(struct irq_domain *, struct msi_desc *, int);
1: -	int (*domain_alloc_irqs)(struct irq_domain *, struct device *, int);
1: -	void (*domain_free_irqs)(struct irq_domain *, struct device *);
1: +  irq_hw_number_t (*get_hwirq)(struct msi_domain_info *, msi_alloc_info_t *);
1: +  int (*msi_init)(struct irq_domain *, struct msi_domain_info *, unsigned int,
1: +                  irq_hw_number_t, msi_alloc_info_t *);
1: +  void (*msi_free)(struct irq_domain *, struct msi_domain_info *, unsigned int);
1: +  int (*msi_check)(struct irq_domain *, struct msi_domain_info *,
1: +                   struct device *);
1: +  int (*msi_prepare)(struct irq_domain *, struct device *, int,
1: +                     msi_alloc_info_t *);
1: +  void (*msi_finish)(msi_alloc_info_t *, int);
1: +  void (*set_desc)(msi_alloc_info_t *, struct msi_desc *);
1: +  int (*handle_error)(struct irq_domain *, struct msi_desc *, int);
1: +  int (*domain_alloc_irqs)(struct irq_domain *, struct device *, int);
1: +  void (*domain_free_irqs)(struct irq_domain *, struct device *);
1:  };
1:  
1:  struct msi_domain_info {
1: -	u32 flags;
1: -	struct msi_domain_ops *ops;
1: -	struct irq_chip *chip;
1: -	void *chip_data;
1: -	irq_flow_handler_t handler;
1: -	void *handler_data;
1: -	const char *handler_name;
1: -	void *data;
1: +  u32 flags;
1: +  struct msi_domain_ops *ops;
1: +  struct irq_chip *chip;
1: +  void *chip_data;
1: +  irq_flow_handler_t handler;
1: +  void *handler_data;
1: +  const char *handler_name;
1: +  void *data;
1:  };
1:  
1:  enum {
1: -	MSI_FLAG_USE_DEF_DOM_OPS = 1,
1: -	MSI_FLAG_USE_DEF_CHIP_OPS = 2,
1: -	MSI_FLAG_MULTI_PCI_MSI = 4,
1: -	MSI_FLAG_PCI_MSIX = 8,
1: -	MSI_FLAG_ACTIVATE_EARLY = 16,
1: -	MSI_FLAG_MUST_REACTIVATE = 32,
1: -	MSI_FLAG_LEVEL_CAPABLE = 64,
1: +  MSI_FLAG_USE_DEF_DOM_OPS = 1,
1: +  MSI_FLAG_USE_DEF_CHIP_OPS = 2,
1: +  MSI_FLAG_MULTI_PCI_MSI = 4,
1: +  MSI_FLAG_PCI_MSIX = 8,
1: +  MSI_FLAG_ACTIVATE_EARLY = 16,
1: +  MSI_FLAG_MUST_REACTIVATE = 32,
1: +  MSI_FLAG_LEVEL_CAPABLE = 64,
1:  };
1:  
1:  struct hpet_channel;
1:  
1:  struct cluster_mask {
1: -	unsigned int clusterid;
1: -	int node;
1: -	struct cpumask mask;
1: +  unsigned int clusterid;
1: +  int node;
1: +  struct cpumask mask;
1:  };
1:  
1:  struct dyn_arch_ftrace {};
1:  
1:  enum {
1: -	FTRACE_OPS_FL_ENABLED = 1,
1: -	FTRACE_OPS_FL_DYNAMIC = 2,
1: -	FTRACE_OPS_FL_SAVE_REGS = 4,
1: -	FTRACE_OPS_FL_SAVE_REGS_IF_SUPPORTED = 8,
1: -	FTRACE_OPS_FL_RECURSION_SAFE = 16,
1: -	FTRACE_OPS_FL_STUB = 32,
1: -	FTRACE_OPS_FL_INITIALIZED = 64,
1: -	FTRACE_OPS_FL_DELETED = 128,
1: -	FTRACE_OPS_FL_ADDING = 256,
1: -	FTRACE_OPS_FL_REMOVING = 512,
1: -	FTRACE_OPS_FL_MODIFYING = 1024,
1: -	FTRACE_OPS_FL_ALLOC_TRAMP = 2048,
1: -	FTRACE_OPS_FL_IPMODIFY = 4096,
1: -	FTRACE_OPS_FL_PID = 8192,
1: -	FTRACE_OPS_FL_RCU = 16384,
1: -	FTRACE_OPS_FL_TRACE_ARRAY = 32768,
1: -	FTRACE_OPS_FL_PERMANENT = 65536,
1: -	FTRACE_OPS_FL_DIRECT = 131072,
1: -};
1: -
1: -enum {
1: -	FTRACE_FL_ENABLED = 2147483648,
1: -	FTRACE_FL_REGS = 1073741824,
1: -	FTRACE_FL_REGS_EN = 536870912,
1: -	FTRACE_FL_TRAMP = 268435456,
1: -	FTRACE_FL_TRAMP_EN = 134217728,
1: -	FTRACE_FL_IPMODIFY = 67108864,
1: -	FTRACE_FL_DISABLED = 33554432,
1: -	FTRACE_FL_DIRECT = 16777216,
1: -	FTRACE_FL_DIRECT_EN = 8388608,
1: +  FTRACE_OPS_FL_ENABLED = 1,
1: +  FTRACE_OPS_FL_DYNAMIC = 2,
1: +  FTRACE_OPS_FL_SAVE_REGS = 4,
1: +  FTRACE_OPS_FL_SAVE_REGS_IF_SUPPORTED = 8,
1: +  FTRACE_OPS_FL_RECURSION_SAFE = 16,
1: +  FTRACE_OPS_FL_STUB = 32,
1: +  FTRACE_OPS_FL_INITIALIZED = 64,
1: +  FTRACE_OPS_FL_DELETED = 128,
1: +  FTRACE_OPS_FL_ADDING = 256,
1: +  FTRACE_OPS_FL_REMOVING = 512,
1: +  FTRACE_OPS_FL_MODIFYING = 1024,
1: +  FTRACE_OPS_FL_ALLOC_TRAMP = 2048,
1: +  FTRACE_OPS_FL_IPMODIFY = 4096,
1: +  FTRACE_OPS_FL_PID = 8192,
1: +  FTRACE_OPS_FL_RCU = 16384,
1: +  FTRACE_OPS_FL_TRACE_ARRAY = 32768,
1: +  FTRACE_OPS_FL_PERMANENT = 65536,
1: +  FTRACE_OPS_FL_DIRECT = 131072,
1: +};
1: +
1: +enum {
1: +  FTRACE_FL_ENABLED = 2147483648,
1: +  FTRACE_FL_REGS = 1073741824,
1: +  FTRACE_FL_REGS_EN = 536870912,
1: +  FTRACE_FL_TRAMP = 268435456,
1: +  FTRACE_FL_TRAMP_EN = 134217728,
1: +  FTRACE_FL_IPMODIFY = 67108864,
1: +  FTRACE_FL_DISABLED = 33554432,
1: +  FTRACE_FL_DIRECT = 16777216,
1: +  FTRACE_FL_DIRECT_EN = 8388608,
1:  };
1:  
1:  struct dyn_ftrace {
1: -	long unsigned int ip;
1: -	long unsigned int flags;
1: -	struct dyn_arch_ftrace arch;
1: +  long unsigned int ip;
1: +  long unsigned int flags;
1: +  struct dyn_arch_ftrace arch;
1:  };
1:  
1:  enum {
1: -	FTRACE_UPDATE_IGNORE = 0,
1: -	FTRACE_UPDATE_MAKE_CALL = 1,
1: -	FTRACE_UPDATE_MODIFY_CALL = 2,
1: -	FTRACE_UPDATE_MAKE_NOP = 3,
1: +  FTRACE_UPDATE_IGNORE = 0,
1: +  FTRACE_UPDATE_MAKE_CALL = 1,
1: +  FTRACE_UPDATE_MODIFY_CALL = 2,
1: +  FTRACE_UPDATE_MAKE_NOP = 3,
1:  };
1:  
1:  union ftrace_op_code_union {
1: -	char code[7];
1: -	struct {
1: -		char op[3];
1: -		int offset;
1: -	} __attribute__((packed));
1: +  char code[7];
1: +  struct {
1: +    char op[3];
1: +    int offset;
1: +  } __attribute__((packed));
1:  };
1:  
1:  struct ftrace_rec_iter;
1:  
1:  struct kimage_arch {
1: -	p4d_t *p4d;
1: -	pud_t *pud;
1: -	pmd_t *pmd;
1: -	pte_t *pte;
1: -	void *elf_headers;
1: -	long unsigned int elf_headers_sz;
1: -	long unsigned int elf_load_addr;
1: +  p4d_t *p4d;
1: +  pud_t *pud;
1: +  pmd_t *pmd;
1: +  pte_t *pte;
1: +  void *elf_headers;
1: +  long unsigned int elf_headers_sz;
1: +  long unsigned int elf_load_addr;
1:  };
1:  
1:  typedef long unsigned int kimage_entry_t;
1:  
1:  struct kexec_segment {
1: -	union {
1: -		void *buf;
1: -		void *kbuf;
1: -	};
1: -	size_t bufsz;
1: -	long unsigned int mem;
1: -	size_t memsz;
1: +  union {
1: +    void *buf;
1: +    void *kbuf;
1: +  };
1: +  size_t bufsz;
1: +  long unsigned int mem;
1: +  size_t memsz;
1:  };
1:  
1:  struct kimage {
1: -	kimage_entry_t head;
1: -	kimage_entry_t *entry;
1: -	kimage_entry_t *last_entry;
1: -	long unsigned int start;
1: -	struct page *control_code_page;
1: -	struct page *swap_page;
1: -	void *vmcoreinfo_data_copy;
1: -	long unsigned int nr_segments;
1: -	struct kexec_segment segment[16];
1: -	struct list_head control_pages;
1: -	struct list_head dest_pages;
1: -	struct list_head unusable_pages;
1: -	long unsigned int control_page;
1: -	unsigned int type: 1;
1: -	unsigned int preserve_context: 1;
1: -	unsigned int file_mode: 1;
1: -	struct kimage_arch arch;
1: +  kimage_entry_t head;
1: +  kimage_entry_t *entry;
1: +  kimage_entry_t *last_entry;
1: +  long unsigned int start;
1: +  struct page *control_code_page;
1: +  struct page *swap_page;
1: +  void *vmcoreinfo_data_copy;
1: +  long unsigned int nr_segments;
1: +  struct kexec_segment segment[16];
1: +  struct list_head control_pages;
1: +  struct list_head dest_pages;
1: +  struct list_head unusable_pages;
1: +  long unsigned int control_page;
1: +  unsigned int type : 1;
1: +  unsigned int preserve_context : 1;
1: +  unsigned int file_mode : 1;
1: +  struct kimage_arch arch;
1:  };
1:  
1:  struct x86_mapping_info {
1: -	void * (*alloc_pgt_page)(void *);
1: -	void *context;
1: -	long unsigned int page_flag;
1: -	long unsigned int offset;
1: -	bool direct_gbpages;
1: -	long unsigned int kernpg_flag;
1: +  void *(*alloc_pgt_page)(void *);
1: +  void *context;
1: +  long unsigned int page_flag;
1: +  long unsigned int offset;
1: +  bool direct_gbpages;
1: +  long unsigned int kernpg_flag;
1:  };
1:  
1:  struct init_pgtable_data {
1: -	struct x86_mapping_info *info;
1: -	pgd_t *level4p;
1: +  struct x86_mapping_info *info;
1: +  pgd_t *level4p;
1:  };
1:  
1:  typedef void crash_vmclear_fn();
1:  
1:  struct prev_kprobe {
1: -	struct kprobe *kp;
1: -	long unsigned int status;
1: -	long unsigned int old_flags;
1: -	long unsigned int saved_flags;
1: +  struct kprobe *kp;
1: +  long unsigned int status;
1: +  long unsigned int old_flags;
1: +  long unsigned int saved_flags;
1:  };
1:  
1:  struct kprobe_ctlblk {
1: -	long unsigned int kprobe_status;
1: -	long unsigned int kprobe_old_flags;
1: -	long unsigned int kprobe_saved_flags;
1: -	struct prev_kprobe prev_kprobe;
1: +  long unsigned int kprobe_status;
1: +  long unsigned int kprobe_old_flags;
1: +  long unsigned int kprobe_saved_flags;
1: +  struct prev_kprobe prev_kprobe;
1:  };
1:  
1:  struct kretprobe_instance;
1:  
1: -typedef int (*kretprobe_handler_t)(struct kretprobe_instance *, struct pt_regs *);
1: +typedef int (*kretprobe_handler_t)(struct kretprobe_instance *,
1: +                                   struct pt_regs *);
1:  
1:  struct kretprobe;
1:  
1:  struct kretprobe_instance {
1: -	union {
1: -		struct hlist_node hlist;
1: -		struct callback_head rcu;
1: -	};
1: -	struct kretprobe *rp;
1: -	kprobe_opcode_t *ret_addr;
1: -	struct task_struct *task;
1: -	void *fp;
1: -	char data[0];
1: +  union {
1: +    struct hlist_node hlist;
1: +    struct callback_head rcu;
1: +  };
1: +  struct kretprobe *rp;
1: +  kprobe_opcode_t *ret_addr;
1: +  struct task_struct *task;
1: +  void *fp;
1: +  char data[0];
1:  };
1:  
1:  struct kretprobe {
1: -	struct kprobe kp;
1: -	kretprobe_handler_t handler;
1: -	kretprobe_handler_t entry_handler;
1: -	int maxactive;
1: -	int nmissed;
1: -	size_t data_size;
1: -	struct hlist_head free_instances;
1: -	raw_spinlock_t lock;
1: +  struct kprobe kp;
1: +  kretprobe_handler_t handler;
1: +  kretprobe_handler_t entry_handler;
1: +  int maxactive;
1: +  int nmissed;
1: +  size_t data_size;
1: +  struct hlist_head free_instances;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct kretprobe_blackpoint {
1: -	const char *name;
1: -	void *addr;
1: +  const char *name;
1: +  void *addr;
1:  };
1:  
1:  struct kprobe_insn_cache {
1: -	struct mutex mutex;
1: -	void * (*alloc)();
1: -	void (*free)(void *);
1: -	const char *sym;
1: -	struct list_head pages;
1: -	size_t insn_size;
1: -	int nr_garbage;
1: +  struct mutex mutex;
1: +  void *(*alloc)();
1: +  void (*free)(void *);
1: +  const char *sym;
1: +  struct list_head pages;
1: +  size_t insn_size;
1: +  int nr_garbage;
1:  };
1:  
1:  struct __arch_relative_insn {
1: -	u8 op;
1: -	s32 raddr;
1: +  u8 op;
1: +  s32 raddr;
1:  } __attribute__((packed));
1:  
1:  struct arch_optimized_insn {
1: -	kprobe_opcode_t copied_insn[4];
1: -	kprobe_opcode_t *insn;
1: -	size_t size;
1: +  kprobe_opcode_t copied_insn[4];
1: +  kprobe_opcode_t *insn;
1: +  size_t size;
1:  };
1:  
1:  struct optimized_kprobe {
1: -	struct kprobe kp;
1: -	struct list_head list;
1: -	struct arch_optimized_insn optinsn;
1: +  struct kprobe kp;
1: +  struct list_head list;
1: +  struct arch_optimized_insn optinsn;
1:  };
1:  
1:  typedef __u64 Elf64_Off;
1: @@ -23395,278 +23579,278 @@ typedef __u64 Elf64_Off;
1:  typedef __s64 Elf64_Sxword;
1:  
1:  struct elf64_rela {
1: -	Elf64_Addr r_offset;
1: -	Elf64_Xword r_info;
1: -	Elf64_Sxword r_addend;
1: +  Elf64_Addr r_offset;
1: +  Elf64_Xword r_info;
1: +  Elf64_Sxword r_addend;
1:  };
1:  
1:  typedef struct elf64_rela Elf64_Rela;
1:  
1:  struct elf64_hdr {
1: -	unsigned char e_ident[16];
1: -	Elf64_Half e_type;
1: -	Elf64_Half e_machine;
1: -	Elf64_Word e_version;
1: -	Elf64_Addr e_entry;
1: -	Elf64_Off e_phoff;
1: -	Elf64_Off e_shoff;
1: -	Elf64_Word e_flags;
1: -	Elf64_Half e_ehsize;
1: -	Elf64_Half e_phentsize;
1: -	Elf64_Half e_phnum;
1: -	Elf64_Half e_shentsize;
1: -	Elf64_Half e_shnum;
1: -	Elf64_Half e_shstrndx;
1: +  unsigned char e_ident[16];
1: +  Elf64_Half e_type;
1: +  Elf64_Half e_machine;
1: +  Elf64_Word e_version;
1: +  Elf64_Addr e_entry;
1: +  Elf64_Off e_phoff;
1: +  Elf64_Off e_shoff;
1: +  Elf64_Word e_flags;
1: +  Elf64_Half e_ehsize;
1: +  Elf64_Half e_phentsize;
1: +  Elf64_Half e_phnum;
1: +  Elf64_Half e_shentsize;
1: +  Elf64_Half e_shnum;
1: +  Elf64_Half e_shstrndx;
1:  };
1:  
1:  typedef struct elf64_hdr Elf64_Ehdr;
1:  
1:  struct elf64_shdr {
1: -	Elf64_Word sh_name;
1: -	Elf64_Word sh_type;
1: -	Elf64_Xword sh_flags;
1: -	Elf64_Addr sh_addr;
1: -	Elf64_Off sh_offset;
1: -	Elf64_Xword sh_size;
1: -	Elf64_Word sh_link;
1: -	Elf64_Word sh_info;
1: -	Elf64_Xword sh_addralign;
1: -	Elf64_Xword sh_entsize;
1: +  Elf64_Word sh_name;
1: +  Elf64_Word sh_type;
1: +  Elf64_Xword sh_flags;
1: +  Elf64_Addr sh_addr;
1: +  Elf64_Off sh_offset;
1: +  Elf64_Xword sh_size;
1: +  Elf64_Word sh_link;
1: +  Elf64_Word sh_info;
1: +  Elf64_Xword sh_addralign;
1: +  Elf64_Xword sh_entsize;
1:  };
1:  
1:  typedef struct elf64_shdr Elf64_Shdr;
1:  
1:  struct console {
1: -	char name[16];
1: -	void (*write)(struct console *, const char *, unsigned int);
1: -	int (*read)(struct console *, char *, unsigned int);
1: -	struct tty_driver * (*device)(struct console *, int *);
1: -	void (*unblank)();
1: -	int (*setup)(struct console *, char *);
1: -	int (*exit)(struct console *);
1: -	int (*match)(struct console *, char *, int, char *);
1: -	short int flags;
1: -	short int index;
1: -	int cflag;
1: -	void *data;
1: -	struct console *next;
1: +  char name[16];
1: +  void (*write)(struct console *, const char *, unsigned int);
1: +  int (*read)(struct console *, char *, unsigned int);
1: +  struct tty_driver *(*device)(struct console *, int *);
1: +  void (*unblank)();
1: +  int (*setup)(struct console *, char *);
1: +  int (*exit)(struct console *);
1: +  int (*match)(struct console *, char *, int, char *);
1: +  short int flags;
1: +  short int index;
1: +  int cflag;
1: +  void *data;
1: +  struct console *next;
1:  };
1:  
1:  struct hpet_data {
1: -	long unsigned int hd_phys_address;
1: -	void *hd_address;
1: -	short unsigned int hd_nirqs;
1: -	unsigned int hd_state;
1: -	unsigned int hd_irq[32];
1: +  long unsigned int hd_phys_address;
1: +  void *hd_address;
1: +  short unsigned int hd_nirqs;
1: +  unsigned int hd_state;
1: +  unsigned int hd_irq[32];
1:  };
1:  
1:  typedef irqreturn_t (*rtc_irq_handler)(int, void *);
1:  
1:  enum hpet_mode {
1: -	HPET_MODE_UNUSED = 0,
1: -	HPET_MODE_LEGACY = 1,
1: -	HPET_MODE_CLOCKEVT = 2,
1: -	HPET_MODE_DEVICE = 3,
1: +  HPET_MODE_UNUSED = 0,
1: +  HPET_MODE_LEGACY = 1,
1: +  HPET_MODE_CLOCKEVT = 2,
1: +  HPET_MODE_DEVICE = 3,
1:  };
1:  
1:  struct hpet_channel___2 {
1: -	struct clock_event_device evt;
1: -	unsigned int num;
1: -	unsigned int cpu;
1: -	unsigned int irq;
1: -	unsigned int in_use;
1: -	enum hpet_mode mode;
1: -	unsigned int boot_cfg;
1: -	char name[10];
1: -	long: 48;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct clock_event_device evt;
1: +  unsigned int num;
1: +  unsigned int cpu;
1: +  unsigned int irq;
1: +  unsigned int in_use;
1: +  enum hpet_mode mode;
1: +  unsigned int boot_cfg;
1: +  char name[10];
1: +  long : 48;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct hpet_base {
1: -	unsigned int nr_channels;
1: -	unsigned int nr_clockevents;
1: -	unsigned int boot_cfg;
1: -	struct hpet_channel___2 *channels;
1: +  unsigned int nr_channels;
1: +  unsigned int nr_clockevents;
1: +  unsigned int boot_cfg;
1: +  struct hpet_channel___2 *channels;
1:  };
1:  
1:  union hpet_lock {
1: -	struct {
1: -		arch_spinlock_t lock;
1: -		u32 value;
1: -	};
1: -	u64 lockval;
1: +  struct {
1: +    arch_spinlock_t lock;
1: +    u32 value;
1: +  };
1: +  u64 lockval;
1:  };
1:  
1:  struct amd_nb_bus_dev_range {
1: -	u8 bus;
1: -	u8 dev_base;
1: -	u8 dev_limit;
1: +  u8 bus;
1: +  u8 dev_base;
1: +  u8 dev_limit;
1:  };
1:  
1:  struct amd_northbridge_info {
1: -	u16 num;
1: -	u64 flags;
1: -	struct amd_northbridge *nb;
1: +  u16 num;
1: +  u64 flags;
1: +  struct amd_northbridge *nb;
1:  };
1:  
1:  struct property_entry;
1:  
1:  struct platform_device_info {
1: -	struct device *parent;
1: -	struct fwnode_handle *fwnode;
1: -	bool of_node_reused;
1: -	const char *name;
1: -	int id;
1: -	const struct resource *res;
1: -	unsigned int num_res;
1: -	const void *data;
1: -	size_t size_data;
1: -	u64 dma_mask;
1: -	const struct property_entry *properties;
1: +  struct device *parent;
1: +  struct fwnode_handle *fwnode;
1: +  bool of_node_reused;
1: +  const char *name;
1: +  int id;
1: +  const struct resource *res;
1: +  unsigned int num_res;
1: +  const void *data;
1: +  size_t size_data;
1: +  u64 dma_mask;
1: +  const struct property_entry *properties;
1:  };
1:  
1:  enum dev_prop_type {
1: -	DEV_PROP_U8 = 0,
1: -	DEV_PROP_U16 = 1,
1: -	DEV_PROP_U32 = 2,
1: -	DEV_PROP_U64 = 3,
1: -	DEV_PROP_STRING = 4,
1: -	DEV_PROP_REF = 5,
1: +  DEV_PROP_U8 = 0,
1: +  DEV_PROP_U16 = 1,
1: +  DEV_PROP_U32 = 2,
1: +  DEV_PROP_U64 = 3,
1: +  DEV_PROP_STRING = 4,
1: +  DEV_PROP_REF = 5,
1:  };
1:  
1:  struct property_entry {
1: -	const char *name;
1: -	size_t length;
1: -	bool is_inline;
1: -	enum dev_prop_type type;
1: -	union {
1: -		const void *pointer;
1: -		union {
1: -			u8 u8_data[8];
1: -			u16 u16_data[4];
1: -			u32 u32_data[2];
1: -			u64 u64_data[1];
1: -			const char *str[1];
1: -		} value;
1: -	};
1: +  const char *name;
1: +  size_t length;
1: +  bool is_inline;
1: +  enum dev_prop_type type;
1: +  union {
1: +    const void *pointer;
1: +    union {
1: +      u8 u8_data[8];
1: +      u16 u16_data[4];
1: +      u32 u32_data[2];
1: +      u64 u64_data[1];
1: +      const char *str[1];
1: +    } value;
1: +  };
1:  };
1:  
1:  enum swiotlb_force {
1: -	SWIOTLB_NORMAL = 0,
1: -	SWIOTLB_FORCE = 1,
1: -	SWIOTLB_NO_FORCE = 2,
1: +  SWIOTLB_NORMAL = 0,
1: +  SWIOTLB_FORCE = 1,
1: +  SWIOTLB_NO_FORCE = 2,
1:  };
1:  
1:  struct uprobe_xol_ops;
1:  
1:  struct arch_uprobe {
1: -	union {
1: -		u8 insn[16];
1: -		u8 ixol[16];
1: -	};
1: -	const struct uprobe_xol_ops *ops;
1: -	union {
1: -		struct {
1: -			s32 offs;
1: -			u8 ilen;
1: -			u8 opc1;
1: -		} branch;
1: -		struct {
1: -			u8 fixups;
1: -			u8 ilen;
1: -		} defparam;
1: -		struct {
1: -			u8 reg_offset;
1: -			u8 ilen;
1: -		} push;
1: -	};
1: +  union {
1: +    u8 insn[16];
1: +    u8 ixol[16];
1: +  };
1: +  const struct uprobe_xol_ops *ops;
1: +  union {
1: +    struct {
1: +      s32 offs;
1: +      u8 ilen;
1: +      u8 opc1;
1: +    } branch;
1: +    struct {
1: +      u8 fixups;
1: +      u8 ilen;
1: +    } defparam;
1: +    struct {
1: +      u8 reg_offset;
1: +      u8 ilen;
1: +    } push;
1: +  };
1:  };
1:  
1:  struct uprobe_xol_ops {
1: -	bool (*emulate)(struct arch_uprobe *, struct pt_regs *);
1: -	int (*pre_xol)(struct arch_uprobe *, struct pt_regs *);
1: -	int (*post_xol)(struct arch_uprobe *, struct pt_regs *);
1: -	void (*abort)(struct arch_uprobe *, struct pt_regs *);
1: +  bool (*emulate)(struct arch_uprobe *, struct pt_regs *);
1: +  int (*pre_xol)(struct arch_uprobe *, struct pt_regs *);
1: +  int (*post_xol)(struct arch_uprobe *, struct pt_regs *);
1: +  void (*abort)(struct arch_uprobe *, struct pt_regs *);
1:  };
1:  
1:  enum rp_check {
1: -	RP_CHECK_CALL = 0,
1: -	RP_CHECK_CHAIN_CALL = 1,
1: -	RP_CHECK_RET = 2,
1: +  RP_CHECK_CALL = 0,
1: +  RP_CHECK_CHAIN_CALL = 1,
1: +  RP_CHECK_RET = 2,
1:  };
1:  
1:  struct simplefb_platform_data {
1: -	u32 width;
1: -	u32 height;
1: -	u32 stride;
1: -	const char *format;
1: -};
1: -
1: -enum {
1: -	M_I17 = 0,
1: -	M_I20 = 1,
1: -	M_I20_SR = 2,
1: -	M_I24 = 3,
1: -	M_I24_8_1 = 4,
1: -	M_I24_10_1 = 5,
1: -	M_I27_11_1 = 6,
1: -	M_MINI = 7,
1: -	M_MINI_3_1 = 8,
1: -	M_MINI_4_1 = 9,
1: -	M_MB = 10,
1: -	M_MB_2 = 11,
1: -	M_MB_3 = 12,
1: -	M_MB_5_1 = 13,
1: -	M_MB_6_1 = 14,
1: -	M_MB_7_1 = 15,
1: -	M_MB_SR = 16,
1: -	M_MBA = 17,
1: -	M_MBA_3 = 18,
1: -	M_MBP = 19,
1: -	M_MBP_2 = 20,
1: -	M_MBP_2_2 = 21,
1: -	M_MBP_SR = 22,
1: -	M_MBP_4 = 23,
1: -	M_MBP_5_1 = 24,
1: -	M_MBP_5_2 = 25,
1: -	M_MBP_5_3 = 26,
1: -	M_MBP_6_1 = 27,
1: -	M_MBP_6_2 = 28,
1: -	M_MBP_7_1 = 29,
1: -	M_MBP_8_2 = 30,
1: -	M_UNKNOWN = 31,
1: +  u32 width;
1: +  u32 height;
1: +  u32 stride;
1: +  const char *format;
1: +};
1: +
1: +enum {
1: +  M_I17 = 0,
1: +  M_I20 = 1,
1: +  M_I20_SR = 2,
1: +  M_I24 = 3,
1: +  M_I24_8_1 = 4,
1: +  M_I24_10_1 = 5,
1: +  M_I27_11_1 = 6,
1: +  M_MINI = 7,
1: +  M_MINI_3_1 = 8,
1: +  M_MINI_4_1 = 9,
1: +  M_MB = 10,
1: +  M_MB_2 = 11,
1: +  M_MB_3 = 12,
1: +  M_MB_5_1 = 13,
1: +  M_MB_6_1 = 14,
1: +  M_MB_7_1 = 15,
1: +  M_MB_SR = 16,
1: +  M_MBA = 17,
1: +  M_MBA_3 = 18,
1: +  M_MBP = 19,
1: +  M_MBP_2 = 20,
1: +  M_MBP_2_2 = 21,
1: +  M_MBP_SR = 22,
1: +  M_MBP_4 = 23,
1: +  M_MBP_5_1 = 24,
1: +  M_MBP_5_2 = 25,
1: +  M_MBP_5_3 = 26,
1: +  M_MBP_6_1 = 27,
1: +  M_MBP_6_2 = 28,
1: +  M_MBP_7_1 = 29,
1: +  M_MBP_8_2 = 30,
1: +  M_UNKNOWN = 31,
1:  };
1:  
1:  struct efifb_dmi_info {
1: -	char *optname;
1: -	long unsigned int base;
1: -	int stride;
1: -	int width;
1: -	int height;
1: -	int flags;
1: +  char *optname;
1: +  long unsigned int base;
1: +  int stride;
1: +  int width;
1: +  int height;
1: +  int flags;
1:  };
1:  
1:  enum {
1: -	OVERRIDE_NONE = 0,
1: -	OVERRIDE_BASE = 1,
1: -	OVERRIDE_STRIDE = 2,
1: -	OVERRIDE_HEIGHT = 4,
1: -	OVERRIDE_WIDTH = 8,
1: +  OVERRIDE_NONE = 0,
1: +  OVERRIDE_BASE = 1,
1: +  OVERRIDE_STRIDE = 2,
1: +  OVERRIDE_HEIGHT = 4,
1: +  OVERRIDE_WIDTH = 8,
1:  };
1:  
1:  enum perf_sample_regs_abi {
1: -	PERF_SAMPLE_REGS_ABI_NONE = 0,
1: -	PERF_SAMPLE_REGS_ABI_32 = 1,
1: -	PERF_SAMPLE_REGS_ABI_64 = 2,
1: +  PERF_SAMPLE_REGS_ABI_NONE = 0,
1: +  PERF_SAMPLE_REGS_ABI_32 = 1,
1: +  PERF_SAMPLE_REGS_ABI_64 = 2,
1:  };
1:  
1:  struct __va_list_tag {
1: -	unsigned int gp_offset;
1: -	unsigned int fp_offset;
1: -	void *overflow_arg_area;
1: -	void *reg_save_area;
1: +  unsigned int gp_offset;
1: +  unsigned int fp_offset;
1: +  void *overflow_arg_area;
1: +  void *reg_save_area;
1:  };
1:  
1:  typedef __builtin_va_list __gnuc_va_list;
1: @@ -23674,108 +23858,108 @@ typedef __builtin_va_list __gnuc_va_list;
1:  typedef __gnuc_va_list va_list;
1:  
1:  struct va_format {
1: -	const char *fmt;
1: -	va_list *va;
1: +  const char *fmt;
1: +  va_list *va;
1:  };
1:  
1:  enum chipset_type {
1: -	NOT_SUPPORTED = 0,
1: -	SUPPORTED = 1,
1: +  NOT_SUPPORTED = 0,
1: +  SUPPORTED = 1,
1:  };
1:  
1:  struct agp_version {
1: -	u16 major;
1: -	u16 minor;
1: +  u16 major;
1: +  u16 minor;
1:  };
1:  
1:  struct agp_kern_info {
1: -	struct agp_version version;
1: -	struct pci_dev *device;
1: -	enum chipset_type chipset;
1: -	long unsigned int mode;
1: -	long unsigned int aper_base;
1: -	size_t aper_size;
1: -	int max_memory;
1: -	int current_memory;
1: -	bool cant_use_aperture;
1: -	long unsigned int page_mask;
1: -	const struct vm_operations_struct *vm_ops;
1: +  struct agp_version version;
1: +  struct pci_dev *device;
1: +  enum chipset_type chipset;
1: +  long unsigned int mode;
1: +  long unsigned int aper_base;
1: +  size_t aper_size;
1: +  int max_memory;
1: +  int current_memory;
1: +  bool cant_use_aperture;
1: +  long unsigned int page_mask;
1: +  const struct vm_operations_struct *vm_ops;
1:  };
1:  
1:  struct agp_bridge_data;
1:  
1:  struct pci_hostbridge_probe {
1: -	u32 bus;
1: -	u32 slot;
1: -	u32 vendor;
1: -	u32 device;
1: +  u32 bus;
1: +  u32 slot;
1: +  u32 vendor;
1: +  u32 device;
1:  };
1:  
1:  typedef u16 uint16_t;
1:  
1:  enum pg_level {
1: -	PG_LEVEL_NONE = 0,
1: -	PG_LEVEL_4K = 1,
1: -	PG_LEVEL_2M = 2,
1: -	PG_LEVEL_1G = 3,
1: -	PG_LEVEL_512G = 4,
1: -	PG_LEVEL_NUM = 5,
1: +  PG_LEVEL_NONE = 0,
1: +  PG_LEVEL_4K = 1,
1: +  PG_LEVEL_2M = 2,
1: +  PG_LEVEL_1G = 3,
1: +  PG_LEVEL_512G = 4,
1: +  PG_LEVEL_NUM = 5,
1:  };
1:  
1:  struct trace_print_flags {
1: -	long unsigned int mask;
1: -	const char *name;
1: +  long unsigned int mask;
1: +  const char *name;
1:  };
1:  
1:  enum tlb_flush_reason {
1: -	TLB_FLUSH_ON_TASK_SWITCH = 0,
1: -	TLB_REMOTE_SHOOTDOWN = 1,
1: -	TLB_LOCAL_SHOOTDOWN = 2,
1: -	TLB_LOCAL_MM_SHOOTDOWN = 3,
1: -	TLB_REMOTE_SEND_IPI = 4,
1: -	NR_TLB_FLUSH_REASONS = 5,
1: +  TLB_FLUSH_ON_TASK_SWITCH = 0,
1: +  TLB_REMOTE_SHOOTDOWN = 1,
1: +  TLB_LOCAL_SHOOTDOWN = 2,
1: +  TLB_LOCAL_MM_SHOOTDOWN = 3,
1: +  TLB_REMOTE_SEND_IPI = 4,
1: +  NR_TLB_FLUSH_REASONS = 5,
1:  };
1:  
1:  enum {
1: -	REGION_INTERSECTS = 0,
1: -	REGION_DISJOINT = 1,
1: -	REGION_MIXED = 2,
1: +  REGION_INTERSECTS = 0,
1: +  REGION_DISJOINT = 1,
1: +  REGION_MIXED = 2,
1:  };
1:  
1:  enum memblock_flags {
1: -	MEMBLOCK_NONE = 0,
1: -	MEMBLOCK_HOTPLUG = 1,
1: -	MEMBLOCK_MIRROR = 2,
1: -	MEMBLOCK_NOMAP = 4,
1: +  MEMBLOCK_NONE = 0,
1: +  MEMBLOCK_HOTPLUG = 1,
1: +  MEMBLOCK_MIRROR = 2,
1: +  MEMBLOCK_NOMAP = 4,
1:  };
1:  
1:  struct memblock_region {
1: -	phys_addr_t base;
1: -	phys_addr_t size;
1: -	enum memblock_flags flags;
1: -	int nid;
1: +  phys_addr_t base;
1: +  phys_addr_t size;
1: +  enum memblock_flags flags;
1: +  int nid;
1:  };
1:  
1:  struct memblock_type {
1: -	long unsigned int cnt;
1: -	long unsigned int max;
1: -	phys_addr_t total_size;
1: -	struct memblock_region *regions;
1: -	char *name;
1: +  long unsigned int cnt;
1: +  long unsigned int max;
1: +  phys_addr_t total_size;
1: +  struct memblock_region *regions;
1: +  char *name;
1:  };
1:  
1:  struct memblock {
1: -	bool bottom_up;
1: -	phys_addr_t current_limit;
1: -	struct memblock_type memory;
1: -	struct memblock_type reserved;
1: +  bool bottom_up;
1: +  phys_addr_t current_limit;
1: +  struct memblock_type memory;
1: +  struct memblock_type reserved;
1:  };
1:  
1:  struct trace_event_raw_tlb_flush {
1: -	struct trace_entry ent;
1: -	int reason;
1: -	long unsigned int pages;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int reason;
1: +  long unsigned int pages;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_tlb_flush {};
1: @@ -23783,427 +23967,430 @@ struct trace_event_data_offsets_tlb_flush {};
1:  typedef void (*btf_trace_tlb_flush)(void *, int, long unsigned int);
1:  
1:  struct map_range {
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	unsigned int page_size_mask;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  unsigned int page_size_mask;
1:  };
1:  
1:  struct mem_section_usage {
1: -	long unsigned int subsection_map[1];
1: -	long unsigned int pageblock_flags[0];
1: +  long unsigned int subsection_map[1];
1: +  long unsigned int pageblock_flags[0];
1:  };
1:  
1:  struct mem_section {
1: -	long unsigned int section_mem_map;
1: -	struct mem_section_usage *usage;
1: +  long unsigned int section_mem_map;
1: +  struct mem_section_usage *usage;
1:  };
1:  
1:  enum kcore_type {
1: -	KCORE_TEXT = 0,
1: -	KCORE_VMALLOC = 1,
1: -	KCORE_RAM = 2,
1: -	KCORE_VMEMMAP = 3,
1: -	KCORE_USER = 4,
1: -	KCORE_OTHER = 5,
1: -	KCORE_REMAP = 6,
1: +  KCORE_TEXT = 0,
1: +  KCORE_VMALLOC = 1,
1: +  KCORE_RAM = 2,
1: +  KCORE_VMEMMAP = 3,
1: +  KCORE_USER = 4,
1: +  KCORE_OTHER = 5,
1: +  KCORE_REMAP = 6,
1:  };
1:  
1:  struct kcore_list {
1: -	struct list_head list;
1: -	long unsigned int addr;
1: -	long unsigned int vaddr;
1: -	size_t size;
1: -	int type;
1: +  struct list_head list;
1: +  long unsigned int addr;
1: +  long unsigned int vaddr;
1: +  size_t size;
1: +  int type;
1:  };
1:  
1:  struct hstate {
1: -	int next_nid_to_alloc;
1: -	int next_nid_to_free;
1: -	unsigned int order;
1: -	long unsigned int mask;
1: -	long unsigned int max_huge_pages;
1: -	long unsigned int nr_huge_pages;
1: -	long unsigned int free_huge_pages;
1: -	long unsigned int resv_huge_pages;
1: -	long unsigned int surplus_huge_pages;
1: -	long unsigned int nr_overcommit_huge_pages;
1: -	struct list_head hugepage_activelist;
1: -	struct list_head hugepage_freelists[64];
1: -	unsigned int nr_huge_pages_node[64];
1: -	unsigned int free_huge_pages_node[64];
1: -	unsigned int surplus_huge_pages_node[64];
1: -	struct cftype cgroup_files_dfl[7];
1: -	struct cftype cgroup_files_legacy[9];
1: -	char name[32];
1: +  int next_nid_to_alloc;
1: +  int next_nid_to_free;
1: +  unsigned int order;
1: +  long unsigned int mask;
1: +  long unsigned int max_huge_pages;
1: +  long unsigned int nr_huge_pages;
1: +  long unsigned int free_huge_pages;
1: +  long unsigned int resv_huge_pages;
1: +  long unsigned int surplus_huge_pages;
1: +  long unsigned int nr_overcommit_huge_pages;
1: +  struct list_head hugepage_activelist;
1: +  struct list_head hugepage_freelists[64];
1: +  unsigned int nr_huge_pages_node[64];
1: +  unsigned int free_huge_pages_node[64];
1: +  unsigned int surplus_huge_pages_node[64];
1: +  struct cftype cgroup_files_dfl[7];
1: +  struct cftype cgroup_files_legacy[9];
1: +  char name[32];
1:  };
1:  
1:  struct trace_event_raw_x86_exceptions {
1: -	struct trace_entry ent;
1: -	long unsigned int address;
1: -	long unsigned int ip;
1: -	long unsigned int error_code;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int address;
1: +  long unsigned int ip;
1: +  long unsigned int error_code;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_x86_exceptions {};
1:  
1: -typedef void (*btf_trace_page_fault_user)(void *, long unsigned int, struct pt_regs *, long unsigned int);
1: +typedef void (*btf_trace_page_fault_user)(void *, long unsigned int,
1: +                                          struct pt_regs *, long unsigned int);
1:  
1: -typedef void (*btf_trace_page_fault_kernel)(void *, long unsigned int, struct pt_regs *, long unsigned int);
1: +typedef void (*btf_trace_page_fault_kernel)(void *, long unsigned int,
1: +                                            struct pt_regs *,
1: +                                            long unsigned int);
1:  
1:  enum {
1: -	IORES_MAP_SYSTEM_RAM = 1,
1: -	IORES_MAP_ENCRYPTED = 2,
1: +  IORES_MAP_SYSTEM_RAM = 1,
1: +  IORES_MAP_ENCRYPTED = 2,
1:  };
1:  
1:  struct ioremap_desc {
1: -	unsigned int flags;
1: +  unsigned int flags;
1:  };
1:  
1: -typedef bool (*ex_handler_t)(const struct exception_table_entry *, struct pt_regs *, int, long unsigned int, long unsigned int);
1: +typedef bool (*ex_handler_t)(const struct exception_table_entry *,
1: +                             struct pt_regs *, int, long unsigned int,
1: +                             long unsigned int);
1:  
1:  struct hugepage_subpool {
1: -	spinlock_t lock;
1: -	long int count;
1: -	long int max_hpages;
1: -	long int used_hpages;
1: -	struct hstate *hstate;
1: -	long int min_hpages;
1: -	long int rsv_hpages;
1: +  spinlock_t lock;
1: +  long int count;
1: +  long int max_hpages;
1: +  long int used_hpages;
1: +  struct hstate *hstate;
1: +  long int min_hpages;
1: +  long int rsv_hpages;
1:  };
1:  
1:  struct hugetlbfs_sb_info {
1: -	long int max_inodes;
1: -	long int free_inodes;
1: -	spinlock_t stat_lock;
1: -	struct hstate *hstate;
1: -	struct hugepage_subpool *spool;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	umode_t mode;
1: +  long int max_inodes;
1: +  long int free_inodes;
1: +  spinlock_t stat_lock;
1: +  struct hstate *hstate;
1: +  struct hugepage_subpool *spool;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  umode_t mode;
1:  };
1:  
1:  struct flush_tlb_info {
1: -	struct mm_struct *mm;
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	u64 new_tlb_gen;
1: -	unsigned int stride_shift;
1: -	bool freed_tables;
1: +  struct mm_struct *mm;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  u64 new_tlb_gen;
1: +  unsigned int stride_shift;
1: +  bool freed_tables;
1:  };
1:  
1:  struct entry_stack_page {
1: -	struct entry_stack stack;
1: +  struct entry_stack stack;
1:  };
1:  
1:  struct debug_store_buffers {
1: -	char bts_buffer[65536];
1: -	char pebs_buffer[65536];
1: +  char bts_buffer[65536];
1: +  char pebs_buffer[65536];
1:  };
1:  
1:  struct exception_stacks {
1: -	char DF_stack_guard[0];
1: -	char DF_stack[4096];
1: -	char NMI_stack_guard[0];
1: -	char NMI_stack[4096];
1: -	char DB_stack_guard[0];
1: -	char DB_stack[4096];
1: -	char MCE_stack_guard[0];
1: -	char MCE_stack[4096];
1: -	char VC_stack_guard[0];
1: -	char VC_stack[0];
1: -	char VC2_stack_guard[0];
1: -	char VC2_stack[0];
1: -	char IST_top_guard[0];
1: +  char DF_stack_guard[0];
1: +  char DF_stack[4096];
1: +  char NMI_stack_guard[0];
1: +  char NMI_stack[4096];
1: +  char DB_stack_guard[0];
1: +  char DB_stack[4096];
1: +  char MCE_stack_guard[0];
1: +  char MCE_stack[4096];
1: +  char VC_stack_guard[0];
1: +  char VC_stack[0];
1: +  char VC2_stack_guard[0];
1: +  char VC2_stack[0];
1: +  char IST_top_guard[0];
1:  };
1:  
1:  struct cpu_entry_area {
1: -	char gdt[4096];
1: -	struct entry_stack_page entry_stack_page;
1: -	struct tss_struct tss;
1: -	struct cea_exception_stacks estacks;
1: -	struct debug_store cpu_debug_store;
1: -	struct debug_store_buffers cpu_debug_buffers;
1: +  char gdt[4096];
1: +  struct entry_stack_page entry_stack_page;
1: +  struct tss_struct tss;
1: +  struct cea_exception_stacks estacks;
1: +  struct debug_store cpu_debug_store;
1: +  struct debug_store_buffers cpu_debug_buffers;
1:  };
1:  
1:  struct cpa_data {
1: -	long unsigned int *vaddr;
1: -	pgd_t *pgd;
1: -	pgprot_t mask_set;
1: -	pgprot_t mask_clr;
1: -	long unsigned int numpages;
1: -	long unsigned int curpage;
1: -	long unsigned int pfn;
1: -	unsigned int flags;
1: -	unsigned int force_split: 1;
1: -	unsigned int force_static_prot: 1;
1: -	unsigned int force_flush_all: 1;
1: -	struct page **pages;
1: +  long unsigned int *vaddr;
1: +  pgd_t *pgd;
1: +  pgprot_t mask_set;
1: +  pgprot_t mask_clr;
1: +  long unsigned int numpages;
1: +  long unsigned int curpage;
1: +  long unsigned int pfn;
1: +  unsigned int flags;
1: +  unsigned int force_split : 1;
1: +  unsigned int force_static_prot : 1;
1: +  unsigned int force_flush_all : 1;
1: +  struct page **pages;
1:  };
1:  
1:  enum cpa_warn {
1: -	CPA_CONFLICT = 0,
1: -	CPA_PROTECT = 1,
1: -	CPA_DETECT = 2,
1: +  CPA_CONFLICT = 0,
1: +  CPA_PROTECT = 1,
1: +  CPA_DETECT = 2,
1:  };
1:  
1: -typedef struct {
1: -	u64 val;
1: -} pfn_t;
1: +typedef struct { u64 val; } pfn_t;
1:  
1:  struct memtype {
1: -	u64 start;
1: -	u64 end;
1: -	u64 subtree_max_end;
1: -	enum page_cache_mode type;
1: -	struct rb_node rb;
1: +  u64 start;
1: +  u64 end;
1: +  u64 subtree_max_end;
1: +  enum page_cache_mode type;
1: +  struct rb_node rb;
1:  };
1:  
1:  enum {
1: -	PAT_UC = 0,
1: -	PAT_WC = 1,
1: -	PAT_WT = 4,
1: -	PAT_WP = 5,
1: -	PAT_WB = 6,
1: -	PAT_UC_MINUS = 7,
1: +  PAT_UC = 0,
1: +  PAT_WC = 1,
1: +  PAT_WT = 4,
1: +  PAT_WP = 5,
1: +  PAT_WB = 6,
1: +  PAT_UC_MINUS = 7,
1:  };
1:  
1:  struct pagerange_state {
1: -	long unsigned int cur_pfn;
1: -	int ram;
1: -	int not_ram;
1: +  long unsigned int cur_pfn;
1: +  int ram;
1: +  int not_ram;
1:  };
1:  
1:  struct rb_augment_callbacks {
1: -	void (*propagate)(struct rb_node *, struct rb_node *);
1: -	void (*copy)(struct rb_node *, struct rb_node *);
1: -	void (*rotate)(struct rb_node *, struct rb_node *);
1: +  void (*propagate)(struct rb_node *, struct rb_node *);
1: +  void (*copy)(struct rb_node *, struct rb_node *);
1: +  void (*rotate)(struct rb_node *, struct rb_node *);
1:  };
1:  
1:  enum {
1: -	MEMTYPE_EXACT_MATCH = 0,
1: -	MEMTYPE_END_MATCH = 1,
1: +  MEMTYPE_EXACT_MATCH = 0,
1: +  MEMTYPE_END_MATCH = 1,
1:  };
1:  
1:  struct numa_memblk {
1: -	u64 start;
1: -	u64 end;
1: -	int nid;
1: +  u64 start;
1: +  u64 end;
1: +  int nid;
1:  };
1:  
1:  struct numa_meminfo {
1: -	int nr_blks;
1: -	struct numa_memblk blk[128];
1: +  int nr_blks;
1: +  struct numa_memblk blk[128];
1:  };
1:  
1:  struct acpi_srat_cpu_affinity {
1: -	struct acpi_subtable_header header;
1: -	u8 proximity_domain_lo;
1: -	u8 apic_id;
1: -	u32 flags;
1: -	u8 local_sapic_eid;
1: -	u8 proximity_domain_hi[3];
1: -	u32 clock_domain;
1: +  struct acpi_subtable_header header;
1: +  u8 proximity_domain_lo;
1: +  u8 apic_id;
1: +  u32 flags;
1: +  u8 local_sapic_eid;
1: +  u8 proximity_domain_hi[3];
1: +  u32 clock_domain;
1:  };
1:  
1:  struct acpi_srat_x2apic_cpu_affinity {
1: -	struct acpi_subtable_header header;
1: -	u16 reserved;
1: -	u32 proximity_domain;
1: -	u32 apic_id;
1: -	u32 flags;
1: -	u32 clock_domain;
1: -	u32 reserved2;
1: +  struct acpi_subtable_header header;
1: +  u16 reserved;
1: +  u32 proximity_domain;
1: +  u32 apic_id;
1: +  u32 flags;
1: +  u32 clock_domain;
1: +  u32 reserved2;
1:  };
1:  
1:  enum uv_system_type {
1: -	UV_NONE = 0,
1: -	UV_LEGACY_APIC = 1,
1: -	UV_X2APIC = 2,
1: +  UV_NONE = 0,
1: +  UV_LEGACY_APIC = 1,
1: +  UV_X2APIC = 2,
1:  };
1:  
1:  enum pti_mode {
1: -	PTI_AUTO = 0,
1: -	PTI_FORCE_OFF = 1,
1: -	PTI_FORCE_ON = 2,
1: +  PTI_AUTO = 0,
1: +  PTI_FORCE_OFF = 1,
1: +  PTI_FORCE_ON = 2,
1:  };
1:  
1:  enum pti_clone_level {
1: -	PTI_CLONE_PMD = 0,
1: -	PTI_CLONE_PTE = 1,
1: +  PTI_CLONE_PMD = 0,
1: +  PTI_CLONE_PTE = 1,
1:  };
1:  
1:  struct sigcontext_32 {
1: -	__u16 gs;
1: -	__u16 __gsh;
1: -	__u16 fs;
1: -	__u16 __fsh;
1: -	__u16 es;
1: -	__u16 __esh;
1: -	__u16 ds;
1: -	__u16 __dsh;
1: -	__u32 di;
1: -	__u32 si;
1: -	__u32 bp;
1: -	__u32 sp;
1: -	__u32 bx;
1: -	__u32 dx;
1: -	__u32 cx;
1: -	__u32 ax;
1: -	__u32 trapno;
1: -	__u32 err;
1: -	__u32 ip;
1: -	__u16 cs;
1: -	__u16 __csh;
1: -	__u32 flags;
1: -	__u32 sp_at_signal;
1: -	__u16 ss;
1: -	__u16 __ssh;
1: -	__u32 fpstate;
1: -	__u32 oldmask;
1: -	__u32 cr2;
1: +  __u16 gs;
1: +  __u16 __gsh;
1: +  __u16 fs;
1: +  __u16 __fsh;
1: +  __u16 es;
1: +  __u16 __esh;
1: +  __u16 ds;
1: +  __u16 __dsh;
1: +  __u32 di;
1: +  __u32 si;
1: +  __u32 bp;
1: +  __u32 sp;
1: +  __u32 bx;
1: +  __u32 dx;
1: +  __u32 cx;
1: +  __u32 ax;
1: +  __u32 trapno;
1: +  __u32 err;
1: +  __u32 ip;
1: +  __u16 cs;
1: +  __u16 __csh;
1: +  __u32 flags;
1: +  __u32 sp_at_signal;
1: +  __u16 ss;
1: +  __u16 __ssh;
1: +  __u32 fpstate;
1: +  __u32 oldmask;
1: +  __u32 cr2;
1:  };
1:  
1:  typedef u32 compat_size_t;
1:  
1:  struct compat_sigaltstack {
1: -	compat_uptr_t ss_sp;
1: -	int ss_flags;
1: -	compat_size_t ss_size;
1: +  compat_uptr_t ss_sp;
1: +  int ss_flags;
1: +  compat_size_t ss_size;
1:  };
1:  
1:  typedef struct compat_sigaltstack compat_stack_t;
1:  
1:  struct ucontext_ia32 {
1: -	unsigned int uc_flags;
1: -	unsigned int uc_link;
1: -	compat_stack_t uc_stack;
1: -	struct sigcontext_32 uc_mcontext;
1: -	compat_sigset_t uc_sigmask;
1: +  unsigned int uc_flags;
1: +  unsigned int uc_link;
1: +  compat_stack_t uc_stack;
1: +  struct sigcontext_32 uc_mcontext;
1: +  compat_sigset_t uc_sigmask;
1:  };
1:  
1:  struct sigframe_ia32 {
1: -	u32 pretcode;
1: -	int sig;
1: -	struct sigcontext_32 sc;
1: -	struct _fpstate_32 fpstate_unused;
1: -	unsigned int extramask[1];
1: -	char retcode[8];
1: +  u32 pretcode;
1: +  int sig;
1: +  struct sigcontext_32 sc;
1: +  struct _fpstate_32 fpstate_unused;
1: +  unsigned int extramask[1];
1: +  char retcode[8];
1:  };
1:  
1:  struct rt_sigframe_ia32 {
1: -	u32 pretcode;
1: -	int sig;
1: -	u32 pinfo;
1: -	u32 puc;
1: -	compat_siginfo_t info;
1: -	struct ucontext_ia32 uc;
1: -	char retcode[8];
1: +  u32 pretcode;
1: +  int sig;
1: +  u32 pinfo;
1: +  u32 puc;
1: +  compat_siginfo_t info;
1: +  struct ucontext_ia32 uc;
1: +  char retcode[8];
1:  };
1:  
1:  typedef struct {
1: -	efi_guid_t guid;
1: -	u64 table;
1: +  efi_guid_t guid;
1: +  u64 table;
1:  } efi_config_table_64_t;
1:  
1:  struct efi_memory_map_data {
1: -	phys_addr_t phys_map;
1: -	long unsigned int size;
1: -	long unsigned int desc_version;
1: -	long unsigned int desc_size;
1: -	long unsigned int flags;
1: +  phys_addr_t phys_map;
1: +  long unsigned int size;
1: +  long unsigned int desc_version;
1: +  long unsigned int desc_size;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct efi_mem_range {
1: -	struct range range;
1: -	u64 attribute;
1: +  struct range range;
1: +  u64 attribute;
1:  };
1:  
1:  enum efi_rts_ids {
1: -	EFI_NONE = 0,
1: -	EFI_GET_TIME = 1,
1: -	EFI_SET_TIME = 2,
1: -	EFI_GET_WAKEUP_TIME = 3,
1: -	EFI_SET_WAKEUP_TIME = 4,
1: -	EFI_GET_VARIABLE = 5,
1: -	EFI_GET_NEXT_VARIABLE = 6,
1: -	EFI_SET_VARIABLE = 7,
1: -	EFI_QUERY_VARIABLE_INFO = 8,
1: -	EFI_GET_NEXT_HIGH_MONO_COUNT = 9,
1: -	EFI_RESET_SYSTEM = 10,
1: -	EFI_UPDATE_CAPSULE = 11,
1: -	EFI_QUERY_CAPSULE_CAPS = 12,
1: +  EFI_NONE = 0,
1: +  EFI_GET_TIME = 1,
1: +  EFI_SET_TIME = 2,
1: +  EFI_GET_WAKEUP_TIME = 3,
1: +  EFI_SET_WAKEUP_TIME = 4,
1: +  EFI_GET_VARIABLE = 5,
1: +  EFI_GET_NEXT_VARIABLE = 6,
1: +  EFI_SET_VARIABLE = 7,
1: +  EFI_QUERY_VARIABLE_INFO = 8,
1: +  EFI_GET_NEXT_HIGH_MONO_COUNT = 9,
1: +  EFI_RESET_SYSTEM = 10,
1: +  EFI_UPDATE_CAPSULE = 11,
1: +  EFI_QUERY_CAPSULE_CAPS = 12,
1:  };
1:  
1:  struct efi_runtime_work {
1: -	void *arg1;
1: -	void *arg2;
1: -	void *arg3;
1: -	void *arg4;
1: -	void *arg5;
1: -	efi_status_t status;
1: -	struct work_struct work;
1: -	enum efi_rts_ids efi_rts_id;
1: -	struct completion efi_rts_comp;
1: +  void *arg1;
1: +  void *arg2;
1: +  void *arg3;
1: +  void *arg4;
1: +  void *arg5;
1: +  efi_status_t status;
1: +  struct work_struct work;
1: +  enum efi_rts_ids efi_rts_id;
1: +  struct completion efi_rts_comp;
1:  };
1:  
1:  struct efi_scratch {
1: -	u64 phys_stack;
1: -	struct mm_struct *prev_mm;
1: +  u64 phys_stack;
1: +  struct mm_struct *prev_mm;
1:  };
1:  
1:  struct efi_setup_data {
1: -	u64 fw_vendor;
1: -	u64 __unused;
1: -	u64 tables;
1: -	u64 smbios;
1: -	u64 reserved[8];
1: +  u64 fw_vendor;
1: +  u64 __unused;
1: +  u64 tables;
1: +  u64 smbios;
1: +  u64 reserved[8];
1:  };
1:  
1:  typedef struct {
1: -	efi_guid_t guid;
1: -	long unsigned int *ptr;
1: -	const char name[16];
1: +  efi_guid_t guid;
1: +  long unsigned int *ptr;
1: +  const char name[16];
1:  } efi_config_table_type_t;
1:  
1:  typedef struct {
1: -	efi_table_hdr_t hdr;
1: -	u64 fw_vendor;
1: -	u32 fw_revision;
1: -	u32 __pad1;
1: -	u64 con_in_handle;
1: -	u64 con_in;
1: -	u64 con_out_handle;
1: -	u64 con_out;
1: -	u64 stderr_handle;
1: -	u64 stderr;
1: -	u64 runtime;
1: -	u64 boottime;
1: -	u32 nr_tables;
1: -	u32 __pad2;
1: -	u64 tables;
1: +  efi_table_hdr_t hdr;
1: +  u64 fw_vendor;
1: +  u32 fw_revision;
1: +  u32 __pad1;
1: +  u64 con_in_handle;
1: +  u64 con_in;
1: +  u64 con_out_handle;
1: +  u64 con_out;
1: +  u64 stderr_handle;
1: +  u64 stderr;
1: +  u64 runtime;
1: +  u64 boottime;
1: +  u32 nr_tables;
1: +  u32 __pad2;
1: +  u64 tables;
1:  } efi_system_table_64_t;
1:  
1:  typedef struct {
1: -	efi_table_hdr_t hdr;
1: -	u32 fw_vendor;
1: -	u32 fw_revision;
1: -	u32 con_in_handle;
1: -	u32 con_in;
1: -	u32 con_out_handle;
1: -	u32 con_out;
1: -	u32 stderr_handle;
1: -	u32 stderr;
1: -	u32 runtime;
1: -	u32 boottime;
1: -	u32 nr_tables;
1: -	u32 tables;
1: +  efi_table_hdr_t hdr;
1: +  u32 fw_vendor;
1: +  u32 fw_revision;
1: +  u32 con_in_handle;
1: +  u32 con_in;
1: +  u32 con_out_handle;
1: +  u32 con_out;
1: +  u32 stderr_handle;
1: +  u32 stderr;
1: +  u32 runtime;
1: +  u32 boottime;
1: +  u32 nr_tables;
1: +  u32 tables;
1:  } efi_system_table_32_t;
1:  
1:  typedef struct {
1: -	u32 version;
1: -	u32 length;
1: -	u64 memory_protection_attribute;
1: +  u32 version;
1: +  u32 length;
1: +  u64 memory_protection_attribute;
1:  } efi_properties_table_t;
1:  
1:  union efi_boot_services;
1: @@ -24219,330 +24406,332 @@ union efi_simple_text_output_protocol;
1:  typedef union efi_simple_text_output_protocol efi_simple_text_output_protocol_t;
1:  
1:  typedef union {
1: -	struct {
1: -		efi_table_hdr_t hdr;
1: -		long unsigned int fw_vendor;
1: -		u32 fw_revision;
1: -		long unsigned int con_in_handle;
1: -		efi_simple_text_input_protocol_t *con_in;
1: -		long unsigned int con_out_handle;
1: -		efi_simple_text_output_protocol_t *con_out;
1: -		long unsigned int stderr_handle;
1: -		long unsigned int stderr;
1: -		efi_runtime_services_t *runtime;
1: -		efi_boot_services_t *boottime;
1: -		long unsigned int nr_tables;
1: -		long unsigned int tables;
1: -	};
1: -	efi_system_table_32_t mixed_mode;
1: +  struct {
1: +    efi_table_hdr_t hdr;
1: +    long unsigned int fw_vendor;
1: +    u32 fw_revision;
1: +    long unsigned int con_in_handle;
1: +    efi_simple_text_input_protocol_t *con_in;
1: +    long unsigned int con_out_handle;
1: +    efi_simple_text_output_protocol_t *con_out;
1: +    long unsigned int stderr_handle;
1: +    long unsigned int stderr;
1: +    efi_runtime_services_t *runtime;
1: +    efi_boot_services_t *boottime;
1: +    long unsigned int nr_tables;
1: +    long unsigned int tables;
1: +  };
1: +  efi_system_table_32_t mixed_mode;
1:  } efi_system_table_t;
1:  
1:  enum {
1: -	BPF_REG_0 = 0,
1: -	BPF_REG_1 = 1,
1: -	BPF_REG_2 = 2,
1: -	BPF_REG_3 = 3,
1: -	BPF_REG_4 = 4,
1: -	BPF_REG_5 = 5,
1: -	BPF_REG_6 = 6,
1: -	BPF_REG_7 = 7,
1: -	BPF_REG_8 = 8,
1: -	BPF_REG_9 = 9,
1: -	BPF_REG_10 = 10,
1: -	__MAX_BPF_REG = 11,
1: +  BPF_REG_0 = 0,
1: +  BPF_REG_1 = 1,
1: +  BPF_REG_2 = 2,
1: +  BPF_REG_3 = 3,
1: +  BPF_REG_4 = 4,
1: +  BPF_REG_5 = 5,
1: +  BPF_REG_6 = 6,
1: +  BPF_REG_7 = 7,
1: +  BPF_REG_8 = 8,
1: +  BPF_REG_9 = 9,
1: +  BPF_REG_10 = 10,
1: +  __MAX_BPF_REG = 11,
1:  };
1:  
1:  struct bpf_tramp_progs {
1: -	struct bpf_prog *progs[40];
1: -	int nr_progs;
1: +  struct bpf_prog *progs[40];
1: +  int nr_progs;
1:  };
1:  
1:  enum bpf_jit_poke_reason {
1: -	BPF_POKE_REASON_TAIL_CALL = 0,
1: +  BPF_POKE_REASON_TAIL_CALL = 0,
1:  };
1:  
1:  struct bpf_array_aux {
1: -	enum bpf_prog_type type;
1: -	bool jited;
1: -	struct list_head poke_progs;
1: -	struct bpf_map *map;
1: -	struct mutex poke_mutex;
1: -	struct work_struct work;
1: +  enum bpf_prog_type type;
1: +  bool jited;
1: +  struct list_head poke_progs;
1: +  struct bpf_map *map;
1: +  struct mutex poke_mutex;
1: +  struct work_struct work;
1:  };
1:  
1:  struct bpf_array {
1: -	struct bpf_map map;
1: -	u32 elem_size;
1: -	u32 index_mask;
1: -	struct bpf_array_aux *aux;
1: -	union {
1: -		char value[0];
1: -		void *ptrs[0];
1: -		void *pptrs[0];
1: -	};
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  u32 elem_size;
1: +  u32 index_mask;
1: +  struct bpf_array_aux *aux;
1: +  union {
1: +    char value[0];
1: +    void *ptrs[0];
1: +    void *pptrs[0];
1: +  };
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum bpf_text_poke_type {
1: -	BPF_MOD_CALL = 0,
1: -	BPF_MOD_JUMP = 1,
1: +  BPF_MOD_CALL = 0,
1: +  BPF_MOD_JUMP = 1,
1:  };
1:  
1:  struct bpf_binary_header {
1: -	u32 pages;
1: -	int: 32;
1: -	u8 image[0];
1: +  u32 pages;
1: +  int : 32;
1: +  u8 image[0];
1:  };
1:  
1:  struct jit_context {
1: -	int cleanup_addr;
1: +  int cleanup_addr;
1:  };
1:  
1:  struct x64_jit_data {
1: -	struct bpf_binary_header *header;
1: -	int *addrs;
1: -	u8 *image;
1: -	int proglen;
1: -	struct jit_context ctx;
1: +  struct bpf_binary_header *header;
1: +  int *addrs;
1: +  u8 *image;
1: +  int proglen;
1: +  struct jit_context ctx;
1:  };
1:  
1:  struct static_key_true {
1: -	struct static_key key;
1: +  struct static_key key;
1:  };
1:  
1:  enum tk_offsets {
1: -	TK_OFFS_REAL = 0,
1: -	TK_OFFS_BOOT = 1,
1: -	TK_OFFS_TAI = 2,
1: -	TK_OFFS_MAX = 3,
1: +  TK_OFFS_REAL = 0,
1: +  TK_OFFS_BOOT = 1,
1: +  TK_OFFS_TAI = 2,
1: +  TK_OFFS_MAX = 3,
1:  };
1:  
1:  typedef struct pglist_data pg_data_t;
1:  
1:  struct clone_args {
1: -	__u64 flags;
1: -	__u64 pidfd;
1: -	__u64 child_tid;
1: -	__u64 parent_tid;
1: -	__u64 exit_signal;
1: -	__u64 stack;
1: -	__u64 stack_size;
1: -	__u64 tls;
1: -	__u64 set_tid;
1: -	__u64 set_tid_size;
1: -	__u64 cgroup;
1: +  __u64 flags;
1: +  __u64 pidfd;
1: +  __u64 child_tid;
1: +  __u64 parent_tid;
1: +  __u64 exit_signal;
1: +  __u64 stack;
1: +  __u64 stack_size;
1: +  __u64 tls;
1: +  __u64 set_tid;
1: +  __u64 set_tid_size;
1: +  __u64 cgroup;
1:  };
1:  
1:  struct fdtable {
1: -	unsigned int max_fds;
1: -	struct file **fd;
1: -	long unsigned int *close_on_exec;
1: -	long unsigned int *open_fds;
1: -	long unsigned int *full_fds_bits;
1: -	struct callback_head rcu;
1: +  unsigned int max_fds;
1: +  struct file **fd;
1: +  long unsigned int *close_on_exec;
1: +  long unsigned int *open_fds;
1: +  long unsigned int *full_fds_bits;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct files_struct {
1: -	atomic_t count;
1: -	bool resize_in_progress;
1: -	wait_queue_head_t resize_wait;
1: -	struct fdtable *fdt;
1: -	struct fdtable fdtab;
1: -	long: 64;
1: -	long: 64;
1: -	spinlock_t file_lock;
1: -	unsigned int next_fd;
1: -	long unsigned int close_on_exec_init[1];
1: -	long unsigned int open_fds_init[1];
1: -	long unsigned int full_fds_bits_init[1];
1: -	struct file *fd_array[64];
1: -	long: 64;
1: +  atomic_t count;
1: +  bool resize_in_progress;
1: +  wait_queue_head_t resize_wait;
1: +  struct fdtable *fdt;
1: +  struct fdtable fdtab;
1: +  long : 64;
1: +  long : 64;
1: +  spinlock_t file_lock;
1: +  unsigned int next_fd;
1: +  long unsigned int close_on_exec_init[1];
1: +  long unsigned int open_fds_init[1];
1: +  long unsigned int full_fds_bits_init[1];
1: +  struct file *fd_array[64];
1: +  long : 64;
1:  };
1:  
1:  struct io_identity {
1: -	struct files_struct *files;
1: -	struct mm_struct *mm;
1: -	struct cgroup_subsys_state *blkcg_css;
1: -	const struct cred *creds;
1: -	struct nsproxy *nsproxy;
1: -	struct fs_struct *fs;
1: -	long unsigned int fsize;
1: -	kuid_t loginuid;
1: -	unsigned int sessionid;
1: -	refcount_t count;
1: +  struct files_struct *files;
1: +  struct mm_struct *mm;
1: +  struct cgroup_subsys_state *blkcg_css;
1: +  const struct cred *creds;
1: +  struct nsproxy *nsproxy;
1: +  struct fs_struct *fs;
1: +  long unsigned int fsize;
1: +  kuid_t loginuid;
1: +  unsigned int sessionid;
1: +  refcount_t count;
1:  };
1:  
1:  struct io_uring_task {
1: -	struct xarray xa;
1: -	struct wait_queue_head wait;
1: -	struct file *last;
1: -	struct percpu_counter inflight;
1: -	struct io_identity __identity;
1: -	struct io_identity *identity;
1: -	atomic_t in_idle;
1: -	bool sqpoll;
1: +  struct xarray xa;
1: +  struct wait_queue_head wait;
1: +  struct file *last;
1: +  struct percpu_counter inflight;
1: +  struct io_identity __identity;
1: +  struct io_identity *identity;
1: +  atomic_t in_idle;
1: +  bool sqpoll;
1:  };
1:  
1:  struct robust_list {
1: -	struct robust_list *next;
1: +  struct robust_list *next;
1:  };
1:  
1:  struct robust_list_head {
1: -	struct robust_list list;
1: -	long int futex_offset;
1: -	struct robust_list *list_op_pending;
1: +  struct robust_list list;
1: +  long int futex_offset;
1: +  struct robust_list *list_op_pending;
1:  };
1:  
1:  struct multiprocess_signals {
1: -	sigset_t signal;
1: -	struct hlist_node node;
1: +  sigset_t signal;
1: +  struct hlist_node node;
1:  };
1:  
1:  typedef int (*proc_visitor)(struct task_struct *, void *);
1:  
1:  enum {
1: -	IOPRIO_CLASS_NONE = 0,
1: -	IOPRIO_CLASS_RT = 1,
1: -	IOPRIO_CLASS_BE = 2,
1: -	IOPRIO_CLASS_IDLE = 3,
1: +  IOPRIO_CLASS_NONE = 0,
1: +  IOPRIO_CLASS_RT = 1,
1: +  IOPRIO_CLASS_BE = 2,
1: +  IOPRIO_CLASS_IDLE = 3,
1:  };
1:  
1:  enum page_memcg_data_flags {
1: -	MEMCG_DATA_OBJCGS = 1,
1: -	MEMCG_DATA_KMEM = 2,
1: -	__NR_MEMCG_DATA_FLAGS = 4,
1: +  MEMCG_DATA_OBJCGS = 1,
1: +  MEMCG_DATA_KMEM = 2,
1: +  __NR_MEMCG_DATA_FLAGS = 4,
1:  };
1:  
1:  typedef struct poll_table_struct poll_table;
1:  
1:  enum {
1: -	FUTEX_STATE_OK = 0,
1: -	FUTEX_STATE_EXITING = 1,
1: -	FUTEX_STATE_DEAD = 2,
1: +  FUTEX_STATE_OK = 0,
1: +  FUTEX_STATE_EXITING = 1,
1: +  FUTEX_STATE_DEAD = 2,
1:  };
1:  
1:  enum proc_hidepid {
1: -	HIDEPID_OFF = 0,
1: -	HIDEPID_NO_ACCESS = 1,
1: -	HIDEPID_INVISIBLE = 2,
1: -	HIDEPID_NOT_PTRACEABLE = 4,
1: +  HIDEPID_OFF = 0,
1: +  HIDEPID_NO_ACCESS = 1,
1: +  HIDEPID_INVISIBLE = 2,
1: +  HIDEPID_NOT_PTRACEABLE = 4,
1:  };
1:  
1:  enum proc_pidonly {
1: -	PROC_PIDONLY_OFF = 0,
1: -	PROC_PIDONLY_ON = 1,
1: +  PROC_PIDONLY_OFF = 0,
1: +  PROC_PIDONLY_ON = 1,
1:  };
1:  
1:  struct proc_fs_info {
1: -	struct pid_namespace *pid_ns;
1: -	struct dentry *proc_self;
1: -	struct dentry *proc_thread_self;
1: -	kgid_t pid_gid;
1: -	enum proc_hidepid hide_pid;
1: -	enum proc_pidonly pidonly;
1: +  struct pid_namespace *pid_ns;
1: +  struct dentry *proc_self;
1: +  struct dentry *proc_thread_self;
1: +  kgid_t pid_gid;
1: +  enum proc_hidepid hide_pid;
1: +  enum proc_pidonly pidonly;
1:  };
1:  
1:  struct trace_event_raw_task_newtask {
1: -	struct trace_entry ent;
1: -	pid_t pid;
1: -	char comm[16];
1: -	long unsigned int clone_flags;
1: -	short int oom_score_adj;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  pid_t pid;
1: +  char comm[16];
1: +  long unsigned int clone_flags;
1: +  short int oom_score_adj;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_task_rename {
1: -	struct trace_entry ent;
1: -	pid_t pid;
1: -	char oldcomm[16];
1: -	char newcomm[16];
1: -	short int oom_score_adj;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  pid_t pid;
1: +  char oldcomm[16];
1: +  char newcomm[16];
1: +  short int oom_score_adj;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_task_newtask {};
1:  
1:  struct trace_event_data_offsets_task_rename {};
1:  
1: -typedef void (*btf_trace_task_newtask)(void *, struct task_struct *, long unsigned int);
1: +typedef void (*btf_trace_task_newtask)(void *, struct task_struct *,
1: +                                       long unsigned int);
1:  
1: -typedef void (*btf_trace_task_rename)(void *, struct task_struct *, const char *);
1: +typedef void (*btf_trace_task_rename)(void *, struct task_struct *,
1: +                                      const char *);
1:  
1:  struct taint_flag {
1: -	char c_true;
1: -	char c_false;
1: -	bool module;
1: +  char c_true;
1: +  char c_false;
1: +  bool module;
1:  };
1:  
1:  enum ftrace_dump_mode {
1: -	DUMP_NONE = 0,
1: -	DUMP_ALL = 1,
1: -	DUMP_ORIG = 2,
1: +  DUMP_NONE = 0,
1: +  DUMP_ALL = 1,
1: +  DUMP_ORIG = 2,
1:  };
1:  
1:  enum kmsg_dump_reason {
1: -	KMSG_DUMP_UNDEF = 0,
1: -	KMSG_DUMP_PANIC = 1,
1: -	KMSG_DUMP_OOPS = 2,
1: -	KMSG_DUMP_EMERG = 3,
1: -	KMSG_DUMP_SHUTDOWN = 4,
1: -	KMSG_DUMP_MAX = 5,
1: +  KMSG_DUMP_UNDEF = 0,
1: +  KMSG_DUMP_PANIC = 1,
1: +  KMSG_DUMP_OOPS = 2,
1: +  KMSG_DUMP_EMERG = 3,
1: +  KMSG_DUMP_SHUTDOWN = 4,
1: +  KMSG_DUMP_MAX = 5,
1:  };
1:  
1:  enum con_flush_mode {
1: -	CONSOLE_FLUSH_PENDING = 0,
1: -	CONSOLE_REPLAY_ALL = 1,
1: +  CONSOLE_FLUSH_PENDING = 0,
1: +  CONSOLE_REPLAY_ALL = 1,
1:  };
1:  
1:  struct warn_args {
1: -	const char *fmt;
1: -	va_list args;
1: +  const char *fmt;
1: +  va_list args;
1:  };
1:  
1:  struct smp_hotplug_thread {
1: -	struct task_struct **store;
1: -	struct list_head list;
1: -	int (*thread_should_run)(unsigned int);
1: -	void (*thread_fn)(unsigned int);
1: -	void (*create)(unsigned int);
1: -	void (*setup)(unsigned int);
1: -	void (*cleanup)(unsigned int, bool);
1: -	void (*park)(unsigned int);
1: -	void (*unpark)(unsigned int);
1: -	bool selfparking;
1: -	const char *thread_comm;
1: +  struct task_struct **store;
1: +  struct list_head list;
1: +  int (*thread_should_run)(unsigned int);
1: +  void (*thread_fn)(unsigned int);
1: +  void (*create)(unsigned int);
1: +  void (*setup)(unsigned int);
1: +  void (*cleanup)(unsigned int, bool);
1: +  void (*park)(unsigned int);
1: +  void (*unpark)(unsigned int);
1: +  bool selfparking;
1: +  const char *thread_comm;
1:  };
1:  
1:  struct trace_event_raw_cpuhp_enter {
1: -	struct trace_entry ent;
1: -	unsigned int cpu;
1: -	int target;
1: -	int idx;
1: -	void *fun;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int cpu;
1: +  int target;
1: +  int idx;
1: +  void *fun;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cpuhp_multi_enter {
1: -	struct trace_entry ent;
1: -	unsigned int cpu;
1: -	int target;
1: -	int idx;
1: -	void *fun;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int cpu;
1: +  int target;
1: +  int idx;
1: +  void *fun;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cpuhp_exit {
1: -	struct trace_entry ent;
1: -	unsigned int cpu;
1: -	int state;
1: -	int idx;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int cpu;
1: +  int state;
1: +  int idx;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_cpuhp_enter {};
1: @@ -24551,166 +24740,171 @@ struct trace_event_data_offsets_cpuhp_multi_enter {};
1:  
1:  struct trace_event_data_offsets_cpuhp_exit {};
1:  
1: -typedef void (*btf_trace_cpuhp_enter)(void *, unsigned int, int, int, int (*)(unsigned int));
1: +typedef void (*btf_trace_cpuhp_enter)(void *, unsigned int, int, int,
1: +                                      int (*)(unsigned int));
1:  
1: -typedef void (*btf_trace_cpuhp_multi_enter)(void *, unsigned int, int, int, int (*)(unsigned int, struct hlist_node *), struct hlist_node *);
1: +typedef void (*btf_trace_cpuhp_multi_enter)(void *, unsigned int, int, int,
1: +                                            int (*)(unsigned int,
1: +                                                    struct hlist_node *),
1: +                                            struct hlist_node *);
1:  
1:  typedef void (*btf_trace_cpuhp_exit)(void *, unsigned int, int, int, int);
1:  
1:  struct cpuhp_cpu_state {
1: -	enum cpuhp_state state;
1: -	enum cpuhp_state target;
1: -	enum cpuhp_state fail;
1: -	struct task_struct *thread;
1: -	bool should_run;
1: -	bool rollback;
1: -	bool single;
1: -	bool bringup;
1: -	struct hlist_node *node;
1: -	struct hlist_node *last;
1: -	enum cpuhp_state cb_state;
1: -	int result;
1: -	struct completion done_up;
1: -	struct completion done_down;
1: +  enum cpuhp_state state;
1: +  enum cpuhp_state target;
1: +  enum cpuhp_state fail;
1: +  struct task_struct *thread;
1: +  bool should_run;
1: +  bool rollback;
1: +  bool single;
1: +  bool bringup;
1: +  struct hlist_node *node;
1: +  struct hlist_node *last;
1: +  enum cpuhp_state cb_state;
1: +  int result;
1: +  struct completion done_up;
1: +  struct completion done_down;
1:  };
1:  
1:  struct cpuhp_step {
1: -	const char *name;
1: -	union {
1: -		int (*single)(unsigned int);
1: -		int (*multi)(unsigned int, struct hlist_node *);
1: -	} startup;
1: -	union {
1: -		int (*single)(unsigned int);
1: -		int (*multi)(unsigned int, struct hlist_node *);
1: -	} teardown;
1: -	struct hlist_head list;
1: -	bool cant_stop;
1: -	bool multi_instance;
1: +  const char *name;
1: +  union {
1: +    int (*single)(unsigned int);
1: +    int (*multi)(unsigned int, struct hlist_node *);
1: +  } startup;
1: +  union {
1: +    int (*single)(unsigned int);
1: +    int (*multi)(unsigned int, struct hlist_node *);
1: +  } teardown;
1: +  struct hlist_head list;
1: +  bool cant_stop;
1: +  bool multi_instance;
1:  };
1:  
1:  enum cpu_mitigations {
1: -	CPU_MITIGATIONS_OFF = 0,
1: -	CPU_MITIGATIONS_AUTO = 1,
1: -	CPU_MITIGATIONS_AUTO_NOSMT = 2,
1: +  CPU_MITIGATIONS_OFF = 0,
1: +  CPU_MITIGATIONS_AUTO = 1,
1: +  CPU_MITIGATIONS_AUTO_NOSMT = 2,
1:  };
1:  
1:  struct __kernel_old_timeval {
1: -	__kernel_long_t tv_sec;
1: -	__kernel_long_t tv_usec;
1: +  __kernel_long_t tv_sec;
1: +  __kernel_long_t tv_usec;
1:  };
1:  
1:  struct old_timeval32 {
1: -	old_time32_t tv_sec;
1: -	s32 tv_usec;
1: +  old_time32_t tv_sec;
1: +  s32 tv_usec;
1:  };
1:  
1:  struct rusage {
1: -	struct __kernel_old_timeval ru_utime;
1: -	struct __kernel_old_timeval ru_stime;
1: -	__kernel_long_t ru_maxrss;
1: -	__kernel_long_t ru_ixrss;
1: -	__kernel_long_t ru_idrss;
1: -	__kernel_long_t ru_isrss;
1: -	__kernel_long_t ru_minflt;
1: -	__kernel_long_t ru_majflt;
1: -	__kernel_long_t ru_nswap;
1: -	__kernel_long_t ru_inblock;
1: -	__kernel_long_t ru_oublock;
1: -	__kernel_long_t ru_msgsnd;
1: -	__kernel_long_t ru_msgrcv;
1: -	__kernel_long_t ru_nsignals;
1: -	__kernel_long_t ru_nvcsw;
1: -	__kernel_long_t ru_nivcsw;
1: -};
1: -
1: -typedef struct {} mm_segment_t;
1: +  struct __kernel_old_timeval ru_utime;
1: +  struct __kernel_old_timeval ru_stime;
1: +  __kernel_long_t ru_maxrss;
1: +  __kernel_long_t ru_ixrss;
1: +  __kernel_long_t ru_idrss;
1: +  __kernel_long_t ru_isrss;
1: +  __kernel_long_t ru_minflt;
1: +  __kernel_long_t ru_majflt;
1: +  __kernel_long_t ru_nswap;
1: +  __kernel_long_t ru_inblock;
1: +  __kernel_long_t ru_oublock;
1: +  __kernel_long_t ru_msgsnd;
1: +  __kernel_long_t ru_msgrcv;
1: +  __kernel_long_t ru_nsignals;
1: +  __kernel_long_t ru_nvcsw;
1: +  __kernel_long_t ru_nivcsw;
1: +};
1: +
1: +typedef struct {
1: +} mm_segment_t;
1:  
1:  struct compat_rusage {
1: -	struct old_timeval32 ru_utime;
1: -	struct old_timeval32 ru_stime;
1: -	compat_long_t ru_maxrss;
1: -	compat_long_t ru_ixrss;
1: -	compat_long_t ru_idrss;
1: -	compat_long_t ru_isrss;
1: -	compat_long_t ru_minflt;
1: -	compat_long_t ru_majflt;
1: -	compat_long_t ru_nswap;
1: -	compat_long_t ru_inblock;
1: -	compat_long_t ru_oublock;
1: -	compat_long_t ru_msgsnd;
1: -	compat_long_t ru_msgrcv;
1: -	compat_long_t ru_nsignals;
1: -	compat_long_t ru_nvcsw;
1: -	compat_long_t ru_nivcsw;
1: +  struct old_timeval32 ru_utime;
1: +  struct old_timeval32 ru_stime;
1: +  compat_long_t ru_maxrss;
1: +  compat_long_t ru_ixrss;
1: +  compat_long_t ru_idrss;
1: +  compat_long_t ru_isrss;
1: +  compat_long_t ru_minflt;
1: +  compat_long_t ru_majflt;
1: +  compat_long_t ru_nswap;
1: +  compat_long_t ru_inblock;
1: +  compat_long_t ru_oublock;
1: +  compat_long_t ru_msgsnd;
1: +  compat_long_t ru_msgrcv;
1: +  compat_long_t ru_nsignals;
1: +  compat_long_t ru_nvcsw;
1: +  compat_long_t ru_nivcsw;
1:  };
1:  
1:  struct waitid_info {
1: -	pid_t pid;
1: -	uid_t uid;
1: -	int status;
1: -	int cause;
1: +  pid_t pid;
1: +  uid_t uid;
1: +  int status;
1: +  int cause;
1:  };
1:  
1:  struct wait_opts {
1: -	enum pid_type wo_type;
1: -	int wo_flags;
1: -	struct pid *wo_pid;
1: -	struct waitid_info *wo_info;
1: -	int wo_stat;
1: -	struct rusage *wo_rusage;
1: -	wait_queue_entry_t child_wait;
1: -	int notask_error;
1: +  enum pid_type wo_type;
1: +  int wo_flags;
1: +  struct pid *wo_pid;
1: +  struct waitid_info *wo_info;
1: +  int wo_stat;
1: +  struct rusage *wo_rusage;
1: +  wait_queue_entry_t child_wait;
1: +  int notask_error;
1:  };
1:  
1:  struct softirq_action {
1: -	void (*action)(struct softirq_action *);
1: +  void (*action)(struct softirq_action *);
1:  };
1:  
1:  struct tasklet_struct {
1: -	struct tasklet_struct *next;
1: -	long unsigned int state;
1: -	atomic_t count;
1: -	bool use_callback;
1: -	union {
1: -		void (*func)(long unsigned int);
1: -		void (*callback)(struct tasklet_struct *);
1: -	};
1: -	long unsigned int data;
1: +  struct tasklet_struct *next;
1: +  long unsigned int state;
1: +  atomic_t count;
1: +  bool use_callback;
1: +  union {
1: +    void (*func)(long unsigned int);
1: +    void (*callback)(struct tasklet_struct *);
1: +  };
1: +  long unsigned int data;
1:  };
1:  
1:  enum {
1: -	TASKLET_STATE_SCHED = 0,
1: -	TASKLET_STATE_RUN = 1,
1: +  TASKLET_STATE_SCHED = 0,
1: +  TASKLET_STATE_RUN = 1,
1:  };
1:  
1:  struct kernel_stat {
1: -	long unsigned int irqs_sum;
1: -	unsigned int softirqs[10];
1: +  long unsigned int irqs_sum;
1: +  unsigned int softirqs[10];
1:  };
1:  
1:  struct trace_event_raw_irq_handler_entry {
1: -	struct trace_entry ent;
1: -	int irq;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int irq;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_irq_handler_exit {
1: -	struct trace_entry ent;
1: -	int irq;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int irq;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_softirq {
1: -	struct trace_entry ent;
1: -	unsigned int vec;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int vec;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_irq_handler_entry {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_irq_handler_exit {};
1: @@ -24719,7 +24913,8 @@ struct trace_event_data_offsets_softirq {};
1:  
1:  typedef void (*btf_trace_irq_handler_entry)(void *, int, struct irqaction *);
1:  
1: -typedef void (*btf_trace_irq_handler_exit)(void *, int, struct irqaction *, int);
1: +typedef void (*btf_trace_irq_handler_exit)(void *, int, struct irqaction *,
1: +                                           int);
1:  
1:  typedef void (*btf_trace_softirq_entry)(void *, unsigned int);
1:  
1: @@ -24728,339 +24923,342 @@ typedef void (*btf_trace_softirq_exit)(void *, unsigned int);
1:  typedef void (*btf_trace_softirq_raise)(void *, unsigned int);
1:  
1:  struct tasklet_head {
1: -	struct tasklet_struct *head;
1: -	struct tasklet_struct **tail;
1: +  struct tasklet_struct *head;
1: +  struct tasklet_struct **tail;
1:  };
1:  
1:  typedef void (*dr_release_t)(struct device *, void *);
1:  
1:  struct resource_entry {
1: -	struct list_head node;
1: -	struct resource *res;
1: -	resource_size_t offset;
1: -	struct resource __res;
1: +  struct list_head node;
1: +  struct resource *res;
1: +  resource_size_t offset;
1: +  struct resource __res;
1:  };
1:  
1:  struct resource_constraint {
1: -	resource_size_t min;
1: -	resource_size_t max;
1: -	resource_size_t align;
1: -	resource_size_t (*alignf)(void *, const struct resource *, resource_size_t, resource_size_t);
1: -	void *alignf_data;
1: +  resource_size_t min;
1: +  resource_size_t max;
1: +  resource_size_t align;
1: +  resource_size_t (*alignf)(void *, const struct resource *, resource_size_t,
1: +                            resource_size_t);
1: +  void *alignf_data;
1:  };
1:  
1:  enum {
1: -	MAX_IORES_LEVEL = 5,
1: +  MAX_IORES_LEVEL = 5,
1:  };
1:  
1:  struct region_devres {
1: -	struct resource *parent;
1: -	resource_size_t start;
1: -	resource_size_t n;
1: +  struct resource *parent;
1: +  resource_size_t start;
1: +  resource_size_t n;
1:  };
1:  
1:  struct dentry_stat_t {
1: -	long int nr_dentry;
1: -	long int nr_unused;
1: -	long int age_limit;
1: -	long int want_pages;
1: -	long int nr_negative;
1: -	long int dummy;
1: +  long int nr_dentry;
1: +  long int nr_unused;
1: +  long int age_limit;
1: +  long int want_pages;
1: +  long int nr_negative;
1: +  long int dummy;
1:  };
1:  
1:  struct files_stat_struct {
1: -	long unsigned int nr_files;
1: -	long unsigned int nr_free_files;
1: -	long unsigned int max_files;
1: +  long unsigned int nr_files;
1: +  long unsigned int nr_free_files;
1: +  long unsigned int max_files;
1:  };
1:  
1:  struct inodes_stat_t {
1: -	long int nr_inodes;
1: -	long int nr_unused;
1: -	long int dummy[5];
1: +  long int nr_inodes;
1: +  long int nr_unused;
1: +  long int dummy[5];
1:  };
1:  
1:  enum sched_tunable_scaling {
1: -	SCHED_TUNABLESCALING_NONE = 0,
1: -	SCHED_TUNABLESCALING_LOG = 1,
1: -	SCHED_TUNABLESCALING_LINEAR = 2,
1: -	SCHED_TUNABLESCALING_END = 3,
1: +  SCHED_TUNABLESCALING_NONE = 0,
1: +  SCHED_TUNABLESCALING_LOG = 1,
1: +  SCHED_TUNABLESCALING_LINEAR = 2,
1: +  SCHED_TUNABLESCALING_END = 3,
1:  };
1:  
1:  enum sysctl_writes_mode {
1: -	SYSCTL_WRITES_LEGACY = 4294967295,
1: -	SYSCTL_WRITES_WARN = 0,
1: -	SYSCTL_WRITES_STRICT = 1,
1: +  SYSCTL_WRITES_LEGACY = 4294967295,
1: +  SYSCTL_WRITES_WARN = 0,
1: +  SYSCTL_WRITES_STRICT = 1,
1:  };
1:  
1:  struct do_proc_dointvec_minmax_conv_param {
1: -	int *min;
1: -	int *max;
1: +  int *min;
1: +  int *max;
1:  };
1:  
1:  struct do_proc_douintvec_minmax_conv_param {
1: -	unsigned int *min;
1: -	unsigned int *max;
1: +  unsigned int *min;
1: +  unsigned int *max;
1:  };
1:  
1:  struct __user_cap_header_struct {
1: -	__u32 version;
1: -	int pid;
1: +  __u32 version;
1: +  int pid;
1:  };
1:  
1:  typedef struct __user_cap_header_struct *cap_user_header_t;
1:  
1:  struct __user_cap_data_struct {
1: -	__u32 effective;
1: -	__u32 permitted;
1: -	__u32 inheritable;
1: +  __u32 effective;
1: +  __u32 permitted;
1: +  __u32 inheritable;
1:  };
1:  
1:  typedef struct __user_cap_data_struct *cap_user_data_t;
1:  
1:  struct sigqueue {
1: -	struct list_head list;
1: -	int flags;
1: -	kernel_siginfo_t info;
1: -	struct user_struct *user;
1: +  struct list_head list;
1: +  int flags;
1: +  kernel_siginfo_t info;
1: +  struct user_struct *user;
1:  };
1:  
1:  struct ptrace_peeksiginfo_args {
1: -	__u64 off;
1: -	__u32 flags;
1: -	__s32 nr;
1: +  __u64 off;
1: +  __u32 flags;
1: +  __s32 nr;
1:  };
1:  
1:  struct ptrace_syscall_info {
1: -	__u8 op;
1: -	__u32 arch;
1: -	__u64 instruction_pointer;
1: -	__u64 stack_pointer;
1: -	union {
1: -		struct {
1: -			__u64 nr;
1: -			__u64 args[6];
1: -		} entry;
1: -		struct {
1: -			__s64 rval;
1: -			__u8 is_error;
1: -		} exit;
1: -		struct {
1: -			__u64 nr;
1: -			__u64 args[6];
1: -			__u32 ret_data;
1: -		} seccomp;
1: -	};
1: +  __u8 op;
1: +  __u32 arch;
1: +  __u64 instruction_pointer;
1: +  __u64 stack_pointer;
1: +  union {
1: +    struct {
1: +      __u64 nr;
1: +      __u64 args[6];
1: +    } entry;
1: +    struct {
1: +      __s64 rval;
1: +      __u8 is_error;
1: +    } exit;
1: +    struct {
1: +      __u64 nr;
1: +      __u64 args[6];
1: +      __u32 ret_data;
1: +    } seccomp;
1: +  };
1:  };
1:  
1:  struct compat_iovec {
1: -	compat_uptr_t iov_base;
1: -	compat_size_t iov_len;
1: +  compat_uptr_t iov_base;
1: +  compat_size_t iov_len;
1:  };
1:  
1:  typedef long unsigned int old_sigset_t;
1:  
1:  enum siginfo_layout {
1: -	SIL_KILL = 0,
1: -	SIL_TIMER = 1,
1: -	SIL_POLL = 2,
1: -	SIL_FAULT = 3,
1: -	SIL_FAULT_MCEERR = 4,
1: -	SIL_FAULT_BNDERR = 5,
1: -	SIL_FAULT_PKUERR = 6,
1: -	SIL_CHLD = 7,
1: -	SIL_RT = 8,
1: -	SIL_SYS = 9,
1: +  SIL_KILL = 0,
1: +  SIL_TIMER = 1,
1: +  SIL_POLL = 2,
1: +  SIL_FAULT = 3,
1: +  SIL_FAULT_MCEERR = 4,
1: +  SIL_FAULT_BNDERR = 5,
1: +  SIL_FAULT_PKUERR = 6,
1: +  SIL_CHLD = 7,
1: +  SIL_RT = 8,
1: +  SIL_SYS = 9,
1:  };
1:  
1:  struct fd {
1: -	struct file *file;
1: -	unsigned int flags;
1: +  struct file *file;
1: +  unsigned int flags;
1:  };
1:  
1:  typedef u32 compat_old_sigset_t;
1:  
1:  struct compat_sigaction {
1: -	compat_uptr_t sa_handler;
1: -	compat_ulong_t sa_flags;
1: -	compat_uptr_t sa_restorer;
1: -	compat_sigset_t sa_mask;
1: +  compat_uptr_t sa_handler;
1: +  compat_ulong_t sa_flags;
1: +  compat_uptr_t sa_restorer;
1: +  compat_sigset_t sa_mask;
1:  };
1:  
1:  struct compat_old_sigaction {
1: -	compat_uptr_t sa_handler;
1: -	compat_old_sigset_t sa_mask;
1: -	compat_ulong_t sa_flags;
1: -	compat_uptr_t sa_restorer;
1: +  compat_uptr_t sa_handler;
1: +  compat_old_sigset_t sa_mask;
1: +  compat_ulong_t sa_flags;
1: +  compat_uptr_t sa_restorer;
1:  };
1:  
1:  enum {
1: -	TRACE_SIGNAL_DELIVERED = 0,
1: -	TRACE_SIGNAL_IGNORED = 1,
1: -	TRACE_SIGNAL_ALREADY_PENDING = 2,
1: -	TRACE_SIGNAL_OVERFLOW_FAIL = 3,
1: -	TRACE_SIGNAL_LOSE_INFO = 4,
1: +  TRACE_SIGNAL_DELIVERED = 0,
1: +  TRACE_SIGNAL_IGNORED = 1,
1: +  TRACE_SIGNAL_ALREADY_PENDING = 2,
1: +  TRACE_SIGNAL_OVERFLOW_FAIL = 3,
1: +  TRACE_SIGNAL_LOSE_INFO = 4,
1:  };
1:  
1:  struct trace_event_raw_signal_generate {
1: -	struct trace_entry ent;
1: -	int sig;
1: -	int errno;
1: -	int code;
1: -	char comm[16];
1: -	pid_t pid;
1: -	int group;
1: -	int result;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int sig;
1: +  int errno;
1: +  int code;
1: +  char comm[16];
1: +  pid_t pid;
1: +  int group;
1: +  int result;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_signal_deliver {
1: -	struct trace_entry ent;
1: -	int sig;
1: -	int errno;
1: -	int code;
1: -	long unsigned int sa_handler;
1: -	long unsigned int sa_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int sig;
1: +  int errno;
1: +  int code;
1: +  long unsigned int sa_handler;
1: +  long unsigned int sa_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_signal_generate {};
1:  
1:  struct trace_event_data_offsets_signal_deliver {};
1:  
1: -typedef void (*btf_trace_signal_generate)(void *, int, struct kernel_siginfo *, struct task_struct *, int, int);
1: +typedef void (*btf_trace_signal_generate)(void *, int, struct kernel_siginfo *,
1: +                                          struct task_struct *, int, int);
1:  
1: -typedef void (*btf_trace_signal_deliver)(void *, int, struct kernel_siginfo *, struct k_sigaction *);
1: +typedef void (*btf_trace_signal_deliver)(void *, int, struct kernel_siginfo *,
1: +                                         struct k_sigaction *);
1:  
1:  typedef __kernel_clock_t clock_t;
1:  
1:  struct sysinfo {
1: -	__kernel_long_t uptime;
1: -	__kernel_ulong_t loads[3];
1: -	__kernel_ulong_t totalram;
1: -	__kernel_ulong_t freeram;
1: -	__kernel_ulong_t sharedram;
1: -	__kernel_ulong_t bufferram;
1: -	__kernel_ulong_t totalswap;
1: -	__kernel_ulong_t freeswap;
1: -	__u16 procs;
1: -	__u16 pad;
1: -	__kernel_ulong_t totalhigh;
1: -	__kernel_ulong_t freehigh;
1: -	__u32 mem_unit;
1: -	char _f[0];
1: -};
1: -
1: -enum {
1: -	PER_LINUX = 0,
1: -	PER_LINUX_32BIT = 8388608,
1: -	PER_LINUX_FDPIC = 524288,
1: -	PER_SVR4 = 68157441,
1: -	PER_SVR3 = 83886082,
1: -	PER_SCOSVR3 = 117440515,
1: -	PER_OSR5 = 100663299,
1: -	PER_WYSEV386 = 83886084,
1: -	PER_ISCR4 = 67108869,
1: -	PER_BSD = 6,
1: -	PER_SUNOS = 67108870,
1: -	PER_XENIX = 83886087,
1: -	PER_LINUX32 = 8,
1: -	PER_LINUX32_3GB = 134217736,
1: -	PER_IRIX32 = 67108873,
1: -	PER_IRIXN32 = 67108874,
1: -	PER_IRIX64 = 67108875,
1: -	PER_RISCOS = 12,
1: -	PER_SOLARIS = 67108877,
1: -	PER_UW7 = 68157454,
1: -	PER_OSF4 = 15,
1: -	PER_HPUX = 16,
1: -	PER_MASK = 255,
1: +  __kernel_long_t uptime;
1: +  __kernel_ulong_t loads[3];
1: +  __kernel_ulong_t totalram;
1: +  __kernel_ulong_t freeram;
1: +  __kernel_ulong_t sharedram;
1: +  __kernel_ulong_t bufferram;
1: +  __kernel_ulong_t totalswap;
1: +  __kernel_ulong_t freeswap;
1: +  __u16 procs;
1: +  __u16 pad;
1: +  __kernel_ulong_t totalhigh;
1: +  __kernel_ulong_t freehigh;
1: +  __u32 mem_unit;
1: +  char _f[0];
1: +};
1: +
1: +enum {
1: +  PER_LINUX = 0,
1: +  PER_LINUX_32BIT = 8388608,
1: +  PER_LINUX_FDPIC = 524288,
1: +  PER_SVR4 = 68157441,
1: +  PER_SVR3 = 83886082,
1: +  PER_SCOSVR3 = 117440515,
1: +  PER_OSR5 = 100663299,
1: +  PER_WYSEV386 = 83886084,
1: +  PER_ISCR4 = 67108869,
1: +  PER_BSD = 6,
1: +  PER_SUNOS = 67108870,
1: +  PER_XENIX = 83886087,
1: +  PER_LINUX32 = 8,
1: +  PER_LINUX32_3GB = 134217736,
1: +  PER_IRIX32 = 67108873,
1: +  PER_IRIXN32 = 67108874,
1: +  PER_IRIX64 = 67108875,
1: +  PER_RISCOS = 12,
1: +  PER_SOLARIS = 67108877,
1: +  PER_UW7 = 68157454,
1: +  PER_OSF4 = 15,
1: +  PER_HPUX = 16,
1: +  PER_MASK = 255,
1:  };
1:  
1:  struct rlimit64 {
1: -	__u64 rlim_cur;
1: -	__u64 rlim_max;
1: +  __u64 rlim_cur;
1: +  __u64 rlim_max;
1:  };
1:  
1:  struct oldold_utsname {
1: -	char sysname[9];
1: -	char nodename[9];
1: -	char release[9];
1: -	char version[9];
1: -	char machine[9];
1: +  char sysname[9];
1: +  char nodename[9];
1: +  char release[9];
1: +  char version[9];
1: +  char machine[9];
1:  };
1:  
1:  struct old_utsname {
1: -	char sysname[65];
1: -	char nodename[65];
1: -	char release[65];
1: -	char version[65];
1: -	char machine[65];
1: +  char sysname[65];
1: +  char nodename[65];
1: +  char release[65];
1: +  char version[65];
1: +  char machine[65];
1:  };
1:  
1:  enum uts_proc {
1: -	UTS_PROC_OSTYPE = 0,
1: -	UTS_PROC_OSRELEASE = 1,
1: -	UTS_PROC_VERSION = 2,
1: -	UTS_PROC_HOSTNAME = 3,
1: -	UTS_PROC_DOMAINNAME = 4,
1: +  UTS_PROC_OSTYPE = 0,
1: +  UTS_PROC_OSRELEASE = 1,
1: +  UTS_PROC_VERSION = 2,
1: +  UTS_PROC_HOSTNAME = 3,
1: +  UTS_PROC_DOMAINNAME = 4,
1:  };
1:  
1:  struct prctl_mm_map {
1: -	__u64 start_code;
1: -	__u64 end_code;
1: -	__u64 start_data;
1: -	__u64 end_data;
1: -	__u64 start_brk;
1: -	__u64 brk;
1: -	__u64 start_stack;
1: -	__u64 arg_start;
1: -	__u64 arg_end;
1: -	__u64 env_start;
1: -	__u64 env_end;
1: -	__u64 *auxv;
1: -	__u32 auxv_size;
1: -	__u32 exe_fd;
1: +  __u64 start_code;
1: +  __u64 end_code;
1: +  __u64 start_data;
1: +  __u64 end_data;
1: +  __u64 start_brk;
1: +  __u64 brk;
1: +  __u64 start_stack;
1: +  __u64 arg_start;
1: +  __u64 arg_end;
1: +  __u64 env_start;
1: +  __u64 env_end;
1: +  __u64 *auxv;
1: +  __u32 auxv_size;
1: +  __u32 exe_fd;
1:  };
1:  
1:  struct compat_tms {
1: -	compat_clock_t tms_utime;
1: -	compat_clock_t tms_stime;
1: -	compat_clock_t tms_cutime;
1: -	compat_clock_t tms_cstime;
1: +  compat_clock_t tms_utime;
1: +  compat_clock_t tms_stime;
1: +  compat_clock_t tms_cutime;
1: +  compat_clock_t tms_cstime;
1:  };
1:  
1:  struct compat_rlimit {
1: -	compat_ulong_t rlim_cur;
1: -	compat_ulong_t rlim_max;
1: +  compat_ulong_t rlim_cur;
1: +  compat_ulong_t rlim_max;
1:  };
1:  
1:  struct tms {
1: -	__kernel_clock_t tms_utime;
1: -	__kernel_clock_t tms_stime;
1: -	__kernel_clock_t tms_cutime;
1: -	__kernel_clock_t tms_cstime;
1: +  __kernel_clock_t tms_utime;
1: +  __kernel_clock_t tms_stime;
1: +  __kernel_clock_t tms_cutime;
1: +  __kernel_clock_t tms_cstime;
1:  };
1:  
1:  struct getcpu_cache {
1: -	long unsigned int blob[16];
1: +  long unsigned int blob[16];
1:  };
1:  
1:  struct compat_sysinfo {
1: -	s32 uptime;
1: -	u32 loads[3];
1: -	u32 totalram;
1: -	u32 freeram;
1: -	u32 sharedram;
1: -	u32 bufferram;
1: -	u32 totalswap;
1: -	u32 freeswap;
1: -	u16 procs;
1: -	u16 pad;
1: -	u32 totalhigh;
1: -	u32 freehigh;
1: -	u32 mem_unit;
1: -	char _f[8];
1: +  s32 uptime;
1: +  u32 loads[3];
1: +  u32 totalram;
1: +  u32 freeram;
1: +  u32 sharedram;
1: +  u32 bufferram;
1: +  u32 totalswap;
1: +  u32 freeswap;
1: +  u16 procs;
1: +  u16 pad;
1: +  u32 totalhigh;
1: +  u32 freehigh;
1: +  u32 mem_unit;
1: +  char _f[8];
1:  };
1:  
1:  struct wq_flusher;
1: @@ -25074,224 +25272,224 @@ struct pool_workqueue;
1:  struct wq_device;
1:  
1:  struct workqueue_struct {
1: -	struct list_head pwqs;
1: -	struct list_head list;
1: -	struct mutex mutex;
1: -	int work_color;
1: -	int flush_color;
1: -	atomic_t nr_pwqs_to_flush;
1: -	struct wq_flusher *first_flusher;
1: -	struct list_head flusher_queue;
1: -	struct list_head flusher_overflow;
1: -	struct list_head maydays;
1: -	struct worker *rescuer;
1: -	int nr_drainers;
1: -	int saved_max_active;
1: -	struct workqueue_attrs *unbound_attrs;
1: -	struct pool_workqueue *dfl_pwq;
1: -	struct wq_device *wq_dev;
1: -	char name[24];
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	unsigned int flags;
1: -	struct pool_workqueue *cpu_pwqs;
1: -	struct pool_workqueue *numa_pwq_tbl[0];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct list_head pwqs;
1: +  struct list_head list;
1: +  struct mutex mutex;
1: +  int work_color;
1: +  int flush_color;
1: +  atomic_t nr_pwqs_to_flush;
1: +  struct wq_flusher *first_flusher;
1: +  struct list_head flusher_queue;
1: +  struct list_head flusher_overflow;
1: +  struct list_head maydays;
1: +  struct worker *rescuer;
1: +  int nr_drainers;
1: +  int saved_max_active;
1: +  struct workqueue_attrs *unbound_attrs;
1: +  struct pool_workqueue *dfl_pwq;
1: +  struct wq_device *wq_dev;
1: +  char name[24];
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  unsigned int flags;
1: +  struct pool_workqueue *cpu_pwqs;
1: +  struct pool_workqueue *numa_pwq_tbl[0];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct workqueue_attrs {
1: -	int nice;
1: -	cpumask_var_t cpumask;
1: -	bool no_numa;
1: +  int nice;
1: +  cpumask_var_t cpumask;
1: +  bool no_numa;
1:  };
1:  
1:  struct execute_work {
1: -	struct work_struct work;
1: +  struct work_struct work;
1:  };
1:  
1:  enum {
1: -	WQ_UNBOUND = 2,
1: -	WQ_FREEZABLE = 4,
1: -	WQ_MEM_RECLAIM = 8,
1: -	WQ_HIGHPRI = 16,
1: -	WQ_CPU_INTENSIVE = 32,
1: -	WQ_SYSFS = 64,
1: -	WQ_POWER_EFFICIENT = 128,
1: -	__WQ_DRAINING = 65536,
1: -	__WQ_ORDERED = 131072,
1: -	__WQ_LEGACY = 262144,
1: -	__WQ_ORDERED_EXPLICIT = 524288,
1: -	WQ_MAX_ACTIVE = 512,
1: -	WQ_MAX_UNBOUND_PER_CPU = 4,
1: -	WQ_DFL_ACTIVE = 256,
1: +  WQ_UNBOUND = 2,
1: +  WQ_FREEZABLE = 4,
1: +  WQ_MEM_RECLAIM = 8,
1: +  WQ_HIGHPRI = 16,
1: +  WQ_CPU_INTENSIVE = 32,
1: +  WQ_SYSFS = 64,
1: +  WQ_POWER_EFFICIENT = 128,
1: +  __WQ_DRAINING = 65536,
1: +  __WQ_ORDERED = 131072,
1: +  __WQ_LEGACY = 262144,
1: +  __WQ_ORDERED_EXPLICIT = 524288,
1: +  WQ_MAX_ACTIVE = 512,
1: +  WQ_MAX_UNBOUND_PER_CPU = 4,
1: +  WQ_DFL_ACTIVE = 256,
1:  };
1:  
1:  typedef unsigned int xa_mark_t;
1:  
1:  enum xa_lock_type {
1: -	XA_LOCK_IRQ = 1,
1: -	XA_LOCK_BH = 2,
1: +  XA_LOCK_IRQ = 1,
1: +  XA_LOCK_BH = 2,
1:  };
1:  
1:  struct ida {
1: -	struct xarray xa;
1: +  struct xarray xa;
1:  };
1:  
1:  struct __una_u32 {
1: -	u32 x;
1: +  u32 x;
1:  };
1:  
1:  struct worker_pool;
1:  
1:  struct worker {
1: -	union {
1: -		struct list_head entry;
1: -		struct hlist_node hentry;
1: -	};
1: -	struct work_struct *current_work;
1: -	work_func_t current_func;
1: -	struct pool_workqueue *current_pwq;
1: -	struct list_head scheduled;
1: -	struct task_struct *task;
1: -	struct worker_pool *pool;
1: -	struct list_head node;
1: -	long unsigned int last_active;
1: -	unsigned int flags;
1: -	int id;
1: -	int sleeping;
1: -	char desc[24];
1: -	struct workqueue_struct *rescue_wq;
1: -	work_func_t last_func;
1: +  union {
1: +    struct list_head entry;
1: +    struct hlist_node hentry;
1: +  };
1: +  struct work_struct *current_work;
1: +  work_func_t current_func;
1: +  struct pool_workqueue *current_pwq;
1: +  struct list_head scheduled;
1: +  struct task_struct *task;
1: +  struct worker_pool *pool;
1: +  struct list_head node;
1: +  long unsigned int last_active;
1: +  unsigned int flags;
1: +  int id;
1: +  int sleeping;
1: +  char desc[24];
1: +  struct workqueue_struct *rescue_wq;
1: +  work_func_t last_func;
1:  };
1:  
1:  struct pool_workqueue {
1: -	struct worker_pool *pool;
1: -	struct workqueue_struct *wq;
1: -	int work_color;
1: -	int flush_color;
1: -	int refcnt;
1: -	int nr_in_flight[15];
1: -	int nr_active;
1: -	int max_active;
1: -	struct list_head delayed_works;
1: -	struct list_head pwqs_node;
1: -	struct list_head mayday_node;
1: -	struct work_struct unbound_release_work;
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct worker_pool *pool;
1: +  struct workqueue_struct *wq;
1: +  int work_color;
1: +  int flush_color;
1: +  int refcnt;
1: +  int nr_in_flight[15];
1: +  int nr_active;
1: +  int max_active;
1: +  struct list_head delayed_works;
1: +  struct list_head pwqs_node;
1: +  struct list_head mayday_node;
1: +  struct work_struct unbound_release_work;
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct worker_pool {
1: -	raw_spinlock_t lock;
1: -	int cpu;
1: -	int node;
1: -	int id;
1: -	unsigned int flags;
1: -	long unsigned int watchdog_ts;
1: -	struct list_head worklist;
1: -	int nr_workers;
1: -	int nr_idle;
1: -	struct list_head idle_list;
1: -	struct timer_list idle_timer;
1: -	struct timer_list mayday_timer;
1: -	struct hlist_head busy_hash[64];
1: -	struct worker *manager;
1: -	struct list_head workers;
1: -	struct completion *detach_completion;
1: -	struct ida worker_ida;
1: -	struct workqueue_attrs *attrs;
1: -	struct hlist_node hash_node;
1: -	int refcnt;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	atomic_t nr_running;
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -};
1: -
1: -enum {
1: -	POOL_MANAGER_ACTIVE = 1,
1: -	POOL_DISASSOCIATED = 4,
1: -	WORKER_DIE = 2,
1: -	WORKER_IDLE = 4,
1: -	WORKER_PREP = 8,
1: -	WORKER_CPU_INTENSIVE = 64,
1: -	WORKER_UNBOUND = 128,
1: -	WORKER_REBOUND = 256,
1: -	WORKER_NOT_RUNNING = 456,
1: -	NR_STD_WORKER_POOLS = 2,
1: -	UNBOUND_POOL_HASH_ORDER = 6,
1: -	BUSY_WORKER_HASH_ORDER = 6,
1: -	MAX_IDLE_WORKERS_RATIO = 4,
1: -	IDLE_WORKER_TIMEOUT = 300000,
1: -	MAYDAY_INITIAL_TIMEOUT = 10,
1: -	MAYDAY_INTERVAL = 100,
1: -	CREATE_COOLDOWN = 1000,
1: -	RESCUER_NICE_LEVEL = 4294967276,
1: -	HIGHPRI_NICE_LEVEL = 4294967276,
1: -	WQ_NAME_LEN = 24,
1: +  raw_spinlock_t lock;
1: +  int cpu;
1: +  int node;
1: +  int id;
1: +  unsigned int flags;
1: +  long unsigned int watchdog_ts;
1: +  struct list_head worklist;
1: +  int nr_workers;
1: +  int nr_idle;
1: +  struct list_head idle_list;
1: +  struct timer_list idle_timer;
1: +  struct timer_list mayday_timer;
1: +  struct hlist_head busy_hash[64];
1: +  struct worker *manager;
1: +  struct list_head workers;
1: +  struct completion *detach_completion;
1: +  struct ida worker_ida;
1: +  struct workqueue_attrs *attrs;
1: +  struct hlist_node hash_node;
1: +  int refcnt;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  atomic_t nr_running;
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +};
1: +
1: +enum {
1: +  POOL_MANAGER_ACTIVE = 1,
1: +  POOL_DISASSOCIATED = 4,
1: +  WORKER_DIE = 2,
1: +  WORKER_IDLE = 4,
1: +  WORKER_PREP = 8,
1: +  WORKER_CPU_INTENSIVE = 64,
1: +  WORKER_UNBOUND = 128,
1: +  WORKER_REBOUND = 256,
1: +  WORKER_NOT_RUNNING = 456,
1: +  NR_STD_WORKER_POOLS = 2,
1: +  UNBOUND_POOL_HASH_ORDER = 6,
1: +  BUSY_WORKER_HASH_ORDER = 6,
1: +  MAX_IDLE_WORKERS_RATIO = 4,
1: +  IDLE_WORKER_TIMEOUT = 300000,
1: +  MAYDAY_INITIAL_TIMEOUT = 10,
1: +  MAYDAY_INTERVAL = 100,
1: +  CREATE_COOLDOWN = 1000,
1: +  RESCUER_NICE_LEVEL = 4294967276,
1: +  HIGHPRI_NICE_LEVEL = 4294967276,
1: +  WQ_NAME_LEN = 24,
1:  };
1:  
1:  struct wq_flusher {
1: -	struct list_head list;
1: -	int flush_color;
1: -	struct completion done;
1: +  struct list_head list;
1: +  int flush_color;
1: +  struct completion done;
1:  };
1:  
1:  struct wq_device {
1: -	struct workqueue_struct *wq;
1: -	struct device dev;
1: +  struct workqueue_struct *wq;
1: +  struct device dev;
1:  };
1:  
1:  struct trace_event_raw_workqueue_queue_work {
1: -	struct trace_entry ent;
1: -	void *work;
1: -	void *function;
1: -	void *workqueue;
1: -	unsigned int req_cpu;
1: -	unsigned int cpu;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *work;
1: +  void *function;
1: +  void *workqueue;
1: +  unsigned int req_cpu;
1: +  unsigned int cpu;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_workqueue_activate_work {
1: -	struct trace_entry ent;
1: -	void *work;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *work;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_workqueue_execute_start {
1: -	struct trace_entry ent;
1: -	void *work;
1: -	void *function;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *work;
1: +  void *function;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_workqueue_execute_end {
1: -	struct trace_entry ent;
1: -	void *work;
1: -	void *function;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *work;
1: +  void *function;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_workqueue_queue_work {};
1: @@ -25302,108 +25500,112 @@ struct trace_event_data_offsets_workqueue_execute_start {};
1:  
1:  struct trace_event_data_offsets_workqueue_execute_end {};
1:  
1: -typedef void (*btf_trace_workqueue_queue_work)(void *, unsigned int, struct pool_workqueue *, struct work_struct *);
1: +typedef void (*btf_trace_workqueue_queue_work)(void *, unsigned int,
1: +                                               struct pool_workqueue *,
1: +                                               struct work_struct *);
1:  
1:  typedef void (*btf_trace_workqueue_activate_work)(void *, struct work_struct *);
1:  
1:  typedef void (*btf_trace_workqueue_execute_start)(void *, struct work_struct *);
1:  
1: -typedef void (*btf_trace_workqueue_execute_end)(void *, struct work_struct *, work_func_t);
1: +typedef void (*btf_trace_workqueue_execute_end)(void *, struct work_struct *,
1: +                                                work_func_t);
1:  
1:  struct wq_barrier {
1: -	struct work_struct work;
1: -	struct completion done;
1: -	struct task_struct *task;
1: +  struct work_struct work;
1: +  struct completion done;
1: +  struct task_struct *task;
1:  };
1:  
1:  struct cwt_wait {
1: -	wait_queue_entry_t wait;
1: -	struct work_struct *work;
1: +  wait_queue_entry_t wait;
1: +  struct work_struct *work;
1:  };
1:  
1:  struct apply_wqattrs_ctx {
1: -	struct workqueue_struct *wq;
1: -	struct workqueue_attrs *attrs;
1: -	struct list_head list;
1: -	struct pool_workqueue *dfl_pwq;
1: -	struct pool_workqueue *pwq_tbl[0];
1: +  struct workqueue_struct *wq;
1: +  struct workqueue_attrs *attrs;
1: +  struct list_head list;
1: +  struct pool_workqueue *dfl_pwq;
1: +  struct pool_workqueue *pwq_tbl[0];
1:  };
1:  
1:  struct work_for_cpu {
1: -	struct work_struct work;
1: -	long int (*fn)(void *);
1: -	void *arg;
1: -	long int ret;
1: +  struct work_struct work;
1: +  long int (*fn)(void *);
1: +  void *arg;
1: +  long int ret;
1:  };
1:  
1:  struct xa_node {
1: -	unsigned char shift;
1: -	unsigned char offset;
1: -	unsigned char count;
1: -	unsigned char nr_values;
1: -	struct xa_node *parent;
1: -	struct xarray *array;
1: -	union {
1: -		struct list_head private_list;
1: -		struct callback_head callback_head;
1: -	};
1: -	void *slots[64];
1: -	union {
1: -		long unsigned int tags[3];
1: -		long unsigned int marks[3];
1: -	};
1: -};
1: -
1: -typedef struct {} local_lock_t;
1: +  unsigned char shift;
1: +  unsigned char offset;
1: +  unsigned char count;
1: +  unsigned char nr_values;
1: +  struct xa_node *parent;
1: +  struct xarray *array;
1: +  union {
1: +    struct list_head private_list;
1: +    struct callback_head callback_head;
1: +  };
1: +  void *slots[64];
1: +  union {
1: +    long unsigned int tags[3];
1: +    long unsigned int marks[3];
1: +  };
1: +};
1: +
1: +typedef struct {
1: +} local_lock_t;
1:  
1:  struct radix_tree_preload {
1: -	local_lock_t lock;
1: -	unsigned int nr;
1: -	struct xa_node *nodes;
1: +  local_lock_t lock;
1: +  unsigned int nr;
1: +  struct xa_node *nodes;
1:  };
1:  
1:  typedef void (*task_work_func_t)(struct callback_head *);
1:  
1:  enum {
1: -	KERNEL_PARAM_OPS_FL_NOARG = 1,
1: +  KERNEL_PARAM_OPS_FL_NOARG = 1,
1:  };
1:  
1:  enum {
1: -	KERNEL_PARAM_FL_UNSAFE = 1,
1: -	KERNEL_PARAM_FL_HWPARAM = 2,
1: +  KERNEL_PARAM_FL_UNSAFE = 1,
1: +  KERNEL_PARAM_FL_HWPARAM = 2,
1:  };
1:  
1:  struct param_attribute {
1: -	struct module_attribute mattr;
1: -	const struct kernel_param *param;
1: +  struct module_attribute mattr;
1: +  const struct kernel_param *param;
1:  };
1:  
1:  struct module_param_attrs {
1: -	unsigned int num;
1: -	struct attribute_group grp;
1: -	struct param_attribute attrs[0];
1: +  unsigned int num;
1: +  struct attribute_group grp;
1: +  struct param_attribute attrs[0];
1:  };
1:  
1:  struct module_version_attribute {
1: -	struct module_attribute mattr;
1: -	const char *module_name;
1: -	const char *version;
1: +  struct module_attribute mattr;
1: +  const char *module_name;
1: +  const char *version;
1:  };
1:  
1:  struct kmalloced_param {
1: -	struct list_head list;
1: -	char val[0];
1: +  struct list_head list;
1: +  char val[0];
1:  };
1:  
1:  struct sched_param {
1: -	int sched_priority;
1: +  int sched_priority;
1:  };
1:  
1:  enum {
1: -	__PERCPU_REF_ATOMIC = 1,
1: -	__PERCPU_REF_DEAD = 2,
1: -	__PERCPU_REF_ATOMIC_DEAD = 3,
1: -	__PERCPU_REF_FLAG_BITS = 2,
1: +  __PERCPU_REF_ATOMIC = 1,
1: +  __PERCPU_REF_DEAD = 2,
1: +  __PERCPU_REF_ATOMIC_DEAD = 3,
1: +  __PERCPU_REF_FLAG_BITS = 2,
1:  };
1:  
1:  struct kthread_work;
1: @@ -25413,127 +25615,127 @@ typedef void (*kthread_work_func_t)(struct kthread_work *);
1:  struct kthread_worker;
1:  
1:  struct kthread_work {
1: -	struct list_head node;
1: -	kthread_work_func_t func;
1: -	struct kthread_worker *worker;
1: -	int canceling;
1: +  struct list_head node;
1: +  kthread_work_func_t func;
1: +  struct kthread_worker *worker;
1: +  int canceling;
1:  };
1:  
1:  enum {
1: -	KTW_FREEZABLE = 1,
1: +  KTW_FREEZABLE = 1,
1:  };
1:  
1:  struct kthread_worker {
1: -	unsigned int flags;
1: -	raw_spinlock_t lock;
1: -	struct list_head work_list;
1: -	struct list_head delayed_work_list;
1: -	struct task_struct *task;
1: -	struct kthread_work *current_work;
1: +  unsigned int flags;
1: +  raw_spinlock_t lock;
1: +  struct list_head work_list;
1: +  struct list_head delayed_work_list;
1: +  struct task_struct *task;
1: +  struct kthread_work *current_work;
1:  };
1:  
1:  struct kthread_delayed_work {
1: -	struct kthread_work work;
1: -	struct timer_list timer;
1: +  struct kthread_work work;
1: +  struct timer_list timer;
1:  };
1:  
1:  enum {
1: -	CSS_NO_REF = 1,
1: -	CSS_ONLINE = 2,
1: -	CSS_RELEASED = 4,
1: -	CSS_VISIBLE = 8,
1: -	CSS_DYING = 16,
1: +  CSS_NO_REF = 1,
1: +  CSS_ONLINE = 2,
1: +  CSS_RELEASED = 4,
1: +  CSS_VISIBLE = 8,
1: +  CSS_DYING = 16,
1:  };
1:  
1:  struct kthread_create_info {
1: -	int (*threadfn)(void *);
1: -	void *data;
1: -	int node;
1: -	struct task_struct *result;
1: -	struct completion *done;
1: -	struct list_head list;
1: +  int (*threadfn)(void *);
1: +  void *data;
1: +  int node;
1: +  struct task_struct *result;
1: +  struct completion *done;
1: +  struct list_head list;
1:  };
1:  
1:  struct kthread {
1: -	long unsigned int flags;
1: -	unsigned int cpu;
1: -	int (*threadfn)(void *);
1: -	void *data;
1: -	mm_segment_t oldfs;
1: -	struct completion parked;
1: -	struct completion exited;
1: -	struct cgroup_subsys_state *blkcg_css;
1: +  long unsigned int flags;
1: +  unsigned int cpu;
1: +  int (*threadfn)(void *);
1: +  void *data;
1: +  mm_segment_t oldfs;
1: +  struct completion parked;
1: +  struct completion exited;
1: +  struct cgroup_subsys_state *blkcg_css;
1:  };
1:  
1:  enum KTHREAD_BITS {
1: -	KTHREAD_IS_PER_CPU = 0,
1: -	KTHREAD_SHOULD_STOP = 1,
1: -	KTHREAD_SHOULD_PARK = 2,
1: +  KTHREAD_IS_PER_CPU = 0,
1: +  KTHREAD_SHOULD_STOP = 1,
1: +  KTHREAD_SHOULD_PARK = 2,
1:  };
1:  
1:  struct kthread_flush_work {
1: -	struct kthread_work work;
1: -	struct completion done;
1: +  struct kthread_work work;
1: +  struct completion done;
1:  };
1:  
1:  struct pt_regs___2;
1:  
1:  struct ipc_ids {
1: -	int in_use;
1: -	short unsigned int seq;
1: -	struct rw_semaphore rwsem;
1: -	struct idr ipcs_idr;
1: -	int max_idx;
1: -	int last_idx;
1: -	struct rhashtable key_ht;
1: +  int in_use;
1: +  short unsigned int seq;
1: +  struct rw_semaphore rwsem;
1: +  struct idr ipcs_idr;
1: +  int max_idx;
1: +  int last_idx;
1: +  struct rhashtable key_ht;
1:  };
1:  
1:  struct ipc_namespace {
1: -	refcount_t count;
1: -	struct ipc_ids ids[3];
1: -	int sem_ctls[4];
1: -	int used_sems;
1: -	unsigned int msg_ctlmax;
1: -	unsigned int msg_ctlmnb;
1: -	unsigned int msg_ctlmni;
1: -	atomic_t msg_bytes;
1: -	atomic_t msg_hdrs;
1: -	size_t shm_ctlmax;
1: -	size_t shm_ctlall;
1: -	long unsigned int shm_tot;
1: -	int shm_ctlmni;
1: -	int shm_rmid_forced;
1: -	struct notifier_block ipcns_nb;
1: -	struct vfsmount *mq_mnt;
1: -	unsigned int mq_queues_count;
1: -	unsigned int mq_queues_max;
1: -	unsigned int mq_msg_max;
1: -	unsigned int mq_msgsize_max;
1: -	unsigned int mq_msg_default;
1: -	unsigned int mq_msgsize_default;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	struct llist_node mnt_llist;
1: -	struct ns_common ns;
1: +  refcount_t count;
1: +  struct ipc_ids ids[3];
1: +  int sem_ctls[4];
1: +  int used_sems;
1: +  unsigned int msg_ctlmax;
1: +  unsigned int msg_ctlmnb;
1: +  unsigned int msg_ctlmni;
1: +  atomic_t msg_bytes;
1: +  atomic_t msg_hdrs;
1: +  size_t shm_ctlmax;
1: +  size_t shm_ctlall;
1: +  long unsigned int shm_tot;
1: +  int shm_ctlmni;
1: +  int shm_rmid_forced;
1: +  struct notifier_block ipcns_nb;
1: +  struct vfsmount *mq_mnt;
1: +  unsigned int mq_queues_count;
1: +  unsigned int mq_queues_max;
1: +  unsigned int mq_msg_max;
1: +  unsigned int mq_msgsize_max;
1: +  unsigned int mq_msg_default;
1: +  unsigned int mq_msgsize_default;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  struct llist_node mnt_llist;
1: +  struct ns_common ns;
1:  };
1:  
1:  struct srcu_notifier_head {
1: -	struct mutex mutex;
1: -	struct srcu_struct srcu;
1: -	struct notifier_block *head;
1: +  struct mutex mutex;
1: +  struct srcu_struct srcu;
1: +  struct notifier_block *head;
1:  };
1:  
1:  enum what {
1: -	PROC_EVENT_NONE = 0,
1: -	PROC_EVENT_FORK = 1,
1: -	PROC_EVENT_EXEC = 2,
1: -	PROC_EVENT_UID = 4,
1: -	PROC_EVENT_GID = 64,
1: -	PROC_EVENT_SID = 128,
1: -	PROC_EVENT_PTRACE = 256,
1: -	PROC_EVENT_COMM = 512,
1: -	PROC_EVENT_COREDUMP = 1073741824,
1: -	PROC_EVENT_EXIT = 2147483648,
1: +  PROC_EVENT_NONE = 0,
1: +  PROC_EVENT_FORK = 1,
1: +  PROC_EVENT_EXEC = 2,
1: +  PROC_EVENT_UID = 4,
1: +  PROC_EVENT_GID = 64,
1: +  PROC_EVENT_SID = 128,
1: +  PROC_EVENT_PTRACE = 256,
1: +  PROC_EVENT_COMM = 512,
1: +  PROC_EVENT_COREDUMP = 1073741824,
1: +  PROC_EVENT_EXIT = 2147483648,
1:  };
1:  
1:  typedef u64 async_cookie_t;
1: @@ -25541,38 +25743,38 @@ typedef u64 async_cookie_t;
1:  typedef void (*async_func_t)(void *, async_cookie_t);
1:  
1:  struct async_domain {
1: -	struct list_head pending;
1: -	unsigned int registered: 1;
1: +  struct list_head pending;
1: +  unsigned int registered : 1;
1:  };
1:  
1:  struct async_entry {
1: -	struct list_head domain_list;
1: -	struct list_head global_list;
1: -	struct work_struct work;
1: -	async_cookie_t cookie;
1: -	async_func_t func;
1: -	void *data;
1: -	struct async_domain *domain;
1: +  struct list_head domain_list;
1: +  struct list_head global_list;
1: +  struct work_struct work;
1: +  async_cookie_t cookie;
1: +  async_func_t func;
1: +  void *data;
1: +  struct async_domain *domain;
1:  };
1:  
1:  struct smpboot_thread_data {
1: -	unsigned int cpu;
1: -	unsigned int status;
1: -	struct smp_hotplug_thread *ht;
1: +  unsigned int cpu;
1: +  unsigned int status;
1: +  struct smp_hotplug_thread *ht;
1:  };
1:  
1:  enum {
1: -	HP_THREAD_NONE = 0,
1: -	HP_THREAD_ACTIVE = 1,
1: -	HP_THREAD_PARKED = 2,
1: +  HP_THREAD_NONE = 0,
1: +  HP_THREAD_ACTIVE = 1,
1: +  HP_THREAD_PARKED = 2,
1:  };
1:  
1:  struct umd_info {
1: -	const char *driver_name;
1: -	struct file *pipe_to_umh;
1: -	struct file *pipe_from_umh;
1: -	struct path wd;
1: -	struct pid *tgid;
1: +  const char *driver_name;
1: +  struct file *pipe_to_umh;
1: +  struct file *pipe_from_umh;
1: +  struct path wd;
1: +  struct pid *tgid;
1:  };
1:  
1:  struct pin_cookie {};
1: @@ -25580,375 +25782,375 @@ struct pin_cookie {};
1:  struct preempt_notifier;
1:  
1:  struct preempt_ops {
1: -	void (*sched_in)(struct preempt_notifier *, int);
1: -	void (*sched_out)(struct preempt_notifier *, struct task_struct *);
1: +  void (*sched_in)(struct preempt_notifier *, int);
1: +  void (*sched_out)(struct preempt_notifier *, struct task_struct *);
1:  };
1:  
1:  struct preempt_notifier {
1: -	struct hlist_node link;
1: -	struct preempt_ops *ops;
1: +  struct hlist_node link;
1: +  struct preempt_ops *ops;
1:  };
1:  
1:  enum {
1: -	CSD_FLAG_LOCK = 1,
1: -	IRQ_WORK_PENDING = 1,
1: -	IRQ_WORK_BUSY = 2,
1: -	IRQ_WORK_LAZY = 4,
1: -	IRQ_WORK_HARD_IRQ = 8,
1: -	IRQ_WORK_CLAIMED = 3,
1: -	CSD_TYPE_ASYNC = 0,
1: -	CSD_TYPE_SYNC = 16,
1: -	CSD_TYPE_IRQ_WORK = 32,
1: -	CSD_TYPE_TTWU = 48,
1: -	CSD_FLAG_TYPE_MASK = 240,
1: +  CSD_FLAG_LOCK = 1,
1: +  IRQ_WORK_PENDING = 1,
1: +  IRQ_WORK_BUSY = 2,
1: +  IRQ_WORK_LAZY = 4,
1: +  IRQ_WORK_HARD_IRQ = 8,
1: +  IRQ_WORK_CLAIMED = 3,
1: +  CSD_TYPE_ASYNC = 0,
1: +  CSD_TYPE_SYNC = 16,
1: +  CSD_TYPE_IRQ_WORK = 32,
1: +  CSD_TYPE_TTWU = 48,
1: +  CSD_FLAG_TYPE_MASK = 240,
1:  };
1:  
1:  struct dl_bw {
1: -	raw_spinlock_t lock;
1: -	u64 bw;
1: -	u64 total_bw;
1: +  raw_spinlock_t lock;
1: +  u64 bw;
1: +  u64 total_bw;
1:  };
1:  
1:  struct cpudl_item;
1:  
1:  struct cpudl {
1: -	raw_spinlock_t lock;
1: -	int size;
1: -	cpumask_var_t free_cpus;
1: -	struct cpudl_item *elements;
1: +  raw_spinlock_t lock;
1: +  int size;
1: +  cpumask_var_t free_cpus;
1: +  struct cpudl_item *elements;
1:  };
1:  
1:  struct cpupri_vec {
1: -	atomic_t count;
1: -	cpumask_var_t mask;
1: +  atomic_t count;
1: +  cpumask_var_t mask;
1:  };
1:  
1:  struct cpupri {
1: -	struct cpupri_vec pri_to_cpu[102];
1: -	int *cpu_to_pri;
1: +  struct cpupri_vec pri_to_cpu[102];
1: +  int *cpu_to_pri;
1:  };
1:  
1:  struct perf_domain;
1:  
1:  struct root_domain {
1: -	atomic_t refcount;
1: -	atomic_t rto_count;
1: -	struct callback_head rcu;
1: -	cpumask_var_t span;
1: -	cpumask_var_t online;
1: -	int overload;
1: -	int overutilized;
1: -	cpumask_var_t dlo_mask;
1: -	atomic_t dlo_count;
1: -	struct dl_bw dl_bw;
1: -	struct cpudl cpudl;
1: -	struct irq_work rto_push_work;
1: -	raw_spinlock_t rto_lock;
1: -	int rto_loop;
1: -	int rto_cpu;
1: -	atomic_t rto_loop_next;
1: -	atomic_t rto_loop_start;
1: -	cpumask_var_t rto_mask;
1: -	struct cpupri cpupri;
1: -	long unsigned int max_cpu_capacity;
1: -	struct perf_domain *pd;
1: +  atomic_t refcount;
1: +  atomic_t rto_count;
1: +  struct callback_head rcu;
1: +  cpumask_var_t span;
1: +  cpumask_var_t online;
1: +  int overload;
1: +  int overutilized;
1: +  cpumask_var_t dlo_mask;
1: +  atomic_t dlo_count;
1: +  struct dl_bw dl_bw;
1: +  struct cpudl cpudl;
1: +  struct irq_work rto_push_work;
1: +  raw_spinlock_t rto_lock;
1: +  int rto_loop;
1: +  int rto_cpu;
1: +  atomic_t rto_loop_next;
1: +  atomic_t rto_loop_start;
1: +  cpumask_var_t rto_mask;
1: +  struct cpupri cpupri;
1: +  long unsigned int max_cpu_capacity;
1: +  struct perf_domain *pd;
1:  };
1:  
1:  struct cfs_rq {
1: -	struct load_weight load;
1: -	unsigned int nr_running;
1: -	unsigned int h_nr_running;
1: -	unsigned int idle_h_nr_running;
1: -	u64 exec_clock;
1: -	u64 min_vruntime;
1: -	struct rb_root_cached tasks_timeline;
1: -	struct sched_entity *curr;
1: -	struct sched_entity *next;
1: -	struct sched_entity *last;
1: -	struct sched_entity *skip;
1: -	unsigned int nr_spread_over;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct sched_avg avg;
1: -	struct {
1: -		raw_spinlock_t lock;
1: -		int nr;
1: -		long unsigned int load_avg;
1: -		long unsigned int util_avg;
1: -		long unsigned int runnable_avg;
1: -		long: 64;
1: -	} removed;
1: -	long unsigned int tg_load_avg_contrib;
1: -	long int propagate;
1: -	long int prop_runnable_sum;
1: -	long unsigned int h_load;
1: -	u64 last_h_load_update;
1: -	struct sched_entity *h_load_next;
1: -	struct rq *rq;
1: -	int on_list;
1: -	struct list_head leaf_cfs_rq_list;
1: -	struct task_group *tg;
1: -	int runtime_enabled;
1: -	s64 runtime_remaining;
1: -	u64 throttled_clock;
1: -	u64 throttled_clock_task;
1: -	u64 throttled_clock_task_time;
1: -	int throttled;
1: -	int throttle_count;
1: -	struct list_head throttled_list;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct load_weight load;
1: +  unsigned int nr_running;
1: +  unsigned int h_nr_running;
1: +  unsigned int idle_h_nr_running;
1: +  u64 exec_clock;
1: +  u64 min_vruntime;
1: +  struct rb_root_cached tasks_timeline;
1: +  struct sched_entity *curr;
1: +  struct sched_entity *next;
1: +  struct sched_entity *last;
1: +  struct sched_entity *skip;
1: +  unsigned int nr_spread_over;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct sched_avg avg;
1: +  struct {
1: +    raw_spinlock_t lock;
1: +    int nr;
1: +    long unsigned int load_avg;
1: +    long unsigned int util_avg;
1: +    long unsigned int runnable_avg;
1: +    long : 64;
1: +  } removed;
1: +  long unsigned int tg_load_avg_contrib;
1: +  long int propagate;
1: +  long int prop_runnable_sum;
1: +  long unsigned int h_load;
1: +  u64 last_h_load_update;
1: +  struct sched_entity *h_load_next;
1: +  struct rq *rq;
1: +  int on_list;
1: +  struct list_head leaf_cfs_rq_list;
1: +  struct task_group *tg;
1: +  int runtime_enabled;
1: +  s64 runtime_remaining;
1: +  u64 throttled_clock;
1: +  u64 throttled_clock_task;
1: +  u64 throttled_clock_task_time;
1: +  int throttled;
1: +  int throttle_count;
1: +  struct list_head throttled_list;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct cfs_bandwidth {
1: -	raw_spinlock_t lock;
1: -	ktime_t period;
1: -	u64 quota;
1: -	u64 runtime;
1: -	s64 hierarchical_quota;
1: -	u8 idle;
1: -	u8 period_active;
1: -	u8 slack_started;
1: -	struct hrtimer period_timer;
1: -	struct hrtimer slack_timer;
1: -	struct list_head throttled_cfs_rq;
1: -	int nr_periods;
1: -	int nr_throttled;
1: -	u64 throttled_time;
1: +  raw_spinlock_t lock;
1: +  ktime_t period;
1: +  u64 quota;
1: +  u64 runtime;
1: +  s64 hierarchical_quota;
1: +  u8 idle;
1: +  u8 period_active;
1: +  u8 slack_started;
1: +  struct hrtimer period_timer;
1: +  struct hrtimer slack_timer;
1: +  struct list_head throttled_cfs_rq;
1: +  int nr_periods;
1: +  int nr_throttled;
1: +  u64 throttled_time;
1:  };
1:  
1:  struct task_group {
1: -	struct cgroup_subsys_state css;
1: -	struct sched_entity **se;
1: -	struct cfs_rq **cfs_rq;
1: -	long unsigned int shares;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	atomic_long_t load_avg;
1: -	struct callback_head rcu;
1: -	struct list_head list;
1: -	struct task_group *parent;
1: -	struct list_head siblings;
1: -	struct list_head children;
1: -	struct cfs_bandwidth cfs_bandwidth;
1: -	long: 64;
1: -	long: 64;
1: +  struct cgroup_subsys_state css;
1: +  struct sched_entity **se;
1: +  struct cfs_rq **cfs_rq;
1: +  long unsigned int shares;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  atomic_long_t load_avg;
1: +  struct callback_head rcu;
1: +  struct list_head list;
1: +  struct task_group *parent;
1: +  struct list_head siblings;
1: +  struct list_head children;
1: +  struct cfs_bandwidth cfs_bandwidth;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sched_group {
1: -	struct sched_group *next;
1: -	atomic_t ref;
1: -	unsigned int group_weight;
1: -	struct sched_group_capacity *sgc;
1: -	int asym_prefer_cpu;
1: -	long unsigned int cpumask[0];
1: +  struct sched_group *next;
1: +  atomic_t ref;
1: +  unsigned int group_weight;
1: +  struct sched_group_capacity *sgc;
1: +  int asym_prefer_cpu;
1: +  long unsigned int cpumask[0];
1:  };
1:  
1:  struct sched_group_capacity {
1: -	atomic_t ref;
1: -	long unsigned int capacity;
1: -	long unsigned int min_capacity;
1: -	long unsigned int max_capacity;
1: -	long unsigned int next_update;
1: -	int imbalance;
1: -	int id;
1: -	long unsigned int cpumask[0];
1: +  atomic_t ref;
1: +  long unsigned int capacity;
1: +  long unsigned int min_capacity;
1: +  long unsigned int max_capacity;
1: +  long unsigned int next_update;
1: +  int imbalance;
1: +  int id;
1: +  long unsigned int cpumask[0];
1:  };
1:  
1:  struct em_perf_state {
1: -	long unsigned int frequency;
1: -	long unsigned int power;
1: -	long unsigned int cost;
1: +  long unsigned int frequency;
1: +  long unsigned int power;
1: +  long unsigned int cost;
1:  };
1:  
1:  struct em_perf_domain {
1: -	struct em_perf_state *table;
1: -	int nr_perf_states;
1: -	long unsigned int cpus[0];
1: +  struct em_perf_state *table;
1: +  int nr_perf_states;
1: +  long unsigned int cpus[0];
1:  };
1:  
1:  enum ctx_state {
1: -	CONTEXT_DISABLED = 4294967295,
1: -	CONTEXT_KERNEL = 0,
1: -	CONTEXT_USER = 1,
1: -	CONTEXT_GUEST = 2,
1: +  CONTEXT_DISABLED = 4294967295,
1: +  CONTEXT_KERNEL = 0,
1: +  CONTEXT_USER = 1,
1: +  CONTEXT_GUEST = 2,
1:  };
1:  
1:  struct kernel_cpustat {
1: -	u64 cpustat[10];
1: +  u64 cpustat[10];
1:  };
1:  
1:  enum {
1: -	MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY = 1,
1: -	MEMBARRIER_STATE_PRIVATE_EXPEDITED = 2,
1: -	MEMBARRIER_STATE_GLOBAL_EXPEDITED_READY = 4,
1: -	MEMBARRIER_STATE_GLOBAL_EXPEDITED = 8,
1: -	MEMBARRIER_STATE_PRIVATE_EXPEDITED_SYNC_CORE_READY = 16,
1: -	MEMBARRIER_STATE_PRIVATE_EXPEDITED_SYNC_CORE = 32,
1: -	MEMBARRIER_STATE_PRIVATE_EXPEDITED_RSEQ_READY = 64,
1: -	MEMBARRIER_STATE_PRIVATE_EXPEDITED_RSEQ = 128,
1: +  MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY = 1,
1: +  MEMBARRIER_STATE_PRIVATE_EXPEDITED = 2,
1: +  MEMBARRIER_STATE_GLOBAL_EXPEDITED_READY = 4,
1: +  MEMBARRIER_STATE_GLOBAL_EXPEDITED = 8,
1: +  MEMBARRIER_STATE_PRIVATE_EXPEDITED_SYNC_CORE_READY = 16,
1: +  MEMBARRIER_STATE_PRIVATE_EXPEDITED_SYNC_CORE = 32,
1: +  MEMBARRIER_STATE_PRIVATE_EXPEDITED_RSEQ_READY = 64,
1: +  MEMBARRIER_STATE_PRIVATE_EXPEDITED_RSEQ = 128,
1:  };
1:  
1:  enum {
1: -	CFTYPE_ONLY_ON_ROOT = 1,
1: -	CFTYPE_NOT_ON_ROOT = 2,
1: -	CFTYPE_NS_DELEGATABLE = 4,
1: -	CFTYPE_NO_PREFIX = 8,
1: -	CFTYPE_WORLD_WRITABLE = 16,
1: -	CFTYPE_DEBUG = 32,
1: -	__CFTYPE_ONLY_ON_DFL = 65536,
1: -	__CFTYPE_NOT_ON_DFL = 131072,
1: +  CFTYPE_ONLY_ON_ROOT = 1,
1: +  CFTYPE_NOT_ON_ROOT = 2,
1: +  CFTYPE_NS_DELEGATABLE = 4,
1: +  CFTYPE_NO_PREFIX = 8,
1: +  CFTYPE_WORLD_WRITABLE = 16,
1: +  CFTYPE_DEBUG = 32,
1: +  __CFTYPE_ONLY_ON_DFL = 65536,
1: +  __CFTYPE_NOT_ON_DFL = 131072,
1:  };
1:  
1:  struct trace_event_raw_sched_kthread_stop {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_kthread_stop_ret {
1: -	struct trace_entry ent;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_wakeup_template {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	int prio;
1: -	int success;
1: -	int target_cpu;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  int prio;
1: +  int success;
1: +  int target_cpu;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_switch {
1: -	struct trace_entry ent;
1: -	char prev_comm[16];
1: -	pid_t prev_pid;
1: -	int prev_prio;
1: -	long int prev_state;
1: -	char next_comm[16];
1: -	pid_t next_pid;
1: -	int next_prio;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char prev_comm[16];
1: +  pid_t prev_pid;
1: +  int prev_prio;
1: +  long int prev_state;
1: +  char next_comm[16];
1: +  pid_t next_pid;
1: +  int next_prio;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_migrate_task {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	int prio;
1: -	int orig_cpu;
1: -	int dest_cpu;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  int prio;
1: +  int orig_cpu;
1: +  int dest_cpu;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_process_template {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	int prio;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  int prio;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_process_wait {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	int prio;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  int prio;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_process_fork {
1: -	struct trace_entry ent;
1: -	char parent_comm[16];
1: -	pid_t parent_pid;
1: -	char child_comm[16];
1: -	pid_t child_pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char parent_comm[16];
1: +  pid_t parent_pid;
1: +  char child_comm[16];
1: +  pid_t child_pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_process_exec {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_filename;
1: -	pid_t pid;
1: -	pid_t old_pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_filename;
1: +  pid_t pid;
1: +  pid_t old_pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_stat_template {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	u64 delay;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  u64 delay;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_stat_runtime {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	u64 runtime;
1: -	u64 vruntime;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  u64 runtime;
1: +  u64 vruntime;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_pi_setprio {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	int oldprio;
1: -	int newprio;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  int oldprio;
1: +  int newprio;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_process_hang {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	pid_t pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  pid_t pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_move_numa {
1: -	struct trace_entry ent;
1: -	pid_t pid;
1: -	pid_t tgid;
1: -	pid_t ngid;
1: -	int src_cpu;
1: -	int src_nid;
1: -	int dst_cpu;
1: -	int dst_nid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  pid_t pid;
1: +  pid_t tgid;
1: +  pid_t ngid;
1: +  int src_cpu;
1: +  int src_nid;
1: +  int dst_cpu;
1: +  int dst_nid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_numa_pair_template {
1: -	struct trace_entry ent;
1: -	pid_t src_pid;
1: -	pid_t src_tgid;
1: -	pid_t src_ngid;
1: -	int src_cpu;
1: -	int src_nid;
1: -	pid_t dst_pid;
1: -	pid_t dst_tgid;
1: -	pid_t dst_ngid;
1: -	int dst_cpu;
1: -	int dst_nid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  pid_t src_pid;
1: +  pid_t src_tgid;
1: +  pid_t src_ngid;
1: +  int src_cpu;
1: +  int src_nid;
1: +  pid_t dst_pid;
1: +  pid_t dst_tgid;
1: +  pid_t dst_ngid;
1: +  int dst_cpu;
1: +  int dst_nid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sched_wake_idle_without_ipi {
1: -	struct trace_entry ent;
1: -	int cpu;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int cpu;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_sched_kthread_stop {};
1: @@ -25968,7 +26170,7 @@ struct trace_event_data_offsets_sched_process_wait {};
1:  struct trace_event_data_offsets_sched_process_fork {};
1:  
1:  struct trace_event_data_offsets_sched_process_exec {
1: -	u32 filename;
1: +  u32 filename;
1:  };
1:  
1:  struct trace_event_data_offsets_sched_stat_template {};
1: @@ -25995,7 +26197,8 @@ typedef void (*btf_trace_sched_wakeup)(void *, struct task_struct *);
1:  
1:  typedef void (*btf_trace_sched_wakeup_new)(void *, struct task_struct *);
1:  
1: -typedef void (*btf_trace_sched_switch)(void *, bool, struct task_struct *, struct task_struct *);
1: +typedef void (*btf_trace_sched_switch)(void *, bool, struct task_struct *,
1: +                                       struct task_struct *);
1:  
1:  typedef void (*btf_trace_sched_migrate_task)(void *, struct task_struct *, int);
1:  
1: @@ -26007,9 +26210,11 @@ typedef void (*btf_trace_sched_wait_task)(void *, struct task_struct *);
1:  
1:  typedef void (*btf_trace_sched_process_wait)(void *, struct pid *);
1:  
1: -typedef void (*btf_trace_sched_process_fork)(void *, struct task_struct *, struct task_struct *);
1: +typedef void (*btf_trace_sched_process_fork)(void *, struct task_struct *,
1: +                                             struct task_struct *);
1:  
1: -typedef void (*btf_trace_sched_process_exec)(void *, struct task_struct *, pid_t, struct linux_binprm *);
1: +typedef void (*btf_trace_sched_process_exec)(void *, struct task_struct *,
1: +                                             pid_t, struct linux_binprm *);
1:  
1:  typedef void (*btf_trace_sched_stat_wait)(void *, struct task_struct *, u64);
1:  
1: @@ -26019,47 +26224,52 @@ typedef void (*btf_trace_sched_stat_iowait)(void *, struct task_struct *, u64);
1:  
1:  typedef void (*btf_trace_sched_stat_blocked)(void *, struct task_struct *, u64);
1:  
1: -typedef void (*btf_trace_sched_stat_runtime)(void *, struct task_struct *, u64, u64);
1: +typedef void (*btf_trace_sched_stat_runtime)(void *, struct task_struct *, u64,
1: +                                             u64);
1:  
1: -typedef void (*btf_trace_sched_pi_setprio)(void *, struct task_struct *, struct task_struct *);
1: +typedef void (*btf_trace_sched_pi_setprio)(void *, struct task_struct *,
1: +                                           struct task_struct *);
1:  
1:  typedef void (*btf_trace_sched_process_hang)(void *, struct task_struct *);
1:  
1: -typedef void (*btf_trace_sched_move_numa)(void *, struct task_struct *, int, int);
1: +typedef void (*btf_trace_sched_move_numa)(void *, struct task_struct *, int,
1: +                                          int);
1:  
1: -typedef void (*btf_trace_sched_stick_numa)(void *, struct task_struct *, int, struct task_struct *, int);
1: +typedef void (*btf_trace_sched_stick_numa)(void *, struct task_struct *, int,
1: +                                           struct task_struct *, int);
1:  
1: -typedef void (*btf_trace_sched_swap_numa)(void *, struct task_struct *, int, struct task_struct *, int);
1: +typedef void (*btf_trace_sched_swap_numa)(void *, struct task_struct *, int,
1: +                                          struct task_struct *, int);
1:  
1:  typedef void (*btf_trace_sched_wake_idle_without_ipi)(void *, int);
1:  
1:  struct wake_q_head {
1: -	struct wake_q_node *first;
1: -	struct wake_q_node **lastp;
1: +  struct wake_q_node *first;
1: +  struct wake_q_node **lastp;
1:  };
1:  
1:  struct sched_attr {
1: -	__u32 size;
1: -	__u32 sched_policy;
1: -	__u64 sched_flags;
1: -	__s32 sched_nice;
1: -	__u32 sched_priority;
1: -	__u64 sched_runtime;
1: -	__u64 sched_deadline;
1: -	__u64 sched_period;
1: -	__u32 sched_util_min;
1: -	__u32 sched_util_max;
1: +  __u32 size;
1: +  __u32 sched_policy;
1: +  __u64 sched_flags;
1: +  __s32 sched_nice;
1: +  __u32 sched_priority;
1: +  __u64 sched_runtime;
1: +  __u64 sched_deadline;
1: +  __u64 sched_period;
1: +  __u32 sched_util_min;
1: +  __u32 sched_util_max;
1:  };
1:  
1:  struct cpuidle_state_usage {
1: -	long long unsigned int disable;
1: -	long long unsigned int usage;
1: -	u64 time_ns;
1: -	long long unsigned int above;
1: -	long long unsigned int below;
1: -	long long unsigned int rejected;
1: -	long long unsigned int s2idle_usage;
1: -	long long unsigned int s2idle_time;
1: +  long long unsigned int disable;
1: +  long long unsigned int usage;
1: +  u64 time_ns;
1: +  long long unsigned int above;
1: +  long long unsigned int below;
1: +  long long unsigned int rejected;
1: +  long long unsigned int s2idle_usage;
1: +  long long unsigned int s2idle_time;
1:  };
1:  
1:  struct cpuidle_device;
1: @@ -26067,17 +26277,17 @@ struct cpuidle_device;
1:  struct cpuidle_driver;
1:  
1:  struct cpuidle_state {
1: -	char name[16];
1: -	char desc[32];
1: -	u64 exit_latency_ns;
1: -	u64 target_residency_ns;
1: -	unsigned int flags;
1: -	unsigned int exit_latency;
1: -	int power_usage;
1: -	unsigned int target_residency;
1: -	int (*enter)(struct cpuidle_device *, struct cpuidle_driver *, int);
1: -	int (*enter_dead)(struct cpuidle_device *, int);
1: -	int (*enter_s2idle)(struct cpuidle_device *, struct cpuidle_driver *, int);
1: +  char name[16];
1: +  char desc[32];
1: +  u64 exit_latency_ns;
1: +  u64 target_residency_ns;
1: +  unsigned int flags;
1: +  unsigned int exit_latency;
1: +  int power_usage;
1: +  unsigned int target_residency;
1: +  int (*enter)(struct cpuidle_device *, struct cpuidle_driver *, int);
1: +  int (*enter_dead)(struct cpuidle_device *, int);
1: +  int (*enter_s2idle)(struct cpuidle_device *, struct cpuidle_driver *, int);
1:  };
1:  
1:  struct cpuidle_driver_kobj;
1: @@ -26087,31 +26297,31 @@ struct cpuidle_state_kobj;
1:  struct cpuidle_device_kobj;
1:  
1:  struct cpuidle_device {
1: -	unsigned int registered: 1;
1: -	unsigned int enabled: 1;
1: -	unsigned int poll_time_limit: 1;
1: -	unsigned int cpu;
1: -	ktime_t next_hrtimer;
1: -	int last_state_idx;
1: -	u64 last_residency_ns;
1: -	u64 poll_limit_ns;
1: -	u64 forced_idle_latency_limit_ns;
1: -	struct cpuidle_state_usage states_usage[10];
1: -	struct cpuidle_state_kobj *kobjs[10];
1: -	struct cpuidle_driver_kobj *kobj_driver;
1: -	struct cpuidle_device_kobj *kobj_dev;
1: -	struct list_head device_list;
1: +  unsigned int registered : 1;
1: +  unsigned int enabled : 1;
1: +  unsigned int poll_time_limit : 1;
1: +  unsigned int cpu;
1: +  ktime_t next_hrtimer;
1: +  int last_state_idx;
1: +  u64 last_residency_ns;
1: +  u64 poll_limit_ns;
1: +  u64 forced_idle_latency_limit_ns;
1: +  struct cpuidle_state_usage states_usage[10];
1: +  struct cpuidle_state_kobj *kobjs[10];
1: +  struct cpuidle_driver_kobj *kobj_driver;
1: +  struct cpuidle_device_kobj *kobj_dev;
1: +  struct list_head device_list;
1:  };
1:  
1:  struct cpuidle_driver {
1: -	const char *name;
1: -	struct module *owner;
1: -	unsigned int bctimer: 1;
1: -	struct cpuidle_state states[10];
1: -	int state_count;
1: -	int safe_state_index;
1: -	struct cpumask *cpumask;
1: -	const char *governor;
1: +  const char *name;
1: +  struct module *owner;
1: +  unsigned int bctimer : 1;
1: +  struct cpuidle_state states[10];
1: +  int state_count;
1: +  int safe_state_index;
1: +  struct cpumask *cpumask;
1: +  const char *governor;
1:  };
1:  
1:  typedef int (*cpu_stop_fn_t)(void *);
1: @@ -26119,1028 +26329,1028 @@ typedef int (*cpu_stop_fn_t)(void *);
1:  struct cpu_stop_done;
1:  
1:  struct cpu_stop_work {
1: -	struct list_head list;
1: -	cpu_stop_fn_t fn;
1: -	void *arg;
1: -	struct cpu_stop_done *done;
1: +  struct list_head list;
1: +  cpu_stop_fn_t fn;
1: +  void *arg;
1: +  struct cpu_stop_done *done;
1:  };
1:  
1:  struct cpudl_item {
1: -	u64 dl;
1: -	int cpu;
1: -	int idx;
1: +  u64 dl;
1: +  int cpu;
1: +  int idx;
1:  };
1:  
1:  struct rt_prio_array {
1: -	long unsigned int bitmap[2];
1: -	struct list_head queue[100];
1: +  long unsigned int bitmap[2];
1: +  struct list_head queue[100];
1:  };
1:  
1:  struct rt_bandwidth {
1: -	raw_spinlock_t rt_runtime_lock;
1: -	ktime_t rt_period;
1: -	u64 rt_runtime;
1: -	struct hrtimer rt_period_timer;
1: -	unsigned int rt_period_active;
1: +  raw_spinlock_t rt_runtime_lock;
1: +  ktime_t rt_period;
1: +  u64 rt_runtime;
1: +  struct hrtimer rt_period_timer;
1: +  unsigned int rt_period_active;
1:  };
1:  
1:  struct dl_bandwidth {
1: -	raw_spinlock_t dl_runtime_lock;
1: -	u64 dl_runtime;
1: -	u64 dl_period;
1: +  raw_spinlock_t dl_runtime_lock;
1: +  u64 dl_runtime;
1: +  u64 dl_period;
1:  };
1:  
1:  typedef int (*tg_visitor)(struct task_group *, void *);
1:  
1:  struct rt_rq {
1: -	struct rt_prio_array active;
1: -	unsigned int rt_nr_running;
1: -	unsigned int rr_nr_running;
1: -	struct {
1: -		int curr;
1: -		int next;
1: -	} highest_prio;
1: -	long unsigned int rt_nr_migratory;
1: -	long unsigned int rt_nr_total;
1: -	int overloaded;
1: -	struct plist_head pushable_tasks;
1: -	int rt_queued;
1: -	int rt_throttled;
1: -	u64 rt_time;
1: -	u64 rt_runtime;
1: -	raw_spinlock_t rt_runtime_lock;
1: +  struct rt_prio_array active;
1: +  unsigned int rt_nr_running;
1: +  unsigned int rr_nr_running;
1: +  struct {
1: +    int curr;
1: +    int next;
1: +  } highest_prio;
1: +  long unsigned int rt_nr_migratory;
1: +  long unsigned int rt_nr_total;
1: +  int overloaded;
1: +  struct plist_head pushable_tasks;
1: +  int rt_queued;
1: +  int rt_throttled;
1: +  u64 rt_time;
1: +  u64 rt_runtime;
1: +  raw_spinlock_t rt_runtime_lock;
1:  };
1:  
1:  struct dl_rq {
1: -	struct rb_root_cached root;
1: -	long unsigned int dl_nr_running;
1: -	struct {
1: -		u64 curr;
1: -		u64 next;
1: -	} earliest_dl;
1: -	long unsigned int dl_nr_migratory;
1: -	int overloaded;
1: -	struct rb_root_cached pushable_dl_tasks_root;
1: -	u64 running_bw;
1: -	u64 this_bw;
1: -	u64 extra_bw;
1: -	u64 bw_ratio;
1: +  struct rb_root_cached root;
1: +  long unsigned int dl_nr_running;
1: +  struct {
1: +    u64 curr;
1: +    u64 next;
1: +  } earliest_dl;
1: +  long unsigned int dl_nr_migratory;
1: +  int overloaded;
1: +  struct rb_root_cached pushable_dl_tasks_root;
1: +  u64 running_bw;
1: +  u64 this_bw;
1: +  u64 extra_bw;
1: +  u64 bw_ratio;
1:  };
1:  
1:  struct rq {
1: -	raw_spinlock_t lock;
1: -	unsigned int nr_running;
1: -	unsigned int nr_numa_running;
1: -	unsigned int nr_preferred_running;
1: -	unsigned int numa_migrate_on;
1: -	long unsigned int last_blocked_load_update_tick;
1: -	unsigned int has_blocked_load;
1: -	long: 32;
1: -	long: 64;
1: -	call_single_data_t nohz_csd;
1: -	unsigned int nohz_tick_stopped;
1: -	atomic_t nohz_flags;
1: -	unsigned int ttwu_pending;
1: -	u64 nr_switches;
1: -	long: 64;
1: -	struct cfs_rq cfs;
1: -	struct rt_rq rt;
1: -	struct dl_rq dl;
1: -	struct list_head leaf_cfs_rq_list;
1: -	struct list_head *tmp_alone_branch;
1: -	long unsigned int nr_uninterruptible;
1: -	struct task_struct *curr;
1: -	struct task_struct *idle;
1: -	struct task_struct *stop;
1: -	long unsigned int next_balance;
1: -	struct mm_struct *prev_mm;
1: -	unsigned int clock_update_flags;
1: -	u64 clock;
1: -	long: 64;
1: -	u64 clock_task;
1: -	u64 clock_pelt;
1: -	long unsigned int lost_idle_time;
1: -	atomic_t nr_iowait;
1: -	int membarrier_state;
1: -	struct root_domain *rd;
1: -	struct sched_domain *sd;
1: -	long unsigned int cpu_capacity;
1: -	long unsigned int cpu_capacity_orig;
1: -	struct callback_head *balance_callback;
1: -	unsigned char nohz_idle_balance;
1: -	unsigned char idle_balance;
1: -	long unsigned int misfit_task_load;
1: -	int active_balance;
1: -	int push_cpu;
1: -	struct cpu_stop_work active_balance_work;
1: -	int cpu;
1: -	int online;
1: -	struct list_head cfs_tasks;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct sched_avg avg_rt;
1: -	struct sched_avg avg_dl;
1: -	u64 idle_stamp;
1: -	u64 avg_idle;
1: -	u64 max_idle_balance_cost;
1: -	long unsigned int calc_load_update;
1: -	long int calc_load_active;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	call_single_data_t hrtick_csd;
1: -	struct hrtimer hrtick_timer;
1: -	struct sched_info rq_sched_info;
1: -	long long unsigned int rq_cpu_time;
1: -	unsigned int yld_count;
1: -	unsigned int sched_count;
1: -	unsigned int sched_goidle;
1: -	unsigned int ttwu_count;
1: -	unsigned int ttwu_local;
1: -	struct cpuidle_state *idle_state;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  raw_spinlock_t lock;
1: +  unsigned int nr_running;
1: +  unsigned int nr_numa_running;
1: +  unsigned int nr_preferred_running;
1: +  unsigned int numa_migrate_on;
1: +  long unsigned int last_blocked_load_update_tick;
1: +  unsigned int has_blocked_load;
1: +  long : 32;
1: +  long : 64;
1: +  call_single_data_t nohz_csd;
1: +  unsigned int nohz_tick_stopped;
1: +  atomic_t nohz_flags;
1: +  unsigned int ttwu_pending;
1: +  u64 nr_switches;
1: +  long : 64;
1: +  struct cfs_rq cfs;
1: +  struct rt_rq rt;
1: +  struct dl_rq dl;
1: +  struct list_head leaf_cfs_rq_list;
1: +  struct list_head *tmp_alone_branch;
1: +  long unsigned int nr_uninterruptible;
1: +  struct task_struct *curr;
1: +  struct task_struct *idle;
1: +  struct task_struct *stop;
1: +  long unsigned int next_balance;
1: +  struct mm_struct *prev_mm;
1: +  unsigned int clock_update_flags;
1: +  u64 clock;
1: +  long : 64;
1: +  u64 clock_task;
1: +  u64 clock_pelt;
1: +  long unsigned int lost_idle_time;
1: +  atomic_t nr_iowait;
1: +  int membarrier_state;
1: +  struct root_domain *rd;
1: +  struct sched_domain *sd;
1: +  long unsigned int cpu_capacity;
1: +  long unsigned int cpu_capacity_orig;
1: +  struct callback_head *balance_callback;
1: +  unsigned char nohz_idle_balance;
1: +  unsigned char idle_balance;
1: +  long unsigned int misfit_task_load;
1: +  int active_balance;
1: +  int push_cpu;
1: +  struct cpu_stop_work active_balance_work;
1: +  int cpu;
1: +  int online;
1: +  struct list_head cfs_tasks;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct sched_avg avg_rt;
1: +  struct sched_avg avg_dl;
1: +  u64 idle_stamp;
1: +  u64 avg_idle;
1: +  u64 max_idle_balance_cost;
1: +  long unsigned int calc_load_update;
1: +  long int calc_load_active;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  call_single_data_t hrtick_csd;
1: +  struct hrtimer hrtick_timer;
1: +  struct sched_info rq_sched_info;
1: +  long long unsigned int rq_cpu_time;
1: +  unsigned int yld_count;
1: +  unsigned int sched_count;
1: +  unsigned int sched_goidle;
1: +  unsigned int ttwu_count;
1: +  unsigned int ttwu_local;
1: +  struct cpuidle_state *idle_state;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct perf_domain {
1: -	struct em_perf_domain *em_pd;
1: -	struct perf_domain *next;
1: -	struct callback_head rcu;
1: +  struct em_perf_domain *em_pd;
1: +  struct perf_domain *next;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct rq_flags {
1: -	long unsigned int flags;
1: -	struct pin_cookie cookie;
1: -	unsigned int clock_update_flags;
1: -};
1: -
1: -enum {
1: -	__SCHED_FEAT_GENTLE_FAIR_SLEEPERS = 0,
1: -	__SCHED_FEAT_START_DEBIT = 1,
1: -	__SCHED_FEAT_NEXT_BUDDY = 2,
1: -	__SCHED_FEAT_LAST_BUDDY = 3,
1: -	__SCHED_FEAT_CACHE_HOT_BUDDY = 4,
1: -	__SCHED_FEAT_WAKEUP_PREEMPTION = 5,
1: -	__SCHED_FEAT_HRTICK = 6,
1: -	__SCHED_FEAT_DOUBLE_TICK = 7,
1: -	__SCHED_FEAT_NONTASK_CAPACITY = 8,
1: -	__SCHED_FEAT_TTWU_QUEUE = 9,
1: -	__SCHED_FEAT_SIS_AVG_CPU = 10,
1: -	__SCHED_FEAT_SIS_PROP = 11,
1: -	__SCHED_FEAT_WARN_DOUBLE_CLOCK = 12,
1: -	__SCHED_FEAT_RT_PUSH_IPI = 13,
1: -	__SCHED_FEAT_RT_RUNTIME_SHARE = 14,
1: -	__SCHED_FEAT_LB_MIN = 15,
1: -	__SCHED_FEAT_ATTACH_AGE_LOAD = 16,
1: -	__SCHED_FEAT_WA_IDLE = 17,
1: -	__SCHED_FEAT_WA_WEIGHT = 18,
1: -	__SCHED_FEAT_WA_BIAS = 19,
1: -	__SCHED_FEAT_UTIL_EST = 20,
1: -	__SCHED_FEAT_UTIL_EST_FASTUP = 21,
1: -	__SCHED_FEAT_NR = 22,
1: +  long unsigned int flags;
1: +  struct pin_cookie cookie;
1: +  unsigned int clock_update_flags;
1: +};
1: +
1: +enum {
1: +  __SCHED_FEAT_GENTLE_FAIR_SLEEPERS = 0,
1: +  __SCHED_FEAT_START_DEBIT = 1,
1: +  __SCHED_FEAT_NEXT_BUDDY = 2,
1: +  __SCHED_FEAT_LAST_BUDDY = 3,
1: +  __SCHED_FEAT_CACHE_HOT_BUDDY = 4,
1: +  __SCHED_FEAT_WAKEUP_PREEMPTION = 5,
1: +  __SCHED_FEAT_HRTICK = 6,
1: +  __SCHED_FEAT_DOUBLE_TICK = 7,
1: +  __SCHED_FEAT_NONTASK_CAPACITY = 8,
1: +  __SCHED_FEAT_TTWU_QUEUE = 9,
1: +  __SCHED_FEAT_SIS_AVG_CPU = 10,
1: +  __SCHED_FEAT_SIS_PROP = 11,
1: +  __SCHED_FEAT_WARN_DOUBLE_CLOCK = 12,
1: +  __SCHED_FEAT_RT_PUSH_IPI = 13,
1: +  __SCHED_FEAT_RT_RUNTIME_SHARE = 14,
1: +  __SCHED_FEAT_LB_MIN = 15,
1: +  __SCHED_FEAT_ATTACH_AGE_LOAD = 16,
1: +  __SCHED_FEAT_WA_IDLE = 17,
1: +  __SCHED_FEAT_WA_WEIGHT = 18,
1: +  __SCHED_FEAT_WA_BIAS = 19,
1: +  __SCHED_FEAT_UTIL_EST = 20,
1: +  __SCHED_FEAT_UTIL_EST_FASTUP = 21,
1: +  __SCHED_FEAT_NR = 22,
1:  };
1:  
1:  struct migration_arg {
1: -	struct task_struct *task;
1: -	int dest_cpu;
1: +  struct task_struct *task;
1: +  int dest_cpu;
1:  };
1:  
1:  struct migration_swap_arg {
1: -	struct task_struct *src_task;
1: -	struct task_struct *dst_task;
1: -	int src_cpu;
1: -	int dst_cpu;
1: +  struct task_struct *src_task;
1: +  struct task_struct *dst_task;
1: +  int src_cpu;
1: +  int dst_cpu;
1:  };
1:  
1:  struct cfs_schedulable_data {
1: -	struct task_group *tg;
1: -	u64 period;
1: -	u64 quota;
1: +  struct task_group *tg;
1: +  u64 period;
1: +  u64 quota;
1:  };
1:  
1:  enum {
1: -	cpuset = 0,
1: -	possible = 1,
1: -	fail = 2,
1: +  cpuset = 0,
1: +  possible = 1,
1: +  fail = 2,
1:  };
1:  
1:  enum tick_dep_bits {
1: -	TICK_DEP_BIT_POSIX_TIMER = 0,
1: -	TICK_DEP_BIT_PERF_EVENTS = 1,
1: -	TICK_DEP_BIT_SCHED = 2,
1: -	TICK_DEP_BIT_CLOCK_UNSTABLE = 3,
1: -	TICK_DEP_BIT_RCU = 4,
1: -	TICK_DEP_BIT_RCU_EXP = 5,
1: +  TICK_DEP_BIT_POSIX_TIMER = 0,
1: +  TICK_DEP_BIT_PERF_EVENTS = 1,
1: +  TICK_DEP_BIT_SCHED = 2,
1: +  TICK_DEP_BIT_CLOCK_UNSTABLE = 3,
1: +  TICK_DEP_BIT_RCU = 4,
1: +  TICK_DEP_BIT_RCU_EXP = 5,
1:  };
1:  
1:  struct sched_clock_data {
1: -	u64 tick_raw;
1: -	u64 tick_gtod;
1: -	u64 clock;
1: +  u64 tick_raw;
1: +  u64 tick_gtod;
1: +  u64 clock;
1:  };
1:  
1:  enum s2idle_states {
1: -	S2IDLE_STATE_NONE = 0,
1: -	S2IDLE_STATE_ENTER = 1,
1: -	S2IDLE_STATE_WAKE = 2,
1: +  S2IDLE_STATE_NONE = 0,
1: +  S2IDLE_STATE_ENTER = 1,
1: +  S2IDLE_STATE_WAKE = 2,
1:  };
1:  
1:  struct idle_timer {
1: -	struct hrtimer timer;
1: -	int done;
1: +  struct hrtimer timer;
1: +  int done;
1:  };
1:  
1:  typedef void (*rcu_callback_t)(struct callback_head *);
1:  
1:  struct numa_group {
1: -	refcount_t refcount;
1: -	spinlock_t lock;
1: -	int nr_tasks;
1: -	pid_t gid;
1: -	int active_nodes;
1: -	struct callback_head rcu;
1: -	long unsigned int total_faults;
1: -	long unsigned int max_faults_cpu;
1: -	long unsigned int *faults_cpu;
1: -	long unsigned int faults[0];
1: +  refcount_t refcount;
1: +  spinlock_t lock;
1: +  int nr_tasks;
1: +  pid_t gid;
1: +  int active_nodes;
1: +  struct callback_head rcu;
1: +  long unsigned int total_faults;
1: +  long unsigned int max_faults_cpu;
1: +  long unsigned int *faults_cpu;
1: +  long unsigned int faults[0];
1:  };
1:  
1:  struct update_util_data {
1: -	void (*func)(struct update_util_data *, u64, unsigned int);
1: +  void (*func)(struct update_util_data *, u64, unsigned int);
1:  };
1:  
1:  enum numa_topology_type {
1: -	NUMA_DIRECT = 0,
1: -	NUMA_GLUELESS_MESH = 1,
1: -	NUMA_BACKPLANE = 2,
1: +  NUMA_DIRECT = 0,
1: +  NUMA_GLUELESS_MESH = 1,
1: +  NUMA_BACKPLANE = 2,
1:  };
1:  
1:  enum numa_faults_stats {
1: -	NUMA_MEM = 0,
1: -	NUMA_CPU = 1,
1: -	NUMA_MEMBUF = 2,
1: -	NUMA_CPUBUF = 3,
1: +  NUMA_MEM = 0,
1: +  NUMA_CPU = 1,
1: +  NUMA_MEMBUF = 2,
1: +  NUMA_CPUBUF = 3,
1:  };
1:  
1:  enum schedutil_type {
1: -	FREQUENCY_UTIL = 0,
1: -	ENERGY_UTIL = 1,
1: +  FREQUENCY_UTIL = 0,
1: +  ENERGY_UTIL = 1,
1:  };
1:  
1:  enum numa_type {
1: -	node_has_spare = 0,
1: -	node_fully_busy = 1,
1: -	node_overloaded = 2,
1: +  node_has_spare = 0,
1: +  node_fully_busy = 1,
1: +  node_overloaded = 2,
1:  };
1:  
1:  struct numa_stats {
1: -	long unsigned int load;
1: -	long unsigned int runnable;
1: -	long unsigned int util;
1: -	long unsigned int compute_capacity;
1: -	unsigned int nr_running;
1: -	unsigned int weight;
1: -	enum numa_type node_type;
1: -	int idle_cpu;
1: +  long unsigned int load;
1: +  long unsigned int runnable;
1: +  long unsigned int util;
1: +  long unsigned int compute_capacity;
1: +  unsigned int nr_running;
1: +  unsigned int weight;
1: +  enum numa_type node_type;
1: +  int idle_cpu;
1:  };
1:  
1:  struct task_numa_env {
1: -	struct task_struct *p;
1: -	int src_cpu;
1: -	int src_nid;
1: -	int dst_cpu;
1: -	int dst_nid;
1: -	struct numa_stats src_stats;
1: -	struct numa_stats dst_stats;
1: -	int imbalance_pct;
1: -	int dist;
1: -	struct task_struct *best_task;
1: -	long int best_imp;
1: -	int best_cpu;
1: +  struct task_struct *p;
1: +  int src_cpu;
1: +  int src_nid;
1: +  int dst_cpu;
1: +  int dst_nid;
1: +  struct numa_stats src_stats;
1: +  struct numa_stats dst_stats;
1: +  int imbalance_pct;
1: +  int dist;
1: +  struct task_struct *best_task;
1: +  long int best_imp;
1: +  int best_cpu;
1:  };
1:  
1:  enum fbq_type {
1: -	regular = 0,
1: -	remote = 1,
1: -	all = 2,
1: +  regular = 0,
1: +  remote = 1,
1: +  all = 2,
1:  };
1:  
1:  enum group_type {
1: -	group_has_spare = 0,
1: -	group_fully_busy = 1,
1: -	group_misfit_task = 2,
1: -	group_asym_packing = 3,
1: -	group_imbalanced = 4,
1: -	group_overloaded = 5,
1: +  group_has_spare = 0,
1: +  group_fully_busy = 1,
1: +  group_misfit_task = 2,
1: +  group_asym_packing = 3,
1: +  group_imbalanced = 4,
1: +  group_overloaded = 5,
1:  };
1:  
1:  enum migration_type {
1: -	migrate_load = 0,
1: -	migrate_util = 1,
1: -	migrate_task = 2,
1: -	migrate_misfit = 3,
1: +  migrate_load = 0,
1: +  migrate_util = 1,
1: +  migrate_task = 2,
1: +  migrate_misfit = 3,
1:  };
1:  
1:  struct lb_env {
1: -	struct sched_domain *sd;
1: -	struct rq *src_rq;
1: -	int src_cpu;
1: -	int dst_cpu;
1: -	struct rq *dst_rq;
1: -	struct cpumask *dst_grpmask;
1: -	int new_dst_cpu;
1: -	enum cpu_idle_type idle;
1: -	long int imbalance;
1: -	struct cpumask *cpus;
1: -	unsigned int flags;
1: -	unsigned int loop;
1: -	unsigned int loop_break;
1: -	unsigned int loop_max;
1: -	enum fbq_type fbq_type;
1: -	enum migration_type migration_type;
1: -	struct list_head tasks;
1: +  struct sched_domain *sd;
1: +  struct rq *src_rq;
1: +  int src_cpu;
1: +  int dst_cpu;
1: +  struct rq *dst_rq;
1: +  struct cpumask *dst_grpmask;
1: +  int new_dst_cpu;
1: +  enum cpu_idle_type idle;
1: +  long int imbalance;
1: +  struct cpumask *cpus;
1: +  unsigned int flags;
1: +  unsigned int loop;
1: +  unsigned int loop_break;
1: +  unsigned int loop_max;
1: +  enum fbq_type fbq_type;
1: +  enum migration_type migration_type;
1: +  struct list_head tasks;
1:  };
1:  
1:  struct sg_lb_stats {
1: -	long unsigned int avg_load;
1: -	long unsigned int group_load;
1: -	long unsigned int group_capacity;
1: -	long unsigned int group_util;
1: -	long unsigned int group_runnable;
1: -	unsigned int sum_nr_running;
1: -	unsigned int sum_h_nr_running;
1: -	unsigned int idle_cpus;
1: -	unsigned int group_weight;
1: -	enum group_type group_type;
1: -	unsigned int group_asym_packing;
1: -	long unsigned int group_misfit_task_load;
1: -	unsigned int nr_numa_running;
1: -	unsigned int nr_preferred_running;
1: +  long unsigned int avg_load;
1: +  long unsigned int group_load;
1: +  long unsigned int group_capacity;
1: +  long unsigned int group_util;
1: +  long unsigned int group_runnable;
1: +  unsigned int sum_nr_running;
1: +  unsigned int sum_h_nr_running;
1: +  unsigned int idle_cpus;
1: +  unsigned int group_weight;
1: +  enum group_type group_type;
1: +  unsigned int group_asym_packing;
1: +  long unsigned int group_misfit_task_load;
1: +  unsigned int nr_numa_running;
1: +  unsigned int nr_preferred_running;
1:  };
1:  
1:  struct sd_lb_stats {
1: -	struct sched_group *busiest;
1: -	struct sched_group *local;
1: -	long unsigned int total_load;
1: -	long unsigned int total_capacity;
1: -	long unsigned int avg_load;
1: -	unsigned int prefer_sibling;
1: -	struct sg_lb_stats busiest_stat;
1: -	struct sg_lb_stats local_stat;
1: +  struct sched_group *busiest;
1: +  struct sched_group *local;
1: +  long unsigned int total_load;
1: +  long unsigned int total_capacity;
1: +  long unsigned int avg_load;
1: +  unsigned int prefer_sibling;
1: +  struct sg_lb_stats busiest_stat;
1: +  struct sg_lb_stats local_stat;
1:  };
1:  
1:  typedef struct rt_rq *rt_rq_iter_t;
1:  
1:  struct wait_bit_key {
1: -	void *flags;
1: -	int bit_nr;
1: -	long unsigned int timeout;
1: +  void *flags;
1: +  int bit_nr;
1: +  long unsigned int timeout;
1:  };
1:  
1:  struct wait_bit_queue_entry {
1: -	struct wait_bit_key key;
1: -	struct wait_queue_entry wq_entry;
1: +  struct wait_bit_key key;
1: +  struct wait_queue_entry wq_entry;
1:  };
1:  
1:  typedef int wait_bit_action_f(struct wait_bit_key *, int);
1:  
1:  struct swait_queue {
1: -	struct task_struct *task;
1: -	struct list_head task_list;
1: +  struct task_struct *task;
1: +  struct list_head task_list;
1:  };
1:  
1:  struct sd_flag_debug {
1: -	unsigned int meta_flags;
1: -	char *name;
1: +  unsigned int meta_flags;
1: +  char *name;
1:  };
1:  
1:  struct sched_domain_attr {
1: -	int relax_domain_level;
1: +  int relax_domain_level;
1:  };
1:  
1:  struct s_data {
1: -	struct sched_domain **sd;
1: -	struct root_domain *rd;
1: +  struct sched_domain **sd;
1: +  struct root_domain *rd;
1:  };
1:  
1:  enum s_alloc {
1: -	sa_rootdomain = 0,
1: -	sa_sd = 1,
1: -	sa_sd_storage = 2,
1: -	sa_none = 3,
1: +  sa_rootdomain = 0,
1: +  sa_sd = 1,
1: +  sa_sd_storage = 2,
1: +  sa_none = 3,
1:  };
1:  
1:  enum cpuacct_stat_index {
1: -	CPUACCT_STAT_USER = 0,
1: -	CPUACCT_STAT_SYSTEM = 1,
1: -	CPUACCT_STAT_NSTATS = 2,
1: +  CPUACCT_STAT_USER = 0,
1: +  CPUACCT_STAT_SYSTEM = 1,
1: +  CPUACCT_STAT_NSTATS = 2,
1:  };
1:  
1:  struct cpuacct_usage {
1: -	u64 usages[2];
1: +  u64 usages[2];
1:  };
1:  
1:  struct cpuacct {
1: -	struct cgroup_subsys_state css;
1: -	struct cpuacct_usage *cpuusage;
1: -	struct kernel_cpustat *cpustat;
1: +  struct cgroup_subsys_state css;
1: +  struct cpuacct_usage *cpuusage;
1: +  struct kernel_cpustat *cpustat;
1:  };
1:  
1:  struct gov_attr_set {
1: -	struct kobject kobj;
1: -	struct list_head policy_list;
1: -	struct mutex update_lock;
1: -	int usage_count;
1: +  struct kobject kobj;
1: +  struct list_head policy_list;
1: +  struct mutex update_lock;
1: +  int usage_count;
1:  };
1:  
1:  struct governor_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct gov_attr_set *, char *);
1: -	ssize_t (*store)(struct gov_attr_set *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct gov_attr_set *, char *);
1: +  ssize_t (*store)(struct gov_attr_set *, const char *, size_t);
1:  };
1:  
1:  struct sugov_tunables {
1: -	struct gov_attr_set attr_set;
1: -	unsigned int rate_limit_us;
1: +  struct gov_attr_set attr_set;
1: +  unsigned int rate_limit_us;
1:  };
1:  
1:  struct sugov_policy {
1: -	struct cpufreq_policy *policy;
1: -	struct sugov_tunables *tunables;
1: -	struct list_head tunables_hook;
1: -	raw_spinlock_t update_lock;
1: -	u64 last_freq_update_time;
1: -	s64 freq_update_delay_ns;
1: -	unsigned int next_freq;
1: -	unsigned int cached_raw_freq;
1: -	struct irq_work irq_work;
1: -	struct kthread_work work;
1: -	struct mutex work_lock;
1: -	struct kthread_worker worker;
1: -	struct task_struct *thread;
1: -	bool work_in_progress;
1: -	bool limits_changed;
1: -	bool need_freq_update;
1: +  struct cpufreq_policy *policy;
1: +  struct sugov_tunables *tunables;
1: +  struct list_head tunables_hook;
1: +  raw_spinlock_t update_lock;
1: +  u64 last_freq_update_time;
1: +  s64 freq_update_delay_ns;
1: +  unsigned int next_freq;
1: +  unsigned int cached_raw_freq;
1: +  struct irq_work irq_work;
1: +  struct kthread_work work;
1: +  struct mutex work_lock;
1: +  struct kthread_worker worker;
1: +  struct task_struct *thread;
1: +  bool work_in_progress;
1: +  bool limits_changed;
1: +  bool need_freq_update;
1:  };
1:  
1:  struct sugov_cpu {
1: -	struct update_util_data update_util;
1: -	struct sugov_policy *sg_policy;
1: -	unsigned int cpu;
1: -	bool iowait_boost_pending;
1: -	unsigned int iowait_boost;
1: -	u64 last_update;
1: -	long unsigned int bw_dl;
1: -	long unsigned int max;
1: -	long unsigned int saved_idle_calls;
1: +  struct update_util_data update_util;
1: +  struct sugov_policy *sg_policy;
1: +  unsigned int cpu;
1: +  bool iowait_boost_pending;
1: +  unsigned int iowait_boost;
1: +  u64 last_update;
1: +  long unsigned int bw_dl;
1: +  long unsigned int max;
1: +  long unsigned int saved_idle_calls;
1:  };
1:  
1:  enum {
1: -	MEMBARRIER_FLAG_SYNC_CORE = 1,
1: -	MEMBARRIER_FLAG_RSEQ = 2,
1: +  MEMBARRIER_FLAG_SYNC_CORE = 1,
1: +  MEMBARRIER_FLAG_RSEQ = 2,
1:  };
1:  
1:  enum membarrier_cmd {
1: -	MEMBARRIER_CMD_QUERY = 0,
1: -	MEMBARRIER_CMD_GLOBAL = 1,
1: -	MEMBARRIER_CMD_GLOBAL_EXPEDITED = 2,
1: -	MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = 4,
1: -	MEMBARRIER_CMD_PRIVATE_EXPEDITED = 8,
1: -	MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16,
1: -	MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = 32,
1: -	MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64,
1: -	MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 128,
1: -	MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ = 256,
1: -	MEMBARRIER_CMD_SHARED = 1,
1: +  MEMBARRIER_CMD_QUERY = 0,
1: +  MEMBARRIER_CMD_GLOBAL = 1,
1: +  MEMBARRIER_CMD_GLOBAL_EXPEDITED = 2,
1: +  MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = 4,
1: +  MEMBARRIER_CMD_PRIVATE_EXPEDITED = 8,
1: +  MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16,
1: +  MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = 32,
1: +  MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64,
1: +  MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 128,
1: +  MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ = 256,
1: +  MEMBARRIER_CMD_SHARED = 1,
1:  };
1:  
1:  enum membarrier_cmd_flag {
1: -	MEMBARRIER_CMD_FLAG_CPU = 1,
1: +  MEMBARRIER_CMD_FLAG_CPU = 1,
1:  };
1:  
1:  enum psi_res {
1: -	PSI_IO = 0,
1: -	PSI_MEM = 1,
1: -	PSI_CPU = 2,
1: -	NR_PSI_RESOURCES = 3,
1: +  PSI_IO = 0,
1: +  PSI_MEM = 1,
1: +  PSI_CPU = 2,
1: +  NR_PSI_RESOURCES = 3,
1:  };
1:  
1:  struct psi_window {
1: -	u64 size;
1: -	u64 start_time;
1: -	u64 start_value;
1: -	u64 prev_growth;
1: +  u64 size;
1: +  u64 start_time;
1: +  u64 start_value;
1: +  u64 prev_growth;
1:  };
1:  
1:  struct psi_trigger {
1: -	enum psi_states state;
1: -	u64 threshold;
1: -	struct list_head node;
1: -	struct psi_group *group;
1: -	wait_queue_head_t event_wait;
1: -	int event;
1: -	struct psi_window win;
1: -	u64 last_event_time;
1: -	struct kref refcount;
1: +  enum psi_states state;
1: +  u64 threshold;
1: +  struct list_head node;
1: +  struct psi_group *group;
1: +  wait_queue_head_t event_wait;
1: +  int event;
1: +  struct psi_window win;
1: +  u64 last_event_time;
1: +  struct kref refcount;
1:  };
1:  
1:  enum mutex_trylock_recursive_enum {
1: -	MUTEX_TRYLOCK_FAILED = 0,
1: -	MUTEX_TRYLOCK_SUCCESS = 1,
1: -	MUTEX_TRYLOCK_RECURSIVE = 2,
1: +  MUTEX_TRYLOCK_FAILED = 0,
1: +  MUTEX_TRYLOCK_SUCCESS = 1,
1: +  MUTEX_TRYLOCK_RECURSIVE = 2,
1:  };
1:  
1:  struct semaphore {
1: -	raw_spinlock_t lock;
1: -	unsigned int count;
1: -	struct list_head wait_list;
1: +  raw_spinlock_t lock;
1: +  unsigned int count;
1: +  struct list_head wait_list;
1:  };
1:  
1:  struct semaphore_waiter {
1: -	struct list_head list;
1: -	struct task_struct *task;
1: -	bool up;
1: +  struct list_head list;
1: +  struct task_struct *task;
1: +  bool up;
1:  };
1:  
1:  enum rwsem_waiter_type {
1: -	RWSEM_WAITING_FOR_WRITE = 0,
1: -	RWSEM_WAITING_FOR_READ = 1,
1: +  RWSEM_WAITING_FOR_WRITE = 0,
1: +  RWSEM_WAITING_FOR_READ = 1,
1:  };
1:  
1:  struct rwsem_waiter {
1: -	struct list_head list;
1: -	struct task_struct *task;
1: -	enum rwsem_waiter_type type;
1: -	long unsigned int timeout;
1: -	long unsigned int last_rowner;
1: +  struct list_head list;
1: +  struct task_struct *task;
1: +  enum rwsem_waiter_type type;
1: +  long unsigned int timeout;
1: +  long unsigned int last_rowner;
1:  };
1:  
1:  enum rwsem_wake_type {
1: -	RWSEM_WAKE_ANY = 0,
1: -	RWSEM_WAKE_READERS = 1,
1: -	RWSEM_WAKE_READ_OWNED = 2,
1: +  RWSEM_WAKE_ANY = 0,
1: +  RWSEM_WAKE_READERS = 1,
1: +  RWSEM_WAKE_READ_OWNED = 2,
1:  };
1:  
1:  enum writer_wait_state {
1: -	WRITER_NOT_FIRST = 0,
1: -	WRITER_FIRST = 1,
1: -	WRITER_HANDOFF = 2,
1: +  WRITER_NOT_FIRST = 0,
1: +  WRITER_FIRST = 1,
1: +  WRITER_HANDOFF = 2,
1:  };
1:  
1:  enum owner_state {
1: -	OWNER_NULL = 1,
1: -	OWNER_WRITER = 2,
1: -	OWNER_READER = 4,
1: -	OWNER_NONSPINNABLE = 8,
1: +  OWNER_NULL = 1,
1: +  OWNER_WRITER = 2,
1: +  OWNER_READER = 4,
1: +  OWNER_NONSPINNABLE = 8,
1:  };
1:  
1:  struct optimistic_spin_node {
1: -	struct optimistic_spin_node *next;
1: -	struct optimistic_spin_node *prev;
1: -	int locked;
1: -	int cpu;
1: +  struct optimistic_spin_node *next;
1: +  struct optimistic_spin_node *prev;
1: +  int locked;
1: +  int cpu;
1:  };
1:  
1:  struct mcs_spinlock {
1: -	struct mcs_spinlock *next;
1: -	int locked;
1: -	int count;
1: +  struct mcs_spinlock *next;
1: +  int locked;
1: +  int count;
1:  };
1:  
1:  struct qnode {
1: -	struct mcs_spinlock mcs;
1: +  struct mcs_spinlock mcs;
1:  };
1:  
1:  struct hrtimer_sleeper {
1: -	struct hrtimer timer;
1: -	struct task_struct *task;
1: +  struct hrtimer timer;
1: +  struct task_struct *task;
1:  };
1:  
1:  struct rt_mutex;
1:  
1:  struct rt_mutex_waiter {
1: -	struct rb_node tree_entry;
1: -	struct rb_node pi_tree_entry;
1: -	struct task_struct *task;
1: -	struct rt_mutex *lock;
1: -	long unsigned int ip;
1: -	struct pid *deadlock_task_pid;
1: -	struct rt_mutex *deadlock_lock;
1: -	int prio;
1: -	u64 deadline;
1: +  struct rb_node tree_entry;
1: +  struct rb_node pi_tree_entry;
1: +  struct task_struct *task;
1: +  struct rt_mutex *lock;
1: +  long unsigned int ip;
1: +  struct pid *deadlock_task_pid;
1: +  struct rt_mutex *deadlock_lock;
1: +  int prio;
1: +  u64 deadline;
1:  };
1:  
1:  struct rt_mutex {
1: -	raw_spinlock_t wait_lock;
1: -	struct rb_root_cached waiters;
1: -	struct task_struct *owner;
1: -	int save_state;
1: -	const char *name;
1: -	const char *file;
1: -	int line;
1: -	void *magic;
1: +  raw_spinlock_t wait_lock;
1: +  struct rb_root_cached waiters;
1: +  struct task_struct *owner;
1: +  int save_state;
1: +  const char *name;
1: +  const char *file;
1: +  int line;
1: +  void *magic;
1:  };
1:  
1:  enum rtmutex_chainwalk {
1: -	RT_MUTEX_MIN_CHAINWALK = 0,
1: -	RT_MUTEX_FULL_CHAINWALK = 1,
1: +  RT_MUTEX_MIN_CHAINWALK = 0,
1: +  RT_MUTEX_FULL_CHAINWALK = 1,
1:  };
1:  
1:  struct pm_qos_request {
1: -	struct plist_node node;
1: -	struct pm_qos_constraints *qos;
1: +  struct plist_node node;
1: +  struct pm_qos_constraints *qos;
1:  };
1:  
1:  enum pm_qos_req_action {
1: -	PM_QOS_ADD_REQ = 0,
1: -	PM_QOS_UPDATE_REQ = 1,
1: -	PM_QOS_REMOVE_REQ = 2,
1: +  PM_QOS_ADD_REQ = 0,
1: +  PM_QOS_UPDATE_REQ = 1,
1: +  PM_QOS_REMOVE_REQ = 2,
1:  };
1:  
1:  struct miscdevice {
1: -	int minor;
1: -	const char *name;
1: -	const struct file_operations *fops;
1: -	struct list_head list;
1: -	struct device *parent;
1: -	struct device *this_device;
1: -	const struct attribute_group **groups;
1: -	const char *nodename;
1: -	umode_t mode;
1: +  int minor;
1: +  const char *name;
1: +  const struct file_operations *fops;
1: +  struct list_head list;
1: +  struct device *parent;
1: +  struct device *this_device;
1: +  const struct attribute_group **groups;
1: +  const char *nodename;
1: +  umode_t mode;
1:  };
1:  
1:  typedef int suspend_state_t;
1:  
1:  enum suspend_stat_step {
1: -	SUSPEND_FREEZE = 1,
1: -	SUSPEND_PREPARE = 2,
1: -	SUSPEND_SUSPEND = 3,
1: -	SUSPEND_SUSPEND_LATE = 4,
1: -	SUSPEND_SUSPEND_NOIRQ = 5,
1: -	SUSPEND_RESUME_NOIRQ = 6,
1: -	SUSPEND_RESUME_EARLY = 7,
1: -	SUSPEND_RESUME = 8,
1: +  SUSPEND_FREEZE = 1,
1: +  SUSPEND_PREPARE = 2,
1: +  SUSPEND_SUSPEND = 3,
1: +  SUSPEND_SUSPEND_LATE = 4,
1: +  SUSPEND_SUSPEND_NOIRQ = 5,
1: +  SUSPEND_RESUME_NOIRQ = 6,
1: +  SUSPEND_RESUME_EARLY = 7,
1: +  SUSPEND_RESUME = 8,
1:  };
1:  
1:  struct suspend_stats {
1: -	int success;
1: -	int fail;
1: -	int failed_freeze;
1: -	int failed_prepare;
1: -	int failed_suspend;
1: -	int failed_suspend_late;
1: -	int failed_suspend_noirq;
1: -	int failed_resume;
1: -	int failed_resume_early;
1: -	int failed_resume_noirq;
1: -	int last_failed_dev;
1: -	char failed_devs[80];
1: -	int last_failed_errno;
1: -	int errno[2];
1: -	int last_failed_step;
1: -	enum suspend_stat_step failed_steps[2];
1: +  int success;
1: +  int fail;
1: +  int failed_freeze;
1: +  int failed_prepare;
1: +  int failed_suspend;
1: +  int failed_suspend_late;
1: +  int failed_suspend_noirq;
1: +  int failed_resume;
1: +  int failed_resume_early;
1: +  int failed_resume_noirq;
1: +  int last_failed_dev;
1: +  char failed_devs[80];
1: +  int last_failed_errno;
1: +  int errno[2];
1: +  int last_failed_step;
1: +  enum suspend_stat_step failed_steps[2];
1:  };
1:  
1:  struct pm_vt_switch {
1: -	struct list_head head;
1: -	struct device *dev;
1: -	bool required;
1: +  struct list_head head;
1: +  struct device *dev;
1: +  bool required;
1:  };
1:  
1:  struct platform_suspend_ops {
1: -	int (*valid)(suspend_state_t);
1: -	int (*begin)(suspend_state_t);
1: -	int (*prepare)();
1: -	int (*prepare_late)();
1: -	int (*enter)(suspend_state_t);
1: -	void (*wake)();
1: -	void (*finish)();
1: -	bool (*suspend_again)();
1: -	void (*end)();
1: -	void (*recover)();
1: +  int (*valid)(suspend_state_t);
1: +  int (*begin)(suspend_state_t);
1: +  int (*prepare)();
1: +  int (*prepare_late)();
1: +  int (*enter)(suspend_state_t);
1: +  void (*wake)();
1: +  void (*finish)();
1: +  bool (*suspend_again)();
1: +  void (*end)();
1: +  void (*recover)();
1:  };
1:  
1:  struct platform_s2idle_ops {
1: -	int (*begin)();
1: -	int (*prepare)();
1: -	int (*prepare_late)();
1: -	bool (*wake)();
1: -	void (*restore_early)();
1: -	void (*restore)();
1: -	void (*end)();
1: +  int (*begin)();
1: +  int (*prepare)();
1: +  int (*prepare_late)();
1: +  bool (*wake)();
1: +  void (*restore_early)();
1: +  void (*restore)();
1: +  void (*end)();
1:  };
1:  
1:  enum {
1: -	TEST_NONE = 0,
1: -	TEST_CORE = 1,
1: -	TEST_CPUS = 2,
1: -	TEST_PLATFORM = 3,
1: -	TEST_DEVICES = 4,
1: -	TEST_FREEZER = 5,
1: -	__TEST_AFTER_LAST = 6,
1: +  TEST_NONE = 0,
1: +  TEST_CORE = 1,
1: +  TEST_CPUS = 2,
1: +  TEST_PLATFORM = 3,
1: +  TEST_DEVICES = 4,
1: +  TEST_FREEZER = 5,
1: +  __TEST_AFTER_LAST = 6,
1:  };
1:  
1:  struct sysrq_key_op {
1: -	void (* const handler)(int);
1: -	const char * const help_msg;
1: -	const char * const action_msg;
1: -	const int enable_mask;
1: +  void (*const handler)(int);
1: +  const char *const help_msg;
1: +  const char *const action_msg;
1: +  const int enable_mask;
1:  };
1:  
1:  struct dev_printk_info {
1: -	char subsystem[16];
1: -	char device[48];
1: +  char subsystem[16];
1: +  char device[48];
1:  };
1:  
1:  struct kmsg_dumper {
1: -	struct list_head list;
1: -	void (*dump)(struct kmsg_dumper *, enum kmsg_dump_reason);
1: -	enum kmsg_dump_reason max_reason;
1: -	bool active;
1: -	bool registered;
1: -	u32 cur_idx;
1: -	u32 next_idx;
1: -	u64 cur_seq;
1: -	u64 next_seq;
1: +  struct list_head list;
1: +  void (*dump)(struct kmsg_dumper *, enum kmsg_dump_reason);
1: +  enum kmsg_dump_reason max_reason;
1: +  bool active;
1: +  bool registered;
1: +  u32 cur_idx;
1: +  u32 next_idx;
1: +  u64 cur_seq;
1: +  u64 next_seq;
1:  };
1:  
1:  struct trace_event_raw_console {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_msg;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_msg;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_console {
1: -	u32 msg;
1: +  u32 msg;
1:  };
1:  
1:  typedef void (*btf_trace_console)(void *, const char *, size_t);
1:  
1:  struct printk_info {
1: -	u64 seq;
1: -	u64 ts_nsec;
1: -	u16 text_len;
1: -	u8 facility;
1: -	u8 flags: 5;
1: -	u8 level: 3;
1: -	u32 caller_id;
1: -	struct dev_printk_info dev_info;
1: +  u64 seq;
1: +  u64 ts_nsec;
1: +  u16 text_len;
1: +  u8 facility;
1: +  u8 flags : 5;
1: +  u8 level : 3;
1: +  u32 caller_id;
1: +  struct dev_printk_info dev_info;
1:  };
1:  
1:  struct printk_record {
1: -	struct printk_info *info;
1: -	char *text_buf;
1: -	unsigned int text_buf_size;
1: +  struct printk_info *info;
1: +  char *text_buf;
1: +  unsigned int text_buf_size;
1:  };
1:  
1:  struct prb_data_blk_lpos {
1: -	long unsigned int begin;
1: -	long unsigned int next;
1: +  long unsigned int begin;
1: +  long unsigned int next;
1:  };
1:  
1:  struct prb_desc {
1: -	atomic_long_t state_var;
1: -	struct prb_data_blk_lpos text_blk_lpos;
1: +  atomic_long_t state_var;
1: +  struct prb_data_blk_lpos text_blk_lpos;
1:  };
1:  
1:  struct prb_data_ring {
1: -	unsigned int size_bits;
1: -	char *data;
1: -	atomic_long_t head_lpos;
1: -	atomic_long_t tail_lpos;
1: +  unsigned int size_bits;
1: +  char *data;
1: +  atomic_long_t head_lpos;
1: +  atomic_long_t tail_lpos;
1:  };
1:  
1:  struct prb_desc_ring {
1: -	unsigned int count_bits;
1: -	struct prb_desc *descs;
1: -	struct printk_info *infos;
1: -	atomic_long_t head_id;
1: -	atomic_long_t tail_id;
1: +  unsigned int count_bits;
1: +  struct prb_desc *descs;
1: +  struct printk_info *infos;
1: +  atomic_long_t head_id;
1: +  atomic_long_t tail_id;
1:  };
1:  
1:  struct printk_ringbuffer {
1: -	struct prb_desc_ring desc_ring;
1: -	struct prb_data_ring text_data_ring;
1: -	atomic_long_t fail;
1: +  struct prb_desc_ring desc_ring;
1: +  struct prb_data_ring text_data_ring;
1: +  atomic_long_t fail;
1:  };
1:  
1:  struct prb_reserved_entry {
1: -	struct printk_ringbuffer *rb;
1: -	long unsigned int irqflags;
1: -	long unsigned int id;
1: -	unsigned int text_space;
1: +  struct printk_ringbuffer *rb;
1: +  long unsigned int irqflags;
1: +  long unsigned int id;
1: +  unsigned int text_space;
1:  };
1:  
1:  enum desc_state {
1: -	desc_miss = 4294967295,
1: -	desc_reserved = 0,
1: -	desc_committed = 1,
1: -	desc_finalized = 2,
1: -	desc_reusable = 3,
1: +  desc_miss = 4294967295,
1: +  desc_reserved = 0,
1: +  desc_committed = 1,
1: +  desc_finalized = 2,
1: +  desc_reusable = 3,
1:  };
1:  
1:  struct console_cmdline {
1: -	char name[16];
1: -	int index;
1: -	bool user_specified;
1: -	char *options;
1: +  char name[16];
1: +  int index;
1: +  bool user_specified;
1: +  char *options;
1:  };
1:  
1:  enum devkmsg_log_bits {
1: -	__DEVKMSG_LOG_BIT_ON = 0,
1: -	__DEVKMSG_LOG_BIT_OFF = 1,
1: -	__DEVKMSG_LOG_BIT_LOCK = 2,
1: +  __DEVKMSG_LOG_BIT_ON = 0,
1: +  __DEVKMSG_LOG_BIT_OFF = 1,
1: +  __DEVKMSG_LOG_BIT_LOCK = 2,
1:  };
1:  
1:  enum devkmsg_log_masks {
1: -	DEVKMSG_LOG_MASK_ON = 1,
1: -	DEVKMSG_LOG_MASK_OFF = 2,
1: -	DEVKMSG_LOG_MASK_LOCK = 4,
1: +  DEVKMSG_LOG_MASK_ON = 1,
1: +  DEVKMSG_LOG_MASK_OFF = 2,
1: +  DEVKMSG_LOG_MASK_LOCK = 4,
1:  };
1:  
1:  enum con_msg_format_flags {
1: -	MSG_FORMAT_DEFAULT = 0,
1: -	MSG_FORMAT_SYSLOG = 1,
1: +  MSG_FORMAT_DEFAULT = 0,
1: +  MSG_FORMAT_SYSLOG = 1,
1:  };
1:  
1:  enum log_flags {
1: -	LOG_NEWLINE = 2,
1: -	LOG_CONT = 8,
1: +  LOG_NEWLINE = 2,
1: +  LOG_CONT = 8,
1:  };
1:  
1:  struct devkmsg_user {
1: -	u64 seq;
1: -	struct ratelimit_state rs;
1: -	struct mutex lock;
1: -	char buf[8192];
1: -	struct printk_info info;
1: -	char text_buf[8192];
1: -	struct printk_record record;
1: +  u64 seq;
1: +  struct ratelimit_state rs;
1: +  struct mutex lock;
1: +  char buf[8192];
1: +  struct printk_info info;
1: +  char text_buf[8192];
1: +  struct printk_record record;
1:  };
1:  
1:  struct printk_safe_seq_buf {
1: -	atomic_t len;
1: -	atomic_t message_lost;
1: -	struct irq_work work;
1: -	unsigned char buffer[8160];
1: +  atomic_t len;
1: +  atomic_t message_lost;
1: +  struct irq_work work;
1: +  unsigned char buffer[8160];
1:  };
1:  
1:  struct prb_data_block {
1: -	long unsigned int id;
1: -	char data[0];
1: +  long unsigned int id;
1: +  char data[0];
1:  };
1:  
1:  enum {
1: -	IRQS_AUTODETECT = 1,
1: -	IRQS_SPURIOUS_DISABLED = 2,
1: -	IRQS_POLL_INPROGRESS = 8,
1: -	IRQS_ONESHOT = 32,
1: -	IRQS_REPLAY = 64,
1: -	IRQS_WAITING = 128,
1: -	IRQS_PENDING = 512,
1: -	IRQS_SUSPENDED = 2048,
1: -	IRQS_TIMINGS = 4096,
1: -	IRQS_NMI = 8192,
1: +  IRQS_AUTODETECT = 1,
1: +  IRQS_SPURIOUS_DISABLED = 2,
1: +  IRQS_POLL_INPROGRESS = 8,
1: +  IRQS_ONESHOT = 32,
1: +  IRQS_REPLAY = 64,
1: +  IRQS_WAITING = 128,
1: +  IRQS_PENDING = 512,
1: +  IRQS_SUSPENDED = 2048,
1: +  IRQS_TIMINGS = 4096,
1: +  IRQS_NMI = 8192,
1:  };
1:  
1:  enum {
1: -	_IRQ_DEFAULT_INIT_FLAGS = 0,
1: -	_IRQ_PER_CPU = 512,
1: -	_IRQ_LEVEL = 256,
1: -	_IRQ_NOPROBE = 1024,
1: -	_IRQ_NOREQUEST = 2048,
1: -	_IRQ_NOTHREAD = 65536,
1: -	_IRQ_NOAUTOEN = 4096,
1: -	_IRQ_MOVE_PCNTXT = 16384,
1: -	_IRQ_NO_BALANCING = 8192,
1: -	_IRQ_NESTED_THREAD = 32768,
1: -	_IRQ_PER_CPU_DEVID = 131072,
1: -	_IRQ_IS_POLLED = 262144,
1: -	_IRQ_DISABLE_UNLAZY = 524288,
1: -	_IRQ_HIDDEN = 1048576,
1: -	_IRQF_MODIFY_MASK = 2096911,
1: +  _IRQ_DEFAULT_INIT_FLAGS = 0,
1: +  _IRQ_PER_CPU = 512,
1: +  _IRQ_LEVEL = 256,
1: +  _IRQ_NOPROBE = 1024,
1: +  _IRQ_NOREQUEST = 2048,
1: +  _IRQ_NOTHREAD = 65536,
1: +  _IRQ_NOAUTOEN = 4096,
1: +  _IRQ_MOVE_PCNTXT = 16384,
1: +  _IRQ_NO_BALANCING = 8192,
1: +  _IRQ_NESTED_THREAD = 32768,
1: +  _IRQ_PER_CPU_DEVID = 131072,
1: +  _IRQ_IS_POLLED = 262144,
1: +  _IRQ_DISABLE_UNLAZY = 524288,
1: +  _IRQ_HIDDEN = 1048576,
1: +  _IRQF_MODIFY_MASK = 2096911,
1:  };
1:  
1:  enum {
1: -	IRQTF_RUNTHREAD = 0,
1: -	IRQTF_WARNED = 1,
1: -	IRQTF_AFFINITY = 2,
1: -	IRQTF_FORCED_THREAD = 3,
1: +  IRQTF_RUNTHREAD = 0,
1: +  IRQTF_WARNED = 1,
1: +  IRQTF_AFFINITY = 2,
1: +  IRQTF_FORCED_THREAD = 3,
1:  };
1:  
1:  enum {
1: -	IRQC_IS_HARDIRQ = 0,
1: -	IRQC_IS_NESTED = 1,
1: +  IRQC_IS_HARDIRQ = 0,
1: +  IRQC_IS_NESTED = 1,
1:  };
1:  
1:  enum {
1: -	IRQ_STARTUP_NORMAL = 0,
1: -	IRQ_STARTUP_MANAGED = 1,
1: -	IRQ_STARTUP_ABORT = 2,
1: +  IRQ_STARTUP_NORMAL = 0,
1: +  IRQ_STARTUP_MANAGED = 1,
1: +  IRQ_STARTUP_ABORT = 2,
1:  };
1:  
1:  struct irq_devres {
1: -	unsigned int irq;
1: -	void *dev_id;
1: +  unsigned int irq;
1: +  void *dev_id;
1:  };
1:  
1:  struct irq_desc_devres {
1: -	unsigned int from;
1: -	unsigned int cnt;
1: +  unsigned int from;
1: +  unsigned int cnt;
1:  };
1:  
1:  struct irqchip_fwid {
1: -	struct fwnode_handle fwnode;
1: -	unsigned int type;
1: -	char *name;
1: -	phys_addr_t *pa;
1: +  struct fwnode_handle fwnode;
1: +  unsigned int type;
1: +  char *name;
1: +  phys_addr_t *pa;
1:  };
1:  
1:  enum {
1: -	AFFINITY = 0,
1: -	AFFINITY_LIST = 1,
1: -	EFFECTIVE = 2,
1: -	EFFECTIVE_LIST = 3,
1: +  AFFINITY = 0,
1: +  AFFINITY_LIST = 1,
1: +  EFFECTIVE = 2,
1: +  EFFECTIVE_LIST = 3,
1:  };
1:  
1:  struct irq_affinity {
1: -	unsigned int pre_vectors;
1: -	unsigned int post_vectors;
1: -	unsigned int nr_sets;
1: -	unsigned int set_size[4];
1: -	void (*calc_sets)(struct irq_affinity *, unsigned int);
1: -	void *priv;
1: +  unsigned int pre_vectors;
1: +  unsigned int post_vectors;
1: +  unsigned int nr_sets;
1: +  unsigned int set_size[4];
1: +  void (*calc_sets)(struct irq_affinity *, unsigned int);
1: +  void *priv;
1:  };
1:  
1:  struct node_vectors {
1: -	unsigned int id;
1: -	union {
1: -		unsigned int nvectors;
1: -		unsigned int ncpus;
1: -	};
1: +  unsigned int id;
1: +  union {
1: +    unsigned int nvectors;
1: +    unsigned int ncpus;
1: +  };
1:  };
1:  
1:  struct cpumap {
1: -	unsigned int available;
1: -	unsigned int allocated;
1: -	unsigned int managed;
1: -	unsigned int managed_allocated;
1: -	bool initialized;
1: -	bool online;
1: -	long unsigned int alloc_map[4];
1: -	long unsigned int managed_map[4];
1: +  unsigned int available;
1: +  unsigned int allocated;
1: +  unsigned int managed;
1: +  unsigned int managed_allocated;
1: +  bool initialized;
1: +  bool online;
1: +  long unsigned int alloc_map[4];
1: +  long unsigned int managed_map[4];
1:  };
1:  
1:  struct irq_matrix___2 {
1: -	unsigned int matrix_bits;
1: -	unsigned int alloc_start;
1: -	unsigned int alloc_end;
1: -	unsigned int alloc_size;
1: -	unsigned int global_available;
1: -	unsigned int global_reserved;
1: -	unsigned int systembits_inalloc;
1: -	unsigned int total_allocated;
1: -	unsigned int online_maps;
1: -	struct cpumap *maps;
1: -	long unsigned int scratch_map[4];
1: -	long unsigned int system_map[4];
1: +  unsigned int matrix_bits;
1: +  unsigned int alloc_start;
1: +  unsigned int alloc_end;
1: +  unsigned int alloc_size;
1: +  unsigned int global_available;
1: +  unsigned int global_reserved;
1: +  unsigned int systembits_inalloc;
1: +  unsigned int total_allocated;
1: +  unsigned int online_maps;
1: +  struct cpumap *maps;
1: +  long unsigned int scratch_map[4];
1: +  long unsigned int system_map[4];
1:  };
1:  
1:  struct trace_event_raw_irq_matrix_global {
1: -	struct trace_entry ent;
1: -	unsigned int online_maps;
1: -	unsigned int global_available;
1: -	unsigned int global_reserved;
1: -	unsigned int total_allocated;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int online_maps;
1: +  unsigned int global_available;
1: +  unsigned int global_reserved;
1: +  unsigned int total_allocated;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_irq_matrix_global_update {
1: -	struct trace_entry ent;
1: -	int bit;
1: -	unsigned int online_maps;
1: -	unsigned int global_available;
1: -	unsigned int global_reserved;
1: -	unsigned int total_allocated;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int bit;
1: +  unsigned int online_maps;
1: +  unsigned int global_available;
1: +  unsigned int global_reserved;
1: +  unsigned int total_allocated;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_irq_matrix_cpu {
1: -	struct trace_entry ent;
1: -	int bit;
1: -	unsigned int cpu;
1: -	bool online;
1: -	unsigned int available;
1: -	unsigned int allocated;
1: -	unsigned int managed;
1: -	unsigned int online_maps;
1: -	unsigned int global_available;
1: -	unsigned int global_reserved;
1: -	unsigned int total_allocated;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int bit;
1: +  unsigned int cpu;
1: +  bool online;
1: +  unsigned int available;
1: +  unsigned int allocated;
1: +  unsigned int managed;
1: +  unsigned int online_maps;
1: +  unsigned int global_available;
1: +  unsigned int global_reserved;
1: +  unsigned int total_allocated;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_irq_matrix_global {};
1: @@ -27155,35 +27365,51 @@ typedef void (*btf_trace_irq_matrix_offline)(void *, struct irq_matrix___2 *);
1:  
1:  typedef void (*btf_trace_irq_matrix_reserve)(void *, struct irq_matrix___2 *);
1:  
1: -typedef void (*btf_trace_irq_matrix_remove_reserved)(void *, struct irq_matrix___2 *);
1: +typedef void (*btf_trace_irq_matrix_remove_reserved)(void *,
1: +                                                     struct irq_matrix___2 *);
1:  
1: -typedef void (*btf_trace_irq_matrix_assign_system)(void *, int, struct irq_matrix___2 *);
1: +typedef void (*btf_trace_irq_matrix_assign_system)(void *, int,
1: +                                                   struct irq_matrix___2 *);
1:  
1: -typedef void (*btf_trace_irq_matrix_alloc_reserved)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_alloc_reserved)(void *, int, unsigned int,
1: +                                                    struct irq_matrix___2 *,
1: +                                                    struct cpumap *);
1:  
1: -typedef void (*btf_trace_irq_matrix_reserve_managed)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_reserve_managed)(void *, int, unsigned int,
1: +                                                     struct irq_matrix___2 *,
1: +                                                     struct cpumap *);
1:  
1: -typedef void (*btf_trace_irq_matrix_remove_managed)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_remove_managed)(void *, int, unsigned int,
1: +                                                    struct irq_matrix___2 *,
1: +                                                    struct cpumap *);
1:  
1: -typedef void (*btf_trace_irq_matrix_alloc_managed)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_alloc_managed)(void *, int, unsigned int,
1: +                                                   struct irq_matrix___2 *,
1: +                                                   struct cpumap *);
1:  
1: -typedef void (*btf_trace_irq_matrix_assign)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_assign)(void *, int, unsigned int,
1: +                                            struct irq_matrix___2 *,
1: +                                            struct cpumap *);
1:  
1: -typedef void (*btf_trace_irq_matrix_alloc)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_alloc)(void *, int, unsigned int,
1: +                                           struct irq_matrix___2 *,
1: +                                           struct cpumap *);
1:  
1: -typedef void (*btf_trace_irq_matrix_free)(void *, int, unsigned int, struct irq_matrix___2 *, struct cpumap *);
1: +typedef void (*btf_trace_irq_matrix_free)(void *, int, unsigned int,
1: +                                          struct irq_matrix___2 *,
1: +                                          struct cpumap *);
1:  
1:  typedef void (*call_rcu_func_t)(struct callback_head *, rcu_callback_t);
1:  
1:  struct rcu_synchronize {
1: -	struct callback_head head;
1: -	struct completion completion;
1: +  struct callback_head head;
1: +  struct completion completion;
1:  };
1:  
1:  struct trace_event_raw_rcu_utilization {
1: -	struct trace_entry ent;
1: -	const char *s;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *s;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_rcu_utilization {};
1: @@ -27205,280 +27431,281 @@ typedef void (*holdouts_func_t)(struct list_head *, bool, bool *);
1:  typedef void (*postgp_func_t)(struct rcu_tasks *);
1:  
1:  struct rcu_tasks {
1: -	struct callback_head *cbs_head;
1: -	struct callback_head **cbs_tail;
1: -	struct wait_queue_head cbs_wq;
1: -	raw_spinlock_t cbs_lock;
1: -	int gp_state;
1: -	int gp_sleep;
1: -	int init_fract;
1: -	long unsigned int gp_jiffies;
1: -	long unsigned int gp_start;
1: -	long unsigned int n_gps;
1: -	long unsigned int n_ipis;
1: -	long unsigned int n_ipis_fails;
1: -	struct task_struct *kthread_ptr;
1: -	rcu_tasks_gp_func_t gp_func;
1: -	pregp_func_t pregp_func;
1: -	pertask_func_t pertask_func;
1: -	postscan_func_t postscan_func;
1: -	holdouts_func_t holdouts_func;
1: -	postgp_func_t postgp_func;
1: -	call_rcu_func_t call_func;
1: -	char *name;
1: -	char *kname;
1: -};
1: -
1: -enum {
1: -	GP_IDLE = 0,
1: -	GP_ENTER = 1,
1: -	GP_PASSED = 2,
1: -	GP_EXIT = 3,
1: -	GP_REPLAY = 4,
1: +  struct callback_head *cbs_head;
1: +  struct callback_head **cbs_tail;
1: +  struct wait_queue_head cbs_wq;
1: +  raw_spinlock_t cbs_lock;
1: +  int gp_state;
1: +  int gp_sleep;
1: +  int init_fract;
1: +  long unsigned int gp_jiffies;
1: +  long unsigned int gp_start;
1: +  long unsigned int n_gps;
1: +  long unsigned int n_ipis;
1: +  long unsigned int n_ipis_fails;
1: +  struct task_struct *kthread_ptr;
1: +  rcu_tasks_gp_func_t gp_func;
1: +  pregp_func_t pregp_func;
1: +  pertask_func_t pertask_func;
1: +  postscan_func_t postscan_func;
1: +  holdouts_func_t holdouts_func;
1: +  postgp_func_t postgp_func;
1: +  call_rcu_func_t call_func;
1: +  char *name;
1: +  char *kname;
1: +};
1: +
1: +enum {
1: +  GP_IDLE = 0,
1: +  GP_ENTER = 1,
1: +  GP_PASSED = 2,
1: +  GP_EXIT = 3,
1: +  GP_REPLAY = 4,
1:  };
1:  
1:  typedef long unsigned int ulong;
1:  
1:  struct rcu_cblist {
1: -	struct callback_head *head;
1: -	struct callback_head **tail;
1: -	long int len;
1: +  struct callback_head *head;
1: +  struct callback_head **tail;
1: +  long int len;
1:  };
1:  
1:  enum rcutorture_type {
1: -	RCU_FLAVOR = 0,
1: -	RCU_TASKS_FLAVOR = 1,
1: -	RCU_TASKS_RUDE_FLAVOR = 2,
1: -	RCU_TASKS_TRACING_FLAVOR = 3,
1: -	RCU_TRIVIAL_FLAVOR = 4,
1: -	SRCU_FLAVOR = 5,
1: -	INVALID_RCU_FLAVOR = 6,
1: +  RCU_FLAVOR = 0,
1: +  RCU_TASKS_FLAVOR = 1,
1: +  RCU_TASKS_RUDE_FLAVOR = 2,
1: +  RCU_TASKS_TRACING_FLAVOR = 3,
1: +  RCU_TRIVIAL_FLAVOR = 4,
1: +  SRCU_FLAVOR = 5,
1: +  INVALID_RCU_FLAVOR = 6,
1:  };
1:  
1:  struct rcu_exp_work {
1: -	long unsigned int rew_s;
1: -	struct work_struct rew_work;
1: +  long unsigned int rew_s;
1: +  struct work_struct rew_work;
1:  };
1:  
1:  struct rcu_node {
1: -	raw_spinlock_t lock;
1: -	long unsigned int gp_seq;
1: -	long unsigned int gp_seq_needed;
1: -	long unsigned int completedqs;
1: -	long unsigned int qsmask;
1: -	long unsigned int rcu_gp_init_mask;
1: -	long unsigned int qsmaskinit;
1: -	long unsigned int qsmaskinitnext;
1: -	long unsigned int expmask;
1: -	long unsigned int expmaskinit;
1: -	long unsigned int expmaskinitnext;
1: -	long unsigned int cbovldmask;
1: -	long unsigned int ffmask;
1: -	long unsigned int grpmask;
1: -	int grplo;
1: -	int grphi;
1: -	u8 grpnum;
1: -	u8 level;
1: -	bool wait_blkd_tasks;
1: -	struct rcu_node *parent;
1: -	struct list_head blkd_tasks;
1: -	struct list_head *gp_tasks;
1: -	struct list_head *exp_tasks;
1: -	struct list_head *boost_tasks;
1: -	struct rt_mutex boost_mtx;
1: -	long unsigned int boost_time;
1: -	struct task_struct *boost_kthread_task;
1: -	unsigned int boost_kthread_status;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	raw_spinlock_t fqslock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	spinlock_t exp_lock;
1: -	long unsigned int exp_seq_rq;
1: -	wait_queue_head_t exp_wq[4];
1: -	struct rcu_exp_work rew;
1: -	bool exp_need_flush;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: +  raw_spinlock_t lock;
1: +  long unsigned int gp_seq;
1: +  long unsigned int gp_seq_needed;
1: +  long unsigned int completedqs;
1: +  long unsigned int qsmask;
1: +  long unsigned int rcu_gp_init_mask;
1: +  long unsigned int qsmaskinit;
1: +  long unsigned int qsmaskinitnext;
1: +  long unsigned int expmask;
1: +  long unsigned int expmaskinit;
1: +  long unsigned int expmaskinitnext;
1: +  long unsigned int cbovldmask;
1: +  long unsigned int ffmask;
1: +  long unsigned int grpmask;
1: +  int grplo;
1: +  int grphi;
1: +  u8 grpnum;
1: +  u8 level;
1: +  bool wait_blkd_tasks;
1: +  struct rcu_node *parent;
1: +  struct list_head blkd_tasks;
1: +  struct list_head *gp_tasks;
1: +  struct list_head *exp_tasks;
1: +  struct list_head *boost_tasks;
1: +  struct rt_mutex boost_mtx;
1: +  long unsigned int boost_time;
1: +  struct task_struct *boost_kthread_task;
1: +  unsigned int boost_kthread_status;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  raw_spinlock_t fqslock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  spinlock_t exp_lock;
1: +  long unsigned int exp_seq_rq;
1: +  wait_queue_head_t exp_wq[4];
1: +  struct rcu_exp_work rew;
1: +  bool exp_need_flush;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  union rcu_noqs {
1: -	struct {
1: -		u8 norm;
1: -		u8 exp;
1: -	} b;
1: -	u16 s;
1: +  struct {
1: +    u8 norm;
1: +    u8 exp;
1: +  } b;
1: +  u16 s;
1:  };
1:  
1:  struct rcu_data {
1: -	long unsigned int gp_seq;
1: -	long unsigned int gp_seq_needed;
1: -	union rcu_noqs cpu_no_qs;
1: -	bool core_needs_qs;
1: -	bool beenonline;
1: -	bool gpwrap;
1: -	bool exp_deferred_qs;
1: -	bool cpu_started;
1: -	struct rcu_node *mynode;
1: -	long unsigned int grpmask;
1: -	long unsigned int ticks_this_gp;
1: -	struct irq_work defer_qs_iw;
1: -	bool defer_qs_iw_pending;
1: -	struct work_struct strict_work;
1: -	struct rcu_segcblist cblist;
1: -	long int qlen_last_fqs_check;
1: -	long unsigned int n_cbs_invoked;
1: -	long unsigned int n_force_qs_snap;
1: -	long int blimit;
1: -	int dynticks_snap;
1: -	long int dynticks_nesting;
1: -	long int dynticks_nmi_nesting;
1: -	atomic_t dynticks;
1: -	bool rcu_need_heavy_qs;
1: -	bool rcu_urgent_qs;
1: -	bool rcu_forced_tick;
1: -	bool rcu_forced_tick_exp;
1: -	struct callback_head barrier_head;
1: -	int exp_dynticks_snap;
1: -	struct task_struct *rcu_cpu_kthread_task;
1: -	unsigned int rcu_cpu_kthread_status;
1: -	char rcu_cpu_has_work;
1: -	unsigned int softirq_snap;
1: -	struct irq_work rcu_iw;
1: -	bool rcu_iw_pending;
1: -	long unsigned int rcu_iw_gp_seq;
1: -	long unsigned int rcu_ofl_gp_seq;
1: -	short int rcu_ofl_gp_flags;
1: -	long unsigned int rcu_onl_gp_seq;
1: -	short int rcu_onl_gp_flags;
1: -	long unsigned int last_fqs_resched;
1: -	int cpu;
1: +  long unsigned int gp_seq;
1: +  long unsigned int gp_seq_needed;
1: +  union rcu_noqs cpu_no_qs;
1: +  bool core_needs_qs;
1: +  bool beenonline;
1: +  bool gpwrap;
1: +  bool exp_deferred_qs;
1: +  bool cpu_started;
1: +  struct rcu_node *mynode;
1: +  long unsigned int grpmask;
1: +  long unsigned int ticks_this_gp;
1: +  struct irq_work defer_qs_iw;
1: +  bool defer_qs_iw_pending;
1: +  struct work_struct strict_work;
1: +  struct rcu_segcblist cblist;
1: +  long int qlen_last_fqs_check;
1: +  long unsigned int n_cbs_invoked;
1: +  long unsigned int n_force_qs_snap;
1: +  long int blimit;
1: +  int dynticks_snap;
1: +  long int dynticks_nesting;
1: +  long int dynticks_nmi_nesting;
1: +  atomic_t dynticks;
1: +  bool rcu_need_heavy_qs;
1: +  bool rcu_urgent_qs;
1: +  bool rcu_forced_tick;
1: +  bool rcu_forced_tick_exp;
1: +  struct callback_head barrier_head;
1: +  int exp_dynticks_snap;
1: +  struct task_struct *rcu_cpu_kthread_task;
1: +  unsigned int rcu_cpu_kthread_status;
1: +  char rcu_cpu_has_work;
1: +  unsigned int softirq_snap;
1: +  struct irq_work rcu_iw;
1: +  bool rcu_iw_pending;
1: +  long unsigned int rcu_iw_gp_seq;
1: +  long unsigned int rcu_ofl_gp_seq;
1: +  short int rcu_ofl_gp_flags;
1: +  long unsigned int rcu_onl_gp_seq;
1: +  short int rcu_onl_gp_flags;
1: +  long unsigned int last_fqs_resched;
1: +  int cpu;
1:  };
1:  
1:  struct rcu_state {
1: -	struct rcu_node node[9];
1: -	struct rcu_node *level[3];
1: -	int ncpus;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u8 boost;
1: -	long unsigned int gp_seq;
1: -	long unsigned int gp_max;
1: -	struct task_struct *gp_kthread;
1: -	struct swait_queue_head gp_wq;
1: -	short int gp_flags;
1: -	short int gp_state;
1: -	long unsigned int gp_wake_time;
1: -	long unsigned int gp_wake_seq;
1: -	struct mutex barrier_mutex;
1: -	atomic_t barrier_cpu_count;
1: -	struct completion barrier_completion;
1: -	long unsigned int barrier_sequence;
1: -	struct mutex exp_mutex;
1: -	struct mutex exp_wake_mutex;
1: -	long unsigned int expedited_sequence;
1: -	atomic_t expedited_need_qs;
1: -	struct swait_queue_head expedited_wq;
1: -	int ncpus_snap;
1: -	u8 cbovld;
1: -	u8 cbovldnext;
1: -	long unsigned int jiffies_force_qs;
1: -	long unsigned int jiffies_kick_kthreads;
1: -	long unsigned int n_force_qs;
1: -	long unsigned int gp_start;
1: -	long unsigned int gp_end;
1: -	long unsigned int gp_activity;
1: -	long unsigned int gp_req_activity;
1: -	long unsigned int jiffies_stall;
1: -	long unsigned int jiffies_resched;
1: -	long unsigned int n_force_qs_gpstart;
1: -	const char *name;
1: -	char abbr;
1: -	raw_spinlock_t ofl_lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct rcu_node node[9];
1: +  struct rcu_node *level[3];
1: +  int ncpus;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u8 boost;
1: +  long unsigned int gp_seq;
1: +  long unsigned int gp_max;
1: +  struct task_struct *gp_kthread;
1: +  struct swait_queue_head gp_wq;
1: +  short int gp_flags;
1: +  short int gp_state;
1: +  long unsigned int gp_wake_time;
1: +  long unsigned int gp_wake_seq;
1: +  struct mutex barrier_mutex;
1: +  atomic_t barrier_cpu_count;
1: +  struct completion barrier_completion;
1: +  long unsigned int barrier_sequence;
1: +  struct mutex exp_mutex;
1: +  struct mutex exp_wake_mutex;
1: +  long unsigned int expedited_sequence;
1: +  atomic_t expedited_need_qs;
1: +  struct swait_queue_head expedited_wq;
1: +  int ncpus_snap;
1: +  u8 cbovld;
1: +  u8 cbovldnext;
1: +  long unsigned int jiffies_force_qs;
1: +  long unsigned int jiffies_kick_kthreads;
1: +  long unsigned int n_force_qs;
1: +  long unsigned int gp_start;
1: +  long unsigned int gp_end;
1: +  long unsigned int gp_activity;
1: +  long unsigned int gp_req_activity;
1: +  long unsigned int jiffies_stall;
1: +  long unsigned int jiffies_resched;
1: +  long unsigned int n_force_qs_gpstart;
1: +  const char *name;
1: +  char abbr;
1: +  raw_spinlock_t ofl_lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct kvfree_rcu_bulk_data {
1: -	long unsigned int nr_records;
1: -	struct kvfree_rcu_bulk_data *next;
1: -	void *records[0];
1: +  long unsigned int nr_records;
1: +  struct kvfree_rcu_bulk_data *next;
1: +  void *records[0];
1:  };
1:  
1:  struct kfree_rcu_cpu;
1:  
1:  struct kfree_rcu_cpu_work {
1: -	struct rcu_work rcu_work;
1: -	struct callback_head *head_free;
1: -	struct kvfree_rcu_bulk_data *bkvhead_free[2];
1: -	struct kfree_rcu_cpu *krcp;
1: +  struct rcu_work rcu_work;
1: +  struct callback_head *head_free;
1: +  struct kvfree_rcu_bulk_data *bkvhead_free[2];
1: +  struct kfree_rcu_cpu *krcp;
1:  };
1:  
1:  struct kfree_rcu_cpu {
1: -	struct callback_head *head;
1: -	struct kvfree_rcu_bulk_data *bkvhead[2];
1: -	struct kfree_rcu_cpu_work krw_arr[2];
1: -	raw_spinlock_t lock;
1: -	struct delayed_work monitor_work;
1: -	bool monitor_todo;
1: -	bool initialized;
1: -	int count;
1: -	struct llist_head bkvcache;
1: -	int nr_bkv_objs;
1: +  struct callback_head *head;
1: +  struct kvfree_rcu_bulk_data *bkvhead[2];
1: +  struct kfree_rcu_cpu_work krw_arr[2];
1: +  raw_spinlock_t lock;
1: +  struct delayed_work monitor_work;
1: +  bool monitor_todo;
1: +  bool initialized;
1: +  int count;
1: +  struct llist_head bkvcache;
1: +  int nr_bkv_objs;
1:  };
1:  
1:  enum dma_sync_target {
1: -	SYNC_FOR_CPU = 0,
1: -	SYNC_FOR_DEVICE = 1,
1: +  SYNC_FOR_CPU = 0,
1: +  SYNC_FOR_DEVICE = 1,
1:  };
1:  
1:  struct dma_devres {
1: -	size_t size;
1: -	void *vaddr;
1: -	dma_addr_t dma_handle;
1: -	long unsigned int attrs;
1: +  size_t size;
1: +  void *vaddr;
1: +  dma_addr_t dma_handle;
1: +  long unsigned int attrs;
1:  };
1:  
1:  struct trace_event_raw_swiotlb_bounced {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev_name;
1: -	u64 dma_mask;
1: -	dma_addr_t dev_addr;
1: -	size_t size;
1: -	enum swiotlb_force swiotlb_force;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev_name;
1: +  u64 dma_mask;
1: +  dma_addr_t dev_addr;
1: +  size_t size;
1: +  enum swiotlb_force swiotlb_force;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_swiotlb_bounced {
1: -	u32 dev_name;
1: +  u32 dev_name;
1:  };
1:  
1: -typedef void (*btf_trace_swiotlb_bounced)(void *, struct device *, dma_addr_t, size_t, enum swiotlb_force);
1: +typedef void (*btf_trace_swiotlb_bounced)(void *, struct device *, dma_addr_t,
1: +                                          size_t, enum swiotlb_force);
1:  
1:  struct trace_event_raw_sys_enter {
1: -	struct trace_entry ent;
1: -	long int id;
1: -	long unsigned int args[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long int id;
1: +  long unsigned int args[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sys_exit {
1: -	struct trace_entry ent;
1: -	long int id;
1: -	long int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long int id;
1: +  long int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_sys_enter {};
1: @@ -27490,13 +27717,13 @@ typedef void (*btf_trace_sys_enter)(void *, struct pt_regs *, long int);
1:  typedef void (*btf_trace_sys_exit)(void *, struct pt_regs *, long int);
1:  
1:  enum mmu_notifier_event {
1: -	MMU_NOTIFY_UNMAP = 0,
1: -	MMU_NOTIFY_CLEAR = 1,
1: -	MMU_NOTIFY_PROTECTION_VMA = 2,
1: -	MMU_NOTIFY_PROTECTION_PAGE = 3,
1: -	MMU_NOTIFY_SOFT_DIRTY = 4,
1: -	MMU_NOTIFY_RELEASE = 5,
1: -	MMU_NOTIFY_MIGRATE = 6,
1: +  MMU_NOTIFY_UNMAP = 0,
1: +  MMU_NOTIFY_CLEAR = 1,
1: +  MMU_NOTIFY_PROTECTION_VMA = 2,
1: +  MMU_NOTIFY_PROTECTION_PAGE = 3,
1: +  MMU_NOTIFY_SOFT_DIRTY = 4,
1: +  MMU_NOTIFY_RELEASE = 5,
1: +  MMU_NOTIFY_MIGRATE = 6,
1:  };
1:  
1:  struct mmu_notifier;
1: @@ -27504,345 +27731,352 @@ struct mmu_notifier;
1:  struct mmu_notifier_range;
1:  
1:  struct mmu_notifier_ops {
1: -	void (*release)(struct mmu_notifier *, struct mm_struct *);
1: -	int (*clear_flush_young)(struct mmu_notifier *, struct mm_struct *, long unsigned int, long unsigned int);
1: -	int (*clear_young)(struct mmu_notifier *, struct mm_struct *, long unsigned int, long unsigned int);
1: -	int (*test_young)(struct mmu_notifier *, struct mm_struct *, long unsigned int);
1: -	void (*change_pte)(struct mmu_notifier *, struct mm_struct *, long unsigned int, pte_t);
1: -	int (*invalidate_range_start)(struct mmu_notifier *, const struct mmu_notifier_range *);
1: -	void (*invalidate_range_end)(struct mmu_notifier *, const struct mmu_notifier_range *);
1: -	void (*invalidate_range)(struct mmu_notifier *, struct mm_struct *, long unsigned int, long unsigned int);
1: -	struct mmu_notifier * (*alloc_notifier)(struct mm_struct *);
1: -	void (*free_notifier)(struct mmu_notifier *);
1: +  void (*release)(struct mmu_notifier *, struct mm_struct *);
1: +  int (*clear_flush_young)(struct mmu_notifier *, struct mm_struct *,
1: +                           long unsigned int, long unsigned int);
1: +  int (*clear_young)(struct mmu_notifier *, struct mm_struct *,
1: +                     long unsigned int, long unsigned int);
1: +  int (*test_young)(struct mmu_notifier *, struct mm_struct *,
1: +                    long unsigned int);
1: +  void (*change_pte)(struct mmu_notifier *, struct mm_struct *,
1: +                     long unsigned int, pte_t);
1: +  int (*invalidate_range_start)(struct mmu_notifier *,
1: +                                const struct mmu_notifier_range *);
1: +  void (*invalidate_range_end)(struct mmu_notifier *,
1: +                               const struct mmu_notifier_range *);
1: +  void (*invalidate_range)(struct mmu_notifier *, struct mm_struct *,
1: +                           long unsigned int, long unsigned int);
1: +  struct mmu_notifier *(*alloc_notifier)(struct mm_struct *);
1: +  void (*free_notifier)(struct mmu_notifier *);
1:  };
1:  
1:  struct mmu_notifier {
1: -	struct hlist_node hlist;
1: -	const struct mmu_notifier_ops *ops;
1: -	struct mm_struct *mm;
1: -	struct callback_head rcu;
1: -	unsigned int users;
1: +  struct hlist_node hlist;
1: +  const struct mmu_notifier_ops *ops;
1: +  struct mm_struct *mm;
1: +  struct callback_head rcu;
1: +  unsigned int users;
1:  };
1:  
1:  struct mmu_notifier_range {
1: -	struct vm_area_struct *vma;
1: -	struct mm_struct *mm;
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	unsigned int flags;
1: -	enum mmu_notifier_event event;
1: -	void *migrate_pgmap_owner;
1: +  struct vm_area_struct *vma;
1: +  struct mm_struct *mm;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  unsigned int flags;
1: +  enum mmu_notifier_event event;
1: +  void *migrate_pgmap_owner;
1:  };
1:  
1:  struct kvm_regs {
1: -	__u64 rax;
1: -	__u64 rbx;
1: -	__u64 rcx;
1: -	__u64 rdx;
1: -	__u64 rsi;
1: -	__u64 rdi;
1: -	__u64 rsp;
1: -	__u64 rbp;
1: -	__u64 r8;
1: -	__u64 r9;
1: -	__u64 r10;
1: -	__u64 r11;
1: -	__u64 r12;
1: -	__u64 r13;
1: -	__u64 r14;
1: -	__u64 r15;
1: -	__u64 rip;
1: -	__u64 rflags;
1: +  __u64 rax;
1: +  __u64 rbx;
1: +  __u64 rcx;
1: +  __u64 rdx;
1: +  __u64 rsi;
1: +  __u64 rdi;
1: +  __u64 rsp;
1: +  __u64 rbp;
1: +  __u64 r8;
1: +  __u64 r9;
1: +  __u64 r10;
1: +  __u64 r11;
1: +  __u64 r12;
1: +  __u64 r13;
1: +  __u64 r14;
1: +  __u64 r15;
1: +  __u64 rip;
1: +  __u64 rflags;
1:  };
1:  
1:  struct kvm_segment {
1: -	__u64 base;
1: -	__u32 limit;
1: -	__u16 selector;
1: -	__u8 type;
1: -	__u8 present;
1: -	__u8 dpl;
1: -	__u8 db;
1: -	__u8 s;
1: -	__u8 l;
1: -	__u8 g;
1: -	__u8 avl;
1: -	__u8 unusable;
1: -	__u8 padding;
1: +  __u64 base;
1: +  __u32 limit;
1: +  __u16 selector;
1: +  __u8 type;
1: +  __u8 present;
1: +  __u8 dpl;
1: +  __u8 db;
1: +  __u8 s;
1: +  __u8 l;
1: +  __u8 g;
1: +  __u8 avl;
1: +  __u8 unusable;
1: +  __u8 padding;
1:  };
1:  
1:  struct kvm_dtable {
1: -	__u64 base;
1: -	__u16 limit;
1: -	__u16 padding[3];
1: +  __u64 base;
1: +  __u16 limit;
1: +  __u16 padding[3];
1:  };
1:  
1:  struct kvm_sregs {
1: -	struct kvm_segment cs;
1: -	struct kvm_segment ds;
1: -	struct kvm_segment es;
1: -	struct kvm_segment fs;
1: -	struct kvm_segment gs;
1: -	struct kvm_segment ss;
1: -	struct kvm_segment tr;
1: -	struct kvm_segment ldt;
1: -	struct kvm_dtable gdt;
1: -	struct kvm_dtable idt;
1: -	__u64 cr0;
1: -	__u64 cr2;
1: -	__u64 cr3;
1: -	__u64 cr4;
1: -	__u64 cr8;
1: -	__u64 efer;
1: -	__u64 apic_base;
1: -	__u64 interrupt_bitmap[4];
1: +  struct kvm_segment cs;
1: +  struct kvm_segment ds;
1: +  struct kvm_segment es;
1: +  struct kvm_segment fs;
1: +  struct kvm_segment gs;
1: +  struct kvm_segment ss;
1: +  struct kvm_segment tr;
1: +  struct kvm_segment ldt;
1: +  struct kvm_dtable gdt;
1: +  struct kvm_dtable idt;
1: +  __u64 cr0;
1: +  __u64 cr2;
1: +  __u64 cr3;
1: +  __u64 cr4;
1: +  __u64 cr8;
1: +  __u64 efer;
1: +  __u64 apic_base;
1: +  __u64 interrupt_bitmap[4];
1:  };
1:  
1:  struct kvm_cpuid_entry2 {
1: -	__u32 function;
1: -	__u32 index;
1: -	__u32 flags;
1: -	__u32 eax;
1: -	__u32 ebx;
1: -	__u32 ecx;
1: -	__u32 edx;
1: -	__u32 padding[3];
1: +  __u32 function;
1: +  __u32 index;
1: +  __u32 flags;
1: +  __u32 eax;
1: +  __u32 ebx;
1: +  __u32 ecx;
1: +  __u32 edx;
1: +  __u32 padding[3];
1:  };
1:  
1:  struct kvm_debug_exit_arch {
1: -	__u32 exception;
1: -	__u32 pad;
1: -	__u64 pc;
1: -	__u64 dr6;
1: -	__u64 dr7;
1: +  __u32 exception;
1: +  __u32 pad;
1: +  __u64 pc;
1: +  __u64 dr6;
1: +  __u64 dr7;
1:  };
1:  
1:  struct kvm_vcpu_events {
1: -	struct {
1: -		__u8 injected;
1: -		__u8 nr;
1: -		__u8 has_error_code;
1: -		__u8 pending;
1: -		__u32 error_code;
1: -	} exception;
1: -	struct {
1: -		__u8 injected;
1: -		__u8 nr;
1: -		__u8 soft;
1: -		__u8 shadow;
1: -	} interrupt;
1: -	struct {
1: -		__u8 injected;
1: -		__u8 pending;
1: -		__u8 masked;
1: -		__u8 pad;
1: -	} nmi;
1: -	__u32 sipi_vector;
1: -	__u32 flags;
1: -	struct {
1: -		__u8 smm;
1: -		__u8 pending;
1: -		__u8 smm_inside_nmi;
1: -		__u8 latched_init;
1: -	} smi;
1: -	__u8 reserved[27];
1: -	__u8 exception_has_payload;
1: -	__u64 exception_payload;
1: +  struct {
1: +    __u8 injected;
1: +    __u8 nr;
1: +    __u8 has_error_code;
1: +    __u8 pending;
1: +    __u32 error_code;
1: +  } exception;
1: +  struct {
1: +    __u8 injected;
1: +    __u8 nr;
1: +    __u8 soft;
1: +    __u8 shadow;
1: +  } interrupt;
1: +  struct {
1: +    __u8 injected;
1: +    __u8 pending;
1: +    __u8 masked;
1: +    __u8 pad;
1: +  } nmi;
1: +  __u32 sipi_vector;
1: +  __u32 flags;
1: +  struct {
1: +    __u8 smm;
1: +    __u8 pending;
1: +    __u8 smm_inside_nmi;
1: +    __u8 latched_init;
1: +  } smi;
1: +  __u8 reserved[27];
1: +  __u8 exception_has_payload;
1: +  __u64 exception_payload;
1:  };
1:  
1:  struct kvm_sync_regs {
1: -	struct kvm_regs regs;
1: -	struct kvm_sregs sregs;
1: -	struct kvm_vcpu_events events;
1: +  struct kvm_regs regs;
1: +  struct kvm_sregs sregs;
1: +  struct kvm_vcpu_events events;
1:  };
1:  
1:  struct kvm_pmu_event_filter {
1: -	__u32 action;
1: -	__u32 nevents;
1: -	__u32 fixed_counter_bitmap;
1: -	__u32 flags;
1: -	__u32 pad[4];
1: -	__u64 events[0];
1: +  __u32 action;
1: +  __u32 nevents;
1: +  __u32 fixed_counter_bitmap;
1: +  __u32 flags;
1: +  __u32 pad[4];
1: +  __u64 events[0];
1:  };
1:  
1:  struct kvm_hyperv_exit {
1: -	__u32 type;
1: -	__u32 pad1;
1: -	union {
1: -		struct {
1: -			__u32 msr;
1: -			__u32 pad2;
1: -			__u64 control;
1: -			__u64 evt_page;
1: -			__u64 msg_page;
1: -		} synic;
1: -		struct {
1: -			__u64 input;
1: -			__u64 result;
1: -			__u64 params[2];
1: -		} hcall;
1: -		struct {
1: -			__u32 msr;
1: -			__u32 pad2;
1: -			__u64 control;
1: -			__u64 status;
1: -			__u64 send_page;
1: -			__u64 recv_page;
1: -			__u64 pending_page;
1: -		} syndbg;
1: -	} u;
1: +  __u32 type;
1: +  __u32 pad1;
1: +  union {
1: +    struct {
1: +      __u32 msr;
1: +      __u32 pad2;
1: +      __u64 control;
1: +      __u64 evt_page;
1: +      __u64 msg_page;
1: +    } synic;
1: +    struct {
1: +      __u64 input;
1: +      __u64 result;
1: +      __u64 params[2];
1: +    } hcall;
1: +    struct {
1: +      __u32 msr;
1: +      __u32 pad2;
1: +      __u64 control;
1: +      __u64 status;
1: +      __u64 send_page;
1: +      __u64 recv_page;
1: +      __u64 pending_page;
1: +    } syndbg;
1: +  } u;
1:  };
1:  
1:  struct kvm_run {
1: -	__u8 request_interrupt_window;
1: -	__u8 immediate_exit;
1: -	__u8 padding1[6];
1: -	__u32 exit_reason;
1: -	__u8 ready_for_interrupt_injection;
1: -	__u8 if_flag;
1: -	__u16 flags;
1: -	__u64 cr8;
1: -	__u64 apic_base;
1: -	union {
1: -		struct {
1: -			__u64 hardware_exit_reason;
1: -		} hw;
1: -		struct {
1: -			__u64 hardware_entry_failure_reason;
1: -			__u32 cpu;
1: -		} fail_entry;
1: -		struct {
1: -			__u32 exception;
1: -			__u32 error_code;
1: -		} ex;
1: -		struct {
1: -			__u8 direction;
1: -			__u8 size;
1: -			__u16 port;
1: -			__u32 count;
1: -			__u64 data_offset;
1: -		} io;
1: -		struct {
1: -			struct kvm_debug_exit_arch arch;
1: -		} debug;
1: -		struct {
1: -			__u64 phys_addr;
1: -			__u8 data[8];
1: -			__u32 len;
1: -			__u8 is_write;
1: -		} mmio;
1: -		struct {
1: -			__u64 nr;
1: -			__u64 args[6];
1: -			__u64 ret;
1: -			__u32 longmode;
1: -			__u32 pad;
1: -		} hypercall;
1: -		struct {
1: -			__u64 rip;
1: -			__u32 is_write;
1: -			__u32 pad;
1: -		} tpr_access;
1: -		struct {
1: -			__u8 icptcode;
1: -			__u16 ipa;
1: -			__u32 ipb;
1: -		} s390_sieic;
1: -		__u64 s390_reset_flags;
1: -		struct {
1: -			__u64 trans_exc_code;
1: -			__u32 pgm_code;
1: -		} s390_ucontrol;
1: -		struct {
1: -			__u32 dcrn;
1: -			__u32 data;
1: -			__u8 is_write;
1: -		} dcr;
1: -		struct {
1: -			__u32 suberror;
1: -			__u32 ndata;
1: -			__u64 data[16];
1: -		} internal;
1: -		struct {
1: -			__u64 gprs[32];
1: -		} osi;
1: -		struct {
1: -			__u64 nr;
1: -			__u64 ret;
1: -			__u64 args[9];
1: -		} papr_hcall;
1: -		struct {
1: -			__u16 subchannel_id;
1: -			__u16 subchannel_nr;
1: -			__u32 io_int_parm;
1: -			__u32 io_int_word;
1: -			__u32 ipb;
1: -			__u8 dequeued;
1: -		} s390_tsch;
1: -		struct {
1: -			__u32 epr;
1: -		} epr;
1: -		struct {
1: -			__u32 type;
1: -			__u64 flags;
1: -		} system_event;
1: -		struct {
1: -			__u64 addr;
1: -			__u8 ar;
1: -			__u8 reserved;
1: -			__u8 fc;
1: -			__u8 sel1;
1: -			__u16 sel2;
1: -		} s390_stsi;
1: -		struct {
1: -			__u8 vector;
1: -		} eoi;
1: -		struct kvm_hyperv_exit hyperv;
1: -		struct {
1: -			__u64 esr_iss;
1: -			__u64 fault_ipa;
1: -		} arm_nisv;
1: -		struct {
1: -			__u8 error;
1: -			__u8 pad[7];
1: -			__u32 reason;
1: -			__u32 index;
1: -			__u64 data;
1: -		} msr;
1: -		char padding[256];
1: -	};
1: -	__u64 kvm_valid_regs;
1: -	__u64 kvm_dirty_regs;
1: -	union {
1: -		struct kvm_sync_regs regs;
1: -		char padding[2048];
1: -	} s;
1: +  __u8 request_interrupt_window;
1: +  __u8 immediate_exit;
1: +  __u8 padding1[6];
1: +  __u32 exit_reason;
1: +  __u8 ready_for_interrupt_injection;
1: +  __u8 if_flag;
1: +  __u16 flags;
1: +  __u64 cr8;
1: +  __u64 apic_base;
1: +  union {
1: +    struct {
1: +      __u64 hardware_exit_reason;
1: +    } hw;
1: +    struct {
1: +      __u64 hardware_entry_failure_reason;
1: +      __u32 cpu;
1: +    } fail_entry;
1: +    struct {
1: +      __u32 exception;
1: +      __u32 error_code;
1: +    } ex;
1: +    struct {
1: +      __u8 direction;
1: +      __u8 size;
1: +      __u16 port;
1: +      __u32 count;
1: +      __u64 data_offset;
1: +    } io;
1: +    struct {
1: +      struct kvm_debug_exit_arch arch;
1: +    } debug;
1: +    struct {
1: +      __u64 phys_addr;
1: +      __u8 data[8];
1: +      __u32 len;
1: +      __u8 is_write;
1: +    } mmio;
1: +    struct {
1: +      __u64 nr;
1: +      __u64 args[6];
1: +      __u64 ret;
1: +      __u32 longmode;
1: +      __u32 pad;
1: +    } hypercall;
1: +    struct {
1: +      __u64 rip;
1: +      __u32 is_write;
1: +      __u32 pad;
1: +    } tpr_access;
1: +    struct {
1: +      __u8 icptcode;
1: +      __u16 ipa;
1: +      __u32 ipb;
1: +    } s390_sieic;
1: +    __u64 s390_reset_flags;
1: +    struct {
1: +      __u64 trans_exc_code;
1: +      __u32 pgm_code;
1: +    } s390_ucontrol;
1: +    struct {
1: +      __u32 dcrn;
1: +      __u32 data;
1: +      __u8 is_write;
1: +    } dcr;
1: +    struct {
1: +      __u32 suberror;
1: +      __u32 ndata;
1: +      __u64 data[16];
1: +    } internal;
1: +    struct {
1: +      __u64 gprs[32];
1: +    } osi;
1: +    struct {
1: +      __u64 nr;
1: +      __u64 ret;
1: +      __u64 args[9];
1: +    } papr_hcall;
1: +    struct {
1: +      __u16 subchannel_id;
1: +      __u16 subchannel_nr;
1: +      __u32 io_int_parm;
1: +      __u32 io_int_word;
1: +      __u32 ipb;
1: +      __u8 dequeued;
1: +    } s390_tsch;
1: +    struct {
1: +      __u32 epr;
1: +    } epr;
1: +    struct {
1: +      __u32 type;
1: +      __u64 flags;
1: +    } system_event;
1: +    struct {
1: +      __u64 addr;
1: +      __u8 ar;
1: +      __u8 reserved;
1: +      __u8 fc;
1: +      __u8 sel1;
1: +      __u16 sel2;
1: +    } s390_stsi;
1: +    struct {
1: +      __u8 vector;
1: +    } eoi;
1: +    struct kvm_hyperv_exit hyperv;
1: +    struct {
1: +      __u64 esr_iss;
1: +      __u64 fault_ipa;
1: +    } arm_nisv;
1: +    struct {
1: +      __u8 error;
1: +      __u8 pad[7];
1: +      __u32 reason;
1: +      __u32 index;
1: +      __u64 data;
1: +    } msr;
1: +    char padding[256];
1: +  };
1: +  __u64 kvm_valid_regs;
1: +  __u64 kvm_dirty_regs;
1: +  union {
1: +    struct kvm_sync_regs regs;
1: +    char padding[2048];
1: +  } s;
1:  };
1:  
1:  struct kvm_coalesced_mmio {
1: -	__u64 phys_addr;
1: -	__u32 len;
1: -	union {
1: -		__u32 pad;
1: -		__u32 pio;
1: -	};
1: -	__u8 data[8];
1: +  __u64 phys_addr;
1: +  __u32 len;
1: +  union {
1: +    __u32 pad;
1: +    __u32 pio;
1: +  };
1: +  __u8 data[8];
1:  };
1:  
1:  struct kvm_coalesced_mmio_ring {
1: -	__u32 first;
1: -	__u32 last;
1: -	struct kvm_coalesced_mmio coalesced_mmio[0];
1: +  __u32 first;
1: +  __u32 last;
1: +  struct kvm_coalesced_mmio coalesced_mmio[0];
1:  };
1:  
1:  struct kvm_xen_hvm_config {
1: -	__u32 flags;
1: -	__u32 msr;
1: -	__u64 blob_addr_32;
1: -	__u64 blob_addr_64;
1: -	__u8 blob_size_32;
1: -	__u8 blob_size_64;
1: -	__u8 pad2[30];
1: +  __u32 flags;
1: +  __u32 msr;
1: +  __u64 blob_addr_32;
1: +  __u64 blob_addr_64;
1: +  __u8 blob_size_32;
1: +  __u8 blob_size_64;
1: +  __u8 pad2[30];
1:  };
1:  
1:  typedef long unsigned int gva_t;
1: @@ -27860,11 +28094,11 @@ typedef hfn_t kvm_pfn_t;
1:  struct kvm_memory_slot;
1:  
1:  struct gfn_to_hva_cache {
1: -	u64 generation;
1: -	gpa_t gpa;
1: -	long unsigned int hva;
1: -	long unsigned int len;
1: -	struct kvm_memory_slot *memslot;
1: +  u64 generation;
1: +  gpa_t gpa;
1: +  long unsigned int hva;
1: +  long unsigned int len;
1: +  struct kvm_memory_slot *memslot;
1:  };
1:  
1:  struct kvm_rmap_head;
1: @@ -27872,97 +28106,97 @@ struct kvm_rmap_head;
1:  struct kvm_lpage_info;
1:  
1:  struct kvm_arch_memory_slot {
1: -	struct kvm_rmap_head *rmap[3];
1: -	struct kvm_lpage_info *lpage_info[2];
1: -	short unsigned int *gfn_track[1];
1: +  struct kvm_rmap_head *rmap[3];
1: +  struct kvm_lpage_info *lpage_info[2];
1: +  short unsigned int *gfn_track[1];
1:  };
1:  
1:  struct kvm_memory_slot {
1: -	gfn_t base_gfn;
1: -	long unsigned int npages;
1: -	long unsigned int *dirty_bitmap;
1: -	struct kvm_arch_memory_slot arch;
1: -	long unsigned int userspace_addr;
1: -	u32 flags;
1: -	short int id;
1: -	u16 as_id;
1: +  gfn_t base_gfn;
1: +  long unsigned int npages;
1: +  long unsigned int *dirty_bitmap;
1: +  struct kvm_arch_memory_slot arch;
1: +  long unsigned int userspace_addr;
1: +  u32 flags;
1: +  short int id;
1: +  u16 as_id;
1:  };
1:  
1:  struct gfn_to_pfn_cache {
1: -	u64 generation;
1: -	gfn_t gfn;
1: -	kvm_pfn_t pfn;
1: -	bool dirty;
1: +  u64 generation;
1: +  gfn_t gfn;
1: +  kvm_pfn_t pfn;
1: +  bool dirty;
1:  };
1:  
1:  struct kvm_mmu_memory_cache {
1: -	int nobjs;
1: -	gfp_t gfp_zero;
1: -	struct kmem_cache *kmem_cache;
1: -	void *objects[40];
1: +  int nobjs;
1: +  gfp_t gfp_zero;
1: +  struct kmem_cache *kmem_cache;
1: +  void *objects[40];
1:  };
1:  
1:  struct hv_partition_assist_pg {
1: -	u32 tlb_lock_count;
1: +  u32 tlb_lock_count;
1:  };
1:  
1:  union hv_message_flags {
1: -	__u8 asu8;
1: -	struct {
1: -		__u8 msg_pending: 1;
1: -		__u8 reserved: 7;
1: -	};
1: +  __u8 asu8;
1: +  struct {
1: +    __u8 msg_pending : 1;
1: +    __u8 reserved : 7;
1: +  };
1:  };
1:  
1:  union hv_port_id {
1: -	__u32 asu32;
1: -	struct {
1: -		__u32 id: 24;
1: -		__u32 reserved: 8;
1: -	} u;
1: +  __u32 asu32;
1: +  struct {
1: +    __u32 id : 24;
1: +    __u32 reserved : 8;
1: +  } u;
1:  };
1:  
1:  struct hv_message_header {
1: -	__u32 message_type;
1: -	__u8 payload_size;
1: -	union hv_message_flags message_flags;
1: -	__u8 reserved[2];
1: -	union {
1: -		__u64 sender;
1: -		union hv_port_id port;
1: -	};
1: +  __u32 message_type;
1: +  __u8 payload_size;
1: +  union hv_message_flags message_flags;
1: +  __u8 reserved[2];
1: +  union {
1: +    __u64 sender;
1: +    union hv_port_id port;
1: +  };
1:  };
1:  
1:  struct hv_message {
1: -	struct hv_message_header header;
1: -	union {
1: -		__u64 payload[30];
1: -	} u;
1: +  struct hv_message_header header;
1: +  union {
1: +    __u64 payload[30];
1: +  } u;
1:  };
1:  
1:  union hv_stimer_config {
1: -	u64 as_uint64;
1: -	struct {
1: -		u64 enable: 1;
1: -		u64 periodic: 1;
1: -		u64 lazy: 1;
1: -		u64 auto_enable: 1;
1: -		u64 apic_vector: 8;
1: -		u64 direct_mode: 1;
1: -		u64 reserved_z0: 3;
1: -		u64 sintx: 4;
1: -		u64 reserved_z1: 44;
1: -	};
1: +  u64 as_uint64;
1: +  struct {
1: +    u64 enable : 1;
1: +    u64 periodic : 1;
1: +    u64 lazy : 1;
1: +    u64 auto_enable : 1;
1: +    u64 apic_vector : 8;
1: +    u64 direct_mode : 1;
1: +    u64 reserved_z0 : 3;
1: +    u64 sintx : 4;
1: +    u64 reserved_z1 : 44;
1: +  };
1:  };
1:  
1:  enum kvm_page_track_mode {
1: -	KVM_PAGE_TRACK_WRITE = 0,
1: -	KVM_PAGE_TRACK_MAX = 1,
1: +  KVM_PAGE_TRACK_WRITE = 0,
1: +  KVM_PAGE_TRACK_MAX = 1,
1:  };
1:  
1:  struct kvm_page_track_notifier_head {
1: -	struct srcu_struct track_srcu;
1: -	struct hlist_head track_notifier_list;
1: +  struct srcu_struct track_srcu;
1: +  struct hlist_head track_notifier_list;
1:  };
1:  
1:  struct kvm_vcpu;
1: @@ -27970,46 +28204,48 @@ struct kvm_vcpu;
1:  struct kvm;
1:  
1:  struct kvm_page_track_notifier_node {
1: -	struct hlist_node node;
1: -	void (*track_write)(struct kvm_vcpu *, gpa_t, const u8 *, int, struct kvm_page_track_notifier_node *);
1: -	void (*track_flush_slot)(struct kvm *, struct kvm_memory_slot *, struct kvm_page_track_notifier_node *);
1: +  struct hlist_node node;
1: +  void (*track_write)(struct kvm_vcpu *, gpa_t, const u8 *, int,
1: +                      struct kvm_page_track_notifier_node *);
1: +  void (*track_flush_slot)(struct kvm *, struct kvm_memory_slot *,
1: +                           struct kvm_page_track_notifier_node *);
1:  };
1:  
1:  struct kvm_vcpu_stat {
1: -	u64 pf_fixed;
1: -	u64 pf_guest;
1: -	u64 tlb_flush;
1: -	u64 invlpg;
1: -	u64 exits;
1: -	u64 io_exits;
1: -	u64 mmio_exits;
1: -	u64 signal_exits;
1: -	u64 irq_window_exits;
1: -	u64 nmi_window_exits;
1: -	u64 l1d_flush;
1: -	u64 halt_exits;
1: -	u64 halt_successful_poll;
1: -	u64 halt_attempted_poll;
1: -	u64 halt_poll_invalid;
1: -	u64 halt_wakeup;
1: -	u64 request_irq_exits;
1: -	u64 irq_exits;
1: -	u64 host_state_reload;
1: -	u64 fpu_reload;
1: -	u64 insn_emulation;
1: -	u64 insn_emulation_fail;
1: -	u64 hypercalls;
1: -	u64 irq_injections;
1: -	u64 nmi_injections;
1: -	u64 req_event;
1: -	u64 halt_poll_success_ns;
1: -	u64 halt_poll_fail_ns;
1: +  u64 pf_fixed;
1: +  u64 pf_guest;
1: +  u64 tlb_flush;
1: +  u64 invlpg;
1: +  u64 exits;
1: +  u64 io_exits;
1: +  u64 mmio_exits;
1: +  u64 signal_exits;
1: +  u64 irq_window_exits;
1: +  u64 nmi_window_exits;
1: +  u64 l1d_flush;
1: +  u64 halt_exits;
1: +  u64 halt_successful_poll;
1: +  u64 halt_attempted_poll;
1: +  u64 halt_poll_invalid;
1: +  u64 halt_wakeup;
1: +  u64 request_irq_exits;
1: +  u64 irq_exits;
1: +  u64 host_state_reload;
1: +  u64 fpu_reload;
1: +  u64 insn_emulation;
1: +  u64 insn_emulation_fail;
1: +  u64 hypercalls;
1: +  u64 irq_injections;
1: +  u64 nmi_injections;
1: +  u64 req_event;
1: +  u64 halt_poll_success_ns;
1: +  u64 halt_poll_fail_ns;
1:  };
1:  
1:  struct kvm_mmio_fragment {
1: -	gpa_t gpa;
1: -	void *data;
1: -	unsigned int len;
1: +  gpa_t gpa;
1: +  void *data;
1: +  unsigned int len;
1:  };
1:  
1:  struct kvm_lapic;
1: @@ -28019,411 +28255,412 @@ struct x86_exception;
1:  struct kvm_mmu_page;
1:  
1:  union kvm_mmu_page_role {
1: -	u32 word;
1: -	struct {
1: -		unsigned int level: 4;
1: -		unsigned int gpte_is_8_bytes: 1;
1: -		unsigned int quadrant: 2;
1: -		unsigned int direct: 1;
1: -		unsigned int access: 3;
1: -		unsigned int invalid: 1;
1: -		unsigned int nxe: 1;
1: -		unsigned int cr0_wp: 1;
1: -		unsigned int smep_andnot_wp: 1;
1: -		unsigned int smap_andnot_wp: 1;
1: -		unsigned int ad_disabled: 1;
1: -		unsigned int guest_mode: 1;
1: -		char: 6;
1: -		unsigned int smm: 8;
1: -	};
1: +  u32 word;
1: +  struct {
1: +    unsigned int level : 4;
1: +    unsigned int gpte_is_8_bytes : 1;
1: +    unsigned int quadrant : 2;
1: +    unsigned int direct : 1;
1: +    unsigned int access : 3;
1: +    unsigned int invalid : 1;
1: +    unsigned int nxe : 1;
1: +    unsigned int cr0_wp : 1;
1: +    unsigned int smep_andnot_wp : 1;
1: +    unsigned int smap_andnot_wp : 1;
1: +    unsigned int ad_disabled : 1;
1: +    unsigned int guest_mode : 1;
1: +    char : 6;
1: +    unsigned int smm : 8;
1: +  };
1:  };
1:  
1:  union kvm_mmu_extended_role {
1: -	u32 word;
1: -	struct {
1: -		unsigned int valid: 1;
1: -		unsigned int execonly: 1;
1: -		unsigned int cr0_pg: 1;
1: -		unsigned int cr4_pae: 1;
1: -		unsigned int cr4_pse: 1;
1: -		unsigned int cr4_pke: 1;
1: -		unsigned int cr4_smap: 1;
1: -		unsigned int cr4_smep: 1;
1: -		unsigned int maxphyaddr: 6;
1: -	};
1: +  u32 word;
1: +  struct {
1: +    unsigned int valid : 1;
1: +    unsigned int execonly : 1;
1: +    unsigned int cr0_pg : 1;
1: +    unsigned int cr4_pae : 1;
1: +    unsigned int cr4_pse : 1;
1: +    unsigned int cr4_pke : 1;
1: +    unsigned int cr4_smap : 1;
1: +    unsigned int cr4_smep : 1;
1: +    unsigned int maxphyaddr : 6;
1: +  };
1:  };
1:  
1:  union kvm_mmu_role {
1: -	u64 as_u64;
1: -	struct {
1: -		union kvm_mmu_page_role base;
1: -		union kvm_mmu_extended_role ext;
1: -	};
1: +  u64 as_u64;
1: +  struct {
1: +    union kvm_mmu_page_role base;
1: +    union kvm_mmu_extended_role ext;
1: +  };
1:  };
1:  
1:  struct kvm_mmu_root_info {
1: -	gpa_t pgd;
1: -	hpa_t hpa;
1: +  gpa_t pgd;
1: +  hpa_t hpa;
1:  };
1:  
1:  struct rsvd_bits_validate {
1: -	u64 rsvd_bits_mask[10];
1: -	u64 bad_mt_xwr;
1: +  u64 rsvd_bits_mask[10];
1: +  u64 bad_mt_xwr;
1:  };
1:  
1:  struct kvm_mmu {
1: -	long unsigned int (*get_guest_pgd)(struct kvm_vcpu *);
1: -	u64 (*get_pdptr)(struct kvm_vcpu *, int);
1: -	int (*page_fault)(struct kvm_vcpu *, gpa_t, u32, bool);
1: -	void (*inject_page_fault)(struct kvm_vcpu *, struct x86_exception *);
1: -	gpa_t (*gva_to_gpa)(struct kvm_vcpu *, gpa_t, u32, struct x86_exception *);
1: -	gpa_t (*translate_gpa)(struct kvm_vcpu *, gpa_t, u32, struct x86_exception *);
1: -	int (*sync_page)(struct kvm_vcpu *, struct kvm_mmu_page *);
1: -	void (*invlpg)(struct kvm_vcpu *, gva_t, hpa_t);
1: -	void (*update_pte)(struct kvm_vcpu *, struct kvm_mmu_page *, u64 *, const void *);
1: -	hpa_t root_hpa;
1: -	gpa_t root_pgd;
1: -	union kvm_mmu_role mmu_role;
1: -	u8 root_level;
1: -	u8 shadow_root_level;
1: -	u8 ept_ad;
1: -	bool direct_map;
1: -	struct kvm_mmu_root_info prev_roots[3];
1: -	u8 permissions[16];
1: -	u32 pkru_mask;
1: -	u64 *pae_root;
1: -	u64 *lm_root;
1: -	struct rsvd_bits_validate shadow_zero_check;
1: -	struct rsvd_bits_validate guest_rsvd_check;
1: -	u8 last_nonleaf_level;
1: -	bool nx;
1: -	u64 pdptrs[4];
1: +  long unsigned int (*get_guest_pgd)(struct kvm_vcpu *);
1: +  u64 (*get_pdptr)(struct kvm_vcpu *, int);
1: +  int (*page_fault)(struct kvm_vcpu *, gpa_t, u32, bool);
1: +  void (*inject_page_fault)(struct kvm_vcpu *, struct x86_exception *);
1: +  gpa_t (*gva_to_gpa)(struct kvm_vcpu *, gpa_t, u32, struct x86_exception *);
1: +  gpa_t (*translate_gpa)(struct kvm_vcpu *, gpa_t, u32, struct x86_exception *);
1: +  int (*sync_page)(struct kvm_vcpu *, struct kvm_mmu_page *);
1: +  void (*invlpg)(struct kvm_vcpu *, gva_t, hpa_t);
1: +  void (*update_pte)(struct kvm_vcpu *, struct kvm_mmu_page *, u64 *,
1: +                     const void *);
1: +  hpa_t root_hpa;
1: +  gpa_t root_pgd;
1: +  union kvm_mmu_role mmu_role;
1: +  u8 root_level;
1: +  u8 shadow_root_level;
1: +  u8 ept_ad;
1: +  bool direct_map;
1: +  struct kvm_mmu_root_info prev_roots[3];
1: +  u8 permissions[16];
1: +  u32 pkru_mask;
1: +  u64 *pae_root;
1: +  u64 *lm_root;
1: +  struct rsvd_bits_validate shadow_zero_check;
1: +  struct rsvd_bits_validate guest_rsvd_check;
1: +  u8 last_nonleaf_level;
1: +  bool nx;
1: +  u64 pdptrs[4];
1:  };
1:  
1:  struct kvm_pio_request {
1: -	long unsigned int linear_rip;
1: -	long unsigned int count;
1: -	int in;
1: -	int port;
1: -	int size;
1: +  long unsigned int linear_rip;
1: +  long unsigned int count;
1: +  int in;
1: +  int port;
1: +  int size;
1:  };
1:  
1:  struct kvm_queued_exception {
1: -	bool pending;
1: -	bool injected;
1: -	bool has_error_code;
1: -	u8 nr;
1: -	u32 error_code;
1: -	long unsigned int payload;
1: -	bool has_payload;
1: -	u8 nested_apf;
1: +  bool pending;
1: +  bool injected;
1: +  bool has_error_code;
1: +  u8 nr;
1: +  u32 error_code;
1: +  long unsigned int payload;
1: +  bool has_payload;
1: +  u8 nested_apf;
1:  };
1:  
1:  struct kvm_queued_interrupt {
1: -	bool injected;
1: -	bool soft;
1: -	u8 nr;
1: +  bool injected;
1: +  bool soft;
1: +  u8 nr;
1:  };
1:  
1:  struct x86_emulate_ctxt;
1:  
1:  struct kvm_mtrr_range {
1: -	u64 base;
1: -	u64 mask;
1: -	struct list_head node;
1: +  u64 base;
1: +  u64 mask;
1: +  struct list_head node;
1:  };
1:  
1:  struct kvm_mtrr {
1: -	struct kvm_mtrr_range var_ranges[8];
1: -	mtrr_type fixed_ranges[88];
1: -	u64 deftype;
1: -	struct list_head head;
1: +  struct kvm_mtrr_range var_ranges[8];
1: +  mtrr_type fixed_ranges[88];
1: +  u64 deftype;
1: +  struct list_head head;
1:  };
1:  
1:  enum pmc_type {
1: -	KVM_PMC_GP = 0,
1: -	KVM_PMC_FIXED = 1,
1: +  KVM_PMC_GP = 0,
1: +  KVM_PMC_FIXED = 1,
1:  };
1:  
1:  struct kvm_pmc {
1: -	enum pmc_type type;
1: -	u8 idx;
1: -	u64 counter;
1: -	u64 eventsel;
1: -	struct perf_event *perf_event;
1: -	struct kvm_vcpu *vcpu;
1: -	u64 current_config;
1: +  enum pmc_type type;
1: +  u8 idx;
1: +  u64 counter;
1: +  u64 eventsel;
1: +  struct perf_event *perf_event;
1: +  struct kvm_vcpu *vcpu;
1: +  u64 current_config;
1:  };
1:  
1:  struct kvm_pmu {
1: -	unsigned int nr_arch_gp_counters;
1: -	unsigned int nr_arch_fixed_counters;
1: -	unsigned int available_event_types;
1: -	u64 fixed_ctr_ctrl;
1: -	u64 global_ctrl;
1: -	u64 global_status;
1: -	u64 global_ovf_ctrl;
1: -	u64 counter_bitmask[2];
1: -	u64 global_ctrl_mask;
1: -	u64 global_ovf_ctrl_mask;
1: -	u64 reserved_bits;
1: -	u8 version;
1: -	struct kvm_pmc gp_counters[32];
1: -	struct kvm_pmc fixed_counters[4];
1: -	struct irq_work irq_work;
1: -	long unsigned int reprogram_pmi[1];
1: -	long unsigned int all_valid_pmc_idx[1];
1: -	long unsigned int pmc_in_use[1];
1: -	bool need_cleanup;
1: -	u8 event_count;
1: +  unsigned int nr_arch_gp_counters;
1: +  unsigned int nr_arch_fixed_counters;
1: +  unsigned int available_event_types;
1: +  u64 fixed_ctr_ctrl;
1: +  u64 global_ctrl;
1: +  u64 global_status;
1: +  u64 global_ovf_ctrl;
1: +  u64 counter_bitmask[2];
1: +  u64 global_ctrl_mask;
1: +  u64 global_ovf_ctrl_mask;
1: +  u64 reserved_bits;
1: +  u8 version;
1: +  struct kvm_pmc gp_counters[32];
1: +  struct kvm_pmc fixed_counters[4];
1: +  struct irq_work irq_work;
1: +  long unsigned int reprogram_pmi[1];
1: +  long unsigned int all_valid_pmc_idx[1];
1: +  long unsigned int pmc_in_use[1];
1: +  bool need_cleanup;
1: +  u8 event_count;
1:  };
1:  
1:  struct kvm_vcpu_hv_synic {
1: -	u64 version;
1: -	u64 control;
1: -	u64 msg_page;
1: -	u64 evt_page;
1: -	atomic64_t sint[16];
1: -	atomic_t sint_to_gsi[16];
1: -	long unsigned int auto_eoi_bitmap[4];
1: -	long unsigned int vec_bitmap[4];
1: -	bool active;
1: -	bool dont_zero_synic_pages;
1: +  u64 version;
1: +  u64 control;
1: +  u64 msg_page;
1: +  u64 evt_page;
1: +  atomic64_t sint[16];
1: +  atomic_t sint_to_gsi[16];
1: +  long unsigned int auto_eoi_bitmap[4];
1: +  long unsigned int vec_bitmap[4];
1: +  bool active;
1: +  bool dont_zero_synic_pages;
1:  };
1:  
1:  struct kvm_vcpu_hv_stimer {
1: -	struct hrtimer timer;
1: -	int index;
1: -	union hv_stimer_config config;
1: -	u64 count;
1: -	u64 exp_time;
1: -	struct hv_message msg;
1: -	bool msg_pending;
1: +  struct hrtimer timer;
1: +  int index;
1: +  union hv_stimer_config config;
1: +  u64 count;
1: +  u64 exp_time;
1: +  struct hv_message msg;
1: +  bool msg_pending;
1:  };
1:  
1:  struct kvm_vcpu_hv {
1: -	u32 vp_index;
1: -	u64 hv_vapic;
1: -	s64 runtime_offset;
1: -	struct kvm_vcpu_hv_synic synic;
1: -	struct kvm_hyperv_exit exit;
1: -	struct kvm_vcpu_hv_stimer stimer[4];
1: -	long unsigned int stimer_pending_bitmap[1];
1: -	cpumask_t tlb_flush;
1: +  u32 vp_index;
1: +  u64 hv_vapic;
1: +  s64 runtime_offset;
1: +  struct kvm_vcpu_hv_synic synic;
1: +  struct kvm_hyperv_exit exit;
1: +  struct kvm_vcpu_hv_stimer stimer[4];
1: +  long unsigned int stimer_pending_bitmap[1];
1: +  cpumask_t tlb_flush;
1:  };
1:  
1:  struct kvm_vcpu_arch {
1: -	long unsigned int regs[17];
1: -	u32 regs_avail;
1: -	u32 regs_dirty;
1: -	long unsigned int cr0;
1: -	long unsigned int cr0_guest_owned_bits;
1: -	long unsigned int cr2;
1: -	long unsigned int cr3;
1: -	long unsigned int cr4;
1: -	long unsigned int cr4_guest_owned_bits;
1: -	long unsigned int cr4_guest_rsvd_bits;
1: -	long unsigned int cr8;
1: -	u32 host_pkru;
1: -	u32 pkru;
1: -	u32 hflags;
1: -	u64 efer;
1: -	u64 apic_base;
1: -	struct kvm_lapic *apic;
1: -	bool apicv_active;
1: -	bool load_eoi_exitmap_pending;
1: -	long unsigned int ioapic_handled_vectors[4];
1: -	long unsigned int apic_attention;
1: -	int32_t apic_arb_prio;
1: -	int mp_state;
1: -	u64 ia32_misc_enable_msr;
1: -	u64 smbase;
1: -	u64 smi_count;
1: -	bool tpr_access_reporting;
1: -	bool xsaves_enabled;
1: -	u64 ia32_xss;
1: -	u64 microcode_version;
1: -	u64 arch_capabilities;
1: -	u64 perf_capabilities;
1: -	struct kvm_mmu *mmu;
1: -	struct kvm_mmu root_mmu;
1: -	struct kvm_mmu guest_mmu;
1: -	struct kvm_mmu nested_mmu;
1: -	struct kvm_mmu *walk_mmu;
1: -	struct kvm_mmu_memory_cache mmu_pte_list_desc_cache;
1: -	struct kvm_mmu_memory_cache mmu_shadow_page_cache;
1: -	struct kvm_mmu_memory_cache mmu_gfn_array_cache;
1: -	struct kvm_mmu_memory_cache mmu_page_header_cache;
1: -	struct fpu *user_fpu;
1: -	struct fpu *guest_fpu;
1: -	u64 xcr0;
1: -	u64 guest_supported_xcr0;
1: -	struct kvm_pio_request pio;
1: -	void *pio_data;
1: -	u8 event_exit_inst_len;
1: -	struct kvm_queued_exception exception;
1: -	struct kvm_queued_interrupt interrupt;
1: -	int halt_request;
1: -	int cpuid_nent;
1: -	struct kvm_cpuid_entry2 *cpuid_entries;
1: -	int maxphyaddr;
1: -	int max_tdp_level;
1: -	struct x86_emulate_ctxt *emulate_ctxt;
1: -	bool emulate_regs_need_sync_to_vcpu;
1: -	bool emulate_regs_need_sync_from_vcpu;
1: -	int (*complete_userspace_io)(struct kvm_vcpu *);
1: -	gpa_t time;
1: -	struct pvclock_vcpu_time_info hv_clock;
1: -	unsigned int hw_tsc_khz;
1: -	struct gfn_to_hva_cache pv_time;
1: -	bool pv_time_enabled;
1: -	bool pvclock_set_guest_stopped_request;
1: -	struct {
1: -		u8 preempted;
1: -		u64 msr_val;
1: -		u64 last_steal;
1: -		struct gfn_to_pfn_cache cache;
1: -	} st;
1: -	u64 l1_tsc_offset;
1: -	u64 tsc_offset;
1: -	u64 last_guest_tsc;
1: -	u64 last_host_tsc;
1: -	u64 tsc_offset_adjustment;
1: -	u64 this_tsc_nsec;
1: -	u64 this_tsc_write;
1: -	u64 this_tsc_generation;
1: -	bool tsc_catchup;
1: -	bool tsc_always_catchup;
1: -	s8 virtual_tsc_shift;
1: -	u32 virtual_tsc_mult;
1: -	u32 virtual_tsc_khz;
1: -	s64 ia32_tsc_adjust_msr;
1: -	u64 msr_ia32_power_ctl;
1: -	u64 tsc_scaling_ratio;
1: -	atomic_t nmi_queued;
1: -	unsigned int nmi_pending;
1: -	bool nmi_injected;
1: -	bool smi_pending;
1: -	struct kvm_mtrr mtrr_state;
1: -	u64 pat;
1: -	unsigned int switch_db_regs;
1: -	long unsigned int db[4];
1: -	long unsigned int dr6;
1: -	long unsigned int dr7;
1: -	long unsigned int eff_db[4];
1: -	long unsigned int guest_debug_dr7;
1: -	u64 msr_platform_info;
1: -	u64 msr_misc_features_enables;
1: -	u64 mcg_cap;
1: -	u64 mcg_status;
1: -	u64 mcg_ctl;
1: -	u64 mcg_ext_ctl;
1: -	u64 *mce_banks;
1: -	u64 mmio_gva;
1: -	unsigned int mmio_access;
1: -	gfn_t mmio_gfn;
1: -	u64 mmio_gen;
1: -	struct kvm_pmu pmu;
1: -	long unsigned int singlestep_rip;
1: -	struct kvm_vcpu_hv hyperv;
1: -	cpumask_var_t wbinvd_dirty_mask;
1: -	long unsigned int last_retry_eip;
1: -	long unsigned int last_retry_addr;
1: -	struct {
1: -		bool halted;
1: -		gfn_t gfns[64];
1: -		struct gfn_to_hva_cache data;
1: -		u64 msr_en_val;
1: -		u64 msr_int_val;
1: -		u16 vec;
1: -		u32 id;
1: -		bool send_user_only;
1: -		u32 host_apf_flags;
1: -		long unsigned int nested_apf_token;
1: -		bool delivery_as_pf_vmexit;
1: -		bool pageready_pending;
1: -	} apf;
1: -	struct {
1: -		u64 length;
1: -		u64 status;
1: -	} osvw;
1: -	struct {
1: -		u64 msr_val;
1: -		struct gfn_to_hva_cache data;
1: -	} pv_eoi;
1: -	u64 msr_kvm_poll_control;
1: -	bool write_fault_to_shadow_pgtable;
1: -	long unsigned int exit_qualification;
1: -	struct {
1: -		bool pv_unhalted;
1: -	} pv;
1: -	int pending_ioapic_eoi;
1: -	int pending_external_vector;
1: -	bool preempted_in_kernel;
1: -	bool l1tf_flush_l1d;
1: -	unsigned int last_vmentry_cpu;
1: -	u64 msr_hwcr;
1: -	struct {
1: -		u32 features;
1: -		bool enforce;
1: -	} pv_cpuid;
1: +  long unsigned int regs[17];
1: +  u32 regs_avail;
1: +  u32 regs_dirty;
1: +  long unsigned int cr0;
1: +  long unsigned int cr0_guest_owned_bits;
1: +  long unsigned int cr2;
1: +  long unsigned int cr3;
1: +  long unsigned int cr4;
1: +  long unsigned int cr4_guest_owned_bits;
1: +  long unsigned int cr4_guest_rsvd_bits;
1: +  long unsigned int cr8;
1: +  u32 host_pkru;
1: +  u32 pkru;
1: +  u32 hflags;
1: +  u64 efer;
1: +  u64 apic_base;
1: +  struct kvm_lapic *apic;
1: +  bool apicv_active;
1: +  bool load_eoi_exitmap_pending;
1: +  long unsigned int ioapic_handled_vectors[4];
1: +  long unsigned int apic_attention;
1: +  int32_t apic_arb_prio;
1: +  int mp_state;
1: +  u64 ia32_misc_enable_msr;
1: +  u64 smbase;
1: +  u64 smi_count;
1: +  bool tpr_access_reporting;
1: +  bool xsaves_enabled;
1: +  u64 ia32_xss;
1: +  u64 microcode_version;
1: +  u64 arch_capabilities;
1: +  u64 perf_capabilities;
1: +  struct kvm_mmu *mmu;
1: +  struct kvm_mmu root_mmu;
1: +  struct kvm_mmu guest_mmu;
1: +  struct kvm_mmu nested_mmu;
1: +  struct kvm_mmu *walk_mmu;
1: +  struct kvm_mmu_memory_cache mmu_pte_list_desc_cache;
1: +  struct kvm_mmu_memory_cache mmu_shadow_page_cache;
1: +  struct kvm_mmu_memory_cache mmu_gfn_array_cache;
1: +  struct kvm_mmu_memory_cache mmu_page_header_cache;
1: +  struct fpu *user_fpu;
1: +  struct fpu *guest_fpu;
1: +  u64 xcr0;
1: +  u64 guest_supported_xcr0;
1: +  struct kvm_pio_request pio;
1: +  void *pio_data;
1: +  u8 event_exit_inst_len;
1: +  struct kvm_queued_exception exception;
1: +  struct kvm_queued_interrupt interrupt;
1: +  int halt_request;
1: +  int cpuid_nent;
1: +  struct kvm_cpuid_entry2 *cpuid_entries;
1: +  int maxphyaddr;
1: +  int max_tdp_level;
1: +  struct x86_emulate_ctxt *emulate_ctxt;
1: +  bool emulate_regs_need_sync_to_vcpu;
1: +  bool emulate_regs_need_sync_from_vcpu;
1: +  int (*complete_userspace_io)(struct kvm_vcpu *);
1: +  gpa_t time;
1: +  struct pvclock_vcpu_time_info hv_clock;
1: +  unsigned int hw_tsc_khz;
1: +  struct gfn_to_hva_cache pv_time;
1: +  bool pv_time_enabled;
1: +  bool pvclock_set_guest_stopped_request;
1: +  struct {
1: +    u8 preempted;
1: +    u64 msr_val;
1: +    u64 last_steal;
1: +    struct gfn_to_pfn_cache cache;
1: +  } st;
1: +  u64 l1_tsc_offset;
1: +  u64 tsc_offset;
1: +  u64 last_guest_tsc;
1: +  u64 last_host_tsc;
1: +  u64 tsc_offset_adjustment;
1: +  u64 this_tsc_nsec;
1: +  u64 this_tsc_write;
1: +  u64 this_tsc_generation;
1: +  bool tsc_catchup;
1: +  bool tsc_always_catchup;
1: +  s8 virtual_tsc_shift;
1: +  u32 virtual_tsc_mult;
1: +  u32 virtual_tsc_khz;
1: +  s64 ia32_tsc_adjust_msr;
1: +  u64 msr_ia32_power_ctl;
1: +  u64 tsc_scaling_ratio;
1: +  atomic_t nmi_queued;
1: +  unsigned int nmi_pending;
1: +  bool nmi_injected;
1: +  bool smi_pending;
1: +  struct kvm_mtrr mtrr_state;
1: +  u64 pat;
1: +  unsigned int switch_db_regs;
1: +  long unsigned int db[4];
1: +  long unsigned int dr6;
1: +  long unsigned int dr7;
1: +  long unsigned int eff_db[4];
1: +  long unsigned int guest_debug_dr7;
1: +  u64 msr_platform_info;
1: +  u64 msr_misc_features_enables;
1: +  u64 mcg_cap;
1: +  u64 mcg_status;
1: +  u64 mcg_ctl;
1: +  u64 mcg_ext_ctl;
1: +  u64 *mce_banks;
1: +  u64 mmio_gva;
1: +  unsigned int mmio_access;
1: +  gfn_t mmio_gfn;
1: +  u64 mmio_gen;
1: +  struct kvm_pmu pmu;
1: +  long unsigned int singlestep_rip;
1: +  struct kvm_vcpu_hv hyperv;
1: +  cpumask_var_t wbinvd_dirty_mask;
1: +  long unsigned int last_retry_eip;
1: +  long unsigned int last_retry_addr;
1: +  struct {
1: +    bool halted;
1: +    gfn_t gfns[64];
1: +    struct gfn_to_hva_cache data;
1: +    u64 msr_en_val;
1: +    u64 msr_int_val;
1: +    u16 vec;
1: +    u32 id;
1: +    bool send_user_only;
1: +    u32 host_apf_flags;
1: +    long unsigned int nested_apf_token;
1: +    bool delivery_as_pf_vmexit;
1: +    bool pageready_pending;
1: +  } apf;
1: +  struct {
1: +    u64 length;
1: +    u64 status;
1: +  } osvw;
1: +  struct {
1: +    u64 msr_val;
1: +    struct gfn_to_hva_cache data;
1: +  } pv_eoi;
1: +  u64 msr_kvm_poll_control;
1: +  bool write_fault_to_shadow_pgtable;
1: +  long unsigned int exit_qualification;
1: +  struct {
1: +    bool pv_unhalted;
1: +  } pv;
1: +  int pending_ioapic_eoi;
1: +  int pending_external_vector;
1: +  bool preempted_in_kernel;
1: +  bool l1tf_flush_l1d;
1: +  unsigned int last_vmentry_cpu;
1: +  u64 msr_hwcr;
1: +  struct {
1: +    u32 features;
1: +    bool enforce;
1: +  } pv_cpuid;
1:  };
1:  
1:  struct kvm_vcpu {
1: -	struct kvm *kvm;
1: -	struct preempt_notifier preempt_notifier;
1: -	int cpu;
1: -	int vcpu_id;
1: -	int vcpu_idx;
1: -	int srcu_idx;
1: -	int mode;
1: -	u64 requests;
1: -	long unsigned int guest_debug;
1: -	int pre_pcpu;
1: -	struct list_head blocked_vcpu_list;
1: -	struct mutex mutex;
1: -	struct kvm_run *run;
1: -	struct rcuwait wait;
1: -	struct pid *pid;
1: -	int sigset_active;
1: -	sigset_t sigset;
1: -	struct kvm_vcpu_stat stat;
1: -	unsigned int halt_poll_ns;
1: -	bool valid_wakeup;
1: -	int mmio_needed;
1: -	int mmio_read_completed;
1: -	int mmio_is_write;
1: -	int mmio_cur_fragment;
1: -	int mmio_nr_fragments;
1: -	struct kvm_mmio_fragment mmio_fragments[2];
1: -	struct {
1: -		u32 queued;
1: -		struct list_head queue;
1: -		struct list_head done;
1: -		spinlock_t lock;
1: -	} async_pf;
1: -	struct {
1: -		bool in_spin_loop;
1: -		bool dy_eligible;
1: -	} spin_loop;
1: -	bool preempted;
1: -	bool ready;
1: -	struct kvm_vcpu_arch arch;
1: +  struct kvm *kvm;
1: +  struct preempt_notifier preempt_notifier;
1: +  int cpu;
1: +  int vcpu_id;
1: +  int vcpu_idx;
1: +  int srcu_idx;
1: +  int mode;
1: +  u64 requests;
1: +  long unsigned int guest_debug;
1: +  int pre_pcpu;
1: +  struct list_head blocked_vcpu_list;
1: +  struct mutex mutex;
1: +  struct kvm_run *run;
1: +  struct rcuwait wait;
1: +  struct pid *pid;
1: +  int sigset_active;
1: +  sigset_t sigset;
1: +  struct kvm_vcpu_stat stat;
1: +  unsigned int halt_poll_ns;
1: +  bool valid_wakeup;
1: +  int mmio_needed;
1: +  int mmio_read_completed;
1: +  int mmio_is_write;
1: +  int mmio_cur_fragment;
1: +  int mmio_nr_fragments;
1: +  struct kvm_mmio_fragment mmio_fragments[2];
1: +  struct {
1: +    u32 queued;
1: +    struct list_head queue;
1: +    struct list_head done;
1: +    spinlock_t lock;
1: +  } async_pf;
1: +  struct {
1: +    bool in_spin_loop;
1: +    bool dy_eligible;
1: +  } spin_loop;
1: +  bool preempted;
1: +  bool ready;
1: +  struct kvm_vcpu_arch arch;
1:  };
1:  
1:  struct kvm_vm_stat {
1: -	ulong mmu_shadow_zapped;
1: -	ulong mmu_pte_write;
1: -	ulong mmu_pte_updated;
1: -	ulong mmu_pde_zapped;
1: -	ulong mmu_flooded;
1: -	ulong mmu_recycled;
1: -	ulong mmu_cache_miss;
1: -	ulong mmu_unsync;
1: -	ulong remote_tlb_flush;
1: -	ulong lpages;
1: -	ulong nx_lpage_splits;
1: -	ulong max_mmu_page_hash_collisions;
1: +  ulong mmu_shadow_zapped;
1: +  ulong mmu_pte_write;
1: +  ulong mmu_pte_updated;
1: +  ulong mmu_pde_zapped;
1: +  ulong mmu_flooded;
1: +  ulong mmu_recycled;
1: +  ulong mmu_cache_miss;
1: +  ulong mmu_unsync;
1: +  ulong remote_tlb_flush;
1: +  ulong lpages;
1: +  ulong nx_lpage_splits;
1: +  ulong max_mmu_page_hash_collisions;
1:  };
1:  
1:  struct iommu_domain___2;
1: @@ -28435,121 +28672,121 @@ struct kvm_ioapic;
1:  struct kvm_pit;
1:  
1:  struct kvm_hv_syndbg {
1: -	struct {
1: -		u64 control;
1: -		u64 status;
1: -		u64 send_page;
1: -		u64 recv_page;
1: -		u64 pending_page;
1: -	} control;
1: -	u64 options;
1: +  struct {
1: +    u64 control;
1: +    u64 status;
1: +    u64 send_page;
1: +    u64 recv_page;
1: +    u64 pending_page;
1: +  } control;
1: +  u64 options;
1:  };
1:  
1:  struct kvm_hv {
1: -	struct mutex hv_lock;
1: -	u64 hv_guest_os_id;
1: -	u64 hv_hypercall;
1: -	u64 hv_tsc_page;
1: -	u64 hv_crash_param[5];
1: -	u64 hv_crash_ctl;
1: -	struct ms_hyperv_tsc_page tsc_ref;
1: -	struct idr conn_to_evt;
1: -	u64 hv_reenlightenment_control;
1: -	u64 hv_tsc_emulation_control;
1: -	u64 hv_tsc_emulation_status;
1: -	atomic_t num_mismatched_vp_indexes;
1: -	struct hv_partition_assist_pg *hv_pa_pg;
1: -	struct kvm_hv_syndbg hv_syndbg;
1: +  struct mutex hv_lock;
1: +  u64 hv_guest_os_id;
1: +  u64 hv_hypercall;
1: +  u64 hv_tsc_page;
1: +  u64 hv_crash_param[5];
1: +  u64 hv_crash_ctl;
1: +  struct ms_hyperv_tsc_page tsc_ref;
1: +  struct idr conn_to_evt;
1: +  u64 hv_reenlightenment_control;
1: +  u64 hv_tsc_emulation_control;
1: +  u64 hv_tsc_emulation_status;
1: +  atomic_t num_mismatched_vp_indexes;
1: +  struct hv_partition_assist_pg *hv_pa_pg;
1: +  struct kvm_hv_syndbg hv_syndbg;
1:  };
1:  
1:  enum kvm_irqchip_mode {
1: -	KVM_IRQCHIP_NONE = 0,
1: -	KVM_IRQCHIP_KERNEL = 1,
1: -	KVM_IRQCHIP_SPLIT = 2,
1: +  KVM_IRQCHIP_NONE = 0,
1: +  KVM_IRQCHIP_KERNEL = 1,
1: +  KVM_IRQCHIP_SPLIT = 2,
1:  };
1:  
1:  struct msr_bitmap_range {
1: -	u32 flags;
1: -	u32 nmsrs;
1: -	u32 base;
1: -	long unsigned int *bitmap;
1: +  u32 flags;
1: +  u32 nmsrs;
1: +  u32 base;
1: +  long unsigned int *bitmap;
1:  };
1:  
1:  struct kvm_apic_map;
1:  
1:  struct kvm_arch {
1: -	long unsigned int n_used_mmu_pages;
1: -	long unsigned int n_requested_mmu_pages;
1: -	long unsigned int n_max_mmu_pages;
1: -	unsigned int indirect_shadow_pages;
1: -	u8 mmu_valid_gen;
1: -	struct hlist_head mmu_page_hash[4096];
1: -	struct list_head active_mmu_pages;
1: -	struct list_head zapped_obsolete_pages;
1: -	struct list_head lpage_disallowed_mmu_pages;
1: -	struct kvm_page_track_notifier_node mmu_sp_tracker;
1: -	struct kvm_page_track_notifier_head track_notifier_head;
1: -	struct list_head assigned_dev_head;
1: -	struct iommu_domain___2 *iommu_domain;
1: -	bool iommu_noncoherent;
1: -	atomic_t noncoherent_dma_count;
1: -	atomic_t assigned_device_count;
1: -	struct kvm_pic *vpic;
1: -	struct kvm_ioapic *vioapic;
1: -	struct kvm_pit *vpit;
1: -	atomic_t vapics_in_nmi_mode;
1: -	struct mutex apic_map_lock;
1: -	struct kvm_apic_map *apic_map;
1: -	atomic_t apic_map_dirty;
1: -	bool apic_access_page_done;
1: -	long unsigned int apicv_inhibit_reasons;
1: -	gpa_t wall_clock;
1: -	bool mwait_in_guest;
1: -	bool hlt_in_guest;
1: -	bool pause_in_guest;
1: -	bool cstate_in_guest;
1: -	long unsigned int irq_sources_bitmap;
1: -	s64 kvmclock_offset;
1: -	raw_spinlock_t tsc_write_lock;
1: -	u64 last_tsc_nsec;
1: -	u64 last_tsc_write;
1: -	u32 last_tsc_khz;
1: -	u64 cur_tsc_nsec;
1: -	u64 cur_tsc_write;
1: -	u64 cur_tsc_offset;
1: -	u64 cur_tsc_generation;
1: -	int nr_vcpus_matched_tsc;
1: -	spinlock_t pvclock_gtod_sync_lock;
1: -	bool use_master_clock;
1: -	u64 master_kernel_ns;
1: -	u64 master_cycle_now;
1: -	struct delayed_work kvmclock_update_work;
1: -	struct delayed_work kvmclock_sync_work;
1: -	struct kvm_xen_hvm_config xen_hvm_config;
1: -	struct hlist_head mask_notifier_list;
1: -	struct kvm_hv hyperv;
1: -	bool backwards_tsc_observed;
1: -	bool boot_vcpu_runs_old_kvmclock;
1: -	u32 bsp_vcpu_id;
1: -	u64 disabled_quirks;
1: -	enum kvm_irqchip_mode irqchip_mode;
1: -	u8 nr_reserved_ioapic_pins;
1: -	bool disabled_lapic_found;
1: -	bool x2apic_format;
1: -	bool x2apic_broadcast_quirk_disabled;
1: -	bool guest_can_read_msr_platform_info;
1: -	bool exception_payload_enabled;
1: -	u32 user_space_msr_mask;
1: -	struct {
1: -		u8 count;
1: -		bool default_allow: 1;
1: -		struct msr_bitmap_range ranges[16];
1: -	} msr_filter;
1: -	struct kvm_pmu_event_filter *pmu_event_filter;
1: -	struct task_struct *nx_lpage_recovery_thread;
1: -	bool tdp_mmu_enabled;
1: -	struct list_head tdp_mmu_roots;
1: -	struct list_head tdp_mmu_pages;
1: +  long unsigned int n_used_mmu_pages;
1: +  long unsigned int n_requested_mmu_pages;
1: +  long unsigned int n_max_mmu_pages;
1: +  unsigned int indirect_shadow_pages;
1: +  u8 mmu_valid_gen;
1: +  struct hlist_head mmu_page_hash[4096];
1: +  struct list_head active_mmu_pages;
1: +  struct list_head zapped_obsolete_pages;
1: +  struct list_head lpage_disallowed_mmu_pages;
1: +  struct kvm_page_track_notifier_node mmu_sp_tracker;
1: +  struct kvm_page_track_notifier_head track_notifier_head;
1: +  struct list_head assigned_dev_head;
1: +  struct iommu_domain___2 *iommu_domain;
1: +  bool iommu_noncoherent;
1: +  atomic_t noncoherent_dma_count;
1: +  atomic_t assigned_device_count;
1: +  struct kvm_pic *vpic;
1: +  struct kvm_ioapic *vioapic;
1: +  struct kvm_pit *vpit;
1: +  atomic_t vapics_in_nmi_mode;
1: +  struct mutex apic_map_lock;
1: +  struct kvm_apic_map *apic_map;
1: +  atomic_t apic_map_dirty;
1: +  bool apic_access_page_done;
1: +  long unsigned int apicv_inhibit_reasons;
1: +  gpa_t wall_clock;
1: +  bool mwait_in_guest;
1: +  bool hlt_in_guest;
1: +  bool pause_in_guest;
1: +  bool cstate_in_guest;
1: +  long unsigned int irq_sources_bitmap;
1: +  s64 kvmclock_offset;
1: +  raw_spinlock_t tsc_write_lock;
1: +  u64 last_tsc_nsec;
1: +  u64 last_tsc_write;
1: +  u32 last_tsc_khz;
1: +  u64 cur_tsc_nsec;
1: +  u64 cur_tsc_write;
1: +  u64 cur_tsc_offset;
1: +  u64 cur_tsc_generation;
1: +  int nr_vcpus_matched_tsc;
1: +  spinlock_t pvclock_gtod_sync_lock;
1: +  bool use_master_clock;
1: +  u64 master_kernel_ns;
1: +  u64 master_cycle_now;
1: +  struct delayed_work kvmclock_update_work;
1: +  struct delayed_work kvmclock_sync_work;
1: +  struct kvm_xen_hvm_config xen_hvm_config;
1: +  struct hlist_head mask_notifier_list;
1: +  struct kvm_hv hyperv;
1: +  bool backwards_tsc_observed;
1: +  bool boot_vcpu_runs_old_kvmclock;
1: +  u32 bsp_vcpu_id;
1: +  u64 disabled_quirks;
1: +  enum kvm_irqchip_mode irqchip_mode;
1: +  u8 nr_reserved_ioapic_pins;
1: +  bool disabled_lapic_found;
1: +  bool x2apic_format;
1: +  bool x2apic_broadcast_quirk_disabled;
1: +  bool guest_can_read_msr_platform_info;
1: +  bool exception_payload_enabled;
1: +  u32 user_space_msr_mask;
1: +  struct {
1: +    u8 count;
1: +    bool default_allow : 1;
1: +    struct msr_bitmap_range ranges[16];
1: +  } msr_filter;
1: +  struct kvm_pmu_event_filter *pmu_event_filter;
1: +  struct task_struct *nx_lpage_recovery_thread;
1: +  bool tdp_mmu_enabled;
1: +  struct list_head tdp_mmu_roots;
1: +  struct list_head tdp_mmu_pages;
1:  };
1:  
1:  struct kvm_memslots;
1: @@ -28561,165 +28798,165 @@ struct kvm_irq_routing_table;
1:  struct kvm_stat_data;
1:  
1:  struct kvm {
1: -	spinlock_t mmu_lock;
1: -	struct mutex slots_lock;
1: -	struct mm_struct *mm;
1: -	struct kvm_memslots *memslots[2];
1: -	struct kvm_vcpu *vcpus[288];
1: -	atomic_t online_vcpus;
1: -	int created_vcpus;
1: -	int last_boosted_vcpu;
1: -	struct list_head vm_list;
1: -	struct mutex lock;
1: -	struct kvm_io_bus *buses[4];
1: -	struct {
1: -		spinlock_t lock;
1: -		struct list_head items;
1: -		struct list_head resampler_list;
1: -		struct mutex resampler_lock;
1: -	} irqfds;
1: -	struct list_head ioeventfds;
1: -	struct kvm_vm_stat stat;
1: -	struct kvm_arch arch;
1: -	refcount_t users_count;
1: -	struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
1: -	spinlock_t ring_lock;
1: -	struct list_head coalesced_zones;
1: -	struct mutex irq_lock;
1: -	struct kvm_irq_routing_table *irq_routing;
1: -	struct hlist_head irq_ack_notifier_list;
1: -	struct mmu_notifier mmu_notifier;
1: -	long unsigned int mmu_notifier_seq;
1: -	long int mmu_notifier_count;
1: -	long int tlbs_dirty;
1: -	struct list_head devices;
1: -	u64 manual_dirty_log_protect;
1: -	struct dentry *debugfs_dentry;
1: -	struct kvm_stat_data **debugfs_stat_data;
1: -	struct srcu_struct srcu;
1: -	struct srcu_struct irq_srcu;
1: -	pid_t userspace_pid;
1: -	unsigned int max_halt_poll_ns;
1: +  spinlock_t mmu_lock;
1: +  struct mutex slots_lock;
1: +  struct mm_struct *mm;
1: +  struct kvm_memslots *memslots[2];
1: +  struct kvm_vcpu *vcpus[288];
1: +  atomic_t online_vcpus;
1: +  int created_vcpus;
1: +  int last_boosted_vcpu;
1: +  struct list_head vm_list;
1: +  struct mutex lock;
1: +  struct kvm_io_bus *buses[4];
1: +  struct {
1: +    spinlock_t lock;
1: +    struct list_head items;
1: +    struct list_head resampler_list;
1: +    struct mutex resampler_lock;
1: +  } irqfds;
1: +  struct list_head ioeventfds;
1: +  struct kvm_vm_stat stat;
1: +  struct kvm_arch arch;
1: +  refcount_t users_count;
1: +  struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
1: +  spinlock_t ring_lock;
1: +  struct list_head coalesced_zones;
1: +  struct mutex irq_lock;
1: +  struct kvm_irq_routing_table *irq_routing;
1: +  struct hlist_head irq_ack_notifier_list;
1: +  struct mmu_notifier mmu_notifier;
1: +  long unsigned int mmu_notifier_seq;
1: +  long int mmu_notifier_count;
1: +  long int tlbs_dirty;
1: +  struct list_head devices;
1: +  u64 manual_dirty_log_protect;
1: +  struct dentry *debugfs_dentry;
1: +  struct kvm_stat_data **debugfs_stat_data;
1: +  struct srcu_struct srcu;
1: +  struct srcu_struct irq_srcu;
1: +  pid_t userspace_pid;
1: +  unsigned int max_halt_poll_ns;
1:  };
1:  
1:  enum kvm_reg {
1: -	VCPU_REGS_RAX = 0,
1: -	VCPU_REGS_RCX = 1,
1: -	VCPU_REGS_RDX = 2,
1: -	VCPU_REGS_RBX = 3,
1: -	VCPU_REGS_RSP = 4,
1: -	VCPU_REGS_RBP = 5,
1: -	VCPU_REGS_RSI = 6,
1: -	VCPU_REGS_RDI = 7,
1: -	VCPU_REGS_R8 = 8,
1: -	VCPU_REGS_R9 = 9,
1: -	VCPU_REGS_R10 = 10,
1: -	VCPU_REGS_R11 = 11,
1: -	VCPU_REGS_R12 = 12,
1: -	VCPU_REGS_R13 = 13,
1: -	VCPU_REGS_R14 = 14,
1: -	VCPU_REGS_R15 = 15,
1: -	VCPU_REGS_RIP = 16,
1: -	NR_VCPU_REGS = 17,
1: -	VCPU_EXREG_PDPTR = 17,
1: -	VCPU_EXREG_CR0 = 18,
1: -	VCPU_EXREG_CR3 = 19,
1: -	VCPU_EXREG_CR4 = 20,
1: -	VCPU_EXREG_RFLAGS = 21,
1: -	VCPU_EXREG_SEGMENTS = 22,
1: -	VCPU_EXREG_EXIT_INFO_1 = 23,
1: -	VCPU_EXREG_EXIT_INFO_2 = 24,
1: +  VCPU_REGS_RAX = 0,
1: +  VCPU_REGS_RCX = 1,
1: +  VCPU_REGS_RDX = 2,
1: +  VCPU_REGS_RBX = 3,
1: +  VCPU_REGS_RSP = 4,
1: +  VCPU_REGS_RBP = 5,
1: +  VCPU_REGS_RSI = 6,
1: +  VCPU_REGS_RDI = 7,
1: +  VCPU_REGS_R8 = 8,
1: +  VCPU_REGS_R9 = 9,
1: +  VCPU_REGS_R10 = 10,
1: +  VCPU_REGS_R11 = 11,
1: +  VCPU_REGS_R12 = 12,
1: +  VCPU_REGS_R13 = 13,
1: +  VCPU_REGS_R14 = 14,
1: +  VCPU_REGS_R15 = 15,
1: +  VCPU_REGS_RIP = 16,
1: +  NR_VCPU_REGS = 17,
1: +  VCPU_EXREG_PDPTR = 17,
1: +  VCPU_EXREG_CR0 = 18,
1: +  VCPU_EXREG_CR3 = 19,
1: +  VCPU_EXREG_CR4 = 20,
1: +  VCPU_EXREG_RFLAGS = 21,
1: +  VCPU_EXREG_SEGMENTS = 22,
1: +  VCPU_EXREG_EXIT_INFO_1 = 23,
1: +  VCPU_EXREG_EXIT_INFO_2 = 24,
1:  };
1:  
1:  struct kvm_rmap_head {
1: -	long unsigned int val;
1: +  long unsigned int val;
1:  };
1:  
1:  struct kvm_lpage_info {
1: -	int disallow_lpage;
1: +  int disallow_lpage;
1:  };
1:  
1:  struct kvm_apic_map {
1: -	struct callback_head rcu;
1: -	u8 mode;
1: -	u32 max_apic_id;
1: -	union {
1: -		struct kvm_lapic *xapic_flat_map[8];
1: -		struct kvm_lapic *xapic_cluster_map[64];
1: -	};
1: -	struct kvm_lapic *phys_map[0];
1: +  struct callback_head rcu;
1: +  u8 mode;
1: +  u32 max_apic_id;
1: +  union {
1: +    struct kvm_lapic *xapic_flat_map[8];
1: +    struct kvm_lapic *xapic_cluster_map[64];
1: +  };
1: +  struct kvm_lapic *phys_map[0];
1:  };
1:  
1:  struct kvm_io_device;
1:  
1:  struct kvm_io_range {
1: -	gpa_t addr;
1: -	int len;
1: -	struct kvm_io_device *dev;
1: +  gpa_t addr;
1: +  int len;
1: +  struct kvm_io_device *dev;
1:  };
1:  
1:  struct kvm_io_bus {
1: -	int dev_count;
1: -	int ioeventfd_count;
1: -	struct kvm_io_range range[0];
1: +  int dev_count;
1: +  int ioeventfd_count;
1: +  struct kvm_io_range range[0];
1:  };
1:  
1:  enum kvm_bus {
1: -	KVM_MMIO_BUS = 0,
1: -	KVM_PIO_BUS = 1,
1: -	KVM_VIRTIO_CCW_NOTIFY_BUS = 2,
1: -	KVM_FAST_MMIO_BUS = 3,
1: -	KVM_NR_BUSES = 4,
1: +  KVM_MMIO_BUS = 0,
1: +  KVM_PIO_BUS = 1,
1: +  KVM_VIRTIO_CCW_NOTIFY_BUS = 2,
1: +  KVM_FAST_MMIO_BUS = 3,
1: +  KVM_NR_BUSES = 4,
1:  };
1:  
1:  struct kvm_irq_routing_table {
1: -	int chip[72];
1: -	u32 nr_rt_entries;
1: -	struct hlist_head map[0];
1: +  int chip[72];
1: +  u32 nr_rt_entries;
1: +  struct hlist_head map[0];
1:  };
1:  
1:  struct kvm_memslots {
1: -	u64 generation;
1: -	short int id_to_index[512];
1: -	atomic_t lru_slot;
1: -	int used_slots;
1: -	struct kvm_memory_slot memslots[0];
1: +  u64 generation;
1: +  short int id_to_index[512];
1: +  atomic_t lru_slot;
1: +  int used_slots;
1: +  struct kvm_memory_slot memslots[0];
1:  };
1:  
1:  struct kvm_stats_debugfs_item;
1:  
1:  struct kvm_stat_data {
1: -	struct kvm *kvm;
1: -	struct kvm_stats_debugfs_item *dbgfs_item;
1: +  struct kvm *kvm;
1: +  struct kvm_stats_debugfs_item *dbgfs_item;
1:  };
1:  
1:  enum kvm_stat_kind {
1: -	KVM_STAT_VM = 0,
1: -	KVM_STAT_VCPU = 1,
1: +  KVM_STAT_VM = 0,
1: +  KVM_STAT_VCPU = 1,
1:  };
1:  
1:  struct kvm_stats_debugfs_item {
1: -	const char *name;
1: -	int offset;
1: -	enum kvm_stat_kind kind;
1: -	int mode;
1: +  const char *name;
1: +  int offset;
1: +  enum kvm_stat_kind kind;
1: +  int mode;
1:  };
1:  
1:  enum profile_type {
1: -	PROFILE_TASK_EXIT = 0,
1: -	PROFILE_MUNMAP = 1,
1: +  PROFILE_TASK_EXIT = 0,
1: +  PROFILE_MUNMAP = 1,
1:  };
1:  
1:  struct profile_hit {
1: -	u32 pc;
1: -	u32 hits;
1: +  u32 pc;
1: +  u32 hits;
1:  };
1:  
1:  struct stacktrace_cookie {
1: -	long unsigned int *store;
1: -	unsigned int size;
1: -	unsigned int skip;
1: -	unsigned int len;
1: +  long unsigned int *store;
1: +  unsigned int size;
1: +  unsigned int skip;
1: +  unsigned int len;
1:  };
1:  
1:  typedef __kernel_long_t __kernel_suseconds_t;
1: @@ -28731,169 +28968,169 @@ typedef __kernel_suseconds_t suseconds_t;
1:  typedef __u64 timeu64_t;
1:  
1:  struct __kernel_itimerspec {
1: -	struct __kernel_timespec it_interval;
1: -	struct __kernel_timespec it_value;
1: +  struct __kernel_timespec it_interval;
1: +  struct __kernel_timespec it_value;
1:  };
1:  
1:  struct timezone {
1: -	int tz_minuteswest;
1: -	int tz_dsttime;
1: +  int tz_minuteswest;
1: +  int tz_dsttime;
1:  };
1:  
1:  struct itimerspec64 {
1: -	struct timespec64 it_interval;
1: -	struct timespec64 it_value;
1: +  struct timespec64 it_interval;
1: +  struct timespec64 it_value;
1:  };
1:  
1:  struct old_itimerspec32 {
1: -	struct old_timespec32 it_interval;
1: -	struct old_timespec32 it_value;
1: +  struct old_timespec32 it_interval;
1: +  struct old_timespec32 it_value;
1:  };
1:  
1:  struct old_timex32 {
1: -	u32 modes;
1: -	s32 offset;
1: -	s32 freq;
1: -	s32 maxerror;
1: -	s32 esterror;
1: -	s32 status;
1: -	s32 constant;
1: -	s32 precision;
1: -	s32 tolerance;
1: -	struct old_timeval32 time;
1: -	s32 tick;
1: -	s32 ppsfreq;
1: -	s32 jitter;
1: -	s32 shift;
1: -	s32 stabil;
1: -	s32 jitcnt;
1: -	s32 calcnt;
1: -	s32 errcnt;
1: -	s32 stbcnt;
1: -	s32 tai;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u32 modes;
1: +  s32 offset;
1: +  s32 freq;
1: +  s32 maxerror;
1: +  s32 esterror;
1: +  s32 status;
1: +  s32 constant;
1: +  s32 precision;
1: +  s32 tolerance;
1: +  struct old_timeval32 time;
1: +  s32 tick;
1: +  s32 ppsfreq;
1: +  s32 jitter;
1: +  s32 shift;
1: +  s32 stabil;
1: +  s32 jitcnt;
1: +  s32 calcnt;
1: +  s32 errcnt;
1: +  s32 stbcnt;
1: +  s32 tai;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct __kernel_timex_timeval {
1: -	__kernel_time64_t tv_sec;
1: -	long long int tv_usec;
1: +  __kernel_time64_t tv_sec;
1: +  long long int tv_usec;
1:  };
1:  
1:  struct __kernel_timex {
1: -	unsigned int modes;
1: -	long long int offset;
1: -	long long int freq;
1: -	long long int maxerror;
1: -	long long int esterror;
1: -	int status;
1: -	long long int constant;
1: -	long long int precision;
1: -	long long int tolerance;
1: -	struct __kernel_timex_timeval time;
1: -	long long int tick;
1: -	long long int ppsfreq;
1: -	long long int jitter;
1: -	int shift;
1: -	long long int stabil;
1: -	long long int jitcnt;
1: -	long long int calcnt;
1: -	long long int errcnt;
1: -	long long int stbcnt;
1: -	int tai;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  unsigned int modes;
1: +  long long int offset;
1: +  long long int freq;
1: +  long long int maxerror;
1: +  long long int esterror;
1: +  int status;
1: +  long long int constant;
1: +  long long int precision;
1: +  long long int tolerance;
1: +  struct __kernel_timex_timeval time;
1: +  long long int tick;
1: +  long long int ppsfreq;
1: +  long long int jitter;
1: +  int shift;
1: +  long long int stabil;
1: +  long long int jitcnt;
1: +  long long int calcnt;
1: +  long long int errcnt;
1: +  long long int stbcnt;
1: +  int tai;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct trace_event_raw_timer_class {
1: -	struct trace_entry ent;
1: -	void *timer;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *timer;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_timer_start {
1: -	struct trace_entry ent;
1: -	void *timer;
1: -	void *function;
1: -	long unsigned int expires;
1: -	long unsigned int now;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *timer;
1: +  void *function;
1: +  long unsigned int expires;
1: +  long unsigned int now;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_timer_expire_entry {
1: -	struct trace_entry ent;
1: -	void *timer;
1: -	long unsigned int now;
1: -	void *function;
1: -	long unsigned int baseclk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *timer;
1: +  long unsigned int now;
1: +  void *function;
1: +  long unsigned int baseclk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_hrtimer_init {
1: -	struct trace_entry ent;
1: -	void *hrtimer;
1: -	clockid_t clockid;
1: -	enum hrtimer_mode mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *hrtimer;
1: +  clockid_t clockid;
1: +  enum hrtimer_mode mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_hrtimer_start {
1: -	struct trace_entry ent;
1: -	void *hrtimer;
1: -	void *function;
1: -	s64 expires;
1: -	s64 softexpires;
1: -	enum hrtimer_mode mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *hrtimer;
1: +  void *function;
1: +  s64 expires;
1: +  s64 softexpires;
1: +  enum hrtimer_mode mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_hrtimer_expire_entry {
1: -	struct trace_entry ent;
1: -	void *hrtimer;
1: -	s64 now;
1: -	void *function;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *hrtimer;
1: +  s64 now;
1: +  void *function;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_hrtimer_class {
1: -	struct trace_entry ent;
1: -	void *hrtimer;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *hrtimer;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_itimer_state {
1: -	struct trace_entry ent;
1: -	int which;
1: -	long long unsigned int expires;
1: -	long int value_sec;
1: -	long int value_nsec;
1: -	long int interval_sec;
1: -	long int interval_nsec;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int which;
1: +  long long unsigned int expires;
1: +  long int value_sec;
1: +  long int value_nsec;
1: +  long int interval_sec;
1: +  long int interval_nsec;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_itimer_expire {
1: -	struct trace_entry ent;
1: -	int which;
1: -	pid_t pid;
1: -	long long unsigned int now;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int which;
1: +  pid_t pid;
1: +  long long unsigned int now;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tick_stop {
1: -	struct trace_entry ent;
1: -	int success;
1: -	int dependency;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int success;
1: +  int dependency;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_timer_class {};
1: @@ -28918,376 +29155,385 @@ struct trace_event_data_offsets_tick_stop {};
1:  
1:  typedef void (*btf_trace_timer_init)(void *, struct timer_list *);
1:  
1: -typedef void (*btf_trace_timer_start)(void *, struct timer_list *, long unsigned int, unsigned int);
1: +typedef void (*btf_trace_timer_start)(void *, struct timer_list *,
1: +                                      long unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_timer_expire_entry)(void *, struct timer_list *, long unsigned int);
1: +typedef void (*btf_trace_timer_expire_entry)(void *, struct timer_list *,
1: +                                             long unsigned int);
1:  
1:  typedef void (*btf_trace_timer_expire_exit)(void *, struct timer_list *);
1:  
1:  typedef void (*btf_trace_timer_cancel)(void *, struct timer_list *);
1:  
1: -typedef void (*btf_trace_hrtimer_init)(void *, struct hrtimer *, clockid_t, enum hrtimer_mode);
1: +typedef void (*btf_trace_hrtimer_init)(void *, struct hrtimer *, clockid_t,
1: +                                       enum hrtimer_mode);
1:  
1: -typedef void (*btf_trace_hrtimer_start)(void *, struct hrtimer *, enum hrtimer_mode);
1: +typedef void (*btf_trace_hrtimer_start)(void *, struct hrtimer *,
1: +                                        enum hrtimer_mode);
1:  
1: -typedef void (*btf_trace_hrtimer_expire_entry)(void *, struct hrtimer *, ktime_t *);
1: +typedef void (*btf_trace_hrtimer_expire_entry)(void *, struct hrtimer *,
1: +                                               ktime_t *);
1:  
1:  typedef void (*btf_trace_hrtimer_expire_exit)(void *, struct hrtimer *);
1:  
1:  typedef void (*btf_trace_hrtimer_cancel)(void *, struct hrtimer *);
1:  
1: -typedef void (*btf_trace_itimer_state)(void *, int, const struct itimerspec64 * const, long long unsigned int);
1: +typedef void (*btf_trace_itimer_state)(void *, int,
1: +                                       const struct itimerspec64 *const,
1: +                                       long long unsigned int);
1:  
1: -typedef void (*btf_trace_itimer_expire)(void *, int, struct pid *, long long unsigned int);
1: +typedef void (*btf_trace_itimer_expire)(void *, int, struct pid *,
1: +                                        long long unsigned int);
1:  
1:  typedef void (*btf_trace_tick_stop)(void *, int, int);
1:  
1:  struct timer_base {
1: -	raw_spinlock_t lock;
1: -	struct timer_list *running_timer;
1: -	long unsigned int clk;
1: -	long unsigned int next_expiry;
1: -	unsigned int cpu;
1: -	bool next_expiry_recalc;
1: -	bool is_idle;
1: -	long unsigned int pending_map[9];
1: -	struct hlist_head vectors[576];
1: +  raw_spinlock_t lock;
1: +  struct timer_list *running_timer;
1: +  long unsigned int clk;
1: +  long unsigned int next_expiry;
1: +  unsigned int cpu;
1: +  bool next_expiry_recalc;
1: +  bool is_idle;
1: +  long unsigned int pending_map[9];
1: +  struct hlist_head vectors[576];
1:  };
1:  
1:  struct process_timer {
1: -	struct timer_list timer;
1: -	struct task_struct *task;
1: +  struct timer_list timer;
1: +  struct task_struct *task;
1:  };
1:  
1:  enum tick_device_mode {
1: -	TICKDEV_MODE_PERIODIC = 0,
1: -	TICKDEV_MODE_ONESHOT = 1,
1: +  TICKDEV_MODE_PERIODIC = 0,
1: +  TICKDEV_MODE_ONESHOT = 1,
1:  };
1:  
1:  struct tick_device {
1: -	struct clock_event_device *evtdev;
1: -	enum tick_device_mode mode;
1: +  struct clock_event_device *evtdev;
1: +  enum tick_device_mode mode;
1:  };
1:  
1:  struct ktime_timestamps {
1: -	u64 mono;
1: -	u64 boot;
1: -	u64 real;
1: +  u64 mono;
1: +  u64 boot;
1: +  u64 real;
1:  };
1:  
1:  struct system_time_snapshot {
1: -	u64 cycles;
1: -	ktime_t real;
1: -	ktime_t raw;
1: -	unsigned int clock_was_set_seq;
1: -	u8 cs_was_changed_seq;
1: +  u64 cycles;
1: +  ktime_t real;
1: +  ktime_t raw;
1: +  unsigned int clock_was_set_seq;
1: +  u8 cs_was_changed_seq;
1:  };
1:  
1:  struct system_device_crosststamp {
1: -	ktime_t device;
1: -	ktime_t sys_realtime;
1: -	ktime_t sys_monoraw;
1: +  ktime_t device;
1: +  ktime_t sys_realtime;
1: +  ktime_t sys_monoraw;
1:  };
1:  
1:  struct tk_read_base {
1: -	struct clocksource *clock;
1: -	u64 mask;
1: -	u64 cycle_last;
1: -	u32 mult;
1: -	u32 shift;
1: -	u64 xtime_nsec;
1: -	ktime_t base;
1: -	u64 base_real;
1: +  struct clocksource *clock;
1: +  u64 mask;
1: +  u64 cycle_last;
1: +  u32 mult;
1: +  u32 shift;
1: +  u64 xtime_nsec;
1: +  ktime_t base;
1: +  u64 base_real;
1:  };
1:  
1:  struct timekeeper {
1: -	struct tk_read_base tkr_mono;
1: -	struct tk_read_base tkr_raw;
1: -	u64 xtime_sec;
1: -	long unsigned int ktime_sec;
1: -	struct timespec64 wall_to_monotonic;
1: -	ktime_t offs_real;
1: -	ktime_t offs_boot;
1: -	ktime_t offs_tai;
1: -	s32 tai_offset;
1: -	unsigned int clock_was_set_seq;
1: -	u8 cs_was_changed_seq;
1: -	ktime_t next_leap_ktime;
1: -	u64 raw_sec;
1: -	struct timespec64 monotonic_to_boot;
1: -	u64 cycle_interval;
1: -	u64 xtime_interval;
1: -	s64 xtime_remainder;
1: -	u64 raw_interval;
1: -	u64 ntp_tick;
1: -	s64 ntp_error;
1: -	u32 ntp_error_shift;
1: -	u32 ntp_err_mult;
1: -	u32 skip_second_overflow;
1: +  struct tk_read_base tkr_mono;
1: +  struct tk_read_base tkr_raw;
1: +  u64 xtime_sec;
1: +  long unsigned int ktime_sec;
1: +  struct timespec64 wall_to_monotonic;
1: +  ktime_t offs_real;
1: +  ktime_t offs_boot;
1: +  ktime_t offs_tai;
1: +  s32 tai_offset;
1: +  unsigned int clock_was_set_seq;
1: +  u8 cs_was_changed_seq;
1: +  ktime_t next_leap_ktime;
1: +  u64 raw_sec;
1: +  struct timespec64 monotonic_to_boot;
1: +  u64 cycle_interval;
1: +  u64 xtime_interval;
1: +  s64 xtime_remainder;
1: +  u64 raw_interval;
1: +  u64 ntp_tick;
1: +  s64 ntp_error;
1: +  u32 ntp_error_shift;
1: +  u32 ntp_err_mult;
1: +  u32 skip_second_overflow;
1:  };
1:  
1:  struct audit_ntp_val {
1: -	long long int oldval;
1: -	long long int newval;
1: +  long long int oldval;
1: +  long long int newval;
1:  };
1:  
1:  struct audit_ntp_data {
1: -	struct audit_ntp_val vals[6];
1: +  struct audit_ntp_val vals[6];
1:  };
1:  
1:  enum timekeeping_adv_mode {
1: -	TK_ADV_TICK = 0,
1: -	TK_ADV_FREQ = 1,
1: +  TK_ADV_TICK = 0,
1: +  TK_ADV_FREQ = 1,
1:  };
1:  
1:  struct tk_fast {
1: -	seqcount_latch_t seq;
1: -	struct tk_read_base base[2];
1: +  seqcount_latch_t seq;
1: +  struct tk_read_base base[2];
1:  };
1:  
1:  typedef s64 int64_t;
1:  
1:  enum tick_nohz_mode {
1: -	NOHZ_MODE_INACTIVE = 0,
1: -	NOHZ_MODE_LOWRES = 1,
1: -	NOHZ_MODE_HIGHRES = 2,
1: +  NOHZ_MODE_INACTIVE = 0,
1: +  NOHZ_MODE_LOWRES = 1,
1: +  NOHZ_MODE_HIGHRES = 2,
1:  };
1:  
1:  struct tick_sched {
1: -	struct hrtimer sched_timer;
1: -	long unsigned int check_clocks;
1: -	enum tick_nohz_mode nohz_mode;
1: -	unsigned int inidle: 1;
1: -	unsigned int tick_stopped: 1;
1: -	unsigned int idle_active: 1;
1: -	unsigned int do_timer_last: 1;
1: -	unsigned int got_idle_tick: 1;
1: -	ktime_t last_tick;
1: -	ktime_t next_tick;
1: -	long unsigned int idle_jiffies;
1: -	long unsigned int idle_calls;
1: -	long unsigned int idle_sleeps;
1: -	ktime_t idle_entrytime;
1: -	ktime_t idle_waketime;
1: -	ktime_t idle_exittime;
1: -	ktime_t idle_sleeptime;
1: -	ktime_t iowait_sleeptime;
1: -	long unsigned int last_jiffies;
1: -	u64 timer_expires;
1: -	u64 timer_expires_base;
1: -	u64 next_timer;
1: -	ktime_t idle_expires;
1: -	atomic_t tick_dep_mask;
1: +  struct hrtimer sched_timer;
1: +  long unsigned int check_clocks;
1: +  enum tick_nohz_mode nohz_mode;
1: +  unsigned int inidle : 1;
1: +  unsigned int tick_stopped : 1;
1: +  unsigned int idle_active : 1;
1: +  unsigned int do_timer_last : 1;
1: +  unsigned int got_idle_tick : 1;
1: +  ktime_t last_tick;
1: +  ktime_t next_tick;
1: +  long unsigned int idle_jiffies;
1: +  long unsigned int idle_calls;
1: +  long unsigned int idle_sleeps;
1: +  ktime_t idle_entrytime;
1: +  ktime_t idle_waketime;
1: +  ktime_t idle_exittime;
1: +  ktime_t idle_sleeptime;
1: +  ktime_t iowait_sleeptime;
1: +  long unsigned int last_jiffies;
1: +  u64 timer_expires;
1: +  u64 timer_expires_base;
1: +  u64 next_timer;
1: +  ktime_t idle_expires;
1: +  atomic_t tick_dep_mask;
1:  };
1:  
1:  struct timer_list_iter {
1: -	int cpu;
1: -	bool second_pass;
1: -	u64 now;
1: +  int cpu;
1: +  bool second_pass;
1: +  u64 now;
1:  };
1:  
1:  struct tm {
1: -	int tm_sec;
1: -	int tm_min;
1: -	int tm_hour;
1: -	int tm_mday;
1: -	int tm_mon;
1: -	long int tm_year;
1: -	int tm_wday;
1: -	int tm_yday;
1: +  int tm_sec;
1: +  int tm_min;
1: +  int tm_hour;
1: +  int tm_mday;
1: +  int tm_mon;
1: +  long int tm_year;
1: +  int tm_wday;
1: +  int tm_yday;
1:  };
1:  
1:  struct cyclecounter {
1: -	u64 (*read)(const struct cyclecounter *);
1: -	u64 mask;
1: -	u32 mult;
1: -	u32 shift;
1: +  u64 (*read)(const struct cyclecounter *);
1: +  u64 mask;
1: +  u32 mult;
1: +  u32 shift;
1:  };
1:  
1:  struct timecounter {
1: -	const struct cyclecounter *cc;
1: -	u64 cycle_last;
1: -	u64 nsec;
1: -	u64 mask;
1: -	u64 frac;
1: +  const struct cyclecounter *cc;
1: +  u64 cycle_last;
1: +  u64 nsec;
1: +  u64 mask;
1: +  u64 frac;
1:  };
1:  
1:  typedef __kernel_timer_t timer_t;
1:  
1:  struct rtc_wkalrm {
1: -	unsigned char enabled;
1: -	unsigned char pending;
1: -	struct rtc_time time;
1: +  unsigned char enabled;
1: +  unsigned char pending;
1: +  struct rtc_time time;
1:  };
1:  
1:  enum alarmtimer_type {
1: -	ALARM_REALTIME = 0,
1: -	ALARM_BOOTTIME = 1,
1: -	ALARM_NUMTYPE = 2,
1: -	ALARM_REALTIME_FREEZER = 3,
1: -	ALARM_BOOTTIME_FREEZER = 4,
1: +  ALARM_REALTIME = 0,
1: +  ALARM_BOOTTIME = 1,
1: +  ALARM_NUMTYPE = 2,
1: +  ALARM_REALTIME_FREEZER = 3,
1: +  ALARM_BOOTTIME_FREEZER = 4,
1:  };
1:  
1:  enum alarmtimer_restart {
1: -	ALARMTIMER_NORESTART = 0,
1: -	ALARMTIMER_RESTART = 1,
1: +  ALARMTIMER_NORESTART = 0,
1: +  ALARMTIMER_RESTART = 1,
1:  };
1:  
1:  struct alarm {
1: -	struct timerqueue_node node;
1: -	struct hrtimer timer;
1: -	enum alarmtimer_restart (*function)(struct alarm *, ktime_t);
1: -	enum alarmtimer_type type;
1: -	int state;
1: -	void *data;
1: +  struct timerqueue_node node;
1: +  struct hrtimer timer;
1: +  enum alarmtimer_restart (*function)(struct alarm *, ktime_t);
1: +  enum alarmtimer_type type;
1: +  int state;
1: +  void *data;
1:  };
1:  
1:  struct cpu_timer {
1: -	struct timerqueue_node node;
1: -	struct timerqueue_head *head;
1: -	struct pid *pid;
1: -	struct list_head elist;
1: -	int firing;
1: +  struct timerqueue_node node;
1: +  struct timerqueue_head *head;
1: +  struct pid *pid;
1: +  struct list_head elist;
1: +  int firing;
1:  };
1:  
1:  struct k_clock;
1:  
1:  struct k_itimer {
1: -	struct list_head list;
1: -	struct hlist_node t_hash;
1: -	spinlock_t it_lock;
1: -	const struct k_clock *kclock;
1: -	clockid_t it_clock;
1: -	timer_t it_id;
1: -	int it_active;
1: -	s64 it_overrun;
1: -	s64 it_overrun_last;
1: -	int it_requeue_pending;
1: -	int it_sigev_notify;
1: -	ktime_t it_interval;
1: -	struct signal_struct *it_signal;
1: -	union {
1: -		struct pid *it_pid;
1: -		struct task_struct *it_process;
1: -	};
1: -	struct sigqueue *sigq;
1: -	union {
1: -		struct {
1: -			struct hrtimer timer;
1: -		} real;
1: -		struct cpu_timer cpu;
1: -		struct {
1: -			struct alarm alarmtimer;
1: -		} alarm;
1: -	} it;
1: -	struct callback_head rcu;
1: +  struct list_head list;
1: +  struct hlist_node t_hash;
1: +  spinlock_t it_lock;
1: +  const struct k_clock *kclock;
1: +  clockid_t it_clock;
1: +  timer_t it_id;
1: +  int it_active;
1: +  s64 it_overrun;
1: +  s64 it_overrun_last;
1: +  int it_requeue_pending;
1: +  int it_sigev_notify;
1: +  ktime_t it_interval;
1: +  struct signal_struct *it_signal;
1: +  union {
1: +    struct pid *it_pid;
1: +    struct task_struct *it_process;
1: +  };
1: +  struct sigqueue *sigq;
1: +  union {
1: +    struct {
1: +      struct hrtimer timer;
1: +    } real;
1: +    struct cpu_timer cpu;
1: +    struct {
1: +      struct alarm alarmtimer;
1: +    } alarm;
1: +  } it;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct k_clock {
1: -	int (*clock_getres)(const clockid_t, struct timespec64 *);
1: -	int (*clock_set)(const clockid_t, const struct timespec64 *);
1: -	int (*clock_get_timespec)(const clockid_t, struct timespec64 *);
1: -	ktime_t (*clock_get_ktime)(const clockid_t);
1: -	int (*clock_adj)(const clockid_t, struct __kernel_timex *);
1: -	int (*timer_create)(struct k_itimer *);
1: -	int (*nsleep)(const clockid_t, int, const struct timespec64 *);
1: -	int (*timer_set)(struct k_itimer *, int, struct itimerspec64 *, struct itimerspec64 *);
1: -	int (*timer_del)(struct k_itimer *);
1: -	void (*timer_get)(struct k_itimer *, struct itimerspec64 *);
1: -	void (*timer_rearm)(struct k_itimer *);
1: -	s64 (*timer_forward)(struct k_itimer *, ktime_t);
1: -	ktime_t (*timer_remaining)(struct k_itimer *, ktime_t);
1: -	int (*timer_try_to_cancel)(struct k_itimer *);
1: -	void (*timer_arm)(struct k_itimer *, ktime_t, bool, bool);
1: -	void (*timer_wait_running)(struct k_itimer *);
1: +  int (*clock_getres)(const clockid_t, struct timespec64 *);
1: +  int (*clock_set)(const clockid_t, const struct timespec64 *);
1: +  int (*clock_get_timespec)(const clockid_t, struct timespec64 *);
1: +  ktime_t (*clock_get_ktime)(const clockid_t);
1: +  int (*clock_adj)(const clockid_t, struct __kernel_timex *);
1: +  int (*timer_create)(struct k_itimer *);
1: +  int (*nsleep)(const clockid_t, int, const struct timespec64 *);
1: +  int (*timer_set)(struct k_itimer *, int, struct itimerspec64 *,
1: +                   struct itimerspec64 *);
1: +  int (*timer_del)(struct k_itimer *);
1: +  void (*timer_get)(struct k_itimer *, struct itimerspec64 *);
1: +  void (*timer_rearm)(struct k_itimer *);
1: +  s64 (*timer_forward)(struct k_itimer *, ktime_t);
1: +  ktime_t (*timer_remaining)(struct k_itimer *, ktime_t);
1: +  int (*timer_try_to_cancel)(struct k_itimer *);
1: +  void (*timer_arm)(struct k_itimer *, ktime_t, bool, bool);
1: +  void (*timer_wait_running)(struct k_itimer *);
1:  };
1:  
1:  struct class_interface {
1: -	struct list_head node;
1: -	struct class *class;
1: -	int (*add_dev)(struct device *, struct class_interface *);
1: -	void (*remove_dev)(struct device *, struct class_interface *);
1: +  struct list_head node;
1: +  struct class *class;
1: +  int (*add_dev)(struct device *, struct class_interface *);
1: +  void (*remove_dev)(struct device *, struct class_interface *);
1:  };
1:  
1:  struct rtc_class_ops {
1: -	int (*ioctl)(struct device *, unsigned int, long unsigned int);
1: -	int (*read_time)(struct device *, struct rtc_time *);
1: -	int (*set_time)(struct device *, struct rtc_time *);
1: -	int (*read_alarm)(struct device *, struct rtc_wkalrm *);
1: -	int (*set_alarm)(struct device *, struct rtc_wkalrm *);
1: -	int (*proc)(struct device *, struct seq_file *);
1: -	int (*alarm_irq_enable)(struct device *, unsigned int);
1: -	int (*read_offset)(struct device *, long int *);
1: -	int (*set_offset)(struct device *, long int);
1: +  int (*ioctl)(struct device *, unsigned int, long unsigned int);
1: +  int (*read_time)(struct device *, struct rtc_time *);
1: +  int (*set_time)(struct device *, struct rtc_time *);
1: +  int (*read_alarm)(struct device *, struct rtc_wkalrm *);
1: +  int (*set_alarm)(struct device *, struct rtc_wkalrm *);
1: +  int (*proc)(struct device *, struct seq_file *);
1: +  int (*alarm_irq_enable)(struct device *, unsigned int);
1: +  int (*read_offset)(struct device *, long int *);
1: +  int (*set_offset)(struct device *, long int);
1:  };
1:  
1:  struct rtc_device;
1:  
1:  struct rtc_timer {
1: -	struct timerqueue_node node;
1: -	ktime_t period;
1: -	void (*func)(struct rtc_device *);
1: -	struct rtc_device *rtc;
1: -	int enabled;
1: +  struct timerqueue_node node;
1: +  ktime_t period;
1: +  void (*func)(struct rtc_device *);
1: +  struct rtc_device *rtc;
1: +  int enabled;
1:  };
1:  
1:  struct rtc_device {
1: -	struct device dev;
1: -	struct module *owner;
1: -	int id;
1: -	const struct rtc_class_ops *ops;
1: -	struct mutex ops_lock;
1: -	struct cdev char_dev;
1: -	long unsigned int flags;
1: -	long unsigned int irq_data;
1: -	spinlock_t irq_lock;
1: -	wait_queue_head_t irq_queue;
1: -	struct fasync_struct *async_queue;
1: -	int irq_freq;
1: -	int max_user_freq;
1: -	struct timerqueue_head timerqueue;
1: -	struct rtc_timer aie_timer;
1: -	struct rtc_timer uie_rtctimer;
1: -	struct hrtimer pie_timer;
1: -	int pie_enabled;
1: -	struct work_struct irqwork;
1: -	int uie_unsupported;
1: -	long int set_offset_nsec;
1: -	bool registered;
1: -	bool nvram_old_abi;
1: -	struct bin_attribute *nvram;
1: -	time64_t range_min;
1: -	timeu64_t range_max;
1: -	time64_t start_secs;
1: -	time64_t offset_secs;
1: -	bool set_start_time;
1: +  struct device dev;
1: +  struct module *owner;
1: +  int id;
1: +  const struct rtc_class_ops *ops;
1: +  struct mutex ops_lock;
1: +  struct cdev char_dev;
1: +  long unsigned int flags;
1: +  long unsigned int irq_data;
1: +  spinlock_t irq_lock;
1: +  wait_queue_head_t irq_queue;
1: +  struct fasync_struct *async_queue;
1: +  int irq_freq;
1: +  int max_user_freq;
1: +  struct timerqueue_head timerqueue;
1: +  struct rtc_timer aie_timer;
1: +  struct rtc_timer uie_rtctimer;
1: +  struct hrtimer pie_timer;
1: +  int pie_enabled;
1: +  struct work_struct irqwork;
1: +  int uie_unsupported;
1: +  long int set_offset_nsec;
1: +  bool registered;
1: +  bool nvram_old_abi;
1: +  struct bin_attribute *nvram;
1: +  time64_t range_min;
1: +  timeu64_t range_max;
1: +  time64_t start_secs;
1: +  time64_t offset_secs;
1: +  bool set_start_time;
1:  };
1:  
1:  struct platform_driver {
1: -	int (*probe)(struct platform_device *);
1: -	int (*remove)(struct platform_device *);
1: -	void (*shutdown)(struct platform_device *);
1: -	int (*suspend)(struct platform_device *, pm_message_t);
1: -	int (*resume)(struct platform_device *);
1: -	struct device_driver driver;
1: -	const struct platform_device_id *id_table;
1: -	bool prevent_deferred_probe;
1: +  int (*probe)(struct platform_device *);
1: +  int (*remove)(struct platform_device *);
1: +  void (*shutdown)(struct platform_device *);
1: +  int (*suspend)(struct platform_device *, pm_message_t);
1: +  int (*resume)(struct platform_device *);
1: +  struct device_driver driver;
1: +  const struct platform_device_id *id_table;
1: +  bool prevent_deferred_probe;
1:  };
1:  
1:  struct trace_event_raw_alarmtimer_suspend {
1: -	struct trace_entry ent;
1: -	s64 expires;
1: -	unsigned char alarm_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  s64 expires;
1: +  unsigned char alarm_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_alarm_class {
1: -	struct trace_entry ent;
1: -	void *alarm;
1: -	unsigned char alarm_type;
1: -	s64 expires;
1: -	s64 now;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *alarm;
1: +  unsigned char alarm_type;
1: +  s64 expires;
1: +  s64 now;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_alarmtimer_suspend {};
1: @@ -29303,41 +29549,41 @@ typedef void (*btf_trace_alarmtimer_start)(void *, struct alarm *, ktime_t);
1:  typedef void (*btf_trace_alarmtimer_cancel)(void *, struct alarm *, ktime_t);
1:  
1:  struct alarm_base {
1: -	spinlock_t lock;
1: -	struct timerqueue_head timerqueue;
1: -	ktime_t (*get_ktime)();
1: -	void (*get_timespec)(struct timespec64 *);
1: -	clockid_t base_clockid;
1: +  spinlock_t lock;
1: +  struct timerqueue_head timerqueue;
1: +  ktime_t (*get_ktime)();
1: +  void (*get_timespec)(struct timespec64 *);
1: +  clockid_t base_clockid;
1:  };
1:  
1:  struct sigevent {
1: -	sigval_t sigev_value;
1: -	int sigev_signo;
1: -	int sigev_notify;
1: -	union {
1: -		int _pad[12];
1: -		int _tid;
1: -		struct {
1: -			void (*_function)(sigval_t);
1: -			void *_attribute;
1: -		} _sigev_thread;
1: -	} _sigev_un;
1: +  sigval_t sigev_value;
1: +  int sigev_signo;
1: +  int sigev_notify;
1: +  union {
1: +    int _pad[12];
1: +    int _tid;
1: +    struct {
1: +      void (*_function)(sigval_t);
1: +      void *_attribute;
1: +    } _sigev_thread;
1: +  } _sigev_un;
1:  };
1:  
1:  typedef struct sigevent sigevent_t;
1:  
1:  struct compat_sigevent {
1: -	compat_sigval_t sigev_value;
1: -	compat_int_t sigev_signo;
1: -	compat_int_t sigev_notify;
1: -	union {
1: -		compat_int_t _pad[13];
1: -		compat_int_t _tid;
1: -		struct {
1: -			compat_uptr_t _function;
1: -			compat_uptr_t _attribute;
1: -		} _sigev_thread;
1: -	} _sigev_un;
1: +  compat_sigval_t sigev_value;
1: +  compat_int_t sigev_signo;
1: +  compat_int_t sigev_notify;
1: +  union {
1: +    compat_int_t _pad[13];
1: +    compat_int_t _tid;
1: +    struct {
1: +      compat_uptr_t _function;
1: +      compat_uptr_t _attribute;
1: +    } _sigev_thread;
1: +  } _sigev_un;
1:  };
1:  
1:  typedef unsigned int uint;
1: @@ -29345,354 +29591,357 @@ typedef unsigned int uint;
1:  struct posix_clock;
1:  
1:  struct posix_clock_operations {
1: -	struct module *owner;
1: -	int (*clock_adjtime)(struct posix_clock *, struct __kernel_timex *);
1: -	int (*clock_gettime)(struct posix_clock *, struct timespec64 *);
1: -	int (*clock_getres)(struct posix_clock *, struct timespec64 *);
1: -	int (*clock_settime)(struct posix_clock *, const struct timespec64 *);
1: -	long int (*ioctl)(struct posix_clock *, unsigned int, long unsigned int);
1: -	int (*open)(struct posix_clock *, fmode_t);
1: -	__poll_t (*poll)(struct posix_clock *, struct file *, poll_table *);
1: -	int (*release)(struct posix_clock *);
1: -	ssize_t (*read)(struct posix_clock *, uint, char *, size_t);
1: +  struct module *owner;
1: +  int (*clock_adjtime)(struct posix_clock *, struct __kernel_timex *);
1: +  int (*clock_gettime)(struct posix_clock *, struct timespec64 *);
1: +  int (*clock_getres)(struct posix_clock *, struct timespec64 *);
1: +  int (*clock_settime)(struct posix_clock *, const struct timespec64 *);
1: +  long int (*ioctl)(struct posix_clock *, unsigned int, long unsigned int);
1: +  int (*open)(struct posix_clock *, fmode_t);
1: +  __poll_t (*poll)(struct posix_clock *, struct file *, poll_table *);
1: +  int (*release)(struct posix_clock *);
1: +  ssize_t (*read)(struct posix_clock *, uint, char *, size_t);
1:  };
1:  
1:  struct posix_clock {
1: -	struct posix_clock_operations ops;
1: -	struct cdev cdev;
1: -	struct device *dev;
1: -	struct rw_semaphore rwsem;
1: -	bool zombie;
1: +  struct posix_clock_operations ops;
1: +  struct cdev cdev;
1: +  struct device *dev;
1: +  struct rw_semaphore rwsem;
1: +  bool zombie;
1:  };
1:  
1:  struct posix_clock_desc {
1: -	struct file *fp;
1: -	struct posix_clock *clk;
1: +  struct file *fp;
1: +  struct posix_clock *clk;
1:  };
1:  
1:  struct __kernel_old_itimerval {
1: -	struct __kernel_old_timeval it_interval;
1: -	struct __kernel_old_timeval it_value;
1: +  struct __kernel_old_timeval it_interval;
1: +  struct __kernel_old_timeval it_value;
1:  };
1:  
1:  struct old_itimerval32 {
1: -	struct old_timeval32 it_interval;
1: -	struct old_timeval32 it_value;
1: +  struct old_timeval32 it_interval;
1: +  struct old_timeval32 it_value;
1:  };
1:  
1:  struct ce_unbind {
1: -	struct clock_event_device *ce;
1: -	int res;
1: +  struct clock_event_device *ce;
1: +  int res;
1:  };
1:  
1:  union futex_key {
1: -	struct {
1: -		u64 i_seq;
1: -		long unsigned int pgoff;
1: -		unsigned int offset;
1: -	} shared;
1: -	struct {
1: -		union {
1: -			struct mm_struct *mm;
1: -			u64 __tmp;
1: -		};
1: -		long unsigned int address;
1: -		unsigned int offset;
1: -	} private;
1: -	struct {
1: -		u64 ptr;
1: -		long unsigned int word;
1: -		unsigned int offset;
1: -	} both;
1: +  struct {
1: +    u64 i_seq;
1: +    long unsigned int pgoff;
1: +    unsigned int offset;
1: +  } shared;
1: +  struct {
1: +    union {
1: +      struct mm_struct *mm;
1: +      u64 __tmp;
1: +    };
1: +    long unsigned int address;
1: +    unsigned int offset;
1: +  } private;
1: +  struct {
1: +    u64 ptr;
1: +    long unsigned int word;
1: +    unsigned int offset;
1: +  } both;
1:  };
1:  
1:  struct futex_pi_state {
1: -	struct list_head list;
1: -	struct rt_mutex pi_mutex;
1: -	struct task_struct *owner;
1: -	refcount_t refcount;
1: -	union futex_key key;
1: +  struct list_head list;
1: +  struct rt_mutex pi_mutex;
1: +  struct task_struct *owner;
1: +  refcount_t refcount;
1: +  union futex_key key;
1:  };
1:  
1:  struct futex_q {
1: -	struct plist_node list;
1: -	struct task_struct *task;
1: -	spinlock_t *lock_ptr;
1: -	union futex_key key;
1: -	struct futex_pi_state *pi_state;
1: -	struct rt_mutex_waiter *rt_waiter;
1: -	union futex_key *requeue_pi_key;
1: -	u32 bitset;
1: +  struct plist_node list;
1: +  struct task_struct *task;
1: +  spinlock_t *lock_ptr;
1: +  union futex_key key;
1: +  struct futex_pi_state *pi_state;
1: +  struct rt_mutex_waiter *rt_waiter;
1: +  union futex_key *requeue_pi_key;
1: +  u32 bitset;
1:  };
1:  
1:  struct futex_hash_bucket {
1: -	atomic_t waiters;
1: -	spinlock_t lock;
1: -	struct plist_head chain;
1: -	long: 64;
1: -	long: 64;
1: +  atomic_t waiters;
1: +  spinlock_t lock;
1: +  struct plist_head chain;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum futex_access {
1: -	FUTEX_READ = 0,
1: -	FUTEX_WRITE = 1,
1: +  FUTEX_READ = 0,
1: +  FUTEX_WRITE = 1,
1:  };
1:  
1:  struct dma_chan {
1: -	int lock;
1: -	const char *device_id;
1: +  int lock;
1: +  const char *device_id;
1:  };
1:  
1:  typedef bool (*smp_cond_func_t)(int, void *);
1:  
1:  struct call_function_data {
1: -	call_single_data_t *csd;
1: -	cpumask_var_t cpumask;
1: -	cpumask_var_t cpumask_ipi;
1: +  call_single_data_t *csd;
1: +  cpumask_var_t cpumask;
1: +  cpumask_var_t cpumask_ipi;
1:  };
1:  
1:  struct smp_call_on_cpu_struct {
1: -	struct work_struct work;
1: -	struct completion done;
1: -	int (*func)(void *);
1: -	void *data;
1: -	int ret;
1: -	int cpu;
1: +  struct work_struct work;
1: +  struct completion done;
1: +  int (*func)(void *);
1: +  void *data;
1: +  int ret;
1: +  int cpu;
1:  };
1:  
1:  struct latch_tree_root {
1: -	seqcount_latch_t seq;
1: -	struct rb_root tree[2];
1: +  seqcount_latch_t seq;
1: +  struct rb_root tree[2];
1:  };
1:  
1:  struct latch_tree_ops {
1: -	bool (*less)(struct latch_tree_node *, struct latch_tree_node *);
1: -	int (*comp)(void *, struct latch_tree_node *);
1: +  bool (*less)(struct latch_tree_node *, struct latch_tree_node *);
1: +  int (*comp)(void *, struct latch_tree_node *);
1:  };
1:  
1:  struct modversion_info {
1: -	long unsigned int crc;
1: -	char name[56];
1: +  long unsigned int crc;
1: +  char name[56];
1:  };
1:  
1:  struct module_use {
1: -	struct list_head source_list;
1: -	struct list_head target_list;
1: -	struct module *source;
1: -	struct module *target;
1: +  struct list_head source_list;
1: +  struct list_head target_list;
1: +  struct module *source;
1: +  struct module *target;
1:  };
1:  
1:  struct module_sect_attr {
1: -	struct bin_attribute battr;
1: -	long unsigned int address;
1: +  struct bin_attribute battr;
1: +  long unsigned int address;
1:  };
1:  
1:  struct module_sect_attrs {
1: -	struct attribute_group grp;
1: -	unsigned int nsections;
1: -	struct module_sect_attr attrs[0];
1: +  struct attribute_group grp;
1: +  unsigned int nsections;
1: +  struct module_sect_attr attrs[0];
1:  };
1:  
1:  struct module_notes_attrs {
1: -	struct kobject *dir;
1: -	unsigned int notes;
1: -	struct bin_attribute attrs[0];
1: +  struct kobject *dir;
1: +  unsigned int notes;
1: +  struct bin_attribute attrs[0];
1:  };
1:  
1:  enum mod_license {
1: -	NOT_GPL_ONLY = 0,
1: -	GPL_ONLY = 1,
1: -	WILL_BE_GPL_ONLY = 2,
1: +  NOT_GPL_ONLY = 0,
1: +  GPL_ONLY = 1,
1: +  WILL_BE_GPL_ONLY = 2,
1:  };
1:  
1:  struct symsearch {
1: -	const struct kernel_symbol *start;
1: -	const struct kernel_symbol *stop;
1: -	const s32 *crcs;
1: -	enum mod_license license;
1: -	bool unused;
1: +  const struct kernel_symbol *start;
1: +  const struct kernel_symbol *stop;
1: +  const s32 *crcs;
1: +  enum mod_license license;
1: +  bool unused;
1:  };
1:  
1:  enum kernel_read_file_id {
1: -	READING_UNKNOWN = 0,
1: -	READING_FIRMWARE = 1,
1: -	READING_MODULE = 2,
1: -	READING_KEXEC_IMAGE = 3,
1: -	READING_KEXEC_INITRAMFS = 4,
1: -	READING_POLICY = 5,
1: -	READING_X509_CERTIFICATE = 6,
1: -	READING_MAX_ID = 7,
1: +  READING_UNKNOWN = 0,
1: +  READING_FIRMWARE = 1,
1: +  READING_MODULE = 2,
1: +  READING_KEXEC_IMAGE = 3,
1: +  READING_KEXEC_INITRAMFS = 4,
1: +  READING_POLICY = 5,
1: +  READING_X509_CERTIFICATE = 6,
1: +  READING_MAX_ID = 7,
1:  };
1:  
1:  enum kernel_load_data_id {
1: -	LOADING_UNKNOWN = 0,
1: -	LOADING_FIRMWARE = 1,
1: -	LOADING_MODULE = 2,
1: -	LOADING_KEXEC_IMAGE = 3,
1: -	LOADING_KEXEC_INITRAMFS = 4,
1: -	LOADING_POLICY = 5,
1: -	LOADING_X509_CERTIFICATE = 6,
1: -	LOADING_MAX_ID = 7,
1: +  LOADING_UNKNOWN = 0,
1: +  LOADING_FIRMWARE = 1,
1: +  LOADING_MODULE = 2,
1: +  LOADING_KEXEC_IMAGE = 3,
1: +  LOADING_KEXEC_INITRAMFS = 4,
1: +  LOADING_POLICY = 5,
1: +  LOADING_X509_CERTIFICATE = 6,
1: +  LOADING_MAX_ID = 7,
1:  };
1:  
1:  enum {
1: -	PROC_ENTRY_PERMANENT = 1,
1: +  PROC_ENTRY_PERMANENT = 1,
1:  };
1:  
1:  struct _ddebug {
1: -	const char *modname;
1: -	const char *function;
1: -	const char *filename;
1: -	const char *format;
1: -	unsigned int lineno: 18;
1: -	unsigned int flags: 8;
1: -	union {
1: -		struct static_key_true dd_key_true;
1: -		struct static_key_false dd_key_false;
1: -	} key;
1: +  const char *modname;
1: +  const char *function;
1: +  const char *filename;
1: +  const char *format;
1: +  unsigned int lineno : 18;
1: +  unsigned int flags : 8;
1: +  union {
1: +    struct static_key_true dd_key_true;
1: +    struct static_key_false dd_key_false;
1: +  } key;
1:  };
1:  
1:  struct load_info {
1: -	const char *name;
1: -	struct module *mod;
1: -	Elf64_Ehdr *hdr;
1: -	long unsigned int len;
1: -	Elf64_Shdr *sechdrs;
1: -	char *secstrings;
1: -	char *strtab;
1: -	long unsigned int symoffs;
1: -	long unsigned int stroffs;
1: -	long unsigned int init_typeoffs;
1: -	long unsigned int core_typeoffs;
1: -	struct _ddebug *debug;
1: -	unsigned int num_debug;
1: -	bool sig_ok;
1: -	long unsigned int mod_kallsyms_init_off;
1: -	struct {
1: -		unsigned int sym;
1: -		unsigned int str;
1: -		unsigned int mod;
1: -		unsigned int vers;
1: -		unsigned int info;
1: -		unsigned int pcpu;
1: -	} index;
1: +  const char *name;
1: +  struct module *mod;
1: +  Elf64_Ehdr *hdr;
1: +  long unsigned int len;
1: +  Elf64_Shdr *sechdrs;
1: +  char *secstrings;
1: +  char *strtab;
1: +  long unsigned int symoffs;
1: +  long unsigned int stroffs;
1: +  long unsigned int init_typeoffs;
1: +  long unsigned int core_typeoffs;
1: +  struct _ddebug *debug;
1: +  unsigned int num_debug;
1: +  bool sig_ok;
1: +  long unsigned int mod_kallsyms_init_off;
1: +  struct {
1: +    unsigned int sym;
1: +    unsigned int str;
1: +    unsigned int mod;
1: +    unsigned int vers;
1: +    unsigned int info;
1: +    unsigned int pcpu;
1: +  } index;
1:  };
1:  
1:  struct trace_event_raw_module_load {
1: -	struct trace_entry ent;
1: -	unsigned int taints;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int taints;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_module_free {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_module_refcnt {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: -	int refcnt;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1: +  int refcnt;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_module_request {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: -	bool wait;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1: +  bool wait;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_module_load {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_module_free {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_module_refcnt {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_module_request {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  typedef void (*btf_trace_module_load)(void *, struct module *);
1:  
1:  typedef void (*btf_trace_module_free)(void *, struct module *);
1:  
1: -typedef void (*btf_trace_module_get)(void *, struct module *, long unsigned int);
1: +typedef void (*btf_trace_module_get)(void *, struct module *,
1: +                                     long unsigned int);
1:  
1: -typedef void (*btf_trace_module_put)(void *, struct module *, long unsigned int);
1: +typedef void (*btf_trace_module_put)(void *, struct module *,
1: +                                     long unsigned int);
1:  
1: -typedef void (*btf_trace_module_request)(void *, char *, bool, long unsigned int);
1: +typedef void (*btf_trace_module_request)(void *, char *, bool,
1: +                                         long unsigned int);
1:  
1:  struct mod_tree_root {
1: -	struct latch_tree_root root;
1: -	long unsigned int addr_min;
1: -	long unsigned int addr_max;
1: +  struct latch_tree_root root;
1: +  long unsigned int addr_min;
1: +  long unsigned int addr_max;
1:  };
1:  
1:  struct find_symbol_arg {
1: -	const char *name;
1: -	bool gplok;
1: -	bool warn;
1: -	struct module *owner;
1: -	const s32 *crc;
1: -	const struct kernel_symbol *sym;
1: -	enum mod_license license;
1: +  const char *name;
1: +  bool gplok;
1: +  bool warn;
1: +  struct module *owner;
1: +  const s32 *crc;
1: +  const struct kernel_symbol *sym;
1: +  enum mod_license license;
1:  };
1:  
1:  struct mod_initfree {
1: -	struct llist_node node;
1: -	void *module_init;
1: +  struct llist_node node;
1: +  void *module_init;
1:  };
1:  
1:  struct module_signature {
1: -	u8 algo;
1: -	u8 hash;
1: -	u8 id_type;
1: -	u8 signer_len;
1: -	u8 key_id_len;
1: -	u8 __pad[3];
1: -	__be32 sig_len;
1: +  u8 algo;
1: +  u8 hash;
1: +  u8 id_type;
1: +  u8 signer_len;
1: +  u8 key_id_len;
1: +  u8 __pad[3];
1: +  __be32 sig_len;
1:  };
1:  
1:  enum key_being_used_for {
1: -	VERIFYING_MODULE_SIGNATURE = 0,
1: -	VERIFYING_FIRMWARE_SIGNATURE = 1,
1: -	VERIFYING_KEXEC_PE_SIGNATURE = 2,
1: -	VERIFYING_KEY_SIGNATURE = 3,
1: -	VERIFYING_KEY_SELF_SIGNATURE = 4,
1: -	VERIFYING_UNSPECIFIED_SIGNATURE = 5,
1: -	NR__KEY_BEING_USED_FOR = 6,
1: +  VERIFYING_MODULE_SIGNATURE = 0,
1: +  VERIFYING_FIRMWARE_SIGNATURE = 1,
1: +  VERIFYING_KEXEC_PE_SIGNATURE = 2,
1: +  VERIFYING_KEY_SIGNATURE = 3,
1: +  VERIFYING_KEY_SELF_SIGNATURE = 4,
1: +  VERIFYING_UNSPECIFIED_SIGNATURE = 5,
1: +  NR__KEY_BEING_USED_FOR = 6,
1:  };
1:  
1:  enum pkey_id_type {
1: -	PKEY_ID_PGP = 0,
1: -	PKEY_ID_X509 = 1,
1: -	PKEY_ID_PKCS7 = 2,
1: +  PKEY_ID_PGP = 0,
1: +  PKEY_ID_X509 = 1,
1: +  PKEY_ID_PKCS7 = 2,
1:  };
1:  
1:  struct kallsym_iter {
1: -	loff_t pos;
1: -	loff_t pos_arch_end;
1: -	loff_t pos_mod_end;
1: -	loff_t pos_ftrace_mod_end;
1: -	loff_t pos_bpf_end;
1: -	long unsigned int value;
1: -	unsigned int nameoff;
1: -	char type;
1: -	char name[128];
1: -	char module_name[56];
1: -	int exported;
1: -	int show_value;
1: +  loff_t pos;
1: +  loff_t pos_arch_end;
1: +  loff_t pos_mod_end;
1: +  loff_t pos_ftrace_mod_end;
1: +  loff_t pos_bpf_end;
1: +  long unsigned int value;
1: +  unsigned int nameoff;
1: +  char type;
1: +  char name[128];
1: +  char module_name[56];
1: +  int exported;
1: +  int show_value;
1:  };
1:  
1:  typedef __u16 comp_t;
1: @@ -29700,62 +29949,62 @@ typedef __u16 comp_t;
1:  typedef __u32 comp2_t;
1:  
1:  struct acct {
1: -	char ac_flag;
1: -	char ac_version;
1: -	__u16 ac_uid16;
1: -	__u16 ac_gid16;
1: -	__u16 ac_tty;
1: -	__u32 ac_btime;
1: -	comp_t ac_utime;
1: -	comp_t ac_stime;
1: -	comp_t ac_etime;
1: -	comp_t ac_mem;
1: -	comp_t ac_io;
1: -	comp_t ac_rw;
1: -	comp_t ac_minflt;
1: -	comp_t ac_majflt;
1: -	comp_t ac_swaps;
1: -	__u16 ac_ahz;
1: -	__u32 ac_exitcode;
1: -	char ac_comm[17];
1: -	__u8 ac_etime_hi;
1: -	__u16 ac_etime_lo;
1: -	__u32 ac_uid;
1: -	__u32 ac_gid;
1: +  char ac_flag;
1: +  char ac_version;
1: +  __u16 ac_uid16;
1: +  __u16 ac_gid16;
1: +  __u16 ac_tty;
1: +  __u32 ac_btime;
1: +  comp_t ac_utime;
1: +  comp_t ac_stime;
1: +  comp_t ac_etime;
1: +  comp_t ac_mem;
1: +  comp_t ac_io;
1: +  comp_t ac_rw;
1: +  comp_t ac_minflt;
1: +  comp_t ac_majflt;
1: +  comp_t ac_swaps;
1: +  __u16 ac_ahz;
1: +  __u32 ac_exitcode;
1: +  char ac_comm[17];
1: +  __u8 ac_etime_hi;
1: +  __u16 ac_etime_lo;
1: +  __u32 ac_uid;
1: +  __u32 ac_gid;
1:  };
1:  
1:  typedef struct acct acct_t;
1:  
1:  struct fs_pin {
1: -	wait_queue_head_t wait;
1: -	int done;
1: -	struct hlist_node s_list;
1: -	struct hlist_node m_list;
1: -	void (*kill)(struct fs_pin *);
1: +  wait_queue_head_t wait;
1: +  int done;
1: +  struct hlist_node s_list;
1: +  struct hlist_node m_list;
1: +  void (*kill)(struct fs_pin *);
1:  };
1:  
1:  struct bsd_acct_struct {
1: -	struct fs_pin pin;
1: -	atomic_long_t count;
1: -	struct callback_head rcu;
1: -	struct mutex lock;
1: -	int active;
1: -	long unsigned int needcheck;
1: -	struct file *file;
1: -	struct pid_namespace *ns;
1: -	struct work_struct work;
1: -	struct completion done;
1: +  struct fs_pin pin;
1: +  atomic_long_t count;
1: +  struct callback_head rcu;
1: +  struct mutex lock;
1: +  int active;
1: +  long unsigned int needcheck;
1: +  struct file *file;
1: +  struct pid_namespace *ns;
1: +  struct work_struct work;
1: +  struct completion done;
1:  };
1:  
1:  struct elf64_note {
1: -	Elf64_Word n_namesz;
1: -	Elf64_Word n_descsz;
1: -	Elf64_Word n_type;
1: +  Elf64_Word n_namesz;
1: +  Elf64_Word n_descsz;
1: +  Elf64_Word n_type;
1:  };
1:  
1:  struct elf_note_section {
1: -	struct elf64_note n_hdr;
1: -	u8 n_data[0];
1: +  struct elf64_note n_hdr;
1: +  u8 n_data[0];
1:  };
1:  
1:  typedef long unsigned int elf_greg_t;
1: @@ -29763,46 +30012,46 @@ typedef long unsigned int elf_greg_t;
1:  typedef elf_greg_t elf_gregset_t[27];
1:  
1:  struct elf_siginfo {
1: -	int si_signo;
1: -	int si_code;
1: -	int si_errno;
1: +  int si_signo;
1: +  int si_code;
1: +  int si_errno;
1:  };
1:  
1:  struct elf_prstatus {
1: -	struct elf_siginfo pr_info;
1: -	short int pr_cursig;
1: -	long unsigned int pr_sigpend;
1: -	long unsigned int pr_sighold;
1: -	pid_t pr_pid;
1: -	pid_t pr_ppid;
1: -	pid_t pr_pgrp;
1: -	pid_t pr_sid;
1: -	struct __kernel_old_timeval pr_utime;
1: -	struct __kernel_old_timeval pr_stime;
1: -	struct __kernel_old_timeval pr_cutime;
1: -	struct __kernel_old_timeval pr_cstime;
1: -	elf_gregset_t pr_reg;
1: -	int pr_fpvalid;
1: +  struct elf_siginfo pr_info;
1: +  short int pr_cursig;
1: +  long unsigned int pr_sigpend;
1: +  long unsigned int pr_sighold;
1: +  pid_t pr_pid;
1: +  pid_t pr_ppid;
1: +  pid_t pr_pgrp;
1: +  pid_t pr_sid;
1: +  struct __kernel_old_timeval pr_utime;
1: +  struct __kernel_old_timeval pr_stime;
1: +  struct __kernel_old_timeval pr_cutime;
1: +  struct __kernel_old_timeval pr_cstime;
1: +  elf_gregset_t pr_reg;
1: +  int pr_fpvalid;
1:  };
1:  
1:  typedef u32 note_buf_t[92];
1:  
1:  struct compat_kexec_segment {
1: -	compat_uptr_t buf;
1: -	compat_size_t bufsz;
1: -	compat_ulong_t mem;
1: -	compat_size_t memsz;
1: +  compat_uptr_t buf;
1: +  compat_size_t bufsz;
1: +  compat_ulong_t mem;
1: +  compat_size_t memsz;
1:  };
1:  
1:  enum migrate_reason {
1: -	MR_COMPACTION = 0,
1: -	MR_MEMORY_FAILURE = 1,
1: -	MR_MEMORY_HOTPLUG = 2,
1: -	MR_SYSCALL = 3,
1: -	MR_MEMPOLICY_MBIND = 4,
1: -	MR_NUMA_MISPLACED = 5,
1: -	MR_CONTIG_RANGE = 6,
1: -	MR_TYPES = 7,
1: +  MR_COMPACTION = 0,
1: +  MR_MEMORY_FAILURE = 1,
1: +  MR_MEMORY_HOTPLUG = 2,
1: +  MR_SYSCALL = 3,
1: +  MR_MEMPOLICY_MBIND = 4,
1: +  MR_NUMA_MISPLACED = 5,
1: +  MR_CONTIG_RANGE = 6,
1: +  MR_TYPES = 7,
1:  };
1:  
1:  typedef __kernel_ulong_t __kernel_ino_t;
1: @@ -29810,218 +30059,218 @@ typedef __kernel_ulong_t __kernel_ino_t;
1:  typedef __kernel_ino_t ino_t;
1:  
1:  enum kernfs_node_type {
1: -	KERNFS_DIR = 1,
1: -	KERNFS_FILE = 2,
1: -	KERNFS_LINK = 4,
1: +  KERNFS_DIR = 1,
1: +  KERNFS_FILE = 2,
1: +  KERNFS_LINK = 4,
1:  };
1:  
1:  enum kernfs_root_flag {
1: -	KERNFS_ROOT_CREATE_DEACTIVATED = 1,
1: -	KERNFS_ROOT_EXTRA_OPEN_PERM_CHECK = 2,
1: -	KERNFS_ROOT_SUPPORT_EXPORTOP = 4,
1: -	KERNFS_ROOT_SUPPORT_USER_XATTR = 8,
1: +  KERNFS_ROOT_CREATE_DEACTIVATED = 1,
1: +  KERNFS_ROOT_EXTRA_OPEN_PERM_CHECK = 2,
1: +  KERNFS_ROOT_SUPPORT_EXPORTOP = 4,
1: +  KERNFS_ROOT_SUPPORT_USER_XATTR = 8,
1:  };
1:  
1:  struct kernfs_fs_context {
1: -	struct kernfs_root *root;
1: -	void *ns_tag;
1: -	long unsigned int magic;
1: -	bool new_sb_created;
1: +  struct kernfs_root *root;
1: +  void *ns_tag;
1: +  long unsigned int magic;
1: +  bool new_sb_created;
1:  };
1:  
1:  enum bpf_link_type {
1: -	BPF_LINK_TYPE_UNSPEC = 0,
1: -	BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
1: -	BPF_LINK_TYPE_TRACING = 2,
1: -	BPF_LINK_TYPE_CGROUP = 3,
1: -	BPF_LINK_TYPE_ITER = 4,
1: -	BPF_LINK_TYPE_NETNS = 5,
1: -	BPF_LINK_TYPE_XDP = 6,
1: -	MAX_BPF_LINK_TYPE = 7,
1: +  BPF_LINK_TYPE_UNSPEC = 0,
1: +  BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
1: +  BPF_LINK_TYPE_TRACING = 2,
1: +  BPF_LINK_TYPE_CGROUP = 3,
1: +  BPF_LINK_TYPE_ITER = 4,
1: +  BPF_LINK_TYPE_NETNS = 5,
1: +  BPF_LINK_TYPE_XDP = 6,
1: +  MAX_BPF_LINK_TYPE = 7,
1:  };
1:  
1:  struct bpf_link_info {
1: -	__u32 type;
1: -	__u32 id;
1: -	__u32 prog_id;
1: -	union {
1: -		struct {
1: -			__u64 tp_name;
1: -			__u32 tp_name_len;
1: -		} raw_tracepoint;
1: -		struct {
1: -			__u32 attach_type;
1: -		} tracing;
1: -		struct {
1: -			__u64 cgroup_id;
1: -			__u32 attach_type;
1: -		} cgroup;
1: -		struct {
1: -			__u64 target_name;
1: -			__u32 target_name_len;
1: -			union {
1: -				struct {
1: -					__u32 map_id;
1: -				} map;
1: -			};
1: -		} iter;
1: -		struct {
1: -			__u32 netns_ino;
1: -			__u32 attach_type;
1: -		} netns;
1: -		struct {
1: -			__u32 ifindex;
1: -		} xdp;
1: -	};
1: +  __u32 type;
1: +  __u32 id;
1: +  __u32 prog_id;
1: +  union {
1: +    struct {
1: +      __u64 tp_name;
1: +      __u32 tp_name_len;
1: +    } raw_tracepoint;
1: +    struct {
1: +      __u32 attach_type;
1: +    } tracing;
1: +    struct {
1: +      __u64 cgroup_id;
1: +      __u32 attach_type;
1: +    } cgroup;
1: +    struct {
1: +      __u64 target_name;
1: +      __u32 target_name_len;
1: +      union {
1: +        struct {
1: +          __u32 map_id;
1: +        } map;
1: +      };
1: +    } iter;
1: +    struct {
1: +      __u32 netns_ino;
1: +      __u32 attach_type;
1: +    } netns;
1: +    struct {
1: +      __u32 ifindex;
1: +    } xdp;
1: +  };
1:  };
1:  
1:  struct bpf_link_ops;
1:  
1:  struct bpf_link {
1: -	atomic64_t refcnt;
1: -	u32 id;
1: -	enum bpf_link_type type;
1: -	const struct bpf_link_ops *ops;
1: -	struct bpf_prog *prog;
1: -	struct work_struct work;
1: +  atomic64_t refcnt;
1: +  u32 id;
1: +  enum bpf_link_type type;
1: +  const struct bpf_link_ops *ops;
1: +  struct bpf_prog *prog;
1: +  struct work_struct work;
1:  };
1:  
1:  struct bpf_link_ops {
1: -	void (*release)(struct bpf_link *);
1: -	void (*dealloc)(struct bpf_link *);
1: -	int (*detach)(struct bpf_link *);
1: -	int (*update_prog)(struct bpf_link *, struct bpf_prog *, struct bpf_prog *);
1: -	void (*show_fdinfo)(const struct bpf_link *, struct seq_file *);
1: -	int (*fill_link_info)(const struct bpf_link *, struct bpf_link_info *);
1: +  void (*release)(struct bpf_link *);
1: +  void (*dealloc)(struct bpf_link *);
1: +  int (*detach)(struct bpf_link *);
1: +  int (*update_prog)(struct bpf_link *, struct bpf_prog *, struct bpf_prog *);
1: +  void (*show_fdinfo)(const struct bpf_link *, struct seq_file *);
1: +  int (*fill_link_info)(const struct bpf_link *, struct bpf_link_info *);
1:  };
1:  
1:  struct bpf_cgroup_link {
1: -	struct bpf_link link;
1: -	struct cgroup *cgroup;
1: -	enum bpf_attach_type type;
1: +  struct bpf_link link;
1: +  struct cgroup *cgroup;
1: +  enum bpf_attach_type type;
1:  };
1:  
1:  enum {
1: -	CGRP_NOTIFY_ON_RELEASE = 0,
1: -	CGRP_CPUSET_CLONE_CHILDREN = 1,
1: -	CGRP_FREEZE = 2,
1: -	CGRP_FROZEN = 3,
1: +  CGRP_NOTIFY_ON_RELEASE = 0,
1: +  CGRP_CPUSET_CLONE_CHILDREN = 1,
1: +  CGRP_FREEZE = 2,
1: +  CGRP_FROZEN = 3,
1:  };
1:  
1:  enum {
1: -	CGRP_ROOT_NOPREFIX = 2,
1: -	CGRP_ROOT_XATTR = 4,
1: -	CGRP_ROOT_NS_DELEGATE = 8,
1: -	CGRP_ROOT_CPUSET_V2_MODE = 16,
1: -	CGRP_ROOT_MEMORY_LOCAL_EVENTS = 32,
1: -	CGRP_ROOT_MEMORY_RECURSIVE_PROT = 64,
1: +  CGRP_ROOT_NOPREFIX = 2,
1: +  CGRP_ROOT_XATTR = 4,
1: +  CGRP_ROOT_NS_DELEGATE = 8,
1: +  CGRP_ROOT_CPUSET_V2_MODE = 16,
1: +  CGRP_ROOT_MEMORY_LOCAL_EVENTS = 32,
1: +  CGRP_ROOT_MEMORY_RECURSIVE_PROT = 64,
1:  };
1:  
1:  struct cgroup_taskset {
1: -	struct list_head src_csets;
1: -	struct list_head dst_csets;
1: -	int nr_tasks;
1: -	int ssid;
1: -	struct list_head *csets;
1: -	struct css_set *cur_cset;
1: -	struct task_struct *cur_task;
1: +  struct list_head src_csets;
1: +  struct list_head dst_csets;
1: +  int nr_tasks;
1: +  int ssid;
1: +  struct list_head *csets;
1: +  struct css_set *cur_cset;
1: +  struct task_struct *cur_task;
1:  };
1:  
1:  struct css_task_iter {
1: -	struct cgroup_subsys *ss;
1: -	unsigned int flags;
1: -	struct list_head *cset_pos;
1: -	struct list_head *cset_head;
1: -	struct list_head *tcset_pos;
1: -	struct list_head *tcset_head;
1: -	struct list_head *task_pos;
1: -	struct list_head *cur_tasks_head;
1: -	struct css_set *cur_cset;
1: -	struct css_set *cur_dcset;
1: -	struct task_struct *cur_task;
1: -	struct list_head iters_node;
1: +  struct cgroup_subsys *ss;
1: +  unsigned int flags;
1: +  struct list_head *cset_pos;
1: +  struct list_head *cset_head;
1: +  struct list_head *tcset_pos;
1: +  struct list_head *tcset_head;
1: +  struct list_head *task_pos;
1: +  struct list_head *cur_tasks_head;
1: +  struct css_set *cur_cset;
1: +  struct css_set *cur_dcset;
1: +  struct task_struct *cur_task;
1: +  struct list_head iters_node;
1:  };
1:  
1:  struct cgroup_fs_context {
1: -	struct kernfs_fs_context kfc;
1: -	struct cgroup_root *root;
1: -	struct cgroup_namespace *ns;
1: -	unsigned int flags;
1: -	bool cpuset_clone_children;
1: -	bool none;
1: -	bool all_ss;
1: -	u16 subsys_mask;
1: -	char *name;
1: -	char *release_agent;
1: +  struct kernfs_fs_context kfc;
1: +  struct cgroup_root *root;
1: +  struct cgroup_namespace *ns;
1: +  unsigned int flags;
1: +  bool cpuset_clone_children;
1: +  bool none;
1: +  bool all_ss;
1: +  u16 subsys_mask;
1: +  char *name;
1: +  char *release_agent;
1:  };
1:  
1:  struct cgrp_cset_link {
1: -	struct cgroup *cgrp;
1: -	struct css_set *cset;
1: -	struct list_head cset_link;
1: -	struct list_head cgrp_link;
1: +  struct cgroup *cgrp;
1: +  struct css_set *cset;
1: +  struct list_head cset_link;
1: +  struct list_head cgrp_link;
1:  };
1:  
1:  struct cgroup_mgctx {
1: -	struct list_head preloaded_src_csets;
1: -	struct list_head preloaded_dst_csets;
1: -	struct cgroup_taskset tset;
1: -	u16 ss_mask;
1: +  struct list_head preloaded_src_csets;
1: +  struct list_head preloaded_dst_csets;
1: +  struct cgroup_taskset tset;
1: +  u16 ss_mask;
1:  };
1:  
1:  struct trace_event_raw_cgroup_root {
1: -	struct trace_entry ent;
1: -	int root;
1: -	u16 ss_mask;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int root;
1: +  u16 ss_mask;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cgroup {
1: -	struct trace_entry ent;
1: -	int root;
1: -	int id;
1: -	int level;
1: -	u32 __data_loc_path;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int root;
1: +  int id;
1: +  int level;
1: +  u32 __data_loc_path;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cgroup_migrate {
1: -	struct trace_entry ent;
1: -	int dst_root;
1: -	int dst_id;
1: -	int dst_level;
1: -	int pid;
1: -	u32 __data_loc_dst_path;
1: -	u32 __data_loc_comm;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int dst_root;
1: +  int dst_id;
1: +  int dst_level;
1: +  int pid;
1: +  u32 __data_loc_dst_path;
1: +  u32 __data_loc_comm;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cgroup_event {
1: -	struct trace_entry ent;
1: -	int root;
1: -	int id;
1: -	int level;
1: -	u32 __data_loc_path;
1: -	int val;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int root;
1: +  int id;
1: +  int level;
1: +  u32 __data_loc_path;
1: +  int val;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_cgroup_root {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_cgroup {
1: -	u32 path;
1: +  u32 path;
1:  };
1:  
1:  struct trace_event_data_offsets_cgroup_migrate {
1: -	u32 dst_path;
1: -	u32 comm;
1: +  u32 dst_path;
1: +  u32 comm;
1:  };
1:  
1:  struct trace_event_data_offsets_cgroup_event {
1: -	u32 path;
1: +  u32 path;
1:  };
1:  
1:  typedef void (*btf_trace_cgroup_setup_root)(void *, struct cgroup_root *);
1: @@ -30040,229 +30289,236 @@ typedef void (*btf_trace_cgroup_rename)(void *, struct cgroup *, const char *);
1:  
1:  typedef void (*btf_trace_cgroup_freeze)(void *, struct cgroup *, const char *);
1:  
1: -typedef void (*btf_trace_cgroup_unfreeze)(void *, struct cgroup *, const char *);
1: +typedef void (*btf_trace_cgroup_unfreeze)(void *, struct cgroup *,
1: +                                          const char *);
1:  
1: -typedef void (*btf_trace_cgroup_attach_task)(void *, struct cgroup *, const char *, struct task_struct *, bool);
1: +typedef void (*btf_trace_cgroup_attach_task)(void *, struct cgroup *,
1: +                                             const char *, struct task_struct *,
1: +                                             bool);
1:  
1: -typedef void (*btf_trace_cgroup_transfer_tasks)(void *, struct cgroup *, const char *, struct task_struct *, bool);
1: +typedef void (*btf_trace_cgroup_transfer_tasks)(void *, struct cgroup *,
1: +                                                const char *,
1: +                                                struct task_struct *, bool);
1:  
1: -typedef void (*btf_trace_cgroup_notify_populated)(void *, struct cgroup *, const char *, int);
1: +typedef void (*btf_trace_cgroup_notify_populated)(void *, struct cgroup *,
1: +                                                  const char *, int);
1:  
1: -typedef void (*btf_trace_cgroup_notify_frozen)(void *, struct cgroup *, const char *, int);
1: +typedef void (*btf_trace_cgroup_notify_frozen)(void *, struct cgroup *,
1: +                                               const char *, int);
1:  
1:  enum cgroup2_param {
1: -	Opt_nsdelegate = 0,
1: -	Opt_memory_localevents = 1,
1: -	Opt_memory_recursiveprot = 2,
1: -	nr__cgroup2_params = 3,
1: +  Opt_nsdelegate = 0,
1: +  Opt_memory_localevents = 1,
1: +  Opt_memory_recursiveprot = 2,
1: +  nr__cgroup2_params = 3,
1:  };
1:  
1:  struct cgroupstats {
1: -	__u64 nr_sleeping;
1: -	__u64 nr_running;
1: -	__u64 nr_stopped;
1: -	__u64 nr_uninterruptible;
1: -	__u64 nr_io_wait;
1: +  __u64 nr_sleeping;
1: +  __u64 nr_running;
1: +  __u64 nr_stopped;
1: +  __u64 nr_uninterruptible;
1: +  __u64 nr_io_wait;
1:  };
1:  
1:  enum cgroup_filetype {
1: -	CGROUP_FILE_PROCS = 0,
1: -	CGROUP_FILE_TASKS = 1,
1: +  CGROUP_FILE_PROCS = 0,
1: +  CGROUP_FILE_TASKS = 1,
1:  };
1:  
1:  struct cgroup_pidlist {
1: -	struct {
1: -		enum cgroup_filetype type;
1: -		struct pid_namespace *ns;
1: -	} key;
1: -	pid_t *list;
1: -	int length;
1: -	struct list_head links;
1: -	struct cgroup *owner;
1: -	struct delayed_work destroy_dwork;
1: +  struct {
1: +    enum cgroup_filetype type;
1: +    struct pid_namespace *ns;
1: +  } key;
1: +  pid_t *list;
1: +  int length;
1: +  struct list_head links;
1: +  struct cgroup *owner;
1: +  struct delayed_work destroy_dwork;
1:  };
1:  
1:  enum cgroup1_param {
1: -	Opt_all = 0,
1: -	Opt_clone_children = 1,
1: -	Opt_cpuset_v2_mode = 2,
1: -	Opt_name = 3,
1: -	Opt_none = 4,
1: -	Opt_noprefix = 5,
1: -	Opt_release_agent = 6,
1: -	Opt_xattr = 7,
1: +  Opt_all = 0,
1: +  Opt_clone_children = 1,
1: +  Opt_cpuset_v2_mode = 2,
1: +  Opt_name = 3,
1: +  Opt_none = 4,
1: +  Opt_noprefix = 5,
1: +  Opt_release_agent = 6,
1: +  Opt_xattr = 7,
1:  };
1:  
1:  enum freezer_state_flags {
1: -	CGROUP_FREEZER_ONLINE = 1,
1: -	CGROUP_FREEZING_SELF = 2,
1: -	CGROUP_FREEZING_PARENT = 4,
1: -	CGROUP_FROZEN = 8,
1: -	CGROUP_FREEZING = 6,
1: +  CGROUP_FREEZER_ONLINE = 1,
1: +  CGROUP_FREEZING_SELF = 2,
1: +  CGROUP_FREEZING_PARENT = 4,
1: +  CGROUP_FROZEN = 8,
1: +  CGROUP_FREEZING = 6,
1:  };
1:  
1:  struct freezer {
1: -	struct cgroup_subsys_state css;
1: -	unsigned int state;
1: +  struct cgroup_subsys_state css;
1: +  unsigned int state;
1:  };
1:  
1:  struct root_domain___2;
1:  
1:  struct fmeter {
1: -	int cnt;
1: -	int val;
1: -	time64_t time;
1: -	spinlock_t lock;
1: +  int cnt;
1: +  int val;
1: +  time64_t time;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct cpuset {
1: -	struct cgroup_subsys_state css;
1: -	long unsigned int flags;
1: -	cpumask_var_t cpus_allowed;
1: -	nodemask_t mems_allowed;
1: -	cpumask_var_t effective_cpus;
1: -	nodemask_t effective_mems;
1: -	cpumask_var_t subparts_cpus;
1: -	nodemask_t old_mems_allowed;
1: -	struct fmeter fmeter;
1: -	int attach_in_progress;
1: -	int pn;
1: -	int relax_domain_level;
1: -	int nr_subparts_cpus;
1: -	int partition_root_state;
1: -	int use_parent_ecpus;
1: -	int child_ecpus_count;
1: +  struct cgroup_subsys_state css;
1: +  long unsigned int flags;
1: +  cpumask_var_t cpus_allowed;
1: +  nodemask_t mems_allowed;
1: +  cpumask_var_t effective_cpus;
1: +  nodemask_t effective_mems;
1: +  cpumask_var_t subparts_cpus;
1: +  nodemask_t old_mems_allowed;
1: +  struct fmeter fmeter;
1: +  int attach_in_progress;
1: +  int pn;
1: +  int relax_domain_level;
1: +  int nr_subparts_cpus;
1: +  int partition_root_state;
1: +  int use_parent_ecpus;
1: +  int child_ecpus_count;
1:  };
1:  
1:  struct tmpmasks {
1: -	cpumask_var_t addmask;
1: -	cpumask_var_t delmask;
1: -	cpumask_var_t new_cpus;
1: +  cpumask_var_t addmask;
1: +  cpumask_var_t delmask;
1: +  cpumask_var_t new_cpus;
1:  };
1:  
1:  typedef enum {
1: -	CS_ONLINE = 0,
1: -	CS_CPU_EXCLUSIVE = 1,
1: -	CS_MEM_EXCLUSIVE = 2,
1: -	CS_MEM_HARDWALL = 3,
1: -	CS_MEMORY_MIGRATE = 4,
1: -	CS_SCHED_LOAD_BALANCE = 5,
1: -	CS_SPREAD_PAGE = 6,
1: -	CS_SPREAD_SLAB = 7,
1: +  CS_ONLINE = 0,
1: +  CS_CPU_EXCLUSIVE = 1,
1: +  CS_MEM_EXCLUSIVE = 2,
1: +  CS_MEM_HARDWALL = 3,
1: +  CS_MEMORY_MIGRATE = 4,
1: +  CS_SCHED_LOAD_BALANCE = 5,
1: +  CS_SPREAD_PAGE = 6,
1: +  CS_SPREAD_SLAB = 7,
1:  } cpuset_flagbits_t;
1:  
1:  enum subparts_cmd {
1: -	partcmd_enable = 0,
1: -	partcmd_disable = 1,
1: -	partcmd_update = 2,
1: +  partcmd_enable = 0,
1: +  partcmd_disable = 1,
1: +  partcmd_update = 2,
1:  };
1:  
1:  struct cpuset_migrate_mm_work {
1: -	struct work_struct work;
1: -	struct mm_struct *mm;
1: -	nodemask_t from;
1: -	nodemask_t to;
1: +  struct work_struct work;
1: +  struct mm_struct *mm;
1: +  nodemask_t from;
1: +  nodemask_t to;
1:  };
1:  
1:  typedef enum {
1: -	FILE_MEMORY_MIGRATE = 0,
1: -	FILE_CPULIST = 1,
1: -	FILE_MEMLIST = 2,
1: -	FILE_EFFECTIVE_CPULIST = 3,
1: -	FILE_EFFECTIVE_MEMLIST = 4,
1: -	FILE_SUBPARTS_CPULIST = 5,
1: -	FILE_CPU_EXCLUSIVE = 6,
1: -	FILE_MEM_EXCLUSIVE = 7,
1: -	FILE_MEM_HARDWALL = 8,
1: -	FILE_SCHED_LOAD_BALANCE = 9,
1: -	FILE_PARTITION_ROOT = 10,
1: -	FILE_SCHED_RELAX_DOMAIN_LEVEL = 11,
1: -	FILE_MEMORY_PRESSURE_ENABLED = 12,
1: -	FILE_MEMORY_PRESSURE = 13,
1: -	FILE_SPREAD_PAGE = 14,
1: -	FILE_SPREAD_SLAB = 15,
1: +  FILE_MEMORY_MIGRATE = 0,
1: +  FILE_CPULIST = 1,
1: +  FILE_MEMLIST = 2,
1: +  FILE_EFFECTIVE_CPULIST = 3,
1: +  FILE_EFFECTIVE_MEMLIST = 4,
1: +  FILE_SUBPARTS_CPULIST = 5,
1: +  FILE_CPU_EXCLUSIVE = 6,
1: +  FILE_MEM_EXCLUSIVE = 7,
1: +  FILE_MEM_HARDWALL = 8,
1: +  FILE_SCHED_LOAD_BALANCE = 9,
1: +  FILE_PARTITION_ROOT = 10,
1: +  FILE_SCHED_RELAX_DOMAIN_LEVEL = 11,
1: +  FILE_MEMORY_PRESSURE_ENABLED = 12,
1: +  FILE_MEMORY_PRESSURE = 13,
1: +  FILE_SPREAD_PAGE = 14,
1: +  FILE_SPREAD_SLAB = 15,
1:  } cpuset_filetype_t;
1:  
1:  struct kernel_pkey_query {
1: -	__u32 supported_ops;
1: -	__u32 key_size;
1: -	__u16 max_data_size;
1: -	__u16 max_sig_size;
1: -	__u16 max_enc_size;
1: -	__u16 max_dec_size;
1: +  __u32 supported_ops;
1: +  __u32 key_size;
1: +  __u16 max_data_size;
1: +  __u16 max_sig_size;
1: +  __u16 max_enc_size;
1: +  __u16 max_dec_size;
1:  };
1:  
1:  enum kernel_pkey_operation {
1: -	kernel_pkey_encrypt = 0,
1: -	kernel_pkey_decrypt = 1,
1: -	kernel_pkey_sign = 2,
1: -	kernel_pkey_verify = 3,
1: +  kernel_pkey_encrypt = 0,
1: +  kernel_pkey_decrypt = 1,
1: +  kernel_pkey_sign = 2,
1: +  kernel_pkey_verify = 3,
1:  };
1:  
1:  struct kernel_pkey_params {
1: -	struct key *key;
1: -	const char *encoding;
1: -	const char *hash_algo;
1: -	char *info;
1: -	__u32 in_len;
1: -	union {
1: -		__u32 out_len;
1: -		__u32 in2_len;
1: -	};
1: -	enum kernel_pkey_operation op: 8;
1: +  struct key *key;
1: +  const char *encoding;
1: +  const char *hash_algo;
1: +  char *info;
1: +  __u32 in_len;
1: +  union {
1: +    __u32 out_len;
1: +    __u32 in2_len;
1: +  };
1: +  enum kernel_pkey_operation op : 8;
1:  };
1:  
1:  struct key_preparsed_payload {
1: -	char *description;
1: -	union key_payload payload;
1: -	const void *data;
1: -	size_t datalen;
1: -	size_t quotalen;
1: -	time64_t expiry;
1: +  char *description;
1: +  union key_payload payload;
1: +  const void *data;
1: +  size_t datalen;
1: +  size_t quotalen;
1: +  time64_t expiry;
1:  };
1:  
1:  struct key_match_data {
1: -	bool (*cmp)(const struct key *, const struct key_match_data *);
1: -	const void *raw_data;
1: -	void *preparsed;
1: -	unsigned int lookup_type;
1: +  bool (*cmp)(const struct key *, const struct key_match_data *);
1: +  const void *raw_data;
1: +  void *preparsed;
1: +  unsigned int lookup_type;
1:  };
1:  
1:  struct idmap_key {
1: -	bool map_up;
1: -	u32 id;
1: -	u32 count;
1: +  bool map_up;
1: +  u32 id;
1: +  u32 count;
1:  };
1:  
1:  struct cpu_stop_done {
1: -	atomic_t nr_todo;
1: -	int ret;
1: -	struct completion completion;
1: +  atomic_t nr_todo;
1: +  int ret;
1: +  struct completion completion;
1:  };
1:  
1:  struct cpu_stopper {
1: -	struct task_struct *thread;
1: -	raw_spinlock_t lock;
1: -	bool enabled;
1: -	struct list_head works;
1: -	struct cpu_stop_work stop_work;
1: +  struct task_struct *thread;
1: +  raw_spinlock_t lock;
1: +  bool enabled;
1: +  struct list_head works;
1: +  struct cpu_stop_work stop_work;
1:  };
1:  
1:  enum multi_stop_state {
1: -	MULTI_STOP_NONE = 0,
1: -	MULTI_STOP_PREPARE = 1,
1: -	MULTI_STOP_DISABLE_IRQ = 2,
1: -	MULTI_STOP_RUN = 3,
1: -	MULTI_STOP_EXIT = 4,
1: +  MULTI_STOP_NONE = 0,
1: +  MULTI_STOP_PREPARE = 1,
1: +  MULTI_STOP_DISABLE_IRQ = 2,
1: +  MULTI_STOP_RUN = 3,
1: +  MULTI_STOP_EXIT = 4,
1:  };
1:  
1:  struct multi_stop_data {
1: -	cpu_stop_fn_t fn;
1: -	void *data;
1: -	unsigned int num_threads;
1: -	const struct cpumask *active_cpus;
1: -	enum multi_stop_state state;
1: -	atomic_t thread_ack;
1: +  cpu_stop_fn_t fn;
1: +  void *data;
1: +  unsigned int num_threads;
1: +  const struct cpumask *active_cpus;
1: +  enum multi_stop_state state;
1: +  atomic_t thread_ack;
1:  };
1:  
1:  typedef int __kernel_mqd_t;
1: @@ -30270,51 +30526,51 @@ typedef int __kernel_mqd_t;
1:  typedef __kernel_mqd_t mqd_t;
1:  
1:  enum audit_state {
1: -	AUDIT_DISABLED = 0,
1: -	AUDIT_BUILD_CONTEXT = 1,
1: -	AUDIT_RECORD_CONTEXT = 2,
1: +  AUDIT_DISABLED = 0,
1: +  AUDIT_BUILD_CONTEXT = 1,
1: +  AUDIT_RECORD_CONTEXT = 2,
1:  };
1:  
1:  struct audit_cap_data {
1: -	kernel_cap_t permitted;
1: -	kernel_cap_t inheritable;
1: -	union {
1: -		unsigned int fE;
1: -		kernel_cap_t effective;
1: -	};
1: -	kernel_cap_t ambient;
1: -	kuid_t rootid;
1: +  kernel_cap_t permitted;
1: +  kernel_cap_t inheritable;
1: +  union {
1: +    unsigned int fE;
1: +    kernel_cap_t effective;
1: +  };
1: +  kernel_cap_t ambient;
1: +  kuid_t rootid;
1:  };
1:  
1:  struct audit_names {
1: -	struct list_head list;
1: -	struct filename *name;
1: -	int name_len;
1: -	bool hidden;
1: -	long unsigned int ino;
1: -	dev_t dev;
1: -	umode_t mode;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	dev_t rdev;
1: -	u32 osid;
1: -	struct audit_cap_data fcap;
1: -	unsigned int fcap_ver;
1: -	unsigned char type;
1: -	bool should_free;
1: +  struct list_head list;
1: +  struct filename *name;
1: +  int name_len;
1: +  bool hidden;
1: +  long unsigned int ino;
1: +  dev_t dev;
1: +  umode_t mode;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  dev_t rdev;
1: +  u32 osid;
1: +  struct audit_cap_data fcap;
1: +  unsigned int fcap_ver;
1: +  unsigned char type;
1: +  bool should_free;
1:  };
1:  
1:  struct mq_attr {
1: -	__kernel_long_t mq_flags;
1: -	__kernel_long_t mq_maxmsg;
1: -	__kernel_long_t mq_msgsize;
1: -	__kernel_long_t mq_curmsgs;
1: -	__kernel_long_t __reserved[4];
1: +  __kernel_long_t mq_flags;
1: +  __kernel_long_t mq_maxmsg;
1: +  __kernel_long_t mq_msgsize;
1: +  __kernel_long_t mq_curmsgs;
1: +  __kernel_long_t __reserved[4];
1:  };
1:  
1:  struct audit_proctitle {
1: -	int len;
1: -	char *value;
1: +  int len;
1: +  char *value;
1:  };
1:  
1:  struct audit_aux_data;
1: @@ -30324,256 +30580,256 @@ struct __kernel_sockaddr_storage;
1:  struct audit_tree_refs;
1:  
1:  struct audit_context {
1: -	int dummy;
1: -	int in_syscall;
1: -	enum audit_state state;
1: -	enum audit_state current_state;
1: -	unsigned int serial;
1: -	int major;
1: -	struct timespec64 ctime;
1: -	long unsigned int argv[4];
1: -	long int return_code;
1: -	u64 prio;
1: -	int return_valid;
1: -	struct audit_names preallocated_names[5];
1: -	int name_count;
1: -	struct list_head names_list;
1: -	char *filterkey;
1: -	struct path pwd;
1: -	struct audit_aux_data *aux;
1: -	struct audit_aux_data *aux_pids;
1: -	struct __kernel_sockaddr_storage *sockaddr;
1: -	size_t sockaddr_len;
1: -	pid_t pid;
1: -	pid_t ppid;
1: -	kuid_t uid;
1: -	kuid_t euid;
1: -	kuid_t suid;
1: -	kuid_t fsuid;
1: -	kgid_t gid;
1: -	kgid_t egid;
1: -	kgid_t sgid;
1: -	kgid_t fsgid;
1: -	long unsigned int personality;
1: -	int arch;
1: -	pid_t target_pid;
1: -	kuid_t target_auid;
1: -	kuid_t target_uid;
1: -	unsigned int target_sessionid;
1: -	u32 target_sid;
1: -	char target_comm[16];
1: -	struct audit_tree_refs *trees;
1: -	struct audit_tree_refs *first_trees;
1: -	struct list_head killed_trees;
1: -	int tree_count;
1: -	int type;
1: -	union {
1: -		struct {
1: -			int nargs;
1: -			long int args[6];
1: -		} socketcall;
1: -		struct {
1: -			kuid_t uid;
1: -			kgid_t gid;
1: -			umode_t mode;
1: -			u32 osid;
1: -			int has_perm;
1: -			uid_t perm_uid;
1: -			gid_t perm_gid;
1: -			umode_t perm_mode;
1: -			long unsigned int qbytes;
1: -		} ipc;
1: -		struct {
1: -			mqd_t mqdes;
1: -			struct mq_attr mqstat;
1: -		} mq_getsetattr;
1: -		struct {
1: -			mqd_t mqdes;
1: -			int sigev_signo;
1: -		} mq_notify;
1: -		struct {
1: -			mqd_t mqdes;
1: -			size_t msg_len;
1: -			unsigned int msg_prio;
1: -			struct timespec64 abs_timeout;
1: -		} mq_sendrecv;
1: -		struct {
1: -			int oflag;
1: -			umode_t mode;
1: -			struct mq_attr attr;
1: -		} mq_open;
1: -		struct {
1: -			pid_t pid;
1: -			struct audit_cap_data cap;
1: -		} capset;
1: -		struct {
1: -			int fd;
1: -			int flags;
1: -		} mmap;
1: -		struct {
1: -			int argc;
1: -		} execve;
1: -		struct {
1: -			char *name;
1: -		} module;
1: -	};
1: -	int fds[2];
1: -	struct audit_proctitle proctitle;
1: +  int dummy;
1: +  int in_syscall;
1: +  enum audit_state state;
1: +  enum audit_state current_state;
1: +  unsigned int serial;
1: +  int major;
1: +  struct timespec64 ctime;
1: +  long unsigned int argv[4];
1: +  long int return_code;
1: +  u64 prio;
1: +  int return_valid;
1: +  struct audit_names preallocated_names[5];
1: +  int name_count;
1: +  struct list_head names_list;
1: +  char *filterkey;
1: +  struct path pwd;
1: +  struct audit_aux_data *aux;
1: +  struct audit_aux_data *aux_pids;
1: +  struct __kernel_sockaddr_storage *sockaddr;
1: +  size_t sockaddr_len;
1: +  pid_t pid;
1: +  pid_t ppid;
1: +  kuid_t uid;
1: +  kuid_t euid;
1: +  kuid_t suid;
1: +  kuid_t fsuid;
1: +  kgid_t gid;
1: +  kgid_t egid;
1: +  kgid_t sgid;
1: +  kgid_t fsgid;
1: +  long unsigned int personality;
1: +  int arch;
1: +  pid_t target_pid;
1: +  kuid_t target_auid;
1: +  kuid_t target_uid;
1: +  unsigned int target_sessionid;
1: +  u32 target_sid;
1: +  char target_comm[16];
1: +  struct audit_tree_refs *trees;
1: +  struct audit_tree_refs *first_trees;
1: +  struct list_head killed_trees;
1: +  int tree_count;
1: +  int type;
1: +  union {
1: +    struct {
1: +      int nargs;
1: +      long int args[6];
1: +    } socketcall;
1: +    struct {
1: +      kuid_t uid;
1: +      kgid_t gid;
1: +      umode_t mode;
1: +      u32 osid;
1: +      int has_perm;
1: +      uid_t perm_uid;
1: +      gid_t perm_gid;
1: +      umode_t perm_mode;
1: +      long unsigned int qbytes;
1: +    } ipc;
1: +    struct {
1: +      mqd_t mqdes;
1: +      struct mq_attr mqstat;
1: +    } mq_getsetattr;
1: +    struct {
1: +      mqd_t mqdes;
1: +      int sigev_signo;
1: +    } mq_notify;
1: +    struct {
1: +      mqd_t mqdes;
1: +      size_t msg_len;
1: +      unsigned int msg_prio;
1: +      struct timespec64 abs_timeout;
1: +    } mq_sendrecv;
1: +    struct {
1: +      int oflag;
1: +      umode_t mode;
1: +      struct mq_attr attr;
1: +    } mq_open;
1: +    struct {
1: +      pid_t pid;
1: +      struct audit_cap_data cap;
1: +    } capset;
1: +    struct {
1: +      int fd;
1: +      int flags;
1: +    } mmap;
1: +    struct {
1: +      int argc;
1: +    } execve;
1: +    struct {
1: +      char *name;
1: +    } module;
1: +  };
1: +  int fds[2];
1: +  struct audit_proctitle proctitle;
1:  };
1:  
1:  struct __kernel_sockaddr_storage {
1: -	union {
1: -		struct {
1: -			__kernel_sa_family_t ss_family;
1: -			char __data[126];
1: -		};
1: -		void *__align;
1: -	};
1: +  union {
1: +    struct {
1: +      __kernel_sa_family_t ss_family;
1: +      char __data[126];
1: +    };
1: +    void *__align;
1: +  };
1:  };
1:  
1:  enum audit_nlgrps {
1: -	AUDIT_NLGRP_NONE = 0,
1: -	AUDIT_NLGRP_READLOG = 1,
1: -	__AUDIT_NLGRP_MAX = 2,
1: +  AUDIT_NLGRP_NONE = 0,
1: +  AUDIT_NLGRP_READLOG = 1,
1: +  __AUDIT_NLGRP_MAX = 2,
1:  };
1:  
1:  struct audit_status {
1: -	__u32 mask;
1: -	__u32 enabled;
1: -	__u32 failure;
1: -	__u32 pid;
1: -	__u32 rate_limit;
1: -	__u32 backlog_limit;
1: -	__u32 lost;
1: -	__u32 backlog;
1: -	union {
1: -		__u32 version;
1: -		__u32 feature_bitmap;
1: -	};
1: -	__u32 backlog_wait_time;
1: -	__u32 backlog_wait_time_actual;
1: +  __u32 mask;
1: +  __u32 enabled;
1: +  __u32 failure;
1: +  __u32 pid;
1: +  __u32 rate_limit;
1: +  __u32 backlog_limit;
1: +  __u32 lost;
1: +  __u32 backlog;
1: +  union {
1: +    __u32 version;
1: +    __u32 feature_bitmap;
1: +  };
1: +  __u32 backlog_wait_time;
1: +  __u32 backlog_wait_time_actual;
1:  };
1:  
1:  struct audit_features {
1: -	__u32 vers;
1: -	__u32 mask;
1: -	__u32 features;
1: -	__u32 lock;
1: +  __u32 vers;
1: +  __u32 mask;
1: +  __u32 features;
1: +  __u32 lock;
1:  };
1:  
1:  struct audit_tty_status {
1: -	__u32 enabled;
1: -	__u32 log_passwd;
1: +  __u32 enabled;
1: +  __u32 log_passwd;
1:  };
1:  
1:  struct audit_sig_info {
1: -	uid_t uid;
1: -	pid_t pid;
1: -	char ctx[0];
1: +  uid_t uid;
1: +  pid_t pid;
1: +  char ctx[0];
1:  };
1:  
1:  struct net_generic {
1: -	union {
1: -		struct {
1: -			unsigned int len;
1: -			struct callback_head rcu;
1: -		} s;
1: -		void *ptr[0];
1: -	};
1: +  union {
1: +    struct {
1: +      unsigned int len;
1: +      struct callback_head rcu;
1: +    } s;
1: +    void *ptr[0];
1: +  };
1:  };
1:  
1:  struct pernet_operations {
1: -	struct list_head list;
1: -	int (*init)(struct net *);
1: -	void (*pre_exit)(struct net *);
1: -	void (*exit)(struct net *);
1: -	void (*exit_batch)(struct list_head *);
1: -	unsigned int *id;
1: -	size_t size;
1: +  struct list_head list;
1: +  int (*init)(struct net *);
1: +  void (*pre_exit)(struct net *);
1: +  void (*exit)(struct net *);
1: +  void (*exit_batch)(struct list_head *);
1: +  unsigned int *id;
1: +  size_t size;
1:  };
1:  
1:  struct scm_creds {
1: -	u32 pid;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: +  u32 pid;
1: +  kuid_t uid;
1: +  kgid_t gid;
1:  };
1:  
1:  struct netlink_skb_parms {
1: -	struct scm_creds creds;
1: -	__u32 portid;
1: -	__u32 dst_group;
1: -	__u32 flags;
1: -	struct sock *sk;
1: -	bool nsid_is_set;
1: -	int nsid;
1: +  struct scm_creds creds;
1: +  __u32 portid;
1: +  __u32 dst_group;
1: +  __u32 flags;
1: +  struct sock *sk;
1: +  bool nsid_is_set;
1: +  int nsid;
1:  };
1:  
1:  struct netlink_kernel_cfg {
1: -	unsigned int groups;
1: -	unsigned int flags;
1: -	void (*input)(struct sk_buff *);
1: -	struct mutex *cb_mutex;
1: -	int (*bind)(struct net *, int);
1: -	void (*unbind)(struct net *, int);
1: -	bool (*compare)(struct net *, struct sock *);
1: +  unsigned int groups;
1: +  unsigned int flags;
1: +  void (*input)(struct sk_buff *);
1: +  struct mutex *cb_mutex;
1: +  int (*bind)(struct net *, int);
1: +  void (*unbind)(struct net *, int);
1: +  bool (*compare)(struct net *, struct sock *);
1:  };
1:  
1:  struct audit_netlink_list {
1: -	__u32 portid;
1: -	struct net *net;
1: -	struct sk_buff_head q;
1: +  __u32 portid;
1: +  struct net *net;
1: +  struct sk_buff_head q;
1:  };
1:  
1:  struct audit_net {
1: -	struct sock *sk;
1: +  struct sock *sk;
1:  };
1:  
1:  struct auditd_connection {
1: -	struct pid *pid;
1: -	u32 portid;
1: -	struct net *net;
1: -	struct callback_head rcu;
1: +  struct pid *pid;
1: +  u32 portid;
1: +  struct net *net;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct audit_ctl_mutex {
1: -	struct mutex lock;
1: -	void *owner;
1: +  struct mutex lock;
1: +  void *owner;
1:  };
1:  
1:  struct audit_buffer {
1: -	struct sk_buff *skb;
1: -	struct audit_context *ctx;
1: -	gfp_t gfp_mask;
1: +  struct sk_buff *skb;
1: +  struct audit_context *ctx;
1: +  gfp_t gfp_mask;
1:  };
1:  
1:  struct audit_reply {
1: -	__u32 portid;
1: -	struct net *net;
1: -	struct sk_buff *skb;
1: +  __u32 portid;
1: +  struct net *net;
1: +  struct sk_buff *skb;
1:  };
1:  
1:  enum {
1: -	Audit_equal = 0,
1: -	Audit_not_equal = 1,
1: -	Audit_bitmask = 2,
1: -	Audit_bittest = 3,
1: -	Audit_lt = 4,
1: -	Audit_gt = 5,
1: -	Audit_le = 6,
1: -	Audit_ge = 7,
1: -	Audit_bad = 8,
1: +  Audit_equal = 0,
1: +  Audit_not_equal = 1,
1: +  Audit_bitmask = 2,
1: +  Audit_bittest = 3,
1: +  Audit_lt = 4,
1: +  Audit_gt = 5,
1: +  Audit_le = 6,
1: +  Audit_ge = 7,
1: +  Audit_bad = 8,
1:  };
1:  
1:  struct audit_rule_data {
1: -	__u32 flags;
1: -	__u32 action;
1: -	__u32 field_count;
1: -	__u32 mask[64];
1: -	__u32 fields[64];
1: -	__u32 values[64];
1: -	__u32 fieldflags[64];
1: -	__u32 buflen;
1: -	char buf[0];
1: +  __u32 flags;
1: +  __u32 action;
1: +  __u32 field_count;
1: +  __u32 mask[64];
1: +  __u32 fields[64];
1: +  __u32 values[64];
1: +  __u32 fieldflags[64];
1: +  __u32 buflen;
1: +  char buf[0];
1:  };
1:  
1:  struct audit_field;
1: @@ -30585,43 +30841,43 @@ struct audit_tree;
1:  struct audit_fsnotify_mark;
1:  
1:  struct audit_krule {
1: -	u32 pflags;
1: -	u32 flags;
1: -	u32 listnr;
1: -	u32 action;
1: -	u32 mask[64];
1: -	u32 buflen;
1: -	u32 field_count;
1: -	char *filterkey;
1: -	struct audit_field *fields;
1: -	struct audit_field *arch_f;
1: -	struct audit_field *inode_f;
1: -	struct audit_watch *watch;
1: -	struct audit_tree *tree;
1: -	struct audit_fsnotify_mark *exe;
1: -	struct list_head rlist;
1: -	struct list_head list;
1: -	u64 prio;
1: +  u32 pflags;
1: +  u32 flags;
1: +  u32 listnr;
1: +  u32 action;
1: +  u32 mask[64];
1: +  u32 buflen;
1: +  u32 field_count;
1: +  char *filterkey;
1: +  struct audit_field *fields;
1: +  struct audit_field *arch_f;
1: +  struct audit_field *inode_f;
1: +  struct audit_watch *watch;
1: +  struct audit_tree *tree;
1: +  struct audit_fsnotify_mark *exe;
1: +  struct list_head rlist;
1: +  struct list_head list;
1: +  u64 prio;
1:  };
1:  
1:  struct audit_field {
1: -	u32 type;
1: -	union {
1: -		u32 val;
1: -		kuid_t uid;
1: -		kgid_t gid;
1: -		struct {
1: -			char *lsm_str;
1: -			void *lsm_rule;
1: -		};
1: -	};
1: -	u32 op;
1: +  u32 type;
1: +  union {
1: +    u32 val;
1: +    kuid_t uid;
1: +    kgid_t gid;
1: +    struct {
1: +      char *lsm_str;
1: +      void *lsm_rule;
1: +    };
1: +  };
1: +  u32 op;
1:  };
1:  
1:  struct audit_entry {
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: -	struct audit_krule rule;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1: +  struct audit_krule rule;
1:  };
1:  
1:  struct audit_buffer___2;
1: @@ -30631,125 +30887,125 @@ typedef int __kernel_key_t;
1:  typedef __kernel_key_t key_t;
1:  
1:  struct cpu_vfs_cap_data {
1: -	__u32 magic_etc;
1: -	kernel_cap_t permitted;
1: -	kernel_cap_t inheritable;
1: -	kuid_t rootid;
1: +  __u32 magic_etc;
1: +  kernel_cap_t permitted;
1: +  kernel_cap_t inheritable;
1: +  kuid_t rootid;
1:  };
1:  
1:  struct kern_ipc_perm {
1: -	spinlock_t lock;
1: -	bool deleted;
1: -	int id;
1: -	key_t key;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	kuid_t cuid;
1: -	kgid_t cgid;
1: -	umode_t mode;
1: -	long unsigned int seq;
1: -	void *security;
1: -	struct rhash_head khtnode;
1: -	struct callback_head rcu;
1: -	refcount_t refcount;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  spinlock_t lock;
1: +  bool deleted;
1: +  int id;
1: +  key_t key;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  kuid_t cuid;
1: +  kgid_t cgid;
1: +  umode_t mode;
1: +  long unsigned int seq;
1: +  void *security;
1: +  struct rhash_head khtnode;
1: +  struct callback_head rcu;
1: +  refcount_t refcount;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  typedef struct fsnotify_mark_connector *fsnotify_connp_t;
1:  
1:  struct fsnotify_mark_connector {
1: -	spinlock_t lock;
1: -	short unsigned int type;
1: -	short unsigned int flags;
1: -	__kernel_fsid_t fsid;
1: -	union {
1: -		fsnotify_connp_t *obj;
1: -		struct fsnotify_mark_connector *destroy_next;
1: -	};
1: -	struct hlist_head list;
1: +  spinlock_t lock;
1: +  short unsigned int type;
1: +  short unsigned int flags;
1: +  __kernel_fsid_t fsid;
1: +  union {
1: +    fsnotify_connp_t *obj;
1: +    struct fsnotify_mark_connector *destroy_next;
1: +  };
1: +  struct hlist_head list;
1:  };
1:  
1:  enum audit_nfcfgop {
1: -	AUDIT_XT_OP_REGISTER = 0,
1: -	AUDIT_XT_OP_REPLACE = 1,
1: -	AUDIT_XT_OP_UNREGISTER = 2,
1: -	AUDIT_NFT_OP_TABLE_REGISTER = 3,
1: -	AUDIT_NFT_OP_TABLE_UNREGISTER = 4,
1: -	AUDIT_NFT_OP_CHAIN_REGISTER = 5,
1: -	AUDIT_NFT_OP_CHAIN_UNREGISTER = 6,
1: -	AUDIT_NFT_OP_RULE_REGISTER = 7,
1: -	AUDIT_NFT_OP_RULE_UNREGISTER = 8,
1: -	AUDIT_NFT_OP_SET_REGISTER = 9,
1: -	AUDIT_NFT_OP_SET_UNREGISTER = 10,
1: -	AUDIT_NFT_OP_SETELEM_REGISTER = 11,
1: -	AUDIT_NFT_OP_SETELEM_UNREGISTER = 12,
1: -	AUDIT_NFT_OP_GEN_REGISTER = 13,
1: -	AUDIT_NFT_OP_OBJ_REGISTER = 14,
1: -	AUDIT_NFT_OP_OBJ_UNREGISTER = 15,
1: -	AUDIT_NFT_OP_OBJ_RESET = 16,
1: -	AUDIT_NFT_OP_FLOWTABLE_REGISTER = 17,
1: -	AUDIT_NFT_OP_FLOWTABLE_UNREGISTER = 18,
1: -	AUDIT_NFT_OP_INVALID = 19,
1: +  AUDIT_XT_OP_REGISTER = 0,
1: +  AUDIT_XT_OP_REPLACE = 1,
1: +  AUDIT_XT_OP_UNREGISTER = 2,
1: +  AUDIT_NFT_OP_TABLE_REGISTER = 3,
1: +  AUDIT_NFT_OP_TABLE_UNREGISTER = 4,
1: +  AUDIT_NFT_OP_CHAIN_REGISTER = 5,
1: +  AUDIT_NFT_OP_CHAIN_UNREGISTER = 6,
1: +  AUDIT_NFT_OP_RULE_REGISTER = 7,
1: +  AUDIT_NFT_OP_RULE_UNREGISTER = 8,
1: +  AUDIT_NFT_OP_SET_REGISTER = 9,
1: +  AUDIT_NFT_OP_SET_UNREGISTER = 10,
1: +  AUDIT_NFT_OP_SETELEM_REGISTER = 11,
1: +  AUDIT_NFT_OP_SETELEM_UNREGISTER = 12,
1: +  AUDIT_NFT_OP_GEN_REGISTER = 13,
1: +  AUDIT_NFT_OP_OBJ_REGISTER = 14,
1: +  AUDIT_NFT_OP_OBJ_UNREGISTER = 15,
1: +  AUDIT_NFT_OP_OBJ_RESET = 16,
1: +  AUDIT_NFT_OP_FLOWTABLE_REGISTER = 17,
1: +  AUDIT_NFT_OP_FLOWTABLE_UNREGISTER = 18,
1: +  AUDIT_NFT_OP_INVALID = 19,
1:  };
1:  
1:  enum fsnotify_obj_type {
1: -	FSNOTIFY_OBJ_TYPE_INODE = 0,
1: -	FSNOTIFY_OBJ_TYPE_CHILD = 1,
1: -	FSNOTIFY_OBJ_TYPE_VFSMOUNT = 2,
1: -	FSNOTIFY_OBJ_TYPE_SB = 3,
1: -	FSNOTIFY_OBJ_TYPE_COUNT = 4,
1: -	FSNOTIFY_OBJ_TYPE_DETACHED = 4,
1: +  FSNOTIFY_OBJ_TYPE_INODE = 0,
1: +  FSNOTIFY_OBJ_TYPE_CHILD = 1,
1: +  FSNOTIFY_OBJ_TYPE_VFSMOUNT = 2,
1: +  FSNOTIFY_OBJ_TYPE_SB = 3,
1: +  FSNOTIFY_OBJ_TYPE_COUNT = 4,
1: +  FSNOTIFY_OBJ_TYPE_DETACHED = 4,
1:  };
1:  
1:  struct audit_aux_data {
1: -	struct audit_aux_data *next;
1: -	int type;
1: +  struct audit_aux_data *next;
1: +  int type;
1:  };
1:  
1:  struct audit_chunk;
1:  
1:  struct audit_tree_refs {
1: -	struct audit_tree_refs *next;
1: -	struct audit_chunk *c[31];
1: +  struct audit_tree_refs *next;
1: +  struct audit_chunk *c[31];
1:  };
1:  
1:  struct audit_aux_data_pids {
1: -	struct audit_aux_data d;
1: -	pid_t target_pid[16];
1: -	kuid_t target_auid[16];
1: -	kuid_t target_uid[16];
1: -	unsigned int target_sessionid[16];
1: -	u32 target_sid[16];
1: -	char target_comm[256];
1: -	int pid_count;
1: +  struct audit_aux_data d;
1: +  pid_t target_pid[16];
1: +  kuid_t target_auid[16];
1: +  kuid_t target_uid[16];
1: +  unsigned int target_sessionid[16];
1: +  u32 target_sid[16];
1: +  char target_comm[256];
1: +  int pid_count;
1:  };
1:  
1:  struct audit_aux_data_bprm_fcaps {
1: -	struct audit_aux_data d;
1: -	struct audit_cap_data fcap;
1: -	unsigned int fcap_ver;
1: -	struct audit_cap_data old_pcap;
1: -	struct audit_cap_data new_pcap;
1: +  struct audit_aux_data d;
1: +  struct audit_cap_data fcap;
1: +  unsigned int fcap_ver;
1: +  struct audit_cap_data old_pcap;
1: +  struct audit_cap_data new_pcap;
1:  };
1:  
1:  struct audit_nfcfgop_tab {
1: -	enum audit_nfcfgop op;
1: -	const char *s;
1: +  enum audit_nfcfgop op;
1: +  const char *s;
1:  };
1:  
1:  struct audit_parent;
1:  
1:  struct audit_watch {
1: -	refcount_t count;
1: -	dev_t dev;
1: -	char *path;
1: -	long unsigned int ino;
1: -	struct audit_parent *parent;
1: -	struct list_head wlist;
1: -	struct list_head rules;
1: +  refcount_t count;
1: +  dev_t dev;
1: +  char *path;
1: +  long unsigned int ino;
1: +  struct audit_parent *parent;
1: +  struct list_head wlist;
1: +  struct list_head rules;
1:  };
1:  
1:  struct fsnotify_group;
1: @@ -30761,412 +31017,416 @@ struct fsnotify_mark;
1:  struct fsnotify_event;
1:  
1:  struct fsnotify_ops {
1: -	int (*handle_event)(struct fsnotify_group *, u32, const void *, int, struct inode *, const struct qstr *, u32, struct fsnotify_iter_info *);
1: -	int (*handle_inode_event)(struct fsnotify_mark *, u32, struct inode *, struct inode *, const struct qstr *);
1: -	void (*free_group_priv)(struct fsnotify_group *);
1: -	void (*freeing_mark)(struct fsnotify_mark *, struct fsnotify_group *);
1: -	void (*free_event)(struct fsnotify_event *);
1: -	void (*free_mark)(struct fsnotify_mark *);
1: +  int (*handle_event)(struct fsnotify_group *, u32, const void *, int,
1: +                      struct inode *, const struct qstr *, u32,
1: +                      struct fsnotify_iter_info *);
1: +  int (*handle_inode_event)(struct fsnotify_mark *, u32, struct inode *,
1: +                            struct inode *, const struct qstr *);
1: +  void (*free_group_priv)(struct fsnotify_group *);
1: +  void (*freeing_mark)(struct fsnotify_mark *, struct fsnotify_group *);
1: +  void (*free_event)(struct fsnotify_event *);
1: +  void (*free_mark)(struct fsnotify_mark *);
1:  };
1:  
1:  struct inotify_group_private_data {
1: -	spinlock_t idr_lock;
1: -	struct idr idr;
1: -	struct ucounts *ucounts;
1: +  spinlock_t idr_lock;
1: +  struct idr idr;
1: +  struct ucounts *ucounts;
1:  };
1:  
1:  struct fsnotify_group {
1: -	const struct fsnotify_ops *ops;
1: -	refcount_t refcnt;
1: -	spinlock_t notification_lock;
1: -	struct list_head notification_list;
1: -	wait_queue_head_t notification_waitq;
1: -	unsigned int q_len;
1: -	unsigned int max_events;
1: -	unsigned int priority;
1: -	bool shutdown;
1: -	struct mutex mark_mutex;
1: -	atomic_t num_marks;
1: -	atomic_t user_waits;
1: -	struct list_head marks_list;
1: -	struct fasync_struct *fsn_fa;
1: -	struct fsnotify_event *overflow_event;
1: -	struct mem_cgroup *memcg;
1: -	union {
1: -		void *private;
1: -		struct inotify_group_private_data inotify_data;
1: -	};
1: +  const struct fsnotify_ops *ops;
1: +  refcount_t refcnt;
1: +  spinlock_t notification_lock;
1: +  struct list_head notification_list;
1: +  wait_queue_head_t notification_waitq;
1: +  unsigned int q_len;
1: +  unsigned int max_events;
1: +  unsigned int priority;
1: +  bool shutdown;
1: +  struct mutex mark_mutex;
1: +  atomic_t num_marks;
1: +  atomic_t user_waits;
1: +  struct list_head marks_list;
1: +  struct fasync_struct *fsn_fa;
1: +  struct fsnotify_event *overflow_event;
1: +  struct mem_cgroup *memcg;
1: +  union {
1: +    void *private;
1: +    struct inotify_group_private_data inotify_data;
1: +  };
1:  };
1:  
1:  struct fsnotify_iter_info {
1: -	struct fsnotify_mark *marks[4];
1: -	unsigned int report_mask;
1: -	int srcu_idx;
1: +  struct fsnotify_mark *marks[4];
1: +  unsigned int report_mask;
1: +  int srcu_idx;
1:  };
1:  
1:  struct fsnotify_mark {
1: -	__u32 mask;
1: -	refcount_t refcnt;
1: -	struct fsnotify_group *group;
1: -	struct list_head g_list;
1: -	spinlock_t lock;
1: -	struct hlist_node obj_list;
1: -	struct fsnotify_mark_connector *connector;
1: -	__u32 ignored_mask;
1: -	unsigned int flags;
1: +  __u32 mask;
1: +  refcount_t refcnt;
1: +  struct fsnotify_group *group;
1: +  struct list_head g_list;
1: +  spinlock_t lock;
1: +  struct hlist_node obj_list;
1: +  struct fsnotify_mark_connector *connector;
1: +  __u32 ignored_mask;
1: +  unsigned int flags;
1:  };
1:  
1:  struct fsnotify_event {
1: -	struct list_head list;
1: -	long unsigned int objectid;
1: +  struct list_head list;
1: +  long unsigned int objectid;
1:  };
1:  
1:  struct audit_parent {
1: -	struct list_head watches;
1: -	struct fsnotify_mark mark;
1: +  struct list_head watches;
1: +  struct fsnotify_mark mark;
1:  };
1:  
1:  struct audit_fsnotify_mark {
1: -	dev_t dev;
1: -	long unsigned int ino;
1: -	char *path;
1: -	struct fsnotify_mark mark;
1: -	struct audit_krule *rule;
1: +  dev_t dev;
1: +  long unsigned int ino;
1: +  char *path;
1: +  struct fsnotify_mark mark;
1: +  struct audit_krule *rule;
1:  };
1:  
1:  struct audit_chunk___2;
1:  
1:  struct audit_tree {
1: -	refcount_t count;
1: -	int goner;
1: -	struct audit_chunk___2 *root;
1: -	struct list_head chunks;
1: -	struct list_head rules;
1: -	struct list_head list;
1: -	struct list_head same_root;
1: -	struct callback_head head;
1: -	char pathname[0];
1: +  refcount_t count;
1: +  int goner;
1: +  struct audit_chunk___2 *root;
1: +  struct list_head chunks;
1: +  struct list_head rules;
1: +  struct list_head list;
1: +  struct list_head same_root;
1: +  struct callback_head head;
1: +  char pathname[0];
1:  };
1:  
1:  struct node {
1: -	struct list_head list;
1: -	struct audit_tree *owner;
1: -	unsigned int index;
1: +  struct list_head list;
1: +  struct audit_tree *owner;
1: +  unsigned int index;
1:  };
1:  
1:  struct audit_chunk___2 {
1: -	struct list_head hash;
1: -	long unsigned int key;
1: -	struct fsnotify_mark *mark;
1: -	struct list_head trees;
1: -	int count;
1: -	atomic_long_t refs;
1: -	struct callback_head head;
1: -	struct node owners[0];
1: +  struct list_head hash;
1: +  long unsigned int key;
1: +  struct fsnotify_mark *mark;
1: +  struct list_head trees;
1: +  int count;
1: +  atomic_long_t refs;
1: +  struct callback_head head;
1: +  struct node owners[0];
1:  };
1:  
1:  struct audit_tree_mark {
1: -	struct fsnotify_mark mark;
1: -	struct audit_chunk___2 *chunk;
1: +  struct fsnotify_mark mark;
1: +  struct audit_chunk___2 *chunk;
1:  };
1:  
1:  enum {
1: -	HASH_SIZE = 128,
1: +  HASH_SIZE = 128,
1:  };
1:  
1:  struct kprobe_blacklist_entry {
1: -	struct list_head list;
1: -	long unsigned int start_addr;
1: -	long unsigned int end_addr;
1: +  struct list_head list;
1: +  long unsigned int start_addr;
1: +  long unsigned int end_addr;
1:  };
1:  
1:  enum perf_record_ksymbol_type {
1: -	PERF_RECORD_KSYMBOL_TYPE_UNKNOWN = 0,
1: -	PERF_RECORD_KSYMBOL_TYPE_BPF = 1,
1: -	PERF_RECORD_KSYMBOL_TYPE_OOL = 2,
1: -	PERF_RECORD_KSYMBOL_TYPE_MAX = 3,
1: +  PERF_RECORD_KSYMBOL_TYPE_UNKNOWN = 0,
1: +  PERF_RECORD_KSYMBOL_TYPE_BPF = 1,
1: +  PERF_RECORD_KSYMBOL_TYPE_OOL = 2,
1: +  PERF_RECORD_KSYMBOL_TYPE_MAX = 3,
1:  };
1:  
1:  struct kprobe_insn_page {
1: -	struct list_head list;
1: -	kprobe_opcode_t *insns;
1: -	struct kprobe_insn_cache *cache;
1: -	int nused;
1: -	int ngarbage;
1: -	char slot_used[0];
1: +  struct list_head list;
1: +  kprobe_opcode_t *insns;
1: +  struct kprobe_insn_cache *cache;
1: +  int nused;
1: +  int ngarbage;
1: +  char slot_used[0];
1:  };
1:  
1:  enum kprobe_slot_state {
1: -	SLOT_CLEAN = 0,
1: -	SLOT_DIRTY = 1,
1: -	SLOT_USED = 2,
1: +  SLOT_CLEAN = 0,
1: +  SLOT_DIRTY = 1,
1: +  SLOT_USED = 2,
1:  };
1:  
1:  struct fault_attr {
1: -	long unsigned int probability;
1: -	long unsigned int interval;
1: -	atomic_t times;
1: -	atomic_t space;
1: -	long unsigned int verbose;
1: -	bool task_filter;
1: -	long unsigned int stacktrace_depth;
1: -	long unsigned int require_start;
1: -	long unsigned int require_end;
1: -	long unsigned int reject_start;
1: -	long unsigned int reject_end;
1: -	long unsigned int count;
1: -	struct ratelimit_state ratelimit_state;
1: -	struct dentry *dname;
1: +  long unsigned int probability;
1: +  long unsigned int interval;
1: +  atomic_t times;
1: +  atomic_t space;
1: +  long unsigned int verbose;
1: +  bool task_filter;
1: +  long unsigned int stacktrace_depth;
1: +  long unsigned int require_start;
1: +  long unsigned int require_end;
1: +  long unsigned int reject_start;
1: +  long unsigned int reject_end;
1: +  long unsigned int count;
1: +  struct ratelimit_state ratelimit_state;
1: +  struct dentry *dname;
1:  };
1:  
1:  struct fei_attr {
1: -	struct list_head list;
1: -	struct kprobe kp;
1: -	long unsigned int retval;
1: +  struct list_head list;
1: +  struct kprobe kp;
1: +  long unsigned int retval;
1:  };
1:  
1:  struct seccomp_data {
1: -	int nr;
1: -	__u32 arch;
1: -	__u64 instruction_pointer;
1: -	__u64 args[6];
1: +  int nr;
1: +  __u32 arch;
1: +  __u64 instruction_pointer;
1: +  __u64 args[6];
1:  };
1:  
1:  struct seccomp_notif_sizes {
1: -	__u16 seccomp_notif;
1: -	__u16 seccomp_notif_resp;
1: -	__u16 seccomp_data;
1: +  __u16 seccomp_notif;
1: +  __u16 seccomp_notif_resp;
1: +  __u16 seccomp_data;
1:  };
1:  
1:  struct seccomp_notif {
1: -	__u64 id;
1: -	__u32 pid;
1: -	__u32 flags;
1: -	struct seccomp_data data;
1: +  __u64 id;
1: +  __u32 pid;
1: +  __u32 flags;
1: +  struct seccomp_data data;
1:  };
1:  
1:  struct seccomp_notif_resp {
1: -	__u64 id;
1: -	__s64 val;
1: -	__s32 error;
1: -	__u32 flags;
1: +  __u64 id;
1: +  __s64 val;
1: +  __s32 error;
1: +  __u32 flags;
1:  };
1:  
1:  struct seccomp_notif_addfd {
1: -	__u64 id;
1: -	__u32 flags;
1: -	__u32 srcfd;
1: -	__u32 newfd;
1: -	__u32 newfd_flags;
1: +  __u64 id;
1: +  __u32 flags;
1: +  __u32 srcfd;
1: +  __u32 newfd;
1: +  __u32 newfd_flags;
1:  };
1:  
1:  struct notification;
1:  
1:  struct seccomp_filter {
1: -	refcount_t refs;
1: -	refcount_t users;
1: -	bool log;
1: -	struct seccomp_filter *prev;
1: -	struct bpf_prog *prog;
1: -	struct notification *notif;
1: -	struct mutex notify_lock;
1: -	wait_queue_head_t wqh;
1: +  refcount_t refs;
1: +  refcount_t users;
1: +  bool log;
1: +  struct seccomp_filter *prev;
1: +  struct bpf_prog *prog;
1: +  struct notification *notif;
1: +  struct mutex notify_lock;
1: +  wait_queue_head_t wqh;
1:  };
1:  
1:  struct ctl_path {
1: -	const char *procname;
1: +  const char *procname;
1:  };
1:  
1:  struct sock_fprog {
1: -	short unsigned int len;
1: -	struct sock_filter *filter;
1: +  short unsigned int len;
1: +  struct sock_filter *filter;
1:  };
1:  
1:  struct compat_sock_fprog {
1: -	u16 len;
1: -	compat_uptr_t filter;
1: +  u16 len;
1: +  compat_uptr_t filter;
1:  };
1:  
1:  enum notify_state {
1: -	SECCOMP_NOTIFY_INIT = 0,
1: -	SECCOMP_NOTIFY_SENT = 1,
1: -	SECCOMP_NOTIFY_REPLIED = 2,
1: +  SECCOMP_NOTIFY_INIT = 0,
1: +  SECCOMP_NOTIFY_SENT = 1,
1: +  SECCOMP_NOTIFY_REPLIED = 2,
1:  };
1:  
1:  struct seccomp_knotif {
1: -	struct task_struct *task;
1: -	u64 id;
1: -	const struct seccomp_data *data;
1: -	enum notify_state state;
1: -	int error;
1: -	long int val;
1: -	u32 flags;
1: -	struct completion ready;
1: -	struct list_head list;
1: -	struct list_head addfd;
1: +  struct task_struct *task;
1: +  u64 id;
1: +  const struct seccomp_data *data;
1: +  enum notify_state state;
1: +  int error;
1: +  long int val;
1: +  u32 flags;
1: +  struct completion ready;
1: +  struct list_head list;
1: +  struct list_head addfd;
1:  };
1:  
1:  struct seccomp_kaddfd {
1: -	struct file *file;
1: -	int fd;
1: -	unsigned int flags;
1: -	int ret;
1: -	struct completion completion;
1: -	struct list_head list;
1: +  struct file *file;
1: +  int fd;
1: +  unsigned int flags;
1: +  int ret;
1: +  struct completion completion;
1: +  struct list_head list;
1:  };
1:  
1:  struct notification {
1: -	struct semaphore request;
1: -	u64 next_id;
1: -	struct list_head notifications;
1: +  struct semaphore request;
1: +  u64 next_id;
1: +  struct list_head notifications;
1:  };
1:  
1:  struct seccomp_log_name {
1: -	u32 log;
1: -	const char *name;
1: +  u32 log;
1: +  const char *name;
1:  };
1:  
1:  struct rchan;
1:  
1:  struct rchan_buf {
1: -	void *start;
1: -	void *data;
1: -	size_t offset;
1: -	size_t subbufs_produced;
1: -	size_t subbufs_consumed;
1: -	struct rchan *chan;
1: -	wait_queue_head_t read_wait;
1: -	struct irq_work wakeup_work;
1: -	struct dentry *dentry;
1: -	struct kref kref;
1: -	struct page **page_array;
1: -	unsigned int page_count;
1: -	unsigned int finalized;
1: -	size_t *padding;
1: -	size_t prev_padding;
1: -	size_t bytes_consumed;
1: -	size_t early_bytes;
1: -	unsigned int cpu;
1: -	long: 32;
1: -	long: 64;
1: +  void *start;
1: +  void *data;
1: +  size_t offset;
1: +  size_t subbufs_produced;
1: +  size_t subbufs_consumed;
1: +  struct rchan *chan;
1: +  wait_queue_head_t read_wait;
1: +  struct irq_work wakeup_work;
1: +  struct dentry *dentry;
1: +  struct kref kref;
1: +  struct page **page_array;
1: +  unsigned int page_count;
1: +  unsigned int finalized;
1: +  size_t *padding;
1: +  size_t prev_padding;
1: +  size_t bytes_consumed;
1: +  size_t early_bytes;
1: +  unsigned int cpu;
1: +  long : 32;
1: +  long : 64;
1:  };
1:  
1:  struct rchan_callbacks;
1:  
1:  struct rchan {
1: -	u32 version;
1: -	size_t subbuf_size;
1: -	size_t n_subbufs;
1: -	size_t alloc_size;
1: -	struct rchan_callbacks *cb;
1: -	struct kref kref;
1: -	void *private_data;
1: -	size_t last_toobig;
1: -	struct rchan_buf **buf;
1: -	int is_global;
1: -	struct list_head list;
1: -	struct dentry *parent;
1: -	int has_base_filename;
1: -	char base_filename[255];
1: +  u32 version;
1: +  size_t subbuf_size;
1: +  size_t n_subbufs;
1: +  size_t alloc_size;
1: +  struct rchan_callbacks *cb;
1: +  struct kref kref;
1: +  void *private_data;
1: +  size_t last_toobig;
1: +  struct rchan_buf **buf;
1: +  int is_global;
1: +  struct list_head list;
1: +  struct dentry *parent;
1: +  int has_base_filename;
1: +  char base_filename[255];
1:  };
1:  
1:  struct rchan_callbacks {
1: -	int (*subbuf_start)(struct rchan_buf *, void *, void *, size_t);
1: -	void (*buf_mapped)(struct rchan_buf *, struct file *);
1: -	void (*buf_unmapped)(struct rchan_buf *, struct file *);
1: -	struct dentry * (*create_buf_file)(const char *, struct dentry *, umode_t, struct rchan_buf *, int *);
1: -	int (*remove_buf_file)(struct dentry *);
1: +  int (*subbuf_start)(struct rchan_buf *, void *, void *, size_t);
1: +  void (*buf_mapped)(struct rchan_buf *, struct file *);
1: +  void (*buf_unmapped)(struct rchan_buf *, struct file *);
1: +  struct dentry *(*create_buf_file)(const char *, struct dentry *, umode_t,
1: +                                    struct rchan_buf *, int *);
1: +  int (*remove_buf_file)(struct dentry *);
1:  };
1:  
1:  struct partial_page {
1: -	unsigned int offset;
1: -	unsigned int len;
1: -	long unsigned int private;
1: +  unsigned int offset;
1: +  unsigned int len;
1: +  long unsigned int private;
1:  };
1:  
1:  struct splice_pipe_desc {
1: -	struct page **pages;
1: -	struct partial_page *partial;
1: -	int nr_pages;
1: -	unsigned int nr_pages_max;
1: -	const struct pipe_buf_operations *ops;
1: -	void (*spd_release)(struct splice_pipe_desc *, unsigned int);
1: +  struct page **pages;
1: +  struct partial_page *partial;
1: +  int nr_pages;
1: +  unsigned int nr_pages_max;
1: +  const struct pipe_buf_operations *ops;
1: +  void (*spd_release)(struct splice_pipe_desc *, unsigned int);
1:  };
1:  
1:  struct rchan_percpu_buf_dispatcher {
1: -	struct rchan_buf *buf;
1: -	struct dentry *dentry;
1: +  struct rchan_buf *buf;
1: +  struct dentry *dentry;
1:  };
1:  
1:  enum {
1: -	TASKSTATS_TYPE_UNSPEC = 0,
1: -	TASKSTATS_TYPE_PID = 1,
1: -	TASKSTATS_TYPE_TGID = 2,
1: -	TASKSTATS_TYPE_STATS = 3,
1: -	TASKSTATS_TYPE_AGGR_PID = 4,
1: -	TASKSTATS_TYPE_AGGR_TGID = 5,
1: -	TASKSTATS_TYPE_NULL = 6,
1: -	__TASKSTATS_TYPE_MAX = 7,
1: +  TASKSTATS_TYPE_UNSPEC = 0,
1: +  TASKSTATS_TYPE_PID = 1,
1: +  TASKSTATS_TYPE_TGID = 2,
1: +  TASKSTATS_TYPE_STATS = 3,
1: +  TASKSTATS_TYPE_AGGR_PID = 4,
1: +  TASKSTATS_TYPE_AGGR_TGID = 5,
1: +  TASKSTATS_TYPE_NULL = 6,
1: +  __TASKSTATS_TYPE_MAX = 7,
1:  };
1:  
1:  enum {
1: -	TASKSTATS_CMD_ATTR_UNSPEC = 0,
1: -	TASKSTATS_CMD_ATTR_PID = 1,
1: -	TASKSTATS_CMD_ATTR_TGID = 2,
1: -	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 3,
1: -	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 4,
1: -	__TASKSTATS_CMD_ATTR_MAX = 5,
1: +  TASKSTATS_CMD_ATTR_UNSPEC = 0,
1: +  TASKSTATS_CMD_ATTR_PID = 1,
1: +  TASKSTATS_CMD_ATTR_TGID = 2,
1: +  TASKSTATS_CMD_ATTR_REGISTER_CPUMASK = 3,
1: +  TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 4,
1: +  __TASKSTATS_CMD_ATTR_MAX = 5,
1:  };
1:  
1:  enum {
1: -	CGROUPSTATS_CMD_UNSPEC = 3,
1: -	CGROUPSTATS_CMD_GET = 4,
1: -	CGROUPSTATS_CMD_NEW = 5,
1: -	__CGROUPSTATS_CMD_MAX = 6,
1: +  CGROUPSTATS_CMD_UNSPEC = 3,
1: +  CGROUPSTATS_CMD_GET = 4,
1: +  CGROUPSTATS_CMD_NEW = 5,
1: +  __CGROUPSTATS_CMD_MAX = 6,
1:  };
1:  
1:  enum {
1: -	CGROUPSTATS_TYPE_UNSPEC = 0,
1: -	CGROUPSTATS_TYPE_CGROUP_STATS = 1,
1: -	__CGROUPSTATS_TYPE_MAX = 2,
1: +  CGROUPSTATS_TYPE_UNSPEC = 0,
1: +  CGROUPSTATS_TYPE_CGROUP_STATS = 1,
1: +  __CGROUPSTATS_TYPE_MAX = 2,
1:  };
1:  
1:  enum {
1: -	CGROUPSTATS_CMD_ATTR_UNSPEC = 0,
1: -	CGROUPSTATS_CMD_ATTR_FD = 1,
1: -	__CGROUPSTATS_CMD_ATTR_MAX = 2,
1: +  CGROUPSTATS_CMD_ATTR_UNSPEC = 0,
1: +  CGROUPSTATS_CMD_ATTR_FD = 1,
1: +  __CGROUPSTATS_CMD_ATTR_MAX = 2,
1:  };
1:  
1:  struct genlmsghdr {
1: -	__u8 cmd;
1: -	__u8 version;
1: -	__u16 reserved;
1: -};
1: -
1: -enum {
1: -	NLA_UNSPEC = 0,
1: -	NLA_U8 = 1,
1: -	NLA_U16 = 2,
1: -	NLA_U32 = 3,
1: -	NLA_U64 = 4,
1: -	NLA_STRING = 5,
1: -	NLA_FLAG = 6,
1: -	NLA_MSECS = 7,
1: -	NLA_NESTED = 8,
1: -	NLA_NESTED_ARRAY = 9,
1: -	NLA_NUL_STRING = 10,
1: -	NLA_BINARY = 11,
1: -	NLA_S8 = 12,
1: -	NLA_S16 = 13,
1: -	NLA_S32 = 14,
1: -	NLA_S64 = 15,
1: -	NLA_BITFIELD32 = 16,
1: -	NLA_REJECT = 17,
1: -	__NLA_TYPE_MAX = 18,
1: +  __u8 cmd;
1: +  __u8 version;
1: +  __u16 reserved;
1: +};
1: +
1: +enum {
1: +  NLA_UNSPEC = 0,
1: +  NLA_U8 = 1,
1: +  NLA_U16 = 2,
1: +  NLA_U32 = 3,
1: +  NLA_U64 = 4,
1: +  NLA_STRING = 5,
1: +  NLA_FLAG = 6,
1: +  NLA_MSECS = 7,
1: +  NLA_NESTED = 8,
1: +  NLA_NESTED_ARRAY = 9,
1: +  NLA_NUL_STRING = 10,
1: +  NLA_BINARY = 11,
1: +  NLA_S8 = 12,
1: +  NLA_S16 = 13,
1: +  NLA_S32 = 14,
1: +  NLA_S64 = 15,
1: +  NLA_BITFIELD32 = 16,
1: +  NLA_REJECT = 17,
1: +  __NLA_TYPE_MAX = 18,
1:  };
1:  
1:  struct genl_multicast_group {
1: -	char name[16];
1: +  char name[16];
1:  };
1:  
1:  struct genl_ops;
1: @@ -31176,149 +31436,151 @@ struct genl_info;
1:  struct genl_small_ops;
1:  
1:  struct genl_family {
1: -	int id;
1: -	unsigned int hdrsize;
1: -	char name[16];
1: -	unsigned int version;
1: -	unsigned int maxattr;
1: -	unsigned int mcgrp_offset;
1: -	u8 netnsok: 1;
1: -	u8 parallel_ops: 1;
1: -	u8 n_ops;
1: -	u8 n_small_ops;
1: -	u8 n_mcgrps;
1: -	const struct nla_policy *policy;
1: -	int (*pre_doit)(const struct genl_ops *, struct sk_buff *, struct genl_info *);
1: -	void (*post_doit)(const struct genl_ops *, struct sk_buff *, struct genl_info *);
1: -	const struct genl_ops *ops;
1: -	const struct genl_small_ops *small_ops;
1: -	const struct genl_multicast_group *mcgrps;
1: -	struct module *module;
1: +  int id;
1: +  unsigned int hdrsize;
1: +  char name[16];
1: +  unsigned int version;
1: +  unsigned int maxattr;
1: +  unsigned int mcgrp_offset;
1: +  u8 netnsok : 1;
1: +  u8 parallel_ops : 1;
1: +  u8 n_ops;
1: +  u8 n_small_ops;
1: +  u8 n_mcgrps;
1: +  const struct nla_policy *policy;
1: +  int (*pre_doit)(const struct genl_ops *, struct sk_buff *,
1: +                  struct genl_info *);
1: +  void (*post_doit)(const struct genl_ops *, struct sk_buff *,
1: +                    struct genl_info *);
1: +  const struct genl_ops *ops;
1: +  const struct genl_small_ops *small_ops;
1: +  const struct genl_multicast_group *mcgrps;
1: +  struct module *module;
1:  };
1:  
1:  struct genl_ops {
1: -	int (*doit)(struct sk_buff *, struct genl_info *);
1: -	int (*start)(struct netlink_callback *);
1: -	int (*dumpit)(struct sk_buff *, struct netlink_callback *);
1: -	int (*done)(struct netlink_callback *);
1: -	const struct nla_policy *policy;
1: -	unsigned int maxattr;
1: -	u8 cmd;
1: -	u8 internal_flags;
1: -	u8 flags;
1: -	u8 validate;
1: +  int (*doit)(struct sk_buff *, struct genl_info *);
1: +  int (*start)(struct netlink_callback *);
1: +  int (*dumpit)(struct sk_buff *, struct netlink_callback *);
1: +  int (*done)(struct netlink_callback *);
1: +  const struct nla_policy *policy;
1: +  unsigned int maxattr;
1: +  u8 cmd;
1: +  u8 internal_flags;
1: +  u8 flags;
1: +  u8 validate;
1:  };
1:  
1:  struct genl_info {
1: -	u32 snd_seq;
1: -	u32 snd_portid;
1: -	struct nlmsghdr *nlhdr;
1: -	struct genlmsghdr *genlhdr;
1: -	void *userhdr;
1: -	struct nlattr **attrs;
1: -	possible_net_t _net;
1: -	void *user_ptr[2];
1: -	struct netlink_ext_ack *extack;
1: +  u32 snd_seq;
1: +  u32 snd_portid;
1: +  struct nlmsghdr *nlhdr;
1: +  struct genlmsghdr *genlhdr;
1: +  void *userhdr;
1: +  struct nlattr **attrs;
1: +  possible_net_t _net;
1: +  void *user_ptr[2];
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct genl_small_ops {
1: -	int (*doit)(struct sk_buff *, struct genl_info *);
1: -	int (*dumpit)(struct sk_buff *, struct netlink_callback *);
1: -	u8 cmd;
1: -	u8 internal_flags;
1: -	u8 flags;
1: -	u8 validate;
1: +  int (*doit)(struct sk_buff *, struct genl_info *);
1: +  int (*dumpit)(struct sk_buff *, struct netlink_callback *);
1: +  u8 cmd;
1: +  u8 internal_flags;
1: +  u8 flags;
1: +  u8 validate;
1:  };
1:  
1:  enum genl_validate_flags {
1: -	GENL_DONT_VALIDATE_STRICT = 1,
1: -	GENL_DONT_VALIDATE_DUMP = 2,
1: -	GENL_DONT_VALIDATE_DUMP_STRICT = 4,
1: +  GENL_DONT_VALIDATE_STRICT = 1,
1: +  GENL_DONT_VALIDATE_DUMP = 2,
1: +  GENL_DONT_VALIDATE_DUMP_STRICT = 4,
1:  };
1:  
1:  struct listener {
1: -	struct list_head list;
1: -	pid_t pid;
1: -	char valid;
1: +  struct list_head list;
1: +  pid_t pid;
1: +  char valid;
1:  };
1:  
1:  struct listener_list {
1: -	struct rw_semaphore sem;
1: -	struct list_head list;
1: +  struct rw_semaphore sem;
1: +  struct list_head list;
1:  };
1:  
1:  enum actions {
1: -	REGISTER = 0,
1: -	DEREGISTER = 1,
1: -	CPU_DONT_CARE = 2,
1: +  REGISTER = 0,
1: +  DEREGISTER = 1,
1: +  CPU_DONT_CARE = 2,
1:  };
1:  
1:  struct tp_module {
1: -	struct list_head list;
1: -	struct module *mod;
1: +  struct list_head list;
1: +  struct module *mod;
1:  };
1:  
1:  struct tp_probes {
1: -	struct callback_head rcu;
1: -	struct tracepoint_func probes[0];
1: +  struct callback_head rcu;
1: +  struct tracepoint_func probes[0];
1:  };
1:  
1:  struct ftrace_hash {
1: -	long unsigned int size_bits;
1: -	struct hlist_head *buckets;
1: -	long unsigned int count;
1: -	long unsigned int flags;
1: -	struct callback_head rcu;
1: +  long unsigned int size_bits;
1: +  struct hlist_head *buckets;
1: +  long unsigned int count;
1: +  long unsigned int flags;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ftrace_func_entry {
1: -	struct hlist_node hlist;
1: -	long unsigned int ip;
1: -	long unsigned int direct;
1: +  struct hlist_node hlist;
1: +  long unsigned int ip;
1: +  long unsigned int direct;
1:  };
1:  
1:  enum ftrace_bug_type {
1: -	FTRACE_BUG_UNKNOWN = 0,
1: -	FTRACE_BUG_INIT = 1,
1: -	FTRACE_BUG_NOP = 2,
1: -	FTRACE_BUG_CALL = 3,
1: -	FTRACE_BUG_UPDATE = 4,
1: +  FTRACE_BUG_UNKNOWN = 0,
1: +  FTRACE_BUG_INIT = 1,
1: +  FTRACE_BUG_NOP = 2,
1: +  FTRACE_BUG_CALL = 3,
1: +  FTRACE_BUG_UPDATE = 4,
1:  };
1:  
1:  enum {
1: -	FTRACE_UPDATE_CALLS = 1,
1: -	FTRACE_DISABLE_CALLS = 2,
1: -	FTRACE_UPDATE_TRACE_FUNC = 4,
1: -	FTRACE_START_FUNC_RET = 8,
1: -	FTRACE_STOP_FUNC_RET = 16,
1: -	FTRACE_MAY_SLEEP = 32,
1: +  FTRACE_UPDATE_CALLS = 1,
1: +  FTRACE_DISABLE_CALLS = 2,
1: +  FTRACE_UPDATE_TRACE_FUNC = 4,
1: +  FTRACE_START_FUNC_RET = 8,
1: +  FTRACE_STOP_FUNC_RET = 16,
1: +  FTRACE_MAY_SLEEP = 32,
1:  };
1:  
1:  enum {
1: -	FTRACE_ITER_FILTER = 1,
1: -	FTRACE_ITER_NOTRACE = 2,
1: -	FTRACE_ITER_PRINTALL = 4,
1: -	FTRACE_ITER_DO_PROBES = 8,
1: -	FTRACE_ITER_PROBE = 16,
1: -	FTRACE_ITER_MOD = 32,
1: -	FTRACE_ITER_ENABLED = 64,
1: +  FTRACE_ITER_FILTER = 1,
1: +  FTRACE_ITER_NOTRACE = 2,
1: +  FTRACE_ITER_PRINTALL = 4,
1: +  FTRACE_ITER_DO_PROBES = 8,
1: +  FTRACE_ITER_PROBE = 16,
1: +  FTRACE_ITER_MOD = 32,
1: +  FTRACE_ITER_ENABLED = 64,
1:  };
1:  
1:  struct prog_entry;
1:  
1:  struct event_filter {
1: -	struct prog_entry *prog;
1: -	char *filter_string;
1: +  struct prog_entry *prog;
1: +  char *filter_string;
1:  };
1:  
1:  struct trace_array_cpu;
1:  
1:  struct array_buffer {
1: -	struct trace_array *tr;
1: -	struct trace_buffer *buffer;
1: -	struct trace_array_cpu *data;
1: -	u64 time_start;
1: -	int cpu;
1: +  struct trace_array *tr;
1: +  struct trace_buffer *buffer;
1: +  struct trace_array_cpu *data;
1: +  u64 time_start;
1: +  int cpu;
1:  };
1:  
1:  struct trace_pid_list;
1: @@ -31326,359 +31588,366 @@ struct trace_pid_list;
1:  struct trace_options;
1:  
1:  struct trace_array {
1: -	struct list_head list;
1: -	char *name;
1: -	struct array_buffer array_buffer;
1: -	struct trace_pid_list *filtered_pids;
1: -	struct trace_pid_list *filtered_no_pids;
1: -	arch_spinlock_t max_lock;
1: -	int buffer_disabled;
1: -	int sys_refcount_enter;
1: -	int sys_refcount_exit;
1: -	struct trace_event_file *enter_syscall_files[441];
1: -	struct trace_event_file *exit_syscall_files[441];
1: -	int stop_count;
1: -	int clock_id;
1: -	int nr_topts;
1: -	bool clear_trace;
1: -	int buffer_percent;
1: -	unsigned int n_err_log_entries;
1: -	struct tracer *current_trace;
1: -	unsigned int trace_flags;
1: -	unsigned char trace_flags_index[32];
1: -	unsigned int flags;
1: -	raw_spinlock_t start_lock;
1: -	struct list_head err_log;
1: -	struct dentry *dir;
1: -	struct dentry *options;
1: -	struct dentry *percpu_dir;
1: -	struct dentry *event_dir;
1: -	struct trace_options *topts;
1: -	struct list_head systems;
1: -	struct list_head events;
1: -	struct trace_event_file *trace_marker_file;
1: -	cpumask_var_t tracing_cpumask;
1: -	int ref;
1: -	int trace_ref;
1: -	struct ftrace_ops *ops;
1: -	struct trace_pid_list *function_pids;
1: -	struct trace_pid_list *function_no_pids;
1: -	struct list_head func_probes;
1: -	struct list_head mod_trace;
1: -	struct list_head mod_notrace;
1: -	int function_enabled;
1: -	int time_stamp_abs_ref;
1: -	struct list_head hist_vars;
1: +  struct list_head list;
1: +  char *name;
1: +  struct array_buffer array_buffer;
1: +  struct trace_pid_list *filtered_pids;
1: +  struct trace_pid_list *filtered_no_pids;
1: +  arch_spinlock_t max_lock;
1: +  int buffer_disabled;
1: +  int sys_refcount_enter;
1: +  int sys_refcount_exit;
1: +  struct trace_event_file *enter_syscall_files[441];
1: +  struct trace_event_file *exit_syscall_files[441];
1: +  int stop_count;
1: +  int clock_id;
1: +  int nr_topts;
1: +  bool clear_trace;
1: +  int buffer_percent;
1: +  unsigned int n_err_log_entries;
1: +  struct tracer *current_trace;
1: +  unsigned int trace_flags;
1: +  unsigned char trace_flags_index[32];
1: +  unsigned int flags;
1: +  raw_spinlock_t start_lock;
1: +  struct list_head err_log;
1: +  struct dentry *dir;
1: +  struct dentry *options;
1: +  struct dentry *percpu_dir;
1: +  struct dentry *event_dir;
1: +  struct trace_options *topts;
1: +  struct list_head systems;
1: +  struct list_head events;
1: +  struct trace_event_file *trace_marker_file;
1: +  cpumask_var_t tracing_cpumask;
1: +  int ref;
1: +  int trace_ref;
1: +  struct ftrace_ops *ops;
1: +  struct trace_pid_list *function_pids;
1: +  struct trace_pid_list *function_no_pids;
1: +  struct list_head func_probes;
1: +  struct list_head mod_trace;
1: +  struct list_head mod_notrace;
1: +  int function_enabled;
1: +  int time_stamp_abs_ref;
1: +  struct list_head hist_vars;
1:  };
1:  
1:  struct tracer_flags;
1:  
1:  struct tracer {
1: -	const char *name;
1: -	int (*init)(struct trace_array *);
1: -	void (*reset)(struct trace_array *);
1: -	void (*start)(struct trace_array *);
1: -	void (*stop)(struct trace_array *);
1: -	int (*update_thresh)(struct trace_array *);
1: -	void (*open)(struct trace_iterator *);
1: -	void (*pipe_open)(struct trace_iterator *);
1: -	void (*close)(struct trace_iterator *);
1: -	void (*pipe_close)(struct trace_iterator *);
1: -	ssize_t (*read)(struct trace_iterator *, struct file *, char *, size_t, loff_t *);
1: -	ssize_t (*splice_read)(struct trace_iterator *, struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
1: -	void (*print_header)(struct seq_file *);
1: -	enum print_line_t (*print_line)(struct trace_iterator *);
1: -	int (*set_flag)(struct trace_array *, u32, u32, int);
1: -	int (*flag_changed)(struct trace_array *, u32, int);
1: -	struct tracer *next;
1: -	struct tracer_flags *flags;
1: -	int enabled;
1: -	bool print_max;
1: -	bool allow_instances;
1: -	bool noboot;
1: +  const char *name;
1: +  int (*init)(struct trace_array *);
1: +  void (*reset)(struct trace_array *);
1: +  void (*start)(struct trace_array *);
1: +  void (*stop)(struct trace_array *);
1: +  int (*update_thresh)(struct trace_array *);
1: +  void (*open)(struct trace_iterator *);
1: +  void (*pipe_open)(struct trace_iterator *);
1: +  void (*close)(struct trace_iterator *);
1: +  void (*pipe_close)(struct trace_iterator *);
1: +  ssize_t (*read)(struct trace_iterator *, struct file *, char *, size_t,
1: +                  loff_t *);
1: +  ssize_t (*splice_read)(struct trace_iterator *, struct file *, loff_t *,
1: +                         struct pipe_inode_info *, size_t, unsigned int);
1: +  void (*print_header)(struct seq_file *);
1: +  enum print_line_t (*print_line)(struct trace_iterator *);
1: +  int (*set_flag)(struct trace_array *, u32, u32, int);
1: +  int (*flag_changed)(struct trace_array *, u32, int);
1: +  struct tracer *next;
1: +  struct tracer_flags *flags;
1: +  int enabled;
1: +  bool print_max;
1: +  bool allow_instances;
1: +  bool noboot;
1:  };
1:  
1:  struct event_subsystem;
1:  
1:  struct trace_subsystem_dir {
1: -	struct list_head list;
1: -	struct event_subsystem *subsystem;
1: -	struct trace_array *tr;
1: -	struct dentry *entry;
1: -	int ref_count;
1: -	int nr_events;
1: +  struct list_head list;
1: +  struct event_subsystem *subsystem;
1: +  struct trace_array *tr;
1: +  struct dentry *entry;
1: +  int ref_count;
1: +  int nr_events;
1:  };
1:  
1:  struct trace_array_cpu {
1: -	atomic_t disabled;
1: -	void *buffer_page;
1: -	long unsigned int entries;
1: -	long unsigned int saved_latency;
1: -	long unsigned int critical_start;
1: -	long unsigned int critical_end;
1: -	long unsigned int critical_sequence;
1: -	long unsigned int nice;
1: -	long unsigned int policy;
1: -	long unsigned int rt_priority;
1: -	long unsigned int skipped_entries;
1: -	u64 preempt_timestamp;
1: -	pid_t pid;
1: -	kuid_t uid;
1: -	char comm[16];
1: -	int ftrace_ignore_pid;
1: -	bool ignore_pid;
1: +  atomic_t disabled;
1: +  void *buffer_page;
1: +  long unsigned int entries;
1: +  long unsigned int saved_latency;
1: +  long unsigned int critical_start;
1: +  long unsigned int critical_end;
1: +  long unsigned int critical_sequence;
1: +  long unsigned int nice;
1: +  long unsigned int policy;
1: +  long unsigned int rt_priority;
1: +  long unsigned int skipped_entries;
1: +  u64 preempt_timestamp;
1: +  pid_t pid;
1: +  kuid_t uid;
1: +  char comm[16];
1: +  int ftrace_ignore_pid;
1: +  bool ignore_pid;
1:  };
1:  
1:  struct trace_option_dentry;
1:  
1:  struct trace_options {
1: -	struct tracer *tracer;
1: -	struct trace_option_dentry *topts;
1: +  struct tracer *tracer;
1: +  struct trace_option_dentry *topts;
1:  };
1:  
1:  struct tracer_opt;
1:  
1:  struct trace_option_dentry {
1: -	struct tracer_opt *opt;
1: -	struct tracer_flags *flags;
1: -	struct trace_array *tr;
1: -	struct dentry *entry;
1: +  struct tracer_opt *opt;
1: +  struct tracer_flags *flags;
1: +  struct trace_array *tr;
1: +  struct dentry *entry;
1:  };
1:  
1:  struct trace_pid_list {
1: -	int pid_max;
1: -	long unsigned int *pids;
1: +  int pid_max;
1: +  long unsigned int *pids;
1:  };
1:  
1:  enum {
1: -	TRACE_PIDS = 1,
1: -	TRACE_NO_PIDS = 2,
1: +  TRACE_PIDS = 1,
1: +  TRACE_NO_PIDS = 2,
1:  };
1:  
1:  enum {
1: -	TRACE_ARRAY_FL_GLOBAL = 1,
1: +  TRACE_ARRAY_FL_GLOBAL = 1,
1:  };
1:  
1:  struct tracer_opt {
1: -	const char *name;
1: -	u32 bit;
1: +  const char *name;
1: +  u32 bit;
1:  };
1:  
1:  struct tracer_flags {
1: -	u32 val;
1: -	struct tracer_opt *opts;
1: -	struct tracer *trace;
1: +  u32 val;
1: +  struct tracer_opt *opts;
1: +  struct tracer *trace;
1:  };
1:  
1:  enum {
1: -	TRACE_FTRACE_BIT = 0,
1: -	TRACE_FTRACE_NMI_BIT = 1,
1: -	TRACE_FTRACE_IRQ_BIT = 2,
1: -	TRACE_FTRACE_SIRQ_BIT = 3,
1: -	TRACE_INTERNAL_BIT = 4,
1: -	TRACE_INTERNAL_NMI_BIT = 5,
1: -	TRACE_INTERNAL_IRQ_BIT = 6,
1: -	TRACE_INTERNAL_SIRQ_BIT = 7,
1: -	TRACE_BRANCH_BIT = 8,
1: -	TRACE_IRQ_BIT = 9,
1: -	TRACE_GRAPH_BIT = 10,
1: -	TRACE_GRAPH_DEPTH_START_BIT = 11,
1: -	TRACE_GRAPH_DEPTH_END_BIT = 12,
1: -	TRACE_GRAPH_NOTRACE_BIT = 13,
1: -	TRACE_TRANSITION_BIT = 14,
1: +  TRACE_FTRACE_BIT = 0,
1: +  TRACE_FTRACE_NMI_BIT = 1,
1: +  TRACE_FTRACE_IRQ_BIT = 2,
1: +  TRACE_FTRACE_SIRQ_BIT = 3,
1: +  TRACE_INTERNAL_BIT = 4,
1: +  TRACE_INTERNAL_NMI_BIT = 5,
1: +  TRACE_INTERNAL_IRQ_BIT = 6,
1: +  TRACE_INTERNAL_SIRQ_BIT = 7,
1: +  TRACE_BRANCH_BIT = 8,
1: +  TRACE_IRQ_BIT = 9,
1: +  TRACE_GRAPH_BIT = 10,
1: +  TRACE_GRAPH_DEPTH_START_BIT = 11,
1: +  TRACE_GRAPH_DEPTH_END_BIT = 12,
1: +  TRACE_GRAPH_NOTRACE_BIT = 13,
1: +  TRACE_TRANSITION_BIT = 14,
1:  };
1:  
1:  struct ftrace_mod_load {
1: -	struct list_head list;
1: -	char *func;
1: -	char *module;
1: -	int enable;
1: +  struct list_head list;
1: +  char *func;
1: +  char *module;
1: +  int enable;
1:  };
1:  
1:  enum {
1: -	FTRACE_HASH_FL_MOD = 1,
1: +  FTRACE_HASH_FL_MOD = 1,
1:  };
1:  
1:  struct ftrace_func_command {
1: -	struct list_head list;
1: -	char *name;
1: -	int (*func)(struct trace_array *, struct ftrace_hash *, char *, char *, char *, int);
1: +  struct list_head list;
1: +  char *name;
1: +  int (*func)(struct trace_array *, struct ftrace_hash *, char *, char *,
1: +              char *, int);
1:  };
1:  
1:  struct ftrace_probe_ops {
1: -	void (*func)(long unsigned int, long unsigned int, struct trace_array *, struct ftrace_probe_ops *, void *);
1: -	int (*init)(struct ftrace_probe_ops *, struct trace_array *, long unsigned int, void *, void **);
1: -	void (*free)(struct ftrace_probe_ops *, struct trace_array *, long unsigned int, void *);
1: -	int (*print)(struct seq_file *, long unsigned int, struct ftrace_probe_ops *, void *);
1: +  void (*func)(long unsigned int, long unsigned int, struct trace_array *,
1: +               struct ftrace_probe_ops *, void *);
1: +  int (*init)(struct ftrace_probe_ops *, struct trace_array *,
1: +              long unsigned int, void *, void **);
1: +  void (*free)(struct ftrace_probe_ops *, struct trace_array *,
1: +               long unsigned int, void *);
1: +  int (*print)(struct seq_file *, long unsigned int, struct ftrace_probe_ops *,
1: +               void *);
1:  };
1:  
1:  typedef int (*ftrace_mapper_func)(void *);
1:  
1:  struct trace_parser {
1: -	bool cont;
1: -	char *buffer;
1: -	unsigned int idx;
1: -	unsigned int size;
1: +  bool cont;
1: +  char *buffer;
1: +  unsigned int idx;
1: +  unsigned int size;
1:  };
1:  
1:  enum trace_iterator_bits {
1: -	TRACE_ITER_PRINT_PARENT_BIT = 0,
1: -	TRACE_ITER_SYM_OFFSET_BIT = 1,
1: -	TRACE_ITER_SYM_ADDR_BIT = 2,
1: -	TRACE_ITER_VERBOSE_BIT = 3,
1: -	TRACE_ITER_RAW_BIT = 4,
1: -	TRACE_ITER_HEX_BIT = 5,
1: -	TRACE_ITER_BIN_BIT = 6,
1: -	TRACE_ITER_BLOCK_BIT = 7,
1: -	TRACE_ITER_PRINTK_BIT = 8,
1: -	TRACE_ITER_ANNOTATE_BIT = 9,
1: -	TRACE_ITER_USERSTACKTRACE_BIT = 10,
1: -	TRACE_ITER_SYM_USEROBJ_BIT = 11,
1: -	TRACE_ITER_PRINTK_MSGONLY_BIT = 12,
1: -	TRACE_ITER_CONTEXT_INFO_BIT = 13,
1: -	TRACE_ITER_LATENCY_FMT_BIT = 14,
1: -	TRACE_ITER_RECORD_CMD_BIT = 15,
1: -	TRACE_ITER_RECORD_TGID_BIT = 16,
1: -	TRACE_ITER_OVERWRITE_BIT = 17,
1: -	TRACE_ITER_STOP_ON_FREE_BIT = 18,
1: -	TRACE_ITER_IRQ_INFO_BIT = 19,
1: -	TRACE_ITER_MARKERS_BIT = 20,
1: -	TRACE_ITER_EVENT_FORK_BIT = 21,
1: -	TRACE_ITER_PAUSE_ON_TRACE_BIT = 22,
1: -	TRACE_ITER_FUNCTION_BIT = 23,
1: -	TRACE_ITER_FUNC_FORK_BIT = 24,
1: -	TRACE_ITER_DISPLAY_GRAPH_BIT = 25,
1: -	TRACE_ITER_STACKTRACE_BIT = 26,
1: -	TRACE_ITER_LAST_BIT = 27,
1: +  TRACE_ITER_PRINT_PARENT_BIT = 0,
1: +  TRACE_ITER_SYM_OFFSET_BIT = 1,
1: +  TRACE_ITER_SYM_ADDR_BIT = 2,
1: +  TRACE_ITER_VERBOSE_BIT = 3,
1: +  TRACE_ITER_RAW_BIT = 4,
1: +  TRACE_ITER_HEX_BIT = 5,
1: +  TRACE_ITER_BIN_BIT = 6,
1: +  TRACE_ITER_BLOCK_BIT = 7,
1: +  TRACE_ITER_PRINTK_BIT = 8,
1: +  TRACE_ITER_ANNOTATE_BIT = 9,
1: +  TRACE_ITER_USERSTACKTRACE_BIT = 10,
1: +  TRACE_ITER_SYM_USEROBJ_BIT = 11,
1: +  TRACE_ITER_PRINTK_MSGONLY_BIT = 12,
1: +  TRACE_ITER_CONTEXT_INFO_BIT = 13,
1: +  TRACE_ITER_LATENCY_FMT_BIT = 14,
1: +  TRACE_ITER_RECORD_CMD_BIT = 15,
1: +  TRACE_ITER_RECORD_TGID_BIT = 16,
1: +  TRACE_ITER_OVERWRITE_BIT = 17,
1: +  TRACE_ITER_STOP_ON_FREE_BIT = 18,
1: +  TRACE_ITER_IRQ_INFO_BIT = 19,
1: +  TRACE_ITER_MARKERS_BIT = 20,
1: +  TRACE_ITER_EVENT_FORK_BIT = 21,
1: +  TRACE_ITER_PAUSE_ON_TRACE_BIT = 22,
1: +  TRACE_ITER_FUNCTION_BIT = 23,
1: +  TRACE_ITER_FUNC_FORK_BIT = 24,
1: +  TRACE_ITER_DISPLAY_GRAPH_BIT = 25,
1: +  TRACE_ITER_STACKTRACE_BIT = 26,
1: +  TRACE_ITER_LAST_BIT = 27,
1:  };
1:  
1:  struct event_subsystem {
1: -	struct list_head list;
1: -	const char *name;
1: -	struct event_filter *filter;
1: -	int ref_count;
1: +  struct list_head list;
1: +  const char *name;
1: +  struct event_filter *filter;
1: +  int ref_count;
1:  };
1:  
1:  enum regex_type {
1: -	MATCH_FULL = 0,
1: -	MATCH_FRONT_ONLY = 1,
1: -	MATCH_MIDDLE_ONLY = 2,
1: -	MATCH_END_ONLY = 3,
1: -	MATCH_GLOB = 4,
1: -	MATCH_INDEX = 5,
1: +  MATCH_FULL = 0,
1: +  MATCH_FRONT_ONLY = 1,
1: +  MATCH_MIDDLE_ONLY = 2,
1: +  MATCH_END_ONLY = 3,
1: +  MATCH_GLOB = 4,
1: +  MATCH_INDEX = 5,
1:  };
1:  
1:  enum {
1: -	FTRACE_MODIFY_ENABLE_FL = 1,
1: -	FTRACE_MODIFY_MAY_SLEEP_FL = 2,
1: +  FTRACE_MODIFY_ENABLE_FL = 1,
1: +  FTRACE_MODIFY_MAY_SLEEP_FL = 2,
1:  };
1:  
1:  struct ftrace_func_probe {
1: -	struct ftrace_probe_ops *probe_ops;
1: -	struct ftrace_ops ops;
1: -	struct trace_array *tr;
1: -	struct list_head list;
1: -	void *data;
1: -	int ref;
1: +  struct ftrace_probe_ops *probe_ops;
1: +  struct ftrace_ops ops;
1: +  struct trace_array *tr;
1: +  struct list_head list;
1: +  void *data;
1: +  int ref;
1:  };
1:  
1:  struct ftrace_page {
1: -	struct ftrace_page *next;
1: -	struct dyn_ftrace *records;
1: -	int index;
1: -	int size;
1: +  struct ftrace_page *next;
1: +  struct dyn_ftrace *records;
1: +  int index;
1: +  int size;
1:  };
1:  
1:  struct ftrace_rec_iter___2 {
1: -	struct ftrace_page *pg;
1: -	int index;
1: +  struct ftrace_page *pg;
1: +  int index;
1:  };
1:  
1:  struct ftrace_iterator {
1: -	loff_t pos;
1: -	loff_t func_pos;
1: -	loff_t mod_pos;
1: -	struct ftrace_page *pg;
1: -	struct dyn_ftrace *func;
1: -	struct ftrace_func_probe *probe;
1: -	struct ftrace_func_entry *probe_entry;
1: -	struct trace_parser parser;
1: -	struct ftrace_hash *hash;
1: -	struct ftrace_ops *ops;
1: -	struct trace_array *tr;
1: -	struct list_head *mod_list;
1: -	int pidx;
1: -	int idx;
1: -	unsigned int flags;
1: +  loff_t pos;
1: +  loff_t func_pos;
1: +  loff_t mod_pos;
1: +  struct ftrace_page *pg;
1: +  struct dyn_ftrace *func;
1: +  struct ftrace_func_probe *probe;
1: +  struct ftrace_func_entry *probe_entry;
1: +  struct trace_parser parser;
1: +  struct ftrace_hash *hash;
1: +  struct ftrace_ops *ops;
1: +  struct trace_array *tr;
1: +  struct list_head *mod_list;
1: +  int pidx;
1: +  int idx;
1: +  unsigned int flags;
1:  };
1:  
1:  struct ftrace_glob {
1: -	char *search;
1: -	unsigned int len;
1: -	int type;
1: +  char *search;
1: +  unsigned int len;
1: +  int type;
1:  };
1:  
1:  struct ftrace_func_map {
1: -	struct ftrace_func_entry entry;
1: -	void *data;
1: +  struct ftrace_func_entry entry;
1: +  void *data;
1:  };
1:  
1:  struct ftrace_func_mapper {
1: -	struct ftrace_hash hash;
1: +  struct ftrace_hash hash;
1:  };
1:  
1:  struct ftrace_direct_func {
1: -	struct list_head next;
1: -	long unsigned int addr;
1: -	int count;
1: +  struct list_head next;
1: +  long unsigned int addr;
1: +  int count;
1:  };
1:  
1:  enum graph_filter_type {
1: -	GRAPH_FILTER_NOTRACE = 0,
1: -	GRAPH_FILTER_FUNCTION = 1,
1: +  GRAPH_FILTER_NOTRACE = 0,
1: +  GRAPH_FILTER_FUNCTION = 1,
1:  };
1:  
1:  struct ftrace_graph_data {
1: -	struct ftrace_hash *hash;
1: -	struct ftrace_func_entry *entry;
1: -	int idx;
1: -	enum graph_filter_type type;
1: -	struct ftrace_hash *new_hash;
1: -	const struct seq_operations *seq_ops;
1: -	struct trace_parser parser;
1: +  struct ftrace_hash *hash;
1: +  struct ftrace_func_entry *entry;
1: +  int idx;
1: +  enum graph_filter_type type;
1: +  struct ftrace_hash *new_hash;
1: +  const struct seq_operations *seq_ops;
1: +  struct trace_parser parser;
1:  };
1:  
1:  struct ftrace_mod_func {
1: -	struct list_head list;
1: -	char *name;
1: -	long unsigned int ip;
1: -	unsigned int size;
1: +  struct list_head list;
1: +  char *name;
1: +  long unsigned int ip;
1: +  unsigned int size;
1:  };
1:  
1:  struct ftrace_mod_map {
1: -	struct callback_head rcu;
1: -	struct list_head list;
1: -	struct module *mod;
1: -	long unsigned int start_addr;
1: -	long unsigned int end_addr;
1: -	struct list_head funcs;
1: -	unsigned int num_funcs;
1: +  struct callback_head rcu;
1: +  struct list_head list;
1: +  struct module *mod;
1: +  long unsigned int start_addr;
1: +  long unsigned int end_addr;
1: +  struct list_head funcs;
1: +  unsigned int num_funcs;
1:  };
1:  
1:  struct ftrace_init_func {
1: -	struct list_head list;
1: -	long unsigned int ip;
1: +  struct list_head list;
1: +  long unsigned int ip;
1:  };
1:  
1:  enum ring_buffer_type {
1: -	RINGBUF_TYPE_DATA_TYPE_LEN_MAX = 28,
1: -	RINGBUF_TYPE_PADDING = 29,
1: -	RINGBUF_TYPE_TIME_EXTEND = 30,
1: -	RINGBUF_TYPE_TIME_STAMP = 31,
1: +  RINGBUF_TYPE_DATA_TYPE_LEN_MAX = 28,
1: +  RINGBUF_TYPE_PADDING = 29,
1: +  RINGBUF_TYPE_TIME_EXTEND = 30,
1: +  RINGBUF_TYPE_TIME_STAMP = 31,
1:  };
1:  
1:  enum ring_buffer_flags {
1: -	RB_FL_OVERWRITE = 1,
1: +  RB_FL_OVERWRITE = 1,
1:  };
1:  
1:  struct ring_buffer_per_cpu;
1: @@ -31686,389 +31955,389 @@ struct ring_buffer_per_cpu;
1:  struct buffer_page;
1:  
1:  struct ring_buffer_iter {
1: -	struct ring_buffer_per_cpu *cpu_buffer;
1: -	long unsigned int head;
1: -	long unsigned int next_event;
1: -	struct buffer_page *head_page;
1: -	struct buffer_page *cache_reader_page;
1: -	long unsigned int cache_read;
1: -	u64 read_stamp;
1: -	u64 page_stamp;
1: -	struct ring_buffer_event *event;
1: -	int missed_events;
1: +  struct ring_buffer_per_cpu *cpu_buffer;
1: +  long unsigned int head;
1: +  long unsigned int next_event;
1: +  struct buffer_page *head_page;
1: +  struct buffer_page *cache_reader_page;
1: +  long unsigned int cache_read;
1: +  u64 read_stamp;
1: +  u64 page_stamp;
1: +  struct ring_buffer_event *event;
1: +  int missed_events;
1:  };
1:  
1:  struct rb_irq_work {
1: -	struct irq_work work;
1: -	wait_queue_head_t waiters;
1: -	wait_queue_head_t full_waiters;
1: -	bool waiters_pending;
1: -	bool full_waiters_pending;
1: -	bool wakeup_full;
1: +  struct irq_work work;
1: +  wait_queue_head_t waiters;
1: +  wait_queue_head_t full_waiters;
1: +  bool waiters_pending;
1: +  bool full_waiters_pending;
1: +  bool wakeup_full;
1:  };
1:  
1:  struct trace_buffer___2 {
1: -	unsigned int flags;
1: -	int cpus;
1: -	atomic_t record_disabled;
1: -	cpumask_var_t cpumask;
1: -	struct lock_class_key *reader_lock_key;
1: -	struct mutex mutex;
1: -	struct ring_buffer_per_cpu **buffers;
1: -	struct hlist_node node;
1: -	u64 (*clock)();
1: -	struct rb_irq_work irq_work;
1: -	bool time_stamp_abs;
1: +  unsigned int flags;
1: +  int cpus;
1: +  atomic_t record_disabled;
1: +  cpumask_var_t cpumask;
1: +  struct lock_class_key *reader_lock_key;
1: +  struct mutex mutex;
1: +  struct ring_buffer_per_cpu **buffers;
1: +  struct hlist_node node;
1: +  u64 (*clock)();
1: +  struct rb_irq_work irq_work;
1: +  bool time_stamp_abs;
1:  };
1:  
1:  enum {
1: -	RB_LEN_TIME_EXTEND = 8,
1: -	RB_LEN_TIME_STAMP = 8,
1: +  RB_LEN_TIME_EXTEND = 8,
1: +  RB_LEN_TIME_STAMP = 8,
1:  };
1:  
1:  struct buffer_data_page {
1: -	u64 time_stamp;
1: -	local_t commit;
1: -	unsigned char data[0];
1: +  u64 time_stamp;
1: +  local_t commit;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct buffer_page {
1: -	struct list_head list;
1: -	local_t write;
1: -	unsigned int read;
1: -	local_t entries;
1: -	long unsigned int real_end;
1: -	struct buffer_data_page *page;
1: +  struct list_head list;
1: +  local_t write;
1: +  unsigned int read;
1: +  local_t entries;
1: +  long unsigned int real_end;
1: +  struct buffer_data_page *page;
1:  };
1:  
1:  struct rb_event_info {
1: -	u64 ts;
1: -	u64 delta;
1: -	u64 before;
1: -	u64 after;
1: -	long unsigned int length;
1: -	struct buffer_page *tail_page;
1: -	int add_timestamp;
1: +  u64 ts;
1: +  u64 delta;
1: +  u64 before;
1: +  u64 after;
1: +  long unsigned int length;
1: +  struct buffer_page *tail_page;
1: +  int add_timestamp;
1:  };
1:  
1:  enum {
1: -	RB_ADD_STAMP_NONE = 0,
1: -	RB_ADD_STAMP_EXTEND = 2,
1: -	RB_ADD_STAMP_ABSOLUTE = 4,
1: -	RB_ADD_STAMP_FORCE = 8,
1: +  RB_ADD_STAMP_NONE = 0,
1: +  RB_ADD_STAMP_EXTEND = 2,
1: +  RB_ADD_STAMP_ABSOLUTE = 4,
1: +  RB_ADD_STAMP_FORCE = 8,
1:  };
1:  
1:  enum {
1: -	RB_CTX_TRANSITION = 0,
1: -	RB_CTX_NMI = 1,
1: -	RB_CTX_IRQ = 2,
1: -	RB_CTX_SOFTIRQ = 3,
1: -	RB_CTX_NORMAL = 4,
1: -	RB_CTX_MAX = 5,
1: +  RB_CTX_TRANSITION = 0,
1: +  RB_CTX_NMI = 1,
1: +  RB_CTX_IRQ = 2,
1: +  RB_CTX_SOFTIRQ = 3,
1: +  RB_CTX_NORMAL = 4,
1: +  RB_CTX_MAX = 5,
1:  };
1:  
1:  struct rb_time_struct {
1: -	local64_t time;
1: +  local64_t time;
1:  };
1:  
1:  typedef struct rb_time_struct rb_time_t;
1:  
1:  struct ring_buffer_per_cpu {
1: -	int cpu;
1: -	atomic_t record_disabled;
1: -	atomic_t resize_disabled;
1: -	struct trace_buffer___2 *buffer;
1: -	raw_spinlock_t reader_lock;
1: -	arch_spinlock_t lock;
1: -	struct lock_class_key lock_key;
1: -	struct buffer_data_page *free_page;
1: -	long unsigned int nr_pages;
1: -	unsigned int current_context;
1: -	struct list_head *pages;
1: -	struct buffer_page *head_page;
1: -	struct buffer_page *tail_page;
1: -	struct buffer_page *commit_page;
1: -	struct buffer_page *reader_page;
1: -	long unsigned int lost_events;
1: -	long unsigned int last_overrun;
1: -	long unsigned int nest;
1: -	local_t entries_bytes;
1: -	local_t entries;
1: -	local_t overrun;
1: -	local_t commit_overrun;
1: -	local_t dropped_events;
1: -	local_t committing;
1: -	local_t commits;
1: -	local_t pages_touched;
1: -	local_t pages_read;
1: -	long int last_pages_touch;
1: -	size_t shortest_full;
1: -	long unsigned int read;
1: -	long unsigned int read_bytes;
1: -	rb_time_t write_stamp;
1: -	rb_time_t before_stamp;
1: -	u64 read_stamp;
1: -	long int nr_pages_to_update;
1: -	struct list_head new_pages;
1: -	struct work_struct update_pages_work;
1: -	struct completion update_done;
1: -	struct rb_irq_work irq_work;
1: +  int cpu;
1: +  atomic_t record_disabled;
1: +  atomic_t resize_disabled;
1: +  struct trace_buffer___2 *buffer;
1: +  raw_spinlock_t reader_lock;
1: +  arch_spinlock_t lock;
1: +  struct lock_class_key lock_key;
1: +  struct buffer_data_page *free_page;
1: +  long unsigned int nr_pages;
1: +  unsigned int current_context;
1: +  struct list_head *pages;
1: +  struct buffer_page *head_page;
1: +  struct buffer_page *tail_page;
1: +  struct buffer_page *commit_page;
1: +  struct buffer_page *reader_page;
1: +  long unsigned int lost_events;
1: +  long unsigned int last_overrun;
1: +  long unsigned int nest;
1: +  local_t entries_bytes;
1: +  local_t entries;
1: +  local_t overrun;
1: +  local_t commit_overrun;
1: +  local_t dropped_events;
1: +  local_t committing;
1: +  local_t commits;
1: +  local_t pages_touched;
1: +  local_t pages_read;
1: +  long int last_pages_touch;
1: +  size_t shortest_full;
1: +  long unsigned int read;
1: +  long unsigned int read_bytes;
1: +  rb_time_t write_stamp;
1: +  rb_time_t before_stamp;
1: +  u64 read_stamp;
1: +  long int nr_pages_to_update;
1: +  struct list_head new_pages;
1: +  struct work_struct update_pages_work;
1: +  struct completion update_done;
1: +  struct rb_irq_work irq_work;
1:  };
1:  
1:  struct trace_export {
1: -	struct trace_export *next;
1: -	void (*write)(struct trace_export *, const void *, unsigned int);
1: -	int flags;
1: +  struct trace_export *next;
1: +  void (*write)(struct trace_export *, const void *, unsigned int);
1: +  int flags;
1:  };
1:  
1:  enum trace_iter_flags {
1: -	TRACE_FILE_LAT_FMT = 1,
1: -	TRACE_FILE_ANNOTATE = 2,
1: -	TRACE_FILE_TIME_IN_NS = 4,
1: +  TRACE_FILE_LAT_FMT = 1,
1: +  TRACE_FILE_ANNOTATE = 2,
1: +  TRACE_FILE_TIME_IN_NS = 4,
1:  };
1:  
1:  enum event_trigger_type {
1: -	ETT_NONE = 0,
1: -	ETT_TRACE_ONOFF = 1,
1: -	ETT_SNAPSHOT = 2,
1: -	ETT_STACKTRACE = 4,
1: -	ETT_EVENT_ENABLE = 8,
1: -	ETT_EVENT_HIST = 16,
1: -	ETT_HIST_ENABLE = 32,
1: +  ETT_NONE = 0,
1: +  ETT_TRACE_ONOFF = 1,
1: +  ETT_SNAPSHOT = 2,
1: +  ETT_STACKTRACE = 4,
1: +  ETT_EVENT_ENABLE = 8,
1: +  ETT_EVENT_HIST = 16,
1: +  ETT_HIST_ENABLE = 32,
1:  };
1:  
1:  enum trace_type {
1: -	__TRACE_FIRST_TYPE = 0,
1: -	TRACE_FN = 1,
1: -	TRACE_CTX = 2,
1: -	TRACE_WAKE = 3,
1: -	TRACE_STACK = 4,
1: -	TRACE_PRINT = 5,
1: -	TRACE_BPRINT = 6,
1: -	TRACE_MMIO_RW = 7,
1: -	TRACE_MMIO_MAP = 8,
1: -	TRACE_BRANCH = 9,
1: -	TRACE_GRAPH_RET = 10,
1: -	TRACE_GRAPH_ENT = 11,
1: -	TRACE_USER_STACK = 12,
1: -	TRACE_BLK = 13,
1: -	TRACE_BPUTS = 14,
1: -	TRACE_HWLAT = 15,
1: -	TRACE_RAW_DATA = 16,
1: -	__TRACE_LAST_TYPE = 17,
1: +  __TRACE_FIRST_TYPE = 0,
1: +  TRACE_FN = 1,
1: +  TRACE_CTX = 2,
1: +  TRACE_WAKE = 3,
1: +  TRACE_STACK = 4,
1: +  TRACE_PRINT = 5,
1: +  TRACE_BPRINT = 6,
1: +  TRACE_MMIO_RW = 7,
1: +  TRACE_MMIO_MAP = 8,
1: +  TRACE_BRANCH = 9,
1: +  TRACE_GRAPH_RET = 10,
1: +  TRACE_GRAPH_ENT = 11,
1: +  TRACE_USER_STACK = 12,
1: +  TRACE_BLK = 13,
1: +  TRACE_BPUTS = 14,
1: +  TRACE_HWLAT = 15,
1: +  TRACE_RAW_DATA = 16,
1: +  __TRACE_LAST_TYPE = 17,
1:  };
1:  
1:  struct ftrace_entry {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: -	long unsigned int parent_ip;
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1: +  long unsigned int parent_ip;
1:  };
1:  
1:  struct stack_entry {
1: -	struct trace_entry ent;
1: -	int size;
1: -	long unsigned int caller[8];
1: +  struct trace_entry ent;
1: +  int size;
1: +  long unsigned int caller[8];
1:  };
1:  
1:  struct userstack_entry {
1: -	struct trace_entry ent;
1: -	unsigned int tgid;
1: -	long unsigned int caller[8];
1: +  struct trace_entry ent;
1: +  unsigned int tgid;
1: +  long unsigned int caller[8];
1:  };
1:  
1:  struct bprint_entry {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: -	const char *fmt;
1: -	u32 buf[0];
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1: +  const char *fmt;
1: +  u32 buf[0];
1:  };
1:  
1:  struct print_entry {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: -	char buf[0];
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1: +  char buf[0];
1:  };
1:  
1:  struct raw_data_entry {
1: -	struct trace_entry ent;
1: -	unsigned int id;
1: -	char buf[0];
1: +  struct trace_entry ent;
1: +  unsigned int id;
1: +  char buf[0];
1:  };
1:  
1:  struct bputs_entry {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: -	const char *str;
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1: +  const char *str;
1:  };
1:  
1:  enum trace_flag_type {
1: -	TRACE_FLAG_IRQS_OFF = 1,
1: -	TRACE_FLAG_IRQS_NOSUPPORT = 2,
1: -	TRACE_FLAG_NEED_RESCHED = 4,
1: -	TRACE_FLAG_HARDIRQ = 8,
1: -	TRACE_FLAG_SOFTIRQ = 16,
1: -	TRACE_FLAG_PREEMPT_RESCHED = 32,
1: -	TRACE_FLAG_NMI = 64,
1: +  TRACE_FLAG_IRQS_OFF = 1,
1: +  TRACE_FLAG_IRQS_NOSUPPORT = 2,
1: +  TRACE_FLAG_NEED_RESCHED = 4,
1: +  TRACE_FLAG_HARDIRQ = 8,
1: +  TRACE_FLAG_SOFTIRQ = 16,
1: +  TRACE_FLAG_PREEMPT_RESCHED = 32,
1: +  TRACE_FLAG_NMI = 64,
1:  };
1:  
1:  typedef bool (*cond_update_fn_t)(struct trace_array *, void *);
1:  
1:  enum trace_iterator_flags {
1: -	TRACE_ITER_PRINT_PARENT = 1,
1: -	TRACE_ITER_SYM_OFFSET = 2,
1: -	TRACE_ITER_SYM_ADDR = 4,
1: -	TRACE_ITER_VERBOSE = 8,
1: -	TRACE_ITER_RAW = 16,
1: -	TRACE_ITER_HEX = 32,
1: -	TRACE_ITER_BIN = 64,
1: -	TRACE_ITER_BLOCK = 128,
1: -	TRACE_ITER_PRINTK = 256,
1: -	TRACE_ITER_ANNOTATE = 512,
1: -	TRACE_ITER_USERSTACKTRACE = 1024,
1: -	TRACE_ITER_SYM_USEROBJ = 2048,
1: -	TRACE_ITER_PRINTK_MSGONLY = 4096,
1: -	TRACE_ITER_CONTEXT_INFO = 8192,
1: -	TRACE_ITER_LATENCY_FMT = 16384,
1: -	TRACE_ITER_RECORD_CMD = 32768,
1: -	TRACE_ITER_RECORD_TGID = 65536,
1: -	TRACE_ITER_OVERWRITE = 131072,
1: -	TRACE_ITER_STOP_ON_FREE = 262144,
1: -	TRACE_ITER_IRQ_INFO = 524288,
1: -	TRACE_ITER_MARKERS = 1048576,
1: -	TRACE_ITER_EVENT_FORK = 2097152,
1: -	TRACE_ITER_PAUSE_ON_TRACE = 4194304,
1: -	TRACE_ITER_FUNCTION = 8388608,
1: -	TRACE_ITER_FUNC_FORK = 16777216,
1: -	TRACE_ITER_DISPLAY_GRAPH = 33554432,
1: -	TRACE_ITER_STACKTRACE = 67108864,
1: +  TRACE_ITER_PRINT_PARENT = 1,
1: +  TRACE_ITER_SYM_OFFSET = 2,
1: +  TRACE_ITER_SYM_ADDR = 4,
1: +  TRACE_ITER_VERBOSE = 8,
1: +  TRACE_ITER_RAW = 16,
1: +  TRACE_ITER_HEX = 32,
1: +  TRACE_ITER_BIN = 64,
1: +  TRACE_ITER_BLOCK = 128,
1: +  TRACE_ITER_PRINTK = 256,
1: +  TRACE_ITER_ANNOTATE = 512,
1: +  TRACE_ITER_USERSTACKTRACE = 1024,
1: +  TRACE_ITER_SYM_USEROBJ = 2048,
1: +  TRACE_ITER_PRINTK_MSGONLY = 4096,
1: +  TRACE_ITER_CONTEXT_INFO = 8192,
1: +  TRACE_ITER_LATENCY_FMT = 16384,
1: +  TRACE_ITER_RECORD_CMD = 32768,
1: +  TRACE_ITER_RECORD_TGID = 65536,
1: +  TRACE_ITER_OVERWRITE = 131072,
1: +  TRACE_ITER_STOP_ON_FREE = 262144,
1: +  TRACE_ITER_IRQ_INFO = 524288,
1: +  TRACE_ITER_MARKERS = 1048576,
1: +  TRACE_ITER_EVENT_FORK = 2097152,
1: +  TRACE_ITER_PAUSE_ON_TRACE = 4194304,
1: +  TRACE_ITER_FUNCTION = 8388608,
1: +  TRACE_ITER_FUNC_FORK = 16777216,
1: +  TRACE_ITER_DISPLAY_GRAPH = 33554432,
1: +  TRACE_ITER_STACKTRACE = 67108864,
1:  };
1:  
1:  struct saved_cmdlines_buffer {
1: -	unsigned int map_pid_to_cmdline[32769];
1: -	unsigned int *map_cmdline_to_pid;
1: -	unsigned int cmdline_num;
1: -	int cmdline_idx;
1: -	char *saved_cmdlines;
1: +  unsigned int map_pid_to_cmdline[32769];
1: +  unsigned int *map_cmdline_to_pid;
1: +  unsigned int cmdline_num;
1: +  int cmdline_idx;
1: +  char *saved_cmdlines;
1:  };
1:  
1:  struct ftrace_stack {
1: -	long unsigned int calls[1024];
1: +  long unsigned int calls[1024];
1:  };
1:  
1:  struct ftrace_stacks {
1: -	struct ftrace_stack stacks[4];
1: +  struct ftrace_stack stacks[4];
1:  };
1:  
1:  struct trace_buffer_struct {
1: -	int nesting;
1: -	char buffer[4096];
1: +  int nesting;
1: +  char buffer[4096];
1:  };
1:  
1:  struct ftrace_buffer_info {
1: -	struct trace_iterator iter;
1: -	void *spare;
1: -	unsigned int spare_cpu;
1: -	unsigned int read;
1: +  struct trace_iterator iter;
1: +  void *spare;
1: +  unsigned int spare_cpu;
1: +  unsigned int read;
1:  };
1:  
1:  struct err_info {
1: -	const char **errs;
1: -	u8 type;
1: -	u8 pos;
1: -	u64 ts;
1: +  const char **errs;
1: +  u8 type;
1: +  u8 pos;
1: +  u64 ts;
1:  };
1:  
1:  struct tracing_log_err {
1: -	struct list_head list;
1: -	struct err_info info;
1: -	char loc[128];
1: -	char cmd[256];
1: +  struct list_head list;
1: +  struct err_info info;
1: +  char loc[128];
1: +  char cmd[256];
1:  };
1:  
1:  struct buffer_ref {
1: -	struct trace_buffer *buffer;
1: -	void *page;
1: -	int cpu;
1: -	refcount_t refcount;
1: +  struct trace_buffer *buffer;
1: +  void *page;
1: +  int cpu;
1: +  refcount_t refcount;
1:  };
1:  
1:  struct ctx_switch_entry {
1: -	struct trace_entry ent;
1: -	unsigned int prev_pid;
1: -	unsigned int next_pid;
1: -	unsigned int next_cpu;
1: -	unsigned char prev_prio;
1: -	unsigned char prev_state;
1: -	unsigned char next_prio;
1: -	unsigned char next_state;
1: +  struct trace_entry ent;
1: +  unsigned int prev_pid;
1: +  unsigned int next_pid;
1: +  unsigned int next_cpu;
1: +  unsigned char prev_prio;
1: +  unsigned char prev_state;
1: +  unsigned char next_prio;
1: +  unsigned char next_state;
1:  };
1:  
1:  struct hwlat_entry {
1: -	struct trace_entry ent;
1: -	u64 duration;
1: -	u64 outer_duration;
1: -	u64 nmi_total_ts;
1: -	struct timespec64 timestamp;
1: -	unsigned int nmi_count;
1: -	unsigned int seqnum;
1: -	unsigned int count;
1: +  struct trace_entry ent;
1: +  u64 duration;
1: +  u64 outer_duration;
1: +  u64 nmi_total_ts;
1: +  struct timespec64 timestamp;
1: +  unsigned int nmi_count;
1: +  unsigned int seqnum;
1: +  unsigned int count;
1:  };
1:  
1:  struct trace_mark {
1: -	long long unsigned int val;
1: -	char sym;
1: +  long long unsigned int val;
1: +  char sym;
1:  };
1:  
1:  struct tracer_stat {
1: -	const char *name;
1: -	void * (*stat_start)(struct tracer_stat *);
1: -	void * (*stat_next)(void *, int);
1: -	cmp_func_t stat_cmp;
1: -	int (*stat_show)(struct seq_file *, void *);
1: -	void (*stat_release)(void *);
1: -	int (*stat_headers)(struct seq_file *);
1: +  const char *name;
1: +  void *(*stat_start)(struct tracer_stat *);
1: +  void *(*stat_next)(void *, int);
1: +  cmp_func_t stat_cmp;
1: +  int (*stat_show)(struct seq_file *, void *);
1: +  void (*stat_release)(void *);
1: +  int (*stat_headers)(struct seq_file *);
1:  };
1:  
1:  struct stat_node {
1: -	struct rb_node node;
1: -	void *stat;
1: +  struct rb_node node;
1: +  void *stat;
1:  };
1:  
1:  struct stat_session {
1: -	struct list_head session_list;
1: -	struct tracer_stat *ts;
1: -	struct rb_root stat_root;
1: -	struct mutex stat_mutex;
1: -	struct dentry *file;
1: +  struct list_head session_list;
1: +  struct tracer_stat *ts;
1: +  struct rb_root stat_root;
1: +  struct mutex stat_mutex;
1: +  struct dentry *file;
1:  };
1:  
1:  struct trace_bprintk_fmt {
1: -	struct list_head list;
1: -	const char *fmt;
1: +  struct list_head list;
1: +  const char *fmt;
1:  };
1:  
1:  enum {
1: -	TRACE_FUNC_OPT_STACK = 1,
1: +  TRACE_FUNC_OPT_STACK = 1,
1:  };
1:  
1:  struct ftrace_func_mapper___2;
1:  
1:  enum {
1: -	TRACE_NOP_OPT_ACCEPT = 1,
1: -	TRACE_NOP_OPT_REFUSE = 2,
1: +  TRACE_NOP_OPT_ACCEPT = 1,
1: +  TRACE_NOP_OPT_REFUSE = 2,
1:  };
1:  
1:  struct ftrace_graph_ent {
1: -	long unsigned int func;
1: -	int depth;
1: +  long unsigned int func;
1: +  int depth;
1:  } __attribute__((packed));
1:  
1:  struct ftrace_graph_ret {
1: -	long unsigned int func;
1: -	long unsigned int overrun;
1: -	long long unsigned int calltime;
1: -	long long unsigned int rettime;
1: -	int depth;
1: +  long unsigned int func;
1: +  long unsigned int overrun;
1: +  long long unsigned int calltime;
1: +  long long unsigned int rettime;
1: +  int depth;
1:  } __attribute__((packed));
1:  
1:  typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *);
1: @@ -32076,479 +32345,479 @@ typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *);
1:  typedef int (*trace_func_graph_ent_t)(struct ftrace_graph_ent *);
1:  
1:  struct fgraph_ops {
1: -	trace_func_graph_ent_t entryfunc;
1: -	trace_func_graph_ret_t retfunc;
1: +  trace_func_graph_ent_t entryfunc;
1: +  trace_func_graph_ret_t retfunc;
1:  };
1:  
1:  struct ftrace_graph_ent_entry {
1: -	struct trace_entry ent;
1: -	struct ftrace_graph_ent graph_ent;
1: +  struct trace_entry ent;
1: +  struct ftrace_graph_ent graph_ent;
1:  } __attribute__((packed));
1:  
1:  struct ftrace_graph_ret_entry {
1: -	struct trace_entry ent;
1: -	struct ftrace_graph_ret ret;
1: +  struct trace_entry ent;
1: +  struct ftrace_graph_ret ret;
1:  } __attribute__((packed));
1:  
1:  struct fgraph_cpu_data {
1: -	pid_t last_pid;
1: -	int depth;
1: -	int depth_irq;
1: -	int ignore;
1: -	long unsigned int enter_funcs[50];
1: +  pid_t last_pid;
1: +  int depth;
1: +  int depth_irq;
1: +  int ignore;
1: +  long unsigned int enter_funcs[50];
1:  };
1:  
1:  struct fgraph_data {
1: -	struct fgraph_cpu_data *cpu_data;
1: -	struct ftrace_graph_ent_entry ent;
1: -	struct ftrace_graph_ret_entry ret;
1: -	int failed;
1: -	int cpu;
1: +  struct fgraph_cpu_data *cpu_data;
1: +  struct ftrace_graph_ent_entry ent;
1: +  struct ftrace_graph_ret_entry ret;
1: +  int failed;
1: +  int cpu;
1:  } __attribute__((packed));
1:  
1:  enum {
1: -	FLAGS_FILL_FULL = 268435456,
1: -	FLAGS_FILL_START = 536870912,
1: -	FLAGS_FILL_END = 805306368,
1: +  FLAGS_FILL_FULL = 268435456,
1: +  FLAGS_FILL_START = 536870912,
1: +  FLAGS_FILL_END = 805306368,
1:  };
1:  
1:  typedef __u32 blk_mq_req_flags_t;
1:  
1:  enum req_opf {
1: -	REQ_OP_READ = 0,
1: -	REQ_OP_WRITE = 1,
1: -	REQ_OP_FLUSH = 2,
1: -	REQ_OP_DISCARD = 3,
1: -	REQ_OP_SECURE_ERASE = 5,
1: -	REQ_OP_WRITE_SAME = 7,
1: -	REQ_OP_WRITE_ZEROES = 9,
1: -	REQ_OP_ZONE_OPEN = 10,
1: -	REQ_OP_ZONE_CLOSE = 11,
1: -	REQ_OP_ZONE_FINISH = 12,
1: -	REQ_OP_ZONE_APPEND = 13,
1: -	REQ_OP_ZONE_RESET = 15,
1: -	REQ_OP_ZONE_RESET_ALL = 17,
1: -	REQ_OP_SCSI_IN = 32,
1: -	REQ_OP_SCSI_OUT = 33,
1: -	REQ_OP_DRV_IN = 34,
1: -	REQ_OP_DRV_OUT = 35,
1: -	REQ_OP_LAST = 36,
1: +  REQ_OP_READ = 0,
1: +  REQ_OP_WRITE = 1,
1: +  REQ_OP_FLUSH = 2,
1: +  REQ_OP_DISCARD = 3,
1: +  REQ_OP_SECURE_ERASE = 5,
1: +  REQ_OP_WRITE_SAME = 7,
1: +  REQ_OP_WRITE_ZEROES = 9,
1: +  REQ_OP_ZONE_OPEN = 10,
1: +  REQ_OP_ZONE_CLOSE = 11,
1: +  REQ_OP_ZONE_FINISH = 12,
1: +  REQ_OP_ZONE_APPEND = 13,
1: +  REQ_OP_ZONE_RESET = 15,
1: +  REQ_OP_ZONE_RESET_ALL = 17,
1: +  REQ_OP_SCSI_IN = 32,
1: +  REQ_OP_SCSI_OUT = 33,
1: +  REQ_OP_DRV_IN = 34,
1: +  REQ_OP_DRV_OUT = 35,
1: +  REQ_OP_LAST = 36,
1:  };
1:  
1:  enum req_flag_bits {
1: -	__REQ_FAILFAST_DEV = 8,
1: -	__REQ_FAILFAST_TRANSPORT = 9,
1: -	__REQ_FAILFAST_DRIVER = 10,
1: -	__REQ_SYNC = 11,
1: -	__REQ_META = 12,
1: -	__REQ_PRIO = 13,
1: -	__REQ_NOMERGE = 14,
1: -	__REQ_IDLE = 15,
1: -	__REQ_INTEGRITY = 16,
1: -	__REQ_FUA = 17,
1: -	__REQ_PREFLUSH = 18,
1: -	__REQ_RAHEAD = 19,
1: -	__REQ_BACKGROUND = 20,
1: -	__REQ_NOWAIT = 21,
1: -	__REQ_CGROUP_PUNT = 22,
1: -	__REQ_NOUNMAP = 23,
1: -	__REQ_HIPRI = 24,
1: -	__REQ_DRV = 25,
1: -	__REQ_SWAP = 26,
1: -	__REQ_NR_BITS = 27,
1: +  __REQ_FAILFAST_DEV = 8,
1: +  __REQ_FAILFAST_TRANSPORT = 9,
1: +  __REQ_FAILFAST_DRIVER = 10,
1: +  __REQ_SYNC = 11,
1: +  __REQ_META = 12,
1: +  __REQ_PRIO = 13,
1: +  __REQ_NOMERGE = 14,
1: +  __REQ_IDLE = 15,
1: +  __REQ_INTEGRITY = 16,
1: +  __REQ_FUA = 17,
1: +  __REQ_PREFLUSH = 18,
1: +  __REQ_RAHEAD = 19,
1: +  __REQ_BACKGROUND = 20,
1: +  __REQ_NOWAIT = 21,
1: +  __REQ_CGROUP_PUNT = 22,
1: +  __REQ_NOUNMAP = 23,
1: +  __REQ_HIPRI = 24,
1: +  __REQ_DRV = 25,
1: +  __REQ_SWAP = 26,
1: +  __REQ_NR_BITS = 27,
1:  };
1:  
1:  struct disk_stats {
1: -	u64 nsecs[4];
1: -	long unsigned int sectors[4];
1: -	long unsigned int ios[4];
1: -	long unsigned int merges[4];
1: -	long unsigned int io_ticks;
1: -	local_t in_flight[2];
1: +  u64 nsecs[4];
1: +  long unsigned int sectors[4];
1: +  long unsigned int ios[4];
1: +  long unsigned int merges[4];
1: +  long unsigned int io_ticks;
1: +  local_t in_flight[2];
1:  };
1:  
1:  struct blk_mq_ctxs;
1:  
1:  struct blk_mq_ctx {
1: -	struct {
1: -		spinlock_t lock;
1: -		struct list_head rq_lists[3];
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	unsigned int cpu;
1: -	short unsigned int index_hw[3];
1: -	struct blk_mq_hw_ctx *hctxs[3];
1: -	long unsigned int rq_dispatched[2];
1: -	long unsigned int rq_merged;
1: -	long unsigned int rq_completed[2];
1: -	struct request_queue *queue;
1: -	struct blk_mq_ctxs *ctxs;
1: -	struct kobject kobj;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct {
1: +    spinlock_t lock;
1: +    struct list_head rq_lists[3];
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  unsigned int cpu;
1: +  short unsigned int index_hw[3];
1: +  struct blk_mq_hw_ctx *hctxs[3];
1: +  long unsigned int rq_dispatched[2];
1: +  long unsigned int rq_merged;
1: +  long unsigned int rq_completed[2];
1: +  struct request_queue *queue;
1: +  struct blk_mq_ctxs *ctxs;
1: +  struct kobject kobj;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sbitmap_word;
1:  
1:  struct sbitmap {
1: -	unsigned int depth;
1: -	unsigned int shift;
1: -	unsigned int map_nr;
1: -	struct sbitmap_word *map;
1: +  unsigned int depth;
1: +  unsigned int shift;
1: +  unsigned int map_nr;
1: +  struct sbitmap_word *map;
1:  };
1:  
1:  struct blk_mq_tags;
1:  
1:  struct blk_mq_hw_ctx {
1: -	struct {
1: -		spinlock_t lock;
1: -		struct list_head dispatch;
1: -		long unsigned int state;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct delayed_work run_work;
1: -	cpumask_var_t cpumask;
1: -	int next_cpu;
1: -	int next_cpu_batch;
1: -	long unsigned int flags;
1: -	void *sched_data;
1: -	struct request_queue *queue;
1: -	struct blk_flush_queue *fq;
1: -	void *driver_data;
1: -	struct sbitmap ctx_map;
1: -	struct blk_mq_ctx *dispatch_from;
1: -	unsigned int dispatch_busy;
1: -	short unsigned int type;
1: -	short unsigned int nr_ctx;
1: -	struct blk_mq_ctx **ctxs;
1: -	spinlock_t dispatch_wait_lock;
1: -	wait_queue_entry_t dispatch_wait;
1: -	atomic_t wait_index;
1: -	struct blk_mq_tags *tags;
1: -	struct blk_mq_tags *sched_tags;
1: -	long unsigned int queued;
1: -	long unsigned int run;
1: -	long unsigned int dispatched[7];
1: -	unsigned int numa_node;
1: -	unsigned int queue_num;
1: -	atomic_t nr_active;
1: -	atomic_t elevator_queued;
1: -	struct hlist_node cpuhp_online;
1: -	struct hlist_node cpuhp_dead;
1: -	struct kobject kobj;
1: -	long unsigned int poll_considered;
1: -	long unsigned int poll_invoked;
1: -	long unsigned int poll_success;
1: -	struct dentry *debugfs_dir;
1: -	struct dentry *sched_debugfs_dir;
1: -	struct list_head hctx_list;
1: -	struct srcu_struct srcu[0];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct {
1: +    spinlock_t lock;
1: +    struct list_head dispatch;
1: +    long unsigned int state;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct delayed_work run_work;
1: +  cpumask_var_t cpumask;
1: +  int next_cpu;
1: +  int next_cpu_batch;
1: +  long unsigned int flags;
1: +  void *sched_data;
1: +  struct request_queue *queue;
1: +  struct blk_flush_queue *fq;
1: +  void *driver_data;
1: +  struct sbitmap ctx_map;
1: +  struct blk_mq_ctx *dispatch_from;
1: +  unsigned int dispatch_busy;
1: +  short unsigned int type;
1: +  short unsigned int nr_ctx;
1: +  struct blk_mq_ctx **ctxs;
1: +  spinlock_t dispatch_wait_lock;
1: +  wait_queue_entry_t dispatch_wait;
1: +  atomic_t wait_index;
1: +  struct blk_mq_tags *tags;
1: +  struct blk_mq_tags *sched_tags;
1: +  long unsigned int queued;
1: +  long unsigned int run;
1: +  long unsigned int dispatched[7];
1: +  unsigned int numa_node;
1: +  unsigned int queue_num;
1: +  atomic_t nr_active;
1: +  atomic_t elevator_queued;
1: +  struct hlist_node cpuhp_online;
1: +  struct hlist_node cpuhp_dead;
1: +  struct kobject kobj;
1: +  long unsigned int poll_considered;
1: +  long unsigned int poll_invoked;
1: +  long unsigned int poll_success;
1: +  struct dentry *debugfs_dir;
1: +  struct dentry *sched_debugfs_dir;
1: +  struct list_head hctx_list;
1: +  struct srcu_struct srcu[0];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct blk_mq_alloc_data {
1: -	struct request_queue *q;
1: -	blk_mq_req_flags_t flags;
1: -	unsigned int shallow_depth;
1: -	unsigned int cmd_flags;
1: -	struct blk_mq_ctx *ctx;
1: -	struct blk_mq_hw_ctx *hctx;
1: +  struct request_queue *q;
1: +  blk_mq_req_flags_t flags;
1: +  unsigned int shallow_depth;
1: +  unsigned int cmd_flags;
1: +  struct blk_mq_ctx *ctx;
1: +  struct blk_mq_hw_ctx *hctx;
1:  };
1:  
1:  struct blk_stat_callback {
1: -	struct list_head list;
1: -	struct timer_list timer;
1: -	struct blk_rq_stat *cpu_stat;
1: -	int (*bucket_fn)(const struct request *);
1: -	unsigned int buckets;
1: -	struct blk_rq_stat *stat;
1: -	void (*timer_fn)(struct blk_stat_callback *);
1: -	void *data;
1: -	struct callback_head rcu;
1: +  struct list_head list;
1: +  struct timer_list timer;
1: +  struct blk_rq_stat *cpu_stat;
1: +  int (*bucket_fn)(const struct request *);
1: +  unsigned int buckets;
1: +  struct blk_rq_stat *stat;
1: +  void (*timer_fn)(struct blk_stat_callback *);
1: +  void *data;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct blk_trace {
1: -	int trace_state;
1: -	struct rchan *rchan;
1: -	long unsigned int *sequence;
1: -	unsigned char *msg_data;
1: -	u16 act_mask;
1: -	u64 start_lba;
1: -	u64 end_lba;
1: -	u32 pid;
1: -	u32 dev;
1: -	struct dentry *dir;
1: -	struct dentry *dropped_file;
1: -	struct dentry *msg_file;
1: -	struct list_head running_list;
1: -	atomic_t dropped;
1: +  int trace_state;
1: +  struct rchan *rchan;
1: +  long unsigned int *sequence;
1: +  unsigned char *msg_data;
1: +  u16 act_mask;
1: +  u64 start_lba;
1: +  u64 end_lba;
1: +  u32 pid;
1: +  u32 dev;
1: +  struct dentry *dir;
1: +  struct dentry *dropped_file;
1: +  struct dentry *msg_file;
1: +  struct list_head running_list;
1: +  atomic_t dropped;
1:  };
1:  
1:  struct blk_flush_queue {
1: -	unsigned int flush_pending_idx: 1;
1: -	unsigned int flush_running_idx: 1;
1: -	blk_status_t rq_status;
1: -	long unsigned int flush_pending_since;
1: -	struct list_head flush_queue[2];
1: -	struct list_head flush_data_in_flight;
1: -	struct request *flush_rq;
1: -	struct lock_class_key key;
1: -	spinlock_t mq_flush_lock;
1: +  unsigned int flush_pending_idx : 1;
1: +  unsigned int flush_running_idx : 1;
1: +  blk_status_t rq_status;
1: +  long unsigned int flush_pending_since;
1: +  struct list_head flush_queue[2];
1: +  struct list_head flush_data_in_flight;
1: +  struct request *flush_rq;
1: +  struct lock_class_key key;
1: +  spinlock_t mq_flush_lock;
1:  };
1:  
1:  struct blk_mq_queue_map {
1: -	unsigned int *mq_map;
1: -	unsigned int nr_queues;
1: -	unsigned int queue_offset;
1: +  unsigned int *mq_map;
1: +  unsigned int nr_queues;
1: +  unsigned int queue_offset;
1:  };
1:  
1:  struct sbq_wait_state;
1:  
1:  struct sbitmap_queue {
1: -	struct sbitmap sb;
1: -	unsigned int *alloc_hint;
1: -	unsigned int wake_batch;
1: -	atomic_t wake_index;
1: -	struct sbq_wait_state *ws;
1: -	atomic_t ws_active;
1: -	bool round_robin;
1: -	unsigned int min_shallow_depth;
1: +  struct sbitmap sb;
1: +  unsigned int *alloc_hint;
1: +  unsigned int wake_batch;
1: +  atomic_t wake_index;
1: +  struct sbq_wait_state *ws;
1: +  atomic_t ws_active;
1: +  bool round_robin;
1: +  unsigned int min_shallow_depth;
1:  };
1:  
1:  struct blk_mq_tag_set {
1: -	struct blk_mq_queue_map map[3];
1: -	unsigned int nr_maps;
1: -	const struct blk_mq_ops *ops;
1: -	unsigned int nr_hw_queues;
1: -	unsigned int queue_depth;
1: -	unsigned int reserved_tags;
1: -	unsigned int cmd_size;
1: -	int numa_node;
1: -	unsigned int timeout;
1: -	unsigned int flags;
1: -	void *driver_data;
1: -	atomic_t active_queues_shared_sbitmap;
1: -	struct sbitmap_queue __bitmap_tags;
1: -	struct sbitmap_queue __breserved_tags;
1: -	struct blk_mq_tags **tags;
1: -	struct mutex tag_list_lock;
1: -	struct list_head tag_list;
1: +  struct blk_mq_queue_map map[3];
1: +  unsigned int nr_maps;
1: +  const struct blk_mq_ops *ops;
1: +  unsigned int nr_hw_queues;
1: +  unsigned int queue_depth;
1: +  unsigned int reserved_tags;
1: +  unsigned int cmd_size;
1: +  int numa_node;
1: +  unsigned int timeout;
1: +  unsigned int flags;
1: +  void *driver_data;
1: +  atomic_t active_queues_shared_sbitmap;
1: +  struct sbitmap_queue __bitmap_tags;
1: +  struct sbitmap_queue __breserved_tags;
1: +  struct blk_mq_tags **tags;
1: +  struct mutex tag_list_lock;
1: +  struct list_head tag_list;
1:  };
1:  
1:  typedef u64 compat_u64;
1:  
1:  enum blktrace_cat {
1: -	BLK_TC_READ = 1,
1: -	BLK_TC_WRITE = 2,
1: -	BLK_TC_FLUSH = 4,
1: -	BLK_TC_SYNC = 8,
1: -	BLK_TC_SYNCIO = 8,
1: -	BLK_TC_QUEUE = 16,
1: -	BLK_TC_REQUEUE = 32,
1: -	BLK_TC_ISSUE = 64,
1: -	BLK_TC_COMPLETE = 128,
1: -	BLK_TC_FS = 256,
1: -	BLK_TC_PC = 512,
1: -	BLK_TC_NOTIFY = 1024,
1: -	BLK_TC_AHEAD = 2048,
1: -	BLK_TC_META = 4096,
1: -	BLK_TC_DISCARD = 8192,
1: -	BLK_TC_DRV_DATA = 16384,
1: -	BLK_TC_FUA = 32768,
1: -	BLK_TC_END = 32768,
1: +  BLK_TC_READ = 1,
1: +  BLK_TC_WRITE = 2,
1: +  BLK_TC_FLUSH = 4,
1: +  BLK_TC_SYNC = 8,
1: +  BLK_TC_SYNCIO = 8,
1: +  BLK_TC_QUEUE = 16,
1: +  BLK_TC_REQUEUE = 32,
1: +  BLK_TC_ISSUE = 64,
1: +  BLK_TC_COMPLETE = 128,
1: +  BLK_TC_FS = 256,
1: +  BLK_TC_PC = 512,
1: +  BLK_TC_NOTIFY = 1024,
1: +  BLK_TC_AHEAD = 2048,
1: +  BLK_TC_META = 4096,
1: +  BLK_TC_DISCARD = 8192,
1: +  BLK_TC_DRV_DATA = 16384,
1: +  BLK_TC_FUA = 32768,
1: +  BLK_TC_END = 32768,
1:  };
1:  
1:  enum blktrace_act {
1: -	__BLK_TA_QUEUE = 1,
1: -	__BLK_TA_BACKMERGE = 2,
1: -	__BLK_TA_FRONTMERGE = 3,
1: -	__BLK_TA_GETRQ = 4,
1: -	__BLK_TA_SLEEPRQ = 5,
1: -	__BLK_TA_REQUEUE = 6,
1: -	__BLK_TA_ISSUE = 7,
1: -	__BLK_TA_COMPLETE = 8,
1: -	__BLK_TA_PLUG = 9,
1: -	__BLK_TA_UNPLUG_IO = 10,
1: -	__BLK_TA_UNPLUG_TIMER = 11,
1: -	__BLK_TA_INSERT = 12,
1: -	__BLK_TA_SPLIT = 13,
1: -	__BLK_TA_BOUNCE = 14,
1: -	__BLK_TA_REMAP = 15,
1: -	__BLK_TA_ABORT = 16,
1: -	__BLK_TA_DRV_DATA = 17,
1: -	__BLK_TA_CGROUP = 256,
1: +  __BLK_TA_QUEUE = 1,
1: +  __BLK_TA_BACKMERGE = 2,
1: +  __BLK_TA_FRONTMERGE = 3,
1: +  __BLK_TA_GETRQ = 4,
1: +  __BLK_TA_SLEEPRQ = 5,
1: +  __BLK_TA_REQUEUE = 6,
1: +  __BLK_TA_ISSUE = 7,
1: +  __BLK_TA_COMPLETE = 8,
1: +  __BLK_TA_PLUG = 9,
1: +  __BLK_TA_UNPLUG_IO = 10,
1: +  __BLK_TA_UNPLUG_TIMER = 11,
1: +  __BLK_TA_INSERT = 12,
1: +  __BLK_TA_SPLIT = 13,
1: +  __BLK_TA_BOUNCE = 14,
1: +  __BLK_TA_REMAP = 15,
1: +  __BLK_TA_ABORT = 16,
1: +  __BLK_TA_DRV_DATA = 17,
1: +  __BLK_TA_CGROUP = 256,
1:  };
1:  
1:  enum blktrace_notify {
1: -	__BLK_TN_PROCESS = 0,
1: -	__BLK_TN_TIMESTAMP = 1,
1: -	__BLK_TN_MESSAGE = 2,
1: -	__BLK_TN_CGROUP = 256,
1: +  __BLK_TN_PROCESS = 0,
1: +  __BLK_TN_TIMESTAMP = 1,
1: +  __BLK_TN_MESSAGE = 2,
1: +  __BLK_TN_CGROUP = 256,
1:  };
1:  
1:  struct blk_io_trace {
1: -	__u32 magic;
1: -	__u32 sequence;
1: -	__u64 time;
1: -	__u64 sector;
1: -	__u32 bytes;
1: -	__u32 action;
1: -	__u32 pid;
1: -	__u32 device;
1: -	__u32 cpu;
1: -	__u16 error;
1: -	__u16 pdu_len;
1: +  __u32 magic;
1: +  __u32 sequence;
1: +  __u64 time;
1: +  __u64 sector;
1: +  __u32 bytes;
1: +  __u32 action;
1: +  __u32 pid;
1: +  __u32 device;
1: +  __u32 cpu;
1: +  __u16 error;
1: +  __u16 pdu_len;
1:  };
1:  
1:  struct blk_io_trace_remap {
1: -	__be32 device_from;
1: -	__be32 device_to;
1: -	__be64 sector_from;
1: +  __be32 device_from;
1: +  __be32 device_to;
1: +  __be64 sector_from;
1:  };
1:  
1:  enum {
1: -	Blktrace_setup = 1,
1: -	Blktrace_running = 2,
1: -	Blktrace_stopped = 3,
1: +  Blktrace_setup = 1,
1: +  Blktrace_running = 2,
1: +  Blktrace_stopped = 3,
1:  };
1:  
1:  struct blk_user_trace_setup {
1: -	char name[32];
1: -	__u16 act_mask;
1: -	__u32 buf_size;
1: -	__u32 buf_nr;
1: -	__u64 start_lba;
1: -	__u64 end_lba;
1: -	__u32 pid;
1: +  char name[32];
1: +  __u16 act_mask;
1: +  __u32 buf_size;
1: +  __u32 buf_nr;
1: +  __u64 start_lba;
1: +  __u64 end_lba;
1: +  __u32 pid;
1:  };
1:  
1:  struct compat_blk_user_trace_setup {
1: -	char name[32];
1: -	u16 act_mask;
1: -	short: 16;
1: -	u32 buf_size;
1: -	u32 buf_nr;
1: -	compat_u64 start_lba;
1: -	compat_u64 end_lba;
1: -	u32 pid;
1: +  char name[32];
1: +  u16 act_mask;
1: +  short : 16;
1: +  u32 buf_size;
1: +  u32 buf_nr;
1: +  compat_u64 start_lba;
1: +  compat_u64 end_lba;
1: +  u32 pid;
1:  } __attribute__((packed));
1:  
1:  struct sbitmap_word {
1: -	long unsigned int depth;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long unsigned int word;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long unsigned int cleared;
1: -	spinlock_t swap_lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  long unsigned int depth;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long unsigned int word;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long unsigned int cleared;
1: +  spinlock_t swap_lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sbq_wait_state {
1: -	atomic_t wait_cnt;
1: -	wait_queue_head_t wait;
1: -	long: 64;
1: -	long: 64;
1: +  atomic_t wait_cnt;
1: +  wait_queue_head_t wait;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct blk_mq_tags {
1: -	unsigned int nr_tags;
1: -	unsigned int nr_reserved_tags;
1: -	atomic_t active_queues;
1: -	struct sbitmap_queue *bitmap_tags;
1: -	struct sbitmap_queue *breserved_tags;
1: -	struct sbitmap_queue __bitmap_tags;
1: -	struct sbitmap_queue __breserved_tags;
1: -	struct request **rqs;
1: -	struct request **static_rqs;
1: -	struct list_head page_list;
1: +  unsigned int nr_tags;
1: +  unsigned int nr_reserved_tags;
1: +  atomic_t active_queues;
1: +  struct sbitmap_queue *bitmap_tags;
1: +  struct sbitmap_queue *breserved_tags;
1: +  struct sbitmap_queue __bitmap_tags;
1: +  struct sbitmap_queue __breserved_tags;
1: +  struct request **rqs;
1: +  struct request **static_rqs;
1: +  struct list_head page_list;
1:  };
1:  
1:  struct blk_mq_queue_data {
1: -	struct request *rq;
1: -	bool last;
1: +  struct request *rq;
1: +  bool last;
1:  };
1:  
1:  struct blk_mq_ctxs {
1: -	struct kobject kobj;
1: -	struct blk_mq_ctx *queue_ctx;
1: +  struct kobject kobj;
1: +  struct blk_mq_ctx *queue_ctx;
1:  };
1:  
1:  typedef void blk_log_action_t(struct trace_iterator *, const char *, bool);
1:  
1:  struct ftrace_event_field {
1: -	struct list_head link;
1: -	const char *name;
1: -	const char *type;
1: -	int filter_type;
1: -	int offset;
1: -	int size;
1: -	int is_signed;
1: +  struct list_head link;
1: +  const char *name;
1: +  const char *type;
1: +  int filter_type;
1: +  int offset;
1: +  int size;
1: +  int is_signed;
1:  };
1:  
1:  enum {
1: -	FORMAT_HEADER = 1,
1: -	FORMAT_FIELD_SEPERATOR = 2,
1: -	FORMAT_PRINTFMT = 3,
1: +  FORMAT_HEADER = 1,
1: +  FORMAT_FIELD_SEPERATOR = 2,
1: +  FORMAT_PRINTFMT = 3,
1:  };
1:  
1:  struct event_probe_data {
1: -	struct trace_event_file *file;
1: -	long unsigned int count;
1: -	int ref;
1: -	bool enable;
1: +  struct trace_event_file *file;
1: +  long unsigned int count;
1: +  int ref;
1: +  bool enable;
1:  };
1:  
1:  struct syscall_trace_enter {
1: -	struct trace_entry ent;
1: -	int nr;
1: -	long unsigned int args[0];
1: +  struct trace_entry ent;
1: +  int nr;
1: +  long unsigned int args[0];
1:  };
1:  
1:  struct syscall_trace_exit {
1: -	struct trace_entry ent;
1: -	int nr;
1: -	long int ret;
1: +  struct trace_entry ent;
1: +  int nr;
1: +  long int ret;
1:  };
1:  
1:  struct syscall_tp_t {
1: -	long long unsigned int regs;
1: -	long unsigned int syscall_nr;
1: -	long unsigned int ret;
1: +  long long unsigned int regs;
1: +  long unsigned int syscall_nr;
1: +  long unsigned int ret;
1:  };
1:  
1:  struct syscall_tp_t___2 {
1: -	long long unsigned int regs;
1: -	long unsigned int syscall_nr;
1: -	long unsigned int args[6];
1: +  long long unsigned int regs;
1: +  long unsigned int syscall_nr;
1: +  long unsigned int args[6];
1:  };
1:  
1:  typedef long unsigned int perf_trace_t[256];
1: @@ -32556,9 +32825,9 @@ typedef long unsigned int perf_trace_t[256];
1:  struct filter_pred;
1:  
1:  struct prog_entry {
1: -	int target;
1: -	int when_to_branch;
1: -	struct filter_pred *pred;
1: +  int target;
1: +  int when_to_branch;
1: +  struct filter_pred *pred;
1:  };
1:  
1:  typedef int (*filter_pred_fn_t)(struct filter_pred *, void *);
1: @@ -32568,84 +32837,86 @@ struct regex;
1:  typedef int (*regex_match_func)(char *, struct regex *, int);
1:  
1:  struct regex {
1: -	char pattern[256];
1: -	int len;
1: -	int field_len;
1: -	regex_match_func match;
1: +  char pattern[256];
1: +  int len;
1: +  int field_len;
1: +  regex_match_func match;
1:  };
1:  
1:  struct filter_pred {
1: -	filter_pred_fn_t fn;
1: -	u64 val;
1: -	struct regex regex;
1: -	short unsigned int *ops;
1: -	struct ftrace_event_field *field;
1: -	int offset;
1: -	int not;
1: -	int op;
1: +  filter_pred_fn_t fn;
1: +  u64 val;
1: +  struct regex regex;
1: +  short unsigned int *ops;
1: +  struct ftrace_event_field *field;
1: +  int offset;
1: +  int not;
1: +  int op;
1:  };
1:  
1:  enum filter_op_ids {
1: -	OP_GLOB = 0,
1: -	OP_NE = 1,
1: -	OP_EQ = 2,
1: -	OP_LE = 3,
1: -	OP_LT = 4,
1: -	OP_GE = 5,
1: -	OP_GT = 6,
1: -	OP_BAND = 7,
1: -	OP_MAX = 8,
1: -};
1: -
1: -enum {
1: -	FILT_ERR_NONE = 0,
1: -	FILT_ERR_INVALID_OP = 1,
1: -	FILT_ERR_TOO_MANY_OPEN = 2,
1: -	FILT_ERR_TOO_MANY_CLOSE = 3,
1: -	FILT_ERR_MISSING_QUOTE = 4,
1: -	FILT_ERR_OPERAND_TOO_LONG = 5,
1: -	FILT_ERR_EXPECT_STRING = 6,
1: -	FILT_ERR_EXPECT_DIGIT = 7,
1: -	FILT_ERR_ILLEGAL_FIELD_OP = 8,
1: -	FILT_ERR_FIELD_NOT_FOUND = 9,
1: -	FILT_ERR_ILLEGAL_INTVAL = 10,
1: -	FILT_ERR_BAD_SUBSYS_FILTER = 11,
1: -	FILT_ERR_TOO_MANY_PREDS = 12,
1: -	FILT_ERR_INVALID_FILTER = 13,
1: -	FILT_ERR_IP_FIELD_ONLY = 14,
1: -	FILT_ERR_INVALID_VALUE = 15,
1: -	FILT_ERR_ERRNO = 16,
1: -	FILT_ERR_NO_FILTER = 17,
1: +  OP_GLOB = 0,
1: +  OP_NE = 1,
1: +  OP_EQ = 2,
1: +  OP_LE = 3,
1: +  OP_LT = 4,
1: +  OP_GE = 5,
1: +  OP_GT = 6,
1: +  OP_BAND = 7,
1: +  OP_MAX = 8,
1: +};
1: +
1: +enum {
1: +  FILT_ERR_NONE = 0,
1: +  FILT_ERR_INVALID_OP = 1,
1: +  FILT_ERR_TOO_MANY_OPEN = 2,
1: +  FILT_ERR_TOO_MANY_CLOSE = 3,
1: +  FILT_ERR_MISSING_QUOTE = 4,
1: +  FILT_ERR_OPERAND_TOO_LONG = 5,
1: +  FILT_ERR_EXPECT_STRING = 6,
1: +  FILT_ERR_EXPECT_DIGIT = 7,
1: +  FILT_ERR_ILLEGAL_FIELD_OP = 8,
1: +  FILT_ERR_FIELD_NOT_FOUND = 9,
1: +  FILT_ERR_ILLEGAL_INTVAL = 10,
1: +  FILT_ERR_BAD_SUBSYS_FILTER = 11,
1: +  FILT_ERR_TOO_MANY_PREDS = 12,
1: +  FILT_ERR_INVALID_FILTER = 13,
1: +  FILT_ERR_IP_FIELD_ONLY = 14,
1: +  FILT_ERR_INVALID_VALUE = 15,
1: +  FILT_ERR_ERRNO = 16,
1: +  FILT_ERR_NO_FILTER = 17,
1:  };
1:  
1:  struct filter_parse_error {
1: -	int lasterr;
1: -	int lasterr_pos;
1: +  int lasterr;
1: +  int lasterr_pos;
1:  };
1:  
1: -typedef int (*parse_pred_fn)(const char *, void *, int, struct filter_parse_error *, struct filter_pred **);
1: +typedef int (*parse_pred_fn)(const char *, void *, int,
1: +                             struct filter_parse_error *,
1: +                             struct filter_pred **);
1:  
1:  enum {
1: -	INVERT = 1,
1: -	PROCESS_AND = 2,
1: -	PROCESS_OR = 4,
1: +  INVERT = 1,
1: +  PROCESS_AND = 2,
1: +  PROCESS_OR = 4,
1:  };
1:  
1:  enum {
1: -	TOO_MANY_CLOSE = 4294967295,
1: -	TOO_MANY_OPEN = 4294967294,
1: -	MISSING_QUOTE = 4294967293,
1: +  TOO_MANY_CLOSE = 4294967295,
1: +  TOO_MANY_OPEN = 4294967294,
1: +  MISSING_QUOTE = 4294967293,
1:  };
1:  
1:  struct filter_list {
1: -	struct list_head list;
1: -	struct event_filter *filter;
1: +  struct list_head list;
1: +  struct event_filter *filter;
1:  };
1:  
1:  struct function_filter_data {
1: -	struct ftrace_ops *ops;
1: -	int first_filter;
1: -	int first_notrace;
1: +  struct ftrace_ops *ops;
1: +  int first_filter;
1: +  int first_notrace;
1:  };
1:  
1:  struct event_trigger_ops;
1: @@ -32653,447 +32924,460 @@ struct event_trigger_ops;
1:  struct event_command;
1:  
1:  struct event_trigger_data {
1: -	long unsigned int count;
1: -	int ref;
1: -	struct event_trigger_ops *ops;
1: -	struct event_command *cmd_ops;
1: -	struct event_filter *filter;
1: -	char *filter_str;
1: -	void *private_data;
1: -	bool paused;
1: -	bool paused_tmp;
1: -	struct list_head list;
1: -	char *name;
1: -	struct list_head named_list;
1: -	struct event_trigger_data *named_data;
1: +  long unsigned int count;
1: +  int ref;
1: +  struct event_trigger_ops *ops;
1: +  struct event_command *cmd_ops;
1: +  struct event_filter *filter;
1: +  char *filter_str;
1: +  void *private_data;
1: +  bool paused;
1: +  bool paused_tmp;
1: +  struct list_head list;
1: +  char *name;
1: +  struct list_head named_list;
1: +  struct event_trigger_data *named_data;
1:  };
1:  
1:  struct event_trigger_ops {
1: -	void (*func)(struct event_trigger_data *, void *, struct ring_buffer_event *);
1: -	int (*init)(struct event_trigger_ops *, struct event_trigger_data *);
1: -	void (*free)(struct event_trigger_ops *, struct event_trigger_data *);
1: -	int (*print)(struct seq_file *, struct event_trigger_ops *, struct event_trigger_data *);
1: +  void (*func)(struct event_trigger_data *, void *, struct ring_buffer_event *);
1: +  int (*init)(struct event_trigger_ops *, struct event_trigger_data *);
1: +  void (*free)(struct event_trigger_ops *, struct event_trigger_data *);
1: +  int (*print)(struct seq_file *, struct event_trigger_ops *,
1: +               struct event_trigger_data *);
1:  };
1:  
1:  struct event_command {
1: -	struct list_head list;
1: -	char *name;
1: -	enum event_trigger_type trigger_type;
1: -	int flags;
1: -	int (*func)(struct event_command *, struct trace_event_file *, char *, char *, char *);
1: -	int (*reg)(char *, struct event_trigger_ops *, struct event_trigger_data *, struct trace_event_file *);
1: -	void (*unreg)(char *, struct event_trigger_ops *, struct event_trigger_data *, struct trace_event_file *);
1: -	void (*unreg_all)(struct trace_event_file *);
1: -	int (*set_filter)(char *, struct event_trigger_data *, struct trace_event_file *);
1: -	struct event_trigger_ops * (*get_trigger_ops)(char *, char *);
1: +  struct list_head list;
1: +  char *name;
1: +  enum event_trigger_type trigger_type;
1: +  int flags;
1: +  int (*func)(struct event_command *, struct trace_event_file *, char *, char *,
1: +              char *);
1: +  int (*reg)(char *, struct event_trigger_ops *, struct event_trigger_data *,
1: +             struct trace_event_file *);
1: +  void (*unreg)(char *, struct event_trigger_ops *, struct event_trigger_data *,
1: +                struct trace_event_file *);
1: +  void (*unreg_all)(struct trace_event_file *);
1: +  int (*set_filter)(char *, struct event_trigger_data *,
1: +                    struct trace_event_file *);
1: +  struct event_trigger_ops *(*get_trigger_ops)(char *, char *);
1:  };
1:  
1:  struct enable_trigger_data {
1: -	struct trace_event_file *file;
1: -	bool enable;
1: -	bool hist;
1: +  struct trace_event_file *file;
1: +  bool enable;
1: +  bool hist;
1:  };
1:  
1:  enum event_command_flags {
1: -	EVENT_CMD_FL_POST_TRIGGER = 1,
1: -	EVENT_CMD_FL_NEEDS_REC = 2,
1: +  EVENT_CMD_FL_POST_TRIGGER = 1,
1: +  EVENT_CMD_FL_NEEDS_REC = 2,
1:  };
1:  
1:  enum bpf_func_id {
1: -	BPF_FUNC_unspec = 0,
1: -	BPF_FUNC_map_lookup_elem = 1,
1: -	BPF_FUNC_map_update_elem = 2,
1: -	BPF_FUNC_map_delete_elem = 3,
1: -	BPF_FUNC_probe_read = 4,
1: -	BPF_FUNC_ktime_get_ns = 5,
1: -	BPF_FUNC_trace_printk = 6,
1: -	BPF_FUNC_get_prandom_u32 = 7,
1: -	BPF_FUNC_get_smp_processor_id = 8,
1: -	BPF_FUNC_skb_store_bytes = 9,
1: -	BPF_FUNC_l3_csum_replace = 10,
1: -	BPF_FUNC_l4_csum_replace = 11,
1: -	BPF_FUNC_tail_call = 12,
1: -	BPF_FUNC_clone_redirect = 13,
1: -	BPF_FUNC_get_current_pid_tgid = 14,
1: -	BPF_FUNC_get_current_uid_gid = 15,
1: -	BPF_FUNC_get_current_comm = 16,
1: -	BPF_FUNC_get_cgroup_classid = 17,
1: -	BPF_FUNC_skb_vlan_push = 18,
1: -	BPF_FUNC_skb_vlan_pop = 19,
1: -	BPF_FUNC_skb_get_tunnel_key = 20,
1: -	BPF_FUNC_skb_set_tunnel_key = 21,
1: -	BPF_FUNC_perf_event_read = 22,
1: -	BPF_FUNC_redirect = 23,
1: -	BPF_FUNC_get_route_realm = 24,
1: -	BPF_FUNC_perf_event_output = 25,
1: -	BPF_FUNC_skb_load_bytes = 26,
1: -	BPF_FUNC_get_stackid = 27,
1: -	BPF_FUNC_csum_diff = 28,
1: -	BPF_FUNC_skb_get_tunnel_opt = 29,
1: -	BPF_FUNC_skb_set_tunnel_opt = 30,
1: -	BPF_FUNC_skb_change_proto = 31,
1: -	BPF_FUNC_skb_change_type = 32,
1: -	BPF_FUNC_skb_under_cgroup = 33,
1: -	BPF_FUNC_get_hash_recalc = 34,
1: -	BPF_FUNC_get_current_task = 35,
1: -	BPF_FUNC_probe_write_user = 36,
1: -	BPF_FUNC_current_task_under_cgroup = 37,
1: -	BPF_FUNC_skb_change_tail = 38,
1: -	BPF_FUNC_skb_pull_data = 39,
1: -	BPF_FUNC_csum_update = 40,
1: -	BPF_FUNC_set_hash_invalid = 41,
1: -	BPF_FUNC_get_numa_node_id = 42,
1: -	BPF_FUNC_skb_change_head = 43,
1: -	BPF_FUNC_xdp_adjust_head = 44,
1: -	BPF_FUNC_probe_read_str = 45,
1: -	BPF_FUNC_get_socket_cookie = 46,
1: -	BPF_FUNC_get_socket_uid = 47,
1: -	BPF_FUNC_set_hash = 48,
1: -	BPF_FUNC_setsockopt = 49,
1: -	BPF_FUNC_skb_adjust_room = 50,
1: -	BPF_FUNC_redirect_map = 51,
1: -	BPF_FUNC_sk_redirect_map = 52,
1: -	BPF_FUNC_sock_map_update = 53,
1: -	BPF_FUNC_xdp_adjust_meta = 54,
1: -	BPF_FUNC_perf_event_read_value = 55,
1: -	BPF_FUNC_perf_prog_read_value = 56,
1: -	BPF_FUNC_getsockopt = 57,
1: -	BPF_FUNC_override_return = 58,
1: -	BPF_FUNC_sock_ops_cb_flags_set = 59,
1: -	BPF_FUNC_msg_redirect_map = 60,
1: -	BPF_FUNC_msg_apply_bytes = 61,
1: -	BPF_FUNC_msg_cork_bytes = 62,
1: -	BPF_FUNC_msg_pull_data = 63,
1: -	BPF_FUNC_bind = 64,
1: -	BPF_FUNC_xdp_adjust_tail = 65,
1: -	BPF_FUNC_skb_get_xfrm_state = 66,
1: -	BPF_FUNC_get_stack = 67,
1: -	BPF_FUNC_skb_load_bytes_relative = 68,
1: -	BPF_FUNC_fib_lookup = 69,
1: -	BPF_FUNC_sock_hash_update = 70,
1: -	BPF_FUNC_msg_redirect_hash = 71,
1: -	BPF_FUNC_sk_redirect_hash = 72,
1: -	BPF_FUNC_lwt_push_encap = 73,
1: -	BPF_FUNC_lwt_seg6_store_bytes = 74,
1: -	BPF_FUNC_lwt_seg6_adjust_srh = 75,
1: -	BPF_FUNC_lwt_seg6_action = 76,
1: -	BPF_FUNC_rc_repeat = 77,
1: -	BPF_FUNC_rc_keydown = 78,
1: -	BPF_FUNC_skb_cgroup_id = 79,
1: -	BPF_FUNC_get_current_cgroup_id = 80,
1: -	BPF_FUNC_get_local_storage = 81,
1: -	BPF_FUNC_sk_select_reuseport = 82,
1: -	BPF_FUNC_skb_ancestor_cgroup_id = 83,
1: -	BPF_FUNC_sk_lookup_tcp = 84,
1: -	BPF_FUNC_sk_lookup_udp = 85,
1: -	BPF_FUNC_sk_release = 86,
1: -	BPF_FUNC_map_push_elem = 87,
1: -	BPF_FUNC_map_pop_elem = 88,
1: -	BPF_FUNC_map_peek_elem = 89,
1: -	BPF_FUNC_msg_push_data = 90,
1: -	BPF_FUNC_msg_pop_data = 91,
1: -	BPF_FUNC_rc_pointer_rel = 92,
1: -	BPF_FUNC_spin_lock = 93,
1: -	BPF_FUNC_spin_unlock = 94,
1: -	BPF_FUNC_sk_fullsock = 95,
1: -	BPF_FUNC_tcp_sock = 96,
1: -	BPF_FUNC_skb_ecn_set_ce = 97,
1: -	BPF_FUNC_get_listener_sock = 98,
1: -	BPF_FUNC_skc_lookup_tcp = 99,
1: -	BPF_FUNC_tcp_check_syncookie = 100,
1: -	BPF_FUNC_sysctl_get_name = 101,
1: -	BPF_FUNC_sysctl_get_current_value = 102,
1: -	BPF_FUNC_sysctl_get_new_value = 103,
1: -	BPF_FUNC_sysctl_set_new_value = 104,
1: -	BPF_FUNC_strtol = 105,
1: -	BPF_FUNC_strtoul = 106,
1: -	BPF_FUNC_sk_storage_get = 107,
1: -	BPF_FUNC_sk_storage_delete = 108,
1: -	BPF_FUNC_send_signal = 109,
1: -	BPF_FUNC_tcp_gen_syncookie = 110,
1: -	BPF_FUNC_skb_output = 111,
1: -	BPF_FUNC_probe_read_user = 112,
1: -	BPF_FUNC_probe_read_kernel = 113,
1: -	BPF_FUNC_probe_read_user_str = 114,
1: -	BPF_FUNC_probe_read_kernel_str = 115,
1: -	BPF_FUNC_tcp_send_ack = 116,
1: -	BPF_FUNC_send_signal_thread = 117,
1: -	BPF_FUNC_jiffies64 = 118,
1: -	BPF_FUNC_read_branch_records = 119,
1: -	BPF_FUNC_get_ns_current_pid_tgid = 120,
1: -	BPF_FUNC_xdp_output = 121,
1: -	BPF_FUNC_get_netns_cookie = 122,
1: -	BPF_FUNC_get_current_ancestor_cgroup_id = 123,
1: -	BPF_FUNC_sk_assign = 124,
1: -	BPF_FUNC_ktime_get_boot_ns = 125,
1: -	BPF_FUNC_seq_printf = 126,
1: -	BPF_FUNC_seq_write = 127,
1: -	BPF_FUNC_sk_cgroup_id = 128,
1: -	BPF_FUNC_sk_ancestor_cgroup_id = 129,
1: -	BPF_FUNC_ringbuf_output = 130,
1: -	BPF_FUNC_ringbuf_reserve = 131,
1: -	BPF_FUNC_ringbuf_submit = 132,
1: -	BPF_FUNC_ringbuf_discard = 133,
1: -	BPF_FUNC_ringbuf_query = 134,
1: -	BPF_FUNC_csum_level = 135,
1: -	BPF_FUNC_skc_to_tcp6_sock = 136,
1: -	BPF_FUNC_skc_to_tcp_sock = 137,
1: -	BPF_FUNC_skc_to_tcp_timewait_sock = 138,
1: -	BPF_FUNC_skc_to_tcp_request_sock = 139,
1: -	BPF_FUNC_skc_to_udp6_sock = 140,
1: -	BPF_FUNC_get_task_stack = 141,
1: -	BPF_FUNC_load_hdr_opt = 142,
1: -	BPF_FUNC_store_hdr_opt = 143,
1: -	BPF_FUNC_reserve_hdr_opt = 144,
1: -	BPF_FUNC_inode_storage_get = 145,
1: -	BPF_FUNC_inode_storage_delete = 146,
1: -	BPF_FUNC_d_path = 147,
1: -	BPF_FUNC_copy_from_user = 148,
1: -	BPF_FUNC_snprintf_btf = 149,
1: -	BPF_FUNC_seq_printf_btf = 150,
1: -	BPF_FUNC_skb_cgroup_classid = 151,
1: -	BPF_FUNC_redirect_neigh = 152,
1: -	BPF_FUNC_bpf_per_cpu_ptr = 153,
1: -	BPF_FUNC_bpf_this_cpu_ptr = 154,
1: -	BPF_FUNC_redirect_peer = 155,
1: -	BPF_FUNC_task_storage_get = 156,
1: -	BPF_FUNC_task_storage_delete = 157,
1: -	BPF_FUNC_get_current_task_btf = 158,
1: -	BPF_FUNC_bprm_opts_set = 159,
1: -	BPF_FUNC_ktime_get_coarse_ns = 160,
1: -	BPF_FUNC_ima_inode_hash = 161,
1: -	__BPF_FUNC_MAX_ID = 162,
1: -};
1: -
1: -enum {
1: -	BPF_F_INDEX_MASK = 4294967295,
1: -	BPF_F_CURRENT_CPU = 4294967295,
1: -	BPF_F_CTXLEN_MASK = 0,
1: -};
1: -
1: -enum {
1: -	BPF_F_GET_BRANCH_RECORDS_SIZE = 1,
1: +  BPF_FUNC_unspec = 0,
1: +  BPF_FUNC_map_lookup_elem = 1,
1: +  BPF_FUNC_map_update_elem = 2,
1: +  BPF_FUNC_map_delete_elem = 3,
1: +  BPF_FUNC_probe_read = 4,
1: +  BPF_FUNC_ktime_get_ns = 5,
1: +  BPF_FUNC_trace_printk = 6,
1: +  BPF_FUNC_get_prandom_u32 = 7,
1: +  BPF_FUNC_get_smp_processor_id = 8,
1: +  BPF_FUNC_skb_store_bytes = 9,
1: +  BPF_FUNC_l3_csum_replace = 10,
1: +  BPF_FUNC_l4_csum_replace = 11,
1: +  BPF_FUNC_tail_call = 12,
1: +  BPF_FUNC_clone_redirect = 13,
1: +  BPF_FUNC_get_current_pid_tgid = 14,
1: +  BPF_FUNC_get_current_uid_gid = 15,
1: +  BPF_FUNC_get_current_comm = 16,
1: +  BPF_FUNC_get_cgroup_classid = 17,
1: +  BPF_FUNC_skb_vlan_push = 18,
1: +  BPF_FUNC_skb_vlan_pop = 19,
1: +  BPF_FUNC_skb_get_tunnel_key = 20,
1: +  BPF_FUNC_skb_set_tunnel_key = 21,
1: +  BPF_FUNC_perf_event_read = 22,
1: +  BPF_FUNC_redirect = 23,
1: +  BPF_FUNC_get_route_realm = 24,
1: +  BPF_FUNC_perf_event_output = 25,
1: +  BPF_FUNC_skb_load_bytes = 26,
1: +  BPF_FUNC_get_stackid = 27,
1: +  BPF_FUNC_csum_diff = 28,
1: +  BPF_FUNC_skb_get_tunnel_opt = 29,
1: +  BPF_FUNC_skb_set_tunnel_opt = 30,
1: +  BPF_FUNC_skb_change_proto = 31,
1: +  BPF_FUNC_skb_change_type = 32,
1: +  BPF_FUNC_skb_under_cgroup = 33,
1: +  BPF_FUNC_get_hash_recalc = 34,
1: +  BPF_FUNC_get_current_task = 35,
1: +  BPF_FUNC_probe_write_user = 36,
1: +  BPF_FUNC_current_task_under_cgroup = 37,
1: +  BPF_FUNC_skb_change_tail = 38,
1: +  BPF_FUNC_skb_pull_data = 39,
1: +  BPF_FUNC_csum_update = 40,
1: +  BPF_FUNC_set_hash_invalid = 41,
1: +  BPF_FUNC_get_numa_node_id = 42,
1: +  BPF_FUNC_skb_change_head = 43,
1: +  BPF_FUNC_xdp_adjust_head = 44,
1: +  BPF_FUNC_probe_read_str = 45,
1: +  BPF_FUNC_get_socket_cookie = 46,
1: +  BPF_FUNC_get_socket_uid = 47,
1: +  BPF_FUNC_set_hash = 48,
1: +  BPF_FUNC_setsockopt = 49,
1: +  BPF_FUNC_skb_adjust_room = 50,
1: +  BPF_FUNC_redirect_map = 51,
1: +  BPF_FUNC_sk_redirect_map = 52,
1: +  BPF_FUNC_sock_map_update = 53,
1: +  BPF_FUNC_xdp_adjust_meta = 54,
1: +  BPF_FUNC_perf_event_read_value = 55,
1: +  BPF_FUNC_perf_prog_read_value = 56,
1: +  BPF_FUNC_getsockopt = 57,
1: +  BPF_FUNC_override_return = 58,
1: +  BPF_FUNC_sock_ops_cb_flags_set = 59,
1: +  BPF_FUNC_msg_redirect_map = 60,
1: +  BPF_FUNC_msg_apply_bytes = 61,
1: +  BPF_FUNC_msg_cork_bytes = 62,
1: +  BPF_FUNC_msg_pull_data = 63,
1: +  BPF_FUNC_bind = 64,
1: +  BPF_FUNC_xdp_adjust_tail = 65,
1: +  BPF_FUNC_skb_get_xfrm_state = 66,
1: +  BPF_FUNC_get_stack = 67,
1: +  BPF_FUNC_skb_load_bytes_relative = 68,
1: +  BPF_FUNC_fib_lookup = 69,
1: +  BPF_FUNC_sock_hash_update = 70,
1: +  BPF_FUNC_msg_redirect_hash = 71,
1: +  BPF_FUNC_sk_redirect_hash = 72,
1: +  BPF_FUNC_lwt_push_encap = 73,
1: +  BPF_FUNC_lwt_seg6_store_bytes = 74,
1: +  BPF_FUNC_lwt_seg6_adjust_srh = 75,
1: +  BPF_FUNC_lwt_seg6_action = 76,
1: +  BPF_FUNC_rc_repeat = 77,
1: +  BPF_FUNC_rc_keydown = 78,
1: +  BPF_FUNC_skb_cgroup_id = 79,
1: +  BPF_FUNC_get_current_cgroup_id = 80,
1: +  BPF_FUNC_get_local_storage = 81,
1: +  BPF_FUNC_sk_select_reuseport = 82,
1: +  BPF_FUNC_skb_ancestor_cgroup_id = 83,
1: +  BPF_FUNC_sk_lookup_tcp = 84,
1: +  BPF_FUNC_sk_lookup_udp = 85,
1: +  BPF_FUNC_sk_release = 86,
1: +  BPF_FUNC_map_push_elem = 87,
1: +  BPF_FUNC_map_pop_elem = 88,
1: +  BPF_FUNC_map_peek_elem = 89,
1: +  BPF_FUNC_msg_push_data = 90,
1: +  BPF_FUNC_msg_pop_data = 91,
1: +  BPF_FUNC_rc_pointer_rel = 92,
1: +  BPF_FUNC_spin_lock = 93,
1: +  BPF_FUNC_spin_unlock = 94,
1: +  BPF_FUNC_sk_fullsock = 95,
1: +  BPF_FUNC_tcp_sock = 96,
1: +  BPF_FUNC_skb_ecn_set_ce = 97,
1: +  BPF_FUNC_get_listener_sock = 98,
1: +  BPF_FUNC_skc_lookup_tcp = 99,
1: +  BPF_FUNC_tcp_check_syncookie = 100,
1: +  BPF_FUNC_sysctl_get_name = 101,
1: +  BPF_FUNC_sysctl_get_current_value = 102,
1: +  BPF_FUNC_sysctl_get_new_value = 103,
1: +  BPF_FUNC_sysctl_set_new_value = 104,
1: +  BPF_FUNC_strtol = 105,
1: +  BPF_FUNC_strtoul = 106,
1: +  BPF_FUNC_sk_storage_get = 107,
1: +  BPF_FUNC_sk_storage_delete = 108,
1: +  BPF_FUNC_send_signal = 109,
1: +  BPF_FUNC_tcp_gen_syncookie = 110,
1: +  BPF_FUNC_skb_output = 111,
1: +  BPF_FUNC_probe_read_user = 112,
1: +  BPF_FUNC_probe_read_kernel = 113,
1: +  BPF_FUNC_probe_read_user_str = 114,
1: +  BPF_FUNC_probe_read_kernel_str = 115,
1: +  BPF_FUNC_tcp_send_ack = 116,
1: +  BPF_FUNC_send_signal_thread = 117,
1: +  BPF_FUNC_jiffies64 = 118,
1: +  BPF_FUNC_read_branch_records = 119,
1: +  BPF_FUNC_get_ns_current_pid_tgid = 120,
1: +  BPF_FUNC_xdp_output = 121,
1: +  BPF_FUNC_get_netns_cookie = 122,
1: +  BPF_FUNC_get_current_ancestor_cgroup_id = 123,
1: +  BPF_FUNC_sk_assign = 124,
1: +  BPF_FUNC_ktime_get_boot_ns = 125,
1: +  BPF_FUNC_seq_printf = 126,
1: +  BPF_FUNC_seq_write = 127,
1: +  BPF_FUNC_sk_cgroup_id = 128,
1: +  BPF_FUNC_sk_ancestor_cgroup_id = 129,
1: +  BPF_FUNC_ringbuf_output = 130,
1: +  BPF_FUNC_ringbuf_reserve = 131,
1: +  BPF_FUNC_ringbuf_submit = 132,
1: +  BPF_FUNC_ringbuf_discard = 133,
1: +  BPF_FUNC_ringbuf_query = 134,
1: +  BPF_FUNC_csum_level = 135,
1: +  BPF_FUNC_skc_to_tcp6_sock = 136,
1: +  BPF_FUNC_skc_to_tcp_sock = 137,
1: +  BPF_FUNC_skc_to_tcp_timewait_sock = 138,
1: +  BPF_FUNC_skc_to_tcp_request_sock = 139,
1: +  BPF_FUNC_skc_to_udp6_sock = 140,
1: +  BPF_FUNC_get_task_stack = 141,
1: +  BPF_FUNC_load_hdr_opt = 142,
1: +  BPF_FUNC_store_hdr_opt = 143,
1: +  BPF_FUNC_reserve_hdr_opt = 144,
1: +  BPF_FUNC_inode_storage_get = 145,
1: +  BPF_FUNC_inode_storage_delete = 146,
1: +  BPF_FUNC_d_path = 147,
1: +  BPF_FUNC_copy_from_user = 148,
1: +  BPF_FUNC_snprintf_btf = 149,
1: +  BPF_FUNC_seq_printf_btf = 150,
1: +  BPF_FUNC_skb_cgroup_classid = 151,
1: +  BPF_FUNC_redirect_neigh = 152,
1: +  BPF_FUNC_bpf_per_cpu_ptr = 153,
1: +  BPF_FUNC_bpf_this_cpu_ptr = 154,
1: +  BPF_FUNC_redirect_peer = 155,
1: +  BPF_FUNC_task_storage_get = 156,
1: +  BPF_FUNC_task_storage_delete = 157,
1: +  BPF_FUNC_get_current_task_btf = 158,
1: +  BPF_FUNC_bprm_opts_set = 159,
1: +  BPF_FUNC_ktime_get_coarse_ns = 160,
1: +  BPF_FUNC_ima_inode_hash = 161,
1: +  __BPF_FUNC_MAX_ID = 162,
1: +};
1: +
1: +enum {
1: +  BPF_F_INDEX_MASK = 4294967295,
1: +  BPF_F_CURRENT_CPU = 4294967295,
1: +  BPF_F_CTXLEN_MASK = 0,
1: +};
1: +
1: +enum {
1: +  BPF_F_GET_BRANCH_RECORDS_SIZE = 1,
1:  };
1:  
1:  struct bpf_perf_event_value {
1: -	__u64 counter;
1: -	__u64 enabled;
1: -	__u64 running;
1: +  __u64 counter;
1: +  __u64 enabled;
1: +  __u64 running;
1:  };
1:  
1:  struct bpf_raw_tracepoint_args {
1: -	__u64 args[0];
1: +  __u64 args[0];
1:  };
1:  
1:  enum bpf_task_fd_type {
1: -	BPF_FD_TYPE_RAW_TRACEPOINT = 0,
1: -	BPF_FD_TYPE_TRACEPOINT = 1,
1: -	BPF_FD_TYPE_KPROBE = 2,
1: -	BPF_FD_TYPE_KRETPROBE = 3,
1: -	BPF_FD_TYPE_UPROBE = 4,
1: -	BPF_FD_TYPE_URETPROBE = 5,
1: +  BPF_FD_TYPE_RAW_TRACEPOINT = 0,
1: +  BPF_FD_TYPE_TRACEPOINT = 1,
1: +  BPF_FD_TYPE_KPROBE = 2,
1: +  BPF_FD_TYPE_KRETPROBE = 3,
1: +  BPF_FD_TYPE_UPROBE = 4,
1: +  BPF_FD_TYPE_URETPROBE = 5,
1:  };
1:  
1:  struct btf_ptr {
1: -	void *ptr;
1: -	__u32 type_id;
1: -	__u32 flags;
1: +  void *ptr;
1: +  __u32 type_id;
1: +  __u32 flags;
1:  };
1:  
1:  enum {
1: -	BTF_F_COMPACT = 1,
1: -	BTF_F_NONAME = 2,
1: -	BTF_F_PTR_RAW = 4,
1: -	BTF_F_ZERO = 8,
1: +  BTF_F_COMPACT = 1,
1: +  BTF_F_NONAME = 2,
1: +  BTF_F_PTR_RAW = 4,
1: +  BTF_F_ZERO = 8,
1:  };
1:  
1:  struct bpf_local_storage_map_bucket;
1:  
1:  struct bpf_local_storage_map {
1: -	struct bpf_map map;
1: -	struct bpf_local_storage_map_bucket *buckets;
1: -	u32 bucket_log;
1: -	u16 elem_size;
1: -	u16 cache_idx;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct bpf_local_storage_map_bucket *buckets;
1: +  u32 bucket_log;
1: +  u16 elem_size;
1: +  u16 cache_idx;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_local_storage_data;
1:  
1:  struct bpf_local_storage {
1: -	struct bpf_local_storage_data *cache[16];
1: -	struct hlist_head list;
1: -	void *owner;
1: -	struct callback_head rcu;
1: -	raw_spinlock_t lock;
1: +  struct bpf_local_storage_data *cache[16];
1: +  struct hlist_head list;
1: +  void *owner;
1: +  struct callback_head rcu;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  enum bpf_arg_type {
1: -	ARG_DONTCARE = 0,
1: -	ARG_CONST_MAP_PTR = 1,
1: -	ARG_PTR_TO_MAP_KEY = 2,
1: -	ARG_PTR_TO_MAP_VALUE = 3,
1: -	ARG_PTR_TO_UNINIT_MAP_VALUE = 4,
1: -	ARG_PTR_TO_MAP_VALUE_OR_NULL = 5,
1: -	ARG_PTR_TO_MEM = 6,
1: -	ARG_PTR_TO_MEM_OR_NULL = 7,
1: -	ARG_PTR_TO_UNINIT_MEM = 8,
1: -	ARG_CONST_SIZE = 9,
1: -	ARG_CONST_SIZE_OR_ZERO = 10,
1: -	ARG_PTR_TO_CTX = 11,
1: -	ARG_PTR_TO_CTX_OR_NULL = 12,
1: -	ARG_ANYTHING = 13,
1: -	ARG_PTR_TO_SPIN_LOCK = 14,
1: -	ARG_PTR_TO_SOCK_COMMON = 15,
1: -	ARG_PTR_TO_INT = 16,
1: -	ARG_PTR_TO_LONG = 17,
1: -	ARG_PTR_TO_SOCKET = 18,
1: -	ARG_PTR_TO_SOCKET_OR_NULL = 19,
1: -	ARG_PTR_TO_BTF_ID = 20,
1: -	ARG_PTR_TO_ALLOC_MEM = 21,
1: -	ARG_PTR_TO_ALLOC_MEM_OR_NULL = 22,
1: -	ARG_CONST_ALLOC_SIZE_OR_ZERO = 23,
1: -	ARG_PTR_TO_BTF_ID_SOCK_COMMON = 24,
1: -	ARG_PTR_TO_PERCPU_BTF_ID = 25,
1: -	__BPF_ARG_TYPE_MAX = 26,
1: +  ARG_DONTCARE = 0,
1: +  ARG_CONST_MAP_PTR = 1,
1: +  ARG_PTR_TO_MAP_KEY = 2,
1: +  ARG_PTR_TO_MAP_VALUE = 3,
1: +  ARG_PTR_TO_UNINIT_MAP_VALUE = 4,
1: +  ARG_PTR_TO_MAP_VALUE_OR_NULL = 5,
1: +  ARG_PTR_TO_MEM = 6,
1: +  ARG_PTR_TO_MEM_OR_NULL = 7,
1: +  ARG_PTR_TO_UNINIT_MEM = 8,
1: +  ARG_CONST_SIZE = 9,
1: +  ARG_CONST_SIZE_OR_ZERO = 10,
1: +  ARG_PTR_TO_CTX = 11,
1: +  ARG_PTR_TO_CTX_OR_NULL = 12,
1: +  ARG_ANYTHING = 13,
1: +  ARG_PTR_TO_SPIN_LOCK = 14,
1: +  ARG_PTR_TO_SOCK_COMMON = 15,
1: +  ARG_PTR_TO_INT = 16,
1: +  ARG_PTR_TO_LONG = 17,
1: +  ARG_PTR_TO_SOCKET = 18,
1: +  ARG_PTR_TO_SOCKET_OR_NULL = 19,
1: +  ARG_PTR_TO_BTF_ID = 20,
1: +  ARG_PTR_TO_ALLOC_MEM = 21,
1: +  ARG_PTR_TO_ALLOC_MEM_OR_NULL = 22,
1: +  ARG_CONST_ALLOC_SIZE_OR_ZERO = 23,
1: +  ARG_PTR_TO_BTF_ID_SOCK_COMMON = 24,
1: +  ARG_PTR_TO_PERCPU_BTF_ID = 25,
1: +  __BPF_ARG_TYPE_MAX = 26,
1:  };
1:  
1:  enum bpf_return_type {
1: -	RET_INTEGER = 0,
1: -	RET_VOID = 1,
1: -	RET_PTR_TO_MAP_VALUE = 2,
1: -	RET_PTR_TO_MAP_VALUE_OR_NULL = 3,
1: -	RET_PTR_TO_SOCKET_OR_NULL = 4,
1: -	RET_PTR_TO_TCP_SOCK_OR_NULL = 5,
1: -	RET_PTR_TO_SOCK_COMMON_OR_NULL = 6,
1: -	RET_PTR_TO_ALLOC_MEM_OR_NULL = 7,
1: -	RET_PTR_TO_BTF_ID_OR_NULL = 8,
1: -	RET_PTR_TO_MEM_OR_BTF_ID_OR_NULL = 9,
1: -	RET_PTR_TO_MEM_OR_BTF_ID = 10,
1: -	RET_PTR_TO_BTF_ID = 11,
1: +  RET_INTEGER = 0,
1: +  RET_VOID = 1,
1: +  RET_PTR_TO_MAP_VALUE = 2,
1: +  RET_PTR_TO_MAP_VALUE_OR_NULL = 3,
1: +  RET_PTR_TO_SOCKET_OR_NULL = 4,
1: +  RET_PTR_TO_TCP_SOCK_OR_NULL = 5,
1: +  RET_PTR_TO_SOCK_COMMON_OR_NULL = 6,
1: +  RET_PTR_TO_ALLOC_MEM_OR_NULL = 7,
1: +  RET_PTR_TO_BTF_ID_OR_NULL = 8,
1: +  RET_PTR_TO_MEM_OR_BTF_ID_OR_NULL = 9,
1: +  RET_PTR_TO_MEM_OR_BTF_ID = 10,
1: +  RET_PTR_TO_BTF_ID = 11,
1:  };
1:  
1:  struct bpf_func_proto {
1: -	u64 (*func)(u64, u64, u64, u64, u64);
1: -	bool gpl_only;
1: -	bool pkt_access;
1: -	enum bpf_return_type ret_type;
1: -	union {
1: -		struct {
1: -			enum bpf_arg_type arg1_type;
1: -			enum bpf_arg_type arg2_type;
1: -			enum bpf_arg_type arg3_type;
1: -			enum bpf_arg_type arg4_type;
1: -			enum bpf_arg_type arg5_type;
1: -		};
1: -		enum bpf_arg_type arg_type[5];
1: -	};
1: -	union {
1: -		struct {
1: -			u32 *arg1_btf_id;
1: -			u32 *arg2_btf_id;
1: -			u32 *arg3_btf_id;
1: -			u32 *arg4_btf_id;
1: -			u32 *arg5_btf_id;
1: -		};
1: -		u32 *arg_btf_id[5];
1: -	};
1: -	int *ret_btf_id;
1: -	bool (*allowed)(const struct bpf_prog *);
1: +  u64 (*func)(u64, u64, u64, u64, u64);
1: +  bool gpl_only;
1: +  bool pkt_access;
1: +  enum bpf_return_type ret_type;
1: +  union {
1: +    struct {
1: +      enum bpf_arg_type arg1_type;
1: +      enum bpf_arg_type arg2_type;
1: +      enum bpf_arg_type arg3_type;
1: +      enum bpf_arg_type arg4_type;
1: +      enum bpf_arg_type arg5_type;
1: +    };
1: +    enum bpf_arg_type arg_type[5];
1: +  };
1: +  union {
1: +    struct {
1: +      u32 *arg1_btf_id;
1: +      u32 *arg2_btf_id;
1: +      u32 *arg3_btf_id;
1: +      u32 *arg4_btf_id;
1: +      u32 *arg5_btf_id;
1: +    };
1: +    u32 *arg_btf_id[5];
1: +  };
1: +  int *ret_btf_id;
1: +  bool (*allowed)(const struct bpf_prog *);
1:  };
1:  
1:  enum bpf_access_type {
1: -	BPF_READ = 1,
1: -	BPF_WRITE = 2,
1: +  BPF_READ = 1,
1: +  BPF_WRITE = 2,
1:  };
1:  
1:  struct bpf_verifier_log;
1:  
1:  struct bpf_insn_access_aux {
1: -	enum bpf_reg_type reg_type;
1: -	union {
1: -		int ctx_field_size;
1: -		struct {
1: -			struct btf *btf;
1: -			u32 btf_id;
1: -		};
1: -	};
1: -	struct bpf_verifier_log *log;
1: +  enum bpf_reg_type reg_type;
1: +  union {
1: +    int ctx_field_size;
1: +    struct {
1: +      struct btf *btf;
1: +      u32 btf_id;
1: +    };
1: +  };
1: +  struct bpf_verifier_log *log;
1:  };
1:  
1:  struct bpf_verifier_ops {
1: -	const struct bpf_func_proto * (*get_func_proto)(enum bpf_func_id, const struct bpf_prog *);
1: -	bool (*is_valid_access)(int, int, enum bpf_access_type, const struct bpf_prog *, struct bpf_insn_access_aux *);
1: -	int (*gen_prologue)(struct bpf_insn *, bool, const struct bpf_prog *);
1: -	int (*gen_ld_abs)(const struct bpf_insn *, struct bpf_insn *);
1: -	u32 (*convert_ctx_access)(enum bpf_access_type, const struct bpf_insn *, struct bpf_insn *, struct bpf_prog *, u32 *);
1: -	int (*btf_struct_access)(struct bpf_verifier_log *, const struct btf *, const struct btf_type *, int, int, enum bpf_access_type, u32 *);
1: +  const struct bpf_func_proto *(*get_func_proto)(enum bpf_func_id,
1: +                                                 const struct bpf_prog *);
1: +  bool (*is_valid_access)(int, int, enum bpf_access_type,
1: +                          const struct bpf_prog *,
1: +                          struct bpf_insn_access_aux *);
1: +  int (*gen_prologue)(struct bpf_insn *, bool, const struct bpf_prog *);
1: +  int (*gen_ld_abs)(const struct bpf_insn *, struct bpf_insn *);
1: +  u32 (*convert_ctx_access)(enum bpf_access_type, const struct bpf_insn *,
1: +                            struct bpf_insn *, struct bpf_prog *, u32 *);
1: +  int (*btf_struct_access)(struct bpf_verifier_log *, const struct btf *,
1: +                           const struct btf_type *, int, int,
1: +                           enum bpf_access_type, u32 *);
1:  };
1:  
1:  struct bpf_event_entry {
1: -	struct perf_event *event;
1: -	struct file *perf_file;
1: -	struct file *map_file;
1: -	struct callback_head rcu;
1: +  struct perf_event *event;
1: +  struct file *perf_file;
1: +  struct file *map_file;
1: +  struct callback_head rcu;
1:  };
1:  
1: -typedef long unsigned int (*bpf_ctx_copy_t)(void *, const void *, long unsigned int, long unsigned int);
1: +typedef long unsigned int (*bpf_ctx_copy_t)(void *, const void *,
1: +                                            long unsigned int,
1: +                                            long unsigned int);
1:  
1:  typedef struct pt_regs bpf_user_pt_regs_t;
1:  
1:  struct bpf_perf_event_data {
1: -	bpf_user_pt_regs_t regs;
1: -	__u64 sample_period;
1: -	__u64 addr;
1: +  bpf_user_pt_regs_t regs;
1: +  __u64 sample_period;
1: +  __u64 addr;
1:  };
1:  
1:  struct perf_event_query_bpf {
1: -	__u32 ids_len;
1: -	__u32 prog_cnt;
1: -	__u32 ids[0];
1: +  __u32 ids_len;
1: +  __u32 prog_cnt;
1: +  __u32 ids[0];
1:  };
1:  
1:  struct bpf_perf_event_data_kern {
1: -	bpf_user_pt_regs_t *regs;
1: -	struct perf_sample_data *data;
1: -	struct perf_event *event;
1: +  bpf_user_pt_regs_t *regs;
1: +  struct perf_sample_data *data;
1: +  struct perf_event *event;
1:  };
1:  
1:  struct btf_id_set {
1: -	u32 cnt;
1: -	u32 ids[0];
1: +  u32 cnt;
1: +  u32 ids[0];
1:  };
1:  
1:  struct bpf_local_storage_map_bucket {
1: -	struct hlist_head list;
1: -	raw_spinlock_t lock;
1: +  struct hlist_head list;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct bpf_local_storage_data {
1: -	struct bpf_local_storage_map *smap;
1: -	u8 data[0];
1: +  struct bpf_local_storage_map *smap;
1: +  u8 data[0];
1:  };
1:  
1:  struct trace_event_raw_bpf_trace_printk {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bpf_string;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bpf_string;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_bpf_trace_printk {
1: -	u32 bpf_string;
1: +  u32 bpf_string;
1:  };
1:  
1:  typedef void (*btf_trace_bpf_trace_printk)(void *, const char *);
1:  
1:  struct bpf_trace_module {
1: -	struct module *module;
1: -	struct list_head list;
1: +  struct module *module;
1: +  struct list_head list;
1:  };
1:  
1:  typedef u64 (*btf_bpf_override_return)(struct pt_regs *, long unsigned int);
1: @@ -33115,27 +33399,32 @@ typedef u64 (*btf_bpf_probe_write_user)(void *, const void *, u32);
1:  typedef u64 (*btf_bpf_trace_printk)(char *, u32, u64, u64, u64);
1:  
1:  struct bpf_seq_printf_buf {
1: -	char buf[768];
1: +  char buf[768];
1:  };
1:  
1: -typedef u64 (*btf_bpf_seq_printf)(struct seq_file *, char *, u32, const void *, u32);
1: +typedef u64 (*btf_bpf_seq_printf)(struct seq_file *, char *, u32, const void *,
1: +                                  u32);
1:  
1:  typedef u64 (*btf_bpf_seq_write)(struct seq_file *, const void *, u32);
1:  
1: -typedef u64 (*btf_bpf_seq_printf_btf)(struct seq_file *, struct btf_ptr *, u32, u64);
1: +typedef u64 (*btf_bpf_seq_printf_btf)(struct seq_file *, struct btf_ptr *, u32,
1: +                                      u64);
1:  
1:  typedef u64 (*btf_bpf_perf_event_read)(struct bpf_map *, u64);
1:  
1: -typedef u64 (*btf_bpf_perf_event_read_value)(struct bpf_map *, u64, struct bpf_perf_event_value *, u32);
1: +typedef u64 (*btf_bpf_perf_event_read_value)(struct bpf_map *, u64,
1: +                                             struct bpf_perf_event_value *,
1: +                                             u32);
1:  
1:  struct bpf_trace_sample_data {
1: -	struct perf_sample_data sds[3];
1: +  struct perf_sample_data sds[3];
1:  };
1:  
1: -typedef u64 (*btf_bpf_perf_event_output)(struct pt_regs *, struct bpf_map *, u64, void *, u64);
1: +typedef u64 (*btf_bpf_perf_event_output)(struct pt_regs *, struct bpf_map *,
1: +                                         u64, void *, u64);
1:  
1:  struct bpf_nested_pt_regs {
1: -	struct pt_regs regs[3];
1: +  struct pt_regs regs[3];
1:  };
1:  
1:  typedef u64 (*btf_bpf_get_current_task)();
1: @@ -33145,10 +33434,10 @@ typedef u64 (*btf_bpf_get_current_task_btf)();
1:  typedef u64 (*btf_bpf_current_task_under_cgroup)(struct bpf_map *, u32);
1:  
1:  struct send_signal_irq_work {
1: -	struct irq_work irq_work;
1: -	struct task_struct *task;
1: -	u32 sig;
1: -	enum pid_type type;
1: +  struct irq_work irq_work;
1: +  struct task_struct *task;
1: +  u32 sig;
1: +  enum pid_type type;
1:  };
1:  
1:  typedef u64 (*btf_bpf_send_signal)(u32);
1: @@ -33159,30 +33448,36 @@ typedef u64 (*btf_bpf_d_path)(struct path *, char *, u32);
1:  
1:  typedef u64 (*btf_bpf_snprintf_btf)(char *, u32, struct btf_ptr *, u32, u64);
1:  
1: -typedef u64 (*btf_bpf_perf_event_output_tp)(void *, struct bpf_map *, u64, void *, u64);
1: +typedef u64 (*btf_bpf_perf_event_output_tp)(void *, struct bpf_map *, u64,
1: +                                            void *, u64);
1:  
1:  typedef u64 (*btf_bpf_get_stackid_tp)(void *, struct bpf_map *, u64);
1:  
1:  typedef u64 (*btf_bpf_get_stack_tp)(void *, void *, u32, u64);
1:  
1: -typedef u64 (*btf_bpf_perf_prog_read_value)(struct bpf_perf_event_data_kern *, struct bpf_perf_event_value *, u32);
1: +typedef u64 (*btf_bpf_perf_prog_read_value)(struct bpf_perf_event_data_kern *,
1: +                                            struct bpf_perf_event_value *, u32);
1:  
1: -typedef u64 (*btf_bpf_read_branch_records)(struct bpf_perf_event_data_kern *, void *, u32, u64);
1: +typedef u64 (*btf_bpf_read_branch_records)(struct bpf_perf_event_data_kern *,
1: +                                           void *, u32, u64);
1:  
1:  struct bpf_raw_tp_regs {
1: -	struct pt_regs regs[3];
1: +  struct pt_regs regs[3];
1:  };
1:  
1: -typedef u64 (*btf_bpf_perf_event_output_raw_tp)(struct bpf_raw_tracepoint_args *, struct bpf_map *, u64, void *, u64);
1: +typedef u64 (*btf_bpf_perf_event_output_raw_tp)(
1: +    struct bpf_raw_tracepoint_args *, struct bpf_map *, u64, void *, u64);
1:  
1: -typedef u64 (*btf_bpf_get_stackid_raw_tp)(struct bpf_raw_tracepoint_args *, struct bpf_map *, u64);
1: +typedef u64 (*btf_bpf_get_stackid_raw_tp)(struct bpf_raw_tracepoint_args *,
1: +                                          struct bpf_map *, u64);
1:  
1: -typedef u64 (*btf_bpf_get_stack_raw_tp)(struct bpf_raw_tracepoint_args *, void *, u32, u64);
1: +typedef u64 (*btf_bpf_get_stack_raw_tp)(struct bpf_raw_tracepoint_args *,
1: +                                        void *, u32, u64);
1:  
1:  enum dynevent_type {
1: -	DYNEVENT_TYPE_SYNTH = 1,
1: -	DYNEVENT_TYPE_KPROBE = 2,
1: -	DYNEVENT_TYPE_NONE = 3,
1: +  DYNEVENT_TYPE_SYNTH = 1,
1: +  DYNEVENT_TYPE_KPROBE = 2,
1: +  DYNEVENT_TYPE_NONE = 3,
1:  };
1:  
1:  struct dynevent_cmd;
1: @@ -33190,314 +33485,315 @@ struct dynevent_cmd;
1:  typedef int (*dynevent_create_fn_t)(struct dynevent_cmd *);
1:  
1:  struct dynevent_cmd {
1: -	struct seq_buf seq;
1: -	const char *event_name;
1: -	unsigned int n_fields;
1: -	enum dynevent_type type;
1: -	dynevent_create_fn_t run_command;
1: -	void *private_data;
1: +  struct seq_buf seq;
1: +  const char *event_name;
1: +  unsigned int n_fields;
1: +  enum dynevent_type type;
1: +  dynevent_create_fn_t run_command;
1: +  void *private_data;
1:  };
1:  
1:  struct kprobe_trace_entry_head {
1: -	struct trace_entry ent;
1: -	long unsigned int ip;
1: +  struct trace_entry ent;
1: +  long unsigned int ip;
1:  };
1:  
1:  struct kretprobe_trace_entry_head {
1: -	struct trace_entry ent;
1: -	long unsigned int func;
1: -	long unsigned int ret_ip;
1: +  struct trace_entry ent;
1: +  long unsigned int func;
1: +  long unsigned int ret_ip;
1:  };
1:  
1:  struct dyn_event;
1:  
1:  struct dyn_event_operations {
1: -	struct list_head list;
1: -	int (*create)(int, const char **);
1: -	int (*show)(struct seq_file *, struct dyn_event *);
1: -	bool (*is_busy)(struct dyn_event *);
1: -	int (*free)(struct dyn_event *);
1: -	bool (*match)(const char *, const char *, int, const char **, struct dyn_event *);
1: +  struct list_head list;
1: +  int (*create)(int, const char **);
1: +  int (*show)(struct seq_file *, struct dyn_event *);
1: +  bool (*is_busy)(struct dyn_event *);
1: +  int (*free)(struct dyn_event *);
1: +  bool (*match)(const char *, const char *, int, const char **,
1: +                struct dyn_event *);
1:  };
1:  
1:  struct dyn_event {
1: -	struct list_head list;
1: -	struct dyn_event_operations *ops;
1: +  struct list_head list;
1: +  struct dyn_event_operations *ops;
1:  };
1:  
1:  struct dynevent_arg {
1: -	const char *str;
1: -	char separator;
1: +  const char *str;
1: +  char separator;
1:  };
1:  
1:  typedef int (*print_type_func_t)(struct trace_seq *, void *, void *);
1:  
1:  enum fetch_op {
1: -	FETCH_OP_NOP = 0,
1: -	FETCH_OP_REG = 1,
1: -	FETCH_OP_STACK = 2,
1: -	FETCH_OP_STACKP = 3,
1: -	FETCH_OP_RETVAL = 4,
1: -	FETCH_OP_IMM = 5,
1: -	FETCH_OP_COMM = 6,
1: -	FETCH_OP_ARG = 7,
1: -	FETCH_OP_FOFFS = 8,
1: -	FETCH_OP_DATA = 9,
1: -	FETCH_OP_DEREF = 10,
1: -	FETCH_OP_UDEREF = 11,
1: -	FETCH_OP_ST_RAW = 12,
1: -	FETCH_OP_ST_MEM = 13,
1: -	FETCH_OP_ST_UMEM = 14,
1: -	FETCH_OP_ST_STRING = 15,
1: -	FETCH_OP_ST_USTRING = 16,
1: -	FETCH_OP_MOD_BF = 17,
1: -	FETCH_OP_LP_ARRAY = 18,
1: -	FETCH_OP_END = 19,
1: -	FETCH_NOP_SYMBOL = 20,
1: +  FETCH_OP_NOP = 0,
1: +  FETCH_OP_REG = 1,
1: +  FETCH_OP_STACK = 2,
1: +  FETCH_OP_STACKP = 3,
1: +  FETCH_OP_RETVAL = 4,
1: +  FETCH_OP_IMM = 5,
1: +  FETCH_OP_COMM = 6,
1: +  FETCH_OP_ARG = 7,
1: +  FETCH_OP_FOFFS = 8,
1: +  FETCH_OP_DATA = 9,
1: +  FETCH_OP_DEREF = 10,
1: +  FETCH_OP_UDEREF = 11,
1: +  FETCH_OP_ST_RAW = 12,
1: +  FETCH_OP_ST_MEM = 13,
1: +  FETCH_OP_ST_UMEM = 14,
1: +  FETCH_OP_ST_STRING = 15,
1: +  FETCH_OP_ST_USTRING = 16,
1: +  FETCH_OP_MOD_BF = 17,
1: +  FETCH_OP_LP_ARRAY = 18,
1: +  FETCH_OP_END = 19,
1: +  FETCH_NOP_SYMBOL = 20,
1:  };
1:  
1:  struct fetch_insn {
1: -	enum fetch_op op;
1: -	union {
1: -		unsigned int param;
1: -		struct {
1: -			unsigned int size;
1: -			int offset;
1: -		};
1: -		struct {
1: -			unsigned char basesize;
1: -			unsigned char lshift;
1: -			unsigned char rshift;
1: -		};
1: -		long unsigned int immediate;
1: -		void *data;
1: -	};
1: +  enum fetch_op op;
1: +  union {
1: +    unsigned int param;
1: +    struct {
1: +      unsigned int size;
1: +      int offset;
1: +    };
1: +    struct {
1: +      unsigned char basesize;
1: +      unsigned char lshift;
1: +      unsigned char rshift;
1: +    };
1: +    long unsigned int immediate;
1: +    void *data;
1: +  };
1:  };
1:  
1:  struct fetch_type {
1: -	const char *name;
1: -	size_t size;
1: -	int is_signed;
1: -	print_type_func_t print;
1: -	const char *fmt;
1: -	const char *fmttype;
1: +  const char *name;
1: +  size_t size;
1: +  int is_signed;
1: +  print_type_func_t print;
1: +  const char *fmt;
1: +  const char *fmttype;
1:  };
1:  
1:  struct probe_arg {
1: -	struct fetch_insn *code;
1: -	bool dynamic;
1: -	unsigned int offset;
1: -	unsigned int count;
1: -	const char *name;
1: -	const char *comm;
1: -	char *fmt;
1: -	const struct fetch_type *type;
1: +  struct fetch_insn *code;
1: +  bool dynamic;
1: +  unsigned int offset;
1: +  unsigned int count;
1: +  const char *name;
1: +  const char *comm;
1: +  char *fmt;
1: +  const struct fetch_type *type;
1:  };
1:  
1:  struct trace_uprobe_filter {
1: -	rwlock_t rwlock;
1: -	int nr_systemwide;
1: -	struct list_head perf_events;
1: +  rwlock_t rwlock;
1: +  int nr_systemwide;
1: +  struct list_head perf_events;
1:  };
1:  
1:  struct trace_probe_event {
1: -	unsigned int flags;
1: -	struct trace_event_class class;
1: -	struct trace_event_call call;
1: -	struct list_head files;
1: -	struct list_head probes;
1: -	struct trace_uprobe_filter filter[0];
1: +  unsigned int flags;
1: +  struct trace_event_class class;
1: +  struct trace_event_call call;
1: +  struct list_head files;
1: +  struct list_head probes;
1: +  struct trace_uprobe_filter filter[0];
1:  };
1:  
1:  struct trace_probe {
1: -	struct list_head list;
1: -	struct trace_probe_event *event;
1: -	ssize_t size;
1: -	unsigned int nr_args;
1: -	struct probe_arg args[0];
1: +  struct list_head list;
1: +  struct trace_probe_event *event;
1: +  ssize_t size;
1: +  unsigned int nr_args;
1: +  struct probe_arg args[0];
1:  };
1:  
1:  struct event_file_link {
1: -	struct trace_event_file *file;
1: -	struct list_head list;
1: -};
1: -
1: -enum {
1: -	TP_ERR_FILE_NOT_FOUND = 0,
1: -	TP_ERR_NO_REGULAR_FILE = 1,
1: -	TP_ERR_BAD_REFCNT = 2,
1: -	TP_ERR_REFCNT_OPEN_BRACE = 3,
1: -	TP_ERR_BAD_REFCNT_SUFFIX = 4,
1: -	TP_ERR_BAD_UPROBE_OFFS = 5,
1: -	TP_ERR_MAXACT_NO_KPROBE = 6,
1: -	TP_ERR_BAD_MAXACT = 7,
1: -	TP_ERR_MAXACT_TOO_BIG = 8,
1: -	TP_ERR_BAD_PROBE_ADDR = 9,
1: -	TP_ERR_BAD_RETPROBE = 10,
1: -	TP_ERR_BAD_ADDR_SUFFIX = 11,
1: -	TP_ERR_NO_GROUP_NAME = 12,
1: -	TP_ERR_GROUP_TOO_LONG = 13,
1: -	TP_ERR_BAD_GROUP_NAME = 14,
1: -	TP_ERR_NO_EVENT_NAME = 15,
1: -	TP_ERR_EVENT_TOO_LONG = 16,
1: -	TP_ERR_BAD_EVENT_NAME = 17,
1: -	TP_ERR_RETVAL_ON_PROBE = 18,
1: -	TP_ERR_BAD_STACK_NUM = 19,
1: -	TP_ERR_BAD_ARG_NUM = 20,
1: -	TP_ERR_BAD_VAR = 21,
1: -	TP_ERR_BAD_REG_NAME = 22,
1: -	TP_ERR_BAD_MEM_ADDR = 23,
1: -	TP_ERR_BAD_IMM = 24,
1: -	TP_ERR_IMMSTR_NO_CLOSE = 25,
1: -	TP_ERR_FILE_ON_KPROBE = 26,
1: -	TP_ERR_BAD_FILE_OFFS = 27,
1: -	TP_ERR_SYM_ON_UPROBE = 28,
1: -	TP_ERR_TOO_MANY_OPS = 29,
1: -	TP_ERR_DEREF_NEED_BRACE = 30,
1: -	TP_ERR_BAD_DEREF_OFFS = 31,
1: -	TP_ERR_DEREF_OPEN_BRACE = 32,
1: -	TP_ERR_COMM_CANT_DEREF = 33,
1: -	TP_ERR_BAD_FETCH_ARG = 34,
1: -	TP_ERR_ARRAY_NO_CLOSE = 35,
1: -	TP_ERR_BAD_ARRAY_SUFFIX = 36,
1: -	TP_ERR_BAD_ARRAY_NUM = 37,
1: -	TP_ERR_ARRAY_TOO_BIG = 38,
1: -	TP_ERR_BAD_TYPE = 39,
1: -	TP_ERR_BAD_STRING = 40,
1: -	TP_ERR_BAD_BITFIELD = 41,
1: -	TP_ERR_ARG_NAME_TOO_LONG = 42,
1: -	TP_ERR_NO_ARG_NAME = 43,
1: -	TP_ERR_BAD_ARG_NAME = 44,
1: -	TP_ERR_USED_ARG_NAME = 45,
1: -	TP_ERR_ARG_TOO_LONG = 46,
1: -	TP_ERR_NO_ARG_BODY = 47,
1: -	TP_ERR_BAD_INSN_BNDRY = 48,
1: -	TP_ERR_FAIL_REG_PROBE = 49,
1: -	TP_ERR_DIFF_PROBE_TYPE = 50,
1: -	TP_ERR_DIFF_ARG_TYPE = 51,
1: -	TP_ERR_SAME_PROBE = 52,
1: +  struct trace_event_file *file;
1: +  struct list_head list;
1: +};
1: +
1: +enum {
1: +  TP_ERR_FILE_NOT_FOUND = 0,
1: +  TP_ERR_NO_REGULAR_FILE = 1,
1: +  TP_ERR_BAD_REFCNT = 2,
1: +  TP_ERR_REFCNT_OPEN_BRACE = 3,
1: +  TP_ERR_BAD_REFCNT_SUFFIX = 4,
1: +  TP_ERR_BAD_UPROBE_OFFS = 5,
1: +  TP_ERR_MAXACT_NO_KPROBE = 6,
1: +  TP_ERR_BAD_MAXACT = 7,
1: +  TP_ERR_MAXACT_TOO_BIG = 8,
1: +  TP_ERR_BAD_PROBE_ADDR = 9,
1: +  TP_ERR_BAD_RETPROBE = 10,
1: +  TP_ERR_BAD_ADDR_SUFFIX = 11,
1: +  TP_ERR_NO_GROUP_NAME = 12,
1: +  TP_ERR_GROUP_TOO_LONG = 13,
1: +  TP_ERR_BAD_GROUP_NAME = 14,
1: +  TP_ERR_NO_EVENT_NAME = 15,
1: +  TP_ERR_EVENT_TOO_LONG = 16,
1: +  TP_ERR_BAD_EVENT_NAME = 17,
1: +  TP_ERR_RETVAL_ON_PROBE = 18,
1: +  TP_ERR_BAD_STACK_NUM = 19,
1: +  TP_ERR_BAD_ARG_NUM = 20,
1: +  TP_ERR_BAD_VAR = 21,
1: +  TP_ERR_BAD_REG_NAME = 22,
1: +  TP_ERR_BAD_MEM_ADDR = 23,
1: +  TP_ERR_BAD_IMM = 24,
1: +  TP_ERR_IMMSTR_NO_CLOSE = 25,
1: +  TP_ERR_FILE_ON_KPROBE = 26,
1: +  TP_ERR_BAD_FILE_OFFS = 27,
1: +  TP_ERR_SYM_ON_UPROBE = 28,
1: +  TP_ERR_TOO_MANY_OPS = 29,
1: +  TP_ERR_DEREF_NEED_BRACE = 30,
1: +  TP_ERR_BAD_DEREF_OFFS = 31,
1: +  TP_ERR_DEREF_OPEN_BRACE = 32,
1: +  TP_ERR_COMM_CANT_DEREF = 33,
1: +  TP_ERR_BAD_FETCH_ARG = 34,
1: +  TP_ERR_ARRAY_NO_CLOSE = 35,
1: +  TP_ERR_BAD_ARRAY_SUFFIX = 36,
1: +  TP_ERR_BAD_ARRAY_NUM = 37,
1: +  TP_ERR_ARRAY_TOO_BIG = 38,
1: +  TP_ERR_BAD_TYPE = 39,
1: +  TP_ERR_BAD_STRING = 40,
1: +  TP_ERR_BAD_BITFIELD = 41,
1: +  TP_ERR_ARG_NAME_TOO_LONG = 42,
1: +  TP_ERR_NO_ARG_NAME = 43,
1: +  TP_ERR_BAD_ARG_NAME = 44,
1: +  TP_ERR_USED_ARG_NAME = 45,
1: +  TP_ERR_ARG_TOO_LONG = 46,
1: +  TP_ERR_NO_ARG_BODY = 47,
1: +  TP_ERR_BAD_INSN_BNDRY = 48,
1: +  TP_ERR_FAIL_REG_PROBE = 49,
1: +  TP_ERR_DIFF_PROBE_TYPE = 50,
1: +  TP_ERR_DIFF_ARG_TYPE = 51,
1: +  TP_ERR_SAME_PROBE = 52,
1:  };
1:  
1:  struct trace_kprobe {
1: -	struct dyn_event devent;
1: -	struct kretprobe rp;
1: -	long unsigned int *nhit;
1: -	const char *symbol;
1: -	struct trace_probe tp;
1: +  struct dyn_event devent;
1: +  struct kretprobe rp;
1: +  long unsigned int *nhit;
1: +  const char *symbol;
1: +  struct trace_probe tp;
1:  };
1:  
1:  struct trace_event_raw_cpu {
1: -	struct trace_entry ent;
1: -	u32 state;
1: -	u32 cpu_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 state;
1: +  u32 cpu_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_powernv_throttle {
1: -	struct trace_entry ent;
1: -	int chip_id;
1: -	u32 __data_loc_reason;
1: -	int pmax;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int chip_id;
1: +  u32 __data_loc_reason;
1: +  int pmax;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_pstate_sample {
1: -	struct trace_entry ent;
1: -	u32 core_busy;
1: -	u32 scaled_busy;
1: -	u32 from;
1: -	u32 to;
1: -	u64 mperf;
1: -	u64 aperf;
1: -	u64 tsc;
1: -	u32 freq;
1: -	u32 io_boost;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 core_busy;
1: +  u32 scaled_busy;
1: +  u32 from;
1: +  u32 to;
1: +  u64 mperf;
1: +  u64 aperf;
1: +  u64 tsc;
1: +  u32 freq;
1: +  u32 io_boost;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cpu_frequency_limits {
1: -	struct trace_entry ent;
1: -	u32 min_freq;
1: -	u32 max_freq;
1: -	u32 cpu_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 min_freq;
1: +  u32 max_freq;
1: +  u32 cpu_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_device_pm_callback_start {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_device;
1: -	u32 __data_loc_driver;
1: -	u32 __data_loc_parent;
1: -	u32 __data_loc_pm_ops;
1: -	int event;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_device;
1: +  u32 __data_loc_driver;
1: +  u32 __data_loc_parent;
1: +  u32 __data_loc_pm_ops;
1: +  int event;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_device_pm_callback_end {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_device;
1: -	u32 __data_loc_driver;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_device;
1: +  u32 __data_loc_driver;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_suspend_resume {
1: -	struct trace_entry ent;
1: -	const char *action;
1: -	int val;
1: -	bool start;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *action;
1: +  int val;
1: +  bool start;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wakeup_source {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u64 state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u64 state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_clock {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u64 state;
1: -	u64 cpu_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u64 state;
1: +  u64 cpu_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_power_domain {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u64 state;
1: -	u64 cpu_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u64 state;
1: +  u64 cpu_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cpu_latency_qos_request {
1: -	struct trace_entry ent;
1: -	s32 value;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  s32 value;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_pm_qos_update {
1: -	struct trace_entry ent;
1: -	enum pm_qos_req_action action;
1: -	int prev_value;
1: -	int curr_value;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum pm_qos_req_action action;
1: +  int prev_value;
1: +  int curr_value;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_dev_pm_qos_request {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	enum dev_pm_qos_req_type type;
1: -	s32 new_value;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  enum dev_pm_qos_req_type type;
1: +  s32 new_value;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_cpu {};
1:  
1:  struct trace_event_data_offsets_powernv_throttle {
1: -	u32 reason;
1: +  u32 reason;
1:  };
1:  
1:  struct trace_event_data_offsets_pstate_sample {};
1: @@ -33505,29 +33801,29 @@ struct trace_event_data_offsets_pstate_sample {};
1:  struct trace_event_data_offsets_cpu_frequency_limits {};
1:  
1:  struct trace_event_data_offsets_device_pm_callback_start {
1: -	u32 device;
1: -	u32 driver;
1: -	u32 parent;
1: -	u32 pm_ops;
1: +  u32 device;
1: +  u32 driver;
1: +  u32 parent;
1: +  u32 pm_ops;
1:  };
1:  
1:  struct trace_event_data_offsets_device_pm_callback_end {
1: -	u32 device;
1: -	u32 driver;
1: +  u32 device;
1: +  u32 driver;
1:  };
1:  
1:  struct trace_event_data_offsets_suspend_resume {};
1:  
1:  struct trace_event_data_offsets_wakeup_source {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_clock {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_power_domain {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_cpu_latency_qos_request {};
1: @@ -33535,36 +33831,44 @@ struct trace_event_data_offsets_cpu_latency_qos_request {};
1:  struct trace_event_data_offsets_pm_qos_update {};
1:  
1:  struct trace_event_data_offsets_dev_pm_qos_request {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  typedef void (*btf_trace_cpu_idle)(void *, unsigned int, unsigned int);
1:  
1:  typedef void (*btf_trace_powernv_throttle)(void *, int, const char *, int);
1:  
1: -typedef void (*btf_trace_pstate_sample)(void *, u32, u32, u32, u32, u64, u64, u64, u32, u32);
1: +typedef void (*btf_trace_pstate_sample)(void *, u32, u32, u32, u32, u64, u64,
1: +                                        u64, u32, u32);
1:  
1:  typedef void (*btf_trace_cpu_frequency)(void *, unsigned int, unsigned int);
1:  
1:  typedef void (*btf_trace_cpu_frequency_limits)(void *, struct cpufreq_policy *);
1:  
1: -typedef void (*btf_trace_device_pm_callback_start)(void *, struct device *, const char *, int);
1: +typedef void (*btf_trace_device_pm_callback_start)(void *, struct device *,
1: +                                                   const char *, int);
1:  
1:  typedef void (*btf_trace_device_pm_callback_end)(void *, struct device *, int);
1:  
1:  typedef void (*btf_trace_suspend_resume)(void *, const char *, int, bool);
1:  
1: -typedef void (*btf_trace_wakeup_source_activate)(void *, const char *, unsigned int);
1: +typedef void (*btf_trace_wakeup_source_activate)(void *, const char *,
1: +                                                 unsigned int);
1:  
1: -typedef void (*btf_trace_wakeup_source_deactivate)(void *, const char *, unsigned int);
1: +typedef void (*btf_trace_wakeup_source_deactivate)(void *, const char *,
1: +                                                   unsigned int);
1:  
1: -typedef void (*btf_trace_clock_enable)(void *, const char *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_clock_enable)(void *, const char *, unsigned int,
1: +                                       unsigned int);
1:  
1: -typedef void (*btf_trace_clock_disable)(void *, const char *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_clock_disable)(void *, const char *, unsigned int,
1: +                                        unsigned int);
1:  
1: -typedef void (*btf_trace_clock_set_rate)(void *, const char *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_clock_set_rate)(void *, const char *, unsigned int,
1: +                                         unsigned int);
1:  
1: -typedef void (*btf_trace_power_domain_target)(void *, const char *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_power_domain_target)(void *, const char *,
1: +                                              unsigned int, unsigned int);
1:  
1:  typedef void (*btf_trace_pm_qos_add_request)(void *, s32);
1:  
1: @@ -33572,43 +33876,50 @@ typedef void (*btf_trace_pm_qos_update_request)(void *, s32);
1:  
1:  typedef void (*btf_trace_pm_qos_remove_request)(void *, s32);
1:  
1: -typedef void (*btf_trace_pm_qos_update_target)(void *, enum pm_qos_req_action, int, int);
1: +typedef void (*btf_trace_pm_qos_update_target)(void *, enum pm_qos_req_action,
1: +                                               int, int);
1:  
1: -typedef void (*btf_trace_pm_qos_update_flags)(void *, enum pm_qos_req_action, int, int);
1: +typedef void (*btf_trace_pm_qos_update_flags)(void *, enum pm_qos_req_action,
1: +                                              int, int);
1:  
1: -typedef void (*btf_trace_dev_pm_qos_add_request)(void *, const char *, enum dev_pm_qos_req_type, s32);
1: +typedef void (*btf_trace_dev_pm_qos_add_request)(void *, const char *,
1: +                                                 enum dev_pm_qos_req_type, s32);
1:  
1: -typedef void (*btf_trace_dev_pm_qos_update_request)(void *, const char *, enum dev_pm_qos_req_type, s32);
1: +typedef void (*btf_trace_dev_pm_qos_update_request)(void *, const char *,
1: +                                                    enum dev_pm_qos_req_type,
1: +                                                    s32);
1:  
1: -typedef void (*btf_trace_dev_pm_qos_remove_request)(void *, const char *, enum dev_pm_qos_req_type, s32);
1: +typedef void (*btf_trace_dev_pm_qos_remove_request)(void *, const char *,
1: +                                                    enum dev_pm_qos_req_type,
1: +                                                    s32);
1:  
1:  struct trace_event_raw_rpm_internal {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	int flags;
1: -	int usage_count;
1: -	int disable_depth;
1: -	int runtime_auto;
1: -	int request_pending;
1: -	int irq_safe;
1: -	int child_count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  int flags;
1: +  int usage_count;
1: +  int disable_depth;
1: +  int runtime_auto;
1: +  int request_pending;
1: +  int irq_safe;
1: +  int child_count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpm_return_int {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	long unsigned int ip;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  long unsigned int ip;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_rpm_internal {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_rpm_return_int {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  typedef void (*btf_trace_rpm_suspend)(void *, struct device *, int);
1: @@ -33619,113 +33930,117 @@ typedef void (*btf_trace_rpm_idle)(void *, struct device *, int);
1:  
1:  typedef void (*btf_trace_rpm_usage)(void *, struct device *, int);
1:  
1: -typedef void (*btf_trace_rpm_return_int)(void *, struct device *, long unsigned int, int);
1: +typedef void (*btf_trace_rpm_return_int)(void *, struct device *,
1: +                                         long unsigned int, int);
1:  
1:  typedef int (*dynevent_check_arg_fn_t)(void *);
1:  
1:  struct dynevent_arg_pair {
1: -	const char *lhs;
1: -	const char *rhs;
1: -	char operator;
1: -	char separator;
1: +  const char *lhs;
1: +  const char *rhs;
1: +  char operator;
1: +  char separator;
1:  };
1:  
1:  struct trace_probe_log {
1: -	const char *subsystem;
1: -	const char **argv;
1: -	int argc;
1: -	int index;
1: +  const char *subsystem;
1: +  const char **argv;
1: +  int argc;
1: +  int index;
1:  };
1:  
1:  enum uprobe_filter_ctx {
1: -	UPROBE_FILTER_REGISTER = 0,
1: -	UPROBE_FILTER_UNREGISTER = 1,
1: -	UPROBE_FILTER_MMAP = 2,
1: +  UPROBE_FILTER_REGISTER = 0,
1: +  UPROBE_FILTER_UNREGISTER = 1,
1: +  UPROBE_FILTER_MMAP = 2,
1:  };
1:  
1:  struct uprobe_consumer {
1: -	int (*handler)(struct uprobe_consumer *, struct pt_regs *);
1: -	int (*ret_handler)(struct uprobe_consumer *, long unsigned int, struct pt_regs *);
1: -	bool (*filter)(struct uprobe_consumer *, enum uprobe_filter_ctx, struct mm_struct *);
1: -	struct uprobe_consumer *next;
1: +  int (*handler)(struct uprobe_consumer *, struct pt_regs *);
1: +  int (*ret_handler)(struct uprobe_consumer *, long unsigned int,
1: +                     struct pt_regs *);
1: +  bool (*filter)(struct uprobe_consumer *, enum uprobe_filter_ctx,
1: +                 struct mm_struct *);
1: +  struct uprobe_consumer *next;
1:  };
1:  
1:  struct uprobe_trace_entry_head {
1: -	struct trace_entry ent;
1: -	long unsigned int vaddr[0];
1: +  struct trace_entry ent;
1: +  long unsigned int vaddr[0];
1:  };
1:  
1:  struct trace_uprobe {
1: -	struct dyn_event devent;
1: -	struct uprobe_consumer consumer;
1: -	struct path path;
1: -	struct inode *inode;
1: -	char *filename;
1: -	long unsigned int offset;
1: -	long unsigned int ref_ctr_offset;
1: -	long unsigned int nhit;
1: -	struct trace_probe tp;
1: +  struct dyn_event devent;
1: +  struct uprobe_consumer consumer;
1: +  struct path path;
1: +  struct inode *inode;
1: +  char *filename;
1: +  long unsigned int offset;
1: +  long unsigned int ref_ctr_offset;
1: +  long unsigned int nhit;
1: +  struct trace_probe tp;
1:  };
1:  
1:  struct uprobe_dispatch_data {
1: -	struct trace_uprobe *tu;
1: -	long unsigned int bp_addr;
1: +  struct trace_uprobe *tu;
1: +  long unsigned int bp_addr;
1:  };
1:  
1:  struct uprobe_cpu_buffer {
1: -	struct mutex mutex;
1: -	void *buf;
1: +  struct mutex mutex;
1: +  void *buf;
1:  };
1:  
1: -typedef bool (*filter_func_t)(struct uprobe_consumer *, enum uprobe_filter_ctx, struct mm_struct *);
1: +typedef bool (*filter_func_t)(struct uprobe_consumer *, enum uprobe_filter_ctx,
1: +                              struct mm_struct *);
1:  
1:  struct rhash_lock_head;
1:  
1:  struct bucket_table {
1: -	unsigned int size;
1: -	unsigned int nest;
1: -	u32 hash_rnd;
1: -	struct list_head walkers;
1: -	struct callback_head rcu;
1: -	struct bucket_table *future_tbl;
1: -	struct lockdep_map dep_map;
1: -	long: 64;
1: -	struct rhash_lock_head *buckets[0];
1: +  unsigned int size;
1: +  unsigned int nest;
1: +  u32 hash_rnd;
1: +  struct list_head walkers;
1: +  struct callback_head rcu;
1: +  struct bucket_table *future_tbl;
1: +  struct lockdep_map dep_map;
1: +  long : 64;
1: +  struct rhash_lock_head *buckets[0];
1:  };
1:  
1:  struct rnd_state {
1: -	__u32 s1;
1: -	__u32 s2;
1: -	__u32 s3;
1: -	__u32 s4;
1: +  __u32 s1;
1: +  __u32 s2;
1: +  __u32 s3;
1: +  __u32 s4;
1:  };
1:  
1:  enum xdp_action {
1: -	XDP_ABORTED = 0,
1: -	XDP_DROP = 1,
1: -	XDP_PASS = 2,
1: -	XDP_TX = 3,
1: -	XDP_REDIRECT = 4,
1: +  XDP_ABORTED = 0,
1: +  XDP_DROP = 1,
1: +  XDP_PASS = 2,
1: +  XDP_TX = 3,
1: +  XDP_REDIRECT = 4,
1:  };
1:  
1:  enum xdp_mem_type {
1: -	MEM_TYPE_PAGE_SHARED = 0,
1: -	MEM_TYPE_PAGE_ORDER0 = 1,
1: -	MEM_TYPE_PAGE_POOL = 2,
1: -	MEM_TYPE_XSK_BUFF_POOL = 3,
1: -	MEM_TYPE_MAX = 4,
1: +  MEM_TYPE_PAGE_SHARED = 0,
1: +  MEM_TYPE_PAGE_ORDER0 = 1,
1: +  MEM_TYPE_PAGE_POOL = 2,
1: +  MEM_TYPE_XSK_BUFF_POOL = 3,
1: +  MEM_TYPE_MAX = 4,
1:  };
1:  
1:  struct xdp_cpumap_stats {
1: -	unsigned int redirect;
1: -	unsigned int pass;
1: -	unsigned int drop;
1: +  unsigned int redirect;
1: +  unsigned int pass;
1: +  unsigned int drop;
1:  };
1:  
1:  typedef void (*bpf_jit_fill_hole_t)(void *, unsigned int);
1:  
1:  struct bpf_prog_dummy {
1: -	struct bpf_prog prog;
1: +  struct bpf_prog prog;
1:  };
1:  
1:  typedef u64 (*btf_bpf_user_rnd_u32)();
1: @@ -33733,7 +34048,7 @@ typedef u64 (*btf_bpf_user_rnd_u32)();
1:  typedef u64 (*btf_bpf_get_raw_cpu_id)();
1:  
1:  struct _bpf_dtab_netdev {
1: -	struct net_device *dev;
1: +  struct net_device *dev;
1:  };
1:  
1:  struct rhash_lock_head {};
1: @@ -33743,108 +34058,108 @@ struct zero_copy_allocator;
1:  struct page_pool;
1:  
1:  struct xdp_mem_allocator {
1: -	struct xdp_mem_info mem;
1: -	union {
1: -		void *allocator;
1: -		struct page_pool *page_pool;
1: -		struct zero_copy_allocator *zc_alloc;
1: -	};
1: -	struct rhash_head node;
1: -	struct callback_head rcu;
1: +  struct xdp_mem_info mem;
1: +  union {
1: +    void *allocator;
1: +    struct page_pool *page_pool;
1: +    struct zero_copy_allocator *zc_alloc;
1: +  };
1: +  struct rhash_head node;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct trace_event_raw_xdp_exception {
1: -	struct trace_entry ent;
1: -	int prog_id;
1: -	u32 act;
1: -	int ifindex;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int prog_id;
1: +  u32 act;
1: +  int ifindex;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xdp_bulk_tx {
1: -	struct trace_entry ent;
1: -	int ifindex;
1: -	u32 act;
1: -	int drops;
1: -	int sent;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int ifindex;
1: +  u32 act;
1: +  int drops;
1: +  int sent;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xdp_redirect_template {
1: -	struct trace_entry ent;
1: -	int prog_id;
1: -	u32 act;
1: -	int ifindex;
1: -	int err;
1: -	int to_ifindex;
1: -	u32 map_id;
1: -	int map_index;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int prog_id;
1: +  u32 act;
1: +  int ifindex;
1: +  int err;
1: +  int to_ifindex;
1: +  u32 map_id;
1: +  int map_index;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xdp_cpumap_kthread {
1: -	struct trace_entry ent;
1: -	int map_id;
1: -	u32 act;
1: -	int cpu;
1: -	unsigned int drops;
1: -	unsigned int processed;
1: -	int sched;
1: -	unsigned int xdp_pass;
1: -	unsigned int xdp_drop;
1: -	unsigned int xdp_redirect;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int map_id;
1: +  u32 act;
1: +  int cpu;
1: +  unsigned int drops;
1: +  unsigned int processed;
1: +  int sched;
1: +  unsigned int xdp_pass;
1: +  unsigned int xdp_drop;
1: +  unsigned int xdp_redirect;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xdp_cpumap_enqueue {
1: -	struct trace_entry ent;
1: -	int map_id;
1: -	u32 act;
1: -	int cpu;
1: -	unsigned int drops;
1: -	unsigned int processed;
1: -	int to_cpu;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int map_id;
1: +  u32 act;
1: +  int cpu;
1: +  unsigned int drops;
1: +  unsigned int processed;
1: +  int to_cpu;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xdp_devmap_xmit {
1: -	struct trace_entry ent;
1: -	int from_ifindex;
1: -	u32 act;
1: -	int to_ifindex;
1: -	int drops;
1: -	int sent;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int from_ifindex;
1: +  u32 act;
1: +  int to_ifindex;
1: +  int drops;
1: +  int sent;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mem_disconnect {
1: -	struct trace_entry ent;
1: -	const struct xdp_mem_allocator *xa;
1: -	u32 mem_id;
1: -	u32 mem_type;
1: -	const void *allocator;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const struct xdp_mem_allocator *xa;
1: +  u32 mem_id;
1: +  u32 mem_type;
1: +  const void *allocator;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mem_connect {
1: -	struct trace_entry ent;
1: -	const struct xdp_mem_allocator *xa;
1: -	u32 mem_id;
1: -	u32 mem_type;
1: -	const void *allocator;
1: -	const struct xdp_rxq_info *rxq;
1: -	int ifindex;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const struct xdp_mem_allocator *xa;
1: +  u32 mem_id;
1: +  u32 mem_type;
1: +  const void *allocator;
1: +  const struct xdp_rxq_info *rxq;
1: +  int ifindex;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mem_return_failed {
1: -	struct trace_entry ent;
1: -	const struct page *page;
1: -	u32 mem_id;
1: -	u32 mem_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const struct page *page;
1: +  u32 mem_id;
1: +  u32 mem_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_xdp_exception {};
1: @@ -33865,240 +34180,262 @@ struct trace_event_data_offsets_mem_connect {};
1:  
1:  struct trace_event_data_offsets_mem_return_failed {};
1:  
1: -typedef void (*btf_trace_xdp_exception)(void *, const struct net_device *, const struct bpf_prog *, u32);
1: +typedef void (*btf_trace_xdp_exception)(void *, const struct net_device *,
1: +                                        const struct bpf_prog *, u32);
1:  
1: -typedef void (*btf_trace_xdp_bulk_tx)(void *, const struct net_device *, int, int, int);
1: +typedef void (*btf_trace_xdp_bulk_tx)(void *, const struct net_device *, int,
1: +                                      int, int);
1:  
1: -typedef void (*btf_trace_xdp_redirect)(void *, const struct net_device *, const struct bpf_prog *, const void *, int, const struct bpf_map *, u32);
1: +typedef void (*btf_trace_xdp_redirect)(void *, const struct net_device *,
1: +                                       const struct bpf_prog *, const void *,
1: +                                       int, const struct bpf_map *, u32);
1:  
1: -typedef void (*btf_trace_xdp_redirect_err)(void *, const struct net_device *, const struct bpf_prog *, const void *, int, const struct bpf_map *, u32);
1: +typedef void (*btf_trace_xdp_redirect_err)(void *, const struct net_device *,
1: +                                           const struct bpf_prog *,
1: +                                           const void *, int,
1: +                                           const struct bpf_map *, u32);
1:  
1: -typedef void (*btf_trace_xdp_redirect_map)(void *, const struct net_device *, const struct bpf_prog *, const void *, int, const struct bpf_map *, u32);
1: +typedef void (*btf_trace_xdp_redirect_map)(void *, const struct net_device *,
1: +                                           const struct bpf_prog *,
1: +                                           const void *, int,
1: +                                           const struct bpf_map *, u32);
1:  
1: -typedef void (*btf_trace_xdp_redirect_map_err)(void *, const struct net_device *, const struct bpf_prog *, const void *, int, const struct bpf_map *, u32);
1: +typedef void (*btf_trace_xdp_redirect_map_err)(void *,
1: +                                               const struct net_device *,
1: +                                               const struct bpf_prog *,
1: +                                               const void *, int,
1: +                                               const struct bpf_map *, u32);
1:  
1: -typedef void (*btf_trace_xdp_cpumap_kthread)(void *, int, unsigned int, unsigned int, int, struct xdp_cpumap_stats *);
1: +typedef void (*btf_trace_xdp_cpumap_kthread)(void *, int, unsigned int,
1: +                                             unsigned int, int,
1: +                                             struct xdp_cpumap_stats *);
1:  
1: -typedef void (*btf_trace_xdp_cpumap_enqueue)(void *, int, unsigned int, unsigned int, int);
1: +typedef void (*btf_trace_xdp_cpumap_enqueue)(void *, int, unsigned int,
1: +                                             unsigned int, int);
1:  
1: -typedef void (*btf_trace_xdp_devmap_xmit)(void *, const struct net_device *, const struct net_device *, int, int, int);
1: +typedef void (*btf_trace_xdp_devmap_xmit)(void *, const struct net_device *,
1: +                                          const struct net_device *, int, int,
1: +                                          int);
1:  
1: -typedef void (*btf_trace_mem_disconnect)(void *, const struct xdp_mem_allocator *);
1: +typedef void (*btf_trace_mem_disconnect)(void *,
1: +                                         const struct xdp_mem_allocator *);
1:  
1: -typedef void (*btf_trace_mem_connect)(void *, const struct xdp_mem_allocator *, const struct xdp_rxq_info *);
1: +typedef void (*btf_trace_mem_connect)(void *, const struct xdp_mem_allocator *,
1: +                                      const struct xdp_rxq_info *);
1:  
1: -typedef void (*btf_trace_mem_return_failed)(void *, const struct xdp_mem_info *, const struct page *);
1: +typedef void (*btf_trace_mem_return_failed)(void *, const struct xdp_mem_info *,
1: +                                            const struct page *);
1:  
1:  enum bpf_cmd {
1: -	BPF_MAP_CREATE = 0,
1: -	BPF_MAP_LOOKUP_ELEM = 1,
1: -	BPF_MAP_UPDATE_ELEM = 2,
1: -	BPF_MAP_DELETE_ELEM = 3,
1: -	BPF_MAP_GET_NEXT_KEY = 4,
1: -	BPF_PROG_LOAD = 5,
1: -	BPF_OBJ_PIN = 6,
1: -	BPF_OBJ_GET = 7,
1: -	BPF_PROG_ATTACH = 8,
1: -	BPF_PROG_DETACH = 9,
1: -	BPF_PROG_TEST_RUN = 10,
1: -	BPF_PROG_GET_NEXT_ID = 11,
1: -	BPF_MAP_GET_NEXT_ID = 12,
1: -	BPF_PROG_GET_FD_BY_ID = 13,
1: -	BPF_MAP_GET_FD_BY_ID = 14,
1: -	BPF_OBJ_GET_INFO_BY_FD = 15,
1: -	BPF_PROG_QUERY = 16,
1: -	BPF_RAW_TRACEPOINT_OPEN = 17,
1: -	BPF_BTF_LOAD = 18,
1: -	BPF_BTF_GET_FD_BY_ID = 19,
1: -	BPF_TASK_FD_QUERY = 20,
1: -	BPF_MAP_LOOKUP_AND_DELETE_ELEM = 21,
1: -	BPF_MAP_FREEZE = 22,
1: -	BPF_BTF_GET_NEXT_ID = 23,
1: -	BPF_MAP_LOOKUP_BATCH = 24,
1: -	BPF_MAP_LOOKUP_AND_DELETE_BATCH = 25,
1: -	BPF_MAP_UPDATE_BATCH = 26,
1: -	BPF_MAP_DELETE_BATCH = 27,
1: -	BPF_LINK_CREATE = 28,
1: -	BPF_LINK_UPDATE = 29,
1: -	BPF_LINK_GET_FD_BY_ID = 30,
1: -	BPF_LINK_GET_NEXT_ID = 31,
1: -	BPF_ENABLE_STATS = 32,
1: -	BPF_ITER_CREATE = 33,
1: -	BPF_LINK_DETACH = 34,
1: -	BPF_PROG_BIND_MAP = 35,
1: -};
1: -
1: -enum {
1: -	BPF_ANY = 0,
1: -	BPF_NOEXIST = 1,
1: -	BPF_EXIST = 2,
1: -	BPF_F_LOCK = 4,
1: -};
1: -
1: -enum {
1: -	BPF_F_NO_PREALLOC = 1,
1: -	BPF_F_NO_COMMON_LRU = 2,
1: -	BPF_F_NUMA_NODE = 4,
1: -	BPF_F_RDONLY = 8,
1: -	BPF_F_WRONLY = 16,
1: -	BPF_F_STACK_BUILD_ID = 32,
1: -	BPF_F_ZERO_SEED = 64,
1: -	BPF_F_RDONLY_PROG = 128,
1: -	BPF_F_WRONLY_PROG = 256,
1: -	BPF_F_CLONE = 512,
1: -	BPF_F_MMAPABLE = 1024,
1: -	BPF_F_PRESERVE_ELEMS = 2048,
1: -	BPF_F_INNER_MAP = 4096,
1: +  BPF_MAP_CREATE = 0,
1: +  BPF_MAP_LOOKUP_ELEM = 1,
1: +  BPF_MAP_UPDATE_ELEM = 2,
1: +  BPF_MAP_DELETE_ELEM = 3,
1: +  BPF_MAP_GET_NEXT_KEY = 4,
1: +  BPF_PROG_LOAD = 5,
1: +  BPF_OBJ_PIN = 6,
1: +  BPF_OBJ_GET = 7,
1: +  BPF_PROG_ATTACH = 8,
1: +  BPF_PROG_DETACH = 9,
1: +  BPF_PROG_TEST_RUN = 10,
1: +  BPF_PROG_GET_NEXT_ID = 11,
1: +  BPF_MAP_GET_NEXT_ID = 12,
1: +  BPF_PROG_GET_FD_BY_ID = 13,
1: +  BPF_MAP_GET_FD_BY_ID = 14,
1: +  BPF_OBJ_GET_INFO_BY_FD = 15,
1: +  BPF_PROG_QUERY = 16,
1: +  BPF_RAW_TRACEPOINT_OPEN = 17,
1: +  BPF_BTF_LOAD = 18,
1: +  BPF_BTF_GET_FD_BY_ID = 19,
1: +  BPF_TASK_FD_QUERY = 20,
1: +  BPF_MAP_LOOKUP_AND_DELETE_ELEM = 21,
1: +  BPF_MAP_FREEZE = 22,
1: +  BPF_BTF_GET_NEXT_ID = 23,
1: +  BPF_MAP_LOOKUP_BATCH = 24,
1: +  BPF_MAP_LOOKUP_AND_DELETE_BATCH = 25,
1: +  BPF_MAP_UPDATE_BATCH = 26,
1: +  BPF_MAP_DELETE_BATCH = 27,
1: +  BPF_LINK_CREATE = 28,
1: +  BPF_LINK_UPDATE = 29,
1: +  BPF_LINK_GET_FD_BY_ID = 30,
1: +  BPF_LINK_GET_NEXT_ID = 31,
1: +  BPF_ENABLE_STATS = 32,
1: +  BPF_ITER_CREATE = 33,
1: +  BPF_LINK_DETACH = 34,
1: +  BPF_PROG_BIND_MAP = 35,
1: +};
1: +
1: +enum {
1: +  BPF_ANY = 0,
1: +  BPF_NOEXIST = 1,
1: +  BPF_EXIST = 2,
1: +  BPF_F_LOCK = 4,
1: +};
1: +
1: +enum {
1: +  BPF_F_NO_PREALLOC = 1,
1: +  BPF_F_NO_COMMON_LRU = 2,
1: +  BPF_F_NUMA_NODE = 4,
1: +  BPF_F_RDONLY = 8,
1: +  BPF_F_WRONLY = 16,
1: +  BPF_F_STACK_BUILD_ID = 32,
1: +  BPF_F_ZERO_SEED = 64,
1: +  BPF_F_RDONLY_PROG = 128,
1: +  BPF_F_WRONLY_PROG = 256,
1: +  BPF_F_CLONE = 512,
1: +  BPF_F_MMAPABLE = 1024,
1: +  BPF_F_PRESERVE_ELEMS = 2048,
1: +  BPF_F_INNER_MAP = 4096,
1:  };
1:  
1:  enum bpf_stats_type {
1: -	BPF_STATS_RUN_TIME = 0,
1: +  BPF_STATS_RUN_TIME = 0,
1:  };
1:  
1:  struct bpf_prog_info {
1: -	__u32 type;
1: -	__u32 id;
1: -	__u8 tag[8];
1: -	__u32 jited_prog_len;
1: -	__u32 xlated_prog_len;
1: -	__u64 jited_prog_insns;
1: -	__u64 xlated_prog_insns;
1: -	__u64 load_time;
1: -	__u32 created_by_uid;
1: -	__u32 nr_map_ids;
1: -	__u64 map_ids;
1: -	char name[16];
1: -	__u32 ifindex;
1: -	__u32 gpl_compatible: 1;
1: -	__u64 netns_dev;
1: -	__u64 netns_ino;
1: -	__u32 nr_jited_ksyms;
1: -	__u32 nr_jited_func_lens;
1: -	__u64 jited_ksyms;
1: -	__u64 jited_func_lens;
1: -	__u32 btf_id;
1: -	__u32 func_info_rec_size;
1: -	__u64 func_info;
1: -	__u32 nr_func_info;
1: -	__u32 nr_line_info;
1: -	__u64 line_info;
1: -	__u64 jited_line_info;
1: -	__u32 nr_jited_line_info;
1: -	__u32 line_info_rec_size;
1: -	__u32 jited_line_info_rec_size;
1: -	__u32 nr_prog_tags;
1: -	__u64 prog_tags;
1: -	__u64 run_time_ns;
1: -	__u64 run_cnt;
1: +  __u32 type;
1: +  __u32 id;
1: +  __u8 tag[8];
1: +  __u32 jited_prog_len;
1: +  __u32 xlated_prog_len;
1: +  __u64 jited_prog_insns;
1: +  __u64 xlated_prog_insns;
1: +  __u64 load_time;
1: +  __u32 created_by_uid;
1: +  __u32 nr_map_ids;
1: +  __u64 map_ids;
1: +  char name[16];
1: +  __u32 ifindex;
1: +  __u32 gpl_compatible : 1;
1: +  __u64 netns_dev;
1: +  __u64 netns_ino;
1: +  __u32 nr_jited_ksyms;
1: +  __u32 nr_jited_func_lens;
1: +  __u64 jited_ksyms;
1: +  __u64 jited_func_lens;
1: +  __u32 btf_id;
1: +  __u32 func_info_rec_size;
1: +  __u64 func_info;
1: +  __u32 nr_func_info;
1: +  __u32 nr_line_info;
1: +  __u64 line_info;
1: +  __u64 jited_line_info;
1: +  __u32 nr_jited_line_info;
1: +  __u32 line_info_rec_size;
1: +  __u32 jited_line_info_rec_size;
1: +  __u32 nr_prog_tags;
1: +  __u64 prog_tags;
1: +  __u64 run_time_ns;
1: +  __u64 run_cnt;
1:  };
1:  
1:  struct bpf_map_info {
1: -	__u32 type;
1: -	__u32 id;
1: -	__u32 key_size;
1: -	__u32 value_size;
1: -	__u32 max_entries;
1: -	__u32 map_flags;
1: -	char name[16];
1: -	__u32 ifindex;
1: -	__u32 btf_vmlinux_value_type_id;
1: -	__u64 netns_dev;
1: -	__u64 netns_ino;
1: -	__u32 btf_id;
1: -	__u32 btf_key_type_id;
1: -	__u32 btf_value_type_id;
1: +  __u32 type;
1: +  __u32 id;
1: +  __u32 key_size;
1: +  __u32 value_size;
1: +  __u32 max_entries;
1: +  __u32 map_flags;
1: +  char name[16];
1: +  __u32 ifindex;
1: +  __u32 btf_vmlinux_value_type_id;
1: +  __u64 netns_dev;
1: +  __u64 netns_ino;
1: +  __u32 btf_id;
1: +  __u32 btf_key_type_id;
1: +  __u32 btf_value_type_id;
1:  };
1:  
1:  struct bpf_btf_info {
1: -	__u64 btf;
1: -	__u32 btf_size;
1: -	__u32 id;
1: -	__u64 name;
1: -	__u32 name_len;
1: -	__u32 kernel_btf;
1: +  __u64 btf;
1: +  __u32 btf_size;
1: +  __u32 id;
1: +  __u64 name;
1: +  __u32 name_len;
1: +  __u32 kernel_btf;
1:  };
1:  
1:  struct bpf_spin_lock {
1: -	__u32 val;
1: +  __u32 val;
1:  };
1:  
1:  struct bpf_attach_target_info {
1: -	struct btf_func_model fmodel;
1: -	long int tgt_addr;
1: -	const char *tgt_name;
1: -	const struct btf_type *tgt_type;
1: +  struct btf_func_model fmodel;
1: +  long int tgt_addr;
1: +  const char *tgt_name;
1: +  const struct btf_type *tgt_type;
1:  };
1:  
1:  struct bpf_link_primer {
1: -	struct bpf_link *link;
1: -	struct file *file;
1: -	int fd;
1: -	u32 id;
1: +  struct bpf_link *link;
1: +  struct file *file;
1: +  int fd;
1: +  u32 id;
1:  };
1:  
1:  enum perf_bpf_event_type {
1: -	PERF_BPF_EVENT_UNKNOWN = 0,
1: -	PERF_BPF_EVENT_PROG_LOAD = 1,
1: -	PERF_BPF_EVENT_PROG_UNLOAD = 2,
1: -	PERF_BPF_EVENT_MAX = 3,
1: +  PERF_BPF_EVENT_UNKNOWN = 0,
1: +  PERF_BPF_EVENT_PROG_LOAD = 1,
1: +  PERF_BPF_EVENT_PROG_UNLOAD = 2,
1: +  PERF_BPF_EVENT_MAX = 3,
1:  };
1:  
1:  enum bpf_audit {
1: -	BPF_AUDIT_LOAD = 0,
1: -	BPF_AUDIT_UNLOAD = 1,
1: -	BPF_AUDIT_MAX = 2,
1: +  BPF_AUDIT_LOAD = 0,
1: +  BPF_AUDIT_UNLOAD = 1,
1: +  BPF_AUDIT_MAX = 2,
1:  };
1:  
1:  struct bpf_tracing_link {
1: -	struct bpf_link link;
1: -	enum bpf_attach_type attach_type;
1: -	struct bpf_trampoline *trampoline;
1: -	struct bpf_prog *tgt_prog;
1: +  struct bpf_link link;
1: +  enum bpf_attach_type attach_type;
1: +  struct bpf_trampoline *trampoline;
1: +  struct bpf_prog *tgt_prog;
1:  };
1:  
1:  struct bpf_raw_tp_link {
1: -	struct bpf_link link;
1: -	struct bpf_raw_event_map *btp;
1: +  struct bpf_link link;
1: +  struct bpf_raw_event_map *btp;
1:  };
1:  
1:  struct btf_member {
1: -	__u32 name_off;
1: -	__u32 type;
1: -	__u32 offset;
1: +  __u32 name_off;
1: +  __u32 type;
1: +  __u32 offset;
1:  };
1:  
1:  enum btf_func_linkage {
1: -	BTF_FUNC_STATIC = 0,
1: -	BTF_FUNC_GLOBAL = 1,
1: -	BTF_FUNC_EXTERN = 2,
1: +  BTF_FUNC_STATIC = 0,
1: +  BTF_FUNC_GLOBAL = 1,
1: +  BTF_FUNC_EXTERN = 2,
1:  };
1:  
1:  struct btf_var_secinfo {
1: -	__u32 type;
1: -	__u32 offset;
1: -	__u32 size;
1: +  __u32 type;
1: +  __u32 offset;
1: +  __u32 size;
1:  };
1:  
1:  enum sk_action {
1: -	SK_DROP = 0,
1: -	SK_PASS = 1,
1: +  SK_DROP = 0,
1: +  SK_PASS = 1,
1:  };
1:  
1:  struct bpf_verifier_log {
1: -	u32 level;
1: -	char kbuf[1024];
1: -	char *ubuf;
1: -	u32 len_used;
1: -	u32 len_total;
1: +  u32 level;
1: +  char kbuf[1024];
1: +  char *ubuf;
1: +  u32 len_used;
1: +  u32 len_total;
1:  };
1:  
1:  struct bpf_subprog_info {
1: -	u32 start;
1: -	u32 linfo_idx;
1: -	u16 stack_depth;
1: -	bool has_tail_call;
1: -	bool tail_call_reachable;
1: -	bool has_ld_abs;
1: +  u32 start;
1: +  u32 linfo_idx;
1: +  u16 stack_depth;
1: +  bool has_tail_call;
1: +  bool tail_call_reachable;
1: +  bool has_ld_abs;
1:  };
1:  
1:  struct bpf_verifier_stack_elem;
1: @@ -34110,326 +34447,331 @@ struct bpf_verifier_state_list;
1:  struct bpf_insn_aux_data;
1:  
1:  struct bpf_verifier_env {
1: -	u32 insn_idx;
1: -	u32 prev_insn_idx;
1: -	struct bpf_prog *prog;
1: -	const struct bpf_verifier_ops *ops;
1: -	struct bpf_verifier_stack_elem *head;
1: -	int stack_size;
1: -	bool strict_alignment;
1: -	bool test_state_freq;
1: -	struct bpf_verifier_state *cur_state;
1: -	struct bpf_verifier_state_list **explored_states;
1: -	struct bpf_verifier_state_list *free_list;
1: -	struct bpf_map *used_maps[64];
1: -	u32 used_map_cnt;
1: -	u32 id_gen;
1: -	bool allow_ptr_leaks;
1: -	bool allow_ptr_to_map_access;
1: -	bool bpf_capable;
1: -	bool bypass_spec_v1;
1: -	bool bypass_spec_v4;
1: -	bool seen_direct_write;
1: -	struct bpf_insn_aux_data *insn_aux_data;
1: -	const struct bpf_line_info *prev_linfo;
1: -	struct bpf_verifier_log log;
1: -	struct bpf_subprog_info subprog_info[257];
1: -	struct {
1: -		int *insn_state;
1: -		int *insn_stack;
1: -		int cur_stack;
1: -	} cfg;
1: -	u32 pass_cnt;
1: -	u32 subprog_cnt;
1: -	u32 prev_insn_processed;
1: -	u32 insn_processed;
1: -	u32 prev_jmps_processed;
1: -	u32 jmps_processed;
1: -	u64 verification_time;
1: -	u32 max_states_per_insn;
1: -	u32 total_states;
1: -	u32 peak_states;
1: -	u32 longest_mark_read_walk;
1: +  u32 insn_idx;
1: +  u32 prev_insn_idx;
1: +  struct bpf_prog *prog;
1: +  const struct bpf_verifier_ops *ops;
1: +  struct bpf_verifier_stack_elem *head;
1: +  int stack_size;
1: +  bool strict_alignment;
1: +  bool test_state_freq;
1: +  struct bpf_verifier_state *cur_state;
1: +  struct bpf_verifier_state_list **explored_states;
1: +  struct bpf_verifier_state_list *free_list;
1: +  struct bpf_map *used_maps[64];
1: +  u32 used_map_cnt;
1: +  u32 id_gen;
1: +  bool allow_ptr_leaks;
1: +  bool allow_ptr_to_map_access;
1: +  bool bpf_capable;
1: +  bool bypass_spec_v1;
1: +  bool bypass_spec_v4;
1: +  bool seen_direct_write;
1: +  struct bpf_insn_aux_data *insn_aux_data;
1: +  const struct bpf_line_info *prev_linfo;
1: +  struct bpf_verifier_log log;
1: +  struct bpf_subprog_info subprog_info[257];
1: +  struct {
1: +    int *insn_state;
1: +    int *insn_stack;
1: +    int cur_stack;
1: +  } cfg;
1: +  u32 pass_cnt;
1: +  u32 subprog_cnt;
1: +  u32 prev_insn_processed;
1: +  u32 insn_processed;
1: +  u32 prev_jmps_processed;
1: +  u32 jmps_processed;
1: +  u64 verification_time;
1: +  u32 max_states_per_insn;
1: +  u32 total_states;
1: +  u32 peak_states;
1: +  u32 longest_mark_read_walk;
1:  };
1:  
1:  struct bpf_struct_ops {
1: -	const struct bpf_verifier_ops *verifier_ops;
1: -	int (*init)(struct btf *);
1: -	int (*check_member)(const struct btf_type *, const struct btf_member *);
1: -	int (*init_member)(const struct btf_type *, const struct btf_member *, void *, const void *);
1: -	int (*reg)(void *);
1: -	void (*unreg)(void *);
1: -	const struct btf_type *type;
1: -	const struct btf_type *value_type;
1: -	const char *name;
1: -	struct btf_func_model func_models[64];
1: -	u32 type_id;
1: -	u32 value_id;
1: -};
1: -
1: -typedef u32 (*bpf_convert_ctx_access_t)(enum bpf_access_type, const struct bpf_insn *, struct bpf_insn *, struct bpf_prog *, u32 *);
1: +  const struct bpf_verifier_ops *verifier_ops;
1: +  int (*init)(struct btf *);
1: +  int (*check_member)(const struct btf_type *, const struct btf_member *);
1: +  int (*init_member)(const struct btf_type *, const struct btf_member *, void *,
1: +                     const void *);
1: +  int (*reg)(void *);
1: +  void (*unreg)(void *);
1: +  const struct btf_type *type;
1: +  const struct btf_type *value_type;
1: +  const char *name;
1: +  struct btf_func_model func_models[64];
1: +  u32 type_id;
1: +  u32 value_id;
1: +};
1: +
1: +typedef u32 (*bpf_convert_ctx_access_t)(enum bpf_access_type,
1: +                                        const struct bpf_insn *,
1: +                                        struct bpf_insn *, struct bpf_prog *,
1: +                                        u32 *);
1:  
1:  struct tnum {
1: -	u64 value;
1: -	u64 mask;
1: +  u64 value;
1: +  u64 mask;
1:  };
1:  
1:  enum bpf_reg_liveness {
1: -	REG_LIVE_NONE = 0,
1: -	REG_LIVE_READ32 = 1,
1: -	REG_LIVE_READ64 = 2,
1: -	REG_LIVE_READ = 3,
1: -	REG_LIVE_WRITTEN = 4,
1: -	REG_LIVE_DONE = 8,
1: +  REG_LIVE_NONE = 0,
1: +  REG_LIVE_READ32 = 1,
1: +  REG_LIVE_READ64 = 2,
1: +  REG_LIVE_READ = 3,
1: +  REG_LIVE_WRITTEN = 4,
1: +  REG_LIVE_DONE = 8,
1:  };
1:  
1:  struct bpf_reg_state {
1: -	enum bpf_reg_type type;
1: -	s32 off;
1: -	union {
1: -		int range;
1: -		struct bpf_map *map_ptr;
1: -		struct {
1: -			struct btf *btf;
1: -			u32 btf_id;
1: -		};
1: -		u32 mem_size;
1: -		struct {
1: -			long unsigned int raw1;
1: -			long unsigned int raw2;
1: -		} raw;
1: -	};
1: -	u32 id;
1: -	u32 ref_obj_id;
1: -	struct tnum var_off;
1: -	s64 smin_value;
1: -	s64 smax_value;
1: -	u64 umin_value;
1: -	u64 umax_value;
1: -	s32 s32_min_value;
1: -	s32 s32_max_value;
1: -	u32 u32_min_value;
1: -	u32 u32_max_value;
1: -	struct bpf_reg_state *parent;
1: -	u32 frameno;
1: -	s32 subreg_def;
1: -	enum bpf_reg_liveness live;
1: -	bool precise;
1: +  enum bpf_reg_type type;
1: +  s32 off;
1: +  union {
1: +    int range;
1: +    struct bpf_map *map_ptr;
1: +    struct {
1: +      struct btf *btf;
1: +      u32 btf_id;
1: +    };
1: +    u32 mem_size;
1: +    struct {
1: +      long unsigned int raw1;
1: +      long unsigned int raw2;
1: +    } raw;
1: +  };
1: +  u32 id;
1: +  u32 ref_obj_id;
1: +  struct tnum var_off;
1: +  s64 smin_value;
1: +  s64 smax_value;
1: +  u64 umin_value;
1: +  u64 umax_value;
1: +  s32 s32_min_value;
1: +  s32 s32_max_value;
1: +  u32 u32_min_value;
1: +  u32 u32_max_value;
1: +  struct bpf_reg_state *parent;
1: +  u32 frameno;
1: +  s32 subreg_def;
1: +  enum bpf_reg_liveness live;
1: +  bool precise;
1:  };
1:  
1:  enum bpf_stack_slot_type {
1: -	STACK_INVALID = 0,
1: -	STACK_SPILL = 1,
1: -	STACK_MISC = 2,
1: -	STACK_ZERO = 3,
1: +  STACK_INVALID = 0,
1: +  STACK_SPILL = 1,
1: +  STACK_MISC = 2,
1: +  STACK_ZERO = 3,
1:  };
1:  
1:  struct bpf_stack_state {
1: -	struct bpf_reg_state spilled_ptr;
1: -	u8 slot_type[8];
1: +  struct bpf_reg_state spilled_ptr;
1: +  u8 slot_type[8];
1:  };
1:  
1:  struct bpf_reference_state {
1: -	int id;
1: -	int insn_idx;
1: +  int id;
1: +  int insn_idx;
1:  };
1:  
1:  struct bpf_func_state {
1: -	struct bpf_reg_state regs[11];
1: -	int callsite;
1: -	u32 frameno;
1: -	u32 subprogno;
1: -	int acquired_refs;
1: -	struct bpf_reference_state *refs;
1: -	int allocated_stack;
1: -	struct bpf_stack_state *stack;
1: +  struct bpf_reg_state regs[11];
1: +  int callsite;
1: +  u32 frameno;
1: +  u32 subprogno;
1: +  int acquired_refs;
1: +  struct bpf_reference_state *refs;
1: +  int allocated_stack;
1: +  struct bpf_stack_state *stack;
1:  };
1:  
1:  struct bpf_idx_pair {
1: -	u32 prev_idx;
1: -	u32 idx;
1: +  u32 prev_idx;
1: +  u32 idx;
1:  };
1:  
1:  struct bpf_verifier_state {
1: -	struct bpf_func_state *frame[8];
1: -	struct bpf_verifier_state *parent;
1: -	u32 branches;
1: -	u32 insn_idx;
1: -	u32 curframe;
1: -	u32 active_spin_lock;
1: -	bool speculative;
1: -	u32 first_insn_idx;
1: -	u32 last_insn_idx;
1: -	struct bpf_idx_pair *jmp_history;
1: -	u32 jmp_history_cnt;
1: +  struct bpf_func_state *frame[8];
1: +  struct bpf_verifier_state *parent;
1: +  u32 branches;
1: +  u32 insn_idx;
1: +  u32 curframe;
1: +  u32 active_spin_lock;
1: +  bool speculative;
1: +  u32 first_insn_idx;
1: +  u32 last_insn_idx;
1: +  struct bpf_idx_pair *jmp_history;
1: +  u32 jmp_history_cnt;
1:  };
1:  
1:  struct bpf_verifier_state_list {
1: -	struct bpf_verifier_state state;
1: -	struct bpf_verifier_state_list *next;
1: -	int miss_cnt;
1: -	int hit_cnt;
1: +  struct bpf_verifier_state state;
1: +  struct bpf_verifier_state_list *next;
1: +  int miss_cnt;
1: +  int hit_cnt;
1:  };
1:  
1:  struct bpf_insn_aux_data {
1: -	union {
1: -		enum bpf_reg_type ptr_type;
1: -		long unsigned int map_ptr_state;
1: -		s32 call_imm;
1: -		u32 alu_limit;
1: -		struct {
1: -			u32 map_index;
1: -			u32 map_off;
1: -		};
1: -		struct {
1: -			enum bpf_reg_type reg_type;
1: -			union {
1: -				struct {
1: -					struct btf *btf;
1: -					u32 btf_id;
1: -				};
1: -				u32 mem_size;
1: -			};
1: -		} btf_var;
1: -	};
1: -	u64 map_key_state;
1: -	int ctx_field_size;
1: -	int sanitize_stack_off;
1: -	u32 seen;
1: -	bool zext_dst;
1: -	u8 alu_state;
1: -	unsigned int orig_idx;
1: -	bool prune_point;
1: +  union {
1: +    enum bpf_reg_type ptr_type;
1: +    long unsigned int map_ptr_state;
1: +    s32 call_imm;
1: +    u32 alu_limit;
1: +    struct {
1: +      u32 map_index;
1: +      u32 map_off;
1: +    };
1: +    struct {
1: +      enum bpf_reg_type reg_type;
1: +      union {
1: +        struct {
1: +          struct btf *btf;
1: +          u32 btf_id;
1: +        };
1: +        u32 mem_size;
1: +      };
1: +    } btf_var;
1: +  };
1: +  u64 map_key_state;
1: +  int ctx_field_size;
1: +  int sanitize_stack_off;
1: +  u32 seen;
1: +  bool zext_dst;
1: +  u8 alu_state;
1: +  unsigned int orig_idx;
1: +  bool prune_point;
1:  };
1:  
1:  struct bpf_verifier_stack_elem {
1: -	struct bpf_verifier_state st;
1: -	int insn_idx;
1: -	int prev_insn_idx;
1: -	struct bpf_verifier_stack_elem *next;
1: -	u32 log_pos;
1: -};
1: -
1: -enum {
1: -	BTF_SOCK_TYPE_INET = 0,
1: -	BTF_SOCK_TYPE_INET_CONN = 1,
1: -	BTF_SOCK_TYPE_INET_REQ = 2,
1: -	BTF_SOCK_TYPE_INET_TW = 3,
1: -	BTF_SOCK_TYPE_REQ = 4,
1: -	BTF_SOCK_TYPE_SOCK = 5,
1: -	BTF_SOCK_TYPE_SOCK_COMMON = 6,
1: -	BTF_SOCK_TYPE_TCP = 7,
1: -	BTF_SOCK_TYPE_TCP_REQ = 8,
1: -	BTF_SOCK_TYPE_TCP_TW = 9,
1: -	BTF_SOCK_TYPE_TCP6 = 10,
1: -	BTF_SOCK_TYPE_UDP = 11,
1: -	BTF_SOCK_TYPE_UDP6 = 12,
1: -	MAX_BTF_SOCK_TYPE = 13,
1: +  struct bpf_verifier_state st;
1: +  int insn_idx;
1: +  int prev_insn_idx;
1: +  struct bpf_verifier_stack_elem *next;
1: +  u32 log_pos;
1: +};
1: +
1: +enum {
1: +  BTF_SOCK_TYPE_INET = 0,
1: +  BTF_SOCK_TYPE_INET_CONN = 1,
1: +  BTF_SOCK_TYPE_INET_REQ = 2,
1: +  BTF_SOCK_TYPE_INET_TW = 3,
1: +  BTF_SOCK_TYPE_REQ = 4,
1: +  BTF_SOCK_TYPE_SOCK = 5,
1: +  BTF_SOCK_TYPE_SOCK_COMMON = 6,
1: +  BTF_SOCK_TYPE_TCP = 7,
1: +  BTF_SOCK_TYPE_TCP_REQ = 8,
1: +  BTF_SOCK_TYPE_TCP_TW = 9,
1: +  BTF_SOCK_TYPE_TCP6 = 10,
1: +  BTF_SOCK_TYPE_UDP = 11,
1: +  BTF_SOCK_TYPE_UDP6 = 12,
1: +  MAX_BTF_SOCK_TYPE = 13,
1:  };
1:  
1:  typedef void (*bpf_insn_print_t)(void *, const char *, ...);
1:  
1: -typedef const char * (*bpf_insn_revmap_call_t)(void *, const struct bpf_insn *);
1: +typedef const char *(*bpf_insn_revmap_call_t)(void *, const struct bpf_insn *);
1:  
1: -typedef const char * (*bpf_insn_print_imm_t)(void *, const struct bpf_insn *, __u64);
1: +typedef const char *(*bpf_insn_print_imm_t)(void *, const struct bpf_insn *,
1: +                                            __u64);
1:  
1:  struct bpf_insn_cbs {
1: -	bpf_insn_print_t cb_print;
1: -	bpf_insn_revmap_call_t cb_call;
1: -	bpf_insn_print_imm_t cb_imm;
1: -	void *private_data;
1: +  bpf_insn_print_t cb_print;
1: +  bpf_insn_revmap_call_t cb_call;
1: +  bpf_insn_print_imm_t cb_imm;
1: +  void *private_data;
1:  };
1:  
1:  struct bpf_call_arg_meta {
1: -	struct bpf_map *map_ptr;
1: -	bool raw_mode;
1: -	bool pkt_access;
1: -	int regno;
1: -	int access_size;
1: -	int mem_size;
1: -	u64 msize_max_value;
1: -	int ref_obj_id;
1: -	int func_id;
1: -	struct btf *btf;
1: -	u32 btf_id;
1: -	struct btf *ret_btf;
1: -	u32 ret_btf_id;
1: +  struct bpf_map *map_ptr;
1: +  bool raw_mode;
1: +  bool pkt_access;
1: +  int regno;
1: +  int access_size;
1: +  int mem_size;
1: +  u64 msize_max_value;
1: +  int ref_obj_id;
1: +  int func_id;
1: +  struct btf *btf;
1: +  u32 btf_id;
1: +  struct btf *ret_btf;
1: +  u32 ret_btf_id;
1:  };
1:  
1:  enum reg_arg_type {
1: -	SRC_OP = 0,
1: -	DST_OP = 1,
1: -	DST_OP_NO_MARK = 2,
1: +  SRC_OP = 0,
1: +  DST_OP = 1,
1: +  DST_OP_NO_MARK = 2,
1:  };
1:  
1:  struct bpf_reg_types {
1: -	const enum bpf_reg_type types[10];
1: -	u32 *btf_id;
1: +  const enum bpf_reg_type types[10];
1: +  u32 *btf_id;
1:  };
1:  
1:  enum {
1: -	AT_PKT_END = 4294967295,
1: -	BEYOND_PKT_END = 4294967294,
1: +  AT_PKT_END = 4294967295,
1: +  BEYOND_PKT_END = 4294967294,
1:  };
1:  
1:  enum {
1: -	DISCOVERED = 16,
1: -	EXPLORED = 32,
1: -	FALLTHROUGH = 1,
1: -	BRANCH = 2,
1: +  DISCOVERED = 16,
1: +  EXPLORED = 32,
1: +  FALLTHROUGH = 1,
1: +  BRANCH = 2,
1:  };
1:  
1:  enum {
1: -	DONE_EXPLORING = 0,
1: -	KEEP_EXPLORING = 1,
1: +  DONE_EXPLORING = 0,
1: +  KEEP_EXPLORING = 1,
1:  };
1:  
1:  struct idpair {
1: -	u32 old;
1: -	u32 cur;
1: +  u32 old;
1: +  u32 cur;
1:  };
1:  
1:  struct tree_descr {
1: -	const char *name;
1: -	const struct file_operations *ops;
1: -	int mode;
1: +  const char *name;
1: +  const struct file_operations *ops;
1: +  int mode;
1:  };
1:  
1:  struct bpf_preload_info {
1: -	char link_name[16];
1: -	int link_id;
1: +  char link_name[16];
1: +  int link_id;
1:  };
1:  
1:  struct bpf_preload_ops {
1: -	struct umd_info info;
1: -	int (*preload)(struct bpf_preload_info *);
1: -	int (*finish)();
1: -	struct module *owner;
1: +  struct umd_info info;
1: +  int (*preload)(struct bpf_preload_info *);
1: +  int (*finish)();
1: +  struct module *owner;
1:  };
1:  
1:  enum bpf_type {
1: -	BPF_TYPE_UNSPEC = 0,
1: -	BPF_TYPE_PROG = 1,
1: -	BPF_TYPE_MAP = 2,
1: -	BPF_TYPE_LINK = 3,
1: +  BPF_TYPE_UNSPEC = 0,
1: +  BPF_TYPE_PROG = 1,
1: +  BPF_TYPE_MAP = 2,
1: +  BPF_TYPE_LINK = 3,
1:  };
1:  
1:  struct map_iter {
1: -	void *key;
1: -	bool done;
1: +  void *key;
1: +  bool done;
1:  };
1:  
1:  enum {
1: -	OPT_MODE = 0,
1: +  OPT_MODE = 0,
1:  };
1:  
1:  struct bpf_mount_opts {
1: -	umode_t mode;
1: +  umode_t mode;
1:  };
1:  
1:  struct bpf_pidns_info {
1: -	__u32 pid;
1: -	__u32 tgid;
1: +  __u32 pid;
1: +  __u32 tgid;
1:  };
1:  
1:  typedef u64 (*btf_bpf_map_lookup_elem)(struct bpf_map *, void *);
1: @@ -34476,9 +34818,11 @@ typedef u64 (*btf_bpf_strtol)(const char *, size_t, u64, long int *);
1:  
1:  typedef u64 (*btf_bpf_strtoul)(const char *, size_t, u64, long unsigned int *);
1:  
1: -typedef u64 (*btf_bpf_get_ns_current_pid_tgid)(u64, u64, struct bpf_pidns_info *, u32);
1: +typedef u64 (*btf_bpf_get_ns_current_pid_tgid)(u64, u64,
1: +                                               struct bpf_pidns_info *, u32);
1:  
1: -typedef u64 (*btf_bpf_event_output_data)(void *, struct bpf_map *, u64, void *, u64);
1: +typedef u64 (*btf_bpf_event_output_data)(void *, struct bpf_map *, u64, void *,
1: +                                         u64);
1:  
1:  typedef u64 (*btf_bpf_copy_from_user)(void *, u32, const void *);
1:  
1: @@ -34487,1919 +34831,1923 @@ typedef u64 (*btf_bpf_per_cpu_ptr)(const void *, u32);
1:  typedef u64 (*btf_bpf_this_cpu_ptr)(const void *);
1:  
1:  union bpf_iter_link_info {
1: -	struct {
1: -		__u32 map_fd;
1: -	} map;
1: +  struct {
1: +    __u32 map_fd;
1: +  } map;
1:  };
1:  
1: -typedef int (*bpf_iter_attach_target_t)(struct bpf_prog *, union bpf_iter_link_info *, struct bpf_iter_aux_info *);
1: +typedef int (*bpf_iter_attach_target_t)(struct bpf_prog *,
1: +                                        union bpf_iter_link_info *,
1: +                                        struct bpf_iter_aux_info *);
1:  
1:  typedef void (*bpf_iter_detach_target_t)(struct bpf_iter_aux_info *);
1:  
1: -typedef void (*bpf_iter_show_fdinfo_t)(const struct bpf_iter_aux_info *, struct seq_file *);
1: +typedef void (*bpf_iter_show_fdinfo_t)(const struct bpf_iter_aux_info *,
1: +                                       struct seq_file *);
1:  
1: -typedef int (*bpf_iter_fill_link_info_t)(const struct bpf_iter_aux_info *, struct bpf_link_info *);
1: +typedef int (*bpf_iter_fill_link_info_t)(const struct bpf_iter_aux_info *,
1: +                                         struct bpf_link_info *);
1:  
1:  enum bpf_iter_feature {
1: -	BPF_ITER_RESCHED = 1,
1: +  BPF_ITER_RESCHED = 1,
1:  };
1:  
1:  struct bpf_iter_reg {
1: -	const char *target;
1: -	bpf_iter_attach_target_t attach_target;
1: -	bpf_iter_detach_target_t detach_target;
1: -	bpf_iter_show_fdinfo_t show_fdinfo;
1: -	bpf_iter_fill_link_info_t fill_link_info;
1: -	u32 ctx_arg_info_size;
1: -	u32 feature;
1: -	struct bpf_ctx_arg_aux ctx_arg_info[2];
1: -	const struct bpf_iter_seq_info *seq_info;
1: +  const char *target;
1: +  bpf_iter_attach_target_t attach_target;
1: +  bpf_iter_detach_target_t detach_target;
1: +  bpf_iter_show_fdinfo_t show_fdinfo;
1: +  bpf_iter_fill_link_info_t fill_link_info;
1: +  u32 ctx_arg_info_size;
1: +  u32 feature;
1: +  struct bpf_ctx_arg_aux ctx_arg_info[2];
1: +  const struct bpf_iter_seq_info *seq_info;
1:  };
1:  
1:  struct bpf_iter_meta {
1: -	union {
1: -		struct seq_file *seq;
1: -	};
1: -	u64 session_id;
1: -	u64 seq_num;
1: +  union {
1: +    struct seq_file *seq;
1: +  };
1: +  u64 session_id;
1: +  u64 seq_num;
1:  };
1:  
1:  struct bpf_iter_target_info {
1: -	struct list_head list;
1: -	const struct bpf_iter_reg *reg_info;
1: -	u32 btf_id;
1: +  struct list_head list;
1: +  const struct bpf_iter_reg *reg_info;
1: +  u32 btf_id;
1:  };
1:  
1:  struct bpf_iter_link {
1: -	struct bpf_link link;
1: -	struct bpf_iter_aux_info aux;
1: -	struct bpf_iter_target_info *tinfo;
1: +  struct bpf_link link;
1: +  struct bpf_iter_aux_info aux;
1: +  struct bpf_iter_target_info *tinfo;
1:  };
1:  
1:  struct bpf_iter_priv_data {
1: -	struct bpf_iter_target_info *tinfo;
1: -	const struct bpf_iter_seq_info *seq_info;
1: -	struct bpf_prog *prog;
1: -	u64 session_id;
1: -	u64 seq_num;
1: -	bool done_stop;
1: -	long: 56;
1: -	u8 target_private[0];
1: +  struct bpf_iter_target_info *tinfo;
1: +  const struct bpf_iter_seq_info *seq_info;
1: +  struct bpf_prog *prog;
1: +  u64 session_id;
1: +  u64 seq_num;
1: +  bool done_stop;
1: +  long : 56;
1: +  u8 target_private[0];
1:  };
1:  
1:  struct bpf_iter_seq_map_info {
1: -	u32 map_id;
1: +  u32 map_id;
1:  };
1:  
1:  struct bpf_iter__bpf_map {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct bpf_map *map;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct bpf_map *map;
1: +  };
1:  };
1:  
1:  struct bpf_iter_seq_task_common {
1: -	struct pid_namespace *ns;
1: +  struct pid_namespace *ns;
1:  };
1:  
1:  struct bpf_iter_seq_task_info {
1: -	struct bpf_iter_seq_task_common common;
1: -	u32 tid;
1: +  struct bpf_iter_seq_task_common common;
1: +  u32 tid;
1:  };
1:  
1:  struct bpf_iter__task {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct task_struct *task;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct task_struct *task;
1: +  };
1:  };
1:  
1:  struct bpf_iter_seq_task_file_info {
1: -	struct bpf_iter_seq_task_common common;
1: -	struct task_struct *task;
1: -	struct files_struct *files;
1: -	u32 tid;
1: -	u32 fd;
1: +  struct bpf_iter_seq_task_common common;
1: +  struct task_struct *task;
1: +  struct files_struct *files;
1: +  u32 tid;
1: +  u32 fd;
1:  };
1:  
1:  struct bpf_iter__task_file {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct task_struct *task;
1: -	};
1: -	u32 fd;
1: -	union {
1: -		struct file *file;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct task_struct *task;
1: +  };
1: +  u32 fd;
1: +  union {
1: +    struct file *file;
1: +  };
1:  };
1:  
1:  struct bpf_iter_seq_prog_info {
1: -	u32 prog_id;
1: +  u32 prog_id;
1:  };
1:  
1:  struct bpf_iter__bpf_prog {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct bpf_prog *prog;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct bpf_prog *prog;
1: +  };
1:  };
1:  
1:  struct bpf_iter__bpf_map_elem {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct bpf_map *map;
1: -	};
1: -	union {
1: -		void *key;
1: -	};
1: -	union {
1: -		void *value;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct bpf_map *map;
1: +  };
1: +  union {
1: +    void *key;
1: +  };
1: +  union {
1: +    void *value;
1: +  };
1:  };
1:  
1:  struct hlist_nulls_head {
1: -	struct hlist_nulls_node *first;
1: +  struct hlist_nulls_node *first;
1:  };
1:  
1:  struct pcpu_freelist_node;
1:  
1:  struct pcpu_freelist_head {
1: -	struct pcpu_freelist_node *first;
1: -	raw_spinlock_t lock;
1: +  struct pcpu_freelist_node *first;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct pcpu_freelist_node {
1: -	struct pcpu_freelist_node *next;
1: +  struct pcpu_freelist_node *next;
1:  };
1:  
1:  struct pcpu_freelist {
1: -	struct pcpu_freelist_head *freelist;
1: -	struct pcpu_freelist_head extralist;
1: +  struct pcpu_freelist_head *freelist;
1: +  struct pcpu_freelist_head extralist;
1:  };
1:  
1:  struct bpf_lru_node {
1: -	struct list_head list;
1: -	u16 cpu;
1: -	u8 type;
1: -	u8 ref;
1: +  struct list_head list;
1: +  u16 cpu;
1: +  u8 type;
1: +  u8 ref;
1:  };
1:  
1:  struct bpf_lru_list {
1: -	struct list_head lists[3];
1: -	unsigned int counts[2];
1: -	struct list_head *next_inactive_rotation;
1: -	raw_spinlock_t lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct list_head lists[3];
1: +  unsigned int counts[2];
1: +  struct list_head *next_inactive_rotation;
1: +  raw_spinlock_t lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_lru_locallist {
1: -	struct list_head lists[2];
1: -	u16 next_steal;
1: -	raw_spinlock_t lock;
1: +  struct list_head lists[2];
1: +  u16 next_steal;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct bpf_common_lru {
1: -	struct bpf_lru_list lru_list;
1: -	struct bpf_lru_locallist *local_list;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_lru_list lru_list;
1: +  struct bpf_lru_locallist *local_list;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  typedef bool (*del_from_htab_func)(void *, struct bpf_lru_node *);
1:  
1:  struct bpf_lru {
1: -	union {
1: -		struct bpf_common_lru common_lru;
1: -		struct bpf_lru_list *percpu_lru;
1: -	};
1: -	del_from_htab_func del_from_htab;
1: -	void *del_arg;
1: -	unsigned int hash_offset;
1: -	unsigned int nr_scans;
1: -	bool percpu;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  union {
1: +    struct bpf_common_lru common_lru;
1: +    struct bpf_lru_list *percpu_lru;
1: +  };
1: +  del_from_htab_func del_from_htab;
1: +  void *del_arg;
1: +  unsigned int hash_offset;
1: +  unsigned int nr_scans;
1: +  bool percpu;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bucket {
1: -	struct hlist_nulls_head head;
1: -	union {
1: -		raw_spinlock_t raw_lock;
1: -		spinlock_t lock;
1: -	};
1: +  struct hlist_nulls_head head;
1: +  union {
1: +    raw_spinlock_t raw_lock;
1: +    spinlock_t lock;
1: +  };
1:  };
1:  
1:  struct htab_elem;
1:  
1:  struct bpf_htab {
1: -	struct bpf_map map;
1: -	struct bucket *buckets;
1: -	void *elems;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	union {
1: -		struct pcpu_freelist freelist;
1: -		struct bpf_lru lru;
1: -	};
1: -	struct htab_elem **extra_elems;
1: -	atomic_t count;
1: -	u32 n_buckets;
1: -	u32 elem_size;
1: -	u32 hashrnd;
1: -	struct lock_class_key lockdep_key;
1: -	int *map_locked[8];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct bucket *buckets;
1: +  void *elems;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  union {
1: +    struct pcpu_freelist freelist;
1: +    struct bpf_lru lru;
1: +  };
1: +  struct htab_elem **extra_elems;
1: +  atomic_t count;
1: +  u32 n_buckets;
1: +  u32 elem_size;
1: +  u32 hashrnd;
1: +  struct lock_class_key lockdep_key;
1: +  int *map_locked[8];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct htab_elem {
1: -	union {
1: -		struct hlist_nulls_node hash_node;
1: -		struct {
1: -			void *padding;
1: -			union {
1: -				struct bpf_htab *htab;
1: -				struct pcpu_freelist_node fnode;
1: -				struct htab_elem *batch_flink;
1: -			};
1: -		};
1: -	};
1: -	union {
1: -		struct callback_head rcu;
1: -		struct bpf_lru_node lru_node;
1: -	};
1: -	u32 hash;
1: -	int: 32;
1: -	char key[0];
1: +  union {
1: +    struct hlist_nulls_node hash_node;
1: +    struct {
1: +      void *padding;
1: +      union {
1: +        struct bpf_htab *htab;
1: +        struct pcpu_freelist_node fnode;
1: +        struct htab_elem *batch_flink;
1: +      };
1: +    };
1: +  };
1: +  union {
1: +    struct callback_head rcu;
1: +    struct bpf_lru_node lru_node;
1: +  };
1: +  u32 hash;
1: +  int : 32;
1: +  char key[0];
1:  };
1:  
1:  struct bpf_iter_seq_hash_map_info {
1: -	struct bpf_map *map;
1: -	struct bpf_htab *htab;
1: -	void *percpu_value_buf;
1: -	u32 bucket_id;
1: -	u32 skip_elems;
1: +  struct bpf_map *map;
1: +  struct bpf_htab *htab;
1: +  void *percpu_value_buf;
1: +  u32 bucket_id;
1: +  u32 skip_elems;
1:  };
1:  
1:  struct bpf_iter_seq_array_map_info {
1: -	struct bpf_map *map;
1: -	void *percpu_value_buf;
1: -	u32 index;
1: +  struct bpf_map *map;
1: +  void *percpu_value_buf;
1: +  u32 index;
1:  };
1:  
1:  struct prog_poke_elem {
1: -	struct list_head list;
1: -	struct bpf_prog_aux *aux;
1: +  struct list_head list;
1: +  struct bpf_prog_aux *aux;
1:  };
1:  
1:  enum bpf_lru_list_type {
1: -	BPF_LRU_LIST_T_ACTIVE = 0,
1: -	BPF_LRU_LIST_T_INACTIVE = 1,
1: -	BPF_LRU_LIST_T_FREE = 2,
1: -	BPF_LRU_LOCAL_LIST_T_FREE = 3,
1: -	BPF_LRU_LOCAL_LIST_T_PENDING = 4,
1: +  BPF_LRU_LIST_T_ACTIVE = 0,
1: +  BPF_LRU_LIST_T_INACTIVE = 1,
1: +  BPF_LRU_LIST_T_FREE = 2,
1: +  BPF_LRU_LOCAL_LIST_T_FREE = 3,
1: +  BPF_LRU_LOCAL_LIST_T_PENDING = 4,
1:  };
1:  
1:  struct bpf_lpm_trie_key {
1: -	__u32 prefixlen;
1: -	__u8 data[0];
1: +  __u32 prefixlen;
1: +  __u8 data[0];
1:  };
1:  
1:  struct lpm_trie_node {
1: -	struct callback_head rcu;
1: -	struct lpm_trie_node *child[2];
1: -	u32 prefixlen;
1: -	u32 flags;
1: -	u8 data[0];
1: +  struct callback_head rcu;
1: +  struct lpm_trie_node *child[2];
1: +  u32 prefixlen;
1: +  u32 flags;
1: +  u8 data[0];
1:  };
1:  
1:  struct lpm_trie {
1: -	struct bpf_map map;
1: -	struct lpm_trie_node *root;
1: -	size_t n_entries;
1: -	size_t max_prefixlen;
1: -	size_t data_size;
1: -	spinlock_t lock;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct lpm_trie_node *root;
1: +  size_t n_entries;
1: +  size_t max_prefixlen;
1: +  size_t data_size;
1: +  spinlock_t lock;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_cgroup_storage_map {
1: -	struct bpf_map map;
1: -	spinlock_t lock;
1: -	struct rb_root root;
1: -	struct list_head list;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  spinlock_t lock;
1: +  struct rb_root root;
1: +  struct list_head list;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_queue_stack {
1: -	struct bpf_map map;
1: -	raw_spinlock_t lock;
1: -	u32 head;
1: -	u32 tail;
1: -	u32 size;
1: -	int: 32;
1: -	char elements[0];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  raw_spinlock_t lock;
1: +  u32 head;
1: +  u32 tail;
1: +  u32 size;
1: +  int : 32;
1: +  char elements[0];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum {
1: -	BPF_RB_NO_WAKEUP = 1,
1: -	BPF_RB_FORCE_WAKEUP = 2,
1: +  BPF_RB_NO_WAKEUP = 1,
1: +  BPF_RB_FORCE_WAKEUP = 2,
1:  };
1:  
1:  enum {
1: -	BPF_RB_AVAIL_DATA = 0,
1: -	BPF_RB_RING_SIZE = 1,
1: -	BPF_RB_CONS_POS = 2,
1: -	BPF_RB_PROD_POS = 3,
1: +  BPF_RB_AVAIL_DATA = 0,
1: +  BPF_RB_RING_SIZE = 1,
1: +  BPF_RB_CONS_POS = 2,
1: +  BPF_RB_PROD_POS = 3,
1:  };
1:  
1:  enum {
1: -	BPF_RINGBUF_BUSY_BIT = 2147483648,
1: -	BPF_RINGBUF_DISCARD_BIT = 1073741824,
1: -	BPF_RINGBUF_HDR_SZ = 8,
1: +  BPF_RINGBUF_BUSY_BIT = 2147483648,
1: +  BPF_RINGBUF_DISCARD_BIT = 1073741824,
1: +  BPF_RINGBUF_HDR_SZ = 8,
1:  };
1:  
1:  struct bpf_ringbuf {
1: -	wait_queue_head_t waitq;
1: -	struct irq_work work;
1: -	u64 mask;
1: -	struct page **pages;
1: -	int nr_pages;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	spinlock_t spinlock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long unsigned int consumer_pos;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long unsigned int producer_pos;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	char data[0];
1: +  wait_queue_head_t waitq;
1: +  struct irq_work work;
1: +  u64 mask;
1: +  struct page **pages;
1: +  int nr_pages;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  spinlock_t spinlock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long unsigned int consumer_pos;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long unsigned int producer_pos;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  char data[0];
1:  };
1:  
1:  struct bpf_ringbuf_map {
1: -	struct bpf_map map;
1: -	struct bpf_ringbuf *rb;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct bpf_ringbuf *rb;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_ringbuf_hdr {
1: -	u32 len;
1: -	u32 pg_off;
1: +  u32 len;
1: +  u32 pg_off;
1:  };
1:  
1:  typedef u64 (*btf_bpf_ringbuf_reserve)(struct bpf_map *, u64, u64);
1: @@ -36413,335 +36761,338 @@ typedef u64 (*btf_bpf_ringbuf_output)(struct bpf_map *, void *, u64, u64);
1:  typedef u64 (*btf_bpf_ringbuf_query)(struct bpf_map *, u64);
1:  
1:  enum {
1: -	BPF_LOCAL_STORAGE_GET_F_CREATE = 1,
1: -	BPF_SK_STORAGE_GET_F_CREATE = 1,
1: +  BPF_LOCAL_STORAGE_GET_F_CREATE = 1,
1: +  BPF_SK_STORAGE_GET_F_CREATE = 1,
1:  };
1:  
1:  struct bpf_local_storage_elem {
1: -	struct hlist_node map_node;
1: -	struct hlist_node snode;
1: -	struct bpf_local_storage *local_storage;
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	struct bpf_local_storage_data sdata;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct hlist_node map_node;
1: +  struct hlist_node snode;
1: +  struct bpf_local_storage *local_storage;
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  struct bpf_local_storage_data sdata;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_local_storage_cache {
1: -	spinlock_t idx_lock;
1: -	u64 idx_usage_counts[16];
1: +  spinlock_t idx_lock;
1: +  u64 idx_usage_counts[16];
1:  };
1:  
1:  struct lsm_blob_sizes {
1: -	int lbs_cred;
1: -	int lbs_file;
1: -	int lbs_inode;
1: -	int lbs_ipc;
1: -	int lbs_msg_msg;
1: -	int lbs_task;
1: +  int lbs_cred;
1: +  int lbs_file;
1: +  int lbs_inode;
1: +  int lbs_ipc;
1: +  int lbs_msg_msg;
1: +  int lbs_task;
1:  };
1:  
1:  struct bpf_storage_blob {
1: -	struct bpf_local_storage *storage;
1: +  struct bpf_local_storage *storage;
1:  };
1:  
1: -typedef u64 (*btf_bpf_inode_storage_get)(struct bpf_map *, struct inode *, void *, u64);
1: +typedef u64 (*btf_bpf_inode_storage_get)(struct bpf_map *, struct inode *,
1: +                                         void *, u64);
1:  
1:  typedef u64 (*btf_bpf_inode_storage_delete)(struct bpf_map *, struct inode *);
1:  
1: -typedef u64 (*btf_bpf_task_storage_get)(struct bpf_map *, struct task_struct *, void *, u64);
1: +typedef u64 (*btf_bpf_task_storage_get)(struct bpf_map *, struct task_struct *,
1: +                                        void *, u64);
1:  
1: -typedef u64 (*btf_bpf_task_storage_delete)(struct bpf_map *, struct task_struct *);
1: +typedef u64 (*btf_bpf_task_storage_delete)(struct bpf_map *,
1: +                                           struct task_struct *);
1:  
1:  struct btf_enum {
1: -	__u32 name_off;
1: -	__s32 val;
1: +  __u32 name_off;
1: +  __s32 val;
1:  };
1:  
1:  struct btf_array {
1: -	__u32 type;
1: -	__u32 index_type;
1: -	__u32 nelems;
1: +  __u32 type;
1: +  __u32 index_type;
1: +  __u32 nelems;
1:  };
1:  
1:  struct btf_param {
1: -	__u32 name_off;
1: -	__u32 type;
1: +  __u32 name_off;
1: +  __u32 type;
1:  };
1:  
1:  enum {
1: -	BTF_VAR_STATIC = 0,
1: -	BTF_VAR_GLOBAL_ALLOCATED = 1,
1: -	BTF_VAR_GLOBAL_EXTERN = 2,
1: +  BTF_VAR_STATIC = 0,
1: +  BTF_VAR_GLOBAL_ALLOCATED = 1,
1: +  BTF_VAR_GLOBAL_EXTERN = 2,
1:  };
1:  
1:  struct btf_var {
1: -	__u32 linkage;
1: +  __u32 linkage;
1:  };
1:  
1:  struct bpf_flow_keys {
1: -	__u16 nhoff;
1: -	__u16 thoff;
1: -	__u16 addr_proto;
1: -	__u8 is_frag;
1: -	__u8 is_first_frag;
1: -	__u8 is_encap;
1: -	__u8 ip_proto;
1: -	__be16 n_proto;
1: -	__be16 sport;
1: -	__be16 dport;
1: -	union {
1: -		struct {
1: -			__be32 ipv4_src;
1: -			__be32 ipv4_dst;
1: -		};
1: -		struct {
1: -			__u32 ipv6_src[4];
1: -			__u32 ipv6_dst[4];
1: -		};
1: -	};
1: -	__u32 flags;
1: -	__be32 flow_label;
1: +  __u16 nhoff;
1: +  __u16 thoff;
1: +  __u16 addr_proto;
1: +  __u8 is_frag;
1: +  __u8 is_first_frag;
1: +  __u8 is_encap;
1: +  __u8 ip_proto;
1: +  __be16 n_proto;
1: +  __be16 sport;
1: +  __be16 dport;
1: +  union {
1: +    struct {
1: +      __be32 ipv4_src;
1: +      __be32 ipv4_dst;
1: +    };
1: +    struct {
1: +      __u32 ipv6_src[4];
1: +      __u32 ipv6_dst[4];
1: +    };
1: +  };
1: +  __u32 flags;
1: +  __be32 flow_label;
1:  };
1:  
1:  struct bpf_sock {
1: -	__u32 bound_dev_if;
1: -	__u32 family;
1: -	__u32 type;
1: -	__u32 protocol;
1: -	__u32 mark;
1: -	__u32 priority;
1: -	__u32 src_ip4;
1: -	__u32 src_ip6[4];
1: -	__u32 src_port;
1: -	__u32 dst_port;
1: -	__u32 dst_ip4;
1: -	__u32 dst_ip6[4];
1: -	__u32 state;
1: -	__s32 rx_queue_mapping;
1: +  __u32 bound_dev_if;
1: +  __u32 family;
1: +  __u32 type;
1: +  __u32 protocol;
1: +  __u32 mark;
1: +  __u32 priority;
1: +  __u32 src_ip4;
1: +  __u32 src_ip6[4];
1: +  __u32 src_port;
1: +  __u32 dst_port;
1: +  __u32 dst_ip4;
1: +  __u32 dst_ip6[4];
1: +  __u32 state;
1: +  __s32 rx_queue_mapping;
1:  };
1:  
1:  struct __sk_buff {
1: -	__u32 len;
1: -	__u32 pkt_type;
1: -	__u32 mark;
1: -	__u32 queue_mapping;
1: -	__u32 protocol;
1: -	__u32 vlan_present;
1: -	__u32 vlan_tci;
1: -	__u32 vlan_proto;
1: -	__u32 priority;
1: -	__u32 ingress_ifindex;
1: -	__u32 ifindex;
1: -	__u32 tc_index;
1: -	__u32 cb[5];
1: -	__u32 hash;
1: -	__u32 tc_classid;
1: -	__u32 data;
1: -	__u32 data_end;
1: -	__u32 napi_id;
1: -	__u32 family;
1: -	__u32 remote_ip4;
1: -	__u32 local_ip4;
1: -	__u32 remote_ip6[4];
1: -	__u32 local_ip6[4];
1: -	__u32 remote_port;
1: -	__u32 local_port;
1: -	__u32 data_meta;
1: -	union {
1: -		struct bpf_flow_keys *flow_keys;
1: -	};
1: -	__u64 tstamp;
1: -	__u32 wire_len;
1: -	__u32 gso_segs;
1: -	union {
1: -		struct bpf_sock *sk;
1: -	};
1: -	__u32 gso_size;
1: +  __u32 len;
1: +  __u32 pkt_type;
1: +  __u32 mark;
1: +  __u32 queue_mapping;
1: +  __u32 protocol;
1: +  __u32 vlan_present;
1: +  __u32 vlan_tci;
1: +  __u32 vlan_proto;
1: +  __u32 priority;
1: +  __u32 ingress_ifindex;
1: +  __u32 ifindex;
1: +  __u32 tc_index;
1: +  __u32 cb[5];
1: +  __u32 hash;
1: +  __u32 tc_classid;
1: +  __u32 data;
1: +  __u32 data_end;
1: +  __u32 napi_id;
1: +  __u32 family;
1: +  __u32 remote_ip4;
1: +  __u32 local_ip4;
1: +  __u32 remote_ip6[4];
1: +  __u32 local_ip6[4];
1: +  __u32 remote_port;
1: +  __u32 local_port;
1: +  __u32 data_meta;
1: +  union {
1: +    struct bpf_flow_keys *flow_keys;
1: +  };
1: +  __u64 tstamp;
1: +  __u32 wire_len;
1: +  __u32 gso_segs;
1: +  union {
1: +    struct bpf_sock *sk;
1: +  };
1: +  __u32 gso_size;
1:  };
1:  
1:  struct xdp_md {
1: -	__u32 data;
1: -	__u32 data_end;
1: -	__u32 data_meta;
1: -	__u32 ingress_ifindex;
1: -	__u32 rx_queue_index;
1: -	__u32 egress_ifindex;
1: +  __u32 data;
1: +  __u32 data_end;
1: +  __u32 data_meta;
1: +  __u32 ingress_ifindex;
1: +  __u32 rx_queue_index;
1: +  __u32 egress_ifindex;
1:  };
1:  
1:  struct sk_msg_md {
1: -	union {
1: -		void *data;
1: -	};
1: -	union {
1: -		void *data_end;
1: -	};
1: -	__u32 family;
1: -	__u32 remote_ip4;
1: -	__u32 local_ip4;
1: -	__u32 remote_ip6[4];
1: -	__u32 local_ip6[4];
1: -	__u32 remote_port;
1: -	__u32 local_port;
1: -	__u32 size;
1: -	union {
1: -		struct bpf_sock *sk;
1: -	};
1: +  union {
1: +    void *data;
1: +  };
1: +  union {
1: +    void *data_end;
1: +  };
1: +  __u32 family;
1: +  __u32 remote_ip4;
1: +  __u32 local_ip4;
1: +  __u32 remote_ip6[4];
1: +  __u32 local_ip6[4];
1: +  __u32 remote_port;
1: +  __u32 local_port;
1: +  __u32 size;
1: +  union {
1: +    struct bpf_sock *sk;
1: +  };
1:  };
1:  
1:  struct sk_reuseport_md {
1: -	union {
1: -		void *data;
1: -	};
1: -	union {
1: -		void *data_end;
1: -	};
1: -	__u32 len;
1: -	__u32 eth_protocol;
1: -	__u32 ip_protocol;
1: -	__u32 bind_inany;
1: -	__u32 hash;
1: +  union {
1: +    void *data;
1: +  };
1: +  union {
1: +    void *data_end;
1: +  };
1: +  __u32 len;
1: +  __u32 eth_protocol;
1: +  __u32 ip_protocol;
1: +  __u32 bind_inany;
1: +  __u32 hash;
1:  };
1:  
1:  struct bpf_sock_addr {
1: -	__u32 user_family;
1: -	__u32 user_ip4;
1: -	__u32 user_ip6[4];
1: -	__u32 user_port;
1: -	__u32 family;
1: -	__u32 type;
1: -	__u32 protocol;
1: -	__u32 msg_src_ip4;
1: -	__u32 msg_src_ip6[4];
1: -	union {
1: -		struct bpf_sock *sk;
1: -	};
1: +  __u32 user_family;
1: +  __u32 user_ip4;
1: +  __u32 user_ip6[4];
1: +  __u32 user_port;
1: +  __u32 family;
1: +  __u32 type;
1: +  __u32 protocol;
1: +  __u32 msg_src_ip4;
1: +  __u32 msg_src_ip6[4];
1: +  union {
1: +    struct bpf_sock *sk;
1: +  };
1:  };
1:  
1:  struct bpf_sock_ops {
1: -	__u32 op;
1: -	union {
1: -		__u32 args[4];
1: -		__u32 reply;
1: -		__u32 replylong[4];
1: -	};
1: -	__u32 family;
1: -	__u32 remote_ip4;
1: -	__u32 local_ip4;
1: -	__u32 remote_ip6[4];
1: -	__u32 local_ip6[4];
1: -	__u32 remote_port;
1: -	__u32 local_port;
1: -	__u32 is_fullsock;
1: -	__u32 snd_cwnd;
1: -	__u32 srtt_us;
1: -	__u32 bpf_sock_ops_cb_flags;
1: -	__u32 state;
1: -	__u32 rtt_min;
1: -	__u32 snd_ssthresh;
1: -	__u32 rcv_nxt;
1: -	__u32 snd_nxt;
1: -	__u32 snd_una;
1: -	__u32 mss_cache;
1: -	__u32 ecn_flags;
1: -	__u32 rate_delivered;
1: -	__u32 rate_interval_us;
1: -	__u32 packets_out;
1: -	__u32 retrans_out;
1: -	__u32 total_retrans;
1: -	__u32 segs_in;
1: -	__u32 data_segs_in;
1: -	__u32 segs_out;
1: -	__u32 data_segs_out;
1: -	__u32 lost_out;
1: -	__u32 sacked_out;
1: -	__u32 sk_txhash;
1: -	__u64 bytes_received;
1: -	__u64 bytes_acked;
1: -	union {
1: -		struct bpf_sock *sk;
1: -	};
1: -	union {
1: -		void *skb_data;
1: -	};
1: -	union {
1: -		void *skb_data_end;
1: -	};
1: -	__u32 skb_len;
1: -	__u32 skb_tcp_flags;
1: +  __u32 op;
1: +  union {
1: +    __u32 args[4];
1: +    __u32 reply;
1: +    __u32 replylong[4];
1: +  };
1: +  __u32 family;
1: +  __u32 remote_ip4;
1: +  __u32 local_ip4;
1: +  __u32 remote_ip6[4];
1: +  __u32 local_ip6[4];
1: +  __u32 remote_port;
1: +  __u32 local_port;
1: +  __u32 is_fullsock;
1: +  __u32 snd_cwnd;
1: +  __u32 srtt_us;
1: +  __u32 bpf_sock_ops_cb_flags;
1: +  __u32 state;
1: +  __u32 rtt_min;
1: +  __u32 snd_ssthresh;
1: +  __u32 rcv_nxt;
1: +  __u32 snd_nxt;
1: +  __u32 snd_una;
1: +  __u32 mss_cache;
1: +  __u32 ecn_flags;
1: +  __u32 rate_delivered;
1: +  __u32 rate_interval_us;
1: +  __u32 packets_out;
1: +  __u32 retrans_out;
1: +  __u32 total_retrans;
1: +  __u32 segs_in;
1: +  __u32 data_segs_in;
1: +  __u32 segs_out;
1: +  __u32 data_segs_out;
1: +  __u32 lost_out;
1: +  __u32 sacked_out;
1: +  __u32 sk_txhash;
1: +  __u64 bytes_received;
1: +  __u64 bytes_acked;
1: +  union {
1: +    struct bpf_sock *sk;
1: +  };
1: +  union {
1: +    void *skb_data;
1: +  };
1: +  union {
1: +    void *skb_data_end;
1: +  };
1: +  __u32 skb_len;
1: +  __u32 skb_tcp_flags;
1:  };
1:  
1:  struct bpf_cgroup_dev_ctx {
1: -	__u32 access_type;
1: -	__u32 major;
1: -	__u32 minor;
1: +  __u32 access_type;
1: +  __u32 major;
1: +  __u32 minor;
1:  };
1:  
1:  struct bpf_sysctl {
1: -	__u32 write;
1: -	__u32 file_pos;
1: +  __u32 write;
1: +  __u32 file_pos;
1:  };
1:  
1:  struct bpf_sockopt {
1: -	union {
1: -		struct bpf_sock *sk;
1: -	};
1: -	union {
1: -		void *optval;
1: -	};
1: -	union {
1: -		void *optval_end;
1: -	};
1: -	__s32 level;
1: -	__s32 optname;
1: -	__s32 optlen;
1: -	__s32 retval;
1: +  union {
1: +    struct bpf_sock *sk;
1: +  };
1: +  union {
1: +    void *optval;
1: +  };
1: +  union {
1: +    void *optval_end;
1: +  };
1: +  __s32 level;
1: +  __s32 optname;
1: +  __s32 optlen;
1: +  __s32 retval;
1:  };
1:  
1:  struct bpf_sk_lookup {
1: -	union {
1: -		struct bpf_sock *sk;
1: -	};
1: -	__u32 family;
1: -	__u32 protocol;
1: -	__u32 remote_ip4;
1: -	__u32 remote_ip6[4];
1: -	__u32 remote_port;
1: -	__u32 local_ip4;
1: -	__u32 local_ip6[4];
1: -	__u32 local_port;
1: +  union {
1: +    struct bpf_sock *sk;
1: +  };
1: +  __u32 family;
1: +  __u32 protocol;
1: +  __u32 remote_ip4;
1: +  __u32 remote_ip6[4];
1: +  __u32 remote_port;
1: +  __u32 local_ip4;
1: +  __u32 local_ip6[4];
1: +  __u32 local_port;
1:  };
1:  
1:  struct sk_reuseport_kern {
1: -	struct sk_buff *skb;
1: -	struct sock *sk;
1: -	struct sock *selected_sk;
1: -	void *data_end;
1: -	u32 hash;
1: -	u32 reuseport_id;
1: -	bool bind_inany;
1: +  struct sk_buff *skb;
1: +  struct sock *sk;
1: +  struct sock *selected_sk;
1: +  void *data_end;
1: +  u32 hash;
1: +  u32 reuseport_id;
1: +  bool bind_inany;
1:  };
1:  
1:  struct bpf_flow_dissector {
1: -	struct bpf_flow_keys *flow_keys;
1: -	const struct sk_buff *skb;
1: -	void *data;
1: -	void *data_end;
1: +  struct bpf_flow_keys *flow_keys;
1: +  const struct sk_buff *skb;
1: +  void *data;
1: +  void *data_end;
1:  };
1:  
1:  struct inet_listen_hashbucket {
1: -	spinlock_t lock;
1: -	unsigned int count;
1: -	union {
1: -		struct hlist_head head;
1: -		struct hlist_nulls_head nulls_head;
1: -	};
1: +  spinlock_t lock;
1: +  unsigned int count;
1: +  union {
1: +    struct hlist_head head;
1: +    struct hlist_nulls_head nulls_head;
1: +  };
1:  };
1:  
1:  struct inet_ehash_bucket;
1: @@ -36749,675 +37100,678 @@ struct inet_ehash_bucket;
1:  struct inet_bind_hashbucket;
1:  
1:  struct inet_hashinfo {
1: -	struct inet_ehash_bucket *ehash;
1: -	spinlock_t *ehash_locks;
1: -	unsigned int ehash_mask;
1: -	unsigned int ehash_locks_mask;
1: -	struct kmem_cache *bind_bucket_cachep;
1: -	struct inet_bind_hashbucket *bhash;
1: -	unsigned int bhash_size;
1: -	unsigned int lhash2_mask;
1: -	struct inet_listen_hashbucket *lhash2;
1: -	long: 64;
1: -	struct inet_listen_hashbucket listening_hash[32];
1: +  struct inet_ehash_bucket *ehash;
1: +  spinlock_t *ehash_locks;
1: +  unsigned int ehash_mask;
1: +  unsigned int ehash_locks_mask;
1: +  struct kmem_cache *bind_bucket_cachep;
1: +  struct inet_bind_hashbucket *bhash;
1: +  unsigned int bhash_size;
1: +  unsigned int lhash2_mask;
1: +  struct inet_listen_hashbucket *lhash2;
1: +  long : 64;
1: +  struct inet_listen_hashbucket listening_hash[32];
1:  };
1:  
1:  struct ip_ra_chain {
1: -	struct ip_ra_chain *next;
1: -	struct sock *sk;
1: -	union {
1: -		void (*destructor)(struct sock *);
1: -		struct sock *saved_sk;
1: -	};
1: -	struct callback_head rcu;
1: +  struct ip_ra_chain *next;
1: +  struct sock *sk;
1: +  union {
1: +    void (*destructor)(struct sock *);
1: +    struct sock *saved_sk;
1: +  };
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct fib_table {
1: -	struct hlist_node tb_hlist;
1: -	u32 tb_id;
1: -	int tb_num_default;
1: -	struct callback_head rcu;
1: -	long unsigned int *tb_data;
1: -	long unsigned int __data[0];
1: +  struct hlist_node tb_hlist;
1: +  u32 tb_id;
1: +  int tb_num_default;
1: +  struct callback_head rcu;
1: +  long unsigned int *tb_data;
1: +  long unsigned int __data[0];
1:  };
1:  
1:  struct inet_peer_base {
1: -	struct rb_root rb_root;
1: -	seqlock_t lock;
1: -	int total;
1: +  struct rb_root rb_root;
1: +  seqlock_t lock;
1: +  int total;
1:  };
1:  
1:  struct tcp_fastopen_context {
1: -	siphash_key_t key[2];
1: -	int num;
1: -	struct callback_head rcu;
1: +  siphash_key_t key[2];
1: +  int num;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct xdp_txq_info {
1: -	struct net_device *dev;
1: +  struct net_device *dev;
1:  };
1:  
1:  struct xdp_buff {
1: -	void *data;
1: -	void *data_end;
1: -	void *data_meta;
1: -	void *data_hard_start;
1: -	struct xdp_rxq_info *rxq;
1: -	struct xdp_txq_info *txq;
1: -	u32 frame_sz;
1: +  void *data;
1: +  void *data_end;
1: +  void *data_meta;
1: +  void *data_hard_start;
1: +  struct xdp_rxq_info *rxq;
1: +  struct xdp_txq_info *txq;
1: +  u32 frame_sz;
1:  };
1:  
1:  struct bpf_sock_addr_kern {
1: -	struct sock *sk;
1: -	struct sockaddr *uaddr;
1: -	u64 tmp_reg;
1: -	void *t_ctx;
1: +  struct sock *sk;
1: +  struct sockaddr *uaddr;
1: +  u64 tmp_reg;
1: +  void *t_ctx;
1:  };
1:  
1:  struct bpf_sock_ops_kern {
1: -	struct sock *sk;
1: -	union {
1: -		u32 args[4];
1: -		u32 reply;
1: -		u32 replylong[4];
1: -	};
1: -	struct sk_buff *syn_skb;
1: -	struct sk_buff *skb;
1: -	void *skb_data_end;
1: -	u8 op;
1: -	u8 is_fullsock;
1: -	u8 remaining_opt_len;
1: -	u64 temp;
1: +  struct sock *sk;
1: +  union {
1: +    u32 args[4];
1: +    u32 reply;
1: +    u32 replylong[4];
1: +  };
1: +  struct sk_buff *syn_skb;
1: +  struct sk_buff *skb;
1: +  void *skb_data_end;
1: +  u8 op;
1: +  u8 is_fullsock;
1: +  u8 remaining_opt_len;
1: +  u64 temp;
1:  };
1:  
1:  struct bpf_sysctl_kern {
1: -	struct ctl_table_header *head;
1: -	struct ctl_table *table;
1: -	void *cur_val;
1: -	size_t cur_len;
1: -	void *new_val;
1: -	size_t new_len;
1: -	int new_updated;
1: -	int write;
1: -	loff_t *ppos;
1: -	u64 tmp_reg;
1: +  struct ctl_table_header *head;
1: +  struct ctl_table *table;
1: +  void *cur_val;
1: +  size_t cur_len;
1: +  void *new_val;
1: +  size_t new_len;
1: +  int new_updated;
1: +  int write;
1: +  loff_t *ppos;
1: +  u64 tmp_reg;
1:  };
1:  
1:  struct bpf_sockopt_kern {
1: -	struct sock *sk;
1: -	u8 *optval;
1: -	u8 *optval_end;
1: -	s32 level;
1: -	s32 optname;
1: -	s32 optlen;
1: -	s32 retval;
1: +  struct sock *sk;
1: +  u8 *optval;
1: +  u8 *optval_end;
1: +  s32 level;
1: +  s32 optname;
1: +  s32 optlen;
1: +  s32 retval;
1:  };
1:  
1:  struct bpf_sk_lookup_kern {
1: -	u16 family;
1: -	u16 protocol;
1: -	__be16 sport;
1: -	u16 dport;
1: -	struct {
1: -		__be32 saddr;
1: -		__be32 daddr;
1: -	} v4;
1: -	struct {
1: -		const struct in6_addr *saddr;
1: -		const struct in6_addr *daddr;
1: -	} v6;
1: -	struct sock *selected_sk;
1: -	bool no_reuseport;
1: +  u16 family;
1: +  u16 protocol;
1: +  __be16 sport;
1: +  u16 dport;
1: +  struct {
1: +    __be32 saddr;
1: +    __be32 daddr;
1: +  } v4;
1: +  struct {
1: +    const struct in6_addr *saddr;
1: +    const struct in6_addr *daddr;
1: +  } v6;
1: +  struct sock *selected_sk;
1: +  bool no_reuseport;
1:  };
1:  
1:  struct sock_reuseport {
1: -	struct callback_head rcu;
1: -	u16 max_socks;
1: -	u16 num_socks;
1: -	unsigned int synq_overflow_ts;
1: -	unsigned int reuseport_id;
1: -	unsigned int bind_inany: 1;
1: -	unsigned int has_conns: 1;
1: -	struct bpf_prog *prog;
1: -	struct sock *socks[0];
1: +  struct callback_head rcu;
1: +  u16 max_socks;
1: +  u16 num_socks;
1: +  unsigned int synq_overflow_ts;
1: +  unsigned int reuseport_id;
1: +  unsigned int bind_inany : 1;
1: +  unsigned int has_conns : 1;
1: +  struct bpf_prog *prog;
1: +  struct sock *socks[0];
1:  };
1:  
1:  struct inet_ehash_bucket {
1: -	struct hlist_nulls_head chain;
1: +  struct hlist_nulls_head chain;
1:  };
1:  
1:  struct inet_bind_hashbucket {
1: -	spinlock_t lock;
1: -	struct hlist_head chain;
1: +  spinlock_t lock;
1: +  struct hlist_head chain;
1:  };
1:  
1:  struct ack_sample {
1: -	u32 pkts_acked;
1: -	s32 rtt_us;
1: -	u32 in_flight;
1: +  u32 pkts_acked;
1: +  s32 rtt_us;
1: +  u32 in_flight;
1:  };
1:  
1:  struct rate_sample {
1: -	u64 prior_mstamp;
1: -	u32 prior_delivered;
1: -	s32 delivered;
1: -	long int interval_us;
1: -	u32 snd_interval_us;
1: -	u32 rcv_interval_us;
1: -	long int rtt_us;
1: -	int losses;
1: -	u32 acked_sacked;
1: -	u32 prior_in_flight;
1: -	bool is_app_limited;
1: -	bool is_retrans;
1: -	bool is_ack_delayed;
1: +  u64 prior_mstamp;
1: +  u32 prior_delivered;
1: +  s32 delivered;
1: +  long int interval_us;
1: +  u32 snd_interval_us;
1: +  u32 rcv_interval_us;
1: +  long int rtt_us;
1: +  int losses;
1: +  u32 acked_sacked;
1: +  u32 prior_in_flight;
1: +  bool is_app_limited;
1: +  bool is_retrans;
1: +  bool is_ack_delayed;
1:  };
1:  
1:  struct sk_msg_sg {
1: -	u32 start;
1: -	u32 curr;
1: -	u32 end;
1: -	u32 size;
1: -	u32 copybreak;
1: -	long unsigned int copy;
1: -	struct scatterlist data[19];
1: +  u32 start;
1: +  u32 curr;
1: +  u32 end;
1: +  u32 size;
1: +  u32 copybreak;
1: +  long unsigned int copy;
1: +  struct scatterlist data[19];
1:  };
1:  
1:  struct sk_msg {
1: -	struct sk_msg_sg sg;
1: -	void *data;
1: -	void *data_end;
1: -	u32 apply_bytes;
1: -	u32 cork_bytes;
1: -	u32 flags;
1: -	struct sk_buff *skb;
1: -	struct sock *sk_redir;
1: -	struct sock *sk;
1: -	struct list_head list;
1: +  struct sk_msg_sg sg;
1: +  void *data;
1: +  void *data_end;
1: +  u32 apply_bytes;
1: +  u32 cork_bytes;
1: +  u32 flags;
1: +  struct sk_buff *skb;
1: +  struct sock *sk_redir;
1: +  struct sock *sk;
1: +  struct list_head list;
1:  };
1:  
1:  enum verifier_phase {
1: -	CHECK_META = 0,
1: -	CHECK_TYPE = 1,
1: +  CHECK_META = 0,
1: +  CHECK_TYPE = 1,
1:  };
1:  
1:  struct resolve_vertex {
1: -	const struct btf_type *t;
1: -	u32 type_id;
1: -	u16 next_member;
1: +  const struct btf_type *t;
1: +  u32 type_id;
1: +  u16 next_member;
1:  };
1:  
1:  enum visit_state {
1: -	NOT_VISITED = 0,
1: -	VISITED = 1,
1: -	RESOLVED = 2,
1: +  NOT_VISITED = 0,
1: +  VISITED = 1,
1: +  RESOLVED = 2,
1:  };
1:  
1:  enum resolve_mode {
1: -	RESOLVE_TBD = 0,
1: -	RESOLVE_PTR = 1,
1: -	RESOLVE_STRUCT_OR_ARRAY = 2,
1: +  RESOLVE_TBD = 0,
1: +  RESOLVE_PTR = 1,
1: +  RESOLVE_STRUCT_OR_ARRAY = 2,
1:  };
1:  
1:  struct btf_sec_info {
1: -	u32 off;
1: -	u32 len;
1: +  u32 off;
1: +  u32 len;
1:  };
1:  
1:  struct btf_verifier_env {
1: -	struct btf *btf;
1: -	u8 *visit_states;
1: -	struct resolve_vertex stack[32];
1: -	struct bpf_verifier_log log;
1: -	u32 log_type_id;
1: -	u32 top_stack;
1: -	enum verifier_phase phase;
1: -	enum resolve_mode resolve_mode;
1: +  struct btf *btf;
1: +  u8 *visit_states;
1: +  struct resolve_vertex stack[32];
1: +  struct bpf_verifier_log log;
1: +  u32 log_type_id;
1: +  u32 top_stack;
1: +  enum verifier_phase phase;
1: +  enum resolve_mode resolve_mode;
1:  };
1:  
1:  struct btf_show {
1: -	u64 flags;
1: -	void *target;
1: -	void (*showfn)(struct btf_show *, const char *, struct __va_list_tag *);
1: -	const struct btf *btf;
1: -	struct {
1: -		u8 depth;
1: -		u8 depth_to_show;
1: -		u8 depth_check;
1: -		u8 array_member: 1;
1: -		u8 array_terminated: 1;
1: -		u16 array_encoding;
1: -		u32 type_id;
1: -		int status;
1: -		const struct btf_type *type;
1: -		const struct btf_member *member;
1: -		char name[80];
1: -	} state;
1: -	struct {
1: -		u32 size;
1: -		void *head;
1: -		void *data;
1: -		u8 safe[32];
1: -	} obj;
1: +  u64 flags;
1: +  void *target;
1: +  void (*showfn)(struct btf_show *, const char *, struct __va_list_tag *);
1: +  const struct btf *btf;
1: +  struct {
1: +    u8 depth;
1: +    u8 depth_to_show;
1: +    u8 depth_check;
1: +    u8 array_member : 1;
1: +    u8 array_terminated : 1;
1: +    u16 array_encoding;
1: +    u32 type_id;
1: +    int status;
1: +    const struct btf_type *type;
1: +    const struct btf_member *member;
1: +    char name[80];
1: +  } state;
1: +  struct {
1: +    u32 size;
1: +    void *head;
1: +    void *data;
1: +    u8 safe[32];
1: +  } obj;
1:  };
1:  
1:  struct btf_kind_operations {
1: -	s32 (*check_meta)(struct btf_verifier_env *, const struct btf_type *, u32);
1: -	int (*resolve)(struct btf_verifier_env *, const struct resolve_vertex *);
1: -	int (*check_member)(struct btf_verifier_env *, const struct btf_type *, const struct btf_member *, const struct btf_type *);
1: -	int (*check_kflag_member)(struct btf_verifier_env *, const struct btf_type *, const struct btf_member *, const struct btf_type *);
1: -	void (*log_details)(struct btf_verifier_env *, const struct btf_type *);
1: -	void (*show)(const struct btf *, const struct btf_type *, u32, void *, u8, struct btf_show *);
1: +  s32 (*check_meta)(struct btf_verifier_env *, const struct btf_type *, u32);
1: +  int (*resolve)(struct btf_verifier_env *, const struct resolve_vertex *);
1: +  int (*check_member)(struct btf_verifier_env *, const struct btf_type *,
1: +                      const struct btf_member *, const struct btf_type *);
1: +  int (*check_kflag_member)(struct btf_verifier_env *, const struct btf_type *,
1: +                            const struct btf_member *, const struct btf_type *);
1: +  void (*log_details)(struct btf_verifier_env *, const struct btf_type *);
1: +  void (*show)(const struct btf *, const struct btf_type *, u32, void *, u8,
1: +               struct btf_show *);
1:  };
1:  
1:  struct bpf_ctx_convert {
1: -	struct __sk_buff BPF_PROG_TYPE_SOCKET_FILTER_prog;
1: -	struct sk_buff BPF_PROG_TYPE_SOCKET_FILTER_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_SCHED_CLS_prog;
1: -	struct sk_buff BPF_PROG_TYPE_SCHED_CLS_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_SCHED_ACT_prog;
1: -	struct sk_buff BPF_PROG_TYPE_SCHED_ACT_kern;
1: -	struct xdp_md BPF_PROG_TYPE_XDP_prog;
1: -	struct xdp_buff BPF_PROG_TYPE_XDP_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_CGROUP_SKB_prog;
1: -	struct sk_buff BPF_PROG_TYPE_CGROUP_SKB_kern;
1: -	struct bpf_sock BPF_PROG_TYPE_CGROUP_SOCK_prog;
1: -	struct sock BPF_PROG_TYPE_CGROUP_SOCK_kern;
1: -	struct bpf_sock_addr BPF_PROG_TYPE_CGROUP_SOCK_ADDR_prog;
1: -	struct bpf_sock_addr_kern BPF_PROG_TYPE_CGROUP_SOCK_ADDR_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_LWT_IN_prog;
1: -	struct sk_buff BPF_PROG_TYPE_LWT_IN_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_LWT_OUT_prog;
1: -	struct sk_buff BPF_PROG_TYPE_LWT_OUT_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_LWT_XMIT_prog;
1: -	struct sk_buff BPF_PROG_TYPE_LWT_XMIT_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_LWT_SEG6LOCAL_prog;
1: -	struct sk_buff BPF_PROG_TYPE_LWT_SEG6LOCAL_kern;
1: -	struct bpf_sock_ops BPF_PROG_TYPE_SOCK_OPS_prog;
1: -	struct bpf_sock_ops_kern BPF_PROG_TYPE_SOCK_OPS_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_SK_SKB_prog;
1: -	struct sk_buff BPF_PROG_TYPE_SK_SKB_kern;
1: -	struct sk_msg_md BPF_PROG_TYPE_SK_MSG_prog;
1: -	struct sk_msg BPF_PROG_TYPE_SK_MSG_kern;
1: -	struct __sk_buff BPF_PROG_TYPE_FLOW_DISSECTOR_prog;
1: -	struct bpf_flow_dissector BPF_PROG_TYPE_FLOW_DISSECTOR_kern;
1: -	bpf_user_pt_regs_t BPF_PROG_TYPE_KPROBE_prog;
1: -	struct pt_regs BPF_PROG_TYPE_KPROBE_kern;
1: -	__u64 BPF_PROG_TYPE_TRACEPOINT_prog;
1: -	u64 BPF_PROG_TYPE_TRACEPOINT_kern;
1: -	struct bpf_perf_event_data BPF_PROG_TYPE_PERF_EVENT_prog;
1: -	struct bpf_perf_event_data_kern BPF_PROG_TYPE_PERF_EVENT_kern;
1: -	struct bpf_raw_tracepoint_args BPF_PROG_TYPE_RAW_TRACEPOINT_prog;
1: -	u64 BPF_PROG_TYPE_RAW_TRACEPOINT_kern;
1: -	struct bpf_raw_tracepoint_args BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE_prog;
1: -	u64 BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE_kern;
1: -	void *BPF_PROG_TYPE_TRACING_prog;
1: -	void *BPF_PROG_TYPE_TRACING_kern;
1: -	struct bpf_cgroup_dev_ctx BPF_PROG_TYPE_CGROUP_DEVICE_prog;
1: -	struct bpf_cgroup_dev_ctx BPF_PROG_TYPE_CGROUP_DEVICE_kern;
1: -	struct bpf_sysctl BPF_PROG_TYPE_CGROUP_SYSCTL_prog;
1: -	struct bpf_sysctl_kern BPF_PROG_TYPE_CGROUP_SYSCTL_kern;
1: -	struct bpf_sockopt BPF_PROG_TYPE_CGROUP_SOCKOPT_prog;
1: -	struct bpf_sockopt_kern BPF_PROG_TYPE_CGROUP_SOCKOPT_kern;
1: -	struct sk_reuseport_md BPF_PROG_TYPE_SK_REUSEPORT_prog;
1: -	struct sk_reuseport_kern BPF_PROG_TYPE_SK_REUSEPORT_kern;
1: -	struct bpf_sk_lookup BPF_PROG_TYPE_SK_LOOKUP_prog;
1: -	struct bpf_sk_lookup_kern BPF_PROG_TYPE_SK_LOOKUP_kern;
1: -	void *BPF_PROG_TYPE_STRUCT_OPS_prog;
1: -	void *BPF_PROG_TYPE_STRUCT_OPS_kern;
1: -	void *BPF_PROG_TYPE_EXT_prog;
1: -	void *BPF_PROG_TYPE_EXT_kern;
1: -	void *BPF_PROG_TYPE_LSM_prog;
1: -	void *BPF_PROG_TYPE_LSM_kern;
1: -};
1: -
1: -enum {
1: -	__ctx_convertBPF_PROG_TYPE_SOCKET_FILTER = 0,
1: -	__ctx_convertBPF_PROG_TYPE_SCHED_CLS = 1,
1: -	__ctx_convertBPF_PROG_TYPE_SCHED_ACT = 2,
1: -	__ctx_convertBPF_PROG_TYPE_XDP = 3,
1: -	__ctx_convertBPF_PROG_TYPE_CGROUP_SKB = 4,
1: -	__ctx_convertBPF_PROG_TYPE_CGROUP_SOCK = 5,
1: -	__ctx_convertBPF_PROG_TYPE_CGROUP_SOCK_ADDR = 6,
1: -	__ctx_convertBPF_PROG_TYPE_LWT_IN = 7,
1: -	__ctx_convertBPF_PROG_TYPE_LWT_OUT = 8,
1: -	__ctx_convertBPF_PROG_TYPE_LWT_XMIT = 9,
1: -	__ctx_convertBPF_PROG_TYPE_LWT_SEG6LOCAL = 10,
1: -	__ctx_convertBPF_PROG_TYPE_SOCK_OPS = 11,
1: -	__ctx_convertBPF_PROG_TYPE_SK_SKB = 12,
1: -	__ctx_convertBPF_PROG_TYPE_SK_MSG = 13,
1: -	__ctx_convertBPF_PROG_TYPE_FLOW_DISSECTOR = 14,
1: -	__ctx_convertBPF_PROG_TYPE_KPROBE = 15,
1: -	__ctx_convertBPF_PROG_TYPE_TRACEPOINT = 16,
1: -	__ctx_convertBPF_PROG_TYPE_PERF_EVENT = 17,
1: -	__ctx_convertBPF_PROG_TYPE_RAW_TRACEPOINT = 18,
1: -	__ctx_convertBPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE = 19,
1: -	__ctx_convertBPF_PROG_TYPE_TRACING = 20,
1: -	__ctx_convertBPF_PROG_TYPE_CGROUP_DEVICE = 21,
1: -	__ctx_convertBPF_PROG_TYPE_CGROUP_SYSCTL = 22,
1: -	__ctx_convertBPF_PROG_TYPE_CGROUP_SOCKOPT = 23,
1: -	__ctx_convertBPF_PROG_TYPE_SK_REUSEPORT = 24,
1: -	__ctx_convertBPF_PROG_TYPE_SK_LOOKUP = 25,
1: -	__ctx_convertBPF_PROG_TYPE_STRUCT_OPS = 26,
1: -	__ctx_convertBPF_PROG_TYPE_EXT = 27,
1: -	__ctx_convertBPF_PROG_TYPE_LSM = 28,
1: -	__ctx_convert_unused = 29,
1: +  struct __sk_buff BPF_PROG_TYPE_SOCKET_FILTER_prog;
1: +  struct sk_buff BPF_PROG_TYPE_SOCKET_FILTER_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_SCHED_CLS_prog;
1: +  struct sk_buff BPF_PROG_TYPE_SCHED_CLS_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_SCHED_ACT_prog;
1: +  struct sk_buff BPF_PROG_TYPE_SCHED_ACT_kern;
1: +  struct xdp_md BPF_PROG_TYPE_XDP_prog;
1: +  struct xdp_buff BPF_PROG_TYPE_XDP_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_CGROUP_SKB_prog;
1: +  struct sk_buff BPF_PROG_TYPE_CGROUP_SKB_kern;
1: +  struct bpf_sock BPF_PROG_TYPE_CGROUP_SOCK_prog;
1: +  struct sock BPF_PROG_TYPE_CGROUP_SOCK_kern;
1: +  struct bpf_sock_addr BPF_PROG_TYPE_CGROUP_SOCK_ADDR_prog;
1: +  struct bpf_sock_addr_kern BPF_PROG_TYPE_CGROUP_SOCK_ADDR_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_LWT_IN_prog;
1: +  struct sk_buff BPF_PROG_TYPE_LWT_IN_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_LWT_OUT_prog;
1: +  struct sk_buff BPF_PROG_TYPE_LWT_OUT_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_LWT_XMIT_prog;
1: +  struct sk_buff BPF_PROG_TYPE_LWT_XMIT_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_LWT_SEG6LOCAL_prog;
1: +  struct sk_buff BPF_PROG_TYPE_LWT_SEG6LOCAL_kern;
1: +  struct bpf_sock_ops BPF_PROG_TYPE_SOCK_OPS_prog;
1: +  struct bpf_sock_ops_kern BPF_PROG_TYPE_SOCK_OPS_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_SK_SKB_prog;
1: +  struct sk_buff BPF_PROG_TYPE_SK_SKB_kern;
1: +  struct sk_msg_md BPF_PROG_TYPE_SK_MSG_prog;
1: +  struct sk_msg BPF_PROG_TYPE_SK_MSG_kern;
1: +  struct __sk_buff BPF_PROG_TYPE_FLOW_DISSECTOR_prog;
1: +  struct bpf_flow_dissector BPF_PROG_TYPE_FLOW_DISSECTOR_kern;
1: +  bpf_user_pt_regs_t BPF_PROG_TYPE_KPROBE_prog;
1: +  struct pt_regs BPF_PROG_TYPE_KPROBE_kern;
1: +  __u64 BPF_PROG_TYPE_TRACEPOINT_prog;
1: +  u64 BPF_PROG_TYPE_TRACEPOINT_kern;
1: +  struct bpf_perf_event_data BPF_PROG_TYPE_PERF_EVENT_prog;
1: +  struct bpf_perf_event_data_kern BPF_PROG_TYPE_PERF_EVENT_kern;
1: +  struct bpf_raw_tracepoint_args BPF_PROG_TYPE_RAW_TRACEPOINT_prog;
1: +  u64 BPF_PROG_TYPE_RAW_TRACEPOINT_kern;
1: +  struct bpf_raw_tracepoint_args BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE_prog;
1: +  u64 BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE_kern;
1: +  void *BPF_PROG_TYPE_TRACING_prog;
1: +  void *BPF_PROG_TYPE_TRACING_kern;
1: +  struct bpf_cgroup_dev_ctx BPF_PROG_TYPE_CGROUP_DEVICE_prog;
1: +  struct bpf_cgroup_dev_ctx BPF_PROG_TYPE_CGROUP_DEVICE_kern;
1: +  struct bpf_sysctl BPF_PROG_TYPE_CGROUP_SYSCTL_prog;
1: +  struct bpf_sysctl_kern BPF_PROG_TYPE_CGROUP_SYSCTL_kern;
1: +  struct bpf_sockopt BPF_PROG_TYPE_CGROUP_SOCKOPT_prog;
1: +  struct bpf_sockopt_kern BPF_PROG_TYPE_CGROUP_SOCKOPT_kern;
1: +  struct sk_reuseport_md BPF_PROG_TYPE_SK_REUSEPORT_prog;
1: +  struct sk_reuseport_kern BPF_PROG_TYPE_SK_REUSEPORT_kern;
1: +  struct bpf_sk_lookup BPF_PROG_TYPE_SK_LOOKUP_prog;
1: +  struct bpf_sk_lookup_kern BPF_PROG_TYPE_SK_LOOKUP_kern;
1: +  void *BPF_PROG_TYPE_STRUCT_OPS_prog;
1: +  void *BPF_PROG_TYPE_STRUCT_OPS_kern;
1: +  void *BPF_PROG_TYPE_EXT_prog;
1: +  void *BPF_PROG_TYPE_EXT_kern;
1: +  void *BPF_PROG_TYPE_LSM_prog;
1: +  void *BPF_PROG_TYPE_LSM_kern;
1: +};
1: +
1: +enum {
1: +  __ctx_convertBPF_PROG_TYPE_SOCKET_FILTER = 0,
1: +  __ctx_convertBPF_PROG_TYPE_SCHED_CLS = 1,
1: +  __ctx_convertBPF_PROG_TYPE_SCHED_ACT = 2,
1: +  __ctx_convertBPF_PROG_TYPE_XDP = 3,
1: +  __ctx_convertBPF_PROG_TYPE_CGROUP_SKB = 4,
1: +  __ctx_convertBPF_PROG_TYPE_CGROUP_SOCK = 5,
1: +  __ctx_convertBPF_PROG_TYPE_CGROUP_SOCK_ADDR = 6,
1: +  __ctx_convertBPF_PROG_TYPE_LWT_IN = 7,
1: +  __ctx_convertBPF_PROG_TYPE_LWT_OUT = 8,
1: +  __ctx_convertBPF_PROG_TYPE_LWT_XMIT = 9,
1: +  __ctx_convertBPF_PROG_TYPE_LWT_SEG6LOCAL = 10,
1: +  __ctx_convertBPF_PROG_TYPE_SOCK_OPS = 11,
1: +  __ctx_convertBPF_PROG_TYPE_SK_SKB = 12,
1: +  __ctx_convertBPF_PROG_TYPE_SK_MSG = 13,
1: +  __ctx_convertBPF_PROG_TYPE_FLOW_DISSECTOR = 14,
1: +  __ctx_convertBPF_PROG_TYPE_KPROBE = 15,
1: +  __ctx_convertBPF_PROG_TYPE_TRACEPOINT = 16,
1: +  __ctx_convertBPF_PROG_TYPE_PERF_EVENT = 17,
1: +  __ctx_convertBPF_PROG_TYPE_RAW_TRACEPOINT = 18,
1: +  __ctx_convertBPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE = 19,
1: +  __ctx_convertBPF_PROG_TYPE_TRACING = 20,
1: +  __ctx_convertBPF_PROG_TYPE_CGROUP_DEVICE = 21,
1: +  __ctx_convertBPF_PROG_TYPE_CGROUP_SYSCTL = 22,
1: +  __ctx_convertBPF_PROG_TYPE_CGROUP_SOCKOPT = 23,
1: +  __ctx_convertBPF_PROG_TYPE_SK_REUSEPORT = 24,
1: +  __ctx_convertBPF_PROG_TYPE_SK_LOOKUP = 25,
1: +  __ctx_convertBPF_PROG_TYPE_STRUCT_OPS = 26,
1: +  __ctx_convertBPF_PROG_TYPE_EXT = 27,
1: +  __ctx_convertBPF_PROG_TYPE_LSM = 28,
1: +  __ctx_convert_unused = 29,
1:  };
1:  
1:  enum bpf_struct_walk_result {
1: -	WALK_SCALAR = 0,
1: -	WALK_PTR = 1,
1: -	WALK_STRUCT = 2,
1: +  WALK_SCALAR = 0,
1: +  WALK_PTR = 1,
1: +  WALK_STRUCT = 2,
1:  };
1:  
1:  struct btf_show_snprintf {
1: -	struct btf_show show;
1: -	int len_left;
1: -	int len;
1: +  struct btf_show show;
1: +  int len_left;
1: +  int len;
1:  };
1:  
1:  struct btf_module {
1: -	struct list_head list;
1: -	struct module *module;
1: -	struct btf *btf;
1: -	struct bin_attribute *sysfs_attr;
1: +  struct list_head list;
1: +  struct module *module;
1: +  struct btf *btf;
1: +  struct bin_attribute *sysfs_attr;
1:  };
1:  
1:  struct bpf_dispatcher_prog {
1: -	struct bpf_prog *prog;
1: -	refcount_t users;
1: +  struct bpf_prog *prog;
1: +  refcount_t users;
1:  };
1:  
1:  struct bpf_dispatcher {
1: -	struct mutex mutex;
1: -	void *func;
1: -	struct bpf_dispatcher_prog progs[48];
1: -	int num_progs;
1: -	void *image;
1: -	u32 image_off;
1: -	struct bpf_ksym ksym;
1: +  struct mutex mutex;
1: +  void *func;
1: +  struct bpf_dispatcher_prog progs[48];
1: +  int num_progs;
1: +  void *image;
1: +  u32 image_off;
1: +  struct bpf_ksym ksym;
1:  };
1:  
1:  struct bpf_devmap_val {
1: -	__u32 ifindex;
1: -	union {
1: -		int fd;
1: -		__u32 id;
1: -	} bpf_prog;
1: +  __u32 ifindex;
1: +  union {
1: +    int fd;
1: +    __u32 id;
1: +  } bpf_prog;
1:  };
1:  
1:  enum net_device_flags {
1: -	IFF_UP = 1,
1: -	IFF_BROADCAST = 2,
1: -	IFF_DEBUG = 4,
1: -	IFF_LOOPBACK = 8,
1: -	IFF_POINTOPOINT = 16,
1: -	IFF_NOTRAILERS = 32,
1: -	IFF_RUNNING = 64,
1: -	IFF_NOARP = 128,
1: -	IFF_PROMISC = 256,
1: -	IFF_ALLMULTI = 512,
1: -	IFF_MASTER = 1024,
1: -	IFF_SLAVE = 2048,
1: -	IFF_MULTICAST = 4096,
1: -	IFF_PORTSEL = 8192,
1: -	IFF_AUTOMEDIA = 16384,
1: -	IFF_DYNAMIC = 32768,
1: -	IFF_LOWER_UP = 65536,
1: -	IFF_DORMANT = 131072,
1: -	IFF_ECHO = 262144,
1: +  IFF_UP = 1,
1: +  IFF_BROADCAST = 2,
1: +  IFF_DEBUG = 4,
1: +  IFF_LOOPBACK = 8,
1: +  IFF_POINTOPOINT = 16,
1: +  IFF_NOTRAILERS = 32,
1: +  IFF_RUNNING = 64,
1: +  IFF_NOARP = 128,
1: +  IFF_PROMISC = 256,
1: +  IFF_ALLMULTI = 512,
1: +  IFF_MASTER = 1024,
1: +  IFF_SLAVE = 2048,
1: +  IFF_MULTICAST = 4096,
1: +  IFF_PORTSEL = 8192,
1: +  IFF_AUTOMEDIA = 16384,
1: +  IFF_DYNAMIC = 32768,
1: +  IFF_LOWER_UP = 65536,
1: +  IFF_DORMANT = 131072,
1: +  IFF_ECHO = 262144,
1:  };
1:  
1:  struct xdp_dev_bulk_queue {
1: -	struct xdp_frame *q[16];
1: -	struct list_head flush_node;
1: -	struct net_device *dev;
1: -	struct net_device *dev_rx;
1: -	unsigned int count;
1: +  struct xdp_frame *q[16];
1: +  struct list_head flush_node;
1: +  struct net_device *dev;
1: +  struct net_device *dev_rx;
1: +  unsigned int count;
1:  };
1:  
1:  enum netdev_cmd {
1: -	NETDEV_UP = 1,
1: -	NETDEV_DOWN = 2,
1: -	NETDEV_REBOOT = 3,
1: -	NETDEV_CHANGE = 4,
1: -	NETDEV_REGISTER = 5,
1: -	NETDEV_UNREGISTER = 6,
1: -	NETDEV_CHANGEMTU = 7,
1: -	NETDEV_CHANGEADDR = 8,
1: -	NETDEV_PRE_CHANGEADDR = 9,
1: -	NETDEV_GOING_DOWN = 10,
1: -	NETDEV_CHANGENAME = 11,
1: -	NETDEV_FEAT_CHANGE = 12,
1: -	NETDEV_BONDING_FAILOVER = 13,
1: -	NETDEV_PRE_UP = 14,
1: -	NETDEV_PRE_TYPE_CHANGE = 15,
1: -	NETDEV_POST_TYPE_CHANGE = 16,
1: -	NETDEV_POST_INIT = 17,
1: -	NETDEV_RELEASE = 18,
1: -	NETDEV_NOTIFY_PEERS = 19,
1: -	NETDEV_JOIN = 20,
1: -	NETDEV_CHANGEUPPER = 21,
1: -	NETDEV_RESEND_IGMP = 22,
1: -	NETDEV_PRECHANGEMTU = 23,
1: -	NETDEV_CHANGEINFODATA = 24,
1: -	NETDEV_BONDING_INFO = 25,
1: -	NETDEV_PRECHANGEUPPER = 26,
1: -	NETDEV_CHANGELOWERSTATE = 27,
1: -	NETDEV_UDP_TUNNEL_PUSH_INFO = 28,
1: -	NETDEV_UDP_TUNNEL_DROP_INFO = 29,
1: -	NETDEV_CHANGE_TX_QUEUE_LEN = 30,
1: -	NETDEV_CVLAN_FILTER_PUSH_INFO = 31,
1: -	NETDEV_CVLAN_FILTER_DROP_INFO = 32,
1: -	NETDEV_SVLAN_FILTER_PUSH_INFO = 33,
1: -	NETDEV_SVLAN_FILTER_DROP_INFO = 34,
1: +  NETDEV_UP = 1,
1: +  NETDEV_DOWN = 2,
1: +  NETDEV_REBOOT = 3,
1: +  NETDEV_CHANGE = 4,
1: +  NETDEV_REGISTER = 5,
1: +  NETDEV_UNREGISTER = 6,
1: +  NETDEV_CHANGEMTU = 7,
1: +  NETDEV_CHANGEADDR = 8,
1: +  NETDEV_PRE_CHANGEADDR = 9,
1: +  NETDEV_GOING_DOWN = 10,
1: +  NETDEV_CHANGENAME = 11,
1: +  NETDEV_FEAT_CHANGE = 12,
1: +  NETDEV_BONDING_FAILOVER = 13,
1: +  NETDEV_PRE_UP = 14,
1: +  NETDEV_PRE_TYPE_CHANGE = 15,
1: +  NETDEV_POST_TYPE_CHANGE = 16,
1: +  NETDEV_POST_INIT = 17,
1: +  NETDEV_RELEASE = 18,
1: +  NETDEV_NOTIFY_PEERS = 19,
1: +  NETDEV_JOIN = 20,
1: +  NETDEV_CHANGEUPPER = 21,
1: +  NETDEV_RESEND_IGMP = 22,
1: +  NETDEV_PRECHANGEMTU = 23,
1: +  NETDEV_CHANGEINFODATA = 24,
1: +  NETDEV_BONDING_INFO = 25,
1: +  NETDEV_PRECHANGEUPPER = 26,
1: +  NETDEV_CHANGELOWERSTATE = 27,
1: +  NETDEV_UDP_TUNNEL_PUSH_INFO = 28,
1: +  NETDEV_UDP_TUNNEL_DROP_INFO = 29,
1: +  NETDEV_CHANGE_TX_QUEUE_LEN = 30,
1: +  NETDEV_CVLAN_FILTER_PUSH_INFO = 31,
1: +  NETDEV_CVLAN_FILTER_DROP_INFO = 32,
1: +  NETDEV_SVLAN_FILTER_PUSH_INFO = 33,
1: +  NETDEV_SVLAN_FILTER_DROP_INFO = 34,
1:  };
1:  
1:  struct netdev_notifier_info {
1: -	struct net_device *dev;
1: -	struct netlink_ext_ack *extack;
1: +  struct net_device *dev;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct bpf_dtab;
1:  
1:  struct bpf_dtab_netdev {
1: -	struct net_device *dev;
1: -	struct hlist_node index_hlist;
1: -	struct bpf_dtab *dtab;
1: -	struct bpf_prog *xdp_prog;
1: -	struct callback_head rcu;
1: -	unsigned int idx;
1: -	struct bpf_devmap_val val;
1: +  struct net_device *dev;
1: +  struct hlist_node index_hlist;
1: +  struct bpf_dtab *dtab;
1: +  struct bpf_prog *xdp_prog;
1: +  struct callback_head rcu;
1: +  unsigned int idx;
1: +  struct bpf_devmap_val val;
1:  };
1:  
1:  struct bpf_dtab {
1: -	struct bpf_map map;
1: -	struct bpf_dtab_netdev **netdev_map;
1: -	struct list_head list;
1: -	struct hlist_head *dev_index_head;
1: -	spinlock_t index_lock;
1: -	unsigned int items;
1: -	u32 n_buckets;
1: +  struct bpf_map map;
1: +  struct bpf_dtab_netdev **netdev_map;
1: +  struct list_head list;
1: +  struct hlist_head *dev_index_head;
1: +  spinlock_t index_lock;
1: +  unsigned int items;
1: +  u32 n_buckets;
1:  };
1:  
1:  struct bpf_cpumap_val {
1: -	__u32 qsize;
1: -	union {
1: -		int fd;
1: -		__u32 id;
1: -	} bpf_prog;
1: +  __u32 qsize;
1: +  union {
1: +    int fd;
1: +    __u32 id;
1: +  } bpf_prog;
1:  };
1:  
1:  typedef struct bio_vec skb_frag_t;
1:  
1:  struct skb_shared_hwtstamps {
1: -	ktime_t hwtstamp;
1: +  ktime_t hwtstamp;
1:  };
1:  
1:  struct skb_shared_info {
1: -	__u8 __unused;
1: -	__u8 meta_len;
1: -	__u8 nr_frags;
1: -	__u8 tx_flags;
1: -	short unsigned int gso_size;
1: -	short unsigned int gso_segs;
1: -	struct sk_buff *frag_list;
1: -	struct skb_shared_hwtstamps hwtstamps;
1: -	unsigned int gso_type;
1: -	u32 tskey;
1: -	atomic_t dataref;
1: -	void *destructor_arg;
1: -	skb_frag_t frags[17];
1: +  __u8 __unused;
1: +  __u8 meta_len;
1: +  __u8 nr_frags;
1: +  __u8 tx_flags;
1: +  short unsigned int gso_size;
1: +  short unsigned int gso_segs;
1: +  struct sk_buff *frag_list;
1: +  struct skb_shared_hwtstamps hwtstamps;
1: +  unsigned int gso_type;
1: +  u32 tskey;
1: +  atomic_t dataref;
1: +  void *destructor_arg;
1: +  skb_frag_t frags[17];
1:  };
1:  
1:  struct bpf_nh_params {
1: -	u32 nh_family;
1: -	union {
1: -		u32 ipv4_nh;
1: -		struct in6_addr ipv6_nh;
1: -	};
1: +  u32 nh_family;
1: +  union {
1: +    u32 ipv4_nh;
1: +    struct in6_addr ipv6_nh;
1: +  };
1:  };
1:  
1:  struct bpf_redirect_info {
1: -	u32 flags;
1: -	u32 tgt_index;
1: -	void *tgt_value;
1: -	struct bpf_map *map;
1: -	u32 kern_flags;
1: -	struct bpf_nh_params nh;
1: +  u32 flags;
1: +  u32 tgt_index;
1: +  void *tgt_value;
1: +  struct bpf_map *map;
1: +  u32 kern_flags;
1: +  struct bpf_nh_params nh;
1:  };
1:  
1:  struct ptr_ring {
1: -	int producer;
1: -	spinlock_t producer_lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	int consumer_head;
1: -	int consumer_tail;
1: -	spinlock_t consumer_lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	int size;
1: -	int batch;
1: -	void **queue;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  int producer;
1: +  spinlock_t producer_lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  int consumer_head;
1: +  int consumer_tail;
1: +  spinlock_t consumer_lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  int size;
1: +  int batch;
1: +  void **queue;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bpf_cpu_map_entry;
1:  
1:  struct xdp_bulk_queue {
1: -	void *q[8];
1: -	struct list_head flush_node;
1: -	struct bpf_cpu_map_entry *obj;
1: -	unsigned int count;
1: +  void *q[8];
1: +  struct list_head flush_node;
1: +  struct bpf_cpu_map_entry *obj;
1: +  unsigned int count;
1:  };
1:  
1:  struct bpf_cpu_map;
1:  
1:  struct bpf_cpu_map_entry {
1: -	u32 cpu;
1: -	int map_id;
1: -	struct xdp_bulk_queue *bulkq;
1: -	struct bpf_cpu_map *cmap;
1: -	struct ptr_ring *queue;
1: -	struct task_struct *kthread;
1: -	struct bpf_cpumap_val value;
1: -	struct bpf_prog *prog;
1: -	atomic_t refcnt;
1: -	struct callback_head rcu;
1: -	struct work_struct kthread_stop_wq;
1: +  u32 cpu;
1: +  int map_id;
1: +  struct xdp_bulk_queue *bulkq;
1: +  struct bpf_cpu_map *cmap;
1: +  struct ptr_ring *queue;
1: +  struct task_struct *kthread;
1: +  struct bpf_cpumap_val value;
1: +  struct bpf_prog *prog;
1: +  atomic_t refcnt;
1: +  struct callback_head rcu;
1: +  struct work_struct kthread_stop_wq;
1:  };
1:  
1:  struct bpf_cpu_map {
1: -	struct bpf_map map;
1: -	struct bpf_cpu_map_entry **cpu_map;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct bpf_cpu_map_entry **cpu_map;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct rhlist_head {
1: -	struct rhash_head rhead;
1: -	struct rhlist_head *next;
1: +  struct rhash_head rhead;
1: +  struct rhlist_head *next;
1:  };
1:  
1:  struct bpf_prog_offload_ops {
1: -	int (*insn_hook)(struct bpf_verifier_env *, int, int);
1: -	int (*finalize)(struct bpf_verifier_env *);
1: -	int (*replace_insn)(struct bpf_verifier_env *, u32, struct bpf_insn *);
1: -	int (*remove_insns)(struct bpf_verifier_env *, u32, u32);
1: -	int (*prepare)(struct bpf_prog *);
1: -	int (*translate)(struct bpf_prog *);
1: -	void (*destroy)(struct bpf_prog *);
1: +  int (*insn_hook)(struct bpf_verifier_env *, int, int);
1: +  int (*finalize)(struct bpf_verifier_env *);
1: +  int (*replace_insn)(struct bpf_verifier_env *, u32, struct bpf_insn *);
1: +  int (*remove_insns)(struct bpf_verifier_env *, u32, u32);
1: +  int (*prepare)(struct bpf_prog *);
1: +  int (*translate)(struct bpf_prog *);
1: +  void (*destroy)(struct bpf_prog *);
1:  };
1:  
1:  struct bpf_offload_dev {
1: -	const struct bpf_prog_offload_ops *ops;
1: -	struct list_head netdevs;
1: -	void *priv;
1: +  const struct bpf_prog_offload_ops *ops;
1: +  struct list_head netdevs;
1: +  void *priv;
1:  };
1:  
1:  struct bpf_offload_netdev {
1: -	struct rhash_head l;
1: -	struct net_device *netdev;
1: -	struct bpf_offload_dev *offdev;
1: -	struct list_head progs;
1: -	struct list_head maps;
1: -	struct list_head offdev_netdevs;
1: +  struct rhash_head l;
1: +  struct net_device *netdev;
1: +  struct bpf_offload_dev *offdev;
1: +  struct list_head progs;
1: +  struct list_head maps;
1: +  struct list_head offdev_netdevs;
1:  };
1:  
1:  struct ns_get_path_bpf_prog_args {
1: -	struct bpf_prog *prog;
1: -	struct bpf_prog_info *info;
1: +  struct bpf_prog *prog;
1: +  struct bpf_prog_info *info;
1:  };
1:  
1:  struct ns_get_path_bpf_map_args {
1: -	struct bpf_offloaded_map *offmap;
1: -	struct bpf_map_info *info;
1: +  struct bpf_offloaded_map *offmap;
1: +  struct bpf_map_info *info;
1:  };
1:  
1:  struct bpf_netns_link {
1: -	struct bpf_link link;
1: -	enum bpf_attach_type type;
1: -	enum netns_bpf_attach_type netns_type;
1: -	struct net *net;
1: -	struct list_head node;
1: +  struct bpf_link link;
1: +  enum bpf_attach_type type;
1: +  enum netns_bpf_attach_type netns_type;
1: +  struct net *net;
1: +  struct list_head node;
1:  };
1:  
1:  enum bpf_stack_build_id_status {
1: -	BPF_STACK_BUILD_ID_EMPTY = 0,
1: -	BPF_STACK_BUILD_ID_VALID = 1,
1: -	BPF_STACK_BUILD_ID_IP = 2,
1: +  BPF_STACK_BUILD_ID_EMPTY = 0,
1: +  BPF_STACK_BUILD_ID_VALID = 1,
1: +  BPF_STACK_BUILD_ID_IP = 2,
1:  };
1:  
1:  struct bpf_stack_build_id {
1: -	__s32 status;
1: -	unsigned char build_id[20];
1: -	union {
1: -		__u64 offset;
1: -		__u64 ip;
1: -	};
1: +  __s32 status;
1: +  unsigned char build_id[20];
1: +  union {
1: +    __u64 offset;
1: +    __u64 ip;
1: +  };
1:  };
1:  
1:  enum {
1: -	BPF_F_SKIP_FIELD_MASK = 255,
1: -	BPF_F_USER_STACK = 256,
1: -	BPF_F_FAST_STACK_CMP = 512,
1: -	BPF_F_REUSE_STACKID = 1024,
1: -	BPF_F_USER_BUILD_ID = 2048,
1: +  BPF_F_SKIP_FIELD_MASK = 255,
1: +  BPF_F_USER_STACK = 256,
1: +  BPF_F_FAST_STACK_CMP = 512,
1: +  BPF_F_REUSE_STACKID = 1024,
1: +  BPF_F_USER_BUILD_ID = 2048,
1:  };
1:  
1:  typedef __u32 Elf32_Addr;
1: @@ -37427,46 +37781,46 @@ typedef __u16 Elf32_Half;
1:  typedef __u32 Elf32_Off;
1:  
1:  struct elf32_hdr {
1: -	unsigned char e_ident[16];
1: -	Elf32_Half e_type;
1: -	Elf32_Half e_machine;
1: -	Elf32_Word e_version;
1: -	Elf32_Addr e_entry;
1: -	Elf32_Off e_phoff;
1: -	Elf32_Off e_shoff;
1: -	Elf32_Word e_flags;
1: -	Elf32_Half e_ehsize;
1: -	Elf32_Half e_phentsize;
1: -	Elf32_Half e_phnum;
1: -	Elf32_Half e_shentsize;
1: -	Elf32_Half e_shnum;
1: -	Elf32_Half e_shstrndx;
1: +  unsigned char e_ident[16];
1: +  Elf32_Half e_type;
1: +  Elf32_Half e_machine;
1: +  Elf32_Word e_version;
1: +  Elf32_Addr e_entry;
1: +  Elf32_Off e_phoff;
1: +  Elf32_Off e_shoff;
1: +  Elf32_Word e_flags;
1: +  Elf32_Half e_ehsize;
1: +  Elf32_Half e_phentsize;
1: +  Elf32_Half e_phnum;
1: +  Elf32_Half e_shentsize;
1: +  Elf32_Half e_shnum;
1: +  Elf32_Half e_shstrndx;
1:  };
1:  
1:  typedef struct elf32_hdr Elf32_Ehdr;
1:  
1:  struct elf32_phdr {
1: -	Elf32_Word p_type;
1: -	Elf32_Off p_offset;
1: -	Elf32_Addr p_vaddr;
1: -	Elf32_Addr p_paddr;
1: -	Elf32_Word p_filesz;
1: -	Elf32_Word p_memsz;
1: -	Elf32_Word p_flags;
1: -	Elf32_Word p_align;
1: +  Elf32_Word p_type;
1: +  Elf32_Off p_offset;
1: +  Elf32_Addr p_vaddr;
1: +  Elf32_Addr p_paddr;
1: +  Elf32_Word p_filesz;
1: +  Elf32_Word p_memsz;
1: +  Elf32_Word p_flags;
1: +  Elf32_Word p_align;
1:  };
1:  
1:  typedef struct elf32_phdr Elf32_Phdr;
1:  
1:  struct elf64_phdr {
1: -	Elf64_Word p_type;
1: -	Elf64_Word p_flags;
1: -	Elf64_Off p_offset;
1: -	Elf64_Addr p_vaddr;
1: -	Elf64_Addr p_paddr;
1: -	Elf64_Xword p_filesz;
1: -	Elf64_Xword p_memsz;
1: -	Elf64_Xword p_align;
1: +  Elf64_Word p_type;
1: +  Elf64_Word p_flags;
1: +  Elf64_Off p_offset;
1: +  Elf64_Addr p_vaddr;
1: +  Elf64_Addr p_paddr;
1: +  Elf64_Xword p_filesz;
1: +  Elf64_Xword p_memsz;
1: +  Elf64_Xword p_align;
1:  };
1:  
1:  typedef struct elf64_phdr Elf64_Phdr;
1: @@ -37474,241 +37828,247 @@ typedef struct elf64_phdr Elf64_Phdr;
1:  typedef struct elf32_note Elf32_Nhdr;
1:  
1:  enum perf_callchain_context {
1: -	PERF_CONTEXT_HV = 4294967264,
1: -	PERF_CONTEXT_KERNEL = 4294967168,
1: -	PERF_CONTEXT_USER = 4294966784,
1: -	PERF_CONTEXT_GUEST = 4294965248,
1: -	PERF_CONTEXT_GUEST_KERNEL = 4294965120,
1: -	PERF_CONTEXT_GUEST_USER = 4294964736,
1: -	PERF_CONTEXT_MAX = 4294963201,
1: +  PERF_CONTEXT_HV = 4294967264,
1: +  PERF_CONTEXT_KERNEL = 4294967168,
1: +  PERF_CONTEXT_USER = 4294966784,
1: +  PERF_CONTEXT_GUEST = 4294965248,
1: +  PERF_CONTEXT_GUEST_KERNEL = 4294965120,
1: +  PERF_CONTEXT_GUEST_USER = 4294964736,
1: +  PERF_CONTEXT_MAX = 4294963201,
1:  };
1:  
1:  struct stack_map_bucket {
1: -	struct pcpu_freelist_node fnode;
1: -	u32 hash;
1: -	u32 nr;
1: -	u64 data[0];
1: +  struct pcpu_freelist_node fnode;
1: +  u32 hash;
1: +  u32 nr;
1: +  u64 data[0];
1:  };
1:  
1:  struct bpf_stack_map {
1: -	struct bpf_map map;
1: -	void *elems;
1: -	struct pcpu_freelist freelist;
1: -	u32 n_buckets;
1: -	struct stack_map_bucket *buckets[0];
1: -	long: 64;
1: +  struct bpf_map map;
1: +  void *elems;
1: +  struct pcpu_freelist freelist;
1: +  u32 n_buckets;
1: +  struct stack_map_bucket *buckets[0];
1: +  long : 64;
1:  };
1:  
1:  struct stack_map_irq_work {
1: -	struct irq_work irq_work;
1: -	struct mm_struct *mm;
1: +  struct irq_work irq_work;
1: +  struct mm_struct *mm;
1:  };
1:  
1:  typedef u64 (*btf_bpf_get_stackid)(struct pt_regs *, struct bpf_map *, u64);
1:  
1: -typedef u64 (*btf_bpf_get_stackid_pe)(struct bpf_perf_event_data_kern *, struct bpf_map *, u64);
1: +typedef u64 (*btf_bpf_get_stackid_pe)(struct bpf_perf_event_data_kern *,
1: +                                      struct bpf_map *, u64);
1:  
1:  typedef u64 (*btf_bpf_get_stack)(struct pt_regs *, void *, u32, u64);
1:  
1:  typedef u64 (*btf_bpf_get_task_stack)(struct task_struct *, void *, u32, u64);
1:  
1: -typedef u64 (*btf_bpf_get_stack_pe)(struct bpf_perf_event_data_kern *, void *, u32, u64);
1: +typedef u64 (*btf_bpf_get_stack_pe)(struct bpf_perf_event_data_kern *, void *,
1: +                                    u32, u64);
1:  
1:  enum {
1: -	BPF_F_SYSCTL_BASE_NAME = 1,
1: +  BPF_F_SYSCTL_BASE_NAME = 1,
1:  };
1:  
1:  struct bpf_prog_list {
1: -	struct list_head node;
1: -	struct bpf_prog *prog;
1: -	struct bpf_cgroup_link *link;
1: -	struct bpf_cgroup_storage *storage[2];
1: +  struct list_head node;
1: +  struct bpf_prog *prog;
1: +  struct bpf_cgroup_link *link;
1: +  struct bpf_cgroup_storage *storage[2];
1:  };
1:  
1:  struct qdisc_skb_cb {
1: -	struct {
1: -		unsigned int pkt_len;
1: -		u16 slave_dev_queue_mapping;
1: -		u16 tc_classid;
1: -	};
1: -	unsigned char data[20];
1: -	u16 mru;
1: +  struct {
1: +    unsigned int pkt_len;
1: +    u16 slave_dev_queue_mapping;
1: +    u16 tc_classid;
1: +  };
1: +  unsigned char data[20];
1: +  u16 mru;
1:  };
1:  
1:  struct bpf_skb_data_end {
1: -	struct qdisc_skb_cb qdisc_cb;
1: -	void *data_meta;
1: -	void *data_end;
1: +  struct qdisc_skb_cb qdisc_cb;
1: +  void *data_meta;
1: +  void *data_end;
1:  };
1:  
1:  enum {
1: -	TCPF_ESTABLISHED = 2,
1: -	TCPF_SYN_SENT = 4,
1: -	TCPF_SYN_RECV = 8,
1: -	TCPF_FIN_WAIT1 = 16,
1: -	TCPF_FIN_WAIT2 = 32,
1: -	TCPF_TIME_WAIT = 64,
1: -	TCPF_CLOSE = 128,
1: -	TCPF_CLOSE_WAIT = 256,
1: -	TCPF_LAST_ACK = 512,
1: -	TCPF_LISTEN = 1024,
1: -	TCPF_CLOSING = 2048,
1: -	TCPF_NEW_SYN_RECV = 4096,
1: +  TCPF_ESTABLISHED = 2,
1: +  TCPF_SYN_SENT = 4,
1: +  TCPF_SYN_RECV = 8,
1: +  TCPF_FIN_WAIT1 = 16,
1: +  TCPF_FIN_WAIT2 = 32,
1: +  TCPF_TIME_WAIT = 64,
1: +  TCPF_CLOSE = 128,
1: +  TCPF_CLOSE_WAIT = 256,
1: +  TCPF_LAST_ACK = 512,
1: +  TCPF_LISTEN = 1024,
1: +  TCPF_CLOSING = 2048,
1: +  TCPF_NEW_SYN_RECV = 4096,
1:  };
1:  
1: -typedef u64 (*btf_bpf_sysctl_get_name)(struct bpf_sysctl_kern *, char *, size_t, u64);
1: +typedef u64 (*btf_bpf_sysctl_get_name)(struct bpf_sysctl_kern *, char *, size_t,
1: +                                       u64);
1:  
1: -typedef u64 (*btf_bpf_sysctl_get_current_value)(struct bpf_sysctl_kern *, char *, size_t);
1: +typedef u64 (*btf_bpf_sysctl_get_current_value)(struct bpf_sysctl_kern *,
1: +                                                char *, size_t);
1:  
1: -typedef u64 (*btf_bpf_sysctl_get_new_value)(struct bpf_sysctl_kern *, char *, size_t);
1: +typedef u64 (*btf_bpf_sysctl_get_new_value)(struct bpf_sysctl_kern *, char *,
1: +                                            size_t);
1:  
1: -typedef u64 (*btf_bpf_sysctl_set_new_value)(struct bpf_sysctl_kern *, const char *, size_t);
1: +typedef u64 (*btf_bpf_sysctl_set_new_value)(struct bpf_sysctl_kern *,
1: +                                            const char *, size_t);
1:  
1:  enum sock_type {
1: -	SOCK_STREAM = 1,
1: -	SOCK_DGRAM = 2,
1: -	SOCK_RAW = 3,
1: -	SOCK_RDM = 4,
1: -	SOCK_SEQPACKET = 5,
1: -	SOCK_DCCP = 6,
1: -	SOCK_PACKET = 10,
1: -};
1: -
1: -enum {
1: -	IPPROTO_IP = 0,
1: -	IPPROTO_ICMP = 1,
1: -	IPPROTO_IGMP = 2,
1: -	IPPROTO_IPIP = 4,
1: -	IPPROTO_TCP = 6,
1: -	IPPROTO_EGP = 8,
1: -	IPPROTO_PUP = 12,
1: -	IPPROTO_UDP = 17,
1: -	IPPROTO_IDP = 22,
1: -	IPPROTO_TP = 29,
1: -	IPPROTO_DCCP = 33,
1: -	IPPROTO_IPV6 = 41,
1: -	IPPROTO_RSVP = 46,
1: -	IPPROTO_GRE = 47,
1: -	IPPROTO_ESP = 50,
1: -	IPPROTO_AH = 51,
1: -	IPPROTO_MTP = 92,
1: -	IPPROTO_BEETPH = 94,
1: -	IPPROTO_ENCAP = 98,
1: -	IPPROTO_PIM = 103,
1: -	IPPROTO_COMP = 108,
1: -	IPPROTO_SCTP = 132,
1: -	IPPROTO_UDPLITE = 136,
1: -	IPPROTO_MPLS = 137,
1: -	IPPROTO_ETHERNET = 143,
1: -	IPPROTO_RAW = 255,
1: -	IPPROTO_MPTCP = 262,
1: -	IPPROTO_MAX = 263,
1: +  SOCK_STREAM = 1,
1: +  SOCK_DGRAM = 2,
1: +  SOCK_RAW = 3,
1: +  SOCK_RDM = 4,
1: +  SOCK_SEQPACKET = 5,
1: +  SOCK_DCCP = 6,
1: +  SOCK_PACKET = 10,
1: +};
1: +
1: +enum {
1: +  IPPROTO_IP = 0,
1: +  IPPROTO_ICMP = 1,
1: +  IPPROTO_IGMP = 2,
1: +  IPPROTO_IPIP = 4,
1: +  IPPROTO_TCP = 6,
1: +  IPPROTO_EGP = 8,
1: +  IPPROTO_PUP = 12,
1: +  IPPROTO_UDP = 17,
1: +  IPPROTO_IDP = 22,
1: +  IPPROTO_TP = 29,
1: +  IPPROTO_DCCP = 33,
1: +  IPPROTO_IPV6 = 41,
1: +  IPPROTO_RSVP = 46,
1: +  IPPROTO_GRE = 47,
1: +  IPPROTO_ESP = 50,
1: +  IPPROTO_AH = 51,
1: +  IPPROTO_MTP = 92,
1: +  IPPROTO_BEETPH = 94,
1: +  IPPROTO_ENCAP = 98,
1: +  IPPROTO_PIM = 103,
1: +  IPPROTO_COMP = 108,
1: +  IPPROTO_SCTP = 132,
1: +  IPPROTO_UDPLITE = 136,
1: +  IPPROTO_MPLS = 137,
1: +  IPPROTO_ETHERNET = 143,
1: +  IPPROTO_RAW = 255,
1: +  IPPROTO_MPTCP = 262,
1: +  IPPROTO_MAX = 263,
1:  };
1:  
1:  enum sock_flags {
1: -	SOCK_DEAD = 0,
1: -	SOCK_DONE = 1,
1: -	SOCK_URGINLINE = 2,
1: -	SOCK_KEEPOPEN = 3,
1: -	SOCK_LINGER = 4,
1: -	SOCK_DESTROY = 5,
1: -	SOCK_BROADCAST = 6,
1: -	SOCK_TIMESTAMP = 7,
1: -	SOCK_ZAPPED = 8,
1: -	SOCK_USE_WRITE_QUEUE = 9,
1: -	SOCK_DBG = 10,
1: -	SOCK_RCVTSTAMP = 11,
1: -	SOCK_RCVTSTAMPNS = 12,
1: -	SOCK_LOCALROUTE = 13,
1: -	SOCK_MEMALLOC = 14,
1: -	SOCK_TIMESTAMPING_RX_SOFTWARE = 15,
1: -	SOCK_FASYNC = 16,
1: -	SOCK_RXQ_OVFL = 17,
1: -	SOCK_ZEROCOPY = 18,
1: -	SOCK_WIFI_STATUS = 19,
1: -	SOCK_NOFCS = 20,
1: -	SOCK_FILTER_LOCKED = 21,
1: -	SOCK_SELECT_ERR_QUEUE = 22,
1: -	SOCK_RCU_FREE = 23,
1: -	SOCK_TXTIME = 24,
1: -	SOCK_XDP = 25,
1: -	SOCK_TSTAMP_NEW = 26,
1: +  SOCK_DEAD = 0,
1: +  SOCK_DONE = 1,
1: +  SOCK_URGINLINE = 2,
1: +  SOCK_KEEPOPEN = 3,
1: +  SOCK_LINGER = 4,
1: +  SOCK_DESTROY = 5,
1: +  SOCK_BROADCAST = 6,
1: +  SOCK_TIMESTAMP = 7,
1: +  SOCK_ZAPPED = 8,
1: +  SOCK_USE_WRITE_QUEUE = 9,
1: +  SOCK_DBG = 10,
1: +  SOCK_RCVTSTAMP = 11,
1: +  SOCK_RCVTSTAMPNS = 12,
1: +  SOCK_LOCALROUTE = 13,
1: +  SOCK_MEMALLOC = 14,
1: +  SOCK_TIMESTAMPING_RX_SOFTWARE = 15,
1: +  SOCK_FASYNC = 16,
1: +  SOCK_RXQ_OVFL = 17,
1: +  SOCK_ZEROCOPY = 18,
1: +  SOCK_WIFI_STATUS = 19,
1: +  SOCK_NOFCS = 20,
1: +  SOCK_FILTER_LOCKED = 21,
1: +  SOCK_SELECT_ERR_QUEUE = 22,
1: +  SOCK_RCU_FREE = 23,
1: +  SOCK_TXTIME = 24,
1: +  SOCK_XDP = 25,
1: +  SOCK_TSTAMP_NEW = 26,
1:  };
1:  
1:  struct reuseport_array {
1: -	struct bpf_map map;
1: -	struct sock *ptrs[0];
1: +  struct bpf_map map;
1: +  struct sock *ptrs[0];
1:  };
1:  
1:  enum bpf_struct_ops_state {
1: -	BPF_STRUCT_OPS_STATE_INIT = 0,
1: -	BPF_STRUCT_OPS_STATE_INUSE = 1,
1: -	BPF_STRUCT_OPS_STATE_TOBEFREE = 2,
1: +  BPF_STRUCT_OPS_STATE_INIT = 0,
1: +  BPF_STRUCT_OPS_STATE_INUSE = 1,
1: +  BPF_STRUCT_OPS_STATE_TOBEFREE = 2,
1:  };
1:  
1:  struct bpf_struct_ops_value {
1: -	refcount_t refcnt;
1: -	enum bpf_struct_ops_state state;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	char data[0];
1: +  refcount_t refcnt;
1: +  enum bpf_struct_ops_state state;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  char data[0];
1:  };
1:  
1:  struct bpf_struct_ops_map {
1: -	struct bpf_map map;
1: -	const struct bpf_struct_ops *st_ops;
1: -	struct mutex lock;
1: -	struct bpf_prog **progs;
1: -	void *image;
1: -	struct bpf_struct_ops_value *uvalue;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct bpf_struct_ops_value kvalue;
1: +  struct bpf_map map;
1: +  const struct bpf_struct_ops *st_ops;
1: +  struct mutex lock;
1: +  struct bpf_prog **progs;
1: +  void *image;
1: +  struct bpf_struct_ops_value *uvalue;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct bpf_struct_ops_value kvalue;
1:  };
1:  
1:  struct bpf_struct_ops_tcp_congestion_ops {
1: -	refcount_t refcnt;
1: -	enum bpf_struct_ops_state state;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct tcp_congestion_ops data;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  refcount_t refcnt;
1: +  enum bpf_struct_ops_state state;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct tcp_congestion_ops data;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sembuf {
1: -	short unsigned int sem_num;
1: -	short int sem_op;
1: -	short int sem_flg;
1: +  short unsigned int sem_num;
1: +  short int sem_op;
1: +  short int sem_flg;
1:  };
1:  
1:  enum key_need_perm {
1: -	KEY_NEED_UNSPECIFIED = 0,
1: -	KEY_NEED_VIEW = 1,
1: -	KEY_NEED_READ = 2,
1: -	KEY_NEED_WRITE = 3,
1: -	KEY_NEED_SEARCH = 4,
1: -	KEY_NEED_LINK = 5,
1: -	KEY_NEED_SETATTR = 6,
1: -	KEY_NEED_UNLINK = 7,
1: -	KEY_SYSADMIN_OVERRIDE = 8,
1: -	KEY_AUTHTOKEN_OVERRIDE = 9,
1: -	KEY_DEFER_PERM_CHECK = 10,
1: +  KEY_NEED_UNSPECIFIED = 0,
1: +  KEY_NEED_VIEW = 1,
1: +  KEY_NEED_READ = 2,
1: +  KEY_NEED_WRITE = 3,
1: +  KEY_NEED_SEARCH = 4,
1: +  KEY_NEED_LINK = 5,
1: +  KEY_NEED_SETATTR = 6,
1: +  KEY_NEED_UNLINK = 7,
1: +  KEY_SYSADMIN_OVERRIDE = 8,
1: +  KEY_AUTHTOKEN_OVERRIDE = 9,
1: +  KEY_DEFER_PERM_CHECK = 10,
1:  };
1:  
1:  struct __key_reference_with_attributes;
1: @@ -37716,7 +38076,7 @@ struct __key_reference_with_attributes;
1:  typedef struct __key_reference_with_attributes *key_ref_t;
1:  
1:  enum {
1: -	BPF_F_BPRM_SECUREEXEC = 1,
1: +  BPF_F_BPRM_SECUREEXEC = 1,
1:  };
1:  
1:  typedef u64 (*btf_bpf_bprm_opts_set)(struct linux_binprm *, u64);
1: @@ -37724,376 +38084,377 @@ typedef u64 (*btf_bpf_bprm_opts_set)(struct linux_binprm *, u64);
1:  typedef u64 (*btf_bpf_ima_inode_hash)(struct inode *, void *, u32);
1:  
1:  enum perf_event_read_format {
1: -	PERF_FORMAT_TOTAL_TIME_ENABLED = 1,
1: -	PERF_FORMAT_TOTAL_TIME_RUNNING = 2,
1: -	PERF_FORMAT_ID = 4,
1: -	PERF_FORMAT_GROUP = 8,
1: -	PERF_FORMAT_MAX = 16,
1: +  PERF_FORMAT_TOTAL_TIME_ENABLED = 1,
1: +  PERF_FORMAT_TOTAL_TIME_RUNNING = 2,
1: +  PERF_FORMAT_ID = 4,
1: +  PERF_FORMAT_GROUP = 8,
1: +  PERF_FORMAT_MAX = 16,
1:  };
1:  
1:  enum perf_event_ioc_flags {
1: -	PERF_IOC_FLAG_GROUP = 1,
1: +  PERF_IOC_FLAG_GROUP = 1,
1:  };
1:  
1:  struct perf_ns_link_info {
1: -	__u64 dev;
1: -	__u64 ino;
1: +  __u64 dev;
1: +  __u64 ino;
1:  };
1:  
1:  enum {
1: -	NET_NS_INDEX = 0,
1: -	UTS_NS_INDEX = 1,
1: -	IPC_NS_INDEX = 2,
1: -	PID_NS_INDEX = 3,
1: -	USER_NS_INDEX = 4,
1: -	MNT_NS_INDEX = 5,
1: -	CGROUP_NS_INDEX = 6,
1: -	NR_NAMESPACES = 7,
1: +  NET_NS_INDEX = 0,
1: +  UTS_NS_INDEX = 1,
1: +  IPC_NS_INDEX = 2,
1: +  PID_NS_INDEX = 3,
1: +  USER_NS_INDEX = 4,
1: +  MNT_NS_INDEX = 5,
1: +  CGROUP_NS_INDEX = 6,
1: +  NR_NAMESPACES = 7,
1:  };
1:  
1:  enum perf_event_type {
1: -	PERF_RECORD_MMAP = 1,
1: -	PERF_RECORD_LOST = 2,
1: -	PERF_RECORD_COMM = 3,
1: -	PERF_RECORD_EXIT = 4,
1: -	PERF_RECORD_THROTTLE = 5,
1: -	PERF_RECORD_UNTHROTTLE = 6,
1: -	PERF_RECORD_FORK = 7,
1: -	PERF_RECORD_READ = 8,
1: -	PERF_RECORD_SAMPLE = 9,
1: -	PERF_RECORD_MMAP2 = 10,
1: -	PERF_RECORD_AUX = 11,
1: -	PERF_RECORD_ITRACE_START = 12,
1: -	PERF_RECORD_LOST_SAMPLES = 13,
1: -	PERF_RECORD_SWITCH = 14,
1: -	PERF_RECORD_SWITCH_CPU_WIDE = 15,
1: -	PERF_RECORD_NAMESPACES = 16,
1: -	PERF_RECORD_KSYMBOL = 17,
1: -	PERF_RECORD_BPF_EVENT = 18,
1: -	PERF_RECORD_CGROUP = 19,
1: -	PERF_RECORD_TEXT_POKE = 20,
1: -	PERF_RECORD_MAX = 21,
1: +  PERF_RECORD_MMAP = 1,
1: +  PERF_RECORD_LOST = 2,
1: +  PERF_RECORD_COMM = 3,
1: +  PERF_RECORD_EXIT = 4,
1: +  PERF_RECORD_THROTTLE = 5,
1: +  PERF_RECORD_UNTHROTTLE = 6,
1: +  PERF_RECORD_FORK = 7,
1: +  PERF_RECORD_READ = 8,
1: +  PERF_RECORD_SAMPLE = 9,
1: +  PERF_RECORD_MMAP2 = 10,
1: +  PERF_RECORD_AUX = 11,
1: +  PERF_RECORD_ITRACE_START = 12,
1: +  PERF_RECORD_LOST_SAMPLES = 13,
1: +  PERF_RECORD_SWITCH = 14,
1: +  PERF_RECORD_SWITCH_CPU_WIDE = 15,
1: +  PERF_RECORD_NAMESPACES = 16,
1: +  PERF_RECORD_KSYMBOL = 17,
1: +  PERF_RECORD_BPF_EVENT = 18,
1: +  PERF_RECORD_CGROUP = 19,
1: +  PERF_RECORD_TEXT_POKE = 20,
1: +  PERF_RECORD_MAX = 21,
1:  };
1:  
1:  struct swevent_hlist {
1: -	struct hlist_head heads[256];
1: -	struct callback_head callback_head;
1: +  struct hlist_head heads[256];
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct pmu_event_list {
1: -	raw_spinlock_t lock;
1: -	struct list_head list;
1: +  raw_spinlock_t lock;
1: +  struct list_head list;
1:  };
1:  
1:  struct perf_buffer {
1: -	refcount_t refcount;
1: -	struct callback_head callback_head;
1: -	int nr_pages;
1: -	int overwrite;
1: -	int paused;
1: -	atomic_t poll;
1: -	local_t head;
1: -	unsigned int nest;
1: -	local_t events;
1: -	local_t wakeup;
1: -	local_t lost;
1: -	long int watermark;
1: -	long int aux_watermark;
1: -	spinlock_t event_lock;
1: -	struct list_head event_list;
1: -	atomic_t mmap_count;
1: -	long unsigned int mmap_locked;
1: -	struct user_struct *mmap_user;
1: -	long int aux_head;
1: -	unsigned int aux_nest;
1: -	long int aux_wakeup;
1: -	long unsigned int aux_pgoff;
1: -	int aux_nr_pages;
1: -	int aux_overwrite;
1: -	atomic_t aux_mmap_count;
1: -	long unsigned int aux_mmap_locked;
1: -	void (*free_aux)(void *);
1: -	refcount_t aux_refcount;
1: -	int aux_in_sampling;
1: -	void **aux_pages;
1: -	void *aux_priv;
1: -	struct perf_event_mmap_page *user_page;
1: -	void *data_pages[0];
1: +  refcount_t refcount;
1: +  struct callback_head callback_head;
1: +  int nr_pages;
1: +  int overwrite;
1: +  int paused;
1: +  atomic_t poll;
1: +  local_t head;
1: +  unsigned int nest;
1: +  local_t events;
1: +  local_t wakeup;
1: +  local_t lost;
1: +  long int watermark;
1: +  long int aux_watermark;
1: +  spinlock_t event_lock;
1: +  struct list_head event_list;
1: +  atomic_t mmap_count;
1: +  long unsigned int mmap_locked;
1: +  struct user_struct *mmap_user;
1: +  long int aux_head;
1: +  unsigned int aux_nest;
1: +  long int aux_wakeup;
1: +  long unsigned int aux_pgoff;
1: +  int aux_nr_pages;
1: +  int aux_overwrite;
1: +  atomic_t aux_mmap_count;
1: +  long unsigned int aux_mmap_locked;
1: +  void (*free_aux)(void *);
1: +  refcount_t aux_refcount;
1: +  int aux_in_sampling;
1: +  void **aux_pages;
1: +  void *aux_priv;
1: +  struct perf_event_mmap_page *user_page;
1: +  void *data_pages[0];
1:  };
1:  
1:  struct match_token {
1: -	int token;
1: -	const char *pattern;
1: +  int token;
1: +  const char *pattern;
1:  };
1:  
1:  enum {
1: -	MAX_OPT_ARGS = 3,
1: +  MAX_OPT_ARGS = 3,
1:  };
1:  
1:  typedef struct {
1: -	char *from;
1: -	char *to;
1: +  char *from;
1: +  char *to;
1:  } substring_t;
1:  
1:  struct min_heap {
1: -	void *data;
1: -	int nr;
1: -	int size;
1: +  void *data;
1: +  int nr;
1: +  int size;
1:  };
1:  
1:  struct min_heap_callbacks {
1: -	int elem_size;
1: -	bool (*less)(const void *, const void *);
1: -	void (*swp)(void *, void *);
1: +  int elem_size;
1: +  bool (*less)(const void *, const void *);
1: +  void (*swp)(void *, void *);
1:  };
1:  
1:  typedef int (*remote_function_f)(void *);
1:  
1:  struct remote_function_call {
1: -	struct task_struct *p;
1: -	remote_function_f func;
1: -	void *info;
1: -	int ret;
1: +  struct task_struct *p;
1: +  remote_function_f func;
1: +  void *info;
1: +  int ret;
1:  };
1:  
1: -typedef void (*event_f)(struct perf_event *, struct perf_cpu_context *, struct perf_event_context *, void *);
1: +typedef void (*event_f)(struct perf_event *, struct perf_cpu_context *,
1: +                        struct perf_event_context *, void *);
1:  
1:  struct event_function_struct {
1: -	struct perf_event *event;
1: -	event_f func;
1: -	void *data;
1: +  struct perf_event *event;
1: +  event_f func;
1: +  void *data;
1:  };
1:  
1:  enum event_type_t {
1: -	EVENT_FLEXIBLE = 1,
1: -	EVENT_PINNED = 2,
1: -	EVENT_TIME = 4,
1: -	EVENT_CPU = 8,
1: -	EVENT_ALL = 3,
1: +  EVENT_FLEXIBLE = 1,
1: +  EVENT_PINNED = 2,
1: +  EVENT_TIME = 4,
1: +  EVENT_CPU = 8,
1: +  EVENT_ALL = 3,
1:  };
1:  
1:  struct stop_event_data {
1: -	struct perf_event *event;
1: -	unsigned int restart;
1: +  struct perf_event *event;
1: +  unsigned int restart;
1:  };
1:  
1:  struct perf_read_data {
1: -	struct perf_event *event;
1: -	bool group;
1: -	int ret;
1: +  struct perf_event *event;
1: +  bool group;
1: +  int ret;
1:  };
1:  
1:  struct perf_read_event {
1: -	struct perf_event_header header;
1: -	u32 pid;
1: -	u32 tid;
1: +  struct perf_event_header header;
1: +  u32 pid;
1: +  u32 tid;
1:  };
1:  
1:  typedef void perf_iterate_f(struct perf_event *, void *);
1:  
1:  struct remote_output {
1: -	struct perf_buffer *rb;
1: -	int err;
1: +  struct perf_buffer *rb;
1: +  int err;
1:  };
1:  
1:  struct perf_task_event {
1: -	struct task_struct *task;
1: -	struct perf_event_context *task_ctx;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u32 pid;
1: -		u32 ppid;
1: -		u32 tid;
1: -		u32 ptid;
1: -		u64 time;
1: -	} event_id;
1: +  struct task_struct *task;
1: +  struct perf_event_context *task_ctx;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u32 pid;
1: +    u32 ppid;
1: +    u32 tid;
1: +    u32 ptid;
1: +    u64 time;
1: +  } event_id;
1:  };
1:  
1:  struct perf_comm_event {
1: -	struct task_struct *task;
1: -	char *comm;
1: -	int comm_size;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u32 pid;
1: -		u32 tid;
1: -	} event_id;
1: +  struct task_struct *task;
1: +  char *comm;
1: +  int comm_size;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u32 pid;
1: +    u32 tid;
1: +  } event_id;
1:  };
1:  
1:  struct perf_namespaces_event {
1: -	struct task_struct *task;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u32 pid;
1: -		u32 tid;
1: -		u64 nr_namespaces;
1: -		struct perf_ns_link_info link_info[7];
1: -	} event_id;
1: +  struct task_struct *task;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u32 pid;
1: +    u32 tid;
1: +    u64 nr_namespaces;
1: +    struct perf_ns_link_info link_info[7];
1: +  } event_id;
1:  };
1:  
1:  struct perf_cgroup_event {
1: -	char *path;
1: -	int path_size;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u64 id;
1: -		char path[0];
1: -	} event_id;
1: +  char *path;
1: +  int path_size;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u64 id;
1: +    char path[0];
1: +  } event_id;
1:  };
1:  
1:  struct perf_mmap_event {
1: -	struct vm_area_struct *vma;
1: -	const char *file_name;
1: -	int file_size;
1: -	int maj;
1: -	int min;
1: -	u64 ino;
1: -	u64 ino_generation;
1: -	u32 prot;
1: -	u32 flags;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u32 pid;
1: -		u32 tid;
1: -		u64 start;
1: -		u64 len;
1: -		u64 pgoff;
1: -	} event_id;
1: +  struct vm_area_struct *vma;
1: +  const char *file_name;
1: +  int file_size;
1: +  int maj;
1: +  int min;
1: +  u64 ino;
1: +  u64 ino_generation;
1: +  u32 prot;
1: +  u32 flags;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u32 pid;
1: +    u32 tid;
1: +    u64 start;
1: +    u64 len;
1: +    u64 pgoff;
1: +  } event_id;
1:  };
1:  
1:  struct perf_switch_event {
1: -	struct task_struct *task;
1: -	struct task_struct *next_prev;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u32 next_prev_pid;
1: -		u32 next_prev_tid;
1: -	} event_id;
1: +  struct task_struct *task;
1: +  struct task_struct *next_prev;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u32 next_prev_pid;
1: +    u32 next_prev_tid;
1: +  } event_id;
1:  };
1:  
1:  struct perf_ksymbol_event {
1: -	const char *name;
1: -	int name_len;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u64 addr;
1: -		u32 len;
1: -		u16 ksym_type;
1: -		u16 flags;
1: -	} event_id;
1: +  const char *name;
1: +  int name_len;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u64 addr;
1: +    u32 len;
1: +    u16 ksym_type;
1: +    u16 flags;
1: +  } event_id;
1:  };
1:  
1:  struct perf_bpf_event {
1: -	struct bpf_prog *prog;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u16 type;
1: -		u16 flags;
1: -		u32 id;
1: -		u8 tag[8];
1: -	} event_id;
1: +  struct bpf_prog *prog;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u16 type;
1: +    u16 flags;
1: +    u32 id;
1: +    u8 tag[8];
1: +  } event_id;
1:  };
1:  
1:  struct perf_text_poke_event {
1: -	const void *old_bytes;
1: -	const void *new_bytes;
1: -	size_t pad;
1: -	u16 old_len;
1: -	u16 new_len;
1: -	struct {
1: -		struct perf_event_header header;
1: -		u64 addr;
1: -	} event_id;
1: +  const void *old_bytes;
1: +  const void *new_bytes;
1: +  size_t pad;
1: +  u16 old_len;
1: +  u16 new_len;
1: +  struct {
1: +    struct perf_event_header header;
1: +    u64 addr;
1: +  } event_id;
1:  };
1:  
1:  struct swevent_htable {
1: -	struct swevent_hlist *swevent_hlist;
1: -	struct mutex hlist_mutex;
1: -	int hlist_refcount;
1: -	int recursion[4];
1: +  struct swevent_hlist *swevent_hlist;
1: +  struct mutex hlist_mutex;
1: +  int hlist_refcount;
1: +  int recursion[4];
1:  };
1:  
1:  enum perf_probe_config {
1: -	PERF_PROBE_CONFIG_IS_RETPROBE = 1,
1: -	PERF_UPROBE_REF_CTR_OFFSET_BITS = 32,
1: -	PERF_UPROBE_REF_CTR_OFFSET_SHIFT = 32,
1: +  PERF_PROBE_CONFIG_IS_RETPROBE = 1,
1: +  PERF_UPROBE_REF_CTR_OFFSET_BITS = 32,
1: +  PERF_UPROBE_REF_CTR_OFFSET_SHIFT = 32,
1:  };
1:  
1:  enum {
1: -	IF_ACT_NONE = 4294967295,
1: -	IF_ACT_FILTER = 0,
1: -	IF_ACT_START = 1,
1: -	IF_ACT_STOP = 2,
1: -	IF_SRC_FILE = 3,
1: -	IF_SRC_KERNEL = 4,
1: -	IF_SRC_FILEADDR = 5,
1: -	IF_SRC_KERNELADDR = 6,
1: +  IF_ACT_NONE = 4294967295,
1: +  IF_ACT_FILTER = 0,
1: +  IF_ACT_START = 1,
1: +  IF_ACT_STOP = 2,
1: +  IF_SRC_FILE = 3,
1: +  IF_SRC_KERNEL = 4,
1: +  IF_SRC_FILEADDR = 5,
1: +  IF_SRC_KERNELADDR = 6,
1:  };
1:  
1:  enum {
1: -	IF_STATE_ACTION = 0,
1: -	IF_STATE_SOURCE = 1,
1: -	IF_STATE_END = 2,
1: +  IF_STATE_ACTION = 0,
1: +  IF_STATE_SOURCE = 1,
1: +  IF_STATE_END = 2,
1:  };
1:  
1:  struct perf_aux_event {
1: -	struct perf_event_header header;
1: -	u32 pid;
1: -	u32 tid;
1: +  struct perf_event_header header;
1: +  u32 pid;
1: +  u32 tid;
1:  };
1:  
1:  struct perf_aux_event___2 {
1: -	struct perf_event_header header;
1: -	u64 offset;
1: -	u64 size;
1: -	u64 flags;
1: +  struct perf_event_header header;
1: +  u64 offset;
1: +  u64 size;
1: +  u64 flags;
1:  };
1:  
1:  struct callchain_cpus_entries {
1: -	struct callback_head callback_head;
1: -	struct perf_callchain_entry *cpu_entries[0];
1: +  struct callback_head callback_head;
1: +  struct perf_callchain_entry *cpu_entries[0];
1:  };
1:  
1:  enum bp_type_idx {
1: -	TYPE_INST = 0,
1: -	TYPE_DATA = 0,
1: -	TYPE_MAX = 1,
1: +  TYPE_INST = 0,
1: +  TYPE_DATA = 0,
1: +  TYPE_MAX = 1,
1:  };
1:  
1:  struct bp_cpuinfo {
1: -	unsigned int cpu_pinned;
1: -	unsigned int *tsk_pinned;
1: -	unsigned int flexible;
1: +  unsigned int cpu_pinned;
1: +  unsigned int *tsk_pinned;
1: +  unsigned int flexible;
1:  };
1:  
1:  struct bp_busy_slots {
1: -	unsigned int pinned;
1: -	unsigned int flexible;
1: +  unsigned int pinned;
1: +  unsigned int flexible;
1:  };
1:  
1:  typedef u8 uprobe_opcode_t;
1:  
1:  struct uprobe {
1: -	struct rb_node rb_node;
1: -	refcount_t ref;
1: -	struct rw_semaphore register_rwsem;
1: -	struct rw_semaphore consumer_rwsem;
1: -	struct list_head pending_list;
1: -	struct uprobe_consumer *consumers;
1: -	struct inode *inode;
1: -	loff_t offset;
1: -	loff_t ref_ctr_offset;
1: -	long unsigned int flags;
1: -	struct arch_uprobe arch;
1: +  struct rb_node rb_node;
1: +  refcount_t ref;
1: +  struct rw_semaphore register_rwsem;
1: +  struct rw_semaphore consumer_rwsem;
1: +  struct list_head pending_list;
1: +  struct uprobe_consumer *consumers;
1: +  struct inode *inode;
1: +  loff_t offset;
1: +  loff_t ref_ctr_offset;
1: +  long unsigned int flags;
1: +  struct arch_uprobe arch;
1:  };
1:  
1:  struct xol_area {
1: -	wait_queue_head_t wq;
1: -	atomic_t slot_count;
1: -	long unsigned int *bitmap;
1: -	struct vm_special_mapping xol_mapping;
1: -	struct page *pages[2];
1: -	long unsigned int vaddr;
1: +  wait_queue_head_t wq;
1: +  atomic_t slot_count;
1: +  long unsigned int *bitmap;
1: +  struct vm_special_mapping xol_mapping;
1: +  struct page *pages[2];
1: +  long unsigned int vaddr;
1:  };
1:  
1:  typedef long unsigned int vm_flags_t;
1: @@ -38101,115 +38462,115 @@ typedef long unsigned int vm_flags_t;
1:  struct compact_control;
1:  
1:  struct capture_control {
1: -	struct compact_control *cc;
1: -	struct page *page;
1: +  struct compact_control *cc;
1: +  struct page *page;
1:  };
1:  
1:  struct page_vma_mapped_walk {
1: -	struct page *page;
1: -	struct vm_area_struct *vma;
1: -	long unsigned int address;
1: -	pmd_t *pmd;
1: -	pte_t *pte;
1: -	spinlock_t *ptl;
1: -	unsigned int flags;
1: +  struct page *page;
1: +  struct vm_area_struct *vma;
1: +  long unsigned int address;
1: +  pmd_t *pmd;
1: +  pte_t *pte;
1: +  spinlock_t *ptl;
1: +  unsigned int flags;
1:  };
1:  
1:  struct compact_control {
1: -	struct list_head freepages;
1: -	struct list_head migratepages;
1: -	unsigned int nr_freepages;
1: -	unsigned int nr_migratepages;
1: -	long unsigned int free_pfn;
1: -	long unsigned int migrate_pfn;
1: -	long unsigned int fast_start_pfn;
1: -	struct zone *zone;
1: -	long unsigned int total_migrate_scanned;
1: -	long unsigned int total_free_scanned;
1: -	short unsigned int fast_search_fail;
1: -	short int search_order;
1: -	const gfp_t gfp_mask;
1: -	int order;
1: -	int migratetype;
1: -	const unsigned int alloc_flags;
1: -	const int highest_zoneidx;
1: -	enum migrate_mode mode;
1: -	bool ignore_skip_hint;
1: -	bool no_set_skip_hint;
1: -	bool ignore_block_suitable;
1: -	bool direct_compaction;
1: -	bool proactive_compaction;
1: -	bool whole_zone;
1: -	bool contended;
1: -	bool rescan;
1: -	bool alloc_contig;
1: +  struct list_head freepages;
1: +  struct list_head migratepages;
1: +  unsigned int nr_freepages;
1: +  unsigned int nr_migratepages;
1: +  long unsigned int free_pfn;
1: +  long unsigned int migrate_pfn;
1: +  long unsigned int fast_start_pfn;
1: +  struct zone *zone;
1: +  long unsigned int total_migrate_scanned;
1: +  long unsigned int total_free_scanned;
1: +  short unsigned int fast_search_fail;
1: +  short int search_order;
1: +  const gfp_t gfp_mask;
1: +  int order;
1: +  int migratetype;
1: +  const unsigned int alloc_flags;
1: +  const int highest_zoneidx;
1: +  enum migrate_mode mode;
1: +  bool ignore_skip_hint;
1: +  bool no_set_skip_hint;
1: +  bool ignore_block_suitable;
1: +  bool direct_compaction;
1: +  bool proactive_compaction;
1: +  bool whole_zone;
1: +  bool contended;
1: +  bool rescan;
1: +  bool alloc_contig;
1:  };
1:  
1:  struct delayed_uprobe {
1: -	struct list_head list;
1: -	struct uprobe *uprobe;
1: -	struct mm_struct *mm;
1: +  struct list_head list;
1: +  struct uprobe *uprobe;
1: +  struct mm_struct *mm;
1:  };
1:  
1:  struct map_info {
1: -	struct map_info *next;
1: -	struct mm_struct *mm;
1: -	long unsigned int vaddr;
1: +  struct map_info *next;
1: +  struct mm_struct *mm;
1: +  long unsigned int vaddr;
1:  };
1:  
1:  struct user_return_notifier {
1: -	void (*on_user_return)(struct user_return_notifier *);
1: -	struct hlist_node link;
1: +  void (*on_user_return)(struct user_return_notifier *);
1: +  struct hlist_node link;
1:  };
1:  
1:  struct static_key_mod {
1: -	struct static_key_mod *next;
1: -	struct jump_entry *entries;
1: -	struct module *mod;
1: +  struct static_key_mod *next;
1: +  struct jump_entry *entries;
1: +  struct module *mod;
1:  };
1:  
1:  struct static_key_deferred {
1: -	struct static_key key;
1: -	long unsigned int timeout;
1: -	struct delayed_work work;
1: +  struct static_key key;
1: +  long unsigned int timeout;
1: +  struct delayed_work work;
1:  };
1:  
1:  enum rseq_cpu_id_state {
1: -	RSEQ_CPU_ID_UNINITIALIZED = 4294967295,
1: -	RSEQ_CPU_ID_REGISTRATION_FAILED = 4294967294,
1: +  RSEQ_CPU_ID_UNINITIALIZED = 4294967295,
1: +  RSEQ_CPU_ID_REGISTRATION_FAILED = 4294967294,
1:  };
1:  
1:  enum rseq_flags {
1: -	RSEQ_FLAG_UNREGISTER = 1,
1: +  RSEQ_FLAG_UNREGISTER = 1,
1:  };
1:  
1:  enum rseq_cs_flags {
1: -	RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT = 1,
1: -	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL = 2,
1: -	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE = 4,
1: +  RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT = 1,
1: +  RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL = 2,
1: +  RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE = 4,
1:  };
1:  
1:  struct rseq_cs {
1: -	__u32 version;
1: -	__u32 flags;
1: -	__u64 start_ip;
1: -	__u64 post_commit_offset;
1: -	__u64 abort_ip;
1: +  __u32 version;
1: +  __u32 flags;
1: +  __u64 start_ip;
1: +  __u64 post_commit_offset;
1: +  __u64 abort_ip;
1:  };
1:  
1:  struct trace_event_raw_rseq_update {
1: -	struct trace_entry ent;
1: -	s32 cpu_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  s32 cpu_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rseq_ip_fixup {
1: -	struct trace_entry ent;
1: -	long unsigned int regs_ip;
1: -	long unsigned int start_ip;
1: -	long unsigned int post_commit_offset;
1: -	long unsigned int abort_ip;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int regs_ip;
1: +  long unsigned int start_ip;
1: +  long unsigned int post_commit_offset;
1: +  long unsigned int abort_ip;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_rseq_update {};
1: @@ -38218,110 +38579,112 @@ struct trace_event_data_offsets_rseq_ip_fixup {};
1:  
1:  typedef void (*btf_trace_rseq_update)(void *, struct task_struct *);
1:  
1: -typedef void (*btf_trace_rseq_ip_fixup)(void *, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_rseq_ip_fixup)(void *, long unsigned int,
1: +                                        long unsigned int, long unsigned int,
1: +                                        long unsigned int);
1:  
1:  struct pkcs7_message;
1:  
1:  typedef void (*xa_update_node_t)(struct xa_node *);
1:  
1:  struct xa_state {
1: -	struct xarray *xa;
1: -	long unsigned int xa_index;
1: -	unsigned char xa_shift;
1: -	unsigned char xa_sibs;
1: -	unsigned char xa_offset;
1: -	unsigned char xa_pad;
1: -	struct xa_node *xa_node;
1: -	struct xa_node *xa_alloc;
1: -	xa_update_node_t xa_update;
1: +  struct xarray *xa;
1: +  long unsigned int xa_index;
1: +  unsigned char xa_shift;
1: +  unsigned char xa_sibs;
1: +  unsigned char xa_offset;
1: +  unsigned char xa_pad;
1: +  struct xa_node *xa_node;
1: +  struct xa_node *xa_alloc;
1: +  xa_update_node_t xa_update;
1:  };
1:  
1:  typedef int __kernel_rwf_t;
1:  
1:  enum positive_aop_returns {
1: -	AOP_WRITEPAGE_ACTIVATE = 524288,
1: -	AOP_TRUNCATED_PAGE = 524289,
1: +  AOP_WRITEPAGE_ACTIVATE = 524288,
1: +  AOP_TRUNCATED_PAGE = 524289,
1:  };
1:  
1:  struct vm_event_state {
1: -	long unsigned int event[96];
1: +  long unsigned int event[96];
1:  };
1:  
1:  enum mapping_flags {
1: -	AS_EIO = 0,
1: -	AS_ENOSPC = 1,
1: -	AS_MM_ALL_LOCKS = 2,
1: -	AS_UNEVICTABLE = 3,
1: -	AS_EXITING = 4,
1: -	AS_NO_WRITEBACK_TAGS = 5,
1: -	AS_THP_SUPPORT = 6,
1: +  AS_EIO = 0,
1: +  AS_ENOSPC = 1,
1: +  AS_MM_ALL_LOCKS = 2,
1: +  AS_UNEVICTABLE = 3,
1: +  AS_EXITING = 4,
1: +  AS_NO_WRITEBACK_TAGS = 5,
1: +  AS_THP_SUPPORT = 6,
1:  };
1:  
1:  struct wait_page_key {
1: -	struct page *page;
1: -	int bit_nr;
1: -	int page_match;
1: +  struct page *page;
1: +  int bit_nr;
1: +  int page_match;
1:  };
1:  
1:  enum iter_type {
1: -	ITER_IOVEC = 4,
1: -	ITER_KVEC = 8,
1: -	ITER_BVEC = 16,
1: -	ITER_PIPE = 32,
1: -	ITER_DISCARD = 64,
1: +  ITER_IOVEC = 4,
1: +  ITER_KVEC = 8,
1: +  ITER_BVEC = 16,
1: +  ITER_PIPE = 32,
1: +  ITER_DISCARD = 64,
1:  };
1:  
1:  struct pagevec {
1: -	unsigned char nr;
1: -	bool percpu_pvec_drained;
1: -	struct page *pages[15];
1: +  unsigned char nr;
1: +  bool percpu_pvec_drained;
1: +  struct page *pages[15];
1:  };
1:  
1:  struct fid {
1: -	union {
1: -		struct {
1: -			u32 ino;
1: -			u32 gen;
1: -			u32 parent_ino;
1: -			u32 parent_gen;
1: -		} i32;
1: -		struct {
1: -			u32 block;
1: -			u16 partref;
1: -			u16 parent_partref;
1: -			u32 generation;
1: -			u32 parent_block;
1: -			u32 parent_generation;
1: -		} udf;
1: -		__u32 raw[0];
1: -	};
1: +  union {
1: +    struct {
1: +      u32 ino;
1: +      u32 gen;
1: +      u32 parent_ino;
1: +      u32 parent_gen;
1: +    } i32;
1: +    struct {
1: +      u32 block;
1: +      u16 partref;
1: +      u16 parent_partref;
1: +      u32 generation;
1: +      u32 parent_block;
1: +      u32 parent_generation;
1: +    } udf;
1: +    __u32 raw[0];
1: +  };
1:  };
1:  
1:  struct trace_event_raw_mm_filemap_op_page_cache {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	long unsigned int i_ino;
1: -	long unsigned int index;
1: -	dev_t s_dev;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  long unsigned int i_ino;
1: +  long unsigned int index;
1: +  dev_t s_dev;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_filemap_set_wb_err {
1: -	struct trace_entry ent;
1: -	long unsigned int i_ino;
1: -	dev_t s_dev;
1: -	errseq_t errseq;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int i_ino;
1: +  dev_t s_dev;
1: +  errseq_t errseq;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_file_check_and_advance_wb_err {
1: -	struct trace_entry ent;
1: -	struct file *file;
1: -	long unsigned int i_ino;
1: -	dev_t s_dev;
1: -	errseq_t old;
1: -	errseq_t new;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct file *file;
1: +  long unsigned int i_ino;
1: +  dev_t s_dev;
1: +  errseq_t old;
1: +  errseq_t new;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mm_filemap_op_page_cache {};
1: @@ -38330,28 +38693,31 @@ struct trace_event_data_offsets_filemap_set_wb_err {};
1:  
1:  struct trace_event_data_offsets_file_check_and_advance_wb_err {};
1:  
1: -typedef void (*btf_trace_mm_filemap_delete_from_page_cache)(void *, struct page *);
1: +typedef void (*btf_trace_mm_filemap_delete_from_page_cache)(void *,
1: +                                                            struct page *);
1:  
1:  typedef void (*btf_trace_mm_filemap_add_to_page_cache)(void *, struct page *);
1:  
1: -typedef void (*btf_trace_filemap_set_wb_err)(void *, struct address_space *, errseq_t);
1: +typedef void (*btf_trace_filemap_set_wb_err)(void *, struct address_space *,
1: +                                             errseq_t);
1:  
1: -typedef void (*btf_trace_file_check_and_advance_wb_err)(void *, struct file *, errseq_t);
1: +typedef void (*btf_trace_file_check_and_advance_wb_err)(void *, struct file *,
1: +                                                        errseq_t);
1:  
1:  enum behavior {
1: -	EXCLUSIVE = 0,
1: -	SHARED = 1,
1: -	DROP = 2,
1: +  EXCLUSIVE = 0,
1: +  SHARED = 1,
1: +  DROP = 2,
1:  };
1:  
1:  struct reciprocal_value {
1: -	u32 m;
1: -	u8 sh1;
1: -	u8 sh2;
1: +  u32 m;
1: +  u8 sh1;
1: +  u8 sh2;
1:  };
1:  
1:  struct kmem_cache_order_objects {
1: -	unsigned int x;
1: +  unsigned int x;
1:  };
1:  
1:  struct kmem_cache_cpu;
1: @@ -38359,149 +38725,149 @@ struct kmem_cache_cpu;
1:  struct kmem_cache_node;
1:  
1:  struct kmem_cache {
1: -	struct kmem_cache_cpu *cpu_slab;
1: -	slab_flags_t flags;
1: -	long unsigned int min_partial;
1: -	unsigned int size;
1: -	unsigned int object_size;
1: -	struct reciprocal_value reciprocal_size;
1: -	unsigned int offset;
1: -	unsigned int cpu_partial;
1: -	struct kmem_cache_order_objects oo;
1: -	struct kmem_cache_order_objects max;
1: -	struct kmem_cache_order_objects min;
1: -	gfp_t allocflags;
1: -	int refcount;
1: -	void (*ctor)(void *);
1: -	unsigned int inuse;
1: -	unsigned int align;
1: -	unsigned int red_left_pad;
1: -	const char *name;
1: -	struct list_head list;
1: -	struct kobject kobj;
1: -	unsigned int remote_node_defrag_ratio;
1: -	unsigned int useroffset;
1: -	unsigned int usersize;
1: -	struct kmem_cache_node *node[64];
1: +  struct kmem_cache_cpu *cpu_slab;
1: +  slab_flags_t flags;
1: +  long unsigned int min_partial;
1: +  unsigned int size;
1: +  unsigned int object_size;
1: +  struct reciprocal_value reciprocal_size;
1: +  unsigned int offset;
1: +  unsigned int cpu_partial;
1: +  struct kmem_cache_order_objects oo;
1: +  struct kmem_cache_order_objects max;
1: +  struct kmem_cache_order_objects min;
1: +  gfp_t allocflags;
1: +  int refcount;
1: +  void (*ctor)(void *);
1: +  unsigned int inuse;
1: +  unsigned int align;
1: +  unsigned int red_left_pad;
1: +  const char *name;
1: +  struct list_head list;
1: +  struct kobject kobj;
1: +  unsigned int remote_node_defrag_ratio;
1: +  unsigned int useroffset;
1: +  unsigned int usersize;
1: +  struct kmem_cache_node *node[64];
1:  };
1:  
1:  struct kmem_cache_cpu {
1: -	void **freelist;
1: -	long unsigned int tid;
1: -	struct page *page;
1: -	struct page *partial;
1: +  void **freelist;
1: +  long unsigned int tid;
1: +  struct page *page;
1: +  struct page *partial;
1:  };
1:  
1:  struct kmem_cache_node {
1: -	spinlock_t list_lock;
1: -	long unsigned int nr_partial;
1: -	struct list_head partial;
1: -	atomic_long_t nr_slabs;
1: -	atomic_long_t total_objects;
1: -	struct list_head full;
1: +  spinlock_t list_lock;
1: +  long unsigned int nr_partial;
1: +  struct list_head partial;
1: +  atomic_long_t nr_slabs;
1: +  atomic_long_t total_objects;
1: +  struct list_head full;
1:  };
1:  
1:  enum oom_constraint {
1: -	CONSTRAINT_NONE = 0,
1: -	CONSTRAINT_CPUSET = 1,
1: -	CONSTRAINT_MEMORY_POLICY = 2,
1: -	CONSTRAINT_MEMCG = 3,
1: +  CONSTRAINT_NONE = 0,
1: +  CONSTRAINT_CPUSET = 1,
1: +  CONSTRAINT_MEMORY_POLICY = 2,
1: +  CONSTRAINT_MEMCG = 3,
1:  };
1:  
1:  struct oom_control {
1: -	struct zonelist *zonelist;
1: -	nodemask_t *nodemask;
1: -	struct mem_cgroup *memcg;
1: -	const gfp_t gfp_mask;
1: -	const int order;
1: -	long unsigned int totalpages;
1: -	struct task_struct *chosen;
1: -	long int chosen_points;
1: -	enum oom_constraint constraint;
1: +  struct zonelist *zonelist;
1: +  nodemask_t *nodemask;
1: +  struct mem_cgroup *memcg;
1: +  const gfp_t gfp_mask;
1: +  const int order;
1: +  long unsigned int totalpages;
1: +  struct task_struct *chosen;
1: +  long int chosen_points;
1: +  enum oom_constraint constraint;
1:  };
1:  
1:  enum compact_priority {
1: -	COMPACT_PRIO_SYNC_FULL = 0,
1: -	MIN_COMPACT_PRIORITY = 0,
1: -	COMPACT_PRIO_SYNC_LIGHT = 1,
1: -	MIN_COMPACT_COSTLY_PRIORITY = 1,
1: -	DEF_COMPACT_PRIORITY = 1,
1: -	COMPACT_PRIO_ASYNC = 2,
1: -	INIT_COMPACT_PRIORITY = 2,
1: +  COMPACT_PRIO_SYNC_FULL = 0,
1: +  MIN_COMPACT_PRIORITY = 0,
1: +  COMPACT_PRIO_SYNC_LIGHT = 1,
1: +  MIN_COMPACT_COSTLY_PRIORITY = 1,
1: +  DEF_COMPACT_PRIORITY = 1,
1: +  COMPACT_PRIO_ASYNC = 2,
1: +  INIT_COMPACT_PRIORITY = 2,
1:  };
1:  
1:  enum compact_result {
1: -	COMPACT_NOT_SUITABLE_ZONE = 0,
1: -	COMPACT_SKIPPED = 1,
1: -	COMPACT_DEFERRED = 2,
1: -	COMPACT_NO_SUITABLE_PAGE = 3,
1: -	COMPACT_CONTINUE = 4,
1: -	COMPACT_COMPLETE = 5,
1: -	COMPACT_PARTIAL_SKIPPED = 6,
1: -	COMPACT_CONTENDED = 7,
1: -	COMPACT_SUCCESS = 8,
1: +  COMPACT_NOT_SUITABLE_ZONE = 0,
1: +  COMPACT_SKIPPED = 1,
1: +  COMPACT_DEFERRED = 2,
1: +  COMPACT_NO_SUITABLE_PAGE = 3,
1: +  COMPACT_CONTINUE = 4,
1: +  COMPACT_COMPLETE = 5,
1: +  COMPACT_PARTIAL_SKIPPED = 6,
1: +  COMPACT_CONTENDED = 7,
1: +  COMPACT_SUCCESS = 8,
1:  };
1:  
1:  struct trace_event_raw_oom_score_adj_update {
1: -	struct trace_entry ent;
1: -	pid_t pid;
1: -	char comm[16];
1: -	short int oom_score_adj;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  pid_t pid;
1: +  char comm[16];
1: +  short int oom_score_adj;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_reclaim_retry_zone {
1: -	struct trace_entry ent;
1: -	int node;
1: -	int zone_idx;
1: -	int order;
1: -	long unsigned int reclaimable;
1: -	long unsigned int available;
1: -	long unsigned int min_wmark;
1: -	int no_progress_loops;
1: -	bool wmark_check;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int node;
1: +  int zone_idx;
1: +  int order;
1: +  long unsigned int reclaimable;
1: +  long unsigned int available;
1: +  long unsigned int min_wmark;
1: +  int no_progress_loops;
1: +  bool wmark_check;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mark_victim {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wake_reaper {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_start_task_reaping {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_finish_task_reaping {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_skip_task_reaping {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_compact_retry {
1: -	struct trace_entry ent;
1: -	int order;
1: -	int priority;
1: -	int result;
1: -	int retries;
1: -	int max_retries;
1: -	bool ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int order;
1: +  int priority;
1: +  int result;
1: +  int retries;
1: +  int max_retries;
1: +  bool ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_oom_score_adj_update {};
1: @@ -38522,7 +38888,10 @@ struct trace_event_data_offsets_compact_retry {};
1:  
1:  typedef void (*btf_trace_oom_score_adj_update)(void *, struct task_struct *);
1:  
1: -typedef void (*btf_trace_reclaim_retry_zone)(void *, struct zoneref *, int, long unsigned int, long unsigned int, long unsigned int, int, bool);
1: +typedef void (*btf_trace_reclaim_retry_zone)(void *, struct zoneref *, int,
1: +                                             long unsigned int,
1: +                                             long unsigned int,
1: +                                             long unsigned int, int, bool);
1:  
1:  typedef void (*btf_trace_mark_victim)(void *, int);
1:  
1: @@ -38534,67 +38903,68 @@ typedef void (*btf_trace_finish_task_reaping)(void *, int);
1:  
1:  typedef void (*btf_trace_skip_task_reaping)(void *, int);
1:  
1: -typedef void (*btf_trace_compact_retry)(void *, int, enum compact_priority, enum compact_result, int, int, bool);
1: +typedef void (*btf_trace_compact_retry)(void *, int, enum compact_priority,
1: +                                        enum compact_result, int, int, bool);
1:  
1:  enum wb_congested_state {
1: -	WB_async_congested = 0,
1: -	WB_sync_congested = 1,
1: +  WB_async_congested = 0,
1: +  WB_sync_congested = 1,
1:  };
1:  
1:  enum {
1: -	XA_CHECK_SCHED = 4096,
1: +  XA_CHECK_SCHED = 4096,
1:  };
1:  
1:  enum wb_state {
1: -	WB_registered = 0,
1: -	WB_writeback_running = 1,
1: -	WB_has_dirty_io = 2,
1: -	WB_start_all = 3,
1: +  WB_registered = 0,
1: +  WB_writeback_running = 1,
1: +  WB_has_dirty_io = 2,
1: +  WB_start_all = 3,
1:  };
1:  
1:  enum {
1: -	BLK_RW_ASYNC = 0,
1: -	BLK_RW_SYNC = 1,
1: +  BLK_RW_ASYNC = 0,
1: +  BLK_RW_SYNC = 1,
1:  };
1:  
1:  struct wb_lock_cookie {
1: -	bool locked;
1: -	long unsigned int flags;
1: +  bool locked;
1: +  long unsigned int flags;
1:  };
1:  
1:  typedef int (*writepage_t)(struct page *, struct writeback_control *, void *);
1:  
1:  struct dirty_throttle_control {
1: -	struct wb_domain *dom;
1: -	struct dirty_throttle_control *gdtc;
1: -	struct bdi_writeback *wb;
1: -	struct fprop_local_percpu *wb_completions;
1: -	long unsigned int avail;
1: -	long unsigned int dirty;
1: -	long unsigned int thresh;
1: -	long unsigned int bg_thresh;
1: -	long unsigned int wb_dirty;
1: -	long unsigned int wb_thresh;
1: -	long unsigned int wb_bg_thresh;
1: -	long unsigned int pos_ratio;
1: +  struct wb_domain *dom;
1: +  struct dirty_throttle_control *gdtc;
1: +  struct bdi_writeback *wb;
1: +  struct fprop_local_percpu *wb_completions;
1: +  long unsigned int avail;
1: +  long unsigned int dirty;
1: +  long unsigned int thresh;
1: +  long unsigned int bg_thresh;
1: +  long unsigned int wb_dirty;
1: +  long unsigned int wb_thresh;
1: +  long unsigned int wb_bg_thresh;
1: +  long unsigned int pos_ratio;
1:  };
1:  
1:  typedef void compound_page_dtor(struct page *);
1:  
1:  struct trace_event_raw_mm_lru_insertion {
1: -	struct trace_entry ent;
1: -	struct page *page;
1: -	long unsigned int pfn;
1: -	int lru;
1: -	long unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct page *page;
1: +  long unsigned int pfn;
1: +  int lru;
1: +  long unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_lru_activate {
1: -	struct trace_entry ent;
1: -	struct page *page;
1: -	long unsigned int pfn;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct page *page;
1: +  long unsigned int pfn;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mm_lru_insertion {};
1: @@ -38606,189 +38976,187 @@ typedef void (*btf_trace_mm_lru_insertion)(void *, struct page *, int);
1:  typedef void (*btf_trace_mm_lru_activate)(void *, struct page *);
1:  
1:  struct lru_rotate {
1: -	local_lock_t lock;
1: -	struct pagevec pvec;
1: +  local_lock_t lock;
1: +  struct pagevec pvec;
1:  };
1:  
1:  struct lru_pvecs {
1: -	local_lock_t lock;
1: -	struct pagevec lru_add;
1: -	struct pagevec lru_deactivate_file;
1: -	struct pagevec lru_deactivate;
1: -	struct pagevec lru_lazyfree;
1: -	struct pagevec activate_page;
1: +  local_lock_t lock;
1: +  struct pagevec lru_add;
1: +  struct pagevec lru_deactivate_file;
1: +  struct pagevec lru_deactivate;
1: +  struct pagevec lru_lazyfree;
1: +  struct pagevec activate_page;
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int val;
1: -} swp_entry_t;
1: +typedef struct { long unsigned int val; } swp_entry_t;
1:  
1:  enum lruvec_flags {
1: -	LRUVEC_CONGESTED = 0,
1: +  LRUVEC_CONGESTED = 0,
1:  };
1:  
1:  enum pgdat_flags {
1: -	PGDAT_DIRTY = 0,
1: -	PGDAT_WRITEBACK = 1,
1: -	PGDAT_RECLAIM_LOCKED = 2,
1: +  PGDAT_DIRTY = 0,
1: +  PGDAT_WRITEBACK = 1,
1: +  PGDAT_RECLAIM_LOCKED = 2,
1:  };
1:  
1:  struct reclaim_stat {
1: -	unsigned int nr_dirty;
1: -	unsigned int nr_unqueued_dirty;
1: -	unsigned int nr_congested;
1: -	unsigned int nr_writeback;
1: -	unsigned int nr_immediate;
1: -	unsigned int nr_pageout;
1: -	unsigned int nr_activate[2];
1: -	unsigned int nr_ref_keep;
1: -	unsigned int nr_unmap_fail;
1: -	unsigned int nr_lazyfree_fail;
1: +  unsigned int nr_dirty;
1: +  unsigned int nr_unqueued_dirty;
1: +  unsigned int nr_congested;
1: +  unsigned int nr_writeback;
1: +  unsigned int nr_immediate;
1: +  unsigned int nr_pageout;
1: +  unsigned int nr_activate[2];
1: +  unsigned int nr_ref_keep;
1: +  unsigned int nr_unmap_fail;
1: +  unsigned int nr_lazyfree_fail;
1:  };
1:  
1:  enum ttu_flags {
1: -	TTU_MIGRATION = 1,
1: -	TTU_MUNLOCK = 2,
1: -	TTU_SPLIT_HUGE_PMD = 4,
1: -	TTU_IGNORE_MLOCK = 8,
1: -	TTU_IGNORE_ACCESS = 16,
1: -	TTU_IGNORE_HWPOISON = 32,
1: -	TTU_BATCH_FLUSH = 64,
1: -	TTU_RMAP_LOCKED = 128,
1: -	TTU_SPLIT_FREEZE = 256,
1: +  TTU_MIGRATION = 1,
1: +  TTU_MUNLOCK = 2,
1: +  TTU_SPLIT_HUGE_PMD = 4,
1: +  TTU_IGNORE_MLOCK = 8,
1: +  TTU_IGNORE_ACCESS = 16,
1: +  TTU_IGNORE_HWPOISON = 32,
1: +  TTU_BATCH_FLUSH = 64,
1: +  TTU_RMAP_LOCKED = 128,
1: +  TTU_SPLIT_FREEZE = 256,
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_kswapd_sleep {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_kswapd_wake {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	int zid;
1: -	int order;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  int zid;
1: +  int order;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_wakeup_kswapd {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	int zid;
1: -	int order;
1: -	gfp_t gfp_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  int zid;
1: +  int order;
1: +  gfp_t gfp_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_direct_reclaim_begin_template {
1: -	struct trace_entry ent;
1: -	int order;
1: -	gfp_t gfp_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int order;
1: +  gfp_t gfp_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_direct_reclaim_end_template {
1: -	struct trace_entry ent;
1: -	long unsigned int nr_reclaimed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int nr_reclaimed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_shrink_slab_start {
1: -	struct trace_entry ent;
1: -	struct shrinker *shr;
1: -	void *shrink;
1: -	int nid;
1: -	long int nr_objects_to_shrink;
1: -	gfp_t gfp_flags;
1: -	long unsigned int cache_items;
1: -	long long unsigned int delta;
1: -	long unsigned int total_scan;
1: -	int priority;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct shrinker *shr;
1: +  void *shrink;
1: +  int nid;
1: +  long int nr_objects_to_shrink;
1: +  gfp_t gfp_flags;
1: +  long unsigned int cache_items;
1: +  long long unsigned int delta;
1: +  long unsigned int total_scan;
1: +  int priority;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_shrink_slab_end {
1: -	struct trace_entry ent;
1: -	struct shrinker *shr;
1: -	int nid;
1: -	void *shrink;
1: -	long int unused_scan;
1: -	long int new_scan;
1: -	int retval;
1: -	long int total_scan;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct shrinker *shr;
1: +  int nid;
1: +  void *shrink;
1: +  long int unused_scan;
1: +  long int new_scan;
1: +  int retval;
1: +  long int total_scan;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_lru_isolate {
1: -	struct trace_entry ent;
1: -	int highest_zoneidx;
1: -	int order;
1: -	long unsigned int nr_requested;
1: -	long unsigned int nr_scanned;
1: -	long unsigned int nr_skipped;
1: -	long unsigned int nr_taken;
1: -	isolate_mode_t isolate_mode;
1: -	int lru;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int highest_zoneidx;
1: +  int order;
1: +  long unsigned int nr_requested;
1: +  long unsigned int nr_scanned;
1: +  long unsigned int nr_skipped;
1: +  long unsigned int nr_taken;
1: +  isolate_mode_t isolate_mode;
1: +  int lru;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_writepage {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	int reclaim_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  int reclaim_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_lru_shrink_inactive {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	long unsigned int nr_scanned;
1: -	long unsigned int nr_reclaimed;
1: -	long unsigned int nr_dirty;
1: -	long unsigned int nr_writeback;
1: -	long unsigned int nr_congested;
1: -	long unsigned int nr_immediate;
1: -	unsigned int nr_activate0;
1: -	unsigned int nr_activate1;
1: -	long unsigned int nr_ref_keep;
1: -	long unsigned int nr_unmap_fail;
1: -	int priority;
1: -	int reclaim_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  long unsigned int nr_scanned;
1: +  long unsigned int nr_reclaimed;
1: +  long unsigned int nr_dirty;
1: +  long unsigned int nr_writeback;
1: +  long unsigned int nr_congested;
1: +  long unsigned int nr_immediate;
1: +  unsigned int nr_activate0;
1: +  unsigned int nr_activate1;
1: +  long unsigned int nr_ref_keep;
1: +  long unsigned int nr_unmap_fail;
1: +  int priority;
1: +  int reclaim_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_lru_shrink_active {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	long unsigned int nr_taken;
1: -	long unsigned int nr_active;
1: -	long unsigned int nr_deactivated;
1: -	long unsigned int nr_referenced;
1: -	int priority;
1: -	int reclaim_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  long unsigned int nr_taken;
1: +  long unsigned int nr_active;
1: +  long unsigned int nr_deactivated;
1: +  long unsigned int nr_referenced;
1: +  int priority;
1: +  int reclaim_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_inactive_list_is_low {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	int reclaim_idx;
1: -	long unsigned int total_inactive;
1: -	long unsigned int inactive;
1: -	long unsigned int total_active;
1: -	long unsigned int active;
1: -	long unsigned int ratio;
1: -	int reclaim_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  int reclaim_idx;
1: +  long unsigned int total_inactive;
1: +  long unsigned int inactive;
1: +  long unsigned int total_active;
1: +  long unsigned int active;
1: +  long unsigned int ratio;
1: +  int reclaim_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_vmscan_node_reclaim_begin {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	int order;
1: -	gfp_t gfp_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  int order;
1: +  gfp_t gfp_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mm_vmscan_kswapd_sleep {};
1: @@ -38827,280 +39195,299 @@ typedef void (*btf_trace_mm_vmscan_direct_reclaim_begin)(void *, int, gfp_t);
1:  
1:  typedef void (*btf_trace_mm_vmscan_memcg_reclaim_begin)(void *, int, gfp_t);
1:  
1: -typedef void (*btf_trace_mm_vmscan_memcg_softlimit_reclaim_begin)(void *, int, gfp_t);
1: +typedef void (*btf_trace_mm_vmscan_memcg_softlimit_reclaim_begin)(void *, int,
1: +                                                                  gfp_t);
1:  
1: -typedef void (*btf_trace_mm_vmscan_direct_reclaim_end)(void *, long unsigned int);
1: +typedef void (*btf_trace_mm_vmscan_direct_reclaim_end)(void *,
1: +                                                       long unsigned int);
1:  
1: -typedef void (*btf_trace_mm_vmscan_memcg_reclaim_end)(void *, long unsigned int);
1: +typedef void (*btf_trace_mm_vmscan_memcg_reclaim_end)(void *,
1: +                                                      long unsigned int);
1:  
1: -typedef void (*btf_trace_mm_vmscan_memcg_softlimit_reclaim_end)(void *, long unsigned int);
1: +typedef void (*btf_trace_mm_vmscan_memcg_softlimit_reclaim_end)(
1: +    void *, long unsigned int);
1:  
1: -typedef void (*btf_trace_mm_shrink_slab_start)(void *, struct shrinker *, struct shrink_control *, long int, long unsigned int, long long unsigned int, long unsigned int, int);
1: +typedef void (*btf_trace_mm_shrink_slab_start)(void *, struct shrinker *,
1: +                                               struct shrink_control *,
1: +                                               long int, long unsigned int,
1: +                                               long long unsigned int,
1: +                                               long unsigned int, int);
1:  
1: -typedef void (*btf_trace_mm_shrink_slab_end)(void *, struct shrinker *, int, int, long int, long int, long int);
1: +typedef void (*btf_trace_mm_shrink_slab_end)(void *, struct shrinker *, int,
1: +                                             int, long int, long int, long int);
1:  
1: -typedef void (*btf_trace_mm_vmscan_lru_isolate)(void *, int, int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, isolate_mode_t, int);
1: +typedef void (*btf_trace_mm_vmscan_lru_isolate)(
1: +    void *, int, int, long unsigned int, long unsigned int, long unsigned int,
1: +    long unsigned int, isolate_mode_t, int);
1:  
1:  typedef void (*btf_trace_mm_vmscan_writepage)(void *, struct page *);
1:  
1: -typedef void (*btf_trace_mm_vmscan_lru_shrink_inactive)(void *, int, long unsigned int, long unsigned int, struct reclaim_stat *, int, int);
1: +typedef void (*btf_trace_mm_vmscan_lru_shrink_inactive)(void *, int,
1: +                                                        long unsigned int,
1: +                                                        long unsigned int,
1: +                                                        struct reclaim_stat *,
1: +                                                        int, int);
1:  
1: -typedef void (*btf_trace_mm_vmscan_lru_shrink_active)(void *, int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, int, int);
1: +typedef void (*btf_trace_mm_vmscan_lru_shrink_active)(
1: +    void *, int, long unsigned int, long unsigned int, long unsigned int,
1: +    long unsigned int, int, int);
1:  
1: -typedef void (*btf_trace_mm_vmscan_inactive_list_is_low)(void *, int, int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, int);
1: +typedef void (*btf_trace_mm_vmscan_inactive_list_is_low)(
1: +    void *, int, int, long unsigned int, long unsigned int, long unsigned int,
1: +    long unsigned int, long unsigned int, int);
1:  
1:  typedef void (*btf_trace_mm_vmscan_node_reclaim_begin)(void *, int, int, gfp_t);
1:  
1:  typedef void (*btf_trace_mm_vmscan_node_reclaim_end)(void *, long unsigned int);
1:  
1:  struct scan_control {
1: -	long unsigned int nr_to_reclaim;
1: -	nodemask_t *nodemask;
1: -	struct mem_cgroup *target_mem_cgroup;
1: -	long unsigned int anon_cost;
1: -	long unsigned int file_cost;
1: -	unsigned int may_deactivate: 2;
1: -	unsigned int force_deactivate: 1;
1: -	unsigned int skipped_deactivate: 1;
1: -	unsigned int may_writepage: 1;
1: -	unsigned int may_unmap: 1;
1: -	unsigned int may_swap: 1;
1: -	unsigned int memcg_low_reclaim: 1;
1: -	unsigned int memcg_low_skipped: 1;
1: -	unsigned int hibernation_mode: 1;
1: -	unsigned int compaction_ready: 1;
1: -	unsigned int cache_trim_mode: 1;
1: -	unsigned int file_is_tiny: 1;
1: -	s8 order;
1: -	s8 priority;
1: -	s8 reclaim_idx;
1: -	gfp_t gfp_mask;
1: -	long unsigned int nr_scanned;
1: -	long unsigned int nr_reclaimed;
1: -	struct {
1: -		unsigned int dirty;
1: -		unsigned int unqueued_dirty;
1: -		unsigned int congested;
1: -		unsigned int writeback;
1: -		unsigned int immediate;
1: -		unsigned int file_taken;
1: -		unsigned int taken;
1: -	} nr;
1: -	struct reclaim_state reclaim_state;
1: +  long unsigned int nr_to_reclaim;
1: +  nodemask_t *nodemask;
1: +  struct mem_cgroup *target_mem_cgroup;
1: +  long unsigned int anon_cost;
1: +  long unsigned int file_cost;
1: +  unsigned int may_deactivate : 2;
1: +  unsigned int force_deactivate : 1;
1: +  unsigned int skipped_deactivate : 1;
1: +  unsigned int may_writepage : 1;
1: +  unsigned int may_unmap : 1;
1: +  unsigned int may_swap : 1;
1: +  unsigned int memcg_low_reclaim : 1;
1: +  unsigned int memcg_low_skipped : 1;
1: +  unsigned int hibernation_mode : 1;
1: +  unsigned int compaction_ready : 1;
1: +  unsigned int cache_trim_mode : 1;
1: +  unsigned int file_is_tiny : 1;
1: +  s8 order;
1: +  s8 priority;
1: +  s8 reclaim_idx;
1: +  gfp_t gfp_mask;
1: +  long unsigned int nr_scanned;
1: +  long unsigned int nr_reclaimed;
1: +  struct {
1: +    unsigned int dirty;
1: +    unsigned int unqueued_dirty;
1: +    unsigned int congested;
1: +    unsigned int writeback;
1: +    unsigned int immediate;
1: +    unsigned int file_taken;
1: +    unsigned int taken;
1: +  } nr;
1: +  struct reclaim_state reclaim_state;
1:  };
1:  
1:  typedef enum {
1: -	PAGE_KEEP = 0,
1: -	PAGE_ACTIVATE = 1,
1: -	PAGE_SUCCESS = 2,
1: -	PAGE_CLEAN = 3,
1: +  PAGE_KEEP = 0,
1: +  PAGE_ACTIVATE = 1,
1: +  PAGE_SUCCESS = 2,
1: +  PAGE_CLEAN = 3,
1:  } pageout_t;
1:  
1:  enum page_references {
1: -	PAGEREF_RECLAIM = 0,
1: -	PAGEREF_RECLAIM_CLEAN = 1,
1: -	PAGEREF_KEEP = 2,
1: -	PAGEREF_ACTIVATE = 3,
1: +  PAGEREF_RECLAIM = 0,
1: +  PAGEREF_RECLAIM_CLEAN = 1,
1: +  PAGEREF_KEEP = 2,
1: +  PAGEREF_ACTIVATE = 3,
1:  };
1:  
1:  enum scan_balance {
1: -	SCAN_EQUAL = 0,
1: -	SCAN_FRACT = 1,
1: -	SCAN_ANON = 2,
1: -	SCAN_FILE = 3,
1: +  SCAN_EQUAL = 0,
1: +  SCAN_FRACT = 1,
1: +  SCAN_ANON = 2,
1: +  SCAN_FILE = 3,
1:  };
1:  
1:  enum transparent_hugepage_flag {
1: -	TRANSPARENT_HUGEPAGE_FLAG = 0,
1: -	TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG = 1,
1: -	TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG = 2,
1: -	TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG = 3,
1: -	TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG = 4,
1: -	TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG = 5,
1: -	TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG = 6,
1: -	TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG = 7,
1: +  TRANSPARENT_HUGEPAGE_FLAG = 0,
1: +  TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG = 1,
1: +  TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG = 2,
1: +  TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG = 3,
1: +  TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG = 4,
1: +  TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG = 5,
1: +  TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG = 6,
1: +  TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG = 7,
1:  };
1:  
1:  struct xattr {
1: -	const char *name;
1: -	void *value;
1: -	size_t value_len;
1: +  const char *name;
1: +  void *value;
1: +  size_t value_len;
1:  };
1:  
1:  struct constant_table {
1: -	const char *name;
1: -	int value;
1: +  const char *name;
1: +  int value;
1:  };
1:  
1:  enum {
1: -	MPOL_DEFAULT = 0,
1: -	MPOL_PREFERRED = 1,
1: -	MPOL_BIND = 2,
1: -	MPOL_INTERLEAVE = 3,
1: -	MPOL_LOCAL = 4,
1: -	MPOL_MAX = 5,
1: +  MPOL_DEFAULT = 0,
1: +  MPOL_PREFERRED = 1,
1: +  MPOL_BIND = 2,
1: +  MPOL_INTERLEAVE = 3,
1: +  MPOL_LOCAL = 4,
1: +  MPOL_MAX = 5,
1:  };
1:  
1:  struct shared_policy {
1: -	struct rb_root root;
1: -	rwlock_t lock;
1: +  struct rb_root root;
1: +  rwlock_t lock;
1:  };
1:  
1:  struct simple_xattrs {
1: -	struct list_head head;
1: -	spinlock_t lock;
1: +  struct list_head head;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct simple_xattr {
1: -	struct list_head list;
1: -	char *name;
1: -	size_t size;
1: -	char value[0];
1: +  struct list_head list;
1: +  char *name;
1: +  size_t size;
1: +  char value[0];
1:  };
1:  
1:  enum fid_type {
1: -	FILEID_ROOT = 0,
1: -	FILEID_INO32_GEN = 1,
1: -	FILEID_INO32_GEN_PARENT = 2,
1: -	FILEID_BTRFS_WITHOUT_PARENT = 77,
1: -	FILEID_BTRFS_WITH_PARENT = 78,
1: -	FILEID_BTRFS_WITH_PARENT_ROOT = 79,
1: -	FILEID_UDF_WITHOUT_PARENT = 81,
1: -	FILEID_UDF_WITH_PARENT = 82,
1: -	FILEID_NILFS_WITHOUT_PARENT = 97,
1: -	FILEID_NILFS_WITH_PARENT = 98,
1: -	FILEID_FAT_WITHOUT_PARENT = 113,
1: -	FILEID_FAT_WITH_PARENT = 114,
1: -	FILEID_LUSTRE = 151,
1: -	FILEID_KERNFS = 254,
1: -	FILEID_INVALID = 255,
1: +  FILEID_ROOT = 0,
1: +  FILEID_INO32_GEN = 1,
1: +  FILEID_INO32_GEN_PARENT = 2,
1: +  FILEID_BTRFS_WITHOUT_PARENT = 77,
1: +  FILEID_BTRFS_WITH_PARENT = 78,
1: +  FILEID_BTRFS_WITH_PARENT_ROOT = 79,
1: +  FILEID_UDF_WITHOUT_PARENT = 81,
1: +  FILEID_UDF_WITH_PARENT = 82,
1: +  FILEID_NILFS_WITHOUT_PARENT = 97,
1: +  FILEID_NILFS_WITH_PARENT = 98,
1: +  FILEID_FAT_WITHOUT_PARENT = 113,
1: +  FILEID_FAT_WITH_PARENT = 114,
1: +  FILEID_LUSTRE = 151,
1: +  FILEID_KERNFS = 254,
1: +  FILEID_INVALID = 255,
1:  };
1:  
1:  struct shmem_inode_info {
1: -	spinlock_t lock;
1: -	unsigned int seals;
1: -	long unsigned int flags;
1: -	long unsigned int alloced;
1: -	long unsigned int swapped;
1: -	struct list_head shrinklist;
1: -	struct list_head swaplist;
1: -	struct shared_policy policy;
1: -	struct simple_xattrs xattrs;
1: -	atomic_t stop_eviction;
1: -	struct inode vfs_inode;
1: +  spinlock_t lock;
1: +  unsigned int seals;
1: +  long unsigned int flags;
1: +  long unsigned int alloced;
1: +  long unsigned int swapped;
1: +  struct list_head shrinklist;
1: +  struct list_head swaplist;
1: +  struct shared_policy policy;
1: +  struct simple_xattrs xattrs;
1: +  atomic_t stop_eviction;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  struct shmem_sb_info {
1: -	long unsigned int max_blocks;
1: -	struct percpu_counter used_blocks;
1: -	long unsigned int max_inodes;
1: -	long unsigned int free_inodes;
1: -	spinlock_t stat_lock;
1: -	umode_t mode;
1: -	unsigned char huge;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	bool full_inums;
1: -	ino_t next_ino;
1: -	ino_t *ino_batch;
1: -	struct mempolicy *mpol;
1: -	spinlock_t shrinklist_lock;
1: -	struct list_head shrinklist;
1: -	long unsigned int shrinklist_len;
1: +  long unsigned int max_blocks;
1: +  struct percpu_counter used_blocks;
1: +  long unsigned int max_inodes;
1: +  long unsigned int free_inodes;
1: +  spinlock_t stat_lock;
1: +  umode_t mode;
1: +  unsigned char huge;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  bool full_inums;
1: +  ino_t next_ino;
1: +  ino_t *ino_batch;
1: +  struct mempolicy *mpol;
1: +  spinlock_t shrinklist_lock;
1: +  struct list_head shrinklist;
1: +  long unsigned int shrinklist_len;
1:  };
1:  
1:  enum sgp_type {
1: -	SGP_READ = 0,
1: -	SGP_CACHE = 1,
1: -	SGP_NOHUGE = 2,
1: -	SGP_HUGE = 3,
1: -	SGP_WRITE = 4,
1: -	SGP_FALLOC = 5,
1: +  SGP_READ = 0,
1: +  SGP_CACHE = 1,
1: +  SGP_NOHUGE = 2,
1: +  SGP_HUGE = 3,
1: +  SGP_WRITE = 4,
1: +  SGP_FALLOC = 5,
1:  };
1:  
1:  struct shmem_falloc {
1: -	wait_queue_head_t *waitq;
1: -	long unsigned int start;
1: -	long unsigned int next;
1: -	long unsigned int nr_falloced;
1: -	long unsigned int nr_unswapped;
1: +  wait_queue_head_t *waitq;
1: +  long unsigned int start;
1: +  long unsigned int next;
1: +  long unsigned int nr_falloced;
1: +  long unsigned int nr_unswapped;
1:  };
1:  
1:  struct shmem_options {
1: -	long long unsigned int blocks;
1: -	long long unsigned int inodes;
1: -	struct mempolicy *mpol;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	umode_t mode;
1: -	bool full_inums;
1: -	int huge;
1: -	int seen;
1: +  long long unsigned int blocks;
1: +  long long unsigned int inodes;
1: +  struct mempolicy *mpol;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  umode_t mode;
1: +  bool full_inums;
1: +  int huge;
1: +  int seen;
1:  };
1:  
1:  enum shmem_param {
1: -	Opt_gid = 0,
1: -	Opt_huge = 1,
1: -	Opt_mode = 2,
1: -	Opt_mpol = 3,
1: -	Opt_nr_blocks = 4,
1: -	Opt_nr_inodes = 5,
1: -	Opt_size = 6,
1: -	Opt_uid = 7,
1: -	Opt_inode32 = 8,
1: -	Opt_inode64 = 9,
1: +  Opt_gid = 0,
1: +  Opt_huge = 1,
1: +  Opt_mode = 2,
1: +  Opt_mpol = 3,
1: +  Opt_nr_blocks = 4,
1: +  Opt_nr_inodes = 5,
1: +  Opt_size = 6,
1: +  Opt_uid = 7,
1: +  Opt_inode32 = 8,
1: +  Opt_inode64 = 9,
1:  };
1:  
1:  enum writeback_stat_item {
1: -	NR_DIRTY_THRESHOLD = 0,
1: -	NR_DIRTY_BG_THRESHOLD = 1,
1: -	NR_VM_WRITEBACK_STAT_ITEMS = 2,
1: +  NR_DIRTY_THRESHOLD = 0,
1: +  NR_DIRTY_BG_THRESHOLD = 1,
1: +  NR_VM_WRITEBACK_STAT_ITEMS = 2,
1:  };
1:  
1:  struct contig_page_info {
1: -	long unsigned int free_pages;
1: -	long unsigned int free_blocks_total;
1: -	long unsigned int free_blocks_suitable;
1: +  long unsigned int free_pages;
1: +  long unsigned int free_blocks_total;
1: +  long unsigned int free_blocks_suitable;
1:  };
1:  
1:  struct radix_tree_iter {
1: -	long unsigned int index;
1: -	long unsigned int next_index;
1: -	long unsigned int tags;
1: -	struct xa_node *node;
1: +  long unsigned int index;
1: +  long unsigned int next_index;
1: +  long unsigned int tags;
1: +  struct xa_node *node;
1:  };
1:  
1:  enum {
1: -	RADIX_TREE_ITER_TAG_MASK = 15,
1: -	RADIX_TREE_ITER_TAGGED = 16,
1: -	RADIX_TREE_ITER_CONTIG = 32,
1: +  RADIX_TREE_ITER_TAG_MASK = 15,
1: +  RADIX_TREE_ITER_TAGGED = 16,
1: +  RADIX_TREE_ITER_CONTIG = 32,
1:  };
1:  
1:  enum mminit_level {
1: -	MMINIT_WARNING = 0,
1: -	MMINIT_VERIFY = 1,
1: -	MMINIT_TRACE = 2,
1: +  MMINIT_WARNING = 0,
1: +  MMINIT_VERIFY = 1,
1: +  MMINIT_TRACE = 2,
1:  };
1:  
1:  struct pcpu_group_info {
1: -	int nr_units;
1: -	long unsigned int base_offset;
1: -	unsigned int *cpu_map;
1: +  int nr_units;
1: +  long unsigned int base_offset;
1: +  unsigned int *cpu_map;
1:  };
1:  
1:  struct pcpu_alloc_info {
1: -	size_t static_size;
1: -	size_t reserved_size;
1: -	size_t dyn_size;
1: -	size_t unit_size;
1: -	size_t atom_size;
1: -	size_t alloc_size;
1: -	size_t __ai_size;
1: -	int nr_groups;
1: -	struct pcpu_group_info groups[0];
1: +  size_t static_size;
1: +  size_t reserved_size;
1: +  size_t dyn_size;
1: +  size_t unit_size;
1: +  size_t atom_size;
1: +  size_t alloc_size;
1: +  size_t __ai_size;
1: +  int nr_groups;
1: +  struct pcpu_group_info groups[0];
1:  };
1:  
1: -typedef void * (*pcpu_fc_alloc_fn_t)(unsigned int, size_t, size_t);
1: +typedef void *(*pcpu_fc_alloc_fn_t)(unsigned int, size_t, size_t);
1:  
1:  typedef void (*pcpu_fc_free_fn_t)(void *, size_t);
1:  
1: @@ -39109,44 +39496,44 @@ typedef void (*pcpu_fc_populate_pte_fn_t)(long unsigned int);
1:  typedef int pcpu_fc_cpu_distance_fn_t(unsigned int, unsigned int);
1:  
1:  struct trace_event_raw_percpu_alloc_percpu {
1: -	struct trace_entry ent;
1: -	bool reserved;
1: -	bool is_atomic;
1: -	size_t size;
1: -	size_t align;
1: -	void *base_addr;
1: -	int off;
1: -	void *ptr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  bool reserved;
1: +  bool is_atomic;
1: +  size_t size;
1: +  size_t align;
1: +  void *base_addr;
1: +  int off;
1: +  void *ptr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_percpu_free_percpu {
1: -	struct trace_entry ent;
1: -	void *base_addr;
1: -	int off;
1: -	void *ptr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *base_addr;
1: +  int off;
1: +  void *ptr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_percpu_alloc_percpu_fail {
1: -	struct trace_entry ent;
1: -	bool reserved;
1: -	bool is_atomic;
1: -	size_t size;
1: -	size_t align;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  bool reserved;
1: +  bool is_atomic;
1: +  size_t size;
1: +  size_t align;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_percpu_create_chunk {
1: -	struct trace_entry ent;
1: -	void *base_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *base_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_percpu_destroy_chunk {
1: -	struct trace_entry ent;
1: -	void *base_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *base_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_percpu_alloc_percpu {};
1: @@ -39159,137 +39546,139 @@ struct trace_event_data_offsets_percpu_create_chunk {};
1:  
1:  struct trace_event_data_offsets_percpu_destroy_chunk {};
1:  
1: -typedef void (*btf_trace_percpu_alloc_percpu)(void *, bool, bool, size_t, size_t, void *, int, void *);
1: +typedef void (*btf_trace_percpu_alloc_percpu)(void *, bool, bool, size_t,
1: +                                              size_t, void *, int, void *);
1:  
1:  typedef void (*btf_trace_percpu_free_percpu)(void *, void *, int, void *);
1:  
1: -typedef void (*btf_trace_percpu_alloc_percpu_fail)(void *, bool, bool, size_t, size_t);
1: +typedef void (*btf_trace_percpu_alloc_percpu_fail)(void *, bool, bool, size_t,
1: +                                                   size_t);
1:  
1:  typedef void (*btf_trace_percpu_create_chunk)(void *, void *);
1:  
1:  typedef void (*btf_trace_percpu_destroy_chunk)(void *, void *);
1:  
1:  enum pcpu_chunk_type {
1: -	PCPU_CHUNK_ROOT = 0,
1: -	PCPU_CHUNK_MEMCG = 1,
1: -	PCPU_NR_CHUNK_TYPES = 2,
1: -	PCPU_FAIL_ALLOC = 2,
1: +  PCPU_CHUNK_ROOT = 0,
1: +  PCPU_CHUNK_MEMCG = 1,
1: +  PCPU_NR_CHUNK_TYPES = 2,
1: +  PCPU_FAIL_ALLOC = 2,
1:  };
1:  
1:  struct pcpu_block_md {
1: -	int scan_hint;
1: -	int scan_hint_start;
1: -	int contig_hint;
1: -	int contig_hint_start;
1: -	int left_free;
1: -	int right_free;
1: -	int first_free;
1: -	int nr_bits;
1: +  int scan_hint;
1: +  int scan_hint_start;
1: +  int contig_hint;
1: +  int contig_hint_start;
1: +  int left_free;
1: +  int right_free;
1: +  int first_free;
1: +  int nr_bits;
1:  };
1:  
1:  struct pcpu_chunk {
1: -	struct list_head list;
1: -	int free_bytes;
1: -	struct pcpu_block_md chunk_md;
1: -	void *base_addr;
1: -	long unsigned int *alloc_map;
1: -	long unsigned int *bound_map;
1: -	struct pcpu_block_md *md_blocks;
1: -	void *data;
1: -	bool immutable;
1: -	int start_offset;
1: -	int end_offset;
1: -	struct obj_cgroup **obj_cgroups;
1: -	int nr_pages;
1: -	int nr_populated;
1: -	int nr_empty_pop_pages;
1: -	long unsigned int populated[0];
1: +  struct list_head list;
1: +  int free_bytes;
1: +  struct pcpu_block_md chunk_md;
1: +  void *base_addr;
1: +  long unsigned int *alloc_map;
1: +  long unsigned int *bound_map;
1: +  struct pcpu_block_md *md_blocks;
1: +  void *data;
1: +  bool immutable;
1: +  int start_offset;
1: +  int end_offset;
1: +  struct obj_cgroup **obj_cgroups;
1: +  int nr_pages;
1: +  int nr_populated;
1: +  int nr_empty_pop_pages;
1: +  long unsigned int populated[0];
1:  };
1:  
1:  struct trace_event_raw_kmem_alloc {
1: -	struct trace_entry ent;
1: -	long unsigned int call_site;
1: -	const void *ptr;
1: -	size_t bytes_req;
1: -	size_t bytes_alloc;
1: -	gfp_t gfp_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int call_site;
1: +  const void *ptr;
1: +  size_t bytes_req;
1: +  size_t bytes_alloc;
1: +  gfp_t gfp_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_kmem_alloc_node {
1: -	struct trace_entry ent;
1: -	long unsigned int call_site;
1: -	const void *ptr;
1: -	size_t bytes_req;
1: -	size_t bytes_alloc;
1: -	gfp_t gfp_flags;
1: -	int node;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int call_site;
1: +  const void *ptr;
1: +  size_t bytes_req;
1: +  size_t bytes_alloc;
1: +  gfp_t gfp_flags;
1: +  int node;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_kmem_free {
1: -	struct trace_entry ent;
1: -	long unsigned int call_site;
1: -	const void *ptr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int call_site;
1: +  const void *ptr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_page_free {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	unsigned int order;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  unsigned int order;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_page_free_batched {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_page_alloc {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	unsigned int order;
1: -	gfp_t gfp_flags;
1: -	int migratetype;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  unsigned int order;
1: +  gfp_t gfp_flags;
1: +  int migratetype;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_page {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	unsigned int order;
1: -	int migratetype;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  unsigned int order;
1: +  int migratetype;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_page_pcpu_drain {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	unsigned int order;
1: -	int migratetype;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  unsigned int order;
1: +  int migratetype;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_page_alloc_extfrag {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	int alloc_order;
1: -	int fallback_order;
1: -	int alloc_migratetype;
1: -	int fallback_migratetype;
1: -	int change_ownership;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  int alloc_order;
1: +  int fallback_order;
1: +  int alloc_migratetype;
1: +  int fallback_migratetype;
1: +  int change_ownership;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rss_stat {
1: -	struct trace_entry ent;
1: -	unsigned int mm_id;
1: -	unsigned int curr;
1: -	int member;
1: -	long int size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int mm_id;
1: +  unsigned int curr;
1: +  int member;
1: +  long int size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_kmem_alloc {};
1: @@ -39312,156 +39701,166 @@ struct trace_event_data_offsets_mm_page_alloc_extfrag {};
1:  
1:  struct trace_event_data_offsets_rss_stat {};
1:  
1: -typedef void (*btf_trace_kmalloc)(void *, long unsigned int, const void *, size_t, size_t, gfp_t);
1: +typedef void (*btf_trace_kmalloc)(void *, long unsigned int, const void *,
1: +                                  size_t, size_t, gfp_t);
1:  
1: -typedef void (*btf_trace_kmem_cache_alloc)(void *, long unsigned int, const void *, size_t, size_t, gfp_t);
1: +typedef void (*btf_trace_kmem_cache_alloc)(void *, long unsigned int,
1: +                                           const void *, size_t, size_t, gfp_t);
1:  
1: -typedef void (*btf_trace_kmalloc_node)(void *, long unsigned int, const void *, size_t, size_t, gfp_t, int);
1: +typedef void (*btf_trace_kmalloc_node)(void *, long unsigned int, const void *,
1: +                                       size_t, size_t, gfp_t, int);
1:  
1: -typedef void (*btf_trace_kmem_cache_alloc_node)(void *, long unsigned int, const void *, size_t, size_t, gfp_t, int);
1: +typedef void (*btf_trace_kmem_cache_alloc_node)(void *, long unsigned int,
1: +                                                const void *, size_t, size_t,
1: +                                                gfp_t, int);
1:  
1:  typedef void (*btf_trace_kfree)(void *, long unsigned int, const void *);
1:  
1: -typedef void (*btf_trace_kmem_cache_free)(void *, long unsigned int, const void *);
1: +typedef void (*btf_trace_kmem_cache_free)(void *, long unsigned int,
1: +                                          const void *);
1:  
1:  typedef void (*btf_trace_mm_page_free)(void *, struct page *, unsigned int);
1:  
1:  typedef void (*btf_trace_mm_page_free_batched)(void *, struct page *);
1:  
1: -typedef void (*btf_trace_mm_page_alloc)(void *, struct page *, unsigned int, gfp_t, int);
1: +typedef void (*btf_trace_mm_page_alloc)(void *, struct page *, unsigned int,
1: +                                        gfp_t, int);
1:  
1: -typedef void (*btf_trace_mm_page_alloc_zone_locked)(void *, struct page *, unsigned int, int);
1: +typedef void (*btf_trace_mm_page_alloc_zone_locked)(void *, struct page *,
1: +                                                    unsigned int, int);
1:  
1: -typedef void (*btf_trace_mm_page_pcpu_drain)(void *, struct page *, unsigned int, int);
1: +typedef void (*btf_trace_mm_page_pcpu_drain)(void *, struct page *,
1: +                                             unsigned int, int);
1:  
1: -typedef void (*btf_trace_mm_page_alloc_extfrag)(void *, struct page *, int, int, int, int);
1: +typedef void (*btf_trace_mm_page_alloc_extfrag)(void *, struct page *, int, int,
1: +                                                int, int);
1:  
1:  typedef void (*btf_trace_rss_stat)(void *, struct mm_struct *, int, long int);
1:  
1:  enum slab_state {
1: -	DOWN = 0,
1: -	PARTIAL = 1,
1: -	PARTIAL_NODE = 2,
1: -	UP = 3,
1: -	FULL = 4,
1: +  DOWN = 0,
1: +  PARTIAL = 1,
1: +  PARTIAL_NODE = 2,
1: +  UP = 3,
1: +  FULL = 4,
1:  };
1:  
1:  struct kmalloc_info_struct {
1: -	const char *name[3];
1: -	unsigned int size;
1: +  const char *name[3];
1: +  unsigned int size;
1:  };
1:  
1:  struct slabinfo {
1: -	long unsigned int active_objs;
1: -	long unsigned int num_objs;
1: -	long unsigned int active_slabs;
1: -	long unsigned int num_slabs;
1: -	long unsigned int shared_avail;
1: -	unsigned int limit;
1: -	unsigned int batchcount;
1: -	unsigned int shared;
1: -	unsigned int objects_per_slab;
1: -	unsigned int cache_order;
1: +  long unsigned int active_objs;
1: +  long unsigned int num_objs;
1: +  long unsigned int active_slabs;
1: +  long unsigned int num_slabs;
1: +  long unsigned int shared_avail;
1: +  unsigned int limit;
1: +  unsigned int batchcount;
1: +  unsigned int shared;
1: +  unsigned int objects_per_slab;
1: +  unsigned int cache_order;
1:  };
1:  
1:  enum pageblock_bits {
1: -	PB_migrate = 0,
1: -	PB_migrate_end = 2,
1: -	PB_migrate_skip = 3,
1: -	NR_PAGEBLOCK_BITS = 4,
1: +  PB_migrate = 0,
1: +  PB_migrate_end = 2,
1: +  PB_migrate_skip = 3,
1: +  NR_PAGEBLOCK_BITS = 4,
1:  };
1:  
1:  struct node___2 {
1: -	struct device dev;
1: -	struct list_head access_list;
1: +  struct device dev;
1: +  struct list_head access_list;
1:  };
1:  
1:  struct alloc_context {
1: -	struct zonelist *zonelist;
1: -	nodemask_t *nodemask;
1: -	struct zoneref *preferred_zoneref;
1: -	int migratetype;
1: -	enum zone_type highest_zoneidx;
1: -	bool spread_dirty_pages;
1: +  struct zonelist *zonelist;
1: +  nodemask_t *nodemask;
1: +  struct zoneref *preferred_zoneref;
1: +  int migratetype;
1: +  enum zone_type highest_zoneidx;
1: +  bool spread_dirty_pages;
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_isolate_template {
1: -	struct trace_entry ent;
1: -	long unsigned int start_pfn;
1: -	long unsigned int end_pfn;
1: -	long unsigned int nr_scanned;
1: -	long unsigned int nr_taken;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int start_pfn;
1: +  long unsigned int end_pfn;
1: +  long unsigned int nr_scanned;
1: +  long unsigned int nr_taken;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_migratepages {
1: -	struct trace_entry ent;
1: -	long unsigned int nr_migrated;
1: -	long unsigned int nr_failed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int nr_migrated;
1: +  long unsigned int nr_failed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_begin {
1: -	struct trace_entry ent;
1: -	long unsigned int zone_start;
1: -	long unsigned int migrate_pfn;
1: -	long unsigned int free_pfn;
1: -	long unsigned int zone_end;
1: -	bool sync;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int zone_start;
1: +  long unsigned int migrate_pfn;
1: +  long unsigned int free_pfn;
1: +  long unsigned int zone_end;
1: +  bool sync;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_end {
1: -	struct trace_entry ent;
1: -	long unsigned int zone_start;
1: -	long unsigned int migrate_pfn;
1: -	long unsigned int free_pfn;
1: -	long unsigned int zone_end;
1: -	bool sync;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int zone_start;
1: +  long unsigned int migrate_pfn;
1: +  long unsigned int free_pfn;
1: +  long unsigned int zone_end;
1: +  bool sync;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_try_to_compact_pages {
1: -	struct trace_entry ent;
1: -	int order;
1: -	gfp_t gfp_mask;
1: -	int prio;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int order;
1: +  gfp_t gfp_mask;
1: +  int prio;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_suitable_template {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	enum zone_type idx;
1: -	int order;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  enum zone_type idx;
1: +  int order;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_defer_template {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	enum zone_type idx;
1: -	int order;
1: -	unsigned int considered;
1: -	unsigned int defer_shift;
1: -	int order_failed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  enum zone_type idx;
1: +  int order;
1: +  unsigned int considered;
1: +  unsigned int defer_shift;
1: +  int order_failed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_compaction_kcompactd_sleep {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_kcompactd_wake_template {
1: -	struct trace_entry ent;
1: -	int nid;
1: -	int order;
1: -	enum zone_type highest_zoneidx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nid;
1: +  int order;
1: +  enum zone_type highest_zoneidx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mm_compaction_isolate_template {};
1: @@ -39482,600 +39881,630 @@ struct trace_event_data_offsets_mm_compaction_kcompactd_sleep {};
1:  
1:  struct trace_event_data_offsets_kcompactd_wake_template {};
1:  
1: -typedef void (*btf_trace_mm_compaction_isolate_migratepages)(void *, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_mm_compaction_isolate_migratepages)(void *,
1: +                                                             long unsigned int,
1: +                                                             long unsigned int,
1: +                                                             long unsigned int,
1: +                                                             long unsigned int);
1:  
1: -typedef void (*btf_trace_mm_compaction_isolate_freepages)(void *, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_mm_compaction_isolate_freepages)(void *,
1: +                                                          long unsigned int,
1: +                                                          long unsigned int,
1: +                                                          long unsigned int,
1: +                                                          long unsigned int);
1:  
1: -typedef void (*btf_trace_mm_compaction_migratepages)(void *, long unsigned int, int, struct list_head *);
1: +typedef void (*btf_trace_mm_compaction_migratepages)(void *, long unsigned int,
1: +                                                     int, struct list_head *);
1:  
1: -typedef void (*btf_trace_mm_compaction_begin)(void *, long unsigned int, long unsigned int, long unsigned int, long unsigned int, bool);
1: +typedef void (*btf_trace_mm_compaction_begin)(void *, long unsigned int,
1: +                                              long unsigned int,
1: +                                              long unsigned int,
1: +                                              long unsigned int, bool);
1:  
1: -typedef void (*btf_trace_mm_compaction_end)(void *, long unsigned int, long unsigned int, long unsigned int, long unsigned int, bool, int);
1: +typedef void (*btf_trace_mm_compaction_end)(void *, long unsigned int,
1: +                                            long unsigned int,
1: +                                            long unsigned int,
1: +                                            long unsigned int, bool, int);
1:  
1: -typedef void (*btf_trace_mm_compaction_try_to_compact_pages)(void *, int, gfp_t, int);
1: +typedef void (*btf_trace_mm_compaction_try_to_compact_pages)(void *, int, gfp_t,
1: +                                                             int);
1:  
1: -typedef void (*btf_trace_mm_compaction_finished)(void *, struct zone *, int, int);
1: +typedef void (*btf_trace_mm_compaction_finished)(void *, struct zone *, int,
1: +                                                 int);
1:  
1: -typedef void (*btf_trace_mm_compaction_suitable)(void *, struct zone *, int, int);
1: +typedef void (*btf_trace_mm_compaction_suitable)(void *, struct zone *, int,
1: +                                                 int);
1:  
1:  typedef void (*btf_trace_mm_compaction_deferred)(void *, struct zone *, int);
1:  
1: -typedef void (*btf_trace_mm_compaction_defer_compaction)(void *, struct zone *, int);
1: +typedef void (*btf_trace_mm_compaction_defer_compaction)(void *, struct zone *,
1: +                                                         int);
1:  
1:  typedef void (*btf_trace_mm_compaction_defer_reset)(void *, struct zone *, int);
1:  
1:  typedef void (*btf_trace_mm_compaction_kcompactd_sleep)(void *, int);
1:  
1: -typedef void (*btf_trace_mm_compaction_wakeup_kcompactd)(void *, int, int, enum zone_type);
1: +typedef void (*btf_trace_mm_compaction_wakeup_kcompactd)(void *, int, int,
1: +                                                         enum zone_type);
1:  
1: -typedef void (*btf_trace_mm_compaction_kcompactd_wake)(void *, int, int, enum zone_type);
1: +typedef void (*btf_trace_mm_compaction_kcompactd_wake)(void *, int, int,
1: +                                                       enum zone_type);
1:  
1:  typedef enum {
1: -	ISOLATE_ABORT = 0,
1: -	ISOLATE_NONE = 1,
1: -	ISOLATE_SUCCESS = 2,
1: +  ISOLATE_ABORT = 0,
1: +  ISOLATE_NONE = 1,
1: +  ISOLATE_SUCCESS = 2,
1:  } isolate_migrate_t;
1:  
1:  struct anon_vma_chain {
1: -	struct vm_area_struct *vma;
1: -	struct anon_vma *anon_vma;
1: -	struct list_head same_vma;
1: -	struct rb_node rb;
1: -	long unsigned int rb_subtree_last;
1: +  struct vm_area_struct *vma;
1: +  struct anon_vma *anon_vma;
1: +  struct list_head same_vma;
1: +  struct rb_node rb;
1: +  long unsigned int rb_subtree_last;
1:  };
1:  
1:  enum lru_status {
1: -	LRU_REMOVED = 0,
1: -	LRU_REMOVED_RETRY = 1,
1: -	LRU_ROTATE = 2,
1: -	LRU_SKIP = 3,
1: -	LRU_RETRY = 4,
1: +  LRU_REMOVED = 0,
1: +  LRU_REMOVED_RETRY = 1,
1: +  LRU_ROTATE = 2,
1: +  LRU_SKIP = 3,
1: +  LRU_RETRY = 4,
1:  };
1:  
1: -typedef enum lru_status (*list_lru_walk_cb)(struct list_head *, struct list_lru_one *, spinlock_t *, void *);
1: +typedef enum lru_status (*list_lru_walk_cb)(struct list_head *,
1: +                                            struct list_lru_one *, spinlock_t *,
1: +                                            void *);
1:  
1: -typedef struct {
1: -	long unsigned int pd;
1: -} hugepd_t;
1: +typedef struct { long unsigned int pd; } hugepd_t;
1:  
1:  struct migration_target_control {
1: -	int nid;
1: -	nodemask_t *nmask;
1: -	gfp_t gfp_mask;
1: +  int nid;
1: +  nodemask_t *nmask;
1: +  gfp_t gfp_mask;
1:  };
1:  
1:  struct follow_page_context {
1: -	struct dev_pagemap *pgmap;
1: -	unsigned int page_mask;
1: +  struct dev_pagemap *pgmap;
1: +  unsigned int page_mask;
1:  };
1:  
1:  typedef unsigned int pgtbl_mod_mask;
1:  
1:  struct zap_details {
1: -	struct address_space *check_mapping;
1: -	long unsigned int first_index;
1: -	long unsigned int last_index;
1: +  struct address_space *check_mapping;
1: +  long unsigned int first_index;
1: +  long unsigned int last_index;
1:  };
1:  
1:  typedef int (*pte_fn_t)(pte_t *, long unsigned int, void *);
1:  
1:  enum {
1: -	SWP_USED = 1,
1: -	SWP_WRITEOK = 2,
1: -	SWP_DISCARDABLE = 4,
1: -	SWP_DISCARDING = 8,
1: -	SWP_SOLIDSTATE = 16,
1: -	SWP_CONTINUED = 32,
1: -	SWP_BLKDEV = 64,
1: -	SWP_ACTIVATED = 128,
1: -	SWP_FS_OPS = 256,
1: -	SWP_AREA_DISCARD = 512,
1: -	SWP_PAGE_DISCARD = 1024,
1: -	SWP_STABLE_WRITES = 2048,
1: -	SWP_SYNCHRONOUS_IO = 4096,
1: -	SWP_VALID = 8192,
1: -	SWP_SCANNING = 16384,
1: +  SWP_USED = 1,
1: +  SWP_WRITEOK = 2,
1: +  SWP_DISCARDABLE = 4,
1: +  SWP_DISCARDING = 8,
1: +  SWP_SOLIDSTATE = 16,
1: +  SWP_CONTINUED = 32,
1: +  SWP_BLKDEV = 64,
1: +  SWP_ACTIVATED = 128,
1: +  SWP_FS_OPS = 256,
1: +  SWP_AREA_DISCARD = 512,
1: +  SWP_PAGE_DISCARD = 1024,
1: +  SWP_STABLE_WRITES = 2048,
1: +  SWP_SYNCHRONOUS_IO = 4096,
1: +  SWP_VALID = 8192,
1: +  SWP_SCANNING = 16384,
1:  };
1:  
1:  struct copy_subpage_arg {
1: -	struct page *dst;
1: -	struct page *src;
1: -	struct vm_area_struct *vma;
1: +  struct page *dst;
1: +  struct page *src;
1: +  struct vm_area_struct *vma;
1:  };
1:  
1:  struct mm_walk;
1:  
1:  struct mm_walk_ops {
1: -	int (*pgd_entry)(pgd_t *, long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*p4d_entry)(p4d_t *, long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*pud_entry)(pud_t *, long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*pmd_entry)(pmd_t *, long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*pte_entry)(pte_t *, long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*pte_hole)(long unsigned int, long unsigned int, int, struct mm_walk *);
1: -	int (*hugetlb_entry)(pte_t *, long unsigned int, long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*test_walk)(long unsigned int, long unsigned int, struct mm_walk *);
1: -	int (*pre_vma)(long unsigned int, long unsigned int, struct mm_walk *);
1: -	void (*post_vma)(struct mm_walk *);
1: +  int (*pgd_entry)(pgd_t *, long unsigned int, long unsigned int,
1: +                   struct mm_walk *);
1: +  int (*p4d_entry)(p4d_t *, long unsigned int, long unsigned int,
1: +                   struct mm_walk *);
1: +  int (*pud_entry)(pud_t *, long unsigned int, long unsigned int,
1: +                   struct mm_walk *);
1: +  int (*pmd_entry)(pmd_t *, long unsigned int, long unsigned int,
1: +                   struct mm_walk *);
1: +  int (*pte_entry)(pte_t *, long unsigned int, long unsigned int,
1: +                   struct mm_walk *);
1: +  int (*pte_hole)(long unsigned int, long unsigned int, int, struct mm_walk *);
1: +  int (*hugetlb_entry)(pte_t *, long unsigned int, long unsigned int,
1: +                       long unsigned int, struct mm_walk *);
1: +  int (*test_walk)(long unsigned int, long unsigned int, struct mm_walk *);
1: +  int (*pre_vma)(long unsigned int, long unsigned int, struct mm_walk *);
1: +  void (*post_vma)(struct mm_walk *);
1:  };
1:  
1:  enum page_walk_action {
1: -	ACTION_SUBTREE = 0,
1: -	ACTION_CONTINUE = 1,
1: -	ACTION_AGAIN = 2,
1: +  ACTION_SUBTREE = 0,
1: +  ACTION_CONTINUE = 1,
1: +  ACTION_AGAIN = 2,
1:  };
1:  
1:  struct mm_walk {
1: -	const struct mm_walk_ops *ops;
1: -	struct mm_struct *mm;
1: -	pgd_t *pgd;
1: -	struct vm_area_struct *vma;
1: -	enum page_walk_action action;
1: -	bool no_vma;
1: -	void *private;
1: +  const struct mm_walk_ops *ops;
1: +  struct mm_struct *mm;
1: +  pgd_t *pgd;
1: +  struct vm_area_struct *vma;
1: +  enum page_walk_action action;
1: +  bool no_vma;
1: +  void *private;
1:  };
1:  
1:  enum {
1: -	HUGETLB_SHMFS_INODE = 1,
1: -	HUGETLB_ANONHUGE_INODE = 2,
1: +  HUGETLB_SHMFS_INODE = 1,
1: +  HUGETLB_ANONHUGE_INODE = 2,
1:  };
1:  
1:  struct trace_event_raw_vm_unmapped_area {
1: -	struct trace_entry ent;
1: -	long unsigned int addr;
1: -	long unsigned int total_vm;
1: -	long unsigned int flags;
1: -	long unsigned int length;
1: -	long unsigned int low_limit;
1: -	long unsigned int high_limit;
1: -	long unsigned int align_mask;
1: -	long unsigned int align_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int addr;
1: +  long unsigned int total_vm;
1: +  long unsigned int flags;
1: +  long unsigned int length;
1: +  long unsigned int low_limit;
1: +  long unsigned int high_limit;
1: +  long unsigned int align_mask;
1: +  long unsigned int align_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_vm_unmapped_area {};
1:  
1: -typedef void (*btf_trace_vm_unmapped_area)(void *, long unsigned int, struct vm_unmapped_area_info *);
1: +typedef void (*btf_trace_vm_unmapped_area)(void *, long unsigned int,
1: +                                           struct vm_unmapped_area_info *);
1:  
1:  struct rmap_walk_control {
1: -	void *arg;
1: -	bool (*rmap_one)(struct page *, struct vm_area_struct *, long unsigned int, void *);
1: -	int (*done)(struct page *);
1: -	struct anon_vma * (*anon_lock)(struct page *);
1: -	bool (*invalid_vma)(struct vm_area_struct *, void *);
1: +  void *arg;
1: +  bool (*rmap_one)(struct page *, struct vm_area_struct *, long unsigned int,
1: +                   void *);
1: +  int (*done)(struct page *);
1: +  struct anon_vma *(*anon_lock)(struct page *);
1: +  bool (*invalid_vma)(struct vm_area_struct *, void *);
1:  };
1:  
1:  struct page_referenced_arg {
1: -	int mapcount;
1: -	int referenced;
1: -	long unsigned int vm_flags;
1: -	struct mem_cgroup *memcg;
1: +  int mapcount;
1: +  int referenced;
1: +  long unsigned int vm_flags;
1: +  struct mem_cgroup *memcg;
1:  };
1:  
1:  struct vmap_area {
1: -	long unsigned int va_start;
1: -	long unsigned int va_end;
1: -	struct rb_node rb_node;
1: -	struct list_head list;
1: -	union {
1: -		long unsigned int subtree_max_size;
1: -		struct vm_struct *vm;
1: -		struct llist_node purge_list;
1: -	};
1: +  long unsigned int va_start;
1: +  long unsigned int va_end;
1: +  struct rb_node rb_node;
1: +  struct list_head list;
1: +  union {
1: +    long unsigned int subtree_max_size;
1: +    struct vm_struct *vm;
1: +    struct llist_node purge_list;
1: +  };
1:  };
1:  
1:  struct vfree_deferred {
1: -	struct llist_head list;
1: -	struct work_struct wq;
1: +  struct llist_head list;
1: +  struct work_struct wq;
1:  };
1:  
1:  enum fit_type {
1: -	NOTHING_FIT = 0,
1: -	FL_FIT_TYPE = 1,
1: -	LE_FIT_TYPE = 2,
1: -	RE_FIT_TYPE = 3,
1: -	NE_FIT_TYPE = 4,
1: +  NOTHING_FIT = 0,
1: +  FL_FIT_TYPE = 1,
1: +  LE_FIT_TYPE = 2,
1: +  RE_FIT_TYPE = 3,
1: +  NE_FIT_TYPE = 4,
1:  };
1:  
1:  struct vmap_block_queue {
1: -	spinlock_t lock;
1: -	struct list_head free;
1: +  spinlock_t lock;
1: +  struct list_head free;
1:  };
1:  
1:  struct vmap_block {
1: -	spinlock_t lock;
1: -	struct vmap_area *va;
1: -	long unsigned int free;
1: -	long unsigned int dirty;
1: -	long unsigned int dirty_min;
1: -	long unsigned int dirty_max;
1: -	struct list_head free_list;
1: -	struct callback_head callback_head;
1: -	struct list_head purge;
1: +  spinlock_t lock;
1: +  struct vmap_area *va;
1: +  long unsigned int free;
1: +  long unsigned int dirty;
1: +  long unsigned int dirty_min;
1: +  long unsigned int dirty_max;
1: +  struct list_head free_list;
1: +  struct callback_head callback_head;
1: +  struct list_head purge;
1:  };
1:  
1:  struct vmap_pfn_data {
1: -	long unsigned int *pfns;
1: -	pgprot_t prot;
1: -	unsigned int idx;
1: +  long unsigned int *pfns;
1: +  pgprot_t prot;
1: +  unsigned int idx;
1:  };
1:  
1:  struct page_frag_cache {
1: -	void *va;
1: -	__u16 offset;
1: -	__u16 size;
1: -	unsigned int pagecnt_bias;
1: -	bool pfmemalloc;
1: +  void *va;
1: +  __u16 offset;
1: +  __u16 size;
1: +  unsigned int pagecnt_bias;
1: +  bool pfmemalloc;
1:  };
1:  
1:  enum zone_flags {
1: -	ZONE_BOOSTED_WATERMARK = 0,
1: +  ZONE_BOOSTED_WATERMARK = 0,
1:  };
1:  
1:  struct mminit_pfnnid_cache {
1: -	long unsigned int last_start;
1: -	long unsigned int last_end;
1: -	int last_nid;
1: +  long unsigned int last_start;
1: +  long unsigned int last_end;
1: +  int last_nid;
1:  };
1:  
1:  typedef int fpi_t;
1:  
1:  struct pcpu_drain {
1: -	struct zone *zone;
1: -	struct work_struct work;
1: +  struct zone *zone;
1: +  struct work_struct work;
1:  };
1:  
1:  struct madvise_walk_private {
1: -	struct mmu_gather *tlb;
1: -	bool pageout;
1: +  struct mmu_gather *tlb;
1: +  bool pageout;
1:  };
1:  
1:  enum {
1: -	BIO_NO_PAGE_REF = 0,
1: -	BIO_CLONED = 1,
1: -	BIO_BOUNCED = 2,
1: -	BIO_WORKINGSET = 3,
1: -	BIO_QUIET = 4,
1: -	BIO_CHAIN = 5,
1: -	BIO_REFFED = 6,
1: -	BIO_THROTTLED = 7,
1: -	BIO_TRACE_COMPLETION = 8,
1: -	BIO_CGROUP_ACCT = 9,
1: -	BIO_TRACKED = 10,
1: -	BIO_FLAG_LAST = 11,
1: +  BIO_NO_PAGE_REF = 0,
1: +  BIO_CLONED = 1,
1: +  BIO_BOUNCED = 2,
1: +  BIO_WORKINGSET = 3,
1: +  BIO_QUIET = 4,
1: +  BIO_CHAIN = 5,
1: +  BIO_REFFED = 6,
1: +  BIO_THROTTLED = 7,
1: +  BIO_TRACE_COMPLETION = 8,
1: +  BIO_CGROUP_ACCT = 9,
1: +  BIO_TRACKED = 10,
1: +  BIO_FLAG_LAST = 11,
1:  };
1:  
1:  struct vma_swap_readahead {
1: -	short unsigned int win;
1: -	short unsigned int offset;
1: -	short unsigned int nr_pte;
1: -	pte_t *ptes;
1: +  short unsigned int win;
1: +  short unsigned int offset;
1: +  short unsigned int nr_pte;
1: +  pte_t *ptes;
1:  };
1:  
1:  union swap_header {
1: -	struct {
1: -		char reserved[4086];
1: -		char magic[10];
1: -	} magic;
1: -	struct {
1: -		char bootbits[1024];
1: -		__u32 version;
1: -		__u32 last_page;
1: -		__u32 nr_badpages;
1: -		unsigned char sws_uuid[16];
1: -		unsigned char sws_volume[16];
1: -		__u32 padding[117];
1: -		__u32 badpages[1];
1: -	} info;
1: +  struct {
1: +    char reserved[4086];
1: +    char magic[10];
1: +  } magic;
1: +  struct {
1: +    char bootbits[1024];
1: +    __u32 version;
1: +    __u32 last_page;
1: +    __u32 nr_badpages;
1: +    unsigned char sws_uuid[16];
1: +    unsigned char sws_volume[16];
1: +    __u32 padding[117];
1: +    __u32 badpages[1];
1: +  } info;
1:  };
1:  
1:  struct swap_extent {
1: -	struct rb_node rb_node;
1: -	long unsigned int start_page;
1: -	long unsigned int nr_pages;
1: -	sector_t start_block;
1: +  struct rb_node rb_node;
1: +  long unsigned int start_page;
1: +  long unsigned int nr_pages;
1: +  sector_t start_block;
1:  };
1:  
1:  struct swap_slots_cache {
1: -	bool lock_initialized;
1: -	struct mutex alloc_lock;
1: -	swp_entry_t *slots;
1: -	int nr;
1: -	int cur;
1: -	spinlock_t free_lock;
1: -	swp_entry_t *slots_ret;
1: -	int n_ret;
1: +  bool lock_initialized;
1: +  struct mutex alloc_lock;
1: +  swp_entry_t *slots;
1: +  int nr;
1: +  int cur;
1: +  spinlock_t free_lock;
1: +  swp_entry_t *slots_ret;
1: +  int n_ret;
1:  };
1:  
1:  struct dma_pool {
1: -	struct list_head page_list;
1: -	spinlock_t lock;
1: -	size_t size;
1: -	struct device *dev;
1: -	size_t allocation;
1: -	size_t boundary;
1: -	char name[32];
1: -	struct list_head pools;
1: +  struct list_head page_list;
1: +  spinlock_t lock;
1: +  size_t size;
1: +  struct device *dev;
1: +  size_t allocation;
1: +  size_t boundary;
1: +  char name[32];
1: +  struct list_head pools;
1:  };
1:  
1:  struct dma_page {
1: -	struct list_head page_list;
1: -	void *vaddr;
1: -	dma_addr_t dma;
1: -	unsigned int in_use;
1: -	unsigned int offset;
1: +  struct list_head page_list;
1: +  void *vaddr;
1: +  dma_addr_t dma;
1: +  unsigned int in_use;
1: +  unsigned int offset;
1:  };
1:  
1:  enum string_size_units {
1: -	STRING_UNITS_10 = 0,
1: -	STRING_UNITS_2 = 1,
1: +  STRING_UNITS_10 = 0,
1: +  STRING_UNITS_2 = 1,
1:  };
1:  
1:  struct resv_map {
1: -	struct kref refs;
1: -	spinlock_t lock;
1: -	struct list_head regions;
1: -	long int adds_in_progress;
1: -	struct list_head region_cache;
1: -	long int region_cache_count;
1: -	struct page_counter *reservation_counter;
1: -	long unsigned int pages_per_hpage;
1: -	struct cgroup_subsys_state *css;
1: +  struct kref refs;
1: +  spinlock_t lock;
1: +  struct list_head regions;
1: +  long int adds_in_progress;
1: +  struct list_head region_cache;
1: +  long int region_cache_count;
1: +  struct page_counter *reservation_counter;
1: +  long unsigned int pages_per_hpage;
1: +  struct cgroup_subsys_state *css;
1:  };
1:  
1:  struct file_region {
1: -	struct list_head link;
1: -	long int from;
1: -	long int to;
1: -	struct page_counter *reservation_counter;
1: -	struct cgroup_subsys_state *css;
1: +  struct list_head link;
1: +  long int from;
1: +  long int to;
1: +  struct page_counter *reservation_counter;
1: +  struct cgroup_subsys_state *css;
1:  };
1:  
1:  struct huge_bootmem_page {
1: -	struct list_head list;
1: -	struct hstate *hstate;
1: +  struct list_head list;
1: +  struct hstate *hstate;
1:  };
1:  
1:  enum hugetlb_memory_event {
1: -	HUGETLB_MAX = 0,
1: -	HUGETLB_NR_MEMORY_EVENTS = 1,
1: +  HUGETLB_MAX = 0,
1: +  HUGETLB_NR_MEMORY_EVENTS = 1,
1:  };
1:  
1:  struct hugetlb_cgroup {
1: -	struct cgroup_subsys_state css;
1: -	struct page_counter hugepage[2];
1: -	struct page_counter rsvd_hugepage[2];
1: -	atomic_long_t events[2];
1: -	atomic_long_t events_local[2];
1: -	struct cgroup_file events_file[2];
1: -	struct cgroup_file events_local_file[2];
1: +  struct cgroup_subsys_state css;
1: +  struct page_counter hugepage[2];
1: +  struct page_counter rsvd_hugepage[2];
1: +  atomic_long_t events[2];
1: +  atomic_long_t events_local[2];
1: +  struct cgroup_file events_file[2];
1: +  struct cgroup_file events_local_file[2];
1:  };
1:  
1:  enum vma_resv_mode {
1: -	VMA_NEEDS_RESV = 0,
1: -	VMA_COMMIT_RESV = 1,
1: -	VMA_END_RESV = 2,
1: -	VMA_ADD_RESV = 3,
1: +  VMA_NEEDS_RESV = 0,
1: +  VMA_COMMIT_RESV = 1,
1: +  VMA_END_RESV = 2,
1: +  VMA_ADD_RESV = 3,
1:  };
1:  
1:  struct node_hstate {
1: -	struct kobject *hugepages_kobj;
1: -	struct kobject *hstate_kobjs[2];
1: +  struct kobject *hugepages_kobj;
1: +  struct kobject *hstate_kobjs[2];
1:  };
1:  
1:  struct nodemask_scratch {
1: -	nodemask_t mask1;
1: -	nodemask_t mask2;
1: +  nodemask_t mask1;
1: +  nodemask_t mask2;
1:  };
1:  
1:  struct sp_node {
1: -	struct rb_node nd;
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	struct mempolicy *policy;
1: +  struct rb_node nd;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  struct mempolicy *policy;
1:  };
1:  
1:  struct mempolicy_operations {
1: -	int (*create)(struct mempolicy *, const nodemask_t *);
1: -	void (*rebind)(struct mempolicy *, const nodemask_t *);
1: +  int (*create)(struct mempolicy *, const nodemask_t *);
1: +  void (*rebind)(struct mempolicy *, const nodemask_t *);
1:  };
1:  
1:  struct queue_pages {
1: -	struct list_head *pagelist;
1: -	long unsigned int flags;
1: -	nodemask_t *nmask;
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	struct vm_area_struct *first;
1: +  struct list_head *pagelist;
1: +  long unsigned int flags;
1: +  nodemask_t *nmask;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  struct vm_area_struct *first;
1:  };
1:  
1:  struct mmu_notifier_subscriptions {
1: -	struct hlist_head list;
1: -	bool has_itree;
1: -	spinlock_t lock;
1: -	long unsigned int invalidate_seq;
1: -	long unsigned int active_invalidate_ranges;
1: -	struct rb_root_cached itree;
1: -	wait_queue_head_t wq;
1: -	struct hlist_head deferred_list;
1: +  struct hlist_head list;
1: +  bool has_itree;
1: +  spinlock_t lock;
1: +  long unsigned int invalidate_seq;
1: +  long unsigned int active_invalidate_ranges;
1: +  struct rb_root_cached itree;
1: +  wait_queue_head_t wq;
1: +  struct hlist_head deferred_list;
1:  };
1:  
1:  struct interval_tree_node {
1: -	struct rb_node rb;
1: -	long unsigned int start;
1: -	long unsigned int last;
1: -	long unsigned int __subtree_last;
1: +  struct rb_node rb;
1: +  long unsigned int start;
1: +  long unsigned int last;
1: +  long unsigned int __subtree_last;
1:  };
1:  
1:  struct mmu_interval_notifier;
1:  
1:  struct mmu_interval_notifier_ops {
1: -	bool (*invalidate)(struct mmu_interval_notifier *, const struct mmu_notifier_range *, long unsigned int);
1: +  bool (*invalidate)(struct mmu_interval_notifier *,
1: +                     const struct mmu_notifier_range *, long unsigned int);
1:  };
1:  
1:  struct mmu_interval_notifier {
1: -	struct interval_tree_node interval_tree;
1: -	const struct mmu_interval_notifier_ops *ops;
1: -	struct mm_struct *mm;
1: -	struct hlist_node deferred_item;
1: -	long unsigned int invalidate_seq;
1: +  struct interval_tree_node interval_tree;
1: +  const struct mmu_interval_notifier_ops *ops;
1: +  struct mm_struct *mm;
1: +  struct hlist_node deferred_item;
1: +  long unsigned int invalidate_seq;
1:  };
1:  
1:  struct rmap_item;
1:  
1:  struct mm_slot {
1: -	struct hlist_node link;
1: -	struct list_head mm_list;
1: -	struct rmap_item *rmap_list;
1: -	struct mm_struct *mm;
1: +  struct hlist_node link;
1: +  struct list_head mm_list;
1: +  struct rmap_item *rmap_list;
1: +  struct mm_struct *mm;
1:  };
1:  
1:  struct stable_node;
1:  
1:  struct rmap_item {
1: -	struct rmap_item *rmap_list;
1: -	union {
1: -		struct anon_vma *anon_vma;
1: -		int nid;
1: -	};
1: -	struct mm_struct *mm;
1: -	long unsigned int address;
1: -	unsigned int oldchecksum;
1: -	union {
1: -		struct rb_node node;
1: -		struct {
1: -			struct stable_node *head;
1: -			struct hlist_node hlist;
1: -		};
1: -	};
1: +  struct rmap_item *rmap_list;
1: +  union {
1: +    struct anon_vma *anon_vma;
1: +    int nid;
1: +  };
1: +  struct mm_struct *mm;
1: +  long unsigned int address;
1: +  unsigned int oldchecksum;
1: +  union {
1: +    struct rb_node node;
1: +    struct {
1: +      struct stable_node *head;
1: +      struct hlist_node hlist;
1: +    };
1: +  };
1:  };
1:  
1:  struct ksm_scan {
1: -	struct mm_slot *mm_slot;
1: -	long unsigned int address;
1: -	struct rmap_item **rmap_list;
1: -	long unsigned int seqnr;
1: +  struct mm_slot *mm_slot;
1: +  long unsigned int address;
1: +  struct rmap_item **rmap_list;
1: +  long unsigned int seqnr;
1:  };
1:  
1:  struct stable_node {
1: -	union {
1: -		struct rb_node node;
1: -		struct {
1: -			struct list_head *head;
1: -			struct {
1: -				struct hlist_node hlist_dup;
1: -				struct list_head list;
1: -			};
1: -		};
1: -	};
1: -	struct hlist_head hlist;
1: -	union {
1: -		long unsigned int kpfn;
1: -		long unsigned int chain_prune_time;
1: -	};
1: -	int rmap_hlist_len;
1: -	int nid;
1: +  union {
1: +    struct rb_node node;
1: +    struct {
1: +      struct list_head *head;
1: +      struct {
1: +        struct hlist_node hlist_dup;
1: +        struct list_head list;
1: +      };
1: +    };
1: +  };
1: +  struct hlist_head hlist;
1: +  union {
1: +    long unsigned int kpfn;
1: +    long unsigned int chain_prune_time;
1: +  };
1: +  int rmap_hlist_len;
1: +  int nid;
1:  };
1:  
1:  enum get_ksm_page_flags {
1: -	GET_KSM_PAGE_NOLOCK = 0,
1: -	GET_KSM_PAGE_LOCK = 1,
1: -	GET_KSM_PAGE_TRYLOCK = 2,
1: +  GET_KSM_PAGE_NOLOCK = 0,
1: +  GET_KSM_PAGE_LOCK = 1,
1: +  GET_KSM_PAGE_TRYLOCK = 2,
1:  };
1:  
1:  enum stat_item {
1: -	ALLOC_FASTPATH = 0,
1: -	ALLOC_SLOWPATH = 1,
1: -	FREE_FASTPATH = 2,
1: -	FREE_SLOWPATH = 3,
1: -	FREE_FROZEN = 4,
1: -	FREE_ADD_PARTIAL = 5,
1: -	FREE_REMOVE_PARTIAL = 6,
1: -	ALLOC_FROM_PARTIAL = 7,
1: -	ALLOC_SLAB = 8,
1: -	ALLOC_REFILL = 9,
1: -	ALLOC_NODE_MISMATCH = 10,
1: -	FREE_SLAB = 11,
1: -	CPUSLAB_FLUSH = 12,
1: -	DEACTIVATE_FULL = 13,
1: -	DEACTIVATE_EMPTY = 14,
1: -	DEACTIVATE_TO_HEAD = 15,
1: -	DEACTIVATE_TO_TAIL = 16,
1: -	DEACTIVATE_REMOTE_FREES = 17,
1: -	DEACTIVATE_BYPASS = 18,
1: -	ORDER_FALLBACK = 19,
1: -	CMPXCHG_DOUBLE_CPU_FAIL = 20,
1: -	CMPXCHG_DOUBLE_FAIL = 21,
1: -	CPU_PARTIAL_ALLOC = 22,
1: -	CPU_PARTIAL_FREE = 23,
1: -	CPU_PARTIAL_NODE = 24,
1: -	CPU_PARTIAL_DRAIN = 25,
1: -	NR_SLUB_STAT_ITEMS = 26,
1: +  ALLOC_FASTPATH = 0,
1: +  ALLOC_SLOWPATH = 1,
1: +  FREE_FASTPATH = 2,
1: +  FREE_SLOWPATH = 3,
1: +  FREE_FROZEN = 4,
1: +  FREE_ADD_PARTIAL = 5,
1: +  FREE_REMOVE_PARTIAL = 6,
1: +  ALLOC_FROM_PARTIAL = 7,
1: +  ALLOC_SLAB = 8,
1: +  ALLOC_REFILL = 9,
1: +  ALLOC_NODE_MISMATCH = 10,
1: +  FREE_SLAB = 11,
1: +  CPUSLAB_FLUSH = 12,
1: +  DEACTIVATE_FULL = 13,
1: +  DEACTIVATE_EMPTY = 14,
1: +  DEACTIVATE_TO_HEAD = 15,
1: +  DEACTIVATE_TO_TAIL = 16,
1: +  DEACTIVATE_REMOTE_FREES = 17,
1: +  DEACTIVATE_BYPASS = 18,
1: +  ORDER_FALLBACK = 19,
1: +  CMPXCHG_DOUBLE_CPU_FAIL = 20,
1: +  CMPXCHG_DOUBLE_FAIL = 21,
1: +  CPU_PARTIAL_ALLOC = 22,
1: +  CPU_PARTIAL_FREE = 23,
1: +  CPU_PARTIAL_NODE = 24,
1: +  CPU_PARTIAL_DRAIN = 25,
1: +  NR_SLUB_STAT_ITEMS = 26,
1:  };
1:  
1:  struct track {
1: -	long unsigned int addr;
1: -	long unsigned int addrs[16];
1: -	int cpu;
1: -	int pid;
1: -	long unsigned int when;
1: +  long unsigned int addr;
1: +  long unsigned int addrs[16];
1: +  int cpu;
1: +  int pid;
1: +  long unsigned int when;
1:  };
1:  
1:  enum track_item {
1: -	TRACK_ALLOC = 0,
1: -	TRACK_FREE = 1,
1: +  TRACK_ALLOC = 0,
1: +  TRACK_FREE = 1,
1:  };
1:  
1:  struct detached_freelist {
1: -	struct page *page;
1: -	void *tail;
1: -	void *freelist;
1: -	int cnt;
1: -	struct kmem_cache *s;
1: +  struct page *page;
1: +  void *tail;
1: +  void *freelist;
1: +  int cnt;
1: +  struct kmem_cache *s;
1:  };
1:  
1:  struct location {
1: -	long unsigned int count;
1: -	long unsigned int addr;
1: -	long long int sum_time;
1: -	long int min_time;
1: -	long int max_time;
1: -	long int min_pid;
1: -	long int max_pid;
1: -	long unsigned int cpus[2];
1: -	nodemask_t nodes;
1: +  long unsigned int count;
1: +  long unsigned int addr;
1: +  long long int sum_time;
1: +  long int min_time;
1: +  long int max_time;
1: +  long int min_pid;
1: +  long int max_pid;
1: +  long unsigned int cpus[2];
1: +  nodemask_t nodes;
1:  };
1:  
1:  struct loc_track {
1: -	long unsigned int max;
1: -	long unsigned int count;
1: -	struct location *loc;
1: +  long unsigned int max;
1: +  long unsigned int count;
1: +  struct location *loc;
1:  };
1:  
1:  enum slab_stat_type {
1: -	SL_ALL = 0,
1: -	SL_PARTIAL = 1,
1: -	SL_CPU = 2,
1: -	SL_OBJECTS = 3,
1: -	SL_TOTAL = 4,
1: +  SL_ALL = 0,
1: +  SL_PARTIAL = 1,
1: +  SL_CPU = 2,
1: +  SL_OBJECTS = 3,
1: +  SL_TOTAL = 4,
1:  };
1:  
1:  struct slab_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct kmem_cache *, char *);
1: -	ssize_t (*store)(struct kmem_cache *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct kmem_cache *, char *);
1: +  ssize_t (*store)(struct kmem_cache *, const char *, size_t);
1:  };
1:  
1:  struct saved_alias {
1: -	struct kmem_cache *s;
1: -	const char *name;
1: -	struct saved_alias *next;
1: +  struct kmem_cache *s;
1: +  const char *name;
1: +  struct saved_alias *next;
1:  };
1:  
1:  enum slab_modes {
1: -	M_NONE = 0,
1: -	M_PARTIAL = 1,
1: -	M_FULL = 2,
1: -	M_FREE = 3,
1: +  M_NONE = 0,
1: +  M_PARTIAL = 1,
1: +  M_FULL = 2,
1: +  M_FREE = 3,
1:  };
1:  
1:  struct buffer_head;
1: @@ -40083,19 +40512,19 @@ struct buffer_head;
1:  typedef void bh_end_io_t(struct buffer_head *, int);
1:  
1:  struct buffer_head {
1: -	long unsigned int b_state;
1: -	struct buffer_head *b_this_page;
1: -	struct page *b_page;
1: -	sector_t b_blocknr;
1: -	size_t b_size;
1: -	char *b_data;
1: -	struct block_device *b_bdev;
1: -	bh_end_io_t *b_end_io;
1: -	void *b_private;
1: -	struct list_head b_assoc_buffers;
1: -	struct address_space *b_assoc_map;
1: -	atomic_t b_count;
1: -	spinlock_t b_uptodate_lock;
1: +  long unsigned int b_state;
1: +  struct buffer_head *b_this_page;
1: +  struct page *b_page;
1: +  sector_t b_blocknr;
1: +  size_t b_size;
1: +  char *b_data;
1: +  struct block_device *b_bdev;
1: +  bh_end_io_t *b_end_io;
1: +  void *b_private;
1: +  struct list_head b_assoc_buffers;
1: +  struct address_space *b_assoc_map;
1: +  atomic_t b_count;
1: +  spinlock_t b_uptodate_lock;
1:  };
1:  
1:  typedef struct page *new_page_t(struct page *, long unsigned int);
1: @@ -40103,108 +40532,111 @@ typedef struct page *new_page_t(struct page *, long unsigned int);
1:  typedef void free_page_t(struct page *, long unsigned int);
1:  
1:  enum bh_state_bits {
1: -	BH_Uptodate = 0,
1: -	BH_Dirty = 1,
1: -	BH_Lock = 2,
1: -	BH_Req = 3,
1: -	BH_Mapped = 4,
1: -	BH_New = 5,
1: -	BH_Async_Read = 6,
1: -	BH_Async_Write = 7,
1: -	BH_Delay = 8,
1: -	BH_Boundary = 9,
1: -	BH_Write_EIO = 10,
1: -	BH_Unwritten = 11,
1: -	BH_Quiet = 12,
1: -	BH_Meta = 13,
1: -	BH_Prio = 14,
1: -	BH_Defer_Completion = 15,
1: -	BH_PrivateStart = 16,
1: +  BH_Uptodate = 0,
1: +  BH_Dirty = 1,
1: +  BH_Lock = 2,
1: +  BH_Req = 3,
1: +  BH_Mapped = 4,
1: +  BH_New = 5,
1: +  BH_Async_Read = 6,
1: +  BH_Async_Write = 7,
1: +  BH_Delay = 8,
1: +  BH_Boundary = 9,
1: +  BH_Write_EIO = 10,
1: +  BH_Unwritten = 11,
1: +  BH_Quiet = 12,
1: +  BH_Meta = 13,
1: +  BH_Prio = 14,
1: +  BH_Defer_Completion = 15,
1: +  BH_PrivateStart = 16,
1:  };
1:  
1:  struct trace_event_raw_mm_migrate_pages {
1: -	struct trace_entry ent;
1: -	long unsigned int succeeded;
1: -	long unsigned int failed;
1: -	long unsigned int thp_succeeded;
1: -	long unsigned int thp_failed;
1: -	long unsigned int thp_split;
1: -	enum migrate_mode mode;
1: -	int reason;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int succeeded;
1: +  long unsigned int failed;
1: +  long unsigned int thp_succeeded;
1: +  long unsigned int thp_failed;
1: +  long unsigned int thp_split;
1: +  enum migrate_mode mode;
1: +  int reason;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mm_migrate_pages {};
1:  
1: -typedef void (*btf_trace_mm_migrate_pages)(void *, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, enum migrate_mode, int);
1: +typedef void (*btf_trace_mm_migrate_pages)(void *, long unsigned int,
1: +                                           long unsigned int, long unsigned int,
1: +                                           long unsigned int, long unsigned int,
1: +                                           enum migrate_mode, int);
1:  
1:  enum scan_result {
1: -	SCAN_FAIL = 0,
1: -	SCAN_SUCCEED = 1,
1: -	SCAN_PMD_NULL = 2,
1: -	SCAN_EXCEED_NONE_PTE = 3,
1: -	SCAN_EXCEED_SWAP_PTE = 4,
1: -	SCAN_EXCEED_SHARED_PTE = 5,
1: -	SCAN_PTE_NON_PRESENT = 6,
1: -	SCAN_PTE_UFFD_WP = 7,
1: -	SCAN_PAGE_RO = 8,
1: -	SCAN_LACK_REFERENCED_PAGE = 9,
1: -	SCAN_PAGE_NULL = 10,
1: -	SCAN_SCAN_ABORT = 11,
1: -	SCAN_PAGE_COUNT = 12,
1: -	SCAN_PAGE_LRU = 13,
1: -	SCAN_PAGE_LOCK = 14,
1: -	SCAN_PAGE_ANON = 15,
1: -	SCAN_PAGE_COMPOUND = 16,
1: -	SCAN_ANY_PROCESS = 17,
1: -	SCAN_VMA_NULL = 18,
1: -	SCAN_VMA_CHECK = 19,
1: -	SCAN_ADDRESS_RANGE = 20,
1: -	SCAN_SWAP_CACHE_PAGE = 21,
1: -	SCAN_DEL_PAGE_LRU = 22,
1: -	SCAN_ALLOC_HUGE_PAGE_FAIL = 23,
1: -	SCAN_CGROUP_CHARGE_FAIL = 24,
1: -	SCAN_TRUNCATED = 25,
1: -	SCAN_PAGE_HAS_PRIVATE = 26,
1: +  SCAN_FAIL = 0,
1: +  SCAN_SUCCEED = 1,
1: +  SCAN_PMD_NULL = 2,
1: +  SCAN_EXCEED_NONE_PTE = 3,
1: +  SCAN_EXCEED_SWAP_PTE = 4,
1: +  SCAN_EXCEED_SHARED_PTE = 5,
1: +  SCAN_PTE_NON_PRESENT = 6,
1: +  SCAN_PTE_UFFD_WP = 7,
1: +  SCAN_PAGE_RO = 8,
1: +  SCAN_LACK_REFERENCED_PAGE = 9,
1: +  SCAN_PAGE_NULL = 10,
1: +  SCAN_SCAN_ABORT = 11,
1: +  SCAN_PAGE_COUNT = 12,
1: +  SCAN_PAGE_LRU = 13,
1: +  SCAN_PAGE_LOCK = 14,
1: +  SCAN_PAGE_ANON = 15,
1: +  SCAN_PAGE_COMPOUND = 16,
1: +  SCAN_ANY_PROCESS = 17,
1: +  SCAN_VMA_NULL = 18,
1: +  SCAN_VMA_CHECK = 19,
1: +  SCAN_ADDRESS_RANGE = 20,
1: +  SCAN_SWAP_CACHE_PAGE = 21,
1: +  SCAN_DEL_PAGE_LRU = 22,
1: +  SCAN_ALLOC_HUGE_PAGE_FAIL = 23,
1: +  SCAN_CGROUP_CHARGE_FAIL = 24,
1: +  SCAN_TRUNCATED = 25,
1: +  SCAN_PAGE_HAS_PRIVATE = 26,
1:  };
1:  
1:  struct trace_event_raw_mm_khugepaged_scan_pmd {
1: -	struct trace_entry ent;
1: -	struct mm_struct *mm;
1: -	long unsigned int pfn;
1: -	bool writable;
1: -	int referenced;
1: -	int none_or_zero;
1: -	int status;
1: -	int unmapped;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct mm_struct *mm;
1: +  long unsigned int pfn;
1: +  bool writable;
1: +  int referenced;
1: +  int none_or_zero;
1: +  int status;
1: +  int unmapped;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_collapse_huge_page {
1: -	struct trace_entry ent;
1: -	struct mm_struct *mm;
1: -	int isolated;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct mm_struct *mm;
1: +  int isolated;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_collapse_huge_page_isolate {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	int none_or_zero;
1: -	int referenced;
1: -	bool writable;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  int none_or_zero;
1: +  int referenced;
1: +  bool writable;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mm_collapse_huge_page_swapin {
1: -	struct trace_entry ent;
1: -	struct mm_struct *mm;
1: -	int swapped_in;
1: -	int referenced;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct mm_struct *mm;
1: +  int swapped_in;
1: +  int referenced;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mm_khugepaged_scan_pmd {};
1: @@ -40215,385 +40647,399 @@ struct trace_event_data_offsets_mm_collapse_huge_page_isolate {};
1:  
1:  struct trace_event_data_offsets_mm_collapse_huge_page_swapin {};
1:  
1: -typedef void (*btf_trace_mm_khugepaged_scan_pmd)(void *, struct mm_struct *, struct page *, bool, int, int, int, int);
1: +typedef void (*btf_trace_mm_khugepaged_scan_pmd)(void *, struct mm_struct *,
1: +                                                 struct page *, bool, int, int,
1: +                                                 int, int);
1:  
1: -typedef void (*btf_trace_mm_collapse_huge_page)(void *, struct mm_struct *, int, int);
1: +typedef void (*btf_trace_mm_collapse_huge_page)(void *, struct mm_struct *, int,
1: +                                                int);
1:  
1: -typedef void (*btf_trace_mm_collapse_huge_page_isolate)(void *, struct page *, int, int, bool, int);
1: +typedef void (*btf_trace_mm_collapse_huge_page_isolate)(void *, struct page *,
1: +                                                        int, int, bool, int);
1:  
1: -typedef void (*btf_trace_mm_collapse_huge_page_swapin)(void *, struct mm_struct *, int, int, int);
1: +typedef void (*btf_trace_mm_collapse_huge_page_swapin)(void *,
1: +                                                       struct mm_struct *, int,
1: +                                                       int, int);
1:  
1:  struct mm_slot___2 {
1: -	struct hlist_node hash;
1: -	struct list_head mm_node;
1: -	struct mm_struct *mm;
1: -	int nr_pte_mapped_thp;
1: -	long unsigned int pte_mapped_thp[8];
1: +  struct hlist_node hash;
1: +  struct list_head mm_node;
1: +  struct mm_struct *mm;
1: +  int nr_pte_mapped_thp;
1: +  long unsigned int pte_mapped_thp[8];
1:  };
1:  
1:  struct khugepaged_scan {
1: -	struct list_head mm_head;
1: -	struct mm_slot___2 *mm_slot;
1: -	long unsigned int address;
1: +  struct list_head mm_head;
1: +  struct mm_slot___2 *mm_slot;
1: +  long unsigned int address;
1:  };
1:  
1:  struct mem_cgroup_reclaim_cookie {
1: -	pg_data_t *pgdat;
1: -	unsigned int generation;
1: +  pg_data_t *pgdat;
1: +  unsigned int generation;
1:  };
1:  
1:  struct mem_cgroup_tree_per_node {
1: -	struct rb_root rb_root;
1: -	struct rb_node *rb_rightmost;
1: -	spinlock_t lock;
1: +  struct rb_root rb_root;
1: +  struct rb_node *rb_rightmost;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct mem_cgroup_tree {
1: -	struct mem_cgroup_tree_per_node *rb_tree_per_node[64];
1: +  struct mem_cgroup_tree_per_node *rb_tree_per_node[64];
1:  };
1:  
1:  struct mem_cgroup_eventfd_list {
1: -	struct list_head list;
1: -	struct eventfd_ctx *eventfd;
1: +  struct list_head list;
1: +  struct eventfd_ctx *eventfd;
1:  };
1:  
1:  struct mem_cgroup_event {
1: -	struct mem_cgroup *memcg;
1: -	struct eventfd_ctx *eventfd;
1: -	struct list_head list;
1: -	int (*register_event)(struct mem_cgroup *, struct eventfd_ctx *, const char *);
1: -	void (*unregister_event)(struct mem_cgroup *, struct eventfd_ctx *);
1: -	poll_table pt;
1: -	wait_queue_head_t *wqh;
1: -	wait_queue_entry_t wait;
1: -	struct work_struct remove;
1: +  struct mem_cgroup *memcg;
1: +  struct eventfd_ctx *eventfd;
1: +  struct list_head list;
1: +  int (*register_event)(struct mem_cgroup *, struct eventfd_ctx *,
1: +                        const char *);
1: +  void (*unregister_event)(struct mem_cgroup *, struct eventfd_ctx *);
1: +  poll_table pt;
1: +  wait_queue_head_t *wqh;
1: +  wait_queue_entry_t wait;
1: +  struct work_struct remove;
1:  };
1:  
1:  struct move_charge_struct {
1: -	spinlock_t lock;
1: -	struct mm_struct *mm;
1: -	struct mem_cgroup *from;
1: -	struct mem_cgroup *to;
1: -	long unsigned int flags;
1: -	long unsigned int precharge;
1: -	long unsigned int moved_charge;
1: -	long unsigned int moved_swap;
1: -	struct task_struct *moving_task;
1: -	wait_queue_head_t waitq;
1: +  spinlock_t lock;
1: +  struct mm_struct *mm;
1: +  struct mem_cgroup *from;
1: +  struct mem_cgroup *to;
1: +  long unsigned int flags;
1: +  long unsigned int precharge;
1: +  long unsigned int moved_charge;
1: +  long unsigned int moved_swap;
1: +  struct task_struct *moving_task;
1: +  wait_queue_head_t waitq;
1:  };
1:  
1:  enum res_type {
1: -	_MEM = 0,
1: -	_MEMSWAP = 1,
1: -	_OOM_TYPE = 2,
1: -	_KMEM = 3,
1: -	_TCP = 4,
1: +  _MEM = 0,
1: +  _MEMSWAP = 1,
1: +  _OOM_TYPE = 2,
1: +  _KMEM = 3,
1: +  _TCP = 4,
1:  };
1:  
1:  struct memory_stat {
1: -	const char *name;
1: -	unsigned int ratio;
1: -	unsigned int idx;
1: +  const char *name;
1: +  unsigned int ratio;
1: +  unsigned int idx;
1:  };
1:  
1:  struct oom_wait_info {
1: -	struct mem_cgroup *memcg;
1: -	wait_queue_entry_t wait;
1: +  struct mem_cgroup *memcg;
1: +  wait_queue_entry_t wait;
1:  };
1:  
1:  enum oom_status {
1: -	OOM_SUCCESS = 0,
1: -	OOM_FAILED = 1,
1: -	OOM_ASYNC = 2,
1: -	OOM_SKIPPED = 3,
1: +  OOM_SUCCESS = 0,
1: +  OOM_FAILED = 1,
1: +  OOM_ASYNC = 2,
1: +  OOM_SKIPPED = 3,
1:  };
1:  
1:  struct memcg_stock_pcp {
1: -	struct mem_cgroup *cached;
1: -	unsigned int nr_pages;
1: -	struct obj_cgroup *cached_objcg;
1: -	unsigned int nr_bytes;
1: -	struct work_struct work;
1: -	long unsigned int flags;
1: +  struct mem_cgroup *cached;
1: +  unsigned int nr_pages;
1: +  struct obj_cgroup *cached_objcg;
1: +  unsigned int nr_bytes;
1: +  struct work_struct work;
1: +  long unsigned int flags;
1:  };
1:  
1:  enum {
1: -	RES_USAGE = 0,
1: -	RES_LIMIT = 1,
1: -	RES_MAX_USAGE = 2,
1: -	RES_FAILCNT = 3,
1: -	RES_SOFT_LIMIT = 4,
1: +  RES_USAGE = 0,
1: +  RES_LIMIT = 1,
1: +  RES_MAX_USAGE = 2,
1: +  RES_FAILCNT = 3,
1: +  RES_SOFT_LIMIT = 4,
1:  };
1:  
1:  union mc_target {
1: -	struct page *page;
1: -	swp_entry_t ent;
1: +  struct page *page;
1: +  swp_entry_t ent;
1:  };
1:  
1:  enum mc_target_type {
1: -	MC_TARGET_NONE = 0,
1: -	MC_TARGET_PAGE = 1,
1: -	MC_TARGET_SWAP = 2,
1: -	MC_TARGET_DEVICE = 3,
1: +  MC_TARGET_NONE = 0,
1: +  MC_TARGET_PAGE = 1,
1: +  MC_TARGET_SWAP = 2,
1: +  MC_TARGET_DEVICE = 3,
1:  };
1:  
1:  struct uncharge_gather {
1: -	struct mem_cgroup *memcg;
1: -	long unsigned int nr_pages;
1: -	long unsigned int pgpgout;
1: -	long unsigned int nr_kmem;
1: -	struct page *dummy_page;
1: +  struct mem_cgroup *memcg;
1: +  long unsigned int nr_pages;
1: +  long unsigned int pgpgout;
1: +  long unsigned int nr_kmem;
1: +  struct page *dummy_page;
1:  };
1:  
1:  struct numa_stat {
1: -	const char *name;
1: -	unsigned int lru_mask;
1: +  const char *name;
1: +  unsigned int lru_mask;
1:  };
1:  
1:  enum vmpressure_levels {
1: -	VMPRESSURE_LOW = 0,
1: -	VMPRESSURE_MEDIUM = 1,
1: -	VMPRESSURE_CRITICAL = 2,
1: -	VMPRESSURE_NUM_LEVELS = 3,
1: +  VMPRESSURE_LOW = 0,
1: +  VMPRESSURE_MEDIUM = 1,
1: +  VMPRESSURE_CRITICAL = 2,
1: +  VMPRESSURE_NUM_LEVELS = 3,
1:  };
1:  
1:  enum vmpressure_modes {
1: -	VMPRESSURE_NO_PASSTHROUGH = 0,
1: -	VMPRESSURE_HIERARCHY = 1,
1: -	VMPRESSURE_LOCAL = 2,
1: -	VMPRESSURE_NUM_MODES = 3,
1: +  VMPRESSURE_NO_PASSTHROUGH = 0,
1: +  VMPRESSURE_HIERARCHY = 1,
1: +  VMPRESSURE_LOCAL = 2,
1: +  VMPRESSURE_NUM_MODES = 3,
1:  };
1:  
1:  struct vmpressure_event {
1: -	struct eventfd_ctx *efd;
1: -	enum vmpressure_levels level;
1: -	enum vmpressure_modes mode;
1: -	struct list_head node;
1: +  struct eventfd_ctx *efd;
1: +  enum vmpressure_levels level;
1: +  enum vmpressure_modes mode;
1: +  struct list_head node;
1:  };
1:  
1:  struct swap_cgroup_ctrl {
1: -	struct page **map;
1: -	long unsigned int length;
1: -	spinlock_t lock;
1: +  struct page **map;
1: +  long unsigned int length;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct swap_cgroup {
1: -	short unsigned int id;
1: +  short unsigned int id;
1:  };
1:  
1:  enum {
1: -	RES_USAGE___2 = 0,
1: -	RES_RSVD_USAGE = 1,
1: -	RES_LIMIT___2 = 2,
1: -	RES_RSVD_LIMIT = 3,
1: -	RES_MAX_USAGE___2 = 4,
1: -	RES_RSVD_MAX_USAGE = 5,
1: -	RES_FAILCNT___2 = 6,
1: -	RES_RSVD_FAILCNT = 7,
1: +  RES_USAGE___2 = 0,
1: +  RES_RSVD_USAGE = 1,
1: +  RES_LIMIT___2 = 2,
1: +  RES_RSVD_LIMIT = 3,
1: +  RES_MAX_USAGE___2 = 4,
1: +  RES_RSVD_MAX_USAGE = 5,
1: +  RES_FAILCNT___2 = 6,
1: +  RES_RSVD_FAILCNT = 7,
1:  };
1:  
1:  enum mf_result {
1: -	MF_IGNORED = 0,
1: -	MF_FAILED = 1,
1: -	MF_DELAYED = 2,
1: -	MF_RECOVERED = 3,
1: +  MF_IGNORED = 0,
1: +  MF_FAILED = 1,
1: +  MF_DELAYED = 2,
1: +  MF_RECOVERED = 3,
1:  };
1:  
1:  enum mf_action_page_type {
1: -	MF_MSG_KERNEL = 0,
1: -	MF_MSG_KERNEL_HIGH_ORDER = 1,
1: -	MF_MSG_SLAB = 2,
1: -	MF_MSG_DIFFERENT_COMPOUND = 3,
1: -	MF_MSG_POISONED_HUGE = 4,
1: -	MF_MSG_HUGE = 5,
1: -	MF_MSG_FREE_HUGE = 6,
1: -	MF_MSG_NON_PMD_HUGE = 7,
1: -	MF_MSG_UNMAP_FAILED = 8,
1: -	MF_MSG_DIRTY_SWAPCACHE = 9,
1: -	MF_MSG_CLEAN_SWAPCACHE = 10,
1: -	MF_MSG_DIRTY_MLOCKED_LRU = 11,
1: -	MF_MSG_CLEAN_MLOCKED_LRU = 12,
1: -	MF_MSG_DIRTY_UNEVICTABLE_LRU = 13,
1: -	MF_MSG_CLEAN_UNEVICTABLE_LRU = 14,
1: -	MF_MSG_DIRTY_LRU = 15,
1: -	MF_MSG_CLEAN_LRU = 16,
1: -	MF_MSG_TRUNCATED_LRU = 17,
1: -	MF_MSG_BUDDY = 18,
1: -	MF_MSG_BUDDY_2ND = 19,
1: -	MF_MSG_DAX = 20,
1: -	MF_MSG_UNSPLIT_THP = 21,
1: -	MF_MSG_UNKNOWN = 22,
1: +  MF_MSG_KERNEL = 0,
1: +  MF_MSG_KERNEL_HIGH_ORDER = 1,
1: +  MF_MSG_SLAB = 2,
1: +  MF_MSG_DIFFERENT_COMPOUND = 3,
1: +  MF_MSG_POISONED_HUGE = 4,
1: +  MF_MSG_HUGE = 5,
1: +  MF_MSG_FREE_HUGE = 6,
1: +  MF_MSG_NON_PMD_HUGE = 7,
1: +  MF_MSG_UNMAP_FAILED = 8,
1: +  MF_MSG_DIRTY_SWAPCACHE = 9,
1: +  MF_MSG_CLEAN_SWAPCACHE = 10,
1: +  MF_MSG_DIRTY_MLOCKED_LRU = 11,
1: +  MF_MSG_CLEAN_MLOCKED_LRU = 12,
1: +  MF_MSG_DIRTY_UNEVICTABLE_LRU = 13,
1: +  MF_MSG_CLEAN_UNEVICTABLE_LRU = 14,
1: +  MF_MSG_DIRTY_LRU = 15,
1: +  MF_MSG_CLEAN_LRU = 16,
1: +  MF_MSG_TRUNCATED_LRU = 17,
1: +  MF_MSG_BUDDY = 18,
1: +  MF_MSG_BUDDY_2ND = 19,
1: +  MF_MSG_DAX = 20,
1: +  MF_MSG_UNSPLIT_THP = 21,
1: +  MF_MSG_UNKNOWN = 22,
1:  };
1:  
1:  typedef long unsigned int dax_entry_t;
1:  
1:  struct __kfifo {
1: -	unsigned int in;
1: -	unsigned int out;
1: -	unsigned int mask;
1: -	unsigned int esize;
1: -	void *data;
1: +  unsigned int in;
1: +  unsigned int out;
1: +  unsigned int mask;
1: +  unsigned int esize;
1: +  void *data;
1:  };
1:  
1:  struct to_kill {
1: -	struct list_head nd;
1: -	struct task_struct *tsk;
1: -	long unsigned int addr;
1: -	short int size_shift;
1: +  struct list_head nd;
1: +  struct task_struct *tsk;
1: +  long unsigned int addr;
1: +  short int size_shift;
1:  };
1:  
1:  struct page_state {
1: -	long unsigned int mask;
1: -	long unsigned int res;
1: -	enum mf_action_page_type type;
1: -	int (*action)(struct page *, long unsigned int);
1: +  long unsigned int mask;
1: +  long unsigned int res;
1: +  enum mf_action_page_type type;
1: +  int (*action)(struct page *, long unsigned int);
1:  };
1:  
1:  struct memory_failure_entry {
1: -	long unsigned int pfn;
1: -	int flags;
1: +  long unsigned int pfn;
1: +  int flags;
1:  };
1:  
1:  struct memory_failure_cpu {
1: -	struct {
1: -		union {
1: -			struct __kfifo kfifo;
1: -			struct memory_failure_entry *type;
1: -			const struct memory_failure_entry *const_type;
1: -			char (*rectype)[0];
1: -			struct memory_failure_entry *ptr;
1: -			const struct memory_failure_entry *ptr_const;
1: -		};
1: -		struct memory_failure_entry buf[16];
1: -	} fifo;
1: -	spinlock_t lock;
1: -	struct work_struct work;
1: +  struct {
1: +    union {
1: +      struct __kfifo kfifo;
1: +      struct memory_failure_entry *type;
1: +      const struct memory_failure_entry *const_type;
1: +      char (*rectype)[0];
1: +      struct memory_failure_entry *ptr;
1: +      const struct memory_failure_entry *ptr_const;
1: +    };
1: +    struct memory_failure_entry buf[16];
1: +  } fifo;
1: +  spinlock_t lock;
1: +  struct work_struct work;
1:  };
1:  
1:  struct trace_event_raw_test_pages_isolated {
1: -	struct trace_entry ent;
1: -	long unsigned int start_pfn;
1: -	long unsigned int end_pfn;
1: -	long unsigned int fin_pfn;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int start_pfn;
1: +  long unsigned int end_pfn;
1: +  long unsigned int fin_pfn;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_test_pages_isolated {};
1:  
1: -typedef void (*btf_trace_test_pages_isolated)(void *, long unsigned int, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_test_pages_isolated)(void *, long unsigned int,
1: +                                              long unsigned int,
1: +                                              long unsigned int);
1:  
1:  struct cma {
1: -	long unsigned int base_pfn;
1: -	long unsigned int count;
1: -	long unsigned int *bitmap;
1: -	unsigned int order_per_bit;
1: -	struct mutex lock;
1: -	char name[64];
1: +  long unsigned int base_pfn;
1: +  long unsigned int count;
1: +  long unsigned int *bitmap;
1: +  unsigned int order_per_bit;
1: +  struct mutex lock;
1: +  char name[64];
1:  };
1:  
1:  struct trace_event_raw_cma_alloc {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	const struct page *page;
1: -	unsigned int count;
1: -	unsigned int align;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  const struct page *page;
1: +  unsigned int count;
1: +  unsigned int align;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cma_release {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	const struct page *page;
1: -	unsigned int count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  const struct page *page;
1: +  unsigned int count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_cma_alloc {};
1:  
1:  struct trace_event_data_offsets_cma_release {};
1:  
1: -typedef void (*btf_trace_cma_alloc)(void *, long unsigned int, const struct page *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_cma_alloc)(void *, long unsigned int,
1: +                                    const struct page *, unsigned int,
1: +                                    unsigned int);
1:  
1: -typedef void (*btf_trace_cma_release)(void *, long unsigned int, const struct page *, unsigned int);
1: +typedef void (*btf_trace_cma_release)(void *, long unsigned int,
1: +                                      const struct page *, unsigned int);
1:  
1:  struct balloon_dev_info {
1: -	long unsigned int isolated_pages;
1: -	spinlock_t pages_lock;
1: -	struct list_head pages;
1: -	int (*migratepage)(struct balloon_dev_info *, struct page *, struct page *, enum migrate_mode);
1: -	struct inode *inode;
1: +  long unsigned int isolated_pages;
1: +  spinlock_t pages_lock;
1: +  struct list_head pages;
1: +  int (*migratepage)(struct balloon_dev_info *, struct page *, struct page *,
1: +                     enum migrate_mode);
1: +  struct inode *inode;
1:  };
1:  
1:  enum hmm_pfn_flags {
1: -	HMM_PFN_VALID = 0,
1: -	HMM_PFN_WRITE = 0,
1: -	HMM_PFN_ERROR = 0,
1: -	HMM_PFN_ORDER_SHIFT = 56,
1: -	HMM_PFN_REQ_FAULT = 0,
1: -	HMM_PFN_REQ_WRITE = 0,
1: -	HMM_PFN_FLAGS = 0,
1: +  HMM_PFN_VALID = 0,
1: +  HMM_PFN_WRITE = 0,
1: +  HMM_PFN_ERROR = 0,
1: +  HMM_PFN_ORDER_SHIFT = 56,
1: +  HMM_PFN_REQ_FAULT = 0,
1: +  HMM_PFN_REQ_WRITE = 0,
1: +  HMM_PFN_FLAGS = 0,
1:  };
1:  
1:  struct hmm_range {
1: -	struct mmu_interval_notifier *notifier;
1: -	long unsigned int notifier_seq;
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	long unsigned int *hmm_pfns;
1: -	long unsigned int default_flags;
1: -	long unsigned int pfn_flags_mask;
1: -	void *dev_private_owner;
1: +  struct mmu_interval_notifier *notifier;
1: +  long unsigned int notifier_seq;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  long unsigned int *hmm_pfns;
1: +  long unsigned int default_flags;
1: +  long unsigned int pfn_flags_mask;
1: +  void *dev_private_owner;
1:  };
1:  
1:  struct hmm_vma_walk {
1: -	struct hmm_range *range;
1: -	long unsigned int last;
1: +  struct hmm_range *range;
1: +  long unsigned int last;
1:  };
1:  
1:  enum {
1: -	HMM_NEED_FAULT = 1,
1: -	HMM_NEED_WRITE_FAULT = 2,
1: -	HMM_NEED_ALL_BITS = 3,
1: +  HMM_NEED_FAULT = 1,
1: +  HMM_NEED_WRITE_FAULT = 2,
1: +  HMM_NEED_ALL_BITS = 3,
1:  };
1:  
1:  struct hugetlbfs_inode_info {
1: -	struct shared_policy policy;
1: -	struct inode vfs_inode;
1: -	unsigned int seals;
1: +  struct shared_policy policy;
1: +  struct inode vfs_inode;
1: +  unsigned int seals;
1:  };
1:  
1:  struct page_reporting_dev_info {
1: -	int (*report)(struct page_reporting_dev_info *, struct scatterlist *, unsigned int);
1: -	struct delayed_work work;
1: -	atomic_t state;
1: +  int (*report)(struct page_reporting_dev_info *, struct scatterlist *,
1: +                unsigned int);
1: +  struct delayed_work work;
1: +  atomic_t state;
1:  };
1:  
1:  enum {
1: -	PAGE_REPORTING_IDLE = 0,
1: -	PAGE_REPORTING_REQUESTED = 1,
1: -	PAGE_REPORTING_ACTIVE = 2,
1: +  PAGE_REPORTING_IDLE = 0,
1: +  PAGE_REPORTING_REQUESTED = 1,
1: +  PAGE_REPORTING_ACTIVE = 2,
1:  };
1:  
1:  struct open_how {
1: -	__u64 flags;
1: -	__u64 mode;
1: -	__u64 resolve;
1: +  __u64 flags;
1: +  __u64 mode;
1: +  __u64 resolve;
1:  };
1:  
1:  enum fsnotify_data_type {
1: -	FSNOTIFY_EVENT_NONE = 0,
1: -	FSNOTIFY_EVENT_PATH = 1,
1: -	FSNOTIFY_EVENT_INODE = 2,
1: +  FSNOTIFY_EVENT_NONE = 0,
1: +  FSNOTIFY_EVENT_PATH = 1,
1: +  FSNOTIFY_EVENT_INODE = 2,
1:  };
1:  
1:  typedef s32 compat_off_t;
1:  
1:  struct open_flags {
1: -	int open_flag;
1: -	umode_t mode;
1: -	int acc_mode;
1: -	int intent;
1: -	int lookup_flags;
1: +  int open_flag;
1: +  umode_t mode;
1: +  int acc_mode;
1: +  int intent;
1: +  int lookup_flags;
1:  };
1:  
1:  typedef __kernel_long_t __kernel_off_t;
1: @@ -40605,105 +41051,105 @@ typedef __kernel_rwf_t rwf_t;
1:  typedef s64 compat_loff_t;
1:  
1:  enum vfs_get_super_keying {
1: -	vfs_get_single_super = 0,
1: -	vfs_get_single_reconf_super = 1,
1: -	vfs_get_keyed_super = 2,
1: -	vfs_get_independent_super = 3,
1: +  vfs_get_single_super = 0,
1: +  vfs_get_single_reconf_super = 1,
1: +  vfs_get_keyed_super = 2,
1: +  vfs_get_independent_super = 3,
1:  };
1:  
1:  struct kobj_map;
1:  
1:  struct char_device_struct {
1: -	struct char_device_struct *next;
1: -	unsigned int major;
1: -	unsigned int baseminor;
1: -	int minorct;
1: -	char name[64];
1: -	struct cdev *cdev;
1: +  struct char_device_struct *next;
1: +  unsigned int major;
1: +  unsigned int baseminor;
1: +  int minorct;
1: +  char name[64];
1: +  struct cdev *cdev;
1:  };
1:  
1:  struct stat {
1: -	__kernel_ulong_t st_dev;
1: -	__kernel_ulong_t st_ino;
1: -	__kernel_ulong_t st_nlink;
1: -	unsigned int st_mode;
1: -	unsigned int st_uid;
1: -	unsigned int st_gid;
1: -	unsigned int __pad0;
1: -	__kernel_ulong_t st_rdev;
1: -	__kernel_long_t st_size;
1: -	__kernel_long_t st_blksize;
1: -	__kernel_long_t st_blocks;
1: -	__kernel_ulong_t st_atime;
1: -	__kernel_ulong_t st_atime_nsec;
1: -	__kernel_ulong_t st_mtime;
1: -	__kernel_ulong_t st_mtime_nsec;
1: -	__kernel_ulong_t st_ctime;
1: -	__kernel_ulong_t st_ctime_nsec;
1: -	__kernel_long_t __unused[3];
1: +  __kernel_ulong_t st_dev;
1: +  __kernel_ulong_t st_ino;
1: +  __kernel_ulong_t st_nlink;
1: +  unsigned int st_mode;
1: +  unsigned int st_uid;
1: +  unsigned int st_gid;
1: +  unsigned int __pad0;
1: +  __kernel_ulong_t st_rdev;
1: +  __kernel_long_t st_size;
1: +  __kernel_long_t st_blksize;
1: +  __kernel_long_t st_blocks;
1: +  __kernel_ulong_t st_atime;
1: +  __kernel_ulong_t st_atime_nsec;
1: +  __kernel_ulong_t st_mtime;
1: +  __kernel_ulong_t st_mtime_nsec;
1: +  __kernel_ulong_t st_ctime;
1: +  __kernel_ulong_t st_ctime_nsec;
1: +  __kernel_long_t __unused[3];
1:  };
1:  
1:  struct __old_kernel_stat {
1: -	short unsigned int st_dev;
1: -	short unsigned int st_ino;
1: -	short unsigned int st_mode;
1: -	short unsigned int st_nlink;
1: -	short unsigned int st_uid;
1: -	short unsigned int st_gid;
1: -	short unsigned int st_rdev;
1: -	unsigned int st_size;
1: -	unsigned int st_atime;
1: -	unsigned int st_mtime;
1: -	unsigned int st_ctime;
1: +  short unsigned int st_dev;
1: +  short unsigned int st_ino;
1: +  short unsigned int st_mode;
1: +  short unsigned int st_nlink;
1: +  short unsigned int st_uid;
1: +  short unsigned int st_gid;
1: +  short unsigned int st_rdev;
1: +  unsigned int st_size;
1: +  unsigned int st_atime;
1: +  unsigned int st_mtime;
1: +  unsigned int st_ctime;
1:  };
1:  
1:  struct statx_timestamp {
1: -	__s64 tv_sec;
1: -	__u32 tv_nsec;
1: -	__s32 __reserved;
1: +  __s64 tv_sec;
1: +  __u32 tv_nsec;
1: +  __s32 __reserved;
1:  };
1:  
1:  struct statx {
1: -	__u32 stx_mask;
1: -	__u32 stx_blksize;
1: -	__u64 stx_attributes;
1: -	__u32 stx_nlink;
1: -	__u32 stx_uid;
1: -	__u32 stx_gid;
1: -	__u16 stx_mode;
1: -	__u16 __spare0[1];
1: -	__u64 stx_ino;
1: -	__u64 stx_size;
1: -	__u64 stx_blocks;
1: -	__u64 stx_attributes_mask;
1: -	struct statx_timestamp stx_atime;
1: -	struct statx_timestamp stx_btime;
1: -	struct statx_timestamp stx_ctime;
1: -	struct statx_timestamp stx_mtime;
1: -	__u32 stx_rdev_major;
1: -	__u32 stx_rdev_minor;
1: -	__u32 stx_dev_major;
1: -	__u32 stx_dev_minor;
1: -	__u64 stx_mnt_id;
1: -	__u64 __spare2;
1: -	__u64 __spare3[12];
1: +  __u32 stx_mask;
1: +  __u32 stx_blksize;
1: +  __u64 stx_attributes;
1: +  __u32 stx_nlink;
1: +  __u32 stx_uid;
1: +  __u32 stx_gid;
1: +  __u16 stx_mode;
1: +  __u16 __spare0[1];
1: +  __u64 stx_ino;
1: +  __u64 stx_size;
1: +  __u64 stx_blocks;
1: +  __u64 stx_attributes_mask;
1: +  struct statx_timestamp stx_atime;
1: +  struct statx_timestamp stx_btime;
1: +  struct statx_timestamp stx_ctime;
1: +  struct statx_timestamp stx_mtime;
1: +  __u32 stx_rdev_major;
1: +  __u32 stx_rdev_minor;
1: +  __u32 stx_dev_major;
1: +  __u32 stx_dev_minor;
1: +  __u64 stx_mnt_id;
1: +  __u64 __spare2;
1: +  __u64 __spare3[12];
1:  };
1:  
1:  struct mount;
1:  
1:  struct mnt_namespace {
1: -	atomic_t count;
1: -	struct ns_common ns;
1: -	struct mount *root;
1: -	struct list_head list;
1: -	spinlock_t ns_lock;
1: -	struct user_namespace *user_ns;
1: -	struct ucounts *ucounts;
1: -	u64 seq;
1: -	wait_queue_head_t poll;
1: -	u64 event;
1: -	unsigned int mounts;
1: -	unsigned int pending_mounts;
1: +  atomic_t count;
1: +  struct ns_common ns;
1: +  struct mount *root;
1: +  struct list_head list;
1: +  spinlock_t ns_lock;
1: +  struct user_namespace *user_ns;
1: +  struct ucounts *ucounts;
1: +  u64 seq;
1: +  wait_queue_head_t poll;
1: +  u64 event;
1: +  unsigned int mounts;
1: +  unsigned int pending_mounts;
1:  };
1:  
1:  typedef u32 compat_ino_t;
1: @@ -40719,26 +41165,26 @@ typedef u16 compat_dev_t;
1:  typedef u16 compat_nlink_t;
1:  
1:  struct compat_stat {
1: -	compat_dev_t st_dev;
1: -	u16 __pad1;
1: -	compat_ino_t st_ino;
1: -	compat_mode_t st_mode;
1: -	compat_nlink_t st_nlink;
1: -	__compat_uid_t st_uid;
1: -	__compat_gid_t st_gid;
1: -	compat_dev_t st_rdev;
1: -	u16 __pad2;
1: -	u32 st_size;
1: -	u32 st_blksize;
1: -	u32 st_blocks;
1: -	u32 st_atime;
1: -	u32 st_atime_nsec;
1: -	u32 st_mtime;
1: -	u32 st_mtime_nsec;
1: -	u32 st_ctime;
1: -	u32 st_ctime_nsec;
1: -	u32 __unused4;
1: -	u32 __unused5;
1: +  compat_dev_t st_dev;
1: +  u16 __pad1;
1: +  compat_ino_t st_ino;
1: +  compat_mode_t st_mode;
1: +  compat_nlink_t st_nlink;
1: +  __compat_uid_t st_uid;
1: +  __compat_gid_t st_gid;
1: +  compat_dev_t st_rdev;
1: +  u16 __pad2;
1: +  u32 st_size;
1: +  u32 st_blksize;
1: +  u32 st_blocks;
1: +  u32 st_atime;
1: +  u32 st_atime_nsec;
1: +  u32 st_mtime;
1: +  u32 st_mtime_nsec;
1: +  u32 st_ctime;
1: +  u32 st_ctime_nsec;
1: +  u32 __unused4;
1: +  u32 __unused5;
1:  };
1:  
1:  struct mnt_pcp;
1: @@ -40746,182 +41192,182 @@ struct mnt_pcp;
1:  struct mountpoint;
1:  
1:  struct mount {
1: -	struct hlist_node mnt_hash;
1: -	struct mount *mnt_parent;
1: -	struct dentry *mnt_mountpoint;
1: -	struct vfsmount mnt;
1: -	union {
1: -		struct callback_head mnt_rcu;
1: -		struct llist_node mnt_llist;
1: -	};
1: -	struct mnt_pcp *mnt_pcp;
1: -	struct list_head mnt_mounts;
1: -	struct list_head mnt_child;
1: -	struct list_head mnt_instance;
1: -	const char *mnt_devname;
1: -	struct list_head mnt_list;
1: -	struct list_head mnt_expire;
1: -	struct list_head mnt_share;
1: -	struct list_head mnt_slave_list;
1: -	struct list_head mnt_slave;
1: -	struct mount *mnt_master;
1: -	struct mnt_namespace *mnt_ns;
1: -	struct mountpoint *mnt_mp;
1: -	union {
1: -		struct hlist_node mnt_mp_list;
1: -		struct hlist_node mnt_umount;
1: -	};
1: -	struct list_head mnt_umounting;
1: -	struct fsnotify_mark_connector *mnt_fsnotify_marks;
1: -	__u32 mnt_fsnotify_mask;
1: -	int mnt_id;
1: -	int mnt_group_id;
1: -	int mnt_expiry_mark;
1: -	struct hlist_head mnt_pins;
1: -	struct hlist_head mnt_stuck_children;
1: +  struct hlist_node mnt_hash;
1: +  struct mount *mnt_parent;
1: +  struct dentry *mnt_mountpoint;
1: +  struct vfsmount mnt;
1: +  union {
1: +    struct callback_head mnt_rcu;
1: +    struct llist_node mnt_llist;
1: +  };
1: +  struct mnt_pcp *mnt_pcp;
1: +  struct list_head mnt_mounts;
1: +  struct list_head mnt_child;
1: +  struct list_head mnt_instance;
1: +  const char *mnt_devname;
1: +  struct list_head mnt_list;
1: +  struct list_head mnt_expire;
1: +  struct list_head mnt_share;
1: +  struct list_head mnt_slave_list;
1: +  struct list_head mnt_slave;
1: +  struct mount *mnt_master;
1: +  struct mnt_namespace *mnt_ns;
1: +  struct mountpoint *mnt_mp;
1: +  union {
1: +    struct hlist_node mnt_mp_list;
1: +    struct hlist_node mnt_umount;
1: +  };
1: +  struct list_head mnt_umounting;
1: +  struct fsnotify_mark_connector *mnt_fsnotify_marks;
1: +  __u32 mnt_fsnotify_mask;
1: +  int mnt_id;
1: +  int mnt_group_id;
1: +  int mnt_expiry_mark;
1: +  struct hlist_head mnt_pins;
1: +  struct hlist_head mnt_stuck_children;
1:  };
1:  
1:  struct mnt_pcp {
1: -	int mnt_count;
1: -	int mnt_writers;
1: +  int mnt_count;
1: +  int mnt_writers;
1:  };
1:  
1:  struct mountpoint {
1: -	struct hlist_node m_hash;
1: -	struct dentry *m_dentry;
1: -	struct hlist_head m_list;
1: -	int m_count;
1: +  struct hlist_node m_hash;
1: +  struct dentry *m_dentry;
1: +  struct hlist_head m_list;
1: +  int m_count;
1:  };
1:  
1:  typedef short unsigned int ushort;
1:  
1:  struct user_arg_ptr {
1: -	bool is_compat;
1: -	union {
1: -		const char * const *native;
1: -		const compat_uptr_t *compat;
1: -	} ptr;
1: +  bool is_compat;
1: +  union {
1: +    const char *const *native;
1: +    const compat_uptr_t *compat;
1: +  } ptr;
1:  };
1:  
1:  enum inode_i_mutex_lock_class {
1: -	I_MUTEX_NORMAL = 0,
1: -	I_MUTEX_PARENT = 1,
1: -	I_MUTEX_CHILD = 2,
1: -	I_MUTEX_XATTR = 3,
1: -	I_MUTEX_NONDIR2 = 4,
1: -	I_MUTEX_PARENT2 = 5,
1: +  I_MUTEX_NORMAL = 0,
1: +  I_MUTEX_PARENT = 1,
1: +  I_MUTEX_CHILD = 2,
1: +  I_MUTEX_XATTR = 3,
1: +  I_MUTEX_NONDIR2 = 4,
1: +  I_MUTEX_PARENT2 = 5,
1:  };
1:  
1:  struct pseudo_fs_context {
1: -	const struct super_operations *ops;
1: -	const struct xattr_handler **xattr;
1: -	const struct dentry_operations *dops;
1: -	long unsigned int magic;
1: +  const struct super_operations *ops;
1: +  const struct xattr_handler **xattr;
1: +  const struct dentry_operations *dops;
1: +  long unsigned int magic;
1:  };
1:  
1:  struct name_snapshot {
1: -	struct qstr name;
1: -	unsigned char inline_name[32];
1: +  struct qstr name;
1: +  unsigned char inline_name[32];
1:  };
1:  
1:  struct saved {
1: -	struct path link;
1: -	struct delayed_call done;
1: -	const char *name;
1: -	unsigned int seq;
1: +  struct path link;
1: +  struct delayed_call done;
1: +  const char *name;
1: +  unsigned int seq;
1:  };
1:  
1:  struct nameidata {
1: -	struct path path;
1: -	struct qstr last;
1: -	struct path root;
1: -	struct inode *inode;
1: -	unsigned int flags;
1: -	unsigned int seq;
1: -	unsigned int m_seq;
1: -	unsigned int r_seq;
1: -	int last_type;
1: -	unsigned int depth;
1: -	int total_link_count;
1: -	struct saved *stack;
1: -	struct saved internal[2];
1: -	struct filename *name;
1: -	struct nameidata *saved;
1: -	unsigned int root_seq;
1: -	int dfd;
1: -	kuid_t dir_uid;
1: -	umode_t dir_mode;
1: +  struct path path;
1: +  struct qstr last;
1: +  struct path root;
1: +  struct inode *inode;
1: +  unsigned int flags;
1: +  unsigned int seq;
1: +  unsigned int m_seq;
1: +  unsigned int r_seq;
1: +  int last_type;
1: +  unsigned int depth;
1: +  int total_link_count;
1: +  struct saved *stack;
1: +  struct saved internal[2];
1: +  struct filename *name;
1: +  struct nameidata *saved;
1: +  unsigned int root_seq;
1: +  int dfd;
1: +  kuid_t dir_uid;
1: +  umode_t dir_mode;
1:  };
1:  
1:  enum {
1: -	LAST_NORM = 0,
1: -	LAST_ROOT = 1,
1: -	LAST_DOT = 2,
1: -	LAST_DOTDOT = 3,
1: +  LAST_NORM = 0,
1: +  LAST_ROOT = 1,
1: +  LAST_DOT = 2,
1: +  LAST_DOTDOT = 3,
1:  };
1:  
1:  enum {
1: -	WALK_TRAILING = 1,
1: -	WALK_MORE = 2,
1: -	WALK_NOFOLLOW = 4,
1: +  WALK_TRAILING = 1,
1: +  WALK_MORE = 2,
1: +  WALK_NOFOLLOW = 4,
1:  };
1:  
1:  struct word_at_a_time {
1: -	const long unsigned int one_bits;
1: -	const long unsigned int high_bits;
1: +  const long unsigned int one_bits;
1: +  const long unsigned int high_bits;
1:  };
1:  
1:  struct f_owner_ex {
1: -	int type;
1: -	__kernel_pid_t pid;
1: +  int type;
1: +  __kernel_pid_t pid;
1:  };
1:  
1:  struct flock {
1: -	short int l_type;
1: -	short int l_whence;
1: -	__kernel_off_t l_start;
1: -	__kernel_off_t l_len;
1: -	__kernel_pid_t l_pid;
1: +  short int l_type;
1: +  short int l_whence;
1: +  __kernel_off_t l_start;
1: +  __kernel_off_t l_len;
1: +  __kernel_pid_t l_pid;
1:  };
1:  
1:  struct compat_flock {
1: -	short int l_type;
1: -	short int l_whence;
1: -	compat_off_t l_start;
1: -	compat_off_t l_len;
1: -	compat_pid_t l_pid;
1: +  short int l_type;
1: +  short int l_whence;
1: +  compat_off_t l_start;
1: +  compat_off_t l_len;
1: +  compat_pid_t l_pid;
1:  };
1:  
1:  struct compat_flock64 {
1: -	short int l_type;
1: -	short int l_whence;
1: -	compat_loff_t l_start;
1: -	compat_loff_t l_len;
1: -	compat_pid_t l_pid;
1: +  short int l_type;
1: +  short int l_whence;
1: +  compat_loff_t l_start;
1: +  compat_loff_t l_len;
1: +  compat_pid_t l_pid;
1:  } __attribute__((packed));
1:  
1:  struct file_clone_range {
1: -	__s64 src_fd;
1: -	__u64 src_offset;
1: -	__u64 src_length;
1: -	__u64 dest_offset;
1: +  __s64 src_fd;
1: +  __u64 src_offset;
1: +  __u64 src_length;
1: +  __u64 dest_offset;
1:  };
1:  
1:  struct file_dedupe_range_info {
1: -	__s64 dest_fd;
1: -	__u64 dest_offset;
1: -	__u64 bytes_deduped;
1: -	__s32 status;
1: -	__u32 reserved;
1: +  __s64 dest_fd;
1: +  __u64 dest_offset;
1: +  __u64 bytes_deduped;
1: +  __s32 status;
1: +  __u32 reserved;
1:  };
1:  
1:  struct file_dedupe_range {
1: -	__u64 src_offset;
1: -	__u64 src_length;
1: -	__u16 dest_count;
1: -	__u16 reserved1;
1: -	__u32 reserved2;
1: -	struct file_dedupe_range_info info[0];
1: +  __u64 src_offset;
1: +  __u64 src_length;
1: +  __u16 dest_count;
1: +  __u16 reserved1;
1: +  __u32 reserved2;
1: +  struct file_dedupe_range_info info[0];
1:  };
1:  
1:  typedef int get_block_t(struct inode *, sector_t, struct buffer_head *, int);
1: @@ -40929,494 +41375,492 @@ typedef int get_block_t(struct inode *, sector_t, struct buffer_head *, int);
1:  struct fiemap_extent;
1:  
1:  struct fiemap_extent_info {
1: -	unsigned int fi_flags;
1: -	unsigned int fi_extents_mapped;
1: -	unsigned int fi_extents_max;
1: -	struct fiemap_extent *fi_extents_start;
1: +  unsigned int fi_flags;
1: +  unsigned int fi_extents_mapped;
1: +  unsigned int fi_extents_max;
1: +  struct fiemap_extent *fi_extents_start;
1:  };
1:  
1:  struct space_resv {
1: -	__s16 l_type;
1: -	__s16 l_whence;
1: -	__s64 l_start;
1: -	__s64 l_len;
1: -	__s32 l_sysid;
1: -	__u32 l_pid;
1: -	__s32 l_pad[4];
1: +  __s16 l_type;
1: +  __s16 l_whence;
1: +  __s64 l_start;
1: +  __s64 l_len;
1: +  __s32 l_sysid;
1: +  __u32 l_pid;
1: +  __s32 l_pad[4];
1:  };
1:  
1:  struct space_resv_32 {
1: -	__s16 l_type;
1: -	__s16 l_whence;
1: -	__s64 l_start;
1: -	__s64 l_len;
1: -	__s32 l_sysid;
1: -	__u32 l_pid;
1: -	__s32 l_pad[4];
1: +  __s16 l_type;
1: +  __s16 l_whence;
1: +  __s64 l_start;
1: +  __s64 l_len;
1: +  __s32 l_sysid;
1: +  __u32 l_pid;
1: +  __s32 l_pad[4];
1:  } __attribute__((packed));
1:  
1:  struct fiemap_extent {
1: -	__u64 fe_logical;
1: -	__u64 fe_physical;
1: -	__u64 fe_length;
1: -	__u64 fe_reserved64[2];
1: -	__u32 fe_flags;
1: -	__u32 fe_reserved[3];
1: +  __u64 fe_logical;
1: +  __u64 fe_physical;
1: +  __u64 fe_length;
1: +  __u64 fe_reserved64[2];
1: +  __u32 fe_flags;
1: +  __u32 fe_reserved[3];
1:  };
1:  
1:  struct fiemap {
1: -	__u64 fm_start;
1: -	__u64 fm_length;
1: -	__u32 fm_flags;
1: -	__u32 fm_mapped_extents;
1: -	__u32 fm_extent_count;
1: -	__u32 fm_reserved;
1: -	struct fiemap_extent fm_extents[0];
1: +  __u64 fm_start;
1: +  __u64 fm_length;
1: +  __u32 fm_flags;
1: +  __u32 fm_mapped_extents;
1: +  __u32 fm_extent_count;
1: +  __u32 fm_reserved;
1: +  struct fiemap_extent fm_extents[0];
1:  };
1:  
1:  struct linux_dirent64 {
1: -	u64 d_ino;
1: -	s64 d_off;
1: -	short unsigned int d_reclen;
1: -	unsigned char d_type;
1: -	char d_name[0];
1: +  u64 d_ino;
1: +  s64 d_off;
1: +  short unsigned int d_reclen;
1: +  unsigned char d_type;
1: +  char d_name[0];
1:  };
1:  
1:  struct old_linux_dirent {
1: -	long unsigned int d_ino;
1: -	long unsigned int d_offset;
1: -	short unsigned int d_namlen;
1: -	char d_name[1];
1: +  long unsigned int d_ino;
1: +  long unsigned int d_offset;
1: +  short unsigned int d_namlen;
1: +  char d_name[1];
1:  };
1:  
1:  struct readdir_callback {
1: -	struct dir_context ctx;
1: -	struct old_linux_dirent *dirent;
1: -	int result;
1: +  struct dir_context ctx;
1: +  struct old_linux_dirent *dirent;
1: +  int result;
1:  };
1:  
1:  struct linux_dirent {
1: -	long unsigned int d_ino;
1: -	long unsigned int d_off;
1: -	short unsigned int d_reclen;
1: -	char d_name[1];
1: +  long unsigned int d_ino;
1: +  long unsigned int d_off;
1: +  short unsigned int d_reclen;
1: +  char d_name[1];
1:  };
1:  
1:  struct getdents_callback {
1: -	struct dir_context ctx;
1: -	struct linux_dirent *current_dir;
1: -	int prev_reclen;
1: -	int count;
1: -	int error;
1: +  struct dir_context ctx;
1: +  struct linux_dirent *current_dir;
1: +  int prev_reclen;
1: +  int count;
1: +  int error;
1:  };
1:  
1:  struct getdents_callback64 {
1: -	struct dir_context ctx;
1: -	struct linux_dirent64 *current_dir;
1: -	int prev_reclen;
1: -	int count;
1: -	int error;
1: +  struct dir_context ctx;
1: +  struct linux_dirent64 *current_dir;
1: +  int prev_reclen;
1: +  int count;
1: +  int error;
1:  };
1:  
1:  struct compat_old_linux_dirent {
1: -	compat_ulong_t d_ino;
1: -	compat_ulong_t d_offset;
1: -	short unsigned int d_namlen;
1: -	char d_name[1];
1: +  compat_ulong_t d_ino;
1: +  compat_ulong_t d_offset;
1: +  short unsigned int d_namlen;
1: +  char d_name[1];
1:  };
1:  
1:  struct compat_readdir_callback {
1: -	struct dir_context ctx;
1: -	struct compat_old_linux_dirent *dirent;
1: -	int result;
1: +  struct dir_context ctx;
1: +  struct compat_old_linux_dirent *dirent;
1: +  int result;
1:  };
1:  
1:  struct compat_linux_dirent {
1: -	compat_ulong_t d_ino;
1: -	compat_ulong_t d_off;
1: -	short unsigned int d_reclen;
1: -	char d_name[1];
1: +  compat_ulong_t d_ino;
1: +  compat_ulong_t d_off;
1: +  short unsigned int d_reclen;
1: +  char d_name[1];
1:  };
1:  
1:  struct compat_getdents_callback {
1: -	struct dir_context ctx;
1: -	struct compat_linux_dirent *current_dir;
1: -	int prev_reclen;
1: -	int count;
1: -	int error;
1: +  struct dir_context ctx;
1: +  struct compat_linux_dirent *current_dir;
1: +  int prev_reclen;
1: +  int count;
1: +  int error;
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int fds_bits[16];
1: -} __kernel_fd_set;
1: +typedef struct { long unsigned int fds_bits[16]; } __kernel_fd_set;
1:  
1:  typedef __kernel_fd_set fd_set;
1:  
1:  struct poll_table_entry {
1: -	struct file *filp;
1: -	__poll_t key;
1: -	wait_queue_entry_t wait;
1: -	wait_queue_head_t *wait_address;
1: +  struct file *filp;
1: +  __poll_t key;
1: +  wait_queue_entry_t wait;
1: +  wait_queue_head_t *wait_address;
1:  };
1:  
1:  struct poll_table_page;
1:  
1:  struct poll_wqueues {
1: -	poll_table pt;
1: -	struct poll_table_page *table;
1: -	struct task_struct *polling_task;
1: -	int triggered;
1: -	int error;
1: -	int inline_index;
1: -	struct poll_table_entry inline_entries[9];
1: +  poll_table pt;
1: +  struct poll_table_page *table;
1: +  struct task_struct *polling_task;
1: +  int triggered;
1: +  int error;
1: +  int inline_index;
1: +  struct poll_table_entry inline_entries[9];
1:  };
1:  
1:  struct poll_table_page {
1: -	struct poll_table_page *next;
1: -	struct poll_table_entry *entry;
1: -	struct poll_table_entry entries[0];
1: +  struct poll_table_page *next;
1: +  struct poll_table_entry *entry;
1: +  struct poll_table_entry entries[0];
1:  };
1:  
1:  enum poll_time_type {
1: -	PT_TIMEVAL = 0,
1: -	PT_OLD_TIMEVAL = 1,
1: -	PT_TIMESPEC = 2,
1: -	PT_OLD_TIMESPEC = 3,
1: +  PT_TIMEVAL = 0,
1: +  PT_OLD_TIMEVAL = 1,
1: +  PT_TIMESPEC = 2,
1: +  PT_OLD_TIMESPEC = 3,
1:  };
1:  
1:  typedef struct {
1: -	long unsigned int *in;
1: -	long unsigned int *out;
1: -	long unsigned int *ex;
1: -	long unsigned int *res_in;
1: -	long unsigned int *res_out;
1: -	long unsigned int *res_ex;
1: +  long unsigned int *in;
1: +  long unsigned int *out;
1: +  long unsigned int *ex;
1: +  long unsigned int *res_in;
1: +  long unsigned int *res_out;
1: +  long unsigned int *res_ex;
1:  } fd_set_bits;
1:  
1:  struct sigset_argpack {
1: -	sigset_t *p;
1: -	size_t size;
1: +  sigset_t *p;
1: +  size_t size;
1:  };
1:  
1:  struct poll_list {
1: -	struct poll_list *next;
1: -	int len;
1: -	struct pollfd entries[0];
1: +  struct poll_list *next;
1: +  int len;
1: +  struct pollfd entries[0];
1:  };
1:  
1:  struct compat_sel_arg_struct {
1: -	compat_ulong_t n;
1: -	compat_uptr_t inp;
1: -	compat_uptr_t outp;
1: -	compat_uptr_t exp;
1: -	compat_uptr_t tvp;
1: +  compat_ulong_t n;
1: +  compat_uptr_t inp;
1: +  compat_uptr_t outp;
1: +  compat_uptr_t exp;
1: +  compat_uptr_t tvp;
1:  };
1:  
1:  struct compat_sigset_argpack {
1: -	compat_uptr_t p;
1: -	compat_size_t size;
1: +  compat_uptr_t p;
1: +  compat_size_t size;
1:  };
1:  
1:  enum dentry_d_lock_class {
1: -	DENTRY_D_LOCK_NORMAL = 0,
1: -	DENTRY_D_LOCK_NESTED = 1,
1: +  DENTRY_D_LOCK_NORMAL = 0,
1: +  DENTRY_D_LOCK_NESTED = 1,
1:  };
1:  
1:  struct external_name {
1: -	union {
1: -		atomic_t count;
1: -		struct callback_head head;
1: -	} u;
1: -	unsigned char name[0];
1: +  union {
1: +    atomic_t count;
1: +    struct callback_head head;
1: +  } u;
1: +  unsigned char name[0];
1:  };
1:  
1:  enum d_walk_ret {
1: -	D_WALK_CONTINUE = 0,
1: -	D_WALK_QUIT = 1,
1: -	D_WALK_NORETRY = 2,
1: -	D_WALK_SKIP = 3,
1: +  D_WALK_CONTINUE = 0,
1: +  D_WALK_QUIT = 1,
1: +  D_WALK_NORETRY = 2,
1: +  D_WALK_SKIP = 3,
1:  };
1:  
1:  struct check_mount {
1: -	struct vfsmount *mnt;
1: -	unsigned int mounted;
1: +  struct vfsmount *mnt;
1: +  unsigned int mounted;
1:  };
1:  
1:  struct select_data {
1: -	struct dentry *start;
1: -	union {
1: -		long int found;
1: -		struct dentry *victim;
1: -	};
1: -	struct list_head dispose;
1: +  struct dentry *start;
1: +  union {
1: +    long int found;
1: +    struct dentry *victim;
1: +  };
1: +  struct list_head dispose;
1:  };
1:  
1:  struct fsxattr {
1: -	__u32 fsx_xflags;
1: -	__u32 fsx_extsize;
1: -	__u32 fsx_nextents;
1: -	__u32 fsx_projid;
1: -	__u32 fsx_cowextsize;
1: -	unsigned char fsx_pad[8];
1: +  __u32 fsx_xflags;
1: +  __u32 fsx_extsize;
1: +  __u32 fsx_nextents;
1: +  __u32 fsx_projid;
1: +  __u32 fsx_cowextsize;
1: +  unsigned char fsx_pad[8];
1:  };
1:  
1:  enum file_time_flags {
1: -	S_ATIME = 1,
1: -	S_MTIME = 2,
1: -	S_CTIME = 4,
1: -	S_VERSION = 8,
1: +  S_ATIME = 1,
1: +  S_MTIME = 2,
1: +  S_CTIME = 4,
1: +  S_VERSION = 8,
1:  };
1:  
1:  struct proc_mounts {
1: -	struct mnt_namespace *ns;
1: -	struct path root;
1: -	int (*show)(struct seq_file *, struct vfsmount *);
1: -	struct mount cursor;
1: +  struct mnt_namespace *ns;
1: +  struct path root;
1: +  int (*show)(struct seq_file *, struct vfsmount *);
1: +  struct mount cursor;
1:  };
1:  
1:  enum umount_tree_flags {
1: -	UMOUNT_SYNC = 1,
1: -	UMOUNT_PROPAGATE = 2,
1: -	UMOUNT_CONNECTED = 4,
1: +  UMOUNT_SYNC = 1,
1: +  UMOUNT_PROPAGATE = 2,
1: +  UMOUNT_CONNECTED = 4,
1:  };
1:  
1:  struct simple_transaction_argresp {
1: -	ssize_t size;
1: -	char data[0];
1: +  ssize_t size;
1: +  char data[0];
1:  };
1:  
1:  struct simple_attr {
1: -	int (*get)(void *, u64 *);
1: -	int (*set)(void *, u64);
1: -	char get_buf[24];
1: -	char set_buf[24];
1: -	void *data;
1: -	const char *fmt;
1: -	struct mutex mutex;
1: +  int (*get)(void *, u64 *);
1: +  int (*set)(void *, u64);
1: +  char get_buf[24];
1: +  char set_buf[24];
1: +  void *data;
1: +  const char *fmt;
1: +  struct mutex mutex;
1:  };
1:  
1:  struct wb_writeback_work {
1: -	long int nr_pages;
1: -	struct super_block *sb;
1: -	enum writeback_sync_modes sync_mode;
1: -	unsigned int tagged_writepages: 1;
1: -	unsigned int for_kupdate: 1;
1: -	unsigned int range_cyclic: 1;
1: -	unsigned int for_background: 1;
1: -	unsigned int for_sync: 1;
1: -	unsigned int auto_free: 1;
1: -	enum wb_reason reason;
1: -	struct list_head list;
1: -	struct wb_completion *done;
1: +  long int nr_pages;
1: +  struct super_block *sb;
1: +  enum writeback_sync_modes sync_mode;
1: +  unsigned int tagged_writepages : 1;
1: +  unsigned int for_kupdate : 1;
1: +  unsigned int range_cyclic : 1;
1: +  unsigned int for_background : 1;
1: +  unsigned int for_sync : 1;
1: +  unsigned int auto_free : 1;
1: +  enum wb_reason reason;
1: +  struct list_head list;
1: +  struct wb_completion *done;
1:  };
1:  
1:  struct trace_event_raw_writeback_page_template {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	long unsigned int index;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  long unsigned int index;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_dirty_inode_template {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	long unsigned int state;
1: -	long unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  long unsigned int state;
1: +  long unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_inode_foreign_history {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	ino_t cgroup_ino;
1: -	unsigned int history;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  ino_t cgroup_ino;
1: +  unsigned int history;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_inode_switch_wbs {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	ino_t old_cgroup_ino;
1: -	ino_t new_cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  ino_t old_cgroup_ino;
1: +  ino_t new_cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_track_foreign_dirty {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	u64 bdi_id;
1: -	ino_t ino;
1: -	unsigned int memcg_id;
1: -	ino_t cgroup_ino;
1: -	ino_t page_cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  u64 bdi_id;
1: +  ino_t ino;
1: +  unsigned int memcg_id;
1: +  ino_t cgroup_ino;
1: +  ino_t page_cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_flush_foreign {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t cgroup_ino;
1: -	unsigned int frn_bdi_id;
1: -	unsigned int frn_memcg_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t cgroup_ino;
1: +  unsigned int frn_bdi_id;
1: +  unsigned int frn_memcg_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_write_inode_template {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	int sync_mode;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  int sync_mode;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_work_class {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	long int nr_pages;
1: -	dev_t sb_dev;
1: -	int sync_mode;
1: -	int for_kupdate;
1: -	int range_cyclic;
1: -	int for_background;
1: -	int reason;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  long int nr_pages;
1: +  dev_t sb_dev;
1: +  int sync_mode;
1: +  int for_kupdate;
1: +  int range_cyclic;
1: +  int for_background;
1: +  int reason;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_pages_written {
1: -	struct trace_entry ent;
1: -	long int pages;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long int pages;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_class {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_bdi_register {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wbc_class {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	long int nr_to_write;
1: -	long int pages_skipped;
1: -	int sync_mode;
1: -	int for_kupdate;
1: -	int for_background;
1: -	int for_reclaim;
1: -	int range_cyclic;
1: -	long int range_start;
1: -	long int range_end;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  long int nr_to_write;
1: +  long int pages_skipped;
1: +  int sync_mode;
1: +  int for_kupdate;
1: +  int for_background;
1: +  int for_reclaim;
1: +  int range_cyclic;
1: +  long int range_start;
1: +  long int range_end;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_queue_io {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	long unsigned int older;
1: -	long int age;
1: -	int moved;
1: -	int reason;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  long unsigned int older;
1: +  long int age;
1: +  int moved;
1: +  int reason;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_global_dirty_state {
1: -	struct trace_entry ent;
1: -	long unsigned int nr_dirty;
1: -	long unsigned int nr_writeback;
1: -	long unsigned int background_thresh;
1: -	long unsigned int dirty_thresh;
1: -	long unsigned int dirty_limit;
1: -	long unsigned int nr_dirtied;
1: -	long unsigned int nr_written;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int nr_dirty;
1: +  long unsigned int nr_writeback;
1: +  long unsigned int background_thresh;
1: +  long unsigned int dirty_thresh;
1: +  long unsigned int dirty_limit;
1: +  long unsigned int nr_dirtied;
1: +  long unsigned int nr_written;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_bdi_dirty_ratelimit {
1: -	struct trace_entry ent;
1: -	char bdi[32];
1: -	long unsigned int write_bw;
1: -	long unsigned int avg_write_bw;
1: -	long unsigned int dirty_rate;
1: -	long unsigned int dirty_ratelimit;
1: -	long unsigned int task_ratelimit;
1: -	long unsigned int balanced_dirty_ratelimit;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char bdi[32];
1: +  long unsigned int write_bw;
1: +  long unsigned int avg_write_bw;
1: +  long unsigned int dirty_rate;
1: +  long unsigned int dirty_ratelimit;
1: +  long unsigned int task_ratelimit;
1: +  long unsigned int balanced_dirty_ratelimit;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_balance_dirty_pages {
1: -	struct trace_entry ent;
1: -	char bdi[32];
1: -	long unsigned int limit;
1: -	long unsigned int setpoint;
1: -	long unsigned int dirty;
1: -	long unsigned int bdi_setpoint;
1: -	long unsigned int bdi_dirty;
1: -	long unsigned int dirty_ratelimit;
1: -	long unsigned int task_ratelimit;
1: -	unsigned int dirtied;
1: -	unsigned int dirtied_pause;
1: -	long unsigned int paused;
1: -	long int pause;
1: -	long unsigned int period;
1: -	long int think;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char bdi[32];
1: +  long unsigned int limit;
1: +  long unsigned int setpoint;
1: +  long unsigned int dirty;
1: +  long unsigned int bdi_setpoint;
1: +  long unsigned int bdi_dirty;
1: +  long unsigned int dirty_ratelimit;
1: +  long unsigned int task_ratelimit;
1: +  unsigned int dirtied;
1: +  unsigned int dirtied_pause;
1: +  long unsigned int paused;
1: +  long int pause;
1: +  long unsigned int period;
1: +  long int think;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_sb_inodes_requeue {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	long unsigned int state;
1: -	long unsigned int dirtied_when;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  long unsigned int state;
1: +  long unsigned int dirtied_when;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_congest_waited_template {
1: -	struct trace_entry ent;
1: -	unsigned int usec_timeout;
1: -	unsigned int usec_delayed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int usec_timeout;
1: +  unsigned int usec_delayed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_single_inode_template {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	ino_t ino;
1: -	long unsigned int state;
1: -	long unsigned int dirtied_when;
1: -	long unsigned int writeback_index;
1: -	long int nr_to_write;
1: -	long unsigned int wrote;
1: -	ino_t cgroup_ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  ino_t ino;
1: +  long unsigned int state;
1: +  long unsigned int dirtied_when;
1: +  long unsigned int writeback_index;
1: +  long int nr_to_write;
1: +  long unsigned int wrote;
1: +  ino_t cgroup_ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_writeback_inode_template {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	long unsigned int state;
1: -	__u16 mode;
1: -	long unsigned int dirtied_when;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  long unsigned int state;
1: +  __u16 mode;
1: +  long unsigned int dirtied_when;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_writeback_page_template {};
1: @@ -41459,63 +41903,97 @@ struct trace_event_data_offsets_writeback_single_inode_template {};
1:  
1:  struct trace_event_data_offsets_writeback_inode_template {};
1:  
1: -typedef void (*btf_trace_writeback_dirty_page)(void *, struct page *, struct address_space *);
1: +typedef void (*btf_trace_writeback_dirty_page)(void *, struct page *,
1: +                                               struct address_space *);
1:  
1: -typedef void (*btf_trace_wait_on_page_writeback)(void *, struct page *, struct address_space *);
1: +typedef void (*btf_trace_wait_on_page_writeback)(void *, struct page *,
1: +                                                 struct address_space *);
1:  
1: -typedef void (*btf_trace_writeback_mark_inode_dirty)(void *, struct inode *, int);
1: +typedef void (*btf_trace_writeback_mark_inode_dirty)(void *, struct inode *,
1: +                                                     int);
1:  
1: -typedef void (*btf_trace_writeback_dirty_inode_start)(void *, struct inode *, int);
1: +typedef void (*btf_trace_writeback_dirty_inode_start)(void *, struct inode *,
1: +                                                      int);
1:  
1:  typedef void (*btf_trace_writeback_dirty_inode)(void *, struct inode *, int);
1:  
1: -typedef void (*btf_trace_inode_foreign_history)(void *, struct inode *, struct writeback_control *, unsigned int);
1: +typedef void (*btf_trace_inode_foreign_history)(void *, struct inode *,
1: +                                                struct writeback_control *,
1: +                                                unsigned int);
1:  
1: -typedef void (*btf_trace_inode_switch_wbs)(void *, struct inode *, struct bdi_writeback *, struct bdi_writeback *);
1: +typedef void (*btf_trace_inode_switch_wbs)(void *, struct inode *,
1: +                                           struct bdi_writeback *,
1: +                                           struct bdi_writeback *);
1:  
1: -typedef void (*btf_trace_track_foreign_dirty)(void *, struct page *, struct bdi_writeback *);
1: +typedef void (*btf_trace_track_foreign_dirty)(void *, struct page *,
1: +                                              struct bdi_writeback *);
1:  
1: -typedef void (*btf_trace_flush_foreign)(void *, struct bdi_writeback *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_flush_foreign)(void *, struct bdi_writeback *,
1: +                                        unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_writeback_write_inode_start)(void *, struct inode *, struct writeback_control *);
1: +typedef void (*btf_trace_writeback_write_inode_start)(
1: +    void *, struct inode *, struct writeback_control *);
1:  
1: -typedef void (*btf_trace_writeback_write_inode)(void *, struct inode *, struct writeback_control *);
1: +typedef void (*btf_trace_writeback_write_inode)(void *, struct inode *,
1: +                                                struct writeback_control *);
1:  
1: -typedef void (*btf_trace_writeback_queue)(void *, struct bdi_writeback *, struct wb_writeback_work *);
1: +typedef void (*btf_trace_writeback_queue)(void *, struct bdi_writeback *,
1: +                                          struct wb_writeback_work *);
1:  
1: -typedef void (*btf_trace_writeback_exec)(void *, struct bdi_writeback *, struct wb_writeback_work *);
1: +typedef void (*btf_trace_writeback_exec)(void *, struct bdi_writeback *,
1: +                                         struct wb_writeback_work *);
1:  
1: -typedef void (*btf_trace_writeback_start)(void *, struct bdi_writeback *, struct wb_writeback_work *);
1: +typedef void (*btf_trace_writeback_start)(void *, struct bdi_writeback *,
1: +                                          struct wb_writeback_work *);
1:  
1: -typedef void (*btf_trace_writeback_written)(void *, struct bdi_writeback *, struct wb_writeback_work *);
1: +typedef void (*btf_trace_writeback_written)(void *, struct bdi_writeback *,
1: +                                            struct wb_writeback_work *);
1:  
1: -typedef void (*btf_trace_writeback_wait)(void *, struct bdi_writeback *, struct wb_writeback_work *);
1: +typedef void (*btf_trace_writeback_wait)(void *, struct bdi_writeback *,
1: +                                         struct wb_writeback_work *);
1:  
1:  typedef void (*btf_trace_writeback_pages_written)(void *, long int);
1:  
1: -typedef void (*btf_trace_writeback_wake_background)(void *, struct bdi_writeback *);
1: +typedef void (*btf_trace_writeback_wake_background)(void *,
1: +                                                    struct bdi_writeback *);
1:  
1: -typedef void (*btf_trace_writeback_bdi_register)(void *, struct backing_dev_info *);
1: +typedef void (*btf_trace_writeback_bdi_register)(void *,
1: +                                                 struct backing_dev_info *);
1:  
1: -typedef void (*btf_trace_wbc_writepage)(void *, struct writeback_control *, struct backing_dev_info *);
1: +typedef void (*btf_trace_wbc_writepage)(void *, struct writeback_control *,
1: +                                        struct backing_dev_info *);
1:  
1: -typedef void (*btf_trace_writeback_queue_io)(void *, struct bdi_writeback *, struct wb_writeback_work *, long unsigned int, int);
1: +typedef void (*btf_trace_writeback_queue_io)(void *, struct bdi_writeback *,
1: +                                             struct wb_writeback_work *,
1: +                                             long unsigned int, int);
1:  
1: -typedef void (*btf_trace_global_dirty_state)(void *, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_global_dirty_state)(void *, long unsigned int,
1: +                                             long unsigned int);
1:  
1: -typedef void (*btf_trace_bdi_dirty_ratelimit)(void *, struct bdi_writeback *, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_bdi_dirty_ratelimit)(void *, struct bdi_writeback *,
1: +                                              long unsigned int,
1: +                                              long unsigned int);
1:  
1: -typedef void (*btf_trace_balance_dirty_pages)(void *, struct bdi_writeback *, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int, long int, long unsigned int);
1: +typedef void (*btf_trace_balance_dirty_pages)(
1: +    void *, struct bdi_writeback *, long unsigned int, long unsigned int,
1: +    long unsigned int, long unsigned int, long unsigned int, long unsigned int,
1: +    long unsigned int, long unsigned int, long unsigned int, long int,
1: +    long unsigned int);
1:  
1:  typedef void (*btf_trace_writeback_sb_inodes_requeue)(void *, struct inode *);
1:  
1: -typedef void (*btf_trace_writeback_congestion_wait)(void *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_writeback_congestion_wait)(void *, unsigned int,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_writeback_wait_iff_congested)(void *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_writeback_wait_iff_congested)(void *, unsigned int,
1: +                                                       unsigned int);
1:  
1: -typedef void (*btf_trace_writeback_single_inode_start)(void *, struct inode *, struct writeback_control *, long unsigned int);
1: +typedef void (*btf_trace_writeback_single_inode_start)(
1: +    void *, struct inode *, struct writeback_control *, long unsigned int);
1:  
1: -typedef void (*btf_trace_writeback_single_inode)(void *, struct inode *, struct writeback_control *, long unsigned int);
1: +typedef void (*btf_trace_writeback_single_inode)(void *, struct inode *,
1: +                                                 struct writeback_control *,
1: +                                                 long unsigned int);
1:  
1:  typedef void (*btf_trace_writeback_lazytime)(void *, struct inode *);
1:  
1: @@ -41528,48 +42006,49 @@ typedef void (*btf_trace_sb_mark_inode_writeback)(void *, struct inode *);
1:  typedef void (*btf_trace_sb_clear_inode_writeback)(void *, struct inode *);
1:  
1:  struct inode_switch_wbs_context {
1: -	struct inode *inode;
1: -	struct bdi_writeback *new_wb;
1: -	struct callback_head callback_head;
1: -	struct work_struct work;
1: +  struct inode *inode;
1: +  struct bdi_writeback *new_wb;
1: +  struct callback_head callback_head;
1: +  struct work_struct work;
1:  };
1:  
1:  struct splice_desc {
1: -	size_t total_len;
1: -	unsigned int len;
1: -	unsigned int flags;
1: -	union {
1: -		void *userptr;
1: -		struct file *file;
1: -		void *data;
1: -	} u;
1: -	loff_t pos;
1: -	loff_t *opos;
1: -	size_t num_spliced;
1: -	bool need_wakeup;
1: -};
1: -
1: -typedef int splice_actor(struct pipe_inode_info *, struct pipe_buffer *, struct splice_desc *);
1: +  size_t total_len;
1: +  unsigned int len;
1: +  unsigned int flags;
1: +  union {
1: +    void *userptr;
1: +    struct file *file;
1: +    void *data;
1: +  } u;
1: +  loff_t pos;
1: +  loff_t *opos;
1: +  size_t num_spliced;
1: +  bool need_wakeup;
1: +};
1: +
1: +typedef int splice_actor(struct pipe_inode_info *, struct pipe_buffer *,
1: +                         struct splice_desc *);
1:  
1:  typedef int splice_direct_actor(struct pipe_inode_info *, struct splice_desc *);
1:  
1:  struct old_utimbuf32 {
1: -	old_time32_t actime;
1: -	old_time32_t modtime;
1: +  old_time32_t actime;
1: +  old_time32_t modtime;
1:  };
1:  
1:  struct utimbuf {
1: -	__kernel_old_time_t actime;
1: -	__kernel_old_time_t modtime;
1: +  __kernel_old_time_t actime;
1: +  __kernel_old_time_t modtime;
1:  };
1:  
1:  typedef int __kernel_daddr_t;
1:  
1:  struct ustat {
1: -	__kernel_daddr_t f_tfree;
1: -	__kernel_ino_t f_tinode;
1: -	char f_fname[6];
1: -	char f_fpack[6];
1: +  __kernel_daddr_t f_tfree;
1: +  __kernel_ino_t f_tinode;
1: +  char f_fname[6];
1: +  char f_fpack[6];
1:  };
1:  
1:  typedef s32 compat_daddr_t;
1: @@ -41577,100 +42056,100 @@ typedef s32 compat_daddr_t;
1:  typedef __kernel_fsid_t compat_fsid_t;
1:  
1:  struct compat_statfs {
1: -	int f_type;
1: -	int f_bsize;
1: -	int f_blocks;
1: -	int f_bfree;
1: -	int f_bavail;
1: -	int f_files;
1: -	int f_ffree;
1: -	compat_fsid_t f_fsid;
1: -	int f_namelen;
1: -	int f_frsize;
1: -	int f_flags;
1: -	int f_spare[4];
1: +  int f_type;
1: +  int f_bsize;
1: +  int f_blocks;
1: +  int f_bfree;
1: +  int f_bavail;
1: +  int f_files;
1: +  int f_ffree;
1: +  compat_fsid_t f_fsid;
1: +  int f_namelen;
1: +  int f_frsize;
1: +  int f_flags;
1: +  int f_spare[4];
1:  };
1:  
1:  struct compat_ustat {
1: -	compat_daddr_t f_tfree;
1: -	compat_ino_t f_tinode;
1: -	char f_fname[6];
1: -	char f_fpack[6];
1: +  compat_daddr_t f_tfree;
1: +  compat_ino_t f_tinode;
1: +  char f_fname[6];
1: +  char f_fpack[6];
1:  };
1:  
1:  struct statfs {
1: -	__kernel_long_t f_type;
1: -	__kernel_long_t f_bsize;
1: -	__kernel_long_t f_blocks;
1: -	__kernel_long_t f_bfree;
1: -	__kernel_long_t f_bavail;
1: -	__kernel_long_t f_files;
1: -	__kernel_long_t f_ffree;
1: -	__kernel_fsid_t f_fsid;
1: -	__kernel_long_t f_namelen;
1: -	__kernel_long_t f_frsize;
1: -	__kernel_long_t f_flags;
1: -	__kernel_long_t f_spare[4];
1: +  __kernel_long_t f_type;
1: +  __kernel_long_t f_bsize;
1: +  __kernel_long_t f_blocks;
1: +  __kernel_long_t f_bfree;
1: +  __kernel_long_t f_bavail;
1: +  __kernel_long_t f_files;
1: +  __kernel_long_t f_ffree;
1: +  __kernel_fsid_t f_fsid;
1: +  __kernel_long_t f_namelen;
1: +  __kernel_long_t f_frsize;
1: +  __kernel_long_t f_flags;
1: +  __kernel_long_t f_spare[4];
1:  };
1:  
1:  struct statfs64 {
1: -	__kernel_long_t f_type;
1: -	__kernel_long_t f_bsize;
1: -	__u64 f_blocks;
1: -	__u64 f_bfree;
1: -	__u64 f_bavail;
1: -	__u64 f_files;
1: -	__u64 f_ffree;
1: -	__kernel_fsid_t f_fsid;
1: -	__kernel_long_t f_namelen;
1: -	__kernel_long_t f_frsize;
1: -	__kernel_long_t f_flags;
1: -	__kernel_long_t f_spare[4];
1: +  __kernel_long_t f_type;
1: +  __kernel_long_t f_bsize;
1: +  __u64 f_blocks;
1: +  __u64 f_bfree;
1: +  __u64 f_bavail;
1: +  __u64 f_files;
1: +  __u64 f_ffree;
1: +  __kernel_fsid_t f_fsid;
1: +  __kernel_long_t f_namelen;
1: +  __kernel_long_t f_frsize;
1: +  __kernel_long_t f_flags;
1: +  __kernel_long_t f_spare[4];
1:  };
1:  
1:  struct compat_statfs64 {
1: -	__u32 f_type;
1: -	__u32 f_bsize;
1: -	__u64 f_blocks;
1: -	__u64 f_bfree;
1: -	__u64 f_bavail;
1: -	__u64 f_files;
1: -	__u64 f_ffree;
1: -	__kernel_fsid_t f_fsid;
1: -	__u32 f_namelen;
1: -	__u32 f_frsize;
1: -	__u32 f_flags;
1: -	__u32 f_spare[4];
1: +  __u32 f_type;
1: +  __u32 f_bsize;
1: +  __u64 f_blocks;
1: +  __u64 f_bfree;
1: +  __u64 f_bavail;
1: +  __u64 f_files;
1: +  __u64 f_ffree;
1: +  __kernel_fsid_t f_fsid;
1: +  __u32 f_namelen;
1: +  __u32 f_frsize;
1: +  __u32 f_flags;
1: +  __u32 f_spare[4];
1:  } __attribute__((packed));
1:  
1:  typedef struct ns_common *ns_get_path_helper_t(void *);
1:  
1:  struct ns_get_path_task_args {
1: -	const struct proc_ns_operations *ns_ops;
1: -	struct task_struct *task;
1: +  const struct proc_ns_operations *ns_ops;
1: +  struct task_struct *task;
1:  };
1:  
1:  enum legacy_fs_param {
1: -	LEGACY_FS_UNSET_PARAMS = 0,
1: -	LEGACY_FS_MONOLITHIC_PARAMS = 1,
1: -	LEGACY_FS_INDIVIDUAL_PARAMS = 2,
1: +  LEGACY_FS_UNSET_PARAMS = 0,
1: +  LEGACY_FS_MONOLITHIC_PARAMS = 1,
1: +  LEGACY_FS_INDIVIDUAL_PARAMS = 2,
1:  };
1:  
1:  struct legacy_fs_context {
1: -	char *legacy_data;
1: -	size_t data_size;
1: -	enum legacy_fs_param param_type;
1: +  char *legacy_data;
1: +  size_t data_size;
1: +  enum legacy_fs_param param_type;
1:  };
1:  
1:  enum fsconfig_command {
1: -	FSCONFIG_SET_FLAG = 0,
1: -	FSCONFIG_SET_STRING = 1,
1: -	FSCONFIG_SET_BINARY = 2,
1: -	FSCONFIG_SET_PATH = 3,
1: -	FSCONFIG_SET_PATH_EMPTY = 4,
1: -	FSCONFIG_SET_FD = 5,
1: -	FSCONFIG_CMD_CREATE = 6,
1: -	FSCONFIG_CMD_RECONFIGURE = 7,
1: +  FSCONFIG_SET_FLAG = 0,
1: +  FSCONFIG_SET_STRING = 1,
1: +  FSCONFIG_SET_BINARY = 2,
1: +  FSCONFIG_SET_PATH = 3,
1: +  FSCONFIG_SET_PATH_EMPTY = 4,
1: +  FSCONFIG_SET_FD = 5,
1: +  FSCONFIG_CMD_CREATE = 6,
1: +  FSCONFIG_CMD_RECONFIGURE = 7,
1:  };
1:  
1:  struct dax_device;
1: @@ -41678,79 +42157,80 @@ struct dax_device;
1:  struct iomap_page_ops;
1:  
1:  struct iomap___2 {
1: -	u64 addr;
1: -	loff_t offset;
1: -	u64 length;
1: -	u16 type;
1: -	u16 flags;
1: -	struct block_device *bdev;
1: -	struct dax_device *dax_dev;
1: -	void *inline_data;
1: -	void *private;
1: -	const struct iomap_page_ops *page_ops;
1: +  u64 addr;
1: +  loff_t offset;
1: +  u64 length;
1: +  u16 type;
1: +  u16 flags;
1: +  struct block_device *bdev;
1: +  struct dax_device *dax_dev;
1: +  void *inline_data;
1: +  void *private;
1: +  const struct iomap_page_ops *page_ops;
1:  };
1:  
1:  struct iomap_page_ops {
1: -	int (*page_prepare)(struct inode *, loff_t, unsigned int, struct iomap___2 *);
1: -	void (*page_done)(struct inode *, loff_t, unsigned int, struct page *, struct iomap___2 *);
1: +  int (*page_prepare)(struct inode *, loff_t, unsigned int, struct iomap___2 *);
1: +  void (*page_done)(struct inode *, loff_t, unsigned int, struct page *,
1: +                    struct iomap___2 *);
1:  };
1:  
1:  struct decrypt_bh_ctx {
1: -	struct work_struct work;
1: -	struct buffer_head *bh;
1: +  struct work_struct work;
1: +  struct buffer_head *bh;
1:  };
1:  
1:  struct bh_lru {
1: -	struct buffer_head *bhs[16];
1: +  struct buffer_head *bhs[16];
1:  };
1:  
1:  struct bh_accounting {
1: -	int nr;
1: -	int ratelimit;
1: +  int nr;
1: +  int ratelimit;
1:  };
1:  
1:  enum {
1: -	DISK_EVENT_MEDIA_CHANGE = 1,
1: -	DISK_EVENT_EJECT_REQUEST = 2,
1: +  DISK_EVENT_MEDIA_CHANGE = 1,
1: +  DISK_EVENT_EJECT_REQUEST = 2,
1:  };
1:  
1:  struct blk_integrity_profile;
1:  
1:  struct blk_integrity {
1: -	const struct blk_integrity_profile *profile;
1: -	unsigned char flags;
1: -	unsigned char tuple_size;
1: -	unsigned char interval_exp;
1: -	unsigned char tag_size;
1: +  const struct blk_integrity_profile *profile;
1: +  unsigned char flags;
1: +  unsigned char tuple_size;
1: +  unsigned char interval_exp;
1: +  unsigned char tag_size;
1:  };
1:  
1:  enum {
1: -	BIOSET_NEED_BVECS = 1,
1: -	BIOSET_NEED_RESCUER = 2,
1: +  BIOSET_NEED_BVECS = 1,
1: +  BIOSET_NEED_RESCUER = 2,
1:  };
1:  
1:  struct bdev_inode {
1: -	struct block_device bdev;
1: -	struct inode vfs_inode;
1: +  struct block_device bdev;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  struct blkdev_dio {
1: -	union {
1: -		struct kiocb *iocb;
1: -		struct task_struct *waiter;
1: -	};
1: -	size_t size;
1: -	atomic_t ref;
1: -	bool multi_bio: 1;
1: -	bool should_dirty: 1;
1: -	bool is_sync: 1;
1: -	struct bio bio;
1: +  union {
1: +    struct kiocb *iocb;
1: +    struct task_struct *waiter;
1: +  };
1: +  size_t size;
1: +  atomic_t ref;
1: +  bool multi_bio : 1;
1: +  bool should_dirty : 1;
1: +  bool is_sync : 1;
1: +  struct bio bio;
1:  };
1:  
1:  struct bd_holder_disk {
1: -	struct list_head list;
1: -	struct gendisk *disk;
1: -	int refcnt;
1: +  struct list_head list;
1: +  struct gendisk *disk;
1: +  int refcnt;
1:  };
1:  
1:  typedef int dio_iodone_t(struct kiocb *, loff_t, ssize_t, void *);
1: @@ -41758,94 +42238,94 @@ typedef int dio_iodone_t(struct kiocb *, loff_t, ssize_t, void *);
1:  typedef void dio_submit_t(struct bio *, struct inode *, loff_t);
1:  
1:  enum {
1: -	DIO_LOCKING = 1,
1: -	DIO_SKIP_HOLES = 2,
1: +  DIO_LOCKING = 1,
1: +  DIO_SKIP_HOLES = 2,
1:  };
1:  
1:  struct dio_submit {
1: -	struct bio *bio;
1: -	unsigned int blkbits;
1: -	unsigned int blkfactor;
1: -	unsigned int start_zero_done;
1: -	int pages_in_io;
1: -	sector_t block_in_file;
1: -	unsigned int blocks_available;
1: -	int reap_counter;
1: -	sector_t final_block_in_request;
1: -	int boundary;
1: -	get_block_t *get_block;
1: -	dio_submit_t *submit_io;
1: -	loff_t logical_offset_in_bio;
1: -	sector_t final_block_in_bio;
1: -	sector_t next_block_for_io;
1: -	struct page *cur_page;
1: -	unsigned int cur_page_offset;
1: -	unsigned int cur_page_len;
1: -	sector_t cur_page_block;
1: -	loff_t cur_page_fs_offset;
1: -	struct iov_iter *iter;
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	size_t from;
1: -	size_t to;
1: +  struct bio *bio;
1: +  unsigned int blkbits;
1: +  unsigned int blkfactor;
1: +  unsigned int start_zero_done;
1: +  int pages_in_io;
1: +  sector_t block_in_file;
1: +  unsigned int blocks_available;
1: +  int reap_counter;
1: +  sector_t final_block_in_request;
1: +  int boundary;
1: +  get_block_t *get_block;
1: +  dio_submit_t *submit_io;
1: +  loff_t logical_offset_in_bio;
1: +  sector_t final_block_in_bio;
1: +  sector_t next_block_for_io;
1: +  struct page *cur_page;
1: +  unsigned int cur_page_offset;
1: +  unsigned int cur_page_len;
1: +  sector_t cur_page_block;
1: +  loff_t cur_page_fs_offset;
1: +  struct iov_iter *iter;
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  size_t from;
1: +  size_t to;
1:  };
1:  
1:  struct dio {
1: -	int flags;
1: -	int op;
1: -	int op_flags;
1: -	blk_qc_t bio_cookie;
1: -	struct gendisk *bio_disk;
1: -	struct inode *inode;
1: -	loff_t i_size;
1: -	dio_iodone_t *end_io;
1: -	void *private;
1: -	spinlock_t bio_lock;
1: -	int page_errors;
1: -	int is_async;
1: -	bool defer_completion;
1: -	bool should_dirty;
1: -	int io_error;
1: -	long unsigned int refcount;
1: -	struct bio *bio_list;
1: -	struct task_struct *waiter;
1: -	struct kiocb *iocb;
1: -	ssize_t result;
1: -	union {
1: -		struct page *pages[64];
1: -		struct work_struct complete_work;
1: -	};
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  int flags;
1: +  int op;
1: +  int op_flags;
1: +  blk_qc_t bio_cookie;
1: +  struct gendisk *bio_disk;
1: +  struct inode *inode;
1: +  loff_t i_size;
1: +  dio_iodone_t *end_io;
1: +  void *private;
1: +  spinlock_t bio_lock;
1: +  int page_errors;
1: +  int is_async;
1: +  bool defer_completion;
1: +  bool should_dirty;
1: +  int io_error;
1: +  long unsigned int refcount;
1: +  struct bio *bio_list;
1: +  struct task_struct *waiter;
1: +  struct kiocb *iocb;
1: +  ssize_t result;
1: +  union {
1: +    struct page *pages[64];
1: +    struct work_struct complete_work;
1: +  };
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct bvec_iter_all {
1: -	struct bio_vec bv;
1: -	int idx;
1: -	unsigned int done;
1: +  struct bio_vec bv;
1: +  int idx;
1: +  unsigned int done;
1:  };
1:  
1:  struct mpage_readpage_args {
1: -	struct bio *bio;
1: -	struct page *page;
1: -	unsigned int nr_pages;
1: -	bool is_readahead;
1: -	sector_t last_block_in_bio;
1: -	struct buffer_head map_bh;
1: -	long unsigned int first_logical_block;
1: -	get_block_t *get_block;
1: +  struct bio *bio;
1: +  struct page *page;
1: +  unsigned int nr_pages;
1: +  bool is_readahead;
1: +  sector_t last_block_in_bio;
1: +  struct buffer_head map_bh;
1: +  long unsigned int first_logical_block;
1: +  get_block_t *get_block;
1:  };
1:  
1:  struct mpage_data {
1: -	struct bio *bio;
1: -	sector_t last_block_in_bio;
1: -	get_block_t *get_block;
1: -	unsigned int use_writepage;
1: +  struct bio *bio;
1: +  sector_t last_block_in_bio;
1: +  get_block_t *get_block;
1: +  unsigned int use_writepage;
1:  };
1:  
1:  typedef u32 nlink_t;
1: @@ -41853,271 +42333,272 @@ typedef u32 nlink_t;
1:  typedef int (*proc_write_t)(struct file *, char *, size_t);
1:  
1:  struct proc_dir_entry {
1: -	atomic_t in_use;
1: -	refcount_t refcnt;
1: -	struct list_head pde_openers;
1: -	spinlock_t pde_unload_lock;
1: -	struct completion *pde_unload_completion;
1: -	const struct inode_operations *proc_iops;
1: -	union {
1: -		const struct proc_ops *proc_ops;
1: -		const struct file_operations *proc_dir_ops;
1: -	};
1: -	const struct dentry_operations *proc_dops;
1: -	union {
1: -		const struct seq_operations *seq_ops;
1: -		int (*single_show)(struct seq_file *, void *);
1: -	};
1: -	proc_write_t write;
1: -	void *data;
1: -	unsigned int state_size;
1: -	unsigned int low_ino;
1: -	nlink_t nlink;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	loff_t size;
1: -	struct proc_dir_entry *parent;
1: -	struct rb_root subdir;
1: -	struct rb_node subdir_node;
1: -	char *name;
1: -	umode_t mode;
1: -	u8 flags;
1: -	u8 namelen;
1: -	char inline_name[0];
1: +  atomic_t in_use;
1: +  refcount_t refcnt;
1: +  struct list_head pde_openers;
1: +  spinlock_t pde_unload_lock;
1: +  struct completion *pde_unload_completion;
1: +  const struct inode_operations *proc_iops;
1: +  union {
1: +    const struct proc_ops *proc_ops;
1: +    const struct file_operations *proc_dir_ops;
1: +  };
1: +  const struct dentry_operations *proc_dops;
1: +  union {
1: +    const struct seq_operations *seq_ops;
1: +    int (*single_show)(struct seq_file *, void *);
1: +  };
1: +  proc_write_t write;
1: +  void *data;
1: +  unsigned int state_size;
1: +  unsigned int low_ino;
1: +  nlink_t nlink;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  loff_t size;
1: +  struct proc_dir_entry *parent;
1: +  struct rb_root subdir;
1: +  struct rb_node subdir_node;
1: +  char *name;
1: +  umode_t mode;
1: +  u8 flags;
1: +  u8 namelen;
1: +  char inline_name[0];
1:  };
1:  
1:  union proc_op {
1: -	int (*proc_get_link)(struct dentry *, struct path *);
1: -	int (*proc_show)(struct seq_file *, struct pid_namespace *, struct pid *, struct task_struct *);
1: -	const char *lsm;
1: +  int (*proc_get_link)(struct dentry *, struct path *);
1: +  int (*proc_show)(struct seq_file *, struct pid_namespace *, struct pid *,
1: +                   struct task_struct *);
1: +  const char *lsm;
1:  };
1:  
1:  struct proc_inode {
1: -	struct pid *pid;
1: -	unsigned int fd;
1: -	union proc_op op;
1: -	struct proc_dir_entry *pde;
1: -	struct ctl_table_header *sysctl;
1: -	struct ctl_table *sysctl_entry;
1: -	struct hlist_node sibling_inodes;
1: -	const struct proc_ns_operations *ns_ops;
1: -	struct inode vfs_inode;
1: +  struct pid *pid;
1: +  unsigned int fd;
1: +  union proc_op op;
1: +  struct proc_dir_entry *pde;
1: +  struct ctl_table_header *sysctl;
1: +  struct ctl_table *sysctl_entry;
1: +  struct hlist_node sibling_inodes;
1: +  const struct proc_ns_operations *ns_ops;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  struct proc_fs_opts {
1: -	int flag;
1: -	const char *str;
1: +  int flag;
1: +  const char *str;
1:  };
1:  
1:  struct file_handle {
1: -	__u32 handle_bytes;
1: -	int handle_type;
1: -	unsigned char f_handle[0];
1: +  __u32 handle_bytes;
1: +  int handle_type;
1: +  unsigned char f_handle[0];
1:  };
1:  
1:  struct inotify_inode_mark {
1: -	struct fsnotify_mark fsn_mark;
1: -	int wd;
1: +  struct fsnotify_mark fsn_mark;
1: +  int wd;
1:  };
1:  
1:  struct dnotify_struct {
1: -	struct dnotify_struct *dn_next;
1: -	__u32 dn_mask;
1: -	int dn_fd;
1: -	struct file *dn_filp;
1: -	fl_owner_t dn_owner;
1: +  struct dnotify_struct *dn_next;
1: +  __u32 dn_mask;
1: +  int dn_fd;
1: +  struct file *dn_filp;
1: +  fl_owner_t dn_owner;
1:  };
1:  
1:  struct dnotify_mark {
1: -	struct fsnotify_mark fsn_mark;
1: -	struct dnotify_struct *dn;
1: +  struct fsnotify_mark fsn_mark;
1: +  struct dnotify_struct *dn;
1:  };
1:  
1:  struct inotify_event_info {
1: -	struct fsnotify_event fse;
1: -	u32 mask;
1: -	int wd;
1: -	u32 sync_cookie;
1: -	int name_len;
1: -	char name[0];
1: +  struct fsnotify_event fse;
1: +  u32 mask;
1: +  int wd;
1: +  u32 sync_cookie;
1: +  int name_len;
1: +  char name[0];
1:  };
1:  
1:  struct inotify_event {
1: -	__s32 wd;
1: -	__u32 mask;
1: -	__u32 cookie;
1: -	__u32 len;
1: -	char name[0];
1: +  __s32 wd;
1: +  __u32 mask;
1: +  __u32 cookie;
1: +  __u32 len;
1: +  char name[0];
1:  };
1:  
1:  struct epoll_event {
1: -	__poll_t events;
1: -	__u64 data;
1: +  __poll_t events;
1: +  __u64 data;
1:  } __attribute__((packed));
1:  
1:  struct epoll_filefd {
1: -	struct file *file;
1: -	int fd;
1: +  struct file *file;
1: +  int fd;
1:  } __attribute__((packed));
1:  
1:  struct nested_call_node {
1: -	struct list_head llink;
1: -	void *cookie;
1: -	void *ctx;
1: +  struct list_head llink;
1: +  void *cookie;
1: +  void *ctx;
1:  };
1:  
1:  struct nested_calls {
1: -	struct list_head tasks_call_list;
1: -	spinlock_t lock;
1: +  struct list_head tasks_call_list;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct eventpoll;
1:  
1:  struct epitem {
1: -	union {
1: -		struct rb_node rbn;
1: -		struct callback_head rcu;
1: -	};
1: -	struct list_head rdllink;
1: -	struct epitem *next;
1: -	struct epoll_filefd ffd;
1: -	int nwait;
1: -	struct list_head pwqlist;
1: -	struct eventpoll *ep;
1: -	struct list_head fllink;
1: -	struct wakeup_source *ws;
1: -	struct epoll_event event;
1: +  union {
1: +    struct rb_node rbn;
1: +    struct callback_head rcu;
1: +  };
1: +  struct list_head rdllink;
1: +  struct epitem *next;
1: +  struct epoll_filefd ffd;
1: +  int nwait;
1: +  struct list_head pwqlist;
1: +  struct eventpoll *ep;
1: +  struct list_head fllink;
1: +  struct wakeup_source *ws;
1: +  struct epoll_event event;
1:  };
1:  
1:  struct eventpoll {
1: -	struct mutex mtx;
1: -	wait_queue_head_t wq;
1: -	wait_queue_head_t poll_wait;
1: -	struct list_head rdllist;
1: -	rwlock_t lock;
1: -	struct rb_root_cached rbr;
1: -	struct epitem *ovflist;
1: -	struct wakeup_source *ws;
1: -	struct user_struct *user;
1: -	struct file *file;
1: -	u64 gen;
1: -	unsigned int napi_id;
1: +  struct mutex mtx;
1: +  wait_queue_head_t wq;
1: +  wait_queue_head_t poll_wait;
1: +  struct list_head rdllist;
1: +  rwlock_t lock;
1: +  struct rb_root_cached rbr;
1: +  struct epitem *ovflist;
1: +  struct wakeup_source *ws;
1: +  struct user_struct *user;
1: +  struct file *file;
1: +  u64 gen;
1: +  unsigned int napi_id;
1:  };
1:  
1:  struct eppoll_entry {
1: -	struct list_head llink;
1: -	struct epitem *base;
1: -	wait_queue_entry_t wait;
1: -	wait_queue_head_t *whead;
1: +  struct list_head llink;
1: +  struct epitem *base;
1: +  wait_queue_entry_t wait;
1: +  wait_queue_head_t *whead;
1:  };
1:  
1:  struct ep_pqueue {
1: -	poll_table pt;
1: -	struct epitem *epi;
1: +  poll_table pt;
1: +  struct epitem *epi;
1:  };
1:  
1:  struct ep_send_events_data {
1: -	int maxevents;
1: -	struct epoll_event *events;
1: -	int res;
1: +  int maxevents;
1: +  struct epoll_event *events;
1: +  int res;
1:  };
1:  
1:  struct signalfd_siginfo {
1: -	__u32 ssi_signo;
1: -	__s32 ssi_errno;
1: -	__s32 ssi_code;
1: -	__u32 ssi_pid;
1: -	__u32 ssi_uid;
1: -	__s32 ssi_fd;
1: -	__u32 ssi_tid;
1: -	__u32 ssi_band;
1: -	__u32 ssi_overrun;
1: -	__u32 ssi_trapno;
1: -	__s32 ssi_status;
1: -	__s32 ssi_int;
1: -	__u64 ssi_ptr;
1: -	__u64 ssi_utime;
1: -	__u64 ssi_stime;
1: -	__u64 ssi_addr;
1: -	__u16 ssi_addr_lsb;
1: -	__u16 __pad2;
1: -	__s32 ssi_syscall;
1: -	__u64 ssi_call_addr;
1: -	__u32 ssi_arch;
1: -	__u8 __pad[28];
1: +  __u32 ssi_signo;
1: +  __s32 ssi_errno;
1: +  __s32 ssi_code;
1: +  __u32 ssi_pid;
1: +  __u32 ssi_uid;
1: +  __s32 ssi_fd;
1: +  __u32 ssi_tid;
1: +  __u32 ssi_band;
1: +  __u32 ssi_overrun;
1: +  __u32 ssi_trapno;
1: +  __s32 ssi_status;
1: +  __s32 ssi_int;
1: +  __u64 ssi_ptr;
1: +  __u64 ssi_utime;
1: +  __u64 ssi_stime;
1: +  __u64 ssi_addr;
1: +  __u16 ssi_addr_lsb;
1: +  __u16 __pad2;
1: +  __s32 ssi_syscall;
1: +  __u64 ssi_call_addr;
1: +  __u32 ssi_arch;
1: +  __u8 __pad[28];
1:  };
1:  
1:  struct signalfd_ctx {
1: -	sigset_t sigmask;
1: +  sigset_t sigmask;
1:  };
1:  
1:  struct timerfd_ctx {
1: -	union {
1: -		struct hrtimer tmr;
1: -		struct alarm alarm;
1: -	} t;
1: -	ktime_t tintv;
1: -	ktime_t moffs;
1: -	wait_queue_head_t wqh;
1: -	u64 ticks;
1: -	int clockid;
1: -	short unsigned int expired;
1: -	short unsigned int settime_flags;
1: -	struct callback_head rcu;
1: -	struct list_head clist;
1: -	spinlock_t cancel_lock;
1: -	bool might_cancel;
1: +  union {
1: +    struct hrtimer tmr;
1: +    struct alarm alarm;
1: +  } t;
1: +  ktime_t tintv;
1: +  ktime_t moffs;
1: +  wait_queue_head_t wqh;
1: +  u64 ticks;
1: +  int clockid;
1: +  short unsigned int expired;
1: +  short unsigned int settime_flags;
1: +  struct callback_head rcu;
1: +  struct list_head clist;
1: +  spinlock_t cancel_lock;
1: +  bool might_cancel;
1:  };
1:  
1:  struct eventfd_ctx___2 {
1: -	struct kref kref;
1: -	wait_queue_head_t wqh;
1: -	__u64 count;
1: -	unsigned int flags;
1: -	int id;
1: +  struct kref kref;
1: +  wait_queue_head_t wqh;
1: +  __u64 count;
1: +  unsigned int flags;
1: +  int id;
1:  };
1:  
1:  struct kioctx;
1:  
1:  struct kioctx_table {
1: -	struct callback_head rcu;
1: -	unsigned int nr;
1: -	struct kioctx *table[0];
1: +  struct callback_head rcu;
1: +  unsigned int nr;
1: +  struct kioctx *table[0];
1:  };
1:  
1:  typedef __kernel_ulong_t aio_context_t;
1:  
1:  enum {
1: -	IOCB_CMD_PREAD = 0,
1: -	IOCB_CMD_PWRITE = 1,
1: -	IOCB_CMD_FSYNC = 2,
1: -	IOCB_CMD_FDSYNC = 3,
1: -	IOCB_CMD_POLL = 5,
1: -	IOCB_CMD_NOOP = 6,
1: -	IOCB_CMD_PREADV = 7,
1: -	IOCB_CMD_PWRITEV = 8,
1: +  IOCB_CMD_PREAD = 0,
1: +  IOCB_CMD_PWRITE = 1,
1: +  IOCB_CMD_FSYNC = 2,
1: +  IOCB_CMD_FDSYNC = 3,
1: +  IOCB_CMD_POLL = 5,
1: +  IOCB_CMD_NOOP = 6,
1: +  IOCB_CMD_PREADV = 7,
1: +  IOCB_CMD_PWRITEV = 8,
1:  };
1:  
1:  struct io_event {
1: -	__u64 data;
1: -	__u64 obj;
1: -	__s64 res;
1: -	__s64 res2;
1: +  __u64 data;
1: +  __u64 obj;
1: +  __s64 res;
1: +  __s64 res2;
1:  };
1:  
1:  struct iocb {
1: -	__u64 aio_data;
1: -	__u32 aio_key;
1: -	__kernel_rwf_t aio_rw_flags;
1: -	__u16 aio_lio_opcode;
1: -	__s16 aio_reqprio;
1: -	__u32 aio_fildes;
1: -	__u64 aio_buf;
1: -	__u64 aio_nbytes;
1: -	__s64 aio_offset;
1: -	__u64 aio_reserved2;
1: -	__u32 aio_flags;
1: -	__u32 aio_resfd;
1: +  __u64 aio_data;
1: +  __u32 aio_key;
1: +  __kernel_rwf_t aio_rw_flags;
1: +  __u16 aio_lio_opcode;
1: +  __s16 aio_reqprio;
1: +  __u32 aio_fildes;
1: +  __u64 aio_buf;
1: +  __u64 aio_nbytes;
1: +  __s64 aio_offset;
1: +  __u64 aio_reserved2;
1: +  __u32 aio_flags;
1: +  __u32 aio_resfd;
1:  };
1:  
1:  typedef u32 compat_aio_context_t;
1: @@ -42125,15 +42606,15 @@ typedef u32 compat_aio_context_t;
1:  typedef int kiocb_cancel_fn(struct kiocb *);
1:  
1:  struct aio_ring {
1: -	unsigned int id;
1: -	unsigned int nr;
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	unsigned int magic;
1: -	unsigned int compat_features;
1: -	unsigned int incompat_features;
1: -	unsigned int header_length;
1: -	struct io_event io_events[0];
1: +  unsigned int id;
1: +  unsigned int nr;
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  unsigned int magic;
1: +  unsigned int compat_features;
1: +  unsigned int incompat_features;
1: +  unsigned int header_length;
1: +  struct io_event io_events[0];
1:  };
1:  
1:  struct kioctx_cpu;
1: @@ -42141,302 +42622,302 @@ struct kioctx_cpu;
1:  struct ctx_rq_wait;
1:  
1:  struct kioctx {
1: -	struct percpu_ref users;
1: -	atomic_t dead;
1: -	struct percpu_ref reqs;
1: -	long unsigned int user_id;
1: -	struct kioctx_cpu *cpu;
1: -	unsigned int req_batch;
1: -	unsigned int max_reqs;
1: -	unsigned int nr_events;
1: -	long unsigned int mmap_base;
1: -	long unsigned int mmap_size;
1: -	struct page **ring_pages;
1: -	long int nr_pages;
1: -	struct rcu_work free_rwork;
1: -	struct ctx_rq_wait *rq_wait;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct {
1: -		atomic_t reqs_available;
1: -		long: 32;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct {
1: -		spinlock_t ctx_lock;
1: -		struct list_head active_reqs;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct {
1: -		struct mutex ring_lock;
1: -		wait_queue_head_t wait;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct {
1: -		unsigned int tail;
1: -		unsigned int completed_events;
1: -		spinlock_t completion_lock;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct page *internal_pages[8];
1: -	struct file *aio_ring_file;
1: -	unsigned int id;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct percpu_ref users;
1: +  atomic_t dead;
1: +  struct percpu_ref reqs;
1: +  long unsigned int user_id;
1: +  struct kioctx_cpu *cpu;
1: +  unsigned int req_batch;
1: +  unsigned int max_reqs;
1: +  unsigned int nr_events;
1: +  long unsigned int mmap_base;
1: +  long unsigned int mmap_size;
1: +  struct page **ring_pages;
1: +  long int nr_pages;
1: +  struct rcu_work free_rwork;
1: +  struct ctx_rq_wait *rq_wait;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct {
1: +    atomic_t reqs_available;
1: +    long : 32;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct {
1: +    spinlock_t ctx_lock;
1: +    struct list_head active_reqs;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct {
1: +    struct mutex ring_lock;
1: +    wait_queue_head_t wait;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct {
1: +    unsigned int tail;
1: +    unsigned int completed_events;
1: +    spinlock_t completion_lock;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct page *internal_pages[8];
1: +  struct file *aio_ring_file;
1: +  unsigned int id;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct kioctx_cpu {
1: -	unsigned int reqs_available;
1: +  unsigned int reqs_available;
1:  };
1:  
1:  struct ctx_rq_wait {
1: -	struct completion comp;
1: -	atomic_t count;
1: +  struct completion comp;
1: +  atomic_t count;
1:  };
1:  
1:  struct fsync_iocb {
1: -	struct file *file;
1: -	struct work_struct work;
1: -	bool datasync;
1: -	struct cred *creds;
1: +  struct file *file;
1: +  struct work_struct work;
1: +  bool datasync;
1: +  struct cred *creds;
1:  };
1:  
1:  struct poll_iocb {
1: -	struct file *file;
1: -	struct wait_queue_head *head;
1: -	__poll_t events;
1: -	bool done;
1: -	bool cancelled;
1: -	struct wait_queue_entry wait;
1: -	struct work_struct work;
1: +  struct file *file;
1: +  struct wait_queue_head *head;
1: +  __poll_t events;
1: +  bool done;
1: +  bool cancelled;
1: +  struct wait_queue_entry wait;
1: +  struct work_struct work;
1:  };
1:  
1:  struct aio_kiocb {
1: -	union {
1: -		struct file *ki_filp;
1: -		struct kiocb rw;
1: -		struct fsync_iocb fsync;
1: -		struct poll_iocb poll;
1: -	};
1: -	struct kioctx *ki_ctx;
1: -	kiocb_cancel_fn *ki_cancel;
1: -	struct io_event ki_res;
1: -	struct list_head ki_list;
1: -	refcount_t ki_refcnt;
1: -	struct eventfd_ctx *ki_eventfd;
1: +  union {
1: +    struct file *ki_filp;
1: +    struct kiocb rw;
1: +    struct fsync_iocb fsync;
1: +    struct poll_iocb poll;
1: +  };
1: +  struct kioctx *ki_ctx;
1: +  kiocb_cancel_fn *ki_cancel;
1: +  struct io_event ki_res;
1: +  struct list_head ki_list;
1: +  refcount_t ki_refcnt;
1: +  struct eventfd_ctx *ki_eventfd;
1:  };
1:  
1:  struct aio_poll_table {
1: -	struct poll_table_struct pt;
1: -	struct aio_kiocb *iocb;
1: -	int error;
1: +  struct poll_table_struct pt;
1: +  struct aio_kiocb *iocb;
1: +  int error;
1:  };
1:  
1:  struct __aio_sigset {
1: -	const sigset_t *sigmask;
1: -	size_t sigsetsize;
1: +  const sigset_t *sigmask;
1: +  size_t sigsetsize;
1:  };
1:  
1:  struct __compat_aio_sigset {
1: -	compat_uptr_t sigmask;
1: -	compat_size_t sigsetsize;
1: +  compat_uptr_t sigmask;
1: +  compat_size_t sigsetsize;
1:  };
1:  
1:  enum {
1: -	PERCPU_REF_INIT_ATOMIC = 1,
1: -	PERCPU_REF_INIT_DEAD = 2,
1: -	PERCPU_REF_ALLOW_REINIT = 4,
1: +  PERCPU_REF_INIT_ATOMIC = 1,
1: +  PERCPU_REF_INIT_DEAD = 2,
1: +  PERCPU_REF_ALLOW_REINIT = 4,
1:  };
1:  
1:  struct user_msghdr {
1: -	void *msg_name;
1: -	int msg_namelen;
1: -	struct iovec *msg_iov;
1: -	__kernel_size_t msg_iovlen;
1: -	void *msg_control;
1: -	__kernel_size_t msg_controllen;
1: -	unsigned int msg_flags;
1: +  void *msg_name;
1: +  int msg_namelen;
1: +  struct iovec *msg_iov;
1: +  __kernel_size_t msg_iovlen;
1: +  void *msg_control;
1: +  __kernel_size_t msg_controllen;
1: +  unsigned int msg_flags;
1:  };
1:  
1:  typedef s32 compat_ssize_t;
1:  
1:  struct compat_msghdr {
1: -	compat_uptr_t msg_name;
1: -	compat_int_t msg_namelen;
1: -	compat_uptr_t msg_iov;
1: -	compat_size_t msg_iovlen;
1: -	compat_uptr_t msg_control;
1: -	compat_size_t msg_controllen;
1: -	compat_uint_t msg_flags;
1: +  compat_uptr_t msg_name;
1: +  compat_int_t msg_namelen;
1: +  compat_uptr_t msg_iov;
1: +  compat_size_t msg_iovlen;
1: +  compat_uptr_t msg_control;
1: +  compat_size_t msg_controllen;
1: +  compat_uint_t msg_flags;
1:  };
1:  
1:  struct scm_fp_list {
1: -	short int count;
1: -	short int max;
1: -	struct user_struct *user;
1: -	struct file *fp[253];
1: +  short int count;
1: +  short int max;
1: +  struct user_struct *user;
1: +  struct file *fp[253];
1:  };
1:  
1:  struct unix_skb_parms {
1: -	struct pid *pid;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	struct scm_fp_list *fp;
1: -	u32 secid;
1: -	u32 consumed;
1: +  struct pid *pid;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  struct scm_fp_list *fp;
1: +  u32 secid;
1: +  u32 consumed;
1:  };
1:  
1:  struct trace_event_raw_io_uring_create {
1: -	struct trace_entry ent;
1: -	int fd;
1: -	void *ctx;
1: -	u32 sq_entries;
1: -	u32 cq_entries;
1: -	u32 flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int fd;
1: +  void *ctx;
1: +  u32 sq_entries;
1: +  u32 cq_entries;
1: +  u32 flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_register {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	unsigned int opcode;
1: -	unsigned int nr_files;
1: -	unsigned int nr_bufs;
1: -	bool eventfd;
1: -	long int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  unsigned int opcode;
1: +  unsigned int nr_files;
1: +  unsigned int nr_bufs;
1: +  bool eventfd;
1: +  long int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_file_get {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	int fd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  int fd;
1: +  char __data[0];
1:  };
1:  
1:  struct io_wq_work;
1:  
1:  struct trace_event_raw_io_uring_queue_async_work {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	int rw;
1: -	void *req;
1: -	struct io_wq_work *work;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  int rw;
1: +  void *req;
1: +  struct io_wq_work *work;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct io_wq_work_node {
1: -	struct io_wq_work_node *next;
1: +  struct io_wq_work_node *next;
1:  };
1:  
1:  struct io_wq_work {
1: -	struct io_wq_work_node list;
1: -	struct io_identity *identity;
1: -	unsigned int flags;
1: +  struct io_wq_work_node list;
1: +  struct io_identity *identity;
1: +  unsigned int flags;
1:  };
1:  
1:  struct trace_event_raw_io_uring_defer {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	void *req;
1: -	long long unsigned int data;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  void *req;
1: +  long long unsigned int data;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_link {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	void *req;
1: -	void *target_req;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  void *req;
1: +  void *target_req;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_cqring_wait {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	int min_events;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  int min_events;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_fail_link {
1: -	struct trace_entry ent;
1: -	void *req;
1: -	void *link;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *req;
1: +  void *link;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_complete {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	u64 user_data;
1: -	long int res;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  u64 user_data;
1: +  long int res;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_submit_sqe {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	u8 opcode;
1: -	u64 user_data;
1: -	bool force_nonblock;
1: -	bool sq_thread;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  u8 opcode;
1: +  u64 user_data;
1: +  bool force_nonblock;
1: +  bool sq_thread;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_poll_arm {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	u8 opcode;
1: -	u64 user_data;
1: -	int mask;
1: -	int events;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  u8 opcode;
1: +  u64 user_data;
1: +  int mask;
1: +  int events;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_poll_wake {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	u8 opcode;
1: -	u64 user_data;
1: -	int mask;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  u8 opcode;
1: +  u64 user_data;
1: +  int mask;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_task_add {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	u8 opcode;
1: -	u64 user_data;
1: -	int mask;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  u8 opcode;
1: +  u64 user_data;
1: +  int mask;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_io_uring_task_run {
1: -	struct trace_entry ent;
1: -	void *ctx;
1: -	u8 opcode;
1: -	u64 user_data;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *ctx;
1: +  u8 opcode;
1: +  u64 user_data;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_io_uring_create {};
1: @@ -42469,13 +42950,18 @@ struct trace_event_data_offsets_io_uring_task_run {};
1:  
1:  typedef void (*btf_trace_io_uring_create)(void *, int, void *, u32, u32, u32);
1:  
1: -typedef void (*btf_trace_io_uring_register)(void *, void *, unsigned int, unsigned int, unsigned int, bool, long int);
1: +typedef void (*btf_trace_io_uring_register)(void *, void *, unsigned int,
1: +                                            unsigned int, unsigned int, bool,
1: +                                            long int);
1:  
1:  typedef void (*btf_trace_io_uring_file_get)(void *, void *, int);
1:  
1: -typedef void (*btf_trace_io_uring_queue_async_work)(void *, void *, int, void *, struct io_wq_work *, unsigned int);
1: +typedef void (*btf_trace_io_uring_queue_async_work)(void *, void *, int, void *,
1: +                                                    struct io_wq_work *,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_io_uring_defer)(void *, void *, void *, long long unsigned int);
1: +typedef void (*btf_trace_io_uring_defer)(void *, void *, void *,
1: +                                         long long unsigned int);
1:  
1:  typedef void (*btf_trace_io_uring_link)(void *, void *, void *, void *);
1:  
1: @@ -42485,7 +42971,8 @@ typedef void (*btf_trace_io_uring_fail_link)(void *, void *, void *);
1:  
1:  typedef void (*btf_trace_io_uring_complete)(void *, void *, u64, long int);
1:  
1: -typedef void (*btf_trace_io_uring_submit_sqe)(void *, void *, u8, u64, bool, bool);
1: +typedef void (*btf_trace_io_uring_submit_sqe)(void *, void *, u8, u64, bool,
1: +                                              bool);
1:  
1:  typedef void (*btf_trace_io_uring_poll_arm)(void *, void *, u8, u64, int, int);
1:  
1: @@ -42496,218 +42983,218 @@ typedef void (*btf_trace_io_uring_task_add)(void *, void *, u8, u64, int);
1:  typedef void (*btf_trace_io_uring_task_run)(void *, void *, u8, u64);
1:  
1:  struct io_uring_sqe {
1: -	__u8 opcode;
1: -	__u8 flags;
1: -	__u16 ioprio;
1: -	__s32 fd;
1: -	union {
1: -		__u64 off;
1: -		__u64 addr2;
1: -	};
1: -	union {
1: -		__u64 addr;
1: -		__u64 splice_off_in;
1: -	};
1: -	__u32 len;
1: -	union {
1: -		__kernel_rwf_t rw_flags;
1: -		__u32 fsync_flags;
1: -		__u16 poll_events;
1: -		__u32 poll32_events;
1: -		__u32 sync_range_flags;
1: -		__u32 msg_flags;
1: -		__u32 timeout_flags;
1: -		__u32 accept_flags;
1: -		__u32 cancel_flags;
1: -		__u32 open_flags;
1: -		__u32 statx_flags;
1: -		__u32 fadvise_advice;
1: -		__u32 splice_flags;
1: -	};
1: -	__u64 user_data;
1: -	union {
1: -		struct {
1: -			union {
1: -				__u16 buf_index;
1: -				__u16 buf_group;
1: -			};
1: -			__u16 personality;
1: -			__s32 splice_fd_in;
1: -		};
1: -		__u64 __pad2[3];
1: -	};
1: -};
1: -
1: -enum {
1: -	IOSQE_FIXED_FILE_BIT = 0,
1: -	IOSQE_IO_DRAIN_BIT = 1,
1: -	IOSQE_IO_LINK_BIT = 2,
1: -	IOSQE_IO_HARDLINK_BIT = 3,
1: -	IOSQE_ASYNC_BIT = 4,
1: -	IOSQE_BUFFER_SELECT_BIT = 5,
1: -};
1: -
1: -enum {
1: -	IORING_OP_NOP = 0,
1: -	IORING_OP_READV = 1,
1: -	IORING_OP_WRITEV = 2,
1: -	IORING_OP_FSYNC = 3,
1: -	IORING_OP_READ_FIXED = 4,
1: -	IORING_OP_WRITE_FIXED = 5,
1: -	IORING_OP_POLL_ADD = 6,
1: -	IORING_OP_POLL_REMOVE = 7,
1: -	IORING_OP_SYNC_FILE_RANGE = 8,
1: -	IORING_OP_SENDMSG = 9,
1: -	IORING_OP_RECVMSG = 10,
1: -	IORING_OP_TIMEOUT = 11,
1: -	IORING_OP_TIMEOUT_REMOVE = 12,
1: -	IORING_OP_ACCEPT = 13,
1: -	IORING_OP_ASYNC_CANCEL = 14,
1: -	IORING_OP_LINK_TIMEOUT = 15,
1: -	IORING_OP_CONNECT = 16,
1: -	IORING_OP_FALLOCATE = 17,
1: -	IORING_OP_OPENAT = 18,
1: -	IORING_OP_CLOSE = 19,
1: -	IORING_OP_FILES_UPDATE = 20,
1: -	IORING_OP_STATX = 21,
1: -	IORING_OP_READ = 22,
1: -	IORING_OP_WRITE = 23,
1: -	IORING_OP_FADVISE = 24,
1: -	IORING_OP_MADVISE = 25,
1: -	IORING_OP_SEND = 26,
1: -	IORING_OP_RECV = 27,
1: -	IORING_OP_OPENAT2 = 28,
1: -	IORING_OP_EPOLL_CTL = 29,
1: -	IORING_OP_SPLICE = 30,
1: -	IORING_OP_PROVIDE_BUFFERS = 31,
1: -	IORING_OP_REMOVE_BUFFERS = 32,
1: -	IORING_OP_TEE = 33,
1: -	IORING_OP_LAST = 34,
1: +  __u8 opcode;
1: +  __u8 flags;
1: +  __u16 ioprio;
1: +  __s32 fd;
1: +  union {
1: +    __u64 off;
1: +    __u64 addr2;
1: +  };
1: +  union {
1: +    __u64 addr;
1: +    __u64 splice_off_in;
1: +  };
1: +  __u32 len;
1: +  union {
1: +    __kernel_rwf_t rw_flags;
1: +    __u32 fsync_flags;
1: +    __u16 poll_events;
1: +    __u32 poll32_events;
1: +    __u32 sync_range_flags;
1: +    __u32 msg_flags;
1: +    __u32 timeout_flags;
1: +    __u32 accept_flags;
1: +    __u32 cancel_flags;
1: +    __u32 open_flags;
1: +    __u32 statx_flags;
1: +    __u32 fadvise_advice;
1: +    __u32 splice_flags;
1: +  };
1: +  __u64 user_data;
1: +  union {
1: +    struct {
1: +      union {
1: +        __u16 buf_index;
1: +        __u16 buf_group;
1: +      };
1: +      __u16 personality;
1: +      __s32 splice_fd_in;
1: +    };
1: +    __u64 __pad2[3];
1: +  };
1: +};
1: +
1: +enum {
1: +  IOSQE_FIXED_FILE_BIT = 0,
1: +  IOSQE_IO_DRAIN_BIT = 1,
1: +  IOSQE_IO_LINK_BIT = 2,
1: +  IOSQE_IO_HARDLINK_BIT = 3,
1: +  IOSQE_ASYNC_BIT = 4,
1: +  IOSQE_BUFFER_SELECT_BIT = 5,
1: +};
1: +
1: +enum {
1: +  IORING_OP_NOP = 0,
1: +  IORING_OP_READV = 1,
1: +  IORING_OP_WRITEV = 2,
1: +  IORING_OP_FSYNC = 3,
1: +  IORING_OP_READ_FIXED = 4,
1: +  IORING_OP_WRITE_FIXED = 5,
1: +  IORING_OP_POLL_ADD = 6,
1: +  IORING_OP_POLL_REMOVE = 7,
1: +  IORING_OP_SYNC_FILE_RANGE = 8,
1: +  IORING_OP_SENDMSG = 9,
1: +  IORING_OP_RECVMSG = 10,
1: +  IORING_OP_TIMEOUT = 11,
1: +  IORING_OP_TIMEOUT_REMOVE = 12,
1: +  IORING_OP_ACCEPT = 13,
1: +  IORING_OP_ASYNC_CANCEL = 14,
1: +  IORING_OP_LINK_TIMEOUT = 15,
1: +  IORING_OP_CONNECT = 16,
1: +  IORING_OP_FALLOCATE = 17,
1: +  IORING_OP_OPENAT = 18,
1: +  IORING_OP_CLOSE = 19,
1: +  IORING_OP_FILES_UPDATE = 20,
1: +  IORING_OP_STATX = 21,
1: +  IORING_OP_READ = 22,
1: +  IORING_OP_WRITE = 23,
1: +  IORING_OP_FADVISE = 24,
1: +  IORING_OP_MADVISE = 25,
1: +  IORING_OP_SEND = 26,
1: +  IORING_OP_RECV = 27,
1: +  IORING_OP_OPENAT2 = 28,
1: +  IORING_OP_EPOLL_CTL = 29,
1: +  IORING_OP_SPLICE = 30,
1: +  IORING_OP_PROVIDE_BUFFERS = 31,
1: +  IORING_OP_REMOVE_BUFFERS = 32,
1: +  IORING_OP_TEE = 33,
1: +  IORING_OP_LAST = 34,
1:  };
1:  
1:  struct io_uring_cqe {
1: -	__u64 user_data;
1: -	__s32 res;
1: -	__u32 flags;
1: +  __u64 user_data;
1: +  __s32 res;
1: +  __u32 flags;
1:  };
1:  
1:  enum {
1: -	IORING_CQE_BUFFER_SHIFT = 16,
1: +  IORING_CQE_BUFFER_SHIFT = 16,
1:  };
1:  
1:  struct io_sqring_offsets {
1: -	__u32 head;
1: -	__u32 tail;
1: -	__u32 ring_mask;
1: -	__u32 ring_entries;
1: -	__u32 flags;
1: -	__u32 dropped;
1: -	__u32 array;
1: -	__u32 resv1;
1: -	__u64 resv2;
1: +  __u32 head;
1: +  __u32 tail;
1: +  __u32 ring_mask;
1: +  __u32 ring_entries;
1: +  __u32 flags;
1: +  __u32 dropped;
1: +  __u32 array;
1: +  __u32 resv1;
1: +  __u64 resv2;
1:  };
1:  
1:  struct io_cqring_offsets {
1: -	__u32 head;
1: -	__u32 tail;
1: -	__u32 ring_mask;
1: -	__u32 ring_entries;
1: -	__u32 overflow;
1: -	__u32 cqes;
1: -	__u32 flags;
1: -	__u32 resv1;
1: -	__u64 resv2;
1: +  __u32 head;
1: +  __u32 tail;
1: +  __u32 ring_mask;
1: +  __u32 ring_entries;
1: +  __u32 overflow;
1: +  __u32 cqes;
1: +  __u32 flags;
1: +  __u32 resv1;
1: +  __u64 resv2;
1:  };
1:  
1:  struct io_uring_params {
1: -	__u32 sq_entries;
1: -	__u32 cq_entries;
1: -	__u32 flags;
1: -	__u32 sq_thread_cpu;
1: -	__u32 sq_thread_idle;
1: -	__u32 features;
1: -	__u32 wq_fd;
1: -	__u32 resv[3];
1: -	struct io_sqring_offsets sq_off;
1: -	struct io_cqring_offsets cq_off;
1: -};
1: -
1: -enum {
1: -	IORING_REGISTER_BUFFERS = 0,
1: -	IORING_UNREGISTER_BUFFERS = 1,
1: -	IORING_REGISTER_FILES = 2,
1: -	IORING_UNREGISTER_FILES = 3,
1: -	IORING_REGISTER_EVENTFD = 4,
1: -	IORING_UNREGISTER_EVENTFD = 5,
1: -	IORING_REGISTER_FILES_UPDATE = 6,
1: -	IORING_REGISTER_EVENTFD_ASYNC = 7,
1: -	IORING_REGISTER_PROBE = 8,
1: -	IORING_REGISTER_PERSONALITY = 9,
1: -	IORING_UNREGISTER_PERSONALITY = 10,
1: -	IORING_REGISTER_RESTRICTIONS = 11,
1: -	IORING_REGISTER_ENABLE_RINGS = 12,
1: -	IORING_REGISTER_LAST = 13,
1: +  __u32 sq_entries;
1: +  __u32 cq_entries;
1: +  __u32 flags;
1: +  __u32 sq_thread_cpu;
1: +  __u32 sq_thread_idle;
1: +  __u32 features;
1: +  __u32 wq_fd;
1: +  __u32 resv[3];
1: +  struct io_sqring_offsets sq_off;
1: +  struct io_cqring_offsets cq_off;
1: +};
1: +
1: +enum {
1: +  IORING_REGISTER_BUFFERS = 0,
1: +  IORING_UNREGISTER_BUFFERS = 1,
1: +  IORING_REGISTER_FILES = 2,
1: +  IORING_UNREGISTER_FILES = 3,
1: +  IORING_REGISTER_EVENTFD = 4,
1: +  IORING_UNREGISTER_EVENTFD = 5,
1: +  IORING_REGISTER_FILES_UPDATE = 6,
1: +  IORING_REGISTER_EVENTFD_ASYNC = 7,
1: +  IORING_REGISTER_PROBE = 8,
1: +  IORING_REGISTER_PERSONALITY = 9,
1: +  IORING_UNREGISTER_PERSONALITY = 10,
1: +  IORING_REGISTER_RESTRICTIONS = 11,
1: +  IORING_REGISTER_ENABLE_RINGS = 12,
1: +  IORING_REGISTER_LAST = 13,
1:  };
1:  
1:  struct io_uring_files_update {
1: -	__u32 offset;
1: -	__u32 resv;
1: -	__u64 fds;
1: +  __u32 offset;
1: +  __u32 resv;
1: +  __u64 fds;
1:  };
1:  
1:  struct io_uring_probe_op {
1: -	__u8 op;
1: -	__u8 resv;
1: -	__u16 flags;
1: -	__u32 resv2;
1: +  __u8 op;
1: +  __u8 resv;
1: +  __u16 flags;
1: +  __u32 resv2;
1:  };
1:  
1:  struct io_uring_probe {
1: -	__u8 last_op;
1: -	__u8 ops_len;
1: -	__u16 resv;
1: -	__u32 resv2[3];
1: -	struct io_uring_probe_op ops[0];
1: +  __u8 last_op;
1: +  __u8 ops_len;
1: +  __u16 resv;
1: +  __u32 resv2[3];
1: +  struct io_uring_probe_op ops[0];
1:  };
1:  
1:  struct io_uring_restriction {
1: -	__u16 opcode;
1: -	union {
1: -		__u8 register_op;
1: -		__u8 sqe_op;
1: -		__u8 sqe_flags;
1: -	};
1: -	__u8 resv;
1: -	__u32 resv2[3];
1: +  __u16 opcode;
1: +  union {
1: +    __u8 register_op;
1: +    __u8 sqe_op;
1: +    __u8 sqe_flags;
1: +  };
1: +  __u8 resv;
1: +  __u32 resv2[3];
1:  };
1:  
1:  enum {
1: -	IORING_RESTRICTION_REGISTER_OP = 0,
1: -	IORING_RESTRICTION_SQE_OP = 1,
1: -	IORING_RESTRICTION_SQE_FLAGS_ALLOWED = 2,
1: -	IORING_RESTRICTION_SQE_FLAGS_REQUIRED = 3,
1: -	IORING_RESTRICTION_LAST = 4,
1: +  IORING_RESTRICTION_REGISTER_OP = 0,
1: +  IORING_RESTRICTION_SQE_OP = 1,
1: +  IORING_RESTRICTION_SQE_FLAGS_ALLOWED = 2,
1: +  IORING_RESTRICTION_SQE_FLAGS_REQUIRED = 3,
1: +  IORING_RESTRICTION_LAST = 4,
1:  };
1:  
1:  enum {
1: -	IO_WQ_WORK_CANCEL = 1,
1: -	IO_WQ_WORK_HASHED = 2,
1: -	IO_WQ_WORK_UNBOUND = 4,
1: -	IO_WQ_WORK_NO_CANCEL = 8,
1: -	IO_WQ_WORK_CONCURRENT = 16,
1: -	IO_WQ_WORK_FILES = 32,
1: -	IO_WQ_WORK_FS = 64,
1: -	IO_WQ_WORK_MM = 128,
1: -	IO_WQ_WORK_CREDS = 256,
1: -	IO_WQ_WORK_BLKCG = 512,
1: -	IO_WQ_WORK_FSIZE = 1024,
1: -	IO_WQ_HASH_SHIFT = 24,
1: +  IO_WQ_WORK_CANCEL = 1,
1: +  IO_WQ_WORK_HASHED = 2,
1: +  IO_WQ_WORK_UNBOUND = 4,
1: +  IO_WQ_WORK_NO_CANCEL = 8,
1: +  IO_WQ_WORK_CONCURRENT = 16,
1: +  IO_WQ_WORK_FILES = 32,
1: +  IO_WQ_WORK_FS = 64,
1: +  IO_WQ_WORK_MM = 128,
1: +  IO_WQ_WORK_CREDS = 256,
1: +  IO_WQ_WORK_BLKCG = 512,
1: +  IO_WQ_WORK_FSIZE = 1024,
1: +  IO_WQ_HASH_SHIFT = 24,
1:  };
1:  
1:  enum io_wq_cancel {
1: -	IO_WQ_CANCEL_OK = 0,
1: -	IO_WQ_CANCEL_RUNNING = 1,
1: -	IO_WQ_CANCEL_NOTFOUND = 2,
1: +  IO_WQ_CANCEL_OK = 0,
1: +  IO_WQ_CANCEL_RUNNING = 1,
1: +  IO_WQ_CANCEL_NOTFOUND = 2,
1:  };
1:  
1:  typedef void free_work_fn(struct io_wq_work *);
1: @@ -42715,92 +43202,92 @@ typedef void free_work_fn(struct io_wq_work *);
1:  typedef struct io_wq_work *io_wq_work_fn(struct io_wq_work *);
1:  
1:  struct io_wq_data {
1: -	struct user_struct *user;
1: -	io_wq_work_fn *do_work;
1: -	free_work_fn *free_work;
1: +  struct user_struct *user;
1: +  io_wq_work_fn *do_work;
1: +  free_work_fn *free_work;
1:  };
1:  
1:  struct io_uring {
1: -	u32 head;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 tail;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u32 head;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 tail;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct io_rings {
1: -	struct io_uring sq;
1: -	struct io_uring cq;
1: -	u32 sq_ring_mask;
1: -	u32 cq_ring_mask;
1: -	u32 sq_ring_entries;
1: -	u32 cq_ring_entries;
1: -	u32 sq_dropped;
1: -	u32 sq_flags;
1: -	u32 cq_flags;
1: -	u32 cq_overflow;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct io_uring_cqe cqes[0];
1: +  struct io_uring sq;
1: +  struct io_uring cq;
1: +  u32 sq_ring_mask;
1: +  u32 cq_ring_mask;
1: +  u32 sq_ring_entries;
1: +  u32 cq_ring_entries;
1: +  u32 sq_dropped;
1: +  u32 sq_flags;
1: +  u32 cq_flags;
1: +  u32 cq_overflow;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct io_uring_cqe cqes[0];
1:  };
1:  
1:  struct io_mapped_ubuf {
1: -	u64 ubuf;
1: -	size_t len;
1: -	struct bio_vec *bvec;
1: -	unsigned int nr_bvecs;
1: -	long unsigned int acct_pages;
1: +  u64 ubuf;
1: +  size_t len;
1: +  struct bio_vec *bvec;
1: +  unsigned int nr_bvecs;
1: +  long unsigned int acct_pages;
1:  };
1:  
1:  struct fixed_file_table {
1: -	struct file **files;
1: +  struct file **files;
1:  };
1:  
1:  struct fixed_file_data;
1:  
1:  struct fixed_file_ref_node {
1: -	struct percpu_ref refs;
1: -	struct list_head node;
1: -	struct list_head file_list;
1: -	struct fixed_file_data *file_data;
1: -	struct llist_node llist;
1: +  struct percpu_ref refs;
1: +  struct list_head node;
1: +  struct list_head file_list;
1: +  struct fixed_file_data *file_data;
1: +  struct llist_node llist;
1:  };
1:  
1:  struct io_ring_ctx;
1:  
1:  struct fixed_file_data {
1: -	struct fixed_file_table *table;
1: -	struct io_ring_ctx *ctx;
1: -	struct fixed_file_ref_node *node;
1: -	struct percpu_ref refs;
1: -	struct completion done;
1: -	struct list_head ref_list;
1: -	spinlock_t lock;
1: +  struct fixed_file_table *table;
1: +  struct io_ring_ctx *ctx;
1: +  struct fixed_file_ref_node *node;
1: +  struct percpu_ref refs;
1: +  struct completion done;
1: +  struct list_head ref_list;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct io_wq;
1:  
1:  struct io_restriction {
1: -	long unsigned int register_op[1];
1: -	long unsigned int sqe_op[1];
1: -	u8 sqe_flags_allowed;
1: -	u8 sqe_flags_required;
1: -	bool registered;
1: +  long unsigned int register_op[1];
1: +  long unsigned int sqe_op[1];
1: +  u8 sqe_flags_allowed;
1: +  u8 sqe_flags_required;
1: +  bool registered;
1:  };
1:  
1:  struct io_sq_data;
1: @@ -42808,642 +43295,642 @@ struct io_sq_data;
1:  struct io_kiocb;
1:  
1:  struct io_ring_ctx {
1: -	struct {
1: -		struct percpu_ref refs;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct {
1: -		unsigned int flags;
1: -		unsigned int compat: 1;
1: -		unsigned int limit_mem: 1;
1: -		unsigned int cq_overflow_flushed: 1;
1: -		unsigned int drain_next: 1;
1: -		unsigned int eventfd_async: 1;
1: -		unsigned int restricted: 1;
1: -		u32 *sq_array;
1: -		unsigned int cached_sq_head;
1: -		unsigned int sq_entries;
1: -		unsigned int sq_mask;
1: -		unsigned int sq_thread_idle;
1: -		unsigned int cached_sq_dropped;
1: -		unsigned int cached_cq_overflow;
1: -		long unsigned int sq_check_overflow;
1: -		struct list_head defer_list;
1: -		struct list_head timeout_list;
1: -		struct list_head cq_overflow_list;
1: -		wait_queue_head_t inflight_wait;
1: -		struct io_uring_sqe *sq_sqes;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct io_rings *rings;
1: -	struct io_wq *io_wq;
1: -	struct task_struct *sqo_task;
1: -	struct mm_struct *mm_account;
1: -	struct cgroup_subsys_state *sqo_blkcg_css;
1: -	struct io_sq_data *sq_data;
1: -	struct wait_queue_head sqo_sq_wait;
1: -	struct wait_queue_entry sqo_wait_entry;
1: -	struct list_head sqd_list;
1: -	struct fixed_file_data *file_data;
1: -	unsigned int nr_user_files;
1: -	unsigned int nr_user_bufs;
1: -	struct io_mapped_ubuf *user_bufs;
1: -	struct user_struct *user;
1: -	const struct cred *creds;
1: -	kuid_t loginuid;
1: -	unsigned int sessionid;
1: -	struct completion ref_comp;
1: -	struct completion sq_thread_comp;
1: -	struct io_kiocb *fallback_req;
1: -	struct socket *ring_sock;
1: -	struct idr io_buffer_idr;
1: -	struct idr personality_idr;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct {
1: -		unsigned int cached_cq_tail;
1: -		unsigned int cq_entries;
1: -		unsigned int cq_mask;
1: -		atomic_t cq_timeouts;
1: -		long unsigned int cq_check_overflow;
1: -		struct wait_queue_head cq_wait;
1: -		struct fasync_struct *cq_fasync;
1: -		struct eventfd_ctx *cq_ev_fd;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct {
1: -		struct mutex uring_lock;
1: -		wait_queue_head_t wait;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct {
1: -		spinlock_t completion_lock;
1: -		struct list_head iopoll_list;
1: -		struct hlist_head *cancel_hash;
1: -		unsigned int cancel_hash_bits;
1: -		bool poll_multi_file;
1: -		spinlock_t inflight_lock;
1: -		struct list_head inflight_list;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -		long: 64;
1: -	};
1: -	struct delayed_work file_put_work;
1: -	struct llist_head file_put_llist;
1: -	struct work_struct exit_work;
1: -	struct io_restriction restrictions;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct {
1: +    struct percpu_ref refs;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct {
1: +    unsigned int flags;
1: +    unsigned int compat : 1;
1: +    unsigned int limit_mem : 1;
1: +    unsigned int cq_overflow_flushed : 1;
1: +    unsigned int drain_next : 1;
1: +    unsigned int eventfd_async : 1;
1: +    unsigned int restricted : 1;
1: +    u32 *sq_array;
1: +    unsigned int cached_sq_head;
1: +    unsigned int sq_entries;
1: +    unsigned int sq_mask;
1: +    unsigned int sq_thread_idle;
1: +    unsigned int cached_sq_dropped;
1: +    unsigned int cached_cq_overflow;
1: +    long unsigned int sq_check_overflow;
1: +    struct list_head defer_list;
1: +    struct list_head timeout_list;
1: +    struct list_head cq_overflow_list;
1: +    wait_queue_head_t inflight_wait;
1: +    struct io_uring_sqe *sq_sqes;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct io_rings *rings;
1: +  struct io_wq *io_wq;
1: +  struct task_struct *sqo_task;
1: +  struct mm_struct *mm_account;
1: +  struct cgroup_subsys_state *sqo_blkcg_css;
1: +  struct io_sq_data *sq_data;
1: +  struct wait_queue_head sqo_sq_wait;
1: +  struct wait_queue_entry sqo_wait_entry;
1: +  struct list_head sqd_list;
1: +  struct fixed_file_data *file_data;
1: +  unsigned int nr_user_files;
1: +  unsigned int nr_user_bufs;
1: +  struct io_mapped_ubuf *user_bufs;
1: +  struct user_struct *user;
1: +  const struct cred *creds;
1: +  kuid_t loginuid;
1: +  unsigned int sessionid;
1: +  struct completion ref_comp;
1: +  struct completion sq_thread_comp;
1: +  struct io_kiocb *fallback_req;
1: +  struct socket *ring_sock;
1: +  struct idr io_buffer_idr;
1: +  struct idr personality_idr;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct {
1: +    unsigned int cached_cq_tail;
1: +    unsigned int cq_entries;
1: +    unsigned int cq_mask;
1: +    atomic_t cq_timeouts;
1: +    long unsigned int cq_check_overflow;
1: +    struct wait_queue_head cq_wait;
1: +    struct fasync_struct *cq_fasync;
1: +    struct eventfd_ctx *cq_ev_fd;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct {
1: +    struct mutex uring_lock;
1: +    wait_queue_head_t wait;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct {
1: +    spinlock_t completion_lock;
1: +    struct list_head iopoll_list;
1: +    struct hlist_head *cancel_hash;
1: +    unsigned int cancel_hash_bits;
1: +    bool poll_multi_file;
1: +    spinlock_t inflight_lock;
1: +    struct list_head inflight_list;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +    long : 64;
1: +  };
1: +  struct delayed_work file_put_work;
1: +  struct llist_head file_put_llist;
1: +  struct work_struct exit_work;
1: +  struct io_restriction restrictions;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct io_buffer {
1: -	struct list_head list;
1: -	__u64 addr;
1: -	__s32 len;
1: -	__u16 bid;
1: +  struct list_head list;
1: +  __u64 addr;
1: +  __s32 len;
1: +  __u16 bid;
1:  };
1:  
1:  struct io_sq_data {
1: -	refcount_t refs;
1: -	struct mutex lock;
1: -	struct list_head ctx_list;
1: -	struct list_head ctx_new_list;
1: -	struct mutex ctx_lock;
1: -	struct task_struct *thread;
1: -	struct wait_queue_head wait;
1: +  refcount_t refs;
1: +  struct mutex lock;
1: +  struct list_head ctx_list;
1: +  struct list_head ctx_new_list;
1: +  struct mutex ctx_lock;
1: +  struct task_struct *thread;
1: +  struct wait_queue_head wait;
1:  };
1:  
1:  struct io_rw {
1: -	struct kiocb kiocb;
1: -	u64 addr;
1: -	u64 len;
1: +  struct kiocb kiocb;
1: +  u64 addr;
1: +  u64 len;
1:  };
1:  
1:  struct io_poll_iocb {
1: -	struct file *file;
1: -	union {
1: -		struct wait_queue_head *head;
1: -		u64 addr;
1: -	};
1: -	__poll_t events;
1: -	bool done;
1: -	bool canceled;
1: -	struct wait_queue_entry wait;
1: +  struct file *file;
1: +  union {
1: +    struct wait_queue_head *head;
1: +    u64 addr;
1: +  };
1: +  __poll_t events;
1: +  bool done;
1: +  bool canceled;
1: +  struct wait_queue_entry wait;
1:  };
1:  
1:  struct io_accept {
1: -	struct file *file;
1: -	struct sockaddr *addr;
1: -	int *addr_len;
1: -	int flags;
1: -	long unsigned int nofile;
1: +  struct file *file;
1: +  struct sockaddr *addr;
1: +  int *addr_len;
1: +  int flags;
1: +  long unsigned int nofile;
1:  };
1:  
1:  struct io_sync {
1: -	struct file *file;
1: -	loff_t len;
1: -	loff_t off;
1: -	int flags;
1: -	int mode;
1: +  struct file *file;
1: +  loff_t len;
1: +  loff_t off;
1: +  int flags;
1: +  int mode;
1:  };
1:  
1:  struct io_cancel {
1: -	struct file *file;
1: -	u64 addr;
1: +  struct file *file;
1: +  u64 addr;
1:  };
1:  
1:  struct io_timeout {
1: -	struct file *file;
1: -	u32 off;
1: -	u32 target_seq;
1: -	struct list_head list;
1: +  struct file *file;
1: +  u32 off;
1: +  u32 target_seq;
1: +  struct list_head list;
1:  };
1:  
1:  struct io_timeout_rem {
1: -	struct file *file;
1: -	u64 addr;
1: +  struct file *file;
1: +  u64 addr;
1:  };
1:  
1:  struct io_connect {
1: -	struct file *file;
1: -	struct sockaddr *addr;
1: -	int addr_len;
1: +  struct file *file;
1: +  struct sockaddr *addr;
1: +  int addr_len;
1:  };
1:  
1:  struct io_sr_msg {
1: -	struct file *file;
1: -	union {
1: -		struct user_msghdr *umsg;
1: -		void *buf;
1: -	};
1: -	int msg_flags;
1: -	int bgid;
1: -	size_t len;
1: -	struct io_buffer *kbuf;
1: +  struct file *file;
1: +  union {
1: +    struct user_msghdr *umsg;
1: +    void *buf;
1: +  };
1: +  int msg_flags;
1: +  int bgid;
1: +  size_t len;
1: +  struct io_buffer *kbuf;
1:  };
1:  
1:  struct io_open {
1: -	struct file *file;
1: -	int dfd;
1: -	struct filename *filename;
1: -	struct open_how how;
1: -	long unsigned int nofile;
1: +  struct file *file;
1: +  int dfd;
1: +  struct filename *filename;
1: +  struct open_how how;
1: +  long unsigned int nofile;
1:  };
1:  
1:  struct io_close {
1: -	struct file *file;
1: -	struct file *put_file;
1: -	int fd;
1: +  struct file *file;
1: +  struct file *put_file;
1: +  int fd;
1:  };
1:  
1:  struct io_files_update {
1: -	struct file *file;
1: -	u64 arg;
1: -	u32 nr_args;
1: -	u32 offset;
1: +  struct file *file;
1: +  u64 arg;
1: +  u32 nr_args;
1: +  u32 offset;
1:  };
1:  
1:  struct io_fadvise {
1: -	struct file *file;
1: -	u64 offset;
1: -	u32 len;
1: -	u32 advice;
1: +  struct file *file;
1: +  u64 offset;
1: +  u32 len;
1: +  u32 advice;
1:  };
1:  
1:  struct io_madvise {
1: -	struct file *file;
1: -	u64 addr;
1: -	u32 len;
1: -	u32 advice;
1: +  struct file *file;
1: +  u64 addr;
1: +  u32 len;
1: +  u32 advice;
1:  };
1:  
1:  struct io_epoll {
1: -	struct file *file;
1: -	int epfd;
1: -	int op;
1: -	int fd;
1: -	struct epoll_event event;
1: +  struct file *file;
1: +  int epfd;
1: +  int op;
1: +  int fd;
1: +  struct epoll_event event;
1:  } __attribute__((packed));
1:  
1:  struct io_splice {
1: -	struct file *file_out;
1: -	struct file *file_in;
1: -	loff_t off_out;
1: -	loff_t off_in;
1: -	u64 len;
1: -	unsigned int flags;
1: +  struct file *file_out;
1: +  struct file *file_in;
1: +  loff_t off_out;
1: +  loff_t off_in;
1: +  u64 len;
1: +  unsigned int flags;
1:  };
1:  
1:  struct io_provide_buf {
1: -	struct file *file;
1: -	__u64 addr;
1: -	__s32 len;
1: -	__u32 bgid;
1: -	__u16 nbufs;
1: -	__u16 bid;
1: +  struct file *file;
1: +  __u64 addr;
1: +  __s32 len;
1: +  __u32 bgid;
1: +  __u16 nbufs;
1: +  __u16 bid;
1:  };
1:  
1:  struct io_statx {
1: -	struct file *file;
1: -	int dfd;
1: -	unsigned int mask;
1: -	unsigned int flags;
1: -	const char *filename;
1: -	struct statx *buffer;
1: +  struct file *file;
1: +  int dfd;
1: +  unsigned int mask;
1: +  unsigned int flags;
1: +  const char *filename;
1: +  struct statx *buffer;
1:  };
1:  
1:  struct io_completion {
1: -	struct file *file;
1: -	struct list_head list;
1: -	int cflags;
1: +  struct file *file;
1: +  struct list_head list;
1: +  int cflags;
1:  };
1:  
1:  struct async_poll;
1:  
1:  struct io_kiocb {
1: -	union {
1: -		struct file *file;
1: -		struct io_rw rw;
1: -		struct io_poll_iocb poll;
1: -		struct io_accept accept;
1: -		struct io_sync sync;
1: -		struct io_cancel cancel;
1: -		struct io_timeout timeout;
1: -		struct io_timeout_rem timeout_rem;
1: -		struct io_connect connect;
1: -		struct io_sr_msg sr_msg;
1: -		struct io_open open;
1: -		struct io_close close;
1: -		struct io_files_update files_update;
1: -		struct io_fadvise fadvise;
1: -		struct io_madvise madvise;
1: -		struct io_epoll epoll;
1: -		struct io_splice splice;
1: -		struct io_provide_buf pbuf;
1: -		struct io_statx statx;
1: -		struct io_completion compl;
1: -	};
1: -	void *async_data;
1: -	u8 opcode;
1: -	u8 iopoll_completed;
1: -	u16 buf_index;
1: -	u32 result;
1: -	struct io_ring_ctx *ctx;
1: -	unsigned int flags;
1: -	refcount_t refs;
1: -	struct task_struct *task;
1: -	u64 user_data;
1: -	struct list_head link_list;
1: -	struct list_head inflight_entry;
1: -	struct percpu_ref *fixed_file_refs;
1: -	struct callback_head task_work;
1: -	struct hlist_node hash_node;
1: -	struct async_poll *apoll;
1: -	struct io_wq_work work;
1: +  union {
1: +    struct file *file;
1: +    struct io_rw rw;
1: +    struct io_poll_iocb poll;
1: +    struct io_accept accept;
1: +    struct io_sync sync;
1: +    struct io_cancel cancel;
1: +    struct io_timeout timeout;
1: +    struct io_timeout_rem timeout_rem;
1: +    struct io_connect connect;
1: +    struct io_sr_msg sr_msg;
1: +    struct io_open open;
1: +    struct io_close close;
1: +    struct io_files_update files_update;
1: +    struct io_fadvise fadvise;
1: +    struct io_madvise madvise;
1: +    struct io_epoll epoll;
1: +    struct io_splice splice;
1: +    struct io_provide_buf pbuf;
1: +    struct io_statx statx;
1: +    struct io_completion compl;
1: +  };
1: +  void *async_data;
1: +  u8 opcode;
1: +  u8 iopoll_completed;
1: +  u16 buf_index;
1: +  u32 result;
1: +  struct io_ring_ctx *ctx;
1: +  unsigned int flags;
1: +  refcount_t refs;
1: +  struct task_struct *task;
1: +  u64 user_data;
1: +  struct list_head link_list;
1: +  struct list_head inflight_entry;
1: +  struct percpu_ref *fixed_file_refs;
1: +  struct callback_head task_work;
1: +  struct hlist_node hash_node;
1: +  struct async_poll *apoll;
1: +  struct io_wq_work work;
1:  };
1:  
1:  struct io_timeout_data {
1: -	struct io_kiocb *req;
1: -	struct hrtimer timer;
1: -	struct timespec64 ts;
1: -	enum hrtimer_mode mode;
1: +  struct io_kiocb *req;
1: +  struct hrtimer timer;
1: +  struct timespec64 ts;
1: +  enum hrtimer_mode mode;
1:  };
1:  
1:  struct io_async_connect {
1: -	struct __kernel_sockaddr_storage address;
1: +  struct __kernel_sockaddr_storage address;
1:  };
1:  
1:  struct io_async_msghdr {
1: -	struct iovec fast_iov[8];
1: -	struct iovec *iov;
1: -	struct sockaddr *uaddr;
1: -	struct msghdr msg;
1: -	struct __kernel_sockaddr_storage addr;
1: +  struct iovec fast_iov[8];
1: +  struct iovec *iov;
1: +  struct sockaddr *uaddr;
1: +  struct msghdr msg;
1: +  struct __kernel_sockaddr_storage addr;
1:  };
1:  
1:  struct io_async_rw {
1: -	struct iovec fast_iov[8];
1: -	const struct iovec *free_iovec;
1: -	struct iov_iter iter;
1: -	size_t bytes_done;
1: -	struct wait_page_queue wpq;
1: -};
1: -
1: -enum {
1: -	REQ_F_FIXED_FILE_BIT = 0,
1: -	REQ_F_IO_DRAIN_BIT = 1,
1: -	REQ_F_LINK_BIT = 2,
1: -	REQ_F_HARDLINK_BIT = 3,
1: -	REQ_F_FORCE_ASYNC_BIT = 4,
1: -	REQ_F_BUFFER_SELECT_BIT = 5,
1: -	REQ_F_LINK_HEAD_BIT = 6,
1: -	REQ_F_FAIL_LINK_BIT = 7,
1: -	REQ_F_INFLIGHT_BIT = 8,
1: -	REQ_F_CUR_POS_BIT = 9,
1: -	REQ_F_NOWAIT_BIT = 10,
1: -	REQ_F_LINK_TIMEOUT_BIT = 11,
1: -	REQ_F_ISREG_BIT = 12,
1: -	REQ_F_NEED_CLEANUP_BIT = 13,
1: -	REQ_F_POLLED_BIT = 14,
1: -	REQ_F_BUFFER_SELECTED_BIT = 15,
1: -	REQ_F_NO_FILE_TABLE_BIT = 16,
1: -	REQ_F_WORK_INITIALIZED_BIT = 17,
1: -	REQ_F_LTIMEOUT_ACTIVE_BIT = 18,
1: -	__REQ_F_LAST_BIT = 19,
1: -};
1: -
1: -enum {
1: -	REQ_F_FIXED_FILE = 1,
1: -	REQ_F_IO_DRAIN = 2,
1: -	REQ_F_LINK = 4,
1: -	REQ_F_HARDLINK = 8,
1: -	REQ_F_FORCE_ASYNC = 16,
1: -	REQ_F_BUFFER_SELECT = 32,
1: -	REQ_F_LINK_HEAD = 64,
1: -	REQ_F_FAIL_LINK = 128,
1: -	REQ_F_INFLIGHT = 256,
1: -	REQ_F_CUR_POS = 512,
1: -	REQ_F_NOWAIT = 1024,
1: -	REQ_F_LINK_TIMEOUT = 2048,
1: -	REQ_F_ISREG = 4096,
1: -	REQ_F_NEED_CLEANUP = 8192,
1: -	REQ_F_POLLED = 16384,
1: -	REQ_F_BUFFER_SELECTED = 32768,
1: -	REQ_F_NO_FILE_TABLE = 65536,
1: -	REQ_F_WORK_INITIALIZED = 131072,
1: -	REQ_F_LTIMEOUT_ACTIVE = 262144,
1: +  struct iovec fast_iov[8];
1: +  const struct iovec *free_iovec;
1: +  struct iov_iter iter;
1: +  size_t bytes_done;
1: +  struct wait_page_queue wpq;
1: +};
1: +
1: +enum {
1: +  REQ_F_FIXED_FILE_BIT = 0,
1: +  REQ_F_IO_DRAIN_BIT = 1,
1: +  REQ_F_LINK_BIT = 2,
1: +  REQ_F_HARDLINK_BIT = 3,
1: +  REQ_F_FORCE_ASYNC_BIT = 4,
1: +  REQ_F_BUFFER_SELECT_BIT = 5,
1: +  REQ_F_LINK_HEAD_BIT = 6,
1: +  REQ_F_FAIL_LINK_BIT = 7,
1: +  REQ_F_INFLIGHT_BIT = 8,
1: +  REQ_F_CUR_POS_BIT = 9,
1: +  REQ_F_NOWAIT_BIT = 10,
1: +  REQ_F_LINK_TIMEOUT_BIT = 11,
1: +  REQ_F_ISREG_BIT = 12,
1: +  REQ_F_NEED_CLEANUP_BIT = 13,
1: +  REQ_F_POLLED_BIT = 14,
1: +  REQ_F_BUFFER_SELECTED_BIT = 15,
1: +  REQ_F_NO_FILE_TABLE_BIT = 16,
1: +  REQ_F_WORK_INITIALIZED_BIT = 17,
1: +  REQ_F_LTIMEOUT_ACTIVE_BIT = 18,
1: +  __REQ_F_LAST_BIT = 19,
1: +};
1: +
1: +enum {
1: +  REQ_F_FIXED_FILE = 1,
1: +  REQ_F_IO_DRAIN = 2,
1: +  REQ_F_LINK = 4,
1: +  REQ_F_HARDLINK = 8,
1: +  REQ_F_FORCE_ASYNC = 16,
1: +  REQ_F_BUFFER_SELECT = 32,
1: +  REQ_F_LINK_HEAD = 64,
1: +  REQ_F_FAIL_LINK = 128,
1: +  REQ_F_INFLIGHT = 256,
1: +  REQ_F_CUR_POS = 512,
1: +  REQ_F_NOWAIT = 1024,
1: +  REQ_F_LINK_TIMEOUT = 2048,
1: +  REQ_F_ISREG = 4096,
1: +  REQ_F_NEED_CLEANUP = 8192,
1: +  REQ_F_POLLED = 16384,
1: +  REQ_F_BUFFER_SELECTED = 32768,
1: +  REQ_F_NO_FILE_TABLE = 65536,
1: +  REQ_F_WORK_INITIALIZED = 131072,
1: +  REQ_F_LTIMEOUT_ACTIVE = 262144,
1:  };
1:  
1:  struct async_poll {
1: -	struct io_poll_iocb poll;
1: -	struct io_poll_iocb *double_poll;
1: +  struct io_poll_iocb poll;
1: +  struct io_poll_iocb *double_poll;
1:  };
1:  
1:  struct io_defer_entry {
1: -	struct list_head list;
1: -	struct io_kiocb *req;
1: -	u32 seq;
1: +  struct list_head list;
1: +  struct io_kiocb *req;
1: +  u32 seq;
1:  };
1:  
1:  struct io_comp_state {
1: -	unsigned int nr;
1: -	struct list_head list;
1: -	struct io_ring_ctx *ctx;
1: +  unsigned int nr;
1: +  struct list_head list;
1: +  struct io_ring_ctx *ctx;
1:  };
1:  
1:  struct io_submit_state {
1: -	struct blk_plug plug;
1: -	void *reqs[8];
1: -	unsigned int free_reqs;
1: -	struct io_comp_state comp;
1: -	struct file *file;
1: -	unsigned int fd;
1: -	unsigned int has_refs;
1: -	unsigned int ios_left;
1: +  struct blk_plug plug;
1: +  void *reqs[8];
1: +  unsigned int free_reqs;
1: +  struct io_comp_state comp;
1: +  struct file *file;
1: +  unsigned int fd;
1: +  unsigned int has_refs;
1: +  unsigned int ios_left;
1:  };
1:  
1:  struct io_op_def {
1: -	unsigned int needs_file: 1;
1: -	unsigned int needs_file_no_error: 1;
1: -	unsigned int hash_reg_file: 1;
1: -	unsigned int unbound_nonreg_file: 1;
1: -	unsigned int not_supported: 1;
1: -	unsigned int pollin: 1;
1: -	unsigned int pollout: 1;
1: -	unsigned int buffer_select: 1;
1: -	unsigned int needs_async_data: 1;
1: -	short unsigned int async_size;
1: -	unsigned int work_flags;
1: +  unsigned int needs_file : 1;
1: +  unsigned int needs_file_no_error : 1;
1: +  unsigned int hash_reg_file : 1;
1: +  unsigned int unbound_nonreg_file : 1;
1: +  unsigned int not_supported : 1;
1: +  unsigned int pollin : 1;
1: +  unsigned int pollout : 1;
1: +  unsigned int buffer_select : 1;
1: +  unsigned int needs_async_data : 1;
1: +  short unsigned int async_size;
1: +  unsigned int work_flags;
1:  };
1:  
1:  enum io_mem_account {
1: -	ACCT_LOCKED = 0,
1: -	ACCT_PINNED = 1,
1: +  ACCT_LOCKED = 0,
1: +  ACCT_PINNED = 1,
1:  };
1:  
1:  struct req_batch {
1: -	void *reqs[8];
1: -	int to_free;
1: -	struct task_struct *task;
1: -	int task_refs;
1: +  void *reqs[8];
1: +  int to_free;
1: +  struct task_struct *task;
1: +  int task_refs;
1:  };
1:  
1:  struct io_poll_table {
1: -	struct poll_table_struct pt;
1: -	struct io_kiocb *req;
1: -	int error;
1: +  struct poll_table_struct pt;
1: +  struct io_kiocb *req;
1: +  int error;
1:  };
1:  
1:  enum sq_ret {
1: -	SQT_IDLE = 1,
1: -	SQT_SPIN = 2,
1: -	SQT_DID_WORK = 4,
1: +  SQT_IDLE = 1,
1: +  SQT_SPIN = 2,
1: +  SQT_DID_WORK = 4,
1:  };
1:  
1:  struct io_wait_queue {
1: -	struct wait_queue_entry wq;
1: -	struct io_ring_ctx *ctx;
1: -	unsigned int to_wait;
1: -	unsigned int nr_timeouts;
1: +  struct wait_queue_entry wq;
1: +  struct io_ring_ctx *ctx;
1: +  unsigned int to_wait;
1: +  unsigned int nr_timeouts;
1:  };
1:  
1:  struct io_file_put {
1: -	struct list_head list;
1: -	struct file *file;
1: +  struct list_head list;
1: +  struct file *file;
1:  };
1:  
1:  struct io_wq_work_list {
1: -	struct io_wq_work_node *first;
1: -	struct io_wq_work_node *last;
1: +  struct io_wq_work_node *first;
1: +  struct io_wq_work_node *last;
1:  };
1:  
1:  typedef bool work_cancel_fn(struct io_wq_work *, void *);
1:  
1:  enum {
1: -	IO_WORKER_F_UP = 1,
1: -	IO_WORKER_F_RUNNING = 2,
1: -	IO_WORKER_F_FREE = 4,
1: -	IO_WORKER_F_FIXED = 8,
1: -	IO_WORKER_F_BOUND = 16,
1: +  IO_WORKER_F_UP = 1,
1: +  IO_WORKER_F_RUNNING = 2,
1: +  IO_WORKER_F_FREE = 4,
1: +  IO_WORKER_F_FIXED = 8,
1: +  IO_WORKER_F_BOUND = 16,
1:  };
1:  
1:  enum {
1: -	IO_WQ_BIT_EXIT = 0,
1: -	IO_WQ_BIT_CANCEL = 1,
1: -	IO_WQ_BIT_ERROR = 2,
1: +  IO_WQ_BIT_EXIT = 0,
1: +  IO_WQ_BIT_CANCEL = 1,
1: +  IO_WQ_BIT_ERROR = 2,
1:  };
1:  
1:  enum {
1: -	IO_WQE_FLAG_STALLED = 1,
1: +  IO_WQE_FLAG_STALLED = 1,
1:  };
1:  
1:  struct io_wqe;
1:  
1:  struct io_worker {
1: -	refcount_t ref;
1: -	unsigned int flags;
1: -	struct hlist_nulls_node nulls_node;
1: -	struct list_head all_list;
1: -	struct task_struct *task;
1: -	struct io_wqe *wqe;
1: -	struct io_wq_work *cur_work;
1: -	spinlock_t lock;
1: -	struct callback_head rcu;
1: -	struct mm_struct *mm;
1: -	struct cgroup_subsys_state *blkcg_css;
1: -	const struct cred *cur_creds;
1: -	const struct cred *saved_creds;
1: -	struct files_struct *restore_files;
1: -	struct nsproxy *restore_nsproxy;
1: -	struct fs_struct *restore_fs;
1: +  refcount_t ref;
1: +  unsigned int flags;
1: +  struct hlist_nulls_node nulls_node;
1: +  struct list_head all_list;
1: +  struct task_struct *task;
1: +  struct io_wqe *wqe;
1: +  struct io_wq_work *cur_work;
1: +  spinlock_t lock;
1: +  struct callback_head rcu;
1: +  struct mm_struct *mm;
1: +  struct cgroup_subsys_state *blkcg_css;
1: +  const struct cred *cur_creds;
1: +  const struct cred *saved_creds;
1: +  struct files_struct *restore_files;
1: +  struct nsproxy *restore_nsproxy;
1: +  struct fs_struct *restore_fs;
1:  };
1:  
1:  struct io_wqe_acct {
1: -	unsigned int nr_workers;
1: -	unsigned int max_workers;
1: -	atomic_t nr_running;
1: +  unsigned int nr_workers;
1: +  unsigned int max_workers;
1: +  atomic_t nr_running;
1:  };
1:  
1:  struct io_wq___2;
1:  
1:  struct io_wqe {
1: -	struct {
1: -		raw_spinlock_t lock;
1: -		struct io_wq_work_list work_list;
1: -		long unsigned int hash_map;
1: -		unsigned int flags;
1: -		long: 32;
1: -		long: 64;
1: -	};
1: -	int node;
1: -	struct io_wqe_acct acct[2];
1: -	struct hlist_nulls_head free_list;
1: -	struct list_head all_list;
1: -	struct io_wq___2 *wq;
1: -	struct io_wq_work *hash_tail[64];
1: +  struct {
1: +    raw_spinlock_t lock;
1: +    struct io_wq_work_list work_list;
1: +    long unsigned int hash_map;
1: +    unsigned int flags;
1: +    long : 32;
1: +    long : 64;
1: +  };
1: +  int node;
1: +  struct io_wqe_acct acct[2];
1: +  struct hlist_nulls_head free_list;
1: +  struct list_head all_list;
1: +  struct io_wq___2 *wq;
1: +  struct io_wq_work *hash_tail[64];
1:  };
1:  
1:  enum {
1: -	IO_WQ_ACCT_BOUND = 0,
1: -	IO_WQ_ACCT_UNBOUND = 1,
1: +  IO_WQ_ACCT_BOUND = 0,
1: +  IO_WQ_ACCT_UNBOUND = 1,
1:  };
1:  
1:  struct io_wq___2 {
1: -	struct io_wqe **wqes;
1: -	long unsigned int state;
1: -	free_work_fn *free_work;
1: -	io_wq_work_fn *do_work;
1: -	struct task_struct *manager;
1: -	struct user_struct *user;
1: -	refcount_t refs;
1: -	struct completion done;
1: -	struct hlist_node cpuhp_node;
1: -	refcount_t use_refs;
1: +  struct io_wqe **wqes;
1: +  long unsigned int state;
1: +  free_work_fn *free_work;
1: +  io_wq_work_fn *do_work;
1: +  struct task_struct *manager;
1: +  struct user_struct *user;
1: +  refcount_t refs;
1: +  struct completion done;
1: +  struct hlist_node cpuhp_node;
1: +  refcount_t use_refs;
1:  };
1:  
1:  struct io_cb_cancel_data {
1: -	work_cancel_fn *fn;
1: -	void *data;
1: -	int nr_running;
1: -	int nr_pending;
1: -	bool cancel_all;
1: +  work_cancel_fn *fn;
1: +  void *data;
1: +  int nr_running;
1: +  int nr_pending;
1: +  bool cancel_all;
1:  };
1:  
1:  struct flock64 {
1: -	short int l_type;
1: -	short int l_whence;
1: -	__kernel_loff_t l_start;
1: -	__kernel_loff_t l_len;
1: -	__kernel_pid_t l_pid;
1: +  short int l_type;
1: +  short int l_whence;
1: +  __kernel_loff_t l_start;
1: +  __kernel_loff_t l_len;
1: +  __kernel_pid_t l_pid;
1:  };
1:  
1:  struct trace_event_raw_locks_get_lock_context {
1: -	struct trace_entry ent;
1: -	long unsigned int i_ino;
1: -	dev_t s_dev;
1: -	unsigned char type;
1: -	struct file_lock_context *ctx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int i_ino;
1: +  dev_t s_dev;
1: +  unsigned char type;
1: +  struct file_lock_context *ctx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_filelock_lock {
1: -	struct trace_entry ent;
1: -	struct file_lock *fl;
1: -	long unsigned int i_ino;
1: -	dev_t s_dev;
1: -	struct file_lock *fl_blocker;
1: -	fl_owner_t fl_owner;
1: -	unsigned int fl_pid;
1: -	unsigned int fl_flags;
1: -	unsigned char fl_type;
1: -	loff_t fl_start;
1: -	loff_t fl_end;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct file_lock *fl;
1: +  long unsigned int i_ino;
1: +  dev_t s_dev;
1: +  struct file_lock *fl_blocker;
1: +  fl_owner_t fl_owner;
1: +  unsigned int fl_pid;
1: +  unsigned int fl_flags;
1: +  unsigned char fl_type;
1: +  loff_t fl_start;
1: +  loff_t fl_end;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_filelock_lease {
1: -	struct trace_entry ent;
1: -	struct file_lock *fl;
1: -	long unsigned int i_ino;
1: -	dev_t s_dev;
1: -	struct file_lock *fl_blocker;
1: -	fl_owner_t fl_owner;
1: -	unsigned int fl_flags;
1: -	unsigned char fl_type;
1: -	long unsigned int fl_break_time;
1: -	long unsigned int fl_downgrade_time;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct file_lock *fl;
1: +  long unsigned int i_ino;
1: +  dev_t s_dev;
1: +  struct file_lock *fl_blocker;
1: +  fl_owner_t fl_owner;
1: +  unsigned int fl_flags;
1: +  unsigned char fl_type;
1: +  long unsigned int fl_break_time;
1: +  long unsigned int fl_downgrade_time;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_generic_add_lease {
1: -	struct trace_entry ent;
1: -	long unsigned int i_ino;
1: -	int wcount;
1: -	int rcount;
1: -	int icount;
1: -	dev_t s_dev;
1: -	fl_owner_t fl_owner;
1: -	unsigned int fl_flags;
1: -	unsigned char fl_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int i_ino;
1: +  int wcount;
1: +  int rcount;
1: +  int icount;
1: +  dev_t s_dev;
1: +  fl_owner_t fl_owner;
1: +  unsigned int fl_flags;
1: +  unsigned char fl_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_leases_conflict {
1: -	struct trace_entry ent;
1: -	void *lease;
1: -	void *breaker;
1: -	unsigned int l_fl_flags;
1: -	unsigned int b_fl_flags;
1: -	unsigned char l_fl_type;
1: -	unsigned char b_fl_type;
1: -	bool conflict;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *lease;
1: +  void *breaker;
1: +  unsigned int l_fl_flags;
1: +  unsigned int b_fl_flags;
1: +  unsigned char l_fl_type;
1: +  unsigned char b_fl_type;
1: +  bool conflict;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_locks_get_lock_context {};
1: @@ -43456,60 +43943,72 @@ struct trace_event_data_offsets_generic_add_lease {};
1:  
1:  struct trace_event_data_offsets_leases_conflict {};
1:  
1: -typedef void (*btf_trace_locks_get_lock_context)(void *, struct inode *, int, struct file_lock_context *);
1: +typedef void (*btf_trace_locks_get_lock_context)(void *, struct inode *, int,
1: +                                                 struct file_lock_context *);
1:  
1: -typedef void (*btf_trace_posix_lock_inode)(void *, struct inode *, struct file_lock *, int);
1: +typedef void (*btf_trace_posix_lock_inode)(void *, struct inode *,
1: +                                           struct file_lock *, int);
1:  
1: -typedef void (*btf_trace_fcntl_setlk)(void *, struct inode *, struct file_lock *, int);
1: +typedef void (*btf_trace_fcntl_setlk)(void *, struct inode *,
1: +                                      struct file_lock *, int);
1:  
1: -typedef void (*btf_trace_locks_remove_posix)(void *, struct inode *, struct file_lock *, int);
1: +typedef void (*btf_trace_locks_remove_posix)(void *, struct inode *,
1: +                                             struct file_lock *, int);
1:  
1: -typedef void (*btf_trace_flock_lock_inode)(void *, struct inode *, struct file_lock *, int);
1: +typedef void (*btf_trace_flock_lock_inode)(void *, struct inode *,
1: +                                           struct file_lock *, int);
1:  
1: -typedef void (*btf_trace_break_lease_noblock)(void *, struct inode *, struct file_lock *);
1: +typedef void (*btf_trace_break_lease_noblock)(void *, struct inode *,
1: +                                              struct file_lock *);
1:  
1: -typedef void (*btf_trace_break_lease_block)(void *, struct inode *, struct file_lock *);
1: +typedef void (*btf_trace_break_lease_block)(void *, struct inode *,
1: +                                            struct file_lock *);
1:  
1: -typedef void (*btf_trace_break_lease_unblock)(void *, struct inode *, struct file_lock *);
1: +typedef void (*btf_trace_break_lease_unblock)(void *, struct inode *,
1: +                                              struct file_lock *);
1:  
1: -typedef void (*btf_trace_generic_delete_lease)(void *, struct inode *, struct file_lock *);
1: +typedef void (*btf_trace_generic_delete_lease)(void *, struct inode *,
1: +                                               struct file_lock *);
1:  
1: -typedef void (*btf_trace_time_out_leases)(void *, struct inode *, struct file_lock *);
1: +typedef void (*btf_trace_time_out_leases)(void *, struct inode *,
1: +                                          struct file_lock *);
1:  
1: -typedef void (*btf_trace_generic_add_lease)(void *, struct inode *, struct file_lock *);
1: +typedef void (*btf_trace_generic_add_lease)(void *, struct inode *,
1: +                                            struct file_lock *);
1:  
1: -typedef void (*btf_trace_leases_conflict)(void *, bool, struct file_lock *, struct file_lock *);
1: +typedef void (*btf_trace_leases_conflict)(void *, bool, struct file_lock *,
1: +                                          struct file_lock *);
1:  
1:  struct file_lock_list_struct {
1: -	spinlock_t lock;
1: -	struct hlist_head hlist;
1: +  spinlock_t lock;
1: +  struct hlist_head hlist;
1:  };
1:  
1:  struct locks_iterator {
1: -	int li_cpu;
1: -	loff_t li_pos;
1: +  int li_cpu;
1: +  loff_t li_pos;
1:  };
1:  
1:  enum {
1: -	VERBOSE_STATUS = 1,
1: +  VERBOSE_STATUS = 1,
1:  };
1:  
1:  enum {
1: -	Enabled = 0,
1: -	Magic = 1,
1: +  Enabled = 0,
1: +  Magic = 1,
1:  };
1:  
1:  typedef struct {
1: -	struct list_head list;
1: -	long unsigned int flags;
1: -	int offset;
1: -	int size;
1: -	char *magic;
1: -	char *mask;
1: -	const char *interpreter;
1: -	char *name;
1: -	struct dentry *dentry;
1: -	struct file *interp_file;
1: +  struct list_head list;
1: +  long unsigned int flags;
1: +  int offset;
1: +  int size;
1: +  char *magic;
1: +  char *mask;
1: +  const char *interpreter;
1: +  char *name;
1: +  struct dentry *dentry;
1: +  struct file *interp_file;
1:  } Node;
1:  
1:  typedef unsigned int __kernel_uid_t;
1: @@ -43517,198 +44016,198 @@ typedef unsigned int __kernel_uid_t;
1:  typedef unsigned int __kernel_gid_t;
1:  
1:  struct elf_prpsinfo {
1: -	char pr_state;
1: -	char pr_sname;
1: -	char pr_zomb;
1: -	char pr_nice;
1: -	long unsigned int pr_flag;
1: -	__kernel_uid_t pr_uid;
1: -	__kernel_gid_t pr_gid;
1: -	pid_t pr_pid;
1: -	pid_t pr_ppid;
1: -	pid_t pr_pgrp;
1: -	pid_t pr_sid;
1: -	char pr_fname[16];
1: -	char pr_psargs[80];
1: +  char pr_state;
1: +  char pr_sname;
1: +  char pr_zomb;
1: +  char pr_nice;
1: +  long unsigned int pr_flag;
1: +  __kernel_uid_t pr_uid;
1: +  __kernel_gid_t pr_gid;
1: +  pid_t pr_pid;
1: +  pid_t pr_ppid;
1: +  pid_t pr_pgrp;
1: +  pid_t pr_sid;
1: +  char pr_fname[16];
1: +  char pr_psargs[80];
1:  };
1:  
1:  struct core_vma_metadata {
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	long unsigned int flags;
1: -	long unsigned int dump_size;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  long unsigned int flags;
1: +  long unsigned int dump_size;
1:  };
1:  
1:  struct arch_elf_state {};
1:  
1:  struct memelfnote {
1: -	const char *name;
1: -	int type;
1: -	unsigned int datasz;
1: -	void *data;
1: +  const char *name;
1: +  int type;
1: +  unsigned int datasz;
1: +  void *data;
1:  };
1:  
1:  struct elf_thread_core_info {
1: -	struct elf_thread_core_info *next;
1: -	struct task_struct *task;
1: -	struct elf_prstatus prstatus;
1: -	struct memelfnote notes[0];
1: +  struct elf_thread_core_info *next;
1: +  struct task_struct *task;
1: +  struct elf_prstatus prstatus;
1: +  struct memelfnote notes[0];
1:  };
1:  
1:  struct elf_note_info {
1: -	struct elf_thread_core_info *thread;
1: -	struct memelfnote psinfo;
1: -	struct memelfnote signote;
1: -	struct memelfnote auxv;
1: -	struct memelfnote files;
1: -	siginfo_t csigdata;
1: -	size_t size;
1: -	int thread_notes;
1: +  struct elf_thread_core_info *thread;
1: +  struct memelfnote psinfo;
1: +  struct memelfnote signote;
1: +  struct memelfnote auxv;
1: +  struct memelfnote files;
1: +  siginfo_t csigdata;
1: +  size_t size;
1: +  int thread_notes;
1:  };
1:  
1:  struct user_regs_struct {
1: -	long unsigned int r15;
1: -	long unsigned int r14;
1: -	long unsigned int r13;
1: -	long unsigned int r12;
1: -	long unsigned int bp;
1: -	long unsigned int bx;
1: -	long unsigned int r11;
1: -	long unsigned int r10;
1: -	long unsigned int r9;
1: -	long unsigned int r8;
1: -	long unsigned int ax;
1: -	long unsigned int cx;
1: -	long unsigned int dx;
1: -	long unsigned int si;
1: -	long unsigned int di;
1: -	long unsigned int orig_ax;
1: -	long unsigned int ip;
1: -	long unsigned int cs;
1: -	long unsigned int flags;
1: -	long unsigned int sp;
1: -	long unsigned int ss;
1: -	long unsigned int fs_base;
1: -	long unsigned int gs_base;
1: -	long unsigned int ds;
1: -	long unsigned int es;
1: -	long unsigned int fs;
1: -	long unsigned int gs;
1: +  long unsigned int r15;
1: +  long unsigned int r14;
1: +  long unsigned int r13;
1: +  long unsigned int r12;
1: +  long unsigned int bp;
1: +  long unsigned int bx;
1: +  long unsigned int r11;
1: +  long unsigned int r10;
1: +  long unsigned int r9;
1: +  long unsigned int r8;
1: +  long unsigned int ax;
1: +  long unsigned int cx;
1: +  long unsigned int dx;
1: +  long unsigned int si;
1: +  long unsigned int di;
1: +  long unsigned int orig_ax;
1: +  long unsigned int ip;
1: +  long unsigned int cs;
1: +  long unsigned int flags;
1: +  long unsigned int sp;
1: +  long unsigned int ss;
1: +  long unsigned int fs_base;
1: +  long unsigned int gs_base;
1: +  long unsigned int ds;
1: +  long unsigned int es;
1: +  long unsigned int fs;
1: +  long unsigned int gs;
1:  };
1:  
1:  struct elf32_shdr {
1: -	Elf32_Word sh_name;
1: -	Elf32_Word sh_type;
1: -	Elf32_Word sh_flags;
1: -	Elf32_Addr sh_addr;
1: -	Elf32_Off sh_offset;
1: -	Elf32_Word sh_size;
1: -	Elf32_Word sh_link;
1: -	Elf32_Word sh_info;
1: -	Elf32_Word sh_addralign;
1: -	Elf32_Word sh_entsize;
1: +  Elf32_Word sh_name;
1: +  Elf32_Word sh_type;
1: +  Elf32_Word sh_flags;
1: +  Elf32_Addr sh_addr;
1: +  Elf32_Off sh_offset;
1: +  Elf32_Word sh_size;
1: +  Elf32_Word sh_link;
1: +  Elf32_Word sh_info;
1: +  Elf32_Word sh_addralign;
1: +  Elf32_Word sh_entsize;
1:  };
1:  
1:  typedef struct user_regs_struct compat_elf_gregset_t;
1:  
1:  struct compat_elf_siginfo {
1: -	compat_int_t si_signo;
1: -	compat_int_t si_code;
1: -	compat_int_t si_errno;
1: +  compat_int_t si_signo;
1: +  compat_int_t si_code;
1: +  compat_int_t si_errno;
1:  };
1:  
1:  struct compat_elf_prstatus {
1: -	struct compat_elf_siginfo pr_info;
1: -	short int pr_cursig;
1: -	compat_ulong_t pr_sigpend;
1: -	compat_ulong_t pr_sighold;
1: -	compat_pid_t pr_pid;
1: -	compat_pid_t pr_ppid;
1: -	compat_pid_t pr_pgrp;
1: -	compat_pid_t pr_sid;
1: -	struct old_timeval32 pr_utime;
1: -	struct old_timeval32 pr_stime;
1: -	struct old_timeval32 pr_cutime;
1: -	struct old_timeval32 pr_cstime;
1: -	compat_elf_gregset_t pr_reg;
1: -	compat_int_t pr_fpvalid;
1: +  struct compat_elf_siginfo pr_info;
1: +  short int pr_cursig;
1: +  compat_ulong_t pr_sigpend;
1: +  compat_ulong_t pr_sighold;
1: +  compat_pid_t pr_pid;
1: +  compat_pid_t pr_ppid;
1: +  compat_pid_t pr_pgrp;
1: +  compat_pid_t pr_sid;
1: +  struct old_timeval32 pr_utime;
1: +  struct old_timeval32 pr_stime;
1: +  struct old_timeval32 pr_cutime;
1: +  struct old_timeval32 pr_cstime;
1: +  compat_elf_gregset_t pr_reg;
1: +  compat_int_t pr_fpvalid;
1:  };
1:  
1:  struct compat_elf_prpsinfo {
1: -	char pr_state;
1: -	char pr_sname;
1: -	char pr_zomb;
1: -	char pr_nice;
1: -	compat_ulong_t pr_flag;
1: -	__compat_uid_t pr_uid;
1: -	__compat_gid_t pr_gid;
1: -	compat_pid_t pr_pid;
1: -	compat_pid_t pr_ppid;
1: -	compat_pid_t pr_pgrp;
1: -	compat_pid_t pr_sid;
1: -	char pr_fname[16];
1: -	char pr_psargs[80];
1: +  char pr_state;
1: +  char pr_sname;
1: +  char pr_zomb;
1: +  char pr_nice;
1: +  compat_ulong_t pr_flag;
1: +  __compat_uid_t pr_uid;
1: +  __compat_gid_t pr_gid;
1: +  compat_pid_t pr_pid;
1: +  compat_pid_t pr_ppid;
1: +  compat_pid_t pr_pgrp;
1: +  compat_pid_t pr_sid;
1: +  char pr_fname[16];
1: +  char pr_psargs[80];
1:  };
1:  
1:  struct elf_thread_core_info___2 {
1: -	struct elf_thread_core_info___2 *next;
1: -	struct task_struct *task;
1: -	struct compat_elf_prstatus prstatus;
1: -	struct memelfnote notes[0];
1: +  struct elf_thread_core_info___2 *next;
1: +  struct task_struct *task;
1: +  struct compat_elf_prstatus prstatus;
1: +  struct memelfnote notes[0];
1:  };
1:  
1:  struct elf_note_info___2 {
1: -	struct elf_thread_core_info___2 *thread;
1: -	struct memelfnote psinfo;
1: -	struct memelfnote signote;
1: -	struct memelfnote auxv;
1: -	struct memelfnote files;
1: -	compat_siginfo_t csigdata;
1: -	size_t size;
1: -	int thread_notes;
1: +  struct elf_thread_core_info___2 *thread;
1: +  struct memelfnote psinfo;
1: +  struct memelfnote signote;
1: +  struct memelfnote auxv;
1: +  struct memelfnote files;
1: +  compat_siginfo_t csigdata;
1: +  size_t size;
1: +  int thread_notes;
1:  };
1:  
1:  struct mb_cache_entry {
1: -	struct list_head e_list;
1: -	struct hlist_bl_node e_hash_list;
1: -	atomic_t e_refcnt;
1: -	u32 e_key;
1: -	u32 e_referenced: 1;
1: -	u32 e_reusable: 1;
1: -	u64 e_value;
1: +  struct list_head e_list;
1: +  struct hlist_bl_node e_hash_list;
1: +  atomic_t e_refcnt;
1: +  u32 e_key;
1: +  u32 e_referenced : 1;
1: +  u32 e_reusable : 1;
1: +  u64 e_value;
1:  };
1:  
1:  struct mb_cache {
1: -	struct hlist_bl_head *c_hash;
1: -	int c_bucket_bits;
1: -	long unsigned int c_max_entries;
1: -	spinlock_t c_list_lock;
1: -	struct list_head c_list;
1: -	long unsigned int c_entry_count;
1: -	struct shrinker c_shrink;
1: -	struct work_struct c_shrink_work;
1: +  struct hlist_bl_head *c_hash;
1: +  int c_bucket_bits;
1: +  long unsigned int c_max_entries;
1: +  spinlock_t c_list_lock;
1: +  struct list_head c_list;
1: +  long unsigned int c_entry_count;
1: +  struct shrinker c_shrink;
1: +  struct work_struct c_shrink_work;
1:  };
1:  
1:  struct posix_acl_xattr_entry {
1: -	__le16 e_tag;
1: -	__le16 e_perm;
1: -	__le32 e_id;
1: +  __le16 e_tag;
1: +  __le16 e_perm;
1: +  __le32 e_id;
1:  };
1:  
1:  struct posix_acl_xattr_header {
1: -	__le32 a_version;
1: +  __le32 a_version;
1:  };
1:  
1:  struct xdr_buf {
1: -	struct kvec head[1];
1: -	struct kvec tail[1];
1: -	struct bio_vec *bvec;
1: -	struct page **pages;
1: -	unsigned int page_base;
1: -	unsigned int page_len;
1: -	unsigned int flags;
1: -	unsigned int buflen;
1: -	unsigned int len;
1: +  struct kvec head[1];
1: +  struct kvec tail[1];
1: +  struct bio_vec *bvec;
1: +  struct page **pages;
1: +  unsigned int page_base;
1: +  unsigned int page_len;
1: +  unsigned int flags;
1: +  unsigned int buflen;
1: +  unsigned int len;
1:  };
1:  
1:  struct xdr_array2_desc;
1: @@ -43716,82 +44215,82 @@ struct xdr_array2_desc;
1:  typedef int (*xdr_xcode_elem_t)(struct xdr_array2_desc *, void *);
1:  
1:  struct xdr_array2_desc {
1: -	unsigned int elem_size;
1: -	unsigned int array_len;
1: -	unsigned int array_maxlen;
1: -	xdr_xcode_elem_t xcode;
1: +  unsigned int elem_size;
1: +  unsigned int array_len;
1: +  unsigned int array_maxlen;
1: +  xdr_xcode_elem_t xcode;
1:  };
1:  
1:  struct nfsacl_encode_desc {
1: -	struct xdr_array2_desc desc;
1: -	unsigned int count;
1: -	struct posix_acl *acl;
1: -	int typeflag;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: +  struct xdr_array2_desc desc;
1: +  unsigned int count;
1: +  struct posix_acl *acl;
1: +  int typeflag;
1: +  kuid_t uid;
1: +  kgid_t gid;
1:  };
1:  
1:  struct nfsacl_simple_acl {
1: -	struct posix_acl acl;
1: -	struct posix_acl_entry ace[4];
1: +  struct posix_acl acl;
1: +  struct posix_acl_entry ace[4];
1:  };
1:  
1:  struct nfsacl_decode_desc {
1: -	struct xdr_array2_desc desc;
1: -	unsigned int count;
1: -	struct posix_acl *acl;
1: +  struct xdr_array2_desc desc;
1: +  unsigned int count;
1: +  struct posix_acl *acl;
1:  };
1:  
1:  struct lock_manager {
1: -	struct list_head list;
1: -	bool block_opens;
1: +  struct list_head list;
1: +  bool block_opens;
1:  };
1:  
1:  struct rpc_timer {
1: -	struct list_head list;
1: -	long unsigned int expires;
1: -	struct delayed_work dwork;
1: +  struct list_head list;
1: +  long unsigned int expires;
1: +  struct delayed_work dwork;
1:  };
1:  
1:  struct rpc_wait_queue {
1: -	spinlock_t lock;
1: -	struct list_head tasks[4];
1: -	unsigned char maxpriority;
1: -	unsigned char priority;
1: -	unsigned char nr;
1: -	short unsigned int qlen;
1: -	struct rpc_timer timer_list;
1: -	const char *name;
1: +  spinlock_t lock;
1: +  struct list_head tasks[4];
1: +  unsigned char maxpriority;
1: +  unsigned char priority;
1: +  unsigned char nr;
1: +  short unsigned int qlen;
1: +  struct rpc_timer timer_list;
1: +  const char *name;
1:  };
1:  
1:  struct nfs_seqid_counter {
1: -	ktime_t create_time;
1: -	int owner_id;
1: -	int flags;
1: -	u32 counter;
1: -	spinlock_t lock;
1: -	struct list_head list;
1: -	struct rpc_wait_queue wait;
1: +  ktime_t create_time;
1: +  int owner_id;
1: +  int flags;
1: +  u32 counter;
1: +  spinlock_t lock;
1: +  struct list_head list;
1: +  struct rpc_wait_queue wait;
1:  };
1:  
1:  struct nfs4_stateid_struct {
1: -	union {
1: -		char data[16];
1: -		struct {
1: -			__be32 seqid;
1: -			char other[12];
1: -		};
1: -	};
1: -	enum {
1: -		NFS4_INVALID_STATEID_TYPE = 0,
1: -		NFS4_SPECIAL_STATEID_TYPE = 1,
1: -		NFS4_OPEN_STATEID_TYPE = 2,
1: -		NFS4_LOCK_STATEID_TYPE = 3,
1: -		NFS4_DELEGATION_STATEID_TYPE = 4,
1: -		NFS4_LAYOUT_STATEID_TYPE = 5,
1: -		NFS4_PNFS_DS_STATEID_TYPE = 6,
1: -		NFS4_REVOKED_STATEID_TYPE = 7,
1: -	} type;
1: +  union {
1: +    char data[16];
1: +    struct {
1: +      __be32 seqid;
1: +      char other[12];
1: +    };
1: +  };
1: +  enum {
1: +    NFS4_INVALID_STATEID_TYPE = 0,
1: +    NFS4_SPECIAL_STATEID_TYPE = 1,
1: +    NFS4_OPEN_STATEID_TYPE = 2,
1: +    NFS4_LOCK_STATEID_TYPE = 3,
1: +    NFS4_DELEGATION_STATEID_TYPE = 4,
1: +    NFS4_LAYOUT_STATEID_TYPE = 5,
1: +    NFS4_PNFS_DS_STATEID_TYPE = 6,
1: +    NFS4_REVOKED_STATEID_TYPE = 7,
1: +  } type;
1:  };
1:  
1:  typedef struct nfs4_stateid_struct nfs4_stateid;
1: @@ -43799,26 +44298,26 @@ typedef struct nfs4_stateid_struct nfs4_stateid;
1:  struct nfs4_state;
1:  
1:  struct nfs4_lock_state {
1: -	struct list_head ls_locks;
1: -	struct nfs4_state *ls_state;
1: -	long unsigned int ls_flags;
1: -	struct nfs_seqid_counter ls_seqid;
1: -	nfs4_stateid ls_stateid;
1: -	refcount_t ls_count;
1: -	fl_owner_t ls_owner;
1: +  struct list_head ls_locks;
1: +  struct nfs4_state *ls_state;
1: +  long unsigned int ls_flags;
1: +  struct nfs_seqid_counter ls_seqid;
1: +  nfs4_stateid ls_stateid;
1: +  refcount_t ls_count;
1: +  fl_owner_t ls_owner;
1:  };
1:  
1:  struct rpc_rqst;
1:  
1:  struct xdr_stream {
1: -	__be32 *p;
1: -	struct xdr_buf *buf;
1: -	__be32 *end;
1: -	struct kvec *iov;
1: -	struct kvec scratch;
1: -	struct page **page_ptr;
1: -	unsigned int nwords;
1: -	struct rpc_rqst *rqst;
1: +  __be32 *p;
1: +  struct xdr_buf *buf;
1: +  __be32 *end;
1: +  struct kvec *iov;
1: +  struct kvec scratch;
1: +  struct page **page_ptr;
1: +  unsigned int nwords;
1: +  struct rpc_rqst *rqst;
1:  };
1:  
1:  struct rpc_xprt;
1: @@ -43828,70 +44327,71 @@ struct rpc_task;
1:  struct rpc_cred;
1:  
1:  struct rpc_rqst {
1: -	struct rpc_xprt *rq_xprt;
1: -	struct xdr_buf rq_snd_buf;
1: -	struct xdr_buf rq_rcv_buf;
1: -	struct rpc_task *rq_task;
1: -	struct rpc_cred *rq_cred;
1: -	__be32 rq_xid;
1: -	int rq_cong;
1: -	u32 rq_seqno;
1: -	int rq_enc_pages_num;
1: -	struct page **rq_enc_pages;
1: -	void (*rq_release_snd_buf)(struct rpc_rqst *);
1: -	union {
1: -		struct list_head rq_list;
1: -		struct rb_node rq_recv;
1: -	};
1: -	struct list_head rq_xmit;
1: -	struct list_head rq_xmit2;
1: -	void *rq_buffer;
1: -	size_t rq_callsize;
1: -	void *rq_rbuffer;
1: -	size_t rq_rcvsize;
1: -	size_t rq_xmit_bytes_sent;
1: -	size_t rq_reply_bytes_recvd;
1: -	struct xdr_buf rq_private_buf;
1: -	long unsigned int rq_majortimeo;
1: -	long unsigned int rq_minortimeo;
1: -	long unsigned int rq_timeout;
1: -	ktime_t rq_rtt;
1: -	unsigned int rq_retries;
1: -	unsigned int rq_connect_cookie;
1: -	atomic_t rq_pin;
1: -	u32 rq_bytes_sent;
1: -	ktime_t rq_xtime;
1: -	int rq_ntrans;
1: -};
1: -
1: -typedef void (*kxdreproc_t)(struct rpc_rqst *, struct xdr_stream *, const void *);
1: +  struct rpc_xprt *rq_xprt;
1: +  struct xdr_buf rq_snd_buf;
1: +  struct xdr_buf rq_rcv_buf;
1: +  struct rpc_task *rq_task;
1: +  struct rpc_cred *rq_cred;
1: +  __be32 rq_xid;
1: +  int rq_cong;
1: +  u32 rq_seqno;
1: +  int rq_enc_pages_num;
1: +  struct page **rq_enc_pages;
1: +  void (*rq_release_snd_buf)(struct rpc_rqst *);
1: +  union {
1: +    struct list_head rq_list;
1: +    struct rb_node rq_recv;
1: +  };
1: +  struct list_head rq_xmit;
1: +  struct list_head rq_xmit2;
1: +  void *rq_buffer;
1: +  size_t rq_callsize;
1: +  void *rq_rbuffer;
1: +  size_t rq_rcvsize;
1: +  size_t rq_xmit_bytes_sent;
1: +  size_t rq_reply_bytes_recvd;
1: +  struct xdr_buf rq_private_buf;
1: +  long unsigned int rq_majortimeo;
1: +  long unsigned int rq_minortimeo;
1: +  long unsigned int rq_timeout;
1: +  ktime_t rq_rtt;
1: +  unsigned int rq_retries;
1: +  unsigned int rq_connect_cookie;
1: +  atomic_t rq_pin;
1: +  u32 rq_bytes_sent;
1: +  ktime_t rq_xtime;
1: +  int rq_ntrans;
1: +};
1: +
1: +typedef void (*kxdreproc_t)(struct rpc_rqst *, struct xdr_stream *,
1: +                            const void *);
1:  
1:  typedef int (*kxdrdproc_t)(struct rpc_rqst *, struct xdr_stream *, void *);
1:  
1:  struct rpc_procinfo;
1:  
1:  struct rpc_message {
1: -	const struct rpc_procinfo *rpc_proc;
1: -	void *rpc_argp;
1: -	void *rpc_resp;
1: -	const struct cred *rpc_cred;
1: +  const struct rpc_procinfo *rpc_proc;
1: +  void *rpc_argp;
1: +  void *rpc_resp;
1: +  const struct cred *rpc_cred;
1:  };
1:  
1:  struct rpc_procinfo {
1: -	u32 p_proc;
1: -	kxdreproc_t p_encode;
1: -	kxdrdproc_t p_decode;
1: -	unsigned int p_arglen;
1: -	unsigned int p_replen;
1: -	unsigned int p_timer;
1: -	u32 p_statidx;
1: -	const char *p_name;
1: +  u32 p_proc;
1: +  kxdreproc_t p_encode;
1: +  kxdrdproc_t p_decode;
1: +  unsigned int p_arglen;
1: +  unsigned int p_replen;
1: +  unsigned int p_timer;
1: +  u32 p_statidx;
1: +  const char *p_name;
1:  };
1:  
1:  struct rpc_wait {
1: -	struct list_head list;
1: -	struct list_head links;
1: -	struct list_head timer_list;
1: +  struct list_head list;
1: +  struct list_head links;
1: +  struct list_head timer_list;
1:  };
1:  
1:  struct rpc_call_ops;
1: @@ -43899,63 +44399,63 @@ struct rpc_call_ops;
1:  struct rpc_clnt;
1:  
1:  struct rpc_task {
1: -	atomic_t tk_count;
1: -	int tk_status;
1: -	struct list_head tk_task;
1: -	void (*tk_callback)(struct rpc_task *);
1: -	void (*tk_action)(struct rpc_task *);
1: -	long unsigned int tk_timeout;
1: -	long unsigned int tk_runstate;
1: -	struct rpc_wait_queue *tk_waitqueue;
1: -	union {
1: -		struct work_struct tk_work;
1: -		struct rpc_wait tk_wait;
1: -	} u;
1: -	int tk_rpc_status;
1: -	struct rpc_message tk_msg;
1: -	void *tk_calldata;
1: -	const struct rpc_call_ops *tk_ops;
1: -	struct rpc_clnt *tk_client;
1: -	struct rpc_xprt *tk_xprt;
1: -	struct rpc_cred *tk_op_cred;
1: -	struct rpc_rqst *tk_rqstp;
1: -	struct workqueue_struct *tk_workqueue;
1: -	ktime_t tk_start;
1: -	pid_t tk_owner;
1: -	short unsigned int tk_flags;
1: -	short unsigned int tk_timeouts;
1: -	short unsigned int tk_pid;
1: -	unsigned char tk_priority: 2;
1: -	unsigned char tk_garb_retry: 2;
1: -	unsigned char tk_cred_retry: 2;
1: -	unsigned char tk_rebind_retry: 2;
1: +  atomic_t tk_count;
1: +  int tk_status;
1: +  struct list_head tk_task;
1: +  void (*tk_callback)(struct rpc_task *);
1: +  void (*tk_action)(struct rpc_task *);
1: +  long unsigned int tk_timeout;
1: +  long unsigned int tk_runstate;
1: +  struct rpc_wait_queue *tk_waitqueue;
1: +  union {
1: +    struct work_struct tk_work;
1: +    struct rpc_wait tk_wait;
1: +  } u;
1: +  int tk_rpc_status;
1: +  struct rpc_message tk_msg;
1: +  void *tk_calldata;
1: +  const struct rpc_call_ops *tk_ops;
1: +  struct rpc_clnt *tk_client;
1: +  struct rpc_xprt *tk_xprt;
1: +  struct rpc_cred *tk_op_cred;
1: +  struct rpc_rqst *tk_rqstp;
1: +  struct workqueue_struct *tk_workqueue;
1: +  ktime_t tk_start;
1: +  pid_t tk_owner;
1: +  short unsigned int tk_flags;
1: +  short unsigned int tk_timeouts;
1: +  short unsigned int tk_pid;
1: +  unsigned char tk_priority : 2;
1: +  unsigned char tk_garb_retry : 2;
1: +  unsigned char tk_cred_retry : 2;
1: +  unsigned char tk_rebind_retry : 2;
1:  };
1:  
1:  struct rpc_call_ops {
1: -	void (*rpc_call_prepare)(struct rpc_task *, void *);
1: -	void (*rpc_call_done)(struct rpc_task *, void *);
1: -	void (*rpc_count_stats)(struct rpc_task *, void *);
1: -	void (*rpc_release)(void *);
1: +  void (*rpc_call_prepare)(struct rpc_task *, void *);
1: +  void (*rpc_call_done)(struct rpc_task *, void *);
1: +  void (*rpc_count_stats)(struct rpc_task *, void *);
1: +  void (*rpc_release)(void *);
1:  };
1:  
1:  struct rpc_pipe_dir_head {
1: -	struct list_head pdh_entries;
1: -	struct dentry *pdh_dentry;
1: +  struct list_head pdh_entries;
1: +  struct dentry *pdh_dentry;
1:  };
1:  
1:  struct rpc_rtt {
1: -	long unsigned int timeo;
1: -	long unsigned int srtt[5];
1: -	long unsigned int sdrtt[5];
1: -	int ntimeouts[5];
1: +  long unsigned int timeo;
1: +  long unsigned int srtt[5];
1: +  long unsigned int sdrtt[5];
1: +  int ntimeouts[5];
1:  };
1:  
1:  struct rpc_timeout {
1: -	long unsigned int to_initval;
1: -	long unsigned int to_maxval;
1: -	long unsigned int to_increment;
1: -	unsigned int to_retries;
1: -	unsigned char to_exponential;
1: +  long unsigned int to_initval;
1: +  long unsigned int to_maxval;
1: +  long unsigned int to_increment;
1: +  unsigned int to_retries;
1: +  unsigned char to_exponential;
1:  };
1:  
1:  struct rpc_xprt_switch;
1: @@ -43963,9 +44463,9 @@ struct rpc_xprt_switch;
1:  struct rpc_xprt_iter_ops;
1:  
1:  struct rpc_xprt_iter {
1: -	struct rpc_xprt_switch *xpi_xpswitch;
1: -	struct rpc_xprt *xpi_cursor;
1: -	const struct rpc_xprt_iter_ops *xpi_ops;
1: +  struct rpc_xprt_switch *xpi_xpswitch;
1: +  struct rpc_xprt *xpi_cursor;
1: +  const struct rpc_xprt_iter_ops *xpi_ops;
1:  };
1:  
1:  struct rpc_auth;
1: @@ -43977,41 +44477,41 @@ struct rpc_iostats;
1:  struct rpc_program;
1:  
1:  struct rpc_clnt {
1: -	atomic_t cl_count;
1: -	unsigned int cl_clid;
1: -	struct list_head cl_clients;
1: -	struct list_head cl_tasks;
1: -	spinlock_t cl_lock;
1: -	struct rpc_xprt *cl_xprt;
1: -	const struct rpc_procinfo *cl_procinfo;
1: -	u32 cl_prog;
1: -	u32 cl_vers;
1: -	u32 cl_maxproc;
1: -	struct rpc_auth *cl_auth;
1: -	struct rpc_stat *cl_stats;
1: -	struct rpc_iostats *cl_metrics;
1: -	unsigned int cl_softrtry: 1;
1: -	unsigned int cl_softerr: 1;
1: -	unsigned int cl_discrtry: 1;
1: -	unsigned int cl_noretranstimeo: 1;
1: -	unsigned int cl_autobind: 1;
1: -	unsigned int cl_chatty: 1;
1: -	struct rpc_rtt *cl_rtt;
1: -	const struct rpc_timeout *cl_timeout;
1: -	atomic_t cl_swapper;
1: -	int cl_nodelen;
1: -	char cl_nodename[65];
1: -	struct rpc_pipe_dir_head cl_pipedir_objects;
1: -	struct rpc_clnt *cl_parent;
1: -	struct rpc_rtt cl_rtt_default;
1: -	struct rpc_timeout cl_timeout_default;
1: -	const struct rpc_program *cl_program;
1: -	const char *cl_principal;
1: -	union {
1: -		struct rpc_xprt_iter cl_xpi;
1: -		struct work_struct cl_work;
1: -	};
1: -	const struct cred *cl_cred;
1: +  atomic_t cl_count;
1: +  unsigned int cl_clid;
1: +  struct list_head cl_clients;
1: +  struct list_head cl_tasks;
1: +  spinlock_t cl_lock;
1: +  struct rpc_xprt *cl_xprt;
1: +  const struct rpc_procinfo *cl_procinfo;
1: +  u32 cl_prog;
1: +  u32 cl_vers;
1: +  u32 cl_maxproc;
1: +  struct rpc_auth *cl_auth;
1: +  struct rpc_stat *cl_stats;
1: +  struct rpc_iostats *cl_metrics;
1: +  unsigned int cl_softrtry : 1;
1: +  unsigned int cl_softerr : 1;
1: +  unsigned int cl_discrtry : 1;
1: +  unsigned int cl_noretranstimeo : 1;
1: +  unsigned int cl_autobind : 1;
1: +  unsigned int cl_chatty : 1;
1: +  struct rpc_rtt *cl_rtt;
1: +  const struct rpc_timeout *cl_timeout;
1: +  atomic_t cl_swapper;
1: +  int cl_nodelen;
1: +  char cl_nodename[65];
1: +  struct rpc_pipe_dir_head cl_pipedir_objects;
1: +  struct rpc_clnt *cl_parent;
1: +  struct rpc_rtt cl_rtt_default;
1: +  struct rpc_timeout cl_timeout_default;
1: +  const struct rpc_program *cl_program;
1: +  const char *cl_principal;
1: +  union {
1: +    struct rpc_xprt_iter cl_xpi;
1: +    struct work_struct cl_work;
1: +  };
1: +  const struct cred *cl_cred;
1:  };
1:  
1:  struct rpc_xprt_ops;
1: @@ -44019,86 +44519,86 @@ struct rpc_xprt_ops;
1:  struct svc_xprt;
1:  
1:  struct rpc_xprt {
1: -	struct kref kref;
1: -	const struct rpc_xprt_ops *ops;
1: -	const struct rpc_timeout *timeout;
1: -	struct __kernel_sockaddr_storage addr;
1: -	size_t addrlen;
1: -	int prot;
1: -	long unsigned int cong;
1: -	long unsigned int cwnd;
1: -	size_t max_payload;
1: -	struct rpc_wait_queue binding;
1: -	struct rpc_wait_queue sending;
1: -	struct rpc_wait_queue pending;
1: -	struct rpc_wait_queue backlog;
1: -	struct list_head free;
1: -	unsigned int max_reqs;
1: -	unsigned int min_reqs;
1: -	unsigned int num_reqs;
1: -	long unsigned int state;
1: -	unsigned char resvport: 1;
1: -	unsigned char reuseport: 1;
1: -	atomic_t swapper;
1: -	unsigned int bind_index;
1: -	struct list_head xprt_switch;
1: -	long unsigned int bind_timeout;
1: -	long unsigned int reestablish_timeout;
1: -	unsigned int connect_cookie;
1: -	struct work_struct task_cleanup;
1: -	struct timer_list timer;
1: -	long unsigned int last_used;
1: -	long unsigned int idle_timeout;
1: -	long unsigned int connect_timeout;
1: -	long unsigned int max_reconnect_timeout;
1: -	atomic_long_t queuelen;
1: -	spinlock_t transport_lock;
1: -	spinlock_t reserve_lock;
1: -	spinlock_t queue_lock;
1: -	u32 xid;
1: -	struct rpc_task *snd_task;
1: -	struct list_head xmit_queue;
1: -	struct svc_xprt *bc_xprt;
1: -	struct rb_root recv_queue;
1: -	struct {
1: -		long unsigned int bind_count;
1: -		long unsigned int connect_count;
1: -		long unsigned int connect_start;
1: -		long unsigned int connect_time;
1: -		long unsigned int sends;
1: -		long unsigned int recvs;
1: -		long unsigned int bad_xids;
1: -		long unsigned int max_slots;
1: -		long long unsigned int req_u;
1: -		long long unsigned int bklog_u;
1: -		long long unsigned int sending_u;
1: -		long long unsigned int pending_u;
1: -	} stat;
1: -	struct net *xprt_net;
1: -	const char *servername;
1: -	const char *address_strings[6];
1: -	struct callback_head rcu;
1: +  struct kref kref;
1: +  const struct rpc_xprt_ops *ops;
1: +  const struct rpc_timeout *timeout;
1: +  struct __kernel_sockaddr_storage addr;
1: +  size_t addrlen;
1: +  int prot;
1: +  long unsigned int cong;
1: +  long unsigned int cwnd;
1: +  size_t max_payload;
1: +  struct rpc_wait_queue binding;
1: +  struct rpc_wait_queue sending;
1: +  struct rpc_wait_queue pending;
1: +  struct rpc_wait_queue backlog;
1: +  struct list_head free;
1: +  unsigned int max_reqs;
1: +  unsigned int min_reqs;
1: +  unsigned int num_reqs;
1: +  long unsigned int state;
1: +  unsigned char resvport : 1;
1: +  unsigned char reuseport : 1;
1: +  atomic_t swapper;
1: +  unsigned int bind_index;
1: +  struct list_head xprt_switch;
1: +  long unsigned int bind_timeout;
1: +  long unsigned int reestablish_timeout;
1: +  unsigned int connect_cookie;
1: +  struct work_struct task_cleanup;
1: +  struct timer_list timer;
1: +  long unsigned int last_used;
1: +  long unsigned int idle_timeout;
1: +  long unsigned int connect_timeout;
1: +  long unsigned int max_reconnect_timeout;
1: +  atomic_long_t queuelen;
1: +  spinlock_t transport_lock;
1: +  spinlock_t reserve_lock;
1: +  spinlock_t queue_lock;
1: +  u32 xid;
1: +  struct rpc_task *snd_task;
1: +  struct list_head xmit_queue;
1: +  struct svc_xprt *bc_xprt;
1: +  struct rb_root recv_queue;
1: +  struct {
1: +    long unsigned int bind_count;
1: +    long unsigned int connect_count;
1: +    long unsigned int connect_start;
1: +    long unsigned int connect_time;
1: +    long unsigned int sends;
1: +    long unsigned int recvs;
1: +    long unsigned int bad_xids;
1: +    long unsigned int max_slots;
1: +    long long unsigned int req_u;
1: +    long long unsigned int bklog_u;
1: +    long long unsigned int sending_u;
1: +    long long unsigned int pending_u;
1: +  } stat;
1: +  struct net *xprt_net;
1: +  const char *servername;
1: +  const char *address_strings[6];
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct rpc_credops;
1:  
1:  struct rpc_cred {
1: -	struct hlist_node cr_hash;
1: -	struct list_head cr_lru;
1: -	struct callback_head cr_rcu;
1: -	struct rpc_auth *cr_auth;
1: -	const struct rpc_credops *cr_ops;
1: -	long unsigned int cr_expire;
1: -	long unsigned int cr_flags;
1: -	refcount_t cr_count;
1: -	const struct cred *cr_cred;
1: +  struct hlist_node cr_hash;
1: +  struct list_head cr_lru;
1: +  struct callback_head cr_rcu;
1: +  struct rpc_auth *cr_auth;
1: +  const struct rpc_credops *cr_ops;
1: +  long unsigned int cr_expire;
1: +  long unsigned int cr_flags;
1: +  refcount_t cr_count;
1: +  const struct cred *cr_cred;
1:  };
1:  
1:  typedef u32 rpc_authflavor_t;
1:  
1:  struct auth_cred {
1: -	const struct cred *cred;
1: -	const char *principal;
1: +  const struct cred *cred;
1: +  const char *principal;
1:  };
1:  
1:  struct rpc_authops;
1: @@ -44106,30 +44606,30 @@ struct rpc_authops;
1:  struct rpc_cred_cache;
1:  
1:  struct rpc_auth {
1: -	unsigned int au_cslack;
1: -	unsigned int au_rslack;
1: -	unsigned int au_verfsize;
1: -	unsigned int au_ralign;
1: -	long unsigned int au_flags;
1: -	const struct rpc_authops *au_ops;
1: -	rpc_authflavor_t au_flavor;
1: -	refcount_t au_count;
1: -	struct rpc_cred_cache *au_credcache;
1: +  unsigned int au_cslack;
1: +  unsigned int au_rslack;
1: +  unsigned int au_verfsize;
1: +  unsigned int au_ralign;
1: +  long unsigned int au_flags;
1: +  const struct rpc_authops *au_ops;
1: +  rpc_authflavor_t au_flavor;
1: +  refcount_t au_count;
1: +  struct rpc_cred_cache *au_credcache;
1:  };
1:  
1:  struct rpc_credops {
1: -	const char *cr_name;
1: -	int (*cr_init)(struct rpc_auth *, struct rpc_cred *);
1: -	void (*crdestroy)(struct rpc_cred *);
1: -	int (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
1: -	int (*crmarshal)(struct rpc_task *, struct xdr_stream *);
1: -	int (*crrefresh)(struct rpc_task *);
1: -	int (*crvalidate)(struct rpc_task *, struct xdr_stream *);
1: -	int (*crwrap_req)(struct rpc_task *, struct xdr_stream *);
1: -	int (*crunwrap_resp)(struct rpc_task *, struct xdr_stream *);
1: -	int (*crkey_timeout)(struct rpc_cred *);
1: -	char * (*crstringify_acceptor)(struct rpc_cred *);
1: -	bool (*crneed_reencode)(struct rpc_task *);
1: +  const char *cr_name;
1: +  int (*cr_init)(struct rpc_auth *, struct rpc_cred *);
1: +  void (*crdestroy)(struct rpc_cred *);
1: +  int (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
1: +  int (*crmarshal)(struct rpc_task *, struct xdr_stream *);
1: +  int (*crrefresh)(struct rpc_task *);
1: +  int (*crvalidate)(struct rpc_task *, struct xdr_stream *);
1: +  int (*crwrap_req)(struct rpc_task *, struct xdr_stream *);
1: +  int (*crunwrap_resp)(struct rpc_task *, struct xdr_stream *);
1: +  int (*crkey_timeout)(struct rpc_cred *);
1: +  char *(*crstringify_acceptor)(struct rpc_cred *);
1: +  bool (*crneed_reencode)(struct rpc_task *);
1:  };
1:  
1:  struct rpc_auth_create_args;
1: @@ -44137,281 +44637,282 @@ struct rpc_auth_create_args;
1:  struct rpcsec_gss_info;
1:  
1:  struct rpc_authops {
1: -	struct module *owner;
1: -	rpc_authflavor_t au_flavor;
1: -	char *au_name;
1: -	struct rpc_auth * (*create)(const struct rpc_auth_create_args *, struct rpc_clnt *);
1: -	void (*destroy)(struct rpc_auth *);
1: -	int (*hash_cred)(struct auth_cred *, unsigned int);
1: -	struct rpc_cred * (*lookup_cred)(struct rpc_auth *, struct auth_cred *, int);
1: -	struct rpc_cred * (*crcreate)(struct rpc_auth *, struct auth_cred *, int, gfp_t);
1: -	rpc_authflavor_t (*info2flavor)(struct rpcsec_gss_info *);
1: -	int (*flavor2info)(rpc_authflavor_t, struct rpcsec_gss_info *);
1: -	int (*key_timeout)(struct rpc_auth *, struct rpc_cred *);
1: +  struct module *owner;
1: +  rpc_authflavor_t au_flavor;
1: +  char *au_name;
1: +  struct rpc_auth *(*create)(const struct rpc_auth_create_args *,
1: +                             struct rpc_clnt *);
1: +  void (*destroy)(struct rpc_auth *);
1: +  int (*hash_cred)(struct auth_cred *, unsigned int);
1: +  struct rpc_cred *(*lookup_cred)(struct rpc_auth *, struct auth_cred *, int);
1: +  struct rpc_cred *(*crcreate)(struct rpc_auth *, struct auth_cred *, int,
1: +                               gfp_t);
1: +  rpc_authflavor_t (*info2flavor)(struct rpcsec_gss_info *);
1: +  int (*flavor2info)(rpc_authflavor_t, struct rpcsec_gss_info *);
1: +  int (*key_timeout)(struct rpc_auth *, struct rpc_cred *);
1:  };
1:  
1:  struct rpc_auth_create_args {
1: -	rpc_authflavor_t pseudoflavor;
1: -	const char *target_name;
1: +  rpc_authflavor_t pseudoflavor;
1: +  const char *target_name;
1:  };
1:  
1:  struct rpcsec_gss_oid {
1: -	unsigned int len;
1: -	u8 data[32];
1: +  unsigned int len;
1: +  u8 data[32];
1:  };
1:  
1:  struct rpcsec_gss_info {
1: -	struct rpcsec_gss_oid oid;
1: -	u32 qop;
1: -	u32 service;
1: +  struct rpcsec_gss_oid oid;
1: +  u32 qop;
1: +  u32 service;
1:  };
1:  
1:  struct rpc_xprt_ops {
1: -	void (*set_buffer_size)(struct rpc_xprt *, size_t, size_t);
1: -	int (*reserve_xprt)(struct rpc_xprt *, struct rpc_task *);
1: -	void (*release_xprt)(struct rpc_xprt *, struct rpc_task *);
1: -	void (*alloc_slot)(struct rpc_xprt *, struct rpc_task *);
1: -	void (*free_slot)(struct rpc_xprt *, struct rpc_rqst *);
1: -	void (*rpcbind)(struct rpc_task *);
1: -	void (*set_port)(struct rpc_xprt *, short unsigned int);
1: -	void (*connect)(struct rpc_xprt *, struct rpc_task *);
1: -	int (*buf_alloc)(struct rpc_task *);
1: -	void (*buf_free)(struct rpc_task *);
1: -	void (*prepare_request)(struct rpc_rqst *);
1: -	int (*send_request)(struct rpc_rqst *);
1: -	void (*wait_for_reply_request)(struct rpc_task *);
1: -	void (*timer)(struct rpc_xprt *, struct rpc_task *);
1: -	void (*release_request)(struct rpc_task *);
1: -	void (*close)(struct rpc_xprt *);
1: -	void (*destroy)(struct rpc_xprt *);
1: -	void (*set_connect_timeout)(struct rpc_xprt *, long unsigned int, long unsigned int);
1: -	void (*print_stats)(struct rpc_xprt *, struct seq_file *);
1: -	int (*enable_swap)(struct rpc_xprt *);
1: -	void (*disable_swap)(struct rpc_xprt *);
1: -	void (*inject_disconnect)(struct rpc_xprt *);
1: -	int (*bc_setup)(struct rpc_xprt *, unsigned int);
1: -	size_t (*bc_maxpayload)(struct rpc_xprt *);
1: -	unsigned int (*bc_num_slots)(struct rpc_xprt *);
1: -	void (*bc_free_rqst)(struct rpc_rqst *);
1: -	void (*bc_destroy)(struct rpc_xprt *, unsigned int);
1: +  void (*set_buffer_size)(struct rpc_xprt *, size_t, size_t);
1: +  int (*reserve_xprt)(struct rpc_xprt *, struct rpc_task *);
1: +  void (*release_xprt)(struct rpc_xprt *, struct rpc_task *);
1: +  void (*alloc_slot)(struct rpc_xprt *, struct rpc_task *);
1: +  void (*free_slot)(struct rpc_xprt *, struct rpc_rqst *);
1: +  void (*rpcbind)(struct rpc_task *);
1: +  void (*set_port)(struct rpc_xprt *, short unsigned int);
1: +  void (*connect)(struct rpc_xprt *, struct rpc_task *);
1: +  int (*buf_alloc)(struct rpc_task *);
1: +  void (*buf_free)(struct rpc_task *);
1: +  void (*prepare_request)(struct rpc_rqst *);
1: +  int (*send_request)(struct rpc_rqst *);
1: +  void (*wait_for_reply_request)(struct rpc_task *);
1: +  void (*timer)(struct rpc_xprt *, struct rpc_task *);
1: +  void (*release_request)(struct rpc_task *);
1: +  void (*close)(struct rpc_xprt *);
1: +  void (*destroy)(struct rpc_xprt *);
1: +  void (*set_connect_timeout)(struct rpc_xprt *, long unsigned int,
1: +                              long unsigned int);
1: +  void (*print_stats)(struct rpc_xprt *, struct seq_file *);
1: +  int (*enable_swap)(struct rpc_xprt *);
1: +  void (*disable_swap)(struct rpc_xprt *);
1: +  void (*inject_disconnect)(struct rpc_xprt *);
1: +  int (*bc_setup)(struct rpc_xprt *, unsigned int);
1: +  size_t (*bc_maxpayload)(struct rpc_xprt *);
1: +  unsigned int (*bc_num_slots)(struct rpc_xprt *);
1: +  void (*bc_free_rqst)(struct rpc_rqst *);
1: +  void (*bc_destroy)(struct rpc_xprt *, unsigned int);
1:  };
1:  
1:  struct rpc_xprt_switch {
1: -	spinlock_t xps_lock;
1: -	struct kref xps_kref;
1: -	unsigned int xps_nxprts;
1: -	unsigned int xps_nactive;
1: -	atomic_long_t xps_queuelen;
1: -	struct list_head xps_xprt_list;
1: -	struct net *xps_net;
1: -	const struct rpc_xprt_iter_ops *xps_iter_ops;
1: -	struct callback_head xps_rcu;
1: +  spinlock_t xps_lock;
1: +  struct kref xps_kref;
1: +  unsigned int xps_nxprts;
1: +  unsigned int xps_nactive;
1: +  atomic_long_t xps_queuelen;
1: +  struct list_head xps_xprt_list;
1: +  struct net *xps_net;
1: +  const struct rpc_xprt_iter_ops *xps_iter_ops;
1: +  struct callback_head xps_rcu;
1:  };
1:  
1:  struct rpc_stat {
1: -	const struct rpc_program *program;
1: -	unsigned int netcnt;
1: -	unsigned int netudpcnt;
1: -	unsigned int nettcpcnt;
1: -	unsigned int nettcpconn;
1: -	unsigned int netreconn;
1: -	unsigned int rpccnt;
1: -	unsigned int rpcretrans;
1: -	unsigned int rpcauthrefresh;
1: -	unsigned int rpcgarbage;
1: +  const struct rpc_program *program;
1: +  unsigned int netcnt;
1: +  unsigned int netudpcnt;
1: +  unsigned int nettcpcnt;
1: +  unsigned int nettcpconn;
1: +  unsigned int netreconn;
1: +  unsigned int rpccnt;
1: +  unsigned int rpcretrans;
1: +  unsigned int rpcauthrefresh;
1: +  unsigned int rpcgarbage;
1:  };
1:  
1:  struct rpc_version;
1:  
1:  struct rpc_program {
1: -	const char *name;
1: -	u32 number;
1: -	unsigned int nrvers;
1: -	const struct rpc_version **version;
1: -	struct rpc_stat *stats;
1: -	const char *pipe_dir_name;
1: +  const char *name;
1: +  u32 number;
1: +  unsigned int nrvers;
1: +  const struct rpc_version **version;
1: +  struct rpc_stat *stats;
1: +  const char *pipe_dir_name;
1:  };
1:  
1:  struct rpc_xprt_iter_ops {
1: -	void (*xpi_rewind)(struct rpc_xprt_iter *);
1: -	struct rpc_xprt * (*xpi_xprt)(struct rpc_xprt_iter *);
1: -	struct rpc_xprt * (*xpi_next)(struct rpc_xprt_iter *);
1: +  void (*xpi_rewind)(struct rpc_xprt_iter *);
1: +  struct rpc_xprt *(*xpi_xprt)(struct rpc_xprt_iter *);
1: +  struct rpc_xprt *(*xpi_next)(struct rpc_xprt_iter *);
1:  };
1:  
1:  struct rpc_version {
1: -	u32 number;
1: -	unsigned int nrprocs;
1: -	const struct rpc_procinfo *procs;
1: -	unsigned int *counts;
1: +  u32 number;
1: +  unsigned int nrprocs;
1: +  const struct rpc_procinfo *procs;
1: +  unsigned int *counts;
1:  };
1:  
1:  struct nfs_fh {
1: -	short unsigned int size;
1: -	unsigned char data[128];
1: +  short unsigned int size;
1: +  unsigned char data[128];
1:  };
1:  
1:  enum nfs3_stable_how {
1: -	NFS_UNSTABLE = 0,
1: -	NFS_DATA_SYNC = 1,
1: -	NFS_FILE_SYNC = 2,
1: -	NFS_INVALID_STABLE_HOW = 4294967295,
1: +  NFS_UNSTABLE = 0,
1: +  NFS_DATA_SYNC = 1,
1: +  NFS_FILE_SYNC = 2,
1: +  NFS_INVALID_STABLE_HOW = 4294967295,
1:  };
1:  
1:  struct nfs4_label {
1: -	uint32_t lfs;
1: -	uint32_t pi;
1: -	u32 len;
1: -	char *label;
1: +  uint32_t lfs;
1: +  uint32_t pi;
1: +  u32 len;
1: +  char *label;
1:  };
1:  
1: -typedef struct {
1: -	char data[8];
1: -} nfs4_verifier;
1: +typedef struct { char data[8]; } nfs4_verifier;
1:  
1:  struct nfs4_string {
1: -	unsigned int len;
1: -	char *data;
1: +  unsigned int len;
1: +  char *data;
1:  };
1:  
1:  struct nfs_fsid {
1: -	uint64_t major;
1: -	uint64_t minor;
1: +  uint64_t major;
1: +  uint64_t minor;
1:  };
1:  
1:  struct nfs4_threshold {
1: -	__u32 bm;
1: -	__u32 l_type;
1: -	__u64 rd_sz;
1: -	__u64 wr_sz;
1: -	__u64 rd_io_sz;
1: -	__u64 wr_io_sz;
1: +  __u32 bm;
1: +  __u32 l_type;
1: +  __u64 rd_sz;
1: +  __u64 wr_sz;
1: +  __u64 rd_io_sz;
1: +  __u64 wr_io_sz;
1:  };
1:  
1:  struct nfs_fattr {
1: -	unsigned int valid;
1: -	umode_t mode;
1: -	__u32 nlink;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	dev_t rdev;
1: -	__u64 size;
1: -	union {
1: -		struct {
1: -			__u32 blocksize;
1: -			__u32 blocks;
1: -		} nfs2;
1: -		struct {
1: -			__u64 used;
1: -		} nfs3;
1: -	} du;
1: -	struct nfs_fsid fsid;
1: -	__u64 fileid;
1: -	__u64 mounted_on_fileid;
1: -	struct timespec64 atime;
1: -	struct timespec64 mtime;
1: -	struct timespec64 ctime;
1: -	__u64 change_attr;
1: -	__u64 pre_change_attr;
1: -	__u64 pre_size;
1: -	struct timespec64 pre_mtime;
1: -	struct timespec64 pre_ctime;
1: -	long unsigned int time_start;
1: -	long unsigned int gencount;
1: -	struct nfs4_string *owner_name;
1: -	struct nfs4_string *group_name;
1: -	struct nfs4_threshold *mdsthreshold;
1: -	struct nfs4_label *label;
1: +  unsigned int valid;
1: +  umode_t mode;
1: +  __u32 nlink;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  dev_t rdev;
1: +  __u64 size;
1: +  union {
1: +    struct {
1: +      __u32 blocksize;
1: +      __u32 blocks;
1: +    } nfs2;
1: +    struct {
1: +      __u64 used;
1: +    } nfs3;
1: +  } du;
1: +  struct nfs_fsid fsid;
1: +  __u64 fileid;
1: +  __u64 mounted_on_fileid;
1: +  struct timespec64 atime;
1: +  struct timespec64 mtime;
1: +  struct timespec64 ctime;
1: +  __u64 change_attr;
1: +  __u64 pre_change_attr;
1: +  __u64 pre_size;
1: +  struct timespec64 pre_mtime;
1: +  struct timespec64 pre_ctime;
1: +  long unsigned int time_start;
1: +  long unsigned int gencount;
1: +  struct nfs4_string *owner_name;
1: +  struct nfs4_string *group_name;
1: +  struct nfs4_threshold *mdsthreshold;
1: +  struct nfs4_label *label;
1:  };
1:  
1:  struct nfs_fsinfo {
1: -	struct nfs_fattr *fattr;
1: -	__u32 rtmax;
1: -	__u32 rtpref;
1: -	__u32 rtmult;
1: -	__u32 wtmax;
1: -	__u32 wtpref;
1: -	__u32 wtmult;
1: -	__u32 dtpref;
1: -	__u64 maxfilesize;
1: -	struct timespec64 time_delta;
1: -	__u32 lease_time;
1: -	__u32 nlayouttypes;
1: -	__u32 layouttype[8];
1: -	__u32 blksize;
1: -	__u32 clone_blksize;
1: -	__u32 xattr_support;
1: +  struct nfs_fattr *fattr;
1: +  __u32 rtmax;
1: +  __u32 rtpref;
1: +  __u32 rtmult;
1: +  __u32 wtmax;
1: +  __u32 wtpref;
1: +  __u32 wtmult;
1: +  __u32 dtpref;
1: +  __u64 maxfilesize;
1: +  struct timespec64 time_delta;
1: +  __u32 lease_time;
1: +  __u32 nlayouttypes;
1: +  __u32 layouttype[8];
1: +  __u32 blksize;
1: +  __u32 clone_blksize;
1: +  __u32 xattr_support;
1:  };
1:  
1:  struct nfs_fsstat {
1: -	struct nfs_fattr *fattr;
1: -	__u64 tbytes;
1: -	__u64 fbytes;
1: -	__u64 abytes;
1: -	__u64 tfiles;
1: -	__u64 ffiles;
1: -	__u64 afiles;
1: +  struct nfs_fattr *fattr;
1: +  __u64 tbytes;
1: +  __u64 fbytes;
1: +  __u64 abytes;
1: +  __u64 tfiles;
1: +  __u64 ffiles;
1: +  __u64 afiles;
1:  };
1:  
1:  struct nfs_pathconf {
1: -	struct nfs_fattr *fattr;
1: -	__u32 max_link;
1: -	__u32 max_namelen;
1: +  struct nfs_fattr *fattr;
1: +  __u32 max_link;
1: +  __u32 max_namelen;
1:  };
1:  
1:  struct nfs4_change_info {
1: -	u32 atomic;
1: -	u64 before;
1: -	u64 after;
1: +  u32 atomic;
1: +  u64 before;
1: +  u64 after;
1:  };
1:  
1:  struct nfs4_slot;
1:  
1:  struct nfs4_sequence_args {
1: -	struct nfs4_slot *sa_slot;
1: -	u8 sa_cache_this: 1;
1: -	u8 sa_privileged: 1;
1: +  struct nfs4_slot *sa_slot;
1: +  u8 sa_cache_this : 1;
1: +  u8 sa_privileged : 1;
1:  };
1:  
1:  struct nfs4_sequence_res {
1: -	struct nfs4_slot *sr_slot;
1: -	long unsigned int sr_timestamp;
1: -	int sr_status;
1: -	u32 sr_status_flags;
1: -	u32 sr_highest_slotid;
1: -	u32 sr_target_highest_slotid;
1: +  struct nfs4_slot *sr_slot;
1: +  long unsigned int sr_timestamp;
1: +  int sr_status;
1: +  u32 sr_status_flags;
1: +  u32 sr_highest_slotid;
1: +  u32 sr_target_highest_slotid;
1:  };
1:  
1:  struct nfs_open_context;
1:  
1:  struct nfs_lock_context {
1: -	refcount_t count;
1: -	struct list_head list;
1: -	struct nfs_open_context *open_context;
1: -	fl_owner_t lockowner;
1: -	atomic_t io_count;
1: -	struct callback_head callback_head;
1: +  refcount_t count;
1: +  struct list_head list;
1: +  struct nfs_open_context *open_context;
1: +  fl_owner_t lockowner;
1: +  atomic_t io_count;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct nfs_open_context {
1: -	struct nfs_lock_context lock_context;
1: -	fl_owner_t flock_owner;
1: -	struct dentry *dentry;
1: -	const struct cred *cred;
1: -	struct rpc_cred *ll_cred;
1: -	struct nfs4_state *state;
1: -	fmode_t mode;
1: -	long unsigned int flags;
1: -	int error;
1: -	struct list_head list;
1: -	struct nfs4_threshold *mdsthreshold;
1: -	struct callback_head callback_head;
1: +  struct nfs_lock_context lock_context;
1: +  fl_owner_t flock_owner;
1: +  struct dentry *dentry;
1: +  const struct cred *cred;
1: +  struct rpc_cred *ll_cred;
1: +  struct nfs4_state *state;
1: +  fmode_t mode;
1: +  long unsigned int flags;
1: +  int error;
1: +  struct list_head list;
1: +  struct nfs4_threshold *mdsthreshold;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct nlm_host;
1:  
1:  struct nfs_auth_info {
1: -	unsigned int flavor_len;
1: -	rpc_authflavor_t flavors[12];
1: +  unsigned int flavor_len;
1: +  rpc_authflavor_t flavors[12];
1:  };
1:  
1:  struct pnfs_layoutdriver_type;
1: @@ -44421,67 +44922,67 @@ struct nfs_client;
1:  struct nfs_iostats;
1:  
1:  struct nfs_server {
1: -	struct nfs_client *nfs_client;
1: -	struct list_head client_link;
1: -	struct list_head master_link;
1: -	struct rpc_clnt *client;
1: -	struct rpc_clnt *client_acl;
1: -	struct nlm_host *nlm_host;
1: -	struct nfs_iostats *io_stats;
1: -	atomic_long_t writeback;
1: -	int flags;
1: -	unsigned int caps;
1: -	unsigned int rsize;
1: -	unsigned int rpages;
1: -	unsigned int wsize;
1: -	unsigned int wpages;
1: -	unsigned int wtmult;
1: -	unsigned int dtsize;
1: -	short unsigned int port;
1: -	unsigned int bsize;
1: -	unsigned int acregmin;
1: -	unsigned int acregmax;
1: -	unsigned int acdirmin;
1: -	unsigned int acdirmax;
1: -	unsigned int namelen;
1: -	unsigned int options;
1: -	unsigned int clone_blksize;
1: -	struct nfs_fsid fsid;
1: -	__u64 maxfilesize;
1: -	struct timespec64 time_delta;
1: -	long unsigned int mount_time;
1: -	struct super_block *super;
1: -	dev_t s_dev;
1: -	struct nfs_auth_info auth_info;
1: -	u32 pnfs_blksize;
1: -	u32 attr_bitmask[3];
1: -	u32 attr_bitmask_nl[3];
1: -	u32 exclcreat_bitmask[3];
1: -	u32 cache_consistency_bitmask[3];
1: -	u32 acl_bitmask;
1: -	u32 fh_expire_type;
1: -	struct pnfs_layoutdriver_type *pnfs_curr_ld;
1: -	struct rpc_wait_queue roc_rpcwaitq;
1: -	void *pnfs_ld_data;
1: -	struct rb_root state_owners;
1: -	struct ida openowner_id;
1: -	struct ida lockowner_id;
1: -	struct list_head state_owners_lru;
1: -	struct list_head layouts;
1: -	struct list_head delegations;
1: -	struct list_head ss_copies;
1: -	long unsigned int mig_gen;
1: -	long unsigned int mig_status;
1: -	void (*destroy)(struct nfs_server *);
1: -	atomic_t active;
1: -	struct __kernel_sockaddr_storage mountd_address;
1: -	size_t mountd_addrlen;
1: -	u32 mountd_version;
1: -	short unsigned int mountd_port;
1: -	short unsigned int mountd_protocol;
1: -	struct rpc_wait_queue uoc_rpcwaitq;
1: -	unsigned int read_hdrsize;
1: -	const struct cred *cred;
1: +  struct nfs_client *nfs_client;
1: +  struct list_head client_link;
1: +  struct list_head master_link;
1: +  struct rpc_clnt *client;
1: +  struct rpc_clnt *client_acl;
1: +  struct nlm_host *nlm_host;
1: +  struct nfs_iostats *io_stats;
1: +  atomic_long_t writeback;
1: +  int flags;
1: +  unsigned int caps;
1: +  unsigned int rsize;
1: +  unsigned int rpages;
1: +  unsigned int wsize;
1: +  unsigned int wpages;
1: +  unsigned int wtmult;
1: +  unsigned int dtsize;
1: +  short unsigned int port;
1: +  unsigned int bsize;
1: +  unsigned int acregmin;
1: +  unsigned int acregmax;
1: +  unsigned int acdirmin;
1: +  unsigned int acdirmax;
1: +  unsigned int namelen;
1: +  unsigned int options;
1: +  unsigned int clone_blksize;
1: +  struct nfs_fsid fsid;
1: +  __u64 maxfilesize;
1: +  struct timespec64 time_delta;
1: +  long unsigned int mount_time;
1: +  struct super_block *super;
1: +  dev_t s_dev;
1: +  struct nfs_auth_info auth_info;
1: +  u32 pnfs_blksize;
1: +  u32 attr_bitmask[3];
1: +  u32 attr_bitmask_nl[3];
1: +  u32 exclcreat_bitmask[3];
1: +  u32 cache_consistency_bitmask[3];
1: +  u32 acl_bitmask;
1: +  u32 fh_expire_type;
1: +  struct pnfs_layoutdriver_type *pnfs_curr_ld;
1: +  struct rpc_wait_queue roc_rpcwaitq;
1: +  void *pnfs_ld_data;
1: +  struct rb_root state_owners;
1: +  struct ida openowner_id;
1: +  struct ida lockowner_id;
1: +  struct list_head state_owners_lru;
1: +  struct list_head layouts;
1: +  struct list_head delegations;
1: +  struct list_head ss_copies;
1: +  long unsigned int mig_gen;
1: +  long unsigned int mig_status;
1: +  void (*destroy)(struct nfs_server *);
1: +  atomic_t active;
1: +  struct __kernel_sockaddr_storage mountd_address;
1: +  size_t mountd_addrlen;
1: +  u32 mountd_version;
1: +  short unsigned int mountd_port;
1: +  short unsigned int mountd_protocol;
1: +  struct rpc_wait_queue uoc_rpcwaitq;
1: +  unsigned int read_hdrsize;
1: +  const struct cred *cred;
1:  };
1:  
1:  struct idmap;
1: @@ -44503,188 +45004,188 @@ struct nfs4_slot_table;
1:  struct nfs4_session;
1:  
1:  struct nfs_client {
1: -	refcount_t cl_count;
1: -	atomic_t cl_mds_count;
1: -	int cl_cons_state;
1: -	long unsigned int cl_res_state;
1: -	long unsigned int cl_flags;
1: -	struct __kernel_sockaddr_storage cl_addr;
1: -	size_t cl_addrlen;
1: -	char *cl_hostname;
1: -	char *cl_acceptor;
1: -	struct list_head cl_share_link;
1: -	struct list_head cl_superblocks;
1: -	struct rpc_clnt *cl_rpcclient;
1: -	const struct nfs_rpc_ops *rpc_ops;
1: -	int cl_proto;
1: -	struct nfs_subversion *cl_nfs_mod;
1: -	u32 cl_minorversion;
1: -	unsigned int cl_nconnect;
1: -	const char *cl_principal;
1: -	struct list_head cl_ds_clients;
1: -	u64 cl_clientid;
1: -	nfs4_verifier cl_confirm;
1: -	long unsigned int cl_state;
1: -	spinlock_t cl_lock;
1: -	long unsigned int cl_lease_time;
1: -	long unsigned int cl_last_renewal;
1: -	struct delayed_work cl_renewd;
1: -	struct rpc_wait_queue cl_rpcwaitq;
1: -	struct idmap *cl_idmap;
1: -	const char *cl_owner_id;
1: -	u32 cl_cb_ident;
1: -	const struct nfs4_minor_version_ops *cl_mvops;
1: -	long unsigned int cl_mig_gen;
1: -	struct nfs4_slot_table *cl_slot_tbl;
1: -	u32 cl_seqid;
1: -	u32 cl_exchange_flags;
1: -	struct nfs4_session *cl_session;
1: -	bool cl_preserve_clid;
1: -	struct nfs41_server_owner *cl_serverowner;
1: -	struct nfs41_server_scope *cl_serverscope;
1: -	struct nfs41_impl_id *cl_implid;
1: -	long unsigned int cl_sp4_flags;
1: -	char cl_ipaddr[48];
1: -	struct net *cl_net;
1: -	struct list_head pending_cb_stateids;
1: +  refcount_t cl_count;
1: +  atomic_t cl_mds_count;
1: +  int cl_cons_state;
1: +  long unsigned int cl_res_state;
1: +  long unsigned int cl_flags;
1: +  struct __kernel_sockaddr_storage cl_addr;
1: +  size_t cl_addrlen;
1: +  char *cl_hostname;
1: +  char *cl_acceptor;
1: +  struct list_head cl_share_link;
1: +  struct list_head cl_superblocks;
1: +  struct rpc_clnt *cl_rpcclient;
1: +  const struct nfs_rpc_ops *rpc_ops;
1: +  int cl_proto;
1: +  struct nfs_subversion *cl_nfs_mod;
1: +  u32 cl_minorversion;
1: +  unsigned int cl_nconnect;
1: +  const char *cl_principal;
1: +  struct list_head cl_ds_clients;
1: +  u64 cl_clientid;
1: +  nfs4_verifier cl_confirm;
1: +  long unsigned int cl_state;
1: +  spinlock_t cl_lock;
1: +  long unsigned int cl_lease_time;
1: +  long unsigned int cl_last_renewal;
1: +  struct delayed_work cl_renewd;
1: +  struct rpc_wait_queue cl_rpcwaitq;
1: +  struct idmap *cl_idmap;
1: +  const char *cl_owner_id;
1: +  u32 cl_cb_ident;
1: +  const struct nfs4_minor_version_ops *cl_mvops;
1: +  long unsigned int cl_mig_gen;
1: +  struct nfs4_slot_table *cl_slot_tbl;
1: +  u32 cl_seqid;
1: +  u32 cl_exchange_flags;
1: +  struct nfs4_session *cl_session;
1: +  bool cl_preserve_clid;
1: +  struct nfs41_server_owner *cl_serverowner;
1: +  struct nfs41_server_scope *cl_serverscope;
1: +  struct nfs41_impl_id *cl_implid;
1: +  long unsigned int cl_sp4_flags;
1: +  char cl_ipaddr[48];
1: +  struct net *cl_net;
1: +  struct list_head pending_cb_stateids;
1:  };
1:  
1:  struct nfs_seqid {
1: -	struct nfs_seqid_counter *sequence;
1: -	struct list_head list;
1: -	struct rpc_task *task;
1: +  struct nfs_seqid_counter *sequence;
1: +  struct list_head list;
1: +  struct rpc_task *task;
1:  };
1:  
1:  struct nfs_write_verifier {
1: -	char data[8];
1: +  char data[8];
1:  };
1:  
1:  struct nfs_writeverf {
1: -	struct nfs_write_verifier verifier;
1: -	enum nfs3_stable_how committed;
1: +  struct nfs_write_verifier verifier;
1: +  enum nfs3_stable_how committed;
1:  };
1:  
1:  struct nfs_pgio_args {
1: -	struct nfs4_sequence_args seq_args;
1: -	struct nfs_fh *fh;
1: -	struct nfs_open_context *context;
1: -	struct nfs_lock_context *lock_context;
1: -	nfs4_stateid stateid;
1: -	__u64 offset;
1: -	__u32 count;
1: -	unsigned int pgbase;
1: -	struct page **pages;
1: -	union {
1: -		unsigned int replen;
1: -		struct {
1: -			u32 *bitmask;
1: -			enum nfs3_stable_how stable;
1: -		};
1: -	};
1: +  struct nfs4_sequence_args seq_args;
1: +  struct nfs_fh *fh;
1: +  struct nfs_open_context *context;
1: +  struct nfs_lock_context *lock_context;
1: +  nfs4_stateid stateid;
1: +  __u64 offset;
1: +  __u32 count;
1: +  unsigned int pgbase;
1: +  struct page **pages;
1: +  union {
1: +    unsigned int replen;
1: +    struct {
1: +      u32 *bitmask;
1: +      enum nfs3_stable_how stable;
1: +    };
1: +  };
1:  };
1:  
1:  struct nfs_pgio_res {
1: -	struct nfs4_sequence_res seq_res;
1: -	struct nfs_fattr *fattr;
1: -	__u64 count;
1: -	__u32 op_status;
1: -	union {
1: -		struct {
1: -			unsigned int replen;
1: -			int eof;
1: -		};
1: -		struct {
1: -			struct nfs_writeverf *verf;
1: -			const struct nfs_server *server;
1: -		};
1: -	};
1: +  struct nfs4_sequence_res seq_res;
1: +  struct nfs_fattr *fattr;
1: +  __u64 count;
1: +  __u32 op_status;
1: +  union {
1: +    struct {
1: +      unsigned int replen;
1: +      int eof;
1: +    };
1: +    struct {
1: +      struct nfs_writeverf *verf;
1: +      const struct nfs_server *server;
1: +    };
1: +  };
1:  };
1:  
1:  struct nfs_commitargs {
1: -	struct nfs4_sequence_args seq_args;
1: -	struct nfs_fh *fh;
1: -	__u64 offset;
1: -	__u32 count;
1: -	const u32 *bitmask;
1: +  struct nfs4_sequence_args seq_args;
1: +  struct nfs_fh *fh;
1: +  __u64 offset;
1: +  __u32 count;
1: +  const u32 *bitmask;
1:  };
1:  
1:  struct nfs_commitres {
1: -	struct nfs4_sequence_res seq_res;
1: -	__u32 op_status;
1: -	struct nfs_fattr *fattr;
1: -	struct nfs_writeverf *verf;
1: -	const struct nfs_server *server;
1: +  struct nfs4_sequence_res seq_res;
1: +  __u32 op_status;
1: +  struct nfs_fattr *fattr;
1: +  struct nfs_writeverf *verf;
1: +  const struct nfs_server *server;
1:  };
1:  
1:  struct nfs_removeargs {
1: -	struct nfs4_sequence_args seq_args;
1: -	const struct nfs_fh *fh;
1: -	struct qstr name;
1: +  struct nfs4_sequence_args seq_args;
1: +  const struct nfs_fh *fh;
1: +  struct qstr name;
1:  };
1:  
1:  struct nfs_removeres {
1: -	struct nfs4_sequence_res seq_res;
1: -	struct nfs_server *server;
1: -	struct nfs_fattr *dir_attr;
1: -	struct nfs4_change_info cinfo;
1: +  struct nfs4_sequence_res seq_res;
1: +  struct nfs_server *server;
1: +  struct nfs_fattr *dir_attr;
1: +  struct nfs4_change_info cinfo;
1:  };
1:  
1:  struct nfs_renameargs {
1: -	struct nfs4_sequence_args seq_args;
1: -	const struct nfs_fh *old_dir;
1: -	const struct nfs_fh *new_dir;
1: -	const struct qstr *old_name;
1: -	const struct qstr *new_name;
1: +  struct nfs4_sequence_args seq_args;
1: +  const struct nfs_fh *old_dir;
1: +  const struct nfs_fh *new_dir;
1: +  const struct qstr *old_name;
1: +  const struct qstr *new_name;
1:  };
1:  
1:  struct nfs_renameres {
1: -	struct nfs4_sequence_res seq_res;
1: -	struct nfs_server *server;
1: -	struct nfs4_change_info old_cinfo;
1: -	struct nfs_fattr *old_fattr;
1: -	struct nfs4_change_info new_cinfo;
1: -	struct nfs_fattr *new_fattr;
1: +  struct nfs4_sequence_res seq_res;
1: +  struct nfs_server *server;
1: +  struct nfs4_change_info old_cinfo;
1: +  struct nfs_fattr *old_fattr;
1: +  struct nfs4_change_info new_cinfo;
1: +  struct nfs_fattr *new_fattr;
1:  };
1:  
1:  struct nfs_entry {
1: -	__u64 ino;
1: -	__u64 cookie;
1: -	__u64 prev_cookie;
1: -	const char *name;
1: -	unsigned int len;
1: -	int eof;
1: -	struct nfs_fh *fh;
1: -	struct nfs_fattr *fattr;
1: -	struct nfs4_label *label;
1: -	unsigned char d_type;
1: -	struct nfs_server *server;
1: +  __u64 ino;
1: +  __u64 cookie;
1: +  __u64 prev_cookie;
1: +  const char *name;
1: +  unsigned int len;
1: +  int eof;
1: +  struct nfs_fh *fh;
1: +  struct nfs_fattr *fattr;
1: +  struct nfs4_label *label;
1: +  unsigned char d_type;
1: +  struct nfs_server *server;
1:  };
1:  
1:  struct nfs4_pathname {
1: -	unsigned int ncomponents;
1: -	struct nfs4_string components[512];
1: +  unsigned int ncomponents;
1: +  struct nfs4_string components[512];
1:  };
1:  
1:  struct nfs4_fs_location {
1: -	unsigned int nservers;
1: -	struct nfs4_string servers[10];
1: -	struct nfs4_pathname rootpath;
1: +  unsigned int nservers;
1: +  struct nfs4_string servers[10];
1: +  struct nfs4_pathname rootpath;
1:  };
1:  
1:  struct nfs4_fs_locations {
1: -	struct nfs_fattr fattr;
1: -	const struct nfs_server *server;
1: -	struct nfs4_pathname fs_path;
1: -	int nlocations;
1: -	struct nfs4_fs_location locations[10];
1: +  struct nfs_fattr fattr;
1: +  const struct nfs_server *server;
1: +  struct nfs4_pathname fs_path;
1: +  int nlocations;
1: +  struct nfs4_fs_location locations[10];
1:  };
1:  
1:  struct pnfs_ds_commit_info {};
1:  
1:  struct nfs_page_array {
1: -	struct page **pagevec;
1: -	unsigned int npages;
1: -	struct page *page_array[8];
1: +  struct page **pagevec;
1: +  unsigned int npages;
1: +  struct page *page_array[8];
1:  };
1:  
1:  struct nfs_page;
1: @@ -44700,58 +45201,59 @@ struct nfs_io_completion;
1:  struct nfs_direct_req;
1:  
1:  struct nfs_pgio_header {
1: -	struct inode *inode;
1: -	const struct cred *cred;
1: -	struct list_head pages;
1: -	struct nfs_page *req;
1: -	struct nfs_writeverf verf;
1: -	fmode_t rw_mode;
1: -	struct pnfs_layout_segment *lseg;
1: -	loff_t io_start;
1: -	const struct rpc_call_ops *mds_ops;
1: -	void (*release)(struct nfs_pgio_header *);
1: -	const struct nfs_pgio_completion_ops *completion_ops;
1: -	const struct nfs_rw_ops *rw_ops;
1: -	struct nfs_io_completion *io_completion;
1: -	struct nfs_direct_req *dreq;
1: -	int pnfs_error;
1: -	int error;
1: -	unsigned int good_bytes;
1: -	long unsigned int flags;
1: -	struct rpc_task task;
1: -	struct nfs_fattr fattr;
1: -	struct nfs_pgio_args args;
1: -	struct nfs_pgio_res res;
1: -	long unsigned int timestamp;
1: -	int (*pgio_done_cb)(struct rpc_task *, struct nfs_pgio_header *);
1: -	__u64 mds_offset;
1: -	struct nfs_page_array page_array;
1: -	struct nfs_client *ds_clp;
1: -	u32 ds_commit_idx;
1: -	u32 pgio_mirror_idx;
1: +  struct inode *inode;
1: +  const struct cred *cred;
1: +  struct list_head pages;
1: +  struct nfs_page *req;
1: +  struct nfs_writeverf verf;
1: +  fmode_t rw_mode;
1: +  struct pnfs_layout_segment *lseg;
1: +  loff_t io_start;
1: +  const struct rpc_call_ops *mds_ops;
1: +  void (*release)(struct nfs_pgio_header *);
1: +  const struct nfs_pgio_completion_ops *completion_ops;
1: +  const struct nfs_rw_ops *rw_ops;
1: +  struct nfs_io_completion *io_completion;
1: +  struct nfs_direct_req *dreq;
1: +  int pnfs_error;
1: +  int error;
1: +  unsigned int good_bytes;
1: +  long unsigned int flags;
1: +  struct rpc_task task;
1: +  struct nfs_fattr fattr;
1: +  struct nfs_pgio_args args;
1: +  struct nfs_pgio_res res;
1: +  long unsigned int timestamp;
1: +  int (*pgio_done_cb)(struct rpc_task *, struct nfs_pgio_header *);
1: +  __u64 mds_offset;
1: +  struct nfs_page_array page_array;
1: +  struct nfs_client *ds_clp;
1: +  u32 ds_commit_idx;
1: +  u32 pgio_mirror_idx;
1:  };
1:  
1:  struct nfs_pgio_completion_ops {
1: -	void (*error_cleanup)(struct list_head *, int);
1: -	void (*init_hdr)(struct nfs_pgio_header *);
1: -	void (*completion)(struct nfs_pgio_header *);
1: -	void (*reschedule_io)(struct nfs_pgio_header *);
1: +  void (*error_cleanup)(struct list_head *, int);
1: +  void (*init_hdr)(struct nfs_pgio_header *);
1: +  void (*completion)(struct nfs_pgio_header *);
1: +  void (*reschedule_io)(struct nfs_pgio_header *);
1:  };
1:  
1:  struct rpc_task_setup;
1:  
1:  struct nfs_rw_ops {
1: -	struct nfs_pgio_header * (*rw_alloc_header)();
1: -	void (*rw_free_header)(struct nfs_pgio_header *);
1: -	int (*rw_done)(struct rpc_task *, struct nfs_pgio_header *, struct inode *);
1: -	void (*rw_result)(struct rpc_task *, struct nfs_pgio_header *);
1: -	void (*rw_initiate)(struct nfs_pgio_header *, struct rpc_message *, const struct nfs_rpc_ops *, struct rpc_task_setup *, int);
1: +  struct nfs_pgio_header *(*rw_alloc_header)();
1: +  void (*rw_free_header)(struct nfs_pgio_header *);
1: +  int (*rw_done)(struct rpc_task *, struct nfs_pgio_header *, struct inode *);
1: +  void (*rw_result)(struct rpc_task *, struct nfs_pgio_header *);
1: +  void (*rw_initiate)(struct nfs_pgio_header *, struct rpc_message *,
1: +                      const struct nfs_rpc_ops *, struct rpc_task_setup *, int);
1:  };
1:  
1:  struct nfs_mds_commit_info {
1: -	atomic_t rpcs_out;
1: -	atomic_long_t ncommit;
1: -	struct list_head list;
1: +  atomic_t rpcs_out;
1: +  atomic_long_t ncommit;
1: +  struct list_head list;
1:  };
1:  
1:  struct nfs_commit_data;
1: @@ -44759,63 +45261,63 @@ struct nfs_commit_data;
1:  struct nfs_commit_info;
1:  
1:  struct nfs_commit_completion_ops {
1: -	void (*completion)(struct nfs_commit_data *);
1: -	void (*resched_write)(struct nfs_commit_info *, struct nfs_page *);
1: +  void (*completion)(struct nfs_commit_data *);
1: +  void (*resched_write)(struct nfs_commit_info *, struct nfs_page *);
1:  };
1:  
1:  struct nfs_commit_data {
1: -	struct rpc_task task;
1: -	struct inode *inode;
1: -	const struct cred *cred;
1: -	struct nfs_fattr fattr;
1: -	struct nfs_writeverf verf;
1: -	struct list_head pages;
1: -	struct list_head list;
1: -	struct nfs_direct_req *dreq;
1: -	struct nfs_commitargs args;
1: -	struct nfs_commitres res;
1: -	struct nfs_open_context *context;
1: -	struct pnfs_layout_segment *lseg;
1: -	struct nfs_client *ds_clp;
1: -	int ds_commit_index;
1: -	loff_t lwb;
1: -	const struct rpc_call_ops *mds_ops;
1: -	const struct nfs_commit_completion_ops *completion_ops;
1: -	int (*commit_done_cb)(struct rpc_task *, struct nfs_commit_data *);
1: -	long unsigned int flags;
1: +  struct rpc_task task;
1: +  struct inode *inode;
1: +  const struct cred *cred;
1: +  struct nfs_fattr fattr;
1: +  struct nfs_writeverf verf;
1: +  struct list_head pages;
1: +  struct list_head list;
1: +  struct nfs_direct_req *dreq;
1: +  struct nfs_commitargs args;
1: +  struct nfs_commitres res;
1: +  struct nfs_open_context *context;
1: +  struct pnfs_layout_segment *lseg;
1: +  struct nfs_client *ds_clp;
1: +  int ds_commit_index;
1: +  loff_t lwb;
1: +  const struct rpc_call_ops *mds_ops;
1: +  const struct nfs_commit_completion_ops *completion_ops;
1: +  int (*commit_done_cb)(struct rpc_task *, struct nfs_commit_data *);
1: +  long unsigned int flags;
1:  };
1:  
1:  struct nfs_commit_info {
1: -	struct inode *inode;
1: -	struct nfs_mds_commit_info *mds;
1: -	struct pnfs_ds_commit_info *ds;
1: -	struct nfs_direct_req *dreq;
1: -	const struct nfs_commit_completion_ops *completion_ops;
1: +  struct inode *inode;
1: +  struct nfs_mds_commit_info *mds;
1: +  struct pnfs_ds_commit_info *ds;
1: +  struct nfs_direct_req *dreq;
1: +  const struct nfs_commit_completion_ops *completion_ops;
1:  };
1:  
1:  struct nfs_unlinkdata {
1: -	struct nfs_removeargs args;
1: -	struct nfs_removeres res;
1: -	struct dentry *dentry;
1: -	wait_queue_head_t wq;
1: -	const struct cred *cred;
1: -	struct nfs_fattr dir_attr;
1: -	long int timeout;
1: +  struct nfs_removeargs args;
1: +  struct nfs_removeres res;
1: +  struct dentry *dentry;
1: +  wait_queue_head_t wq;
1: +  const struct cred *cred;
1: +  struct nfs_fattr dir_attr;
1: +  long int timeout;
1:  };
1:  
1:  struct nfs_renamedata {
1: -	struct nfs_renameargs args;
1: -	struct nfs_renameres res;
1: -	const struct cred *cred;
1: -	struct inode *old_dir;
1: -	struct dentry *old_dentry;
1: -	struct nfs_fattr old_fattr;
1: -	struct inode *new_dir;
1: -	struct dentry *new_dentry;
1: -	struct nfs_fattr new_fattr;
1: -	void (*complete)(struct rpc_task *, struct nfs_renamedata *);
1: -	long int timeout;
1: -	bool cancelled;
1: +  struct nfs_renameargs args;
1: +  struct nfs_renameres res;
1: +  const struct cred *cred;
1: +  struct inode *old_dir;
1: +  struct dentry *old_dentry;
1: +  struct nfs_fattr old_fattr;
1: +  struct inode *new_dir;
1: +  struct dentry *new_dentry;
1: +  struct nfs_fattr new_fattr;
1: +  void (*complete)(struct rpc_task *, struct nfs_renamedata *);
1: +  long int timeout;
1: +  bool cancelled;
1:  };
1:  
1:  struct nlmclnt_operations;
1: @@ -44825,89 +45327,99 @@ struct nfs_access_entry;
1:  struct nfs_client_initdata;
1:  
1:  struct nfs_rpc_ops {
1: -	u32 version;
1: -	const struct dentry_operations *dentry_ops;
1: -	const struct inode_operations *dir_inode_ops;
1: -	const struct inode_operations *file_inode_ops;
1: -	const struct file_operations *file_ops;
1: -	const struct nlmclnt_operations *nlmclnt_ops;
1: -	int (*getroot)(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
1: -	int (*submount)(struct fs_context *, struct nfs_server *);
1: -	int (*try_get_tree)(struct fs_context *);
1: -	int (*getattr)(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *, struct inode *);
1: -	int (*setattr)(struct dentry *, struct nfs_fattr *, struct iattr *);
1: -	int (*lookup)(struct inode *, struct dentry *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *);
1: -	int (*lookupp)(struct inode *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *);
1: -	int (*access)(struct inode *, struct nfs_access_entry *);
1: -	int (*readlink)(struct inode *, struct page *, unsigned int, unsigned int);
1: -	int (*create)(struct inode *, struct dentry *, struct iattr *, int);
1: -	int (*remove)(struct inode *, struct dentry *);
1: -	void (*unlink_setup)(struct rpc_message *, struct dentry *, struct inode *);
1: -	void (*unlink_rpc_prepare)(struct rpc_task *, struct nfs_unlinkdata *);
1: -	int (*unlink_done)(struct rpc_task *, struct inode *);
1: -	void (*rename_setup)(struct rpc_message *, struct dentry *, struct dentry *);
1: -	void (*rename_rpc_prepare)(struct rpc_task *, struct nfs_renamedata *);
1: -	int (*rename_done)(struct rpc_task *, struct inode *, struct inode *);
1: -	int (*link)(struct inode *, struct inode *, const struct qstr *);
1: -	int (*symlink)(struct inode *, struct dentry *, struct page *, unsigned int, struct iattr *);
1: -	int (*mkdir)(struct inode *, struct dentry *, struct iattr *);
1: -	int (*rmdir)(struct inode *, const struct qstr *);
1: -	int (*readdir)(struct dentry *, const struct cred *, u64, struct page **, unsigned int, bool);
1: -	int (*mknod)(struct inode *, struct dentry *, struct iattr *, dev_t);
1: -	int (*statfs)(struct nfs_server *, struct nfs_fh *, struct nfs_fsstat *);
1: -	int (*fsinfo)(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
1: -	int (*pathconf)(struct nfs_server *, struct nfs_fh *, struct nfs_pathconf *);
1: -	int (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
1: -	int (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, bool);
1: -	int (*pgio_rpc_prepare)(struct rpc_task *, struct nfs_pgio_header *);
1: -	void (*read_setup)(struct nfs_pgio_header *, struct rpc_message *);
1: -	int (*read_done)(struct rpc_task *, struct nfs_pgio_header *);
1: -	void (*write_setup)(struct nfs_pgio_header *, struct rpc_message *, struct rpc_clnt **);
1: -	int (*write_done)(struct rpc_task *, struct nfs_pgio_header *);
1: -	void (*commit_setup)(struct nfs_commit_data *, struct rpc_message *, struct rpc_clnt **);
1: -	void (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);
1: -	int (*commit_done)(struct rpc_task *, struct nfs_commit_data *);
1: -	int (*lock)(struct file *, int, struct file_lock *);
1: -	int (*lock_check_bounds)(const struct file_lock *);
1: -	void (*clear_acl_cache)(struct inode *);
1: -	void (*close_context)(struct nfs_open_context *, int);
1: -	struct inode * (*open_context)(struct inode *, struct nfs_open_context *, int, struct iattr *, int *);
1: -	int (*have_delegation)(struct inode *, fmode_t);
1: -	struct nfs_client * (*alloc_client)(const struct nfs_client_initdata *);
1: -	struct nfs_client * (*init_client)(struct nfs_client *, const struct nfs_client_initdata *);
1: -	void (*free_client)(struct nfs_client *);
1: -	struct nfs_server * (*create_server)(struct fs_context *);
1: -	struct nfs_server * (*clone_server)(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, rpc_authflavor_t);
1: +  u32 version;
1: +  const struct dentry_operations *dentry_ops;
1: +  const struct inode_operations *dir_inode_ops;
1: +  const struct inode_operations *file_inode_ops;
1: +  const struct file_operations *file_ops;
1: +  const struct nlmclnt_operations *nlmclnt_ops;
1: +  int (*getroot)(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
1: +  int (*submount)(struct fs_context *, struct nfs_server *);
1: +  int (*try_get_tree)(struct fs_context *);
1: +  int (*getattr)(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *,
1: +                 struct nfs4_label *, struct inode *);
1: +  int (*setattr)(struct dentry *, struct nfs_fattr *, struct iattr *);
1: +  int (*lookup)(struct inode *, struct dentry *, struct nfs_fh *,
1: +                struct nfs_fattr *, struct nfs4_label *);
1: +  int (*lookupp)(struct inode *, struct nfs_fh *, struct nfs_fattr *,
1: +                 struct nfs4_label *);
1: +  int (*access)(struct inode *, struct nfs_access_entry *);
1: +  int (*readlink)(struct inode *, struct page *, unsigned int, unsigned int);
1: +  int (*create)(struct inode *, struct dentry *, struct iattr *, int);
1: +  int (*remove)(struct inode *, struct dentry *);
1: +  void (*unlink_setup)(struct rpc_message *, struct dentry *, struct inode *);
1: +  void (*unlink_rpc_prepare)(struct rpc_task *, struct nfs_unlinkdata *);
1: +  int (*unlink_done)(struct rpc_task *, struct inode *);
1: +  void (*rename_setup)(struct rpc_message *, struct dentry *, struct dentry *);
1: +  void (*rename_rpc_prepare)(struct rpc_task *, struct nfs_renamedata *);
1: +  int (*rename_done)(struct rpc_task *, struct inode *, struct inode *);
1: +  int (*link)(struct inode *, struct inode *, const struct qstr *);
1: +  int (*symlink)(struct inode *, struct dentry *, struct page *, unsigned int,
1: +                 struct iattr *);
1: +  int (*mkdir)(struct inode *, struct dentry *, struct iattr *);
1: +  int (*rmdir)(struct inode *, const struct qstr *);
1: +  int (*readdir)(struct dentry *, const struct cred *, u64, struct page **,
1: +                 unsigned int, bool);
1: +  int (*mknod)(struct inode *, struct dentry *, struct iattr *, dev_t);
1: +  int (*statfs)(struct nfs_server *, struct nfs_fh *, struct nfs_fsstat *);
1: +  int (*fsinfo)(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
1: +  int (*pathconf)(struct nfs_server *, struct nfs_fh *, struct nfs_pathconf *);
1: +  int (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
1: +  int (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, bool);
1: +  int (*pgio_rpc_prepare)(struct rpc_task *, struct nfs_pgio_header *);
1: +  void (*read_setup)(struct nfs_pgio_header *, struct rpc_message *);
1: +  int (*read_done)(struct rpc_task *, struct nfs_pgio_header *);
1: +  void (*write_setup)(struct nfs_pgio_header *, struct rpc_message *,
1: +                      struct rpc_clnt **);
1: +  int (*write_done)(struct rpc_task *, struct nfs_pgio_header *);
1: +  void (*commit_setup)(struct nfs_commit_data *, struct rpc_message *,
1: +                       struct rpc_clnt **);
1: +  void (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);
1: +  int (*commit_done)(struct rpc_task *, struct nfs_commit_data *);
1: +  int (*lock)(struct file *, int, struct file_lock *);
1: +  int (*lock_check_bounds)(const struct file_lock *);
1: +  void (*clear_acl_cache)(struct inode *);
1: +  void (*close_context)(struct nfs_open_context *, int);
1: +  struct inode *(*open_context)(struct inode *, struct nfs_open_context *, int,
1: +                                struct iattr *, int *);
1: +  int (*have_delegation)(struct inode *, fmode_t);
1: +  struct nfs_client *(*alloc_client)(const struct nfs_client_initdata *);
1: +  struct nfs_client *(*init_client)(struct nfs_client *,
1: +                                    const struct nfs_client_initdata *);
1: +  void (*free_client)(struct nfs_client *);
1: +  struct nfs_server *(*create_server)(struct fs_context *);
1: +  struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,
1: +                                     struct nfs_fattr *, rpc_authflavor_t);
1:  };
1:  
1:  struct nlmclnt_operations {
1: -	void (*nlmclnt_alloc_call)(void *);
1: -	bool (*nlmclnt_unlock_prepare)(struct rpc_task *, void *);
1: -	void (*nlmclnt_release_call)(void *);
1: +  void (*nlmclnt_alloc_call)(void *);
1: +  bool (*nlmclnt_unlock_prepare)(struct rpc_task *, void *);
1: +  void (*nlmclnt_release_call)(void *);
1:  };
1:  
1:  struct nfs_access_entry {
1: -	struct rb_node rb_node;
1: -	struct list_head lru;
1: -	const struct cred *cred;
1: -	__u32 mask;
1: -	struct callback_head callback_head;
1: +  struct rb_node rb_node;
1: +  struct list_head lru;
1: +  const struct cred *cred;
1: +  __u32 mask;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct nfs_client_initdata {
1: -	long unsigned int init_flags;
1: -	const char *hostname;
1: -	const struct sockaddr *addr;
1: -	const char *nodename;
1: -	const char *ip_addr;
1: -	size_t addrlen;
1: -	struct nfs_subversion *nfs_mod;
1: -	int proto;
1: -	u32 minorversion;
1: -	unsigned int nconnect;
1: -	struct net *net;
1: -	const struct rpc_timeout *timeparms;
1: -	const struct cred *cred;
1: +  long unsigned int init_flags;
1: +  const char *hostname;
1: +  const struct sockaddr *addr;
1: +  const char *nodename;
1: +  const char *ip_addr;
1: +  size_t addrlen;
1: +  struct nfs_subversion *nfs_mod;
1: +  int proto;
1: +  u32 minorversion;
1: +  unsigned int nconnect;
1: +  struct net *net;
1: +  const struct rpc_timeout *timeparms;
1: +  const struct cred *cred;
1:  };
1:  
1:  struct nfs4_state_recovery_ops;
1: @@ -44917,43 +45429,45 @@ struct nfs4_state_maintenance_ops;
1:  struct nfs4_mig_recovery_ops;
1:  
1:  struct nfs4_minor_version_ops {
1: -	u32 minor_version;
1: -	unsigned int init_caps;
1: -	int (*init_client)(struct nfs_client *);
1: -	void (*shutdown_client)(struct nfs_client *);
1: -	bool (*match_stateid)(const nfs4_stateid *, const nfs4_stateid *);
1: -	int (*find_root_sec)(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
1: -	void (*free_lock_state)(struct nfs_server *, struct nfs4_lock_state *);
1: -	int (*test_and_free_expired)(struct nfs_server *, nfs4_stateid *, const struct cred *);
1: -	struct nfs_seqid * (*alloc_seqid)(struct nfs_seqid_counter *, gfp_t);
1: -	void (*session_trunk)(struct rpc_clnt *, struct rpc_xprt *, void *);
1: -	const struct rpc_call_ops *call_sync_ops;
1: -	const struct nfs4_state_recovery_ops *reboot_recovery_ops;
1: -	const struct nfs4_state_recovery_ops *nograce_recovery_ops;
1: -	const struct nfs4_state_maintenance_ops *state_renewal_ops;
1: -	const struct nfs4_mig_recovery_ops *mig_recovery_ops;
1: +  u32 minor_version;
1: +  unsigned int init_caps;
1: +  int (*init_client)(struct nfs_client *);
1: +  void (*shutdown_client)(struct nfs_client *);
1: +  bool (*match_stateid)(const nfs4_stateid *, const nfs4_stateid *);
1: +  int (*find_root_sec)(struct nfs_server *, struct nfs_fh *,
1: +                       struct nfs_fsinfo *);
1: +  void (*free_lock_state)(struct nfs_server *, struct nfs4_lock_state *);
1: +  int (*test_and_free_expired)(struct nfs_server *, nfs4_stateid *,
1: +                               const struct cred *);
1: +  struct nfs_seqid *(*alloc_seqid)(struct nfs_seqid_counter *, gfp_t);
1: +  void (*session_trunk)(struct rpc_clnt *, struct rpc_xprt *, void *);
1: +  const struct rpc_call_ops *call_sync_ops;
1: +  const struct nfs4_state_recovery_ops *reboot_recovery_ops;
1: +  const struct nfs4_state_recovery_ops *nograce_recovery_ops;
1: +  const struct nfs4_state_maintenance_ops *state_renewal_ops;
1: +  const struct nfs4_mig_recovery_ops *mig_recovery_ops;
1:  };
1:  
1:  struct nfs4_state_owner;
1:  
1:  struct nfs4_state {
1: -	struct list_head open_states;
1: -	struct list_head inode_states;
1: -	struct list_head lock_states;
1: -	struct nfs4_state_owner *owner;
1: -	struct inode *inode;
1: -	long unsigned int flags;
1: -	spinlock_t state_lock;
1: -	seqlock_t seqlock;
1: -	nfs4_stateid stateid;
1: -	nfs4_stateid open_stateid;
1: -	unsigned int n_rdonly;
1: -	unsigned int n_wronly;
1: -	unsigned int n_rdwr;
1: -	fmode_t state;
1: -	refcount_t count;
1: -	wait_queue_head_t waitq;
1: -	struct callback_head callback_head;
1: +  struct list_head open_states;
1: +  struct list_head inode_states;
1: +  struct list_head lock_states;
1: +  struct nfs4_state_owner *owner;
1: +  struct inode *inode;
1: +  long unsigned int flags;
1: +  spinlock_t state_lock;
1: +  seqlock_t seqlock;
1: +  nfs4_stateid stateid;
1: +  nfs4_stateid open_stateid;
1: +  unsigned int n_rdonly;
1: +  unsigned int n_wronly;
1: +  unsigned int n_rdwr;
1: +  fmode_t state;
1: +  refcount_t count;
1: +  wait_queue_head_t waitq;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct nfs4_ssc_client_ops;
1: @@ -44961,103 +45475,106 @@ struct nfs4_ssc_client_ops;
1:  struct nfs_ssc_client_ops;
1:  
1:  struct nfs_ssc_client_ops_tbl {
1: -	const struct nfs4_ssc_client_ops *ssc_nfs4_ops;
1: -	const struct nfs_ssc_client_ops *ssc_nfs_ops;
1: +  const struct nfs4_ssc_client_ops *ssc_nfs4_ops;
1: +  const struct nfs_ssc_client_ops *ssc_nfs_ops;
1:  };
1:  
1:  struct nfs4_ssc_client_ops {
1: -	struct file * (*sco_open)(struct vfsmount *, struct nfs_fh *, nfs4_stateid *);
1: -	void (*sco_close)(struct file *);
1: +  struct file *(*sco_open)(struct vfsmount *, struct nfs_fh *, nfs4_stateid *);
1: +  void (*sco_close)(struct file *);
1:  };
1:  
1:  struct nfs_ssc_client_ops {
1: -	void (*sco_sb_deactive)(struct super_block *);
1: +  void (*sco_sb_deactive)(struct super_block *);
1:  };
1:  
1:  struct nfs4_state_recovery_ops {
1: -	int owner_flag_bit;
1: -	int state_flag_bit;
1: -	int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);
1: -	int (*recover_lock)(struct nfs4_state *, struct file_lock *);
1: -	int (*establish_clid)(struct nfs_client *, const struct cred *);
1: -	int (*reclaim_complete)(struct nfs_client *, const struct cred *);
1: -	int (*detect_trunking)(struct nfs_client *, struct nfs_client **, const struct cred *);
1: +  int owner_flag_bit;
1: +  int state_flag_bit;
1: +  int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);
1: +  int (*recover_lock)(struct nfs4_state *, struct file_lock *);
1: +  int (*establish_clid)(struct nfs_client *, const struct cred *);
1: +  int (*reclaim_complete)(struct nfs_client *, const struct cred *);
1: +  int (*detect_trunking)(struct nfs_client *, struct nfs_client **,
1: +                         const struct cred *);
1:  };
1:  
1:  struct nfs4_state_maintenance_ops {
1: -	int (*sched_state_renewal)(struct nfs_client *, const struct cred *, unsigned int);
1: -	const struct cred * (*get_state_renewal_cred)(struct nfs_client *);
1: -	int (*renew_lease)(struct nfs_client *, const struct cred *);
1: +  int (*sched_state_renewal)(struct nfs_client *, const struct cred *,
1: +                             unsigned int);
1: +  const struct cred *(*get_state_renewal_cred)(struct nfs_client *);
1: +  int (*renew_lease)(struct nfs_client *, const struct cred *);
1:  };
1:  
1:  struct nfs4_mig_recovery_ops {
1: -	int (*get_locations)(struct inode *, struct nfs4_fs_locations *, struct page *, const struct cred *);
1: -	int (*fsid_present)(struct inode *, const struct cred *);
1: +  int (*get_locations)(struct inode *, struct nfs4_fs_locations *,
1: +                       struct page *, const struct cred *);
1: +  int (*fsid_present)(struct inode *, const struct cred *);
1:  };
1:  
1:  struct nfs4_state_owner {
1: -	struct nfs_server *so_server;
1: -	struct list_head so_lru;
1: -	long unsigned int so_expires;
1: -	struct rb_node so_server_node;
1: -	const struct cred *so_cred;
1: -	spinlock_t so_lock;
1: -	atomic_t so_count;
1: -	long unsigned int so_flags;
1: -	struct list_head so_states;
1: -	struct nfs_seqid_counter so_seqid;
1: -	seqcount_spinlock_t so_reclaim_seqcount;
1: -	struct mutex so_delegreturn_mutex;
1: +  struct nfs_server *so_server;
1: +  struct list_head so_lru;
1: +  long unsigned int so_expires;
1: +  struct rb_node so_server_node;
1: +  const struct cred *so_cred;
1: +  spinlock_t so_lock;
1: +  atomic_t so_count;
1: +  long unsigned int so_flags;
1: +  struct list_head so_states;
1: +  struct nfs_seqid_counter so_seqid;
1: +  seqcount_spinlock_t so_reclaim_seqcount;
1: +  struct mutex so_delegreturn_mutex;
1:  };
1:  
1:  struct core_name {
1: -	char *corename;
1: -	int used;
1: -	int size;
1: +  char *corename;
1: +  int used;
1: +  int size;
1:  };
1:  
1:  struct trace_event_raw_iomap_readpage_class {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 ino;
1: -	int nr_pages;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 ino;
1: +  int nr_pages;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_iomap_range_class {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 ino;
1: -	loff_t size;
1: -	long unsigned int offset;
1: -	unsigned int length;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 ino;
1: +  loff_t size;
1: +  long unsigned int offset;
1: +  unsigned int length;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_iomap_class {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 ino;
1: -	u64 addr;
1: -	loff_t offset;
1: -	u64 length;
1: -	u16 type;
1: -	u16 flags;
1: -	dev_t bdev;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 ino;
1: +  u64 addr;
1: +  loff_t offset;
1: +  u64 length;
1: +  u16 type;
1: +  u16 flags;
1: +  dev_t bdev;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_iomap_apply {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 ino;
1: -	loff_t pos;
1: -	loff_t length;
1: -	unsigned int flags;
1: -	const void *ops;
1: -	void *actor;
1: -	long unsigned int caller;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 ino;
1: +  loff_t pos;
1: +  loff_t length;
1: +  unsigned int flags;
1: +  const void *ops;
1: +  void *actor;
1: +  long unsigned int caller;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_iomap_readpage_class {};
1: @@ -45072,587 +45589,599 @@ typedef void (*btf_trace_iomap_readpage)(void *, struct inode *, int);
1:  
1:  typedef void (*btf_trace_iomap_readahead)(void *, struct inode *, int);
1:  
1: -typedef void (*btf_trace_iomap_writepage)(void *, struct inode *, long unsigned int, unsigned int);
1: +typedef void (*btf_trace_iomap_writepage)(void *, struct inode *,
1: +                                          long unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_iomap_releasepage)(void *, struct inode *, long unsigned int, unsigned int);
1: +typedef void (*btf_trace_iomap_releasepage)(void *, struct inode *,
1: +                                            long unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_iomap_invalidatepage)(void *, struct inode *, long unsigned int, unsigned int);
1: +typedef void (*btf_trace_iomap_invalidatepage)(void *, struct inode *,
1: +                                               long unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_iomap_dio_invalidate_fail)(void *, struct inode *, long unsigned int, unsigned int);
1: +typedef void (*btf_trace_iomap_dio_invalidate_fail)(void *, struct inode *,
1: +                                                    long unsigned int,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_iomap_apply_dstmap)(void *, struct inode *, struct iomap___2 *);
1: +typedef void (*btf_trace_iomap_apply_dstmap)(void *, struct inode *,
1: +                                             struct iomap___2 *);
1:  
1: -typedef void (*btf_trace_iomap_apply_srcmap)(void *, struct inode *, struct iomap___2 *);
1: +typedef void (*btf_trace_iomap_apply_srcmap)(void *, struct inode *,
1: +                                             struct iomap___2 *);
1:  
1: -typedef void (*btf_trace_iomap_apply)(void *, struct inode *, loff_t, loff_t, unsigned int, const void *, void *, long unsigned int);
1: +typedef void (*btf_trace_iomap_apply)(void *, struct inode *, loff_t, loff_t,
1: +                                      unsigned int, const void *, void *,
1: +                                      long unsigned int);
1:  
1:  struct iomap_ops {
1: -	int (*iomap_begin)(struct inode *, loff_t, loff_t, unsigned int, struct iomap___2 *, struct iomap___2 *);
1: -	int (*iomap_end)(struct inode *, loff_t, loff_t, ssize_t, unsigned int, struct iomap___2 *);
1: +  int (*iomap_begin)(struct inode *, loff_t, loff_t, unsigned int,
1: +                     struct iomap___2 *, struct iomap___2 *);
1: +  int (*iomap_end)(struct inode *, loff_t, loff_t, ssize_t, unsigned int,
1: +                   struct iomap___2 *);
1:  };
1:  
1: -typedef loff_t (*iomap_actor_t)(struct inode *, loff_t, loff_t, void *, struct iomap___2 *, struct iomap___2 *);
1: +typedef loff_t (*iomap_actor_t)(struct inode *, loff_t, loff_t, void *,
1: +                                struct iomap___2 *, struct iomap___2 *);
1:  
1:  struct iomap_ioend {
1: -	struct list_head io_list;
1: -	u16 io_type;
1: -	u16 io_flags;
1: -	struct inode *io_inode;
1: -	size_t io_size;
1: -	loff_t io_offset;
1: -	void *io_private;
1: -	struct bio *io_bio;
1: -	struct bio io_inline_bio;
1: +  struct list_head io_list;
1: +  u16 io_type;
1: +  u16 io_flags;
1: +  struct inode *io_inode;
1: +  size_t io_size;
1: +  loff_t io_offset;
1: +  void *io_private;
1: +  struct bio *io_bio;
1: +  struct bio io_inline_bio;
1:  };
1:  
1:  struct iomap_writepage_ctx;
1:  
1:  struct iomap_writeback_ops {
1: -	int (*map_blocks)(struct iomap_writepage_ctx *, struct inode *, loff_t);
1: -	int (*prepare_ioend)(struct iomap_ioend *, int);
1: -	void (*discard_page)(struct page *, loff_t);
1: +  int (*map_blocks)(struct iomap_writepage_ctx *, struct inode *, loff_t);
1: +  int (*prepare_ioend)(struct iomap_ioend *, int);
1: +  void (*discard_page)(struct page *, loff_t);
1:  };
1:  
1:  struct iomap_writepage_ctx {
1: -	struct iomap___2 iomap;
1: -	struct iomap_ioend *ioend;
1: -	const struct iomap_writeback_ops *ops;
1: +  struct iomap___2 iomap;
1: +  struct iomap_ioend *ioend;
1: +  const struct iomap_writeback_ops *ops;
1:  };
1:  
1:  struct iomap_page {
1: -	atomic_t read_bytes_pending;
1: -	atomic_t write_bytes_pending;
1: -	spinlock_t uptodate_lock;
1: -	long unsigned int uptodate[0];
1: +  atomic_t read_bytes_pending;
1: +  atomic_t write_bytes_pending;
1: +  spinlock_t uptodate_lock;
1: +  long unsigned int uptodate[0];
1:  };
1:  
1:  struct iomap_readpage_ctx {
1: -	struct page *cur_page;
1: -	bool cur_page_in_bio;
1: -	struct bio *bio;
1: -	struct readahead_control *rac;
1: +  struct page *cur_page;
1: +  bool cur_page_in_bio;
1: +  struct bio *bio;
1: +  struct readahead_control *rac;
1:  };
1:  
1:  enum {
1: -	IOMAP_WRITE_F_UNSHARE = 1,
1: +  IOMAP_WRITE_F_UNSHARE = 1,
1:  };
1:  
1:  struct iomap_dio_ops {
1: -	int (*end_io)(struct kiocb *, ssize_t, int, unsigned int);
1: -	blk_qc_t (*submit_io)(struct inode *, struct iomap___2 *, struct bio *, loff_t);
1: +  int (*end_io)(struct kiocb *, ssize_t, int, unsigned int);
1: +  blk_qc_t (*submit_io)(struct inode *, struct iomap___2 *, struct bio *,
1: +                        loff_t);
1:  };
1:  
1:  struct iomap_dio {
1: -	struct kiocb *iocb;
1: -	const struct iomap_dio_ops *dops;
1: -	loff_t i_size;
1: -	loff_t size;
1: -	atomic_t ref;
1: -	unsigned int flags;
1: -	int error;
1: -	bool wait_for_completion;
1: -	union {
1: -		struct {
1: -			struct iov_iter *iter;
1: -			struct task_struct *waiter;
1: -			struct request_queue *last_queue;
1: -			blk_qc_t cookie;
1: -		} submit;
1: -		struct {
1: -			struct work_struct work;
1: -		} aio;
1: -	};
1: +  struct kiocb *iocb;
1: +  const struct iomap_dio_ops *dops;
1: +  loff_t i_size;
1: +  loff_t size;
1: +  atomic_t ref;
1: +  unsigned int flags;
1: +  int error;
1: +  bool wait_for_completion;
1: +  union {
1: +    struct {
1: +      struct iov_iter *iter;
1: +      struct task_struct *waiter;
1: +      struct request_queue *last_queue;
1: +      blk_qc_t cookie;
1: +    } submit;
1: +    struct {
1: +      struct work_struct work;
1: +    } aio;
1: +  };
1:  };
1:  
1:  struct fiemap_ctx {
1: -	struct fiemap_extent_info *fi;
1: -	struct iomap___2 prev;
1: +  struct fiemap_extent_info *fi;
1: +  struct iomap___2 prev;
1:  };
1:  
1:  struct iomap_swapfile_info {
1: -	struct iomap___2 iomap;
1: -	struct swap_info_struct *sis;
1: -	uint64_t lowest_ppage;
1: -	uint64_t highest_ppage;
1: -	long unsigned int nr_pages;
1: -	int nr_extents;
1: +  struct iomap___2 iomap;
1: +  struct swap_info_struct *sis;
1: +  uint64_t lowest_ppage;
1: +  uint64_t highest_ppage;
1: +  long unsigned int nr_pages;
1: +  int nr_extents;
1:  };
1:  
1:  enum {
1: -	QIF_BLIMITS_B = 0,
1: -	QIF_SPACE_B = 1,
1: -	QIF_ILIMITS_B = 2,
1: -	QIF_INODES_B = 3,
1: -	QIF_BTIME_B = 4,
1: -	QIF_ITIME_B = 5,
1: +  QIF_BLIMITS_B = 0,
1: +  QIF_SPACE_B = 1,
1: +  QIF_ILIMITS_B = 2,
1: +  QIF_INODES_B = 3,
1: +  QIF_BTIME_B = 4,
1: +  QIF_ITIME_B = 5,
1:  };
1:  
1:  typedef __kernel_uid32_t qid_t;
1:  
1:  enum {
1: -	DQF_INFO_DIRTY_B = 17,
1: +  DQF_INFO_DIRTY_B = 17,
1:  };
1:  
1:  struct dqstats {
1: -	long unsigned int stat[8];
1: -	struct percpu_counter counter[8];
1: +  long unsigned int stat[8];
1: +  struct percpu_counter counter[8];
1:  };
1:  
1:  enum {
1: -	_DQUOT_USAGE_ENABLED = 0,
1: -	_DQUOT_LIMITS_ENABLED = 1,
1: -	_DQUOT_SUSPENDED = 2,
1: -	_DQUOT_STATE_FLAGS = 3,
1: +  _DQUOT_USAGE_ENABLED = 0,
1: +  _DQUOT_LIMITS_ENABLED = 1,
1: +  _DQUOT_SUSPENDED = 2,
1: +  _DQUOT_STATE_FLAGS = 3,
1:  };
1:  
1:  struct quota_module_name {
1: -	int qm_fmt_id;
1: -	char *qm_mod_name;
1: +  int qm_fmt_id;
1: +  char *qm_mod_name;
1:  };
1:  
1:  struct dquot_warn {
1: -	struct super_block *w_sb;
1: -	struct kqid w_dq_id;
1: -	short int w_type;
1: +  struct super_block *w_sb;
1: +  struct kqid w_dq_id;
1: +  short int w_type;
1:  };
1:  
1:  struct qtree_fmt_operations {
1: -	void (*mem2disk_dqblk)(void *, struct dquot *);
1: -	void (*disk2mem_dqblk)(struct dquot *, void *);
1: -	int (*is_id)(void *, struct dquot *);
1: +  void (*mem2disk_dqblk)(void *, struct dquot *);
1: +  void (*disk2mem_dqblk)(struct dquot *, void *);
1: +  int (*is_id)(void *, struct dquot *);
1:  };
1:  
1:  struct qtree_mem_dqinfo {
1: -	struct super_block *dqi_sb;
1: -	int dqi_type;
1: -	unsigned int dqi_blocks;
1: -	unsigned int dqi_free_blk;
1: -	unsigned int dqi_free_entry;
1: -	unsigned int dqi_blocksize_bits;
1: -	unsigned int dqi_entry_size;
1: -	unsigned int dqi_usable_bs;
1: -	unsigned int dqi_qtree_depth;
1: -	const struct qtree_fmt_operations *dqi_ops;
1: +  struct super_block *dqi_sb;
1: +  int dqi_type;
1: +  unsigned int dqi_blocks;
1: +  unsigned int dqi_free_blk;
1: +  unsigned int dqi_free_entry;
1: +  unsigned int dqi_blocksize_bits;
1: +  unsigned int dqi_entry_size;
1: +  unsigned int dqi_usable_bs;
1: +  unsigned int dqi_qtree_depth;
1: +  const struct qtree_fmt_operations *dqi_ops;
1:  };
1:  
1:  struct v2_disk_dqheader {
1: -	__le32 dqh_magic;
1: -	__le32 dqh_version;
1: +  __le32 dqh_magic;
1: +  __le32 dqh_version;
1:  };
1:  
1:  struct v2r0_disk_dqblk {
1: -	__le32 dqb_id;
1: -	__le32 dqb_ihardlimit;
1: -	__le32 dqb_isoftlimit;
1: -	__le32 dqb_curinodes;
1: -	__le32 dqb_bhardlimit;
1: -	__le32 dqb_bsoftlimit;
1: -	__le64 dqb_curspace;
1: -	__le64 dqb_btime;
1: -	__le64 dqb_itime;
1: +  __le32 dqb_id;
1: +  __le32 dqb_ihardlimit;
1: +  __le32 dqb_isoftlimit;
1: +  __le32 dqb_curinodes;
1: +  __le32 dqb_bhardlimit;
1: +  __le32 dqb_bsoftlimit;
1: +  __le64 dqb_curspace;
1: +  __le64 dqb_btime;
1: +  __le64 dqb_itime;
1:  };
1:  
1:  struct v2r1_disk_dqblk {
1: -	__le32 dqb_id;
1: -	__le32 dqb_pad;
1: -	__le64 dqb_ihardlimit;
1: -	__le64 dqb_isoftlimit;
1: -	__le64 dqb_curinodes;
1: -	__le64 dqb_bhardlimit;
1: -	__le64 dqb_bsoftlimit;
1: -	__le64 dqb_curspace;
1: -	__le64 dqb_btime;
1: -	__le64 dqb_itime;
1: +  __le32 dqb_id;
1: +  __le32 dqb_pad;
1: +  __le64 dqb_ihardlimit;
1: +  __le64 dqb_isoftlimit;
1: +  __le64 dqb_curinodes;
1: +  __le64 dqb_bhardlimit;
1: +  __le64 dqb_bsoftlimit;
1: +  __le64 dqb_curspace;
1: +  __le64 dqb_btime;
1: +  __le64 dqb_itime;
1:  };
1:  
1:  struct v2_disk_dqinfo {
1: -	__le32 dqi_bgrace;
1: -	__le32 dqi_igrace;
1: -	__le32 dqi_flags;
1: -	__le32 dqi_blocks;
1: -	__le32 dqi_free_blk;
1: -	__le32 dqi_free_entry;
1: +  __le32 dqi_bgrace;
1: +  __le32 dqi_igrace;
1: +  __le32 dqi_flags;
1: +  __le32 dqi_blocks;
1: +  __le32 dqi_free_blk;
1: +  __le32 dqi_free_entry;
1:  };
1:  
1:  struct qt_disk_dqdbheader {
1: -	__le32 dqdh_next_free;
1: -	__le32 dqdh_prev_free;
1: -	__le16 dqdh_entries;
1: -	__le16 dqdh_pad1;
1: -	__le32 dqdh_pad2;
1: +  __le32 dqdh_next_free;
1: +  __le32 dqdh_prev_free;
1: +  __le16 dqdh_entries;
1: +  __le16 dqdh_pad1;
1: +  __le32 dqdh_pad2;
1:  };
1:  
1:  struct fs_disk_quota {
1: -	__s8 d_version;
1: -	__s8 d_flags;
1: -	__u16 d_fieldmask;
1: -	__u32 d_id;
1: -	__u64 d_blk_hardlimit;
1: -	__u64 d_blk_softlimit;
1: -	__u64 d_ino_hardlimit;
1: -	__u64 d_ino_softlimit;
1: -	__u64 d_bcount;
1: -	__u64 d_icount;
1: -	__s32 d_itimer;
1: -	__s32 d_btimer;
1: -	__u16 d_iwarns;
1: -	__u16 d_bwarns;
1: -	__s8 d_itimer_hi;
1: -	__s8 d_btimer_hi;
1: -	__s8 d_rtbtimer_hi;
1: -	__s8 d_padding2;
1: -	__u64 d_rtb_hardlimit;
1: -	__u64 d_rtb_softlimit;
1: -	__u64 d_rtbcount;
1: -	__s32 d_rtbtimer;
1: -	__u16 d_rtbwarns;
1: -	__s16 d_padding3;
1: -	char d_padding4[8];
1: +  __s8 d_version;
1: +  __s8 d_flags;
1: +  __u16 d_fieldmask;
1: +  __u32 d_id;
1: +  __u64 d_blk_hardlimit;
1: +  __u64 d_blk_softlimit;
1: +  __u64 d_ino_hardlimit;
1: +  __u64 d_ino_softlimit;
1: +  __u64 d_bcount;
1: +  __u64 d_icount;
1: +  __s32 d_itimer;
1: +  __s32 d_btimer;
1: +  __u16 d_iwarns;
1: +  __u16 d_bwarns;
1: +  __s8 d_itimer_hi;
1: +  __s8 d_btimer_hi;
1: +  __s8 d_rtbtimer_hi;
1: +  __s8 d_padding2;
1: +  __u64 d_rtb_hardlimit;
1: +  __u64 d_rtb_softlimit;
1: +  __u64 d_rtbcount;
1: +  __s32 d_rtbtimer;
1: +  __u16 d_rtbwarns;
1: +  __s16 d_padding3;
1: +  char d_padding4[8];
1:  };
1:  
1:  struct fs_qfilestat {
1: -	__u64 qfs_ino;
1: -	__u64 qfs_nblks;
1: -	__u32 qfs_nextents;
1: +  __u64 qfs_ino;
1: +  __u64 qfs_nblks;
1: +  __u32 qfs_nextents;
1:  };
1:  
1:  typedef struct fs_qfilestat fs_qfilestat_t;
1:  
1:  struct fs_quota_stat {
1: -	__s8 qs_version;
1: -	__u16 qs_flags;
1: -	__s8 qs_pad;
1: -	fs_qfilestat_t qs_uquota;
1: -	fs_qfilestat_t qs_gquota;
1: -	__u32 qs_incoredqs;
1: -	__s32 qs_btimelimit;
1: -	__s32 qs_itimelimit;
1: -	__s32 qs_rtbtimelimit;
1: -	__u16 qs_bwarnlimit;
1: -	__u16 qs_iwarnlimit;
1: +  __s8 qs_version;
1: +  __u16 qs_flags;
1: +  __s8 qs_pad;
1: +  fs_qfilestat_t qs_uquota;
1: +  fs_qfilestat_t qs_gquota;
1: +  __u32 qs_incoredqs;
1: +  __s32 qs_btimelimit;
1: +  __s32 qs_itimelimit;
1: +  __s32 qs_rtbtimelimit;
1: +  __u16 qs_bwarnlimit;
1: +  __u16 qs_iwarnlimit;
1:  };
1:  
1:  struct fs_qfilestatv {
1: -	__u64 qfs_ino;
1: -	__u64 qfs_nblks;
1: -	__u32 qfs_nextents;
1: -	__u32 qfs_pad;
1: +  __u64 qfs_ino;
1: +  __u64 qfs_nblks;
1: +  __u32 qfs_nextents;
1: +  __u32 qfs_pad;
1:  };
1:  
1:  struct fs_quota_statv {
1: -	__s8 qs_version;
1: -	__u8 qs_pad1;
1: -	__u16 qs_flags;
1: -	__u32 qs_incoredqs;
1: -	struct fs_qfilestatv qs_uquota;
1: -	struct fs_qfilestatv qs_gquota;
1: -	struct fs_qfilestatv qs_pquota;
1: -	__s32 qs_btimelimit;
1: -	__s32 qs_itimelimit;
1: -	__s32 qs_rtbtimelimit;
1: -	__u16 qs_bwarnlimit;
1: -	__u16 qs_iwarnlimit;
1: -	__u64 qs_pad2[8];
1: +  __s8 qs_version;
1: +  __u8 qs_pad1;
1: +  __u16 qs_flags;
1: +  __u32 qs_incoredqs;
1: +  struct fs_qfilestatv qs_uquota;
1: +  struct fs_qfilestatv qs_gquota;
1: +  struct fs_qfilestatv qs_pquota;
1: +  __s32 qs_btimelimit;
1: +  __s32 qs_itimelimit;
1: +  __s32 qs_rtbtimelimit;
1: +  __u16 qs_bwarnlimit;
1: +  __u16 qs_iwarnlimit;
1: +  __u64 qs_pad2[8];
1:  };
1:  
1:  struct if_dqblk {
1: -	__u64 dqb_bhardlimit;
1: -	__u64 dqb_bsoftlimit;
1: -	__u64 dqb_curspace;
1: -	__u64 dqb_ihardlimit;
1: -	__u64 dqb_isoftlimit;
1: -	__u64 dqb_curinodes;
1: -	__u64 dqb_btime;
1: -	__u64 dqb_itime;
1: -	__u32 dqb_valid;
1: +  __u64 dqb_bhardlimit;
1: +  __u64 dqb_bsoftlimit;
1: +  __u64 dqb_curspace;
1: +  __u64 dqb_ihardlimit;
1: +  __u64 dqb_isoftlimit;
1: +  __u64 dqb_curinodes;
1: +  __u64 dqb_btime;
1: +  __u64 dqb_itime;
1: +  __u32 dqb_valid;
1:  };
1:  
1:  struct if_nextdqblk {
1: -	__u64 dqb_bhardlimit;
1: -	__u64 dqb_bsoftlimit;
1: -	__u64 dqb_curspace;
1: -	__u64 dqb_ihardlimit;
1: -	__u64 dqb_isoftlimit;
1: -	__u64 dqb_curinodes;
1: -	__u64 dqb_btime;
1: -	__u64 dqb_itime;
1: -	__u32 dqb_valid;
1: -	__u32 dqb_id;
1: +  __u64 dqb_bhardlimit;
1: +  __u64 dqb_bsoftlimit;
1: +  __u64 dqb_curspace;
1: +  __u64 dqb_ihardlimit;
1: +  __u64 dqb_isoftlimit;
1: +  __u64 dqb_curinodes;
1: +  __u64 dqb_btime;
1: +  __u64 dqb_itime;
1: +  __u32 dqb_valid;
1: +  __u32 dqb_id;
1:  };
1:  
1:  struct if_dqinfo {
1: -	__u64 dqi_bgrace;
1: -	__u64 dqi_igrace;
1: -	__u32 dqi_flags;
1: -	__u32 dqi_valid;
1: +  __u64 dqi_bgrace;
1: +  __u64 dqi_igrace;
1: +  __u32 dqi_flags;
1: +  __u32 dqi_valid;
1:  };
1:  
1:  struct compat_if_dqblk {
1: -	compat_u64 dqb_bhardlimit;
1: -	compat_u64 dqb_bsoftlimit;
1: -	compat_u64 dqb_curspace;
1: -	compat_u64 dqb_ihardlimit;
1: -	compat_u64 dqb_isoftlimit;
1: -	compat_u64 dqb_curinodes;
1: -	compat_u64 dqb_btime;
1: -	compat_u64 dqb_itime;
1: -	compat_uint_t dqb_valid;
1: +  compat_u64 dqb_bhardlimit;
1: +  compat_u64 dqb_bsoftlimit;
1: +  compat_u64 dqb_curspace;
1: +  compat_u64 dqb_ihardlimit;
1: +  compat_u64 dqb_isoftlimit;
1: +  compat_u64 dqb_curinodes;
1: +  compat_u64 dqb_btime;
1: +  compat_u64 dqb_itime;
1: +  compat_uint_t dqb_valid;
1:  } __attribute__((packed));
1:  
1:  struct compat_fs_qfilestat {
1: -	compat_u64 dqb_bhardlimit;
1: -	compat_u64 qfs_nblks;
1: -	compat_uint_t qfs_nextents;
1: +  compat_u64 dqb_bhardlimit;
1: +  compat_u64 qfs_nblks;
1: +  compat_uint_t qfs_nextents;
1:  } __attribute__((packed));
1:  
1:  struct compat_fs_quota_stat {
1: -	__s8 qs_version;
1: -	char: 8;
1: -	__u16 qs_flags;
1: -	__s8 qs_pad;
1: -	int: 24;
1: -	struct compat_fs_qfilestat qs_uquota;
1: -	struct compat_fs_qfilestat qs_gquota;
1: -	compat_uint_t qs_incoredqs;
1: -	compat_int_t qs_btimelimit;
1: -	compat_int_t qs_itimelimit;
1: -	compat_int_t qs_rtbtimelimit;
1: -	__u16 qs_bwarnlimit;
1: -	__u16 qs_iwarnlimit;
1: +  __s8 qs_version;
1: +  char : 8;
1: +  __u16 qs_flags;
1: +  __s8 qs_pad;
1: +  int : 24;
1: +  struct compat_fs_qfilestat qs_uquota;
1: +  struct compat_fs_qfilestat qs_gquota;
1: +  compat_uint_t qs_incoredqs;
1: +  compat_int_t qs_btimelimit;
1: +  compat_int_t qs_itimelimit;
1: +  compat_int_t qs_rtbtimelimit;
1: +  __u16 qs_bwarnlimit;
1: +  __u16 qs_iwarnlimit;
1:  } __attribute__((packed));
1:  
1:  struct proc_maps_private {
1: -	struct inode *inode;
1: -	struct task_struct *task;
1: -	struct mm_struct *mm;
1: -	struct vm_area_struct *tail_vma;
1: -	struct mempolicy *task_mempolicy;
1: +  struct inode *inode;
1: +  struct task_struct *task;
1: +  struct mm_struct *mm;
1: +  struct vm_area_struct *tail_vma;
1: +  struct mempolicy *task_mempolicy;
1:  };
1:  
1:  struct mem_size_stats {
1: -	long unsigned int resident;
1: -	long unsigned int shared_clean;
1: -	long unsigned int shared_dirty;
1: -	long unsigned int private_clean;
1: -	long unsigned int private_dirty;
1: -	long unsigned int referenced;
1: -	long unsigned int anonymous;
1: -	long unsigned int lazyfree;
1: -	long unsigned int anonymous_thp;
1: -	long unsigned int shmem_thp;
1: -	long unsigned int file_thp;
1: -	long unsigned int swap;
1: -	long unsigned int shared_hugetlb;
1: -	long unsigned int private_hugetlb;
1: -	u64 pss;
1: -	u64 pss_anon;
1: -	u64 pss_file;
1: -	u64 pss_shmem;
1: -	u64 pss_locked;
1: -	u64 swap_pss;
1: -	bool check_shmem_swap;
1: +  long unsigned int resident;
1: +  long unsigned int shared_clean;
1: +  long unsigned int shared_dirty;
1: +  long unsigned int private_clean;
1: +  long unsigned int private_dirty;
1: +  long unsigned int referenced;
1: +  long unsigned int anonymous;
1: +  long unsigned int lazyfree;
1: +  long unsigned int anonymous_thp;
1: +  long unsigned int shmem_thp;
1: +  long unsigned int file_thp;
1: +  long unsigned int swap;
1: +  long unsigned int shared_hugetlb;
1: +  long unsigned int private_hugetlb;
1: +  u64 pss;
1: +  u64 pss_anon;
1: +  u64 pss_file;
1: +  u64 pss_shmem;
1: +  u64 pss_locked;
1: +  u64 swap_pss;
1: +  bool check_shmem_swap;
1:  };
1:  
1:  enum clear_refs_types {
1: -	CLEAR_REFS_ALL = 1,
1: -	CLEAR_REFS_ANON = 2,
1: -	CLEAR_REFS_MAPPED = 3,
1: -	CLEAR_REFS_SOFT_DIRTY = 4,
1: -	CLEAR_REFS_MM_HIWATER_RSS = 5,
1: -	CLEAR_REFS_LAST = 6,
1: +  CLEAR_REFS_ALL = 1,
1: +  CLEAR_REFS_ANON = 2,
1: +  CLEAR_REFS_MAPPED = 3,
1: +  CLEAR_REFS_SOFT_DIRTY = 4,
1: +  CLEAR_REFS_MM_HIWATER_RSS = 5,
1: +  CLEAR_REFS_LAST = 6,
1:  };
1:  
1:  struct clear_refs_private {
1: -	enum clear_refs_types type;
1: +  enum clear_refs_types type;
1:  };
1:  
1: -typedef struct {
1: -	u64 pme;
1: -} pagemap_entry_t;
1: +typedef struct { u64 pme; } pagemap_entry_t;
1:  
1:  struct pagemapread {
1: -	int pos;
1: -	int len;
1: -	pagemap_entry_t *buffer;
1: -	bool show_pfn;
1: +  int pos;
1: +  int len;
1: +  pagemap_entry_t *buffer;
1: +  bool show_pfn;
1:  };
1:  
1:  struct numa_maps {
1: -	long unsigned int pages;
1: -	long unsigned int anon;
1: -	long unsigned int active;
1: -	long unsigned int writeback;
1: -	long unsigned int mapcount_max;
1: -	long unsigned int dirty;
1: -	long unsigned int swapcache;
1: -	long unsigned int node[64];
1: +  long unsigned int pages;
1: +  long unsigned int anon;
1: +  long unsigned int active;
1: +  long unsigned int writeback;
1: +  long unsigned int mapcount_max;
1: +  long unsigned int dirty;
1: +  long unsigned int swapcache;
1: +  long unsigned int node[64];
1:  };
1:  
1:  struct numa_maps_private {
1: -	struct proc_maps_private proc_maps;
1: -	struct numa_maps md;
1: +  struct proc_maps_private proc_maps;
1: +  struct numa_maps md;
1:  };
1:  
1:  struct pde_opener {
1: -	struct list_head lh;
1: -	struct file *file;
1: -	bool closing;
1: -	struct completion *c;
1: +  struct list_head lh;
1: +  struct file *file;
1: +  bool closing;
1: +  struct completion *c;
1:  };
1:  
1:  enum {
1: -	BIAS = 2147483648,
1: +  BIAS = 2147483648,
1:  };
1:  
1:  struct proc_fs_context {
1: -	struct pid_namespace *pid_ns;
1: -	unsigned int mask;
1: -	enum proc_hidepid hidepid;
1: -	int gid;
1: -	enum proc_pidonly pidonly;
1: +  struct pid_namespace *pid_ns;
1: +  unsigned int mask;
1: +  enum proc_hidepid hidepid;
1: +  int gid;
1: +  enum proc_pidonly pidonly;
1:  };
1:  
1:  enum proc_param {
1: -	Opt_gid___2 = 0,
1: -	Opt_hidepid = 1,
1: -	Opt_subset = 2,
1: +  Opt_gid___2 = 0,
1: +  Opt_hidepid = 1,
1: +  Opt_subset = 2,
1:  };
1:  
1:  struct genradix_root;
1:  
1:  struct __genradix {
1: -	struct genradix_root *root;
1: +  struct genradix_root *root;
1:  };
1:  
1:  struct syscall_info {
1: -	__u64 sp;
1: -	struct seccomp_data data;
1: +  __u64 sp;
1: +  struct seccomp_data data;
1:  };
1:  
1: -typedef struct dentry *instantiate_t(struct dentry *, struct task_struct *, const void *);
1: +typedef struct dentry *instantiate_t(struct dentry *, struct task_struct *,
1: +                                     const void *);
1:  
1:  struct pid_entry {
1: -	const char *name;
1: -	unsigned int len;
1: -	umode_t mode;
1: -	const struct inode_operations *iop;
1: -	const struct file_operations *fop;
1: -	union proc_op op;
1: +  const char *name;
1: +  unsigned int len;
1: +  umode_t mode;
1: +  const struct inode_operations *iop;
1: +  const struct file_operations *fop;
1: +  union proc_op op;
1:  };
1:  
1:  struct limit_names {
1: -	const char *name;
1: -	const char *unit;
1: +  const char *name;
1: +  const char *unit;
1:  };
1:  
1:  struct map_files_info {
1: -	long unsigned int start;
1: -	long unsigned int end;
1: -	fmode_t mode;
1: +  long unsigned int start;
1: +  long unsigned int end;
1: +  fmode_t mode;
1:  };
1:  
1:  struct tgid_iter {
1: -	unsigned int tgid;
1: -	struct task_struct *task;
1: +  unsigned int tgid;
1: +  struct task_struct *task;
1:  };
1:  
1:  struct fd_data {
1: -	fmode_t mode;
1: -	unsigned int fd;
1: +  fmode_t mode;
1: +  unsigned int fd;
1:  };
1:  
1:  struct sysctl_alias {
1: -	const char *kernel_param;
1: -	const char *sysctl_param;
1: +  const char *kernel_param;
1: +  const char *sysctl_param;
1:  };
1:  
1:  struct seq_net_private {
1: -	struct net *net;
1: +  struct net *net;
1:  };
1:  
1:  struct bpf_iter_aux_info___2;
1:  
1:  struct kernfs_iattrs {
1: -	kuid_t ia_uid;
1: -	kgid_t ia_gid;
1: -	struct timespec64 ia_atime;
1: -	struct timespec64 ia_mtime;
1: -	struct timespec64 ia_ctime;
1: -	struct simple_xattrs xattrs;
1: -	atomic_t nr_user_xattrs;
1: -	atomic_t user_xattr_size;
1: +  kuid_t ia_uid;
1: +  kgid_t ia_gid;
1: +  struct timespec64 ia_atime;
1: +  struct timespec64 ia_mtime;
1: +  struct timespec64 ia_ctime;
1: +  struct simple_xattrs xattrs;
1: +  atomic_t nr_user_xattrs;
1: +  atomic_t user_xattr_size;
1:  };
1:  
1:  struct kernfs_super_info {
1: -	struct super_block *sb;
1: -	struct kernfs_root *root;
1: -	const void *ns;
1: -	struct list_head node;
1: +  struct super_block *sb;
1: +  struct kernfs_root *root;
1: +  const void *ns;
1: +  struct list_head node;
1:  };
1:  
1:  enum kernfs_node_flag {
1: -	KERNFS_ACTIVATED = 16,
1: -	KERNFS_NS = 32,
1: -	KERNFS_HAS_SEQ_SHOW = 64,
1: -	KERNFS_HAS_MMAP = 128,
1: -	KERNFS_LOCKDEP = 256,
1: -	KERNFS_SUICIDAL = 1024,
1: -	KERNFS_SUICIDED = 2048,
1: -	KERNFS_EMPTY_DIR = 4096,
1: -	KERNFS_HAS_RELEASE = 8192,
1: +  KERNFS_ACTIVATED = 16,
1: +  KERNFS_NS = 32,
1: +  KERNFS_HAS_SEQ_SHOW = 64,
1: +  KERNFS_HAS_MMAP = 128,
1: +  KERNFS_LOCKDEP = 256,
1: +  KERNFS_SUICIDAL = 1024,
1: +  KERNFS_SUICIDED = 2048,
1: +  KERNFS_EMPTY_DIR = 4096,
1: +  KERNFS_HAS_RELEASE = 8192,
1:  };
1:  
1:  struct kernfs_open_node {
1: -	atomic_t refcnt;
1: -	atomic_t event;
1: -	wait_queue_head_t poll;
1: -	struct list_head files;
1: +  atomic_t refcnt;
1: +  atomic_t event;
1: +  wait_queue_head_t poll;
1: +  struct list_head files;
1:  };
1:  
1:  struct pts_mount_opts {
1: -	int setuid;
1: -	int setgid;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	umode_t mode;
1: -	umode_t ptmxmode;
1: -	int reserve;
1: -	int max;
1: +  int setuid;
1: +  int setgid;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  umode_t mode;
1: +  umode_t ptmxmode;
1: +  int reserve;
1: +  int max;
1:  };
1:  
1:  enum {
1: -	Opt_uid___2 = 0,
1: -	Opt_gid___3 = 1,
1: -	Opt_mode___2 = 2,
1: -	Opt_ptmxmode = 3,
1: -	Opt_newinstance = 4,
1: -	Opt_max = 5,
1: -	Opt_err = 6,
1: +  Opt_uid___2 = 0,
1: +  Opt_gid___3 = 1,
1: +  Opt_mode___2 = 2,
1: +  Opt_ptmxmode = 3,
1: +  Opt_newinstance = 4,
1: +  Opt_max = 5,
1: +  Opt_err = 6,
1:  };
1:  
1:  struct pts_fs_info {
1: -	struct ida allocated_ptys;
1: -	struct pts_mount_opts mount_opts;
1: -	struct super_block *sb;
1: -	struct dentry *ptmx_dentry;
1: +  struct ida allocated_ptys;
1: +  struct pts_mount_opts mount_opts;
1: +  struct super_block *sb;
1: +  struct dentry *ptmx_dentry;
1:  };
1:  
1:  struct dcookie_struct {
1: -	struct path path;
1: -	struct list_head hash_list;
1: +  struct path path;
1: +  struct list_head hash_list;
1:  };
1:  
1:  struct dcookie_user {
1: -	struct list_head next;
1: +  struct list_head next;
1:  };
1:  
1:  typedef unsigned int tid_t;
1:  
1:  struct transaction_chp_stats_s {
1: -	long unsigned int cs_chp_time;
1: -	__u32 cs_forced_to_close;
1: -	__u32 cs_written;
1: -	__u32 cs_dropped;
1: +  long unsigned int cs_chp_time;
1: +  __u32 cs_forced_to_close;
1: +  __u32 cs_written;
1: +  __u32 cs_dropped;
1:  };
1:  
1:  struct journal_s;
1: @@ -45666,138 +46195,141 @@ struct transaction_s;
1:  typedef struct transaction_s transaction_t;
1:  
1:  struct transaction_s {
1: -	journal_t *t_journal;
1: -	tid_t t_tid;
1: -	enum {
1: -		T_RUNNING = 0,
1: -		T_LOCKED = 1,
1: -		T_SWITCH = 2,
1: -		T_FLUSH = 3,
1: -		T_COMMIT = 4,
1: -		T_COMMIT_DFLUSH = 5,
1: -		T_COMMIT_JFLUSH = 6,
1: -		T_COMMIT_CALLBACK = 7,
1: -		T_FINISHED = 8,
1: -	} t_state;
1: -	long unsigned int t_log_start;
1: -	int t_nr_buffers;
1: -	struct journal_head *t_reserved_list;
1: -	struct journal_head *t_buffers;
1: -	struct journal_head *t_forget;
1: -	struct journal_head *t_checkpoint_list;
1: -	struct journal_head *t_checkpoint_io_list;
1: -	struct journal_head *t_shadow_list;
1: -	struct list_head t_inode_list;
1: -	spinlock_t t_handle_lock;
1: -	long unsigned int t_max_wait;
1: -	long unsigned int t_start;
1: -	long unsigned int t_requested;
1: -	struct transaction_chp_stats_s t_chp_stats;
1: -	atomic_t t_updates;
1: -	atomic_t t_outstanding_credits;
1: -	atomic_t t_outstanding_revokes;
1: -	atomic_t t_handle_count;
1: -	transaction_t *t_cpnext;
1: -	transaction_t *t_cpprev;
1: -	long unsigned int t_expires;
1: -	ktime_t t_start_time;
1: -	unsigned int t_synchronous_commit: 1;
1: -	int t_need_data_flush;
1: -	struct list_head t_private_list;
1: +  journal_t *t_journal;
1: +  tid_t t_tid;
1: +  enum {
1: +    T_RUNNING = 0,
1: +    T_LOCKED = 1,
1: +    T_SWITCH = 2,
1: +    T_FLUSH = 3,
1: +    T_COMMIT = 4,
1: +    T_COMMIT_DFLUSH = 5,
1: +    T_COMMIT_JFLUSH = 6,
1: +    T_COMMIT_CALLBACK = 7,
1: +    T_FINISHED = 8,
1: +  } t_state;
1: +  long unsigned int t_log_start;
1: +  int t_nr_buffers;
1: +  struct journal_head *t_reserved_list;
1: +  struct journal_head *t_buffers;
1: +  struct journal_head *t_forget;
1: +  struct journal_head *t_checkpoint_list;
1: +  struct journal_head *t_checkpoint_io_list;
1: +  struct journal_head *t_shadow_list;
1: +  struct list_head t_inode_list;
1: +  spinlock_t t_handle_lock;
1: +  long unsigned int t_max_wait;
1: +  long unsigned int t_start;
1: +  long unsigned int t_requested;
1: +  struct transaction_chp_stats_s t_chp_stats;
1: +  atomic_t t_updates;
1: +  atomic_t t_outstanding_credits;
1: +  atomic_t t_outstanding_revokes;
1: +  atomic_t t_handle_count;
1: +  transaction_t *t_cpnext;
1: +  transaction_t *t_cpprev;
1: +  long unsigned int t_expires;
1: +  ktime_t t_start_time;
1: +  unsigned int t_synchronous_commit : 1;
1: +  int t_need_data_flush;
1: +  struct list_head t_private_list;
1:  };
1:  
1:  struct jbd2_buffer_trigger_type;
1:  
1:  struct journal_head {
1: -	struct buffer_head *b_bh;
1: -	spinlock_t b_state_lock;
1: -	int b_jcount;
1: -	unsigned int b_jlist;
1: -	unsigned int b_modified;
1: -	char *b_frozen_data;
1: -	char *b_committed_data;
1: -	transaction_t *b_transaction;
1: -	transaction_t *b_next_transaction;
1: -	struct journal_head *b_tnext;
1: -	struct journal_head *b_tprev;
1: -	transaction_t *b_cp_transaction;
1: -	struct journal_head *b_cpnext;
1: -	struct journal_head *b_cpprev;
1: -	struct jbd2_buffer_trigger_type *b_triggers;
1: -	struct jbd2_buffer_trigger_type *b_frozen_triggers;
1: +  struct buffer_head *b_bh;
1: +  spinlock_t b_state_lock;
1: +  int b_jcount;
1: +  unsigned int b_jlist;
1: +  unsigned int b_modified;
1: +  char *b_frozen_data;
1: +  char *b_committed_data;
1: +  transaction_t *b_transaction;
1: +  transaction_t *b_next_transaction;
1: +  struct journal_head *b_tnext;
1: +  struct journal_head *b_tprev;
1: +  transaction_t *b_cp_transaction;
1: +  struct journal_head *b_cpnext;
1: +  struct journal_head *b_cpprev;
1: +  struct jbd2_buffer_trigger_type *b_triggers;
1: +  struct jbd2_buffer_trigger_type *b_frozen_triggers;
1:  };
1:  
1:  struct jbd2_buffer_trigger_type {
1: -	void (*t_frozen)(struct jbd2_buffer_trigger_type *, struct buffer_head *, void *, size_t);
1: -	void (*t_abort)(struct jbd2_buffer_trigger_type *, struct buffer_head *);
1: +  void (*t_frozen)(struct jbd2_buffer_trigger_type *, struct buffer_head *,
1: +                   void *, size_t);
1: +  void (*t_abort)(struct jbd2_buffer_trigger_type *, struct buffer_head *);
1:  };
1:  
1:  struct crypto_alg;
1:  
1:  struct crypto_tfm {
1: -	u32 crt_flags;
1: -	int node;
1: -	void (*exit)(struct crypto_tfm *);
1: -	struct crypto_alg *__crt_alg;
1: -	void *__crt_ctx[0];
1: +  u32 crt_flags;
1: +  int node;
1: +  void (*exit)(struct crypto_tfm *);
1: +  struct crypto_alg *__crt_alg;
1: +  void *__crt_ctx[0];
1:  };
1:  
1:  struct cipher_alg {
1: -	unsigned int cia_min_keysize;
1: -	unsigned int cia_max_keysize;
1: -	int (*cia_setkey)(struct crypto_tfm *, const u8 *, unsigned int);
1: -	void (*cia_encrypt)(struct crypto_tfm *, u8 *, const u8 *);
1: -	void (*cia_decrypt)(struct crypto_tfm *, u8 *, const u8 *);
1: +  unsigned int cia_min_keysize;
1: +  unsigned int cia_max_keysize;
1: +  int (*cia_setkey)(struct crypto_tfm *, const u8 *, unsigned int);
1: +  void (*cia_encrypt)(struct crypto_tfm *, u8 *, const u8 *);
1: +  void (*cia_decrypt)(struct crypto_tfm *, u8 *, const u8 *);
1:  };
1:  
1:  struct compress_alg {
1: -	int (*coa_compress)(struct crypto_tfm *, const u8 *, unsigned int, u8 *, unsigned int *);
1: -	int (*coa_decompress)(struct crypto_tfm *, const u8 *, unsigned int, u8 *, unsigned int *);
1: +  int (*coa_compress)(struct crypto_tfm *, const u8 *, unsigned int, u8 *,
1: +                      unsigned int *);
1: +  int (*coa_decompress)(struct crypto_tfm *, const u8 *, unsigned int, u8 *,
1: +                        unsigned int *);
1:  };
1:  
1:  struct crypto_type;
1:  
1:  struct crypto_alg {
1: -	struct list_head cra_list;
1: -	struct list_head cra_users;
1: -	u32 cra_flags;
1: -	unsigned int cra_blocksize;
1: -	unsigned int cra_ctxsize;
1: -	unsigned int cra_alignmask;
1: -	int cra_priority;
1: -	refcount_t cra_refcnt;
1: -	char cra_name[128];
1: -	char cra_driver_name[128];
1: -	const struct crypto_type *cra_type;
1: -	union {
1: -		struct cipher_alg cipher;
1: -		struct compress_alg compress;
1: -	} cra_u;
1: -	int (*cra_init)(struct crypto_tfm *);
1: -	void (*cra_exit)(struct crypto_tfm *);
1: -	void (*cra_destroy)(struct crypto_alg *);
1: -	struct module *cra_module;
1: +  struct list_head cra_list;
1: +  struct list_head cra_users;
1: +  u32 cra_flags;
1: +  unsigned int cra_blocksize;
1: +  unsigned int cra_ctxsize;
1: +  unsigned int cra_alignmask;
1: +  int cra_priority;
1: +  refcount_t cra_refcnt;
1: +  char cra_name[128];
1: +  char cra_driver_name[128];
1: +  const struct crypto_type *cra_type;
1: +  union {
1: +    struct cipher_alg cipher;
1: +    struct compress_alg compress;
1: +  } cra_u;
1: +  int (*cra_init)(struct crypto_tfm *);
1: +  void (*cra_exit)(struct crypto_tfm *);
1: +  void (*cra_destroy)(struct crypto_alg *);
1: +  struct module *cra_module;
1:  };
1:  
1:  struct crypto_instance;
1:  
1:  struct crypto_type {
1: -	unsigned int (*ctxsize)(struct crypto_alg *, u32, u32);
1: -	unsigned int (*extsize)(struct crypto_alg *);
1: -	int (*init)(struct crypto_tfm *, u32, u32);
1: -	int (*init_tfm)(struct crypto_tfm *);
1: -	void (*show)(struct seq_file *, struct crypto_alg *);
1: -	int (*report)(struct sk_buff *, struct crypto_alg *);
1: -	void (*free)(struct crypto_instance *);
1: -	unsigned int type;
1: -	unsigned int maskclear;
1: -	unsigned int maskset;
1: -	unsigned int tfmsize;
1: +  unsigned int (*ctxsize)(struct crypto_alg *, u32, u32);
1: +  unsigned int (*extsize)(struct crypto_alg *);
1: +  int (*init)(struct crypto_tfm *, u32, u32);
1: +  int (*init_tfm)(struct crypto_tfm *);
1: +  void (*show)(struct seq_file *, struct crypto_alg *);
1: +  int (*report)(struct sk_buff *, struct crypto_alg *);
1: +  void (*free)(struct crypto_instance *);
1: +  unsigned int type;
1: +  unsigned int maskclear;
1: +  unsigned int maskset;
1: +  unsigned int tfmsize;
1:  };
1:  
1:  struct crypto_shash {
1: -	unsigned int descsize;
1: -	struct crypto_tfm base;
1: +  unsigned int descsize;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct jbd2_journal_handle;
1: @@ -45805,49 +46337,49 @@ struct jbd2_journal_handle;
1:  typedef struct jbd2_journal_handle handle_t;
1:  
1:  struct jbd2_journal_handle {
1: -	union {
1: -		transaction_t *h_transaction;
1: -		journal_t *h_journal;
1: -	};
1: -	handle_t *h_rsv_handle;
1: -	int h_total_credits;
1: -	int h_revoke_credits;
1: -	int h_revoke_credits_requested;
1: -	int h_ref;
1: -	int h_err;
1: -	unsigned int h_sync: 1;
1: -	unsigned int h_jdata: 1;
1: -	unsigned int h_reserved: 1;
1: -	unsigned int h_aborted: 1;
1: -	unsigned int h_type: 8;
1: -	unsigned int h_line_no: 16;
1: -	long unsigned int h_start_jiffies;
1: -	unsigned int h_requested_credits;
1: -	unsigned int saved_alloc_context;
1: +  union {
1: +    transaction_t *h_transaction;
1: +    journal_t *h_journal;
1: +  };
1: +  handle_t *h_rsv_handle;
1: +  int h_total_credits;
1: +  int h_revoke_credits;
1: +  int h_revoke_credits_requested;
1: +  int h_ref;
1: +  int h_err;
1: +  unsigned int h_sync : 1;
1: +  unsigned int h_jdata : 1;
1: +  unsigned int h_reserved : 1;
1: +  unsigned int h_aborted : 1;
1: +  unsigned int h_type : 8;
1: +  unsigned int h_line_no : 16;
1: +  long unsigned int h_start_jiffies;
1: +  unsigned int h_requested_credits;
1: +  unsigned int saved_alloc_context;
1:  };
1:  
1:  struct transaction_run_stats_s {
1: -	long unsigned int rs_wait;
1: -	long unsigned int rs_request_delay;
1: -	long unsigned int rs_running;
1: -	long unsigned int rs_locked;
1: -	long unsigned int rs_flushing;
1: -	long unsigned int rs_logging;
1: -	__u32 rs_handle_count;
1: -	__u32 rs_blocks;
1: -	__u32 rs_blocks_logged;
1: +  long unsigned int rs_wait;
1: +  long unsigned int rs_request_delay;
1: +  long unsigned int rs_running;
1: +  long unsigned int rs_locked;
1: +  long unsigned int rs_flushing;
1: +  long unsigned int rs_logging;
1: +  __u32 rs_handle_count;
1: +  __u32 rs_blocks;
1: +  __u32 rs_blocks_logged;
1:  };
1:  
1:  struct transaction_stats_s {
1: -	long unsigned int ts_tid;
1: -	long unsigned int ts_requested;
1: -	struct transaction_run_stats_s run;
1: +  long unsigned int ts_tid;
1: +  long unsigned int ts_requested;
1: +  struct transaction_run_stats_s run;
1:  };
1:  
1:  enum passtype {
1: -	PASS_SCAN = 0,
1: -	PASS_REVOKE = 1,
1: -	PASS_REPLAY = 2,
1: +  PASS_SCAN = 0,
1: +  PASS_REVOKE = 1,
1: +  PASS_REPLAY = 2,
1:  };
1:  
1:  struct journal_superblock_s;
1: @@ -45859,144 +46391,145 @@ struct jbd2_revoke_table_s;
1:  struct jbd2_inode;
1:  
1:  struct journal_s {
1: -	long unsigned int j_flags;
1: -	int j_errno;
1: -	struct mutex j_abort_mutex;
1: -	struct buffer_head *j_sb_buffer;
1: -	journal_superblock_t *j_superblock;
1: -	int j_format_version;
1: -	rwlock_t j_state_lock;
1: -	int j_barrier_count;
1: -	struct mutex j_barrier;
1: -	transaction_t *j_running_transaction;
1: -	transaction_t *j_committing_transaction;
1: -	transaction_t *j_checkpoint_transactions;
1: -	wait_queue_head_t j_wait_transaction_locked;
1: -	wait_queue_head_t j_wait_done_commit;
1: -	wait_queue_head_t j_wait_commit;
1: -	wait_queue_head_t j_wait_updates;
1: -	wait_queue_head_t j_wait_reserved;
1: -	wait_queue_head_t j_fc_wait;
1: -	struct mutex j_checkpoint_mutex;
1: -	struct buffer_head *j_chkpt_bhs[64];
1: -	long unsigned int j_head;
1: -	long unsigned int j_tail;
1: -	long unsigned int j_free;
1: -	long unsigned int j_first;
1: -	long unsigned int j_last;
1: -	long unsigned int j_fc_first;
1: -	long unsigned int j_fc_off;
1: -	long unsigned int j_fc_last;
1: -	struct block_device *j_dev;
1: -	int j_blocksize;
1: -	long long unsigned int j_blk_offset;
1: -	char j_devname[56];
1: -	struct block_device *j_fs_dev;
1: -	unsigned int j_total_len;
1: -	atomic_t j_reserved_credits;
1: -	spinlock_t j_list_lock;
1: -	struct inode *j_inode;
1: -	tid_t j_tail_sequence;
1: -	tid_t j_transaction_sequence;
1: -	tid_t j_commit_sequence;
1: -	tid_t j_commit_request;
1: -	__u8 j_uuid[16];
1: -	struct task_struct *j_task;
1: -	int j_max_transaction_buffers;
1: -	int j_revoke_records_per_block;
1: -	long unsigned int j_commit_interval;
1: -	struct timer_list j_commit_timer;
1: -	spinlock_t j_revoke_lock;
1: -	struct jbd2_revoke_table_s *j_revoke;
1: -	struct jbd2_revoke_table_s *j_revoke_table[2];
1: -	struct buffer_head **j_wbuf;
1: -	struct buffer_head **j_fc_wbuf;
1: -	int j_wbufsize;
1: -	int j_fc_wbufsize;
1: -	pid_t j_last_sync_writer;
1: -	u64 j_average_commit_time;
1: -	u32 j_min_batch_time;
1: -	u32 j_max_batch_time;
1: -	void (*j_commit_callback)(journal_t *, transaction_t *);
1: -	int (*j_submit_inode_data_buffers)(struct jbd2_inode *);
1: -	int (*j_finish_inode_data_buffers)(struct jbd2_inode *);
1: -	spinlock_t j_history_lock;
1: -	struct proc_dir_entry *j_proc_entry;
1: -	struct transaction_stats_s j_stats;
1: -	unsigned int j_failed_commit;
1: -	void *j_private;
1: -	struct crypto_shash *j_chksum_driver;
1: -	__u32 j_csum_seed;
1: -	void (*j_fc_cleanup_callback)(struct journal_s *, int);
1: -	int (*j_fc_replay_callback)(struct journal_s *, struct buffer_head *, enum passtype, int, tid_t);
1: +  long unsigned int j_flags;
1: +  int j_errno;
1: +  struct mutex j_abort_mutex;
1: +  struct buffer_head *j_sb_buffer;
1: +  journal_superblock_t *j_superblock;
1: +  int j_format_version;
1: +  rwlock_t j_state_lock;
1: +  int j_barrier_count;
1: +  struct mutex j_barrier;
1: +  transaction_t *j_running_transaction;
1: +  transaction_t *j_committing_transaction;
1: +  transaction_t *j_checkpoint_transactions;
1: +  wait_queue_head_t j_wait_transaction_locked;
1: +  wait_queue_head_t j_wait_done_commit;
1: +  wait_queue_head_t j_wait_commit;
1: +  wait_queue_head_t j_wait_updates;
1: +  wait_queue_head_t j_wait_reserved;
1: +  wait_queue_head_t j_fc_wait;
1: +  struct mutex j_checkpoint_mutex;
1: +  struct buffer_head *j_chkpt_bhs[64];
1: +  long unsigned int j_head;
1: +  long unsigned int j_tail;
1: +  long unsigned int j_free;
1: +  long unsigned int j_first;
1: +  long unsigned int j_last;
1: +  long unsigned int j_fc_first;
1: +  long unsigned int j_fc_off;
1: +  long unsigned int j_fc_last;
1: +  struct block_device *j_dev;
1: +  int j_blocksize;
1: +  long long unsigned int j_blk_offset;
1: +  char j_devname[56];
1: +  struct block_device *j_fs_dev;
1: +  unsigned int j_total_len;
1: +  atomic_t j_reserved_credits;
1: +  spinlock_t j_list_lock;
1: +  struct inode *j_inode;
1: +  tid_t j_tail_sequence;
1: +  tid_t j_transaction_sequence;
1: +  tid_t j_commit_sequence;
1: +  tid_t j_commit_request;
1: +  __u8 j_uuid[16];
1: +  struct task_struct *j_task;
1: +  int j_max_transaction_buffers;
1: +  int j_revoke_records_per_block;
1: +  long unsigned int j_commit_interval;
1: +  struct timer_list j_commit_timer;
1: +  spinlock_t j_revoke_lock;
1: +  struct jbd2_revoke_table_s *j_revoke;
1: +  struct jbd2_revoke_table_s *j_revoke_table[2];
1: +  struct buffer_head **j_wbuf;
1: +  struct buffer_head **j_fc_wbuf;
1: +  int j_wbufsize;
1: +  int j_fc_wbufsize;
1: +  pid_t j_last_sync_writer;
1: +  u64 j_average_commit_time;
1: +  u32 j_min_batch_time;
1: +  u32 j_max_batch_time;
1: +  void (*j_commit_callback)(journal_t *, transaction_t *);
1: +  int (*j_submit_inode_data_buffers)(struct jbd2_inode *);
1: +  int (*j_finish_inode_data_buffers)(struct jbd2_inode *);
1: +  spinlock_t j_history_lock;
1: +  struct proc_dir_entry *j_proc_entry;
1: +  struct transaction_stats_s j_stats;
1: +  unsigned int j_failed_commit;
1: +  void *j_private;
1: +  struct crypto_shash *j_chksum_driver;
1: +  __u32 j_csum_seed;
1: +  void (*j_fc_cleanup_callback)(struct journal_s *, int);
1: +  int (*j_fc_replay_callback)(struct journal_s *, struct buffer_head *,
1: +                              enum passtype, int, tid_t);
1:  };
1:  
1:  struct journal_header_s {
1: -	__be32 h_magic;
1: -	__be32 h_blocktype;
1: -	__be32 h_sequence;
1: +  __be32 h_magic;
1: +  __be32 h_blocktype;
1: +  __be32 h_sequence;
1:  };
1:  
1:  typedef struct journal_header_s journal_header_t;
1:  
1:  struct journal_superblock_s {
1: -	journal_header_t s_header;
1: -	__be32 s_blocksize;
1: -	__be32 s_maxlen;
1: -	__be32 s_first;
1: -	__be32 s_sequence;
1: -	__be32 s_start;
1: -	__be32 s_errno;
1: -	__be32 s_feature_compat;
1: -	__be32 s_feature_incompat;
1: -	__be32 s_feature_ro_compat;
1: -	__u8 s_uuid[16];
1: -	__be32 s_nr_users;
1: -	__be32 s_dynsuper;
1: -	__be32 s_max_transaction;
1: -	__be32 s_max_trans_data;
1: -	__u8 s_checksum_type;
1: -	__u8 s_padding2[3];
1: -	__be32 s_num_fc_blks;
1: -	__u32 s_padding[41];
1: -	__be32 s_checksum;
1: -	__u8 s_users[768];
1: +  journal_header_t s_header;
1: +  __be32 s_blocksize;
1: +  __be32 s_maxlen;
1: +  __be32 s_first;
1: +  __be32 s_sequence;
1: +  __be32 s_start;
1: +  __be32 s_errno;
1: +  __be32 s_feature_compat;
1: +  __be32 s_feature_incompat;
1: +  __be32 s_feature_ro_compat;
1: +  __u8 s_uuid[16];
1: +  __be32 s_nr_users;
1: +  __be32 s_dynsuper;
1: +  __be32 s_max_transaction;
1: +  __be32 s_max_trans_data;
1: +  __u8 s_checksum_type;
1: +  __u8 s_padding2[3];
1: +  __be32 s_num_fc_blks;
1: +  __u32 s_padding[41];
1: +  __be32 s_checksum;
1: +  __u8 s_users[768];
1:  };
1:  
1:  enum jbd_state_bits {
1: -	BH_JBD = 16,
1: -	BH_JWrite = 17,
1: -	BH_Freed = 18,
1: -	BH_Revoked = 19,
1: -	BH_RevokeValid = 20,
1: -	BH_JBDDirty = 21,
1: -	BH_JournalHead = 22,
1: -	BH_Shadow = 23,
1: -	BH_Verified = 24,
1: -	BH_JBDPrivateStart = 25,
1: +  BH_JBD = 16,
1: +  BH_JWrite = 17,
1: +  BH_Freed = 18,
1: +  BH_Revoked = 19,
1: +  BH_RevokeValid = 20,
1: +  BH_JBDDirty = 21,
1: +  BH_JournalHead = 22,
1: +  BH_Shadow = 23,
1: +  BH_Verified = 24,
1: +  BH_JBDPrivateStart = 25,
1:  };
1:  
1:  struct jbd2_inode {
1: -	transaction_t *i_transaction;
1: -	transaction_t *i_next_transaction;
1: -	struct list_head i_list;
1: -	struct inode *i_vfs_inode;
1: -	long unsigned int i_flags;
1: -	loff_t i_dirty_start;
1: -	loff_t i_dirty_end;
1: +  transaction_t *i_transaction;
1: +  transaction_t *i_next_transaction;
1: +  struct list_head i_list;
1: +  struct inode *i_vfs_inode;
1: +  long unsigned int i_flags;
1: +  loff_t i_dirty_start;
1: +  loff_t i_dirty_end;
1:  };
1:  
1:  struct bgl_lock {
1: -	spinlock_t lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  spinlock_t lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct blockgroup_lock {
1: -	struct bgl_lock locks[128];
1: +  struct bgl_lock locks[128];
1:  };
1:  
1:  struct fscrypt_dummy_policy {};
1: @@ -46010,262 +46543,262 @@ typedef __u32 ext4_lblk_t;
1:  typedef unsigned int ext4_group_t;
1:  
1:  struct ext4_allocation_request {
1: -	struct inode *inode;
1: -	unsigned int len;
1: -	ext4_lblk_t logical;
1: -	ext4_lblk_t lleft;
1: -	ext4_lblk_t lright;
1: -	ext4_fsblk_t goal;
1: -	ext4_fsblk_t pleft;
1: -	ext4_fsblk_t pright;
1: -	unsigned int flags;
1: +  struct inode *inode;
1: +  unsigned int len;
1: +  ext4_lblk_t logical;
1: +  ext4_lblk_t lleft;
1: +  ext4_lblk_t lright;
1: +  ext4_fsblk_t goal;
1: +  ext4_fsblk_t pleft;
1: +  ext4_fsblk_t pright;
1: +  unsigned int flags;
1:  };
1:  
1:  struct ext4_system_blocks {
1: -	struct rb_root root;
1: -	struct callback_head rcu;
1: +  struct rb_root root;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ext4_group_desc {
1: -	__le32 bg_block_bitmap_lo;
1: -	__le32 bg_inode_bitmap_lo;
1: -	__le32 bg_inode_table_lo;
1: -	__le16 bg_free_blocks_count_lo;
1: -	__le16 bg_free_inodes_count_lo;
1: -	__le16 bg_used_dirs_count_lo;
1: -	__le16 bg_flags;
1: -	__le32 bg_exclude_bitmap_lo;
1: -	__le16 bg_block_bitmap_csum_lo;
1: -	__le16 bg_inode_bitmap_csum_lo;
1: -	__le16 bg_itable_unused_lo;
1: -	__le16 bg_checksum;
1: -	__le32 bg_block_bitmap_hi;
1: -	__le32 bg_inode_bitmap_hi;
1: -	__le32 bg_inode_table_hi;
1: -	__le16 bg_free_blocks_count_hi;
1: -	__le16 bg_free_inodes_count_hi;
1: -	__le16 bg_used_dirs_count_hi;
1: -	__le16 bg_itable_unused_hi;
1: -	__le32 bg_exclude_bitmap_hi;
1: -	__le16 bg_block_bitmap_csum_hi;
1: -	__le16 bg_inode_bitmap_csum_hi;
1: -	__u32 bg_reserved;
1: +  __le32 bg_block_bitmap_lo;
1: +  __le32 bg_inode_bitmap_lo;
1: +  __le32 bg_inode_table_lo;
1: +  __le16 bg_free_blocks_count_lo;
1: +  __le16 bg_free_inodes_count_lo;
1: +  __le16 bg_used_dirs_count_lo;
1: +  __le16 bg_flags;
1: +  __le32 bg_exclude_bitmap_lo;
1: +  __le16 bg_block_bitmap_csum_lo;
1: +  __le16 bg_inode_bitmap_csum_lo;
1: +  __le16 bg_itable_unused_lo;
1: +  __le16 bg_checksum;
1: +  __le32 bg_block_bitmap_hi;
1: +  __le32 bg_inode_bitmap_hi;
1: +  __le32 bg_inode_table_hi;
1: +  __le16 bg_free_blocks_count_hi;
1: +  __le16 bg_free_inodes_count_hi;
1: +  __le16 bg_used_dirs_count_hi;
1: +  __le16 bg_itable_unused_hi;
1: +  __le32 bg_exclude_bitmap_hi;
1: +  __le16 bg_block_bitmap_csum_hi;
1: +  __le16 bg_inode_bitmap_csum_hi;
1: +  __u32 bg_reserved;
1:  };
1:  
1:  struct flex_groups {
1: -	atomic64_t free_clusters;
1: -	atomic_t free_inodes;
1: -	atomic_t used_dirs;
1: +  atomic64_t free_clusters;
1: +  atomic_t free_inodes;
1: +  atomic_t used_dirs;
1:  };
1:  
1:  struct extent_status {
1: -	struct rb_node rb_node;
1: -	ext4_lblk_t es_lblk;
1: -	ext4_lblk_t es_len;
1: -	ext4_fsblk_t es_pblk;
1: +  struct rb_node rb_node;
1: +  ext4_lblk_t es_lblk;
1: +  ext4_lblk_t es_len;
1: +  ext4_fsblk_t es_pblk;
1:  };
1:  
1:  struct ext4_es_tree {
1: -	struct rb_root root;
1: -	struct extent_status *cache_es;
1: +  struct rb_root root;
1: +  struct extent_status *cache_es;
1:  };
1:  
1:  struct ext4_es_stats {
1: -	long unsigned int es_stats_shrunk;
1: -	struct percpu_counter es_stats_cache_hits;
1: -	struct percpu_counter es_stats_cache_misses;
1: -	u64 es_stats_scan_time;
1: -	u64 es_stats_max_scan_time;
1: -	struct percpu_counter es_stats_all_cnt;
1: -	struct percpu_counter es_stats_shk_cnt;
1: +  long unsigned int es_stats_shrunk;
1: +  struct percpu_counter es_stats_cache_hits;
1: +  struct percpu_counter es_stats_cache_misses;
1: +  u64 es_stats_scan_time;
1: +  u64 es_stats_max_scan_time;
1: +  struct percpu_counter es_stats_all_cnt;
1: +  struct percpu_counter es_stats_shk_cnt;
1:  };
1:  
1:  struct ext4_pending_tree {
1: -	struct rb_root root;
1: +  struct rb_root root;
1:  };
1:  
1:  struct ext4_fc_stats {
1: -	unsigned int fc_ineligible_reason_count[10];
1: -	long unsigned int fc_num_commits;
1: -	long unsigned int fc_ineligible_commits;
1: -	long unsigned int fc_numblks;
1: +  unsigned int fc_ineligible_reason_count[10];
1: +  long unsigned int fc_num_commits;
1: +  long unsigned int fc_ineligible_commits;
1: +  long unsigned int fc_numblks;
1:  };
1:  
1:  struct ext4_fc_alloc_region {
1: -	ext4_lblk_t lblk;
1: -	ext4_fsblk_t pblk;
1: -	int ino;
1: -	int len;
1: +  ext4_lblk_t lblk;
1: +  ext4_fsblk_t pblk;
1: +  int ino;
1: +  int len;
1:  };
1:  
1:  struct ext4_fc_replay_state {
1: -	int fc_replay_num_tags;
1: -	int fc_replay_expected_off;
1: -	int fc_current_pass;
1: -	int fc_cur_tag;
1: -	int fc_crc;
1: -	struct ext4_fc_alloc_region *fc_regions;
1: -	int fc_regions_size;
1: -	int fc_regions_used;
1: -	int fc_regions_valid;
1: -	int *fc_modified_inodes;
1: -	int fc_modified_inodes_used;
1: -	int fc_modified_inodes_size;
1: +  int fc_replay_num_tags;
1: +  int fc_replay_expected_off;
1: +  int fc_current_pass;
1: +  int fc_cur_tag;
1: +  int fc_crc;
1: +  struct ext4_fc_alloc_region *fc_regions;
1: +  int fc_regions_size;
1: +  int fc_regions_used;
1: +  int fc_regions_valid;
1: +  int *fc_modified_inodes;
1: +  int fc_modified_inodes_used;
1: +  int fc_modified_inodes_size;
1:  };
1:  
1:  struct ext4_inode_info {
1: -	__le32 i_data[15];
1: -	__u32 i_dtime;
1: -	ext4_fsblk_t i_file_acl;
1: -	ext4_group_t i_block_group;
1: -	ext4_lblk_t i_dir_start_lookup;
1: -	long unsigned int i_flags;
1: -	struct rw_semaphore xattr_sem;
1: -	struct list_head i_orphan;
1: -	struct list_head i_fc_list;
1: -	ext4_lblk_t i_fc_lblk_start;
1: -	ext4_lblk_t i_fc_lblk_len;
1: -	atomic_t i_fc_updates;
1: -	wait_queue_head_t i_fc_wait;
1: -	struct mutex i_fc_lock;
1: -	loff_t i_disksize;
1: -	struct rw_semaphore i_data_sem;
1: -	struct rw_semaphore i_mmap_sem;
1: -	struct inode vfs_inode;
1: -	struct jbd2_inode *jinode;
1: -	spinlock_t i_raw_lock;
1: -	struct timespec64 i_crtime;
1: -	atomic_t i_prealloc_active;
1: -	struct list_head i_prealloc_list;
1: -	spinlock_t i_prealloc_lock;
1: -	struct ext4_es_tree i_es_tree;
1: -	rwlock_t i_es_lock;
1: -	struct list_head i_es_list;
1: -	unsigned int i_es_all_nr;
1: -	unsigned int i_es_shk_nr;
1: -	ext4_lblk_t i_es_shrink_lblk;
1: -	ext4_group_t i_last_alloc_group;
1: -	unsigned int i_reserved_data_blocks;
1: -	struct ext4_pending_tree i_pending_tree;
1: -	__u16 i_extra_isize;
1: -	u16 i_inline_off;
1: -	u16 i_inline_size;
1: -	qsize_t i_reserved_quota;
1: -	spinlock_t i_completed_io_lock;
1: -	struct list_head i_rsv_conversion_list;
1: -	struct work_struct i_rsv_conversion_work;
1: -	atomic_t i_unwritten;
1: -	spinlock_t i_block_reservation_lock;
1: -	tid_t i_sync_tid;
1: -	tid_t i_datasync_tid;
1: -	struct dquot *i_dquot[3];
1: -	__u32 i_csum_seed;
1: -	kprojid_t i_projid;
1: +  __le32 i_data[15];
1: +  __u32 i_dtime;
1: +  ext4_fsblk_t i_file_acl;
1: +  ext4_group_t i_block_group;
1: +  ext4_lblk_t i_dir_start_lookup;
1: +  long unsigned int i_flags;
1: +  struct rw_semaphore xattr_sem;
1: +  struct list_head i_orphan;
1: +  struct list_head i_fc_list;
1: +  ext4_lblk_t i_fc_lblk_start;
1: +  ext4_lblk_t i_fc_lblk_len;
1: +  atomic_t i_fc_updates;
1: +  wait_queue_head_t i_fc_wait;
1: +  struct mutex i_fc_lock;
1: +  loff_t i_disksize;
1: +  struct rw_semaphore i_data_sem;
1: +  struct rw_semaphore i_mmap_sem;
1: +  struct inode vfs_inode;
1: +  struct jbd2_inode *jinode;
1: +  spinlock_t i_raw_lock;
1: +  struct timespec64 i_crtime;
1: +  atomic_t i_prealloc_active;
1: +  struct list_head i_prealloc_list;
1: +  spinlock_t i_prealloc_lock;
1: +  struct ext4_es_tree i_es_tree;
1: +  rwlock_t i_es_lock;
1: +  struct list_head i_es_list;
1: +  unsigned int i_es_all_nr;
1: +  unsigned int i_es_shk_nr;
1: +  ext4_lblk_t i_es_shrink_lblk;
1: +  ext4_group_t i_last_alloc_group;
1: +  unsigned int i_reserved_data_blocks;
1: +  struct ext4_pending_tree i_pending_tree;
1: +  __u16 i_extra_isize;
1: +  u16 i_inline_off;
1: +  u16 i_inline_size;
1: +  qsize_t i_reserved_quota;
1: +  spinlock_t i_completed_io_lock;
1: +  struct list_head i_rsv_conversion_list;
1: +  struct work_struct i_rsv_conversion_work;
1: +  atomic_t i_unwritten;
1: +  spinlock_t i_block_reservation_lock;
1: +  tid_t i_sync_tid;
1: +  tid_t i_datasync_tid;
1: +  struct dquot *i_dquot[3];
1: +  __u32 i_csum_seed;
1: +  kprojid_t i_projid;
1:  };
1:  
1:  struct ext4_super_block {
1: -	__le32 s_inodes_count;
1: -	__le32 s_blocks_count_lo;
1: -	__le32 s_r_blocks_count_lo;
1: -	__le32 s_free_blocks_count_lo;
1: -	__le32 s_free_inodes_count;
1: -	__le32 s_first_data_block;
1: -	__le32 s_log_block_size;
1: -	__le32 s_log_cluster_size;
1: -	__le32 s_blocks_per_group;
1: -	__le32 s_clusters_per_group;
1: -	__le32 s_inodes_per_group;
1: -	__le32 s_mtime;
1: -	__le32 s_wtime;
1: -	__le16 s_mnt_count;
1: -	__le16 s_max_mnt_count;
1: -	__le16 s_magic;
1: -	__le16 s_state;
1: -	__le16 s_errors;
1: -	__le16 s_minor_rev_level;
1: -	__le32 s_lastcheck;
1: -	__le32 s_checkinterval;
1: -	__le32 s_creator_os;
1: -	__le32 s_rev_level;
1: -	__le16 s_def_resuid;
1: -	__le16 s_def_resgid;
1: -	__le32 s_first_ino;
1: -	__le16 s_inode_size;
1: -	__le16 s_block_group_nr;
1: -	__le32 s_feature_compat;
1: -	__le32 s_feature_incompat;
1: -	__le32 s_feature_ro_compat;
1: -	__u8 s_uuid[16];
1: -	char s_volume_name[16];
1: -	char s_last_mounted[64];
1: -	__le32 s_algorithm_usage_bitmap;
1: -	__u8 s_prealloc_blocks;
1: -	__u8 s_prealloc_dir_blocks;
1: -	__le16 s_reserved_gdt_blocks;
1: -	__u8 s_journal_uuid[16];
1: -	__le32 s_journal_inum;
1: -	__le32 s_journal_dev;
1: -	__le32 s_last_orphan;
1: -	__le32 s_hash_seed[4];
1: -	__u8 s_def_hash_version;
1: -	__u8 s_jnl_backup_type;
1: -	__le16 s_desc_size;
1: -	__le32 s_default_mount_opts;
1: -	__le32 s_first_meta_bg;
1: -	__le32 s_mkfs_time;
1: -	__le32 s_jnl_blocks[17];
1: -	__le32 s_blocks_count_hi;
1: -	__le32 s_r_blocks_count_hi;
1: -	__le32 s_free_blocks_count_hi;
1: -	__le16 s_min_extra_isize;
1: -	__le16 s_want_extra_isize;
1: -	__le32 s_flags;
1: -	__le16 s_raid_stride;
1: -	__le16 s_mmp_update_interval;
1: -	__le64 s_mmp_block;
1: -	__le32 s_raid_stripe_width;
1: -	__u8 s_log_groups_per_flex;
1: -	__u8 s_checksum_type;
1: -	__u8 s_encryption_level;
1: -	__u8 s_reserved_pad;
1: -	__le64 s_kbytes_written;
1: -	__le32 s_snapshot_inum;
1: -	__le32 s_snapshot_id;
1: -	__le64 s_snapshot_r_blocks_count;
1: -	__le32 s_snapshot_list;
1: -	__le32 s_error_count;
1: -	__le32 s_first_error_time;
1: -	__le32 s_first_error_ino;
1: -	__le64 s_first_error_block;
1: -	__u8 s_first_error_func[32];
1: -	__le32 s_first_error_line;
1: -	__le32 s_last_error_time;
1: -	__le32 s_last_error_ino;
1: -	__le32 s_last_error_line;
1: -	__le64 s_last_error_block;
1: -	__u8 s_last_error_func[32];
1: -	__u8 s_mount_opts[64];
1: -	__le32 s_usr_quota_inum;
1: -	__le32 s_grp_quota_inum;
1: -	__le32 s_overhead_clusters;
1: -	__le32 s_backup_bgs[2];
1: -	__u8 s_encrypt_algos[4];
1: -	__u8 s_encrypt_pw_salt[16];
1: -	__le32 s_lpf_ino;
1: -	__le32 s_prj_quota_inum;
1: -	__le32 s_checksum_seed;
1: -	__u8 s_wtime_hi;
1: -	__u8 s_mtime_hi;
1: -	__u8 s_mkfs_time_hi;
1: -	__u8 s_lastcheck_hi;
1: -	__u8 s_first_error_time_hi;
1: -	__u8 s_last_error_time_hi;
1: -	__u8 s_first_error_errcode;
1: -	__u8 s_last_error_errcode;
1: -	__le16 s_encoding;
1: -	__le16 s_encoding_flags;
1: -	__le32 s_reserved[95];
1: -	__le32 s_checksum;
1: +  __le32 s_inodes_count;
1: +  __le32 s_blocks_count_lo;
1: +  __le32 s_r_blocks_count_lo;
1: +  __le32 s_free_blocks_count_lo;
1: +  __le32 s_free_inodes_count;
1: +  __le32 s_first_data_block;
1: +  __le32 s_log_block_size;
1: +  __le32 s_log_cluster_size;
1: +  __le32 s_blocks_per_group;
1: +  __le32 s_clusters_per_group;
1: +  __le32 s_inodes_per_group;
1: +  __le32 s_mtime;
1: +  __le32 s_wtime;
1: +  __le16 s_mnt_count;
1: +  __le16 s_max_mnt_count;
1: +  __le16 s_magic;
1: +  __le16 s_state;
1: +  __le16 s_errors;
1: +  __le16 s_minor_rev_level;
1: +  __le32 s_lastcheck;
1: +  __le32 s_checkinterval;
1: +  __le32 s_creator_os;
1: +  __le32 s_rev_level;
1: +  __le16 s_def_resuid;
1: +  __le16 s_def_resgid;
1: +  __le32 s_first_ino;
1: +  __le16 s_inode_size;
1: +  __le16 s_block_group_nr;
1: +  __le32 s_feature_compat;
1: +  __le32 s_feature_incompat;
1: +  __le32 s_feature_ro_compat;
1: +  __u8 s_uuid[16];
1: +  char s_volume_name[16];
1: +  char s_last_mounted[64];
1: +  __le32 s_algorithm_usage_bitmap;
1: +  __u8 s_prealloc_blocks;
1: +  __u8 s_prealloc_dir_blocks;
1: +  __le16 s_reserved_gdt_blocks;
1: +  __u8 s_journal_uuid[16];
1: +  __le32 s_journal_inum;
1: +  __le32 s_journal_dev;
1: +  __le32 s_last_orphan;
1: +  __le32 s_hash_seed[4];
1: +  __u8 s_def_hash_version;
1: +  __u8 s_jnl_backup_type;
1: +  __le16 s_desc_size;
1: +  __le32 s_default_mount_opts;
1: +  __le32 s_first_meta_bg;
1: +  __le32 s_mkfs_time;
1: +  __le32 s_jnl_blocks[17];
1: +  __le32 s_blocks_count_hi;
1: +  __le32 s_r_blocks_count_hi;
1: +  __le32 s_free_blocks_count_hi;
1: +  __le16 s_min_extra_isize;
1: +  __le16 s_want_extra_isize;
1: +  __le32 s_flags;
1: +  __le16 s_raid_stride;
1: +  __le16 s_mmp_update_interval;
1: +  __le64 s_mmp_block;
1: +  __le32 s_raid_stripe_width;
1: +  __u8 s_log_groups_per_flex;
1: +  __u8 s_checksum_type;
1: +  __u8 s_encryption_level;
1: +  __u8 s_reserved_pad;
1: +  __le64 s_kbytes_written;
1: +  __le32 s_snapshot_inum;
1: +  __le32 s_snapshot_id;
1: +  __le64 s_snapshot_r_blocks_count;
1: +  __le32 s_snapshot_list;
1: +  __le32 s_error_count;
1: +  __le32 s_first_error_time;
1: +  __le32 s_first_error_ino;
1: +  __le64 s_first_error_block;
1: +  __u8 s_first_error_func[32];
1: +  __le32 s_first_error_line;
1: +  __le32 s_last_error_time;
1: +  __le32 s_last_error_ino;
1: +  __le32 s_last_error_line;
1: +  __le64 s_last_error_block;
1: +  __u8 s_last_error_func[32];
1: +  __u8 s_mount_opts[64];
1: +  __le32 s_usr_quota_inum;
1: +  __le32 s_grp_quota_inum;
1: +  __le32 s_overhead_clusters;
1: +  __le32 s_backup_bgs[2];
1: +  __u8 s_encrypt_algos[4];
1: +  __u8 s_encrypt_pw_salt[16];
1: +  __le32 s_lpf_ino;
1: +  __le32 s_prj_quota_inum;
1: +  __le32 s_checksum_seed;
1: +  __u8 s_wtime_hi;
1: +  __u8 s_mtime_hi;
1: +  __u8 s_mkfs_time_hi;
1: +  __u8 s_lastcheck_hi;
1: +  __u8 s_first_error_time_hi;
1: +  __u8 s_last_error_time_hi;
1: +  __u8 s_first_error_errcode;
1: +  __u8 s_last_error_errcode;
1: +  __le16 s_encoding;
1: +  __le16 s_encoding_flags;
1: +  __le32 s_reserved[95];
1: +  __le32 s_checksum;
1:  };
1:  
1:  struct mb_cache___2;
1: @@ -46277,458 +46810,459 @@ struct ext4_locality_group;
1:  struct ext4_li_request;
1:  
1:  struct ext4_sb_info {
1: -	long unsigned int s_desc_size;
1: -	long unsigned int s_inodes_per_block;
1: -	long unsigned int s_blocks_per_group;
1: -	long unsigned int s_clusters_per_group;
1: -	long unsigned int s_inodes_per_group;
1: -	long unsigned int s_itb_per_group;
1: -	long unsigned int s_gdb_count;
1: -	long unsigned int s_desc_per_block;
1: -	ext4_group_t s_groups_count;
1: -	ext4_group_t s_blockfile_groups;
1: -	long unsigned int s_overhead;
1: -	unsigned int s_cluster_ratio;
1: -	unsigned int s_cluster_bits;
1: -	loff_t s_bitmap_maxbytes;
1: -	struct buffer_head *s_sbh;
1: -	struct ext4_super_block *s_es;
1: -	struct buffer_head **s_group_desc;
1: -	unsigned int s_mount_opt;
1: -	unsigned int s_mount_opt2;
1: -	long unsigned int s_mount_flags;
1: -	unsigned int s_def_mount_opt;
1: -	ext4_fsblk_t s_sb_block;
1: -	atomic64_t s_resv_clusters;
1: -	kuid_t s_resuid;
1: -	kgid_t s_resgid;
1: -	short unsigned int s_mount_state;
1: -	short unsigned int s_pad;
1: -	int s_addr_per_block_bits;
1: -	int s_desc_per_block_bits;
1: -	int s_inode_size;
1: -	int s_first_ino;
1: -	unsigned int s_inode_readahead_blks;
1: -	unsigned int s_inode_goal;
1: -	u32 s_hash_seed[4];
1: -	int s_def_hash_version;
1: -	int s_hash_unsigned;
1: -	struct percpu_counter s_freeclusters_counter;
1: -	struct percpu_counter s_freeinodes_counter;
1: -	struct percpu_counter s_dirs_counter;
1: -	struct percpu_counter s_dirtyclusters_counter;
1: -	struct blockgroup_lock *s_blockgroup_lock;
1: -	struct proc_dir_entry *s_proc;
1: -	struct kobject s_kobj;
1: -	struct completion s_kobj_unregister;
1: -	struct super_block *s_sb;
1: -	struct journal_s *s_journal;
1: -	struct list_head s_orphan;
1: -	struct mutex s_orphan_lock;
1: -	long unsigned int s_ext4_flags;
1: -	long unsigned int s_commit_interval;
1: -	u32 s_max_batch_time;
1: -	u32 s_min_batch_time;
1: -	struct block_device *s_journal_bdev;
1: -	char *s_qf_names[3];
1: -	int s_jquota_fmt;
1: -	unsigned int s_want_extra_isize;
1: -	struct ext4_system_blocks *s_system_blks;
1: -	struct ext4_group_info ***s_group_info;
1: -	struct inode *s_buddy_cache;
1: -	spinlock_t s_md_lock;
1: -	short unsigned int *s_mb_offsets;
1: -	unsigned int *s_mb_maxs;
1: -	unsigned int s_group_info_size;
1: -	unsigned int s_mb_free_pending;
1: -	struct list_head s_freed_data_list;
1: -	long unsigned int s_stripe;
1: -	unsigned int s_mb_stream_request;
1: -	unsigned int s_mb_max_to_scan;
1: -	unsigned int s_mb_min_to_scan;
1: -	unsigned int s_mb_stats;
1: -	unsigned int s_mb_order2_reqs;
1: -	unsigned int s_mb_group_prealloc;
1: -	unsigned int s_mb_max_inode_prealloc;
1: -	unsigned int s_max_dir_size_kb;
1: -	long unsigned int s_mb_last_group;
1: -	long unsigned int s_mb_last_start;
1: -	unsigned int s_mb_prefetch;
1: -	unsigned int s_mb_prefetch_limit;
1: -	atomic_t s_bal_reqs;
1: -	atomic_t s_bal_success;
1: -	atomic_t s_bal_allocated;
1: -	atomic_t s_bal_ex_scanned;
1: -	atomic_t s_bal_goals;
1: -	atomic_t s_bal_breaks;
1: -	atomic_t s_bal_2orders;
1: -	spinlock_t s_bal_lock;
1: -	long unsigned int s_mb_buddies_generated;
1: -	long long unsigned int s_mb_generation_time;
1: -	atomic_t s_mb_lost_chunks;
1: -	atomic_t s_mb_preallocated;
1: -	atomic_t s_mb_discarded;
1: -	atomic_t s_lock_busy;
1: -	struct ext4_locality_group *s_locality_groups;
1: -	long unsigned int s_sectors_written_start;
1: -	u64 s_kbytes_written;
1: -	unsigned int s_extent_max_zeroout_kb;
1: -	unsigned int s_log_groups_per_flex;
1: -	struct flex_groups **s_flex_groups;
1: -	ext4_group_t s_flex_groups_allocated;
1: -	struct workqueue_struct *rsv_conversion_wq;
1: -	struct timer_list s_err_report;
1: -	struct ext4_li_request *s_li_request;
1: -	unsigned int s_li_wait_mult;
1: -	struct task_struct *s_mmp_tsk;
1: -	atomic_t s_last_trim_minblks;
1: -	struct crypto_shash *s_chksum_driver;
1: -	__u32 s_csum_seed;
1: -	struct shrinker s_es_shrinker;
1: -	struct list_head s_es_list;
1: -	long int s_es_nr_inode;
1: -	struct ext4_es_stats s_es_stats;
1: -	struct mb_cache___2 *s_ea_block_cache;
1: -	struct mb_cache___2 *s_ea_inode_cache;
1: -	spinlock_t s_es_lock;
1: -	struct ratelimit_state s_err_ratelimit_state;
1: -	struct ratelimit_state s_warning_ratelimit_state;
1: -	struct ratelimit_state s_msg_ratelimit_state;
1: -	atomic_t s_warning_count;
1: -	atomic_t s_msg_count;
1: -	struct fscrypt_dummy_policy s_dummy_enc_policy;
1: -	struct percpu_rw_semaphore s_writepages_rwsem;
1: -	struct dax_device *s_daxdev;
1: -	errseq_t s_bdev_wb_err;
1: -	spinlock_t s_bdev_wb_lock;
1: -	atomic_t s_fc_subtid;
1: -	atomic_t s_fc_ineligible_updates;
1: -	struct list_head s_fc_q[2];
1: -	struct list_head s_fc_dentry_q[2];
1: -	unsigned int s_fc_bytes;
1: -	spinlock_t s_fc_lock;
1: -	struct buffer_head *s_fc_bh;
1: -	struct ext4_fc_stats s_fc_stats;
1: -	u64 s_fc_avg_commit_time;
1: -	struct ext4_fc_replay_state s_fc_replay_state;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  long unsigned int s_desc_size;
1: +  long unsigned int s_inodes_per_block;
1: +  long unsigned int s_blocks_per_group;
1: +  long unsigned int s_clusters_per_group;
1: +  long unsigned int s_inodes_per_group;
1: +  long unsigned int s_itb_per_group;
1: +  long unsigned int s_gdb_count;
1: +  long unsigned int s_desc_per_block;
1: +  ext4_group_t s_groups_count;
1: +  ext4_group_t s_blockfile_groups;
1: +  long unsigned int s_overhead;
1: +  unsigned int s_cluster_ratio;
1: +  unsigned int s_cluster_bits;
1: +  loff_t s_bitmap_maxbytes;
1: +  struct buffer_head *s_sbh;
1: +  struct ext4_super_block *s_es;
1: +  struct buffer_head **s_group_desc;
1: +  unsigned int s_mount_opt;
1: +  unsigned int s_mount_opt2;
1: +  long unsigned int s_mount_flags;
1: +  unsigned int s_def_mount_opt;
1: +  ext4_fsblk_t s_sb_block;
1: +  atomic64_t s_resv_clusters;
1: +  kuid_t s_resuid;
1: +  kgid_t s_resgid;
1: +  short unsigned int s_mount_state;
1: +  short unsigned int s_pad;
1: +  int s_addr_per_block_bits;
1: +  int s_desc_per_block_bits;
1: +  int s_inode_size;
1: +  int s_first_ino;
1: +  unsigned int s_inode_readahead_blks;
1: +  unsigned int s_inode_goal;
1: +  u32 s_hash_seed[4];
1: +  int s_def_hash_version;
1: +  int s_hash_unsigned;
1: +  struct percpu_counter s_freeclusters_counter;
1: +  struct percpu_counter s_freeinodes_counter;
1: +  struct percpu_counter s_dirs_counter;
1: +  struct percpu_counter s_dirtyclusters_counter;
1: +  struct blockgroup_lock *s_blockgroup_lock;
1: +  struct proc_dir_entry *s_proc;
1: +  struct kobject s_kobj;
1: +  struct completion s_kobj_unregister;
1: +  struct super_block *s_sb;
1: +  struct journal_s *s_journal;
1: +  struct list_head s_orphan;
1: +  struct mutex s_orphan_lock;
1: +  long unsigned int s_ext4_flags;
1: +  long unsigned int s_commit_interval;
1: +  u32 s_max_batch_time;
1: +  u32 s_min_batch_time;
1: +  struct block_device *s_journal_bdev;
1: +  char *s_qf_names[3];
1: +  int s_jquota_fmt;
1: +  unsigned int s_want_extra_isize;
1: +  struct ext4_system_blocks *s_system_blks;
1: +  struct ext4_group_info ***s_group_info;
1: +  struct inode *s_buddy_cache;
1: +  spinlock_t s_md_lock;
1: +  short unsigned int *s_mb_offsets;
1: +  unsigned int *s_mb_maxs;
1: +  unsigned int s_group_info_size;
1: +  unsigned int s_mb_free_pending;
1: +  struct list_head s_freed_data_list;
1: +  long unsigned int s_stripe;
1: +  unsigned int s_mb_stream_request;
1: +  unsigned int s_mb_max_to_scan;
1: +  unsigned int s_mb_min_to_scan;
1: +  unsigned int s_mb_stats;
1: +  unsigned int s_mb_order2_reqs;
1: +  unsigned int s_mb_group_prealloc;
1: +  unsigned int s_mb_max_inode_prealloc;
1: +  unsigned int s_max_dir_size_kb;
1: +  long unsigned int s_mb_last_group;
1: +  long unsigned int s_mb_last_start;
1: +  unsigned int s_mb_prefetch;
1: +  unsigned int s_mb_prefetch_limit;
1: +  atomic_t s_bal_reqs;
1: +  atomic_t s_bal_success;
1: +  atomic_t s_bal_allocated;
1: +  atomic_t s_bal_ex_scanned;
1: +  atomic_t s_bal_goals;
1: +  atomic_t s_bal_breaks;
1: +  atomic_t s_bal_2orders;
1: +  spinlock_t s_bal_lock;
1: +  long unsigned int s_mb_buddies_generated;
1: +  long long unsigned int s_mb_generation_time;
1: +  atomic_t s_mb_lost_chunks;
1: +  atomic_t s_mb_preallocated;
1: +  atomic_t s_mb_discarded;
1: +  atomic_t s_lock_busy;
1: +  struct ext4_locality_group *s_locality_groups;
1: +  long unsigned int s_sectors_written_start;
1: +  u64 s_kbytes_written;
1: +  unsigned int s_extent_max_zeroout_kb;
1: +  unsigned int s_log_groups_per_flex;
1: +  struct flex_groups **s_flex_groups;
1: +  ext4_group_t s_flex_groups_allocated;
1: +  struct workqueue_struct *rsv_conversion_wq;
1: +  struct timer_list s_err_report;
1: +  struct ext4_li_request *s_li_request;
1: +  unsigned int s_li_wait_mult;
1: +  struct task_struct *s_mmp_tsk;
1: +  atomic_t s_last_trim_minblks;
1: +  struct crypto_shash *s_chksum_driver;
1: +  __u32 s_csum_seed;
1: +  struct shrinker s_es_shrinker;
1: +  struct list_head s_es_list;
1: +  long int s_es_nr_inode;
1: +  struct ext4_es_stats s_es_stats;
1: +  struct mb_cache___2 *s_ea_block_cache;
1: +  struct mb_cache___2 *s_ea_inode_cache;
1: +  spinlock_t s_es_lock;
1: +  struct ratelimit_state s_err_ratelimit_state;
1: +  struct ratelimit_state s_warning_ratelimit_state;
1: +  struct ratelimit_state s_msg_ratelimit_state;
1: +  atomic_t s_warning_count;
1: +  atomic_t s_msg_count;
1: +  struct fscrypt_dummy_policy s_dummy_enc_policy;
1: +  struct percpu_rw_semaphore s_writepages_rwsem;
1: +  struct dax_device *s_daxdev;
1: +  errseq_t s_bdev_wb_err;
1: +  spinlock_t s_bdev_wb_lock;
1: +  atomic_t s_fc_subtid;
1: +  atomic_t s_fc_ineligible_updates;
1: +  struct list_head s_fc_q[2];
1: +  struct list_head s_fc_dentry_q[2];
1: +  unsigned int s_fc_bytes;
1: +  spinlock_t s_fc_lock;
1: +  struct buffer_head *s_fc_bh;
1: +  struct ext4_fc_stats s_fc_stats;
1: +  u64 s_fc_avg_commit_time;
1: +  struct ext4_fc_replay_state s_fc_replay_state;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ext4_group_info {
1: -	long unsigned int bb_state;
1: -	struct rb_root bb_free_root;
1: -	ext4_grpblk_t bb_first_free;
1: -	ext4_grpblk_t bb_free;
1: -	ext4_grpblk_t bb_fragments;
1: -	ext4_grpblk_t bb_largest_free_order;
1: -	struct list_head bb_prealloc_list;
1: -	struct rw_semaphore alloc_sem;
1: -	ext4_grpblk_t bb_counters[0];
1: +  long unsigned int bb_state;
1: +  struct rb_root bb_free_root;
1: +  ext4_grpblk_t bb_first_free;
1: +  ext4_grpblk_t bb_free;
1: +  ext4_grpblk_t bb_fragments;
1: +  ext4_grpblk_t bb_largest_free_order;
1: +  struct list_head bb_prealloc_list;
1: +  struct rw_semaphore alloc_sem;
1: +  ext4_grpblk_t bb_counters[0];
1:  };
1:  
1:  struct ext4_locality_group {
1: -	struct mutex lg_mutex;
1: -	struct list_head lg_prealloc_list[10];
1: -	spinlock_t lg_prealloc_lock;
1: +  struct mutex lg_mutex;
1: +  struct list_head lg_prealloc_list[10];
1: +  spinlock_t lg_prealloc_lock;
1:  };
1:  
1:  enum ext4_li_mode {
1: -	EXT4_LI_MODE_PREFETCH_BBITMAP = 0,
1: -	EXT4_LI_MODE_ITABLE = 1,
1: +  EXT4_LI_MODE_PREFETCH_BBITMAP = 0,
1: +  EXT4_LI_MODE_ITABLE = 1,
1:  };
1:  
1:  struct ext4_li_request {
1: -	struct super_block *lr_super;
1: -	enum ext4_li_mode lr_mode;
1: -	ext4_group_t lr_first_not_zeroed;
1: -	ext4_group_t lr_next_group;
1: -	struct list_head lr_request;
1: -	long unsigned int lr_next_sched;
1: -	long unsigned int lr_timeout;
1: +  struct super_block *lr_super;
1: +  enum ext4_li_mode lr_mode;
1: +  ext4_group_t lr_first_not_zeroed;
1: +  ext4_group_t lr_next_group;
1: +  struct list_head lr_request;
1: +  long unsigned int lr_next_sched;
1: +  long unsigned int lr_timeout;
1:  };
1:  
1:  struct shash_desc {
1: -	struct crypto_shash *tfm;
1: -	void *__ctx[0];
1: +  struct crypto_shash *tfm;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct ext4_map_blocks {
1: -	ext4_fsblk_t m_pblk;
1: -	ext4_lblk_t m_lblk;
1: -	unsigned int m_len;
1: -	unsigned int m_flags;
1: +  ext4_fsblk_t m_pblk;
1: +  ext4_lblk_t m_lblk;
1: +  unsigned int m_len;
1: +  unsigned int m_flags;
1:  };
1:  
1:  struct ext4_system_zone {
1: -	struct rb_node node;
1: -	ext4_fsblk_t start_blk;
1: -	unsigned int count;
1: -	u32 ino;
1: +  struct rb_node node;
1: +  ext4_fsblk_t start_blk;
1: +  unsigned int count;
1: +  u32 ino;
1:  };
1:  
1:  struct fscrypt_str {
1: -	unsigned char *name;
1: -	u32 len;
1: -};
1: -
1: -enum {
1: -	EXT4_INODE_SECRM = 0,
1: -	EXT4_INODE_UNRM = 1,
1: -	EXT4_INODE_COMPR = 2,
1: -	EXT4_INODE_SYNC = 3,
1: -	EXT4_INODE_IMMUTABLE = 4,
1: -	EXT4_INODE_APPEND = 5,
1: -	EXT4_INODE_NODUMP = 6,
1: -	EXT4_INODE_NOATIME = 7,
1: -	EXT4_INODE_DIRTY = 8,
1: -	EXT4_INODE_COMPRBLK = 9,
1: -	EXT4_INODE_NOCOMPR = 10,
1: -	EXT4_INODE_ENCRYPT = 11,
1: -	EXT4_INODE_INDEX = 12,
1: -	EXT4_INODE_IMAGIC = 13,
1: -	EXT4_INODE_JOURNAL_DATA = 14,
1: -	EXT4_INODE_NOTAIL = 15,
1: -	EXT4_INODE_DIRSYNC = 16,
1: -	EXT4_INODE_TOPDIR = 17,
1: -	EXT4_INODE_HUGE_FILE = 18,
1: -	EXT4_INODE_EXTENTS = 19,
1: -	EXT4_INODE_VERITY = 20,
1: -	EXT4_INODE_EA_INODE = 21,
1: -	EXT4_INODE_DAX = 25,
1: -	EXT4_INODE_INLINE_DATA = 28,
1: -	EXT4_INODE_PROJINHERIT = 29,
1: -	EXT4_INODE_CASEFOLD = 30,
1: -	EXT4_INODE_RESERVED = 31,
1: -};
1: -
1: -enum {
1: -	EXT4_FC_REASON_OK = 0,
1: -	EXT4_FC_REASON_INELIGIBLE = 1,
1: -	EXT4_FC_REASON_ALREADY_COMMITTED = 2,
1: -	EXT4_FC_REASON_FC_START_FAILED = 3,
1: -	EXT4_FC_REASON_FC_FAILED = 4,
1: -	EXT4_FC_REASON_XATTR = 0,
1: -	EXT4_FC_REASON_CROSS_RENAME = 1,
1: -	EXT4_FC_REASON_JOURNAL_FLAG_CHANGE = 2,
1: -	EXT4_FC_REASON_NOMEM = 3,
1: -	EXT4_FC_REASON_SWAP_BOOT = 4,
1: -	EXT4_FC_REASON_RESIZE = 5,
1: -	EXT4_FC_REASON_RENAME_DIR = 6,
1: -	EXT4_FC_REASON_FALLOC_RANGE = 7,
1: -	EXT4_FC_REASON_INODE_JOURNAL_DATA = 8,
1: -	EXT4_FC_COMMIT_FAILED = 9,
1: -	EXT4_FC_REASON_MAX = 10,
1: +  unsigned char *name;
1: +  u32 len;
1: +};
1: +
1: +enum {
1: +  EXT4_INODE_SECRM = 0,
1: +  EXT4_INODE_UNRM = 1,
1: +  EXT4_INODE_COMPR = 2,
1: +  EXT4_INODE_SYNC = 3,
1: +  EXT4_INODE_IMMUTABLE = 4,
1: +  EXT4_INODE_APPEND = 5,
1: +  EXT4_INODE_NODUMP = 6,
1: +  EXT4_INODE_NOATIME = 7,
1: +  EXT4_INODE_DIRTY = 8,
1: +  EXT4_INODE_COMPRBLK = 9,
1: +  EXT4_INODE_NOCOMPR = 10,
1: +  EXT4_INODE_ENCRYPT = 11,
1: +  EXT4_INODE_INDEX = 12,
1: +  EXT4_INODE_IMAGIC = 13,
1: +  EXT4_INODE_JOURNAL_DATA = 14,
1: +  EXT4_INODE_NOTAIL = 15,
1: +  EXT4_INODE_DIRSYNC = 16,
1: +  EXT4_INODE_TOPDIR = 17,
1: +  EXT4_INODE_HUGE_FILE = 18,
1: +  EXT4_INODE_EXTENTS = 19,
1: +  EXT4_INODE_VERITY = 20,
1: +  EXT4_INODE_EA_INODE = 21,
1: +  EXT4_INODE_DAX = 25,
1: +  EXT4_INODE_INLINE_DATA = 28,
1: +  EXT4_INODE_PROJINHERIT = 29,
1: +  EXT4_INODE_CASEFOLD = 30,
1: +  EXT4_INODE_RESERVED = 31,
1: +};
1: +
1: +enum {
1: +  EXT4_FC_REASON_OK = 0,
1: +  EXT4_FC_REASON_INELIGIBLE = 1,
1: +  EXT4_FC_REASON_ALREADY_COMMITTED = 2,
1: +  EXT4_FC_REASON_FC_START_FAILED = 3,
1: +  EXT4_FC_REASON_FC_FAILED = 4,
1: +  EXT4_FC_REASON_XATTR = 0,
1: +  EXT4_FC_REASON_CROSS_RENAME = 1,
1: +  EXT4_FC_REASON_JOURNAL_FLAG_CHANGE = 2,
1: +  EXT4_FC_REASON_NOMEM = 3,
1: +  EXT4_FC_REASON_SWAP_BOOT = 4,
1: +  EXT4_FC_REASON_RESIZE = 5,
1: +  EXT4_FC_REASON_RENAME_DIR = 6,
1: +  EXT4_FC_REASON_FALLOC_RANGE = 7,
1: +  EXT4_FC_REASON_INODE_JOURNAL_DATA = 8,
1: +  EXT4_FC_COMMIT_FAILED = 9,
1: +  EXT4_FC_REASON_MAX = 10,
1:  };
1:  
1:  struct ext4_dir_entry_2 {
1: -	__le32 inode;
1: -	__le16 rec_len;
1: -	__u8 name_len;
1: -	__u8 file_type;
1: -	char name[255];
1: +  __le32 inode;
1: +  __le16 rec_len;
1: +  __u8 name_len;
1: +  __u8 file_type;
1: +  char name[255];
1:  };
1:  
1:  struct fname;
1:  
1:  struct dir_private_info {
1: -	struct rb_root root;
1: -	struct rb_node *curr_node;
1: -	struct fname *extra_fname;
1: -	loff_t last_pos;
1: -	__u32 curr_hash;
1: -	__u32 curr_minor_hash;
1: -	__u32 next_hash;
1: +  struct rb_root root;
1: +  struct rb_node *curr_node;
1: +  struct fname *extra_fname;
1: +  loff_t last_pos;
1: +  __u32 curr_hash;
1: +  __u32 curr_minor_hash;
1: +  __u32 next_hash;
1:  };
1:  
1:  struct fname {
1: -	__u32 hash;
1: -	__u32 minor_hash;
1: -	struct rb_node rb_hash;
1: -	struct fname *next;
1: -	__u32 inode;
1: -	__u8 name_len;
1: -	__u8 file_type;
1: -	char name[0];
1: +  __u32 hash;
1: +  __u32 minor_hash;
1: +  struct rb_node rb_hash;
1: +  struct fname *next;
1: +  __u32 inode;
1: +  __u8 name_len;
1: +  __u8 file_type;
1: +  char name[0];
1:  };
1:  
1:  enum SHIFT_DIRECTION {
1: -	SHIFT_LEFT = 0,
1: -	SHIFT_RIGHT = 1,
1: +  SHIFT_LEFT = 0,
1: +  SHIFT_RIGHT = 1,
1:  };
1:  
1:  struct ext4_io_end_vec {
1: -	struct list_head list;
1: -	loff_t offset;
1: -	ssize_t size;
1: +  struct list_head list;
1: +  loff_t offset;
1: +  ssize_t size;
1:  };
1:  
1:  struct ext4_io_end {
1: -	struct list_head list;
1: -	handle_t *handle;
1: -	struct inode *inode;
1: -	struct bio *bio;
1: -	unsigned int flag;
1: -	atomic_t count;
1: -	struct list_head list_vec;
1: +  struct list_head list;
1: +  handle_t *handle;
1: +  struct inode *inode;
1: +  struct bio *bio;
1: +  unsigned int flag;
1: +  atomic_t count;
1: +  struct list_head list_vec;
1:  };
1:  
1:  typedef struct ext4_io_end ext4_io_end_t;
1:  
1:  enum {
1: -	ES_WRITTEN_B = 0,
1: -	ES_UNWRITTEN_B = 1,
1: -	ES_DELAYED_B = 2,
1: -	ES_HOLE_B = 3,
1: -	ES_REFERENCED_B = 4,
1: -	ES_FLAGS = 5,
1: +  ES_WRITTEN_B = 0,
1: +  ES_UNWRITTEN_B = 1,
1: +  ES_DELAYED_B = 2,
1: +  ES_HOLE_B = 3,
1: +  ES_REFERENCED_B = 4,
1: +  ES_FLAGS = 5,
1:  };
1:  
1:  enum {
1: -	EXT4_STATE_JDATA = 0,
1: -	EXT4_STATE_NEW = 1,
1: -	EXT4_STATE_XATTR = 2,
1: -	EXT4_STATE_NO_EXPAND = 3,
1: -	EXT4_STATE_DA_ALLOC_CLOSE = 4,
1: -	EXT4_STATE_EXT_MIGRATE = 5,
1: -	EXT4_STATE_NEWENTRY = 6,
1: -	EXT4_STATE_MAY_INLINE_DATA = 7,
1: -	EXT4_STATE_EXT_PRECACHED = 8,
1: -	EXT4_STATE_LUSTRE_EA_INODE = 9,
1: -	EXT4_STATE_VERITY_IN_PROGRESS = 10,
1: -	EXT4_STATE_FC_COMMITTING = 11,
1: +  EXT4_STATE_JDATA = 0,
1: +  EXT4_STATE_NEW = 1,
1: +  EXT4_STATE_XATTR = 2,
1: +  EXT4_STATE_NO_EXPAND = 3,
1: +  EXT4_STATE_DA_ALLOC_CLOSE = 4,
1: +  EXT4_STATE_EXT_MIGRATE = 5,
1: +  EXT4_STATE_NEWENTRY = 6,
1: +  EXT4_STATE_MAY_INLINE_DATA = 7,
1: +  EXT4_STATE_EXT_PRECACHED = 8,
1: +  EXT4_STATE_LUSTRE_EA_INODE = 9,
1: +  EXT4_STATE_VERITY_IN_PROGRESS = 10,
1: +  EXT4_STATE_FC_COMMITTING = 11,
1:  };
1:  
1:  struct ext4_iloc {
1: -	struct buffer_head *bh;
1: -	long unsigned int offset;
1: -	ext4_group_t block_group;
1: +  struct buffer_head *bh;
1: +  long unsigned int offset;
1: +  ext4_group_t block_group;
1:  };
1:  
1:  struct ext4_extent_tail {
1: -	__le32 et_checksum;
1: +  __le32 et_checksum;
1:  };
1:  
1:  struct ext4_extent {
1: -	__le32 ee_block;
1: -	__le16 ee_len;
1: -	__le16 ee_start_hi;
1: -	__le32 ee_start_lo;
1: +  __le32 ee_block;
1: +  __le16 ee_len;
1: +  __le16 ee_start_hi;
1: +  __le32 ee_start_lo;
1:  };
1:  
1:  struct ext4_extent_idx {
1: -	__le32 ei_block;
1: -	__le32 ei_leaf_lo;
1: -	__le16 ei_leaf_hi;
1: -	__u16 ei_unused;
1: +  __le32 ei_block;
1: +  __le32 ei_leaf_lo;
1: +  __le16 ei_leaf_hi;
1: +  __u16 ei_unused;
1:  };
1:  
1:  struct ext4_extent_header {
1: -	__le16 eh_magic;
1: -	__le16 eh_entries;
1: -	__le16 eh_max;
1: -	__le16 eh_depth;
1: -	__le32 eh_generation;
1: +  __le16 eh_magic;
1: +  __le16 eh_entries;
1: +  __le16 eh_max;
1: +  __le16 eh_depth;
1: +  __le32 eh_generation;
1:  };
1:  
1:  struct ext4_ext_path {
1: -	ext4_fsblk_t p_block;
1: -	__u16 p_depth;
1: -	__u16 p_maxdepth;
1: -	struct ext4_extent *p_ext;
1: -	struct ext4_extent_idx *p_idx;
1: -	struct ext4_extent_header *p_hdr;
1: -	struct buffer_head *p_bh;
1: +  ext4_fsblk_t p_block;
1: +  __u16 p_depth;
1: +  __u16 p_maxdepth;
1: +  struct ext4_extent *p_ext;
1: +  struct ext4_extent_idx *p_idx;
1: +  struct ext4_extent_header *p_hdr;
1: +  struct buffer_head *p_bh;
1:  };
1:  
1:  struct partial_cluster {
1: -	ext4_fsblk_t pclu;
1: -	ext4_lblk_t lblk;
1: -	enum {
1: -		initial = 0,
1: -		tofree = 1,
1: -		nofree = 2,
1: -	} state;
1: +  ext4_fsblk_t pclu;
1: +  ext4_lblk_t lblk;
1: +  enum {
1: +    initial = 0,
1: +    tofree = 1,
1: +    nofree = 2,
1: +  } state;
1:  };
1:  
1:  struct pending_reservation {
1: -	struct rb_node rb_node;
1: -	ext4_lblk_t lclu;
1: +  struct rb_node rb_node;
1: +  ext4_lblk_t lclu;
1:  };
1:  
1:  struct rsvd_count {
1: -	int ndelonly;
1: -	bool first_do_lblk_found;
1: -	ext4_lblk_t first_do_lblk;
1: -	ext4_lblk_t last_do_lblk;
1: -	struct extent_status *left_es;
1: -	bool partial;
1: -	ext4_lblk_t lclu;
1: +  int ndelonly;
1: +  bool first_do_lblk_found;
1: +  ext4_lblk_t first_do_lblk;
1: +  ext4_lblk_t last_do_lblk;
1: +  struct extent_status *left_es;
1: +  bool partial;
1: +  ext4_lblk_t lclu;
1:  };
1:  
1:  enum {
1: -	EXT4_MF_MNTDIR_SAMPLED = 0,
1: -	EXT4_MF_FS_ABORTED = 1,
1: -	EXT4_MF_FC_INELIGIBLE = 2,
1: -	EXT4_MF_FC_COMMITTING = 3,
1: +  EXT4_MF_MNTDIR_SAMPLED = 0,
1: +  EXT4_MF_FS_ABORTED = 1,
1: +  EXT4_MF_FC_INELIGIBLE = 2,
1: +  EXT4_MF_FC_COMMITTING = 3,
1:  };
1:  
1:  struct fsverity_info;
1:  
1:  struct fsmap {
1: -	__u32 fmr_device;
1: -	__u32 fmr_flags;
1: -	__u64 fmr_physical;
1: -	__u64 fmr_owner;
1: -	__u64 fmr_offset;
1: -	__u64 fmr_length;
1: -	__u64 fmr_reserved[3];
1: +  __u32 fmr_device;
1: +  __u32 fmr_flags;
1: +  __u64 fmr_physical;
1: +  __u64 fmr_owner;
1: +  __u64 fmr_offset;
1: +  __u64 fmr_length;
1: +  __u64 fmr_reserved[3];
1:  };
1:  
1:  struct ext4_fsmap {
1: -	struct list_head fmr_list;
1: -	dev_t fmr_device;
1: -	uint32_t fmr_flags;
1: -	uint64_t fmr_physical;
1: -	uint64_t fmr_owner;
1: -	uint64_t fmr_length;
1: +  struct list_head fmr_list;
1: +  dev_t fmr_device;
1: +  uint32_t fmr_flags;
1: +  uint64_t fmr_physical;
1: +  uint64_t fmr_owner;
1: +  uint64_t fmr_length;
1:  };
1:  
1:  struct ext4_fsmap_head {
1: -	uint32_t fmh_iflags;
1: -	uint32_t fmh_oflags;
1: -	unsigned int fmh_count;
1: -	unsigned int fmh_entries;
1: -	struct ext4_fsmap fmh_keys[2];
1: +  uint32_t fmh_iflags;
1: +  uint32_t fmh_oflags;
1: +  unsigned int fmh_count;
1: +  unsigned int fmh_entries;
1: +  struct ext4_fsmap fmh_keys[2];
1:  };
1:  
1:  typedef int (*ext4_fsmap_format_t)(struct ext4_fsmap *, void *);
1:  
1:  struct ext4_getfsmap_info {
1: -	struct ext4_fsmap_head *gfi_head;
1: -	ext4_fsmap_format_t gfi_formatter;
1: -	void *gfi_format_arg;
1: -	ext4_fsblk_t gfi_next_fsblk;
1: -	u32 gfi_dev;
1: -	ext4_group_t gfi_agno;
1: -	struct ext4_fsmap gfi_low;
1: -	struct ext4_fsmap gfi_high;
1: -	struct ext4_fsmap gfi_lastfree;
1: -	struct list_head gfi_meta_list;
1: -	bool gfi_last;
1: +  struct ext4_fsmap_head *gfi_head;
1: +  ext4_fsmap_format_t gfi_formatter;
1: +  void *gfi_format_arg;
1: +  ext4_fsblk_t gfi_next_fsblk;
1: +  u32 gfi_dev;
1: +  ext4_group_t gfi_agno;
1: +  struct ext4_fsmap gfi_low;
1: +  struct ext4_fsmap gfi_high;
1: +  struct ext4_fsmap gfi_lastfree;
1: +  struct list_head gfi_meta_list;
1: +  bool gfi_last;
1:  };
1:  
1:  struct ext4_getfsmap_dev {
1: -	int (*gfd_fn)(struct super_block *, struct ext4_fsmap *, struct ext4_getfsmap_info *);
1: -	u32 gfd_dev;
1: +  int (*gfd_fn)(struct super_block *, struct ext4_fsmap *,
1: +                struct ext4_getfsmap_info *);
1: +  u32 gfd_dev;
1:  };
1:  
1:  struct dx_hash_info {
1: -	u32 hash;
1: -	u32 minor_hash;
1: -	int hash_version;
1: -	u32 *seed;
1: +  u32 hash;
1: +  u32 minor_hash;
1: +  int hash_version;
1: +  u32 *seed;
1:  };
1:  
1:  typedef unsigned int __kernel_mode_t;
1: @@ -46736,117 +47270,117 @@ typedef unsigned int __kernel_mode_t;
1:  typedef __kernel_mode_t mode_t;
1:  
1:  struct ext4_inode {
1: -	__le16 i_mode;
1: -	__le16 i_uid;
1: -	__le32 i_size_lo;
1: -	__le32 i_atime;
1: -	__le32 i_ctime;
1: -	__le32 i_mtime;
1: -	__le32 i_dtime;
1: -	__le16 i_gid;
1: -	__le16 i_links_count;
1: -	__le32 i_blocks_lo;
1: -	__le32 i_flags;
1: -	union {
1: -		struct {
1: -			__le32 l_i_version;
1: -		} linux1;
1: -		struct {
1: -			__u32 h_i_translator;
1: -		} hurd1;
1: -		struct {
1: -			__u32 m_i_reserved1;
1: -		} masix1;
1: -	} osd1;
1: -	__le32 i_block[15];
1: -	__le32 i_generation;
1: -	__le32 i_file_acl_lo;
1: -	__le32 i_size_high;
1: -	__le32 i_obso_faddr;
1: -	union {
1: -		struct {
1: -			__le16 l_i_blocks_high;
1: -			__le16 l_i_file_acl_high;
1: -			__le16 l_i_uid_high;
1: -			__le16 l_i_gid_high;
1: -			__le16 l_i_checksum_lo;
1: -			__le16 l_i_reserved;
1: -		} linux2;
1: -		struct {
1: -			__le16 h_i_reserved1;
1: -			__u16 h_i_mode_high;
1: -			__u16 h_i_uid_high;
1: -			__u16 h_i_gid_high;
1: -			__u32 h_i_author;
1: -		} hurd2;
1: -		struct {
1: -			__le16 h_i_reserved1;
1: -			__le16 m_i_file_acl_high;
1: -			__u32 m_i_reserved2[2];
1: -		} masix2;
1: -	} osd2;
1: -	__le16 i_extra_isize;
1: -	__le16 i_checksum_hi;
1: -	__le32 i_ctime_extra;
1: -	__le32 i_mtime_extra;
1: -	__le32 i_atime_extra;
1: -	__le32 i_crtime;
1: -	__le32 i_crtime_extra;
1: -	__le32 i_version_hi;
1: -	__le32 i_projid;
1: +  __le16 i_mode;
1: +  __le16 i_uid;
1: +  __le32 i_size_lo;
1: +  __le32 i_atime;
1: +  __le32 i_ctime;
1: +  __le32 i_mtime;
1: +  __le32 i_dtime;
1: +  __le16 i_gid;
1: +  __le16 i_links_count;
1: +  __le32 i_blocks_lo;
1: +  __le32 i_flags;
1: +  union {
1: +    struct {
1: +      __le32 l_i_version;
1: +    } linux1;
1: +    struct {
1: +      __u32 h_i_translator;
1: +    } hurd1;
1: +    struct {
1: +      __u32 m_i_reserved1;
1: +    } masix1;
1: +  } osd1;
1: +  __le32 i_block[15];
1: +  __le32 i_generation;
1: +  __le32 i_file_acl_lo;
1: +  __le32 i_size_high;
1: +  __le32 i_obso_faddr;
1: +  union {
1: +    struct {
1: +      __le16 l_i_blocks_high;
1: +      __le16 l_i_file_acl_high;
1: +      __le16 l_i_uid_high;
1: +      __le16 l_i_gid_high;
1: +      __le16 l_i_checksum_lo;
1: +      __le16 l_i_reserved;
1: +    } linux2;
1: +    struct {
1: +      __le16 h_i_reserved1;
1: +      __u16 h_i_mode_high;
1: +      __u16 h_i_uid_high;
1: +      __u16 h_i_gid_high;
1: +      __u32 h_i_author;
1: +    } hurd2;
1: +    struct {
1: +      __le16 h_i_reserved1;
1: +      __le16 m_i_file_acl_high;
1: +      __u32 m_i_reserved2[2];
1: +    } masix2;
1: +  } osd2;
1: +  __le16 i_extra_isize;
1: +  __le16 i_checksum_hi;
1: +  __le32 i_ctime_extra;
1: +  __le32 i_mtime_extra;
1: +  __le32 i_atime_extra;
1: +  __le32 i_crtime;
1: +  __le32 i_crtime_extra;
1: +  __le32 i_version_hi;
1: +  __le32 i_projid;
1:  };
1:  
1:  struct orlov_stats {
1: -	__u64 free_clusters;
1: -	__u32 free_inodes;
1: -	__u32 used_dirs;
1: +  __u64 free_clusters;
1: +  __u32 free_inodes;
1: +  __u32 used_dirs;
1:  };
1:  
1:  typedef struct {
1: -	__le32 *p;
1: -	__le32 key;
1: -	struct buffer_head *bh;
1: +  __le32 *p;
1: +  __le32 key;
1: +  struct buffer_head *bh;
1:  } Indirect;
1:  
1:  struct ext4_filename {
1: -	const struct qstr *usr_fname;
1: -	struct fscrypt_str disk_name;
1: -	struct dx_hash_info hinfo;
1: +  const struct qstr *usr_fname;
1: +  struct fscrypt_str disk_name;
1: +  struct dx_hash_info hinfo;
1:  };
1:  
1:  struct ext4_xattr_ibody_header {
1: -	__le32 h_magic;
1: +  __le32 h_magic;
1:  };
1:  
1:  struct ext4_xattr_entry {
1: -	__u8 e_name_len;
1: -	__u8 e_name_index;
1: -	__le16 e_value_offs;
1: -	__le32 e_value_inum;
1: -	__le32 e_value_size;
1: -	__le32 e_hash;
1: -	char e_name[0];
1: +  __u8 e_name_len;
1: +  __u8 e_name_index;
1: +  __le16 e_value_offs;
1: +  __le32 e_value_inum;
1: +  __le32 e_value_size;
1: +  __le32 e_hash;
1: +  char e_name[0];
1:  };
1:  
1:  struct ext4_xattr_info {
1: -	const char *name;
1: -	const void *value;
1: -	size_t value_len;
1: -	int name_index;
1: -	int in_inode;
1: +  const char *name;
1: +  const void *value;
1: +  size_t value_len;
1: +  int name_index;
1: +  int in_inode;
1:  };
1:  
1:  struct ext4_xattr_search {
1: -	struct ext4_xattr_entry *first;
1: -	void *base;
1: -	void *end;
1: -	struct ext4_xattr_entry *here;
1: -	int not_found;
1: +  struct ext4_xattr_entry *first;
1: +  void *base;
1: +  void *end;
1: +  struct ext4_xattr_entry *here;
1: +  int not_found;
1:  };
1:  
1:  struct ext4_xattr_ibody_find {
1: -	struct ext4_xattr_search s;
1: -	struct ext4_iloc iloc;
1: +  struct ext4_xattr_search s;
1: +  struct ext4_iloc iloc;
1:  };
1:  
1:  typedef short unsigned int __kernel_uid16_t;
1: @@ -46858,1305 +47392,1307 @@ typedef __kernel_uid16_t uid16_t;
1:  typedef __kernel_gid16_t gid16_t;
1:  
1:  struct ext4_io_submit {
1: -	struct writeback_control *io_wbc;
1: -	struct bio *io_bio;
1: -	ext4_io_end_t *io_end;
1: -	sector_t io_next_block;
1: +  struct writeback_control *io_wbc;
1: +  struct bio *io_bio;
1: +  ext4_io_end_t *io_end;
1: +  sector_t io_next_block;
1:  };
1:  
1:  typedef enum {
1: -	EXT4_IGET_NORMAL = 0,
1: -	EXT4_IGET_SPECIAL = 1,
1: -	EXT4_IGET_HANDLE = 2,
1: +  EXT4_IGET_NORMAL = 0,
1: +  EXT4_IGET_SPECIAL = 1,
1: +  EXT4_IGET_HANDLE = 2,
1:  } ext4_iget_flags;
1:  
1:  struct ext4_xattr_inode_array {
1: -	unsigned int count;
1: -	struct inode *inodes[0];
1: +  unsigned int count;
1: +  struct inode *inodes[0];
1:  };
1:  
1:  struct mpage_da_data {
1: -	struct inode *inode;
1: -	struct writeback_control *wbc;
1: -	long unsigned int first_page;
1: -	long unsigned int next_page;
1: -	long unsigned int last_page;
1: -	struct ext4_map_blocks map;
1: -	struct ext4_io_submit io_submit;
1: -	unsigned int do_map: 1;
1: -	unsigned int scanned_until_end: 1;
1: +  struct inode *inode;
1: +  struct writeback_control *wbc;
1: +  long unsigned int first_page;
1: +  long unsigned int next_page;
1: +  long unsigned int last_page;
1: +  struct ext4_map_blocks map;
1: +  struct ext4_io_submit io_submit;
1: +  unsigned int do_map : 1;
1: +  unsigned int scanned_until_end : 1;
1:  };
1:  
1:  struct fscrypt_info;
1:  
1:  struct fstrim_range {
1: -	__u64 start;
1: -	__u64 len;
1: -	__u64 minlen;
1: +  __u64 start;
1: +  __u64 len;
1: +  __u64 minlen;
1:  };
1:  
1:  struct ext4_new_group_input {
1: -	__u32 group;
1: -	__u64 block_bitmap;
1: -	__u64 inode_bitmap;
1: -	__u64 inode_table;
1: -	__u32 blocks_count;
1: -	__u16 reserved_blocks;
1: -	__u16 unused;
1: +  __u32 group;
1: +  __u64 block_bitmap;
1: +  __u64 inode_bitmap;
1: +  __u64 inode_table;
1: +  __u32 blocks_count;
1: +  __u16 reserved_blocks;
1: +  __u16 unused;
1:  };
1:  
1:  struct compat_ext4_new_group_input {
1: -	u32 group;
1: -	compat_u64 block_bitmap;
1: -	compat_u64 inode_bitmap;
1: -	compat_u64 inode_table;
1: -	u32 blocks_count;
1: -	u16 reserved_blocks;
1: -	u16 unused;
1: +  u32 group;
1: +  compat_u64 block_bitmap;
1: +  compat_u64 inode_bitmap;
1: +  compat_u64 inode_table;
1: +  u32 blocks_count;
1: +  u16 reserved_blocks;
1: +  u16 unused;
1:  } __attribute__((packed));
1:  
1:  struct ext4_new_group_data {
1: -	__u32 group;
1: -	__u64 block_bitmap;
1: -	__u64 inode_bitmap;
1: -	__u64 inode_table;
1: -	__u32 blocks_count;
1: -	__u16 reserved_blocks;
1: -	__u16 mdata_blocks;
1: -	__u32 free_clusters_count;
1: +  __u32 group;
1: +  __u64 block_bitmap;
1: +  __u64 inode_bitmap;
1: +  __u64 inode_table;
1: +  __u32 blocks_count;
1: +  __u16 reserved_blocks;
1: +  __u16 mdata_blocks;
1: +  __u32 free_clusters_count;
1:  };
1:  
1:  struct move_extent {
1: -	__u32 reserved;
1: -	__u32 donor_fd;
1: -	__u64 orig_start;
1: -	__u64 donor_start;
1: -	__u64 len;
1: -	__u64 moved_len;
1: +  __u32 reserved;
1: +  __u32 donor_fd;
1: +  __u64 orig_start;
1: +  __u64 donor_start;
1: +  __u64 len;
1: +  __u64 moved_len;
1:  };
1:  
1:  struct fsmap_head {
1: -	__u32 fmh_iflags;
1: -	__u32 fmh_oflags;
1: -	__u32 fmh_count;
1: -	__u32 fmh_entries;
1: -	__u64 fmh_reserved[6];
1: -	struct fsmap fmh_keys[2];
1: -	struct fsmap fmh_recs[0];
1: +  __u32 fmh_iflags;
1: +  __u32 fmh_oflags;
1: +  __u32 fmh_count;
1: +  __u32 fmh_entries;
1: +  __u64 fmh_reserved[6];
1: +  struct fsmap fmh_keys[2];
1: +  struct fsmap fmh_recs[0];
1:  };
1:  
1:  struct getfsmap_info {
1: -	struct super_block *gi_sb;
1: -	struct fsmap_head *gi_data;
1: -	unsigned int gi_idx;
1: -	__u32 gi_last_flags;
1: +  struct super_block *gi_sb;
1: +  struct fsmap_head *gi_data;
1: +  unsigned int gi_idx;
1: +  __u32 gi_last_flags;
1:  };
1:  
1:  struct ext4_free_data {
1: -	struct list_head efd_list;
1: -	struct rb_node efd_node;
1: -	ext4_group_t efd_group;
1: -	ext4_grpblk_t efd_start_cluster;
1: -	ext4_grpblk_t efd_count;
1: -	tid_t efd_tid;
1: +  struct list_head efd_list;
1: +  struct rb_node efd_node;
1: +  ext4_group_t efd_group;
1: +  ext4_grpblk_t efd_start_cluster;
1: +  ext4_grpblk_t efd_count;
1: +  tid_t efd_tid;
1:  };
1:  
1:  struct ext4_prealloc_space {
1: -	struct list_head pa_inode_list;
1: -	struct list_head pa_group_list;
1: -	union {
1: -		struct list_head pa_tmp_list;
1: -		struct callback_head pa_rcu;
1: -	} u;
1: -	spinlock_t pa_lock;
1: -	atomic_t pa_count;
1: -	unsigned int pa_deleted;
1: -	ext4_fsblk_t pa_pstart;
1: -	ext4_lblk_t pa_lstart;
1: -	ext4_grpblk_t pa_len;
1: -	ext4_grpblk_t pa_free;
1: -	short unsigned int pa_type;
1: -	spinlock_t *pa_obj_lock;
1: -	struct inode *pa_inode;
1: +  struct list_head pa_inode_list;
1: +  struct list_head pa_group_list;
1: +  union {
1: +    struct list_head pa_tmp_list;
1: +    struct callback_head pa_rcu;
1: +  } u;
1: +  spinlock_t pa_lock;
1: +  atomic_t pa_count;
1: +  unsigned int pa_deleted;
1: +  ext4_fsblk_t pa_pstart;
1: +  ext4_lblk_t pa_lstart;
1: +  ext4_grpblk_t pa_len;
1: +  ext4_grpblk_t pa_free;
1: +  short unsigned int pa_type;
1: +  spinlock_t *pa_obj_lock;
1: +  struct inode *pa_inode;
1:  };
1:  
1:  enum {
1: -	MB_INODE_PA = 0,
1: -	MB_GROUP_PA = 1,
1: +  MB_INODE_PA = 0,
1: +  MB_GROUP_PA = 1,
1:  };
1:  
1:  struct ext4_free_extent {
1: -	ext4_lblk_t fe_logical;
1: -	ext4_grpblk_t fe_start;
1: -	ext4_group_t fe_group;
1: -	ext4_grpblk_t fe_len;
1: +  ext4_lblk_t fe_logical;
1: +  ext4_grpblk_t fe_start;
1: +  ext4_group_t fe_group;
1: +  ext4_grpblk_t fe_len;
1:  };
1:  
1:  struct ext4_allocation_context {
1: -	struct inode *ac_inode;
1: -	struct super_block *ac_sb;
1: -	struct ext4_free_extent ac_o_ex;
1: -	struct ext4_free_extent ac_g_ex;
1: -	struct ext4_free_extent ac_b_ex;
1: -	struct ext4_free_extent ac_f_ex;
1: -	__u16 ac_groups_scanned;
1: -	__u16 ac_found;
1: -	__u16 ac_tail;
1: -	__u16 ac_buddy;
1: -	__u16 ac_flags;
1: -	__u8 ac_status;
1: -	__u8 ac_criteria;
1: -	__u8 ac_2order;
1: -	__u8 ac_op;
1: -	struct page *ac_bitmap_page;
1: -	struct page *ac_buddy_page;
1: -	struct ext4_prealloc_space *ac_pa;
1: -	struct ext4_locality_group *ac_lg;
1: +  struct inode *ac_inode;
1: +  struct super_block *ac_sb;
1: +  struct ext4_free_extent ac_o_ex;
1: +  struct ext4_free_extent ac_g_ex;
1: +  struct ext4_free_extent ac_b_ex;
1: +  struct ext4_free_extent ac_f_ex;
1: +  __u16 ac_groups_scanned;
1: +  __u16 ac_found;
1: +  __u16 ac_tail;
1: +  __u16 ac_buddy;
1: +  __u16 ac_flags;
1: +  __u8 ac_status;
1: +  __u8 ac_criteria;
1: +  __u8 ac_2order;
1: +  __u8 ac_op;
1: +  struct page *ac_bitmap_page;
1: +  struct page *ac_buddy_page;
1: +  struct ext4_prealloc_space *ac_pa;
1: +  struct ext4_locality_group *ac_lg;
1:  };
1:  
1:  struct ext4_buddy {
1: -	struct page *bd_buddy_page;
1: -	void *bd_buddy;
1: -	struct page *bd_bitmap_page;
1: -	void *bd_bitmap;
1: -	struct ext4_group_info *bd_info;
1: -	struct super_block *bd_sb;
1: -	__u16 bd_blkbits;
1: -	ext4_group_t bd_group;
1: +  struct page *bd_buddy_page;
1: +  void *bd_buddy;
1: +  struct page *bd_bitmap_page;
1: +  void *bd_bitmap;
1: +  struct ext4_group_info *bd_info;
1: +  struct super_block *bd_sb;
1: +  __u16 bd_blkbits;
1: +  ext4_group_t bd_group;
1:  };
1:  
1: -typedef int (*ext4_mballoc_query_range_fn)(struct super_block *, ext4_group_t, ext4_grpblk_t, ext4_grpblk_t, void *);
1: +typedef int (*ext4_mballoc_query_range_fn)(struct super_block *, ext4_group_t,
1: +                                           ext4_grpblk_t, ext4_grpblk_t,
1: +                                           void *);
1:  
1:  struct sg {
1: -	struct ext4_group_info info;
1: -	ext4_grpblk_t counters[18];
1: +  struct ext4_group_info info;
1: +  ext4_grpblk_t counters[18];
1:  };
1:  
1:  struct migrate_struct {
1: -	ext4_lblk_t first_block;
1: -	ext4_lblk_t last_block;
1: -	ext4_lblk_t curr_block;
1: -	ext4_fsblk_t first_pblock;
1: -	ext4_fsblk_t last_pblock;
1: +  ext4_lblk_t first_block;
1: +  ext4_lblk_t last_block;
1: +  ext4_lblk_t curr_block;
1: +  ext4_fsblk_t first_pblock;
1: +  ext4_fsblk_t last_pblock;
1:  };
1:  
1:  struct mmp_struct {
1: -	__le32 mmp_magic;
1: -	__le32 mmp_seq;
1: -	__le64 mmp_time;
1: -	char mmp_nodename[64];
1: -	char mmp_bdevname[32];
1: -	__le16 mmp_check_interval;
1: -	__le16 mmp_pad1;
1: -	__le32 mmp_pad2[226];
1: -	__le32 mmp_checksum;
1: +  __le32 mmp_magic;
1: +  __le32 mmp_seq;
1: +  __le64 mmp_time;
1: +  char mmp_nodename[64];
1: +  char mmp_bdevname[32];
1: +  __le16 mmp_check_interval;
1: +  __le16 mmp_pad1;
1: +  __le32 mmp_pad2[226];
1: +  __le32 mmp_checksum;
1:  };
1:  
1:  struct mmpd_data {
1: -	struct buffer_head *bh;
1: -	struct super_block *sb;
1: +  struct buffer_head *bh;
1: +  struct super_block *sb;
1:  };
1:  
1:  struct fscrypt_name {
1: -	const struct qstr *usr_fname;
1: -	struct fscrypt_str disk_name;
1: -	u32 hash;
1: -	u32 minor_hash;
1: -	struct fscrypt_str crypto_buf;
1: -	bool is_nokey_name;
1: +  const struct qstr *usr_fname;
1: +  struct fscrypt_str disk_name;
1: +  u32 hash;
1: +  u32 minor_hash;
1: +  struct fscrypt_str crypto_buf;
1: +  bool is_nokey_name;
1:  };
1:  
1:  struct ext4_dir_entry {
1: -	__le32 inode;
1: -	__le16 rec_len;
1: -	__le16 name_len;
1: -	char name[255];
1: +  __le32 inode;
1: +  __le16 rec_len;
1: +  __le16 name_len;
1: +  char name[255];
1:  };
1:  
1:  struct ext4_dir_entry_tail {
1: -	__le32 det_reserved_zero1;
1: -	__le16 det_rec_len;
1: -	__u8 det_reserved_zero2;
1: -	__u8 det_reserved_ft;
1: -	__le32 det_checksum;
1: +  __le32 det_reserved_zero1;
1: +  __le16 det_rec_len;
1: +  __u8 det_reserved_zero2;
1: +  __u8 det_reserved_ft;
1: +  __le32 det_checksum;
1:  };
1:  
1:  typedef enum {
1: -	EITHER = 0,
1: -	INDEX = 1,
1: -	DIRENT = 2,
1: -	DIRENT_HTREE = 3,
1: +  EITHER = 0,
1: +  INDEX = 1,
1: +  DIRENT = 2,
1: +  DIRENT_HTREE = 3,
1:  } dirblock_type_t;
1:  
1:  struct fake_dirent {
1: -	__le32 inode;
1: -	__le16 rec_len;
1: -	u8 name_len;
1: -	u8 file_type;
1: +  __le32 inode;
1: +  __le16 rec_len;
1: +  u8 name_len;
1: +  u8 file_type;
1:  };
1:  
1:  struct dx_countlimit {
1: -	__le16 limit;
1: -	__le16 count;
1: +  __le16 limit;
1: +  __le16 count;
1:  };
1:  
1:  struct dx_entry {
1: -	__le32 hash;
1: -	__le32 block;
1: +  __le32 hash;
1: +  __le32 block;
1:  };
1:  
1:  struct dx_root_info {
1: -	__le32 reserved_zero;
1: -	u8 hash_version;
1: -	u8 info_length;
1: -	u8 indirect_levels;
1: -	u8 unused_flags;
1: +  __le32 reserved_zero;
1: +  u8 hash_version;
1: +  u8 info_length;
1: +  u8 indirect_levels;
1: +  u8 unused_flags;
1:  };
1:  
1:  struct dx_root {
1: -	struct fake_dirent dot;
1: -	char dot_name[4];
1: -	struct fake_dirent dotdot;
1: -	char dotdot_name[4];
1: -	struct dx_root_info info;
1: -	struct dx_entry entries[0];
1: +  struct fake_dirent dot;
1: +  char dot_name[4];
1: +  struct fake_dirent dotdot;
1: +  char dotdot_name[4];
1: +  struct dx_root_info info;
1: +  struct dx_entry entries[0];
1:  };
1:  
1:  struct dx_node {
1: -	struct fake_dirent fake;
1: -	struct dx_entry entries[0];
1: +  struct fake_dirent fake;
1: +  struct dx_entry entries[0];
1:  };
1:  
1:  struct dx_frame {
1: -	struct buffer_head *bh;
1: -	struct dx_entry *entries;
1: -	struct dx_entry *at;
1: +  struct buffer_head *bh;
1: +  struct dx_entry *entries;
1: +  struct dx_entry *at;
1:  };
1:  
1:  struct dx_map_entry {
1: -	u32 hash;
1: -	u16 offs;
1: -	u16 size;
1: +  u32 hash;
1: +  u16 offs;
1: +  u16 size;
1:  };
1:  
1:  struct dx_tail {
1: -	u32 dt_reserved;
1: -	__le32 dt_checksum;
1: +  u32 dt_reserved;
1: +  __le32 dt_checksum;
1:  };
1:  
1:  struct ext4_renament {
1: -	struct inode *dir;
1: -	struct dentry *dentry;
1: -	struct inode *inode;
1: -	bool is_dir;
1: -	int dir_nlink_delta;
1: -	struct buffer_head *bh;
1: -	struct ext4_dir_entry_2 *de;
1: -	int inlined;
1: -	struct buffer_head *dir_bh;
1: -	struct ext4_dir_entry_2 *parent_de;
1: -	int dir_inlined;
1: +  struct inode *dir;
1: +  struct dentry *dentry;
1: +  struct inode *inode;
1: +  bool is_dir;
1: +  int dir_nlink_delta;
1: +  struct buffer_head *bh;
1: +  struct ext4_dir_entry_2 *de;
1: +  int inlined;
1: +  struct buffer_head *dir_bh;
1: +  struct ext4_dir_entry_2 *parent_de;
1: +  int dir_inlined;
1:  };
1:  
1:  enum bio_post_read_step {
1: -	STEP_INITIAL = 0,
1: -	STEP_DECRYPT = 1,
1: -	STEP_VERITY = 2,
1: -	STEP_MAX = 3,
1: +  STEP_INITIAL = 0,
1: +  STEP_DECRYPT = 1,
1: +  STEP_VERITY = 2,
1: +  STEP_MAX = 3,
1:  };
1:  
1:  struct bio_post_read_ctx {
1: -	struct bio *bio;
1: -	struct work_struct work;
1: -	unsigned int cur_step;
1: -	unsigned int enabled_steps;
1: +  struct bio *bio;
1: +  struct work_struct work;
1: +  unsigned int cur_step;
1: +  unsigned int enabled_steps;
1:  };
1:  
1:  enum {
1: -	BLOCK_BITMAP = 0,
1: -	INODE_BITMAP = 1,
1: -	INODE_TABLE = 2,
1: -	GROUP_TABLE_COUNT = 3,
1: +  BLOCK_BITMAP = 0,
1: +  INODE_BITMAP = 1,
1: +  INODE_TABLE = 2,
1: +  GROUP_TABLE_COUNT = 3,
1:  };
1:  
1:  struct ext4_rcu_ptr {
1: -	struct callback_head rcu;
1: -	void *ptr;
1: +  struct callback_head rcu;
1: +  void *ptr;
1:  };
1:  
1:  struct ext4_new_flex_group_data {
1: -	struct ext4_new_group_data *groups;
1: -	__u16 *bg_flags;
1: -	ext4_group_t count;
1: +  struct ext4_new_group_data *groups;
1: +  __u16 *bg_flags;
1: +  ext4_group_t count;
1:  };
1:  
1:  enum stat_group {
1: -	STAT_READ = 0,
1: -	STAT_WRITE = 1,
1: -	STAT_DISCARD = 2,
1: -	STAT_FLUSH = 3,
1: -	NR_STAT_GROUPS = 4,
1: +  STAT_READ = 0,
1: +  STAT_WRITE = 1,
1: +  STAT_DISCARD = 2,
1: +  STAT_FLUSH = 3,
1: +  NR_STAT_GROUPS = 4,
1:  };
1:  
1:  enum {
1: -	I_DATA_SEM_NORMAL = 0,
1: -	I_DATA_SEM_OTHER = 1,
1: -	I_DATA_SEM_QUOTA = 2,
1: +  I_DATA_SEM_NORMAL = 0,
1: +  I_DATA_SEM_OTHER = 1,
1: +  I_DATA_SEM_QUOTA = 2,
1:  };
1:  
1:  struct ext4_lazy_init {
1: -	long unsigned int li_state;
1: -	struct list_head li_request_list;
1: -	struct mutex li_list_mtx;
1: +  long unsigned int li_state;
1: +  struct list_head li_request_list;
1: +  struct mutex li_list_mtx;
1:  };
1:  
1:  struct ext4_journal_cb_entry {
1: -	struct list_head jce_list;
1: -	void (*jce_func)(struct super_block *, struct ext4_journal_cb_entry *, int);
1: +  struct list_head jce_list;
1: +  void (*jce_func)(struct super_block *, struct ext4_journal_cb_entry *, int);
1:  };
1:  
1:  struct trace_event_raw_ext4_other_inode_update_time {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ino_t orig_ino;
1: -	uid_t uid;
1: -	gid_t gid;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ino_t orig_ino;
1: +  uid_t uid;
1: +  gid_t gid;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_free_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	uid_t uid;
1: -	gid_t gid;
1: -	__u64 blocks;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  uid_t uid;
1: +  gid_t gid;
1: +  __u64 blocks;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_request_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t dir;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t dir;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_allocate_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ino_t dir;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ino_t dir;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_evict_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int nlink;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int nlink;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_drop_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int drop;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int drop;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_nfs_commit_metadata {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_mark_inode_dirty {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	long unsigned int ip;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  long unsigned int ip;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_begin_ordered_truncate {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t new_size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t new_size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__write_begin {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t pos;
1: -	unsigned int len;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t pos;
1: +  unsigned int len;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__write_end {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t pos;
1: -	unsigned int len;
1: -	unsigned int copied;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t pos;
1: +  unsigned int len;
1: +  unsigned int copied;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_writepages {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	long int nr_to_write;
1: -	long int pages_skipped;
1: -	loff_t range_start;
1: -	loff_t range_end;
1: -	long unsigned int writeback_index;
1: -	int sync_mode;
1: -	char for_kupdate;
1: -	char range_cyclic;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  long int nr_to_write;
1: +  long int pages_skipped;
1: +  loff_t range_start;
1: +  loff_t range_end;
1: +  long unsigned int writeback_index;
1: +  int sync_mode;
1: +  char for_kupdate;
1: +  char range_cyclic;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_da_write_pages {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	long unsigned int first_page;
1: -	long int nr_to_write;
1: -	int sync_mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  long unsigned int first_page;
1: +  long int nr_to_write;
1: +  int sync_mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_da_write_pages_extent {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 lblk;
1: -	__u32 len;
1: -	__u32 flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 lblk;
1: +  __u32 len;
1: +  __u32 flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_writepages_result {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int ret;
1: -	int pages_written;
1: -	long int pages_skipped;
1: -	long unsigned int writeback_index;
1: -	int sync_mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int ret;
1: +  int pages_written;
1: +  long int pages_skipped;
1: +  long unsigned int writeback_index;
1: +  int sync_mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__page_op {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	long unsigned int index;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  long unsigned int index;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_invalidatepage_op {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	long unsigned int index;
1: -	unsigned int offset;
1: -	unsigned int length;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  long unsigned int index;
1: +  unsigned int offset;
1: +  unsigned int length;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_discard_blocks {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	__u64 blk;
1: -	__u64 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  __u64 blk;
1: +  __u64 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__mb_new_pa {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 pa_pstart;
1: -	__u64 pa_lstart;
1: -	__u32 pa_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 pa_pstart;
1: +  __u64 pa_lstart;
1: +  __u32 pa_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_mb_release_inode_pa {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 block;
1: -	__u32 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 block;
1: +  __u32 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_mb_release_group_pa {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	__u64 pa_pstart;
1: -	__u32 pa_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  __u64 pa_pstart;
1: +  __u32 pa_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_discard_preallocations {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	unsigned int len;
1: -	unsigned int needed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  unsigned int len;
1: +  unsigned int needed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_mb_discard_preallocations {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int needed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int needed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_request_blocks {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	unsigned int len;
1: -	__u32 logical;
1: -	__u32 lleft;
1: -	__u32 lright;
1: -	__u64 goal;
1: -	__u64 pleft;
1: -	__u64 pright;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  unsigned int len;
1: +  __u32 logical;
1: +  __u32 lleft;
1: +  __u32 lright;
1: +  __u64 goal;
1: +  __u64 pleft;
1: +  __u64 pright;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_allocate_blocks {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 block;
1: -	unsigned int len;
1: -	__u32 logical;
1: -	__u32 lleft;
1: -	__u32 lright;
1: -	__u64 goal;
1: -	__u64 pleft;
1: -	__u64 pright;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 block;
1: +  unsigned int len;
1: +  __u32 logical;
1: +  __u32 lleft;
1: +  __u32 lright;
1: +  __u64 goal;
1: +  __u64 pleft;
1: +  __u64 pright;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_free_blocks {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 block;
1: -	long unsigned int count;
1: -	int flags;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 block;
1: +  long unsigned int count;
1: +  int flags;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_sync_file_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ino_t parent;
1: -	int datasync;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ino_t parent;
1: +  int datasync;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_sync_file_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_sync_fs {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int wait;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int wait;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_alloc_da_blocks {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	unsigned int data_blocks;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  unsigned int data_blocks;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_mballoc_alloc {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u32 orig_logical;
1: -	int orig_start;
1: -	__u32 orig_group;
1: -	int orig_len;
1: -	__u32 goal_logical;
1: -	int goal_start;
1: -	__u32 goal_group;
1: -	int goal_len;
1: -	__u32 result_logical;
1: -	int result_start;
1: -	__u32 result_group;
1: -	int result_len;
1: -	__u16 found;
1: -	__u16 groups;
1: -	__u16 buddy;
1: -	__u16 flags;
1: -	__u16 tail;
1: -	__u8 cr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u32 orig_logical;
1: +  int orig_start;
1: +  __u32 orig_group;
1: +  int orig_len;
1: +  __u32 goal_logical;
1: +  int goal_start;
1: +  __u32 goal_group;
1: +  int goal_len;
1: +  __u32 result_logical;
1: +  int result_start;
1: +  __u32 result_group;
1: +  int result_len;
1: +  __u16 found;
1: +  __u16 groups;
1: +  __u16 buddy;
1: +  __u16 flags;
1: +  __u16 tail;
1: +  __u8 cr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_mballoc_prealloc {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u32 orig_logical;
1: -	int orig_start;
1: -	__u32 orig_group;
1: -	int orig_len;
1: -	__u32 result_logical;
1: -	int result_start;
1: -	__u32 result_group;
1: -	int result_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u32 orig_logical;
1: +  int orig_start;
1: +  __u32 orig_group;
1: +  int orig_len;
1: +  __u32 result_logical;
1: +  int result_start;
1: +  __u32 result_group;
1: +  int result_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__mballoc {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int result_start;
1: -	__u32 result_group;
1: -	int result_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int result_start;
1: +  __u32 result_group;
1: +  int result_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_forget {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 block;
1: -	int is_metadata;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 block;
1: +  int is_metadata;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_da_update_reserve_space {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 i_blocks;
1: -	int used_blocks;
1: -	int reserved_data_blocks;
1: -	int quota_claim;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 i_blocks;
1: +  int used_blocks;
1: +  int reserved_data_blocks;
1: +  int quota_claim;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_da_reserve_space {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 i_blocks;
1: -	int reserved_data_blocks;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 i_blocks;
1: +  int reserved_data_blocks;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_da_release_space {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 i_blocks;
1: -	int freed_blocks;
1: -	int reserved_data_blocks;
1: -	__u16 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 i_blocks;
1: +  int freed_blocks;
1: +  int reserved_data_blocks;
1: +  __u16 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__bitmap_load {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	__u32 group;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  __u32 group;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_read_block_bitmap_load {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	__u32 group;
1: -	bool prefetch;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  __u32 group;
1: +  bool prefetch;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_direct_IO_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t pos;
1: -	long unsigned int len;
1: -	int rw;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t pos;
1: +  long unsigned int len;
1: +  int rw;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_direct_IO_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t pos;
1: -	long unsigned int len;
1: -	int rw;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t pos;
1: +  long unsigned int len;
1: +  int rw;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__fallocate_mode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t offset;
1: -	loff_t len;
1: -	int mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t offset;
1: +  loff_t len;
1: +  int mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fallocate_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t pos;
1: -	unsigned int blocks;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t pos;
1: +  unsigned int blocks;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_unlink_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ino_t parent;
1: -	loff_t size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ino_t parent;
1: +  loff_t size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_unlink_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__truncate {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	__u64 blocks;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  __u64 blocks;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_convert_to_initialized_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t m_lblk;
1: -	unsigned int m_len;
1: -	ext4_lblk_t u_lblk;
1: -	unsigned int u_len;
1: -	ext4_fsblk_t u_pblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t m_lblk;
1: +  unsigned int m_len;
1: +  ext4_lblk_t u_lblk;
1: +  unsigned int u_len;
1: +  ext4_fsblk_t u_pblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_convert_to_initialized_fastpath {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t m_lblk;
1: -	unsigned int m_len;
1: -	ext4_lblk_t u_lblk;
1: -	unsigned int u_len;
1: -	ext4_fsblk_t u_pblk;
1: -	ext4_lblk_t i_lblk;
1: -	unsigned int i_len;
1: -	ext4_fsblk_t i_pblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t m_lblk;
1: +  unsigned int m_len;
1: +  ext4_lblk_t u_lblk;
1: +  unsigned int u_len;
1: +  ext4_fsblk_t u_pblk;
1: +  ext4_lblk_t i_lblk;
1: +  unsigned int i_len;
1: +  ext4_fsblk_t i_pblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__map_blocks_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	unsigned int len;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  unsigned int len;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__map_blocks_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	unsigned int flags;
1: -	ext4_fsblk_t pblk;
1: -	ext4_lblk_t lblk;
1: -	unsigned int len;
1: -	unsigned int mflags;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  unsigned int flags;
1: +  ext4_fsblk_t pblk;
1: +  ext4_lblk_t lblk;
1: +  unsigned int len;
1: +  unsigned int mflags;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_load_extent {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_fsblk_t pblk;
1: -	ext4_lblk_t lblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_fsblk_t pblk;
1: +  ext4_lblk_t lblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_load_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_journal_start {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int ip;
1: -	int blocks;
1: -	int rsv_blocks;
1: -	int revoke_creds;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int ip;
1: +  int blocks;
1: +  int rsv_blocks;
1: +  int revoke_creds;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_journal_start_reserved {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int ip;
1: -	int blocks;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int ip;
1: +  int blocks;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__trim {
1: -	struct trace_entry ent;
1: -	int dev_major;
1: -	int dev_minor;
1: -	__u32 group;
1: -	int start;
1: -	int len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int dev_major;
1: +  int dev_minor;
1: +  __u32 group;
1: +  int start;
1: +  int len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_handle_unwritten_extents {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	int flags;
1: -	ext4_lblk_t lblk;
1: -	ext4_fsblk_t pblk;
1: -	unsigned int len;
1: -	unsigned int allocated;
1: -	ext4_fsblk_t newblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  int flags;
1: +  ext4_lblk_t lblk;
1: +  ext4_fsblk_t pblk;
1: +  unsigned int len;
1: +  unsigned int allocated;
1: +  ext4_fsblk_t newblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_get_implied_cluster_alloc_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	unsigned int flags;
1: -	ext4_lblk_t lblk;
1: -	ext4_fsblk_t pblk;
1: -	unsigned int len;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  unsigned int flags;
1: +  ext4_lblk_t lblk;
1: +  ext4_fsblk_t pblk;
1: +  unsigned int len;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_put_in_cache {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	unsigned int len;
1: -	ext4_fsblk_t start;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  unsigned int len;
1: +  ext4_fsblk_t start;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_in_cache {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_find_delalloc_range {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t from;
1: -	ext4_lblk_t to;
1: -	int reverse;
1: -	int found;
1: -	ext4_lblk_t found_blk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t from;
1: +  ext4_lblk_t to;
1: +  int reverse;
1: +  int found;
1: +  ext4_lblk_t found_blk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_get_reserved_cluster_alloc {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	unsigned int len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  unsigned int len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_show_extent {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_fsblk_t pblk;
1: -	ext4_lblk_t lblk;
1: -	short unsigned int len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_fsblk_t pblk;
1: +  ext4_lblk_t lblk;
1: +  short unsigned int len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_remove_blocks {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t from;
1: -	ext4_lblk_t to;
1: -	ext4_fsblk_t ee_pblk;
1: -	ext4_lblk_t ee_lblk;
1: -	short unsigned int ee_len;
1: -	ext4_fsblk_t pc_pclu;
1: -	ext4_lblk_t pc_lblk;
1: -	int pc_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t from;
1: +  ext4_lblk_t to;
1: +  ext4_fsblk_t ee_pblk;
1: +  ext4_lblk_t ee_lblk;
1: +  short unsigned int ee_len;
1: +  ext4_fsblk_t pc_pclu;
1: +  ext4_lblk_t pc_lblk;
1: +  int pc_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_rm_leaf {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t start;
1: -	ext4_lblk_t ee_lblk;
1: -	ext4_fsblk_t ee_pblk;
1: -	short int ee_len;
1: -	ext4_fsblk_t pc_pclu;
1: -	ext4_lblk_t pc_lblk;
1: -	int pc_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t start;
1: +  ext4_lblk_t ee_lblk;
1: +  ext4_fsblk_t ee_pblk;
1: +  short int ee_len;
1: +  ext4_fsblk_t pc_pclu;
1: +  ext4_lblk_t pc_lblk;
1: +  int pc_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_rm_idx {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_fsblk_t pblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_fsblk_t pblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_remove_space {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t start;
1: -	ext4_lblk_t end;
1: -	int depth;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t start;
1: +  ext4_lblk_t end;
1: +  int depth;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_ext_remove_space_done {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t start;
1: -	ext4_lblk_t end;
1: -	int depth;
1: -	ext4_fsblk_t pc_pclu;
1: -	ext4_lblk_t pc_lblk;
1: -	int pc_state;
1: -	short unsigned int eh_entries;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t start;
1: +  ext4_lblk_t end;
1: +  int depth;
1: +  ext4_fsblk_t pc_pclu;
1: +  ext4_lblk_t pc_lblk;
1: +  int pc_state;
1: +  short unsigned int eh_entries;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__es_extent {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	ext4_lblk_t len;
1: -	ext4_fsblk_t pblk;
1: -	char status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  ext4_lblk_t len;
1: +  ext4_fsblk_t pblk;
1: +  char status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_remove_extent {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t lblk;
1: -	loff_t len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t lblk;
1: +  loff_t len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_find_extent_range_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_find_extent_range_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	ext4_lblk_t len;
1: -	ext4_fsblk_t pblk;
1: -	char status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  ext4_lblk_t len;
1: +  ext4_fsblk_t pblk;
1: +  char status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_lookup_extent_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_lookup_extent_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	ext4_lblk_t len;
1: -	ext4_fsblk_t pblk;
1: -	char status;
1: -	int found;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  ext4_lblk_t len;
1: +  ext4_fsblk_t pblk;
1: +  char status;
1: +  int found;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4__es_shrink_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int nr_to_scan;
1: -	int cache_cnt;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int nr_to_scan;
1: +  int cache_cnt;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_shrink_scan_exit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int nr_shrunk;
1: -	int cache_cnt;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int nr_shrunk;
1: +  int cache_cnt;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_collapse_range {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t offset;
1: -	loff_t len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t offset;
1: +  loff_t len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_insert_range {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	loff_t offset;
1: -	loff_t len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  loff_t offset;
1: +  loff_t len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_shrink {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int nr_shrunk;
1: -	long long unsigned int scan_time;
1: -	int nr_skipped;
1: -	int retried;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int nr_shrunk;
1: +  long long unsigned int scan_time;
1: +  int nr_skipped;
1: +  int retried;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_es_insert_delayed_block {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	ext4_lblk_t lblk;
1: -	ext4_lblk_t len;
1: -	ext4_fsblk_t pblk;
1: -	char status;
1: -	bool allocated;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  ext4_lblk_t lblk;
1: +  ext4_lblk_t len;
1: +  ext4_fsblk_t pblk;
1: +  char status;
1: +  bool allocated;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fsmap_class {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	dev_t keydev;
1: -	u32 agno;
1: -	u64 bno;
1: -	u64 len;
1: -	u64 owner;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  dev_t keydev;
1: +  u32 agno;
1: +  u64 bno;
1: +  u64 len;
1: +  u64 owner;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_getfsmap_class {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	dev_t keydev;
1: -	u64 block;
1: -	u64 len;
1: -	u64 owner;
1: -	u64 flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  dev_t keydev;
1: +  u64 block;
1: +  u64 len;
1: +  u64 owner;
1: +  u64 flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_shutdown {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_error {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	const char *function;
1: -	unsigned int line;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  const char *function;
1: +  unsigned int line;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_prefetch_bitmaps {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	__u32 group;
1: -	__u32 next;
1: -	__u32 ios;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  __u32 group;
1: +  __u32 next;
1: +  __u32 ios;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_lazy_itable_init {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	__u32 group;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  __u32 group;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_replay_scan {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int error;
1: -	int off;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int error;
1: +  int off;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_replay {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int tag;
1: -	int ino;
1: -	int priv1;
1: -	int priv2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int tag;
1: +  int ino;
1: +  int priv1;
1: +  int priv2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_commit_start {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_commit_stop {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int nblks;
1: -	int reason;
1: -	int num_fc;
1: -	int num_fc_ineligible;
1: -	int nblks_agg;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int nblks;
1: +  int reason;
1: +  int num_fc;
1: +  int num_fc_ineligible;
1: +  int nblks_agg;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_stats {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	struct ext4_sb_info *sbi;
1: -	int count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  struct ext4_sb_info *sbi;
1: +  int count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_track_create {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int ino;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int ino;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_track_link {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int ino;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int ino;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_track_unlink {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int ino;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int ino;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_track_inode {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int ino;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int ino;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ext4_fc_track_range {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int ino;
1: -	long int start;
1: -	long int end;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int ino;
1: +  long int start;
1: +  long int end;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_ext4_other_inode_update_time {};
1: @@ -48349,13 +48885,15 @@ struct trace_event_data_offsets_ext4_fc_track_inode {};
1:  
1:  struct trace_event_data_offsets_ext4_fc_track_range {};
1:  
1: -typedef void (*btf_trace_ext4_other_inode_update_time)(void *, struct inode *, ino_t);
1: +typedef void (*btf_trace_ext4_other_inode_update_time)(void *, struct inode *,
1: +                                                       ino_t);
1:  
1:  typedef void (*btf_trace_ext4_free_inode)(void *, struct inode *);
1:  
1:  typedef void (*btf_trace_ext4_request_inode)(void *, struct inode *, int);
1:  
1: -typedef void (*btf_trace_ext4_allocate_inode)(void *, struct inode *, struct inode *, int);
1: +typedef void (*btf_trace_ext4_allocate_inode)(void *, struct inode *,
1: +                                              struct inode *, int);
1:  
1:  typedef void (*btf_trace_ext4_evict_inode)(void *, struct inode *);
1:  
1: @@ -48363,27 +48901,41 @@ typedef void (*btf_trace_ext4_drop_inode)(void *, struct inode *, int);
1:  
1:  typedef void (*btf_trace_ext4_nfs_commit_metadata)(void *, struct inode *);
1:  
1: -typedef void (*btf_trace_ext4_mark_inode_dirty)(void *, struct inode *, long unsigned int);
1: +typedef void (*btf_trace_ext4_mark_inode_dirty)(void *, struct inode *,
1: +                                                long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_begin_ordered_truncate)(void *, struct inode *, loff_t);
1: +typedef void (*btf_trace_ext4_begin_ordered_truncate)(void *, struct inode *,
1: +                                                      loff_t);
1:  
1: -typedef void (*btf_trace_ext4_write_begin)(void *, struct inode *, loff_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_write_begin)(void *, struct inode *, loff_t,
1: +                                           unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_da_write_begin)(void *, struct inode *, loff_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_da_write_begin)(void *, struct inode *, loff_t,
1: +                                              unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_write_end)(void *, struct inode *, loff_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_write_end)(void *, struct inode *, loff_t,
1: +                                         unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_journalled_write_end)(void *, struct inode *, loff_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_journalled_write_end)(void *, struct inode *,
1: +                                                    loff_t, unsigned int,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_da_write_end)(void *, struct inode *, loff_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_da_write_end)(void *, struct inode *, loff_t,
1: +                                            unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_writepages)(void *, struct inode *, struct writeback_control *);
1: +typedef void (*btf_trace_ext4_writepages)(void *, struct inode *,
1: +                                          struct writeback_control *);
1:  
1: -typedef void (*btf_trace_ext4_da_write_pages)(void *, struct inode *, long unsigned int, struct writeback_control *);
1: +typedef void (*btf_trace_ext4_da_write_pages)(void *, struct inode *,
1: +                                              long unsigned int,
1: +                                              struct writeback_control *);
1:  
1: -typedef void (*btf_trace_ext4_da_write_pages_extent)(void *, struct inode *, struct ext4_map_blocks *);
1: +typedef void (*btf_trace_ext4_da_write_pages_extent)(void *, struct inode *,
1: +                                                     struct ext4_map_blocks *);
1:  
1: -typedef void (*btf_trace_ext4_writepages_result)(void *, struct inode *, struct writeback_control *, int, int);
1: +typedef void (*btf_trace_ext4_writepages_result)(void *, struct inode *,
1: +                                                 struct writeback_control *,
1: +                                                 int, int);
1:  
1:  typedef void (*btf_trace_ext4_writepage)(void *, struct page *);
1:  
1: @@ -48391,29 +48943,50 @@ typedef void (*btf_trace_ext4_readpage)(void *, struct page *);
1:  
1:  typedef void (*btf_trace_ext4_releasepage)(void *, struct page *);
1:  
1: -typedef void (*btf_trace_ext4_invalidatepage)(void *, struct page *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_invalidatepage)(void *, struct page *,
1: +                                              unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_journalled_invalidatepage)(void *, struct page *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_journalled_invalidatepage)(void *, struct page *,
1: +                                                         unsigned int,
1: +                                                         unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_discard_blocks)(void *, struct super_block *, long long unsigned int, long long unsigned int);
1: +typedef void (*btf_trace_ext4_discard_blocks)(void *, struct super_block *,
1: +                                              long long unsigned int,
1: +                                              long long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_mb_new_inode_pa)(void *, struct ext4_allocation_context *, struct ext4_prealloc_space *);
1: +typedef void (*btf_trace_ext4_mb_new_inode_pa)(void *,
1: +                                               struct ext4_allocation_context *,
1: +                                               struct ext4_prealloc_space *);
1:  
1: -typedef void (*btf_trace_ext4_mb_new_group_pa)(void *, struct ext4_allocation_context *, struct ext4_prealloc_space *);
1: +typedef void (*btf_trace_ext4_mb_new_group_pa)(void *,
1: +                                               struct ext4_allocation_context *,
1: +                                               struct ext4_prealloc_space *);
1:  
1: -typedef void (*btf_trace_ext4_mb_release_inode_pa)(void *, struct ext4_prealloc_space *, long long unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_mb_release_inode_pa)(void *,
1: +                                                   struct ext4_prealloc_space *,
1: +                                                   long long unsigned int,
1: +                                                   unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_mb_release_group_pa)(void *, struct super_block *, struct ext4_prealloc_space *);
1: +typedef void (*btf_trace_ext4_mb_release_group_pa)(
1: +    void *, struct super_block *, struct ext4_prealloc_space *);
1:  
1: -typedef void (*btf_trace_ext4_discard_preallocations)(void *, struct inode *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_discard_preallocations)(void *, struct inode *,
1: +                                                      unsigned int,
1: +                                                      unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_mb_discard_preallocations)(void *, struct super_block *, int);
1: +typedef void (*btf_trace_ext4_mb_discard_preallocations)(void *,
1: +                                                         struct super_block *,
1: +                                                         int);
1:  
1: -typedef void (*btf_trace_ext4_request_blocks)(void *, struct ext4_allocation_request *);
1: +typedef void (*btf_trace_ext4_request_blocks)(void *,
1: +                                              struct ext4_allocation_request *);
1:  
1: -typedef void (*btf_trace_ext4_allocate_blocks)(void *, struct ext4_allocation_request *, long long unsigned int);
1: +typedef void (*btf_trace_ext4_allocate_blocks)(void *,
1: +                                               struct ext4_allocation_request *,
1: +                                               long long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_free_blocks)(void *, struct inode *, __u64, long unsigned int, int);
1: +typedef void (*btf_trace_ext4_free_blocks)(void *, struct inode *, __u64,
1: +                                           long unsigned int, int);
1:  
1:  typedef void (*btf_trace_ext4_sync_file_enter)(void *, struct file *, int);
1:  
1: @@ -48423,43 +48996,63 @@ typedef void (*btf_trace_ext4_sync_fs)(void *, struct super_block *, int);
1:  
1:  typedef void (*btf_trace_ext4_alloc_da_blocks)(void *, struct inode *);
1:  
1: -typedef void (*btf_trace_ext4_mballoc_alloc)(void *, struct ext4_allocation_context *);
1: +typedef void (*btf_trace_ext4_mballoc_alloc)(void *,
1: +                                             struct ext4_allocation_context *);
1:  
1: -typedef void (*btf_trace_ext4_mballoc_prealloc)(void *, struct ext4_allocation_context *);
1: +typedef void (*btf_trace_ext4_mballoc_prealloc)(
1: +    void *, struct ext4_allocation_context *);
1:  
1: -typedef void (*btf_trace_ext4_mballoc_discard)(void *, struct super_block *, struct inode *, ext4_group_t, ext4_grpblk_t, ext4_grpblk_t);
1: +typedef void (*btf_trace_ext4_mballoc_discard)(void *, struct super_block *,
1: +                                               struct inode *, ext4_group_t,
1: +                                               ext4_grpblk_t, ext4_grpblk_t);
1:  
1: -typedef void (*btf_trace_ext4_mballoc_free)(void *, struct super_block *, struct inode *, ext4_group_t, ext4_grpblk_t, ext4_grpblk_t);
1: +typedef void (*btf_trace_ext4_mballoc_free)(void *, struct super_block *,
1: +                                            struct inode *, ext4_group_t,
1: +                                            ext4_grpblk_t, ext4_grpblk_t);
1:  
1:  typedef void (*btf_trace_ext4_forget)(void *, struct inode *, int, __u64);
1:  
1: -typedef void (*btf_trace_ext4_da_update_reserve_space)(void *, struct inode *, int, int);
1: +typedef void (*btf_trace_ext4_da_update_reserve_space)(void *, struct inode *,
1: +                                                       int, int);
1:  
1:  typedef void (*btf_trace_ext4_da_reserve_space)(void *, struct inode *);
1:  
1:  typedef void (*btf_trace_ext4_da_release_space)(void *, struct inode *, int);
1:  
1: -typedef void (*btf_trace_ext4_mb_bitmap_load)(void *, struct super_block *, long unsigned int);
1: +typedef void (*btf_trace_ext4_mb_bitmap_load)(void *, struct super_block *,
1: +                                              long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_mb_buddy_bitmap_load)(void *, struct super_block *, long unsigned int);
1: +typedef void (*btf_trace_ext4_mb_buddy_bitmap_load)(void *,
1: +                                                    struct super_block *,
1: +                                                    long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_load_inode_bitmap)(void *, struct super_block *, long unsigned int);
1: +typedef void (*btf_trace_ext4_load_inode_bitmap)(void *, struct super_block *,
1: +                                                 long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_read_block_bitmap_load)(void *, struct super_block *, long unsigned int, bool);
1: +typedef void (*btf_trace_ext4_read_block_bitmap_load)(void *,
1: +                                                      struct super_block *,
1: +                                                      long unsigned int, bool);
1:  
1: -typedef void (*btf_trace_ext4_direct_IO_enter)(void *, struct inode *, loff_t, long unsigned int, int);
1: +typedef void (*btf_trace_ext4_direct_IO_enter)(void *, struct inode *, loff_t,
1: +                                               long unsigned int, int);
1:  
1: -typedef void (*btf_trace_ext4_direct_IO_exit)(void *, struct inode *, loff_t, long unsigned int, int, int);
1: +typedef void (*btf_trace_ext4_direct_IO_exit)(void *, struct inode *, loff_t,
1: +                                              long unsigned int, int, int);
1:  
1: -typedef void (*btf_trace_ext4_fallocate_enter)(void *, struct inode *, loff_t, loff_t, int);
1: +typedef void (*btf_trace_ext4_fallocate_enter)(void *, struct inode *, loff_t,
1: +                                               loff_t, int);
1:  
1: -typedef void (*btf_trace_ext4_punch_hole)(void *, struct inode *, loff_t, loff_t, int);
1: +typedef void (*btf_trace_ext4_punch_hole)(void *, struct inode *, loff_t,
1: +                                          loff_t, int);
1:  
1: -typedef void (*btf_trace_ext4_zero_range)(void *, struct inode *, loff_t, loff_t, int);
1: +typedef void (*btf_trace_ext4_zero_range)(void *, struct inode *, loff_t,
1: +                                          loff_t, int);
1:  
1: -typedef void (*btf_trace_ext4_fallocate_exit)(void *, struct inode *, loff_t, unsigned int, int);
1: +typedef void (*btf_trace_ext4_fallocate_exit)(void *, struct inode *, loff_t,
1: +                                              unsigned int, int);
1:  
1: -typedef void (*btf_trace_ext4_unlink_enter)(void *, struct inode *, struct dentry *);
1: +typedef void (*btf_trace_ext4_unlink_enter)(void *, struct inode *,
1: +                                            struct dentry *);
1:  
1:  typedef void (*btf_trace_ext4_unlink_exit)(void *, struct dentry *, int);
1:  
1: @@ -48467,522 +49060,601 @@ typedef void (*btf_trace_ext4_truncate_enter)(void *, struct inode *);
1:  
1:  typedef void (*btf_trace_ext4_truncate_exit)(void *, struct inode *);
1:  
1: -typedef void (*btf_trace_ext4_ext_convert_to_initialized_enter)(void *, struct inode *, struct ext4_map_blocks *, struct ext4_extent *);
1: +typedef void (*btf_trace_ext4_ext_convert_to_initialized_enter)(
1: +    void *, struct inode *, struct ext4_map_blocks *, struct ext4_extent *);
1:  
1: -typedef void (*btf_trace_ext4_ext_convert_to_initialized_fastpath)(void *, struct inode *, struct ext4_map_blocks *, struct ext4_extent *, struct ext4_extent *);
1: +typedef void (*btf_trace_ext4_ext_convert_to_initialized_fastpath)(
1: +    void *, struct inode *, struct ext4_map_blocks *, struct ext4_extent *,
1: +    struct ext4_extent *);
1:  
1: -typedef void (*btf_trace_ext4_ext_map_blocks_enter)(void *, struct inode *, ext4_lblk_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_ext_map_blocks_enter)(void *, struct inode *,
1: +                                                    ext4_lblk_t, unsigned int,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_ind_map_blocks_enter)(void *, struct inode *, ext4_lblk_t, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ext4_ind_map_blocks_enter)(void *, struct inode *,
1: +                                                    ext4_lblk_t, unsigned int,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_ext_map_blocks_exit)(void *, struct inode *, unsigned int, struct ext4_map_blocks *, int);
1: +typedef void (*btf_trace_ext4_ext_map_blocks_exit)(void *, struct inode *,
1: +                                                   unsigned int,
1: +                                                   struct ext4_map_blocks *,
1: +                                                   int);
1:  
1: -typedef void (*btf_trace_ext4_ind_map_blocks_exit)(void *, struct inode *, unsigned int, struct ext4_map_blocks *, int);
1: +typedef void (*btf_trace_ext4_ind_map_blocks_exit)(void *, struct inode *,
1: +                                                   unsigned int,
1: +                                                   struct ext4_map_blocks *,
1: +                                                   int);
1:  
1: -typedef void (*btf_trace_ext4_ext_load_extent)(void *, struct inode *, ext4_lblk_t, ext4_fsblk_t);
1: +typedef void (*btf_trace_ext4_ext_load_extent)(void *, struct inode *,
1: +                                               ext4_lblk_t, ext4_fsblk_t);
1:  
1: -typedef void (*btf_trace_ext4_load_inode)(void *, struct super_block *, long unsigned int);
1: +typedef void (*btf_trace_ext4_load_inode)(void *, struct super_block *,
1: +                                          long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_journal_start)(void *, struct super_block *, int, int, int, long unsigned int);
1: +typedef void (*btf_trace_ext4_journal_start)(void *, struct super_block *, int,
1: +                                             int, int, long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_journal_start_reserved)(void *, struct super_block *, int, long unsigned int);
1: +typedef void (*btf_trace_ext4_journal_start_reserved)(void *,
1: +                                                      struct super_block *, int,
1: +                                                      long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_trim_extent)(void *, struct super_block *, ext4_group_t, ext4_grpblk_t, ext4_grpblk_t);
1: +typedef void (*btf_trace_ext4_trim_extent)(void *, struct super_block *,
1: +                                           ext4_group_t, ext4_grpblk_t,
1: +                                           ext4_grpblk_t);
1:  
1: -typedef void (*btf_trace_ext4_trim_all_free)(void *, struct super_block *, ext4_group_t, ext4_grpblk_t, ext4_grpblk_t);
1: +typedef void (*btf_trace_ext4_trim_all_free)(void *, struct super_block *,
1: +                                             ext4_group_t, ext4_grpblk_t,
1: +                                             ext4_grpblk_t);
1:  
1: -typedef void (*btf_trace_ext4_ext_handle_unwritten_extents)(void *, struct inode *, struct ext4_map_blocks *, int, unsigned int, ext4_fsblk_t);
1: +typedef void (*btf_trace_ext4_ext_handle_unwritten_extents)(
1: +    void *, struct inode *, struct ext4_map_blocks *, int, unsigned int,
1: +    ext4_fsblk_t);
1:  
1: -typedef void (*btf_trace_ext4_get_implied_cluster_alloc_exit)(void *, struct super_block *, struct ext4_map_blocks *, int);
1: +typedef void (*btf_trace_ext4_get_implied_cluster_alloc_exit)(
1: +    void *, struct super_block *, struct ext4_map_blocks *, int);
1:  
1: -typedef void (*btf_trace_ext4_ext_put_in_cache)(void *, struct inode *, ext4_lblk_t, unsigned int, ext4_fsblk_t);
1: +typedef void (*btf_trace_ext4_ext_put_in_cache)(void *, struct inode *,
1: +                                                ext4_lblk_t, unsigned int,
1: +                                                ext4_fsblk_t);
1:  
1: -typedef void (*btf_trace_ext4_ext_in_cache)(void *, struct inode *, ext4_lblk_t, int);
1: +typedef void (*btf_trace_ext4_ext_in_cache)(void *, struct inode *, ext4_lblk_t,
1: +                                            int);
1:  
1: -typedef void (*btf_trace_ext4_find_delalloc_range)(void *, struct inode *, ext4_lblk_t, ext4_lblk_t, int, int, ext4_lblk_t);
1: +typedef void (*btf_trace_ext4_find_delalloc_range)(void *, struct inode *,
1: +                                                   ext4_lblk_t, ext4_lblk_t,
1: +                                                   int, int, ext4_lblk_t);
1:  
1: -typedef void (*btf_trace_ext4_get_reserved_cluster_alloc)(void *, struct inode *, ext4_lblk_t, unsigned int);
1: +typedef void (*btf_trace_ext4_get_reserved_cluster_alloc)(void *,
1: +                                                          struct inode *,
1: +                                                          ext4_lblk_t,
1: +                                                          unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_ext_show_extent)(void *, struct inode *, ext4_lblk_t, ext4_fsblk_t, short unsigned int);
1: +typedef void (*btf_trace_ext4_ext_show_extent)(void *, struct inode *,
1: +                                               ext4_lblk_t, ext4_fsblk_t,
1: +                                               short unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_remove_blocks)(void *, struct inode *, struct ext4_extent *, ext4_lblk_t, ext4_fsblk_t, struct partial_cluster *);
1: +typedef void (*btf_trace_ext4_remove_blocks)(void *, struct inode *,
1: +                                             struct ext4_extent *, ext4_lblk_t,
1: +                                             ext4_fsblk_t,
1: +                                             struct partial_cluster *);
1:  
1: -typedef void (*btf_trace_ext4_ext_rm_leaf)(void *, struct inode *, ext4_lblk_t, struct ext4_extent *, struct partial_cluster *);
1: +typedef void (*btf_trace_ext4_ext_rm_leaf)(void *, struct inode *, ext4_lblk_t,
1: +                                           struct ext4_extent *,
1: +                                           struct partial_cluster *);
1:  
1:  typedef void (*btf_trace_ext4_ext_rm_idx)(void *, struct inode *, ext4_fsblk_t);
1:  
1: -typedef void (*btf_trace_ext4_ext_remove_space)(void *, struct inode *, ext4_lblk_t, ext4_lblk_t, int);
1: +typedef void (*btf_trace_ext4_ext_remove_space)(void *, struct inode *,
1: +                                                ext4_lblk_t, ext4_lblk_t, int);
1:  
1: -typedef void (*btf_trace_ext4_ext_remove_space_done)(void *, struct inode *, ext4_lblk_t, ext4_lblk_t, int, struct partial_cluster *, __le16);
1: +typedef void (*btf_trace_ext4_ext_remove_space_done)(void *, struct inode *,
1: +                                                     ext4_lblk_t, ext4_lblk_t,
1: +                                                     int,
1: +                                                     struct partial_cluster *,
1: +                                                     __le16);
1:  
1: -typedef void (*btf_trace_ext4_es_insert_extent)(void *, struct inode *, struct extent_status *);
1: +typedef void (*btf_trace_ext4_es_insert_extent)(void *, struct inode *,
1: +                                                struct extent_status *);
1:  
1: -typedef void (*btf_trace_ext4_es_cache_extent)(void *, struct inode *, struct extent_status *);
1: +typedef void (*btf_trace_ext4_es_cache_extent)(void *, struct inode *,
1: +                                               struct extent_status *);
1:  
1: -typedef void (*btf_trace_ext4_es_remove_extent)(void *, struct inode *, ext4_lblk_t, ext4_lblk_t);
1: +typedef void (*btf_trace_ext4_es_remove_extent)(void *, struct inode *,
1: +                                                ext4_lblk_t, ext4_lblk_t);
1:  
1: -typedef void (*btf_trace_ext4_es_find_extent_range_enter)(void *, struct inode *, ext4_lblk_t);
1: +typedef void (*btf_trace_ext4_es_find_extent_range_enter)(void *,
1: +                                                          struct inode *,
1: +                                                          ext4_lblk_t);
1:  
1: -typedef void (*btf_trace_ext4_es_find_extent_range_exit)(void *, struct inode *, struct extent_status *);
1: +typedef void (*btf_trace_ext4_es_find_extent_range_exit)(
1: +    void *, struct inode *, struct extent_status *);
1:  
1: -typedef void (*btf_trace_ext4_es_lookup_extent_enter)(void *, struct inode *, ext4_lblk_t);
1: +typedef void (*btf_trace_ext4_es_lookup_extent_enter)(void *, struct inode *,
1: +                                                      ext4_lblk_t);
1:  
1: -typedef void (*btf_trace_ext4_es_lookup_extent_exit)(void *, struct inode *, struct extent_status *, int);
1: +typedef void (*btf_trace_ext4_es_lookup_extent_exit)(void *, struct inode *,
1: +                                                     struct extent_status *,
1: +                                                     int);
1:  
1: -typedef void (*btf_trace_ext4_es_shrink_count)(void *, struct super_block *, int, int);
1: +typedef void (*btf_trace_ext4_es_shrink_count)(void *, struct super_block *,
1: +                                               int, int);
1:  
1: -typedef void (*btf_trace_ext4_es_shrink_scan_enter)(void *, struct super_block *, int, int);
1: +typedef void (*btf_trace_ext4_es_shrink_scan_enter)(void *,
1: +                                                    struct super_block *, int,
1: +                                                    int);
1:  
1: -typedef void (*btf_trace_ext4_es_shrink_scan_exit)(void *, struct super_block *, int, int);
1: +typedef void (*btf_trace_ext4_es_shrink_scan_exit)(void *, struct super_block *,
1: +                                                   int, int);
1:  
1: -typedef void (*btf_trace_ext4_collapse_range)(void *, struct inode *, loff_t, loff_t);
1: +typedef void (*btf_trace_ext4_collapse_range)(void *, struct inode *, loff_t,
1: +                                              loff_t);
1:  
1: -typedef void (*btf_trace_ext4_insert_range)(void *, struct inode *, loff_t, loff_t);
1: +typedef void (*btf_trace_ext4_insert_range)(void *, struct inode *, loff_t,
1: +                                            loff_t);
1:  
1: -typedef void (*btf_trace_ext4_es_shrink)(void *, struct super_block *, int, u64, int, int);
1: +typedef void (*btf_trace_ext4_es_shrink)(void *, struct super_block *, int, u64,
1: +                                         int, int);
1:  
1: -typedef void (*btf_trace_ext4_es_insert_delayed_block)(void *, struct inode *, struct extent_status *, bool);
1: +typedef void (*btf_trace_ext4_es_insert_delayed_block)(void *, struct inode *,
1: +                                                       struct extent_status *,
1: +                                                       bool);
1:  
1: -typedef void (*btf_trace_ext4_fsmap_low_key)(void *, struct super_block *, u32, u32, u64, u64, u64);
1: +typedef void (*btf_trace_ext4_fsmap_low_key)(void *, struct super_block *, u32,
1: +                                             u32, u64, u64, u64);
1:  
1: -typedef void (*btf_trace_ext4_fsmap_high_key)(void *, struct super_block *, u32, u32, u64, u64, u64);
1: +typedef void (*btf_trace_ext4_fsmap_high_key)(void *, struct super_block *, u32,
1: +                                              u32, u64, u64, u64);
1:  
1: -typedef void (*btf_trace_ext4_fsmap_mapping)(void *, struct super_block *, u32, u32, u64, u64, u64);
1: +typedef void (*btf_trace_ext4_fsmap_mapping)(void *, struct super_block *, u32,
1: +                                             u32, u64, u64, u64);
1:  
1: -typedef void (*btf_trace_ext4_getfsmap_low_key)(void *, struct super_block *, struct ext4_fsmap *);
1: +typedef void (*btf_trace_ext4_getfsmap_low_key)(void *, struct super_block *,
1: +                                                struct ext4_fsmap *);
1:  
1: -typedef void (*btf_trace_ext4_getfsmap_high_key)(void *, struct super_block *, struct ext4_fsmap *);
1: +typedef void (*btf_trace_ext4_getfsmap_high_key)(void *, struct super_block *,
1: +                                                 struct ext4_fsmap *);
1:  
1: -typedef void (*btf_trace_ext4_getfsmap_mapping)(void *, struct super_block *, struct ext4_fsmap *);
1: +typedef void (*btf_trace_ext4_getfsmap_mapping)(void *, struct super_block *,
1: +                                                struct ext4_fsmap *);
1:  
1: -typedef void (*btf_trace_ext4_shutdown)(void *, struct super_block *, long unsigned int);
1: +typedef void (*btf_trace_ext4_shutdown)(void *, struct super_block *,
1: +                                        long unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_error)(void *, struct super_block *, const char *, unsigned int);
1: +typedef void (*btf_trace_ext4_error)(void *, struct super_block *, const char *,
1: +                                     unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_prefetch_bitmaps)(void *, struct super_block *, ext4_group_t, ext4_group_t, unsigned int);
1: +typedef void (*btf_trace_ext4_prefetch_bitmaps)(void *, struct super_block *,
1: +                                                ext4_group_t, ext4_group_t,
1: +                                                unsigned int);
1:  
1: -typedef void (*btf_trace_ext4_lazy_itable_init)(void *, struct super_block *, ext4_group_t);
1: +typedef void (*btf_trace_ext4_lazy_itable_init)(void *, struct super_block *,
1: +                                                ext4_group_t);
1:  
1: -typedef void (*btf_trace_ext4_fc_replay_scan)(void *, struct super_block *, int, int);
1: +typedef void (*btf_trace_ext4_fc_replay_scan)(void *, struct super_block *, int,
1: +                                              int);
1:  
1: -typedef void (*btf_trace_ext4_fc_replay)(void *, struct super_block *, int, int, int, int);
1: +typedef void (*btf_trace_ext4_fc_replay)(void *, struct super_block *, int, int,
1: +                                         int, int);
1:  
1:  typedef void (*btf_trace_ext4_fc_commit_start)(void *, struct super_block *);
1:  
1: -typedef void (*btf_trace_ext4_fc_commit_stop)(void *, struct super_block *, int, int);
1: +typedef void (*btf_trace_ext4_fc_commit_stop)(void *, struct super_block *, int,
1: +                                              int);
1:  
1:  typedef void (*btf_trace_ext4_fc_stats)(void *, struct super_block *);
1:  
1: -typedef void (*btf_trace_ext4_fc_track_create)(void *, struct inode *, struct dentry *, int);
1: +typedef void (*btf_trace_ext4_fc_track_create)(void *, struct inode *,
1: +                                               struct dentry *, int);
1:  
1: -typedef void (*btf_trace_ext4_fc_track_link)(void *, struct inode *, struct dentry *, int);
1: +typedef void (*btf_trace_ext4_fc_track_link)(void *, struct inode *,
1: +                                             struct dentry *, int);
1:  
1: -typedef void (*btf_trace_ext4_fc_track_unlink)(void *, struct inode *, struct dentry *, int);
1: +typedef void (*btf_trace_ext4_fc_track_unlink)(void *, struct inode *,
1: +                                               struct dentry *, int);
1:  
1:  typedef void (*btf_trace_ext4_fc_track_inode)(void *, struct inode *, int);
1:  
1: -typedef void (*btf_trace_ext4_fc_track_range)(void *, struct inode *, long int, long int, int);
1: -
1: -enum {
1: -	Opt_bsd_df = 0,
1: -	Opt_minix_df = 1,
1: -	Opt_grpid = 2,
1: -	Opt_nogrpid = 3,
1: -	Opt_resgid = 4,
1: -	Opt_resuid = 5,
1: -	Opt_sb = 6,
1: -	Opt_err_cont = 7,
1: -	Opt_err_panic = 8,
1: -	Opt_err_ro = 9,
1: -	Opt_nouid32 = 10,
1: -	Opt_debug = 11,
1: -	Opt_removed = 12,
1: -	Opt_user_xattr = 13,
1: -	Opt_nouser_xattr = 14,
1: -	Opt_acl = 15,
1: -	Opt_noacl = 16,
1: -	Opt_auto_da_alloc = 17,
1: -	Opt_noauto_da_alloc = 18,
1: -	Opt_noload = 19,
1: -	Opt_commit = 20,
1: -	Opt_min_batch_time = 21,
1: -	Opt_max_batch_time = 22,
1: -	Opt_journal_dev = 23,
1: -	Opt_journal_path = 24,
1: -	Opt_journal_checksum = 25,
1: -	Opt_journal_async_commit = 26,
1: -	Opt_abort = 27,
1: -	Opt_data_journal = 28,
1: -	Opt_data_ordered = 29,
1: -	Opt_data_writeback = 30,
1: -	Opt_data_err_abort = 31,
1: -	Opt_data_err_ignore = 32,
1: -	Opt_test_dummy_encryption = 33,
1: -	Opt_inlinecrypt = 34,
1: -	Opt_usrjquota = 35,
1: -	Opt_grpjquota = 36,
1: -	Opt_offusrjquota = 37,
1: -	Opt_offgrpjquota = 38,
1: -	Opt_jqfmt_vfsold = 39,
1: -	Opt_jqfmt_vfsv0 = 40,
1: -	Opt_jqfmt_vfsv1 = 41,
1: -	Opt_quota = 42,
1: -	Opt_noquota = 43,
1: -	Opt_barrier = 44,
1: -	Opt_nobarrier = 45,
1: -	Opt_err___2 = 46,
1: -	Opt_usrquota = 47,
1: -	Opt_grpquota = 48,
1: -	Opt_prjquota = 49,
1: -	Opt_i_version = 50,
1: -	Opt_dax = 51,
1: -	Opt_dax_always = 52,
1: -	Opt_dax_inode = 53,
1: -	Opt_dax_never = 54,
1: -	Opt_stripe = 55,
1: -	Opt_delalloc = 56,
1: -	Opt_nodelalloc = 57,
1: -	Opt_warn_on_error = 58,
1: -	Opt_nowarn_on_error = 59,
1: -	Opt_mblk_io_submit = 60,
1: -	Opt_lazytime = 61,
1: -	Opt_nolazytime = 62,
1: -	Opt_debug_want_extra_isize = 63,
1: -	Opt_nomblk_io_submit = 64,
1: -	Opt_block_validity = 65,
1: -	Opt_noblock_validity = 66,
1: -	Opt_inode_readahead_blks = 67,
1: -	Opt_journal_ioprio = 68,
1: -	Opt_dioread_nolock = 69,
1: -	Opt_dioread_lock = 70,
1: -	Opt_discard = 71,
1: -	Opt_nodiscard = 72,
1: -	Opt_init_itable = 73,
1: -	Opt_noinit_itable = 74,
1: -	Opt_max_dir_size_kb = 75,
1: -	Opt_nojournal_checksum = 76,
1: -	Opt_nombcache = 77,
1: -	Opt_prefetch_block_bitmaps = 78,
1: +typedef void (*btf_trace_ext4_fc_track_range)(void *, struct inode *, long int,
1: +                                              long int, int);
1: +
1: +enum {
1: +  Opt_bsd_df = 0,
1: +  Opt_minix_df = 1,
1: +  Opt_grpid = 2,
1: +  Opt_nogrpid = 3,
1: +  Opt_resgid = 4,
1: +  Opt_resuid = 5,
1: +  Opt_sb = 6,
1: +  Opt_err_cont = 7,
1: +  Opt_err_panic = 8,
1: +  Opt_err_ro = 9,
1: +  Opt_nouid32 = 10,
1: +  Opt_debug = 11,
1: +  Opt_removed = 12,
1: +  Opt_user_xattr = 13,
1: +  Opt_nouser_xattr = 14,
1: +  Opt_acl = 15,
1: +  Opt_noacl = 16,
1: +  Opt_auto_da_alloc = 17,
1: +  Opt_noauto_da_alloc = 18,
1: +  Opt_noload = 19,
1: +  Opt_commit = 20,
1: +  Opt_min_batch_time = 21,
1: +  Opt_max_batch_time = 22,
1: +  Opt_journal_dev = 23,
1: +  Opt_journal_path = 24,
1: +  Opt_journal_checksum = 25,
1: +  Opt_journal_async_commit = 26,
1: +  Opt_abort = 27,
1: +  Opt_data_journal = 28,
1: +  Opt_data_ordered = 29,
1: +  Opt_data_writeback = 30,
1: +  Opt_data_err_abort = 31,
1: +  Opt_data_err_ignore = 32,
1: +  Opt_test_dummy_encryption = 33,
1: +  Opt_inlinecrypt = 34,
1: +  Opt_usrjquota = 35,
1: +  Opt_grpjquota = 36,
1: +  Opt_offusrjquota = 37,
1: +  Opt_offgrpjquota = 38,
1: +  Opt_jqfmt_vfsold = 39,
1: +  Opt_jqfmt_vfsv0 = 40,
1: +  Opt_jqfmt_vfsv1 = 41,
1: +  Opt_quota = 42,
1: +  Opt_noquota = 43,
1: +  Opt_barrier = 44,
1: +  Opt_nobarrier = 45,
1: +  Opt_err___2 = 46,
1: +  Opt_usrquota = 47,
1: +  Opt_grpquota = 48,
1: +  Opt_prjquota = 49,
1: +  Opt_i_version = 50,
1: +  Opt_dax = 51,
1: +  Opt_dax_always = 52,
1: +  Opt_dax_inode = 53,
1: +  Opt_dax_never = 54,
1: +  Opt_stripe = 55,
1: +  Opt_delalloc = 56,
1: +  Opt_nodelalloc = 57,
1: +  Opt_warn_on_error = 58,
1: +  Opt_nowarn_on_error = 59,
1: +  Opt_mblk_io_submit = 60,
1: +  Opt_lazytime = 61,
1: +  Opt_nolazytime = 62,
1: +  Opt_debug_want_extra_isize = 63,
1: +  Opt_nomblk_io_submit = 64,
1: +  Opt_block_validity = 65,
1: +  Opt_noblock_validity = 66,
1: +  Opt_inode_readahead_blks = 67,
1: +  Opt_journal_ioprio = 68,
1: +  Opt_dioread_nolock = 69,
1: +  Opt_dioread_lock = 70,
1: +  Opt_discard = 71,
1: +  Opt_nodiscard = 72,
1: +  Opt_init_itable = 73,
1: +  Opt_noinit_itable = 74,
1: +  Opt_max_dir_size_kb = 75,
1: +  Opt_nojournal_checksum = 76,
1: +  Opt_nombcache = 77,
1: +  Opt_prefetch_block_bitmaps = 78,
1:  };
1:  
1:  struct mount_opts {
1: -	int token;
1: -	int mount_opt;
1: -	int flags;
1: +  int token;
1: +  int mount_opt;
1: +  int flags;
1:  };
1:  
1:  struct ext4_mount_options {
1: -	long unsigned int s_mount_opt;
1: -	long unsigned int s_mount_opt2;
1: -	kuid_t s_resuid;
1: -	kgid_t s_resgid;
1: -	long unsigned int s_commit_interval;
1: -	u32 s_min_batch_time;
1: -	u32 s_max_batch_time;
1: -	int s_jquota_fmt;
1: -	char *s_qf_names[3];
1: -};
1: -
1: -enum {
1: -	attr_noop = 0,
1: -	attr_delayed_allocation_blocks = 1,
1: -	attr_session_write_kbytes = 2,
1: -	attr_lifetime_write_kbytes = 3,
1: -	attr_reserved_clusters = 4,
1: -	attr_inode_readahead = 5,
1: -	attr_trigger_test_error = 6,
1: -	attr_first_error_time = 7,
1: -	attr_last_error_time = 8,
1: -	attr_feature = 9,
1: -	attr_pointer_ui = 10,
1: -	attr_pointer_ul = 11,
1: -	attr_pointer_u64 = 12,
1: -	attr_pointer_u8 = 13,
1: -	attr_pointer_string = 14,
1: -	attr_pointer_atomic = 15,
1: -	attr_journal_task = 16,
1: -};
1: -
1: -enum {
1: -	ptr_explicit = 0,
1: -	ptr_ext4_sb_info_offset = 1,
1: -	ptr_ext4_super_block_offset = 2,
1: +  long unsigned int s_mount_opt;
1: +  long unsigned int s_mount_opt2;
1: +  kuid_t s_resuid;
1: +  kgid_t s_resgid;
1: +  long unsigned int s_commit_interval;
1: +  u32 s_min_batch_time;
1: +  u32 s_max_batch_time;
1: +  int s_jquota_fmt;
1: +  char *s_qf_names[3];
1: +};
1: +
1: +enum {
1: +  attr_noop = 0,
1: +  attr_delayed_allocation_blocks = 1,
1: +  attr_session_write_kbytes = 2,
1: +  attr_lifetime_write_kbytes = 3,
1: +  attr_reserved_clusters = 4,
1: +  attr_inode_readahead = 5,
1: +  attr_trigger_test_error = 6,
1: +  attr_first_error_time = 7,
1: +  attr_last_error_time = 8,
1: +  attr_feature = 9,
1: +  attr_pointer_ui = 10,
1: +  attr_pointer_ul = 11,
1: +  attr_pointer_u64 = 12,
1: +  attr_pointer_u8 = 13,
1: +  attr_pointer_string = 14,
1: +  attr_pointer_atomic = 15,
1: +  attr_journal_task = 16,
1: +};
1: +
1: +enum {
1: +  ptr_explicit = 0,
1: +  ptr_ext4_sb_info_offset = 1,
1: +  ptr_ext4_super_block_offset = 2,
1:  };
1:  
1:  struct ext4_attr {
1: -	struct attribute attr;
1: -	short int attr_id;
1: -	short int attr_ptr;
1: -	short unsigned int attr_size;
1: -	union {
1: -		int offset;
1: -		void *explicit_ptr;
1: -	} u;
1: +  struct attribute attr;
1: +  short int attr_id;
1: +  short int attr_ptr;
1: +  short unsigned int attr_size;
1: +  union {
1: +    int offset;
1: +    void *explicit_ptr;
1: +  } u;
1:  };
1:  
1:  struct ext4_xattr_header {
1: -	__le32 h_magic;
1: -	__le32 h_refcount;
1: -	__le32 h_blocks;
1: -	__le32 h_hash;
1: -	__le32 h_checksum;
1: -	__u32 h_reserved[3];
1: +  __le32 h_magic;
1: +  __le32 h_refcount;
1: +  __le32 h_blocks;
1: +  __le32 h_hash;
1: +  __le32 h_checksum;
1: +  __u32 h_reserved[3];
1:  };
1:  
1:  struct ext4_xattr_block_find {
1: -	struct ext4_xattr_search s;
1: -	struct buffer_head *bh;
1: +  struct ext4_xattr_search s;
1: +  struct buffer_head *bh;
1:  };
1:  
1:  struct ext4_fc_tl {
1: -	__le16 fc_tag;
1: -	__le16 fc_len;
1: +  __le16 fc_tag;
1: +  __le16 fc_len;
1:  };
1:  
1:  struct ext4_fc_head {
1: -	__le32 fc_features;
1: -	__le32 fc_tid;
1: +  __le32 fc_features;
1: +  __le32 fc_tid;
1:  };
1:  
1:  struct ext4_fc_add_range {
1: -	__le32 fc_ino;
1: -	__u8 fc_ex[12];
1: +  __le32 fc_ino;
1: +  __u8 fc_ex[12];
1:  };
1:  
1:  struct ext4_fc_del_range {
1: -	__le32 fc_ino;
1: -	__le32 fc_lblk;
1: -	__le32 fc_len;
1: +  __le32 fc_ino;
1: +  __le32 fc_lblk;
1: +  __le32 fc_len;
1:  };
1:  
1:  struct ext4_fc_dentry_info {
1: -	__le32 fc_parent_ino;
1: -	__le32 fc_ino;
1: -	u8 fc_dname[0];
1: +  __le32 fc_parent_ino;
1: +  __le32 fc_ino;
1: +  u8 fc_dname[0];
1:  };
1:  
1:  struct ext4_fc_inode {
1: -	__le32 fc_ino;
1: -	__u8 fc_raw_inode[0];
1: +  __le32 fc_ino;
1: +  __u8 fc_raw_inode[0];
1:  };
1:  
1:  struct ext4_fc_tail {
1: -	__le32 fc_tid;
1: -	__le32 fc_crc;
1: +  __le32 fc_tid;
1: +  __le32 fc_crc;
1:  };
1:  
1:  struct ext4_fc_dentry_update {
1: -	int fcd_op;
1: -	int fcd_parent;
1: -	int fcd_ino;
1: -	struct qstr fcd_name;
1: -	unsigned char fcd_iname[32];
1: -	struct list_head fcd_list;
1: +  int fcd_op;
1: +  int fcd_parent;
1: +  int fcd_ino;
1: +  struct qstr fcd_name;
1: +  unsigned char fcd_iname[32];
1: +  struct list_head fcd_list;
1:  };
1:  
1:  struct __track_dentry_update_args {
1: -	struct dentry *dentry;
1: -	int op;
1: +  struct dentry *dentry;
1: +  int op;
1:  };
1:  
1:  struct __track_range_args {
1: -	ext4_lblk_t start;
1: -	ext4_lblk_t end;
1: +  ext4_lblk_t start;
1: +  ext4_lblk_t end;
1:  };
1:  
1:  struct dentry_info_args {
1: -	int parent_ino;
1: -	int dname_len;
1: -	int ino;
1: -	int inode_len;
1: -	char *dname;
1: +  int parent_ino;
1: +  int dname_len;
1: +  int ino;
1: +  int inode_len;
1: +  char *dname;
1:  };
1:  
1:  typedef struct {
1: -	__le16 e_tag;
1: -	__le16 e_perm;
1: -	__le32 e_id;
1: +  __le16 e_tag;
1: +  __le16 e_perm;
1: +  __le32 e_id;
1:  } ext4_acl_entry;
1:  
1: -typedef struct {
1: -	__le32 a_version;
1: -} ext4_acl_header;
1: +typedef struct { __le32 a_version; } ext4_acl_header;
1:  
1:  struct commit_header {
1: -	__be32 h_magic;
1: -	__be32 h_blocktype;
1: -	__be32 h_sequence;
1: -	unsigned char h_chksum_type;
1: -	unsigned char h_chksum_size;
1: -	unsigned char h_padding[2];
1: -	__be32 h_chksum[8];
1: -	__be64 h_commit_sec;
1: -	__be32 h_commit_nsec;
1: +  __be32 h_magic;
1: +  __be32 h_blocktype;
1: +  __be32 h_sequence;
1: +  unsigned char h_chksum_type;
1: +  unsigned char h_chksum_size;
1: +  unsigned char h_padding[2];
1: +  __be32 h_chksum[8];
1: +  __be64 h_commit_sec;
1: +  __be32 h_commit_nsec;
1:  };
1:  
1:  struct journal_block_tag3_s {
1: -	__be32 t_blocknr;
1: -	__be32 t_flags;
1: -	__be32 t_blocknr_high;
1: -	__be32 t_checksum;
1: +  __be32 t_blocknr;
1: +  __be32 t_flags;
1: +  __be32 t_blocknr_high;
1: +  __be32 t_checksum;
1:  };
1:  
1:  typedef struct journal_block_tag3_s journal_block_tag3_t;
1:  
1:  struct journal_block_tag_s {
1: -	__be32 t_blocknr;
1: -	__be16 t_checksum;
1: -	__be16 t_flags;
1: -	__be32 t_blocknr_high;
1: +  __be32 t_blocknr;
1: +  __be16 t_checksum;
1: +  __be16 t_flags;
1: +  __be32 t_blocknr_high;
1:  };
1:  
1:  typedef struct journal_block_tag_s journal_block_tag_t;
1:  
1:  struct jbd2_journal_block_tail {
1: -	__be32 t_checksum;
1: +  __be32 t_checksum;
1:  };
1:  
1:  struct jbd2_journal_revoke_header_s {
1: -	journal_header_t r_header;
1: -	__be32 r_count;
1: +  journal_header_t r_header;
1: +  __be32 r_count;
1:  };
1:  
1:  typedef struct jbd2_journal_revoke_header_s jbd2_journal_revoke_header_t;
1:  
1:  struct recovery_info {
1: -	tid_t start_transaction;
1: -	tid_t end_transaction;
1: -	int nr_replays;
1: -	int nr_revokes;
1: -	int nr_revoke_hits;
1: +  tid_t start_transaction;
1: +  tid_t end_transaction;
1: +  int nr_replays;
1: +  int nr_revokes;
1: +  int nr_revoke_hits;
1:  };
1:  
1:  struct jbd2_revoke_table_s {
1: -	int hash_size;
1: -	int hash_shift;
1: -	struct list_head *hash_table;
1: +  int hash_size;
1: +  int hash_shift;
1: +  struct list_head *hash_table;
1:  };
1:  
1:  struct jbd2_revoke_record_s {
1: -	struct list_head hash;
1: -	tid_t sequence;
1: -	long long unsigned int blocknr;
1: +  struct list_head hash;
1: +  tid_t sequence;
1: +  long long unsigned int blocknr;
1:  };
1:  
1:  struct trace_event_raw_jbd2_checkpoint {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int result;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int result;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_commit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	char sync_commit;
1: -	int transaction;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  char sync_commit;
1: +  int transaction;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_end_commit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	char sync_commit;
1: -	int transaction;
1: -	int head;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  char sync_commit;
1: +  int transaction;
1: +  int head;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_submit_inode_data {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	ino_t ino;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  ino_t ino;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_handle_start_class {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int tid;
1: -	unsigned int type;
1: -	unsigned int line_no;
1: -	int requested_blocks;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int tid;
1: +  unsigned int type;
1: +  unsigned int line_no;
1: +  int requested_blocks;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_handle_extend {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int tid;
1: -	unsigned int type;
1: -	unsigned int line_no;
1: -	int buffer_credits;
1: -	int requested_blocks;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int tid;
1: +  unsigned int type;
1: +  unsigned int line_no;
1: +  int buffer_credits;
1: +  int requested_blocks;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_handle_stats {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int tid;
1: -	unsigned int type;
1: -	unsigned int line_no;
1: -	int interval;
1: -	int sync;
1: -	int requested_blocks;
1: -	int dirtied_blocks;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int tid;
1: +  unsigned int type;
1: +  unsigned int line_no;
1: +  int interval;
1: +  int sync;
1: +  int requested_blocks;
1: +  int dirtied_blocks;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_run_stats {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int tid;
1: -	long unsigned int wait;
1: -	long unsigned int request_delay;
1: -	long unsigned int running;
1: -	long unsigned int locked;
1: -	long unsigned int flushing;
1: -	long unsigned int logging;
1: -	__u32 handle_count;
1: -	__u32 blocks;
1: -	__u32 blocks_logged;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int tid;
1: +  long unsigned int wait;
1: +  long unsigned int request_delay;
1: +  long unsigned int running;
1: +  long unsigned int locked;
1: +  long unsigned int flushing;
1: +  long unsigned int logging;
1: +  __u32 handle_count;
1: +  __u32 blocks;
1: +  __u32 blocks_logged;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_checkpoint_stats {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int tid;
1: -	long unsigned int chp_time;
1: -	__u32 forced_to_close;
1: -	__u32 written;
1: -	__u32 dropped;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int tid;
1: +  long unsigned int chp_time;
1: +  __u32 forced_to_close;
1: +  __u32 written;
1: +  __u32 dropped;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_update_log_tail {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	tid_t tail_sequence;
1: -	tid_t first_tid;
1: -	long unsigned int block_nr;
1: -	long unsigned int freed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  tid_t tail_sequence;
1: +  tid_t first_tid;
1: +  long unsigned int block_nr;
1: +  long unsigned int freed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_write_superblock {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int write_op;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int write_op;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_jbd2_lock_buffer_stall {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int stall_ms;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int stall_ms;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_jbd2_checkpoint {};
1: @@ -49011,541 +49683,558 @@ struct trace_event_data_offsets_jbd2_lock_buffer_stall {};
1:  
1:  typedef void (*btf_trace_jbd2_checkpoint)(void *, journal_t *, int);
1:  
1: -typedef void (*btf_trace_jbd2_start_commit)(void *, journal_t *, transaction_t *);
1: +typedef void (*btf_trace_jbd2_start_commit)(void *, journal_t *,
1: +                                            transaction_t *);
1:  
1: -typedef void (*btf_trace_jbd2_commit_locking)(void *, journal_t *, transaction_t *);
1: +typedef void (*btf_trace_jbd2_commit_locking)(void *, journal_t *,
1: +                                              transaction_t *);
1:  
1: -typedef void (*btf_trace_jbd2_commit_flushing)(void *, journal_t *, transaction_t *);
1: +typedef void (*btf_trace_jbd2_commit_flushing)(void *, journal_t *,
1: +                                               transaction_t *);
1:  
1: -typedef void (*btf_trace_jbd2_commit_logging)(void *, journal_t *, transaction_t *);
1: +typedef void (*btf_trace_jbd2_commit_logging)(void *, journal_t *,
1: +                                              transaction_t *);
1:  
1: -typedef void (*btf_trace_jbd2_drop_transaction)(void *, journal_t *, transaction_t *);
1: +typedef void (*btf_trace_jbd2_drop_transaction)(void *, journal_t *,
1: +                                                transaction_t *);
1:  
1:  typedef void (*btf_trace_jbd2_end_commit)(void *, journal_t *, transaction_t *);
1:  
1:  typedef void (*btf_trace_jbd2_submit_inode_data)(void *, struct inode *);
1:  
1: -typedef void (*btf_trace_jbd2_handle_start)(void *, dev_t, long unsigned int, unsigned int, unsigned int, int);
1: +typedef void (*btf_trace_jbd2_handle_start)(void *, dev_t, long unsigned int,
1: +                                            unsigned int, unsigned int, int);
1:  
1: -typedef void (*btf_trace_jbd2_handle_restart)(void *, dev_t, long unsigned int, unsigned int, unsigned int, int);
1: +typedef void (*btf_trace_jbd2_handle_restart)(void *, dev_t, long unsigned int,
1: +                                              unsigned int, unsigned int, int);
1:  
1: -typedef void (*btf_trace_jbd2_handle_extend)(void *, dev_t, long unsigned int, unsigned int, unsigned int, int, int);
1: +typedef void (*btf_trace_jbd2_handle_extend)(void *, dev_t, long unsigned int,
1: +                                             unsigned int, unsigned int, int,
1: +                                             int);
1:  
1: -typedef void (*btf_trace_jbd2_handle_stats)(void *, dev_t, long unsigned int, unsigned int, unsigned int, int, int, int, int);
1: +typedef void (*btf_trace_jbd2_handle_stats)(void *, dev_t, long unsigned int,
1: +                                            unsigned int, unsigned int, int,
1: +                                            int, int, int);
1:  
1: -typedef void (*btf_trace_jbd2_run_stats)(void *, dev_t, long unsigned int, struct transaction_run_stats_s *);
1: +typedef void (*btf_trace_jbd2_run_stats)(void *, dev_t, long unsigned int,
1: +                                         struct transaction_run_stats_s *);
1:  
1: -typedef void (*btf_trace_jbd2_checkpoint_stats)(void *, dev_t, long unsigned int, struct transaction_chp_stats_s *);
1: +typedef void (*btf_trace_jbd2_checkpoint_stats)(
1: +    void *, dev_t, long unsigned int, struct transaction_chp_stats_s *);
1:  
1: -typedef void (*btf_trace_jbd2_update_log_tail)(void *, journal_t *, tid_t, long unsigned int, long unsigned int);
1: +typedef void (*btf_trace_jbd2_update_log_tail)(void *, journal_t *, tid_t,
1: +                                               long unsigned int,
1: +                                               long unsigned int);
1:  
1:  typedef void (*btf_trace_jbd2_write_superblock)(void *, journal_t *, int);
1:  
1: -typedef void (*btf_trace_jbd2_lock_buffer_stall)(void *, dev_t, long unsigned int);
1: +typedef void (*btf_trace_jbd2_lock_buffer_stall)(void *, dev_t,
1: +                                                 long unsigned int);
1:  
1:  struct jbd2_stats_proc_session {
1: -	journal_t *journal;
1: -	struct transaction_stats_s *stats;
1: -	int start;
1: -	int max;
1: +  journal_t *journal;
1: +  struct transaction_stats_s *stats;
1: +  int start;
1: +  int max;
1:  };
1:  
1:  struct ramfs_mount_opts {
1: -	umode_t mode;
1: +  umode_t mode;
1:  };
1:  
1:  struct ramfs_fs_info {
1: -	struct ramfs_mount_opts mount_opts;
1: +  struct ramfs_mount_opts mount_opts;
1:  };
1:  
1:  enum ramfs_param {
1: -	Opt_mode___3 = 0,
1: +  Opt_mode___3 = 0,
1:  };
1:  
1:  enum hugetlbfs_size_type {
1: -	NO_SIZE = 0,
1: -	SIZE_STD = 1,
1: -	SIZE_PERCENT = 2,
1: +  NO_SIZE = 0,
1: +  SIZE_STD = 1,
1: +  SIZE_PERCENT = 2,
1:  };
1:  
1:  struct hugetlbfs_fs_context {
1: -	struct hstate *hstate;
1: -	long long unsigned int max_size_opt;
1: -	long long unsigned int min_size_opt;
1: -	long int max_hpages;
1: -	long int nr_inodes;
1: -	long int min_hpages;
1: -	enum hugetlbfs_size_type max_val_type;
1: -	enum hugetlbfs_size_type min_val_type;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	umode_t mode;
1: +  struct hstate *hstate;
1: +  long long unsigned int max_size_opt;
1: +  long long unsigned int min_size_opt;
1: +  long int max_hpages;
1: +  long int nr_inodes;
1: +  long int min_hpages;
1: +  enum hugetlbfs_size_type max_val_type;
1: +  enum hugetlbfs_size_type min_val_type;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  umode_t mode;
1:  };
1:  
1:  enum hugetlb_param {
1: -	Opt_gid___4 = 0,
1: -	Opt_min_size = 1,
1: -	Opt_mode___4 = 2,
1: -	Opt_nr_inodes___2 = 3,
1: -	Opt_pagesize = 4,
1: -	Opt_size___2 = 5,
1: -	Opt_uid___3 = 6,
1: +  Opt_gid___4 = 0,
1: +  Opt_min_size = 1,
1: +  Opt_mode___4 = 2,
1: +  Opt_nr_inodes___2 = 3,
1: +  Opt_pagesize = 4,
1: +  Opt_size___2 = 5,
1: +  Opt_uid___3 = 6,
1:  };
1:  
1:  struct iso_directory_record {
1: -	__u8 length[1];
1: -	__u8 ext_attr_length[1];
1: -	__u8 extent[8];
1: -	__u8 size[8];
1: -	__u8 date[7];
1: -	__u8 flags[1];
1: -	__u8 file_unit_size[1];
1: -	__u8 interleave[1];
1: -	__u8 volume_sequence_number[4];
1: -	__u8 name_len[1];
1: -	char name[0];
1: +  __u8 length[1];
1: +  __u8 ext_attr_length[1];
1: +  __u8 extent[8];
1: +  __u8 size[8];
1: +  __u8 date[7];
1: +  __u8 flags[1];
1: +  __u8 file_unit_size[1];
1: +  __u8 interleave[1];
1: +  __u8 volume_sequence_number[4];
1: +  __u8 name_len[1];
1: +  char name[0];
1:  };
1:  
1:  struct iso_inode_info {
1: -	long unsigned int i_iget5_block;
1: -	long unsigned int i_iget5_offset;
1: -	unsigned int i_first_extent;
1: -	unsigned char i_file_format;
1: -	unsigned char i_format_parm[3];
1: -	long unsigned int i_next_section_block;
1: -	long unsigned int i_next_section_offset;
1: -	off_t i_section_size;
1: -	struct inode vfs_inode;
1: +  long unsigned int i_iget5_block;
1: +  long unsigned int i_iget5_offset;
1: +  unsigned int i_first_extent;
1: +  unsigned char i_file_format;
1: +  unsigned char i_format_parm[3];
1: +  long unsigned int i_next_section_block;
1: +  long unsigned int i_next_section_offset;
1: +  off_t i_section_size;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  struct nls_table;
1:  
1:  struct isofs_sb_info {
1: -	long unsigned int s_ninodes;
1: -	long unsigned int s_nzones;
1: -	long unsigned int s_firstdatazone;
1: -	long unsigned int s_log_zone_size;
1: -	long unsigned int s_max_size;
1: -	int s_rock_offset;
1: -	s32 s_sbsector;
1: -	unsigned char s_joliet_level;
1: -	unsigned char s_mapping;
1: -	unsigned char s_check;
1: -	unsigned char s_session;
1: -	unsigned int s_high_sierra: 1;
1: -	unsigned int s_rock: 2;
1: -	unsigned int s_utf8: 1;
1: -	unsigned int s_cruft: 1;
1: -	unsigned int s_nocompress: 1;
1: -	unsigned int s_hide: 1;
1: -	unsigned int s_showassoc: 1;
1: -	unsigned int s_overriderockperm: 1;
1: -	unsigned int s_uid_set: 1;
1: -	unsigned int s_gid_set: 1;
1: -	umode_t s_fmode;
1: -	umode_t s_dmode;
1: -	kgid_t s_gid;
1: -	kuid_t s_uid;
1: -	struct nls_table *s_nls_iocharset;
1: +  long unsigned int s_ninodes;
1: +  long unsigned int s_nzones;
1: +  long unsigned int s_firstdatazone;
1: +  long unsigned int s_log_zone_size;
1: +  long unsigned int s_max_size;
1: +  int s_rock_offset;
1: +  s32 s_sbsector;
1: +  unsigned char s_joliet_level;
1: +  unsigned char s_mapping;
1: +  unsigned char s_check;
1: +  unsigned char s_session;
1: +  unsigned int s_high_sierra : 1;
1: +  unsigned int s_rock : 2;
1: +  unsigned int s_utf8 : 1;
1: +  unsigned int s_cruft : 1;
1: +  unsigned int s_nocompress : 1;
1: +  unsigned int s_hide : 1;
1: +  unsigned int s_showassoc : 1;
1: +  unsigned int s_overriderockperm : 1;
1: +  unsigned int s_uid_set : 1;
1: +  unsigned int s_gid_set : 1;
1: +  umode_t s_fmode;
1: +  umode_t s_dmode;
1: +  kgid_t s_gid;
1: +  kuid_t s_uid;
1: +  struct nls_table *s_nls_iocharset;
1:  };
1:  
1:  typedef u16 wchar_t;
1:  
1:  struct nls_table {
1: -	const char *charset;
1: -	const char *alias;
1: -	int (*uni2char)(wchar_t, unsigned char *, int);
1: -	int (*char2uni)(const unsigned char *, int, wchar_t *);
1: -	const unsigned char *charset2lower;
1: -	const unsigned char *charset2upper;
1: -	struct module *owner;
1: -	struct nls_table *next;
1: +  const char *charset;
1: +  const char *alias;
1: +  int (*uni2char)(wchar_t, unsigned char *, int);
1: +  int (*char2uni)(const unsigned char *, int, wchar_t *);
1: +  const unsigned char *charset2lower;
1: +  const unsigned char *charset2upper;
1: +  struct module *owner;
1: +  struct nls_table *next;
1:  };
1:  
1:  struct scsi_sense_hdr {
1: -	u8 response_code;
1: -	u8 sense_key;
1: -	u8 asc;
1: -	u8 ascq;
1: -	u8 byte4;
1: -	u8 byte5;
1: -	u8 byte6;
1: -	u8 additional_length;
1: +  u8 response_code;
1: +  u8 sense_key;
1: +  u8 asc;
1: +  u8 ascq;
1: +  u8 byte4;
1: +  u8 byte5;
1: +  u8 byte6;
1: +  u8 additional_length;
1:  };
1:  
1:  struct cdrom_msf0 {
1: -	__u8 minute;
1: -	__u8 second;
1: -	__u8 frame;
1: +  __u8 minute;
1: +  __u8 second;
1: +  __u8 frame;
1:  };
1:  
1:  union cdrom_addr {
1: -	struct cdrom_msf0 msf;
1: -	int lba;
1: +  struct cdrom_msf0 msf;
1: +  int lba;
1:  };
1:  
1:  struct cdrom_tocentry {
1: -	__u8 cdte_track;
1: -	__u8 cdte_adr: 4;
1: -	__u8 cdte_ctrl: 4;
1: -	__u8 cdte_format;
1: -	union cdrom_addr cdte_addr;
1: -	__u8 cdte_datamode;
1: +  __u8 cdte_track;
1: +  __u8 cdte_adr : 4;
1: +  __u8 cdte_ctrl : 4;
1: +  __u8 cdte_format;
1: +  union cdrom_addr cdte_addr;
1: +  __u8 cdte_datamode;
1:  };
1:  
1:  struct cdrom_multisession {
1: -	union cdrom_addr addr;
1: -	__u8 xa_flag;
1: -	__u8 addr_format;
1: +  union cdrom_addr addr;
1: +  __u8 xa_flag;
1: +  __u8 addr_format;
1:  };
1:  
1:  struct cdrom_mcn {
1: -	__u8 medium_catalog_number[14];
1: +  __u8 medium_catalog_number[14];
1:  };
1:  
1:  struct packet_command {
1: -	unsigned char cmd[12];
1: -	unsigned char *buffer;
1: -	unsigned int buflen;
1: -	int stat;
1: -	struct scsi_sense_hdr *sshdr;
1: -	unsigned char data_direction;
1: -	int quiet;
1: -	int timeout;
1: -	void *reserved[1];
1: +  unsigned char cmd[12];
1: +  unsigned char *buffer;
1: +  unsigned int buflen;
1: +  int stat;
1: +  struct scsi_sense_hdr *sshdr;
1: +  unsigned char data_direction;
1: +  int quiet;
1: +  int timeout;
1: +  void *reserved[1];
1:  };
1:  
1:  struct cdrom_device_ops;
1:  
1:  struct cdrom_device_info {
1: -	const struct cdrom_device_ops *ops;
1: -	struct list_head list;
1: -	struct gendisk *disk;
1: -	void *handle;
1: -	int mask;
1: -	int speed;
1: -	int capacity;
1: -	unsigned int options: 30;
1: -	unsigned int mc_flags: 2;
1: -	unsigned int vfs_events;
1: -	unsigned int ioctl_events;
1: -	int use_count;
1: -	char name[20];
1: -	__u8 sanyo_slot: 2;
1: -	__u8 keeplocked: 1;
1: -	__u8 reserved: 5;
1: -	int cdda_method;
1: -	__u8 last_sense;
1: -	__u8 media_written;
1: -	short unsigned int mmc3_profile;
1: -	int for_data;
1: -	int (*exit)(struct cdrom_device_info *);
1: -	int mrw_mode_page;
1: +  const struct cdrom_device_ops *ops;
1: +  struct list_head list;
1: +  struct gendisk *disk;
1: +  void *handle;
1: +  int mask;
1: +  int speed;
1: +  int capacity;
1: +  unsigned int options : 30;
1: +  unsigned int mc_flags : 2;
1: +  unsigned int vfs_events;
1: +  unsigned int ioctl_events;
1: +  int use_count;
1: +  char name[20];
1: +  __u8 sanyo_slot : 2;
1: +  __u8 keeplocked : 1;
1: +  __u8 reserved : 5;
1: +  int cdda_method;
1: +  __u8 last_sense;
1: +  __u8 media_written;
1: +  short unsigned int mmc3_profile;
1: +  int for_data;
1: +  int (*exit)(struct cdrom_device_info *);
1: +  int mrw_mode_page;
1:  };
1:  
1:  struct cdrom_device_ops {
1: -	int (*open)(struct cdrom_device_info *, int);
1: -	void (*release)(struct cdrom_device_info *);
1: -	int (*drive_status)(struct cdrom_device_info *, int);
1: -	unsigned int (*check_events)(struct cdrom_device_info *, unsigned int, int);
1: -	int (*tray_move)(struct cdrom_device_info *, int);
1: -	int (*lock_door)(struct cdrom_device_info *, int);
1: -	int (*select_speed)(struct cdrom_device_info *, int);
1: -	int (*select_disc)(struct cdrom_device_info *, int);
1: -	int (*get_last_session)(struct cdrom_device_info *, struct cdrom_multisession *);
1: -	int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
1: -	int (*reset)(struct cdrom_device_info *);
1: -	int (*audio_ioctl)(struct cdrom_device_info *, unsigned int, void *);
1: -	const int capability;
1: -	int (*generic_packet)(struct cdrom_device_info *, struct packet_command *);
1: +  int (*open)(struct cdrom_device_info *, int);
1: +  void (*release)(struct cdrom_device_info *);
1: +  int (*drive_status)(struct cdrom_device_info *, int);
1: +  unsigned int (*check_events)(struct cdrom_device_info *, unsigned int, int);
1: +  int (*tray_move)(struct cdrom_device_info *, int);
1: +  int (*lock_door)(struct cdrom_device_info *, int);
1: +  int (*select_speed)(struct cdrom_device_info *, int);
1: +  int (*select_disc)(struct cdrom_device_info *, int);
1: +  int (*get_last_session)(struct cdrom_device_info *,
1: +                          struct cdrom_multisession *);
1: +  int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
1: +  int (*reset)(struct cdrom_device_info *);
1: +  int (*audio_ioctl)(struct cdrom_device_info *, unsigned int, void *);
1: +  const int capability;
1: +  int (*generic_packet)(struct cdrom_device_info *, struct packet_command *);
1:  };
1:  
1:  struct iso_volume_descriptor {
1: -	__u8 type[1];
1: -	char id[5];
1: -	__u8 version[1];
1: -	__u8 data[2041];
1: +  __u8 type[1];
1: +  char id[5];
1: +  __u8 version[1];
1: +  __u8 data[2041];
1:  };
1:  
1:  struct iso_primary_descriptor {
1: -	__u8 type[1];
1: -	char id[5];
1: -	__u8 version[1];
1: -	__u8 unused1[1];
1: -	char system_id[32];
1: -	char volume_id[32];
1: -	__u8 unused2[8];
1: -	__u8 volume_space_size[8];
1: -	__u8 unused3[32];
1: -	__u8 volume_set_size[4];
1: -	__u8 volume_sequence_number[4];
1: -	__u8 logical_block_size[4];
1: -	__u8 path_table_size[8];
1: -	__u8 type_l_path_table[4];
1: -	__u8 opt_type_l_path_table[4];
1: -	__u8 type_m_path_table[4];
1: -	__u8 opt_type_m_path_table[4];
1: -	__u8 root_directory_record[34];
1: -	char volume_set_id[128];
1: -	char publisher_id[128];
1: -	char preparer_id[128];
1: -	char application_id[128];
1: -	char copyright_file_id[37];
1: -	char abstract_file_id[37];
1: -	char bibliographic_file_id[37];
1: -	__u8 creation_date[17];
1: -	__u8 modification_date[17];
1: -	__u8 expiration_date[17];
1: -	__u8 effective_date[17];
1: -	__u8 file_structure_version[1];
1: -	__u8 unused4[1];
1: -	__u8 application_data[512];
1: -	__u8 unused5[653];
1: +  __u8 type[1];
1: +  char id[5];
1: +  __u8 version[1];
1: +  __u8 unused1[1];
1: +  char system_id[32];
1: +  char volume_id[32];
1: +  __u8 unused2[8];
1: +  __u8 volume_space_size[8];
1: +  __u8 unused3[32];
1: +  __u8 volume_set_size[4];
1: +  __u8 volume_sequence_number[4];
1: +  __u8 logical_block_size[4];
1: +  __u8 path_table_size[8];
1: +  __u8 type_l_path_table[4];
1: +  __u8 opt_type_l_path_table[4];
1: +  __u8 type_m_path_table[4];
1: +  __u8 opt_type_m_path_table[4];
1: +  __u8 root_directory_record[34];
1: +  char volume_set_id[128];
1: +  char publisher_id[128];
1: +  char preparer_id[128];
1: +  char application_id[128];
1: +  char copyright_file_id[37];
1: +  char abstract_file_id[37];
1: +  char bibliographic_file_id[37];
1: +  __u8 creation_date[17];
1: +  __u8 modification_date[17];
1: +  __u8 expiration_date[17];
1: +  __u8 effective_date[17];
1: +  __u8 file_structure_version[1];
1: +  __u8 unused4[1];
1: +  __u8 application_data[512];
1: +  __u8 unused5[653];
1:  };
1:  
1:  struct iso_supplementary_descriptor {
1: -	__u8 type[1];
1: -	char id[5];
1: -	__u8 version[1];
1: -	__u8 flags[1];
1: -	char system_id[32];
1: -	char volume_id[32];
1: -	__u8 unused2[8];
1: -	__u8 volume_space_size[8];
1: -	__u8 escape[32];
1: -	__u8 volume_set_size[4];
1: -	__u8 volume_sequence_number[4];
1: -	__u8 logical_block_size[4];
1: -	__u8 path_table_size[8];
1: -	__u8 type_l_path_table[4];
1: -	__u8 opt_type_l_path_table[4];
1: -	__u8 type_m_path_table[4];
1: -	__u8 opt_type_m_path_table[4];
1: -	__u8 root_directory_record[34];
1: -	char volume_set_id[128];
1: -	char publisher_id[128];
1: -	char preparer_id[128];
1: -	char application_id[128];
1: -	char copyright_file_id[37];
1: -	char abstract_file_id[37];
1: -	char bibliographic_file_id[37];
1: -	__u8 creation_date[17];
1: -	__u8 modification_date[17];
1: -	__u8 expiration_date[17];
1: -	__u8 effective_date[17];
1: -	__u8 file_structure_version[1];
1: -	__u8 unused4[1];
1: -	__u8 application_data[512];
1: -	__u8 unused5[653];
1: +  __u8 type[1];
1: +  char id[5];
1: +  __u8 version[1];
1: +  __u8 flags[1];
1: +  char system_id[32];
1: +  char volume_id[32];
1: +  __u8 unused2[8];
1: +  __u8 volume_space_size[8];
1: +  __u8 escape[32];
1: +  __u8 volume_set_size[4];
1: +  __u8 volume_sequence_number[4];
1: +  __u8 logical_block_size[4];
1: +  __u8 path_table_size[8];
1: +  __u8 type_l_path_table[4];
1: +  __u8 opt_type_l_path_table[4];
1: +  __u8 type_m_path_table[4];
1: +  __u8 opt_type_m_path_table[4];
1: +  __u8 root_directory_record[34];
1: +  char volume_set_id[128];
1: +  char publisher_id[128];
1: +  char preparer_id[128];
1: +  char application_id[128];
1: +  char copyright_file_id[37];
1: +  char abstract_file_id[37];
1: +  char bibliographic_file_id[37];
1: +  __u8 creation_date[17];
1: +  __u8 modification_date[17];
1: +  __u8 expiration_date[17];
1: +  __u8 effective_date[17];
1: +  __u8 file_structure_version[1];
1: +  __u8 unused4[1];
1: +  __u8 application_data[512];
1: +  __u8 unused5[653];
1:  };
1:  
1:  struct hs_volume_descriptor {
1: -	__u8 foo[8];
1: -	__u8 type[1];
1: -	char id[5];
1: -	__u8 version[1];
1: -	__u8 data[2033];
1: +  __u8 foo[8];
1: +  __u8 type[1];
1: +  char id[5];
1: +  __u8 version[1];
1: +  __u8 data[2033];
1:  };
1:  
1:  struct hs_primary_descriptor {
1: -	__u8 foo[8];
1: -	__u8 type[1];
1: -	__u8 id[5];
1: -	__u8 version[1];
1: -	__u8 unused1[1];
1: -	char system_id[32];
1: -	char volume_id[32];
1: -	__u8 unused2[8];
1: -	__u8 volume_space_size[8];
1: -	__u8 unused3[32];
1: -	__u8 volume_set_size[4];
1: -	__u8 volume_sequence_number[4];
1: -	__u8 logical_block_size[4];
1: -	__u8 path_table_size[8];
1: -	__u8 type_l_path_table[4];
1: -	__u8 unused4[28];
1: -	__u8 root_directory_record[34];
1: +  __u8 foo[8];
1: +  __u8 type[1];
1: +  __u8 id[5];
1: +  __u8 version[1];
1: +  __u8 unused1[1];
1: +  char system_id[32];
1: +  char volume_id[32];
1: +  __u8 unused2[8];
1: +  __u8 volume_space_size[8];
1: +  __u8 unused3[32];
1: +  __u8 volume_set_size[4];
1: +  __u8 volume_sequence_number[4];
1: +  __u8 logical_block_size[4];
1: +  __u8 path_table_size[8];
1: +  __u8 type_l_path_table[4];
1: +  __u8 unused4[28];
1: +  __u8 root_directory_record[34];
1:  };
1:  
1:  enum isofs_file_format {
1: -	isofs_file_normal = 0,
1: -	isofs_file_sparse = 1,
1: -	isofs_file_compressed = 2,
1: +  isofs_file_normal = 0,
1: +  isofs_file_sparse = 1,
1: +  isofs_file_compressed = 2,
1:  };
1:  
1:  struct iso9660_options {
1: -	unsigned int rock: 1;
1: -	unsigned int joliet: 1;
1: -	unsigned int cruft: 1;
1: -	unsigned int hide: 1;
1: -	unsigned int showassoc: 1;
1: -	unsigned int nocompress: 1;
1: -	unsigned int overriderockperm: 1;
1: -	unsigned int uid_set: 1;
1: -	unsigned int gid_set: 1;
1: -	unsigned int utf8: 1;
1: -	unsigned char map;
1: -	unsigned char check;
1: -	unsigned int blocksize;
1: -	umode_t fmode;
1: -	umode_t dmode;
1: -	kgid_t gid;
1: -	kuid_t uid;
1: -	char *iocharset;
1: -	s32 session;
1: -	s32 sbsector;
1: -};
1: -
1: -enum {
1: -	Opt_block = 0,
1: -	Opt_check_r = 1,
1: -	Opt_check_s = 2,
1: -	Opt_cruft = 3,
1: -	Opt_gid___5 = 4,
1: -	Opt_ignore = 5,
1: -	Opt_iocharset = 6,
1: -	Opt_map_a = 7,
1: -	Opt_map_n = 8,
1: -	Opt_map_o = 9,
1: -	Opt_mode___5 = 10,
1: -	Opt_nojoliet = 11,
1: -	Opt_norock = 12,
1: -	Opt_sb___2 = 13,
1: -	Opt_session = 14,
1: -	Opt_uid___4 = 15,
1: -	Opt_unhide = 16,
1: -	Opt_utf8 = 17,
1: -	Opt_err___3 = 18,
1: -	Opt_nocompress = 19,
1: -	Opt_hide = 20,
1: -	Opt_showassoc = 21,
1: -	Opt_dmode = 22,
1: -	Opt_overriderockperm = 23,
1: +  unsigned int rock : 1;
1: +  unsigned int joliet : 1;
1: +  unsigned int cruft : 1;
1: +  unsigned int hide : 1;
1: +  unsigned int showassoc : 1;
1: +  unsigned int nocompress : 1;
1: +  unsigned int overriderockperm : 1;
1: +  unsigned int uid_set : 1;
1: +  unsigned int gid_set : 1;
1: +  unsigned int utf8 : 1;
1: +  unsigned char map;
1: +  unsigned char check;
1: +  unsigned int blocksize;
1: +  umode_t fmode;
1: +  umode_t dmode;
1: +  kgid_t gid;
1: +  kuid_t uid;
1: +  char *iocharset;
1: +  s32 session;
1: +  s32 sbsector;
1: +};
1: +
1: +enum {
1: +  Opt_block = 0,
1: +  Opt_check_r = 1,
1: +  Opt_check_s = 2,
1: +  Opt_cruft = 3,
1: +  Opt_gid___5 = 4,
1: +  Opt_ignore = 5,
1: +  Opt_iocharset = 6,
1: +  Opt_map_a = 7,
1: +  Opt_map_n = 8,
1: +  Opt_map_o = 9,
1: +  Opt_mode___5 = 10,
1: +  Opt_nojoliet = 11,
1: +  Opt_norock = 12,
1: +  Opt_sb___2 = 13,
1: +  Opt_session = 14,
1: +  Opt_uid___4 = 15,
1: +  Opt_unhide = 16,
1: +  Opt_utf8 = 17,
1: +  Opt_err___3 = 18,
1: +  Opt_nocompress = 19,
1: +  Opt_hide = 20,
1: +  Opt_showassoc = 21,
1: +  Opt_dmode = 22,
1: +  Opt_overriderockperm = 23,
1:  };
1:  
1:  struct isofs_iget5_callback_data {
1: -	long unsigned int block;
1: -	long unsigned int offset;
1: +  long unsigned int block;
1: +  long unsigned int offset;
1:  };
1:  
1:  struct SU_SP_s {
1: -	__u8 magic[2];
1: -	__u8 skip;
1: +  __u8 magic[2];
1: +  __u8 skip;
1:  };
1:  
1:  struct SU_CE_s {
1: -	__u8 extent[8];
1: -	__u8 offset[8];
1: -	__u8 size[8];
1: +  __u8 extent[8];
1: +  __u8 offset[8];
1: +  __u8 size[8];
1:  };
1:  
1:  struct SU_ER_s {
1: -	__u8 len_id;
1: -	__u8 len_des;
1: -	__u8 len_src;
1: -	__u8 ext_ver;
1: -	__u8 data[0];
1: +  __u8 len_id;
1: +  __u8 len_des;
1: +  __u8 len_src;
1: +  __u8 ext_ver;
1: +  __u8 data[0];
1:  };
1:  
1:  struct RR_RR_s {
1: -	__u8 flags[1];
1: +  __u8 flags[1];
1:  };
1:  
1:  struct RR_PX_s {
1: -	__u8 mode[8];
1: -	__u8 n_links[8];
1: -	__u8 uid[8];
1: -	__u8 gid[8];
1: +  __u8 mode[8];
1: +  __u8 n_links[8];
1: +  __u8 uid[8];
1: +  __u8 gid[8];
1:  };
1:  
1:  struct RR_PN_s {
1: -	__u8 dev_high[8];
1: -	__u8 dev_low[8];
1: +  __u8 dev_high[8];
1: +  __u8 dev_low[8];
1:  };
1:  
1:  struct SL_component {
1: -	__u8 flags;
1: -	__u8 len;
1: -	__u8 text[0];
1: +  __u8 flags;
1: +  __u8 len;
1: +  __u8 text[0];
1:  };
1:  
1:  struct RR_SL_s {
1: -	__u8 flags;
1: -	struct SL_component link;
1: +  __u8 flags;
1: +  struct SL_component link;
1:  };
1:  
1:  struct RR_NM_s {
1: -	__u8 flags;
1: -	char name[0];
1: +  __u8 flags;
1: +  char name[0];
1:  };
1:  
1:  struct RR_CL_s {
1: -	__u8 location[8];
1: +  __u8 location[8];
1:  };
1:  
1:  struct RR_PL_s {
1: -	__u8 location[8];
1: +  __u8 location[8];
1:  };
1:  
1:  struct stamp {
1: -	__u8 time[7];
1: +  __u8 time[7];
1:  };
1:  
1:  struct RR_TF_s {
1: -	__u8 flags;
1: -	struct stamp times[0];
1: +  __u8 flags;
1: +  struct stamp times[0];
1:  };
1:  
1:  struct RR_ZF_s {
1: -	__u8 algorithm[2];
1: -	__u8 parms[2];
1: -	__u8 real_size[8];
1: +  __u8 algorithm[2];
1: +  __u8 parms[2];
1: +  __u8 real_size[8];
1:  };
1:  
1:  struct rock_ridge {
1: -	__u8 signature[2];
1: -	__u8 len;
1: -	__u8 version;
1: -	union {
1: -		struct SU_SP_s SP;
1: -		struct SU_CE_s CE;
1: -		struct SU_ER_s ER;
1: -		struct RR_RR_s RR;
1: -		struct RR_PX_s PX;
1: -		struct RR_PN_s PN;
1: -		struct RR_SL_s SL;
1: -		struct RR_NM_s NM;
1: -		struct RR_CL_s CL;
1: -		struct RR_PL_s PL;
1: -		struct RR_TF_s TF;
1: -		struct RR_ZF_s ZF;
1: -	} u;
1: +  __u8 signature[2];
1: +  __u8 len;
1: +  __u8 version;
1: +  union {
1: +    struct SU_SP_s SP;
1: +    struct SU_CE_s CE;
1: +    struct SU_ER_s ER;
1: +    struct RR_RR_s RR;
1: +    struct RR_PX_s PX;
1: +    struct RR_PN_s PN;
1: +    struct RR_SL_s SL;
1: +    struct RR_NM_s NM;
1: +    struct RR_CL_s CL;
1: +    struct RR_PL_s PL;
1: +    struct RR_TF_s TF;
1: +    struct RR_ZF_s ZF;
1: +  } u;
1:  };
1:  
1:  struct rock_state {
1: -	void *buffer;
1: -	unsigned char *chr;
1: -	int len;
1: -	int cont_size;
1: -	int cont_extent;
1: -	int cont_offset;
1: -	int cont_loops;
1: -	struct inode *inode;
1: +  void *buffer;
1: +  unsigned char *chr;
1: +  int len;
1: +  int cont_size;
1: +  int cont_extent;
1: +  int cont_offset;
1: +  int cont_loops;
1: +  struct inode *inode;
1:  };
1:  
1:  struct isofs_fid {
1: -	u32 block;
1: -	u16 offset;
1: -	u16 parent_offset;
1: -	u32 generation;
1: -	u32 parent_block;
1: -	u32 parent_generation;
1: +  u32 block;
1: +  u16 offset;
1: +  u16 parent_offset;
1: +  u32 generation;
1: +  u32 parent_block;
1: +  u32 parent_generation;
1:  };
1:  
1:  enum utf16_endian {
1: -	UTF16_HOST_ENDIAN = 0,
1: -	UTF16_LITTLE_ENDIAN = 1,
1: -	UTF16_BIG_ENDIAN = 2,
1: +  UTF16_HOST_ENDIAN = 0,
1: +  UTF16_LITTLE_ENDIAN = 1,
1: +  UTF16_BIG_ENDIAN = 2,
1:  };
1:  
1:  typedef unsigned char Byte;
1: @@ -49555,99 +50244,99 @@ typedef long unsigned int uLong;
1:  struct internal_state;
1:  
1:  struct z_stream_s {
1: -	const Byte *next_in;
1: -	uLong avail_in;
1: -	uLong total_in;
1: -	Byte *next_out;
1: -	uLong avail_out;
1: -	uLong total_out;
1: -	char *msg;
1: -	struct internal_state *state;
1: -	void *workspace;
1: -	int data_type;
1: -	uLong adler;
1: -	uLong reserved;
1: +  const Byte *next_in;
1: +  uLong avail_in;
1: +  uLong total_in;
1: +  Byte *next_out;
1: +  uLong avail_out;
1: +  uLong total_out;
1: +  char *msg;
1: +  struct internal_state *state;
1: +  void *workspace;
1: +  int data_type;
1: +  uLong adler;
1: +  uLong reserved;
1:  };
1:  
1:  struct internal_state {
1: -	int dummy;
1: +  int dummy;
1:  };
1:  
1:  typedef struct z_stream_s z_stream;
1:  
1:  struct in_addr {
1: -	__be32 s_addr;
1: +  __be32 s_addr;
1:  };
1:  
1:  struct sockaddr_in {
1: -	__kernel_sa_family_t sin_family;
1: -	__be16 sin_port;
1: -	struct in_addr sin_addr;
1: -	unsigned char __pad[8];
1: +  __kernel_sa_family_t sin_family;
1: +  __be16 sin_port;
1: +  struct in_addr sin_addr;
1: +  unsigned char __pad[8];
1:  };
1:  
1:  struct sockaddr_in6 {
1: -	short unsigned int sin6_family;
1: -	__be16 sin6_port;
1: -	__be32 sin6_flowinfo;
1: -	struct in6_addr sin6_addr;
1: -	__u32 sin6_scope_id;
1: +  short unsigned int sin6_family;
1: +  __be16 sin6_port;
1: +  __be32 sin6_flowinfo;
1: +  struct in6_addr sin6_addr;
1: +  __u32 sin6_scope_id;
1:  };
1:  
1:  enum rpc_auth_flavors {
1: -	RPC_AUTH_NULL = 0,
1: -	RPC_AUTH_UNIX = 1,
1: -	RPC_AUTH_SHORT = 2,
1: -	RPC_AUTH_DES = 3,
1: -	RPC_AUTH_KRB = 4,
1: -	RPC_AUTH_GSS = 6,
1: -	RPC_AUTH_MAXFLAVOR = 8,
1: -	RPC_AUTH_GSS_KRB5 = 390003,
1: -	RPC_AUTH_GSS_KRB5I = 390004,
1: -	RPC_AUTH_GSS_KRB5P = 390005,
1: -	RPC_AUTH_GSS_LKEY = 390006,
1: -	RPC_AUTH_GSS_LKEYI = 390007,
1: -	RPC_AUTH_GSS_LKEYP = 390008,
1: -	RPC_AUTH_GSS_SPKM = 390009,
1: -	RPC_AUTH_GSS_SPKMI = 390010,
1: -	RPC_AUTH_GSS_SPKMP = 390011,
1: +  RPC_AUTH_NULL = 0,
1: +  RPC_AUTH_UNIX = 1,
1: +  RPC_AUTH_SHORT = 2,
1: +  RPC_AUTH_DES = 3,
1: +  RPC_AUTH_KRB = 4,
1: +  RPC_AUTH_GSS = 6,
1: +  RPC_AUTH_MAXFLAVOR = 8,
1: +  RPC_AUTH_GSS_KRB5 = 390003,
1: +  RPC_AUTH_GSS_KRB5I = 390004,
1: +  RPC_AUTH_GSS_KRB5P = 390005,
1: +  RPC_AUTH_GSS_LKEY = 390006,
1: +  RPC_AUTH_GSS_LKEYI = 390007,
1: +  RPC_AUTH_GSS_LKEYP = 390008,
1: +  RPC_AUTH_GSS_SPKM = 390009,
1: +  RPC_AUTH_GSS_SPKMI = 390010,
1: +  RPC_AUTH_GSS_SPKMP = 390011,
1:  };
1:  
1:  struct xdr_netobj {
1: -	unsigned int len;
1: -	u8 *data;
1: +  unsigned int len;
1: +  u8 *data;
1:  };
1:  
1:  struct rpc_task_setup {
1: -	struct rpc_task *task;
1: -	struct rpc_clnt *rpc_client;
1: -	struct rpc_xprt *rpc_xprt;
1: -	struct rpc_cred *rpc_op_cred;
1: -	const struct rpc_message *rpc_message;
1: -	const struct rpc_call_ops *callback_ops;
1: -	void *callback_data;
1: -	struct workqueue_struct *workqueue;
1: -	short unsigned int flags;
1: -	signed char priority;
1: +  struct rpc_task *task;
1: +  struct rpc_clnt *rpc_client;
1: +  struct rpc_xprt *rpc_xprt;
1: +  struct rpc_cred *rpc_op_cred;
1: +  const struct rpc_message *rpc_message;
1: +  const struct rpc_call_ops *callback_ops;
1: +  void *callback_data;
1: +  struct workqueue_struct *workqueue;
1: +  short unsigned int flags;
1: +  signed char priority;
1:  };
1:  
1:  enum rpc_display_format_t {
1: -	RPC_DISPLAY_ADDR = 0,
1: -	RPC_DISPLAY_PORT = 1,
1: -	RPC_DISPLAY_PROTO = 2,
1: -	RPC_DISPLAY_HEX_ADDR = 3,
1: -	RPC_DISPLAY_HEX_PORT = 4,
1: -	RPC_DISPLAY_NETID = 5,
1: -	RPC_DISPLAY_MAX = 6,
1: +  RPC_DISPLAY_ADDR = 0,
1: +  RPC_DISPLAY_PORT = 1,
1: +  RPC_DISPLAY_PROTO = 2,
1: +  RPC_DISPLAY_HEX_ADDR = 3,
1: +  RPC_DISPLAY_HEX_PORT = 4,
1: +  RPC_DISPLAY_NETID = 5,
1: +  RPC_DISPLAY_MAX = 6,
1:  };
1:  
1:  enum xprt_transports {
1: -	XPRT_TRANSPORT_UDP = 17,
1: -	XPRT_TRANSPORT_TCP = 6,
1: -	XPRT_TRANSPORT_BC_TCP = 2147483654,
1: -	XPRT_TRANSPORT_RDMA = 256,
1: -	XPRT_TRANSPORT_BC_RDMA = 2147483904,
1: -	XPRT_TRANSPORT_LOCAL = 257,
1: +  XPRT_TRANSPORT_UDP = 17,
1: +  XPRT_TRANSPORT_TCP = 6,
1: +  XPRT_TRANSPORT_BC_TCP = 2147483654,
1: +  XPRT_TRANSPORT_RDMA = 256,
1: +  XPRT_TRANSPORT_BC_RDMA = 2147483904,
1: +  XPRT_TRANSPORT_LOCAL = 257,
1:  };
1:  
1:  struct svc_xprt_class;
1: @@ -49657,43 +50346,43 @@ struct svc_xprt_ops;
1:  struct svc_serv;
1:  
1:  struct svc_xprt {
1: -	struct svc_xprt_class *xpt_class;
1: -	const struct svc_xprt_ops *xpt_ops;
1: -	struct kref xpt_ref;
1: -	struct list_head xpt_list;
1: -	struct list_head xpt_ready;
1: -	long unsigned int xpt_flags;
1: -	struct svc_serv *xpt_server;
1: -	atomic_t xpt_reserved;
1: -	atomic_t xpt_nr_rqsts;
1: -	struct mutex xpt_mutex;
1: -	spinlock_t xpt_lock;
1: -	void *xpt_auth_cache;
1: -	struct list_head xpt_deferred;
1: -	struct __kernel_sockaddr_storage xpt_local;
1: -	size_t xpt_locallen;
1: -	struct __kernel_sockaddr_storage xpt_remote;
1: -	size_t xpt_remotelen;
1: -	char xpt_remotebuf[58];
1: -	struct list_head xpt_users;
1: -	struct net *xpt_net;
1: -	const struct cred *xpt_cred;
1: -	struct rpc_xprt *xpt_bc_xprt;
1: -	struct rpc_xprt_switch *xpt_bc_xps;
1: +  struct svc_xprt_class *xpt_class;
1: +  const struct svc_xprt_ops *xpt_ops;
1: +  struct kref xpt_ref;
1: +  struct list_head xpt_list;
1: +  struct list_head xpt_ready;
1: +  long unsigned int xpt_flags;
1: +  struct svc_serv *xpt_server;
1: +  atomic_t xpt_reserved;
1: +  atomic_t xpt_nr_rqsts;
1: +  struct mutex xpt_mutex;
1: +  spinlock_t xpt_lock;
1: +  void *xpt_auth_cache;
1: +  struct list_head xpt_deferred;
1: +  struct __kernel_sockaddr_storage xpt_local;
1: +  size_t xpt_locallen;
1: +  struct __kernel_sockaddr_storage xpt_remote;
1: +  size_t xpt_remotelen;
1: +  char xpt_remotebuf[58];
1: +  struct list_head xpt_users;
1: +  struct net *xpt_net;
1: +  const struct cred *xpt_cred;
1: +  struct rpc_xprt *xpt_bc_xprt;
1: +  struct rpc_xprt_switch *xpt_bc_xps;
1:  };
1:  
1:  struct svc_program;
1:  
1:  struct svc_stat {
1: -	struct svc_program *program;
1: -	unsigned int netcnt;
1: -	unsigned int netudpcnt;
1: -	unsigned int nettcpcnt;
1: -	unsigned int nettcpconn;
1: -	unsigned int rpccnt;
1: -	unsigned int rpcbadfmt;
1: -	unsigned int rpcbadauth;
1: -	unsigned int rpcbadclnt;
1: +  struct svc_program *program;
1: +  unsigned int netcnt;
1: +  unsigned int netudpcnt;
1: +  unsigned int nettcpcnt;
1: +  unsigned int nettcpconn;
1: +  unsigned int rpccnt;
1: +  unsigned int rpcbadfmt;
1: +  unsigned int rpcbadauth;
1: +  unsigned int rpcbadclnt;
1:  };
1:  
1:  struct svc_version;
1: @@ -49703,94 +50392,96 @@ struct svc_rqst;
1:  struct svc_process_info;
1:  
1:  struct svc_program {
1: -	struct svc_program *pg_next;
1: -	u32 pg_prog;
1: -	unsigned int pg_lovers;
1: -	unsigned int pg_hivers;
1: -	unsigned int pg_nvers;
1: -	const struct svc_version **pg_vers;
1: -	char *pg_name;
1: -	char *pg_class;
1: -	struct svc_stat *pg_stats;
1: -	int (*pg_authenticate)(struct svc_rqst *);
1: -	__be32 (*pg_init_request)(struct svc_rqst *, const struct svc_program *, struct svc_process_info *);
1: -	int (*pg_rpcbind_set)(struct net *, const struct svc_program *, u32, int, short unsigned int, short unsigned int);
1: +  struct svc_program *pg_next;
1: +  u32 pg_prog;
1: +  unsigned int pg_lovers;
1: +  unsigned int pg_hivers;
1: +  unsigned int pg_nvers;
1: +  const struct svc_version **pg_vers;
1: +  char *pg_name;
1: +  char *pg_class;
1: +  struct svc_stat *pg_stats;
1: +  int (*pg_authenticate)(struct svc_rqst *);
1: +  __be32 (*pg_init_request)(struct svc_rqst *, const struct svc_program *,
1: +                            struct svc_process_info *);
1: +  int (*pg_rpcbind_set)(struct net *, const struct svc_program *, u32, int,
1: +                        short unsigned int, short unsigned int);
1:  };
1:  
1:  struct rpc_pipe_msg {
1: -	struct list_head list;
1: -	void *data;
1: -	size_t len;
1: -	size_t copied;
1: -	int errno;
1: +  struct list_head list;
1: +  void *data;
1: +  size_t len;
1: +  size_t copied;
1: +  int errno;
1:  };
1:  
1:  struct rpc_pipe_ops {
1: -	ssize_t (*upcall)(struct file *, struct rpc_pipe_msg *, char *, size_t);
1: -	ssize_t (*downcall)(struct file *, const char *, size_t);
1: -	void (*release_pipe)(struct inode *);
1: -	int (*open_pipe)(struct inode *);
1: -	void (*destroy_msg)(struct rpc_pipe_msg *);
1: +  ssize_t (*upcall)(struct file *, struct rpc_pipe_msg *, char *, size_t);
1: +  ssize_t (*downcall)(struct file *, const char *, size_t);
1: +  void (*release_pipe)(struct inode *);
1: +  int (*open_pipe)(struct inode *);
1: +  void (*destroy_msg)(struct rpc_pipe_msg *);
1:  };
1:  
1:  struct rpc_pipe {
1: -	struct list_head pipe;
1: -	struct list_head in_upcall;
1: -	struct list_head in_downcall;
1: -	int pipelen;
1: -	int nreaders;
1: -	int nwriters;
1: -	int flags;
1: -	struct delayed_work queue_timeout;
1: -	const struct rpc_pipe_ops *ops;
1: -	spinlock_t lock;
1: -	struct dentry *dentry;
1: +  struct list_head pipe;
1: +  struct list_head in_upcall;
1: +  struct list_head in_downcall;
1: +  int pipelen;
1: +  int nreaders;
1: +  int nwriters;
1: +  int flags;
1: +  struct delayed_work queue_timeout;
1: +  const struct rpc_pipe_ops *ops;
1: +  spinlock_t lock;
1: +  struct dentry *dentry;
1:  };
1:  
1:  struct rpc_iostats {
1: -	spinlock_t om_lock;
1: -	long unsigned int om_ops;
1: -	long unsigned int om_ntrans;
1: -	long unsigned int om_timeouts;
1: -	long long unsigned int om_bytes_sent;
1: -	long long unsigned int om_bytes_recv;
1: -	ktime_t om_queue;
1: -	ktime_t om_rtt;
1: -	ktime_t om_execute;
1: -	long unsigned int om_error_status;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  spinlock_t om_lock;
1: +  long unsigned int om_ops;
1: +  long unsigned int om_ntrans;
1: +  long unsigned int om_timeouts;
1: +  long long unsigned int om_bytes_sent;
1: +  long long unsigned int om_bytes_recv;
1: +  ktime_t om_queue;
1: +  ktime_t om_rtt;
1: +  ktime_t om_execute;
1: +  long unsigned int om_error_status;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct rpc_create_args {
1: -	struct net *net;
1: -	int protocol;
1: -	struct sockaddr *address;
1: -	size_t addrsize;
1: -	struct sockaddr *saddress;
1: -	const struct rpc_timeout *timeout;
1: -	const char *servername;
1: -	const char *nodename;
1: -	const struct rpc_program *program;
1: -	u32 prognumber;
1: -	u32 version;
1: -	rpc_authflavor_t authflavor;
1: -	u32 nconnect;
1: -	long unsigned int flags;
1: -	char *client_name;
1: -	struct svc_xprt *bc_xprt;
1: -	const struct cred *cred;
1: +  struct net *net;
1: +  int protocol;
1: +  struct sockaddr *address;
1: +  size_t addrsize;
1: +  struct sockaddr *saddress;
1: +  const struct rpc_timeout *timeout;
1: +  const char *servername;
1: +  const char *nodename;
1: +  const struct rpc_program *program;
1: +  u32 prognumber;
1: +  u32 version;
1: +  rpc_authflavor_t authflavor;
1: +  u32 nconnect;
1: +  long unsigned int flags;
1: +  char *client_name;
1: +  struct svc_xprt *bc_xprt;
1: +  const struct cred *cred;
1:  };
1:  
1:  struct gss_api_mech;
1:  
1:  struct gss_ctx {
1: -	struct gss_api_mech *mech_type;
1: -	void *internal_ctx_id;
1: -	unsigned int slack;
1: -	unsigned int align;
1: +  struct gss_api_mech *mech_type;
1: +  void *internal_ctx_id;
1: +  unsigned int slack;
1: +  unsigned int align;
1:  };
1:  
1:  struct gss_api_ops;
1: @@ -49798,118 +50489,120 @@ struct gss_api_ops;
1:  struct pf_desc;
1:  
1:  struct gss_api_mech {
1: -	struct list_head gm_list;
1: -	struct module *gm_owner;
1: -	struct rpcsec_gss_oid gm_oid;
1: -	char *gm_name;
1: -	const struct gss_api_ops *gm_ops;
1: -	int gm_pf_num;
1: -	struct pf_desc *gm_pfs;
1: -	const char *gm_upcall_enctypes;
1: +  struct list_head gm_list;
1: +  struct module *gm_owner;
1: +  struct rpcsec_gss_oid gm_oid;
1: +  char *gm_name;
1: +  const struct gss_api_ops *gm_ops;
1: +  int gm_pf_num;
1: +  struct pf_desc *gm_pfs;
1: +  const char *gm_upcall_enctypes;
1:  };
1:  
1:  struct auth_domain;
1:  
1:  struct pf_desc {
1: -	u32 pseudoflavor;
1: -	u32 qop;
1: -	u32 service;
1: -	char *name;
1: -	char *auth_domain_name;
1: -	struct auth_domain *domain;
1: -	bool datatouch;
1: +  u32 pseudoflavor;
1: +  u32 qop;
1: +  u32 service;
1: +  char *name;
1: +  char *auth_domain_name;
1: +  struct auth_domain *domain;
1: +  bool datatouch;
1:  };
1:  
1:  struct auth_ops;
1:  
1:  struct auth_domain {
1: -	struct kref ref;
1: -	struct hlist_node hash;
1: -	char *name;
1: -	struct auth_ops *flavour;
1: -	struct callback_head callback_head;
1: +  struct kref ref;
1: +  struct hlist_node hash;
1: +  char *name;
1: +  struct auth_ops *flavour;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct gss_api_ops {
1: -	int (*gss_import_sec_context)(const void *, size_t, struct gss_ctx *, time64_t *, gfp_t);
1: -	u32 (*gss_get_mic)(struct gss_ctx *, struct xdr_buf *, struct xdr_netobj *);
1: -	u32 (*gss_verify_mic)(struct gss_ctx *, struct xdr_buf *, struct xdr_netobj *);
1: -	u32 (*gss_wrap)(struct gss_ctx *, int, struct xdr_buf *, struct page **);
1: -	u32 (*gss_unwrap)(struct gss_ctx *, int, int, struct xdr_buf *);
1: -	void (*gss_delete_sec_context)(void *);
1: +  int (*gss_import_sec_context)(const void *, size_t, struct gss_ctx *,
1: +                                time64_t *, gfp_t);
1: +  u32 (*gss_get_mic)(struct gss_ctx *, struct xdr_buf *, struct xdr_netobj *);
1: +  u32 (*gss_verify_mic)(struct gss_ctx *, struct xdr_buf *,
1: +                        struct xdr_netobj *);
1: +  u32 (*gss_wrap)(struct gss_ctx *, int, struct xdr_buf *, struct page **);
1: +  u32 (*gss_unwrap)(struct gss_ctx *, int, int, struct xdr_buf *);
1: +  void (*gss_delete_sec_context)(void *);
1:  };
1:  
1:  struct pnfs_layout_range {
1: -	u32 iomode;
1: -	u64 offset;
1: -	u64 length;
1: +  u32 iomode;
1: +  u64 offset;
1: +  u64 length;
1:  };
1:  
1:  struct pnfs_layout_hdr;
1:  
1:  struct pnfs_layout_segment {
1: -	struct list_head pls_list;
1: -	struct list_head pls_lc_list;
1: -	struct list_head pls_commits;
1: -	struct pnfs_layout_range pls_range;
1: -	refcount_t pls_refcount;
1: -	u32 pls_seq;
1: -	long unsigned int pls_flags;
1: -	struct pnfs_layout_hdr *pls_layout;
1: +  struct list_head pls_list;
1: +  struct list_head pls_lc_list;
1: +  struct list_head pls_commits;
1: +  struct pnfs_layout_range pls_range;
1: +  refcount_t pls_refcount;
1: +  u32 pls_seq;
1: +  long unsigned int pls_flags;
1: +  struct pnfs_layout_hdr *pls_layout;
1:  };
1:  
1:  struct nfs_page {
1: -	struct list_head wb_list;
1: -	struct page *wb_page;
1: -	struct nfs_lock_context *wb_lock_context;
1: -	long unsigned int wb_index;
1: -	unsigned int wb_offset;
1: -	unsigned int wb_pgbase;
1: -	unsigned int wb_bytes;
1: -	struct kref wb_kref;
1: -	long unsigned int wb_flags;
1: -	struct nfs_write_verifier wb_verf;
1: -	struct nfs_page *wb_this_page;
1: -	struct nfs_page *wb_head;
1: -	short unsigned int wb_nio;
1: +  struct list_head wb_list;
1: +  struct page *wb_page;
1: +  struct nfs_lock_context *wb_lock_context;
1: +  long unsigned int wb_index;
1: +  unsigned int wb_offset;
1: +  unsigned int wb_pgbase;
1: +  unsigned int wb_bytes;
1: +  struct kref wb_kref;
1: +  long unsigned int wb_flags;
1: +  struct nfs_write_verifier wb_verf;
1: +  struct nfs_page *wb_this_page;
1: +  struct nfs_page *wb_head;
1: +  short unsigned int wb_nio;
1:  };
1:  
1:  struct nfs_subversion {
1: -	struct module *owner;
1: -	struct file_system_type *nfs_fs;
1: -	const struct rpc_version *rpc_vers;
1: -	const struct nfs_rpc_ops *rpc_ops;
1: -	const struct super_operations *sops;
1: -	const struct xattr_handler **xattr;
1: -	struct list_head list;
1: +  struct module *owner;
1: +  struct file_system_type *nfs_fs;
1: +  const struct rpc_version *rpc_vers;
1: +  const struct nfs_rpc_ops *rpc_ops;
1: +  const struct super_operations *sops;
1: +  const struct xattr_handler **xattr;
1: +  struct list_head list;
1:  };
1:  
1:  struct nfs_iostats {
1: -	long long unsigned int bytes[8];
1: -	long unsigned int events[27];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  long long unsigned int bytes[8];
1: +  long unsigned int events[27];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct svc_cred {
1: -	kuid_t cr_uid;
1: -	kgid_t cr_gid;
1: -	struct group_info *cr_group_info;
1: -	u32 cr_flavor;
1: -	char *cr_raw_principal;
1: -	char *cr_principal;
1: -	char *cr_targ_princ;
1: -	struct gss_api_mech *cr_gss_mech;
1: +  kuid_t cr_uid;
1: +  kgid_t cr_gid;
1: +  struct group_info *cr_group_info;
1: +  u32 cr_flavor;
1: +  char *cr_raw_principal;
1: +  char *cr_principal;
1: +  char *cr_targ_princ;
1: +  struct gss_api_mech *cr_gss_mech;
1:  };
1:  
1:  struct cache_deferred_req;
1:  
1:  struct cache_req {
1: -	struct cache_deferred_req * (*defer)(struct cache_req *);
1: -	int thread_wait;
1: +  struct cache_deferred_req *(*defer)(struct cache_req *);
1: +  int thread_wait;
1:  };
1:  
1:  struct svc_cacherep;
1: @@ -49921,382 +50614,385 @@ struct svc_procedure;
1:  struct svc_deferred_req;
1:  
1:  struct svc_rqst {
1: -	struct list_head rq_all;
1: -	struct callback_head rq_rcu_head;
1: -	struct svc_xprt *rq_xprt;
1: -	struct __kernel_sockaddr_storage rq_addr;
1: -	size_t rq_addrlen;
1: -	struct __kernel_sockaddr_storage rq_daddr;
1: -	size_t rq_daddrlen;
1: -	struct svc_serv *rq_server;
1: -	struct svc_pool *rq_pool;
1: -	const struct svc_procedure *rq_procinfo;
1: -	struct auth_ops *rq_authop;
1: -	struct svc_cred rq_cred;
1: -	void *rq_xprt_ctxt;
1: -	struct svc_deferred_req *rq_deferred;
1: -	size_t rq_xprt_hlen;
1: -	struct xdr_buf rq_arg;
1: -	struct xdr_buf rq_res;
1: -	struct page *rq_pages[260];
1: -	struct page **rq_respages;
1: -	struct page **rq_next_page;
1: -	struct page **rq_page_end;
1: -	struct kvec rq_vec[259];
1: -	struct bio_vec rq_bvec[259];
1: -	__be32 rq_xid;
1: -	u32 rq_prog;
1: -	u32 rq_vers;
1: -	u32 rq_proc;
1: -	u32 rq_prot;
1: -	int rq_cachetype;
1: -	long unsigned int rq_flags;
1: -	ktime_t rq_qtime;
1: -	void *rq_argp;
1: -	void *rq_resp;
1: -	void *rq_auth_data;
1: -	int rq_auth_slack;
1: -	int rq_reserved;
1: -	ktime_t rq_stime;
1: -	struct cache_req rq_chandle;
1: -	struct auth_domain *rq_client;
1: -	struct auth_domain *rq_gssclient;
1: -	struct svc_cacherep *rq_cacherep;
1: -	struct task_struct *rq_task;
1: -	spinlock_t rq_lock;
1: -	struct net *rq_bc_net;
1: -	void **rq_lease_breaker;
1: +  struct list_head rq_all;
1: +  struct callback_head rq_rcu_head;
1: +  struct svc_xprt *rq_xprt;
1: +  struct __kernel_sockaddr_storage rq_addr;
1: +  size_t rq_addrlen;
1: +  struct __kernel_sockaddr_storage rq_daddr;
1: +  size_t rq_daddrlen;
1: +  struct svc_serv *rq_server;
1: +  struct svc_pool *rq_pool;
1: +  const struct svc_procedure *rq_procinfo;
1: +  struct auth_ops *rq_authop;
1: +  struct svc_cred rq_cred;
1: +  void *rq_xprt_ctxt;
1: +  struct svc_deferred_req *rq_deferred;
1: +  size_t rq_xprt_hlen;
1: +  struct xdr_buf rq_arg;
1: +  struct xdr_buf rq_res;
1: +  struct page *rq_pages[260];
1: +  struct page **rq_respages;
1: +  struct page **rq_next_page;
1: +  struct page **rq_page_end;
1: +  struct kvec rq_vec[259];
1: +  struct bio_vec rq_bvec[259];
1: +  __be32 rq_xid;
1: +  u32 rq_prog;
1: +  u32 rq_vers;
1: +  u32 rq_proc;
1: +  u32 rq_prot;
1: +  int rq_cachetype;
1: +  long unsigned int rq_flags;
1: +  ktime_t rq_qtime;
1: +  void *rq_argp;
1: +  void *rq_resp;
1: +  void *rq_auth_data;
1: +  int rq_auth_slack;
1: +  int rq_reserved;
1: +  ktime_t rq_stime;
1: +  struct cache_req rq_chandle;
1: +  struct auth_domain *rq_client;
1: +  struct auth_domain *rq_gssclient;
1: +  struct svc_cacherep *rq_cacherep;
1: +  struct task_struct *rq_task;
1: +  spinlock_t rq_lock;
1: +  struct net *rq_bc_net;
1: +  void **rq_lease_breaker;
1:  };
1:  
1:  struct nlmclnt_initdata {
1: -	const char *hostname;
1: -	const struct sockaddr *address;
1: -	size_t addrlen;
1: -	short unsigned int protocol;
1: -	u32 nfs_version;
1: -	int noresvport;
1: -	struct net *net;
1: -	const struct nlmclnt_operations *nlmclnt_ops;
1: -	const struct cred *cred;
1: +  const char *hostname;
1: +  const struct sockaddr *address;
1: +  size_t addrlen;
1: +  short unsigned int protocol;
1: +  u32 nfs_version;
1: +  int noresvport;
1: +  struct net *net;
1: +  const struct nlmclnt_operations *nlmclnt_ops;
1: +  const struct cred *cred;
1:  };
1:  
1:  struct cache_head {
1: -	struct hlist_node cache_list;
1: -	time64_t expiry_time;
1: -	time64_t last_refresh;
1: -	struct kref ref;
1: -	long unsigned int flags;
1: +  struct hlist_node cache_list;
1: +  time64_t expiry_time;
1: +  time64_t last_refresh;
1: +  struct kref ref;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct cache_detail {
1: -	struct module *owner;
1: -	int hash_size;
1: -	struct hlist_head *hash_table;
1: -	spinlock_t hash_lock;
1: -	char *name;
1: -	void (*cache_put)(struct kref *);
1: -	int (*cache_upcall)(struct cache_detail *, struct cache_head *);
1: -	void (*cache_request)(struct cache_detail *, struct cache_head *, char **, int *);
1: -	int (*cache_parse)(struct cache_detail *, char *, int);
1: -	int (*cache_show)(struct seq_file *, struct cache_detail *, struct cache_head *);
1: -	void (*warn_no_listener)(struct cache_detail *, int);
1: -	struct cache_head * (*alloc)();
1: -	void (*flush)();
1: -	int (*match)(struct cache_head *, struct cache_head *);
1: -	void (*init)(struct cache_head *, struct cache_head *);
1: -	void (*update)(struct cache_head *, struct cache_head *);
1: -	time64_t flush_time;
1: -	struct list_head others;
1: -	time64_t nextcheck;
1: -	int entries;
1: -	struct list_head queue;
1: -	atomic_t writers;
1: -	time64_t last_close;
1: -	time64_t last_warn;
1: -	union {
1: -		struct proc_dir_entry *procfs;
1: -		struct dentry *pipefs;
1: -	};
1: -	struct net *net;
1: +  struct module *owner;
1: +  int hash_size;
1: +  struct hlist_head *hash_table;
1: +  spinlock_t hash_lock;
1: +  char *name;
1: +  void (*cache_put)(struct kref *);
1: +  int (*cache_upcall)(struct cache_detail *, struct cache_head *);
1: +  void (*cache_request)(struct cache_detail *, struct cache_head *, char **,
1: +                        int *);
1: +  int (*cache_parse)(struct cache_detail *, char *, int);
1: +  int (*cache_show)(struct seq_file *, struct cache_detail *,
1: +                    struct cache_head *);
1: +  void (*warn_no_listener)(struct cache_detail *, int);
1: +  struct cache_head *(*alloc)();
1: +  void (*flush)();
1: +  int (*match)(struct cache_head *, struct cache_head *);
1: +  void (*init)(struct cache_head *, struct cache_head *);
1: +  void (*update)(struct cache_head *, struct cache_head *);
1: +  time64_t flush_time;
1: +  struct list_head others;
1: +  time64_t nextcheck;
1: +  int entries;
1: +  struct list_head queue;
1: +  atomic_t writers;
1: +  time64_t last_close;
1: +  time64_t last_warn;
1: +  union {
1: +    struct proc_dir_entry *procfs;
1: +    struct dentry *pipefs;
1: +  };
1: +  struct net *net;
1:  };
1:  
1:  struct cache_deferred_req {
1: -	struct hlist_node hash;
1: -	struct list_head recent;
1: -	struct cache_head *item;
1: -	void *owner;
1: -	void (*revisit)(struct cache_deferred_req *, int);
1: +  struct hlist_node hash;
1: +  struct list_head recent;
1: +  struct cache_head *item;
1: +  void *owner;
1: +  void (*revisit)(struct cache_deferred_req *, int);
1:  };
1:  
1:  struct auth_ops {
1: -	char *name;
1: -	struct module *owner;
1: -	int flavour;
1: -	int (*accept)(struct svc_rqst *, __be32 *);
1: -	int (*release)(struct svc_rqst *);
1: -	void (*domain_release)(struct auth_domain *);
1: -	int (*set_client)(struct svc_rqst *);
1: +  char *name;
1: +  struct module *owner;
1: +  int flavour;
1: +  int (*accept)(struct svc_rqst *, __be32 *);
1: +  int (*release)(struct svc_rqst *);
1: +  void (*domain_release)(struct auth_domain *);
1: +  int (*set_client)(struct svc_rqst *);
1:  };
1:  
1:  struct svc_pool_stats {
1: -	atomic_long_t packets;
1: -	long unsigned int sockets_queued;
1: -	atomic_long_t threads_woken;
1: -	atomic_long_t threads_timedout;
1: +  atomic_long_t packets;
1: +  long unsigned int sockets_queued;
1: +  atomic_long_t threads_woken;
1: +  atomic_long_t threads_timedout;
1:  };
1:  
1:  struct svc_pool {
1: -	unsigned int sp_id;
1: -	spinlock_t sp_lock;
1: -	struct list_head sp_sockets;
1: -	unsigned int sp_nrthreads;
1: -	struct list_head sp_all_threads;
1: -	struct svc_pool_stats sp_stats;
1: -	long unsigned int sp_flags;
1: -	long: 64;
1: -	long: 64;
1: +  unsigned int sp_id;
1: +  spinlock_t sp_lock;
1: +  struct list_head sp_sockets;
1: +  unsigned int sp_nrthreads;
1: +  struct list_head sp_all_threads;
1: +  struct svc_pool_stats sp_stats;
1: +  long unsigned int sp_flags;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct svc_serv_ops {
1: -	void (*svo_shutdown)(struct svc_serv *, struct net *);
1: -	int (*svo_function)(void *);
1: -	void (*svo_enqueue_xprt)(struct svc_xprt *);
1: -	int (*svo_setup)(struct svc_serv *, struct svc_pool *, int);
1: -	struct module *svo_module;
1: +  void (*svo_shutdown)(struct svc_serv *, struct net *);
1: +  int (*svo_function)(void *);
1: +  void (*svo_enqueue_xprt)(struct svc_xprt *);
1: +  int (*svo_setup)(struct svc_serv *, struct svc_pool *, int);
1: +  struct module *svo_module;
1:  };
1:  
1:  struct svc_serv {
1: -	struct svc_program *sv_program;
1: -	struct svc_stat *sv_stats;
1: -	spinlock_t sv_lock;
1: -	unsigned int sv_nrthreads;
1: -	unsigned int sv_maxconn;
1: -	unsigned int sv_max_payload;
1: -	unsigned int sv_max_mesg;
1: -	unsigned int sv_xdrsize;
1: -	struct list_head sv_permsocks;
1: -	struct list_head sv_tempsocks;
1: -	int sv_tmpcnt;
1: -	struct timer_list sv_temptimer;
1: -	char *sv_name;
1: -	unsigned int sv_nrpools;
1: -	struct svc_pool *sv_pools;
1: -	const struct svc_serv_ops *sv_ops;
1: +  struct svc_program *sv_program;
1: +  struct svc_stat *sv_stats;
1: +  spinlock_t sv_lock;
1: +  unsigned int sv_nrthreads;
1: +  unsigned int sv_maxconn;
1: +  unsigned int sv_max_payload;
1: +  unsigned int sv_max_mesg;
1: +  unsigned int sv_xdrsize;
1: +  struct list_head sv_permsocks;
1: +  struct list_head sv_tempsocks;
1: +  int sv_tmpcnt;
1: +  struct timer_list sv_temptimer;
1: +  char *sv_name;
1: +  unsigned int sv_nrpools;
1: +  struct svc_pool *sv_pools;
1: +  const struct svc_serv_ops *sv_ops;
1:  };
1:  
1:  struct svc_procedure {
1: -	__be32 (*pc_func)(struct svc_rqst *);
1: -	int (*pc_decode)(struct svc_rqst *, __be32 *);
1: -	int (*pc_encode)(struct svc_rqst *, __be32 *);
1: -	void (*pc_release)(struct svc_rqst *);
1: -	unsigned int pc_argsize;
1: -	unsigned int pc_ressize;
1: -	unsigned int pc_cachetype;
1: -	unsigned int pc_xdrressize;
1: +  __be32 (*pc_func)(struct svc_rqst *);
1: +  int (*pc_decode)(struct svc_rqst *, __be32 *);
1: +  int (*pc_encode)(struct svc_rqst *, __be32 *);
1: +  void (*pc_release)(struct svc_rqst *);
1: +  unsigned int pc_argsize;
1: +  unsigned int pc_ressize;
1: +  unsigned int pc_cachetype;
1: +  unsigned int pc_xdrressize;
1:  };
1:  
1:  struct svc_deferred_req {
1: -	u32 prot;
1: -	struct svc_xprt *xprt;
1: -	struct __kernel_sockaddr_storage addr;
1: -	size_t addrlen;
1: -	struct __kernel_sockaddr_storage daddr;
1: -	size_t daddrlen;
1: -	struct cache_deferred_req handle;
1: -	size_t xprt_hlen;
1: -	int argslen;
1: -	__be32 args[0];
1: +  u32 prot;
1: +  struct svc_xprt *xprt;
1: +  struct __kernel_sockaddr_storage addr;
1: +  size_t addrlen;
1: +  struct __kernel_sockaddr_storage daddr;
1: +  size_t daddrlen;
1: +  struct cache_deferred_req handle;
1: +  size_t xprt_hlen;
1: +  int argslen;
1: +  __be32 args[0];
1:  };
1:  
1:  struct svc_process_info {
1: -	union {
1: -		int (*dispatch)(struct svc_rqst *, __be32 *);
1: -		struct {
1: -			unsigned int lovers;
1: -			unsigned int hivers;
1: -		} mismatch;
1: -	};
1: +  union {
1: +    int (*dispatch)(struct svc_rqst *, __be32 *);
1: +    struct {
1: +      unsigned int lovers;
1: +      unsigned int hivers;
1: +    } mismatch;
1: +  };
1:  };
1:  
1:  struct svc_version {
1: -	u32 vs_vers;
1: -	u32 vs_nproc;
1: -	const struct svc_procedure *vs_proc;
1: -	unsigned int *vs_count;
1: -	u32 vs_xdrsize;
1: -	bool vs_hidden;
1: -	bool vs_rpcb_optnl;
1: -	bool vs_need_cong_ctrl;
1: -	int (*vs_dispatch)(struct svc_rqst *, __be32 *);
1: +  u32 vs_vers;
1: +  u32 vs_nproc;
1: +  const struct svc_procedure *vs_proc;
1: +  unsigned int *vs_count;
1: +  u32 vs_xdrsize;
1: +  bool vs_hidden;
1: +  bool vs_rpcb_optnl;
1: +  bool vs_need_cong_ctrl;
1: +  int (*vs_dispatch)(struct svc_rqst *, __be32 *);
1:  };
1:  
1:  struct svc_xprt_ops {
1: -	struct svc_xprt * (*xpo_create)(struct svc_serv *, struct net *, struct sockaddr *, int, int);
1: -	struct svc_xprt * (*xpo_accept)(struct svc_xprt *);
1: -	int (*xpo_has_wspace)(struct svc_xprt *);
1: -	int (*xpo_recvfrom)(struct svc_rqst *);
1: -	int (*xpo_sendto)(struct svc_rqst *);
1: -	int (*xpo_read_payload)(struct svc_rqst *, unsigned int, unsigned int);
1: -	void (*xpo_release_rqst)(struct svc_rqst *);
1: -	void (*xpo_detach)(struct svc_xprt *);
1: -	void (*xpo_free)(struct svc_xprt *);
1: -	void (*xpo_secure_port)(struct svc_rqst *);
1: -	void (*xpo_kill_temp_xprt)(struct svc_xprt *);
1: +  struct svc_xprt *(*xpo_create)(struct svc_serv *, struct net *,
1: +                                 struct sockaddr *, int, int);
1: +  struct svc_xprt *(*xpo_accept)(struct svc_xprt *);
1: +  int (*xpo_has_wspace)(struct svc_xprt *);
1: +  int (*xpo_recvfrom)(struct svc_rqst *);
1: +  int (*xpo_sendto)(struct svc_rqst *);
1: +  int (*xpo_read_payload)(struct svc_rqst *, unsigned int, unsigned int);
1: +  void (*xpo_release_rqst)(struct svc_rqst *);
1: +  void (*xpo_detach)(struct svc_xprt *);
1: +  void (*xpo_free)(struct svc_xprt *);
1: +  void (*xpo_secure_port)(struct svc_rqst *);
1: +  void (*xpo_kill_temp_xprt)(struct svc_xprt *);
1:  };
1:  
1:  struct svc_xprt_class {
1: -	const char *xcl_name;
1: -	struct module *xcl_owner;
1: -	const struct svc_xprt_ops *xcl_ops;
1: -	struct list_head xcl_list;
1: -	u32 xcl_max_payload;
1: -	int xcl_ident;
1: +  const char *xcl_name;
1: +  struct module *xcl_owner;
1: +  const struct svc_xprt_ops *xcl_ops;
1: +  struct list_head xcl_list;
1: +  u32 xcl_max_payload;
1: +  int xcl_ident;
1:  };
1:  
1:  enum nfs_stat_bytecounters {
1: -	NFSIOS_NORMALREADBYTES = 0,
1: -	NFSIOS_NORMALWRITTENBYTES = 1,
1: -	NFSIOS_DIRECTREADBYTES = 2,
1: -	NFSIOS_DIRECTWRITTENBYTES = 3,
1: -	NFSIOS_SERVERREADBYTES = 4,
1: -	NFSIOS_SERVERWRITTENBYTES = 5,
1: -	NFSIOS_READPAGES = 6,
1: -	NFSIOS_WRITEPAGES = 7,
1: -	__NFSIOS_BYTESMAX = 8,
1: +  NFSIOS_NORMALREADBYTES = 0,
1: +  NFSIOS_NORMALWRITTENBYTES = 1,
1: +  NFSIOS_DIRECTREADBYTES = 2,
1: +  NFSIOS_DIRECTWRITTENBYTES = 3,
1: +  NFSIOS_SERVERREADBYTES = 4,
1: +  NFSIOS_SERVERWRITTENBYTES = 5,
1: +  NFSIOS_READPAGES = 6,
1: +  NFSIOS_WRITEPAGES = 7,
1: +  __NFSIOS_BYTESMAX = 8,
1:  };
1:  
1:  enum nfs_stat_eventcounters {
1: -	NFSIOS_INODEREVALIDATE = 0,
1: -	NFSIOS_DENTRYREVALIDATE = 1,
1: -	NFSIOS_DATAINVALIDATE = 2,
1: -	NFSIOS_ATTRINVALIDATE = 3,
1: -	NFSIOS_VFSOPEN = 4,
1: -	NFSIOS_VFSLOOKUP = 5,
1: -	NFSIOS_VFSACCESS = 6,
1: -	NFSIOS_VFSUPDATEPAGE = 7,
1: -	NFSIOS_VFSREADPAGE = 8,
1: -	NFSIOS_VFSREADPAGES = 9,
1: -	NFSIOS_VFSWRITEPAGE = 10,
1: -	NFSIOS_VFSWRITEPAGES = 11,
1: -	NFSIOS_VFSGETDENTS = 12,
1: -	NFSIOS_VFSSETATTR = 13,
1: -	NFSIOS_VFSFLUSH = 14,
1: -	NFSIOS_VFSFSYNC = 15,
1: -	NFSIOS_VFSLOCK = 16,
1: -	NFSIOS_VFSRELEASE = 17,
1: -	NFSIOS_CONGESTIONWAIT = 18,
1: -	NFSIOS_SETATTRTRUNC = 19,
1: -	NFSIOS_EXTENDWRITE = 20,
1: -	NFSIOS_SILLYRENAME = 21,
1: -	NFSIOS_SHORTREAD = 22,
1: -	NFSIOS_SHORTWRITE = 23,
1: -	NFSIOS_DELAY = 24,
1: -	NFSIOS_PNFS_READ = 25,
1: -	NFSIOS_PNFS_WRITE = 26,
1: -	__NFSIOS_COUNTSMAX = 27,
1: +  NFSIOS_INODEREVALIDATE = 0,
1: +  NFSIOS_DENTRYREVALIDATE = 1,
1: +  NFSIOS_DATAINVALIDATE = 2,
1: +  NFSIOS_ATTRINVALIDATE = 3,
1: +  NFSIOS_VFSOPEN = 4,
1: +  NFSIOS_VFSLOOKUP = 5,
1: +  NFSIOS_VFSACCESS = 6,
1: +  NFSIOS_VFSUPDATEPAGE = 7,
1: +  NFSIOS_VFSREADPAGE = 8,
1: +  NFSIOS_VFSREADPAGES = 9,
1: +  NFSIOS_VFSWRITEPAGE = 10,
1: +  NFSIOS_VFSWRITEPAGES = 11,
1: +  NFSIOS_VFSGETDENTS = 12,
1: +  NFSIOS_VFSSETATTR = 13,
1: +  NFSIOS_VFSFLUSH = 14,
1: +  NFSIOS_VFSFSYNC = 15,
1: +  NFSIOS_VFSLOCK = 16,
1: +  NFSIOS_VFSRELEASE = 17,
1: +  NFSIOS_CONGESTIONWAIT = 18,
1: +  NFSIOS_SETATTRTRUNC = 19,
1: +  NFSIOS_EXTENDWRITE = 20,
1: +  NFSIOS_SILLYRENAME = 21,
1: +  NFSIOS_SHORTREAD = 22,
1: +  NFSIOS_SHORTWRITE = 23,
1: +  NFSIOS_DELAY = 24,
1: +  NFSIOS_PNFS_READ = 25,
1: +  NFSIOS_PNFS_WRITE = 26,
1: +  __NFSIOS_COUNTSMAX = 27,
1:  };
1:  
1:  struct nfs_clone_mount {
1: -	struct super_block *sb;
1: -	struct dentry *dentry;
1: -	struct nfs_fattr *fattr;
1: -	unsigned int inherited_bsize;
1: +  struct super_block *sb;
1: +  struct dentry *dentry;
1: +  struct nfs_fattr *fattr;
1: +  unsigned int inherited_bsize;
1:  };
1:  
1:  struct nfs_fs_context {
1: -	bool internal;
1: -	bool skip_reconfig_option_check;
1: -	bool need_mount;
1: -	bool sloppy;
1: -	unsigned int flags;
1: -	unsigned int rsize;
1: -	unsigned int wsize;
1: -	unsigned int timeo;
1: -	unsigned int retrans;
1: -	unsigned int acregmin;
1: -	unsigned int acregmax;
1: -	unsigned int acdirmin;
1: -	unsigned int acdirmax;
1: -	unsigned int namlen;
1: -	unsigned int options;
1: -	unsigned int bsize;
1: -	struct nfs_auth_info auth_info;
1: -	rpc_authflavor_t selected_flavor;
1: -	char *client_address;
1: -	unsigned int version;
1: -	unsigned int minorversion;
1: -	char *fscache_uniq;
1: -	short unsigned int protofamily;
1: -	short unsigned int mountfamily;
1: -	struct {
1: -		union {
1: -			struct sockaddr address;
1: -			struct __kernel_sockaddr_storage _address;
1: -		};
1: -		size_t addrlen;
1: -		char *hostname;
1: -		u32 version;
1: -		int port;
1: -		short unsigned int protocol;
1: -	} mount_server;
1: -	struct {
1: -		union {
1: -			struct sockaddr address;
1: -			struct __kernel_sockaddr_storage _address;
1: -		};
1: -		size_t addrlen;
1: -		char *hostname;
1: -		char *export_path;
1: -		int port;
1: -		short unsigned int protocol;
1: -		short unsigned int nconnect;
1: -		short unsigned int export_path_len;
1: -	} nfs_server;
1: -	struct nfs_fh *mntfh;
1: -	struct nfs_server *server;
1: -	struct nfs_subversion *nfs_mod;
1: -	struct nfs_clone_mount clone_data;
1: +  bool internal;
1: +  bool skip_reconfig_option_check;
1: +  bool need_mount;
1: +  bool sloppy;
1: +  unsigned int flags;
1: +  unsigned int rsize;
1: +  unsigned int wsize;
1: +  unsigned int timeo;
1: +  unsigned int retrans;
1: +  unsigned int acregmin;
1: +  unsigned int acregmax;
1: +  unsigned int acdirmin;
1: +  unsigned int acdirmax;
1: +  unsigned int namlen;
1: +  unsigned int options;
1: +  unsigned int bsize;
1: +  struct nfs_auth_info auth_info;
1: +  rpc_authflavor_t selected_flavor;
1: +  char *client_address;
1: +  unsigned int version;
1: +  unsigned int minorversion;
1: +  char *fscache_uniq;
1: +  short unsigned int protofamily;
1: +  short unsigned int mountfamily;
1: +  struct {
1: +    union {
1: +      struct sockaddr address;
1: +      struct __kernel_sockaddr_storage _address;
1: +    };
1: +    size_t addrlen;
1: +    char *hostname;
1: +    u32 version;
1: +    int port;
1: +    short unsigned int protocol;
1: +  } mount_server;
1: +  struct {
1: +    union {
1: +      struct sockaddr address;
1: +      struct __kernel_sockaddr_storage _address;
1: +    };
1: +    size_t addrlen;
1: +    char *hostname;
1: +    char *export_path;
1: +    int port;
1: +    short unsigned int protocol;
1: +    short unsigned int nconnect;
1: +    short unsigned int export_path_len;
1: +  } nfs_server;
1: +  struct nfs_fh *mntfh;
1: +  struct nfs_server *server;
1: +  struct nfs_subversion *nfs_mod;
1: +  struct nfs_clone_mount clone_data;
1:  };
1:  
1:  struct bl_dev_msg {
1: -	int32_t status;
1: -	uint32_t major;
1: -	uint32_t minor;
1: +  int32_t status;
1: +  uint32_t major;
1: +  uint32_t minor;
1:  };
1:  
1:  struct nfs_netns_client;
1:  
1:  struct nfs_net {
1: -	struct cache_detail *nfs_dns_resolve;
1: -	struct rpc_pipe *bl_device_pipe;
1: -	struct bl_dev_msg bl_mount_reply;
1: -	wait_queue_head_t bl_wq;
1: -	struct mutex bl_mutex;
1: -	struct list_head nfs_client_list;
1: -	struct list_head nfs_volume_list;
1: -	struct idr cb_ident_idr;
1: -	short unsigned int nfs_callback_tcpport;
1: -	short unsigned int nfs_callback_tcpport6;
1: -	int cb_users[1];
1: -	struct nfs_netns_client *nfs_client;
1: -	spinlock_t nfs_client_lock;
1: -	ktime_t boot_time;
1: -	struct proc_dir_entry *proc_nfsfs;
1: +  struct cache_detail *nfs_dns_resolve;
1: +  struct rpc_pipe *bl_device_pipe;
1: +  struct bl_dev_msg bl_mount_reply;
1: +  wait_queue_head_t bl_wq;
1: +  struct mutex bl_mutex;
1: +  struct list_head nfs_client_list;
1: +  struct list_head nfs_volume_list;
1: +  struct idr cb_ident_idr;
1: +  short unsigned int nfs_callback_tcpport;
1: +  short unsigned int nfs_callback_tcpport6;
1: +  int cb_users[1];
1: +  struct nfs_netns_client *nfs_client;
1: +  spinlock_t nfs_client_lock;
1: +  ktime_t boot_time;
1: +  struct proc_dir_entry *proc_nfsfs;
1:  };
1:  
1:  struct nfs_netns_client {
1: -	struct kobject kobject;
1: -	struct net *net;
1: -	const char *identifier;
1: +  struct kobject kobject;
1: +  struct net *net;
1: +  const char *identifier;
1:  };
1:  
1:  struct nfs_open_dir_context {
1: -	struct list_head list;
1: -	const struct cred *cred;
1: -	long unsigned int attr_gencount;
1: -	__u64 dir_cookie;
1: -	__u64 dup_cookie;
1: -	signed char duped;
1: +  struct list_head list;
1: +  const struct cred *cred;
1: +  long unsigned int attr_gencount;
1: +  __u64 dir_cookie;
1: +  __u64 dup_cookie;
1: +  signed char duped;
1:  };
1:  
1:  struct nfs4_cached_acl;
1: @@ -50304,674 +51000,676 @@ struct nfs4_cached_acl;
1:  struct nfs_delegation;
1:  
1:  struct nfs_inode {
1: -	__u64 fileid;
1: -	struct nfs_fh fh;
1: -	long unsigned int flags;
1: -	long unsigned int cache_validity;
1: -	long unsigned int read_cache_jiffies;
1: -	long unsigned int attrtimeo;
1: -	long unsigned int attrtimeo_timestamp;
1: -	long unsigned int attr_gencount;
1: -	long unsigned int cache_change_attribute;
1: -	struct rb_root access_cache;
1: -	struct list_head access_cache_entry_lru;
1: -	struct list_head access_cache_inode_lru;
1: -	__be32 cookieverf[2];
1: -	atomic_long_t nrequests;
1: -	struct nfs_mds_commit_info commit_info;
1: -	struct list_head open_files;
1: -	struct rw_semaphore rmdir_sem;
1: -	struct mutex commit_mutex;
1: -	long unsigned int page_index;
1: -	struct nfs4_cached_acl *nfs4_acl;
1: -	struct list_head open_states;
1: -	struct nfs_delegation *delegation;
1: -	struct rw_semaphore rwsem;
1: -	struct pnfs_layout_hdr *layout;
1: -	__u64 write_io;
1: -	__u64 read_io;
1: -	struct inode vfs_inode;
1: +  __u64 fileid;
1: +  struct nfs_fh fh;
1: +  long unsigned int flags;
1: +  long unsigned int cache_validity;
1: +  long unsigned int read_cache_jiffies;
1: +  long unsigned int attrtimeo;
1: +  long unsigned int attrtimeo_timestamp;
1: +  long unsigned int attr_gencount;
1: +  long unsigned int cache_change_attribute;
1: +  struct rb_root access_cache;
1: +  struct list_head access_cache_entry_lru;
1: +  struct list_head access_cache_inode_lru;
1: +  __be32 cookieverf[2];
1: +  atomic_long_t nrequests;
1: +  struct nfs_mds_commit_info commit_info;
1: +  struct list_head open_files;
1: +  struct rw_semaphore rmdir_sem;
1: +  struct mutex commit_mutex;
1: +  long unsigned int page_index;
1: +  struct nfs4_cached_acl *nfs4_acl;
1: +  struct list_head open_states;
1: +  struct nfs_delegation *delegation;
1: +  struct rw_semaphore rwsem;
1: +  struct pnfs_layout_hdr *layout;
1: +  __u64 write_io;
1: +  __u64 read_io;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  struct nfs_delegation {
1: -	struct list_head super_list;
1: -	const struct cred *cred;
1: -	struct inode *inode;
1: -	nfs4_stateid stateid;
1: -	fmode_t type;
1: -	long unsigned int pagemod_limit;
1: -	__u64 change_attr;
1: -	long unsigned int flags;
1: -	refcount_t refcount;
1: -	spinlock_t lock;
1: -	struct callback_head rcu;
1: +  struct list_head super_list;
1: +  const struct cred *cred;
1: +  struct inode *inode;
1: +  nfs4_stateid stateid;
1: +  fmode_t type;
1: +  long unsigned int pagemod_limit;
1: +  __u64 change_attr;
1: +  long unsigned int flags;
1: +  refcount_t refcount;
1: +  spinlock_t lock;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct nfs_cache_array_entry {
1: -	u64 cookie;
1: -	u64 ino;
1: -	struct qstr string;
1: -	unsigned char d_type;
1: +  u64 cookie;
1: +  u64 ino;
1: +  struct qstr string;
1: +  unsigned char d_type;
1:  };
1:  
1:  struct nfs_cache_array {
1: -	int size;
1: -	int eof_index;
1: -	u64 last_cookie;
1: -	struct nfs_cache_array_entry array[0];
1: +  int size;
1: +  int eof_index;
1: +  u64 last_cookie;
1: +  struct nfs_cache_array_entry array[0];
1:  };
1:  
1:  typedef struct {
1: -	struct file *file;
1: -	struct page *page;
1: -	struct dir_context *ctx;
1: -	long unsigned int page_index;
1: -	u64 *dir_cookie;
1: -	u64 last_cookie;
1: -	loff_t current_index;
1: -	loff_t prev_index;
1: -	long unsigned int dir_verifier;
1: -	long unsigned int timestamp;
1: -	long unsigned int gencount;
1: -	unsigned int cache_entry_index;
1: -	bool plus;
1: -	bool eof;
1: +  struct file *file;
1: +  struct page *page;
1: +  struct dir_context *ctx;
1: +  long unsigned int page_index;
1: +  u64 *dir_cookie;
1: +  u64 last_cookie;
1: +  loff_t current_index;
1: +  loff_t prev_index;
1: +  long unsigned int dir_verifier;
1: +  long unsigned int timestamp;
1: +  long unsigned int gencount;
1: +  unsigned int cache_entry_index;
1: +  bool plus;
1: +  bool eof;
1:  } nfs_readdir_descriptor_t;
1:  
1:  struct nfs_find_desc {
1: -	struct nfs_fh *fh;
1: -	struct nfs_fattr *fattr;
1: +  struct nfs_fh *fh;
1: +  struct nfs_fattr *fattr;
1:  };
1:  
1:  struct nfs4_sessionid {
1: -	unsigned char data[16];
1: +  unsigned char data[16];
1:  };
1:  
1:  struct nfs4_channel_attrs {
1: -	u32 max_rqst_sz;
1: -	u32 max_resp_sz;
1: -	u32 max_resp_sz_cached;
1: -	u32 max_ops;
1: -	u32 max_reqs;
1: +  u32 max_rqst_sz;
1: +  u32 max_resp_sz;
1: +  u32 max_resp_sz_cached;
1: +  u32 max_ops;
1: +  u32 max_reqs;
1:  };
1:  
1:  struct nfs4_slot {
1: -	struct nfs4_slot_table *table;
1: -	struct nfs4_slot *next;
1: -	long unsigned int generation;
1: -	u32 slot_nr;
1: -	u32 seq_nr;
1: -	u32 seq_nr_last_acked;
1: -	u32 seq_nr_highest_sent;
1: -	unsigned int privileged: 1;
1: -	unsigned int seq_done: 1;
1: +  struct nfs4_slot_table *table;
1: +  struct nfs4_slot *next;
1: +  long unsigned int generation;
1: +  u32 slot_nr;
1: +  u32 seq_nr;
1: +  u32 seq_nr_last_acked;
1: +  u32 seq_nr_highest_sent;
1: +  unsigned int privileged : 1;
1: +  unsigned int seq_done : 1;
1:  };
1:  
1:  struct nfs4_slot_table {
1: -	struct nfs4_session *session;
1: -	struct nfs4_slot *slots;
1: -	long unsigned int used_slots[16];
1: -	spinlock_t slot_tbl_lock;
1: -	struct rpc_wait_queue slot_tbl_waitq;
1: -	wait_queue_head_t slot_waitq;
1: -	u32 max_slots;
1: -	u32 max_slotid;
1: -	u32 highest_used_slotid;
1: -	u32 target_highest_slotid;
1: -	u32 server_highest_slotid;
1: -	s32 d_target_highest_slotid;
1: -	s32 d2_target_highest_slotid;
1: -	long unsigned int generation;
1: -	struct completion complete;
1: -	long unsigned int slot_tbl_state;
1: +  struct nfs4_session *session;
1: +  struct nfs4_slot *slots;
1: +  long unsigned int used_slots[16];
1: +  spinlock_t slot_tbl_lock;
1: +  struct rpc_wait_queue slot_tbl_waitq;
1: +  wait_queue_head_t slot_waitq;
1: +  u32 max_slots;
1: +  u32 max_slotid;
1: +  u32 highest_used_slotid;
1: +  u32 target_highest_slotid;
1: +  u32 server_highest_slotid;
1: +  s32 d_target_highest_slotid;
1: +  s32 d2_target_highest_slotid;
1: +  long unsigned int generation;
1: +  struct completion complete;
1: +  long unsigned int slot_tbl_state;
1:  };
1:  
1:  struct nfs4_session {
1: -	struct nfs4_sessionid sess_id;
1: -	u32 flags;
1: -	long unsigned int session_state;
1: -	u32 hash_alg;
1: -	u32 ssv_len;
1: -	struct nfs4_channel_attrs fc_attrs;
1: -	struct nfs4_slot_table fc_slot_table;
1: -	struct nfs4_channel_attrs bc_attrs;
1: -	struct nfs4_slot_table bc_slot_table;
1: -	struct nfs_client *clp;
1: +  struct nfs4_sessionid sess_id;
1: +  u32 flags;
1: +  long unsigned int session_state;
1: +  u32 hash_alg;
1: +  u32 ssv_len;
1: +  struct nfs4_channel_attrs fc_attrs;
1: +  struct nfs4_slot_table fc_slot_table;
1: +  struct nfs4_channel_attrs bc_attrs;
1: +  struct nfs4_slot_table bc_slot_table;
1: +  struct nfs_client *clp;
1:  };
1:  
1:  struct nfs_mount_request {
1: -	struct sockaddr *sap;
1: -	size_t salen;
1: -	char *hostname;
1: -	char *dirpath;
1: -	u32 version;
1: -	short unsigned int protocol;
1: -	struct nfs_fh *fh;
1: -	int noresvport;
1: -	unsigned int *auth_flav_len;
1: -	rpc_authflavor_t *auth_flavs;
1: -	struct net *net;
1: +  struct sockaddr *sap;
1: +  size_t salen;
1: +  char *hostname;
1: +  char *dirpath;
1: +  u32 version;
1: +  short unsigned int protocol;
1: +  struct nfs_fh *fh;
1: +  int noresvport;
1: +  unsigned int *auth_flav_len;
1: +  rpc_authflavor_t *auth_flavs;
1: +  struct net *net;
1:  };
1:  
1:  struct proc_nfs_info {
1: -	int flag;
1: -	const char *str;
1: -	const char *nostr;
1: +  int flag;
1: +  const char *str;
1: +  const char *nostr;
1:  };
1:  
1:  enum {
1: -	NFS_IOHDR_ERROR = 0,
1: -	NFS_IOHDR_EOF = 1,
1: -	NFS_IOHDR_REDO = 2,
1: -	NFS_IOHDR_STAT = 3,
1: -	NFS_IOHDR_RESEND_PNFS = 4,
1: -	NFS_IOHDR_RESEND_MDS = 5,
1: +  NFS_IOHDR_ERROR = 0,
1: +  NFS_IOHDR_EOF = 1,
1: +  NFS_IOHDR_REDO = 2,
1: +  NFS_IOHDR_STAT = 3,
1: +  NFS_IOHDR_RESEND_PNFS = 4,
1: +  NFS_IOHDR_RESEND_MDS = 5,
1:  };
1:  
1:  struct nfs_direct_req {
1: -	struct kref kref;
1: -	struct nfs_open_context *ctx;
1: -	struct nfs_lock_context *l_ctx;
1: -	struct kiocb *iocb;
1: -	struct inode *inode;
1: -	atomic_t io_count;
1: -	spinlock_t lock;
1: -	loff_t io_start;
1: -	ssize_t count;
1: -	ssize_t max_count;
1: -	ssize_t bytes_left;
1: -	ssize_t error;
1: -	struct completion completion;
1: -	struct nfs_mds_commit_info mds_cinfo;
1: -	struct pnfs_ds_commit_info ds_cinfo;
1: -	struct work_struct work;
1: -	int flags;
1: -};
1: -
1: -enum {
1: -	PG_BUSY = 0,
1: -	PG_MAPPED = 1,
1: -	PG_CLEAN = 2,
1: -	PG_COMMIT_TO_DS = 3,
1: -	PG_INODE_REF = 4,
1: -	PG_HEADLOCK = 5,
1: -	PG_TEARDOWN = 6,
1: -	PG_UNLOCKPAGE = 7,
1: -	PG_UPTODATE = 8,
1: -	PG_WB_END = 9,
1: -	PG_REMOVE = 10,
1: -	PG_CONTENDED1 = 11,
1: -	PG_CONTENDED2 = 12,
1: +  struct kref kref;
1: +  struct nfs_open_context *ctx;
1: +  struct nfs_lock_context *l_ctx;
1: +  struct kiocb *iocb;
1: +  struct inode *inode;
1: +  atomic_t io_count;
1: +  spinlock_t lock;
1: +  loff_t io_start;
1: +  ssize_t count;
1: +  ssize_t max_count;
1: +  ssize_t bytes_left;
1: +  ssize_t error;
1: +  struct completion completion;
1: +  struct nfs_mds_commit_info mds_cinfo;
1: +  struct pnfs_ds_commit_info ds_cinfo;
1: +  struct work_struct work;
1: +  int flags;
1: +};
1: +
1: +enum {
1: +  PG_BUSY = 0,
1: +  PG_MAPPED = 1,
1: +  PG_CLEAN = 2,
1: +  PG_COMMIT_TO_DS = 3,
1: +  PG_INODE_REF = 4,
1: +  PG_HEADLOCK = 5,
1: +  PG_TEARDOWN = 6,
1: +  PG_UNLOCKPAGE = 7,
1: +  PG_UPTODATE = 8,
1: +  PG_WB_END = 9,
1: +  PG_REMOVE = 10,
1: +  PG_CONTENDED1 = 11,
1: +  PG_CONTENDED2 = 12,
1:  };
1:  
1:  struct nfs_pageio_descriptor;
1:  
1:  struct nfs_pageio_ops {
1: -	void (*pg_init)(struct nfs_pageio_descriptor *, struct nfs_page *);
1: -	size_t (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
1: -	int (*pg_doio)(struct nfs_pageio_descriptor *);
1: -	unsigned int (*pg_get_mirror_count)(struct nfs_pageio_descriptor *, struct nfs_page *);
1: -	void (*pg_cleanup)(struct nfs_pageio_descriptor *);
1: +  void (*pg_init)(struct nfs_pageio_descriptor *, struct nfs_page *);
1: +  size_t (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *,
1: +                    struct nfs_page *);
1: +  int (*pg_doio)(struct nfs_pageio_descriptor *);
1: +  unsigned int (*pg_get_mirror_count)(struct nfs_pageio_descriptor *,
1: +                                      struct nfs_page *);
1: +  void (*pg_cleanup)(struct nfs_pageio_descriptor *);
1:  };
1:  
1:  struct nfs_pgio_mirror {
1: -	struct list_head pg_list;
1: -	long unsigned int pg_bytes_written;
1: -	size_t pg_count;
1: -	size_t pg_bsize;
1: -	unsigned int pg_base;
1: -	unsigned char pg_recoalesce: 1;
1: +  struct list_head pg_list;
1: +  long unsigned int pg_bytes_written;
1: +  size_t pg_count;
1: +  size_t pg_bsize;
1: +  unsigned int pg_base;
1: +  unsigned char pg_recoalesce : 1;
1:  };
1:  
1:  struct nfs_pageio_descriptor {
1: -	struct inode *pg_inode;
1: -	const struct nfs_pageio_ops *pg_ops;
1: -	const struct nfs_rw_ops *pg_rw_ops;
1: -	int pg_ioflags;
1: -	int pg_error;
1: -	const struct rpc_call_ops *pg_rpc_callops;
1: -	const struct nfs_pgio_completion_ops *pg_completion_ops;
1: -	struct pnfs_layout_segment *pg_lseg;
1: -	struct nfs_io_completion *pg_io_completion;
1: -	struct nfs_direct_req *pg_dreq;
1: -	unsigned int pg_bsize;
1: -	u32 pg_mirror_count;
1: -	struct nfs_pgio_mirror *pg_mirrors;
1: -	struct nfs_pgio_mirror pg_mirrors_static[1];
1: -	struct nfs_pgio_mirror *pg_mirrors_dynamic;
1: -	u32 pg_mirror_idx;
1: -	short unsigned int pg_maxretrans;
1: -	unsigned char pg_moreio: 1;
1: +  struct inode *pg_inode;
1: +  const struct nfs_pageio_ops *pg_ops;
1: +  const struct nfs_rw_ops *pg_rw_ops;
1: +  int pg_ioflags;
1: +  int pg_error;
1: +  const struct rpc_call_ops *pg_rpc_callops;
1: +  const struct nfs_pgio_completion_ops *pg_completion_ops;
1: +  struct pnfs_layout_segment *pg_lseg;
1: +  struct nfs_io_completion *pg_io_completion;
1: +  struct nfs_direct_req *pg_dreq;
1: +  unsigned int pg_bsize;
1: +  u32 pg_mirror_count;
1: +  struct nfs_pgio_mirror *pg_mirrors;
1: +  struct nfs_pgio_mirror pg_mirrors_static[1];
1: +  struct nfs_pgio_mirror *pg_mirrors_dynamic;
1: +  u32 pg_mirror_idx;
1: +  short unsigned int pg_maxretrans;
1: +  unsigned char pg_moreio : 1;
1:  };
1:  
1:  struct nfs_readdesc {
1: -	struct nfs_pageio_descriptor *pgio;
1: -	struct nfs_open_context *ctx;
1: +  struct nfs_pageio_descriptor *pgio;
1: +  struct nfs_open_context *ctx;
1:  };
1:  
1:  struct nfs_io_completion {
1: -	void (*complete)(void *);
1: -	void *data;
1: -	struct kref refcount;
1: +  void (*complete)(void *);
1: +  void *data;
1: +  struct kref refcount;
1:  };
1:  
1:  enum pnfs_try_status {
1: -	PNFS_ATTEMPTED = 0,
1: -	PNFS_NOT_ATTEMPTED = 1,
1: -	PNFS_TRY_AGAIN = 2,
1: +  PNFS_ATTEMPTED = 0,
1: +  PNFS_NOT_ATTEMPTED = 1,
1: +  PNFS_TRY_AGAIN = 2,
1:  };
1:  
1:  enum {
1: -	MOUNTPROC_NULL = 0,
1: -	MOUNTPROC_MNT = 1,
1: -	MOUNTPROC_DUMP = 2,
1: -	MOUNTPROC_UMNT = 3,
1: -	MOUNTPROC_UMNTALL = 4,
1: -	MOUNTPROC_EXPORT = 5,
1: +  MOUNTPROC_NULL = 0,
1: +  MOUNTPROC_MNT = 1,
1: +  MOUNTPROC_DUMP = 2,
1: +  MOUNTPROC_UMNT = 3,
1: +  MOUNTPROC_UMNTALL = 4,
1: +  MOUNTPROC_EXPORT = 5,
1:  };
1:  
1:  enum {
1: -	MOUNTPROC3_NULL = 0,
1: -	MOUNTPROC3_MNT = 1,
1: -	MOUNTPROC3_DUMP = 2,
1: -	MOUNTPROC3_UMNT = 3,
1: -	MOUNTPROC3_UMNTALL = 4,
1: -	MOUNTPROC3_EXPORT = 5,
1: +  MOUNTPROC3_NULL = 0,
1: +  MOUNTPROC3_MNT = 1,
1: +  MOUNTPROC3_DUMP = 2,
1: +  MOUNTPROC3_UMNT = 3,
1: +  MOUNTPROC3_UMNTALL = 4,
1: +  MOUNTPROC3_EXPORT = 5,
1:  };
1:  
1:  enum mountstat {
1: -	MNT_OK = 0,
1: -	MNT_EPERM = 1,
1: -	MNT_ENOENT = 2,
1: -	MNT_EACCES = 13,
1: -	MNT_EINVAL = 22,
1: +  MNT_OK = 0,
1: +  MNT_EPERM = 1,
1: +  MNT_ENOENT = 2,
1: +  MNT_EACCES = 13,
1: +  MNT_EINVAL = 22,
1:  };
1:  
1:  enum mountstat3 {
1: -	MNT3_OK = 0,
1: -	MNT3ERR_PERM = 1,
1: -	MNT3ERR_NOENT = 2,
1: -	MNT3ERR_IO = 5,
1: -	MNT3ERR_ACCES = 13,
1: -	MNT3ERR_NOTDIR = 20,
1: -	MNT3ERR_INVAL = 22,
1: -	MNT3ERR_NAMETOOLONG = 63,
1: -	MNT3ERR_NOTSUPP = 10004,
1: -	MNT3ERR_SERVERFAULT = 10006,
1: +  MNT3_OK = 0,
1: +  MNT3ERR_PERM = 1,
1: +  MNT3ERR_NOENT = 2,
1: +  MNT3ERR_IO = 5,
1: +  MNT3ERR_ACCES = 13,
1: +  MNT3ERR_NOTDIR = 20,
1: +  MNT3ERR_INVAL = 22,
1: +  MNT3ERR_NAMETOOLONG = 63,
1: +  MNT3ERR_NOTSUPP = 10004,
1: +  MNT3ERR_SERVERFAULT = 10006,
1:  };
1:  
1:  struct mountres {
1: -	int errno;
1: -	struct nfs_fh *fh;
1: -	unsigned int *auth_count;
1: -	rpc_authflavor_t *auth_flavors;
1: +  int errno;
1: +  struct nfs_fh *fh;
1: +  unsigned int *auth_count;
1: +  rpc_authflavor_t *auth_flavors;
1:  };
1:  
1:  enum nfs_stat {
1: -	NFS_OK = 0,
1: -	NFSERR_PERM = 1,
1: -	NFSERR_NOENT = 2,
1: -	NFSERR_IO = 5,
1: -	NFSERR_NXIO = 6,
1: -	NFSERR_EAGAIN = 11,
1: -	NFSERR_ACCES = 13,
1: -	NFSERR_EXIST = 17,
1: -	NFSERR_XDEV = 18,
1: -	NFSERR_NODEV = 19,
1: -	NFSERR_NOTDIR = 20,
1: -	NFSERR_ISDIR = 21,
1: -	NFSERR_INVAL = 22,
1: -	NFSERR_FBIG = 27,
1: -	NFSERR_NOSPC = 28,
1: -	NFSERR_ROFS = 30,
1: -	NFSERR_MLINK = 31,
1: -	NFSERR_OPNOTSUPP = 45,
1: -	NFSERR_NAMETOOLONG = 63,
1: -	NFSERR_NOTEMPTY = 66,
1: -	NFSERR_DQUOT = 69,
1: -	NFSERR_STALE = 70,
1: -	NFSERR_REMOTE = 71,
1: -	NFSERR_WFLUSH = 99,
1: -	NFSERR_BADHANDLE = 10001,
1: -	NFSERR_NOT_SYNC = 10002,
1: -	NFSERR_BAD_COOKIE = 10003,
1: -	NFSERR_NOTSUPP = 10004,
1: -	NFSERR_TOOSMALL = 10005,
1: -	NFSERR_SERVERFAULT = 10006,
1: -	NFSERR_BADTYPE = 10007,
1: -	NFSERR_JUKEBOX = 10008,
1: -	NFSERR_SAME = 10009,
1: -	NFSERR_DENIED = 10010,
1: -	NFSERR_EXPIRED = 10011,
1: -	NFSERR_LOCKED = 10012,
1: -	NFSERR_GRACE = 10013,
1: -	NFSERR_FHEXPIRED = 10014,
1: -	NFSERR_SHARE_DENIED = 10015,
1: -	NFSERR_WRONGSEC = 10016,
1: -	NFSERR_CLID_INUSE = 10017,
1: -	NFSERR_RESOURCE = 10018,
1: -	NFSERR_MOVED = 10019,
1: -	NFSERR_NOFILEHANDLE = 10020,
1: -	NFSERR_MINOR_VERS_MISMATCH = 10021,
1: -	NFSERR_STALE_CLIENTID = 10022,
1: -	NFSERR_STALE_STATEID = 10023,
1: -	NFSERR_OLD_STATEID = 10024,
1: -	NFSERR_BAD_STATEID = 10025,
1: -	NFSERR_BAD_SEQID = 10026,
1: -	NFSERR_NOT_SAME = 10027,
1: -	NFSERR_LOCK_RANGE = 10028,
1: -	NFSERR_SYMLINK = 10029,
1: -	NFSERR_RESTOREFH = 10030,
1: -	NFSERR_LEASE_MOVED = 10031,
1: -	NFSERR_ATTRNOTSUPP = 10032,
1: -	NFSERR_NO_GRACE = 10033,
1: -	NFSERR_RECLAIM_BAD = 10034,
1: -	NFSERR_RECLAIM_CONFLICT = 10035,
1: -	NFSERR_BAD_XDR = 10036,
1: -	NFSERR_LOCKS_HELD = 10037,
1: -	NFSERR_OPENMODE = 10038,
1: -	NFSERR_BADOWNER = 10039,
1: -	NFSERR_BADCHAR = 10040,
1: -	NFSERR_BADNAME = 10041,
1: -	NFSERR_BAD_RANGE = 10042,
1: -	NFSERR_LOCK_NOTSUPP = 10043,
1: -	NFSERR_OP_ILLEGAL = 10044,
1: -	NFSERR_DEADLOCK = 10045,
1: -	NFSERR_FILE_OPEN = 10046,
1: -	NFSERR_ADMIN_REVOKED = 10047,
1: -	NFSERR_CB_PATH_DOWN = 10048,
1: +  NFS_OK = 0,
1: +  NFSERR_PERM = 1,
1: +  NFSERR_NOENT = 2,
1: +  NFSERR_IO = 5,
1: +  NFSERR_NXIO = 6,
1: +  NFSERR_EAGAIN = 11,
1: +  NFSERR_ACCES = 13,
1: +  NFSERR_EXIST = 17,
1: +  NFSERR_XDEV = 18,
1: +  NFSERR_NODEV = 19,
1: +  NFSERR_NOTDIR = 20,
1: +  NFSERR_ISDIR = 21,
1: +  NFSERR_INVAL = 22,
1: +  NFSERR_FBIG = 27,
1: +  NFSERR_NOSPC = 28,
1: +  NFSERR_ROFS = 30,
1: +  NFSERR_MLINK = 31,
1: +  NFSERR_OPNOTSUPP = 45,
1: +  NFSERR_NAMETOOLONG = 63,
1: +  NFSERR_NOTEMPTY = 66,
1: +  NFSERR_DQUOT = 69,
1: +  NFSERR_STALE = 70,
1: +  NFSERR_REMOTE = 71,
1: +  NFSERR_WFLUSH = 99,
1: +  NFSERR_BADHANDLE = 10001,
1: +  NFSERR_NOT_SYNC = 10002,
1: +  NFSERR_BAD_COOKIE = 10003,
1: +  NFSERR_NOTSUPP = 10004,
1: +  NFSERR_TOOSMALL = 10005,
1: +  NFSERR_SERVERFAULT = 10006,
1: +  NFSERR_BADTYPE = 10007,
1: +  NFSERR_JUKEBOX = 10008,
1: +  NFSERR_SAME = 10009,
1: +  NFSERR_DENIED = 10010,
1: +  NFSERR_EXPIRED = 10011,
1: +  NFSERR_LOCKED = 10012,
1: +  NFSERR_GRACE = 10013,
1: +  NFSERR_FHEXPIRED = 10014,
1: +  NFSERR_SHARE_DENIED = 10015,
1: +  NFSERR_WRONGSEC = 10016,
1: +  NFSERR_CLID_INUSE = 10017,
1: +  NFSERR_RESOURCE = 10018,
1: +  NFSERR_MOVED = 10019,
1: +  NFSERR_NOFILEHANDLE = 10020,
1: +  NFSERR_MINOR_VERS_MISMATCH = 10021,
1: +  NFSERR_STALE_CLIENTID = 10022,
1: +  NFSERR_STALE_STATEID = 10023,
1: +  NFSERR_OLD_STATEID = 10024,
1: +  NFSERR_BAD_STATEID = 10025,
1: +  NFSERR_BAD_SEQID = 10026,
1: +  NFSERR_NOT_SAME = 10027,
1: +  NFSERR_LOCK_RANGE = 10028,
1: +  NFSERR_SYMLINK = 10029,
1: +  NFSERR_RESTOREFH = 10030,
1: +  NFSERR_LEASE_MOVED = 10031,
1: +  NFSERR_ATTRNOTSUPP = 10032,
1: +  NFSERR_NO_GRACE = 10033,
1: +  NFSERR_RECLAIM_BAD = 10034,
1: +  NFSERR_RECLAIM_CONFLICT = 10035,
1: +  NFSERR_BAD_XDR = 10036,
1: +  NFSERR_LOCKS_HELD = 10037,
1: +  NFSERR_OPENMODE = 10038,
1: +  NFSERR_BADOWNER = 10039,
1: +  NFSERR_BADCHAR = 10040,
1: +  NFSERR_BADNAME = 10041,
1: +  NFSERR_BAD_RANGE = 10042,
1: +  NFSERR_LOCK_NOTSUPP = 10043,
1: +  NFSERR_OP_ILLEGAL = 10044,
1: +  NFSERR_DEADLOCK = 10045,
1: +  NFSERR_FILE_OPEN = 10046,
1: +  NFSERR_ADMIN_REVOKED = 10047,
1: +  NFSERR_CB_PATH_DOWN = 10048,
1:  };
1:  
1:  struct trace_event_raw_nfs_inode_event {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	u64 version;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  u64 version;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_inode_event_done {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	unsigned char type;
1: -	u64 fileid;
1: -	u64 version;
1: -	loff_t size;
1: -	long unsigned int nfsi_flags;
1: -	long unsigned int cache_validity;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  unsigned char type;
1: +  u64 fileid;
1: +  u64 version;
1: +  loff_t size;
1: +  long unsigned int nfsi_flags;
1: +  long unsigned int cache_validity;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_access_exit {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	unsigned char type;
1: -	u64 fileid;
1: -	u64 version;
1: -	loff_t size;
1: -	long unsigned int nfsi_flags;
1: -	long unsigned int cache_validity;
1: -	unsigned int mask;
1: -	unsigned int permitted;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  unsigned char type;
1: +  u64 fileid;
1: +  u64 version;
1: +  loff_t size;
1: +  long unsigned int nfsi_flags;
1: +  long unsigned int cache_validity;
1: +  unsigned int mask;
1: +  unsigned int permitted;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_lookup_event {
1: -	struct trace_entry ent;
1: -	long unsigned int flags;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int flags;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_lookup_event_done {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	long unsigned int flags;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  long unsigned int flags;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_atomic_open_enter {
1: -	struct trace_entry ent;
1: -	long unsigned int flags;
1: -	unsigned int fmode;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int flags;
1: +  unsigned int fmode;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_atomic_open_exit {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	long unsigned int flags;
1: -	unsigned int fmode;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  long unsigned int flags;
1: +  unsigned int fmode;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_create_enter {
1: -	struct trace_entry ent;
1: -	long unsigned int flags;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int flags;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_create_exit {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	long unsigned int flags;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  long unsigned int flags;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_directory_event {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_directory_event_done {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	dev_t dev;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  dev_t dev;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_link_enter {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 fileid;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 fileid;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_link_exit {
1: -	struct trace_entry ent;
1: -	long unsigned int error;
1: -	dev_t dev;
1: -	u64 fileid;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int error;
1: +  dev_t dev;
1: +  u64 fileid;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_rename_event {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u64 old_dir;
1: -	u64 new_dir;
1: -	u32 __data_loc_old_name;
1: -	u32 __data_loc_new_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u64 old_dir;
1: +  u64 new_dir;
1: +  u32 __data_loc_old_name;
1: +  u32 __data_loc_new_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_rename_event_done {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int error;
1: -	u64 old_dir;
1: -	u32 __data_loc_old_name;
1: -	u64 new_dir;
1: -	u32 __data_loc_new_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int error;
1: +  u64 old_dir;
1: +  u32 __data_loc_old_name;
1: +  u64 new_dir;
1: +  u32 __data_loc_new_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_sillyrename_unlink {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	long unsigned int error;
1: -	u64 dir;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  long unsigned int error;
1: +  u64 dir;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_initiate_read {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_readpage_done {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 arg_count;
1: -	u32 res_count;
1: -	bool eof;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 arg_count;
1: +  u32 res_count;
1: +  bool eof;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_readpage_short {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 arg_count;
1: -	u32 res_count;
1: -	bool eof;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 arg_count;
1: +  u32 res_count;
1: +  bool eof;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_pgio_error {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 arg_count;
1: -	u32 res_count;
1: -	loff_t pos;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 arg_count;
1: +  u32 res_count;
1: +  loff_t pos;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_initiate_write {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 count;
1: -	enum nfs3_stable_how stable;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 count;
1: +  enum nfs3_stable_how stable;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_writeback_done {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 arg_count;
1: -	u32 res_count;
1: -	int status;
1: -	enum nfs3_stable_how stable;
1: -	char verifier[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 arg_count;
1: +  u32 res_count;
1: +  int status;
1: +  enum nfs3_stable_how stable;
1: +  char verifier[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_page_error_class {
1: -	struct trace_entry ent;
1: -	const void *req;
1: -	long unsigned int index;
1: -	unsigned int offset;
1: -	unsigned int pgbase;
1: -	unsigned int bytes;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *req;
1: +  long unsigned int index;
1: +  unsigned int offset;
1: +  unsigned int pgbase;
1: +  unsigned int bytes;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_initiate_commit {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	u32 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  u32 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_commit_done {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	loff_t offset;
1: -	int status;
1: -	enum nfs3_stable_how stable;
1: -	char verifier[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  loff_t offset;
1: +  int status;
1: +  enum nfs3_stable_how stable;
1: +  char verifier[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_fh_to_dentry {
1: -	struct trace_entry ent;
1: -	int error;
1: -	dev_t dev;
1: -	u32 fhandle;
1: -	u64 fileid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int error;
1: +  dev_t dev;
1: +  u32 fhandle;
1: +  u64 fileid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_nfs_xdr_status {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	u32 xid;
1: -	int version;
1: -	long unsigned int error;
1: -	u32 __data_loc_program;
1: -	u32 __data_loc_procedure;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  u32 xid;
1: +  int version;
1: +  long unsigned int error;
1: +  u32 __data_loc_program;
1: +  u32 __data_loc_procedure;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_inode_event {};
1: @@ -50981,57 +51679,57 @@ struct trace_event_data_offsets_nfs_inode_event_done {};
1:  struct trace_event_data_offsets_nfs_access_exit {};
1:  
1:  struct trace_event_data_offsets_nfs_lookup_event {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_lookup_event_done {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_atomic_open_enter {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_atomic_open_exit {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_create_enter {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_create_exit {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_directory_event {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_directory_event_done {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_link_enter {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_link_exit {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_rename_event {
1: -	u32 old_name;
1: -	u32 new_name;
1: +  u32 old_name;
1: +  u32 new_name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_rename_event_done {
1: -	u32 old_name;
1: -	u32 new_name;
1: +  u32 old_name;
1: +  u32 new_name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_sillyrename_unlink {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_nfs_initiate_read {};
1: @@ -51055,23 +51753,29 @@ struct trace_event_data_offsets_nfs_commit_done {};
1:  struct trace_event_data_offsets_nfs_fh_to_dentry {};
1:  
1:  struct trace_event_data_offsets_nfs_xdr_status {
1: -	u32 program;
1: -	u32 procedure;
1: +  u32 program;
1: +  u32 procedure;
1:  };
1:  
1:  typedef void (*btf_trace_nfs_set_inode_stale)(void *, const struct inode *);
1:  
1:  typedef void (*btf_trace_nfs_refresh_inode_enter)(void *, const struct inode *);
1:  
1: -typedef void (*btf_trace_nfs_refresh_inode_exit)(void *, const struct inode *, int);
1: +typedef void (*btf_trace_nfs_refresh_inode_exit)(void *, const struct inode *,
1: +                                                 int);
1:  
1: -typedef void (*btf_trace_nfs_revalidate_inode_enter)(void *, const struct inode *);
1: +typedef void (*btf_trace_nfs_revalidate_inode_enter)(void *,
1: +                                                     const struct inode *);
1:  
1: -typedef void (*btf_trace_nfs_revalidate_inode_exit)(void *, const struct inode *, int);
1: +typedef void (*btf_trace_nfs_revalidate_inode_exit)(void *,
1: +                                                    const struct inode *, int);
1:  
1: -typedef void (*btf_trace_nfs_invalidate_mapping_enter)(void *, const struct inode *);
1: +typedef void (*btf_trace_nfs_invalidate_mapping_enter)(void *,
1: +                                                       const struct inode *);
1:  
1: -typedef void (*btf_trace_nfs_invalidate_mapping_exit)(void *, const struct inode *, int);
1: +typedef void (*btf_trace_nfs_invalidate_mapping_exit)(void *,
1: +                                                      const struct inode *,
1: +                                                      int);
1:  
1:  typedef void (*btf_trace_nfs_getattr_enter)(void *, const struct inode *);
1:  
1: @@ -51081,13 +51785,17 @@ typedef void (*btf_trace_nfs_setattr_enter)(void *, const struct inode *);
1:  
1:  typedef void (*btf_trace_nfs_setattr_exit)(void *, const struct inode *, int);
1:  
1: -typedef void (*btf_trace_nfs_writeback_page_enter)(void *, const struct inode *);
1: +typedef void (*btf_trace_nfs_writeback_page_enter)(void *,
1: +                                                   const struct inode *);
1:  
1: -typedef void (*btf_trace_nfs_writeback_page_exit)(void *, const struct inode *, int);
1: +typedef void (*btf_trace_nfs_writeback_page_exit)(void *, const struct inode *,
1: +                                                  int);
1:  
1: -typedef void (*btf_trace_nfs_writeback_inode_enter)(void *, const struct inode *);
1: +typedef void (*btf_trace_nfs_writeback_inode_enter)(void *,
1: +                                                    const struct inode *);
1:  
1: -typedef void (*btf_trace_nfs_writeback_inode_exit)(void *, const struct inode *, int);
1: +typedef void (*btf_trace_nfs_writeback_inode_exit)(void *, const struct inode *,
1: +                                                   int);
1:  
1:  typedef void (*btf_trace_nfs_fsync_enter)(void *, const struct inode *);
1:  
1: @@ -51095,636 +51803,691 @@ typedef void (*btf_trace_nfs_fsync_exit)(void *, const struct inode *, int);
1:  
1:  typedef void (*btf_trace_nfs_access_enter)(void *, const struct inode *);
1:  
1: -typedef void (*btf_trace_nfs_access_exit)(void *, const struct inode *, unsigned int, unsigned int, int);
1: +typedef void (*btf_trace_nfs_access_exit)(void *, const struct inode *,
1: +                                          unsigned int, unsigned int, int);
1:  
1: -typedef void (*btf_trace_nfs_lookup_enter)(void *, const struct inode *, const struct dentry *, unsigned int);
1: +typedef void (*btf_trace_nfs_lookup_enter)(void *, const struct inode *,
1: +                                           const struct dentry *, unsigned int);
1:  
1: -typedef void (*btf_trace_nfs_lookup_exit)(void *, const struct inode *, const struct dentry *, unsigned int, int);
1: +typedef void (*btf_trace_nfs_lookup_exit)(void *, const struct inode *,
1: +                                          const struct dentry *, unsigned int,
1: +                                          int);
1:  
1: -typedef void (*btf_trace_nfs_lookup_revalidate_enter)(void *, const struct inode *, const struct dentry *, unsigned int);
1: +typedef void (*btf_trace_nfs_lookup_revalidate_enter)(void *,
1: +                                                      const struct inode *,
1: +                                                      const struct dentry *,
1: +                                                      unsigned int);
1:  
1: -typedef void (*btf_trace_nfs_lookup_revalidate_exit)(void *, const struct inode *, const struct dentry *, unsigned int, int);
1: +typedef void (*btf_trace_nfs_lookup_revalidate_exit)(void *,
1: +                                                     const struct inode *,
1: +                                                     const struct dentry *,
1: +                                                     unsigned int, int);
1:  
1: -typedef void (*btf_trace_nfs_atomic_open_enter)(void *, const struct inode *, const struct nfs_open_context *, unsigned int);
1: +typedef void (*btf_trace_nfs_atomic_open_enter)(void *, const struct inode *,
1: +                                                const struct nfs_open_context *,
1: +                                                unsigned int);
1:  
1: -typedef void (*btf_trace_nfs_atomic_open_exit)(void *, const struct inode *, const struct nfs_open_context *, unsigned int, int);
1: +typedef void (*btf_trace_nfs_atomic_open_exit)(void *, const struct inode *,
1: +                                               const struct nfs_open_context *,
1: +                                               unsigned int, int);
1:  
1: -typedef void (*btf_trace_nfs_create_enter)(void *, const struct inode *, const struct dentry *, unsigned int);
1: +typedef void (*btf_trace_nfs_create_enter)(void *, const struct inode *,
1: +                                           const struct dentry *, unsigned int);
1:  
1: -typedef void (*btf_trace_nfs_create_exit)(void *, const struct inode *, const struct dentry *, unsigned int, int);
1: +typedef void (*btf_trace_nfs_create_exit)(void *, const struct inode *,
1: +                                          const struct dentry *, unsigned int,
1: +                                          int);
1:  
1: -typedef void (*btf_trace_nfs_mknod_enter)(void *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_mknod_enter)(void *, const struct inode *,
1: +                                          const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_mknod_exit)(void *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_mknod_exit)(void *, const struct inode *,
1: +                                         const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_mkdir_enter)(void *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_mkdir_enter)(void *, const struct inode *,
1: +                                          const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_mkdir_exit)(void *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_mkdir_exit)(void *, const struct inode *,
1: +                                         const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_rmdir_enter)(void *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_rmdir_enter)(void *, const struct inode *,
1: +                                          const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_rmdir_exit)(void *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_rmdir_exit)(void *, const struct inode *,
1: +                                         const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_remove_enter)(void *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_remove_enter)(void *, const struct inode *,
1: +                                           const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_remove_exit)(void *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_remove_exit)(void *, const struct inode *,
1: +                                          const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_unlink_enter)(void *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_unlink_enter)(void *, const struct inode *,
1: +                                           const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_unlink_exit)(void *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_unlink_exit)(void *, const struct inode *,
1: +                                          const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_symlink_enter)(void *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_symlink_enter)(void *, const struct inode *,
1: +                                            const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_symlink_exit)(void *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_symlink_exit)(void *, const struct inode *,
1: +                                           const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_link_enter)(void *, const struct inode *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_link_enter)(void *, const struct inode *,
1: +                                         const struct inode *,
1: +                                         const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_link_exit)(void *, const struct inode *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_link_exit)(void *, const struct inode *,
1: +                                        const struct inode *,
1: +                                        const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_rename_enter)(void *, const struct inode *, const struct dentry *, const struct inode *, const struct dentry *);
1: +typedef void (*btf_trace_nfs_rename_enter)(void *, const struct inode *,
1: +                                           const struct dentry *,
1: +                                           const struct inode *,
1: +                                           const struct dentry *);
1:  
1: -typedef void (*btf_trace_nfs_rename_exit)(void *, const struct inode *, const struct dentry *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_rename_exit)(void *, const struct inode *,
1: +                                          const struct dentry *,
1: +                                          const struct inode *,
1: +                                          const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_sillyrename_rename)(void *, const struct inode *, const struct dentry *, const struct inode *, const struct dentry *, int);
1: +typedef void (*btf_trace_nfs_sillyrename_rename)(void *, const struct inode *,
1: +                                                 const struct dentry *,
1: +                                                 const struct inode *,
1: +                                                 const struct dentry *, int);
1:  
1: -typedef void (*btf_trace_nfs_sillyrename_unlink)(void *, const struct nfs_unlinkdata *, int);
1: +typedef void (*btf_trace_nfs_sillyrename_unlink)(void *,
1: +                                                 const struct nfs_unlinkdata *,
1: +                                                 int);
1:  
1: -typedef void (*btf_trace_nfs_initiate_read)(void *, const struct nfs_pgio_header *);
1: +typedef void (*btf_trace_nfs_initiate_read)(void *,
1: +                                            const struct nfs_pgio_header *);
1:  
1: -typedef void (*btf_trace_nfs_readpage_done)(void *, const struct rpc_task *, const struct nfs_pgio_header *);
1: +typedef void (*btf_trace_nfs_readpage_done)(void *, const struct rpc_task *,
1: +                                            const struct nfs_pgio_header *);
1:  
1: -typedef void (*btf_trace_nfs_readpage_short)(void *, const struct rpc_task *, const struct nfs_pgio_header *);
1: +typedef void (*btf_trace_nfs_readpage_short)(void *, const struct rpc_task *,
1: +                                             const struct nfs_pgio_header *);
1:  
1: -typedef void (*btf_trace_nfs_pgio_error)(void *, const struct nfs_pgio_header *, int, loff_t);
1: +typedef void (*btf_trace_nfs_pgio_error)(void *, const struct nfs_pgio_header *,
1: +                                         int, loff_t);
1:  
1: -typedef void (*btf_trace_nfs_initiate_write)(void *, const struct nfs_pgio_header *);
1: +typedef void (*btf_trace_nfs_initiate_write)(void *,
1: +                                             const struct nfs_pgio_header *);
1:  
1: -typedef void (*btf_trace_nfs_writeback_done)(void *, const struct rpc_task *, const struct nfs_pgio_header *);
1: +typedef void (*btf_trace_nfs_writeback_done)(void *, const struct rpc_task *,
1: +                                             const struct nfs_pgio_header *);
1:  
1:  typedef void (*btf_trace_nfs_write_error)(void *, const struct nfs_page *, int);
1:  
1:  typedef void (*btf_trace_nfs_comp_error)(void *, const struct nfs_page *, int);
1:  
1: -typedef void (*btf_trace_nfs_commit_error)(void *, const struct nfs_page *, int);
1: +typedef void (*btf_trace_nfs_commit_error)(void *, const struct nfs_page *,
1: +                                           int);
1:  
1: -typedef void (*btf_trace_nfs_initiate_commit)(void *, const struct nfs_commit_data *);
1: +typedef void (*btf_trace_nfs_initiate_commit)(void *,
1: +                                              const struct nfs_commit_data *);
1:  
1: -typedef void (*btf_trace_nfs_commit_done)(void *, const struct rpc_task *, const struct nfs_commit_data *);
1: +typedef void (*btf_trace_nfs_commit_done)(void *, const struct rpc_task *,
1: +                                          const struct nfs_commit_data *);
1:  
1: -typedef void (*btf_trace_nfs_fh_to_dentry)(void *, const struct super_block *, const struct nfs_fh *, u64, int);
1: +typedef void (*btf_trace_nfs_fh_to_dentry)(void *, const struct super_block *,
1: +                                           const struct nfs_fh *, u64, int);
1:  
1: -typedef void (*btf_trace_nfs_xdr_status)(void *, const struct xdr_stream *, int);
1: +typedef void (*btf_trace_nfs_xdr_status)(void *, const struct xdr_stream *,
1: +                                         int);
1:  
1:  enum {
1: -	FILEID_HIGH_OFF = 0,
1: -	FILEID_LOW_OFF = 1,
1: -	FILE_I_TYPE_OFF = 2,
1: -	EMBED_FH_OFF = 3,
1: +  FILEID_HIGH_OFF = 0,
1: +  FILEID_LOW_OFF = 1,
1: +  FILE_I_TYPE_OFF = 2,
1: +  EMBED_FH_OFF = 3,
1:  };
1:  
1:  struct nfs2_fh {
1: -	char data[32];
1: +  char data[32];
1:  };
1:  
1:  struct nfs3_fh {
1: -	short unsigned int size;
1: -	unsigned char data[64];
1: +  short unsigned int size;
1: +  unsigned char data[64];
1:  };
1:  
1:  struct nfs_mount_data {
1: -	int version;
1: -	int fd;
1: -	struct nfs2_fh old_root;
1: -	int flags;
1: -	int rsize;
1: -	int wsize;
1: -	int timeo;
1: -	int retrans;
1: -	int acregmin;
1: -	int acregmax;
1: -	int acdirmin;
1: -	int acdirmax;
1: -	struct sockaddr_in addr;
1: -	char hostname[256];
1: -	int namlen;
1: -	unsigned int bsize;
1: -	struct nfs3_fh root;
1: -	int pseudoflavor;
1: -	char context[257];
1: +  int version;
1: +  int fd;
1: +  struct nfs2_fh old_root;
1: +  int flags;
1: +  int rsize;
1: +  int wsize;
1: +  int timeo;
1: +  int retrans;
1: +  int acregmin;
1: +  int acregmax;
1: +  int acdirmin;
1: +  int acdirmax;
1: +  struct sockaddr_in addr;
1: +  char hostname[256];
1: +  int namlen;
1: +  unsigned int bsize;
1: +  struct nfs3_fh root;
1: +  int pseudoflavor;
1: +  char context[257];
1:  };
1:  
1:  struct nfs_string {
1: -	unsigned int len;
1: -	const char *data;
1: +  unsigned int len;
1: +  const char *data;
1:  };
1:  
1:  struct nfs4_mount_data {
1: -	int version;
1: -	int flags;
1: -	int rsize;
1: -	int wsize;
1: -	int timeo;
1: -	int retrans;
1: -	int acregmin;
1: -	int acregmax;
1: -	int acdirmin;
1: -	int acdirmax;
1: -	struct nfs_string client_addr;
1: -	struct nfs_string mnt_path;
1: -	struct nfs_string hostname;
1: -	unsigned int host_addrlen;
1: -	struct sockaddr *host_addr;
1: -	int proto;
1: -	int auth_flavourlen;
1: -	int *auth_flavours;
1: +  int version;
1: +  int flags;
1: +  int rsize;
1: +  int wsize;
1: +  int timeo;
1: +  int retrans;
1: +  int acregmin;
1: +  int acregmax;
1: +  int acdirmin;
1: +  int acdirmax;
1: +  struct nfs_string client_addr;
1: +  struct nfs_string mnt_path;
1: +  struct nfs_string hostname;
1: +  unsigned int host_addrlen;
1: +  struct sockaddr *host_addr;
1: +  int proto;
1: +  int auth_flavourlen;
1: +  int *auth_flavours;
1:  };
1:  
1:  enum nfs_param {
1: -	Opt_ac = 0,
1: -	Opt_acdirmax = 1,
1: -	Opt_acdirmin = 2,
1: -	Opt_acl___2 = 3,
1: -	Opt_acregmax = 4,
1: -	Opt_acregmin = 5,
1: -	Opt_actimeo = 6,
1: -	Opt_addr = 7,
1: -	Opt_bg = 8,
1: -	Opt_bsize = 9,
1: -	Opt_clientaddr = 10,
1: -	Opt_cto = 11,
1: -	Opt_fg = 12,
1: -	Opt_fscache = 13,
1: -	Opt_fscache_flag = 14,
1: -	Opt_hard = 15,
1: -	Opt_intr = 16,
1: -	Opt_local_lock = 17,
1: -	Opt_lock = 18,
1: -	Opt_lookupcache = 19,
1: -	Opt_migration = 20,
1: -	Opt_minorversion = 21,
1: -	Opt_mountaddr = 22,
1: -	Opt_mounthost = 23,
1: -	Opt_mountport = 24,
1: -	Opt_mountproto = 25,
1: -	Opt_mountvers = 26,
1: -	Opt_namelen = 27,
1: -	Opt_nconnect = 28,
1: -	Opt_port = 29,
1: -	Opt_posix = 30,
1: -	Opt_proto = 31,
1: -	Opt_rdirplus = 32,
1: -	Opt_rdma = 33,
1: -	Opt_resvport = 34,
1: -	Opt_retrans = 35,
1: -	Opt_retry = 36,
1: -	Opt_rsize = 37,
1: -	Opt_sec = 38,
1: -	Opt_sharecache = 39,
1: -	Opt_sloppy = 40,
1: -	Opt_soft = 41,
1: -	Opt_softerr = 42,
1: -	Opt_softreval = 43,
1: -	Opt_source = 44,
1: -	Opt_tcp = 45,
1: -	Opt_timeo = 46,
1: -	Opt_udp = 47,
1: -	Opt_v = 48,
1: -	Opt_vers = 49,
1: -	Opt_wsize = 50,
1: -};
1: -
1: -enum {
1: -	Opt_local_lock_all = 0,
1: -	Opt_local_lock_flock = 1,
1: -	Opt_local_lock_none = 2,
1: -	Opt_local_lock_posix = 3,
1: -};
1: -
1: -enum {
1: -	Opt_lookupcache_all = 0,
1: -	Opt_lookupcache_none = 1,
1: -	Opt_lookupcache_positive = 2,
1: -};
1: -
1: -enum {
1: -	Opt_vers_2 = 0,
1: -	Opt_vers_3 = 1,
1: -	Opt_vers_4 = 2,
1: -	Opt_vers_4_0 = 3,
1: -	Opt_vers_4_1 = 4,
1: -	Opt_vers_4_2 = 5,
1: -};
1: -
1: -enum {
1: -	Opt_xprt_rdma = 0,
1: -	Opt_xprt_rdma6 = 1,
1: -	Opt_xprt_tcp = 2,
1: -	Opt_xprt_tcp6 = 3,
1: -	Opt_xprt_udp = 4,
1: -	Opt_xprt_udp6 = 5,
1: -	nr__Opt_xprt = 6,
1: -};
1: -
1: -enum {
1: -	Opt_sec_krb5 = 0,
1: -	Opt_sec_krb5i = 1,
1: -	Opt_sec_krb5p = 2,
1: -	Opt_sec_lkey = 3,
1: -	Opt_sec_lkeyi = 4,
1: -	Opt_sec_lkeyp = 5,
1: -	Opt_sec_none = 6,
1: -	Opt_sec_spkm = 7,
1: -	Opt_sec_spkmi = 8,
1: -	Opt_sec_spkmp = 9,
1: -	Opt_sec_sys = 10,
1: -	nr__Opt_sec = 11,
1: +  Opt_ac = 0,
1: +  Opt_acdirmax = 1,
1: +  Opt_acdirmin = 2,
1: +  Opt_acl___2 = 3,
1: +  Opt_acregmax = 4,
1: +  Opt_acregmin = 5,
1: +  Opt_actimeo = 6,
1: +  Opt_addr = 7,
1: +  Opt_bg = 8,
1: +  Opt_bsize = 9,
1: +  Opt_clientaddr = 10,
1: +  Opt_cto = 11,
1: +  Opt_fg = 12,
1: +  Opt_fscache = 13,
1: +  Opt_fscache_flag = 14,
1: +  Opt_hard = 15,
1: +  Opt_intr = 16,
1: +  Opt_local_lock = 17,
1: +  Opt_lock = 18,
1: +  Opt_lookupcache = 19,
1: +  Opt_migration = 20,
1: +  Opt_minorversion = 21,
1: +  Opt_mountaddr = 22,
1: +  Opt_mounthost = 23,
1: +  Opt_mountport = 24,
1: +  Opt_mountproto = 25,
1: +  Opt_mountvers = 26,
1: +  Opt_namelen = 27,
1: +  Opt_nconnect = 28,
1: +  Opt_port = 29,
1: +  Opt_posix = 30,
1: +  Opt_proto = 31,
1: +  Opt_rdirplus = 32,
1: +  Opt_rdma = 33,
1: +  Opt_resvport = 34,
1: +  Opt_retrans = 35,
1: +  Opt_retry = 36,
1: +  Opt_rsize = 37,
1: +  Opt_sec = 38,
1: +  Opt_sharecache = 39,
1: +  Opt_sloppy = 40,
1: +  Opt_soft = 41,
1: +  Opt_softerr = 42,
1: +  Opt_softreval = 43,
1: +  Opt_source = 44,
1: +  Opt_tcp = 45,
1: +  Opt_timeo = 46,
1: +  Opt_udp = 47,
1: +  Opt_v = 48,
1: +  Opt_vers = 49,
1: +  Opt_wsize = 50,
1: +};
1: +
1: +enum {
1: +  Opt_local_lock_all = 0,
1: +  Opt_local_lock_flock = 1,
1: +  Opt_local_lock_none = 2,
1: +  Opt_local_lock_posix = 3,
1: +};
1: +
1: +enum {
1: +  Opt_lookupcache_all = 0,
1: +  Opt_lookupcache_none = 1,
1: +  Opt_lookupcache_positive = 2,
1: +};
1: +
1: +enum {
1: +  Opt_vers_2 = 0,
1: +  Opt_vers_3 = 1,
1: +  Opt_vers_4 = 2,
1: +  Opt_vers_4_0 = 3,
1: +  Opt_vers_4_1 = 4,
1: +  Opt_vers_4_2 = 5,
1: +};
1: +
1: +enum {
1: +  Opt_xprt_rdma = 0,
1: +  Opt_xprt_rdma6 = 1,
1: +  Opt_xprt_tcp = 2,
1: +  Opt_xprt_tcp6 = 3,
1: +  Opt_xprt_udp = 4,
1: +  Opt_xprt_udp6 = 5,
1: +  nr__Opt_xprt = 6,
1: +};
1: +
1: +enum {
1: +  Opt_sec_krb5 = 0,
1: +  Opt_sec_krb5i = 1,
1: +  Opt_sec_krb5p = 2,
1: +  Opt_sec_lkey = 3,
1: +  Opt_sec_lkeyi = 4,
1: +  Opt_sec_lkeyp = 5,
1: +  Opt_sec_none = 6,
1: +  Opt_sec_spkm = 7,
1: +  Opt_sec_spkmi = 8,
1: +  Opt_sec_spkmp = 9,
1: +  Opt_sec_sys = 10,
1: +  nr__Opt_sec = 11,
1:  };
1:  
1:  struct compat_nfs_string {
1: -	compat_uint_t len;
1: -	compat_uptr_t data;
1: +  compat_uint_t len;
1: +  compat_uptr_t data;
1:  };
1:  
1:  struct compat_nfs4_mount_data_v1 {
1: -	compat_int_t version;
1: -	compat_int_t flags;
1: -	compat_int_t rsize;
1: -	compat_int_t wsize;
1: -	compat_int_t timeo;
1: -	compat_int_t retrans;
1: -	compat_int_t acregmin;
1: -	compat_int_t acregmax;
1: -	compat_int_t acdirmin;
1: -	compat_int_t acdirmax;
1: -	struct compat_nfs_string client_addr;
1: -	struct compat_nfs_string mnt_path;
1: -	struct compat_nfs_string hostname;
1: -	compat_uint_t host_addrlen;
1: -	compat_uptr_t host_addr;
1: -	compat_int_t proto;
1: -	compat_int_t auth_flavourlen;
1: -	compat_uptr_t auth_flavours;
1: +  compat_int_t version;
1: +  compat_int_t flags;
1: +  compat_int_t rsize;
1: +  compat_int_t wsize;
1: +  compat_int_t timeo;
1: +  compat_int_t retrans;
1: +  compat_int_t acregmin;
1: +  compat_int_t acregmax;
1: +  compat_int_t acdirmin;
1: +  compat_int_t acdirmax;
1: +  struct compat_nfs_string client_addr;
1: +  struct compat_nfs_string mnt_path;
1: +  struct compat_nfs_string hostname;
1: +  compat_uint_t host_addrlen;
1: +  compat_uptr_t host_addr;
1: +  compat_int_t proto;
1: +  compat_int_t auth_flavourlen;
1: +  compat_uptr_t auth_flavours;
1:  };
1:  
1:  enum nfs3_createmode {
1: -	NFS3_CREATE_UNCHECKED = 0,
1: -	NFS3_CREATE_GUARDED = 1,
1: -	NFS3_CREATE_EXCLUSIVE = 2,
1: +  NFS3_CREATE_UNCHECKED = 0,
1: +  NFS3_CREATE_GUARDED = 1,
1: +  NFS3_CREATE_EXCLUSIVE = 2,
1:  };
1:  
1:  enum nfs3_ftype {
1: -	NF3NON = 0,
1: -	NF3REG = 1,
1: -	NF3DIR = 2,
1: -	NF3BLK = 3,
1: -	NF3CHR = 4,
1: -	NF3LNK = 5,
1: -	NF3SOCK = 6,
1: -	NF3FIFO = 7,
1: -	NF3BAD = 8,
1: +  NF3NON = 0,
1: +  NF3REG = 1,
1: +  NF3DIR = 2,
1: +  NF3BLK = 3,
1: +  NF3CHR = 4,
1: +  NF3LNK = 5,
1: +  NF3SOCK = 6,
1: +  NF3FIFO = 7,
1: +  NF3BAD = 8,
1:  };
1:  
1:  struct nfs3_sattrargs {
1: -	struct nfs_fh *fh;
1: -	struct iattr *sattr;
1: -	unsigned int guard;
1: -	struct timespec64 guardtime;
1: +  struct nfs_fh *fh;
1: +  struct iattr *sattr;
1: +  unsigned int guard;
1: +  struct timespec64 guardtime;
1:  };
1:  
1:  struct nfs3_diropargs {
1: -	struct nfs_fh *fh;
1: -	const char *name;
1: -	unsigned int len;
1: +  struct nfs_fh *fh;
1: +  const char *name;
1: +  unsigned int len;
1:  };
1:  
1:  struct nfs3_accessargs {
1: -	struct nfs_fh *fh;
1: -	__u32 access;
1: +  struct nfs_fh *fh;
1: +  __u32 access;
1:  };
1:  
1:  struct nfs3_createargs {
1: -	struct nfs_fh *fh;
1: -	const char *name;
1: -	unsigned int len;
1: -	struct iattr *sattr;
1: -	enum nfs3_createmode createmode;
1: -	__be32 verifier[2];
1: +  struct nfs_fh *fh;
1: +  const char *name;
1: +  unsigned int len;
1: +  struct iattr *sattr;
1: +  enum nfs3_createmode createmode;
1: +  __be32 verifier[2];
1:  };
1:  
1:  struct nfs3_mkdirargs {
1: -	struct nfs_fh *fh;
1: -	const char *name;
1: -	unsigned int len;
1: -	struct iattr *sattr;
1: +  struct nfs_fh *fh;
1: +  const char *name;
1: +  unsigned int len;
1: +  struct iattr *sattr;
1:  };
1:  
1:  struct nfs3_symlinkargs {
1: -	struct nfs_fh *fromfh;
1: -	const char *fromname;
1: -	unsigned int fromlen;
1: -	struct page **pages;
1: -	unsigned int pathlen;
1: -	struct iattr *sattr;
1: +  struct nfs_fh *fromfh;
1: +  const char *fromname;
1: +  unsigned int fromlen;
1: +  struct page **pages;
1: +  unsigned int pathlen;
1: +  struct iattr *sattr;
1:  };
1:  
1:  struct nfs3_mknodargs {
1: -	struct nfs_fh *fh;
1: -	const char *name;
1: -	unsigned int len;
1: -	enum nfs3_ftype type;
1: -	struct iattr *sattr;
1: -	dev_t rdev;
1: +  struct nfs_fh *fh;
1: +  const char *name;
1: +  unsigned int len;
1: +  enum nfs3_ftype type;
1: +  struct iattr *sattr;
1: +  dev_t rdev;
1:  };
1:  
1:  struct nfs3_linkargs {
1: -	struct nfs_fh *fromfh;
1: -	struct nfs_fh *tofh;
1: -	const char *toname;
1: -	unsigned int tolen;
1: +  struct nfs_fh *fromfh;
1: +  struct nfs_fh *tofh;
1: +  const char *toname;
1: +  unsigned int tolen;
1:  };
1:  
1:  struct nfs3_readdirargs {
1: -	struct nfs_fh *fh;
1: -	__u64 cookie;
1: -	__be32 verf[2];
1: -	bool plus;
1: -	unsigned int count;
1: -	struct page **pages;
1: +  struct nfs_fh *fh;
1: +  __u64 cookie;
1: +  __be32 verf[2];
1: +  bool plus;
1: +  unsigned int count;
1: +  struct page **pages;
1:  };
1:  
1:  struct nfs3_diropres {
1: -	struct nfs_fattr *dir_attr;
1: -	struct nfs_fh *fh;
1: -	struct nfs_fattr *fattr;
1: +  struct nfs_fattr *dir_attr;
1: +  struct nfs_fh *fh;
1: +  struct nfs_fattr *fattr;
1:  };
1:  
1:  struct nfs3_accessres {
1: -	struct nfs_fattr *fattr;
1: -	__u32 access;
1: +  struct nfs_fattr *fattr;
1: +  __u32 access;
1:  };
1:  
1:  struct nfs3_readlinkargs {
1: -	struct nfs_fh *fh;
1: -	unsigned int pgbase;
1: -	unsigned int pglen;
1: -	struct page **pages;
1: +  struct nfs_fh *fh;
1: +  unsigned int pgbase;
1: +  unsigned int pglen;
1: +  struct page **pages;
1:  };
1:  
1:  struct nfs3_linkres {
1: -	struct nfs_fattr *dir_attr;
1: -	struct nfs_fattr *fattr;
1: +  struct nfs_fattr *dir_attr;
1: +  struct nfs_fattr *fattr;
1:  };
1:  
1:  struct nfs3_readdirres {
1: -	struct nfs_fattr *dir_attr;
1: -	__be32 *verf;
1: -	bool plus;
1: +  struct nfs_fattr *dir_attr;
1: +  __be32 *verf;
1: +  bool plus;
1:  };
1:  
1:  struct nfs3_createdata {
1: -	struct rpc_message msg;
1: -	union {
1: -		struct nfs3_createargs create;
1: -		struct nfs3_mkdirargs mkdir;
1: -		struct nfs3_symlinkargs symlink;
1: -		struct nfs3_mknodargs mknod;
1: -	} arg;
1: -	struct nfs3_diropres res;
1: -	struct nfs_fh fh;
1: -	struct nfs_fattr fattr;
1: -	struct nfs_fattr dir_attr;
1: +  struct rpc_message msg;
1: +  union {
1: +    struct nfs3_createargs create;
1: +    struct nfs3_mkdirargs mkdir;
1: +    struct nfs3_symlinkargs symlink;
1: +    struct nfs3_mknodargs mknod;
1: +  } arg;
1: +  struct nfs3_diropres res;
1: +  struct nfs_fh fh;
1: +  struct nfs_fattr fattr;
1: +  struct nfs_fattr dir_attr;
1:  };
1:  
1:  struct nfs3_getaclargs {
1: -	struct nfs_fh *fh;
1: -	int mask;
1: -	struct page **pages;
1: +  struct nfs_fh *fh;
1: +  int mask;
1: +  struct page **pages;
1:  };
1:  
1:  struct nfs3_setaclargs {
1: -	struct inode *inode;
1: -	int mask;
1: -	struct posix_acl *acl_access;
1: -	struct posix_acl *acl_default;
1: -	size_t len;
1: -	unsigned int npages;
1: -	struct page **pages;
1: +  struct inode *inode;
1: +  int mask;
1: +  struct posix_acl *acl_access;
1: +  struct posix_acl *acl_default;
1: +  size_t len;
1: +  unsigned int npages;
1: +  struct page **pages;
1:  };
1:  
1:  struct nfs3_getaclres {
1: -	struct nfs_fattr *fattr;
1: -	int mask;
1: -	unsigned int acl_access_count;
1: -	unsigned int acl_default_count;
1: -	struct posix_acl *acl_access;
1: -	struct posix_acl *acl_default;
1: +  struct nfs_fattr *fattr;
1: +  int mask;
1: +  unsigned int acl_access_count;
1: +  unsigned int acl_default_count;
1: +  struct posix_acl *acl_access;
1: +  struct posix_acl *acl_default;
1:  };
1:  
1:  struct getdents_callback___2 {
1: -	struct dir_context ctx;
1: -	char *name;
1: -	u64 ino;
1: -	int found;
1: -	int sequence;
1: +  struct dir_context ctx;
1: +  char *name;
1: +  u64 ino;
1: +  int found;
1: +  int sequence;
1:  };
1:  
1:  struct nlm_host___2;
1:  
1:  struct nlm_lockowner {
1: -	struct list_head list;
1: -	refcount_t count;
1: -	struct nlm_host___2 *host;
1: -	fl_owner_t owner;
1: -	uint32_t pid;
1: +  struct list_head list;
1: +  refcount_t count;
1: +  struct nlm_host___2 *host;
1: +  fl_owner_t owner;
1: +  uint32_t pid;
1:  };
1:  
1:  struct nsm_handle;
1:  
1:  struct nlm_host___2 {
1: -	struct hlist_node h_hash;
1: -	struct __kernel_sockaddr_storage h_addr;
1: -	size_t h_addrlen;
1: -	struct __kernel_sockaddr_storage h_srcaddr;
1: -	size_t h_srcaddrlen;
1: -	struct rpc_clnt *h_rpcclnt;
1: -	char *h_name;
1: -	u32 h_version;
1: -	short unsigned int h_proto;
1: -	short unsigned int h_reclaiming: 1;
1: -	short unsigned int h_server: 1;
1: -	short unsigned int h_noresvport: 1;
1: -	short unsigned int h_inuse: 1;
1: -	wait_queue_head_t h_gracewait;
1: -	struct rw_semaphore h_rwsem;
1: -	u32 h_state;
1: -	u32 h_nsmstate;
1: -	u32 h_pidcount;
1: -	refcount_t h_count;
1: -	struct mutex h_mutex;
1: -	long unsigned int h_nextrebind;
1: -	long unsigned int h_expires;
1: -	struct list_head h_lockowners;
1: -	spinlock_t h_lock;
1: -	struct list_head h_granted;
1: -	struct list_head h_reclaim;
1: -	struct nsm_handle *h_nsmhandle;
1: -	char *h_addrbuf;
1: -	struct net *net;
1: -	const struct cred *h_cred;
1: -	char nodename[65];
1: -	const struct nlmclnt_operations *h_nlmclnt_ops;
1: -};
1: -
1: -enum {
1: -	NLM_LCK_GRANTED = 0,
1: -	NLM_LCK_DENIED = 1,
1: -	NLM_LCK_DENIED_NOLOCKS = 2,
1: -	NLM_LCK_BLOCKED = 3,
1: -	NLM_LCK_DENIED_GRACE_PERIOD = 4,
1: -	NLM_DEADLCK = 5,
1: -	NLM_ROFS = 6,
1: -	NLM_STALE_FH = 7,
1: -	NLM_FBIG = 8,
1: -	NLM_FAILED = 9,
1: +  struct hlist_node h_hash;
1: +  struct __kernel_sockaddr_storage h_addr;
1: +  size_t h_addrlen;
1: +  struct __kernel_sockaddr_storage h_srcaddr;
1: +  size_t h_srcaddrlen;
1: +  struct rpc_clnt *h_rpcclnt;
1: +  char *h_name;
1: +  u32 h_version;
1: +  short unsigned int h_proto;
1: +  short unsigned int h_reclaiming : 1;
1: +  short unsigned int h_server : 1;
1: +  short unsigned int h_noresvport : 1;
1: +  short unsigned int h_inuse : 1;
1: +  wait_queue_head_t h_gracewait;
1: +  struct rw_semaphore h_rwsem;
1: +  u32 h_state;
1: +  u32 h_nsmstate;
1: +  u32 h_pidcount;
1: +  refcount_t h_count;
1: +  struct mutex h_mutex;
1: +  long unsigned int h_nextrebind;
1: +  long unsigned int h_expires;
1: +  struct list_head h_lockowners;
1: +  spinlock_t h_lock;
1: +  struct list_head h_granted;
1: +  struct list_head h_reclaim;
1: +  struct nsm_handle *h_nsmhandle;
1: +  char *h_addrbuf;
1: +  struct net *net;
1: +  const struct cred *h_cred;
1: +  char nodename[65];
1: +  const struct nlmclnt_operations *h_nlmclnt_ops;
1: +};
1: +
1: +enum {
1: +  NLM_LCK_GRANTED = 0,
1: +  NLM_LCK_DENIED = 1,
1: +  NLM_LCK_DENIED_NOLOCKS = 2,
1: +  NLM_LCK_BLOCKED = 3,
1: +  NLM_LCK_DENIED_GRACE_PERIOD = 4,
1: +  NLM_DEADLCK = 5,
1: +  NLM_ROFS = 6,
1: +  NLM_STALE_FH = 7,
1: +  NLM_FBIG = 8,
1: +  NLM_FAILED = 9,
1:  };
1:  
1:  struct nsm_private {
1: -	unsigned char data[16];
1: +  unsigned char data[16];
1:  };
1:  
1:  struct nlm_lock {
1: -	char *caller;
1: -	unsigned int len;
1: -	struct nfs_fh fh;
1: -	struct xdr_netobj oh;
1: -	u32 svid;
1: -	struct file_lock fl;
1: +  char *caller;
1: +  unsigned int len;
1: +  struct nfs_fh fh;
1: +  struct xdr_netobj oh;
1: +  u32 svid;
1: +  struct file_lock fl;
1:  };
1:  
1:  struct nlm_cookie {
1: -	unsigned char data[32];
1: -	unsigned int len;
1: +  unsigned char data[32];
1: +  unsigned int len;
1:  };
1:  
1:  struct nlm_args {
1: -	struct nlm_cookie cookie;
1: -	struct nlm_lock lock;
1: -	u32 block;
1: -	u32 reclaim;
1: -	u32 state;
1: -	u32 monitor;
1: -	u32 fsm_access;
1: -	u32 fsm_mode;
1: +  struct nlm_cookie cookie;
1: +  struct nlm_lock lock;
1: +  u32 block;
1: +  u32 reclaim;
1: +  u32 state;
1: +  u32 monitor;
1: +  u32 fsm_access;
1: +  u32 fsm_mode;
1:  };
1:  
1:  struct nlm_res {
1: -	struct nlm_cookie cookie;
1: -	__be32 status;
1: -	struct nlm_lock lock;
1: +  struct nlm_cookie cookie;
1: +  __be32 status;
1: +  struct nlm_lock lock;
1:  };
1:  
1:  struct nsm_handle {
1: -	struct list_head sm_link;
1: -	refcount_t sm_count;
1: -	char *sm_mon_name;
1: -	char *sm_name;
1: -	struct __kernel_sockaddr_storage sm_addr;
1: -	size_t sm_addrlen;
1: -	unsigned int sm_monitored: 1;
1: -	unsigned int sm_sticky: 1;
1: -	struct nsm_private sm_priv;
1: -	char sm_addrbuf[51];
1: +  struct list_head sm_link;
1: +  refcount_t sm_count;
1: +  char *sm_mon_name;
1: +  char *sm_name;
1: +  struct __kernel_sockaddr_storage sm_addr;
1: +  size_t sm_addrlen;
1: +  unsigned int sm_monitored : 1;
1: +  unsigned int sm_sticky : 1;
1: +  struct nsm_private sm_priv;
1: +  char sm_addrbuf[51];
1:  };
1:  
1:  struct nlm_block;
1:  
1:  struct nlm_rqst {
1: -	refcount_t a_count;
1: -	unsigned int a_flags;
1: -	struct nlm_host___2 *a_host;
1: -	struct nlm_args a_args;
1: -	struct nlm_res a_res;
1: -	struct nlm_block *a_block;
1: -	unsigned int a_retries;
1: -	u8 a_owner[74];
1: -	void *a_callback_data;
1: +  refcount_t a_count;
1: +  unsigned int a_flags;
1: +  struct nlm_host___2 *a_host;
1: +  struct nlm_args a_args;
1: +  struct nlm_res a_res;
1: +  struct nlm_block *a_block;
1: +  unsigned int a_retries;
1: +  u8 a_owner[74];
1: +  void *a_callback_data;
1:  };
1:  
1:  struct nlm_file;
1:  
1:  struct nlm_block {
1: -	struct kref b_count;
1: -	struct list_head b_list;
1: -	struct list_head b_flist;
1: -	struct nlm_rqst *b_call;
1: -	struct svc_serv *b_daemon;
1: -	struct nlm_host___2 *b_host;
1: -	long unsigned int b_when;
1: -	unsigned int b_id;
1: -	unsigned char b_granted;
1: -	struct nlm_file *b_file;
1: -	struct cache_req *b_cache_req;
1: -	struct cache_deferred_req *b_deferred_req;
1: -	unsigned int b_flags;
1: +  struct kref b_count;
1: +  struct list_head b_list;
1: +  struct list_head b_flist;
1: +  struct nlm_rqst *b_call;
1: +  struct svc_serv *b_daemon;
1: +  struct nlm_host___2 *b_host;
1: +  long unsigned int b_when;
1: +  unsigned int b_id;
1: +  unsigned char b_granted;
1: +  struct nlm_file *b_file;
1: +  struct cache_req *b_cache_req;
1: +  struct cache_deferred_req *b_deferred_req;
1: +  unsigned int b_flags;
1:  };
1:  
1:  struct nlm_share;
1:  
1:  struct nlm_file {
1: -	struct hlist_node f_list;
1: -	struct nfs_fh f_handle;
1: -	struct file *f_file;
1: -	struct nlm_share *f_shares;
1: -	struct list_head f_blocks;
1: -	unsigned int f_locks;
1: -	unsigned int f_count;
1: -	struct mutex f_mutex;
1: +  struct hlist_node f_list;
1: +  struct nfs_fh f_handle;
1: +  struct file *f_file;
1: +  struct nlm_share *f_shares;
1: +  struct list_head f_blocks;
1: +  unsigned int f_locks;
1: +  unsigned int f_count;
1: +  struct mutex f_mutex;
1:  };
1:  
1:  struct nlm_wait {
1: -	struct list_head b_list;
1: -	wait_queue_head_t b_wait;
1: -	struct nlm_host___2 *b_host;
1: -	struct file_lock *b_lock;
1: -	short unsigned int b_reclaim;
1: -	__be32 b_status;
1: +  struct list_head b_list;
1: +  wait_queue_head_t b_wait;
1: +  struct nlm_host___2 *b_host;
1: +  struct file_lock *b_lock;
1: +  short unsigned int b_reclaim;
1: +  __be32 b_status;
1:  };
1:  
1:  struct nlm_wait___2;
1:  
1:  struct nlm_reboot {
1: -	char *mon;
1: -	unsigned int len;
1: -	u32 state;
1: -	struct nsm_private priv;
1: +  char *mon;
1: +  unsigned int len;
1: +  u32 state;
1: +  struct nsm_private priv;
1:  };
1:  
1:  struct lockd_net {
1: -	unsigned int nlmsvc_users;
1: -	long unsigned int next_gc;
1: -	long unsigned int nrhosts;
1: -	struct delayed_work grace_period_end;
1: -	struct lock_manager lockd_manager;
1: -	struct list_head nsm_handles;
1: +  unsigned int nlmsvc_users;
1: +  long unsigned int next_gc;
1: +  long unsigned int nrhosts;
1: +  struct delayed_work grace_period_end;
1: +  struct lock_manager lockd_manager;
1: +  struct list_head nsm_handles;
1:  };
1:  
1:  struct nlm_lookup_host_info {
1: -	const int server;
1: -	const struct sockaddr *sap;
1: -	const size_t salen;
1: -	const short unsigned int protocol;
1: -	const u32 version;
1: -	const char *hostname;
1: -	const size_t hostname_len;
1: -	const int noresvport;
1: -	struct net *net;
1: -	const struct cred *cred;
1: +  const int server;
1: +  const struct sockaddr *sap;
1: +  const size_t salen;
1: +  const short unsigned int protocol;
1: +  const u32 version;
1: +  const char *hostname;
1: +  const size_t hostname_len;
1: +  const int noresvport;
1: +  struct net *net;
1: +  const struct cred *cred;
1:  };
1:  
1:  struct ipv4_devconf {
1: -	void *sysctl;
1: -	int data[32];
1: -	long unsigned int state[1];
1: +  void *sysctl;
1: +  int data[32];
1: +  long unsigned int state[1];
1:  };
1:  
1:  struct in_ifaddr;
1: @@ -51732,137 +52495,137 @@ struct in_ifaddr;
1:  struct ip_mc_list;
1:  
1:  struct in_device {
1: -	struct net_device *dev;
1: -	refcount_t refcnt;
1: -	int dead;
1: -	struct in_ifaddr *ifa_list;
1: -	struct ip_mc_list *mc_list;
1: -	struct ip_mc_list **mc_hash;
1: -	int mc_count;
1: -	spinlock_t mc_tomb_lock;
1: -	struct ip_mc_list *mc_tomb;
1: -	long unsigned int mr_v1_seen;
1: -	long unsigned int mr_v2_seen;
1: -	long unsigned int mr_maxdelay;
1: -	long unsigned int mr_qi;
1: -	long unsigned int mr_qri;
1: -	unsigned char mr_qrv;
1: -	unsigned char mr_gq_running;
1: -	unsigned char mr_ifc_count;
1: -	struct timer_list mr_gq_timer;
1: -	struct timer_list mr_ifc_timer;
1: -	struct neigh_parms *arp_parms;
1: -	struct ipv4_devconf cnf;
1: -	struct callback_head callback_head;
1: +  struct net_device *dev;
1: +  refcount_t refcnt;
1: +  int dead;
1: +  struct in_ifaddr *ifa_list;
1: +  struct ip_mc_list *mc_list;
1: +  struct ip_mc_list **mc_hash;
1: +  int mc_count;
1: +  spinlock_t mc_tomb_lock;
1: +  struct ip_mc_list *mc_tomb;
1: +  long unsigned int mr_v1_seen;
1: +  long unsigned int mr_v2_seen;
1: +  long unsigned int mr_maxdelay;
1: +  long unsigned int mr_qi;
1: +  long unsigned int mr_qri;
1: +  unsigned char mr_qrv;
1: +  unsigned char mr_gq_running;
1: +  unsigned char mr_ifc_count;
1: +  struct timer_list mr_gq_timer;
1: +  struct timer_list mr_ifc_timer;
1: +  struct neigh_parms *arp_parms;
1: +  struct ipv4_devconf cnf;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct in_ifaddr {
1: -	struct hlist_node hash;
1: -	struct in_ifaddr *ifa_next;
1: -	struct in_device *ifa_dev;
1: -	struct callback_head callback_head;
1: -	__be32 ifa_local;
1: -	__be32 ifa_address;
1: -	__be32 ifa_mask;
1: -	__u32 ifa_rt_priority;
1: -	__be32 ifa_broadcast;
1: -	unsigned char ifa_scope;
1: -	unsigned char ifa_prefixlen;
1: -	__u32 ifa_flags;
1: -	char ifa_label[16];
1: -	__u32 ifa_valid_lft;
1: -	__u32 ifa_preferred_lft;
1: -	long unsigned int ifa_cstamp;
1: -	long unsigned int ifa_tstamp;
1: +  struct hlist_node hash;
1: +  struct in_ifaddr *ifa_next;
1: +  struct in_device *ifa_dev;
1: +  struct callback_head callback_head;
1: +  __be32 ifa_local;
1: +  __be32 ifa_address;
1: +  __be32 ifa_mask;
1: +  __u32 ifa_rt_priority;
1: +  __be32 ifa_broadcast;
1: +  unsigned char ifa_scope;
1: +  unsigned char ifa_prefixlen;
1: +  __u32 ifa_flags;
1: +  char ifa_label[16];
1: +  __u32 ifa_valid_lft;
1: +  __u32 ifa_preferred_lft;
1: +  long unsigned int ifa_cstamp;
1: +  long unsigned int ifa_tstamp;
1:  };
1:  
1:  struct inet6_ifaddr {
1: -	struct in6_addr addr;
1: -	__u32 prefix_len;
1: -	__u32 rt_priority;
1: -	__u32 valid_lft;
1: -	__u32 prefered_lft;
1: -	refcount_t refcnt;
1: -	spinlock_t lock;
1: -	int state;
1: -	__u32 flags;
1: -	__u8 dad_probes;
1: -	__u8 stable_privacy_retry;
1: -	__u16 scope;
1: -	__u64 dad_nonce;
1: -	long unsigned int cstamp;
1: -	long unsigned int tstamp;
1: -	struct delayed_work dad_work;
1: -	struct inet6_dev *idev;
1: -	struct fib6_info *rt;
1: -	struct hlist_node addr_lst;
1: -	struct list_head if_list;
1: -	struct list_head tmp_list;
1: -	struct inet6_ifaddr *ifpub;
1: -	int regen_count;
1: -	bool tokenized;
1: -	struct callback_head rcu;
1: -	struct in6_addr peer_addr;
1: +  struct in6_addr addr;
1: +  __u32 prefix_len;
1: +  __u32 rt_priority;
1: +  __u32 valid_lft;
1: +  __u32 prefered_lft;
1: +  refcount_t refcnt;
1: +  spinlock_t lock;
1: +  int state;
1: +  __u32 flags;
1: +  __u8 dad_probes;
1: +  __u8 stable_privacy_retry;
1: +  __u16 scope;
1: +  __u64 dad_nonce;
1: +  long unsigned int cstamp;
1: +  long unsigned int tstamp;
1: +  struct delayed_work dad_work;
1: +  struct inet6_dev *idev;
1: +  struct fib6_info *rt;
1: +  struct hlist_node addr_lst;
1: +  struct list_head if_list;
1: +  struct list_head tmp_list;
1: +  struct inet6_ifaddr *ifpub;
1: +  int regen_count;
1: +  bool tokenized;
1: +  struct callback_head rcu;
1: +  struct in6_addr peer_addr;
1:  };
1:  
1:  struct nlmsvc_binding {
1: -	__be32 (*fopen)(struct svc_rqst *, struct nfs_fh *, struct file **);
1: -	void (*fclose)(struct file *);
1: +  __be32 (*fopen)(struct svc_rqst *, struct nfs_fh *, struct file **);
1: +  void (*fclose)(struct file *);
1:  };
1:  
1:  typedef int (*nlm_host_match_fn_t)(void *, struct nlm_host___2 *);
1:  
1:  struct nlm_share {
1: -	struct nlm_share *s_next;
1: -	struct nlm_host___2 *s_host;
1: -	struct nlm_file *s_file;
1: -	struct xdr_netobj s_owner;
1: -	u32 s_access;
1: -	u32 s_mode;
1: +  struct nlm_share *s_next;
1: +  struct nlm_host___2 *s_host;
1: +  struct nlm_file *s_file;
1: +  struct xdr_netobj s_owner;
1: +  u32 s_access;
1: +  u32 s_mode;
1:  };
1:  
1:  enum rpc_accept_stat {
1: -	RPC_SUCCESS = 0,
1: -	RPC_PROG_UNAVAIL = 1,
1: -	RPC_PROG_MISMATCH = 2,
1: -	RPC_PROC_UNAVAIL = 3,
1: -	RPC_GARBAGE_ARGS = 4,
1: -	RPC_SYSTEM_ERR = 5,
1: -	RPC_DROP_REPLY = 60000,
1: +  RPC_SUCCESS = 0,
1: +  RPC_PROG_UNAVAIL = 1,
1: +  RPC_PROG_MISMATCH = 2,
1: +  RPC_PROC_UNAVAIL = 3,
1: +  RPC_GARBAGE_ARGS = 4,
1: +  RPC_SYSTEM_ERR = 5,
1: +  RPC_DROP_REPLY = 60000,
1:  };
1:  
1:  enum {
1: -	NSMPROC_NULL = 0,
1: -	NSMPROC_STAT = 1,
1: -	NSMPROC_MON = 2,
1: -	NSMPROC_UNMON = 3,
1: -	NSMPROC_UNMON_ALL = 4,
1: -	NSMPROC_SIMU_CRASH = 5,
1: -	NSMPROC_NOTIFY = 6,
1: +  NSMPROC_NULL = 0,
1: +  NSMPROC_STAT = 1,
1: +  NSMPROC_MON = 2,
1: +  NSMPROC_UNMON = 3,
1: +  NSMPROC_UNMON_ALL = 4,
1: +  NSMPROC_SIMU_CRASH = 5,
1: +  NSMPROC_NOTIFY = 6,
1:  };
1:  
1:  struct nsm_args {
1: -	struct nsm_private *priv;
1: -	u32 prog;
1: -	u32 vers;
1: -	u32 proc;
1: -	char *mon_name;
1: -	const char *nodename;
1: +  struct nsm_private *priv;
1: +  u32 prog;
1: +  u32 vers;
1: +  u32 proc;
1: +  char *mon_name;
1: +  const char *nodename;
1:  };
1:  
1:  struct nsm_res {
1: -	u32 status;
1: -	u32 state;
1: +  u32 status;
1: +  u32 state;
1:  };
1:  
1:  typedef u32 unicode_t;
1:  
1:  struct utf8_table {
1: -	int cmask;
1: -	int cval;
1: -	int shift;
1: -	long int lmask;
1: -	long int lval;
1: +  int cmask;
1: +  int cval;
1: +  int shift;
1: +  long int lmask;
1: +  long int lval;
1:  };
1:  
1:  typedef unsigned int autofs_wqt_t;
1: @@ -51870,139 +52633,139 @@ typedef unsigned int autofs_wqt_t;
1:  struct autofs_sb_info;
1:  
1:  struct autofs_info {
1: -	struct dentry *dentry;
1: -	struct inode *inode;
1: -	int flags;
1: -	struct completion expire_complete;
1: -	struct list_head active;
1: -	struct list_head expiring;
1: -	struct autofs_sb_info *sbi;
1: -	long unsigned int last_used;
1: -	int count;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	struct callback_head rcu;
1: +  struct dentry *dentry;
1: +  struct inode *inode;
1: +  int flags;
1: +  struct completion expire_complete;
1: +  struct list_head active;
1: +  struct list_head expiring;
1: +  struct autofs_sb_info *sbi;
1: +  long unsigned int last_used;
1: +  int count;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct autofs_wait_queue;
1:  
1:  struct autofs_sb_info {
1: -	u32 magic;
1: -	int pipefd;
1: -	struct file *pipe;
1: -	struct pid *oz_pgrp;
1: -	int version;
1: -	int sub_version;
1: -	int min_proto;
1: -	int max_proto;
1: -	unsigned int flags;
1: -	long unsigned int exp_timeout;
1: -	unsigned int type;
1: -	struct super_block *sb;
1: -	struct mutex wq_mutex;
1: -	struct mutex pipe_mutex;
1: -	spinlock_t fs_lock;
1: -	struct autofs_wait_queue *queues;
1: -	spinlock_t lookup_lock;
1: -	struct list_head active_list;
1: -	struct list_head expiring_list;
1: -	struct callback_head rcu;
1: +  u32 magic;
1: +  int pipefd;
1: +  struct file *pipe;
1: +  struct pid *oz_pgrp;
1: +  int version;
1: +  int sub_version;
1: +  int min_proto;
1: +  int max_proto;
1: +  unsigned int flags;
1: +  long unsigned int exp_timeout;
1: +  unsigned int type;
1: +  struct super_block *sb;
1: +  struct mutex wq_mutex;
1: +  struct mutex pipe_mutex;
1: +  spinlock_t fs_lock;
1: +  struct autofs_wait_queue *queues;
1: +  spinlock_t lookup_lock;
1: +  struct list_head active_list;
1: +  struct list_head expiring_list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct autofs_wait_queue {
1: -	wait_queue_head_t queue;
1: -	struct autofs_wait_queue *next;
1: -	autofs_wqt_t wait_queue_token;
1: -	struct qstr name;
1: -	u32 dev;
1: -	u64 ino;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	pid_t pid;
1: -	pid_t tgid;
1: -	int status;
1: -	unsigned int wait_ctr;
1: -};
1: -
1: -enum {
1: -	Opt_err___4 = 0,
1: -	Opt_fd = 1,
1: -	Opt_uid___5 = 2,
1: -	Opt_gid___6 = 3,
1: -	Opt_pgrp = 4,
1: -	Opt_minproto = 5,
1: -	Opt_maxproto = 6,
1: -	Opt_indirect = 7,
1: -	Opt_direct = 8,
1: -	Opt_offset = 9,
1: -	Opt_strictexpire = 10,
1: -	Opt_ignore___2 = 11,
1: -};
1: -
1: -enum {
1: -	AUTOFS_IOC_READY_CMD = 96,
1: -	AUTOFS_IOC_FAIL_CMD = 97,
1: -	AUTOFS_IOC_CATATONIC_CMD = 98,
1: -	AUTOFS_IOC_PROTOVER_CMD = 99,
1: -	AUTOFS_IOC_SETTIMEOUT_CMD = 100,
1: -	AUTOFS_IOC_EXPIRE_CMD = 101,
1: +  wait_queue_head_t queue;
1: +  struct autofs_wait_queue *next;
1: +  autofs_wqt_t wait_queue_token;
1: +  struct qstr name;
1: +  u32 dev;
1: +  u64 ino;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  pid_t pid;
1: +  pid_t tgid;
1: +  int status;
1: +  unsigned int wait_ctr;
1: +};
1: +
1: +enum {
1: +  Opt_err___4 = 0,
1: +  Opt_fd = 1,
1: +  Opt_uid___5 = 2,
1: +  Opt_gid___6 = 3,
1: +  Opt_pgrp = 4,
1: +  Opt_minproto = 5,
1: +  Opt_maxproto = 6,
1: +  Opt_indirect = 7,
1: +  Opt_direct = 8,
1: +  Opt_offset = 9,
1: +  Opt_strictexpire = 10,
1: +  Opt_ignore___2 = 11,
1: +};
1: +
1: +enum {
1: +  AUTOFS_IOC_READY_CMD = 96,
1: +  AUTOFS_IOC_FAIL_CMD = 97,
1: +  AUTOFS_IOC_CATATONIC_CMD = 98,
1: +  AUTOFS_IOC_PROTOVER_CMD = 99,
1: +  AUTOFS_IOC_SETTIMEOUT_CMD = 100,
1: +  AUTOFS_IOC_EXPIRE_CMD = 101,
1:  };
1:  
1:  enum autofs_notify {
1: -	NFY_NONE = 0,
1: -	NFY_MOUNT = 1,
1: -	NFY_EXPIRE = 2,
1: +  NFY_NONE = 0,
1: +  NFY_MOUNT = 1,
1: +  NFY_EXPIRE = 2,
1:  };
1:  
1:  enum {
1: -	AUTOFS_IOC_EXPIRE_MULTI_CMD = 102,
1: -	AUTOFS_IOC_PROTOSUBVER_CMD = 103,
1: -	AUTOFS_IOC_ASKUMOUNT_CMD = 112,
1: +  AUTOFS_IOC_EXPIRE_MULTI_CMD = 102,
1: +  AUTOFS_IOC_PROTOSUBVER_CMD = 103,
1: +  AUTOFS_IOC_ASKUMOUNT_CMD = 112,
1:  };
1:  
1:  struct autofs_packet_hdr {
1: -	int proto_version;
1: -	int type;
1: +  int proto_version;
1: +  int type;
1:  };
1:  
1:  struct autofs_packet_missing {
1: -	struct autofs_packet_hdr hdr;
1: -	autofs_wqt_t wait_queue_token;
1: -	int len;
1: -	char name[256];
1: +  struct autofs_packet_hdr hdr;
1: +  autofs_wqt_t wait_queue_token;
1: +  int len;
1: +  char name[256];
1:  };
1:  
1:  struct autofs_packet_expire {
1: -	struct autofs_packet_hdr hdr;
1: -	int len;
1: -	char name[256];
1: +  struct autofs_packet_hdr hdr;
1: +  int len;
1: +  char name[256];
1:  };
1:  
1:  struct autofs_packet_expire_multi {
1: -	struct autofs_packet_hdr hdr;
1: -	autofs_wqt_t wait_queue_token;
1: -	int len;
1: -	char name[256];
1: +  struct autofs_packet_hdr hdr;
1: +  autofs_wqt_t wait_queue_token;
1: +  int len;
1: +  char name[256];
1:  };
1:  
1:  union autofs_packet_union {
1: -	struct autofs_packet_hdr hdr;
1: -	struct autofs_packet_missing missing;
1: -	struct autofs_packet_expire expire;
1: -	struct autofs_packet_expire_multi expire_multi;
1: +  struct autofs_packet_hdr hdr;
1: +  struct autofs_packet_missing missing;
1: +  struct autofs_packet_expire expire;
1: +  struct autofs_packet_expire_multi expire_multi;
1:  };
1:  
1:  struct autofs_v5_packet {
1: -	struct autofs_packet_hdr hdr;
1: -	autofs_wqt_t wait_queue_token;
1: -	__u32 dev;
1: -	__u64 ino;
1: -	__u32 uid;
1: -	__u32 gid;
1: -	__u32 pid;
1: -	__u32 tgid;
1: -	__u32 len;
1: -	char name[256];
1: +  struct autofs_packet_hdr hdr;
1: +  autofs_wqt_t wait_queue_token;
1: +  __u32 dev;
1: +  __u64 ino;
1: +  __u32 uid;
1: +  __u32 gid;
1: +  __u32 pid;
1: +  __u32 tgid;
1: +  __u32 len;
1: +  char name[256];
1:  };
1:  
1:  typedef struct autofs_v5_packet autofs_packet_missing_indirect_t;
1: @@ -52014,736 +52777,738 @@ typedef struct autofs_v5_packet autofs_packet_missing_direct_t;
1:  typedef struct autofs_v5_packet autofs_packet_expire_direct_t;
1:  
1:  union autofs_v5_packet_union {
1: -	struct autofs_packet_hdr hdr;
1: -	struct autofs_v5_packet v5_packet;
1: -	autofs_packet_missing_indirect_t missing_indirect;
1: -	autofs_packet_expire_indirect_t expire_indirect;
1: -	autofs_packet_missing_direct_t missing_direct;
1: -	autofs_packet_expire_direct_t expire_direct;
1: +  struct autofs_packet_hdr hdr;
1: +  struct autofs_v5_packet v5_packet;
1: +  autofs_packet_missing_indirect_t missing_indirect;
1: +  autofs_packet_expire_indirect_t expire_indirect;
1: +  autofs_packet_missing_direct_t missing_direct;
1: +  autofs_packet_expire_direct_t expire_direct;
1:  };
1:  
1:  struct args_protover {
1: -	__u32 version;
1: +  __u32 version;
1:  };
1:  
1:  struct args_protosubver {
1: -	__u32 sub_version;
1: +  __u32 sub_version;
1:  };
1:  
1:  struct args_openmount {
1: -	__u32 devid;
1: +  __u32 devid;
1:  };
1:  
1:  struct args_ready {
1: -	__u32 token;
1: +  __u32 token;
1:  };
1:  
1:  struct args_fail {
1: -	__u32 token;
1: -	__s32 status;
1: +  __u32 token;
1: +  __s32 status;
1:  };
1:  
1:  struct args_setpipefd {
1: -	__s32 pipefd;
1: +  __s32 pipefd;
1:  };
1:  
1:  struct args_timeout {
1: -	__u64 timeout;
1: +  __u64 timeout;
1:  };
1:  
1:  struct args_requester {
1: -	__u32 uid;
1: -	__u32 gid;
1: +  __u32 uid;
1: +  __u32 gid;
1:  };
1:  
1:  struct args_expire {
1: -	__u32 how;
1: +  __u32 how;
1:  };
1:  
1:  struct args_askumount {
1: -	__u32 may_umount;
1: +  __u32 may_umount;
1:  };
1:  
1:  struct args_in {
1: -	__u32 type;
1: +  __u32 type;
1:  };
1:  
1:  struct args_out {
1: -	__u32 devid;
1: -	__u32 magic;
1: +  __u32 devid;
1: +  __u32 magic;
1:  };
1:  
1:  struct args_ismountpoint {
1: -	union {
1: -		struct args_in in;
1: -		struct args_out out;
1: -	};
1: +  union {
1: +    struct args_in in;
1: +    struct args_out out;
1: +  };
1:  };
1:  
1:  struct autofs_dev_ioctl {
1: -	__u32 ver_major;
1: -	__u32 ver_minor;
1: -	__u32 size;
1: -	__s32 ioctlfd;
1: -	union {
1: -		struct args_protover protover;
1: -		struct args_protosubver protosubver;
1: -		struct args_openmount openmount;
1: -		struct args_ready ready;
1: -		struct args_fail fail;
1: -		struct args_setpipefd setpipefd;
1: -		struct args_timeout timeout;
1: -		struct args_requester requester;
1: -		struct args_expire expire;
1: -		struct args_askumount askumount;
1: -		struct args_ismountpoint ismountpoint;
1: -	};
1: -	char path[0];
1: -};
1: -
1: -enum {
1: -	AUTOFS_DEV_IOCTL_VERSION_CMD = 113,
1: -	AUTOFS_DEV_IOCTL_PROTOVER_CMD = 114,
1: -	AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD = 115,
1: -	AUTOFS_DEV_IOCTL_OPENMOUNT_CMD = 116,
1: -	AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD = 117,
1: -	AUTOFS_DEV_IOCTL_READY_CMD = 118,
1: -	AUTOFS_DEV_IOCTL_FAIL_CMD = 119,
1: -	AUTOFS_DEV_IOCTL_SETPIPEFD_CMD = 120,
1: -	AUTOFS_DEV_IOCTL_CATATONIC_CMD = 121,
1: -	AUTOFS_DEV_IOCTL_TIMEOUT_CMD = 122,
1: -	AUTOFS_DEV_IOCTL_REQUESTER_CMD = 123,
1: -	AUTOFS_DEV_IOCTL_EXPIRE_CMD = 124,
1: -	AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD = 125,
1: -	AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD = 126,
1: -};
1: -
1: -typedef int (*ioctl_fn)(struct file *, struct autofs_sb_info *, struct autofs_dev_ioctl *);
1: +  __u32 ver_major;
1: +  __u32 ver_minor;
1: +  __u32 size;
1: +  __s32 ioctlfd;
1: +  union {
1: +    struct args_protover protover;
1: +    struct args_protosubver protosubver;
1: +    struct args_openmount openmount;
1: +    struct args_ready ready;
1: +    struct args_fail fail;
1: +    struct args_setpipefd setpipefd;
1: +    struct args_timeout timeout;
1: +    struct args_requester requester;
1: +    struct args_expire expire;
1: +    struct args_askumount askumount;
1: +    struct args_ismountpoint ismountpoint;
1: +  };
1: +  char path[0];
1: +};
1: +
1: +enum {
1: +  AUTOFS_DEV_IOCTL_VERSION_CMD = 113,
1: +  AUTOFS_DEV_IOCTL_PROTOVER_CMD = 114,
1: +  AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD = 115,
1: +  AUTOFS_DEV_IOCTL_OPENMOUNT_CMD = 116,
1: +  AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD = 117,
1: +  AUTOFS_DEV_IOCTL_READY_CMD = 118,
1: +  AUTOFS_DEV_IOCTL_FAIL_CMD = 119,
1: +  AUTOFS_DEV_IOCTL_SETPIPEFD_CMD = 120,
1: +  AUTOFS_DEV_IOCTL_CATATONIC_CMD = 121,
1: +  AUTOFS_DEV_IOCTL_TIMEOUT_CMD = 122,
1: +  AUTOFS_DEV_IOCTL_REQUESTER_CMD = 123,
1: +  AUTOFS_DEV_IOCTL_EXPIRE_CMD = 124,
1: +  AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD = 125,
1: +  AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD = 126,
1: +};
1: +
1: +typedef int (*ioctl_fn)(struct file *, struct autofs_sb_info *,
1: +                        struct autofs_dev_ioctl *);
1:  
1:  struct p9_qid {
1: -	u8 type;
1: -	u32 version;
1: -	u64 path;
1: +  u8 type;
1: +  u32 version;
1: +  u64 path;
1:  };
1:  
1:  struct p9_wstat {
1: -	u16 size;
1: -	u16 type;
1: -	u32 dev;
1: -	struct p9_qid qid;
1: -	u32 mode;
1: -	u32 atime;
1: -	u32 mtime;
1: -	u64 length;
1: -	const char *name;
1: -	const char *uid;
1: -	const char *gid;
1: -	const char *muid;
1: -	char *extension;
1: -	kuid_t n_uid;
1: -	kgid_t n_gid;
1: -	kuid_t n_muid;
1: +  u16 size;
1: +  u16 type;
1: +  u32 dev;
1: +  struct p9_qid qid;
1: +  u32 mode;
1: +  u32 atime;
1: +  u32 mtime;
1: +  u64 length;
1: +  const char *name;
1: +  const char *uid;
1: +  const char *gid;
1: +  const char *muid;
1: +  char *extension;
1: +  kuid_t n_uid;
1: +  kgid_t n_gid;
1: +  kuid_t n_muid;
1:  };
1:  
1:  struct p9_stat_dotl {
1: -	u64 st_result_mask;
1: -	struct p9_qid qid;
1: -	u32 st_mode;
1: -	kuid_t st_uid;
1: -	kgid_t st_gid;
1: -	u64 st_nlink;
1: -	u64 st_rdev;
1: -	u64 st_size;
1: -	u64 st_blksize;
1: -	u64 st_blocks;
1: -	u64 st_atime_sec;
1: -	u64 st_atime_nsec;
1: -	u64 st_mtime_sec;
1: -	u64 st_mtime_nsec;
1: -	u64 st_ctime_sec;
1: -	u64 st_ctime_nsec;
1: -	u64 st_btime_sec;
1: -	u64 st_btime_nsec;
1: -	u64 st_gen;
1: -	u64 st_data_version;
1: +  u64 st_result_mask;
1: +  struct p9_qid qid;
1: +  u32 st_mode;
1: +  kuid_t st_uid;
1: +  kgid_t st_gid;
1: +  u64 st_nlink;
1: +  u64 st_rdev;
1: +  u64 st_size;
1: +  u64 st_blksize;
1: +  u64 st_blocks;
1: +  u64 st_atime_sec;
1: +  u64 st_atime_nsec;
1: +  u64 st_mtime_sec;
1: +  u64 st_mtime_nsec;
1: +  u64 st_ctime_sec;
1: +  u64 st_ctime_nsec;
1: +  u64 st_btime_sec;
1: +  u64 st_btime_nsec;
1: +  u64 st_gen;
1: +  u64 st_data_version;
1:  };
1:  
1:  struct p9_rstatfs {
1: -	u32 type;
1: -	u32 bsize;
1: -	u64 blocks;
1: -	u64 bfree;
1: -	u64 bavail;
1: -	u64 files;
1: -	u64 ffree;
1: -	u64 fsid;
1: -	u32 namelen;
1: +  u32 type;
1: +  u32 bsize;
1: +  u64 blocks;
1: +  u64 bfree;
1: +  u64 bavail;
1: +  u64 files;
1: +  u64 ffree;
1: +  u64 fsid;
1: +  u32 namelen;
1:  };
1:  
1:  enum p9_trans_status {
1: -	Connected = 0,
1: -	BeginDisconnect = 1,
1: -	Disconnected = 2,
1: -	Hung = 3,
1: +  Connected = 0,
1: +  BeginDisconnect = 1,
1: +  Disconnected = 2,
1: +  Hung = 3,
1:  };
1:  
1:  struct p9_trans_module;
1:  
1:  struct p9_client {
1: -	spinlock_t lock;
1: -	unsigned int msize;
1: -	unsigned char proto_version;
1: -	struct p9_trans_module *trans_mod;
1: -	enum p9_trans_status status;
1: -	void *trans;
1: -	struct kmem_cache *fcall_cache;
1: -	union {
1: -		struct {
1: -			int rfd;
1: -			int wfd;
1: -		} fd;
1: -		struct {
1: -			u16 port;
1: -			bool privport;
1: -		} tcp;
1: -	} trans_opts;
1: -	struct idr fids;
1: -	struct idr reqs;
1: -	char name[65];
1: +  spinlock_t lock;
1: +  unsigned int msize;
1: +  unsigned char proto_version;
1: +  struct p9_trans_module *trans_mod;
1: +  enum p9_trans_status status;
1: +  void *trans;
1: +  struct kmem_cache *fcall_cache;
1: +  union {
1: +    struct {
1: +      int rfd;
1: +      int wfd;
1: +    } fd;
1: +    struct {
1: +      u16 port;
1: +      bool privport;
1: +    } tcp;
1: +  } trans_opts;
1: +  struct idr fids;
1: +  struct idr reqs;
1: +  char name[65];
1:  };
1:  
1:  struct p9_fid {
1: -	struct p9_client *clnt;
1: -	u32 fid;
1: -	int mode;
1: -	struct p9_qid qid;
1: -	u32 iounit;
1: -	kuid_t uid;
1: -	void *rdir;
1: -	struct hlist_node dlist;
1: +  struct p9_client *clnt;
1: +  u32 fid;
1: +  int mode;
1: +  struct p9_qid qid;
1: +  u32 iounit;
1: +  kuid_t uid;
1: +  void *rdir;
1: +  struct hlist_node dlist;
1:  };
1:  
1:  enum p9_session_flags {
1: -	V9FS_PROTO_2000U = 1,
1: -	V9FS_PROTO_2000L = 2,
1: -	V9FS_ACCESS_SINGLE = 4,
1: -	V9FS_ACCESS_USER = 8,
1: -	V9FS_ACCESS_CLIENT = 16,
1: -	V9FS_POSIX_ACL = 32,
1: +  V9FS_PROTO_2000U = 1,
1: +  V9FS_PROTO_2000L = 2,
1: +  V9FS_ACCESS_SINGLE = 4,
1: +  V9FS_ACCESS_USER = 8,
1: +  V9FS_ACCESS_CLIENT = 16,
1: +  V9FS_POSIX_ACL = 32,
1:  };
1:  
1:  enum p9_cache_modes {
1: -	CACHE_NONE = 0,
1: -	CACHE_MMAP = 1,
1: -	CACHE_LOOSE = 2,
1: -	CACHE_FSCACHE = 3,
1: -	nr__p9_cache_modes = 4,
1: +  CACHE_NONE = 0,
1: +  CACHE_MMAP = 1,
1: +  CACHE_LOOSE = 2,
1: +  CACHE_FSCACHE = 3,
1: +  nr__p9_cache_modes = 4,
1:  };
1:  
1:  struct v9fs_session_info {
1: -	unsigned char flags;
1: -	unsigned char nodev;
1: -	short unsigned int debug;
1: -	unsigned int afid;
1: -	unsigned int cache;
1: -	char *uname;
1: -	char *aname;
1: -	unsigned int maxdata;
1: -	kuid_t dfltuid;
1: -	kgid_t dfltgid;
1: -	kuid_t uid;
1: -	struct p9_client *clnt;
1: -	struct list_head slist;
1: -	struct rw_semaphore rename_sem;
1: -	long int session_lock_timeout;
1: +  unsigned char flags;
1: +  unsigned char nodev;
1: +  short unsigned int debug;
1: +  unsigned int afid;
1: +  unsigned int cache;
1: +  char *uname;
1: +  char *aname;
1: +  unsigned int maxdata;
1: +  kuid_t dfltuid;
1: +  kgid_t dfltgid;
1: +  kuid_t uid;
1: +  struct p9_client *clnt;
1: +  struct list_head slist;
1: +  struct rw_semaphore rename_sem;
1: +  long int session_lock_timeout;
1:  };
1:  
1:  struct v9fs_inode {
1: -	struct p9_qid qid;
1: -	unsigned int cache_validity;
1: -	struct p9_fid *writeback_fid;
1: -	struct mutex v_mutex;
1: -	struct inode vfs_inode;
1: +  struct p9_qid qid;
1: +  unsigned int cache_validity;
1: +  struct p9_fid *writeback_fid;
1: +  struct mutex v_mutex;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  enum p9_open_mode_t {
1: -	P9_OREAD = 0,
1: -	P9_OWRITE = 1,
1: -	P9_ORDWR = 2,
1: -	P9_OEXEC = 3,
1: -	P9_OTRUNC = 16,
1: -	P9_OREXEC = 32,
1: -	P9_ORCLOSE = 64,
1: -	P9_OAPPEND = 128,
1: -	P9_OEXCL = 4096,
1: +  P9_OREAD = 0,
1: +  P9_OWRITE = 1,
1: +  P9_ORDWR = 2,
1: +  P9_OEXEC = 3,
1: +  P9_OTRUNC = 16,
1: +  P9_OREXEC = 32,
1: +  P9_ORCLOSE = 64,
1: +  P9_OAPPEND = 128,
1: +  P9_OEXCL = 4096,
1:  };
1:  
1:  enum p9_perm_t {
1: -	P9_DMDIR = 2147483648,
1: -	P9_DMAPPEND = 1073741824,
1: -	P9_DMEXCL = 536870912,
1: -	P9_DMMOUNT = 268435456,
1: -	P9_DMAUTH = 134217728,
1: -	P9_DMTMP = 67108864,
1: -	P9_DMSYMLINK = 33554432,
1: -	P9_DMLINK = 16777216,
1: -	P9_DMDEVICE = 8388608,
1: -	P9_DMNAMEDPIPE = 2097152,
1: -	P9_DMSOCKET = 1048576,
1: -	P9_DMSETUID = 524288,
1: -	P9_DMSETGID = 262144,
1: -	P9_DMSETVTX = 65536,
1: +  P9_DMDIR = 2147483648,
1: +  P9_DMAPPEND = 1073741824,
1: +  P9_DMEXCL = 536870912,
1: +  P9_DMMOUNT = 268435456,
1: +  P9_DMAUTH = 134217728,
1: +  P9_DMTMP = 67108864,
1: +  P9_DMSYMLINK = 33554432,
1: +  P9_DMLINK = 16777216,
1: +  P9_DMDEVICE = 8388608,
1: +  P9_DMNAMEDPIPE = 2097152,
1: +  P9_DMSOCKET = 1048576,
1: +  P9_DMSETUID = 524288,
1: +  P9_DMSETGID = 262144,
1: +  P9_DMSETVTX = 65536,
1:  };
1:  
1:  struct p9_iattr_dotl {
1: -	u32 valid;
1: -	u32 mode;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	u64 size;
1: -	u64 atime_sec;
1: -	u64 atime_nsec;
1: -	u64 mtime_sec;
1: -	u64 mtime_nsec;
1: +  u32 valid;
1: +  u32 mode;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  u64 size;
1: +  u64 atime_sec;
1: +  u64 atime_nsec;
1: +  u64 mtime_sec;
1: +  u64 mtime_nsec;
1:  };
1:  
1:  struct dotl_openflag_map {
1: -	int open_flag;
1: -	int dotl_flag;
1: +  int open_flag;
1: +  int dotl_flag;
1:  };
1:  
1:  struct dotl_iattr_map {
1: -	int iattr_valid;
1: -	int p9_iattr_valid;
1: +  int iattr_valid;
1: +  int p9_iattr_valid;
1:  };
1:  
1:  struct p9_flock {
1: -	u8 type;
1: -	u32 flags;
1: -	u64 start;
1: -	u64 length;
1: -	u32 proc_id;
1: -	char *client_id;
1: +  u8 type;
1: +  u32 flags;
1: +  u64 start;
1: +  u64 length;
1: +  u32 proc_id;
1: +  char *client_id;
1:  };
1:  
1:  struct p9_getlock {
1: -	u8 type;
1: -	u64 start;
1: -	u64 length;
1: -	u32 proc_id;
1: -	char *client_id;
1: +  u8 type;
1: +  u64 start;
1: +  u64 length;
1: +  u32 proc_id;
1: +  char *client_id;
1:  };
1:  
1:  struct p9_dirent {
1: -	struct p9_qid qid;
1: -	u64 d_off;
1: -	unsigned char d_type;
1: -	char d_name[256];
1: +  struct p9_qid qid;
1: +  u64 d_off;
1: +  unsigned char d_type;
1: +  char d_name[256];
1:  };
1:  
1:  struct p9_rdir {
1: -	int head;
1: -	int tail;
1: -	uint8_t buf[0];
1: +  int head;
1: +  int tail;
1: +  uint8_t buf[0];
1:  };
1:  
1:  struct p9_fcall {
1: -	u32 size;
1: -	u8 id;
1: -	u16 tag;
1: -	size_t offset;
1: -	size_t capacity;
1: -	struct kmem_cache *cache;
1: -	u8 *sdata;
1: +  u32 size;
1: +  u8 id;
1: +  u16 tag;
1: +  size_t offset;
1: +  size_t capacity;
1: +  struct kmem_cache *cache;
1: +  u8 *sdata;
1:  };
1:  
1:  struct p9_req_t {
1: -	int status;
1: -	int t_err;
1: -	struct kref refcount;
1: -	wait_queue_head_t wq;
1: -	struct p9_fcall tc;
1: -	struct p9_fcall rc;
1: -	struct list_head req_list;
1: +  int status;
1: +  int t_err;
1: +  struct kref refcount;
1: +  wait_queue_head_t wq;
1: +  struct p9_fcall tc;
1: +  struct p9_fcall rc;
1: +  struct list_head req_list;
1:  };
1:  
1:  struct p9_trans_module {
1: -	struct list_head list;
1: -	char *name;
1: -	int maxsize;
1: -	int def;
1: -	struct module *owner;
1: -	int (*create)(struct p9_client *, const char *, char *);
1: -	void (*close)(struct p9_client *);
1: -	int (*request)(struct p9_client *, struct p9_req_t *);
1: -	int (*cancel)(struct p9_client *, struct p9_req_t *);
1: -	int (*cancelled)(struct p9_client *, struct p9_req_t *);
1: -	int (*zc_request)(struct p9_client *, struct p9_req_t *, struct iov_iter *, struct iov_iter *, int, int, int);
1: -	int (*show_options)(struct seq_file *, struct p9_client *);
1: -};
1: -
1: -enum {
1: -	Opt_debug___2 = 0,
1: -	Opt_dfltuid = 1,
1: -	Opt_dfltgid = 2,
1: -	Opt_afid = 3,
1: -	Opt_uname = 4,
1: -	Opt_remotename = 5,
1: -	Opt_cache = 6,
1: -	Opt_cachetag = 7,
1: -	Opt_nodevmap = 8,
1: -	Opt_cache_loose = 9,
1: -	Opt_fscache___2 = 10,
1: -	Opt_mmap = 11,
1: -	Opt_access = 12,
1: -	Opt_posixacl = 13,
1: -	Opt_locktimeout = 14,
1: -	Opt_err___5 = 15,
1: -};
1: -
1: -typedef struct vfsmount * (*debugfs_automount_t)(struct dentry *, void *);
1: +  struct list_head list;
1: +  char *name;
1: +  int maxsize;
1: +  int def;
1: +  struct module *owner;
1: +  int (*create)(struct p9_client *, const char *, char *);
1: +  void (*close)(struct p9_client *);
1: +  int (*request)(struct p9_client *, struct p9_req_t *);
1: +  int (*cancel)(struct p9_client *, struct p9_req_t *);
1: +  int (*cancelled)(struct p9_client *, struct p9_req_t *);
1: +  int (*zc_request)(struct p9_client *, struct p9_req_t *, struct iov_iter *,
1: +                    struct iov_iter *, int, int, int);
1: +  int (*show_options)(struct seq_file *, struct p9_client *);
1: +};
1: +
1: +enum {
1: +  Opt_debug___2 = 0,
1: +  Opt_dfltuid = 1,
1: +  Opt_dfltgid = 2,
1: +  Opt_afid = 3,
1: +  Opt_uname = 4,
1: +  Opt_remotename = 5,
1: +  Opt_cache = 6,
1: +  Opt_cachetag = 7,
1: +  Opt_nodevmap = 8,
1: +  Opt_cache_loose = 9,
1: +  Opt_fscache___2 = 10,
1: +  Opt_mmap = 11,
1: +  Opt_access = 12,
1: +  Opt_posixacl = 13,
1: +  Opt_locktimeout = 14,
1: +  Opt_err___5 = 15,
1: +};
1: +
1: +typedef struct vfsmount *(*debugfs_automount_t)(struct dentry *, void *);
1:  
1:  struct debugfs_fsdata {
1: -	const struct file_operations *real_fops;
1: -	refcount_t active_users;
1: -	struct completion active_users_drained;
1: +  const struct file_operations *real_fops;
1: +  refcount_t active_users;
1: +  struct completion active_users_drained;
1:  };
1:  
1:  struct debugfs_mount_opts {
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	umode_t mode;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  umode_t mode;
1:  };
1:  
1:  enum {
1: -	Opt_uid___6 = 0,
1: -	Opt_gid___7 = 1,
1: -	Opt_mode___6 = 2,
1: -	Opt_err___6 = 3,
1: +  Opt_uid___6 = 0,
1: +  Opt_gid___7 = 1,
1: +  Opt_mode___6 = 2,
1: +  Opt_err___6 = 3,
1:  };
1:  
1:  struct debugfs_fs_info {
1: -	struct debugfs_mount_opts mount_opts;
1: +  struct debugfs_mount_opts mount_opts;
1:  };
1:  
1:  struct debugfs_blob_wrapper {
1: -	void *data;
1: -	long unsigned int size;
1: +  void *data;
1: +  long unsigned int size;
1:  };
1:  
1:  struct debugfs_reg32 {
1: -	char *name;
1: -	long unsigned int offset;
1: +  char *name;
1: +  long unsigned int offset;
1:  };
1:  
1:  struct debugfs_regset32 {
1: -	const struct debugfs_reg32 *regs;
1: -	int nregs;
1: -	void *base;
1: -	struct device *dev;
1: +  const struct debugfs_reg32 *regs;
1: +  int nregs;
1: +  void *base;
1: +  struct device *dev;
1:  };
1:  
1:  struct debugfs_u32_array {
1: -	u32 *array;
1: -	u32 n_elements;
1: +  u32 *array;
1: +  u32 n_elements;
1:  };
1:  
1:  struct debugfs_devm_entry {
1: -	int (*read)(struct seq_file *, void *);
1: -	struct device *dev;
1: +  int (*read)(struct seq_file *, void *);
1: +  struct device *dev;
1:  };
1:  
1:  struct tracefs_dir_ops {
1: -	int (*mkdir)(const char *);
1: -	int (*rmdir)(const char *);
1: +  int (*mkdir)(const char *);
1: +  int (*rmdir)(const char *);
1:  };
1:  
1:  struct tracefs_mount_opts {
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	umode_t mode;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  umode_t mode;
1:  };
1:  
1:  struct tracefs_fs_info {
1: -	struct tracefs_mount_opts mount_opts;
1: +  struct tracefs_mount_opts mount_opts;
1:  };
1:  
1:  struct btrfs_ioctl_vol_args {
1: -	__s64 fd;
1: -	char name[4088];
1: +  __s64 fd;
1: +  char name[4088];
1:  };
1:  
1:  struct btrfs_scrub_progress {
1: -	__u64 data_extents_scrubbed;
1: -	__u64 tree_extents_scrubbed;
1: -	__u64 data_bytes_scrubbed;
1: -	__u64 tree_bytes_scrubbed;
1: -	__u64 read_errors;
1: -	__u64 csum_errors;
1: -	__u64 verify_errors;
1: -	__u64 no_csum;
1: -	__u64 csum_discards;
1: -	__u64 super_errors;
1: -	__u64 malloc_errors;
1: -	__u64 uncorrectable_errors;
1: -	__u64 corrected_errors;
1: -	__u64 last_physical;
1: -	__u64 unverified_errors;
1: +  __u64 data_extents_scrubbed;
1: +  __u64 tree_extents_scrubbed;
1: +  __u64 data_bytes_scrubbed;
1: +  __u64 tree_bytes_scrubbed;
1: +  __u64 read_errors;
1: +  __u64 csum_errors;
1: +  __u64 verify_errors;
1: +  __u64 no_csum;
1: +  __u64 csum_discards;
1: +  __u64 super_errors;
1: +  __u64 malloc_errors;
1: +  __u64 uncorrectable_errors;
1: +  __u64 corrected_errors;
1: +  __u64 last_physical;
1: +  __u64 unverified_errors;
1:  };
1:  
1:  struct btrfs_balance_args {
1: -	__u64 profiles;
1: -	union {
1: -		__u64 usage;
1: -		struct {
1: -			__u32 usage_min;
1: -			__u32 usage_max;
1: -		};
1: -	};
1: -	__u64 devid;
1: -	__u64 pstart;
1: -	__u64 pend;
1: -	__u64 vstart;
1: -	__u64 vend;
1: -	__u64 target;
1: -	__u64 flags;
1: -	union {
1: -		__u64 limit;
1: -		struct {
1: -			__u32 limit_min;
1: -			__u32 limit_max;
1: -		};
1: -	};
1: -	__u32 stripes_min;
1: -	__u32 stripes_max;
1: -	__u64 unused[6];
1: +  __u64 profiles;
1: +  union {
1: +    __u64 usage;
1: +    struct {
1: +      __u32 usage_min;
1: +      __u32 usage_max;
1: +    };
1: +  };
1: +  __u64 devid;
1: +  __u64 pstart;
1: +  __u64 pend;
1: +  __u64 vstart;
1: +  __u64 vend;
1: +  __u64 target;
1: +  __u64 flags;
1: +  union {
1: +    __u64 limit;
1: +    struct {
1: +      __u32 limit_min;
1: +      __u32 limit_max;
1: +    };
1: +  };
1: +  __u32 stripes_min;
1: +  __u32 stripes_max;
1: +  __u64 unused[6];
1:  };
1:  
1:  struct btrfs_balance_progress {
1: -	__u64 expected;
1: -	__u64 considered;
1: -	__u64 completed;
1: +  __u64 expected;
1: +  __u64 considered;
1: +  __u64 completed;
1:  };
1:  
1:  enum btrfs_dev_stat_values {
1: -	BTRFS_DEV_STAT_WRITE_ERRS = 0,
1: -	BTRFS_DEV_STAT_READ_ERRS = 1,
1: -	BTRFS_DEV_STAT_FLUSH_ERRS = 2,
1: -	BTRFS_DEV_STAT_CORRUPTION_ERRS = 3,
1: -	BTRFS_DEV_STAT_GENERATION_ERRS = 4,
1: -	BTRFS_DEV_STAT_VALUES_MAX = 5,
1: +  BTRFS_DEV_STAT_WRITE_ERRS = 0,
1: +  BTRFS_DEV_STAT_READ_ERRS = 1,
1: +  BTRFS_DEV_STAT_FLUSH_ERRS = 2,
1: +  BTRFS_DEV_STAT_CORRUPTION_ERRS = 3,
1: +  BTRFS_DEV_STAT_GENERATION_ERRS = 4,
1: +  BTRFS_DEV_STAT_VALUES_MAX = 5,
1:  };
1:  
1:  struct btrfs_disk_key {
1: -	__le64 objectid;
1: -	__u8 type;
1: -	__le64 offset;
1: +  __le64 objectid;
1: +  __u8 type;
1: +  __le64 offset;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_key {
1: -	__u64 objectid;
1: -	__u8 type;
1: -	__u64 offset;
1: +  __u64 objectid;
1: +  __u8 type;
1: +  __u64 offset;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_dev_item {
1: -	__le64 devid;
1: -	__le64 total_bytes;
1: -	__le64 bytes_used;
1: -	__le32 io_align;
1: -	__le32 io_width;
1: -	__le32 sector_size;
1: -	__le64 type;
1: -	__le64 generation;
1: -	__le64 start_offset;
1: -	__le32 dev_group;
1: -	__u8 seek_speed;
1: -	__u8 bandwidth;
1: -	__u8 uuid[16];
1: -	__u8 fsid[16];
1: +  __le64 devid;
1: +  __le64 total_bytes;
1: +  __le64 bytes_used;
1: +  __le32 io_align;
1: +  __le32 io_width;
1: +  __le32 sector_size;
1: +  __le64 type;
1: +  __le64 generation;
1: +  __le64 start_offset;
1: +  __le32 dev_group;
1: +  __u8 seek_speed;
1: +  __u8 bandwidth;
1: +  __u8 uuid[16];
1: +  __u8 fsid[16];
1:  } __attribute__((packed));
1:  
1:  struct btrfs_inode_ref {
1: -	__le64 index;
1: -	__le16 name_len;
1: +  __le64 index;
1: +  __le16 name_len;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_timespec {
1: -	__le64 sec;
1: -	__le32 nsec;
1: +  __le64 sec;
1: +  __le32 nsec;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_inode_item {
1: -	__le64 generation;
1: -	__le64 transid;
1: -	__le64 size;
1: -	__le64 nbytes;
1: -	__le64 block_group;
1: -	__le32 nlink;
1: -	__le32 uid;
1: -	__le32 gid;
1: -	__le32 mode;
1: -	__le64 rdev;
1: -	__le64 flags;
1: -	__le64 sequence;
1: -	__le64 reserved[4];
1: -	struct btrfs_timespec atime;
1: -	struct btrfs_timespec ctime;
1: -	struct btrfs_timespec mtime;
1: -	struct btrfs_timespec otime;
1: +  __le64 generation;
1: +  __le64 transid;
1: +  __le64 size;
1: +  __le64 nbytes;
1: +  __le64 block_group;
1: +  __le32 nlink;
1: +  __le32 uid;
1: +  __le32 gid;
1: +  __le32 mode;
1: +  __le64 rdev;
1: +  __le64 flags;
1: +  __le64 sequence;
1: +  __le64 reserved[4];
1: +  struct btrfs_timespec atime;
1: +  struct btrfs_timespec ctime;
1: +  struct btrfs_timespec mtime;
1: +  struct btrfs_timespec otime;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_dir_item {
1: -	struct btrfs_disk_key location;
1: -	__le64 transid;
1: -	__le16 data_len;
1: -	__le16 name_len;
1: -	__u8 type;
1: +  struct btrfs_disk_key location;
1: +  __le64 transid;
1: +  __le16 data_len;
1: +  __le16 name_len;
1: +  __u8 type;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_root_item {
1: -	struct btrfs_inode_item inode;
1: -	__le64 generation;
1: -	__le64 root_dirid;
1: -	__le64 bytenr;
1: -	__le64 byte_limit;
1: -	__le64 bytes_used;
1: -	__le64 last_snapshot;
1: -	__le64 flags;
1: -	__le32 refs;
1: -	struct btrfs_disk_key drop_progress;
1: -	__u8 drop_level;
1: -	__u8 level;
1: -	__le64 generation_v2;
1: -	__u8 uuid[16];
1: -	__u8 parent_uuid[16];
1: -	__u8 received_uuid[16];
1: -	__le64 ctransid;
1: -	__le64 otransid;
1: -	__le64 stransid;
1: -	__le64 rtransid;
1: -	struct btrfs_timespec ctime;
1: -	struct btrfs_timespec otime;
1: -	struct btrfs_timespec stime;
1: -	struct btrfs_timespec rtime;
1: -	__le64 reserved[8];
1: +  struct btrfs_inode_item inode;
1: +  __le64 generation;
1: +  __le64 root_dirid;
1: +  __le64 bytenr;
1: +  __le64 byte_limit;
1: +  __le64 bytes_used;
1: +  __le64 last_snapshot;
1: +  __le64 flags;
1: +  __le32 refs;
1: +  struct btrfs_disk_key drop_progress;
1: +  __u8 drop_level;
1: +  __u8 level;
1: +  __le64 generation_v2;
1: +  __u8 uuid[16];
1: +  __u8 parent_uuid[16];
1: +  __u8 received_uuid[16];
1: +  __le64 ctransid;
1: +  __le64 otransid;
1: +  __le64 stransid;
1: +  __le64 rtransid;
1: +  struct btrfs_timespec ctime;
1: +  struct btrfs_timespec otime;
1: +  struct btrfs_timespec stime;
1: +  struct btrfs_timespec rtime;
1: +  __le64 reserved[8];
1:  } __attribute__((packed));
1:  
1:  struct btrfs_root_ref {
1: -	__le64 dirid;
1: -	__le64 sequence;
1: -	__le16 name_len;
1: +  __le64 dirid;
1: +  __le64 sequence;
1: +  __le16 name_len;
1:  } __attribute__((packed));
1:  
1:  enum {
1: -	BTRFS_FILE_EXTENT_INLINE = 0,
1: -	BTRFS_FILE_EXTENT_REG = 1,
1: -	BTRFS_FILE_EXTENT_PREALLOC = 2,
1: -	BTRFS_NR_FILE_EXTENT_TYPES = 3,
1: +  BTRFS_FILE_EXTENT_INLINE = 0,
1: +  BTRFS_FILE_EXTENT_REG = 1,
1: +  BTRFS_FILE_EXTENT_PREALLOC = 2,
1: +  BTRFS_NR_FILE_EXTENT_TYPES = 3,
1:  };
1:  
1:  struct btrfs_file_extent_item {
1: -	__le64 generation;
1: -	__le64 ram_bytes;
1: -	__u8 compression;
1: -	__u8 encryption;
1: -	__le16 other_encoding;
1: -	__u8 type;
1: -	__le64 disk_bytenr;
1: -	__le64 disk_num_bytes;
1: -	__le64 offset;
1: -	__le64 num_bytes;
1: +  __le64 generation;
1: +  __le64 ram_bytes;
1: +  __u8 compression;
1: +  __u8 encryption;
1: +  __le16 other_encoding;
1: +  __u8 type;
1: +  __le64 disk_bytenr;
1: +  __le64 disk_num_bytes;
1: +  __le64 offset;
1: +  __le64 num_bytes;
1:  } __attribute__((packed));
1:  
1:  enum btrfs_raid_types {
1: -	BTRFS_RAID_RAID10 = 0,
1: -	BTRFS_RAID_RAID1 = 1,
1: -	BTRFS_RAID_DUP = 2,
1: -	BTRFS_RAID_RAID0 = 3,
1: -	BTRFS_RAID_SINGLE = 4,
1: -	BTRFS_RAID_RAID5 = 5,
1: -	BTRFS_RAID_RAID6 = 6,
1: -	BTRFS_RAID_RAID1C3 = 7,
1: -	BTRFS_RAID_RAID1C4 = 8,
1: -	BTRFS_NR_RAID_TYPES = 9,
1: -};
1: -
1: -enum {
1: -	IO_TREE_FS_PINNED_EXTENTS = 0,
1: -	IO_TREE_FS_EXCLUDED_EXTENTS = 1,
1: -	IO_TREE_BTREE_INODE_IO = 2,
1: -	IO_TREE_INODE_IO = 3,
1: -	IO_TREE_INODE_IO_FAILURE = 4,
1: -	IO_TREE_RELOC_BLOCKS = 5,
1: -	IO_TREE_TRANS_DIRTY_PAGES = 6,
1: -	IO_TREE_ROOT_DIRTY_LOG_PAGES = 7,
1: -	IO_TREE_INODE_FILE_EXTENT = 8,
1: -	IO_TREE_LOG_CSUM_RANGE = 9,
1: -	IO_TREE_SELFTEST = 10,
1: -	IO_TREE_DEVICE_ALLOC_STATE = 11,
1: +  BTRFS_RAID_RAID10 = 0,
1: +  BTRFS_RAID_RAID1 = 1,
1: +  BTRFS_RAID_DUP = 2,
1: +  BTRFS_RAID_RAID0 = 3,
1: +  BTRFS_RAID_SINGLE = 4,
1: +  BTRFS_RAID_RAID5 = 5,
1: +  BTRFS_RAID_RAID6 = 6,
1: +  BTRFS_RAID_RAID1C3 = 7,
1: +  BTRFS_RAID_RAID1C4 = 8,
1: +  BTRFS_NR_RAID_TYPES = 9,
1: +};
1: +
1: +enum {
1: +  IO_TREE_FS_PINNED_EXTENTS = 0,
1: +  IO_TREE_FS_EXCLUDED_EXTENTS = 1,
1: +  IO_TREE_BTREE_INODE_IO = 2,
1: +  IO_TREE_INODE_IO = 3,
1: +  IO_TREE_INODE_IO_FAILURE = 4,
1: +  IO_TREE_RELOC_BLOCKS = 5,
1: +  IO_TREE_TRANS_DIRTY_PAGES = 6,
1: +  IO_TREE_ROOT_DIRTY_LOG_PAGES = 7,
1: +  IO_TREE_INODE_FILE_EXTENT = 8,
1: +  IO_TREE_LOG_CSUM_RANGE = 9,
1: +  IO_TREE_SELFTEST = 10,
1: +  IO_TREE_DEVICE_ALLOC_STATE = 11,
1:  };
1:  
1:  struct btrfs_fs_info;
1:  
1:  struct extent_io_tree {
1: -	struct rb_root state;
1: -	struct btrfs_fs_info *fs_info;
1: -	void *private_data;
1: -	u64 dirty_bytes;
1: -	bool track_uptodate;
1: -	u8 owner;
1: -	spinlock_t lock;
1: +  struct rb_root state;
1: +  struct btrfs_fs_info *fs_info;
1: +  void *private_data;
1: +  u64 dirty_bytes;
1: +  bool track_uptodate;
1: +  u8 owner;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct extent_map_tree {
1: -	struct rb_root_cached map;
1: -	struct list_head modified_extents;
1: -	rwlock_t lock;
1: +  struct rb_root_cached map;
1: +  struct list_head modified_extents;
1: +  rwlock_t lock;
1:  };
1:  
1:  struct btrfs_space_info;
1:  
1:  struct btrfs_block_rsv {
1: -	u64 size;
1: -	u64 reserved;
1: -	struct btrfs_space_info *space_info;
1: -	spinlock_t lock;
1: -	short unsigned int full;
1: -	short unsigned int type;
1: -	short unsigned int failfast;
1: -	u64 qgroup_rsv_size;
1: -	u64 qgroup_rsv_reserved;
1: +  u64 size;
1: +  u64 reserved;
1: +  struct btrfs_space_info *space_info;
1: +  spinlock_t lock;
1: +  short unsigned int full;
1: +  short unsigned int type;
1: +  short unsigned int failfast;
1: +  u64 qgroup_rsv_size;
1: +  u64 qgroup_rsv_reserved;
1:  };
1:  
1:  struct btrfs_block_group;
1:  
1:  struct btrfs_free_cluster {
1: -	spinlock_t lock;
1: -	spinlock_t refill_lock;
1: -	struct rb_root root;
1: -	u64 max_size;
1: -	u64 window_start;
1: -	bool fragmented;
1: -	struct btrfs_block_group *block_group;
1: -	struct list_head block_group_list;
1: +  spinlock_t lock;
1: +  spinlock_t refill_lock;
1: +  struct rb_root root;
1: +  u64 max_size;
1: +  u64 window_start;
1: +  bool fragmented;
1: +  struct btrfs_block_group *block_group;
1: +  struct list_head block_group_list;
1:  };
1:  
1:  struct btrfs_discard_ctl {
1: -	struct workqueue_struct *discard_workers;
1: -	struct delayed_work work;
1: -	spinlock_t lock;
1: -	struct btrfs_block_group *block_group;
1: -	struct list_head discard_list[3];
1: -	u64 prev_discard;
1: -	atomic_t discardable_extents;
1: -	atomic64_t discardable_bytes;
1: -	u64 max_discard_size;
1: -	long unsigned int delay;
1: -	u32 iops_limit;
1: -	u32 kbps_limit;
1: -	u64 discard_extent_bytes;
1: -	u64 discard_bitmap_bytes;
1: -	atomic64_t discard_bytes_saved;
1: +  struct workqueue_struct *discard_workers;
1: +  struct delayed_work work;
1: +  spinlock_t lock;
1: +  struct btrfs_block_group *block_group;
1: +  struct list_head discard_list[3];
1: +  u64 prev_discard;
1: +  atomic_t discardable_extents;
1: +  atomic64_t discardable_bytes;
1: +  u64 max_discard_size;
1: +  long unsigned int delay;
1: +  u32 iops_limit;
1: +  u32 kbps_limit;
1: +  u64 discard_extent_bytes;
1: +  u64 discard_bitmap_bytes;
1: +  atomic64_t discard_bytes_saved;
1:  };
1:  
1:  struct btrfs_work;
1: @@ -52753,37 +53518,37 @@ typedef void (*btrfs_func_t)(struct btrfs_work *);
1:  struct __btrfs_workqueue;
1:  
1:  struct btrfs_work {
1: -	btrfs_func_t func;
1: -	btrfs_func_t ordered_func;
1: -	btrfs_func_t ordered_free;
1: -	struct work_struct normal_work;
1: -	struct list_head ordered_list;
1: -	struct __btrfs_workqueue *wq;
1: -	long unsigned int flags;
1: +  btrfs_func_t func;
1: +  btrfs_func_t ordered_func;
1: +  btrfs_func_t ordered_free;
1: +  struct work_struct normal_work;
1: +  struct list_head ordered_list;
1: +  struct __btrfs_workqueue *wq;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct btrfs_device;
1:  
1:  struct btrfs_dev_replace {
1: -	u64 replace_state;
1: -	time64_t time_started;
1: -	time64_t time_stopped;
1: -	atomic64_t num_write_errors;
1: -	atomic64_t num_uncorrectable_read_errors;
1: -	u64 cursor_left;
1: -	u64 committed_cursor_left;
1: -	u64 cursor_left_last_write_of_item;
1: -	u64 cursor_right;
1: -	u64 cont_reading_from_srcdev_mode;
1: -	int is_valid;
1: -	int item_needs_writeback;
1: -	struct btrfs_device *srcdev;
1: -	struct btrfs_device *tgtdev;
1: -	struct mutex lock_finishing_cancel_unmount;
1: -	struct rw_semaphore rwsem;
1: -	struct btrfs_scrub_progress scrub_progress;
1: -	struct percpu_counter bio_counter;
1: -	wait_queue_head_t replace_wait;
1: +  u64 replace_state;
1: +  time64_t time_started;
1: +  time64_t time_stopped;
1: +  atomic64_t num_write_errors;
1: +  atomic64_t num_uncorrectable_read_errors;
1: +  u64 cursor_left;
1: +  u64 committed_cursor_left;
1: +  u64 cursor_left_last_write_of_item;
1: +  u64 cursor_right;
1: +  u64 cont_reading_from_srcdev_mode;
1: +  int is_valid;
1: +  int item_needs_writeback;
1: +  struct btrfs_device *srcdev;
1: +  struct btrfs_device *tgtdev;
1: +  struct mutex lock_finishing_cancel_unmount;
1: +  struct rw_semaphore rwsem;
1: +  struct btrfs_scrub_progress scrub_progress;
1: +  struct percpu_counter bio_counter;
1: +  wait_queue_head_t replace_wait;
1:  };
1:  
1:  struct btrfs_root;
1: @@ -52807,490 +53572,490 @@ struct ulist;
1:  struct btrfs_delayed_root;
1:  
1:  struct btrfs_fs_info {
1: -	u8 chunk_tree_uuid[16];
1: -	long unsigned int flags;
1: -	struct btrfs_root *extent_root;
1: -	struct btrfs_root *tree_root;
1: -	struct btrfs_root *chunk_root;
1: -	struct btrfs_root *dev_root;
1: -	struct btrfs_root *fs_root;
1: -	struct btrfs_root *csum_root;
1: -	struct btrfs_root *quota_root;
1: -	struct btrfs_root *uuid_root;
1: -	struct btrfs_root *free_space_root;
1: -	struct btrfs_root *data_reloc_root;
1: -	struct btrfs_root *log_root_tree;
1: -	spinlock_t fs_roots_radix_lock;
1: -	struct xarray fs_roots_radix;
1: -	spinlock_t block_group_cache_lock;
1: -	u64 first_logical_byte;
1: -	struct rb_root block_group_cache_tree;
1: -	atomic64_t free_chunk_space;
1: -	struct extent_io_tree excluded_extents;
1: -	struct extent_map_tree mapping_tree;
1: -	struct btrfs_block_rsv global_block_rsv;
1: -	struct btrfs_block_rsv trans_block_rsv;
1: -	struct btrfs_block_rsv chunk_block_rsv;
1: -	struct btrfs_block_rsv delayed_block_rsv;
1: -	struct btrfs_block_rsv delayed_refs_rsv;
1: -	struct btrfs_block_rsv empty_block_rsv;
1: -	u64 generation;
1: -	u64 last_trans_committed;
1: -	u64 avg_delayed_ref_runtime;
1: -	u64 last_trans_log_full_commit;
1: -	long unsigned int mount_opt;
1: -	long unsigned int pending_changes;
1: -	long unsigned int compress_type: 4;
1: -	unsigned int compress_level;
1: -	u32 commit_interval;
1: -	u64 max_inline;
1: -	struct btrfs_transaction *running_transaction;
1: -	wait_queue_head_t transaction_throttle;
1: -	wait_queue_head_t transaction_wait;
1: -	wait_queue_head_t transaction_blocked_wait;
1: -	wait_queue_head_t async_submit_wait;
1: -	spinlock_t super_lock;
1: -	struct btrfs_super_block *super_copy;
1: -	struct btrfs_super_block *super_for_commit;
1: -	struct super_block *sb;
1: -	struct inode *btree_inode;
1: -	struct mutex tree_log_mutex;
1: -	struct mutex transaction_kthread_mutex;
1: -	struct mutex cleaner_mutex;
1: -	struct mutex chunk_mutex;
1: -	struct mutex ro_block_group_mutex;
1: -	struct btrfs_stripe_hash_table *stripe_hash_table;
1: -	struct mutex ordered_operations_mutex;
1: -	struct rw_semaphore commit_root_sem;
1: -	struct rw_semaphore cleanup_work_sem;
1: -	struct rw_semaphore subvol_sem;
1: -	spinlock_t trans_lock;
1: -	struct mutex reloc_mutex;
1: -	struct list_head trans_list;
1: -	struct list_head dead_roots;
1: -	struct list_head caching_block_groups;
1: -	spinlock_t delayed_iput_lock;
1: -	struct list_head delayed_iputs;
1: -	atomic_t nr_delayed_iputs;
1: -	wait_queue_head_t delayed_iputs_wait;
1: -	atomic64_t tree_mod_seq;
1: -	rwlock_t tree_mod_log_lock;
1: -	struct rb_root tree_mod_log;
1: -	struct list_head tree_mod_seq_list;
1: -	atomic_t async_delalloc_pages;
1: -	spinlock_t ordered_root_lock;
1: -	struct list_head ordered_roots;
1: -	struct mutex delalloc_root_mutex;
1: -	spinlock_t delalloc_root_lock;
1: -	struct list_head delalloc_roots;
1: -	struct btrfs_workqueue *workers;
1: -	struct btrfs_workqueue *delalloc_workers;
1: -	struct btrfs_workqueue *flush_workers;
1: -	struct btrfs_workqueue *endio_workers;
1: -	struct btrfs_workqueue *endio_meta_workers;
1: -	struct btrfs_workqueue *endio_raid56_workers;
1: -	struct btrfs_workqueue *rmw_workers;
1: -	struct btrfs_workqueue *endio_meta_write_workers;
1: -	struct btrfs_workqueue *endio_write_workers;
1: -	struct btrfs_workqueue *endio_freespace_worker;
1: -	struct btrfs_workqueue *caching_workers;
1: -	struct btrfs_workqueue *readahead_workers;
1: -	struct btrfs_workqueue *fixup_workers;
1: -	struct btrfs_workqueue *delayed_workers;
1: -	struct task_struct *transaction_kthread;
1: -	struct task_struct *cleaner_kthread;
1: -	u32 thread_pool_size;
1: -	struct kobject *space_info_kobj;
1: -	struct kobject *qgroups_kobj;
1: -	u64 total_pinned;
1: -	struct percpu_counter dirty_metadata_bytes;
1: -	struct percpu_counter delalloc_bytes;
1: -	struct percpu_counter dio_bytes;
1: -	s32 dirty_metadata_batch;
1: -	s32 delalloc_batch;
1: -	struct list_head dirty_cowonly_roots;
1: -	struct btrfs_fs_devices *fs_devices;
1: -	struct list_head space_info;
1: -	struct btrfs_space_info *data_sinfo;
1: -	struct reloc_control *reloc_ctl;
1: -	struct btrfs_free_cluster data_alloc_cluster;
1: -	struct btrfs_free_cluster meta_alloc_cluster;
1: -	spinlock_t defrag_inodes_lock;
1: -	struct rb_root defrag_inodes;
1: -	atomic_t defrag_running;
1: -	seqlock_t profiles_lock;
1: -	u64 avail_data_alloc_bits;
1: -	u64 avail_metadata_alloc_bits;
1: -	u64 avail_system_alloc_bits;
1: -	spinlock_t balance_lock;
1: -	struct mutex balance_mutex;
1: -	atomic_t balance_pause_req;
1: -	atomic_t balance_cancel_req;
1: -	struct btrfs_balance_control *balance_ctl;
1: -	wait_queue_head_t balance_wait_q;
1: -	u32 data_chunk_allocations;
1: -	u32 metadata_ratio;
1: -	void *bdev_holder;
1: -	struct mutex scrub_lock;
1: -	atomic_t scrubs_running;
1: -	atomic_t scrub_pause_req;
1: -	atomic_t scrubs_paused;
1: -	atomic_t scrub_cancel_req;
1: -	wait_queue_head_t scrub_pause_wait;
1: -	refcount_t scrub_workers_refcnt;
1: -	struct btrfs_workqueue *scrub_workers;
1: -	struct btrfs_workqueue *scrub_wr_completion_workers;
1: -	struct btrfs_workqueue *scrub_parity_workers;
1: -	struct btrfs_discard_ctl discard_ctl;
1: -	u64 qgroup_flags;
1: -	struct rb_root qgroup_tree;
1: -	spinlock_t qgroup_lock;
1: -	struct ulist *qgroup_ulist;
1: -	struct mutex qgroup_ioctl_lock;
1: -	struct list_head dirty_qgroups;
1: -	u64 qgroup_seq;
1: -	struct mutex qgroup_rescan_lock;
1: -	struct btrfs_key qgroup_rescan_progress;
1: -	struct btrfs_workqueue *qgroup_rescan_workers;
1: -	struct completion qgroup_rescan_completion;
1: -	struct btrfs_work qgroup_rescan_work;
1: -	bool qgroup_rescan_running;
1: -	long unsigned int fs_state;
1: -	struct btrfs_delayed_root *delayed_root;
1: -	spinlock_t reada_lock;
1: -	struct xarray reada_tree;
1: -	atomic_t reada_works_cnt;
1: -	spinlock_t buffer_lock;
1: -	struct xarray buffer_radix;
1: -	int backup_root_index;
1: -	struct btrfs_dev_replace dev_replace;
1: -	struct semaphore uuid_tree_rescan_sem;
1: -	struct work_struct async_reclaim_work;
1: -	struct work_struct async_data_reclaim_work;
1: -	spinlock_t unused_bgs_lock;
1: -	struct list_head unused_bgs;
1: -	struct mutex unused_bg_unpin_mutex;
1: -	struct mutex delete_unused_bgs_mutex;
1: -	u32 nodesize;
1: -	u32 sectorsize;
1: -	u32 stripesize;
1: -	spinlock_t swapfile_pins_lock;
1: -	struct rb_root swapfile_pins;
1: -	struct crypto_shash *csum_shash;
1: -	int send_in_progress;
1: -	long unsigned int exclusive_operation;
1: +  u8 chunk_tree_uuid[16];
1: +  long unsigned int flags;
1: +  struct btrfs_root *extent_root;
1: +  struct btrfs_root *tree_root;
1: +  struct btrfs_root *chunk_root;
1: +  struct btrfs_root *dev_root;
1: +  struct btrfs_root *fs_root;
1: +  struct btrfs_root *csum_root;
1: +  struct btrfs_root *quota_root;
1: +  struct btrfs_root *uuid_root;
1: +  struct btrfs_root *free_space_root;
1: +  struct btrfs_root *data_reloc_root;
1: +  struct btrfs_root *log_root_tree;
1: +  spinlock_t fs_roots_radix_lock;
1: +  struct xarray fs_roots_radix;
1: +  spinlock_t block_group_cache_lock;
1: +  u64 first_logical_byte;
1: +  struct rb_root block_group_cache_tree;
1: +  atomic64_t free_chunk_space;
1: +  struct extent_io_tree excluded_extents;
1: +  struct extent_map_tree mapping_tree;
1: +  struct btrfs_block_rsv global_block_rsv;
1: +  struct btrfs_block_rsv trans_block_rsv;
1: +  struct btrfs_block_rsv chunk_block_rsv;
1: +  struct btrfs_block_rsv delayed_block_rsv;
1: +  struct btrfs_block_rsv delayed_refs_rsv;
1: +  struct btrfs_block_rsv empty_block_rsv;
1: +  u64 generation;
1: +  u64 last_trans_committed;
1: +  u64 avg_delayed_ref_runtime;
1: +  u64 last_trans_log_full_commit;
1: +  long unsigned int mount_opt;
1: +  long unsigned int pending_changes;
1: +  long unsigned int compress_type : 4;
1: +  unsigned int compress_level;
1: +  u32 commit_interval;
1: +  u64 max_inline;
1: +  struct btrfs_transaction *running_transaction;
1: +  wait_queue_head_t transaction_throttle;
1: +  wait_queue_head_t transaction_wait;
1: +  wait_queue_head_t transaction_blocked_wait;
1: +  wait_queue_head_t async_submit_wait;
1: +  spinlock_t super_lock;
1: +  struct btrfs_super_block *super_copy;
1: +  struct btrfs_super_block *super_for_commit;
1: +  struct super_block *sb;
1: +  struct inode *btree_inode;
1: +  struct mutex tree_log_mutex;
1: +  struct mutex transaction_kthread_mutex;
1: +  struct mutex cleaner_mutex;
1: +  struct mutex chunk_mutex;
1: +  struct mutex ro_block_group_mutex;
1: +  struct btrfs_stripe_hash_table *stripe_hash_table;
1: +  struct mutex ordered_operations_mutex;
1: +  struct rw_semaphore commit_root_sem;
1: +  struct rw_semaphore cleanup_work_sem;
1: +  struct rw_semaphore subvol_sem;
1: +  spinlock_t trans_lock;
1: +  struct mutex reloc_mutex;
1: +  struct list_head trans_list;
1: +  struct list_head dead_roots;
1: +  struct list_head caching_block_groups;
1: +  spinlock_t delayed_iput_lock;
1: +  struct list_head delayed_iputs;
1: +  atomic_t nr_delayed_iputs;
1: +  wait_queue_head_t delayed_iputs_wait;
1: +  atomic64_t tree_mod_seq;
1: +  rwlock_t tree_mod_log_lock;
1: +  struct rb_root tree_mod_log;
1: +  struct list_head tree_mod_seq_list;
1: +  atomic_t async_delalloc_pages;
1: +  spinlock_t ordered_root_lock;
1: +  struct list_head ordered_roots;
1: +  struct mutex delalloc_root_mutex;
1: +  spinlock_t delalloc_root_lock;
1: +  struct list_head delalloc_roots;
1: +  struct btrfs_workqueue *workers;
1: +  struct btrfs_workqueue *delalloc_workers;
1: +  struct btrfs_workqueue *flush_workers;
1: +  struct btrfs_workqueue *endio_workers;
1: +  struct btrfs_workqueue *endio_meta_workers;
1: +  struct btrfs_workqueue *endio_raid56_workers;
1: +  struct btrfs_workqueue *rmw_workers;
1: +  struct btrfs_workqueue *endio_meta_write_workers;
1: +  struct btrfs_workqueue *endio_write_workers;
1: +  struct btrfs_workqueue *endio_freespace_worker;
1: +  struct btrfs_workqueue *caching_workers;
1: +  struct btrfs_workqueue *readahead_workers;
1: +  struct btrfs_workqueue *fixup_workers;
1: +  struct btrfs_workqueue *delayed_workers;
1: +  struct task_struct *transaction_kthread;
1: +  struct task_struct *cleaner_kthread;
1: +  u32 thread_pool_size;
1: +  struct kobject *space_info_kobj;
1: +  struct kobject *qgroups_kobj;
1: +  u64 total_pinned;
1: +  struct percpu_counter dirty_metadata_bytes;
1: +  struct percpu_counter delalloc_bytes;
1: +  struct percpu_counter dio_bytes;
1: +  s32 dirty_metadata_batch;
1: +  s32 delalloc_batch;
1: +  struct list_head dirty_cowonly_roots;
1: +  struct btrfs_fs_devices *fs_devices;
1: +  struct list_head space_info;
1: +  struct btrfs_space_info *data_sinfo;
1: +  struct reloc_control *reloc_ctl;
1: +  struct btrfs_free_cluster data_alloc_cluster;
1: +  struct btrfs_free_cluster meta_alloc_cluster;
1: +  spinlock_t defrag_inodes_lock;
1: +  struct rb_root defrag_inodes;
1: +  atomic_t defrag_running;
1: +  seqlock_t profiles_lock;
1: +  u64 avail_data_alloc_bits;
1: +  u64 avail_metadata_alloc_bits;
1: +  u64 avail_system_alloc_bits;
1: +  spinlock_t balance_lock;
1: +  struct mutex balance_mutex;
1: +  atomic_t balance_pause_req;
1: +  atomic_t balance_cancel_req;
1: +  struct btrfs_balance_control *balance_ctl;
1: +  wait_queue_head_t balance_wait_q;
1: +  u32 data_chunk_allocations;
1: +  u32 metadata_ratio;
1: +  void *bdev_holder;
1: +  struct mutex scrub_lock;
1: +  atomic_t scrubs_running;
1: +  atomic_t scrub_pause_req;
1: +  atomic_t scrubs_paused;
1: +  atomic_t scrub_cancel_req;
1: +  wait_queue_head_t scrub_pause_wait;
1: +  refcount_t scrub_workers_refcnt;
1: +  struct btrfs_workqueue *scrub_workers;
1: +  struct btrfs_workqueue *scrub_wr_completion_workers;
1: +  struct btrfs_workqueue *scrub_parity_workers;
1: +  struct btrfs_discard_ctl discard_ctl;
1: +  u64 qgroup_flags;
1: +  struct rb_root qgroup_tree;
1: +  spinlock_t qgroup_lock;
1: +  struct ulist *qgroup_ulist;
1: +  struct mutex qgroup_ioctl_lock;
1: +  struct list_head dirty_qgroups;
1: +  u64 qgroup_seq;
1: +  struct mutex qgroup_rescan_lock;
1: +  struct btrfs_key qgroup_rescan_progress;
1: +  struct btrfs_workqueue *qgroup_rescan_workers;
1: +  struct completion qgroup_rescan_completion;
1: +  struct btrfs_work qgroup_rescan_work;
1: +  bool qgroup_rescan_running;
1: +  long unsigned int fs_state;
1: +  struct btrfs_delayed_root *delayed_root;
1: +  spinlock_t reada_lock;
1: +  struct xarray reada_tree;
1: +  atomic_t reada_works_cnt;
1: +  spinlock_t buffer_lock;
1: +  struct xarray buffer_radix;
1: +  int backup_root_index;
1: +  struct btrfs_dev_replace dev_replace;
1: +  struct semaphore uuid_tree_rescan_sem;
1: +  struct work_struct async_reclaim_work;
1: +  struct work_struct async_data_reclaim_work;
1: +  spinlock_t unused_bgs_lock;
1: +  struct list_head unused_bgs;
1: +  struct mutex unused_bg_unpin_mutex;
1: +  struct mutex delete_unused_bgs_mutex;
1: +  u32 nodesize;
1: +  u32 sectorsize;
1: +  u32 stripesize;
1: +  spinlock_t swapfile_pins_lock;
1: +  struct rb_root swapfile_pins;
1: +  struct crypto_shash *csum_shash;
1: +  int send_in_progress;
1: +  long unsigned int exclusive_operation;
1:  };
1:  
1:  struct io_failure_record;
1:  
1:  struct extent_state {
1: -	u64 start;
1: -	u64 end;
1: -	struct rb_node rb_node;
1: -	wait_queue_head_t wq;
1: -	refcount_t refs;
1: -	unsigned int state;
1: -	struct io_failure_record *failrec;
1: +  u64 start;
1: +  u64 end;
1: +  struct rb_node rb_node;
1: +  wait_queue_head_t wq;
1: +  refcount_t refs;
1: +  unsigned int state;
1: +  struct io_failure_record *failrec;
1:  };
1:  
1:  struct io_failure_record {
1: -	struct page *page;
1: -	u64 start;
1: -	u64 len;
1: -	u64 logical;
1: -	long unsigned int bio_flags;
1: -	int this_mirror;
1: -	int failed_mirror;
1: -	int in_validation;
1: +  struct page *page;
1: +  u64 start;
1: +  u64 len;
1: +  u64 logical;
1: +  long unsigned int bio_flags;
1: +  int this_mirror;
1: +  int failed_mirror;
1: +  int in_validation;
1:  };
1:  
1:  struct ulist {
1: -	long unsigned int nnodes;
1: -	struct list_head nodes;
1: -	struct rb_root root;
1: +  long unsigned int nnodes;
1: +  struct list_head nodes;
1: +  struct rb_root root;
1:  };
1:  
1:  struct extent_buffer {
1: -	u64 start;
1: -	long unsigned int len;
1: -	long unsigned int bflags;
1: -	struct btrfs_fs_info *fs_info;
1: -	spinlock_t refs_lock;
1: -	atomic_t refs;
1: -	atomic_t io_pages;
1: -	int read_mirror;
1: -	struct callback_head callback_head;
1: -	pid_t lock_owner;
1: -	int blocking_writers;
1: -	atomic_t blocking_readers;
1: -	bool lock_recursed;
1: -	short int log_index;
1: -	rwlock_t lock;
1: -	wait_queue_head_t write_lock_wq;
1: -	wait_queue_head_t read_lock_wq;
1: -	struct page *pages[16];
1: +  u64 start;
1: +  long unsigned int len;
1: +  long unsigned int bflags;
1: +  struct btrfs_fs_info *fs_info;
1: +  spinlock_t refs_lock;
1: +  atomic_t refs;
1: +  atomic_t io_pages;
1: +  int read_mirror;
1: +  struct callback_head callback_head;
1: +  pid_t lock_owner;
1: +  int blocking_writers;
1: +  atomic_t blocking_readers;
1: +  bool lock_recursed;
1: +  short int log_index;
1: +  rwlock_t lock;
1: +  wait_queue_head_t write_lock_wq;
1: +  wait_queue_head_t read_lock_wq;
1: +  struct page *pages[16];
1:  };
1:  
1:  struct map_lookup;
1:  
1:  struct extent_map {
1: -	struct rb_node rb_node;
1: -	u64 start;
1: -	u64 len;
1: -	u64 mod_start;
1: -	u64 mod_len;
1: -	u64 orig_start;
1: -	u64 orig_block_len;
1: -	u64 ram_bytes;
1: -	u64 block_start;
1: -	u64 block_len;
1: -	u64 generation;
1: -	long unsigned int flags;
1: -	struct map_lookup *map_lookup;
1: -	refcount_t refs;
1: -	unsigned int compress_type;
1: -	struct list_head list;
1: +  struct rb_node rb_node;
1: +  u64 start;
1: +  u64 len;
1: +  u64 mod_start;
1: +  u64 mod_len;
1: +  u64 orig_start;
1: +  u64 orig_block_len;
1: +  u64 ram_bytes;
1: +  u64 block_start;
1: +  u64 block_len;
1: +  u64 generation;
1: +  long unsigned int flags;
1: +  struct map_lookup *map_lookup;
1: +  refcount_t refs;
1: +  unsigned int compress_type;
1: +  struct list_head list;
1:  };
1:  
1:  struct btrfs_ordered_inode_tree {
1: -	spinlock_t lock;
1: -	struct rb_root tree;
1: -	struct rb_node *last;
1: +  spinlock_t lock;
1: +  struct rb_root tree;
1: +  struct rb_node *last;
1:  };
1:  
1:  struct btrfs_delayed_node;
1:  
1:  struct btrfs_inode {
1: -	struct btrfs_root *root;
1: -	struct btrfs_key location;
1: -	spinlock_t lock;
1: -	struct extent_map_tree extent_tree;
1: -	struct extent_io_tree io_tree;
1: -	struct extent_io_tree io_failure_tree;
1: -	struct extent_io_tree file_extent_tree;
1: -	struct mutex log_mutex;
1: -	struct btrfs_ordered_inode_tree ordered_tree;
1: -	struct list_head delalloc_inodes;
1: -	struct rb_node rb_node;
1: -	long unsigned int runtime_flags;
1: -	atomic_t sync_writers;
1: -	u64 generation;
1: -	u64 last_trans;
1: -	u64 logged_trans;
1: -	int last_sub_trans;
1: -	int last_log_commit;
1: -	u64 delalloc_bytes;
1: -	u64 new_delalloc_bytes;
1: -	u64 defrag_bytes;
1: -	u64 disk_i_size;
1: -	u64 index_cnt;
1: -	u64 dir_index;
1: -	u64 last_unlink_trans;
1: -	u64 last_reflink_trans;
1: -	u64 csum_bytes;
1: -	u32 flags;
1: -	unsigned int outstanding_extents;
1: -	struct btrfs_block_rsv block_rsv;
1: -	unsigned int prop_compress;
1: -	unsigned int defrag_compress;
1: -	struct btrfs_delayed_node *delayed_node;
1: -	struct timespec64 i_otime;
1: -	struct list_head delayed_iput;
1: -	struct rw_semaphore dio_sem;
1: -	struct inode vfs_inode;
1: -};
1: -
1: -enum {
1: -	EXTENT_FLAG_PINNED = 0,
1: -	EXTENT_FLAG_COMPRESSED = 1,
1: -	EXTENT_FLAG_PREALLOC = 2,
1: -	EXTENT_FLAG_LOGGING = 3,
1: -	EXTENT_FLAG_FILLING = 4,
1: -	EXTENT_FLAG_FS_MAPPING = 5,
1: +  struct btrfs_root *root;
1: +  struct btrfs_key location;
1: +  spinlock_t lock;
1: +  struct extent_map_tree extent_tree;
1: +  struct extent_io_tree io_tree;
1: +  struct extent_io_tree io_failure_tree;
1: +  struct extent_io_tree file_extent_tree;
1: +  struct mutex log_mutex;
1: +  struct btrfs_ordered_inode_tree ordered_tree;
1: +  struct list_head delalloc_inodes;
1: +  struct rb_node rb_node;
1: +  long unsigned int runtime_flags;
1: +  atomic_t sync_writers;
1: +  u64 generation;
1: +  u64 last_trans;
1: +  u64 logged_trans;
1: +  int last_sub_trans;
1: +  int last_log_commit;
1: +  u64 delalloc_bytes;
1: +  u64 new_delalloc_bytes;
1: +  u64 defrag_bytes;
1: +  u64 disk_i_size;
1: +  u64 index_cnt;
1: +  u64 dir_index;
1: +  u64 last_unlink_trans;
1: +  u64 last_reflink_trans;
1: +  u64 csum_bytes;
1: +  u32 flags;
1: +  unsigned int outstanding_extents;
1: +  struct btrfs_block_rsv block_rsv;
1: +  unsigned int prop_compress;
1: +  unsigned int defrag_compress;
1: +  struct btrfs_delayed_node *delayed_node;
1: +  struct timespec64 i_otime;
1: +  struct list_head delayed_iput;
1: +  struct rw_semaphore dio_sem;
1: +  struct inode vfs_inode;
1: +};
1: +
1: +enum {
1: +  EXTENT_FLAG_PINNED = 0,
1: +  EXTENT_FLAG_COMPRESSED = 1,
1: +  EXTENT_FLAG_PREALLOC = 2,
1: +  EXTENT_FLAG_LOGGING = 3,
1: +  EXTENT_FLAG_FILLING = 4,
1: +  EXTENT_FLAG_FS_MAPPING = 5,
1:  };
1:  
1:  struct btrfs_bio_stripe {
1: -	struct btrfs_device *dev;
1: -	u64 physical;
1: -	u64 length;
1: +  struct btrfs_device *dev;
1: +  u64 physical;
1: +  u64 length;
1:  };
1:  
1:  struct map_lookup {
1: -	u64 type;
1: -	int io_align;
1: -	int io_width;
1: -	u64 stripe_len;
1: -	int num_stripes;
1: -	int sub_stripes;
1: -	int verified_stripes;
1: -	struct btrfs_bio_stripe stripes[0];
1: +  u64 type;
1: +  int io_align;
1: +  int io_width;
1: +  u64 stripe_len;
1: +  int num_stripes;
1: +  int sub_stripes;
1: +  int verified_stripes;
1: +  struct btrfs_bio_stripe stripes[0];
1:  };
1:  
1:  struct __btrfs_workqueue {
1: -	struct workqueue_struct *normal_wq;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct list_head ordered_list;
1: -	spinlock_t list_lock;
1: -	atomic_t pending;
1: -	int limit_active;
1: -	int current_active;
1: -	int thresh;
1: -	unsigned int count;
1: -	spinlock_t thres_lock;
1: +  struct workqueue_struct *normal_wq;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct list_head ordered_list;
1: +  spinlock_t list_lock;
1: +  atomic_t pending;
1: +  int limit_active;
1: +  int current_active;
1: +  int thresh;
1: +  unsigned int count;
1: +  spinlock_t thres_lock;
1:  };
1:  
1:  struct btrfs_space_info {
1: -	spinlock_t lock;
1: -	u64 total_bytes;
1: -	u64 bytes_used;
1: -	u64 bytes_pinned;
1: -	u64 bytes_reserved;
1: -	u64 bytes_may_use;
1: -	u64 bytes_readonly;
1: -	u64 max_extent_size;
1: -	unsigned int full: 1;
1: -	unsigned int chunk_alloc: 1;
1: -	unsigned int flush: 1;
1: -	unsigned int force_alloc;
1: -	u64 disk_used;
1: -	u64 disk_total;
1: -	u64 flags;
1: -	struct percpu_counter total_bytes_pinned;
1: -	struct list_head list;
1: -	struct list_head ro_bgs;
1: -	struct list_head priority_tickets;
1: -	struct list_head tickets;
1: -	u64 reclaim_size;
1: -	u64 tickets_id;
1: -	struct rw_semaphore groups_sem;
1: -	struct list_head block_groups[9];
1: -	struct kobject kobj;
1: -	struct kobject *block_group_kobjs[9];
1: +  spinlock_t lock;
1: +  u64 total_bytes;
1: +  u64 bytes_used;
1: +  u64 bytes_pinned;
1: +  u64 bytes_reserved;
1: +  u64 bytes_may_use;
1: +  u64 bytes_readonly;
1: +  u64 max_extent_size;
1: +  unsigned int full : 1;
1: +  unsigned int chunk_alloc : 1;
1: +  unsigned int flush : 1;
1: +  unsigned int force_alloc;
1: +  u64 disk_used;
1: +  u64 disk_total;
1: +  u64 flags;
1: +  struct percpu_counter total_bytes_pinned;
1: +  struct list_head list;
1: +  struct list_head ro_bgs;
1: +  struct list_head priority_tickets;
1: +  struct list_head tickets;
1: +  u64 reclaim_size;
1: +  u64 tickets_id;
1: +  struct rw_semaphore groups_sem;
1: +  struct list_head block_groups[9];
1: +  struct kobject kobj;
1: +  struct kobject *block_group_kobjs[9];
1:  };
1:  
1:  enum btrfs_lock_nesting {
1: -	BTRFS_NESTING_NORMAL = 0,
1: -	BTRFS_NESTING_COW = 1,
1: -	BTRFS_NESTING_LEFT = 2,
1: -	BTRFS_NESTING_RIGHT = 3,
1: -	BTRFS_NESTING_LEFT_COW = 4,
1: -	BTRFS_NESTING_RIGHT_COW = 5,
1: -	BTRFS_NESTING_SPLIT = 6,
1: -	BTRFS_NESTING_NEW_ROOT = 7,
1: -	BTRFS_NESTING_MAX = 8,
1: +  BTRFS_NESTING_NORMAL = 0,
1: +  BTRFS_NESTING_COW = 1,
1: +  BTRFS_NESTING_LEFT = 2,
1: +  BTRFS_NESTING_RIGHT = 3,
1: +  BTRFS_NESTING_LEFT_COW = 4,
1: +  BTRFS_NESTING_RIGHT_COW = 5,
1: +  BTRFS_NESTING_SPLIT = 6,
1: +  BTRFS_NESTING_NEW_ROOT = 7,
1: +  BTRFS_NESTING_MAX = 8,
1:  };
1:  
1:  struct btrfs_drew_lock {
1: -	atomic_t readers;
1: -	struct percpu_counter writers;
1: -	wait_queue_head_t pending_writers;
1: -	wait_queue_head_t pending_readers;
1: +  atomic_t readers;
1: +  struct percpu_counter writers;
1: +  wait_queue_head_t pending_writers;
1: +  wait_queue_head_t pending_readers;
1:  };
1:  
1:  enum {
1: -	BTRFS_FS_STATE_ERROR = 0,
1: -	BTRFS_FS_STATE_REMOUNTING = 1,
1: -	BTRFS_FS_STATE_TRANS_ABORTED = 2,
1: -	BTRFS_FS_STATE_DEV_REPLACING = 3,
1: -	BTRFS_FS_STATE_DUMMY_FS_INFO = 4,
1: +  BTRFS_FS_STATE_ERROR = 0,
1: +  BTRFS_FS_STATE_REMOUNTING = 1,
1: +  BTRFS_FS_STATE_TRANS_ABORTED = 2,
1: +  BTRFS_FS_STATE_DEV_REPLACING = 3,
1: +  BTRFS_FS_STATE_DUMMY_FS_INFO = 4,
1:  };
1:  
1:  struct btrfs_header {
1: -	u8 csum[32];
1: -	u8 fsid[16];
1: -	__le64 bytenr;
1: -	__le64 flags;
1: -	u8 chunk_tree_uuid[16];
1: -	__le64 generation;
1: -	__le64 owner;
1: -	__le32 nritems;
1: -	u8 level;
1: +  u8 csum[32];
1: +  u8 fsid[16];
1: +  __le64 bytenr;
1: +  __le64 flags;
1: +  u8 chunk_tree_uuid[16];
1: +  __le64 generation;
1: +  __le64 owner;
1: +  __le32 nritems;
1: +  u8 level;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_root_backup {
1: -	__le64 tree_root;
1: -	__le64 tree_root_gen;
1: -	__le64 chunk_root;
1: -	__le64 chunk_root_gen;
1: -	__le64 extent_root;
1: -	__le64 extent_root_gen;
1: -	__le64 fs_root;
1: -	__le64 fs_root_gen;
1: -	__le64 dev_root;
1: -	__le64 dev_root_gen;
1: -	__le64 csum_root;
1: -	__le64 csum_root_gen;
1: -	__le64 total_bytes;
1: -	__le64 bytes_used;
1: -	__le64 num_devices;
1: -	__le64 unused_64[4];
1: -	u8 tree_root_level;
1: -	u8 chunk_root_level;
1: -	u8 extent_root_level;
1: -	u8 fs_root_level;
1: -	u8 dev_root_level;
1: -	u8 csum_root_level;
1: -	u8 unused_8[10];
1: +  __le64 tree_root;
1: +  __le64 tree_root_gen;
1: +  __le64 chunk_root;
1: +  __le64 chunk_root_gen;
1: +  __le64 extent_root;
1: +  __le64 extent_root_gen;
1: +  __le64 fs_root;
1: +  __le64 fs_root_gen;
1: +  __le64 dev_root;
1: +  __le64 dev_root_gen;
1: +  __le64 csum_root;
1: +  __le64 csum_root_gen;
1: +  __le64 total_bytes;
1: +  __le64 bytes_used;
1: +  __le64 num_devices;
1: +  __le64 unused_64[4];
1: +  u8 tree_root_level;
1: +  u8 chunk_root_level;
1: +  u8 extent_root_level;
1: +  u8 fs_root_level;
1: +  u8 dev_root_level;
1: +  u8 csum_root_level;
1: +  u8 unused_8[10];
1:  };
1:  
1:  struct btrfs_super_block {
1: -	u8 csum[32];
1: -	u8 fsid[16];
1: -	__le64 bytenr;
1: -	__le64 flags;
1: -	__le64 magic;
1: -	__le64 generation;
1: -	__le64 root;
1: -	__le64 chunk_root;
1: -	__le64 log_root;
1: -	__le64 log_root_transid;
1: -	__le64 total_bytes;
1: -	__le64 bytes_used;
1: -	__le64 root_dir_objectid;
1: -	__le64 num_devices;
1: -	__le32 sectorsize;
1: -	__le32 nodesize;
1: -	__le32 __unused_leafsize;
1: -	__le32 stripesize;
1: -	__le32 sys_chunk_array_size;
1: -	__le64 chunk_root_generation;
1: -	__le64 compat_flags;
1: -	__le64 compat_ro_flags;
1: -	__le64 incompat_flags;
1: -	__le16 csum_type;
1: -	u8 root_level;
1: -	u8 chunk_root_level;
1: -	u8 log_root_level;
1: -	struct btrfs_dev_item dev_item;
1: -	char label[256];
1: -	__le64 cache_generation;
1: -	__le64 uuid_tree_generation;
1: -	u8 metadata_uuid[16];
1: -	__le64 reserved[28];
1: -	u8 sys_chunk_array[2048];
1: -	struct btrfs_root_backup super_roots[4];
1: +  u8 csum[32];
1: +  u8 fsid[16];
1: +  __le64 bytenr;
1: +  __le64 flags;
1: +  __le64 magic;
1: +  __le64 generation;
1: +  __le64 root;
1: +  __le64 chunk_root;
1: +  __le64 log_root;
1: +  __le64 log_root_transid;
1: +  __le64 total_bytes;
1: +  __le64 bytes_used;
1: +  __le64 root_dir_objectid;
1: +  __le64 num_devices;
1: +  __le32 sectorsize;
1: +  __le32 nodesize;
1: +  __le32 __unused_leafsize;
1: +  __le32 stripesize;
1: +  __le32 sys_chunk_array_size;
1: +  __le64 chunk_root_generation;
1: +  __le64 compat_flags;
1: +  __le64 compat_ro_flags;
1: +  __le64 incompat_flags;
1: +  __le16 csum_type;
1: +  u8 root_level;
1: +  u8 chunk_root_level;
1: +  u8 log_root_level;
1: +  struct btrfs_dev_item dev_item;
1: +  char label[256];
1: +  __le64 cache_generation;
1: +  __le64 uuid_tree_generation;
1: +  u8 metadata_uuid[16];
1: +  __le64 reserved[28];
1: +  u8 sys_chunk_array[2048];
1: +  struct btrfs_root_backup super_roots[4];
1:  } __attribute__((packed));
1:  
1:  struct btrfs_item {
1: -	struct btrfs_disk_key key;
1: -	__le32 offset;
1: -	__le32 size;
1: +  struct btrfs_disk_key key;
1: +  __le32 offset;
1: +  __le32 size;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_path {
1: -	struct extent_buffer *nodes[8];
1: -	int slots[8];
1: -	u8 locks[8];
1: -	u8 reada;
1: -	u8 lowest_level;
1: -	unsigned int search_for_split: 1;
1: -	unsigned int keep_locks: 1;
1: -	unsigned int skip_locking: 1;
1: -	unsigned int leave_spinning: 1;
1: -	unsigned int search_commit_root: 1;
1: -	unsigned int need_commit_sem: 1;
1: -	unsigned int skip_release_on_error: 1;
1: -	unsigned int recurse: 1;
1: +  struct extent_buffer *nodes[8];
1: +  int slots[8];
1: +  u8 locks[8];
1: +  u8 reada;
1: +  u8 lowest_level;
1: +  unsigned int search_for_split : 1;
1: +  unsigned int keep_locks : 1;
1: +  unsigned int skip_locking : 1;
1: +  unsigned int leave_spinning : 1;
1: +  unsigned int search_commit_root : 1;
1: +  unsigned int need_commit_sem : 1;
1: +  unsigned int skip_release_on_error : 1;
1: +  unsigned int recurse : 1;
1:  };
1:  
1:  struct rcu_string;
1: @@ -53300,68 +54065,68 @@ struct scrub_ctx;
1:  struct reada_zone;
1:  
1:  struct btrfs_device {
1: -	struct list_head dev_list;
1: -	struct list_head dev_alloc_list;
1: -	struct list_head post_commit_list;
1: -	struct btrfs_fs_devices *fs_devices;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct rcu_string *name;
1: -	u64 generation;
1: -	struct block_device *bdev;
1: -	fmode_t mode;
1: -	long unsigned int dev_state;
1: -	blk_status_t last_flush_error;
1: -	u64 devid;
1: -	u64 total_bytes;
1: -	u64 disk_total_bytes;
1: -	u64 bytes_used;
1: -	u32 io_align;
1: -	u32 io_width;
1: -	u64 type;
1: -	u32 sector_size;
1: -	u8 uuid[16];
1: -	u64 commit_total_bytes;
1: -	u64 commit_bytes_used;
1: -	struct bio *flush_bio;
1: -	struct completion flush_wait;
1: -	struct scrub_ctx *scrub_ctx;
1: -	atomic_t reada_in_flight;
1: -	u64 reada_next;
1: -	struct reada_zone *reada_curr_zone;
1: -	struct xarray reada_zones;
1: -	struct xarray reada_extents;
1: -	int dev_stats_valid;
1: -	atomic_t dev_stats_ccnt;
1: -	atomic_t dev_stat_values[5];
1: -	struct extent_io_tree alloc_state;
1: -	struct completion kobj_unregister;
1: -	struct kobject devid_kobj;
1: +  struct list_head dev_list;
1: +  struct list_head dev_alloc_list;
1: +  struct list_head post_commit_list;
1: +  struct btrfs_fs_devices *fs_devices;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct rcu_string *name;
1: +  u64 generation;
1: +  struct block_device *bdev;
1: +  fmode_t mode;
1: +  long unsigned int dev_state;
1: +  blk_status_t last_flush_error;
1: +  u64 devid;
1: +  u64 total_bytes;
1: +  u64 disk_total_bytes;
1: +  u64 bytes_used;
1: +  u32 io_align;
1: +  u32 io_width;
1: +  u64 type;
1: +  u32 sector_size;
1: +  u8 uuid[16];
1: +  u64 commit_total_bytes;
1: +  u64 commit_bytes_used;
1: +  struct bio *flush_bio;
1: +  struct completion flush_wait;
1: +  struct scrub_ctx *scrub_ctx;
1: +  atomic_t reada_in_flight;
1: +  u64 reada_next;
1: +  struct reada_zone *reada_curr_zone;
1: +  struct xarray reada_zones;
1: +  struct xarray reada_extents;
1: +  int dev_stats_valid;
1: +  atomic_t dev_stats_ccnt;
1: +  atomic_t dev_stat_values[5];
1: +  struct extent_io_tree alloc_state;
1: +  struct completion kobj_unregister;
1: +  struct kobject devid_kobj;
1:  };
1:  
1:  enum btrfs_discard_state {
1: -	BTRFS_DISCARD_EXTENTS = 0,
1: -	BTRFS_DISCARD_BITMAPS = 1,
1: -	BTRFS_DISCARD_RESET_CURSOR = 2,
1: +  BTRFS_DISCARD_EXTENTS = 0,
1: +  BTRFS_DISCARD_BITMAPS = 1,
1: +  BTRFS_DISCARD_RESET_CURSOR = 2,
1:  };
1:  
1:  struct btrfs_io_ctl {
1: -	void *cur;
1: -	void *orig;
1: -	struct page *page;
1: -	struct page **pages;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct inode *inode;
1: -	long unsigned int size;
1: -	int index;
1: -	int num_pages;
1: -	int entries;
1: -	int bitmaps;
1: -	unsigned int check_crcs: 1;
1: +  void *cur;
1: +  void *orig;
1: +  struct page *page;
1: +  struct page **pages;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct inode *inode;
1: +  long unsigned int size;
1: +  int index;
1: +  int num_pages;
1: +  int entries;
1: +  int bitmaps;
1: +  unsigned int check_crcs : 1;
1:  };
1:  
1:  struct btrfs_full_stripe_locks_tree {
1: -	struct rb_root root;
1: -	struct mutex lock;
1: +  struct rb_root root;
1: +  struct mutex lock;
1:  };
1:  
1:  struct btrfs_caching_control;
1: @@ -53369,1110 +54134,1110 @@ struct btrfs_caching_control;
1:  struct btrfs_free_space_ctl;
1:  
1:  struct btrfs_block_group {
1: -	struct btrfs_fs_info *fs_info;
1: -	struct inode *inode;
1: -	spinlock_t lock;
1: -	u64 start;
1: -	u64 length;
1: -	u64 pinned;
1: -	u64 reserved;
1: -	u64 used;
1: -	u64 delalloc_bytes;
1: -	u64 bytes_super;
1: -	u64 flags;
1: -	u64 cache_generation;
1: -	u32 bitmap_high_thresh;
1: -	u32 bitmap_low_thresh;
1: -	struct rw_semaphore data_rwsem;
1: -	long unsigned int full_stripe_len;
1: -	unsigned int ro;
1: -	unsigned int iref: 1;
1: -	unsigned int has_caching_ctl: 1;
1: -	unsigned int removed: 1;
1: -	int disk_cache_state;
1: -	int cached;
1: -	struct btrfs_caching_control *caching_ctl;
1: -	u64 last_byte_to_unpin;
1: -	struct btrfs_space_info *space_info;
1: -	struct btrfs_free_space_ctl *free_space_ctl;
1: -	struct rb_node cache_node;
1: -	struct list_head list;
1: -	refcount_t refs;
1: -	struct list_head cluster_list;
1: -	struct list_head bg_list;
1: -	struct list_head ro_list;
1: -	atomic_t frozen;
1: -	struct list_head discard_list;
1: -	int discard_index;
1: -	u64 discard_eligible_time;
1: -	u64 discard_cursor;
1: -	enum btrfs_discard_state discard_state;
1: -	struct list_head dirty_list;
1: -	struct list_head io_list;
1: -	struct btrfs_io_ctl io_ctl;
1: -	atomic_t reservations;
1: -	atomic_t nocow_writers;
1: -	struct mutex free_space_lock;
1: -	int needs_free_space;
1: -	struct btrfs_full_stripe_locks_tree full_stripe_locks_root;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct inode *inode;
1: +  spinlock_t lock;
1: +  u64 start;
1: +  u64 length;
1: +  u64 pinned;
1: +  u64 reserved;
1: +  u64 used;
1: +  u64 delalloc_bytes;
1: +  u64 bytes_super;
1: +  u64 flags;
1: +  u64 cache_generation;
1: +  u32 bitmap_high_thresh;
1: +  u32 bitmap_low_thresh;
1: +  struct rw_semaphore data_rwsem;
1: +  long unsigned int full_stripe_len;
1: +  unsigned int ro;
1: +  unsigned int iref : 1;
1: +  unsigned int has_caching_ctl : 1;
1: +  unsigned int removed : 1;
1: +  int disk_cache_state;
1: +  int cached;
1: +  struct btrfs_caching_control *caching_ctl;
1: +  u64 last_byte_to_unpin;
1: +  struct btrfs_space_info *space_info;
1: +  struct btrfs_free_space_ctl *free_space_ctl;
1: +  struct rb_node cache_node;
1: +  struct list_head list;
1: +  refcount_t refs;
1: +  struct list_head cluster_list;
1: +  struct list_head bg_list;
1: +  struct list_head ro_list;
1: +  atomic_t frozen;
1: +  struct list_head discard_list;
1: +  int discard_index;
1: +  u64 discard_eligible_time;
1: +  u64 discard_cursor;
1: +  enum btrfs_discard_state discard_state;
1: +  struct list_head dirty_list;
1: +  struct list_head io_list;
1: +  struct btrfs_io_ctl io_ctl;
1: +  atomic_t reservations;
1: +  atomic_t nocow_writers;
1: +  struct mutex free_space_lock;
1: +  int needs_free_space;
1: +  struct btrfs_full_stripe_locks_tree full_stripe_locks_root;
1:  };
1:  
1:  enum btrfs_caching_type {
1: -	BTRFS_CACHE_NO = 0,
1: -	BTRFS_CACHE_STARTED = 1,
1: -	BTRFS_CACHE_FAST = 2,
1: -	BTRFS_CACHE_FINISHED = 3,
1: -	BTRFS_CACHE_ERROR = 4,
1: -};
1: -
1: -enum {
1: -	BTRFS_FS_BARRIER = 0,
1: -	BTRFS_FS_CLOSING_START = 1,
1: -	BTRFS_FS_CLOSING_DONE = 2,
1: -	BTRFS_FS_LOG_RECOVERING = 3,
1: -	BTRFS_FS_OPEN = 4,
1: -	BTRFS_FS_QUOTA_ENABLED = 5,
1: -	BTRFS_FS_UPDATE_UUID_TREE_GEN = 6,
1: -	BTRFS_FS_CREATING_FREE_SPACE_TREE = 7,
1: -	BTRFS_FS_BTREE_ERR = 8,
1: -	BTRFS_FS_LOG1_ERR = 9,
1: -	BTRFS_FS_LOG2_ERR = 10,
1: -	BTRFS_FS_QUOTA_OVERRIDE = 11,
1: -	BTRFS_FS_FROZEN = 12,
1: -	BTRFS_FS_BALANCE_RUNNING = 13,
1: -	BTRFS_FS_CLEANER_RUNNING = 14,
1: -	BTRFS_FS_CSUM_IMPL_FAST = 15,
1: -	BTRFS_FS_DISCARD_RUNNING = 16,
1: +  BTRFS_CACHE_NO = 0,
1: +  BTRFS_CACHE_STARTED = 1,
1: +  BTRFS_CACHE_FAST = 2,
1: +  BTRFS_CACHE_FINISHED = 3,
1: +  BTRFS_CACHE_ERROR = 4,
1: +};
1: +
1: +enum {
1: +  BTRFS_FS_BARRIER = 0,
1: +  BTRFS_FS_CLOSING_START = 1,
1: +  BTRFS_FS_CLOSING_DONE = 2,
1: +  BTRFS_FS_LOG_RECOVERING = 3,
1: +  BTRFS_FS_OPEN = 4,
1: +  BTRFS_FS_QUOTA_ENABLED = 5,
1: +  BTRFS_FS_UPDATE_UUID_TREE_GEN = 6,
1: +  BTRFS_FS_CREATING_FREE_SPACE_TREE = 7,
1: +  BTRFS_FS_BTREE_ERR = 8,
1: +  BTRFS_FS_LOG1_ERR = 9,
1: +  BTRFS_FS_LOG2_ERR = 10,
1: +  BTRFS_FS_QUOTA_OVERRIDE = 11,
1: +  BTRFS_FS_FROZEN = 12,
1: +  BTRFS_FS_BALANCE_RUNNING = 13,
1: +  BTRFS_FS_CLEANER_RUNNING = 14,
1: +  BTRFS_FS_CSUM_IMPL_FAST = 15,
1: +  BTRFS_FS_DISCARD_RUNNING = 16,
1:  };
1:  
1:  struct btrfs_qgroup_swapped_blocks {
1: -	spinlock_t lock;
1: -	bool swapped;
1: -	struct rb_root blocks[8];
1: +  spinlock_t lock;
1: +  bool swapped;
1: +  struct rb_root blocks[8];
1:  };
1:  
1:  struct btrfs_root {
1: -	struct extent_buffer *node;
1: -	struct extent_buffer *commit_root;
1: -	struct btrfs_root *log_root;
1: -	struct btrfs_root *reloc_root;
1: -	long unsigned int state;
1: -	struct btrfs_root_item root_item;
1: -	struct btrfs_key root_key;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct extent_io_tree dirty_log_pages;
1: -	struct mutex objectid_mutex;
1: -	spinlock_t accounting_lock;
1: -	struct btrfs_block_rsv *block_rsv;
1: -	struct btrfs_free_space_ctl *free_ino_ctl;
1: -	enum btrfs_caching_type ino_cache_state;
1: -	int: 32;
1: -	spinlock_t ino_cache_lock;
1: -	wait_queue_head_t ino_cache_wait;
1: -	struct btrfs_free_space_ctl *free_ino_pinned;
1: -	u64 ino_cache_progress;
1: -	struct inode *ino_cache_inode;
1: -	struct mutex log_mutex;
1: -	wait_queue_head_t log_writer_wait;
1: -	wait_queue_head_t log_commit_wait[2];
1: -	struct list_head log_ctxs[2];
1: -	atomic_t log_writers;
1: -	atomic_t log_commit[2];
1: -	atomic_t log_batch;
1: -	int log_transid;
1: -	int log_transid_committed;
1: -	int last_log_commit;
1: -	pid_t log_start_pid;
1: -	u64 last_trans;
1: -	u32 type;
1: -	int: 32;
1: -	u64 highest_objectid;
1: -	struct btrfs_key defrag_progress;
1: -	struct btrfs_key defrag_max;
1: -	long: 48;
1: -	struct list_head dirty_list;
1: -	struct list_head root_list;
1: -	spinlock_t log_extents_lock[2];
1: -	struct list_head logged_list[2];
1: -	int orphan_cleanup_state;
1: -	int: 32;
1: -	spinlock_t inode_lock;
1: -	struct rb_root inode_tree;
1: -	struct xarray delayed_nodes_tree;
1: -	dev_t anon_dev;
1: -	int: 32;
1: -	spinlock_t root_item_lock;
1: -	refcount_t refs;
1: -	int: 32;
1: -	struct mutex delalloc_mutex;
1: -	spinlock_t delalloc_lock;
1: -	struct list_head delalloc_inodes;
1: -	struct list_head delalloc_root;
1: -	u64 nr_delalloc_inodes;
1: -	struct mutex ordered_extent_mutex;
1: -	spinlock_t ordered_extent_lock;
1: -	struct list_head ordered_extents;
1: -	struct list_head ordered_root;
1: -	u64 nr_ordered_extents;
1: -	struct list_head reloc_dirty_list;
1: -	int send_in_progress;
1: -	int dedupe_in_progress;
1: -	struct btrfs_drew_lock snapshot_lock;
1: -	atomic_t snapshot_force_cow;
1: -	int: 32;
1: -	spinlock_t qgroup_meta_rsv_lock;
1: -	u64 qgroup_meta_rsv_pertrans;
1: -	u64 qgroup_meta_rsv_prealloc;
1: -	wait_queue_head_t qgroup_flush_wait;
1: -	atomic_t nr_swapfiles;
1: -	int: 32;
1: -	struct btrfs_qgroup_swapped_blocks swapped_blocks;
1: -	struct extent_io_tree log_csum_range;
1: +  struct extent_buffer *node;
1: +  struct extent_buffer *commit_root;
1: +  struct btrfs_root *log_root;
1: +  struct btrfs_root *reloc_root;
1: +  long unsigned int state;
1: +  struct btrfs_root_item root_item;
1: +  struct btrfs_key root_key;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct extent_io_tree dirty_log_pages;
1: +  struct mutex objectid_mutex;
1: +  spinlock_t accounting_lock;
1: +  struct btrfs_block_rsv *block_rsv;
1: +  struct btrfs_free_space_ctl *free_ino_ctl;
1: +  enum btrfs_caching_type ino_cache_state;
1: +  int : 32;
1: +  spinlock_t ino_cache_lock;
1: +  wait_queue_head_t ino_cache_wait;
1: +  struct btrfs_free_space_ctl *free_ino_pinned;
1: +  u64 ino_cache_progress;
1: +  struct inode *ino_cache_inode;
1: +  struct mutex log_mutex;
1: +  wait_queue_head_t log_writer_wait;
1: +  wait_queue_head_t log_commit_wait[2];
1: +  struct list_head log_ctxs[2];
1: +  atomic_t log_writers;
1: +  atomic_t log_commit[2];
1: +  atomic_t log_batch;
1: +  int log_transid;
1: +  int log_transid_committed;
1: +  int last_log_commit;
1: +  pid_t log_start_pid;
1: +  u64 last_trans;
1: +  u32 type;
1: +  int : 32;
1: +  u64 highest_objectid;
1: +  struct btrfs_key defrag_progress;
1: +  struct btrfs_key defrag_max;
1: +  long : 48;
1: +  struct list_head dirty_list;
1: +  struct list_head root_list;
1: +  spinlock_t log_extents_lock[2];
1: +  struct list_head logged_list[2];
1: +  int orphan_cleanup_state;
1: +  int : 32;
1: +  spinlock_t inode_lock;
1: +  struct rb_root inode_tree;
1: +  struct xarray delayed_nodes_tree;
1: +  dev_t anon_dev;
1: +  int : 32;
1: +  spinlock_t root_item_lock;
1: +  refcount_t refs;
1: +  int : 32;
1: +  struct mutex delalloc_mutex;
1: +  spinlock_t delalloc_lock;
1: +  struct list_head delalloc_inodes;
1: +  struct list_head delalloc_root;
1: +  u64 nr_delalloc_inodes;
1: +  struct mutex ordered_extent_mutex;
1: +  spinlock_t ordered_extent_lock;
1: +  struct list_head ordered_extents;
1: +  struct list_head ordered_root;
1: +  u64 nr_ordered_extents;
1: +  struct list_head reloc_dirty_list;
1: +  int send_in_progress;
1: +  int dedupe_in_progress;
1: +  struct btrfs_drew_lock snapshot_lock;
1: +  atomic_t snapshot_force_cow;
1: +  int : 32;
1: +  spinlock_t qgroup_meta_rsv_lock;
1: +  u64 qgroup_meta_rsv_pertrans;
1: +  u64 qgroup_meta_rsv_prealloc;
1: +  wait_queue_head_t qgroup_flush_wait;
1: +  atomic_t nr_swapfiles;
1: +  int : 32;
1: +  struct btrfs_qgroup_swapped_blocks swapped_blocks;
1: +  struct extent_io_tree log_csum_range;
1:  } __attribute__((packed));
1:  
1:  enum btrfs_trans_state {
1: -	TRANS_STATE_RUNNING = 0,
1: -	TRANS_STATE_COMMIT_START = 1,
1: -	TRANS_STATE_COMMIT_DOING = 2,
1: -	TRANS_STATE_UNBLOCKED = 3,
1: -	TRANS_STATE_COMPLETED = 4,
1: -	TRANS_STATE_MAX = 5,
1: +  TRANS_STATE_RUNNING = 0,
1: +  TRANS_STATE_COMMIT_START = 1,
1: +  TRANS_STATE_COMMIT_DOING = 2,
1: +  TRANS_STATE_UNBLOCKED = 3,
1: +  TRANS_STATE_COMPLETED = 4,
1: +  TRANS_STATE_MAX = 5,
1:  };
1:  
1:  struct btrfs_delayed_ref_root {
1: -	struct rb_root_cached href_root;
1: -	struct rb_root dirty_extent_root;
1: -	spinlock_t lock;
1: -	atomic_t num_entries;
1: -	long unsigned int num_heads;
1: -	long unsigned int num_heads_ready;
1: -	u64 pending_csums;
1: -	int flushing;
1: -	u64 run_delayed_start;
1: -	u64 qgroup_to_skip;
1: +  struct rb_root_cached href_root;
1: +  struct rb_root dirty_extent_root;
1: +  spinlock_t lock;
1: +  atomic_t num_entries;
1: +  long unsigned int num_heads;
1: +  long unsigned int num_heads_ready;
1: +  u64 pending_csums;
1: +  int flushing;
1: +  u64 run_delayed_start;
1: +  u64 qgroup_to_skip;
1:  };
1:  
1:  struct btrfs_transaction {
1: -	u64 transid;
1: -	atomic_t num_extwriters;
1: -	atomic_t num_writers;
1: -	refcount_t use_count;
1: -	long unsigned int flags;
1: -	enum btrfs_trans_state state;
1: -	int aborted;
1: -	struct list_head list;
1: -	struct extent_io_tree dirty_pages;
1: -	time64_t start_time;
1: -	wait_queue_head_t writer_wait;
1: -	wait_queue_head_t commit_wait;
1: -	struct list_head pending_snapshots;
1: -	struct list_head dev_update_list;
1: -	struct list_head switch_commits;
1: -	struct list_head dirty_bgs;
1: -	struct list_head io_bgs;
1: -	struct list_head dropped_roots;
1: -	struct extent_io_tree pinned_extents;
1: -	struct mutex cache_write_mutex;
1: -	spinlock_t dirty_bgs_lock;
1: -	struct list_head deleted_bgs;
1: -	spinlock_t dropped_roots_lock;
1: -	struct btrfs_delayed_ref_root delayed_refs;
1: -	struct btrfs_fs_info *fs_info;
1: -	atomic_t pending_ordered;
1: -	wait_queue_head_t pending_wait;
1: +  u64 transid;
1: +  atomic_t num_extwriters;
1: +  atomic_t num_writers;
1: +  refcount_t use_count;
1: +  long unsigned int flags;
1: +  enum btrfs_trans_state state;
1: +  int aborted;
1: +  struct list_head list;
1: +  struct extent_io_tree dirty_pages;
1: +  time64_t start_time;
1: +  wait_queue_head_t writer_wait;
1: +  wait_queue_head_t commit_wait;
1: +  struct list_head pending_snapshots;
1: +  struct list_head dev_update_list;
1: +  struct list_head switch_commits;
1: +  struct list_head dirty_bgs;
1: +  struct list_head io_bgs;
1: +  struct list_head dropped_roots;
1: +  struct extent_io_tree pinned_extents;
1: +  struct mutex cache_write_mutex;
1: +  spinlock_t dirty_bgs_lock;
1: +  struct list_head deleted_bgs;
1: +  spinlock_t dropped_roots_lock;
1: +  struct btrfs_delayed_ref_root delayed_refs;
1: +  struct btrfs_fs_info *fs_info;
1: +  atomic_t pending_ordered;
1: +  wait_queue_head_t pending_wait;
1:  };
1:  
1:  enum btrfs_chunk_allocation_policy {
1: -	BTRFS_CHUNK_ALLOC_REGULAR = 0,
1: +  BTRFS_CHUNK_ALLOC_REGULAR = 0,
1:  };
1:  
1:  struct btrfs_fs_devices {
1: -	u8 fsid[16];
1: -	u8 metadata_uuid[16];
1: -	bool fsid_change;
1: -	struct list_head fs_list;
1: -	u64 num_devices;
1: -	u64 open_devices;
1: -	u64 rw_devices;
1: -	u64 missing_devices;
1: -	u64 total_rw_bytes;
1: -	u64 total_devices;
1: -	u64 latest_generation;
1: -	struct block_device *latest_bdev;
1: -	struct mutex device_list_mutex;
1: -	struct list_head devices;
1: -	struct list_head alloc_list;
1: -	struct list_head seed_list;
1: -	bool seeding;
1: -	int opened;
1: -	bool rotating;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct kobject fsid_kobj;
1: -	struct kobject *devices_kobj;
1: -	struct kobject *devinfo_kobj;
1: -	struct completion kobj_unregister;
1: -	enum btrfs_chunk_allocation_policy chunk_alloc_policy;
1: +  u8 fsid[16];
1: +  u8 metadata_uuid[16];
1: +  bool fsid_change;
1: +  struct list_head fs_list;
1: +  u64 num_devices;
1: +  u64 open_devices;
1: +  u64 rw_devices;
1: +  u64 missing_devices;
1: +  u64 total_rw_bytes;
1: +  u64 total_devices;
1: +  u64 latest_generation;
1: +  struct block_device *latest_bdev;
1: +  struct mutex device_list_mutex;
1: +  struct list_head devices;
1: +  struct list_head alloc_list;
1: +  struct list_head seed_list;
1: +  bool seeding;
1: +  int opened;
1: +  bool rotating;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct kobject fsid_kobj;
1: +  struct kobject *devices_kobj;
1: +  struct kobject *devinfo_kobj;
1: +  struct completion kobj_unregister;
1: +  enum btrfs_chunk_allocation_policy chunk_alloc_policy;
1:  };
1:  
1:  struct btrfs_balance_control {
1: -	struct btrfs_balance_args data;
1: -	struct btrfs_balance_args meta;
1: -	struct btrfs_balance_args sys;
1: -	u64 flags;
1: -	struct btrfs_balance_progress stat;
1: +  struct btrfs_balance_args data;
1: +  struct btrfs_balance_args meta;
1: +  struct btrfs_balance_args sys;
1: +  u64 flags;
1: +  struct btrfs_balance_progress stat;
1:  };
1:  
1:  struct btrfs_delayed_root {
1: -	spinlock_t lock;
1: -	struct list_head node_list;
1: -	struct list_head prepare_list;
1: -	atomic_t items;
1: -	atomic_t items_seq;
1: -	int nodes;
1: -	wait_queue_head_t wait;
1: +  spinlock_t lock;
1: +  struct list_head node_list;
1: +  struct list_head prepare_list;
1: +  atomic_t items;
1: +  atomic_t items_seq;
1: +  int nodes;
1: +  wait_queue_head_t wait;
1:  };
1:  
1:  struct btrfs_free_space_op;
1:  
1:  struct btrfs_free_space_ctl {
1: -	spinlock_t tree_lock;
1: -	struct rb_root free_space_offset;
1: -	u64 free_space;
1: -	int extents_thresh;
1: -	int free_extents;
1: -	int total_bitmaps;
1: -	int unit;
1: -	u64 start;
1: -	s32 discardable_extents[2];
1: -	s64 discardable_bytes[2];
1: -	const struct btrfs_free_space_op *op;
1: -	void *private;
1: -	struct mutex cache_writeout_mutex;
1: -	struct list_head trimming_ranges;
1: +  spinlock_t tree_lock;
1: +  struct rb_root free_space_offset;
1: +  u64 free_space;
1: +  int extents_thresh;
1: +  int free_extents;
1: +  int total_bitmaps;
1: +  int unit;
1: +  u64 start;
1: +  s32 discardable_extents[2];
1: +  s64 discardable_bytes[2];
1: +  const struct btrfs_free_space_op *op;
1: +  void *private;
1: +  struct mutex cache_writeout_mutex;
1: +  struct list_head trimming_ranges;
1:  };
1:  
1:  enum btrfs_reserve_flush_enum {
1: -	BTRFS_RESERVE_NO_FLUSH = 0,
1: -	BTRFS_RESERVE_FLUSH_LIMIT = 1,
1: -	BTRFS_RESERVE_FLUSH_EVICT = 2,
1: -	BTRFS_RESERVE_FLUSH_DATA = 3,
1: -	BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE = 4,
1: -	BTRFS_RESERVE_FLUSH_ALL = 5,
1: -	BTRFS_RESERVE_FLUSH_ALL_STEAL = 6,
1: +  BTRFS_RESERVE_NO_FLUSH = 0,
1: +  BTRFS_RESERVE_FLUSH_LIMIT = 1,
1: +  BTRFS_RESERVE_FLUSH_EVICT = 2,
1: +  BTRFS_RESERVE_FLUSH_DATA = 3,
1: +  BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE = 4,
1: +  BTRFS_RESERVE_FLUSH_ALL = 5,
1: +  BTRFS_RESERVE_FLUSH_ALL_STEAL = 6,
1:  };
1:  
1:  enum btrfs_flush_state {
1: -	FLUSH_DELAYED_ITEMS_NR = 1,
1: -	FLUSH_DELAYED_ITEMS = 2,
1: -	FLUSH_DELAYED_REFS_NR = 3,
1: -	FLUSH_DELAYED_REFS = 4,
1: -	FLUSH_DELALLOC = 5,
1: -	FLUSH_DELALLOC_WAIT = 6,
1: -	ALLOC_CHUNK = 7,
1: -	ALLOC_CHUNK_FORCE = 8,
1: -	RUN_DELAYED_IPUTS = 9,
1: -	COMMIT_TRANS = 10,
1: +  FLUSH_DELAYED_ITEMS_NR = 1,
1: +  FLUSH_DELAYED_ITEMS = 2,
1: +  FLUSH_DELAYED_REFS_NR = 3,
1: +  FLUSH_DELAYED_REFS = 4,
1: +  FLUSH_DELALLOC = 5,
1: +  FLUSH_DELALLOC_WAIT = 6,
1: +  ALLOC_CHUNK = 7,
1: +  ALLOC_CHUNK_FORCE = 8,
1: +  RUN_DELAYED_IPUTS = 9,
1: +  COMMIT_TRANS = 10,
1:  };
1:  
1:  struct btrfs_delayed_node {
1: -	u64 inode_id;
1: -	u64 bytes_reserved;
1: -	struct btrfs_root *root;
1: -	struct list_head n_list;
1: -	struct list_head p_list;
1: -	struct rb_root_cached ins_root;
1: -	struct rb_root_cached del_root;
1: -	struct mutex mutex;
1: -	struct btrfs_inode_item inode_item;
1: -	refcount_t refs;
1: -	u64 index_cnt;
1: -	long unsigned int flags;
1: -	int count;
1: -};
1: -
1: -enum {
1: -	BTRFS_ORDERED_IO_DONE = 0,
1: -	BTRFS_ORDERED_COMPLETE = 1,
1: -	BTRFS_ORDERED_NOCOW = 2,
1: -	BTRFS_ORDERED_COMPRESSED = 3,
1: -	BTRFS_ORDERED_PREALLOC = 4,
1: -	BTRFS_ORDERED_DIRECT = 5,
1: -	BTRFS_ORDERED_IOERR = 6,
1: -	BTRFS_ORDERED_TRUNCATED = 7,
1: -	BTRFS_ORDERED_REGULAR = 8,
1: -	BTRFS_ORDERED_LOGGED = 9,
1: -	BTRFS_ORDERED_LOGGED_CSUM = 10,
1: -	BTRFS_ORDERED_PENDING = 11,
1: +  u64 inode_id;
1: +  u64 bytes_reserved;
1: +  struct btrfs_root *root;
1: +  struct list_head n_list;
1: +  struct list_head p_list;
1: +  struct rb_root_cached ins_root;
1: +  struct rb_root_cached del_root;
1: +  struct mutex mutex;
1: +  struct btrfs_inode_item inode_item;
1: +  refcount_t refs;
1: +  u64 index_cnt;
1: +  long unsigned int flags;
1: +  int count;
1: +};
1: +
1: +enum {
1: +  BTRFS_ORDERED_IO_DONE = 0,
1: +  BTRFS_ORDERED_COMPLETE = 1,
1: +  BTRFS_ORDERED_NOCOW = 2,
1: +  BTRFS_ORDERED_COMPRESSED = 3,
1: +  BTRFS_ORDERED_PREALLOC = 4,
1: +  BTRFS_ORDERED_DIRECT = 5,
1: +  BTRFS_ORDERED_IOERR = 6,
1: +  BTRFS_ORDERED_TRUNCATED = 7,
1: +  BTRFS_ORDERED_REGULAR = 8,
1: +  BTRFS_ORDERED_LOGGED = 9,
1: +  BTRFS_ORDERED_LOGGED_CSUM = 10,
1: +  BTRFS_ORDERED_PENDING = 11,
1:  };
1:  
1:  struct btrfs_ordered_extent {
1: -	u64 file_offset;
1: -	u64 disk_bytenr;
1: -	u64 num_bytes;
1: -	u64 disk_num_bytes;
1: -	u64 bytes_left;
1: -	u64 outstanding_isize;
1: -	u64 truncated_len;
1: -	long unsigned int flags;
1: -	int compress_type;
1: -	int qgroup_rsv;
1: -	refcount_t refs;
1: -	struct inode *inode;
1: -	struct list_head list;
1: -	struct list_head log_list;
1: -	wait_queue_head_t wait;
1: -	struct rb_node rb_node;
1: -	struct list_head root_extent_list;
1: -	struct btrfs_work work;
1: -	struct completion completion;
1: -	struct btrfs_work flush_work;
1: -	struct list_head work_list;
1: +  u64 file_offset;
1: +  u64 disk_bytenr;
1: +  u64 num_bytes;
1: +  u64 disk_num_bytes;
1: +  u64 bytes_left;
1: +  u64 outstanding_isize;
1: +  u64 truncated_len;
1: +  long unsigned int flags;
1: +  int compress_type;
1: +  int qgroup_rsv;
1: +  refcount_t refs;
1: +  struct inode *inode;
1: +  struct list_head list;
1: +  struct list_head log_list;
1: +  wait_queue_head_t wait;
1: +  struct rb_node rb_node;
1: +  struct list_head root_extent_list;
1: +  struct btrfs_work work;
1: +  struct completion completion;
1: +  struct btrfs_work flush_work;
1: +  struct list_head work_list;
1:  };
1:  
1:  struct btrfs_delayed_ref_node {
1: -	struct rb_node ref_node;
1: -	struct list_head add_list;
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	u64 seq;
1: -	refcount_t refs;
1: -	int ref_mod;
1: -	unsigned int action: 8;
1: -	unsigned int type: 8;
1: -	unsigned int is_head: 1;
1: -	unsigned int in_tree: 1;
1: +  struct rb_node ref_node;
1: +  struct list_head add_list;
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  u64 seq;
1: +  refcount_t refs;
1: +  int ref_mod;
1: +  unsigned int action : 8;
1: +  unsigned int type : 8;
1: +  unsigned int is_head : 1;
1: +  unsigned int in_tree : 1;
1:  };
1:  
1:  struct btrfs_delayed_extent_op {
1: -	struct btrfs_disk_key key;
1: -	u8 level;
1: -	bool update_key;
1: -	bool update_flags;
1: -	bool is_data;
1: -	u64 flags_to_set;
1: +  struct btrfs_disk_key key;
1: +  u8 level;
1: +  bool update_key;
1: +  bool update_flags;
1: +  bool is_data;
1: +  u64 flags_to_set;
1:  };
1:  
1:  struct btrfs_delayed_ref_head {
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	refcount_t refs;
1: -	struct mutex mutex;
1: -	spinlock_t lock;
1: -	struct rb_root_cached ref_tree;
1: -	struct list_head ref_add_list;
1: -	struct rb_node href_node;
1: -	struct btrfs_delayed_extent_op *extent_op;
1: -	int total_ref_mod;
1: -	int ref_mod;
1: -	unsigned int must_insert_reserved: 1;
1: -	unsigned int is_data: 1;
1: -	unsigned int is_system: 1;
1: -	unsigned int processing: 1;
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  refcount_t refs;
1: +  struct mutex mutex;
1: +  spinlock_t lock;
1: +  struct rb_root_cached ref_tree;
1: +  struct list_head ref_add_list;
1: +  struct rb_node href_node;
1: +  struct btrfs_delayed_extent_op *extent_op;
1: +  int total_ref_mod;
1: +  int ref_mod;
1: +  unsigned int must_insert_reserved : 1;
1: +  unsigned int is_data : 1;
1: +  unsigned int is_system : 1;
1: +  unsigned int processing : 1;
1:  };
1:  
1:  struct btrfs_delayed_tree_ref {
1: -	struct btrfs_delayed_ref_node node;
1: -	u64 root;
1: -	u64 parent;
1: -	int level;
1: +  struct btrfs_delayed_ref_node node;
1: +  u64 root;
1: +  u64 parent;
1: +  int level;
1:  };
1:  
1:  struct btrfs_delayed_data_ref {
1: -	struct btrfs_delayed_ref_node node;
1: -	u64 root;
1: -	u64 parent;
1: -	u64 objectid;
1: -	u64 offset;
1: +  struct btrfs_delayed_ref_node node;
1: +  u64 root;
1: +  u64 parent;
1: +  u64 objectid;
1: +  u64 offset;
1:  };
1:  
1:  struct btrfs_trans_handle {
1: -	u64 transid;
1: -	u64 bytes_reserved;
1: -	u64 chunk_bytes_reserved;
1: -	long unsigned int delayed_ref_updates;
1: -	struct btrfs_transaction *transaction;
1: -	struct btrfs_block_rsv *block_rsv;
1: -	struct btrfs_block_rsv *orig_rsv;
1: -	refcount_t use_count;
1: -	unsigned int type;
1: -	short int aborted;
1: -	bool adding_csums;
1: -	bool allocating_chunk;
1: -	bool can_flush_pending_bgs;
1: -	bool reloc_reserved;
1: -	bool dirty;
1: -	struct btrfs_root *root;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct list_head new_bgs;
1: +  u64 transid;
1: +  u64 bytes_reserved;
1: +  u64 chunk_bytes_reserved;
1: +  long unsigned int delayed_ref_updates;
1: +  struct btrfs_transaction *transaction;
1: +  struct btrfs_block_rsv *block_rsv;
1: +  struct btrfs_block_rsv *orig_rsv;
1: +  refcount_t use_count;
1: +  unsigned int type;
1: +  short int aborted;
1: +  bool adding_csums;
1: +  bool allocating_chunk;
1: +  bool can_flush_pending_bgs;
1: +  bool reloc_reserved;
1: +  bool dirty;
1: +  struct btrfs_root *root;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct list_head new_bgs;
1:  };
1:  
1:  struct rcu_string {
1: -	struct callback_head rcu;
1: -	char str[0];
1: +  struct callback_head rcu;
1: +  char str[0];
1:  };
1:  
1:  struct btrfs_device_info {
1: -	struct btrfs_device *dev;
1: -	u64 dev_offset;
1: -	u64 max_avail;
1: -	u64 total_avail;
1: +  struct btrfs_device *dev;
1: +  u64 dev_offset;
1: +  u64 max_avail;
1: +  u64 total_avail;
1:  };
1:  
1:  struct btrfs_raid_attr {
1: -	u8 sub_stripes;
1: -	u8 dev_stripes;
1: -	u8 devs_max;
1: -	u8 devs_min;
1: -	u8 tolerated_failures;
1: -	u8 devs_increment;
1: -	u8 ncopies;
1: -	u8 nparity;
1: -	u8 mindev_error;
1: -	const char raid_name[8];
1: -	u64 bg_flag;
1: +  u8 sub_stripes;
1: +  u8 dev_stripes;
1: +  u8 devs_max;
1: +  u8 devs_min;
1: +  u8 tolerated_failures;
1: +  u8 devs_increment;
1: +  u8 ncopies;
1: +  u8 nparity;
1: +  u8 mindev_error;
1: +  const char raid_name[8];
1: +  u64 bg_flag;
1:  };
1:  
1:  enum btrfs_compression_type {
1: -	BTRFS_COMPRESS_NONE = 0,
1: -	BTRFS_COMPRESS_ZLIB = 1,
1: -	BTRFS_COMPRESS_LZO = 2,
1: -	BTRFS_COMPRESS_ZSTD = 3,
1: -	BTRFS_NR_COMPRESS_TYPES = 4,
1: +  BTRFS_COMPRESS_NONE = 0,
1: +  BTRFS_COMPRESS_ZLIB = 1,
1: +  BTRFS_COMPRESS_LZO = 2,
1: +  BTRFS_COMPRESS_ZSTD = 3,
1: +  BTRFS_NR_COMPRESS_TYPES = 4,
1:  };
1:  
1:  enum btrfs_trim_state {
1: -	BTRFS_TRIM_STATE_UNTRIMMED = 0,
1: -	BTRFS_TRIM_STATE_TRIMMED = 1,
1: -	BTRFS_TRIM_STATE_TRIMMING = 2,
1: +  BTRFS_TRIM_STATE_UNTRIMMED = 0,
1: +  BTRFS_TRIM_STATE_TRIMMED = 1,
1: +  BTRFS_TRIM_STATE_TRIMMING = 2,
1:  };
1:  
1:  struct btrfs_free_space {
1: -	struct rb_node offset_index;
1: -	u64 offset;
1: -	u64 bytes;
1: -	u64 max_extent_size;
1: -	long unsigned int *bitmap;
1: -	struct list_head list;
1: -	enum btrfs_trim_state trim_state;
1: -	s32 bitmap_extents;
1: +  struct rb_node offset_index;
1: +  u64 offset;
1: +  u64 bytes;
1: +  u64 max_extent_size;
1: +  long unsigned int *bitmap;
1: +  struct list_head list;
1: +  enum btrfs_trim_state trim_state;
1: +  s32 bitmap_extents;
1:  };
1:  
1:  struct btrfs_free_space_op {
1: -	void (*recalc_thresholds)(struct btrfs_free_space_ctl *);
1: -	bool (*use_bitmap)(struct btrfs_free_space_ctl *, struct btrfs_free_space *);
1: +  void (*recalc_thresholds)(struct btrfs_free_space_ctl *);
1: +  bool (*use_bitmap)(struct btrfs_free_space_ctl *, struct btrfs_free_space *);
1:  };
1:  
1:  struct extent_inode_elem;
1:  
1:  struct prelim_ref {
1: -	struct rb_node rbnode;
1: -	u64 root_id;
1: -	struct btrfs_key key_for_search;
1: -	int level;
1: -	int count;
1: -	struct extent_inode_elem *inode_list;
1: -	u64 parent;
1: -	u64 wanted_disk_byte;
1: +  struct rb_node rbnode;
1: +  u64 root_id;
1: +  struct btrfs_key key_for_search;
1: +  int level;
1: +  int count;
1: +  struct extent_inode_elem *inode_list;
1: +  u64 parent;
1: +  u64 wanted_disk_byte;
1:  };
1:  
1:  struct btrfs_caching_control {
1: -	struct list_head list;
1: -	struct mutex mutex;
1: -	wait_queue_head_t wait;
1: -	struct btrfs_work work;
1: -	struct btrfs_block_group *block_group;
1: -	u64 progress;
1: -	refcount_t count;
1: +  struct list_head list;
1: +  struct mutex mutex;
1: +  wait_queue_head_t wait;
1: +  struct btrfs_work work;
1: +  struct btrfs_block_group *block_group;
1: +  u64 progress;
1: +  refcount_t count;
1:  };
1:  
1:  struct btrfs_qgroup_extent_record {
1: -	struct rb_node node;
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	u32 data_rsv;
1: -	u64 data_rsv_refroot;
1: -	struct ulist *old_roots;
1: +  struct rb_node node;
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  u32 data_rsv;
1: +  u64 data_rsv_refroot;
1: +  struct ulist *old_roots;
1:  };
1:  
1:  enum btrfs_qgroup_rsv_type {
1: -	BTRFS_QGROUP_RSV_DATA = 0,
1: -	BTRFS_QGROUP_RSV_META_PERTRANS = 1,
1: -	BTRFS_QGROUP_RSV_META_PREALLOC = 2,
1: -	BTRFS_QGROUP_RSV_LAST = 3,
1: +  BTRFS_QGROUP_RSV_DATA = 0,
1: +  BTRFS_QGROUP_RSV_META_PERTRANS = 1,
1: +  BTRFS_QGROUP_RSV_META_PREALLOC = 2,
1: +  BTRFS_QGROUP_RSV_LAST = 3,
1:  };
1:  
1:  struct btrfs_qgroup_rsv {
1: -	u64 values[3];
1: +  u64 values[3];
1:  };
1:  
1:  struct btrfs_qgroup {
1: -	u64 qgroupid;
1: -	u64 rfer;
1: -	u64 rfer_cmpr;
1: -	u64 excl;
1: -	u64 excl_cmpr;
1: -	u64 lim_flags;
1: -	u64 max_rfer;
1: -	u64 max_excl;
1: -	u64 rsv_rfer;
1: -	u64 rsv_excl;
1: -	struct btrfs_qgroup_rsv rsv;
1: -	struct list_head groups;
1: -	struct list_head members;
1: -	struct list_head dirty;
1: -	struct rb_node node;
1: -	u64 old_refcnt;
1: -	u64 new_refcnt;
1: -	struct kobject kobj;
1: +  u64 qgroupid;
1: +  u64 rfer;
1: +  u64 rfer_cmpr;
1: +  u64 excl;
1: +  u64 excl_cmpr;
1: +  u64 lim_flags;
1: +  u64 max_rfer;
1: +  u64 max_excl;
1: +  u64 rsv_rfer;
1: +  u64 rsv_excl;
1: +  struct btrfs_qgroup_rsv rsv;
1: +  struct list_head groups;
1: +  struct list_head members;
1: +  struct list_head dirty;
1: +  struct rb_node node;
1: +  u64 old_refcnt;
1: +  u64 new_refcnt;
1: +  struct kobject kobj;
1:  };
1:  
1:  struct trace_event_raw_btrfs_transaction_commit {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 generation;
1: -	u64 root_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 generation;
1: +  u64 root_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__inode {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 ino;
1: -	u64 blocks;
1: -	u64 disk_i_size;
1: -	u64 generation;
1: -	u64 last_trans;
1: -	u64 logged_trans;
1: -	u64 root_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 ino;
1: +  u64 blocks;
1: +  u64 disk_i_size;
1: +  u64 generation;
1: +  u64 last_trans;
1: +  u64 logged_trans;
1: +  u64 root_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_get_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_objectid;
1: -	u64 ino;
1: -	u64 start;
1: -	u64 len;
1: -	u64 orig_start;
1: -	u64 block_start;
1: -	u64 block_len;
1: -	long unsigned int flags;
1: -	int refs;
1: -	unsigned int compress_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_objectid;
1: +  u64 ino;
1: +  u64 start;
1: +  u64 len;
1: +  u64 orig_start;
1: +  u64 block_start;
1: +  u64 block_len;
1: +  long unsigned int flags;
1: +  int refs;
1: +  unsigned int compress_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_handle_em_exist {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 e_start;
1: -	u64 e_len;
1: -	u64 map_start;
1: -	u64 map_len;
1: -	u64 start;
1: -	u64 len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 e_start;
1: +  u64 e_len;
1: +  u64 map_start;
1: +  u64 map_len;
1: +  u64 start;
1: +  u64 len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__file_extent_item_regular {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_obj;
1: -	u64 ino;
1: -	loff_t isize;
1: -	u64 disk_isize;
1: -	u64 num_bytes;
1: -	u64 ram_bytes;
1: -	u64 disk_bytenr;
1: -	u64 disk_num_bytes;
1: -	u64 extent_offset;
1: -	u8 extent_type;
1: -	u8 compression;
1: -	u64 extent_start;
1: -	u64 extent_end;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_obj;
1: +  u64 ino;
1: +  loff_t isize;
1: +  u64 disk_isize;
1: +  u64 num_bytes;
1: +  u64 ram_bytes;
1: +  u64 disk_bytenr;
1: +  u64 disk_num_bytes;
1: +  u64 extent_offset;
1: +  u8 extent_type;
1: +  u8 compression;
1: +  u64 extent_start;
1: +  u64 extent_end;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__file_extent_item_inline {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_obj;
1: -	u64 ino;
1: -	loff_t isize;
1: -	u64 disk_isize;
1: -	u8 extent_type;
1: -	u8 compression;
1: -	u64 extent_start;
1: -	u64 extent_end;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_obj;
1: +  u64 ino;
1: +  loff_t isize;
1: +  u64 disk_isize;
1: +  u8 extent_type;
1: +  u8 compression;
1: +  u64 extent_start;
1: +  u64 extent_end;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__ordered_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 ino;
1: -	u64 file_offset;
1: -	u64 start;
1: -	u64 len;
1: -	u64 disk_len;
1: -	u64 bytes_left;
1: -	long unsigned int flags;
1: -	int compress_type;
1: -	int refs;
1: -	u64 root_objectid;
1: -	u64 truncated_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 ino;
1: +  u64 file_offset;
1: +  u64 start;
1: +  u64 len;
1: +  u64 disk_len;
1: +  u64 bytes_left;
1: +  long unsigned int flags;
1: +  int compress_type;
1: +  int refs;
1: +  u64 root_objectid;
1: +  u64 truncated_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__writepage {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 ino;
1: -	long unsigned int index;
1: -	long int nr_to_write;
1: -	long int pages_skipped;
1: -	loff_t range_start;
1: -	loff_t range_end;
1: -	char for_kupdate;
1: -	char for_reclaim;
1: -	char range_cyclic;
1: -	long unsigned int writeback_index;
1: -	u64 root_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 ino;
1: +  long unsigned int index;
1: +  long int nr_to_write;
1: +  long int pages_skipped;
1: +  loff_t range_start;
1: +  loff_t range_end;
1: +  char for_kupdate;
1: +  char for_reclaim;
1: +  char range_cyclic;
1: +  long unsigned int writeback_index;
1: +  u64 root_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_writepage_end_io_hook {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 ino;
1: -	long unsigned int index;
1: -	u64 start;
1: -	u64 end;
1: -	int uptodate;
1: -	u64 root_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 ino;
1: +  long unsigned int index;
1: +  u64 start;
1: +  u64 end;
1: +  int uptodate;
1: +  u64 root_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_sync_file {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 ino;
1: -	u64 parent;
1: -	int datasync;
1: -	u64 root_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 ino;
1: +  u64 parent;
1: +  int datasync;
1: +  u64 root_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_sync_fs {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	int wait;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  int wait;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_add_block_group {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 offset;
1: -	u64 size;
1: -	u64 flags;
1: -	u64 bytes_used;
1: -	u64 bytes_super;
1: -	int create;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 offset;
1: +  u64 size;
1: +  u64 flags;
1: +  u64 bytes_used;
1: +  u64 bytes_super;
1: +  int create;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_delayed_tree_ref {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	int action;
1: -	u64 parent;
1: -	u64 ref_root;
1: -	int level;
1: -	int type;
1: -	u64 seq;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  int action;
1: +  u64 parent;
1: +  u64 ref_root;
1: +  int level;
1: +  int type;
1: +  u64 seq;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_delayed_data_ref {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	int action;
1: -	u64 parent;
1: -	u64 ref_root;
1: -	u64 owner;
1: -	u64 offset;
1: -	int type;
1: -	u64 seq;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  int action;
1: +  u64 parent;
1: +  u64 ref_root;
1: +  u64 owner;
1: +  u64 offset;
1: +  int type;
1: +  u64 seq;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_delayed_ref_head {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	int action;
1: -	int is_data;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  int action;
1: +  int is_data;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__chunk {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	int num_stripes;
1: -	u64 type;
1: -	int sub_stripes;
1: -	u64 offset;
1: -	u64 size;
1: -	u64 root_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  int num_stripes;
1: +  u64 type;
1: +  int sub_stripes;
1: +  u64 offset;
1: +  u64 size;
1: +  u64 root_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_cow_block {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_objectid;
1: -	u64 buf_start;
1: -	int refs;
1: -	u64 cow_start;
1: -	int buf_level;
1: -	int cow_level;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_objectid;
1: +  u64 buf_start;
1: +  int refs;
1: +  u64 cow_start;
1: +  int buf_level;
1: +  int cow_level;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_space_reservation {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u32 __data_loc_type;
1: -	u64 val;
1: -	u64 bytes;
1: -	int reserve;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u32 __data_loc_type;
1: +  u64 val;
1: +  u64 bytes;
1: +  int reserve;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_trigger_flush {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 flags;
1: -	u64 bytes;
1: -	int flush;
1: -	u32 __data_loc_reason;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 flags;
1: +  u64 bytes;
1: +  int flush;
1: +  u32 __data_loc_reason;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_flush_space {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 flags;
1: -	u64 num_bytes;
1: -	int state;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 flags;
1: +  u64 num_bytes;
1: +  int state;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__reserved_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 start;
1: -	u64 len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 start;
1: +  u64 len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_find_free_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_objectid;
1: -	u64 num_bytes;
1: -	u64 empty_size;
1: -	u64 data;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_objectid;
1: +  u64 num_bytes;
1: +  u64 empty_size;
1: +  u64 data;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__reserve_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bg_objectid;
1: -	u64 flags;
1: -	u64 start;
1: -	u64 len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bg_objectid;
1: +  u64 flags;
1: +  u64 start;
1: +  u64 len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_find_cluster {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bg_objectid;
1: -	u64 flags;
1: -	u64 start;
1: -	u64 bytes;
1: -	u64 empty_size;
1: -	u64 min_bytes;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bg_objectid;
1: +  u64 flags;
1: +  u64 start;
1: +  u64 bytes;
1: +  u64 empty_size;
1: +  u64 min_bytes;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_failed_cluster_setup {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bg_objectid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bg_objectid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_setup_cluster {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bg_objectid;
1: -	u64 flags;
1: -	u64 start;
1: -	u64 max_size;
1: -	u64 size;
1: -	int bitmap;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bg_objectid;
1: +  u64 flags;
1: +  u64 start;
1: +  u64 max_size;
1: +  u64 size;
1: +  int bitmap;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_alloc_extent_state {
1: -	struct trace_entry ent;
1: -	const struct extent_state *state;
1: -	gfp_t mask;
1: -	const void *ip;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const struct extent_state *state;
1: +  gfp_t mask;
1: +  const void *ip;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_free_extent_state {
1: -	struct trace_entry ent;
1: -	const struct extent_state *state;
1: -	const void *ip;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const struct extent_state *state;
1: +  const void *ip;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__work {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	const void *work;
1: -	const void *wq;
1: -	const void *func;
1: -	const void *ordered_func;
1: -	const void *ordered_free;
1: -	const void *normal_work;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  const void *work;
1: +  const void *wq;
1: +  const void *func;
1: +  const void *ordered_func;
1: +  const void *ordered_free;
1: +  const void *normal_work;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__work__done {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	const void *wtag;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  const void *wtag;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__workqueue {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	const void *wq;
1: -	u32 __data_loc_name;
1: -	int high;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  const void *wq;
1: +  u32 __data_loc_name;
1: +  int high;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__workqueue_done {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	const void *wq;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  const void *wq;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__qgroup_rsv_data {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 rootid;
1: -	u64 ino;
1: -	u64 start;
1: -	u64 len;
1: -	u64 reserved;
1: -	int op;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 rootid;
1: +  u64 ino;
1: +  u64 start;
1: +  u64 len;
1: +  u64 reserved;
1: +  int op;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_qgroup_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qgroup_num_dirty_extents {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 transid;
1: -	u64 num_dirty_extents;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 transid;
1: +  u64 num_dirty_extents;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_qgroup_account_extent {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 transid;
1: -	u64 bytenr;
1: -	u64 num_bytes;
1: -	u64 nr_old_roots;
1: -	u64 nr_new_roots;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 transid;
1: +  u64 bytenr;
1: +  u64 num_bytes;
1: +  u64 nr_old_roots;
1: +  u64 nr_new_roots;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qgroup_update_counters {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 qgid;
1: -	u64 old_rfer;
1: -	u64 old_excl;
1: -	u64 cur_old_count;
1: -	u64 cur_new_count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 qgid;
1: +  u64 old_rfer;
1: +  u64 old_excl;
1: +  u64 cur_old_count;
1: +  u64 cur_new_count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qgroup_update_reserve {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 qgid;
1: -	u64 cur_reserved;
1: -	s64 diff;
1: -	int type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 qgid;
1: +  u64 cur_reserved;
1: +  s64 diff;
1: +  int type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qgroup_meta_reserve {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 refroot;
1: -	s64 diff;
1: -	int type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 refroot;
1: +  s64 diff;
1: +  int type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qgroup_meta_convert {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 refroot;
1: -	s64 diff;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 refroot;
1: +  s64 diff;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qgroup_meta_free_all_pertrans {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 refroot;
1: -	s64 diff;
1: -	int type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 refroot;
1: +  s64 diff;
1: +  int type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__prelim_ref {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_id;
1: -	u64 objectid;
1: -	u8 type;
1: -	u64 offset;
1: -	int level;
1: -	int old_count;
1: -	u64 parent;
1: -	u64 bytenr;
1: -	int mod_count;
1: -	u64 tree_size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_id;
1: +  u64 objectid;
1: +  u8 type;
1: +  u64 offset;
1: +  int level;
1: +  int old_count;
1: +  u64 parent;
1: +  u64 bytenr;
1: +  int mod_count;
1: +  u64 tree_size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_inode_mod_outstanding_extents {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 root_objectid;
1: -	u64 ino;
1: -	int mod;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 root_objectid;
1: +  u64 ino;
1: +  int mod;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__block_group {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 bytenr;
1: -	u64 len;
1: -	u64 used;
1: -	u64 flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 bytenr;
1: +  u64 len;
1: +  u64 used;
1: +  u64 flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_set_extent_bit {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	unsigned int owner;
1: -	u64 ino;
1: -	u64 rootid;
1: -	u64 start;
1: -	u64 len;
1: -	unsigned int set_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  unsigned int owner;
1: +  u64 ino;
1: +  u64 rootid;
1: +  u64 start;
1: +  u64 len;
1: +  unsigned int set_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_clear_extent_bit {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	unsigned int owner;
1: -	u64 ino;
1: -	u64 rootid;
1: -	u64 start;
1: -	u64 len;
1: -	unsigned int clear_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  unsigned int owner;
1: +  u64 ino;
1: +  u64 rootid;
1: +  u64 start;
1: +  u64 len;
1: +  unsigned int clear_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_convert_extent_bit {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	unsigned int owner;
1: -	u64 ino;
1: -	u64 rootid;
1: -	u64 start;
1: -	u64 len;
1: -	unsigned int set_bits;
1: -	unsigned int clear_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  unsigned int owner;
1: +  u64 ino;
1: +  u64 rootid;
1: +  u64 start;
1: +  u64 len;
1: +  unsigned int set_bits;
1: +  unsigned int clear_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_sleep_tree_lock {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 block;
1: -	u64 generation;
1: -	u64 start_ns;
1: -	u64 end_ns;
1: -	u64 diff_ns;
1: -	u64 owner;
1: -	int is_log_tree;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 block;
1: +  u64 generation;
1: +  u64 start_ns;
1: +  u64 end_ns;
1: +  u64 diff_ns;
1: +  u64 owner;
1: +  int is_log_tree;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs_locking_events {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 block;
1: -	u64 generation;
1: -	u64 owner;
1: -	int is_log_tree;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 block;
1: +  u64 generation;
1: +  u64 owner;
1: +  int is_log_tree;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_btrfs__space_info_update {
1: -	struct trace_entry ent;
1: -	u8 fsid[16];
1: -	u64 type;
1: -	u64 old;
1: -	s64 diff;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 fsid[16];
1: +  u64 type;
1: +  u64 old;
1: +  s64 diff;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_btrfs_transaction_commit {};
1: @@ -54510,11 +55275,11 @@ struct trace_event_data_offsets_btrfs__chunk {};
1:  struct trace_event_data_offsets_btrfs_cow_block {};
1:  
1:  struct trace_event_data_offsets_btrfs_space_reservation {
1: -	u32 type;
1: +  u32 type;
1:  };
1:  
1:  struct trace_event_data_offsets_btrfs_trigger_flush {
1: -	u32 reason;
1: +  u32 reason;
1:  };
1:  
1:  struct trace_event_data_offsets_btrfs_flush_space {};
1: @@ -54540,7 +55305,7 @@ struct trace_event_data_offsets_btrfs__work {};
1:  struct trace_event_data_offsets_btrfs__work__done {};
1:  
1:  struct trace_event_data_offsets_btrfs__workqueue {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_btrfs__workqueue_done {};
1: @@ -54581,7 +55346,8 @@ struct trace_event_data_offsets_btrfs_locking_events {};
1:  
1:  struct trace_event_data_offsets_btrfs__space_info_update {};
1:  
1: -typedef void (*btf_trace_btrfs_transaction_commit)(void *, const struct btrfs_root *);
1: +typedef void (*btf_trace_btrfs_transaction_commit)(void *,
1: +                                                   const struct btrfs_root *);
1:  
1:  typedef void (*btf_trace_btrfs_inode_new)(void *, const struct inode *);
1:  
1: @@ -54589,1392 +55355,1516 @@ typedef void (*btf_trace_btrfs_inode_request)(void *, const struct inode *);
1:  
1:  typedef void (*btf_trace_btrfs_inode_evict)(void *, const struct inode *);
1:  
1: -typedef void (*btf_trace_btrfs_get_extent)(void *, const struct btrfs_root *, const struct btrfs_inode *, const struct extent_map *);
1: +typedef void (*btf_trace_btrfs_get_extent)(void *, const struct btrfs_root *,
1: +                                           const struct btrfs_inode *,
1: +                                           const struct extent_map *);
1:  
1: -typedef void (*btf_trace_btrfs_handle_em_exist)(void *, const struct btrfs_fs_info *, const struct extent_map *, const struct extent_map *, u64, u64);
1: +typedef void (*btf_trace_btrfs_handle_em_exist)(void *,
1: +                                                const struct btrfs_fs_info *,
1: +                                                const struct extent_map *,
1: +                                                const struct extent_map *, u64,
1: +                                                u64);
1:  
1: -typedef void (*btf_trace_btrfs_get_extent_show_fi_regular)(void *, const struct btrfs_inode *, const struct extent_buffer *, const struct btrfs_file_extent_item *, u64);
1: +typedef void (*btf_trace_btrfs_get_extent_show_fi_regular)(
1: +    void *, const struct btrfs_inode *, const struct extent_buffer *,
1: +    const struct btrfs_file_extent_item *, u64);
1:  
1: -typedef void (*btf_trace_btrfs_truncate_show_fi_regular)(void *, const struct btrfs_inode *, const struct extent_buffer *, const struct btrfs_file_extent_item *, u64);
1: +typedef void (*btf_trace_btrfs_truncate_show_fi_regular)(
1: +    void *, const struct btrfs_inode *, const struct extent_buffer *,
1: +    const struct btrfs_file_extent_item *, u64);
1:  
1: -typedef void (*btf_trace_btrfs_get_extent_show_fi_inline)(void *, const struct btrfs_inode *, const struct extent_buffer *, const struct btrfs_file_extent_item *, int, u64);
1: +typedef void (*btf_trace_btrfs_get_extent_show_fi_inline)(
1: +    void *, const struct btrfs_inode *, const struct extent_buffer *,
1: +    const struct btrfs_file_extent_item *, int, u64);
1:  
1: -typedef void (*btf_trace_btrfs_truncate_show_fi_inline)(void *, const struct btrfs_inode *, const struct extent_buffer *, const struct btrfs_file_extent_item *, int, u64);
1: +typedef void (*btf_trace_btrfs_truncate_show_fi_inline)(
1: +    void *, const struct btrfs_inode *, const struct extent_buffer *,
1: +    const struct btrfs_file_extent_item *, int, u64);
1:  
1: -typedef void (*btf_trace_btrfs_ordered_extent_add)(void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1: +typedef void (*btf_trace_btrfs_ordered_extent_add)(
1: +    void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1:  
1: -typedef void (*btf_trace_btrfs_ordered_extent_remove)(void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1: +typedef void (*btf_trace_btrfs_ordered_extent_remove)(
1: +    void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1:  
1: -typedef void (*btf_trace_btrfs_ordered_extent_start)(void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1: +typedef void (*btf_trace_btrfs_ordered_extent_start)(
1: +    void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1:  
1: -typedef void (*btf_trace_btrfs_ordered_extent_put)(void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1: +typedef void (*btf_trace_btrfs_ordered_extent_put)(
1: +    void *, const struct btrfs_inode *, const struct btrfs_ordered_extent *);
1:  
1: -typedef void (*btf_trace___extent_writepage)(void *, const struct page *, const struct inode *, const struct writeback_control *);
1: +typedef void (*btf_trace___extent_writepage)(void *, const struct page *,
1: +                                             const struct inode *,
1: +                                             const struct writeback_control *);
1:  
1: -typedef void (*btf_trace_btrfs_writepage_end_io_hook)(void *, const struct page *, u64, u64, int);
1: +typedef void (*btf_trace_btrfs_writepage_end_io_hook)(void *,
1: +                                                      const struct page *, u64,
1: +                                                      u64, int);
1:  
1:  typedef void (*btf_trace_btrfs_sync_file)(void *, const struct file *, int);
1:  
1: -typedef void (*btf_trace_btrfs_sync_fs)(void *, const struct btrfs_fs_info *, int);
1: +typedef void (*btf_trace_btrfs_sync_fs)(void *, const struct btrfs_fs_info *,
1: +                                        int);
1:  
1: -typedef void (*btf_trace_btrfs_add_block_group)(void *, const struct btrfs_fs_info *, const struct btrfs_block_group *, int);
1: +typedef void (*btf_trace_btrfs_add_block_group)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_block_group *,
1: +    int);
1:  
1: -typedef void (*btf_trace_add_delayed_tree_ref)(void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *, const struct btrfs_delayed_tree_ref *, int);
1: +typedef void (*btf_trace_add_delayed_tree_ref)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *,
1: +    const struct btrfs_delayed_tree_ref *, int);
1:  
1: -typedef void (*btf_trace_run_delayed_tree_ref)(void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *, const struct btrfs_delayed_tree_ref *, int);
1: +typedef void (*btf_trace_run_delayed_tree_ref)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *,
1: +    const struct btrfs_delayed_tree_ref *, int);
1:  
1: -typedef void (*btf_trace_add_delayed_data_ref)(void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *, const struct btrfs_delayed_data_ref *, int);
1: +typedef void (*btf_trace_add_delayed_data_ref)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *,
1: +    const struct btrfs_delayed_data_ref *, int);
1:  
1: -typedef void (*btf_trace_run_delayed_data_ref)(void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *, const struct btrfs_delayed_data_ref *, int);
1: +typedef void (*btf_trace_run_delayed_data_ref)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_node *,
1: +    const struct btrfs_delayed_data_ref *, int);
1:  
1: -typedef void (*btf_trace_add_delayed_ref_head)(void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_head *, int);
1: +typedef void (*btf_trace_add_delayed_ref_head)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_head *,
1: +    int);
1:  
1: -typedef void (*btf_trace_run_delayed_ref_head)(void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_head *, int);
1: +typedef void (*btf_trace_run_delayed_ref_head)(
1: +    void *, const struct btrfs_fs_info *, const struct btrfs_delayed_ref_head *,
1: +    int);
1:  
1: -typedef void (*btf_trace_btrfs_chunk_alloc)(void *, const struct btrfs_fs_info *, const struct map_lookup *, u64, u64);
1: +typedef void (*btf_trace_btrfs_chunk_alloc)(void *,
1: +                                            const struct btrfs_fs_info *,
1: +                                            const struct map_lookup *, u64,
1: +                                            u64);
1:  
1: -typedef void (*btf_trace_btrfs_chunk_free)(void *, const struct btrfs_fs_info *, const struct map_lookup *, u64, u64);
1: +typedef void (*btf_trace_btrfs_chunk_free)(void *, const struct btrfs_fs_info *,
1: +                                           const struct map_lookup *, u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_cow_block)(void *, const struct btrfs_root *, const struct extent_buffer *, const struct extent_buffer *);
1: +typedef void (*btf_trace_btrfs_cow_block)(void *, const struct btrfs_root *,
1: +                                          const struct extent_buffer *,
1: +                                          const struct extent_buffer *);
1:  
1: -typedef void (*btf_trace_btrfs_space_reservation)(void *, const struct btrfs_fs_info *, const char *, u64, u64, int);
1: +typedef void (*btf_trace_btrfs_space_reservation)(void *,
1: +                                                  const struct btrfs_fs_info *,
1: +                                                  const char *, u64, u64, int);
1:  
1: -typedef void (*btf_trace_btrfs_trigger_flush)(void *, const struct btrfs_fs_info *, u64, u64, int, const char *);
1: +typedef void (*btf_trace_btrfs_trigger_flush)(void *,
1: +                                              const struct btrfs_fs_info *, u64,
1: +                                              u64, int, const char *);
1:  
1: -typedef void (*btf_trace_btrfs_flush_space)(void *, const struct btrfs_fs_info *, u64, u64, int, int);
1: +typedef void (*btf_trace_btrfs_flush_space)(void *,
1: +                                            const struct btrfs_fs_info *, u64,
1: +                                            u64, int, int);
1:  
1: -typedef void (*btf_trace_btrfs_reserved_extent_alloc)(void *, const struct btrfs_fs_info *, u64, u64);
1: +typedef void (*btf_trace_btrfs_reserved_extent_alloc)(
1: +    void *, const struct btrfs_fs_info *, u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_reserved_extent_free)(void *, const struct btrfs_fs_info *, u64, u64);
1: +typedef void (*btf_trace_btrfs_reserved_extent_free)(
1: +    void *, const struct btrfs_fs_info *, u64, u64);
1:  
1: -typedef void (*btf_trace_find_free_extent)(void *, const struct btrfs_root *, u64, u64, u64);
1: +typedef void (*btf_trace_find_free_extent)(void *, const struct btrfs_root *,
1: +                                           u64, u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_reserve_extent)(void *, const struct btrfs_block_group *, u64, u64);
1: +typedef void (*btf_trace_btrfs_reserve_extent)(void *,
1: +                                               const struct btrfs_block_group *,
1: +                                               u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_reserve_extent_cluster)(void *, const struct btrfs_block_group *, u64, u64);
1: +typedef void (*btf_trace_btrfs_reserve_extent_cluster)(
1: +    void *, const struct btrfs_block_group *, u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_find_cluster)(void *, const struct btrfs_block_group *, u64, u64, u64, u64);
1: +typedef void (*btf_trace_btrfs_find_cluster)(void *,
1: +                                             const struct btrfs_block_group *,
1: +                                             u64, u64, u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_failed_cluster_setup)(void *, const struct btrfs_block_group *);
1: +typedef void (*btf_trace_btrfs_failed_cluster_setup)(
1: +    void *, const struct btrfs_block_group *);
1:  
1: -typedef void (*btf_trace_btrfs_setup_cluster)(void *, const struct btrfs_block_group *, const struct btrfs_free_cluster *, u64, int);
1: +typedef void (*btf_trace_btrfs_setup_cluster)(void *,
1: +                                              const struct btrfs_block_group *,
1: +                                              const struct btrfs_free_cluster *,
1: +                                              u64, int);
1:  
1: -typedef void (*btf_trace_alloc_extent_state)(void *, const struct extent_state *, gfp_t, long unsigned int);
1: +typedef void (*btf_trace_alloc_extent_state)(void *,
1: +                                             const struct extent_state *, gfp_t,
1: +                                             long unsigned int);
1:  
1: -typedef void (*btf_trace_free_extent_state)(void *, const struct extent_state *, long unsigned int);
1: +typedef void (*btf_trace_free_extent_state)(void *, const struct extent_state *,
1: +                                            long unsigned int);
1:  
1:  typedef void (*btf_trace_btrfs_work_queued)(void *, const struct btrfs_work *);
1:  
1:  typedef void (*btf_trace_btrfs_work_sched)(void *, const struct btrfs_work *);
1:  
1: -typedef void (*btf_trace_btrfs_all_work_done)(void *, const struct btrfs_fs_info *, const void *);
1: +typedef void (*btf_trace_btrfs_all_work_done)(void *,
1: +                                              const struct btrfs_fs_info *,
1: +                                              const void *);
1:  
1: -typedef void (*btf_trace_btrfs_ordered_sched)(void *, const struct btrfs_work *);
1: +typedef void (*btf_trace_btrfs_ordered_sched)(void *,
1: +                                              const struct btrfs_work *);
1:  
1: -typedef void (*btf_trace_btrfs_workqueue_alloc)(void *, const struct __btrfs_workqueue *, const char *, int);
1: +typedef void (*btf_trace_btrfs_workqueue_alloc)(
1: +    void *, const struct __btrfs_workqueue *, const char *, int);
1:  
1: -typedef void (*btf_trace_btrfs_workqueue_destroy)(void *, const struct __btrfs_workqueue *);
1: +typedef void (*btf_trace_btrfs_workqueue_destroy)(
1: +    void *, const struct __btrfs_workqueue *);
1:  
1: -typedef void (*btf_trace_btrfs_qgroup_reserve_data)(void *, const struct inode *, u64, u64, u64, int);
1: +typedef void (*btf_trace_btrfs_qgroup_reserve_data)(void *,
1: +                                                    const struct inode *, u64,
1: +                                                    u64, u64, int);
1:  
1: -typedef void (*btf_trace_btrfs_qgroup_release_data)(void *, const struct inode *, u64, u64, u64, int);
1: +typedef void (*btf_trace_btrfs_qgroup_release_data)(void *,
1: +                                                    const struct inode *, u64,
1: +                                                    u64, u64, int);
1:  
1: -typedef void (*btf_trace_btrfs_qgroup_account_extents)(void *, const struct btrfs_fs_info *, const struct btrfs_qgroup_extent_record *);
1: +typedef void (*btf_trace_btrfs_qgroup_account_extents)(
1: +    void *, const struct btrfs_fs_info *,
1: +    const struct btrfs_qgroup_extent_record *);
1:  
1: -typedef void (*btf_trace_btrfs_qgroup_trace_extent)(void *, const struct btrfs_fs_info *, const struct btrfs_qgroup_extent_record *);
1: +typedef void (*btf_trace_btrfs_qgroup_trace_extent)(
1: +    void *, const struct btrfs_fs_info *,
1: +    const struct btrfs_qgroup_extent_record *);
1:  
1: -typedef void (*btf_trace_qgroup_num_dirty_extents)(void *, const struct btrfs_fs_info *, u64, u64);
1: +typedef void (*btf_trace_qgroup_num_dirty_extents)(void *,
1: +                                                   const struct btrfs_fs_info *,
1: +                                                   u64, u64);
1:  
1: -typedef void (*btf_trace_btrfs_qgroup_account_extent)(void *, const struct btrfs_fs_info *, u64, u64, u64, u64, u64);
1: +typedef void (*btf_trace_btrfs_qgroup_account_extent)(
1: +    void *, const struct btrfs_fs_info *, u64, u64, u64, u64, u64);
1:  
1: -typedef void (*btf_trace_qgroup_update_counters)(void *, const struct btrfs_fs_info *, const struct btrfs_qgroup *, u64, u64);
1: +typedef void (*btf_trace_qgroup_update_counters)(void *,
1: +                                                 const struct btrfs_fs_info *,
1: +                                                 const struct btrfs_qgroup *,
1: +                                                 u64, u64);
1:  
1: -typedef void (*btf_trace_qgroup_update_reserve)(void *, struct btrfs_fs_info *, struct btrfs_qgroup *, s64, int);
1: +typedef void (*btf_trace_qgroup_update_reserve)(void *, struct btrfs_fs_info *,
1: +                                                struct btrfs_qgroup *, s64,
1: +                                                int);
1:  
1: -typedef void (*btf_trace_qgroup_meta_reserve)(void *, struct btrfs_root *, s64, int);
1: +typedef void (*btf_trace_qgroup_meta_reserve)(void *, struct btrfs_root *, s64,
1: +                                              int);
1:  
1:  typedef void (*btf_trace_qgroup_meta_convert)(void *, struct btrfs_root *, s64);
1:  
1: -typedef void (*btf_trace_qgroup_meta_free_all_pertrans)(void *, struct btrfs_root *);
1: -
1: -typedef void (*btf_trace_btrfs_prelim_ref_merge)(void *, const struct btrfs_fs_info *, const struct prelim_ref *, const struct prelim_ref *, u64);
1: -
1: -typedef void (*btf_trace_btrfs_prelim_ref_insert)(void *, const struct btrfs_fs_info *, const struct prelim_ref *, const struct prelim_ref *, u64);
1: -
1: -typedef void (*btf_trace_btrfs_inode_mod_outstanding_extents)(void *, const struct btrfs_root *, u64, int);
1: -
1: -typedef void (*btf_trace_btrfs_remove_block_group)(void *, const struct btrfs_block_group *);
1: -
1: -typedef void (*btf_trace_btrfs_add_unused_block_group)(void *, const struct btrfs_block_group *);
1: -
1: -typedef void (*btf_trace_btrfs_skip_unused_block_group)(void *, const struct btrfs_block_group *);
1: -
1: -typedef void (*btf_trace_btrfs_set_extent_bit)(void *, const struct extent_io_tree *, u64, u64, unsigned int);
1: -
1: -typedef void (*btf_trace_btrfs_clear_extent_bit)(void *, const struct extent_io_tree *, u64, u64, unsigned int);
1: -
1: -typedef void (*btf_trace_btrfs_convert_extent_bit)(void *, const struct extent_io_tree *, u64, u64, unsigned int, unsigned int);
1: -
1: -typedef void (*btf_trace_btrfs_tree_read_lock)(void *, const struct extent_buffer *, u64);
1: -
1: -typedef void (*btf_trace_btrfs_tree_lock)(void *, const struct extent_buffer *, u64);
1: -
1: -typedef void (*btf_trace_btrfs_tree_unlock)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_tree_read_unlock)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_tree_read_unlock_blocking)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_set_lock_blocking_read)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_set_lock_blocking_write)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_try_tree_read_lock)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_try_tree_write_lock)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_btrfs_tree_read_lock_atomic)(void *, const struct extent_buffer *);
1: -
1: -typedef void (*btf_trace_update_bytes_may_use)(void *, const struct btrfs_fs_info *, const struct btrfs_space_info *, u64, s64);
1: -
1: -typedef void (*btf_trace_update_bytes_pinned)(void *, const struct btrfs_fs_info *, const struct btrfs_space_info *, u64, s64);
1: -
1: -enum {
1: -	Opt_acl___3 = 0,
1: -	Opt_noacl___2 = 1,
1: -	Opt_clear_cache = 2,
1: -	Opt_commit_interval = 3,
1: -	Opt_compress = 4,
1: -	Opt_compress_force = 5,
1: -	Opt_compress_force_type = 6,
1: -	Opt_compress_type = 7,
1: -	Opt_degraded = 8,
1: -	Opt_device = 9,
1: -	Opt_fatal_errors = 10,
1: -	Opt_flushoncommit = 11,
1: -	Opt_noflushoncommit = 12,
1: -	Opt_inode_cache = 13,
1: -	Opt_noinode_cache = 14,
1: -	Opt_max_inline = 15,
1: -	Opt_barrier___2 = 16,
1: -	Opt_nobarrier___2 = 17,
1: -	Opt_datacow = 18,
1: -	Opt_nodatacow = 19,
1: -	Opt_datasum = 20,
1: -	Opt_nodatasum = 21,
1: -	Opt_defrag = 22,
1: -	Opt_nodefrag = 23,
1: -	Opt_discard___2 = 24,
1: -	Opt_nodiscard___2 = 25,
1: -	Opt_discard_mode = 26,
1: -	Opt_norecovery = 27,
1: -	Opt_ratio = 28,
1: -	Opt_rescan_uuid_tree = 29,
1: -	Opt_skip_balance = 30,
1: -	Opt_space_cache = 31,
1: -	Opt_no_space_cache = 32,
1: -	Opt_space_cache_version = 33,
1: -	Opt_ssd = 34,
1: -	Opt_nossd = 35,
1: -	Opt_ssd_spread = 36,
1: -	Opt_nossd_spread = 37,
1: -	Opt_subvol = 38,
1: -	Opt_subvol_empty = 39,
1: -	Opt_subvolid = 40,
1: -	Opt_thread_pool = 41,
1: -	Opt_treelog = 42,
1: -	Opt_notreelog = 43,
1: -	Opt_user_subvol_rm_allowed = 44,
1: -	Opt_rescue = 45,
1: -	Opt_usebackuproot = 46,
1: -	Opt_nologreplay = 47,
1: -	Opt_recovery = 48,
1: -	Opt_check_integrity = 49,
1: -	Opt_check_integrity_including_extent_data = 50,
1: -	Opt_check_integrity_print_mask = 51,
1: -	Opt_enospc_debug = 52,
1: -	Opt_noenospc_debug = 53,
1: -	Opt_err___7 = 54,
1: +typedef void (*btf_trace_qgroup_meta_free_all_pertrans)(void *,
1: +                                                        struct btrfs_root *);
1: +
1: +typedef void (*btf_trace_btrfs_prelim_ref_merge)(void *,
1: +                                                 const struct btrfs_fs_info *,
1: +                                                 const struct prelim_ref *,
1: +                                                 const struct prelim_ref *,
1: +                                                 u64);
1: +
1: +typedef void (*btf_trace_btrfs_prelim_ref_insert)(void *,
1: +                                                  const struct btrfs_fs_info *,
1: +                                                  const struct prelim_ref *,
1: +                                                  const struct prelim_ref *,
1: +                                                  u64);
1: +
1: +typedef void (*btf_trace_btrfs_inode_mod_outstanding_extents)(
1: +    void *, const struct btrfs_root *, u64, int);
1: +
1: +typedef void (*btf_trace_btrfs_remove_block_group)(
1: +    void *, const struct btrfs_block_group *);
1: +
1: +typedef void (*btf_trace_btrfs_add_unused_block_group)(
1: +    void *, const struct btrfs_block_group *);
1: +
1: +typedef void (*btf_trace_btrfs_skip_unused_block_group)(
1: +    void *, const struct btrfs_block_group *);
1: +
1: +typedef void (*btf_trace_btrfs_set_extent_bit)(void *,
1: +                                               const struct extent_io_tree *,
1: +                                               u64, u64, unsigned int);
1: +
1: +typedef void (*btf_trace_btrfs_clear_extent_bit)(void *,
1: +                                                 const struct extent_io_tree *,
1: +                                                 u64, u64, unsigned int);
1: +
1: +typedef void (*btf_trace_btrfs_convert_extent_bit)(
1: +    void *, const struct extent_io_tree *, u64, u64, unsigned int,
1: +    unsigned int);
1: +
1: +typedef void (*btf_trace_btrfs_tree_read_lock)(void *,
1: +                                               const struct extent_buffer *,
1: +                                               u64);
1: +
1: +typedef void (*btf_trace_btrfs_tree_lock)(void *, const struct extent_buffer *,
1: +                                          u64);
1: +
1: +typedef void (*btf_trace_btrfs_tree_unlock)(void *,
1: +                                            const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_tree_read_unlock)(void *,
1: +                                                 const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_tree_read_unlock_blocking)(
1: +    void *, const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_set_lock_blocking_read)(
1: +    void *, const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_set_lock_blocking_write)(
1: +    void *, const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_try_tree_read_lock)(
1: +    void *, const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_try_tree_write_lock)(
1: +    void *, const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_btrfs_tree_read_lock_atomic)(
1: +    void *, const struct extent_buffer *);
1: +
1: +typedef void (*btf_trace_update_bytes_may_use)(void *,
1: +                                               const struct btrfs_fs_info *,
1: +                                               const struct btrfs_space_info *,
1: +                                               u64, s64);
1: +
1: +typedef void (*btf_trace_update_bytes_pinned)(void *,
1: +                                              const struct btrfs_fs_info *,
1: +                                              const struct btrfs_space_info *,
1: +                                              u64, s64);
1: +
1: +enum {
1: +  Opt_acl___3 = 0,
1: +  Opt_noacl___2 = 1,
1: +  Opt_clear_cache = 2,
1: +  Opt_commit_interval = 3,
1: +  Opt_compress = 4,
1: +  Opt_compress_force = 5,
1: +  Opt_compress_force_type = 6,
1: +  Opt_compress_type = 7,
1: +  Opt_degraded = 8,
1: +  Opt_device = 9,
1: +  Opt_fatal_errors = 10,
1: +  Opt_flushoncommit = 11,
1: +  Opt_noflushoncommit = 12,
1: +  Opt_inode_cache = 13,
1: +  Opt_noinode_cache = 14,
1: +  Opt_max_inline = 15,
1: +  Opt_barrier___2 = 16,
1: +  Opt_nobarrier___2 = 17,
1: +  Opt_datacow = 18,
1: +  Opt_nodatacow = 19,
1: +  Opt_datasum = 20,
1: +  Opt_nodatasum = 21,
1: +  Opt_defrag = 22,
1: +  Opt_nodefrag = 23,
1: +  Opt_discard___2 = 24,
1: +  Opt_nodiscard___2 = 25,
1: +  Opt_discard_mode = 26,
1: +  Opt_norecovery = 27,
1: +  Opt_ratio = 28,
1: +  Opt_rescan_uuid_tree = 29,
1: +  Opt_skip_balance = 30,
1: +  Opt_space_cache = 31,
1: +  Opt_no_space_cache = 32,
1: +  Opt_space_cache_version = 33,
1: +  Opt_ssd = 34,
1: +  Opt_nossd = 35,
1: +  Opt_ssd_spread = 36,
1: +  Opt_nossd_spread = 37,
1: +  Opt_subvol = 38,
1: +  Opt_subvol_empty = 39,
1: +  Opt_subvolid = 40,
1: +  Opt_thread_pool = 41,
1: +  Opt_treelog = 42,
1: +  Opt_notreelog = 43,
1: +  Opt_user_subvol_rm_allowed = 44,
1: +  Opt_rescue = 45,
1: +  Opt_usebackuproot = 46,
1: +  Opt_nologreplay = 47,
1: +  Opt_recovery = 48,
1: +  Opt_check_integrity = 49,
1: +  Opt_check_integrity_including_extent_data = 50,
1: +  Opt_check_integrity_print_mask = 51,
1: +  Opt_enospc_debug = 52,
1: +  Opt_noenospc_debug = 53,
1: +  Opt_err___7 = 54,
1:  };
1:  
1:  enum btrfs_csum_type {
1: -	BTRFS_CSUM_TYPE_CRC32 = 0,
1: -	BTRFS_CSUM_TYPE_XXHASH = 1,
1: -	BTRFS_CSUM_TYPE_SHA256 = 2,
1: -	BTRFS_CSUM_TYPE_BLAKE2 = 3,
1: +  BTRFS_CSUM_TYPE_CRC32 = 0,
1: +  BTRFS_CSUM_TYPE_XXHASH = 1,
1: +  BTRFS_CSUM_TYPE_SHA256 = 2,
1: +  BTRFS_CSUM_TYPE_BLAKE2 = 3,
1:  };
1:  
1:  enum {
1: -	EXTENT_BUFFER_UPTODATE = 0,
1: -	EXTENT_BUFFER_DIRTY = 1,
1: -	EXTENT_BUFFER_CORRUPT = 2,
1: -	EXTENT_BUFFER_READAHEAD = 3,
1: -	EXTENT_BUFFER_TREE_REF = 4,
1: -	EXTENT_BUFFER_STALE = 5,
1: -	EXTENT_BUFFER_WRITEBACK = 6,
1: -	EXTENT_BUFFER_READ_ERR = 7,
1: -	EXTENT_BUFFER_UNMAPPED = 8,
1: -	EXTENT_BUFFER_IN_TREE = 9,
1: -	EXTENT_BUFFER_WRITE_ERR = 10,
1: +  EXTENT_BUFFER_UPTODATE = 0,
1: +  EXTENT_BUFFER_DIRTY = 1,
1: +  EXTENT_BUFFER_CORRUPT = 2,
1: +  EXTENT_BUFFER_READAHEAD = 3,
1: +  EXTENT_BUFFER_TREE_REF = 4,
1: +  EXTENT_BUFFER_STALE = 5,
1: +  EXTENT_BUFFER_WRITEBACK = 6,
1: +  EXTENT_BUFFER_READ_ERR = 7,
1: +  EXTENT_BUFFER_UNMAPPED = 8,
1: +  EXTENT_BUFFER_IN_TREE = 9,
1: +  EXTENT_BUFFER_WRITE_ERR = 10,
1:  };
1:  
1:  struct btrfs_key_ptr {
1: -	struct btrfs_disk_key key;
1: -	__le64 blockptr;
1: -	__le64 generation;
1: +  struct btrfs_disk_key key;
1: +  __le64 blockptr;
1: +  __le64 generation;
1:  } __attribute__((packed));
1:  
1:  enum {
1: -	READA_NONE = 0,
1: -	READA_BACK = 1,
1: -	READA_FORWARD = 2,
1: +  READA_NONE = 0,
1: +  READA_BACK = 1,
1: +  READA_FORWARD = 2,
1:  };
1:  
1:  struct seq_list {
1: -	struct list_head list;
1: -	u64 seq;
1: +  struct list_head list;
1: +  u64 seq;
1:  };
1:  
1:  enum {
1: -	BTRFS_ROOT_IN_TRANS_SETUP = 0,
1: -	BTRFS_ROOT_SHAREABLE = 1,
1: -	BTRFS_ROOT_TRACK_DIRTY = 2,
1: -	BTRFS_ROOT_IN_RADIX = 3,
1: -	BTRFS_ROOT_ORPHAN_ITEM_INSERTED = 4,
1: -	BTRFS_ROOT_DEFRAG_RUNNING = 5,
1: -	BTRFS_ROOT_FORCE_COW = 6,
1: -	BTRFS_ROOT_MULTI_LOG_TASKS = 7,
1: -	BTRFS_ROOT_DIRTY = 8,
1: -	BTRFS_ROOT_DELETING = 9,
1: -	BTRFS_ROOT_DEAD_RELOC_TREE = 10,
1: -	BTRFS_ROOT_DEAD_TREE = 11,
1: -	BTRFS_ROOT_HAS_LOG_TREE = 12,
1: -	BTRFS_ROOT_QGROUP_FLUSHING = 13,
1: +  BTRFS_ROOT_IN_TRANS_SETUP = 0,
1: +  BTRFS_ROOT_SHAREABLE = 1,
1: +  BTRFS_ROOT_TRACK_DIRTY = 2,
1: +  BTRFS_ROOT_IN_RADIX = 3,
1: +  BTRFS_ROOT_ORPHAN_ITEM_INSERTED = 4,
1: +  BTRFS_ROOT_DEFRAG_RUNNING = 5,
1: +  BTRFS_ROOT_FORCE_COW = 6,
1: +  BTRFS_ROOT_MULTI_LOG_TASKS = 7,
1: +  BTRFS_ROOT_DIRTY = 8,
1: +  BTRFS_ROOT_DELETING = 9,
1: +  BTRFS_ROOT_DEAD_RELOC_TREE = 10,
1: +  BTRFS_ROOT_DEAD_TREE = 11,
1: +  BTRFS_ROOT_HAS_LOG_TREE = 12,
1: +  BTRFS_ROOT_QGROUP_FLUSHING = 13,
1:  };
1:  
1:  struct btrfs_map_token {
1: -	struct extent_buffer *eb;
1: -	char *kaddr;
1: -	long unsigned int offset;
1: +  struct extent_buffer *eb;
1: +  char *kaddr;
1: +  long unsigned int offset;
1:  };
1:  
1:  struct btrfs_csums {
1: -	u16 size;
1: -	const char name[10];
1: -	const char driver[12];
1: +  u16 size;
1: +  const char name[10];
1: +  const char driver[12];
1:  };
1:  
1:  enum mod_log_op {
1: -	MOD_LOG_KEY_REPLACE = 0,
1: -	MOD_LOG_KEY_ADD = 1,
1: -	MOD_LOG_KEY_REMOVE = 2,
1: -	MOD_LOG_KEY_REMOVE_WHILE_FREEING = 3,
1: -	MOD_LOG_KEY_REMOVE_WHILE_MOVING = 4,
1: -	MOD_LOG_MOVE_KEYS = 5,
1: -	MOD_LOG_ROOT_REPLACE = 6,
1: +  MOD_LOG_KEY_REPLACE = 0,
1: +  MOD_LOG_KEY_ADD = 1,
1: +  MOD_LOG_KEY_REMOVE = 2,
1: +  MOD_LOG_KEY_REMOVE_WHILE_FREEING = 3,
1: +  MOD_LOG_KEY_REMOVE_WHILE_MOVING = 4,
1: +  MOD_LOG_MOVE_KEYS = 5,
1: +  MOD_LOG_ROOT_REPLACE = 6,
1:  };
1:  
1:  struct tree_mod_root {
1: -	u64 logical;
1: -	u8 level;
1: +  u64 logical;
1: +  u8 level;
1:  };
1:  
1:  struct tree_mod_elem {
1: -	struct rb_node node;
1: -	u64 logical;
1: -	u64 seq;
1: -	enum mod_log_op op;
1: -	int slot;
1: -	u64 generation;
1: -	struct btrfs_disk_key key;
1: -	u64 blockptr;
1: -	struct {
1: -		int dst_slot;
1: -		int nr_items;
1: -	} move;
1: -	struct tree_mod_root old_root;
1: +  struct rb_node node;
1: +  u64 logical;
1: +  u64 seq;
1: +  enum mod_log_op op;
1: +  int slot;
1: +  u64 generation;
1: +  struct btrfs_disk_key key;
1: +  u64 blockptr;
1: +  struct {
1: +    int dst_slot;
1: +    int nr_items;
1: +  } move;
1: +  struct tree_mod_root old_root;
1:  };
1:  
1:  struct btrfs_extent_item {
1: -	__le64 refs;
1: -	__le64 generation;
1: -	__le64 flags;
1: +  __le64 refs;
1: +  __le64 generation;
1: +  __le64 flags;
1:  };
1:  
1:  struct btrfs_tree_block_info {
1: -	struct btrfs_disk_key key;
1: -	__u8 level;
1: +  struct btrfs_disk_key key;
1: +  __u8 level;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_extent_data_ref {
1: -	__le64 root;
1: -	__le64 objectid;
1: -	__le64 offset;
1: -	__le32 count;
1: +  __le64 root;
1: +  __le64 objectid;
1: +  __le64 offset;
1: +  __le32 count;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_shared_data_ref {
1: -	__le32 count;
1: +  __le32 count;
1:  };
1:  
1:  struct btrfs_extent_inline_ref {
1: -	__u8 type;
1: -	__le64 offset;
1: +  __u8 type;
1: +  __le64 offset;
1:  } __attribute__((packed));
1:  
1:  enum btrfs_inline_ref_type {
1: -	BTRFS_REF_TYPE_INVALID = 0,
1: -	BTRFS_REF_TYPE_BLOCK = 1,
1: -	BTRFS_REF_TYPE_DATA = 2,
1: -	BTRFS_REF_TYPE_ANY = 3,
1: +  BTRFS_REF_TYPE_INVALID = 0,
1: +  BTRFS_REF_TYPE_BLOCK = 1,
1: +  BTRFS_REF_TYPE_DATA = 2,
1: +  BTRFS_REF_TYPE_ANY = 3,
1:  };
1:  
1:  enum btrfs_ref_type {
1: -	BTRFS_REF_NOT_SET = 0,
1: -	BTRFS_REF_DATA = 1,
1: -	BTRFS_REF_METADATA = 2,
1: -	BTRFS_REF_LAST = 3,
1: +  BTRFS_REF_NOT_SET = 0,
1: +  BTRFS_REF_DATA = 1,
1: +  BTRFS_REF_METADATA = 2,
1: +  BTRFS_REF_LAST = 3,
1:  };
1:  
1:  struct btrfs_data_ref {
1: -	u64 ref_root;
1: -	u64 ino;
1: -	u64 offset;
1: +  u64 ref_root;
1: +  u64 ino;
1: +  u64 offset;
1:  };
1:  
1:  struct btrfs_tree_ref {
1: -	int level;
1: -	u64 root;
1: +  int level;
1: +  u64 root;
1:  };
1:  
1:  struct btrfs_ref {
1: -	enum btrfs_ref_type type;
1: -	int action;
1: -	bool skip_qgroup;
1: -	u64 real_root;
1: -	u64 bytenr;
1: -	u64 len;
1: -	u64 parent;
1: -	union {
1: -		struct btrfs_data_ref data_ref;
1: -		struct btrfs_tree_ref tree_ref;
1: -	};
1: +  enum btrfs_ref_type type;
1: +  int action;
1: +  bool skip_qgroup;
1: +  u64 real_root;
1: +  u64 bytenr;
1: +  u64 len;
1: +  u64 parent;
1: +  union {
1: +    struct btrfs_data_ref data_ref;
1: +    struct btrfs_tree_ref tree_ref;
1: +  };
1:  };
1:  
1:  struct btrfs_bio {
1: -	refcount_t refs;
1: -	atomic_t stripes_pending;
1: -	struct btrfs_fs_info *fs_info;
1: -	u64 map_type;
1: -	bio_end_io_t *end_io;
1: -	struct bio *orig_bio;
1: -	void *private;
1: -	atomic_t error;
1: -	int max_errors;
1: -	int num_stripes;
1: -	int mirror_num;
1: -	int num_tgtdevs;
1: -	int *tgtdev_map;
1: -	u64 *raid_map;
1: -	struct btrfs_bio_stripe stripes[0];
1: +  refcount_t refs;
1: +  atomic_t stripes_pending;
1: +  struct btrfs_fs_info *fs_info;
1: +  u64 map_type;
1: +  bio_end_io_t *end_io;
1: +  struct bio *orig_bio;
1: +  void *private;
1: +  atomic_t error;
1: +  int max_errors;
1: +  int num_stripes;
1: +  int mirror_num;
1: +  int num_tgtdevs;
1: +  int *tgtdev_map;
1: +  u64 *raid_map;
1: +  struct btrfs_bio_stripe stripes[0];
1:  };
1:  
1:  enum btrfs_map_op {
1: -	BTRFS_MAP_READ = 0,
1: -	BTRFS_MAP_WRITE = 1,
1: -	BTRFS_MAP_DISCARD = 2,
1: -	BTRFS_MAP_GET_READ_MIRRORS = 3,
1: +  BTRFS_MAP_READ = 0,
1: +  BTRFS_MAP_WRITE = 1,
1: +  BTRFS_MAP_DISCARD = 2,
1: +  BTRFS_MAP_GET_READ_MIRRORS = 3,
1:  };
1:  
1:  enum btrfs_chunk_alloc_enum {
1: -	CHUNK_ALLOC_NO_FORCE = 0,
1: -	CHUNK_ALLOC_LIMITED = 1,
1: -	CHUNK_ALLOC_FORCE = 2,
1: +  CHUNK_ALLOC_NO_FORCE = 0,
1: +  CHUNK_ALLOC_LIMITED = 1,
1: +  CHUNK_ALLOC_FORCE = 2,
1:  };
1:  
1:  enum btrfs_loop_type {
1: -	LOOP_CACHING_NOWAIT = 0,
1: -	LOOP_CACHING_WAIT = 1,
1: -	LOOP_ALLOC_CHUNK = 2,
1: -	LOOP_NO_EMPTY_SIZE = 3,
1: +  LOOP_CACHING_NOWAIT = 0,
1: +  LOOP_CACHING_WAIT = 1,
1: +  LOOP_ALLOC_CHUNK = 2,
1: +  LOOP_NO_EMPTY_SIZE = 3,
1:  };
1:  
1:  enum btrfs_extent_allocation_policy {
1: -	BTRFS_EXTENT_ALLOC_CLUSTERED = 0,
1: +  BTRFS_EXTENT_ALLOC_CLUSTERED = 0,
1:  };
1:  
1:  struct find_free_extent_ctl {
1: -	u64 num_bytes;
1: -	u64 empty_size;
1: -	u64 flags;
1: -	int delalloc;
1: -	u64 search_start;
1: -	u64 empty_cluster;
1: -	struct btrfs_free_cluster *last_ptr;
1: -	bool use_cluster;
1: -	bool have_caching_bg;
1: -	bool orig_have_caching_bg;
1: -	int index;
1: -	int loop;
1: -	bool retry_clustered;
1: -	bool retry_unclustered;
1: -	int cached;
1: -	u64 max_extent_size;
1: -	u64 total_free_space;
1: -	u64 found_offset;
1: -	u64 hint_byte;
1: -	enum btrfs_extent_allocation_policy policy;
1: +  u64 num_bytes;
1: +  u64 empty_size;
1: +  u64 flags;
1: +  int delalloc;
1: +  u64 search_start;
1: +  u64 empty_cluster;
1: +  struct btrfs_free_cluster *last_ptr;
1: +  bool use_cluster;
1: +  bool have_caching_bg;
1: +  bool orig_have_caching_bg;
1: +  int index;
1: +  int loop;
1: +  bool retry_clustered;
1: +  bool retry_unclustered;
1: +  int cached;
1: +  u64 max_extent_size;
1: +  u64 total_free_space;
1: +  u64 found_offset;
1: +  u64 hint_byte;
1: +  enum btrfs_extent_allocation_policy policy;
1:  };
1:  
1:  struct walk_control {
1: -	u64 refs[8];
1: -	u64 flags[8];
1: -	struct btrfs_key update_progress;
1: -	struct btrfs_key drop_progress;
1: -	short: 16;
1: -	int drop_level;
1: -	int stage;
1: -	int level;
1: -	int shared_level;
1: -	int update_ref;
1: -	int keep_locks;
1: -	int reada_slot;
1: -	int reada_count;
1: -	int restarted;
1: +  u64 refs[8];
1: +  u64 flags[8];
1: +  struct btrfs_key update_progress;
1: +  struct btrfs_key drop_progress;
1: +  short : 16;
1: +  int drop_level;
1: +  int stage;
1: +  int level;
1: +  int shared_level;
1: +  int update_ref;
1: +  int keep_locks;
1: +  int reada_slot;
1: +  int reada_count;
1: +  int restarted;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_stripe {
1: -	__le64 devid;
1: -	__le64 offset;
1: -	__u8 dev_uuid[16];
1: +  __le64 devid;
1: +  __le64 offset;
1: +  __u8 dev_uuid[16];
1:  };
1:  
1:  struct btrfs_chunk {
1: -	__le64 length;
1: -	__le64 owner;
1: -	__le64 stripe_len;
1: -	__le64 type;
1: -	__le32 io_align;
1: -	__le32 io_width;
1: -	__le32 sector_size;
1: -	__le16 num_stripes;
1: -	__le16 sub_stripes;
1: -	struct btrfs_stripe stripe;
1: +  __le64 length;
1: +  __le64 owner;
1: +  __le64 stripe_len;
1: +  __le64 type;
1: +  __le32 io_align;
1: +  __le32 io_width;
1: +  __le32 sector_size;
1: +  __le16 num_stripes;
1: +  __le16 sub_stripes;
1: +  struct btrfs_stripe stripe;
1:  };
1:  
1:  struct btrfs_dev_extent {
1: -	__le64 chunk_tree;
1: -	__le64 chunk_objectid;
1: -	__le64 chunk_offset;
1: -	__le64 length;
1: -	__u8 chunk_tree_uuid[16];
1: +  __le64 chunk_tree;
1: +  __le64 chunk_objectid;
1: +  __le64 chunk_offset;
1: +  __le64 length;
1: +  __u8 chunk_tree_uuid[16];
1:  };
1:  
1:  struct btrfs_block_group_item {
1: -	__le64 used;
1: -	__le64 chunk_objectid;
1: -	__le64 flags;
1: +  __le64 used;
1: +  __le64 chunk_objectid;
1: +  __le64 flags;
1:  };
1:  
1:  struct root_name_map {
1: -	u64 id;
1: -	char name[16];
1: +  u64 id;
1: +  char name[16];
1:  };
1:  
1:  struct btrfs_csum_item {
1: -	__u8 csum;
1: +  __u8 csum;
1:  };
1:  
1:  struct btrfs_ordered_sum {
1: -	u64 bytenr;
1: -	int len;
1: -	struct list_head list;
1: -	u8 sums[0];
1: +  u64 bytenr;
1: +  int len;
1: +  struct list_head list;
1: +  u8 sums[0];
1:  };
1:  
1:  struct btrfs_io_bio {
1: -	unsigned int mirror_num;
1: -	struct btrfs_device *device;
1: -	u64 logical;
1: -	u8 *csum;
1: -	u8 csum_inline[64];
1: -	struct bvec_iter iter;
1: -	struct bio bio;
1: +  unsigned int mirror_num;
1: +  struct btrfs_device *device;
1: +  u64 logical;
1: +  u8 *csum;
1: +  u8 csum_inline[64];
1: +  struct bvec_iter iter;
1: +  struct bio bio;
1:  };
1:  
1:  struct btrfs_inode_extref {
1: -	__le64 parent_objectid;
1: -	__le64 index;
1: -	__le16 name_len;
1: -	__u8 name[0];
1: +  __le64 parent_objectid;
1: +  __le64 index;
1: +  __le16 name_len;
1: +  __u8 name[0];
1:  } __attribute__((packed));
1:  
1:  struct extent_changeset {
1: -	unsigned int bytes_changed;
1: -	struct ulist range_changed;
1: +  unsigned int bytes_changed;
1: +  struct ulist range_changed;
1:  };
1:  
1:  struct shash_alg {
1: -	int (*init)(struct shash_desc *);
1: -	int (*update)(struct shash_desc *, const u8 *, unsigned int);
1: -	int (*final)(struct shash_desc *, u8 *);
1: -	int (*finup)(struct shash_desc *, const u8 *, unsigned int, u8 *);
1: -	int (*digest)(struct shash_desc *, const u8 *, unsigned int, u8 *);
1: -	int (*export)(struct shash_desc *, void *);
1: -	int (*import)(struct shash_desc *, const void *);
1: -	int (*setkey)(struct crypto_shash *, const u8 *, unsigned int);
1: -	int (*init_tfm)(struct crypto_shash *);
1: -	void (*exit_tfm)(struct crypto_shash *);
1: -	unsigned int descsize;
1: -	int: 32;
1: -	unsigned int digestsize;
1: -	unsigned int statesize;
1: -	struct crypto_alg base;
1: +  int (*init)(struct shash_desc *);
1: +  int (*update)(struct shash_desc *, const u8 *, unsigned int);
1: +  int (*final)(struct shash_desc *, u8 *);
1: +  int (*finup)(struct shash_desc *, const u8 *, unsigned int, u8 *);
1: +  int (*digest)(struct shash_desc *, const u8 *, unsigned int, u8 *);
1: +  int (*export)(struct shash_desc *, void *);
1: +  int (*import)(struct shash_desc *, const void *);
1: +  int (*setkey)(struct crypto_shash *, const u8 *, unsigned int);
1: +  int (*init_tfm)(struct crypto_shash *);
1: +  void (*exit_tfm)(struct crypto_shash *);
1: +  unsigned int descsize;
1: +  int : 32;
1: +  unsigned int digestsize;
1: +  unsigned int statesize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  typedef blk_status_t extent_submit_bio_start_t(void *, struct bio *, u64);
1:  
1:  enum {
1: -	BTRFS_BLOCK_RSV_GLOBAL = 0,
1: -	BTRFS_BLOCK_RSV_DELALLOC = 1,
1: -	BTRFS_BLOCK_RSV_TRANS = 2,
1: -	BTRFS_BLOCK_RSV_CHUNK = 3,
1: -	BTRFS_BLOCK_RSV_DELOPS = 4,
1: -	BTRFS_BLOCK_RSV_DELREFS = 5,
1: -	BTRFS_BLOCK_RSV_EMPTY = 6,
1: -	BTRFS_BLOCK_RSV_TEMP = 7,
1: +  BTRFS_BLOCK_RSV_GLOBAL = 0,
1: +  BTRFS_BLOCK_RSV_DELALLOC = 1,
1: +  BTRFS_BLOCK_RSV_TRANS = 2,
1: +  BTRFS_BLOCK_RSV_CHUNK = 3,
1: +  BTRFS_BLOCK_RSV_DELOPS = 4,
1: +  BTRFS_BLOCK_RSV_DELREFS = 5,
1: +  BTRFS_BLOCK_RSV_EMPTY = 6,
1: +  BTRFS_BLOCK_RSV_TEMP = 7,
1:  };
1:  
1:  enum btrfs_wq_endio_type {
1: -	BTRFS_WQ_ENDIO_DATA = 0,
1: -	BTRFS_WQ_ENDIO_METADATA = 1,
1: -	BTRFS_WQ_ENDIO_FREE_SPACE = 2,
1: -	BTRFS_WQ_ENDIO_RAID56 = 3,
1: +  BTRFS_WQ_ENDIO_DATA = 0,
1: +  BTRFS_WQ_ENDIO_METADATA = 1,
1: +  BTRFS_WQ_ENDIO_FREE_SPACE = 2,
1: +  BTRFS_WQ_ENDIO_RAID56 = 3,
1:  };
1:  
1:  enum {
1: -	BTRFS_INODE_FLUSH_ON_CLOSE = 0,
1: -	BTRFS_INODE_DUMMY = 1,
1: -	BTRFS_INODE_IN_DEFRAG = 2,
1: -	BTRFS_INODE_HAS_ASYNC_EXTENT = 3,
1: -	BTRFS_INODE_NEEDS_FULL_SYNC = 4,
1: -	BTRFS_INODE_COPY_EVERYTHING = 5,
1: -	BTRFS_INODE_IN_DELALLOC_LIST = 6,
1: -	BTRFS_INODE_HAS_PROPS = 7,
1: -	BTRFS_INODE_SNAPSHOT_FLUSH = 8,
1: +  BTRFS_INODE_FLUSH_ON_CLOSE = 0,
1: +  BTRFS_INODE_DUMMY = 1,
1: +  BTRFS_INODE_IN_DEFRAG = 2,
1: +  BTRFS_INODE_HAS_ASYNC_EXTENT = 3,
1: +  BTRFS_INODE_NEEDS_FULL_SYNC = 4,
1: +  BTRFS_INODE_COPY_EVERYTHING = 5,
1: +  BTRFS_INODE_IN_DELALLOC_LIST = 6,
1: +  BTRFS_INODE_HAS_PROPS = 7,
1: +  BTRFS_INODE_SNAPSHOT_FLUSH = 8,
1:  };
1:  
1:  enum btrfs_disk_cache_state {
1: -	BTRFS_DC_WRITTEN = 0,
1: -	BTRFS_DC_ERROR = 1,
1: -	BTRFS_DC_CLEAR = 2,
1: -	BTRFS_DC_SETUP = 3,
1: +  BTRFS_DC_WRITTEN = 0,
1: +  BTRFS_DC_ERROR = 1,
1: +  BTRFS_DC_CLEAR = 2,
1: +  BTRFS_DC_SETUP = 3,
1:  };
1:  
1:  struct btrfs_end_io_wq {
1: -	struct bio *bio;
1: -	bio_end_io_t *end_io;
1: -	void *private;
1: -	struct btrfs_fs_info *info;
1: -	blk_status_t status;
1: -	enum btrfs_wq_endio_type metadata;
1: -	struct btrfs_work work;
1: +  struct bio *bio;
1: +  bio_end_io_t *end_io;
1: +  void *private;
1: +  struct btrfs_fs_info *info;
1: +  blk_status_t status;
1: +  enum btrfs_wq_endio_type metadata;
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct async_submit_bio {
1: -	void *private_data;
1: -	struct bio *bio;
1: -	extent_submit_bio_start_t *submit_bio_start;
1: -	int mirror_num;
1: -	u64 bio_offset;
1: -	struct btrfs_work work;
1: -	blk_status_t status;
1: +  void *private_data;
1: +  struct bio *bio;
1: +  extent_submit_bio_start_t *submit_bio_start;
1: +  int mirror_num;
1: +  u64 bio_offset;
1: +  struct btrfs_work work;
1: +  blk_status_t status;
1:  };
1:  
1:  struct btrfs_qgroup_limit {
1: -	__u64 flags;
1: -	__u64 max_rfer;
1: -	__u64 max_excl;
1: -	__u64 rsv_rfer;
1: -	__u64 rsv_excl;
1: +  __u64 flags;
1: +  __u64 max_rfer;
1: +  __u64 max_excl;
1: +  __u64 rsv_rfer;
1: +  __u64 rsv_excl;
1:  };
1:  
1:  struct btrfs_qgroup_inherit {
1: -	__u64 flags;
1: -	__u64 num_qgroups;
1: -	__u64 num_ref_copies;
1: -	__u64 num_excl_copies;
1: -	struct btrfs_qgroup_limit lim;
1: -	__u64 qgroups[0];
1: +  __u64 flags;
1: +  __u64 num_qgroups;
1: +  __u64 num_ref_copies;
1: +  __u64 num_excl_copies;
1: +  struct btrfs_qgroup_limit lim;
1: +  __u64 qgroups[0];
1:  };
1:  
1:  struct btrfs_pending_snapshot {
1: -	struct dentry *dentry;
1: -	struct inode *dir;
1: -	struct btrfs_root *root;
1: -	struct btrfs_root_item *root_item;
1: -	struct btrfs_root *snap;
1: -	struct btrfs_qgroup_inherit *inherit;
1: -	struct btrfs_path *path;
1: -	struct btrfs_block_rsv block_rsv;
1: -	int error;
1: -	dev_t anon_dev;
1: -	bool readonly;
1: -	struct list_head list;
1: +  struct dentry *dentry;
1: +  struct inode *dir;
1: +  struct btrfs_root *root;
1: +  struct btrfs_root_item *root_item;
1: +  struct btrfs_root *snap;
1: +  struct btrfs_qgroup_inherit *inherit;
1: +  struct btrfs_path *path;
1: +  struct btrfs_block_rsv block_rsv;
1: +  int error;
1: +  dev_t anon_dev;
1: +  bool readonly;
1: +  struct list_head list;
1:  };
1:  
1:  struct btrfs_async_commit {
1: -	struct btrfs_trans_handle *newtrans;
1: -	struct work_struct work;
1: +  struct btrfs_trans_handle *newtrans;
1: +  struct work_struct work;
1:  };
1:  
1:  enum btrfs_orphan_cleanup_state {
1: -	ORPHAN_CLEANUP_STARTED = 1,
1: -	ORPHAN_CLEANUP_DONE = 2,
1: +  ORPHAN_CLEANUP_STARTED = 1,
1: +  ORPHAN_CLEANUP_DONE = 2,
1:  };
1:  
1:  struct btrfs_swapfile_pin {
1: -	struct rb_node node;
1: -	void *ptr;
1: -	struct inode *inode;
1: -	bool is_block_group;
1: +  struct rb_node node;
1: +  void *ptr;
1: +  struct inode *inode;
1: +  bool is_block_group;
1:  };
1:  
1:  enum btrfs_exclusive_operation {
1: -	BTRFS_EXCLOP_NONE = 0,
1: -	BTRFS_EXCLOP_BALANCE = 1,
1: -	BTRFS_EXCLOP_DEV_ADD = 2,
1: -	BTRFS_EXCLOP_DEV_REMOVE = 3,
1: -	BTRFS_EXCLOP_DEV_REPLACE = 4,
1: -	BTRFS_EXCLOP_RESIZE = 5,
1: -	BTRFS_EXCLOP_SWAP_ACTIVATE = 6,
1: +  BTRFS_EXCLOP_NONE = 0,
1: +  BTRFS_EXCLOP_BALANCE = 1,
1: +  BTRFS_EXCLOP_DEV_ADD = 2,
1: +  BTRFS_EXCLOP_DEV_REMOVE = 3,
1: +  BTRFS_EXCLOP_DEV_REPLACE = 4,
1: +  BTRFS_EXCLOP_RESIZE = 5,
1: +  BTRFS_EXCLOP_SWAP_ACTIVATE = 6,
1:  };
1:  
1:  struct btrfs_replace_extent_info {
1: -	u64 disk_offset;
1: -	u64 disk_len;
1: -	u64 data_offset;
1: -	u64 data_len;
1: -	u64 file_offset;
1: -	char *extent_buf;
1: -	bool is_new_extent;
1: -	int qgroup_reserved;
1: -	int insertions;
1: +  u64 disk_offset;
1: +  u64 disk_len;
1: +  u64 data_offset;
1: +  u64 data_len;
1: +  u64 file_offset;
1: +  char *extent_buf;
1: +  bool is_new_extent;
1: +  int qgroup_reserved;
1: +  int insertions;
1:  };
1:  
1:  struct btrfs_file_private {
1: -	void *filldir_buf;
1: +  void *filldir_buf;
1:  };
1:  
1:  struct btrfs_dio_private {
1: -	struct inode *inode;
1: -	u64 logical_offset;
1: -	u64 disk_bytenr;
1: -	u64 bytes;
1: -	refcount_t refs;
1: -	struct bio *dio_bio;
1: -	u8 csums[0];
1: +  struct inode *inode;
1: +  u64 logical_offset;
1: +  u64 disk_bytenr;
1: +  u64 bytes;
1: +  refcount_t refs;
1: +  struct bio *dio_bio;
1: +  u8 csums[0];
1:  };
1:  
1:  struct btrfs_io_geometry {
1: -	u64 len;
1: -	u64 offset;
1: -	u64 stripe_len;
1: -	u64 stripe_nr;
1: -	u64 stripe_offset;
1: -	u64 raid56_stripe_offset;
1: +  u64 len;
1: +  u64 offset;
1: +  u64 stripe_len;
1: +  u64 stripe_nr;
1: +  u64 stripe_offset;
1: +  u64 raid56_stripe_offset;
1:  };
1:  
1:  struct btrfs_iget_args {
1: -	u64 ino;
1: -	struct btrfs_root *root;
1: +  u64 ino;
1: +  struct btrfs_root *root;
1:  };
1:  
1:  struct btrfs_dio_data {
1: -	u64 reserve;
1: -	loff_t length;
1: -	ssize_t submitted;
1: -	struct extent_changeset *data_reserved;
1: -	bool sync;
1: +  u64 reserve;
1: +  loff_t length;
1: +  ssize_t submitted;
1: +  struct extent_changeset *data_reserved;
1: +  bool sync;
1:  };
1:  
1:  struct async_extent {
1: -	u64 start;
1: -	u64 ram_size;
1: -	u64 compressed_size;
1: -	struct page **pages;
1: -	long unsigned int nr_pages;
1: -	int compress_type;
1: -	struct list_head list;
1: +  u64 start;
1: +  u64 ram_size;
1: +  u64 compressed_size;
1: +  struct page **pages;
1: +  long unsigned int nr_pages;
1: +  int compress_type;
1: +  struct list_head list;
1:  };
1:  
1:  struct async_chunk {
1: -	struct inode *inode;
1: -	struct page *locked_page;
1: -	u64 start;
1: -	u64 end;
1: -	unsigned int write_flags;
1: -	struct list_head extents;
1: -	struct cgroup_subsys_state *blkcg_css;
1: -	struct btrfs_work work;
1: -	atomic_t *pending;
1: +  struct inode *inode;
1: +  struct page *locked_page;
1: +  u64 start;
1: +  u64 end;
1: +  unsigned int write_flags;
1: +  struct list_head extents;
1: +  struct cgroup_subsys_state *blkcg_css;
1: +  struct btrfs_work work;
1: +  atomic_t *pending;
1:  };
1:  
1:  struct async_cow {
1: -	atomic_t num_chunks;
1: -	struct async_chunk chunks[0];
1: +  atomic_t num_chunks;
1: +  struct async_chunk chunks[0];
1:  };
1:  
1:  struct btrfs_writepage_fixup {
1: -	struct page *page;
1: -	struct inode *inode;
1: -	struct btrfs_work work;
1: +  struct page *page;
1: +  struct inode *inode;
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct dir_entry___2 {
1: -	u64 ino;
1: -	u64 offset;
1: -	unsigned int type;
1: -	int name_len;
1: +  u64 ino;
1: +  u64 offset;
1: +  unsigned int type;
1: +  int name_len;
1:  };
1:  
1:  struct btrfs_delalloc_work {
1: -	struct inode *inode;
1: -	struct completion completion;
1: -	struct list_head list;
1: -	struct btrfs_work work;
1: +  struct inode *inode;
1: +  struct completion completion;
1: +  struct list_head list;
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct btrfs_swap_info {
1: -	u64 start;
1: -	u64 block_start;
1: -	u64 block_len;
1: -	u64 lowest_ppage;
1: -	u64 highest_ppage;
1: -	long unsigned int nr_pages;
1: -	int nr_extents;
1: +  u64 start;
1: +  u64 block_start;
1: +  u64 block_len;
1: +  u64 lowest_ppage;
1: +  u64 highest_ppage;
1: +  long unsigned int nr_pages;
1: +  int nr_extents;
1:  };
1:  
1:  struct btrfs_ioctl_defrag_range_args {
1: -	__u64 start;
1: -	__u64 len;
1: -	__u64 flags;
1: -	__u32 extent_thresh;
1: -	__u32 compress_type;
1: -	__u32 unused[4];
1: +  __u64 start;
1: +  __u64 len;
1: +  __u64 flags;
1: +  __u32 extent_thresh;
1: +  __u32 compress_type;
1: +  __u32 unused[4];
1:  };
1:  
1:  struct btrfs_log_ctx {
1: -	int log_ret;
1: -	int log_transid;
1: -	bool log_new_dentries;
1: -	bool logging_new_name;
1: -	struct inode *inode;
1: -	struct list_head list;
1: -	struct list_head ordered_extents;
1: +  int log_ret;
1: +  int log_transid;
1: +  bool log_new_dentries;
1: +  bool logging_new_name;
1: +  struct inode *inode;
1: +  struct list_head list;
1: +  struct list_head ordered_extents;
1:  };
1:  
1:  struct inode_defrag {
1: -	struct rb_node rb_node;
1: -	u64 ino;
1: -	u64 transid;
1: -	u64 root;
1: -	u64 last_offset;
1: -	int cycled;
1: +  struct rb_node rb_node;
1: +  u64 ino;
1: +  u64 transid;
1: +  u64 root;
1: +  u64 last_offset;
1: +  int cycled;
1:  };
1:  
1:  struct falloc_range {
1: -	struct list_head list;
1: -	u64 start;
1: -	u64 len;
1: +  struct list_head list;
1: +  u64 start;
1: +  u64 len;
1:  };
1:  
1:  enum {
1: -	RANGE_BOUNDARY_WRITTEN_EXTENT = 0,
1: -	RANGE_BOUNDARY_PREALLOC_EXTENT = 1,
1: -	RANGE_BOUNDARY_HOLE = 2,
1: +  RANGE_BOUNDARY_WRITTEN_EXTENT = 0,
1: +  RANGE_BOUNDARY_PREALLOC_EXTENT = 1,
1: +  RANGE_BOUNDARY_HOLE = 2,
1:  };
1:  
1:  enum btrfs_feature_set {
1: -	FEAT_COMPAT = 0,
1: -	FEAT_COMPAT_RO = 1,
1: -	FEAT_INCOMPAT = 2,
1: -	FEAT_MAX = 3,
1: +  FEAT_COMPAT = 0,
1: +  FEAT_COMPAT_RO = 1,
1: +  FEAT_INCOMPAT = 2,
1: +  FEAT_MAX = 3,
1:  };
1:  
1:  struct btrfs_feature_attr {
1: -	struct kobj_attribute kobj_attr;
1: -	enum btrfs_feature_set feature_set;
1: -	u64 feature_bit;
1: +  struct kobj_attribute kobj_attr;
1: +  enum btrfs_feature_set feature_set;
1: +  u64 feature_bit;
1:  };
1:  
1:  struct raid_kobject {
1: -	u64 flags;
1: -	struct kobject kobj;
1: +  u64 flags;
1: +  struct kobject kobj;
1:  };
1:  
1: -typedef blk_status_t submit_bio_hook_t(struct inode *, struct bio *, int, long unsigned int);
1: +typedef blk_status_t submit_bio_hook_t(struct inode *, struct bio *, int,
1: +                                       long unsigned int);
1:  
1:  struct tree_entry {
1: -	u64 start;
1: -	u64 end;
1: -	struct rb_node rb_node;
1: +  u64 start;
1: +  u64 end;
1: +  struct rb_node rb_node;
1:  };
1:  
1:  struct extent_page_data {
1: -	struct bio *bio;
1: -	unsigned int extent_locked: 1;
1: -	unsigned int sync_io: 1;
1: +  struct bio *bio;
1: +  unsigned int extent_locked : 1;
1: +  unsigned int sync_io : 1;
1:  };
1:  
1:  struct fiemap_cache {
1: -	u64 offset;
1: -	u64 phys;
1: -	u64 len;
1: -	u32 flags;
1: -	bool cached;
1: +  u64 offset;
1: +  u64 phys;
1: +  u64 len;
1: +  u32 flags;
1: +  bool cached;
1:  };
1:  
1:  struct btrfs_ioctl_balance_args {
1: -	__u64 flags;
1: -	__u64 state;
1: -	struct btrfs_balance_args data;
1: -	struct btrfs_balance_args meta;
1: -	struct btrfs_balance_args sys;
1: -	struct btrfs_balance_progress stat;
1: -	__u64 unused[72];
1: +  __u64 flags;
1: +  __u64 state;
1: +  struct btrfs_balance_args data;
1: +  struct btrfs_balance_args meta;
1: +  struct btrfs_balance_args sys;
1: +  struct btrfs_balance_progress stat;
1: +  __u64 unused[72];
1:  };
1:  
1:  struct btrfs_ioctl_get_dev_stats {
1: -	__u64 devid;
1: -	__u64 nr_items;
1: -	__u64 flags;
1: -	__u64 values[5];
1: -	__u64 unused[121];
1: +  __u64 devid;
1: +  __u64 nr_items;
1: +  __u64 flags;
1: +  __u64 values[5];
1: +  __u64 unused[121];
1:  };
1:  
1:  enum btrfs_err_code {
1: -	BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET = 1,
1: -	BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET = 2,
1: -	BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET = 3,
1: -	BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET = 4,
1: -	BTRFS_ERROR_DEV_TGT_REPLACE = 5,
1: -	BTRFS_ERROR_DEV_MISSING_NOT_FOUND = 6,
1: -	BTRFS_ERROR_DEV_ONLY_WRITABLE = 7,
1: -	BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS = 8,
1: -	BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET = 9,
1: -	BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET = 10,
1: +  BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET = 1,
1: +  BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET = 2,
1: +  BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET = 3,
1: +  BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET = 4,
1: +  BTRFS_ERROR_DEV_TGT_REPLACE = 5,
1: +  BTRFS_ERROR_DEV_MISSING_NOT_FOUND = 6,
1: +  BTRFS_ERROR_DEV_ONLY_WRITABLE = 7,
1: +  BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS = 8,
1: +  BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET = 9,
1: +  BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET = 10,
1:  };
1:  
1:  struct btrfs_disk_balance_args {
1: -	__le64 profiles;
1: -	union {
1: -		__le64 usage;
1: -		struct {
1: -			__le32 usage_min;
1: -			__le32 usage_max;
1: -		};
1: -	};
1: -	__le64 devid;
1: -	__le64 pstart;
1: -	__le64 pend;
1: -	__le64 vstart;
1: -	__le64 vend;
1: -	__le64 target;
1: -	__le64 flags;
1: -	union {
1: -		__le64 limit;
1: -		struct {
1: -			__le32 limit_min;
1: -			__le32 limit_max;
1: -		};
1: -	};
1: -	__le32 stripes_min;
1: -	__le32 stripes_max;
1: -	__le64 unused[6];
1: +  __le64 profiles;
1: +  union {
1: +    __le64 usage;
1: +    struct {
1: +      __le32 usage_min;
1: +      __le32 usage_max;
1: +    };
1: +  };
1: +  __le64 devid;
1: +  __le64 pstart;
1: +  __le64 pend;
1: +  __le64 vstart;
1: +  __le64 vend;
1: +  __le64 target;
1: +  __le64 flags;
1: +  union {
1: +    __le64 limit;
1: +    struct {
1: +      __le32 limit_min;
1: +      __le32 limit_max;
1: +    };
1: +  };
1: +  __le32 stripes_min;
1: +  __le32 stripes_max;
1: +  __le64 unused[6];
1:  };
1:  
1:  struct btrfs_balance_item {
1: -	__le64 flags;
1: -	struct btrfs_disk_balance_args data;
1: -	struct btrfs_disk_balance_args meta;
1: -	struct btrfs_disk_balance_args sys;
1: -	__le64 unused[4];
1: +  __le64 flags;
1: +  struct btrfs_disk_balance_args data;
1: +  struct btrfs_disk_balance_args meta;
1: +  struct btrfs_disk_balance_args sys;
1: +  __le64 unused[4];
1:  };
1:  
1:  struct btrfs_dev_stats_item {
1: -	__le64 values[5];
1: +  __le64 values[5];
1:  };
1:  
1:  struct alloc_chunk_ctl {
1: -	u64 start;
1: -	u64 type;
1: -	int num_stripes;
1: -	int sub_stripes;
1: -	int dev_stripes;
1: -	int devs_max;
1: -	int devs_min;
1: -	int devs_increment;
1: -	int ncopies;
1: -	int nparity;
1: -	u64 max_stripe_size;
1: -	u64 max_chunk_size;
1: -	u64 dev_extent_min;
1: -	u64 stripe_size;
1: -	u64 chunk_size;
1: -	int ndevs;
1: +  u64 start;
1: +  u64 type;
1: +  int num_stripes;
1: +  int sub_stripes;
1: +  int dev_stripes;
1: +  int devs_max;
1: +  int devs_min;
1: +  int devs_increment;
1: +  int ncopies;
1: +  int nparity;
1: +  u64 max_stripe_size;
1: +  u64 max_chunk_size;
1: +  u64 dev_extent_min;
1: +  u64 stripe_size;
1: +  u64 chunk_size;
1: +  int ndevs;
1:  };
1:  
1:  struct btrfs_workqueue {
1: -	struct __btrfs_workqueue *normal;
1: -	struct __btrfs_workqueue *high;
1: +  struct __btrfs_workqueue *normal;
1: +  struct __btrfs_workqueue *high;
1:  };
1:  
1:  enum {
1: -	WORK_DONE_BIT = 0,
1: -	WORK_ORDER_DONE_BIT = 1,
1: -	WORK_HIGH_PRIO_BIT = 2,
1: +  WORK_DONE_BIT = 0,
1: +  WORK_ORDER_DONE_BIT = 1,
1: +  WORK_HIGH_PRIO_BIT = 2,
1:  };
1:  
1:  struct btrfs_ioctl_qgroup_limit_args {
1: -	__u64 qgroupid;
1: -	struct btrfs_qgroup_limit lim;
1: +  __u64 qgroupid;
1: +  struct btrfs_qgroup_limit lim;
1:  };
1:  
1:  struct btrfs_ioctl_vol_args_v2 {
1: -	__s64 fd;
1: -	__u64 transid;
1: -	__u64 flags;
1: -	union {
1: -		struct {
1: -			__u64 size;
1: -			struct btrfs_qgroup_inherit *qgroup_inherit;
1: -		};
1: -		__u64 unused[4];
1: -	};
1: -	union {
1: -		char name[4040];
1: -		__u64 devid;
1: -		__u64 subvolid;
1: -	};
1: +  __s64 fd;
1: +  __u64 transid;
1: +  __u64 flags;
1: +  union {
1: +    struct {
1: +      __u64 size;
1: +      struct btrfs_qgroup_inherit *qgroup_inherit;
1: +    };
1: +    __u64 unused[4];
1: +  };
1: +  union {
1: +    char name[4040];
1: +    __u64 devid;
1: +    __u64 subvolid;
1: +  };
1:  };
1:  
1:  struct btrfs_ioctl_scrub_args {
1: -	__u64 devid;
1: -	__u64 start;
1: -	__u64 end;
1: -	__u64 flags;
1: -	struct btrfs_scrub_progress progress;
1: -	__u64 unused[109];
1: +  __u64 devid;
1: +  __u64 start;
1: +  __u64 end;
1: +  __u64 flags;
1: +  struct btrfs_scrub_progress progress;
1: +  __u64 unused[109];
1:  };
1:  
1:  struct btrfs_ioctl_dev_replace_start_params {
1: -	__u64 srcdevid;
1: -	__u64 cont_reading_from_srcdev_mode;
1: -	__u8 srcdev_name[1025];
1: -	__u8 tgtdev_name[1025];
1: +  __u64 srcdevid;
1: +  __u64 cont_reading_from_srcdev_mode;
1: +  __u8 srcdev_name[1025];
1: +  __u8 tgtdev_name[1025];
1:  };
1:  
1:  struct btrfs_ioctl_dev_replace_status_params {
1: -	__u64 replace_state;
1: -	__u64 progress_1000;
1: -	__u64 time_started;
1: -	__u64 time_stopped;
1: -	__u64 num_write_errors;
1: -	__u64 num_uncorrectable_read_errors;
1: +  __u64 replace_state;
1: +  __u64 progress_1000;
1: +  __u64 time_started;
1: +  __u64 time_stopped;
1: +  __u64 num_write_errors;
1: +  __u64 num_uncorrectable_read_errors;
1:  };
1:  
1:  struct btrfs_ioctl_dev_replace_args {
1: -	__u64 cmd;
1: -	__u64 result;
1: -	union {
1: -		struct btrfs_ioctl_dev_replace_start_params start;
1: -		struct btrfs_ioctl_dev_replace_status_params status;
1: -	};
1: -	__u64 spare[64];
1: +  __u64 cmd;
1: +  __u64 result;
1: +  union {
1: +    struct btrfs_ioctl_dev_replace_start_params start;
1: +    struct btrfs_ioctl_dev_replace_status_params status;
1: +  };
1: +  __u64 spare[64];
1:  };
1:  
1:  struct btrfs_ioctl_dev_info_args {
1: -	__u64 devid;
1: -	__u8 uuid[16];
1: -	__u64 bytes_used;
1: -	__u64 total_bytes;
1: -	__u64 unused[379];
1: -	__u8 path[1024];
1: +  __u64 devid;
1: +  __u8 uuid[16];
1: +  __u64 bytes_used;
1: +  __u64 total_bytes;
1: +  __u64 unused[379];
1: +  __u8 path[1024];
1:  };
1:  
1:  struct btrfs_ioctl_fs_info_args {
1: -	__u64 max_id;
1: -	__u64 num_devices;
1: -	__u8 fsid[16];
1: -	__u32 nodesize;
1: -	__u32 sectorsize;
1: -	__u32 clone_alignment;
1: -	__u16 csum_type;
1: -	__u16 csum_size;
1: -	__u64 flags;
1: -	__u64 generation;
1: -	__u8 metadata_uuid[16];
1: -	__u8 reserved[944];
1: +  __u64 max_id;
1: +  __u64 num_devices;
1: +  __u8 fsid[16];
1: +  __u32 nodesize;
1: +  __u32 sectorsize;
1: +  __u32 clone_alignment;
1: +  __u16 csum_type;
1: +  __u16 csum_size;
1: +  __u64 flags;
1: +  __u64 generation;
1: +  __u8 metadata_uuid[16];
1: +  __u8 reserved[944];
1:  };
1:  
1:  struct btrfs_ioctl_feature_flags {
1: -	__u64 compat_flags;
1: -	__u64 compat_ro_flags;
1: -	__u64 incompat_flags;
1: +  __u64 compat_flags;
1: +  __u64 compat_ro_flags;
1: +  __u64 incompat_flags;
1:  };
1:  
1:  struct btrfs_ioctl_ino_lookup_args {
1: -	__u64 treeid;
1: -	__u64 objectid;
1: -	char name[4080];
1: +  __u64 treeid;
1: +  __u64 objectid;
1: +  char name[4080];
1:  };
1:  
1:  struct btrfs_ioctl_ino_lookup_user_args {
1: -	__u64 dirid;
1: -	__u64 treeid;
1: -	char name[256];
1: -	char path[3824];
1: +  __u64 dirid;
1: +  __u64 treeid;
1: +  char name[256];
1: +  char path[3824];
1:  };
1:  
1:  struct btrfs_ioctl_search_key {
1: -	__u64 tree_id;
1: -	__u64 min_objectid;
1: -	__u64 max_objectid;
1: -	__u64 min_offset;
1: -	__u64 max_offset;
1: -	__u64 min_transid;
1: -	__u64 max_transid;
1: -	__u32 min_type;
1: -	__u32 max_type;
1: -	__u32 nr_items;
1: -	__u32 unused;
1: -	__u64 unused1;
1: -	__u64 unused2;
1: -	__u64 unused3;
1: -	__u64 unused4;
1: +  __u64 tree_id;
1: +  __u64 min_objectid;
1: +  __u64 max_objectid;
1: +  __u64 min_offset;
1: +  __u64 max_offset;
1: +  __u64 min_transid;
1: +  __u64 max_transid;
1: +  __u32 min_type;
1: +  __u32 max_type;
1: +  __u32 nr_items;
1: +  __u32 unused;
1: +  __u64 unused1;
1: +  __u64 unused2;
1: +  __u64 unused3;
1: +  __u64 unused4;
1:  };
1:  
1:  struct btrfs_ioctl_search_header {
1: -	__u64 transid;
1: -	__u64 objectid;
1: -	__u64 offset;
1: -	__u32 type;
1: -	__u32 len;
1: +  __u64 transid;
1: +  __u64 objectid;
1: +  __u64 offset;
1: +  __u32 type;
1: +  __u32 len;
1:  };
1:  
1:  struct btrfs_ioctl_search_args {
1: -	struct btrfs_ioctl_search_key key;
1: -	char buf[3992];
1: +  struct btrfs_ioctl_search_key key;
1: +  char buf[3992];
1:  };
1:  
1:  struct btrfs_ioctl_search_args_v2 {
1: -	struct btrfs_ioctl_search_key key;
1: -	__u64 buf_size;
1: -	__u64 buf[0];
1: +  struct btrfs_ioctl_search_key key;
1: +  __u64 buf_size;
1: +  __u64 buf[0];
1:  };
1:  
1:  struct btrfs_ioctl_space_info {
1: -	__u64 flags;
1: -	__u64 total_bytes;
1: -	__u64 used_bytes;
1: +  __u64 flags;
1: +  __u64 total_bytes;
1: +  __u64 used_bytes;
1:  };
1:  
1:  struct btrfs_ioctl_space_args {
1: -	__u64 space_slots;
1: -	__u64 total_spaces;
1: -	struct btrfs_ioctl_space_info spaces[0];
1: +  __u64 space_slots;
1: +  __u64 total_spaces;
1: +  struct btrfs_ioctl_space_info spaces[0];
1:  };
1:  
1:  struct btrfs_data_container {
1: -	__u32 bytes_left;
1: -	__u32 bytes_missing;
1: -	__u32 elem_cnt;
1: -	__u32 elem_missed;
1: -	__u64 val[0];
1: +  __u32 bytes_left;
1: +  __u32 bytes_missing;
1: +  __u32 elem_cnt;
1: +  __u32 elem_missed;
1: +  __u64 val[0];
1:  };
1:  
1:  struct btrfs_ioctl_ino_path_args {
1: -	__u64 inum;
1: -	__u64 size;
1: -	__u64 reserved[4];
1: -	__u64 fspath;
1: +  __u64 inum;
1: +  __u64 size;
1: +  __u64 reserved[4];
1: +  __u64 fspath;
1:  };
1:  
1:  struct btrfs_ioctl_logical_ino_args {
1: -	__u64 logical;
1: -	__u64 size;
1: -	__u64 reserved[3];
1: -	__u64 flags;
1: -	__u64 inodes;
1: +  __u64 logical;
1: +  __u64 size;
1: +  __u64 reserved[3];
1: +  __u64 flags;
1: +  __u64 inodes;
1:  };
1:  
1:  struct btrfs_ioctl_quota_ctl_args {
1: -	__u64 cmd;
1: -	__u64 status;
1: +  __u64 cmd;
1: +  __u64 status;
1:  };
1:  
1:  struct btrfs_ioctl_quota_rescan_args {
1: -	__u64 flags;
1: -	__u64 progress;
1: -	__u64 reserved[6];
1: +  __u64 flags;
1: +  __u64 progress;
1: +  __u64 reserved[6];
1:  };
1:  
1:  struct btrfs_ioctl_qgroup_assign_args {
1: -	__u64 assign;
1: -	__u64 src;
1: -	__u64 dst;
1: +  __u64 assign;
1: +  __u64 src;
1: +  __u64 dst;
1:  };
1:  
1:  struct btrfs_ioctl_qgroup_create_args {
1: -	__u64 create;
1: -	__u64 qgroupid;
1: +  __u64 create;
1: +  __u64 qgroupid;
1:  };
1:  
1:  struct btrfs_ioctl_timespec {
1: -	__u64 sec;
1: -	__u32 nsec;
1: +  __u64 sec;
1: +  __u32 nsec;
1:  };
1:  
1:  struct btrfs_ioctl_received_subvol_args {
1: -	char uuid[16];
1: -	__u64 stransid;
1: -	__u64 rtransid;
1: -	struct btrfs_ioctl_timespec stime;
1: -	struct btrfs_ioctl_timespec rtime;
1: -	__u64 flags;
1: -	__u64 reserved[16];
1: +  char uuid[16];
1: +  __u64 stransid;
1: +  __u64 rtransid;
1: +  struct btrfs_ioctl_timespec stime;
1: +  struct btrfs_ioctl_timespec rtime;
1: +  __u64 flags;
1: +  __u64 reserved[16];
1:  };
1:  
1:  struct btrfs_ioctl_send_args {
1: -	__s64 send_fd;
1: -	__u64 clone_sources_count;
1: -	__u64 *clone_sources;
1: -	__u64 parent_root;
1: -	__u64 flags;
1: -	__u64 reserved[4];
1: +  __s64 send_fd;
1: +  __u64 clone_sources_count;
1: +  __u64 *clone_sources;
1: +  __u64 parent_root;
1: +  __u64 flags;
1: +  __u64 reserved[4];
1:  };
1:  
1:  struct btrfs_ioctl_get_subvol_info_args {
1: -	__u64 treeid;
1: -	char name[256];
1: -	__u64 parent_id;
1: -	__u64 dirid;
1: -	__u64 generation;
1: -	__u64 flags;
1: -	__u8 uuid[16];
1: -	__u8 parent_uuid[16];
1: -	__u8 received_uuid[16];
1: -	__u64 ctransid;
1: -	__u64 otransid;
1: -	__u64 stransid;
1: -	__u64 rtransid;
1: -	struct btrfs_ioctl_timespec ctime;
1: -	struct btrfs_ioctl_timespec otime;
1: -	struct btrfs_ioctl_timespec stime;
1: -	struct btrfs_ioctl_timespec rtime;
1: -	__u64 reserved[8];
1: +  __u64 treeid;
1: +  char name[256];
1: +  __u64 parent_id;
1: +  __u64 dirid;
1: +  __u64 generation;
1: +  __u64 flags;
1: +  __u8 uuid[16];
1: +  __u8 parent_uuid[16];
1: +  __u8 received_uuid[16];
1: +  __u64 ctransid;
1: +  __u64 otransid;
1: +  __u64 stransid;
1: +  __u64 rtransid;
1: +  struct btrfs_ioctl_timespec ctime;
1: +  struct btrfs_ioctl_timespec otime;
1: +  struct btrfs_ioctl_timespec stime;
1: +  struct btrfs_ioctl_timespec rtime;
1: +  __u64 reserved[8];
1:  };
1:  
1:  struct btrfs_ioctl_get_subvol_rootref_args {
1: -	__u64 min_treeid;
1: -	struct {
1: -		__u64 treeid;
1: -		__u64 dirid;
1: -	} rootref[255];
1: -	__u8 num_items;
1: -	__u8 align[7];
1: +  __u64 min_treeid;
1: +  struct {
1: +    __u64 treeid;
1: +    __u64 dirid;
1: +  } rootref[255];
1: +  __u8 num_items;
1: +  __u8 align[7];
1:  };
1:  
1:  struct inode_fs_paths {
1: -	struct btrfs_path *btrfs_path;
1: -	struct btrfs_root *fs_root;
1: -	struct btrfs_data_container *fspath;
1: +  struct btrfs_path *btrfs_path;
1: +  struct btrfs_root *fs_root;
1: +  struct btrfs_data_container *fspath;
1:  };
1:  
1:  struct btrfs_ioctl_timespec_32 {
1: -	__u64 sec;
1: -	__u32 nsec;
1: +  __u64 sec;
1: +  __u32 nsec;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_ioctl_received_subvol_args_32 {
1: -	char uuid[16];
1: -	__u64 stransid;
1: -	__u64 rtransid;
1: -	struct btrfs_ioctl_timespec_32 stime;
1: -	struct btrfs_ioctl_timespec_32 rtime;
1: -	__u64 flags;
1: -	__u64 reserved[16];
1: +  char uuid[16];
1: +  __u64 stransid;
1: +  __u64 rtransid;
1: +  struct btrfs_ioctl_timespec_32 stime;
1: +  struct btrfs_ioctl_timespec_32 rtime;
1: +  __u64 flags;
1: +  __u64 reserved[16];
1:  } __attribute__((packed));
1:  
1:  struct btrfs_ioctl_send_args_32 {
1: -	__s64 send_fd;
1: -	__u64 clone_sources_count;
1: -	compat_uptr_t clone_sources;
1: -	__u64 parent_root;
1: -	__u64 flags;
1: -	__u64 reserved[4];
1: +  __s64 send_fd;
1: +  __u64 clone_sources_count;
1: +  compat_uptr_t clone_sources;
1: +  __u64 parent_root;
1: +  __u64 flags;
1: +  __u64 reserved[4];
1:  } __attribute__((packed));
1:  
1:  struct btrfs_trans_handle___2;
1:  
1:  struct btrfs_fid {
1: -	u64 objectid;
1: -	u64 root_objectid;
1: -	u32 gen;
1: -	u64 parent_objectid;
1: -	u32 parent_gen;
1: -	u64 parent_root_objectid;
1: +  u64 objectid;
1: +  u64 root_objectid;
1: +  u32 gen;
1: +  u64 parent_objectid;
1: +  u32 parent_gen;
1: +  u64 parent_root_objectid;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_dir_log_item {
1: -	__le64 end;
1: +  __le64 end;
1:  };
1:  
1:  enum {
1: -	LOG_INODE_ALL = 0,
1: -	LOG_INODE_EXISTS = 1,
1: -	LOG_OTHER_INODE = 2,
1: -	LOG_OTHER_INODE_ALL = 3,
1: +  LOG_INODE_ALL = 0,
1: +  LOG_INODE_EXISTS = 1,
1: +  LOG_OTHER_INODE = 2,
1: +  LOG_OTHER_INODE_ALL = 3,
1:  };
1:  
1:  enum {
1: -	LOG_WALK_PIN_ONLY = 0,
1: -	LOG_WALK_REPLAY_INODES = 1,
1: -	LOG_WALK_REPLAY_DIR_INDEX = 2,
1: -	LOG_WALK_REPLAY_ALL = 3,
1: +  LOG_WALK_PIN_ONLY = 0,
1: +  LOG_WALK_REPLAY_INODES = 1,
1: +  LOG_WALK_REPLAY_DIR_INDEX = 2,
1: +  LOG_WALK_REPLAY_ALL = 3,
1:  };
1:  
1:  struct walk_control___2 {
1: -	int free;
1: -	int write;
1: -	int wait;
1: -	int pin;
1: -	int stage;
1: -	bool ignore_cur_inode;
1: -	struct btrfs_root *replay_dest;
1: -	struct btrfs_trans_handle *trans;
1: -	int (*process_func)(struct btrfs_root *, struct extent_buffer *, struct walk_control___2 *, u64, int);
1: +  int free;
1: +  int write;
1: +  int wait;
1: +  int pin;
1: +  int stage;
1: +  bool ignore_cur_inode;
1: +  struct btrfs_root *replay_dest;
1: +  struct btrfs_trans_handle *trans;
1: +  int (*process_func)(struct btrfs_root *, struct extent_buffer *,
1: +                      struct walk_control___2 *, u64, int);
1:  };
1:  
1:  struct btrfs_ino_list {
1: -	u64 ino;
1: -	u64 parent;
1: -	struct list_head list;
1: +  u64 ino;
1: +  u64 parent;
1: +  struct list_head list;
1:  };
1:  
1:  struct btrfs_dir_list {
1: -	u64 ino;
1: -	struct list_head list;
1: +  u64 ino;
1: +  struct list_head list;
1:  };
1:  
1:  struct btrfs_free_space_entry {
1: -	__le64 offset;
1: -	__le64 bytes;
1: -	__u8 type;
1: +  __le64 offset;
1: +  __le64 bytes;
1: +  __u8 type;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_free_space_header {
1: -	struct btrfs_disk_key location;
1: -	__le64 generation;
1: -	__le64 num_entries;
1: -	__le64 num_bitmaps;
1: +  struct btrfs_disk_key location;
1: +  __le64 generation;
1: +  __le64 num_entries;
1: +  __le64 num_bitmaps;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_trim_range {
1: -	u64 start;
1: -	u64 bytes;
1: -	struct list_head list;
1: +  u64 start;
1: +  u64 bytes;
1: +  struct list_head list;
1:  };
1:  
1:  struct compressed_bio {
1: -	refcount_t pending_bios;
1: -	struct page **compressed_pages;
1: -	struct inode *inode;
1: -	u64 start;
1: -	long unsigned int len;
1: -	long unsigned int compressed_len;
1: -	int compress_type;
1: -	long unsigned int nr_pages;
1: -	int errors;
1: -	int mirror_num;
1: -	struct bio *orig_bio;
1: -	u8 sums[0];
1: +  refcount_t pending_bios;
1: +  struct page **compressed_pages;
1: +  struct inode *inode;
1: +  u64 start;
1: +  long unsigned int len;
1: +  long unsigned int compressed_len;
1: +  int compress_type;
1: +  long unsigned int nr_pages;
1: +  int errors;
1: +  int mirror_num;
1: +  struct bio *orig_bio;
1: +  u8 sums[0];
1:  };
1:  
1:  struct workspace_manager {
1: -	struct list_head idle_ws;
1: -	spinlock_t ws_lock;
1: -	int free_ws;
1: -	atomic_t total_ws;
1: -	wait_queue_head_t ws_wait;
1: +  struct list_head idle_ws;
1: +  spinlock_t ws_lock;
1: +  int free_ws;
1: +  atomic_t total_ws;
1: +  wait_queue_head_t ws_wait;
1:  };
1:  
1:  struct btrfs_compress_op {
1: -	struct workspace_manager *workspace_manager;
1: -	unsigned int max_level;
1: -	unsigned int default_level;
1: +  struct workspace_manager *workspace_manager;
1: +  unsigned int max_level;
1: +  unsigned int default_level;
1:  };
1:  
1:  struct workspace {
1: -	z_stream strm;
1: -	char *buf;
1: -	unsigned int buf_size;
1: -	struct list_head list;
1: -	int level;
1: +  z_stream strm;
1: +  char *buf;
1: +  unsigned int buf_size;
1: +  struct list_head list;
1: +  int level;
1:  };
1:  
1:  struct workspace___2 {
1: -	void *mem;
1: -	void *buf;
1: -	void *cbuf;
1: -	struct list_head list;
1: +  void *mem;
1: +  void *buf;
1: +  void *cbuf;
1: +  struct list_head list;
1:  };
1:  
1:  typedef enum {
1: -	ZSTD_fast = 0,
1: -	ZSTD_dfast = 1,
1: -	ZSTD_greedy = 2,
1: -	ZSTD_lazy = 3,
1: -	ZSTD_lazy2 = 4,
1: -	ZSTD_btlazy2 = 5,
1: -	ZSTD_btopt = 6,
1: -	ZSTD_btopt2 = 7,
1: +  ZSTD_fast = 0,
1: +  ZSTD_dfast = 1,
1: +  ZSTD_greedy = 2,
1: +  ZSTD_lazy = 3,
1: +  ZSTD_lazy2 = 4,
1: +  ZSTD_btlazy2 = 5,
1: +  ZSTD_btopt = 6,
1: +  ZSTD_btopt2 = 7,
1:  } ZSTD_strategy;
1:  
1:  typedef struct {
1: -	unsigned int windowLog;
1: -	unsigned int chainLog;
1: -	unsigned int hashLog;
1: -	unsigned int searchLog;
1: -	unsigned int searchLength;
1: -	unsigned int targetLength;
1: -	ZSTD_strategy strategy;
1: +  unsigned int windowLog;
1: +  unsigned int chainLog;
1: +  unsigned int hashLog;
1: +  unsigned int searchLog;
1: +  unsigned int searchLength;
1: +  unsigned int targetLength;
1: +  ZSTD_strategy strategy;
1:  } ZSTD_compressionParameters;
1:  
1:  typedef struct {
1: -	unsigned int contentSizeFlag;
1: -	unsigned int checksumFlag;
1: -	unsigned int noDictIDFlag;
1: +  unsigned int contentSizeFlag;
1: +  unsigned int checksumFlag;
1: +  unsigned int noDictIDFlag;
1:  } ZSTD_frameParameters;
1:  
1:  typedef struct {
1: -	ZSTD_compressionParameters cParams;
1: -	ZSTD_frameParameters fParams;
1: +  ZSTD_compressionParameters cParams;
1: +  ZSTD_frameParameters fParams;
1:  } ZSTD_parameters;
1:  
1:  struct ZSTD_inBuffer_s {
1: -	const void *src;
1: -	size_t size;
1: -	size_t pos;
1: +  const void *src;
1: +  size_t size;
1: +  size_t pos;
1:  };
1:  
1:  typedef struct ZSTD_inBuffer_s ZSTD_inBuffer;
1:  
1:  struct ZSTD_outBuffer_s {
1: -	void *dst;
1: -	size_t size;
1: -	size_t pos;
1: +  void *dst;
1: +  size_t size;
1: +  size_t pos;
1:  };
1:  
1:  typedef struct ZSTD_outBuffer_s ZSTD_outBuffer;
1: @@ -55988,656 +56878,658 @@ struct ZSTD_DStream_s;
1:  typedef struct ZSTD_DStream_s ZSTD_DStream;
1:  
1:  struct workspace___3 {
1: -	void *mem;
1: -	size_t size;
1: -	char *buf;
1: -	unsigned int level;
1: -	unsigned int req_level;
1: -	long unsigned int last_used;
1: -	struct list_head list;
1: -	struct list_head lru_list;
1: -	ZSTD_inBuffer in_buf;
1: -	ZSTD_outBuffer out_buf;
1: +  void *mem;
1: +  size_t size;
1: +  char *buf;
1: +  unsigned int level;
1: +  unsigned int req_level;
1: +  long unsigned int last_used;
1: +  struct list_head list;
1: +  struct list_head lru_list;
1: +  ZSTD_inBuffer in_buf;
1: +  ZSTD_outBuffer out_buf;
1:  };
1:  
1:  struct zstd_workspace_manager {
1: -	const struct btrfs_compress_op *ops;
1: -	spinlock_t lock;
1: -	struct list_head lru_list;
1: -	struct list_head idle_ws[15];
1: -	long unsigned int active_map;
1: -	wait_queue_head_t wait;
1: -	struct timer_list timer;
1: +  const struct btrfs_compress_op *ops;
1: +  spinlock_t lock;
1: +  struct list_head lru_list;
1: +  struct list_head idle_ws[15];
1: +  long unsigned int active_map;
1: +  wait_queue_head_t wait;
1: +  struct timer_list timer;
1:  };
1:  
1:  struct bucket_item {
1: -	u32 count;
1: +  u32 count;
1:  };
1:  
1:  struct heuristic_ws {
1: -	u8 *sample;
1: -	u32 sample_size;
1: -	struct bucket_item *bucket;
1: -	struct bucket_item *bucket_b;
1: -	struct list_head list;
1: +  u8 *sample;
1: +  u32 sample_size;
1: +  struct bucket_item *bucket;
1: +  struct bucket_item *bucket_b;
1: +  struct list_head list;
1:  };
1:  
1:  struct ulist_iterator {
1: -	struct list_head *cur_list;
1: +  struct list_head *cur_list;
1:  };
1:  
1:  struct ulist_node {
1: -	u64 val;
1: -	u64 aux;
1: -	struct list_head list;
1: -	struct rb_node rb_node;
1: +  u64 val;
1: +  u64 aux;
1: +  struct list_head list;
1: +  struct rb_node rb_node;
1:  };
1:  
1:  struct btrfs_backref_node;
1:  
1:  struct btrfs_backref_cache {
1: -	struct rb_root rb_root;
1: -	struct btrfs_backref_node *path[8];
1: -	struct list_head pending[8];
1: -	struct list_head leaves;
1: -	struct list_head changed;
1: -	struct list_head detached;
1: -	u64 last_trans;
1: -	int nr_nodes;
1: -	int nr_edges;
1: -	struct list_head pending_edge;
1: -	struct list_head useless_node;
1: -	struct btrfs_fs_info *fs_info;
1: -	unsigned int is_reloc;
1: +  struct rb_root rb_root;
1: +  struct btrfs_backref_node *path[8];
1: +  struct list_head pending[8];
1: +  struct list_head leaves;
1: +  struct list_head changed;
1: +  struct list_head detached;
1: +  u64 last_trans;
1: +  int nr_nodes;
1: +  int nr_edges;
1: +  struct list_head pending_edge;
1: +  struct list_head useless_node;
1: +  struct btrfs_fs_info *fs_info;
1: +  unsigned int is_reloc;
1:  };
1:  
1:  struct file_extent_cluster {
1: -	u64 start;
1: -	u64 end;
1: -	u64 boundary[128];
1: -	unsigned int nr;
1: +  u64 start;
1: +  u64 end;
1: +  u64 boundary[128];
1: +  unsigned int nr;
1:  };
1:  
1:  struct mapping_tree {
1: -	struct rb_root rb_root;
1: -	spinlock_t lock;
1: +  struct rb_root rb_root;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct reloc_control {
1: -	struct btrfs_block_group *block_group;
1: -	struct btrfs_root *extent_root;
1: -	struct inode *data_inode;
1: -	struct btrfs_block_rsv *block_rsv;
1: -	struct btrfs_backref_cache backref_cache;
1: -	struct file_extent_cluster cluster;
1: -	struct extent_io_tree processed_blocks;
1: -	struct mapping_tree reloc_root_tree;
1: -	struct list_head reloc_roots;
1: -	struct list_head dirty_subvol_roots;
1: -	u64 merging_rsv_size;
1: -	u64 nodes_relocated;
1: -	u64 reserved_bytes;
1: -	u64 search_start;
1: -	u64 extents_found;
1: -	unsigned int stage: 8;
1: -	unsigned int create_reloc_tree: 1;
1: -	unsigned int merge_reloc_tree: 1;
1: -	unsigned int found_file_extent: 1;
1: +  struct btrfs_block_group *block_group;
1: +  struct btrfs_root *extent_root;
1: +  struct inode *data_inode;
1: +  struct btrfs_block_rsv *block_rsv;
1: +  struct btrfs_backref_cache backref_cache;
1: +  struct file_extent_cluster cluster;
1: +  struct extent_io_tree processed_blocks;
1: +  struct mapping_tree reloc_root_tree;
1: +  struct list_head reloc_roots;
1: +  struct list_head dirty_subvol_roots;
1: +  u64 merging_rsv_size;
1: +  u64 nodes_relocated;
1: +  u64 reserved_bytes;
1: +  u64 search_start;
1: +  u64 extents_found;
1: +  unsigned int stage : 8;
1: +  unsigned int create_reloc_tree : 1;
1: +  unsigned int merge_reloc_tree : 1;
1: +  unsigned int found_file_extent : 1;
1:  };
1:  
1:  struct btrfs_backref_iter {
1: -	u64 bytenr;
1: -	struct btrfs_path *path;
1: -	struct btrfs_fs_info *fs_info;
1: -	struct btrfs_key cur_key;
1: -	u32 item_ptr;
1: -	u32 cur_ptr;
1: -	u32 end_ptr;
1: +  u64 bytenr;
1: +  struct btrfs_path *path;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct btrfs_key cur_key;
1: +  u32 item_ptr;
1: +  u32 cur_ptr;
1: +  u32 end_ptr;
1:  };
1:  
1:  struct btrfs_backref_node {
1: -	struct {
1: -		struct rb_node rb_node;
1: -		u64 bytenr;
1: -	};
1: -	u64 new_bytenr;
1: -	u64 owner;
1: -	struct list_head list;
1: -	struct list_head upper;
1: -	struct list_head lower;
1: -	struct btrfs_root *root;
1: -	struct extent_buffer *eb;
1: -	unsigned int level: 8;
1: -	unsigned int cowonly: 1;
1: -	unsigned int lowest: 1;
1: -	unsigned int locked: 1;
1: -	unsigned int processed: 1;
1: -	unsigned int checked: 1;
1: -	unsigned int pending: 1;
1: -	unsigned int detached: 1;
1: -	unsigned int is_reloc_root: 1;
1: +  struct {
1: +    struct rb_node rb_node;
1: +    u64 bytenr;
1: +  };
1: +  u64 new_bytenr;
1: +  u64 owner;
1: +  struct list_head list;
1: +  struct list_head upper;
1: +  struct list_head lower;
1: +  struct btrfs_root *root;
1: +  struct extent_buffer *eb;
1: +  unsigned int level : 8;
1: +  unsigned int cowonly : 1;
1: +  unsigned int lowest : 1;
1: +  unsigned int locked : 1;
1: +  unsigned int processed : 1;
1: +  unsigned int checked : 1;
1: +  unsigned int pending : 1;
1: +  unsigned int detached : 1;
1: +  unsigned int is_reloc_root : 1;
1:  };
1:  
1:  struct btrfs_backref_edge {
1: -	struct list_head list[2];
1: -	struct btrfs_backref_node *node[2];
1: +  struct list_head list[2];
1: +  struct btrfs_backref_node *node[2];
1:  };
1:  
1:  struct rb_simple_node {
1: -	struct rb_node rb_node;
1: -	u64 bytenr;
1: +  struct rb_node rb_node;
1: +  u64 bytenr;
1:  };
1:  
1:  struct mapping_node {
1: -	struct {
1: -		struct rb_node rb_node;
1: -		u64 bytenr;
1: -	};
1: -	void *data;
1: +  struct {
1: +    struct rb_node rb_node;
1: +    u64 bytenr;
1: +  };
1: +  void *data;
1:  };
1:  
1:  struct tree_block {
1: -	struct {
1: -		struct rb_node rb_node;
1: -		u64 bytenr;
1: -	};
1: -	struct btrfs_key key;
1: -	unsigned int level: 8;
1: -	unsigned int key_ready: 1;
1: +  struct {
1: +    struct rb_node rb_node;
1: +    u64 bytenr;
1: +  };
1: +  struct btrfs_key key;
1: +  unsigned int level : 8;
1: +  unsigned int key_ready : 1;
1:  };
1:  
1:  struct btrfs_delayed_item {
1: -	struct rb_node rb_node;
1: -	struct btrfs_key key;
1: -	struct list_head tree_list;
1: -	struct list_head readdir_list;
1: -	u64 bytes_reserved;
1: -	struct btrfs_delayed_node *delayed_node;
1: -	refcount_t refs;
1: -	int ins_or_del;
1: -	u32 data_len;
1: -	char data[0];
1: +  struct rb_node rb_node;
1: +  struct btrfs_key key;
1: +  struct list_head tree_list;
1: +  struct list_head readdir_list;
1: +  u64 bytes_reserved;
1: +  struct btrfs_delayed_node *delayed_node;
1: +  refcount_t refs;
1: +  int ins_or_del;
1: +  u32 data_len;
1: +  char data[0];
1:  };
1:  
1:  struct btrfs_async_delayed_work {
1: -	struct btrfs_delayed_root *delayed_root;
1: -	int nr;
1: -	struct btrfs_work work;
1: +  struct btrfs_delayed_root *delayed_root;
1: +  int nr;
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct reada_control {
1: -	struct btrfs_fs_info *fs_info;
1: -	struct btrfs_key key_start;
1: -	struct btrfs_key key_end;
1: -	short: 16;
1: -	atomic_t elems;
1: -	struct kref refcnt;
1: -	int: 32;
1: -	wait_queue_head_t wait;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct btrfs_key key_start;
1: +  struct btrfs_key key_end;
1: +  short : 16;
1: +  atomic_t elems;
1: +  struct kref refcnt;
1: +  int : 32;
1: +  wait_queue_head_t wait;
1:  } __attribute__((packed));
1:  
1:  struct scrub_bio;
1:  
1:  struct scrub_ctx {
1: -	struct scrub_bio *bios[64];
1: -	struct btrfs_fs_info *fs_info;
1: -	int first_free;
1: -	int curr;
1: -	atomic_t bios_in_flight;
1: -	atomic_t workers_pending;
1: -	spinlock_t list_lock;
1: -	wait_queue_head_t list_wait;
1: -	u16 csum_size;
1: -	struct list_head csum_list;
1: -	atomic_t cancel_req;
1: -	int readonly;
1: -	int pages_per_rd_bio;
1: -	int is_dev_replace;
1: -	struct scrub_bio *wr_curr_bio;
1: -	struct mutex wr_lock;
1: -	int pages_per_wr_bio;
1: -	struct btrfs_device *wr_tgtdev;
1: -	bool flush_all_writes;
1: -	struct btrfs_scrub_progress stat;
1: -	spinlock_t stat_lock;
1: -	refcount_t refs;
1: +  struct scrub_bio *bios[64];
1: +  struct btrfs_fs_info *fs_info;
1: +  int first_free;
1: +  int curr;
1: +  atomic_t bios_in_flight;
1: +  atomic_t workers_pending;
1: +  spinlock_t list_lock;
1: +  wait_queue_head_t list_wait;
1: +  u16 csum_size;
1: +  struct list_head csum_list;
1: +  atomic_t cancel_req;
1: +  int readonly;
1: +  int pages_per_rd_bio;
1: +  int is_dev_replace;
1: +  struct scrub_bio *wr_curr_bio;
1: +  struct mutex wr_lock;
1: +  int pages_per_wr_bio;
1: +  struct btrfs_device *wr_tgtdev;
1: +  bool flush_all_writes;
1: +  struct btrfs_scrub_progress stat;
1: +  spinlock_t stat_lock;
1: +  refcount_t refs;
1:  };
1:  
1:  struct scrub_recover {
1: -	refcount_t refs;
1: -	struct btrfs_bio *bbio;
1: -	u64 map_length;
1: +  refcount_t refs;
1: +  struct btrfs_bio *bbio;
1: +  u64 map_length;
1:  };
1:  
1:  struct scrub_block;
1:  
1:  struct scrub_page {
1: -	struct scrub_block *sblock;
1: -	struct page *page;
1: -	struct btrfs_device *dev;
1: -	struct list_head list;
1: -	u64 flags;
1: -	u64 generation;
1: -	u64 logical;
1: -	u64 physical;
1: -	u64 physical_for_dev_replace;
1: -	atomic_t refs;
1: -	struct {
1: -		unsigned int mirror_num: 8;
1: -		unsigned int have_csum: 1;
1: -		unsigned int io_error: 1;
1: -	};
1: -	u8 csum[32];
1: -	struct scrub_recover *recover;
1: +  struct scrub_block *sblock;
1: +  struct page *page;
1: +  struct btrfs_device *dev;
1: +  struct list_head list;
1: +  u64 flags;
1: +  u64 generation;
1: +  u64 logical;
1: +  u64 physical;
1: +  u64 physical_for_dev_replace;
1: +  atomic_t refs;
1: +  struct {
1: +    unsigned int mirror_num : 8;
1: +    unsigned int have_csum : 1;
1: +    unsigned int io_error : 1;
1: +  };
1: +  u8 csum[32];
1: +  struct scrub_recover *recover;
1:  };
1:  
1:  struct scrub_parity;
1:  
1:  struct scrub_block {
1: -	struct scrub_page *pagev[16];
1: -	int page_count;
1: -	atomic_t outstanding_pages;
1: -	refcount_t refs;
1: -	struct scrub_ctx *sctx;
1: -	struct scrub_parity *sparity;
1: -	struct {
1: -		unsigned int header_error: 1;
1: -		unsigned int checksum_error: 1;
1: -		unsigned int no_io_error_seen: 1;
1: -		unsigned int generation_error: 1;
1: -		unsigned int data_corrected: 1;
1: -	};
1: -	struct btrfs_work work;
1: +  struct scrub_page *pagev[16];
1: +  int page_count;
1: +  atomic_t outstanding_pages;
1: +  refcount_t refs;
1: +  struct scrub_ctx *sctx;
1: +  struct scrub_parity *sparity;
1: +  struct {
1: +    unsigned int header_error : 1;
1: +    unsigned int checksum_error : 1;
1: +    unsigned int no_io_error_seen : 1;
1: +    unsigned int generation_error : 1;
1: +    unsigned int data_corrected : 1;
1: +  };
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct scrub_bio {
1: -	int index;
1: -	struct scrub_ctx *sctx;
1: -	struct btrfs_device *dev;
1: -	struct bio *bio;
1: -	blk_status_t status;
1: -	u64 logical;
1: -	u64 physical;
1: -	struct scrub_page *pagev[32];
1: -	int page_count;
1: -	int next_free;
1: -	struct btrfs_work work;
1: +  int index;
1: +  struct scrub_ctx *sctx;
1: +  struct btrfs_device *dev;
1: +  struct bio *bio;
1: +  blk_status_t status;
1: +  u64 logical;
1: +  u64 physical;
1: +  struct scrub_page *pagev[32];
1: +  int page_count;
1: +  int next_free;
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct scrub_parity {
1: -	struct scrub_ctx *sctx;
1: -	struct btrfs_device *scrub_dev;
1: -	u64 logic_start;
1: -	u64 logic_end;
1: -	int nsectors;
1: -	u64 stripe_len;
1: -	refcount_t refs;
1: -	struct list_head spages;
1: -	struct btrfs_work work;
1: -	long unsigned int *dbitmap;
1: -	long unsigned int *ebitmap;
1: -	long unsigned int bitmap[0];
1: +  struct scrub_ctx *sctx;
1: +  struct btrfs_device *scrub_dev;
1: +  u64 logic_start;
1: +  u64 logic_end;
1: +  int nsectors;
1: +  u64 stripe_len;
1: +  refcount_t refs;
1: +  struct list_head spages;
1: +  struct btrfs_work work;
1: +  long unsigned int *dbitmap;
1: +  long unsigned int *ebitmap;
1: +  long unsigned int bitmap[0];
1:  };
1:  
1:  struct scrub_warning {
1: -	struct btrfs_path *path;
1: -	u64 extent_item_size;
1: -	const char *errstr;
1: -	u64 physical;
1: -	u64 logical;
1: -	struct btrfs_device *dev;
1: +  struct btrfs_path *path;
1: +  u64 extent_item_size;
1: +  const char *errstr;
1: +  u64 physical;
1: +  u64 logical;
1: +  struct btrfs_device *dev;
1:  };
1:  
1:  struct full_stripe_lock {
1: -	struct rb_node node;
1: -	u64 logical;
1: -	u64 refs;
1: -	struct mutex mutex;
1: +  struct rb_node node;
1: +  u64 logical;
1: +  u64 refs;
1: +  struct mutex mutex;
1:  };
1:  
1:  struct btrfs_raid_bio;
1:  
1:  struct reada_zone {
1: -	u64 start;
1: -	u64 end;
1: -	u64 elems;
1: -	struct list_head list;
1: -	spinlock_t lock;
1: -	int locked;
1: -	struct btrfs_device *device;
1: -	struct btrfs_device *devs[5];
1: -	int ndevs;
1: -	struct kref refcnt;
1: +  u64 start;
1: +  u64 end;
1: +  u64 elems;
1: +  struct list_head list;
1: +  spinlock_t lock;
1: +  int locked;
1: +  struct btrfs_device *device;
1: +  struct btrfs_device *devs[5];
1: +  int ndevs;
1: +  struct kref refcnt;
1:  };
1:  
1:  struct reada_extctl {
1: -	struct list_head list;
1: -	struct reada_control *rc;
1: -	u64 generation;
1: +  struct list_head list;
1: +  struct reada_control *rc;
1: +  u64 generation;
1:  };
1:  
1:  struct reada_extent {
1: -	u64 logical;
1: -	struct btrfs_key top;
1: -	struct list_head extctl;
1: -	int refcnt;
1: -	spinlock_t lock;
1: -	struct reada_zone *zones[5];
1: -	int nzones;
1: -	int scheduled;
1: +  u64 logical;
1: +  struct btrfs_key top;
1: +  struct list_head extctl;
1: +  int refcnt;
1: +  spinlock_t lock;
1: +  struct reada_zone *zones[5];
1: +  int nzones;
1: +  int scheduled;
1:  };
1:  
1:  struct reada_machine_work {
1: -	struct btrfs_work work;
1: -	struct btrfs_fs_info *fs_info;
1: +  struct btrfs_work work;
1: +  struct btrfs_fs_info *fs_info;
1:  };
1:  
1:  typedef int iterate_extent_inodes_t(u64, u64, u64, void *);
1:  
1:  struct extent_inode_elem {
1: -	u64 inum;
1: -	u64 offset;
1: -	struct extent_inode_elem *next;
1: +  u64 inum;
1: +  u64 offset;
1: +  struct extent_inode_elem *next;
1:  };
1:  
1:  struct preftree {
1: -	struct rb_root_cached root;
1: -	unsigned int count;
1: +  struct rb_root_cached root;
1: +  unsigned int count;
1:  };
1:  
1:  struct preftrees {
1: -	struct preftree direct;
1: -	struct preftree indirect;
1: -	struct preftree indirect_missing_keys;
1: +  struct preftree direct;
1: +  struct preftree indirect;
1: +  struct preftree indirect_missing_keys;
1:  };
1:  
1:  struct share_check {
1: -	u64 root_objectid;
1: -	u64 inum;
1: -	int share_count;
1: +  u64 root_objectid;
1: +  u64 inum;
1: +  int share_count;
1:  };
1:  
1: -typedef int iterate_irefs_t(u64, u32, long unsigned int, struct extent_buffer *, void *);
1: +typedef int iterate_irefs_t(u64, u32, long unsigned int, struct extent_buffer *,
1: +                            void *);
1:  
1:  struct btrfs_qgroup_status_item {
1: -	__le64 version;
1: -	__le64 generation;
1: -	__le64 flags;
1: -	__le64 rescan;
1: +  __le64 version;
1: +  __le64 generation;
1: +  __le64 flags;
1: +  __le64 rescan;
1:  };
1:  
1:  struct btrfs_qgroup_info_item {
1: -	__le64 generation;
1: -	__le64 rfer;
1: -	__le64 rfer_cmpr;
1: -	__le64 excl;
1: -	__le64 excl_cmpr;
1: +  __le64 generation;
1: +  __le64 rfer;
1: +  __le64 rfer_cmpr;
1: +  __le64 excl;
1: +  __le64 excl_cmpr;
1:  };
1:  
1:  struct btrfs_qgroup_limit_item {
1: -	__le64 flags;
1: -	__le64 max_rfer;
1: -	__le64 max_excl;
1: -	__le64 rsv_rfer;
1: -	__le64 rsv_excl;
1: +  __le64 flags;
1: +  __le64 max_rfer;
1: +  __le64 max_excl;
1: +  __le64 rsv_rfer;
1: +  __le64 rsv_excl;
1:  };
1:  
1:  struct btrfs_qgroup_swapped_block {
1: -	struct rb_node node;
1: -	int level;
1: -	bool trace_leaf;
1: -	u64 subvol_bytenr;
1: -	u64 subvol_generation;
1: -	u64 reloc_bytenr;
1: -	u64 reloc_generation;
1: -	u64 last_snapshot;
1: -	struct btrfs_key first_key;
1: +  struct rb_node node;
1: +  int level;
1: +  bool trace_leaf;
1: +  u64 subvol_bytenr;
1: +  u64 subvol_generation;
1: +  u64 reloc_bytenr;
1: +  u64 reloc_generation;
1: +  u64 last_snapshot;
1: +  struct btrfs_key first_key;
1:  };
1:  
1:  struct btrfs_qgroup_list {
1: -	struct list_head next_group;
1: -	struct list_head next_member;
1: -	struct btrfs_qgroup *group;
1: -	struct btrfs_qgroup *member;
1: +  struct list_head next_group;
1: +  struct list_head next_member;
1: +  struct btrfs_qgroup *group;
1: +  struct btrfs_qgroup *member;
1:  };
1:  
1:  struct btrfs_stream_header {
1: -	char magic[13];
1: -	__le32 version;
1: +  char magic[13];
1: +  __le32 version;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_cmd_header {
1: -	__le32 len;
1: -	__le16 cmd;
1: -	__le32 crc;
1: +  __le32 len;
1: +  __le16 cmd;
1: +  __le32 crc;
1:  } __attribute__((packed));
1:  
1:  struct btrfs_tlv_header {
1: -	__le16 tlv_type;
1: -	__le16 tlv_len;
1: +  __le16 tlv_type;
1: +  __le16 tlv_len;
1:  };
1:  
1:  enum btrfs_send_cmd {
1: -	BTRFS_SEND_C_UNSPEC = 0,
1: -	BTRFS_SEND_C_SUBVOL = 1,
1: -	BTRFS_SEND_C_SNAPSHOT = 2,
1: -	BTRFS_SEND_C_MKFILE = 3,
1: -	BTRFS_SEND_C_MKDIR = 4,
1: -	BTRFS_SEND_C_MKNOD = 5,
1: -	BTRFS_SEND_C_MKFIFO = 6,
1: -	BTRFS_SEND_C_MKSOCK = 7,
1: -	BTRFS_SEND_C_SYMLINK = 8,
1: -	BTRFS_SEND_C_RENAME = 9,
1: -	BTRFS_SEND_C_LINK = 10,
1: -	BTRFS_SEND_C_UNLINK = 11,
1: -	BTRFS_SEND_C_RMDIR = 12,
1: -	BTRFS_SEND_C_SET_XATTR = 13,
1: -	BTRFS_SEND_C_REMOVE_XATTR = 14,
1: -	BTRFS_SEND_C_WRITE = 15,
1: -	BTRFS_SEND_C_CLONE = 16,
1: -	BTRFS_SEND_C_TRUNCATE = 17,
1: -	BTRFS_SEND_C_CHMOD = 18,
1: -	BTRFS_SEND_C_CHOWN = 19,
1: -	BTRFS_SEND_C_UTIMES = 20,
1: -	BTRFS_SEND_C_END = 21,
1: -	BTRFS_SEND_C_UPDATE_EXTENT = 22,
1: -	__BTRFS_SEND_C_MAX = 23,
1: -};
1: -
1: -enum {
1: -	BTRFS_SEND_A_UNSPEC = 0,
1: -	BTRFS_SEND_A_UUID = 1,
1: -	BTRFS_SEND_A_CTRANSID = 2,
1: -	BTRFS_SEND_A_INO = 3,
1: -	BTRFS_SEND_A_SIZE = 4,
1: -	BTRFS_SEND_A_MODE = 5,
1: -	BTRFS_SEND_A_UID = 6,
1: -	BTRFS_SEND_A_GID = 7,
1: -	BTRFS_SEND_A_RDEV = 8,
1: -	BTRFS_SEND_A_CTIME = 9,
1: -	BTRFS_SEND_A_MTIME = 10,
1: -	BTRFS_SEND_A_ATIME = 11,
1: -	BTRFS_SEND_A_OTIME = 12,
1: -	BTRFS_SEND_A_XATTR_NAME = 13,
1: -	BTRFS_SEND_A_XATTR_DATA = 14,
1: -	BTRFS_SEND_A_PATH = 15,
1: -	BTRFS_SEND_A_PATH_TO = 16,
1: -	BTRFS_SEND_A_PATH_LINK = 17,
1: -	BTRFS_SEND_A_FILE_OFFSET = 18,
1: -	BTRFS_SEND_A_DATA = 19,
1: -	BTRFS_SEND_A_CLONE_UUID = 20,
1: -	BTRFS_SEND_A_CLONE_CTRANSID = 21,
1: -	BTRFS_SEND_A_CLONE_PATH = 22,
1: -	BTRFS_SEND_A_CLONE_OFFSET = 23,
1: -	BTRFS_SEND_A_CLONE_LEN = 24,
1: -	__BTRFS_SEND_A_MAX = 25,
1: +  BTRFS_SEND_C_UNSPEC = 0,
1: +  BTRFS_SEND_C_SUBVOL = 1,
1: +  BTRFS_SEND_C_SNAPSHOT = 2,
1: +  BTRFS_SEND_C_MKFILE = 3,
1: +  BTRFS_SEND_C_MKDIR = 4,
1: +  BTRFS_SEND_C_MKNOD = 5,
1: +  BTRFS_SEND_C_MKFIFO = 6,
1: +  BTRFS_SEND_C_MKSOCK = 7,
1: +  BTRFS_SEND_C_SYMLINK = 8,
1: +  BTRFS_SEND_C_RENAME = 9,
1: +  BTRFS_SEND_C_LINK = 10,
1: +  BTRFS_SEND_C_UNLINK = 11,
1: +  BTRFS_SEND_C_RMDIR = 12,
1: +  BTRFS_SEND_C_SET_XATTR = 13,
1: +  BTRFS_SEND_C_REMOVE_XATTR = 14,
1: +  BTRFS_SEND_C_WRITE = 15,
1: +  BTRFS_SEND_C_CLONE = 16,
1: +  BTRFS_SEND_C_TRUNCATE = 17,
1: +  BTRFS_SEND_C_CHMOD = 18,
1: +  BTRFS_SEND_C_CHOWN = 19,
1: +  BTRFS_SEND_C_UTIMES = 20,
1: +  BTRFS_SEND_C_END = 21,
1: +  BTRFS_SEND_C_UPDATE_EXTENT = 22,
1: +  __BTRFS_SEND_C_MAX = 23,
1: +};
1: +
1: +enum {
1: +  BTRFS_SEND_A_UNSPEC = 0,
1: +  BTRFS_SEND_A_UUID = 1,
1: +  BTRFS_SEND_A_CTRANSID = 2,
1: +  BTRFS_SEND_A_INO = 3,
1: +  BTRFS_SEND_A_SIZE = 4,
1: +  BTRFS_SEND_A_MODE = 5,
1: +  BTRFS_SEND_A_UID = 6,
1: +  BTRFS_SEND_A_GID = 7,
1: +  BTRFS_SEND_A_RDEV = 8,
1: +  BTRFS_SEND_A_CTIME = 9,
1: +  BTRFS_SEND_A_MTIME = 10,
1: +  BTRFS_SEND_A_ATIME = 11,
1: +  BTRFS_SEND_A_OTIME = 12,
1: +  BTRFS_SEND_A_XATTR_NAME = 13,
1: +  BTRFS_SEND_A_XATTR_DATA = 14,
1: +  BTRFS_SEND_A_PATH = 15,
1: +  BTRFS_SEND_A_PATH_TO = 16,
1: +  BTRFS_SEND_A_PATH_LINK = 17,
1: +  BTRFS_SEND_A_FILE_OFFSET = 18,
1: +  BTRFS_SEND_A_DATA = 19,
1: +  BTRFS_SEND_A_CLONE_UUID = 20,
1: +  BTRFS_SEND_A_CLONE_CTRANSID = 21,
1: +  BTRFS_SEND_A_CLONE_PATH = 22,
1: +  BTRFS_SEND_A_CLONE_OFFSET = 23,
1: +  BTRFS_SEND_A_CLONE_LEN = 24,
1: +  __BTRFS_SEND_A_MAX = 25,
1:  };
1:  
1:  struct fs_path {
1: -	union {
1: -		struct {
1: -			char *start;
1: -			char *end;
1: -			char *buf;
1: -			short unsigned int buf_len: 15;
1: -			short unsigned int reversed: 1;
1: -			char inline_buf[0];
1: -		};
1: -		char pad[256];
1: -	};
1: +  union {
1: +    struct {
1: +      char *start;
1: +      char *end;
1: +      char *buf;
1: +      short unsigned int buf_len : 15;
1: +      short unsigned int reversed : 1;
1: +      char inline_buf[0];
1: +    };
1: +    char pad[256];
1: +  };
1:  };
1:  
1:  struct clone_root {
1: -	struct btrfs_root *root;
1: -	u64 ino;
1: -	u64 offset;
1: -	u64 found_refs;
1: +  struct btrfs_root *root;
1: +  u64 ino;
1: +  u64 offset;
1: +  u64 found_refs;
1:  };
1:  
1:  struct send_ctx {
1: -	struct file *send_filp;
1: -	loff_t send_off;
1: -	char *send_buf;
1: -	u32 send_size;
1: -	u32 send_max_size;
1: -	u64 total_send_size;
1: -	u64 cmd_send_size[23];
1: -	u64 flags;
1: -	struct btrfs_root *send_root;
1: -	struct btrfs_root *parent_root;
1: -	struct clone_root *clone_roots;
1: -	int clone_roots_cnt;
1: -	struct btrfs_path *left_path;
1: -	struct btrfs_path *right_path;
1: -	struct btrfs_key *cmp_key;
1: -	u64 cur_ino;
1: -	u64 cur_inode_gen;
1: -	int cur_inode_new;
1: -	int cur_inode_new_gen;
1: -	int cur_inode_deleted;
1: -	u64 cur_inode_size;
1: -	u64 cur_inode_mode;
1: -	u64 cur_inode_rdev;
1: -	u64 cur_inode_last_extent;
1: -	u64 cur_inode_next_write_offset;
1: -	bool ignore_cur_inode;
1: -	u64 send_progress;
1: -	struct list_head new_refs;
1: -	struct list_head deleted_refs;
1: -	struct xarray name_cache;
1: -	struct list_head name_cache_list;
1: -	int name_cache_size;
1: -	struct file_ra_state ra;
1: -	struct rb_root pending_dir_moves;
1: -	struct rb_root waiting_dir_moves;
1: -	struct rb_root orphan_dirs;
1: +  struct file *send_filp;
1: +  loff_t send_off;
1: +  char *send_buf;
1: +  u32 send_size;
1: +  u32 send_max_size;
1: +  u64 total_send_size;
1: +  u64 cmd_send_size[23];
1: +  u64 flags;
1: +  struct btrfs_root *send_root;
1: +  struct btrfs_root *parent_root;
1: +  struct clone_root *clone_roots;
1: +  int clone_roots_cnt;
1: +  struct btrfs_path *left_path;
1: +  struct btrfs_path *right_path;
1: +  struct btrfs_key *cmp_key;
1: +  u64 cur_ino;
1: +  u64 cur_inode_gen;
1: +  int cur_inode_new;
1: +  int cur_inode_new_gen;
1: +  int cur_inode_deleted;
1: +  u64 cur_inode_size;
1: +  u64 cur_inode_mode;
1: +  u64 cur_inode_rdev;
1: +  u64 cur_inode_last_extent;
1: +  u64 cur_inode_next_write_offset;
1: +  bool ignore_cur_inode;
1: +  u64 send_progress;
1: +  struct list_head new_refs;
1: +  struct list_head deleted_refs;
1: +  struct xarray name_cache;
1: +  struct list_head name_cache_list;
1: +  int name_cache_size;
1: +  struct file_ra_state ra;
1: +  struct rb_root pending_dir_moves;
1: +  struct rb_root waiting_dir_moves;
1: +  struct rb_root orphan_dirs;
1:  };
1:  
1:  struct pending_dir_move {
1: -	struct rb_node node;
1: -	struct list_head list;
1: -	u64 parent_ino;
1: -	u64 ino;
1: -	u64 gen;
1: -	struct list_head update_refs;
1: +  struct rb_node node;
1: +  struct list_head list;
1: +  u64 parent_ino;
1: +  u64 ino;
1: +  u64 gen;
1: +  struct list_head update_refs;
1:  };
1:  
1:  struct waiting_dir_move {
1: -	struct rb_node node;
1: -	u64 ino;
1: -	u64 rmdir_ino;
1: -	bool orphanized;
1: +  struct rb_node node;
1: +  u64 ino;
1: +  u64 rmdir_ino;
1: +  bool orphanized;
1:  };
1:  
1:  struct orphan_dir_info {
1: -	struct rb_node node;
1: -	u64 ino;
1: -	u64 gen;
1: -	u64 last_dir_index_offset;
1: +  struct rb_node node;
1: +  u64 ino;
1: +  u64 gen;
1: +  u64 last_dir_index_offset;
1:  };
1:  
1:  struct name_cache_entry {
1: -	struct list_head list;
1: -	struct list_head radix_list;
1: -	u64 ino;
1: -	u64 gen;
1: -	u64 parent_ino;
1: -	u64 parent_gen;
1: -	int ret;
1: -	int need_later_update;
1: -	int name_len;
1: -	char name[0];
1: +  struct list_head list;
1: +  struct list_head radix_list;
1: +  u64 ino;
1: +  u64 gen;
1: +  u64 parent_ino;
1: +  u64 parent_gen;
1: +  int ret;
1: +  int need_later_update;
1: +  int name_len;
1: +  char name[0];
1:  };
1:  
1:  enum btrfs_compare_tree_result {
1: -	BTRFS_COMPARE_TREE_NEW = 0,
1: -	BTRFS_COMPARE_TREE_DELETED = 1,
1: -	BTRFS_COMPARE_TREE_CHANGED = 2,
1: -	BTRFS_COMPARE_TREE_SAME = 3,
1: +  BTRFS_COMPARE_TREE_NEW = 0,
1: +  BTRFS_COMPARE_TREE_DELETED = 1,
1: +  BTRFS_COMPARE_TREE_CHANGED = 2,
1: +  BTRFS_COMPARE_TREE_SAME = 3,
1:  };
1:  
1:  typedef int (*iterate_inode_ref_t)(int, u64, int, struct fs_path *, void *);
1:  
1: -typedef int (*iterate_dir_item_t)(int, struct btrfs_key *, const char *, int, const char *, int, u8, void *);
1: +typedef int (*iterate_dir_item_t)(int, struct btrfs_key *, const char *, int,
1: +                                  const char *, int, u8, void *);
1:  
1:  struct backref_ctx {
1: -	struct send_ctx *sctx;
1: -	u64 found;
1: -	u64 cur_objectid;
1: -	u64 cur_offset;
1: -	u64 extent_len;
1: -	u64 data_offset;
1: -	int found_itself;
1: +  struct send_ctx *sctx;
1: +  u64 found;
1: +  u64 cur_objectid;
1: +  u64 cur_offset;
1: +  u64 extent_len;
1: +  u64 data_offset;
1: +  int found_itself;
1:  };
1:  
1:  enum inode_state {
1: -	inode_state_no_change = 0,
1: -	inode_state_will_create = 1,
1: -	inode_state_did_create = 2,
1: -	inode_state_will_delete = 3,
1: -	inode_state_did_delete = 4,
1: +  inode_state_no_change = 0,
1: +  inode_state_will_create = 1,
1: +  inode_state_did_create = 2,
1: +  inode_state_will_delete = 3,
1: +  inode_state_did_delete = 4,
1:  };
1:  
1:  struct recorded_ref {
1: -	struct list_head list;
1: -	char *name;
1: -	struct fs_path *full_path;
1: -	u64 dir;
1: -	u64 dir_gen;
1: -	int name_len;
1: +  struct list_head list;
1: +  char *name;
1: +  struct fs_path *full_path;
1: +  u64 dir;
1: +  u64 dir_gen;
1: +  int name_len;
1:  };
1:  
1:  struct find_ref_ctx {
1: -	u64 dir;
1: -	u64 dir_gen;
1: -	struct btrfs_root *root;
1: -	struct fs_path *name;
1: -	int found_idx;
1: +  u64 dir;
1: +  u64 dir_gen;
1: +  struct btrfs_root *root;
1: +  struct fs_path *name;
1: +  int found_idx;
1:  };
1:  
1:  struct find_xattr_ctx {
1: -	const char *name;
1: -	int name_len;
1: -	int found_idx;
1: -	char *found_data;
1: -	int found_data_len;
1: +  const char *name;
1: +  int name_len;
1: +  int found_idx;
1: +  char *found_data;
1: +  int found_data_len;
1:  };
1:  
1:  struct parent_paths_ctx {
1: -	struct list_head *refs;
1: -	struct send_ctx *sctx;
1: +  struct list_head *refs;
1: +  struct send_ctx *sctx;
1:  };
1:  
1:  struct btrfs_dev_replace_item {
1: -	__le64 src_devid;
1: -	__le64 cursor_left;
1: -	__le64 cursor_right;
1: -	__le64 cont_reading_from_srcdev_mode;
1: -	__le64 replace_state;
1: -	__le64 time_started;
1: -	__le64 time_stopped;
1: -	__le64 num_write_errors;
1: -	__le64 num_uncorrectable_read_errors;
1: +  __le64 src_devid;
1: +  __le64 cursor_left;
1: +  __le64 cursor_right;
1: +  __le64 cont_reading_from_srcdev_mode;
1: +  __le64 replace_state;
1: +  __le64 time_started;
1: +  __le64 time_stopped;
1: +  __le64 num_write_errors;
1: +  __le64 num_uncorrectable_read_errors;
1:  };
1:  
1:  struct blk_plug_cb;
1: @@ -56645,110 +57537,110 @@ struct blk_plug_cb;
1:  typedef void (*blk_plug_cb_fn)(struct blk_plug_cb *, bool);
1:  
1:  struct blk_plug_cb {
1: -	struct list_head list;
1: -	blk_plug_cb_fn callback;
1: -	void *data;
1: +  struct list_head list;
1: +  blk_plug_cb_fn callback;
1: +  void *data;
1:  };
1:  
1:  struct raid6_calls {
1: -	void (*gen_syndrome)(int, size_t, void **);
1: -	void (*xor_syndrome)(int, int, int, size_t, void **);
1: -	int (*valid)();
1: -	const char *name;
1: -	int prefer;
1: +  void (*gen_syndrome)(int, size_t, void **);
1: +  void (*xor_syndrome)(int, int, int, size_t, void **);
1: +  int (*valid)();
1: +  const char *name;
1: +  int prefer;
1:  };
1:  
1:  struct btrfs_stripe_hash {
1: -	struct list_head hash_list;
1: -	spinlock_t lock;
1: +  struct list_head hash_list;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct btrfs_stripe_hash_table {
1: -	struct list_head stripe_cache;
1: -	spinlock_t cache_lock;
1: -	int cache_size;
1: -	struct btrfs_stripe_hash table[0];
1: +  struct list_head stripe_cache;
1: +  spinlock_t cache_lock;
1: +  int cache_size;
1: +  struct btrfs_stripe_hash table[0];
1:  };
1:  
1:  enum btrfs_rbio_ops {
1: -	BTRFS_RBIO_WRITE = 0,
1: -	BTRFS_RBIO_READ_REBUILD = 1,
1: -	BTRFS_RBIO_PARITY_SCRUB = 2,
1: -	BTRFS_RBIO_REBUILD_MISSING = 3,
1: +  BTRFS_RBIO_WRITE = 0,
1: +  BTRFS_RBIO_READ_REBUILD = 1,
1: +  BTRFS_RBIO_PARITY_SCRUB = 2,
1: +  BTRFS_RBIO_REBUILD_MISSING = 3,
1:  };
1:  
1:  struct btrfs_raid_bio___2 {
1: -	struct btrfs_fs_info *fs_info;
1: -	struct btrfs_bio *bbio;
1: -	struct list_head hash_list;
1: -	struct list_head stripe_cache;
1: -	struct btrfs_work work;
1: -	struct bio_list bio_list;
1: -	spinlock_t bio_list_lock;
1: -	struct list_head plug_list;
1: -	long unsigned int flags;
1: -	int stripe_len;
1: -	int nr_data;
1: -	int real_stripes;
1: -	int stripe_npages;
1: -	enum btrfs_rbio_ops operation;
1: -	int faila;
1: -	int failb;
1: -	int scrubp;
1: -	int nr_pages;
1: -	int bio_list_bytes;
1: -	int generic_bio_cnt;
1: -	refcount_t refs;
1: -	atomic_t stripes_pending;
1: -	atomic_t error;
1: -	struct page **stripe_pages;
1: -	struct page **bio_pages;
1: -	long unsigned int *dbitmap;
1: -	void **finish_pointers;
1: -	long unsigned int *finish_pbitmap;
1: +  struct btrfs_fs_info *fs_info;
1: +  struct btrfs_bio *bbio;
1: +  struct list_head hash_list;
1: +  struct list_head stripe_cache;
1: +  struct btrfs_work work;
1: +  struct bio_list bio_list;
1: +  spinlock_t bio_list_lock;
1: +  struct list_head plug_list;
1: +  long unsigned int flags;
1: +  int stripe_len;
1: +  int nr_data;
1: +  int real_stripes;
1: +  int stripe_npages;
1: +  enum btrfs_rbio_ops operation;
1: +  int faila;
1: +  int failb;
1: +  int scrubp;
1: +  int nr_pages;
1: +  int bio_list_bytes;
1: +  int generic_bio_cnt;
1: +  refcount_t refs;
1: +  atomic_t stripes_pending;
1: +  atomic_t error;
1: +  struct page **stripe_pages;
1: +  struct page **bio_pages;
1: +  long unsigned int *dbitmap;
1: +  void **finish_pointers;
1: +  long unsigned int *finish_pbitmap;
1:  };
1:  
1:  struct btrfs_plug_cb {
1: -	struct blk_plug_cb cb;
1: -	struct btrfs_fs_info *info;
1: -	struct list_head rbio_list;
1: -	struct btrfs_work work;
1: +  struct blk_plug_cb cb;
1: +  struct btrfs_fs_info *info;
1: +  struct list_head rbio_list;
1: +  struct btrfs_work work;
1:  };
1:  
1:  struct prop_handler {
1: -	struct hlist_node node;
1: -	const char *xattr_name;
1: -	int (*validate)(const char *, size_t);
1: -	int (*apply)(struct inode *, const char *, size_t);
1: -	const char * (*extract)(struct inode *);
1: -	int inheritable;
1: +  struct hlist_node node;
1: +  const char *xattr_name;
1: +  int (*validate)(const char *, size_t);
1: +  int (*apply)(struct inode *, const char *, size_t);
1: +  const char *(*extract)(struct inode *);
1: +  int inheritable;
1:  };
1:  
1:  struct btrfs_free_space_info {
1: -	__le32 extent_count;
1: -	__le32 flags;
1: +  __le32 extent_count;
1: +  __le32 flags;
1:  };
1:  
1:  struct reserve_ticket {
1: -	u64 bytes;
1: -	int error;
1: -	bool steal;
1: -	struct list_head list;
1: -	wait_queue_head_t wait;
1: +  u64 bytes;
1: +  int error;
1: +  bool steal;
1: +  struct list_head list;
1: +  wait_queue_head_t wait;
1:  };
1:  
1:  struct ipc64_perm {
1: -	__kernel_key_t key;
1: -	__kernel_uid32_t uid;
1: -	__kernel_gid32_t gid;
1: -	__kernel_uid32_t cuid;
1: -	__kernel_gid32_t cgid;
1: -	__kernel_mode_t mode;
1: -	unsigned char __pad1[0];
1: -	short unsigned int seq;
1: -	short unsigned int __pad2;
1: -	__kernel_ulong_t __unused1;
1: -	__kernel_ulong_t __unused2;
1: +  __kernel_key_t key;
1: +  __kernel_uid32_t uid;
1: +  __kernel_gid32_t gid;
1: +  __kernel_uid32_t cuid;
1: +  __kernel_gid32_t cgid;
1: +  __kernel_mode_t mode;
1: +  unsigned char __pad1[0];
1: +  short unsigned int seq;
1: +  short unsigned int __pad2;
1: +  __kernel_ulong_t __unused1;
1: +  __kernel_ulong_t __unused2;
1:  };
1:  
1:  typedef s32 compat_key_t;
1: @@ -56756,201 +57648,201 @@ typedef s32 compat_key_t;
1:  typedef u32 __compat_gid32_t;
1:  
1:  struct compat_ipc64_perm {
1: -	compat_key_t key;
1: -	__compat_uid32_t uid;
1: -	__compat_gid32_t gid;
1: -	__compat_uid32_t cuid;
1: -	__compat_gid32_t cgid;
1: -	short unsigned int mode;
1: -	short unsigned int __pad1;
1: -	short unsigned int seq;
1: -	short unsigned int __pad2;
1: -	compat_ulong_t unused1;
1: -	compat_ulong_t unused2;
1: +  compat_key_t key;
1: +  __compat_uid32_t uid;
1: +  __compat_gid32_t gid;
1: +  __compat_uid32_t cuid;
1: +  __compat_gid32_t cgid;
1: +  short unsigned int mode;
1: +  short unsigned int __pad1;
1: +  short unsigned int seq;
1: +  short unsigned int __pad2;
1: +  compat_ulong_t unused1;
1: +  compat_ulong_t unused2;
1:  };
1:  
1:  struct compat_ipc_perm {
1: -	key_t key;
1: -	__compat_uid_t uid;
1: -	__compat_gid_t gid;
1: -	__compat_uid_t cuid;
1: -	__compat_gid_t cgid;
1: -	compat_mode_t mode;
1: -	short unsigned int seq;
1: +  key_t key;
1: +  __compat_uid_t uid;
1: +  __compat_gid_t gid;
1: +  __compat_uid_t cuid;
1: +  __compat_gid_t cgid;
1: +  compat_mode_t mode;
1: +  short unsigned int seq;
1:  };
1:  
1:  struct ipc_perm {
1: -	__kernel_key_t key;
1: -	__kernel_uid_t uid;
1: -	__kernel_gid_t gid;
1: -	__kernel_uid_t cuid;
1: -	__kernel_gid_t cgid;
1: -	__kernel_mode_t mode;
1: -	short unsigned int seq;
1: +  __kernel_key_t key;
1: +  __kernel_uid_t uid;
1: +  __kernel_gid_t gid;
1: +  __kernel_uid_t cuid;
1: +  __kernel_gid_t cgid;
1: +  __kernel_mode_t mode;
1: +  short unsigned int seq;
1:  };
1:  
1:  struct ipc_params {
1: -	key_t key;
1: -	int flg;
1: -	union {
1: -		size_t size;
1: -		int nsems;
1: -	} u;
1: +  key_t key;
1: +  int flg;
1: +  union {
1: +    size_t size;
1: +    int nsems;
1: +  } u;
1:  };
1:  
1:  struct ipc_ops {
1: -	int (*getnew)(struct ipc_namespace *, struct ipc_params *);
1: -	int (*associate)(struct kern_ipc_perm *, int);
1: -	int (*more_checks)(struct kern_ipc_perm *, struct ipc_params *);
1: +  int (*getnew)(struct ipc_namespace *, struct ipc_params *);
1: +  int (*associate)(struct kern_ipc_perm *, int);
1: +  int (*more_checks)(struct kern_ipc_perm *, struct ipc_params *);
1:  };
1:  
1:  struct ipc_proc_iface {
1: -	const char *path;
1: -	const char *header;
1: -	int ids;
1: -	int (*show)(struct seq_file *, void *);
1: +  const char *path;
1: +  const char *header;
1: +  int ids;
1: +  int (*show)(struct seq_file *, void *);
1:  };
1:  
1:  struct ipc_proc_iter {
1: -	struct ipc_namespace *ns;
1: -	struct pid_namespace *pid_ns;
1: -	struct ipc_proc_iface *iface;
1: +  struct ipc_namespace *ns;
1: +  struct pid_namespace *pid_ns;
1: +  struct ipc_proc_iface *iface;
1:  };
1:  
1:  struct msg_msgseg;
1:  
1:  struct msg_msg {
1: -	struct list_head m_list;
1: -	long int m_type;
1: -	size_t m_ts;
1: -	struct msg_msgseg *next;
1: -	void *security;
1: +  struct list_head m_list;
1: +  long int m_type;
1: +  size_t m_ts;
1: +  struct msg_msgseg *next;
1: +  void *security;
1:  };
1:  
1:  struct msg_msgseg {
1: -	struct msg_msgseg *next;
1: +  struct msg_msgseg *next;
1:  };
1:  
1:  typedef int __kernel_ipc_pid_t;
1:  
1:  struct msgbuf {
1: -	__kernel_long_t mtype;
1: -	char mtext[1];
1: +  __kernel_long_t mtype;
1: +  char mtext[1];
1:  };
1:  
1:  struct msg;
1:  
1:  struct msqid_ds {
1: -	struct ipc_perm msg_perm;
1: -	struct msg *msg_first;
1: -	struct msg *msg_last;
1: -	__kernel_old_time_t msg_stime;
1: -	__kernel_old_time_t msg_rtime;
1: -	__kernel_old_time_t msg_ctime;
1: -	long unsigned int msg_lcbytes;
1: -	long unsigned int msg_lqbytes;
1: -	short unsigned int msg_cbytes;
1: -	short unsigned int msg_qnum;
1: -	short unsigned int msg_qbytes;
1: -	__kernel_ipc_pid_t msg_lspid;
1: -	__kernel_ipc_pid_t msg_lrpid;
1: +  struct ipc_perm msg_perm;
1: +  struct msg *msg_first;
1: +  struct msg *msg_last;
1: +  __kernel_old_time_t msg_stime;
1: +  __kernel_old_time_t msg_rtime;
1: +  __kernel_old_time_t msg_ctime;
1: +  long unsigned int msg_lcbytes;
1: +  long unsigned int msg_lqbytes;
1: +  short unsigned int msg_cbytes;
1: +  short unsigned int msg_qnum;
1: +  short unsigned int msg_qbytes;
1: +  __kernel_ipc_pid_t msg_lspid;
1: +  __kernel_ipc_pid_t msg_lrpid;
1:  };
1:  
1:  struct msqid64_ds {
1: -	struct ipc64_perm msg_perm;
1: -	long int msg_stime;
1: -	long int msg_rtime;
1: -	long int msg_ctime;
1: -	long unsigned int msg_cbytes;
1: -	long unsigned int msg_qnum;
1: -	long unsigned int msg_qbytes;
1: -	__kernel_pid_t msg_lspid;
1: -	__kernel_pid_t msg_lrpid;
1: -	long unsigned int __unused4;
1: -	long unsigned int __unused5;
1: +  struct ipc64_perm msg_perm;
1: +  long int msg_stime;
1: +  long int msg_rtime;
1: +  long int msg_ctime;
1: +  long unsigned int msg_cbytes;
1: +  long unsigned int msg_qnum;
1: +  long unsigned int msg_qbytes;
1: +  __kernel_pid_t msg_lspid;
1: +  __kernel_pid_t msg_lrpid;
1: +  long unsigned int __unused4;
1: +  long unsigned int __unused5;
1:  };
1:  
1:  struct msginfo {
1: -	int msgpool;
1: -	int msgmap;
1: -	int msgmax;
1: -	int msgmnb;
1: -	int msgmni;
1: -	int msgssz;
1: -	int msgtql;
1: -	short unsigned int msgseg;
1: +  int msgpool;
1: +  int msgmap;
1: +  int msgmax;
1: +  int msgmnb;
1: +  int msgmni;
1: +  int msgssz;
1: +  int msgtql;
1: +  short unsigned int msgseg;
1:  };
1:  
1:  typedef u16 compat_ipc_pid_t;
1:  
1:  struct compat_msqid64_ds {
1: -	struct compat_ipc64_perm msg_perm;
1: -	compat_ulong_t msg_stime;
1: -	compat_ulong_t msg_stime_high;
1: -	compat_ulong_t msg_rtime;
1: -	compat_ulong_t msg_rtime_high;
1: -	compat_ulong_t msg_ctime;
1: -	compat_ulong_t msg_ctime_high;
1: -	compat_ulong_t msg_cbytes;
1: -	compat_ulong_t msg_qnum;
1: -	compat_ulong_t msg_qbytes;
1: -	compat_pid_t msg_lspid;
1: -	compat_pid_t msg_lrpid;
1: -	compat_ulong_t __unused4;
1: -	compat_ulong_t __unused5;
1: +  struct compat_ipc64_perm msg_perm;
1: +  compat_ulong_t msg_stime;
1: +  compat_ulong_t msg_stime_high;
1: +  compat_ulong_t msg_rtime;
1: +  compat_ulong_t msg_rtime_high;
1: +  compat_ulong_t msg_ctime;
1: +  compat_ulong_t msg_ctime_high;
1: +  compat_ulong_t msg_cbytes;
1: +  compat_ulong_t msg_qnum;
1: +  compat_ulong_t msg_qbytes;
1: +  compat_pid_t msg_lspid;
1: +  compat_pid_t msg_lrpid;
1: +  compat_ulong_t __unused4;
1: +  compat_ulong_t __unused5;
1:  };
1:  
1:  struct msg_queue {
1: -	struct kern_ipc_perm q_perm;
1: -	time64_t q_stime;
1: -	time64_t q_rtime;
1: -	time64_t q_ctime;
1: -	long unsigned int q_cbytes;
1: -	long unsigned int q_qnum;
1: -	long unsigned int q_qbytes;
1: -	struct pid *q_lspid;
1: -	struct pid *q_lrpid;
1: -	struct list_head q_messages;
1: -	struct list_head q_receivers;
1: -	struct list_head q_senders;
1: -	long: 64;
1: -	long: 64;
1: +  struct kern_ipc_perm q_perm;
1: +  time64_t q_stime;
1: +  time64_t q_rtime;
1: +  time64_t q_ctime;
1: +  long unsigned int q_cbytes;
1: +  long unsigned int q_qnum;
1: +  long unsigned int q_qbytes;
1: +  struct pid *q_lspid;
1: +  struct pid *q_lrpid;
1: +  struct list_head q_messages;
1: +  struct list_head q_receivers;
1: +  struct list_head q_senders;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct msg_receiver {
1: -	struct list_head r_list;
1: -	struct task_struct *r_tsk;
1: -	int r_mode;
1: -	long int r_msgtype;
1: -	long int r_maxsize;
1: -	struct msg_msg *r_msg;
1: +  struct list_head r_list;
1: +  struct task_struct *r_tsk;
1: +  int r_mode;
1: +  long int r_msgtype;
1: +  long int r_maxsize;
1: +  struct msg_msg *r_msg;
1:  };
1:  
1:  struct msg_sender {
1: -	struct list_head list;
1: -	struct task_struct *tsk;
1: -	size_t msgsz;
1: +  struct list_head list;
1: +  struct task_struct *tsk;
1: +  size_t msgsz;
1:  };
1:  
1:  struct compat_msqid_ds {
1: -	struct compat_ipc_perm msg_perm;
1: -	compat_uptr_t msg_first;
1: -	compat_uptr_t msg_last;
1: -	old_time32_t msg_stime;
1: -	old_time32_t msg_rtime;
1: -	old_time32_t msg_ctime;
1: -	compat_ulong_t msg_lcbytes;
1: -	compat_ulong_t msg_lqbytes;
1: -	short unsigned int msg_cbytes;
1: -	short unsigned int msg_qnum;
1: -	short unsigned int msg_qbytes;
1: -	compat_ipc_pid_t msg_lspid;
1: -	compat_ipc_pid_t msg_lrpid;
1: +  struct compat_ipc_perm msg_perm;
1: +  compat_uptr_t msg_first;
1: +  compat_uptr_t msg_last;
1: +  old_time32_t msg_stime;
1: +  old_time32_t msg_rtime;
1: +  old_time32_t msg_ctime;
1: +  compat_ulong_t msg_lcbytes;
1: +  compat_ulong_t msg_lqbytes;
1: +  short unsigned int msg_cbytes;
1: +  short unsigned int msg_qnum;
1: +  short unsigned int msg_qbytes;
1: +  compat_ipc_pid_t msg_lspid;
1: +  compat_ipc_pid_t msg_lrpid;
1:  };
1:  
1:  struct compat_msgbuf {
1: -	compat_long_t mtype;
1: -	char mtext[1];
1: +  compat_long_t mtype;
1: +  char mtext[1];
1:  };
1:  
1:  struct sem;
1: @@ -56960,1147 +57852,1170 @@ struct sem_queue;
1:  struct sem_undo;
1:  
1:  struct semid_ds {
1: -	struct ipc_perm sem_perm;
1: -	__kernel_old_time_t sem_otime;
1: -	__kernel_old_time_t sem_ctime;
1: -	struct sem *sem_base;
1: -	struct sem_queue *sem_pending;
1: -	struct sem_queue **sem_pending_last;
1: -	struct sem_undo *undo;
1: -	short unsigned int sem_nsems;
1: +  struct ipc_perm sem_perm;
1: +  __kernel_old_time_t sem_otime;
1: +  __kernel_old_time_t sem_ctime;
1: +  struct sem *sem_base;
1: +  struct sem_queue *sem_pending;
1: +  struct sem_queue **sem_pending_last;
1: +  struct sem_undo *undo;
1: +  short unsigned int sem_nsems;
1:  };
1:  
1:  struct sem {
1: -	int semval;
1: -	struct pid *sempid;
1: -	spinlock_t lock;
1: -	struct list_head pending_alter;
1: -	struct list_head pending_const;
1: -	time64_t sem_otime;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  int semval;
1: +  struct pid *sempid;
1: +  spinlock_t lock;
1: +  struct list_head pending_alter;
1: +  struct list_head pending_const;
1: +  time64_t sem_otime;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sem_queue {
1: -	struct list_head list;
1: -	struct task_struct *sleeper;
1: -	struct sem_undo *undo;
1: -	struct pid *pid;
1: -	int status;
1: -	struct sembuf *sops;
1: -	struct sembuf *blocking;
1: -	int nsops;
1: -	bool alter;
1: -	bool dupsop;
1: +  struct list_head list;
1: +  struct task_struct *sleeper;
1: +  struct sem_undo *undo;
1: +  struct pid *pid;
1: +  int status;
1: +  struct sembuf *sops;
1: +  struct sembuf *blocking;
1: +  int nsops;
1: +  bool alter;
1: +  bool dupsop;
1:  };
1:  
1:  struct sem_undo {
1: -	struct list_head list_proc;
1: -	struct callback_head rcu;
1: -	struct sem_undo_list *ulp;
1: -	struct list_head list_id;
1: -	int semid;
1: -	short int *semadj;
1: +  struct list_head list_proc;
1: +  struct callback_head rcu;
1: +  struct sem_undo_list *ulp;
1: +  struct list_head list_id;
1: +  int semid;
1: +  short int *semadj;
1:  };
1:  
1:  struct semid64_ds {
1: -	struct ipc64_perm sem_perm;
1: -	__kernel_long_t sem_otime;
1: -	__kernel_ulong_t __unused1;
1: -	__kernel_long_t sem_ctime;
1: -	__kernel_ulong_t __unused2;
1: -	__kernel_ulong_t sem_nsems;
1: -	__kernel_ulong_t __unused3;
1: -	__kernel_ulong_t __unused4;
1: +  struct ipc64_perm sem_perm;
1: +  __kernel_long_t sem_otime;
1: +  __kernel_ulong_t __unused1;
1: +  __kernel_long_t sem_ctime;
1: +  __kernel_ulong_t __unused2;
1: +  __kernel_ulong_t sem_nsems;
1: +  __kernel_ulong_t __unused3;
1: +  __kernel_ulong_t __unused4;
1:  };
1:  
1:  struct seminfo {
1: -	int semmap;
1: -	int semmni;
1: -	int semmns;
1: -	int semmnu;
1: -	int semmsl;
1: -	int semopm;
1: -	int semume;
1: -	int semusz;
1: -	int semvmx;
1: -	int semaem;
1: +  int semmap;
1: +  int semmni;
1: +  int semmns;
1: +  int semmnu;
1: +  int semmsl;
1: +  int semopm;
1: +  int semume;
1: +  int semusz;
1: +  int semvmx;
1: +  int semaem;
1:  };
1:  
1:  struct sem_undo_list {
1: -	refcount_t refcnt;
1: -	spinlock_t lock;
1: -	struct list_head list_proc;
1: +  refcount_t refcnt;
1: +  spinlock_t lock;
1: +  struct list_head list_proc;
1:  };
1:  
1:  struct compat_semid64_ds {
1: -	struct compat_ipc64_perm sem_perm;
1: -	compat_ulong_t sem_otime;
1: -	compat_ulong_t sem_otime_high;
1: -	compat_ulong_t sem_ctime;
1: -	compat_ulong_t sem_ctime_high;
1: -	compat_ulong_t sem_nsems;
1: -	compat_ulong_t __unused3;
1: -	compat_ulong_t __unused4;
1: +  struct compat_ipc64_perm sem_perm;
1: +  compat_ulong_t sem_otime;
1: +  compat_ulong_t sem_otime_high;
1: +  compat_ulong_t sem_ctime;
1: +  compat_ulong_t sem_ctime_high;
1: +  compat_ulong_t sem_nsems;
1: +  compat_ulong_t __unused3;
1: +  compat_ulong_t __unused4;
1:  };
1:  
1:  struct sem_array {
1: -	struct kern_ipc_perm sem_perm;
1: -	time64_t sem_ctime;
1: -	struct list_head pending_alter;
1: -	struct list_head pending_const;
1: -	struct list_head list_id;
1: -	int sem_nsems;
1: -	int complex_count;
1: -	unsigned int use_global_lock;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct sem sems[0];
1: +  struct kern_ipc_perm sem_perm;
1: +  time64_t sem_ctime;
1: +  struct list_head pending_alter;
1: +  struct list_head pending_const;
1: +  struct list_head list_id;
1: +  int sem_nsems;
1: +  int complex_count;
1: +  unsigned int use_global_lock;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct sem sems[0];
1:  };
1:  
1:  struct compat_semid_ds {
1: -	struct compat_ipc_perm sem_perm;
1: -	old_time32_t sem_otime;
1: -	old_time32_t sem_ctime;
1: -	compat_uptr_t sem_base;
1: -	compat_uptr_t sem_pending;
1: -	compat_uptr_t sem_pending_last;
1: -	compat_uptr_t undo;
1: -	short unsigned int sem_nsems;
1: +  struct compat_ipc_perm sem_perm;
1: +  old_time32_t sem_otime;
1: +  old_time32_t sem_ctime;
1: +  compat_uptr_t sem_base;
1: +  compat_uptr_t sem_pending;
1: +  compat_uptr_t sem_pending_last;
1: +  compat_uptr_t undo;
1: +  short unsigned int sem_nsems;
1:  };
1:  
1:  struct shmid_ds {
1: -	struct ipc_perm shm_perm;
1: -	int shm_segsz;
1: -	__kernel_old_time_t shm_atime;
1: -	__kernel_old_time_t shm_dtime;
1: -	__kernel_old_time_t shm_ctime;
1: -	__kernel_ipc_pid_t shm_cpid;
1: -	__kernel_ipc_pid_t shm_lpid;
1: -	short unsigned int shm_nattch;
1: -	short unsigned int shm_unused;
1: -	void *shm_unused2;
1: -	void *shm_unused3;
1: +  struct ipc_perm shm_perm;
1: +  int shm_segsz;
1: +  __kernel_old_time_t shm_atime;
1: +  __kernel_old_time_t shm_dtime;
1: +  __kernel_old_time_t shm_ctime;
1: +  __kernel_ipc_pid_t shm_cpid;
1: +  __kernel_ipc_pid_t shm_lpid;
1: +  short unsigned int shm_nattch;
1: +  short unsigned int shm_unused;
1: +  void *shm_unused2;
1: +  void *shm_unused3;
1:  };
1:  
1:  struct shmid64_ds {
1: -	struct ipc64_perm shm_perm;
1: -	size_t shm_segsz;
1: -	long int shm_atime;
1: -	long int shm_dtime;
1: -	long int shm_ctime;
1: -	__kernel_pid_t shm_cpid;
1: -	__kernel_pid_t shm_lpid;
1: -	long unsigned int shm_nattch;
1: -	long unsigned int __unused4;
1: -	long unsigned int __unused5;
1: +  struct ipc64_perm shm_perm;
1: +  size_t shm_segsz;
1: +  long int shm_atime;
1: +  long int shm_dtime;
1: +  long int shm_ctime;
1: +  __kernel_pid_t shm_cpid;
1: +  __kernel_pid_t shm_lpid;
1: +  long unsigned int shm_nattch;
1: +  long unsigned int __unused4;
1: +  long unsigned int __unused5;
1:  };
1:  
1:  struct shminfo64 {
1: -	long unsigned int shmmax;
1: -	long unsigned int shmmin;
1: -	long unsigned int shmmni;
1: -	long unsigned int shmseg;
1: -	long unsigned int shmall;
1: -	long unsigned int __unused1;
1: -	long unsigned int __unused2;
1: -	long unsigned int __unused3;
1: -	long unsigned int __unused4;
1: +  long unsigned int shmmax;
1: +  long unsigned int shmmin;
1: +  long unsigned int shmmni;
1: +  long unsigned int shmseg;
1: +  long unsigned int shmall;
1: +  long unsigned int __unused1;
1: +  long unsigned int __unused2;
1: +  long unsigned int __unused3;
1: +  long unsigned int __unused4;
1:  };
1:  
1:  struct shminfo {
1: -	int shmmax;
1: -	int shmmin;
1: -	int shmmni;
1: -	int shmseg;
1: -	int shmall;
1: +  int shmmax;
1: +  int shmmin;
1: +  int shmmni;
1: +  int shmseg;
1: +  int shmall;
1:  };
1:  
1:  struct shm_info {
1: -	int used_ids;
1: -	__kernel_ulong_t shm_tot;
1: -	__kernel_ulong_t shm_rss;
1: -	__kernel_ulong_t shm_swp;
1: -	__kernel_ulong_t swap_attempts;
1: -	__kernel_ulong_t swap_successes;
1: +  int used_ids;
1: +  __kernel_ulong_t shm_tot;
1: +  __kernel_ulong_t shm_rss;
1: +  __kernel_ulong_t shm_swp;
1: +  __kernel_ulong_t swap_attempts;
1: +  __kernel_ulong_t swap_successes;
1:  };
1:  
1:  struct compat_shmid64_ds {
1: -	struct compat_ipc64_perm shm_perm;
1: -	compat_size_t shm_segsz;
1: -	compat_ulong_t shm_atime;
1: -	compat_ulong_t shm_atime_high;
1: -	compat_ulong_t shm_dtime;
1: -	compat_ulong_t shm_dtime_high;
1: -	compat_ulong_t shm_ctime;
1: -	compat_ulong_t shm_ctime_high;
1: -	compat_pid_t shm_cpid;
1: -	compat_pid_t shm_lpid;
1: -	compat_ulong_t shm_nattch;
1: -	compat_ulong_t __unused4;
1: -	compat_ulong_t __unused5;
1: +  struct compat_ipc64_perm shm_perm;
1: +  compat_size_t shm_segsz;
1: +  compat_ulong_t shm_atime;
1: +  compat_ulong_t shm_atime_high;
1: +  compat_ulong_t shm_dtime;
1: +  compat_ulong_t shm_dtime_high;
1: +  compat_ulong_t shm_ctime;
1: +  compat_ulong_t shm_ctime_high;
1: +  compat_pid_t shm_cpid;
1: +  compat_pid_t shm_lpid;
1: +  compat_ulong_t shm_nattch;
1: +  compat_ulong_t __unused4;
1: +  compat_ulong_t __unused5;
1:  };
1:  
1:  struct shmid_kernel {
1: -	struct kern_ipc_perm shm_perm;
1: -	struct file *shm_file;
1: -	long unsigned int shm_nattch;
1: -	long unsigned int shm_segsz;
1: -	time64_t shm_atim;
1: -	time64_t shm_dtim;
1: -	time64_t shm_ctim;
1: -	struct pid *shm_cprid;
1: -	struct pid *shm_lprid;
1: -	struct user_struct *mlock_user;
1: -	struct task_struct *shm_creator;
1: -	struct list_head shm_clist;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct kern_ipc_perm shm_perm;
1: +  struct file *shm_file;
1: +  long unsigned int shm_nattch;
1: +  long unsigned int shm_segsz;
1: +  time64_t shm_atim;
1: +  time64_t shm_dtim;
1: +  time64_t shm_ctim;
1: +  struct pid *shm_cprid;
1: +  struct pid *shm_lprid;
1: +  struct user_struct *mlock_user;
1: +  struct task_struct *shm_creator;
1: +  struct list_head shm_clist;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct shm_file_data {
1: -	int id;
1: -	struct ipc_namespace *ns;
1: -	struct file *file;
1: -	const struct vm_operations_struct *vm_ops;
1: +  int id;
1: +  struct ipc_namespace *ns;
1: +  struct file *file;
1: +  const struct vm_operations_struct *vm_ops;
1:  };
1:  
1:  struct compat_shmid_ds {
1: -	struct compat_ipc_perm shm_perm;
1: -	int shm_segsz;
1: -	old_time32_t shm_atime;
1: -	old_time32_t shm_dtime;
1: -	old_time32_t shm_ctime;
1: -	compat_ipc_pid_t shm_cpid;
1: -	compat_ipc_pid_t shm_lpid;
1: -	short unsigned int shm_nattch;
1: -	short unsigned int shm_unused;
1: -	compat_uptr_t shm_unused2;
1: -	compat_uptr_t shm_unused3;
1: +  struct compat_ipc_perm shm_perm;
1: +  int shm_segsz;
1: +  old_time32_t shm_atime;
1: +  old_time32_t shm_dtime;
1: +  old_time32_t shm_ctime;
1: +  compat_ipc_pid_t shm_cpid;
1: +  compat_ipc_pid_t shm_lpid;
1: +  short unsigned int shm_nattch;
1: +  short unsigned int shm_unused;
1: +  compat_uptr_t shm_unused2;
1: +  compat_uptr_t shm_unused3;
1:  };
1:  
1:  struct compat_shminfo64 {
1: -	compat_ulong_t shmmax;
1: -	compat_ulong_t shmmin;
1: -	compat_ulong_t shmmni;
1: -	compat_ulong_t shmseg;
1: -	compat_ulong_t shmall;
1: -	compat_ulong_t __unused1;
1: -	compat_ulong_t __unused2;
1: -	compat_ulong_t __unused3;
1: -	compat_ulong_t __unused4;
1: +  compat_ulong_t shmmax;
1: +  compat_ulong_t shmmin;
1: +  compat_ulong_t shmmni;
1: +  compat_ulong_t shmseg;
1: +  compat_ulong_t shmall;
1: +  compat_ulong_t __unused1;
1: +  compat_ulong_t __unused2;
1: +  compat_ulong_t __unused3;
1: +  compat_ulong_t __unused4;
1:  };
1:  
1:  struct compat_shm_info {
1: -	compat_int_t used_ids;
1: -	compat_ulong_t shm_tot;
1: -	compat_ulong_t shm_rss;
1: -	compat_ulong_t shm_swp;
1: -	compat_ulong_t swap_attempts;
1: -	compat_ulong_t swap_successes;
1: +  compat_int_t used_ids;
1: +  compat_ulong_t shm_tot;
1: +  compat_ulong_t shm_rss;
1: +  compat_ulong_t shm_swp;
1: +  compat_ulong_t swap_attempts;
1: +  compat_ulong_t swap_successes;
1:  };
1:  
1:  struct compat_ipc_kludge {
1: -	compat_uptr_t msgp;
1: -	compat_long_t msgtyp;
1: +  compat_uptr_t msgp;
1: +  compat_long_t msgtyp;
1:  };
1:  
1:  struct mqueue_fs_context {
1: -	struct ipc_namespace *ipc_ns;
1: +  struct ipc_namespace *ipc_ns;
1:  };
1:  
1:  struct posix_msg_tree_node {
1: -	struct rb_node rb_node;
1: -	struct list_head msg_list;
1: -	int priority;
1: +  struct rb_node rb_node;
1: +  struct list_head msg_list;
1: +  int priority;
1:  };
1:  
1:  struct ext_wait_queue {
1: -	struct task_struct *task;
1: -	struct list_head list;
1: -	struct msg_msg *msg;
1: -	int state;
1: +  struct task_struct *task;
1: +  struct list_head list;
1: +  struct msg_msg *msg;
1: +  int state;
1:  };
1:  
1:  struct mqueue_inode_info {
1: -	spinlock_t lock;
1: -	struct inode vfs_inode;
1: -	wait_queue_head_t wait_q;
1: -	struct rb_root msg_tree;
1: -	struct rb_node *msg_tree_rightmost;
1: -	struct posix_msg_tree_node *node_cache;
1: -	struct mq_attr attr;
1: -	struct sigevent notify;
1: -	struct pid *notify_owner;
1: -	u32 notify_self_exec_id;
1: -	struct user_namespace *notify_user_ns;
1: -	struct user_struct *user;
1: -	struct sock *notify_sock;
1: -	struct sk_buff *notify_cookie;
1: -	struct ext_wait_queue e_wait_q[2];
1: -	long unsigned int qsize;
1: +  spinlock_t lock;
1: +  struct inode vfs_inode;
1: +  wait_queue_head_t wait_q;
1: +  struct rb_root msg_tree;
1: +  struct rb_node *msg_tree_rightmost;
1: +  struct posix_msg_tree_node *node_cache;
1: +  struct mq_attr attr;
1: +  struct sigevent notify;
1: +  struct pid *notify_owner;
1: +  u32 notify_self_exec_id;
1: +  struct user_namespace *notify_user_ns;
1: +  struct user_struct *user;
1: +  struct sock *notify_sock;
1: +  struct sk_buff *notify_cookie;
1: +  struct ext_wait_queue e_wait_q[2];
1: +  long unsigned int qsize;
1:  };
1:  
1:  struct compat_mq_attr {
1: -	compat_long_t mq_flags;
1: -	compat_long_t mq_maxmsg;
1: -	compat_long_t mq_msgsize;
1: -	compat_long_t mq_curmsgs;
1: -	compat_long_t __reserved[4];
1: +  compat_long_t mq_flags;
1: +  compat_long_t mq_maxmsg;
1: +  compat_long_t mq_msgsize;
1: +  compat_long_t mq_curmsgs;
1: +  compat_long_t __reserved[4];
1:  };
1:  
1:  enum key_state {
1: -	KEY_IS_UNINSTANTIATED = 0,
1: -	KEY_IS_POSITIVE = 1,
1: +  KEY_IS_UNINSTANTIATED = 0,
1: +  KEY_IS_POSITIVE = 1,
1:  };
1:  
1:  struct key_user {
1: -	struct rb_node node;
1: -	struct mutex cons_lock;
1: -	spinlock_t lock;
1: -	refcount_t usage;
1: -	atomic_t nkeys;
1: -	atomic_t nikeys;
1: -	kuid_t uid;
1: -	int qnkeys;
1: -	int qnbytes;
1: +  struct rb_node node;
1: +  struct mutex cons_lock;
1: +  spinlock_t lock;
1: +  refcount_t usage;
1: +  atomic_t nkeys;
1: +  atomic_t nikeys;
1: +  kuid_t uid;
1: +  int qnkeys;
1: +  int qnbytes;
1:  };
1:  
1:  enum key_notification_subtype {
1: -	NOTIFY_KEY_INSTANTIATED = 0,
1: -	NOTIFY_KEY_UPDATED = 1,
1: -	NOTIFY_KEY_LINKED = 2,
1: -	NOTIFY_KEY_UNLINKED = 3,
1: -	NOTIFY_KEY_CLEARED = 4,
1: -	NOTIFY_KEY_REVOKED = 5,
1: -	NOTIFY_KEY_INVALIDATED = 6,
1: -	NOTIFY_KEY_SETATTR = 7,
1: +  NOTIFY_KEY_INSTANTIATED = 0,
1: +  NOTIFY_KEY_UPDATED = 1,
1: +  NOTIFY_KEY_LINKED = 2,
1: +  NOTIFY_KEY_UNLINKED = 3,
1: +  NOTIFY_KEY_CLEARED = 4,
1: +  NOTIFY_KEY_REVOKED = 5,
1: +  NOTIFY_KEY_INVALIDATED = 6,
1: +  NOTIFY_KEY_SETATTR = 7,
1:  };
1:  
1:  struct assoc_array_edit;
1:  
1:  struct assoc_array_ops {
1: -	long unsigned int (*get_key_chunk)(const void *, int);
1: -	long unsigned int (*get_object_key_chunk)(const void *, int);
1: -	bool (*compare_object)(const void *, const void *);
1: -	int (*diff_objects)(const void *, const void *);
1: -	void (*free_object)(void *);
1: +  long unsigned int (*get_key_chunk)(const void *, int);
1: +  long unsigned int (*get_object_key_chunk)(const void *, int);
1: +  bool (*compare_object)(const void *, const void *);
1: +  int (*diff_objects)(const void *, const void *);
1: +  void (*free_object)(void *);
1:  };
1:  
1:  struct assoc_array_node {
1: -	struct assoc_array_ptr *back_pointer;
1: -	u8 parent_slot;
1: -	struct assoc_array_ptr *slots[16];
1: -	long unsigned int nr_leaves_on_branch;
1: +  struct assoc_array_ptr *back_pointer;
1: +  u8 parent_slot;
1: +  struct assoc_array_ptr *slots[16];
1: +  long unsigned int nr_leaves_on_branch;
1:  };
1:  
1:  struct assoc_array_shortcut {
1: -	struct assoc_array_ptr *back_pointer;
1: -	int parent_slot;
1: -	int skip_to_level;
1: -	struct assoc_array_ptr *next_node;
1: -	long unsigned int index_key[0];
1: +  struct assoc_array_ptr *back_pointer;
1: +  int parent_slot;
1: +  int skip_to_level;
1: +  struct assoc_array_ptr *next_node;
1: +  long unsigned int index_key[0];
1:  };
1:  
1:  struct assoc_array_edit___2 {
1: -	struct callback_head rcu;
1: -	struct assoc_array *array;
1: -	const struct assoc_array_ops *ops;
1: -	const struct assoc_array_ops *ops_for_excised_subtree;
1: -	struct assoc_array_ptr *leaf;
1: -	struct assoc_array_ptr **leaf_p;
1: -	struct assoc_array_ptr *dead_leaf;
1: -	struct assoc_array_ptr *new_meta[3];
1: -	struct assoc_array_ptr *excised_meta[1];
1: -	struct assoc_array_ptr *excised_subtree;
1: -	struct assoc_array_ptr **set_backpointers[16];
1: -	struct assoc_array_ptr *set_backpointers_to;
1: -	struct assoc_array_node *adjust_count_on;
1: -	long int adjust_count_by;
1: -	struct {
1: -		struct assoc_array_ptr **ptr;
1: -		struct assoc_array_ptr *to;
1: -	} set[2];
1: -	struct {
1: -		u8 *p;
1: -		u8 to;
1: -	} set_parent_slot[1];
1: -	u8 segment_cache[17];
1: +  struct callback_head rcu;
1: +  struct assoc_array *array;
1: +  const struct assoc_array_ops *ops;
1: +  const struct assoc_array_ops *ops_for_excised_subtree;
1: +  struct assoc_array_ptr *leaf;
1: +  struct assoc_array_ptr **leaf_p;
1: +  struct assoc_array_ptr *dead_leaf;
1: +  struct assoc_array_ptr *new_meta[3];
1: +  struct assoc_array_ptr *excised_meta[1];
1: +  struct assoc_array_ptr *excised_subtree;
1: +  struct assoc_array_ptr **set_backpointers[16];
1: +  struct assoc_array_ptr *set_backpointers_to;
1: +  struct assoc_array_node *adjust_count_on;
1: +  long int adjust_count_by;
1: +  struct {
1: +    struct assoc_array_ptr **ptr;
1: +    struct assoc_array_ptr *to;
1: +  } set[2];
1: +  struct {
1: +    u8 *p;
1: +    u8 to;
1: +  } set_parent_slot[1];
1: +  u8 segment_cache[17];
1:  };
1:  
1:  struct keyring_search_context {
1: -	struct keyring_index_key index_key;
1: -	const struct cred *cred;
1: -	struct key_match_data match_data;
1: -	unsigned int flags;
1: -	int (*iterator)(const void *, void *);
1: -	int skipped_ret;
1: -	bool possessed;
1: -	key_ref_t result;
1: -	time64_t now;
1: +  struct keyring_index_key index_key;
1: +  const struct cred *cred;
1: +  struct key_match_data match_data;
1: +  unsigned int flags;
1: +  int (*iterator)(const void *, void *);
1: +  int skipped_ret;
1: +  bool possessed;
1: +  key_ref_t result;
1: +  time64_t now;
1:  };
1:  
1:  struct keyring_read_iterator_context {
1: -	size_t buflen;
1: -	size_t count;
1: -	key_serial_t *buffer;
1: +  size_t buflen;
1: +  size_t count;
1: +  key_serial_t *buffer;
1:  };
1:  
1:  struct keyctl_dh_params {
1: -	union {
1: -		__s32 private;
1: -		__s32 priv;
1: -	};
1: -	__s32 prime;
1: -	__s32 base;
1: +  union {
1: +    __s32 private;
1: +    __s32 priv;
1: +  };
1: +  __s32 prime;
1: +  __s32 base;
1:  };
1:  
1:  struct keyctl_kdf_params {
1: -	char *hashname;
1: -	char *otherinfo;
1: -	__u32 otherinfolen;
1: -	__u32 __spare[8];
1: +  char *hashname;
1: +  char *otherinfo;
1: +  __u32 otherinfolen;
1: +  __u32 __spare[8];
1:  };
1:  
1:  struct keyctl_pkey_query {
1: -	__u32 supported_ops;
1: -	__u32 key_size;
1: -	__u16 max_data_size;
1: -	__u16 max_sig_size;
1: -	__u16 max_enc_size;
1: -	__u16 max_dec_size;
1: -	__u32 __spare[10];
1: +  __u32 supported_ops;
1: +  __u32 key_size;
1: +  __u16 max_data_size;
1: +  __u16 max_sig_size;
1: +  __u16 max_enc_size;
1: +  __u16 max_dec_size;
1: +  __u32 __spare[10];
1:  };
1:  
1:  struct keyctl_pkey_params {
1: -	__s32 key_id;
1: -	__u32 in_len;
1: -	union {
1: -		__u32 out_len;
1: -		__u32 in2_len;
1: -	};
1: -	__u32 __spare[7];
1: +  __s32 key_id;
1: +  __u32 in_len;
1: +  union {
1: +    __u32 out_len;
1: +    __u32 in2_len;
1: +  };
1: +  __u32 __spare[7];
1:  };
1:  
1:  struct request_key_auth {
1: -	struct callback_head rcu;
1: -	struct key *target_key;
1: -	struct key *dest_keyring;
1: -	const struct cred *cred;
1: -	void *callout_info;
1: -	size_t callout_len;
1: -	pid_t pid;
1: -	char op[8];
1: +  struct callback_head rcu;
1: +  struct key *target_key;
1: +  struct key *dest_keyring;
1: +  const struct cred *cred;
1: +  void *callout_info;
1: +  size_t callout_len;
1: +  pid_t pid;
1: +  char op[8];
1:  };
1:  
1:  struct user_key_payload {
1: -	struct callback_head rcu;
1: -	short unsigned int datalen;
1: -	long: 48;
1: -	char data[0];
1: +  struct callback_head rcu;
1: +  short unsigned int datalen;
1: +  long : 48;
1: +  char data[0];
1:  };
1:  
1:  enum {
1: -	Opt_err___8 = 0,
1: -	Opt_enc = 1,
1: -	Opt_hash = 2,
1: +  Opt_err___8 = 0,
1: +  Opt_enc = 1,
1: +  Opt_hash = 2,
1:  };
1:  
1:  struct vfs_cap_data {
1: -	__le32 magic_etc;
1: -	struct {
1: -		__le32 permitted;
1: -		__le32 inheritable;
1: -	} data[2];
1: +  __le32 magic_etc;
1: +  struct {
1: +    __le32 permitted;
1: +    __le32 inheritable;
1: +  } data[2];
1:  };
1:  
1:  struct vfs_ns_cap_data {
1: -	__le32 magic_etc;
1: -	struct {
1: -		__le32 permitted;
1: -		__le32 inheritable;
1: -	} data[2];
1: -	__le32 rootid;
1: +  __le32 magic_etc;
1: +  struct {
1: +    __le32 permitted;
1: +    __le32 inheritable;
1: +  } data[2];
1: +  __le32 rootid;
1:  };
1:  
1:  struct sctp_endpoint;
1:  
1:  union security_list_options {
1: -	int (*binder_set_context_mgr)(struct task_struct *);
1: -	int (*binder_transaction)(struct task_struct *, struct task_struct *);
1: -	int (*binder_transfer_binder)(struct task_struct *, struct task_struct *);
1: -	int (*binder_transfer_file)(struct task_struct *, struct task_struct *, struct file *);
1: -	int (*ptrace_access_check)(struct task_struct *, unsigned int);
1: -	int (*ptrace_traceme)(struct task_struct *);
1: -	int (*capget)(struct task_struct *, kernel_cap_t *, kernel_cap_t *, kernel_cap_t *);
1: -	int (*capset)(struct cred *, const struct cred *, const kernel_cap_t *, const kernel_cap_t *, const kernel_cap_t *);
1: -	int (*capable)(const struct cred *, struct user_namespace *, int, unsigned int);
1: -	int (*quotactl)(int, int, int, struct super_block *);
1: -	int (*quota_on)(struct dentry *);
1: -	int (*syslog)(int);
1: -	int (*settime)(const struct timespec64 *, const struct timezone *);
1: -	int (*vm_enough_memory)(struct mm_struct *, long int);
1: -	int (*bprm_creds_for_exec)(struct linux_binprm *);
1: -	int (*bprm_creds_from_file)(struct linux_binprm *, struct file *);
1: -	int (*bprm_check_security)(struct linux_binprm *);
1: -	void (*bprm_committing_creds)(struct linux_binprm *);
1: -	void (*bprm_committed_creds)(struct linux_binprm *);
1: -	int (*fs_context_dup)(struct fs_context *, struct fs_context *);
1: -	int (*fs_context_parse_param)(struct fs_context *, struct fs_parameter *);
1: -	int (*sb_alloc_security)(struct super_block *);
1: -	void (*sb_free_security)(struct super_block *);
1: -	void (*sb_free_mnt_opts)(void *);
1: -	int (*sb_eat_lsm_opts)(char *, void **);
1: -	int (*sb_remount)(struct super_block *, void *);
1: -	int (*sb_kern_mount)(struct super_block *);
1: -	int (*sb_show_options)(struct seq_file *, struct super_block *);
1: -	int (*sb_statfs)(struct dentry *);
1: -	int (*sb_mount)(const char *, const struct path *, const char *, long unsigned int, void *);
1: -	int (*sb_umount)(struct vfsmount *, int);
1: -	int (*sb_pivotroot)(const struct path *, const struct path *);
1: -	int (*sb_set_mnt_opts)(struct super_block *, void *, long unsigned int, long unsigned int *);
1: -	int (*sb_clone_mnt_opts)(const struct super_block *, struct super_block *, long unsigned int, long unsigned int *);
1: -	int (*sb_add_mnt_opt)(const char *, const char *, int, void **);
1: -	int (*move_mount)(const struct path *, const struct path *);
1: -	int (*dentry_init_security)(struct dentry *, int, const struct qstr *, void **, u32 *);
1: -	int (*dentry_create_files_as)(struct dentry *, int, struct qstr *, const struct cred *, struct cred *);
1: -	int (*path_notify)(const struct path *, u64, unsigned int);
1: -	int (*inode_alloc_security)(struct inode *);
1: -	void (*inode_free_security)(struct inode *);
1: -	int (*inode_init_security)(struct inode *, struct inode *, const struct qstr *, const char **, void **, size_t *);
1: -	int (*inode_create)(struct inode *, struct dentry *, umode_t);
1: -	int (*inode_link)(struct dentry *, struct inode *, struct dentry *);
1: -	int (*inode_unlink)(struct inode *, struct dentry *);
1: -	int (*inode_symlink)(struct inode *, struct dentry *, const char *);
1: -	int (*inode_mkdir)(struct inode *, struct dentry *, umode_t);
1: -	int (*inode_rmdir)(struct inode *, struct dentry *);
1: -	int (*inode_mknod)(struct inode *, struct dentry *, umode_t, dev_t);
1: -	int (*inode_rename)(struct inode *, struct dentry *, struct inode *, struct dentry *);
1: -	int (*inode_readlink)(struct dentry *);
1: -	int (*inode_follow_link)(struct dentry *, struct inode *, bool);
1: -	int (*inode_permission)(struct inode *, int);
1: -	int (*inode_setattr)(struct dentry *, struct iattr *);
1: -	int (*inode_getattr)(const struct path *);
1: -	int (*inode_setxattr)(struct dentry *, const char *, const void *, size_t, int);
1: -	void (*inode_post_setxattr)(struct dentry *, const char *, const void *, size_t, int);
1: -	int (*inode_getxattr)(struct dentry *, const char *);
1: -	int (*inode_listxattr)(struct dentry *);
1: -	int (*inode_removexattr)(struct dentry *, const char *);
1: -	int (*inode_need_killpriv)(struct dentry *);
1: -	int (*inode_killpriv)(struct dentry *);
1: -	int (*inode_getsecurity)(struct inode *, const char *, void **, bool);
1: -	int (*inode_setsecurity)(struct inode *, const char *, const void *, size_t, int);
1: -	int (*inode_listsecurity)(struct inode *, char *, size_t);
1: -	void (*inode_getsecid)(struct inode *, u32 *);
1: -	int (*inode_copy_up)(struct dentry *, struct cred **);
1: -	int (*inode_copy_up_xattr)(const char *);
1: -	int (*kernfs_init_security)(struct kernfs_node *, struct kernfs_node *);
1: -	int (*file_permission)(struct file *, int);
1: -	int (*file_alloc_security)(struct file *);
1: -	void (*file_free_security)(struct file *);
1: -	int (*file_ioctl)(struct file *, unsigned int, long unsigned int);
1: -	int (*mmap_addr)(long unsigned int);
1: -	int (*mmap_file)(struct file *, long unsigned int, long unsigned int, long unsigned int);
1: -	int (*file_mprotect)(struct vm_area_struct *, long unsigned int, long unsigned int);
1: -	int (*file_lock)(struct file *, unsigned int);
1: -	int (*file_fcntl)(struct file *, unsigned int, long unsigned int);
1: -	void (*file_set_fowner)(struct file *);
1: -	int (*file_send_sigiotask)(struct task_struct *, struct fown_struct *, int);
1: -	int (*file_receive)(struct file *);
1: -	int (*file_open)(struct file *);
1: -	int (*task_alloc)(struct task_struct *, long unsigned int);
1: -	void (*task_free)(struct task_struct *);
1: -	int (*cred_alloc_blank)(struct cred *, gfp_t);
1: -	void (*cred_free)(struct cred *);
1: -	int (*cred_prepare)(struct cred *, const struct cred *, gfp_t);
1: -	void (*cred_transfer)(struct cred *, const struct cred *);
1: -	void (*cred_getsecid)(const struct cred *, u32 *);
1: -	int (*kernel_act_as)(struct cred *, u32);
1: -	int (*kernel_create_files_as)(struct cred *, struct inode *);
1: -	int (*kernel_module_request)(char *);
1: -	int (*kernel_load_data)(enum kernel_load_data_id, bool);
1: -	int (*kernel_post_load_data)(char *, loff_t, enum kernel_load_data_id, char *);
1: -	int (*kernel_read_file)(struct file *, enum kernel_read_file_id, bool);
1: -	int (*kernel_post_read_file)(struct file *, char *, loff_t, enum kernel_read_file_id);
1: -	int (*task_fix_setuid)(struct cred *, const struct cred *, int);
1: -	int (*task_fix_setgid)(struct cred *, const struct cred *, int);
1: -	int (*task_setpgid)(struct task_struct *, pid_t);
1: -	int (*task_getpgid)(struct task_struct *);
1: -	int (*task_getsid)(struct task_struct *);
1: -	void (*task_getsecid)(struct task_struct *, u32 *);
1: -	int (*task_setnice)(struct task_struct *, int);
1: -	int (*task_setioprio)(struct task_struct *, int);
1: -	int (*task_getioprio)(struct task_struct *);
1: -	int (*task_prlimit)(const struct cred *, const struct cred *, unsigned int);
1: -	int (*task_setrlimit)(struct task_struct *, unsigned int, struct rlimit *);
1: -	int (*task_setscheduler)(struct task_struct *);
1: -	int (*task_getscheduler)(struct task_struct *);
1: -	int (*task_movememory)(struct task_struct *);
1: -	int (*task_kill)(struct task_struct *, struct kernel_siginfo *, int, const struct cred *);
1: -	int (*task_prctl)(int, long unsigned int, long unsigned int, long unsigned int, long unsigned int);
1: -	void (*task_to_inode)(struct task_struct *, struct inode *);
1: -	int (*ipc_permission)(struct kern_ipc_perm *, short int);
1: -	void (*ipc_getsecid)(struct kern_ipc_perm *, u32 *);
1: -	int (*msg_msg_alloc_security)(struct msg_msg *);
1: -	void (*msg_msg_free_security)(struct msg_msg *);
1: -	int (*msg_queue_alloc_security)(struct kern_ipc_perm *);
1: -	void (*msg_queue_free_security)(struct kern_ipc_perm *);
1: -	int (*msg_queue_associate)(struct kern_ipc_perm *, int);
1: -	int (*msg_queue_msgctl)(struct kern_ipc_perm *, int);
1: -	int (*msg_queue_msgsnd)(struct kern_ipc_perm *, struct msg_msg *, int);
1: -	int (*msg_queue_msgrcv)(struct kern_ipc_perm *, struct msg_msg *, struct task_struct *, long int, int);
1: -	int (*shm_alloc_security)(struct kern_ipc_perm *);
1: -	void (*shm_free_security)(struct kern_ipc_perm *);
1: -	int (*shm_associate)(struct kern_ipc_perm *, int);
1: -	int (*shm_shmctl)(struct kern_ipc_perm *, int);
1: -	int (*shm_shmat)(struct kern_ipc_perm *, char *, int);
1: -	int (*sem_alloc_security)(struct kern_ipc_perm *);
1: -	void (*sem_free_security)(struct kern_ipc_perm *);
1: -	int (*sem_associate)(struct kern_ipc_perm *, int);
1: -	int (*sem_semctl)(struct kern_ipc_perm *, int);
1: -	int (*sem_semop)(struct kern_ipc_perm *, struct sembuf *, unsigned int, int);
1: -	int (*netlink_send)(struct sock *, struct sk_buff *);
1: -	void (*d_instantiate)(struct dentry *, struct inode *);
1: -	int (*getprocattr)(struct task_struct *, char *, char **);
1: -	int (*setprocattr)(const char *, void *, size_t);
1: -	int (*ismaclabel)(const char *);
1: -	int (*secid_to_secctx)(u32, char **, u32 *);
1: -	int (*secctx_to_secid)(const char *, u32, u32 *);
1: -	void (*release_secctx)(char *, u32);
1: -	void (*inode_invalidate_secctx)(struct inode *);
1: -	int (*inode_notifysecctx)(struct inode *, void *, u32);
1: -	int (*inode_setsecctx)(struct dentry *, void *, u32);
1: -	int (*inode_getsecctx)(struct inode *, void **, u32 *);
1: -	int (*unix_stream_connect)(struct sock *, struct sock *, struct sock *);
1: -	int (*unix_may_send)(struct socket *, struct socket *);
1: -	int (*socket_create)(int, int, int, int);
1: -	int (*socket_post_create)(struct socket *, int, int, int, int);
1: -	int (*socket_socketpair)(struct socket *, struct socket *);
1: -	int (*socket_bind)(struct socket *, struct sockaddr *, int);
1: -	int (*socket_connect)(struct socket *, struct sockaddr *, int);
1: -	int (*socket_listen)(struct socket *, int);
1: -	int (*socket_accept)(struct socket *, struct socket *);
1: -	int (*socket_sendmsg)(struct socket *, struct msghdr *, int);
1: -	int (*socket_recvmsg)(struct socket *, struct msghdr *, int, int);
1: -	int (*socket_getsockname)(struct socket *);
1: -	int (*socket_getpeername)(struct socket *);
1: -	int (*socket_getsockopt)(struct socket *, int, int);
1: -	int (*socket_setsockopt)(struct socket *, int, int);
1: -	int (*socket_shutdown)(struct socket *, int);
1: -	int (*socket_sock_rcv_skb)(struct sock *, struct sk_buff *);
1: -	int (*socket_getpeersec_stream)(struct socket *, char *, int *, unsigned int);
1: -	int (*socket_getpeersec_dgram)(struct socket *, struct sk_buff *, u32 *);
1: -	int (*sk_alloc_security)(struct sock *, int, gfp_t);
1: -	void (*sk_free_security)(struct sock *);
1: -	void (*sk_clone_security)(const struct sock *, struct sock *);
1: -	void (*sk_getsecid)(struct sock *, u32 *);
1: -	void (*sock_graft)(struct sock *, struct socket *);
1: -	int (*inet_conn_request)(struct sock *, struct sk_buff *, struct request_sock *);
1: -	void (*inet_csk_clone)(struct sock *, const struct request_sock *);
1: -	void (*inet_conn_established)(struct sock *, struct sk_buff *);
1: -	int (*secmark_relabel_packet)(u32);
1: -	void (*secmark_refcount_inc)();
1: -	void (*secmark_refcount_dec)();
1: -	void (*req_classify_flow)(const struct request_sock *, struct flowi *);
1: -	int (*tun_dev_alloc_security)(void **);
1: -	void (*tun_dev_free_security)(void *);
1: -	int (*tun_dev_create)();
1: -	int (*tun_dev_attach_queue)(void *);
1: -	int (*tun_dev_attach)(struct sock *, void *);
1: -	int (*tun_dev_open)(void *);
1: -	int (*sctp_assoc_request)(struct sctp_endpoint *, struct sk_buff *);
1: -	int (*sctp_bind_connect)(struct sock *, int, struct sockaddr *, int);
1: -	void (*sctp_sk_clone)(struct sctp_endpoint *, struct sock *, struct sock *);
1: -	int (*key_alloc)(struct key *, const struct cred *, long unsigned int);
1: -	void (*key_free)(struct key *);
1: -	int (*key_permission)(key_ref_t, const struct cred *, enum key_need_perm);
1: -	int (*key_getsecurity)(struct key *, char **);
1: -	int (*audit_rule_init)(u32, u32, char *, void **);
1: -	int (*audit_rule_known)(struct audit_krule *);
1: -	int (*audit_rule_match)(u32, u32, u32, void *);
1: -	void (*audit_rule_free)(void *);
1: -	int (*bpf)(int, union bpf_attr *, unsigned int);
1: -	int (*bpf_map)(struct bpf_map *, fmode_t);
1: -	int (*bpf_prog)(struct bpf_prog *);
1: -	int (*bpf_map_alloc_security)(struct bpf_map *);
1: -	void (*bpf_map_free_security)(struct bpf_map *);
1: -	int (*bpf_prog_alloc_security)(struct bpf_prog_aux *);
1: -	void (*bpf_prog_free_security)(struct bpf_prog_aux *);
1: -	int (*locked_down)(enum lockdown_reason);
1: -	int (*perf_event_open)(struct perf_event_attr *, int);
1: -	int (*perf_event_alloc)(struct perf_event *);
1: -	void (*perf_event_free)(struct perf_event *);
1: -	int (*perf_event_read)(struct perf_event *);
1: -	int (*perf_event_write)(struct perf_event *);
1: +  int (*binder_set_context_mgr)(struct task_struct *);
1: +  int (*binder_transaction)(struct task_struct *, struct task_struct *);
1: +  int (*binder_transfer_binder)(struct task_struct *, struct task_struct *);
1: +  int (*binder_transfer_file)(struct task_struct *, struct task_struct *,
1: +                              struct file *);
1: +  int (*ptrace_access_check)(struct task_struct *, unsigned int);
1: +  int (*ptrace_traceme)(struct task_struct *);
1: +  int (*capget)(struct task_struct *, kernel_cap_t *, kernel_cap_t *,
1: +                kernel_cap_t *);
1: +  int (*capset)(struct cred *, const struct cred *, const kernel_cap_t *,
1: +                const kernel_cap_t *, const kernel_cap_t *);
1: +  int (*capable)(const struct cred *, struct user_namespace *, int,
1: +                 unsigned int);
1: +  int (*quotactl)(int, int, int, struct super_block *);
1: +  int (*quota_on)(struct dentry *);
1: +  int (*syslog)(int);
1: +  int (*settime)(const struct timespec64 *, const struct timezone *);
1: +  int (*vm_enough_memory)(struct mm_struct *, long int);
1: +  int (*bprm_creds_for_exec)(struct linux_binprm *);
1: +  int (*bprm_creds_from_file)(struct linux_binprm *, struct file *);
1: +  int (*bprm_check_security)(struct linux_binprm *);
1: +  void (*bprm_committing_creds)(struct linux_binprm *);
1: +  void (*bprm_committed_creds)(struct linux_binprm *);
1: +  int (*fs_context_dup)(struct fs_context *, struct fs_context *);
1: +  int (*fs_context_parse_param)(struct fs_context *, struct fs_parameter *);
1: +  int (*sb_alloc_security)(struct super_block *);
1: +  void (*sb_free_security)(struct super_block *);
1: +  void (*sb_free_mnt_opts)(void *);
1: +  int (*sb_eat_lsm_opts)(char *, void **);
1: +  int (*sb_remount)(struct super_block *, void *);
1: +  int (*sb_kern_mount)(struct super_block *);
1: +  int (*sb_show_options)(struct seq_file *, struct super_block *);
1: +  int (*sb_statfs)(struct dentry *);
1: +  int (*sb_mount)(const char *, const struct path *, const char *,
1: +                  long unsigned int, void *);
1: +  int (*sb_umount)(struct vfsmount *, int);
1: +  int (*sb_pivotroot)(const struct path *, const struct path *);
1: +  int (*sb_set_mnt_opts)(struct super_block *, void *, long unsigned int,
1: +                         long unsigned int *);
1: +  int (*sb_clone_mnt_opts)(const struct super_block *, struct super_block *,
1: +                           long unsigned int, long unsigned int *);
1: +  int (*sb_add_mnt_opt)(const char *, const char *, int, void **);
1: +  int (*move_mount)(const struct path *, const struct path *);
1: +  int (*dentry_init_security)(struct dentry *, int, const struct qstr *,
1: +                              void **, u32 *);
1: +  int (*dentry_create_files_as)(struct dentry *, int, struct qstr *,
1: +                                const struct cred *, struct cred *);
1: +  int (*path_notify)(const struct path *, u64, unsigned int);
1: +  int (*inode_alloc_security)(struct inode *);
1: +  void (*inode_free_security)(struct inode *);
1: +  int (*inode_init_security)(struct inode *, struct inode *,
1: +                             const struct qstr *, const char **, void **,
1: +                             size_t *);
1: +  int (*inode_create)(struct inode *, struct dentry *, umode_t);
1: +  int (*inode_link)(struct dentry *, struct inode *, struct dentry *);
1: +  int (*inode_unlink)(struct inode *, struct dentry *);
1: +  int (*inode_symlink)(struct inode *, struct dentry *, const char *);
1: +  int (*inode_mkdir)(struct inode *, struct dentry *, umode_t);
1: +  int (*inode_rmdir)(struct inode *, struct dentry *);
1: +  int (*inode_mknod)(struct inode *, struct dentry *, umode_t, dev_t);
1: +  int (*inode_rename)(struct inode *, struct dentry *, struct inode *,
1: +                      struct dentry *);
1: +  int (*inode_readlink)(struct dentry *);
1: +  int (*inode_follow_link)(struct dentry *, struct inode *, bool);
1: +  int (*inode_permission)(struct inode *, int);
1: +  int (*inode_setattr)(struct dentry *, struct iattr *);
1: +  int (*inode_getattr)(const struct path *);
1: +  int (*inode_setxattr)(struct dentry *, const char *, const void *, size_t,
1: +                        int);
1: +  void (*inode_post_setxattr)(struct dentry *, const char *, const void *,
1: +                              size_t, int);
1: +  int (*inode_getxattr)(struct dentry *, const char *);
1: +  int (*inode_listxattr)(struct dentry *);
1: +  int (*inode_removexattr)(struct dentry *, const char *);
1: +  int (*inode_need_killpriv)(struct dentry *);
1: +  int (*inode_killpriv)(struct dentry *);
1: +  int (*inode_getsecurity)(struct inode *, const char *, void **, bool);
1: +  int (*inode_setsecurity)(struct inode *, const char *, const void *, size_t,
1: +                           int);
1: +  int (*inode_listsecurity)(struct inode *, char *, size_t);
1: +  void (*inode_getsecid)(struct inode *, u32 *);
1: +  int (*inode_copy_up)(struct dentry *, struct cred **);
1: +  int (*inode_copy_up_xattr)(const char *);
1: +  int (*kernfs_init_security)(struct kernfs_node *, struct kernfs_node *);
1: +  int (*file_permission)(struct file *, int);
1: +  int (*file_alloc_security)(struct file *);
1: +  void (*file_free_security)(struct file *);
1: +  int (*file_ioctl)(struct file *, unsigned int, long unsigned int);
1: +  int (*mmap_addr)(long unsigned int);
1: +  int (*mmap_file)(struct file *, long unsigned int, long unsigned int,
1: +                   long unsigned int);
1: +  int (*file_mprotect)(struct vm_area_struct *, long unsigned int,
1: +                       long unsigned int);
1: +  int (*file_lock)(struct file *, unsigned int);
1: +  int (*file_fcntl)(struct file *, unsigned int, long unsigned int);
1: +  void (*file_set_fowner)(struct file *);
1: +  int (*file_send_sigiotask)(struct task_struct *, struct fown_struct *, int);
1: +  int (*file_receive)(struct file *);
1: +  int (*file_open)(struct file *);
1: +  int (*task_alloc)(struct task_struct *, long unsigned int);
1: +  void (*task_free)(struct task_struct *);
1: +  int (*cred_alloc_blank)(struct cred *, gfp_t);
1: +  void (*cred_free)(struct cred *);
1: +  int (*cred_prepare)(struct cred *, const struct cred *, gfp_t);
1: +  void (*cred_transfer)(struct cred *, const struct cred *);
1: +  void (*cred_getsecid)(const struct cred *, u32 *);
1: +  int (*kernel_act_as)(struct cred *, u32);
1: +  int (*kernel_create_files_as)(struct cred *, struct inode *);
1: +  int (*kernel_module_request)(char *);
1: +  int (*kernel_load_data)(enum kernel_load_data_id, bool);
1: +  int (*kernel_post_load_data)(char *, loff_t, enum kernel_load_data_id,
1: +                               char *);
1: +  int (*kernel_read_file)(struct file *, enum kernel_read_file_id, bool);
1: +  int (*kernel_post_read_file)(struct file *, char *, loff_t,
1: +                               enum kernel_read_file_id);
1: +  int (*task_fix_setuid)(struct cred *, const struct cred *, int);
1: +  int (*task_fix_setgid)(struct cred *, const struct cred *, int);
1: +  int (*task_setpgid)(struct task_struct *, pid_t);
1: +  int (*task_getpgid)(struct task_struct *);
1: +  int (*task_getsid)(struct task_struct *);
1: +  void (*task_getsecid)(struct task_struct *, u32 *);
1: +  int (*task_setnice)(struct task_struct *, int);
1: +  int (*task_setioprio)(struct task_struct *, int);
1: +  int (*task_getioprio)(struct task_struct *);
1: +  int (*task_prlimit)(const struct cred *, const struct cred *, unsigned int);
1: +  int (*task_setrlimit)(struct task_struct *, unsigned int, struct rlimit *);
1: +  int (*task_setscheduler)(struct task_struct *);
1: +  int (*task_getscheduler)(struct task_struct *);
1: +  int (*task_movememory)(struct task_struct *);
1: +  int (*task_kill)(struct task_struct *, struct kernel_siginfo *, int,
1: +                   const struct cred *);
1: +  int (*task_prctl)(int, long unsigned int, long unsigned int,
1: +                    long unsigned int, long unsigned int);
1: +  void (*task_to_inode)(struct task_struct *, struct inode *);
1: +  int (*ipc_permission)(struct kern_ipc_perm *, short int);
1: +  void (*ipc_getsecid)(struct kern_ipc_perm *, u32 *);
1: +  int (*msg_msg_alloc_security)(struct msg_msg *);
1: +  void (*msg_msg_free_security)(struct msg_msg *);
1: +  int (*msg_queue_alloc_security)(struct kern_ipc_perm *);
1: +  void (*msg_queue_free_security)(struct kern_ipc_perm *);
1: +  int (*msg_queue_associate)(struct kern_ipc_perm *, int);
1: +  int (*msg_queue_msgctl)(struct kern_ipc_perm *, int);
1: +  int (*msg_queue_msgsnd)(struct kern_ipc_perm *, struct msg_msg *, int);
1: +  int (*msg_queue_msgrcv)(struct kern_ipc_perm *, struct msg_msg *,
1: +                          struct task_struct *, long int, int);
1: +  int (*shm_alloc_security)(struct kern_ipc_perm *);
1: +  void (*shm_free_security)(struct kern_ipc_perm *);
1: +  int (*shm_associate)(struct kern_ipc_perm *, int);
1: +  int (*shm_shmctl)(struct kern_ipc_perm *, int);
1: +  int (*shm_shmat)(struct kern_ipc_perm *, char *, int);
1: +  int (*sem_alloc_security)(struct kern_ipc_perm *);
1: +  void (*sem_free_security)(struct kern_ipc_perm *);
1: +  int (*sem_associate)(struct kern_ipc_perm *, int);
1: +  int (*sem_semctl)(struct kern_ipc_perm *, int);
1: +  int (*sem_semop)(struct kern_ipc_perm *, struct sembuf *, unsigned int, int);
1: +  int (*netlink_send)(struct sock *, struct sk_buff *);
1: +  void (*d_instantiate)(struct dentry *, struct inode *);
1: +  int (*getprocattr)(struct task_struct *, char *, char **);
1: +  int (*setprocattr)(const char *, void *, size_t);
1: +  int (*ismaclabel)(const char *);
1: +  int (*secid_to_secctx)(u32, char **, u32 *);
1: +  int (*secctx_to_secid)(const char *, u32, u32 *);
1: +  void (*release_secctx)(char *, u32);
1: +  void (*inode_invalidate_secctx)(struct inode *);
1: +  int (*inode_notifysecctx)(struct inode *, void *, u32);
1: +  int (*inode_setsecctx)(struct dentry *, void *, u32);
1: +  int (*inode_getsecctx)(struct inode *, void **, u32 *);
1: +  int (*unix_stream_connect)(struct sock *, struct sock *, struct sock *);
1: +  int (*unix_may_send)(struct socket *, struct socket *);
1: +  int (*socket_create)(int, int, int, int);
1: +  int (*socket_post_create)(struct socket *, int, int, int, int);
1: +  int (*socket_socketpair)(struct socket *, struct socket *);
1: +  int (*socket_bind)(struct socket *, struct sockaddr *, int);
1: +  int (*socket_connect)(struct socket *, struct sockaddr *, int);
1: +  int (*socket_listen)(struct socket *, int);
1: +  int (*socket_accept)(struct socket *, struct socket *);
1: +  int (*socket_sendmsg)(struct socket *, struct msghdr *, int);
1: +  int (*socket_recvmsg)(struct socket *, struct msghdr *, int, int);
1: +  int (*socket_getsockname)(struct socket *);
1: +  int (*socket_getpeername)(struct socket *);
1: +  int (*socket_getsockopt)(struct socket *, int, int);
1: +  int (*socket_setsockopt)(struct socket *, int, int);
1: +  int (*socket_shutdown)(struct socket *, int);
1: +  int (*socket_sock_rcv_skb)(struct sock *, struct sk_buff *);
1: +  int (*socket_getpeersec_stream)(struct socket *, char *, int *, unsigned int);
1: +  int (*socket_getpeersec_dgram)(struct socket *, struct sk_buff *, u32 *);
1: +  int (*sk_alloc_security)(struct sock *, int, gfp_t);
1: +  void (*sk_free_security)(struct sock *);
1: +  void (*sk_clone_security)(const struct sock *, struct sock *);
1: +  void (*sk_getsecid)(struct sock *, u32 *);
1: +  void (*sock_graft)(struct sock *, struct socket *);
1: +  int (*inet_conn_request)(struct sock *, struct sk_buff *,
1: +                           struct request_sock *);
1: +  void (*inet_csk_clone)(struct sock *, const struct request_sock *);
1: +  void (*inet_conn_established)(struct sock *, struct sk_buff *);
1: +  int (*secmark_relabel_packet)(u32);
1: +  void (*secmark_refcount_inc)();
1: +  void (*secmark_refcount_dec)();
1: +  void (*req_classify_flow)(const struct request_sock *, struct flowi *);
1: +  int (*tun_dev_alloc_security)(void **);
1: +  void (*tun_dev_free_security)(void *);
1: +  int (*tun_dev_create)();
1: +  int (*tun_dev_attach_queue)(void *);
1: +  int (*tun_dev_attach)(struct sock *, void *);
1: +  int (*tun_dev_open)(void *);
1: +  int (*sctp_assoc_request)(struct sctp_endpoint *, struct sk_buff *);
1: +  int (*sctp_bind_connect)(struct sock *, int, struct sockaddr *, int);
1: +  void (*sctp_sk_clone)(struct sctp_endpoint *, struct sock *, struct sock *);
1: +  int (*key_alloc)(struct key *, const struct cred *, long unsigned int);
1: +  void (*key_free)(struct key *);
1: +  int (*key_permission)(key_ref_t, const struct cred *, enum key_need_perm);
1: +  int (*key_getsecurity)(struct key *, char **);
1: +  int (*audit_rule_init)(u32, u32, char *, void **);
1: +  int (*audit_rule_known)(struct audit_krule *);
1: +  int (*audit_rule_match)(u32, u32, u32, void *);
1: +  void (*audit_rule_free)(void *);
1: +  int (*bpf)(int, union bpf_attr *, unsigned int);
1: +  int (*bpf_map)(struct bpf_map *, fmode_t);
1: +  int (*bpf_prog)(struct bpf_prog *);
1: +  int (*bpf_map_alloc_security)(struct bpf_map *);
1: +  void (*bpf_map_free_security)(struct bpf_map *);
1: +  int (*bpf_prog_alloc_security)(struct bpf_prog_aux *);
1: +  void (*bpf_prog_free_security)(struct bpf_prog_aux *);
1: +  int (*locked_down)(enum lockdown_reason);
1: +  int (*perf_event_open)(struct perf_event_attr *, int);
1: +  int (*perf_event_alloc)(struct perf_event *);
1: +  void (*perf_event_free)(struct perf_event *);
1: +  int (*perf_event_read)(struct perf_event *);
1: +  int (*perf_event_write)(struct perf_event *);
1:  };
1:  
1:  struct security_hook_heads {
1: -	struct hlist_head binder_set_context_mgr;
1: -	struct hlist_head binder_transaction;
1: -	struct hlist_head binder_transfer_binder;
1: -	struct hlist_head binder_transfer_file;
1: -	struct hlist_head ptrace_access_check;
1: -	struct hlist_head ptrace_traceme;
1: -	struct hlist_head capget;
1: -	struct hlist_head capset;
1: -	struct hlist_head capable;
1: -	struct hlist_head quotactl;
1: -	struct hlist_head quota_on;
1: -	struct hlist_head syslog;
1: -	struct hlist_head settime;
1: -	struct hlist_head vm_enough_memory;
1: -	struct hlist_head bprm_creds_for_exec;
1: -	struct hlist_head bprm_creds_from_file;
1: -	struct hlist_head bprm_check_security;
1: -	struct hlist_head bprm_committing_creds;
1: -	struct hlist_head bprm_committed_creds;
1: -	struct hlist_head fs_context_dup;
1: -	struct hlist_head fs_context_parse_param;
1: -	struct hlist_head sb_alloc_security;
1: -	struct hlist_head sb_free_security;
1: -	struct hlist_head sb_free_mnt_opts;
1: -	struct hlist_head sb_eat_lsm_opts;
1: -	struct hlist_head sb_remount;
1: -	struct hlist_head sb_kern_mount;
1: -	struct hlist_head sb_show_options;
1: -	struct hlist_head sb_statfs;
1: -	struct hlist_head sb_mount;
1: -	struct hlist_head sb_umount;
1: -	struct hlist_head sb_pivotroot;
1: -	struct hlist_head sb_set_mnt_opts;
1: -	struct hlist_head sb_clone_mnt_opts;
1: -	struct hlist_head sb_add_mnt_opt;
1: -	struct hlist_head move_mount;
1: -	struct hlist_head dentry_init_security;
1: -	struct hlist_head dentry_create_files_as;
1: -	struct hlist_head path_notify;
1: -	struct hlist_head inode_alloc_security;
1: -	struct hlist_head inode_free_security;
1: -	struct hlist_head inode_init_security;
1: -	struct hlist_head inode_create;
1: -	struct hlist_head inode_link;
1: -	struct hlist_head inode_unlink;
1: -	struct hlist_head inode_symlink;
1: -	struct hlist_head inode_mkdir;
1: -	struct hlist_head inode_rmdir;
1: -	struct hlist_head inode_mknod;
1: -	struct hlist_head inode_rename;
1: -	struct hlist_head inode_readlink;
1: -	struct hlist_head inode_follow_link;
1: -	struct hlist_head inode_permission;
1: -	struct hlist_head inode_setattr;
1: -	struct hlist_head inode_getattr;
1: -	struct hlist_head inode_setxattr;
1: -	struct hlist_head inode_post_setxattr;
1: -	struct hlist_head inode_getxattr;
1: -	struct hlist_head inode_listxattr;
1: -	struct hlist_head inode_removexattr;
1: -	struct hlist_head inode_need_killpriv;
1: -	struct hlist_head inode_killpriv;
1: -	struct hlist_head inode_getsecurity;
1: -	struct hlist_head inode_setsecurity;
1: -	struct hlist_head inode_listsecurity;
1: -	struct hlist_head inode_getsecid;
1: -	struct hlist_head inode_copy_up;
1: -	struct hlist_head inode_copy_up_xattr;
1: -	struct hlist_head kernfs_init_security;
1: -	struct hlist_head file_permission;
1: -	struct hlist_head file_alloc_security;
1: -	struct hlist_head file_free_security;
1: -	struct hlist_head file_ioctl;
1: -	struct hlist_head mmap_addr;
1: -	struct hlist_head mmap_file;
1: -	struct hlist_head file_mprotect;
1: -	struct hlist_head file_lock;
1: -	struct hlist_head file_fcntl;
1: -	struct hlist_head file_set_fowner;
1: -	struct hlist_head file_send_sigiotask;
1: -	struct hlist_head file_receive;
1: -	struct hlist_head file_open;
1: -	struct hlist_head task_alloc;
1: -	struct hlist_head task_free;
1: -	struct hlist_head cred_alloc_blank;
1: -	struct hlist_head cred_free;
1: -	struct hlist_head cred_prepare;
1: -	struct hlist_head cred_transfer;
1: -	struct hlist_head cred_getsecid;
1: -	struct hlist_head kernel_act_as;
1: -	struct hlist_head kernel_create_files_as;
1: -	struct hlist_head kernel_module_request;
1: -	struct hlist_head kernel_load_data;
1: -	struct hlist_head kernel_post_load_data;
1: -	struct hlist_head kernel_read_file;
1: -	struct hlist_head kernel_post_read_file;
1: -	struct hlist_head task_fix_setuid;
1: -	struct hlist_head task_fix_setgid;
1: -	struct hlist_head task_setpgid;
1: -	struct hlist_head task_getpgid;
1: -	struct hlist_head task_getsid;
1: -	struct hlist_head task_getsecid;
1: -	struct hlist_head task_setnice;
1: -	struct hlist_head task_setioprio;
1: -	struct hlist_head task_getioprio;
1: -	struct hlist_head task_prlimit;
1: -	struct hlist_head task_setrlimit;
1: -	struct hlist_head task_setscheduler;
1: -	struct hlist_head task_getscheduler;
1: -	struct hlist_head task_movememory;
1: -	struct hlist_head task_kill;
1: -	struct hlist_head task_prctl;
1: -	struct hlist_head task_to_inode;
1: -	struct hlist_head ipc_permission;
1: -	struct hlist_head ipc_getsecid;
1: -	struct hlist_head msg_msg_alloc_security;
1: -	struct hlist_head msg_msg_free_security;
1: -	struct hlist_head msg_queue_alloc_security;
1: -	struct hlist_head msg_queue_free_security;
1: -	struct hlist_head msg_queue_associate;
1: -	struct hlist_head msg_queue_msgctl;
1: -	struct hlist_head msg_queue_msgsnd;
1: -	struct hlist_head msg_queue_msgrcv;
1: -	struct hlist_head shm_alloc_security;
1: -	struct hlist_head shm_free_security;
1: -	struct hlist_head shm_associate;
1: -	struct hlist_head shm_shmctl;
1: -	struct hlist_head shm_shmat;
1: -	struct hlist_head sem_alloc_security;
1: -	struct hlist_head sem_free_security;
1: -	struct hlist_head sem_associate;
1: -	struct hlist_head sem_semctl;
1: -	struct hlist_head sem_semop;
1: -	struct hlist_head netlink_send;
1: -	struct hlist_head d_instantiate;
1: -	struct hlist_head getprocattr;
1: -	struct hlist_head setprocattr;
1: -	struct hlist_head ismaclabel;
1: -	struct hlist_head secid_to_secctx;
1: -	struct hlist_head secctx_to_secid;
1: -	struct hlist_head release_secctx;
1: -	struct hlist_head inode_invalidate_secctx;
1: -	struct hlist_head inode_notifysecctx;
1: -	struct hlist_head inode_setsecctx;
1: -	struct hlist_head inode_getsecctx;
1: -	struct hlist_head unix_stream_connect;
1: -	struct hlist_head unix_may_send;
1: -	struct hlist_head socket_create;
1: -	struct hlist_head socket_post_create;
1: -	struct hlist_head socket_socketpair;
1: -	struct hlist_head socket_bind;
1: -	struct hlist_head socket_connect;
1: -	struct hlist_head socket_listen;
1: -	struct hlist_head socket_accept;
1: -	struct hlist_head socket_sendmsg;
1: -	struct hlist_head socket_recvmsg;
1: -	struct hlist_head socket_getsockname;
1: -	struct hlist_head socket_getpeername;
1: -	struct hlist_head socket_getsockopt;
1: -	struct hlist_head socket_setsockopt;
1: -	struct hlist_head socket_shutdown;
1: -	struct hlist_head socket_sock_rcv_skb;
1: -	struct hlist_head socket_getpeersec_stream;
1: -	struct hlist_head socket_getpeersec_dgram;
1: -	struct hlist_head sk_alloc_security;
1: -	struct hlist_head sk_free_security;
1: -	struct hlist_head sk_clone_security;
1: -	struct hlist_head sk_getsecid;
1: -	struct hlist_head sock_graft;
1: -	struct hlist_head inet_conn_request;
1: -	struct hlist_head inet_csk_clone;
1: -	struct hlist_head inet_conn_established;
1: -	struct hlist_head secmark_relabel_packet;
1: -	struct hlist_head secmark_refcount_inc;
1: -	struct hlist_head secmark_refcount_dec;
1: -	struct hlist_head req_classify_flow;
1: -	struct hlist_head tun_dev_alloc_security;
1: -	struct hlist_head tun_dev_free_security;
1: -	struct hlist_head tun_dev_create;
1: -	struct hlist_head tun_dev_attach_queue;
1: -	struct hlist_head tun_dev_attach;
1: -	struct hlist_head tun_dev_open;
1: -	struct hlist_head sctp_assoc_request;
1: -	struct hlist_head sctp_bind_connect;
1: -	struct hlist_head sctp_sk_clone;
1: -	struct hlist_head key_alloc;
1: -	struct hlist_head key_free;
1: -	struct hlist_head key_permission;
1: -	struct hlist_head key_getsecurity;
1: -	struct hlist_head audit_rule_init;
1: -	struct hlist_head audit_rule_known;
1: -	struct hlist_head audit_rule_match;
1: -	struct hlist_head audit_rule_free;
1: -	struct hlist_head bpf;
1: -	struct hlist_head bpf_map;
1: -	struct hlist_head bpf_prog;
1: -	struct hlist_head bpf_map_alloc_security;
1: -	struct hlist_head bpf_map_free_security;
1: -	struct hlist_head bpf_prog_alloc_security;
1: -	struct hlist_head bpf_prog_free_security;
1: -	struct hlist_head locked_down;
1: -	struct hlist_head perf_event_open;
1: -	struct hlist_head perf_event_alloc;
1: -	struct hlist_head perf_event_free;
1: -	struct hlist_head perf_event_read;
1: -	struct hlist_head perf_event_write;
1: +  struct hlist_head binder_set_context_mgr;
1: +  struct hlist_head binder_transaction;
1: +  struct hlist_head binder_transfer_binder;
1: +  struct hlist_head binder_transfer_file;
1: +  struct hlist_head ptrace_access_check;
1: +  struct hlist_head ptrace_traceme;
1: +  struct hlist_head capget;
1: +  struct hlist_head capset;
1: +  struct hlist_head capable;
1: +  struct hlist_head quotactl;
1: +  struct hlist_head quota_on;
1: +  struct hlist_head syslog;
1: +  struct hlist_head settime;
1: +  struct hlist_head vm_enough_memory;
1: +  struct hlist_head bprm_creds_for_exec;
1: +  struct hlist_head bprm_creds_from_file;
1: +  struct hlist_head bprm_check_security;
1: +  struct hlist_head bprm_committing_creds;
1: +  struct hlist_head bprm_committed_creds;
1: +  struct hlist_head fs_context_dup;
1: +  struct hlist_head fs_context_parse_param;
1: +  struct hlist_head sb_alloc_security;
1: +  struct hlist_head sb_free_security;
1: +  struct hlist_head sb_free_mnt_opts;
1: +  struct hlist_head sb_eat_lsm_opts;
1: +  struct hlist_head sb_remount;
1: +  struct hlist_head sb_kern_mount;
1: +  struct hlist_head sb_show_options;
1: +  struct hlist_head sb_statfs;
1: +  struct hlist_head sb_mount;
1: +  struct hlist_head sb_umount;
1: +  struct hlist_head sb_pivotroot;
1: +  struct hlist_head sb_set_mnt_opts;
1: +  struct hlist_head sb_clone_mnt_opts;
1: +  struct hlist_head sb_add_mnt_opt;
1: +  struct hlist_head move_mount;
1: +  struct hlist_head dentry_init_security;
1: +  struct hlist_head dentry_create_files_as;
1: +  struct hlist_head path_notify;
1: +  struct hlist_head inode_alloc_security;
1: +  struct hlist_head inode_free_security;
1: +  struct hlist_head inode_init_security;
1: +  struct hlist_head inode_create;
1: +  struct hlist_head inode_link;
1: +  struct hlist_head inode_unlink;
1: +  struct hlist_head inode_symlink;
1: +  struct hlist_head inode_mkdir;
1: +  struct hlist_head inode_rmdir;
1: +  struct hlist_head inode_mknod;
1: +  struct hlist_head inode_rename;
1: +  struct hlist_head inode_readlink;
1: +  struct hlist_head inode_follow_link;
1: +  struct hlist_head inode_permission;
1: +  struct hlist_head inode_setattr;
1: +  struct hlist_head inode_getattr;
1: +  struct hlist_head inode_setxattr;
1: +  struct hlist_head inode_post_setxattr;
1: +  struct hlist_head inode_getxattr;
1: +  struct hlist_head inode_listxattr;
1: +  struct hlist_head inode_removexattr;
1: +  struct hlist_head inode_need_killpriv;
1: +  struct hlist_head inode_killpriv;
1: +  struct hlist_head inode_getsecurity;
1: +  struct hlist_head inode_setsecurity;
1: +  struct hlist_head inode_listsecurity;
1: +  struct hlist_head inode_getsecid;
1: +  struct hlist_head inode_copy_up;
1: +  struct hlist_head inode_copy_up_xattr;
1: +  struct hlist_head kernfs_init_security;
1: +  struct hlist_head file_permission;
1: +  struct hlist_head file_alloc_security;
1: +  struct hlist_head file_free_security;
1: +  struct hlist_head file_ioctl;
1: +  struct hlist_head mmap_addr;
1: +  struct hlist_head mmap_file;
1: +  struct hlist_head file_mprotect;
1: +  struct hlist_head file_lock;
1: +  struct hlist_head file_fcntl;
1: +  struct hlist_head file_set_fowner;
1: +  struct hlist_head file_send_sigiotask;
1: +  struct hlist_head file_receive;
1: +  struct hlist_head file_open;
1: +  struct hlist_head task_alloc;
1: +  struct hlist_head task_free;
1: +  struct hlist_head cred_alloc_blank;
1: +  struct hlist_head cred_free;
1: +  struct hlist_head cred_prepare;
1: +  struct hlist_head cred_transfer;
1: +  struct hlist_head cred_getsecid;
1: +  struct hlist_head kernel_act_as;
1: +  struct hlist_head kernel_create_files_as;
1: +  struct hlist_head kernel_module_request;
1: +  struct hlist_head kernel_load_data;
1: +  struct hlist_head kernel_post_load_data;
1: +  struct hlist_head kernel_read_file;
1: +  struct hlist_head kernel_post_read_file;
1: +  struct hlist_head task_fix_setuid;
1: +  struct hlist_head task_fix_setgid;
1: +  struct hlist_head task_setpgid;
1: +  struct hlist_head task_getpgid;
1: +  struct hlist_head task_getsid;
1: +  struct hlist_head task_getsecid;
1: +  struct hlist_head task_setnice;
1: +  struct hlist_head task_setioprio;
1: +  struct hlist_head task_getioprio;
1: +  struct hlist_head task_prlimit;
1: +  struct hlist_head task_setrlimit;
1: +  struct hlist_head task_setscheduler;
1: +  struct hlist_head task_getscheduler;
1: +  struct hlist_head task_movememory;
1: +  struct hlist_head task_kill;
1: +  struct hlist_head task_prctl;
1: +  struct hlist_head task_to_inode;
1: +  struct hlist_head ipc_permission;
1: +  struct hlist_head ipc_getsecid;
1: +  struct hlist_head msg_msg_alloc_security;
1: +  struct hlist_head msg_msg_free_security;
1: +  struct hlist_head msg_queue_alloc_security;
1: +  struct hlist_head msg_queue_free_security;
1: +  struct hlist_head msg_queue_associate;
1: +  struct hlist_head msg_queue_msgctl;
1: +  struct hlist_head msg_queue_msgsnd;
1: +  struct hlist_head msg_queue_msgrcv;
1: +  struct hlist_head shm_alloc_security;
1: +  struct hlist_head shm_free_security;
1: +  struct hlist_head shm_associate;
1: +  struct hlist_head shm_shmctl;
1: +  struct hlist_head shm_shmat;
1: +  struct hlist_head sem_alloc_security;
1: +  struct hlist_head sem_free_security;
1: +  struct hlist_head sem_associate;
1: +  struct hlist_head sem_semctl;
1: +  struct hlist_head sem_semop;
1: +  struct hlist_head netlink_send;
1: +  struct hlist_head d_instantiate;
1: +  struct hlist_head getprocattr;
1: +  struct hlist_head setprocattr;
1: +  struct hlist_head ismaclabel;
1: +  struct hlist_head secid_to_secctx;
1: +  struct hlist_head secctx_to_secid;
1: +  struct hlist_head release_secctx;
1: +  struct hlist_head inode_invalidate_secctx;
1: +  struct hlist_head inode_notifysecctx;
1: +  struct hlist_head inode_setsecctx;
1: +  struct hlist_head inode_getsecctx;
1: +  struct hlist_head unix_stream_connect;
1: +  struct hlist_head unix_may_send;
1: +  struct hlist_head socket_create;
1: +  struct hlist_head socket_post_create;
1: +  struct hlist_head socket_socketpair;
1: +  struct hlist_head socket_bind;
1: +  struct hlist_head socket_connect;
1: +  struct hlist_head socket_listen;
1: +  struct hlist_head socket_accept;
1: +  struct hlist_head socket_sendmsg;
1: +  struct hlist_head socket_recvmsg;
1: +  struct hlist_head socket_getsockname;
1: +  struct hlist_head socket_getpeername;
1: +  struct hlist_head socket_getsockopt;
1: +  struct hlist_head socket_setsockopt;
1: +  struct hlist_head socket_shutdown;
1: +  struct hlist_head socket_sock_rcv_skb;
1: +  struct hlist_head socket_getpeersec_stream;
1: +  struct hlist_head socket_getpeersec_dgram;
1: +  struct hlist_head sk_alloc_security;
1: +  struct hlist_head sk_free_security;
1: +  struct hlist_head sk_clone_security;
1: +  struct hlist_head sk_getsecid;
1: +  struct hlist_head sock_graft;
1: +  struct hlist_head inet_conn_request;
1: +  struct hlist_head inet_csk_clone;
1: +  struct hlist_head inet_conn_established;
1: +  struct hlist_head secmark_relabel_packet;
1: +  struct hlist_head secmark_refcount_inc;
1: +  struct hlist_head secmark_refcount_dec;
1: +  struct hlist_head req_classify_flow;
1: +  struct hlist_head tun_dev_alloc_security;
1: +  struct hlist_head tun_dev_free_security;
1: +  struct hlist_head tun_dev_create;
1: +  struct hlist_head tun_dev_attach_queue;
1: +  struct hlist_head tun_dev_attach;
1: +  struct hlist_head tun_dev_open;
1: +  struct hlist_head sctp_assoc_request;
1: +  struct hlist_head sctp_bind_connect;
1: +  struct hlist_head sctp_sk_clone;
1: +  struct hlist_head key_alloc;
1: +  struct hlist_head key_free;
1: +  struct hlist_head key_permission;
1: +  struct hlist_head key_getsecurity;
1: +  struct hlist_head audit_rule_init;
1: +  struct hlist_head audit_rule_known;
1: +  struct hlist_head audit_rule_match;
1: +  struct hlist_head audit_rule_free;
1: +  struct hlist_head bpf;
1: +  struct hlist_head bpf_map;
1: +  struct hlist_head bpf_prog;
1: +  struct hlist_head bpf_map_alloc_security;
1: +  struct hlist_head bpf_map_free_security;
1: +  struct hlist_head bpf_prog_alloc_security;
1: +  struct hlist_head bpf_prog_free_security;
1: +  struct hlist_head locked_down;
1: +  struct hlist_head perf_event_open;
1: +  struct hlist_head perf_event_alloc;
1: +  struct hlist_head perf_event_free;
1: +  struct hlist_head perf_event_read;
1: +  struct hlist_head perf_event_write;
1:  };
1:  
1:  struct security_hook_list {
1: -	struct hlist_node list;
1: -	struct hlist_head *head;
1: -	union security_list_options hook;
1: -	char *lsm;
1: +  struct hlist_node list;
1: +  struct hlist_head *head;
1: +  union security_list_options hook;
1: +  char *lsm;
1:  };
1:  
1:  enum lsm_order {
1: -	LSM_ORDER_FIRST = 4294967295,
1: -	LSM_ORDER_MUTABLE = 0,
1: +  LSM_ORDER_FIRST = 4294967295,
1: +  LSM_ORDER_MUTABLE = 0,
1:  };
1:  
1:  struct lsm_info {
1: -	const char *name;
1: -	enum lsm_order order;
1: -	long unsigned int flags;
1: -	int *enabled;
1: -	int (*init)();
1: -	struct lsm_blob_sizes *blobs;
1: +  const char *name;
1: +  enum lsm_order order;
1: +  long unsigned int flags;
1: +  int *enabled;
1: +  int (*init)();
1: +  struct lsm_blob_sizes *blobs;
1:  };
1:  
1:  enum lsm_event {
1: -	LSM_POLICY_CHANGE = 0,
1: +  LSM_POLICY_CHANGE = 0,
1:  };
1:  
1:  typedef int (*initxattrs)(struct inode *, const struct xattr *, void *);
1:  
1:  enum ib_uverbs_write_cmds {
1: -	IB_USER_VERBS_CMD_GET_CONTEXT = 0,
1: -	IB_USER_VERBS_CMD_QUERY_DEVICE = 1,
1: -	IB_USER_VERBS_CMD_QUERY_PORT = 2,
1: -	IB_USER_VERBS_CMD_ALLOC_PD = 3,
1: -	IB_USER_VERBS_CMD_DEALLOC_PD = 4,
1: -	IB_USER_VERBS_CMD_CREATE_AH = 5,
1: -	IB_USER_VERBS_CMD_MODIFY_AH = 6,
1: -	IB_USER_VERBS_CMD_QUERY_AH = 7,
1: -	IB_USER_VERBS_CMD_DESTROY_AH = 8,
1: -	IB_USER_VERBS_CMD_REG_MR = 9,
1: -	IB_USER_VERBS_CMD_REG_SMR = 10,
1: -	IB_USER_VERBS_CMD_REREG_MR = 11,
1: -	IB_USER_VERBS_CMD_QUERY_MR = 12,
1: -	IB_USER_VERBS_CMD_DEREG_MR = 13,
1: -	IB_USER_VERBS_CMD_ALLOC_MW = 14,
1: -	IB_USER_VERBS_CMD_BIND_MW = 15,
1: -	IB_USER_VERBS_CMD_DEALLOC_MW = 16,
1: -	IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL = 17,
1: -	IB_USER_VERBS_CMD_CREATE_CQ = 18,
1: -	IB_USER_VERBS_CMD_RESIZE_CQ = 19,
1: -	IB_USER_VERBS_CMD_DESTROY_CQ = 20,
1: -	IB_USER_VERBS_CMD_POLL_CQ = 21,
1: -	IB_USER_VERBS_CMD_PEEK_CQ = 22,
1: -	IB_USER_VERBS_CMD_REQ_NOTIFY_CQ = 23,
1: -	IB_USER_VERBS_CMD_CREATE_QP = 24,
1: -	IB_USER_VERBS_CMD_QUERY_QP = 25,
1: -	IB_USER_VERBS_CMD_MODIFY_QP = 26,
1: -	IB_USER_VERBS_CMD_DESTROY_QP = 27,
1: -	IB_USER_VERBS_CMD_POST_SEND = 28,
1: -	IB_USER_VERBS_CMD_POST_RECV = 29,
1: -	IB_USER_VERBS_CMD_ATTACH_MCAST = 30,
1: -	IB_USER_VERBS_CMD_DETACH_MCAST = 31,
1: -	IB_USER_VERBS_CMD_CREATE_SRQ = 32,
1: -	IB_USER_VERBS_CMD_MODIFY_SRQ = 33,
1: -	IB_USER_VERBS_CMD_QUERY_SRQ = 34,
1: -	IB_USER_VERBS_CMD_DESTROY_SRQ = 35,
1: -	IB_USER_VERBS_CMD_POST_SRQ_RECV = 36,
1: -	IB_USER_VERBS_CMD_OPEN_XRCD = 37,
1: -	IB_USER_VERBS_CMD_CLOSE_XRCD = 38,
1: -	IB_USER_VERBS_CMD_CREATE_XSRQ = 39,
1: -	IB_USER_VERBS_CMD_OPEN_QP = 40,
1: +  IB_USER_VERBS_CMD_GET_CONTEXT = 0,
1: +  IB_USER_VERBS_CMD_QUERY_DEVICE = 1,
1: +  IB_USER_VERBS_CMD_QUERY_PORT = 2,
1: +  IB_USER_VERBS_CMD_ALLOC_PD = 3,
1: +  IB_USER_VERBS_CMD_DEALLOC_PD = 4,
1: +  IB_USER_VERBS_CMD_CREATE_AH = 5,
1: +  IB_USER_VERBS_CMD_MODIFY_AH = 6,
1: +  IB_USER_VERBS_CMD_QUERY_AH = 7,
1: +  IB_USER_VERBS_CMD_DESTROY_AH = 8,
1: +  IB_USER_VERBS_CMD_REG_MR = 9,
1: +  IB_USER_VERBS_CMD_REG_SMR = 10,
1: +  IB_USER_VERBS_CMD_REREG_MR = 11,
1: +  IB_USER_VERBS_CMD_QUERY_MR = 12,
1: +  IB_USER_VERBS_CMD_DEREG_MR = 13,
1: +  IB_USER_VERBS_CMD_ALLOC_MW = 14,
1: +  IB_USER_VERBS_CMD_BIND_MW = 15,
1: +  IB_USER_VERBS_CMD_DEALLOC_MW = 16,
1: +  IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL = 17,
1: +  IB_USER_VERBS_CMD_CREATE_CQ = 18,
1: +  IB_USER_VERBS_CMD_RESIZE_CQ = 19,
1: +  IB_USER_VERBS_CMD_DESTROY_CQ = 20,
1: +  IB_USER_VERBS_CMD_POLL_CQ = 21,
1: +  IB_USER_VERBS_CMD_PEEK_CQ = 22,
1: +  IB_USER_VERBS_CMD_REQ_NOTIFY_CQ = 23,
1: +  IB_USER_VERBS_CMD_CREATE_QP = 24,
1: +  IB_USER_VERBS_CMD_QUERY_QP = 25,
1: +  IB_USER_VERBS_CMD_MODIFY_QP = 26,
1: +  IB_USER_VERBS_CMD_DESTROY_QP = 27,
1: +  IB_USER_VERBS_CMD_POST_SEND = 28,
1: +  IB_USER_VERBS_CMD_POST_RECV = 29,
1: +  IB_USER_VERBS_CMD_ATTACH_MCAST = 30,
1: +  IB_USER_VERBS_CMD_DETACH_MCAST = 31,
1: +  IB_USER_VERBS_CMD_CREATE_SRQ = 32,
1: +  IB_USER_VERBS_CMD_MODIFY_SRQ = 33,
1: +  IB_USER_VERBS_CMD_QUERY_SRQ = 34,
1: +  IB_USER_VERBS_CMD_DESTROY_SRQ = 35,
1: +  IB_USER_VERBS_CMD_POST_SRQ_RECV = 36,
1: +  IB_USER_VERBS_CMD_OPEN_XRCD = 37,
1: +  IB_USER_VERBS_CMD_CLOSE_XRCD = 38,
1: +  IB_USER_VERBS_CMD_CREATE_XSRQ = 39,
1: +  IB_USER_VERBS_CMD_OPEN_QP = 40,
1:  };
1:  
1:  enum ib_uverbs_wc_opcode {
1: -	IB_UVERBS_WC_SEND = 0,
1: -	IB_UVERBS_WC_RDMA_WRITE = 1,
1: -	IB_UVERBS_WC_RDMA_READ = 2,
1: -	IB_UVERBS_WC_COMP_SWAP = 3,
1: -	IB_UVERBS_WC_FETCH_ADD = 4,
1: -	IB_UVERBS_WC_BIND_MW = 5,
1: -	IB_UVERBS_WC_LOCAL_INV = 6,
1: -	IB_UVERBS_WC_TSO = 7,
1: +  IB_UVERBS_WC_SEND = 0,
1: +  IB_UVERBS_WC_RDMA_WRITE = 1,
1: +  IB_UVERBS_WC_RDMA_READ = 2,
1: +  IB_UVERBS_WC_COMP_SWAP = 3,
1: +  IB_UVERBS_WC_FETCH_ADD = 4,
1: +  IB_UVERBS_WC_BIND_MW = 5,
1: +  IB_UVERBS_WC_LOCAL_INV = 6,
1: +  IB_UVERBS_WC_TSO = 7,
1:  };
1:  
1:  enum ib_uverbs_create_qp_mask {
1: -	IB_UVERBS_CREATE_QP_MASK_IND_TABLE = 1,
1: +  IB_UVERBS_CREATE_QP_MASK_IND_TABLE = 1,
1:  };
1:  
1:  enum ib_uverbs_wr_opcode {
1: -	IB_UVERBS_WR_RDMA_WRITE = 0,
1: -	IB_UVERBS_WR_RDMA_WRITE_WITH_IMM = 1,
1: -	IB_UVERBS_WR_SEND = 2,
1: -	IB_UVERBS_WR_SEND_WITH_IMM = 3,
1: -	IB_UVERBS_WR_RDMA_READ = 4,
1: -	IB_UVERBS_WR_ATOMIC_CMP_AND_SWP = 5,
1: -	IB_UVERBS_WR_ATOMIC_FETCH_AND_ADD = 6,
1: -	IB_UVERBS_WR_LOCAL_INV = 7,
1: -	IB_UVERBS_WR_BIND_MW = 8,
1: -	IB_UVERBS_WR_SEND_WITH_INV = 9,
1: -	IB_UVERBS_WR_TSO = 10,
1: -	IB_UVERBS_WR_RDMA_READ_WITH_INV = 11,
1: -	IB_UVERBS_WR_MASKED_ATOMIC_CMP_AND_SWP = 12,
1: -	IB_UVERBS_WR_MASKED_ATOMIC_FETCH_AND_ADD = 13,
1: +  IB_UVERBS_WR_RDMA_WRITE = 0,
1: +  IB_UVERBS_WR_RDMA_WRITE_WITH_IMM = 1,
1: +  IB_UVERBS_WR_SEND = 2,
1: +  IB_UVERBS_WR_SEND_WITH_IMM = 3,
1: +  IB_UVERBS_WR_RDMA_READ = 4,
1: +  IB_UVERBS_WR_ATOMIC_CMP_AND_SWP = 5,
1: +  IB_UVERBS_WR_ATOMIC_FETCH_AND_ADD = 6,
1: +  IB_UVERBS_WR_LOCAL_INV = 7,
1: +  IB_UVERBS_WR_BIND_MW = 8,
1: +  IB_UVERBS_WR_SEND_WITH_INV = 9,
1: +  IB_UVERBS_WR_TSO = 10,
1: +  IB_UVERBS_WR_RDMA_READ_WITH_INV = 11,
1: +  IB_UVERBS_WR_MASKED_ATOMIC_CMP_AND_SWP = 12,
1: +  IB_UVERBS_WR_MASKED_ATOMIC_FETCH_AND_ADD = 13,
1:  };
1:  
1:  enum ib_uverbs_access_flags {
1: -	IB_UVERBS_ACCESS_LOCAL_WRITE = 1,
1: -	IB_UVERBS_ACCESS_REMOTE_WRITE = 2,
1: -	IB_UVERBS_ACCESS_REMOTE_READ = 4,
1: -	IB_UVERBS_ACCESS_REMOTE_ATOMIC = 8,
1: -	IB_UVERBS_ACCESS_MW_BIND = 16,
1: -	IB_UVERBS_ACCESS_ZERO_BASED = 32,
1: -	IB_UVERBS_ACCESS_ON_DEMAND = 64,
1: -	IB_UVERBS_ACCESS_HUGETLB = 128,
1: -	IB_UVERBS_ACCESS_RELAXED_ORDERING = 1048576,
1: -	IB_UVERBS_ACCESS_OPTIONAL_RANGE = 1072693248,
1: +  IB_UVERBS_ACCESS_LOCAL_WRITE = 1,
1: +  IB_UVERBS_ACCESS_REMOTE_WRITE = 2,
1: +  IB_UVERBS_ACCESS_REMOTE_READ = 4,
1: +  IB_UVERBS_ACCESS_REMOTE_ATOMIC = 8,
1: +  IB_UVERBS_ACCESS_MW_BIND = 16,
1: +  IB_UVERBS_ACCESS_ZERO_BASED = 32,
1: +  IB_UVERBS_ACCESS_ON_DEMAND = 64,
1: +  IB_UVERBS_ACCESS_HUGETLB = 128,
1: +  IB_UVERBS_ACCESS_RELAXED_ORDERING = 1048576,
1: +  IB_UVERBS_ACCESS_OPTIONAL_RANGE = 1072693248,
1:  };
1:  
1:  enum ib_uverbs_srq_type {
1: -	IB_UVERBS_SRQT_BASIC = 0,
1: -	IB_UVERBS_SRQT_XRC = 1,
1: -	IB_UVERBS_SRQT_TM = 2,
1: +  IB_UVERBS_SRQT_BASIC = 0,
1: +  IB_UVERBS_SRQT_XRC = 1,
1: +  IB_UVERBS_SRQT_TM = 2,
1:  };
1:  
1:  enum ib_uverbs_wq_type {
1: -	IB_UVERBS_WQT_RQ = 0,
1: +  IB_UVERBS_WQT_RQ = 0,
1:  };
1:  
1:  enum ib_uverbs_wq_flags {
1: -	IB_UVERBS_WQ_FLAGS_CVLAN_STRIPPING = 1,
1: -	IB_UVERBS_WQ_FLAGS_SCATTER_FCS = 2,
1: -	IB_UVERBS_WQ_FLAGS_DELAY_DROP = 4,
1: -	IB_UVERBS_WQ_FLAGS_PCI_WRITE_END_PADDING = 8,
1: +  IB_UVERBS_WQ_FLAGS_CVLAN_STRIPPING = 1,
1: +  IB_UVERBS_WQ_FLAGS_SCATTER_FCS = 2,
1: +  IB_UVERBS_WQ_FLAGS_DELAY_DROP = 4,
1: +  IB_UVERBS_WQ_FLAGS_PCI_WRITE_END_PADDING = 8,
1:  };
1:  
1:  enum ib_uverbs_qp_type {
1: -	IB_UVERBS_QPT_RC = 2,
1: -	IB_UVERBS_QPT_UC = 3,
1: -	IB_UVERBS_QPT_UD = 4,
1: -	IB_UVERBS_QPT_RAW_PACKET = 8,
1: -	IB_UVERBS_QPT_XRC_INI = 9,
1: -	IB_UVERBS_QPT_XRC_TGT = 10,
1: -	IB_UVERBS_QPT_DRIVER = 255,
1: +  IB_UVERBS_QPT_RC = 2,
1: +  IB_UVERBS_QPT_UC = 3,
1: +  IB_UVERBS_QPT_UD = 4,
1: +  IB_UVERBS_QPT_RAW_PACKET = 8,
1: +  IB_UVERBS_QPT_XRC_INI = 9,
1: +  IB_UVERBS_QPT_XRC_TGT = 10,
1: +  IB_UVERBS_QPT_DRIVER = 255,
1:  };
1:  
1:  enum ib_uverbs_qp_create_flags {
1: -	IB_UVERBS_QP_CREATE_BLOCK_MULTICAST_LOOPBACK = 2,
1: -	IB_UVERBS_QP_CREATE_SCATTER_FCS = 256,
1: -	IB_UVERBS_QP_CREATE_CVLAN_STRIPPING = 512,
1: -	IB_UVERBS_QP_CREATE_PCI_WRITE_END_PADDING = 2048,
1: -	IB_UVERBS_QP_CREATE_SQ_SIG_ALL = 4096,
1: +  IB_UVERBS_QP_CREATE_BLOCK_MULTICAST_LOOPBACK = 2,
1: +  IB_UVERBS_QP_CREATE_SCATTER_FCS = 256,
1: +  IB_UVERBS_QP_CREATE_CVLAN_STRIPPING = 512,
1: +  IB_UVERBS_QP_CREATE_PCI_WRITE_END_PADDING = 2048,
1: +  IB_UVERBS_QP_CREATE_SQ_SIG_ALL = 4096,
1:  };
1:  
1:  enum ib_uverbs_gid_type {
1: -	IB_UVERBS_GID_TYPE_IB = 0,
1: -	IB_UVERBS_GID_TYPE_ROCE_V1 = 1,
1: -	IB_UVERBS_GID_TYPE_ROCE_V2 = 2,
1: +  IB_UVERBS_GID_TYPE_IB = 0,
1: +  IB_UVERBS_GID_TYPE_ROCE_V1 = 1,
1: +  IB_UVERBS_GID_TYPE_ROCE_V2 = 2,
1:  };
1:  
1:  enum ib_poll_context {
1: -	IB_POLL_SOFTIRQ = 0,
1: -	IB_POLL_WORKQUEUE = 1,
1: -	IB_POLL_UNBOUND_WORKQUEUE = 2,
1: -	IB_POLL_LAST_POOL_TYPE = 2,
1: -	IB_POLL_DIRECT = 3,
1: +  IB_POLL_SOFTIRQ = 0,
1: +  IB_POLL_WORKQUEUE = 1,
1: +  IB_POLL_UNBOUND_WORKQUEUE = 2,
1: +  IB_POLL_LAST_POOL_TYPE = 2,
1: +  IB_POLL_DIRECT = 3,
1:  };
1:  
1:  struct lsm_network_audit {
1: -	int netif;
1: -	struct sock *sk;
1: -	u16 family;
1: -	__be16 dport;
1: -	__be16 sport;
1: -	union {
1: -		struct {
1: -			__be32 daddr;
1: -			__be32 saddr;
1: -		} v4;
1: -		struct {
1: -			struct in6_addr daddr;
1: -			struct in6_addr saddr;
1: -		} v6;
1: -	} fam;
1: +  int netif;
1: +  struct sock *sk;
1: +  u16 family;
1: +  __be16 dport;
1: +  __be16 sport;
1: +  union {
1: +    struct {
1: +      __be32 daddr;
1: +      __be32 saddr;
1: +    } v4;
1: +    struct {
1: +      struct in6_addr daddr;
1: +      struct in6_addr saddr;
1: +    } v6;
1: +  } fam;
1:  };
1:  
1:  struct lsm_ioctlop_audit {
1: -	struct path path;
1: -	u16 cmd;
1: +  struct path path;
1: +  u16 cmd;
1:  };
1:  
1:  struct lsm_ibpkey_audit {
1: -	u64 subnet_prefix;
1: -	u16 pkey;
1: +  u64 subnet_prefix;
1: +  u16 pkey;
1:  };
1:  
1:  struct lsm_ibendport_audit {
1: -	char dev_name[64];
1: -	u8 port;
1: +  char dev_name[64];
1: +  u8 port;
1:  };
1:  
1:  struct selinux_state;
1:  
1:  struct selinux_audit_data {
1: -	u32 ssid;
1: -	u32 tsid;
1: -	u16 tclass;
1: -	u32 requested;
1: -	u32 audited;
1: -	u32 denied;
1: -	int result;
1: -	struct selinux_state *state;
1: +  u32 ssid;
1: +  u32 tsid;
1: +  u16 tclass;
1: +  u32 requested;
1: +  u32 audited;
1: +  u32 denied;
1: +  int result;
1: +  struct selinux_state *state;
1:  };
1:  
1:  struct common_audit_data {
1: -	char type;
1: -	union {
1: -		struct path path;
1: -		struct dentry *dentry;
1: -		struct inode *inode;
1: -		struct lsm_network_audit *net;
1: -		int cap;
1: -		int ipc_id;
1: -		struct task_struct *tsk;
1: -		struct {
1: -			key_serial_t key;
1: -			char *key_desc;
1: -		} key_struct;
1: -		char *kmod_name;
1: -		struct lsm_ioctlop_audit *op;
1: -		struct file *file;
1: -		struct lsm_ibpkey_audit *ibpkey;
1: -		struct lsm_ibendport_audit *ibendport;
1: -		int reason;
1: -	} u;
1: -	union {
1: -		struct selinux_audit_data *selinux_audit_data;
1: -	};
1: -};
1: -
1: -enum {
1: -	POLICYDB_CAPABILITY_NETPEER = 0,
1: -	POLICYDB_CAPABILITY_OPENPERM = 1,
1: -	POLICYDB_CAPABILITY_EXTSOCKCLASS = 2,
1: -	POLICYDB_CAPABILITY_ALWAYSNETWORK = 3,
1: -	POLICYDB_CAPABILITY_CGROUPSECLABEL = 4,
1: -	POLICYDB_CAPABILITY_NNP_NOSUID_TRANSITION = 5,
1: -	POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS = 6,
1: -	__POLICYDB_CAPABILITY_MAX = 7,
1: +  char type;
1: +  union {
1: +    struct path path;
1: +    struct dentry *dentry;
1: +    struct inode *inode;
1: +    struct lsm_network_audit *net;
1: +    int cap;
1: +    int ipc_id;
1: +    struct task_struct *tsk;
1: +    struct {
1: +      key_serial_t key;
1: +      char *key_desc;
1: +    } key_struct;
1: +    char *kmod_name;
1: +    struct lsm_ioctlop_audit *op;
1: +    struct file *file;
1: +    struct lsm_ibpkey_audit *ibpkey;
1: +    struct lsm_ibendport_audit *ibendport;
1: +    int reason;
1: +  } u;
1: +  union {
1: +    struct selinux_audit_data *selinux_audit_data;
1: +  };
1: +};
1: +
1: +enum {
1: +  POLICYDB_CAPABILITY_NETPEER = 0,
1: +  POLICYDB_CAPABILITY_OPENPERM = 1,
1: +  POLICYDB_CAPABILITY_EXTSOCKCLASS = 2,
1: +  POLICYDB_CAPABILITY_ALWAYSNETWORK = 3,
1: +  POLICYDB_CAPABILITY_CGROUPSECLABEL = 4,
1: +  POLICYDB_CAPABILITY_NNP_NOSUID_TRANSITION = 5,
1: +  POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS = 6,
1: +  __POLICYDB_CAPABILITY_MAX = 7,
1:  };
1:  
1:  struct selinux_avc;
1: @@ -58108,151 +59023,152 @@ struct selinux_avc;
1:  struct selinux_policy;
1:  
1:  struct selinux_state {
1: -	bool disabled;
1: -	bool enforcing;
1: -	bool checkreqprot;
1: -	bool initialized;
1: -	bool policycap[7];
1: -	struct page *status_page;
1: -	struct mutex status_lock;
1: -	struct selinux_avc *avc;
1: -	struct selinux_policy *policy;
1: -	struct mutex policy_mutex;
1: +  bool disabled;
1: +  bool enforcing;
1: +  bool checkreqprot;
1: +  bool initialized;
1: +  bool policycap[7];
1: +  struct page *status_page;
1: +  struct mutex status_lock;
1: +  struct selinux_avc *avc;
1: +  struct selinux_policy *policy;
1: +  struct mutex policy_mutex;
1:  };
1:  
1:  struct avc_cache {
1: -	struct hlist_head slots[512];
1: -	spinlock_t slots_lock[512];
1: -	atomic_t lru_hint;
1: -	atomic_t active_nodes;
1: -	u32 latest_notif;
1: +  struct hlist_head slots[512];
1: +  spinlock_t slots_lock[512];
1: +  atomic_t lru_hint;
1: +  atomic_t active_nodes;
1: +  u32 latest_notif;
1:  };
1:  
1:  struct selinux_avc {
1: -	unsigned int avc_cache_threshold;
1: -	struct avc_cache avc_cache;
1: +  unsigned int avc_cache_threshold;
1: +  struct avc_cache avc_cache;
1:  };
1:  
1:  struct av_decision {
1: -	u32 allowed;
1: -	u32 auditallow;
1: -	u32 auditdeny;
1: -	u32 seqno;
1: -	u32 flags;
1: +  u32 allowed;
1: +  u32 auditallow;
1: +  u32 auditdeny;
1: +  u32 seqno;
1: +  u32 flags;
1:  };
1:  
1:  struct extended_perms_data {
1: -	u32 p[8];
1: +  u32 p[8];
1:  };
1:  
1:  struct extended_perms_decision {
1: -	u8 used;
1: -	u8 driver;
1: -	struct extended_perms_data *allowed;
1: -	struct extended_perms_data *auditallow;
1: -	struct extended_perms_data *dontaudit;
1: +  u8 used;
1: +  u8 driver;
1: +  struct extended_perms_data *allowed;
1: +  struct extended_perms_data *auditallow;
1: +  struct extended_perms_data *dontaudit;
1:  };
1:  
1:  struct extended_perms {
1: -	u16 len;
1: -	struct extended_perms_data drivers;
1: +  u16 len;
1: +  struct extended_perms_data drivers;
1:  };
1:  
1:  struct avc_cache_stats {
1: -	unsigned int lookups;
1: -	unsigned int misses;
1: -	unsigned int allocations;
1: -	unsigned int reclaims;
1: -	unsigned int frees;
1: +  unsigned int lookups;
1: +  unsigned int misses;
1: +  unsigned int allocations;
1: +  unsigned int reclaims;
1: +  unsigned int frees;
1:  };
1:  
1:  struct security_class_mapping {
1: -	const char *name;
1: -	const char *perms[33];
1: +  const char *name;
1: +  const char *perms[33];
1:  };
1:  
1:  struct trace_event_raw_selinux_audited {
1: -	struct trace_entry ent;
1: -	u32 requested;
1: -	u32 denied;
1: -	u32 audited;
1: -	int result;
1: -	u32 __data_loc_scontext;
1: -	u32 __data_loc_tcontext;
1: -	u32 __data_loc_tclass;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 requested;
1: +  u32 denied;
1: +  u32 audited;
1: +  int result;
1: +  u32 __data_loc_scontext;
1: +  u32 __data_loc_tcontext;
1: +  u32 __data_loc_tclass;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_selinux_audited {
1: -	u32 scontext;
1: -	u32 tcontext;
1: -	u32 tclass;
1: +  u32 scontext;
1: +  u32 tcontext;
1: +  u32 tclass;
1:  };
1:  
1: -typedef void (*btf_trace_selinux_audited)(void *, struct selinux_audit_data *, char *, char *, const char *);
1: +typedef void (*btf_trace_selinux_audited)(void *, struct selinux_audit_data *,
1: +                                          char *, char *, const char *);
1:  
1:  struct avc_xperms_node;
1:  
1:  struct avc_entry {
1: -	u32 ssid;
1: -	u32 tsid;
1: -	u16 tclass;
1: -	struct av_decision avd;
1: -	struct avc_xperms_node *xp_node;
1: +  u32 ssid;
1: +  u32 tsid;
1: +  u16 tclass;
1: +  struct av_decision avd;
1: +  struct avc_xperms_node *xp_node;
1:  };
1:  
1:  struct avc_xperms_node {
1: -	struct extended_perms xp;
1: -	struct list_head xpd_head;
1: +  struct extended_perms xp;
1: +  struct list_head xpd_head;
1:  };
1:  
1:  struct avc_node {
1: -	struct avc_entry ae;
1: -	struct hlist_node list;
1: -	struct callback_head rhead;
1: +  struct avc_entry ae;
1: +  struct hlist_node list;
1: +  struct callback_head rhead;
1:  };
1:  
1:  struct avc_xperms_decision_node {
1: -	struct extended_perms_decision xpd;
1: -	struct list_head xpd_list;
1: +  struct extended_perms_decision xpd;
1: +  struct list_head xpd_list;
1:  };
1:  
1:  struct avc_callback_node {
1: -	int (*callback)(u32);
1: -	u32 events;
1: -	struct avc_callback_node *next;
1: +  int (*callback)(u32);
1: +  u32 events;
1: +  struct avc_callback_node *next;
1:  };
1:  
1:  typedef __u16 __sum16;
1:  
1:  enum sctp_endpoint_type {
1: -	SCTP_EP_TYPE_SOCKET = 0,
1: -	SCTP_EP_TYPE_ASSOCIATION = 1,
1: +  SCTP_EP_TYPE_SOCKET = 0,
1: +  SCTP_EP_TYPE_ASSOCIATION = 1,
1:  };
1:  
1:  struct sctp_chunk;
1:  
1:  struct sctp_inq {
1: -	struct list_head in_chunk_list;
1: -	struct sctp_chunk *in_progress;
1: -	struct work_struct immediate;
1: +  struct list_head in_chunk_list;
1: +  struct sctp_chunk *in_progress;
1: +  struct work_struct immediate;
1:  };
1:  
1:  struct sctp_bind_addr {
1: -	__u16 port;
1: -	struct list_head address_list;
1: +  __u16 port;
1: +  struct list_head address_list;
1:  };
1:  
1:  struct sctp_ep_common {
1: -	struct hlist_node node;
1: -	int hashent;
1: -	enum sctp_endpoint_type type;
1: -	refcount_t refcnt;
1: -	bool dead;
1: -	struct sock *sk;
1: -	struct net *net;
1: -	struct sctp_inq inqueue;
1: -	struct sctp_bind_addr bind_addr;
1: +  struct hlist_node node;
1: +  int hashent;
1: +  enum sctp_endpoint_type type;
1: +  refcount_t refcnt;
1: +  bool dead;
1: +  struct sock *sk;
1: +  struct net *net;
1: +  struct sctp_inq inqueue;
1: +  struct sctp_bind_addr bind_addr;
1:  };
1:  
1:  struct sctp_hmac_algo_param;
1: @@ -58260,123 +59176,124 @@ struct sctp_hmac_algo_param;
1:  struct sctp_chunks_param;
1:  
1:  struct sctp_endpoint {
1: -	struct sctp_ep_common base;
1: -	struct list_head asocs;
1: -	__u8 secret_key[32];
1: -	__u8 *digest;
1: -	__u32 sndbuf_policy;
1: -	__u32 rcvbuf_policy;
1: -	struct crypto_shash **auth_hmacs;
1: -	struct sctp_hmac_algo_param *auth_hmacs_list;
1: -	struct sctp_chunks_param *auth_chunk_list;
1: -	struct list_head endpoint_shared_keys;
1: -	__u16 active_key_id;
1: -	__u8 ecn_enable: 1;
1: -	__u8 auth_enable: 1;
1: -	__u8 intl_enable: 1;
1: -	__u8 prsctp_enable: 1;
1: -	__u8 asconf_enable: 1;
1: -	__u8 reconf_enable: 1;
1: -	__u8 strreset_enable;
1: -	u32 secid;
1: -	u32 peer_secid;
1: +  struct sctp_ep_common base;
1: +  struct list_head asocs;
1: +  __u8 secret_key[32];
1: +  __u8 *digest;
1: +  __u32 sndbuf_policy;
1: +  __u32 rcvbuf_policy;
1: +  struct crypto_shash **auth_hmacs;
1: +  struct sctp_hmac_algo_param *auth_hmacs_list;
1: +  struct sctp_chunks_param *auth_chunk_list;
1: +  struct list_head endpoint_shared_keys;
1: +  __u16 active_key_id;
1: +  __u8 ecn_enable : 1;
1: +  __u8 auth_enable : 1;
1: +  __u8 intl_enable : 1;
1: +  __u8 prsctp_enable : 1;
1: +  __u8 asconf_enable : 1;
1: +  __u8 reconf_enable : 1;
1: +  __u8 strreset_enable;
1: +  u32 secid;
1: +  u32 peer_secid;
1:  };
1:  
1:  struct nf_hook_state;
1:  
1: -typedef unsigned int nf_hookfn(void *, struct sk_buff *, const struct nf_hook_state *);
1: +typedef unsigned int nf_hookfn(void *, struct sk_buff *,
1: +                               const struct nf_hook_state *);
1:  
1:  struct nf_hook_entry {
1: -	nf_hookfn *hook;
1: -	void *priv;
1: +  nf_hookfn *hook;
1: +  void *priv;
1:  };
1:  
1:  struct nf_hook_entries {
1: -	u16 num_hook_entries;
1: -	struct nf_hook_entry hooks[0];
1: +  u16 num_hook_entries;
1: +  struct nf_hook_entry hooks[0];
1:  };
1:  
1:  struct nf_hook_state {
1: -	unsigned int hook;
1: -	u_int8_t pf;
1: -	struct net_device *in;
1: -	struct net_device *out;
1: -	struct sock *sk;
1: -	struct net *net;
1: -	int (*okfn)(struct net *, struct sock *, struct sk_buff *);
1: +  unsigned int hook;
1: +  u_int8_t pf;
1: +  struct net_device *in;
1: +  struct net_device *out;
1: +  struct sock *sk;
1: +  struct net *net;
1: +  int (*okfn)(struct net *, struct sock *, struct sk_buff *);
1:  };
1:  
1:  struct nf_hook_ops {
1: -	nf_hookfn *hook;
1: -	struct net_device *dev;
1: -	void *priv;
1: -	u_int8_t pf;
1: -	unsigned int hooknum;
1: -	int priority;
1: +  nf_hookfn *hook;
1: +  struct net_device *dev;
1: +  void *priv;
1: +  u_int8_t pf;
1: +  unsigned int hooknum;
1: +  int priority;
1:  };
1:  
1:  enum nf_ip_hook_priorities {
1: -	NF_IP_PRI_FIRST = 2147483648,
1: -	NF_IP_PRI_RAW_BEFORE_DEFRAG = 4294966846,
1: -	NF_IP_PRI_CONNTRACK_DEFRAG = 4294966896,
1: -	NF_IP_PRI_RAW = 4294966996,
1: -	NF_IP_PRI_SELINUX_FIRST = 4294967071,
1: -	NF_IP_PRI_CONNTRACK = 4294967096,
1: -	NF_IP_PRI_MANGLE = 4294967146,
1: -	NF_IP_PRI_NAT_DST = 4294967196,
1: -	NF_IP_PRI_FILTER = 0,
1: -	NF_IP_PRI_SECURITY = 50,
1: -	NF_IP_PRI_NAT_SRC = 100,
1: -	NF_IP_PRI_SELINUX_LAST = 225,
1: -	NF_IP_PRI_CONNTRACK_HELPER = 300,
1: -	NF_IP_PRI_CONNTRACK_CONFIRM = 2147483647,
1: -	NF_IP_PRI_LAST = 2147483647,
1: +  NF_IP_PRI_FIRST = 2147483648,
1: +  NF_IP_PRI_RAW_BEFORE_DEFRAG = 4294966846,
1: +  NF_IP_PRI_CONNTRACK_DEFRAG = 4294966896,
1: +  NF_IP_PRI_RAW = 4294966996,
1: +  NF_IP_PRI_SELINUX_FIRST = 4294967071,
1: +  NF_IP_PRI_CONNTRACK = 4294967096,
1: +  NF_IP_PRI_MANGLE = 4294967146,
1: +  NF_IP_PRI_NAT_DST = 4294967196,
1: +  NF_IP_PRI_FILTER = 0,
1: +  NF_IP_PRI_SECURITY = 50,
1: +  NF_IP_PRI_NAT_SRC = 100,
1: +  NF_IP_PRI_SELINUX_LAST = 225,
1: +  NF_IP_PRI_CONNTRACK_HELPER = 300,
1: +  NF_IP_PRI_CONNTRACK_CONFIRM = 2147483647,
1: +  NF_IP_PRI_LAST = 2147483647,
1:  };
1:  
1:  enum nf_ip6_hook_priorities {
1: -	NF_IP6_PRI_FIRST = 2147483648,
1: -	NF_IP6_PRI_RAW_BEFORE_DEFRAG = 4294966846,
1: -	NF_IP6_PRI_CONNTRACK_DEFRAG = 4294966896,
1: -	NF_IP6_PRI_RAW = 4294966996,
1: -	NF_IP6_PRI_SELINUX_FIRST = 4294967071,
1: -	NF_IP6_PRI_CONNTRACK = 4294967096,
1: -	NF_IP6_PRI_MANGLE = 4294967146,
1: -	NF_IP6_PRI_NAT_DST = 4294967196,
1: -	NF_IP6_PRI_FILTER = 0,
1: -	NF_IP6_PRI_SECURITY = 50,
1: -	NF_IP6_PRI_NAT_SRC = 100,
1: -	NF_IP6_PRI_SELINUX_LAST = 225,
1: -	NF_IP6_PRI_CONNTRACK_HELPER = 300,
1: -	NF_IP6_PRI_LAST = 2147483647,
1: +  NF_IP6_PRI_FIRST = 2147483648,
1: +  NF_IP6_PRI_RAW_BEFORE_DEFRAG = 4294966846,
1: +  NF_IP6_PRI_CONNTRACK_DEFRAG = 4294966896,
1: +  NF_IP6_PRI_RAW = 4294966996,
1: +  NF_IP6_PRI_SELINUX_FIRST = 4294967071,
1: +  NF_IP6_PRI_CONNTRACK = 4294967096,
1: +  NF_IP6_PRI_MANGLE = 4294967146,
1: +  NF_IP6_PRI_NAT_DST = 4294967196,
1: +  NF_IP6_PRI_FILTER = 0,
1: +  NF_IP6_PRI_SECURITY = 50,
1: +  NF_IP6_PRI_NAT_SRC = 100,
1: +  NF_IP6_PRI_SELINUX_LAST = 225,
1: +  NF_IP6_PRI_CONNTRACK_HELPER = 300,
1: +  NF_IP6_PRI_LAST = 2147483647,
1:  };
1:  
1:  struct socket_alloc {
1: -	struct socket socket;
1: -	struct inode vfs_inode;
1: +  struct socket socket;
1: +  struct inode vfs_inode;
1:  };
1:  
1:  struct ip_options {
1: -	__be32 faddr;
1: -	__be32 nexthop;
1: -	unsigned char optlen;
1: -	unsigned char srr;
1: -	unsigned char rr;
1: -	unsigned char ts;
1: -	unsigned char is_strictroute: 1;
1: -	unsigned char srr_is_hit: 1;
1: -	unsigned char is_changed: 1;
1: -	unsigned char rr_needaddr: 1;
1: -	unsigned char ts_needtime: 1;
1: -	unsigned char ts_needaddr: 1;
1: -	unsigned char router_alert;
1: -	unsigned char cipso;
1: -	unsigned char __pad2;
1: -	unsigned char __data[0];
1: +  __be32 faddr;
1: +  __be32 nexthop;
1: +  unsigned char optlen;
1: +  unsigned char srr;
1: +  unsigned char rr;
1: +  unsigned char ts;
1: +  unsigned char is_strictroute : 1;
1: +  unsigned char srr_is_hit : 1;
1: +  unsigned char is_changed : 1;
1: +  unsigned char rr_needaddr : 1;
1: +  unsigned char ts_needtime : 1;
1: +  unsigned char ts_needaddr : 1;
1: +  unsigned char router_alert;
1: +  unsigned char cipso;
1: +  unsigned char __pad2;
1: +  unsigned char __data[0];
1:  };
1:  
1:  struct ip_options_rcu {
1: -	struct callback_head rcu;
1: -	struct ip_options opt;
1: +  struct callback_head rcu;
1: +  struct ip_options opt;
1:  };
1:  
1:  struct ipv6_opt_hdr;
1: @@ -58384,36 +59301,36 @@ struct ipv6_opt_hdr;
1:  struct ipv6_rt_hdr;
1:  
1:  struct ipv6_txoptions {
1: -	refcount_t refcnt;
1: -	int tot_len;
1: -	__u16 opt_flen;
1: -	__u16 opt_nflen;
1: -	struct ipv6_opt_hdr *hopopt;
1: -	struct ipv6_opt_hdr *dst0opt;
1: -	struct ipv6_rt_hdr *srcrt;
1: -	struct ipv6_opt_hdr *dst1opt;
1: -	struct callback_head rcu;
1: +  refcount_t refcnt;
1: +  int tot_len;
1: +  __u16 opt_flen;
1: +  __u16 opt_nflen;
1: +  struct ipv6_opt_hdr *hopopt;
1: +  struct ipv6_opt_hdr *dst0opt;
1: +  struct ipv6_rt_hdr *srcrt;
1: +  struct ipv6_opt_hdr *dst1opt;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct inet_cork {
1: -	unsigned int flags;
1: -	__be32 addr;
1: -	struct ip_options *opt;
1: -	unsigned int fragsize;
1: -	int length;
1: -	struct dst_entry *dst;
1: -	u8 tx_flags;
1: -	__u8 ttl;
1: -	__s16 tos;
1: -	char priority;
1: -	__u16 gso_size;
1: -	u64 transmit_time;
1: -	u32 mark;
1: +  unsigned int flags;
1: +  __be32 addr;
1: +  struct ip_options *opt;
1: +  unsigned int fragsize;
1: +  int length;
1: +  struct dst_entry *dst;
1: +  u8 tx_flags;
1: +  __u8 ttl;
1: +  __s16 tos;
1: +  char priority;
1: +  __u16 gso_size;
1: +  u64 transmit_time;
1: +  u32 mark;
1:  };
1:  
1:  struct inet_cork_full {
1: -	struct inet_cork base;
1: -	struct flowi fl;
1: +  struct inet_cork base;
1: +  struct flowi fl;
1:  };
1:  
1:  struct ipv6_pinfo;
1: @@ -58421,48 +59338,48 @@ struct ipv6_pinfo;
1:  struct ip_mc_socklist;
1:  
1:  struct inet_sock {
1: -	struct sock sk;
1: -	struct ipv6_pinfo *pinet6;
1: -	__be32 inet_saddr;
1: -	__s16 uc_ttl;
1: -	__u16 cmsg_flags;
1: -	__be16 inet_sport;
1: -	__u16 inet_id;
1: -	struct ip_options_rcu *inet_opt;
1: -	int rx_dst_ifindex;
1: -	__u8 tos;
1: -	__u8 min_ttl;
1: -	__u8 mc_ttl;
1: -	__u8 pmtudisc;
1: -	__u8 recverr: 1;
1: -	__u8 is_icsk: 1;
1: -	__u8 freebind: 1;
1: -	__u8 hdrincl: 1;
1: -	__u8 mc_loop: 1;
1: -	__u8 transparent: 1;
1: -	__u8 mc_all: 1;
1: -	__u8 nodefrag: 1;
1: -	__u8 bind_address_no_port: 1;
1: -	__u8 recverr_rfc4884: 1;
1: -	__u8 defer_connect: 1;
1: -	__u8 rcv_tos;
1: -	__u8 convert_csum;
1: -	int uc_index;
1: -	int mc_index;
1: -	__be32 mc_addr;
1: -	struct ip_mc_socklist *mc_list;
1: -	struct inet_cork_full cork;
1: +  struct sock sk;
1: +  struct ipv6_pinfo *pinet6;
1: +  __be32 inet_saddr;
1: +  __s16 uc_ttl;
1: +  __u16 cmsg_flags;
1: +  __be16 inet_sport;
1: +  __u16 inet_id;
1: +  struct ip_options_rcu *inet_opt;
1: +  int rx_dst_ifindex;
1: +  __u8 tos;
1: +  __u8 min_ttl;
1: +  __u8 mc_ttl;
1: +  __u8 pmtudisc;
1: +  __u8 recverr : 1;
1: +  __u8 is_icsk : 1;
1: +  __u8 freebind : 1;
1: +  __u8 hdrincl : 1;
1: +  __u8 mc_loop : 1;
1: +  __u8 transparent : 1;
1: +  __u8 mc_all : 1;
1: +  __u8 nodefrag : 1;
1: +  __u8 bind_address_no_port : 1;
1: +  __u8 recverr_rfc4884 : 1;
1: +  __u8 defer_connect : 1;
1: +  __u8 rcv_tos;
1: +  __u8 convert_csum;
1: +  int uc_index;
1: +  int mc_index;
1: +  __be32 mc_addr;
1: +  struct ip_mc_socklist *mc_list;
1: +  struct inet_cork_full cork;
1:  };
1:  
1:  struct in6_pktinfo {
1: -	struct in6_addr ipi6_addr;
1: -	int ipi6_ifindex;
1: +  struct in6_addr ipi6_addr;
1: +  int ipi6_ifindex;
1:  };
1:  
1:  struct inet6_cork {
1: -	struct ipv6_txoptions *opt;
1: -	u8 hop_limit;
1: -	u8 tclass;
1: +  struct ipv6_txoptions *opt;
1: +  u8 hop_limit;
1: +  u8 tclass;
1:  };
1:  
1:  struct ipv6_mc_socklist;
1: @@ -58472,659 +59389,659 @@ struct ipv6_ac_socklist;
1:  struct ipv6_fl_socklist;
1:  
1:  struct ipv6_pinfo {
1: -	struct in6_addr saddr;
1: -	struct in6_pktinfo sticky_pktinfo;
1: -	const struct in6_addr *daddr_cache;
1: -	const struct in6_addr *saddr_cache;
1: -	__be32 flow_label;
1: -	__u32 frag_size;
1: -	__u16 __unused_1: 7;
1: -	__s16 hop_limit: 9;
1: -	__u16 mc_loop: 1;
1: -	__u16 __unused_2: 6;
1: -	__s16 mcast_hops: 9;
1: -	int ucast_oif;
1: -	int mcast_oif;
1: -	union {
1: -		struct {
1: -			__u16 srcrt: 1;
1: -			__u16 osrcrt: 1;
1: -			__u16 rxinfo: 1;
1: -			__u16 rxoinfo: 1;
1: -			__u16 rxhlim: 1;
1: -			__u16 rxohlim: 1;
1: -			__u16 hopopts: 1;
1: -			__u16 ohopopts: 1;
1: -			__u16 dstopts: 1;
1: -			__u16 odstopts: 1;
1: -			__u16 rxflow: 1;
1: -			__u16 rxtclass: 1;
1: -			__u16 rxpmtu: 1;
1: -			__u16 rxorigdstaddr: 1;
1: -			__u16 recvfragsize: 1;
1: -		} bits;
1: -		__u16 all;
1: -	} rxopt;
1: -	__u16 recverr: 1;
1: -	__u16 sndflow: 1;
1: -	__u16 repflow: 1;
1: -	__u16 pmtudisc: 3;
1: -	__u16 padding: 1;
1: -	__u16 srcprefs: 3;
1: -	__u16 dontfrag: 1;
1: -	__u16 autoflowlabel: 1;
1: -	__u16 autoflowlabel_set: 1;
1: -	__u16 mc_all: 1;
1: -	__u16 recverr_rfc4884: 1;
1: -	__u16 rtalert_isolate: 1;
1: -	__u8 min_hopcount;
1: -	__u8 tclass;
1: -	__be32 rcv_flowinfo;
1: -	__u32 dst_cookie;
1: -	__u32 rx_dst_cookie;
1: -	struct ipv6_mc_socklist *ipv6_mc_list;
1: -	struct ipv6_ac_socklist *ipv6_ac_list;
1: -	struct ipv6_fl_socklist *ipv6_fl_list;
1: -	struct ipv6_txoptions *opt;
1: -	struct sk_buff *pktoptions;
1: -	struct sk_buff *rxpmtu;
1: -	struct inet6_cork cork;
1: +  struct in6_addr saddr;
1: +  struct in6_pktinfo sticky_pktinfo;
1: +  const struct in6_addr *daddr_cache;
1: +  const struct in6_addr *saddr_cache;
1: +  __be32 flow_label;
1: +  __u32 frag_size;
1: +  __u16 __unused_1 : 7;
1: +  __s16 hop_limit : 9;
1: +  __u16 mc_loop : 1;
1: +  __u16 __unused_2 : 6;
1: +  __s16 mcast_hops : 9;
1: +  int ucast_oif;
1: +  int mcast_oif;
1: +  union {
1: +    struct {
1: +      __u16 srcrt : 1;
1: +      __u16 osrcrt : 1;
1: +      __u16 rxinfo : 1;
1: +      __u16 rxoinfo : 1;
1: +      __u16 rxhlim : 1;
1: +      __u16 rxohlim : 1;
1: +      __u16 hopopts : 1;
1: +      __u16 ohopopts : 1;
1: +      __u16 dstopts : 1;
1: +      __u16 odstopts : 1;
1: +      __u16 rxflow : 1;
1: +      __u16 rxtclass : 1;
1: +      __u16 rxpmtu : 1;
1: +      __u16 rxorigdstaddr : 1;
1: +      __u16 recvfragsize : 1;
1: +    } bits;
1: +    __u16 all;
1: +  } rxopt;
1: +  __u16 recverr : 1;
1: +  __u16 sndflow : 1;
1: +  __u16 repflow : 1;
1: +  __u16 pmtudisc : 3;
1: +  __u16 padding : 1;
1: +  __u16 srcprefs : 3;
1: +  __u16 dontfrag : 1;
1: +  __u16 autoflowlabel : 1;
1: +  __u16 autoflowlabel_set : 1;
1: +  __u16 mc_all : 1;
1: +  __u16 recverr_rfc4884 : 1;
1: +  __u16 rtalert_isolate : 1;
1: +  __u8 min_hopcount;
1: +  __u8 tclass;
1: +  __be32 rcv_flowinfo;
1: +  __u32 dst_cookie;
1: +  __u32 rx_dst_cookie;
1: +  struct ipv6_mc_socklist *ipv6_mc_list;
1: +  struct ipv6_ac_socklist *ipv6_ac_list;
1: +  struct ipv6_fl_socklist *ipv6_fl_list;
1: +  struct ipv6_txoptions *opt;
1: +  struct sk_buff *pktoptions;
1: +  struct sk_buff *rxpmtu;
1: +  struct inet6_cork cork;
1:  };
1:  
1:  struct tcphdr {
1: -	__be16 source;
1: -	__be16 dest;
1: -	__be32 seq;
1: -	__be32 ack_seq;
1: -	__u16 res1: 4;
1: -	__u16 doff: 4;
1: -	__u16 fin: 1;
1: -	__u16 syn: 1;
1: -	__u16 rst: 1;
1: -	__u16 psh: 1;
1: -	__u16 ack: 1;
1: -	__u16 urg: 1;
1: -	__u16 ece: 1;
1: -	__u16 cwr: 1;
1: -	__be16 window;
1: -	__sum16 check;
1: -	__be16 urg_ptr;
1: +  __be16 source;
1: +  __be16 dest;
1: +  __be32 seq;
1: +  __be32 ack_seq;
1: +  __u16 res1 : 4;
1: +  __u16 doff : 4;
1: +  __u16 fin : 1;
1: +  __u16 syn : 1;
1: +  __u16 rst : 1;
1: +  __u16 psh : 1;
1: +  __u16 ack : 1;
1: +  __u16 urg : 1;
1: +  __u16 ece : 1;
1: +  __u16 cwr : 1;
1: +  __be16 window;
1: +  __sum16 check;
1: +  __be16 urg_ptr;
1:  };
1:  
1:  struct iphdr {
1: -	__u8 ihl: 4;
1: -	__u8 version: 4;
1: -	__u8 tos;
1: -	__be16 tot_len;
1: -	__be16 id;
1: -	__be16 frag_off;
1: -	__u8 ttl;
1: -	__u8 protocol;
1: -	__sum16 check;
1: -	__be32 saddr;
1: -	__be32 daddr;
1: +  __u8 ihl : 4;
1: +  __u8 version : 4;
1: +  __u8 tos;
1: +  __be16 tot_len;
1: +  __be16 id;
1: +  __be16 frag_off;
1: +  __u8 ttl;
1: +  __u8 protocol;
1: +  __sum16 check;
1: +  __be32 saddr;
1: +  __be32 daddr;
1:  };
1:  
1:  struct ipv6_rt_hdr {
1: -	__u8 nexthdr;
1: -	__u8 hdrlen;
1: -	__u8 type;
1: -	__u8 segments_left;
1: +  __u8 nexthdr;
1: +  __u8 hdrlen;
1: +  __u8 type;
1: +  __u8 segments_left;
1:  };
1:  
1:  struct ipv6_opt_hdr {
1: -	__u8 nexthdr;
1: -	__u8 hdrlen;
1: +  __u8 nexthdr;
1: +  __u8 hdrlen;
1:  };
1:  
1:  struct ipv6hdr {
1: -	__u8 priority: 4;
1: -	__u8 version: 4;
1: -	__u8 flow_lbl[3];
1: -	__be16 payload_len;
1: -	__u8 nexthdr;
1: -	__u8 hop_limit;
1: -	struct in6_addr saddr;
1: -	struct in6_addr daddr;
1: +  __u8 priority : 4;
1: +  __u8 version : 4;
1: +  __u8 flow_lbl[3];
1: +  __be16 payload_len;
1: +  __u8 nexthdr;
1: +  __u8 hop_limit;
1: +  struct in6_addr saddr;
1: +  struct in6_addr daddr;
1:  };
1:  
1:  struct udphdr {
1: -	__be16 source;
1: -	__be16 dest;
1: -	__be16 len;
1: -	__sum16 check;
1: +  __be16 source;
1: +  __be16 dest;
1: +  __be16 len;
1: +  __sum16 check;
1:  };
1:  
1:  struct inet6_skb_parm {
1: -	int iif;
1: -	__be16 ra;
1: -	__u16 dst0;
1: -	__u16 srcrt;
1: -	__u16 dst1;
1: -	__u16 lastopt;
1: -	__u16 nhoff;
1: -	__u16 flags;
1: -	__u16 dsthao;
1: -	__u16 frag_max_size;
1: +  int iif;
1: +  __be16 ra;
1: +  __u16 dst0;
1: +  __u16 srcrt;
1: +  __u16 dst1;
1: +  __u16 lastopt;
1: +  __u16 nhoff;
1: +  __u16 flags;
1: +  __u16 dsthao;
1: +  __u16 frag_max_size;
1:  };
1:  
1:  struct ip6_sf_socklist;
1:  
1:  struct ipv6_mc_socklist {
1: -	struct in6_addr addr;
1: -	int ifindex;
1: -	unsigned int sfmode;
1: -	struct ipv6_mc_socklist *next;
1: -	rwlock_t sflock;
1: -	struct ip6_sf_socklist *sflist;
1: -	struct callback_head rcu;
1: +  struct in6_addr addr;
1: +  int ifindex;
1: +  unsigned int sfmode;
1: +  struct ipv6_mc_socklist *next;
1: +  rwlock_t sflock;
1: +  struct ip6_sf_socklist *sflist;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ipv6_ac_socklist {
1: -	struct in6_addr acl_addr;
1: -	int acl_ifindex;
1: -	struct ipv6_ac_socklist *acl_next;
1: +  struct in6_addr acl_addr;
1: +  int acl_ifindex;
1: +  struct ipv6_ac_socklist *acl_next;
1:  };
1:  
1:  struct ip6_flowlabel;
1:  
1:  struct ipv6_fl_socklist {
1: -	struct ipv6_fl_socklist *next;
1: -	struct ip6_flowlabel *fl;
1: -	struct callback_head rcu;
1: +  struct ipv6_fl_socklist *next;
1: +  struct ip6_flowlabel *fl;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ip6_sf_socklist {
1: -	unsigned int sl_max;
1: -	unsigned int sl_count;
1: -	struct in6_addr sl_addr[0];
1: +  unsigned int sl_max;
1: +  unsigned int sl_count;
1: +  struct in6_addr sl_addr[0];
1:  };
1:  
1:  struct ip6_flowlabel {
1: -	struct ip6_flowlabel *next;
1: -	__be32 label;
1: -	atomic_t users;
1: -	struct in6_addr dst;
1: -	struct ipv6_txoptions *opt;
1: -	long unsigned int linger;
1: -	struct callback_head rcu;
1: -	u8 share;
1: -	union {
1: -		struct pid *pid;
1: -		kuid_t uid;
1: -	} owner;
1: -	long unsigned int lastuse;
1: -	long unsigned int expires;
1: -	struct net *fl_net;
1: +  struct ip6_flowlabel *next;
1: +  __be32 label;
1: +  atomic_t users;
1: +  struct in6_addr dst;
1: +  struct ipv6_txoptions *opt;
1: +  long unsigned int linger;
1: +  struct callback_head rcu;
1: +  u8 share;
1: +  union {
1: +    struct pid *pid;
1: +    kuid_t uid;
1: +  } owner;
1: +  long unsigned int lastuse;
1: +  long unsigned int expires;
1: +  struct net *fl_net;
1:  };
1:  
1:  struct inet_skb_parm {
1: -	int iif;
1: -	struct ip_options opt;
1: -	u16 flags;
1: -	u16 frag_max_size;
1: +  int iif;
1: +  struct ip_options opt;
1: +  u16 flags;
1: +  u16 frag_max_size;
1:  };
1:  
1:  struct tty_file_private {
1: -	struct tty_struct *tty;
1: -	struct file *file;
1: -	struct list_head list;
1: +  struct tty_struct *tty;
1: +  struct file *file;
1: +  struct list_head list;
1:  };
1:  
1:  struct netlbl_lsm_cache {
1: -	refcount_t refcount;
1: -	void (*free)(const void *);
1: -	void *data;
1: +  refcount_t refcount;
1: +  void (*free)(const void *);
1: +  void *data;
1:  };
1:  
1:  struct netlbl_lsm_catmap {
1: -	u32 startbit;
1: -	u64 bitmap[4];
1: -	struct netlbl_lsm_catmap *next;
1: +  u32 startbit;
1: +  u64 bitmap[4];
1: +  struct netlbl_lsm_catmap *next;
1:  };
1:  
1:  struct netlbl_lsm_secattr {
1: -	u32 flags;
1: -	u32 type;
1: -	char *domain;
1: -	struct netlbl_lsm_cache *cache;
1: -	struct {
1: -		struct {
1: -			struct netlbl_lsm_catmap *cat;
1: -			u32 lvl;
1: -		} mls;
1: -		u32 secid;
1: -	} attr;
1: +  u32 flags;
1: +  u32 type;
1: +  char *domain;
1: +  struct netlbl_lsm_cache *cache;
1: +  struct {
1: +    struct {
1: +      struct netlbl_lsm_catmap *cat;
1: +      u32 lvl;
1: +    } mls;
1: +    u32 secid;
1: +  } attr;
1:  };
1:  
1:  struct dccp_hdr {
1: -	__be16 dccph_sport;
1: -	__be16 dccph_dport;
1: -	__u8 dccph_doff;
1: -	__u8 dccph_cscov: 4;
1: -	__u8 dccph_ccval: 4;
1: -	__sum16 dccph_checksum;
1: -	__u8 dccph_x: 1;
1: -	__u8 dccph_type: 4;
1: -	__u8 dccph_reserved: 3;
1: -	__u8 dccph_seq2;
1: -	__be16 dccph_seq;
1: +  __be16 dccph_sport;
1: +  __be16 dccph_dport;
1: +  __u8 dccph_doff;
1: +  __u8 dccph_cscov : 4;
1: +  __u8 dccph_ccval : 4;
1: +  __sum16 dccph_checksum;
1: +  __u8 dccph_x : 1;
1: +  __u8 dccph_type : 4;
1: +  __u8 dccph_reserved : 3;
1: +  __u8 dccph_seq2;
1: +  __be16 dccph_seq;
1:  };
1:  
1:  enum dccp_state {
1: -	DCCP_OPEN = 1,
1: -	DCCP_REQUESTING = 2,
1: -	DCCP_LISTEN = 10,
1: -	DCCP_RESPOND = 3,
1: -	DCCP_ACTIVE_CLOSEREQ = 4,
1: -	DCCP_PASSIVE_CLOSE = 8,
1: -	DCCP_CLOSING = 11,
1: -	DCCP_TIME_WAIT = 6,
1: -	DCCP_CLOSED = 7,
1: -	DCCP_NEW_SYN_RECV = 12,
1: -	DCCP_PARTOPEN = 13,
1: -	DCCP_PASSIVE_CLOSEREQ = 14,
1: -	DCCP_MAX_STATES = 15,
1: +  DCCP_OPEN = 1,
1: +  DCCP_REQUESTING = 2,
1: +  DCCP_LISTEN = 10,
1: +  DCCP_RESPOND = 3,
1: +  DCCP_ACTIVE_CLOSEREQ = 4,
1: +  DCCP_PASSIVE_CLOSE = 8,
1: +  DCCP_CLOSING = 11,
1: +  DCCP_TIME_WAIT = 6,
1: +  DCCP_CLOSED = 7,
1: +  DCCP_NEW_SYN_RECV = 12,
1: +  DCCP_PARTOPEN = 13,
1: +  DCCP_PASSIVE_CLOSEREQ = 14,
1: +  DCCP_MAX_STATES = 15,
1:  };
1:  
1:  typedef __s32 sctp_assoc_t;
1:  
1:  enum sctp_msg_flags {
1: -	MSG_NOTIFICATION = 32768,
1: +  MSG_NOTIFICATION = 32768,
1:  };
1:  
1:  struct sctp_initmsg {
1: -	__u16 sinit_num_ostreams;
1: -	__u16 sinit_max_instreams;
1: -	__u16 sinit_max_attempts;
1: -	__u16 sinit_max_init_timeo;
1: +  __u16 sinit_num_ostreams;
1: +  __u16 sinit_max_instreams;
1: +  __u16 sinit_max_attempts;
1: +  __u16 sinit_max_init_timeo;
1:  };
1:  
1:  struct sctp_sndrcvinfo {
1: -	__u16 sinfo_stream;
1: -	__u16 sinfo_ssn;
1: -	__u16 sinfo_flags;
1: -	__u32 sinfo_ppid;
1: -	__u32 sinfo_context;
1: -	__u32 sinfo_timetolive;
1: -	__u32 sinfo_tsn;
1: -	__u32 sinfo_cumtsn;
1: -	sctp_assoc_t sinfo_assoc_id;
1: +  __u16 sinfo_stream;
1: +  __u16 sinfo_ssn;
1: +  __u16 sinfo_flags;
1: +  __u32 sinfo_ppid;
1: +  __u32 sinfo_context;
1: +  __u32 sinfo_timetolive;
1: +  __u32 sinfo_tsn;
1: +  __u32 sinfo_cumtsn;
1: +  sctp_assoc_t sinfo_assoc_id;
1:  };
1:  
1:  struct sctp_rtoinfo {
1: -	sctp_assoc_t srto_assoc_id;
1: -	__u32 srto_initial;
1: -	__u32 srto_max;
1: -	__u32 srto_min;
1: +  sctp_assoc_t srto_assoc_id;
1: +  __u32 srto_initial;
1: +  __u32 srto_max;
1: +  __u32 srto_min;
1:  };
1:  
1:  struct sctp_assocparams {
1: -	sctp_assoc_t sasoc_assoc_id;
1: -	__u16 sasoc_asocmaxrxt;
1: -	__u16 sasoc_number_peer_destinations;
1: -	__u32 sasoc_peer_rwnd;
1: -	__u32 sasoc_local_rwnd;
1: -	__u32 sasoc_cookie_life;
1: +  sctp_assoc_t sasoc_assoc_id;
1: +  __u16 sasoc_asocmaxrxt;
1: +  __u16 sasoc_number_peer_destinations;
1: +  __u32 sasoc_peer_rwnd;
1: +  __u32 sasoc_local_rwnd;
1: +  __u32 sasoc_cookie_life;
1:  };
1:  
1:  struct sctp_paddrparams {
1: -	sctp_assoc_t spp_assoc_id;
1: -	struct __kernel_sockaddr_storage spp_address;
1: -	__u32 spp_hbinterval;
1: -	__u16 spp_pathmaxrxt;
1: -	__u32 spp_pathmtu;
1: -	__u32 spp_sackdelay;
1: -	__u32 spp_flags;
1: -	__u32 spp_ipv6_flowlabel;
1: -	__u8 spp_dscp;
1: -	char: 8;
1: +  sctp_assoc_t spp_assoc_id;
1: +  struct __kernel_sockaddr_storage spp_address;
1: +  __u32 spp_hbinterval;
1: +  __u16 spp_pathmaxrxt;
1: +  __u32 spp_pathmtu;
1: +  __u32 spp_sackdelay;
1: +  __u32 spp_flags;
1: +  __u32 spp_ipv6_flowlabel;
1: +  __u8 spp_dscp;
1: +  char : 8;
1:  } __attribute__((packed));
1:  
1:  struct sctphdr {
1: -	__be16 source;
1: -	__be16 dest;
1: -	__be32 vtag;
1: -	__le32 checksum;
1: +  __be16 source;
1: +  __be16 dest;
1: +  __be32 vtag;
1: +  __le32 checksum;
1:  };
1:  
1:  struct sctp_chunkhdr {
1: -	__u8 type;
1: -	__u8 flags;
1: -	__be16 length;
1: +  __u8 type;
1: +  __u8 flags;
1: +  __be16 length;
1:  };
1:  
1:  enum sctp_cid {
1: -	SCTP_CID_DATA = 0,
1: -	SCTP_CID_INIT = 1,
1: -	SCTP_CID_INIT_ACK = 2,
1: -	SCTP_CID_SACK = 3,
1: -	SCTP_CID_HEARTBEAT = 4,
1: -	SCTP_CID_HEARTBEAT_ACK = 5,
1: -	SCTP_CID_ABORT = 6,
1: -	SCTP_CID_SHUTDOWN = 7,
1: -	SCTP_CID_SHUTDOWN_ACK = 8,
1: -	SCTP_CID_ERROR = 9,
1: -	SCTP_CID_COOKIE_ECHO = 10,
1: -	SCTP_CID_COOKIE_ACK = 11,
1: -	SCTP_CID_ECN_ECNE = 12,
1: -	SCTP_CID_ECN_CWR = 13,
1: -	SCTP_CID_SHUTDOWN_COMPLETE = 14,
1: -	SCTP_CID_AUTH = 15,
1: -	SCTP_CID_I_DATA = 64,
1: -	SCTP_CID_FWD_TSN = 192,
1: -	SCTP_CID_ASCONF = 193,
1: -	SCTP_CID_I_FWD_TSN = 194,
1: -	SCTP_CID_ASCONF_ACK = 128,
1: -	SCTP_CID_RECONF = 130,
1: +  SCTP_CID_DATA = 0,
1: +  SCTP_CID_INIT = 1,
1: +  SCTP_CID_INIT_ACK = 2,
1: +  SCTP_CID_SACK = 3,
1: +  SCTP_CID_HEARTBEAT = 4,
1: +  SCTP_CID_HEARTBEAT_ACK = 5,
1: +  SCTP_CID_ABORT = 6,
1: +  SCTP_CID_SHUTDOWN = 7,
1: +  SCTP_CID_SHUTDOWN_ACK = 8,
1: +  SCTP_CID_ERROR = 9,
1: +  SCTP_CID_COOKIE_ECHO = 10,
1: +  SCTP_CID_COOKIE_ACK = 11,
1: +  SCTP_CID_ECN_ECNE = 12,
1: +  SCTP_CID_ECN_CWR = 13,
1: +  SCTP_CID_SHUTDOWN_COMPLETE = 14,
1: +  SCTP_CID_AUTH = 15,
1: +  SCTP_CID_I_DATA = 64,
1: +  SCTP_CID_FWD_TSN = 192,
1: +  SCTP_CID_ASCONF = 193,
1: +  SCTP_CID_I_FWD_TSN = 194,
1: +  SCTP_CID_ASCONF_ACK = 128,
1: +  SCTP_CID_RECONF = 130,
1:  };
1:  
1:  struct sctp_paramhdr {
1: -	__be16 type;
1: -	__be16 length;
1: +  __be16 type;
1: +  __be16 length;
1:  };
1:  
1:  enum sctp_param {
1: -	SCTP_PARAM_HEARTBEAT_INFO = 256,
1: -	SCTP_PARAM_IPV4_ADDRESS = 1280,
1: -	SCTP_PARAM_IPV6_ADDRESS = 1536,
1: -	SCTP_PARAM_STATE_COOKIE = 1792,
1: -	SCTP_PARAM_UNRECOGNIZED_PARAMETERS = 2048,
1: -	SCTP_PARAM_COOKIE_PRESERVATIVE = 2304,
1: -	SCTP_PARAM_HOST_NAME_ADDRESS = 2816,
1: -	SCTP_PARAM_SUPPORTED_ADDRESS_TYPES = 3072,
1: -	SCTP_PARAM_ECN_CAPABLE = 128,
1: -	SCTP_PARAM_RANDOM = 640,
1: -	SCTP_PARAM_CHUNKS = 896,
1: -	SCTP_PARAM_HMAC_ALGO = 1152,
1: -	SCTP_PARAM_SUPPORTED_EXT = 2176,
1: -	SCTP_PARAM_FWD_TSN_SUPPORT = 192,
1: -	SCTP_PARAM_ADD_IP = 448,
1: -	SCTP_PARAM_DEL_IP = 704,
1: -	SCTP_PARAM_ERR_CAUSE = 960,
1: -	SCTP_PARAM_SET_PRIMARY = 1216,
1: -	SCTP_PARAM_SUCCESS_REPORT = 1472,
1: -	SCTP_PARAM_ADAPTATION_LAYER_IND = 1728,
1: -	SCTP_PARAM_RESET_OUT_REQUEST = 3328,
1: -	SCTP_PARAM_RESET_IN_REQUEST = 3584,
1: -	SCTP_PARAM_RESET_TSN_REQUEST = 3840,
1: -	SCTP_PARAM_RESET_RESPONSE = 4096,
1: -	SCTP_PARAM_RESET_ADD_OUT_STREAMS = 4352,
1: -	SCTP_PARAM_RESET_ADD_IN_STREAMS = 4608,
1: +  SCTP_PARAM_HEARTBEAT_INFO = 256,
1: +  SCTP_PARAM_IPV4_ADDRESS = 1280,
1: +  SCTP_PARAM_IPV6_ADDRESS = 1536,
1: +  SCTP_PARAM_STATE_COOKIE = 1792,
1: +  SCTP_PARAM_UNRECOGNIZED_PARAMETERS = 2048,
1: +  SCTP_PARAM_COOKIE_PRESERVATIVE = 2304,
1: +  SCTP_PARAM_HOST_NAME_ADDRESS = 2816,
1: +  SCTP_PARAM_SUPPORTED_ADDRESS_TYPES = 3072,
1: +  SCTP_PARAM_ECN_CAPABLE = 128,
1: +  SCTP_PARAM_RANDOM = 640,
1: +  SCTP_PARAM_CHUNKS = 896,
1: +  SCTP_PARAM_HMAC_ALGO = 1152,
1: +  SCTP_PARAM_SUPPORTED_EXT = 2176,
1: +  SCTP_PARAM_FWD_TSN_SUPPORT = 192,
1: +  SCTP_PARAM_ADD_IP = 448,
1: +  SCTP_PARAM_DEL_IP = 704,
1: +  SCTP_PARAM_ERR_CAUSE = 960,
1: +  SCTP_PARAM_SET_PRIMARY = 1216,
1: +  SCTP_PARAM_SUCCESS_REPORT = 1472,
1: +  SCTP_PARAM_ADAPTATION_LAYER_IND = 1728,
1: +  SCTP_PARAM_RESET_OUT_REQUEST = 3328,
1: +  SCTP_PARAM_RESET_IN_REQUEST = 3584,
1: +  SCTP_PARAM_RESET_TSN_REQUEST = 3840,
1: +  SCTP_PARAM_RESET_RESPONSE = 4096,
1: +  SCTP_PARAM_RESET_ADD_OUT_STREAMS = 4352,
1: +  SCTP_PARAM_RESET_ADD_IN_STREAMS = 4608,
1:  };
1:  
1:  struct sctp_datahdr {
1: -	__be32 tsn;
1: -	__be16 stream;
1: -	__be16 ssn;
1: -	__u32 ppid;
1: -	__u8 payload[0];
1: +  __be32 tsn;
1: +  __be16 stream;
1: +  __be16 ssn;
1: +  __u32 ppid;
1: +  __u8 payload[0];
1:  };
1:  
1:  struct sctp_idatahdr {
1: -	__be32 tsn;
1: -	__be16 stream;
1: -	__be16 reserved;
1: -	__be32 mid;
1: -	union {
1: -		__u32 ppid;
1: -		__be32 fsn;
1: -	};
1: -	__u8 payload[0];
1: +  __be32 tsn;
1: +  __be16 stream;
1: +  __be16 reserved;
1: +  __be32 mid;
1: +  union {
1: +    __u32 ppid;
1: +    __be32 fsn;
1: +  };
1: +  __u8 payload[0];
1:  };
1:  
1:  struct sctp_inithdr {
1: -	__be32 init_tag;
1: -	__be32 a_rwnd;
1: -	__be16 num_outbound_streams;
1: -	__be16 num_inbound_streams;
1: -	__be32 initial_tsn;
1: -	__u8 params[0];
1: +  __be32 init_tag;
1: +  __be32 a_rwnd;
1: +  __be16 num_outbound_streams;
1: +  __be16 num_inbound_streams;
1: +  __be32 initial_tsn;
1: +  __u8 params[0];
1:  };
1:  
1:  struct sctp_init_chunk {
1: -	struct sctp_chunkhdr chunk_hdr;
1: -	struct sctp_inithdr init_hdr;
1: +  struct sctp_chunkhdr chunk_hdr;
1: +  struct sctp_inithdr init_hdr;
1:  };
1:  
1:  struct sctp_ipv4addr_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	struct in_addr addr;
1: +  struct sctp_paramhdr param_hdr;
1: +  struct in_addr addr;
1:  };
1:  
1:  struct sctp_ipv6addr_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	struct in6_addr addr;
1: +  struct sctp_paramhdr param_hdr;
1: +  struct in6_addr addr;
1:  };
1:  
1:  struct sctp_cookie_preserve_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__be32 lifespan_increment;
1: +  struct sctp_paramhdr param_hdr;
1: +  __be32 lifespan_increment;
1:  };
1:  
1:  struct sctp_hostname_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	uint8_t hostname[0];
1: +  struct sctp_paramhdr param_hdr;
1: +  uint8_t hostname[0];
1:  };
1:  
1:  struct sctp_supported_addrs_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__be16 types[0];
1: +  struct sctp_paramhdr param_hdr;
1: +  __be16 types[0];
1:  };
1:  
1:  struct sctp_adaptation_ind_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__be32 adaptation_ind;
1: +  struct sctp_paramhdr param_hdr;
1: +  __be32 adaptation_ind;
1:  };
1:  
1:  struct sctp_supported_ext_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__u8 chunks[0];
1: +  struct sctp_paramhdr param_hdr;
1: +  __u8 chunks[0];
1:  };
1:  
1:  struct sctp_random_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__u8 random_val[0];
1: +  struct sctp_paramhdr param_hdr;
1: +  __u8 random_val[0];
1:  };
1:  
1:  struct sctp_chunks_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__u8 chunks[0];
1: +  struct sctp_paramhdr param_hdr;
1: +  __u8 chunks[0];
1:  };
1:  
1:  struct sctp_hmac_algo_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__be16 hmac_ids[0];
1: +  struct sctp_paramhdr param_hdr;
1: +  __be16 hmac_ids[0];
1:  };
1:  
1:  struct sctp_cookie_param {
1: -	struct sctp_paramhdr p;
1: -	__u8 body[0];
1: +  struct sctp_paramhdr p;
1: +  __u8 body[0];
1:  };
1:  
1:  struct sctp_gap_ack_block {
1: -	__be16 start;
1: -	__be16 end;
1: +  __be16 start;
1: +  __be16 end;
1:  };
1:  
1:  union sctp_sack_variable {
1: -	struct sctp_gap_ack_block gab;
1: -	__be32 dup;
1: +  struct sctp_gap_ack_block gab;
1: +  __be32 dup;
1:  };
1:  
1:  struct sctp_sackhdr {
1: -	__be32 cum_tsn_ack;
1: -	__be32 a_rwnd;
1: -	__be16 num_gap_ack_blocks;
1: -	__be16 num_dup_tsns;
1: -	union sctp_sack_variable variable[0];
1: +  __be32 cum_tsn_ack;
1: +  __be32 a_rwnd;
1: +  __be16 num_gap_ack_blocks;
1: +  __be16 num_dup_tsns;
1: +  union sctp_sack_variable variable[0];
1:  };
1:  
1:  struct sctp_heartbeathdr {
1: -	struct sctp_paramhdr info;
1: +  struct sctp_paramhdr info;
1:  };
1:  
1:  struct sctp_shutdownhdr {
1: -	__be32 cum_tsn_ack;
1: +  __be32 cum_tsn_ack;
1:  };
1:  
1:  struct sctp_errhdr {
1: -	__be16 cause;
1: -	__be16 length;
1: -	__u8 variable[0];
1: +  __be16 cause;
1: +  __be16 length;
1: +  __u8 variable[0];
1:  };
1:  
1:  struct sctp_ecnehdr {
1: -	__be32 lowest_tsn;
1: +  __be32 lowest_tsn;
1:  };
1:  
1:  struct sctp_cwrhdr {
1: -	__be32 lowest_tsn;
1: +  __be32 lowest_tsn;
1:  };
1:  
1:  struct sctp_fwdtsn_skip {
1: -	__be16 stream;
1: -	__be16 ssn;
1: +  __be16 stream;
1: +  __be16 ssn;
1:  };
1:  
1:  struct sctp_fwdtsn_hdr {
1: -	__be32 new_cum_tsn;
1: -	struct sctp_fwdtsn_skip skip[0];
1: +  __be32 new_cum_tsn;
1: +  struct sctp_fwdtsn_skip skip[0];
1:  };
1:  
1:  struct sctp_ifwdtsn_skip {
1: -	__be16 stream;
1: -	__u8 reserved;
1: -	__u8 flags;
1: -	__be32 mid;
1: +  __be16 stream;
1: +  __u8 reserved;
1: +  __u8 flags;
1: +  __be32 mid;
1:  };
1:  
1:  struct sctp_ifwdtsn_hdr {
1: -	__be32 new_cum_tsn;
1: -	struct sctp_ifwdtsn_skip skip[0];
1: +  __be32 new_cum_tsn;
1: +  struct sctp_ifwdtsn_skip skip[0];
1:  };
1:  
1:  struct sctp_addip_param {
1: -	struct sctp_paramhdr param_hdr;
1: -	__be32 crr_id;
1: +  struct sctp_paramhdr param_hdr;
1: +  __be32 crr_id;
1:  };
1:  
1:  struct sctp_addiphdr {
1: -	__be32 serial;
1: -	__u8 params[0];
1: +  __be32 serial;
1: +  __u8 params[0];
1:  };
1:  
1:  struct sctp_authhdr {
1: -	__be16 shkey_id;
1: -	__be16 hmac_id;
1: -	__u8 hmac[0];
1: +  __be16 shkey_id;
1: +  __be16 hmac_id;
1: +  __u8 hmac[0];
1:  };
1:  
1:  union sctp_addr {
1: -	struct sockaddr_in v4;
1: -	struct sockaddr_in6 v6;
1: -	struct sockaddr sa;
1: +  struct sockaddr_in v4;
1: +  struct sockaddr_in6 v6;
1: +  struct sockaddr sa;
1:  };
1:  
1:  struct sctp_cookie {
1: -	__u32 my_vtag;
1: -	__u32 peer_vtag;
1: -	__u32 my_ttag;
1: -	__u32 peer_ttag;
1: -	ktime_t expiration;
1: -	__u16 sinit_num_ostreams;
1: -	__u16 sinit_max_instreams;
1: -	__u32 initial_tsn;
1: -	union sctp_addr peer_addr;
1: -	__u16 my_port;
1: -	__u8 prsctp_capable;
1: -	__u8 padding;
1: -	__u32 adaptation_ind;
1: -	__u8 auth_random[36];
1: -	__u8 auth_hmacs[10];
1: -	__u8 auth_chunks[20];
1: -	__u32 raw_addr_list_len;
1: -	struct sctp_init_chunk peer_init[0];
1: +  __u32 my_vtag;
1: +  __u32 peer_vtag;
1: +  __u32 my_ttag;
1: +  __u32 peer_ttag;
1: +  ktime_t expiration;
1: +  __u16 sinit_num_ostreams;
1: +  __u16 sinit_max_instreams;
1: +  __u32 initial_tsn;
1: +  union sctp_addr peer_addr;
1: +  __u16 my_port;
1: +  __u8 prsctp_capable;
1: +  __u8 padding;
1: +  __u32 adaptation_ind;
1: +  __u8 auth_random[36];
1: +  __u8 auth_hmacs[10];
1: +  __u8 auth_chunks[20];
1: +  __u32 raw_addr_list_len;
1: +  struct sctp_init_chunk peer_init[0];
1:  };
1:  
1:  struct sctp_tsnmap {
1: -	long unsigned int *tsn_map;
1: -	__u32 base_tsn;
1: -	__u32 cumulative_tsn_ack_point;
1: -	__u32 max_tsn_seen;
1: -	__u16 len;
1: -	__u16 pending_data;
1: -	__u16 num_dup_tsns;
1: -	__be32 dup_tsns[16];
1: +  long unsigned int *tsn_map;
1: +  __u32 base_tsn;
1: +  __u32 cumulative_tsn_ack_point;
1: +  __u32 max_tsn_seen;
1: +  __u16 len;
1: +  __u16 pending_data;
1: +  __u16 num_dup_tsns;
1: +  __be32 dup_tsns[16];
1:  };
1:  
1:  struct sctp_inithdr_host {
1: -	__u32 init_tag;
1: -	__u32 a_rwnd;
1: -	__u16 num_outbound_streams;
1: -	__u16 num_inbound_streams;
1: -	__u32 initial_tsn;
1: +  __u32 init_tag;
1: +  __u32 a_rwnd;
1: +  __u16 num_outbound_streams;
1: +  __u16 num_inbound_streams;
1: +  __u32 initial_tsn;
1:  };
1:  
1:  enum sctp_state {
1: -	SCTP_STATE_CLOSED = 0,
1: -	SCTP_STATE_COOKIE_WAIT = 1,
1: -	SCTP_STATE_COOKIE_ECHOED = 2,
1: -	SCTP_STATE_ESTABLISHED = 3,
1: -	SCTP_STATE_SHUTDOWN_PENDING = 4,
1: -	SCTP_STATE_SHUTDOWN_SENT = 5,
1: -	SCTP_STATE_SHUTDOWN_RECEIVED = 6,
1: -	SCTP_STATE_SHUTDOWN_ACK_SENT = 7,
1: +  SCTP_STATE_CLOSED = 0,
1: +  SCTP_STATE_COOKIE_WAIT = 1,
1: +  SCTP_STATE_COOKIE_ECHOED = 2,
1: +  SCTP_STATE_ESTABLISHED = 3,
1: +  SCTP_STATE_SHUTDOWN_PENDING = 4,
1: +  SCTP_STATE_SHUTDOWN_SENT = 5,
1: +  SCTP_STATE_SHUTDOWN_RECEIVED = 6,
1: +  SCTP_STATE_SHUTDOWN_ACK_SENT = 7,
1:  };
1:  
1:  struct sctp_stream_out_ext;
1:  
1:  struct sctp_stream_out {
1: -	union {
1: -		__u32 mid;
1: -		__u16 ssn;
1: -	};
1: -	__u32 mid_uo;
1: -	struct sctp_stream_out_ext *ext;
1: -	__u8 state;
1: +  union {
1: +    __u32 mid;
1: +    __u16 ssn;
1: +  };
1: +  __u32 mid_uo;
1: +  struct sctp_stream_out_ext *ext;
1: +  __u8 state;
1:  };
1:  
1:  struct sctp_stream_in {
1: -	union {
1: -		__u32 mid;
1: -		__u16 ssn;
1: -	};
1: -	__u32 mid_uo;
1: -	__u32 fsn;
1: -	__u32 fsn_uo;
1: -	char pd_mode;
1: -	char pd_mode_uo;
1: +  union {
1: +    __u32 mid;
1: +    __u16 ssn;
1: +  };
1: +  __u32 mid_uo;
1: +  __u32 fsn;
1: +  __u32 fsn_uo;
1: +  char pd_mode;
1: +  char pd_mode_uo;
1:  };
1:  
1:  struct sctp_stream_interleave;
1:  
1:  struct sctp_stream {
1: -	struct {
1: -		struct __genradix tree;
1: -		struct sctp_stream_out type[0];
1: -	} out;
1: -	struct {
1: -		struct __genradix tree;
1: -		struct sctp_stream_in type[0];
1: -	} in;
1: -	__u16 outcnt;
1: -	__u16 incnt;
1: -	struct sctp_stream_out *out_curr;
1: -	union {
1: -		struct {
1: -			struct list_head prio_list;
1: -		};
1: -		struct {
1: -			struct list_head rr_list;
1: -			struct sctp_stream_out_ext *rr_next;
1: -		};
1: -	};
1: -	struct sctp_stream_interleave *si;
1: +  struct {
1: +    struct __genradix tree;
1: +    struct sctp_stream_out type[0];
1: +  } out;
1: +  struct {
1: +    struct __genradix tree;
1: +    struct sctp_stream_in type[0];
1: +  } in;
1: +  __u16 outcnt;
1: +  __u16 incnt;
1: +  struct sctp_stream_out *out_curr;
1: +  union {
1: +    struct {
1: +      struct list_head prio_list;
1: +    };
1: +    struct {
1: +      struct list_head rr_list;
1: +      struct sctp_stream_out_ext *rr_next;
1: +    };
1: +  };
1: +  struct sctp_stream_interleave *si;
1:  };
1:  
1:  struct sctp_sched_ops;
1: @@ -59132,45 +60049,45 @@ struct sctp_sched_ops;
1:  struct sctp_association;
1:  
1:  struct sctp_outq {
1: -	struct sctp_association *asoc;
1: -	struct list_head out_chunk_list;
1: -	struct sctp_sched_ops *sched;
1: -	unsigned int out_qlen;
1: -	unsigned int error;
1: -	struct list_head control_chunk_list;
1: -	struct list_head sacked;
1: -	struct list_head retransmit;
1: -	struct list_head abandoned;
1: -	__u32 outstanding_bytes;
1: -	char fast_rtx;
1: -	char cork;
1: +  struct sctp_association *asoc;
1: +  struct list_head out_chunk_list;
1: +  struct sctp_sched_ops *sched;
1: +  unsigned int out_qlen;
1: +  unsigned int error;
1: +  struct list_head control_chunk_list;
1: +  struct list_head sacked;
1: +  struct list_head retransmit;
1: +  struct list_head abandoned;
1: +  __u32 outstanding_bytes;
1: +  char fast_rtx;
1: +  char cork;
1:  };
1:  
1:  struct sctp_ulpq {
1: -	char pd_mode;
1: -	struct sctp_association *asoc;
1: -	struct sk_buff_head reasm;
1: -	struct sk_buff_head reasm_uo;
1: -	struct sk_buff_head lobby;
1: +  char pd_mode;
1: +  struct sctp_association *asoc;
1: +  struct sk_buff_head reasm;
1: +  struct sk_buff_head reasm_uo;
1: +  struct sk_buff_head lobby;
1:  };
1:  
1:  struct sctp_priv_assoc_stats {
1: -	struct __kernel_sockaddr_storage obs_rto_ipaddr;
1: -	__u64 max_obs_rto;
1: -	__u64 isacks;
1: -	__u64 osacks;
1: -	__u64 opackets;
1: -	__u64 ipackets;
1: -	__u64 rtxchunks;
1: -	__u64 outofseqtsns;
1: -	__u64 idupchunks;
1: -	__u64 gapcnt;
1: -	__u64 ouodchunks;
1: -	__u64 iuodchunks;
1: -	__u64 oodchunks;
1: -	__u64 iodchunks;
1: -	__u64 octrlchunks;
1: -	__u64 ictrlchunks;
1: +  struct __kernel_sockaddr_storage obs_rto_ipaddr;
1: +  __u64 max_obs_rto;
1: +  __u64 isacks;
1: +  __u64 osacks;
1: +  __u64 opackets;
1: +  __u64 ipackets;
1: +  __u64 rtxchunks;
1: +  __u64 outofseqtsns;
1: +  __u64 idupchunks;
1: +  __u64 gapcnt;
1: +  __u64 ouodchunks;
1: +  __u64 iuodchunks;
1: +  __u64 oodchunks;
1: +  __u64 iodchunks;
1: +  __u64 octrlchunks;
1: +  __u64 ictrlchunks;
1:  };
1:  
1:  struct sctp_transport;
1: @@ -59180,224 +60097,224 @@ struct sctp_auth_bytes;
1:  struct sctp_shared_key;
1:  
1:  struct sctp_association {
1: -	struct sctp_ep_common base;
1: -	struct list_head asocs;
1: -	sctp_assoc_t assoc_id;
1: -	struct sctp_endpoint *ep;
1: -	struct sctp_cookie c;
1: -	struct {
1: -		struct list_head transport_addr_list;
1: -		__u32 rwnd;
1: -		__u16 transport_count;
1: -		__u16 port;
1: -		struct sctp_transport *primary_path;
1: -		union sctp_addr primary_addr;
1: -		struct sctp_transport *active_path;
1: -		struct sctp_transport *retran_path;
1: -		struct sctp_transport *last_sent_to;
1: -		struct sctp_transport *last_data_from;
1: -		struct sctp_tsnmap tsn_map;
1: -		__be16 addip_disabled_mask;
1: -		__u16 ecn_capable: 1;
1: -		__u16 ipv4_address: 1;
1: -		__u16 ipv6_address: 1;
1: -		__u16 hostname_address: 1;
1: -		__u16 asconf_capable: 1;
1: -		__u16 prsctp_capable: 1;
1: -		__u16 reconf_capable: 1;
1: -		__u16 intl_capable: 1;
1: -		__u16 auth_capable: 1;
1: -		__u16 sack_needed: 1;
1: -		__u16 sack_generation: 1;
1: -		__u16 zero_window_announced: 1;
1: -		__u32 sack_cnt;
1: -		__u32 adaptation_ind;
1: -		struct sctp_inithdr_host i;
1: -		void *cookie;
1: -		int cookie_len;
1: -		__u32 addip_serial;
1: -		struct sctp_random_param *peer_random;
1: -		struct sctp_chunks_param *peer_chunks;
1: -		struct sctp_hmac_algo_param *peer_hmacs;
1: -	} peer;
1: -	enum sctp_state state;
1: -	int overall_error_count;
1: -	ktime_t cookie_life;
1: -	long unsigned int rto_initial;
1: -	long unsigned int rto_max;
1: -	long unsigned int rto_min;
1: -	int max_burst;
1: -	int max_retrans;
1: -	__u16 pf_retrans;
1: -	__u16 ps_retrans;
1: -	__u16 max_init_attempts;
1: -	__u16 init_retries;
1: -	long unsigned int max_init_timeo;
1: -	long unsigned int hbinterval;
1: -	__be16 encap_port;
1: -	__u16 pathmaxrxt;
1: -	__u32 flowlabel;
1: -	__u8 dscp;
1: -	__u8 pmtu_pending;
1: -	__u32 pathmtu;
1: -	__u32 param_flags;
1: -	__u32 sackfreq;
1: -	long unsigned int sackdelay;
1: -	long unsigned int timeouts[11];
1: -	struct timer_list timers[11];
1: -	struct sctp_transport *shutdown_last_sent_to;
1: -	struct sctp_transport *init_last_sent_to;
1: -	int shutdown_retries;
1: -	__u32 next_tsn;
1: -	__u32 ctsn_ack_point;
1: -	__u32 adv_peer_ack_point;
1: -	__u32 highest_sacked;
1: -	__u32 fast_recovery_exit;
1: -	__u8 fast_recovery;
1: -	__u16 unack_data;
1: -	__u32 rtx_data_chunks;
1: -	__u32 rwnd;
1: -	__u32 a_rwnd;
1: -	__u32 rwnd_over;
1: -	__u32 rwnd_press;
1: -	int sndbuf_used;
1: -	atomic_t rmem_alloc;
1: -	wait_queue_head_t wait;
1: -	__u32 frag_point;
1: -	__u32 user_frag;
1: -	int init_err_counter;
1: -	int init_cycle;
1: -	__u16 default_stream;
1: -	__u16 default_flags;
1: -	__u32 default_ppid;
1: -	__u32 default_context;
1: -	__u32 default_timetolive;
1: -	__u32 default_rcv_context;
1: -	struct sctp_stream stream;
1: -	struct sctp_outq outqueue;
1: -	struct sctp_ulpq ulpq;
1: -	__u32 last_ecne_tsn;
1: -	__u32 last_cwr_tsn;
1: -	int numduptsns;
1: -	struct sctp_chunk *addip_last_asconf;
1: -	struct list_head asconf_ack_list;
1: -	struct list_head addip_chunk_list;
1: -	__u32 addip_serial;
1: -	int src_out_of_asoc_ok;
1: -	union sctp_addr *asconf_addr_del_pending;
1: -	struct sctp_transport *new_transport;
1: -	struct list_head endpoint_shared_keys;
1: -	struct sctp_auth_bytes *asoc_shared_key;
1: -	struct sctp_shared_key *shkey;
1: -	__u16 default_hmac_id;
1: -	__u16 active_key_id;
1: -	__u8 need_ecne: 1;
1: -	__u8 temp: 1;
1: -	__u8 pf_expose: 2;
1: -	__u8 force_delay: 1;
1: -	__u8 strreset_enable;
1: -	__u8 strreset_outstanding;
1: -	__u32 strreset_outseq;
1: -	__u32 strreset_inseq;
1: -	__u32 strreset_result[2];
1: -	struct sctp_chunk *strreset_chunk;
1: -	struct sctp_priv_assoc_stats stats;
1: -	int sent_cnt_removable;
1: -	__u16 subscribe;
1: -	__u64 abandoned_unsent[3];
1: -	__u64 abandoned_sent[3];
1: -	struct callback_head rcu;
1: +  struct sctp_ep_common base;
1: +  struct list_head asocs;
1: +  sctp_assoc_t assoc_id;
1: +  struct sctp_endpoint *ep;
1: +  struct sctp_cookie c;
1: +  struct {
1: +    struct list_head transport_addr_list;
1: +    __u32 rwnd;
1: +    __u16 transport_count;
1: +    __u16 port;
1: +    struct sctp_transport *primary_path;
1: +    union sctp_addr primary_addr;
1: +    struct sctp_transport *active_path;
1: +    struct sctp_transport *retran_path;
1: +    struct sctp_transport *last_sent_to;
1: +    struct sctp_transport *last_data_from;
1: +    struct sctp_tsnmap tsn_map;
1: +    __be16 addip_disabled_mask;
1: +    __u16 ecn_capable : 1;
1: +    __u16 ipv4_address : 1;
1: +    __u16 ipv6_address : 1;
1: +    __u16 hostname_address : 1;
1: +    __u16 asconf_capable : 1;
1: +    __u16 prsctp_capable : 1;
1: +    __u16 reconf_capable : 1;
1: +    __u16 intl_capable : 1;
1: +    __u16 auth_capable : 1;
1: +    __u16 sack_needed : 1;
1: +    __u16 sack_generation : 1;
1: +    __u16 zero_window_announced : 1;
1: +    __u32 sack_cnt;
1: +    __u32 adaptation_ind;
1: +    struct sctp_inithdr_host i;
1: +    void *cookie;
1: +    int cookie_len;
1: +    __u32 addip_serial;
1: +    struct sctp_random_param *peer_random;
1: +    struct sctp_chunks_param *peer_chunks;
1: +    struct sctp_hmac_algo_param *peer_hmacs;
1: +  } peer;
1: +  enum sctp_state state;
1: +  int overall_error_count;
1: +  ktime_t cookie_life;
1: +  long unsigned int rto_initial;
1: +  long unsigned int rto_max;
1: +  long unsigned int rto_min;
1: +  int max_burst;
1: +  int max_retrans;
1: +  __u16 pf_retrans;
1: +  __u16 ps_retrans;
1: +  __u16 max_init_attempts;
1: +  __u16 init_retries;
1: +  long unsigned int max_init_timeo;
1: +  long unsigned int hbinterval;
1: +  __be16 encap_port;
1: +  __u16 pathmaxrxt;
1: +  __u32 flowlabel;
1: +  __u8 dscp;
1: +  __u8 pmtu_pending;
1: +  __u32 pathmtu;
1: +  __u32 param_flags;
1: +  __u32 sackfreq;
1: +  long unsigned int sackdelay;
1: +  long unsigned int timeouts[11];
1: +  struct timer_list timers[11];
1: +  struct sctp_transport *shutdown_last_sent_to;
1: +  struct sctp_transport *init_last_sent_to;
1: +  int shutdown_retries;
1: +  __u32 next_tsn;
1: +  __u32 ctsn_ack_point;
1: +  __u32 adv_peer_ack_point;
1: +  __u32 highest_sacked;
1: +  __u32 fast_recovery_exit;
1: +  __u8 fast_recovery;
1: +  __u16 unack_data;
1: +  __u32 rtx_data_chunks;
1: +  __u32 rwnd;
1: +  __u32 a_rwnd;
1: +  __u32 rwnd_over;
1: +  __u32 rwnd_press;
1: +  int sndbuf_used;
1: +  atomic_t rmem_alloc;
1: +  wait_queue_head_t wait;
1: +  __u32 frag_point;
1: +  __u32 user_frag;
1: +  int init_err_counter;
1: +  int init_cycle;
1: +  __u16 default_stream;
1: +  __u16 default_flags;
1: +  __u32 default_ppid;
1: +  __u32 default_context;
1: +  __u32 default_timetolive;
1: +  __u32 default_rcv_context;
1: +  struct sctp_stream stream;
1: +  struct sctp_outq outqueue;
1: +  struct sctp_ulpq ulpq;
1: +  __u32 last_ecne_tsn;
1: +  __u32 last_cwr_tsn;
1: +  int numduptsns;
1: +  struct sctp_chunk *addip_last_asconf;
1: +  struct list_head asconf_ack_list;
1: +  struct list_head addip_chunk_list;
1: +  __u32 addip_serial;
1: +  int src_out_of_asoc_ok;
1: +  union sctp_addr *asconf_addr_del_pending;
1: +  struct sctp_transport *new_transport;
1: +  struct list_head endpoint_shared_keys;
1: +  struct sctp_auth_bytes *asoc_shared_key;
1: +  struct sctp_shared_key *shkey;
1: +  __u16 default_hmac_id;
1: +  __u16 active_key_id;
1: +  __u8 need_ecne : 1;
1: +  __u8 temp : 1;
1: +  __u8 pf_expose : 2;
1: +  __u8 force_delay : 1;
1: +  __u8 strreset_enable;
1: +  __u8 strreset_outstanding;
1: +  __u32 strreset_outseq;
1: +  __u32 strreset_inseq;
1: +  __u32 strreset_result[2];
1: +  struct sctp_chunk *strreset_chunk;
1: +  struct sctp_priv_assoc_stats stats;
1: +  int sent_cnt_removable;
1: +  __u16 subscribe;
1: +  __u64 abandoned_unsent[3];
1: +  __u64 abandoned_sent[3];
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct sctp_auth_bytes {
1: -	refcount_t refcnt;
1: -	__u32 len;
1: -	__u8 data[0];
1: +  refcount_t refcnt;
1: +  __u32 len;
1: +  __u8 data[0];
1:  };
1:  
1:  struct sctp_shared_key {
1: -	struct list_head key_list;
1: -	struct sctp_auth_bytes *key;
1: -	refcount_t refcnt;
1: -	__u16 key_id;
1: -	__u8 deactivated;
1: +  struct list_head key_list;
1: +  struct sctp_auth_bytes *key;
1: +  refcount_t refcnt;
1: +  __u16 key_id;
1: +  __u8 deactivated;
1:  };
1:  
1:  enum {
1: -	SCTP_MAX_STREAM = 65535,
1: +  SCTP_MAX_STREAM = 65535,
1:  };
1:  
1:  enum sctp_event_timeout {
1: -	SCTP_EVENT_TIMEOUT_NONE = 0,
1: -	SCTP_EVENT_TIMEOUT_T1_COOKIE = 1,
1: -	SCTP_EVENT_TIMEOUT_T1_INIT = 2,
1: -	SCTP_EVENT_TIMEOUT_T2_SHUTDOWN = 3,
1: -	SCTP_EVENT_TIMEOUT_T3_RTX = 4,
1: -	SCTP_EVENT_TIMEOUT_T4_RTO = 5,
1: -	SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD = 6,
1: -	SCTP_EVENT_TIMEOUT_HEARTBEAT = 7,
1: -	SCTP_EVENT_TIMEOUT_RECONF = 8,
1: -	SCTP_EVENT_TIMEOUT_SACK = 9,
1: -	SCTP_EVENT_TIMEOUT_AUTOCLOSE = 10,
1: +  SCTP_EVENT_TIMEOUT_NONE = 0,
1: +  SCTP_EVENT_TIMEOUT_T1_COOKIE = 1,
1: +  SCTP_EVENT_TIMEOUT_T1_INIT = 2,
1: +  SCTP_EVENT_TIMEOUT_T2_SHUTDOWN = 3,
1: +  SCTP_EVENT_TIMEOUT_T3_RTX = 4,
1: +  SCTP_EVENT_TIMEOUT_T4_RTO = 5,
1: +  SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD = 6,
1: +  SCTP_EVENT_TIMEOUT_HEARTBEAT = 7,
1: +  SCTP_EVENT_TIMEOUT_RECONF = 8,
1: +  SCTP_EVENT_TIMEOUT_SACK = 9,
1: +  SCTP_EVENT_TIMEOUT_AUTOCLOSE = 10,
1:  };
1:  
1:  enum {
1: -	SCTP_MAX_DUP_TSNS = 16,
1: +  SCTP_MAX_DUP_TSNS = 16,
1:  };
1:  
1:  enum sctp_scope {
1: -	SCTP_SCOPE_GLOBAL = 0,
1: -	SCTP_SCOPE_PRIVATE = 1,
1: -	SCTP_SCOPE_LINK = 2,
1: -	SCTP_SCOPE_LOOPBACK = 3,
1: -	SCTP_SCOPE_UNUSABLE = 4,
1: +  SCTP_SCOPE_GLOBAL = 0,
1: +  SCTP_SCOPE_PRIVATE = 1,
1: +  SCTP_SCOPE_LINK = 2,
1: +  SCTP_SCOPE_LOOPBACK = 3,
1: +  SCTP_SCOPE_UNUSABLE = 4,
1:  };
1:  
1:  enum {
1: -	SCTP_AUTH_HMAC_ID_RESERVED_0 = 0,
1: -	SCTP_AUTH_HMAC_ID_SHA1 = 1,
1: -	SCTP_AUTH_HMAC_ID_RESERVED_2 = 2,
1: -	SCTP_AUTH_HMAC_ID_SHA256 = 3,
1: -	__SCTP_AUTH_HMAC_MAX = 4,
1: +  SCTP_AUTH_HMAC_ID_RESERVED_0 = 0,
1: +  SCTP_AUTH_HMAC_ID_SHA1 = 1,
1: +  SCTP_AUTH_HMAC_ID_RESERVED_2 = 2,
1: +  SCTP_AUTH_HMAC_ID_SHA256 = 3,
1: +  __SCTP_AUTH_HMAC_MAX = 4,
1:  };
1:  
1:  struct sctp_ulpevent {
1: -	struct sctp_association *asoc;
1: -	struct sctp_chunk *chunk;
1: -	unsigned int rmem_len;
1: -	union {
1: -		__u32 mid;
1: -		__u16 ssn;
1: -	};
1: -	union {
1: -		__u32 ppid;
1: -		__u32 fsn;
1: -	};
1: -	__u32 tsn;
1: -	__u32 cumtsn;
1: -	__u16 stream;
1: -	__u16 flags;
1: -	__u16 msg_flags;
1: +  struct sctp_association *asoc;
1: +  struct sctp_chunk *chunk;
1: +  unsigned int rmem_len;
1: +  union {
1: +    __u32 mid;
1: +    __u16 ssn;
1: +  };
1: +  union {
1: +    __u32 ppid;
1: +    __u32 fsn;
1: +  };
1: +  __u32 tsn;
1: +  __u32 cumtsn;
1: +  __u16 stream;
1: +  __u16 flags;
1: +  __u16 msg_flags;
1:  } __attribute__((packed));
1:  
1:  union sctp_addr_param;
1:  
1:  union sctp_params {
1: -	void *v;
1: -	struct sctp_paramhdr *p;
1: -	struct sctp_cookie_preserve_param *life;
1: -	struct sctp_hostname_param *dns;
1: -	struct sctp_cookie_param *cookie;
1: -	struct sctp_supported_addrs_param *sat;
1: -	struct sctp_ipv4addr_param *v4;
1: -	struct sctp_ipv6addr_param *v6;
1: -	union sctp_addr_param *addr;
1: -	struct sctp_adaptation_ind_param *aind;
1: -	struct sctp_supported_ext_param *ext;
1: -	struct sctp_random_param *random;
1: -	struct sctp_chunks_param *chunks;
1: -	struct sctp_hmac_algo_param *hmac_algo;
1: -	struct sctp_addip_param *addip;
1: +  void *v;
1: +  struct sctp_paramhdr *p;
1: +  struct sctp_cookie_preserve_param *life;
1: +  struct sctp_hostname_param *dns;
1: +  struct sctp_cookie_param *cookie;
1: +  struct sctp_supported_addrs_param *sat;
1: +  struct sctp_ipv4addr_param *v4;
1: +  struct sctp_ipv6addr_param *v6;
1: +  union sctp_addr_param *addr;
1: +  struct sctp_adaptation_ind_param *aind;
1: +  struct sctp_supported_ext_param *ext;
1: +  struct sctp_random_param *random;
1: +  struct sctp_chunks_param *chunks;
1: +  struct sctp_hmac_algo_param *hmac_algo;
1: +  struct sctp_addip_param *addip;
1:  };
1:  
1:  struct sctp_sender_hb_info;
1: @@ -59407,729 +60324,737 @@ struct sctp_signed_cookie;
1:  struct sctp_datamsg;
1:  
1:  struct sctp_chunk {
1: -	struct list_head list;
1: -	refcount_t refcnt;
1: -	int sent_count;
1: -	union {
1: -		struct list_head transmitted_list;
1: -		struct list_head stream_list;
1: -	};
1: -	struct list_head frag_list;
1: -	struct sk_buff *skb;
1: -	union {
1: -		struct sk_buff *head_skb;
1: -		struct sctp_shared_key *shkey;
1: -	};
1: -	union sctp_params param_hdr;
1: -	union {
1: -		__u8 *v;
1: -		struct sctp_datahdr *data_hdr;
1: -		struct sctp_inithdr *init_hdr;
1: -		struct sctp_sackhdr *sack_hdr;
1: -		struct sctp_heartbeathdr *hb_hdr;
1: -		struct sctp_sender_hb_info *hbs_hdr;
1: -		struct sctp_shutdownhdr *shutdown_hdr;
1: -		struct sctp_signed_cookie *cookie_hdr;
1: -		struct sctp_ecnehdr *ecne_hdr;
1: -		struct sctp_cwrhdr *ecn_cwr_hdr;
1: -		struct sctp_errhdr *err_hdr;
1: -		struct sctp_addiphdr *addip_hdr;
1: -		struct sctp_fwdtsn_hdr *fwdtsn_hdr;
1: -		struct sctp_authhdr *auth_hdr;
1: -		struct sctp_idatahdr *idata_hdr;
1: -		struct sctp_ifwdtsn_hdr *ifwdtsn_hdr;
1: -	} subh;
1: -	__u8 *chunk_end;
1: -	struct sctp_chunkhdr *chunk_hdr;
1: -	struct sctphdr *sctp_hdr;
1: -	struct sctp_sndrcvinfo sinfo;
1: -	struct sctp_association *asoc;
1: -	struct sctp_ep_common *rcvr;
1: -	long unsigned int sent_at;
1: -	union sctp_addr source;
1: -	union sctp_addr dest;
1: -	struct sctp_datamsg *msg;
1: -	struct sctp_transport *transport;
1: -	struct sk_buff *auth_chunk;
1: -	__u16 rtt_in_progress: 1;
1: -	__u16 has_tsn: 1;
1: -	__u16 has_ssn: 1;
1: -	__u16 singleton: 1;
1: -	__u16 end_of_packet: 1;
1: -	__u16 ecn_ce_done: 1;
1: -	__u16 pdiscard: 1;
1: -	__u16 tsn_gap_acked: 1;
1: -	__u16 data_accepted: 1;
1: -	__u16 auth: 1;
1: -	__u16 has_asconf: 1;
1: -	__u16 tsn_missing_report: 2;
1: -	__u16 fast_retransmit: 2;
1: +  struct list_head list;
1: +  refcount_t refcnt;
1: +  int sent_count;
1: +  union {
1: +    struct list_head transmitted_list;
1: +    struct list_head stream_list;
1: +  };
1: +  struct list_head frag_list;
1: +  struct sk_buff *skb;
1: +  union {
1: +    struct sk_buff *head_skb;
1: +    struct sctp_shared_key *shkey;
1: +  };
1: +  union sctp_params param_hdr;
1: +  union {
1: +    __u8 *v;
1: +    struct sctp_datahdr *data_hdr;
1: +    struct sctp_inithdr *init_hdr;
1: +    struct sctp_sackhdr *sack_hdr;
1: +    struct sctp_heartbeathdr *hb_hdr;
1: +    struct sctp_sender_hb_info *hbs_hdr;
1: +    struct sctp_shutdownhdr *shutdown_hdr;
1: +    struct sctp_signed_cookie *cookie_hdr;
1: +    struct sctp_ecnehdr *ecne_hdr;
1: +    struct sctp_cwrhdr *ecn_cwr_hdr;
1: +    struct sctp_errhdr *err_hdr;
1: +    struct sctp_addiphdr *addip_hdr;
1: +    struct sctp_fwdtsn_hdr *fwdtsn_hdr;
1: +    struct sctp_authhdr *auth_hdr;
1: +    struct sctp_idatahdr *idata_hdr;
1: +    struct sctp_ifwdtsn_hdr *ifwdtsn_hdr;
1: +  } subh;
1: +  __u8 *chunk_end;
1: +  struct sctp_chunkhdr *chunk_hdr;
1: +  struct sctphdr *sctp_hdr;
1: +  struct sctp_sndrcvinfo sinfo;
1: +  struct sctp_association *asoc;
1: +  struct sctp_ep_common *rcvr;
1: +  long unsigned int sent_at;
1: +  union sctp_addr source;
1: +  union sctp_addr dest;
1: +  struct sctp_datamsg *msg;
1: +  struct sctp_transport *transport;
1: +  struct sk_buff *auth_chunk;
1: +  __u16 rtt_in_progress : 1;
1: +  __u16 has_tsn : 1;
1: +  __u16 has_ssn : 1;
1: +  __u16 singleton : 1;
1: +  __u16 end_of_packet : 1;
1: +  __u16 ecn_ce_done : 1;
1: +  __u16 pdiscard : 1;
1: +  __u16 tsn_gap_acked : 1;
1: +  __u16 data_accepted : 1;
1: +  __u16 auth : 1;
1: +  __u16 has_asconf : 1;
1: +  __u16 tsn_missing_report : 2;
1: +  __u16 fast_retransmit : 2;
1:  };
1:  
1:  struct sctp_stream_interleave {
1: -	__u16 data_chunk_len;
1: -	__u16 ftsn_chunk_len;
1: -	struct sctp_chunk * (*make_datafrag)(const struct sctp_association *, const struct sctp_sndrcvinfo *, int, __u8, gfp_t);
1: -	void (*assign_number)(struct sctp_chunk *);
1: -	bool (*validate_data)(struct sctp_chunk *);
1: -	int (*ulpevent_data)(struct sctp_ulpq *, struct sctp_chunk *, gfp_t);
1: -	int (*enqueue_event)(struct sctp_ulpq *, struct sctp_ulpevent *);
1: -	void (*renege_events)(struct sctp_ulpq *, struct sctp_chunk *, gfp_t);
1: -	void (*start_pd)(struct sctp_ulpq *, gfp_t);
1: -	void (*abort_pd)(struct sctp_ulpq *, gfp_t);
1: -	void (*generate_ftsn)(struct sctp_outq *, __u32);
1: -	bool (*validate_ftsn)(struct sctp_chunk *);
1: -	void (*report_ftsn)(struct sctp_ulpq *, __u32);
1: -	void (*handle_ftsn)(struct sctp_ulpq *, struct sctp_chunk *);
1: +  __u16 data_chunk_len;
1: +  __u16 ftsn_chunk_len;
1: +  struct sctp_chunk *(*make_datafrag)(const struct sctp_association *,
1: +                                      const struct sctp_sndrcvinfo *, int, __u8,
1: +                                      gfp_t);
1: +  void (*assign_number)(struct sctp_chunk *);
1: +  bool (*validate_data)(struct sctp_chunk *);
1: +  int (*ulpevent_data)(struct sctp_ulpq *, struct sctp_chunk *, gfp_t);
1: +  int (*enqueue_event)(struct sctp_ulpq *, struct sctp_ulpevent *);
1: +  void (*renege_events)(struct sctp_ulpq *, struct sctp_chunk *, gfp_t);
1: +  void (*start_pd)(struct sctp_ulpq *, gfp_t);
1: +  void (*abort_pd)(struct sctp_ulpq *, gfp_t);
1: +  void (*generate_ftsn)(struct sctp_outq *, __u32);
1: +  bool (*validate_ftsn)(struct sctp_chunk *);
1: +  void (*report_ftsn)(struct sctp_ulpq *, __u32);
1: +  void (*handle_ftsn)(struct sctp_ulpq *, struct sctp_chunk *);
1:  };
1:  
1:  struct sctp_bind_bucket {
1: -	short unsigned int port;
1: -	signed char fastreuse;
1: -	signed char fastreuseport;
1: -	kuid_t fastuid;
1: -	struct hlist_node node;
1: -	struct hlist_head owner;
1: -	struct net *net;
1: +  short unsigned int port;
1: +  signed char fastreuse;
1: +  signed char fastreuseport;
1: +  kuid_t fastuid;
1: +  struct hlist_node node;
1: +  struct hlist_head owner;
1: +  struct net *net;
1:  };
1:  
1:  enum sctp_socket_type {
1: -	SCTP_SOCKET_UDP = 0,
1: -	SCTP_SOCKET_UDP_HIGH_BANDWIDTH = 1,
1: -	SCTP_SOCKET_TCP = 2,
1: +  SCTP_SOCKET_UDP = 0,
1: +  SCTP_SOCKET_UDP_HIGH_BANDWIDTH = 1,
1: +  SCTP_SOCKET_TCP = 2,
1:  };
1:  
1:  struct sctp_pf;
1:  
1:  struct sctp_sock {
1: -	struct inet_sock inet;
1: -	enum sctp_socket_type type;
1: -	struct sctp_pf *pf;
1: -	struct crypto_shash *hmac;
1: -	char *sctp_hmac_alg;
1: -	struct sctp_endpoint *ep;
1: -	struct sctp_bind_bucket *bind_hash;
1: -	__u16 default_stream;
1: -	__u32 default_ppid;
1: -	__u16 default_flags;
1: -	__u32 default_context;
1: -	__u32 default_timetolive;
1: -	__u32 default_rcv_context;
1: -	int max_burst;
1: -	__u32 hbinterval;
1: -	__be16 udp_port;
1: -	__be16 encap_port;
1: -	__u16 pathmaxrxt;
1: -	__u32 flowlabel;
1: -	__u8 dscp;
1: -	__u16 pf_retrans;
1: -	__u16 ps_retrans;
1: -	__u32 pathmtu;
1: -	__u32 sackdelay;
1: -	__u32 sackfreq;
1: -	__u32 param_flags;
1: -	__u32 default_ss;
1: -	struct sctp_rtoinfo rtoinfo;
1: -	struct sctp_paddrparams paddrparam;
1: -	struct sctp_assocparams assocparams;
1: -	__u16 subscribe;
1: -	struct sctp_initmsg initmsg;
1: -	int user_frag;
1: -	__u32 autoclose;
1: -	__u32 adaptation_ind;
1: -	__u32 pd_point;
1: -	__u16 nodelay: 1;
1: -	__u16 pf_expose: 2;
1: -	__u16 reuse: 1;
1: -	__u16 disable_fragments: 1;
1: -	__u16 v4mapped: 1;
1: -	__u16 frag_interleave: 1;
1: -	__u16 recvrcvinfo: 1;
1: -	__u16 recvnxtinfo: 1;
1: -	__u16 data_ready_signalled: 1;
1: -	atomic_t pd_mode;
1: -	struct sk_buff_head pd_lobby;
1: -	struct list_head auto_asconf_list;
1: -	int do_auto_asconf;
1: +  struct inet_sock inet;
1: +  enum sctp_socket_type type;
1: +  struct sctp_pf *pf;
1: +  struct crypto_shash *hmac;
1: +  char *sctp_hmac_alg;
1: +  struct sctp_endpoint *ep;
1: +  struct sctp_bind_bucket *bind_hash;
1: +  __u16 default_stream;
1: +  __u32 default_ppid;
1: +  __u16 default_flags;
1: +  __u32 default_context;
1: +  __u32 default_timetolive;
1: +  __u32 default_rcv_context;
1: +  int max_burst;
1: +  __u32 hbinterval;
1: +  __be16 udp_port;
1: +  __be16 encap_port;
1: +  __u16 pathmaxrxt;
1: +  __u32 flowlabel;
1: +  __u8 dscp;
1: +  __u16 pf_retrans;
1: +  __u16 ps_retrans;
1: +  __u32 pathmtu;
1: +  __u32 sackdelay;
1: +  __u32 sackfreq;
1: +  __u32 param_flags;
1: +  __u32 default_ss;
1: +  struct sctp_rtoinfo rtoinfo;
1: +  struct sctp_paddrparams paddrparam;
1: +  struct sctp_assocparams assocparams;
1: +  __u16 subscribe;
1: +  struct sctp_initmsg initmsg;
1: +  int user_frag;
1: +  __u32 autoclose;
1: +  __u32 adaptation_ind;
1: +  __u32 pd_point;
1: +  __u16 nodelay : 1;
1: +  __u16 pf_expose : 2;
1: +  __u16 reuse : 1;
1: +  __u16 disable_fragments : 1;
1: +  __u16 v4mapped : 1;
1: +  __u16 frag_interleave : 1;
1: +  __u16 recvrcvinfo : 1;
1: +  __u16 recvnxtinfo : 1;
1: +  __u16 data_ready_signalled : 1;
1: +  atomic_t pd_mode;
1: +  struct sk_buff_head pd_lobby;
1: +  struct list_head auto_asconf_list;
1: +  int do_auto_asconf;
1:  };
1:  
1:  struct sctp_af;
1:  
1:  struct sctp_pf {
1: -	void (*event_msgname)(struct sctp_ulpevent *, char *, int *);
1: -	void (*skb_msgname)(struct sk_buff *, char *, int *);
1: -	int (*af_supported)(sa_family_t, struct sctp_sock *);
1: -	int (*cmp_addr)(const union sctp_addr *, const union sctp_addr *, struct sctp_sock *);
1: -	int (*bind_verify)(struct sctp_sock *, union sctp_addr *);
1: -	int (*send_verify)(struct sctp_sock *, union sctp_addr *);
1: -	int (*supported_addrs)(const struct sctp_sock *, __be16 *);
1: -	struct sock * (*create_accept_sk)(struct sock *, struct sctp_association *, bool);
1: -	int (*addr_to_user)(struct sctp_sock *, union sctp_addr *);
1: -	void (*to_sk_saddr)(union sctp_addr *, struct sock *);
1: -	void (*to_sk_daddr)(union sctp_addr *, struct sock *);
1: -	void (*copy_ip_options)(struct sock *, struct sock *);
1: -	struct sctp_af *af;
1: +  void (*event_msgname)(struct sctp_ulpevent *, char *, int *);
1: +  void (*skb_msgname)(struct sk_buff *, char *, int *);
1: +  int (*af_supported)(sa_family_t, struct sctp_sock *);
1: +  int (*cmp_addr)(const union sctp_addr *, const union sctp_addr *,
1: +                  struct sctp_sock *);
1: +  int (*bind_verify)(struct sctp_sock *, union sctp_addr *);
1: +  int (*send_verify)(struct sctp_sock *, union sctp_addr *);
1: +  int (*supported_addrs)(const struct sctp_sock *, __be16 *);
1: +  struct sock *(*create_accept_sk)(struct sock *, struct sctp_association *,
1: +                                   bool);
1: +  int (*addr_to_user)(struct sctp_sock *, union sctp_addr *);
1: +  void (*to_sk_saddr)(union sctp_addr *, struct sock *);
1: +  void (*to_sk_daddr)(union sctp_addr *, struct sock *);
1: +  void (*copy_ip_options)(struct sock *, struct sock *);
1: +  struct sctp_af *af;
1:  };
1:  
1:  struct sctp_signed_cookie {
1: -	__u8 signature[32];
1: -	__u32 __pad;
1: -	struct sctp_cookie c;
1: +  __u8 signature[32];
1: +  __u32 __pad;
1: +  struct sctp_cookie c;
1:  } __attribute__((packed));
1:  
1:  union sctp_addr_param {
1: -	struct sctp_paramhdr p;
1: -	struct sctp_ipv4addr_param v4;
1: -	struct sctp_ipv6addr_param v6;
1: +  struct sctp_paramhdr p;
1: +  struct sctp_ipv4addr_param v4;
1: +  struct sctp_ipv6addr_param v6;
1:  };
1:  
1:  struct sctp_sender_hb_info {
1: -	struct sctp_paramhdr param_hdr;
1: -	union sctp_addr daddr;
1: -	long unsigned int sent_at;
1: -	__u64 hb_nonce;
1: +  struct sctp_paramhdr param_hdr;
1: +  union sctp_addr daddr;
1: +  long unsigned int sent_at;
1: +  __u64 hb_nonce;
1:  };
1:  
1:  struct sctp_af {
1: -	int (*sctp_xmit)(struct sk_buff *, struct sctp_transport *);
1: -	int (*setsockopt)(struct sock *, int, int, sockptr_t, unsigned int);
1: -	int (*getsockopt)(struct sock *, int, int, char *, int *);
1: -	void (*get_dst)(struct sctp_transport *, union sctp_addr *, struct flowi *, struct sock *);
1: -	void (*get_saddr)(struct sctp_sock *, struct sctp_transport *, struct flowi *);
1: -	void (*copy_addrlist)(struct list_head *, struct net_device *);
1: -	int (*cmp_addr)(const union sctp_addr *, const union sctp_addr *);
1: -	void (*addr_copy)(union sctp_addr *, union sctp_addr *);
1: -	void (*from_skb)(union sctp_addr *, struct sk_buff *, int);
1: -	void (*from_sk)(union sctp_addr *, struct sock *);
1: -	void (*from_addr_param)(union sctp_addr *, union sctp_addr_param *, __be16, int);
1: -	int (*to_addr_param)(const union sctp_addr *, union sctp_addr_param *);
1: -	int (*addr_valid)(union sctp_addr *, struct sctp_sock *, const struct sk_buff *);
1: -	enum sctp_scope (*scope)(union sctp_addr *);
1: -	void (*inaddr_any)(union sctp_addr *, __be16);
1: -	int (*is_any)(const union sctp_addr *);
1: -	int (*available)(union sctp_addr *, struct sctp_sock *);
1: -	int (*skb_iif)(const struct sk_buff *);
1: -	int (*is_ce)(const struct sk_buff *);
1: -	void (*seq_dump_addr)(struct seq_file *, union sctp_addr *);
1: -	void (*ecn_capable)(struct sock *);
1: -	__u16 net_header_len;
1: -	int sockaddr_len;
1: -	int (*ip_options_len)(struct sock *);
1: -	sa_family_t sa_family;
1: -	struct list_head list;
1: +  int (*sctp_xmit)(struct sk_buff *, struct sctp_transport *);
1: +  int (*setsockopt)(struct sock *, int, int, sockptr_t, unsigned int);
1: +  int (*getsockopt)(struct sock *, int, int, char *, int *);
1: +  void (*get_dst)(struct sctp_transport *, union sctp_addr *, struct flowi *,
1: +                  struct sock *);
1: +  void (*get_saddr)(struct sctp_sock *, struct sctp_transport *,
1: +                    struct flowi *);
1: +  void (*copy_addrlist)(struct list_head *, struct net_device *);
1: +  int (*cmp_addr)(const union sctp_addr *, const union sctp_addr *);
1: +  void (*addr_copy)(union sctp_addr *, union sctp_addr *);
1: +  void (*from_skb)(union sctp_addr *, struct sk_buff *, int);
1: +  void (*from_sk)(union sctp_addr *, struct sock *);
1: +  void (*from_addr_param)(union sctp_addr *, union sctp_addr_param *, __be16,
1: +                          int);
1: +  int (*to_addr_param)(const union sctp_addr *, union sctp_addr_param *);
1: +  int (*addr_valid)(union sctp_addr *, struct sctp_sock *,
1: +                    const struct sk_buff *);
1: +  enum sctp_scope (*scope)(union sctp_addr *);
1: +  void (*inaddr_any)(union sctp_addr *, __be16);
1: +  int (*is_any)(const union sctp_addr *);
1: +  int (*available)(union sctp_addr *, struct sctp_sock *);
1: +  int (*skb_iif)(const struct sk_buff *);
1: +  int (*is_ce)(const struct sk_buff *);
1: +  void (*seq_dump_addr)(struct seq_file *, union sctp_addr *);
1: +  void (*ecn_capable)(struct sock *);
1: +  __u16 net_header_len;
1: +  int sockaddr_len;
1: +  int (*ip_options_len)(struct sock *);
1: +  sa_family_t sa_family;
1: +  struct list_head list;
1:  };
1:  
1:  struct sctp_packet {
1: -	__u16 source_port;
1: -	__u16 destination_port;
1: -	__u32 vtag;
1: -	struct list_head chunk_list;
1: -	size_t overhead;
1: -	size_t size;
1: -	size_t max_size;
1: -	struct sctp_transport *transport;
1: -	struct sctp_chunk *auth;
1: -	u8 has_cookie_echo: 1;
1: -	u8 has_sack: 1;
1: -	u8 has_auth: 1;
1: -	u8 has_data: 1;
1: -	u8 ipfragok: 1;
1: +  __u16 source_port;
1: +  __u16 destination_port;
1: +  __u32 vtag;
1: +  struct list_head chunk_list;
1: +  size_t overhead;
1: +  size_t size;
1: +  size_t max_size;
1: +  struct sctp_transport *transport;
1: +  struct sctp_chunk *auth;
1: +  u8 has_cookie_echo : 1;
1: +  u8 has_sack : 1;
1: +  u8 has_auth : 1;
1: +  u8 has_data : 1;
1: +  u8 ipfragok : 1;
1:  };
1:  
1:  struct sctp_transport {
1: -	struct list_head transports;
1: -	struct rhlist_head node;
1: -	refcount_t refcnt;
1: -	__u32 rto_pending: 1;
1: -	__u32 hb_sent: 1;
1: -	__u32 pmtu_pending: 1;
1: -	__u32 dst_pending_confirm: 1;
1: -	__u32 sack_generation: 1;
1: -	u32 dst_cookie;
1: -	struct flowi fl;
1: -	union sctp_addr ipaddr;
1: -	struct sctp_af *af_specific;
1: -	struct sctp_association *asoc;
1: -	long unsigned int rto;
1: -	__u32 rtt;
1: -	__u32 rttvar;
1: -	__u32 srtt;
1: -	__u32 cwnd;
1: -	__u32 ssthresh;
1: -	__u32 partial_bytes_acked;
1: -	__u32 flight_size;
1: -	__u32 burst_limited;
1: -	struct dst_entry *dst;
1: -	union sctp_addr saddr;
1: -	long unsigned int hbinterval;
1: -	long unsigned int sackdelay;
1: -	__u32 sackfreq;
1: -	atomic_t mtu_info;
1: -	ktime_t last_time_heard;
1: -	long unsigned int last_time_sent;
1: -	long unsigned int last_time_ecne_reduced;
1: -	__be16 encap_port;
1: -	__u16 pathmaxrxt;
1: -	__u32 flowlabel;
1: -	__u8 dscp;
1: -	__u16 pf_retrans;
1: -	__u16 ps_retrans;
1: -	__u32 pathmtu;
1: -	__u32 param_flags;
1: -	int init_sent_count;
1: -	int state;
1: -	short unsigned int error_count;
1: -	struct timer_list T3_rtx_timer;
1: -	struct timer_list hb_timer;
1: -	struct timer_list proto_unreach_timer;
1: -	struct timer_list reconf_timer;
1: -	struct list_head transmitted;
1: -	struct sctp_packet packet;
1: -	struct list_head send_ready;
1: -	struct {
1: -		__u32 next_tsn_at_change;
1: -		char changeover_active;
1: -		char cycling_changeover;
1: -		char cacc_saw_newack;
1: -	} cacc;
1: -	__u64 hb_nonce;
1: -	struct callback_head rcu;
1: +  struct list_head transports;
1: +  struct rhlist_head node;
1: +  refcount_t refcnt;
1: +  __u32 rto_pending : 1;
1: +  __u32 hb_sent : 1;
1: +  __u32 pmtu_pending : 1;
1: +  __u32 dst_pending_confirm : 1;
1: +  __u32 sack_generation : 1;
1: +  u32 dst_cookie;
1: +  struct flowi fl;
1: +  union sctp_addr ipaddr;
1: +  struct sctp_af *af_specific;
1: +  struct sctp_association *asoc;
1: +  long unsigned int rto;
1: +  __u32 rtt;
1: +  __u32 rttvar;
1: +  __u32 srtt;
1: +  __u32 cwnd;
1: +  __u32 ssthresh;
1: +  __u32 partial_bytes_acked;
1: +  __u32 flight_size;
1: +  __u32 burst_limited;
1: +  struct dst_entry *dst;
1: +  union sctp_addr saddr;
1: +  long unsigned int hbinterval;
1: +  long unsigned int sackdelay;
1: +  __u32 sackfreq;
1: +  atomic_t mtu_info;
1: +  ktime_t last_time_heard;
1: +  long unsigned int last_time_sent;
1: +  long unsigned int last_time_ecne_reduced;
1: +  __be16 encap_port;
1: +  __u16 pathmaxrxt;
1: +  __u32 flowlabel;
1: +  __u8 dscp;
1: +  __u16 pf_retrans;
1: +  __u16 ps_retrans;
1: +  __u32 pathmtu;
1: +  __u32 param_flags;
1: +  int init_sent_count;
1: +  int state;
1: +  short unsigned int error_count;
1: +  struct timer_list T3_rtx_timer;
1: +  struct timer_list hb_timer;
1: +  struct timer_list proto_unreach_timer;
1: +  struct timer_list reconf_timer;
1: +  struct list_head transmitted;
1: +  struct sctp_packet packet;
1: +  struct list_head send_ready;
1: +  struct {
1: +    __u32 next_tsn_at_change;
1: +    char changeover_active;
1: +    char cycling_changeover;
1: +    char cacc_saw_newack;
1: +  } cacc;
1: +  __u64 hb_nonce;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct sctp_datamsg {
1: -	struct list_head chunks;
1: -	refcount_t refcnt;
1: -	long unsigned int expires_at;
1: -	int send_error;
1: -	u8 send_failed: 1;
1: -	u8 can_delay: 1;
1: -	u8 abandoned: 1;
1: +  struct list_head chunks;
1: +  refcount_t refcnt;
1: +  long unsigned int expires_at;
1: +  int send_error;
1: +  u8 send_failed : 1;
1: +  u8 can_delay : 1;
1: +  u8 abandoned : 1;
1:  };
1:  
1:  struct sctp_stream_priorities {
1: -	struct list_head prio_sched;
1: -	struct list_head active;
1: -	struct sctp_stream_out_ext *next;
1: -	__u16 prio;
1: +  struct list_head prio_sched;
1: +  struct list_head active;
1: +  struct sctp_stream_out_ext *next;
1: +  __u16 prio;
1:  };
1:  
1:  struct sctp_stream_out_ext {
1: -	__u64 abandoned_unsent[3];
1: -	__u64 abandoned_sent[3];
1: -	struct list_head outq;
1: -	union {
1: -		struct {
1: -			struct list_head prio_list;
1: -			struct sctp_stream_priorities *prio_head;
1: -		};
1: -		struct {
1: -			struct list_head rr_list;
1: -		};
1: -	};
1: +  __u64 abandoned_unsent[3];
1: +  __u64 abandoned_sent[3];
1: +  struct list_head outq;
1: +  union {
1: +    struct {
1: +      struct list_head prio_list;
1: +      struct sctp_stream_priorities *prio_head;
1: +    };
1: +    struct {
1: +      struct list_head rr_list;
1: +    };
1: +  };
1:  };
1:  
1:  struct task_security_struct {
1: -	u32 osid;
1: -	u32 sid;
1: -	u32 exec_sid;
1: -	u32 create_sid;
1: -	u32 keycreate_sid;
1: -	u32 sockcreate_sid;
1: +  u32 osid;
1: +  u32 sid;
1: +  u32 exec_sid;
1: +  u32 create_sid;
1: +  u32 keycreate_sid;
1: +  u32 sockcreate_sid;
1:  };
1:  
1:  enum label_initialized {
1: -	LABEL_INVALID = 0,
1: -	LABEL_INITIALIZED = 1,
1: -	LABEL_PENDING = 2,
1: +  LABEL_INVALID = 0,
1: +  LABEL_INITIALIZED = 1,
1: +  LABEL_PENDING = 2,
1:  };
1:  
1:  struct inode_security_struct {
1: -	struct inode *inode;
1: -	struct list_head list;
1: -	u32 task_sid;
1: -	u32 sid;
1: -	u16 sclass;
1: -	unsigned char initialized;
1: -	spinlock_t lock;
1: +  struct inode *inode;
1: +  struct list_head list;
1: +  u32 task_sid;
1: +  u32 sid;
1: +  u16 sclass;
1: +  unsigned char initialized;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct file_security_struct {
1: -	u32 sid;
1: -	u32 fown_sid;
1: -	u32 isid;
1: -	u32 pseqno;
1: +  u32 sid;
1: +  u32 fown_sid;
1: +  u32 isid;
1: +  u32 pseqno;
1:  };
1:  
1:  struct superblock_security_struct {
1: -	struct super_block *sb;
1: -	u32 sid;
1: -	u32 def_sid;
1: -	u32 mntpoint_sid;
1: -	short unsigned int behavior;
1: -	short unsigned int flags;
1: -	struct mutex lock;
1: -	struct list_head isec_head;
1: -	spinlock_t isec_lock;
1: +  struct super_block *sb;
1: +  u32 sid;
1: +  u32 def_sid;
1: +  u32 mntpoint_sid;
1: +  short unsigned int behavior;
1: +  short unsigned int flags;
1: +  struct mutex lock;
1: +  struct list_head isec_head;
1: +  spinlock_t isec_lock;
1:  };
1:  
1:  struct msg_security_struct {
1: -	u32 sid;
1: +  u32 sid;
1:  };
1:  
1:  struct ipc_security_struct {
1: -	u16 sclass;
1: -	u32 sid;
1: +  u16 sclass;
1: +  u32 sid;
1:  };
1:  
1:  struct sk_security_struct {
1: -	enum {
1: -		NLBL_UNSET = 0,
1: -		NLBL_REQUIRE = 1,
1: -		NLBL_LABELED = 2,
1: -		NLBL_REQSKB = 3,
1: -		NLBL_CONNLABELED = 4,
1: -	} nlbl_state;
1: -	struct netlbl_lsm_secattr *nlbl_secattr;
1: -	u32 sid;
1: -	u32 peer_sid;
1: -	u16 sclass;
1: -	enum {
1: -		SCTP_ASSOC_UNSET = 0,
1: -		SCTP_ASSOC_SET = 1,
1: -	} sctp_assoc_state;
1: +  enum {
1: +    NLBL_UNSET = 0,
1: +    NLBL_REQUIRE = 1,
1: +    NLBL_LABELED = 2,
1: +    NLBL_REQSKB = 3,
1: +    NLBL_CONNLABELED = 4,
1: +  } nlbl_state;
1: +  struct netlbl_lsm_secattr *nlbl_secattr;
1: +  u32 sid;
1: +  u32 peer_sid;
1: +  u16 sclass;
1: +  enum {
1: +    SCTP_ASSOC_UNSET = 0,
1: +    SCTP_ASSOC_SET = 1,
1: +  } sctp_assoc_state;
1:  };
1:  
1:  struct tun_security_struct {
1: -	u32 sid;
1: +  u32 sid;
1:  };
1:  
1:  struct key_security_struct {
1: -	u32 sid;
1: +  u32 sid;
1:  };
1:  
1:  struct bpf_security_struct {
1: -	u32 sid;
1: +  u32 sid;
1:  };
1:  
1:  struct perf_event_security_struct {
1: -	u32 sid;
1: +  u32 sid;
1:  };
1:  
1:  struct selinux_mnt_opts {
1: -	const char *fscontext;
1: -	const char *context;
1: -	const char *rootcontext;
1: -	const char *defcontext;
1: +  const char *fscontext;
1: +  const char *context;
1: +  const char *rootcontext;
1: +  const char *defcontext;
1:  };
1:  
1:  enum {
1: -	Opt_error = 4294967295,
1: -	Opt_context = 0,
1: -	Opt_defcontext = 1,
1: -	Opt_fscontext = 2,
1: -	Opt_rootcontext = 3,
1: -	Opt_seclabel = 4,
1: +  Opt_error = 4294967295,
1: +  Opt_context = 0,
1: +  Opt_defcontext = 1,
1: +  Opt_fscontext = 2,
1: +  Opt_rootcontext = 3,
1: +  Opt_seclabel = 4,
1:  };
1:  
1:  enum sel_inos {
1: -	SEL_ROOT_INO = 2,
1: -	SEL_LOAD = 3,
1: -	SEL_ENFORCE = 4,
1: -	SEL_CONTEXT = 5,
1: -	SEL_ACCESS = 6,
1: -	SEL_CREATE = 7,
1: -	SEL_RELABEL = 8,
1: -	SEL_USER = 9,
1: -	SEL_POLICYVERS = 10,
1: -	SEL_COMMIT_BOOLS = 11,
1: -	SEL_MLS = 12,
1: -	SEL_DISABLE = 13,
1: -	SEL_MEMBER = 14,
1: -	SEL_CHECKREQPROT = 15,
1: -	SEL_COMPAT_NET = 16,
1: -	SEL_REJECT_UNKNOWN = 17,
1: -	SEL_DENY_UNKNOWN = 18,
1: -	SEL_STATUS = 19,
1: -	SEL_POLICY = 20,
1: -	SEL_VALIDATE_TRANS = 21,
1: -	SEL_INO_NEXT = 22,
1: +  SEL_ROOT_INO = 2,
1: +  SEL_LOAD = 3,
1: +  SEL_ENFORCE = 4,
1: +  SEL_CONTEXT = 5,
1: +  SEL_ACCESS = 6,
1: +  SEL_CREATE = 7,
1: +  SEL_RELABEL = 8,
1: +  SEL_USER = 9,
1: +  SEL_POLICYVERS = 10,
1: +  SEL_COMMIT_BOOLS = 11,
1: +  SEL_MLS = 12,
1: +  SEL_DISABLE = 13,
1: +  SEL_MEMBER = 14,
1: +  SEL_CHECKREQPROT = 15,
1: +  SEL_COMPAT_NET = 16,
1: +  SEL_REJECT_UNKNOWN = 17,
1: +  SEL_DENY_UNKNOWN = 18,
1: +  SEL_STATUS = 19,
1: +  SEL_POLICY = 20,
1: +  SEL_VALIDATE_TRANS = 21,
1: +  SEL_INO_NEXT = 22,
1:  };
1:  
1:  struct selinux_fs_info {
1: -	struct dentry *bool_dir;
1: -	unsigned int bool_num;
1: -	char **bool_pending_names;
1: -	unsigned int *bool_pending_values;
1: -	struct dentry *class_dir;
1: -	long unsigned int last_class_ino;
1: -	bool policy_opened;
1: -	struct dentry *policycap_dir;
1: -	long unsigned int last_ino;
1: -	struct selinux_state *state;
1: -	struct super_block *sb;
1: +  struct dentry *bool_dir;
1: +  unsigned int bool_num;
1: +  char **bool_pending_names;
1: +  unsigned int *bool_pending_values;
1: +  struct dentry *class_dir;
1: +  long unsigned int last_class_ino;
1: +  bool policy_opened;
1: +  struct dentry *policycap_dir;
1: +  long unsigned int last_ino;
1: +  struct selinux_state *state;
1: +  struct super_block *sb;
1:  };
1:  
1:  struct policy_load_memory {
1: -	size_t len;
1: -	void *data;
1: +  size_t len;
1: +  void *data;
1:  };
1:  
1:  enum {
1: -	SELNL_MSG_SETENFORCE = 16,
1: -	SELNL_MSG_POLICYLOAD = 17,
1: -	SELNL_MSG_MAX = 18,
1: +  SELNL_MSG_SETENFORCE = 16,
1: +  SELNL_MSG_POLICYLOAD = 17,
1: +  SELNL_MSG_MAX = 18,
1:  };
1:  
1:  enum selinux_nlgroups {
1: -	SELNLGRP_NONE = 0,
1: -	SELNLGRP_AVC = 1,
1: -	__SELNLGRP_MAX = 2,
1: +  SELNLGRP_NONE = 0,
1: +  SELNLGRP_AVC = 1,
1: +  __SELNLGRP_MAX = 2,
1:  };
1:  
1:  struct selnl_msg_setenforce {
1: -	__s32 val;
1: +  __s32 val;
1:  };
1:  
1:  struct selnl_msg_policyload {
1: -	__u32 seqno;
1: -};
1: -
1: -enum {
1: -	XFRM_MSG_BASE = 16,
1: -	XFRM_MSG_NEWSA = 16,
1: -	XFRM_MSG_DELSA = 17,
1: -	XFRM_MSG_GETSA = 18,
1: -	XFRM_MSG_NEWPOLICY = 19,
1: -	XFRM_MSG_DELPOLICY = 20,
1: -	XFRM_MSG_GETPOLICY = 21,
1: -	XFRM_MSG_ALLOCSPI = 22,
1: -	XFRM_MSG_ACQUIRE = 23,
1: -	XFRM_MSG_EXPIRE = 24,
1: -	XFRM_MSG_UPDPOLICY = 25,
1: -	XFRM_MSG_UPDSA = 26,
1: -	XFRM_MSG_POLEXPIRE = 27,
1: -	XFRM_MSG_FLUSHSA = 28,
1: -	XFRM_MSG_FLUSHPOLICY = 29,
1: -	XFRM_MSG_NEWAE = 30,
1: -	XFRM_MSG_GETAE = 31,
1: -	XFRM_MSG_REPORT = 32,
1: -	XFRM_MSG_MIGRATE = 33,
1: -	XFRM_MSG_NEWSADINFO = 34,
1: -	XFRM_MSG_GETSADINFO = 35,
1: -	XFRM_MSG_NEWSPDINFO = 36,
1: -	XFRM_MSG_GETSPDINFO = 37,
1: -	XFRM_MSG_MAPPING = 38,
1: -	__XFRM_MSG_MAX = 39,
1: -};
1: -
1: -enum {
1: -	RTM_BASE = 16,
1: -	RTM_NEWLINK = 16,
1: -	RTM_DELLINK = 17,
1: -	RTM_GETLINK = 18,
1: -	RTM_SETLINK = 19,
1: -	RTM_NEWADDR = 20,
1: -	RTM_DELADDR = 21,
1: -	RTM_GETADDR = 22,
1: -	RTM_NEWROUTE = 24,
1: -	RTM_DELROUTE = 25,
1: -	RTM_GETROUTE = 26,
1: -	RTM_NEWNEIGH = 28,
1: -	RTM_DELNEIGH = 29,
1: -	RTM_GETNEIGH = 30,
1: -	RTM_NEWRULE = 32,
1: -	RTM_DELRULE = 33,
1: -	RTM_GETRULE = 34,
1: -	RTM_NEWQDISC = 36,
1: -	RTM_DELQDISC = 37,
1: -	RTM_GETQDISC = 38,
1: -	RTM_NEWTCLASS = 40,
1: -	RTM_DELTCLASS = 41,
1: -	RTM_GETTCLASS = 42,
1: -	RTM_NEWTFILTER = 44,
1: -	RTM_DELTFILTER = 45,
1: -	RTM_GETTFILTER = 46,
1: -	RTM_NEWACTION = 48,
1: -	RTM_DELACTION = 49,
1: -	RTM_GETACTION = 50,
1: -	RTM_NEWPREFIX = 52,
1: -	RTM_GETMULTICAST = 58,
1: -	RTM_GETANYCAST = 62,
1: -	RTM_NEWNEIGHTBL = 64,
1: -	RTM_GETNEIGHTBL = 66,
1: -	RTM_SETNEIGHTBL = 67,
1: -	RTM_NEWNDUSEROPT = 68,
1: -	RTM_NEWADDRLABEL = 72,
1: -	RTM_DELADDRLABEL = 73,
1: -	RTM_GETADDRLABEL = 74,
1: -	RTM_GETDCB = 78,
1: -	RTM_SETDCB = 79,
1: -	RTM_NEWNETCONF = 80,
1: -	RTM_DELNETCONF = 81,
1: -	RTM_GETNETCONF = 82,
1: -	RTM_NEWMDB = 84,
1: -	RTM_DELMDB = 85,
1: -	RTM_GETMDB = 86,
1: -	RTM_NEWNSID = 88,
1: -	RTM_DELNSID = 89,
1: -	RTM_GETNSID = 90,
1: -	RTM_NEWSTATS = 92,
1: -	RTM_GETSTATS = 94,
1: -	RTM_NEWCACHEREPORT = 96,
1: -	RTM_NEWCHAIN = 100,
1: -	RTM_DELCHAIN = 101,
1: -	RTM_GETCHAIN = 102,
1: -	RTM_NEWNEXTHOP = 104,
1: -	RTM_DELNEXTHOP = 105,
1: -	RTM_GETNEXTHOP = 106,
1: -	RTM_NEWLINKPROP = 108,
1: -	RTM_DELLINKPROP = 109,
1: -	RTM_GETLINKPROP = 110,
1: -	RTM_NEWVLAN = 112,
1: -	RTM_DELVLAN = 113,
1: -	RTM_GETVLAN = 114,
1: -	__RTM_MAX = 115,
1: +  __u32 seqno;
1: +};
1: +
1: +enum {
1: +  XFRM_MSG_BASE = 16,
1: +  XFRM_MSG_NEWSA = 16,
1: +  XFRM_MSG_DELSA = 17,
1: +  XFRM_MSG_GETSA = 18,
1: +  XFRM_MSG_NEWPOLICY = 19,
1: +  XFRM_MSG_DELPOLICY = 20,
1: +  XFRM_MSG_GETPOLICY = 21,
1: +  XFRM_MSG_ALLOCSPI = 22,
1: +  XFRM_MSG_ACQUIRE = 23,
1: +  XFRM_MSG_EXPIRE = 24,
1: +  XFRM_MSG_UPDPOLICY = 25,
1: +  XFRM_MSG_UPDSA = 26,
1: +  XFRM_MSG_POLEXPIRE = 27,
1: +  XFRM_MSG_FLUSHSA = 28,
1: +  XFRM_MSG_FLUSHPOLICY = 29,
1: +  XFRM_MSG_NEWAE = 30,
1: +  XFRM_MSG_GETAE = 31,
1: +  XFRM_MSG_REPORT = 32,
1: +  XFRM_MSG_MIGRATE = 33,
1: +  XFRM_MSG_NEWSADINFO = 34,
1: +  XFRM_MSG_GETSADINFO = 35,
1: +  XFRM_MSG_NEWSPDINFO = 36,
1: +  XFRM_MSG_GETSPDINFO = 37,
1: +  XFRM_MSG_MAPPING = 38,
1: +  __XFRM_MSG_MAX = 39,
1: +};
1: +
1: +enum {
1: +  RTM_BASE = 16,
1: +  RTM_NEWLINK = 16,
1: +  RTM_DELLINK = 17,
1: +  RTM_GETLINK = 18,
1: +  RTM_SETLINK = 19,
1: +  RTM_NEWADDR = 20,
1: +  RTM_DELADDR = 21,
1: +  RTM_GETADDR = 22,
1: +  RTM_NEWROUTE = 24,
1: +  RTM_DELROUTE = 25,
1: +  RTM_GETROUTE = 26,
1: +  RTM_NEWNEIGH = 28,
1: +  RTM_DELNEIGH = 29,
1: +  RTM_GETNEIGH = 30,
1: +  RTM_NEWRULE = 32,
1: +  RTM_DELRULE = 33,
1: +  RTM_GETRULE = 34,
1: +  RTM_NEWQDISC = 36,
1: +  RTM_DELQDISC = 37,
1: +  RTM_GETQDISC = 38,
1: +  RTM_NEWTCLASS = 40,
1: +  RTM_DELTCLASS = 41,
1: +  RTM_GETTCLASS = 42,
1: +  RTM_NEWTFILTER = 44,
1: +  RTM_DELTFILTER = 45,
1: +  RTM_GETTFILTER = 46,
1: +  RTM_NEWACTION = 48,
1: +  RTM_DELACTION = 49,
1: +  RTM_GETACTION = 50,
1: +  RTM_NEWPREFIX = 52,
1: +  RTM_GETMULTICAST = 58,
1: +  RTM_GETANYCAST = 62,
1: +  RTM_NEWNEIGHTBL = 64,
1: +  RTM_GETNEIGHTBL = 66,
1: +  RTM_SETNEIGHTBL = 67,
1: +  RTM_NEWNDUSEROPT = 68,
1: +  RTM_NEWADDRLABEL = 72,
1: +  RTM_DELADDRLABEL = 73,
1: +  RTM_GETADDRLABEL = 74,
1: +  RTM_GETDCB = 78,
1: +  RTM_SETDCB = 79,
1: +  RTM_NEWNETCONF = 80,
1: +  RTM_DELNETCONF = 81,
1: +  RTM_GETNETCONF = 82,
1: +  RTM_NEWMDB = 84,
1: +  RTM_DELMDB = 85,
1: +  RTM_GETMDB = 86,
1: +  RTM_NEWNSID = 88,
1: +  RTM_DELNSID = 89,
1: +  RTM_GETNSID = 90,
1: +  RTM_NEWSTATS = 92,
1: +  RTM_GETSTATS = 94,
1: +  RTM_NEWCACHEREPORT = 96,
1: +  RTM_NEWCHAIN = 100,
1: +  RTM_DELCHAIN = 101,
1: +  RTM_GETCHAIN = 102,
1: +  RTM_NEWNEXTHOP = 104,
1: +  RTM_DELNEXTHOP = 105,
1: +  RTM_GETNEXTHOP = 106,
1: +  RTM_NEWLINKPROP = 108,
1: +  RTM_DELLINKPROP = 109,
1: +  RTM_GETLINKPROP = 110,
1: +  RTM_NEWVLAN = 112,
1: +  RTM_DELVLAN = 113,
1: +  RTM_GETVLAN = 114,
1: +  __RTM_MAX = 115,
1:  };
1:  
1:  struct nlmsg_perm {
1: -	u16 nlmsg_type;
1: -	u32 perm;
1: +  u16 nlmsg_type;
1: +  u32 perm;
1:  };
1:  
1:  struct netif_security_struct {
1: -	struct net *ns;
1: -	int ifindex;
1: -	u32 sid;
1: +  struct net *ns;
1: +  int ifindex;
1: +  u32 sid;
1:  };
1:  
1:  struct sel_netif {
1: -	struct list_head list;
1: -	struct netif_security_struct nsec;
1: -	struct callback_head callback_head;
1: +  struct list_head list;
1: +  struct netif_security_struct nsec;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct netnode_security_struct {
1: -	union {
1: -		__be32 ipv4;
1: -		struct in6_addr ipv6;
1: -	} addr;
1: -	u32 sid;
1: -	u16 family;
1: +  union {
1: +    __be32 ipv4;
1: +    struct in6_addr ipv6;
1: +  } addr;
1: +  u32 sid;
1: +  u16 family;
1:  };
1:  
1:  struct sel_netnode_bkt {
1: -	unsigned int size;
1: -	struct list_head list;
1: +  unsigned int size;
1: +  struct list_head list;
1:  };
1:  
1:  struct sel_netnode {
1: -	struct netnode_security_struct nsec;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  struct netnode_security_struct nsec;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netport_security_struct {
1: -	u32 sid;
1: -	u16 port;
1: -	u8 protocol;
1: +  u32 sid;
1: +  u16 port;
1: +  u8 protocol;
1:  };
1:  
1:  struct sel_netport_bkt {
1: -	int size;
1: -	struct list_head list;
1: +  int size;
1: +  struct list_head list;
1:  };
1:  
1:  struct sel_netport {
1: -	struct netport_security_struct psec;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  struct netport_security_struct psec;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct selinux_kernel_status {
1: -	u32 version;
1: -	u32 sequence;
1: -	u32 enforcing;
1: -	u32 policyload;
1: -	u32 deny_unknown;
1: +  u32 version;
1: +  u32 sequence;
1: +  u32 enforcing;
1: +  u32 policyload;
1: +  u32 deny_unknown;
1:  };
1:  
1:  struct ebitmap_node {
1: -	struct ebitmap_node *next;
1: -	long unsigned int maps[6];
1: -	u32 startbit;
1: +  struct ebitmap_node *next;
1: +  long unsigned int maps[6];
1: +  u32 startbit;
1:  };
1:  
1:  struct ebitmap {
1: -	struct ebitmap_node *node;
1: -	u32 highbit;
1: +  struct ebitmap_node *node;
1: +  u32 highbit;
1:  };
1:  
1:  struct policy_file {
1: -	char *data;
1: -	size_t len;
1: +  char *data;
1: +  size_t len;
1:  };
1:  
1:  struct hashtab_node {
1: -	void *key;
1: -	void *datum;
1: -	struct hashtab_node *next;
1: +  void *key;
1: +  void *datum;
1: +  struct hashtab_node *next;
1:  };
1:  
1:  struct hashtab {
1: -	struct hashtab_node **htable;
1: -	u32 size;
1: -	u32 nel;
1: +  struct hashtab_node **htable;
1: +  u32 size;
1: +  u32 nel;
1:  };
1:  
1:  struct hashtab_info {
1: -	u32 slots_used;
1: -	u32 max_chain_len;
1: +  u32 slots_used;
1: +  u32 max_chain_len;
1:  };
1:  
1:  struct hashtab_key_params {
1: -	u32 (*hash)(const void *);
1: -	int (*cmp)(const void *, const void *);
1: +  u32 (*hash)(const void *);
1: +  int (*cmp)(const void *, const void *);
1:  };
1:  
1:  struct symtab {
1: -	struct hashtab table;
1: -	u32 nprim;
1: +  struct hashtab table;
1: +  u32 nprim;
1:  };
1:  
1:  struct mls_level {
1: -	u32 sens;
1: -	struct ebitmap cat;
1: +  u32 sens;
1: +  struct ebitmap cat;
1:  };
1:  
1:  struct mls_range {
1: -	struct mls_level level[2];
1: +  struct mls_level level[2];
1:  };
1:  
1:  struct context___2 {
1: -	u32 user;
1: -	u32 role;
1: -	u32 type;
1: -	u32 len;
1: -	struct mls_range range;
1: -	char *str;
1: +  u32 user;
1: +  u32 role;
1: +  u32 type;
1: +  u32 len;
1: +  struct mls_range range;
1: +  char *str;
1:  };
1:  
1:  struct sidtab_str_cache;
1:  
1:  struct sidtab_entry {
1: -	u32 sid;
1: -	u32 hash;
1: -	struct context___2 context;
1: -	struct sidtab_str_cache *cache;
1: -	struct hlist_node list;
1: +  u32 sid;
1: +  u32 hash;
1: +  struct context___2 context;
1: +  struct sidtab_str_cache *cache;
1: +  struct hlist_node list;
1:  };
1:  
1:  struct sidtab_str_cache {
1: -	struct callback_head rcu_member;
1: -	struct list_head lru_member;
1: -	struct sidtab_entry *parent;
1: -	u32 len;
1: -	char str[0];
1: +  struct callback_head rcu_member;
1: +  struct list_head lru_member;
1: +  struct sidtab_entry *parent;
1: +  u32 len;
1: +  char str[0];
1:  };
1:  
1:  struct sidtab_node_inner;
1: @@ -60137,671 +61062,672 @@ struct sidtab_node_inner;
1:  struct sidtab_node_leaf;
1:  
1:  union sidtab_entry_inner {
1: -	struct sidtab_node_inner *ptr_inner;
1: -	struct sidtab_node_leaf *ptr_leaf;
1: +  struct sidtab_node_inner *ptr_inner;
1: +  struct sidtab_node_leaf *ptr_leaf;
1:  };
1:  
1:  struct sidtab_node_inner {
1: -	union sidtab_entry_inner entries[512];
1: +  union sidtab_entry_inner entries[512];
1:  };
1:  
1:  struct sidtab_node_leaf {
1: -	struct sidtab_entry entries[39];
1: +  struct sidtab_entry entries[39];
1:  };
1:  
1:  struct sidtab_isid_entry {
1: -	int set;
1: -	struct sidtab_entry entry;
1: +  int set;
1: +  struct sidtab_entry entry;
1:  };
1:  
1:  struct sidtab;
1:  
1:  struct sidtab_convert_params {
1: -	int (*func)(struct context___2 *, struct context___2 *, void *);
1: -	void *args;
1: -	struct sidtab *target;
1: +  int (*func)(struct context___2 *, struct context___2 *, void *);
1: +  void *args;
1: +  struct sidtab *target;
1:  };
1:  
1:  struct sidtab {
1: -	union sidtab_entry_inner roots[4];
1: -	u32 count;
1: -	struct sidtab_convert_params *convert;
1: -	spinlock_t lock;
1: -	u32 cache_free_slots;
1: -	struct list_head cache_lru_list;
1: -	spinlock_t cache_lock;
1: -	struct sidtab_isid_entry isids[27];
1: -	struct hlist_head context_to_sid[512];
1: +  union sidtab_entry_inner roots[4];
1: +  u32 count;
1: +  struct sidtab_convert_params *convert;
1: +  spinlock_t lock;
1: +  u32 cache_free_slots;
1: +  struct list_head cache_lru_list;
1: +  spinlock_t cache_lock;
1: +  struct sidtab_isid_entry isids[27];
1: +  struct hlist_head context_to_sid[512];
1:  };
1:  
1:  struct avtab_key {
1: -	u16 source_type;
1: -	u16 target_type;
1: -	u16 target_class;
1: -	u16 specified;
1: +  u16 source_type;
1: +  u16 target_type;
1: +  u16 target_class;
1: +  u16 specified;
1:  };
1:  
1:  struct avtab_extended_perms {
1: -	u8 specified;
1: -	u8 driver;
1: -	struct extended_perms_data perms;
1: +  u8 specified;
1: +  u8 driver;
1: +  struct extended_perms_data perms;
1:  };
1:  
1:  struct avtab_datum {
1: -	union {
1: -		u32 data;
1: -		struct avtab_extended_perms *xperms;
1: -	} u;
1: +  union {
1: +    u32 data;
1: +    struct avtab_extended_perms *xperms;
1: +  } u;
1:  };
1:  
1:  struct avtab_node {
1: -	struct avtab_key key;
1: -	struct avtab_datum datum;
1: -	struct avtab_node *next;
1: +  struct avtab_key key;
1: +  struct avtab_datum datum;
1: +  struct avtab_node *next;
1:  };
1:  
1:  struct avtab {
1: -	struct avtab_node **htable;
1: -	u32 nel;
1: -	u32 nslot;
1: -	u32 mask;
1: +  struct avtab_node **htable;
1: +  u32 nel;
1: +  u32 nslot;
1: +  u32 mask;
1:  };
1:  
1:  struct type_set;
1:  
1:  struct constraint_expr {
1: -	u32 expr_type;
1: -	u32 attr;
1: -	u32 op;
1: -	struct ebitmap names;
1: -	struct type_set *type_names;
1: -	struct constraint_expr *next;
1: +  u32 expr_type;
1: +  u32 attr;
1: +  u32 op;
1: +  struct ebitmap names;
1: +  struct type_set *type_names;
1: +  struct constraint_expr *next;
1:  };
1:  
1:  struct type_set {
1: -	struct ebitmap types;
1: -	struct ebitmap negset;
1: -	u32 flags;
1: +  struct ebitmap types;
1: +  struct ebitmap negset;
1: +  u32 flags;
1:  };
1:  
1:  struct constraint_node {
1: -	u32 permissions;
1: -	struct constraint_expr *expr;
1: -	struct constraint_node *next;
1: +  u32 permissions;
1: +  struct constraint_expr *expr;
1: +  struct constraint_node *next;
1:  };
1:  
1:  struct common_datum {
1: -	u32 value;
1: -	struct symtab permissions;
1: +  u32 value;
1: +  struct symtab permissions;
1:  };
1:  
1:  struct class_datum {
1: -	u32 value;
1: -	char *comkey;
1: -	struct common_datum *comdatum;
1: -	struct symtab permissions;
1: -	struct constraint_node *constraints;
1: -	struct constraint_node *validatetrans;
1: -	char default_user;
1: -	char default_role;
1: -	char default_type;
1: -	char default_range;
1: +  u32 value;
1: +  char *comkey;
1: +  struct common_datum *comdatum;
1: +  struct symtab permissions;
1: +  struct constraint_node *constraints;
1: +  struct constraint_node *validatetrans;
1: +  char default_user;
1: +  char default_role;
1: +  char default_type;
1: +  char default_range;
1:  };
1:  
1:  struct role_datum {
1: -	u32 value;
1: -	u32 bounds;
1: -	struct ebitmap dominates;
1: -	struct ebitmap types;
1: +  u32 value;
1: +  u32 bounds;
1: +  struct ebitmap dominates;
1: +  struct ebitmap types;
1:  };
1:  
1:  struct role_allow {
1: -	u32 role;
1: -	u32 new_role;
1: -	struct role_allow *next;
1: +  u32 role;
1: +  u32 new_role;
1: +  struct role_allow *next;
1:  };
1:  
1:  struct type_datum {
1: -	u32 value;
1: -	u32 bounds;
1: -	unsigned char primary;
1: -	unsigned char attribute;
1: +  u32 value;
1: +  u32 bounds;
1: +  unsigned char primary;
1: +  unsigned char attribute;
1:  };
1:  
1:  struct user_datum {
1: -	u32 value;
1: -	u32 bounds;
1: -	struct ebitmap roles;
1: -	struct mls_range range;
1: -	struct mls_level dfltlevel;
1: +  u32 value;
1: +  u32 bounds;
1: +  struct ebitmap roles;
1: +  struct mls_range range;
1: +  struct mls_level dfltlevel;
1:  };
1:  
1:  struct cond_bool_datum {
1: -	__u32 value;
1: -	int state;
1: +  __u32 value;
1: +  int state;
1:  };
1:  
1:  struct ocontext {
1: -	union {
1: -		char *name;
1: -		struct {
1: -			u8 protocol;
1: -			u16 low_port;
1: -			u16 high_port;
1: -		} port;
1: -		struct {
1: -			u32 addr;
1: -			u32 mask;
1: -		} node;
1: -		struct {
1: -			u32 addr[4];
1: -			u32 mask[4];
1: -		} node6;
1: -		struct {
1: -			u64 subnet_prefix;
1: -			u16 low_pkey;
1: -			u16 high_pkey;
1: -		} ibpkey;
1: -		struct {
1: -			char *dev_name;
1: -			u8 port;
1: -		} ibendport;
1: -	} u;
1: -	union {
1: -		u32 sclass;
1: -		u32 behavior;
1: -	} v;
1: -	struct context___2 context[2];
1: -	u32 sid[2];
1: -	struct ocontext *next;
1: +  union {
1: +    char *name;
1: +    struct {
1: +      u8 protocol;
1: +      u16 low_port;
1: +      u16 high_port;
1: +    } port;
1: +    struct {
1: +      u32 addr;
1: +      u32 mask;
1: +    } node;
1: +    struct {
1: +      u32 addr[4];
1: +      u32 mask[4];
1: +    } node6;
1: +    struct {
1: +      u64 subnet_prefix;
1: +      u16 low_pkey;
1: +      u16 high_pkey;
1: +    } ibpkey;
1: +    struct {
1: +      char *dev_name;
1: +      u8 port;
1: +    } ibendport;
1: +  } u;
1: +  union {
1: +    u32 sclass;
1: +    u32 behavior;
1: +  } v;
1: +  struct context___2 context[2];
1: +  u32 sid[2];
1: +  struct ocontext *next;
1:  };
1:  
1:  struct genfs {
1: -	char *fstype;
1: -	struct ocontext *head;
1: -	struct genfs *next;
1: +  char *fstype;
1: +  struct ocontext *head;
1: +  struct genfs *next;
1:  };
1:  
1:  struct cond_node;
1:  
1:  struct policydb {
1: -	int mls_enabled;
1: -	struct symtab symtab[8];
1: -	char **sym_val_to_name[8];
1: -	struct class_datum **class_val_to_struct;
1: -	struct role_datum **role_val_to_struct;
1: -	struct user_datum **user_val_to_struct;
1: -	struct type_datum **type_val_to_struct;
1: -	struct avtab te_avtab;
1: -	struct hashtab role_tr;
1: -	struct ebitmap filename_trans_ttypes;
1: -	struct hashtab filename_trans;
1: -	u32 compat_filename_trans_count;
1: -	struct cond_bool_datum **bool_val_to_struct;
1: -	struct avtab te_cond_avtab;
1: -	struct cond_node *cond_list;
1: -	u32 cond_list_len;
1: -	struct role_allow *role_allow;
1: -	struct ocontext *ocontexts[9];
1: -	struct genfs *genfs;
1: -	struct hashtab range_tr;
1: -	struct ebitmap *type_attr_map_array;
1: -	struct ebitmap policycaps;
1: -	struct ebitmap permissive_map;
1: -	size_t len;
1: -	unsigned int policyvers;
1: -	unsigned int reject_unknown: 1;
1: -	unsigned int allow_unknown: 1;
1: -	u16 process_class;
1: -	u32 process_trans_perms;
1: +  int mls_enabled;
1: +  struct symtab symtab[8];
1: +  char **sym_val_to_name[8];
1: +  struct class_datum **class_val_to_struct;
1: +  struct role_datum **role_val_to_struct;
1: +  struct user_datum **user_val_to_struct;
1: +  struct type_datum **type_val_to_struct;
1: +  struct avtab te_avtab;
1: +  struct hashtab role_tr;
1: +  struct ebitmap filename_trans_ttypes;
1: +  struct hashtab filename_trans;
1: +  u32 compat_filename_trans_count;
1: +  struct cond_bool_datum **bool_val_to_struct;
1: +  struct avtab te_cond_avtab;
1: +  struct cond_node *cond_list;
1: +  u32 cond_list_len;
1: +  struct role_allow *role_allow;
1: +  struct ocontext *ocontexts[9];
1: +  struct genfs *genfs;
1: +  struct hashtab range_tr;
1: +  struct ebitmap *type_attr_map_array;
1: +  struct ebitmap policycaps;
1: +  struct ebitmap permissive_map;
1: +  size_t len;
1: +  unsigned int policyvers;
1: +  unsigned int reject_unknown : 1;
1: +  unsigned int allow_unknown : 1;
1: +  u16 process_class;
1: +  u32 process_trans_perms;
1:  };
1:  
1:  struct perm_datum {
1: -	u32 value;
1: +  u32 value;
1:  };
1:  
1:  struct role_trans_key {
1: -	u32 role;
1: -	u32 type;
1: -	u32 tclass;
1: +  u32 role;
1: +  u32 type;
1: +  u32 tclass;
1:  };
1:  
1:  struct role_trans_datum {
1: -	u32 new_role;
1: +  u32 new_role;
1:  };
1:  
1:  struct filename_trans_key {
1: -	u32 ttype;
1: -	u16 tclass;
1: -	const char *name;
1: +  u32 ttype;
1: +  u16 tclass;
1: +  const char *name;
1:  };
1:  
1:  struct filename_trans_datum {
1: -	struct ebitmap stypes;
1: -	u32 otype;
1: -	struct filename_trans_datum *next;
1: +  struct ebitmap stypes;
1: +  u32 otype;
1: +  struct filename_trans_datum *next;
1:  };
1:  
1:  struct level_datum {
1: -	struct mls_level *level;
1: -	unsigned char isalias;
1: +  struct mls_level *level;
1: +  unsigned char isalias;
1:  };
1:  
1:  struct cat_datum {
1: -	u32 value;
1: -	unsigned char isalias;
1: +  u32 value;
1: +  unsigned char isalias;
1:  };
1:  
1:  struct range_trans {
1: -	u32 source_type;
1: -	u32 target_type;
1: -	u32 target_class;
1: +  u32 source_type;
1: +  u32 target_type;
1: +  u32 target_class;
1:  };
1:  
1:  struct cond_expr_node;
1:  
1:  struct cond_expr {
1: -	struct cond_expr_node *nodes;
1: -	u32 len;
1: +  struct cond_expr_node *nodes;
1: +  u32 len;
1:  };
1:  
1:  struct cond_av_list {
1: -	struct avtab_node **nodes;
1: -	u32 len;
1: +  struct avtab_node **nodes;
1: +  u32 len;
1:  };
1:  
1:  struct cond_node {
1: -	int cur_state;
1: -	struct cond_expr expr;
1: -	struct cond_av_list true_list;
1: -	struct cond_av_list false_list;
1: +  int cur_state;
1: +  struct cond_expr expr;
1: +  struct cond_av_list true_list;
1: +  struct cond_av_list false_list;
1:  };
1:  
1:  struct policy_data {
1: -	struct policydb *p;
1: -	void *fp;
1: +  struct policydb *p;
1: +  void *fp;
1:  };
1:  
1:  struct cond_expr_node {
1: -	u32 expr_type;
1: -	u32 bool;
1: +  u32 expr_type;
1: +  u32 bool;
1:  };
1:  
1:  struct policydb_compat_info {
1: -	int version;
1: -	int sym_num;
1: -	int ocon_num;
1: +  int version;
1: +  int sym_num;
1: +  int ocon_num;
1:  };
1:  
1:  struct selinux_mapping;
1:  
1:  struct selinux_map {
1: -	struct selinux_mapping *mapping;
1: -	u16 size;
1: +  struct selinux_mapping *mapping;
1: +  u16 size;
1:  };
1:  
1:  struct selinux_policy {
1: -	struct sidtab *sidtab;
1: -	struct policydb policydb;
1: -	struct selinux_map map;
1: -	u32 latest_granting;
1: +  struct sidtab *sidtab;
1: +  struct policydb policydb;
1: +  struct selinux_map map;
1: +  u32 latest_granting;
1:  };
1:  
1:  struct selinux_mapping {
1: -	u16 value;
1: -	unsigned int num_perms;
1: -	u32 perms[32];
1: +  u16 value;
1: +  unsigned int num_perms;
1: +  u32 perms[32];
1:  };
1:  
1:  struct convert_context_args {
1: -	struct selinux_state *state;
1: -	struct policydb *oldp;
1: -	struct policydb *newp;
1: +  struct selinux_state *state;
1: +  struct policydb *oldp;
1: +  struct policydb *newp;
1:  };
1:  
1:  struct selinux_audit_rule {
1: -	u32 au_seqno;
1: -	struct context___2 au_ctxt;
1: +  u32 au_seqno;
1: +  struct context___2 au_ctxt;
1:  };
1:  
1:  struct cond_insertf_data {
1: -	struct policydb *p;
1: -	struct avtab_node **dst;
1: -	struct cond_av_list *other;
1: +  struct policydb *p;
1: +  struct avtab_node **dst;
1: +  struct cond_av_list *other;
1:  };
1:  
1:  struct sockaddr_un {
1: -	__kernel_sa_family_t sun_family;
1: -	char sun_path[108];
1: +  __kernel_sa_family_t sun_family;
1: +  char sun_path[108];
1:  };
1:  
1:  struct unix_address {
1: -	refcount_t refcnt;
1: -	int len;
1: -	unsigned int hash;
1: -	struct sockaddr_un name[0];
1: +  refcount_t refcnt;
1: +  int len;
1: +  unsigned int hash;
1: +  struct sockaddr_un name[0];
1:  };
1:  
1:  struct scm_stat {
1: -	atomic_t nr_fds;
1: +  atomic_t nr_fds;
1:  };
1:  
1:  struct unix_sock {
1: -	struct sock sk;
1: -	struct unix_address *addr;
1: -	struct path path;
1: -	struct mutex iolock;
1: -	struct mutex bindlock;
1: -	struct sock *peer;
1: -	struct list_head link;
1: -	atomic_long_t inflight;
1: -	spinlock_t lock;
1: -	long unsigned int gc_flags;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct socket_wq peer_wq;
1: -	wait_queue_entry_t peer_wake;
1: -	struct scm_stat scm_stat;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: +  struct sock sk;
1: +  struct unix_address *addr;
1: +  struct path path;
1: +  struct mutex iolock;
1: +  struct mutex bindlock;
1: +  struct sock *peer;
1: +  struct list_head link;
1: +  atomic_long_t inflight;
1: +  spinlock_t lock;
1: +  long unsigned int gc_flags;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct socket_wq peer_wq;
1: +  wait_queue_entry_t peer_wake;
1: +  struct scm_stat scm_stat;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum devcg_behavior {
1: -	DEVCG_DEFAULT_NONE = 0,
1: -	DEVCG_DEFAULT_ALLOW = 1,
1: -	DEVCG_DEFAULT_DENY = 2,
1: +  DEVCG_DEFAULT_NONE = 0,
1: +  DEVCG_DEFAULT_ALLOW = 1,
1: +  DEVCG_DEFAULT_DENY = 2,
1:  };
1:  
1:  struct dev_exception_item {
1: -	u32 major;
1: -	u32 minor;
1: -	short int type;
1: -	short int access;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  u32 major;
1: +  u32 minor;
1: +  short int type;
1: +  short int access;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct dev_cgroup {
1: -	struct cgroup_subsys_state css;
1: -	struct list_head exceptions;
1: -	enum devcg_behavior behavior;
1: +  struct cgroup_subsys_state css;
1: +  struct list_head exceptions;
1: +  enum devcg_behavior behavior;
1:  };
1:  
1:  enum integrity_status {
1: -	INTEGRITY_PASS = 0,
1: -	INTEGRITY_PASS_IMMUTABLE = 1,
1: -	INTEGRITY_FAIL = 2,
1: -	INTEGRITY_NOLABEL = 3,
1: -	INTEGRITY_NOXATTRS = 4,
1: -	INTEGRITY_UNKNOWN = 5,
1: +  INTEGRITY_PASS = 0,
1: +  INTEGRITY_PASS_IMMUTABLE = 1,
1: +  INTEGRITY_FAIL = 2,
1: +  INTEGRITY_NOLABEL = 3,
1: +  INTEGRITY_NOXATTRS = 4,
1: +  INTEGRITY_UNKNOWN = 5,
1:  };
1:  
1:  struct ima_digest_data {
1: -	u8 algo;
1: -	u8 length;
1: -	union {
1: -		struct {
1: -			u8 unused;
1: -			u8 type;
1: -		} sha1;
1: -		struct {
1: -			u8 type;
1: -			u8 algo;
1: -		} ng;
1: -		u8 data[2];
1: -	} xattr;
1: -	u8 digest[0];
1: +  u8 algo;
1: +  u8 length;
1: +  union {
1: +    struct {
1: +      u8 unused;
1: +      u8 type;
1: +    } sha1;
1: +    struct {
1: +      u8 type;
1: +      u8 algo;
1: +    } ng;
1: +    u8 data[2];
1: +  } xattr;
1: +  u8 digest[0];
1:  };
1:  
1:  struct integrity_iint_cache {
1: -	struct rb_node rb_node;
1: -	struct mutex mutex;
1: -	struct inode *inode;
1: -	u64 version;
1: -	long unsigned int flags;
1: -	long unsigned int measured_pcrs;
1: -	long unsigned int atomic_flags;
1: -	enum integrity_status ima_file_status: 4;
1: -	enum integrity_status ima_mmap_status: 4;
1: -	enum integrity_status ima_bprm_status: 4;
1: -	enum integrity_status ima_read_status: 4;
1: -	enum integrity_status ima_creds_status: 4;
1: -	enum integrity_status evm_status: 4;
1: -	struct ima_digest_data *ima_hash;
1: +  struct rb_node rb_node;
1: +  struct mutex mutex;
1: +  struct inode *inode;
1: +  u64 version;
1: +  long unsigned int flags;
1: +  long unsigned int measured_pcrs;
1: +  long unsigned int atomic_flags;
1: +  enum integrity_status ima_file_status : 4;
1: +  enum integrity_status ima_mmap_status : 4;
1: +  enum integrity_status ima_bprm_status : 4;
1: +  enum integrity_status ima_read_status : 4;
1: +  enum integrity_status ima_creds_status : 4;
1: +  enum integrity_status evm_status : 4;
1: +  struct ima_digest_data *ima_hash;
1:  };
1:  
1:  struct tpm_digest {
1: -	u16 alg_id;
1: -	u8 digest[64];
1: +  u16 alg_id;
1: +  u8 digest[64];
1:  };
1:  
1:  struct evm_ima_xattr_data {
1: -	u8 type;
1: -	u8 data[0];
1: +  u8 type;
1: +  u8 data[0];
1:  };
1:  
1:  enum ima_show_type {
1: -	IMA_SHOW_BINARY = 0,
1: -	IMA_SHOW_BINARY_NO_FIELD_LEN = 1,
1: -	IMA_SHOW_BINARY_OLD_STRING_FMT = 2,
1: -	IMA_SHOW_ASCII = 3,
1: +  IMA_SHOW_BINARY = 0,
1: +  IMA_SHOW_BINARY_NO_FIELD_LEN = 1,
1: +  IMA_SHOW_BINARY_OLD_STRING_FMT = 2,
1: +  IMA_SHOW_ASCII = 3,
1:  };
1:  
1:  struct modsig;
1:  
1:  struct ima_event_data {
1: -	struct integrity_iint_cache *iint;
1: -	struct file *file;
1: -	const unsigned char *filename;
1: -	struct evm_ima_xattr_data *xattr_value;
1: -	int xattr_len;
1: -	const struct modsig *modsig;
1: -	const char *violation;
1: -	const void *buf;
1: -	int buf_len;
1: +  struct integrity_iint_cache *iint;
1: +  struct file *file;
1: +  const unsigned char *filename;
1: +  struct evm_ima_xattr_data *xattr_value;
1: +  int xattr_len;
1: +  const struct modsig *modsig;
1: +  const char *violation;
1: +  const void *buf;
1: +  int buf_len;
1:  };
1:  
1:  struct ima_field_data {
1: -	u8 *data;
1: -	u32 len;
1: +  u8 *data;
1: +  u32 len;
1:  };
1:  
1:  struct ima_template_field {
1: -	const char field_id[16];
1: -	int (*field_init)(struct ima_event_data *, struct ima_field_data *);
1: -	void (*field_show)(struct seq_file *, enum ima_show_type, struct ima_field_data *);
1: +  const char field_id[16];
1: +  int (*field_init)(struct ima_event_data *, struct ima_field_data *);
1: +  void (*field_show)(struct seq_file *, enum ima_show_type,
1: +                     struct ima_field_data *);
1:  };
1:  
1:  struct ima_template_desc {
1: -	struct list_head list;
1: -	char *name;
1: -	char *fmt;
1: -	int num_fields;
1: -	const struct ima_template_field **fields;
1: +  struct list_head list;
1: +  char *name;
1: +  char *fmt;
1: +  int num_fields;
1: +  const struct ima_template_field **fields;
1:  };
1:  
1:  struct ima_template_entry {
1: -	int pcr;
1: -	struct tpm_digest *digests;
1: -	struct ima_template_desc *template_desc;
1: -	u32 template_data_len;
1: -	struct ima_field_data template_data[0];
1: +  int pcr;
1: +  struct tpm_digest *digests;
1: +  struct ima_template_desc *template_desc;
1: +  u32 template_data_len;
1: +  struct ima_field_data template_data[0];
1:  };
1:  
1:  struct ima_queue_entry {
1: -	struct hlist_node hnext;
1: -	struct list_head later;
1: -	struct ima_template_entry *entry;
1: +  struct hlist_node hnext;
1: +  struct list_head later;
1: +  struct ima_template_entry *entry;
1:  };
1:  
1:  struct ima_h_table {
1: -	atomic_long_t len;
1: -	atomic_long_t violations;
1: -	struct hlist_head queue[1024];
1: +  atomic_long_t len;
1: +  atomic_long_t violations;
1: +  struct hlist_head queue[1024];
1:  };
1:  
1:  enum ima_fs_flags {
1: -	IMA_FS_BUSY = 0,
1: +  IMA_FS_BUSY = 0,
1:  };
1:  
1:  struct hwrng {
1: -	const char *name;
1: -	int (*init)(struct hwrng *);
1: -	void (*cleanup)(struct hwrng *);
1: -	int (*data_present)(struct hwrng *, int);
1: -	int (*data_read)(struct hwrng *, u32 *);
1: -	int (*read)(struct hwrng *, void *, size_t, bool);
1: -	long unsigned int priv;
1: -	short unsigned int quality;
1: -	struct list_head list;
1: -	struct kref ref;
1: -	struct completion cleanup_done;
1: +  const char *name;
1: +  int (*init)(struct hwrng *);
1: +  void (*cleanup)(struct hwrng *);
1: +  int (*data_present)(struct hwrng *, int);
1: +  int (*data_read)(struct hwrng *, u32 *);
1: +  int (*read)(struct hwrng *, void *, size_t, bool);
1: +  long unsigned int priv;
1: +  short unsigned int quality;
1: +  struct list_head list;
1: +  struct kref ref;
1: +  struct completion cleanup_done;
1:  };
1:  
1:  enum hash_algo {
1: -	HASH_ALGO_MD4 = 0,
1: -	HASH_ALGO_MD5 = 1,
1: -	HASH_ALGO_SHA1 = 2,
1: -	HASH_ALGO_RIPE_MD_160 = 3,
1: -	HASH_ALGO_SHA256 = 4,
1: -	HASH_ALGO_SHA384 = 5,
1: -	HASH_ALGO_SHA512 = 6,
1: -	HASH_ALGO_SHA224 = 7,
1: -	HASH_ALGO_RIPE_MD_128 = 8,
1: -	HASH_ALGO_RIPE_MD_256 = 9,
1: -	HASH_ALGO_RIPE_MD_320 = 10,
1: -	HASH_ALGO_WP_256 = 11,
1: -	HASH_ALGO_WP_384 = 12,
1: -	HASH_ALGO_WP_512 = 13,
1: -	HASH_ALGO_TGR_128 = 14,
1: -	HASH_ALGO_TGR_160 = 15,
1: -	HASH_ALGO_TGR_192 = 16,
1: -	HASH_ALGO_SM3_256 = 17,
1: -	HASH_ALGO_STREEBOG_256 = 18,
1: -	HASH_ALGO_STREEBOG_512 = 19,
1: -	HASH_ALGO__LAST = 20,
1: +  HASH_ALGO_MD4 = 0,
1: +  HASH_ALGO_MD5 = 1,
1: +  HASH_ALGO_SHA1 = 2,
1: +  HASH_ALGO_RIPE_MD_160 = 3,
1: +  HASH_ALGO_SHA256 = 4,
1: +  HASH_ALGO_SHA384 = 5,
1: +  HASH_ALGO_SHA512 = 6,
1: +  HASH_ALGO_SHA224 = 7,
1: +  HASH_ALGO_RIPE_MD_128 = 8,
1: +  HASH_ALGO_RIPE_MD_256 = 9,
1: +  HASH_ALGO_RIPE_MD_320 = 10,
1: +  HASH_ALGO_WP_256 = 11,
1: +  HASH_ALGO_WP_384 = 12,
1: +  HASH_ALGO_WP_512 = 13,
1: +  HASH_ALGO_TGR_128 = 14,
1: +  HASH_ALGO_TGR_160 = 15,
1: +  HASH_ALGO_TGR_192 = 16,
1: +  HASH_ALGO_SM3_256 = 17,
1: +  HASH_ALGO_STREEBOG_256 = 18,
1: +  HASH_ALGO_STREEBOG_512 = 19,
1: +  HASH_ALGO__LAST = 20,
1:  };
1:  
1:  struct tpm_bank_info {
1: -	u16 alg_id;
1: -	u16 digest_size;
1: -	u16 crypto_id;
1: +  u16 alg_id;
1: +  u16 digest_size;
1: +  u16 crypto_id;
1:  };
1:  
1:  struct tpm_chip;
1:  
1:  struct tpm_class_ops {
1: -	unsigned int flags;
1: -	const u8 req_complete_mask;
1: -	const u8 req_complete_val;
1: -	bool (*req_canceled)(struct tpm_chip *, u8);
1: -	int (*recv)(struct tpm_chip *, u8 *, size_t);
1: -	int (*send)(struct tpm_chip *, u8 *, size_t);
1: -	void (*cancel)(struct tpm_chip *);
1: -	u8 (*status)(struct tpm_chip *);
1: -	void (*update_timeouts)(struct tpm_chip *, long unsigned int *);
1: -	void (*update_durations)(struct tpm_chip *, long unsigned int *);
1: -	int (*go_idle)(struct tpm_chip *);
1: -	int (*cmd_ready)(struct tpm_chip *);
1: -	int (*request_locality)(struct tpm_chip *, int);
1: -	int (*relinquish_locality)(struct tpm_chip *, int);
1: -	void (*clk_enable)(struct tpm_chip *, bool);
1: +  unsigned int flags;
1: +  const u8 req_complete_mask;
1: +  const u8 req_complete_val;
1: +  bool (*req_canceled)(struct tpm_chip *, u8);
1: +  int (*recv)(struct tpm_chip *, u8 *, size_t);
1: +  int (*send)(struct tpm_chip *, u8 *, size_t);
1: +  void (*cancel)(struct tpm_chip *);
1: +  u8 (*status)(struct tpm_chip *);
1: +  void (*update_timeouts)(struct tpm_chip *, long unsigned int *);
1: +  void (*update_durations)(struct tpm_chip *, long unsigned int *);
1: +  int (*go_idle)(struct tpm_chip *);
1: +  int (*cmd_ready)(struct tpm_chip *);
1: +  int (*request_locality)(struct tpm_chip *, int);
1: +  int (*relinquish_locality)(struct tpm_chip *, int);
1: +  void (*clk_enable)(struct tpm_chip *, bool);
1:  };
1:  
1:  struct tpm_bios_log {
1: -	void *bios_event_log;
1: -	void *bios_event_log_end;
1: +  void *bios_event_log;
1: +  void *bios_event_log_end;
1:  };
1:  
1:  struct tpm_chip_seqops {
1: -	struct tpm_chip *chip;
1: -	const struct seq_operations *seqops;
1: +  struct tpm_chip *chip;
1: +  const struct seq_operations *seqops;
1:  };
1:  
1:  struct tpm_space {
1: -	u32 context_tbl[3];
1: -	u8 *context_buf;
1: -	u32 session_tbl[3];
1: -	u8 *session_buf;
1: -	u32 buf_size;
1: +  u32 context_tbl[3];
1: +  u8 *context_buf;
1: +  u32 session_tbl[3];
1: +  u8 *session_buf;
1: +  u32 buf_size;
1:  };
1:  
1:  struct tpm_chip {
1: -	struct device dev;
1: -	struct device devs;
1: -	struct cdev cdev;
1: -	struct cdev cdevs;
1: -	struct rw_semaphore ops_sem;
1: -	const struct tpm_class_ops *ops;
1: -	struct tpm_bios_log log;
1: -	struct tpm_chip_seqops bin_log_seqops;
1: -	struct tpm_chip_seqops ascii_log_seqops;
1: -	unsigned int flags;
1: -	int dev_num;
1: -	long unsigned int is_open;
1: -	char hwrng_name[64];
1: -	struct hwrng hwrng;
1: -	struct mutex tpm_mutex;
1: -	long unsigned int timeout_a;
1: -	long unsigned int timeout_b;
1: -	long unsigned int timeout_c;
1: -	long unsigned int timeout_d;
1: -	bool timeout_adjusted;
1: -	long unsigned int duration[4];
1: -	bool duration_adjusted;
1: -	struct dentry *bios_dir[3];
1: -	const struct attribute_group *groups[3];
1: -	unsigned int groups_cnt;
1: -	u32 nr_allocated_banks;
1: -	struct tpm_bank_info *allocated_banks;
1: -	acpi_handle acpi_dev_handle;
1: -	char ppi_version[4];
1: -	struct tpm_space work_space;
1: -	u32 last_cc;
1: -	u32 nr_commands;
1: -	u32 *cc_attrs_tbl;
1: -	int locality;
1: +  struct device dev;
1: +  struct device devs;
1: +  struct cdev cdev;
1: +  struct cdev cdevs;
1: +  struct rw_semaphore ops_sem;
1: +  const struct tpm_class_ops *ops;
1: +  struct tpm_bios_log log;
1: +  struct tpm_chip_seqops bin_log_seqops;
1: +  struct tpm_chip_seqops ascii_log_seqops;
1: +  unsigned int flags;
1: +  int dev_num;
1: +  long unsigned int is_open;
1: +  char hwrng_name[64];
1: +  struct hwrng hwrng;
1: +  struct mutex tpm_mutex;
1: +  long unsigned int timeout_a;
1: +  long unsigned int timeout_b;
1: +  long unsigned int timeout_c;
1: +  long unsigned int timeout_d;
1: +  bool timeout_adjusted;
1: +  long unsigned int duration[4];
1: +  bool duration_adjusted;
1: +  struct dentry *bios_dir[3];
1: +  const struct attribute_group *groups[3];
1: +  unsigned int groups_cnt;
1: +  u32 nr_allocated_banks;
1: +  struct tpm_bank_info *allocated_banks;
1: +  acpi_handle acpi_dev_handle;
1: +  char ppi_version[4];
1: +  struct tpm_space work_space;
1: +  u32 last_cc;
1: +  u32 nr_commands;
1: +  u32 *cc_attrs_tbl;
1: +  int locality;
1:  };
1:  
1:  enum tpm_duration {
1: -	TPM_SHORT = 0,
1: -	TPM_MEDIUM = 1,
1: -	TPM_LONG = 2,
1: -	TPM_LONG_LONG = 3,
1: -	TPM_UNDEFINED = 4,
1: -	TPM_NUM_DURATIONS = 4,
1: +  TPM_SHORT = 0,
1: +  TPM_MEDIUM = 1,
1: +  TPM_LONG = 2,
1: +  TPM_LONG_LONG = 3,
1: +  TPM_UNDEFINED = 4,
1: +  TPM_NUM_DURATIONS = 4,
1:  };
1:  
1:  enum evm_ima_xattr_type {
1: -	IMA_XATTR_DIGEST = 1,
1: -	EVM_XATTR_HMAC = 2,
1: -	EVM_IMA_XATTR_DIGSIG = 3,
1: -	IMA_XATTR_DIGEST_NG = 4,
1: -	EVM_XATTR_PORTABLE_DIGSIG = 5,
1: -	IMA_XATTR_LAST = 6,
1: +  IMA_XATTR_DIGEST = 1,
1: +  EVM_XATTR_HMAC = 2,
1: +  EVM_IMA_XATTR_DIGSIG = 3,
1: +  IMA_XATTR_DIGEST_NG = 4,
1: +  EVM_XATTR_PORTABLE_DIGSIG = 5,
1: +  IMA_XATTR_LAST = 6,
1:  };
1:  
1:  enum ima_hooks {
1: -	NONE___2 = 0,
1: -	FILE_CHECK = 1,
1: -	MMAP_CHECK = 2,
1: -	BPRM_CHECK = 3,
1: -	CREDS_CHECK = 4,
1: -	POST_SETATTR = 5,
1: -	MODULE_CHECK = 6,
1: -	FIRMWARE_CHECK = 7,
1: -	KEXEC_KERNEL_CHECK = 8,
1: -	KEXEC_INITRAMFS_CHECK = 9,
1: -	POLICY_CHECK = 10,
1: -	KEXEC_CMDLINE = 11,
1: -	KEY_CHECK = 12,
1: -	MAX_CHECK = 13,
1: +  NONE___2 = 0,
1: +  FILE_CHECK = 1,
1: +  MMAP_CHECK = 2,
1: +  BPRM_CHECK = 3,
1: +  CREDS_CHECK = 4,
1: +  POST_SETATTR = 5,
1: +  MODULE_CHECK = 6,
1: +  FIRMWARE_CHECK = 7,
1: +  KEXEC_KERNEL_CHECK = 8,
1: +  KEXEC_INITRAMFS_CHECK = 9,
1: +  POLICY_CHECK = 10,
1: +  KEXEC_CMDLINE = 11,
1: +  KEY_CHECK = 12,
1: +  MAX_CHECK = 13,
1:  };
1:  
1:  struct crypto_async_request;
1: @@ -60809,187 +61735,187 @@ struct crypto_async_request;
1:  typedef void (*crypto_completion_t)(struct crypto_async_request *, int);
1:  
1:  struct crypto_async_request {
1: -	struct list_head list;
1: -	crypto_completion_t complete;
1: -	void *data;
1: -	struct crypto_tfm *tfm;
1: -	u32 flags;
1: +  struct list_head list;
1: +  crypto_completion_t complete;
1: +  void *data;
1: +  struct crypto_tfm *tfm;
1: +  u32 flags;
1:  };
1:  
1:  struct crypto_wait {
1: -	struct completion completion;
1: -	int err;
1: +  struct completion completion;
1: +  int err;
1:  };
1:  
1:  struct hash_alg_common {
1: -	unsigned int digestsize;
1: -	unsigned int statesize;
1: -	struct crypto_alg base;
1: +  unsigned int digestsize;
1: +  unsigned int statesize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct ahash_request {
1: -	struct crypto_async_request base;
1: -	unsigned int nbytes;
1: -	struct scatterlist *src;
1: -	u8 *result;
1: -	void *priv;
1: -	void *__ctx[0];
1: +  struct crypto_async_request base;
1: +  unsigned int nbytes;
1: +  struct scatterlist *src;
1: +  u8 *result;
1: +  void *priv;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_ahash {
1: -	int (*init)(struct ahash_request *);
1: -	int (*update)(struct ahash_request *);
1: -	int (*final)(struct ahash_request *);
1: -	int (*finup)(struct ahash_request *);
1: -	int (*digest)(struct ahash_request *);
1: -	int (*export)(struct ahash_request *, void *);
1: -	int (*import)(struct ahash_request *, const void *);
1: -	int (*setkey)(struct crypto_ahash *, const u8 *, unsigned int);
1: -	unsigned int reqsize;
1: -	struct crypto_tfm base;
1: +  int (*init)(struct ahash_request *);
1: +  int (*update)(struct ahash_request *);
1: +  int (*final)(struct ahash_request *);
1: +  int (*finup)(struct ahash_request *);
1: +  int (*digest)(struct ahash_request *);
1: +  int (*export)(struct ahash_request *, void *);
1: +  int (*import)(struct ahash_request *, const void *);
1: +  int (*setkey)(struct crypto_ahash *, const u8 *, unsigned int);
1: +  unsigned int reqsize;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  enum tpm_algorithms {
1: -	TPM_ALG_ERROR = 0,
1: -	TPM_ALG_SHA1 = 4,
1: -	TPM_ALG_KEYEDHASH = 8,
1: -	TPM_ALG_SHA256 = 11,
1: -	TPM_ALG_SHA384 = 12,
1: -	TPM_ALG_SHA512 = 13,
1: -	TPM_ALG_NULL = 16,
1: -	TPM_ALG_SM3_256 = 18,
1: +  TPM_ALG_ERROR = 0,
1: +  TPM_ALG_SHA1 = 4,
1: +  TPM_ALG_KEYEDHASH = 8,
1: +  TPM_ALG_SHA256 = 11,
1: +  TPM_ALG_SHA384 = 12,
1: +  TPM_ALG_SHA512 = 13,
1: +  TPM_ALG_NULL = 16,
1: +  TPM_ALG_SM3_256 = 18,
1:  };
1:  
1:  enum tpm_pcrs {
1: -	TPM_PCR0 = 0,
1: -	TPM_PCR8 = 8,
1: -	TPM_PCR10 = 10,
1: +  TPM_PCR0 = 0,
1: +  TPM_PCR8 = 8,
1: +  TPM_PCR10 = 10,
1:  };
1:  
1:  struct ima_algo_desc {
1: -	struct crypto_shash *tfm;
1: -	enum hash_algo algo;
1: +  struct crypto_shash *tfm;
1: +  enum hash_algo algo;
1:  };
1:  
1:  enum lsm_rule_types {
1: -	LSM_OBJ_USER = 0,
1: -	LSM_OBJ_ROLE = 1,
1: -	LSM_OBJ_TYPE = 2,
1: -	LSM_SUBJ_USER = 3,
1: -	LSM_SUBJ_ROLE = 4,
1: -	LSM_SUBJ_TYPE = 5,
1: +  LSM_OBJ_USER = 0,
1: +  LSM_OBJ_ROLE = 1,
1: +  LSM_OBJ_TYPE = 2,
1: +  LSM_SUBJ_USER = 3,
1: +  LSM_SUBJ_ROLE = 4,
1: +  LSM_SUBJ_TYPE = 5,
1:  };
1:  
1:  enum policy_types {
1: -	ORIGINAL_TCB = 1,
1: -	DEFAULT_TCB = 2,
1: +  ORIGINAL_TCB = 1,
1: +  DEFAULT_TCB = 2,
1:  };
1:  
1:  enum policy_rule_list {
1: -	IMA_DEFAULT_POLICY = 1,
1: -	IMA_CUSTOM_POLICY = 2,
1: +  IMA_DEFAULT_POLICY = 1,
1: +  IMA_CUSTOM_POLICY = 2,
1:  };
1:  
1:  struct ima_rule_opt_list {
1: -	size_t count;
1: -	char *items[0];
1: +  size_t count;
1: +  char *items[0];
1:  };
1:  
1:  struct ima_rule_entry {
1: -	struct list_head list;
1: -	int action;
1: -	unsigned int flags;
1: -	enum ima_hooks func;
1: -	int mask;
1: -	long unsigned int fsmagic;
1: -	uuid_t fsuuid;
1: -	kuid_t uid;
1: -	kuid_t fowner;
1: -	bool (*uid_op)(kuid_t, kuid_t);
1: -	bool (*fowner_op)(kuid_t, kuid_t);
1: -	int pcr;
1: -	struct {
1: -		void *rule;
1: -		char *args_p;
1: -		int type;
1: -	} lsm[6];
1: -	char *fsname;
1: -	struct ima_rule_opt_list *keyrings;
1: -	struct ima_template_desc *template;
1: -};
1: -
1: -enum {
1: -	Opt_measure = 0,
1: -	Opt_dont_measure = 1,
1: -	Opt_appraise = 2,
1: -	Opt_dont_appraise = 3,
1: -	Opt_audit = 4,
1: -	Opt_hash___2 = 5,
1: -	Opt_dont_hash = 6,
1: -	Opt_obj_user = 7,
1: -	Opt_obj_role = 8,
1: -	Opt_obj_type = 9,
1: -	Opt_subj_user = 10,
1: -	Opt_subj_role = 11,
1: -	Opt_subj_type = 12,
1: -	Opt_func = 13,
1: -	Opt_mask = 14,
1: -	Opt_fsmagic = 15,
1: -	Opt_fsname = 16,
1: -	Opt_fsuuid = 17,
1: -	Opt_uid_eq = 18,
1: -	Opt_euid_eq = 19,
1: -	Opt_fowner_eq = 20,
1: -	Opt_uid_gt = 21,
1: -	Opt_euid_gt = 22,
1: -	Opt_fowner_gt = 23,
1: -	Opt_uid_lt = 24,
1: -	Opt_euid_lt = 25,
1: -	Opt_fowner_lt = 26,
1: -	Opt_appraise_type = 27,
1: -	Opt_appraise_flag = 28,
1: -	Opt_permit_directio = 29,
1: -	Opt_pcr = 30,
1: -	Opt_template = 31,
1: -	Opt_keyrings = 32,
1: -	Opt_err___9 = 33,
1: -};
1: -
1: -enum {
1: -	mask_exec = 0,
1: -	mask_write = 1,
1: -	mask_read = 2,
1: -	mask_append = 3,
1: +  struct list_head list;
1: +  int action;
1: +  unsigned int flags;
1: +  enum ima_hooks func;
1: +  int mask;
1: +  long unsigned int fsmagic;
1: +  uuid_t fsuuid;
1: +  kuid_t uid;
1: +  kuid_t fowner;
1: +  bool (*uid_op)(kuid_t, kuid_t);
1: +  bool (*fowner_op)(kuid_t, kuid_t);
1: +  int pcr;
1: +  struct {
1: +    void *rule;
1: +    char *args_p;
1: +    int type;
1: +  } lsm[6];
1: +  char *fsname;
1: +  struct ima_rule_opt_list *keyrings;
1: +  struct ima_template_desc *template;
1: +};
1: +
1: +enum {
1: +  Opt_measure = 0,
1: +  Opt_dont_measure = 1,
1: +  Opt_appraise = 2,
1: +  Opt_dont_appraise = 3,
1: +  Opt_audit = 4,
1: +  Opt_hash___2 = 5,
1: +  Opt_dont_hash = 6,
1: +  Opt_obj_user = 7,
1: +  Opt_obj_role = 8,
1: +  Opt_obj_type = 9,
1: +  Opt_subj_user = 10,
1: +  Opt_subj_role = 11,
1: +  Opt_subj_type = 12,
1: +  Opt_func = 13,
1: +  Opt_mask = 14,
1: +  Opt_fsmagic = 15,
1: +  Opt_fsname = 16,
1: +  Opt_fsuuid = 17,
1: +  Opt_uid_eq = 18,
1: +  Opt_euid_eq = 19,
1: +  Opt_fowner_eq = 20,
1: +  Opt_uid_gt = 21,
1: +  Opt_euid_gt = 22,
1: +  Opt_fowner_gt = 23,
1: +  Opt_uid_lt = 24,
1: +  Opt_euid_lt = 25,
1: +  Opt_fowner_lt = 26,
1: +  Opt_appraise_type = 27,
1: +  Opt_appraise_flag = 28,
1: +  Opt_permit_directio = 29,
1: +  Opt_pcr = 30,
1: +  Opt_template = 31,
1: +  Opt_keyrings = 32,
1: +  Opt_err___9 = 33,
1: +};
1: +
1: +enum {
1: +  mask_exec = 0,
1: +  mask_write = 1,
1: +  mask_read = 2,
1: +  mask_append = 3,
1:  };
1:  
1:  struct ima_kexec_hdr {
1: -	u16 version;
1: -	u16 _reserved0;
1: -	u32 _reserved1;
1: -	u64 buffer_size;
1: -	u64 count;
1: +  u16 version;
1: +  u16 _reserved0;
1: +  u32 _reserved1;
1: +  u64 buffer_size;
1: +  u64 count;
1:  };
1:  
1:  enum header_fields {
1: -	HDR_PCR = 0,
1: -	HDR_DIGEST = 1,
1: -	HDR_TEMPLATE_NAME = 2,
1: -	HDR_TEMPLATE_DATA = 3,
1: -	HDR__LAST = 4,
1: +  HDR_PCR = 0,
1: +  HDR_DIGEST = 1,
1: +  HDR_TEMPLATE_NAME = 2,
1: +  HDR_TEMPLATE_DATA = 3,
1: +  HDR__LAST = 4,
1:  };
1:  
1:  enum data_formats {
1: -	DATA_FMT_DIGEST = 0,
1: -	DATA_FMT_DIGEST_WITH_ALGO = 1,
1: -	DATA_FMT_STRING = 2,
1: -	DATA_FMT_HEX = 3,
1: +  DATA_FMT_DIGEST = 0,
1: +  DATA_FMT_DIGEST_WITH_ALGO = 1,
1: +  DATA_FMT_STRING = 2,
1: +  DATA_FMT_HEX = 3,
1:  };
1:  
1:  struct ima_key_entry {
1: -	struct list_head list;
1: -	void *payload;
1: -	size_t payload_len;
1: -	char *keyring_name;
1: +  struct list_head list;
1: +  void *payload;
1: +  size_t payload_len;
1: +  char *keyring_name;
1:  };
1:  
1:  struct crypto_template;
1: @@ -60997,1737 +61923,1746 @@ struct crypto_template;
1:  struct crypto_spawn;
1:  
1:  struct crypto_instance {
1: -	struct crypto_alg alg;
1: -	struct crypto_template *tmpl;
1: -	union {
1: -		struct hlist_node list;
1: -		struct crypto_spawn *spawns;
1: -	};
1: -	void *__ctx[0];
1: +  struct crypto_alg alg;
1: +  struct crypto_template *tmpl;
1: +  union {
1: +    struct hlist_node list;
1: +    struct crypto_spawn *spawns;
1: +  };
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_spawn {
1: -	struct list_head list;
1: -	struct crypto_alg *alg;
1: -	union {
1: -		struct crypto_instance *inst;
1: -		struct crypto_spawn *next;
1: -	};
1: -	const struct crypto_type *frontend;
1: -	u32 mask;
1: -	bool dead;
1: -	bool registered;
1: +  struct list_head list;
1: +  struct crypto_alg *alg;
1: +  union {
1: +    struct crypto_instance *inst;
1: +    struct crypto_spawn *next;
1: +  };
1: +  const struct crypto_type *frontend;
1: +  u32 mask;
1: +  bool dead;
1: +  bool registered;
1:  };
1:  
1:  struct rtattr;
1:  
1:  struct crypto_template {
1: -	struct list_head list;
1: -	struct hlist_head instances;
1: -	struct module *module;
1: -	int (*create)(struct crypto_template *, struct rtattr **);
1: -	char name[128];
1: +  struct list_head list;
1: +  struct hlist_head instances;
1: +  struct module *module;
1: +  int (*create)(struct crypto_template *, struct rtattr **);
1: +  char name[128];
1:  };
1:  
1:  enum {
1: -	CRYPTO_MSG_ALG_REQUEST = 0,
1: -	CRYPTO_MSG_ALG_REGISTER = 1,
1: -	CRYPTO_MSG_ALG_LOADED = 2,
1: +  CRYPTO_MSG_ALG_REQUEST = 0,
1: +  CRYPTO_MSG_ALG_REGISTER = 1,
1: +  CRYPTO_MSG_ALG_LOADED = 2,
1:  };
1:  
1:  struct crypto_larval {
1: -	struct crypto_alg alg;
1: -	struct crypto_alg *adult;
1: -	struct completion completion;
1: -	u32 mask;
1: +  struct crypto_alg alg;
1: +  struct crypto_alg *adult;
1: +  struct completion completion;
1: +  u32 mask;
1:  };
1:  
1:  struct crypto_cipher {
1: -	struct crypto_tfm base;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct crypto_comp {
1: -	struct crypto_tfm base;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  enum {
1: -	CRYPTOA_UNSPEC = 0,
1: -	CRYPTOA_ALG = 1,
1: -	CRYPTOA_TYPE = 2,
1: -	CRYPTOA_U32 = 3,
1: -	__CRYPTOA_MAX = 4,
1: +  CRYPTOA_UNSPEC = 0,
1: +  CRYPTOA_ALG = 1,
1: +  CRYPTOA_TYPE = 2,
1: +  CRYPTOA_U32 = 3,
1: +  __CRYPTOA_MAX = 4,
1:  };
1:  
1:  struct crypto_attr_alg {
1: -	char name[128];
1: +  char name[128];
1:  };
1:  
1:  struct crypto_attr_type {
1: -	u32 type;
1: -	u32 mask;
1: +  u32 type;
1: +  u32 mask;
1:  };
1:  
1:  struct crypto_attr_u32 {
1: -	u32 num;
1: +  u32 num;
1:  };
1:  
1:  struct rtattr {
1: -	short unsigned int rta_len;
1: -	short unsigned int rta_type;
1: +  short unsigned int rta_len;
1: +  short unsigned int rta_type;
1:  };
1:  
1:  struct crypto_queue {
1: -	struct list_head list;
1: -	struct list_head *backlog;
1: -	unsigned int qlen;
1: -	unsigned int max_qlen;
1: +  struct list_head list;
1: +  struct list_head *backlog;
1: +  unsigned int qlen;
1: +  unsigned int max_qlen;
1:  };
1:  
1:  enum {
1: -	NAPI_STATE_SCHED = 0,
1: -	NAPI_STATE_MISSED = 1,
1: -	NAPI_STATE_DISABLE = 2,
1: -	NAPI_STATE_NPSVC = 3,
1: -	NAPI_STATE_LISTED = 4,
1: -	NAPI_STATE_NO_BUSY_POLL = 5,
1: -	NAPI_STATE_IN_BUSY_POLL = 6,
1: -	NAPI_STATE_PREFER_BUSY_POLL = 7,
1: +  NAPI_STATE_SCHED = 0,
1: +  NAPI_STATE_MISSED = 1,
1: +  NAPI_STATE_DISABLE = 2,
1: +  NAPI_STATE_NPSVC = 3,
1: +  NAPI_STATE_LISTED = 4,
1: +  NAPI_STATE_NO_BUSY_POLL = 5,
1: +  NAPI_STATE_IN_BUSY_POLL = 6,
1: +  NAPI_STATE_PREFER_BUSY_POLL = 7,
1:  };
1:  
1:  enum bpf_xdp_mode {
1: -	XDP_MODE_SKB = 0,
1: -	XDP_MODE_DRV = 1,
1: -	XDP_MODE_HW = 2,
1: -	__MAX_XDP_MODE = 3,
1: -};
1: -
1: -enum {
1: -	NETIF_MSG_DRV_BIT = 0,
1: -	NETIF_MSG_PROBE_BIT = 1,
1: -	NETIF_MSG_LINK_BIT = 2,
1: -	NETIF_MSG_TIMER_BIT = 3,
1: -	NETIF_MSG_IFDOWN_BIT = 4,
1: -	NETIF_MSG_IFUP_BIT = 5,
1: -	NETIF_MSG_RX_ERR_BIT = 6,
1: -	NETIF_MSG_TX_ERR_BIT = 7,
1: -	NETIF_MSG_TX_QUEUED_BIT = 8,
1: -	NETIF_MSG_INTR_BIT = 9,
1: -	NETIF_MSG_TX_DONE_BIT = 10,
1: -	NETIF_MSG_RX_STATUS_BIT = 11,
1: -	NETIF_MSG_PKTDATA_BIT = 12,
1: -	NETIF_MSG_HW_BIT = 13,
1: -	NETIF_MSG_WOL_BIT = 14,
1: -	NETIF_MSG_CLASS_COUNT = 15,
1: +  XDP_MODE_SKB = 0,
1: +  XDP_MODE_DRV = 1,
1: +  XDP_MODE_HW = 2,
1: +  __MAX_XDP_MODE = 3,
1: +};
1: +
1: +enum {
1: +  NETIF_MSG_DRV_BIT = 0,
1: +  NETIF_MSG_PROBE_BIT = 1,
1: +  NETIF_MSG_LINK_BIT = 2,
1: +  NETIF_MSG_TIMER_BIT = 3,
1: +  NETIF_MSG_IFDOWN_BIT = 4,
1: +  NETIF_MSG_IFUP_BIT = 5,
1: +  NETIF_MSG_RX_ERR_BIT = 6,
1: +  NETIF_MSG_TX_ERR_BIT = 7,
1: +  NETIF_MSG_TX_QUEUED_BIT = 8,
1: +  NETIF_MSG_INTR_BIT = 9,
1: +  NETIF_MSG_TX_DONE_BIT = 10,
1: +  NETIF_MSG_RX_STATUS_BIT = 11,
1: +  NETIF_MSG_PKTDATA_BIT = 12,
1: +  NETIF_MSG_HW_BIT = 13,
1: +  NETIF_MSG_WOL_BIT = 14,
1: +  NETIF_MSG_CLASS_COUNT = 15,
1:  };
1:  
1:  struct scatter_walk {
1: -	struct scatterlist *sg;
1: -	unsigned int offset;
1: +  struct scatterlist *sg;
1: +  unsigned int offset;
1:  };
1:  
1:  struct aead_request {
1: -	struct crypto_async_request base;
1: -	unsigned int assoclen;
1: -	unsigned int cryptlen;
1: -	u8 *iv;
1: -	struct scatterlist *src;
1: -	struct scatterlist *dst;
1: -	void *__ctx[0];
1: +  struct crypto_async_request base;
1: +  unsigned int assoclen;
1: +  unsigned int cryptlen;
1: +  u8 *iv;
1: +  struct scatterlist *src;
1: +  struct scatterlist *dst;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_aead;
1:  
1:  struct aead_alg {
1: -	int (*setkey)(struct crypto_aead *, const u8 *, unsigned int);
1: -	int (*setauthsize)(struct crypto_aead *, unsigned int);
1: -	int (*encrypt)(struct aead_request *);
1: -	int (*decrypt)(struct aead_request *);
1: -	int (*init)(struct crypto_aead *);
1: -	void (*exit)(struct crypto_aead *);
1: -	unsigned int ivsize;
1: -	unsigned int maxauthsize;
1: -	unsigned int chunksize;
1: -	struct crypto_alg base;
1: +  int (*setkey)(struct crypto_aead *, const u8 *, unsigned int);
1: +  int (*setauthsize)(struct crypto_aead *, unsigned int);
1: +  int (*encrypt)(struct aead_request *);
1: +  int (*decrypt)(struct aead_request *);
1: +  int (*init)(struct crypto_aead *);
1: +  void (*exit)(struct crypto_aead *);
1: +  unsigned int ivsize;
1: +  unsigned int maxauthsize;
1: +  unsigned int chunksize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct crypto_aead {
1: -	unsigned int authsize;
1: -	unsigned int reqsize;
1: -	struct crypto_tfm base;
1: +  unsigned int authsize;
1: +  unsigned int reqsize;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct aead_instance {
1: -	void (*free)(struct aead_instance *);
1: -	union {
1: -		struct {
1: -			char head[64];
1: -			struct crypto_instance base;
1: -		} s;
1: -		struct aead_alg alg;
1: -	};
1: +  void (*free)(struct aead_instance *);
1: +  union {
1: +    struct {
1: +      char head[64];
1: +      struct crypto_instance base;
1: +    } s;
1: +    struct aead_alg alg;
1: +  };
1:  };
1:  
1:  struct crypto_aead_spawn {
1: -	struct crypto_spawn base;
1: +  struct crypto_spawn base;
1:  };
1:  
1:  enum crypto_attr_type_t {
1: -	CRYPTOCFGA_UNSPEC = 0,
1: -	CRYPTOCFGA_PRIORITY_VAL = 1,
1: -	CRYPTOCFGA_REPORT_LARVAL = 2,
1: -	CRYPTOCFGA_REPORT_HASH = 3,
1: -	CRYPTOCFGA_REPORT_BLKCIPHER = 4,
1: -	CRYPTOCFGA_REPORT_AEAD = 5,
1: -	CRYPTOCFGA_REPORT_COMPRESS = 6,
1: -	CRYPTOCFGA_REPORT_RNG = 7,
1: -	CRYPTOCFGA_REPORT_CIPHER = 8,
1: -	CRYPTOCFGA_REPORT_AKCIPHER = 9,
1: -	CRYPTOCFGA_REPORT_KPP = 10,
1: -	CRYPTOCFGA_REPORT_ACOMP = 11,
1: -	CRYPTOCFGA_STAT_LARVAL = 12,
1: -	CRYPTOCFGA_STAT_HASH = 13,
1: -	CRYPTOCFGA_STAT_BLKCIPHER = 14,
1: -	CRYPTOCFGA_STAT_AEAD = 15,
1: -	CRYPTOCFGA_STAT_COMPRESS = 16,
1: -	CRYPTOCFGA_STAT_RNG = 17,
1: -	CRYPTOCFGA_STAT_CIPHER = 18,
1: -	CRYPTOCFGA_STAT_AKCIPHER = 19,
1: -	CRYPTOCFGA_STAT_KPP = 20,
1: -	CRYPTOCFGA_STAT_ACOMP = 21,
1: -	__CRYPTOCFGA_MAX = 22,
1: +  CRYPTOCFGA_UNSPEC = 0,
1: +  CRYPTOCFGA_PRIORITY_VAL = 1,
1: +  CRYPTOCFGA_REPORT_LARVAL = 2,
1: +  CRYPTOCFGA_REPORT_HASH = 3,
1: +  CRYPTOCFGA_REPORT_BLKCIPHER = 4,
1: +  CRYPTOCFGA_REPORT_AEAD = 5,
1: +  CRYPTOCFGA_REPORT_COMPRESS = 6,
1: +  CRYPTOCFGA_REPORT_RNG = 7,
1: +  CRYPTOCFGA_REPORT_CIPHER = 8,
1: +  CRYPTOCFGA_REPORT_AKCIPHER = 9,
1: +  CRYPTOCFGA_REPORT_KPP = 10,
1: +  CRYPTOCFGA_REPORT_ACOMP = 11,
1: +  CRYPTOCFGA_STAT_LARVAL = 12,
1: +  CRYPTOCFGA_STAT_HASH = 13,
1: +  CRYPTOCFGA_STAT_BLKCIPHER = 14,
1: +  CRYPTOCFGA_STAT_AEAD = 15,
1: +  CRYPTOCFGA_STAT_COMPRESS = 16,
1: +  CRYPTOCFGA_STAT_RNG = 17,
1: +  CRYPTOCFGA_STAT_CIPHER = 18,
1: +  CRYPTOCFGA_STAT_AKCIPHER = 19,
1: +  CRYPTOCFGA_STAT_KPP = 20,
1: +  CRYPTOCFGA_STAT_ACOMP = 21,
1: +  __CRYPTOCFGA_MAX = 22,
1:  };
1:  
1:  struct crypto_report_aead {
1: -	char type[64];
1: -	char geniv[64];
1: -	unsigned int blocksize;
1: -	unsigned int maxauthsize;
1: -	unsigned int ivsize;
1: +  char type[64];
1: +  char geniv[64];
1: +  unsigned int blocksize;
1: +  unsigned int maxauthsize;
1: +  unsigned int ivsize;
1:  };
1:  
1:  struct crypto_sync_skcipher;
1:  
1:  struct aead_geniv_ctx {
1: -	spinlock_t lock;
1: -	struct crypto_aead *child;
1: -	struct crypto_sync_skcipher *sknull;
1: -	u8 salt[0];
1: +  spinlock_t lock;
1: +  struct crypto_aead *child;
1: +  struct crypto_sync_skcipher *sknull;
1: +  u8 salt[0];
1:  };
1:  
1:  struct crypto_rng;
1:  
1:  struct rng_alg {
1: -	int (*generate)(struct crypto_rng *, const u8 *, unsigned int, u8 *, unsigned int);
1: -	int (*seed)(struct crypto_rng *, const u8 *, unsigned int);
1: -	void (*set_ent)(struct crypto_rng *, const u8 *, unsigned int);
1: -	unsigned int seedsize;
1: -	struct crypto_alg base;
1: +  int (*generate)(struct crypto_rng *, const u8 *, unsigned int, u8 *,
1: +                  unsigned int);
1: +  int (*seed)(struct crypto_rng *, const u8 *, unsigned int);
1: +  void (*set_ent)(struct crypto_rng *, const u8 *, unsigned int);
1: +  unsigned int seedsize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct crypto_rng {
1: -	struct crypto_tfm base;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct crypto_cipher_spawn {
1: -	struct crypto_spawn base;
1: +  struct crypto_spawn base;
1:  };
1:  
1:  struct skcipher_request {
1: -	unsigned int cryptlen;
1: -	u8 *iv;
1: -	struct scatterlist *src;
1: -	struct scatterlist *dst;
1: -	struct crypto_async_request base;
1: -	void *__ctx[0];
1: +  unsigned int cryptlen;
1: +  u8 *iv;
1: +  struct scatterlist *src;
1: +  struct scatterlist *dst;
1: +  struct crypto_async_request base;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_skcipher {
1: -	unsigned int reqsize;
1: -	struct crypto_tfm base;
1: +  unsigned int reqsize;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct crypto_sync_skcipher {
1: -	struct crypto_skcipher base;
1: +  struct crypto_skcipher base;
1:  };
1:  
1:  struct skcipher_alg {
1: -	int (*setkey)(struct crypto_skcipher *, const u8 *, unsigned int);
1: -	int (*encrypt)(struct skcipher_request *);
1: -	int (*decrypt)(struct skcipher_request *);
1: -	int (*init)(struct crypto_skcipher *);
1: -	void (*exit)(struct crypto_skcipher *);
1: -	unsigned int min_keysize;
1: -	unsigned int max_keysize;
1: -	unsigned int ivsize;
1: -	unsigned int chunksize;
1: -	unsigned int walksize;
1: -	struct crypto_alg base;
1: +  int (*setkey)(struct crypto_skcipher *, const u8 *, unsigned int);
1: +  int (*encrypt)(struct skcipher_request *);
1: +  int (*decrypt)(struct skcipher_request *);
1: +  int (*init)(struct crypto_skcipher *);
1: +  void (*exit)(struct crypto_skcipher *);
1: +  unsigned int min_keysize;
1: +  unsigned int max_keysize;
1: +  unsigned int ivsize;
1: +  unsigned int chunksize;
1: +  unsigned int walksize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct skcipher_instance {
1: -	void (*free)(struct skcipher_instance *);
1: -	union {
1: -		struct {
1: -			char head[64];
1: -			struct crypto_instance base;
1: -		} s;
1: -		struct skcipher_alg alg;
1: -	};
1: +  void (*free)(struct skcipher_instance *);
1: +  union {
1: +    struct {
1: +      char head[64];
1: +      struct crypto_instance base;
1: +    } s;
1: +    struct skcipher_alg alg;
1: +  };
1:  };
1:  
1:  struct crypto_skcipher_spawn {
1: -	struct crypto_spawn base;
1: +  struct crypto_spawn base;
1:  };
1:  
1:  struct skcipher_walk {
1: -	union {
1: -		struct {
1: -			struct page *page;
1: -			long unsigned int offset;
1: -		} phys;
1: -		struct {
1: -			u8 *page;
1: -			void *addr;
1: -		} virt;
1: -	} src;
1: -	union {
1: -		struct {
1: -			struct page *page;
1: -			long unsigned int offset;
1: -		} phys;
1: -		struct {
1: -			u8 *page;
1: -			void *addr;
1: -		} virt;
1: -	} dst;
1: -	struct scatter_walk in;
1: -	unsigned int nbytes;
1: -	struct scatter_walk out;
1: -	unsigned int total;
1: -	struct list_head buffers;
1: -	u8 *page;
1: -	u8 *buffer;
1: -	u8 *oiv;
1: -	void *iv;
1: -	unsigned int ivsize;
1: -	int flags;
1: -	unsigned int blocksize;
1: -	unsigned int stride;
1: -	unsigned int alignmask;
1: +  union {
1: +    struct {
1: +      struct page *page;
1: +      long unsigned int offset;
1: +    } phys;
1: +    struct {
1: +      u8 *page;
1: +      void *addr;
1: +    } virt;
1: +  } src;
1: +  union {
1: +    struct {
1: +      struct page *page;
1: +      long unsigned int offset;
1: +    } phys;
1: +    struct {
1: +      u8 *page;
1: +      void *addr;
1: +    } virt;
1: +  } dst;
1: +  struct scatter_walk in;
1: +  unsigned int nbytes;
1: +  struct scatter_walk out;
1: +  unsigned int total;
1: +  struct list_head buffers;
1: +  u8 *page;
1: +  u8 *buffer;
1: +  u8 *oiv;
1: +  void *iv;
1: +  unsigned int ivsize;
1: +  int flags;
1: +  unsigned int blocksize;
1: +  unsigned int stride;
1: +  unsigned int alignmask;
1:  };
1:  
1:  struct skcipher_ctx_simple {
1: -	struct crypto_cipher *cipher;
1: +  struct crypto_cipher *cipher;
1:  };
1:  
1:  struct crypto_report_blkcipher {
1: -	char type[64];
1: -	char geniv[64];
1: -	unsigned int blocksize;
1: -	unsigned int min_keysize;
1: -	unsigned int max_keysize;
1: -	unsigned int ivsize;
1: +  char type[64];
1: +  char geniv[64];
1: +  unsigned int blocksize;
1: +  unsigned int min_keysize;
1: +  unsigned int max_keysize;
1: +  unsigned int ivsize;
1:  };
1:  
1:  enum {
1: -	SKCIPHER_WALK_PHYS = 1,
1: -	SKCIPHER_WALK_SLOW = 2,
1: -	SKCIPHER_WALK_COPY = 4,
1: -	SKCIPHER_WALK_DIFF = 8,
1: -	SKCIPHER_WALK_SLEEP = 16,
1: +  SKCIPHER_WALK_PHYS = 1,
1: +  SKCIPHER_WALK_SLOW = 2,
1: +  SKCIPHER_WALK_COPY = 4,
1: +  SKCIPHER_WALK_DIFF = 8,
1: +  SKCIPHER_WALK_SLEEP = 16,
1:  };
1:  
1:  struct skcipher_walk_buffer {
1: -	struct list_head entry;
1: -	struct scatter_walk dst;
1: -	unsigned int len;
1: -	u8 *data;
1: -	u8 buffer[0];
1: +  struct list_head entry;
1: +  struct scatter_walk dst;
1: +  unsigned int len;
1: +  u8 *data;
1: +  u8 buffer[0];
1:  };
1:  
1:  struct ahash_alg {
1: -	int (*init)(struct ahash_request *);
1: -	int (*update)(struct ahash_request *);
1: -	int (*final)(struct ahash_request *);
1: -	int (*finup)(struct ahash_request *);
1: -	int (*digest)(struct ahash_request *);
1: -	int (*export)(struct ahash_request *, void *);
1: -	int (*import)(struct ahash_request *, const void *);
1: -	int (*setkey)(struct crypto_ahash *, const u8 *, unsigned int);
1: -	int (*init_tfm)(struct crypto_ahash *);
1: -	void (*exit_tfm)(struct crypto_ahash *);
1: -	struct hash_alg_common halg;
1: +  int (*init)(struct ahash_request *);
1: +  int (*update)(struct ahash_request *);
1: +  int (*final)(struct ahash_request *);
1: +  int (*finup)(struct ahash_request *);
1: +  int (*digest)(struct ahash_request *);
1: +  int (*export)(struct ahash_request *, void *);
1: +  int (*import)(struct ahash_request *, const void *);
1: +  int (*setkey)(struct crypto_ahash *, const u8 *, unsigned int);
1: +  int (*init_tfm)(struct crypto_ahash *);
1: +  void (*exit_tfm)(struct crypto_ahash *);
1: +  struct hash_alg_common halg;
1:  };
1:  
1:  struct crypto_hash_walk {
1: -	char *data;
1: -	unsigned int offset;
1: -	unsigned int alignmask;
1: -	struct page *pg;
1: -	unsigned int entrylen;
1: -	unsigned int total;
1: -	struct scatterlist *sg;
1: -	unsigned int flags;
1: +  char *data;
1: +  unsigned int offset;
1: +  unsigned int alignmask;
1: +  struct page *pg;
1: +  unsigned int entrylen;
1: +  unsigned int total;
1: +  struct scatterlist *sg;
1: +  unsigned int flags;
1:  };
1:  
1:  struct ahash_instance {
1: -	void (*free)(struct ahash_instance *);
1: -	union {
1: -		struct {
1: -			char head[88];
1: -			struct crypto_instance base;
1: -		} s;
1: -		struct ahash_alg alg;
1: -	};
1: +  void (*free)(struct ahash_instance *);
1: +  union {
1: +    struct {
1: +      char head[88];
1: +      struct crypto_instance base;
1: +    } s;
1: +    struct ahash_alg alg;
1: +  };
1:  };
1:  
1:  struct crypto_ahash_spawn {
1: -	struct crypto_spawn base;
1: +  struct crypto_spawn base;
1:  };
1:  
1:  struct crypto_report_hash {
1: -	char type[64];
1: -	unsigned int blocksize;
1: -	unsigned int digestsize;
1: +  char type[64];
1: +  unsigned int blocksize;
1: +  unsigned int digestsize;
1:  };
1:  
1:  struct ahash_request_priv {
1: -	crypto_completion_t complete;
1: -	void *data;
1: -	u8 *result;
1: -	u32 flags;
1: -	void *ubuf[0];
1: +  crypto_completion_t complete;
1: +  void *data;
1: +  u8 *result;
1: +  u32 flags;
1: +  void *ubuf[0];
1:  };
1:  
1:  struct shash_instance {
1: -	void (*free)(struct shash_instance *);
1: -	union {
1: -		struct {
1: -			char head[96];
1: -			struct crypto_instance base;
1: -		} s;
1: -		struct shash_alg alg;
1: -	};
1: +  void (*free)(struct shash_instance *);
1: +  union {
1: +    struct {
1: +      char head[96];
1: +      struct crypto_instance base;
1: +    } s;
1: +    struct shash_alg alg;
1: +  };
1:  };
1:  
1:  struct crypto_shash_spawn {
1: -	struct crypto_spawn base;
1: +  struct crypto_spawn base;
1:  };
1:  
1:  struct crypto_report_akcipher {
1: -	char type[64];
1: +  char type[64];
1:  };
1:  
1:  struct akcipher_request {
1: -	struct crypto_async_request base;
1: -	struct scatterlist *src;
1: -	struct scatterlist *dst;
1: -	unsigned int src_len;
1: -	unsigned int dst_len;
1: -	void *__ctx[0];
1: +  struct crypto_async_request base;
1: +  struct scatterlist *src;
1: +  struct scatterlist *dst;
1: +  unsigned int src_len;
1: +  unsigned int dst_len;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_akcipher {
1: -	struct crypto_tfm base;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct akcipher_alg {
1: -	int (*sign)(struct akcipher_request *);
1: -	int (*verify)(struct akcipher_request *);
1: -	int (*encrypt)(struct akcipher_request *);
1: -	int (*decrypt)(struct akcipher_request *);
1: -	int (*set_pub_key)(struct crypto_akcipher *, const void *, unsigned int);
1: -	int (*set_priv_key)(struct crypto_akcipher *, const void *, unsigned int);
1: -	unsigned int (*max_size)(struct crypto_akcipher *);
1: -	int (*init)(struct crypto_akcipher *);
1: -	void (*exit)(struct crypto_akcipher *);
1: -	unsigned int reqsize;
1: -	struct crypto_alg base;
1: +  int (*sign)(struct akcipher_request *);
1: +  int (*verify)(struct akcipher_request *);
1: +  int (*encrypt)(struct akcipher_request *);
1: +  int (*decrypt)(struct akcipher_request *);
1: +  int (*set_pub_key)(struct crypto_akcipher *, const void *, unsigned int);
1: +  int (*set_priv_key)(struct crypto_akcipher *, const void *, unsigned int);
1: +  unsigned int (*max_size)(struct crypto_akcipher *);
1: +  int (*init)(struct crypto_akcipher *);
1: +  void (*exit)(struct crypto_akcipher *);
1: +  unsigned int reqsize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct akcipher_instance {
1: -	void (*free)(struct akcipher_instance *);
1: -	union {
1: -		struct {
1: -			char head[80];
1: -			struct crypto_instance base;
1: -		} s;
1: -		struct akcipher_alg alg;
1: -	};
1: +  void (*free)(struct akcipher_instance *);
1: +  union {
1: +    struct {
1: +      char head[80];
1: +      struct crypto_instance base;
1: +    } s;
1: +    struct akcipher_alg alg;
1: +  };
1:  };
1:  
1:  struct crypto_akcipher_spawn {
1: -	struct crypto_spawn base;
1: +  struct crypto_spawn base;
1:  };
1:  
1:  struct crypto_report_kpp {
1: -	char type[64];
1: +  char type[64];
1:  };
1:  
1:  struct kpp_request {
1: -	struct crypto_async_request base;
1: -	struct scatterlist *src;
1: -	struct scatterlist *dst;
1: -	unsigned int src_len;
1: -	unsigned int dst_len;
1: -	void *__ctx[0];
1: +  struct crypto_async_request base;
1: +  struct scatterlist *src;
1: +  struct scatterlist *dst;
1: +  unsigned int src_len;
1: +  unsigned int dst_len;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_kpp {
1: -	struct crypto_tfm base;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct kpp_alg {
1: -	int (*set_secret)(struct crypto_kpp *, const void *, unsigned int);
1: -	int (*generate_public_key)(struct kpp_request *);
1: -	int (*compute_shared_secret)(struct kpp_request *);
1: -	unsigned int (*max_size)(struct crypto_kpp *);
1: -	int (*init)(struct crypto_kpp *);
1: -	void (*exit)(struct crypto_kpp *);
1: -	unsigned int reqsize;
1: -	struct crypto_alg base;
1: +  int (*set_secret)(struct crypto_kpp *, const void *, unsigned int);
1: +  int (*generate_public_key)(struct kpp_request *);
1: +  int (*compute_shared_secret)(struct kpp_request *);
1: +  unsigned int (*max_size)(struct crypto_kpp *);
1: +  int (*init)(struct crypto_kpp *);
1: +  void (*exit)(struct crypto_kpp *);
1: +  unsigned int reqsize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  enum asn1_class {
1: -	ASN1_UNIV = 0,
1: -	ASN1_APPL = 1,
1: -	ASN1_CONT = 2,
1: -	ASN1_PRIV = 3,
1: +  ASN1_UNIV = 0,
1: +  ASN1_APPL = 1,
1: +  ASN1_CONT = 2,
1: +  ASN1_PRIV = 3,
1:  };
1:  
1:  enum asn1_method {
1: -	ASN1_PRIM = 0,
1: -	ASN1_CONS = 1,
1: +  ASN1_PRIM = 0,
1: +  ASN1_CONS = 1,
1:  };
1:  
1:  enum asn1_tag {
1: -	ASN1_EOC = 0,
1: -	ASN1_BOOL = 1,
1: -	ASN1_INT = 2,
1: -	ASN1_BTS = 3,
1: -	ASN1_OTS = 4,
1: -	ASN1_NULL = 5,
1: -	ASN1_OID = 6,
1: -	ASN1_ODE = 7,
1: -	ASN1_EXT = 8,
1: -	ASN1_REAL = 9,
1: -	ASN1_ENUM = 10,
1: -	ASN1_EPDV = 11,
1: -	ASN1_UTF8STR = 12,
1: -	ASN1_RELOID = 13,
1: -	ASN1_SEQ = 16,
1: -	ASN1_SET = 17,
1: -	ASN1_NUMSTR = 18,
1: -	ASN1_PRNSTR = 19,
1: -	ASN1_TEXSTR = 20,
1: -	ASN1_VIDSTR = 21,
1: -	ASN1_IA5STR = 22,
1: -	ASN1_UNITIM = 23,
1: -	ASN1_GENTIM = 24,
1: -	ASN1_GRASTR = 25,
1: -	ASN1_VISSTR = 26,
1: -	ASN1_GENSTR = 27,
1: -	ASN1_UNISTR = 28,
1: -	ASN1_CHRSTR = 29,
1: -	ASN1_BMPSTR = 30,
1: -	ASN1_LONG_TAG = 31,
1: -};
1: -
1: -typedef int (*asn1_action_t)(void *, size_t, unsigned char, const void *, size_t);
1: +  ASN1_EOC = 0,
1: +  ASN1_BOOL = 1,
1: +  ASN1_INT = 2,
1: +  ASN1_BTS = 3,
1: +  ASN1_OTS = 4,
1: +  ASN1_NULL = 5,
1: +  ASN1_OID = 6,
1: +  ASN1_ODE = 7,
1: +  ASN1_EXT = 8,
1: +  ASN1_REAL = 9,
1: +  ASN1_ENUM = 10,
1: +  ASN1_EPDV = 11,
1: +  ASN1_UTF8STR = 12,
1: +  ASN1_RELOID = 13,
1: +  ASN1_SEQ = 16,
1: +  ASN1_SET = 17,
1: +  ASN1_NUMSTR = 18,
1: +  ASN1_PRNSTR = 19,
1: +  ASN1_TEXSTR = 20,
1: +  ASN1_VIDSTR = 21,
1: +  ASN1_IA5STR = 22,
1: +  ASN1_UNITIM = 23,
1: +  ASN1_GENTIM = 24,
1: +  ASN1_GRASTR = 25,
1: +  ASN1_VISSTR = 26,
1: +  ASN1_GENSTR = 27,
1: +  ASN1_UNISTR = 28,
1: +  ASN1_CHRSTR = 29,
1: +  ASN1_BMPSTR = 30,
1: +  ASN1_LONG_TAG = 31,
1: +};
1: +
1: +typedef int (*asn1_action_t)(void *, size_t, unsigned char, const void *,
1: +                             size_t);
1:  
1:  struct asn1_decoder {
1: -	const unsigned char *machine;
1: -	size_t machlen;
1: -	const asn1_action_t *actions;
1: +  const unsigned char *machine;
1: +  size_t machlen;
1: +  const asn1_action_t *actions;
1:  };
1:  
1:  enum asn1_opcode {
1: -	ASN1_OP_MATCH = 0,
1: -	ASN1_OP_MATCH_OR_SKIP = 1,
1: -	ASN1_OP_MATCH_ACT = 2,
1: -	ASN1_OP_MATCH_ACT_OR_SKIP = 3,
1: -	ASN1_OP_MATCH_JUMP = 4,
1: -	ASN1_OP_MATCH_JUMP_OR_SKIP = 5,
1: -	ASN1_OP_MATCH_ANY = 8,
1: -	ASN1_OP_MATCH_ANY_OR_SKIP = 9,
1: -	ASN1_OP_MATCH_ANY_ACT = 10,
1: -	ASN1_OP_MATCH_ANY_ACT_OR_SKIP = 11,
1: -	ASN1_OP_COND_MATCH_OR_SKIP = 17,
1: -	ASN1_OP_COND_MATCH_ACT_OR_SKIP = 19,
1: -	ASN1_OP_COND_MATCH_JUMP_OR_SKIP = 21,
1: -	ASN1_OP_COND_MATCH_ANY = 24,
1: -	ASN1_OP_COND_MATCH_ANY_OR_SKIP = 25,
1: -	ASN1_OP_COND_MATCH_ANY_ACT = 26,
1: -	ASN1_OP_COND_MATCH_ANY_ACT_OR_SKIP = 27,
1: -	ASN1_OP_COND_FAIL = 28,
1: -	ASN1_OP_COMPLETE = 29,
1: -	ASN1_OP_ACT = 30,
1: -	ASN1_OP_MAYBE_ACT = 31,
1: -	ASN1_OP_END_SEQ = 32,
1: -	ASN1_OP_END_SET = 33,
1: -	ASN1_OP_END_SEQ_OF = 34,
1: -	ASN1_OP_END_SET_OF = 35,
1: -	ASN1_OP_END_SEQ_ACT = 36,
1: -	ASN1_OP_END_SET_ACT = 37,
1: -	ASN1_OP_END_SEQ_OF_ACT = 38,
1: -	ASN1_OP_END_SET_OF_ACT = 39,
1: -	ASN1_OP_RETURN = 40,
1: -	ASN1_OP__NR = 41,
1: +  ASN1_OP_MATCH = 0,
1: +  ASN1_OP_MATCH_OR_SKIP = 1,
1: +  ASN1_OP_MATCH_ACT = 2,
1: +  ASN1_OP_MATCH_ACT_OR_SKIP = 3,
1: +  ASN1_OP_MATCH_JUMP = 4,
1: +  ASN1_OP_MATCH_JUMP_OR_SKIP = 5,
1: +  ASN1_OP_MATCH_ANY = 8,
1: +  ASN1_OP_MATCH_ANY_OR_SKIP = 9,
1: +  ASN1_OP_MATCH_ANY_ACT = 10,
1: +  ASN1_OP_MATCH_ANY_ACT_OR_SKIP = 11,
1: +  ASN1_OP_COND_MATCH_OR_SKIP = 17,
1: +  ASN1_OP_COND_MATCH_ACT_OR_SKIP = 19,
1: +  ASN1_OP_COND_MATCH_JUMP_OR_SKIP = 21,
1: +  ASN1_OP_COND_MATCH_ANY = 24,
1: +  ASN1_OP_COND_MATCH_ANY_OR_SKIP = 25,
1: +  ASN1_OP_COND_MATCH_ANY_ACT = 26,
1: +  ASN1_OP_COND_MATCH_ANY_ACT_OR_SKIP = 27,
1: +  ASN1_OP_COND_FAIL = 28,
1: +  ASN1_OP_COMPLETE = 29,
1: +  ASN1_OP_ACT = 30,
1: +  ASN1_OP_MAYBE_ACT = 31,
1: +  ASN1_OP_END_SEQ = 32,
1: +  ASN1_OP_END_SET = 33,
1: +  ASN1_OP_END_SEQ_OF = 34,
1: +  ASN1_OP_END_SET_OF = 35,
1: +  ASN1_OP_END_SEQ_ACT = 36,
1: +  ASN1_OP_END_SET_ACT = 37,
1: +  ASN1_OP_END_SEQ_OF_ACT = 38,
1: +  ASN1_OP_END_SET_OF_ACT = 39,
1: +  ASN1_OP_RETURN = 40,
1: +  ASN1_OP__NR = 41,
1:  };
1:  
1:  enum rsapubkey_actions {
1: -	ACT_rsa_get_e = 0,
1: -	ACT_rsa_get_n = 1,
1: -	NR__rsapubkey_actions = 2,
1: +  ACT_rsa_get_e = 0,
1: +  ACT_rsa_get_n = 1,
1: +  NR__rsapubkey_actions = 2,
1:  };
1:  
1:  enum rsaprivkey_actions {
1: -	ACT_rsa_get_d = 0,
1: -	ACT_rsa_get_dp = 1,
1: -	ACT_rsa_get_dq = 2,
1: -	ACT_rsa_get_e___2 = 3,
1: -	ACT_rsa_get_n___2 = 4,
1: -	ACT_rsa_get_p = 5,
1: -	ACT_rsa_get_q = 6,
1: -	ACT_rsa_get_qinv = 7,
1: -	NR__rsaprivkey_actions = 8,
1: +  ACT_rsa_get_d = 0,
1: +  ACT_rsa_get_dp = 1,
1: +  ACT_rsa_get_dq = 2,
1: +  ACT_rsa_get_e___2 = 3,
1: +  ACT_rsa_get_n___2 = 4,
1: +  ACT_rsa_get_p = 5,
1: +  ACT_rsa_get_q = 6,
1: +  ACT_rsa_get_qinv = 7,
1: +  NR__rsaprivkey_actions = 8,
1:  };
1:  
1:  typedef long unsigned int mpi_limb_t;
1:  
1:  struct gcry_mpi {
1: -	int alloced;
1: -	int nlimbs;
1: -	int nbits;
1: -	int sign;
1: -	unsigned int flags;
1: -	mpi_limb_t *d;
1: +  int alloced;
1: +  int nlimbs;
1: +  int nbits;
1: +  int sign;
1: +  unsigned int flags;
1: +  mpi_limb_t *d;
1:  };
1:  
1:  typedef struct gcry_mpi *MPI;
1:  
1:  struct rsa_key {
1: -	const u8 *n;
1: -	const u8 *e;
1: -	const u8 *d;
1: -	const u8 *p;
1: -	const u8 *q;
1: -	const u8 *dp;
1: -	const u8 *dq;
1: -	const u8 *qinv;
1: -	size_t n_sz;
1: -	size_t e_sz;
1: -	size_t d_sz;
1: -	size_t p_sz;
1: -	size_t q_sz;
1: -	size_t dp_sz;
1: -	size_t dq_sz;
1: -	size_t qinv_sz;
1: +  const u8 *n;
1: +  const u8 *e;
1: +  const u8 *d;
1: +  const u8 *p;
1: +  const u8 *q;
1: +  const u8 *dp;
1: +  const u8 *dq;
1: +  const u8 *qinv;
1: +  size_t n_sz;
1: +  size_t e_sz;
1: +  size_t d_sz;
1: +  size_t p_sz;
1: +  size_t q_sz;
1: +  size_t dp_sz;
1: +  size_t dq_sz;
1: +  size_t qinv_sz;
1:  };
1:  
1:  struct rsa_mpi_key {
1: -	MPI n;
1: -	MPI e;
1: -	MPI d;
1: +  MPI n;
1: +  MPI e;
1: +  MPI d;
1:  };
1:  
1:  struct asn1_decoder___2;
1:  
1:  struct rsa_asn1_template {
1: -	const char *name;
1: -	const u8 *data;
1: -	size_t size;
1: +  const char *name;
1: +  const u8 *data;
1: +  size_t size;
1:  };
1:  
1:  struct pkcs1pad_ctx {
1: -	struct crypto_akcipher *child;
1: -	unsigned int key_size;
1: +  struct crypto_akcipher *child;
1: +  unsigned int key_size;
1:  };
1:  
1:  struct pkcs1pad_inst_ctx {
1: -	struct crypto_akcipher_spawn spawn;
1: -	const struct rsa_asn1_template *digest_info;
1: +  struct crypto_akcipher_spawn spawn;
1: +  const struct rsa_asn1_template *digest_info;
1:  };
1:  
1:  struct pkcs1pad_request {
1: -	struct scatterlist in_sg[2];
1: -	struct scatterlist out_sg[1];
1: -	uint8_t *in_buf;
1: -	uint8_t *out_buf;
1: -	struct akcipher_request child_req;
1: +  struct scatterlist in_sg[2];
1: +  struct scatterlist out_sg[1];
1: +  uint8_t *in_buf;
1: +  uint8_t *out_buf;
1: +  struct akcipher_request child_req;
1:  };
1:  
1:  struct crypto_report_acomp {
1: -	char type[64];
1: +  char type[64];
1:  };
1:  
1:  struct acomp_req {
1: -	struct crypto_async_request base;
1: -	struct scatterlist *src;
1: -	struct scatterlist *dst;
1: -	unsigned int slen;
1: -	unsigned int dlen;
1: -	u32 flags;
1: -	void *__ctx[0];
1: +  struct crypto_async_request base;
1: +  struct scatterlist *src;
1: +  struct scatterlist *dst;
1: +  unsigned int slen;
1: +  unsigned int dlen;
1: +  u32 flags;
1: +  void *__ctx[0];
1:  };
1:  
1:  struct crypto_acomp {
1: -	int (*compress)(struct acomp_req *);
1: -	int (*decompress)(struct acomp_req *);
1: -	void (*dst_free)(struct scatterlist *);
1: -	unsigned int reqsize;
1: -	struct crypto_tfm base;
1: +  int (*compress)(struct acomp_req *);
1: +  int (*decompress)(struct acomp_req *);
1: +  void (*dst_free)(struct scatterlist *);
1: +  unsigned int reqsize;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct acomp_alg {
1: -	int (*compress)(struct acomp_req *);
1: -	int (*decompress)(struct acomp_req *);
1: -	void (*dst_free)(struct scatterlist *);
1: -	int (*init)(struct crypto_acomp *);
1: -	void (*exit)(struct crypto_acomp *);
1: -	unsigned int reqsize;
1: -	struct crypto_alg base;
1: +  int (*compress)(struct acomp_req *);
1: +  int (*decompress)(struct acomp_req *);
1: +  void (*dst_free)(struct scatterlist *);
1: +  int (*init)(struct crypto_acomp *);
1: +  void (*exit)(struct crypto_acomp *);
1: +  unsigned int reqsize;
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct crypto_report_comp {
1: -	char type[64];
1: +  char type[64];
1:  };
1:  
1:  struct crypto_scomp {
1: -	struct crypto_tfm base;
1: +  struct crypto_tfm base;
1:  };
1:  
1:  struct scomp_alg {
1: -	void * (*alloc_ctx)(struct crypto_scomp *);
1: -	void (*free_ctx)(struct crypto_scomp *, void *);
1: -	int (*compress)(struct crypto_scomp *, const u8 *, unsigned int, u8 *, unsigned int *, void *);
1: -	int (*decompress)(struct crypto_scomp *, const u8 *, unsigned int, u8 *, unsigned int *, void *);
1: -	struct crypto_alg base;
1: +  void *(*alloc_ctx)(struct crypto_scomp *);
1: +  void (*free_ctx)(struct crypto_scomp *, void *);
1: +  int (*compress)(struct crypto_scomp *, const u8 *, unsigned int, u8 *,
1: +                  unsigned int *, void *);
1: +  int (*decompress)(struct crypto_scomp *, const u8 *, unsigned int, u8 *,
1: +                    unsigned int *, void *);
1: +  struct crypto_alg base;
1:  };
1:  
1:  struct scomp_scratch {
1: -	spinlock_t lock;
1: -	void *src;
1: -	void *dst;
1: +  spinlock_t lock;
1: +  void *src;
1: +  void *dst;
1:  };
1:  
1:  struct cryptomgr_param {
1: -	struct rtattr *tb[34];
1: -	struct {
1: -		struct rtattr attr;
1: -		struct crypto_attr_type data;
1: -	} type;
1: -	union {
1: -		struct rtattr attr;
1: -		struct {
1: -			struct rtattr attr;
1: -			struct crypto_attr_alg data;
1: -		} alg;
1: -		struct {
1: -			struct rtattr attr;
1: -			struct crypto_attr_u32 data;
1: -		} nu32;
1: -	} attrs[32];
1: -	char template[128];
1: -	struct crypto_larval *larval;
1: -	u32 otype;
1: -	u32 omask;
1: +  struct rtattr *tb[34];
1: +  struct {
1: +    struct rtattr attr;
1: +    struct crypto_attr_type data;
1: +  } type;
1: +  union {
1: +    struct rtattr attr;
1: +    struct {
1: +      struct rtattr attr;
1: +      struct crypto_attr_alg data;
1: +    } alg;
1: +    struct {
1: +      struct rtattr attr;
1: +      struct crypto_attr_u32 data;
1: +    } nu32;
1: +  } attrs[32];
1: +  char template[128];
1: +  struct crypto_larval *larval;
1: +  u32 otype;
1: +  u32 omask;
1:  };
1:  
1:  struct crypto_test_param {
1: -	char driver[128];
1: -	char alg[128];
1: -	u32 type;
1: +  char driver[128];
1: +  char alg[128];
1: +  u32 type;
1:  };
1:  
1:  struct cmac_tfm_ctx {
1: -	struct crypto_cipher *child;
1: -	u8 ctx[0];
1: +  struct crypto_cipher *child;
1: +  u8 ctx[0];
1:  };
1:  
1:  struct cmac_desc_ctx {
1: -	unsigned int len;
1: -	u8 ctx[0];
1: +  unsigned int len;
1: +  u8 ctx[0];
1:  };
1:  
1:  struct hmac_ctx {
1: -	struct crypto_shash *hash;
1: +  struct crypto_shash *hash;
1:  };
1:  
1:  struct md5_state {
1: -	u32 hash[4];
1: -	u32 block[16];
1: -	u64 byte_count;
1: +  u32 hash[4];
1: +  u32 block[16];
1: +  u64 byte_count;
1:  };
1:  
1:  struct sha1_state {
1: -	u32 state[5];
1: -	u64 count;
1: -	u8 buffer[64];
1: +  u32 state[5];
1: +  u64 count;
1: +  u8 buffer[64];
1:  };
1:  
1:  typedef void sha1_block_fn(struct sha1_state *, const u8 *, int);
1:  
1:  struct sha256_state {
1: -	u32 state[8];
1: -	u64 count;
1: -	u8 buf[64];
1: +  u32 state[8];
1: +  u64 count;
1: +  u8 buf[64];
1:  };
1:  
1:  enum blake2b_constant {
1: -	BLAKE2B_BLOCKBYTES = 128,
1: -	BLAKE2B_KEYBYTES = 64,
1: +  BLAKE2B_BLOCKBYTES = 128,
1: +  BLAKE2B_KEYBYTES = 64,
1:  };
1:  
1:  struct blake2b_state {
1: -	u64 h[8];
1: -	u64 t[2];
1: -	u64 f[2];
1: -	u8 buf[128];
1: -	size_t buflen;
1: +  u64 h[8];
1: +  u64 t[2];
1: +  u64 f[2];
1: +  u8 buf[128];
1: +  size_t buflen;
1:  };
1:  
1:  struct blake2b_tfm_ctx {
1: -	u8 key[64];
1: -	unsigned int keylen;
1: +  u8 key[64];
1: +  unsigned int keylen;
1:  };
1:  
1:  typedef struct {
1: -	u64 a;
1: -	u64 b;
1: +  u64 a;
1: +  u64 b;
1:  } u128;
1:  
1:  typedef struct {
1: -	__be64 a;
1: -	__be64 b;
1: +  __be64 a;
1: +  __be64 b;
1:  } be128;
1:  
1:  typedef struct {
1: -	__le64 b;
1: -	__le64 a;
1: +  __le64 b;
1: +  __le64 a;
1:  } le128;
1:  
1:  struct gf128mul_4k {
1: -	be128 t[256];
1: +  be128 t[256];
1:  };
1:  
1:  struct gf128mul_64k {
1: -	struct gf128mul_4k *t[16];
1: +  struct gf128mul_4k *t[16];
1:  };
1:  
1:  struct crypto_rfc3686_ctx {
1: -	struct crypto_skcipher *child;
1: -	u8 nonce[4];
1: +  struct crypto_skcipher *child;
1: +  u8 nonce[4];
1:  };
1:  
1:  struct crypto_rfc3686_req_ctx {
1: -	u8 iv[16];
1: -	struct skcipher_request subreq;
1: +  u8 iv[16];
1: +  struct skcipher_request subreq;
1:  };
1:  
1:  struct gcm_instance_ctx {
1: -	struct crypto_skcipher_spawn ctr;
1: -	struct crypto_ahash_spawn ghash;
1: +  struct crypto_skcipher_spawn ctr;
1: +  struct crypto_ahash_spawn ghash;
1:  };
1:  
1:  struct crypto_gcm_ctx {
1: -	struct crypto_skcipher *ctr;
1: -	struct crypto_ahash *ghash;
1: +  struct crypto_skcipher *ctr;
1: +  struct crypto_ahash *ghash;
1:  };
1:  
1:  struct crypto_rfc4106_ctx {
1: -	struct crypto_aead *child;
1: -	u8 nonce[4];
1: +  struct crypto_aead *child;
1: +  u8 nonce[4];
1:  };
1:  
1:  struct crypto_rfc4106_req_ctx {
1: -	struct scatterlist src[3];
1: -	struct scatterlist dst[3];
1: -	struct aead_request subreq;
1: +  struct scatterlist src[3];
1: +  struct scatterlist dst[3];
1: +  struct aead_request subreq;
1:  };
1:  
1:  struct crypto_rfc4543_instance_ctx {
1: -	struct crypto_aead_spawn aead;
1: +  struct crypto_aead_spawn aead;
1:  };
1:  
1:  struct crypto_rfc4543_ctx {
1: -	struct crypto_aead *child;
1: -	struct crypto_sync_skcipher *null;
1: -	u8 nonce[4];
1: +  struct crypto_aead *child;
1: +  struct crypto_sync_skcipher *null;
1: +  u8 nonce[4];
1:  };
1:  
1:  struct crypto_rfc4543_req_ctx {
1: -	struct aead_request subreq;
1: +  struct aead_request subreq;
1:  };
1:  
1:  struct crypto_gcm_ghash_ctx {
1: -	unsigned int cryptlen;
1: -	struct scatterlist *src;
1: -	int (*complete)(struct aead_request *, u32);
1: +  unsigned int cryptlen;
1: +  struct scatterlist *src;
1: +  int (*complete)(struct aead_request *, u32);
1:  };
1:  
1:  struct crypto_gcm_req_priv_ctx {
1: -	u8 iv[16];
1: -	u8 auth_tag[16];
1: -	u8 iauth_tag[16];
1: -	struct scatterlist src[3];
1: -	struct scatterlist dst[3];
1: -	struct scatterlist sg;
1: -	struct crypto_gcm_ghash_ctx ghash_ctx;
1: -	union {
1: -		struct ahash_request ahreq;
1: -		struct skcipher_request skreq;
1: -	} u;
1: +  u8 iv[16];
1: +  u8 auth_tag[16];
1: +  u8 iauth_tag[16];
1: +  struct scatterlist src[3];
1: +  struct scatterlist dst[3];
1: +  struct scatterlist sg;
1: +  struct crypto_gcm_ghash_ctx ghash_ctx;
1: +  union {
1: +    struct ahash_request ahreq;
1: +    struct skcipher_request skreq;
1: +  } u;
1:  };
1:  
1:  struct ccm_instance_ctx {
1: -	struct crypto_skcipher_spawn ctr;
1: -	struct crypto_ahash_spawn mac;
1: +  struct crypto_skcipher_spawn ctr;
1: +  struct crypto_ahash_spawn mac;
1:  };
1:  
1:  struct crypto_ccm_ctx {
1: -	struct crypto_ahash *mac;
1: -	struct crypto_skcipher *ctr;
1: +  struct crypto_ahash *mac;
1: +  struct crypto_skcipher *ctr;
1:  };
1:  
1:  struct crypto_rfc4309_ctx {
1: -	struct crypto_aead *child;
1: -	u8 nonce[3];
1: +  struct crypto_aead *child;
1: +  u8 nonce[3];
1:  };
1:  
1:  struct crypto_rfc4309_req_ctx {
1: -	struct scatterlist src[3];
1: -	struct scatterlist dst[3];
1: -	struct aead_request subreq;
1: +  struct scatterlist src[3];
1: +  struct scatterlist dst[3];
1: +  struct aead_request subreq;
1:  };
1:  
1:  struct crypto_ccm_req_priv_ctx {
1: -	u8 odata[16];
1: -	u8 idata[16];
1: -	u8 auth_tag[16];
1: -	u32 flags;
1: -	struct scatterlist src[3];
1: -	struct scatterlist dst[3];
1: -	union {
1: -		struct ahash_request ahreq;
1: -		struct skcipher_request skreq;
1: -	};
1: +  u8 odata[16];
1: +  u8 idata[16];
1: +  u8 auth_tag[16];
1: +  u32 flags;
1: +  struct scatterlist src[3];
1: +  struct scatterlist dst[3];
1: +  union {
1: +    struct ahash_request ahreq;
1: +    struct skcipher_request skreq;
1: +  };
1:  };
1:  
1:  struct cbcmac_tfm_ctx {
1: -	struct crypto_cipher *child;
1: +  struct crypto_cipher *child;
1:  };
1:  
1:  struct cbcmac_desc_ctx {
1: -	unsigned int len;
1: +  unsigned int len;
1:  };
1:  
1:  struct crypto_aes_ctx {
1: -	u32 key_enc[60];
1: -	u32 key_dec[60];
1: -	u32 key_length;
1: +  u32 key_enc[60];
1: +  u32 key_dec[60];
1: +  u32 key_length;
1:  };
1:  
1:  struct chksum_ctx {
1: -	u32 key;
1: +  u32 key;
1:  };
1:  
1:  struct chksum_desc_ctx {
1: -	u32 crc;
1: +  u32 crc;
1:  };
1:  
1:  struct chksum_desc_ctx___2 {
1: -	__u16 crc;
1: +  __u16 crc;
1:  };
1:  
1:  struct xxh64_state {
1: -	uint64_t total_len;
1: -	uint64_t v1;
1: -	uint64_t v2;
1: -	uint64_t v3;
1: -	uint64_t v4;
1: -	uint64_t mem64[4];
1: -	uint32_t memsize;
1: +  uint64_t total_len;
1: +  uint64_t v1;
1: +  uint64_t v2;
1: +  uint64_t v3;
1: +  uint64_t v4;
1: +  uint64_t mem64[4];
1: +  uint32_t memsize;
1:  };
1:  
1:  struct xxhash64_tfm_ctx {
1: -	u64 seed;
1: +  u64 seed;
1:  };
1:  
1:  struct xxhash64_desc_ctx {
1: -	struct xxh64_state xxhstate;
1: +  struct xxh64_state xxhstate;
1:  };
1:  
1:  struct crypto_report_rng {
1: -	char type[64];
1: -	unsigned int seedsize;
1: +  char type[64];
1: +  unsigned int seedsize;
1:  };
1:  
1:  struct random_ready_callback {
1: -	struct list_head list;
1: -	void (*func)(struct random_ready_callback *);
1: -	struct module *owner;
1: +  struct list_head list;
1: +  void (*func)(struct random_ready_callback *);
1: +  struct module *owner;
1:  };
1:  
1:  struct drbg_string {
1: -	const unsigned char *buf;
1: -	size_t len;
1: -	struct list_head list;
1: +  const unsigned char *buf;
1: +  size_t len;
1: +  struct list_head list;
1:  };
1:  
1:  typedef uint32_t drbg_flag_t;
1:  
1:  struct drbg_core {
1: -	drbg_flag_t flags;
1: -	__u8 statelen;
1: -	__u8 blocklen_bytes;
1: -	char cra_name[128];
1: -	char backend_cra_name[128];
1: +  drbg_flag_t flags;
1: +  __u8 statelen;
1: +  __u8 blocklen_bytes;
1: +  char cra_name[128];
1: +  char backend_cra_name[128];
1:  };
1:  
1:  struct drbg_state;
1:  
1:  struct drbg_state_ops {
1: -	int (*update)(struct drbg_state *, struct list_head *, int);
1: -	int (*generate)(struct drbg_state *, unsigned char *, unsigned int, struct list_head *);
1: -	int (*crypto_init)(struct drbg_state *);
1: -	int (*crypto_fini)(struct drbg_state *);
1: +  int (*update)(struct drbg_state *, struct list_head *, int);
1: +  int (*generate)(struct drbg_state *, unsigned char *, unsigned int,
1: +                  struct list_head *);
1: +  int (*crypto_init)(struct drbg_state *);
1: +  int (*crypto_fini)(struct drbg_state *);
1:  };
1:  
1:  struct drbg_state {
1: -	struct mutex drbg_mutex;
1: -	unsigned char *V;
1: -	unsigned char *Vbuf;
1: -	unsigned char *C;
1: -	unsigned char *Cbuf;
1: -	size_t reseed_ctr;
1: -	size_t reseed_threshold;
1: -	unsigned char *scratchpad;
1: -	unsigned char *scratchpadbuf;
1: -	void *priv_data;
1: -	struct crypto_skcipher *ctr_handle;
1: -	struct skcipher_request *ctr_req;
1: -	__u8 *outscratchpadbuf;
1: -	__u8 *outscratchpad;
1: -	struct crypto_wait ctr_wait;
1: -	struct scatterlist sg_in;
1: -	struct scatterlist sg_out;
1: -	bool seeded;
1: -	bool pr;
1: -	bool fips_primed;
1: -	unsigned char *prev;
1: -	struct work_struct seed_work;
1: -	struct crypto_rng *jent;
1: -	const struct drbg_state_ops *d_ops;
1: -	const struct drbg_core *core;
1: -	struct drbg_string test_data;
1: -	struct random_ready_callback random_ready;
1: +  struct mutex drbg_mutex;
1: +  unsigned char *V;
1: +  unsigned char *Vbuf;
1: +  unsigned char *C;
1: +  unsigned char *Cbuf;
1: +  size_t reseed_ctr;
1: +  size_t reseed_threshold;
1: +  unsigned char *scratchpad;
1: +  unsigned char *scratchpadbuf;
1: +  void *priv_data;
1: +  struct crypto_skcipher *ctr_handle;
1: +  struct skcipher_request *ctr_req;
1: +  __u8 *outscratchpadbuf;
1: +  __u8 *outscratchpad;
1: +  struct crypto_wait ctr_wait;
1: +  struct scatterlist sg_in;
1: +  struct scatterlist sg_out;
1: +  bool seeded;
1: +  bool pr;
1: +  bool fips_primed;
1: +  unsigned char *prev;
1: +  struct work_struct seed_work;
1: +  struct crypto_rng *jent;
1: +  const struct drbg_state_ops *d_ops;
1: +  const struct drbg_core *core;
1: +  struct drbg_string test_data;
1: +  struct random_ready_callback random_ready;
1:  };
1:  
1:  enum drbg_prefixes {
1: -	DRBG_PREFIX0 = 0,
1: -	DRBG_PREFIX1 = 1,
1: -	DRBG_PREFIX2 = 2,
1: -	DRBG_PREFIX3 = 3,
1: +  DRBG_PREFIX0 = 0,
1: +  DRBG_PREFIX1 = 1,
1: +  DRBG_PREFIX2 = 2,
1: +  DRBG_PREFIX3 = 3,
1:  };
1:  
1:  struct sdesc {
1: -	struct shash_desc shash;
1: -	char ctx[0];
1: +  struct shash_desc shash;
1: +  char ctx[0];
1:  };
1:  
1:  struct rand_data {
1: -	__u64 data;
1: -	__u64 old_data;
1: -	__u64 prev_time;
1: -	__u64 last_delta;
1: -	__s64 last_delta2;
1: -	unsigned int osr;
1: -	unsigned char *mem;
1: -	unsigned int memlocation;
1: -	unsigned int memblocks;
1: -	unsigned int memblocksize;
1: -	unsigned int memaccessloops;
1: -	int rct_count;
1: -	unsigned int apt_observations;
1: -	unsigned int apt_count;
1: -	unsigned int apt_base;
1: -	unsigned int apt_base_set: 1;
1: -	unsigned int health_failure: 1;
1: +  __u64 data;
1: +  __u64 old_data;
1: +  __u64 prev_time;
1: +  __u64 last_delta;
1: +  __s64 last_delta2;
1: +  unsigned int osr;
1: +  unsigned char *mem;
1: +  unsigned int memlocation;
1: +  unsigned int memblocks;
1: +  unsigned int memblocksize;
1: +  unsigned int memaccessloops;
1: +  int rct_count;
1: +  unsigned int apt_observations;
1: +  unsigned int apt_count;
1: +  unsigned int apt_base;
1: +  unsigned int apt_base_set : 1;
1: +  unsigned int health_failure : 1;
1:  };
1:  
1:  struct rand_data___2;
1:  
1:  struct jitterentropy {
1: -	spinlock_t jent_lock;
1: -	struct rand_data___2 *entropy_collector;
1: -	unsigned int reset_cnt;
1: +  spinlock_t jent_lock;
1: +  struct rand_data___2 *entropy_collector;
1: +  unsigned int reset_cnt;
1:  };
1:  
1:  struct ghash_ctx {
1: -	struct gf128mul_4k *gf128;
1: +  struct gf128mul_4k *gf128;
1:  };
1:  
1:  struct ghash_desc_ctx {
1: -	u8 buffer[16];
1: -	u32 bytes;
1: +  u8 buffer[16];
1: +  u32 bytes;
1:  };
1:  
1:  struct sockaddr_alg {
1: -	__u16 salg_family;
1: -	__u8 salg_type[14];
1: -	__u32 salg_feat;
1: -	__u32 salg_mask;
1: -	__u8 salg_name[64];
1: +  __u16 salg_family;
1: +  __u8 salg_type[14];
1: +  __u32 salg_feat;
1: +  __u32 salg_mask;
1: +  __u8 salg_name[64];
1:  };
1:  
1:  struct af_alg_iv {
1: -	__u32 ivlen;
1: -	__u8 iv[0];
1: +  __u32 ivlen;
1: +  __u8 iv[0];
1:  };
1:  
1:  struct cmsghdr {
1: -	__kernel_size_t cmsg_len;
1: -	int cmsg_level;
1: -	int cmsg_type;
1: +  __kernel_size_t cmsg_len;
1: +  int cmsg_level;
1: +  int cmsg_type;
1:  };
1:  
1:  struct net_proto_family {
1: -	int family;
1: -	int (*create)(struct net *, struct socket *, int, int);
1: -	struct module *owner;
1: +  int family;
1: +  int (*create)(struct net *, struct socket *, int, int);
1: +  struct module *owner;
1:  };
1:  
1:  enum {
1: -	SOCK_WAKE_IO = 0,
1: -	SOCK_WAKE_WAITD = 1,
1: -	SOCK_WAKE_SPACE = 2,
1: -	SOCK_WAKE_URG = 3,
1: +  SOCK_WAKE_IO = 0,
1: +  SOCK_WAKE_WAITD = 1,
1: +  SOCK_WAKE_SPACE = 2,
1: +  SOCK_WAKE_URG = 3,
1:  };
1:  
1:  struct af_alg_type;
1:  
1:  struct alg_sock {
1: -	struct sock sk;
1: -	struct sock *parent;
1: -	atomic_t refcnt;
1: -	atomic_t nokey_refcnt;
1: -	const struct af_alg_type *type;
1: -	void *private;
1: +  struct sock sk;
1: +  struct sock *parent;
1: +  atomic_t refcnt;
1: +  atomic_t nokey_refcnt;
1: +  const struct af_alg_type *type;
1: +  void *private;
1:  };
1:  
1:  struct af_alg_type {
1: -	void * (*bind)(const char *, u32, u32);
1: -	void (*release)(void *);
1: -	int (*setkey)(void *, const u8 *, unsigned int);
1: -	int (*setentropy)(void *, sockptr_t, unsigned int);
1: -	int (*accept)(void *, struct sock *);
1: -	int (*accept_nokey)(void *, struct sock *);
1: -	int (*setauthsize)(void *, unsigned int);
1: -	struct proto_ops *ops;
1: -	struct proto_ops *ops_nokey;
1: -	struct module *owner;
1: -	char name[14];
1: +  void *(*bind)(const char *, u32, u32);
1: +  void (*release)(void *);
1: +  int (*setkey)(void *, const u8 *, unsigned int);
1: +  int (*setentropy)(void *, sockptr_t, unsigned int);
1: +  int (*accept)(void *, struct sock *);
1: +  int (*accept_nokey)(void *, struct sock *);
1: +  int (*setauthsize)(void *, unsigned int);
1: +  struct proto_ops *ops;
1: +  struct proto_ops *ops_nokey;
1: +  struct module *owner;
1: +  char name[14];
1:  };
1:  
1:  struct af_alg_control {
1: -	struct af_alg_iv *iv;
1: -	int op;
1: -	unsigned int aead_assoclen;
1: +  struct af_alg_iv *iv;
1: +  int op;
1: +  unsigned int aead_assoclen;
1:  };
1:  
1:  struct af_alg_sgl {
1: -	struct scatterlist sg[17];
1: -	struct page *pages[16];
1: -	unsigned int npages;
1: +  struct scatterlist sg[17];
1: +  struct page *pages[16];
1: +  unsigned int npages;
1:  };
1:  
1:  struct af_alg_tsgl {
1: -	struct list_head list;
1: -	unsigned int cur;
1: -	struct scatterlist sg[0];
1: +  struct list_head list;
1: +  unsigned int cur;
1: +  struct scatterlist sg[0];
1:  };
1:  
1:  struct af_alg_rsgl {
1: -	struct af_alg_sgl sgl;
1: -	struct list_head list;
1: -	size_t sg_num_bytes;
1: +  struct af_alg_sgl sgl;
1: +  struct list_head list;
1: +  size_t sg_num_bytes;
1:  };
1:  
1:  struct af_alg_async_req {
1: -	struct kiocb *iocb;
1: -	struct sock *sk;
1: -	struct af_alg_rsgl first_rsgl;
1: -	struct af_alg_rsgl *last_rsgl;
1: -	struct list_head rsgl_list;
1: -	struct scatterlist *tsgl;
1: -	unsigned int tsgl_entries;
1: -	unsigned int outlen;
1: -	unsigned int areqlen;
1: -	union {
1: -		struct aead_request aead_req;
1: -		struct skcipher_request skcipher_req;
1: -	} cra_u;
1: +  struct kiocb *iocb;
1: +  struct sock *sk;
1: +  struct af_alg_rsgl first_rsgl;
1: +  struct af_alg_rsgl *last_rsgl;
1: +  struct list_head rsgl_list;
1: +  struct scatterlist *tsgl;
1: +  unsigned int tsgl_entries;
1: +  unsigned int outlen;
1: +  unsigned int areqlen;
1: +  union {
1: +    struct aead_request aead_req;
1: +    struct skcipher_request skcipher_req;
1: +  } cra_u;
1:  };
1:  
1:  struct af_alg_ctx {
1: -	struct list_head tsgl_list;
1: -	void *iv;
1: -	size_t aead_assoclen;
1: -	struct crypto_wait wait;
1: -	size_t used;
1: -	atomic_t rcvused;
1: -	bool more;
1: -	bool merge;
1: -	bool enc;
1: -	bool init;
1: -	unsigned int len;
1: +  struct list_head tsgl_list;
1: +  void *iv;
1: +  size_t aead_assoclen;
1: +  struct crypto_wait wait;
1: +  size_t used;
1: +  atomic_t rcvused;
1: +  bool more;
1: +  bool merge;
1: +  bool enc;
1: +  bool init;
1: +  unsigned int len;
1:  };
1:  
1:  struct alg_type_list {
1: -	const struct af_alg_type *type;
1: -	struct list_head list;
1: +  const struct af_alg_type *type;
1: +  struct list_head list;
1:  };
1:  
1:  struct hash_ctx {
1: -	struct af_alg_sgl sgl;
1: -	u8 *result;
1: -	struct crypto_wait wait;
1: -	unsigned int len;
1: -	bool more;
1: -	struct ahash_request req;
1: +  struct af_alg_sgl sgl;
1: +  u8 *result;
1: +  struct crypto_wait wait;
1: +  unsigned int len;
1: +  bool more;
1: +  struct ahash_request req;
1:  };
1:  
1:  struct xor_block_template {
1: -	struct xor_block_template *next;
1: -	const char *name;
1: -	int speed;
1: -	void (*do_2)(long unsigned int, long unsigned int *, long unsigned int *);
1: -	void (*do_3)(long unsigned int, long unsigned int *, long unsigned int *, long unsigned int *);
1: -	void (*do_4)(long unsigned int, long unsigned int *, long unsigned int *, long unsigned int *, long unsigned int *);
1: -	void (*do_5)(long unsigned int, long unsigned int *, long unsigned int *, long unsigned int *, long unsigned int *, long unsigned int *);
1: +  struct xor_block_template *next;
1: +  const char *name;
1: +  int speed;
1: +  void (*do_2)(long unsigned int, long unsigned int *, long unsigned int *);
1: +  void (*do_3)(long unsigned int, long unsigned int *, long unsigned int *,
1: +               long unsigned int *);
1: +  void (*do_4)(long unsigned int, long unsigned int *, long unsigned int *,
1: +               long unsigned int *, long unsigned int *);
1: +  void (*do_5)(long unsigned int, long unsigned int *, long unsigned int *,
1: +               long unsigned int *, long unsigned int *, long unsigned int *);
1:  };
1:  
1:  enum asymmetric_payload_bits {
1: -	asym_crypto = 0,
1: -	asym_subtype = 1,
1: -	asym_key_ids = 2,
1: -	asym_auth = 3,
1: +  asym_crypto = 0,
1: +  asym_subtype = 1,
1: +  asym_key_ids = 2,
1: +  asym_auth = 3,
1:  };
1:  
1:  struct asymmetric_key_id {
1: -	short unsigned int len;
1: -	unsigned char data[0];
1: +  short unsigned int len;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct asymmetric_key_ids {
1: -	void *id[2];
1: +  void *id[2];
1:  };
1:  
1:  struct public_key_signature;
1:  
1:  struct asymmetric_key_subtype {
1: -	struct module *owner;
1: -	const char *name;
1: -	short unsigned int name_len;
1: -	void (*describe)(const struct key *, struct seq_file *);
1: -	void (*destroy)(void *, void *);
1: -	int (*query)(const struct kernel_pkey_params *, struct kernel_pkey_query *);
1: -	int (*eds_op)(struct kernel_pkey_params *, const void *, void *);
1: -	int (*verify_signature)(const struct key *, const struct public_key_signature *);
1: +  struct module *owner;
1: +  const char *name;
1: +  short unsigned int name_len;
1: +  void (*describe)(const struct key *, struct seq_file *);
1: +  void (*destroy)(void *, void *);
1: +  int (*query)(const struct kernel_pkey_params *, struct kernel_pkey_query *);
1: +  int (*eds_op)(struct kernel_pkey_params *, const void *, void *);
1: +  int (*verify_signature)(const struct key *,
1: +                          const struct public_key_signature *);
1:  };
1:  
1:  struct public_key_signature {
1: -	struct asymmetric_key_id *auth_ids[2];
1: -	u8 *s;
1: -	u32 s_size;
1: -	u8 *digest;
1: -	u8 digest_size;
1: -	const char *pkey_algo;
1: -	const char *hash_algo;
1: -	const char *encoding;
1: -	const void *data;
1: -	unsigned int data_size;
1: +  struct asymmetric_key_id *auth_ids[2];
1: +  u8 *s;
1: +  u32 s_size;
1: +  u8 *digest;
1: +  u8 digest_size;
1: +  const char *pkey_algo;
1: +  const char *hash_algo;
1: +  const char *encoding;
1: +  const void *data;
1: +  unsigned int data_size;
1:  };
1:  
1:  struct asymmetric_key_parser {
1: -	struct list_head link;
1: -	struct module *owner;
1: -	const char *name;
1: -	int (*parse)(struct key_preparsed_payload *);
1: +  struct list_head link;
1: +  struct module *owner;
1: +  const char *name;
1: +  int (*parse)(struct key_preparsed_payload *);
1:  };
1:  
1:  enum OID {
1: -	OID_id_dsa_with_sha1 = 0,
1: -	OID_id_dsa = 1,
1: -	OID_id_ecdsa_with_sha1 = 2,
1: -	OID_id_ecPublicKey = 3,
1: -	OID_rsaEncryption = 4,
1: -	OID_md2WithRSAEncryption = 5,
1: -	OID_md3WithRSAEncryption = 6,
1: -	OID_md4WithRSAEncryption = 7,
1: -	OID_sha1WithRSAEncryption = 8,
1: -	OID_sha256WithRSAEncryption = 9,
1: -	OID_sha384WithRSAEncryption = 10,
1: -	OID_sha512WithRSAEncryption = 11,
1: -	OID_sha224WithRSAEncryption = 12,
1: -	OID_data = 13,
1: -	OID_signed_data = 14,
1: -	OID_email_address = 15,
1: -	OID_contentType = 16,
1: -	OID_messageDigest = 17,
1: -	OID_signingTime = 18,
1: -	OID_smimeCapabilites = 19,
1: -	OID_smimeAuthenticatedAttrs = 20,
1: -	OID_md2 = 21,
1: -	OID_md4 = 22,
1: -	OID_md5 = 23,
1: -	OID_msIndirectData = 24,
1: -	OID_msStatementType = 25,
1: -	OID_msSpOpusInfo = 26,
1: -	OID_msPeImageDataObjId = 27,
1: -	OID_msIndividualSPKeyPurpose = 28,
1: -	OID_msOutlookExpress = 29,
1: -	OID_certAuthInfoAccess = 30,
1: -	OID_sha1 = 31,
1: -	OID_sha256 = 32,
1: -	OID_sha384 = 33,
1: -	OID_sha512 = 34,
1: -	OID_sha224 = 35,
1: -	OID_commonName = 36,
1: -	OID_surname = 37,
1: -	OID_countryName = 38,
1: -	OID_locality = 39,
1: -	OID_stateOrProvinceName = 40,
1: -	OID_organizationName = 41,
1: -	OID_organizationUnitName = 42,
1: -	OID_title = 43,
1: -	OID_description = 44,
1: -	OID_name = 45,
1: -	OID_givenName = 46,
1: -	OID_initials = 47,
1: -	OID_generationalQualifier = 48,
1: -	OID_subjectKeyIdentifier = 49,
1: -	OID_keyUsage = 50,
1: -	OID_subjectAltName = 51,
1: -	OID_issuerAltName = 52,
1: -	OID_basicConstraints = 53,
1: -	OID_crlDistributionPoints = 54,
1: -	OID_certPolicies = 55,
1: -	OID_authorityKeyIdentifier = 56,
1: -	OID_extKeyUsage = 57,
1: -	OID_gostCPSignA = 58,
1: -	OID_gostCPSignB = 59,
1: -	OID_gostCPSignC = 60,
1: -	OID_gost2012PKey256 = 61,
1: -	OID_gost2012PKey512 = 62,
1: -	OID_gost2012Digest256 = 63,
1: -	OID_gost2012Digest512 = 64,
1: -	OID_gost2012Signature256 = 65,
1: -	OID_gost2012Signature512 = 66,
1: -	OID_gostTC26Sign256A = 67,
1: -	OID_gostTC26Sign256B = 68,
1: -	OID_gostTC26Sign256C = 69,
1: -	OID_gostTC26Sign256D = 70,
1: -	OID_gostTC26Sign512A = 71,
1: -	OID_gostTC26Sign512B = 72,
1: -	OID_gostTC26Sign512C = 73,
1: -	OID_sm2 = 74,
1: -	OID_sm3 = 75,
1: -	OID_SM2_with_SM3 = 76,
1: -	OID_sm3WithRSAEncryption = 77,
1: -	OID__NR = 78,
1: +  OID_id_dsa_with_sha1 = 0,
1: +  OID_id_dsa = 1,
1: +  OID_id_ecdsa_with_sha1 = 2,
1: +  OID_id_ecPublicKey = 3,
1: +  OID_rsaEncryption = 4,
1: +  OID_md2WithRSAEncryption = 5,
1: +  OID_md3WithRSAEncryption = 6,
1: +  OID_md4WithRSAEncryption = 7,
1: +  OID_sha1WithRSAEncryption = 8,
1: +  OID_sha256WithRSAEncryption = 9,
1: +  OID_sha384WithRSAEncryption = 10,
1: +  OID_sha512WithRSAEncryption = 11,
1: +  OID_sha224WithRSAEncryption = 12,
1: +  OID_data = 13,
1: +  OID_signed_data = 14,
1: +  OID_email_address = 15,
1: +  OID_contentType = 16,
1: +  OID_messageDigest = 17,
1: +  OID_signingTime = 18,
1: +  OID_smimeCapabilites = 19,
1: +  OID_smimeAuthenticatedAttrs = 20,
1: +  OID_md2 = 21,
1: +  OID_md4 = 22,
1: +  OID_md5 = 23,
1: +  OID_msIndirectData = 24,
1: +  OID_msStatementType = 25,
1: +  OID_msSpOpusInfo = 26,
1: +  OID_msPeImageDataObjId = 27,
1: +  OID_msIndividualSPKeyPurpose = 28,
1: +  OID_msOutlookExpress = 29,
1: +  OID_certAuthInfoAccess = 30,
1: +  OID_sha1 = 31,
1: +  OID_sha256 = 32,
1: +  OID_sha384 = 33,
1: +  OID_sha512 = 34,
1: +  OID_sha224 = 35,
1: +  OID_commonName = 36,
1: +  OID_surname = 37,
1: +  OID_countryName = 38,
1: +  OID_locality = 39,
1: +  OID_stateOrProvinceName = 40,
1: +  OID_organizationName = 41,
1: +  OID_organizationUnitName = 42,
1: +  OID_title = 43,
1: +  OID_description = 44,
1: +  OID_name = 45,
1: +  OID_givenName = 46,
1: +  OID_initials = 47,
1: +  OID_generationalQualifier = 48,
1: +  OID_subjectKeyIdentifier = 49,
1: +  OID_keyUsage = 50,
1: +  OID_subjectAltName = 51,
1: +  OID_issuerAltName = 52,
1: +  OID_basicConstraints = 53,
1: +  OID_crlDistributionPoints = 54,
1: +  OID_certPolicies = 55,
1: +  OID_authorityKeyIdentifier = 56,
1: +  OID_extKeyUsage = 57,
1: +  OID_gostCPSignA = 58,
1: +  OID_gostCPSignB = 59,
1: +  OID_gostCPSignC = 60,
1: +  OID_gost2012PKey256 = 61,
1: +  OID_gost2012PKey512 = 62,
1: +  OID_gost2012Digest256 = 63,
1: +  OID_gost2012Digest512 = 64,
1: +  OID_gost2012Signature256 = 65,
1: +  OID_gost2012Signature512 = 66,
1: +  OID_gostTC26Sign256A = 67,
1: +  OID_gostTC26Sign256B = 68,
1: +  OID_gostTC26Sign256C = 69,
1: +  OID_gostTC26Sign256D = 70,
1: +  OID_gostTC26Sign512A = 71,
1: +  OID_gostTC26Sign512B = 72,
1: +  OID_gostTC26Sign512C = 73,
1: +  OID_sm2 = 74,
1: +  OID_sm3 = 75,
1: +  OID_SM2_with_SM3 = 76,
1: +  OID_sm3WithRSAEncryption = 77,
1: +  OID__NR = 78,
1:  };
1:  
1:  struct public_key {
1: -	void *key;
1: -	u32 keylen;
1: -	enum OID algo;
1: -	void *params;
1: -	u32 paramlen;
1: -	bool key_is_private;
1: -	const char *id_type;
1: -	const char *pkey_algo;
1: +  void *key;
1: +  u32 keylen;
1: +  enum OID algo;
1: +  void *params;
1: +  u32 paramlen;
1: +  bool key_is_private;
1: +  const char *id_type;
1: +  const char *pkey_algo;
1:  };
1:  
1:  enum x509_actions {
1: -	ACT_x509_extract_key_data = 0,
1: -	ACT_x509_extract_name_segment = 1,
1: -	ACT_x509_note_OID = 2,
1: -	ACT_x509_note_issuer = 3,
1: -	ACT_x509_note_not_after = 4,
1: -	ACT_x509_note_not_before = 5,
1: -	ACT_x509_note_params = 6,
1: -	ACT_x509_note_pkey_algo = 7,
1: -	ACT_x509_note_serial = 8,
1: -	ACT_x509_note_signature = 9,
1: -	ACT_x509_note_subject = 10,
1: -	ACT_x509_note_tbs_certificate = 11,
1: -	ACT_x509_process_extension = 12,
1: -	NR__x509_actions = 13,
1: +  ACT_x509_extract_key_data = 0,
1: +  ACT_x509_extract_name_segment = 1,
1: +  ACT_x509_note_OID = 2,
1: +  ACT_x509_note_issuer = 3,
1: +  ACT_x509_note_not_after = 4,
1: +  ACT_x509_note_not_before = 5,
1: +  ACT_x509_note_params = 6,
1: +  ACT_x509_note_pkey_algo = 7,
1: +  ACT_x509_note_serial = 8,
1: +  ACT_x509_note_signature = 9,
1: +  ACT_x509_note_subject = 10,
1: +  ACT_x509_note_tbs_certificate = 11,
1: +  ACT_x509_process_extension = 12,
1: +  NR__x509_actions = 13,
1:  };
1:  
1:  enum x509_akid_actions {
1: -	ACT_x509_akid_note_kid = 0,
1: -	ACT_x509_akid_note_name = 1,
1: -	ACT_x509_akid_note_serial = 2,
1: -	ACT_x509_extract_name_segment___2 = 3,
1: -	ACT_x509_note_OID___2 = 4,
1: -	NR__x509_akid_actions = 5,
1: +  ACT_x509_akid_note_kid = 0,
1: +  ACT_x509_akid_note_name = 1,
1: +  ACT_x509_akid_note_serial = 2,
1: +  ACT_x509_extract_name_segment___2 = 3,
1: +  ACT_x509_note_OID___2 = 4,
1: +  NR__x509_akid_actions = 5,
1:  };
1:  
1:  struct x509_certificate {
1: -	struct x509_certificate *next;
1: -	struct x509_certificate *signer;
1: -	struct public_key *pub;
1: -	struct public_key_signature *sig;
1: -	char *issuer;
1: -	char *subject;
1: -	struct asymmetric_key_id *id;
1: -	struct asymmetric_key_id *skid;
1: -	time64_t valid_from;
1: -	time64_t valid_to;
1: -	const void *tbs;
1: -	unsigned int tbs_size;
1: -	unsigned int raw_sig_size;
1: -	const void *raw_sig;
1: -	const void *raw_serial;
1: -	unsigned int raw_serial_size;
1: -	unsigned int raw_issuer_size;
1: -	const void *raw_issuer;
1: -	const void *raw_subject;
1: -	unsigned int raw_subject_size;
1: -	unsigned int raw_skid_size;
1: -	const void *raw_skid;
1: -	unsigned int index;
1: -	bool seen;
1: -	bool verified;
1: -	bool self_signed;
1: -	bool unsupported_key;
1: -	bool unsupported_sig;
1: -	bool blacklisted;
1: +  struct x509_certificate *next;
1: +  struct x509_certificate *signer;
1: +  struct public_key *pub;
1: +  struct public_key_signature *sig;
1: +  char *issuer;
1: +  char *subject;
1: +  struct asymmetric_key_id *id;
1: +  struct asymmetric_key_id *skid;
1: +  time64_t valid_from;
1: +  time64_t valid_to;
1: +  const void *tbs;
1: +  unsigned int tbs_size;
1: +  unsigned int raw_sig_size;
1: +  const void *raw_sig;
1: +  const void *raw_serial;
1: +  unsigned int raw_serial_size;
1: +  unsigned int raw_issuer_size;
1: +  const void *raw_issuer;
1: +  const void *raw_subject;
1: +  unsigned int raw_subject_size;
1: +  unsigned int raw_skid_size;
1: +  const void *raw_skid;
1: +  unsigned int index;
1: +  bool seen;
1: +  bool verified;
1: +  bool self_signed;
1: +  bool unsupported_key;
1: +  bool unsupported_sig;
1: +  bool blacklisted;
1:  };
1:  
1:  struct x509_parse_context {
1: -	struct x509_certificate *cert;
1: -	long unsigned int data;
1: -	const void *cert_start;
1: -	const void *key;
1: -	size_t key_size;
1: -	const void *params;
1: -	size_t params_size;
1: -	enum OID key_algo;
1: -	enum OID last_oid;
1: -	enum OID algo_oid;
1: -	unsigned char nr_mpi;
1: -	u8 o_size;
1: -	u8 cn_size;
1: -	u8 email_size;
1: -	u16 o_offset;
1: -	u16 cn_offset;
1: -	u16 email_offset;
1: -	unsigned int raw_akid_size;
1: -	const void *raw_akid;
1: -	const void *akid_raw_issuer;
1: -	unsigned int akid_raw_issuer_size;
1: +  struct x509_certificate *cert;
1: +  long unsigned int data;
1: +  const void *cert_start;
1: +  const void *key;
1: +  size_t key_size;
1: +  const void *params;
1: +  size_t params_size;
1: +  enum OID key_algo;
1: +  enum OID last_oid;
1: +  enum OID algo_oid;
1: +  unsigned char nr_mpi;
1: +  u8 o_size;
1: +  u8 cn_size;
1: +  u8 email_size;
1: +  u16 o_offset;
1: +  u16 cn_offset;
1: +  u16 email_offset;
1: +  unsigned int raw_akid_size;
1: +  const void *raw_akid;
1: +  const void *akid_raw_issuer;
1: +  unsigned int akid_raw_issuer_size;
1:  };
1:  
1:  enum pkcs7_actions {
1: -	ACT_pkcs7_check_content_type = 0,
1: -	ACT_pkcs7_extract_cert = 1,
1: -	ACT_pkcs7_note_OID = 2,
1: -	ACT_pkcs7_note_certificate_list = 3,
1: -	ACT_pkcs7_note_content = 4,
1: -	ACT_pkcs7_note_data = 5,
1: -	ACT_pkcs7_note_signed_info = 6,
1: -	ACT_pkcs7_note_signeddata_version = 7,
1: -	ACT_pkcs7_note_signerinfo_version = 8,
1: -	ACT_pkcs7_sig_note_authenticated_attr = 9,
1: -	ACT_pkcs7_sig_note_digest_algo = 10,
1: -	ACT_pkcs7_sig_note_issuer = 11,
1: -	ACT_pkcs7_sig_note_pkey_algo = 12,
1: -	ACT_pkcs7_sig_note_serial = 13,
1: -	ACT_pkcs7_sig_note_set_of_authattrs = 14,
1: -	ACT_pkcs7_sig_note_signature = 15,
1: -	ACT_pkcs7_sig_note_skid = 16,
1: -	NR__pkcs7_actions = 17,
1: +  ACT_pkcs7_check_content_type = 0,
1: +  ACT_pkcs7_extract_cert = 1,
1: +  ACT_pkcs7_note_OID = 2,
1: +  ACT_pkcs7_note_certificate_list = 3,
1: +  ACT_pkcs7_note_content = 4,
1: +  ACT_pkcs7_note_data = 5,
1: +  ACT_pkcs7_note_signed_info = 6,
1: +  ACT_pkcs7_note_signeddata_version = 7,
1: +  ACT_pkcs7_note_signerinfo_version = 8,
1: +  ACT_pkcs7_sig_note_authenticated_attr = 9,
1: +  ACT_pkcs7_sig_note_digest_algo = 10,
1: +  ACT_pkcs7_sig_note_issuer = 11,
1: +  ACT_pkcs7_sig_note_pkey_algo = 12,
1: +  ACT_pkcs7_sig_note_serial = 13,
1: +  ACT_pkcs7_sig_note_set_of_authattrs = 14,
1: +  ACT_pkcs7_sig_note_signature = 15,
1: +  ACT_pkcs7_sig_note_skid = 16,
1: +  NR__pkcs7_actions = 17,
1:  };
1:  
1:  struct pkcs7_signed_info {
1: -	struct pkcs7_signed_info *next;
1: -	struct x509_certificate *signer;
1: -	unsigned int index;
1: -	bool unsupported_crypto;
1: -	bool blacklisted;
1: -	const void *msgdigest;
1: -	unsigned int msgdigest_len;
1: -	unsigned int authattrs_len;
1: -	const void *authattrs;
1: -	long unsigned int aa_set;
1: -	time64_t signing_time;
1: -	struct public_key_signature *sig;
1: +  struct pkcs7_signed_info *next;
1: +  struct x509_certificate *signer;
1: +  unsigned int index;
1: +  bool unsupported_crypto;
1: +  bool blacklisted;
1: +  const void *msgdigest;
1: +  unsigned int msgdigest_len;
1: +  unsigned int authattrs_len;
1: +  const void *authattrs;
1: +  long unsigned int aa_set;
1: +  time64_t signing_time;
1: +  struct public_key_signature *sig;
1:  };
1:  
1:  struct pkcs7_message___2 {
1: -	struct x509_certificate *certs;
1: -	struct x509_certificate *crl;
1: -	struct pkcs7_signed_info *signed_infos;
1: -	u8 version;
1: -	bool have_authattrs;
1: -	enum OID data_type;
1: -	size_t data_len;
1: -	size_t data_hdrlen;
1: -	const void *data;
1: +  struct x509_certificate *certs;
1: +  struct x509_certificate *crl;
1: +  struct pkcs7_signed_info *signed_infos;
1: +  u8 version;
1: +  bool have_authattrs;
1: +  enum OID data_type;
1: +  size_t data_len;
1: +  size_t data_hdrlen;
1: +  const void *data;
1:  };
1:  
1:  struct pkcs7_parse_context {
1: -	struct pkcs7_message___2 *msg;
1: -	struct pkcs7_signed_info *sinfo;
1: -	struct pkcs7_signed_info **ppsinfo;
1: -	struct x509_certificate *certs;
1: -	struct x509_certificate **ppcerts;
1: -	long unsigned int data;
1: -	enum OID last_oid;
1: -	unsigned int x509_index;
1: -	unsigned int sinfo_index;
1: -	const void *raw_serial;
1: -	unsigned int raw_serial_size;
1: -	unsigned int raw_issuer_size;
1: -	const void *raw_issuer;
1: -	const void *raw_skid;
1: -	unsigned int raw_skid_size;
1: -	bool expect_skid;
1: +  struct pkcs7_message___2 *msg;
1: +  struct pkcs7_signed_info *sinfo;
1: +  struct pkcs7_signed_info **ppsinfo;
1: +  struct x509_certificate *certs;
1: +  struct x509_certificate **ppcerts;
1: +  long unsigned int data;
1: +  enum OID last_oid;
1: +  unsigned int x509_index;
1: +  unsigned int sinfo_index;
1: +  const void *raw_serial;
1: +  unsigned int raw_serial_size;
1: +  unsigned int raw_issuer_size;
1: +  const void *raw_issuer;
1: +  const void *raw_skid;
1: +  unsigned int raw_skid_size;
1: +  bool expect_skid;
1:  };
1:  
1:  struct biovec_slab {
1: -	int nr_vecs;
1: -	char *name;
1: -	struct kmem_cache *slab;
1: +  int nr_vecs;
1: +  char *name;
1: +  struct kmem_cache *slab;
1:  };
1:  
1:  enum rq_qos_id {
1: -	RQ_QOS_WBT = 0,
1: -	RQ_QOS_LATENCY = 1,
1: -	RQ_QOS_COST = 2,
1: +  RQ_QOS_WBT = 0,
1: +  RQ_QOS_LATENCY = 1,
1: +  RQ_QOS_COST = 2,
1:  };
1:  
1:  struct rq_qos_ops;
1:  
1:  struct rq_qos {
1: -	struct rq_qos_ops *ops;
1: -	struct request_queue *q;
1: -	enum rq_qos_id id;
1: -	struct rq_qos *next;
1: -	struct dentry *debugfs_dir;
1: +  struct rq_qos_ops *ops;
1: +  struct request_queue *q;
1: +  enum rq_qos_id id;
1: +  struct rq_qos *next;
1: +  struct dentry *debugfs_dir;
1:  };
1:  
1:  enum hctx_type {
1: -	HCTX_TYPE_DEFAULT = 0,
1: -	HCTX_TYPE_READ = 1,
1: -	HCTX_TYPE_POLL = 2,
1: -	HCTX_MAX_TYPES = 3,
1: +  HCTX_TYPE_DEFAULT = 0,
1: +  HCTX_TYPE_READ = 1,
1: +  HCTX_TYPE_POLL = 2,
1: +  HCTX_MAX_TYPES = 3,
1:  };
1:  
1:  struct rq_qos_ops {
1: -	void (*throttle)(struct rq_qos *, struct bio *);
1: -	void (*track)(struct rq_qos *, struct request *, struct bio *);
1: -	void (*merge)(struct rq_qos *, struct request *, struct bio *);
1: -	void (*issue)(struct rq_qos *, struct request *);
1: -	void (*requeue)(struct rq_qos *, struct request *);
1: -	void (*done)(struct rq_qos *, struct request *);
1: -	void (*done_bio)(struct rq_qos *, struct bio *);
1: -	void (*cleanup)(struct rq_qos *, struct bio *);
1: -	void (*queue_depth_changed)(struct rq_qos *);
1: -	void (*exit)(struct rq_qos *);
1: -	const struct blk_mq_debugfs_attr *debugfs_attrs;
1: +  void (*throttle)(struct rq_qos *, struct bio *);
1: +  void (*track)(struct rq_qos *, struct request *, struct bio *);
1: +  void (*merge)(struct rq_qos *, struct request *, struct bio *);
1: +  void (*issue)(struct rq_qos *, struct request *);
1: +  void (*requeue)(struct rq_qos *, struct request *);
1: +  void (*done)(struct rq_qos *, struct request *);
1: +  void (*done_bio)(struct rq_qos *, struct bio *);
1: +  void (*cleanup)(struct rq_qos *, struct bio *);
1: +  void (*queue_depth_changed)(struct rq_qos *);
1: +  void (*exit)(struct rq_qos *);
1: +  const struct blk_mq_debugfs_attr *debugfs_attrs;
1:  };
1:  
1:  struct bio_slab {
1: -	struct kmem_cache *slab;
1: -	unsigned int slab_ref;
1: -	unsigned int slab_size;
1: -	char name[8];
1: +  struct kmem_cache *slab;
1: +  unsigned int slab_ref;
1: +  unsigned int slab_size;
1: +  char name[8];
1:  };
1:  
1:  enum {
1: -	BLK_MQ_F_SHOULD_MERGE = 1,
1: -	BLK_MQ_F_TAG_QUEUE_SHARED = 2,
1: -	BLK_MQ_F_STACKING = 4,
1: -	BLK_MQ_F_TAG_HCTX_SHARED = 8,
1: -	BLK_MQ_F_BLOCKING = 32,
1: -	BLK_MQ_F_NO_SCHED = 64,
1: -	BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,
1: -	BLK_MQ_F_ALLOC_POLICY_BITS = 1,
1: -	BLK_MQ_S_STOPPED = 0,
1: -	BLK_MQ_S_TAG_ACTIVE = 1,
1: -	BLK_MQ_S_SCHED_RESTART = 2,
1: -	BLK_MQ_S_INACTIVE = 3,
1: -	BLK_MQ_MAX_DEPTH = 10240,
1: -	BLK_MQ_CPU_WORK_BATCH = 8,
1: +  BLK_MQ_F_SHOULD_MERGE = 1,
1: +  BLK_MQ_F_TAG_QUEUE_SHARED = 2,
1: +  BLK_MQ_F_STACKING = 4,
1: +  BLK_MQ_F_TAG_HCTX_SHARED = 8,
1: +  BLK_MQ_F_BLOCKING = 32,
1: +  BLK_MQ_F_NO_SCHED = 64,
1: +  BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,
1: +  BLK_MQ_F_ALLOC_POLICY_BITS = 1,
1: +  BLK_MQ_S_STOPPED = 0,
1: +  BLK_MQ_S_TAG_ACTIVE = 1,
1: +  BLK_MQ_S_SCHED_RESTART = 2,
1: +  BLK_MQ_S_INACTIVE = 3,
1: +  BLK_MQ_MAX_DEPTH = 10240,
1: +  BLK_MQ_CPU_WORK_BATCH = 8,
1:  };
1:  
1:  enum {
1: -	WBT_RWQ_BG = 0,
1: -	WBT_RWQ_KSWAPD = 1,
1: -	WBT_RWQ_DISCARD = 2,
1: -	WBT_NUM_RWQ = 3,
1: +  WBT_RWQ_BG = 0,
1: +  WBT_RWQ_KSWAPD = 1,
1: +  WBT_RWQ_DISCARD = 2,
1: +  WBT_NUM_RWQ = 3,
1:  };
1:  
1:  enum {
1: -	BLK_MQ_REQ_NOWAIT = 1,
1: -	BLK_MQ_REQ_RESERVED = 2,
1: -	BLK_MQ_REQ_PREEMPT = 8,
1: +  BLK_MQ_REQ_NOWAIT = 1,
1: +  BLK_MQ_REQ_RESERVED = 2,
1: +  BLK_MQ_REQ_PREEMPT = 8,
1:  };
1:  
1:  struct trace_event_raw_block_buffer {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	size_t size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  size_t size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_rq_requeue {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	char rwbs[8];
1: -	u32 __data_loc_cmd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  char rwbs[8];
1: +  u32 __data_loc_cmd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_rq_complete {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	int error;
1: -	char rwbs[8];
1: -	u32 __data_loc_cmd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  int error;
1: +  char rwbs[8];
1: +  u32 __data_loc_cmd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_rq {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	unsigned int bytes;
1: -	char rwbs[8];
1: -	char comm[16];
1: -	u32 __data_loc_cmd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  unsigned int bytes;
1: +  char rwbs[8];
1: +  char comm[16];
1: +  u32 __data_loc_cmd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_bio_bounce {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	char rwbs[8];
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  char rwbs[8];
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_bio_complete {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	int error;
1: -	char rwbs[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  int error;
1: +  char rwbs[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_bio_merge {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	char rwbs[8];
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  char rwbs[8];
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_bio_queue {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	char rwbs[8];
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  char rwbs[8];
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_get_rq {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	char rwbs[8];
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  char rwbs[8];
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_plug {
1: -	struct trace_entry ent;
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_unplug {
1: -	struct trace_entry ent;
1: -	int nr_rq;
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nr_rq;
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_split {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	sector_t new_sector;
1: -	char rwbs[8];
1: -	char comm[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  sector_t new_sector;
1: +  char rwbs[8];
1: +  char comm[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_bio_remap {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	dev_t old_dev;
1: -	sector_t old_sector;
1: -	char rwbs[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  dev_t old_dev;
1: +  sector_t old_sector;
1: +  char rwbs[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_block_rq_remap {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	sector_t sector;
1: -	unsigned int nr_sector;
1: -	dev_t old_dev;
1: -	sector_t old_sector;
1: -	unsigned int nr_bios;
1: -	char rwbs[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  sector_t sector;
1: +  unsigned int nr_sector;
1: +  dev_t old_dev;
1: +  sector_t old_sector;
1: +  unsigned int nr_bios;
1: +  char rwbs[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_block_buffer {};
1:  
1:  struct trace_event_data_offsets_block_rq_requeue {
1: -	u32 cmd;
1: +  u32 cmd;
1:  };
1:  
1:  struct trace_event_data_offsets_block_rq_complete {
1: -	u32 cmd;
1: +  u32 cmd;
1:  };
1:  
1:  struct trace_event_data_offsets_block_rq {
1: -	u32 cmd;
1: +  u32 cmd;
1:  };
1:  
1:  struct trace_event_data_offsets_block_bio_bounce {};
1: @@ -62754,804 +63689,819 @@ typedef void (*btf_trace_block_touch_buffer)(void *, struct buffer_head *);
1:  
1:  typedef void (*btf_trace_block_dirty_buffer)(void *, struct buffer_head *);
1:  
1: -typedef void (*btf_trace_block_rq_requeue)(void *, struct request_queue *, struct request *);
1: +typedef void (*btf_trace_block_rq_requeue)(void *, struct request_queue *,
1: +                                           struct request *);
1:  
1: -typedef void (*btf_trace_block_rq_complete)(void *, struct request *, int, unsigned int);
1: +typedef void (*btf_trace_block_rq_complete)(void *, struct request *, int,
1: +                                            unsigned int);
1:  
1: -typedef void (*btf_trace_block_rq_insert)(void *, struct request_queue *, struct request *);
1: +typedef void (*btf_trace_block_rq_insert)(void *, struct request_queue *,
1: +                                          struct request *);
1:  
1: -typedef void (*btf_trace_block_rq_issue)(void *, struct request_queue *, struct request *);
1: +typedef void (*btf_trace_block_rq_issue)(void *, struct request_queue *,
1: +                                         struct request *);
1:  
1: -typedef void (*btf_trace_block_rq_merge)(void *, struct request_queue *, struct request *);
1: +typedef void (*btf_trace_block_rq_merge)(void *, struct request_queue *,
1: +                                         struct request *);
1:  
1: -typedef void (*btf_trace_block_bio_bounce)(void *, struct request_queue *, struct bio *);
1: +typedef void (*btf_trace_block_bio_bounce)(void *, struct request_queue *,
1: +                                           struct bio *);
1:  
1: -typedef void (*btf_trace_block_bio_complete)(void *, struct request_queue *, struct bio *);
1: +typedef void (*btf_trace_block_bio_complete)(void *, struct request_queue *,
1: +                                             struct bio *);
1:  
1: -typedef void (*btf_trace_block_bio_backmerge)(void *, struct request_queue *, struct request *, struct bio *);
1: +typedef void (*btf_trace_block_bio_backmerge)(void *, struct request_queue *,
1: +                                              struct request *, struct bio *);
1:  
1: -typedef void (*btf_trace_block_bio_frontmerge)(void *, struct request_queue *, struct request *, struct bio *);
1: +typedef void (*btf_trace_block_bio_frontmerge)(void *, struct request_queue *,
1: +                                               struct request *, struct bio *);
1:  
1: -typedef void (*btf_trace_block_bio_queue)(void *, struct request_queue *, struct bio *);
1: +typedef void (*btf_trace_block_bio_queue)(void *, struct request_queue *,
1: +                                          struct bio *);
1:  
1: -typedef void (*btf_trace_block_getrq)(void *, struct request_queue *, struct bio *, int);
1: +typedef void (*btf_trace_block_getrq)(void *, struct request_queue *,
1: +                                      struct bio *, int);
1:  
1: -typedef void (*btf_trace_block_sleeprq)(void *, struct request_queue *, struct bio *, int);
1: +typedef void (*btf_trace_block_sleeprq)(void *, struct request_queue *,
1: +                                        struct bio *, int);
1:  
1:  typedef void (*btf_trace_block_plug)(void *, struct request_queue *);
1:  
1: -typedef void (*btf_trace_block_unplug)(void *, struct request_queue *, unsigned int, bool);
1: +typedef void (*btf_trace_block_unplug)(void *, struct request_queue *,
1: +                                       unsigned int, bool);
1:  
1: -typedef void (*btf_trace_block_split)(void *, struct request_queue *, struct bio *, unsigned int);
1: +typedef void (*btf_trace_block_split)(void *, struct request_queue *,
1: +                                      struct bio *, unsigned int);
1:  
1: -typedef void (*btf_trace_block_bio_remap)(void *, struct request_queue *, struct bio *, dev_t, sector_t);
1: +typedef void (*btf_trace_block_bio_remap)(void *, struct request_queue *,
1: +                                          struct bio *, dev_t, sector_t);
1:  
1: -typedef void (*btf_trace_block_rq_remap)(void *, struct request_queue *, struct request *, dev_t, sector_t);
1: +typedef void (*btf_trace_block_rq_remap)(void *, struct request_queue *,
1: +                                         struct request *, dev_t, sector_t);
1:  
1:  enum {
1: -	BLK_MQ_NO_TAG = 4294967295,
1: -	BLK_MQ_TAG_MIN = 1,
1: -	BLK_MQ_TAG_MAX = 4294967294,
1: +  BLK_MQ_NO_TAG = 4294967295,
1: +  BLK_MQ_TAG_MIN = 1,
1: +  BLK_MQ_TAG_MAX = 4294967294,
1:  };
1:  
1:  struct queue_sysfs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct request_queue *, char *);
1: -	ssize_t (*store)(struct request_queue *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct request_queue *, char *);
1: +  ssize_t (*store)(struct request_queue *, const char *, size_t);
1:  };
1:  
1:  enum {
1: -	REQ_FSEQ_PREFLUSH = 1,
1: -	REQ_FSEQ_DATA = 2,
1: -	REQ_FSEQ_POSTFLUSH = 4,
1: -	REQ_FSEQ_DONE = 8,
1: -	REQ_FSEQ_ACTIONS = 7,
1: -	FLUSH_PENDING_TIMEOUT = 5000,
1: +  REQ_FSEQ_PREFLUSH = 1,
1: +  REQ_FSEQ_DATA = 2,
1: +  REQ_FSEQ_POSTFLUSH = 4,
1: +  REQ_FSEQ_DONE = 8,
1: +  REQ_FSEQ_ACTIONS = 7,
1: +  FLUSH_PENDING_TIMEOUT = 5000,
1:  };
1:  
1:  enum blk_default_limits {
1: -	BLK_MAX_SEGMENTS = 128,
1: -	BLK_SAFE_MAX_SECTORS = 255,
1: -	BLK_DEF_MAX_SECTORS = 2560,
1: -	BLK_MAX_SEGMENT_SIZE = 65536,
1: -	BLK_SEG_BOUNDARY_MASK = 4294967295,
1: +  BLK_MAX_SEGMENTS = 128,
1: +  BLK_SAFE_MAX_SECTORS = 255,
1: +  BLK_DEF_MAX_SECTORS = 2560,
1: +  BLK_MAX_SEGMENT_SIZE = 65536,
1: +  BLK_SEG_BOUNDARY_MASK = 4294967295,
1:  };
1:  
1:  enum {
1: -	ICQ_EXITED = 4,
1: -	ICQ_DESTROYED = 8,
1: +  ICQ_EXITED = 4,
1: +  ICQ_DESTROYED = 8,
1:  };
1:  
1:  struct rq_map_data {
1: -	struct page **pages;
1: -	int page_order;
1: -	int nr_entries;
1: -	long unsigned int offset;
1: -	int null_mapped;
1: -	int from_user;
1: +  struct page **pages;
1: +  int page_order;
1: +  int nr_entries;
1: +  long unsigned int offset;
1: +  int null_mapped;
1: +  int from_user;
1:  };
1:  
1:  struct bio_map_data {
1: -	bool is_our_pages: 1;
1: -	bool is_null_mapped: 1;
1: -	struct iov_iter iter;
1: -	struct iovec iov[0];
1: +  bool is_our_pages : 1;
1: +  bool is_null_mapped : 1;
1: +  struct iov_iter iter;
1: +  struct iovec iov[0];
1:  };
1:  
1:  struct req_iterator {
1: -	struct bvec_iter iter;
1: -	struct bio *bio;
1: +  struct bvec_iter iter;
1: +  struct bio *bio;
1:  };
1:  
1:  enum bio_merge_status {
1: -	BIO_MERGE_OK = 0,
1: -	BIO_MERGE_NONE = 1,
1: -	BIO_MERGE_FAILED = 2,
1: +  BIO_MERGE_OK = 0,
1: +  BIO_MERGE_NONE = 1,
1: +  BIO_MERGE_FAILED = 2,
1:  };
1:  
1:  typedef bool (*sb_for_each_fn)(struct sbitmap *, unsigned int, void *);
1:  
1:  enum {
1: -	BLK_MQ_UNIQUE_TAG_BITS = 16,
1: -	BLK_MQ_UNIQUE_TAG_MASK = 65535,
1: +  BLK_MQ_UNIQUE_TAG_BITS = 16,
1: +  BLK_MQ_UNIQUE_TAG_MASK = 65535,
1:  };
1:  
1:  struct mq_inflight {
1: -	struct hd_struct *part;
1: -	unsigned int inflight[2];
1: +  struct hd_struct *part;
1: +  unsigned int inflight[2];
1:  };
1:  
1:  struct flush_busy_ctx_data {
1: -	struct blk_mq_hw_ctx *hctx;
1: -	struct list_head *list;
1: +  struct blk_mq_hw_ctx *hctx;
1: +  struct list_head *list;
1:  };
1:  
1:  struct dispatch_rq_data {
1: -	struct blk_mq_hw_ctx *hctx;
1: -	struct request *rq;
1: +  struct blk_mq_hw_ctx *hctx;
1: +  struct request *rq;
1:  };
1:  
1:  enum prep_dispatch {
1: -	PREP_DISPATCH_OK = 0,
1: -	PREP_DISPATCH_NO_TAG = 1,
1: -	PREP_DISPATCH_NO_BUDGET = 2,
1: +  PREP_DISPATCH_OK = 0,
1: +  PREP_DISPATCH_NO_TAG = 1,
1: +  PREP_DISPATCH_NO_BUDGET = 2,
1:  };
1:  
1:  struct rq_iter_data {
1: -	struct blk_mq_hw_ctx *hctx;
1: -	bool has_rq;
1: +  struct blk_mq_hw_ctx *hctx;
1: +  bool has_rq;
1:  };
1:  
1:  struct blk_mq_qe_pair {
1: -	struct list_head node;
1: -	struct request_queue *q;
1: -	struct elevator_type *type;
1: +  struct list_head node;
1: +  struct request_queue *q;
1: +  struct elevator_type *type;
1:  };
1:  
1:  struct sbq_wait {
1: -	struct sbitmap_queue *sbq;
1: -	struct wait_queue_entry wait;
1: +  struct sbitmap_queue *sbq;
1: +  struct wait_queue_entry wait;
1:  };
1:  
1: -typedef bool busy_iter_fn(struct blk_mq_hw_ctx *, struct request *, void *, bool);
1: +typedef bool busy_iter_fn(struct blk_mq_hw_ctx *, struct request *, void *,
1: +                          bool);
1:  
1:  typedef bool busy_tag_iter_fn(struct request *, void *, bool);
1:  
1:  struct bt_iter_data {
1: -	struct blk_mq_hw_ctx *hctx;
1: -	busy_iter_fn *fn;
1: -	void *data;
1: -	bool reserved;
1: +  struct blk_mq_hw_ctx *hctx;
1: +  busy_iter_fn *fn;
1: +  void *data;
1: +  bool reserved;
1:  };
1:  
1:  struct bt_tags_iter_data {
1: -	struct blk_mq_tags *tags;
1: -	busy_tag_iter_fn *fn;
1: -	void *data;
1: -	unsigned int flags;
1: +  struct blk_mq_tags *tags;
1: +  busy_tag_iter_fn *fn;
1: +  void *data;
1: +  unsigned int flags;
1:  };
1:  
1:  struct blk_queue_stats {
1: -	struct list_head callbacks;
1: -	spinlock_t lock;
1: -	bool enable_accounting;
1: +  struct list_head callbacks;
1: +  spinlock_t lock;
1: +  bool enable_accounting;
1:  };
1:  
1:  struct blk_mq_ctx_sysfs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct blk_mq_ctx *, char *);
1: -	ssize_t (*store)(struct blk_mq_ctx *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct blk_mq_ctx *, char *);
1: +  ssize_t (*store)(struct blk_mq_ctx *, const char *, size_t);
1:  };
1:  
1:  struct blk_mq_hw_ctx_sysfs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct blk_mq_hw_ctx *, char *);
1: -	ssize_t (*store)(struct blk_mq_hw_ctx *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct blk_mq_hw_ctx *, char *);
1: +  ssize_t (*store)(struct blk_mq_hw_ctx *, const char *, size_t);
1:  };
1:  
1:  typedef u32 compat_caddr_t;
1:  
1:  struct hd_geometry {
1: -	unsigned char heads;
1: -	unsigned char sectors;
1: -	short unsigned int cylinders;
1: -	long unsigned int start;
1: +  unsigned char heads;
1: +  unsigned char sectors;
1: +  short unsigned int cylinders;
1: +  long unsigned int start;
1:  };
1:  
1:  struct blkpg_ioctl_arg {
1: -	int op;
1: -	int flags;
1: -	int datalen;
1: -	void *data;
1: +  int op;
1: +  int flags;
1: +  int datalen;
1: +  void *data;
1:  };
1:  
1:  struct blkpg_partition {
1: -	long long int start;
1: -	long long int length;
1: -	int pno;
1: -	char devname[64];
1: -	char volname[64];
1: +  long long int start;
1: +  long long int length;
1: +  int pno;
1: +  char devname[64];
1: +  char volname[64];
1:  };
1:  
1:  struct pr_reservation {
1: -	__u64 key;
1: -	__u32 type;
1: -	__u32 flags;
1: +  __u64 key;
1: +  __u32 type;
1: +  __u32 flags;
1:  };
1:  
1:  struct pr_registration {
1: -	__u64 old_key;
1: -	__u64 new_key;
1: -	__u32 flags;
1: -	__u32 __pad;
1: +  __u64 old_key;
1: +  __u64 new_key;
1: +  __u32 flags;
1: +  __u32 __pad;
1:  };
1:  
1:  struct pr_preempt {
1: -	__u64 old_key;
1: -	__u64 new_key;
1: -	__u32 type;
1: -	__u32 flags;
1: +  __u64 old_key;
1: +  __u64 new_key;
1: +  __u32 type;
1: +  __u32 flags;
1:  };
1:  
1:  struct pr_clear {
1: -	__u64 key;
1: -	__u32 flags;
1: -	__u32 __pad;
1: +  __u64 key;
1: +  __u32 flags;
1: +  __u32 __pad;
1:  };
1:  
1:  struct compat_blkpg_ioctl_arg {
1: -	compat_int_t op;
1: -	compat_int_t flags;
1: -	compat_int_t datalen;
1: -	compat_caddr_t data;
1: +  compat_int_t op;
1: +  compat_int_t flags;
1: +  compat_int_t datalen;
1: +  compat_caddr_t data;
1:  };
1:  
1:  struct compat_hd_geometry {
1: -	unsigned char heads;
1: -	unsigned char sectors;
1: -	short unsigned int cylinders;
1: -	u32 start;
1: +  unsigned char heads;
1: +  unsigned char sectors;
1: +  short unsigned int cylinders;
1: +  u32 start;
1:  };
1:  
1:  struct klist_node;
1:  
1:  struct klist {
1: -	spinlock_t k_lock;
1: -	struct list_head k_list;
1: -	void (*get)(struct klist_node *);
1: -	void (*put)(struct klist_node *);
1: +  spinlock_t k_lock;
1: +  struct list_head k_list;
1: +  void (*get)(struct klist_node *);
1: +  void (*put)(struct klist_node *);
1:  };
1:  
1:  struct klist_node {
1: -	void *n_klist;
1: -	struct list_head n_node;
1: -	struct kref n_ref;
1: +  void *n_klist;
1: +  struct list_head n_node;
1: +  struct kref n_ref;
1:  };
1:  
1:  struct klist_iter {
1: -	struct klist *i_klist;
1: -	struct klist_node *i_cur;
1: +  struct klist *i_klist;
1: +  struct klist_node *i_cur;
1:  };
1:  
1:  struct class_dev_iter {
1: -	struct klist_iter ki;
1: -	const struct device_type *type;
1: +  struct klist_iter ki;
1: +  const struct device_type *type;
1:  };
1:  
1:  enum {
1: -	DISK_EVENT_FLAG_POLL = 1,
1: -	DISK_EVENT_FLAG_UEVENT = 2,
1: +  DISK_EVENT_FLAG_POLL = 1,
1: +  DISK_EVENT_FLAG_UEVENT = 2,
1:  };
1:  
1:  struct disk_events {
1: -	struct list_head node;
1: -	struct gendisk *disk;
1: -	spinlock_t lock;
1: -	struct mutex block_mutex;
1: -	int block;
1: -	unsigned int pending;
1: -	unsigned int clearing;
1: -	long int poll_msecs;
1: -	struct delayed_work dwork;
1: +  struct list_head node;
1: +  struct gendisk *disk;
1: +  spinlock_t lock;
1: +  struct mutex block_mutex;
1: +  int block;
1: +  unsigned int pending;
1: +  unsigned int clearing;
1: +  long int poll_msecs;
1: +  struct delayed_work dwork;
1:  };
1:  
1:  struct badblocks {
1: -	struct device *dev;
1: -	int count;
1: -	int unacked_exist;
1: -	int shift;
1: -	u64 *page;
1: -	int changed;
1: -	seqlock_t lock;
1: -	sector_t sector;
1: -	sector_t size;
1: +  struct device *dev;
1: +  int count;
1: +  int unacked_exist;
1: +  int shift;
1: +  u64 *page;
1: +  int changed;
1: +  seqlock_t lock;
1: +  sector_t sector;
1: +  sector_t size;
1:  };
1:  
1:  struct disk_part_iter {
1: -	struct gendisk *disk;
1: -	struct hd_struct *part;
1: -	int idx;
1: -	unsigned int flags;
1: +  struct gendisk *disk;
1: +  struct hd_struct *part;
1: +  int idx;
1: +  unsigned int flags;
1:  };
1:  
1:  struct blk_major_name {
1: -	struct blk_major_name *next;
1: -	int major;
1: -	char name[16];
1: +  struct blk_major_name *next;
1: +  int major;
1: +  char name[16];
1:  };
1:  
1:  enum {
1: -	IOPRIO_WHO_PROCESS = 1,
1: -	IOPRIO_WHO_PGRP = 2,
1: -	IOPRIO_WHO_USER = 3,
1: +  IOPRIO_WHO_PROCESS = 1,
1: +  IOPRIO_WHO_PGRP = 2,
1: +  IOPRIO_WHO_USER = 3,
1:  };
1:  
1:  struct parsed_partitions {
1: -	struct block_device *bdev;
1: -	char name[32];
1: -	struct {
1: -		sector_t from;
1: -		sector_t size;
1: -		int flags;
1: -		bool has_info;
1: -		struct partition_meta_info info;
1: -	} *parts;
1: -	int next;
1: -	int limit;
1: -	bool access_beyond_eod;
1: -	char *pp_buf;
1: -};
1: -
1: -typedef struct {
1: -	struct page *v;
1: -} Sector;
1: +  struct block_device *bdev;
1: +  char name[32];
1: +  struct {
1: +    sector_t from;
1: +    sector_t size;
1: +    int flags;
1: +    bool has_info;
1: +    struct partition_meta_info info;
1: +  } * parts;
1: +  int next;
1: +  int limit;
1: +  bool access_beyond_eod;
1: +  char *pp_buf;
1: +};
1: +
1: +typedef struct { struct page *v; } Sector;
1:  
1:  struct RigidDiskBlock {
1: -	__u32 rdb_ID;
1: -	__be32 rdb_SummedLongs;
1: -	__s32 rdb_ChkSum;
1: -	__u32 rdb_HostID;
1: -	__be32 rdb_BlockBytes;
1: -	__u32 rdb_Flags;
1: -	__u32 rdb_BadBlockList;
1: -	__be32 rdb_PartitionList;
1: -	__u32 rdb_FileSysHeaderList;
1: -	__u32 rdb_DriveInit;
1: -	__u32 rdb_Reserved1[6];
1: -	__u32 rdb_Cylinders;
1: -	__u32 rdb_Sectors;
1: -	__u32 rdb_Heads;
1: -	__u32 rdb_Interleave;
1: -	__u32 rdb_Park;
1: -	__u32 rdb_Reserved2[3];
1: -	__u32 rdb_WritePreComp;
1: -	__u32 rdb_ReducedWrite;
1: -	__u32 rdb_StepRate;
1: -	__u32 rdb_Reserved3[5];
1: -	__u32 rdb_RDBBlocksLo;
1: -	__u32 rdb_RDBBlocksHi;
1: -	__u32 rdb_LoCylinder;
1: -	__u32 rdb_HiCylinder;
1: -	__u32 rdb_CylBlocks;
1: -	__u32 rdb_AutoParkSeconds;
1: -	__u32 rdb_HighRDSKBlock;
1: -	__u32 rdb_Reserved4;
1: -	char rdb_DiskVendor[8];
1: -	char rdb_DiskProduct[16];
1: -	char rdb_DiskRevision[4];
1: -	char rdb_ControllerVendor[8];
1: -	char rdb_ControllerProduct[16];
1: -	char rdb_ControllerRevision[4];
1: -	__u32 rdb_Reserved5[10];
1: +  __u32 rdb_ID;
1: +  __be32 rdb_SummedLongs;
1: +  __s32 rdb_ChkSum;
1: +  __u32 rdb_HostID;
1: +  __be32 rdb_BlockBytes;
1: +  __u32 rdb_Flags;
1: +  __u32 rdb_BadBlockList;
1: +  __be32 rdb_PartitionList;
1: +  __u32 rdb_FileSysHeaderList;
1: +  __u32 rdb_DriveInit;
1: +  __u32 rdb_Reserved1[6];
1: +  __u32 rdb_Cylinders;
1: +  __u32 rdb_Sectors;
1: +  __u32 rdb_Heads;
1: +  __u32 rdb_Interleave;
1: +  __u32 rdb_Park;
1: +  __u32 rdb_Reserved2[3];
1: +  __u32 rdb_WritePreComp;
1: +  __u32 rdb_ReducedWrite;
1: +  __u32 rdb_StepRate;
1: +  __u32 rdb_Reserved3[5];
1: +  __u32 rdb_RDBBlocksLo;
1: +  __u32 rdb_RDBBlocksHi;
1: +  __u32 rdb_LoCylinder;
1: +  __u32 rdb_HiCylinder;
1: +  __u32 rdb_CylBlocks;
1: +  __u32 rdb_AutoParkSeconds;
1: +  __u32 rdb_HighRDSKBlock;
1: +  __u32 rdb_Reserved4;
1: +  char rdb_DiskVendor[8];
1: +  char rdb_DiskProduct[16];
1: +  char rdb_DiskRevision[4];
1: +  char rdb_ControllerVendor[8];
1: +  char rdb_ControllerProduct[16];
1: +  char rdb_ControllerRevision[4];
1: +  __u32 rdb_Reserved5[10];
1:  };
1:  
1:  struct PartitionBlock {
1: -	__be32 pb_ID;
1: -	__be32 pb_SummedLongs;
1: -	__s32 pb_ChkSum;
1: -	__u32 pb_HostID;
1: -	__be32 pb_Next;
1: -	__u32 pb_Flags;
1: -	__u32 pb_Reserved1[2];
1: -	__u32 pb_DevFlags;
1: -	__u8 pb_DriveName[32];
1: -	__u32 pb_Reserved2[15];
1: -	__be32 pb_Environment[17];
1: -	__u32 pb_EReserved[15];
1: +  __be32 pb_ID;
1: +  __be32 pb_SummedLongs;
1: +  __s32 pb_ChkSum;
1: +  __u32 pb_HostID;
1: +  __be32 pb_Next;
1: +  __u32 pb_Flags;
1: +  __u32 pb_Reserved1[2];
1: +  __u32 pb_DevFlags;
1: +  __u8 pb_DriveName[32];
1: +  __u32 pb_Reserved2[15];
1: +  __be32 pb_Environment[17];
1: +  __u32 pb_EReserved[15];
1:  };
1:  
1:  struct mac_partition {
1: -	__be16 signature;
1: -	__be16 res1;
1: -	__be32 map_count;
1: -	__be32 start_block;
1: -	__be32 block_count;
1: -	char name[32];
1: -	char type[32];
1: -	__be32 data_start;
1: -	__be32 data_count;
1: -	__be32 status;
1: -	__be32 boot_start;
1: -	__be32 boot_size;
1: -	__be32 boot_load;
1: -	__be32 boot_load2;
1: -	__be32 boot_entry;
1: -	__be32 boot_entry2;
1: -	__be32 boot_cksum;
1: -	char processor[16];
1: +  __be16 signature;
1: +  __be16 res1;
1: +  __be32 map_count;
1: +  __be32 start_block;
1: +  __be32 block_count;
1: +  char name[32];
1: +  char type[32];
1: +  __be32 data_start;
1: +  __be32 data_count;
1: +  __be32 status;
1: +  __be32 boot_start;
1: +  __be32 boot_size;
1: +  __be32 boot_load;
1: +  __be32 boot_load2;
1: +  __be32 boot_entry;
1: +  __be32 boot_entry2;
1: +  __be32 boot_cksum;
1: +  char processor[16];
1:  };
1:  
1:  struct mac_driver_desc {
1: -	__be16 signature;
1: -	__be16 block_size;
1: -	__be32 block_count;
1: +  __be16 signature;
1: +  __be16 block_size;
1: +  __be32 block_count;
1:  };
1:  
1:  struct fat_boot_sector {
1: -	__u8 ignored[3];
1: -	__u8 system_id[8];
1: -	__u8 sector_size[2];
1: -	__u8 sec_per_clus;
1: -	__le16 reserved;
1: -	__u8 fats;
1: -	__u8 dir_entries[2];
1: -	__u8 sectors[2];
1: -	__u8 media;
1: -	__le16 fat_length;
1: -	__le16 secs_track;
1: -	__le16 heads;
1: -	__le32 hidden;
1: -	__le32 total_sect;
1: -	union {
1: -		struct {
1: -			__u8 drive_number;
1: -			__u8 state;
1: -			__u8 signature;
1: -			__u8 vol_id[4];
1: -			__u8 vol_label[11];
1: -			__u8 fs_type[8];
1: -		} fat16;
1: -		struct {
1: -			__le32 length;
1: -			__le16 flags;
1: -			__u8 version[2];
1: -			__le32 root_cluster;
1: -			__le16 info_sector;
1: -			__le16 backup_boot;
1: -			__le16 reserved2[6];
1: -			__u8 drive_number;
1: -			__u8 state;
1: -			__u8 signature;
1: -			__u8 vol_id[4];
1: -			__u8 vol_label[11];
1: -			__u8 fs_type[8];
1: -		} fat32;
1: -	};
1: +  __u8 ignored[3];
1: +  __u8 system_id[8];
1: +  __u8 sector_size[2];
1: +  __u8 sec_per_clus;
1: +  __le16 reserved;
1: +  __u8 fats;
1: +  __u8 dir_entries[2];
1: +  __u8 sectors[2];
1: +  __u8 media;
1: +  __le16 fat_length;
1: +  __le16 secs_track;
1: +  __le16 heads;
1: +  __le32 hidden;
1: +  __le32 total_sect;
1: +  union {
1: +    struct {
1: +      __u8 drive_number;
1: +      __u8 state;
1: +      __u8 signature;
1: +      __u8 vol_id[4];
1: +      __u8 vol_label[11];
1: +      __u8 fs_type[8];
1: +    } fat16;
1: +    struct {
1: +      __le32 length;
1: +      __le16 flags;
1: +      __u8 version[2];
1: +      __le32 root_cluster;
1: +      __le16 info_sector;
1: +      __le16 backup_boot;
1: +      __le16 reserved2[6];
1: +      __u8 drive_number;
1: +      __u8 state;
1: +      __u8 signature;
1: +      __u8 vol_id[4];
1: +      __u8 vol_label[11];
1: +      __u8 fs_type[8];
1: +    } fat32;
1: +  };
1:  };
1:  
1:  struct msdos_partition {
1: -	u8 boot_ind;
1: -	u8 head;
1: -	u8 sector;
1: -	u8 cyl;
1: -	u8 sys_ind;
1: -	u8 end_head;
1: -	u8 end_sector;
1: -	u8 end_cyl;
1: -	__le32 start_sect;
1: -	__le32 nr_sects;
1: +  u8 boot_ind;
1: +  u8 head;
1: +  u8 sector;
1: +  u8 cyl;
1: +  u8 sys_ind;
1: +  u8 end_head;
1: +  u8 end_sector;
1: +  u8 end_cyl;
1: +  __le32 start_sect;
1: +  __le32 nr_sects;
1:  };
1:  
1:  enum msdos_sys_ind {
1: -	DOS_EXTENDED_PARTITION = 5,
1: -	LINUX_EXTENDED_PARTITION = 133,
1: -	WIN98_EXTENDED_PARTITION = 15,
1: -	LINUX_DATA_PARTITION = 131,
1: -	LINUX_LVM_PARTITION = 142,
1: -	LINUX_RAID_PARTITION = 253,
1: -	SOLARIS_X86_PARTITION = 130,
1: -	NEW_SOLARIS_X86_PARTITION = 191,
1: -	DM6_AUX1PARTITION = 81,
1: -	DM6_AUX3PARTITION = 83,
1: -	DM6_PARTITION = 84,
1: -	EZD_PARTITION = 85,
1: -	FREEBSD_PARTITION = 165,
1: -	OPENBSD_PARTITION = 166,
1: -	NETBSD_PARTITION = 169,
1: -	BSDI_PARTITION = 183,
1: -	MINIX_PARTITION = 129,
1: -	UNIXWARE_PARTITION = 99,
1: +  DOS_EXTENDED_PARTITION = 5,
1: +  LINUX_EXTENDED_PARTITION = 133,
1: +  WIN98_EXTENDED_PARTITION = 15,
1: +  LINUX_DATA_PARTITION = 131,
1: +  LINUX_LVM_PARTITION = 142,
1: +  LINUX_RAID_PARTITION = 253,
1: +  SOLARIS_X86_PARTITION = 130,
1: +  NEW_SOLARIS_X86_PARTITION = 191,
1: +  DM6_AUX1PARTITION = 81,
1: +  DM6_AUX3PARTITION = 83,
1: +  DM6_PARTITION = 84,
1: +  EZD_PARTITION = 85,
1: +  FREEBSD_PARTITION = 165,
1: +  OPENBSD_PARTITION = 166,
1: +  NETBSD_PARTITION = 169,
1: +  BSDI_PARTITION = 183,
1: +  MINIX_PARTITION = 129,
1: +  UNIXWARE_PARTITION = 99,
1:  };
1:  
1:  struct solaris_x86_slice {
1: -	__le16 s_tag;
1: -	__le16 s_flag;
1: -	__le32 s_start;
1: -	__le32 s_size;
1: +  __le16 s_tag;
1: +  __le16 s_flag;
1: +  __le32 s_start;
1: +  __le32 s_size;
1:  };
1:  
1:  struct solaris_x86_vtoc {
1: -	unsigned int v_bootinfo[3];
1: -	__le32 v_sanity;
1: -	__le32 v_version;
1: -	char v_volume[8];
1: -	__le16 v_sectorsz;
1: -	__le16 v_nparts;
1: -	unsigned int v_reserved[10];
1: -	struct solaris_x86_slice v_slice[16];
1: -	unsigned int timestamp[16];
1: -	char v_asciilabel[128];
1: +  unsigned int v_bootinfo[3];
1: +  __le32 v_sanity;
1: +  __le32 v_version;
1: +  char v_volume[8];
1: +  __le16 v_sectorsz;
1: +  __le16 v_nparts;
1: +  unsigned int v_reserved[10];
1: +  struct solaris_x86_slice v_slice[16];
1: +  unsigned int timestamp[16];
1: +  char v_asciilabel[128];
1:  };
1:  
1:  struct bsd_partition {
1: -	__le32 p_size;
1: -	__le32 p_offset;
1: -	__le32 p_fsize;
1: -	__u8 p_fstype;
1: -	__u8 p_frag;
1: -	__le16 p_cpg;
1: +  __le32 p_size;
1: +  __le32 p_offset;
1: +  __le32 p_fsize;
1: +  __u8 p_fstype;
1: +  __u8 p_frag;
1: +  __le16 p_cpg;
1:  };
1:  
1:  struct bsd_disklabel {
1: -	__le32 d_magic;
1: -	__s16 d_type;
1: -	__s16 d_subtype;
1: -	char d_typename[16];
1: -	char d_packname[16];
1: -	__u32 d_secsize;
1: -	__u32 d_nsectors;
1: -	__u32 d_ntracks;
1: -	__u32 d_ncylinders;
1: -	__u32 d_secpercyl;
1: -	__u32 d_secperunit;
1: -	__u16 d_sparespertrack;
1: -	__u16 d_sparespercyl;
1: -	__u32 d_acylinders;
1: -	__u16 d_rpm;
1: -	__u16 d_interleave;
1: -	__u16 d_trackskew;
1: -	__u16 d_cylskew;
1: -	__u32 d_headswitch;
1: -	__u32 d_trkseek;
1: -	__u32 d_flags;
1: -	__u32 d_drivedata[5];
1: -	__u32 d_spare[5];
1: -	__le32 d_magic2;
1: -	__le16 d_checksum;
1: -	__le16 d_npartitions;
1: -	__le32 d_bbsize;
1: -	__le32 d_sbsize;
1: -	struct bsd_partition d_partitions[16];
1: +  __le32 d_magic;
1: +  __s16 d_type;
1: +  __s16 d_subtype;
1: +  char d_typename[16];
1: +  char d_packname[16];
1: +  __u32 d_secsize;
1: +  __u32 d_nsectors;
1: +  __u32 d_ntracks;
1: +  __u32 d_ncylinders;
1: +  __u32 d_secpercyl;
1: +  __u32 d_secperunit;
1: +  __u16 d_sparespertrack;
1: +  __u16 d_sparespercyl;
1: +  __u32 d_acylinders;
1: +  __u16 d_rpm;
1: +  __u16 d_interleave;
1: +  __u16 d_trackskew;
1: +  __u16 d_cylskew;
1: +  __u32 d_headswitch;
1: +  __u32 d_trkseek;
1: +  __u32 d_flags;
1: +  __u32 d_drivedata[5];
1: +  __u32 d_spare[5];
1: +  __le32 d_magic2;
1: +  __le16 d_checksum;
1: +  __le16 d_npartitions;
1: +  __le32 d_bbsize;
1: +  __le32 d_sbsize;
1: +  struct bsd_partition d_partitions[16];
1:  };
1:  
1:  struct unixware_slice {
1: -	__le16 s_label;
1: -	__le16 s_flags;
1: -	__le32 start_sect;
1: -	__le32 nr_sects;
1: +  __le16 s_label;
1: +  __le16 s_flags;
1: +  __le32 start_sect;
1: +  __le32 nr_sects;
1:  };
1:  
1:  struct unixware_vtoc {
1: -	__le32 v_magic;
1: -	__le32 v_version;
1: -	char v_name[8];
1: -	__le16 v_nslices;
1: -	__le16 v_unknown1;
1: -	__le32 v_reserved[10];
1: -	struct unixware_slice v_slice[16];
1: +  __le32 v_magic;
1: +  __le32 v_version;
1: +  char v_name[8];
1: +  __le16 v_nslices;
1: +  __le16 v_unknown1;
1: +  __le32 v_reserved[10];
1: +  struct unixware_slice v_slice[16];
1:  };
1:  
1:  struct unixware_disklabel {
1: -	__le32 d_type;
1: -	__le32 d_magic;
1: -	__le32 d_version;
1: -	char d_serial[12];
1: -	__le32 d_ncylinders;
1: -	__le32 d_ntracks;
1: -	__le32 d_nsectors;
1: -	__le32 d_secsize;
1: -	__le32 d_part_start;
1: -	__le32 d_unknown1[12];
1: -	__le32 d_alt_tbl;
1: -	__le32 d_alt_len;
1: -	__le32 d_phys_cyl;
1: -	__le32 d_phys_trk;
1: -	__le32 d_phys_sec;
1: -	__le32 d_phys_bytes;
1: -	__le32 d_unknown2;
1: -	__le32 d_unknown3;
1: -	__le32 d_pad[8];
1: -	struct unixware_vtoc vtoc;
1: +  __le32 d_type;
1: +  __le32 d_magic;
1: +  __le32 d_version;
1: +  char d_serial[12];
1: +  __le32 d_ncylinders;
1: +  __le32 d_ntracks;
1: +  __le32 d_nsectors;
1: +  __le32 d_secsize;
1: +  __le32 d_part_start;
1: +  __le32 d_unknown1[12];
1: +  __le32 d_alt_tbl;
1: +  __le32 d_alt_len;
1: +  __le32 d_phys_cyl;
1: +  __le32 d_phys_trk;
1: +  __le32 d_phys_sec;
1: +  __le32 d_phys_bytes;
1: +  __le32 d_unknown2;
1: +  __le32 d_unknown3;
1: +  __le32 d_pad[8];
1: +  struct unixware_vtoc vtoc;
1:  };
1:  
1:  struct d_partition {
1: -	__le32 p_size;
1: -	__le32 p_offset;
1: -	__le32 p_fsize;
1: -	u8 p_fstype;
1: -	u8 p_frag;
1: -	__le16 p_cpg;
1: +  __le32 p_size;
1: +  __le32 p_offset;
1: +  __le32 p_fsize;
1: +  u8 p_fstype;
1: +  u8 p_frag;
1: +  __le16 p_cpg;
1:  };
1:  
1:  struct disklabel {
1: -	__le32 d_magic;
1: -	__le16 d_type;
1: -	__le16 d_subtype;
1: -	u8 d_typename[16];
1: -	u8 d_packname[16];
1: -	__le32 d_secsize;
1: -	__le32 d_nsectors;
1: -	__le32 d_ntracks;
1: -	__le32 d_ncylinders;
1: -	__le32 d_secpercyl;
1: -	__le32 d_secprtunit;
1: -	__le16 d_sparespertrack;
1: -	__le16 d_sparespercyl;
1: -	__le32 d_acylinders;
1: -	__le16 d_rpm;
1: -	__le16 d_interleave;
1: -	__le16 d_trackskew;
1: -	__le16 d_cylskew;
1: -	__le32 d_headswitch;
1: -	__le32 d_trkseek;
1: -	__le32 d_flags;
1: -	__le32 d_drivedata[5];
1: -	__le32 d_spare[5];
1: -	__le32 d_magic2;
1: -	__le16 d_checksum;
1: -	__le16 d_npartitions;
1: -	__le32 d_bbsize;
1: -	__le32 d_sbsize;
1: -	struct d_partition d_partitions[18];
1: -};
1: -
1: -enum {
1: -	LINUX_RAID_PARTITION___2 = 253,
1: +  __le32 d_magic;
1: +  __le16 d_type;
1: +  __le16 d_subtype;
1: +  u8 d_typename[16];
1: +  u8 d_packname[16];
1: +  __le32 d_secsize;
1: +  __le32 d_nsectors;
1: +  __le32 d_ntracks;
1: +  __le32 d_ncylinders;
1: +  __le32 d_secpercyl;
1: +  __le32 d_secprtunit;
1: +  __le16 d_sparespertrack;
1: +  __le16 d_sparespercyl;
1: +  __le32 d_acylinders;
1: +  __le16 d_rpm;
1: +  __le16 d_interleave;
1: +  __le16 d_trackskew;
1: +  __le16 d_cylskew;
1: +  __le32 d_headswitch;
1: +  __le32 d_trkseek;
1: +  __le32 d_flags;
1: +  __le32 d_drivedata[5];
1: +  __le32 d_spare[5];
1: +  __le32 d_magic2;
1: +  __le16 d_checksum;
1: +  __le16 d_npartitions;
1: +  __le32 d_bbsize;
1: +  __le32 d_sbsize;
1: +  struct d_partition d_partitions[18];
1: +};
1: +
1: +enum {
1: +  LINUX_RAID_PARTITION___2 = 253,
1:  };
1:  
1:  struct sgi_volume {
1: -	s8 name[8];
1: -	__be32 block_num;
1: -	__be32 num_bytes;
1: +  s8 name[8];
1: +  __be32 block_num;
1: +  __be32 num_bytes;
1:  };
1:  
1:  struct sgi_partition {
1: -	__be32 num_blocks;
1: -	__be32 first_block;
1: -	__be32 type;
1: +  __be32 num_blocks;
1: +  __be32 first_block;
1: +  __be32 type;
1:  };
1:  
1:  struct sgi_disklabel {
1: -	__be32 magic_mushroom;
1: -	__be16 root_part_num;
1: -	__be16 swap_part_num;
1: -	s8 boot_file[16];
1: -	u8 _unused0[48];
1: -	struct sgi_volume volume[15];
1: -	struct sgi_partition partitions[16];
1: -	__be32 csum;
1: -	__be32 _unused1;
1: +  __be32 magic_mushroom;
1: +  __be16 root_part_num;
1: +  __be16 swap_part_num;
1: +  s8 boot_file[16];
1: +  u8 _unused0[48];
1: +  struct sgi_volume volume[15];
1: +  struct sgi_partition partitions[16];
1: +  __be32 csum;
1: +  __be32 _unused1;
1:  };
1:  
1:  enum {
1: -	SUN_WHOLE_DISK = 5,
1: -	LINUX_RAID_PARTITION___3 = 253,
1: +  SUN_WHOLE_DISK = 5,
1: +  LINUX_RAID_PARTITION___3 = 253,
1:  };
1:  
1:  struct sun_info {
1: -	__be16 id;
1: -	__be16 flags;
1: +  __be16 id;
1: +  __be16 flags;
1:  };
1:  
1:  struct sun_vtoc {
1: -	__be32 version;
1: -	char volume[8];
1: -	__be16 nparts;
1: -	struct sun_info infos[8];
1: -	__be16 padding;
1: -	__be32 bootinfo[3];
1: -	__be32 sanity;
1: -	__be32 reserved[10];
1: -	__be32 timestamp[8];
1: +  __be32 version;
1: +  char volume[8];
1: +  __be16 nparts;
1: +  struct sun_info infos[8];
1: +  __be16 padding;
1: +  __be32 bootinfo[3];
1: +  __be32 sanity;
1: +  __be32 reserved[10];
1: +  __be32 timestamp[8];
1:  };
1:  
1:  struct sun_partition {
1: -	__be32 start_cylinder;
1: -	__be32 num_sectors;
1: +  __be32 start_cylinder;
1: +  __be32 num_sectors;
1:  };
1:  
1:  struct sun_disklabel {
1: -	unsigned char info[128];
1: -	struct sun_vtoc vtoc;
1: -	__be32 write_reinstruct;
1: -	__be32 read_reinstruct;
1: -	unsigned char spare[148];
1: -	__be16 rspeed;
1: -	__be16 pcylcount;
1: -	__be16 sparecyl;
1: -	__be16 obs1;
1: -	__be16 obs2;
1: -	__be16 ilfact;
1: -	__be16 ncyl;
1: -	__be16 nacyl;
1: -	__be16 ntrks;
1: -	__be16 nsect;
1: -	__be16 obs3;
1: -	__be16 obs4;
1: -	struct sun_partition partitions[8];
1: -	__be16 magic;
1: -	__be16 csum;
1: +  unsigned char info[128];
1: +  struct sun_vtoc vtoc;
1: +  __be32 write_reinstruct;
1: +  __be32 read_reinstruct;
1: +  unsigned char spare[148];
1: +  __be16 rspeed;
1: +  __be16 pcylcount;
1: +  __be16 sparecyl;
1: +  __be16 obs1;
1: +  __be16 obs2;
1: +  __be16 ilfact;
1: +  __be16 ncyl;
1: +  __be16 nacyl;
1: +  __be16 ntrks;
1: +  __be16 nsect;
1: +  __be16 obs3;
1: +  __be16 obs4;
1: +  struct sun_partition partitions[8];
1: +  __be16 magic;
1: +  __be16 csum;
1:  };
1:  
1:  struct _gpt_header {
1: -	__le64 signature;
1: -	__le32 revision;
1: -	__le32 header_size;
1: -	__le32 header_crc32;
1: -	__le32 reserved1;
1: -	__le64 my_lba;
1: -	__le64 alternate_lba;
1: -	__le64 first_usable_lba;
1: -	__le64 last_usable_lba;
1: -	efi_guid_t disk_guid;
1: -	__le64 partition_entry_lba;
1: -	__le32 num_partition_entries;
1: -	__le32 sizeof_partition_entry;
1: -	__le32 partition_entry_array_crc32;
1: +  __le64 signature;
1: +  __le32 revision;
1: +  __le32 header_size;
1: +  __le32 header_crc32;
1: +  __le32 reserved1;
1: +  __le64 my_lba;
1: +  __le64 alternate_lba;
1: +  __le64 first_usable_lba;
1: +  __le64 last_usable_lba;
1: +  efi_guid_t disk_guid;
1: +  __le64 partition_entry_lba;
1: +  __le32 num_partition_entries;
1: +  __le32 sizeof_partition_entry;
1: +  __le32 partition_entry_array_crc32;
1:  } __attribute__((packed));
1:  
1:  typedef struct _gpt_header gpt_header;
1:  
1:  struct _gpt_entry_attributes {
1: -	u64 required_to_function: 1;
1: -	u64 reserved: 47;
1: -	u64 type_guid_specific: 16;
1: +  u64 required_to_function : 1;
1: +  u64 reserved : 47;
1: +  u64 type_guid_specific : 16;
1:  };
1:  
1:  typedef struct _gpt_entry_attributes gpt_entry_attributes;
1:  
1:  struct _gpt_entry {
1: -	efi_guid_t partition_type_guid;
1: -	efi_guid_t unique_partition_guid;
1: -	__le64 starting_lba;
1: -	__le64 ending_lba;
1: -	gpt_entry_attributes attributes;
1: -	__le16 partition_name[36];
1: +  efi_guid_t partition_type_guid;
1: +  efi_guid_t unique_partition_guid;
1: +  __le64 starting_lba;
1: +  __le64 ending_lba;
1: +  gpt_entry_attributes attributes;
1: +  __le16 partition_name[36];
1:  };
1:  
1:  typedef struct _gpt_entry gpt_entry;
1:  
1:  struct _gpt_mbr_record {
1: -	u8 boot_indicator;
1: -	u8 start_head;
1: -	u8 start_sector;
1: -	u8 start_track;
1: -	u8 os_type;
1: -	u8 end_head;
1: -	u8 end_sector;
1: -	u8 end_track;
1: -	__le32 starting_lba;
1: -	__le32 size_in_lba;
1: +  u8 boot_indicator;
1: +  u8 start_head;
1: +  u8 start_sector;
1: +  u8 start_track;
1: +  u8 os_type;
1: +  u8 end_head;
1: +  u8 end_sector;
1: +  u8 end_track;
1: +  __le32 starting_lba;
1: +  __le32 size_in_lba;
1:  };
1:  
1:  typedef struct _gpt_mbr_record gpt_mbr_record;
1:  
1:  struct _legacy_mbr {
1: -	u8 boot_code[440];
1: -	__le32 unique_mbr_signature;
1: -	__le16 unknown;
1: -	gpt_mbr_record partition_record[4];
1: -	__le16 signature;
1: +  u8 boot_code[440];
1: +  __le32 unique_mbr_signature;
1: +  __le16 unknown;
1: +  gpt_mbr_record partition_record[4];
1: +  __le16 signature;
1:  } __attribute__((packed));
1:  
1:  typedef struct _legacy_mbr legacy_mbr;
1:  
1:  struct d_partition___2 {
1: -	__le32 p_res;
1: -	u8 p_fstype;
1: -	u8 p_res2[3];
1: -	__le32 p_offset;
1: -	__le32 p_size;
1: +  __le32 p_res;
1: +  u8 p_fstype;
1: +  u8 p_res2[3];
1: +  __le32 p_offset;
1: +  __le32 p_size;
1:  };
1:  
1:  struct disklabel___2 {
1: -	u8 d_reserved[270];
1: -	struct d_partition___2 d_partitions[2];
1: -	u8 d_blank[208];
1: -	__le16 d_magic;
1: +  u8 d_reserved[270];
1: +  struct d_partition___2 d_partitions[2];
1: +  u8 d_blank[208];
1: +  __le16 d_magic;
1:  } __attribute__((packed));
1:  
1:  struct rq_wait {
1: -	wait_queue_head_t wait;
1: -	atomic_t inflight;
1: +  wait_queue_head_t wait;
1: +  atomic_t inflight;
1:  };
1:  
1:  struct rq_depth {
1: -	unsigned int max_depth;
1: -	int scale_step;
1: -	bool scaled_max;
1: -	unsigned int queue_depth;
1: -	unsigned int default_depth;
1: +  unsigned int max_depth;
1: +  int scale_step;
1: +  bool scaled_max;
1: +  unsigned int queue_depth;
1: +  unsigned int default_depth;
1:  };
1:  
1:  typedef bool acquire_inflight_cb_t(struct rq_wait *, void *);
1: @@ -63559,159 +64509,159 @@ typedef bool acquire_inflight_cb_t(struct rq_wait *, void *);
1:  typedef void cleanup_cb_t(struct rq_wait *, void *);
1:  
1:  struct rq_qos_wait_data {
1: -	struct wait_queue_entry wq;
1: -	struct task_struct *task;
1: -	struct rq_wait *rqw;
1: -	acquire_inflight_cb_t *cb;
1: -	void *private_data;
1: -	bool got_token;
1: +  struct wait_queue_entry wq;
1: +  struct task_struct *task;
1: +  struct rq_wait *rqw;
1: +  acquire_inflight_cb_t *cb;
1: +  void *private_data;
1: +  bool got_token;
1:  };
1:  
1:  struct request_sense;
1:  
1:  struct cdrom_generic_command {
1: -	unsigned char cmd[12];
1: -	unsigned char *buffer;
1: -	unsigned int buflen;
1: -	int stat;
1: -	struct request_sense *sense;
1: -	unsigned char data_direction;
1: -	int quiet;
1: -	int timeout;
1: -	union {
1: -		void *reserved[1];
1: -		void *unused;
1: -	};
1: +  unsigned char cmd[12];
1: +  unsigned char *buffer;
1: +  unsigned int buflen;
1: +  int stat;
1: +  struct request_sense *sense;
1: +  unsigned char data_direction;
1: +  int quiet;
1: +  int timeout;
1: +  union {
1: +    void *reserved[1];
1: +    void *unused;
1: +  };
1:  };
1:  
1:  struct request_sense {
1: -	__u8 error_code: 7;
1: -	__u8 valid: 1;
1: -	__u8 segment_number;
1: -	__u8 sense_key: 4;
1: -	__u8 reserved2: 1;
1: -	__u8 ili: 1;
1: -	__u8 reserved1: 2;
1: -	__u8 information[4];
1: -	__u8 add_sense_len;
1: -	__u8 command_info[4];
1: -	__u8 asc;
1: -	__u8 ascq;
1: -	__u8 fruc;
1: -	__u8 sks[3];
1: -	__u8 asb[46];
1: +  __u8 error_code : 7;
1: +  __u8 valid : 1;
1: +  __u8 segment_number;
1: +  __u8 sense_key : 4;
1: +  __u8 reserved2 : 1;
1: +  __u8 ili : 1;
1: +  __u8 reserved1 : 2;
1: +  __u8 information[4];
1: +  __u8 add_sense_len;
1: +  __u8 command_info[4];
1: +  __u8 asc;
1: +  __u8 ascq;
1: +  __u8 fruc;
1: +  __u8 sks[3];
1: +  __u8 asb[46];
1:  };
1:  
1:  struct scsi_ioctl_command {
1: -	unsigned int inlen;
1: -	unsigned int outlen;
1: -	unsigned char data[0];
1: +  unsigned int inlen;
1: +  unsigned int outlen;
1: +  unsigned char data[0];
1:  };
1:  
1:  enum scsi_device_event {
1: -	SDEV_EVT_MEDIA_CHANGE = 1,
1: -	SDEV_EVT_INQUIRY_CHANGE_REPORTED = 2,
1: -	SDEV_EVT_CAPACITY_CHANGE_REPORTED = 3,
1: -	SDEV_EVT_SOFT_THRESHOLD_REACHED_REPORTED = 4,
1: -	SDEV_EVT_MODE_PARAMETER_CHANGE_REPORTED = 5,
1: -	SDEV_EVT_LUN_CHANGE_REPORTED = 6,
1: -	SDEV_EVT_ALUA_STATE_CHANGE_REPORTED = 7,
1: -	SDEV_EVT_POWER_ON_RESET_OCCURRED = 8,
1: -	SDEV_EVT_FIRST = 1,
1: -	SDEV_EVT_LAST = 8,
1: -	SDEV_EVT_MAXBITS = 9,
1: +  SDEV_EVT_MEDIA_CHANGE = 1,
1: +  SDEV_EVT_INQUIRY_CHANGE_REPORTED = 2,
1: +  SDEV_EVT_CAPACITY_CHANGE_REPORTED = 3,
1: +  SDEV_EVT_SOFT_THRESHOLD_REACHED_REPORTED = 4,
1: +  SDEV_EVT_MODE_PARAMETER_CHANGE_REPORTED = 5,
1: +  SDEV_EVT_LUN_CHANGE_REPORTED = 6,
1: +  SDEV_EVT_ALUA_STATE_CHANGE_REPORTED = 7,
1: +  SDEV_EVT_POWER_ON_RESET_OCCURRED = 8,
1: +  SDEV_EVT_FIRST = 1,
1: +  SDEV_EVT_LAST = 8,
1: +  SDEV_EVT_MAXBITS = 9,
1:  };
1:  
1:  struct scsi_request {
1: -	unsigned char __cmd[16];
1: -	unsigned char *cmd;
1: -	short unsigned int cmd_len;
1: -	int result;
1: -	unsigned int sense_len;
1: -	unsigned int resid_len;
1: -	int retries;
1: -	void *sense;
1: +  unsigned char __cmd[16];
1: +  unsigned char *cmd;
1: +  short unsigned int cmd_len;
1: +  int result;
1: +  unsigned int sense_len;
1: +  unsigned int resid_len;
1: +  int retries;
1: +  void *sense;
1:  };
1:  
1:  struct sg_io_hdr {
1: -	int interface_id;
1: -	int dxfer_direction;
1: -	unsigned char cmd_len;
1: -	unsigned char mx_sb_len;
1: -	short unsigned int iovec_count;
1: -	unsigned int dxfer_len;
1: -	void *dxferp;
1: -	unsigned char *cmdp;
1: -	void *sbp;
1: -	unsigned int timeout;
1: -	unsigned int flags;
1: -	int pack_id;
1: -	void *usr_ptr;
1: -	unsigned char status;
1: -	unsigned char masked_status;
1: -	unsigned char msg_status;
1: -	unsigned char sb_len_wr;
1: -	short unsigned int host_status;
1: -	short unsigned int driver_status;
1: -	int resid;
1: -	unsigned int duration;
1: -	unsigned int info;
1: +  int interface_id;
1: +  int dxfer_direction;
1: +  unsigned char cmd_len;
1: +  unsigned char mx_sb_len;
1: +  short unsigned int iovec_count;
1: +  unsigned int dxfer_len;
1: +  void *dxferp;
1: +  unsigned char *cmdp;
1: +  void *sbp;
1: +  unsigned int timeout;
1: +  unsigned int flags;
1: +  int pack_id;
1: +  void *usr_ptr;
1: +  unsigned char status;
1: +  unsigned char masked_status;
1: +  unsigned char msg_status;
1: +  unsigned char sb_len_wr;
1: +  short unsigned int host_status;
1: +  short unsigned int driver_status;
1: +  int resid;
1: +  unsigned int duration;
1: +  unsigned int info;
1:  };
1:  
1:  struct compat_sg_io_hdr {
1: -	compat_int_t interface_id;
1: -	compat_int_t dxfer_direction;
1: -	unsigned char cmd_len;
1: -	unsigned char mx_sb_len;
1: -	short unsigned int iovec_count;
1: -	compat_uint_t dxfer_len;
1: -	compat_uint_t dxferp;
1: -	compat_uptr_t cmdp;
1: -	compat_uptr_t sbp;
1: -	compat_uint_t timeout;
1: -	compat_uint_t flags;
1: -	compat_int_t pack_id;
1: -	compat_uptr_t usr_ptr;
1: -	unsigned char status;
1: -	unsigned char masked_status;
1: -	unsigned char msg_status;
1: -	unsigned char sb_len_wr;
1: -	short unsigned int host_status;
1: -	short unsigned int driver_status;
1: -	compat_int_t resid;
1: -	compat_uint_t duration;
1: -	compat_uint_t info;
1: +  compat_int_t interface_id;
1: +  compat_int_t dxfer_direction;
1: +  unsigned char cmd_len;
1: +  unsigned char mx_sb_len;
1: +  short unsigned int iovec_count;
1: +  compat_uint_t dxfer_len;
1: +  compat_uint_t dxferp;
1: +  compat_uptr_t cmdp;
1: +  compat_uptr_t sbp;
1: +  compat_uint_t timeout;
1: +  compat_uint_t flags;
1: +  compat_int_t pack_id;
1: +  compat_uptr_t usr_ptr;
1: +  unsigned char status;
1: +  unsigned char masked_status;
1: +  unsigned char msg_status;
1: +  unsigned char sb_len_wr;
1: +  short unsigned int host_status;
1: +  short unsigned int driver_status;
1: +  compat_int_t resid;
1: +  compat_uint_t duration;
1: +  compat_uint_t info;
1:  };
1:  
1:  struct blk_cmd_filter {
1: -	long unsigned int read_ok[4];
1: -	long unsigned int write_ok[4];
1: +  long unsigned int read_ok[4];
1: +  long unsigned int write_ok[4];
1:  };
1:  
1:  struct compat_cdrom_generic_command {
1: -	unsigned char cmd[12];
1: -	compat_caddr_t buffer;
1: -	compat_uint_t buflen;
1: -	compat_int_t stat;
1: -	compat_caddr_t sense;
1: -	unsigned char data_direction;
1: -	unsigned char pad[3];
1: -	compat_int_t quiet;
1: -	compat_int_t timeout;
1: -	compat_caddr_t unused;
1: +  unsigned char cmd[12];
1: +  compat_caddr_t buffer;
1: +  compat_uint_t buflen;
1: +  compat_int_t stat;
1: +  compat_caddr_t sense;
1: +  unsigned char data_direction;
1: +  unsigned char pad[3];
1: +  compat_int_t quiet;
1: +  compat_int_t timeout;
1: +  compat_caddr_t unused;
1:  };
1:  
1:  enum {
1: -	OMAX_SB_LEN = 16,
1: +  OMAX_SB_LEN = 16,
1:  };
1:  
1:  struct bsg_device {
1: -	struct request_queue *queue;
1: -	spinlock_t lock;
1: -	struct hlist_node dev_list;
1: -	refcount_t ref_count;
1: -	char name[20];
1: -	int max_queue;
1: +  struct request_queue *queue;
1: +  spinlock_t lock;
1: +  struct hlist_node dev_list;
1: +  refcount_t ref_count;
1: +  char name[20];
1: +  int max_queue;
1:  };
1:  
1:  struct bsg_job;
1: @@ -63719,34 +64669,34 @@ struct bsg_job;
1:  typedef int bsg_job_fn(struct bsg_job *);
1:  
1:  struct bsg_buffer {
1: -	unsigned int payload_len;
1: -	int sg_cnt;
1: -	struct scatterlist *sg_list;
1: +  unsigned int payload_len;
1: +  int sg_cnt;
1: +  struct scatterlist *sg_list;
1:  };
1:  
1:  struct bsg_job {
1: -	struct device *dev;
1: -	struct kref kref;
1: -	unsigned int timeout;
1: -	void *request;
1: -	void *reply;
1: -	unsigned int request_len;
1: -	unsigned int reply_len;
1: -	struct bsg_buffer request_payload;
1: -	struct bsg_buffer reply_payload;
1: -	int result;
1: -	unsigned int reply_payload_rcv_len;
1: -	struct request *bidi_rq;
1: -	struct bio *bidi_bio;
1: -	void *dd_data;
1: +  struct device *dev;
1: +  struct kref kref;
1: +  unsigned int timeout;
1: +  void *request;
1: +  void *reply;
1: +  unsigned int request_len;
1: +  unsigned int reply_len;
1: +  struct bsg_buffer request_payload;
1: +  struct bsg_buffer reply_payload;
1: +  int result;
1: +  unsigned int reply_payload_rcv_len;
1: +  struct request *bidi_rq;
1: +  struct bio *bidi_bio;
1: +  void *dd_data;
1:  };
1:  
1:  typedef enum blk_eh_timer_return bsg_timeout_fn(struct request *);
1:  
1:  struct bsg_set {
1: -	struct blk_mq_tag_set tag_set;
1: -	bsg_job_fn *job_fn;
1: -	bsg_timeout_fn *timeout_fn;
1: +  struct blk_mq_tag_set tag_set;
1: +  bsg_job_fn *job_fn;
1: +  bsg_timeout_fn *timeout_fn;
1:  };
1:  
1:  typedef struct blkcg_policy_data *blkcg_pol_alloc_cpd_fn(gfp_t);
1: @@ -63757,7 +64707,9 @@ typedef void blkcg_pol_free_cpd_fn(struct blkcg_policy_data *);
1:  
1:  typedef void blkcg_pol_bind_cpd_fn(struct blkcg_policy_data *);
1:  
1: -typedef struct blkg_policy_data *blkcg_pol_alloc_pd_fn(gfp_t, struct request_queue *, struct blkcg *);
1: +typedef struct blkg_policy_data *blkcg_pol_alloc_pd_fn(gfp_t,
1: +                                                       struct request_queue *,
1: +                                                       struct blkcg *);
1:  
1:  typedef void blkcg_pol_init_pd_fn(struct blkg_policy_data *);
1:  
1: @@ -63772,181 +64724,181 @@ typedef void blkcg_pol_reset_pd_stats_fn(struct blkg_policy_data *);
1:  typedef size_t blkcg_pol_stat_pd_fn(struct blkg_policy_data *, char *, size_t);
1:  
1:  struct blkcg_policy {
1: -	int plid;
1: -	struct cftype *dfl_cftypes;
1: -	struct cftype *legacy_cftypes;
1: -	blkcg_pol_alloc_cpd_fn *cpd_alloc_fn;
1: -	blkcg_pol_init_cpd_fn *cpd_init_fn;
1: -	blkcg_pol_free_cpd_fn *cpd_free_fn;
1: -	blkcg_pol_bind_cpd_fn *cpd_bind_fn;
1: -	blkcg_pol_alloc_pd_fn *pd_alloc_fn;
1: -	blkcg_pol_init_pd_fn *pd_init_fn;
1: -	blkcg_pol_online_pd_fn *pd_online_fn;
1: -	blkcg_pol_offline_pd_fn *pd_offline_fn;
1: -	blkcg_pol_free_pd_fn *pd_free_fn;
1: -	blkcg_pol_reset_pd_stats_fn *pd_reset_stats_fn;
1: -	blkcg_pol_stat_pd_fn *pd_stat_fn;
1: +  int plid;
1: +  struct cftype *dfl_cftypes;
1: +  struct cftype *legacy_cftypes;
1: +  blkcg_pol_alloc_cpd_fn *cpd_alloc_fn;
1: +  blkcg_pol_init_cpd_fn *cpd_init_fn;
1: +  blkcg_pol_free_cpd_fn *cpd_free_fn;
1: +  blkcg_pol_bind_cpd_fn *cpd_bind_fn;
1: +  blkcg_pol_alloc_pd_fn *pd_alloc_fn;
1: +  blkcg_pol_init_pd_fn *pd_init_fn;
1: +  blkcg_pol_online_pd_fn *pd_online_fn;
1: +  blkcg_pol_offline_pd_fn *pd_offline_fn;
1: +  blkcg_pol_free_pd_fn *pd_free_fn;
1: +  blkcg_pol_reset_pd_stats_fn *pd_reset_stats_fn;
1: +  blkcg_pol_stat_pd_fn *pd_stat_fn;
1:  };
1:  
1:  struct blkg_conf_ctx {
1: -	struct gendisk *disk;
1: -	struct blkcg_gq *blkg;
1: -	char *body;
1: +  struct gendisk *disk;
1: +  struct blkcg_gq *blkg;
1: +  char *body;
1:  };
1:  
1:  enum blkg_rwstat_type {
1: -	BLKG_RWSTAT_READ = 0,
1: -	BLKG_RWSTAT_WRITE = 1,
1: -	BLKG_RWSTAT_SYNC = 2,
1: -	BLKG_RWSTAT_ASYNC = 3,
1: -	BLKG_RWSTAT_DISCARD = 4,
1: -	BLKG_RWSTAT_NR = 5,
1: -	BLKG_RWSTAT_TOTAL = 5,
1: +  BLKG_RWSTAT_READ = 0,
1: +  BLKG_RWSTAT_WRITE = 1,
1: +  BLKG_RWSTAT_SYNC = 2,
1: +  BLKG_RWSTAT_ASYNC = 3,
1: +  BLKG_RWSTAT_DISCARD = 4,
1: +  BLKG_RWSTAT_NR = 5,
1: +  BLKG_RWSTAT_TOTAL = 5,
1:  };
1:  
1:  struct blkg_rwstat {
1: -	struct percpu_counter cpu_cnt[5];
1: -	atomic64_t aux_cnt[5];
1: +  struct percpu_counter cpu_cnt[5];
1: +  atomic64_t aux_cnt[5];
1:  };
1:  
1:  struct blkg_rwstat_sample {
1: -	u64 cnt[5];
1: +  u64 cnt[5];
1:  };
1:  
1:  struct throtl_service_queue {
1: -	struct throtl_service_queue *parent_sq;
1: -	struct list_head queued[2];
1: -	unsigned int nr_queued[2];
1: -	struct rb_root_cached pending_tree;
1: -	unsigned int nr_pending;
1: -	long unsigned int first_pending_disptime;
1: -	struct timer_list pending_timer;
1: +  struct throtl_service_queue *parent_sq;
1: +  struct list_head queued[2];
1: +  unsigned int nr_queued[2];
1: +  struct rb_root_cached pending_tree;
1: +  unsigned int nr_pending;
1: +  long unsigned int first_pending_disptime;
1: +  struct timer_list pending_timer;
1:  };
1:  
1:  struct latency_bucket {
1: -	long unsigned int total_latency;
1: -	int samples;
1: +  long unsigned int total_latency;
1: +  int samples;
1:  };
1:  
1:  struct avg_latency_bucket {
1: -	long unsigned int latency;
1: -	bool valid;
1: +  long unsigned int latency;
1: +  bool valid;
1:  };
1:  
1:  struct throtl_data {
1: -	struct throtl_service_queue service_queue;
1: -	struct request_queue *queue;
1: -	unsigned int nr_queued[2];
1: -	unsigned int throtl_slice;
1: -	struct work_struct dispatch_work;
1: -	unsigned int limit_index;
1: -	bool limit_valid[2];
1: -	long unsigned int low_upgrade_time;
1: -	long unsigned int low_downgrade_time;
1: -	unsigned int scale;
1: -	struct latency_bucket tmp_buckets[18];
1: -	struct avg_latency_bucket avg_buckets[18];
1: -	struct latency_bucket *latency_buckets[2];
1: -	long unsigned int last_calculate_time;
1: -	long unsigned int filtered_latency;
1: -	bool track_bio_latency;
1: +  struct throtl_service_queue service_queue;
1: +  struct request_queue *queue;
1: +  unsigned int nr_queued[2];
1: +  unsigned int throtl_slice;
1: +  struct work_struct dispatch_work;
1: +  unsigned int limit_index;
1: +  bool limit_valid[2];
1: +  long unsigned int low_upgrade_time;
1: +  long unsigned int low_downgrade_time;
1: +  unsigned int scale;
1: +  struct latency_bucket tmp_buckets[18];
1: +  struct avg_latency_bucket avg_buckets[18];
1: +  struct latency_bucket *latency_buckets[2];
1: +  long unsigned int last_calculate_time;
1: +  long unsigned int filtered_latency;
1: +  bool track_bio_latency;
1:  };
1:  
1:  struct throtl_grp;
1:  
1:  struct throtl_qnode {
1: -	struct list_head node;
1: -	struct bio_list bios;
1: -	struct throtl_grp *tg;
1: +  struct list_head node;
1: +  struct bio_list bios;
1: +  struct throtl_grp *tg;
1:  };
1:  
1:  struct throtl_grp {
1: -	struct blkg_policy_data pd;
1: -	struct rb_node rb_node;
1: -	struct throtl_data *td;
1: -	struct throtl_service_queue service_queue;
1: -	struct throtl_qnode qnode_on_self[2];
1: -	struct throtl_qnode qnode_on_parent[2];
1: -	long unsigned int disptime;
1: -	unsigned int flags;
1: -	bool has_rules[2];
1: -	uint64_t bps[4];
1: -	uint64_t bps_conf[4];
1: -	unsigned int iops[4];
1: -	unsigned int iops_conf[4];
1: -	uint64_t bytes_disp[2];
1: -	unsigned int io_disp[2];
1: -	long unsigned int last_low_overflow_time[2];
1: -	uint64_t last_bytes_disp[2];
1: -	unsigned int last_io_disp[2];
1: -	long unsigned int last_check_time;
1: -	long unsigned int latency_target;
1: -	long unsigned int latency_target_conf;
1: -	long unsigned int slice_start[2];
1: -	long unsigned int slice_end[2];
1: -	long unsigned int last_finish_time;
1: -	long unsigned int checked_last_finish_time;
1: -	long unsigned int avg_idletime;
1: -	long unsigned int idletime_threshold;
1: -	long unsigned int idletime_threshold_conf;
1: -	unsigned int bio_cnt;
1: -	unsigned int bad_bio_cnt;
1: -	long unsigned int bio_cnt_reset_time;
1: -	struct blkg_rwstat stat_bytes;
1: -	struct blkg_rwstat stat_ios;
1: +  struct blkg_policy_data pd;
1: +  struct rb_node rb_node;
1: +  struct throtl_data *td;
1: +  struct throtl_service_queue service_queue;
1: +  struct throtl_qnode qnode_on_self[2];
1: +  struct throtl_qnode qnode_on_parent[2];
1: +  long unsigned int disptime;
1: +  unsigned int flags;
1: +  bool has_rules[2];
1: +  uint64_t bps[4];
1: +  uint64_t bps_conf[4];
1: +  unsigned int iops[4];
1: +  unsigned int iops_conf[4];
1: +  uint64_t bytes_disp[2];
1: +  unsigned int io_disp[2];
1: +  long unsigned int last_low_overflow_time[2];
1: +  uint64_t last_bytes_disp[2];
1: +  unsigned int last_io_disp[2];
1: +  long unsigned int last_check_time;
1: +  long unsigned int latency_target;
1: +  long unsigned int latency_target_conf;
1: +  long unsigned int slice_start[2];
1: +  long unsigned int slice_end[2];
1: +  long unsigned int last_finish_time;
1: +  long unsigned int checked_last_finish_time;
1: +  long unsigned int avg_idletime;
1: +  long unsigned int idletime_threshold;
1: +  long unsigned int idletime_threshold_conf;
1: +  unsigned int bio_cnt;
1: +  unsigned int bad_bio_cnt;
1: +  long unsigned int bio_cnt_reset_time;
1: +  struct blkg_rwstat stat_bytes;
1: +  struct blkg_rwstat stat_ios;
1:  };
1:  
1:  enum tg_state_flags {
1: -	THROTL_TG_PENDING = 1,
1: -	THROTL_TG_WAS_EMPTY = 2,
1: +  THROTL_TG_PENDING = 1,
1: +  THROTL_TG_WAS_EMPTY = 2,
1:  };
1:  
1:  enum {
1: -	LIMIT_LOW = 0,
1: -	LIMIT_MAX = 1,
1: -	LIMIT_CNT = 2,
1: +  LIMIT_LOW = 0,
1: +  LIMIT_MAX = 1,
1: +  LIMIT_CNT = 2,
1:  };
1:  
1:  struct deadline_data {
1: -	struct rb_root sort_list[2];
1: -	struct list_head fifo_list[2];
1: -	struct request *next_rq[2];
1: -	unsigned int batching;
1: -	unsigned int starved;
1: -	int fifo_expire[2];
1: -	int fifo_batch;
1: -	int writes_starved;
1: -	int front_merges;
1: -	spinlock_t lock;
1: -	spinlock_t zone_lock;
1: -	struct list_head dispatch;
1: +  struct rb_root sort_list[2];
1: +  struct list_head fifo_list[2];
1: +  struct request *next_rq[2];
1: +  unsigned int batching;
1: +  unsigned int starved;
1: +  int fifo_expire[2];
1: +  int fifo_batch;
1: +  int writes_starved;
1: +  int front_merges;
1: +  spinlock_t lock;
1: +  spinlock_t zone_lock;
1: +  struct list_head dispatch;
1:  };
1:  
1:  struct trace_event_raw_kyber_latency {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	char domain[16];
1: -	char type[8];
1: -	u8 percentile;
1: -	u8 numerator;
1: -	u8 denominator;
1: -	unsigned int samples;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  char domain[16];
1: +  char type[8];
1: +  u8 percentile;
1: +  u8 numerator;
1: +  u8 denominator;
1: +  unsigned int samples;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_kyber_adjust {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	char domain[16];
1: -	unsigned int depth;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  char domain[16];
1: +  unsigned int depth;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_kyber_throttled {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	char domain[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  char domain[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_kyber_latency {};
1: @@ -63955,94 +64907,99 @@ struct trace_event_data_offsets_kyber_adjust {};
1:  
1:  struct trace_event_data_offsets_kyber_throttled {};
1:  
1: -typedef void (*btf_trace_kyber_latency)(void *, struct request_queue *, const char *, const char *, unsigned int, unsigned int, unsigned int, unsigned int);
1: +typedef void (*btf_trace_kyber_latency)(void *, struct request_queue *,
1: +                                        const char *, const char *,
1: +                                        unsigned int, unsigned int,
1: +                                        unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_kyber_adjust)(void *, struct request_queue *, const char *, unsigned int);
1: +typedef void (*btf_trace_kyber_adjust)(void *, struct request_queue *,
1: +                                       const char *, unsigned int);
1:  
1: -typedef void (*btf_trace_kyber_throttled)(void *, struct request_queue *, const char *);
1: +typedef void (*btf_trace_kyber_throttled)(void *, struct request_queue *,
1: +                                          const char *);
1:  
1:  enum {
1: -	KYBER_READ = 0,
1: -	KYBER_WRITE = 1,
1: -	KYBER_DISCARD = 2,
1: -	KYBER_OTHER = 3,
1: -	KYBER_NUM_DOMAINS = 4,
1: +  KYBER_READ = 0,
1: +  KYBER_WRITE = 1,
1: +  KYBER_DISCARD = 2,
1: +  KYBER_OTHER = 3,
1: +  KYBER_NUM_DOMAINS = 4,
1:  };
1:  
1:  enum {
1: -	KYBER_ASYNC_PERCENT = 75,
1: +  KYBER_ASYNC_PERCENT = 75,
1:  };
1:  
1:  enum {
1: -	KYBER_LATENCY_SHIFT = 2,
1: -	KYBER_GOOD_BUCKETS = 4,
1: -	KYBER_LATENCY_BUCKETS = 8,
1: +  KYBER_LATENCY_SHIFT = 2,
1: +  KYBER_GOOD_BUCKETS = 4,
1: +  KYBER_LATENCY_BUCKETS = 8,
1:  };
1:  
1:  enum {
1: -	KYBER_TOTAL_LATENCY = 0,
1: -	KYBER_IO_LATENCY = 1,
1: +  KYBER_TOTAL_LATENCY = 0,
1: +  KYBER_IO_LATENCY = 1,
1:  };
1:  
1:  struct kyber_cpu_latency {
1: -	atomic_t buckets[48];
1: +  atomic_t buckets[48];
1:  };
1:  
1:  struct kyber_ctx_queue {
1: -	spinlock_t lock;
1: -	struct list_head rq_list[4];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  spinlock_t lock;
1: +  struct list_head rq_list[4];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct kyber_queue_data {
1: -	struct request_queue *q;
1: -	struct sbitmap_queue domain_tokens[4];
1: -	unsigned int async_depth;
1: -	struct kyber_cpu_latency *cpu_latency;
1: -	struct timer_list timer;
1: -	unsigned int latency_buckets[48];
1: -	long unsigned int latency_timeout[3];
1: -	int domain_p99[3];
1: -	u64 latency_targets[3];
1: +  struct request_queue *q;
1: +  struct sbitmap_queue domain_tokens[4];
1: +  unsigned int async_depth;
1: +  struct kyber_cpu_latency *cpu_latency;
1: +  struct timer_list timer;
1: +  unsigned int latency_buckets[48];
1: +  long unsigned int latency_timeout[3];
1: +  int domain_p99[3];
1: +  u64 latency_targets[3];
1:  };
1:  
1:  struct kyber_hctx_data {
1: -	spinlock_t lock;
1: -	struct list_head rqs[4];
1: -	unsigned int cur_domain;
1: -	unsigned int batching;
1: -	struct kyber_ctx_queue *kcqs;
1: -	struct sbitmap kcq_map[4];
1: -	struct sbq_wait domain_wait[4];
1: -	struct sbq_wait_state *domain_ws[4];
1: -	atomic_t wait_index[4];
1: +  spinlock_t lock;
1: +  struct list_head rqs[4];
1: +  unsigned int cur_domain;
1: +  unsigned int batching;
1: +  struct kyber_ctx_queue *kcqs;
1: +  struct sbitmap kcq_map[4];
1: +  struct sbq_wait domain_wait[4];
1: +  struct sbq_wait_state *domain_ws[4];
1: +  atomic_t wait_index[4];
1:  };
1:  
1:  struct flush_kcq_data {
1: -	struct kyber_hctx_data *khd;
1: -	unsigned int sched_domain;
1: -	struct list_head *list;
1: +  struct kyber_hctx_data *khd;
1: +  unsigned int sched_domain;
1: +  struct list_head *list;
1:  };
1:  
1:  struct virtio_device_id {
1: -	__u32 device;
1: -	__u32 vendor;
1: +  __u32 device;
1: +  __u32 vendor;
1:  };
1:  
1:  struct virtio_device;
1:  
1:  struct virtqueue {
1: -	struct list_head list;
1: -	void (*callback)(struct virtqueue *);
1: -	const char *name;
1: -	struct virtio_device *vdev;
1: -	unsigned int index;
1: -	unsigned int num_free;
1: -	void *priv;
1: +  struct list_head list;
1: +  void (*callback)(struct virtqueue *);
1: +  const char *name;
1: +  struct virtio_device *vdev;
1: +  unsigned int index;
1: +  unsigned int num_free;
1: +  void *priv;
1:  };
1:  
1:  struct vringh_config_ops;
1: @@ -64050,18 +65007,18 @@ struct vringh_config_ops;
1:  struct virtio_config_ops;
1:  
1:  struct virtio_device {
1: -	int index;
1: -	bool failed;
1: -	bool config_enabled;
1: -	bool config_change_pending;
1: -	spinlock_t config_lock;
1: -	struct device dev;
1: -	struct virtio_device_id id;
1: -	const struct virtio_config_ops *config;
1: -	const struct vringh_config_ops *vringh_config;
1: -	struct list_head vqs;
1: -	u64 features;
1: -	void *priv;
1: +  int index;
1: +  bool failed;
1: +  bool config_enabled;
1: +  bool config_change_pending;
1: +  spinlock_t config_lock;
1: +  struct device dev;
1: +  struct virtio_device_id id;
1: +  const struct virtio_config_ops *config;
1: +  const struct vringh_config_ops *vringh_config;
1: +  struct list_head vqs;
1: +  u64 features;
1: +  void *priv;
1:  };
1:  
1:  typedef void vq_callback_t(struct virtqueue *);
1: @@ -64069,25 +65026,28 @@ typedef void vq_callback_t(struct virtqueue *);
1:  struct virtio_shm_region;
1:  
1:  struct virtio_config_ops {
1: -	void (*get)(struct virtio_device *, unsigned int, void *, unsigned int);
1: -	void (*set)(struct virtio_device *, unsigned int, const void *, unsigned int);
1: -	u32 (*generation)(struct virtio_device *);
1: -	u8 (*get_status)(struct virtio_device *);
1: -	void (*set_status)(struct virtio_device *, u8);
1: -	void (*reset)(struct virtio_device *);
1: -	int (*find_vqs)(struct virtio_device *, unsigned int, struct virtqueue **, vq_callback_t **, const char * const *, const bool *, struct irq_affinity *);
1: -	void (*del_vqs)(struct virtio_device *);
1: -	u64 (*get_features)(struct virtio_device *);
1: -	int (*finalize_features)(struct virtio_device *);
1: -	const char * (*bus_name)(struct virtio_device *);
1: -	int (*set_vq_affinity)(struct virtqueue *, const struct cpumask *);
1: -	const struct cpumask * (*get_vq_affinity)(struct virtio_device *, int);
1: -	bool (*get_shm_region)(struct virtio_device *, struct virtio_shm_region *, u8);
1: +  void (*get)(struct virtio_device *, unsigned int, void *, unsigned int);
1: +  void (*set)(struct virtio_device *, unsigned int, const void *, unsigned int);
1: +  u32 (*generation)(struct virtio_device *);
1: +  u8 (*get_status)(struct virtio_device *);
1: +  void (*set_status)(struct virtio_device *, u8);
1: +  void (*reset)(struct virtio_device *);
1: +  int (*find_vqs)(struct virtio_device *, unsigned int, struct virtqueue **,
1: +                  vq_callback_t **, const char *const *, const bool *,
1: +                  struct irq_affinity *);
1: +  void (*del_vqs)(struct virtio_device *);
1: +  u64 (*get_features)(struct virtio_device *);
1: +  int (*finalize_features)(struct virtio_device *);
1: +  const char *(*bus_name)(struct virtio_device *);
1: +  int (*set_vq_affinity)(struct virtqueue *, const struct cpumask *);
1: +  const struct cpumask *(*get_vq_affinity)(struct virtio_device *, int);
1: +  bool (*get_shm_region)(struct virtio_device *, struct virtio_shm_region *,
1: +                         u8);
1:  };
1:  
1:  struct virtio_shm_region {
1: -	u64 addr;
1: -	u64 len;
1: +  u64 addr;
1: +  u64 len;
1:  };
1:  
1:  struct irq_poll;
1: @@ -64095,184 +65055,184 @@ struct irq_poll;
1:  typedef int irq_poll_fn(struct irq_poll *, int);
1:  
1:  struct irq_poll {
1: -	struct list_head list;
1: -	long unsigned int state;
1: -	int weight;
1: -	irq_poll_fn *poll;
1: +  struct list_head list;
1: +  long unsigned int state;
1: +  int weight;
1: +  irq_poll_fn *poll;
1:  };
1:  
1:  struct dim_sample {
1: -	ktime_t time;
1: -	u32 pkt_ctr;
1: -	u32 byte_ctr;
1: -	u16 event_ctr;
1: -	u32 comp_ctr;
1: +  ktime_t time;
1: +  u32 pkt_ctr;
1: +  u32 byte_ctr;
1: +  u16 event_ctr;
1: +  u32 comp_ctr;
1:  };
1:  
1:  struct dim_stats {
1: -	int ppms;
1: -	int bpms;
1: -	int epms;
1: -	int cpms;
1: -	int cpe_ratio;
1: +  int ppms;
1: +  int bpms;
1: +  int epms;
1: +  int cpms;
1: +  int cpe_ratio;
1:  };
1:  
1:  struct dim {
1: -	u8 state;
1: -	struct dim_stats prev_stats;
1: -	struct dim_sample start_sample;
1: -	struct dim_sample measuring_sample;
1: -	struct work_struct work;
1: -	void *priv;
1: -	u8 profile_ix;
1: -	u8 mode;
1: -	u8 tune_state;
1: -	u8 steps_right;
1: -	u8 steps_left;
1: -	u8 tired;
1: +  u8 state;
1: +  struct dim_stats prev_stats;
1: +  struct dim_sample start_sample;
1: +  struct dim_sample measuring_sample;
1: +  struct work_struct work;
1: +  void *priv;
1: +  u8 profile_ix;
1: +  u8 mode;
1: +  u8 tune_state;
1: +  u8 steps_right;
1: +  u8 steps_left;
1: +  u8 tired;
1:  };
1:  
1:  enum rdma_nl_counter_mode {
1: -	RDMA_COUNTER_MODE_NONE = 0,
1: -	RDMA_COUNTER_MODE_AUTO = 1,
1: -	RDMA_COUNTER_MODE_MANUAL = 2,
1: -	RDMA_COUNTER_MODE_MAX = 3,
1: +  RDMA_COUNTER_MODE_NONE = 0,
1: +  RDMA_COUNTER_MODE_AUTO = 1,
1: +  RDMA_COUNTER_MODE_MANUAL = 2,
1: +  RDMA_COUNTER_MODE_MAX = 3,
1:  };
1:  
1:  enum rdma_nl_counter_mask {
1: -	RDMA_COUNTER_MASK_QP_TYPE = 1,
1: -	RDMA_COUNTER_MASK_PID = 2,
1: +  RDMA_COUNTER_MASK_QP_TYPE = 1,
1: +  RDMA_COUNTER_MASK_PID = 2,
1:  };
1:  
1:  enum rdma_restrack_type {
1: -	RDMA_RESTRACK_PD = 0,
1: -	RDMA_RESTRACK_CQ = 1,
1: -	RDMA_RESTRACK_QP = 2,
1: -	RDMA_RESTRACK_CM_ID = 3,
1: -	RDMA_RESTRACK_MR = 4,
1: -	RDMA_RESTRACK_CTX = 5,
1: -	RDMA_RESTRACK_COUNTER = 6,
1: -	RDMA_RESTRACK_MAX = 7,
1: +  RDMA_RESTRACK_PD = 0,
1: +  RDMA_RESTRACK_CQ = 1,
1: +  RDMA_RESTRACK_QP = 2,
1: +  RDMA_RESTRACK_CM_ID = 3,
1: +  RDMA_RESTRACK_MR = 4,
1: +  RDMA_RESTRACK_CTX = 5,
1: +  RDMA_RESTRACK_COUNTER = 6,
1: +  RDMA_RESTRACK_MAX = 7,
1:  };
1:  
1:  struct rdma_restrack_entry {
1: -	bool valid;
1: -	struct kref kref;
1: -	struct completion comp;
1: -	struct task_struct *task;
1: -	const char *kern_name;
1: -	enum rdma_restrack_type type;
1: -	bool user;
1: -	u32 id;
1: +  bool valid;
1: +  struct kref kref;
1: +  struct completion comp;
1: +  struct task_struct *task;
1: +  const char *kern_name;
1: +  enum rdma_restrack_type type;
1: +  bool user;
1: +  u32 id;
1:  };
1:  
1:  struct rdma_link_ops {
1: -	struct list_head list;
1: -	const char *type;
1: -	int (*newlink)(const char *, struct net_device *);
1: +  struct list_head list;
1: +  const char *type;
1: +  int (*newlink)(const char *, struct net_device *);
1:  };
1:  
1:  struct auto_mode_param {
1: -	int qp_type;
1: +  int qp_type;
1:  };
1:  
1:  struct rdma_counter_mode {
1: -	enum rdma_nl_counter_mode mode;
1: -	enum rdma_nl_counter_mask mask;
1: -	struct auto_mode_param param;
1: +  enum rdma_nl_counter_mode mode;
1: +  enum rdma_nl_counter_mask mask;
1: +  struct auto_mode_param param;
1:  };
1:  
1:  struct rdma_hw_stats;
1:  
1:  struct rdma_port_counter {
1: -	struct rdma_counter_mode mode;
1: -	struct rdma_hw_stats *hstats;
1: -	unsigned int num_counters;
1: -	struct mutex lock;
1: +  struct rdma_counter_mode mode;
1: +  struct rdma_hw_stats *hstats;
1: +  unsigned int num_counters;
1: +  struct mutex lock;
1:  };
1:  
1:  struct rdma_hw_stats {
1: -	struct mutex lock;
1: -	long unsigned int timestamp;
1: -	long unsigned int lifespan;
1: -	const char * const *names;
1: -	int num_counters;
1: -	u64 value[0];
1: +  struct mutex lock;
1: +  long unsigned int timestamp;
1: +  long unsigned int lifespan;
1: +  const char *const *names;
1: +  int num_counters;
1: +  u64 value[0];
1:  };
1:  
1:  struct ib_device;
1:  
1:  struct rdma_counter {
1: -	struct rdma_restrack_entry res;
1: -	struct ib_device *device;
1: -	uint32_t id;
1: -	struct kref kref;
1: -	struct rdma_counter_mode mode;
1: -	struct mutex lock;
1: -	struct rdma_hw_stats *stats;
1: -	u8 port;
1: +  struct rdma_restrack_entry res;
1: +  struct ib_device *device;
1: +  uint32_t id;
1: +  struct kref kref;
1: +  struct rdma_counter_mode mode;
1: +  struct mutex lock;
1: +  struct rdma_hw_stats *stats;
1: +  u8 port;
1:  };
1:  
1:  enum rdma_driver_id {
1: -	RDMA_DRIVER_UNKNOWN = 0,
1: -	RDMA_DRIVER_MLX5 = 1,
1: -	RDMA_DRIVER_MLX4 = 2,
1: -	RDMA_DRIVER_CXGB3 = 3,
1: -	RDMA_DRIVER_CXGB4 = 4,
1: -	RDMA_DRIVER_MTHCA = 5,
1: -	RDMA_DRIVER_BNXT_RE = 6,
1: -	RDMA_DRIVER_OCRDMA = 7,
1: -	RDMA_DRIVER_NES = 8,
1: -	RDMA_DRIVER_I40IW = 9,
1: -	RDMA_DRIVER_VMW_PVRDMA = 10,
1: -	RDMA_DRIVER_QEDR = 11,
1: -	RDMA_DRIVER_HNS = 12,
1: -	RDMA_DRIVER_USNIC = 13,
1: -	RDMA_DRIVER_RXE = 14,
1: -	RDMA_DRIVER_HFI1 = 15,
1: -	RDMA_DRIVER_QIB = 16,
1: -	RDMA_DRIVER_EFA = 17,
1: -	RDMA_DRIVER_SIW = 18,
1: +  RDMA_DRIVER_UNKNOWN = 0,
1: +  RDMA_DRIVER_MLX5 = 1,
1: +  RDMA_DRIVER_MLX4 = 2,
1: +  RDMA_DRIVER_CXGB3 = 3,
1: +  RDMA_DRIVER_CXGB4 = 4,
1: +  RDMA_DRIVER_MTHCA = 5,
1: +  RDMA_DRIVER_BNXT_RE = 6,
1: +  RDMA_DRIVER_OCRDMA = 7,
1: +  RDMA_DRIVER_NES = 8,
1: +  RDMA_DRIVER_I40IW = 9,
1: +  RDMA_DRIVER_VMW_PVRDMA = 10,
1: +  RDMA_DRIVER_QEDR = 11,
1: +  RDMA_DRIVER_HNS = 12,
1: +  RDMA_DRIVER_USNIC = 13,
1: +  RDMA_DRIVER_RXE = 14,
1: +  RDMA_DRIVER_HFI1 = 15,
1: +  RDMA_DRIVER_QIB = 16,
1: +  RDMA_DRIVER_EFA = 17,
1: +  RDMA_DRIVER_SIW = 18,
1:  };
1:  
1:  enum ib_cq_notify_flags {
1: -	IB_CQ_SOLICITED = 1,
1: -	IB_CQ_NEXT_COMP = 2,
1: -	IB_CQ_SOLICITED_MASK = 3,
1: -	IB_CQ_REPORT_MISSED_EVENTS = 4,
1: +  IB_CQ_SOLICITED = 1,
1: +  IB_CQ_NEXT_COMP = 2,
1: +  IB_CQ_SOLICITED_MASK = 3,
1: +  IB_CQ_REPORT_MISSED_EVENTS = 4,
1:  };
1:  
1:  struct ib_mad;
1:  
1:  enum rdma_link_layer {
1: -	IB_LINK_LAYER_UNSPECIFIED = 0,
1: -	IB_LINK_LAYER_INFINIBAND = 1,
1: -	IB_LINK_LAYER_ETHERNET = 2,
1: +  IB_LINK_LAYER_UNSPECIFIED = 0,
1: +  IB_LINK_LAYER_INFINIBAND = 1,
1: +  IB_LINK_LAYER_ETHERNET = 2,
1:  };
1:  
1:  enum rdma_netdev_t {
1: -	RDMA_NETDEV_OPA_VNIC = 0,
1: -	RDMA_NETDEV_IPOIB = 1,
1: +  RDMA_NETDEV_OPA_VNIC = 0,
1: +  RDMA_NETDEV_IPOIB = 1,
1:  };
1:  
1:  enum ib_srq_attr_mask {
1: -	IB_SRQ_MAX_WR = 1,
1: -	IB_SRQ_LIMIT = 2,
1: +  IB_SRQ_MAX_WR = 1,
1: +  IB_SRQ_LIMIT = 2,
1:  };
1:  
1:  enum ib_mr_type {
1: -	IB_MR_TYPE_MEM_REG = 0,
1: -	IB_MR_TYPE_SG_GAPS = 1,
1: -	IB_MR_TYPE_DM = 2,
1: -	IB_MR_TYPE_USER = 3,
1: -	IB_MR_TYPE_DMA = 4,
1: -	IB_MR_TYPE_INTEGRITY = 5,
1: +  IB_MR_TYPE_MEM_REG = 0,
1: +  IB_MR_TYPE_SG_GAPS = 1,
1: +  IB_MR_TYPE_DM = 2,
1: +  IB_MR_TYPE_USER = 3,
1: +  IB_MR_TYPE_DMA = 4,
1: +  IB_MR_TYPE_INTEGRITY = 5,
1:  };
1:  
1:  enum ib_uverbs_advise_mr_advice {
1: -	IB_UVERBS_ADVISE_MR_ADVICE_PREFETCH = 0,
1: -	IB_UVERBS_ADVISE_MR_ADVICE_PREFETCH_WRITE = 1,
1: -	IB_UVERBS_ADVISE_MR_ADVICE_PREFETCH_NO_FAULT = 2,
1: +  IB_UVERBS_ADVISE_MR_ADVICE_PREFETCH = 0,
1: +  IB_UVERBS_ADVISE_MR_ADVICE_PREFETCH_WRITE = 1,
1: +  IB_UVERBS_ADVISE_MR_ADVICE_PREFETCH_NO_FAULT = 2,
1:  };
1:  
1:  struct uverbs_attr_bundle;
1: @@ -64376,229 +65336,263 @@ struct ib_counters;
1:  struct ib_counters_read_attr;
1:  
1:  struct ib_device_ops {
1: -	struct module *owner;
1: -	enum rdma_driver_id driver_id;
1: -	u32 uverbs_abi_ver;
1: -	unsigned int uverbs_no_driver_id_binding: 1;
1: -	int (*post_send)(struct ib_qp *, const struct ib_send_wr *, const struct ib_send_wr **);
1: -	int (*post_recv)(struct ib_qp *, const struct ib_recv_wr *, const struct ib_recv_wr **);
1: -	void (*drain_rq)(struct ib_qp *);
1: -	void (*drain_sq)(struct ib_qp *);
1: -	int (*poll_cq)(struct ib_cq *, int, struct ib_wc *);
1: -	int (*peek_cq)(struct ib_cq *, int);
1: -	int (*req_notify_cq)(struct ib_cq *, enum ib_cq_notify_flags);
1: -	int (*req_ncomp_notif)(struct ib_cq *, int);
1: -	int (*post_srq_recv)(struct ib_srq *, const struct ib_recv_wr *, const struct ib_recv_wr **);
1: -	int (*process_mad)(struct ib_device *, int, u8, const struct ib_wc *, const struct ib_grh *, const struct ib_mad *, struct ib_mad *, size_t *, u16 *);
1: -	int (*query_device)(struct ib_device *, struct ib_device_attr *, struct ib_udata *);
1: -	int (*modify_device)(struct ib_device *, int, struct ib_device_modify *);
1: -	void (*get_dev_fw_str)(struct ib_device *, char *);
1: -	const struct cpumask * (*get_vector_affinity)(struct ib_device *, int);
1: -	int (*query_port)(struct ib_device *, u8, struct ib_port_attr *);
1: -	int (*modify_port)(struct ib_device *, u8, int, struct ib_port_modify *);
1: -	int (*get_port_immutable)(struct ib_device *, u8, struct ib_port_immutable *);
1: -	enum rdma_link_layer (*get_link_layer)(struct ib_device *, u8);
1: -	struct net_device * (*get_netdev)(struct ib_device *, u8);
1: -	struct net_device * (*alloc_rdma_netdev)(struct ib_device *, u8, enum rdma_netdev_t, const char *, unsigned char, void (*)(struct net_device *));
1: -	int (*rdma_netdev_get_params)(struct ib_device *, u8, enum rdma_netdev_t, struct rdma_netdev_alloc_params *);
1: -	int (*query_gid)(struct ib_device *, u8, int, union ib_gid *);
1: -	int (*add_gid)(const struct ib_gid_attr *, void **);
1: -	int (*del_gid)(const struct ib_gid_attr *, void **);
1: -	int (*query_pkey)(struct ib_device *, u8, u16, u16 *);
1: -	int (*alloc_ucontext)(struct ib_ucontext *, struct ib_udata *);
1: -	void (*dealloc_ucontext)(struct ib_ucontext *);
1: -	int (*mmap)(struct ib_ucontext *, struct vm_area_struct *);
1: -	void (*mmap_free)(struct rdma_user_mmap_entry *);
1: -	void (*disassociate_ucontext)(struct ib_ucontext *);
1: -	int (*alloc_pd)(struct ib_pd *, struct ib_udata *);
1: -	int (*dealloc_pd)(struct ib_pd *, struct ib_udata *);
1: -	int (*create_ah)(struct ib_ah *, struct rdma_ah_init_attr *, struct ib_udata *);
1: -	int (*modify_ah)(struct ib_ah *, struct rdma_ah_attr *);
1: -	int (*query_ah)(struct ib_ah *, struct rdma_ah_attr *);
1: -	int (*destroy_ah)(struct ib_ah *, u32);
1: -	int (*create_srq)(struct ib_srq *, struct ib_srq_init_attr *, struct ib_udata *);
1: -	int (*modify_srq)(struct ib_srq *, struct ib_srq_attr *, enum ib_srq_attr_mask, struct ib_udata *);
1: -	int (*query_srq)(struct ib_srq *, struct ib_srq_attr *);
1: -	int (*destroy_srq)(struct ib_srq *, struct ib_udata *);
1: -	struct ib_qp * (*create_qp)(struct ib_pd *, struct ib_qp_init_attr *, struct ib_udata *);
1: -	int (*modify_qp)(struct ib_qp *, struct ib_qp_attr *, int, struct ib_udata *);
1: -	int (*query_qp)(struct ib_qp *, struct ib_qp_attr *, int, struct ib_qp_init_attr *);
1: -	int (*destroy_qp)(struct ib_qp *, struct ib_udata *);
1: -	int (*create_cq)(struct ib_cq *, const struct ib_cq_init_attr *, struct ib_udata *);
1: -	int (*modify_cq)(struct ib_cq *, u16, u16);
1: -	int (*destroy_cq)(struct ib_cq *, struct ib_udata *);
1: -	int (*resize_cq)(struct ib_cq *, int, struct ib_udata *);
1: -	struct ib_mr * (*get_dma_mr)(struct ib_pd *, int);
1: -	struct ib_mr * (*reg_user_mr)(struct ib_pd *, u64, u64, u64, int, struct ib_udata *);
1: -	int (*rereg_user_mr)(struct ib_mr *, int, u64, u64, u64, int, struct ib_pd *, struct ib_udata *);
1: -	int (*dereg_mr)(struct ib_mr *, struct ib_udata *);
1: -	struct ib_mr * (*alloc_mr)(struct ib_pd *, enum ib_mr_type, u32);
1: -	struct ib_mr * (*alloc_mr_integrity)(struct ib_pd *, u32, u32);
1: -	int (*advise_mr)(struct ib_pd *, enum ib_uverbs_advise_mr_advice, u32, struct ib_sge *, u32, struct uverbs_attr_bundle *);
1: -	int (*map_mr_sg)(struct ib_mr *, struct scatterlist *, int, unsigned int *);
1: -	int (*check_mr_status)(struct ib_mr *, u32, struct ib_mr_status *);
1: -	int (*alloc_mw)(struct ib_mw *, struct ib_udata *);
1: -	int (*dealloc_mw)(struct ib_mw *);
1: -	int (*attach_mcast)(struct ib_qp *, union ib_gid *, u16);
1: -	int (*detach_mcast)(struct ib_qp *, union ib_gid *, u16);
1: -	int (*alloc_xrcd)(struct ib_xrcd *, struct ib_udata *);
1: -	int (*dealloc_xrcd)(struct ib_xrcd *, struct ib_udata *);
1: -	struct ib_flow * (*create_flow)(struct ib_qp *, struct ib_flow_attr *, struct ib_udata *);
1: -	int (*destroy_flow)(struct ib_flow *);
1: -	struct ib_flow_action * (*create_flow_action_esp)(struct ib_device *, const struct ib_flow_action_attrs_esp *, struct uverbs_attr_bundle *);
1: -	int (*destroy_flow_action)(struct ib_flow_action *);
1: -	int (*modify_flow_action_esp)(struct ib_flow_action *, const struct ib_flow_action_attrs_esp *, struct uverbs_attr_bundle *);
1: -	int (*set_vf_link_state)(struct ib_device *, int, u8, int);
1: -	int (*get_vf_config)(struct ib_device *, int, u8, struct ifla_vf_info *);
1: -	int (*get_vf_stats)(struct ib_device *, int, u8, struct ifla_vf_stats *);
1: -	int (*get_vf_guid)(struct ib_device *, int, u8, struct ifla_vf_guid *, struct ifla_vf_guid *);
1: -	int (*set_vf_guid)(struct ib_device *, int, u8, u64, int);
1: -	struct ib_wq * (*create_wq)(struct ib_pd *, struct ib_wq_init_attr *, struct ib_udata *);
1: -	int (*destroy_wq)(struct ib_wq *, struct ib_udata *);
1: -	int (*modify_wq)(struct ib_wq *, struct ib_wq_attr *, u32, struct ib_udata *);
1: -	int (*create_rwq_ind_table)(struct ib_rwq_ind_table *, struct ib_rwq_ind_table_init_attr *, struct ib_udata *);
1: -	int (*destroy_rwq_ind_table)(struct ib_rwq_ind_table *);
1: -	struct ib_dm * (*alloc_dm)(struct ib_device *, struct ib_ucontext *, struct ib_dm_alloc_attr *, struct uverbs_attr_bundle *);
1: -	int (*dealloc_dm)(struct ib_dm *, struct uverbs_attr_bundle *);
1: -	struct ib_mr * (*reg_dm_mr)(struct ib_pd *, struct ib_dm *, struct ib_dm_mr_attr *, struct uverbs_attr_bundle *);
1: -	int (*create_counters)(struct ib_counters *, struct uverbs_attr_bundle *);
1: -	int (*destroy_counters)(struct ib_counters *);
1: -	int (*read_counters)(struct ib_counters *, struct ib_counters_read_attr *, struct uverbs_attr_bundle *);
1: -	int (*map_mr_sg_pi)(struct ib_mr *, struct scatterlist *, int, unsigned int *, struct scatterlist *, int, unsigned int *);
1: -	struct rdma_hw_stats * (*alloc_hw_stats)(struct ib_device *, u8);
1: -	int (*get_hw_stats)(struct ib_device *, struct rdma_hw_stats *, u8, int);
1: -	int (*init_port)(struct ib_device *, u8, struct kobject *);
1: -	int (*fill_res_mr_entry)(struct sk_buff *, struct ib_mr *);
1: -	int (*fill_res_mr_entry_raw)(struct sk_buff *, struct ib_mr *);
1: -	int (*fill_res_cq_entry)(struct sk_buff *, struct ib_cq *);
1: -	int (*fill_res_cq_entry_raw)(struct sk_buff *, struct ib_cq *);
1: -	int (*fill_res_qp_entry)(struct sk_buff *, struct ib_qp *);
1: -	int (*fill_res_qp_entry_raw)(struct sk_buff *, struct ib_qp *);
1: -	int (*fill_res_cm_id_entry)(struct sk_buff *, struct rdma_cm_id *);
1: -	int (*enable_driver)(struct ib_device *);
1: -	void (*dealloc_driver)(struct ib_device *);
1: -	void (*iw_add_ref)(struct ib_qp *);
1: -	void (*iw_rem_ref)(struct ib_qp *);
1: -	struct ib_qp * (*iw_get_qp)(struct ib_device *, int);
1: -	int (*iw_connect)(struct iw_cm_id *, struct iw_cm_conn_param *);
1: -	int (*iw_accept)(struct iw_cm_id *, struct iw_cm_conn_param *);
1: -	int (*iw_reject)(struct iw_cm_id *, const void *, u8);
1: -	int (*iw_create_listen)(struct iw_cm_id *, int);
1: -	int (*iw_destroy_listen)(struct iw_cm_id *);
1: -	int (*counter_bind_qp)(struct rdma_counter *, struct ib_qp *);
1: -	int (*counter_unbind_qp)(struct ib_qp *);
1: -	int (*counter_dealloc)(struct rdma_counter *);
1: -	struct rdma_hw_stats * (*counter_alloc_stats)(struct rdma_counter *);
1: -	int (*counter_update_stats)(struct rdma_counter *);
1: -	int (*fill_stat_mr_entry)(struct sk_buff *, struct ib_mr *);
1: -	int (*query_ucontext)(struct ib_ucontext *, struct uverbs_attr_bundle *);
1: -	size_t size_ib_ah;
1: -	size_t size_ib_counters;
1: -	size_t size_ib_cq;
1: -	size_t size_ib_mw;
1: -	size_t size_ib_pd;
1: -	size_t size_ib_rwq_ind_table;
1: -	size_t size_ib_srq;
1: -	size_t size_ib_ucontext;
1: -	size_t size_ib_xrcd;
1: +  struct module *owner;
1: +  enum rdma_driver_id driver_id;
1: +  u32 uverbs_abi_ver;
1: +  unsigned int uverbs_no_driver_id_binding : 1;
1: +  int (*post_send)(struct ib_qp *, const struct ib_send_wr *,
1: +                   const struct ib_send_wr **);
1: +  int (*post_recv)(struct ib_qp *, const struct ib_recv_wr *,
1: +                   const struct ib_recv_wr **);
1: +  void (*drain_rq)(struct ib_qp *);
1: +  void (*drain_sq)(struct ib_qp *);
1: +  int (*poll_cq)(struct ib_cq *, int, struct ib_wc *);
1: +  int (*peek_cq)(struct ib_cq *, int);
1: +  int (*req_notify_cq)(struct ib_cq *, enum ib_cq_notify_flags);
1: +  int (*req_ncomp_notif)(struct ib_cq *, int);
1: +  int (*post_srq_recv)(struct ib_srq *, const struct ib_recv_wr *,
1: +                       const struct ib_recv_wr **);
1: +  int (*process_mad)(struct ib_device *, int, u8, const struct ib_wc *,
1: +                     const struct ib_grh *, const struct ib_mad *,
1: +                     struct ib_mad *, size_t *, u16 *);
1: +  int (*query_device)(struct ib_device *, struct ib_device_attr *,
1: +                      struct ib_udata *);
1: +  int (*modify_device)(struct ib_device *, int, struct ib_device_modify *);
1: +  void (*get_dev_fw_str)(struct ib_device *, char *);
1: +  const struct cpumask *(*get_vector_affinity)(struct ib_device *, int);
1: +  int (*query_port)(struct ib_device *, u8, struct ib_port_attr *);
1: +  int (*modify_port)(struct ib_device *, u8, int, struct ib_port_modify *);
1: +  int (*get_port_immutable)(struct ib_device *, u8, struct ib_port_immutable *);
1: +  enum rdma_link_layer (*get_link_layer)(struct ib_device *, u8);
1: +  struct net_device *(*get_netdev)(struct ib_device *, u8);
1: +  struct net_device *(*alloc_rdma_netdev)(struct ib_device *, u8,
1: +                                          enum rdma_netdev_t, const char *,
1: +                                          unsigned char,
1: +                                          void (*)(struct net_device *));
1: +  int (*rdma_netdev_get_params)(struct ib_device *, u8, enum rdma_netdev_t,
1: +                                struct rdma_netdev_alloc_params *);
1: +  int (*query_gid)(struct ib_device *, u8, int, union ib_gid *);
1: +  int (*add_gid)(const struct ib_gid_attr *, void **);
1: +  int (*del_gid)(const struct ib_gid_attr *, void **);
1: +  int (*query_pkey)(struct ib_device *, u8, u16, u16 *);
1: +  int (*alloc_ucontext)(struct ib_ucontext *, struct ib_udata *);
1: +  void (*dealloc_ucontext)(struct ib_ucontext *);
1: +  int (*mmap)(struct ib_ucontext *, struct vm_area_struct *);
1: +  void (*mmap_free)(struct rdma_user_mmap_entry *);
1: +  void (*disassociate_ucontext)(struct ib_ucontext *);
1: +  int (*alloc_pd)(struct ib_pd *, struct ib_udata *);
1: +  int (*dealloc_pd)(struct ib_pd *, struct ib_udata *);
1: +  int (*create_ah)(struct ib_ah *, struct rdma_ah_init_attr *,
1: +                   struct ib_udata *);
1: +  int (*modify_ah)(struct ib_ah *, struct rdma_ah_attr *);
1: +  int (*query_ah)(struct ib_ah *, struct rdma_ah_attr *);
1: +  int (*destroy_ah)(struct ib_ah *, u32);
1: +  int (*create_srq)(struct ib_srq *, struct ib_srq_init_attr *,
1: +                    struct ib_udata *);
1: +  int (*modify_srq)(struct ib_srq *, struct ib_srq_attr *,
1: +                    enum ib_srq_attr_mask, struct ib_udata *);
1: +  int (*query_srq)(struct ib_srq *, struct ib_srq_attr *);
1: +  int (*destroy_srq)(struct ib_srq *, struct ib_udata *);
1: +  struct ib_qp *(*create_qp)(struct ib_pd *, struct ib_qp_init_attr *,
1: +                             struct ib_udata *);
1: +  int (*modify_qp)(struct ib_qp *, struct ib_qp_attr *, int, struct ib_udata *);
1: +  int (*query_qp)(struct ib_qp *, struct ib_qp_attr *, int,
1: +                  struct ib_qp_init_attr *);
1: +  int (*destroy_qp)(struct ib_qp *, struct ib_udata *);
1: +  int (*create_cq)(struct ib_cq *, const struct ib_cq_init_attr *,
1: +                   struct ib_udata *);
1: +  int (*modify_cq)(struct ib_cq *, u16, u16);
1: +  int (*destroy_cq)(struct ib_cq *, struct ib_udata *);
1: +  int (*resize_cq)(struct ib_cq *, int, struct ib_udata *);
1: +  struct ib_mr *(*get_dma_mr)(struct ib_pd *, int);
1: +  struct ib_mr *(*reg_user_mr)(struct ib_pd *, u64, u64, u64, int,
1: +                               struct ib_udata *);
1: +  int (*rereg_user_mr)(struct ib_mr *, int, u64, u64, u64, int, struct ib_pd *,
1: +                       struct ib_udata *);
1: +  int (*dereg_mr)(struct ib_mr *, struct ib_udata *);
1: +  struct ib_mr *(*alloc_mr)(struct ib_pd *, enum ib_mr_type, u32);
1: +  struct ib_mr *(*alloc_mr_integrity)(struct ib_pd *, u32, u32);
1: +  int (*advise_mr)(struct ib_pd *, enum ib_uverbs_advise_mr_advice, u32,
1: +                   struct ib_sge *, u32, struct uverbs_attr_bundle *);
1: +  int (*map_mr_sg)(struct ib_mr *, struct scatterlist *, int, unsigned int *);
1: +  int (*check_mr_status)(struct ib_mr *, u32, struct ib_mr_status *);
1: +  int (*alloc_mw)(struct ib_mw *, struct ib_udata *);
1: +  int (*dealloc_mw)(struct ib_mw *);
1: +  int (*attach_mcast)(struct ib_qp *, union ib_gid *, u16);
1: +  int (*detach_mcast)(struct ib_qp *, union ib_gid *, u16);
1: +  int (*alloc_xrcd)(struct ib_xrcd *, struct ib_udata *);
1: +  int (*dealloc_xrcd)(struct ib_xrcd *, struct ib_udata *);
1: +  struct ib_flow *(*create_flow)(struct ib_qp *, struct ib_flow_attr *,
1: +                                 struct ib_udata *);
1: +  int (*destroy_flow)(struct ib_flow *);
1: +  struct ib_flow_action *(*create_flow_action_esp)(
1: +      struct ib_device *, const struct ib_flow_action_attrs_esp *,
1: +      struct uverbs_attr_bundle *);
1: +  int (*destroy_flow_action)(struct ib_flow_action *);
1: +  int (*modify_flow_action_esp)(struct ib_flow_action *,
1: +                                const struct ib_flow_action_attrs_esp *,
1: +                                struct uverbs_attr_bundle *);
1: +  int (*set_vf_link_state)(struct ib_device *, int, u8, int);
1: +  int (*get_vf_config)(struct ib_device *, int, u8, struct ifla_vf_info *);
1: +  int (*get_vf_stats)(struct ib_device *, int, u8, struct ifla_vf_stats *);
1: +  int (*get_vf_guid)(struct ib_device *, int, u8, struct ifla_vf_guid *,
1: +                     struct ifla_vf_guid *);
1: +  int (*set_vf_guid)(struct ib_device *, int, u8, u64, int);
1: +  struct ib_wq *(*create_wq)(struct ib_pd *, struct ib_wq_init_attr *,
1: +                             struct ib_udata *);
1: +  int (*destroy_wq)(struct ib_wq *, struct ib_udata *);
1: +  int (*modify_wq)(struct ib_wq *, struct ib_wq_attr *, u32, struct ib_udata *);
1: +  int (*create_rwq_ind_table)(struct ib_rwq_ind_table *,
1: +                              struct ib_rwq_ind_table_init_attr *,
1: +                              struct ib_udata *);
1: +  int (*destroy_rwq_ind_table)(struct ib_rwq_ind_table *);
1: +  struct ib_dm *(*alloc_dm)(struct ib_device *, struct ib_ucontext *,
1: +                            struct ib_dm_alloc_attr *,
1: +                            struct uverbs_attr_bundle *);
1: +  int (*dealloc_dm)(struct ib_dm *, struct uverbs_attr_bundle *);
1: +  struct ib_mr *(*reg_dm_mr)(struct ib_pd *, struct ib_dm *,
1: +                             struct ib_dm_mr_attr *,
1: +                             struct uverbs_attr_bundle *);
1: +  int (*create_counters)(struct ib_counters *, struct uverbs_attr_bundle *);
1: +  int (*destroy_counters)(struct ib_counters *);
1: +  int (*read_counters)(struct ib_counters *, struct ib_counters_read_attr *,
1: +                       struct uverbs_attr_bundle *);
1: +  int (*map_mr_sg_pi)(struct ib_mr *, struct scatterlist *, int, unsigned int *,
1: +                      struct scatterlist *, int, unsigned int *);
1: +  struct rdma_hw_stats *(*alloc_hw_stats)(struct ib_device *, u8);
1: +  int (*get_hw_stats)(struct ib_device *, struct rdma_hw_stats *, u8, int);
1: +  int (*init_port)(struct ib_device *, u8, struct kobject *);
1: +  int (*fill_res_mr_entry)(struct sk_buff *, struct ib_mr *);
1: +  int (*fill_res_mr_entry_raw)(struct sk_buff *, struct ib_mr *);
1: +  int (*fill_res_cq_entry)(struct sk_buff *, struct ib_cq *);
1: +  int (*fill_res_cq_entry_raw)(struct sk_buff *, struct ib_cq *);
1: +  int (*fill_res_qp_entry)(struct sk_buff *, struct ib_qp *);
1: +  int (*fill_res_qp_entry_raw)(struct sk_buff *, struct ib_qp *);
1: +  int (*fill_res_cm_id_entry)(struct sk_buff *, struct rdma_cm_id *);
1: +  int (*enable_driver)(struct ib_device *);
1: +  void (*dealloc_driver)(struct ib_device *);
1: +  void (*iw_add_ref)(struct ib_qp *);
1: +  void (*iw_rem_ref)(struct ib_qp *);
1: +  struct ib_qp *(*iw_get_qp)(struct ib_device *, int);
1: +  int (*iw_connect)(struct iw_cm_id *, struct iw_cm_conn_param *);
1: +  int (*iw_accept)(struct iw_cm_id *, struct iw_cm_conn_param *);
1: +  int (*iw_reject)(struct iw_cm_id *, const void *, u8);
1: +  int (*iw_create_listen)(struct iw_cm_id *, int);
1: +  int (*iw_destroy_listen)(struct iw_cm_id *);
1: +  int (*counter_bind_qp)(struct rdma_counter *, struct ib_qp *);
1: +  int (*counter_unbind_qp)(struct ib_qp *);
1: +  int (*counter_dealloc)(struct rdma_counter *);
1: +  struct rdma_hw_stats *(*counter_alloc_stats)(struct rdma_counter *);
1: +  int (*counter_update_stats)(struct rdma_counter *);
1: +  int (*fill_stat_mr_entry)(struct sk_buff *, struct ib_mr *);
1: +  int (*query_ucontext)(struct ib_ucontext *, struct uverbs_attr_bundle *);
1: +  size_t size_ib_ah;
1: +  size_t size_ib_counters;
1: +  size_t size_ib_cq;
1: +  size_t size_ib_mw;
1: +  size_t size_ib_pd;
1: +  size_t size_ib_rwq_ind_table;
1: +  size_t size_ib_srq;
1: +  size_t size_ib_ucontext;
1: +  size_t size_ib_xrcd;
1:  };
1:  
1:  struct ib_core_device {
1: -	struct device dev;
1: -	possible_net_t rdma_net;
1: -	struct kobject *ports_kobj;
1: -	struct list_head port_list;
1: -	struct ib_device *owner;
1: +  struct device dev;
1: +  possible_net_t rdma_net;
1: +  struct kobject *ports_kobj;
1: +  struct list_head port_list;
1: +  struct ib_device *owner;
1:  };
1:  
1:  enum ib_atomic_cap {
1: -	IB_ATOMIC_NONE = 0,
1: -	IB_ATOMIC_HCA = 1,
1: -	IB_ATOMIC_GLOB = 2,
1: +  IB_ATOMIC_NONE = 0,
1: +  IB_ATOMIC_HCA = 1,
1: +  IB_ATOMIC_GLOB = 2,
1:  };
1:  
1:  struct ib_odp_caps {
1: -	uint64_t general_caps;
1: -	struct {
1: -		uint32_t rc_odp_caps;
1: -		uint32_t uc_odp_caps;
1: -		uint32_t ud_odp_caps;
1: -		uint32_t xrc_odp_caps;
1: -	} per_transport_caps;
1: +  uint64_t general_caps;
1: +  struct {
1: +    uint32_t rc_odp_caps;
1: +    uint32_t uc_odp_caps;
1: +    uint32_t ud_odp_caps;
1: +    uint32_t xrc_odp_caps;
1: +  } per_transport_caps;
1:  };
1:  
1:  struct ib_rss_caps {
1: -	u32 supported_qpts;
1: -	u32 max_rwq_indirection_tables;
1: -	u32 max_rwq_indirection_table_size;
1: +  u32 supported_qpts;
1: +  u32 max_rwq_indirection_tables;
1: +  u32 max_rwq_indirection_table_size;
1:  };
1:  
1:  struct ib_tm_caps {
1: -	u32 max_rndv_hdr_size;
1: -	u32 max_num_tags;
1: -	u32 flags;
1: -	u32 max_ops;
1: -	u32 max_sge;
1: +  u32 max_rndv_hdr_size;
1: +  u32 max_num_tags;
1: +  u32 flags;
1: +  u32 max_ops;
1: +  u32 max_sge;
1:  };
1:  
1:  struct ib_cq_caps {
1: -	u16 max_cq_moderation_count;
1: -	u16 max_cq_moderation_period;
1: +  u16 max_cq_moderation_count;
1: +  u16 max_cq_moderation_period;
1:  };
1:  
1:  struct ib_device_attr {
1: -	u64 fw_ver;
1: -	__be64 sys_image_guid;
1: -	u64 max_mr_size;
1: -	u64 page_size_cap;
1: -	u32 vendor_id;
1: -	u32 vendor_part_id;
1: -	u32 hw_ver;
1: -	int max_qp;
1: -	int max_qp_wr;
1: -	u64 device_cap_flags;
1: -	int max_send_sge;
1: -	int max_recv_sge;
1: -	int max_sge_rd;
1: -	int max_cq;
1: -	int max_cqe;
1: -	int max_mr;
1: -	int max_pd;
1: -	int max_qp_rd_atom;
1: -	int max_ee_rd_atom;
1: -	int max_res_rd_atom;
1: -	int max_qp_init_rd_atom;
1: -	int max_ee_init_rd_atom;
1: -	enum ib_atomic_cap atomic_cap;
1: -	enum ib_atomic_cap masked_atomic_cap;
1: -	int max_ee;
1: -	int max_rdd;
1: -	int max_mw;
1: -	int max_raw_ipv6_qp;
1: -	int max_raw_ethy_qp;
1: -	int max_mcast_grp;
1: -	int max_mcast_qp_attach;
1: -	int max_total_mcast_qp_attach;
1: -	int max_ah;
1: -	int max_srq;
1: -	int max_srq_wr;
1: -	int max_srq_sge;
1: -	unsigned int max_fast_reg_page_list_len;
1: -	unsigned int max_pi_fast_reg_page_list_len;
1: -	u16 max_pkeys;
1: -	u8 local_ca_ack_delay;
1: -	int sig_prot_cap;
1: -	int sig_guard_cap;
1: -	struct ib_odp_caps odp_caps;
1: -	uint64_t timestamp_mask;
1: -	uint64_t hca_core_clock;
1: -	struct ib_rss_caps rss_caps;
1: -	u32 max_wq_type_rq;
1: -	u32 raw_packet_caps;
1: -	struct ib_tm_caps tm_caps;
1: -	struct ib_cq_caps cq_caps;
1: -	u64 max_dm_size;
1: -	u32 max_sgl_rd;
1: +  u64 fw_ver;
1: +  __be64 sys_image_guid;
1: +  u64 max_mr_size;
1: +  u64 page_size_cap;
1: +  u32 vendor_id;
1: +  u32 vendor_part_id;
1: +  u32 hw_ver;
1: +  int max_qp;
1: +  int max_qp_wr;
1: +  u64 device_cap_flags;
1: +  int max_send_sge;
1: +  int max_recv_sge;
1: +  int max_sge_rd;
1: +  int max_cq;
1: +  int max_cqe;
1: +  int max_mr;
1: +  int max_pd;
1: +  int max_qp_rd_atom;
1: +  int max_ee_rd_atom;
1: +  int max_res_rd_atom;
1: +  int max_qp_init_rd_atom;
1: +  int max_ee_init_rd_atom;
1: +  enum ib_atomic_cap atomic_cap;
1: +  enum ib_atomic_cap masked_atomic_cap;
1: +  int max_ee;
1: +  int max_rdd;
1: +  int max_mw;
1: +  int max_raw_ipv6_qp;
1: +  int max_raw_ethy_qp;
1: +  int max_mcast_grp;
1: +  int max_mcast_qp_attach;
1: +  int max_total_mcast_qp_attach;
1: +  int max_ah;
1: +  int max_srq;
1: +  int max_srq_wr;
1: +  int max_srq_sge;
1: +  unsigned int max_fast_reg_page_list_len;
1: +  unsigned int max_pi_fast_reg_page_list_len;
1: +  u16 max_pkeys;
1: +  u8 local_ca_ack_delay;
1: +  int sig_prot_cap;
1: +  int sig_guard_cap;
1: +  struct ib_odp_caps odp_caps;
1: +  uint64_t timestamp_mask;
1: +  uint64_t hca_core_clock;
1: +  struct ib_rss_caps rss_caps;
1: +  u32 max_wq_type_rq;
1: +  u32 raw_packet_caps;
1: +  struct ib_tm_caps tm_caps;
1: +  struct ib_cq_caps cq_caps;
1: +  u64 max_dm_size;
1: +  u32 max_sgl_rd;
1:  };
1:  
1:  struct rdma_restrack_root;
1: @@ -64608,242 +65602,242 @@ struct uapi_definition;
1:  struct ib_port_data;
1:  
1:  struct ib_device {
1: -	struct device *dma_device;
1: -	struct ib_device_ops ops;
1: -	char name[64];
1: -	struct callback_head callback_head;
1: -	struct list_head event_handler_list;
1: -	struct rw_semaphore event_handler_rwsem;
1: -	spinlock_t qp_open_list_lock;
1: -	struct rw_semaphore client_data_rwsem;
1: -	struct xarray client_data;
1: -	struct mutex unregistration_lock;
1: -	rwlock_t cache_lock;
1: -	struct ib_port_data *port_data;
1: -	int num_comp_vectors;
1: -	union {
1: -		struct device dev;
1: -		struct ib_core_device coredev;
1: -	};
1: -	const struct attribute_group *groups[3];
1: -	u64 uverbs_cmd_mask;
1: -	u64 uverbs_ex_cmd_mask;
1: -	char node_desc[64];
1: -	__be64 node_guid;
1: -	u32 local_dma_lkey;
1: -	u16 is_switch: 1;
1: -	u16 kverbs_provider: 1;
1: -	u16 use_cq_dim: 1;
1: -	u8 node_type;
1: -	u8 phys_port_cnt;
1: -	struct ib_device_attr attrs;
1: -	struct attribute_group *hw_stats_ag;
1: -	struct rdma_hw_stats *hw_stats;
1: -	u32 index;
1: -	spinlock_t cq_pools_lock;
1: -	struct list_head cq_pools[3];
1: -	struct rdma_restrack_root *res;
1: -	const struct uapi_definition *driver_def;
1: -	refcount_t refcount;
1: -	struct completion unreg_completion;
1: -	struct work_struct unregistration_work;
1: -	const struct rdma_link_ops *link_ops;
1: -	struct mutex compat_devs_mutex;
1: -	struct xarray compat_devs;
1: -	char iw_ifname[16];
1: -	u32 iw_driver_flags;
1: -	u32 lag_flags;
1: +  struct device *dma_device;
1: +  struct ib_device_ops ops;
1: +  char name[64];
1: +  struct callback_head callback_head;
1: +  struct list_head event_handler_list;
1: +  struct rw_semaphore event_handler_rwsem;
1: +  spinlock_t qp_open_list_lock;
1: +  struct rw_semaphore client_data_rwsem;
1: +  struct xarray client_data;
1: +  struct mutex unregistration_lock;
1: +  rwlock_t cache_lock;
1: +  struct ib_port_data *port_data;
1: +  int num_comp_vectors;
1: +  union {
1: +    struct device dev;
1: +    struct ib_core_device coredev;
1: +  };
1: +  const struct attribute_group *groups[3];
1: +  u64 uverbs_cmd_mask;
1: +  u64 uverbs_ex_cmd_mask;
1: +  char node_desc[64];
1: +  __be64 node_guid;
1: +  u32 local_dma_lkey;
1: +  u16 is_switch : 1;
1: +  u16 kverbs_provider : 1;
1: +  u16 use_cq_dim : 1;
1: +  u8 node_type;
1: +  u8 phys_port_cnt;
1: +  struct ib_device_attr attrs;
1: +  struct attribute_group *hw_stats_ag;
1: +  struct rdma_hw_stats *hw_stats;
1: +  u32 index;
1: +  spinlock_t cq_pools_lock;
1: +  struct list_head cq_pools[3];
1: +  struct rdma_restrack_root *res;
1: +  const struct uapi_definition *driver_def;
1: +  refcount_t refcount;
1: +  struct completion unreg_completion;
1: +  struct work_struct unregistration_work;
1: +  const struct rdma_link_ops *link_ops;
1: +  struct mutex compat_devs_mutex;
1: +  struct xarray compat_devs;
1: +  char iw_ifname[16];
1: +  u32 iw_driver_flags;
1: +  u32 lag_flags;
1:  };
1:  
1:  enum ib_signature_type {
1: -	IB_SIG_TYPE_NONE = 0,
1: -	IB_SIG_TYPE_T10_DIF = 1,
1: +  IB_SIG_TYPE_NONE = 0,
1: +  IB_SIG_TYPE_T10_DIF = 1,
1:  };
1:  
1:  enum ib_t10_dif_bg_type {
1: -	IB_T10DIF_CRC = 0,
1: -	IB_T10DIF_CSUM = 1,
1: +  IB_T10DIF_CRC = 0,
1: +  IB_T10DIF_CSUM = 1,
1:  };
1:  
1:  struct ib_t10_dif_domain {
1: -	enum ib_t10_dif_bg_type bg_type;
1: -	u16 pi_interval;
1: -	u16 bg;
1: -	u16 app_tag;
1: -	u32 ref_tag;
1: -	bool ref_remap;
1: -	bool app_escape;
1: -	bool ref_escape;
1: -	u16 apptag_check_mask;
1: +  enum ib_t10_dif_bg_type bg_type;
1: +  u16 pi_interval;
1: +  u16 bg;
1: +  u16 app_tag;
1: +  u32 ref_tag;
1: +  bool ref_remap;
1: +  bool app_escape;
1: +  bool ref_escape;
1: +  u16 apptag_check_mask;
1:  };
1:  
1:  struct ib_sig_domain {
1: -	enum ib_signature_type sig_type;
1: -	union {
1: -		struct ib_t10_dif_domain dif;
1: -	} sig;
1: +  enum ib_signature_type sig_type;
1: +  union {
1: +    struct ib_t10_dif_domain dif;
1: +  } sig;
1:  };
1:  
1:  struct ib_sig_attrs {
1: -	u8 check_mask;
1: -	struct ib_sig_domain mem;
1: -	struct ib_sig_domain wire;
1: -	int meta_length;
1: +  u8 check_mask;
1: +  struct ib_sig_domain mem;
1: +  struct ib_sig_domain wire;
1: +  int meta_length;
1:  };
1:  
1:  enum ib_sig_err_type {
1: -	IB_SIG_BAD_GUARD = 0,
1: -	IB_SIG_BAD_REFTAG = 1,
1: -	IB_SIG_BAD_APPTAG = 2,
1: +  IB_SIG_BAD_GUARD = 0,
1: +  IB_SIG_BAD_REFTAG = 1,
1: +  IB_SIG_BAD_APPTAG = 2,
1:  };
1:  
1:  struct ib_sig_err {
1: -	enum ib_sig_err_type err_type;
1: -	u32 expected;
1: -	u32 actual;
1: -	u64 sig_err_offset;
1: -	u32 key;
1: +  enum ib_sig_err_type err_type;
1: +  u32 expected;
1: +  u32 actual;
1: +  u64 sig_err_offset;
1: +  u32 key;
1:  };
1:  
1:  enum ib_uverbs_flow_action_esp_keymat {
1: -	IB_UVERBS_FLOW_ACTION_ESP_KEYMAT_AES_GCM = 0,
1: +  IB_UVERBS_FLOW_ACTION_ESP_KEYMAT_AES_GCM = 0,
1:  };
1:  
1:  struct ib_uverbs_flow_action_esp_keymat_aes_gcm {
1: -	__u64 iv;
1: -	__u32 iv_algo;
1: -	__u32 salt;
1: -	__u32 icv_len;
1: -	__u32 key_len;
1: -	__u32 aes_key[8];
1: +  __u64 iv;
1: +  __u32 iv_algo;
1: +  __u32 salt;
1: +  __u32 icv_len;
1: +  __u32 key_len;
1: +  __u32 aes_key[8];
1:  };
1:  
1:  enum ib_uverbs_flow_action_esp_replay {
1: -	IB_UVERBS_FLOW_ACTION_ESP_REPLAY_NONE = 0,
1: -	IB_UVERBS_FLOW_ACTION_ESP_REPLAY_BMP = 1,
1: +  IB_UVERBS_FLOW_ACTION_ESP_REPLAY_NONE = 0,
1: +  IB_UVERBS_FLOW_ACTION_ESP_REPLAY_BMP = 1,
1:  };
1:  
1:  struct ib_uverbs_flow_action_esp_replay_bmp {
1: -	__u32 size;
1: +  __u32 size;
1:  };
1:  
1:  union ib_gid {
1: -	u8 raw[16];
1: -	struct {
1: -		__be64 subnet_prefix;
1: -		__be64 interface_id;
1: -	} global;
1: +  u8 raw[16];
1: +  struct {
1: +    __be64 subnet_prefix;
1: +    __be64 interface_id;
1: +  } global;
1:  };
1:  
1:  enum ib_gid_type {
1: -	IB_GID_TYPE_IB = 0,
1: -	IB_GID_TYPE_ROCE = 1,
1: -	IB_GID_TYPE_ROCE_UDP_ENCAP = 2,
1: -	IB_GID_TYPE_SIZE = 3,
1: +  IB_GID_TYPE_IB = 0,
1: +  IB_GID_TYPE_ROCE = 1,
1: +  IB_GID_TYPE_ROCE_UDP_ENCAP = 2,
1: +  IB_GID_TYPE_SIZE = 3,
1:  };
1:  
1:  struct ib_gid_attr {
1: -	struct net_device *ndev;
1: -	struct ib_device *device;
1: -	union ib_gid gid;
1: -	enum ib_gid_type gid_type;
1: -	u16 index;
1: -	u8 port_num;
1: +  struct net_device *ndev;
1: +  struct ib_device *device;
1: +  union ib_gid gid;
1: +  enum ib_gid_type gid_type;
1: +  u16 index;
1: +  u8 port_num;
1:  };
1:  
1:  struct ib_cq_init_attr {
1: -	unsigned int cqe;
1: -	u32 comp_vector;
1: -	u32 flags;
1: +  unsigned int cqe;
1: +  u32 comp_vector;
1: +  u32 flags;
1:  };
1:  
1:  struct ib_dm_mr_attr {
1: -	u64 length;
1: -	u64 offset;
1: -	u32 access_flags;
1: +  u64 length;
1: +  u64 offset;
1: +  u32 access_flags;
1:  };
1:  
1:  struct ib_dm_alloc_attr {
1: -	u64 length;
1: -	u32 alignment;
1: -	u32 flags;
1: +  u64 length;
1: +  u32 alignment;
1: +  u32 flags;
1:  };
1:  
1:  enum ib_mtu {
1: -	IB_MTU_256 = 1,
1: -	IB_MTU_512 = 2,
1: -	IB_MTU_1024 = 3,
1: -	IB_MTU_2048 = 4,
1: -	IB_MTU_4096 = 5,
1: +  IB_MTU_256 = 1,
1: +  IB_MTU_512 = 2,
1: +  IB_MTU_1024 = 3,
1: +  IB_MTU_2048 = 4,
1: +  IB_MTU_4096 = 5,
1:  };
1:  
1:  enum ib_port_state {
1: -	IB_PORT_NOP = 0,
1: -	IB_PORT_DOWN = 1,
1: -	IB_PORT_INIT = 2,
1: -	IB_PORT_ARMED = 3,
1: -	IB_PORT_ACTIVE = 4,
1: -	IB_PORT_ACTIVE_DEFER = 5,
1: +  IB_PORT_NOP = 0,
1: +  IB_PORT_DOWN = 1,
1: +  IB_PORT_INIT = 2,
1: +  IB_PORT_ARMED = 3,
1: +  IB_PORT_ACTIVE = 4,
1: +  IB_PORT_ACTIVE_DEFER = 5,
1:  };
1:  
1:  struct ib_port_attr {
1: -	u64 subnet_prefix;
1: -	enum ib_port_state state;
1: -	enum ib_mtu max_mtu;
1: -	enum ib_mtu active_mtu;
1: -	u32 phys_mtu;
1: -	int gid_tbl_len;
1: -	unsigned int ip_gids: 1;
1: -	u32 port_cap_flags;
1: -	u32 max_msg_sz;
1: -	u32 bad_pkey_cntr;
1: -	u32 qkey_viol_cntr;
1: -	u16 pkey_tbl_len;
1: -	u32 sm_lid;
1: -	u32 lid;
1: -	u8 lmc;
1: -	u8 max_vl_num;
1: -	u8 sm_sl;
1: -	u8 subnet_timeout;
1: -	u8 init_type_reply;
1: -	u8 active_width;
1: -	u16 active_speed;
1: -	u8 phys_state;
1: -	u16 port_cap_flags2;
1: +  u64 subnet_prefix;
1: +  enum ib_port_state state;
1: +  enum ib_mtu max_mtu;
1: +  enum ib_mtu active_mtu;
1: +  u32 phys_mtu;
1: +  int gid_tbl_len;
1: +  unsigned int ip_gids : 1;
1: +  u32 port_cap_flags;
1: +  u32 max_msg_sz;
1: +  u32 bad_pkey_cntr;
1: +  u32 qkey_viol_cntr;
1: +  u16 pkey_tbl_len;
1: +  u32 sm_lid;
1: +  u32 lid;
1: +  u8 lmc;
1: +  u8 max_vl_num;
1: +  u8 sm_sl;
1: +  u8 subnet_timeout;
1: +  u8 init_type_reply;
1: +  u8 active_width;
1: +  u16 active_speed;
1: +  u8 phys_state;
1: +  u16 port_cap_flags2;
1:  };
1:  
1:  struct ib_device_modify {
1: -	u64 sys_image_guid;
1: -	char node_desc[64];
1: +  u64 sys_image_guid;
1: +  char node_desc[64];
1:  };
1:  
1:  struct ib_port_modify {
1: -	u32 set_port_cap_mask;
1: -	u32 clr_port_cap_mask;
1: -	u8 init_type;
1: +  u32 set_port_cap_mask;
1: +  u32 clr_port_cap_mask;
1: +  u8 init_type;
1:  };
1:  
1:  enum ib_event_type {
1: -	IB_EVENT_CQ_ERR = 0,
1: -	IB_EVENT_QP_FATAL = 1,
1: -	IB_EVENT_QP_REQ_ERR = 2,
1: -	IB_EVENT_QP_ACCESS_ERR = 3,
1: -	IB_EVENT_COMM_EST = 4,
1: -	IB_EVENT_SQ_DRAINED = 5,
1: -	IB_EVENT_PATH_MIG = 6,
1: -	IB_EVENT_PATH_MIG_ERR = 7,
1: -	IB_EVENT_DEVICE_FATAL = 8,
1: -	IB_EVENT_PORT_ACTIVE = 9,
1: -	IB_EVENT_PORT_ERR = 10,
1: -	IB_EVENT_LID_CHANGE = 11,
1: -	IB_EVENT_PKEY_CHANGE = 12,
1: -	IB_EVENT_SM_CHANGE = 13,
1: -	IB_EVENT_SRQ_ERR = 14,
1: -	IB_EVENT_SRQ_LIMIT_REACHED = 15,
1: -	IB_EVENT_QP_LAST_WQE_REACHED = 16,
1: -	IB_EVENT_CLIENT_REREGISTER = 17,
1: -	IB_EVENT_GID_CHANGE = 18,
1: -	IB_EVENT_WQ_FATAL = 19,
1: +  IB_EVENT_CQ_ERR = 0,
1: +  IB_EVENT_QP_FATAL = 1,
1: +  IB_EVENT_QP_REQ_ERR = 2,
1: +  IB_EVENT_QP_ACCESS_ERR = 3,
1: +  IB_EVENT_COMM_EST = 4,
1: +  IB_EVENT_SQ_DRAINED = 5,
1: +  IB_EVENT_PATH_MIG = 6,
1: +  IB_EVENT_PATH_MIG_ERR = 7,
1: +  IB_EVENT_DEVICE_FATAL = 8,
1: +  IB_EVENT_PORT_ACTIVE = 9,
1: +  IB_EVENT_PORT_ERR = 10,
1: +  IB_EVENT_LID_CHANGE = 11,
1: +  IB_EVENT_PKEY_CHANGE = 12,
1: +  IB_EVENT_SM_CHANGE = 13,
1: +  IB_EVENT_SRQ_ERR = 14,
1: +  IB_EVENT_SRQ_LIMIT_REACHED = 15,
1: +  IB_EVENT_QP_LAST_WQE_REACHED = 16,
1: +  IB_EVENT_CLIENT_REREGISTER = 17,
1: +  IB_EVENT_GID_CHANGE = 18,
1: +  IB_EVENT_WQ_FATAL = 19,
1:  };
1:  
1:  struct ib_ucq_object;
1: @@ -64853,501 +65847,501 @@ typedef void (*ib_comp_handler)(struct ib_cq *, void *);
1:  struct ib_event;
1:  
1:  struct ib_cq {
1: -	struct ib_device *device;
1: -	struct ib_ucq_object *uobject;
1: -	ib_comp_handler comp_handler;
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	void *cq_context;
1: -	int cqe;
1: -	unsigned int cqe_used;
1: -	atomic_t usecnt;
1: -	enum ib_poll_context poll_ctx;
1: -	struct ib_wc *wc;
1: -	struct list_head pool_entry;
1: -	union {
1: -		struct irq_poll iop;
1: -		struct work_struct work;
1: -	};
1: -	struct workqueue_struct *comp_wq;
1: -	struct dim *dim;
1: -	ktime_t timestamp;
1: -	u8 interrupt: 1;
1: -	u8 shared: 1;
1: -	unsigned int comp_vector;
1: -	struct rdma_restrack_entry res;
1: +  struct ib_device *device;
1: +  struct ib_ucq_object *uobject;
1: +  ib_comp_handler comp_handler;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  void *cq_context;
1: +  int cqe;
1: +  unsigned int cqe_used;
1: +  atomic_t usecnt;
1: +  enum ib_poll_context poll_ctx;
1: +  struct ib_wc *wc;
1: +  struct list_head pool_entry;
1: +  union {
1: +    struct irq_poll iop;
1: +    struct work_struct work;
1: +  };
1: +  struct workqueue_struct *comp_wq;
1: +  struct dim *dim;
1: +  ktime_t timestamp;
1: +  u8 interrupt : 1;
1: +  u8 shared : 1;
1: +  unsigned int comp_vector;
1: +  struct rdma_restrack_entry res;
1:  };
1:  
1:  struct ib_uqp_object;
1:  
1:  enum ib_qp_type {
1: -	IB_QPT_SMI = 0,
1: -	IB_QPT_GSI = 1,
1: -	IB_QPT_RC = 2,
1: -	IB_QPT_UC = 3,
1: -	IB_QPT_UD = 4,
1: -	IB_QPT_RAW_IPV6 = 5,
1: -	IB_QPT_RAW_ETHERTYPE = 6,
1: -	IB_QPT_RAW_PACKET = 8,
1: -	IB_QPT_XRC_INI = 9,
1: -	IB_QPT_XRC_TGT = 10,
1: -	IB_QPT_MAX = 11,
1: -	IB_QPT_DRIVER = 255,
1: -	IB_QPT_RESERVED1 = 4096,
1: -	IB_QPT_RESERVED2 = 4097,
1: -	IB_QPT_RESERVED3 = 4098,
1: -	IB_QPT_RESERVED4 = 4099,
1: -	IB_QPT_RESERVED5 = 4100,
1: -	IB_QPT_RESERVED6 = 4101,
1: -	IB_QPT_RESERVED7 = 4102,
1: -	IB_QPT_RESERVED8 = 4103,
1: -	IB_QPT_RESERVED9 = 4104,
1: -	IB_QPT_RESERVED10 = 4105,
1: +  IB_QPT_SMI = 0,
1: +  IB_QPT_GSI = 1,
1: +  IB_QPT_RC = 2,
1: +  IB_QPT_UC = 3,
1: +  IB_QPT_UD = 4,
1: +  IB_QPT_RAW_IPV6 = 5,
1: +  IB_QPT_RAW_ETHERTYPE = 6,
1: +  IB_QPT_RAW_PACKET = 8,
1: +  IB_QPT_XRC_INI = 9,
1: +  IB_QPT_XRC_TGT = 10,
1: +  IB_QPT_MAX = 11,
1: +  IB_QPT_DRIVER = 255,
1: +  IB_QPT_RESERVED1 = 4096,
1: +  IB_QPT_RESERVED2 = 4097,
1: +  IB_QPT_RESERVED3 = 4098,
1: +  IB_QPT_RESERVED4 = 4099,
1: +  IB_QPT_RESERVED5 = 4100,
1: +  IB_QPT_RESERVED6 = 4101,
1: +  IB_QPT_RESERVED7 = 4102,
1: +  IB_QPT_RESERVED8 = 4103,
1: +  IB_QPT_RESERVED9 = 4104,
1: +  IB_QPT_RESERVED10 = 4105,
1:  };
1:  
1:  struct ib_qp_security;
1:  
1:  struct ib_qp {
1: -	struct ib_device *device;
1: -	struct ib_pd *pd;
1: -	struct ib_cq *send_cq;
1: -	struct ib_cq *recv_cq;
1: -	spinlock_t mr_lock;
1: -	int mrs_used;
1: -	struct list_head rdma_mrs;
1: -	struct list_head sig_mrs;
1: -	struct ib_srq *srq;
1: -	struct ib_xrcd *xrcd;
1: -	struct list_head xrcd_list;
1: -	atomic_t usecnt;
1: -	struct list_head open_list;
1: -	struct ib_qp *real_qp;
1: -	struct ib_uqp_object *uobject;
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	void *qp_context;
1: -	const struct ib_gid_attr *av_sgid_attr;
1: -	const struct ib_gid_attr *alt_path_sgid_attr;
1: -	u32 qp_num;
1: -	u32 max_write_sge;
1: -	u32 max_read_sge;
1: -	enum ib_qp_type qp_type;
1: -	struct ib_rwq_ind_table *rwq_ind_tbl;
1: -	struct ib_qp_security *qp_sec;
1: -	u8 port;
1: -	bool integrity_en;
1: -	struct rdma_restrack_entry res;
1: -	struct rdma_counter *counter;
1: +  struct ib_device *device;
1: +  struct ib_pd *pd;
1: +  struct ib_cq *send_cq;
1: +  struct ib_cq *recv_cq;
1: +  spinlock_t mr_lock;
1: +  int mrs_used;
1: +  struct list_head rdma_mrs;
1: +  struct list_head sig_mrs;
1: +  struct ib_srq *srq;
1: +  struct ib_xrcd *xrcd;
1: +  struct list_head xrcd_list;
1: +  atomic_t usecnt;
1: +  struct list_head open_list;
1: +  struct ib_qp *real_qp;
1: +  struct ib_uqp_object *uobject;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  void *qp_context;
1: +  const struct ib_gid_attr *av_sgid_attr;
1: +  const struct ib_gid_attr *alt_path_sgid_attr;
1: +  u32 qp_num;
1: +  u32 max_write_sge;
1: +  u32 max_read_sge;
1: +  enum ib_qp_type qp_type;
1: +  struct ib_rwq_ind_table *rwq_ind_tbl;
1: +  struct ib_qp_security *qp_sec;
1: +  u8 port;
1: +  bool integrity_en;
1: +  struct rdma_restrack_entry res;
1: +  struct rdma_counter *counter;
1:  };
1:  
1:  struct ib_usrq_object;
1:  
1:  enum ib_srq_type {
1: -	IB_SRQT_BASIC = 0,
1: -	IB_SRQT_XRC = 1,
1: -	IB_SRQT_TM = 2,
1: +  IB_SRQT_BASIC = 0,
1: +  IB_SRQT_XRC = 1,
1: +  IB_SRQT_TM = 2,
1:  };
1:  
1:  struct ib_srq {
1: -	struct ib_device *device;
1: -	struct ib_pd *pd;
1: -	struct ib_usrq_object *uobject;
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	void *srq_context;
1: -	enum ib_srq_type srq_type;
1: -	atomic_t usecnt;
1: -	struct {
1: -		struct ib_cq *cq;
1: -		union {
1: -			struct {
1: -				struct ib_xrcd *xrcd;
1: -				u32 srq_num;
1: -			} xrc;
1: -		};
1: -	} ext;
1: +  struct ib_device *device;
1: +  struct ib_pd *pd;
1: +  struct ib_usrq_object *uobject;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  void *srq_context;
1: +  enum ib_srq_type srq_type;
1: +  atomic_t usecnt;
1: +  struct {
1: +    struct ib_cq *cq;
1: +    union {
1: +      struct {
1: +        struct ib_xrcd *xrcd;
1: +        u32 srq_num;
1: +      } xrc;
1: +    };
1: +  } ext;
1:  };
1:  
1:  struct ib_uwq_object;
1:  
1:  enum ib_wq_state {
1: -	IB_WQS_RESET = 0,
1: -	IB_WQS_RDY = 1,
1: -	IB_WQS_ERR = 2,
1: +  IB_WQS_RESET = 0,
1: +  IB_WQS_RDY = 1,
1: +  IB_WQS_ERR = 2,
1:  };
1:  
1:  enum ib_wq_type {
1: -	IB_WQT_RQ = 0,
1: +  IB_WQT_RQ = 0,
1:  };
1:  
1:  struct ib_wq {
1: -	struct ib_device *device;
1: -	struct ib_uwq_object *uobject;
1: -	void *wq_context;
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	struct ib_pd *pd;
1: -	struct ib_cq *cq;
1: -	u32 wq_num;
1: -	enum ib_wq_state state;
1: -	enum ib_wq_type wq_type;
1: -	atomic_t usecnt;
1: +  struct ib_device *device;
1: +  struct ib_uwq_object *uobject;
1: +  void *wq_context;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  struct ib_pd *pd;
1: +  struct ib_cq *cq;
1: +  u32 wq_num;
1: +  enum ib_wq_state state;
1: +  enum ib_wq_type wq_type;
1: +  atomic_t usecnt;
1:  };
1:  
1:  struct ib_event {
1: -	struct ib_device *device;
1: -	union {
1: -		struct ib_cq *cq;
1: -		struct ib_qp *qp;
1: -		struct ib_srq *srq;
1: -		struct ib_wq *wq;
1: -		u8 port_num;
1: -	} element;
1: -	enum ib_event_type event;
1: +  struct ib_device *device;
1: +  union {
1: +    struct ib_cq *cq;
1: +    struct ib_qp *qp;
1: +    struct ib_srq *srq;
1: +    struct ib_wq *wq;
1: +    u8 port_num;
1: +  } element;
1: +  enum ib_event_type event;
1:  };
1:  
1:  struct ib_global_route {
1: -	const struct ib_gid_attr *sgid_attr;
1: -	union ib_gid dgid;
1: -	u32 flow_label;
1: -	u8 sgid_index;
1: -	u8 hop_limit;
1: -	u8 traffic_class;
1: +  const struct ib_gid_attr *sgid_attr;
1: +  union ib_gid dgid;
1: +  u32 flow_label;
1: +  u8 sgid_index;
1: +  u8 hop_limit;
1: +  u8 traffic_class;
1:  };
1:  
1:  struct ib_grh {
1: -	__be32 version_tclass_flow;
1: -	__be16 paylen;
1: -	u8 next_hdr;
1: -	u8 hop_limit;
1: -	union ib_gid sgid;
1: -	union ib_gid dgid;
1: +  __be32 version_tclass_flow;
1: +  __be16 paylen;
1: +  u8 next_hdr;
1: +  u8 hop_limit;
1: +  union ib_gid sgid;
1: +  union ib_gid dgid;
1:  };
1:  
1:  struct ib_mr_status {
1: -	u32 fail_status;
1: -	struct ib_sig_err sig_err;
1: +  u32 fail_status;
1: +  struct ib_sig_err sig_err;
1:  };
1:  
1:  struct rdma_ah_init_attr {
1: -	struct rdma_ah_attr *ah_attr;
1: -	u32 flags;
1: -	struct net_device *xmit_slave;
1: +  struct rdma_ah_attr *ah_attr;
1: +  u32 flags;
1: +  struct net_device *xmit_slave;
1:  };
1:  
1:  enum rdma_ah_attr_type {
1: -	RDMA_AH_ATTR_TYPE_UNDEFINED = 0,
1: -	RDMA_AH_ATTR_TYPE_IB = 1,
1: -	RDMA_AH_ATTR_TYPE_ROCE = 2,
1: -	RDMA_AH_ATTR_TYPE_OPA = 3,
1: +  RDMA_AH_ATTR_TYPE_UNDEFINED = 0,
1: +  RDMA_AH_ATTR_TYPE_IB = 1,
1: +  RDMA_AH_ATTR_TYPE_ROCE = 2,
1: +  RDMA_AH_ATTR_TYPE_OPA = 3,
1:  };
1:  
1:  struct ib_ah_attr {
1: -	u16 dlid;
1: -	u8 src_path_bits;
1: +  u16 dlid;
1: +  u8 src_path_bits;
1:  };
1:  
1:  struct roce_ah_attr {
1: -	u8 dmac[6];
1: +  u8 dmac[6];
1:  };
1:  
1:  struct opa_ah_attr {
1: -	u32 dlid;
1: -	u8 src_path_bits;
1: -	bool make_grd;
1: +  u32 dlid;
1: +  u8 src_path_bits;
1: +  bool make_grd;
1:  };
1:  
1:  struct rdma_ah_attr {
1: -	struct ib_global_route grh;
1: -	u8 sl;
1: -	u8 static_rate;
1: -	u8 port_num;
1: -	u8 ah_flags;
1: -	enum rdma_ah_attr_type type;
1: -	union {
1: -		struct ib_ah_attr ib;
1: -		struct roce_ah_attr roce;
1: -		struct opa_ah_attr opa;
1: -	};
1: +  struct ib_global_route grh;
1: +  u8 sl;
1: +  u8 static_rate;
1: +  u8 port_num;
1: +  u8 ah_flags;
1: +  enum rdma_ah_attr_type type;
1: +  union {
1: +    struct ib_ah_attr ib;
1: +    struct roce_ah_attr roce;
1: +    struct opa_ah_attr opa;
1: +  };
1:  };
1:  
1:  enum ib_wc_status {
1: -	IB_WC_SUCCESS = 0,
1: -	IB_WC_LOC_LEN_ERR = 1,
1: -	IB_WC_LOC_QP_OP_ERR = 2,
1: -	IB_WC_LOC_EEC_OP_ERR = 3,
1: -	IB_WC_LOC_PROT_ERR = 4,
1: -	IB_WC_WR_FLUSH_ERR = 5,
1: -	IB_WC_MW_BIND_ERR = 6,
1: -	IB_WC_BAD_RESP_ERR = 7,
1: -	IB_WC_LOC_ACCESS_ERR = 8,
1: -	IB_WC_REM_INV_REQ_ERR = 9,
1: -	IB_WC_REM_ACCESS_ERR = 10,
1: -	IB_WC_REM_OP_ERR = 11,
1: -	IB_WC_RETRY_EXC_ERR = 12,
1: -	IB_WC_RNR_RETRY_EXC_ERR = 13,
1: -	IB_WC_LOC_RDD_VIOL_ERR = 14,
1: -	IB_WC_REM_INV_RD_REQ_ERR = 15,
1: -	IB_WC_REM_ABORT_ERR = 16,
1: -	IB_WC_INV_EECN_ERR = 17,
1: -	IB_WC_INV_EEC_STATE_ERR = 18,
1: -	IB_WC_FATAL_ERR = 19,
1: -	IB_WC_RESP_TIMEOUT_ERR = 20,
1: -	IB_WC_GENERAL_ERR = 21,
1: +  IB_WC_SUCCESS = 0,
1: +  IB_WC_LOC_LEN_ERR = 1,
1: +  IB_WC_LOC_QP_OP_ERR = 2,
1: +  IB_WC_LOC_EEC_OP_ERR = 3,
1: +  IB_WC_LOC_PROT_ERR = 4,
1: +  IB_WC_WR_FLUSH_ERR = 5,
1: +  IB_WC_MW_BIND_ERR = 6,
1: +  IB_WC_BAD_RESP_ERR = 7,
1: +  IB_WC_LOC_ACCESS_ERR = 8,
1: +  IB_WC_REM_INV_REQ_ERR = 9,
1: +  IB_WC_REM_ACCESS_ERR = 10,
1: +  IB_WC_REM_OP_ERR = 11,
1: +  IB_WC_RETRY_EXC_ERR = 12,
1: +  IB_WC_RNR_RETRY_EXC_ERR = 13,
1: +  IB_WC_LOC_RDD_VIOL_ERR = 14,
1: +  IB_WC_REM_INV_RD_REQ_ERR = 15,
1: +  IB_WC_REM_ABORT_ERR = 16,
1: +  IB_WC_INV_EECN_ERR = 17,
1: +  IB_WC_INV_EEC_STATE_ERR = 18,
1: +  IB_WC_FATAL_ERR = 19,
1: +  IB_WC_RESP_TIMEOUT_ERR = 20,
1: +  IB_WC_GENERAL_ERR = 21,
1:  };
1:  
1:  enum ib_wc_opcode {
1: -	IB_WC_SEND = 0,
1: -	IB_WC_RDMA_WRITE = 1,
1: -	IB_WC_RDMA_READ = 2,
1: -	IB_WC_COMP_SWAP = 3,
1: -	IB_WC_FETCH_ADD = 4,
1: -	IB_WC_BIND_MW = 5,
1: -	IB_WC_LOCAL_INV = 6,
1: -	IB_WC_LSO = 7,
1: -	IB_WC_REG_MR = 8,
1: -	IB_WC_MASKED_COMP_SWAP = 9,
1: -	IB_WC_MASKED_FETCH_ADD = 10,
1: -	IB_WC_RECV = 128,
1: -	IB_WC_RECV_RDMA_WITH_IMM = 129,
1: +  IB_WC_SEND = 0,
1: +  IB_WC_RDMA_WRITE = 1,
1: +  IB_WC_RDMA_READ = 2,
1: +  IB_WC_COMP_SWAP = 3,
1: +  IB_WC_FETCH_ADD = 4,
1: +  IB_WC_BIND_MW = 5,
1: +  IB_WC_LOCAL_INV = 6,
1: +  IB_WC_LSO = 7,
1: +  IB_WC_REG_MR = 8,
1: +  IB_WC_MASKED_COMP_SWAP = 9,
1: +  IB_WC_MASKED_FETCH_ADD = 10,
1: +  IB_WC_RECV = 128,
1: +  IB_WC_RECV_RDMA_WITH_IMM = 129,
1:  };
1:  
1:  struct ib_cqe {
1: -	void (*done)(struct ib_cq *, struct ib_wc *);
1: +  void (*done)(struct ib_cq *, struct ib_wc *);
1:  };
1:  
1:  struct ib_wc {
1: -	union {
1: -		u64 wr_id;
1: -		struct ib_cqe *wr_cqe;
1: -	};
1: -	enum ib_wc_status status;
1: -	enum ib_wc_opcode opcode;
1: -	u32 vendor_err;
1: -	u32 byte_len;
1: -	struct ib_qp *qp;
1: -	union {
1: -		__be32 imm_data;
1: -		u32 invalidate_rkey;
1: -	} ex;
1: -	u32 src_qp;
1: -	u32 slid;
1: -	int wc_flags;
1: -	u16 pkey_index;
1: -	u8 sl;
1: -	u8 dlid_path_bits;
1: -	u8 port_num;
1: -	u8 smac[6];
1: -	u16 vlan_id;
1: -	u8 network_hdr_type;
1: +  union {
1: +    u64 wr_id;
1: +    struct ib_cqe *wr_cqe;
1: +  };
1: +  enum ib_wc_status status;
1: +  enum ib_wc_opcode opcode;
1: +  u32 vendor_err;
1: +  u32 byte_len;
1: +  struct ib_qp *qp;
1: +  union {
1: +    __be32 imm_data;
1: +    u32 invalidate_rkey;
1: +  } ex;
1: +  u32 src_qp;
1: +  u32 slid;
1: +  int wc_flags;
1: +  u16 pkey_index;
1: +  u8 sl;
1: +  u8 dlid_path_bits;
1: +  u8 port_num;
1: +  u8 smac[6];
1: +  u16 vlan_id;
1: +  u8 network_hdr_type;
1:  };
1:  
1:  struct ib_srq_attr {
1: -	u32 max_wr;
1: -	u32 max_sge;
1: -	u32 srq_limit;
1: +  u32 max_wr;
1: +  u32 max_sge;
1: +  u32 srq_limit;
1:  };
1:  
1:  struct ib_xrcd {
1: -	struct ib_device *device;
1: -	atomic_t usecnt;
1: -	struct inode *inode;
1: -	struct rw_semaphore tgt_qps_rwsem;
1: -	struct xarray tgt_qps;
1: +  struct ib_device *device;
1: +  atomic_t usecnt;
1: +  struct inode *inode;
1: +  struct rw_semaphore tgt_qps_rwsem;
1: +  struct xarray tgt_qps;
1:  };
1:  
1:  struct ib_srq_init_attr {
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	void *srq_context;
1: -	struct ib_srq_attr attr;
1: -	enum ib_srq_type srq_type;
1: -	struct {
1: -		struct ib_cq *cq;
1: -		union {
1: -			struct {
1: -				struct ib_xrcd *xrcd;
1: -			} xrc;
1: -			struct {
1: -				u32 max_num_tags;
1: -			} tag_matching;
1: -		};
1: -	} ext;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  void *srq_context;
1: +  struct ib_srq_attr attr;
1: +  enum ib_srq_type srq_type;
1: +  struct {
1: +    struct ib_cq *cq;
1: +    union {
1: +      struct {
1: +        struct ib_xrcd *xrcd;
1: +      } xrc;
1: +      struct {
1: +        u32 max_num_tags;
1: +      } tag_matching;
1: +    };
1: +  } ext;
1:  };
1:  
1:  struct ib_qp_cap {
1: -	u32 max_send_wr;
1: -	u32 max_recv_wr;
1: -	u32 max_send_sge;
1: -	u32 max_recv_sge;
1: -	u32 max_inline_data;
1: -	u32 max_rdma_ctxs;
1: +  u32 max_send_wr;
1: +  u32 max_recv_wr;
1: +  u32 max_send_sge;
1: +  u32 max_recv_sge;
1: +  u32 max_inline_data;
1: +  u32 max_rdma_ctxs;
1:  };
1:  
1:  enum ib_sig_type {
1: -	IB_SIGNAL_ALL_WR = 0,
1: -	IB_SIGNAL_REQ_WR = 1,
1: +  IB_SIGNAL_ALL_WR = 0,
1: +  IB_SIGNAL_REQ_WR = 1,
1:  };
1:  
1:  struct ib_qp_init_attr {
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	void *qp_context;
1: -	struct ib_cq *send_cq;
1: -	struct ib_cq *recv_cq;
1: -	struct ib_srq *srq;
1: -	struct ib_xrcd *xrcd;
1: -	struct ib_qp_cap cap;
1: -	enum ib_sig_type sq_sig_type;
1: -	enum ib_qp_type qp_type;
1: -	u32 create_flags;
1: -	u8 port_num;
1: -	struct ib_rwq_ind_table *rwq_ind_tbl;
1: -	u32 source_qpn;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  void *qp_context;
1: +  struct ib_cq *send_cq;
1: +  struct ib_cq *recv_cq;
1: +  struct ib_srq *srq;
1: +  struct ib_xrcd *xrcd;
1: +  struct ib_qp_cap cap;
1: +  enum ib_sig_type sq_sig_type;
1: +  enum ib_qp_type qp_type;
1: +  u32 create_flags;
1: +  u8 port_num;
1: +  struct ib_rwq_ind_table *rwq_ind_tbl;
1: +  u32 source_qpn;
1:  };
1:  
1:  struct ib_uobject;
1:  
1:  struct ib_rwq_ind_table {
1: -	struct ib_device *device;
1: -	struct ib_uobject *uobject;
1: -	atomic_t usecnt;
1: -	u32 ind_tbl_num;
1: -	u32 log_ind_tbl_size;
1: -	struct ib_wq **ind_tbl;
1: +  struct ib_device *device;
1: +  struct ib_uobject *uobject;
1: +  atomic_t usecnt;
1: +  u32 ind_tbl_num;
1: +  u32 log_ind_tbl_size;
1: +  struct ib_wq **ind_tbl;
1:  };
1:  
1:  enum ib_qp_state {
1: -	IB_QPS_RESET = 0,
1: -	IB_QPS_INIT = 1,
1: -	IB_QPS_RTR = 2,
1: -	IB_QPS_RTS = 3,
1: -	IB_QPS_SQD = 4,
1: -	IB_QPS_SQE = 5,
1: -	IB_QPS_ERR = 6,
1: +  IB_QPS_RESET = 0,
1: +  IB_QPS_INIT = 1,
1: +  IB_QPS_RTR = 2,
1: +  IB_QPS_RTS = 3,
1: +  IB_QPS_SQD = 4,
1: +  IB_QPS_SQE = 5,
1: +  IB_QPS_ERR = 6,
1:  };
1:  
1:  enum ib_mig_state {
1: -	IB_MIG_MIGRATED = 0,
1: -	IB_MIG_REARM = 1,
1: -	IB_MIG_ARMED = 2,
1: +  IB_MIG_MIGRATED = 0,
1: +  IB_MIG_REARM = 1,
1: +  IB_MIG_ARMED = 2,
1:  };
1:  
1:  enum ib_mw_type {
1: -	IB_MW_TYPE_1 = 1,
1: -	IB_MW_TYPE_2 = 2,
1: +  IB_MW_TYPE_1 = 1,
1: +  IB_MW_TYPE_2 = 2,
1:  };
1:  
1:  struct ib_qp_attr {
1: -	enum ib_qp_state qp_state;
1: -	enum ib_qp_state cur_qp_state;
1: -	enum ib_mtu path_mtu;
1: -	enum ib_mig_state path_mig_state;
1: -	u32 qkey;
1: -	u32 rq_psn;
1: -	u32 sq_psn;
1: -	u32 dest_qp_num;
1: -	int qp_access_flags;
1: -	struct ib_qp_cap cap;
1: -	struct rdma_ah_attr ah_attr;
1: -	struct rdma_ah_attr alt_ah_attr;
1: -	u16 pkey_index;
1: -	u16 alt_pkey_index;
1: -	u8 en_sqd_async_notify;
1: -	u8 sq_draining;
1: -	u8 max_rd_atomic;
1: -	u8 max_dest_rd_atomic;
1: -	u8 min_rnr_timer;
1: -	u8 port_num;
1: -	u8 timeout;
1: -	u8 retry_cnt;
1: -	u8 rnr_retry;
1: -	u8 alt_port_num;
1: -	u8 alt_timeout;
1: -	u32 rate_limit;
1: -	struct net_device *xmit_slave;
1: +  enum ib_qp_state qp_state;
1: +  enum ib_qp_state cur_qp_state;
1: +  enum ib_mtu path_mtu;
1: +  enum ib_mig_state path_mig_state;
1: +  u32 qkey;
1: +  u32 rq_psn;
1: +  u32 sq_psn;
1: +  u32 dest_qp_num;
1: +  int qp_access_flags;
1: +  struct ib_qp_cap cap;
1: +  struct rdma_ah_attr ah_attr;
1: +  struct rdma_ah_attr alt_ah_attr;
1: +  u16 pkey_index;
1: +  u16 alt_pkey_index;
1: +  u8 en_sqd_async_notify;
1: +  u8 sq_draining;
1: +  u8 max_rd_atomic;
1: +  u8 max_dest_rd_atomic;
1: +  u8 min_rnr_timer;
1: +  u8 port_num;
1: +  u8 timeout;
1: +  u8 retry_cnt;
1: +  u8 rnr_retry;
1: +  u8 alt_port_num;
1: +  u8 alt_timeout;
1: +  u32 rate_limit;
1: +  struct net_device *xmit_slave;
1:  };
1:  
1:  enum ib_wr_opcode {
1: -	IB_WR_RDMA_WRITE = 0,
1: -	IB_WR_RDMA_WRITE_WITH_IMM = 1,
1: -	IB_WR_SEND = 2,
1: -	IB_WR_SEND_WITH_IMM = 3,
1: -	IB_WR_RDMA_READ = 4,
1: -	IB_WR_ATOMIC_CMP_AND_SWP = 5,
1: -	IB_WR_ATOMIC_FETCH_AND_ADD = 6,
1: -	IB_WR_BIND_MW = 8,
1: -	IB_WR_LSO = 10,
1: -	IB_WR_SEND_WITH_INV = 9,
1: -	IB_WR_RDMA_READ_WITH_INV = 11,
1: -	IB_WR_LOCAL_INV = 7,
1: -	IB_WR_MASKED_ATOMIC_CMP_AND_SWP = 12,
1: -	IB_WR_MASKED_ATOMIC_FETCH_AND_ADD = 13,
1: -	IB_WR_REG_MR = 32,
1: -	IB_WR_REG_MR_INTEGRITY = 33,
1: -	IB_WR_RESERVED1 = 240,
1: -	IB_WR_RESERVED2 = 241,
1: -	IB_WR_RESERVED3 = 242,
1: -	IB_WR_RESERVED4 = 243,
1: -	IB_WR_RESERVED5 = 244,
1: -	IB_WR_RESERVED6 = 245,
1: -	IB_WR_RESERVED7 = 246,
1: -	IB_WR_RESERVED8 = 247,
1: -	IB_WR_RESERVED9 = 248,
1: -	IB_WR_RESERVED10 = 249,
1: +  IB_WR_RDMA_WRITE = 0,
1: +  IB_WR_RDMA_WRITE_WITH_IMM = 1,
1: +  IB_WR_SEND = 2,
1: +  IB_WR_SEND_WITH_IMM = 3,
1: +  IB_WR_RDMA_READ = 4,
1: +  IB_WR_ATOMIC_CMP_AND_SWP = 5,
1: +  IB_WR_ATOMIC_FETCH_AND_ADD = 6,
1: +  IB_WR_BIND_MW = 8,
1: +  IB_WR_LSO = 10,
1: +  IB_WR_SEND_WITH_INV = 9,
1: +  IB_WR_RDMA_READ_WITH_INV = 11,
1: +  IB_WR_LOCAL_INV = 7,
1: +  IB_WR_MASKED_ATOMIC_CMP_AND_SWP = 12,
1: +  IB_WR_MASKED_ATOMIC_FETCH_AND_ADD = 13,
1: +  IB_WR_REG_MR = 32,
1: +  IB_WR_REG_MR_INTEGRITY = 33,
1: +  IB_WR_RESERVED1 = 240,
1: +  IB_WR_RESERVED2 = 241,
1: +  IB_WR_RESERVED3 = 242,
1: +  IB_WR_RESERVED4 = 243,
1: +  IB_WR_RESERVED5 = 244,
1: +  IB_WR_RESERVED6 = 245,
1: +  IB_WR_RESERVED7 = 246,
1: +  IB_WR_RESERVED8 = 247,
1: +  IB_WR_RESERVED9 = 248,
1: +  IB_WR_RESERVED10 = 249,
1:  };
1:  
1:  struct ib_sge {
1: -	u64 addr;
1: -	u32 length;
1: -	u32 lkey;
1: +  u64 addr;
1: +  u32 length;
1: +  u32 lkey;
1:  };
1:  
1:  struct ib_send_wr {
1: -	struct ib_send_wr *next;
1: -	union {
1: -		u64 wr_id;
1: -		struct ib_cqe *wr_cqe;
1: -	};
1: -	struct ib_sge *sg_list;
1: -	int num_sge;
1: -	enum ib_wr_opcode opcode;
1: -	int send_flags;
1: -	union {
1: -		__be32 imm_data;
1: -		u32 invalidate_rkey;
1: -	} ex;
1: +  struct ib_send_wr *next;
1: +  union {
1: +    u64 wr_id;
1: +    struct ib_cqe *wr_cqe;
1: +  };
1: +  struct ib_sge *sg_list;
1: +  int num_sge;
1: +  enum ib_wr_opcode opcode;
1: +  int send_flags;
1: +  union {
1: +    __be32 imm_data;
1: +    u32 invalidate_rkey;
1: +  } ex;
1:  };
1:  
1:  struct ib_ah {
1: -	struct ib_device *device;
1: -	struct ib_pd *pd;
1: -	struct ib_uobject *uobject;
1: -	const struct ib_gid_attr *sgid_attr;
1: -	enum rdma_ah_attr_type type;
1: +  struct ib_device *device;
1: +  struct ib_pd *pd;
1: +  struct ib_uobject *uobject;
1: +  const struct ib_gid_attr *sgid_attr;
1: +  enum rdma_ah_attr_type type;
1:  };
1:  
1:  struct ib_mr {
1: -	struct ib_device *device;
1: -	struct ib_pd *pd;
1: -	u32 lkey;
1: -	u32 rkey;
1: -	u64 iova;
1: -	u64 length;
1: -	unsigned int page_size;
1: -	enum ib_mr_type type;
1: -	bool need_inval;
1: -	union {
1: -		struct ib_uobject *uobject;
1: -		struct list_head qp_entry;
1: -	};
1: -	struct ib_dm *dm;
1: -	struct ib_sig_attrs *sig_attrs;
1: -	struct rdma_restrack_entry res;
1: +  struct ib_device *device;
1: +  struct ib_pd *pd;
1: +  u32 lkey;
1: +  u32 rkey;
1: +  u64 iova;
1: +  u64 length;
1: +  unsigned int page_size;
1: +  enum ib_mr_type type;
1: +  bool need_inval;
1: +  union {
1: +    struct ib_uobject *uobject;
1: +    struct list_head qp_entry;
1: +  };
1: +  struct ib_dm *dm;
1: +  struct ib_sig_attrs *sig_attrs;
1: +  struct rdma_restrack_entry res;
1:  };
1:  
1:  struct ib_recv_wr {
1: -	struct ib_recv_wr *next;
1: -	union {
1: -		u64 wr_id;
1: -		struct ib_cqe *wr_cqe;
1: -	};
1: -	struct ib_sge *sg_list;
1: -	int num_sge;
1: +  struct ib_recv_wr *next;
1: +  union {
1: +    u64 wr_id;
1: +    struct ib_cqe *wr_cqe;
1: +  };
1: +  struct ib_sge *sg_list;
1: +  int num_sge;
1:  };
1:  
1:  struct ib_rdmacg_object {};
1: @@ -65355,378 +66349,378 @@ struct ib_rdmacg_object {};
1:  struct ib_uverbs_file;
1:  
1:  struct ib_ucontext {
1: -	struct ib_device *device;
1: -	struct ib_uverbs_file *ufile;
1: -	bool cleanup_retryable;
1: -	struct ib_rdmacg_object cg_obj;
1: -	struct rdma_restrack_entry res;
1: -	struct xarray mmap_xa;
1: +  struct ib_device *device;
1: +  struct ib_uverbs_file *ufile;
1: +  bool cleanup_retryable;
1: +  struct ib_rdmacg_object cg_obj;
1: +  struct rdma_restrack_entry res;
1: +  struct xarray mmap_xa;
1:  };
1:  
1:  struct uverbs_api_object;
1:  
1:  struct ib_uobject {
1: -	u64 user_handle;
1: -	struct ib_uverbs_file *ufile;
1: -	struct ib_ucontext *context;
1: -	void *object;
1: -	struct list_head list;
1: -	struct ib_rdmacg_object cg_obj;
1: -	int id;
1: -	struct kref ref;
1: -	atomic_t usecnt;
1: -	struct callback_head rcu;
1: -	const struct uverbs_api_object *uapi_object;
1: +  u64 user_handle;
1: +  struct ib_uverbs_file *ufile;
1: +  struct ib_ucontext *context;
1: +  void *object;
1: +  struct list_head list;
1: +  struct ib_rdmacg_object cg_obj;
1: +  int id;
1: +  struct kref ref;
1: +  atomic_t usecnt;
1: +  struct callback_head rcu;
1: +  const struct uverbs_api_object *uapi_object;
1:  };
1:  
1:  struct ib_udata {
1: -	const void *inbuf;
1: -	void *outbuf;
1: -	size_t inlen;
1: -	size_t outlen;
1: +  const void *inbuf;
1: +  void *outbuf;
1: +  size_t inlen;
1: +  size_t outlen;
1:  };
1:  
1:  struct ib_pd {
1: -	u32 local_dma_lkey;
1: -	u32 flags;
1: -	struct ib_device *device;
1: -	struct ib_uobject *uobject;
1: -	atomic_t usecnt;
1: -	u32 unsafe_global_rkey;
1: -	struct ib_mr *__internal_mr;
1: -	struct rdma_restrack_entry res;
1: +  u32 local_dma_lkey;
1: +  u32 flags;
1: +  struct ib_device *device;
1: +  struct ib_uobject *uobject;
1: +  atomic_t usecnt;
1: +  u32 unsafe_global_rkey;
1: +  struct ib_mr *__internal_mr;
1: +  struct rdma_restrack_entry res;
1:  };
1:  
1:  struct ib_wq_init_attr {
1: -	void *wq_context;
1: -	enum ib_wq_type wq_type;
1: -	u32 max_wr;
1: -	u32 max_sge;
1: -	struct ib_cq *cq;
1: -	void (*event_handler)(struct ib_event *, void *);
1: -	u32 create_flags;
1: +  void *wq_context;
1: +  enum ib_wq_type wq_type;
1: +  u32 max_wr;
1: +  u32 max_sge;
1: +  struct ib_cq *cq;
1: +  void (*event_handler)(struct ib_event *, void *);
1: +  u32 create_flags;
1:  };
1:  
1:  struct ib_wq_attr {
1: -	enum ib_wq_state wq_state;
1: -	enum ib_wq_state curr_wq_state;
1: -	u32 flags;
1: -	u32 flags_mask;
1: +  enum ib_wq_state wq_state;
1: +  enum ib_wq_state curr_wq_state;
1: +  u32 flags;
1: +  u32 flags_mask;
1:  };
1:  
1:  struct ib_rwq_ind_table_init_attr {
1: -	u32 log_ind_tbl_size;
1: -	struct ib_wq **ind_tbl;
1: +  u32 log_ind_tbl_size;
1: +  struct ib_wq **ind_tbl;
1:  };
1:  
1:  enum port_pkey_state {
1: -	IB_PORT_PKEY_NOT_VALID = 0,
1: -	IB_PORT_PKEY_VALID = 1,
1: -	IB_PORT_PKEY_LISTED = 2,
1: +  IB_PORT_PKEY_NOT_VALID = 0,
1: +  IB_PORT_PKEY_VALID = 1,
1: +  IB_PORT_PKEY_LISTED = 2,
1:  };
1:  
1:  struct ib_port_pkey {
1: -	enum port_pkey_state state;
1: -	u16 pkey_index;
1: -	u8 port_num;
1: -	struct list_head qp_list;
1: -	struct list_head to_error_list;
1: -	struct ib_qp_security *sec;
1: +  enum port_pkey_state state;
1: +  u16 pkey_index;
1: +  u8 port_num;
1: +  struct list_head qp_list;
1: +  struct list_head to_error_list;
1: +  struct ib_qp_security *sec;
1:  };
1:  
1:  struct ib_ports_pkeys;
1:  
1:  struct ib_qp_security {
1: -	struct ib_qp *qp;
1: -	struct ib_device *dev;
1: -	struct mutex mutex;
1: -	struct ib_ports_pkeys *ports_pkeys;
1: -	struct list_head shared_qp_list;
1: -	void *security;
1: -	bool destroying;
1: -	atomic_t error_list_count;
1: -	struct completion error_complete;
1: -	int error_comps_pending;
1: +  struct ib_qp *qp;
1: +  struct ib_device *dev;
1: +  struct mutex mutex;
1: +  struct ib_ports_pkeys *ports_pkeys;
1: +  struct list_head shared_qp_list;
1: +  void *security;
1: +  bool destroying;
1: +  atomic_t error_list_count;
1: +  struct completion error_complete;
1: +  int error_comps_pending;
1:  };
1:  
1:  struct ib_ports_pkeys {
1: -	struct ib_port_pkey main;
1: -	struct ib_port_pkey alt;
1: +  struct ib_port_pkey main;
1: +  struct ib_port_pkey alt;
1:  };
1:  
1:  struct ib_dm {
1: -	struct ib_device *device;
1: -	u32 length;
1: -	u32 flags;
1: -	struct ib_uobject *uobject;
1: -	atomic_t usecnt;
1: +  struct ib_device *device;
1: +  u32 length;
1: +  u32 flags;
1: +  struct ib_uobject *uobject;
1: +  atomic_t usecnt;
1:  };
1:  
1:  struct ib_mw {
1: -	struct ib_device *device;
1: -	struct ib_pd *pd;
1: -	struct ib_uobject *uobject;
1: -	u32 rkey;
1: -	enum ib_mw_type type;
1: +  struct ib_device *device;
1: +  struct ib_pd *pd;
1: +  struct ib_uobject *uobject;
1: +  u32 rkey;
1: +  enum ib_mw_type type;
1:  };
1:  
1:  enum ib_flow_attr_type {
1: -	IB_FLOW_ATTR_NORMAL = 0,
1: -	IB_FLOW_ATTR_ALL_DEFAULT = 1,
1: -	IB_FLOW_ATTR_MC_DEFAULT = 2,
1: -	IB_FLOW_ATTR_SNIFFER = 3,
1: +  IB_FLOW_ATTR_NORMAL = 0,
1: +  IB_FLOW_ATTR_ALL_DEFAULT = 1,
1: +  IB_FLOW_ATTR_MC_DEFAULT = 2,
1: +  IB_FLOW_ATTR_SNIFFER = 3,
1:  };
1:  
1:  enum ib_flow_spec_type {
1: -	IB_FLOW_SPEC_ETH = 32,
1: -	IB_FLOW_SPEC_IB = 34,
1: -	IB_FLOW_SPEC_IPV4 = 48,
1: -	IB_FLOW_SPEC_IPV6 = 49,
1: -	IB_FLOW_SPEC_ESP = 52,
1: -	IB_FLOW_SPEC_TCP = 64,
1: -	IB_FLOW_SPEC_UDP = 65,
1: -	IB_FLOW_SPEC_VXLAN_TUNNEL = 80,
1: -	IB_FLOW_SPEC_GRE = 81,
1: -	IB_FLOW_SPEC_MPLS = 96,
1: -	IB_FLOW_SPEC_INNER = 256,
1: -	IB_FLOW_SPEC_ACTION_TAG = 4096,
1: -	IB_FLOW_SPEC_ACTION_DROP = 4097,
1: -	IB_FLOW_SPEC_ACTION_HANDLE = 4098,
1: -	IB_FLOW_SPEC_ACTION_COUNT = 4099,
1: +  IB_FLOW_SPEC_ETH = 32,
1: +  IB_FLOW_SPEC_IB = 34,
1: +  IB_FLOW_SPEC_IPV4 = 48,
1: +  IB_FLOW_SPEC_IPV6 = 49,
1: +  IB_FLOW_SPEC_ESP = 52,
1: +  IB_FLOW_SPEC_TCP = 64,
1: +  IB_FLOW_SPEC_UDP = 65,
1: +  IB_FLOW_SPEC_VXLAN_TUNNEL = 80,
1: +  IB_FLOW_SPEC_GRE = 81,
1: +  IB_FLOW_SPEC_MPLS = 96,
1: +  IB_FLOW_SPEC_INNER = 256,
1: +  IB_FLOW_SPEC_ACTION_TAG = 4096,
1: +  IB_FLOW_SPEC_ACTION_DROP = 4097,
1: +  IB_FLOW_SPEC_ACTION_HANDLE = 4098,
1: +  IB_FLOW_SPEC_ACTION_COUNT = 4099,
1:  };
1:  
1:  struct ib_flow_eth_filter {
1: -	u8 dst_mac[6];
1: -	u8 src_mac[6];
1: -	__be16 ether_type;
1: -	__be16 vlan_tag;
1: -	u8 real_sz[0];
1: +  u8 dst_mac[6];
1: +  u8 src_mac[6];
1: +  __be16 ether_type;
1: +  __be16 vlan_tag;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_eth {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_eth_filter val;
1: -	struct ib_flow_eth_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_eth_filter val;
1: +  struct ib_flow_eth_filter mask;
1:  };
1:  
1:  struct ib_flow_ib_filter {
1: -	__be16 dlid;
1: -	__u8 sl;
1: -	u8 real_sz[0];
1: +  __be16 dlid;
1: +  __u8 sl;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_ib {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_ib_filter val;
1: -	struct ib_flow_ib_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_ib_filter val;
1: +  struct ib_flow_ib_filter mask;
1:  };
1:  
1:  struct ib_flow_ipv4_filter {
1: -	__be32 src_ip;
1: -	__be32 dst_ip;
1: -	u8 proto;
1: -	u8 tos;
1: -	u8 ttl;
1: -	u8 flags;
1: -	u8 real_sz[0];
1: +  __be32 src_ip;
1: +  __be32 dst_ip;
1: +  u8 proto;
1: +  u8 tos;
1: +  u8 ttl;
1: +  u8 flags;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_ipv4 {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_ipv4_filter val;
1: -	struct ib_flow_ipv4_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_ipv4_filter val;
1: +  struct ib_flow_ipv4_filter mask;
1:  };
1:  
1:  struct ib_flow_ipv6_filter {
1: -	u8 src_ip[16];
1: -	u8 dst_ip[16];
1: -	__be32 flow_label;
1: -	u8 next_hdr;
1: -	u8 traffic_class;
1: -	u8 hop_limit;
1: -	u8 real_sz[0];
1: +  u8 src_ip[16];
1: +  u8 dst_ip[16];
1: +  __be32 flow_label;
1: +  u8 next_hdr;
1: +  u8 traffic_class;
1: +  u8 hop_limit;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_ipv6 {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_ipv6_filter val;
1: -	struct ib_flow_ipv6_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_ipv6_filter val;
1: +  struct ib_flow_ipv6_filter mask;
1:  };
1:  
1:  struct ib_flow_tcp_udp_filter {
1: -	__be16 dst_port;
1: -	__be16 src_port;
1: -	u8 real_sz[0];
1: +  __be16 dst_port;
1: +  __be16 src_port;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_tcp_udp {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_tcp_udp_filter val;
1: -	struct ib_flow_tcp_udp_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_tcp_udp_filter val;
1: +  struct ib_flow_tcp_udp_filter mask;
1:  };
1:  
1:  struct ib_flow_tunnel_filter {
1: -	__be32 tunnel_id;
1: -	u8 real_sz[0];
1: +  __be32 tunnel_id;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_tunnel {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_tunnel_filter val;
1: -	struct ib_flow_tunnel_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_tunnel_filter val;
1: +  struct ib_flow_tunnel_filter mask;
1:  };
1:  
1:  struct ib_flow_esp_filter {
1: -	__be32 spi;
1: -	__be32 seq;
1: -	u8 real_sz[0];
1: +  __be32 spi;
1: +  __be32 seq;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_esp {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_esp_filter val;
1: -	struct ib_flow_esp_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_esp_filter val;
1: +  struct ib_flow_esp_filter mask;
1:  };
1:  
1:  struct ib_flow_gre_filter {
1: -	__be16 c_ks_res0_ver;
1: -	__be16 protocol;
1: -	__be32 key;
1: -	u8 real_sz[0];
1: +  __be16 c_ks_res0_ver;
1: +  __be16 protocol;
1: +  __be32 key;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_gre {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_gre_filter val;
1: -	struct ib_flow_gre_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_gre_filter val;
1: +  struct ib_flow_gre_filter mask;
1:  };
1:  
1:  struct ib_flow_mpls_filter {
1: -	__be32 tag;
1: -	u8 real_sz[0];
1: +  __be32 tag;
1: +  u8 real_sz[0];
1:  };
1:  
1:  struct ib_flow_spec_mpls {
1: -	u32 type;
1: -	u16 size;
1: -	struct ib_flow_mpls_filter val;
1: -	struct ib_flow_mpls_filter mask;
1: +  u32 type;
1: +  u16 size;
1: +  struct ib_flow_mpls_filter val;
1: +  struct ib_flow_mpls_filter mask;
1:  };
1:  
1:  struct ib_flow_spec_action_tag {
1: -	enum ib_flow_spec_type type;
1: -	u16 size;
1: -	u32 tag_id;
1: +  enum ib_flow_spec_type type;
1: +  u16 size;
1: +  u32 tag_id;
1:  };
1:  
1:  struct ib_flow_spec_action_drop {
1: -	enum ib_flow_spec_type type;
1: -	u16 size;
1: +  enum ib_flow_spec_type type;
1: +  u16 size;
1:  };
1:  
1:  struct ib_flow_spec_action_handle {
1: -	enum ib_flow_spec_type type;
1: -	u16 size;
1: -	struct ib_flow_action *act;
1: +  enum ib_flow_spec_type type;
1: +  u16 size;
1: +  struct ib_flow_action *act;
1:  };
1:  
1:  enum ib_flow_action_type {
1: -	IB_FLOW_ACTION_UNSPECIFIED = 0,
1: -	IB_FLOW_ACTION_ESP = 1,
1: +  IB_FLOW_ACTION_UNSPECIFIED = 0,
1: +  IB_FLOW_ACTION_ESP = 1,
1:  };
1:  
1:  struct ib_flow_action {
1: -	struct ib_device *device;
1: -	struct ib_uobject *uobject;
1: -	enum ib_flow_action_type type;
1: -	atomic_t usecnt;
1: +  struct ib_device *device;
1: +  struct ib_uobject *uobject;
1: +  enum ib_flow_action_type type;
1: +  atomic_t usecnt;
1:  };
1:  
1:  struct ib_flow_spec_action_count {
1: -	enum ib_flow_spec_type type;
1: -	u16 size;
1: -	struct ib_counters *counters;
1: +  enum ib_flow_spec_type type;
1: +  u16 size;
1: +  struct ib_counters *counters;
1:  };
1:  
1:  struct ib_counters {
1: -	struct ib_device *device;
1: -	struct ib_uobject *uobject;
1: -	atomic_t usecnt;
1: +  struct ib_device *device;
1: +  struct ib_uobject *uobject;
1: +  atomic_t usecnt;
1:  };
1:  
1:  union ib_flow_spec {
1: -	struct {
1: -		u32 type;
1: -		u16 size;
1: -	};
1: -	struct ib_flow_spec_eth eth;
1: -	struct ib_flow_spec_ib ib;
1: -	struct ib_flow_spec_ipv4 ipv4;
1: -	struct ib_flow_spec_tcp_udp tcp_udp;
1: -	struct ib_flow_spec_ipv6 ipv6;
1: -	struct ib_flow_spec_tunnel tunnel;
1: -	struct ib_flow_spec_esp esp;
1: -	struct ib_flow_spec_gre gre;
1: -	struct ib_flow_spec_mpls mpls;
1: -	struct ib_flow_spec_action_tag flow_tag;
1: -	struct ib_flow_spec_action_drop drop;
1: -	struct ib_flow_spec_action_handle action;
1: -	struct ib_flow_spec_action_count flow_count;
1: +  struct {
1: +    u32 type;
1: +    u16 size;
1: +  };
1: +  struct ib_flow_spec_eth eth;
1: +  struct ib_flow_spec_ib ib;
1: +  struct ib_flow_spec_ipv4 ipv4;
1: +  struct ib_flow_spec_tcp_udp tcp_udp;
1: +  struct ib_flow_spec_ipv6 ipv6;
1: +  struct ib_flow_spec_tunnel tunnel;
1: +  struct ib_flow_spec_esp esp;
1: +  struct ib_flow_spec_gre gre;
1: +  struct ib_flow_spec_mpls mpls;
1: +  struct ib_flow_spec_action_tag flow_tag;
1: +  struct ib_flow_spec_action_drop drop;
1: +  struct ib_flow_spec_action_handle action;
1: +  struct ib_flow_spec_action_count flow_count;
1:  };
1:  
1:  struct ib_flow_attr {
1: -	enum ib_flow_attr_type type;
1: -	u16 size;
1: -	u16 priority;
1: -	u32 flags;
1: -	u8 num_of_specs;
1: -	u8 port;
1: -	union ib_flow_spec flows[0];
1: +  enum ib_flow_attr_type type;
1: +  u16 size;
1: +  u16 priority;
1: +  u32 flags;
1: +  u8 num_of_specs;
1: +  u8 port;
1: +  union ib_flow_spec flows[0];
1:  };
1:  
1:  struct ib_flow {
1: -	struct ib_qp *qp;
1: -	struct ib_device *device;
1: -	struct ib_uobject *uobject;
1: +  struct ib_qp *qp;
1: +  struct ib_device *device;
1: +  struct ib_uobject *uobject;
1:  };
1:  
1:  struct ib_flow_action_attrs_esp_keymats {
1: -	enum ib_uverbs_flow_action_esp_keymat protocol;
1: -	union {
1: -		struct ib_uverbs_flow_action_esp_keymat_aes_gcm aes_gcm;
1: -	} keymat;
1: +  enum ib_uverbs_flow_action_esp_keymat protocol;
1: +  union {
1: +    struct ib_uverbs_flow_action_esp_keymat_aes_gcm aes_gcm;
1: +  } keymat;
1:  };
1:  
1:  struct ib_flow_action_attrs_esp_replays {
1: -	enum ib_uverbs_flow_action_esp_replay protocol;
1: -	union {
1: -		struct ib_uverbs_flow_action_esp_replay_bmp bmp;
1: -	} replay;
1: +  enum ib_uverbs_flow_action_esp_replay protocol;
1: +  union {
1: +    struct ib_uverbs_flow_action_esp_replay_bmp bmp;
1: +  } replay;
1:  };
1:  
1:  struct ib_flow_spec_list {
1: -	struct ib_flow_spec_list *next;
1: -	union ib_flow_spec spec;
1: +  struct ib_flow_spec_list *next;
1: +  union ib_flow_spec spec;
1:  };
1:  
1:  struct ib_flow_action_attrs_esp {
1: -	struct ib_flow_action_attrs_esp_keymats *keymat;
1: -	struct ib_flow_action_attrs_esp_replays *replay;
1: -	struct ib_flow_spec_list *encap;
1: -	u32 esn;
1: -	u32 spi;
1: -	u32 seq;
1: -	u32 tfc_pad;
1: -	u64 flags;
1: -	u64 hard_limit_pkts;
1: +  struct ib_flow_action_attrs_esp_keymats *keymat;
1: +  struct ib_flow_action_attrs_esp_replays *replay;
1: +  struct ib_flow_spec_list *encap;
1: +  u32 esn;
1: +  u32 spi;
1: +  u32 seq;
1: +  u32 tfc_pad;
1: +  u64 flags;
1: +  u64 hard_limit_pkts;
1:  };
1:  
1:  struct ib_pkey_cache;
1: @@ -65734,58 +66728,59 @@ struct ib_pkey_cache;
1:  struct ib_gid_table;
1:  
1:  struct ib_port_cache {
1: -	u64 subnet_prefix;
1: -	struct ib_pkey_cache *pkey;
1: -	struct ib_gid_table *gid;
1: -	u8 lmc;
1: -	enum ib_port_state port_state;
1: +  u64 subnet_prefix;
1: +  struct ib_pkey_cache *pkey;
1: +  struct ib_gid_table *gid;
1: +  u8 lmc;
1: +  enum ib_port_state port_state;
1:  };
1:  
1:  struct ib_port_immutable {
1: -	int pkey_tbl_len;
1: -	int gid_tbl_len;
1: -	u32 core_cap_flags;
1: -	u32 max_mad_size;
1: +  int pkey_tbl_len;
1: +  int gid_tbl_len;
1: +  u32 core_cap_flags;
1: +  u32 max_mad_size;
1:  };
1:  
1:  struct ib_port_data {
1: -	struct ib_device *ib_dev;
1: -	struct ib_port_immutable immutable;
1: -	spinlock_t pkey_list_lock;
1: -	struct list_head pkey_list;
1: -	struct ib_port_cache cache;
1: -	spinlock_t netdev_lock;
1: -	struct net_device *netdev;
1: -	struct hlist_node ndev_hash_link;
1: -	struct rdma_port_counter port_counter;
1: -	struct rdma_hw_stats *hw_stats;
1: +  struct ib_device *ib_dev;
1: +  struct ib_port_immutable immutable;
1: +  spinlock_t pkey_list_lock;
1: +  struct list_head pkey_list;
1: +  struct ib_port_cache cache;
1: +  spinlock_t netdev_lock;
1: +  struct net_device *netdev;
1: +  struct hlist_node ndev_hash_link;
1: +  struct rdma_port_counter port_counter;
1: +  struct rdma_hw_stats *hw_stats;
1:  };
1:  
1:  struct rdma_netdev_alloc_params {
1: -	size_t sizeof_priv;
1: -	unsigned int txqs;
1: -	unsigned int rxqs;
1: -	void *param;
1: -	int (*initialize_rdma_netdev)(struct ib_device *, u8, struct net_device *, void *);
1: +  size_t sizeof_priv;
1: +  unsigned int txqs;
1: +  unsigned int rxqs;
1: +  void *param;
1: +  int (*initialize_rdma_netdev)(struct ib_device *, u8, struct net_device *,
1: +                                void *);
1:  };
1:  
1:  struct ib_counters_read_attr {
1: -	u64 *counters_buff;
1: -	u32 ncounters;
1: -	u32 flags;
1: +  u64 *counters_buff;
1: +  u32 ncounters;
1: +  u32 flags;
1:  };
1:  
1:  struct rdma_user_mmap_entry {
1: -	struct kref ref;
1: -	struct ib_ucontext *ucontext;
1: -	long unsigned int start_pgoff;
1: -	size_t npages;
1: -	bool driver_removed;
1: +  struct kref ref;
1: +  struct ib_ucontext *ucontext;
1: +  long unsigned int start_pgoff;
1: +  size_t npages;
1: +  bool driver_removed;
1:  };
1:  
1:  struct show_busy_params {
1: -	struct seq_file *m;
1: -	struct blk_mq_hw_ctx *hctx;
1: +  struct seq_file *m;
1: +  struct blk_mq_hw_ctx *hctx;
1:  };
1:  
1:  typedef void (*swap_func_t)(void *, void *, int);
1: @@ -65793,10 +66788,10 @@ typedef void (*swap_func_t)(void *, void *, int);
1:  typedef int (*cmp_r_func_t)(const void *, const void *, const void *);
1:  
1:  struct siprand_state {
1: -	long unsigned int v0;
1: -	long unsigned int v1;
1: -	long unsigned int v2;
1: -	long unsigned int v3;
1: +  long unsigned int v0;
1: +  long unsigned int v1;
1: +  long unsigned int v2;
1: +  long unsigned int v3;
1:  };
1:  
1:  typedef __kernel_long_t __kernel_ptrdiff_t;
1: @@ -65804,16 +66799,16 @@ typedef __kernel_long_t __kernel_ptrdiff_t;
1:  typedef __kernel_ptrdiff_t ptrdiff_t;
1:  
1:  struct region {
1: -	unsigned int start;
1: -	unsigned int off;
1: -	unsigned int group_len;
1: -	unsigned int end;
1: +  unsigned int start;
1: +  unsigned int off;
1: +  unsigned int group_len;
1: +  unsigned int end;
1:  };
1:  
1:  enum {
1: -	REG_OP_ISFREE = 0,
1: -	REG_OP_ALLOC = 1,
1: -	REG_OP_RELEASE = 2,
1: +  REG_OP_ISFREE = 0,
1: +  REG_OP_ALLOC = 1,
1: +  REG_OP_RELEASE = 2,
1:  };
1:  
1:  typedef struct scatterlist *sg_alloc_fn(unsigned int, gfp_t);
1: @@ -65821,239 +66816,240 @@ typedef struct scatterlist *sg_alloc_fn(unsigned int, gfp_t);
1:  typedef void sg_free_fn(struct scatterlist *, unsigned int);
1:  
1:  struct sg_page_iter {
1: -	struct scatterlist *sg;
1: -	unsigned int sg_pgoffset;
1: -	unsigned int __nents;
1: -	int __pg_advance;
1: +  struct scatterlist *sg;
1: +  unsigned int sg_pgoffset;
1: +  unsigned int __nents;
1: +  int __pg_advance;
1:  };
1:  
1:  struct sg_dma_page_iter {
1: -	struct sg_page_iter base;
1: +  struct sg_page_iter base;
1:  };
1:  
1:  struct sg_mapping_iter {
1: -	struct page *page;
1: -	void *addr;
1: -	size_t length;
1: -	size_t consumed;
1: -	struct sg_page_iter piter;
1: -	unsigned int __offset;
1: -	unsigned int __remaining;
1: -	unsigned int __flags;
1: +  struct page *page;
1: +  void *addr;
1: +  size_t length;
1: +  size_t consumed;
1: +  struct sg_page_iter piter;
1: +  unsigned int __offset;
1: +  unsigned int __remaining;
1: +  unsigned int __flags;
1:  };
1:  
1: -typedef int (*cmp_func)(void *, const struct list_head *, const struct list_head *);
1: +typedef int (*cmp_func)(void *, const struct list_head *,
1: +                        const struct list_head *);
1:  
1:  struct rhltable {
1: -	struct rhashtable ht;
1: +  struct rhashtable ht;
1:  };
1:  
1:  struct rhashtable_walker {
1: -	struct list_head list;
1: -	struct bucket_table *tbl;
1: +  struct list_head list;
1: +  struct bucket_table *tbl;
1:  };
1:  
1:  struct rhashtable_iter {
1: -	struct rhashtable *ht;
1: -	struct rhash_head *p;
1: -	struct rhlist_head *list;
1: -	struct rhashtable_walker walker;
1: -	unsigned int slot;
1: -	unsigned int skip;
1: -	bool end_of_table;
1: +  struct rhashtable *ht;
1: +  struct rhash_head *p;
1: +  struct rhlist_head *list;
1: +  struct rhashtable_walker walker;
1: +  unsigned int slot;
1: +  unsigned int skip;
1: +  bool end_of_table;
1:  };
1:  
1:  union nested_table {
1: -	union nested_table *table;
1: -	struct rhash_lock_head *bucket;
1: +  union nested_table *table;
1: +  struct rhash_lock_head *bucket;
1:  };
1:  
1:  struct once_work {
1: -	struct work_struct work;
1: -	struct static_key_true *key;
1: +  struct work_struct work;
1: +  struct static_key_true *key;
1:  };
1:  
1:  struct genradix_iter {
1: -	size_t offset;
1: -	size_t pos;
1: +  size_t offset;
1: +  size_t pos;
1:  };
1:  
1:  struct genradix_node {
1: -	union {
1: -		struct genradix_node *children[512];
1: -		u8 data[4096];
1: -	};
1: +  union {
1: +    struct genradix_node *children[512];
1: +    u8 data[4096];
1: +  };
1:  };
1:  
1:  struct reciprocal_value_adv {
1: -	u32 m;
1: -	u8 sh;
1: -	u8 exp;
1: -	bool is_wide_m;
1: +  u32 m;
1: +  u8 sh;
1: +  u8 exp;
1: +  bool is_wide_m;
1:  };
1:  
1:  struct arc4_ctx {
1: -	u32 S[256];
1: -	u32 x;
1: -	u32 y;
1: +  u32 S[256];
1: +  u32 x;
1: +  u32 y;
1:  };
1:  
1:  enum devm_ioremap_type {
1: -	DEVM_IOREMAP = 0,
1: -	DEVM_IOREMAP_UC = 1,
1: -	DEVM_IOREMAP_WC = 2,
1: +  DEVM_IOREMAP = 0,
1: +  DEVM_IOREMAP_UC = 1,
1: +  DEVM_IOREMAP_WC = 2,
1:  };
1:  
1:  struct pcim_iomap_devres {
1: -	void *table[6];
1: +  void *table[6];
1:  };
1:  
1:  enum assoc_array_walk_status {
1: -	assoc_array_walk_tree_empty = 0,
1: -	assoc_array_walk_found_terminal_node = 1,
1: -	assoc_array_walk_found_wrong_shortcut = 2,
1: +  assoc_array_walk_tree_empty = 0,
1: +  assoc_array_walk_found_terminal_node = 1,
1: +  assoc_array_walk_found_wrong_shortcut = 2,
1:  };
1:  
1:  struct assoc_array_walk_result {
1: -	struct {
1: -		struct assoc_array_node *node;
1: -		int level;
1: -		int slot;
1: -	} terminal_node;
1: -	struct {
1: -		struct assoc_array_shortcut *shortcut;
1: -		int level;
1: -		int sc_level;
1: -		long unsigned int sc_segments;
1: -		long unsigned int dissimilarity;
1: -	} wrong_shortcut;
1: +  struct {
1: +    struct assoc_array_node *node;
1: +    int level;
1: +    int slot;
1: +  } terminal_node;
1: +  struct {
1: +    struct assoc_array_shortcut *shortcut;
1: +    int level;
1: +    int sc_level;
1: +    long unsigned int sc_segments;
1: +    long unsigned int dissimilarity;
1: +  } wrong_shortcut;
1:  };
1:  
1:  struct assoc_array_delete_collapse_context {
1: -	struct assoc_array_node *node;
1: -	const void *skip_leaf;
1: -	int slot;
1: +  struct assoc_array_node *node;
1: +  const void *skip_leaf;
1: +  int slot;
1:  };
1:  
1:  struct xxh32_state {
1: -	uint32_t total_len_32;
1: -	uint32_t large_len;
1: -	uint32_t v1;
1: -	uint32_t v2;
1: -	uint32_t v3;
1: -	uint32_t v4;
1: -	uint32_t mem32[4];
1: -	uint32_t memsize;
1: +  uint32_t total_len_32;
1: +  uint32_t large_len;
1: +  uint32_t v1;
1: +  uint32_t v2;
1: +  uint32_t v3;
1: +  uint32_t v4;
1: +  uint32_t mem32[4];
1: +  uint32_t memsize;
1:  };
1:  
1:  struct gen_pool_chunk {
1: -	struct list_head next_chunk;
1: -	atomic_long_t avail;
1: -	phys_addr_t phys_addr;
1: -	void *owner;
1: -	long unsigned int start_addr;
1: -	long unsigned int end_addr;
1: -	long unsigned int bits[0];
1: +  struct list_head next_chunk;
1: +  atomic_long_t avail;
1: +  phys_addr_t phys_addr;
1: +  void *owner;
1: +  long unsigned int start_addr;
1: +  long unsigned int end_addr;
1: +  long unsigned int bits[0];
1:  };
1:  
1:  struct genpool_data_align {
1: -	int align;
1: +  int align;
1:  };
1:  
1:  struct genpool_data_fixed {
1: -	long unsigned int offset;
1: +  long unsigned int offset;
1:  };
1:  
1:  typedef z_stream *z_streamp;
1:  
1:  typedef struct {
1: -	unsigned char op;
1: -	unsigned char bits;
1: -	short unsigned int val;
1: +  unsigned char op;
1: +  unsigned char bits;
1: +  short unsigned int val;
1:  } code;
1:  
1:  typedef enum {
1: -	HEAD = 0,
1: -	FLAGS = 1,
1: -	TIME = 2,
1: -	OS = 3,
1: -	EXLEN = 4,
1: -	EXTRA = 5,
1: -	NAME = 6,
1: -	COMMENT = 7,
1: -	HCRC = 8,
1: -	DICTID = 9,
1: -	DICT = 10,
1: -	TYPE = 11,
1: -	TYPEDO = 12,
1: -	STORED = 13,
1: -	COPY = 14,
1: -	TABLE = 15,
1: -	LENLENS = 16,
1: -	CODELENS = 17,
1: -	LEN = 18,
1: -	LENEXT = 19,
1: -	DIST = 20,
1: -	DISTEXT = 21,
1: -	MATCH = 22,
1: -	LIT = 23,
1: -	CHECK = 24,
1: -	LENGTH = 25,
1: -	DONE = 26,
1: -	BAD = 27,
1: -	MEM = 28,
1: -	SYNC = 29,
1: +  HEAD = 0,
1: +  FLAGS = 1,
1: +  TIME = 2,
1: +  OS = 3,
1: +  EXLEN = 4,
1: +  EXTRA = 5,
1: +  NAME = 6,
1: +  COMMENT = 7,
1: +  HCRC = 8,
1: +  DICTID = 9,
1: +  DICT = 10,
1: +  TYPE = 11,
1: +  TYPEDO = 12,
1: +  STORED = 13,
1: +  COPY = 14,
1: +  TABLE = 15,
1: +  LENLENS = 16,
1: +  CODELENS = 17,
1: +  LEN = 18,
1: +  LENEXT = 19,
1: +  DIST = 20,
1: +  DISTEXT = 21,
1: +  MATCH = 22,
1: +  LIT = 23,
1: +  CHECK = 24,
1: +  LENGTH = 25,
1: +  DONE = 26,
1: +  BAD = 27,
1: +  MEM = 28,
1: +  SYNC = 29,
1:  } inflate_mode;
1:  
1:  struct inflate_state {
1: -	inflate_mode mode;
1: -	int last;
1: -	int wrap;
1: -	int havedict;
1: -	int flags;
1: -	unsigned int dmax;
1: -	long unsigned int check;
1: -	long unsigned int total;
1: -	unsigned int wbits;
1: -	unsigned int wsize;
1: -	unsigned int whave;
1: -	unsigned int write;
1: -	unsigned char *window;
1: -	long unsigned int hold;
1: -	unsigned int bits;
1: -	unsigned int length;
1: -	unsigned int offset;
1: -	unsigned int extra;
1: -	const code *lencode;
1: -	const code *distcode;
1: -	unsigned int lenbits;
1: -	unsigned int distbits;
1: -	unsigned int ncode;
1: -	unsigned int nlen;
1: -	unsigned int ndist;
1: -	unsigned int have;
1: -	code *next;
1: -	short unsigned int lens[320];
1: -	short unsigned int work[288];
1: -	code codes[2048];
1: +  inflate_mode mode;
1: +  int last;
1: +  int wrap;
1: +  int havedict;
1: +  int flags;
1: +  unsigned int dmax;
1: +  long unsigned int check;
1: +  long unsigned int total;
1: +  unsigned int wbits;
1: +  unsigned int wsize;
1: +  unsigned int whave;
1: +  unsigned int write;
1: +  unsigned char *window;
1: +  long unsigned int hold;
1: +  unsigned int bits;
1: +  unsigned int length;
1: +  unsigned int offset;
1: +  unsigned int extra;
1: +  const code *lencode;
1: +  const code *distcode;
1: +  unsigned int lenbits;
1: +  unsigned int distbits;
1: +  unsigned int ncode;
1: +  unsigned int nlen;
1: +  unsigned int ndist;
1: +  unsigned int have;
1: +  code *next;
1: +  short unsigned int lens[320];
1: +  short unsigned int work[288];
1: +  code codes[2048];
1:  };
1:  
1:  union uu {
1: -	short unsigned int us;
1: -	unsigned char b[2];
1: +  short unsigned int us;
1: +  unsigned char b[2];
1:  };
1:  
1:  typedef unsigned int uInt;
1:  
1:  struct inflate_workspace {
1: -	struct inflate_state inflate_state;
1: -	unsigned char working_window[32768];
1: +  struct inflate_state inflate_state;
1: +  unsigned char working_window[32768];
1:  };
1:  
1:  typedef enum {
1: -	CODES = 0,
1: -	LENS = 1,
1: -	DISTS = 2,
1: +  CODES = 0,
1: +  LENS = 1,
1: +  DISTS = 2,
1:  } codetype;
1:  
1:  typedef unsigned char uch;
1: @@ -66063,32 +67059,32 @@ typedef short unsigned int ush;
1:  typedef long unsigned int ulg;
1:  
1:  struct ct_data_s {
1: -	union {
1: -		ush freq;
1: -		ush code;
1: -	} fc;
1: -	union {
1: -		ush dad;
1: -		ush len;
1: -	} dl;
1: +  union {
1: +    ush freq;
1: +    ush code;
1: +  } fc;
1: +  union {
1: +    ush dad;
1: +    ush len;
1: +  } dl;
1:  };
1:  
1:  typedef struct ct_data_s ct_data;
1:  
1:  struct static_tree_desc_s {
1: -	const ct_data *static_tree;
1: -	const int *extra_bits;
1: -	int extra_base;
1: -	int elems;
1: -	int max_length;
1: +  const ct_data *static_tree;
1: +  const int *extra_bits;
1: +  int extra_base;
1: +  int elems;
1: +  int max_length;
1:  };
1:  
1:  typedef struct static_tree_desc_s static_tree_desc;
1:  
1:  struct tree_desc_s {
1: -	ct_data *dyn_tree;
1: -	int max_code;
1: -	static_tree_desc *stat_desc;
1: +  ct_data *dyn_tree;
1: +  int max_code;
1: +  static_tree_desc *stat_desc;
1:  };
1:  
1:  typedef ush Pos;
1: @@ -66096,93 +67092,93 @@ typedef ush Pos;
1:  typedef unsigned int IPos;
1:  
1:  struct deflate_state {
1: -	z_streamp strm;
1: -	int status;
1: -	Byte *pending_buf;
1: -	ulg pending_buf_size;
1: -	Byte *pending_out;
1: -	int pending;
1: -	int noheader;
1: -	Byte data_type;
1: -	Byte method;
1: -	int last_flush;
1: -	uInt w_size;
1: -	uInt w_bits;
1: -	uInt w_mask;
1: -	Byte *window;
1: -	ulg window_size;
1: -	Pos *prev;
1: -	Pos *head;
1: -	uInt ins_h;
1: -	uInt hash_size;
1: -	uInt hash_bits;
1: -	uInt hash_mask;
1: -	uInt hash_shift;
1: -	long int block_start;
1: -	uInt match_length;
1: -	IPos prev_match;
1: -	int match_available;
1: -	uInt strstart;
1: -	uInt match_start;
1: -	uInt lookahead;
1: -	uInt prev_length;
1: -	uInt max_chain_length;
1: -	uInt max_lazy_match;
1: -	int level;
1: -	int strategy;
1: -	uInt good_match;
1: -	int nice_match;
1: -	struct ct_data_s dyn_ltree[573];
1: -	struct ct_data_s dyn_dtree[61];
1: -	struct ct_data_s bl_tree[39];
1: -	struct tree_desc_s l_desc;
1: -	struct tree_desc_s d_desc;
1: -	struct tree_desc_s bl_desc;
1: -	ush bl_count[16];
1: -	int heap[573];
1: -	int heap_len;
1: -	int heap_max;
1: -	uch depth[573];
1: -	uch *l_buf;
1: -	uInt lit_bufsize;
1: -	uInt last_lit;
1: -	ush *d_buf;
1: -	ulg opt_len;
1: -	ulg static_len;
1: -	ulg compressed_len;
1: -	uInt matches;
1: -	int last_eob_len;
1: -	ush bi_buf;
1: -	int bi_valid;
1: +  z_streamp strm;
1: +  int status;
1: +  Byte *pending_buf;
1: +  ulg pending_buf_size;
1: +  Byte *pending_out;
1: +  int pending;
1: +  int noheader;
1: +  Byte data_type;
1: +  Byte method;
1: +  int last_flush;
1: +  uInt w_size;
1: +  uInt w_bits;
1: +  uInt w_mask;
1: +  Byte *window;
1: +  ulg window_size;
1: +  Pos *prev;
1: +  Pos *head;
1: +  uInt ins_h;
1: +  uInt hash_size;
1: +  uInt hash_bits;
1: +  uInt hash_mask;
1: +  uInt hash_shift;
1: +  long int block_start;
1: +  uInt match_length;
1: +  IPos prev_match;
1: +  int match_available;
1: +  uInt strstart;
1: +  uInt match_start;
1: +  uInt lookahead;
1: +  uInt prev_length;
1: +  uInt max_chain_length;
1: +  uInt max_lazy_match;
1: +  int level;
1: +  int strategy;
1: +  uInt good_match;
1: +  int nice_match;
1: +  struct ct_data_s dyn_ltree[573];
1: +  struct ct_data_s dyn_dtree[61];
1: +  struct ct_data_s bl_tree[39];
1: +  struct tree_desc_s l_desc;
1: +  struct tree_desc_s d_desc;
1: +  struct tree_desc_s bl_desc;
1: +  ush bl_count[16];
1: +  int heap[573];
1: +  int heap_len;
1: +  int heap_max;
1: +  uch depth[573];
1: +  uch *l_buf;
1: +  uInt lit_bufsize;
1: +  uInt last_lit;
1: +  ush *d_buf;
1: +  ulg opt_len;
1: +  ulg static_len;
1: +  ulg compressed_len;
1: +  uInt matches;
1: +  int last_eob_len;
1: +  ush bi_buf;
1: +  int bi_valid;
1:  };
1:  
1:  typedef struct deflate_state deflate_state;
1:  
1:  typedef enum {
1: -	need_more = 0,
1: -	block_done = 1,
1: -	finish_started = 2,
1: -	finish_done = 3,
1: +  need_more = 0,
1: +  block_done = 1,
1: +  finish_started = 2,
1: +  finish_done = 3,
1:  } block_state;
1:  
1:  typedef block_state (*compress_func)(deflate_state *, int);
1:  
1:  struct deflate_workspace {
1: -	deflate_state deflate_memory;
1: -	Byte *window_memory;
1: -	Pos *prev_memory;
1: -	Pos *head_memory;
1: -	char *overlay_memory;
1: +  deflate_state deflate_memory;
1: +  Byte *window_memory;
1: +  Pos *prev_memory;
1: +  Pos *head_memory;
1: +  char *overlay_memory;
1:  };
1:  
1:  typedef struct deflate_workspace deflate_workspace;
1:  
1:  struct config_s {
1: -	ush good_length;
1: -	ush max_lazy;
1: -	ush nice_length;
1: -	ush max_chain;
1: -	compress_func func;
1: +  ush good_length;
1: +  ush max_lazy;
1: +  ush nice_length;
1: +  ush max_chain;
1: +  compress_func func;
1:  };
1:  
1:  typedef struct config_s config;
1: @@ -66190,15 +67186,15 @@ typedef struct config_s config;
1:  typedef struct tree_desc_s tree_desc;
1:  
1:  typedef struct {
1: -	const uint8_t *externalDict;
1: -	size_t extDictSize;
1: -	const uint8_t *prefixEnd;
1: -	size_t prefixSize;
1: +  const uint8_t *externalDict;
1: +  size_t extDictSize;
1: +  const uint8_t *prefixEnd;
1: +  size_t prefixSize;
1:  } LZ4_streamDecode_t_internal;
1:  
1:  typedef union {
1: -	long long unsigned int table[4];
1: -	LZ4_streamDecode_t_internal internal_donotuse;
1: +  long long unsigned int table[4];
1: +  LZ4_streamDecode_t_internal internal_donotuse;
1:  } LZ4_streamDecode_t;
1:  
1:  typedef uint8_t BYTE;
1: @@ -66212,41 +67208,41 @@ typedef uint64_t U64;
1:  typedef uintptr_t uptrval;
1:  
1:  typedef enum {
1: -	noDict = 0,
1: -	withPrefix64k = 1,
1: -	usingExtDict = 2,
1: +  noDict = 0,
1: +  withPrefix64k = 1,
1: +  usingExtDict = 2,
1:  } dict_directive;
1:  
1:  typedef enum {
1: -	endOnOutputSize = 0,
1: -	endOnInputSize = 1,
1: +  endOnOutputSize = 0,
1: +  endOnInputSize = 1,
1:  } endCondition_directive;
1:  
1:  typedef enum {
1: -	decode_full_block = 0,
1: -	partial_decode = 1,
1: +  decode_full_block = 0,
1: +  partial_decode = 1,
1:  } earlyEnd_directive;
1:  
1:  typedef struct {
1: -	size_t bitContainer;
1: -	int bitPos;
1: -	char *startPtr;
1: -	char *ptr;
1: -	char *endPtr;
1: +  size_t bitContainer;
1: +  int bitPos;
1: +  char *startPtr;
1: +  char *ptr;
1: +  char *endPtr;
1:  } BIT_CStream_t;
1:  
1:  typedef unsigned int FSE_CTable;
1:  
1:  typedef struct {
1: -	ptrdiff_t value;
1: -	const void *stateTable;
1: -	const void *symbolTT;
1: -	unsigned int stateLog;
1: +  ptrdiff_t value;
1: +  const void *stateTable;
1: +  const void *symbolTT;
1: +  unsigned int stateLog;
1:  } FSE_CState_t;
1:  
1:  typedef struct {
1: -	int deltaFindState;
1: -	U32 deltaNbBits;
1: +  int deltaFindState;
1: +  U32 deltaNbBits;
1:  } FSE_symbolCompressionTransform;
1:  
1:  typedef s16 int16_t;
1: @@ -66254,60 +67250,60 @@ typedef s16 int16_t;
1:  typedef int16_t S16;
1:  
1:  struct HUF_CElt_s {
1: -	U16 val;
1: -	BYTE nbBits;
1: +  U16 val;
1: +  BYTE nbBits;
1:  };
1:  
1:  typedef struct HUF_CElt_s HUF_CElt;
1:  
1:  typedef enum {
1: -	HUF_repeat_none = 0,
1: -	HUF_repeat_check = 1,
1: -	HUF_repeat_valid = 2,
1: +  HUF_repeat_none = 0,
1: +  HUF_repeat_check = 1,
1: +  HUF_repeat_valid = 2,
1:  } HUF_repeat;
1:  
1:  struct nodeElt_s {
1: -	U32 count;
1: -	U16 parent;
1: -	BYTE byte;
1: -	BYTE nbBits;
1: +  U32 count;
1: +  U16 parent;
1: +  BYTE byte;
1: +  BYTE nbBits;
1:  };
1:  
1:  typedef struct nodeElt_s nodeElt;
1:  
1:  typedef struct {
1: -	U32 base;
1: -	U32 curr;
1: +  U32 base;
1: +  U32 curr;
1:  } rankPos;
1:  
1:  typedef enum {
1: -	ZSTDcs_created = 0,
1: -	ZSTDcs_init = 1,
1: -	ZSTDcs_ongoing = 2,
1: -	ZSTDcs_ending = 3,
1: +  ZSTDcs_created = 0,
1: +  ZSTDcs_init = 1,
1: +  ZSTDcs_ongoing = 2,
1: +  ZSTDcs_ending = 3,
1:  } ZSTD_compressionStage_e;
1:  
1: -typedef void * (*ZSTD_allocFunction)(void *, size_t);
1: +typedef void *(*ZSTD_allocFunction)(void *, size_t);
1:  
1:  typedef void (*ZSTD_freeFunction)(void *, void *);
1:  
1:  typedef struct {
1: -	ZSTD_allocFunction customAlloc;
1: -	ZSTD_freeFunction customFree;
1: -	void *opaque;
1: +  ZSTD_allocFunction customAlloc;
1: +  ZSTD_freeFunction customFree;
1: +  void *opaque;
1:  } ZSTD_customMem;
1:  
1:  typedef struct {
1: -	U32 price;
1: -	U32 off;
1: -	U32 mlen;
1: -	U32 litlen;
1: -	U32 rep[3];
1: +  U32 price;
1: +  U32 off;
1: +  U32 mlen;
1: +  U32 litlen;
1: +  U32 rep[3];
1:  } ZSTD_optimal_t;
1:  
1:  typedef struct {
1: -	U32 off;
1: -	U32 len;
1: +  U32 off;
1: +  U32 len;
1:  } ZSTD_match_t;
1:  
1:  struct seqDef_s;
1: @@ -66315,36 +67311,36 @@ struct seqDef_s;
1:  typedef struct seqDef_s seqDef;
1:  
1:  typedef struct {
1: -	seqDef *sequencesStart;
1: -	seqDef *sequences;
1: -	BYTE *litStart;
1: -	BYTE *lit;
1: -	BYTE *llCode;
1: -	BYTE *mlCode;
1: -	BYTE *ofCode;
1: -	U32 longLengthID;
1: -	U32 longLengthPos;
1: -	ZSTD_optimal_t *priceTable;
1: -	ZSTD_match_t *matchTable;
1: -	U32 *matchLengthFreq;
1: -	U32 *litLengthFreq;
1: -	U32 *litFreq;
1: -	U32 *offCodeFreq;
1: -	U32 matchLengthSum;
1: -	U32 matchSum;
1: -	U32 litLengthSum;
1: -	U32 litSum;
1: -	U32 offCodeSum;
1: -	U32 log2matchLengthSum;
1: -	U32 log2matchSum;
1: -	U32 log2litLengthSum;
1: -	U32 log2litSum;
1: -	U32 log2offCodeSum;
1: -	U32 factor;
1: -	U32 staticPrices;
1: -	U32 cachedPrice;
1: -	U32 cachedLitLength;
1: -	const BYTE *cachedLiterals;
1: +  seqDef *sequencesStart;
1: +  seqDef *sequences;
1: +  BYTE *litStart;
1: +  BYTE *lit;
1: +  BYTE *llCode;
1: +  BYTE *mlCode;
1: +  BYTE *ofCode;
1: +  U32 longLengthID;
1: +  U32 longLengthPos;
1: +  ZSTD_optimal_t *priceTable;
1: +  ZSTD_match_t *matchTable;
1: +  U32 *matchLengthFreq;
1: +  U32 *litLengthFreq;
1: +  U32 *litFreq;
1: +  U32 *offCodeFreq;
1: +  U32 matchLengthSum;
1: +  U32 matchSum;
1: +  U32 litLengthSum;
1: +  U32 litSum;
1: +  U32 offCodeSum;
1: +  U32 log2matchLengthSum;
1: +  U32 log2matchSum;
1: +  U32 log2litLengthSum;
1: +  U32 log2litSum;
1: +  U32 log2offCodeSum;
1: +  U32 factor;
1: +  U32 staticPrices;
1: +  U32 cachedPrice;
1: +  U32 cachedLitLength;
1: +  const BYTE *cachedLiterals;
1:  } seqStore_t;
1:  
1:  struct HUF_CElt_s___2;
1: @@ -66352,80 +67348,80 @@ struct HUF_CElt_s___2;
1:  typedef struct HUF_CElt_s___2 HUF_CElt___2;
1:  
1:  struct ZSTD_CCtx_s {
1: -	const BYTE *nextSrc;
1: -	const BYTE *base;
1: -	const BYTE *dictBase;
1: -	U32 dictLimit;
1: -	U32 lowLimit;
1: -	U32 nextToUpdate;
1: -	U32 nextToUpdate3;
1: -	U32 hashLog3;
1: -	U32 loadedDictEnd;
1: -	U32 forceWindow;
1: -	U32 forceRawDict;
1: -	ZSTD_compressionStage_e stage;
1: -	U32 rep[3];
1: -	U32 repToConfirm[3];
1: -	U32 dictID;
1: -	ZSTD_parameters params;
1: -	void *workSpace;
1: -	size_t workSpaceSize;
1: -	size_t blockSize;
1: -	U64 frameContentSize;
1: -	struct xxh64_state xxhState;
1: -	ZSTD_customMem customMem;
1: -	seqStore_t seqStore;
1: -	U32 *hashTable;
1: -	U32 *hashTable3;
1: -	U32 *chainTable;
1: -	HUF_CElt___2 *hufTable;
1: -	U32 flagStaticTables;
1: -	HUF_repeat flagStaticHufTable;
1: -	FSE_CTable offcodeCTable[187];
1: -	FSE_CTable matchlengthCTable[363];
1: -	FSE_CTable litlengthCTable[329];
1: -	unsigned int tmpCounters[1536];
1: +  const BYTE *nextSrc;
1: +  const BYTE *base;
1: +  const BYTE *dictBase;
1: +  U32 dictLimit;
1: +  U32 lowLimit;
1: +  U32 nextToUpdate;
1: +  U32 nextToUpdate3;
1: +  U32 hashLog3;
1: +  U32 loadedDictEnd;
1: +  U32 forceWindow;
1: +  U32 forceRawDict;
1: +  ZSTD_compressionStage_e stage;
1: +  U32 rep[3];
1: +  U32 repToConfirm[3];
1: +  U32 dictID;
1: +  ZSTD_parameters params;
1: +  void *workSpace;
1: +  size_t workSpaceSize;
1: +  size_t blockSize;
1: +  U64 frameContentSize;
1: +  struct xxh64_state xxhState;
1: +  ZSTD_customMem customMem;
1: +  seqStore_t seqStore;
1: +  U32 *hashTable;
1: +  U32 *hashTable3;
1: +  U32 *chainTable;
1: +  HUF_CElt___2 *hufTable;
1: +  U32 flagStaticTables;
1: +  HUF_repeat flagStaticHufTable;
1: +  FSE_CTable offcodeCTable[187];
1: +  FSE_CTable matchlengthCTable[363];
1: +  FSE_CTable litlengthCTable[329];
1: +  unsigned int tmpCounters[1536];
1:  };
1:  
1:  typedef struct ZSTD_CCtx_s ZSTD_CCtx;
1:  
1:  struct ZSTD_CDict_s {
1: -	void *dictBuffer;
1: -	const void *dictContent;
1: -	size_t dictContentSize;
1: -	ZSTD_CCtx *refContext;
1: +  void *dictBuffer;
1: +  const void *dictContent;
1: +  size_t dictContentSize;
1: +  ZSTD_CCtx *refContext;
1:  };
1:  
1:  typedef struct ZSTD_CDict_s ZSTD_CDict;
1:  
1:  typedef enum {
1: -	zcss_init = 0,
1: -	zcss_load = 1,
1: -	zcss_flush = 2,
1: -	zcss_final = 3,
1: +  zcss_init = 0,
1: +  zcss_load = 1,
1: +  zcss_flush = 2,
1: +  zcss_final = 3,
1:  } ZSTD_cStreamStage;
1:  
1:  struct ZSTD_CStream_s___2 {
1: -	ZSTD_CCtx *cctx;
1: -	ZSTD_CDict *cdictLocal;
1: -	const ZSTD_CDict *cdict;
1: -	char *inBuff;
1: -	size_t inBuffSize;
1: -	size_t inToCompress;
1: -	size_t inBuffPos;
1: -	size_t inBuffTarget;
1: -	size_t blockSize;
1: -	char *outBuff;
1: -	size_t outBuffSize;
1: -	size_t outBuffContentSize;
1: -	size_t outBuffFlushedSize;
1: -	ZSTD_cStreamStage stage;
1: -	U32 checksum;
1: -	U32 frameEnded;
1: -	U64 pledgedSrcSize;
1: -	U64 inputProcessed;
1: -	ZSTD_parameters params;
1: -	ZSTD_customMem customMem;
1: +  ZSTD_CCtx *cctx;
1: +  ZSTD_CDict *cdictLocal;
1: +  const ZSTD_CDict *cdict;
1: +  char *inBuff;
1: +  size_t inBuffSize;
1: +  size_t inToCompress;
1: +  size_t inBuffPos;
1: +  size_t inBuffTarget;
1: +  size_t blockSize;
1: +  char *outBuff;
1: +  size_t outBuffSize;
1: +  size_t outBuffContentSize;
1: +  size_t outBuffFlushedSize;
1: +  ZSTD_cStreamStage stage;
1: +  U32 checksum;
1: +  U32 frameEnded;
1: +  U64 pledgedSrcSize;
1: +  U64 inputProcessed;
1: +  ZSTD_parameters params;
1: +  ZSTD_customMem customMem;
1:  };
1:  
1:  typedef struct ZSTD_CStream_s___2 ZSTD_CStream___2;
1: @@ -66433,292 +67429,293 @@ typedef struct ZSTD_CStream_s___2 ZSTD_CStream___2;
1:  typedef int32_t S32;
1:  
1:  typedef enum {
1: -	set_basic = 0,
1: -	set_rle = 1,
1: -	set_compressed = 2,
1: -	set_repeat = 3,
1: +  set_basic = 0,
1: +  set_rle = 1,
1: +  set_compressed = 2,
1: +  set_repeat = 3,
1:  } symbolEncodingType_e;
1:  
1:  struct seqDef_s {
1: -	U32 offset;
1: -	U16 litLength;
1: -	U16 matchLength;
1: +  U32 offset;
1: +  U16 litLength;
1: +  U16 matchLength;
1:  };
1:  
1:  typedef enum {
1: -	ZSTDcrp_continue = 0,
1: -	ZSTDcrp_noMemset = 1,
1: -	ZSTDcrp_fullReset = 2,
1: +  ZSTDcrp_continue = 0,
1: +  ZSTDcrp_noMemset = 1,
1: +  ZSTDcrp_fullReset = 2,
1:  } ZSTD_compResetPolicy_e;
1:  
1:  typedef void (*ZSTD_blockCompressor)(ZSTD_CCtx *, const void *, size_t);
1:  
1:  typedef enum {
1: -	zsf_gather = 0,
1: -	zsf_flush = 1,
1: -	zsf_end = 2,
1: +  zsf_gather = 0,
1: +  zsf_flush = 1,
1: +  zsf_end = 2,
1:  } ZSTD_flush_e;
1:  
1: -typedef size_t (*searchMax_f)(ZSTD_CCtx *, const BYTE *, const BYTE *, size_t *, U32, U32);
1: +typedef size_t (*searchMax_f)(ZSTD_CCtx *, const BYTE *, const BYTE *, size_t *,
1: +                              U32, U32);
1:  
1:  typedef struct {
1: -	size_t bitContainer;
1: -	unsigned int bitsConsumed;
1: -	const char *ptr;
1: -	const char *start;
1: +  size_t bitContainer;
1: +  unsigned int bitsConsumed;
1: +  const char *ptr;
1: +  const char *start;
1:  } BIT_DStream_t;
1:  
1:  typedef enum {
1: -	BIT_DStream_unfinished = 0,
1: -	BIT_DStream_endOfBuffer = 1,
1: -	BIT_DStream_completed = 2,
1: -	BIT_DStream_overflow = 3,
1: +  BIT_DStream_unfinished = 0,
1: +  BIT_DStream_endOfBuffer = 1,
1: +  BIT_DStream_completed = 2,
1: +  BIT_DStream_overflow = 3,
1:  } BIT_DStream_status;
1:  
1:  typedef unsigned int FSE_DTable;
1:  
1:  typedef struct {
1: -	size_t state;
1: -	const void *table;
1: +  size_t state;
1: +  const void *table;
1:  } FSE_DState_t;
1:  
1:  typedef struct {
1: -	U16 tableLog;
1: -	U16 fastMode;
1: +  U16 tableLog;
1: +  U16 fastMode;
1:  } FSE_DTableHeader;
1:  
1:  typedef struct {
1: -	short unsigned int newState;
1: -	unsigned char symbol;
1: -	unsigned char nbBits;
1: +  short unsigned int newState;
1: +  unsigned char symbol;
1: +  unsigned char nbBits;
1:  } FSE_decode_t;
1:  
1:  typedef struct {
1: -	void *ptr;
1: -	const void *end;
1: +  void *ptr;
1: +  const void *end;
1:  } ZSTD_stack;
1:  
1:  typedef U32 HUF_DTable;
1:  
1:  typedef struct {
1: -	BYTE maxTableLog;
1: -	BYTE tableType;
1: -	BYTE tableLog;
1: -	BYTE reserved;
1: +  BYTE maxTableLog;
1: +  BYTE tableType;
1: +  BYTE tableLog;
1: +  BYTE reserved;
1:  } DTableDesc;
1:  
1:  typedef struct {
1: -	BYTE byte;
1: -	BYTE nbBits;
1: +  BYTE byte;
1: +  BYTE nbBits;
1:  } HUF_DEltX2;
1:  
1:  typedef struct {
1: -	U16 sequence;
1: -	BYTE nbBits;
1: -	BYTE length;
1: +  U16 sequence;
1: +  BYTE nbBits;
1: +  BYTE length;
1:  } HUF_DEltX4;
1:  
1:  typedef struct {
1: -	BYTE symbol;
1: -	BYTE weight;
1: +  BYTE symbol;
1: +  BYTE weight;
1:  } sortedSymbol_t;
1:  
1:  typedef U32 rankValCol_t[13];
1:  
1:  typedef struct {
1: -	U32 tableTime;
1: -	U32 decode256Time;
1: +  U32 tableTime;
1: +  U32 decode256Time;
1:  } algo_time_t;
1:  
1:  typedef struct {
1: -	FSE_DTable LLTable[513];
1: -	FSE_DTable OFTable[257];
1: -	FSE_DTable MLTable[513];
1: -	HUF_DTable hufTable[4097];
1: -	U64 workspace[384];
1: -	U32 rep[3];
1: +  FSE_DTable LLTable[513];
1: +  FSE_DTable OFTable[257];
1: +  FSE_DTable MLTable[513];
1: +  HUF_DTable hufTable[4097];
1: +  U64 workspace[384];
1: +  U32 rep[3];
1:  } ZSTD_entropyTables_t;
1:  
1:  typedef struct {
1: -	long long unsigned int frameContentSize;
1: -	unsigned int windowSize;
1: -	unsigned int dictID;
1: -	unsigned int checksumFlag;
1: +  long long unsigned int frameContentSize;
1: +  unsigned int windowSize;
1: +  unsigned int dictID;
1: +  unsigned int checksumFlag;
1:  } ZSTD_frameParams;
1:  
1:  typedef enum {
1: -	bt_raw = 0,
1: -	bt_rle = 1,
1: -	bt_compressed = 2,
1: -	bt_reserved = 3,
1: +  bt_raw = 0,
1: +  bt_rle = 1,
1: +  bt_compressed = 2,
1: +  bt_reserved = 3,
1:  } blockType_e;
1:  
1:  typedef enum {
1: -	ZSTDds_getFrameHeaderSize = 0,
1: -	ZSTDds_decodeFrameHeader = 1,
1: -	ZSTDds_decodeBlockHeader = 2,
1: -	ZSTDds_decompressBlock = 3,
1: -	ZSTDds_decompressLastBlock = 4,
1: -	ZSTDds_checkChecksum = 5,
1: -	ZSTDds_decodeSkippableHeader = 6,
1: -	ZSTDds_skipFrame = 7,
1: +  ZSTDds_getFrameHeaderSize = 0,
1: +  ZSTDds_decodeFrameHeader = 1,
1: +  ZSTDds_decodeBlockHeader = 2,
1: +  ZSTDds_decompressBlock = 3,
1: +  ZSTDds_decompressLastBlock = 4,
1: +  ZSTDds_checkChecksum = 5,
1: +  ZSTDds_decodeSkippableHeader = 6,
1: +  ZSTDds_skipFrame = 7,
1:  } ZSTD_dStage;
1:  
1:  struct ZSTD_DCtx_s {
1: -	const FSE_DTable *LLTptr;
1: -	const FSE_DTable *MLTptr;
1: -	const FSE_DTable *OFTptr;
1: -	const HUF_DTable *HUFptr;
1: -	ZSTD_entropyTables_t entropy;
1: -	const void *previousDstEnd;
1: -	const void *base;
1: -	const void *vBase;
1: -	const void *dictEnd;
1: -	size_t expected;
1: -	ZSTD_frameParams fParams;
1: -	blockType_e bType;
1: -	ZSTD_dStage stage;
1: -	U32 litEntropy;
1: -	U32 fseEntropy;
1: -	struct xxh64_state xxhState;
1: -	size_t headerSize;
1: -	U32 dictID;
1: -	const BYTE *litPtr;
1: -	ZSTD_customMem customMem;
1: -	size_t litSize;
1: -	size_t rleSize;
1: -	BYTE litBuffer[131080];
1: -	BYTE headerBuffer[18];
1: +  const FSE_DTable *LLTptr;
1: +  const FSE_DTable *MLTptr;
1: +  const FSE_DTable *OFTptr;
1: +  const HUF_DTable *HUFptr;
1: +  ZSTD_entropyTables_t entropy;
1: +  const void *previousDstEnd;
1: +  const void *base;
1: +  const void *vBase;
1: +  const void *dictEnd;
1: +  size_t expected;
1: +  ZSTD_frameParams fParams;
1: +  blockType_e bType;
1: +  ZSTD_dStage stage;
1: +  U32 litEntropy;
1: +  U32 fseEntropy;
1: +  struct xxh64_state xxhState;
1: +  size_t headerSize;
1: +  U32 dictID;
1: +  const BYTE *litPtr;
1: +  ZSTD_customMem customMem;
1: +  size_t litSize;
1: +  size_t rleSize;
1: +  BYTE litBuffer[131080];
1: +  BYTE headerBuffer[18];
1:  };
1:  
1:  typedef struct ZSTD_DCtx_s ZSTD_DCtx;
1:  
1:  struct ZSTD_DDict_s {
1: -	void *dictBuffer;
1: -	const void *dictContent;
1: -	size_t dictSize;
1: -	ZSTD_entropyTables_t entropy;
1: -	U32 dictID;
1: -	U32 entropyPresent;
1: -	ZSTD_customMem cMem;
1: +  void *dictBuffer;
1: +  const void *dictContent;
1: +  size_t dictSize;
1: +  ZSTD_entropyTables_t entropy;
1: +  U32 dictID;
1: +  U32 entropyPresent;
1: +  ZSTD_customMem cMem;
1:  };
1:  
1:  typedef struct ZSTD_DDict_s ZSTD_DDict;
1:  
1:  typedef enum {
1: -	zdss_init = 0,
1: -	zdss_loadHeader = 1,
1: -	zdss_read = 2,
1: -	zdss_load = 3,
1: -	zdss_flush = 4,
1: +  zdss_init = 0,
1: +  zdss_loadHeader = 1,
1: +  zdss_read = 2,
1: +  zdss_load = 3,
1: +  zdss_flush = 4,
1:  } ZSTD_dStreamStage;
1:  
1:  struct ZSTD_DStream_s___2 {
1: -	ZSTD_DCtx *dctx;
1: -	ZSTD_DDict *ddictLocal;
1: -	const ZSTD_DDict *ddict;
1: -	ZSTD_frameParams fParams;
1: -	ZSTD_dStreamStage stage;
1: -	char *inBuff;
1: -	size_t inBuffSize;
1: -	size_t inPos;
1: -	size_t maxWindowSize;
1: -	char *outBuff;
1: -	size_t outBuffSize;
1: -	size_t outStart;
1: -	size_t outEnd;
1: -	size_t blockSize;
1: -	BYTE headerBuffer[18];
1: -	size_t lhSize;
1: -	ZSTD_customMem customMem;
1: -	void *legacyContext;
1: -	U32 previousLegacyVersion;
1: -	U32 legacyVersion;
1: -	U32 hostageByte;
1: +  ZSTD_DCtx *dctx;
1: +  ZSTD_DDict *ddictLocal;
1: +  const ZSTD_DDict *ddict;
1: +  ZSTD_frameParams fParams;
1: +  ZSTD_dStreamStage stage;
1: +  char *inBuff;
1: +  size_t inBuffSize;
1: +  size_t inPos;
1: +  size_t maxWindowSize;
1: +  char *outBuff;
1: +  size_t outBuffSize;
1: +  size_t outStart;
1: +  size_t outEnd;
1: +  size_t blockSize;
1: +  BYTE headerBuffer[18];
1: +  size_t lhSize;
1: +  ZSTD_customMem customMem;
1: +  void *legacyContext;
1: +  U32 previousLegacyVersion;
1: +  U32 legacyVersion;
1: +  U32 hostageByte;
1:  };
1:  
1:  typedef struct ZSTD_DStream_s___2 ZSTD_DStream___2;
1:  
1:  typedef enum {
1: -	ZSTDnit_frameHeader = 0,
1: -	ZSTDnit_blockHeader = 1,
1: -	ZSTDnit_block = 2,
1: -	ZSTDnit_lastBlock = 3,
1: -	ZSTDnit_checksum = 4,
1: -	ZSTDnit_skippableFrame = 5,
1: +  ZSTDnit_frameHeader = 0,
1: +  ZSTDnit_blockHeader = 1,
1: +  ZSTDnit_block = 2,
1: +  ZSTDnit_lastBlock = 3,
1: +  ZSTDnit_checksum = 4,
1: +  ZSTDnit_skippableFrame = 5,
1:  } ZSTD_nextInputType_e;
1:  
1:  typedef uintptr_t uPtrDiff;
1:  
1:  typedef struct {
1: -	blockType_e blockType;
1: -	U32 lastBlock;
1: -	U32 origSize;
1: +  blockType_e blockType;
1: +  U32 lastBlock;
1: +  U32 origSize;
1:  } blockProperties_t;
1:  
1:  typedef union {
1: -	FSE_decode_t realData;
1: -	U32 alignedBy4;
1: +  FSE_decode_t realData;
1: +  U32 alignedBy4;
1:  } FSE_decode_t4;
1:  
1:  typedef struct {
1: -	size_t litLength;
1: -	size_t matchLength;
1: -	size_t offset;
1: -	const BYTE *match;
1: +  size_t litLength;
1: +  size_t matchLength;
1: +  size_t offset;
1: +  const BYTE *match;
1:  } seq_t;
1:  
1:  typedef struct {
1: -	BIT_DStream_t DStream;
1: -	FSE_DState_t stateLL;
1: -	FSE_DState_t stateOffb;
1: -	FSE_DState_t stateML;
1: -	size_t prevOffset[3];
1: -	const BYTE *base;
1: -	size_t pos;
1: -	uPtrDiff gotoDict;
1: +  BIT_DStream_t DStream;
1: +  FSE_DState_t stateLL;
1: +  FSE_DState_t stateOffb;
1: +  FSE_DState_t stateML;
1: +  size_t prevOffset[3];
1: +  const BYTE *base;
1: +  size_t pos;
1: +  uPtrDiff gotoDict;
1:  } seqState_t;
1:  
1:  enum xz_mode {
1: -	XZ_SINGLE = 0,
1: -	XZ_PREALLOC = 1,
1: -	XZ_DYNALLOC = 2,
1: +  XZ_SINGLE = 0,
1: +  XZ_PREALLOC = 1,
1: +  XZ_DYNALLOC = 2,
1:  };
1:  
1:  enum xz_ret {
1: -	XZ_OK = 0,
1: -	XZ_STREAM_END = 1,
1: -	XZ_UNSUPPORTED_CHECK = 2,
1: -	XZ_MEM_ERROR = 3,
1: -	XZ_MEMLIMIT_ERROR = 4,
1: -	XZ_FORMAT_ERROR = 5,
1: -	XZ_OPTIONS_ERROR = 6,
1: -	XZ_DATA_ERROR = 7,
1: -	XZ_BUF_ERROR = 8,
1: +  XZ_OK = 0,
1: +  XZ_STREAM_END = 1,
1: +  XZ_UNSUPPORTED_CHECK = 2,
1: +  XZ_MEM_ERROR = 3,
1: +  XZ_MEMLIMIT_ERROR = 4,
1: +  XZ_FORMAT_ERROR = 5,
1: +  XZ_OPTIONS_ERROR = 6,
1: +  XZ_DATA_ERROR = 7,
1: +  XZ_BUF_ERROR = 8,
1:  };
1:  
1:  struct xz_buf {
1: -	const uint8_t *in;
1: -	size_t in_pos;
1: -	size_t in_size;
1: -	uint8_t *out;
1: -	size_t out_pos;
1: -	size_t out_size;
1: +  const uint8_t *in;
1: +  size_t in_pos;
1: +  size_t in_size;
1: +  uint8_t *out;
1: +  size_t out_pos;
1: +  size_t out_size;
1:  };
1:  
1:  typedef uint64_t vli_type;
1:  
1:  enum xz_check {
1: -	XZ_CHECK_NONE = 0,
1: -	XZ_CHECK_CRC32 = 1,
1: -	XZ_CHECK_CRC64 = 4,
1: -	XZ_CHECK_SHA256 = 10,
1: +  XZ_CHECK_NONE = 0,
1: +  XZ_CHECK_CRC32 = 1,
1: +  XZ_CHECK_CRC64 = 4,
1: +  XZ_CHECK_SHA256 = 10,
1:  };
1:  
1:  struct xz_dec_hash {
1: -	vli_type unpadded;
1: -	vli_type uncompressed;
1: -	uint32_t crc32;
1: +  vli_type unpadded;
1: +  vli_type uncompressed;
1: +  uint32_t crc32;
1:  };
1:  
1:  struct xz_dec_lzma2;
1: @@ -66726,281 +67723,282 @@ struct xz_dec_lzma2;
1:  struct xz_dec_bcj;
1:  
1:  struct xz_dec {
1: -	enum {
1: -		SEQ_STREAM_HEADER = 0,
1: -		SEQ_BLOCK_START = 1,
1: -		SEQ_BLOCK_HEADER = 2,
1: -		SEQ_BLOCK_UNCOMPRESS = 3,
1: -		SEQ_BLOCK_PADDING = 4,
1: -		SEQ_BLOCK_CHECK = 5,
1: -		SEQ_INDEX = 6,
1: -		SEQ_INDEX_PADDING = 7,
1: -		SEQ_INDEX_CRC32 = 8,
1: -		SEQ_STREAM_FOOTER = 9,
1: -	} sequence;
1: -	uint32_t pos;
1: -	vli_type vli;
1: -	size_t in_start;
1: -	size_t out_start;
1: -	uint32_t crc32;
1: -	enum xz_check check_type;
1: -	enum xz_mode mode;
1: -	bool allow_buf_error;
1: -	struct {
1: -		vli_type compressed;
1: -		vli_type uncompressed;
1: -		uint32_t size;
1: -	} block_header;
1: -	struct {
1: -		vli_type compressed;
1: -		vli_type uncompressed;
1: -		vli_type count;
1: -		struct xz_dec_hash hash;
1: -	} block;
1: -	struct {
1: -		enum {
1: -			SEQ_INDEX_COUNT = 0,
1: -			SEQ_INDEX_UNPADDED = 1,
1: -			SEQ_INDEX_UNCOMPRESSED = 2,
1: -		} sequence;
1: -		vli_type size;
1: -		vli_type count;
1: -		struct xz_dec_hash hash;
1: -	} index;
1: -	struct {
1: -		size_t pos;
1: -		size_t size;
1: -		uint8_t buf[1024];
1: -	} temp;
1: -	struct xz_dec_lzma2 *lzma2;
1: -	struct xz_dec_bcj *bcj;
1: -	bool bcj_active;
1: +  enum {
1: +    SEQ_STREAM_HEADER = 0,
1: +    SEQ_BLOCK_START = 1,
1: +    SEQ_BLOCK_HEADER = 2,
1: +    SEQ_BLOCK_UNCOMPRESS = 3,
1: +    SEQ_BLOCK_PADDING = 4,
1: +    SEQ_BLOCK_CHECK = 5,
1: +    SEQ_INDEX = 6,
1: +    SEQ_INDEX_PADDING = 7,
1: +    SEQ_INDEX_CRC32 = 8,
1: +    SEQ_STREAM_FOOTER = 9,
1: +  } sequence;
1: +  uint32_t pos;
1: +  vli_type vli;
1: +  size_t in_start;
1: +  size_t out_start;
1: +  uint32_t crc32;
1: +  enum xz_check check_type;
1: +  enum xz_mode mode;
1: +  bool allow_buf_error;
1: +  struct {
1: +    vli_type compressed;
1: +    vli_type uncompressed;
1: +    uint32_t size;
1: +  } block_header;
1: +  struct {
1: +    vli_type compressed;
1: +    vli_type uncompressed;
1: +    vli_type count;
1: +    struct xz_dec_hash hash;
1: +  } block;
1: +  struct {
1: +    enum {
1: +      SEQ_INDEX_COUNT = 0,
1: +      SEQ_INDEX_UNPADDED = 1,
1: +      SEQ_INDEX_UNCOMPRESSED = 2,
1: +    } sequence;
1: +    vli_type size;
1: +    vli_type count;
1: +    struct xz_dec_hash hash;
1: +  } index;
1: +  struct {
1: +    size_t pos;
1: +    size_t size;
1: +    uint8_t buf[1024];
1: +  } temp;
1: +  struct xz_dec_lzma2 *lzma2;
1: +  struct xz_dec_bcj *bcj;
1: +  bool bcj_active;
1:  };
1:  
1:  enum lzma_state {
1: -	STATE_LIT_LIT = 0,
1: -	STATE_MATCH_LIT_LIT = 1,
1: -	STATE_REP_LIT_LIT = 2,
1: -	STATE_SHORTREP_LIT_LIT = 3,
1: -	STATE_MATCH_LIT = 4,
1: -	STATE_REP_LIT = 5,
1: -	STATE_SHORTREP_LIT = 6,
1: -	STATE_LIT_MATCH = 7,
1: -	STATE_LIT_LONGREP = 8,
1: -	STATE_LIT_SHORTREP = 9,
1: -	STATE_NONLIT_MATCH = 10,
1: -	STATE_NONLIT_REP = 11,
1: +  STATE_LIT_LIT = 0,
1: +  STATE_MATCH_LIT_LIT = 1,
1: +  STATE_REP_LIT_LIT = 2,
1: +  STATE_SHORTREP_LIT_LIT = 3,
1: +  STATE_MATCH_LIT = 4,
1: +  STATE_REP_LIT = 5,
1: +  STATE_SHORTREP_LIT = 6,
1: +  STATE_LIT_MATCH = 7,
1: +  STATE_LIT_LONGREP = 8,
1: +  STATE_LIT_SHORTREP = 9,
1: +  STATE_NONLIT_MATCH = 10,
1: +  STATE_NONLIT_REP = 11,
1:  };
1:  
1:  struct dictionary {
1: -	uint8_t *buf;
1: -	size_t start;
1: -	size_t pos;
1: -	size_t full;
1: -	size_t limit;
1: -	size_t end;
1: -	uint32_t size;
1: -	uint32_t size_max;
1: -	uint32_t allocated;
1: -	enum xz_mode mode;
1: +  uint8_t *buf;
1: +  size_t start;
1: +  size_t pos;
1: +  size_t full;
1: +  size_t limit;
1: +  size_t end;
1: +  uint32_t size;
1: +  uint32_t size_max;
1: +  uint32_t allocated;
1: +  enum xz_mode mode;
1:  };
1:  
1:  struct rc_dec {
1: -	uint32_t range;
1: -	uint32_t code;
1: -	uint32_t init_bytes_left;
1: -	const uint8_t *in;
1: -	size_t in_pos;
1: -	size_t in_limit;
1: +  uint32_t range;
1: +  uint32_t code;
1: +  uint32_t init_bytes_left;
1: +  const uint8_t *in;
1: +  size_t in_pos;
1: +  size_t in_limit;
1:  };
1:  
1:  struct lzma_len_dec {
1: -	uint16_t choice;
1: -	uint16_t choice2;
1: -	uint16_t low[128];
1: -	uint16_t mid[128];
1: -	uint16_t high[256];
1: +  uint16_t choice;
1: +  uint16_t choice2;
1: +  uint16_t low[128];
1: +  uint16_t mid[128];
1: +  uint16_t high[256];
1:  };
1:  
1:  struct lzma_dec {
1: -	uint32_t rep0;
1: -	uint32_t rep1;
1: -	uint32_t rep2;
1: -	uint32_t rep3;
1: -	enum lzma_state state;
1: -	uint32_t len;
1: -	uint32_t lc;
1: -	uint32_t literal_pos_mask;
1: -	uint32_t pos_mask;
1: -	uint16_t is_match[192];
1: -	uint16_t is_rep[12];
1: -	uint16_t is_rep0[12];
1: -	uint16_t is_rep1[12];
1: -	uint16_t is_rep2[12];
1: -	uint16_t is_rep0_long[192];
1: -	uint16_t dist_slot[256];
1: -	uint16_t dist_special[114];
1: -	uint16_t dist_align[16];
1: -	struct lzma_len_dec match_len_dec;
1: -	struct lzma_len_dec rep_len_dec;
1: -	uint16_t literal[12288];
1: +  uint32_t rep0;
1: +  uint32_t rep1;
1: +  uint32_t rep2;
1: +  uint32_t rep3;
1: +  enum lzma_state state;
1: +  uint32_t len;
1: +  uint32_t lc;
1: +  uint32_t literal_pos_mask;
1: +  uint32_t pos_mask;
1: +  uint16_t is_match[192];
1: +  uint16_t is_rep[12];
1: +  uint16_t is_rep0[12];
1: +  uint16_t is_rep1[12];
1: +  uint16_t is_rep2[12];
1: +  uint16_t is_rep0_long[192];
1: +  uint16_t dist_slot[256];
1: +  uint16_t dist_special[114];
1: +  uint16_t dist_align[16];
1: +  struct lzma_len_dec match_len_dec;
1: +  struct lzma_len_dec rep_len_dec;
1: +  uint16_t literal[12288];
1:  };
1:  
1:  enum lzma2_seq {
1: -	SEQ_CONTROL = 0,
1: -	SEQ_UNCOMPRESSED_1 = 1,
1: -	SEQ_UNCOMPRESSED_2 = 2,
1: -	SEQ_COMPRESSED_0 = 3,
1: -	SEQ_COMPRESSED_1 = 4,
1: -	SEQ_PROPERTIES = 5,
1: -	SEQ_LZMA_PREPARE = 6,
1: -	SEQ_LZMA_RUN = 7,
1: -	SEQ_COPY = 8,
1: +  SEQ_CONTROL = 0,
1: +  SEQ_UNCOMPRESSED_1 = 1,
1: +  SEQ_UNCOMPRESSED_2 = 2,
1: +  SEQ_COMPRESSED_0 = 3,
1: +  SEQ_COMPRESSED_1 = 4,
1: +  SEQ_PROPERTIES = 5,
1: +  SEQ_LZMA_PREPARE = 6,
1: +  SEQ_LZMA_RUN = 7,
1: +  SEQ_COPY = 8,
1:  };
1:  
1:  struct lzma2_dec {
1: -	enum lzma2_seq sequence;
1: -	enum lzma2_seq next_sequence;
1: -	uint32_t uncompressed;
1: -	uint32_t compressed;
1: -	bool need_dict_reset;
1: -	bool need_props;
1: +  enum lzma2_seq sequence;
1: +  enum lzma2_seq next_sequence;
1: +  uint32_t uncompressed;
1: +  uint32_t compressed;
1: +  bool need_dict_reset;
1: +  bool need_props;
1:  };
1:  
1:  struct xz_dec_lzma2___2 {
1: -	struct rc_dec rc;
1: -	struct dictionary dict;
1: -	struct lzma2_dec lzma2;
1: -	struct lzma_dec lzma;
1: -	struct {
1: -		uint32_t size;
1: -		uint8_t buf[63];
1: -	} temp;
1: +  struct rc_dec rc;
1: +  struct dictionary dict;
1: +  struct lzma2_dec lzma2;
1: +  struct lzma_dec lzma;
1: +  struct {
1: +    uint32_t size;
1: +    uint8_t buf[63];
1: +  } temp;
1:  };
1:  
1:  struct xz_dec_bcj___2 {
1: -	enum {
1: -		BCJ_X86 = 4,
1: -		BCJ_POWERPC = 5,
1: -		BCJ_IA64 = 6,
1: -		BCJ_ARM = 7,
1: -		BCJ_ARMTHUMB = 8,
1: -		BCJ_SPARC = 9,
1: -	} type;
1: -	enum xz_ret ret;
1: -	bool single_call;
1: -	uint32_t pos;
1: -	uint32_t x86_prev_mask;
1: -	uint8_t *out;
1: -	size_t out_pos;
1: -	size_t out_size;
1: -	struct {
1: -		size_t filtered;
1: -		size_t size;
1: -		uint8_t buf[16];
1: -	} temp;
1: +  enum {
1: +    BCJ_X86 = 4,
1: +    BCJ_POWERPC = 5,
1: +    BCJ_IA64 = 6,
1: +    BCJ_ARM = 7,
1: +    BCJ_ARMTHUMB = 8,
1: +    BCJ_SPARC = 9,
1: +  } type;
1: +  enum xz_ret ret;
1: +  bool single_call;
1: +  uint32_t pos;
1: +  uint32_t x86_prev_mask;
1: +  uint8_t *out;
1: +  size_t out_pos;
1: +  size_t out_size;
1: +  struct {
1: +    size_t filtered;
1: +    size_t size;
1: +    uint8_t buf[16];
1: +  } temp;
1:  };
1:  
1:  struct raid6_recov_calls {
1: -	void (*data2)(int, size_t, int, int, void **);
1: -	void (*datap)(int, size_t, int, void **);
1: -	int (*valid)();
1: -	const char *name;
1: -	int priority;
1: +  void (*data2)(int, size_t, int, int, void **);
1: +  void (*datap)(int, size_t, int, void **);
1: +  int (*valid)();
1: +  const char *name;
1: +  int priority;
1:  };
1:  
1:  typedef u64 unative_t;
1:  
1:  struct raid6_sse_constants {
1: -	u64 x1d[2];
1: +  u64 x1d[2];
1:  };
1:  
1:  struct raid6_avx2_constants {
1: -	u64 x1d[4];
1: +  u64 x1d[4];
1:  };
1:  
1:  struct raid6_avx512_constants {
1: -	u64 x1d[8];
1: +  u64 x1d[8];
1:  };
1:  
1:  struct ts_state {
1: -	unsigned int offset;
1: -	char cb[40];
1: +  unsigned int offset;
1: +  char cb[40];
1:  };
1:  
1:  struct ts_config;
1:  
1:  struct ts_ops {
1: -	const char *name;
1: -	struct ts_config * (*init)(const void *, unsigned int, gfp_t, int);
1: -	unsigned int (*find)(struct ts_config *, struct ts_state *);
1: -	void (*destroy)(struct ts_config *);
1: -	void * (*get_pattern)(struct ts_config *);
1: -	unsigned int (*get_pattern_len)(struct ts_config *);
1: -	struct module *owner;
1: -	struct list_head list;
1: +  const char *name;
1: +  struct ts_config *(*init)(const void *, unsigned int, gfp_t, int);
1: +  unsigned int (*find)(struct ts_config *, struct ts_state *);
1: +  void (*destroy)(struct ts_config *);
1: +  void *(*get_pattern)(struct ts_config *);
1: +  unsigned int (*get_pattern_len)(struct ts_config *);
1: +  struct module *owner;
1: +  struct list_head list;
1:  };
1:  
1:  struct ts_config {
1: -	struct ts_ops *ops;
1: -	int flags;
1: -	unsigned int (*get_next_block)(unsigned int, const u8 **, struct ts_config *, struct ts_state *);
1: -	void (*finish)(struct ts_config *, struct ts_state *);
1: +  struct ts_ops *ops;
1: +  int flags;
1: +  unsigned int (*get_next_block)(unsigned int, const u8 **, struct ts_config *,
1: +                                 struct ts_state *);
1: +  void (*finish)(struct ts_config *, struct ts_state *);
1:  };
1:  
1:  struct ts_linear_state {
1: -	unsigned int len;
1: -	const void *data;
1: +  unsigned int len;
1: +  const void *data;
1:  };
1:  
1:  struct ei_entry {
1: -	struct list_head list;
1: -	long unsigned int start_addr;
1: -	long unsigned int end_addr;
1: -	int etype;
1: -	void *priv;
1: +  struct list_head list;
1: +  long unsigned int start_addr;
1: +  long unsigned int end_addr;
1: +  int etype;
1: +  void *priv;
1:  };
1:  
1:  struct nla_bitfield32 {
1: -	__u32 value;
1: -	__u32 selector;
1: +  __u32 value;
1: +  __u32 selector;
1:  };
1:  
1:  enum nla_policy_validation {
1: -	NLA_VALIDATE_NONE = 0,
1: -	NLA_VALIDATE_RANGE = 1,
1: -	NLA_VALIDATE_RANGE_WARN_TOO_LONG = 2,
1: -	NLA_VALIDATE_MIN = 3,
1: -	NLA_VALIDATE_MAX = 4,
1: -	NLA_VALIDATE_MASK = 5,
1: -	NLA_VALIDATE_RANGE_PTR = 6,
1: -	NLA_VALIDATE_FUNCTION = 7,
1: +  NLA_VALIDATE_NONE = 0,
1: +  NLA_VALIDATE_RANGE = 1,
1: +  NLA_VALIDATE_RANGE_WARN_TOO_LONG = 2,
1: +  NLA_VALIDATE_MIN = 3,
1: +  NLA_VALIDATE_MAX = 4,
1: +  NLA_VALIDATE_MASK = 5,
1: +  NLA_VALIDATE_RANGE_PTR = 6,
1: +  NLA_VALIDATE_FUNCTION = 7,
1:  };
1:  
1:  enum netlink_validation {
1: -	NL_VALIDATE_LIBERAL = 0,
1: -	NL_VALIDATE_TRAILING = 1,
1: -	NL_VALIDATE_MAXTYPE = 2,
1: -	NL_VALIDATE_UNSPEC = 4,
1: -	NL_VALIDATE_STRICT_ATTRS = 8,
1: -	NL_VALIDATE_NESTED = 16,
1: +  NL_VALIDATE_LIBERAL = 0,
1: +  NL_VALIDATE_TRAILING = 1,
1: +  NL_VALIDATE_MAXTYPE = 2,
1: +  NL_VALIDATE_UNSPEC = 4,
1: +  NL_VALIDATE_STRICT_ATTRS = 8,
1: +  NL_VALIDATE_NESTED = 16,
1:  };
1:  
1:  struct cpu_rmap {
1: -	struct kref refcount;
1: -	u16 size;
1: -	u16 used;
1: -	void **obj;
1: -	struct {
1: -		u16 index;
1: -		u16 dist;
1: -	} near[0];
1: +  struct kref refcount;
1: +  u16 size;
1: +  u16 used;
1: +  void **obj;
1: +  struct {
1: +    u16 index;
1: +    u16 dist;
1: +  } near[0];
1:  };
1:  
1:  struct irq_glue {
1: -	struct irq_affinity_notify notify;
1: -	struct cpu_rmap *rmap;
1: -	u16 index;
1: +  struct irq_affinity_notify notify;
1: +  struct cpu_rmap *rmap;
1: +  u16 index;
1:  };
1:  
1:  typedef mpi_limb_t *mpi_ptr_t;
1: @@ -67012,12 +68010,12 @@ typedef mpi_limb_t UWtype;
1:  typedef unsigned int UHWtype;
1:  
1:  enum gcry_mpi_constants {
1: -	MPI_C_ZERO = 0,
1: -	MPI_C_ONE = 1,
1: -	MPI_C_TWO = 2,
1: -	MPI_C_THREE = 3,
1: -	MPI_C_FOUR = 4,
1: -	MPI_C_EIGHT = 5,
1: +  MPI_C_ZERO = 0,
1: +  MPI_C_ONE = 1,
1: +  MPI_C_TWO = 2,
1: +  MPI_C_THREE = 3,
1: +  MPI_C_FOUR = 4,
1: +  MPI_C_EIGHT = 5,
1:  };
1:  
1:  struct barrett_ctx_s;
1: @@ -67025,73 +68023,73 @@ struct barrett_ctx_s;
1:  typedef struct barrett_ctx_s *mpi_barrett_t;
1:  
1:  struct gcry_mpi_point {
1: -	MPI x;
1: -	MPI y;
1: -	MPI z;
1: +  MPI x;
1: +  MPI y;
1: +  MPI z;
1:  };
1:  
1:  typedef struct gcry_mpi_point *MPI_POINT;
1:  
1:  enum gcry_mpi_ec_models {
1: -	MPI_EC_WEIERSTRASS = 0,
1: -	MPI_EC_MONTGOMERY = 1,
1: -	MPI_EC_EDWARDS = 2,
1: +  MPI_EC_WEIERSTRASS = 0,
1: +  MPI_EC_MONTGOMERY = 1,
1: +  MPI_EC_EDWARDS = 2,
1:  };
1:  
1:  enum ecc_dialects {
1: -	ECC_DIALECT_STANDARD = 0,
1: -	ECC_DIALECT_ED25519 = 1,
1: -	ECC_DIALECT_SAFECURVE = 2,
1: +  ECC_DIALECT_STANDARD = 0,
1: +  ECC_DIALECT_ED25519 = 1,
1: +  ECC_DIALECT_SAFECURVE = 2,
1:  };
1:  
1:  struct mpi_ec_ctx {
1: -	enum gcry_mpi_ec_models model;
1: -	enum ecc_dialects dialect;
1: -	int flags;
1: -	unsigned int nbits;
1: -	MPI p;
1: -	MPI a;
1: -	MPI b;
1: -	MPI_POINT G;
1: -	MPI n;
1: -	unsigned int h;
1: -	MPI_POINT Q;
1: -	MPI d;
1: -	const char *name;
1: -	struct {
1: -		struct {
1: -			unsigned int a_is_pminus3: 1;
1: -			unsigned int two_inv_p: 1;
1: -		} valid;
1: -		int a_is_pminus3;
1: -		MPI two_inv_p;
1: -		mpi_barrett_t p_barrett;
1: -		MPI scratch[11];
1: -	} t;
1: -	void (*addm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*subm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*mulm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*pow2)(MPI, const MPI, struct mpi_ec_ctx *);
1: -	void (*mul2)(MPI, MPI, struct mpi_ec_ctx *);
1: +  enum gcry_mpi_ec_models model;
1: +  enum ecc_dialects dialect;
1: +  int flags;
1: +  unsigned int nbits;
1: +  MPI p;
1: +  MPI a;
1: +  MPI b;
1: +  MPI_POINT G;
1: +  MPI n;
1: +  unsigned int h;
1: +  MPI_POINT Q;
1: +  MPI d;
1: +  const char *name;
1: +  struct {
1: +    struct {
1: +      unsigned int a_is_pminus3 : 1;
1: +      unsigned int two_inv_p : 1;
1: +    } valid;
1: +    int a_is_pminus3;
1: +    MPI two_inv_p;
1: +    mpi_barrett_t p_barrett;
1: +    MPI scratch[11];
1: +  } t;
1: +  void (*addm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*subm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*mulm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*pow2)(MPI, const MPI, struct mpi_ec_ctx *);
1: +  void (*mul2)(MPI, MPI, struct mpi_ec_ctx *);
1:  };
1:  
1:  struct field_table {
1: -	const char *p;
1: -	void (*addm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*subm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*mulm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*mul2)(MPI, MPI, struct mpi_ec_ctx *);
1: -	void (*pow2)(MPI, const MPI, struct mpi_ec_ctx *);
1: +  const char *p;
1: +  void (*addm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*subm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*mulm)(MPI, MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*mul2)(MPI, MPI, struct mpi_ec_ctx *);
1: +  void (*pow2)(MPI, const MPI, struct mpi_ec_ctx *);
1:  };
1:  
1:  enum gcry_mpi_format {
1: -	GCRYMPI_FMT_NONE = 0,
1: -	GCRYMPI_FMT_STD = 1,
1: -	GCRYMPI_FMT_PGP = 2,
1: -	GCRYMPI_FMT_SSH = 3,
1: -	GCRYMPI_FMT_HEX = 4,
1: -	GCRYMPI_FMT_USG = 5,
1: -	GCRYMPI_FMT_OPAQUE = 8,
1: +  GCRYMPI_FMT_NONE = 0,
1: +  GCRYMPI_FMT_STD = 1,
1: +  GCRYMPI_FMT_PGP = 2,
1: +  GCRYMPI_FMT_SSH = 3,
1: +  GCRYMPI_FMT_HEX = 4,
1: +  GCRYMPI_FMT_USG = 5,
1: +  GCRYMPI_FMT_OPAQUE = 8,
1:  };
1:  
1:  struct barrett_ctx_s___2;
1: @@ -67099,124 +68097,124 @@ struct barrett_ctx_s___2;
1:  typedef struct barrett_ctx_s___2 *mpi_barrett_t___2;
1:  
1:  struct barrett_ctx_s___2 {
1: -	MPI m;
1: -	int m_copied;
1: -	int k;
1: -	MPI y;
1: -	MPI r1;
1: -	MPI r2;
1: -	MPI r3;
1: +  MPI m;
1: +  int m_copied;
1: +  int k;
1: +  MPI y;
1: +  MPI r1;
1: +  MPI r2;
1: +  MPI r3;
1:  };
1:  
1:  struct karatsuba_ctx {
1: -	struct karatsuba_ctx *next;
1: -	mpi_ptr_t tspace;
1: -	mpi_size_t tspace_size;
1: -	mpi_ptr_t tp;
1: -	mpi_size_t tp_size;
1: +  struct karatsuba_ctx *next;
1: +  mpi_ptr_t tspace;
1: +  mpi_size_t tspace_size;
1: +  mpi_ptr_t tp;
1: +  mpi_size_t tp_size;
1:  };
1:  
1:  typedef long int mpi_limb_signed_t;
1:  
1:  enum dim_tune_state {
1: -	DIM_PARKING_ON_TOP = 0,
1: -	DIM_PARKING_TIRED = 1,
1: -	DIM_GOING_RIGHT = 2,
1: -	DIM_GOING_LEFT = 3,
1: +  DIM_PARKING_ON_TOP = 0,
1: +  DIM_PARKING_TIRED = 1,
1: +  DIM_GOING_RIGHT = 2,
1: +  DIM_GOING_LEFT = 3,
1:  };
1:  
1:  struct dim_cq_moder {
1: -	u16 usec;
1: -	u16 pkts;
1: -	u16 comps;
1: -	u8 cq_period_mode;
1: +  u16 usec;
1: +  u16 pkts;
1: +  u16 comps;
1: +  u8 cq_period_mode;
1:  };
1:  
1:  enum dim_cq_period_mode {
1: -	DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0,
1: -	DIM_CQ_PERIOD_MODE_START_FROM_CQE = 1,
1: -	DIM_CQ_PERIOD_NUM_MODES = 2,
1: +  DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0,
1: +  DIM_CQ_PERIOD_MODE_START_FROM_CQE = 1,
1: +  DIM_CQ_PERIOD_NUM_MODES = 2,
1:  };
1:  
1:  enum dim_state {
1: -	DIM_START_MEASURE = 0,
1: -	DIM_MEASURE_IN_PROGRESS = 1,
1: -	DIM_APPLY_NEW_PROFILE = 2,
1: +  DIM_START_MEASURE = 0,
1: +  DIM_MEASURE_IN_PROGRESS = 1,
1: +  DIM_APPLY_NEW_PROFILE = 2,
1:  };
1:  
1:  enum dim_stats_state {
1: -	DIM_STATS_WORSE = 0,
1: -	DIM_STATS_SAME = 1,
1: -	DIM_STATS_BETTER = 2,
1: +  DIM_STATS_WORSE = 0,
1: +  DIM_STATS_SAME = 1,
1: +  DIM_STATS_BETTER = 2,
1:  };
1:  
1:  enum dim_step_result {
1: -	DIM_STEPPED = 0,
1: -	DIM_TOO_TIRED = 1,
1: -	DIM_ON_EDGE = 2,
1: +  DIM_STEPPED = 0,
1: +  DIM_TOO_TIRED = 1,
1: +  DIM_ON_EDGE = 2,
1:  };
1:  
1:  struct sg_pool {
1: -	size_t size;
1: -	char *name;
1: -	struct kmem_cache *slab;
1: -	mempool_t *pool;
1: +  size_t size;
1: +  char *name;
1: +  struct kmem_cache *slab;
1: +  mempool_t *pool;
1:  };
1:  
1:  enum {
1: -	IRQ_POLL_F_SCHED = 0,
1: -	IRQ_POLL_F_DISABLE = 1,
1: +  IRQ_POLL_F_SCHED = 0,
1: +  IRQ_POLL_F_DISABLE = 1,
1:  };
1:  
1:  struct font_desc {
1: -	int idx;
1: -	const char *name;
1: -	int width;
1: -	int height;
1: -	const void *data;
1: -	int pref;
1: +  int idx;
1: +  const char *name;
1: +  int width;
1: +  int height;
1: +  const void *data;
1: +  int pref;
1:  };
1:  
1:  struct font_data {
1: -	unsigned int extra[4];
1: -	const unsigned char data[0];
1: +  unsigned int extra[4];
1: +  const unsigned char data[0];
1:  };
1:  
1:  typedef u16 ucs2_char_t;
1:  
1:  struct msr {
1: -	union {
1: -		struct {
1: -			u32 l;
1: -			u32 h;
1: -		};
1: -		u64 q;
1: -	};
1: +  union {
1: +    struct {
1: +      u32 l;
1: +      u32 h;
1: +    };
1: +    u64 q;
1: +  };
1:  };
1:  
1:  struct msr_info {
1: -	u32 msr_no;
1: -	struct msr reg;
1: -	struct msr *msrs;
1: -	int err;
1: +  u32 msr_no;
1: +  struct msr reg;
1: +  struct msr *msrs;
1: +  int err;
1:  };
1:  
1:  struct msr_regs_info {
1: -	u32 *regs;
1: -	int err;
1: +  u32 *regs;
1: +  int err;
1:  };
1:  
1:  struct msr_info_completion {
1: -	struct msr_info msr;
1: -	struct completion done;
1: +  struct msr_info msr;
1: +  struct completion done;
1:  };
1:  
1:  struct trace_event_raw_msr_trace_class {
1: -	struct trace_entry ent;
1: -	unsigned int msr;
1: -	u64 val;
1: -	int failed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int msr;
1: +  u64 val;
1: +  int failed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_msr_trace_class {};
1: @@ -67228,107 +68226,107 @@ typedef void (*btf_trace_write_msr)(void *, unsigned int, u64, int);
1:  typedef void (*btf_trace_rdpmc)(void *, unsigned int, u64, int);
1:  
1:  struct compress_format {
1: -	unsigned char magic[2];
1: -	const char *name;
1: -	decompress_fn decompressor;
1: +  unsigned char magic[2];
1: +  const char *name;
1: +  decompress_fn decompressor;
1:  };
1:  
1:  struct group_data {
1: -	int limit[21];
1: -	int base[20];
1: -	int permute[258];
1: -	int minLen;
1: -	int maxLen;
1: +  int limit[21];
1: +  int base[20];
1: +  int permute[258];
1: +  int minLen;
1: +  int maxLen;
1:  };
1:  
1:  struct bunzip_data {
1: -	int writeCopies;
1: -	int writePos;
1: -	int writeRunCountdown;
1: -	int writeCount;
1: -	int writeCurrent;
1: -	long int (*fill)(void *, long unsigned int);
1: -	long int inbufCount;
1: -	long int inbufPos;
1: -	unsigned char *inbuf;
1: -	unsigned int inbufBitCount;
1: -	unsigned int inbufBits;
1: -	unsigned int crc32Table[256];
1: -	unsigned int headerCRC;
1: -	unsigned int totalCRC;
1: -	unsigned int writeCRC;
1: -	unsigned int *dbuf;
1: -	unsigned int dbufSize;
1: -	unsigned char selectors[32768];
1: -	struct group_data groups[6];
1: -	int io_error;
1: -	int byteCount[256];
1: -	unsigned char symToByte[256];
1: -	unsigned char mtfSymbol[256];
1: +  int writeCopies;
1: +  int writePos;
1: +  int writeRunCountdown;
1: +  int writeCount;
1: +  int writeCurrent;
1: +  long int (*fill)(void *, long unsigned int);
1: +  long int inbufCount;
1: +  long int inbufPos;
1: +  unsigned char *inbuf;
1: +  unsigned int inbufBitCount;
1: +  unsigned int inbufBits;
1: +  unsigned int crc32Table[256];
1: +  unsigned int headerCRC;
1: +  unsigned int totalCRC;
1: +  unsigned int writeCRC;
1: +  unsigned int *dbuf;
1: +  unsigned int dbufSize;
1: +  unsigned char selectors[32768];
1: +  struct group_data groups[6];
1: +  int io_error;
1: +  int byteCount[256];
1: +  unsigned char symToByte[256];
1: +  unsigned char mtfSymbol[256];
1:  };
1:  
1:  struct rc {
1: -	long int (*fill)(void *, long unsigned int);
1: -	uint8_t *ptr;
1: -	uint8_t *buffer;
1: -	uint8_t *buffer_end;
1: -	long int buffer_size;
1: -	uint32_t code;
1: -	uint32_t range;
1: -	uint32_t bound;
1: -	void (*error)(char *);
1: +  long int (*fill)(void *, long unsigned int);
1: +  uint8_t *ptr;
1: +  uint8_t *buffer;
1: +  uint8_t *buffer_end;
1: +  long int buffer_size;
1: +  uint32_t code;
1: +  uint32_t range;
1: +  uint32_t bound;
1: +  void (*error)(char *);
1:  };
1:  
1:  struct lzma_header {
1: -	uint8_t pos;
1: -	uint32_t dict_size;
1: -	uint64_t dst_size;
1: +  uint8_t pos;
1: +  uint32_t dict_size;
1: +  uint64_t dst_size;
1:  } __attribute__((packed));
1:  
1:  struct writer {
1: -	uint8_t *buffer;
1: -	uint8_t previous_byte;
1: -	size_t buffer_pos;
1: -	int bufsize;
1: -	size_t global_pos;
1: -	long int (*flush)(void *, long unsigned int);
1: -	struct lzma_header *header;
1: +  uint8_t *buffer;
1: +  uint8_t previous_byte;
1: +  size_t buffer_pos;
1: +  int bufsize;
1: +  size_t global_pos;
1: +  long int (*flush)(void *, long unsigned int);
1: +  struct lzma_header *header;
1:  };
1:  
1:  struct cstate {
1: -	int state;
1: -	uint32_t rep0;
1: -	uint32_t rep1;
1: -	uint32_t rep2;
1: -	uint32_t rep3;
1: +  int state;
1: +  uint32_t rep0;
1: +  uint32_t rep1;
1: +  uint32_t rep2;
1: +  uint32_t rep3;
1:  };
1:  
1:  struct xz_dec___2;
1:  
1:  typedef enum {
1: -	ZSTD_error_no_error = 0,
1: -	ZSTD_error_GENERIC = 1,
1: -	ZSTD_error_prefix_unknown = 2,
1: -	ZSTD_error_version_unsupported = 3,
1: -	ZSTD_error_parameter_unknown = 4,
1: -	ZSTD_error_frameParameter_unsupported = 5,
1: -	ZSTD_error_frameParameter_unsupportedBy32bits = 6,
1: -	ZSTD_error_frameParameter_windowTooLarge = 7,
1: -	ZSTD_error_compressionParameter_unsupported = 8,
1: -	ZSTD_error_init_missing = 9,
1: -	ZSTD_error_memory_allocation = 10,
1: -	ZSTD_error_stage_wrong = 11,
1: -	ZSTD_error_dstSize_tooSmall = 12,
1: -	ZSTD_error_srcSize_wrong = 13,
1: -	ZSTD_error_corruption_detected = 14,
1: -	ZSTD_error_checksum_wrong = 15,
1: -	ZSTD_error_tableLog_tooLarge = 16,
1: -	ZSTD_error_maxSymbolValue_tooLarge = 17,
1: -	ZSTD_error_maxSymbolValue_tooSmall = 18,
1: -	ZSTD_error_dictionary_corrupted = 19,
1: -	ZSTD_error_dictionary_wrong = 20,
1: -	ZSTD_error_dictionaryCreation_failed = 21,
1: -	ZSTD_error_maxCode = 22,
1: +  ZSTD_error_no_error = 0,
1: +  ZSTD_error_GENERIC = 1,
1: +  ZSTD_error_prefix_unknown = 2,
1: +  ZSTD_error_version_unsupported = 3,
1: +  ZSTD_error_parameter_unknown = 4,
1: +  ZSTD_error_frameParameter_unsupported = 5,
1: +  ZSTD_error_frameParameter_unsupportedBy32bits = 6,
1: +  ZSTD_error_frameParameter_windowTooLarge = 7,
1: +  ZSTD_error_compressionParameter_unsupported = 8,
1: +  ZSTD_error_init_missing = 9,
1: +  ZSTD_error_memory_allocation = 10,
1: +  ZSTD_error_stage_wrong = 11,
1: +  ZSTD_error_dstSize_tooSmall = 12,
1: +  ZSTD_error_srcSize_wrong = 13,
1: +  ZSTD_error_corruption_detected = 14,
1: +  ZSTD_error_checksum_wrong = 15,
1: +  ZSTD_error_tableLog_tooLarge = 16,
1: +  ZSTD_error_maxSymbolValue_tooLarge = 17,
1: +  ZSTD_error_maxSymbolValue_tooSmall = 18,
1: +  ZSTD_error_dictionary_corrupted = 19,
1: +  ZSTD_error_dictionary_wrong = 20,
1: +  ZSTD_error_dictionaryCreation_failed = 21,
1: +  ZSTD_error_maxCode = 22,
1:  } ZSTD_ErrorCode;
1:  
1:  struct ZSTD_DCtx_s___2;
1: @@ -67336,405 +68334,405 @@ struct ZSTD_DCtx_s___2;
1:  typedef struct ZSTD_DCtx_s___2 ZSTD_DCtx___2;
1:  
1:  struct cpio_data {
1: -	void *data;
1: -	size_t size;
1: -	char name[18];
1: +  void *data;
1: +  size_t size;
1: +  char name[18];
1:  };
1:  
1:  enum cpio_fields {
1: -	C_MAGIC = 0,
1: -	C_INO = 1,
1: -	C_MODE = 2,
1: -	C_UID = 3,
1: -	C_GID = 4,
1: -	C_NLINK = 5,
1: -	C_MTIME = 6,
1: -	C_FILESIZE = 7,
1: -	C_MAJ = 8,
1: -	C_MIN = 9,
1: -	C_RMAJ = 10,
1: -	C_RMIN = 11,
1: -	C_NAMESIZE = 12,
1: -	C_CHKSUM = 13,
1: -	C_NFIELDS = 14,
1: +  C_MAGIC = 0,
1: +  C_INO = 1,
1: +  C_MODE = 2,
1: +  C_UID = 3,
1: +  C_GID = 4,
1: +  C_NLINK = 5,
1: +  C_MTIME = 6,
1: +  C_FILESIZE = 7,
1: +  C_MAJ = 8,
1: +  C_MIN = 9,
1: +  C_RMAJ = 10,
1: +  C_RMIN = 11,
1: +  C_NAMESIZE = 12,
1: +  C_CHKSUM = 13,
1: +  C_NFIELDS = 14,
1:  };
1:  
1:  struct fprop_local_single {
1: -	long unsigned int events;
1: -	unsigned int period;
1: -	raw_spinlock_t lock;
1: +  long unsigned int events;
1: +  unsigned int period;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct ida_bitmap {
1: -	long unsigned int bitmap[16];
1: +  long unsigned int bitmap[16];
1:  };
1:  
1:  struct klist_waiter {
1: -	struct list_head list;
1: -	struct klist_node *node;
1: -	struct task_struct *process;
1: -	int woken;
1: +  struct list_head list;
1: +  struct klist_node *node;
1: +  struct task_struct *process;
1: +  int woken;
1:  };
1:  
1:  struct uevent_sock {
1: -	struct list_head list;
1: -	struct sock *sk;
1: +  struct list_head list;
1: +  struct sock *sk;
1:  };
1:  
1:  enum {
1: -	LOGIC_PIO_INDIRECT = 0,
1: -	LOGIC_PIO_CPU_MMIO = 1,
1: +  LOGIC_PIO_INDIRECT = 0,
1: +  LOGIC_PIO_CPU_MMIO = 1,
1:  };
1:  
1:  struct logic_pio_host_ops;
1:  
1:  struct logic_pio_hwaddr {
1: -	struct list_head list;
1: -	struct fwnode_handle *fwnode;
1: -	resource_size_t hw_start;
1: -	resource_size_t io_start;
1: -	resource_size_t size;
1: -	long unsigned int flags;
1: -	void *hostdata;
1: -	const struct logic_pio_host_ops *ops;
1: +  struct list_head list;
1: +  struct fwnode_handle *fwnode;
1: +  resource_size_t hw_start;
1: +  resource_size_t io_start;
1: +  resource_size_t size;
1: +  long unsigned int flags;
1: +  void *hostdata;
1: +  const struct logic_pio_host_ops *ops;
1:  };
1:  
1:  struct logic_pio_host_ops {
1: -	u32 (*in)(void *, long unsigned int, size_t);
1: -	void (*out)(void *, long unsigned int, u32, size_t);
1: -	u32 (*ins)(void *, long unsigned int, void *, size_t, unsigned int);
1: -	void (*outs)(void *, long unsigned int, const void *, size_t, unsigned int);
1: +  u32 (*in)(void *, long unsigned int, size_t);
1: +  void (*out)(void *, long unsigned int, u32, size_t);
1: +  u32 (*ins)(void *, long unsigned int, void *, size_t, unsigned int);
1: +  void (*outs)(void *, long unsigned int, const void *, size_t, unsigned int);
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int key[2];
1: -} hsiphash_key_t;
1: +typedef struct { long unsigned int key[2]; } hsiphash_key_t;
1:  
1:  enum format_type {
1: -	FORMAT_TYPE_NONE = 0,
1: -	FORMAT_TYPE_WIDTH = 1,
1: -	FORMAT_TYPE_PRECISION = 2,
1: -	FORMAT_TYPE_CHAR = 3,
1: -	FORMAT_TYPE_STR = 4,
1: -	FORMAT_TYPE_PTR = 5,
1: -	FORMAT_TYPE_PERCENT_CHAR = 6,
1: -	FORMAT_TYPE_INVALID = 7,
1: -	FORMAT_TYPE_LONG_LONG = 8,
1: -	FORMAT_TYPE_ULONG = 9,
1: -	FORMAT_TYPE_LONG = 10,
1: -	FORMAT_TYPE_UBYTE = 11,
1: -	FORMAT_TYPE_BYTE = 12,
1: -	FORMAT_TYPE_USHORT = 13,
1: -	FORMAT_TYPE_SHORT = 14,
1: -	FORMAT_TYPE_UINT = 15,
1: -	FORMAT_TYPE_INT = 16,
1: -	FORMAT_TYPE_SIZE_T = 17,
1: -	FORMAT_TYPE_PTRDIFF = 18,
1: +  FORMAT_TYPE_NONE = 0,
1: +  FORMAT_TYPE_WIDTH = 1,
1: +  FORMAT_TYPE_PRECISION = 2,
1: +  FORMAT_TYPE_CHAR = 3,
1: +  FORMAT_TYPE_STR = 4,
1: +  FORMAT_TYPE_PTR = 5,
1: +  FORMAT_TYPE_PERCENT_CHAR = 6,
1: +  FORMAT_TYPE_INVALID = 7,
1: +  FORMAT_TYPE_LONG_LONG = 8,
1: +  FORMAT_TYPE_ULONG = 9,
1: +  FORMAT_TYPE_LONG = 10,
1: +  FORMAT_TYPE_UBYTE = 11,
1: +  FORMAT_TYPE_BYTE = 12,
1: +  FORMAT_TYPE_USHORT = 13,
1: +  FORMAT_TYPE_SHORT = 14,
1: +  FORMAT_TYPE_UINT = 15,
1: +  FORMAT_TYPE_INT = 16,
1: +  FORMAT_TYPE_SIZE_T = 17,
1: +  FORMAT_TYPE_PTRDIFF = 18,
1:  };
1:  
1:  struct printf_spec {
1: -	unsigned int type: 8;
1: -	int field_width: 24;
1: -	unsigned int flags: 8;
1: -	unsigned int base: 8;
1: -	int precision: 16;
1: +  unsigned int type : 8;
1: +  int field_width : 24;
1: +  unsigned int flags : 8;
1: +  unsigned int base : 8;
1: +  int precision : 16;
1:  };
1:  
1:  struct minmax_sample {
1: -	u32 t;
1: -	u32 v;
1: +  u32 t;
1: +  u32 v;
1:  };
1:  
1:  struct minmax {
1: -	struct minmax_sample s[3];
1: +  struct minmax_sample s[3];
1:  };
1:  
1:  struct xa_limit {
1: -	u32 max;
1: -	u32 min;
1: +  u32 max;
1: +  u32 min;
1:  };
1:  
1:  enum {
1: -	st_wordstart = 0,
1: -	st_wordcmp = 1,
1: -	st_wordskip = 2,
1: -	st_bufcpy = 3,
1: +  st_wordstart = 0,
1: +  st_wordcmp = 1,
1: +  st_wordskip = 2,
1: +  st_bufcpy = 3,
1:  };
1:  
1:  enum {
1: -	st_wordstart___2 = 0,
1: -	st_wordcmp___2 = 1,
1: -	st_wordskip___2 = 2,
1: +  st_wordstart___2 = 0,
1: +  st_wordcmp___2 = 1,
1: +  st_wordskip___2 = 2,
1:  };
1:  
1:  struct in6_addr___2;
1:  
1:  enum reg_type {
1: -	REG_TYPE_RM = 0,
1: -	REG_TYPE_REG = 1,
1: -	REG_TYPE_INDEX = 2,
1: -	REG_TYPE_BASE = 3,
1: +  REG_TYPE_RM = 0,
1: +  REG_TYPE_REG = 1,
1: +  REG_TYPE_INDEX = 2,
1: +  REG_TYPE_BASE = 3,
1:  };
1:  
1:  enum device_link_state {
1: -	DL_STATE_NONE = 4294967295,
1: -	DL_STATE_DORMANT = 0,
1: -	DL_STATE_AVAILABLE = 1,
1: -	DL_STATE_CONSUMER_PROBE = 2,
1: -	DL_STATE_ACTIVE = 3,
1: -	DL_STATE_SUPPLIER_UNBIND = 4,
1: +  DL_STATE_NONE = 4294967295,
1: +  DL_STATE_DORMANT = 0,
1: +  DL_STATE_AVAILABLE = 1,
1: +  DL_STATE_CONSUMER_PROBE = 2,
1: +  DL_STATE_ACTIVE = 3,
1: +  DL_STATE_SUPPLIER_UNBIND = 4,
1:  };
1:  
1:  struct device_link {
1: -	struct device *supplier;
1: -	struct list_head s_node;
1: -	struct device *consumer;
1: -	struct list_head c_node;
1: -	struct device link_dev;
1: -	enum device_link_state status;
1: -	u32 flags;
1: -	refcount_t rpm_active;
1: -	struct kref kref;
1: -	struct callback_head callback_head;
1: -	bool supplier_preactivated;
1: +  struct device *supplier;
1: +  struct list_head s_node;
1: +  struct device *consumer;
1: +  struct list_head c_node;
1: +  struct device link_dev;
1: +  enum device_link_state status;
1: +  u32 flags;
1: +  refcount_t rpm_active;
1: +  struct kref kref;
1: +  struct callback_head callback_head;
1: +  bool supplier_preactivated;
1:  };
1:  
1:  struct regulator;
1:  
1:  struct phy_configure_opts_dp {
1: -	unsigned int link_rate;
1: -	unsigned int lanes;
1: -	unsigned int voltage[4];
1: -	unsigned int pre[4];
1: -	u8 ssc: 1;
1: -	u8 set_rate: 1;
1: -	u8 set_lanes: 1;
1: -	u8 set_voltages: 1;
1: +  unsigned int link_rate;
1: +  unsigned int lanes;
1: +  unsigned int voltage[4];
1: +  unsigned int pre[4];
1: +  u8 ssc : 1;
1: +  u8 set_rate : 1;
1: +  u8 set_lanes : 1;
1: +  u8 set_voltages : 1;
1:  };
1:  
1:  struct phy_configure_opts_mipi_dphy {
1: -	unsigned int clk_miss;
1: -	unsigned int clk_post;
1: -	unsigned int clk_pre;
1: -	unsigned int clk_prepare;
1: -	unsigned int clk_settle;
1: -	unsigned int clk_term_en;
1: -	unsigned int clk_trail;
1: -	unsigned int clk_zero;
1: -	unsigned int d_term_en;
1: -	unsigned int eot;
1: -	unsigned int hs_exit;
1: -	unsigned int hs_prepare;
1: -	unsigned int hs_settle;
1: -	unsigned int hs_skip;
1: -	unsigned int hs_trail;
1: -	unsigned int hs_zero;
1: -	unsigned int init;
1: -	unsigned int lpx;
1: -	unsigned int ta_get;
1: -	unsigned int ta_go;
1: -	unsigned int ta_sure;
1: -	unsigned int wakeup;
1: -	long unsigned int hs_clk_rate;
1: -	long unsigned int lp_clk_rate;
1: -	unsigned char lanes;
1: +  unsigned int clk_miss;
1: +  unsigned int clk_post;
1: +  unsigned int clk_pre;
1: +  unsigned int clk_prepare;
1: +  unsigned int clk_settle;
1: +  unsigned int clk_term_en;
1: +  unsigned int clk_trail;
1: +  unsigned int clk_zero;
1: +  unsigned int d_term_en;
1: +  unsigned int eot;
1: +  unsigned int hs_exit;
1: +  unsigned int hs_prepare;
1: +  unsigned int hs_settle;
1: +  unsigned int hs_skip;
1: +  unsigned int hs_trail;
1: +  unsigned int hs_zero;
1: +  unsigned int init;
1: +  unsigned int lpx;
1: +  unsigned int ta_get;
1: +  unsigned int ta_go;
1: +  unsigned int ta_sure;
1: +  unsigned int wakeup;
1: +  long unsigned int hs_clk_rate;
1: +  long unsigned int lp_clk_rate;
1: +  unsigned char lanes;
1:  };
1:  
1:  enum phy_mode {
1: -	PHY_MODE_INVALID = 0,
1: -	PHY_MODE_USB_HOST = 1,
1: -	PHY_MODE_USB_HOST_LS = 2,
1: -	PHY_MODE_USB_HOST_FS = 3,
1: -	PHY_MODE_USB_HOST_HS = 4,
1: -	PHY_MODE_USB_HOST_SS = 5,
1: -	PHY_MODE_USB_DEVICE = 6,
1: -	PHY_MODE_USB_DEVICE_LS = 7,
1: -	PHY_MODE_USB_DEVICE_FS = 8,
1: -	PHY_MODE_USB_DEVICE_HS = 9,
1: -	PHY_MODE_USB_DEVICE_SS = 10,
1: -	PHY_MODE_USB_OTG = 11,
1: -	PHY_MODE_UFS_HS_A = 12,
1: -	PHY_MODE_UFS_HS_B = 13,
1: -	PHY_MODE_PCIE = 14,
1: -	PHY_MODE_ETHERNET = 15,
1: -	PHY_MODE_MIPI_DPHY = 16,
1: -	PHY_MODE_SATA = 17,
1: -	PHY_MODE_LVDS = 18,
1: -	PHY_MODE_DP = 19,
1: +  PHY_MODE_INVALID = 0,
1: +  PHY_MODE_USB_HOST = 1,
1: +  PHY_MODE_USB_HOST_LS = 2,
1: +  PHY_MODE_USB_HOST_FS = 3,
1: +  PHY_MODE_USB_HOST_HS = 4,
1: +  PHY_MODE_USB_HOST_SS = 5,
1: +  PHY_MODE_USB_DEVICE = 6,
1: +  PHY_MODE_USB_DEVICE_LS = 7,
1: +  PHY_MODE_USB_DEVICE_FS = 8,
1: +  PHY_MODE_USB_DEVICE_HS = 9,
1: +  PHY_MODE_USB_DEVICE_SS = 10,
1: +  PHY_MODE_USB_OTG = 11,
1: +  PHY_MODE_UFS_HS_A = 12,
1: +  PHY_MODE_UFS_HS_B = 13,
1: +  PHY_MODE_PCIE = 14,
1: +  PHY_MODE_ETHERNET = 15,
1: +  PHY_MODE_MIPI_DPHY = 16,
1: +  PHY_MODE_SATA = 17,
1: +  PHY_MODE_LVDS = 18,
1: +  PHY_MODE_DP = 19,
1:  };
1:  
1:  union phy_configure_opts {
1: -	struct phy_configure_opts_mipi_dphy mipi_dphy;
1: -	struct phy_configure_opts_dp dp;
1: +  struct phy_configure_opts_mipi_dphy mipi_dphy;
1: +  struct phy_configure_opts_dp dp;
1:  };
1:  
1:  struct phy;
1:  
1:  struct phy_ops {
1: -	int (*init)(struct phy *);
1: -	int (*exit)(struct phy *);
1: -	int (*power_on)(struct phy *);
1: -	int (*power_off)(struct phy *);
1: -	int (*set_mode)(struct phy *, enum phy_mode, int);
1: -	int (*configure)(struct phy *, union phy_configure_opts *);
1: -	int (*validate)(struct phy *, enum phy_mode, int, union phy_configure_opts *);
1: -	int (*reset)(struct phy *);
1: -	int (*calibrate)(struct phy *);
1: -	void (*release)(struct phy *);
1: -	struct module *owner;
1: +  int (*init)(struct phy *);
1: +  int (*exit)(struct phy *);
1: +  int (*power_on)(struct phy *);
1: +  int (*power_off)(struct phy *);
1: +  int (*set_mode)(struct phy *, enum phy_mode, int);
1: +  int (*configure)(struct phy *, union phy_configure_opts *);
1: +  int (*validate)(struct phy *, enum phy_mode, int, union phy_configure_opts *);
1: +  int (*reset)(struct phy *);
1: +  int (*calibrate)(struct phy *);
1: +  void (*release)(struct phy *);
1: +  struct module *owner;
1:  };
1:  
1:  struct phy_attrs {
1: -	u32 bus_width;
1: -	u32 max_link_rate;
1: -	enum phy_mode mode;
1: +  u32 bus_width;
1: +  u32 max_link_rate;
1: +  enum phy_mode mode;
1:  };
1:  
1:  struct phy {
1: -	struct device dev;
1: -	int id;
1: -	const struct phy_ops *ops;
1: -	struct mutex mutex;
1: -	int init_count;
1: -	int power_count;
1: -	struct phy_attrs attrs;
1: -	struct regulator *pwr;
1: +  struct device dev;
1: +  int id;
1: +  const struct phy_ops *ops;
1: +  struct mutex mutex;
1: +  int init_count;
1: +  int power_count;
1: +  struct phy_attrs attrs;
1: +  struct regulator *pwr;
1:  };
1:  
1:  struct phy_provider {
1: -	struct device *dev;
1: -	struct device_node *children;
1: -	struct module *owner;
1: -	struct list_head list;
1: -	struct phy * (*of_xlate)(struct device *, struct of_phandle_args *);
1: +  struct device *dev;
1: +  struct device_node *children;
1: +  struct module *owner;
1: +  struct list_head list;
1: +  struct phy *(*of_xlate)(struct device *, struct of_phandle_args *);
1:  };
1:  
1:  struct phy_lookup {
1: -	struct list_head node;
1: -	const char *dev_id;
1: -	const char *con_id;
1: -	struct phy *phy;
1: +  struct list_head node;
1: +  const char *dev_id;
1: +  const char *con_id;
1: +  struct phy *phy;
1:  };
1:  
1:  struct gpio_device;
1:  
1:  struct gpio_chip {
1: -	const char *label;
1: -	struct gpio_device *gpiodev;
1: -	struct device *parent;
1: -	struct module *owner;
1: -	int (*request)(struct gpio_chip *, unsigned int);
1: -	void (*free)(struct gpio_chip *, unsigned int);
1: -	int (*get_direction)(struct gpio_chip *, unsigned int);
1: -	int (*direction_input)(struct gpio_chip *, unsigned int);
1: -	int (*direction_output)(struct gpio_chip *, unsigned int, int);
1: -	int (*get)(struct gpio_chip *, unsigned int);
1: -	int (*get_multiple)(struct gpio_chip *, long unsigned int *, long unsigned int *);
1: -	void (*set)(struct gpio_chip *, unsigned int, int);
1: -	void (*set_multiple)(struct gpio_chip *, long unsigned int *, long unsigned int *);
1: -	int (*set_config)(struct gpio_chip *, unsigned int, long unsigned int);
1: -	int (*to_irq)(struct gpio_chip *, unsigned int);
1: -	void (*dbg_show)(struct seq_file *, struct gpio_chip *);
1: -	int (*init_valid_mask)(struct gpio_chip *, long unsigned int *, unsigned int);
1: -	int (*add_pin_ranges)(struct gpio_chip *);
1: -	int base;
1: -	u16 ngpio;
1: -	const char * const *names;
1: -	bool can_sleep;
1: -	long unsigned int *valid_mask;
1: +  const char *label;
1: +  struct gpio_device *gpiodev;
1: +  struct device *parent;
1: +  struct module *owner;
1: +  int (*request)(struct gpio_chip *, unsigned int);
1: +  void (*free)(struct gpio_chip *, unsigned int);
1: +  int (*get_direction)(struct gpio_chip *, unsigned int);
1: +  int (*direction_input)(struct gpio_chip *, unsigned int);
1: +  int (*direction_output)(struct gpio_chip *, unsigned int, int);
1: +  int (*get)(struct gpio_chip *, unsigned int);
1: +  int (*get_multiple)(struct gpio_chip *, long unsigned int *,
1: +                      long unsigned int *);
1: +  void (*set)(struct gpio_chip *, unsigned int, int);
1: +  void (*set_multiple)(struct gpio_chip *, long unsigned int *,
1: +                       long unsigned int *);
1: +  int (*set_config)(struct gpio_chip *, unsigned int, long unsigned int);
1: +  int (*to_irq)(struct gpio_chip *, unsigned int);
1: +  void (*dbg_show)(struct seq_file *, struct gpio_chip *);
1: +  int (*init_valid_mask)(struct gpio_chip *, long unsigned int *, unsigned int);
1: +  int (*add_pin_ranges)(struct gpio_chip *);
1: +  int base;
1: +  u16 ngpio;
1: +  const char *const *names;
1: +  bool can_sleep;
1: +  long unsigned int *valid_mask;
1:  };
1:  
1:  enum pin_config_param {
1: -	PIN_CONFIG_BIAS_BUS_HOLD = 0,
1: -	PIN_CONFIG_BIAS_DISABLE = 1,
1: -	PIN_CONFIG_BIAS_HIGH_IMPEDANCE = 2,
1: -	PIN_CONFIG_BIAS_PULL_DOWN = 3,
1: -	PIN_CONFIG_BIAS_PULL_PIN_DEFAULT = 4,
1: -	PIN_CONFIG_BIAS_PULL_UP = 5,
1: -	PIN_CONFIG_DRIVE_OPEN_DRAIN = 6,
1: -	PIN_CONFIG_DRIVE_OPEN_SOURCE = 7,
1: -	PIN_CONFIG_DRIVE_PUSH_PULL = 8,
1: -	PIN_CONFIG_DRIVE_STRENGTH = 9,
1: -	PIN_CONFIG_DRIVE_STRENGTH_UA = 10,
1: -	PIN_CONFIG_INPUT_DEBOUNCE = 11,
1: -	PIN_CONFIG_INPUT_ENABLE = 12,
1: -	PIN_CONFIG_INPUT_SCHMITT = 13,
1: -	PIN_CONFIG_INPUT_SCHMITT_ENABLE = 14,
1: -	PIN_CONFIG_LOW_POWER_MODE = 15,
1: -	PIN_CONFIG_OUTPUT_ENABLE = 16,
1: -	PIN_CONFIG_OUTPUT = 17,
1: -	PIN_CONFIG_POWER_SOURCE = 18,
1: -	PIN_CONFIG_SLEEP_HARDWARE_STATE = 19,
1: -	PIN_CONFIG_SLEW_RATE = 20,
1: -	PIN_CONFIG_SKEW_DELAY = 21,
1: -	PIN_CONFIG_PERSIST_STATE = 22,
1: -	PIN_CONFIG_END = 127,
1: -	PIN_CONFIG_MAX = 255,
1: +  PIN_CONFIG_BIAS_BUS_HOLD = 0,
1: +  PIN_CONFIG_BIAS_DISABLE = 1,
1: +  PIN_CONFIG_BIAS_HIGH_IMPEDANCE = 2,
1: +  PIN_CONFIG_BIAS_PULL_DOWN = 3,
1: +  PIN_CONFIG_BIAS_PULL_PIN_DEFAULT = 4,
1: +  PIN_CONFIG_BIAS_PULL_UP = 5,
1: +  PIN_CONFIG_DRIVE_OPEN_DRAIN = 6,
1: +  PIN_CONFIG_DRIVE_OPEN_SOURCE = 7,
1: +  PIN_CONFIG_DRIVE_PUSH_PULL = 8,
1: +  PIN_CONFIG_DRIVE_STRENGTH = 9,
1: +  PIN_CONFIG_DRIVE_STRENGTH_UA = 10,
1: +  PIN_CONFIG_INPUT_DEBOUNCE = 11,
1: +  PIN_CONFIG_INPUT_ENABLE = 12,
1: +  PIN_CONFIG_INPUT_SCHMITT = 13,
1: +  PIN_CONFIG_INPUT_SCHMITT_ENABLE = 14,
1: +  PIN_CONFIG_LOW_POWER_MODE = 15,
1: +  PIN_CONFIG_OUTPUT_ENABLE = 16,
1: +  PIN_CONFIG_OUTPUT = 17,
1: +  PIN_CONFIG_POWER_SOURCE = 18,
1: +  PIN_CONFIG_SLEEP_HARDWARE_STATE = 19,
1: +  PIN_CONFIG_SLEW_RATE = 20,
1: +  PIN_CONFIG_SKEW_DELAY = 21,
1: +  PIN_CONFIG_PERSIST_STATE = 22,
1: +  PIN_CONFIG_END = 127,
1: +  PIN_CONFIG_MAX = 255,
1:  };
1:  
1:  struct gpio_desc;
1:  
1:  struct gpio_device {
1: -	int id;
1: -	struct device dev;
1: -	struct cdev chrdev;
1: -	struct device *mockdev;
1: -	struct module *owner;
1: -	struct gpio_chip *chip;
1: -	struct gpio_desc *descs;
1: -	int base;
1: -	u16 ngpio;
1: -	const char *label;
1: -	void *data;
1: -	struct list_head list;
1: -	struct blocking_notifier_head notifier;
1: +  int id;
1: +  struct device dev;
1: +  struct cdev chrdev;
1: +  struct device *mockdev;
1: +  struct module *owner;
1: +  struct gpio_chip *chip;
1: +  struct gpio_desc *descs;
1: +  int base;
1: +  u16 ngpio;
1: +  const char *label;
1: +  void *data;
1: +  struct list_head list;
1: +  struct blocking_notifier_head notifier;
1:  };
1:  
1:  struct gpio_array;
1:  
1:  struct gpio_descs {
1: -	struct gpio_array *info;
1: -	unsigned int ndescs;
1: -	struct gpio_desc *desc[0];
1: +  struct gpio_array *info;
1: +  unsigned int ndescs;
1: +  struct gpio_desc *desc[0];
1:  };
1:  
1:  struct gpio_array {
1: -	struct gpio_desc **desc;
1: -	unsigned int size;
1: -	struct gpio_chip *chip;
1: -	long unsigned int *get_mask;
1: -	long unsigned int *set_mask;
1: -	long unsigned int invert_mask[0];
1: +  struct gpio_desc **desc;
1: +  unsigned int size;
1: +  struct gpio_chip *chip;
1: +  long unsigned int *get_mask;
1: +  long unsigned int *set_mask;
1: +  long unsigned int invert_mask[0];
1:  };
1:  
1:  struct gpio_desc {
1: -	struct gpio_device *gdev;
1: -	long unsigned int flags;
1: -	const char *label;
1: -	const char *name;
1: -	unsigned int debounce_period_us;
1: +  struct gpio_device *gdev;
1: +  long unsigned int flags;
1: +  const char *label;
1: +  const char *name;
1: +  unsigned int debounce_period_us;
1:  };
1:  
1:  enum gpiod_flags {
1: -	GPIOD_ASIS = 0,
1: -	GPIOD_IN = 1,
1: -	GPIOD_OUT_LOW = 3,
1: -	GPIOD_OUT_HIGH = 7,
1: -	GPIOD_OUT_LOW_OPEN_DRAIN = 11,
1: -	GPIOD_OUT_HIGH_OPEN_DRAIN = 15,
1: +  GPIOD_ASIS = 0,
1: +  GPIOD_IN = 1,
1: +  GPIOD_OUT_LOW = 3,
1: +  GPIOD_OUT_HIGH = 7,
1: +  GPIOD_OUT_LOW_OPEN_DRAIN = 11,
1: +  GPIOD_OUT_HIGH_OPEN_DRAIN = 15,
1:  };
1:  
1:  struct acpi_gpio_params {
1: -	unsigned int crs_entry_index;
1: -	unsigned int line_index;
1: -	bool active_low;
1: +  unsigned int crs_entry_index;
1: +  unsigned int line_index;
1: +  bool active_low;
1:  };
1:  
1:  struct acpi_gpio_mapping {
1: -	const char *name;
1: -	const struct acpi_gpio_params *data;
1: -	unsigned int size;
1: -	unsigned int quirks;
1: +  const char *name;
1: +  const struct acpi_gpio_params *data;
1: +  unsigned int size;
1: +  unsigned int quirks;
1:  };
1:  
1:  typedef u64 acpi_io_address;
1: @@ -67742,85 +68740,85 @@ typedef u64 acpi_io_address;
1:  typedef u32 acpi_object_type;
1:  
1:  union acpi_object {
1: -	acpi_object_type type;
1: -	struct {
1: -		acpi_object_type type;
1: -		u64 value;
1: -	} integer;
1: -	struct {
1: -		acpi_object_type type;
1: -		u32 length;
1: -		char *pointer;
1: -	} string;
1: -	struct {
1: -		acpi_object_type type;
1: -		u32 length;
1: -		u8 *pointer;
1: -	} buffer;
1: -	struct {
1: -		acpi_object_type type;
1: -		u32 count;
1: -		union acpi_object *elements;
1: -	} package;
1: -	struct {
1: -		acpi_object_type type;
1: -		acpi_object_type actual_type;
1: -		acpi_handle handle;
1: -	} reference;
1: -	struct {
1: -		acpi_object_type type;
1: -		u32 proc_id;
1: -		acpi_io_address pblk_address;
1: -		u32 pblk_length;
1: -	} processor;
1: -	struct {
1: -		acpi_object_type type;
1: -		u32 system_level;
1: -		u32 resource_order;
1: -	} power_resource;
1: +  acpi_object_type type;
1: +  struct {
1: +    acpi_object_type type;
1: +    u64 value;
1: +  } integer;
1: +  struct {
1: +    acpi_object_type type;
1: +    u32 length;
1: +    char *pointer;
1: +  } string;
1: +  struct {
1: +    acpi_object_type type;
1: +    u32 length;
1: +    u8 *pointer;
1: +  } buffer;
1: +  struct {
1: +    acpi_object_type type;
1: +    u32 count;
1: +    union acpi_object *elements;
1: +  } package;
1: +  struct {
1: +    acpi_object_type type;
1: +    acpi_object_type actual_type;
1: +    acpi_handle handle;
1: +  } reference;
1: +  struct {
1: +    acpi_object_type type;
1: +    u32 proc_id;
1: +    acpi_io_address pblk_address;
1: +    u32 pblk_length;
1: +  } processor;
1: +  struct {
1: +    acpi_object_type type;
1: +    u32 system_level;
1: +    u32 resource_order;
1: +  } power_resource;
1:  };
1:  
1:  struct acpi_hotplug_profile {
1: -	struct kobject kobj;
1: -	int (*scan_dependent)(struct acpi_device *);
1: -	void (*notify_online)(struct acpi_device *);
1: -	bool enabled: 1;
1: -	bool demand_offline: 1;
1: +  struct kobject kobj;
1: +  int (*scan_dependent)(struct acpi_device *);
1: +  void (*notify_online)(struct acpi_device *);
1: +  bool enabled : 1;
1: +  bool demand_offline : 1;
1:  };
1:  
1:  struct acpi_device_status {
1: -	u32 present: 1;
1: -	u32 enabled: 1;
1: -	u32 show_in_ui: 1;
1: -	u32 functional: 1;
1: -	u32 battery_present: 1;
1: -	u32 reserved: 27;
1: +  u32 present : 1;
1: +  u32 enabled : 1;
1: +  u32 show_in_ui : 1;
1: +  u32 functional : 1;
1: +  u32 battery_present : 1;
1: +  u32 reserved : 27;
1:  };
1:  
1:  struct acpi_device_flags {
1: -	u32 dynamic_status: 1;
1: -	u32 removable: 1;
1: -	u32 ejectable: 1;
1: -	u32 power_manageable: 1;
1: -	u32 match_driver: 1;
1: -	u32 initialized: 1;
1: -	u32 visited: 1;
1: -	u32 hotplug_notify: 1;
1: -	u32 is_dock_station: 1;
1: -	u32 of_compatible_ok: 1;
1: -	u32 coherent_dma: 1;
1: -	u32 cca_seen: 1;
1: -	u32 enumeration_by_parent: 1;
1: -	u32 reserved: 19;
1: +  u32 dynamic_status : 1;
1: +  u32 removable : 1;
1: +  u32 ejectable : 1;
1: +  u32 power_manageable : 1;
1: +  u32 match_driver : 1;
1: +  u32 initialized : 1;
1: +  u32 visited : 1;
1: +  u32 hotplug_notify : 1;
1: +  u32 is_dock_station : 1;
1: +  u32 of_compatible_ok : 1;
1: +  u32 coherent_dma : 1;
1: +  u32 cca_seen : 1;
1: +  u32 enumeration_by_parent : 1;
1: +  u32 reserved : 19;
1:  };
1:  
1:  typedef char acpi_bus_id[8];
1:  
1:  struct acpi_pnp_type {
1: -	u32 hardware_id: 1;
1: -	u32 bus_address: 1;
1: -	u32 platform_id: 1;
1: -	u32 reserved: 29;
1: +  u32 hardware_id : 1;
1: +  u32 bus_address : 1;
1: +  u32 platform_id : 1;
1: +  u32 reserved : 29;
1:  };
1:  
1:  typedef u64 acpi_bus_address;
1: @@ -67830,87 +68828,87 @@ typedef char acpi_device_name[40];
1:  typedef char acpi_device_class[20];
1:  
1:  struct acpi_device_pnp {
1: -	acpi_bus_id bus_id;
1: -	struct acpi_pnp_type type;
1: -	acpi_bus_address bus_address;
1: -	char *unique_id;
1: -	struct list_head ids;
1: -	acpi_device_name device_name;
1: -	acpi_device_class device_class;
1: -	union acpi_object *str_obj;
1: +  acpi_bus_id bus_id;
1: +  struct acpi_pnp_type type;
1: +  acpi_bus_address bus_address;
1: +  char *unique_id;
1: +  struct list_head ids;
1: +  acpi_device_name device_name;
1: +  acpi_device_class device_class;
1: +  union acpi_object *str_obj;
1:  };
1:  
1:  struct acpi_device_power_flags {
1: -	u32 explicit_get: 1;
1: -	u32 power_resources: 1;
1: -	u32 inrush_current: 1;
1: -	u32 power_removed: 1;
1: -	u32 ignore_parent: 1;
1: -	u32 dsw_present: 1;
1: -	u32 reserved: 26;
1: +  u32 explicit_get : 1;
1: +  u32 power_resources : 1;
1: +  u32 inrush_current : 1;
1: +  u32 power_removed : 1;
1: +  u32 ignore_parent : 1;
1: +  u32 dsw_present : 1;
1: +  u32 reserved : 26;
1:  };
1:  
1:  struct acpi_device_power_state {
1: -	struct {
1: -		u8 valid: 1;
1: -		u8 explicit_set: 1;
1: -		u8 reserved: 6;
1: -	} flags;
1: -	int power;
1: -	int latency;
1: -	struct list_head resources;
1: +  struct {
1: +    u8 valid : 1;
1: +    u8 explicit_set : 1;
1: +    u8 reserved : 6;
1: +  } flags;
1: +  int power;
1: +  int latency;
1: +  struct list_head resources;
1:  };
1:  
1:  struct acpi_device_power {
1: -	int state;
1: -	struct acpi_device_power_flags flags;
1: -	struct acpi_device_power_state states[5];
1: +  int state;
1: +  struct acpi_device_power_flags flags;
1: +  struct acpi_device_power_state states[5];
1:  };
1:  
1:  struct acpi_device_wakeup_flags {
1: -	u8 valid: 1;
1: -	u8 notifier_present: 1;
1: +  u8 valid : 1;
1: +  u8 notifier_present : 1;
1:  };
1:  
1:  struct acpi_device_wakeup_context {
1: -	void (*func)(struct acpi_device_wakeup_context *);
1: -	struct device *dev;
1: +  void (*func)(struct acpi_device_wakeup_context *);
1: +  struct device *dev;
1:  };
1:  
1:  struct acpi_device_wakeup {
1: -	acpi_handle gpe_device;
1: -	u64 gpe_number;
1: -	u64 sleep_state;
1: -	struct list_head resources;
1: -	struct acpi_device_wakeup_flags flags;
1: -	struct acpi_device_wakeup_context context;
1: -	struct wakeup_source *ws;
1: -	int prepare_count;
1: -	int enable_count;
1: +  acpi_handle gpe_device;
1: +  u64 gpe_number;
1: +  u64 sleep_state;
1: +  struct list_head resources;
1: +  struct acpi_device_wakeup_flags flags;
1: +  struct acpi_device_wakeup_context context;
1: +  struct wakeup_source *ws;
1: +  int prepare_count;
1: +  int enable_count;
1:  };
1:  
1:  struct acpi_device_perf_flags {
1: -	u8 reserved: 8;
1: +  u8 reserved : 8;
1:  };
1:  
1:  struct acpi_device_perf_state;
1:  
1:  struct acpi_device_perf {
1: -	int state;
1: -	struct acpi_device_perf_flags flags;
1: -	int state_count;
1: -	struct acpi_device_perf_state *states;
1: +  int state;
1: +  struct acpi_device_perf_flags flags;
1: +  int state_count;
1: +  struct acpi_device_perf_state *states;
1:  };
1:  
1:  struct acpi_device_dir {
1: -	struct proc_dir_entry *entry;
1: +  struct proc_dir_entry *entry;
1:  };
1:  
1:  struct acpi_device_data {
1: -	const union acpi_object *pointer;
1: -	struct list_head properties;
1: -	const union acpi_object *of_compatible;
1: -	struct list_head subnodes;
1: +  const union acpi_object *pointer;
1: +  struct list_head properties;
1: +  const union acpi_object *of_compatible;
1: +  struct list_head subnodes;
1:  };
1:  
1:  struct acpi_scan_handler;
1: @@ -67920,51 +68918,51 @@ struct acpi_hotplug_context;
1:  struct acpi_driver;
1:  
1:  struct acpi_device {
1: -	int device_type;
1: -	acpi_handle handle;
1: -	struct fwnode_handle fwnode;
1: -	struct acpi_device *parent;
1: -	struct list_head children;
1: -	struct list_head node;
1: -	struct list_head wakeup_list;
1: -	struct list_head del_list;
1: -	struct acpi_device_status status;
1: -	struct acpi_device_flags flags;
1: -	struct acpi_device_pnp pnp;
1: -	struct acpi_device_power power;
1: -	struct acpi_device_wakeup wakeup;
1: -	struct acpi_device_perf performance;
1: -	struct acpi_device_dir dir;
1: -	struct acpi_device_data data;
1: -	struct acpi_scan_handler *handler;
1: -	struct acpi_hotplug_context *hp;
1: -	struct acpi_driver *driver;
1: -	const struct acpi_gpio_mapping *driver_gpios;
1: -	void *driver_data;
1: -	struct device dev;
1: -	unsigned int physical_node_count;
1: -	unsigned int dep_unmet;
1: -	struct list_head physical_node_list;
1: -	struct mutex physical_node_lock;
1: -	void (*remove)(struct acpi_device *);
1: +  int device_type;
1: +  acpi_handle handle;
1: +  struct fwnode_handle fwnode;
1: +  struct acpi_device *parent;
1: +  struct list_head children;
1: +  struct list_head node;
1: +  struct list_head wakeup_list;
1: +  struct list_head del_list;
1: +  struct acpi_device_status status;
1: +  struct acpi_device_flags flags;
1: +  struct acpi_device_pnp pnp;
1: +  struct acpi_device_power power;
1: +  struct acpi_device_wakeup wakeup;
1: +  struct acpi_device_perf performance;
1: +  struct acpi_device_dir dir;
1: +  struct acpi_device_data data;
1: +  struct acpi_scan_handler *handler;
1: +  struct acpi_hotplug_context *hp;
1: +  struct acpi_driver *driver;
1: +  const struct acpi_gpio_mapping *driver_gpios;
1: +  void *driver_data;
1: +  struct device dev;
1: +  unsigned int physical_node_count;
1: +  unsigned int dep_unmet;
1: +  struct list_head physical_node_list;
1: +  struct mutex physical_node_lock;
1: +  void (*remove)(struct acpi_device *);
1:  };
1:  
1:  struct acpi_scan_handler {
1: -	const struct acpi_device_id *ids;
1: -	struct list_head list_node;
1: -	bool (*match)(const char *, const struct acpi_device_id **);
1: -	int (*attach)(struct acpi_device *, const struct acpi_device_id *);
1: -	void (*detach)(struct acpi_device *);
1: -	void (*bind)(struct device *);
1: -	void (*unbind)(struct device *);
1: -	struct acpi_hotplug_profile hotplug;
1: +  const struct acpi_device_id *ids;
1: +  struct list_head list_node;
1: +  bool (*match)(const char *, const struct acpi_device_id **);
1: +  int (*attach)(struct acpi_device *, const struct acpi_device_id *);
1: +  void (*detach)(struct acpi_device *);
1: +  void (*bind)(struct device *);
1: +  void (*unbind)(struct device *);
1: +  struct acpi_hotplug_profile hotplug;
1:  };
1:  
1:  struct acpi_hotplug_context {
1: -	struct acpi_device *self;
1: -	int (*notify)(struct acpi_device *, u32);
1: -	void (*uevent)(struct acpi_device *, u32);
1: -	void (*fixup)(struct acpi_device *);
1: +  struct acpi_device *self;
1: +  int (*notify)(struct acpi_device *, u32);
1: +  void (*uevent)(struct acpi_device *, u32);
1: +  void (*fixup)(struct acpi_device *);
1:  };
1:  
1:  typedef int (*acpi_op_add)(struct acpi_device *);
1: @@ -67974,96 +68972,96 @@ typedef int (*acpi_op_remove)(struct acpi_device *);
1:  typedef void (*acpi_op_notify)(struct acpi_device *, u32);
1:  
1:  struct acpi_device_ops {
1: -	acpi_op_add add;
1: -	acpi_op_remove remove;
1: -	acpi_op_notify notify;
1: +  acpi_op_add add;
1: +  acpi_op_remove remove;
1: +  acpi_op_notify notify;
1:  };
1:  
1:  struct acpi_driver {
1: -	char name[80];
1: -	char class[80];
1: -	const struct acpi_device_id *ids;
1: -	unsigned int flags;
1: -	struct acpi_device_ops ops;
1: -	struct device_driver drv;
1: -	struct module *owner;
1: +  char name[80];
1: +  char class[80];
1: +  const struct acpi_device_id *ids;
1: +  unsigned int flags;
1: +  struct acpi_device_ops ops;
1: +  struct device_driver drv;
1: +  struct module *owner;
1:  };
1:  
1:  struct acpi_device_perf_state {
1: -	struct {
1: -		u8 valid: 1;
1: -		u8 reserved: 7;
1: -	} flags;
1: -	u8 power;
1: -	u8 performance;
1: -	int latency;
1: +  struct {
1: +    u8 valid : 1;
1: +    u8 reserved : 7;
1: +  } flags;
1: +  u8 power;
1: +  u8 performance;
1: +  int latency;
1:  };
1:  
1:  enum gpio_lookup_flags {
1: -	GPIO_ACTIVE_HIGH = 0,
1: -	GPIO_ACTIVE_LOW = 1,
1: -	GPIO_OPEN_DRAIN = 2,
1: -	GPIO_OPEN_SOURCE = 4,
1: -	GPIO_PERSISTENT = 0,
1: -	GPIO_TRANSITORY = 8,
1: -	GPIO_PULL_UP = 16,
1: -	GPIO_PULL_DOWN = 32,
1: -	GPIO_LOOKUP_FLAGS_DEFAULT = 0,
1: +  GPIO_ACTIVE_HIGH = 0,
1: +  GPIO_ACTIVE_LOW = 1,
1: +  GPIO_OPEN_DRAIN = 2,
1: +  GPIO_OPEN_SOURCE = 4,
1: +  GPIO_PERSISTENT = 0,
1: +  GPIO_TRANSITORY = 8,
1: +  GPIO_PULL_UP = 16,
1: +  GPIO_PULL_DOWN = 32,
1: +  GPIO_LOOKUP_FLAGS_DEFAULT = 0,
1:  };
1:  
1:  struct gpiod_lookup {
1: -	const char *key;
1: -	u16 chip_hwnum;
1: -	const char *con_id;
1: -	unsigned int idx;
1: -	long unsigned int flags;
1: +  const char *key;
1: +  u16 chip_hwnum;
1: +  const char *con_id;
1: +  unsigned int idx;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct gpiod_lookup_table {
1: -	struct list_head list;
1: -	const char *dev_id;
1: -	struct gpiod_lookup table[0];
1: +  struct list_head list;
1: +  const char *dev_id;
1: +  struct gpiod_lookup table[0];
1:  };
1:  
1:  struct gpiod_hog {
1: -	struct list_head list;
1: -	const char *chip_label;
1: -	u16 chip_hwnum;
1: -	const char *line_name;
1: -	long unsigned int lflags;
1: -	int dflags;
1: +  struct list_head list;
1: +  const char *chip_label;
1: +  u16 chip_hwnum;
1: +  const char *line_name;
1: +  long unsigned int lflags;
1: +  int dflags;
1:  };
1:  
1:  enum {
1: -	GPIOLINE_CHANGED_REQUESTED = 1,
1: -	GPIOLINE_CHANGED_RELEASED = 2,
1: -	GPIOLINE_CHANGED_CONFIG = 3,
1: +  GPIOLINE_CHANGED_REQUESTED = 1,
1: +  GPIOLINE_CHANGED_RELEASED = 2,
1: +  GPIOLINE_CHANGED_CONFIG = 3,
1:  };
1:  
1:  struct acpi_gpio_info {
1: -	struct acpi_device *adev;
1: -	enum gpiod_flags flags;
1: -	bool gpioint;
1: -	int pin_config;
1: -	int polarity;
1: -	int triggering;
1: -	unsigned int quirks;
1: +  struct acpi_device *adev;
1: +  enum gpiod_flags flags;
1: +  bool gpioint;
1: +  int pin_config;
1: +  int polarity;
1: +  int triggering;
1: +  unsigned int quirks;
1:  };
1:  
1:  struct trace_event_raw_gpio_direction {
1: -	struct trace_entry ent;
1: -	unsigned int gpio;
1: -	int in;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int gpio;
1: +  int in;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_gpio_value {
1: -	struct trace_entry ent;
1: -	unsigned int gpio;
1: -	int get;
1: -	int value;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int gpio;
1: +  int get;
1: +  int value;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_gpio_direction {};
1: @@ -68077,1943 +69075,1946 @@ typedef void (*btf_trace_gpio_value)(void *, unsigned int, int, int);
1:  struct devres;
1:  
1:  struct gpio {
1: -	unsigned int gpio;
1: -	long unsigned int flags;
1: -	const char *label;
1: +  unsigned int gpio;
1: +  long unsigned int flags;
1: +  const char *label;
1:  };
1:  
1:  struct gpiochip_info {
1: -	char name[32];
1: -	char label[32];
1: -	__u32 lines;
1: +  char name[32];
1: +  char label[32];
1: +  __u32 lines;
1:  };
1:  
1:  enum gpio_v2_line_flag {
1: -	GPIO_V2_LINE_FLAG_USED = 1,
1: -	GPIO_V2_LINE_FLAG_ACTIVE_LOW = 2,
1: -	GPIO_V2_LINE_FLAG_INPUT = 4,
1: -	GPIO_V2_LINE_FLAG_OUTPUT = 8,
1: -	GPIO_V2_LINE_FLAG_EDGE_RISING = 16,
1: -	GPIO_V2_LINE_FLAG_EDGE_FALLING = 32,
1: -	GPIO_V2_LINE_FLAG_OPEN_DRAIN = 64,
1: -	GPIO_V2_LINE_FLAG_OPEN_SOURCE = 128,
1: -	GPIO_V2_LINE_FLAG_BIAS_PULL_UP = 256,
1: -	GPIO_V2_LINE_FLAG_BIAS_PULL_DOWN = 512,
1: -	GPIO_V2_LINE_FLAG_BIAS_DISABLED = 1024,
1: +  GPIO_V2_LINE_FLAG_USED = 1,
1: +  GPIO_V2_LINE_FLAG_ACTIVE_LOW = 2,
1: +  GPIO_V2_LINE_FLAG_INPUT = 4,
1: +  GPIO_V2_LINE_FLAG_OUTPUT = 8,
1: +  GPIO_V2_LINE_FLAG_EDGE_RISING = 16,
1: +  GPIO_V2_LINE_FLAG_EDGE_FALLING = 32,
1: +  GPIO_V2_LINE_FLAG_OPEN_DRAIN = 64,
1: +  GPIO_V2_LINE_FLAG_OPEN_SOURCE = 128,
1: +  GPIO_V2_LINE_FLAG_BIAS_PULL_UP = 256,
1: +  GPIO_V2_LINE_FLAG_BIAS_PULL_DOWN = 512,
1: +  GPIO_V2_LINE_FLAG_BIAS_DISABLED = 1024,
1:  };
1:  
1:  struct gpio_v2_line_values {
1: -	__u64 bits;
1: -	__u64 mask;
1: +  __u64 bits;
1: +  __u64 mask;
1:  };
1:  
1:  enum gpio_v2_line_attr_id {
1: -	GPIO_V2_LINE_ATTR_ID_FLAGS = 1,
1: -	GPIO_V2_LINE_ATTR_ID_OUTPUT_VALUES = 2,
1: -	GPIO_V2_LINE_ATTR_ID_DEBOUNCE = 3,
1: +  GPIO_V2_LINE_ATTR_ID_FLAGS = 1,
1: +  GPIO_V2_LINE_ATTR_ID_OUTPUT_VALUES = 2,
1: +  GPIO_V2_LINE_ATTR_ID_DEBOUNCE = 3,
1:  };
1:  
1:  struct gpio_v2_line_attribute {
1: -	__u32 id;
1: -	__u32 padding;
1: -	union {
1: -		__u64 flags;
1: -		__u64 values;
1: -		__u32 debounce_period_us;
1: -	};
1: +  __u32 id;
1: +  __u32 padding;
1: +  union {
1: +    __u64 flags;
1: +    __u64 values;
1: +    __u32 debounce_period_us;
1: +  };
1:  };
1:  
1:  struct gpio_v2_line_config_attribute {
1: -	struct gpio_v2_line_attribute attr;
1: -	__u64 mask;
1: +  struct gpio_v2_line_attribute attr;
1: +  __u64 mask;
1:  };
1:  
1:  struct gpio_v2_line_config {
1: -	__u64 flags;
1: -	__u32 num_attrs;
1: -	__u32 padding[5];
1: -	struct gpio_v2_line_config_attribute attrs[10];
1: +  __u64 flags;
1: +  __u32 num_attrs;
1: +  __u32 padding[5];
1: +  struct gpio_v2_line_config_attribute attrs[10];
1:  };
1:  
1:  struct gpio_v2_line_request {
1: -	__u32 offsets[64];
1: -	char consumer[32];
1: -	struct gpio_v2_line_config config;
1: -	__u32 num_lines;
1: -	__u32 event_buffer_size;
1: -	__u32 padding[5];
1: -	__s32 fd;
1: +  __u32 offsets[64];
1: +  char consumer[32];
1: +  struct gpio_v2_line_config config;
1: +  __u32 num_lines;
1: +  __u32 event_buffer_size;
1: +  __u32 padding[5];
1: +  __s32 fd;
1:  };
1:  
1:  struct gpio_v2_line_info {
1: -	char name[32];
1: -	char consumer[32];
1: -	__u32 offset;
1: -	__u32 num_attrs;
1: -	__u64 flags;
1: -	struct gpio_v2_line_attribute attrs[10];
1: -	__u32 padding[4];
1: +  char name[32];
1: +  char consumer[32];
1: +  __u32 offset;
1: +  __u32 num_attrs;
1: +  __u64 flags;
1: +  struct gpio_v2_line_attribute attrs[10];
1: +  __u32 padding[4];
1:  };
1:  
1:  enum gpio_v2_line_changed_type {
1: -	GPIO_V2_LINE_CHANGED_REQUESTED = 1,
1: -	GPIO_V2_LINE_CHANGED_RELEASED = 2,
1: -	GPIO_V2_LINE_CHANGED_CONFIG = 3,
1: +  GPIO_V2_LINE_CHANGED_REQUESTED = 1,
1: +  GPIO_V2_LINE_CHANGED_RELEASED = 2,
1: +  GPIO_V2_LINE_CHANGED_CONFIG = 3,
1:  };
1:  
1:  struct gpio_v2_line_info_changed {
1: -	struct gpio_v2_line_info info;
1: -	__u64 timestamp_ns;
1: -	__u32 event_type;
1: -	__u32 padding[5];
1: +  struct gpio_v2_line_info info;
1: +  __u64 timestamp_ns;
1: +  __u32 event_type;
1: +  __u32 padding[5];
1:  };
1:  
1:  enum gpio_v2_line_event_id {
1: -	GPIO_V2_LINE_EVENT_RISING_EDGE = 1,
1: -	GPIO_V2_LINE_EVENT_FALLING_EDGE = 2,
1: +  GPIO_V2_LINE_EVENT_RISING_EDGE = 1,
1: +  GPIO_V2_LINE_EVENT_FALLING_EDGE = 2,
1:  };
1:  
1:  struct gpio_v2_line_event {
1: -	__u64 timestamp_ns;
1: -	__u32 id;
1: -	__u32 offset;
1: -	__u32 seqno;
1: -	__u32 line_seqno;
1: -	__u32 padding[6];
1: +  __u64 timestamp_ns;
1: +  __u32 id;
1: +  __u32 offset;
1: +  __u32 seqno;
1: +  __u32 line_seqno;
1: +  __u32 padding[6];
1:  };
1:  
1:  struct gpioline_info {
1: -	__u32 line_offset;
1: -	__u32 flags;
1: -	char name[32];
1: -	char consumer[32];
1: +  __u32 line_offset;
1: +  __u32 flags;
1: +  char name[32];
1: +  char consumer[32];
1:  };
1:  
1:  struct gpioline_info_changed {
1: -	struct gpioline_info info;
1: -	__u64 timestamp;
1: -	__u32 event_type;
1: -	__u32 padding[5];
1: +  struct gpioline_info info;
1: +  __u64 timestamp;
1: +  __u32 event_type;
1: +  __u32 padding[5];
1:  };
1:  
1:  struct gpiohandle_request {
1: -	__u32 lineoffsets[64];
1: -	__u32 flags;
1: -	__u8 default_values[64];
1: -	char consumer_label[32];
1: -	__u32 lines;
1: -	int fd;
1: +  __u32 lineoffsets[64];
1: +  __u32 flags;
1: +  __u8 default_values[64];
1: +  char consumer_label[32];
1: +  __u32 lines;
1: +  int fd;
1:  };
1:  
1:  struct gpiohandle_config {
1: -	__u32 flags;
1: -	__u8 default_values[64];
1: -	__u32 padding[4];
1: +  __u32 flags;
1: +  __u8 default_values[64];
1: +  __u32 padding[4];
1:  };
1:  
1:  struct gpiohandle_data {
1: -	__u8 values[64];
1: +  __u8 values[64];
1:  };
1:  
1:  struct gpioevent_request {
1: -	__u32 lineoffset;
1: -	__u32 handleflags;
1: -	__u32 eventflags;
1: -	char consumer_label[32];
1: -	int fd;
1: +  __u32 lineoffset;
1: +  __u32 handleflags;
1: +  __u32 eventflags;
1: +  char consumer_label[32];
1: +  int fd;
1:  };
1:  
1:  struct gpioevent_data {
1: -	__u64 timestamp;
1: -	__u32 id;
1: +  __u64 timestamp;
1: +  __u32 id;
1:  };
1:  
1:  struct linehandle_state {
1: -	struct gpio_device *gdev;
1: -	const char *label;
1: -	struct gpio_desc *descs[64];
1: -	u32 num_descs;
1: +  struct gpio_device *gdev;
1: +  const char *label;
1: +  struct gpio_desc *descs[64];
1: +  u32 num_descs;
1:  };
1:  
1:  struct linereq;
1:  
1:  struct line {
1: -	struct gpio_desc *desc;
1: -	struct linereq *req;
1: -	unsigned int irq;
1: -	u64 eflags;
1: -	u64 timestamp_ns;
1: -	u32 req_seqno;
1: -	u32 line_seqno;
1: -	struct delayed_work work;
1: -	unsigned int sw_debounced;
1: -	unsigned int level;
1: +  struct gpio_desc *desc;
1: +  struct linereq *req;
1: +  unsigned int irq;
1: +  u64 eflags;
1: +  u64 timestamp_ns;
1: +  u32 req_seqno;
1: +  u32 line_seqno;
1: +  struct delayed_work work;
1: +  unsigned int sw_debounced;
1: +  unsigned int level;
1:  };
1:  
1:  struct linereq {
1: -	struct gpio_device *gdev;
1: -	const char *label;
1: -	u32 num_lines;
1: -	wait_queue_head_t wait;
1: -	u32 event_buffer_size;
1: -	struct {
1: -		union {
1: -			struct __kfifo kfifo;
1: -			struct gpio_v2_line_event *type;
1: -			const struct gpio_v2_line_event *const_type;
1: -			char (*rectype)[0];
1: -			struct gpio_v2_line_event *ptr;
1: -			const struct gpio_v2_line_event *ptr_const;
1: -		};
1: -		struct gpio_v2_line_event buf[0];
1: -	} events;
1: -	atomic_t seqno;
1: -	struct mutex config_mutex;
1: -	struct line lines[0];
1: +  struct gpio_device *gdev;
1: +  const char *label;
1: +  u32 num_lines;
1: +  wait_queue_head_t wait;
1: +  u32 event_buffer_size;
1: +  struct {
1: +    union {
1: +      struct __kfifo kfifo;
1: +      struct gpio_v2_line_event *type;
1: +      const struct gpio_v2_line_event *const_type;
1: +      char (*rectype)[0];
1: +      struct gpio_v2_line_event *ptr;
1: +      const struct gpio_v2_line_event *ptr_const;
1: +    };
1: +    struct gpio_v2_line_event buf[0];
1: +  } events;
1: +  atomic_t seqno;
1: +  struct mutex config_mutex;
1: +  struct line lines[0];
1:  };
1:  
1:  struct lineevent_state {
1: -	struct gpio_device *gdev;
1: -	const char *label;
1: -	struct gpio_desc *desc;
1: -	u32 eflags;
1: -	int irq;
1: -	wait_queue_head_t wait;
1: -	struct {
1: -		union {
1: -			struct __kfifo kfifo;
1: -			struct gpioevent_data *type;
1: -			const struct gpioevent_data *const_type;
1: -			char (*rectype)[0];
1: -			struct gpioevent_data *ptr;
1: -			const struct gpioevent_data *ptr_const;
1: -		};
1: -		struct gpioevent_data buf[16];
1: -	} events;
1: -	u64 timestamp;
1: +  struct gpio_device *gdev;
1: +  const char *label;
1: +  struct gpio_desc *desc;
1: +  u32 eflags;
1: +  int irq;
1: +  wait_queue_head_t wait;
1: +  struct {
1: +    union {
1: +      struct __kfifo kfifo;
1: +      struct gpioevent_data *type;
1: +      const struct gpioevent_data *const_type;
1: +      char (*rectype)[0];
1: +      struct gpioevent_data *ptr;
1: +      const struct gpioevent_data *ptr_const;
1: +    };
1: +    struct gpioevent_data buf[16];
1: +  } events;
1: +  u64 timestamp;
1:  };
1:  
1:  struct gpio_chardev_data {
1: -	struct gpio_device *gdev;
1: -	wait_queue_head_t wait;
1: -	struct {
1: -		union {
1: -			struct __kfifo kfifo;
1: -			struct gpio_v2_line_info_changed *type;
1: -			const struct gpio_v2_line_info_changed *const_type;
1: -			char (*rectype)[0];
1: -			struct gpio_v2_line_info_changed *ptr;
1: -			const struct gpio_v2_line_info_changed *ptr_const;
1: -		};
1: -		struct gpio_v2_line_info_changed buf[32];
1: -	} events;
1: -	struct notifier_block lineinfo_changed_nb;
1: -	long unsigned int *watched_lines;
1: -	atomic_t watch_abi_version;
1: +  struct gpio_device *gdev;
1: +  wait_queue_head_t wait;
1: +  struct {
1: +    union {
1: +      struct __kfifo kfifo;
1: +      struct gpio_v2_line_info_changed *type;
1: +      const struct gpio_v2_line_info_changed *const_type;
1: +      char (*rectype)[0];
1: +      struct gpio_v2_line_info_changed *ptr;
1: +      const struct gpio_v2_line_info_changed *ptr_const;
1: +    };
1: +    struct gpio_v2_line_info_changed buf[32];
1: +  } events;
1: +  struct notifier_block lineinfo_changed_nb;
1: +  long unsigned int *watched_lines;
1: +  atomic_t watch_abi_version;
1:  };
1:  
1:  struct class_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct class *, struct class_attribute *, char *);
1: -	ssize_t (*store)(struct class *, struct class_attribute *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct class *, struct class_attribute *, char *);
1: +  ssize_t (*store)(struct class *, struct class_attribute *, const char *,
1: +                   size_t);
1:  };
1:  
1:  struct gpiod_data {
1: -	struct gpio_desc *desc;
1: -	struct mutex mutex;
1: -	struct kernfs_node *value_kn;
1: -	int irq;
1: -	unsigned char irq_flags;
1: -	bool direction_can_change;
1: +  struct gpio_desc *desc;
1: +  struct mutex mutex;
1: +  struct kernfs_node *value_kn;
1: +  int irq;
1: +  unsigned char irq_flags;
1: +  bool direction_can_change;
1:  };
1:  
1:  struct acpi_connection_info {
1: -	u8 *connection;
1: -	u16 length;
1: -	u8 access_length;
1: +  u8 *connection;
1: +  u16 length;
1: +  u8 access_length;
1:  };
1:  
1:  struct acpi_resource_irq {
1: -	u8 descriptor_length;
1: -	u8 triggering;
1: -	u8 polarity;
1: -	u8 shareable;
1: -	u8 wake_capable;
1: -	u8 interrupt_count;
1: -	u8 interrupts[1];
1: +  u8 descriptor_length;
1: +  u8 triggering;
1: +  u8 polarity;
1: +  u8 shareable;
1: +  u8 wake_capable;
1: +  u8 interrupt_count;
1: +  u8 interrupts[1];
1:  };
1:  
1:  struct acpi_resource_dma {
1: -	u8 type;
1: -	u8 bus_master;
1: -	u8 transfer;
1: -	u8 channel_count;
1: -	u8 channels[1];
1: +  u8 type;
1: +  u8 bus_master;
1: +  u8 transfer;
1: +  u8 channel_count;
1: +  u8 channels[1];
1:  };
1:  
1:  struct acpi_resource_start_dependent {
1: -	u8 descriptor_length;
1: -	u8 compatibility_priority;
1: -	u8 performance_robustness;
1: +  u8 descriptor_length;
1: +  u8 compatibility_priority;
1: +  u8 performance_robustness;
1:  };
1:  
1:  struct acpi_resource_io {
1: -	u8 io_decode;
1: -	u8 alignment;
1: -	u8 address_length;
1: -	u16 minimum;
1: -	u16 maximum;
1: +  u8 io_decode;
1: +  u8 alignment;
1: +  u8 address_length;
1: +  u16 minimum;
1: +  u16 maximum;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_fixed_io {
1: -	u16 address;
1: -	u8 address_length;
1: +  u16 address;
1: +  u8 address_length;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_fixed_dma {
1: -	u16 request_lines;
1: -	u16 channels;
1: -	u8 width;
1: +  u16 request_lines;
1: +  u16 channels;
1: +  u8 width;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_vendor {
1: -	u16 byte_length;
1: -	u8 byte_data[1];
1: +  u16 byte_length;
1: +  u8 byte_data[1];
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_vendor_typed {
1: -	u16 byte_length;
1: -	u8 uuid_subtype;
1: -	u8 uuid[16];
1: -	u8 byte_data[1];
1: +  u16 byte_length;
1: +  u8 uuid_subtype;
1: +  u8 uuid[16];
1: +  u8 byte_data[1];
1:  };
1:  
1:  struct acpi_resource_end_tag {
1: -	u8 checksum;
1: +  u8 checksum;
1:  };
1:  
1:  struct acpi_resource_memory24 {
1: -	u8 write_protect;
1: -	u16 minimum;
1: -	u16 maximum;
1: -	u16 alignment;
1: -	u16 address_length;
1: +  u8 write_protect;
1: +  u16 minimum;
1: +  u16 maximum;
1: +  u16 alignment;
1: +  u16 address_length;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_memory32 {
1: -	u8 write_protect;
1: -	u32 minimum;
1: -	u32 maximum;
1: -	u32 alignment;
1: -	u32 address_length;
1: +  u8 write_protect;
1: +  u32 minimum;
1: +  u32 maximum;
1: +  u32 alignment;
1: +  u32 address_length;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_fixed_memory32 {
1: -	u8 write_protect;
1: -	u32 address;
1: -	u32 address_length;
1: +  u8 write_protect;
1: +  u32 address;
1: +  u32 address_length;
1:  } __attribute__((packed));
1:  
1:  struct acpi_memory_attribute {
1: -	u8 write_protect;
1: -	u8 caching;
1: -	u8 range_type;
1: -	u8 translation;
1: +  u8 write_protect;
1: +  u8 caching;
1: +  u8 range_type;
1: +  u8 translation;
1:  };
1:  
1:  struct acpi_io_attribute {
1: -	u8 range_type;
1: -	u8 translation;
1: -	u8 translation_type;
1: -	u8 reserved1;
1: +  u8 range_type;
1: +  u8 translation;
1: +  u8 translation_type;
1: +  u8 reserved1;
1:  };
1:  
1:  union acpi_resource_attribute {
1: -	struct acpi_memory_attribute mem;
1: -	struct acpi_io_attribute io;
1: -	u8 type_specific;
1: +  struct acpi_memory_attribute mem;
1: +  struct acpi_io_attribute io;
1: +  u8 type_specific;
1:  };
1:  
1:  struct acpi_resource_label {
1: -	u16 string_length;
1: -	char *string_ptr;
1: +  u16 string_length;
1: +  char *string_ptr;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_source {
1: -	u8 index;
1: -	u16 string_length;
1: -	char *string_ptr;
1: +  u8 index;
1: +  u16 string_length;
1: +  char *string_ptr;
1:  } __attribute__((packed));
1:  
1:  struct acpi_address16_attribute {
1: -	u16 granularity;
1: -	u16 minimum;
1: -	u16 maximum;
1: -	u16 translation_offset;
1: -	u16 address_length;
1: +  u16 granularity;
1: +  u16 minimum;
1: +  u16 maximum;
1: +  u16 translation_offset;
1: +  u16 address_length;
1:  };
1:  
1:  struct acpi_address32_attribute {
1: -	u32 granularity;
1: -	u32 minimum;
1: -	u32 maximum;
1: -	u32 translation_offset;
1: -	u32 address_length;
1: +  u32 granularity;
1: +  u32 minimum;
1: +  u32 maximum;
1: +  u32 translation_offset;
1: +  u32 address_length;
1:  };
1:  
1:  struct acpi_address64_attribute {
1: -	u64 granularity;
1: -	u64 minimum;
1: -	u64 maximum;
1: -	u64 translation_offset;
1: -	u64 address_length;
1: +  u64 granularity;
1: +  u64 minimum;
1: +  u64 maximum;
1: +  u64 translation_offset;
1: +  u64 address_length;
1:  };
1:  
1:  struct acpi_resource_address {
1: -	u8 resource_type;
1: -	u8 producer_consumer;
1: -	u8 decode;
1: -	u8 min_address_fixed;
1: -	u8 max_address_fixed;
1: -	union acpi_resource_attribute info;
1: +  u8 resource_type;
1: +  u8 producer_consumer;
1: +  u8 decode;
1: +  u8 min_address_fixed;
1: +  u8 max_address_fixed;
1: +  union acpi_resource_attribute info;
1:  };
1:  
1:  struct acpi_resource_address16 {
1: -	u8 resource_type;
1: -	u8 producer_consumer;
1: -	u8 decode;
1: -	u8 min_address_fixed;
1: -	u8 max_address_fixed;
1: -	union acpi_resource_attribute info;
1: -	struct acpi_address16_attribute address;
1: -	struct acpi_resource_source resource_source;
1: +  u8 resource_type;
1: +  u8 producer_consumer;
1: +  u8 decode;
1: +  u8 min_address_fixed;
1: +  u8 max_address_fixed;
1: +  union acpi_resource_attribute info;
1: +  struct acpi_address16_attribute address;
1: +  struct acpi_resource_source resource_source;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_address32 {
1: -	u8 resource_type;
1: -	u8 producer_consumer;
1: -	u8 decode;
1: -	u8 min_address_fixed;
1: -	u8 max_address_fixed;
1: -	union acpi_resource_attribute info;
1: -	struct acpi_address32_attribute address;
1: -	struct acpi_resource_source resource_source;
1: +  u8 resource_type;
1: +  u8 producer_consumer;
1: +  u8 decode;
1: +  u8 min_address_fixed;
1: +  u8 max_address_fixed;
1: +  union acpi_resource_attribute info;
1: +  struct acpi_address32_attribute address;
1: +  struct acpi_resource_source resource_source;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_address64 {
1: -	u8 resource_type;
1: -	u8 producer_consumer;
1: -	u8 decode;
1: -	u8 min_address_fixed;
1: -	u8 max_address_fixed;
1: -	union acpi_resource_attribute info;
1: -	struct acpi_address64_attribute address;
1: -	struct acpi_resource_source resource_source;
1: +  u8 resource_type;
1: +  u8 producer_consumer;
1: +  u8 decode;
1: +  u8 min_address_fixed;
1: +  u8 max_address_fixed;
1: +  union acpi_resource_attribute info;
1: +  struct acpi_address64_attribute address;
1: +  struct acpi_resource_source resource_source;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_extended_address64 {
1: -	u8 resource_type;
1: -	u8 producer_consumer;
1: -	u8 decode;
1: -	u8 min_address_fixed;
1: -	u8 max_address_fixed;
1: -	union acpi_resource_attribute info;
1: -	u8 revision_ID;
1: -	struct acpi_address64_attribute address;
1: -	u64 type_specific;
1: +  u8 resource_type;
1: +  u8 producer_consumer;
1: +  u8 decode;
1: +  u8 min_address_fixed;
1: +  u8 max_address_fixed;
1: +  union acpi_resource_attribute info;
1: +  u8 revision_ID;
1: +  struct acpi_address64_attribute address;
1: +  u64 type_specific;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_extended_irq {
1: -	u8 producer_consumer;
1: -	u8 triggering;
1: -	u8 polarity;
1: -	u8 shareable;
1: -	u8 wake_capable;
1: -	u8 interrupt_count;
1: -	struct acpi_resource_source resource_source;
1: -	u32 interrupts[1];
1: +  u8 producer_consumer;
1: +  u8 triggering;
1: +  u8 polarity;
1: +  u8 shareable;
1: +  u8 wake_capable;
1: +  u8 interrupt_count;
1: +  struct acpi_resource_source resource_source;
1: +  u32 interrupts[1];
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_generic_register {
1: -	u8 space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 access_size;
1: -	u64 address;
1: +  u8 space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 access_size;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_gpio {
1: -	u8 revision_id;
1: -	u8 connection_type;
1: -	u8 producer_consumer;
1: -	u8 pin_config;
1: -	u8 shareable;
1: -	u8 wake_capable;
1: -	u8 io_restriction;
1: -	u8 triggering;
1: -	u8 polarity;
1: -	u16 drive_strength;
1: -	u16 debounce_timeout;
1: -	u16 pin_table_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u16 *pin_table;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 connection_type;
1: +  u8 producer_consumer;
1: +  u8 pin_config;
1: +  u8 shareable;
1: +  u8 wake_capable;
1: +  u8 io_restriction;
1: +  u8 triggering;
1: +  u8 polarity;
1: +  u16 drive_strength;
1: +  u16 debounce_timeout;
1: +  u16 pin_table_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u16 *pin_table;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_common_serialbus {
1: -	u8 revision_id;
1: -	u8 type;
1: -	u8 producer_consumer;
1: -	u8 slave_mode;
1: -	u8 connection_sharing;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 type;
1: +  u8 producer_consumer;
1: +  u8 slave_mode;
1: +  u8 connection_sharing;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_i2c_serialbus {
1: -	u8 revision_id;
1: -	u8 type;
1: -	u8 producer_consumer;
1: -	u8 slave_mode;
1: -	u8 connection_sharing;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u8 *vendor_data;
1: -	u8 access_mode;
1: -	u16 slave_address;
1: -	u32 connection_speed;
1: +  u8 revision_id;
1: +  u8 type;
1: +  u8 producer_consumer;
1: +  u8 slave_mode;
1: +  u8 connection_sharing;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u8 *vendor_data;
1: +  u8 access_mode;
1: +  u16 slave_address;
1: +  u32 connection_speed;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_spi_serialbus {
1: -	u8 revision_id;
1: -	u8 type;
1: -	u8 producer_consumer;
1: -	u8 slave_mode;
1: -	u8 connection_sharing;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u8 *vendor_data;
1: -	u8 wire_mode;
1: -	u8 device_polarity;
1: -	u8 data_bit_length;
1: -	u8 clock_phase;
1: -	u8 clock_polarity;
1: -	u16 device_selection;
1: -	u32 connection_speed;
1: +  u8 revision_id;
1: +  u8 type;
1: +  u8 producer_consumer;
1: +  u8 slave_mode;
1: +  u8 connection_sharing;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u8 *vendor_data;
1: +  u8 wire_mode;
1: +  u8 device_polarity;
1: +  u8 data_bit_length;
1: +  u8 clock_phase;
1: +  u8 clock_polarity;
1: +  u16 device_selection;
1: +  u32 connection_speed;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_uart_serialbus {
1: -	u8 revision_id;
1: -	u8 type;
1: -	u8 producer_consumer;
1: -	u8 slave_mode;
1: -	u8 connection_sharing;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u8 *vendor_data;
1: -	u8 endian;
1: -	u8 data_bits;
1: -	u8 stop_bits;
1: -	u8 flow_control;
1: -	u8 parity;
1: -	u8 lines_enabled;
1: -	u16 rx_fifo_size;
1: -	u16 tx_fifo_size;
1: -	u32 default_baud_rate;
1: +  u8 revision_id;
1: +  u8 type;
1: +  u8 producer_consumer;
1: +  u8 slave_mode;
1: +  u8 connection_sharing;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u8 *vendor_data;
1: +  u8 endian;
1: +  u8 data_bits;
1: +  u8 stop_bits;
1: +  u8 flow_control;
1: +  u8 parity;
1: +  u8 lines_enabled;
1: +  u16 rx_fifo_size;
1: +  u16 tx_fifo_size;
1: +  u32 default_baud_rate;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_pin_function {
1: -	u8 revision_id;
1: -	u8 pin_config;
1: -	u8 shareable;
1: -	u16 function_number;
1: -	u16 pin_table_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u16 *pin_table;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 pin_config;
1: +  u8 shareable;
1: +  u16 function_number;
1: +  u16 pin_table_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u16 *pin_table;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_pin_config {
1: -	u8 revision_id;
1: -	u8 producer_consumer;
1: -	u8 shareable;
1: -	u8 pin_config_type;
1: -	u32 pin_config_value;
1: -	u16 pin_table_length;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	u16 *pin_table;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 producer_consumer;
1: +  u8 shareable;
1: +  u8 pin_config_type;
1: +  u32 pin_config_value;
1: +  u16 pin_table_length;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  u16 *pin_table;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_pin_group {
1: -	u8 revision_id;
1: -	u8 producer_consumer;
1: -	u16 pin_table_length;
1: -	u16 vendor_length;
1: -	u16 *pin_table;
1: -	struct acpi_resource_label resource_label;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 producer_consumer;
1: +  u16 pin_table_length;
1: +  u16 vendor_length;
1: +  u16 *pin_table;
1: +  struct acpi_resource_label resource_label;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_pin_group_function {
1: -	u8 revision_id;
1: -	u8 producer_consumer;
1: -	u8 shareable;
1: -	u16 function_number;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	struct acpi_resource_label resource_source_label;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 producer_consumer;
1: +  u8 shareable;
1: +  u16 function_number;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  struct acpi_resource_label resource_source_label;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_resource_pin_group_config {
1: -	u8 revision_id;
1: -	u8 producer_consumer;
1: -	u8 shareable;
1: -	u8 pin_config_type;
1: -	u32 pin_config_value;
1: -	u16 vendor_length;
1: -	struct acpi_resource_source resource_source;
1: -	struct acpi_resource_label resource_source_label;
1: -	u8 *vendor_data;
1: +  u8 revision_id;
1: +  u8 producer_consumer;
1: +  u8 shareable;
1: +  u8 pin_config_type;
1: +  u32 pin_config_value;
1: +  u16 vendor_length;
1: +  struct acpi_resource_source resource_source;
1: +  struct acpi_resource_label resource_source_label;
1: +  u8 *vendor_data;
1:  } __attribute__((packed));
1:  
1:  union acpi_resource_data {
1: -	struct acpi_resource_irq irq;
1: -	struct acpi_resource_dma dma;
1: -	struct acpi_resource_start_dependent start_dpf;
1: -	struct acpi_resource_io io;
1: -	struct acpi_resource_fixed_io fixed_io;
1: -	struct acpi_resource_fixed_dma fixed_dma;
1: -	struct acpi_resource_vendor vendor;
1: -	struct acpi_resource_vendor_typed vendor_typed;
1: -	struct acpi_resource_end_tag end_tag;
1: -	struct acpi_resource_memory24 memory24;
1: -	struct acpi_resource_memory32 memory32;
1: -	struct acpi_resource_fixed_memory32 fixed_memory32;
1: -	struct acpi_resource_address16 address16;
1: -	struct acpi_resource_address32 address32;
1: -	struct acpi_resource_address64 address64;
1: -	struct acpi_resource_extended_address64 ext_address64;
1: -	struct acpi_resource_extended_irq extended_irq;
1: -	struct acpi_resource_generic_register generic_reg;
1: -	struct acpi_resource_gpio gpio;
1: -	struct acpi_resource_i2c_serialbus i2c_serial_bus;
1: -	struct acpi_resource_spi_serialbus spi_serial_bus;
1: -	struct acpi_resource_uart_serialbus uart_serial_bus;
1: -	struct acpi_resource_common_serialbus common_serial_bus;
1: -	struct acpi_resource_pin_function pin_function;
1: -	struct acpi_resource_pin_config pin_config;
1: -	struct acpi_resource_pin_group pin_group;
1: -	struct acpi_resource_pin_group_function pin_group_function;
1: -	struct acpi_resource_pin_group_config pin_group_config;
1: -	struct acpi_resource_address address;
1: +  struct acpi_resource_irq irq;
1: +  struct acpi_resource_dma dma;
1: +  struct acpi_resource_start_dependent start_dpf;
1: +  struct acpi_resource_io io;
1: +  struct acpi_resource_fixed_io fixed_io;
1: +  struct acpi_resource_fixed_dma fixed_dma;
1: +  struct acpi_resource_vendor vendor;
1: +  struct acpi_resource_vendor_typed vendor_typed;
1: +  struct acpi_resource_end_tag end_tag;
1: +  struct acpi_resource_memory24 memory24;
1: +  struct acpi_resource_memory32 memory32;
1: +  struct acpi_resource_fixed_memory32 fixed_memory32;
1: +  struct acpi_resource_address16 address16;
1: +  struct acpi_resource_address32 address32;
1: +  struct acpi_resource_address64 address64;
1: +  struct acpi_resource_extended_address64 ext_address64;
1: +  struct acpi_resource_extended_irq extended_irq;
1: +  struct acpi_resource_generic_register generic_reg;
1: +  struct acpi_resource_gpio gpio;
1: +  struct acpi_resource_i2c_serialbus i2c_serial_bus;
1: +  struct acpi_resource_spi_serialbus spi_serial_bus;
1: +  struct acpi_resource_uart_serialbus uart_serial_bus;
1: +  struct acpi_resource_common_serialbus common_serial_bus;
1: +  struct acpi_resource_pin_function pin_function;
1: +  struct acpi_resource_pin_config pin_config;
1: +  struct acpi_resource_pin_group pin_group;
1: +  struct acpi_resource_pin_group_function pin_group_function;
1: +  struct acpi_resource_pin_group_config pin_group_config;
1: +  struct acpi_resource_address address;
1:  };
1:  
1:  struct acpi_resource {
1: -	u32 type;
1: -	u32 length;
1: -	union acpi_resource_data data;
1: +  u32 type;
1: +  u32 length;
1: +  union acpi_resource_data data;
1:  } __attribute__((packed));
1:  
1:  struct acpi_gpiolib_dmi_quirk {
1: -	bool no_edge_events_on_boot;
1: -	char *ignore_wake;
1: +  bool no_edge_events_on_boot;
1: +  char *ignore_wake;
1:  };
1:  
1:  struct acpi_gpio_event {
1: -	struct list_head node;
1: -	acpi_handle handle;
1: -	irq_handler_t handler;
1: -	unsigned int pin;
1: -	unsigned int irq;
1: -	long unsigned int irqflags;
1: -	bool irq_is_wake;
1: -	bool irq_requested;
1: -	struct gpio_desc *desc;
1: +  struct list_head node;
1: +  acpi_handle handle;
1: +  irq_handler_t handler;
1: +  unsigned int pin;
1: +  unsigned int irq;
1: +  long unsigned int irqflags;
1: +  bool irq_is_wake;
1: +  bool irq_requested;
1: +  struct gpio_desc *desc;
1:  };
1:  
1:  struct acpi_gpio_connection {
1: -	struct list_head node;
1: -	unsigned int pin;
1: -	struct gpio_desc *desc;
1: +  struct list_head node;
1: +  unsigned int pin;
1: +  struct gpio_desc *desc;
1:  };
1:  
1:  struct acpi_gpio_chip {
1: -	struct acpi_connection_info conn_info;
1: -	struct list_head conns;
1: -	struct mutex conn_lock;
1: -	struct gpio_chip *chip;
1: -	struct list_head events;
1: -	struct list_head deferred_req_irqs_list_entry;
1: +  struct acpi_connection_info conn_info;
1: +  struct list_head conns;
1: +  struct mutex conn_lock;
1: +  struct gpio_chip *chip;
1: +  struct list_head events;
1: +  struct list_head deferred_req_irqs_list_entry;
1:  };
1:  
1:  struct acpi_gpio_lookup {
1: -	struct acpi_gpio_info info;
1: -	int index;
1: -	int pin_index;
1: -	bool active_low;
1: -	struct gpio_desc *desc;
1: -	int n;
1: +  struct acpi_gpio_info info;
1: +  int index;
1: +  int pin_index;
1: +  bool active_low;
1: +  struct gpio_desc *desc;
1: +  int n;
1:  };
1:  
1:  enum {
1: -	pci_channel_io_normal = 1,
1: -	pci_channel_io_frozen = 2,
1: -	pci_channel_io_perm_failure = 3,
1: +  pci_channel_io_normal = 1,
1: +  pci_channel_io_frozen = 2,
1: +  pci_channel_io_perm_failure = 3,
1:  };
1:  
1:  struct pci_sriov {
1: -	int pos;
1: -	int nres;
1: -	u32 cap;
1: -	u16 ctrl;
1: -	u16 total_VFs;
1: -	u16 initial_VFs;
1: -	u16 num_VFs;
1: -	u16 offset;
1: -	u16 stride;
1: -	u16 vf_device;
1: -	u32 pgsz;
1: -	u8 link;
1: -	u8 max_VF_buses;
1: -	u16 driver_max_VFs;
1: -	struct pci_dev *dev;
1: -	struct pci_dev *self;
1: -	u32 class;
1: -	u8 hdr_type;
1: -	u16 subsystem_vendor;
1: -	u16 subsystem_device;
1: -	resource_size_t barsz[6];
1: -	bool drivers_autoprobe;
1: +  int pos;
1: +  int nres;
1: +  u32 cap;
1: +  u16 ctrl;
1: +  u16 total_VFs;
1: +  u16 initial_VFs;
1: +  u16 num_VFs;
1: +  u16 offset;
1: +  u16 stride;
1: +  u16 vf_device;
1: +  u32 pgsz;
1: +  u8 link;
1: +  u8 max_VF_buses;
1: +  u16 driver_max_VFs;
1: +  struct pci_dev *dev;
1: +  struct pci_dev *self;
1: +  u32 class;
1: +  u8 hdr_type;
1: +  u16 subsystem_vendor;
1: +  u16 subsystem_device;
1: +  resource_size_t barsz[6];
1: +  bool drivers_autoprobe;
1:  };
1:  
1:  struct pci_bus_resource {
1: -	struct list_head list;
1: -	struct resource *res;
1: -	unsigned int flags;
1: +  struct list_head list;
1: +  struct resource *res;
1: +  unsigned int flags;
1:  };
1:  
1:  typedef u64 pci_bus_addr_t;
1:  
1:  struct pci_bus_region {
1: -	pci_bus_addr_t start;
1: -	pci_bus_addr_t end;
1: +  pci_bus_addr_t start;
1: +  pci_bus_addr_t end;
1:  };
1:  
1:  enum pci_fixup_pass {
1: -	pci_fixup_early = 0,
1: -	pci_fixup_header = 1,
1: -	pci_fixup_final = 2,
1: -	pci_fixup_enable = 3,
1: -	pci_fixup_resume = 4,
1: -	pci_fixup_suspend = 5,
1: -	pci_fixup_resume_early = 6,
1: -	pci_fixup_suspend_late = 7,
1: +  pci_fixup_early = 0,
1: +  pci_fixup_header = 1,
1: +  pci_fixup_final = 2,
1: +  pci_fixup_enable = 3,
1: +  pci_fixup_resume = 4,
1: +  pci_fixup_suspend = 5,
1: +  pci_fixup_resume_early = 6,
1: +  pci_fixup_suspend_late = 7,
1:  };
1:  
1:  struct hotplug_slot_ops;
1:  
1:  struct hotplug_slot {
1: -	const struct hotplug_slot_ops *ops;
1: -	struct list_head slot_list;
1: -	struct pci_slot *pci_slot;
1: -	struct module *owner;
1: -	const char *mod_name;
1: +  const struct hotplug_slot_ops *ops;
1: +  struct list_head slot_list;
1: +  struct pci_slot *pci_slot;
1: +  struct module *owner;
1: +  const char *mod_name;
1:  };
1:  
1:  enum pci_dev_flags {
1: -	PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = 1,
1: -	PCI_DEV_FLAGS_NO_D3 = 2,
1: -	PCI_DEV_FLAGS_ASSIGNED = 4,
1: -	PCI_DEV_FLAGS_ACS_ENABLED_QUIRK = 8,
1: -	PCI_DEV_FLAG_PCIE_BRIDGE_ALIAS = 32,
1: -	PCI_DEV_FLAGS_NO_BUS_RESET = 64,
1: -	PCI_DEV_FLAGS_NO_PM_RESET = 128,
1: -	PCI_DEV_FLAGS_VPD_REF_F0 = 256,
1: -	PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = 512,
1: -	PCI_DEV_FLAGS_NO_FLR_RESET = 1024,
1: -	PCI_DEV_FLAGS_NO_RELAXED_ORDERING = 2048,
1: +  PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = 1,
1: +  PCI_DEV_FLAGS_NO_D3 = 2,
1: +  PCI_DEV_FLAGS_ASSIGNED = 4,
1: +  PCI_DEV_FLAGS_ACS_ENABLED_QUIRK = 8,
1: +  PCI_DEV_FLAG_PCIE_BRIDGE_ALIAS = 32,
1: +  PCI_DEV_FLAGS_NO_BUS_RESET = 64,
1: +  PCI_DEV_FLAGS_NO_PM_RESET = 128,
1: +  PCI_DEV_FLAGS_VPD_REF_F0 = 256,
1: +  PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = 512,
1: +  PCI_DEV_FLAGS_NO_FLR_RESET = 1024,
1: +  PCI_DEV_FLAGS_NO_RELAXED_ORDERING = 2048,
1:  };
1:  
1:  enum pci_bus_flags {
1: -	PCI_BUS_FLAGS_NO_MSI = 1,
1: -	PCI_BUS_FLAGS_NO_MMRBC = 2,
1: -	PCI_BUS_FLAGS_NO_AERSID = 4,
1: -	PCI_BUS_FLAGS_NO_EXTCFG = 8,
1: +  PCI_BUS_FLAGS_NO_MSI = 1,
1: +  PCI_BUS_FLAGS_NO_MMRBC = 2,
1: +  PCI_BUS_FLAGS_NO_AERSID = 4,
1: +  PCI_BUS_FLAGS_NO_EXTCFG = 8,
1:  };
1:  
1:  enum pci_bus_speed {
1: -	PCI_SPEED_33MHz = 0,
1: -	PCI_SPEED_66MHz = 1,
1: -	PCI_SPEED_66MHz_PCIX = 2,
1: -	PCI_SPEED_100MHz_PCIX = 3,
1: -	PCI_SPEED_133MHz_PCIX = 4,
1: -	PCI_SPEED_66MHz_PCIX_ECC = 5,
1: -	PCI_SPEED_100MHz_PCIX_ECC = 6,
1: -	PCI_SPEED_133MHz_PCIX_ECC = 7,
1: -	PCI_SPEED_66MHz_PCIX_266 = 9,
1: -	PCI_SPEED_100MHz_PCIX_266 = 10,
1: -	PCI_SPEED_133MHz_PCIX_266 = 11,
1: -	AGP_UNKNOWN = 12,
1: -	AGP_1X = 13,
1: -	AGP_2X = 14,
1: -	AGP_4X = 15,
1: -	AGP_8X = 16,
1: -	PCI_SPEED_66MHz_PCIX_533 = 17,
1: -	PCI_SPEED_100MHz_PCIX_533 = 18,
1: -	PCI_SPEED_133MHz_PCIX_533 = 19,
1: -	PCIE_SPEED_2_5GT = 20,
1: -	PCIE_SPEED_5_0GT = 21,
1: -	PCIE_SPEED_8_0GT = 22,
1: -	PCIE_SPEED_16_0GT = 23,
1: -	PCIE_SPEED_32_0GT = 24,
1: -	PCI_SPEED_UNKNOWN = 255,
1: +  PCI_SPEED_33MHz = 0,
1: +  PCI_SPEED_66MHz = 1,
1: +  PCI_SPEED_66MHz_PCIX = 2,
1: +  PCI_SPEED_100MHz_PCIX = 3,
1: +  PCI_SPEED_133MHz_PCIX = 4,
1: +  PCI_SPEED_66MHz_PCIX_ECC = 5,
1: +  PCI_SPEED_100MHz_PCIX_ECC = 6,
1: +  PCI_SPEED_133MHz_PCIX_ECC = 7,
1: +  PCI_SPEED_66MHz_PCIX_266 = 9,
1: +  PCI_SPEED_100MHz_PCIX_266 = 10,
1: +  PCI_SPEED_133MHz_PCIX_266 = 11,
1: +  AGP_UNKNOWN = 12,
1: +  AGP_1X = 13,
1: +  AGP_2X = 14,
1: +  AGP_4X = 15,
1: +  AGP_8X = 16,
1: +  PCI_SPEED_66MHz_PCIX_533 = 17,
1: +  PCI_SPEED_100MHz_PCIX_533 = 18,
1: +  PCI_SPEED_133MHz_PCIX_533 = 19,
1: +  PCIE_SPEED_2_5GT = 20,
1: +  PCIE_SPEED_5_0GT = 21,
1: +  PCIE_SPEED_8_0GT = 22,
1: +  PCIE_SPEED_16_0GT = 23,
1: +  PCIE_SPEED_32_0GT = 24,
1: +  PCI_SPEED_UNKNOWN = 255,
1:  };
1:  
1:  struct pci_host_bridge {
1: -	struct device dev;
1: -	struct pci_bus *bus;
1: -	struct pci_ops *ops;
1: -	struct pci_ops *child_ops;
1: -	void *sysdata;
1: -	int busnr;
1: -	struct list_head windows;
1: -	struct list_head dma_ranges;
1: -	u8 (*swizzle_irq)(struct pci_dev *, u8 *);
1: -	int (*map_irq)(const struct pci_dev *, u8, u8);
1: -	void (*release_fn)(struct pci_host_bridge *);
1: -	void *release_data;
1: -	struct msi_controller *msi;
1: -	unsigned int ignore_reset_delay: 1;
1: -	unsigned int no_ext_tags: 1;
1: -	unsigned int native_aer: 1;
1: -	unsigned int native_pcie_hotplug: 1;
1: -	unsigned int native_shpc_hotplug: 1;
1: -	unsigned int native_pme: 1;
1: -	unsigned int native_ltr: 1;
1: -	unsigned int native_dpc: 1;
1: -	unsigned int preserve_config: 1;
1: -	unsigned int size_windows: 1;
1: -	resource_size_t (*align_resource)(struct pci_dev *, const struct resource *, resource_size_t, resource_size_t, resource_size_t);
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long unsigned int private[0];
1: -};
1: -
1: -enum {
1: -	PCI_REASSIGN_ALL_RSRC = 1,
1: -	PCI_REASSIGN_ALL_BUS = 2,
1: -	PCI_PROBE_ONLY = 4,
1: -	PCI_CAN_SKIP_ISA_ALIGN = 8,
1: -	PCI_ENABLE_PROC_DOMAINS = 16,
1: -	PCI_COMPAT_DOMAIN_0 = 32,
1: -	PCI_SCAN_ALL_PCIE_DEVS = 64,
1: +  struct device dev;
1: +  struct pci_bus *bus;
1: +  struct pci_ops *ops;
1: +  struct pci_ops *child_ops;
1: +  void *sysdata;
1: +  int busnr;
1: +  struct list_head windows;
1: +  struct list_head dma_ranges;
1: +  u8 (*swizzle_irq)(struct pci_dev *, u8 *);
1: +  int (*map_irq)(const struct pci_dev *, u8, u8);
1: +  void (*release_fn)(struct pci_host_bridge *);
1: +  void *release_data;
1: +  struct msi_controller *msi;
1: +  unsigned int ignore_reset_delay : 1;
1: +  unsigned int no_ext_tags : 1;
1: +  unsigned int native_aer : 1;
1: +  unsigned int native_pcie_hotplug : 1;
1: +  unsigned int native_shpc_hotplug : 1;
1: +  unsigned int native_pme : 1;
1: +  unsigned int native_ltr : 1;
1: +  unsigned int native_dpc : 1;
1: +  unsigned int preserve_config : 1;
1: +  unsigned int size_windows : 1;
1: +  resource_size_t (*align_resource)(struct pci_dev *, const struct resource *,
1: +                                    resource_size_t, resource_size_t,
1: +                                    resource_size_t);
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long unsigned int private[0];
1: +};
1: +
1: +enum {
1: +  PCI_REASSIGN_ALL_RSRC = 1,
1: +  PCI_REASSIGN_ALL_BUS = 2,
1: +  PCI_PROBE_ONLY = 4,
1: +  PCI_CAN_SKIP_ISA_ALIGN = 8,
1: +  PCI_ENABLE_PROC_DOMAINS = 16,
1: +  PCI_COMPAT_DOMAIN_0 = 32,
1: +  PCI_SCAN_ALL_PCIE_DEVS = 64,
1:  };
1:  
1:  enum pcie_bus_config_types {
1: -	PCIE_BUS_TUNE_OFF = 0,
1: -	PCIE_BUS_DEFAULT = 1,
1: -	PCIE_BUS_SAFE = 2,
1: -	PCIE_BUS_PERFORMANCE = 3,
1: -	PCIE_BUS_PEER2PEER = 4,
1: +  PCIE_BUS_TUNE_OFF = 0,
1: +  PCIE_BUS_DEFAULT = 1,
1: +  PCIE_BUS_SAFE = 2,
1: +  PCIE_BUS_PERFORMANCE = 3,
1: +  PCIE_BUS_PEER2PEER = 4,
1:  };
1:  
1:  struct hotplug_slot_ops {
1: -	int (*enable_slot)(struct hotplug_slot *);
1: -	int (*disable_slot)(struct hotplug_slot *);
1: -	int (*set_attention_status)(struct hotplug_slot *, u8);
1: -	int (*hardware_test)(struct hotplug_slot *, u32);
1: -	int (*get_power_status)(struct hotplug_slot *, u8 *);
1: -	int (*get_attention_status)(struct hotplug_slot *, u8 *);
1: -	int (*get_latch_status)(struct hotplug_slot *, u8 *);
1: -	int (*get_adapter_status)(struct hotplug_slot *, u8 *);
1: -	int (*reset_slot)(struct hotplug_slot *, int);
1: +  int (*enable_slot)(struct hotplug_slot *);
1: +  int (*disable_slot)(struct hotplug_slot *);
1: +  int (*set_attention_status)(struct hotplug_slot *, u8);
1: +  int (*hardware_test)(struct hotplug_slot *, u32);
1: +  int (*get_power_status)(struct hotplug_slot *, u8 *);
1: +  int (*get_attention_status)(struct hotplug_slot *, u8 *);
1: +  int (*get_latch_status)(struct hotplug_slot *, u8 *);
1: +  int (*get_adapter_status)(struct hotplug_slot *, u8 *);
1: +  int (*reset_slot)(struct hotplug_slot *, int);
1:  };
1:  
1:  enum pci_bar_type {
1: -	pci_bar_unknown = 0,
1: -	pci_bar_io = 1,
1: -	pci_bar_mem32 = 2,
1: -	pci_bar_mem64 = 3,
1: +  pci_bar_unknown = 0,
1: +  pci_bar_io = 1,
1: +  pci_bar_mem32 = 2,
1: +  pci_bar_mem64 = 3,
1:  };
1:  
1:  struct pci_domain_busn_res {
1: -	struct list_head list;
1: -	struct resource res;
1: -	int domain_nr;
1: +  struct list_head list;
1: +  struct resource res;
1: +  int domain_nr;
1:  };
1:  
1:  struct bus_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct bus_type *, char *);
1: -	ssize_t (*store)(struct bus_type *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct bus_type *, char *);
1: +  ssize_t (*store)(struct bus_type *, const char *, size_t);
1:  };
1:  
1:  enum pcie_reset_state {
1: -	pcie_deassert_reset = 1,
1: -	pcie_warm_reset = 2,
1: -	pcie_hot_reset = 3,
1: +  pcie_deassert_reset = 1,
1: +  pcie_warm_reset = 2,
1: +  pcie_hot_reset = 3,
1:  };
1:  
1:  enum pcie_link_width {
1: -	PCIE_LNK_WIDTH_RESRV = 0,
1: -	PCIE_LNK_X1 = 1,
1: -	PCIE_LNK_X2 = 2,
1: -	PCIE_LNK_X4 = 4,
1: -	PCIE_LNK_X8 = 8,
1: -	PCIE_LNK_X12 = 12,
1: -	PCIE_LNK_X16 = 16,
1: -	PCIE_LNK_X32 = 32,
1: -	PCIE_LNK_WIDTH_UNKNOWN = 255,
1: +  PCIE_LNK_WIDTH_RESRV = 0,
1: +  PCIE_LNK_X1 = 1,
1: +  PCIE_LNK_X2 = 2,
1: +  PCIE_LNK_X4 = 4,
1: +  PCIE_LNK_X8 = 8,
1: +  PCIE_LNK_X12 = 12,
1: +  PCIE_LNK_X16 = 16,
1: +  PCIE_LNK_X32 = 32,
1: +  PCIE_LNK_WIDTH_UNKNOWN = 255,
1:  };
1:  
1:  struct pci_cap_saved_data {
1: -	u16 cap_nr;
1: -	bool cap_extended;
1: -	unsigned int size;
1: -	u32 data[0];
1: +  u16 cap_nr;
1: +  bool cap_extended;
1: +  unsigned int size;
1: +  u32 data[0];
1:  };
1:  
1:  struct pci_cap_saved_state {
1: -	struct hlist_node next;
1: -	struct pci_cap_saved_data cap;
1: +  struct hlist_node next;
1: +  struct pci_cap_saved_data cap;
1:  };
1:  
1:  typedef int (*arch_set_vga_state_t)(struct pci_dev *, bool, unsigned int, u32);
1:  
1:  struct pci_platform_pm_ops {
1: -	bool (*bridge_d3)(struct pci_dev *);
1: -	bool (*is_manageable)(struct pci_dev *);
1: -	int (*set_state)(struct pci_dev *, pci_power_t);
1: -	pci_power_t (*get_state)(struct pci_dev *);
1: -	void (*refresh_state)(struct pci_dev *);
1: -	pci_power_t (*choose_state)(struct pci_dev *);
1: -	int (*set_wakeup)(struct pci_dev *, bool);
1: -	bool (*need_resume)(struct pci_dev *);
1: +  bool (*bridge_d3)(struct pci_dev *);
1: +  bool (*is_manageable)(struct pci_dev *);
1: +  int (*set_state)(struct pci_dev *, pci_power_t);
1: +  pci_power_t (*get_state)(struct pci_dev *);
1: +  void (*refresh_state)(struct pci_dev *);
1: +  pci_power_t (*choose_state)(struct pci_dev *);
1: +  int (*set_wakeup)(struct pci_dev *, bool);
1: +  bool (*need_resume)(struct pci_dev *);
1:  };
1:  
1:  struct pci_pme_device {
1: -	struct list_head list;
1: -	struct pci_dev *dev;
1: +  struct list_head list;
1: +  struct pci_dev *dev;
1:  };
1:  
1:  struct pci_saved_state {
1: -	u32 config_space[16];
1: -	struct pci_cap_saved_data cap[0];
1: +  u32 config_space[16];
1: +  struct pci_cap_saved_data cap[0];
1:  };
1:  
1:  struct pci_devres {
1: -	unsigned int enabled: 1;
1: -	unsigned int pinned: 1;
1: -	unsigned int orig_intx: 1;
1: -	unsigned int restore_intx: 1;
1: -	unsigned int mwi: 1;
1: -	u32 region_mask;
1: +  unsigned int enabled : 1;
1: +  unsigned int pinned : 1;
1: +  unsigned int orig_intx : 1;
1: +  unsigned int restore_intx : 1;
1: +  unsigned int mwi : 1;
1: +  u32 region_mask;
1:  };
1:  
1:  struct driver_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct device_driver *, char *);
1: -	ssize_t (*store)(struct device_driver *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct device_driver *, char *);
1: +  ssize_t (*store)(struct device_driver *, const char *, size_t);
1:  };
1:  
1:  enum pci_ers_result {
1: -	PCI_ERS_RESULT_NONE = 1,
1: -	PCI_ERS_RESULT_CAN_RECOVER = 2,
1: -	PCI_ERS_RESULT_NEED_RESET = 3,
1: -	PCI_ERS_RESULT_DISCONNECT = 4,
1: -	PCI_ERS_RESULT_RECOVERED = 5,
1: -	PCI_ERS_RESULT_NO_AER_DRIVER = 6,
1: +  PCI_ERS_RESULT_NONE = 1,
1: +  PCI_ERS_RESULT_CAN_RECOVER = 2,
1: +  PCI_ERS_RESULT_NEED_RESET = 3,
1: +  PCI_ERS_RESULT_DISCONNECT = 4,
1: +  PCI_ERS_RESULT_RECOVERED = 5,
1: +  PCI_ERS_RESULT_NO_AER_DRIVER = 6,
1:  };
1:  
1:  enum dev_dma_attr {
1: -	DEV_DMA_NOT_SUPPORTED = 0,
1: -	DEV_DMA_NON_COHERENT = 1,
1: -	DEV_DMA_COHERENT = 2,
1: +  DEV_DMA_NOT_SUPPORTED = 0,
1: +  DEV_DMA_NON_COHERENT = 1,
1: +  DEV_DMA_COHERENT = 2,
1:  };
1:  
1:  struct pcie_device {
1: -	int irq;
1: -	struct pci_dev *port;
1: -	u32 service;
1: -	void *priv_data;
1: -	struct device device;
1: +  int irq;
1: +  struct pci_dev *port;
1: +  u32 service;
1: +  void *priv_data;
1: +  struct device device;
1:  };
1:  
1:  struct pcie_port_service_driver {
1: -	const char *name;
1: -	int (*probe)(struct pcie_device *);
1: -	void (*remove)(struct pcie_device *);
1: -	int (*suspend)(struct pcie_device *);
1: -	int (*resume_noirq)(struct pcie_device *);
1: -	int (*resume)(struct pcie_device *);
1: -	int (*runtime_suspend)(struct pcie_device *);
1: -	int (*runtime_resume)(struct pcie_device *);
1: -	void (*error_resume)(struct pci_dev *);
1: -	int port_type;
1: -	u32 service;
1: -	struct device_driver driver;
1: +  const char *name;
1: +  int (*probe)(struct pcie_device *);
1: +  void (*remove)(struct pcie_device *);
1: +  int (*suspend)(struct pcie_device *);
1: +  int (*resume_noirq)(struct pcie_device *);
1: +  int (*resume)(struct pcie_device *);
1: +  int (*runtime_suspend)(struct pcie_device *);
1: +  int (*runtime_resume)(struct pcie_device *);
1: +  void (*error_resume)(struct pci_dev *);
1: +  int port_type;
1: +  u32 service;
1: +  struct device_driver driver;
1:  };
1:  
1:  struct pci_dynid {
1: -	struct list_head node;
1: -	struct pci_device_id id;
1: +  struct list_head node;
1: +  struct pci_device_id id;
1:  };
1:  
1:  struct drv_dev_and_id {
1: -	struct pci_driver *drv;
1: -	struct pci_dev *dev;
1: -	const struct pci_device_id *id;
1: +  struct pci_driver *drv;
1: +  struct pci_dev *dev;
1: +  const struct pci_device_id *id;
1:  };
1:  
1:  enum pci_mmap_state {
1: -	pci_mmap_io = 0,
1: -	pci_mmap_mem = 1,
1: +  pci_mmap_io = 0,
1: +  pci_mmap_mem = 1,
1:  };
1:  
1:  enum pci_mmap_api {
1: -	PCI_MMAP_SYSFS = 0,
1: -	PCI_MMAP_PROCFS = 1,
1: +  PCI_MMAP_SYSFS = 0,
1: +  PCI_MMAP_PROCFS = 1,
1:  };
1:  
1:  struct pci_vpd_ops;
1:  
1:  struct pci_vpd {
1: -	const struct pci_vpd_ops *ops;
1: -	struct bin_attribute *attr;
1: -	struct mutex lock;
1: -	unsigned int len;
1: -	u16 flag;
1: -	u8 cap;
1: -	unsigned int busy: 1;
1: -	unsigned int valid: 1;
1: +  const struct pci_vpd_ops *ops;
1: +  struct bin_attribute *attr;
1: +  struct mutex lock;
1: +  unsigned int len;
1: +  u16 flag;
1: +  u8 cap;
1: +  unsigned int busy : 1;
1: +  unsigned int valid : 1;
1:  };
1:  
1:  struct pci_vpd_ops {
1: -	ssize_t (*read)(struct pci_dev *, loff_t, size_t, void *);
1: -	ssize_t (*write)(struct pci_dev *, loff_t, size_t, const void *);
1: -	int (*set_size)(struct pci_dev *, size_t);
1: +  ssize_t (*read)(struct pci_dev *, loff_t, size_t, void *);
1: +  ssize_t (*write)(struct pci_dev *, loff_t, size_t, const void *);
1: +  int (*set_size)(struct pci_dev *, size_t);
1:  };
1:  
1:  struct pci_dev_resource {
1: -	struct list_head list;
1: -	struct resource *res;
1: -	struct pci_dev *dev;
1: -	resource_size_t start;
1: -	resource_size_t end;
1: -	resource_size_t add_size;
1: -	resource_size_t min_align;
1: -	long unsigned int flags;
1: +  struct list_head list;
1: +  struct resource *res;
1: +  struct pci_dev *dev;
1: +  resource_size_t start;
1: +  resource_size_t end;
1: +  resource_size_t add_size;
1: +  resource_size_t min_align;
1: +  long unsigned int flags;
1:  };
1:  
1:  enum release_type {
1: -	leaf_only = 0,
1: -	whole_subtree = 1,
1: +  leaf_only = 0,
1: +  whole_subtree = 1,
1:  };
1:  
1:  enum enable_type {
1: -	undefined = 4294967295,
1: -	user_disabled = 0,
1: -	auto_disabled = 1,
1: -	user_enabled = 2,
1: -	auto_enabled = 3,
1: +  undefined = 4294967295,
1: +  user_disabled = 0,
1: +  auto_disabled = 1,
1: +  user_enabled = 2,
1: +  auto_enabled = 3,
1:  };
1:  
1:  struct portdrv_service_data {
1: -	struct pcie_port_service_driver *drv;
1: -	struct device *dev;
1: -	u32 service;
1: +  struct pcie_port_service_driver *drv;
1: +  struct device *dev;
1: +  u32 service;
1:  };
1:  
1:  typedef int (*pcie_pm_callback_t)(struct pcie_device *);
1:  
1:  struct aspm_latency {
1: -	u32 l0s;
1: -	u32 l1;
1: +  u32 l0s;
1: +  u32 l1;
1:  };
1:  
1:  struct pcie_link_state {
1: -	struct pci_dev *pdev;
1: -	struct pci_dev *downstream;
1: -	struct pcie_link_state *root;
1: -	struct pcie_link_state *parent;
1: -	struct list_head sibling;
1: -	u32 aspm_support: 7;
1: -	u32 aspm_enabled: 7;
1: -	u32 aspm_capable: 7;
1: -	u32 aspm_default: 7;
1: -	char: 4;
1: -	u32 aspm_disable: 7;
1: -	u32 clkpm_capable: 1;
1: -	u32 clkpm_enabled: 1;
1: -	u32 clkpm_default: 1;
1: -	u32 clkpm_disable: 1;
1: -	struct aspm_latency latency_up;
1: -	struct aspm_latency latency_dw;
1: -	struct aspm_latency acceptable[8];
1: +  struct pci_dev *pdev;
1: +  struct pci_dev *downstream;
1: +  struct pcie_link_state *root;
1: +  struct pcie_link_state *parent;
1: +  struct list_head sibling;
1: +  u32 aspm_support : 7;
1: +  u32 aspm_enabled : 7;
1: +  u32 aspm_capable : 7;
1: +  u32 aspm_default : 7;
1: +  char : 4;
1: +  u32 aspm_disable : 7;
1: +  u32 clkpm_capable : 1;
1: +  u32 clkpm_enabled : 1;
1: +  u32 clkpm_default : 1;
1: +  u32 clkpm_disable : 1;
1: +  struct aspm_latency latency_up;
1: +  struct aspm_latency latency_dw;
1: +  struct aspm_latency acceptable[8];
1:  };
1:  
1:  struct pcie_pme_service_data {
1: -	spinlock_t lock;
1: -	struct pcie_device *srv;
1: -	struct work_struct work;
1: -	bool noirq;
1: +  spinlock_t lock;
1: +  struct pcie_device *srv;
1: +  struct work_struct work;
1: +  bool noirq;
1:  };
1:  
1:  struct pci_filp_private {
1: -	enum pci_mmap_state mmap_state;
1: -	int write_combine;
1: +  enum pci_mmap_state mmap_state;
1: +  int write_combine;
1:  };
1:  
1:  struct pci_slot_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct pci_slot *, char *);
1: -	ssize_t (*store)(struct pci_slot *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct pci_slot *, char *);
1: +  ssize_t (*store)(struct pci_slot *, const char *, size_t);
1:  };
1:  
1:  typedef u64 acpi_size;
1:  
1:  struct acpi_buffer {
1: -	acpi_size length;
1: -	void *pointer;
1: +  acpi_size length;
1: +  void *pointer;
1:  };
1:  
1:  struct acpi_bus_type {
1: -	struct list_head list;
1: -	const char *name;
1: -	bool (*match)(struct device *);
1: -	struct acpi_device * (*find_companion)(struct device *);
1: -	void (*setup)(struct device *);
1: -	void (*cleanup)(struct device *);
1: +  struct list_head list;
1: +  const char *name;
1: +  bool (*match)(struct device *);
1: +  struct acpi_device *(*find_companion)(struct device *);
1: +  void (*setup)(struct device *);
1: +  void (*cleanup)(struct device *);
1:  };
1:  
1:  struct acpi_pci_root {
1: -	struct acpi_device *device;
1: -	struct pci_bus *bus;
1: -	u16 segment;
1: -	struct resource secondary;
1: -	u32 osc_support_set;
1: -	u32 osc_control_set;
1: -	phys_addr_t mcfg_addr;
1: +  struct acpi_device *device;
1: +  struct pci_bus *bus;
1: +  u16 segment;
1: +  struct resource secondary;
1: +  u32 osc_support_set;
1: +  u32 osc_control_set;
1: +  phys_addr_t mcfg_addr;
1:  };
1:  
1:  enum pm_qos_flags_status {
1: -	PM_QOS_FLAGS_UNDEFINED = 4294967295,
1: -	PM_QOS_FLAGS_NONE = 0,
1: -	PM_QOS_FLAGS_SOME = 1,
1: -	PM_QOS_FLAGS_ALL = 2,
1: +  PM_QOS_FLAGS_UNDEFINED = 4294967295,
1: +  PM_QOS_FLAGS_NONE = 0,
1: +  PM_QOS_FLAGS_SOME = 1,
1: +  PM_QOS_FLAGS_ALL = 2,
1:  };
1:  
1:  struct hpx_type0 {
1: -	u32 revision;
1: -	u8 cache_line_size;
1: -	u8 latency_timer;
1: -	u8 enable_serr;
1: -	u8 enable_perr;
1: +  u32 revision;
1: +  u8 cache_line_size;
1: +  u8 latency_timer;
1: +  u8 enable_serr;
1: +  u8 enable_perr;
1:  };
1:  
1:  struct hpx_type1 {
1: -	u32 revision;
1: -	u8 max_mem_read;
1: -	u8 avg_max_split;
1: -	u16 tot_max_split;
1: +  u32 revision;
1: +  u8 max_mem_read;
1: +  u8 avg_max_split;
1: +  u16 tot_max_split;
1:  };
1:  
1:  struct hpx_type2 {
1: -	u32 revision;
1: -	u32 unc_err_mask_and;
1: -	u32 unc_err_mask_or;
1: -	u32 unc_err_sever_and;
1: -	u32 unc_err_sever_or;
1: -	u32 cor_err_mask_and;
1: -	u32 cor_err_mask_or;
1: -	u32 adv_err_cap_and;
1: -	u32 adv_err_cap_or;
1: -	u16 pci_exp_devctl_and;
1: -	u16 pci_exp_devctl_or;
1: -	u16 pci_exp_lnkctl_and;
1: -	u16 pci_exp_lnkctl_or;
1: -	u32 sec_unc_err_sever_and;
1: -	u32 sec_unc_err_sever_or;
1: -	u32 sec_unc_err_mask_and;
1: -	u32 sec_unc_err_mask_or;
1: +  u32 revision;
1: +  u32 unc_err_mask_and;
1: +  u32 unc_err_mask_or;
1: +  u32 unc_err_sever_and;
1: +  u32 unc_err_sever_or;
1: +  u32 cor_err_mask_and;
1: +  u32 cor_err_mask_or;
1: +  u32 adv_err_cap_and;
1: +  u32 adv_err_cap_or;
1: +  u16 pci_exp_devctl_and;
1: +  u16 pci_exp_devctl_or;
1: +  u16 pci_exp_lnkctl_and;
1: +  u16 pci_exp_lnkctl_or;
1: +  u32 sec_unc_err_sever_and;
1: +  u32 sec_unc_err_sever_or;
1: +  u32 sec_unc_err_mask_and;
1: +  u32 sec_unc_err_mask_or;
1:  };
1:  
1:  struct hpx_type3 {
1: -	u16 device_type;
1: -	u16 function_type;
1: -	u16 config_space_location;
1: -	u16 pci_exp_cap_id;
1: -	u16 pci_exp_cap_ver;
1: -	u16 pci_exp_vendor_id;
1: -	u16 dvsec_id;
1: -	u16 dvsec_rev;
1: -	u16 match_offset;
1: -	u32 match_mask_and;
1: -	u32 match_value;
1: -	u16 reg_offset;
1: -	u32 reg_mask_and;
1: -	u32 reg_mask_or;
1: +  u16 device_type;
1: +  u16 function_type;
1: +  u16 config_space_location;
1: +  u16 pci_exp_cap_id;
1: +  u16 pci_exp_cap_ver;
1: +  u16 pci_exp_vendor_id;
1: +  u16 dvsec_id;
1: +  u16 dvsec_rev;
1: +  u16 match_offset;
1: +  u32 match_mask_and;
1: +  u32 match_value;
1: +  u16 reg_offset;
1: +  u32 reg_mask_and;
1: +  u32 reg_mask_or;
1:  };
1:  
1:  enum hpx_type3_dev_type {
1: -	HPX_TYPE_ENDPOINT = 1,
1: -	HPX_TYPE_LEG_END = 2,
1: -	HPX_TYPE_RC_END = 4,
1: -	HPX_TYPE_RC_EC = 8,
1: -	HPX_TYPE_ROOT_PORT = 16,
1: -	HPX_TYPE_UPSTREAM = 32,
1: -	HPX_TYPE_DOWNSTREAM = 64,
1: -	HPX_TYPE_PCI_BRIDGE = 128,
1: -	HPX_TYPE_PCIE_BRIDGE = 256,
1: +  HPX_TYPE_ENDPOINT = 1,
1: +  HPX_TYPE_LEG_END = 2,
1: +  HPX_TYPE_RC_END = 4,
1: +  HPX_TYPE_RC_EC = 8,
1: +  HPX_TYPE_ROOT_PORT = 16,
1: +  HPX_TYPE_UPSTREAM = 32,
1: +  HPX_TYPE_DOWNSTREAM = 64,
1: +  HPX_TYPE_PCI_BRIDGE = 128,
1: +  HPX_TYPE_PCIE_BRIDGE = 256,
1:  };
1:  
1:  enum hpx_type3_fn_type {
1: -	HPX_FN_NORMAL = 1,
1: -	HPX_FN_SRIOV_PHYS = 2,
1: -	HPX_FN_SRIOV_VIRT = 4,
1: +  HPX_FN_NORMAL = 1,
1: +  HPX_FN_SRIOV_PHYS = 2,
1: +  HPX_FN_SRIOV_VIRT = 4,
1:  };
1:  
1:  enum hpx_type3_cfg_loc {
1: -	HPX_CFG_PCICFG = 0,
1: -	HPX_CFG_PCIE_CAP = 1,
1: -	HPX_CFG_PCIE_CAP_EXT = 2,
1: -	HPX_CFG_VEND_CAP = 3,
1: -	HPX_CFG_DVSEC = 4,
1: -	HPX_CFG_MAX = 5,
1: +  HPX_CFG_PCICFG = 0,
1: +  HPX_CFG_PCIE_CAP = 1,
1: +  HPX_CFG_PCIE_CAP_EXT = 2,
1: +  HPX_CFG_VEND_CAP = 3,
1: +  HPX_CFG_DVSEC = 4,
1: +  HPX_CFG_MAX = 5,
1:  };
1:  
1:  enum pci_irq_reroute_variant {
1: -	INTEL_IRQ_REROUTE_VARIANT = 1,
1: -	MAX_IRQ_REROUTE_VARIANTS = 3,
1: +  INTEL_IRQ_REROUTE_VARIANT = 1,
1: +  MAX_IRQ_REROUTE_VARIANTS = 3,
1:  };
1:  
1:  struct pci_fixup {
1: -	u16 vendor;
1: -	u16 device;
1: -	u32 class;
1: -	unsigned int class_shift;
1: -	int hook_offset;
1: -};
1: -
1: -enum {
1: -	NVME_REG_CAP = 0,
1: -	NVME_REG_VS = 8,
1: -	NVME_REG_INTMS = 12,
1: -	NVME_REG_INTMC = 16,
1: -	NVME_REG_CC = 20,
1: -	NVME_REG_CSTS = 28,
1: -	NVME_REG_NSSR = 32,
1: -	NVME_REG_AQA = 36,
1: -	NVME_REG_ASQ = 40,
1: -	NVME_REG_ACQ = 48,
1: -	NVME_REG_CMBLOC = 56,
1: -	NVME_REG_CMBSZ = 60,
1: -	NVME_REG_BPINFO = 64,
1: -	NVME_REG_BPRSEL = 68,
1: -	NVME_REG_BPMBL = 72,
1: -	NVME_REG_PMRCAP = 3584,
1: -	NVME_REG_PMRCTL = 3588,
1: -	NVME_REG_PMRSTS = 3592,
1: -	NVME_REG_PMREBS = 3596,
1: -	NVME_REG_PMRSWTP = 3600,
1: -	NVME_REG_DBS = 4096,
1: -};
1: -
1: -enum {
1: -	NVME_CC_ENABLE = 1,
1: -	NVME_CC_EN_SHIFT = 0,
1: -	NVME_CC_CSS_SHIFT = 4,
1: -	NVME_CC_MPS_SHIFT = 7,
1: -	NVME_CC_AMS_SHIFT = 11,
1: -	NVME_CC_SHN_SHIFT = 14,
1: -	NVME_CC_IOSQES_SHIFT = 16,
1: -	NVME_CC_IOCQES_SHIFT = 20,
1: -	NVME_CC_CSS_NVM = 0,
1: -	NVME_CC_CSS_CSI = 96,
1: -	NVME_CC_CSS_MASK = 112,
1: -	NVME_CC_AMS_RR = 0,
1: -	NVME_CC_AMS_WRRU = 2048,
1: -	NVME_CC_AMS_VS = 14336,
1: -	NVME_CC_SHN_NONE = 0,
1: -	NVME_CC_SHN_NORMAL = 16384,
1: -	NVME_CC_SHN_ABRUPT = 32768,
1: -	NVME_CC_SHN_MASK = 49152,
1: -	NVME_CC_IOSQES = 393216,
1: -	NVME_CC_IOCQES = 4194304,
1: -	NVME_CAP_CSS_NVM = 1,
1: -	NVME_CAP_CSS_CSI = 64,
1: -	NVME_CSTS_RDY = 1,
1: -	NVME_CSTS_CFS = 2,
1: -	NVME_CSTS_NSSRO = 16,
1: -	NVME_CSTS_PP = 32,
1: -	NVME_CSTS_SHST_NORMAL = 0,
1: -	NVME_CSTS_SHST_OCCUR = 4,
1: -	NVME_CSTS_SHST_CMPLT = 8,
1: -	NVME_CSTS_SHST_MASK = 12,
1: -};
1: -
1: -enum {
1: -	NVME_AEN_BIT_NS_ATTR = 8,
1: -	NVME_AEN_BIT_FW_ACT = 9,
1: -	NVME_AEN_BIT_ANA_CHANGE = 11,
1: -	NVME_AEN_BIT_DISC_CHANGE = 31,
1: -};
1: -
1: -enum {
1: -	SWITCHTEC_GAS_MRPC_OFFSET = 0,
1: -	SWITCHTEC_GAS_TOP_CFG_OFFSET = 4096,
1: -	SWITCHTEC_GAS_SW_EVENT_OFFSET = 6144,
1: -	SWITCHTEC_GAS_SYS_INFO_OFFSET = 8192,
1: -	SWITCHTEC_GAS_FLASH_INFO_OFFSET = 8704,
1: -	SWITCHTEC_GAS_PART_CFG_OFFSET = 16384,
1: -	SWITCHTEC_GAS_NTB_OFFSET = 65536,
1: -	SWITCHTEC_GAS_PFF_CSR_OFFSET = 1261568,
1: -};
1: -
1: -enum {
1: -	SWITCHTEC_NTB_REG_INFO_OFFSET = 0,
1: -	SWITCHTEC_NTB_REG_CTRL_OFFSET = 16384,
1: -	SWITCHTEC_NTB_REG_DBMSG_OFFSET = 409600,
1: +  u16 vendor;
1: +  u16 device;
1: +  u32 class;
1: +  unsigned int class_shift;
1: +  int hook_offset;
1: +};
1: +
1: +enum {
1: +  NVME_REG_CAP = 0,
1: +  NVME_REG_VS = 8,
1: +  NVME_REG_INTMS = 12,
1: +  NVME_REG_INTMC = 16,
1: +  NVME_REG_CC = 20,
1: +  NVME_REG_CSTS = 28,
1: +  NVME_REG_NSSR = 32,
1: +  NVME_REG_AQA = 36,
1: +  NVME_REG_ASQ = 40,
1: +  NVME_REG_ACQ = 48,
1: +  NVME_REG_CMBLOC = 56,
1: +  NVME_REG_CMBSZ = 60,
1: +  NVME_REG_BPINFO = 64,
1: +  NVME_REG_BPRSEL = 68,
1: +  NVME_REG_BPMBL = 72,
1: +  NVME_REG_PMRCAP = 3584,
1: +  NVME_REG_PMRCTL = 3588,
1: +  NVME_REG_PMRSTS = 3592,
1: +  NVME_REG_PMREBS = 3596,
1: +  NVME_REG_PMRSWTP = 3600,
1: +  NVME_REG_DBS = 4096,
1: +};
1: +
1: +enum {
1: +  NVME_CC_ENABLE = 1,
1: +  NVME_CC_EN_SHIFT = 0,
1: +  NVME_CC_CSS_SHIFT = 4,
1: +  NVME_CC_MPS_SHIFT = 7,
1: +  NVME_CC_AMS_SHIFT = 11,
1: +  NVME_CC_SHN_SHIFT = 14,
1: +  NVME_CC_IOSQES_SHIFT = 16,
1: +  NVME_CC_IOCQES_SHIFT = 20,
1: +  NVME_CC_CSS_NVM = 0,
1: +  NVME_CC_CSS_CSI = 96,
1: +  NVME_CC_CSS_MASK = 112,
1: +  NVME_CC_AMS_RR = 0,
1: +  NVME_CC_AMS_WRRU = 2048,
1: +  NVME_CC_AMS_VS = 14336,
1: +  NVME_CC_SHN_NONE = 0,
1: +  NVME_CC_SHN_NORMAL = 16384,
1: +  NVME_CC_SHN_ABRUPT = 32768,
1: +  NVME_CC_SHN_MASK = 49152,
1: +  NVME_CC_IOSQES = 393216,
1: +  NVME_CC_IOCQES = 4194304,
1: +  NVME_CAP_CSS_NVM = 1,
1: +  NVME_CAP_CSS_CSI = 64,
1: +  NVME_CSTS_RDY = 1,
1: +  NVME_CSTS_CFS = 2,
1: +  NVME_CSTS_NSSRO = 16,
1: +  NVME_CSTS_PP = 32,
1: +  NVME_CSTS_SHST_NORMAL = 0,
1: +  NVME_CSTS_SHST_OCCUR = 4,
1: +  NVME_CSTS_SHST_CMPLT = 8,
1: +  NVME_CSTS_SHST_MASK = 12,
1: +};
1: +
1: +enum {
1: +  NVME_AEN_BIT_NS_ATTR = 8,
1: +  NVME_AEN_BIT_FW_ACT = 9,
1: +  NVME_AEN_BIT_ANA_CHANGE = 11,
1: +  NVME_AEN_BIT_DISC_CHANGE = 31,
1: +};
1: +
1: +enum {
1: +  SWITCHTEC_GAS_MRPC_OFFSET = 0,
1: +  SWITCHTEC_GAS_TOP_CFG_OFFSET = 4096,
1: +  SWITCHTEC_GAS_SW_EVENT_OFFSET = 6144,
1: +  SWITCHTEC_GAS_SYS_INFO_OFFSET = 8192,
1: +  SWITCHTEC_GAS_FLASH_INFO_OFFSET = 8704,
1: +  SWITCHTEC_GAS_PART_CFG_OFFSET = 16384,
1: +  SWITCHTEC_GAS_NTB_OFFSET = 65536,
1: +  SWITCHTEC_GAS_PFF_CSR_OFFSET = 1261568,
1: +};
1: +
1: +enum {
1: +  SWITCHTEC_NTB_REG_INFO_OFFSET = 0,
1: +  SWITCHTEC_NTB_REG_CTRL_OFFSET = 16384,
1: +  SWITCHTEC_NTB_REG_DBMSG_OFFSET = 409600,
1:  };
1:  
1:  struct nt_partition_info {
1: -	u32 xlink_enabled;
1: -	u32 target_part_low;
1: -	u32 target_part_high;
1: -	u32 reserved;
1: +  u32 xlink_enabled;
1: +  u32 target_part_low;
1: +  u32 target_part_high;
1: +  u32 reserved;
1:  };
1:  
1:  struct ntb_info_regs {
1: -	u8 partition_count;
1: -	u8 partition_id;
1: -	u16 reserved1;
1: -	u64 ep_map;
1: -	u16 requester_id;
1: -	u16 reserved2;
1: -	u32 reserved3[4];
1: -	struct nt_partition_info ntp_info[48];
1: +  u8 partition_count;
1: +  u8 partition_id;
1: +  u16 reserved1;
1: +  u64 ep_map;
1: +  u16 requester_id;
1: +  u16 reserved2;
1: +  u32 reserved3[4];
1: +  struct nt_partition_info ntp_info[48];
1:  } __attribute__((packed));
1:  
1:  struct ntb_ctrl_regs {
1: -	u32 partition_status;
1: -	u32 partition_op;
1: -	u32 partition_ctrl;
1: -	u32 bar_setup;
1: -	u32 bar_error;
1: -	u16 lut_table_entries;
1: -	u16 lut_table_offset;
1: -	u32 lut_error;
1: -	u16 req_id_table_size;
1: -	u16 req_id_table_offset;
1: -	u32 req_id_error;
1: -	u32 reserved1[7];
1: -	struct {
1: -		u32 ctl;
1: -		u32 win_size;
1: -		u64 xlate_addr;
1: -	} bar_entry[6];
1: -	struct {
1: -		u32 win_size;
1: -		u32 reserved[3];
1: -	} bar_ext_entry[6];
1: -	u32 reserved2[192];
1: -	u32 req_id_table[512];
1: -	u32 reserved3[256];
1: -	u64 lut_entry[512];
1: +  u32 partition_status;
1: +  u32 partition_op;
1: +  u32 partition_ctrl;
1: +  u32 bar_setup;
1: +  u32 bar_error;
1: +  u16 lut_table_entries;
1: +  u16 lut_table_offset;
1: +  u32 lut_error;
1: +  u16 req_id_table_size;
1: +  u16 req_id_table_offset;
1: +  u32 req_id_error;
1: +  u32 reserved1[7];
1: +  struct {
1: +    u32 ctl;
1: +    u32 win_size;
1: +    u64 xlate_addr;
1: +  } bar_entry[6];
1: +  struct {
1: +    u32 win_size;
1: +    u32 reserved[3];
1: +  } bar_ext_entry[6];
1: +  u32 reserved2[192];
1: +  u32 req_id_table[512];
1: +  u32 reserved3[256];
1: +  u64 lut_entry[512];
1:  };
1:  
1:  struct pci_dev_reset_methods {
1: -	u16 vendor;
1: -	u16 device;
1: -	int (*reset)(struct pci_dev *, int);
1: +  u16 vendor;
1: +  u16 device;
1: +  int (*reset)(struct pci_dev *, int);
1:  };
1:  
1:  struct pci_dev_acs_enabled {
1: -	u16 vendor;
1: -	u16 device;
1: -	int (*acs_enabled)(struct pci_dev *, u16);
1: +  u16 vendor;
1: +  u16 device;
1: +  int (*acs_enabled)(struct pci_dev *, u16);
1:  };
1:  
1:  struct pci_dev_acs_ops {
1: -	u16 vendor;
1: -	u16 device;
1: -	int (*enable_acs)(struct pci_dev *);
1: -	int (*disable_acs_redir)(struct pci_dev *);
1: +  u16 vendor;
1: +  u16 device;
1: +  int (*enable_acs)(struct pci_dev *);
1: +  int (*disable_acs_redir)(struct pci_dev *);
1:  };
1:  
1:  struct msix_entry {
1: -	u32 vector;
1: -	u16 entry;
1: +  u32 vector;
1: +  u16 entry;
1:  };
1:  
1:  enum dmi_device_type {
1: -	DMI_DEV_TYPE_ANY = 0,
1: -	DMI_DEV_TYPE_OTHER = 1,
1: -	DMI_DEV_TYPE_UNKNOWN = 2,
1: -	DMI_DEV_TYPE_VIDEO = 3,
1: -	DMI_DEV_TYPE_SCSI = 4,
1: -	DMI_DEV_TYPE_ETHERNET = 5,
1: -	DMI_DEV_TYPE_TOKENRING = 6,
1: -	DMI_DEV_TYPE_SOUND = 7,
1: -	DMI_DEV_TYPE_PATA = 8,
1: -	DMI_DEV_TYPE_SATA = 9,
1: -	DMI_DEV_TYPE_SAS = 10,
1: -	DMI_DEV_TYPE_IPMI = 4294967295,
1: -	DMI_DEV_TYPE_OEM_STRING = 4294967294,
1: -	DMI_DEV_TYPE_DEV_ONBOARD = 4294967293,
1: -	DMI_DEV_TYPE_DEV_SLOT = 4294967292,
1: +  DMI_DEV_TYPE_ANY = 0,
1: +  DMI_DEV_TYPE_OTHER = 1,
1: +  DMI_DEV_TYPE_UNKNOWN = 2,
1: +  DMI_DEV_TYPE_VIDEO = 3,
1: +  DMI_DEV_TYPE_SCSI = 4,
1: +  DMI_DEV_TYPE_ETHERNET = 5,
1: +  DMI_DEV_TYPE_TOKENRING = 6,
1: +  DMI_DEV_TYPE_SOUND = 7,
1: +  DMI_DEV_TYPE_PATA = 8,
1: +  DMI_DEV_TYPE_SATA = 9,
1: +  DMI_DEV_TYPE_SAS = 10,
1: +  DMI_DEV_TYPE_IPMI = 4294967295,
1: +  DMI_DEV_TYPE_OEM_STRING = 4294967294,
1: +  DMI_DEV_TYPE_DEV_ONBOARD = 4294967293,
1: +  DMI_DEV_TYPE_DEV_SLOT = 4294967292,
1:  };
1:  
1:  struct dmi_device {
1: -	struct list_head list;
1: -	int type;
1: -	const char *name;
1: -	void *device_data;
1: +  struct list_head list;
1: +  int type;
1: +  const char *name;
1: +  void *device_data;
1:  };
1:  
1:  struct dmi_dev_onboard {
1: -	struct dmi_device dev;
1: -	int instance;
1: -	int segment;
1: -	int bus;
1: -	int devfn;
1: +  struct dmi_device dev;
1: +  int instance;
1: +  int segment;
1: +  int bus;
1: +  int devfn;
1:  };
1:  
1:  enum smbios_attr_enum {
1: -	SMBIOS_ATTR_NONE = 0,
1: -	SMBIOS_ATTR_LABEL_SHOW = 1,
1: -	SMBIOS_ATTR_INSTANCE_SHOW = 2,
1: +  SMBIOS_ATTR_NONE = 0,
1: +  SMBIOS_ATTR_LABEL_SHOW = 1,
1: +  SMBIOS_ATTR_INSTANCE_SHOW = 2,
1:  };
1:  
1:  enum acpi_attr_enum {
1: -	ACPI_ATTR_LABEL_SHOW = 0,
1: -	ACPI_ATTR_INDEX_SHOW = 1,
1: +  ACPI_ATTR_LABEL_SHOW = 0,
1: +  ACPI_ATTR_INDEX_SHOW = 1,
1:  };
1:  
1:  enum hdmi_infoframe_type {
1: -	HDMI_INFOFRAME_TYPE_VENDOR = 129,
1: -	HDMI_INFOFRAME_TYPE_AVI = 130,
1: -	HDMI_INFOFRAME_TYPE_SPD = 131,
1: -	HDMI_INFOFRAME_TYPE_AUDIO = 132,
1: -	HDMI_INFOFRAME_TYPE_DRM = 135,
1: +  HDMI_INFOFRAME_TYPE_VENDOR = 129,
1: +  HDMI_INFOFRAME_TYPE_AVI = 130,
1: +  HDMI_INFOFRAME_TYPE_SPD = 131,
1: +  HDMI_INFOFRAME_TYPE_AUDIO = 132,
1: +  HDMI_INFOFRAME_TYPE_DRM = 135,
1:  };
1:  
1:  struct hdmi_any_infoframe {
1: -	enum hdmi_infoframe_type type;
1: -	unsigned char version;
1: -	unsigned char length;
1: +  enum hdmi_infoframe_type type;
1: +  unsigned char version;
1: +  unsigned char length;
1:  };
1:  
1:  enum hdmi_colorspace {
1: -	HDMI_COLORSPACE_RGB = 0,
1: -	HDMI_COLORSPACE_YUV422 = 1,
1: -	HDMI_COLORSPACE_YUV444 = 2,
1: -	HDMI_COLORSPACE_YUV420 = 3,
1: -	HDMI_COLORSPACE_RESERVED4 = 4,
1: -	HDMI_COLORSPACE_RESERVED5 = 5,
1: -	HDMI_COLORSPACE_RESERVED6 = 6,
1: -	HDMI_COLORSPACE_IDO_DEFINED = 7,
1: +  HDMI_COLORSPACE_RGB = 0,
1: +  HDMI_COLORSPACE_YUV422 = 1,
1: +  HDMI_COLORSPACE_YUV444 = 2,
1: +  HDMI_COLORSPACE_YUV420 = 3,
1: +  HDMI_COLORSPACE_RESERVED4 = 4,
1: +  HDMI_COLORSPACE_RESERVED5 = 5,
1: +  HDMI_COLORSPACE_RESERVED6 = 6,
1: +  HDMI_COLORSPACE_IDO_DEFINED = 7,
1:  };
1:  
1:  enum hdmi_scan_mode {
1: -	HDMI_SCAN_MODE_NONE = 0,
1: -	HDMI_SCAN_MODE_OVERSCAN = 1,
1: -	HDMI_SCAN_MODE_UNDERSCAN = 2,
1: -	HDMI_SCAN_MODE_RESERVED = 3,
1: +  HDMI_SCAN_MODE_NONE = 0,
1: +  HDMI_SCAN_MODE_OVERSCAN = 1,
1: +  HDMI_SCAN_MODE_UNDERSCAN = 2,
1: +  HDMI_SCAN_MODE_RESERVED = 3,
1:  };
1:  
1:  enum hdmi_colorimetry {
1: -	HDMI_COLORIMETRY_NONE = 0,
1: -	HDMI_COLORIMETRY_ITU_601 = 1,
1: -	HDMI_COLORIMETRY_ITU_709 = 2,
1: -	HDMI_COLORIMETRY_EXTENDED = 3,
1: +  HDMI_COLORIMETRY_NONE = 0,
1: +  HDMI_COLORIMETRY_ITU_601 = 1,
1: +  HDMI_COLORIMETRY_ITU_709 = 2,
1: +  HDMI_COLORIMETRY_EXTENDED = 3,
1:  };
1:  
1:  enum hdmi_picture_aspect {
1: -	HDMI_PICTURE_ASPECT_NONE = 0,
1: -	HDMI_PICTURE_ASPECT_4_3 = 1,
1: -	HDMI_PICTURE_ASPECT_16_9 = 2,
1: -	HDMI_PICTURE_ASPECT_64_27 = 3,
1: -	HDMI_PICTURE_ASPECT_256_135 = 4,
1: -	HDMI_PICTURE_ASPECT_RESERVED = 5,
1: +  HDMI_PICTURE_ASPECT_NONE = 0,
1: +  HDMI_PICTURE_ASPECT_4_3 = 1,
1: +  HDMI_PICTURE_ASPECT_16_9 = 2,
1: +  HDMI_PICTURE_ASPECT_64_27 = 3,
1: +  HDMI_PICTURE_ASPECT_256_135 = 4,
1: +  HDMI_PICTURE_ASPECT_RESERVED = 5,
1:  };
1:  
1:  enum hdmi_active_aspect {
1: -	HDMI_ACTIVE_ASPECT_16_9_TOP = 2,
1: -	HDMI_ACTIVE_ASPECT_14_9_TOP = 3,
1: -	HDMI_ACTIVE_ASPECT_16_9_CENTER = 4,
1: -	HDMI_ACTIVE_ASPECT_PICTURE = 8,
1: -	HDMI_ACTIVE_ASPECT_4_3 = 9,
1: -	HDMI_ACTIVE_ASPECT_16_9 = 10,
1: -	HDMI_ACTIVE_ASPECT_14_9 = 11,
1: -	HDMI_ACTIVE_ASPECT_4_3_SP_14_9 = 13,
1: -	HDMI_ACTIVE_ASPECT_16_9_SP_14_9 = 14,
1: -	HDMI_ACTIVE_ASPECT_16_9_SP_4_3 = 15,
1: +  HDMI_ACTIVE_ASPECT_16_9_TOP = 2,
1: +  HDMI_ACTIVE_ASPECT_14_9_TOP = 3,
1: +  HDMI_ACTIVE_ASPECT_16_9_CENTER = 4,
1: +  HDMI_ACTIVE_ASPECT_PICTURE = 8,
1: +  HDMI_ACTIVE_ASPECT_4_3 = 9,
1: +  HDMI_ACTIVE_ASPECT_16_9 = 10,
1: +  HDMI_ACTIVE_ASPECT_14_9 = 11,
1: +  HDMI_ACTIVE_ASPECT_4_3_SP_14_9 = 13,
1: +  HDMI_ACTIVE_ASPECT_16_9_SP_14_9 = 14,
1: +  HDMI_ACTIVE_ASPECT_16_9_SP_4_3 = 15,
1:  };
1:  
1:  enum hdmi_extended_colorimetry {
1: -	HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 = 0,
1: -	HDMI_EXTENDED_COLORIMETRY_XV_YCC_709 = 1,
1: -	HDMI_EXTENDED_COLORIMETRY_S_YCC_601 = 2,
1: -	HDMI_EXTENDED_COLORIMETRY_OPYCC_601 = 3,
1: -	HDMI_EXTENDED_COLORIMETRY_OPRGB = 4,
1: -	HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM = 5,
1: -	HDMI_EXTENDED_COLORIMETRY_BT2020 = 6,
1: -	HDMI_EXTENDED_COLORIMETRY_RESERVED = 7,
1: +  HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 = 0,
1: +  HDMI_EXTENDED_COLORIMETRY_XV_YCC_709 = 1,
1: +  HDMI_EXTENDED_COLORIMETRY_S_YCC_601 = 2,
1: +  HDMI_EXTENDED_COLORIMETRY_OPYCC_601 = 3,
1: +  HDMI_EXTENDED_COLORIMETRY_OPRGB = 4,
1: +  HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM = 5,
1: +  HDMI_EXTENDED_COLORIMETRY_BT2020 = 6,
1: +  HDMI_EXTENDED_COLORIMETRY_RESERVED = 7,
1:  };
1:  
1:  enum hdmi_quantization_range {
1: -	HDMI_QUANTIZATION_RANGE_DEFAULT = 0,
1: -	HDMI_QUANTIZATION_RANGE_LIMITED = 1,
1: -	HDMI_QUANTIZATION_RANGE_FULL = 2,
1: -	HDMI_QUANTIZATION_RANGE_RESERVED = 3,
1: +  HDMI_QUANTIZATION_RANGE_DEFAULT = 0,
1: +  HDMI_QUANTIZATION_RANGE_LIMITED = 1,
1: +  HDMI_QUANTIZATION_RANGE_FULL = 2,
1: +  HDMI_QUANTIZATION_RANGE_RESERVED = 3,
1:  };
1:  
1:  enum hdmi_nups {
1: -	HDMI_NUPS_UNKNOWN = 0,
1: -	HDMI_NUPS_HORIZONTAL = 1,
1: -	HDMI_NUPS_VERTICAL = 2,
1: -	HDMI_NUPS_BOTH = 3,
1: +  HDMI_NUPS_UNKNOWN = 0,
1: +  HDMI_NUPS_HORIZONTAL = 1,
1: +  HDMI_NUPS_VERTICAL = 2,
1: +  HDMI_NUPS_BOTH = 3,
1:  };
1:  
1:  enum hdmi_ycc_quantization_range {
1: -	HDMI_YCC_QUANTIZATION_RANGE_LIMITED = 0,
1: -	HDMI_YCC_QUANTIZATION_RANGE_FULL = 1,
1: +  HDMI_YCC_QUANTIZATION_RANGE_LIMITED = 0,
1: +  HDMI_YCC_QUANTIZATION_RANGE_FULL = 1,
1:  };
1:  
1:  enum hdmi_content_type {
1: -	HDMI_CONTENT_TYPE_GRAPHICS = 0,
1: -	HDMI_CONTENT_TYPE_PHOTO = 1,
1: -	HDMI_CONTENT_TYPE_CINEMA = 2,
1: -	HDMI_CONTENT_TYPE_GAME = 3,
1: +  HDMI_CONTENT_TYPE_GRAPHICS = 0,
1: +  HDMI_CONTENT_TYPE_PHOTO = 1,
1: +  HDMI_CONTENT_TYPE_CINEMA = 2,
1: +  HDMI_CONTENT_TYPE_GAME = 3,
1:  };
1:  
1:  enum hdmi_metadata_type {
1: -	HDMI_STATIC_METADATA_TYPE1 = 1,
1: +  HDMI_STATIC_METADATA_TYPE1 = 1,
1:  };
1:  
1:  enum hdmi_eotf {
1: -	HDMI_EOTF_TRADITIONAL_GAMMA_SDR = 0,
1: -	HDMI_EOTF_TRADITIONAL_GAMMA_HDR = 1,
1: -	HDMI_EOTF_SMPTE_ST2084 = 2,
1: -	HDMI_EOTF_BT_2100_HLG = 3,
1: +  HDMI_EOTF_TRADITIONAL_GAMMA_SDR = 0,
1: +  HDMI_EOTF_TRADITIONAL_GAMMA_HDR = 1,
1: +  HDMI_EOTF_SMPTE_ST2084 = 2,
1: +  HDMI_EOTF_BT_2100_HLG = 3,
1:  };
1:  
1:  struct hdmi_avi_infoframe {
1: -	enum hdmi_infoframe_type type;
1: -	unsigned char version;
1: -	unsigned char length;
1: -	enum hdmi_colorspace colorspace;
1: -	enum hdmi_scan_mode scan_mode;
1: -	enum hdmi_colorimetry colorimetry;
1: -	enum hdmi_picture_aspect picture_aspect;
1: -	enum hdmi_active_aspect active_aspect;
1: -	bool itc;
1: -	enum hdmi_extended_colorimetry extended_colorimetry;
1: -	enum hdmi_quantization_range quantization_range;
1: -	enum hdmi_nups nups;
1: -	unsigned char video_code;
1: -	enum hdmi_ycc_quantization_range ycc_quantization_range;
1: -	enum hdmi_content_type content_type;
1: -	unsigned char pixel_repeat;
1: -	short unsigned int top_bar;
1: -	short unsigned int bottom_bar;
1: -	short unsigned int left_bar;
1: -	short unsigned int right_bar;
1: +  enum hdmi_infoframe_type type;
1: +  unsigned char version;
1: +  unsigned char length;
1: +  enum hdmi_colorspace colorspace;
1: +  enum hdmi_scan_mode scan_mode;
1: +  enum hdmi_colorimetry colorimetry;
1: +  enum hdmi_picture_aspect picture_aspect;
1: +  enum hdmi_active_aspect active_aspect;
1: +  bool itc;
1: +  enum hdmi_extended_colorimetry extended_colorimetry;
1: +  enum hdmi_quantization_range quantization_range;
1: +  enum hdmi_nups nups;
1: +  unsigned char video_code;
1: +  enum hdmi_ycc_quantization_range ycc_quantization_range;
1: +  enum hdmi_content_type content_type;
1: +  unsigned char pixel_repeat;
1: +  short unsigned int top_bar;
1: +  short unsigned int bottom_bar;
1: +  short unsigned int left_bar;
1: +  short unsigned int right_bar;
1:  };
1:  
1:  struct hdmi_drm_infoframe {
1: -	enum hdmi_infoframe_type type;
1: -	unsigned char version;
1: -	unsigned char length;
1: -	enum hdmi_eotf eotf;
1: -	enum hdmi_metadata_type metadata_type;
1: -	struct {
1: -		u16 x;
1: -		u16 y;
1: -	} display_primaries[3];
1: -	struct {
1: -		u16 x;
1: -		u16 y;
1: -	} white_point;
1: -	u16 max_display_mastering_luminance;
1: -	u16 min_display_mastering_luminance;
1: -	u16 max_cll;
1: -	u16 max_fall;
1: +  enum hdmi_infoframe_type type;
1: +  unsigned char version;
1: +  unsigned char length;
1: +  enum hdmi_eotf eotf;
1: +  enum hdmi_metadata_type metadata_type;
1: +  struct {
1: +    u16 x;
1: +    u16 y;
1: +  } display_primaries[3];
1: +  struct {
1: +    u16 x;
1: +    u16 y;
1: +  } white_point;
1: +  u16 max_display_mastering_luminance;
1: +  u16 min_display_mastering_luminance;
1: +  u16 max_cll;
1: +  u16 max_fall;
1:  };
1:  
1:  enum hdmi_spd_sdi {
1: -	HDMI_SPD_SDI_UNKNOWN = 0,
1: -	HDMI_SPD_SDI_DSTB = 1,
1: -	HDMI_SPD_SDI_DVDP = 2,
1: -	HDMI_SPD_SDI_DVHS = 3,
1: -	HDMI_SPD_SDI_HDDVR = 4,
1: -	HDMI_SPD_SDI_DVC = 5,
1: -	HDMI_SPD_SDI_DSC = 6,
1: -	HDMI_SPD_SDI_VCD = 7,
1: -	HDMI_SPD_SDI_GAME = 8,
1: -	HDMI_SPD_SDI_PC = 9,
1: -	HDMI_SPD_SDI_BD = 10,
1: -	HDMI_SPD_SDI_SACD = 11,
1: -	HDMI_SPD_SDI_HDDVD = 12,
1: -	HDMI_SPD_SDI_PMP = 13,
1: +  HDMI_SPD_SDI_UNKNOWN = 0,
1: +  HDMI_SPD_SDI_DSTB = 1,
1: +  HDMI_SPD_SDI_DVDP = 2,
1: +  HDMI_SPD_SDI_DVHS = 3,
1: +  HDMI_SPD_SDI_HDDVR = 4,
1: +  HDMI_SPD_SDI_DVC = 5,
1: +  HDMI_SPD_SDI_DSC = 6,
1: +  HDMI_SPD_SDI_VCD = 7,
1: +  HDMI_SPD_SDI_GAME = 8,
1: +  HDMI_SPD_SDI_PC = 9,
1: +  HDMI_SPD_SDI_BD = 10,
1: +  HDMI_SPD_SDI_SACD = 11,
1: +  HDMI_SPD_SDI_HDDVD = 12,
1: +  HDMI_SPD_SDI_PMP = 13,
1:  };
1:  
1:  struct hdmi_spd_infoframe {
1: -	enum hdmi_infoframe_type type;
1: -	unsigned char version;
1: -	unsigned char length;
1: -	char vendor[8];
1: -	char product[16];
1: -	enum hdmi_spd_sdi sdi;
1: +  enum hdmi_infoframe_type type;
1: +  unsigned char version;
1: +  unsigned char length;
1: +  char vendor[8];
1: +  char product[16];
1: +  enum hdmi_spd_sdi sdi;
1:  };
1:  
1:  enum hdmi_audio_coding_type {
1: -	HDMI_AUDIO_CODING_TYPE_STREAM = 0,
1: -	HDMI_AUDIO_CODING_TYPE_PCM = 1,
1: -	HDMI_AUDIO_CODING_TYPE_AC3 = 2,
1: -	HDMI_AUDIO_CODING_TYPE_MPEG1 = 3,
1: -	HDMI_AUDIO_CODING_TYPE_MP3 = 4,
1: -	HDMI_AUDIO_CODING_TYPE_MPEG2 = 5,
1: -	HDMI_AUDIO_CODING_TYPE_AAC_LC = 6,
1: -	HDMI_AUDIO_CODING_TYPE_DTS = 7,
1: -	HDMI_AUDIO_CODING_TYPE_ATRAC = 8,
1: -	HDMI_AUDIO_CODING_TYPE_DSD = 9,
1: -	HDMI_AUDIO_CODING_TYPE_EAC3 = 10,
1: -	HDMI_AUDIO_CODING_TYPE_DTS_HD = 11,
1: -	HDMI_AUDIO_CODING_TYPE_MLP = 12,
1: -	HDMI_AUDIO_CODING_TYPE_DST = 13,
1: -	HDMI_AUDIO_CODING_TYPE_WMA_PRO = 14,
1: -	HDMI_AUDIO_CODING_TYPE_CXT = 15,
1: +  HDMI_AUDIO_CODING_TYPE_STREAM = 0,
1: +  HDMI_AUDIO_CODING_TYPE_PCM = 1,
1: +  HDMI_AUDIO_CODING_TYPE_AC3 = 2,
1: +  HDMI_AUDIO_CODING_TYPE_MPEG1 = 3,
1: +  HDMI_AUDIO_CODING_TYPE_MP3 = 4,
1: +  HDMI_AUDIO_CODING_TYPE_MPEG2 = 5,
1: +  HDMI_AUDIO_CODING_TYPE_AAC_LC = 6,
1: +  HDMI_AUDIO_CODING_TYPE_DTS = 7,
1: +  HDMI_AUDIO_CODING_TYPE_ATRAC = 8,
1: +  HDMI_AUDIO_CODING_TYPE_DSD = 9,
1: +  HDMI_AUDIO_CODING_TYPE_EAC3 = 10,
1: +  HDMI_AUDIO_CODING_TYPE_DTS_HD = 11,
1: +  HDMI_AUDIO_CODING_TYPE_MLP = 12,
1: +  HDMI_AUDIO_CODING_TYPE_DST = 13,
1: +  HDMI_AUDIO_CODING_TYPE_WMA_PRO = 14,
1: +  HDMI_AUDIO_CODING_TYPE_CXT = 15,
1:  };
1:  
1:  enum hdmi_audio_sample_size {
1: -	HDMI_AUDIO_SAMPLE_SIZE_STREAM = 0,
1: -	HDMI_AUDIO_SAMPLE_SIZE_16 = 1,
1: -	HDMI_AUDIO_SAMPLE_SIZE_20 = 2,
1: -	HDMI_AUDIO_SAMPLE_SIZE_24 = 3,
1: +  HDMI_AUDIO_SAMPLE_SIZE_STREAM = 0,
1: +  HDMI_AUDIO_SAMPLE_SIZE_16 = 1,
1: +  HDMI_AUDIO_SAMPLE_SIZE_20 = 2,
1: +  HDMI_AUDIO_SAMPLE_SIZE_24 = 3,
1:  };
1:  
1:  enum hdmi_audio_sample_frequency {
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM = 0,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_32000 = 1,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_44100 = 2,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_48000 = 3,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_88200 = 4,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_96000 = 5,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_176400 = 6,
1: -	HDMI_AUDIO_SAMPLE_FREQUENCY_192000 = 7,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM = 0,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_32000 = 1,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_44100 = 2,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_48000 = 3,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_88200 = 4,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_96000 = 5,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_176400 = 6,
1: +  HDMI_AUDIO_SAMPLE_FREQUENCY_192000 = 7,
1:  };
1:  
1:  enum hdmi_audio_coding_type_ext {
1: -	HDMI_AUDIO_CODING_TYPE_EXT_CT = 0,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC = 1,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2 = 2,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND = 3,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC = 4,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2 = 5,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC = 6,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_DRA = 7,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_SURROUND = 8,
1: -	HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND = 10,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_CT = 0,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC = 1,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2 = 2,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND = 3,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC = 4,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2 = 5,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC = 6,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_DRA = 7,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_SURROUND = 8,
1: +  HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND = 10,
1:  };
1:  
1:  struct hdmi_audio_infoframe {
1: -	enum hdmi_infoframe_type type;
1: -	unsigned char version;
1: -	unsigned char length;
1: -	unsigned char channels;
1: -	enum hdmi_audio_coding_type coding_type;
1: -	enum hdmi_audio_sample_size sample_size;
1: -	enum hdmi_audio_sample_frequency sample_frequency;
1: -	enum hdmi_audio_coding_type_ext coding_type_ext;
1: -	unsigned char channel_allocation;
1: -	unsigned char level_shift_value;
1: -	bool downmix_inhibit;
1: +  enum hdmi_infoframe_type type;
1: +  unsigned char version;
1: +  unsigned char length;
1: +  unsigned char channels;
1: +  enum hdmi_audio_coding_type coding_type;
1: +  enum hdmi_audio_sample_size sample_size;
1: +  enum hdmi_audio_sample_frequency sample_frequency;
1: +  enum hdmi_audio_coding_type_ext coding_type_ext;
1: +  unsigned char channel_allocation;
1: +  unsigned char level_shift_value;
1: +  bool downmix_inhibit;
1:  };
1:  
1:  enum hdmi_3d_structure {
1: -	HDMI_3D_STRUCTURE_INVALID = 4294967295,
1: -	HDMI_3D_STRUCTURE_FRAME_PACKING = 0,
1: -	HDMI_3D_STRUCTURE_FIELD_ALTERNATIVE = 1,
1: -	HDMI_3D_STRUCTURE_LINE_ALTERNATIVE = 2,
1: -	HDMI_3D_STRUCTURE_SIDE_BY_SIDE_FULL = 3,
1: -	HDMI_3D_STRUCTURE_L_DEPTH = 4,
1: -	HDMI_3D_STRUCTURE_L_DEPTH_GFX_GFX_DEPTH = 5,
1: -	HDMI_3D_STRUCTURE_TOP_AND_BOTTOM = 6,
1: -	HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF = 8,
1: +  HDMI_3D_STRUCTURE_INVALID = 4294967295,
1: +  HDMI_3D_STRUCTURE_FRAME_PACKING = 0,
1: +  HDMI_3D_STRUCTURE_FIELD_ALTERNATIVE = 1,
1: +  HDMI_3D_STRUCTURE_LINE_ALTERNATIVE = 2,
1: +  HDMI_3D_STRUCTURE_SIDE_BY_SIDE_FULL = 3,
1: +  HDMI_3D_STRUCTURE_L_DEPTH = 4,
1: +  HDMI_3D_STRUCTURE_L_DEPTH_GFX_GFX_DEPTH = 5,
1: +  HDMI_3D_STRUCTURE_TOP_AND_BOTTOM = 6,
1: +  HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF = 8,
1:  };
1:  
1:  struct hdmi_vendor_infoframe {
1: -	enum hdmi_infoframe_type type;
1: -	unsigned char version;
1: -	unsigned char length;
1: -	unsigned int oui;
1: -	u8 vic;
1: -	enum hdmi_3d_structure s3d_struct;
1: -	unsigned int s3d_ext_data;
1: +  enum hdmi_infoframe_type type;
1: +  unsigned char version;
1: +  unsigned char length;
1: +  unsigned int oui;
1: +  u8 vic;
1: +  enum hdmi_3d_structure s3d_struct;
1: +  unsigned int s3d_ext_data;
1:  };
1:  
1:  union hdmi_vendor_any_infoframe {
1: -	struct {
1: -		enum hdmi_infoframe_type type;
1: -		unsigned char version;
1: -		unsigned char length;
1: -		unsigned int oui;
1: -	} any;
1: -	struct hdmi_vendor_infoframe hdmi;
1: +  struct {
1: +    enum hdmi_infoframe_type type;
1: +    unsigned char version;
1: +    unsigned char length;
1: +    unsigned int oui;
1: +  } any;
1: +  struct hdmi_vendor_infoframe hdmi;
1:  };
1:  
1:  union hdmi_infoframe {
1: -	struct hdmi_any_infoframe any;
1: -	struct hdmi_avi_infoframe avi;
1: -	struct hdmi_spd_infoframe spd;
1: -	union hdmi_vendor_any_infoframe vendor;
1: -	struct hdmi_audio_infoframe audio;
1: -	struct hdmi_drm_infoframe drm;
1: +  struct hdmi_any_infoframe any;
1: +  struct hdmi_avi_infoframe avi;
1: +  struct hdmi_spd_infoframe spd;
1: +  union hdmi_vendor_any_infoframe vendor;
1: +  struct hdmi_audio_infoframe audio;
1: +  struct hdmi_drm_infoframe drm;
1:  };
1:  
1:  struct vc {
1: -	struct vc_data *d;
1: -	struct work_struct SAK_work;
1: +  struct vc_data *d;
1: +  struct work_struct SAK_work;
1:  };
1:  
1:  struct vgastate {
1: -	void *vgabase;
1: -	long unsigned int membase;
1: -	__u32 memsize;
1: -	__u32 flags;
1: -	__u32 depth;
1: -	__u32 num_attr;
1: -	__u32 num_crtc;
1: -	__u32 num_gfx;
1: -	__u32 num_seq;
1: -	void *vidstate;
1: +  void *vgabase;
1: +  long unsigned int membase;
1: +  __u32 memsize;
1: +  __u32 flags;
1: +  __u32 depth;
1: +  __u32 num_attr;
1: +  __u32 num_crtc;
1: +  __u32 num_gfx;
1: +  __u32 num_seq;
1: +  void *vidstate;
1:  };
1:  
1:  struct linux_logo {
1: -	int type;
1: -	unsigned int width;
1: -	unsigned int height;
1: -	unsigned int clutsize;
1: -	const unsigned char *clut;
1: -	const unsigned char *data;
1: +  int type;
1: +  unsigned int width;
1: +  unsigned int height;
1: +  unsigned int clutsize;
1: +  const unsigned char *clut;
1: +  const unsigned char *data;
1:  };
1:  
1:  struct fb_fix_screeninfo {
1: -	char id[16];
1: -	long unsigned int smem_start;
1: -	__u32 smem_len;
1: -	__u32 type;
1: -	__u32 type_aux;
1: -	__u32 visual;
1: -	__u16 xpanstep;
1: -	__u16 ypanstep;
1: -	__u16 ywrapstep;
1: -	__u32 line_length;
1: -	long unsigned int mmio_start;
1: -	__u32 mmio_len;
1: -	__u32 accel;
1: -	__u16 capabilities;
1: -	__u16 reserved[2];
1: +  char id[16];
1: +  long unsigned int smem_start;
1: +  __u32 smem_len;
1: +  __u32 type;
1: +  __u32 type_aux;
1: +  __u32 visual;
1: +  __u16 xpanstep;
1: +  __u16 ypanstep;
1: +  __u16 ywrapstep;
1: +  __u32 line_length;
1: +  long unsigned int mmio_start;
1: +  __u32 mmio_len;
1: +  __u32 accel;
1: +  __u16 capabilities;
1: +  __u16 reserved[2];
1:  };
1:  
1:  struct fb_bitfield {
1: -	__u32 offset;
1: -	__u32 length;
1: -	__u32 msb_right;
1: +  __u32 offset;
1: +  __u32 length;
1: +  __u32 msb_right;
1:  };
1:  
1:  struct fb_var_screeninfo {
1: -	__u32 xres;
1: -	__u32 yres;
1: -	__u32 xres_virtual;
1: -	__u32 yres_virtual;
1: -	__u32 xoffset;
1: -	__u32 yoffset;
1: -	__u32 bits_per_pixel;
1: -	__u32 grayscale;
1: -	struct fb_bitfield red;
1: -	struct fb_bitfield green;
1: -	struct fb_bitfield blue;
1: -	struct fb_bitfield transp;
1: -	__u32 nonstd;
1: -	__u32 activate;
1: -	__u32 height;
1: -	__u32 width;
1: -	__u32 accel_flags;
1: -	__u32 pixclock;
1: -	__u32 left_margin;
1: -	__u32 right_margin;
1: -	__u32 upper_margin;
1: -	__u32 lower_margin;
1: -	__u32 hsync_len;
1: -	__u32 vsync_len;
1: -	__u32 sync;
1: -	__u32 vmode;
1: -	__u32 rotate;
1: -	__u32 colorspace;
1: -	__u32 reserved[4];
1: +  __u32 xres;
1: +  __u32 yres;
1: +  __u32 xres_virtual;
1: +  __u32 yres_virtual;
1: +  __u32 xoffset;
1: +  __u32 yoffset;
1: +  __u32 bits_per_pixel;
1: +  __u32 grayscale;
1: +  struct fb_bitfield red;
1: +  struct fb_bitfield green;
1: +  struct fb_bitfield blue;
1: +  struct fb_bitfield transp;
1: +  __u32 nonstd;
1: +  __u32 activate;
1: +  __u32 height;
1: +  __u32 width;
1: +  __u32 accel_flags;
1: +  __u32 pixclock;
1: +  __u32 left_margin;
1: +  __u32 right_margin;
1: +  __u32 upper_margin;
1: +  __u32 lower_margin;
1: +  __u32 hsync_len;
1: +  __u32 vsync_len;
1: +  __u32 sync;
1: +  __u32 vmode;
1: +  __u32 rotate;
1: +  __u32 colorspace;
1: +  __u32 reserved[4];
1:  };
1:  
1:  struct fb_cmap {
1: -	__u32 start;
1: -	__u32 len;
1: -	__u16 *red;
1: -	__u16 *green;
1: -	__u16 *blue;
1: -	__u16 *transp;
1: +  __u32 start;
1: +  __u32 len;
1: +  __u16 *red;
1: +  __u16 *green;
1: +  __u16 *blue;
1: +  __u16 *transp;
1:  };
1:  
1:  enum {
1: -	FB_BLANK_UNBLANK = 0,
1: -	FB_BLANK_NORMAL = 1,
1: -	FB_BLANK_VSYNC_SUSPEND = 2,
1: -	FB_BLANK_HSYNC_SUSPEND = 3,
1: -	FB_BLANK_POWERDOWN = 4,
1: +  FB_BLANK_UNBLANK = 0,
1: +  FB_BLANK_NORMAL = 1,
1: +  FB_BLANK_VSYNC_SUSPEND = 2,
1: +  FB_BLANK_HSYNC_SUSPEND = 3,
1: +  FB_BLANK_POWERDOWN = 4,
1:  };
1:  
1:  struct fb_copyarea {
1: -	__u32 dx;
1: -	__u32 dy;
1: -	__u32 width;
1: -	__u32 height;
1: -	__u32 sx;
1: -	__u32 sy;
1: +  __u32 dx;
1: +  __u32 dy;
1: +  __u32 width;
1: +  __u32 height;
1: +  __u32 sx;
1: +  __u32 sy;
1:  };
1:  
1:  struct fb_fillrect {
1: -	__u32 dx;
1: -	__u32 dy;
1: -	__u32 width;
1: -	__u32 height;
1: -	__u32 color;
1: -	__u32 rop;
1: +  __u32 dx;
1: +  __u32 dy;
1: +  __u32 width;
1: +  __u32 height;
1: +  __u32 color;
1: +  __u32 rop;
1:  };
1:  
1:  struct fb_image {
1: -	__u32 dx;
1: -	__u32 dy;
1: -	__u32 width;
1: -	__u32 height;
1: -	__u32 fg_color;
1: -	__u32 bg_color;
1: -	__u8 depth;
1: -	const char *data;
1: -	struct fb_cmap cmap;
1: +  __u32 dx;
1: +  __u32 dy;
1: +  __u32 width;
1: +  __u32 height;
1: +  __u32 fg_color;
1: +  __u32 bg_color;
1: +  __u8 depth;
1: +  const char *data;
1: +  struct fb_cmap cmap;
1:  };
1:  
1:  struct fbcurpos {
1: -	__u16 x;
1: -	__u16 y;
1: +  __u16 x;
1: +  __u16 y;
1:  };
1:  
1:  struct fb_cursor {
1: -	__u16 set;
1: -	__u16 enable;
1: -	__u16 rop;
1: -	const char *mask;
1: -	struct fbcurpos hot;
1: -	struct fb_image image;
1: +  __u16 set;
1: +  __u16 enable;
1: +  __u16 rop;
1: +  const char *mask;
1: +  struct fbcurpos hot;
1: +  struct fb_image image;
1:  };
1:  
1:  struct fb_chroma {
1: -	__u32 redx;
1: -	__u32 greenx;
1: -	__u32 bluex;
1: -	__u32 whitex;
1: -	__u32 redy;
1: -	__u32 greeny;
1: -	__u32 bluey;
1: -	__u32 whitey;
1: +  __u32 redx;
1: +  __u32 greenx;
1: +  __u32 bluex;
1: +  __u32 whitex;
1: +  __u32 redy;
1: +  __u32 greeny;
1: +  __u32 bluey;
1: +  __u32 whitey;
1:  };
1:  
1:  struct fb_videomode;
1:  
1:  struct fb_monspecs {
1: -	struct fb_chroma chroma;
1: -	struct fb_videomode *modedb;
1: -	__u8 manufacturer[4];
1: -	__u8 monitor[14];
1: -	__u8 serial_no[14];
1: -	__u8 ascii[14];
1: -	__u32 modedb_len;
1: -	__u32 model;
1: -	__u32 serial;
1: -	__u32 year;
1: -	__u32 week;
1: -	__u32 hfmin;
1: -	__u32 hfmax;
1: -	__u32 dclkmin;
1: -	__u32 dclkmax;
1: -	__u16 input;
1: -	__u16 dpms;
1: -	__u16 signal;
1: -	__u16 vfmin;
1: -	__u16 vfmax;
1: -	__u16 gamma;
1: -	__u16 gtf: 1;
1: -	__u16 misc;
1: -	__u8 version;
1: -	__u8 revision;
1: -	__u8 max_x;
1: -	__u8 max_y;
1: +  struct fb_chroma chroma;
1: +  struct fb_videomode *modedb;
1: +  __u8 manufacturer[4];
1: +  __u8 monitor[14];
1: +  __u8 serial_no[14];
1: +  __u8 ascii[14];
1: +  __u32 modedb_len;
1: +  __u32 model;
1: +  __u32 serial;
1: +  __u32 year;
1: +  __u32 week;
1: +  __u32 hfmin;
1: +  __u32 hfmax;
1: +  __u32 dclkmin;
1: +  __u32 dclkmax;
1: +  __u16 input;
1: +  __u16 dpms;
1: +  __u16 signal;
1: +  __u16 vfmin;
1: +  __u16 vfmax;
1: +  __u16 gamma;
1: +  __u16 gtf : 1;
1: +  __u16 misc;
1: +  __u8 version;
1: +  __u8 revision;
1: +  __u8 max_x;
1: +  __u8 max_y;
1:  };
1:  
1:  struct fb_videomode {
1: -	const char *name;
1: -	u32 refresh;
1: -	u32 xres;
1: -	u32 yres;
1: -	u32 pixclock;
1: -	u32 left_margin;
1: -	u32 right_margin;
1: -	u32 upper_margin;
1: -	u32 lower_margin;
1: -	u32 hsync_len;
1: -	u32 vsync_len;
1: -	u32 sync;
1: -	u32 vmode;
1: -	u32 flag;
1: +  const char *name;
1: +  u32 refresh;
1: +  u32 xres;
1: +  u32 yres;
1: +  u32 pixclock;
1: +  u32 left_margin;
1: +  u32 right_margin;
1: +  u32 upper_margin;
1: +  u32 lower_margin;
1: +  u32 hsync_len;
1: +  u32 vsync_len;
1: +  u32 sync;
1: +  u32 vmode;
1: +  u32 flag;
1:  };
1:  
1:  struct fb_info;
1:  
1:  struct fb_event {
1: -	struct fb_info *info;
1: -	void *data;
1: +  struct fb_info *info;
1: +  void *data;
1:  };
1:  
1:  struct fb_pixmap {
1: -	u8 *addr;
1: -	u32 size;
1: -	u32 offset;
1: -	u32 buf_align;
1: -	u32 scan_align;
1: -	u32 access_align;
1: -	u32 flags;
1: -	u32 blit_x;
1: -	u32 blit_y;
1: -	void (*writeio)(struct fb_info *, void *, void *, unsigned int);
1: -	void (*readio)(struct fb_info *, void *, void *, unsigned int);
1: +  u8 *addr;
1: +  u32 size;
1: +  u32 offset;
1: +  u32 buf_align;
1: +  u32 scan_align;
1: +  u32 access_align;
1: +  u32 flags;
1: +  u32 blit_x;
1: +  u32 blit_y;
1: +  void (*writeio)(struct fb_info *, void *, void *, unsigned int);
1: +  void (*readio)(struct fb_info *, void *, void *, unsigned int);
1:  };
1:  
1:  struct backlight_device;
1: @@ -70027,303 +71028,305 @@ struct fb_tile_ops;
1:  struct apertures_struct;
1:  
1:  struct fb_info {
1: -	atomic_t count;
1: -	int node;
1: -	int flags;
1: -	int fbcon_rotate_hint;
1: -	struct mutex lock;
1: -	struct mutex mm_lock;
1: -	struct fb_var_screeninfo var;
1: -	struct fb_fix_screeninfo fix;
1: -	struct fb_monspecs monspecs;
1: -	struct work_struct queue;
1: -	struct fb_pixmap pixmap;
1: -	struct fb_pixmap sprite;
1: -	struct fb_cmap cmap;
1: -	struct list_head modelist;
1: -	struct fb_videomode *mode;
1: -	struct backlight_device *bl_dev;
1: -	struct mutex bl_curve_mutex;
1: -	u8 bl_curve[128];
1: -	struct delayed_work deferred_work;
1: -	struct fb_deferred_io *fbdefio;
1: -	const struct fb_ops *fbops;
1: -	struct device *device;
1: -	struct device *dev;
1: -	int class_flag;
1: -	struct fb_tile_ops *tileops;
1: -	union {
1: -		char *screen_base;
1: -		char *screen_buffer;
1: -	};
1: -	long unsigned int screen_size;
1: -	void *pseudo_palette;
1: -	u32 state;
1: -	void *fbcon_par;
1: -	void *par;
1: -	struct apertures_struct *apertures;
1: -	bool skip_vt_switch;
1: +  atomic_t count;
1: +  int node;
1: +  int flags;
1: +  int fbcon_rotate_hint;
1: +  struct mutex lock;
1: +  struct mutex mm_lock;
1: +  struct fb_var_screeninfo var;
1: +  struct fb_fix_screeninfo fix;
1: +  struct fb_monspecs monspecs;
1: +  struct work_struct queue;
1: +  struct fb_pixmap pixmap;
1: +  struct fb_pixmap sprite;
1: +  struct fb_cmap cmap;
1: +  struct list_head modelist;
1: +  struct fb_videomode *mode;
1: +  struct backlight_device *bl_dev;
1: +  struct mutex bl_curve_mutex;
1: +  u8 bl_curve[128];
1: +  struct delayed_work deferred_work;
1: +  struct fb_deferred_io *fbdefio;
1: +  const struct fb_ops *fbops;
1: +  struct device *device;
1: +  struct device *dev;
1: +  int class_flag;
1: +  struct fb_tile_ops *tileops;
1: +  union {
1: +    char *screen_base;
1: +    char *screen_buffer;
1: +  };
1: +  long unsigned int screen_size;
1: +  void *pseudo_palette;
1: +  u32 state;
1: +  void *fbcon_par;
1: +  void *par;
1: +  struct apertures_struct *apertures;
1: +  bool skip_vt_switch;
1:  };
1:  
1:  struct fb_blit_caps {
1: -	u32 x;
1: -	u32 y;
1: -	u32 len;
1: -	u32 flags;
1: +  u32 x;
1: +  u32 y;
1: +  u32 len;
1: +  u32 flags;
1:  };
1:  
1:  struct fb_deferred_io {
1: -	long unsigned int delay;
1: -	struct mutex lock;
1: -	struct list_head pagelist;
1: -	void (*first_io)(struct fb_info *);
1: -	void (*deferred_io)(struct fb_info *, struct list_head *);
1: +  long unsigned int delay;
1: +  struct mutex lock;
1: +  struct list_head pagelist;
1: +  void (*first_io)(struct fb_info *);
1: +  void (*deferred_io)(struct fb_info *, struct list_head *);
1:  };
1:  
1:  struct fb_ops {
1: -	struct module *owner;
1: -	int (*fb_open)(struct fb_info *, int);
1: -	int (*fb_release)(struct fb_info *, int);
1: -	ssize_t (*fb_read)(struct fb_info *, char *, size_t, loff_t *);
1: -	ssize_t (*fb_write)(struct fb_info *, const char *, size_t, loff_t *);
1: -	int (*fb_check_var)(struct fb_var_screeninfo *, struct fb_info *);
1: -	int (*fb_set_par)(struct fb_info *);
1: -	int (*fb_setcolreg)(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, struct fb_info *);
1: -	int (*fb_setcmap)(struct fb_cmap *, struct fb_info *);
1: -	int (*fb_blank)(int, struct fb_info *);
1: -	int (*fb_pan_display)(struct fb_var_screeninfo *, struct fb_info *);
1: -	void (*fb_fillrect)(struct fb_info *, const struct fb_fillrect *);
1: -	void (*fb_copyarea)(struct fb_info *, const struct fb_copyarea *);
1: -	void (*fb_imageblit)(struct fb_info *, const struct fb_image *);
1: -	int (*fb_cursor)(struct fb_info *, struct fb_cursor *);
1: -	int (*fb_sync)(struct fb_info *);
1: -	int (*fb_ioctl)(struct fb_info *, unsigned int, long unsigned int);
1: -	int (*fb_compat_ioctl)(struct fb_info *, unsigned int, long unsigned int);
1: -	int (*fb_mmap)(struct fb_info *, struct vm_area_struct *);
1: -	void (*fb_get_caps)(struct fb_info *, struct fb_blit_caps *, struct fb_var_screeninfo *);
1: -	void (*fb_destroy)(struct fb_info *);
1: -	int (*fb_debug_enter)(struct fb_info *);
1: -	int (*fb_debug_leave)(struct fb_info *);
1: +  struct module *owner;
1: +  int (*fb_open)(struct fb_info *, int);
1: +  int (*fb_release)(struct fb_info *, int);
1: +  ssize_t (*fb_read)(struct fb_info *, char *, size_t, loff_t *);
1: +  ssize_t (*fb_write)(struct fb_info *, const char *, size_t, loff_t *);
1: +  int (*fb_check_var)(struct fb_var_screeninfo *, struct fb_info *);
1: +  int (*fb_set_par)(struct fb_info *);
1: +  int (*fb_setcolreg)(unsigned int, unsigned int, unsigned int, unsigned int,
1: +                      unsigned int, struct fb_info *);
1: +  int (*fb_setcmap)(struct fb_cmap *, struct fb_info *);
1: +  int (*fb_blank)(int, struct fb_info *);
1: +  int (*fb_pan_display)(struct fb_var_screeninfo *, struct fb_info *);
1: +  void (*fb_fillrect)(struct fb_info *, const struct fb_fillrect *);
1: +  void (*fb_copyarea)(struct fb_info *, const struct fb_copyarea *);
1: +  void (*fb_imageblit)(struct fb_info *, const struct fb_image *);
1: +  int (*fb_cursor)(struct fb_info *, struct fb_cursor *);
1: +  int (*fb_sync)(struct fb_info *);
1: +  int (*fb_ioctl)(struct fb_info *, unsigned int, long unsigned int);
1: +  int (*fb_compat_ioctl)(struct fb_info *, unsigned int, long unsigned int);
1: +  int (*fb_mmap)(struct fb_info *, struct vm_area_struct *);
1: +  void (*fb_get_caps)(struct fb_info *, struct fb_blit_caps *,
1: +                      struct fb_var_screeninfo *);
1: +  void (*fb_destroy)(struct fb_info *);
1: +  int (*fb_debug_enter)(struct fb_info *);
1: +  int (*fb_debug_leave)(struct fb_info *);
1:  };
1:  
1:  struct fb_tilemap {
1: -	__u32 width;
1: -	__u32 height;
1: -	__u32 depth;
1: -	__u32 length;
1: -	const __u8 *data;
1: +  __u32 width;
1: +  __u32 height;
1: +  __u32 depth;
1: +  __u32 length;
1: +  const __u8 *data;
1:  };
1:  
1:  struct fb_tilerect {
1: -	__u32 sx;
1: -	__u32 sy;
1: -	__u32 width;
1: -	__u32 height;
1: -	__u32 index;
1: -	__u32 fg;
1: -	__u32 bg;
1: -	__u32 rop;
1: +  __u32 sx;
1: +  __u32 sy;
1: +  __u32 width;
1: +  __u32 height;
1: +  __u32 index;
1: +  __u32 fg;
1: +  __u32 bg;
1: +  __u32 rop;
1:  };
1:  
1:  struct fb_tilearea {
1: -	__u32 sx;
1: -	__u32 sy;
1: -	__u32 dx;
1: -	__u32 dy;
1: -	__u32 width;
1: -	__u32 height;
1: +  __u32 sx;
1: +  __u32 sy;
1: +  __u32 dx;
1: +  __u32 dy;
1: +  __u32 width;
1: +  __u32 height;
1:  };
1:  
1:  struct fb_tileblit {
1: -	__u32 sx;
1: -	__u32 sy;
1: -	__u32 width;
1: -	__u32 height;
1: -	__u32 fg;
1: -	__u32 bg;
1: -	__u32 length;
1: -	__u32 *indices;
1: +  __u32 sx;
1: +  __u32 sy;
1: +  __u32 width;
1: +  __u32 height;
1: +  __u32 fg;
1: +  __u32 bg;
1: +  __u32 length;
1: +  __u32 *indices;
1:  };
1:  
1:  struct fb_tilecursor {
1: -	__u32 sx;
1: -	__u32 sy;
1: -	__u32 mode;
1: -	__u32 shape;
1: -	__u32 fg;
1: -	__u32 bg;
1: +  __u32 sx;
1: +  __u32 sy;
1: +  __u32 mode;
1: +  __u32 shape;
1: +  __u32 fg;
1: +  __u32 bg;
1:  };
1:  
1:  struct fb_tile_ops {
1: -	void (*fb_settile)(struct fb_info *, struct fb_tilemap *);
1: -	void (*fb_tilecopy)(struct fb_info *, struct fb_tilearea *);
1: -	void (*fb_tilefill)(struct fb_info *, struct fb_tilerect *);
1: -	void (*fb_tileblit)(struct fb_info *, struct fb_tileblit *);
1: -	void (*fb_tilecursor)(struct fb_info *, struct fb_tilecursor *);
1: -	int (*fb_get_tilemax)(struct fb_info *);
1: +  void (*fb_settile)(struct fb_info *, struct fb_tilemap *);
1: +  void (*fb_tilecopy)(struct fb_info *, struct fb_tilearea *);
1: +  void (*fb_tilefill)(struct fb_info *, struct fb_tilerect *);
1: +  void (*fb_tileblit)(struct fb_info *, struct fb_tileblit *);
1: +  void (*fb_tilecursor)(struct fb_info *, struct fb_tilecursor *);
1: +  int (*fb_get_tilemax)(struct fb_info *);
1:  };
1:  
1:  struct aperture {
1: -	resource_size_t base;
1: -	resource_size_t size;
1: +  resource_size_t base;
1: +  resource_size_t size;
1:  };
1:  
1:  struct apertures_struct {
1: -	unsigned int count;
1: -	struct aperture ranges[0];
1: +  unsigned int count;
1: +  struct aperture ranges[0];
1:  };
1:  
1:  enum backlight_type {
1: -	BACKLIGHT_RAW = 1,
1: -	BACKLIGHT_PLATFORM = 2,
1: -	BACKLIGHT_FIRMWARE = 3,
1: -	BACKLIGHT_TYPE_MAX = 4,
1: +  BACKLIGHT_RAW = 1,
1: +  BACKLIGHT_PLATFORM = 2,
1: +  BACKLIGHT_FIRMWARE = 3,
1: +  BACKLIGHT_TYPE_MAX = 4,
1:  };
1:  
1:  enum backlight_scale {
1: -	BACKLIGHT_SCALE_UNKNOWN = 0,
1: -	BACKLIGHT_SCALE_LINEAR = 1,
1: -	BACKLIGHT_SCALE_NON_LINEAR = 2,
1: +  BACKLIGHT_SCALE_UNKNOWN = 0,
1: +  BACKLIGHT_SCALE_LINEAR = 1,
1: +  BACKLIGHT_SCALE_NON_LINEAR = 2,
1:  };
1:  
1:  struct backlight_properties {
1: -	int brightness;
1: -	int max_brightness;
1: -	int power;
1: -	int fb_blank;
1: -	enum backlight_type type;
1: -	unsigned int state;
1: -	enum backlight_scale scale;
1: +  int brightness;
1: +  int max_brightness;
1: +  int power;
1: +  int fb_blank;
1: +  enum backlight_type type;
1: +  unsigned int state;
1: +  enum backlight_scale scale;
1:  };
1:  
1:  struct backlight_ops;
1:  
1:  struct backlight_device {
1: -	struct backlight_properties props;
1: -	struct mutex update_lock;
1: -	struct mutex ops_lock;
1: -	const struct backlight_ops *ops;
1: -	struct notifier_block fb_notif;
1: -	struct list_head entry;
1: -	struct device dev;
1: -	bool fb_bl_on[32];
1: -	int use_count;
1: +  struct backlight_properties props;
1: +  struct mutex update_lock;
1: +  struct mutex ops_lock;
1: +  const struct backlight_ops *ops;
1: +  struct notifier_block fb_notif;
1: +  struct list_head entry;
1: +  struct device dev;
1: +  bool fb_bl_on[32];
1: +  int use_count;
1:  };
1:  
1:  enum backlight_update_reason {
1: -	BACKLIGHT_UPDATE_HOTKEY = 0,
1: -	BACKLIGHT_UPDATE_SYSFS = 1,
1: +  BACKLIGHT_UPDATE_HOTKEY = 0,
1: +  BACKLIGHT_UPDATE_SYSFS = 1,
1:  };
1:  
1:  enum backlight_notification {
1: -	BACKLIGHT_REGISTERED = 0,
1: -	BACKLIGHT_UNREGISTERED = 1,
1: +  BACKLIGHT_REGISTERED = 0,
1: +  BACKLIGHT_UNREGISTERED = 1,
1:  };
1:  
1:  struct backlight_ops {
1: -	unsigned int options;
1: -	int (*update_status)(struct backlight_device *);
1: -	int (*get_brightness)(struct backlight_device *);
1: -	int (*check_fb)(struct backlight_device *, struct fb_info *);
1: +  unsigned int options;
1: +  int (*update_status)(struct backlight_device *);
1: +  int (*get_brightness)(struct backlight_device *);
1: +  int (*check_fb)(struct backlight_device *, struct fb_info *);
1:  };
1:  
1:  struct fb_cmap_user {
1: -	__u32 start;
1: -	__u32 len;
1: -	__u16 *red;
1: -	__u16 *green;
1: -	__u16 *blue;
1: -	__u16 *transp;
1: +  __u32 start;
1: +  __u32 len;
1: +  __u16 *red;
1: +  __u16 *green;
1: +  __u16 *blue;
1: +  __u16 *transp;
1:  };
1:  
1:  struct fb_modelist {
1: -	struct list_head list;
1: -	struct fb_videomode mode;
1: +  struct list_head list;
1: +  struct fb_videomode mode;
1:  };
1:  
1:  struct logo_data {
1: -	int depth;
1: -	int needs_directpalette;
1: -	int needs_truepalette;
1: -	int needs_cmapreset;
1: -	const struct linux_logo *logo;
1: +  int depth;
1: +  int needs_directpalette;
1: +  int needs_truepalette;
1: +  int needs_cmapreset;
1: +  const struct linux_logo *logo;
1:  };
1:  
1:  struct fb_fix_screeninfo32 {
1: -	char id[16];
1: -	compat_caddr_t smem_start;
1: -	u32 smem_len;
1: -	u32 type;
1: -	u32 type_aux;
1: -	u32 visual;
1: -	u16 xpanstep;
1: -	u16 ypanstep;
1: -	u16 ywrapstep;
1: -	u32 line_length;
1: -	compat_caddr_t mmio_start;
1: -	u32 mmio_len;
1: -	u32 accel;
1: -	u16 reserved[3];
1: +  char id[16];
1: +  compat_caddr_t smem_start;
1: +  u32 smem_len;
1: +  u32 type;
1: +  u32 type_aux;
1: +  u32 visual;
1: +  u16 xpanstep;
1: +  u16 ypanstep;
1: +  u16 ywrapstep;
1: +  u32 line_length;
1: +  compat_caddr_t mmio_start;
1: +  u32 mmio_len;
1: +  u32 accel;
1: +  u16 reserved[3];
1:  };
1:  
1:  struct fb_cmap32 {
1: -	u32 start;
1: -	u32 len;
1: -	compat_caddr_t red;
1: -	compat_caddr_t green;
1: -	compat_caddr_t blue;
1: -	compat_caddr_t transp;
1: +  u32 start;
1: +  u32 len;
1: +  compat_caddr_t red;
1: +  compat_caddr_t green;
1: +  compat_caddr_t blue;
1: +  compat_caddr_t transp;
1:  };
1:  
1:  struct dmt_videomode {
1: -	u32 dmt_id;
1: -	u32 std_2byte_code;
1: -	u32 cvt_3byte_code;
1: -	const struct fb_videomode *mode;
1: +  u32 dmt_id;
1: +  u32 std_2byte_code;
1: +  u32 cvt_3byte_code;
1: +  const struct fb_videomode *mode;
1:  };
1:  
1:  struct broken_edid {
1: -	u8 manufacturer[4];
1: -	u32 model;
1: -	u32 fix;
1: +  u8 manufacturer[4];
1: +  u32 model;
1: +  u32 fix;
1:  };
1:  
1:  struct __fb_timings {
1: -	u32 dclk;
1: -	u32 hfreq;
1: -	u32 vfreq;
1: -	u32 hactive;
1: -	u32 vactive;
1: -	u32 hblank;
1: -	u32 vblank;
1: -	u32 htotal;
1: -	u32 vtotal;
1: +  u32 dclk;
1: +  u32 hfreq;
1: +  u32 vfreq;
1: +  u32 hactive;
1: +  u32 vactive;
1: +  u32 hblank;
1: +  u32 vblank;
1: +  u32 htotal;
1: +  u32 vtotal;
1:  };
1:  
1:  struct fb_cvt_data {
1: -	u32 xres;
1: -	u32 yres;
1: -	u32 refresh;
1: -	u32 f_refresh;
1: -	u32 pixclock;
1: -	u32 hperiod;
1: -	u32 hblank;
1: -	u32 hfreq;
1: -	u32 htotal;
1: -	u32 vtotal;
1: -	u32 vsync;
1: -	u32 hsync;
1: -	u32 h_front_porch;
1: -	u32 h_back_porch;
1: -	u32 v_front_porch;
1: -	u32 v_back_porch;
1: -	u32 h_margin;
1: -	u32 v_margin;
1: -	u32 interlace;
1: -	u32 aspect_ratio;
1: -	u32 active_pixels;
1: -	u32 flags;
1: -	u32 status;
1: +  u32 xres;
1: +  u32 yres;
1: +  u32 refresh;
1: +  u32 f_refresh;
1: +  u32 pixclock;
1: +  u32 hperiod;
1: +  u32 hblank;
1: +  u32 hfreq;
1: +  u32 htotal;
1: +  u32 vtotal;
1: +  u32 vsync;
1: +  u32 hsync;
1: +  u32 h_front_porch;
1: +  u32 h_back_porch;
1: +  u32 v_front_porch;
1: +  u32 v_back_porch;
1: +  u32 h_margin;
1: +  u32 v_margin;
1: +  u32 interlace;
1: +  u32 aspect_ratio;
1: +  u32 active_pixels;
1: +  u32 flags;
1: +  u32 status;
1:  };
1:  
1:  typedef unsigned char u_char;
1: @@ -70331,424 +71334,426 @@ typedef unsigned char u_char;
1:  typedef short unsigned int u_short;
1:  
1:  struct fb_con2fbmap {
1: -	__u32 console;
1: -	__u32 framebuffer;
1: +  __u32 console;
1: +  __u32 framebuffer;
1:  };
1:  
1:  struct fbcon_display {
1: -	const u_char *fontdata;
1: -	int userfont;
1: -	u_short scrollmode;
1: -	u_short inverse;
1: -	short int yscroll;
1: -	int vrows;
1: -	int cursor_shape;
1: -	int con_rotate;
1: -	u32 xres_virtual;
1: -	u32 yres_virtual;
1: -	u32 height;
1: -	u32 width;
1: -	u32 bits_per_pixel;
1: -	u32 grayscale;
1: -	u32 nonstd;
1: -	u32 accel_flags;
1: -	u32 rotate;
1: -	struct fb_bitfield red;
1: -	struct fb_bitfield green;
1: -	struct fb_bitfield blue;
1: -	struct fb_bitfield transp;
1: -	const struct fb_videomode *mode;
1: +  const u_char *fontdata;
1: +  int userfont;
1: +  u_short scrollmode;
1: +  u_short inverse;
1: +  short int yscroll;
1: +  int vrows;
1: +  int cursor_shape;
1: +  int con_rotate;
1: +  u32 xres_virtual;
1: +  u32 yres_virtual;
1: +  u32 height;
1: +  u32 width;
1: +  u32 bits_per_pixel;
1: +  u32 grayscale;
1: +  u32 nonstd;
1: +  u32 accel_flags;
1: +  u32 rotate;
1: +  struct fb_bitfield red;
1: +  struct fb_bitfield green;
1: +  struct fb_bitfield blue;
1: +  struct fb_bitfield transp;
1: +  const struct fb_videomode *mode;
1:  };
1:  
1:  struct fbcon_ops {
1: -	void (*bmove)(struct vc_data *, struct fb_info *, int, int, int, int, int, int);
1: -	void (*clear)(struct vc_data *, struct fb_info *, int, int, int, int);
1: -	void (*putcs)(struct vc_data *, struct fb_info *, const short unsigned int *, int, int, int, int, int);
1: -	void (*clear_margins)(struct vc_data *, struct fb_info *, int, int);
1: -	void (*cursor)(struct vc_data *, struct fb_info *, int, int, int);
1: -	int (*update_start)(struct fb_info *);
1: -	int (*rotate_font)(struct fb_info *, struct vc_data *);
1: -	struct fb_var_screeninfo var;
1: -	struct timer_list cursor_timer;
1: -	struct fb_cursor cursor_state;
1: -	struct fbcon_display *p;
1: -	struct fb_info *info;
1: -	int currcon;
1: -	int cur_blink_jiffies;
1: -	int cursor_flash;
1: -	int cursor_reset;
1: -	int blank_state;
1: -	int graphics;
1: -	int save_graphics;
1: -	int flags;
1: -	int rotate;
1: -	int cur_rotate;
1: -	char *cursor_data;
1: -	u8 *fontbuffer;
1: -	u8 *fontdata;
1: -	u8 *cursor_src;
1: -	u32 cursor_size;
1: -	u32 fd_size;
1: -};
1: -
1: -enum {
1: -	FBCON_LOGO_CANSHOW = 4294967295,
1: -	FBCON_LOGO_DRAW = 4294967294,
1: -	FBCON_LOGO_DONTSHOW = 4294967293,
1: +  void (*bmove)(struct vc_data *, struct fb_info *, int, int, int, int, int,
1: +                int);
1: +  void (*clear)(struct vc_data *, struct fb_info *, int, int, int, int);
1: +  void (*putcs)(struct vc_data *, struct fb_info *, const short unsigned int *,
1: +                int, int, int, int, int);
1: +  void (*clear_margins)(struct vc_data *, struct fb_info *, int, int);
1: +  void (*cursor)(struct vc_data *, struct fb_info *, int, int, int);
1: +  int (*update_start)(struct fb_info *);
1: +  int (*rotate_font)(struct fb_info *, struct vc_data *);
1: +  struct fb_var_screeninfo var;
1: +  struct timer_list cursor_timer;
1: +  struct fb_cursor cursor_state;
1: +  struct fbcon_display *p;
1: +  struct fb_info *info;
1: +  int currcon;
1: +  int cur_blink_jiffies;
1: +  int cursor_flash;
1: +  int cursor_reset;
1: +  int blank_state;
1: +  int graphics;
1: +  int save_graphics;
1: +  int flags;
1: +  int rotate;
1: +  int cur_rotate;
1: +  char *cursor_data;
1: +  u8 *fontbuffer;
1: +  u8 *fontdata;
1: +  u8 *cursor_src;
1: +  u32 cursor_size;
1: +  u32 fd_size;
1: +};
1: +
1: +enum {
1: +  FBCON_LOGO_CANSHOW = 4294967295,
1: +  FBCON_LOGO_DRAW = 4294967294,
1: +  FBCON_LOGO_DONTSHOW = 4294967293,
1:  };
1:  
1:  struct vesafb_par {
1: -	u32 pseudo_palette[256];
1: -	int wc_cookie;
1: -	struct resource *region;
1: +  u32 pseudo_palette[256];
1: +  int wc_cookie;
1: +  struct resource *region;
1:  };
1:  
1:  struct thermal_cooling_device_ops;
1:  
1:  struct thermal_cooling_device {
1: -	int id;
1: -	char type[20];
1: -	struct device device;
1: -	struct device_node *np;
1: -	void *devdata;
1: -	void *stats;
1: -	const struct thermal_cooling_device_ops *ops;
1: -	bool updated;
1: -	struct mutex lock;
1: -	struct list_head thermal_instances;
1: -	struct list_head node;
1: +  int id;
1: +  char type[20];
1: +  struct device device;
1: +  struct device_node *np;
1: +  void *devdata;
1: +  void *stats;
1: +  const struct thermal_cooling_device_ops *ops;
1: +  bool updated;
1: +  struct mutex lock;
1: +  struct list_head thermal_instances;
1: +  struct list_head node;
1:  };
1:  
1:  struct idle_cpu {
1: -	struct cpuidle_state *state_table;
1: -	long unsigned int auto_demotion_disable_flags;
1: -	bool byt_auto_demotion_disable_flag;
1: -	bool disable_promotion_to_c1e;
1: -	bool use_acpi;
1: +  struct cpuidle_state *state_table;
1: +  long unsigned int auto_demotion_disable_flags;
1: +  bool byt_auto_demotion_disable_flag;
1: +  bool disable_promotion_to_c1e;
1: +  bool use_acpi;
1:  };
1:  
1:  struct thermal_cooling_device_ops {
1: -	int (*get_max_state)(struct thermal_cooling_device *, long unsigned int *);
1: -	int (*get_cur_state)(struct thermal_cooling_device *, long unsigned int *);
1: -	int (*set_cur_state)(struct thermal_cooling_device *, long unsigned int);
1: -	int (*get_requested_power)(struct thermal_cooling_device *, u32 *);
1: -	int (*state2power)(struct thermal_cooling_device *, long unsigned int, u32 *);
1: -	int (*power2state)(struct thermal_cooling_device *, u32, long unsigned int *);
1: +  int (*get_max_state)(struct thermal_cooling_device *, long unsigned int *);
1: +  int (*get_cur_state)(struct thermal_cooling_device *, long unsigned int *);
1: +  int (*set_cur_state)(struct thermal_cooling_device *, long unsigned int);
1: +  int (*get_requested_power)(struct thermal_cooling_device *, u32 *);
1: +  int (*state2power)(struct thermal_cooling_device *, long unsigned int, u32 *);
1: +  int (*power2state)(struct thermal_cooling_device *, u32, long unsigned int *);
1:  };
1:  
1:  struct acpi_lpi_state {
1: -	u32 min_residency;
1: -	u32 wake_latency;
1: -	u32 flags;
1: -	u32 arch_flags;
1: -	u32 res_cnt_freq;
1: -	u32 enable_parent_state;
1: -	u64 address;
1: -	u8 index;
1: -	u8 entry_method;
1: -	char desc[32];
1: +  u32 min_residency;
1: +  u32 wake_latency;
1: +  u32 flags;
1: +  u32 arch_flags;
1: +  u32 res_cnt_freq;
1: +  u32 enable_parent_state;
1: +  u64 address;
1: +  u8 index;
1: +  u8 entry_method;
1: +  char desc[32];
1:  };
1:  
1:  struct acpi_processor_power {
1: -	int count;
1: -	union {
1: -		struct acpi_processor_cx states[8];
1: -		struct acpi_lpi_state lpi_states[8];
1: -	};
1: -	int timer_broadcast_on_state;
1: +  int count;
1: +  union {
1: +    struct acpi_processor_cx states[8];
1: +    struct acpi_lpi_state lpi_states[8];
1: +  };
1: +  int timer_broadcast_on_state;
1:  };
1:  
1:  struct acpi_psd_package {
1: -	u64 num_entries;
1: -	u64 revision;
1: -	u64 domain;
1: -	u64 coord_type;
1: -	u64 num_processors;
1: +  u64 num_entries;
1: +  u64 revision;
1: +  u64 domain;
1: +  u64 coord_type;
1: +  u64 num_processors;
1:  };
1:  
1:  struct acpi_pct_register {
1: -	u8 descriptor;
1: -	u16 length;
1: -	u8 space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 reserved;
1: -	u64 address;
1: +  u8 descriptor;
1: +  u16 length;
1: +  u8 space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 reserved;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct acpi_processor_px {
1: -	u64 core_frequency;
1: -	u64 power;
1: -	u64 transition_latency;
1: -	u64 bus_master_latency;
1: -	u64 control;
1: -	u64 status;
1: +  u64 core_frequency;
1: +  u64 power;
1: +  u64 transition_latency;
1: +  u64 bus_master_latency;
1: +  u64 control;
1: +  u64 status;
1:  };
1:  
1:  struct acpi_processor_performance {
1: -	unsigned int state;
1: -	unsigned int platform_limit;
1: -	struct acpi_pct_register control_register;
1: -	struct acpi_pct_register status_register;
1: -	short: 16;
1: -	unsigned int state_count;
1: -	int: 32;
1: -	struct acpi_processor_px *states;
1: -	struct acpi_psd_package domain_info;
1: -	cpumask_var_t shared_cpu_map;
1: -	unsigned int shared_type;
1: -	int: 32;
1: +  unsigned int state;
1: +  unsigned int platform_limit;
1: +  struct acpi_pct_register control_register;
1: +  struct acpi_pct_register status_register;
1: +  short : 16;
1: +  unsigned int state_count;
1: +  int : 32;
1: +  struct acpi_processor_px *states;
1: +  struct acpi_psd_package domain_info;
1: +  cpumask_var_t shared_cpu_map;
1: +  unsigned int shared_type;
1: +  int : 32;
1:  } __attribute__((packed));
1:  
1:  struct acpi_tsd_package {
1: -	u64 num_entries;
1: -	u64 revision;
1: -	u64 domain;
1: -	u64 coord_type;
1: -	u64 num_processors;
1: +  u64 num_entries;
1: +  u64 revision;
1: +  u64 domain;
1: +  u64 coord_type;
1: +  u64 num_processors;
1:  };
1:  
1:  struct acpi_processor_tx_tss {
1: -	u64 freqpercentage;
1: -	u64 power;
1: -	u64 transition_latency;
1: -	u64 control;
1: -	u64 status;
1: +  u64 freqpercentage;
1: +  u64 power;
1: +  u64 transition_latency;
1: +  u64 control;
1: +  u64 status;
1:  };
1:  
1:  struct acpi_processor_tx {
1: -	u16 power;
1: -	u16 performance;
1: +  u16 power;
1: +  u16 performance;
1:  };
1:  
1:  struct acpi_processor;
1:  
1:  struct acpi_processor_throttling {
1: -	unsigned int state;
1: -	unsigned int platform_limit;
1: -	struct acpi_pct_register control_register;
1: -	struct acpi_pct_register status_register;
1: -	short: 16;
1: -	unsigned int state_count;
1: -	int: 32;
1: -	struct acpi_processor_tx_tss *states_tss;
1: -	struct acpi_tsd_package domain_info;
1: -	cpumask_var_t shared_cpu_map;
1: -	int (*acpi_processor_get_throttling)(struct acpi_processor *);
1: -	int (*acpi_processor_set_throttling)(struct acpi_processor *, int, bool);
1: -	u32 address;
1: -	u8 duty_offset;
1: -	u8 duty_width;
1: -	u8 tsd_valid_flag;
1: -	char: 8;
1: -	unsigned int shared_type;
1: -	struct acpi_processor_tx states[16];
1: -	int: 32;
1: +  unsigned int state;
1: +  unsigned int platform_limit;
1: +  struct acpi_pct_register control_register;
1: +  struct acpi_pct_register status_register;
1: +  short : 16;
1: +  unsigned int state_count;
1: +  int : 32;
1: +  struct acpi_processor_tx_tss *states_tss;
1: +  struct acpi_tsd_package domain_info;
1: +  cpumask_var_t shared_cpu_map;
1: +  int (*acpi_processor_get_throttling)(struct acpi_processor *);
1: +  int (*acpi_processor_set_throttling)(struct acpi_processor *, int, bool);
1: +  u32 address;
1: +  u8 duty_offset;
1: +  u8 duty_width;
1: +  u8 tsd_valid_flag;
1: +  char : 8;
1: +  unsigned int shared_type;
1: +  struct acpi_processor_tx states[16];
1: +  int : 32;
1:  } __attribute__((packed));
1:  
1:  struct acpi_processor_lx {
1: -	int px;
1: -	int tx;
1: +  int px;
1: +  int tx;
1:  };
1:  
1:  struct acpi_processor_limit {
1: -	struct acpi_processor_lx state;
1: -	struct acpi_processor_lx thermal;
1: -	struct acpi_processor_lx user;
1: +  struct acpi_processor_lx state;
1: +  struct acpi_processor_lx thermal;
1: +  struct acpi_processor_lx user;
1:  };
1:  
1:  struct acpi_processor {
1: -	acpi_handle handle;
1: -	u32 acpi_id;
1: -	phys_cpuid_t phys_id;
1: -	u32 id;
1: -	u32 pblk;
1: -	int performance_platform_limit;
1: -	int throttling_platform_limit;
1: -	struct acpi_processor_flags flags;
1: -	struct acpi_processor_power power;
1: -	struct acpi_processor_performance *performance;
1: -	struct acpi_processor_throttling throttling;
1: -	struct acpi_processor_limit limit;
1: -	struct thermal_cooling_device *cdev;
1: -	struct device *dev;
1: -	struct freq_qos_request perflib_req;
1: -	struct freq_qos_request thermal_req;
1: +  acpi_handle handle;
1: +  u32 acpi_id;
1: +  phys_cpuid_t phys_id;
1: +  u32 id;
1: +  u32 pblk;
1: +  int performance_platform_limit;
1: +  int throttling_platform_limit;
1: +  struct acpi_processor_flags flags;
1: +  struct acpi_processor_power power;
1: +  struct acpi_processor_performance *performance;
1: +  struct acpi_processor_throttling throttling;
1: +  struct acpi_processor_limit limit;
1: +  struct thermal_cooling_device *cdev;
1: +  struct device *dev;
1: +  struct freq_qos_request perflib_req;
1: +  struct freq_qos_request thermal_req;
1:  };
1:  
1:  enum ipmi_addr_src {
1: -	SI_INVALID = 0,
1: -	SI_HOTMOD = 1,
1: -	SI_HARDCODED = 2,
1: -	SI_SPMI = 3,
1: -	SI_ACPI = 4,
1: -	SI_SMBIOS = 5,
1: -	SI_PCI = 6,
1: -	SI_DEVICETREE = 7,
1: -	SI_PLATFORM = 8,
1: -	SI_LAST = 9,
1: +  SI_INVALID = 0,
1: +  SI_HOTMOD = 1,
1: +  SI_HARDCODED = 2,
1: +  SI_SPMI = 3,
1: +  SI_ACPI = 4,
1: +  SI_SMBIOS = 5,
1: +  SI_PCI = 6,
1: +  SI_DEVICETREE = 7,
1: +  SI_PLATFORM = 8,
1: +  SI_LAST = 9,
1:  };
1:  
1:  struct dmi_header {
1: -	u8 type;
1: -	u8 length;
1: -	u16 handle;
1: +  u8 type;
1: +  u8 length;
1: +  u16 handle;
1:  };
1:  
1:  enum si_type {
1: -	SI_TYPE_INVALID = 0,
1: -	SI_KCS = 1,
1: -	SI_SMIC = 2,
1: -	SI_BT = 3,
1: +  SI_TYPE_INVALID = 0,
1: +  SI_KCS = 1,
1: +  SI_SMIC = 2,
1: +  SI_BT = 3,
1:  };
1:  
1:  enum ipmi_addr_space {
1: -	IPMI_IO_ADDR_SPACE = 0,
1: -	IPMI_MEM_ADDR_SPACE = 1,
1: +  IPMI_IO_ADDR_SPACE = 0,
1: +  IPMI_MEM_ADDR_SPACE = 1,
1:  };
1:  
1:  enum ipmi_plat_interface_type {
1: -	IPMI_PLAT_IF_SI = 0,
1: -	IPMI_PLAT_IF_SSIF = 1,
1: +  IPMI_PLAT_IF_SI = 0,
1: +  IPMI_PLAT_IF_SSIF = 1,
1:  };
1:  
1:  struct ipmi_plat_data {
1: -	enum ipmi_plat_interface_type iftype;
1: -	unsigned int type;
1: -	unsigned int space;
1: -	long unsigned int addr;
1: -	unsigned int regspacing;
1: -	unsigned int regsize;
1: -	unsigned int regshift;
1: -	unsigned int irq;
1: -	unsigned int slave_addr;
1: -	enum ipmi_addr_src addr_source;
1: +  enum ipmi_plat_interface_type iftype;
1: +  unsigned int type;
1: +  unsigned int space;
1: +  long unsigned int addr;
1: +  unsigned int regspacing;
1: +  unsigned int regsize;
1: +  unsigned int regshift;
1: +  unsigned int irq;
1: +  unsigned int slave_addr;
1: +  enum ipmi_addr_src addr_source;
1:  };
1:  
1:  struct ipmi_dmi_info {
1: -	enum si_type si_type;
1: -	unsigned int space;
1: -	long unsigned int addr;
1: -	u8 slave_addr;
1: -	struct ipmi_dmi_info *next;
1: +  enum si_type si_type;
1: +  unsigned int space;
1: +  long unsigned int addr;
1: +  u8 slave_addr;
1: +  struct ipmi_dmi_info *next;
1:  };
1:  
1:  typedef u16 acpi_owner_id;
1:  
1:  union acpi_name_union {
1: -	u32 integer;
1: -	char ascii[4];
1: +  u32 integer;
1: +  char ascii[4];
1:  };
1:  
1:  struct acpi_table_desc {
1: -	acpi_physical_address address;
1: -	struct acpi_table_header *pointer;
1: -	u32 length;
1: -	union acpi_name_union signature;
1: -	acpi_owner_id owner_id;
1: -	u8 flags;
1: -	u16 validation_count;
1: +  acpi_physical_address address;
1: +  struct acpi_table_header *pointer;
1: +  u32 length;
1: +  union acpi_name_union signature;
1: +  acpi_owner_id owner_id;
1: +  u8 flags;
1: +  u16 validation_count;
1:  };
1:  
1:  struct acpi_madt_io_sapic {
1: -	struct acpi_subtable_header header;
1: -	u8 id;
1: -	u8 reserved;
1: -	u32 global_irq_base;
1: -	u64 address;
1: +  struct acpi_subtable_header header;
1: +  u8 id;
1: +  u8 reserved;
1: +  u32 global_irq_base;
1: +  u64 address;
1:  };
1:  
1:  struct acpi_madt_interrupt_source {
1: -	struct acpi_subtable_header header;
1: -	u16 inti_flags;
1: -	u8 type;
1: -	u8 id;
1: -	u8 eid;
1: -	u8 io_sapic_vector;
1: -	u32 global_irq;
1: -	u32 flags;
1: +  struct acpi_subtable_header header;
1: +  u16 inti_flags;
1: +  u8 type;
1: +  u8 id;
1: +  u8 eid;
1: +  u8 io_sapic_vector;
1: +  u32 global_irq;
1: +  u32 flags;
1:  };
1:  
1:  struct acpi_madt_generic_interrupt {
1: -	struct acpi_subtable_header header;
1: -	u16 reserved;
1: -	u32 cpu_interface_number;
1: -	u32 uid;
1: -	u32 flags;
1: -	u32 parking_version;
1: -	u32 performance_interrupt;
1: -	u64 parked_address;
1: -	u64 base_address;
1: -	u64 gicv_base_address;
1: -	u64 gich_base_address;
1: -	u32 vgic_interrupt;
1: -	u64 gicr_base_address;
1: -	u64 arm_mpidr;
1: -	u8 efficiency_class;
1: -	u8 reserved2[1];
1: -	u16 spe_interrupt;
1: +  struct acpi_subtable_header header;
1: +  u16 reserved;
1: +  u32 cpu_interface_number;
1: +  u32 uid;
1: +  u32 flags;
1: +  u32 parking_version;
1: +  u32 performance_interrupt;
1: +  u64 parked_address;
1: +  u64 base_address;
1: +  u64 gicv_base_address;
1: +  u64 gich_base_address;
1: +  u32 vgic_interrupt;
1: +  u64 gicr_base_address;
1: +  u64 arm_mpidr;
1: +  u8 efficiency_class;
1: +  u8 reserved2[1];
1: +  u16 spe_interrupt;
1:  } __attribute__((packed));
1:  
1:  struct acpi_madt_generic_distributor {
1: -	struct acpi_subtable_header header;
1: -	u16 reserved;
1: -	u32 gic_id;
1: -	u64 base_address;
1: -	u32 global_irq_base;
1: -	u8 version;
1: -	u8 reserved2[3];
1: +  struct acpi_subtable_header header;
1: +  u16 reserved;
1: +  u32 gic_id;
1: +  u64 base_address;
1: +  u32 global_irq_base;
1: +  u8 version;
1: +  u8 reserved2[3];
1:  };
1:  
1:  typedef int (*acpi_tbl_table_handler)(struct acpi_table_header *);
1:  
1:  enum acpi_subtable_type {
1: -	ACPI_SUBTABLE_COMMON = 0,
1: -	ACPI_SUBTABLE_HMAT = 1,
1: +  ACPI_SUBTABLE_COMMON = 0,
1: +  ACPI_SUBTABLE_HMAT = 1,
1:  };
1:  
1:  struct acpi_subtable_entry {
1: -	union acpi_subtable_headers *hdr;
1: -	enum acpi_subtable_type type;
1: +  union acpi_subtable_headers *hdr;
1: +  enum acpi_subtable_type type;
1:  };
1:  
1:  enum acpi_predicate {
1: -	all_versions = 0,
1: -	less_than_or_equal = 1,
1: -	equal = 2,
1: -	greater_than_or_equal = 3,
1: +  all_versions = 0,
1: +  less_than_or_equal = 1,
1: +  equal = 2,
1: +  greater_than_or_equal = 3,
1:  };
1:  
1:  struct acpi_platform_list {
1: -	char oem_id[7];
1: -	char oem_table_id[9];
1: -	u32 oem_revision;
1: -	char *table;
1: -	enum acpi_predicate pred;
1: -	char *reason;
1: -	u32 data;
1: +  char oem_id[7];
1: +  char oem_table_id[9];
1: +  u32 oem_revision;
1: +  char *table;
1: +  enum acpi_predicate pred;
1: +  char *reason;
1: +  u32 data;
1:  };
1:  
1:  typedef char *acpi_string;
1:  
1:  struct acpi_osi_entry {
1: -	char string[64];
1: -	bool enable;
1: +  char string[64];
1: +  bool enable;
1:  };
1:  
1:  struct acpi_osi_config {
1: -	u8 default_disabling;
1: -	unsigned int linux_enable: 1;
1: -	unsigned int linux_dmi: 1;
1: -	unsigned int linux_cmdline: 1;
1: -	unsigned int darwin_enable: 1;
1: -	unsigned int darwin_dmi: 1;
1: -	unsigned int darwin_cmdline: 1;
1: +  u8 default_disabling;
1: +  unsigned int linux_enable : 1;
1: +  unsigned int linux_dmi : 1;
1: +  unsigned int linux_cmdline : 1;
1: +  unsigned int darwin_enable : 1;
1: +  unsigned int darwin_dmi : 1;
1: +  unsigned int darwin_cmdline : 1;
1:  };
1:  
1:  struct acpi_predefined_names {
1: -	const char *name;
1: -	u8 type;
1: -	char *val;
1: +  const char *name;
1: +  u8 type;
1: +  char *val;
1:  };
1:  
1:  typedef u32 (*acpi_osd_handler)(void *);
1: @@ -70761,116 +71766,117 @@ typedef void (*acpi_notify_handler)(acpi_handle, u32, void *);
1:  
1:  typedef void (*acpi_object_handler)(acpi_handle, void *);
1:  
1: -typedef acpi_status (*acpi_adr_space_handler)(u32, acpi_physical_address, u32, u64 *, void *, void *);
1: +typedef acpi_status (*acpi_adr_space_handler)(u32, acpi_physical_address, u32,
1: +                                              u64 *, void *, void *);
1:  
1:  typedef acpi_status (*acpi_adr_space_setup)(acpi_handle, u32, void *, void **);
1:  
1:  struct acpi_pci_id {
1: -	u16 segment;
1: -	u16 bus;
1: -	u16 device;
1: -	u16 function;
1: +  u16 segment;
1: +  u16 bus;
1: +  u16 device;
1: +  u16 function;
1:  };
1:  
1:  struct acpi_mem_mapping {
1: -	acpi_physical_address physical_address;
1: -	u8 *logical_address;
1: -	acpi_size length;
1: -	struct acpi_mem_mapping *next_mm;
1: +  acpi_physical_address physical_address;
1: +  u8 *logical_address;
1: +  acpi_size length;
1: +  struct acpi_mem_mapping *next_mm;
1:  };
1:  
1:  struct acpi_mem_space_context {
1: -	u32 length;
1: -	acpi_physical_address address;
1: -	struct acpi_mem_mapping *cur_mm;
1: -	struct acpi_mem_mapping *first_mm;
1: +  u32 length;
1: +  acpi_physical_address address;
1: +  struct acpi_mem_mapping *cur_mm;
1: +  struct acpi_mem_mapping *first_mm;
1:  };
1:  
1:  typedef enum {
1: -	OSL_GLOBAL_LOCK_HANDLER = 0,
1: -	OSL_NOTIFY_HANDLER = 1,
1: -	OSL_GPE_HANDLER = 2,
1: -	OSL_DEBUGGER_MAIN_THREAD = 3,
1: -	OSL_DEBUGGER_EXEC_THREAD = 4,
1: -	OSL_EC_POLL_HANDLER = 5,
1: -	OSL_EC_BURST_HANDLER = 6,
1: +  OSL_GLOBAL_LOCK_HANDLER = 0,
1: +  OSL_NOTIFY_HANDLER = 1,
1: +  OSL_GPE_HANDLER = 2,
1: +  OSL_DEBUGGER_MAIN_THREAD = 3,
1: +  OSL_DEBUGGER_EXEC_THREAD = 4,
1: +  OSL_EC_POLL_HANDLER = 5,
1: +  OSL_EC_BURST_HANDLER = 6,
1:  } acpi_execute_type;
1:  
1:  union acpi_operand_object;
1:  
1:  struct acpi_namespace_node {
1: -	union acpi_operand_object *object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 flags;
1: -	union acpi_name_union name;
1: -	struct acpi_namespace_node *parent;
1: -	struct acpi_namespace_node *child;
1: -	struct acpi_namespace_node *peer;
1: -	acpi_owner_id owner_id;
1: +  union acpi_operand_object *object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 flags;
1: +  union acpi_name_union name;
1: +  struct acpi_namespace_node *parent;
1: +  struct acpi_namespace_node *child;
1: +  struct acpi_namespace_node *peer;
1: +  acpi_owner_id owner_id;
1:  };
1:  
1:  struct acpi_object_common {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1:  };
1:  
1:  struct acpi_object_integer {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 fill[3];
1: -	u64 value;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 fill[3];
1: +  u64 value;
1:  };
1:  
1:  struct acpi_object_string {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	char *pointer;
1: -	u32 length;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  char *pointer;
1: +  u32 length;
1:  };
1:  
1:  struct acpi_object_buffer {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 *pointer;
1: -	u32 length;
1: -	u32 aml_length;
1: -	u8 *aml_start;
1: -	struct acpi_namespace_node *node;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 *pointer;
1: +  u32 length;
1: +  u32 aml_length;
1: +  u8 *aml_start;
1: +  struct acpi_namespace_node *node;
1:  };
1:  
1:  struct acpi_object_package {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_operand_object **elements;
1: -	u8 *aml_start;
1: -	u32 aml_length;
1: -	u32 count;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_operand_object **elements;
1: +  u8 *aml_start;
1: +  u32 aml_length;
1: +  u32 count;
1:  };
1:  
1:  struct acpi_object_event {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	void *os_semaphore;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  void *os_semaphore;
1:  };
1:  
1:  struct acpi_walk_state;
1: @@ -70878,319 +71884,319 @@ struct acpi_walk_state;
1:  typedef acpi_status (*acpi_internal_method)(struct acpi_walk_state *);
1:  
1:  struct acpi_object_method {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 info_flags;
1: -	u8 param_count;
1: -	u8 sync_level;
1: -	union acpi_operand_object *mutex;
1: -	union acpi_operand_object *node;
1: -	u8 *aml_start;
1: -	union {
1: -		acpi_internal_method implementation;
1: -		union acpi_operand_object *handler;
1: -	} dispatch;
1: -	u32 aml_length;
1: -	acpi_owner_id owner_id;
1: -	u8 thread_count;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 info_flags;
1: +  u8 param_count;
1: +  u8 sync_level;
1: +  union acpi_operand_object *mutex;
1: +  union acpi_operand_object *node;
1: +  u8 *aml_start;
1: +  union {
1: +    acpi_internal_method implementation;
1: +    union acpi_operand_object *handler;
1: +  } dispatch;
1: +  u32 aml_length;
1: +  acpi_owner_id owner_id;
1: +  u8 thread_count;
1:  };
1:  
1:  struct acpi_thread_state;
1:  
1:  struct acpi_object_mutex {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 sync_level;
1: -	u16 acquisition_depth;
1: -	void *os_mutex;
1: -	u64 thread_id;
1: -	struct acpi_thread_state *owner_thread;
1: -	union acpi_operand_object *prev;
1: -	union acpi_operand_object *next;
1: -	struct acpi_namespace_node *node;
1: -	u8 original_sync_level;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 sync_level;
1: +  u16 acquisition_depth;
1: +  void *os_mutex;
1: +  u64 thread_id;
1: +  struct acpi_thread_state *owner_thread;
1: +  union acpi_operand_object *prev;
1: +  union acpi_operand_object *next;
1: +  struct acpi_namespace_node *node;
1: +  u8 original_sync_level;
1:  };
1:  
1:  struct acpi_object_region {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 space_id;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_operand_object *handler;
1: -	union acpi_operand_object *next;
1: -	acpi_physical_address address;
1: -	u32 length;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 space_id;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_operand_object *handler;
1: +  union acpi_operand_object *next;
1: +  acpi_physical_address address;
1: +  u32 length;
1:  };
1:  
1:  struct acpi_object_notify_common {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	union acpi_operand_object *notify_list[2];
1: -	union acpi_operand_object *handler;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  union acpi_operand_object *notify_list[2];
1: +  union acpi_operand_object *handler;
1:  };
1:  
1:  struct acpi_gpe_block_info;
1:  
1:  struct acpi_object_device {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	union acpi_operand_object *notify_list[2];
1: -	union acpi_operand_object *handler;
1: -	struct acpi_gpe_block_info *gpe_block;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  union acpi_operand_object *notify_list[2];
1: +  union acpi_operand_object *handler;
1: +  struct acpi_gpe_block_info *gpe_block;
1:  };
1:  
1:  struct acpi_object_power_resource {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	union acpi_operand_object *notify_list[2];
1: -	union acpi_operand_object *handler;
1: -	u32 system_level;
1: -	u32 resource_order;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  union acpi_operand_object *notify_list[2];
1: +  union acpi_operand_object *handler;
1: +  u32 system_level;
1: +  u32 resource_order;
1:  };
1:  
1:  struct acpi_object_processor {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 proc_id;
1: -	u8 length;
1: -	union acpi_operand_object *notify_list[2];
1: -	union acpi_operand_object *handler;
1: -	acpi_io_address address;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 proc_id;
1: +  u8 length;
1: +  union acpi_operand_object *notify_list[2];
1: +  union acpi_operand_object *handler;
1: +  acpi_io_address address;
1:  };
1:  
1:  struct acpi_object_thermal_zone {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	union acpi_operand_object *notify_list[2];
1: -	union acpi_operand_object *handler;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  union acpi_operand_object *notify_list[2];
1: +  union acpi_operand_object *handler;
1:  };
1:  
1:  struct acpi_object_field_common {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 field_flags;
1: -	u8 attribute;
1: -	u8 access_byte_width;
1: -	struct acpi_namespace_node *node;
1: -	u32 bit_length;
1: -	u32 base_byte_offset;
1: -	u32 value;
1: -	u8 start_field_bit_offset;
1: -	u8 access_length;
1: -	union acpi_operand_object *region_obj;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 field_flags;
1: +  u8 attribute;
1: +  u8 access_byte_width;
1: +  struct acpi_namespace_node *node;
1: +  u32 bit_length;
1: +  u32 base_byte_offset;
1: +  u32 value;
1: +  u8 start_field_bit_offset;
1: +  u8 access_length;
1: +  union acpi_operand_object *region_obj;
1:  };
1:  
1:  struct acpi_object_region_field {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 field_flags;
1: -	u8 attribute;
1: -	u8 access_byte_width;
1: -	struct acpi_namespace_node *node;
1: -	u32 bit_length;
1: -	u32 base_byte_offset;
1: -	u32 value;
1: -	u8 start_field_bit_offset;
1: -	u8 access_length;
1: -	u16 resource_length;
1: -	union acpi_operand_object *region_obj;
1: -	u8 *resource_buffer;
1: -	u16 pin_number_index;
1: -	u8 *internal_pcc_buffer;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 field_flags;
1: +  u8 attribute;
1: +  u8 access_byte_width;
1: +  struct acpi_namespace_node *node;
1: +  u32 bit_length;
1: +  u32 base_byte_offset;
1: +  u32 value;
1: +  u8 start_field_bit_offset;
1: +  u8 access_length;
1: +  u16 resource_length;
1: +  union acpi_operand_object *region_obj;
1: +  u8 *resource_buffer;
1: +  u16 pin_number_index;
1: +  u8 *internal_pcc_buffer;
1:  };
1:  
1:  struct acpi_object_buffer_field {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 field_flags;
1: -	u8 attribute;
1: -	u8 access_byte_width;
1: -	struct acpi_namespace_node *node;
1: -	u32 bit_length;
1: -	u32 base_byte_offset;
1: -	u32 value;
1: -	u8 start_field_bit_offset;
1: -	u8 access_length;
1: -	u8 is_create_field;
1: -	union acpi_operand_object *buffer_obj;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 field_flags;
1: +  u8 attribute;
1: +  u8 access_byte_width;
1: +  struct acpi_namespace_node *node;
1: +  u32 bit_length;
1: +  u32 base_byte_offset;
1: +  u32 value;
1: +  u8 start_field_bit_offset;
1: +  u8 access_length;
1: +  u8 is_create_field;
1: +  union acpi_operand_object *buffer_obj;
1:  };
1:  
1:  struct acpi_object_bank_field {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 field_flags;
1: -	u8 attribute;
1: -	u8 access_byte_width;
1: -	struct acpi_namespace_node *node;
1: -	u32 bit_length;
1: -	u32 base_byte_offset;
1: -	u32 value;
1: -	u8 start_field_bit_offset;
1: -	u8 access_length;
1: -	union acpi_operand_object *region_obj;
1: -	union acpi_operand_object *bank_obj;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 field_flags;
1: +  u8 attribute;
1: +  u8 access_byte_width;
1: +  struct acpi_namespace_node *node;
1: +  u32 bit_length;
1: +  u32 base_byte_offset;
1: +  u32 value;
1: +  u8 start_field_bit_offset;
1: +  u8 access_length;
1: +  union acpi_operand_object *region_obj;
1: +  union acpi_operand_object *bank_obj;
1:  };
1:  
1:  struct acpi_object_index_field {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 field_flags;
1: -	u8 attribute;
1: -	u8 access_byte_width;
1: -	struct acpi_namespace_node *node;
1: -	u32 bit_length;
1: -	u32 base_byte_offset;
1: -	u32 value;
1: -	u8 start_field_bit_offset;
1: -	u8 access_length;
1: -	union acpi_operand_object *index_obj;
1: -	union acpi_operand_object *data_obj;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 field_flags;
1: +  u8 attribute;
1: +  u8 access_byte_width;
1: +  struct acpi_namespace_node *node;
1: +  u32 bit_length;
1: +  u32 base_byte_offset;
1: +  u32 value;
1: +  u8 start_field_bit_offset;
1: +  u8 access_length;
1: +  union acpi_operand_object *index_obj;
1: +  union acpi_operand_object *data_obj;
1:  };
1:  
1:  struct acpi_object_notify_handler {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	struct acpi_namespace_node *node;
1: -	u32 handler_type;
1: -	acpi_notify_handler handler;
1: -	void *context;
1: -	union acpi_operand_object *next[2];
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  struct acpi_namespace_node *node;
1: +  u32 handler_type;
1: +  acpi_notify_handler handler;
1: +  void *context;
1: +  union acpi_operand_object *next[2];
1:  };
1:  
1:  struct acpi_object_addr_handler {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 space_id;
1: -	u8 handler_flags;
1: -	acpi_adr_space_handler handler;
1: -	struct acpi_namespace_node *node;
1: -	void *context;
1: -	acpi_adr_space_setup setup;
1: -	union acpi_operand_object *region_list;
1: -	union acpi_operand_object *next;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 space_id;
1: +  u8 handler_flags;
1: +  acpi_adr_space_handler handler;
1: +  struct acpi_namespace_node *node;
1: +  void *context;
1: +  acpi_adr_space_setup setup;
1: +  union acpi_operand_object *region_list;
1: +  union acpi_operand_object *next;
1:  };
1:  
1:  struct acpi_object_reference {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	u8 class;
1: -	u8 target_type;
1: -	u8 resolved;
1: -	void *object;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_operand_object **where;
1: -	u8 *index_pointer;
1: -	u8 *aml;
1: -	u32 value;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  u8 class;
1: +  u8 target_type;
1: +  u8 resolved;
1: +  void *object;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_operand_object **where;
1: +  u8 *index_pointer;
1: +  u8 *aml;
1: +  u32 value;
1:  };
1:  
1:  struct acpi_object_extra {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	struct acpi_namespace_node *method_REG;
1: -	struct acpi_namespace_node *scope_node;
1: -	void *region_context;
1: -	u8 *aml_start;
1: -	u32 aml_length;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  struct acpi_namespace_node *method_REG;
1: +  struct acpi_namespace_node *scope_node;
1: +  void *region_context;
1: +  u8 *aml_start;
1: +  u32 aml_length;
1:  };
1:  
1:  struct acpi_object_data {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	acpi_object_handler handler;
1: -	void *pointer;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  acpi_object_handler handler;
1: +  void *pointer;
1:  };
1:  
1:  struct acpi_object_cache_list {
1: -	union acpi_operand_object *next_object;
1: -	u8 descriptor_type;
1: -	u8 type;
1: -	u16 reference_count;
1: -	u8 flags;
1: -	union acpi_operand_object *next;
1: +  union acpi_operand_object *next_object;
1: +  u8 descriptor_type;
1: +  u8 type;
1: +  u16 reference_count;
1: +  u8 flags;
1: +  union acpi_operand_object *next;
1:  };
1:  
1:  union acpi_operand_object {
1: -	struct acpi_object_common common;
1: -	struct acpi_object_integer integer;
1: -	struct acpi_object_string string;
1: -	struct acpi_object_buffer buffer;
1: -	struct acpi_object_package package;
1: -	struct acpi_object_event event;
1: -	struct acpi_object_method method;
1: -	struct acpi_object_mutex mutex;
1: -	struct acpi_object_region region;
1: -	struct acpi_object_notify_common common_notify;
1: -	struct acpi_object_device device;
1: -	struct acpi_object_power_resource power_resource;
1: -	struct acpi_object_processor processor;
1: -	struct acpi_object_thermal_zone thermal_zone;
1: -	struct acpi_object_field_common common_field;
1: -	struct acpi_object_region_field field;
1: -	struct acpi_object_buffer_field buffer_field;
1: -	struct acpi_object_bank_field bank_field;
1: -	struct acpi_object_index_field index_field;
1: -	struct acpi_object_notify_handler notify;
1: -	struct acpi_object_addr_handler address_space;
1: -	struct acpi_object_reference reference;
1: -	struct acpi_object_extra extra;
1: -	struct acpi_object_data data;
1: -	struct acpi_object_cache_list cache;
1: -	struct acpi_namespace_node node;
1: +  struct acpi_object_common common;
1: +  struct acpi_object_integer integer;
1: +  struct acpi_object_string string;
1: +  struct acpi_object_buffer buffer;
1: +  struct acpi_object_package package;
1: +  struct acpi_object_event event;
1: +  struct acpi_object_method method;
1: +  struct acpi_object_mutex mutex;
1: +  struct acpi_object_region region;
1: +  struct acpi_object_notify_common common_notify;
1: +  struct acpi_object_device device;
1: +  struct acpi_object_power_resource power_resource;
1: +  struct acpi_object_processor processor;
1: +  struct acpi_object_thermal_zone thermal_zone;
1: +  struct acpi_object_field_common common_field;
1: +  struct acpi_object_region_field field;
1: +  struct acpi_object_buffer_field buffer_field;
1: +  struct acpi_object_bank_field bank_field;
1: +  struct acpi_object_index_field index_field;
1: +  struct acpi_object_notify_handler notify;
1: +  struct acpi_object_addr_handler address_space;
1: +  struct acpi_object_reference reference;
1: +  struct acpi_object_extra extra;
1: +  struct acpi_object_data data;
1: +  struct acpi_object_cache_list cache;
1: +  struct acpi_namespace_node node;
1:  };
1:  
1:  union acpi_parse_object;
1: @@ -71198,1097 +72204,1100 @@ union acpi_parse_object;
1:  union acpi_generic_state;
1:  
1:  struct acpi_parse_state {
1: -	u8 *aml_start;
1: -	u8 *aml;
1: -	u8 *aml_end;
1: -	u8 *pkg_start;
1: -	u8 *pkg_end;
1: -	union acpi_parse_object *start_op;
1: -	struct acpi_namespace_node *start_node;
1: -	union acpi_generic_state *scope;
1: -	union acpi_parse_object *start_scope;
1: -	u32 aml_size;
1: +  u8 *aml_start;
1: +  u8 *aml;
1: +  u8 *aml_end;
1: +  u8 *pkg_start;
1: +  u8 *pkg_end;
1: +  union acpi_parse_object *start_op;
1: +  struct acpi_namespace_node *start_node;
1: +  union acpi_generic_state *scope;
1: +  union acpi_parse_object *start_scope;
1: +  u32 aml_size;
1:  };
1:  
1: -typedef acpi_status (*acpi_parse_downwards)(struct acpi_walk_state *, union acpi_parse_object **);
1: +typedef acpi_status (*acpi_parse_downwards)(struct acpi_walk_state *,
1: +                                            union acpi_parse_object **);
1:  
1:  typedef acpi_status (*acpi_parse_upwards)(struct acpi_walk_state *);
1:  
1:  struct acpi_opcode_info;
1:  
1:  struct acpi_walk_state {
1: -	struct acpi_walk_state *next;
1: -	u8 descriptor_type;
1: -	u8 walk_type;
1: -	u16 opcode;
1: -	u8 next_op_info;
1: -	u8 num_operands;
1: -	u8 operand_index;
1: -	acpi_owner_id owner_id;
1: -	u8 last_predicate;
1: -	u8 current_result;
1: -	u8 return_used;
1: -	u8 scope_depth;
1: -	u8 pass_number;
1: -	u8 namespace_override;
1: -	u8 result_size;
1: -	u8 result_count;
1: -	u8 *aml;
1: -	u32 arg_types;
1: -	u32 method_breakpoint;
1: -	u32 user_breakpoint;
1: -	u32 parse_flags;
1: -	struct acpi_parse_state parser_state;
1: -	u32 prev_arg_types;
1: -	u32 arg_count;
1: -	u16 method_nesting_depth;
1: -	u8 method_is_nested;
1: -	struct acpi_namespace_node arguments[7];
1: -	struct acpi_namespace_node local_variables[8];
1: -	union acpi_operand_object *operands[9];
1: -	union acpi_operand_object **params;
1: -	u8 *aml_last_while;
1: -	union acpi_operand_object **caller_return_desc;
1: -	union acpi_generic_state *control_state;
1: -	struct acpi_namespace_node *deferred_node;
1: -	union acpi_operand_object *implicit_return_obj;
1: -	struct acpi_namespace_node *method_call_node;
1: -	union acpi_parse_object *method_call_op;
1: -	union acpi_operand_object *method_desc;
1: -	struct acpi_namespace_node *method_node;
1: -	char *method_pathname;
1: -	union acpi_parse_object *op;
1: -	const struct acpi_opcode_info *op_info;
1: -	union acpi_parse_object *origin;
1: -	union acpi_operand_object *result_obj;
1: -	union acpi_generic_state *results;
1: -	union acpi_operand_object *return_desc;
1: -	union acpi_generic_state *scope_info;
1: -	union acpi_parse_object *prev_op;
1: -	union acpi_parse_object *next_op;
1: -	struct acpi_thread_state *thread;
1: -	acpi_parse_downwards descending_callback;
1: -	acpi_parse_upwards ascending_callback;
1: +  struct acpi_walk_state *next;
1: +  u8 descriptor_type;
1: +  u8 walk_type;
1: +  u16 opcode;
1: +  u8 next_op_info;
1: +  u8 num_operands;
1: +  u8 operand_index;
1: +  acpi_owner_id owner_id;
1: +  u8 last_predicate;
1: +  u8 current_result;
1: +  u8 return_used;
1: +  u8 scope_depth;
1: +  u8 pass_number;
1: +  u8 namespace_override;
1: +  u8 result_size;
1: +  u8 result_count;
1: +  u8 *aml;
1: +  u32 arg_types;
1: +  u32 method_breakpoint;
1: +  u32 user_breakpoint;
1: +  u32 parse_flags;
1: +  struct acpi_parse_state parser_state;
1: +  u32 prev_arg_types;
1: +  u32 arg_count;
1: +  u16 method_nesting_depth;
1: +  u8 method_is_nested;
1: +  struct acpi_namespace_node arguments[7];
1: +  struct acpi_namespace_node local_variables[8];
1: +  union acpi_operand_object *operands[9];
1: +  union acpi_operand_object **params;
1: +  u8 *aml_last_while;
1: +  union acpi_operand_object **caller_return_desc;
1: +  union acpi_generic_state *control_state;
1: +  struct acpi_namespace_node *deferred_node;
1: +  union acpi_operand_object *implicit_return_obj;
1: +  struct acpi_namespace_node *method_call_node;
1: +  union acpi_parse_object *method_call_op;
1: +  union acpi_operand_object *method_desc;
1: +  struct acpi_namespace_node *method_node;
1: +  char *method_pathname;
1: +  union acpi_parse_object *op;
1: +  const struct acpi_opcode_info *op_info;
1: +  union acpi_parse_object *origin;
1: +  union acpi_operand_object *result_obj;
1: +  union acpi_generic_state *results;
1: +  union acpi_operand_object *return_desc;
1: +  union acpi_generic_state *scope_info;
1: +  union acpi_parse_object *prev_op;
1: +  union acpi_parse_object *next_op;
1: +  struct acpi_thread_state *thread;
1: +  acpi_parse_downwards descending_callback;
1: +  acpi_parse_upwards ascending_callback;
1:  };
1:  
1:  struct acpi_gpe_handler_info {
1: -	acpi_gpe_handler address;
1: -	void *context;
1: -	struct acpi_namespace_node *method_node;
1: -	u8 original_flags;
1: -	u8 originally_enabled;
1: +  acpi_gpe_handler address;
1: +  void *context;
1: +  struct acpi_namespace_node *method_node;
1: +  u8 original_flags;
1: +  u8 originally_enabled;
1:  };
1:  
1:  struct acpi_gpe_notify_info {
1: -	struct acpi_namespace_node *device_node;
1: -	struct acpi_gpe_notify_info *next;
1: +  struct acpi_namespace_node *device_node;
1: +  struct acpi_gpe_notify_info *next;
1:  };
1:  
1:  union acpi_gpe_dispatch_info {
1: -	struct acpi_namespace_node *method_node;
1: -	struct acpi_gpe_handler_info *handler;
1: -	struct acpi_gpe_notify_info *notify_list;
1: +  struct acpi_namespace_node *method_node;
1: +  struct acpi_gpe_handler_info *handler;
1: +  struct acpi_gpe_notify_info *notify_list;
1:  };
1:  
1:  struct acpi_gpe_register_info;
1:  
1:  struct acpi_gpe_event_info {
1: -	union acpi_gpe_dispatch_info dispatch;
1: -	struct acpi_gpe_register_info *register_info;
1: -	u8 flags;
1: -	u8 gpe_number;
1: -	u8 runtime_count;
1: -	u8 disable_for_dispatch;
1: +  union acpi_gpe_dispatch_info dispatch;
1: +  struct acpi_gpe_register_info *register_info;
1: +  u8 flags;
1: +  u8 gpe_number;
1: +  u8 runtime_count;
1: +  u8 disable_for_dispatch;
1:  };
1:  
1:  struct acpi_gpe_address {
1: -	u8 space_id;
1: -	u64 address;
1: +  u8 space_id;
1: +  u64 address;
1:  };
1:  
1:  struct acpi_gpe_register_info {
1: -	struct acpi_gpe_address status_address;
1: -	struct acpi_gpe_address enable_address;
1: -	u16 base_gpe_number;
1: -	u8 enable_for_wake;
1: -	u8 enable_for_run;
1: -	u8 mask_for_run;
1: -	u8 enable_mask;
1: +  struct acpi_gpe_address status_address;
1: +  struct acpi_gpe_address enable_address;
1: +  u16 base_gpe_number;
1: +  u8 enable_for_wake;
1: +  u8 enable_for_run;
1: +  u8 mask_for_run;
1: +  u8 enable_mask;
1:  };
1:  
1:  struct acpi_gpe_xrupt_info;
1:  
1:  struct acpi_gpe_block_info {
1: -	struct acpi_namespace_node *node;
1: -	struct acpi_gpe_block_info *previous;
1: -	struct acpi_gpe_block_info *next;
1: -	struct acpi_gpe_xrupt_info *xrupt_block;
1: -	struct acpi_gpe_register_info *register_info;
1: -	struct acpi_gpe_event_info *event_info;
1: -	u64 address;
1: -	u32 register_count;
1: -	u16 gpe_count;
1: -	u16 block_base_number;
1: -	u8 space_id;
1: -	u8 initialized;
1: +  struct acpi_namespace_node *node;
1: +  struct acpi_gpe_block_info *previous;
1: +  struct acpi_gpe_block_info *next;
1: +  struct acpi_gpe_xrupt_info *xrupt_block;
1: +  struct acpi_gpe_register_info *register_info;
1: +  struct acpi_gpe_event_info *event_info;
1: +  u64 address;
1: +  u32 register_count;
1: +  u16 gpe_count;
1: +  u16 block_base_number;
1: +  u8 space_id;
1: +  u8 initialized;
1:  };
1:  
1:  struct acpi_gpe_xrupt_info {
1: -	struct acpi_gpe_xrupt_info *previous;
1: -	struct acpi_gpe_xrupt_info *next;
1: -	struct acpi_gpe_block_info *gpe_block_list_head;
1: -	u32 interrupt_number;
1: +  struct acpi_gpe_xrupt_info *previous;
1: +  struct acpi_gpe_xrupt_info *next;
1: +  struct acpi_gpe_block_info *gpe_block_list_head;
1: +  u32 interrupt_number;
1:  };
1:  
1:  struct acpi_common_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1:  };
1:  
1:  struct acpi_update_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	union acpi_operand_object *object;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  union acpi_operand_object *object;
1:  };
1:  
1:  struct acpi_pkg_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	u32 index;
1: -	union acpi_operand_object *source_object;
1: -	union acpi_operand_object *dest_object;
1: -	struct acpi_walk_state *walk_state;
1: -	void *this_target_obj;
1: -	u32 num_packages;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  u32 index;
1: +  union acpi_operand_object *source_object;
1: +  union acpi_operand_object *dest_object;
1: +  struct acpi_walk_state *walk_state;
1: +  void *this_target_obj;
1: +  u32 num_packages;
1:  };
1:  
1:  struct acpi_control_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	u16 opcode;
1: -	union acpi_parse_object *predicate_op;
1: -	u8 *aml_predicate_start;
1: -	u8 *package_end;
1: -	u64 loop_timeout;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  u16 opcode;
1: +  union acpi_parse_object *predicate_op;
1: +  u8 *aml_predicate_start;
1: +  u8 *package_end;
1: +  u64 loop_timeout;
1:  };
1:  
1:  union acpi_parse_value {
1: -	u64 integer;
1: -	u32 size;
1: -	char *string;
1: -	u8 *buffer;
1: -	char *name;
1: -	union acpi_parse_object *arg;
1: +  u64 integer;
1: +  u32 size;
1: +  char *string;
1: +  u8 *buffer;
1: +  char *name;
1: +  union acpi_parse_object *arg;
1:  };
1:  
1:  struct acpi_parse_obj_common {
1: -	union acpi_parse_object *parent;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 aml_opcode;
1: -	u8 *aml;
1: -	union acpi_parse_object *next;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_parse_value value;
1: -	u8 arg_list_length;
1: +  union acpi_parse_object *parent;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 aml_opcode;
1: +  u8 *aml;
1: +  union acpi_parse_object *next;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_parse_value value;
1: +  u8 arg_list_length;
1:  };
1:  
1:  struct acpi_parse_obj_named {
1: -	union acpi_parse_object *parent;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 aml_opcode;
1: -	u8 *aml;
1: -	union acpi_parse_object *next;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_parse_value value;
1: -	u8 arg_list_length;
1: -	char *path;
1: -	u8 *data;
1: -	u32 length;
1: -	u32 name;
1: +  union acpi_parse_object *parent;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 aml_opcode;
1: +  u8 *aml;
1: +  union acpi_parse_object *next;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_parse_value value;
1: +  u8 arg_list_length;
1: +  char *path;
1: +  u8 *data;
1: +  u32 length;
1: +  u32 name;
1:  };
1:  
1:  struct acpi_parse_obj_asl {
1: -	union acpi_parse_object *parent;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 aml_opcode;
1: -	u8 *aml;
1: -	union acpi_parse_object *next;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_parse_value value;
1: -	u8 arg_list_length;
1: -	union acpi_parse_object *child;
1: -	union acpi_parse_object *parent_method;
1: -	char *filename;
1: -	u8 file_changed;
1: -	char *parent_filename;
1: -	char *external_name;
1: -	char *namepath;
1: -	char name_seg[4];
1: -	u32 extra_value;
1: -	u32 column;
1: -	u32 line_number;
1: -	u32 logical_line_number;
1: -	u32 logical_byte_offset;
1: -	u32 end_line;
1: -	u32 end_logical_line;
1: -	u32 acpi_btype;
1: -	u32 aml_length;
1: -	u32 aml_subtree_length;
1: -	u32 final_aml_length;
1: -	u32 final_aml_offset;
1: -	u32 compile_flags;
1: -	u16 parse_opcode;
1: -	u8 aml_opcode_length;
1: -	u8 aml_pkg_len_bytes;
1: -	u8 extra;
1: -	char parse_op_name[20];
1: +  union acpi_parse_object *parent;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 aml_opcode;
1: +  u8 *aml;
1: +  union acpi_parse_object *next;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_parse_value value;
1: +  u8 arg_list_length;
1: +  union acpi_parse_object *child;
1: +  union acpi_parse_object *parent_method;
1: +  char *filename;
1: +  u8 file_changed;
1: +  char *parent_filename;
1: +  char *external_name;
1: +  char *namepath;
1: +  char name_seg[4];
1: +  u32 extra_value;
1: +  u32 column;
1: +  u32 line_number;
1: +  u32 logical_line_number;
1: +  u32 logical_byte_offset;
1: +  u32 end_line;
1: +  u32 end_logical_line;
1: +  u32 acpi_btype;
1: +  u32 aml_length;
1: +  u32 aml_subtree_length;
1: +  u32 final_aml_length;
1: +  u32 final_aml_offset;
1: +  u32 compile_flags;
1: +  u16 parse_opcode;
1: +  u8 aml_opcode_length;
1: +  u8 aml_pkg_len_bytes;
1: +  u8 extra;
1: +  char parse_op_name[20];
1:  };
1:  
1:  union acpi_parse_object {
1: -	struct acpi_parse_obj_common common;
1: -	struct acpi_parse_obj_named named;
1: -	struct acpi_parse_obj_asl asl;
1: +  struct acpi_parse_obj_common common;
1: +  struct acpi_parse_obj_named named;
1: +  struct acpi_parse_obj_asl asl;
1:  };
1:  
1:  struct acpi_scope_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	struct acpi_namespace_node *node;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  struct acpi_namespace_node *node;
1:  };
1:  
1:  struct acpi_pscope_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	u32 arg_count;
1: -	union acpi_parse_object *op;
1: -	u8 *arg_end;
1: -	u8 *pkg_end;
1: -	u32 arg_list;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  u32 arg_count;
1: +  union acpi_parse_object *op;
1: +  u8 *arg_end;
1: +  u8 *pkg_end;
1: +  u32 arg_list;
1:  };
1:  
1:  struct acpi_thread_state {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	u8 current_sync_level;
1: -	struct acpi_walk_state *walk_state_list;
1: -	union acpi_operand_object *acquired_mutex_list;
1: -	u64 thread_id;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  u8 current_sync_level;
1: +  struct acpi_walk_state *walk_state_list;
1: +  union acpi_operand_object *acquired_mutex_list;
1: +  u64 thread_id;
1:  };
1:  
1:  struct acpi_result_values {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	union acpi_operand_object *obj_desc[8];
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  union acpi_operand_object *obj_desc[8];
1:  };
1:  
1:  struct acpi_global_notify_handler {
1: -	acpi_notify_handler handler;
1: -	void *context;
1: +  acpi_notify_handler handler;
1: +  void *context;
1:  };
1:  
1:  struct acpi_notify_info {
1: -	void *next;
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 value;
1: -	u16 state;
1: -	u8 handler_list_id;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_operand_object *handler_list_head;
1: -	struct acpi_global_notify_handler *global;
1: +  void *next;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 value;
1: +  u16 state;
1: +  u8 handler_list_id;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_operand_object *handler_list_head;
1: +  struct acpi_global_notify_handler *global;
1:  };
1:  
1:  union acpi_generic_state {
1: -	struct acpi_common_state common;
1: -	struct acpi_control_state control;
1: -	struct acpi_update_state update;
1: -	struct acpi_scope_state scope;
1: -	struct acpi_pscope_state parse_scope;
1: -	struct acpi_pkg_state pkg;
1: -	struct acpi_thread_state thread;
1: -	struct acpi_result_values results;
1: -	struct acpi_notify_info notify;
1: +  struct acpi_common_state common;
1: +  struct acpi_control_state control;
1: +  struct acpi_update_state update;
1: +  struct acpi_scope_state scope;
1: +  struct acpi_pscope_state parse_scope;
1: +  struct acpi_pkg_state pkg;
1: +  struct acpi_thread_state thread;
1: +  struct acpi_result_values results;
1: +  struct acpi_notify_info notify;
1:  };
1:  
1:  struct acpi_opcode_info {
1: -	u32 parse_args;
1: -	u32 runtime_args;
1: -	u16 flags;
1: -	u8 object_type;
1: -	u8 class;
1: -	u8 type;
1: +  u32 parse_args;
1: +  u32 runtime_args;
1: +  u16 flags;
1: +  u8 object_type;
1: +  u8 class;
1: +  u8 type;
1:  };
1:  
1:  struct acpi_os_dpc {
1: -	acpi_osd_exec_callback function;
1: -	void *context;
1: -	struct work_struct work;
1: +  acpi_osd_exec_callback function;
1: +  void *context;
1: +  struct work_struct work;
1:  };
1:  
1:  struct acpi_ioremap {
1: -	struct list_head list;
1: -	void *virt;
1: -	acpi_physical_address phys;
1: -	acpi_size size;
1: -	union {
1: -		long unsigned int refcount;
1: -		struct rcu_work rwork;
1: -	} track;
1: +  struct list_head list;
1: +  void *virt;
1: +  acpi_physical_address phys;
1: +  acpi_size size;
1: +  union {
1: +    long unsigned int refcount;
1: +    struct rcu_work rwork;
1: +  } track;
1:  };
1:  
1:  struct acpi_hp_work {
1: -	struct work_struct work;
1: -	struct acpi_device *adev;
1: -	u32 src;
1: +  struct work_struct work;
1: +  struct acpi_device *adev;
1: +  u32 src;
1:  };
1:  
1:  struct acpi_object_list {
1: -	u32 count;
1: -	union acpi_object *pointer;
1: +  u32 count;
1: +  union acpi_object *pointer;
1:  };
1:  
1:  struct acpi_pld_info {
1: -	u8 revision;
1: -	u8 ignore_color;
1: -	u8 red;
1: -	u8 green;
1: -	u8 blue;
1: -	u16 width;
1: -	u16 height;
1: -	u8 user_visible;
1: -	u8 dock;
1: -	u8 lid;
1: -	u8 panel;
1: -	u8 vertical_position;
1: -	u8 horizontal_position;
1: -	u8 shape;
1: -	u8 group_orientation;
1: -	u8 group_token;
1: -	u8 group_position;
1: -	u8 bay;
1: -	u8 ejectable;
1: -	u8 ospm_eject_required;
1: -	u8 cabinet_number;
1: -	u8 card_cage_number;
1: -	u8 reference;
1: -	u8 rotation;
1: -	u8 order;
1: -	u8 reserved;
1: -	u16 vertical_offset;
1: -	u16 horizontal_offset;
1: +  u8 revision;
1: +  u8 ignore_color;
1: +  u8 red;
1: +  u8 green;
1: +  u8 blue;
1: +  u16 width;
1: +  u16 height;
1: +  u8 user_visible;
1: +  u8 dock;
1: +  u8 lid;
1: +  u8 panel;
1: +  u8 vertical_position;
1: +  u8 horizontal_position;
1: +  u8 shape;
1: +  u8 group_orientation;
1: +  u8 group_token;
1: +  u8 group_position;
1: +  u8 bay;
1: +  u8 ejectable;
1: +  u8 ospm_eject_required;
1: +  u8 cabinet_number;
1: +  u8 card_cage_number;
1: +  u8 reference;
1: +  u8 rotation;
1: +  u8 order;
1: +  u8 reserved;
1: +  u16 vertical_offset;
1: +  u16 horizontal_offset;
1:  };
1:  
1:  struct acpi_handle_list {
1: -	u32 count;
1: -	acpi_handle handles[10];
1: +  u32 count;
1: +  acpi_handle handles[10];
1:  };
1:  
1:  struct acpi_device_bus_id {
1: -	char bus_id[15];
1: -	unsigned int instance_no;
1: -	struct list_head node;
1: +  char bus_id[15];
1: +  unsigned int instance_no;
1: +  struct list_head node;
1:  };
1:  
1:  struct acpi_dev_match_info {
1: -	struct acpi_device_id hid[2];
1: -	const char *uid;
1: -	s64 hrv;
1: +  struct acpi_device_id hid[2];
1: +  const char *uid;
1: +  s64 hrv;
1:  };
1:  
1:  struct nvs_region {
1: -	__u64 phys_start;
1: -	__u64 size;
1: -	struct list_head node;
1: +  __u64 phys_start;
1: +  __u64 size;
1: +  struct list_head node;
1:  };
1:  
1:  struct nvs_page {
1: -	long unsigned int phys_start;
1: -	unsigned int size;
1: -	void *kaddr;
1: -	void *data;
1: -	bool unmap;
1: -	struct list_head node;
1: +  long unsigned int phys_start;
1: +  unsigned int size;
1: +  void *kaddr;
1: +  void *data;
1: +  bool unmap;
1: +  struct list_head node;
1:  };
1:  
1:  struct acpi_wakeup_handler {
1: -	struct list_head list_node;
1: -	bool (*wakeup)(void *);
1: -	void *context;
1: +  struct list_head list_node;
1: +  bool (*wakeup)(void *);
1: +  void *context;
1:  };
1:  
1:  typedef u32 acpi_event_status;
1:  
1:  struct lpi_device_info {
1: -	char *name;
1: -	int enabled;
1: -	union acpi_object *package;
1: +  char *name;
1: +  int enabled;
1: +  union acpi_object *package;
1:  };
1:  
1:  struct lpi_device_constraint {
1: -	int uid;
1: -	int min_dstate;
1: -	int function_states;
1: +  int uid;
1: +  int min_dstate;
1: +  int function_states;
1:  };
1:  
1:  struct lpi_constraints {
1: -	acpi_handle handle;
1: -	int min_dstate;
1: +  acpi_handle handle;
1: +  int min_dstate;
1:  };
1:  
1:  struct acpi_hardware_id {
1: -	struct list_head list;
1: -	const char *id;
1: +  struct list_head list;
1: +  const char *id;
1:  };
1:  
1:  struct acpi_data_node {
1: -	const char *name;
1: -	acpi_handle handle;
1: -	struct fwnode_handle fwnode;
1: -	struct fwnode_handle *parent;
1: -	struct acpi_device_data data;
1: -	struct list_head sibling;
1: -	struct kobject kobj;
1: -	struct completion kobj_done;
1: +  const char *name;
1: +  acpi_handle handle;
1: +  struct fwnode_handle fwnode;
1: +  struct fwnode_handle *parent;
1: +  struct acpi_device_data data;
1: +  struct list_head sibling;
1: +  struct kobject kobj;
1: +  struct completion kobj_done;
1:  };
1:  
1:  struct acpi_data_node_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct acpi_data_node *, char *);
1: -	ssize_t (*store)(struct acpi_data_node *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct acpi_data_node *, char *);
1: +  ssize_t (*store)(struct acpi_data_node *, const char *, size_t);
1:  };
1:  
1:  struct acpi_device_physical_node {
1: -	unsigned int node_id;
1: -	struct list_head node;
1: -	struct device *dev;
1: -	bool put_online: 1;
1: +  unsigned int node_id;
1: +  struct list_head node;
1: +  struct device *dev;
1: +  bool put_online : 1;
1:  };
1:  
1:  enum acpi_bus_device_type {
1: -	ACPI_BUS_TYPE_DEVICE = 0,
1: -	ACPI_BUS_TYPE_POWER = 1,
1: -	ACPI_BUS_TYPE_PROCESSOR = 2,
1: -	ACPI_BUS_TYPE_THERMAL = 3,
1: -	ACPI_BUS_TYPE_POWER_BUTTON = 4,
1: -	ACPI_BUS_TYPE_SLEEP_BUTTON = 5,
1: -	ACPI_BUS_TYPE_ECDT_EC = 6,
1: -	ACPI_BUS_DEVICE_TYPE_COUNT = 7,
1: +  ACPI_BUS_TYPE_DEVICE = 0,
1: +  ACPI_BUS_TYPE_POWER = 1,
1: +  ACPI_BUS_TYPE_PROCESSOR = 2,
1: +  ACPI_BUS_TYPE_THERMAL = 3,
1: +  ACPI_BUS_TYPE_POWER_BUTTON = 4,
1: +  ACPI_BUS_TYPE_SLEEP_BUTTON = 5,
1: +  ACPI_BUS_TYPE_ECDT_EC = 6,
1: +  ACPI_BUS_DEVICE_TYPE_COUNT = 7,
1:  };
1:  
1:  struct acpi_osc_context {
1: -	char *uuid_str;
1: -	int rev;
1: -	struct acpi_buffer cap;
1: -	struct acpi_buffer ret;
1: +  char *uuid_str;
1: +  int rev;
1: +  struct acpi_buffer cap;
1: +  struct acpi_buffer ret;
1:  };
1:  
1:  struct acpi_pnp_device_id {
1: -	u32 length;
1: -	char *string;
1: +  u32 length;
1: +  char *string;
1:  };
1:  
1:  struct acpi_pnp_device_id_list {
1: -	u32 count;
1: -	u32 list_size;
1: -	struct acpi_pnp_device_id ids[0];
1: +  u32 count;
1: +  u32 list_size;
1: +  struct acpi_pnp_device_id ids[0];
1:  };
1:  
1:  struct acpi_device_info {
1: -	u32 info_size;
1: -	u32 name;
1: -	acpi_object_type type;
1: -	u8 param_count;
1: -	u16 valid;
1: -	u8 flags;
1: -	u8 highest_dstates[4];
1: -	u8 lowest_dstates[5];
1: -	u64 address;
1: -	struct acpi_pnp_device_id hardware_id;
1: -	struct acpi_pnp_device_id unique_id;
1: -	struct acpi_pnp_device_id class_code;
1: -	struct acpi_pnp_device_id_list compatible_id_list;
1: +  u32 info_size;
1: +  u32 name;
1: +  acpi_object_type type;
1: +  u8 param_count;
1: +  u16 valid;
1: +  u8 flags;
1: +  u8 highest_dstates[4];
1: +  u8 lowest_dstates[5];
1: +  u64 address;
1: +  struct acpi_pnp_device_id hardware_id;
1: +  struct acpi_pnp_device_id unique_id;
1: +  struct acpi_pnp_device_id class_code;
1: +  struct acpi_pnp_device_id_list compatible_id_list;
1:  };
1:  
1:  struct acpi_table_spcr {
1: -	struct acpi_table_header header;
1: -	u8 interface_type;
1: -	u8 reserved[3];
1: -	struct acpi_generic_address serial_port;
1: -	u8 interrupt_type;
1: -	u8 pc_interrupt;
1: -	u32 interrupt;
1: -	u8 baud_rate;
1: -	u8 parity;
1: -	u8 stop_bits;
1: -	u8 flow_control;
1: -	u8 terminal_type;
1: -	u8 reserved1;
1: -	u16 pci_device_id;
1: -	u16 pci_vendor_id;
1: -	u8 pci_bus;
1: -	u8 pci_device;
1: -	u8 pci_function;
1: -	u32 pci_flags;
1: -	u8 pci_segment;
1: -	u32 reserved2;
1: +  struct acpi_table_header header;
1: +  u8 interface_type;
1: +  u8 reserved[3];
1: +  struct acpi_generic_address serial_port;
1: +  u8 interrupt_type;
1: +  u8 pc_interrupt;
1: +  u32 interrupt;
1: +  u8 baud_rate;
1: +  u8 parity;
1: +  u8 stop_bits;
1: +  u8 flow_control;
1: +  u8 terminal_type;
1: +  u8 reserved1;
1: +  u16 pci_device_id;
1: +  u16 pci_vendor_id;
1: +  u8 pci_bus;
1: +  u8 pci_device;
1: +  u8 pci_function;
1: +  u32 pci_flags;
1: +  u8 pci_segment;
1: +  u32 reserved2;
1:  } __attribute__((packed));
1:  
1:  struct acpi_table_stao {
1: -	struct acpi_table_header header;
1: -	u8 ignore_uart;
1: +  struct acpi_table_header header;
1: +  u8 ignore_uart;
1:  } __attribute__((packed));
1:  
1:  enum acpi_reconfig_event {
1: -	ACPI_RECONFIG_DEVICE_ADD = 0,
1: -	ACPI_RECONFIG_DEVICE_REMOVE = 1,
1: +  ACPI_RECONFIG_DEVICE_ADD = 0,
1: +  ACPI_RECONFIG_DEVICE_REMOVE = 1,
1:  };
1:  
1:  struct acpi_probe_entry;
1:  
1: -typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *, struct acpi_probe_entry *);
1: +typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
1: +                                                 struct acpi_probe_entry *);
1:  
1:  struct acpi_probe_entry {
1: -	__u8 id[5];
1: -	__u8 type;
1: -	acpi_probe_entry_validate_subtbl subtable_valid;
1: -	union {
1: -		acpi_tbl_table_handler probe_table;
1: -		acpi_tbl_entry_handler probe_subtbl;
1: -	};
1: -	kernel_ulong_t driver_data;
1: +  __u8 id[5];
1: +  __u8 type;
1: +  acpi_probe_entry_validate_subtbl subtable_valid;
1: +  union {
1: +    acpi_tbl_table_handler probe_table;
1: +    acpi_tbl_entry_handler probe_subtbl;
1: +  };
1: +  kernel_ulong_t driver_data;
1:  };
1:  
1:  struct acpi_dep_data {
1: -	struct list_head node;
1: -	acpi_handle master;
1: -	acpi_handle slave;
1: +  struct list_head node;
1: +  acpi_handle master;
1: +  acpi_handle slave;
1:  };
1:  
1:  struct acpi_table_events_work {
1: -	struct work_struct work;
1: -	void *table;
1: -	u32 event;
1: +  struct work_struct work;
1: +  void *table;
1: +  u32 event;
1:  };
1:  
1:  struct resource_win {
1: -	struct resource res;
1: -	resource_size_t offset;
1: +  struct resource res;
1: +  resource_size_t offset;
1:  };
1:  
1:  struct res_proc_context {
1: -	struct list_head *list;
1: -	int (*preproc)(struct acpi_resource *, void *);
1: -	void *preproc_data;
1: -	int count;
1: -	int error;
1: +  struct list_head *list;
1: +  int (*preproc)(struct acpi_resource *, void *);
1: +  void *preproc_data;
1: +  int count;
1: +  int error;
1:  };
1:  
1:  struct acpi_processor_errata {
1: -	u8 smp;
1: -	struct {
1: -		u8 throttle: 1;
1: -		u8 fdma: 1;
1: -		u8 reserved: 6;
1: -		u32 bmisx;
1: -	} piix4;
1: +  u8 smp;
1: +  struct {
1: +    u8 throttle : 1;
1: +    u8 fdma : 1;
1: +    u8 reserved : 6;
1: +    u32 bmisx;
1: +  } piix4;
1:  };
1:  
1:  struct acpi_table_ecdt {
1: -	struct acpi_table_header header;
1: -	struct acpi_generic_address control;
1: -	struct acpi_generic_address data;
1: -	u32 uid;
1: -	u8 gpe;
1: -	u8 id[1];
1: +  struct acpi_table_header header;
1: +  struct acpi_generic_address control;
1: +  struct acpi_generic_address data;
1: +  u32 uid;
1: +  u8 gpe;
1: +  u8 id[1];
1:  } __attribute__((packed));
1:  
1:  struct transaction;
1:  
1:  struct acpi_ec {
1: -	acpi_handle handle;
1: -	int gpe;
1: -	int irq;
1: -	long unsigned int command_addr;
1: -	long unsigned int data_addr;
1: -	bool global_lock;
1: -	long unsigned int flags;
1: -	long unsigned int reference_count;
1: -	struct mutex mutex;
1: -	wait_queue_head_t wait;
1: -	struct list_head list;
1: -	struct transaction *curr;
1: -	spinlock_t lock;
1: -	struct work_struct work;
1: -	long unsigned int timestamp;
1: -	long unsigned int nr_pending_queries;
1: -	bool busy_polling;
1: -	unsigned int polling_guard;
1: +  acpi_handle handle;
1: +  int gpe;
1: +  int irq;
1: +  long unsigned int command_addr;
1: +  long unsigned int data_addr;
1: +  bool global_lock;
1: +  long unsigned int flags;
1: +  long unsigned int reference_count;
1: +  struct mutex mutex;
1: +  wait_queue_head_t wait;
1: +  struct list_head list;
1: +  struct transaction *curr;
1: +  spinlock_t lock;
1: +  struct work_struct work;
1: +  long unsigned int timestamp;
1: +  long unsigned int nr_pending_queries;
1: +  bool busy_polling;
1: +  unsigned int polling_guard;
1:  };
1:  
1:  struct transaction {
1: -	const u8 *wdata;
1: -	u8 *rdata;
1: -	short unsigned int irq_count;
1: -	u8 command;
1: -	u8 wi;
1: -	u8 ri;
1: -	u8 wlen;
1: -	u8 rlen;
1: -	u8 flags;
1: +  const u8 *wdata;
1: +  u8 *rdata;
1: +  short unsigned int irq_count;
1: +  u8 command;
1: +  u8 wi;
1: +  u8 ri;
1: +  u8 wlen;
1: +  u8 rlen;
1: +  u8 flags;
1:  };
1:  
1:  typedef int (*acpi_ec_query_func)(void *);
1:  
1:  enum ec_command {
1: -	ACPI_EC_COMMAND_READ = 128,
1: -	ACPI_EC_COMMAND_WRITE = 129,
1: -	ACPI_EC_BURST_ENABLE = 130,
1: -	ACPI_EC_BURST_DISABLE = 131,
1: -	ACPI_EC_COMMAND_QUERY = 132,
1: +  ACPI_EC_COMMAND_READ = 128,
1: +  ACPI_EC_COMMAND_WRITE = 129,
1: +  ACPI_EC_BURST_ENABLE = 130,
1: +  ACPI_EC_BURST_DISABLE = 131,
1: +  ACPI_EC_COMMAND_QUERY = 132,
1:  };
1:  
1:  enum {
1: -	EC_FLAGS_QUERY_ENABLED = 0,
1: -	EC_FLAGS_QUERY_PENDING = 1,
1: -	EC_FLAGS_QUERY_GUARDING = 2,
1: -	EC_FLAGS_EVENT_HANDLER_INSTALLED = 3,
1: -	EC_FLAGS_EC_HANDLER_INSTALLED = 4,
1: -	EC_FLAGS_QUERY_METHODS_INSTALLED = 5,
1: -	EC_FLAGS_STARTED = 6,
1: -	EC_FLAGS_STOPPED = 7,
1: -	EC_FLAGS_EVENTS_MASKED = 8,
1: +  EC_FLAGS_QUERY_ENABLED = 0,
1: +  EC_FLAGS_QUERY_PENDING = 1,
1: +  EC_FLAGS_QUERY_GUARDING = 2,
1: +  EC_FLAGS_EVENT_HANDLER_INSTALLED = 3,
1: +  EC_FLAGS_EC_HANDLER_INSTALLED = 4,
1: +  EC_FLAGS_QUERY_METHODS_INSTALLED = 5,
1: +  EC_FLAGS_STARTED = 6,
1: +  EC_FLAGS_STOPPED = 7,
1: +  EC_FLAGS_EVENTS_MASKED = 8,
1:  };
1:  
1:  struct acpi_ec_query_handler {
1: -	struct list_head node;
1: -	acpi_ec_query_func func;
1: -	acpi_handle handle;
1: -	void *data;
1: -	u8 query_bit;
1: -	struct kref kref;
1: +  struct list_head node;
1: +  acpi_ec_query_func func;
1: +  acpi_handle handle;
1: +  void *data;
1: +  u8 query_bit;
1: +  struct kref kref;
1:  };
1:  
1:  struct acpi_ec_query {
1: -	struct transaction transaction;
1: -	struct work_struct work;
1: -	struct acpi_ec_query_handler *handler;
1: +  struct transaction transaction;
1: +  struct work_struct work;
1: +  struct acpi_ec_query_handler *handler;
1:  };
1:  
1:  struct dock_station {
1: -	acpi_handle handle;
1: -	long unsigned int last_dock_time;
1: -	u32 flags;
1: -	struct list_head dependent_devices;
1: -	struct list_head sibling;
1: -	struct platform_device *dock_device;
1: +  acpi_handle handle;
1: +  long unsigned int last_dock_time;
1: +  u32 flags;
1: +  struct list_head dependent_devices;
1: +  struct list_head sibling;
1: +  struct platform_device *dock_device;
1:  };
1:  
1:  struct dock_dependent_device {
1: -	struct list_head list;
1: -	struct acpi_device *adev;
1: +  struct list_head list;
1: +  struct acpi_device *adev;
1:  };
1:  
1:  enum dock_callback_type {
1: -	DOCK_CALL_HANDLER = 0,
1: -	DOCK_CALL_FIXUP = 1,
1: -	DOCK_CALL_UEVENT = 2,
1: +  DOCK_CALL_HANDLER = 0,
1: +  DOCK_CALL_FIXUP = 1,
1: +  DOCK_CALL_UEVENT = 2,
1:  };
1:  
1:  struct acpi_pci_root_ops;
1:  
1:  struct acpi_pci_root_info {
1: -	struct acpi_pci_root *root;
1: -	struct acpi_device *bridge;
1: -	struct acpi_pci_root_ops *ops;
1: -	struct list_head resources;
1: -	char name[16];
1: +  struct acpi_pci_root *root;
1: +  struct acpi_device *bridge;
1: +  struct acpi_pci_root_ops *ops;
1: +  struct list_head resources;
1: +  char name[16];
1:  };
1:  
1:  struct acpi_pci_root_ops {
1: -	struct pci_ops *pci_ops;
1: -	int (*init_info)(struct acpi_pci_root_info *);
1: -	void (*release_info)(struct acpi_pci_root_info *);
1: -	int (*prepare_resources)(struct acpi_pci_root_info *);
1: +  struct pci_ops *pci_ops;
1: +  int (*init_info)(struct acpi_pci_root_info *);
1: +  void (*release_info)(struct acpi_pci_root_info *);
1: +  int (*prepare_resources)(struct acpi_pci_root_info *);
1:  };
1:  
1:  struct pci_osc_bit_struct {
1: -	u32 bit;
1: -	char *desc;
1: +  u32 bit;
1: +  char *desc;
1:  };
1:  
1:  struct acpi_handle_node {
1: -	struct list_head node;
1: -	acpi_handle handle;
1: +  struct list_head node;
1: +  acpi_handle handle;
1:  };
1:  
1:  struct acpi_pci_link_irq {
1: -	u32 active;
1: -	u8 triggering;
1: -	u8 polarity;
1: -	u8 resource_type;
1: -	u8 possible_count;
1: -	u32 possible[16];
1: -	u8 initialized: 1;
1: -	u8 reserved: 7;
1: +  u32 active;
1: +  u8 triggering;
1: +  u8 polarity;
1: +  u8 resource_type;
1: +  u8 possible_count;
1: +  u32 possible[16];
1: +  u8 initialized : 1;
1: +  u8 reserved : 7;
1:  };
1:  
1:  struct acpi_pci_link {
1: -	struct list_head list;
1: -	struct acpi_device *device;
1: -	struct acpi_pci_link_irq irq;
1: -	int refcnt;
1: +  struct list_head list;
1: +  struct acpi_device *device;
1: +  struct acpi_pci_link_irq irq;
1: +  int refcnt;
1:  };
1:  
1:  struct acpi_pci_routing_table {
1: -	u32 length;
1: -	u32 pin;
1: -	u64 address;
1: -	u32 source_index;
1: -	char source[4];
1: +  u32 length;
1: +  u32 pin;
1: +  u64 address;
1: +  u32 source_index;
1: +  char source[4];
1:  };
1:  
1:  struct acpi_prt_entry {
1: -	struct acpi_pci_id id;
1: -	u8 pin;
1: -	acpi_handle link;
1: -	u32 index;
1: +  struct acpi_pci_id id;
1: +  u8 pin;
1: +  acpi_handle link;
1: +  u32 index;
1:  };
1:  
1:  struct prt_quirk {
1: -	const struct dmi_system_id *system;
1: -	unsigned int segment;
1: -	unsigned int bus;
1: -	unsigned int device;
1: -	unsigned char pin;
1: -	const char *source;
1: -	const char *actual_source;
1: +  const struct dmi_system_id *system;
1: +  unsigned int segment;
1: +  unsigned int bus;
1: +  unsigned int device;
1: +  unsigned char pin;
1: +  const char *source;
1: +  const char *actual_source;
1:  };
1:  
1:  struct apd_private_data;
1:  
1:  struct apd_device_desc {
1: -	unsigned int fixed_clk_rate;
1: -	struct property_entry *properties;
1: -	int (*setup)(struct apd_private_data *);
1: +  unsigned int fixed_clk_rate;
1: +  struct property_entry *properties;
1: +  int (*setup)(struct apd_private_data *);
1:  };
1:  
1:  struct apd_private_data {
1: -	struct clk *clk;
1: -	struct acpi_device *adev;
1: -	const struct apd_device_desc *dev_desc;
1: +  struct clk *clk;
1: +  struct acpi_device *adev;
1: +  const struct apd_device_desc *dev_desc;
1:  };
1:  
1:  struct acpi_power_dependent_device {
1: -	struct device *dev;
1: -	struct list_head node;
1: +  struct device *dev;
1: +  struct list_head node;
1:  };
1:  
1:  struct acpi_power_resource {
1: -	struct acpi_device device;
1: -	struct list_head list_node;
1: -	char *name;
1: -	u32 system_level;
1: -	u32 order;
1: -	unsigned int ref_count;
1: -	bool wakeup_enabled;
1: -	struct mutex resource_lock;
1: -	struct list_head dependents;
1: +  struct acpi_device device;
1: +  struct list_head list_node;
1: +  char *name;
1: +  u32 system_level;
1: +  u32 order;
1: +  unsigned int ref_count;
1: +  bool wakeup_enabled;
1: +  struct mutex resource_lock;
1: +  struct list_head dependents;
1:  };
1:  
1:  struct acpi_power_resource_entry {
1: -	struct list_head node;
1: -	struct acpi_power_resource *resource;
1: +  struct list_head node;
1: +  struct acpi_power_resource *resource;
1:  };
1:  
1:  struct acpi_bus_event {
1: -	struct list_head node;
1: -	acpi_device_class device_class;
1: -	acpi_bus_id bus_id;
1: -	u32 type;
1: -	u32 data;
1: +  struct list_head node;
1: +  acpi_device_class device_class;
1: +  acpi_bus_id bus_id;
1: +  u32 type;
1: +  u32 data;
1:  };
1:  
1:  struct acpi_genl_event {
1: -	acpi_device_class device_class;
1: -	char bus_id[15];
1: -	u32 type;
1: -	u32 data;
1: +  acpi_device_class device_class;
1: +  char bus_id[15];
1: +  u32 type;
1: +  u32 data;
1:  };
1:  
1:  enum {
1: -	ACPI_GENL_ATTR_UNSPEC = 0,
1: -	ACPI_GENL_ATTR_EVENT = 1,
1: -	__ACPI_GENL_ATTR_MAX = 2,
1: +  ACPI_GENL_ATTR_UNSPEC = 0,
1: +  ACPI_GENL_ATTR_EVENT = 1,
1: +  __ACPI_GENL_ATTR_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ACPI_GENL_CMD_UNSPEC = 0,
1: -	ACPI_GENL_CMD_EVENT = 1,
1: -	__ACPI_GENL_CMD_MAX = 2,
1: +  ACPI_GENL_CMD_UNSPEC = 0,
1: +  ACPI_GENL_CMD_EVENT = 1,
1: +  __ACPI_GENL_CMD_MAX = 2,
1:  };
1:  
1:  struct acpi_ged_device {
1: -	struct device *dev;
1: -	struct list_head event_list;
1: +  struct device *dev;
1: +  struct list_head event_list;
1:  };
1:  
1:  struct acpi_ged_event {
1: -	struct list_head node;
1: -	struct device *dev;
1: -	unsigned int gsi;
1: -	unsigned int irq;
1: -	acpi_handle handle;
1: +  struct list_head node;
1: +  struct device *dev;
1: +  unsigned int gsi;
1: +  unsigned int irq;
1: +  acpi_handle handle;
1:  };
1:  
1:  struct acpi_table_bert {
1: -	struct acpi_table_header header;
1: -	u32 region_length;
1: -	u64 address;
1: +  struct acpi_table_header header;
1: +  u32 region_length;
1: +  u64 address;
1:  };
1:  
1:  struct acpi_table_attr {
1: -	struct bin_attribute attr;
1: -	char name[4];
1: -	int instance;
1: -	char filename[8];
1: -	struct list_head node;
1: +  struct bin_attribute attr;
1: +  char name[4];
1: +  int instance;
1: +  char filename[8];
1: +  struct list_head node;
1:  };
1:  
1:  struct acpi_data_attr {
1: -	struct bin_attribute attr;
1: -	u64 addr;
1: +  struct bin_attribute attr;
1: +  u64 addr;
1:  };
1:  
1:  struct acpi_data_obj {
1: -	char *name;
1: -	int (*fn)(void *, struct acpi_data_attr *);
1: +  char *name;
1: +  int (*fn)(void *, struct acpi_data_attr *);
1:  };
1:  
1:  struct event_counter {
1: -	u32 count;
1: -	u32 flags;
1: +  u32 count;
1: +  u32 flags;
1:  };
1:  
1:  struct acpi_device_properties {
1: -	const guid_t *guid;
1: -	const union acpi_object *properties;
1: -	struct list_head list;
1: +  const guid_t *guid;
1: +  const union acpi_object *properties;
1: +  struct list_head list;
1:  };
1:  
1:  struct always_present_id {
1: -	struct acpi_device_id hid[2];
1: -	struct x86_cpu_id cpu_ids[2];
1: -	struct dmi_system_id dmi_ids[2];
1: -	const char *uid;
1: +  struct acpi_device_id hid[2];
1: +  struct x86_cpu_id cpu_ids[2];
1: +  struct dmi_system_id dmi_ids[2];
1: +  const char *uid;
1:  };
1:  
1:  struct acpi_lpat {
1: -	int temp;
1: -	int raw;
1: +  int temp;
1: +  int raw;
1:  };
1:  
1:  struct acpi_lpat_conversion_table {
1: -	struct acpi_lpat *lpat;
1: -	int lpat_count;
1: +  struct acpi_lpat *lpat;
1: +  int lpat_count;
1:  };
1:  
1:  struct acpi_table_lpit {
1: -	struct acpi_table_header header;
1: +  struct acpi_table_header header;
1:  };
1:  
1:  struct acpi_lpit_header {
1: -	u32 type;
1: -	u32 length;
1: -	u16 unique_id;
1: -	u16 reserved;
1: -	u32 flags;
1: +  u32 type;
1: +  u32 length;
1: +  u16 unique_id;
1: +  u16 reserved;
1: +  u32 flags;
1:  };
1:  
1:  struct acpi_lpit_native {
1: -	struct acpi_lpit_header header;
1: -	struct acpi_generic_address entry_trigger;
1: -	u32 residency;
1: -	u32 latency;
1: -	struct acpi_generic_address residency_counter;
1: -	u64 counter_frequency;
1: +  struct acpi_lpit_header header;
1: +  struct acpi_generic_address entry_trigger;
1: +  u32 residency;
1: +  u32 latency;
1: +  struct acpi_generic_address residency_counter;
1: +  u64 counter_frequency;
1:  } __attribute__((packed));
1:  
1:  struct lpit_residency_info {
1: -	struct acpi_generic_address gaddr;
1: -	u64 frequency;
1: -	void *iomem_addr;
1: +  struct acpi_generic_address gaddr;
1: +  u64 frequency;
1: +  void *iomem_addr;
1:  };
1:  
1:  enum {
1: -	ACPI_REFCLASS_LOCAL = 0,
1: -	ACPI_REFCLASS_ARG = 1,
1: -	ACPI_REFCLASS_REFOF = 2,
1: -	ACPI_REFCLASS_INDEX = 3,
1: -	ACPI_REFCLASS_TABLE = 4,
1: -	ACPI_REFCLASS_NAME = 5,
1: -	ACPI_REFCLASS_DEBUG = 6,
1: -	ACPI_REFCLASS_MAX = 6,
1: +  ACPI_REFCLASS_LOCAL = 0,
1: +  ACPI_REFCLASS_ARG = 1,
1: +  ACPI_REFCLASS_REFOF = 2,
1: +  ACPI_REFCLASS_INDEX = 3,
1: +  ACPI_REFCLASS_TABLE = 4,
1: +  ACPI_REFCLASS_NAME = 5,
1: +  ACPI_REFCLASS_DEBUG = 6,
1: +  ACPI_REFCLASS_MAX = 6,
1:  };
1:  
1:  struct acpi_common_descriptor {
1: -	void *common_pointer;
1: -	u8 descriptor_type;
1: +  void *common_pointer;
1: +  u8 descriptor_type;
1:  };
1:  
1:  union acpi_descriptor {
1: -	struct acpi_common_descriptor common;
1: -	union acpi_operand_object object;
1: -	struct acpi_namespace_node node;
1: -	union acpi_parse_object op;
1: +  struct acpi_common_descriptor common;
1: +  union acpi_operand_object object;
1: +  struct acpi_namespace_node node;
1: +  union acpi_parse_object op;
1:  };
1:  
1:  struct acpi_create_field_info {
1: -	struct acpi_namespace_node *region_node;
1: -	struct acpi_namespace_node *field_node;
1: -	struct acpi_namespace_node *register_node;
1: -	struct acpi_namespace_node *data_register_node;
1: -	struct acpi_namespace_node *connection_node;
1: -	u8 *resource_buffer;
1: -	u32 bank_value;
1: -	u32 field_bit_position;
1: -	u32 field_bit_length;
1: -	u16 resource_length;
1: -	u16 pin_number_index;
1: -	u8 field_flags;
1: -	u8 attribute;
1: -	u8 field_type;
1: -	u8 access_length;
1: +  struct acpi_namespace_node *region_node;
1: +  struct acpi_namespace_node *field_node;
1: +  struct acpi_namespace_node *register_node;
1: +  struct acpi_namespace_node *data_register_node;
1: +  struct acpi_namespace_node *connection_node;
1: +  u8 *resource_buffer;
1: +  u32 bank_value;
1: +  u32 field_bit_position;
1: +  u32 field_bit_length;
1: +  u16 resource_length;
1: +  u16 pin_number_index;
1: +  u8 field_flags;
1: +  u8 attribute;
1: +  u8 field_type;
1: +  u8 access_length;
1:  };
1:  
1:  struct acpi_init_walk_info {
1: -	u32 table_index;
1: -	u32 object_count;
1: -	u32 method_count;
1: -	u32 serial_method_count;
1: -	u32 non_serial_method_count;
1: -	u32 serialized_method_count;
1: -	u32 device_count;
1: -	u32 op_region_count;
1: -	u32 field_count;
1: -	u32 buffer_count;
1: -	u32 package_count;
1: -	u32 op_region_init;
1: -	u32 field_init;
1: -	u32 buffer_init;
1: -	u32 package_init;
1: -	acpi_owner_id owner_id;
1: +  u32 table_index;
1: +  u32 object_count;
1: +  u32 method_count;
1: +  u32 serial_method_count;
1: +  u32 non_serial_method_count;
1: +  u32 serialized_method_count;
1: +  u32 device_count;
1: +  u32 op_region_count;
1: +  u32 field_count;
1: +  u32 buffer_count;
1: +  u32 package_count;
1: +  u32 op_region_init;
1: +  u32 field_init;
1: +  u32 buffer_init;
1: +  u32 package_init;
1: +  acpi_owner_id owner_id;
1:  };
1:  
1:  typedef u32 acpi_name;
1:  
1: -typedef acpi_status (*acpi_exception_handler)(acpi_status, acpi_name, u16, u32, void *);
1: +typedef acpi_status (*acpi_exception_handler)(acpi_status, acpi_name, u16, u32,
1: +                                              void *);
1:  
1:  struct acpi_name_info {
1: -	char name[4];
1: -	u16 argument_list;
1: -	u8 expected_btypes;
1: +  char name[4];
1: +  u16 argument_list;
1: +  u8 expected_btypes;
1:  } __attribute__((packed));
1:  
1:  struct acpi_package_info {
1: -	u8 type;
1: -	u8 object_type1;
1: -	u8 count1;
1: -	u8 object_type2;
1: -	u8 count2;
1: -	u16 reserved;
1: +  u8 type;
1: +  u8 object_type1;
1: +  u8 count1;
1: +  u8 object_type2;
1: +  u8 count2;
1: +  u16 reserved;
1:  } __attribute__((packed));
1:  
1:  struct acpi_package_info2 {
1: -	u8 type;
1: -	u8 count;
1: -	u8 object_type[4];
1: -	u8 reserved;
1: +  u8 type;
1: +  u8 count;
1: +  u8 object_type[4];
1: +  u8 reserved;
1:  };
1:  
1:  struct acpi_package_info3 {
1: -	u8 type;
1: -	u8 count;
1: -	u8 object_type[2];
1: -	u8 tail_object_type;
1: -	u16 reserved;
1: +  u8 type;
1: +  u8 count;
1: +  u8 object_type[2];
1: +  u8 tail_object_type;
1: +  u16 reserved;
1:  } __attribute__((packed));
1:  
1:  struct acpi_package_info4 {
1: -	u8 type;
1: -	u8 object_type1;
1: -	u8 count1;
1: -	u8 sub_object_types;
1: -	u8 pkg_count;
1: -	u16 reserved;
1: +  u8 type;
1: +  u8 object_type1;
1: +  u8 count1;
1: +  u8 sub_object_types;
1: +  u8 pkg_count;
1: +  u16 reserved;
1:  } __attribute__((packed));
1:  
1:  union acpi_predefined_info {
1: -	struct acpi_name_info info;
1: -	struct acpi_package_info ret_info;
1: -	struct acpi_package_info2 ret_info2;
1: -	struct acpi_package_info3 ret_info3;
1: -	struct acpi_package_info4 ret_info4;
1: +  struct acpi_name_info info;
1: +  struct acpi_package_info ret_info;
1: +  struct acpi_package_info2 ret_info2;
1: +  struct acpi_package_info3 ret_info3;
1: +  struct acpi_package_info4 ret_info4;
1:  };
1:  
1:  struct acpi_evaluate_info {
1: -	struct acpi_namespace_node *prefix_node;
1: -	const char *relative_pathname;
1: -	union acpi_operand_object **parameters;
1: -	struct acpi_namespace_node *node;
1: -	union acpi_operand_object *obj_desc;
1: -	char *full_pathname;
1: -	const union acpi_predefined_info *predefined;
1: -	union acpi_operand_object *return_object;
1: -	union acpi_operand_object *parent_package;
1: -	u32 return_flags;
1: -	u32 return_btype;
1: -	u16 param_count;
1: -	u16 node_flags;
1: -	u8 pass_number;
1: -	u8 return_object_type;
1: -	u8 flags;
1: -};
1: -
1: -enum {
1: -	AML_FIELD_ACCESS_ANY = 0,
1: -	AML_FIELD_ACCESS_BYTE = 1,
1: -	AML_FIELD_ACCESS_WORD = 2,
1: -	AML_FIELD_ACCESS_DWORD = 3,
1: -	AML_FIELD_ACCESS_QWORD = 4,
1: -	AML_FIELD_ACCESS_BUFFER = 5,
1: +  struct acpi_namespace_node *prefix_node;
1: +  const char *relative_pathname;
1: +  union acpi_operand_object **parameters;
1: +  struct acpi_namespace_node *node;
1: +  union acpi_operand_object *obj_desc;
1: +  char *full_pathname;
1: +  const union acpi_predefined_info *predefined;
1: +  union acpi_operand_object *return_object;
1: +  union acpi_operand_object *parent_package;
1: +  u32 return_flags;
1: +  u32 return_btype;
1: +  u16 param_count;
1: +  u16 node_flags;
1: +  u8 pass_number;
1: +  u8 return_object_type;
1: +  u8 flags;
1: +};
1: +
1: +enum {
1: +  AML_FIELD_ACCESS_ANY = 0,
1: +  AML_FIELD_ACCESS_BYTE = 1,
1: +  AML_FIELD_ACCESS_WORD = 2,
1: +  AML_FIELD_ACCESS_DWORD = 3,
1: +  AML_FIELD_ACCESS_QWORD = 4,
1: +  AML_FIELD_ACCESS_BUFFER = 5,
1:  };
1:  
1:  typedef enum {
1: -	ACPI_IMODE_LOAD_PASS1 = 1,
1: -	ACPI_IMODE_LOAD_PASS2 = 2,
1: -	ACPI_IMODE_EXECUTE = 3,
1: +  ACPI_IMODE_LOAD_PASS1 = 1,
1: +  ACPI_IMODE_LOAD_PASS2 = 2,
1: +  ACPI_IMODE_EXECUTE = 3,
1:  } acpi_interpreter_mode;
1:  
1:  typedef acpi_status (*acpi_execute_op)(struct acpi_walk_state *);
1: @@ -72298,596 +73307,600 @@ typedef void (*acpi_gbl_event_handler)(u32, acpi_handle, u32, void *);
1:  typedef u32 (*acpi_event_handler)(void *);
1:  
1:  struct acpi_fixed_event_handler {
1: -	acpi_event_handler handler;
1: -	void *context;
1: +  acpi_event_handler handler;
1: +  void *context;
1:  };
1:  
1:  struct acpi_fixed_event_info {
1: -	u8 status_register_id;
1: -	u8 enable_register_id;
1: -	u16 status_bit_mask;
1: -	u16 enable_bit_mask;
1: +  u8 status_register_id;
1: +  u8 enable_register_id;
1: +  u16 status_bit_mask;
1: +  u16 enable_bit_mask;
1:  };
1:  
1:  struct acpi_gpe_walk_info {
1: -	struct acpi_namespace_node *gpe_device;
1: -	struct acpi_gpe_block_info *gpe_block;
1: -	u16 count;
1: -	acpi_owner_id owner_id;
1: -	u8 execute_by_owner_id;
1: +  struct acpi_namespace_node *gpe_device;
1: +  struct acpi_gpe_block_info *gpe_block;
1: +  u16 count;
1: +  acpi_owner_id owner_id;
1: +  u8 execute_by_owner_id;
1:  };
1:  
1:  struct acpi_gpe_device_info {
1: -	u32 index;
1: -	u32 next_block_base_index;
1: -	acpi_status status;
1: -	struct acpi_namespace_node *gpe_device;
1: +  u32 index;
1: +  u32 next_block_base_index;
1: +  acpi_status status;
1: +  struct acpi_namespace_node *gpe_device;
1:  };
1:  
1: -typedef acpi_status (*acpi_gpe_callback)(struct acpi_gpe_xrupt_info *, struct acpi_gpe_block_info *, void *);
1: +typedef acpi_status (*acpi_gpe_callback)(struct acpi_gpe_xrupt_info *,
1: +                                         struct acpi_gpe_block_info *, void *);
1:  
1:  struct acpi_table_facs {
1: -	char signature[4];
1: -	u32 length;
1: -	u32 hardware_signature;
1: -	u32 firmware_waking_vector;
1: -	u32 global_lock;
1: -	u32 flags;
1: -	u64 xfirmware_waking_vector;
1: -	u8 version;
1: -	u8 reserved[3];
1: -	u32 ospm_flags;
1: -	u8 reserved1[24];
1: +  char signature[4];
1: +  u32 length;
1: +  u32 hardware_signature;
1: +  u32 firmware_waking_vector;
1: +  u32 global_lock;
1: +  u32 flags;
1: +  u64 xfirmware_waking_vector;
1: +  u8 version;
1: +  u8 reserved[3];
1: +  u32 ospm_flags;
1: +  u8 reserved1[24];
1:  };
1:  
1:  struct acpi_reg_walk_info {
1: -	u32 function;
1: -	u32 reg_run_count;
1: -	acpi_adr_space_type space_id;
1: +  u32 function;
1: +  u32 reg_run_count;
1: +  acpi_adr_space_type space_id;
1:  };
1:  
1:  typedef u32 (*acpi_sci_handler)(void *);
1:  
1:  struct acpi_sci_handler_info {
1: -	struct acpi_sci_handler_info *next;
1: -	acpi_sci_handler address;
1: -	void *context;
1: +  struct acpi_sci_handler_info *next;
1: +  acpi_sci_handler address;
1: +  void *context;
1:  };
1:  
1:  enum {
1: -	AML_FIELD_UPDATE_PRESERVE = 0,
1: -	AML_FIELD_UPDATE_WRITE_AS_ONES = 32,
1: -	AML_FIELD_UPDATE_WRITE_AS_ZEROS = 64,
1: +  AML_FIELD_UPDATE_PRESERVE = 0,
1: +  AML_FIELD_UPDATE_WRITE_AS_ONES = 32,
1: +  AML_FIELD_UPDATE_WRITE_AS_ZEROS = 64,
1:  };
1:  
1:  struct acpi_signal_fatal_info {
1: -	u32 type;
1: -	u32 code;
1: -	u32 argument;
1: +  u32 type;
1: +  u32 code;
1: +  u32 argument;
1:  };
1:  
1:  enum {
1: -	MATCH_MTR = 0,
1: -	MATCH_MEQ = 1,
1: -	MATCH_MLE = 2,
1: -	MATCH_MLT = 3,
1: -	MATCH_MGE = 4,
1: -	MATCH_MGT = 5,
1: +  MATCH_MTR = 0,
1: +  MATCH_MEQ = 1,
1: +  MATCH_MLE = 2,
1: +  MATCH_MLT = 3,
1: +  MATCH_MGE = 4,
1: +  MATCH_MGT = 5,
1:  };
1:  
1:  enum {
1: -	AML_FIELD_ATTRIB_QUICK = 2,
1: -	AML_FIELD_ATTRIB_SEND_RECEIVE = 4,
1: -	AML_FIELD_ATTRIB_BYTE = 6,
1: -	AML_FIELD_ATTRIB_WORD = 8,
1: -	AML_FIELD_ATTRIB_BLOCK = 10,
1: -	AML_FIELD_ATTRIB_BYTES = 11,
1: -	AML_FIELD_ATTRIB_PROCESS_CALL = 12,
1: -	AML_FIELD_ATTRIB_BLOCK_PROCESS_CALL = 13,
1: -	AML_FIELD_ATTRIB_RAW_BYTES = 14,
1: -	AML_FIELD_ATTRIB_RAW_PROCESS_BYTES = 15,
1: +  AML_FIELD_ATTRIB_QUICK = 2,
1: +  AML_FIELD_ATTRIB_SEND_RECEIVE = 4,
1: +  AML_FIELD_ATTRIB_BYTE = 6,
1: +  AML_FIELD_ATTRIB_WORD = 8,
1: +  AML_FIELD_ATTRIB_BLOCK = 10,
1: +  AML_FIELD_ATTRIB_BYTES = 11,
1: +  AML_FIELD_ATTRIB_PROCESS_CALL = 12,
1: +  AML_FIELD_ATTRIB_BLOCK_PROCESS_CALL = 13,
1: +  AML_FIELD_ATTRIB_RAW_BYTES = 14,
1: +  AML_FIELD_ATTRIB_RAW_PROCESS_BYTES = 15,
1:  };
1:  
1:  typedef enum {
1: -	ACPI_TRACE_AML_METHOD = 0,
1: -	ACPI_TRACE_AML_OPCODE = 1,
1: -	ACPI_TRACE_AML_REGION = 2,
1: +  ACPI_TRACE_AML_METHOD = 0,
1: +  ACPI_TRACE_AML_OPCODE = 1,
1: +  ACPI_TRACE_AML_REGION = 2,
1:  } acpi_trace_event_type;
1:  
1:  struct acpi_gpe_block_status_context {
1: -	struct acpi_gpe_register_info *gpe_skip_register_info;
1: -	u8 gpe_skip_mask;
1: -	u8 retval;
1: +  struct acpi_gpe_register_info *gpe_skip_register_info;
1: +  u8 gpe_skip_mask;
1: +  u8 retval;
1:  };
1:  
1:  struct acpi_bit_register_info {
1: -	u8 parent_register;
1: -	u8 bit_position;
1: -	u16 access_bit_mask;
1: +  u8 parent_register;
1: +  u8 bit_position;
1: +  u16 access_bit_mask;
1:  };
1:  
1:  struct acpi_port_info {
1: -	char *name;
1: -	u16 start;
1: -	u16 end;
1: -	u8 osi_dependency;
1: +  char *name;
1: +  u16 start;
1: +  u16 end;
1: +  u8 osi_dependency;
1:  };
1:  
1:  struct acpi_pci_device {
1: -	acpi_handle device;
1: -	struct acpi_pci_device *next;
1: +  acpi_handle device;
1: +  struct acpi_pci_device *next;
1:  };
1:  
1:  typedef acpi_status (*acpi_init_handler)(acpi_handle, u32);
1:  
1:  struct acpi_device_walk_info {
1: -	struct acpi_table_desc *table_desc;
1: -	struct acpi_evaluate_info *evaluate_info;
1: -	u32 device_count;
1: -	u32 num_STA;
1: -	u32 num_INI;
1: +  struct acpi_table_desc *table_desc;
1: +  struct acpi_evaluate_info *evaluate_info;
1: +  u32 device_count;
1: +  u32 num_STA;
1: +  u32 num_INI;
1:  };
1:  
1:  struct acpi_table_list {
1: -	struct acpi_table_desc *tables;
1: -	u32 current_table_count;
1: -	u32 max_table_count;
1: -	u8 flags;
1: +  struct acpi_table_desc *tables;
1: +  u32 current_table_count;
1: +  u32 max_table_count;
1: +  u8 flags;
1:  };
1:  
1:  enum acpi_return_package_types {
1: -	ACPI_PTYPE1_FIXED = 1,
1: -	ACPI_PTYPE1_VAR = 2,
1: -	ACPI_PTYPE1_OPTION = 3,
1: -	ACPI_PTYPE2 = 4,
1: -	ACPI_PTYPE2_COUNT = 5,
1: -	ACPI_PTYPE2_PKG_COUNT = 6,
1: -	ACPI_PTYPE2_FIXED = 7,
1: -	ACPI_PTYPE2_MIN = 8,
1: -	ACPI_PTYPE2_REV_FIXED = 9,
1: -	ACPI_PTYPE2_FIX_VAR = 10,
1: -	ACPI_PTYPE2_VAR_VAR = 11,
1: -	ACPI_PTYPE2_UUID_PAIR = 12,
1: -	ACPI_PTYPE_CUSTOM = 13,
1: -};
1: -
1: -typedef acpi_status (*acpi_object_converter)(struct acpi_namespace_node *, union acpi_operand_object *, union acpi_operand_object **);
1: +  ACPI_PTYPE1_FIXED = 1,
1: +  ACPI_PTYPE1_VAR = 2,
1: +  ACPI_PTYPE1_OPTION = 3,
1: +  ACPI_PTYPE2 = 4,
1: +  ACPI_PTYPE2_COUNT = 5,
1: +  ACPI_PTYPE2_PKG_COUNT = 6,
1: +  ACPI_PTYPE2_FIXED = 7,
1: +  ACPI_PTYPE2_MIN = 8,
1: +  ACPI_PTYPE2_REV_FIXED = 9,
1: +  ACPI_PTYPE2_FIX_VAR = 10,
1: +  ACPI_PTYPE2_VAR_VAR = 11,
1: +  ACPI_PTYPE2_UUID_PAIR = 12,
1: +  ACPI_PTYPE_CUSTOM = 13,
1: +};
1: +
1: +typedef acpi_status (*acpi_object_converter)(struct acpi_namespace_node *,
1: +                                             union acpi_operand_object *,
1: +                                             union acpi_operand_object **);
1:  
1:  struct acpi_simple_repair_info {
1: -	char name[4];
1: -	u32 unexpected_btypes;
1: -	u32 package_index;
1: -	acpi_object_converter object_converter;
1: +  char name[4];
1: +  u32 unexpected_btypes;
1: +  u32 package_index;
1: +  acpi_object_converter object_converter;
1:  };
1:  
1: -typedef acpi_status (*acpi_repair_function)(struct acpi_evaluate_info *, union acpi_operand_object **);
1: +typedef acpi_status (*acpi_repair_function)(struct acpi_evaluate_info *,
1: +                                            union acpi_operand_object **);
1:  
1:  struct acpi_repair_info {
1: -	char name[4];
1: -	acpi_repair_function repair_function;
1: +  char name[4];
1: +  acpi_repair_function repair_function;
1:  };
1:  
1:  struct acpi_namestring_info {
1: -	const char *external_name;
1: -	const char *next_external_char;
1: -	char *internal_name;
1: -	u32 length;
1: -	u32 num_segments;
1: -	u32 num_carats;
1: -	u8 fully_qualified;
1: +  const char *external_name;
1: +  const char *next_external_char;
1: +  char *internal_name;
1: +  u32 length;
1: +  u32 num_segments;
1: +  u32 num_carats;
1: +  u8 fully_qualified;
1:  };
1:  
1:  typedef acpi_status (*acpi_walk_callback)(acpi_handle, u32, void *, void **);
1:  
1:  struct acpi_rw_lock {
1: -	void *writer_mutex;
1: -	void *reader_mutex;
1: -	u32 num_readers;
1: +  void *writer_mutex;
1: +  void *reader_mutex;
1: +  u32 num_readers;
1:  };
1:  
1:  struct acpi_get_devices_info {
1: -	acpi_walk_callback user_function;
1: -	void *context;
1: -	const char *hid;
1: +  acpi_walk_callback user_function;
1: +  void *context;
1: +  const char *hid;
1:  };
1:  
1:  struct aml_resource_small_header {
1: -	u8 descriptor_type;
1: +  u8 descriptor_type;
1:  };
1:  
1:  struct aml_resource_irq {
1: -	u8 descriptor_type;
1: -	u16 irq_mask;
1: -	u8 flags;
1: +  u8 descriptor_type;
1: +  u16 irq_mask;
1: +  u8 flags;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_dma {
1: -	u8 descriptor_type;
1: -	u8 dma_channel_mask;
1: -	u8 flags;
1: +  u8 descriptor_type;
1: +  u8 dma_channel_mask;
1: +  u8 flags;
1:  };
1:  
1:  struct aml_resource_start_dependent {
1: -	u8 descriptor_type;
1: -	u8 flags;
1: +  u8 descriptor_type;
1: +  u8 flags;
1:  };
1:  
1:  struct aml_resource_end_dependent {
1: -	u8 descriptor_type;
1: +  u8 descriptor_type;
1:  };
1:  
1:  struct aml_resource_io {
1: -	u8 descriptor_type;
1: -	u8 flags;
1: -	u16 minimum;
1: -	u16 maximum;
1: -	u8 alignment;
1: -	u8 address_length;
1: +  u8 descriptor_type;
1: +  u8 flags;
1: +  u16 minimum;
1: +  u16 maximum;
1: +  u8 alignment;
1: +  u8 address_length;
1:  };
1:  
1:  struct aml_resource_fixed_io {
1: -	u8 descriptor_type;
1: -	u16 address;
1: -	u8 address_length;
1: +  u8 descriptor_type;
1: +  u16 address;
1: +  u8 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_vendor_small {
1: -	u8 descriptor_type;
1: +  u8 descriptor_type;
1:  };
1:  
1:  struct aml_resource_end_tag {
1: -	u8 descriptor_type;
1: -	u8 checksum;
1: +  u8 descriptor_type;
1: +  u8 checksum;
1:  };
1:  
1:  struct aml_resource_fixed_dma {
1: -	u8 descriptor_type;
1: -	u16 request_lines;
1: -	u16 channels;
1: -	u8 width;
1: +  u8 descriptor_type;
1: +  u16 request_lines;
1: +  u16 channels;
1: +  u8 width;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_large_header {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_memory24 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 flags;
1: -	u16 minimum;
1: -	u16 maximum;
1: -	u16 alignment;
1: -	u16 address_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 flags;
1: +  u16 minimum;
1: +  u16 maximum;
1: +  u16 alignment;
1: +  u16 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_vendor_large {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_memory32 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 flags;
1: -	u32 minimum;
1: -	u32 maximum;
1: -	u32 alignment;
1: -	u32 address_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 flags;
1: +  u32 minimum;
1: +  u32 maximum;
1: +  u32 alignment;
1: +  u32 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_fixed_memory32 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 flags;
1: -	u32 address;
1: -	u32 address_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 flags;
1: +  u32 address;
1: +  u32 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_address {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 resource_type;
1: -	u8 flags;
1: -	u8 specific_flags;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 resource_type;
1: +  u8 flags;
1: +  u8 specific_flags;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_extended_address64 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 resource_type;
1: -	u8 flags;
1: -	u8 specific_flags;
1: -	u8 revision_ID;
1: -	u8 reserved;
1: -	u64 granularity;
1: -	u64 minimum;
1: -	u64 maximum;
1: -	u64 translation_offset;
1: -	u64 address_length;
1: -	u64 type_specific;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 resource_type;
1: +  u8 flags;
1: +  u8 specific_flags;
1: +  u8 revision_ID;
1: +  u8 reserved;
1: +  u64 granularity;
1: +  u64 minimum;
1: +  u64 maximum;
1: +  u64 translation_offset;
1: +  u64 address_length;
1: +  u64 type_specific;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_address64 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 resource_type;
1: -	u8 flags;
1: -	u8 specific_flags;
1: -	u64 granularity;
1: -	u64 minimum;
1: -	u64 maximum;
1: -	u64 translation_offset;
1: -	u64 address_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 resource_type;
1: +  u8 flags;
1: +  u8 specific_flags;
1: +  u64 granularity;
1: +  u64 minimum;
1: +  u64 maximum;
1: +  u64 translation_offset;
1: +  u64 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_address32 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 resource_type;
1: -	u8 flags;
1: -	u8 specific_flags;
1: -	u32 granularity;
1: -	u32 minimum;
1: -	u32 maximum;
1: -	u32 translation_offset;
1: -	u32 address_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 resource_type;
1: +  u8 flags;
1: +  u8 specific_flags;
1: +  u32 granularity;
1: +  u32 minimum;
1: +  u32 maximum;
1: +  u32 translation_offset;
1: +  u32 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_address16 {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 resource_type;
1: -	u8 flags;
1: -	u8 specific_flags;
1: -	u16 granularity;
1: -	u16 minimum;
1: -	u16 maximum;
1: -	u16 translation_offset;
1: -	u16 address_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 resource_type;
1: +  u8 flags;
1: +  u8 specific_flags;
1: +  u16 granularity;
1: +  u16 minimum;
1: +  u16 maximum;
1: +  u16 translation_offset;
1: +  u16 address_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_extended_irq {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 flags;
1: -	u8 interrupt_count;
1: -	u32 interrupts[1];
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 flags;
1: +  u8 interrupt_count;
1: +  u32 interrupts[1];
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_generic_register {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 address_space_id;
1: -	u8 bit_width;
1: -	u8 bit_offset;
1: -	u8 access_size;
1: -	u64 address;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 address_space_id;
1: +  u8 bit_width;
1: +  u8 bit_offset;
1: +  u8 access_size;
1: +  u64 address;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_gpio {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u8 connection_type;
1: -	u16 flags;
1: -	u16 int_flags;
1: -	u8 pin_config;
1: -	u16 drive_strength;
1: -	u16 debounce_timeout;
1: -	u16 pin_table_offset;
1: -	u8 res_source_index;
1: -	u16 res_source_offset;
1: -	u16 vendor_offset;
1: -	u16 vendor_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u8 connection_type;
1: +  u16 flags;
1: +  u16 int_flags;
1: +  u8 pin_config;
1: +  u16 drive_strength;
1: +  u16 debounce_timeout;
1: +  u16 pin_table_offset;
1: +  u8 res_source_index;
1: +  u16 res_source_offset;
1: +  u16 vendor_offset;
1: +  u16 vendor_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_common_serialbus {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u8 res_source_index;
1: -	u8 type;
1: -	u8 flags;
1: -	u16 type_specific_flags;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u8 res_source_index;
1: +  u8 type;
1: +  u8 flags;
1: +  u16 type_specific_flags;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_i2c_serialbus {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u8 res_source_index;
1: -	u8 type;
1: -	u8 flags;
1: -	u16 type_specific_flags;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u32 connection_speed;
1: -	u16 slave_address;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u8 res_source_index;
1: +  u8 type;
1: +  u8 flags;
1: +  u16 type_specific_flags;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u32 connection_speed;
1: +  u16 slave_address;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_spi_serialbus {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u8 res_source_index;
1: -	u8 type;
1: -	u8 flags;
1: -	u16 type_specific_flags;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u32 connection_speed;
1: -	u8 data_bit_length;
1: -	u8 clock_phase;
1: -	u8 clock_polarity;
1: -	u16 device_selection;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u8 res_source_index;
1: +  u8 type;
1: +  u8 flags;
1: +  u16 type_specific_flags;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u32 connection_speed;
1: +  u8 data_bit_length;
1: +  u8 clock_phase;
1: +  u8 clock_polarity;
1: +  u16 device_selection;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_uart_serialbus {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u8 res_source_index;
1: -	u8 type;
1: -	u8 flags;
1: -	u16 type_specific_flags;
1: -	u8 type_revision_id;
1: -	u16 type_data_length;
1: -	u32 default_baud_rate;
1: -	u16 rx_fifo_size;
1: -	u16 tx_fifo_size;
1: -	u8 parity;
1: -	u8 lines_enabled;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u8 res_source_index;
1: +  u8 type;
1: +  u8 flags;
1: +  u16 type_specific_flags;
1: +  u8 type_revision_id;
1: +  u16 type_data_length;
1: +  u32 default_baud_rate;
1: +  u16 rx_fifo_size;
1: +  u16 tx_fifo_size;
1: +  u8 parity;
1: +  u8 lines_enabled;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_pin_function {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u16 flags;
1: -	u8 pin_config;
1: -	u16 function_number;
1: -	u16 pin_table_offset;
1: -	u8 res_source_index;
1: -	u16 res_source_offset;
1: -	u16 vendor_offset;
1: -	u16 vendor_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u16 flags;
1: +  u8 pin_config;
1: +  u16 function_number;
1: +  u16 pin_table_offset;
1: +  u8 res_source_index;
1: +  u16 res_source_offset;
1: +  u16 vendor_offset;
1: +  u16 vendor_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_pin_config {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u16 flags;
1: -	u8 pin_config_type;
1: -	u32 pin_config_value;
1: -	u16 pin_table_offset;
1: -	u8 res_source_index;
1: -	u16 res_source_offset;
1: -	u16 vendor_offset;
1: -	u16 vendor_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u16 flags;
1: +  u8 pin_config_type;
1: +  u32 pin_config_value;
1: +  u16 pin_table_offset;
1: +  u8 res_source_index;
1: +  u16 res_source_offset;
1: +  u16 vendor_offset;
1: +  u16 vendor_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_pin_group {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u16 flags;
1: -	u16 pin_table_offset;
1: -	u16 label_offset;
1: -	u16 vendor_offset;
1: -	u16 vendor_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u16 flags;
1: +  u16 pin_table_offset;
1: +  u16 label_offset;
1: +  u16 vendor_offset;
1: +  u16 vendor_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_pin_group_function {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u16 flags;
1: -	u16 function_number;
1: -	u8 res_source_index;
1: -	u16 res_source_offset;
1: -	u16 res_source_label_offset;
1: -	u16 vendor_offset;
1: -	u16 vendor_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u16 flags;
1: +  u16 function_number;
1: +  u8 res_source_index;
1: +  u16 res_source_offset;
1: +  u16 res_source_label_offset;
1: +  u16 vendor_offset;
1: +  u16 vendor_length;
1:  } __attribute__((packed));
1:  
1:  struct aml_resource_pin_group_config {
1: -	u8 descriptor_type;
1: -	u16 resource_length;
1: -	u8 revision_id;
1: -	u16 flags;
1: -	u8 pin_config_type;
1: -	u32 pin_config_value;
1: -	u8 res_source_index;
1: -	u16 res_source_offset;
1: -	u16 res_source_label_offset;
1: -	u16 vendor_offset;
1: -	u16 vendor_length;
1: +  u8 descriptor_type;
1: +  u16 resource_length;
1: +  u8 revision_id;
1: +  u16 flags;
1: +  u8 pin_config_type;
1: +  u32 pin_config_value;
1: +  u8 res_source_index;
1: +  u16 res_source_offset;
1: +  u16 res_source_label_offset;
1: +  u16 vendor_offset;
1: +  u16 vendor_length;
1:  } __attribute__((packed));
1:  
1:  union aml_resource {
1: -	u8 descriptor_type;
1: -	struct aml_resource_small_header small_header;
1: -	struct aml_resource_large_header large_header;
1: -	struct aml_resource_irq irq;
1: -	struct aml_resource_dma dma;
1: -	struct aml_resource_start_dependent start_dpf;
1: -	struct aml_resource_end_dependent end_dpf;
1: -	struct aml_resource_io io;
1: -	struct aml_resource_fixed_io fixed_io;
1: -	struct aml_resource_fixed_dma fixed_dma;
1: -	struct aml_resource_vendor_small vendor_small;
1: -	struct aml_resource_end_tag end_tag;
1: -	struct aml_resource_memory24 memory24;
1: -	struct aml_resource_generic_register generic_reg;
1: -	struct aml_resource_vendor_large vendor_large;
1: -	struct aml_resource_memory32 memory32;
1: -	struct aml_resource_fixed_memory32 fixed_memory32;
1: -	struct aml_resource_address16 address16;
1: -	struct aml_resource_address32 address32;
1: -	struct aml_resource_address64 address64;
1: -	struct aml_resource_extended_address64 ext_address64;
1: -	struct aml_resource_extended_irq extended_irq;
1: -	struct aml_resource_gpio gpio;
1: -	struct aml_resource_i2c_serialbus i2c_serial_bus;
1: -	struct aml_resource_spi_serialbus spi_serial_bus;
1: -	struct aml_resource_uart_serialbus uart_serial_bus;
1: -	struct aml_resource_common_serialbus common_serial_bus;
1: -	struct aml_resource_pin_function pin_function;
1: -	struct aml_resource_pin_config pin_config;
1: -	struct aml_resource_pin_group pin_group;
1: -	struct aml_resource_pin_group_function pin_group_function;
1: -	struct aml_resource_pin_group_config pin_group_config;
1: -	struct aml_resource_address address;
1: -	u32 dword_item;
1: -	u16 word_item;
1: -	u8 byte_item;
1: +  u8 descriptor_type;
1: +  struct aml_resource_small_header small_header;
1: +  struct aml_resource_large_header large_header;
1: +  struct aml_resource_irq irq;
1: +  struct aml_resource_dma dma;
1: +  struct aml_resource_start_dependent start_dpf;
1: +  struct aml_resource_end_dependent end_dpf;
1: +  struct aml_resource_io io;
1: +  struct aml_resource_fixed_io fixed_io;
1: +  struct aml_resource_fixed_dma fixed_dma;
1: +  struct aml_resource_vendor_small vendor_small;
1: +  struct aml_resource_end_tag end_tag;
1: +  struct aml_resource_memory24 memory24;
1: +  struct aml_resource_generic_register generic_reg;
1: +  struct aml_resource_vendor_large vendor_large;
1: +  struct aml_resource_memory32 memory32;
1: +  struct aml_resource_fixed_memory32 fixed_memory32;
1: +  struct aml_resource_address16 address16;
1: +  struct aml_resource_address32 address32;
1: +  struct aml_resource_address64 address64;
1: +  struct aml_resource_extended_address64 ext_address64;
1: +  struct aml_resource_extended_irq extended_irq;
1: +  struct aml_resource_gpio gpio;
1: +  struct aml_resource_i2c_serialbus i2c_serial_bus;
1: +  struct aml_resource_spi_serialbus spi_serial_bus;
1: +  struct aml_resource_uart_serialbus uart_serial_bus;
1: +  struct aml_resource_common_serialbus common_serial_bus;
1: +  struct aml_resource_pin_function pin_function;
1: +  struct aml_resource_pin_config pin_config;
1: +  struct aml_resource_pin_group pin_group;
1: +  struct aml_resource_pin_group_function pin_group_function;
1: +  struct aml_resource_pin_group_config pin_group_config;
1: +  struct aml_resource_address address;
1: +  u32 dword_item;
1: +  u16 word_item;
1: +  u8 byte_item;
1:  };
1:  
1:  struct acpi_rsconvert_info {
1: -	u8 opcode;
1: -	u8 resource_offset;
1: -	u8 aml_offset;
1: -	u8 value;
1: -};
1: -
1: -enum {
1: -	ACPI_RSC_INITGET = 0,
1: -	ACPI_RSC_INITSET = 1,
1: -	ACPI_RSC_FLAGINIT = 2,
1: -	ACPI_RSC_1BITFLAG = 3,
1: -	ACPI_RSC_2BITFLAG = 4,
1: -	ACPI_RSC_3BITFLAG = 5,
1: -	ACPI_RSC_ADDRESS = 6,
1: -	ACPI_RSC_BITMASK = 7,
1: -	ACPI_RSC_BITMASK16 = 8,
1: -	ACPI_RSC_COUNT = 9,
1: -	ACPI_RSC_COUNT16 = 10,
1: -	ACPI_RSC_COUNT_GPIO_PIN = 11,
1: -	ACPI_RSC_COUNT_GPIO_RES = 12,
1: -	ACPI_RSC_COUNT_GPIO_VEN = 13,
1: -	ACPI_RSC_COUNT_SERIAL_RES = 14,
1: -	ACPI_RSC_COUNT_SERIAL_VEN = 15,
1: -	ACPI_RSC_DATA8 = 16,
1: -	ACPI_RSC_EXIT_EQ = 17,
1: -	ACPI_RSC_EXIT_LE = 18,
1: -	ACPI_RSC_EXIT_NE = 19,
1: -	ACPI_RSC_LENGTH = 20,
1: -	ACPI_RSC_MOVE_GPIO_PIN = 21,
1: -	ACPI_RSC_MOVE_GPIO_RES = 22,
1: -	ACPI_RSC_MOVE_SERIAL_RES = 23,
1: -	ACPI_RSC_MOVE_SERIAL_VEN = 24,
1: -	ACPI_RSC_MOVE8 = 25,
1: -	ACPI_RSC_MOVE16 = 26,
1: -	ACPI_RSC_MOVE32 = 27,
1: -	ACPI_RSC_MOVE64 = 28,
1: -	ACPI_RSC_SET8 = 29,
1: -	ACPI_RSC_SOURCE = 30,
1: -	ACPI_RSC_SOURCEX = 31,
1: +  u8 opcode;
1: +  u8 resource_offset;
1: +  u8 aml_offset;
1: +  u8 value;
1: +};
1: +
1: +enum {
1: +  ACPI_RSC_INITGET = 0,
1: +  ACPI_RSC_INITSET = 1,
1: +  ACPI_RSC_FLAGINIT = 2,
1: +  ACPI_RSC_1BITFLAG = 3,
1: +  ACPI_RSC_2BITFLAG = 4,
1: +  ACPI_RSC_3BITFLAG = 5,
1: +  ACPI_RSC_ADDRESS = 6,
1: +  ACPI_RSC_BITMASK = 7,
1: +  ACPI_RSC_BITMASK16 = 8,
1: +  ACPI_RSC_COUNT = 9,
1: +  ACPI_RSC_COUNT16 = 10,
1: +  ACPI_RSC_COUNT_GPIO_PIN = 11,
1: +  ACPI_RSC_COUNT_GPIO_RES = 12,
1: +  ACPI_RSC_COUNT_GPIO_VEN = 13,
1: +  ACPI_RSC_COUNT_SERIAL_RES = 14,
1: +  ACPI_RSC_COUNT_SERIAL_VEN = 15,
1: +  ACPI_RSC_DATA8 = 16,
1: +  ACPI_RSC_EXIT_EQ = 17,
1: +  ACPI_RSC_EXIT_LE = 18,
1: +  ACPI_RSC_EXIT_NE = 19,
1: +  ACPI_RSC_LENGTH = 20,
1: +  ACPI_RSC_MOVE_GPIO_PIN = 21,
1: +  ACPI_RSC_MOVE_GPIO_RES = 22,
1: +  ACPI_RSC_MOVE_SERIAL_RES = 23,
1: +  ACPI_RSC_MOVE_SERIAL_VEN = 24,
1: +  ACPI_RSC_MOVE8 = 25,
1: +  ACPI_RSC_MOVE16 = 26,
1: +  ACPI_RSC_MOVE32 = 27,
1: +  ACPI_RSC_MOVE64 = 28,
1: +  ACPI_RSC_SET8 = 29,
1: +  ACPI_RSC_SOURCE = 30,
1: +  ACPI_RSC_SOURCEX = 31,
1:  };
1:  
1:  typedef u16 acpi_rs_length;
1: @@ -72895,188 +73908,191 @@ typedef u16 acpi_rs_length;
1:  typedef u32 acpi_rsdesc_size;
1:  
1:  struct acpi_vendor_uuid {
1: -	u8 subtype;
1: -	u8 data[16];
1: +  u8 subtype;
1: +  u8 data[16];
1:  };
1:  
1: -typedef acpi_status (*acpi_walk_resource_callback)(struct acpi_resource *, void *);
1: +typedef acpi_status (*acpi_walk_resource_callback)(struct acpi_resource *,
1: +                                                   void *);
1:  
1:  struct acpi_vendor_walk_info {
1: -	struct acpi_vendor_uuid *uuid;
1: -	struct acpi_buffer *buffer;
1: -	acpi_status status;
1: +  struct acpi_vendor_uuid *uuid;
1: +  struct acpi_buffer *buffer;
1: +  acpi_status status;
1:  };
1:  
1:  typedef acpi_status (*acpi_table_handler)(u32, void *, void *);
1:  
1:  struct acpi_fadt_info {
1: -	const char *name;
1: -	u16 address64;
1: -	u16 address32;
1: -	u16 length;
1: -	u8 default_length;
1: -	u8 flags;
1: +  const char *name;
1: +  u16 address64;
1: +  u16 address32;
1: +  u16 length;
1: +  u8 default_length;
1: +  u8 flags;
1:  };
1:  
1:  struct acpi_fadt_pm_info {
1: -	struct acpi_generic_address *target;
1: -	u16 source;
1: -	u8 register_num;
1: +  struct acpi_generic_address *target;
1: +  u16 source;
1: +  u8 register_num;
1:  };
1:  
1:  struct acpi_table_rsdp {
1: -	char signature[8];
1: -	u8 checksum;
1: -	char oem_id[6];
1: -	u8 revision;
1: -	u32 rsdt_physical_address;
1: -	u32 length;
1: -	u64 xsdt_physical_address;
1: -	u8 extended_checksum;
1: -	u8 reserved[3];
1: +  char signature[8];
1: +  u8 checksum;
1: +  char oem_id[6];
1: +  u8 revision;
1: +  u32 rsdt_physical_address;
1: +  u32 length;
1: +  u64 xsdt_physical_address;
1: +  u8 extended_checksum;
1: +  u8 reserved[3];
1:  } __attribute__((packed));
1:  
1:  struct acpi_address_range {
1: -	struct acpi_address_range *next;
1: -	struct acpi_namespace_node *region_node;
1: -	acpi_physical_address start_address;
1: -	acpi_physical_address end_address;
1: +  struct acpi_address_range *next;
1: +  struct acpi_namespace_node *region_node;
1: +  acpi_physical_address start_address;
1: +  acpi_physical_address end_address;
1:  };
1:  
1:  struct acpi_pkg_info {
1: -	u8 *free_space;
1: -	acpi_size length;
1: -	u32 object_space;
1: -	u32 num_packages;
1: +  u8 *free_space;
1: +  acpi_size length;
1: +  u32 object_space;
1: +  u32 num_packages;
1:  };
1:  
1:  struct acpi_exception_info {
1: -	char *name;
1: +  char *name;
1:  };
1:  
1:  typedef u32 (*acpi_interface_handler)(acpi_string, u32);
1:  
1:  struct acpi_mutex_info {
1: -	void *mutex;
1: -	u32 use_count;
1: -	u64 thread_id;
1: +  void *mutex;
1: +  u32 use_count;
1: +  u64 thread_id;
1:  };
1:  
1:  struct acpi_comment_node {
1: -	char *comment;
1: -	struct acpi_comment_node *next;
1: +  char *comment;
1: +  struct acpi_comment_node *next;
1:  };
1:  
1:  struct acpi_interface_info {
1: -	char *name;
1: -	struct acpi_interface_info *next;
1: -	u8 flags;
1: -	u8 value;
1: +  char *name;
1: +  struct acpi_interface_info *next;
1: +  u8 flags;
1: +  u8 value;
1:  };
1:  
1: -typedef acpi_status (*acpi_pkg_callback)(u8, union acpi_operand_object *, union acpi_generic_state *, void *);
1: +typedef acpi_status (*acpi_pkg_callback)(u8, union acpi_operand_object *,
1: +                                         union acpi_generic_state *, void *);
1:  
1:  typedef u32 acpi_mutex_handle;
1:  
1:  typedef acpi_status (*acpi_walk_aml_callback)(u8 *, u32, u32, u8, void **);
1:  
1:  struct acpi_fan_fps {
1: -	u64 control;
1: -	u64 trip_point;
1: -	u64 speed;
1: -	u64 noise_level;
1: -	u64 power;
1: -	char name[20];
1: -	struct device_attribute dev_attr;
1: +  u64 control;
1: +  u64 trip_point;
1: +  u64 speed;
1: +  u64 noise_level;
1: +  u64 power;
1: +  char name[20];
1: +  struct device_attribute dev_attr;
1:  };
1:  
1:  struct acpi_fan_fif {
1: -	u64 revision;
1: -	u64 fine_grain_ctrl;
1: -	u64 step_size;
1: -	u64 low_speed_notification;
1: +  u64 revision;
1: +  u64 fine_grain_ctrl;
1: +  u64 step_size;
1: +  u64 low_speed_notification;
1:  };
1:  
1:  struct acpi_fan {
1: -	bool acpi4;
1: -	struct acpi_fan_fif fif;
1: -	struct acpi_fan_fps *fps;
1: -	int fps_count;
1: -	struct thermal_cooling_device *cdev;
1: +  bool acpi4;
1: +  struct acpi_fan_fif fif;
1: +  struct acpi_fan_fps *fps;
1: +  int fps_count;
1: +  struct thermal_cooling_device *cdev;
1:  };
1:  
1:  struct acpi_lpi_states_array {
1: -	unsigned int size;
1: -	unsigned int composite_states_size;
1: -	struct acpi_lpi_state *entries;
1: -	struct acpi_lpi_state *composite_states[8];
1: +  unsigned int size;
1: +  unsigned int composite_states_size;
1: +  struct acpi_lpi_state *entries;
1: +  struct acpi_lpi_state *composite_states[8];
1:  };
1:  
1:  struct throttling_tstate {
1: -	unsigned int cpu;
1: -	int target_state;
1: +  unsigned int cpu;
1: +  int target_state;
1:  };
1:  
1:  struct acpi_processor_throttling_arg {
1: -	struct acpi_processor *pr;
1: -	int target_state;
1: -	bool force;
1: +  struct acpi_processor *pr;
1: +  int target_state;
1: +  bool force;
1:  };
1:  
1:  struct container_dev {
1: -	struct device dev;
1: -	int (*offline)(struct container_dev *);
1: +  struct device dev;
1: +  int (*offline)(struct container_dev *);
1:  };
1:  
1:  enum thermal_device_mode {
1: -	THERMAL_DEVICE_DISABLED = 0,
1: -	THERMAL_DEVICE_ENABLED = 1,
1: +  THERMAL_DEVICE_DISABLED = 0,
1: +  THERMAL_DEVICE_ENABLED = 1,
1:  };
1:  
1:  enum thermal_trip_type {
1: -	THERMAL_TRIP_ACTIVE = 0,
1: -	THERMAL_TRIP_PASSIVE = 1,
1: -	THERMAL_TRIP_HOT = 2,
1: -	THERMAL_TRIP_CRITICAL = 3,
1: +  THERMAL_TRIP_ACTIVE = 0,
1: +  THERMAL_TRIP_PASSIVE = 1,
1: +  THERMAL_TRIP_HOT = 2,
1: +  THERMAL_TRIP_CRITICAL = 3,
1:  };
1:  
1:  enum thermal_trend {
1: -	THERMAL_TREND_STABLE = 0,
1: -	THERMAL_TREND_RAISING = 1,
1: -	THERMAL_TREND_DROPPING = 2,
1: -	THERMAL_TREND_RAISE_FULL = 3,
1: -	THERMAL_TREND_DROP_FULL = 4,
1: +  THERMAL_TREND_STABLE = 0,
1: +  THERMAL_TREND_RAISING = 1,
1: +  THERMAL_TREND_DROPPING = 2,
1: +  THERMAL_TREND_RAISE_FULL = 3,
1: +  THERMAL_TREND_DROP_FULL = 4,
1:  };
1:  
1:  enum thermal_notify_event {
1: -	THERMAL_EVENT_UNSPECIFIED = 0,
1: -	THERMAL_EVENT_TEMP_SAMPLE = 1,
1: -	THERMAL_TRIP_VIOLATED = 2,
1: -	THERMAL_TRIP_CHANGED = 3,
1: -	THERMAL_DEVICE_DOWN = 4,
1: -	THERMAL_DEVICE_UP = 5,
1: -	THERMAL_DEVICE_POWER_CAPABILITY_CHANGED = 6,
1: -	THERMAL_TABLE_CHANGED = 7,
1: -	THERMAL_EVENT_KEEP_ALIVE = 8,
1: +  THERMAL_EVENT_UNSPECIFIED = 0,
1: +  THERMAL_EVENT_TEMP_SAMPLE = 1,
1: +  THERMAL_TRIP_VIOLATED = 2,
1: +  THERMAL_TRIP_CHANGED = 3,
1: +  THERMAL_DEVICE_DOWN = 4,
1: +  THERMAL_DEVICE_UP = 5,
1: +  THERMAL_DEVICE_POWER_CAPABILITY_CHANGED = 6,
1: +  THERMAL_TABLE_CHANGED = 7,
1: +  THERMAL_EVENT_KEEP_ALIVE = 8,
1:  };
1:  
1:  struct thermal_zone_device;
1:  
1:  struct thermal_zone_device_ops {
1: -	int (*bind)(struct thermal_zone_device *, struct thermal_cooling_device *);
1: -	int (*unbind)(struct thermal_zone_device *, struct thermal_cooling_device *);
1: -	int (*get_temp)(struct thermal_zone_device *, int *);
1: -	int (*set_trips)(struct thermal_zone_device *, int, int);
1: -	int (*change_mode)(struct thermal_zone_device *, enum thermal_device_mode);
1: -	int (*get_trip_type)(struct thermal_zone_device *, int, enum thermal_trip_type *);
1: -	int (*get_trip_temp)(struct thermal_zone_device *, int, int *);
1: -	int (*set_trip_temp)(struct thermal_zone_device *, int, int);
1: -	int (*get_trip_hyst)(struct thermal_zone_device *, int, int *);
1: -	int (*set_trip_hyst)(struct thermal_zone_device *, int, int);
1: -	int (*get_crit_temp)(struct thermal_zone_device *, int *);
1: -	int (*set_emul_temp)(struct thermal_zone_device *, int);
1: -	int (*get_trend)(struct thermal_zone_device *, int, enum thermal_trend *);
1: -	int (*notify)(struct thermal_zone_device *, int, enum thermal_trip_type);
1: +  int (*bind)(struct thermal_zone_device *, struct thermal_cooling_device *);
1: +  int (*unbind)(struct thermal_zone_device *, struct thermal_cooling_device *);
1: +  int (*get_temp)(struct thermal_zone_device *, int *);
1: +  int (*set_trips)(struct thermal_zone_device *, int, int);
1: +  int (*change_mode)(struct thermal_zone_device *, enum thermal_device_mode);
1: +  int (*get_trip_type)(struct thermal_zone_device *, int,
1: +                       enum thermal_trip_type *);
1: +  int (*get_trip_temp)(struct thermal_zone_device *, int, int *);
1: +  int (*set_trip_temp)(struct thermal_zone_device *, int, int);
1: +  int (*get_trip_hyst)(struct thermal_zone_device *, int, int *);
1: +  int (*set_trip_hyst)(struct thermal_zone_device *, int, int);
1: +  int (*get_crit_temp)(struct thermal_zone_device *, int *);
1: +  int (*set_emul_temp)(struct thermal_zone_device *, int);
1: +  int (*get_trend)(struct thermal_zone_device *, int, enum thermal_trend *);
1: +  int (*notify)(struct thermal_zone_device *, int, enum thermal_trip_type);
1:  };
1:  
1:  struct thermal_attr;
1: @@ -73086,231 +74102,231 @@ struct thermal_zone_params;
1:  struct thermal_governor;
1:  
1:  struct thermal_zone_device {
1: -	int id;
1: -	char type[20];
1: -	struct device device;
1: -	struct attribute_group trips_attribute_group;
1: -	struct thermal_attr *trip_temp_attrs;
1: -	struct thermal_attr *trip_type_attrs;
1: -	struct thermal_attr *trip_hyst_attrs;
1: -	enum thermal_device_mode mode;
1: -	void *devdata;
1: -	int trips;
1: -	long unsigned int trips_disabled;
1: -	int passive_delay;
1: -	int polling_delay;
1: -	int temperature;
1: -	int last_temperature;
1: -	int emul_temperature;
1: -	int passive;
1: -	int prev_low_trip;
1: -	int prev_high_trip;
1: -	unsigned int forced_passive;
1: -	atomic_t need_update;
1: -	struct thermal_zone_device_ops *ops;
1: -	struct thermal_zone_params *tzp;
1: -	struct thermal_governor *governor;
1: -	void *governor_data;
1: -	struct list_head thermal_instances;
1: -	struct ida ida;
1: -	struct mutex lock;
1: -	struct list_head node;
1: -	struct delayed_work poll_queue;
1: -	enum thermal_notify_event notify_event;
1: +  int id;
1: +  char type[20];
1: +  struct device device;
1: +  struct attribute_group trips_attribute_group;
1: +  struct thermal_attr *trip_temp_attrs;
1: +  struct thermal_attr *trip_type_attrs;
1: +  struct thermal_attr *trip_hyst_attrs;
1: +  enum thermal_device_mode mode;
1: +  void *devdata;
1: +  int trips;
1: +  long unsigned int trips_disabled;
1: +  int passive_delay;
1: +  int polling_delay;
1: +  int temperature;
1: +  int last_temperature;
1: +  int emul_temperature;
1: +  int passive;
1: +  int prev_low_trip;
1: +  int prev_high_trip;
1: +  unsigned int forced_passive;
1: +  atomic_t need_update;
1: +  struct thermal_zone_device_ops *ops;
1: +  struct thermal_zone_params *tzp;
1: +  struct thermal_governor *governor;
1: +  void *governor_data;
1: +  struct list_head thermal_instances;
1: +  struct ida ida;
1: +  struct mutex lock;
1: +  struct list_head node;
1: +  struct delayed_work poll_queue;
1: +  enum thermal_notify_event notify_event;
1:  };
1:  
1:  struct thermal_bind_params;
1:  
1:  struct thermal_zone_params {
1: -	char governor_name[20];
1: -	bool no_hwmon;
1: -	int num_tbps;
1: -	struct thermal_bind_params *tbp;
1: -	u32 sustainable_power;
1: -	s32 k_po;
1: -	s32 k_pu;
1: -	s32 k_i;
1: -	s32 k_d;
1: -	s32 integral_cutoff;
1: -	int slope;
1: -	int offset;
1: +  char governor_name[20];
1: +  bool no_hwmon;
1: +  int num_tbps;
1: +  struct thermal_bind_params *tbp;
1: +  u32 sustainable_power;
1: +  s32 k_po;
1: +  s32 k_pu;
1: +  s32 k_i;
1: +  s32 k_d;
1: +  s32 integral_cutoff;
1: +  int slope;
1: +  int offset;
1:  };
1:  
1:  struct thermal_governor {
1: -	char name[20];
1: -	int (*bind_to_tz)(struct thermal_zone_device *);
1: -	void (*unbind_from_tz)(struct thermal_zone_device *);
1: -	int (*throttle)(struct thermal_zone_device *, int);
1: -	struct list_head governor_list;
1: +  char name[20];
1: +  int (*bind_to_tz)(struct thermal_zone_device *);
1: +  void (*unbind_from_tz)(struct thermal_zone_device *);
1: +  int (*throttle)(struct thermal_zone_device *, int);
1: +  struct list_head governor_list;
1:  };
1:  
1:  struct thermal_bind_params {
1: -	struct thermal_cooling_device *cdev;
1: -	int weight;
1: -	int trip_mask;
1: -	long unsigned int *binding_limits;
1: -	int (*match)(struct thermal_zone_device *, struct thermal_cooling_device *);
1: +  struct thermal_cooling_device *cdev;
1: +  int weight;
1: +  int trip_mask;
1: +  long unsigned int *binding_limits;
1: +  int (*match)(struct thermal_zone_device *, struct thermal_cooling_device *);
1:  };
1:  
1:  struct acpi_thermal_state {
1: -	u8 critical: 1;
1: -	u8 hot: 1;
1: -	u8 passive: 1;
1: -	u8 active: 1;
1: -	u8 reserved: 4;
1: -	int active_index;
1: +  u8 critical : 1;
1: +  u8 hot : 1;
1: +  u8 passive : 1;
1: +  u8 active : 1;
1: +  u8 reserved : 4;
1: +  int active_index;
1:  };
1:  
1:  struct acpi_thermal_state_flags {
1: -	u8 valid: 1;
1: -	u8 enabled: 1;
1: -	u8 reserved: 6;
1: +  u8 valid : 1;
1: +  u8 enabled : 1;
1: +  u8 reserved : 6;
1:  };
1:  
1:  struct acpi_thermal_critical {
1: -	struct acpi_thermal_state_flags flags;
1: -	long unsigned int temperature;
1: +  struct acpi_thermal_state_flags flags;
1: +  long unsigned int temperature;
1:  };
1:  
1:  struct acpi_thermal_hot {
1: -	struct acpi_thermal_state_flags flags;
1: -	long unsigned int temperature;
1: +  struct acpi_thermal_state_flags flags;
1: +  long unsigned int temperature;
1:  };
1:  
1:  struct acpi_thermal_passive {
1: -	struct acpi_thermal_state_flags flags;
1: -	long unsigned int temperature;
1: -	long unsigned int tc1;
1: -	long unsigned int tc2;
1: -	long unsigned int tsp;
1: -	struct acpi_handle_list devices;
1: +  struct acpi_thermal_state_flags flags;
1: +  long unsigned int temperature;
1: +  long unsigned int tc1;
1: +  long unsigned int tc2;
1: +  long unsigned int tsp;
1: +  struct acpi_handle_list devices;
1:  };
1:  
1:  struct acpi_thermal_active {
1: -	struct acpi_thermal_state_flags flags;
1: -	long unsigned int temperature;
1: -	struct acpi_handle_list devices;
1: +  struct acpi_thermal_state_flags flags;
1: +  long unsigned int temperature;
1: +  struct acpi_handle_list devices;
1:  };
1:  
1:  struct acpi_thermal_trips {
1: -	struct acpi_thermal_critical critical;
1: -	struct acpi_thermal_hot hot;
1: -	struct acpi_thermal_passive passive;
1: -	struct acpi_thermal_active active[10];
1: +  struct acpi_thermal_critical critical;
1: +  struct acpi_thermal_hot hot;
1: +  struct acpi_thermal_passive passive;
1: +  struct acpi_thermal_active active[10];
1:  };
1:  
1:  struct acpi_thermal_flags {
1: -	u8 cooling_mode: 1;
1: -	u8 devices: 1;
1: -	u8 reserved: 6;
1: +  u8 cooling_mode : 1;
1: +  u8 devices : 1;
1: +  u8 reserved : 6;
1:  };
1:  
1:  struct acpi_thermal {
1: -	struct acpi_device *device;
1: -	acpi_bus_id name;
1: -	long unsigned int temperature;
1: -	long unsigned int last_temperature;
1: -	long unsigned int polling_frequency;
1: -	volatile u8 zombie;
1: -	struct acpi_thermal_flags flags;
1: -	struct acpi_thermal_state state;
1: -	struct acpi_thermal_trips trips;
1: -	struct acpi_handle_list devices;
1: -	struct thermal_zone_device *thermal_zone;
1: -	int kelvin_offset;
1: -	struct work_struct thermal_check_work;
1: +  struct acpi_device *device;
1: +  acpi_bus_id name;
1: +  long unsigned int temperature;
1: +  long unsigned int last_temperature;
1: +  long unsigned int polling_frequency;
1: +  volatile u8 zombie;
1: +  struct acpi_thermal_flags flags;
1: +  struct acpi_thermal_state state;
1: +  struct acpi_thermal_trips trips;
1: +  struct acpi_handle_list devices;
1: +  struct thermal_zone_device *thermal_zone;
1: +  int kelvin_offset;
1: +  struct work_struct thermal_check_work;
1:  };
1:  
1:  struct acpi_table_slit {
1: -	struct acpi_table_header header;
1: -	u64 locality_count;
1: -	u8 entry[1];
1: +  struct acpi_table_header header;
1: +  u64 locality_count;
1: +  u8 entry[1];
1:  } __attribute__((packed));
1:  
1:  struct acpi_table_srat {
1: -	struct acpi_table_header header;
1: -	u32 table_revision;
1: -	u64 reserved;
1: +  struct acpi_table_header header;
1: +  u32 table_revision;
1: +  u64 reserved;
1:  };
1:  
1:  enum acpi_srat_type {
1: -	ACPI_SRAT_TYPE_CPU_AFFINITY = 0,
1: -	ACPI_SRAT_TYPE_MEMORY_AFFINITY = 1,
1: -	ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2,
1: -	ACPI_SRAT_TYPE_GICC_AFFINITY = 3,
1: -	ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4,
1: -	ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5,
1: -	ACPI_SRAT_TYPE_RESERVED = 6,
1: +  ACPI_SRAT_TYPE_CPU_AFFINITY = 0,
1: +  ACPI_SRAT_TYPE_MEMORY_AFFINITY = 1,
1: +  ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2,
1: +  ACPI_SRAT_TYPE_GICC_AFFINITY = 3,
1: +  ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4,
1: +  ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5,
1: +  ACPI_SRAT_TYPE_RESERVED = 6,
1:  };
1:  
1:  struct acpi_srat_mem_affinity {
1: -	struct acpi_subtable_header header;
1: -	u32 proximity_domain;
1: -	u16 reserved;
1: -	u64 base_address;
1: -	u64 length;
1: -	u32 reserved1;
1: -	u32 flags;
1: -	u64 reserved2;
1: +  struct acpi_subtable_header header;
1: +  u32 proximity_domain;
1: +  u16 reserved;
1: +  u64 base_address;
1: +  u64 length;
1: +  u32 reserved1;
1: +  u32 flags;
1: +  u64 reserved2;
1:  } __attribute__((packed));
1:  
1:  struct acpi_srat_gicc_affinity {
1: -	struct acpi_subtable_header header;
1: -	u32 proximity_domain;
1: -	u32 acpi_processor_uid;
1: -	u32 flags;
1: -	u32 clock_domain;
1: +  struct acpi_subtable_header header;
1: +  u32 proximity_domain;
1: +  u32 acpi_processor_uid;
1: +  u32 flags;
1: +  u32 clock_domain;
1:  } __attribute__((packed));
1:  
1:  struct acpi_srat_generic_affinity {
1: -	struct acpi_subtable_header header;
1: -	u8 reserved;
1: -	u8 device_handle_type;
1: -	u32 proximity_domain;
1: -	u8 device_handle[16];
1: -	u32 flags;
1: -	u32 reserved1;
1: +  struct acpi_subtable_header header;
1: +  u8 reserved;
1: +  u8 device_handle_type;
1: +  u32 proximity_domain;
1: +  u8 device_handle[16];
1: +  u32 flags;
1: +  u32 reserved1;
1:  };
1:  
1:  struct acpi_pci_ioapic {
1: -	acpi_handle root_handle;
1: -	acpi_handle handle;
1: -	u32 gsi_base;
1: -	struct resource res;
1: -	struct pci_dev *pdev;
1: -	struct list_head list;
1: +  acpi_handle root_handle;
1: +  acpi_handle handle;
1: +  u32 gsi_base;
1: +  struct resource res;
1: +  struct pci_dev *pdev;
1: +  struct list_head list;
1:  };
1:  
1:  struct acpi_pcct_hw_reduced {
1: -	struct acpi_subtable_header header;
1: -	u32 platform_interrupt;
1: -	u8 flags;
1: -	u8 reserved;
1: -	u64 base_address;
1: -	u64 length;
1: -	struct acpi_generic_address doorbell_register;
1: -	u64 preserve_mask;
1: -	u64 write_mask;
1: -	u32 latency;
1: -	u32 max_access_rate;
1: -	u16 min_turnaround_time;
1: +  struct acpi_subtable_header header;
1: +  u32 platform_interrupt;
1: +  u8 flags;
1: +  u8 reserved;
1: +  u64 base_address;
1: +  u64 length;
1: +  struct acpi_generic_address doorbell_register;
1: +  u64 preserve_mask;
1: +  u64 write_mask;
1: +  u32 latency;
1: +  u32 max_access_rate;
1: +  u16 min_turnaround_time;
1:  } __attribute__((packed));
1:  
1:  struct acpi_pcct_shared_memory {
1: -	u32 signature;
1: -	u16 command;
1: -	u16 status;
1: +  u32 signature;
1: +  u16 command;
1: +  u16 status;
1:  };
1:  
1:  struct mbox_chan;
1:  
1:  struct mbox_chan_ops {
1: -	int (*send_data)(struct mbox_chan *, void *);
1: -	int (*flush)(struct mbox_chan *, long unsigned int);
1: -	int (*startup)(struct mbox_chan *);
1: -	void (*shutdown)(struct mbox_chan *);
1: -	bool (*last_tx_done)(struct mbox_chan *);
1: -	bool (*peek_data)(struct mbox_chan *);
1: +  int (*send_data)(struct mbox_chan *, void *);
1: +  int (*flush)(struct mbox_chan *, long unsigned int);
1: +  int (*startup)(struct mbox_chan *);
1: +  void (*shutdown)(struct mbox_chan *);
1: +  bool (*last_tx_done)(struct mbox_chan *);
1: +  bool (*peek_data)(struct mbox_chan *);
1:  };
1:  
1:  struct mbox_controller;
1: @@ -73318,229 +74334,228 @@ struct mbox_controller;
1:  struct mbox_client;
1:  
1:  struct mbox_chan {
1: -	struct mbox_controller *mbox;
1: -	unsigned int txdone_method;
1: -	struct mbox_client *cl;
1: -	struct completion tx_complete;
1: -	void *active_req;
1: -	unsigned int msg_count;
1: -	unsigned int msg_free;
1: -	void *msg_data[20];
1: -	spinlock_t lock;
1: -	void *con_priv;
1: +  struct mbox_controller *mbox;
1: +  unsigned int txdone_method;
1: +  struct mbox_client *cl;
1: +  struct completion tx_complete;
1: +  void *active_req;
1: +  unsigned int msg_count;
1: +  unsigned int msg_free;
1: +  void *msg_data[20];
1: +  spinlock_t lock;
1: +  void *con_priv;
1:  };
1:  
1:  struct mbox_controller {
1: -	struct device *dev;
1: -	const struct mbox_chan_ops *ops;
1: -	struct mbox_chan *chans;
1: -	int num_chans;
1: -	bool txdone_irq;
1: -	bool txdone_poll;
1: -	unsigned int txpoll_period;
1: -	struct mbox_chan * (*of_xlate)(struct mbox_controller *, const struct of_phandle_args *);
1: -	struct hrtimer poll_hrt;
1: -	struct list_head node;
1: +  struct device *dev;
1: +  const struct mbox_chan_ops *ops;
1: +  struct mbox_chan *chans;
1: +  int num_chans;
1: +  bool txdone_irq;
1: +  bool txdone_poll;
1: +  unsigned int txpoll_period;
1: +  struct mbox_chan *(*of_xlate)(struct mbox_controller *,
1: +                                const struct of_phandle_args *);
1: +  struct hrtimer poll_hrt;
1: +  struct list_head node;
1:  };
1:  
1:  struct mbox_client {
1: -	struct device *dev;
1: -	bool tx_block;
1: -	long unsigned int tx_tout;
1: -	bool knows_txdone;
1: -	void (*rx_callback)(struct mbox_client *, void *);
1: -	void (*tx_prepare)(struct mbox_client *, void *);
1: -	void (*tx_done)(struct mbox_client *, void *, int);
1: +  struct device *dev;
1: +  bool tx_block;
1: +  long unsigned int tx_tout;
1: +  bool knows_txdone;
1: +  void (*rx_callback)(struct mbox_client *, void *);
1: +  void (*tx_prepare)(struct mbox_client *, void *);
1: +  void (*tx_done)(struct mbox_client *, void *, int);
1:  };
1:  
1:  struct cpc_register_resource {
1: -	acpi_object_type type;
1: -	u64 *sys_mem_vaddr;
1: -	union {
1: -		struct cpc_reg reg;
1: -		u64 int_value;
1: -	} cpc_entry;
1: +  acpi_object_type type;
1: +  u64 *sys_mem_vaddr;
1: +  union {
1: +    struct cpc_reg reg;
1: +    u64 int_value;
1: +  } cpc_entry;
1:  };
1:  
1:  struct cpc_desc {
1: -	int num_entries;
1: -	int version;
1: -	int cpu_id;
1: -	int write_cmd_status;
1: -	int write_cmd_id;
1: -	struct cpc_register_resource cpc_regs[21];
1: -	struct acpi_psd_package domain_info;
1: -	struct kobject kobj;
1: +  int num_entries;
1: +  int version;
1: +  int cpu_id;
1: +  int write_cmd_status;
1: +  int write_cmd_id;
1: +  struct cpc_register_resource cpc_regs[21];
1: +  struct acpi_psd_package domain_info;
1: +  struct kobject kobj;
1:  };
1:  
1:  enum cppc_regs {
1: -	HIGHEST_PERF = 0,
1: -	NOMINAL_PERF = 1,
1: -	LOW_NON_LINEAR_PERF = 2,
1: -	LOWEST_PERF = 3,
1: -	GUARANTEED_PERF = 4,
1: -	DESIRED_PERF = 5,
1: -	MIN_PERF = 6,
1: -	MAX_PERF = 7,
1: -	PERF_REDUC_TOLERANCE = 8,
1: -	TIME_WINDOW = 9,
1: -	CTR_WRAP_TIME = 10,
1: -	REFERENCE_CTR = 11,
1: -	DELIVERED_CTR = 12,
1: -	PERF_LIMITED = 13,
1: -	ENABLE = 14,
1: -	AUTO_SEL_ENABLE = 15,
1: -	AUTO_ACT_WINDOW = 16,
1: -	ENERGY_PERF = 17,
1: -	REFERENCE_PERF = 18,
1: -	LOWEST_FREQ = 19,
1: -	NOMINAL_FREQ = 20,
1: +  HIGHEST_PERF = 0,
1: +  NOMINAL_PERF = 1,
1: +  LOW_NON_LINEAR_PERF = 2,
1: +  LOWEST_PERF = 3,
1: +  GUARANTEED_PERF = 4,
1: +  DESIRED_PERF = 5,
1: +  MIN_PERF = 6,
1: +  MAX_PERF = 7,
1: +  PERF_REDUC_TOLERANCE = 8,
1: +  TIME_WINDOW = 9,
1: +  CTR_WRAP_TIME = 10,
1: +  REFERENCE_CTR = 11,
1: +  DELIVERED_CTR = 12,
1: +  PERF_LIMITED = 13,
1: +  ENABLE = 14,
1: +  AUTO_SEL_ENABLE = 15,
1: +  AUTO_ACT_WINDOW = 16,
1: +  ENERGY_PERF = 17,
1: +  REFERENCE_PERF = 18,
1: +  LOWEST_FREQ = 19,
1: +  NOMINAL_FREQ = 20,
1:  };
1:  
1:  struct cppc_perf_caps {
1: -	u32 guaranteed_perf;
1: -	u32 highest_perf;
1: -	u32 nominal_perf;
1: -	u32 lowest_perf;
1: -	u32 lowest_nonlinear_perf;
1: -	u32 lowest_freq;
1: -	u32 nominal_freq;
1: +  u32 guaranteed_perf;
1: +  u32 highest_perf;
1: +  u32 nominal_perf;
1: +  u32 lowest_perf;
1: +  u32 lowest_nonlinear_perf;
1: +  u32 lowest_freq;
1: +  u32 nominal_freq;
1:  };
1:  
1:  struct cppc_perf_ctrls {
1: -	u32 max_perf;
1: -	u32 min_perf;
1: -	u32 desired_perf;
1: +  u32 max_perf;
1: +  u32 min_perf;
1: +  u32 desired_perf;
1:  };
1:  
1:  struct cppc_perf_fb_ctrs {
1: -	u64 reference;
1: -	u64 delivered;
1: -	u64 reference_perf;
1: -	u64 wraparound_time;
1: +  u64 reference;
1: +  u64 delivered;
1: +  u64 reference_perf;
1: +  u64 wraparound_time;
1:  };
1:  
1:  struct cppc_cpudata {
1: -	int cpu;
1: -	struct cppc_perf_caps perf_caps;
1: -	struct cppc_perf_ctrls perf_ctrls;
1: -	struct cppc_perf_fb_ctrs perf_fb_ctrs;
1: -	struct cpufreq_policy *cur_policy;
1: -	unsigned int shared_type;
1: -	cpumask_var_t shared_cpu_map;
1: +  int cpu;
1: +  struct cppc_perf_caps perf_caps;
1: +  struct cppc_perf_ctrls perf_ctrls;
1: +  struct cppc_perf_fb_ctrs perf_fb_ctrs;
1: +  struct cpufreq_policy *cur_policy;
1: +  unsigned int shared_type;
1: +  cpumask_var_t shared_cpu_map;
1:  };
1:  
1:  struct cppc_pcc_data {
1: -	struct mbox_chan *pcc_channel;
1: -	void *pcc_comm_addr;
1: -	bool pcc_channel_acquired;
1: -	unsigned int deadline_us;
1: -	unsigned int pcc_mpar;
1: -	unsigned int pcc_mrtt;
1: -	unsigned int pcc_nominal;
1: -	bool pending_pcc_write_cmd;
1: -	bool platform_owns_pcc;
1: -	unsigned int pcc_write_cnt;
1: -	struct rw_semaphore pcc_lock;
1: -	wait_queue_head_t pcc_write_wait_q;
1: -	ktime_t last_cmd_cmpl_time;
1: -	ktime_t last_mpar_reset;
1: -	int mpar_count;
1: -	int refcount;
1: +  struct mbox_chan *pcc_channel;
1: +  void *pcc_comm_addr;
1: +  bool pcc_channel_acquired;
1: +  unsigned int deadline_us;
1: +  unsigned int pcc_mpar;
1: +  unsigned int pcc_mrtt;
1: +  unsigned int pcc_nominal;
1: +  bool pending_pcc_write_cmd;
1: +  bool platform_owns_pcc;
1: +  unsigned int pcc_write_cnt;
1: +  struct rw_semaphore pcc_lock;
1: +  wait_queue_head_t pcc_write_wait_q;
1: +  ktime_t last_cmd_cmpl_time;
1: +  ktime_t last_mpar_reset;
1: +  int mpar_count;
1: +  int refcount;
1:  };
1:  
1:  struct cppc_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct kobject *, struct attribute *, char *);
1: -	ssize_t (*store)(struct kobject *, struct attribute *, const char *, ssize_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct kobject *, struct attribute *, char *);
1: +  ssize_t (*store)(struct kobject *, struct attribute *, const char *, ssize_t);
1:  };
1:  
1:  struct pnp_resource {
1: -	struct list_head list;
1: -	struct resource res;
1: +  struct list_head list;
1: +  struct resource res;
1:  };
1:  
1:  struct pnp_port {
1: -	resource_size_t min;
1: -	resource_size_t max;
1: -	resource_size_t align;
1: -	resource_size_t size;
1: -	unsigned char flags;
1: +  resource_size_t min;
1: +  resource_size_t max;
1: +  resource_size_t align;
1: +  resource_size_t size;
1: +  unsigned char flags;
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int bits[4];
1: -} pnp_irq_mask_t;
1: +typedef struct { long unsigned int bits[4]; } pnp_irq_mask_t;
1:  
1:  struct pnp_irq {
1: -	pnp_irq_mask_t map;
1: -	unsigned char flags;
1: +  pnp_irq_mask_t map;
1: +  unsigned char flags;
1:  };
1:  
1:  struct pnp_dma {
1: -	unsigned char map;
1: -	unsigned char flags;
1: +  unsigned char map;
1: +  unsigned char flags;
1:  };
1:  
1:  struct pnp_mem {
1: -	resource_size_t min;
1: -	resource_size_t max;
1: -	resource_size_t align;
1: -	resource_size_t size;
1: -	unsigned char flags;
1: +  resource_size_t min;
1: +  resource_size_t max;
1: +  resource_size_t align;
1: +  resource_size_t size;
1: +  unsigned char flags;
1:  };
1:  
1:  struct pnp_option {
1: -	struct list_head list;
1: -	unsigned int flags;
1: -	long unsigned int type;
1: -	union {
1: -		struct pnp_port port;
1: -		struct pnp_irq irq;
1: -		struct pnp_dma dma;
1: -		struct pnp_mem mem;
1: -	} u;
1: +  struct list_head list;
1: +  unsigned int flags;
1: +  long unsigned int type;
1: +  union {
1: +    struct pnp_port port;
1: +    struct pnp_irq irq;
1: +    struct pnp_dma dma;
1: +    struct pnp_mem mem;
1: +  } u;
1:  };
1:  
1:  struct pnp_info_buffer {
1: -	char *buffer;
1: -	char *curr;
1: -	long unsigned int size;
1: -	long unsigned int len;
1: -	int stop;
1: -	int error;
1: +  char *buffer;
1: +  char *curr;
1: +  long unsigned int size;
1: +  long unsigned int len;
1: +  int stop;
1: +  int error;
1:  };
1:  
1:  typedef struct pnp_info_buffer pnp_info_buffer_t;
1:  
1:  struct pnp_fixup {
1: -	char id[7];
1: -	void (*quirk_function)(struct pnp_dev *);
1: +  char id[7];
1: +  void (*quirk_function)(struct pnp_dev *);
1:  };
1:  
1:  struct acpipnp_parse_option_s {
1: -	struct pnp_dev *dev;
1: -	unsigned int option_flags;
1: +  struct pnp_dev *dev;
1: +  unsigned int option_flags;
1:  };
1:  
1:  struct clk_bulk_data {
1: -	const char *id;
1: -	struct clk *clk;
1: +  const char *id;
1: +  struct clk *clk;
1:  };
1:  
1:  struct clk_bulk_devres {
1: -	struct clk_bulk_data *clks;
1: -	int num_clks;
1: +  struct clk_bulk_data *clks;
1: +  int num_clks;
1:  };
1:  
1:  struct clk_hw;
1:  
1:  struct clk_lookup {
1: -	struct list_head node;
1: -	const char *dev_id;
1: -	const char *con_id;
1: -	struct clk *clk;
1: -	struct clk_hw *clk_hw;
1: +  struct list_head node;
1: +  const char *dev_id;
1: +  const char *con_id;
1: +  struct clk *clk;
1: +  struct clk_hw *clk_hw;
1:  };
1:  
1:  struct clk_core;
1: @@ -73548,198 +74563,200 @@ struct clk_core;
1:  struct clk_init_data;
1:  
1:  struct clk_hw {
1: -	struct clk_core *core;
1: -	struct clk *clk;
1: -	const struct clk_init_data *init;
1: +  struct clk_core *core;
1: +  struct clk *clk;
1: +  const struct clk_init_data *init;
1:  };
1:  
1:  struct clk_rate_request {
1: -	long unsigned int rate;
1: -	long unsigned int min_rate;
1: -	long unsigned int max_rate;
1: -	long unsigned int best_parent_rate;
1: -	struct clk_hw *best_parent_hw;
1: +  long unsigned int rate;
1: +  long unsigned int min_rate;
1: +  long unsigned int max_rate;
1: +  long unsigned int best_parent_rate;
1: +  struct clk_hw *best_parent_hw;
1:  };
1:  
1:  struct clk_duty {
1: -	unsigned int num;
1: -	unsigned int den;
1: +  unsigned int num;
1: +  unsigned int den;
1:  };
1:  
1:  struct clk_ops {
1: -	int (*prepare)(struct clk_hw *);
1: -	void (*unprepare)(struct clk_hw *);
1: -	int (*is_prepared)(struct clk_hw *);
1: -	void (*unprepare_unused)(struct clk_hw *);
1: -	int (*enable)(struct clk_hw *);
1: -	void (*disable)(struct clk_hw *);
1: -	int (*is_enabled)(struct clk_hw *);
1: -	void (*disable_unused)(struct clk_hw *);
1: -	int (*save_context)(struct clk_hw *);
1: -	void (*restore_context)(struct clk_hw *);
1: -	long unsigned int (*recalc_rate)(struct clk_hw *, long unsigned int);
1: -	long int (*round_rate)(struct clk_hw *, long unsigned int, long unsigned int *);
1: -	int (*determine_rate)(struct clk_hw *, struct clk_rate_request *);
1: -	int (*set_parent)(struct clk_hw *, u8);
1: -	u8 (*get_parent)(struct clk_hw *);
1: -	int (*set_rate)(struct clk_hw *, long unsigned int, long unsigned int);
1: -	int (*set_rate_and_parent)(struct clk_hw *, long unsigned int, long unsigned int, u8);
1: -	long unsigned int (*recalc_accuracy)(struct clk_hw *, long unsigned int);
1: -	int (*get_phase)(struct clk_hw *);
1: -	int (*set_phase)(struct clk_hw *, int);
1: -	int (*get_duty_cycle)(struct clk_hw *, struct clk_duty *);
1: -	int (*set_duty_cycle)(struct clk_hw *, struct clk_duty *);
1: -	int (*init)(struct clk_hw *);
1: -	void (*terminate)(struct clk_hw *);
1: -	void (*debug_init)(struct clk_hw *, struct dentry *);
1: +  int (*prepare)(struct clk_hw *);
1: +  void (*unprepare)(struct clk_hw *);
1: +  int (*is_prepared)(struct clk_hw *);
1: +  void (*unprepare_unused)(struct clk_hw *);
1: +  int (*enable)(struct clk_hw *);
1: +  void (*disable)(struct clk_hw *);
1: +  int (*is_enabled)(struct clk_hw *);
1: +  void (*disable_unused)(struct clk_hw *);
1: +  int (*save_context)(struct clk_hw *);
1: +  void (*restore_context)(struct clk_hw *);
1: +  long unsigned int (*recalc_rate)(struct clk_hw *, long unsigned int);
1: +  long int (*round_rate)(struct clk_hw *, long unsigned int,
1: +                         long unsigned int *);
1: +  int (*determine_rate)(struct clk_hw *, struct clk_rate_request *);
1: +  int (*set_parent)(struct clk_hw *, u8);
1: +  u8 (*get_parent)(struct clk_hw *);
1: +  int (*set_rate)(struct clk_hw *, long unsigned int, long unsigned int);
1: +  int (*set_rate_and_parent)(struct clk_hw *, long unsigned int,
1: +                             long unsigned int, u8);
1: +  long unsigned int (*recalc_accuracy)(struct clk_hw *, long unsigned int);
1: +  int (*get_phase)(struct clk_hw *);
1: +  int (*set_phase)(struct clk_hw *, int);
1: +  int (*get_duty_cycle)(struct clk_hw *, struct clk_duty *);
1: +  int (*set_duty_cycle)(struct clk_hw *, struct clk_duty *);
1: +  int (*init)(struct clk_hw *);
1: +  void (*terminate)(struct clk_hw *);
1: +  void (*debug_init)(struct clk_hw *, struct dentry *);
1:  };
1:  
1:  struct clk_parent_data {
1: -	const struct clk_hw *hw;
1: -	const char *fw_name;
1: -	const char *name;
1: -	int index;
1: +  const struct clk_hw *hw;
1: +  const char *fw_name;
1: +  const char *name;
1: +  int index;
1:  };
1:  
1:  struct clk_init_data {
1: -	const char *name;
1: -	const struct clk_ops *ops;
1: -	const char * const *parent_names;
1: -	const struct clk_parent_data *parent_data;
1: -	const struct clk_hw **parent_hws;
1: -	u8 num_parents;
1: -	long unsigned int flags;
1: +  const char *name;
1: +  const struct clk_ops *ops;
1: +  const char *const *parent_names;
1: +  const struct clk_parent_data *parent_data;
1: +  const struct clk_hw **parent_hws;
1: +  u8 num_parents;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct clk_lookup_alloc {
1: -	struct clk_lookup cl;
1: -	char dev_id[20];
1: -	char con_id[16];
1: +  struct clk_lookup cl;
1: +  char dev_id[20];
1: +  char con_id[16];
1:  };
1:  
1:  struct clk_notifier {
1: -	struct clk *clk;
1: -	struct srcu_notifier_head notifier_head;
1: -	struct list_head node;
1: +  struct clk *clk;
1: +  struct srcu_notifier_head notifier_head;
1: +  struct list_head node;
1:  };
1:  
1:  struct clk {
1: -	struct clk_core *core;
1: -	struct device *dev;
1: -	const char *dev_id;
1: -	const char *con_id;
1: -	long unsigned int min_rate;
1: -	long unsigned int max_rate;
1: -	unsigned int exclusive_count;
1: -	struct hlist_node clks_node;
1: +  struct clk_core *core;
1: +  struct device *dev;
1: +  const char *dev_id;
1: +  const char *con_id;
1: +  long unsigned int min_rate;
1: +  long unsigned int max_rate;
1: +  unsigned int exclusive_count;
1: +  struct hlist_node clks_node;
1:  };
1:  
1:  struct clk_notifier_data {
1: -	struct clk *clk;
1: -	long unsigned int old_rate;
1: -	long unsigned int new_rate;
1: +  struct clk *clk;
1: +  long unsigned int old_rate;
1: +  long unsigned int new_rate;
1:  };
1:  
1:  struct clk_parent_map;
1:  
1:  struct clk_core {
1: -	const char *name;
1: -	const struct clk_ops *ops;
1: -	struct clk_hw *hw;
1: -	struct module *owner;
1: -	struct device *dev;
1: -	struct device_node *of_node;
1: -	struct clk_core *parent;
1: -	struct clk_parent_map *parents;
1: -	u8 num_parents;
1: -	u8 new_parent_index;
1: -	long unsigned int rate;
1: -	long unsigned int req_rate;
1: -	long unsigned int new_rate;
1: -	struct clk_core *new_parent;
1: -	struct clk_core *new_child;
1: -	long unsigned int flags;
1: -	bool orphan;
1: -	bool rpm_enabled;
1: -	unsigned int enable_count;
1: -	unsigned int prepare_count;
1: -	unsigned int protect_count;
1: -	long unsigned int min_rate;
1: -	long unsigned int max_rate;
1: -	long unsigned int accuracy;
1: -	int phase;
1: -	struct clk_duty duty;
1: -	struct hlist_head children;
1: -	struct hlist_node child_node;
1: -	struct hlist_head clks;
1: -	unsigned int notifier_count;
1: -	struct dentry *dentry;
1: -	struct hlist_node debug_node;
1: -	struct kref ref;
1: +  const char *name;
1: +  const struct clk_ops *ops;
1: +  struct clk_hw *hw;
1: +  struct module *owner;
1: +  struct device *dev;
1: +  struct device_node *of_node;
1: +  struct clk_core *parent;
1: +  struct clk_parent_map *parents;
1: +  u8 num_parents;
1: +  u8 new_parent_index;
1: +  long unsigned int rate;
1: +  long unsigned int req_rate;
1: +  long unsigned int new_rate;
1: +  struct clk_core *new_parent;
1: +  struct clk_core *new_child;
1: +  long unsigned int flags;
1: +  bool orphan;
1: +  bool rpm_enabled;
1: +  unsigned int enable_count;
1: +  unsigned int prepare_count;
1: +  unsigned int protect_count;
1: +  long unsigned int min_rate;
1: +  long unsigned int max_rate;
1: +  long unsigned int accuracy;
1: +  int phase;
1: +  struct clk_duty duty;
1: +  struct hlist_head children;
1: +  struct hlist_node child_node;
1: +  struct hlist_head clks;
1: +  unsigned int notifier_count;
1: +  struct dentry *dentry;
1: +  struct hlist_node debug_node;
1: +  struct kref ref;
1:  };
1:  
1:  struct clk_parent_map {
1: -	const struct clk_hw *hw;
1: -	struct clk_core *core;
1: -	const char *fw_name;
1: -	const char *name;
1: -	int index;
1: +  const struct clk_hw *hw;
1: +  struct clk_core *core;
1: +  const char *fw_name;
1: +  const char *name;
1: +  int index;
1:  };
1:  
1:  struct trace_event_raw_clk {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_clk_rate {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	long unsigned int rate;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  long unsigned int rate;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_clk_parent {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u32 __data_loc_pname;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u32 __data_loc_pname;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_clk_phase {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	int phase;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  int phase;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_clk_duty_cycle {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	unsigned int num;
1: -	unsigned int den;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  unsigned int num;
1: +  unsigned int den;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_clk {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_clk_rate {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_clk_parent {
1: -	u32 name;
1: -	u32 pname;
1: +  u32 name;
1: +  u32 pname;
1:  };
1:  
1:  struct trace_event_data_offsets_clk_phase {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_clk_duty_cycle {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  typedef void (*btf_trace_clk_enable)(void *, struct clk_core *);
1: @@ -73758,240 +74775,246 @@ typedef void (*btf_trace_clk_unprepare)(void *, struct clk_core *);
1:  
1:  typedef void (*btf_trace_clk_unprepare_complete)(void *, struct clk_core *);
1:  
1: -typedef void (*btf_trace_clk_set_rate)(void *, struct clk_core *, long unsigned int);
1: +typedef void (*btf_trace_clk_set_rate)(void *, struct clk_core *,
1: +                                       long unsigned int);
1:  
1: -typedef void (*btf_trace_clk_set_rate_complete)(void *, struct clk_core *, long unsigned int);
1: +typedef void (*btf_trace_clk_set_rate_complete)(void *, struct clk_core *,
1: +                                                long unsigned int);
1:  
1: -typedef void (*btf_trace_clk_set_parent)(void *, struct clk_core *, struct clk_core *);
1: +typedef void (*btf_trace_clk_set_parent)(void *, struct clk_core *,
1: +                                         struct clk_core *);
1:  
1: -typedef void (*btf_trace_clk_set_parent_complete)(void *, struct clk_core *, struct clk_core *);
1: +typedef void (*btf_trace_clk_set_parent_complete)(void *, struct clk_core *,
1: +                                                  struct clk_core *);
1:  
1:  typedef void (*btf_trace_clk_set_phase)(void *, struct clk_core *, int);
1:  
1: -typedef void (*btf_trace_clk_set_phase_complete)(void *, struct clk_core *, int);
1: +typedef void (*btf_trace_clk_set_phase_complete)(void *, struct clk_core *,
1: +                                                 int);
1:  
1: -typedef void (*btf_trace_clk_set_duty_cycle)(void *, struct clk_core *, struct clk_duty *);
1: +typedef void (*btf_trace_clk_set_duty_cycle)(void *, struct clk_core *,
1: +                                             struct clk_duty *);
1:  
1: -typedef void (*btf_trace_clk_set_duty_cycle_complete)(void *, struct clk_core *, struct clk_duty *);
1: +typedef void (*btf_trace_clk_set_duty_cycle_complete)(void *, struct clk_core *,
1: +                                                      struct clk_duty *);
1:  
1:  struct clk_div_table {
1: -	unsigned int val;
1: -	unsigned int div;
1: +  unsigned int val;
1: +  unsigned int div;
1:  };
1:  
1:  struct clk_divider {
1: -	struct clk_hw hw;
1: -	void *reg;
1: -	u8 shift;
1: -	u8 width;
1: -	u8 flags;
1: -	const struct clk_div_table *table;
1: -	spinlock_t *lock;
1: +  struct clk_hw hw;
1: +  void *reg;
1: +  u8 shift;
1: +  u8 width;
1: +  u8 flags;
1: +  const struct clk_div_table *table;
1: +  spinlock_t *lock;
1:  };
1:  
1:  struct clk_fixed_factor {
1: -	struct clk_hw hw;
1: -	unsigned int mult;
1: -	unsigned int div;
1: +  struct clk_hw hw;
1: +  unsigned int mult;
1: +  unsigned int div;
1:  };
1:  
1:  struct clk_fixed_rate {
1: -	struct clk_hw hw;
1: -	long unsigned int fixed_rate;
1: -	long unsigned int fixed_accuracy;
1: -	long unsigned int flags;
1: +  struct clk_hw hw;
1: +  long unsigned int fixed_rate;
1: +  long unsigned int fixed_accuracy;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct clk_gate {
1: -	struct clk_hw hw;
1: -	void *reg;
1: -	u8 bit_idx;
1: -	u8 flags;
1: -	spinlock_t *lock;
1: +  struct clk_hw hw;
1: +  void *reg;
1: +  u8 bit_idx;
1: +  u8 flags;
1: +  spinlock_t *lock;
1:  };
1:  
1:  struct clk_multiplier {
1: -	struct clk_hw hw;
1: -	void *reg;
1: -	u8 shift;
1: -	u8 width;
1: -	u8 flags;
1: -	spinlock_t *lock;
1: +  struct clk_hw hw;
1: +  void *reg;
1: +  u8 shift;
1: +  u8 width;
1: +  u8 flags;
1: +  spinlock_t *lock;
1:  };
1:  
1:  struct clk_mux {
1: -	struct clk_hw hw;
1: -	void *reg;
1: -	u32 *table;
1: -	u32 mask;
1: -	u8 shift;
1: -	u8 flags;
1: -	spinlock_t *lock;
1: +  struct clk_hw hw;
1: +  void *reg;
1: +  u32 *table;
1: +  u32 mask;
1: +  u8 shift;
1: +  u8 flags;
1: +  spinlock_t *lock;
1:  };
1:  
1:  struct clk_composite {
1: -	struct clk_hw hw;
1: -	struct clk_ops ops;
1: -	struct clk_hw *mux_hw;
1: -	struct clk_hw *rate_hw;
1: -	struct clk_hw *gate_hw;
1: -	const struct clk_ops *mux_ops;
1: -	const struct clk_ops *rate_ops;
1: -	const struct clk_ops *gate_ops;
1: +  struct clk_hw hw;
1: +  struct clk_ops ops;
1: +  struct clk_hw *mux_hw;
1: +  struct clk_hw *rate_hw;
1: +  struct clk_hw *gate_hw;
1: +  const struct clk_ops *mux_ops;
1: +  const struct clk_ops *rate_ops;
1: +  const struct clk_ops *gate_ops;
1:  };
1:  
1:  struct clk_fractional_divider {
1: -	struct clk_hw hw;
1: -	void *reg;
1: -	u8 mshift;
1: -	u8 mwidth;
1: -	u32 mmask;
1: -	u8 nshift;
1: -	u8 nwidth;
1: -	u32 nmask;
1: -	u8 flags;
1: -	void (*approximation)(struct clk_hw *, long unsigned int, long unsigned int *, long unsigned int *, long unsigned int *);
1: -	spinlock_t *lock;
1: +  struct clk_hw hw;
1: +  void *reg;
1: +  u8 mshift;
1: +  u8 mwidth;
1: +  u32 mmask;
1: +  u8 nshift;
1: +  u8 nwidth;
1: +  u32 nmask;
1: +  u8 flags;
1: +  void (*approximation)(struct clk_hw *, long unsigned int, long unsigned int *,
1: +                        long unsigned int *, long unsigned int *);
1: +  spinlock_t *lock;
1:  };
1:  
1:  struct gpio_desc___2;
1:  
1:  struct clk_gpio {
1: -	struct clk_hw hw;
1: -	struct gpio_desc___2 *gpiod;
1: +  struct clk_hw hw;
1: +  struct gpio_desc___2 *gpiod;
1:  };
1:  
1:  struct pmc_clk {
1: -	const char *name;
1: -	long unsigned int freq;
1: -	const char *parent_name;
1: +  const char *name;
1: +  long unsigned int freq;
1: +  const char *parent_name;
1:  };
1:  
1:  struct pmc_clk_data {
1: -	void *base;
1: -	const struct pmc_clk *clks;
1: -	bool critical;
1: +  void *base;
1: +  const struct pmc_clk *clks;
1: +  bool critical;
1:  };
1:  
1:  struct clk_plt_fixed {
1: -	struct clk_hw *clk;
1: -	struct clk_lookup *lookup;
1: +  struct clk_hw *clk;
1: +  struct clk_lookup *lookup;
1:  };
1:  
1:  struct clk_plt {
1: -	struct clk_hw hw;
1: -	void *reg;
1: -	struct clk_lookup *lookup;
1: -	spinlock_t lock;
1: +  struct clk_hw hw;
1: +  void *reg;
1: +  struct clk_lookup *lookup;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct clk_plt_data {
1: -	struct clk_plt_fixed **parents;
1: -	u8 nparents;
1: -	struct clk_plt *clks[6];
1: -	struct clk_lookup *mclk_lookup;
1: -	struct clk_lookup *ether_clk_lookup;
1: +  struct clk_plt_fixed **parents;
1: +  u8 nparents;
1: +  struct clk_plt *clks[6];
1: +  struct clk_lookup *mclk_lookup;
1: +  struct clk_lookup *ether_clk_lookup;
1:  };
1:  
1:  typedef s32 dma_cookie_t;
1:  
1:  enum dma_status {
1: -	DMA_COMPLETE = 0,
1: -	DMA_IN_PROGRESS = 1,
1: -	DMA_PAUSED = 2,
1: -	DMA_ERROR = 3,
1: -	DMA_OUT_OF_ORDER = 4,
1: +  DMA_COMPLETE = 0,
1: +  DMA_IN_PROGRESS = 1,
1: +  DMA_PAUSED = 2,
1: +  DMA_ERROR = 3,
1: +  DMA_OUT_OF_ORDER = 4,
1:  };
1:  
1:  enum dma_transaction_type {
1: -	DMA_MEMCPY = 0,
1: -	DMA_XOR = 1,
1: -	DMA_PQ = 2,
1: -	DMA_XOR_VAL = 3,
1: -	DMA_PQ_VAL = 4,
1: -	DMA_MEMSET = 5,
1: -	DMA_MEMSET_SG = 6,
1: -	DMA_INTERRUPT = 7,
1: -	DMA_PRIVATE = 8,
1: -	DMA_ASYNC_TX = 9,
1: -	DMA_SLAVE = 10,
1: -	DMA_CYCLIC = 11,
1: -	DMA_INTERLEAVE = 12,
1: -	DMA_COMPLETION_NO_ORDER = 13,
1: -	DMA_REPEAT = 14,
1: -	DMA_LOAD_EOT = 15,
1: -	DMA_TX_TYPE_END = 16,
1: +  DMA_MEMCPY = 0,
1: +  DMA_XOR = 1,
1: +  DMA_PQ = 2,
1: +  DMA_XOR_VAL = 3,
1: +  DMA_PQ_VAL = 4,
1: +  DMA_MEMSET = 5,
1: +  DMA_MEMSET_SG = 6,
1: +  DMA_INTERRUPT = 7,
1: +  DMA_PRIVATE = 8,
1: +  DMA_ASYNC_TX = 9,
1: +  DMA_SLAVE = 10,
1: +  DMA_CYCLIC = 11,
1: +  DMA_INTERLEAVE = 12,
1: +  DMA_COMPLETION_NO_ORDER = 13,
1: +  DMA_REPEAT = 14,
1: +  DMA_LOAD_EOT = 15,
1: +  DMA_TX_TYPE_END = 16,
1:  };
1:  
1:  enum dma_transfer_direction {
1: -	DMA_MEM_TO_MEM = 0,
1: -	DMA_MEM_TO_DEV = 1,
1: -	DMA_DEV_TO_MEM = 2,
1: -	DMA_DEV_TO_DEV = 3,
1: -	DMA_TRANS_NONE = 4,
1: +  DMA_MEM_TO_MEM = 0,
1: +  DMA_MEM_TO_DEV = 1,
1: +  DMA_DEV_TO_MEM = 2,
1: +  DMA_DEV_TO_DEV = 3,
1: +  DMA_TRANS_NONE = 4,
1:  };
1:  
1:  struct data_chunk {
1: -	size_t size;
1: -	size_t icg;
1: -	size_t dst_icg;
1: -	size_t src_icg;
1: +  size_t size;
1: +  size_t icg;
1: +  size_t dst_icg;
1: +  size_t src_icg;
1:  };
1:  
1:  struct dma_interleaved_template {
1: -	dma_addr_t src_start;
1: -	dma_addr_t dst_start;
1: -	enum dma_transfer_direction dir;
1: -	bool src_inc;
1: -	bool dst_inc;
1: -	bool src_sgl;
1: -	bool dst_sgl;
1: -	size_t numf;
1: -	size_t frame_size;
1: -	struct data_chunk sgl[0];
1: +  dma_addr_t src_start;
1: +  dma_addr_t dst_start;
1: +  enum dma_transfer_direction dir;
1: +  bool src_inc;
1: +  bool dst_inc;
1: +  bool src_sgl;
1: +  bool dst_sgl;
1: +  size_t numf;
1: +  size_t frame_size;
1: +  struct data_chunk sgl[0];
1:  };
1:  
1:  enum dma_ctrl_flags {
1: -	DMA_PREP_INTERRUPT = 1,
1: -	DMA_CTRL_ACK = 2,
1: -	DMA_PREP_PQ_DISABLE_P = 4,
1: -	DMA_PREP_PQ_DISABLE_Q = 8,
1: -	DMA_PREP_CONTINUE = 16,
1: -	DMA_PREP_FENCE = 32,
1: -	DMA_CTRL_REUSE = 64,
1: -	DMA_PREP_CMD = 128,
1: -	DMA_PREP_REPEAT = 256,
1: -	DMA_PREP_LOAD_EOT = 512,
1: +  DMA_PREP_INTERRUPT = 1,
1: +  DMA_CTRL_ACK = 2,
1: +  DMA_PREP_PQ_DISABLE_P = 4,
1: +  DMA_PREP_PQ_DISABLE_Q = 8,
1: +  DMA_PREP_CONTINUE = 16,
1: +  DMA_PREP_FENCE = 32,
1: +  DMA_CTRL_REUSE = 64,
1: +  DMA_PREP_CMD = 128,
1: +  DMA_PREP_REPEAT = 256,
1: +  DMA_PREP_LOAD_EOT = 512,
1:  };
1:  
1:  enum sum_check_bits {
1: -	SUM_CHECK_P = 0,
1: -	SUM_CHECK_Q = 1,
1: +  SUM_CHECK_P = 0,
1: +  SUM_CHECK_Q = 1,
1:  };
1:  
1:  enum sum_check_flags {
1: -	SUM_CHECK_P_RESULT = 1,
1: -	SUM_CHECK_Q_RESULT = 2,
1: +  SUM_CHECK_P_RESULT = 1,
1: +  SUM_CHECK_Q_RESULT = 2,
1:  };
1:  
1: -typedef struct {
1: -	long unsigned int bits[1];
1: -} dma_cap_mask_t;
1: +typedef struct { long unsigned int bits[1]; } dma_cap_mask_t;
1:  
1:  enum dma_desc_metadata_mode {
1: -	DESC_METADATA_NONE = 0,
1: -	DESC_METADATA_CLIENT = 1,
1: -	DESC_METADATA_ENGINE = 2,
1: +  DESC_METADATA_NONE = 0,
1: +  DESC_METADATA_CLIENT = 1,
1: +  DESC_METADATA_ENGINE = 2,
1:  };
1:  
1:  struct dma_chan_percpu {
1: -	long unsigned int memcpy_count;
1: -	long unsigned int bytes_transferred;
1: +  long unsigned int memcpy_count;
1: +  long unsigned int bytes_transferred;
1:  };
1:  
1:  struct dma_router {
1: -	struct device *dev;
1: -	void (*route_free)(struct device *, void *);
1: +  struct device *dev;
1: +  void (*route_free)(struct device *, void *);
1:  };
1:  
1:  struct dma_device;
1: @@ -73999,21 +75022,21 @@ struct dma_device;
1:  struct dma_chan_dev;
1:  
1:  struct dma_chan___2 {
1: -	struct dma_device *device;
1: -	struct device *slave;
1: -	dma_cookie_t cookie;
1: -	dma_cookie_t completed_cookie;
1: -	int chan_id;
1: -	struct dma_chan_dev *dev;
1: -	const char *name;
1: -	char *dbg_client_name;
1: -	struct list_head device_node;
1: -	struct dma_chan_percpu *local;
1: -	int client_count;
1: -	int table_count;
1: -	struct dma_router *router;
1: -	void *route_data;
1: -	void *private;
1: +  struct dma_device *device;
1: +  struct device *slave;
1: +  dma_cookie_t cookie;
1: +  dma_cookie_t completed_cookie;
1: +  int chan_id;
1: +  struct dma_chan_dev *dev;
1: +  const char *name;
1: +  char *dbg_client_name;
1: +  struct list_head device_node;
1: +  struct dma_chan_percpu *local;
1: +  int client_count;
1: +  int table_count;
1: +  struct dma_router *router;
1: +  void *route_data;
1: +  void *private;
1:  };
1:  
1:  typedef bool (*dma_filter_fn)(struct dma_chan___2 *, void *);
1: @@ -74021,25 +75044,25 @@ typedef bool (*dma_filter_fn)(struct dma_chan___2 *, void *);
1:  struct dma_slave_map;
1:  
1:  struct dma_filter {
1: -	dma_filter_fn fn;
1: -	int mapcnt;
1: -	const struct dma_slave_map *map;
1: +  dma_filter_fn fn;
1: +  int mapcnt;
1: +  const struct dma_slave_map *map;
1:  };
1:  
1:  enum dmaengine_alignment {
1: -	DMAENGINE_ALIGN_1_BYTE = 0,
1: -	DMAENGINE_ALIGN_2_BYTES = 1,
1: -	DMAENGINE_ALIGN_4_BYTES = 2,
1: -	DMAENGINE_ALIGN_8_BYTES = 3,
1: -	DMAENGINE_ALIGN_16_BYTES = 4,
1: -	DMAENGINE_ALIGN_32_BYTES = 5,
1: -	DMAENGINE_ALIGN_64_BYTES = 6,
1: +  DMAENGINE_ALIGN_1_BYTE = 0,
1: +  DMAENGINE_ALIGN_2_BYTES = 1,
1: +  DMAENGINE_ALIGN_4_BYTES = 2,
1: +  DMAENGINE_ALIGN_8_BYTES = 3,
1: +  DMAENGINE_ALIGN_16_BYTES = 4,
1: +  DMAENGINE_ALIGN_32_BYTES = 5,
1: +  DMAENGINE_ALIGN_64_BYTES = 6,
1:  };
1:  
1:  enum dma_residue_granularity {
1: -	DMA_RESIDUE_GRANULARITY_DESCRIPTOR = 0,
1: -	DMA_RESIDUE_GRANULARITY_SEGMENT = 1,
1: -	DMA_RESIDUE_GRANULARITY_BURST = 2,
1: +  DMA_RESIDUE_GRANULARITY_DESCRIPTOR = 0,
1: +  DMA_RESIDUE_GRANULARITY_SEGMENT = 1,
1: +  DMA_RESIDUE_GRANULARITY_BURST = 2,
1:  };
1:  
1:  struct dma_async_tx_descriptor;
1: @@ -74051,417 +75074,442 @@ struct dma_slave_config;
1:  struct dma_tx_state;
1:  
1:  struct dma_device {
1: -	struct kref ref;
1: -	unsigned int chancnt;
1: -	unsigned int privatecnt;
1: -	struct list_head channels;
1: -	struct list_head global_node;
1: -	struct dma_filter filter;
1: -	dma_cap_mask_t cap_mask;
1: -	enum dma_desc_metadata_mode desc_metadata_modes;
1: -	short unsigned int max_xor;
1: -	short unsigned int max_pq;
1: -	enum dmaengine_alignment copy_align;
1: -	enum dmaengine_alignment xor_align;
1: -	enum dmaengine_alignment pq_align;
1: -	enum dmaengine_alignment fill_align;
1: -	int dev_id;
1: -	struct device *dev;
1: -	struct module *owner;
1: -	struct ida chan_ida;
1: -	struct mutex chan_mutex;
1: -	u32 src_addr_widths;
1: -	u32 dst_addr_widths;
1: -	u32 directions;
1: -	u32 min_burst;
1: -	u32 max_burst;
1: -	u32 max_sg_burst;
1: -	bool descriptor_reuse;
1: -	enum dma_residue_granularity residue_granularity;
1: -	int (*device_alloc_chan_resources)(struct dma_chan___2 *);
1: -	void (*device_free_chan_resources)(struct dma_chan___2 *);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_memcpy)(struct dma_chan___2 *, dma_addr_t, dma_addr_t, size_t, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_xor)(struct dma_chan___2 *, dma_addr_t, dma_addr_t *, unsigned int, size_t, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_xor_val)(struct dma_chan___2 *, dma_addr_t *, unsigned int, size_t, enum sum_check_flags *, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_pq)(struct dma_chan___2 *, dma_addr_t *, dma_addr_t *, unsigned int, const unsigned char *, size_t, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_pq_val)(struct dma_chan___2 *, dma_addr_t *, dma_addr_t *, unsigned int, const unsigned char *, size_t, enum sum_check_flags *, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_memset)(struct dma_chan___2 *, dma_addr_t, int, size_t, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_memset_sg)(struct dma_chan___2 *, struct scatterlist *, unsigned int, int, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_interrupt)(struct dma_chan___2 *, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_slave_sg)(struct dma_chan___2 *, struct scatterlist *, unsigned int, enum dma_transfer_direction, long unsigned int, void *);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_cyclic)(struct dma_chan___2 *, dma_addr_t, size_t, size_t, enum dma_transfer_direction, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_interleaved_dma)(struct dma_chan___2 *, struct dma_interleaved_template *, long unsigned int);
1: -	struct dma_async_tx_descriptor * (*device_prep_dma_imm_data)(struct dma_chan___2 *, dma_addr_t, u64, long unsigned int);
1: -	void (*device_caps)(struct dma_chan___2 *, struct dma_slave_caps *);
1: -	int (*device_config)(struct dma_chan___2 *, struct dma_slave_config *);
1: -	int (*device_pause)(struct dma_chan___2 *);
1: -	int (*device_resume)(struct dma_chan___2 *);
1: -	int (*device_terminate_all)(struct dma_chan___2 *);
1: -	void (*device_synchronize)(struct dma_chan___2 *);
1: -	enum dma_status (*device_tx_status)(struct dma_chan___2 *, dma_cookie_t, struct dma_tx_state *);
1: -	void (*device_issue_pending)(struct dma_chan___2 *);
1: -	void (*device_release)(struct dma_device *);
1: -	void (*dbg_summary_show)(struct seq_file *, struct dma_device *);
1: -	struct dentry *dbg_dev_root;
1: +  struct kref ref;
1: +  unsigned int chancnt;
1: +  unsigned int privatecnt;
1: +  struct list_head channels;
1: +  struct list_head global_node;
1: +  struct dma_filter filter;
1: +  dma_cap_mask_t cap_mask;
1: +  enum dma_desc_metadata_mode desc_metadata_modes;
1: +  short unsigned int max_xor;
1: +  short unsigned int max_pq;
1: +  enum dmaengine_alignment copy_align;
1: +  enum dmaengine_alignment xor_align;
1: +  enum dmaengine_alignment pq_align;
1: +  enum dmaengine_alignment fill_align;
1: +  int dev_id;
1: +  struct device *dev;
1: +  struct module *owner;
1: +  struct ida chan_ida;
1: +  struct mutex chan_mutex;
1: +  u32 src_addr_widths;
1: +  u32 dst_addr_widths;
1: +  u32 directions;
1: +  u32 min_burst;
1: +  u32 max_burst;
1: +  u32 max_sg_burst;
1: +  bool descriptor_reuse;
1: +  enum dma_residue_granularity residue_granularity;
1: +  int (*device_alloc_chan_resources)(struct dma_chan___2 *);
1: +  void (*device_free_chan_resources)(struct dma_chan___2 *);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_memcpy)(
1: +      struct dma_chan___2 *, dma_addr_t, dma_addr_t, size_t, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_xor)(struct dma_chan___2 *,
1: +                                                         dma_addr_t,
1: +                                                         dma_addr_t *,
1: +                                                         unsigned int, size_t,
1: +                                                         long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_xor_val)(
1: +      struct dma_chan___2 *, dma_addr_t *, unsigned int, size_t,
1: +      enum sum_check_flags *, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_pq)(
1: +      struct dma_chan___2 *, dma_addr_t *, dma_addr_t *, unsigned int,
1: +      const unsigned char *, size_t, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_pq_val)(
1: +      struct dma_chan___2 *, dma_addr_t *, dma_addr_t *, unsigned int,
1: +      const unsigned char *, size_t, enum sum_check_flags *, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_memset)(
1: +      struct dma_chan___2 *, dma_addr_t, int, size_t, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_memset_sg)(
1: +      struct dma_chan___2 *, struct scatterlist *, unsigned int, int,
1: +      long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)(
1: +      struct dma_chan___2 *, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_slave_sg)(
1: +      struct dma_chan___2 *, struct scatterlist *, unsigned int,
1: +      enum dma_transfer_direction, long unsigned int, void *);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)(
1: +      struct dma_chan___2 *, dma_addr_t, size_t, size_t,
1: +      enum dma_transfer_direction, long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
1: +      struct dma_chan___2 *, struct dma_interleaved_template *,
1: +      long unsigned int);
1: +  struct dma_async_tx_descriptor *(*device_prep_dma_imm_data)(
1: +      struct dma_chan___2 *, dma_addr_t, u64, long unsigned int);
1: +  void (*device_caps)(struct dma_chan___2 *, struct dma_slave_caps *);
1: +  int (*device_config)(struct dma_chan___2 *, struct dma_slave_config *);
1: +  int (*device_pause)(struct dma_chan___2 *);
1: +  int (*device_resume)(struct dma_chan___2 *);
1: +  int (*device_terminate_all)(struct dma_chan___2 *);
1: +  void (*device_synchronize)(struct dma_chan___2 *);
1: +  enum dma_status (*device_tx_status)(struct dma_chan___2 *, dma_cookie_t,
1: +                                      struct dma_tx_state *);
1: +  void (*device_issue_pending)(struct dma_chan___2 *);
1: +  void (*device_release)(struct dma_device *);
1: +  void (*dbg_summary_show)(struct seq_file *, struct dma_device *);
1: +  struct dentry *dbg_dev_root;
1:  };
1:  
1:  struct dma_chan_dev {
1: -	struct dma_chan___2 *chan;
1: -	struct device device;
1: -	int dev_id;
1: +  struct dma_chan___2 *chan;
1: +  struct device device;
1: +  int dev_id;
1:  };
1:  
1:  enum dma_slave_buswidth {
1: -	DMA_SLAVE_BUSWIDTH_UNDEFINED = 0,
1: -	DMA_SLAVE_BUSWIDTH_1_BYTE = 1,
1: -	DMA_SLAVE_BUSWIDTH_2_BYTES = 2,
1: -	DMA_SLAVE_BUSWIDTH_3_BYTES = 3,
1: -	DMA_SLAVE_BUSWIDTH_4_BYTES = 4,
1: -	DMA_SLAVE_BUSWIDTH_8_BYTES = 8,
1: -	DMA_SLAVE_BUSWIDTH_16_BYTES = 16,
1: -	DMA_SLAVE_BUSWIDTH_32_BYTES = 32,
1: -	DMA_SLAVE_BUSWIDTH_64_BYTES = 64,
1: +  DMA_SLAVE_BUSWIDTH_UNDEFINED = 0,
1: +  DMA_SLAVE_BUSWIDTH_1_BYTE = 1,
1: +  DMA_SLAVE_BUSWIDTH_2_BYTES = 2,
1: +  DMA_SLAVE_BUSWIDTH_3_BYTES = 3,
1: +  DMA_SLAVE_BUSWIDTH_4_BYTES = 4,
1: +  DMA_SLAVE_BUSWIDTH_8_BYTES = 8,
1: +  DMA_SLAVE_BUSWIDTH_16_BYTES = 16,
1: +  DMA_SLAVE_BUSWIDTH_32_BYTES = 32,
1: +  DMA_SLAVE_BUSWIDTH_64_BYTES = 64,
1:  };
1:  
1:  struct dma_slave_config {
1: -	enum dma_transfer_direction direction;
1: -	phys_addr_t src_addr;
1: -	phys_addr_t dst_addr;
1: -	enum dma_slave_buswidth src_addr_width;
1: -	enum dma_slave_buswidth dst_addr_width;
1: -	u32 src_maxburst;
1: -	u32 dst_maxburst;
1: -	u32 src_port_window_size;
1: -	u32 dst_port_window_size;
1: -	bool device_fc;
1: -	unsigned int slave_id;
1: +  enum dma_transfer_direction direction;
1: +  phys_addr_t src_addr;
1: +  phys_addr_t dst_addr;
1: +  enum dma_slave_buswidth src_addr_width;
1: +  enum dma_slave_buswidth dst_addr_width;
1: +  u32 src_maxburst;
1: +  u32 dst_maxburst;
1: +  u32 src_port_window_size;
1: +  u32 dst_port_window_size;
1: +  bool device_fc;
1: +  unsigned int slave_id;
1:  };
1:  
1:  struct dma_slave_caps {
1: -	u32 src_addr_widths;
1: -	u32 dst_addr_widths;
1: -	u32 directions;
1: -	u32 min_burst;
1: -	u32 max_burst;
1: -	u32 max_sg_burst;
1: -	bool cmd_pause;
1: -	bool cmd_resume;
1: -	bool cmd_terminate;
1: -	enum dma_residue_granularity residue_granularity;
1: -	bool descriptor_reuse;
1: +  u32 src_addr_widths;
1: +  u32 dst_addr_widths;
1: +  u32 directions;
1: +  u32 min_burst;
1: +  u32 max_burst;
1: +  u32 max_sg_burst;
1: +  bool cmd_pause;
1: +  bool cmd_resume;
1: +  bool cmd_terminate;
1: +  enum dma_residue_granularity residue_granularity;
1: +  bool descriptor_reuse;
1:  };
1:  
1:  typedef void (*dma_async_tx_callback)(void *);
1:  
1:  enum dmaengine_tx_result {
1: -	DMA_TRANS_NOERROR = 0,
1: -	DMA_TRANS_READ_FAILED = 1,
1: -	DMA_TRANS_WRITE_FAILED = 2,
1: -	DMA_TRANS_ABORTED = 3,
1: +  DMA_TRANS_NOERROR = 0,
1: +  DMA_TRANS_READ_FAILED = 1,
1: +  DMA_TRANS_WRITE_FAILED = 2,
1: +  DMA_TRANS_ABORTED = 3,
1:  };
1:  
1:  struct dmaengine_result {
1: -	enum dmaengine_tx_result result;
1: -	u32 residue;
1: +  enum dmaengine_tx_result result;
1: +  u32 residue;
1:  };
1:  
1: -typedef void (*dma_async_tx_callback_result)(void *, const struct dmaengine_result *);
1: +typedef void (*dma_async_tx_callback_result)(void *,
1: +                                             const struct dmaengine_result *);
1:  
1:  struct dmaengine_unmap_data {
1: -	u16 map_cnt;
1: -	u8 to_cnt;
1: -	u8 from_cnt;
1: -	u8 bidi_cnt;
1: -	struct device *dev;
1: -	struct kref kref;
1: -	size_t len;
1: -	dma_addr_t addr[0];
1: +  u16 map_cnt;
1: +  u8 to_cnt;
1: +  u8 from_cnt;
1: +  u8 bidi_cnt;
1: +  struct device *dev;
1: +  struct kref kref;
1: +  size_t len;
1: +  dma_addr_t addr[0];
1:  };
1:  
1:  struct dma_descriptor_metadata_ops {
1: -	int (*attach)(struct dma_async_tx_descriptor *, void *, size_t);
1: -	void * (*get_ptr)(struct dma_async_tx_descriptor *, size_t *, size_t *);
1: -	int (*set_len)(struct dma_async_tx_descriptor *, size_t);
1: +  int (*attach)(struct dma_async_tx_descriptor *, void *, size_t);
1: +  void *(*get_ptr)(struct dma_async_tx_descriptor *, size_t *, size_t *);
1: +  int (*set_len)(struct dma_async_tx_descriptor *, size_t);
1:  };
1:  
1:  struct dma_async_tx_descriptor {
1: -	dma_cookie_t cookie;
1: -	enum dma_ctrl_flags flags;
1: -	dma_addr_t phys;
1: -	struct dma_chan___2 *chan;
1: -	dma_cookie_t (*tx_submit)(struct dma_async_tx_descriptor *);
1: -	int (*desc_free)(struct dma_async_tx_descriptor *);
1: -	dma_async_tx_callback callback;
1: -	dma_async_tx_callback_result callback_result;
1: -	void *callback_param;
1: -	struct dmaengine_unmap_data *unmap;
1: -	enum dma_desc_metadata_mode desc_metadata_mode;
1: -	struct dma_descriptor_metadata_ops *metadata_ops;
1: +  dma_cookie_t cookie;
1: +  enum dma_ctrl_flags flags;
1: +  dma_addr_t phys;
1: +  struct dma_chan___2 *chan;
1: +  dma_cookie_t (*tx_submit)(struct dma_async_tx_descriptor *);
1: +  int (*desc_free)(struct dma_async_tx_descriptor *);
1: +  dma_async_tx_callback callback;
1: +  dma_async_tx_callback_result callback_result;
1: +  void *callback_param;
1: +  struct dmaengine_unmap_data *unmap;
1: +  enum dma_desc_metadata_mode desc_metadata_mode;
1: +  struct dma_descriptor_metadata_ops *metadata_ops;
1:  };
1:  
1:  struct dma_tx_state {
1: -	dma_cookie_t last;
1: -	dma_cookie_t used;
1: -	u32 residue;
1: -	u32 in_flight_bytes;
1: +  dma_cookie_t last;
1: +  dma_cookie_t used;
1: +  u32 residue;
1: +  u32 in_flight_bytes;
1:  };
1:  
1:  struct dma_slave_map {
1: -	const char *devname;
1: -	const char *slave;
1: -	void *param;
1: +  const char *devname;
1: +  const char *slave;
1: +  void *param;
1:  };
1:  
1:  struct dma_chan_tbl_ent {
1: -	struct dma_chan___2 *chan;
1: +  struct dma_chan___2 *chan;
1:  };
1:  
1:  struct dmaengine_unmap_pool {
1: -	struct kmem_cache *cache;
1: -	const char *name;
1: -	mempool_t *pool;
1: -	size_t size;
1: +  struct kmem_cache *cache;
1: +  const char *name;
1: +  mempool_t *pool;
1: +  size_t size;
1:  };
1:  
1:  struct acpi_table_csrt {
1: -	struct acpi_table_header header;
1: +  struct acpi_table_header header;
1:  };
1:  
1:  struct acpi_csrt_group {
1: -	u32 length;
1: -	u32 vendor_id;
1: -	u32 subvendor_id;
1: -	u16 device_id;
1: -	u16 subdevice_id;
1: -	u16 revision;
1: -	u16 reserved;
1: -	u32 shared_info_length;
1: +  u32 length;
1: +  u32 vendor_id;
1: +  u32 subvendor_id;
1: +  u16 device_id;
1: +  u16 subdevice_id;
1: +  u16 revision;
1: +  u16 reserved;
1: +  u32 shared_info_length;
1:  };
1:  
1:  struct acpi_csrt_shared_info {
1: -	u16 major_version;
1: -	u16 minor_version;
1: -	u32 mmio_base_low;
1: -	u32 mmio_base_high;
1: -	u32 gsi_interrupt;
1: -	u8 interrupt_polarity;
1: -	u8 interrupt_mode;
1: -	u8 num_channels;
1: -	u8 dma_address_width;
1: -	u16 base_request_line;
1: -	u16 num_handshake_signals;
1: -	u32 max_block_size;
1: +  u16 major_version;
1: +  u16 minor_version;
1: +  u32 mmio_base_low;
1: +  u32 mmio_base_high;
1: +  u32 gsi_interrupt;
1: +  u8 interrupt_polarity;
1: +  u8 interrupt_mode;
1: +  u8 num_channels;
1: +  u8 dma_address_width;
1: +  u16 base_request_line;
1: +  u16 num_handshake_signals;
1: +  u32 max_block_size;
1:  };
1:  
1:  struct acpi_dma_spec {
1: -	int chan_id;
1: -	int slave_id;
1: -	struct device *dev;
1: +  int chan_id;
1: +  int slave_id;
1: +  struct device *dev;
1:  };
1:  
1:  struct acpi_dma {
1: -	struct list_head dma_controllers;
1: -	struct device *dev;
1: -	struct dma_chan___2 * (*acpi_dma_xlate)(struct acpi_dma_spec *, struct acpi_dma *);
1: -	void *data;
1: -	short unsigned int base_request_line;
1: -	short unsigned int end_request_line;
1: +  struct list_head dma_controllers;
1: +  struct device *dev;
1: +  struct dma_chan___2 *(*acpi_dma_xlate)(struct acpi_dma_spec *,
1: +                                         struct acpi_dma *);
1: +  void *data;
1: +  short unsigned int base_request_line;
1: +  short unsigned int end_request_line;
1:  };
1:  
1:  struct acpi_dma_filter_info {
1: -	dma_cap_mask_t dma_cap;
1: -	dma_filter_fn filter_fn;
1: +  dma_cap_mask_t dma_cap;
1: +  dma_filter_fn filter_fn;
1:  };
1:  
1:  struct acpi_dma_parser_data {
1: -	struct acpi_dma_spec dma_spec;
1: -	size_t index;
1: -	size_t n;
1: +  struct acpi_dma_spec dma_spec;
1: +  size_t index;
1: +  size_t n;
1:  };
1:  
1:  struct dca_ops;
1:  
1:  struct dca_provider {
1: -	struct list_head node;
1: -	const struct dca_ops *ops;
1: -	struct device *cd;
1: -	int id;
1: +  struct list_head node;
1: +  const struct dca_ops *ops;
1: +  struct device *cd;
1: +  int id;
1:  };
1:  
1:  struct dca_ops {
1: -	int (*add_requester)(struct dca_provider *, struct device *);
1: -	int (*remove_requester)(struct dca_provider *, struct device *);
1: -	u8 (*get_tag)(struct dca_provider *, struct device *, int);
1: -	int (*dev_managed)(struct dca_provider *, struct device *);
1: +  int (*add_requester)(struct dca_provider *, struct device *);
1: +  int (*remove_requester)(struct dca_provider *, struct device *);
1: +  u8 (*get_tag)(struct dca_provider *, struct device *, int);
1: +  int (*dev_managed)(struct dca_provider *, struct device *);
1:  };
1:  
1:  struct ioat_dma_descriptor {
1: -	uint32_t size;
1: -	union {
1: -		uint32_t ctl;
1: -		struct {
1: -			unsigned int int_en: 1;
1: -			unsigned int src_snoop_dis: 1;
1: -			unsigned int dest_snoop_dis: 1;
1: -			unsigned int compl_write: 1;
1: -			unsigned int fence: 1;
1: -			unsigned int null: 1;
1: -			unsigned int src_brk: 1;
1: -			unsigned int dest_brk: 1;
1: -			unsigned int bundle: 1;
1: -			unsigned int dest_dca: 1;
1: -			unsigned int hint: 1;
1: -			unsigned int rsvd2: 13;
1: -			unsigned int op: 8;
1: -		} ctl_f;
1: -	};
1: -	uint64_t src_addr;
1: -	uint64_t dst_addr;
1: -	uint64_t next;
1: -	uint64_t rsv1;
1: -	uint64_t rsv2;
1: -	union {
1: -		uint64_t user1;
1: -		uint64_t tx_cnt;
1: -	};
1: -	uint64_t user2;
1: +  uint32_t size;
1: +  union {
1: +    uint32_t ctl;
1: +    struct {
1: +      unsigned int int_en : 1;
1: +      unsigned int src_snoop_dis : 1;
1: +      unsigned int dest_snoop_dis : 1;
1: +      unsigned int compl_write : 1;
1: +      unsigned int fence : 1;
1: +      unsigned int null : 1;
1: +      unsigned int src_brk : 1;
1: +      unsigned int dest_brk : 1;
1: +      unsigned int bundle : 1;
1: +      unsigned int dest_dca : 1;
1: +      unsigned int hint : 1;
1: +      unsigned int rsvd2 : 13;
1: +      unsigned int op : 8;
1: +    } ctl_f;
1: +  };
1: +  uint64_t src_addr;
1: +  uint64_t dst_addr;
1: +  uint64_t next;
1: +  uint64_t rsv1;
1: +  uint64_t rsv2;
1: +  union {
1: +    uint64_t user1;
1: +    uint64_t tx_cnt;
1: +  };
1: +  uint64_t user2;
1:  };
1:  
1:  struct ioat_xor_descriptor {
1: -	uint32_t size;
1: -	union {
1: -		uint32_t ctl;
1: -		struct {
1: -			unsigned int int_en: 1;
1: -			unsigned int src_snoop_dis: 1;
1: -			unsigned int dest_snoop_dis: 1;
1: -			unsigned int compl_write: 1;
1: -			unsigned int fence: 1;
1: -			unsigned int src_cnt: 3;
1: -			unsigned int bundle: 1;
1: -			unsigned int dest_dca: 1;
1: -			unsigned int hint: 1;
1: -			unsigned int rsvd: 13;
1: -			unsigned int op: 8;
1: -		} ctl_f;
1: -	};
1: -	uint64_t src_addr;
1: -	uint64_t dst_addr;
1: -	uint64_t next;
1: -	uint64_t src_addr2;
1: -	uint64_t src_addr3;
1: -	uint64_t src_addr4;
1: -	uint64_t src_addr5;
1: +  uint32_t size;
1: +  union {
1: +    uint32_t ctl;
1: +    struct {
1: +      unsigned int int_en : 1;
1: +      unsigned int src_snoop_dis : 1;
1: +      unsigned int dest_snoop_dis : 1;
1: +      unsigned int compl_write : 1;
1: +      unsigned int fence : 1;
1: +      unsigned int src_cnt : 3;
1: +      unsigned int bundle : 1;
1: +      unsigned int dest_dca : 1;
1: +      unsigned int hint : 1;
1: +      unsigned int rsvd : 13;
1: +      unsigned int op : 8;
1: +    } ctl_f;
1: +  };
1: +  uint64_t src_addr;
1: +  uint64_t dst_addr;
1: +  uint64_t next;
1: +  uint64_t src_addr2;
1: +  uint64_t src_addr3;
1: +  uint64_t src_addr4;
1: +  uint64_t src_addr5;
1:  };
1:  
1:  struct ioat_xor_ext_descriptor {
1: -	uint64_t src_addr6;
1: -	uint64_t src_addr7;
1: -	uint64_t src_addr8;
1: -	uint64_t next;
1: -	uint64_t rsvd[4];
1: +  uint64_t src_addr6;
1: +  uint64_t src_addr7;
1: +  uint64_t src_addr8;
1: +  uint64_t next;
1: +  uint64_t rsvd[4];
1:  };
1:  
1:  struct ioat_pq_descriptor {
1: -	union {
1: -		uint32_t size;
1: -		uint32_t dwbes;
1: -		struct {
1: -			unsigned int rsvd: 25;
1: -			unsigned int p_val_err: 1;
1: -			unsigned int q_val_err: 1;
1: -			unsigned int rsvd1: 4;
1: -			unsigned int wbes: 1;
1: -		} dwbes_f;
1: -	};
1: -	union {
1: -		uint32_t ctl;
1: -		struct {
1: -			unsigned int int_en: 1;
1: -			unsigned int src_snoop_dis: 1;
1: -			unsigned int dest_snoop_dis: 1;
1: -			unsigned int compl_write: 1;
1: -			unsigned int fence: 1;
1: -			unsigned int src_cnt: 3;
1: -			unsigned int bundle: 1;
1: -			unsigned int dest_dca: 1;
1: -			unsigned int hint: 1;
1: -			unsigned int p_disable: 1;
1: -			unsigned int q_disable: 1;
1: -			unsigned int rsvd2: 2;
1: -			unsigned int wb_en: 1;
1: -			unsigned int prl_en: 1;
1: -			unsigned int rsvd3: 7;
1: -			unsigned int op: 8;
1: -		} ctl_f;
1: -	};
1: -	uint64_t src_addr;
1: -	uint64_t p_addr;
1: -	uint64_t next;
1: -	uint64_t src_addr2;
1: -	union {
1: -		uint64_t src_addr3;
1: -		uint64_t sed_addr;
1: -	};
1: -	uint8_t coef[8];
1: -	uint64_t q_addr;
1: +  union {
1: +    uint32_t size;
1: +    uint32_t dwbes;
1: +    struct {
1: +      unsigned int rsvd : 25;
1: +      unsigned int p_val_err : 1;
1: +      unsigned int q_val_err : 1;
1: +      unsigned int rsvd1 : 4;
1: +      unsigned int wbes : 1;
1: +    } dwbes_f;
1: +  };
1: +  union {
1: +    uint32_t ctl;
1: +    struct {
1: +      unsigned int int_en : 1;
1: +      unsigned int src_snoop_dis : 1;
1: +      unsigned int dest_snoop_dis : 1;
1: +      unsigned int compl_write : 1;
1: +      unsigned int fence : 1;
1: +      unsigned int src_cnt : 3;
1: +      unsigned int bundle : 1;
1: +      unsigned int dest_dca : 1;
1: +      unsigned int hint : 1;
1: +      unsigned int p_disable : 1;
1: +      unsigned int q_disable : 1;
1: +      unsigned int rsvd2 : 2;
1: +      unsigned int wb_en : 1;
1: +      unsigned int prl_en : 1;
1: +      unsigned int rsvd3 : 7;
1: +      unsigned int op : 8;
1: +    } ctl_f;
1: +  };
1: +  uint64_t src_addr;
1: +  uint64_t p_addr;
1: +  uint64_t next;
1: +  uint64_t src_addr2;
1: +  union {
1: +    uint64_t src_addr3;
1: +    uint64_t sed_addr;
1: +  };
1: +  uint8_t coef[8];
1: +  uint64_t q_addr;
1:  };
1:  
1:  struct ioat_pq_ext_descriptor {
1: -	uint64_t src_addr4;
1: -	uint64_t src_addr5;
1: -	uint64_t src_addr6;
1: -	uint64_t next;
1: -	uint64_t src_addr7;
1: -	uint64_t src_addr8;
1: -	uint64_t rsvd[2];
1: +  uint64_t src_addr4;
1: +  uint64_t src_addr5;
1: +  uint64_t src_addr6;
1: +  uint64_t next;
1: +  uint64_t src_addr7;
1: +  uint64_t src_addr8;
1: +  uint64_t rsvd[2];
1:  };
1:  
1:  struct ioat_pq_update_descriptor {
1: -	uint32_t size;
1: -	union {
1: -		uint32_t ctl;
1: -		struct {
1: -			unsigned int int_en: 1;
1: -			unsigned int src_snoop_dis: 1;
1: -			unsigned int dest_snoop_dis: 1;
1: -			unsigned int compl_write: 1;
1: -			unsigned int fence: 1;
1: -			unsigned int src_cnt: 3;
1: -			unsigned int bundle: 1;
1: -			unsigned int dest_dca: 1;
1: -			unsigned int hint: 1;
1: -			unsigned int p_disable: 1;
1: -			unsigned int q_disable: 1;
1: -			unsigned int rsvd: 3;
1: -			unsigned int coef: 8;
1: -			unsigned int op: 8;
1: -		} ctl_f;
1: -	};
1: -	uint64_t src_addr;
1: -	uint64_t p_addr;
1: -	uint64_t next;
1: -	uint64_t src_addr2;
1: -	uint64_t p_src;
1: -	uint64_t q_src;
1: -	uint64_t q_addr;
1: +  uint32_t size;
1: +  union {
1: +    uint32_t ctl;
1: +    struct {
1: +      unsigned int int_en : 1;
1: +      unsigned int src_snoop_dis : 1;
1: +      unsigned int dest_snoop_dis : 1;
1: +      unsigned int compl_write : 1;
1: +      unsigned int fence : 1;
1: +      unsigned int src_cnt : 3;
1: +      unsigned int bundle : 1;
1: +      unsigned int dest_dca : 1;
1: +      unsigned int hint : 1;
1: +      unsigned int p_disable : 1;
1: +      unsigned int q_disable : 1;
1: +      unsigned int rsvd : 3;
1: +      unsigned int coef : 8;
1: +      unsigned int op : 8;
1: +    } ctl_f;
1: +  };
1: +  uint64_t src_addr;
1: +  uint64_t p_addr;
1: +  uint64_t next;
1: +  uint64_t src_addr2;
1: +  uint64_t p_src;
1: +  uint64_t q_src;
1: +  uint64_t q_addr;
1:  };
1:  
1:  struct ioat_raw_descriptor {
1: -	uint64_t field[8];
1: +  uint64_t field[8];
1:  };
1:  
1:  struct ioat_sed_raw_descriptor {
1: -	uint64_t a[8];
1: -	uint64_t b[8];
1: -	uint64_t c[8];
1: +  uint64_t a[8];
1: +  uint64_t b[8];
1: +  uint64_t c[8];
1:  };
1:  
1:  enum ioat_irq_mode {
1: -	IOAT_NOIRQ = 0,
1: -	IOAT_MSIX = 1,
1: -	IOAT_MSI = 2,
1: -	IOAT_INTX = 3,
1: +  IOAT_NOIRQ = 0,
1: +  IOAT_MSIX = 1,
1: +  IOAT_MSI = 2,
1: +  IOAT_INTX = 3,
1:  };
1:  
1:  struct dma_pool___2;
1: @@ -74469,132 +75517,132 @@ struct dma_pool___2;
1:  struct ioatdma_chan;
1:  
1:  struct ioatdma_device {
1: -	struct pci_dev *pdev;
1: -	void *reg_base;
1: -	struct dma_pool___2 *completion_pool;
1: -	struct dma_pool___2 *sed_hw_pool[5];
1: -	struct dma_device dma_dev;
1: -	u8 version;
1: -	struct msix_entry msix_entries[4];
1: -	struct ioatdma_chan *idx[4];
1: -	struct dca_provider *dca;
1: -	enum ioat_irq_mode irq_mode;
1: -	u32 cap;
1: -	u64 msixtba0;
1: -	u64 msixdata0;
1: -	u32 msixpba;
1: +  struct pci_dev *pdev;
1: +  void *reg_base;
1: +  struct dma_pool___2 *completion_pool;
1: +  struct dma_pool___2 *sed_hw_pool[5];
1: +  struct dma_device dma_dev;
1: +  u8 version;
1: +  struct msix_entry msix_entries[4];
1: +  struct ioatdma_chan *idx[4];
1: +  struct dca_provider *dca;
1: +  enum ioat_irq_mode irq_mode;
1: +  u32 cap;
1: +  u64 msixtba0;
1: +  u64 msixdata0;
1: +  u32 msixpba;
1:  };
1:  
1:  struct ioat_descs {
1: -	void *virt;
1: -	dma_addr_t hw;
1: +  void *virt;
1: +  dma_addr_t hw;
1:  };
1:  
1:  struct ioat_ring_ent;
1:  
1:  struct ioatdma_chan {
1: -	struct dma_chan___2 dma_chan;
1: -	void *reg_base;
1: -	dma_addr_t last_completion;
1: -	spinlock_t cleanup_lock;
1: -	long unsigned int state;
1: -	struct timer_list timer;
1: -	struct ioatdma_device *ioat_dma;
1: -	dma_addr_t completion_dma;
1: -	u64 *completion;
1: -	struct tasklet_struct cleanup_task;
1: -	struct kobject kobj;
1: -	size_t xfercap_log;
1: -	u16 head;
1: -	u16 issued;
1: -	u16 tail;
1: -	u16 dmacount;
1: -	u16 alloc_order;
1: -	u16 produce;
1: -	struct ioat_ring_ent **ring;
1: -	spinlock_t prep_lock;
1: -	struct ioat_descs descs[8];
1: -	int desc_chunks;
1: -	int intr_coalesce;
1: -	int prev_intr_coalesce;
1: +  struct dma_chan___2 dma_chan;
1: +  void *reg_base;
1: +  dma_addr_t last_completion;
1: +  spinlock_t cleanup_lock;
1: +  long unsigned int state;
1: +  struct timer_list timer;
1: +  struct ioatdma_device *ioat_dma;
1: +  dma_addr_t completion_dma;
1: +  u64 *completion;
1: +  struct tasklet_struct cleanup_task;
1: +  struct kobject kobj;
1: +  size_t xfercap_log;
1: +  u16 head;
1: +  u16 issued;
1: +  u16 tail;
1: +  u16 dmacount;
1: +  u16 alloc_order;
1: +  u16 produce;
1: +  struct ioat_ring_ent **ring;
1: +  spinlock_t prep_lock;
1: +  struct ioat_descs descs[8];
1: +  int desc_chunks;
1: +  int intr_coalesce;
1: +  int prev_intr_coalesce;
1:  };
1:  
1:  struct ioat_sed_ent;
1:  
1:  struct ioat_ring_ent {
1: -	union {
1: -		struct ioat_dma_descriptor *hw;
1: -		struct ioat_xor_descriptor *xor;
1: -		struct ioat_xor_ext_descriptor *xor_ex;
1: -		struct ioat_pq_descriptor *pq;
1: -		struct ioat_pq_ext_descriptor *pq_ex;
1: -		struct ioat_pq_update_descriptor *pqu;
1: -		struct ioat_raw_descriptor *raw;
1: -	};
1: -	size_t len;
1: -	struct dma_async_tx_descriptor txd;
1: -	enum sum_check_flags *result;
1: -	struct ioat_sed_ent *sed;
1: +  union {
1: +    struct ioat_dma_descriptor *hw;
1: +    struct ioat_xor_descriptor * xor ;
1: +    struct ioat_xor_ext_descriptor *xor_ex;
1: +    struct ioat_pq_descriptor *pq;
1: +    struct ioat_pq_ext_descriptor *pq_ex;
1: +    struct ioat_pq_update_descriptor *pqu;
1: +    struct ioat_raw_descriptor *raw;
1: +  };
1: +  size_t len;
1: +  struct dma_async_tx_descriptor txd;
1: +  enum sum_check_flags *result;
1: +  struct ioat_sed_ent *sed;
1:  };
1:  
1:  struct ioat_sed_ent {
1: -	struct ioat_sed_raw_descriptor *hw;
1: -	dma_addr_t dma;
1: -	struct ioat_ring_ent *parent;
1: -	unsigned int hw_pool;
1: +  struct ioat_sed_raw_descriptor *hw;
1: +  dma_addr_t dma;
1: +  struct ioat_ring_ent *parent;
1: +  unsigned int hw_pool;
1:  };
1:  
1:  struct dmaengine_desc_callback {
1: -	dma_async_tx_callback callback;
1: -	dma_async_tx_callback_result callback_result;
1: -	void *callback_param;
1: +  dma_async_tx_callback callback;
1: +  dma_async_tx_callback_result callback_result;
1: +  void *callback_param;
1:  };
1:  
1:  struct ioat_pq16a_descriptor {
1: -	uint8_t coef[8];
1: -	uint64_t src_addr3;
1: -	uint64_t src_addr4;
1: -	uint64_t src_addr5;
1: -	uint64_t src_addr6;
1: -	uint64_t src_addr7;
1: -	uint64_t src_addr8;
1: -	uint64_t src_addr9;
1: +  uint8_t coef[8];
1: +  uint64_t src_addr3;
1: +  uint64_t src_addr4;
1: +  uint64_t src_addr5;
1: +  uint64_t src_addr6;
1: +  uint64_t src_addr7;
1: +  uint64_t src_addr8;
1: +  uint64_t src_addr9;
1:  };
1:  
1:  struct ioat_dca_slot {
1: -	struct pci_dev *pdev;
1: -	u16 rid;
1: +  struct pci_dev *pdev;
1: +  u16 rid;
1:  };
1:  
1:  struct ioat_dca_priv {
1: -	void *iobase;
1: -	void *dca_base;
1: -	int max_requesters;
1: -	int requester_count;
1: -	u8 tag_map[8];
1: -	struct ioat_dca_slot req_slots[0];
1: +  void *iobase;
1: +  void *dca_base;
1: +  int max_requesters;
1: +  int requester_count;
1: +  u8 tag_map[8];
1: +  struct ioat_dca_slot req_slots[0];
1:  };
1:  
1:  struct ioat_sysfs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct dma_chan___2 *, char *);
1: -	ssize_t (*store)(struct dma_chan___2 *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct dma_chan___2 *, char *);
1: +  ssize_t (*store)(struct dma_chan___2 *, const char *, size_t);
1:  };
1:  
1:  struct virtio_driver {
1: -	struct device_driver driver;
1: -	const struct virtio_device_id *id_table;
1: -	const unsigned int *feature_table;
1: -	unsigned int feature_table_size;
1: -	const unsigned int *feature_table_legacy;
1: -	unsigned int feature_table_size_legacy;
1: -	int (*validate)(struct virtio_device *);
1: -	int (*probe)(struct virtio_device *);
1: -	void (*scan)(struct virtio_device *);
1: -	void (*remove)(struct virtio_device *);
1: -	void (*config_changed)(struct virtio_device *);
1: -	int (*freeze)(struct virtio_device *);
1: -	int (*restore)(struct virtio_device *);
1: +  struct device_driver driver;
1: +  const struct virtio_device_id *id_table;
1: +  const unsigned int *feature_table;
1: +  unsigned int feature_table_size;
1: +  const unsigned int *feature_table_legacy;
1: +  unsigned int feature_table_size_legacy;
1: +  int (*validate)(struct virtio_device *);
1: +  int (*probe)(struct virtio_device *);
1: +  void (*scan)(struct virtio_device *);
1: +  void (*remove)(struct virtio_device *);
1: +  void (*config_changed)(struct virtio_device *);
1: +  int (*freeze)(struct virtio_device *);
1: +  int (*restore)(struct virtio_device *);
1:  };
1:  
1:  typedef __u16 __virtio16;
1: @@ -74604,29 +75652,29 @@ typedef __u32 __virtio32;
1:  typedef __u64 __virtio64;
1:  
1:  struct vring_desc {
1: -	__virtio64 addr;
1: -	__virtio32 len;
1: -	__virtio16 flags;
1: -	__virtio16 next;
1: +  __virtio64 addr;
1: +  __virtio32 len;
1: +  __virtio16 flags;
1: +  __virtio16 next;
1:  };
1:  
1:  struct vring_avail {
1: -	__virtio16 flags;
1: -	__virtio16 idx;
1: -	__virtio16 ring[0];
1: +  __virtio16 flags;
1: +  __virtio16 idx;
1: +  __virtio16 ring[0];
1:  };
1:  
1:  struct vring_used_elem {
1: -	__virtio32 id;
1: -	__virtio32 len;
1: +  __virtio32 id;
1: +  __virtio32 len;
1:  };
1:  
1:  typedef struct vring_used_elem vring_used_elem_t;
1:  
1:  struct vring_used {
1: -	__virtio16 flags;
1: -	__virtio16 idx;
1: -	vring_used_elem_t ring[0];
1: +  __virtio16 flags;
1: +  __virtio16 idx;
1: +  vring_used_elem_t ring[0];
1:  };
1:  
1:  typedef struct vring_desc vring_desc_t;
1: @@ -74636,434 +75684,437 @@ typedef struct vring_avail vring_avail_t;
1:  typedef struct vring_used vring_used_t;
1:  
1:  struct vring {
1: -	unsigned int num;
1: -	vring_desc_t *desc;
1: -	vring_avail_t *avail;
1: -	vring_used_t *used;
1: +  unsigned int num;
1: +  vring_desc_t *desc;
1: +  vring_avail_t *avail;
1: +  vring_used_t *used;
1:  };
1:  
1:  struct vring_packed_desc_event {
1: -	__le16 off_wrap;
1: -	__le16 flags;
1: +  __le16 off_wrap;
1: +  __le16 flags;
1:  };
1:  
1:  struct vring_packed_desc {
1: -	__le64 addr;
1: -	__le32 len;
1: -	__le16 id;
1: -	__le16 flags;
1: +  __le64 addr;
1: +  __le32 len;
1: +  __le16 id;
1: +  __le16 flags;
1:  };
1:  
1:  struct vring_desc_state_split {
1: -	void *data;
1: -	struct vring_desc *indir_desc;
1: +  void *data;
1: +  struct vring_desc *indir_desc;
1:  };
1:  
1:  struct vring_desc_state_packed {
1: -	void *data;
1: -	struct vring_packed_desc *indir_desc;
1: -	u16 num;
1: -	u16 next;
1: -	u16 last;
1: +  void *data;
1: +  struct vring_packed_desc *indir_desc;
1: +  u16 num;
1: +  u16 next;
1: +  u16 last;
1:  };
1:  
1:  struct vring_desc_extra_packed {
1: -	dma_addr_t addr;
1: -	u32 len;
1: -	u16 flags;
1: +  dma_addr_t addr;
1: +  u32 len;
1: +  u16 flags;
1:  };
1:  
1:  struct vring_virtqueue {
1: -	struct virtqueue vq;
1: -	bool packed_ring;
1: -	bool use_dma_api;
1: -	bool weak_barriers;
1: -	bool broken;
1: -	bool indirect;
1: -	bool event;
1: -	unsigned int free_head;
1: -	unsigned int num_added;
1: -	u16 last_used_idx;
1: -	union {
1: -		struct {
1: -			struct vring vring;
1: -			u16 avail_flags_shadow;
1: -			u16 avail_idx_shadow;
1: -			struct vring_desc_state_split *desc_state;
1: -			dma_addr_t queue_dma_addr;
1: -			size_t queue_size_in_bytes;
1: -		} split;
1: -		struct {
1: -			struct {
1: -				unsigned int num;
1: -				struct vring_packed_desc *desc;
1: -				struct vring_packed_desc_event *driver;
1: -				struct vring_packed_desc_event *device;
1: -			} vring;
1: -			bool avail_wrap_counter;
1: -			bool used_wrap_counter;
1: -			u16 avail_used_flags;
1: -			u16 next_avail_idx;
1: -			u16 event_flags_shadow;
1: -			struct vring_desc_state_packed *desc_state;
1: -			struct vring_desc_extra_packed *desc_extra;
1: -			dma_addr_t ring_dma_addr;
1: -			dma_addr_t driver_event_dma_addr;
1: -			dma_addr_t device_event_dma_addr;
1: -			size_t ring_size_in_bytes;
1: -			size_t event_size_in_bytes;
1: -		} packed;
1: -	};
1: -	bool (*notify)(struct virtqueue *);
1: -	bool we_own_ring;
1: +  struct virtqueue vq;
1: +  bool packed_ring;
1: +  bool use_dma_api;
1: +  bool weak_barriers;
1: +  bool broken;
1: +  bool indirect;
1: +  bool event;
1: +  unsigned int free_head;
1: +  unsigned int num_added;
1: +  u16 last_used_idx;
1: +  union {
1: +    struct {
1: +      struct vring vring;
1: +      u16 avail_flags_shadow;
1: +      u16 avail_idx_shadow;
1: +      struct vring_desc_state_split *desc_state;
1: +      dma_addr_t queue_dma_addr;
1: +      size_t queue_size_in_bytes;
1: +    } split;
1: +    struct {
1: +      struct {
1: +        unsigned int num;
1: +        struct vring_packed_desc *desc;
1: +        struct vring_packed_desc_event *driver;
1: +        struct vring_packed_desc_event *device;
1: +      } vring;
1: +      bool avail_wrap_counter;
1: +      bool used_wrap_counter;
1: +      u16 avail_used_flags;
1: +      u16 next_avail_idx;
1: +      u16 event_flags_shadow;
1: +      struct vring_desc_state_packed *desc_state;
1: +      struct vring_desc_extra_packed *desc_extra;
1: +      dma_addr_t ring_dma_addr;
1: +      dma_addr_t driver_event_dma_addr;
1: +      dma_addr_t device_event_dma_addr;
1: +      size_t ring_size_in_bytes;
1: +      size_t event_size_in_bytes;
1: +    } packed;
1: +  };
1: +  bool (*notify)(struct virtqueue *);
1: +  bool we_own_ring;
1:  };
1:  
1:  struct virtio_pci_common_cfg {
1: -	__le32 device_feature_select;
1: -	__le32 device_feature;
1: -	__le32 guest_feature_select;
1: -	__le32 guest_feature;
1: -	__le16 msix_config;
1: -	__le16 num_queues;
1: -	__u8 device_status;
1: -	__u8 config_generation;
1: -	__le16 queue_select;
1: -	__le16 queue_size;
1: -	__le16 queue_msix_vector;
1: -	__le16 queue_enable;
1: -	__le16 queue_notify_off;
1: -	__le32 queue_desc_lo;
1: -	__le32 queue_desc_hi;
1: -	__le32 queue_avail_lo;
1: -	__le32 queue_avail_hi;
1: -	__le32 queue_used_lo;
1: -	__le32 queue_used_hi;
1: +  __le32 device_feature_select;
1: +  __le32 device_feature;
1: +  __le32 guest_feature_select;
1: +  __le32 guest_feature;
1: +  __le16 msix_config;
1: +  __le16 num_queues;
1: +  __u8 device_status;
1: +  __u8 config_generation;
1: +  __le16 queue_select;
1: +  __le16 queue_size;
1: +  __le16 queue_msix_vector;
1: +  __le16 queue_enable;
1: +  __le16 queue_notify_off;
1: +  __le32 queue_desc_lo;
1: +  __le32 queue_desc_hi;
1: +  __le32 queue_avail_lo;
1: +  __le32 queue_avail_hi;
1: +  __le32 queue_used_lo;
1: +  __le32 queue_used_hi;
1:  };
1:  
1:  struct virtio_pci_vq_info {
1: -	struct virtqueue *vq;
1: -	struct list_head node;
1: -	unsigned int msix_vector;
1: +  struct virtqueue *vq;
1: +  struct list_head node;
1: +  unsigned int msix_vector;
1:  };
1:  
1:  struct virtio_pci_device {
1: -	struct virtio_device vdev;
1: -	struct pci_dev *pci_dev;
1: -	u8 *isr;
1: -	struct virtio_pci_common_cfg *common;
1: -	void *device;
1: -	void *notify_base;
1: -	size_t notify_len;
1: -	size_t device_len;
1: -	int notify_map_cap;
1: -	u32 notify_offset_multiplier;
1: -	int modern_bars;
1: -	void *ioaddr;
1: -	spinlock_t lock;
1: -	struct list_head virtqueues;
1: -	struct virtio_pci_vq_info **vqs;
1: -	int msix_enabled;
1: -	int intx_enabled;
1: -	cpumask_var_t *msix_affinity_masks;
1: -	char (*msix_names)[256];
1: -	unsigned int msix_vectors;
1: -	unsigned int msix_used_vectors;
1: -	bool per_vq_vectors;
1: -	struct virtqueue * (*setup_vq)(struct virtio_pci_device *, struct virtio_pci_vq_info *, unsigned int, void (*)(struct virtqueue *), const char *, bool, u16);
1: -	void (*del_vq)(struct virtio_pci_vq_info *);
1: -	u16 (*config_vector)(struct virtio_pci_device *, u16);
1: -};
1: -
1: -enum {
1: -	VP_MSIX_CONFIG_VECTOR = 0,
1: -	VP_MSIX_VQ_VECTOR = 1,
1: +  struct virtio_device vdev;
1: +  struct pci_dev *pci_dev;
1: +  u8 *isr;
1: +  struct virtio_pci_common_cfg *common;
1: +  void *device;
1: +  void *notify_base;
1: +  size_t notify_len;
1: +  size_t device_len;
1: +  int notify_map_cap;
1: +  u32 notify_offset_multiplier;
1: +  int modern_bars;
1: +  void *ioaddr;
1: +  spinlock_t lock;
1: +  struct list_head virtqueues;
1: +  struct virtio_pci_vq_info **vqs;
1: +  int msix_enabled;
1: +  int intx_enabled;
1: +  cpumask_var_t *msix_affinity_masks;
1: +  char (*msix_names)[256];
1: +  unsigned int msix_vectors;
1: +  unsigned int msix_used_vectors;
1: +  bool per_vq_vectors;
1: +  struct virtqueue *(*setup_vq)(struct virtio_pci_device *,
1: +                                struct virtio_pci_vq_info *, unsigned int,
1: +                                void (*)(struct virtqueue *), const char *,
1: +                                bool, u16);
1: +  void (*del_vq)(struct virtio_pci_vq_info *);
1: +  u16 (*config_vector)(struct virtio_pci_device *, u16);
1: +};
1: +
1: +enum {
1: +  VP_MSIX_CONFIG_VECTOR = 0,
1: +  VP_MSIX_VQ_VECTOR = 1,
1:  };
1:  
1:  struct virtio_balloon_config {
1: -	__le32 num_pages;
1: -	__le32 actual;
1: -	union {
1: -		__le32 free_page_hint_cmd_id;
1: -		__le32 free_page_report_cmd_id;
1: -	};
1: -	__le32 poison_val;
1: +  __le32 num_pages;
1: +  __le32 actual;
1: +  union {
1: +    __le32 free_page_hint_cmd_id;
1: +    __le32 free_page_report_cmd_id;
1: +  };
1: +  __le32 poison_val;
1:  };
1:  
1:  struct virtio_balloon_stat {
1: -	__virtio16 tag;
1: -	__virtio64 val;
1: +  __virtio16 tag;
1: +  __virtio64 val;
1:  } __attribute__((packed));
1:  
1:  enum virtio_balloon_vq {
1: -	VIRTIO_BALLOON_VQ_INFLATE = 0,
1: -	VIRTIO_BALLOON_VQ_DEFLATE = 1,
1: -	VIRTIO_BALLOON_VQ_STATS = 2,
1: -	VIRTIO_BALLOON_VQ_FREE_PAGE = 3,
1: -	VIRTIO_BALLOON_VQ_REPORTING = 4,
1: -	VIRTIO_BALLOON_VQ_MAX = 5,
1: +  VIRTIO_BALLOON_VQ_INFLATE = 0,
1: +  VIRTIO_BALLOON_VQ_DEFLATE = 1,
1: +  VIRTIO_BALLOON_VQ_STATS = 2,
1: +  VIRTIO_BALLOON_VQ_FREE_PAGE = 3,
1: +  VIRTIO_BALLOON_VQ_REPORTING = 4,
1: +  VIRTIO_BALLOON_VQ_MAX = 5,
1:  };
1:  
1:  enum virtio_balloon_config_read {
1: -	VIRTIO_BALLOON_CONFIG_READ_CMD_ID = 0,
1: +  VIRTIO_BALLOON_CONFIG_READ_CMD_ID = 0,
1:  };
1:  
1:  struct virtio_balloon {
1: -	struct virtio_device *vdev;
1: -	struct virtqueue *inflate_vq;
1: -	struct virtqueue *deflate_vq;
1: -	struct virtqueue *stats_vq;
1: -	struct virtqueue *free_page_vq;
1: -	struct workqueue_struct *balloon_wq;
1: -	struct work_struct report_free_page_work;
1: -	struct work_struct update_balloon_stats_work;
1: -	struct work_struct update_balloon_size_work;
1: -	spinlock_t stop_update_lock;
1: -	bool stop_update;
1: -	long: 56;
1: -	long unsigned int config_read_bitmap;
1: -	struct list_head free_page_list;
1: -	spinlock_t free_page_list_lock;
1: -	long unsigned int num_free_page_blocks;
1: -	u32 cmd_id_received_cache;
1: -	__virtio32 cmd_id_active;
1: -	__virtio32 cmd_id_stop;
1: -	int: 32;
1: -	wait_queue_head_t acked;
1: -	unsigned int num_pages;
1: -	int: 32;
1: -	struct balloon_dev_info vb_dev_info;
1: -	struct mutex balloon_lock;
1: -	unsigned int num_pfns;
1: -	__virtio32 pfns[256];
1: -	struct virtio_balloon_stat stats[10];
1: -	struct shrinker shrinker;
1: -	struct notifier_block oom_nb;
1: -	struct virtqueue *reporting_vq;
1: -	struct page_reporting_dev_info pr_dev_info;
1: +  struct virtio_device *vdev;
1: +  struct virtqueue *inflate_vq;
1: +  struct virtqueue *deflate_vq;
1: +  struct virtqueue *stats_vq;
1: +  struct virtqueue *free_page_vq;
1: +  struct workqueue_struct *balloon_wq;
1: +  struct work_struct report_free_page_work;
1: +  struct work_struct update_balloon_stats_work;
1: +  struct work_struct update_balloon_size_work;
1: +  spinlock_t stop_update_lock;
1: +  bool stop_update;
1: +  long : 56;
1: +  long unsigned int config_read_bitmap;
1: +  struct list_head free_page_list;
1: +  spinlock_t free_page_list_lock;
1: +  long unsigned int num_free_page_blocks;
1: +  u32 cmd_id_received_cache;
1: +  __virtio32 cmd_id_active;
1: +  __virtio32 cmd_id_stop;
1: +  int : 32;
1: +  wait_queue_head_t acked;
1: +  unsigned int num_pages;
1: +  int : 32;
1: +  struct balloon_dev_info vb_dev_info;
1: +  struct mutex balloon_lock;
1: +  unsigned int num_pfns;
1: +  __virtio32 pfns[256];
1: +  struct virtio_balloon_stat stats[10];
1: +  struct shrinker shrinker;
1: +  struct notifier_block oom_nb;
1: +  struct virtqueue *reporting_vq;
1: +  struct page_reporting_dev_info pr_dev_info;
1:  } __attribute__((packed));
1:  
1:  struct serial_struct32 {
1: -	compat_int_t type;
1: -	compat_int_t line;
1: -	compat_uint_t port;
1: -	compat_int_t irq;
1: -	compat_int_t flags;
1: -	compat_int_t xmit_fifo_size;
1: -	compat_int_t custom_divisor;
1: -	compat_int_t baud_base;
1: -	short unsigned int close_delay;
1: -	char io_type;
1: -	char reserved_char;
1: -	compat_int_t hub6;
1: -	short unsigned int closing_wait;
1: -	short unsigned int closing_wait2;
1: -	compat_uint_t iomem_base;
1: -	short unsigned int iomem_reg_shift;
1: -	unsigned int port_high;
1: -	compat_int_t reserved;
1: +  compat_int_t type;
1: +  compat_int_t line;
1: +  compat_uint_t port;
1: +  compat_int_t irq;
1: +  compat_int_t flags;
1: +  compat_int_t xmit_fifo_size;
1: +  compat_int_t custom_divisor;
1: +  compat_int_t baud_base;
1: +  short unsigned int close_delay;
1: +  char io_type;
1: +  char reserved_char;
1: +  compat_int_t hub6;
1: +  short unsigned int closing_wait;
1: +  short unsigned int closing_wait2;
1: +  compat_uint_t iomem_base;
1: +  short unsigned int iomem_reg_shift;
1: +  unsigned int port_high;
1: +  compat_int_t reserved;
1:  };
1:  
1:  struct n_tty_data {
1: -	size_t read_head;
1: -	size_t commit_head;
1: -	size_t canon_head;
1: -	size_t echo_head;
1: -	size_t echo_commit;
1: -	size_t echo_mark;
1: -	long unsigned int char_map[4];
1: -	long unsigned int overrun_time;
1: -	int num_overrun;
1: -	bool no_room;
1: -	unsigned char lnext: 1;
1: -	unsigned char erasing: 1;
1: -	unsigned char raw: 1;
1: -	unsigned char real_raw: 1;
1: -	unsigned char icanon: 1;
1: -	unsigned char push: 1;
1: -	char read_buf[4096];
1: -	long unsigned int read_flags[64];
1: -	unsigned char echo_buf[4096];
1: -	size_t read_tail;
1: -	size_t line_start;
1: -	unsigned int column;
1: -	unsigned int canon_column;
1: -	size_t echo_tail;
1: -	struct mutex atomic_read_lock;
1: -	struct mutex output_lock;
1: -};
1: -
1: -enum {
1: -	ERASE = 0,
1: -	WERASE = 1,
1: -	KILL = 2,
1: +  size_t read_head;
1: +  size_t commit_head;
1: +  size_t canon_head;
1: +  size_t echo_head;
1: +  size_t echo_commit;
1: +  size_t echo_mark;
1: +  long unsigned int char_map[4];
1: +  long unsigned int overrun_time;
1: +  int num_overrun;
1: +  bool no_room;
1: +  unsigned char lnext : 1;
1: +  unsigned char erasing : 1;
1: +  unsigned char raw : 1;
1: +  unsigned char real_raw : 1;
1: +  unsigned char icanon : 1;
1: +  unsigned char push : 1;
1: +  char read_buf[4096];
1: +  long unsigned int read_flags[64];
1: +  unsigned char echo_buf[4096];
1: +  size_t read_tail;
1: +  size_t line_start;
1: +  unsigned int column;
1: +  unsigned int canon_column;
1: +  size_t echo_tail;
1: +  struct mutex atomic_read_lock;
1: +  struct mutex output_lock;
1: +};
1: +
1: +enum {
1: +  ERASE = 0,
1: +  WERASE = 1,
1: +  KILL = 2,
1:  };
1:  
1:  struct termios {
1: -	tcflag_t c_iflag;
1: -	tcflag_t c_oflag;
1: -	tcflag_t c_cflag;
1: -	tcflag_t c_lflag;
1: -	cc_t c_line;
1: -	cc_t c_cc[19];
1: +  tcflag_t c_iflag;
1: +  tcflag_t c_oflag;
1: +  tcflag_t c_cflag;
1: +  tcflag_t c_lflag;
1: +  cc_t c_line;
1: +  cc_t c_cc[19];
1:  };
1:  
1:  struct termios2 {
1: -	tcflag_t c_iflag;
1: -	tcflag_t c_oflag;
1: -	tcflag_t c_cflag;
1: -	tcflag_t c_lflag;
1: -	cc_t c_line;
1: -	cc_t c_cc[19];
1: -	speed_t c_ispeed;
1: -	speed_t c_ospeed;
1: +  tcflag_t c_iflag;
1: +  tcflag_t c_oflag;
1: +  tcflag_t c_cflag;
1: +  tcflag_t c_lflag;
1: +  cc_t c_line;
1: +  cc_t c_cc[19];
1: +  speed_t c_ispeed;
1: +  speed_t c_ospeed;
1:  };
1:  
1:  struct termio {
1: -	short unsigned int c_iflag;
1: -	short unsigned int c_oflag;
1: -	short unsigned int c_cflag;
1: -	short unsigned int c_lflag;
1: -	unsigned char c_line;
1: -	unsigned char c_cc[8];
1: +  short unsigned int c_iflag;
1: +  short unsigned int c_oflag;
1: +  short unsigned int c_cflag;
1: +  short unsigned int c_lflag;
1: +  unsigned char c_line;
1: +  unsigned char c_cc[8];
1:  };
1:  
1:  struct ldsem_waiter {
1: -	struct list_head list;
1: -	struct task_struct *task;
1: +  struct list_head list;
1: +  struct task_struct *task;
1:  };
1:  
1:  struct pts_fs_info___2;
1:  
1:  struct tty_audit_buf {
1: -	struct mutex mutex;
1: -	dev_t dev;
1: -	unsigned int icanon: 1;
1: -	size_t valid;
1: -	unsigned char *data;
1: +  struct mutex mutex;
1: +  dev_t dev;
1: +  unsigned int icanon : 1;
1: +  size_t valid;
1: +  unsigned char *data;
1:  };
1:  
1:  struct input_id {
1: -	__u16 bustype;
1: -	__u16 vendor;
1: -	__u16 product;
1: -	__u16 version;
1: +  __u16 bustype;
1: +  __u16 vendor;
1: +  __u16 product;
1: +  __u16 version;
1:  };
1:  
1:  struct input_absinfo {
1: -	__s32 value;
1: -	__s32 minimum;
1: -	__s32 maximum;
1: -	__s32 fuzz;
1: -	__s32 flat;
1: -	__s32 resolution;
1: +  __s32 value;
1: +  __s32 minimum;
1: +  __s32 maximum;
1: +  __s32 fuzz;
1: +  __s32 flat;
1: +  __s32 resolution;
1:  };
1:  
1:  struct input_keymap_entry {
1: -	__u8 flags;
1: -	__u8 len;
1: -	__u16 index;
1: -	__u32 keycode;
1: -	__u8 scancode[32];
1: +  __u8 flags;
1: +  __u8 len;
1: +  __u16 index;
1: +  __u32 keycode;
1: +  __u8 scancode[32];
1:  };
1:  
1:  struct ff_replay {
1: -	__u16 length;
1: -	__u16 delay;
1: +  __u16 length;
1: +  __u16 delay;
1:  };
1:  
1:  struct ff_trigger {
1: -	__u16 button;
1: -	__u16 interval;
1: +  __u16 button;
1: +  __u16 interval;
1:  };
1:  
1:  struct ff_envelope {
1: -	__u16 attack_length;
1: -	__u16 attack_level;
1: -	__u16 fade_length;
1: -	__u16 fade_level;
1: +  __u16 attack_length;
1: +  __u16 attack_level;
1: +  __u16 fade_length;
1: +  __u16 fade_level;
1:  };
1:  
1:  struct ff_constant_effect {
1: -	__s16 level;
1: -	struct ff_envelope envelope;
1: +  __s16 level;
1: +  struct ff_envelope envelope;
1:  };
1:  
1:  struct ff_ramp_effect {
1: -	__s16 start_level;
1: -	__s16 end_level;
1: -	struct ff_envelope envelope;
1: +  __s16 start_level;
1: +  __s16 end_level;
1: +  struct ff_envelope envelope;
1:  };
1:  
1:  struct ff_condition_effect {
1: -	__u16 right_saturation;
1: -	__u16 left_saturation;
1: -	__s16 right_coeff;
1: -	__s16 left_coeff;
1: -	__u16 deadband;
1: -	__s16 center;
1: +  __u16 right_saturation;
1: +  __u16 left_saturation;
1: +  __s16 right_coeff;
1: +  __s16 left_coeff;
1: +  __u16 deadband;
1: +  __s16 center;
1:  };
1:  
1:  struct ff_periodic_effect {
1: -	__u16 waveform;
1: -	__u16 period;
1: -	__s16 magnitude;
1: -	__s16 offset;
1: -	__u16 phase;
1: -	struct ff_envelope envelope;
1: -	__u32 custom_len;
1: -	__s16 *custom_data;
1: +  __u16 waveform;
1: +  __u16 period;
1: +  __s16 magnitude;
1: +  __s16 offset;
1: +  __u16 phase;
1: +  struct ff_envelope envelope;
1: +  __u32 custom_len;
1: +  __s16 *custom_data;
1:  };
1:  
1:  struct ff_rumble_effect {
1: -	__u16 strong_magnitude;
1: -	__u16 weak_magnitude;
1: +  __u16 strong_magnitude;
1: +  __u16 weak_magnitude;
1:  };
1:  
1:  struct ff_effect {
1: -	__u16 type;
1: -	__s16 id;
1: -	__u16 direction;
1: -	struct ff_trigger trigger;
1: -	struct ff_replay replay;
1: -	union {
1: -		struct ff_constant_effect constant;
1: -		struct ff_ramp_effect ramp;
1: -		struct ff_periodic_effect periodic;
1: -		struct ff_condition_effect condition[2];
1: -		struct ff_rumble_effect rumble;
1: -	} u;
1: +  __u16 type;
1: +  __s16 id;
1: +  __u16 direction;
1: +  struct ff_trigger trigger;
1: +  struct ff_replay replay;
1: +  union {
1: +    struct ff_constant_effect constant;
1: +    struct ff_ramp_effect ramp;
1: +    struct ff_periodic_effect periodic;
1: +    struct ff_condition_effect condition[2];
1: +    struct ff_rumble_effect rumble;
1: +  } u;
1:  };
1:  
1:  struct input_device_id {
1: -	kernel_ulong_t flags;
1: -	__u16 bustype;
1: -	__u16 vendor;
1: -	__u16 product;
1: -	__u16 version;
1: -	kernel_ulong_t evbit[1];
1: -	kernel_ulong_t keybit[12];
1: -	kernel_ulong_t relbit[1];
1: -	kernel_ulong_t absbit[1];
1: -	kernel_ulong_t mscbit[1];
1: -	kernel_ulong_t ledbit[1];
1: -	kernel_ulong_t sndbit[1];
1: -	kernel_ulong_t ffbit[2];
1: -	kernel_ulong_t swbit[1];
1: -	kernel_ulong_t propbit[1];
1: -	kernel_ulong_t driver_info;
1: +  kernel_ulong_t flags;
1: +  __u16 bustype;
1: +  __u16 vendor;
1: +  __u16 product;
1: +  __u16 version;
1: +  kernel_ulong_t evbit[1];
1: +  kernel_ulong_t keybit[12];
1: +  kernel_ulong_t relbit[1];
1: +  kernel_ulong_t absbit[1];
1: +  kernel_ulong_t mscbit[1];
1: +  kernel_ulong_t ledbit[1];
1: +  kernel_ulong_t sndbit[1];
1: +  kernel_ulong_t ffbit[2];
1: +  kernel_ulong_t swbit[1];
1: +  kernel_ulong_t propbit[1];
1: +  kernel_ulong_t driver_info;
1:  };
1:  
1:  struct input_value {
1: -	__u16 type;
1: -	__u16 code;
1: -	__s32 value;
1: +  __u16 type;
1: +  __u16 code;
1: +  __s32 value;
1:  };
1:  
1:  enum input_clock_type {
1: -	INPUT_CLK_REAL = 0,
1: -	INPUT_CLK_MONO = 1,
1: -	INPUT_CLK_BOOT = 2,
1: -	INPUT_CLK_MAX = 3,
1: +  INPUT_CLK_REAL = 0,
1: +  INPUT_CLK_MONO = 1,
1: +  INPUT_CLK_BOOT = 2,
1: +  INPUT_CLK_MAX = 3,
1:  };
1:  
1:  struct ff_device;
1: @@ -75075,301 +76126,304 @@ struct input_mt;
1:  struct input_handle;
1:  
1:  struct input_dev {
1: -	const char *name;
1: -	const char *phys;
1: -	const char *uniq;
1: -	struct input_id id;
1: -	long unsigned int propbit[1];
1: -	long unsigned int evbit[1];
1: -	long unsigned int keybit[12];
1: -	long unsigned int relbit[1];
1: -	long unsigned int absbit[1];
1: -	long unsigned int mscbit[1];
1: -	long unsigned int ledbit[1];
1: -	long unsigned int sndbit[1];
1: -	long unsigned int ffbit[2];
1: -	long unsigned int swbit[1];
1: -	unsigned int hint_events_per_packet;
1: -	unsigned int keycodemax;
1: -	unsigned int keycodesize;
1: -	void *keycode;
1: -	int (*setkeycode)(struct input_dev *, const struct input_keymap_entry *, unsigned int *);
1: -	int (*getkeycode)(struct input_dev *, struct input_keymap_entry *);
1: -	struct ff_device *ff;
1: -	struct input_dev_poller *poller;
1: -	unsigned int repeat_key;
1: -	struct timer_list timer;
1: -	int rep[2];
1: -	struct input_mt *mt;
1: -	struct input_absinfo *absinfo;
1: -	long unsigned int key[12];
1: -	long unsigned int led[1];
1: -	long unsigned int snd[1];
1: -	long unsigned int sw[1];
1: -	int (*open)(struct input_dev *);
1: -	void (*close)(struct input_dev *);
1: -	int (*flush)(struct input_dev *, struct file *);
1: -	int (*event)(struct input_dev *, unsigned int, unsigned int, int);
1: -	struct input_handle *grab;
1: -	spinlock_t event_lock;
1: -	struct mutex mutex;
1: -	unsigned int users;
1: -	bool going_away;
1: -	struct device dev;
1: -	struct list_head h_list;
1: -	struct list_head node;
1: -	unsigned int num_vals;
1: -	unsigned int max_vals;
1: -	struct input_value *vals;
1: -	bool devres_managed;
1: -	ktime_t timestamp[3];
1: +  const char *name;
1: +  const char *phys;
1: +  const char *uniq;
1: +  struct input_id id;
1: +  long unsigned int propbit[1];
1: +  long unsigned int evbit[1];
1: +  long unsigned int keybit[12];
1: +  long unsigned int relbit[1];
1: +  long unsigned int absbit[1];
1: +  long unsigned int mscbit[1];
1: +  long unsigned int ledbit[1];
1: +  long unsigned int sndbit[1];
1: +  long unsigned int ffbit[2];
1: +  long unsigned int swbit[1];
1: +  unsigned int hint_events_per_packet;
1: +  unsigned int keycodemax;
1: +  unsigned int keycodesize;
1: +  void *keycode;
1: +  int (*setkeycode)(struct input_dev *, const struct input_keymap_entry *,
1: +                    unsigned int *);
1: +  int (*getkeycode)(struct input_dev *, struct input_keymap_entry *);
1: +  struct ff_device *ff;
1: +  struct input_dev_poller *poller;
1: +  unsigned int repeat_key;
1: +  struct timer_list timer;
1: +  int rep[2];
1: +  struct input_mt *mt;
1: +  struct input_absinfo *absinfo;
1: +  long unsigned int key[12];
1: +  long unsigned int led[1];
1: +  long unsigned int snd[1];
1: +  long unsigned int sw[1];
1: +  int (*open)(struct input_dev *);
1: +  void (*close)(struct input_dev *);
1: +  int (*flush)(struct input_dev *, struct file *);
1: +  int (*event)(struct input_dev *, unsigned int, unsigned int, int);
1: +  struct input_handle *grab;
1: +  spinlock_t event_lock;
1: +  struct mutex mutex;
1: +  unsigned int users;
1: +  bool going_away;
1: +  struct device dev;
1: +  struct list_head h_list;
1: +  struct list_head node;
1: +  unsigned int num_vals;
1: +  unsigned int max_vals;
1: +  struct input_value *vals;
1: +  bool devres_managed;
1: +  ktime_t timestamp[3];
1:  };
1:  
1:  struct ff_device {
1: -	int (*upload)(struct input_dev *, struct ff_effect *, struct ff_effect *);
1: -	int (*erase)(struct input_dev *, int);
1: -	int (*playback)(struct input_dev *, int, int);
1: -	void (*set_gain)(struct input_dev *, u16);
1: -	void (*set_autocenter)(struct input_dev *, u16);
1: -	void (*destroy)(struct ff_device *);
1: -	void *private;
1: -	long unsigned int ffbit[2];
1: -	struct mutex mutex;
1: -	int max_effects;
1: -	struct ff_effect *effects;
1: -	struct file *effect_owners[0];
1: +  int (*upload)(struct input_dev *, struct ff_effect *, struct ff_effect *);
1: +  int (*erase)(struct input_dev *, int);
1: +  int (*playback)(struct input_dev *, int, int);
1: +  void (*set_gain)(struct input_dev *, u16);
1: +  void (*set_autocenter)(struct input_dev *, u16);
1: +  void (*destroy)(struct ff_device *);
1: +  void *private;
1: +  long unsigned int ffbit[2];
1: +  struct mutex mutex;
1: +  int max_effects;
1: +  struct ff_effect *effects;
1: +  struct file *effect_owners[0];
1:  };
1:  
1:  struct input_handler;
1:  
1:  struct input_handle {
1: -	void *private;
1: -	int open;
1: -	const char *name;
1: -	struct input_dev *dev;
1: -	struct input_handler *handler;
1: -	struct list_head d_node;
1: -	struct list_head h_node;
1: +  void *private;
1: +  int open;
1: +  const char *name;
1: +  struct input_dev *dev;
1: +  struct input_handler *handler;
1: +  struct list_head d_node;
1: +  struct list_head h_node;
1:  };
1:  
1:  struct input_handler {
1: -	void *private;
1: -	void (*event)(struct input_handle *, unsigned int, unsigned int, int);
1: -	void (*events)(struct input_handle *, const struct input_value *, unsigned int);
1: -	bool (*filter)(struct input_handle *, unsigned int, unsigned int, int);
1: -	bool (*match)(struct input_handler *, struct input_dev *);
1: -	int (*connect)(struct input_handler *, struct input_dev *, const struct input_device_id *);
1: -	void (*disconnect)(struct input_handle *);
1: -	void (*start)(struct input_handle *);
1: -	bool legacy_minors;
1: -	int minor;
1: -	const char *name;
1: -	const struct input_device_id *id_table;
1: -	struct list_head h_list;
1: -	struct list_head node;
1: +  void *private;
1: +  void (*event)(struct input_handle *, unsigned int, unsigned int, int);
1: +  void (*events)(struct input_handle *, const struct input_value *,
1: +                 unsigned int);
1: +  bool (*filter)(struct input_handle *, unsigned int, unsigned int, int);
1: +  bool (*match)(struct input_handler *, struct input_dev *);
1: +  int (*connect)(struct input_handler *, struct input_dev *,
1: +                 const struct input_device_id *);
1: +  void (*disconnect)(struct input_handle *);
1: +  void (*start)(struct input_handle *);
1: +  bool legacy_minors;
1: +  int minor;
1: +  const char *name;
1: +  const struct input_device_id *id_table;
1: +  struct list_head h_list;
1: +  struct list_head node;
1:  };
1:  
1:  struct sysrq_state {
1: -	struct input_handle handle;
1: -	struct work_struct reinject_work;
1: -	long unsigned int key_down[12];
1: -	unsigned int alt;
1: -	unsigned int alt_use;
1: -	unsigned int shift;
1: -	unsigned int shift_use;
1: -	bool active;
1: -	bool need_reinject;
1: -	bool reinjecting;
1: -	bool reset_canceled;
1: -	bool reset_requested;
1: -	long unsigned int reset_keybit[12];
1: -	int reset_seq_len;
1: -	int reset_seq_cnt;
1: -	int reset_seq_version;
1: -	struct timer_list keyreset_timer;
1: +  struct input_handle handle;
1: +  struct work_struct reinject_work;
1: +  long unsigned int key_down[12];
1: +  unsigned int alt;
1: +  unsigned int alt_use;
1: +  unsigned int shift;
1: +  unsigned int shift_use;
1: +  bool active;
1: +  bool need_reinject;
1: +  bool reinjecting;
1: +  bool reset_canceled;
1: +  bool reset_requested;
1: +  long unsigned int reset_keybit[12];
1: +  int reset_seq_len;
1: +  int reset_seq_cnt;
1: +  int reset_seq_version;
1: +  struct timer_list keyreset_timer;
1:  };
1:  
1:  struct consolefontdesc {
1: -	short unsigned int charcount;
1: -	short unsigned int charheight;
1: -	char *chardata;
1: +  short unsigned int charcount;
1: +  short unsigned int charheight;
1: +  char *chardata;
1:  };
1:  
1:  struct unipair {
1: -	short unsigned int unicode;
1: -	short unsigned int fontpos;
1: +  short unsigned int unicode;
1: +  short unsigned int fontpos;
1:  };
1:  
1:  struct unimapdesc {
1: -	short unsigned int entry_ct;
1: -	struct unipair *entries;
1: +  short unsigned int entry_ct;
1: +  struct unipair *entries;
1:  };
1:  
1:  struct kbd_repeat {
1: -	int delay;
1: -	int period;
1: +  int delay;
1: +  int period;
1:  };
1:  
1:  struct console_font_op {
1: -	unsigned int op;
1: -	unsigned int flags;
1: -	unsigned int width;
1: -	unsigned int height;
1: -	unsigned int charcount;
1: -	unsigned char *data;
1: +  unsigned int op;
1: +  unsigned int flags;
1: +  unsigned int width;
1: +  unsigned int height;
1: +  unsigned int charcount;
1: +  unsigned char *data;
1:  };
1:  
1:  struct vt_stat {
1: -	short unsigned int v_active;
1: -	short unsigned int v_signal;
1: -	short unsigned int v_state;
1: +  short unsigned int v_active;
1: +  short unsigned int v_signal;
1: +  short unsigned int v_state;
1:  };
1:  
1:  struct vt_sizes {
1: -	short unsigned int v_rows;
1: -	short unsigned int v_cols;
1: -	short unsigned int v_scrollsize;
1: +  short unsigned int v_rows;
1: +  short unsigned int v_cols;
1: +  short unsigned int v_scrollsize;
1:  };
1:  
1:  struct vt_consize {
1: -	short unsigned int v_rows;
1: -	short unsigned int v_cols;
1: -	short unsigned int v_vlin;
1: -	short unsigned int v_clin;
1: -	short unsigned int v_vcol;
1: -	short unsigned int v_ccol;
1: +  short unsigned int v_rows;
1: +  short unsigned int v_cols;
1: +  short unsigned int v_vlin;
1: +  short unsigned int v_clin;
1: +  short unsigned int v_vcol;
1: +  short unsigned int v_ccol;
1:  };
1:  
1:  struct vt_event {
1: -	unsigned int event;
1: -	unsigned int oldev;
1: -	unsigned int newev;
1: -	unsigned int pad[4];
1: +  unsigned int event;
1: +  unsigned int oldev;
1: +  unsigned int newev;
1: +  unsigned int pad[4];
1:  };
1:  
1:  struct vt_setactivate {
1: -	unsigned int console;
1: -	struct vt_mode mode;
1: +  unsigned int console;
1: +  struct vt_mode mode;
1:  };
1:  
1:  struct vt_spawn_console {
1: -	spinlock_t lock;
1: -	struct pid *pid;
1: -	int sig;
1: +  spinlock_t lock;
1: +  struct pid *pid;
1: +  int sig;
1:  };
1:  
1:  struct vt_event_wait {
1: -	struct list_head list;
1: -	struct vt_event event;
1: -	int done;
1: +  struct list_head list;
1: +  struct vt_event event;
1: +  int done;
1:  };
1:  
1:  struct compat_consolefontdesc {
1: -	short unsigned int charcount;
1: -	short unsigned int charheight;
1: -	compat_caddr_t chardata;
1: +  short unsigned int charcount;
1: +  short unsigned int charheight;
1: +  compat_caddr_t chardata;
1:  };
1:  
1:  struct compat_console_font_op {
1: -	compat_uint_t op;
1: -	compat_uint_t flags;
1: -	compat_uint_t width;
1: -	compat_uint_t height;
1: -	compat_uint_t charcount;
1: -	compat_caddr_t data;
1: +  compat_uint_t op;
1: +  compat_uint_t flags;
1: +  compat_uint_t width;
1: +  compat_uint_t height;
1: +  compat_uint_t charcount;
1: +  compat_caddr_t data;
1:  };
1:  
1:  struct compat_unimapdesc {
1: -	short unsigned int entry_ct;
1: -	compat_caddr_t entries;
1: +  short unsigned int entry_ct;
1: +  compat_caddr_t entries;
1:  };
1:  
1:  struct vt_notifier_param {
1: -	struct vc_data *vc;
1: -	unsigned int c;
1: +  struct vc_data *vc;
1: +  unsigned int c;
1:  };
1:  
1:  struct vcs_poll_data {
1: -	struct notifier_block notifier;
1: -	unsigned int cons_num;
1: -	int event;
1: -	wait_queue_head_t waitq;
1: -	struct fasync_struct *fasync;
1: +  struct notifier_block notifier;
1: +  unsigned int cons_num;
1: +  int event;
1: +  wait_queue_head_t waitq;
1: +  struct fasync_struct *fasync;
1:  };
1:  
1:  struct tiocl_selection {
1: -	short unsigned int xs;
1: -	short unsigned int ys;
1: -	short unsigned int xe;
1: -	short unsigned int ye;
1: -	short unsigned int sel_mode;
1: +  short unsigned int xs;
1: +  short unsigned int ys;
1: +  short unsigned int xe;
1: +  short unsigned int ye;
1: +  short unsigned int sel_mode;
1:  };
1:  
1:  struct vc_selection {
1: -	struct mutex lock;
1: -	struct vc_data *cons;
1: -	char *buffer;
1: -	unsigned int buf_len;
1: -	volatile int start;
1: -	int end;
1: +  struct mutex lock;
1: +  struct vc_data *cons;
1: +  char *buffer;
1: +  unsigned int buf_len;
1: +  volatile int start;
1: +  int end;
1:  };
1:  
1:  struct keyboard_notifier_param {
1: -	struct vc_data *vc;
1: -	int down;
1: -	int shift;
1: -	int ledstate;
1: -	unsigned int value;
1: +  struct vc_data *vc;
1: +  int down;
1: +  int shift;
1: +  int ledstate;
1: +  unsigned int value;
1:  };
1:  
1:  struct kbd_struct {
1: -	unsigned char lockstate;
1: -	unsigned char slockstate;
1: -	unsigned char ledmode: 1;
1: -	unsigned char ledflagstate: 4;
1: -	char: 3;
1: -	unsigned char default_ledflagstate: 4;
1: -	unsigned char kbdmode: 3;
1: -	char: 1;
1: -	unsigned char modeflags: 5;
1: +  unsigned char lockstate;
1: +  unsigned char slockstate;
1: +  unsigned char ledmode : 1;
1: +  unsigned char ledflagstate : 4;
1: +  char : 3;
1: +  unsigned char default_ledflagstate : 4;
1: +  unsigned char kbdmode : 3;
1: +  char : 1;
1: +  unsigned char modeflags : 5;
1:  };
1:  
1:  struct kbentry {
1: -	unsigned char kb_table;
1: -	unsigned char kb_index;
1: -	short unsigned int kb_value;
1: +  unsigned char kb_table;
1: +  unsigned char kb_index;
1: +  short unsigned int kb_value;
1:  };
1:  
1:  struct kbsentry {
1: -	unsigned char kb_func;
1: -	unsigned char kb_string[512];
1: +  unsigned char kb_func;
1: +  unsigned char kb_string[512];
1:  };
1:  
1:  struct kbdiacr {
1: -	unsigned char diacr;
1: -	unsigned char base;
1: -	unsigned char result;
1: +  unsigned char diacr;
1: +  unsigned char base;
1: +  unsigned char result;
1:  };
1:  
1:  struct kbdiacrs {
1: -	unsigned int kb_cnt;
1: -	struct kbdiacr kbdiacr[256];
1: +  unsigned int kb_cnt;
1: +  struct kbdiacr kbdiacr[256];
1:  };
1:  
1:  struct kbdiacruc {
1: -	unsigned int diacr;
1: -	unsigned int base;
1: -	unsigned int result;
1: +  unsigned int diacr;
1: +  unsigned int base;
1: +  unsigned int result;
1:  };
1:  
1:  struct kbdiacrsuc {
1: -	unsigned int kb_cnt;
1: -	struct kbdiacruc kbdiacruc[256];
1: +  unsigned int kb_cnt;
1: +  struct kbdiacruc kbdiacruc[256];
1:  };
1:  
1:  struct kbkeycode {
1: -	unsigned int scancode;
1: -	unsigned int keycode;
1: +  unsigned int scancode;
1: +  unsigned int keycode;
1:  };
1:  
1:  typedef void k_handler_fn(struct vc_data *, unsigned char, char);
1: @@ -75377,175 +76431,175 @@ typedef void k_handler_fn(struct vc_data *, unsigned char, char);
1:  typedef void fn_handler_fn(struct vc_data *);
1:  
1:  struct getset_keycode_data {
1: -	struct input_keymap_entry ke;
1: -	int error;
1: +  struct input_keymap_entry ke;
1: +  int error;
1:  };
1:  
1:  struct uni_pagedir {
1: -	u16 **uni_pgdir[32];
1: -	long unsigned int refcount;
1: -	long unsigned int sum;
1: -	unsigned char *inverse_translations[4];
1: -	u16 *inverse_trans_unicode;
1: +  u16 **uni_pgdir[32];
1: +  long unsigned int refcount;
1: +  long unsigned int sum;
1: +  unsigned char *inverse_translations[4];
1: +  u16 *inverse_trans_unicode;
1:  };
1:  
1:  typedef uint32_t char32_t;
1:  
1:  struct uni_screen {
1: -	char32_t *lines[0];
1: +  char32_t *lines[0];
1:  };
1:  
1:  struct con_driver {
1: -	const struct consw *con;
1: -	const char *desc;
1: -	struct device *dev;
1: -	int node;
1: -	int first;
1: -	int last;
1: -	int flag;
1: +  const struct consw *con;
1: +  const char *desc;
1: +  struct device *dev;
1: +  int node;
1: +  int first;
1: +  int last;
1: +  int flag;
1:  };
1:  
1:  enum {
1: -	blank_off = 0,
1: -	blank_normal_wait = 1,
1: -	blank_vesa_wait = 2,
1: +  blank_off = 0,
1: +  blank_normal_wait = 1,
1: +  blank_vesa_wait = 2,
1:  };
1:  
1:  enum {
1: -	EPecma = 0,
1: -	EPdec = 1,
1: -	EPeq = 2,
1: -	EPgt = 3,
1: -	EPlt = 4,
1: +  EPecma = 0,
1: +  EPdec = 1,
1: +  EPeq = 2,
1: +  EPgt = 3,
1: +  EPlt = 4,
1:  };
1:  
1:  struct rgb {
1: -	u8 r;
1: -	u8 g;
1: -	u8 b;
1: +  u8 r;
1: +  u8 g;
1: +  u8 b;
1:  };
1:  
1:  enum {
1: -	ESnormal = 0,
1: -	ESesc = 1,
1: -	ESsquare = 2,
1: -	ESgetpars = 3,
1: -	ESfunckey = 4,
1: -	EShash = 5,
1: -	ESsetG0 = 6,
1: -	ESsetG1 = 7,
1: -	ESpercent = 8,
1: -	EScsiignore = 9,
1: -	ESnonstd = 10,
1: -	ESpalette = 11,
1: -	ESosc = 12,
1: +  ESnormal = 0,
1: +  ESesc = 1,
1: +  ESsquare = 2,
1: +  ESgetpars = 3,
1: +  ESfunckey = 4,
1: +  EShash = 5,
1: +  ESsetG0 = 6,
1: +  ESsetG1 = 7,
1: +  ESpercent = 8,
1: +  EScsiignore = 9,
1: +  ESnonstd = 10,
1: +  ESpalette = 11,
1: +  ESosc = 12,
1:  };
1:  
1:  struct interval {
1: -	uint32_t first;
1: -	uint32_t last;
1: +  uint32_t first;
1: +  uint32_t last;
1:  };
1:  
1:  struct vc_draw_region {
1: -	long unsigned int from;
1: -	long unsigned int to;
1: -	int x;
1: +  long unsigned int from;
1: +  long unsigned int to;
1: +  int x;
1:  };
1:  
1:  struct hv_ops;
1:  
1:  struct hvc_struct {
1: -	struct tty_port port;
1: -	spinlock_t lock;
1: -	int index;
1: -	int do_wakeup;
1: -	char *outbuf;
1: -	int outbuf_size;
1: -	int n_outbuf;
1: -	uint32_t vtermno;
1: -	const struct hv_ops *ops;
1: -	int irq_requested;
1: -	int data;
1: -	struct winsize ws;
1: -	struct work_struct tty_resize;
1: -	struct list_head next;
1: -	long unsigned int flags;
1: +  struct tty_port port;
1: +  spinlock_t lock;
1: +  int index;
1: +  int do_wakeup;
1: +  char *outbuf;
1: +  int outbuf_size;
1: +  int n_outbuf;
1: +  uint32_t vtermno;
1: +  const struct hv_ops *ops;
1: +  int irq_requested;
1: +  int data;
1: +  struct winsize ws;
1: +  struct work_struct tty_resize;
1: +  struct list_head next;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct hv_ops {
1: -	int (*get_chars)(uint32_t, char *, int);
1: -	int (*put_chars)(uint32_t, const char *, int);
1: -	int (*flush)(uint32_t, bool);
1: -	int (*notifier_add)(struct hvc_struct *, int);
1: -	void (*notifier_del)(struct hvc_struct *, int);
1: -	void (*notifier_hangup)(struct hvc_struct *, int);
1: -	int (*tiocmget)(struct hvc_struct *);
1: -	int (*tiocmset)(struct hvc_struct *, unsigned int, unsigned int);
1: -	void (*dtr_rts)(struct hvc_struct *, int);
1: +  int (*get_chars)(uint32_t, char *, int);
1: +  int (*put_chars)(uint32_t, const char *, int);
1: +  int (*flush)(uint32_t, bool);
1: +  int (*notifier_add)(struct hvc_struct *, int);
1: +  void (*notifier_del)(struct hvc_struct *, int);
1: +  void (*notifier_hangup)(struct hvc_struct *, int);
1: +  int (*tiocmget)(struct hvc_struct *);
1: +  int (*tiocmset)(struct hvc_struct *, unsigned int, unsigned int);
1: +  void (*dtr_rts)(struct hvc_struct *, int);
1:  };
1:  
1:  struct serial_rs485 {
1: -	__u32 flags;
1: -	__u32 delay_rts_before_send;
1: -	__u32 delay_rts_after_send;
1: -	__u32 padding[5];
1: +  __u32 flags;
1: +  __u32 delay_rts_before_send;
1: +  __u32 delay_rts_after_send;
1: +  __u32 padding[5];
1:  };
1:  
1:  struct serial_iso7816 {
1: -	__u32 flags;
1: -	__u32 tg;
1: -	__u32 sc_fi;
1: -	__u32 sc_di;
1: -	__u32 clk;
1: -	__u32 reserved[5];
1: +  __u32 flags;
1: +  __u32 tg;
1: +  __u32 sc_fi;
1: +  __u32 sc_di;
1: +  __u32 clk;
1: +  __u32 reserved[5];
1:  };
1:  
1:  struct circ_buf {
1: -	char *buf;
1: -	int head;
1: -	int tail;
1: +  char *buf;
1: +  int head;
1: +  int tail;
1:  };
1:  
1:  struct uart_port;
1:  
1:  struct uart_ops {
1: -	unsigned int (*tx_empty)(struct uart_port *);
1: -	void (*set_mctrl)(struct uart_port *, unsigned int);
1: -	unsigned int (*get_mctrl)(struct uart_port *);
1: -	void (*stop_tx)(struct uart_port *);
1: -	void (*start_tx)(struct uart_port *);
1: -	void (*throttle)(struct uart_port *);
1: -	void (*unthrottle)(struct uart_port *);
1: -	void (*send_xchar)(struct uart_port *, char);
1: -	void (*stop_rx)(struct uart_port *);
1: -	void (*enable_ms)(struct uart_port *);
1: -	void (*break_ctl)(struct uart_port *, int);
1: -	int (*startup)(struct uart_port *);
1: -	void (*shutdown)(struct uart_port *);
1: -	void (*flush_buffer)(struct uart_port *);
1: -	void (*set_termios)(struct uart_port *, struct ktermios *, struct ktermios *);
1: -	void (*set_ldisc)(struct uart_port *, struct ktermios *);
1: -	void (*pm)(struct uart_port *, unsigned int, unsigned int);
1: -	const char * (*type)(struct uart_port *);
1: -	void (*release_port)(struct uart_port *);
1: -	int (*request_port)(struct uart_port *);
1: -	void (*config_port)(struct uart_port *, int);
1: -	int (*verify_port)(struct uart_port *, struct serial_struct *);
1: -	int (*ioctl)(struct uart_port *, unsigned int, long unsigned int);
1: +  unsigned int (*tx_empty)(struct uart_port *);
1: +  void (*set_mctrl)(struct uart_port *, unsigned int);
1: +  unsigned int (*get_mctrl)(struct uart_port *);
1: +  void (*stop_tx)(struct uart_port *);
1: +  void (*start_tx)(struct uart_port *);
1: +  void (*throttle)(struct uart_port *);
1: +  void (*unthrottle)(struct uart_port *);
1: +  void (*send_xchar)(struct uart_port *, char);
1: +  void (*stop_rx)(struct uart_port *);
1: +  void (*enable_ms)(struct uart_port *);
1: +  void (*break_ctl)(struct uart_port *, int);
1: +  int (*startup)(struct uart_port *);
1: +  void (*shutdown)(struct uart_port *);
1: +  void (*flush_buffer)(struct uart_port *);
1: +  void (*set_termios)(struct uart_port *, struct ktermios *, struct ktermios *);
1: +  void (*set_ldisc)(struct uart_port *, struct ktermios *);
1: +  void (*pm)(struct uart_port *, unsigned int, unsigned int);
1: +  const char *(*type)(struct uart_port *);
1: +  void (*release_port)(struct uart_port *);
1: +  int (*request_port)(struct uart_port *);
1: +  void (*config_port)(struct uart_port *, int);
1: +  int (*verify_port)(struct uart_port *, struct serial_struct *);
1: +  int (*ioctl)(struct uart_port *, unsigned int, long unsigned int);
1:  };
1:  
1:  struct uart_icount {
1: -	__u32 cts;
1: -	__u32 dsr;
1: -	__u32 rng;
1: -	__u32 dcd;
1: -	__u32 rx;
1: -	__u32 tx;
1: -	__u32 frame;
1: -	__u32 overrun;
1: -	__u32 parity;
1: -	__u32 brk;
1: -	__u32 buf_overrun;
1: +  __u32 cts;
1: +  __u32 dsr;
1: +  __u32 rng;
1: +  __u32 dcd;
1: +  __u32 rx;
1: +  __u32 tx;
1: +  __u32 frame;
1: +  __u32 overrun;
1: +  __u32 parity;
1: +  __u32 brk;
1: +  __u32 buf_overrun;
1:  };
1:  
1:  typedef unsigned int upf_t;
1: @@ -75555,167 +76609,168 @@ typedef unsigned int upstat_t;
1:  struct uart_state;
1:  
1:  struct uart_port {
1: -	spinlock_t lock;
1: -	long unsigned int iobase;
1: -	unsigned char *membase;
1: -	unsigned int (*serial_in)(struct uart_port *, int);
1: -	void (*serial_out)(struct uart_port *, int, int);
1: -	void (*set_termios)(struct uart_port *, struct ktermios *, struct ktermios *);
1: -	void (*set_ldisc)(struct uart_port *, struct ktermios *);
1: -	unsigned int (*get_mctrl)(struct uart_port *);
1: -	void (*set_mctrl)(struct uart_port *, unsigned int);
1: -	unsigned int (*get_divisor)(struct uart_port *, unsigned int, unsigned int *);
1: -	void (*set_divisor)(struct uart_port *, unsigned int, unsigned int, unsigned int);
1: -	int (*startup)(struct uart_port *);
1: -	void (*shutdown)(struct uart_port *);
1: -	void (*throttle)(struct uart_port *);
1: -	void (*unthrottle)(struct uart_port *);
1: -	int (*handle_irq)(struct uart_port *);
1: -	void (*pm)(struct uart_port *, unsigned int, unsigned int);
1: -	void (*handle_break)(struct uart_port *);
1: -	int (*rs485_config)(struct uart_port *, struct serial_rs485 *);
1: -	int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *);
1: -	unsigned int irq;
1: -	long unsigned int irqflags;
1: -	unsigned int uartclk;
1: -	unsigned int fifosize;
1: -	unsigned char x_char;
1: -	unsigned char regshift;
1: -	unsigned char iotype;
1: -	unsigned char quirks;
1: -	unsigned int read_status_mask;
1: -	unsigned int ignore_status_mask;
1: -	struct uart_state *state;
1: -	struct uart_icount icount;
1: -	struct console *cons;
1: -	upf_t flags;
1: -	upstat_t status;
1: -	int hw_stopped;
1: -	unsigned int mctrl;
1: -	unsigned int timeout;
1: -	unsigned int type;
1: -	const struct uart_ops *ops;
1: -	unsigned int custom_divisor;
1: -	unsigned int line;
1: -	unsigned int minor;
1: -	resource_size_t mapbase;
1: -	resource_size_t mapsize;
1: -	struct device *dev;
1: -	long unsigned int sysrq;
1: -	unsigned int sysrq_ch;
1: -	unsigned char has_sysrq;
1: -	unsigned char sysrq_seq;
1: -	unsigned char hub6;
1: -	unsigned char suspended;
1: -	unsigned char console_reinit;
1: -	const char *name;
1: -	struct attribute_group *attr_group;
1: -	const struct attribute_group **tty_groups;
1: -	struct serial_rs485 rs485;
1: -	struct gpio_desc___2 *rs485_term_gpio;
1: -	struct serial_iso7816 iso7816;
1: -	void *private_data;
1: +  spinlock_t lock;
1: +  long unsigned int iobase;
1: +  unsigned char *membase;
1: +  unsigned int (*serial_in)(struct uart_port *, int);
1: +  void (*serial_out)(struct uart_port *, int, int);
1: +  void (*set_termios)(struct uart_port *, struct ktermios *, struct ktermios *);
1: +  void (*set_ldisc)(struct uart_port *, struct ktermios *);
1: +  unsigned int (*get_mctrl)(struct uart_port *);
1: +  void (*set_mctrl)(struct uart_port *, unsigned int);
1: +  unsigned int (*get_divisor)(struct uart_port *, unsigned int, unsigned int *);
1: +  void (*set_divisor)(struct uart_port *, unsigned int, unsigned int,
1: +                      unsigned int);
1: +  int (*startup)(struct uart_port *);
1: +  void (*shutdown)(struct uart_port *);
1: +  void (*throttle)(struct uart_port *);
1: +  void (*unthrottle)(struct uart_port *);
1: +  int (*handle_irq)(struct uart_port *);
1: +  void (*pm)(struct uart_port *, unsigned int, unsigned int);
1: +  void (*handle_break)(struct uart_port *);
1: +  int (*rs485_config)(struct uart_port *, struct serial_rs485 *);
1: +  int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *);
1: +  unsigned int irq;
1: +  long unsigned int irqflags;
1: +  unsigned int uartclk;
1: +  unsigned int fifosize;
1: +  unsigned char x_char;
1: +  unsigned char regshift;
1: +  unsigned char iotype;
1: +  unsigned char quirks;
1: +  unsigned int read_status_mask;
1: +  unsigned int ignore_status_mask;
1: +  struct uart_state *state;
1: +  struct uart_icount icount;
1: +  struct console *cons;
1: +  upf_t flags;
1: +  upstat_t status;
1: +  int hw_stopped;
1: +  unsigned int mctrl;
1: +  unsigned int timeout;
1: +  unsigned int type;
1: +  const struct uart_ops *ops;
1: +  unsigned int custom_divisor;
1: +  unsigned int line;
1: +  unsigned int minor;
1: +  resource_size_t mapbase;
1: +  resource_size_t mapsize;
1: +  struct device *dev;
1: +  long unsigned int sysrq;
1: +  unsigned int sysrq_ch;
1: +  unsigned char has_sysrq;
1: +  unsigned char sysrq_seq;
1: +  unsigned char hub6;
1: +  unsigned char suspended;
1: +  unsigned char console_reinit;
1: +  const char *name;
1: +  struct attribute_group *attr_group;
1: +  const struct attribute_group **tty_groups;
1: +  struct serial_rs485 rs485;
1: +  struct gpio_desc___2 *rs485_term_gpio;
1: +  struct serial_iso7816 iso7816;
1: +  void *private_data;
1:  };
1:  
1:  enum uart_pm_state {
1: -	UART_PM_STATE_ON = 0,
1: -	UART_PM_STATE_OFF = 3,
1: -	UART_PM_STATE_UNDEFINED = 4,
1: +  UART_PM_STATE_ON = 0,
1: +  UART_PM_STATE_OFF = 3,
1: +  UART_PM_STATE_UNDEFINED = 4,
1:  };
1:  
1:  struct uart_state {
1: -	struct tty_port port;
1: -	enum uart_pm_state pm_state;
1: -	struct circ_buf xmit;
1: -	atomic_t refcount;
1: -	wait_queue_head_t remove_wait;
1: -	struct uart_port *uart_port;
1: +  struct tty_port port;
1: +  enum uart_pm_state pm_state;
1: +  struct circ_buf xmit;
1: +  atomic_t refcount;
1: +  wait_queue_head_t remove_wait;
1: +  struct uart_port *uart_port;
1:  };
1:  
1:  struct uart_driver {
1: -	struct module *owner;
1: -	const char *driver_name;
1: -	const char *dev_name;
1: -	int major;
1: -	int minor;
1: -	int nr;
1: -	struct console *cons;
1: -	struct uart_state *state;
1: -	struct tty_driver *tty_driver;
1: +  struct module *owner;
1: +  const char *driver_name;
1: +  const char *dev_name;
1: +  int major;
1: +  int minor;
1: +  int nr;
1: +  struct console *cons;
1: +  struct uart_state *state;
1: +  struct tty_driver *tty_driver;
1:  };
1:  
1:  struct uart_match {
1: -	struct uart_port *port;
1: -	struct uart_driver *driver;
1: +  struct uart_port *port;
1: +  struct uart_driver *driver;
1:  };
1:  
1:  struct earlycon_device {
1: -	struct console *con;
1: -	struct uart_port port;
1: -	char options[16];
1: -	unsigned int baud;
1: +  struct console *con;
1: +  struct uart_port port;
1: +  char options[16];
1: +  unsigned int baud;
1:  };
1:  
1:  struct earlycon_id {
1: -	char name[15];
1: -	char name_term;
1: -	char compatible[128];
1: -	int (*setup)(struct earlycon_device *, const char *);
1: +  char name[15];
1: +  char name_term;
1: +  char compatible[128];
1: +  int (*setup)(struct earlycon_device *, const char *);
1:  };
1:  
1:  enum hwparam_type {
1: -	hwparam_ioport = 0,
1: -	hwparam_iomem = 1,
1: -	hwparam_ioport_or_iomem = 2,
1: -	hwparam_irq = 3,
1: -	hwparam_dma = 4,
1: -	hwparam_dma_addr = 5,
1: -	hwparam_other = 6,
1: +  hwparam_ioport = 0,
1: +  hwparam_iomem = 1,
1: +  hwparam_ioport_or_iomem = 2,
1: +  hwparam_irq = 3,
1: +  hwparam_dma = 4,
1: +  hwparam_dma_addr = 5,
1: +  hwparam_other = 6,
1:  };
1:  
1:  struct plat_serial8250_port {
1: -	long unsigned int iobase;
1: -	void *membase;
1: -	resource_size_t mapbase;
1: -	unsigned int irq;
1: -	long unsigned int irqflags;
1: -	unsigned int uartclk;
1: -	void *private_data;
1: -	unsigned char regshift;
1: -	unsigned char iotype;
1: -	unsigned char hub6;
1: -	unsigned char has_sysrq;
1: -	upf_t flags;
1: -	unsigned int type;
1: -	unsigned int (*serial_in)(struct uart_port *, int);
1: -	void (*serial_out)(struct uart_port *, int, int);
1: -	void (*set_termios)(struct uart_port *, struct ktermios *, struct ktermios *);
1: -	void (*set_ldisc)(struct uart_port *, struct ktermios *);
1: -	unsigned int (*get_mctrl)(struct uart_port *);
1: -	int (*handle_irq)(struct uart_port *);
1: -	void (*pm)(struct uart_port *, unsigned int, unsigned int);
1: -	void (*handle_break)(struct uart_port *);
1: -};
1: -
1: -enum {
1: -	PLAT8250_DEV_LEGACY = 4294967295,
1: -	PLAT8250_DEV_PLATFORM = 0,
1: -	PLAT8250_DEV_PLATFORM1 = 1,
1: -	PLAT8250_DEV_PLATFORM2 = 2,
1: -	PLAT8250_DEV_FOURPORT = 3,
1: -	PLAT8250_DEV_ACCENT = 4,
1: -	PLAT8250_DEV_BOCA = 5,
1: -	PLAT8250_DEV_EXAR_ST16C554 = 6,
1: -	PLAT8250_DEV_HUB6 = 7,
1: -	PLAT8250_DEV_AU1X00 = 8,
1: -	PLAT8250_DEV_SM501 = 9,
1: +  long unsigned int iobase;
1: +  void *membase;
1: +  resource_size_t mapbase;
1: +  unsigned int irq;
1: +  long unsigned int irqflags;
1: +  unsigned int uartclk;
1: +  void *private_data;
1: +  unsigned char regshift;
1: +  unsigned char iotype;
1: +  unsigned char hub6;
1: +  unsigned char has_sysrq;
1: +  upf_t flags;
1: +  unsigned int type;
1: +  unsigned int (*serial_in)(struct uart_port *, int);
1: +  void (*serial_out)(struct uart_port *, int, int);
1: +  void (*set_termios)(struct uart_port *, struct ktermios *, struct ktermios *);
1: +  void (*set_ldisc)(struct uart_port *, struct ktermios *);
1: +  unsigned int (*get_mctrl)(struct uart_port *);
1: +  int (*handle_irq)(struct uart_port *);
1: +  void (*pm)(struct uart_port *, unsigned int, unsigned int);
1: +  void (*handle_break)(struct uart_port *);
1: +};
1: +
1: +enum {
1: +  PLAT8250_DEV_LEGACY = 4294967295,
1: +  PLAT8250_DEV_PLATFORM = 0,
1: +  PLAT8250_DEV_PLATFORM1 = 1,
1: +  PLAT8250_DEV_PLATFORM2 = 2,
1: +  PLAT8250_DEV_FOURPORT = 3,
1: +  PLAT8250_DEV_ACCENT = 4,
1: +  PLAT8250_DEV_BOCA = 5,
1: +  PLAT8250_DEV_EXAR_ST16C554 = 6,
1: +  PLAT8250_DEV_HUB6 = 7,
1: +  PLAT8250_DEV_AU1X00 = 8,
1: +  PLAT8250_DEV_SM501 = 9,
1:  };
1:  
1:  struct uart_8250_port;
1:  
1:  struct uart_8250_ops {
1: -	int (*setup_irq)(struct uart_8250_port *);
1: -	void (*release_irq)(struct uart_8250_port *);
1: +  int (*setup_irq)(struct uart_8250_port *);
1: +  void (*release_irq)(struct uart_8250_port *);
1:  };
1:  
1:  struct mctrl_gpios;
1: @@ -75725,414 +76780,416 @@ struct uart_8250_dma;
1:  struct uart_8250_em485;
1:  
1:  struct uart_8250_port {
1: -	struct uart_port port;
1: -	struct timer_list timer;
1: -	struct list_head list;
1: -	u32 capabilities;
1: -	short unsigned int bugs;
1: -	bool fifo_bug;
1: -	unsigned int tx_loadsz;
1: -	unsigned char acr;
1: -	unsigned char fcr;
1: -	unsigned char ier;
1: -	unsigned char lcr;
1: -	unsigned char mcr;
1: -	unsigned char mcr_mask;
1: -	unsigned char mcr_force;
1: -	unsigned char cur_iotype;
1: -	unsigned int rpm_tx_active;
1: -	unsigned char canary;
1: -	unsigned char probe;
1: -	struct mctrl_gpios *gpios;
1: -	unsigned char lsr_saved_flags;
1: -	unsigned char msr_saved_flags;
1: -	struct uart_8250_dma *dma;
1: -	const struct uart_8250_ops *ops;
1: -	int (*dl_read)(struct uart_8250_port *);
1: -	void (*dl_write)(struct uart_8250_port *, int);
1: -	struct uart_8250_em485 *em485;
1: -	void (*rs485_start_tx)(struct uart_8250_port *);
1: -	void (*rs485_stop_tx)(struct uart_8250_port *);
1: -	struct delayed_work overrun_backoff;
1: -	u32 overrun_backoff_time_ms;
1: +  struct uart_port port;
1: +  struct timer_list timer;
1: +  struct list_head list;
1: +  u32 capabilities;
1: +  short unsigned int bugs;
1: +  bool fifo_bug;
1: +  unsigned int tx_loadsz;
1: +  unsigned char acr;
1: +  unsigned char fcr;
1: +  unsigned char ier;
1: +  unsigned char lcr;
1: +  unsigned char mcr;
1: +  unsigned char mcr_mask;
1: +  unsigned char mcr_force;
1: +  unsigned char cur_iotype;
1: +  unsigned int rpm_tx_active;
1: +  unsigned char canary;
1: +  unsigned char probe;
1: +  struct mctrl_gpios *gpios;
1: +  unsigned char lsr_saved_flags;
1: +  unsigned char msr_saved_flags;
1: +  struct uart_8250_dma *dma;
1: +  const struct uart_8250_ops *ops;
1: +  int (*dl_read)(struct uart_8250_port *);
1: +  void (*dl_write)(struct uart_8250_port *, int);
1: +  struct uart_8250_em485 *em485;
1: +  void (*rs485_start_tx)(struct uart_8250_port *);
1: +  void (*rs485_stop_tx)(struct uart_8250_port *);
1: +  struct delayed_work overrun_backoff;
1: +  u32 overrun_backoff_time_ms;
1:  };
1:  
1:  struct uart_8250_em485 {
1: -	struct hrtimer start_tx_timer;
1: -	struct hrtimer stop_tx_timer;
1: -	struct hrtimer *active_timer;
1: -	struct uart_8250_port *port;
1: -	unsigned int tx_stopped: 1;
1: +  struct hrtimer start_tx_timer;
1: +  struct hrtimer stop_tx_timer;
1: +  struct hrtimer *active_timer;
1: +  struct uart_8250_port *port;
1: +  unsigned int tx_stopped : 1;
1:  };
1:  
1:  struct uart_8250_dma {
1: -	int (*tx_dma)(struct uart_8250_port *);
1: -	int (*rx_dma)(struct uart_8250_port *);
1: -	dma_filter_fn fn;
1: -	void *rx_param;
1: -	void *tx_param;
1: -	struct dma_slave_config rxconf;
1: -	struct dma_slave_config txconf;
1: -	struct dma_chan___2 *rxchan;
1: -	struct dma_chan___2 *txchan;
1: -	phys_addr_t rx_dma_addr;
1: -	phys_addr_t tx_dma_addr;
1: -	dma_addr_t rx_addr;
1: -	dma_addr_t tx_addr;
1: -	dma_cookie_t rx_cookie;
1: -	dma_cookie_t tx_cookie;
1: -	void *rx_buf;
1: -	size_t rx_size;
1: -	size_t tx_size;
1: -	unsigned char tx_running;
1: -	unsigned char tx_err;
1: -	unsigned char rx_running;
1: +  int (*tx_dma)(struct uart_8250_port *);
1: +  int (*rx_dma)(struct uart_8250_port *);
1: +  dma_filter_fn fn;
1: +  void *rx_param;
1: +  void *tx_param;
1: +  struct dma_slave_config rxconf;
1: +  struct dma_slave_config txconf;
1: +  struct dma_chan___2 *rxchan;
1: +  struct dma_chan___2 *txchan;
1: +  phys_addr_t rx_dma_addr;
1: +  phys_addr_t tx_dma_addr;
1: +  dma_addr_t rx_addr;
1: +  dma_addr_t tx_addr;
1: +  dma_cookie_t rx_cookie;
1: +  dma_cookie_t tx_cookie;
1: +  void *rx_buf;
1: +  size_t rx_size;
1: +  size_t tx_size;
1: +  unsigned char tx_running;
1: +  unsigned char tx_err;
1: +  unsigned char rx_running;
1:  };
1:  
1:  struct old_serial_port {
1: -	unsigned int uart;
1: -	unsigned int baud_base;
1: -	unsigned int port;
1: -	unsigned int irq;
1: -	upf_t flags;
1: -	unsigned char io_type;
1: -	unsigned char *iomem_base;
1: -	short unsigned int iomem_reg_shift;
1: +  unsigned int uart;
1: +  unsigned int baud_base;
1: +  unsigned int port;
1: +  unsigned int irq;
1: +  upf_t flags;
1: +  unsigned char io_type;
1: +  unsigned char *iomem_base;
1: +  short unsigned int iomem_reg_shift;
1:  };
1:  
1:  struct irq_info {
1: -	struct hlist_node node;
1: -	int irq;
1: -	spinlock_t lock;
1: -	struct list_head *head;
1: +  struct hlist_node node;
1: +  int irq;
1: +  spinlock_t lock;
1: +  struct list_head *head;
1:  };
1:  
1:  struct serial8250_config {
1: -	const char *name;
1: -	short unsigned int fifo_size;
1: -	short unsigned int tx_loadsz;
1: -	unsigned char fcr;
1: -	unsigned char rxtrig_bytes[4];
1: -	unsigned int flags;
1: +  const char *name;
1: +  short unsigned int fifo_size;
1: +  short unsigned int tx_loadsz;
1: +  unsigned char fcr;
1: +  unsigned char rxtrig_bytes[4];
1: +  unsigned int flags;
1:  };
1:  
1:  struct pciserial_board {
1: -	unsigned int flags;
1: -	unsigned int num_ports;
1: -	unsigned int base_baud;
1: -	unsigned int uart_offset;
1: -	unsigned int reg_shift;
1: -	unsigned int first_offset;
1: +  unsigned int flags;
1: +  unsigned int num_ports;
1: +  unsigned int base_baud;
1: +  unsigned int uart_offset;
1: +  unsigned int reg_shift;
1: +  unsigned int first_offset;
1:  };
1:  
1:  struct serial_private;
1:  
1:  struct pci_serial_quirk {
1: -	u32 vendor;
1: -	u32 device;
1: -	u32 subvendor;
1: -	u32 subdevice;
1: -	int (*probe)(struct pci_dev *);
1: -	int (*init)(struct pci_dev *);
1: -	int (*setup)(struct serial_private *, const struct pciserial_board *, struct uart_8250_port *, int);
1: -	void (*exit)(struct pci_dev *);
1: +  u32 vendor;
1: +  u32 device;
1: +  u32 subvendor;
1: +  u32 subdevice;
1: +  int (*probe)(struct pci_dev *);
1: +  int (*init)(struct pci_dev *);
1: +  int (*setup)(struct serial_private *, const struct pciserial_board *,
1: +               struct uart_8250_port *, int);
1: +  void (*exit)(struct pci_dev *);
1:  };
1:  
1:  struct serial_private {
1: -	struct pci_dev *dev;
1: -	unsigned int nr;
1: -	struct pci_serial_quirk *quirk;
1: -	const struct pciserial_board *board;
1: -	int line[0];
1: +  struct pci_dev *dev;
1: +  unsigned int nr;
1: +  struct pci_serial_quirk *quirk;
1: +  const struct pciserial_board *board;
1: +  int line[0];
1:  };
1:  
1:  struct f815xxa_data {
1: -	spinlock_t lock;
1: -	int idx;
1: +  spinlock_t lock;
1: +  int idx;
1:  };
1:  
1:  struct timedia_struct {
1: -	int num;
1: -	const short unsigned int *ids;
1: +  int num;
1: +  const short unsigned int *ids;
1:  };
1:  
1:  struct quatech_feature {
1: -	u16 devid;
1: -	bool amcc;
1: +  u16 devid;
1: +  bool amcc;
1:  };
1:  
1:  enum pci_board_num_t {
1: -	pbn_default = 0,
1: -	pbn_b0_1_115200 = 1,
1: -	pbn_b0_2_115200 = 2,
1: -	pbn_b0_4_115200 = 3,
1: -	pbn_b0_5_115200 = 4,
1: -	pbn_b0_8_115200 = 5,
1: -	pbn_b0_1_921600 = 6,
1: -	pbn_b0_2_921600 = 7,
1: -	pbn_b0_4_921600 = 8,
1: -	pbn_b0_2_1130000 = 9,
1: -	pbn_b0_4_1152000 = 10,
1: -	pbn_b0_4_1250000 = 11,
1: -	pbn_b0_2_1843200 = 12,
1: -	pbn_b0_4_1843200 = 13,
1: -	pbn_b0_1_4000000 = 14,
1: -	pbn_b0_bt_1_115200 = 15,
1: -	pbn_b0_bt_2_115200 = 16,
1: -	pbn_b0_bt_4_115200 = 17,
1: -	pbn_b0_bt_8_115200 = 18,
1: -	pbn_b0_bt_1_460800 = 19,
1: -	pbn_b0_bt_2_460800 = 20,
1: -	pbn_b0_bt_4_460800 = 21,
1: -	pbn_b0_bt_1_921600 = 22,
1: -	pbn_b0_bt_2_921600 = 23,
1: -	pbn_b0_bt_4_921600 = 24,
1: -	pbn_b0_bt_8_921600 = 25,
1: -	pbn_b1_1_115200 = 26,
1: -	pbn_b1_2_115200 = 27,
1: -	pbn_b1_4_115200 = 28,
1: -	pbn_b1_8_115200 = 29,
1: -	pbn_b1_16_115200 = 30,
1: -	pbn_b1_1_921600 = 31,
1: -	pbn_b1_2_921600 = 32,
1: -	pbn_b1_4_921600 = 33,
1: -	pbn_b1_8_921600 = 34,
1: -	pbn_b1_2_1250000 = 35,
1: -	pbn_b1_bt_1_115200 = 36,
1: -	pbn_b1_bt_2_115200 = 37,
1: -	pbn_b1_bt_4_115200 = 38,
1: -	pbn_b1_bt_2_921600 = 39,
1: -	pbn_b1_1_1382400 = 40,
1: -	pbn_b1_2_1382400 = 41,
1: -	pbn_b1_4_1382400 = 42,
1: -	pbn_b1_8_1382400 = 43,
1: -	pbn_b2_1_115200 = 44,
1: -	pbn_b2_2_115200 = 45,
1: -	pbn_b2_4_115200 = 46,
1: -	pbn_b2_8_115200 = 47,
1: -	pbn_b2_1_460800 = 48,
1: -	pbn_b2_4_460800 = 49,
1: -	pbn_b2_8_460800 = 50,
1: -	pbn_b2_16_460800 = 51,
1: -	pbn_b2_1_921600 = 52,
1: -	pbn_b2_4_921600 = 53,
1: -	pbn_b2_8_921600 = 54,
1: -	pbn_b2_8_1152000 = 55,
1: -	pbn_b2_bt_1_115200 = 56,
1: -	pbn_b2_bt_2_115200 = 57,
1: -	pbn_b2_bt_4_115200 = 58,
1: -	pbn_b2_bt_2_921600 = 59,
1: -	pbn_b2_bt_4_921600 = 60,
1: -	pbn_b3_2_115200 = 61,
1: -	pbn_b3_4_115200 = 62,
1: -	pbn_b3_8_115200 = 63,
1: -	pbn_b4_bt_2_921600 = 64,
1: -	pbn_b4_bt_4_921600 = 65,
1: -	pbn_b4_bt_8_921600 = 66,
1: -	pbn_panacom = 67,
1: -	pbn_panacom2 = 68,
1: -	pbn_panacom4 = 69,
1: -	pbn_plx_romulus = 70,
1: -	pbn_endrun_2_4000000 = 71,
1: -	pbn_oxsemi = 72,
1: -	pbn_oxsemi_1_4000000 = 73,
1: -	pbn_oxsemi_2_4000000 = 74,
1: -	pbn_oxsemi_4_4000000 = 75,
1: -	pbn_oxsemi_8_4000000 = 76,
1: -	pbn_intel_i960 = 77,
1: -	pbn_sgi_ioc3 = 78,
1: -	pbn_computone_4 = 79,
1: -	pbn_computone_6 = 80,
1: -	pbn_computone_8 = 81,
1: -	pbn_sbsxrsio = 82,
1: -	pbn_pasemi_1682M = 83,
1: -	pbn_ni8430_2 = 84,
1: -	pbn_ni8430_4 = 85,
1: -	pbn_ni8430_8 = 86,
1: -	pbn_ni8430_16 = 87,
1: -	pbn_ADDIDATA_PCIe_1_3906250 = 88,
1: -	pbn_ADDIDATA_PCIe_2_3906250 = 89,
1: -	pbn_ADDIDATA_PCIe_4_3906250 = 90,
1: -	pbn_ADDIDATA_PCIe_8_3906250 = 91,
1: -	pbn_ce4100_1_115200 = 92,
1: -	pbn_omegapci = 93,
1: -	pbn_NETMOS9900_2s_115200 = 94,
1: -	pbn_brcm_trumanage = 95,
1: -	pbn_fintek_4 = 96,
1: -	pbn_fintek_8 = 97,
1: -	pbn_fintek_12 = 98,
1: -	pbn_fintek_F81504A = 99,
1: -	pbn_fintek_F81508A = 100,
1: -	pbn_fintek_F81512A = 101,
1: -	pbn_wch382_2 = 102,
1: -	pbn_wch384_4 = 103,
1: -	pbn_wch384_8 = 104,
1: -	pbn_pericom_PI7C9X7951 = 105,
1: -	pbn_pericom_PI7C9X7952 = 106,
1: -	pbn_pericom_PI7C9X7954 = 107,
1: -	pbn_pericom_PI7C9X7958 = 108,
1: -	pbn_sunix_pci_1s = 109,
1: -	pbn_sunix_pci_2s = 110,
1: -	pbn_sunix_pci_4s = 111,
1: -	pbn_sunix_pci_8s = 112,
1: -	pbn_sunix_pci_16s = 113,
1: -	pbn_moxa8250_2p = 114,
1: -	pbn_moxa8250_4p = 115,
1: -	pbn_moxa8250_8p = 116,
1: +  pbn_default = 0,
1: +  pbn_b0_1_115200 = 1,
1: +  pbn_b0_2_115200 = 2,
1: +  pbn_b0_4_115200 = 3,
1: +  pbn_b0_5_115200 = 4,
1: +  pbn_b0_8_115200 = 5,
1: +  pbn_b0_1_921600 = 6,
1: +  pbn_b0_2_921600 = 7,
1: +  pbn_b0_4_921600 = 8,
1: +  pbn_b0_2_1130000 = 9,
1: +  pbn_b0_4_1152000 = 10,
1: +  pbn_b0_4_1250000 = 11,
1: +  pbn_b0_2_1843200 = 12,
1: +  pbn_b0_4_1843200 = 13,
1: +  pbn_b0_1_4000000 = 14,
1: +  pbn_b0_bt_1_115200 = 15,
1: +  pbn_b0_bt_2_115200 = 16,
1: +  pbn_b0_bt_4_115200 = 17,
1: +  pbn_b0_bt_8_115200 = 18,
1: +  pbn_b0_bt_1_460800 = 19,
1: +  pbn_b0_bt_2_460800 = 20,
1: +  pbn_b0_bt_4_460800 = 21,
1: +  pbn_b0_bt_1_921600 = 22,
1: +  pbn_b0_bt_2_921600 = 23,
1: +  pbn_b0_bt_4_921600 = 24,
1: +  pbn_b0_bt_8_921600 = 25,
1: +  pbn_b1_1_115200 = 26,
1: +  pbn_b1_2_115200 = 27,
1: +  pbn_b1_4_115200 = 28,
1: +  pbn_b1_8_115200 = 29,
1: +  pbn_b1_16_115200 = 30,
1: +  pbn_b1_1_921600 = 31,
1: +  pbn_b1_2_921600 = 32,
1: +  pbn_b1_4_921600 = 33,
1: +  pbn_b1_8_921600 = 34,
1: +  pbn_b1_2_1250000 = 35,
1: +  pbn_b1_bt_1_115200 = 36,
1: +  pbn_b1_bt_2_115200 = 37,
1: +  pbn_b1_bt_4_115200 = 38,
1: +  pbn_b1_bt_2_921600 = 39,
1: +  pbn_b1_1_1382400 = 40,
1: +  pbn_b1_2_1382400 = 41,
1: +  pbn_b1_4_1382400 = 42,
1: +  pbn_b1_8_1382400 = 43,
1: +  pbn_b2_1_115200 = 44,
1: +  pbn_b2_2_115200 = 45,
1: +  pbn_b2_4_115200 = 46,
1: +  pbn_b2_8_115200 = 47,
1: +  pbn_b2_1_460800 = 48,
1: +  pbn_b2_4_460800 = 49,
1: +  pbn_b2_8_460800 = 50,
1: +  pbn_b2_16_460800 = 51,
1: +  pbn_b2_1_921600 = 52,
1: +  pbn_b2_4_921600 = 53,
1: +  pbn_b2_8_921600 = 54,
1: +  pbn_b2_8_1152000 = 55,
1: +  pbn_b2_bt_1_115200 = 56,
1: +  pbn_b2_bt_2_115200 = 57,
1: +  pbn_b2_bt_4_115200 = 58,
1: +  pbn_b2_bt_2_921600 = 59,
1: +  pbn_b2_bt_4_921600 = 60,
1: +  pbn_b3_2_115200 = 61,
1: +  pbn_b3_4_115200 = 62,
1: +  pbn_b3_8_115200 = 63,
1: +  pbn_b4_bt_2_921600 = 64,
1: +  pbn_b4_bt_4_921600 = 65,
1: +  pbn_b4_bt_8_921600 = 66,
1: +  pbn_panacom = 67,
1: +  pbn_panacom2 = 68,
1: +  pbn_panacom4 = 69,
1: +  pbn_plx_romulus = 70,
1: +  pbn_endrun_2_4000000 = 71,
1: +  pbn_oxsemi = 72,
1: +  pbn_oxsemi_1_4000000 = 73,
1: +  pbn_oxsemi_2_4000000 = 74,
1: +  pbn_oxsemi_4_4000000 = 75,
1: +  pbn_oxsemi_8_4000000 = 76,
1: +  pbn_intel_i960 = 77,
1: +  pbn_sgi_ioc3 = 78,
1: +  pbn_computone_4 = 79,
1: +  pbn_computone_6 = 80,
1: +  pbn_computone_8 = 81,
1: +  pbn_sbsxrsio = 82,
1: +  pbn_pasemi_1682M = 83,
1: +  pbn_ni8430_2 = 84,
1: +  pbn_ni8430_4 = 85,
1: +  pbn_ni8430_8 = 86,
1: +  pbn_ni8430_16 = 87,
1: +  pbn_ADDIDATA_PCIe_1_3906250 = 88,
1: +  pbn_ADDIDATA_PCIe_2_3906250 = 89,
1: +  pbn_ADDIDATA_PCIe_4_3906250 = 90,
1: +  pbn_ADDIDATA_PCIe_8_3906250 = 91,
1: +  pbn_ce4100_1_115200 = 92,
1: +  pbn_omegapci = 93,
1: +  pbn_NETMOS9900_2s_115200 = 94,
1: +  pbn_brcm_trumanage = 95,
1: +  pbn_fintek_4 = 96,
1: +  pbn_fintek_8 = 97,
1: +  pbn_fintek_12 = 98,
1: +  pbn_fintek_F81504A = 99,
1: +  pbn_fintek_F81508A = 100,
1: +  pbn_fintek_F81512A = 101,
1: +  pbn_wch382_2 = 102,
1: +  pbn_wch384_4 = 103,
1: +  pbn_wch384_8 = 104,
1: +  pbn_pericom_PI7C9X7951 = 105,
1: +  pbn_pericom_PI7C9X7952 = 106,
1: +  pbn_pericom_PI7C9X7954 = 107,
1: +  pbn_pericom_PI7C9X7958 = 108,
1: +  pbn_sunix_pci_1s = 109,
1: +  pbn_sunix_pci_2s = 110,
1: +  pbn_sunix_pci_4s = 111,
1: +  pbn_sunix_pci_8s = 112,
1: +  pbn_sunix_pci_16s = 113,
1: +  pbn_moxa8250_2p = 114,
1: +  pbn_moxa8250_4p = 115,
1: +  pbn_moxa8250_8p = 116,
1:  };
1:  
1:  struct exar8250_platform {
1: -	int (*rs485_config)(struct uart_port *, struct serial_rs485 *);
1: -	int (*register_gpio)(struct pci_dev *, struct uart_8250_port *);
1: +  int (*rs485_config)(struct uart_port *, struct serial_rs485 *);
1: +  int (*register_gpio)(struct pci_dev *, struct uart_8250_port *);
1:  };
1:  
1:  struct exar8250;
1:  
1:  struct exar8250_board {
1: -	unsigned int num_ports;
1: -	unsigned int reg_shift;
1: -	int (*setup)(struct exar8250 *, struct pci_dev *, struct uart_8250_port *, int);
1: -	void (*exit)(struct pci_dev *);
1: +  unsigned int num_ports;
1: +  unsigned int reg_shift;
1: +  int (*setup)(struct exar8250 *, struct pci_dev *, struct uart_8250_port *,
1: +               int);
1: +  void (*exit)(struct pci_dev *);
1:  };
1:  
1:  struct exar8250 {
1: -	unsigned int nr;
1: -	struct exar8250_board *board;
1: -	void *virt;
1: -	int line[0];
1: +  unsigned int nr;
1: +  struct exar8250_board *board;
1: +  void *virt;
1: +  int line[0];
1:  };
1:  
1:  enum mctrl_gpio_idx {
1: -	UART_GPIO_CTS = 0,
1: -	UART_GPIO_DSR = 1,
1: -	UART_GPIO_DCD = 2,
1: -	UART_GPIO_RNG = 3,
1: -	UART_GPIO_RI = 3,
1: -	UART_GPIO_RTS = 4,
1: -	UART_GPIO_DTR = 5,
1: -	UART_GPIO_MAX = 6,
1: +  UART_GPIO_CTS = 0,
1: +  UART_GPIO_DSR = 1,
1: +  UART_GPIO_DCD = 2,
1: +  UART_GPIO_RNG = 3,
1: +  UART_GPIO_RI = 3,
1: +  UART_GPIO_RTS = 4,
1: +  UART_GPIO_DTR = 5,
1: +  UART_GPIO_MAX = 6,
1:  };
1:  
1:  struct mctrl_gpios___2 {
1: -	struct uart_port *port;
1: -	struct gpio_desc___2 *gpio[6];
1: -	int irq[6];
1: -	unsigned int mctrl_prev;
1: -	bool mctrl_on;
1: +  struct uart_port *port;
1: +  struct gpio_desc___2 *gpio[6];
1: +  int irq[6];
1: +  unsigned int mctrl_prev;
1: +  bool mctrl_on;
1:  };
1:  
1:  struct memdev {
1: -	const char *name;
1: -	umode_t mode;
1: -	const struct file_operations *fops;
1: -	fmode_t fmode;
1: +  const char *name;
1: +  umode_t mode;
1: +  const struct file_operations *fops;
1: +  fmode_t fmode;
1:  };
1:  
1:  struct timer_rand_state {
1: -	cycles_t last_time;
1: -	long int last_delta;
1: -	long int last_delta2;
1: +  cycles_t last_time;
1: +  long int last_delta;
1: +  long int last_delta2;
1:  };
1:  
1:  struct trace_event_raw_add_device_randomness {
1: -	struct trace_entry ent;
1: -	int bytes;
1: -	long unsigned int IP;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int bytes;
1: +  long unsigned int IP;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_random__mix_pool_bytes {
1: -	struct trace_entry ent;
1: -	const char *pool_name;
1: -	int bytes;
1: -	long unsigned int IP;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *pool_name;
1: +  int bytes;
1: +  long unsigned int IP;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_credit_entropy_bits {
1: -	struct trace_entry ent;
1: -	const char *pool_name;
1: -	int bits;
1: -	int entropy_count;
1: -	long unsigned int IP;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *pool_name;
1: +  int bits;
1: +  int entropy_count;
1: +  long unsigned int IP;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_push_to_pool {
1: -	struct trace_entry ent;
1: -	const char *pool_name;
1: -	int pool_bits;
1: -	int input_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *pool_name;
1: +  int pool_bits;
1: +  int input_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_debit_entropy {
1: -	struct trace_entry ent;
1: -	const char *pool_name;
1: -	int debit_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *pool_name;
1: +  int debit_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_add_input_randomness {
1: -	struct trace_entry ent;
1: -	int input_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int input_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_add_disk_randomness {
1: -	struct trace_entry ent;
1: -	dev_t dev;
1: -	int input_bits;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  dev_t dev;
1: +  int input_bits;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xfer_secondary_pool {
1: -	struct trace_entry ent;
1: -	const char *pool_name;
1: -	int xfer_bits;
1: -	int request_bits;
1: -	int pool_entropy;
1: -	int input_entropy;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *pool_name;
1: +  int xfer_bits;
1: +  int request_bits;
1: +  int pool_entropy;
1: +  int input_entropy;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_random__get_random_bytes {
1: -	struct trace_entry ent;
1: -	int nbytes;
1: -	long unsigned int IP;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int nbytes;
1: +  long unsigned int IP;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_random__extract_entropy {
1: -	struct trace_entry ent;
1: -	const char *pool_name;
1: -	int nbytes;
1: -	int entropy_count;
1: -	long unsigned int IP;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const char *pool_name;
1: +  int nbytes;
1: +  int entropy_count;
1: +  long unsigned int IP;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_random_read {
1: -	struct trace_entry ent;
1: -	int got_bits;
1: -	int need_bits;
1: -	int pool_left;
1: -	int input_left;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int got_bits;
1: +  int need_bits;
1: +  int pool_left;
1: +  int input_left;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_urandom_read {
1: -	struct trace_entry ent;
1: -	int got_bits;
1: -	int pool_left;
1: -	int input_left;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int got_bits;
1: +  int pool_left;
1: +  int input_left;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_prandom_u32 {
1: -	struct trace_entry ent;
1: -	unsigned int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_add_device_randomness {};
1: @@ -76163,11 +77220,14 @@ struct trace_event_data_offsets_prandom_u32 {};
1:  
1:  typedef void (*btf_trace_add_device_randomness)(void *, int, long unsigned int);
1:  
1: -typedef void (*btf_trace_mix_pool_bytes)(void *, const char *, int, long unsigned int);
1: +typedef void (*btf_trace_mix_pool_bytes)(void *, const char *, int,
1: +                                         long unsigned int);
1:  
1: -typedef void (*btf_trace_mix_pool_bytes_nolock)(void *, const char *, int, long unsigned int);
1: +typedef void (*btf_trace_mix_pool_bytes_nolock)(void *, const char *, int,
1: +                                                long unsigned int);
1:  
1: -typedef void (*btf_trace_credit_entropy_bits)(void *, const char *, int, int, long unsigned int);
1: +typedef void (*btf_trace_credit_entropy_bits)(void *, const char *, int, int,
1: +                                              long unsigned int);
1:  
1:  typedef void (*btf_trace_push_to_pool)(void *, const char *, int, int);
1:  
1: @@ -76177,15 +77237,18 @@ typedef void (*btf_trace_add_input_randomness)(void *, int);
1:  
1:  typedef void (*btf_trace_add_disk_randomness)(void *, dev_t, int);
1:  
1: -typedef void (*btf_trace_xfer_secondary_pool)(void *, const char *, int, int, int, int);
1: +typedef void (*btf_trace_xfer_secondary_pool)(void *, const char *, int, int,
1: +                                              int, int);
1:  
1:  typedef void (*btf_trace_get_random_bytes)(void *, int, long unsigned int);
1:  
1:  typedef void (*btf_trace_get_random_bytes_arch)(void *, int, long unsigned int);
1:  
1: -typedef void (*btf_trace_extract_entropy)(void *, const char *, int, int, long unsigned int);
1: +typedef void (*btf_trace_extract_entropy)(void *, const char *, int, int,
1: +                                          long unsigned int);
1:  
1: -typedef void (*btf_trace_extract_entropy_user)(void *, const char *, int, int, long unsigned int);
1: +typedef void (*btf_trace_extract_entropy_user)(void *, const char *, int, int,
1: +                                               long unsigned int);
1:  
1:  typedef void (*btf_trace_random_read)(void *, int, int, int, int);
1:  
1: @@ -76194,1295 +77257,1297 @@ typedef void (*btf_trace_urandom_read)(void *, int, int, int);
1:  typedef void (*btf_trace_prandom_u32)(void *, unsigned int);
1:  
1:  struct poolinfo {
1: -	int poolbitshift;
1: -	int poolwords;
1: -	int poolbytes;
1: -	int poolfracbits;
1: -	int tap1;
1: -	int tap2;
1: -	int tap3;
1: -	int tap4;
1: -	int tap5;
1: +  int poolbitshift;
1: +  int poolwords;
1: +  int poolbytes;
1: +  int poolfracbits;
1: +  int tap1;
1: +  int tap2;
1: +  int tap3;
1: +  int tap4;
1: +  int tap5;
1:  };
1:  
1:  struct crng_state {
1: -	__u32 state[16];
1: -	long unsigned int init_time;
1: -	spinlock_t lock;
1: +  __u32 state[16];
1: +  long unsigned int init_time;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct entropy_store {
1: -	const struct poolinfo *poolinfo;
1: -	__u32 *pool;
1: -	const char *name;
1: -	spinlock_t lock;
1: -	short unsigned int add_ptr;
1: -	short unsigned int input_rotate;
1: -	int entropy_count;
1: -	unsigned int initialized: 1;
1: -	unsigned int last_data_init: 1;
1: -	__u8 last_data[10];
1: +  const struct poolinfo *poolinfo;
1: +  __u32 *pool;
1: +  const char *name;
1: +  spinlock_t lock;
1: +  short unsigned int add_ptr;
1: +  short unsigned int input_rotate;
1: +  int entropy_count;
1: +  unsigned int initialized : 1;
1: +  unsigned int last_data_init : 1;
1: +  __u8 last_data[10];
1:  };
1:  
1:  struct fast_pool {
1: -	__u32 pool[4];
1: -	long unsigned int last;
1: -	short unsigned int reg_idx;
1: -	unsigned char count;
1: +  __u32 pool[4];
1: +  long unsigned int last;
1: +  short unsigned int reg_idx;
1: +  unsigned char count;
1:  };
1:  
1:  struct batched_entropy {
1: -	union {
1: -		u64 entropy_u64[8];
1: -		u32 entropy_u32[16];
1: -	};
1: -	unsigned int position;
1: -	spinlock_t batch_lock;
1: +  union {
1: +    u64 entropy_u64[8];
1: +    u32 entropy_u32[16];
1: +  };
1: +  unsigned int position;
1: +  spinlock_t batch_lock;
1:  };
1:  
1:  struct virtio_console_config {
1: -	__virtio16 cols;
1: -	__virtio16 rows;
1: -	__virtio32 max_nr_ports;
1: -	__virtio32 emerg_wr;
1: +  __virtio16 cols;
1: +  __virtio16 rows;
1: +  __virtio32 max_nr_ports;
1: +  __virtio32 emerg_wr;
1:  };
1:  
1:  struct virtio_console_control {
1: -	__virtio32 id;
1: -	__virtio16 event;
1: -	__virtio16 value;
1: +  __virtio32 id;
1: +  __virtio16 event;
1: +  __virtio16 value;
1:  };
1:  
1:  struct ports_driver_data {
1: -	struct class *class;
1: -	struct dentry *debugfs_dir;
1: -	struct list_head portdevs;
1: -	unsigned int next_vtermno;
1: -	struct list_head consoles;
1: +  struct class *class;
1: +  struct dentry *debugfs_dir;
1: +  struct list_head portdevs;
1: +  unsigned int next_vtermno;
1: +  struct list_head consoles;
1:  };
1:  
1:  struct console___2 {
1: -	struct list_head list;
1: -	struct hvc_struct *hvc;
1: -	struct winsize ws;
1: -	u32 vtermno;
1: +  struct list_head list;
1: +  struct hvc_struct *hvc;
1: +  struct winsize ws;
1: +  u32 vtermno;
1:  };
1:  
1:  struct port_buffer {
1: -	char *buf;
1: -	size_t size;
1: -	size_t len;
1: -	size_t offset;
1: -	dma_addr_t dma;
1: -	struct device *dev;
1: -	struct list_head list;
1: -	unsigned int sgpages;
1: -	struct scatterlist sg[0];
1: +  char *buf;
1: +  size_t size;
1: +  size_t len;
1: +  size_t offset;
1: +  dma_addr_t dma;
1: +  struct device *dev;
1: +  struct list_head list;
1: +  unsigned int sgpages;
1: +  struct scatterlist sg[0];
1:  };
1:  
1:  struct ports_device {
1: -	struct list_head list;
1: -	struct work_struct control_work;
1: -	struct work_struct config_work;
1: -	struct list_head ports;
1: -	spinlock_t ports_lock;
1: -	spinlock_t c_ivq_lock;
1: -	spinlock_t c_ovq_lock;
1: -	u32 max_nr_ports;
1: -	struct virtio_device *vdev;
1: -	struct virtqueue *c_ivq;
1: -	struct virtqueue *c_ovq;
1: -	struct virtio_console_control cpkt;
1: -	struct virtqueue **in_vqs;
1: -	struct virtqueue **out_vqs;
1: -	int chr_major;
1: +  struct list_head list;
1: +  struct work_struct control_work;
1: +  struct work_struct config_work;
1: +  struct list_head ports;
1: +  spinlock_t ports_lock;
1: +  spinlock_t c_ivq_lock;
1: +  spinlock_t c_ovq_lock;
1: +  u32 max_nr_ports;
1: +  struct virtio_device *vdev;
1: +  struct virtqueue *c_ivq;
1: +  struct virtqueue *c_ovq;
1: +  struct virtio_console_control cpkt;
1: +  struct virtqueue **in_vqs;
1: +  struct virtqueue **out_vqs;
1: +  int chr_major;
1:  };
1:  
1:  struct port_stats {
1: -	long unsigned int bytes_sent;
1: -	long unsigned int bytes_received;
1: -	long unsigned int bytes_discarded;
1: +  long unsigned int bytes_sent;
1: +  long unsigned int bytes_received;
1: +  long unsigned int bytes_discarded;
1:  };
1:  
1:  struct port {
1: -	struct list_head list;
1: -	struct ports_device *portdev;
1: -	struct port_buffer *inbuf;
1: -	spinlock_t inbuf_lock;
1: -	spinlock_t outvq_lock;
1: -	struct virtqueue *in_vq;
1: -	struct virtqueue *out_vq;
1: -	struct dentry *debugfs_file;
1: -	struct port_stats stats;
1: -	struct console___2 cons;
1: -	struct cdev *cdev;
1: -	struct device *dev;
1: -	struct kref kref;
1: -	wait_queue_head_t waitqueue;
1: -	char *name;
1: -	struct fasync_struct *async_queue;
1: -	u32 id;
1: -	bool outvq_full;
1: -	bool host_connected;
1: -	bool guest_connected;
1: +  struct list_head list;
1: +  struct ports_device *portdev;
1: +  struct port_buffer *inbuf;
1: +  spinlock_t inbuf_lock;
1: +  spinlock_t outvq_lock;
1: +  struct virtqueue *in_vq;
1: +  struct virtqueue *out_vq;
1: +  struct dentry *debugfs_file;
1: +  struct port_stats stats;
1: +  struct console___2 cons;
1: +  struct cdev *cdev;
1: +  struct device *dev;
1: +  struct kref kref;
1: +  wait_queue_head_t waitqueue;
1: +  char *name;
1: +  struct fasync_struct *async_queue;
1: +  u32 id;
1: +  bool outvq_full;
1: +  bool host_connected;
1: +  bool guest_connected;
1:  };
1:  
1:  struct sg_list {
1: -	unsigned int n;
1: -	unsigned int size;
1: -	size_t len;
1: -	struct scatterlist *sg;
1: +  unsigned int n;
1: +  unsigned int size;
1: +  size_t len;
1: +  struct scatterlist *sg;
1:  };
1:  
1:  struct hpet_info {
1: -	long unsigned int hi_ireqfreq;
1: -	long unsigned int hi_flags;
1: -	short unsigned int hi_hpet;
1: -	short unsigned int hi_timer;
1: +  long unsigned int hi_ireqfreq;
1: +  long unsigned int hi_flags;
1: +  short unsigned int hi_hpet;
1: +  short unsigned int hi_timer;
1:  };
1:  
1:  struct hpet_timer {
1: -	u64 hpet_config;
1: -	union {
1: -		u64 _hpet_hc64;
1: -		u32 _hpet_hc32;
1: -		long unsigned int _hpet_compare;
1: -	} _u1;
1: -	u64 hpet_fsb[2];
1: +  u64 hpet_config;
1: +  union {
1: +    u64 _hpet_hc64;
1: +    u32 _hpet_hc32;
1: +    long unsigned int _hpet_compare;
1: +  } _u1;
1: +  u64 hpet_fsb[2];
1:  };
1:  
1:  struct hpet {
1: -	u64 hpet_cap;
1: -	u64 res0;
1: -	u64 hpet_config;
1: -	u64 res1;
1: -	u64 hpet_isr;
1: -	u64 res2[25];
1: -	union {
1: -		u64 _hpet_mc64;
1: -		u32 _hpet_mc32;
1: -		long unsigned int _hpet_mc;
1: -	} _u0;
1: -	u64 res3;
1: -	struct hpet_timer hpet_timers[1];
1: +  u64 hpet_cap;
1: +  u64 res0;
1: +  u64 hpet_config;
1: +  u64 res1;
1: +  u64 hpet_isr;
1: +  u64 res2[25];
1: +  union {
1: +    u64 _hpet_mc64;
1: +    u32 _hpet_mc32;
1: +    long unsigned int _hpet_mc;
1: +  } _u0;
1: +  u64 res3;
1: +  struct hpet_timer hpet_timers[1];
1:  };
1:  
1:  struct hpets;
1:  
1:  struct hpet_dev {
1: -	struct hpets *hd_hpets;
1: -	struct hpet *hd_hpet;
1: -	struct hpet_timer *hd_timer;
1: -	long unsigned int hd_ireqfreq;
1: -	long unsigned int hd_irqdata;
1: -	wait_queue_head_t hd_waitqueue;
1: -	struct fasync_struct *hd_async_queue;
1: -	unsigned int hd_flags;
1: -	unsigned int hd_irq;
1: -	unsigned int hd_hdwirq;
1: -	char hd_name[7];
1: +  struct hpets *hd_hpets;
1: +  struct hpet *hd_hpet;
1: +  struct hpet_timer *hd_timer;
1: +  long unsigned int hd_ireqfreq;
1: +  long unsigned int hd_irqdata;
1: +  wait_queue_head_t hd_waitqueue;
1: +  struct fasync_struct *hd_async_queue;
1: +  unsigned int hd_flags;
1: +  unsigned int hd_irq;
1: +  unsigned int hd_hdwirq;
1: +  char hd_name[7];
1:  };
1:  
1:  struct hpets {
1: -	struct hpets *hp_next;
1: -	struct hpet *hp_hpet;
1: -	long unsigned int hp_hpet_phys;
1: -	struct clocksource *hp_clocksource;
1: -	long long unsigned int hp_tick_freq;
1: -	long unsigned int hp_delta;
1: -	unsigned int hp_ntimer;
1: -	unsigned int hp_which;
1: -	struct hpet_dev hp_dev[0];
1: +  struct hpets *hp_next;
1: +  struct hpet *hp_hpet;
1: +  long unsigned int hp_hpet_phys;
1: +  struct clocksource *hp_clocksource;
1: +  long long unsigned int hp_tick_freq;
1: +  long unsigned int hp_delta;
1: +  unsigned int hp_ntimer;
1: +  unsigned int hp_which;
1: +  struct hpet_dev hp_dev[0];
1:  };
1:  
1:  struct compat_hpet_info {
1: -	compat_ulong_t hi_ireqfreq;
1: -	compat_ulong_t hi_flags;
1: -	short unsigned int hi_hpet;
1: -	short unsigned int hi_timer;
1: +  compat_ulong_t hi_ireqfreq;
1: +  compat_ulong_t hi_flags;
1: +  short unsigned int hi_hpet;
1: +  short unsigned int hi_timer;
1:  };
1:  
1:  struct nvram_ops {
1: -	ssize_t (*get_size)();
1: -	unsigned char (*read_byte)(int);
1: -	void (*write_byte)(unsigned char, int);
1: -	ssize_t (*read)(char *, size_t, loff_t *);
1: -	ssize_t (*write)(char *, size_t, loff_t *);
1: -	long int (*initialize)();
1: -	long int (*set_checksum)();
1: +  ssize_t (*get_size)();
1: +  unsigned char (*read_byte)(int);
1: +  void (*write_byte)(unsigned char, int);
1: +  ssize_t (*read)(char *, size_t, loff_t *);
1: +  ssize_t (*write)(char *, size_t, loff_t *);
1: +  long int (*initialize)();
1: +  long int (*set_checksum)();
1:  };
1:  
1:  struct intel_rng_hw {
1: -	struct pci_dev *dev;
1: -	void *mem;
1: -	u8 bios_cntl_off;
1: -	u8 bios_cntl_val;
1: -	u8 fwh_dec_en1_off;
1: -	u8 fwh_dec_en1_val;
1: -};
1: -
1: -enum {
1: -	VIA_STRFILT_CNT_SHIFT = 16,
1: -	VIA_STRFILT_FAIL = 32768,
1: -	VIA_STRFILT_ENABLE = 16384,
1: -	VIA_RAWBITS_ENABLE = 8192,
1: -	VIA_RNG_ENABLE = 64,
1: -	VIA_NOISESRC1 = 256,
1: -	VIA_NOISESRC2 = 512,
1: -	VIA_XSTORE_CNT_MASK = 15,
1: -	VIA_RNG_CHUNK_8 = 0,
1: -	VIA_RNG_CHUNK_4 = 1,
1: -	VIA_RNG_CHUNK_4_MASK = 4294967295,
1: -	VIA_RNG_CHUNK_2 = 2,
1: -	VIA_RNG_CHUNK_2_MASK = 65535,
1: -	VIA_RNG_CHUNK_1 = 3,
1: -	VIA_RNG_CHUNK_1_MASK = 255,
1: +  struct pci_dev *dev;
1: +  void *mem;
1: +  u8 bios_cntl_off;
1: +  u8 bios_cntl_val;
1: +  u8 fwh_dec_en1_off;
1: +  u8 fwh_dec_en1_val;
1: +};
1: +
1: +enum {
1: +  VIA_STRFILT_CNT_SHIFT = 16,
1: +  VIA_STRFILT_FAIL = 32768,
1: +  VIA_STRFILT_ENABLE = 16384,
1: +  VIA_RAWBITS_ENABLE = 8192,
1: +  VIA_RNG_ENABLE = 64,
1: +  VIA_NOISESRC1 = 256,
1: +  VIA_NOISESRC2 = 512,
1: +  VIA_XSTORE_CNT_MASK = 15,
1: +  VIA_RNG_CHUNK_8 = 0,
1: +  VIA_RNG_CHUNK_4 = 1,
1: +  VIA_RNG_CHUNK_4_MASK = 4294967295,
1: +  VIA_RNG_CHUNK_2 = 2,
1: +  VIA_RNG_CHUNK_2_MASK = 65535,
1: +  VIA_RNG_CHUNK_1 = 3,
1: +  VIA_RNG_CHUNK_1_MASK = 255,
1:  };
1:  
1:  struct agp_bridge_data___2;
1:  
1:  struct agp_memory {
1: -	struct agp_memory *next;
1: -	struct agp_memory *prev;
1: -	struct agp_bridge_data___2 *bridge;
1: -	struct page **pages;
1: -	size_t page_count;
1: -	int key;
1: -	int num_scratch_pages;
1: -	off_t pg_start;
1: -	u32 type;
1: -	u32 physical;
1: -	bool is_bound;
1: -	bool is_flushed;
1: -	struct list_head mapped_list;
1: -	struct scatterlist *sg_list;
1: -	int num_sg;
1: +  struct agp_memory *next;
1: +  struct agp_memory *prev;
1: +  struct agp_bridge_data___2 *bridge;
1: +  struct page **pages;
1: +  size_t page_count;
1: +  int key;
1: +  int num_scratch_pages;
1: +  off_t pg_start;
1: +  u32 type;
1: +  u32 physical;
1: +  bool is_bound;
1: +  bool is_flushed;
1: +  struct list_head mapped_list;
1: +  struct scatterlist *sg_list;
1: +  int num_sg;
1:  };
1:  
1:  struct agp_bridge_driver;
1:  
1:  struct agp_bridge_data___2 {
1: -	const struct agp_version *version;
1: -	const struct agp_bridge_driver *driver;
1: -	const struct vm_operations_struct *vm_ops;
1: -	void *previous_size;
1: -	void *current_size;
1: -	void *dev_private_data;
1: -	struct pci_dev *dev;
1: -	u32 *gatt_table;
1: -	u32 *gatt_table_real;
1: -	long unsigned int scratch_page;
1: -	struct page *scratch_page_page;
1: -	dma_addr_t scratch_page_dma;
1: -	long unsigned int gart_bus_addr;
1: -	long unsigned int gatt_bus_addr;
1: -	u32 mode;
1: -	enum chipset_type type;
1: -	long unsigned int *key_list;
1: -	atomic_t current_memory_agp;
1: -	atomic_t agp_in_use;
1: -	int max_memory_agp;
1: -	int aperture_size_idx;
1: -	int capndx;
1: -	int flags;
1: -	char major_version;
1: -	char minor_version;
1: -	struct list_head list;
1: -	u32 apbase_config;
1: -	struct list_head mapped_list;
1: -	spinlock_t mapped_lock;
1: +  const struct agp_version *version;
1: +  const struct agp_bridge_driver *driver;
1: +  const struct vm_operations_struct *vm_ops;
1: +  void *previous_size;
1: +  void *current_size;
1: +  void *dev_private_data;
1: +  struct pci_dev *dev;
1: +  u32 *gatt_table;
1: +  u32 *gatt_table_real;
1: +  long unsigned int scratch_page;
1: +  struct page *scratch_page_page;
1: +  dma_addr_t scratch_page_dma;
1: +  long unsigned int gart_bus_addr;
1: +  long unsigned int gatt_bus_addr;
1: +  u32 mode;
1: +  enum chipset_type type;
1: +  long unsigned int *key_list;
1: +  atomic_t current_memory_agp;
1: +  atomic_t agp_in_use;
1: +  int max_memory_agp;
1: +  int aperture_size_idx;
1: +  int capndx;
1: +  int flags;
1: +  char major_version;
1: +  char minor_version;
1: +  struct list_head list;
1: +  u32 apbase_config;
1: +  struct list_head mapped_list;
1: +  spinlock_t mapped_lock;
1:  };
1:  
1:  enum aper_size_type {
1: -	U8_APER_SIZE = 0,
1: -	U16_APER_SIZE = 1,
1: -	U32_APER_SIZE = 2,
1: -	LVL2_APER_SIZE = 3,
1: -	FIXED_APER_SIZE = 4,
1: +  U8_APER_SIZE = 0,
1: +  U16_APER_SIZE = 1,
1: +  U32_APER_SIZE = 2,
1: +  LVL2_APER_SIZE = 3,
1: +  FIXED_APER_SIZE = 4,
1:  };
1:  
1:  struct gatt_mask {
1: -	long unsigned int mask;
1: -	u32 type;
1: +  long unsigned int mask;
1: +  u32 type;
1:  };
1:  
1:  struct agp_bridge_driver {
1: -	struct module *owner;
1: -	const void *aperture_sizes;
1: -	int num_aperture_sizes;
1: -	enum aper_size_type size_type;
1: -	bool cant_use_aperture;
1: -	bool needs_scratch_page;
1: -	const struct gatt_mask *masks;
1: -	int (*fetch_size)();
1: -	int (*configure)();
1: -	void (*agp_enable)(struct agp_bridge_data___2 *, u32);
1: -	void (*cleanup)();
1: -	void (*tlb_flush)(struct agp_memory *);
1: -	long unsigned int (*mask_memory)(struct agp_bridge_data___2 *, dma_addr_t, int);
1: -	void (*cache_flush)();
1: -	int (*create_gatt_table)(struct agp_bridge_data___2 *);
1: -	int (*free_gatt_table)(struct agp_bridge_data___2 *);
1: -	int (*insert_memory)(struct agp_memory *, off_t, int);
1: -	int (*remove_memory)(struct agp_memory *, off_t, int);
1: -	struct agp_memory * (*alloc_by_type)(size_t, int);
1: -	void (*free_by_type)(struct agp_memory *);
1: -	struct page * (*agp_alloc_page)(struct agp_bridge_data___2 *);
1: -	int (*agp_alloc_pages)(struct agp_bridge_data___2 *, struct agp_memory *, size_t);
1: -	void (*agp_destroy_page)(struct page *, int);
1: -	void (*agp_destroy_pages)(struct agp_memory *);
1: -	int (*agp_type_to_mask_type)(struct agp_bridge_data___2 *, int);
1: +  struct module *owner;
1: +  const void *aperture_sizes;
1: +  int num_aperture_sizes;
1: +  enum aper_size_type size_type;
1: +  bool cant_use_aperture;
1: +  bool needs_scratch_page;
1: +  const struct gatt_mask *masks;
1: +  int (*fetch_size)();
1: +  int (*configure)();
1: +  void (*agp_enable)(struct agp_bridge_data___2 *, u32);
1: +  void (*cleanup)();
1: +  void (*tlb_flush)(struct agp_memory *);
1: +  long unsigned int (*mask_memory)(struct agp_bridge_data___2 *, dma_addr_t,
1: +                                   int);
1: +  void (*cache_flush)();
1: +  int (*create_gatt_table)(struct agp_bridge_data___2 *);
1: +  int (*free_gatt_table)(struct agp_bridge_data___2 *);
1: +  int (*insert_memory)(struct agp_memory *, off_t, int);
1: +  int (*remove_memory)(struct agp_memory *, off_t, int);
1: +  struct agp_memory *(*alloc_by_type)(size_t, int);
1: +  void (*free_by_type)(struct agp_memory *);
1: +  struct page *(*agp_alloc_page)(struct agp_bridge_data___2 *);
1: +  int (*agp_alloc_pages)(struct agp_bridge_data___2 *, struct agp_memory *,
1: +                         size_t);
1: +  void (*agp_destroy_page)(struct page *, int);
1: +  void (*agp_destroy_pages)(struct agp_memory *);
1: +  int (*agp_type_to_mask_type)(struct agp_bridge_data___2 *, int);
1:  };
1:  
1:  struct agp_info {
1: -	struct agp_version version;
1: -	u32 bridge_id;
1: -	u32 agp_mode;
1: -	long unsigned int aper_base;
1: -	size_t aper_size;
1: -	size_t pg_total;
1: -	size_t pg_system;
1: -	size_t pg_used;
1: +  struct agp_version version;
1: +  u32 bridge_id;
1: +  u32 agp_mode;
1: +  long unsigned int aper_base;
1: +  size_t aper_size;
1: +  size_t pg_total;
1: +  size_t pg_system;
1: +  size_t pg_used;
1:  };
1:  
1:  struct agp_setup {
1: -	u32 agp_mode;
1: +  u32 agp_mode;
1:  };
1:  
1:  struct agp_segment {
1: -	off_t pg_start;
1: -	size_t pg_count;
1: -	int prot;
1: +  off_t pg_start;
1: +  size_t pg_count;
1: +  int prot;
1:  };
1:  
1:  struct agp_segment_priv {
1: -	off_t pg_start;
1: -	size_t pg_count;
1: -	pgprot_t prot;
1: +  off_t pg_start;
1: +  size_t pg_count;
1: +  pgprot_t prot;
1:  };
1:  
1:  struct agp_region {
1: -	pid_t pid;
1: -	size_t seg_count;
1: -	struct agp_segment *seg_list;
1: +  pid_t pid;
1: +  size_t seg_count;
1: +  struct agp_segment *seg_list;
1:  };
1:  
1:  struct agp_allocate {
1: -	int key;
1: -	size_t pg_count;
1: -	u32 type;
1: -	u32 physical;
1: +  int key;
1: +  size_t pg_count;
1: +  u32 type;
1: +  u32 physical;
1:  };
1:  
1:  struct agp_bind {
1: -	int key;
1: -	off_t pg_start;
1: +  int key;
1: +  off_t pg_start;
1:  };
1:  
1:  struct agp_unbind {
1: -	int key;
1: -	u32 priority;
1: +  int key;
1: +  u32 priority;
1:  };
1:  
1:  struct agp_client {
1: -	struct agp_client *next;
1: -	struct agp_client *prev;
1: -	pid_t pid;
1: -	int num_segments;
1: -	struct agp_segment_priv **segments;
1: +  struct agp_client *next;
1: +  struct agp_client *prev;
1: +  pid_t pid;
1: +  int num_segments;
1: +  struct agp_segment_priv **segments;
1:  };
1:  
1:  struct agp_controller {
1: -	struct agp_controller *next;
1: -	struct agp_controller *prev;
1: -	pid_t pid;
1: -	int num_clients;
1: -	struct agp_memory *pool;
1: -	struct agp_client *clients;
1: +  struct agp_controller *next;
1: +  struct agp_controller *prev;
1: +  pid_t pid;
1: +  int num_clients;
1: +  struct agp_memory *pool;
1: +  struct agp_client *clients;
1:  };
1:  
1:  struct agp_file_private {
1: -	struct agp_file_private *next;
1: -	struct agp_file_private *prev;
1: -	pid_t my_pid;
1: -	long unsigned int access_flags;
1: +  struct agp_file_private *next;
1: +  struct agp_file_private *prev;
1: +  pid_t my_pid;
1: +  long unsigned int access_flags;
1:  };
1:  
1:  struct agp_front_data {
1: -	struct mutex agp_mutex;
1: -	struct agp_controller *current_controller;
1: -	struct agp_controller *controllers;
1: -	struct agp_file_private *file_priv_list;
1: -	bool used_by_controller;
1: -	bool backend_acquired;
1: +  struct mutex agp_mutex;
1: +  struct agp_controller *current_controller;
1: +  struct agp_controller *controllers;
1: +  struct agp_file_private *file_priv_list;
1: +  bool used_by_controller;
1: +  bool backend_acquired;
1:  };
1:  
1:  struct aper_size_info_8 {
1: -	int size;
1: -	int num_entries;
1: -	int page_order;
1: -	u8 size_value;
1: +  int size;
1: +  int num_entries;
1: +  int page_order;
1: +  u8 size_value;
1:  };
1:  
1:  struct aper_size_info_16 {
1: -	int size;
1: -	int num_entries;
1: -	int page_order;
1: -	u16 size_value;
1: +  int size;
1: +  int num_entries;
1: +  int page_order;
1: +  u16 size_value;
1:  };
1:  
1:  struct aper_size_info_32 {
1: -	int size;
1: -	int num_entries;
1: -	int page_order;
1: -	u32 size_value;
1: +  int size;
1: +  int num_entries;
1: +  int page_order;
1: +  u32 size_value;
1:  };
1:  
1:  struct aper_size_info_lvl2 {
1: -	int size;
1: -	int num_entries;
1: -	u32 size_value;
1: +  int size;
1: +  int num_entries;
1: +  u32 size_value;
1:  };
1:  
1:  struct aper_size_info_fixed {
1: -	int size;
1: -	int num_entries;
1: -	int page_order;
1: +  int size;
1: +  int num_entries;
1: +  int page_order;
1:  };
1:  
1:  struct agp_3_5_dev {
1: -	struct list_head list;
1: -	u8 capndx;
1: -	u32 maxbw;
1: -	struct pci_dev *dev;
1: +  struct list_head list;
1: +  u8 capndx;
1: +  u32 maxbw;
1: +  struct pci_dev *dev;
1:  };
1:  
1:  struct isoch_data {
1: -	u32 maxbw;
1: -	u32 n;
1: -	u32 y;
1: -	u32 l;
1: -	u32 rq;
1: -	struct agp_3_5_dev *dev;
1: +  u32 maxbw;
1: +  u32 n;
1: +  u32 y;
1: +  u32 l;
1: +  u32 rq;
1: +  struct agp_3_5_dev *dev;
1:  };
1:  
1:  struct agp_info32 {
1: -	struct agp_version version;
1: -	u32 bridge_id;
1: -	u32 agp_mode;
1: -	compat_long_t aper_base;
1: -	compat_size_t aper_size;
1: -	compat_size_t pg_total;
1: -	compat_size_t pg_system;
1: -	compat_size_t pg_used;
1: +  struct agp_version version;
1: +  u32 bridge_id;
1: +  u32 agp_mode;
1: +  compat_long_t aper_base;
1: +  compat_size_t aper_size;
1: +  compat_size_t pg_total;
1: +  compat_size_t pg_system;
1: +  compat_size_t pg_used;
1:  };
1:  
1:  struct agp_segment32 {
1: -	compat_off_t pg_start;
1: -	compat_size_t pg_count;
1: -	compat_int_t prot;
1: +  compat_off_t pg_start;
1: +  compat_size_t pg_count;
1: +  compat_int_t prot;
1:  };
1:  
1:  struct agp_region32 {
1: -	compat_pid_t pid;
1: -	compat_size_t seg_count;
1: -	struct agp_segment32 *seg_list;
1: +  compat_pid_t pid;
1: +  compat_size_t seg_count;
1: +  struct agp_segment32 *seg_list;
1:  };
1:  
1:  struct agp_allocate32 {
1: -	compat_int_t key;
1: -	compat_size_t pg_count;
1: -	u32 type;
1: -	u32 physical;
1: +  compat_int_t key;
1: +  compat_size_t pg_count;
1: +  u32 type;
1: +  u32 physical;
1:  };
1:  
1:  struct agp_bind32 {
1: -	compat_int_t key;
1: -	compat_off_t pg_start;
1: +  compat_int_t key;
1: +  compat_off_t pg_start;
1:  };
1:  
1:  struct agp_unbind32 {
1: -	compat_int_t key;
1: -	u32 priority;
1: +  compat_int_t key;
1: +  u32 priority;
1:  };
1:  
1:  struct intel_agp_driver_description {
1: -	unsigned int chip_id;
1: -	char *name;
1: -	const struct agp_bridge_driver *driver;
1: +  unsigned int chip_id;
1: +  char *name;
1: +  const struct agp_bridge_driver *driver;
1:  };
1:  
1:  struct intel_gtt_driver {
1: -	unsigned int gen: 8;
1: -	unsigned int is_g33: 1;
1: -	unsigned int is_pineview: 1;
1: -	unsigned int is_ironlake: 1;
1: -	unsigned int has_pgtbl_enable: 1;
1: -	unsigned int dma_mask_size: 8;
1: -	int (*setup)();
1: -	void (*cleanup)();
1: -	void (*write_entry)(dma_addr_t, unsigned int, unsigned int);
1: -	bool (*check_flags)(unsigned int);
1: -	void (*chipset_flush)();
1: +  unsigned int gen : 8;
1: +  unsigned int is_g33 : 1;
1: +  unsigned int is_pineview : 1;
1: +  unsigned int is_ironlake : 1;
1: +  unsigned int has_pgtbl_enable : 1;
1: +  unsigned int dma_mask_size : 8;
1: +  int (*setup)();
1: +  void (*cleanup)();
1: +  void (*write_entry)(dma_addr_t, unsigned int, unsigned int);
1: +  bool (*check_flags)(unsigned int);
1: +  void (*chipset_flush)();
1:  };
1:  
1:  struct _intel_private {
1: -	const struct intel_gtt_driver *driver;
1: -	struct pci_dev *pcidev;
1: -	struct pci_dev *bridge_dev;
1: -	u8 *registers;
1: -	phys_addr_t gtt_phys_addr;
1: -	u32 PGETBL_save;
1: -	u32 *gtt;
1: -	bool clear_fake_agp;
1: -	int num_dcache_entries;
1: -	void *i9xx_flush_page;
1: -	char *i81x_gtt_table;
1: -	struct resource ifp_resource;
1: -	int resource_valid;
1: -	struct page *scratch_page;
1: -	phys_addr_t scratch_page_dma;
1: -	int refcount;
1: -	unsigned int needs_dmar: 1;
1: -	phys_addr_t gma_bus_addr;
1: -	resource_size_t stolen_size;
1: -	unsigned int gtt_total_entries;
1: -	unsigned int gtt_mappable_entries;
1: +  const struct intel_gtt_driver *driver;
1: +  struct pci_dev *pcidev;
1: +  struct pci_dev *bridge_dev;
1: +  u8 *registers;
1: +  phys_addr_t gtt_phys_addr;
1: +  u32 PGETBL_save;
1: +  u32 *gtt;
1: +  bool clear_fake_agp;
1: +  int num_dcache_entries;
1: +  void *i9xx_flush_page;
1: +  char *i81x_gtt_table;
1: +  struct resource ifp_resource;
1: +  int resource_valid;
1: +  struct page *scratch_page;
1: +  phys_addr_t scratch_page_dma;
1: +  int refcount;
1: +  unsigned int needs_dmar : 1;
1: +  phys_addr_t gma_bus_addr;
1: +  resource_size_t stolen_size;
1: +  unsigned int gtt_total_entries;
1: +  unsigned int gtt_mappable_entries;
1:  };
1:  
1:  struct intel_gtt_driver_description {
1: -	unsigned int gmch_chip_id;
1: -	char *name;
1: -	const struct intel_gtt_driver *gtt_driver;
1: +  unsigned int gmch_chip_id;
1: +  char *name;
1: +  const struct intel_gtt_driver *gtt_driver;
1:  };
1:  
1:  struct agp_device_ids {
1: -	short unsigned int device_id;
1: -	enum chipset_type chipset;
1: -	const char *chipset_name;
1: -	int (*chipset_setup)(struct pci_dev *);
1: +  short unsigned int device_id;
1: +  enum chipset_type chipset;
1: +  const char *chipset_name;
1: +  int (*chipset_setup)(struct pci_dev *);
1:  };
1:  
1:  enum tpm2_startup_types {
1: -	TPM2_SU_CLEAR = 0,
1: -	TPM2_SU_STATE = 1,
1: +  TPM2_SU_CLEAR = 0,
1: +  TPM2_SU_STATE = 1,
1:  };
1:  
1:  enum tpm_chip_flags {
1: -	TPM_CHIP_FLAG_TPM2 = 2,
1: -	TPM_CHIP_FLAG_IRQ = 4,
1: -	TPM_CHIP_FLAG_VIRTUAL = 8,
1: -	TPM_CHIP_FLAG_HAVE_TIMEOUTS = 16,
1: -	TPM_CHIP_FLAG_ALWAYS_POWERED = 32,
1: -	TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED = 64,
1: +  TPM_CHIP_FLAG_TPM2 = 2,
1: +  TPM_CHIP_FLAG_IRQ = 4,
1: +  TPM_CHIP_FLAG_VIRTUAL = 8,
1: +  TPM_CHIP_FLAG_HAVE_TIMEOUTS = 16,
1: +  TPM_CHIP_FLAG_ALWAYS_POWERED = 32,
1: +  TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED = 64,
1:  };
1:  
1:  enum tpm2_structures {
1: -	TPM2_ST_NO_SESSIONS = 32769,
1: -	TPM2_ST_SESSIONS = 32770,
1: +  TPM2_ST_NO_SESSIONS = 32769,
1: +  TPM2_ST_SESSIONS = 32770,
1:  };
1:  
1:  enum tpm2_return_codes {
1: -	TPM2_RC_SUCCESS = 0,
1: -	TPM2_RC_HASH = 131,
1: -	TPM2_RC_HANDLE = 139,
1: -	TPM2_RC_INITIALIZE = 256,
1: -	TPM2_RC_FAILURE = 257,
1: -	TPM2_RC_DISABLED = 288,
1: -	TPM2_RC_COMMAND_CODE = 323,
1: -	TPM2_RC_TESTING = 2314,
1: -	TPM2_RC_REFERENCE_H0 = 2320,
1: -	TPM2_RC_RETRY = 2338,
1: +  TPM2_RC_SUCCESS = 0,
1: +  TPM2_RC_HASH = 131,
1: +  TPM2_RC_HANDLE = 139,
1: +  TPM2_RC_INITIALIZE = 256,
1: +  TPM2_RC_FAILURE = 257,
1: +  TPM2_RC_DISABLED = 288,
1: +  TPM2_RC_COMMAND_CODE = 323,
1: +  TPM2_RC_TESTING = 2314,
1: +  TPM2_RC_REFERENCE_H0 = 2320,
1: +  TPM2_RC_RETRY = 2338,
1:  };
1:  
1:  struct tpm_header {
1: -	__be16 tag;
1: -	__be32 length;
1: -	union {
1: -		__be32 ordinal;
1: -		__be32 return_code;
1: -	};
1: +  __be16 tag;
1: +  __be32 length;
1: +  union {
1: +    __be32 ordinal;
1: +    __be32 return_code;
1: +  };
1:  } __attribute__((packed));
1:  
1:  struct file_priv {
1: -	struct tpm_chip *chip;
1: -	struct tpm_space *space;
1: -	struct mutex buffer_mutex;
1: -	struct timer_list user_read_timer;
1: -	struct work_struct timeout_work;
1: -	struct work_struct async_work;
1: -	wait_queue_head_t async_wait;
1: -	ssize_t response_length;
1: -	bool response_read;
1: -	bool command_enqueued;
1: -	u8 data_buffer[4096];
1: +  struct tpm_chip *chip;
1: +  struct tpm_space *space;
1: +  struct mutex buffer_mutex;
1: +  struct timer_list user_read_timer;
1: +  struct work_struct timeout_work;
1: +  struct work_struct async_work;
1: +  wait_queue_head_t async_wait;
1: +  ssize_t response_length;
1: +  bool response_read;
1: +  bool command_enqueued;
1: +  u8 data_buffer[4096];
1:  };
1:  
1:  enum TPM_OPS_FLAGS {
1: -	TPM_OPS_AUTO_STARTUP = 1,
1: +  TPM_OPS_AUTO_STARTUP = 1,
1:  };
1:  
1:  enum tpm2_timeouts {
1: -	TPM2_TIMEOUT_A = 750,
1: -	TPM2_TIMEOUT_B = 2000,
1: -	TPM2_TIMEOUT_C = 200,
1: -	TPM2_TIMEOUT_D = 30,
1: -	TPM2_DURATION_SHORT = 20,
1: -	TPM2_DURATION_MEDIUM = 750,
1: -	TPM2_DURATION_LONG = 2000,
1: -	TPM2_DURATION_LONG_LONG = 300000,
1: -	TPM2_DURATION_DEFAULT = 120000,
1: +  TPM2_TIMEOUT_A = 750,
1: +  TPM2_TIMEOUT_B = 2000,
1: +  TPM2_TIMEOUT_C = 200,
1: +  TPM2_TIMEOUT_D = 30,
1: +  TPM2_DURATION_SHORT = 20,
1: +  TPM2_DURATION_MEDIUM = 750,
1: +  TPM2_DURATION_LONG = 2000,
1: +  TPM2_DURATION_LONG_LONG = 300000,
1: +  TPM2_DURATION_DEFAULT = 120000,
1:  };
1:  
1:  enum tpm2_command_codes {
1: -	TPM2_CC_FIRST = 287,
1: -	TPM2_CC_HIERARCHY_CONTROL = 289,
1: -	TPM2_CC_HIERARCHY_CHANGE_AUTH = 297,
1: -	TPM2_CC_CREATE_PRIMARY = 305,
1: -	TPM2_CC_SEQUENCE_COMPLETE = 318,
1: -	TPM2_CC_SELF_TEST = 323,
1: -	TPM2_CC_STARTUP = 324,
1: -	TPM2_CC_SHUTDOWN = 325,
1: -	TPM2_CC_NV_READ = 334,
1: -	TPM2_CC_CREATE = 339,
1: -	TPM2_CC_LOAD = 343,
1: -	TPM2_CC_SEQUENCE_UPDATE = 348,
1: -	TPM2_CC_UNSEAL = 350,
1: -	TPM2_CC_CONTEXT_LOAD = 353,
1: -	TPM2_CC_CONTEXT_SAVE = 354,
1: -	TPM2_CC_FLUSH_CONTEXT = 357,
1: -	TPM2_CC_VERIFY_SIGNATURE = 375,
1: -	TPM2_CC_GET_CAPABILITY = 378,
1: -	TPM2_CC_GET_RANDOM = 379,
1: -	TPM2_CC_PCR_READ = 382,
1: -	TPM2_CC_PCR_EXTEND = 386,
1: -	TPM2_CC_EVENT_SEQUENCE_COMPLETE = 389,
1: -	TPM2_CC_HASH_SEQUENCE_START = 390,
1: -	TPM2_CC_CREATE_LOADED = 401,
1: -	TPM2_CC_LAST = 403,
1: +  TPM2_CC_FIRST = 287,
1: +  TPM2_CC_HIERARCHY_CONTROL = 289,
1: +  TPM2_CC_HIERARCHY_CHANGE_AUTH = 297,
1: +  TPM2_CC_CREATE_PRIMARY = 305,
1: +  TPM2_CC_SEQUENCE_COMPLETE = 318,
1: +  TPM2_CC_SELF_TEST = 323,
1: +  TPM2_CC_STARTUP = 324,
1: +  TPM2_CC_SHUTDOWN = 325,
1: +  TPM2_CC_NV_READ = 334,
1: +  TPM2_CC_CREATE = 339,
1: +  TPM2_CC_LOAD = 343,
1: +  TPM2_CC_SEQUENCE_UPDATE = 348,
1: +  TPM2_CC_UNSEAL = 350,
1: +  TPM2_CC_CONTEXT_LOAD = 353,
1: +  TPM2_CC_CONTEXT_SAVE = 354,
1: +  TPM2_CC_FLUSH_CONTEXT = 357,
1: +  TPM2_CC_VERIFY_SIGNATURE = 375,
1: +  TPM2_CC_GET_CAPABILITY = 378,
1: +  TPM2_CC_GET_RANDOM = 379,
1: +  TPM2_CC_PCR_READ = 382,
1: +  TPM2_CC_PCR_EXTEND = 386,
1: +  TPM2_CC_EVENT_SEQUENCE_COMPLETE = 389,
1: +  TPM2_CC_HASH_SEQUENCE_START = 390,
1: +  TPM2_CC_CREATE_LOADED = 401,
1: +  TPM2_CC_LAST = 403,
1:  };
1:  
1:  struct tpm_buf {
1: -	unsigned int flags;
1: -	u8 *data;
1: +  unsigned int flags;
1: +  u8 *data;
1:  };
1:  
1:  enum tpm_timeout {
1: -	TPM_TIMEOUT = 5,
1: -	TPM_TIMEOUT_RETRY = 100,
1: -	TPM_TIMEOUT_RANGE_US = 300,
1: -	TPM_TIMEOUT_POLL = 1,
1: -	TPM_TIMEOUT_USECS_MIN = 100,
1: -	TPM_TIMEOUT_USECS_MAX = 500,
1: +  TPM_TIMEOUT = 5,
1: +  TPM_TIMEOUT_RETRY = 100,
1: +  TPM_TIMEOUT_RANGE_US = 300,
1: +  TPM_TIMEOUT_POLL = 1,
1: +  TPM_TIMEOUT_USECS_MIN = 100,
1: +  TPM_TIMEOUT_USECS_MAX = 500,
1:  };
1:  
1:  enum tpm_buf_flags {
1: -	TPM_BUF_OVERFLOW = 1,
1: +  TPM_BUF_OVERFLOW = 1,
1:  };
1:  
1:  struct stclear_flags_t {
1: -	__be16 tag;
1: -	u8 deactivated;
1: -	u8 disableForceClear;
1: -	u8 physicalPresence;
1: -	u8 physicalPresenceLock;
1: -	u8 bGlobalLock;
1: +  __be16 tag;
1: +  u8 deactivated;
1: +  u8 disableForceClear;
1: +  u8 physicalPresence;
1: +  u8 physicalPresenceLock;
1: +  u8 bGlobalLock;
1:  } __attribute__((packed));
1:  
1:  struct tpm1_version {
1: -	u8 major;
1: -	u8 minor;
1: -	u8 rev_major;
1: -	u8 rev_minor;
1: +  u8 major;
1: +  u8 minor;
1: +  u8 rev_major;
1: +  u8 rev_minor;
1:  };
1:  
1:  struct tpm1_version2 {
1: -	__be16 tag;
1: -	struct tpm1_version version;
1: +  __be16 tag;
1: +  struct tpm1_version version;
1:  };
1:  
1:  struct timeout_t {
1: -	__be32 a;
1: -	__be32 b;
1: -	__be32 c;
1: -	__be32 d;
1: +  __be32 a;
1: +  __be32 b;
1: +  __be32 c;
1: +  __be32 d;
1:  };
1:  
1:  struct duration_t {
1: -	__be32 tpm_short;
1: -	__be32 tpm_medium;
1: -	__be32 tpm_long;
1: +  __be32 tpm_short;
1: +  __be32 tpm_medium;
1: +  __be32 tpm_long;
1:  };
1:  
1:  struct permanent_flags_t {
1: -	__be16 tag;
1: -	u8 disable;
1: -	u8 ownership;
1: -	u8 deactivated;
1: -	u8 readPubek;
1: -	u8 disableOwnerClear;
1: -	u8 allowMaintenance;
1: -	u8 physicalPresenceLifetimeLock;
1: -	u8 physicalPresenceHWEnable;
1: -	u8 physicalPresenceCMDEnable;
1: -	u8 CEKPUsed;
1: -	u8 TPMpost;
1: -	u8 TPMpostLock;
1: -	u8 FIPS;
1: -	u8 operator;
1: -	u8 enableRevokeEK;
1: -	u8 nvLocked;
1: -	u8 readSRKPub;
1: -	u8 tpmEstablished;
1: -	u8 maintenanceDone;
1: -	u8 disableFullDALogicInfo;
1: +  __be16 tag;
1: +  u8 disable;
1: +  u8 ownership;
1: +  u8 deactivated;
1: +  u8 readPubek;
1: +  u8 disableOwnerClear;
1: +  u8 allowMaintenance;
1: +  u8 physicalPresenceLifetimeLock;
1: +  u8 physicalPresenceHWEnable;
1: +  u8 physicalPresenceCMDEnable;
1: +  u8 CEKPUsed;
1: +  u8 TPMpost;
1: +  u8 TPMpostLock;
1: +  u8 FIPS;
1: +  u8 operator;
1: +  u8 enableRevokeEK;
1: +  u8 nvLocked;
1: +  u8 readSRKPub;
1: +  u8 tpmEstablished;
1: +  u8 maintenanceDone;
1: +  u8 disableFullDALogicInfo;
1:  };
1:  
1:  typedef union {
1: -	struct permanent_flags_t perm_flags;
1: -	struct stclear_flags_t stclear_flags;
1: -	__u8 owned;
1: -	__be32 num_pcrs;
1: -	struct tpm1_version version1;
1: -	struct tpm1_version2 version2;
1: -	__be32 manufacturer_id;
1: -	struct timeout_t timeout;
1: -	struct duration_t duration;
1: +  struct permanent_flags_t perm_flags;
1: +  struct stclear_flags_t stclear_flags;
1: +  __u8 owned;
1: +  __be32 num_pcrs;
1: +  struct tpm1_version version1;
1: +  struct tpm1_version2 version2;
1: +  __be32 manufacturer_id;
1: +  struct timeout_t timeout;
1: +  struct duration_t duration;
1:  } cap_t;
1:  
1:  enum tpm_capabilities {
1: -	TPM_CAP_FLAG = 4,
1: -	TPM_CAP_PROP = 5,
1: -	TPM_CAP_VERSION_1_1 = 6,
1: -	TPM_CAP_VERSION_1_2 = 26,
1: +  TPM_CAP_FLAG = 4,
1: +  TPM_CAP_PROP = 5,
1: +  TPM_CAP_VERSION_1_1 = 6,
1: +  TPM_CAP_VERSION_1_2 = 26,
1:  };
1:  
1:  enum tpm_sub_capabilities {
1: -	TPM_CAP_PROP_PCR = 257,
1: -	TPM_CAP_PROP_MANUFACTURER = 259,
1: -	TPM_CAP_FLAG_PERM = 264,
1: -	TPM_CAP_FLAG_VOL = 265,
1: -	TPM_CAP_PROP_OWNER = 273,
1: -	TPM_CAP_PROP_TIS_TIMEOUT = 277,
1: -	TPM_CAP_PROP_TIS_DURATION = 288,
1: +  TPM_CAP_PROP_PCR = 257,
1: +  TPM_CAP_PROP_MANUFACTURER = 259,
1: +  TPM_CAP_FLAG_PERM = 264,
1: +  TPM_CAP_FLAG_VOL = 265,
1: +  TPM_CAP_PROP_OWNER = 273,
1: +  TPM_CAP_PROP_TIS_TIMEOUT = 277,
1: +  TPM_CAP_PROP_TIS_DURATION = 288,
1:  };
1:  
1:  struct tpm1_get_random_out {
1: -	__be32 rng_data_len;
1: -	u8 rng_data[128];
1: +  __be32 rng_data_len;
1: +  u8 rng_data[128];
1:  };
1:  
1:  enum tpm2_const {
1: -	TPM2_PLATFORM_PCR = 24,
1: -	TPM2_PCR_SELECT_MIN = 3,
1: +  TPM2_PLATFORM_PCR = 24,
1: +  TPM2_PCR_SELECT_MIN = 3,
1:  };
1:  
1:  enum tpm2_permanent_handles {
1: -	TPM2_RS_PW = 1073741833,
1: +  TPM2_RS_PW = 1073741833,
1:  };
1:  
1:  enum tpm2_capabilities {
1: -	TPM2_CAP_HANDLES = 1,
1: -	TPM2_CAP_COMMANDS = 2,
1: -	TPM2_CAP_PCRS = 5,
1: -	TPM2_CAP_TPM_PROPERTIES = 6,
1: +  TPM2_CAP_HANDLES = 1,
1: +  TPM2_CAP_COMMANDS = 2,
1: +  TPM2_CAP_PCRS = 5,
1: +  TPM2_CAP_TPM_PROPERTIES = 6,
1:  };
1:  
1:  enum tpm2_properties {
1: -	TPM_PT_TOTAL_COMMANDS = 297,
1: +  TPM_PT_TOTAL_COMMANDS = 297,
1:  };
1:  
1:  enum tpm2_cc_attrs {
1: -	TPM2_CC_ATTR_CHANDLES = 25,
1: -	TPM2_CC_ATTR_RHANDLE = 28,
1: +  TPM2_CC_ATTR_CHANDLES = 25,
1: +  TPM2_CC_ATTR_RHANDLE = 28,
1:  };
1:  
1:  struct tpm2_hash {
1: -	unsigned int crypto_id;
1: -	unsigned int tpm_id;
1: +  unsigned int crypto_id;
1: +  unsigned int tpm_id;
1:  };
1:  
1:  struct tpm2_pcr_read_out {
1: -	__be32 update_cnt;
1: -	__be32 pcr_selects_cnt;
1: -	__be16 hash_alg;
1: -	u8 pcr_select_size;
1: -	u8 pcr_select[3];
1: -	__be32 digests_cnt;
1: -	__be16 digest_size;
1: -	u8 digest[0];
1: +  __be32 update_cnt;
1: +  __be32 pcr_selects_cnt;
1: +  __be16 hash_alg;
1: +  u8 pcr_select_size;
1: +  u8 pcr_select[3];
1: +  __be32 digests_cnt;
1: +  __be16 digest_size;
1: +  u8 digest[0];
1:  } __attribute__((packed));
1:  
1:  struct tpm2_null_auth_area {
1: -	__be32 handle;
1: -	__be16 nonce_size;
1: -	u8 attributes;
1: -	__be16 auth_size;
1: +  __be32 handle;
1: +  __be16 nonce_size;
1: +  u8 attributes;
1: +  __be16 auth_size;
1:  } __attribute__((packed));
1:  
1:  struct tpm2_get_random_out {
1: -	__be16 size;
1: -	u8 buffer[128];
1: +  __be16 size;
1: +  u8 buffer[128];
1:  };
1:  
1:  struct tpm2_get_cap_out {
1: -	u8 more_data;
1: -	__be32 subcap_id;
1: -	__be32 property_cnt;
1: -	__be32 property_id;
1: -	__be32 value;
1: +  u8 more_data;
1: +  __be32 subcap_id;
1: +  __be32 property_cnt;
1: +  __be32 property_id;
1: +  __be32 value;
1:  } __attribute__((packed));
1:  
1:  struct tpm2_pcr_selection {
1: -	__be16 hash_alg;
1: -	u8 size_of_select;
1: -	u8 pcr_select[3];
1: +  __be16 hash_alg;
1: +  u8 size_of_select;
1: +  u8 pcr_select[3];
1:  };
1:  
1:  struct tpmrm_priv {
1: -	struct file_priv priv;
1: -	struct tpm_space space;
1: +  struct file_priv priv;
1: +  struct tpm_space space;
1:  };
1:  
1:  enum tpm2_handle_types {
1: -	TPM2_HT_HMAC_SESSION = 33554432,
1: -	TPM2_HT_POLICY_SESSION = 50331648,
1: -	TPM2_HT_TRANSIENT = 2147483648,
1: +  TPM2_HT_HMAC_SESSION = 33554432,
1: +  TPM2_HT_POLICY_SESSION = 50331648,
1: +  TPM2_HT_TRANSIENT = 2147483648,
1:  };
1:  
1:  struct tpm2_context {
1: -	__be64 sequence;
1: -	__be32 saved_handle;
1: -	__be32 hierarchy;
1: -	__be16 blob_size;
1: +  __be64 sequence;
1: +  __be32 saved_handle;
1: +  __be32 hierarchy;
1: +  __be16 blob_size;
1:  } __attribute__((packed));
1:  
1:  struct tpm2_cap_handles {
1: -	u8 more_data;
1: -	__be32 capability;
1: -	__be32 count;
1: -	__be32 handles[0];
1: +  u8 more_data;
1: +  __be32 capability;
1: +  __be32 count;
1: +  __be32 handles[0];
1:  } __attribute__((packed));
1:  
1:  struct tpm_readpubek_out {
1: -	u8 algorithm[4];
1: -	u8 encscheme[2];
1: -	u8 sigscheme[2];
1: -	__be32 paramsize;
1: -	u8 parameters[12];
1: -	__be32 keysize;
1: -	u8 modulus[256];
1: -	u8 checksum[20];
1: +  u8 algorithm[4];
1: +  u8 encscheme[2];
1: +  u8 sigscheme[2];
1: +  __be32 paramsize;
1: +  u8 parameters[12];
1: +  __be32 keysize;
1: +  u8 modulus[256];
1: +  u8 checksum[20];
1:  };
1:  
1:  struct tcpa_event {
1: -	u32 pcr_index;
1: -	u32 event_type;
1: -	u8 pcr_value[20];
1: -	u32 event_size;
1: -	u8 event_data[0];
1: +  u32 pcr_index;
1: +  u32 event_type;
1: +  u8 pcr_value[20];
1: +  u32 event_size;
1: +  u8 event_data[0];
1:  };
1:  
1:  enum tcpa_event_types {
1: -	PREBOOT = 0,
1: -	POST_CODE = 1,
1: -	UNUSED = 2,
1: -	NO_ACTION = 3,
1: -	SEPARATOR = 4,
1: -	ACTION = 5,
1: -	EVENT_TAG = 6,
1: -	SCRTM_CONTENTS = 7,
1: -	SCRTM_VERSION = 8,
1: -	CPU_MICROCODE = 9,
1: -	PLATFORM_CONFIG_FLAGS = 10,
1: -	TABLE_OF_DEVICES = 11,
1: -	COMPACT_HASH = 12,
1: -	IPL = 13,
1: -	IPL_PARTITION_DATA = 14,
1: -	NONHOST_CODE = 15,
1: -	NONHOST_CONFIG = 16,
1: -	NONHOST_INFO = 17,
1: +  PREBOOT = 0,
1: +  POST_CODE = 1,
1: +  UNUSED = 2,
1: +  NO_ACTION = 3,
1: +  SEPARATOR = 4,
1: +  ACTION = 5,
1: +  EVENT_TAG = 6,
1: +  SCRTM_CONTENTS = 7,
1: +  SCRTM_VERSION = 8,
1: +  CPU_MICROCODE = 9,
1: +  PLATFORM_CONFIG_FLAGS = 10,
1: +  TABLE_OF_DEVICES = 11,
1: +  COMPACT_HASH = 12,
1: +  IPL = 13,
1: +  IPL_PARTITION_DATA = 14,
1: +  NONHOST_CODE = 15,
1: +  NONHOST_CONFIG = 16,
1: +  NONHOST_INFO = 17,
1:  };
1:  
1:  struct tcpa_pc_event {
1: -	u32 event_id;
1: -	u32 event_size;
1: -	u8 event_data[0];
1: +  u32 event_id;
1: +  u32 event_size;
1: +  u8 event_data[0];
1:  };
1:  
1:  enum tcpa_pc_event_ids {
1: -	SMBIOS = 1,
1: -	BIS_CERT = 2,
1: -	POST_BIOS_ROM = 3,
1: -	ESCD = 4,
1: -	CMOS = 5,
1: -	NVRAM = 6,
1: -	OPTION_ROM_EXEC = 7,
1: -	OPTION_ROM_CONFIG = 8,
1: -	OPTION_ROM_MICROCODE = 10,
1: -	S_CRTM_VERSION = 11,
1: -	S_CRTM_CONTENTS = 12,
1: -	POST_CONTENTS = 13,
1: -	HOST_TABLE_OF_DEVICES = 14,
1: +  SMBIOS = 1,
1: +  BIS_CERT = 2,
1: +  POST_BIOS_ROM = 3,
1: +  ESCD = 4,
1: +  CMOS = 5,
1: +  NVRAM = 6,
1: +  OPTION_ROM_EXEC = 7,
1: +  OPTION_ROM_CONFIG = 8,
1: +  OPTION_ROM_MICROCODE = 10,
1: +  S_CRTM_VERSION = 11,
1: +  S_CRTM_CONTENTS = 12,
1: +  POST_CONTENTS = 13,
1: +  HOST_TABLE_OF_DEVICES = 14,
1:  };
1:  
1:  struct tcg_efi_specid_event_algs {
1: -	u16 alg_id;
1: -	u16 digest_size;
1: +  u16 alg_id;
1: +  u16 digest_size;
1:  };
1:  
1:  struct tcg_efi_specid_event_head {
1: -	u8 signature[16];
1: -	u32 platform_class;
1: -	u8 spec_version_minor;
1: -	u8 spec_version_major;
1: -	u8 spec_errata;
1: -	u8 uintnsize;
1: -	u32 num_algs;
1: -	struct tcg_efi_specid_event_algs digest_sizes[0];
1: +  u8 signature[16];
1: +  u32 platform_class;
1: +  u8 spec_version_minor;
1: +  u8 spec_version_major;
1: +  u8 spec_errata;
1: +  u8 uintnsize;
1: +  u32 num_algs;
1: +  struct tcg_efi_specid_event_algs digest_sizes[0];
1:  };
1:  
1:  struct tcg_pcr_event {
1: -	u32 pcr_idx;
1: -	u32 event_type;
1: -	u8 digest[20];
1: -	u32 event_size;
1: -	u8 event[0];
1: +  u32 pcr_idx;
1: +  u32 event_type;
1: +  u8 digest[20];
1: +  u32 event_size;
1: +  u8 event[0];
1:  };
1:  
1:  struct tcg_event_field {
1: -	u32 event_size;
1: -	u8 event[0];
1: +  u32 event_size;
1: +  u8 event[0];
1:  };
1:  
1:  struct tcg_pcr_event2_head {
1: -	u32 pcr_idx;
1: -	u32 event_type;
1: -	u32 count;
1: -	struct tpm_digest digests[0];
1: +  u32 pcr_idx;
1: +  u32 event_type;
1: +  u32 count;
1: +  struct tpm_digest digests[0];
1:  };
1:  
1:  struct acpi_table_tpm2 {
1: -	struct acpi_table_header header;
1: -	u16 platform_class;
1: -	u16 reserved;
1: -	u64 control_address;
1: -	u32 start_method;
1: +  struct acpi_table_header header;
1: +  u16 platform_class;
1: +  u16 reserved;
1: +  u64 control_address;
1: +  u32 start_method;
1:  } __attribute__((packed));
1:  
1:  struct acpi_tpm2_phy {
1: -	u8 start_method_specific[12];
1: -	u32 log_area_minimum_length;
1: -	u64 log_area_start_address;
1: +  u8 start_method_specific[12];
1: +  u32 log_area_minimum_length;
1: +  u64 log_area_start_address;
1:  };
1:  
1:  enum bios_platform_class {
1: -	BIOS_CLIENT = 0,
1: -	BIOS_SERVER = 1,
1: +  BIOS_CLIENT = 0,
1: +  BIOS_SERVER = 1,
1:  };
1:  
1:  struct client_hdr {
1: -	u32 log_max_len;
1: -	u64 log_start_addr;
1: +  u32 log_max_len;
1: +  u64 log_start_addr;
1:  } __attribute__((packed));
1:  
1:  struct server_hdr {
1: -	u16 reserved;
1: -	u64 log_max_len;
1: -	u64 log_start_addr;
1: +  u16 reserved;
1: +  u64 log_max_len;
1: +  u64 log_start_addr;
1:  } __attribute__((packed));
1:  
1:  struct acpi_tcpa {
1: -	struct acpi_table_header hdr;
1: -	u16 platform_class;
1: -	union {
1: -		struct client_hdr client;
1: -		struct server_hdr server;
1: -	};
1: +  struct acpi_table_header hdr;
1: +  u16 platform_class;
1: +  union {
1: +    struct client_hdr client;
1: +    struct server_hdr server;
1: +  };
1:  } __attribute__((packed));
1:  
1:  struct linux_efi_tpm_eventlog {
1: -	u32 size;
1: -	u32 final_events_preboot_size;
1: -	u8 version;
1: -	u8 log[0];
1: +  u32 size;
1: +  u32 final_events_preboot_size;
1: +  u8 version;
1: +  u8 log[0];
1:  };
1:  
1:  struct efi_tcg2_final_events_table {
1: -	u64 version;
1: -	u64 nr_events;
1: -	u8 events[0];
1: +  u64 version;
1: +  u64 nr_events;
1: +  u8 events[0];
1:  };
1:  
1:  enum tis_access {
1: -	TPM_ACCESS_VALID = 128,
1: -	TPM_ACCESS_ACTIVE_LOCALITY = 32,
1: -	TPM_ACCESS_REQUEST_PENDING = 4,
1: -	TPM_ACCESS_REQUEST_USE = 2,
1: +  TPM_ACCESS_VALID = 128,
1: +  TPM_ACCESS_ACTIVE_LOCALITY = 32,
1: +  TPM_ACCESS_REQUEST_PENDING = 4,
1: +  TPM_ACCESS_REQUEST_USE = 2,
1:  };
1:  
1:  enum tis_status {
1: -	TPM_STS_VALID = 128,
1: -	TPM_STS_COMMAND_READY = 64,
1: -	TPM_STS_GO = 32,
1: -	TPM_STS_DATA_AVAIL = 16,
1: -	TPM_STS_DATA_EXPECT = 8,
1: -	TPM_STS_READ_ZERO = 35,
1: +  TPM_STS_VALID = 128,
1: +  TPM_STS_COMMAND_READY = 64,
1: +  TPM_STS_GO = 32,
1: +  TPM_STS_DATA_AVAIL = 16,
1: +  TPM_STS_DATA_EXPECT = 8,
1: +  TPM_STS_READ_ZERO = 35,
1:  };
1:  
1:  enum tis_int_flags {
1: -	TPM_GLOBAL_INT_ENABLE = 2147483648,
1: -	TPM_INTF_BURST_COUNT_STATIC = 256,
1: -	TPM_INTF_CMD_READY_INT = 128,
1: -	TPM_INTF_INT_EDGE_FALLING = 64,
1: -	TPM_INTF_INT_EDGE_RISING = 32,
1: -	TPM_INTF_INT_LEVEL_LOW = 16,
1: -	TPM_INTF_INT_LEVEL_HIGH = 8,
1: -	TPM_INTF_LOCALITY_CHANGE_INT = 4,
1: -	TPM_INTF_STS_VALID_INT = 2,
1: -	TPM_INTF_DATA_AVAIL_INT = 1,
1: +  TPM_GLOBAL_INT_ENABLE = 2147483648,
1: +  TPM_INTF_BURST_COUNT_STATIC = 256,
1: +  TPM_INTF_CMD_READY_INT = 128,
1: +  TPM_INTF_INT_EDGE_FALLING = 64,
1: +  TPM_INTF_INT_EDGE_RISING = 32,
1: +  TPM_INTF_INT_LEVEL_LOW = 16,
1: +  TPM_INTF_INT_LEVEL_HIGH = 8,
1: +  TPM_INTF_LOCALITY_CHANGE_INT = 4,
1: +  TPM_INTF_STS_VALID_INT = 2,
1: +  TPM_INTF_DATA_AVAIL_INT = 1,
1:  };
1:  
1:  enum tis_defaults {
1: -	TIS_MEM_LEN = 20480,
1: -	TIS_SHORT_TIMEOUT = 750,
1: -	TIS_LONG_TIMEOUT = 2000,
1: +  TIS_MEM_LEN = 20480,
1: +  TIS_SHORT_TIMEOUT = 750,
1: +  TIS_LONG_TIMEOUT = 2000,
1:  };
1:  
1:  enum tpm_tis_flags {
1: -	TPM_TIS_ITPM_WORKAROUND = 1,
1: +  TPM_TIS_ITPM_WORKAROUND = 1,
1:  };
1:  
1:  struct tpm_tis_phy_ops;
1:  
1:  struct tpm_tis_data {
1: -	u16 manufacturer_id;
1: -	int locality;
1: -	int irq;
1: -	bool irq_tested;
1: -	unsigned int flags;
1: -	void *ilb_base_addr;
1: -	u16 clkrun_enabled;
1: -	wait_queue_head_t int_queue;
1: -	wait_queue_head_t read_queue;
1: -	const struct tpm_tis_phy_ops *phy_ops;
1: -	short unsigned int rng_quality;
1: +  u16 manufacturer_id;
1: +  int locality;
1: +  int irq;
1: +  bool irq_tested;
1: +  unsigned int flags;
1: +  void *ilb_base_addr;
1: +  u16 clkrun_enabled;
1: +  wait_queue_head_t int_queue;
1: +  wait_queue_head_t read_queue;
1: +  const struct tpm_tis_phy_ops *phy_ops;
1: +  short unsigned int rng_quality;
1:  };
1:  
1:  struct tpm_tis_phy_ops {
1: -	int (*read_bytes)(struct tpm_tis_data *, u32, u16, u8 *);
1: -	int (*write_bytes)(struct tpm_tis_data *, u32, u16, const u8 *);
1: -	int (*read16)(struct tpm_tis_data *, u32, u16 *);
1: -	int (*read32)(struct tpm_tis_data *, u32, u32 *);
1: -	int (*write32)(struct tpm_tis_data *, u32, u32);
1: +  int (*read_bytes)(struct tpm_tis_data *, u32, u16, u8 *);
1: +  int (*write_bytes)(struct tpm_tis_data *, u32, u16, const u8 *);
1: +  int (*read16)(struct tpm_tis_data *, u32, u16 *);
1: +  int (*read32)(struct tpm_tis_data *, u32, u32 *);
1: +  int (*write32)(struct tpm_tis_data *, u32, u32);
1:  };
1:  
1:  struct tis_vendor_durations_override {
1: -	u32 did_vid;
1: -	struct tpm1_version version;
1: -	long unsigned int durations[3];
1: +  u32 did_vid;
1: +  struct tpm1_version version;
1: +  long unsigned int durations[3];
1:  };
1:  
1:  struct tis_vendor_timeout_override {
1: -	u32 did_vid;
1: -	long unsigned int timeout_us[4];
1: +  u32 did_vid;
1: +  long unsigned int timeout_us[4];
1:  };
1:  
1:  struct tpm_info {
1: -	struct resource res;
1: -	int irq;
1: +  struct resource res;
1: +  int irq;
1:  };
1:  
1:  struct tpm_tis_tcg_phy {
1: -	struct tpm_tis_data priv;
1: -	void *iobase;
1: +  struct tpm_tis_data priv;
1: +  void *iobase;
1:  };
1:  
1:  enum crb_defaults {
1: -	CRB_ACPI_START_REVISION_ID = 1,
1: -	CRB_ACPI_START_INDEX = 1,
1: +  CRB_ACPI_START_REVISION_ID = 1,
1: +  CRB_ACPI_START_INDEX = 1,
1:  };
1:  
1:  enum crb_loc_ctrl {
1: -	CRB_LOC_CTRL_REQUEST_ACCESS = 1,
1: -	CRB_LOC_CTRL_RELINQUISH = 2,
1: +  CRB_LOC_CTRL_REQUEST_ACCESS = 1,
1: +  CRB_LOC_CTRL_RELINQUISH = 2,
1:  };
1:  
1:  enum crb_loc_state {
1: -	CRB_LOC_STATE_LOC_ASSIGNED = 2,
1: -	CRB_LOC_STATE_TPM_REG_VALID_STS = 128,
1: +  CRB_LOC_STATE_LOC_ASSIGNED = 2,
1: +  CRB_LOC_STATE_TPM_REG_VALID_STS = 128,
1:  };
1:  
1:  enum crb_ctrl_req {
1: -	CRB_CTRL_REQ_CMD_READY = 1,
1: -	CRB_CTRL_REQ_GO_IDLE = 2,
1: +  CRB_CTRL_REQ_CMD_READY = 1,
1: +  CRB_CTRL_REQ_GO_IDLE = 2,
1:  };
1:  
1:  enum crb_ctrl_sts {
1: -	CRB_CTRL_STS_ERROR = 1,
1: -	CRB_CTRL_STS_TPM_IDLE = 2,
1: +  CRB_CTRL_STS_ERROR = 1,
1: +  CRB_CTRL_STS_TPM_IDLE = 2,
1:  };
1:  
1:  enum crb_start {
1: -	CRB_START_INVOKE = 1,
1: +  CRB_START_INVOKE = 1,
1:  };
1:  
1:  enum crb_cancel {
1: -	CRB_CANCEL_INVOKE = 1,
1: +  CRB_CANCEL_INVOKE = 1,
1:  };
1:  
1:  struct crb_regs_head {
1: -	u32 loc_state;
1: -	u32 reserved1;
1: -	u32 loc_ctrl;
1: -	u32 loc_sts;
1: -	u8 reserved2[32];
1: -	u64 intf_id;
1: -	u64 ctrl_ext;
1: +  u32 loc_state;
1: +  u32 reserved1;
1: +  u32 loc_ctrl;
1: +  u32 loc_sts;
1: +  u8 reserved2[32];
1: +  u64 intf_id;
1: +  u64 ctrl_ext;
1:  };
1:  
1:  struct crb_regs_tail {
1: -	u32 ctrl_req;
1: -	u32 ctrl_sts;
1: -	u32 ctrl_cancel;
1: -	u32 ctrl_start;
1: -	u32 ctrl_int_enable;
1: -	u32 ctrl_int_sts;
1: -	u32 ctrl_cmd_size;
1: -	u32 ctrl_cmd_pa_low;
1: -	u32 ctrl_cmd_pa_high;
1: -	u32 ctrl_rsp_size;
1: -	u64 ctrl_rsp_pa;
1: +  u32 ctrl_req;
1: +  u32 ctrl_sts;
1: +  u32 ctrl_cancel;
1: +  u32 ctrl_start;
1: +  u32 ctrl_int_enable;
1: +  u32 ctrl_int_sts;
1: +  u32 ctrl_cmd_size;
1: +  u32 ctrl_cmd_pa_low;
1: +  u32 ctrl_cmd_pa_high;
1: +  u32 ctrl_rsp_size;
1: +  u64 ctrl_rsp_pa;
1:  };
1:  
1:  enum crb_status {
1: -	CRB_DRV_STS_COMPLETE = 1,
1: +  CRB_DRV_STS_COMPLETE = 1,
1:  };
1:  
1:  struct crb_priv {
1: -	u32 sm;
1: -	const char *hid;
1: -	struct crb_regs_head *regs_h;
1: -	struct crb_regs_tail *regs_t;
1: -	u8 *cmd;
1: -	u8 *rsp;
1: -	u32 cmd_size;
1: -	u32 smc_func_id;
1: +  u32 sm;
1: +  const char *hid;
1: +  struct crb_regs_head *regs_h;
1: +  struct crb_regs_tail *regs_t;
1: +  u8 *cmd;
1: +  u8 *rsp;
1: +  u32 cmd_size;
1: +  u32 smc_func_id;
1:  };
1:  
1:  struct tpm2_crb_smc {
1: -	u32 interrupt;
1: -	u8 interrupt_flags;
1: -	u8 op_flags;
1: -	u16 reserved2;
1: -	u32 smc_func_id;
1: +  u32 interrupt;
1: +  u8 interrupt_flags;
1: +  u8 op_flags;
1: +  u16 reserved2;
1: +  u32 smc_func_id;
1:  };
1:  
1:  struct acpi_table_dmar {
1: -	struct acpi_table_header header;
1: -	u8 width;
1: -	u8 flags;
1: -	u8 reserved[10];
1: +  struct acpi_table_header header;
1: +  u8 width;
1: +  u8 flags;
1: +  u8 reserved[10];
1:  };
1:  
1:  struct acpi_dmar_header {
1: -	u16 type;
1: -	u16 length;
1: +  u16 type;
1: +  u16 length;
1:  };
1:  
1:  enum acpi_dmar_type {
1: -	ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
1: -	ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
1: -	ACPI_DMAR_TYPE_ROOT_ATS = 2,
1: -	ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3,
1: -	ACPI_DMAR_TYPE_NAMESPACE = 4,
1: -	ACPI_DMAR_TYPE_RESERVED = 5,
1: +  ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
1: +  ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
1: +  ACPI_DMAR_TYPE_ROOT_ATS = 2,
1: +  ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3,
1: +  ACPI_DMAR_TYPE_NAMESPACE = 4,
1: +  ACPI_DMAR_TYPE_RESERVED = 5,
1:  };
1:  
1:  struct acpi_dmar_device_scope {
1: -	u8 entry_type;
1: -	u8 length;
1: -	u16 reserved;
1: -	u8 enumeration_id;
1: -	u8 bus;
1: +  u8 entry_type;
1: +  u8 length;
1: +  u16 reserved;
1: +  u8 enumeration_id;
1: +  u8 bus;
1:  };
1:  
1:  enum acpi_dmar_scope_type {
1: -	ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
1: -	ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
1: -	ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
1: -	ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
1: -	ACPI_DMAR_SCOPE_TYPE_HPET = 4,
1: -	ACPI_DMAR_SCOPE_TYPE_NAMESPACE = 5,
1: -	ACPI_DMAR_SCOPE_TYPE_RESERVED = 6,
1: +  ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
1: +  ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
1: +  ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
1: +  ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
1: +  ACPI_DMAR_SCOPE_TYPE_HPET = 4,
1: +  ACPI_DMAR_SCOPE_TYPE_NAMESPACE = 5,
1: +  ACPI_DMAR_SCOPE_TYPE_RESERVED = 6,
1:  };
1:  
1:  struct acpi_dmar_pci_path {
1: -	u8 device;
1: -	u8 function;
1: +  u8 device;
1: +  u8 function;
1:  };
1:  
1:  struct acpi_dmar_hardware_unit {
1: -	struct acpi_dmar_header header;
1: -	u8 flags;
1: -	u8 reserved;
1: -	u16 segment;
1: -	u64 address;
1: +  struct acpi_dmar_header header;
1: +  u8 flags;
1: +  u8 reserved;
1: +  u16 segment;
1: +  u64 address;
1:  };
1:  
1:  struct acpi_dmar_reserved_memory {
1: -	struct acpi_dmar_header header;
1: -	u16 reserved;
1: -	u16 segment;
1: -	u64 base_address;
1: -	u64 end_address;
1: +  struct acpi_dmar_header header;
1: +  u16 reserved;
1: +  u16 segment;
1: +  u64 base_address;
1: +  u64 end_address;
1:  };
1:  
1:  struct acpi_dmar_atsr {
1: -	struct acpi_dmar_header header;
1: -	u8 flags;
1: -	u8 reserved;
1: -	u16 segment;
1: +  struct acpi_dmar_header header;
1: +  u8 flags;
1: +  u8 reserved;
1: +  u16 segment;
1:  };
1:  
1:  struct acpi_dmar_rhsa {
1: -	struct acpi_dmar_header header;
1: -	u32 reserved;
1: -	u64 base_address;
1: -	u32 proximity_domain;
1: +  struct acpi_dmar_header header;
1: +  u32 reserved;
1: +  u64 base_address;
1: +  u32 proximity_domain;
1:  } __attribute__((packed));
1:  
1:  struct acpi_dmar_andd {
1: -	struct acpi_dmar_header header;
1: -	u8 reserved[3];
1: -	u8 device_number;
1: -	char device_name[1];
1: +  struct acpi_dmar_header header;
1: +  u8 reserved[3];
1: +  u8 device_number;
1: +  char device_name[1];
1:  } __attribute__((packed));
1:  
1:  struct dmar_dev_scope {
1: -	struct device *dev;
1: -	u8 bus;
1: -	u8 devfn;
1: +  struct device *dev;
1: +  u8 bus;
1: +  u8 devfn;
1:  };
1:  
1:  struct intel_iommu;
1:  
1:  struct dmar_drhd_unit {
1: -	struct list_head list;
1: -	struct acpi_dmar_header *hdr;
1: -	u64 reg_base_addr;
1: -	struct dmar_dev_scope *devices;
1: -	int devices_cnt;
1: -	u16 segment;
1: -	u8 ignored: 1;
1: -	u8 include_all: 1;
1: -	u8 gfx_dedicated: 1;
1: -	struct intel_iommu *iommu;
1: +  struct list_head list;
1: +  struct acpi_dmar_header *hdr;
1: +  u64 reg_base_addr;
1: +  struct dmar_dev_scope *devices;
1: +  int devices_cnt;
1: +  u16 segment;
1: +  u8 ignored : 1;
1: +  u8 include_all : 1;
1: +  u8 gfx_dedicated : 1;
1: +  struct intel_iommu *iommu;
1:  };
1:  
1:  struct iommu_flush {
1: -	void (*flush_context)(struct intel_iommu *, u16, u16, u8, u64);
1: -	void (*flush_iotlb)(struct intel_iommu *, u16, u64, unsigned int, u64);
1: +  void (*flush_context)(struct intel_iommu *, u16, u16, u8, u64);
1: +  void (*flush_iotlb)(struct intel_iommu *, u16, u64, unsigned int, u64);
1:  };
1:  
1:  struct dmar_domain;
1: @@ -77494,113 +78559,113 @@ struct q_inval;
1:  struct ir_table;
1:  
1:  struct intel_iommu {
1: -	void *reg;
1: -	u64 reg_phys;
1: -	u64 reg_size;
1: -	u64 cap;
1: -	u64 ecap;
1: -	u64 vccap;
1: -	u32 gcmd;
1: -	raw_spinlock_t register_lock;
1: -	int seq_id;
1: -	int agaw;
1: -	int msagaw;
1: -	unsigned int irq;
1: -	unsigned int pr_irq;
1: -	u16 segment;
1: -	unsigned char name[13];
1: -	long unsigned int *domain_ids;
1: -	struct dmar_domain ***domains;
1: -	spinlock_t lock;
1: -	struct root_entry *root_entry;
1: -	struct iommu_flush flush;
1: -	struct q_inval *qi;
1: -	u32 *iommu_state;
1: -	struct ir_table *ir_table;
1: -	struct irq_domain *ir_domain;
1: -	struct irq_domain *ir_msi_domain;
1: -	struct iommu_device iommu;
1: -	int node;
1: -	u32 flags;
1: -	struct dmar_drhd_unit *drhd;
1: +  void *reg;
1: +  u64 reg_phys;
1: +  u64 reg_size;
1: +  u64 cap;
1: +  u64 ecap;
1: +  u64 vccap;
1: +  u32 gcmd;
1: +  raw_spinlock_t register_lock;
1: +  int seq_id;
1: +  int agaw;
1: +  int msagaw;
1: +  unsigned int irq;
1: +  unsigned int pr_irq;
1: +  u16 segment;
1: +  unsigned char name[13];
1: +  long unsigned int *domain_ids;
1: +  struct dmar_domain ***domains;
1: +  spinlock_t lock;
1: +  struct root_entry *root_entry;
1: +  struct iommu_flush flush;
1: +  struct q_inval *qi;
1: +  u32 *iommu_state;
1: +  struct ir_table *ir_table;
1: +  struct irq_domain *ir_domain;
1: +  struct irq_domain *ir_msi_domain;
1: +  struct iommu_device iommu;
1: +  int node;
1: +  u32 flags;
1: +  struct dmar_drhd_unit *drhd;
1:  };
1:  
1:  struct dmar_pci_path {
1: -	u8 bus;
1: -	u8 device;
1: -	u8 function;
1: +  u8 bus;
1: +  u8 device;
1: +  u8 function;
1:  };
1:  
1:  struct dmar_pci_notify_info {
1: -	struct pci_dev *dev;
1: -	long unsigned int event;
1: -	int bus;
1: -	u16 seg;
1: -	u16 level;
1: -	struct dmar_pci_path path[0];
1: +  struct pci_dev *dev;
1: +  long unsigned int event;
1: +  int bus;
1: +  u16 seg;
1: +  u16 level;
1: +  struct dmar_pci_path path[0];
1:  };
1:  
1:  struct irte {
1: -	union {
1: -		struct {
1: -			__u64 present: 1;
1: -			__u64 fpd: 1;
1: -			__u64 __res0: 6;
1: -			__u64 avail: 4;
1: -			__u64 __res1: 3;
1: -			__u64 pst: 1;
1: -			__u64 vector: 8;
1: -			__u64 __res2: 40;
1: -		};
1: -		struct {
1: -			__u64 r_present: 1;
1: -			__u64 r_fpd: 1;
1: -			__u64 dst_mode: 1;
1: -			__u64 redir_hint: 1;
1: -			__u64 trigger_mode: 1;
1: -			__u64 dlvry_mode: 3;
1: -			__u64 r_avail: 4;
1: -			__u64 r_res0: 4;
1: -			__u64 r_vector: 8;
1: -			__u64 r_res1: 8;
1: -			__u64 dest_id: 32;
1: -		};
1: -		struct {
1: -			__u64 p_present: 1;
1: -			__u64 p_fpd: 1;
1: -			__u64 p_res0: 6;
1: -			__u64 p_avail: 4;
1: -			__u64 p_res1: 2;
1: -			__u64 p_urgent: 1;
1: -			__u64 p_pst: 1;
1: -			__u64 p_vector: 8;
1: -			__u64 p_res2: 14;
1: -			__u64 pda_l: 26;
1: -		};
1: -		__u64 low;
1: -	};
1: -	union {
1: -		struct {
1: -			__u64 sid: 16;
1: -			__u64 sq: 2;
1: -			__u64 svt: 2;
1: -			__u64 __res3: 44;
1: -		};
1: -		struct {
1: -			__u64 p_sid: 16;
1: -			__u64 p_sq: 2;
1: -			__u64 p_svt: 2;
1: -			__u64 p_res3: 12;
1: -			__u64 pda_h: 32;
1: -		};
1: -		__u64 high;
1: -	};
1: +  union {
1: +    struct {
1: +      __u64 present : 1;
1: +      __u64 fpd : 1;
1: +      __u64 __res0 : 6;
1: +      __u64 avail : 4;
1: +      __u64 __res1 : 3;
1: +      __u64 pst : 1;
1: +      __u64 vector : 8;
1: +      __u64 __res2 : 40;
1: +    };
1: +    struct {
1: +      __u64 r_present : 1;
1: +      __u64 r_fpd : 1;
1: +      __u64 dst_mode : 1;
1: +      __u64 redir_hint : 1;
1: +      __u64 trigger_mode : 1;
1: +      __u64 dlvry_mode : 3;
1: +      __u64 r_avail : 4;
1: +      __u64 r_res0 : 4;
1: +      __u64 r_vector : 8;
1: +      __u64 r_res1 : 8;
1: +      __u64 dest_id : 32;
1: +    };
1: +    struct {
1: +      __u64 p_present : 1;
1: +      __u64 p_fpd : 1;
1: +      __u64 p_res0 : 6;
1: +      __u64 p_avail : 4;
1: +      __u64 p_res1 : 2;
1: +      __u64 p_urgent : 1;
1: +      __u64 p_pst : 1;
1: +      __u64 p_vector : 8;
1: +      __u64 p_res2 : 14;
1: +      __u64 pda_l : 26;
1: +    };
1: +    __u64 low;
1: +  };
1: +  union {
1: +    struct {
1: +      __u64 sid : 16;
1: +      __u64 sq : 2;
1: +      __u64 svt : 2;
1: +      __u64 __res3 : 44;
1: +    };
1: +    struct {
1: +      __u64 p_sid : 16;
1: +      __u64 p_sq : 2;
1: +      __u64 p_svt : 2;
1: +      __u64 p_res3 : 12;
1: +      __u64 pda_h : 32;
1: +    };
1: +    __u64 high;
1: +  };
1:  };
1:  
1:  struct iova {
1: -	struct rb_node node;
1: -	long unsigned int pfn_hi;
1: -	long unsigned int pfn_lo;
1: +  struct rb_node node;
1: +  long unsigned int pfn_hi;
1: +  long unsigned int pfn_lo;
1:  };
1:  
1:  struct iova_magazine;
1: @@ -77608,10 +78673,10 @@ struct iova_magazine;
1:  struct iova_cpu_rcache;
1:  
1:  struct iova_rcache {
1: -	spinlock_t lock;
1: -	long unsigned int depot_size;
1: -	struct iova_magazine *depot[32];
1: -	struct iova_cpu_rcache *cpu_rcaches;
1: +  spinlock_t lock;
1: +  long unsigned int depot_size;
1: +  struct iova_magazine *depot[32];
1: +  struct iova_cpu_rcache *cpu_rcaches;
1:  };
1:  
1:  struct iova_domain;
1: @@ -77623,361 +78688,367 @@ typedef void (*iova_entry_dtor)(long unsigned int);
1:  struct iova_fq;
1:  
1:  struct iova_domain {
1: -	spinlock_t iova_rbtree_lock;
1: -	struct rb_root rbroot;
1: -	struct rb_node *cached_node;
1: -	struct rb_node *cached32_node;
1: -	long unsigned int granule;
1: -	long unsigned int start_pfn;
1: -	long unsigned int dma_32bit_pfn;
1: -	long unsigned int max32_alloc_size;
1: -	struct iova_fq *fq;
1: -	atomic64_t fq_flush_start_cnt;
1: -	atomic64_t fq_flush_finish_cnt;
1: -	struct iova anchor;
1: -	struct iova_rcache rcaches[6];
1: -	iova_flush_cb flush_cb;
1: -	iova_entry_dtor entry_dtor;
1: -	struct timer_list fq_timer;
1: -	atomic_t fq_timer_on;
1: +  spinlock_t iova_rbtree_lock;
1: +  struct rb_root rbroot;
1: +  struct rb_node *cached_node;
1: +  struct rb_node *cached32_node;
1: +  long unsigned int granule;
1: +  long unsigned int start_pfn;
1: +  long unsigned int dma_32bit_pfn;
1: +  long unsigned int max32_alloc_size;
1: +  struct iova_fq *fq;
1: +  atomic64_t fq_flush_start_cnt;
1: +  atomic64_t fq_flush_finish_cnt;
1: +  struct iova anchor;
1: +  struct iova_rcache rcaches[6];
1: +  iova_flush_cb flush_cb;
1: +  iova_entry_dtor entry_dtor;
1: +  struct timer_list fq_timer;
1: +  atomic_t fq_timer_on;
1:  };
1:  
1:  struct iova_fq_entry {
1: -	long unsigned int iova_pfn;
1: -	long unsigned int pages;
1: -	long unsigned int data;
1: -	u64 counter;
1: +  long unsigned int iova_pfn;
1: +  long unsigned int pages;
1: +  long unsigned int data;
1: +  u64 counter;
1:  };
1:  
1:  struct iova_fq {
1: -	struct iova_fq_entry entries[256];
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	spinlock_t lock;
1: +  struct iova_fq_entry entries[256];
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  spinlock_t lock;
1:  };
1:  
1:  enum {
1: -	QI_FREE = 0,
1: -	QI_IN_USE = 1,
1: -	QI_DONE = 2,
1: -	QI_ABORT = 3,
1: +  QI_FREE = 0,
1: +  QI_IN_USE = 1,
1: +  QI_DONE = 2,
1: +  QI_ABORT = 3,
1:  };
1:  
1:  struct qi_desc {
1: -	u64 qw0;
1: -	u64 qw1;
1: -	u64 qw2;
1: -	u64 qw3;
1: +  u64 qw0;
1: +  u64 qw1;
1: +  u64 qw2;
1: +  u64 qw3;
1:  };
1:  
1:  struct q_inval {
1: -	raw_spinlock_t q_lock;
1: -	void *desc;
1: -	int *desc_status;
1: -	int free_head;
1: -	int free_tail;
1: -	int free_cnt;
1: +  raw_spinlock_t q_lock;
1: +  void *desc;
1: +  int *desc_status;
1: +  int free_head;
1: +  int free_tail;
1: +  int free_cnt;
1:  };
1:  
1:  struct ir_table {
1: -	struct irte *base;
1: -	long unsigned int *bitmap;
1: +  struct irte *base;
1: +  long unsigned int *bitmap;
1:  };
1:  
1:  struct root_entry {
1: -	u64 lo;
1: -	u64 hi;
1: +  u64 lo;
1: +  u64 hi;
1:  };
1:  
1:  struct dma_pte;
1:  
1:  struct dmar_domain {
1: -	int nid;
1: -	unsigned int iommu_refcnt[128];
1: -	u16 iommu_did[128];
1: -	unsigned int auxd_refcnt;
1: -	bool has_iotlb_device;
1: -	struct list_head devices;
1: -	struct list_head auxd;
1: -	struct iova_domain iovad;
1: -	struct dma_pte *pgd;
1: -	int gaw;
1: -	int agaw;
1: -	int flags;
1: -	int iommu_coherency;
1: -	int iommu_snooping;
1: -	int iommu_count;
1: -	int iommu_superpage;
1: -	u64 max_addr;
1: -	u32 default_pasid;
1: -	struct iommu_domain domain;
1: +  int nid;
1: +  unsigned int iommu_refcnt[128];
1: +  u16 iommu_did[128];
1: +  unsigned int auxd_refcnt;
1: +  bool has_iotlb_device;
1: +  struct list_head devices;
1: +  struct list_head auxd;
1: +  struct iova_domain iovad;
1: +  struct dma_pte *pgd;
1: +  int gaw;
1: +  int agaw;
1: +  int flags;
1: +  int iommu_coherency;
1: +  int iommu_snooping;
1: +  int iommu_count;
1: +  int iommu_superpage;
1: +  u64 max_addr;
1: +  u32 default_pasid;
1: +  struct iommu_domain domain;
1:  };
1:  
1:  struct dma_pte {
1: -	u64 val;
1: +  u64 val;
1:  };
1:  
1:  typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *);
1:  
1:  struct dmar_res_callback {
1: -	dmar_res_handler_t cb[5];
1: -	void *arg[5];
1: -	bool ignore_unhandled;
1: -	bool print_entry;
1: +  dmar_res_handler_t cb[5];
1: +  void *arg[5];
1: +  bool ignore_unhandled;
1: +  bool print_entry;
1:  };
1:  
1:  enum faulttype {
1: -	DMA_REMAP = 0,
1: -	INTR_REMAP = 1,
1: -	UNKNOWN = 2,
1: +  DMA_REMAP = 0,
1: +  INTR_REMAP = 1,
1: +  UNKNOWN = 2,
1:  };
1:  
1:  struct memory_notify {
1: -	long unsigned int start_pfn;
1: -	long unsigned int nr_pages;
1: -	int status_change_nid_normal;
1: -	int status_change_nid_high;
1: -	int status_change_nid;
1: +  long unsigned int start_pfn;
1: +  long unsigned int nr_pages;
1: +  int status_change_nid_normal;
1: +  int status_change_nid_high;
1: +  int status_change_nid;
1:  };
1:  
1:  typedef unsigned int ioasid_t;
1:  
1:  enum {
1: -	SR_DMAR_FECTL_REG = 0,
1: -	SR_DMAR_FEDATA_REG = 1,
1: -	SR_DMAR_FEADDR_REG = 2,
1: -	SR_DMAR_FEUADDR_REG = 3,
1: -	MAX_SR_DMAR_REGS = 4,
1: +  SR_DMAR_FECTL_REG = 0,
1: +  SR_DMAR_FEDATA_REG = 1,
1: +  SR_DMAR_FEADDR_REG = 2,
1: +  SR_DMAR_FEUADDR_REG = 3,
1: +  MAX_SR_DMAR_REGS = 4,
1:  };
1:  
1:  struct context_entry {
1: -	u64 lo;
1: -	u64 hi;
1: +  u64 lo;
1: +  u64 hi;
1:  };
1:  
1:  struct pasid_table;
1:  
1:  struct device_domain_info {
1: -	struct list_head link;
1: -	struct list_head global;
1: -	struct list_head table;
1: -	struct list_head auxiliary_domains;
1: -	u32 segment;
1: -	u8 bus;
1: -	u8 devfn;
1: -	u16 pfsid;
1: -	u8 pasid_supported: 3;
1: -	u8 pasid_enabled: 1;
1: -	u8 pri_supported: 1;
1: -	u8 pri_enabled: 1;
1: -	u8 ats_supported: 1;
1: -	u8 ats_enabled: 1;
1: -	u8 auxd_enabled: 1;
1: -	u8 ats_qdep;
1: -	struct device *dev;
1: -	struct intel_iommu *iommu;
1: -	struct dmar_domain *domain;
1: -	struct pasid_table *pasid_table;
1: +  struct list_head link;
1: +  struct list_head global;
1: +  struct list_head table;
1: +  struct list_head auxiliary_domains;
1: +  u32 segment;
1: +  u8 bus;
1: +  u8 devfn;
1: +  u16 pfsid;
1: +  u8 pasid_supported : 3;
1: +  u8 pasid_enabled : 1;
1: +  u8 pri_supported : 1;
1: +  u8 pri_enabled : 1;
1: +  u8 ats_supported : 1;
1: +  u8 ats_enabled : 1;
1: +  u8 auxd_enabled : 1;
1: +  u8 ats_qdep;
1: +  struct device *dev;
1: +  struct intel_iommu *iommu;
1: +  struct dmar_domain *domain;
1: +  struct pasid_table *pasid_table;
1:  };
1:  
1:  struct pasid_table {
1: -	void *table;
1: -	int order;
1: -	u32 max_pasid;
1: -	struct list_head dev;
1: +  void *table;
1: +  int order;
1: +  u32 max_pasid;
1: +  struct list_head dev;
1:  };
1:  
1:  struct dmar_rmrr_unit {
1: -	struct list_head list;
1: -	struct acpi_dmar_header *hdr;
1: -	u64 base_address;
1: -	u64 end_address;
1: -	struct dmar_dev_scope *devices;
1: -	int devices_cnt;
1: +  struct list_head list;
1: +  struct acpi_dmar_header *hdr;
1: +  u64 base_address;
1: +  u64 end_address;
1: +  struct dmar_dev_scope *devices;
1: +  int devices_cnt;
1:  };
1:  
1:  struct dmar_atsr_unit {
1: -	struct list_head list;
1: -	struct acpi_dmar_header *hdr;
1: -	struct dmar_dev_scope *devices;
1: -	int devices_cnt;
1: -	u8 include_all: 1;
1: +  struct list_head list;
1: +  struct acpi_dmar_header *hdr;
1: +  struct dmar_dev_scope *devices;
1: +  int devices_cnt;
1: +  u8 include_all : 1;
1:  };
1:  
1:  struct domain_context_mapping_data {
1: -	struct dmar_domain *domain;
1: -	struct intel_iommu *iommu;
1: -	struct pasid_table *table;
1: +  struct dmar_domain *domain;
1: +  struct intel_iommu *iommu;
1: +  struct pasid_table *table;
1:  };
1:  
1:  struct pasid_dir_entry {
1: -	u64 val;
1: +  u64 val;
1:  };
1:  
1:  struct pasid_entry {
1: -	u64 val[8];
1: +  u64 val[8];
1:  };
1:  
1:  struct pasid_table_opaque {
1: -	struct pasid_table **pasid_table;
1: -	int segment;
1: -	int bus;
1: -	int devfn;
1: +  struct pasid_table **pasid_table;
1: +  int segment;
1: +  int bus;
1: +  int devfn;
1:  };
1:  
1:  struct trace_event_raw_dma_map {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev_name;
1: -	dma_addr_t dev_addr;
1: -	phys_addr_t phys_addr;
1: -	size_t size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev_name;
1: +  dma_addr_t dev_addr;
1: +  phys_addr_t phys_addr;
1: +  size_t size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_dma_unmap {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev_name;
1: -	dma_addr_t dev_addr;
1: -	size_t size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev_name;
1: +  dma_addr_t dev_addr;
1: +  size_t size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_dma_map_sg {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev_name;
1: -	dma_addr_t dev_addr;
1: -	phys_addr_t phys_addr;
1: -	size_t size;
1: -	int index;
1: -	int total;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev_name;
1: +  dma_addr_t dev_addr;
1: +  phys_addr_t phys_addr;
1: +  size_t size;
1: +  int index;
1: +  int total;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_dma_map {
1: -	u32 dev_name;
1: +  u32 dev_name;
1:  };
1:  
1:  struct trace_event_data_offsets_dma_unmap {
1: -	u32 dev_name;
1: +  u32 dev_name;
1:  };
1:  
1:  struct trace_event_data_offsets_dma_map_sg {
1: -	u32 dev_name;
1: +  u32 dev_name;
1:  };
1:  
1: -typedef void (*btf_trace_map_single)(void *, struct device *, dma_addr_t, phys_addr_t, size_t);
1: +typedef void (*btf_trace_map_single)(void *, struct device *, dma_addr_t,
1: +                                     phys_addr_t, size_t);
1:  
1: -typedef void (*btf_trace_bounce_map_single)(void *, struct device *, dma_addr_t, phys_addr_t, size_t);
1: +typedef void (*btf_trace_bounce_map_single)(void *, struct device *, dma_addr_t,
1: +                                            phys_addr_t, size_t);
1:  
1: -typedef void (*btf_trace_unmap_single)(void *, struct device *, dma_addr_t, size_t);
1: +typedef void (*btf_trace_unmap_single)(void *, struct device *, dma_addr_t,
1: +                                       size_t);
1:  
1:  typedef void (*btf_trace_unmap_sg)(void *, struct device *, dma_addr_t, size_t);
1:  
1: -typedef void (*btf_trace_bounce_unmap_single)(void *, struct device *, dma_addr_t, size_t);
1: +typedef void (*btf_trace_bounce_unmap_single)(void *, struct device *,
1: +                                              dma_addr_t, size_t);
1:  
1: -typedef void (*btf_trace_map_sg)(void *, struct device *, int, int, struct scatterlist *);
1: +typedef void (*btf_trace_map_sg)(void *, struct device *, int, int,
1: +                                 struct scatterlist *);
1:  
1: -typedef void (*btf_trace_bounce_map_sg)(void *, struct device *, int, int, struct scatterlist *);
1: +typedef void (*btf_trace_bounce_map_sg)(void *, struct device *, int, int,
1: +                                        struct scatterlist *);
1:  
1:  enum irq_remap_cap {
1: -	IRQ_POSTING_CAP = 0,
1: +  IRQ_POSTING_CAP = 0,
1:  };
1:  
1:  struct vcpu_data {
1: -	u64 pi_desc_addr;
1: -	u32 vector;
1: +  u64 pi_desc_addr;
1: +  u32 vector;
1:  };
1:  
1:  struct irq_remap_ops {
1: -	int capability;
1: -	int (*prepare)();
1: -	int (*enable)();
1: -	void (*disable)();
1: -	int (*reenable)(int);
1: -	int (*enable_faulting)();
1: -	struct irq_domain * (*get_irq_domain)(struct irq_alloc_info *);
1: +  int capability;
1: +  int (*prepare)();
1: +  int (*enable)();
1: +  void (*disable)();
1: +  int (*reenable)(int);
1: +  int (*enable_faulting)();
1: +  struct irq_domain *(*get_irq_domain)(struct irq_alloc_info *);
1:  };
1:  
1:  enum irq_mode {
1: -	IRQ_REMAPPING = 0,
1: -	IRQ_POSTING = 1,
1: +  IRQ_REMAPPING = 0,
1: +  IRQ_POSTING = 1,
1:  };
1:  
1:  struct ioapic_scope {
1: -	struct intel_iommu *iommu;
1: -	unsigned int id;
1: -	unsigned int bus;
1: -	unsigned int devfn;
1: +  struct intel_iommu *iommu;
1: +  unsigned int id;
1: +  unsigned int bus;
1: +  unsigned int devfn;
1:  };
1:  
1:  struct hpet_scope {
1: -	struct intel_iommu *iommu;
1: -	u8 id;
1: -	unsigned int bus;
1: -	unsigned int devfn;
1: +  struct intel_iommu *iommu;
1: +  u8 id;
1: +  unsigned int bus;
1: +  unsigned int devfn;
1:  };
1:  
1:  struct irq_2_iommu {
1: -	struct intel_iommu *iommu;
1: -	u16 irte_index;
1: -	u16 sub_handle;
1: -	u8 irte_mask;
1: -	enum irq_mode mode;
1: +  struct intel_iommu *iommu;
1: +  u16 irte_index;
1: +  u16 sub_handle;
1: +  u8 irte_mask;
1: +  enum irq_mode mode;
1:  };
1:  
1:  struct intel_ir_data {
1: -	struct irq_2_iommu irq_2_iommu;
1: -	struct irte irte_entry;
1: -	union {
1: -		struct msi_msg msi_entry;
1: -	};
1: +  struct irq_2_iommu irq_2_iommu;
1: +  struct irte irte_entry;
1: +  union {
1: +    struct msi_msg msi_entry;
1: +  };
1:  };
1:  
1:  struct set_msi_sid_data {
1: -	struct pci_dev *pdev;
1: -	u16 alias;
1: -	int count;
1: -	int busmatch_count;
1: +  struct pci_dev *pdev;
1: +  u16 alias;
1: +  int count;
1: +  int busmatch_count;
1:  };
1:  
1:  struct iommu_group {
1: -	struct kobject kobj;
1: -	struct kobject *devices_kobj;
1: -	struct list_head devices;
1: -	struct mutex mutex;
1: -	struct blocking_notifier_head notifier;
1: -	void *iommu_data;
1: -	void (*iommu_data_release)(void *);
1: -	char *name;
1: -	int id;
1: -	struct iommu_domain *default_domain;
1: -	struct iommu_domain *domain;
1: -	struct list_head entry;
1: +  struct kobject kobj;
1: +  struct kobject *devices_kobj;
1: +  struct list_head devices;
1: +  struct mutex mutex;
1: +  struct blocking_notifier_head notifier;
1: +  void *iommu_data;
1: +  void (*iommu_data_release)(void *);
1: +  char *name;
1: +  int id;
1: +  struct iommu_domain *default_domain;
1: +  struct iommu_domain *domain;
1: +  struct list_head entry;
1:  };
1:  
1:  enum iommu_fault_type {
1: -	IOMMU_FAULT_DMA_UNRECOV = 1,
1: -	IOMMU_FAULT_PAGE_REQ = 2,
1: +  IOMMU_FAULT_DMA_UNRECOV = 1,
1: +  IOMMU_FAULT_PAGE_REQ = 2,
1:  };
1:  
1:  enum iommu_inv_granularity {
1: -	IOMMU_INV_GRANU_DOMAIN = 0,
1: -	IOMMU_INV_GRANU_PASID = 1,
1: -	IOMMU_INV_GRANU_ADDR = 2,
1: -	IOMMU_INV_GRANU_NR = 3,
1: +  IOMMU_INV_GRANU_DOMAIN = 0,
1: +  IOMMU_INV_GRANU_PASID = 1,
1: +  IOMMU_INV_GRANU_ADDR = 2,
1: +  IOMMU_INV_GRANU_NR = 3,
1:  };
1:  
1:  struct fsl_mc_obj_desc {
1: -	char type[16];
1: -	int id;
1: -	u16 vendor;
1: -	u16 ver_major;
1: -	u16 ver_minor;
1: -	u8 irq_count;
1: -	u8 region_count;
1: -	u32 state;
1: -	char label[16];
1: -	u16 flags;
1: +  char type[16];
1: +  int id;
1: +  u16 vendor;
1: +  u16 ver_major;
1: +  u16 ver_minor;
1: +  u8 irq_count;
1: +  u8 region_count;
1: +  u32 state;
1: +  char label[16];
1: +  u16 flags;
1:  };
1:  
1:  struct fsl_mc_io;
1: @@ -77987,124 +79058,124 @@ struct fsl_mc_device_irq;
1:  struct fsl_mc_resource;
1:  
1:  struct fsl_mc_device {
1: -	struct device dev;
1: -	u64 dma_mask;
1: -	u16 flags;
1: -	u32 icid;
1: -	u16 mc_handle;
1: -	struct fsl_mc_io *mc_io;
1: -	struct fsl_mc_obj_desc obj_desc;
1: -	struct resource *regions;
1: -	struct fsl_mc_device_irq **irqs;
1: -	struct fsl_mc_resource *resource;
1: -	struct device_link *consumer_link;
1: -	char *driver_override;
1: +  struct device dev;
1: +  u64 dma_mask;
1: +  u16 flags;
1: +  u32 icid;
1: +  u16 mc_handle;
1: +  struct fsl_mc_io *mc_io;
1: +  struct fsl_mc_obj_desc obj_desc;
1: +  struct resource *regions;
1: +  struct fsl_mc_device_irq **irqs;
1: +  struct fsl_mc_resource *resource;
1: +  struct device_link *consumer_link;
1: +  char *driver_override;
1:  };
1:  
1:  enum fsl_mc_pool_type {
1: -	FSL_MC_POOL_DPMCP = 0,
1: -	FSL_MC_POOL_DPBP = 1,
1: -	FSL_MC_POOL_DPCON = 2,
1: -	FSL_MC_POOL_IRQ = 3,
1: -	FSL_MC_NUM_POOL_TYPES = 4,
1: +  FSL_MC_POOL_DPMCP = 0,
1: +  FSL_MC_POOL_DPBP = 1,
1: +  FSL_MC_POOL_DPCON = 2,
1: +  FSL_MC_POOL_IRQ = 3,
1: +  FSL_MC_NUM_POOL_TYPES = 4,
1:  };
1:  
1:  struct fsl_mc_resource_pool;
1:  
1:  struct fsl_mc_resource {
1: -	enum fsl_mc_pool_type type;
1: -	s32 id;
1: -	void *data;
1: -	struct fsl_mc_resource_pool *parent_pool;
1: -	struct list_head node;
1: +  enum fsl_mc_pool_type type;
1: +  s32 id;
1: +  void *data;
1: +  struct fsl_mc_resource_pool *parent_pool;
1: +  struct list_head node;
1:  };
1:  
1:  struct fsl_mc_device_irq {
1: -	struct msi_desc *msi_desc;
1: -	struct fsl_mc_device *mc_dev;
1: -	u8 dev_irq_index;
1: -	struct fsl_mc_resource resource;
1: +  struct msi_desc *msi_desc;
1: +  struct fsl_mc_device *mc_dev;
1: +  u8 dev_irq_index;
1: +  struct fsl_mc_resource resource;
1:  };
1:  
1:  struct fsl_mc_io {
1: -	struct device *dev;
1: -	u16 flags;
1: -	u32 portal_size;
1: -	phys_addr_t portal_phys_addr;
1: -	void *portal_virt_addr;
1: -	struct fsl_mc_device *dpmcp_dev;
1: -	union {
1: -		struct mutex mutex;
1: -		raw_spinlock_t spinlock;
1: -	};
1: +  struct device *dev;
1: +  u16 flags;
1: +  u32 portal_size;
1: +  phys_addr_t portal_phys_addr;
1: +  void *portal_virt_addr;
1: +  struct fsl_mc_device *dpmcp_dev;
1: +  union {
1: +    struct mutex mutex;
1: +    raw_spinlock_t spinlock;
1: +  };
1:  };
1:  
1:  struct group_device {
1: -	struct list_head list;
1: -	struct device *dev;
1: -	char *name;
1: +  struct list_head list;
1: +  struct device *dev;
1: +  char *name;
1:  };
1:  
1:  struct iommu_group_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct iommu_group *, char *);
1: -	ssize_t (*store)(struct iommu_group *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct iommu_group *, char *);
1: +  ssize_t (*store)(struct iommu_group *, const char *, size_t);
1:  };
1:  
1:  struct group_for_pci_data {
1: -	struct pci_dev *pdev;
1: -	struct iommu_group *group;
1: +  struct pci_dev *pdev;
1: +  struct iommu_group *group;
1:  };
1:  
1:  struct __group_domain_type {
1: -	struct device *dev;
1: -	unsigned int type;
1: +  struct device *dev;
1: +  unsigned int type;
1:  };
1:  
1:  struct trace_event_raw_iommu_group_event {
1: -	struct trace_entry ent;
1: -	int gid;
1: -	u32 __data_loc_device;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int gid;
1: +  u32 __data_loc_device;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_iommu_device_event {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_device;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_device;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_map {
1: -	struct trace_entry ent;
1: -	u64 iova;
1: -	u64 paddr;
1: -	size_t size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u64 iova;
1: +  u64 paddr;
1: +  size_t size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_unmap {
1: -	struct trace_entry ent;
1: -	u64 iova;
1: -	size_t size;
1: -	size_t unmapped_size;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u64 iova;
1: +  size_t size;
1: +  size_t unmapped_size;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_iommu_error {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_device;
1: -	u32 __data_loc_driver;
1: -	u64 iova;
1: -	int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_device;
1: +  u32 __data_loc_driver;
1: +  u64 iova;
1: +  int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_iommu_group_event {
1: -	u32 device;
1: +  u32 device;
1:  };
1:  
1:  struct trace_event_data_offsets_iommu_device_event {
1: -	u32 device;
1: +  u32 device;
1:  };
1:  
1:  struct trace_event_data_offsets_map {};
1: @@ -78112,13 +79183,14 @@ struct trace_event_data_offsets_map {};
1:  struct trace_event_data_offsets_unmap {};
1:  
1:  struct trace_event_data_offsets_iommu_error {
1: -	u32 device;
1: -	u32 driver;
1: +  u32 device;
1: +  u32 driver;
1:  };
1:  
1:  typedef void (*btf_trace_add_device_to_group)(void *, int, struct device *);
1:  
1: -typedef void (*btf_trace_remove_device_from_group)(void *, int, struct device *);
1: +typedef void (*btf_trace_remove_device_from_group)(void *, int,
1: +                                                   struct device *);
1:  
1:  typedef void (*btf_trace_attach_device_to_domain)(void *, struct device *);
1:  
1: @@ -78128,65 +79200,66 @@ typedef void (*btf_trace_map)(void *, long unsigned int, phys_addr_t, size_t);
1:  
1:  typedef void (*btf_trace_unmap)(void *, long unsigned int, size_t, size_t);
1:  
1: -typedef void (*btf_trace_io_page_fault)(void *, struct device *, long unsigned int, int);
1: +typedef void (*btf_trace_io_page_fault)(void *, struct device *,
1: +                                        long unsigned int, int);
1:  
1:  typedef ioasid_t (*ioasid_alloc_fn_t)(ioasid_t, ioasid_t, void *);
1:  
1:  typedef void (*ioasid_free_fn_t)(ioasid_t, void *);
1:  
1:  struct ioasid_set {
1: -	int dummy;
1: +  int dummy;
1:  };
1:  
1:  struct ioasid_allocator_ops {
1: -	ioasid_alloc_fn_t alloc;
1: -	ioasid_free_fn_t free;
1: -	struct list_head list;
1: -	void *pdata;
1: +  ioasid_alloc_fn_t alloc;
1: +  ioasid_free_fn_t free;
1: +  struct list_head list;
1: +  void *pdata;
1:  };
1:  
1:  struct ioasid_data {
1: -	ioasid_t id;
1: -	struct ioasid_set *set;
1: -	void *private;
1: -	struct callback_head rcu;
1: +  ioasid_t id;
1: +  struct ioasid_set *set;
1: +  void *private;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ioasid_allocator_data {
1: -	struct ioasid_allocator_ops *ops;
1: -	struct list_head list;
1: -	struct list_head slist;
1: -	long unsigned int flags;
1: -	struct xarray xa;
1: -	struct callback_head rcu;
1: +  struct ioasid_allocator_ops *ops;
1: +  struct list_head list;
1: +  struct list_head slist;
1: +  long unsigned int flags;
1: +  struct xarray xa;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct iova_magazine {
1: -	long unsigned int size;
1: -	long unsigned int pfns[128];
1: +  long unsigned int size;
1: +  long unsigned int pfns[128];
1:  };
1:  
1:  struct iova_cpu_rcache {
1: -	spinlock_t lock;
1: -	struct iova_magazine *loaded;
1: -	struct iova_magazine *prev;
1: +  spinlock_t lock;
1: +  struct iova_magazine *loaded;
1: +  struct iova_magazine *prev;
1:  };
1:  
1:  struct mipi_dsi_msg {
1: -	u8 channel;
1: -	u8 type;
1: -	u16 flags;
1: -	size_t tx_len;
1: -	const void *tx_buf;
1: -	size_t rx_len;
1: -	void *rx_buf;
1: +  u8 channel;
1: +  u8 type;
1: +  u16 flags;
1: +  size_t tx_len;
1: +  const void *tx_buf;
1: +  size_t rx_len;
1: +  void *rx_buf;
1:  };
1:  
1:  struct mipi_dsi_packet {
1: -	size_t size;
1: -	u8 header[4];
1: -	size_t payload_length;
1: -	const u8 *payload;
1: +  size_t size;
1: +  u8 header[4];
1: +  size_t payload_length;
1: +  const u8 *payload;
1:  };
1:  
1:  struct mipi_dsi_host;
1: @@ -78194,696 +79267,698 @@ struct mipi_dsi_host;
1:  struct mipi_dsi_device;
1:  
1:  struct mipi_dsi_host_ops {
1: -	int (*attach)(struct mipi_dsi_host *, struct mipi_dsi_device *);
1: -	int (*detach)(struct mipi_dsi_host *, struct mipi_dsi_device *);
1: -	ssize_t (*transfer)(struct mipi_dsi_host *, const struct mipi_dsi_msg *);
1: +  int (*attach)(struct mipi_dsi_host *, struct mipi_dsi_device *);
1: +  int (*detach)(struct mipi_dsi_host *, struct mipi_dsi_device *);
1: +  ssize_t (*transfer)(struct mipi_dsi_host *, const struct mipi_dsi_msg *);
1:  };
1:  
1:  struct mipi_dsi_host {
1: -	struct device *dev;
1: -	const struct mipi_dsi_host_ops *ops;
1: -	struct list_head list;
1: +  struct device *dev;
1: +  const struct mipi_dsi_host_ops *ops;
1: +  struct list_head list;
1:  };
1:  
1:  enum mipi_dsi_pixel_format {
1: -	MIPI_DSI_FMT_RGB888 = 0,
1: -	MIPI_DSI_FMT_RGB666 = 1,
1: -	MIPI_DSI_FMT_RGB666_PACKED = 2,
1: -	MIPI_DSI_FMT_RGB565 = 3,
1: +  MIPI_DSI_FMT_RGB888 = 0,
1: +  MIPI_DSI_FMT_RGB666 = 1,
1: +  MIPI_DSI_FMT_RGB666_PACKED = 2,
1: +  MIPI_DSI_FMT_RGB565 = 3,
1:  };
1:  
1:  struct mipi_dsi_device {
1: -	struct mipi_dsi_host *host;
1: -	struct device dev;
1: -	char name[20];
1: -	unsigned int channel;
1: -	unsigned int lanes;
1: -	enum mipi_dsi_pixel_format format;
1: -	long unsigned int mode_flags;
1: -	long unsigned int hs_rate;
1: -	long unsigned int lp_rate;
1: +  struct mipi_dsi_host *host;
1: +  struct device dev;
1: +  char name[20];
1: +  unsigned int channel;
1: +  unsigned int lanes;
1: +  enum mipi_dsi_pixel_format format;
1: +  long unsigned int mode_flags;
1: +  long unsigned int hs_rate;
1: +  long unsigned int lp_rate;
1:  };
1:  
1:  struct mipi_dsi_device_info {
1: -	char type[20];
1: -	u32 channel;
1: -	struct device_node *node;
1: +  char type[20];
1: +  u32 channel;
1: +  struct device_node *node;
1:  };
1:  
1:  enum mipi_dsi_dcs_tear_mode {
1: -	MIPI_DSI_DCS_TEAR_MODE_VBLANK = 0,
1: -	MIPI_DSI_DCS_TEAR_MODE_VHBLANK = 1,
1: +  MIPI_DSI_DCS_TEAR_MODE_VBLANK = 0,
1: +  MIPI_DSI_DCS_TEAR_MODE_VHBLANK = 1,
1:  };
1:  
1:  struct mipi_dsi_driver {
1: -	struct device_driver driver;
1: -	int (*probe)(struct mipi_dsi_device *);
1: -	int (*remove)(struct mipi_dsi_device *);
1: -	void (*shutdown)(struct mipi_dsi_device *);
1: +  struct device_driver driver;
1: +  int (*probe)(struct mipi_dsi_device *);
1: +  int (*remove)(struct mipi_dsi_device *);
1: +  void (*shutdown)(struct mipi_dsi_device *);
1:  };
1:  
1:  struct drm_dsc_picture_parameter_set {
1: -	u8 dsc_version;
1: -	u8 pps_identifier;
1: -	u8 pps_reserved;
1: -	u8 pps_3;
1: -	u8 pps_4;
1: -	u8 bits_per_pixel_low;
1: -	__be16 pic_height;
1: -	__be16 pic_width;
1: -	__be16 slice_height;
1: -	__be16 slice_width;
1: -	__be16 chunk_size;
1: -	u8 initial_xmit_delay_high;
1: -	u8 initial_xmit_delay_low;
1: -	__be16 initial_dec_delay;
1: -	u8 pps20_reserved;
1: -	u8 initial_scale_value;
1: -	__be16 scale_increment_interval;
1: -	u8 scale_decrement_interval_high;
1: -	u8 scale_decrement_interval_low;
1: -	u8 pps26_reserved;
1: -	u8 first_line_bpg_offset;
1: -	__be16 nfl_bpg_offset;
1: -	__be16 slice_bpg_offset;
1: -	__be16 initial_offset;
1: -	__be16 final_offset;
1: -	u8 flatness_min_qp;
1: -	u8 flatness_max_qp;
1: -	__be16 rc_model_size;
1: -	u8 rc_edge_factor;
1: -	u8 rc_quant_incr_limit0;
1: -	u8 rc_quant_incr_limit1;
1: -	u8 rc_tgt_offset;
1: -	u8 rc_buf_thresh[14];
1: -	__be16 rc_range_parameters[15];
1: -	u8 native_422_420;
1: -	u8 second_line_bpg_offset;
1: -	__be16 nsl_bpg_offset;
1: -	__be16 second_line_offset_adj;
1: -	u32 pps_long_94_reserved;
1: -	u32 pps_long_98_reserved;
1: -	u32 pps_long_102_reserved;
1: -	u32 pps_long_106_reserved;
1: -	u32 pps_long_110_reserved;
1: -	u32 pps_long_114_reserved;
1: -	u32 pps_long_118_reserved;
1: -	u32 pps_long_122_reserved;
1: -	__be16 pps_short_126_reserved;
1: +  u8 dsc_version;
1: +  u8 pps_identifier;
1: +  u8 pps_reserved;
1: +  u8 pps_3;
1: +  u8 pps_4;
1: +  u8 bits_per_pixel_low;
1: +  __be16 pic_height;
1: +  __be16 pic_width;
1: +  __be16 slice_height;
1: +  __be16 slice_width;
1: +  __be16 chunk_size;
1: +  u8 initial_xmit_delay_high;
1: +  u8 initial_xmit_delay_low;
1: +  __be16 initial_dec_delay;
1: +  u8 pps20_reserved;
1: +  u8 initial_scale_value;
1: +  __be16 scale_increment_interval;
1: +  u8 scale_decrement_interval_high;
1: +  u8 scale_decrement_interval_low;
1: +  u8 pps26_reserved;
1: +  u8 first_line_bpg_offset;
1: +  __be16 nfl_bpg_offset;
1: +  __be16 slice_bpg_offset;
1: +  __be16 initial_offset;
1: +  __be16 final_offset;
1: +  u8 flatness_min_qp;
1: +  u8 flatness_max_qp;
1: +  __be16 rc_model_size;
1: +  u8 rc_edge_factor;
1: +  u8 rc_quant_incr_limit0;
1: +  u8 rc_quant_incr_limit1;
1: +  u8 rc_tgt_offset;
1: +  u8 rc_buf_thresh[14];
1: +  __be16 rc_range_parameters[15];
1: +  u8 native_422_420;
1: +  u8 second_line_bpg_offset;
1: +  __be16 nsl_bpg_offset;
1: +  __be16 second_line_offset_adj;
1: +  u32 pps_long_94_reserved;
1: +  u32 pps_long_98_reserved;
1: +  u32 pps_long_102_reserved;
1: +  u32 pps_long_106_reserved;
1: +  u32 pps_long_110_reserved;
1: +  u32 pps_long_114_reserved;
1: +  u32 pps_long_118_reserved;
1: +  u32 pps_long_122_reserved;
1: +  __be16 pps_short_126_reserved;
1:  } __attribute__((packed));
1:  
1:  enum {
1: -	MIPI_DSI_V_SYNC_START = 1,
1: -	MIPI_DSI_V_SYNC_END = 17,
1: -	MIPI_DSI_H_SYNC_START = 33,
1: -	MIPI_DSI_H_SYNC_END = 49,
1: -	MIPI_DSI_COMPRESSION_MODE = 7,
1: -	MIPI_DSI_END_OF_TRANSMISSION = 8,
1: -	MIPI_DSI_COLOR_MODE_OFF = 2,
1: -	MIPI_DSI_COLOR_MODE_ON = 18,
1: -	MIPI_DSI_SHUTDOWN_PERIPHERAL = 34,
1: -	MIPI_DSI_TURN_ON_PERIPHERAL = 50,
1: -	MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM = 3,
1: -	MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM = 19,
1: -	MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM = 35,
1: -	MIPI_DSI_GENERIC_READ_REQUEST_0_PARAM = 4,
1: -	MIPI_DSI_GENERIC_READ_REQUEST_1_PARAM = 20,
1: -	MIPI_DSI_GENERIC_READ_REQUEST_2_PARAM = 36,
1: -	MIPI_DSI_DCS_SHORT_WRITE = 5,
1: -	MIPI_DSI_DCS_SHORT_WRITE_PARAM = 21,
1: -	MIPI_DSI_DCS_READ = 6,
1: -	MIPI_DSI_EXECUTE_QUEUE = 22,
1: -	MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE = 55,
1: -	MIPI_DSI_NULL_PACKET = 9,
1: -	MIPI_DSI_BLANKING_PACKET = 25,
1: -	MIPI_DSI_GENERIC_LONG_WRITE = 41,
1: -	MIPI_DSI_DCS_LONG_WRITE = 57,
1: -	MIPI_DSI_PICTURE_PARAMETER_SET = 10,
1: -	MIPI_DSI_COMPRESSED_PIXEL_STREAM = 11,
1: -	MIPI_DSI_LOOSELY_PACKED_PIXEL_STREAM_YCBCR20 = 12,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR24 = 28,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16 = 44,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_30 = 13,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_36 = 29,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR12 = 61,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_16 = 14,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_18 = 30,
1: -	MIPI_DSI_PIXEL_STREAM_3BYTE_18 = 46,
1: -	MIPI_DSI_PACKED_PIXEL_STREAM_24 = 62,
1: -};
1: -
1: -enum {
1: -	MIPI_DCS_NOP = 0,
1: -	MIPI_DCS_SOFT_RESET = 1,
1: -	MIPI_DCS_GET_COMPRESSION_MODE = 3,
1: -	MIPI_DCS_GET_DISPLAY_ID = 4,
1: -	MIPI_DCS_GET_ERROR_COUNT_ON_DSI = 5,
1: -	MIPI_DCS_GET_RED_CHANNEL = 6,
1: -	MIPI_DCS_GET_GREEN_CHANNEL = 7,
1: -	MIPI_DCS_GET_BLUE_CHANNEL = 8,
1: -	MIPI_DCS_GET_DISPLAY_STATUS = 9,
1: -	MIPI_DCS_GET_POWER_MODE = 10,
1: -	MIPI_DCS_GET_ADDRESS_MODE = 11,
1: -	MIPI_DCS_GET_PIXEL_FORMAT = 12,
1: -	MIPI_DCS_GET_DISPLAY_MODE = 13,
1: -	MIPI_DCS_GET_SIGNAL_MODE = 14,
1: -	MIPI_DCS_GET_DIAGNOSTIC_RESULT = 15,
1: -	MIPI_DCS_ENTER_SLEEP_MODE = 16,
1: -	MIPI_DCS_EXIT_SLEEP_MODE = 17,
1: -	MIPI_DCS_ENTER_PARTIAL_MODE = 18,
1: -	MIPI_DCS_ENTER_NORMAL_MODE = 19,
1: -	MIPI_DCS_GET_IMAGE_CHECKSUM_RGB = 20,
1: -	MIPI_DCS_GET_IMAGE_CHECKSUM_CT = 21,
1: -	MIPI_DCS_EXIT_INVERT_MODE = 32,
1: -	MIPI_DCS_ENTER_INVERT_MODE = 33,
1: -	MIPI_DCS_SET_GAMMA_CURVE = 38,
1: -	MIPI_DCS_SET_DISPLAY_OFF = 40,
1: -	MIPI_DCS_SET_DISPLAY_ON = 41,
1: -	MIPI_DCS_SET_COLUMN_ADDRESS = 42,
1: -	MIPI_DCS_SET_PAGE_ADDRESS = 43,
1: -	MIPI_DCS_WRITE_MEMORY_START = 44,
1: -	MIPI_DCS_WRITE_LUT = 45,
1: -	MIPI_DCS_READ_MEMORY_START = 46,
1: -	MIPI_DCS_SET_PARTIAL_ROWS = 48,
1: -	MIPI_DCS_SET_PARTIAL_COLUMNS = 49,
1: -	MIPI_DCS_SET_SCROLL_AREA = 51,
1: -	MIPI_DCS_SET_TEAR_OFF = 52,
1: -	MIPI_DCS_SET_TEAR_ON = 53,
1: -	MIPI_DCS_SET_ADDRESS_MODE = 54,
1: -	MIPI_DCS_SET_SCROLL_START = 55,
1: -	MIPI_DCS_EXIT_IDLE_MODE = 56,
1: -	MIPI_DCS_ENTER_IDLE_MODE = 57,
1: -	MIPI_DCS_SET_PIXEL_FORMAT = 58,
1: -	MIPI_DCS_WRITE_MEMORY_CONTINUE = 60,
1: -	MIPI_DCS_SET_3D_CONTROL = 61,
1: -	MIPI_DCS_READ_MEMORY_CONTINUE = 62,
1: -	MIPI_DCS_GET_3D_CONTROL = 63,
1: -	MIPI_DCS_SET_VSYNC_TIMING = 64,
1: -	MIPI_DCS_SET_TEAR_SCANLINE = 68,
1: -	MIPI_DCS_GET_SCANLINE = 69,
1: -	MIPI_DCS_SET_DISPLAY_BRIGHTNESS = 81,
1: -	MIPI_DCS_GET_DISPLAY_BRIGHTNESS = 82,
1: -	MIPI_DCS_WRITE_CONTROL_DISPLAY = 83,
1: -	MIPI_DCS_GET_CONTROL_DISPLAY = 84,
1: -	MIPI_DCS_WRITE_POWER_SAVE = 85,
1: -	MIPI_DCS_GET_POWER_SAVE = 86,
1: -	MIPI_DCS_SET_CABC_MIN_BRIGHTNESS = 94,
1: -	MIPI_DCS_GET_CABC_MIN_BRIGHTNESS = 95,
1: -	MIPI_DCS_READ_DDB_START = 161,
1: -	MIPI_DCS_READ_PPS_START = 162,
1: -	MIPI_DCS_READ_DDB_CONTINUE = 168,
1: -	MIPI_DCS_READ_PPS_CONTINUE = 169,
1: +  MIPI_DSI_V_SYNC_START = 1,
1: +  MIPI_DSI_V_SYNC_END = 17,
1: +  MIPI_DSI_H_SYNC_START = 33,
1: +  MIPI_DSI_H_SYNC_END = 49,
1: +  MIPI_DSI_COMPRESSION_MODE = 7,
1: +  MIPI_DSI_END_OF_TRANSMISSION = 8,
1: +  MIPI_DSI_COLOR_MODE_OFF = 2,
1: +  MIPI_DSI_COLOR_MODE_ON = 18,
1: +  MIPI_DSI_SHUTDOWN_PERIPHERAL = 34,
1: +  MIPI_DSI_TURN_ON_PERIPHERAL = 50,
1: +  MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM = 3,
1: +  MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM = 19,
1: +  MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM = 35,
1: +  MIPI_DSI_GENERIC_READ_REQUEST_0_PARAM = 4,
1: +  MIPI_DSI_GENERIC_READ_REQUEST_1_PARAM = 20,
1: +  MIPI_DSI_GENERIC_READ_REQUEST_2_PARAM = 36,
1: +  MIPI_DSI_DCS_SHORT_WRITE = 5,
1: +  MIPI_DSI_DCS_SHORT_WRITE_PARAM = 21,
1: +  MIPI_DSI_DCS_READ = 6,
1: +  MIPI_DSI_EXECUTE_QUEUE = 22,
1: +  MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE = 55,
1: +  MIPI_DSI_NULL_PACKET = 9,
1: +  MIPI_DSI_BLANKING_PACKET = 25,
1: +  MIPI_DSI_GENERIC_LONG_WRITE = 41,
1: +  MIPI_DSI_DCS_LONG_WRITE = 57,
1: +  MIPI_DSI_PICTURE_PARAMETER_SET = 10,
1: +  MIPI_DSI_COMPRESSED_PIXEL_STREAM = 11,
1: +  MIPI_DSI_LOOSELY_PACKED_PIXEL_STREAM_YCBCR20 = 12,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR24 = 28,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16 = 44,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_30 = 13,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_36 = 29,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR12 = 61,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_16 = 14,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_18 = 30,
1: +  MIPI_DSI_PIXEL_STREAM_3BYTE_18 = 46,
1: +  MIPI_DSI_PACKED_PIXEL_STREAM_24 = 62,
1: +};
1: +
1: +enum {
1: +  MIPI_DCS_NOP = 0,
1: +  MIPI_DCS_SOFT_RESET = 1,
1: +  MIPI_DCS_GET_COMPRESSION_MODE = 3,
1: +  MIPI_DCS_GET_DISPLAY_ID = 4,
1: +  MIPI_DCS_GET_ERROR_COUNT_ON_DSI = 5,
1: +  MIPI_DCS_GET_RED_CHANNEL = 6,
1: +  MIPI_DCS_GET_GREEN_CHANNEL = 7,
1: +  MIPI_DCS_GET_BLUE_CHANNEL = 8,
1: +  MIPI_DCS_GET_DISPLAY_STATUS = 9,
1: +  MIPI_DCS_GET_POWER_MODE = 10,
1: +  MIPI_DCS_GET_ADDRESS_MODE = 11,
1: +  MIPI_DCS_GET_PIXEL_FORMAT = 12,
1: +  MIPI_DCS_GET_DISPLAY_MODE = 13,
1: +  MIPI_DCS_GET_SIGNAL_MODE = 14,
1: +  MIPI_DCS_GET_DIAGNOSTIC_RESULT = 15,
1: +  MIPI_DCS_ENTER_SLEEP_MODE = 16,
1: +  MIPI_DCS_EXIT_SLEEP_MODE = 17,
1: +  MIPI_DCS_ENTER_PARTIAL_MODE = 18,
1: +  MIPI_DCS_ENTER_NORMAL_MODE = 19,
1: +  MIPI_DCS_GET_IMAGE_CHECKSUM_RGB = 20,
1: +  MIPI_DCS_GET_IMAGE_CHECKSUM_CT = 21,
1: +  MIPI_DCS_EXIT_INVERT_MODE = 32,
1: +  MIPI_DCS_ENTER_INVERT_MODE = 33,
1: +  MIPI_DCS_SET_GAMMA_CURVE = 38,
1: +  MIPI_DCS_SET_DISPLAY_OFF = 40,
1: +  MIPI_DCS_SET_DISPLAY_ON = 41,
1: +  MIPI_DCS_SET_COLUMN_ADDRESS = 42,
1: +  MIPI_DCS_SET_PAGE_ADDRESS = 43,
1: +  MIPI_DCS_WRITE_MEMORY_START = 44,
1: +  MIPI_DCS_WRITE_LUT = 45,
1: +  MIPI_DCS_READ_MEMORY_START = 46,
1: +  MIPI_DCS_SET_PARTIAL_ROWS = 48,
1: +  MIPI_DCS_SET_PARTIAL_COLUMNS = 49,
1: +  MIPI_DCS_SET_SCROLL_AREA = 51,
1: +  MIPI_DCS_SET_TEAR_OFF = 52,
1: +  MIPI_DCS_SET_TEAR_ON = 53,
1: +  MIPI_DCS_SET_ADDRESS_MODE = 54,
1: +  MIPI_DCS_SET_SCROLL_START = 55,
1: +  MIPI_DCS_EXIT_IDLE_MODE = 56,
1: +  MIPI_DCS_ENTER_IDLE_MODE = 57,
1: +  MIPI_DCS_SET_PIXEL_FORMAT = 58,
1: +  MIPI_DCS_WRITE_MEMORY_CONTINUE = 60,
1: +  MIPI_DCS_SET_3D_CONTROL = 61,
1: +  MIPI_DCS_READ_MEMORY_CONTINUE = 62,
1: +  MIPI_DCS_GET_3D_CONTROL = 63,
1: +  MIPI_DCS_SET_VSYNC_TIMING = 64,
1: +  MIPI_DCS_SET_TEAR_SCANLINE = 68,
1: +  MIPI_DCS_GET_SCANLINE = 69,
1: +  MIPI_DCS_SET_DISPLAY_BRIGHTNESS = 81,
1: +  MIPI_DCS_GET_DISPLAY_BRIGHTNESS = 82,
1: +  MIPI_DCS_WRITE_CONTROL_DISPLAY = 83,
1: +  MIPI_DCS_GET_CONTROL_DISPLAY = 84,
1: +  MIPI_DCS_WRITE_POWER_SAVE = 85,
1: +  MIPI_DCS_GET_POWER_SAVE = 86,
1: +  MIPI_DCS_SET_CABC_MIN_BRIGHTNESS = 94,
1: +  MIPI_DCS_GET_CABC_MIN_BRIGHTNESS = 95,
1: +  MIPI_DCS_READ_DDB_START = 161,
1: +  MIPI_DCS_READ_PPS_START = 162,
1: +  MIPI_DCS_READ_DDB_CONTINUE = 168,
1: +  MIPI_DCS_READ_PPS_CONTINUE = 169,
1:  };
1:  
1:  struct vga_device {
1: -	struct list_head list;
1: -	struct pci_dev *pdev;
1: -	unsigned int decodes;
1: -	unsigned int owns;
1: -	unsigned int locks;
1: -	unsigned int io_lock_cnt;
1: -	unsigned int mem_lock_cnt;
1: -	unsigned int io_norm_cnt;
1: -	unsigned int mem_norm_cnt;
1: -	bool bridge_has_one_vga;
1: -	void *cookie;
1: -	void (*irq_set_state)(void *, bool);
1: -	unsigned int (*set_vga_decode)(void *, bool);
1: +  struct list_head list;
1: +  struct pci_dev *pdev;
1: +  unsigned int decodes;
1: +  unsigned int owns;
1: +  unsigned int locks;
1: +  unsigned int io_lock_cnt;
1: +  unsigned int mem_lock_cnt;
1: +  unsigned int io_norm_cnt;
1: +  unsigned int mem_norm_cnt;
1: +  bool bridge_has_one_vga;
1: +  void *cookie;
1: +  void (*irq_set_state)(void *, bool);
1: +  unsigned int (*set_vga_decode)(void *, bool);
1:  };
1:  
1:  struct vga_arb_user_card {
1: -	struct pci_dev *pdev;
1: -	unsigned int mem_cnt;
1: -	unsigned int io_cnt;
1: +  struct pci_dev *pdev;
1: +  unsigned int mem_cnt;
1: +  unsigned int io_cnt;
1:  };
1:  
1:  struct vga_arb_private {
1: -	struct list_head list;
1: -	struct pci_dev *target;
1: -	struct vga_arb_user_card cards[16];
1: -	spinlock_t lock;
1: +  struct list_head list;
1: +  struct pci_dev *target;
1: +  struct vga_arb_user_card cards[16];
1: +  spinlock_t lock;
1:  };
1:  
1:  struct cb_id {
1: -	__u32 idx;
1: -	__u32 val;
1: +  __u32 idx;
1: +  __u32 val;
1:  };
1:  
1:  struct cn_msg {
1: -	struct cb_id id;
1: -	__u32 seq;
1: -	__u32 ack;
1: -	__u16 len;
1: -	__u16 flags;
1: -	__u8 data[0];
1: +  struct cb_id id;
1: +  __u32 seq;
1: +  __u32 ack;
1: +  __u16 len;
1: +  __u16 flags;
1: +  __u8 data[0];
1:  };
1:  
1:  struct cn_queue_dev {
1: -	atomic_t refcnt;
1: -	unsigned char name[32];
1: -	struct list_head queue_list;
1: -	spinlock_t queue_lock;
1: -	struct sock *nls;
1: +  atomic_t refcnt;
1: +  unsigned char name[32];
1: +  struct list_head queue_list;
1: +  spinlock_t queue_lock;
1: +  struct sock *nls;
1:  };
1:  
1:  struct cn_callback_id {
1: -	unsigned char name[32];
1: -	struct cb_id id;
1: +  unsigned char name[32];
1: +  struct cb_id id;
1:  };
1:  
1:  struct cn_callback_entry {
1: -	struct list_head callback_entry;
1: -	refcount_t refcnt;
1: -	struct cn_queue_dev *pdev;
1: -	struct cn_callback_id id;
1: -	void (*callback)(struct cn_msg *, struct netlink_skb_parms *);
1: -	u32 seq;
1: -	u32 group;
1: +  struct list_head callback_entry;
1: +  refcount_t refcnt;
1: +  struct cn_queue_dev *pdev;
1: +  struct cn_callback_id id;
1: +  void (*callback)(struct cn_msg *, struct netlink_skb_parms *);
1: +  u32 seq;
1: +  u32 group;
1:  };
1:  
1:  struct cn_dev {
1: -	struct cb_id id;
1: -	u32 seq;
1: -	u32 groups;
1: -	struct sock *nls;
1: -	struct cn_queue_dev *cbdev;
1: +  struct cb_id id;
1: +  u32 seq;
1: +  u32 groups;
1: +  struct sock *nls;
1: +  struct cn_queue_dev *cbdev;
1:  };
1:  
1:  enum proc_cn_mcast_op {
1: -	PROC_CN_MCAST_LISTEN = 1,
1: -	PROC_CN_MCAST_IGNORE = 2,
1: +  PROC_CN_MCAST_LISTEN = 1,
1: +  PROC_CN_MCAST_IGNORE = 2,
1:  };
1:  
1:  struct fork_proc_event {
1: -	__kernel_pid_t parent_pid;
1: -	__kernel_pid_t parent_tgid;
1: -	__kernel_pid_t child_pid;
1: -	__kernel_pid_t child_tgid;
1: +  __kernel_pid_t parent_pid;
1: +  __kernel_pid_t parent_tgid;
1: +  __kernel_pid_t child_pid;
1: +  __kernel_pid_t child_tgid;
1:  };
1:  
1:  struct exec_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1:  };
1:  
1:  struct id_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: -	union {
1: -		__u32 ruid;
1: -		__u32 rgid;
1: -	} r;
1: -	union {
1: -		__u32 euid;
1: -		__u32 egid;
1: -	} e;
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1: +  union {
1: +    __u32 ruid;
1: +    __u32 rgid;
1: +  } r;
1: +  union {
1: +    __u32 euid;
1: +    __u32 egid;
1: +  } e;
1:  };
1:  
1:  struct sid_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1:  };
1:  
1:  struct ptrace_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: -	__kernel_pid_t tracer_pid;
1: -	__kernel_pid_t tracer_tgid;
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1: +  __kernel_pid_t tracer_pid;
1: +  __kernel_pid_t tracer_tgid;
1:  };
1:  
1:  struct comm_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: -	char comm[16];
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1: +  char comm[16];
1:  };
1:  
1:  struct coredump_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: -	__kernel_pid_t parent_pid;
1: -	__kernel_pid_t parent_tgid;
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1: +  __kernel_pid_t parent_pid;
1: +  __kernel_pid_t parent_tgid;
1:  };
1:  
1:  struct exit_proc_event {
1: -	__kernel_pid_t process_pid;
1: -	__kernel_pid_t process_tgid;
1: -	__u32 exit_code;
1: -	__u32 exit_signal;
1: -	__kernel_pid_t parent_pid;
1: -	__kernel_pid_t parent_tgid;
1: +  __kernel_pid_t process_pid;
1: +  __kernel_pid_t process_tgid;
1: +  __u32 exit_code;
1: +  __u32 exit_signal;
1: +  __kernel_pid_t parent_pid;
1: +  __kernel_pid_t parent_tgid;
1:  };
1:  
1:  struct proc_event {
1: -	enum what what;
1: -	__u32 cpu;
1: -	__u64 timestamp_ns;
1: -	union {
1: -		struct {
1: -			__u32 err;
1: -		} ack;
1: -		struct fork_proc_event fork;
1: -		struct exec_proc_event exec;
1: -		struct id_proc_event id;
1: -		struct sid_proc_event sid;
1: -		struct ptrace_proc_event ptrace;
1: -		struct comm_proc_event comm;
1: -		struct coredump_proc_event coredump;
1: -		struct exit_proc_event exit;
1: -	} event_data;
1: +  enum what what;
1: +  __u32 cpu;
1: +  __u64 timestamp_ns;
1: +  union {
1: +    struct {
1: +      __u32 err;
1: +    } ack;
1: +    struct fork_proc_event fork;
1: +    struct exec_proc_event exec;
1: +    struct id_proc_event id;
1: +    struct sid_proc_event sid;
1: +    struct ptrace_proc_event ptrace;
1: +    struct comm_proc_event comm;
1: +    struct coredump_proc_event coredump;
1: +    struct exit_proc_event exit;
1: +  } event_data;
1:  };
1:  
1:  struct local_event {
1: -	local_lock_t lock;
1: -	__u32 count;
1: +  local_lock_t lock;
1: +  __u32 count;
1:  };
1:  
1:  struct component_ops {
1: -	int (*bind)(struct device *, struct device *, void *);
1: -	void (*unbind)(struct device *, struct device *, void *);
1: +  int (*bind)(struct device *, struct device *, void *);
1: +  void (*unbind)(struct device *, struct device *, void *);
1:  };
1:  
1:  struct component_master_ops {
1: -	int (*bind)(struct device *);
1: -	void (*unbind)(struct device *);
1: +  int (*bind)(struct device *);
1: +  void (*unbind)(struct device *);
1:  };
1:  
1:  struct component;
1:  
1:  struct component_match_array {
1: -	void *data;
1: -	int (*compare)(struct device *, void *);
1: -	int (*compare_typed)(struct device *, int, void *);
1: -	void (*release)(struct device *, void *);
1: -	struct component *component;
1: -	bool duplicate;
1: +  void *data;
1: +  int (*compare)(struct device *, void *);
1: +  int (*compare_typed)(struct device *, int, void *);
1: +  void (*release)(struct device *, void *);
1: +  struct component *component;
1: +  bool duplicate;
1:  };
1:  
1:  struct master;
1:  
1:  struct component {
1: -	struct list_head node;
1: -	struct master *master;
1: -	bool bound;
1: -	const struct component_ops *ops;
1: -	int subcomponent;
1: -	struct device *dev;
1: +  struct list_head node;
1: +  struct master *master;
1: +  bool bound;
1: +  const struct component_ops *ops;
1: +  int subcomponent;
1: +  struct device *dev;
1:  };
1:  
1:  struct component_match {
1: -	size_t alloc;
1: -	size_t num;
1: -	struct component_match_array *compare;
1: +  size_t alloc;
1: +  size_t num;
1: +  struct component_match_array *compare;
1:  };
1:  
1:  struct master {
1: -	struct list_head node;
1: -	bool bound;
1: -	const struct component_master_ops *ops;
1: -	struct device *dev;
1: -	struct component_match *match;
1: -	struct dentry *dentry;
1: +  struct list_head node;
1: +  bool bound;
1: +  const struct component_master_ops *ops;
1: +  struct device *dev;
1: +  struct component_match *match;
1: +  struct dentry *dentry;
1:  };
1:  
1:  struct wake_irq {
1: -	struct device *dev;
1: -	unsigned int status;
1: -	int irq;
1: -	const char *name;
1: +  struct device *dev;
1: +  unsigned int status;
1: +  int irq;
1: +  const char *name;
1:  };
1:  
1:  enum dpm_order {
1: -	DPM_ORDER_NONE = 0,
1: -	DPM_ORDER_DEV_AFTER_PARENT = 1,
1: -	DPM_ORDER_PARENT_BEFORE_DEV = 2,
1: -	DPM_ORDER_DEV_LAST = 3,
1: +  DPM_ORDER_NONE = 0,
1: +  DPM_ORDER_DEV_AFTER_PARENT = 1,
1: +  DPM_ORDER_PARENT_BEFORE_DEV = 2,
1: +  DPM_ORDER_DEV_LAST = 3,
1:  };
1:  
1:  struct subsys_private {
1: -	struct kset subsys;
1: -	struct kset *devices_kset;
1: -	struct list_head interfaces;
1: -	struct mutex mutex;
1: -	struct kset *drivers_kset;
1: -	struct klist klist_devices;
1: -	struct klist klist_drivers;
1: -	struct blocking_notifier_head bus_notifier;
1: -	unsigned int drivers_autoprobe: 1;
1: -	struct bus_type *bus;
1: -	struct kset glue_dirs;
1: -	struct class *class;
1: +  struct kset subsys;
1: +  struct kset *devices_kset;
1: +  struct list_head interfaces;
1: +  struct mutex mutex;
1: +  struct kset *drivers_kset;
1: +  struct klist klist_devices;
1: +  struct klist klist_drivers;
1: +  struct blocking_notifier_head bus_notifier;
1: +  unsigned int drivers_autoprobe : 1;
1: +  struct bus_type *bus;
1: +  struct kset glue_dirs;
1: +  struct class *class;
1:  };
1:  
1:  struct driver_private {
1: -	struct kobject kobj;
1: -	struct klist klist_devices;
1: -	struct klist_node knode_bus;
1: -	struct module_kobject *mkobj;
1: -	struct device_driver *driver;
1: +  struct kobject kobj;
1: +  struct klist klist_devices;
1: +  struct klist_node knode_bus;
1: +  struct module_kobject *mkobj;
1: +  struct device_driver *driver;
1:  };
1:  
1:  struct device_private {
1: -	struct klist klist_children;
1: -	struct klist_node knode_parent;
1: -	struct klist_node knode_driver;
1: -	struct klist_node knode_bus;
1: -	struct klist_node knode_class;
1: -	struct list_head deferred_probe;
1: -	struct device_driver *async_driver;
1: -	char *deferred_probe_reason;
1: -	struct device *device;
1: -	u8 dead: 1;
1: +  struct klist klist_children;
1: +  struct klist_node knode_parent;
1: +  struct klist_node knode_driver;
1: +  struct klist_node knode_bus;
1: +  struct klist_node knode_class;
1: +  struct list_head deferred_probe;
1: +  struct device_driver *async_driver;
1: +  char *deferred_probe_reason;
1: +  struct device *device;
1: +  u8 dead : 1;
1:  };
1:  
1:  union device_attr_group_devres {
1: -	const struct attribute_group *group;
1: -	const struct attribute_group **groups;
1: +  const struct attribute_group *group;
1: +  const struct attribute_group **groups;
1:  };
1:  
1:  struct class_dir {
1: -	struct kobject kobj;
1: -	struct class *class;
1: +  struct kobject kobj;
1: +  struct class *class;
1:  };
1:  
1:  struct root_device {
1: -	struct device dev;
1: -	struct module *owner;
1: +  struct device dev;
1: +  struct module *owner;
1:  };
1:  
1:  struct subsys_dev_iter {
1: -	struct klist_iter ki;
1: -	const struct device_type *type;
1: +  struct klist_iter ki;
1: +  const struct device_type *type;
1:  };
1:  
1:  struct subsys_interface {
1: -	const char *name;
1: -	struct bus_type *subsys;
1: -	struct list_head node;
1: -	int (*add_dev)(struct device *, struct subsys_interface *);
1: -	void (*remove_dev)(struct device *, struct subsys_interface *);
1: +  const char *name;
1: +  struct bus_type *subsys;
1: +  struct list_head node;
1: +  int (*add_dev)(struct device *, struct subsys_interface *);
1: +  void (*remove_dev)(struct device *, struct subsys_interface *);
1:  };
1:  
1:  struct device_attach_data {
1: -	struct device *dev;
1: -	bool check_async;
1: -	bool want_async;
1: -	bool have_async;
1: +  struct device *dev;
1: +  bool check_async;
1: +  bool want_async;
1: +  bool have_async;
1:  };
1:  
1:  struct class_attribute_string {
1: -	struct class_attribute attr;
1: -	char *str;
1: +  struct class_attribute attr;
1: +  char *str;
1:  };
1:  
1:  struct class_compat {
1: -	struct kobject *kobj;
1: +  struct kobject *kobj;
1:  };
1:  
1:  struct platform_object {
1: -	struct platform_device pdev;
1: -	char name[0];
1: +  struct platform_device pdev;
1: +  char name[0];
1:  };
1:  
1:  struct cpu_attr {
1: -	struct device_attribute attr;
1: -	const struct cpumask * const map;
1: +  struct device_attribute attr;
1: +  const struct cpumask *const map;
1:  };
1:  
1:  typedef struct kobject *kobj_probe_t(dev_t, int *, void *);
1:  
1:  struct probe {
1: -	struct probe *next;
1: -	dev_t dev;
1: -	long unsigned int range;
1: -	struct module *owner;
1: -	kobj_probe_t *get;
1: -	int (*lock)(dev_t, void *);
1: -	void *data;
1: +  struct probe *next;
1: +  dev_t dev;
1: +  long unsigned int range;
1: +  struct module *owner;
1: +  kobj_probe_t *get;
1: +  int (*lock)(dev_t, void *);
1: +  void *data;
1:  };
1:  
1:  struct kobj_map___2 {
1: -	struct probe *probes[255];
1: -	struct mutex *lock;
1: +  struct probe *probes[255];
1: +  struct mutex *lock;
1:  };
1:  
1:  typedef int (*dr_match_t)(struct device *, void *, void *);
1:  
1:  struct devres_node {
1: -	struct list_head entry;
1: -	dr_release_t release;
1: +  struct list_head entry;
1: +  dr_release_t release;
1:  };
1:  
1:  struct devres___2 {
1: -	struct devres_node node;
1: -	u8 data[0];
1: +  struct devres_node node;
1: +  u8 data[0];
1:  };
1:  
1:  struct devres_group {
1: -	struct devres_node node[2];
1: -	void *id;
1: -	int color;
1: +  struct devres_node node[2];
1: +  void *id;
1: +  int color;
1:  };
1:  
1:  struct action_devres {
1: -	void *data;
1: -	void (*action)(void *);
1: +  void *data;
1: +  void (*action)(void *);
1:  };
1:  
1:  struct pages_devres {
1: -	long unsigned int addr;
1: -	unsigned int order;
1: +  long unsigned int addr;
1: +  unsigned int order;
1:  };
1:  
1:  struct attribute_container {
1: -	struct list_head node;
1: -	struct klist containers;
1: -	struct class *class;
1: -	const struct attribute_group *grp;
1: -	struct device_attribute **attrs;
1: -	int (*match)(struct attribute_container *, struct device *);
1: -	long unsigned int flags;
1: +  struct list_head node;
1: +  struct klist containers;
1: +  struct class *class;
1: +  const struct attribute_group *grp;
1: +  struct device_attribute **attrs;
1: +  int (*match)(struct attribute_container *, struct device *);
1: +  long unsigned int flags;
1:  };
1:  
1:  struct internal_container {
1: -	struct klist_node node;
1: -	struct attribute_container *cont;
1: -	struct device classdev;
1: +  struct klist_node node;
1: +  struct attribute_container *cont;
1: +  struct device classdev;
1:  };
1:  
1:  struct transport_container;
1:  
1:  struct transport_class {
1: -	struct class class;
1: -	int (*setup)(struct transport_container *, struct device *, struct device *);
1: -	int (*configure)(struct transport_container *, struct device *, struct device *);
1: -	int (*remove)(struct transport_container *, struct device *, struct device *);
1: +  struct class class;
1: +  int (*setup)(struct transport_container *, struct device *, struct device *);
1: +  int (*configure)(struct transport_container *, struct device *,
1: +                   struct device *);
1: +  int (*remove)(struct transport_container *, struct device *, struct device *);
1:  };
1:  
1:  struct transport_container {
1: -	struct attribute_container ac;
1: -	const struct attribute_group *statistics;
1: +  struct attribute_container ac;
1: +  const struct attribute_group *statistics;
1:  };
1:  
1:  struct anon_transport_class {
1: -	struct transport_class tclass;
1: -	struct attribute_container container;
1: +  struct transport_class tclass;
1: +  struct attribute_container container;
1:  };
1:  
1: -typedef void * (*devcon_match_fn_t)(struct fwnode_handle *, const char *, void *);
1: +typedef void *(*devcon_match_fn_t)(struct fwnode_handle *, const char *,
1: +                                   void *);
1:  
1:  enum ethtool_link_mode_bit_indices {
1: -	ETHTOOL_LINK_MODE_10baseT_Half_BIT = 0,
1: -	ETHTOOL_LINK_MODE_10baseT_Full_BIT = 1,
1: -	ETHTOOL_LINK_MODE_100baseT_Half_BIT = 2,
1: -	ETHTOOL_LINK_MODE_100baseT_Full_BIT = 3,
1: -	ETHTOOL_LINK_MODE_1000baseT_Half_BIT = 4,
1: -	ETHTOOL_LINK_MODE_1000baseT_Full_BIT = 5,
1: -	ETHTOOL_LINK_MODE_Autoneg_BIT = 6,
1: -	ETHTOOL_LINK_MODE_TP_BIT = 7,
1: -	ETHTOOL_LINK_MODE_AUI_BIT = 8,
1: -	ETHTOOL_LINK_MODE_MII_BIT = 9,
1: -	ETHTOOL_LINK_MODE_FIBRE_BIT = 10,
1: -	ETHTOOL_LINK_MODE_BNC_BIT = 11,
1: -	ETHTOOL_LINK_MODE_10000baseT_Full_BIT = 12,
1: -	ETHTOOL_LINK_MODE_Pause_BIT = 13,
1: -	ETHTOOL_LINK_MODE_Asym_Pause_BIT = 14,
1: -	ETHTOOL_LINK_MODE_2500baseX_Full_BIT = 15,
1: -	ETHTOOL_LINK_MODE_Backplane_BIT = 16,
1: -	ETHTOOL_LINK_MODE_1000baseKX_Full_BIT = 17,
1: -	ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT = 18,
1: -	ETHTOOL_LINK_MODE_10000baseKR_Full_BIT = 19,
1: -	ETHTOOL_LINK_MODE_10000baseR_FEC_BIT = 20,
1: -	ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT = 21,
1: -	ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT = 22,
1: -	ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT = 23,
1: -	ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT = 24,
1: -	ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT = 25,
1: -	ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT = 26,
1: -	ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT = 27,
1: -	ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,
1: -	ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
1: -	ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
1: -	ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,
1: -	ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,
1: -	ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,
1: -	ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,
1: -	ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT = 35,
1: -	ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT = 36,
1: -	ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT = 37,
1: -	ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT = 38,
1: -	ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT = 39,
1: -	ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT = 40,
1: -	ETHTOOL_LINK_MODE_1000baseX_Full_BIT = 41,
1: -	ETHTOOL_LINK_MODE_10000baseCR_Full_BIT = 42,
1: -	ETHTOOL_LINK_MODE_10000baseSR_Full_BIT = 43,
1: -	ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,
1: -	ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
1: -	ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,
1: -	ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
1: -	ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
1: -	ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,
1: -	ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,
1: -	ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,
1: -	ETHTOOL_LINK_MODE_50000baseKR_Full_BIT = 52,
1: -	ETHTOOL_LINK_MODE_50000baseSR_Full_BIT = 53,
1: -	ETHTOOL_LINK_MODE_50000baseCR_Full_BIT = 54,
1: -	ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT = 55,
1: -	ETHTOOL_LINK_MODE_50000baseDR_Full_BIT = 56,
1: -	ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT = 57,
1: -	ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT = 58,
1: -	ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT = 59,
1: -	ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT = 60,
1: -	ETHTOOL_LINK_MODE_100000baseDR2_Full_BIT = 61,
1: -	ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT = 62,
1: -	ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT = 63,
1: -	ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT = 64,
1: -	ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT = 65,
1: -	ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT = 66,
1: -	ETHTOOL_LINK_MODE_100baseT1_Full_BIT = 67,
1: -	ETHTOOL_LINK_MODE_1000baseT1_Full_BIT = 68,
1: -	ETHTOOL_LINK_MODE_400000baseKR8_Full_BIT = 69,
1: -	ETHTOOL_LINK_MODE_400000baseSR8_Full_BIT = 70,
1: -	ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT = 71,
1: -	ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72,
1: -	ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73,
1: -	ETHTOOL_LINK_MODE_FEC_LLRS_BIT = 74,
1: -	ETHTOOL_LINK_MODE_100000baseKR_Full_BIT = 75,
1: -	ETHTOOL_LINK_MODE_100000baseSR_Full_BIT = 76,
1: -	ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT = 77,
1: -	ETHTOOL_LINK_MODE_100000baseCR_Full_BIT = 78,
1: -	ETHTOOL_LINK_MODE_100000baseDR_Full_BIT = 79,
1: -	ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT = 80,
1: -	ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT = 81,
1: -	ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT = 82,
1: -	ETHTOOL_LINK_MODE_200000baseDR2_Full_BIT = 83,
1: -	ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT = 84,
1: -	ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT = 85,
1: -	ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT = 86,
1: -	ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT = 87,
1: -	ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT = 88,
1: -	ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT = 89,
1: -	ETHTOOL_LINK_MODE_100baseFX_Half_BIT = 90,
1: -	ETHTOOL_LINK_MODE_100baseFX_Full_BIT = 91,
1: -	__ETHTOOL_LINK_MODE_MASK_NBITS = 92,
1: +  ETHTOOL_LINK_MODE_10baseT_Half_BIT = 0,
1: +  ETHTOOL_LINK_MODE_10baseT_Full_BIT = 1,
1: +  ETHTOOL_LINK_MODE_100baseT_Half_BIT = 2,
1: +  ETHTOOL_LINK_MODE_100baseT_Full_BIT = 3,
1: +  ETHTOOL_LINK_MODE_1000baseT_Half_BIT = 4,
1: +  ETHTOOL_LINK_MODE_1000baseT_Full_BIT = 5,
1: +  ETHTOOL_LINK_MODE_Autoneg_BIT = 6,
1: +  ETHTOOL_LINK_MODE_TP_BIT = 7,
1: +  ETHTOOL_LINK_MODE_AUI_BIT = 8,
1: +  ETHTOOL_LINK_MODE_MII_BIT = 9,
1: +  ETHTOOL_LINK_MODE_FIBRE_BIT = 10,
1: +  ETHTOOL_LINK_MODE_BNC_BIT = 11,
1: +  ETHTOOL_LINK_MODE_10000baseT_Full_BIT = 12,
1: +  ETHTOOL_LINK_MODE_Pause_BIT = 13,
1: +  ETHTOOL_LINK_MODE_Asym_Pause_BIT = 14,
1: +  ETHTOOL_LINK_MODE_2500baseX_Full_BIT = 15,
1: +  ETHTOOL_LINK_MODE_Backplane_BIT = 16,
1: +  ETHTOOL_LINK_MODE_1000baseKX_Full_BIT = 17,
1: +  ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT = 18,
1: +  ETHTOOL_LINK_MODE_10000baseKR_Full_BIT = 19,
1: +  ETHTOOL_LINK_MODE_10000baseR_FEC_BIT = 20,
1: +  ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT = 21,
1: +  ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT = 22,
1: +  ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT = 23,
1: +  ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT = 24,
1: +  ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT = 25,
1: +  ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT = 26,
1: +  ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT = 27,
1: +  ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,
1: +  ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
1: +  ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
1: +  ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,
1: +  ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,
1: +  ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,
1: +  ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,
1: +  ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT = 35,
1: +  ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT = 36,
1: +  ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT = 37,
1: +  ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT = 38,
1: +  ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT = 39,
1: +  ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT = 40,
1: +  ETHTOOL_LINK_MODE_1000baseX_Full_BIT = 41,
1: +  ETHTOOL_LINK_MODE_10000baseCR_Full_BIT = 42,
1: +  ETHTOOL_LINK_MODE_10000baseSR_Full_BIT = 43,
1: +  ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,
1: +  ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
1: +  ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,
1: +  ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
1: +  ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
1: +  ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,
1: +  ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,
1: +  ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,
1: +  ETHTOOL_LINK_MODE_50000baseKR_Full_BIT = 52,
1: +  ETHTOOL_LINK_MODE_50000baseSR_Full_BIT = 53,
1: +  ETHTOOL_LINK_MODE_50000baseCR_Full_BIT = 54,
1: +  ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT = 55,
1: +  ETHTOOL_LINK_MODE_50000baseDR_Full_BIT = 56,
1: +  ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT = 57,
1: +  ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT = 58,
1: +  ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT = 59,
1: +  ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT = 60,
1: +  ETHTOOL_LINK_MODE_100000baseDR2_Full_BIT = 61,
1: +  ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT = 62,
1: +  ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT = 63,
1: +  ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT = 64,
1: +  ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT = 65,
1: +  ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT = 66,
1: +  ETHTOOL_LINK_MODE_100baseT1_Full_BIT = 67,
1: +  ETHTOOL_LINK_MODE_1000baseT1_Full_BIT = 68,
1: +  ETHTOOL_LINK_MODE_400000baseKR8_Full_BIT = 69,
1: +  ETHTOOL_LINK_MODE_400000baseSR8_Full_BIT = 70,
1: +  ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT = 71,
1: +  ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72,
1: +  ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73,
1: +  ETHTOOL_LINK_MODE_FEC_LLRS_BIT = 74,
1: +  ETHTOOL_LINK_MODE_100000baseKR_Full_BIT = 75,
1: +  ETHTOOL_LINK_MODE_100000baseSR_Full_BIT = 76,
1: +  ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT = 77,
1: +  ETHTOOL_LINK_MODE_100000baseCR_Full_BIT = 78,
1: +  ETHTOOL_LINK_MODE_100000baseDR_Full_BIT = 79,
1: +  ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT = 80,
1: +  ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT = 81,
1: +  ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT = 82,
1: +  ETHTOOL_LINK_MODE_200000baseDR2_Full_BIT = 83,
1: +  ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT = 84,
1: +  ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT = 85,
1: +  ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT = 86,
1: +  ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT = 87,
1: +  ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT = 88,
1: +  ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT = 89,
1: +  ETHTOOL_LINK_MODE_100baseFX_Half_BIT = 90,
1: +  ETHTOOL_LINK_MODE_100baseFX_Full_BIT = 91,
1: +  __ETHTOOL_LINK_MODE_MASK_NBITS = 92,
1:  };
1:  
1:  struct reset_control;
1: @@ -78891,64 +79966,64 @@ struct reset_control;
1:  struct mii_bus;
1:  
1:  struct mdio_device {
1: -	struct device dev;
1: -	struct mii_bus *bus;
1: -	char modalias[32];
1: -	int (*bus_match)(struct device *, struct device_driver *);
1: -	void (*device_free)(struct mdio_device *);
1: -	void (*device_remove)(struct mdio_device *);
1: -	int addr;
1: -	int flags;
1: -	struct gpio_desc___2 *reset_gpio;
1: -	struct reset_control *reset_ctrl;
1: -	unsigned int reset_assert_delay;
1: -	unsigned int reset_deassert_delay;
1: +  struct device dev;
1: +  struct mii_bus *bus;
1: +  char modalias[32];
1: +  int (*bus_match)(struct device *, struct device_driver *);
1: +  void (*device_free)(struct mdio_device *);
1: +  void (*device_remove)(struct mdio_device *);
1: +  int addr;
1: +  int flags;
1: +  struct gpio_desc___2 *reset_gpio;
1: +  struct reset_control *reset_ctrl;
1: +  unsigned int reset_assert_delay;
1: +  unsigned int reset_deassert_delay;
1:  };
1:  
1:  struct phy_c45_device_ids {
1: -	u32 devices_in_package;
1: -	u32 mmds_present;
1: -	u32 device_ids[32];
1: +  u32 devices_in_package;
1: +  u32 mmds_present;
1: +  u32 device_ids[32];
1:  };
1:  
1:  enum phy_state {
1: -	PHY_DOWN = 0,
1: -	PHY_READY = 1,
1: -	PHY_HALTED = 2,
1: -	PHY_UP = 3,
1: -	PHY_RUNNING = 4,
1: -	PHY_NOLINK = 5,
1: -	PHY_CABLETEST = 6,
1: +  PHY_DOWN = 0,
1: +  PHY_READY = 1,
1: +  PHY_HALTED = 2,
1: +  PHY_UP = 3,
1: +  PHY_RUNNING = 4,
1: +  PHY_NOLINK = 5,
1: +  PHY_CABLETEST = 6,
1:  };
1:  
1:  typedef enum {
1: -	PHY_INTERFACE_MODE_NA = 0,
1: -	PHY_INTERFACE_MODE_INTERNAL = 1,
1: -	PHY_INTERFACE_MODE_MII = 2,
1: -	PHY_INTERFACE_MODE_GMII = 3,
1: -	PHY_INTERFACE_MODE_SGMII = 4,
1: -	PHY_INTERFACE_MODE_TBI = 5,
1: -	PHY_INTERFACE_MODE_REVMII = 6,
1: -	PHY_INTERFACE_MODE_RMII = 7,
1: -	PHY_INTERFACE_MODE_RGMII = 8,
1: -	PHY_INTERFACE_MODE_RGMII_ID = 9,
1: -	PHY_INTERFACE_MODE_RGMII_RXID = 10,
1: -	PHY_INTERFACE_MODE_RGMII_TXID = 11,
1: -	PHY_INTERFACE_MODE_RTBI = 12,
1: -	PHY_INTERFACE_MODE_SMII = 13,
1: -	PHY_INTERFACE_MODE_XGMII = 14,
1: -	PHY_INTERFACE_MODE_XLGMII = 15,
1: -	PHY_INTERFACE_MODE_MOCA = 16,
1: -	PHY_INTERFACE_MODE_QSGMII = 17,
1: -	PHY_INTERFACE_MODE_TRGMII = 18,
1: -	PHY_INTERFACE_MODE_1000BASEX = 19,
1: -	PHY_INTERFACE_MODE_2500BASEX = 20,
1: -	PHY_INTERFACE_MODE_RXAUI = 21,
1: -	PHY_INTERFACE_MODE_XAUI = 22,
1: -	PHY_INTERFACE_MODE_10GBASER = 23,
1: -	PHY_INTERFACE_MODE_USXGMII = 24,
1: -	PHY_INTERFACE_MODE_10GKR = 25,
1: -	PHY_INTERFACE_MODE_MAX = 26,
1: +  PHY_INTERFACE_MODE_NA = 0,
1: +  PHY_INTERFACE_MODE_INTERNAL = 1,
1: +  PHY_INTERFACE_MODE_MII = 2,
1: +  PHY_INTERFACE_MODE_GMII = 3,
1: +  PHY_INTERFACE_MODE_SGMII = 4,
1: +  PHY_INTERFACE_MODE_TBI = 5,
1: +  PHY_INTERFACE_MODE_REVMII = 6,
1: +  PHY_INTERFACE_MODE_RMII = 7,
1: +  PHY_INTERFACE_MODE_RGMII = 8,
1: +  PHY_INTERFACE_MODE_RGMII_ID = 9,
1: +  PHY_INTERFACE_MODE_RGMII_RXID = 10,
1: +  PHY_INTERFACE_MODE_RGMII_TXID = 11,
1: +  PHY_INTERFACE_MODE_RTBI = 12,
1: +  PHY_INTERFACE_MODE_SMII = 13,
1: +  PHY_INTERFACE_MODE_XGMII = 14,
1: +  PHY_INTERFACE_MODE_XLGMII = 15,
1: +  PHY_INTERFACE_MODE_MOCA = 16,
1: +  PHY_INTERFACE_MODE_QSGMII = 17,
1: +  PHY_INTERFACE_MODE_TRGMII = 18,
1: +  PHY_INTERFACE_MODE_1000BASEX = 19,
1: +  PHY_INTERFACE_MODE_2500BASEX = 20,
1: +  PHY_INTERFACE_MODE_RXAUI = 21,
1: +  PHY_INTERFACE_MODE_XAUI = 22,
1: +  PHY_INTERFACE_MODE_10GBASER = 23,
1: +  PHY_INTERFACE_MODE_USXGMII = 24,
1: +  PHY_INTERFACE_MODE_10GKR = 25,
1: +  PHY_INTERFACE_MODE_MAX = 26,
1:  } phy_interface_t;
1:  
1:  struct phylink;
1: @@ -78960,382 +80035,384 @@ struct phy_package_shared;
1:  struct mii_timestamper;
1:  
1:  struct phy_device {
1: -	struct mdio_device mdio;
1: -	struct phy_driver *drv;
1: -	u32 phy_id;
1: -	struct phy_c45_device_ids c45_ids;
1: -	unsigned int is_c45: 1;
1: -	unsigned int is_internal: 1;
1: -	unsigned int is_pseudo_fixed_link: 1;
1: -	unsigned int is_gigabit_capable: 1;
1: -	unsigned int has_fixups: 1;
1: -	unsigned int suspended: 1;
1: -	unsigned int suspended_by_mdio_bus: 1;
1: -	unsigned int sysfs_links: 1;
1: -	unsigned int loopback_enabled: 1;
1: -	unsigned int downshifted_rate: 1;
1: -	unsigned int autoneg: 1;
1: -	unsigned int link: 1;
1: -	unsigned int autoneg_complete: 1;
1: -	unsigned int interrupts: 1;
1: -	enum phy_state state;
1: -	u32 dev_flags;
1: -	phy_interface_t interface;
1: -	int speed;
1: -	int duplex;
1: -	int pause;
1: -	int asym_pause;
1: -	u8 master_slave_get;
1: -	u8 master_slave_set;
1: -	u8 master_slave_state;
1: -	long unsigned int supported[2];
1: -	long unsigned int advertising[2];
1: -	long unsigned int lp_advertising[2];
1: -	long unsigned int adv_old[2];
1: -	u32 eee_broken_modes;
1: -	int irq;
1: -	void *priv;
1: -	struct phy_package_shared *shared;
1: -	struct sk_buff *skb;
1: -	void *ehdr;
1: -	struct nlattr *nest;
1: -	struct delayed_work state_queue;
1: -	struct mutex lock;
1: -	bool sfp_bus_attached;
1: -	struct sfp_bus *sfp_bus;
1: -	struct phylink *phylink;
1: -	struct net_device *attached_dev;
1: -	struct mii_timestamper *mii_ts;
1: -	u8 mdix;
1: -	u8 mdix_ctrl;
1: -	void (*phy_link_change)(struct phy_device *, bool);
1: -	void (*adjust_link)(struct net_device *);
1: +  struct mdio_device mdio;
1: +  struct phy_driver *drv;
1: +  u32 phy_id;
1: +  struct phy_c45_device_ids c45_ids;
1: +  unsigned int is_c45 : 1;
1: +  unsigned int is_internal : 1;
1: +  unsigned int is_pseudo_fixed_link : 1;
1: +  unsigned int is_gigabit_capable : 1;
1: +  unsigned int has_fixups : 1;
1: +  unsigned int suspended : 1;
1: +  unsigned int suspended_by_mdio_bus : 1;
1: +  unsigned int sysfs_links : 1;
1: +  unsigned int loopback_enabled : 1;
1: +  unsigned int downshifted_rate : 1;
1: +  unsigned int autoneg : 1;
1: +  unsigned int link : 1;
1: +  unsigned int autoneg_complete : 1;
1: +  unsigned int interrupts : 1;
1: +  enum phy_state state;
1: +  u32 dev_flags;
1: +  phy_interface_t interface;
1: +  int speed;
1: +  int duplex;
1: +  int pause;
1: +  int asym_pause;
1: +  u8 master_slave_get;
1: +  u8 master_slave_set;
1: +  u8 master_slave_state;
1: +  long unsigned int supported[2];
1: +  long unsigned int advertising[2];
1: +  long unsigned int lp_advertising[2];
1: +  long unsigned int adv_old[2];
1: +  u32 eee_broken_modes;
1: +  int irq;
1: +  void *priv;
1: +  struct phy_package_shared *shared;
1: +  struct sk_buff *skb;
1: +  void *ehdr;
1: +  struct nlattr *nest;
1: +  struct delayed_work state_queue;
1: +  struct mutex lock;
1: +  bool sfp_bus_attached;
1: +  struct sfp_bus *sfp_bus;
1: +  struct phylink *phylink;
1: +  struct net_device *attached_dev;
1: +  struct mii_timestamper *mii_ts;
1: +  u8 mdix;
1: +  u8 mdix_ctrl;
1: +  void (*phy_link_change)(struct phy_device *, bool);
1: +  void (*adjust_link)(struct net_device *);
1:  };
1:  
1:  struct phy_tdr_config {
1: -	u32 first;
1: -	u32 last;
1: -	u32 step;
1: -	s8 pair;
1: +  u32 first;
1: +  u32 last;
1: +  u32 step;
1: +  s8 pair;
1:  };
1:  
1:  struct mdio_bus_stats {
1: -	u64_stats_t transfers;
1: -	u64_stats_t errors;
1: -	u64_stats_t writes;
1: -	u64_stats_t reads;
1: -	struct u64_stats_sync syncp;
1: +  u64_stats_t transfers;
1: +  u64_stats_t errors;
1: +  u64_stats_t writes;
1: +  u64_stats_t reads;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct mii_bus {
1: -	struct module *owner;
1: -	const char *name;
1: -	char id[61];
1: -	void *priv;
1: -	int (*read)(struct mii_bus *, int, int);
1: -	int (*write)(struct mii_bus *, int, int, u16);
1: -	int (*reset)(struct mii_bus *);
1: -	struct mdio_bus_stats stats[32];
1: -	struct mutex mdio_lock;
1: -	struct device *parent;
1: -	enum {
1: -		MDIOBUS_ALLOCATED = 1,
1: -		MDIOBUS_REGISTERED = 2,
1: -		MDIOBUS_UNREGISTERED = 3,
1: -		MDIOBUS_RELEASED = 4,
1: -	} state;
1: -	struct device dev;
1: -	struct mdio_device *mdio_map[32];
1: -	u32 phy_mask;
1: -	u32 phy_ignore_ta_mask;
1: -	int irq[32];
1: -	int reset_delay_us;
1: -	int reset_post_delay_us;
1: -	struct gpio_desc___2 *reset_gpiod;
1: -	enum {
1: -		MDIOBUS_NO_CAP = 0,
1: -		MDIOBUS_C22 = 1,
1: -		MDIOBUS_C45 = 2,
1: -		MDIOBUS_C22_C45 = 3,
1: -	} probe_capabilities;
1: -	struct mutex shared_lock;
1: -	struct phy_package_shared *shared[32];
1: +  struct module *owner;
1: +  const char *name;
1: +  char id[61];
1: +  void *priv;
1: +  int (*read)(struct mii_bus *, int, int);
1: +  int (*write)(struct mii_bus *, int, int, u16);
1: +  int (*reset)(struct mii_bus *);
1: +  struct mdio_bus_stats stats[32];
1: +  struct mutex mdio_lock;
1: +  struct device *parent;
1: +  enum {
1: +    MDIOBUS_ALLOCATED = 1,
1: +    MDIOBUS_REGISTERED = 2,
1: +    MDIOBUS_UNREGISTERED = 3,
1: +    MDIOBUS_RELEASED = 4,
1: +  } state;
1: +  struct device dev;
1: +  struct mdio_device *mdio_map[32];
1: +  u32 phy_mask;
1: +  u32 phy_ignore_ta_mask;
1: +  int irq[32];
1: +  int reset_delay_us;
1: +  int reset_post_delay_us;
1: +  struct gpio_desc___2 *reset_gpiod;
1: +  enum {
1: +    MDIOBUS_NO_CAP = 0,
1: +    MDIOBUS_C22 = 1,
1: +    MDIOBUS_C45 = 2,
1: +    MDIOBUS_C22_C45 = 3,
1: +  } probe_capabilities;
1: +  struct mutex shared_lock;
1: +  struct phy_package_shared *shared[32];
1:  };
1:  
1:  struct mdio_driver_common {
1: -	struct device_driver driver;
1: -	int flags;
1: +  struct device_driver driver;
1: +  int flags;
1:  };
1:  
1:  struct mii_timestamper {
1: -	bool (*rxtstamp)(struct mii_timestamper *, struct sk_buff *, int);
1: -	void (*txtstamp)(struct mii_timestamper *, struct sk_buff *, int);
1: -	int (*hwtstamp)(struct mii_timestamper *, struct ifreq *);
1: -	void (*link_state)(struct mii_timestamper *, struct phy_device *);
1: -	int (*ts_info)(struct mii_timestamper *, struct ethtool_ts_info *);
1: -	struct device *device;
1: +  bool (*rxtstamp)(struct mii_timestamper *, struct sk_buff *, int);
1: +  void (*txtstamp)(struct mii_timestamper *, struct sk_buff *, int);
1: +  int (*hwtstamp)(struct mii_timestamper *, struct ifreq *);
1: +  void (*link_state)(struct mii_timestamper *, struct phy_device *);
1: +  int (*ts_info)(struct mii_timestamper *, struct ethtool_ts_info *);
1: +  struct device *device;
1:  };
1:  
1:  struct phy_package_shared {
1: -	int addr;
1: -	refcount_t refcnt;
1: -	long unsigned int flags;
1: -	size_t priv_size;
1: -	void *priv;
1: +  int addr;
1: +  refcount_t refcnt;
1: +  long unsigned int flags;
1: +  size_t priv_size;
1: +  void *priv;
1:  };
1:  
1:  struct phy_driver {
1: -	struct mdio_driver_common mdiodrv;
1: -	u32 phy_id;
1: -	char *name;
1: -	u32 phy_id_mask;
1: -	const long unsigned int * const features;
1: -	u32 flags;
1: -	const void *driver_data;
1: -	int (*soft_reset)(struct phy_device *);
1: -	int (*config_init)(struct phy_device *);
1: -	int (*probe)(struct phy_device *);
1: -	int (*get_features)(struct phy_device *);
1: -	int (*suspend)(struct phy_device *);
1: -	int (*resume)(struct phy_device *);
1: -	int (*config_aneg)(struct phy_device *);
1: -	int (*aneg_done)(struct phy_device *);
1: -	int (*read_status)(struct phy_device *);
1: -	int (*ack_interrupt)(struct phy_device *);
1: -	int (*config_intr)(struct phy_device *);
1: -	int (*did_interrupt)(struct phy_device *);
1: -	irqreturn_t (*handle_interrupt)(struct phy_device *);
1: -	void (*remove)(struct phy_device *);
1: -	int (*match_phy_device)(struct phy_device *);
1: -	int (*set_wol)(struct phy_device *, struct ethtool_wolinfo *);
1: -	void (*get_wol)(struct phy_device *, struct ethtool_wolinfo *);
1: -	void (*link_change_notify)(struct phy_device *);
1: -	int (*read_mmd)(struct phy_device *, int, u16);
1: -	int (*write_mmd)(struct phy_device *, int, u16, u16);
1: -	int (*read_page)(struct phy_device *);
1: -	int (*write_page)(struct phy_device *, int);
1: -	int (*module_info)(struct phy_device *, struct ethtool_modinfo *);
1: -	int (*module_eeprom)(struct phy_device *, struct ethtool_eeprom *, u8 *);
1: -	int (*cable_test_start)(struct phy_device *);
1: -	int (*cable_test_tdr_start)(struct phy_device *, const struct phy_tdr_config *);
1: -	int (*cable_test_get_status)(struct phy_device *, bool *);
1: -	int (*get_sset_count)(struct phy_device *);
1: -	void (*get_strings)(struct phy_device *, u8 *);
1: -	void (*get_stats)(struct phy_device *, struct ethtool_stats *, u64 *);
1: -	int (*get_tunable)(struct phy_device *, struct ethtool_tunable *, void *);
1: -	int (*set_tunable)(struct phy_device *, struct ethtool_tunable *, const void *);
1: -	int (*set_loopback)(struct phy_device *, bool);
1: -	int (*get_sqi)(struct phy_device *);
1: -	int (*get_sqi_max)(struct phy_device *);
1: +  struct mdio_driver_common mdiodrv;
1: +  u32 phy_id;
1: +  char *name;
1: +  u32 phy_id_mask;
1: +  const long unsigned int *const features;
1: +  u32 flags;
1: +  const void *driver_data;
1: +  int (*soft_reset)(struct phy_device *);
1: +  int (*config_init)(struct phy_device *);
1: +  int (*probe)(struct phy_device *);
1: +  int (*get_features)(struct phy_device *);
1: +  int (*suspend)(struct phy_device *);
1: +  int (*resume)(struct phy_device *);
1: +  int (*config_aneg)(struct phy_device *);
1: +  int (*aneg_done)(struct phy_device *);
1: +  int (*read_status)(struct phy_device *);
1: +  int (*ack_interrupt)(struct phy_device *);
1: +  int (*config_intr)(struct phy_device *);
1: +  int (*did_interrupt)(struct phy_device *);
1: +  irqreturn_t (*handle_interrupt)(struct phy_device *);
1: +  void (*remove)(struct phy_device *);
1: +  int (*match_phy_device)(struct phy_device *);
1: +  int (*set_wol)(struct phy_device *, struct ethtool_wolinfo *);
1: +  void (*get_wol)(struct phy_device *, struct ethtool_wolinfo *);
1: +  void (*link_change_notify)(struct phy_device *);
1: +  int (*read_mmd)(struct phy_device *, int, u16);
1: +  int (*write_mmd)(struct phy_device *, int, u16, u16);
1: +  int (*read_page)(struct phy_device *);
1: +  int (*write_page)(struct phy_device *, int);
1: +  int (*module_info)(struct phy_device *, struct ethtool_modinfo *);
1: +  int (*module_eeprom)(struct phy_device *, struct ethtool_eeprom *, u8 *);
1: +  int (*cable_test_start)(struct phy_device *);
1: +  int (*cable_test_tdr_start)(struct phy_device *,
1: +                              const struct phy_tdr_config *);
1: +  int (*cable_test_get_status)(struct phy_device *, bool *);
1: +  int (*get_sset_count)(struct phy_device *);
1: +  void (*get_strings)(struct phy_device *, u8 *);
1: +  void (*get_stats)(struct phy_device *, struct ethtool_stats *, u64 *);
1: +  int (*get_tunable)(struct phy_device *, struct ethtool_tunable *, void *);
1: +  int (*set_tunable)(struct phy_device *, struct ethtool_tunable *,
1: +                     const void *);
1: +  int (*set_loopback)(struct phy_device *, bool);
1: +  int (*get_sqi)(struct phy_device *);
1: +  int (*get_sqi_max)(struct phy_device *);
1:  };
1:  
1:  struct software_node;
1:  
1:  struct software_node_ref_args {
1: -	const struct software_node *node;
1: -	unsigned int nargs;
1: -	u64 args[8];
1: +  const struct software_node *node;
1: +  unsigned int nargs;
1: +  u64 args[8];
1:  };
1:  
1:  struct software_node {
1: -	const char *name;
1: -	const struct software_node *parent;
1: -	const struct property_entry *properties;
1: +  const char *name;
1: +  const struct software_node *parent;
1: +  const struct property_entry *properties;
1:  };
1:  
1:  struct swnode {
1: -	int id;
1: -	struct kobject kobj;
1: -	struct fwnode_handle fwnode;
1: -	const struct software_node *node;
1: -	struct ida child_ids;
1: -	struct list_head entry;
1: -	struct list_head children;
1: -	struct swnode *parent;
1: -	unsigned int allocated: 1;
1: +  int id;
1: +  struct kobject kobj;
1: +  struct fwnode_handle fwnode;
1: +  const struct software_node *node;
1: +  struct ida child_ids;
1: +  struct list_head entry;
1: +  struct list_head children;
1: +  struct swnode *parent;
1: +  unsigned int allocated : 1;
1:  };
1:  
1:  struct req {
1: -	struct req *next;
1: -	struct completion done;
1: -	int err;
1: -	const char *name;
1: -	umode_t mode;
1: -	kuid_t uid;
1: -	kgid_t gid;
1: -	struct device *dev;
1: +  struct req *next;
1: +  struct completion done;
1: +  int err;
1: +  const char *name;
1: +  umode_t mode;
1: +  kuid_t uid;
1: +  kgid_t gid;
1: +  struct device *dev;
1:  };
1:  
1:  typedef int (*pm_callback_t)(struct device *);
1:  
1:  struct pm_clk_notifier_block {
1: -	struct notifier_block nb;
1: -	struct dev_pm_domain *pm_domain;
1: -	char *con_ids[0];
1: +  struct notifier_block nb;
1: +  struct dev_pm_domain *pm_domain;
1: +  char *con_ids[0];
1:  };
1:  
1:  enum pce_status {
1: -	PCE_STATUS_NONE = 0,
1: -	PCE_STATUS_ACQUIRED = 1,
1: -	PCE_STATUS_ENABLED = 2,
1: -	PCE_STATUS_ERROR = 3,
1: +  PCE_STATUS_NONE = 0,
1: +  PCE_STATUS_ACQUIRED = 1,
1: +  PCE_STATUS_ENABLED = 2,
1: +  PCE_STATUS_ERROR = 3,
1:  };
1:  
1:  struct pm_clock_entry {
1: -	struct list_head node;
1: -	char *con_id;
1: -	struct clk *clk;
1: -	enum pce_status status;
1: +  struct list_head node;
1: +  char *con_id;
1: +  struct clk *clk;
1: +  enum pce_status status;
1:  };
1:  
1:  struct firmware_fallback_config {
1: -	unsigned int force_sysfs_fallback;
1: -	unsigned int ignore_sysfs_fallback;
1: -	int old_timeout;
1: -	int loading_timeout;
1: +  unsigned int force_sysfs_fallback;
1: +  unsigned int ignore_sysfs_fallback;
1: +  int old_timeout;
1: +  int loading_timeout;
1:  };
1:  
1:  struct firmware {
1: -	size_t size;
1: -	const u8 *data;
1: -	void *priv;
1: +  size_t size;
1: +  const u8 *data;
1: +  void *priv;
1:  };
1:  
1:  struct builtin_fw {
1: -	char *name;
1: -	void *data;
1: -	long unsigned int size;
1: +  char *name;
1: +  void *data;
1: +  long unsigned int size;
1:  };
1:  
1:  enum fw_opt {
1: -	FW_OPT_UEVENT = 1,
1: -	FW_OPT_NOWAIT = 2,
1: -	FW_OPT_USERHELPER = 4,
1: -	FW_OPT_NO_WARN = 8,
1: -	FW_OPT_NOCACHE = 16,
1: -	FW_OPT_NOFALLBACK_SYSFS = 32,
1: -	FW_OPT_FALLBACK_PLATFORM = 64,
1: -	FW_OPT_PARTIAL = 128,
1: +  FW_OPT_UEVENT = 1,
1: +  FW_OPT_NOWAIT = 2,
1: +  FW_OPT_USERHELPER = 4,
1: +  FW_OPT_NO_WARN = 8,
1: +  FW_OPT_NOCACHE = 16,
1: +  FW_OPT_NOFALLBACK_SYSFS = 32,
1: +  FW_OPT_FALLBACK_PLATFORM = 64,
1: +  FW_OPT_PARTIAL = 128,
1:  };
1:  
1:  enum fw_status {
1: -	FW_STATUS_UNKNOWN = 0,
1: -	FW_STATUS_LOADING = 1,
1: -	FW_STATUS_DONE = 2,
1: -	FW_STATUS_ABORTED = 3,
1: +  FW_STATUS_UNKNOWN = 0,
1: +  FW_STATUS_LOADING = 1,
1: +  FW_STATUS_DONE = 2,
1: +  FW_STATUS_ABORTED = 3,
1:  };
1:  
1:  struct fw_state {
1: -	struct completion completion;
1: -	enum fw_status status;
1: +  struct completion completion;
1: +  enum fw_status status;
1:  };
1:  
1:  struct firmware_cache;
1:  
1:  struct fw_priv {
1: -	struct kref ref;
1: -	struct list_head list;
1: -	struct firmware_cache *fwc;
1: -	struct fw_state fw_st;
1: -	void *data;
1: -	size_t size;
1: -	size_t allocated_size;
1: -	size_t offset;
1: -	u32 opt_flags;
1: -	bool is_paged_buf;
1: -	struct page **pages;
1: -	int nr_pages;
1: -	int page_array_size;
1: -	bool need_uevent;
1: -	struct list_head pending_list;
1: -	const char *fw_name;
1: +  struct kref ref;
1: +  struct list_head list;
1: +  struct firmware_cache *fwc;
1: +  struct fw_state fw_st;
1: +  void *data;
1: +  size_t size;
1: +  size_t allocated_size;
1: +  size_t offset;
1: +  u32 opt_flags;
1: +  bool is_paged_buf;
1: +  struct page **pages;
1: +  int nr_pages;
1: +  int page_array_size;
1: +  bool need_uevent;
1: +  struct list_head pending_list;
1: +  const char *fw_name;
1:  };
1:  
1:  struct firmware_cache {
1: -	spinlock_t lock;
1: -	struct list_head head;
1: -	int state;
1: -	spinlock_t name_lock;
1: -	struct list_head fw_names;
1: -	struct delayed_work work;
1: -	struct notifier_block pm_notify;
1: +  spinlock_t lock;
1: +  struct list_head head;
1: +  int state;
1: +  spinlock_t name_lock;
1: +  struct list_head fw_names;
1: +  struct delayed_work work;
1: +  struct notifier_block pm_notify;
1:  };
1:  
1:  struct fw_cache_entry {
1: -	struct list_head list;
1: -	const char *name;
1: +  struct list_head list;
1: +  const char *name;
1:  };
1:  
1:  struct fw_name_devm {
1: -	long unsigned int magic;
1: -	const char *name;
1: +  long unsigned int magic;
1: +  const char *name;
1:  };
1:  
1:  struct firmware_work {
1: -	struct work_struct work;
1: -	struct module *module;
1: -	const char *name;
1: -	struct device *device;
1: -	void *context;
1: -	void (*cont)(const struct firmware *, void *);
1: -	u32 opt_flags;
1: +  struct work_struct work;
1: +  struct module *module;
1: +  const char *name;
1: +  struct device *device;
1: +  void *context;
1: +  void (*cont)(const struct firmware *, void *);
1: +  u32 opt_flags;
1:  };
1:  
1:  struct fw_sysfs {
1: -	bool nowait;
1: -	struct device dev;
1: -	struct fw_priv *fw_priv;
1: -	struct firmware *fw;
1: +  bool nowait;
1: +  struct device dev;
1: +  struct fw_priv *fw_priv;
1: +  struct firmware *fw;
1:  };
1:  
1:  typedef void (*node_registration_func_t)(struct node___2 *);
1:  
1:  struct node_access_nodes {
1: -	struct device dev;
1: -	struct list_head list_node;
1: -	unsigned int access;
1: +  struct device dev;
1: +  struct list_head list_node;
1: +  unsigned int access;
1:  };
1:  
1:  struct node_attr {
1: -	struct device_attribute attr;
1: -	enum node_states state;
1: +  struct device_attribute attr;
1: +  enum node_states state;
1:  };
1:  
1:  enum regcache_type {
1: -	REGCACHE_NONE = 0,
1: -	REGCACHE_RBTREE = 1,
1: -	REGCACHE_COMPRESSED = 2,
1: -	REGCACHE_FLAT = 3,
1: +  REGCACHE_NONE = 0,
1: +  REGCACHE_RBTREE = 1,
1: +  REGCACHE_COMPRESSED = 2,
1: +  REGCACHE_FLAT = 3,
1:  };
1:  
1:  struct reg_default {
1: -	unsigned int reg;
1: -	unsigned int def;
1: +  unsigned int reg;
1: +  unsigned int def;
1:  };
1:  
1:  struct reg_sequence {
1: -	unsigned int reg;
1: -	unsigned int def;
1: -	unsigned int delay_us;
1: +  unsigned int reg;
1: +  unsigned int def;
1: +  unsigned int delay_us;
1:  };
1:  
1:  enum regmap_endian {
1: -	REGMAP_ENDIAN_DEFAULT = 0,
1: -	REGMAP_ENDIAN_BIG = 1,
1: -	REGMAP_ENDIAN_LITTLE = 2,
1: -	REGMAP_ENDIAN_NATIVE = 3,
1: +  REGMAP_ENDIAN_DEFAULT = 0,
1: +  REGMAP_ENDIAN_BIG = 1,
1: +  REGMAP_ENDIAN_LITTLE = 2,
1: +  REGMAP_ENDIAN_NATIVE = 3,
1:  };
1:  
1:  struct regmap_range {
1: -	unsigned int range_min;
1: -	unsigned int range_max;
1: +  unsigned int range_min;
1: +  unsigned int range_max;
1:  };
1:  
1:  struct regmap_access_table {
1: -	const struct regmap_range *yes_ranges;
1: -	unsigned int n_yes_ranges;
1: -	const struct regmap_range *no_ranges;
1: -	unsigned int n_no_ranges;
1: +  const struct regmap_range *yes_ranges;
1: +  unsigned int n_yes_ranges;
1: +  const struct regmap_range *no_ranges;
1: +  unsigned int n_no_ranges;
1:  };
1:  
1:  typedef void (*regmap_lock)(void *);
1: @@ -79345,77 +80422,79 @@ typedef void (*regmap_unlock)(void *);
1:  struct regmap_range_cfg;
1:  
1:  struct regmap_config {
1: -	const char *name;
1: -	int reg_bits;
1: -	int reg_stride;
1: -	int pad_bits;
1: -	int val_bits;
1: -	bool (*writeable_reg)(struct device *, unsigned int);
1: -	bool (*readable_reg)(struct device *, unsigned int);
1: -	bool (*volatile_reg)(struct device *, unsigned int);
1: -	bool (*precious_reg)(struct device *, unsigned int);
1: -	bool (*writeable_noinc_reg)(struct device *, unsigned int);
1: -	bool (*readable_noinc_reg)(struct device *, unsigned int);
1: -	bool disable_locking;
1: -	regmap_lock lock;
1: -	regmap_unlock unlock;
1: -	void *lock_arg;
1: -	int (*reg_read)(void *, unsigned int, unsigned int *);
1: -	int (*reg_write)(void *, unsigned int, unsigned int);
1: -	bool fast_io;
1: -	unsigned int max_register;
1: -	const struct regmap_access_table *wr_table;
1: -	const struct regmap_access_table *rd_table;
1: -	const struct regmap_access_table *volatile_table;
1: -	const struct regmap_access_table *precious_table;
1: -	const struct regmap_access_table *wr_noinc_table;
1: -	const struct regmap_access_table *rd_noinc_table;
1: -	const struct reg_default *reg_defaults;
1: -	unsigned int num_reg_defaults;
1: -	enum regcache_type cache_type;
1: -	const void *reg_defaults_raw;
1: -	unsigned int num_reg_defaults_raw;
1: -	long unsigned int read_flag_mask;
1: -	long unsigned int write_flag_mask;
1: -	bool zero_flag_mask;
1: -	bool use_single_read;
1: -	bool use_single_write;
1: -	bool can_multi_write;
1: -	enum regmap_endian reg_format_endian;
1: -	enum regmap_endian val_format_endian;
1: -	const struct regmap_range_cfg *ranges;
1: -	unsigned int num_ranges;
1: -	bool use_hwlock;
1: -	unsigned int hwlock_id;
1: -	unsigned int hwlock_mode;
1: -	bool can_sleep;
1: +  const char *name;
1: +  int reg_bits;
1: +  int reg_stride;
1: +  int pad_bits;
1: +  int val_bits;
1: +  bool (*writeable_reg)(struct device *, unsigned int);
1: +  bool (*readable_reg)(struct device *, unsigned int);
1: +  bool (*volatile_reg)(struct device *, unsigned int);
1: +  bool (*precious_reg)(struct device *, unsigned int);
1: +  bool (*writeable_noinc_reg)(struct device *, unsigned int);
1: +  bool (*readable_noinc_reg)(struct device *, unsigned int);
1: +  bool disable_locking;
1: +  regmap_lock lock;
1: +  regmap_unlock unlock;
1: +  void *lock_arg;
1: +  int (*reg_read)(void *, unsigned int, unsigned int *);
1: +  int (*reg_write)(void *, unsigned int, unsigned int);
1: +  bool fast_io;
1: +  unsigned int max_register;
1: +  const struct regmap_access_table *wr_table;
1: +  const struct regmap_access_table *rd_table;
1: +  const struct regmap_access_table *volatile_table;
1: +  const struct regmap_access_table *precious_table;
1: +  const struct regmap_access_table *wr_noinc_table;
1: +  const struct regmap_access_table *rd_noinc_table;
1: +  const struct reg_default *reg_defaults;
1: +  unsigned int num_reg_defaults;
1: +  enum regcache_type cache_type;
1: +  const void *reg_defaults_raw;
1: +  unsigned int num_reg_defaults_raw;
1: +  long unsigned int read_flag_mask;
1: +  long unsigned int write_flag_mask;
1: +  bool zero_flag_mask;
1: +  bool use_single_read;
1: +  bool use_single_write;
1: +  bool can_multi_write;
1: +  enum regmap_endian reg_format_endian;
1: +  enum regmap_endian val_format_endian;
1: +  const struct regmap_range_cfg *ranges;
1: +  unsigned int num_ranges;
1: +  bool use_hwlock;
1: +  unsigned int hwlock_id;
1: +  unsigned int hwlock_mode;
1: +  bool can_sleep;
1:  };
1:  
1:  struct regmap_range_cfg {
1: -	const char *name;
1: -	unsigned int range_min;
1: -	unsigned int range_max;
1: -	unsigned int selector_reg;
1: -	unsigned int selector_mask;
1: -	int selector_shift;
1: -	unsigned int window_start;
1: -	unsigned int window_len;
1: +  const char *name;
1: +  unsigned int range_min;
1: +  unsigned int range_max;
1: +  unsigned int selector_reg;
1: +  unsigned int selector_mask;
1: +  int selector_shift;
1: +  unsigned int window_start;
1: +  unsigned int window_len;
1:  };
1:  
1:  typedef int (*regmap_hw_write)(void *, const void *, size_t);
1:  
1: -typedef int (*regmap_hw_gather_write)(void *, const void *, size_t, const void *, size_t);
1: +typedef int (*regmap_hw_gather_write)(void *, const void *, size_t,
1: +                                      const void *, size_t);
1:  
1:  struct regmap_async;
1:  
1: -typedef int (*regmap_hw_async_write)(void *, const void *, size_t, const void *, size_t, struct regmap_async *);
1: +typedef int (*regmap_hw_async_write)(void *, const void *, size_t, const void *,
1: +                                     size_t, struct regmap_async *);
1:  
1:  struct regmap;
1:  
1:  struct regmap_async {
1: -	struct list_head list;
1: -	struct regmap *map;
1: -	void *work_buf;
1: +  struct list_head list;
1: +  struct regmap *map;
1: +  void *work_buf;
1:  };
1:  
1:  typedef int (*regmap_hw_read)(void *, const void *, size_t, void *, size_t);
1: @@ -79424,48 +80503,49 @@ typedef int (*regmap_hw_reg_read)(void *, unsigned int, unsigned int *);
1:  
1:  typedef int (*regmap_hw_reg_write)(void *, unsigned int, unsigned int);
1:  
1: -typedef int (*regmap_hw_reg_update_bits)(void *, unsigned int, unsigned int, unsigned int);
1: +typedef int (*regmap_hw_reg_update_bits)(void *, unsigned int, unsigned int,
1: +                                         unsigned int);
1:  
1: -typedef struct regmap_async * (*regmap_hw_async_alloc)();
1: +typedef struct regmap_async *(*regmap_hw_async_alloc)();
1:  
1:  typedef void (*regmap_hw_free_context)(void *);
1:  
1:  struct regmap_bus {
1: -	bool fast_io;
1: -	regmap_hw_write write;
1: -	regmap_hw_gather_write gather_write;
1: -	regmap_hw_async_write async_write;
1: -	regmap_hw_reg_write reg_write;
1: -	regmap_hw_reg_update_bits reg_update_bits;
1: -	regmap_hw_read read;
1: -	regmap_hw_reg_read reg_read;
1: -	regmap_hw_free_context free_context;
1: -	regmap_hw_async_alloc async_alloc;
1: -	u8 read_flag_mask;
1: -	enum regmap_endian reg_format_endian_default;
1: -	enum regmap_endian val_format_endian_default;
1: -	size_t max_raw_read;
1: -	size_t max_raw_write;
1: +  bool fast_io;
1: +  regmap_hw_write write;
1: +  regmap_hw_gather_write gather_write;
1: +  regmap_hw_async_write async_write;
1: +  regmap_hw_reg_write reg_write;
1: +  regmap_hw_reg_update_bits reg_update_bits;
1: +  regmap_hw_read read;
1: +  regmap_hw_reg_read reg_read;
1: +  regmap_hw_free_context free_context;
1: +  regmap_hw_async_alloc async_alloc;
1: +  u8 read_flag_mask;
1: +  enum regmap_endian reg_format_endian_default;
1: +  enum regmap_endian val_format_endian_default;
1: +  size_t max_raw_read;
1: +  size_t max_raw_write;
1:  };
1:  
1:  struct reg_field {
1: -	unsigned int reg;
1: -	unsigned int lsb;
1: -	unsigned int msb;
1: -	unsigned int id_size;
1: -	unsigned int id_offset;
1: +  unsigned int reg;
1: +  unsigned int lsb;
1: +  unsigned int msb;
1: +  unsigned int id_size;
1: +  unsigned int id_offset;
1:  };
1:  
1:  struct regmap_format {
1: -	size_t buf_size;
1: -	size_t reg_bytes;
1: -	size_t pad_bytes;
1: -	size_t val_bytes;
1: -	void (*format_write)(struct regmap *, unsigned int, unsigned int);
1: -	void (*format_reg)(void *, unsigned int, unsigned int);
1: -	void (*format_val)(void *, unsigned int, unsigned int);
1: -	unsigned int (*parse_val)(const void *);
1: -	void (*parse_inplace)(void *);
1: +  size_t buf_size;
1: +  size_t reg_bytes;
1: +  size_t pad_bytes;
1: +  size_t val_bytes;
1: +  void (*format_write)(struct regmap *, unsigned int, unsigned int);
1: +  void (*format_reg)(void *, unsigned int, unsigned int);
1: +  void (*format_val)(void *, unsigned int, unsigned int);
1: +  unsigned int (*parse_val)(const void *);
1: +  void (*parse_inplace)(void *);
1:  };
1:  
1:  struct hwspinlock;
1: @@ -79473,213 +80553,222 @@ struct hwspinlock;
1:  struct regcache_ops;
1:  
1:  struct regmap {
1: -	union {
1: -		struct mutex mutex;
1: -		struct {
1: -			spinlock_t spinlock;
1: -			long unsigned int spinlock_flags;
1: -		};
1: -	};
1: -	regmap_lock lock;
1: -	regmap_unlock unlock;
1: -	void *lock_arg;
1: -	gfp_t alloc_flags;
1: -	struct device *dev;
1: -	void *work_buf;
1: -	struct regmap_format format;
1: -	const struct regmap_bus *bus;
1: -	void *bus_context;
1: -	const char *name;
1: -	bool async;
1: -	spinlock_t async_lock;
1: -	wait_queue_head_t async_waitq;
1: -	struct list_head async_list;
1: -	struct list_head async_free;
1: -	int async_ret;
1: -	bool debugfs_disable;
1: -	struct dentry *debugfs;
1: -	const char *debugfs_name;
1: -	unsigned int debugfs_reg_len;
1: -	unsigned int debugfs_val_len;
1: -	unsigned int debugfs_tot_len;
1: -	struct list_head debugfs_off_cache;
1: -	struct mutex cache_lock;
1: -	unsigned int max_register;
1: -	bool (*writeable_reg)(struct device *, unsigned int);
1: -	bool (*readable_reg)(struct device *, unsigned int);
1: -	bool (*volatile_reg)(struct device *, unsigned int);
1: -	bool (*precious_reg)(struct device *, unsigned int);
1: -	bool (*writeable_noinc_reg)(struct device *, unsigned int);
1: -	bool (*readable_noinc_reg)(struct device *, unsigned int);
1: -	const struct regmap_access_table *wr_table;
1: -	const struct regmap_access_table *rd_table;
1: -	const struct regmap_access_table *volatile_table;
1: -	const struct regmap_access_table *precious_table;
1: -	const struct regmap_access_table *wr_noinc_table;
1: -	const struct regmap_access_table *rd_noinc_table;
1: -	int (*reg_read)(void *, unsigned int, unsigned int *);
1: -	int (*reg_write)(void *, unsigned int, unsigned int);
1: -	int (*reg_update_bits)(void *, unsigned int, unsigned int, unsigned int);
1: -	bool defer_caching;
1: -	long unsigned int read_flag_mask;
1: -	long unsigned int write_flag_mask;
1: -	int reg_shift;
1: -	int reg_stride;
1: -	int reg_stride_order;
1: -	const struct regcache_ops *cache_ops;
1: -	enum regcache_type cache_type;
1: -	unsigned int cache_size_raw;
1: -	unsigned int cache_word_size;
1: -	unsigned int num_reg_defaults;
1: -	unsigned int num_reg_defaults_raw;
1: -	bool cache_only;
1: -	bool cache_bypass;
1: -	bool cache_free;
1: -	struct reg_default *reg_defaults;
1: -	const void *reg_defaults_raw;
1: -	void *cache;
1: -	bool cache_dirty;
1: -	bool no_sync_defaults;
1: -	struct reg_sequence *patch;
1: -	int patch_regs;
1: -	bool use_single_read;
1: -	bool use_single_write;
1: -	bool can_multi_write;
1: -	size_t max_raw_read;
1: -	size_t max_raw_write;
1: -	struct rb_root range_tree;
1: -	void *selector_work_buf;
1: -	struct hwspinlock *hwlock;
1: -	bool can_sleep;
1: +  union {
1: +    struct mutex mutex;
1: +    struct {
1: +      spinlock_t spinlock;
1: +      long unsigned int spinlock_flags;
1: +    };
1: +  };
1: +  regmap_lock lock;
1: +  regmap_unlock unlock;
1: +  void *lock_arg;
1: +  gfp_t alloc_flags;
1: +  struct device *dev;
1: +  void *work_buf;
1: +  struct regmap_format format;
1: +  const struct regmap_bus *bus;
1: +  void *bus_context;
1: +  const char *name;
1: +  bool async;
1: +  spinlock_t async_lock;
1: +  wait_queue_head_t async_waitq;
1: +  struct list_head async_list;
1: +  struct list_head async_free;
1: +  int async_ret;
1: +  bool debugfs_disable;
1: +  struct dentry *debugfs;
1: +  const char *debugfs_name;
1: +  unsigned int debugfs_reg_len;
1: +  unsigned int debugfs_val_len;
1: +  unsigned int debugfs_tot_len;
1: +  struct list_head debugfs_off_cache;
1: +  struct mutex cache_lock;
1: +  unsigned int max_register;
1: +  bool (*writeable_reg)(struct device *, unsigned int);
1: +  bool (*readable_reg)(struct device *, unsigned int);
1: +  bool (*volatile_reg)(struct device *, unsigned int);
1: +  bool (*precious_reg)(struct device *, unsigned int);
1: +  bool (*writeable_noinc_reg)(struct device *, unsigned int);
1: +  bool (*readable_noinc_reg)(struct device *, unsigned int);
1: +  const struct regmap_access_table *wr_table;
1: +  const struct regmap_access_table *rd_table;
1: +  const struct regmap_access_table *volatile_table;
1: +  const struct regmap_access_table *precious_table;
1: +  const struct regmap_access_table *wr_noinc_table;
1: +  const struct regmap_access_table *rd_noinc_table;
1: +  int (*reg_read)(void *, unsigned int, unsigned int *);
1: +  int (*reg_write)(void *, unsigned int, unsigned int);
1: +  int (*reg_update_bits)(void *, unsigned int, unsigned int, unsigned int);
1: +  bool defer_caching;
1: +  long unsigned int read_flag_mask;
1: +  long unsigned int write_flag_mask;
1: +  int reg_shift;
1: +  int reg_stride;
1: +  int reg_stride_order;
1: +  const struct regcache_ops *cache_ops;
1: +  enum regcache_type cache_type;
1: +  unsigned int cache_size_raw;
1: +  unsigned int cache_word_size;
1: +  unsigned int num_reg_defaults;
1: +  unsigned int num_reg_defaults_raw;
1: +  bool cache_only;
1: +  bool cache_bypass;
1: +  bool cache_free;
1: +  struct reg_default *reg_defaults;
1: +  const void *reg_defaults_raw;
1: +  void *cache;
1: +  bool cache_dirty;
1: +  bool no_sync_defaults;
1: +  struct reg_sequence *patch;
1: +  int patch_regs;
1: +  bool use_single_read;
1: +  bool use_single_write;
1: +  bool can_multi_write;
1: +  size_t max_raw_read;
1: +  size_t max_raw_write;
1: +  struct rb_root range_tree;
1: +  void *selector_work_buf;
1: +  struct hwspinlock *hwlock;
1: +  bool can_sleep;
1:  };
1:  
1:  struct regcache_ops {
1: -	const char *name;
1: -	enum regcache_type type;
1: -	int (*init)(struct regmap *);
1: -	int (*exit)(struct regmap *);
1: -	void (*debugfs_init)(struct regmap *);
1: -	int (*read)(struct regmap *, unsigned int, unsigned int *);
1: -	int (*write)(struct regmap *, unsigned int, unsigned int);
1: -	int (*sync)(struct regmap *, unsigned int, unsigned int);
1: -	int (*drop)(struct regmap *, unsigned int, unsigned int);
1: +  const char *name;
1: +  enum regcache_type type;
1: +  int (*init)(struct regmap *);
1: +  int (*exit)(struct regmap *);
1: +  void (*debugfs_init)(struct regmap *);
1: +  int (*read)(struct regmap *, unsigned int, unsigned int *);
1: +  int (*write)(struct regmap *, unsigned int, unsigned int);
1: +  int (*sync)(struct regmap *, unsigned int, unsigned int);
1: +  int (*drop)(struct regmap *, unsigned int, unsigned int);
1:  };
1:  
1:  struct regmap_range_node {
1: -	struct rb_node node;
1: -	const char *name;
1: -	struct regmap *map;
1: -	unsigned int range_min;
1: -	unsigned int range_max;
1: -	unsigned int selector_reg;
1: -	unsigned int selector_mask;
1: -	int selector_shift;
1: -	unsigned int window_start;
1: -	unsigned int window_len;
1: +  struct rb_node node;
1: +  const char *name;
1: +  struct regmap *map;
1: +  unsigned int range_min;
1: +  unsigned int range_max;
1: +  unsigned int selector_reg;
1: +  unsigned int selector_mask;
1: +  int selector_shift;
1: +  unsigned int window_start;
1: +  unsigned int window_len;
1:  };
1:  
1:  struct regmap_field {
1: -	struct regmap *regmap;
1: -	unsigned int mask;
1: -	unsigned int shift;
1: -	unsigned int reg;
1: -	unsigned int id_size;
1: -	unsigned int id_offset;
1: +  struct regmap *regmap;
1: +  unsigned int mask;
1: +  unsigned int shift;
1: +  unsigned int reg;
1: +  unsigned int id_size;
1: +  unsigned int id_offset;
1:  };
1:  
1:  struct trace_event_raw_regmap_reg {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	unsigned int reg;
1: -	unsigned int val;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  unsigned int reg;
1: +  unsigned int val;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_regmap_block {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	unsigned int reg;
1: -	int count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  unsigned int reg;
1: +  int count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_regcache_sync {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u32 __data_loc_status;
1: -	u32 __data_loc_type;
1: -	int type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u32 __data_loc_status;
1: +  u32 __data_loc_type;
1: +  int type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_regmap_bool {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	int flag;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  int flag;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_regmap_async {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_regcache_drop_region {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	unsigned int from;
1: -	unsigned int to;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  unsigned int from;
1: +  unsigned int to;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_regmap_reg {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_regmap_block {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_regcache_sync {
1: -	u32 name;
1: -	u32 status;
1: -	u32 type;
1: +  u32 name;
1: +  u32 status;
1: +  u32 type;
1:  };
1:  
1:  struct trace_event_data_offsets_regmap_bool {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_regmap_async {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_regcache_drop_region {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1: -typedef void (*btf_trace_regmap_reg_write)(void *, struct regmap *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_regmap_reg_write)(void *, struct regmap *,
1: +                                           unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_regmap_reg_read)(void *, struct regmap *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_regmap_reg_read)(void *, struct regmap *, unsigned int,
1: +                                          unsigned int);
1:  
1: -typedef void (*btf_trace_regmap_reg_read_cache)(void *, struct regmap *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_regmap_reg_read_cache)(void *, struct regmap *,
1: +                                                unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_regmap_hw_read_start)(void *, struct regmap *, unsigned int, int);
1: +typedef void (*btf_trace_regmap_hw_read_start)(void *, struct regmap *,
1: +                                               unsigned int, int);
1:  
1: -typedef void (*btf_trace_regmap_hw_read_done)(void *, struct regmap *, unsigned int, int);
1: +typedef void (*btf_trace_regmap_hw_read_done)(void *, struct regmap *,
1: +                                              unsigned int, int);
1:  
1: -typedef void (*btf_trace_regmap_hw_write_start)(void *, struct regmap *, unsigned int, int);
1: +typedef void (*btf_trace_regmap_hw_write_start)(void *, struct regmap *,
1: +                                                unsigned int, int);
1:  
1: -typedef void (*btf_trace_regmap_hw_write_done)(void *, struct regmap *, unsigned int, int);
1: +typedef void (*btf_trace_regmap_hw_write_done)(void *, struct regmap *,
1: +                                               unsigned int, int);
1:  
1: -typedef void (*btf_trace_regcache_sync)(void *, struct regmap *, const char *, const char *);
1: +typedef void (*btf_trace_regcache_sync)(void *, struct regmap *, const char *,
1: +                                        const char *);
1:  
1:  typedef void (*btf_trace_regmap_cache_only)(void *, struct regmap *, bool);
1:  
1:  typedef void (*btf_trace_regmap_cache_bypass)(void *, struct regmap *, bool);
1:  
1: -typedef void (*btf_trace_regmap_async_write_start)(void *, struct regmap *, unsigned int, int);
1: +typedef void (*btf_trace_regmap_async_write_start)(void *, struct regmap *,
1: +                                                   unsigned int, int);
1:  
1:  typedef void (*btf_trace_regmap_async_io_complete)(void *, struct regmap *);
1:  
1: @@ -79687,243 +80776,246 @@ typedef void (*btf_trace_regmap_async_complete_start)(void *, struct regmap *);
1:  
1:  typedef void (*btf_trace_regmap_async_complete_done)(void *, struct regmap *);
1:  
1: -typedef void (*btf_trace_regcache_drop_region)(void *, struct regmap *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_regcache_drop_region)(void *, struct regmap *,
1: +                                               unsigned int, unsigned int);
1:  
1:  struct regcache_rbtree_node {
1: -	void *block;
1: -	long int *cache_present;
1: -	unsigned int base_reg;
1: -	unsigned int blklen;
1: -	struct rb_node node;
1: +  void *block;
1: +  long int *cache_present;
1: +  unsigned int base_reg;
1: +  unsigned int blklen;
1: +  struct rb_node node;
1:  };
1:  
1:  struct regcache_rbtree_ctx {
1: -	struct rb_root root;
1: -	struct regcache_rbtree_node *cached_rbnode;
1: +  struct rb_root root;
1: +  struct regcache_rbtree_node *cached_rbnode;
1:  };
1:  
1:  struct regmap_debugfs_off_cache {
1: -	struct list_head list;
1: -	off_t min;
1: -	off_t max;
1: -	unsigned int base_reg;
1: -	unsigned int max_reg;
1: +  struct list_head list;
1: +  off_t min;
1: +  off_t max;
1: +  unsigned int base_reg;
1: +  unsigned int max_reg;
1:  };
1:  
1:  struct regmap_debugfs_node {
1: -	struct regmap *map;
1: -	struct list_head link;
1: +  struct regmap *map;
1: +  struct list_head link;
1:  };
1:  
1:  typedef void (*irq_write_msi_msg_t)(struct msi_desc *, struct msi_msg *);
1:  
1:  struct platform_msi_priv_data {
1: -	struct device *dev;
1: -	void *host_data;
1: -	msi_alloc_info_t arg;
1: -	irq_write_msi_msg_t write_msg;
1: -	int devid;
1: +  struct device *dev;
1: +  void *host_data;
1: +  msi_alloc_info_t arg;
1: +  irq_write_msi_msg_t write_msg;
1: +  int devid;
1:  };
1:  
1:  struct brd_device {
1: -	int brd_number;
1: -	struct request_queue *brd_queue;
1: -	struct gendisk *brd_disk;
1: -	struct list_head brd_list;
1: -	spinlock_t brd_lock;
1: -	struct xarray brd_pages;
1: +  int brd_number;
1: +  struct request_queue *brd_queue;
1: +  struct gendisk *brd_disk;
1: +  struct list_head brd_list;
1: +  spinlock_t brd_lock;
1: +  struct xarray brd_pages;
1:  };
1:  
1:  typedef long unsigned int __kernel_old_dev_t;
1:  
1:  enum {
1: -	LO_FLAGS_READ_ONLY = 1,
1: -	LO_FLAGS_AUTOCLEAR = 4,
1: -	LO_FLAGS_PARTSCAN = 8,
1: -	LO_FLAGS_DIRECT_IO = 16,
1: +  LO_FLAGS_READ_ONLY = 1,
1: +  LO_FLAGS_AUTOCLEAR = 4,
1: +  LO_FLAGS_PARTSCAN = 8,
1: +  LO_FLAGS_DIRECT_IO = 16,
1:  };
1:  
1:  struct loop_info {
1: -	int lo_number;
1: -	__kernel_old_dev_t lo_device;
1: -	long unsigned int lo_inode;
1: -	__kernel_old_dev_t lo_rdevice;
1: -	int lo_offset;
1: -	int lo_encrypt_type;
1: -	int lo_encrypt_key_size;
1: -	int lo_flags;
1: -	char lo_name[64];
1: -	unsigned char lo_encrypt_key[32];
1: -	long unsigned int lo_init[2];
1: -	char reserved[4];
1: +  int lo_number;
1: +  __kernel_old_dev_t lo_device;
1: +  long unsigned int lo_inode;
1: +  __kernel_old_dev_t lo_rdevice;
1: +  int lo_offset;
1: +  int lo_encrypt_type;
1: +  int lo_encrypt_key_size;
1: +  int lo_flags;
1: +  char lo_name[64];
1: +  unsigned char lo_encrypt_key[32];
1: +  long unsigned int lo_init[2];
1: +  char reserved[4];
1:  };
1:  
1:  struct loop_info64 {
1: -	__u64 lo_device;
1: -	__u64 lo_inode;
1: -	__u64 lo_rdevice;
1: -	__u64 lo_offset;
1: -	__u64 lo_sizelimit;
1: -	__u32 lo_number;
1: -	__u32 lo_encrypt_type;
1: -	__u32 lo_encrypt_key_size;
1: -	__u32 lo_flags;
1: -	__u8 lo_file_name[64];
1: -	__u8 lo_crypt_name[64];
1: -	__u8 lo_encrypt_key[32];
1: -	__u64 lo_init[2];
1: +  __u64 lo_device;
1: +  __u64 lo_inode;
1: +  __u64 lo_rdevice;
1: +  __u64 lo_offset;
1: +  __u64 lo_sizelimit;
1: +  __u32 lo_number;
1: +  __u32 lo_encrypt_type;
1: +  __u32 lo_encrypt_key_size;
1: +  __u32 lo_flags;
1: +  __u8 lo_file_name[64];
1: +  __u8 lo_crypt_name[64];
1: +  __u8 lo_encrypt_key[32];
1: +  __u64 lo_init[2];
1:  };
1:  
1:  struct loop_config {
1: -	__u32 fd;
1: -	__u32 block_size;
1: -	struct loop_info64 info;
1: -	__u64 __reserved[8];
1: +  __u32 fd;
1: +  __u32 block_size;
1: +  struct loop_info64 info;
1: +  __u64 __reserved[8];
1:  };
1:  
1:  enum {
1: -	Lo_unbound = 0,
1: -	Lo_bound = 1,
1: -	Lo_rundown = 2,
1: +  Lo_unbound = 0,
1: +  Lo_bound = 1,
1: +  Lo_rundown = 2,
1:  };
1:  
1:  struct loop_func_table;
1:  
1:  struct loop_device {
1: -	int lo_number;
1: -	atomic_t lo_refcnt;
1: -	loff_t lo_offset;
1: -	loff_t lo_sizelimit;
1: -	int lo_flags;
1: -	int (*transfer)(struct loop_device *, int, struct page *, unsigned int, struct page *, unsigned int, int, sector_t);
1: -	char lo_file_name[64];
1: -	char lo_crypt_name[64];
1: -	char lo_encrypt_key[32];
1: -	int lo_encrypt_key_size;
1: -	struct loop_func_table *lo_encryption;
1: -	__u32 lo_init[2];
1: -	kuid_t lo_key_owner;
1: -	int (*ioctl)(struct loop_device *, int, long unsigned int);
1: -	struct file *lo_backing_file;
1: -	struct block_device *lo_device;
1: -	void *key_data;
1: -	gfp_t old_gfp_mask;
1: -	spinlock_t lo_lock;
1: -	int lo_state;
1: -	struct kthread_worker worker;
1: -	struct task_struct *worker_task;
1: -	bool use_dio;
1: -	bool sysfs_inited;
1: -	struct request_queue *lo_queue;
1: -	struct blk_mq_tag_set tag_set;
1: -	struct gendisk *lo_disk;
1: +  int lo_number;
1: +  atomic_t lo_refcnt;
1: +  loff_t lo_offset;
1: +  loff_t lo_sizelimit;
1: +  int lo_flags;
1: +  int (*transfer)(struct loop_device *, int, struct page *, unsigned int,
1: +                  struct page *, unsigned int, int, sector_t);
1: +  char lo_file_name[64];
1: +  char lo_crypt_name[64];
1: +  char lo_encrypt_key[32];
1: +  int lo_encrypt_key_size;
1: +  struct loop_func_table *lo_encryption;
1: +  __u32 lo_init[2];
1: +  kuid_t lo_key_owner;
1: +  int (*ioctl)(struct loop_device *, int, long unsigned int);
1: +  struct file *lo_backing_file;
1: +  struct block_device *lo_device;
1: +  void *key_data;
1: +  gfp_t old_gfp_mask;
1: +  spinlock_t lo_lock;
1: +  int lo_state;
1: +  struct kthread_worker worker;
1: +  struct task_struct *worker_task;
1: +  bool use_dio;
1: +  bool sysfs_inited;
1: +  struct request_queue *lo_queue;
1: +  struct blk_mq_tag_set tag_set;
1: +  struct gendisk *lo_disk;
1:  };
1:  
1:  struct loop_func_table {
1: -	int number;
1: -	int (*transfer)(struct loop_device *, int, struct page *, unsigned int, struct page *, unsigned int, int, sector_t);
1: -	int (*init)(struct loop_device *, const struct loop_info64 *);
1: -	int (*release)(struct loop_device *);
1: -	int (*ioctl)(struct loop_device *, int, long unsigned int);
1: -	struct module *owner;
1: +  int number;
1: +  int (*transfer)(struct loop_device *, int, struct page *, unsigned int,
1: +                  struct page *, unsigned int, int, sector_t);
1: +  int (*init)(struct loop_device *, const struct loop_info64 *);
1: +  int (*release)(struct loop_device *);
1: +  int (*ioctl)(struct loop_device *, int, long unsigned int);
1: +  struct module *owner;
1:  };
1:  
1:  struct loop_cmd {
1: -	struct kthread_work work;
1: -	bool use_aio;
1: -	atomic_t ref;
1: -	long int ret;
1: -	struct kiocb iocb;
1: -	struct bio_vec *bvec;
1: -	struct cgroup_subsys_state *css;
1: +  struct kthread_work work;
1: +  bool use_aio;
1: +  atomic_t ref;
1: +  long int ret;
1: +  struct kiocb iocb;
1: +  struct bio_vec *bvec;
1: +  struct cgroup_subsys_state *css;
1:  };
1:  
1:  struct compat_loop_info {
1: -	compat_int_t lo_number;
1: -	compat_dev_t lo_device;
1: -	compat_ulong_t lo_inode;
1: -	compat_dev_t lo_rdevice;
1: -	compat_int_t lo_offset;
1: -	compat_int_t lo_encrypt_type;
1: -	compat_int_t lo_encrypt_key_size;
1: -	compat_int_t lo_flags;
1: -	char lo_name[64];
1: -	unsigned char lo_encrypt_key[32];
1: -	compat_ulong_t lo_init[2];
1: -	char reserved[4];
1: +  compat_int_t lo_number;
1: +  compat_dev_t lo_device;
1: +  compat_ulong_t lo_inode;
1: +  compat_dev_t lo_rdevice;
1: +  compat_int_t lo_offset;
1: +  compat_int_t lo_encrypt_type;
1: +  compat_int_t lo_encrypt_key_size;
1: +  compat_int_t lo_flags;
1: +  char lo_name[64];
1: +  unsigned char lo_encrypt_key[32];
1: +  compat_ulong_t lo_init[2];
1: +  char reserved[4];
1:  };
1:  
1:  typedef int (*encdec_cbc_t)(struct skcipher_request *);
1:  
1:  struct virtio_blk_geometry {
1: -	__virtio16 cylinders;
1: -	__u8 heads;
1: -	__u8 sectors;
1: +  __virtio16 cylinders;
1: +  __u8 heads;
1: +  __u8 sectors;
1:  };
1:  
1:  struct virtio_blk_config {
1: -	__virtio64 capacity;
1: -	__virtio32 size_max;
1: -	__virtio32 seg_max;
1: -	struct virtio_blk_geometry geometry;
1: -	__virtio32 blk_size;
1: -	__u8 physical_block_exp;
1: -	__u8 alignment_offset;
1: -	__virtio16 min_io_size;
1: -	__virtio32 opt_io_size;
1: -	__u8 wce;
1: -	__u8 unused;
1: -	__virtio16 num_queues;
1: -	__virtio32 max_discard_sectors;
1: -	__virtio32 max_discard_seg;
1: -	__virtio32 discard_sector_alignment;
1: -	__virtio32 max_write_zeroes_sectors;
1: -	__virtio32 max_write_zeroes_seg;
1: -	__u8 write_zeroes_may_unmap;
1: -	__u8 unused1[3];
1: +  __virtio64 capacity;
1: +  __virtio32 size_max;
1: +  __virtio32 seg_max;
1: +  struct virtio_blk_geometry geometry;
1: +  __virtio32 blk_size;
1: +  __u8 physical_block_exp;
1: +  __u8 alignment_offset;
1: +  __virtio16 min_io_size;
1: +  __virtio32 opt_io_size;
1: +  __u8 wce;
1: +  __u8 unused;
1: +  __virtio16 num_queues;
1: +  __virtio32 max_discard_sectors;
1: +  __virtio32 max_discard_seg;
1: +  __virtio32 discard_sector_alignment;
1: +  __virtio32 max_write_zeroes_sectors;
1: +  __virtio32 max_write_zeroes_seg;
1: +  __u8 write_zeroes_may_unmap;
1: +  __u8 unused1[3];
1:  } __attribute__((packed));
1:  
1:  struct virtio_blk_outhdr {
1: -	__virtio32 type;
1: -	__virtio32 ioprio;
1: -	__virtio64 sector;
1: +  __virtio32 type;
1: +  __virtio32 ioprio;
1: +  __virtio64 sector;
1:  };
1:  
1:  struct virtio_blk_discard_write_zeroes {
1: -	__le64 sector;
1: -	__le32 num_sectors;
1: -	__le32 flags;
1: +  __le64 sector;
1: +  __le32 num_sectors;
1: +  __le32 flags;
1:  };
1:  
1:  struct virtio_blk_vq {
1: -	struct virtqueue *vq;
1: -	spinlock_t lock;
1: -	char name[16];
1: -	long: 64;
1: -	long: 64;
1: +  struct virtqueue *vq;
1: +  spinlock_t lock;
1: +  char name[16];
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct virtio_blk {
1: -	struct mutex vdev_mutex;
1: -	struct virtio_device *vdev;
1: -	struct gendisk *disk;
1: -	struct blk_mq_tag_set tag_set;
1: -	struct work_struct config_work;
1: -	refcount_t refs;
1: -	unsigned int sg_elems;
1: -	int index;
1: -	int num_vqs;
1: -	struct virtio_blk_vq *vqs;
1: +  struct mutex vdev_mutex;
1: +  struct virtio_device *vdev;
1: +  struct gendisk *disk;
1: +  struct blk_mq_tag_set tag_set;
1: +  struct work_struct config_work;
1: +  refcount_t refs;
1: +  unsigned int sg_elems;
1: +  int index;
1: +  int num_vqs;
1: +  struct virtio_blk_vq *vqs;
1:  };
1:  
1:  struct virtblk_req {
1: -	struct virtio_blk_outhdr out_hdr;
1: -	u8 status;
1: -	struct scatterlist sg[0];
1: +  struct virtio_blk_outhdr out_hdr;
1: +  u8 status;
1: +  struct scatterlist sg[0];
1:  };
1:  
1:  struct seqcount_ww_mutex {
1: -	seqcount_t seqcount;
1: +  seqcount_t seqcount;
1:  };
1:  
1:  typedef struct seqcount_ww_mutex seqcount_ww_mutex_t;
1: @@ -79931,37 +81023,37 @@ typedef struct seqcount_ww_mutex seqcount_ww_mutex_t;
1:  struct dma_fence_ops;
1:  
1:  struct dma_fence {
1: -	spinlock_t *lock;
1: -	const struct dma_fence_ops *ops;
1: -	union {
1: -		struct list_head cb_list;
1: -		ktime_t timestamp;
1: -		struct callback_head rcu;
1: -	};
1: -	u64 context;
1: -	u64 seqno;
1: -	long unsigned int flags;
1: -	struct kref refcount;
1: -	int error;
1: +  spinlock_t *lock;
1: +  const struct dma_fence_ops *ops;
1: +  union {
1: +    struct list_head cb_list;
1: +    ktime_t timestamp;
1: +    struct callback_head rcu;
1: +  };
1: +  u64 context;
1: +  u64 seqno;
1: +  long unsigned int flags;
1: +  struct kref refcount;
1: +  int error;
1:  };
1:  
1:  struct dma_fence_ops {
1: -	bool use_64bit_seqno;
1: -	const char * (*get_driver_name)(struct dma_fence *);
1: -	const char * (*get_timeline_name)(struct dma_fence *);
1: -	bool (*enable_signaling)(struct dma_fence *);
1: -	bool (*signaled)(struct dma_fence *);
1: -	long int (*wait)(struct dma_fence *, bool, long int);
1: -	void (*release)(struct dma_fence *);
1: -	void (*fence_value_str)(struct dma_fence *, char *, int);
1: -	void (*timeline_value_str)(struct dma_fence *, char *, int);
1: +  bool use_64bit_seqno;
1: +  const char *(*get_driver_name)(struct dma_fence *);
1: +  const char *(*get_timeline_name)(struct dma_fence *);
1: +  bool (*enable_signaling)(struct dma_fence *);
1: +  bool (*signaled)(struct dma_fence *);
1: +  long int (*wait)(struct dma_fence *, bool, long int);
1: +  void (*release)(struct dma_fence *);
1: +  void (*fence_value_str)(struct dma_fence *, char *, int);
1: +  void (*timeline_value_str)(struct dma_fence *, char *, int);
1:  };
1:  
1:  enum dma_fence_flag_bits {
1: -	DMA_FENCE_FLAG_SIGNALED_BIT = 0,
1: -	DMA_FENCE_FLAG_TIMESTAMP_BIT = 1,
1: -	DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT = 2,
1: -	DMA_FENCE_FLAG_USER_BITS = 3,
1: +  DMA_FENCE_FLAG_SIGNALED_BIT = 0,
1: +  DMA_FENCE_FLAG_TIMESTAMP_BIT = 1,
1: +  DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT = 2,
1: +  DMA_FENCE_FLAG_USER_BITS = 3,
1:  };
1:  
1:  struct dma_fence_cb;
1: @@ -79969,8 +81061,8 @@ struct dma_fence_cb;
1:  typedef void (*dma_fence_func_t)(struct dma_fence *, struct dma_fence_cb *);
1:  
1:  struct dma_fence_cb {
1: -	struct list_head node;
1: -	dma_fence_func_t func;
1: +  struct list_head node;
1: +  dma_fence_func_t func;
1:  };
1:  
1:  struct dma_buf;
1: @@ -79978,115 +81070,117 @@ struct dma_buf;
1:  struct dma_buf_attachment;
1:  
1:  struct dma_buf_ops {
1: -	bool cache_sgt_mapping;
1: -	int (*attach)(struct dma_buf *, struct dma_buf_attachment *);
1: -	void (*detach)(struct dma_buf *, struct dma_buf_attachment *);
1: -	int (*pin)(struct dma_buf_attachment *);
1: -	void (*unpin)(struct dma_buf_attachment *);
1: -	struct sg_table * (*map_dma_buf)(struct dma_buf_attachment *, enum dma_data_direction);
1: -	void (*unmap_dma_buf)(struct dma_buf_attachment *, struct sg_table *, enum dma_data_direction);
1: -	void (*release)(struct dma_buf *);
1: -	int (*begin_cpu_access)(struct dma_buf *, enum dma_data_direction);
1: -	int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
1: -	int (*mmap)(struct dma_buf *, struct vm_area_struct *);
1: -	void * (*vmap)(struct dma_buf *);
1: -	void (*vunmap)(struct dma_buf *, void *);
1: +  bool cache_sgt_mapping;
1: +  int (*attach)(struct dma_buf *, struct dma_buf_attachment *);
1: +  void (*detach)(struct dma_buf *, struct dma_buf_attachment *);
1: +  int (*pin)(struct dma_buf_attachment *);
1: +  void (*unpin)(struct dma_buf_attachment *);
1: +  struct sg_table *(*map_dma_buf)(struct dma_buf_attachment *,
1: +                                  enum dma_data_direction);
1: +  void (*unmap_dma_buf)(struct dma_buf_attachment *, struct sg_table *,
1: +                        enum dma_data_direction);
1: +  void (*release)(struct dma_buf *);
1: +  int (*begin_cpu_access)(struct dma_buf *, enum dma_data_direction);
1: +  int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
1: +  int (*mmap)(struct dma_buf *, struct vm_area_struct *);
1: +  void *(*vmap)(struct dma_buf *);
1: +  void (*vunmap)(struct dma_buf *, void *);
1:  };
1:  
1:  struct dma_buf_poll_cb_t {
1: -	struct dma_fence_cb cb;
1: -	wait_queue_head_t *poll;
1: -	__poll_t active;
1: +  struct dma_fence_cb cb;
1: +  wait_queue_head_t *poll;
1: +  __poll_t active;
1:  };
1:  
1:  struct dma_resv;
1:  
1:  struct dma_buf {
1: -	size_t size;
1: -	struct file *file;
1: -	struct list_head attachments;
1: -	const struct dma_buf_ops *ops;
1: -	struct mutex lock;
1: -	unsigned int vmapping_counter;
1: -	void *vmap_ptr;
1: -	const char *exp_name;
1: -	const char *name;
1: -	spinlock_t name_lock;
1: -	struct module *owner;
1: -	struct list_head list_node;
1: -	void *priv;
1: -	struct dma_resv *resv;
1: -	wait_queue_head_t poll;
1: -	struct dma_buf_poll_cb_t cb_excl;
1: -	struct dma_buf_poll_cb_t cb_shared;
1: +  size_t size;
1: +  struct file *file;
1: +  struct list_head attachments;
1: +  const struct dma_buf_ops *ops;
1: +  struct mutex lock;
1: +  unsigned int vmapping_counter;
1: +  void *vmap_ptr;
1: +  const char *exp_name;
1: +  const char *name;
1: +  spinlock_t name_lock;
1: +  struct module *owner;
1: +  struct list_head list_node;
1: +  void *priv;
1: +  struct dma_resv *resv;
1: +  wait_queue_head_t poll;
1: +  struct dma_buf_poll_cb_t cb_excl;
1: +  struct dma_buf_poll_cb_t cb_shared;
1:  };
1:  
1:  struct dma_buf_attach_ops;
1:  
1:  struct dma_buf_attachment {
1: -	struct dma_buf *dmabuf;
1: -	struct device *dev;
1: -	struct list_head node;
1: -	struct sg_table *sgt;
1: -	enum dma_data_direction dir;
1: -	bool peer2peer;
1: -	const struct dma_buf_attach_ops *importer_ops;
1: -	void *importer_priv;
1: -	void *priv;
1: +  struct dma_buf *dmabuf;
1: +  struct device *dev;
1: +  struct list_head node;
1: +  struct sg_table *sgt;
1: +  enum dma_data_direction dir;
1: +  bool peer2peer;
1: +  const struct dma_buf_attach_ops *importer_ops;
1: +  void *importer_priv;
1: +  void *priv;
1:  };
1:  
1:  struct dma_resv_list;
1:  
1:  struct dma_resv {
1: -	struct ww_mutex lock;
1: -	seqcount_ww_mutex_t seq;
1: -	struct dma_fence *fence_excl;
1: -	struct dma_resv_list *fence;
1: +  struct ww_mutex lock;
1: +  seqcount_ww_mutex_t seq;
1: +  struct dma_fence *fence_excl;
1: +  struct dma_resv_list *fence;
1:  };
1:  
1:  struct dma_buf_attach_ops {
1: -	bool allow_peer2peer;
1: -	void (*move_notify)(struct dma_buf_attachment *);
1: +  bool allow_peer2peer;
1: +  void (*move_notify)(struct dma_buf_attachment *);
1:  };
1:  
1:  struct dma_buf_export_info {
1: -	const char *exp_name;
1: -	struct module *owner;
1: -	const struct dma_buf_ops *ops;
1: -	size_t size;
1: -	int flags;
1: -	struct dma_resv *resv;
1: -	void *priv;
1: +  const char *exp_name;
1: +  struct module *owner;
1: +  const struct dma_buf_ops *ops;
1: +  size_t size;
1: +  int flags;
1: +  struct dma_resv *resv;
1: +  void *priv;
1:  };
1:  
1:  struct dma_resv_list {
1: -	struct callback_head rcu;
1: -	u32 shared_count;
1: -	u32 shared_max;
1: -	struct dma_fence *shared[0];
1: +  struct callback_head rcu;
1: +  u32 shared_count;
1: +  u32 shared_max;
1: +  struct dma_fence *shared[0];
1:  };
1:  
1:  struct dma_buf_sync {
1: -	__u64 flags;
1: +  __u64 flags;
1:  };
1:  
1:  struct dma_buf_list {
1: -	struct list_head head;
1: -	struct mutex lock;
1: +  struct list_head head;
1: +  struct mutex lock;
1:  };
1:  
1:  struct trace_event_raw_dma_fence {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_driver;
1: -	u32 __data_loc_timeline;
1: -	unsigned int context;
1: -	unsigned int seqno;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_driver;
1: +  u32 __data_loc_timeline;
1: +  unsigned int context;
1: +  unsigned int seqno;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_dma_fence {
1: -	u32 driver;
1: -	u32 timeline;
1: +  u32 driver;
1: +  u32 timeline;
1:  };
1:  
1:  typedef void (*btf_trace_dma_fence_emit)(void *, struct dma_fence *);
1: @@ -80104,589 +81198,592 @@ typedef void (*btf_trace_dma_fence_wait_start)(void *, struct dma_fence *);
1:  typedef void (*btf_trace_dma_fence_wait_end)(void *, struct dma_fence *);
1:  
1:  struct default_wait_cb {
1: -	struct dma_fence_cb base;
1: -	struct task_struct *task;
1: +  struct dma_fence_cb base;
1: +  struct task_struct *task;
1:  };
1:  
1:  struct dma_fence_array;
1:  
1:  struct dma_fence_array_cb {
1: -	struct dma_fence_cb cb;
1: -	struct dma_fence_array *array;
1: +  struct dma_fence_cb cb;
1: +  struct dma_fence_array *array;
1:  };
1:  
1:  struct dma_fence_array {
1: -	struct dma_fence base;
1: -	spinlock_t lock;
1: -	unsigned int num_fences;
1: -	atomic_t num_pending;
1: -	struct dma_fence **fences;
1: -	struct irq_work work;
1: +  struct dma_fence base;
1: +  spinlock_t lock;
1: +  unsigned int num_fences;
1: +  atomic_t num_pending;
1: +  struct dma_fence **fences;
1: +  struct irq_work work;
1:  };
1:  
1:  struct dma_fence_chain {
1: -	struct dma_fence base;
1: -	spinlock_t lock;
1: -	struct dma_fence *prev;
1: -	u64 prev_seqno;
1: -	struct dma_fence *fence;
1: -	struct dma_fence_cb cb;
1: -	struct irq_work work;
1: +  struct dma_fence base;
1: +  spinlock_t lock;
1: +  struct dma_fence *prev;
1: +  u64 prev_seqno;
1: +  struct dma_fence *fence;
1: +  struct dma_fence_cb cb;
1: +  struct irq_work work;
1:  };
1:  
1:  enum seqno_fence_condition {
1: -	SEQNO_FENCE_WAIT_GEQUAL = 0,
1: -	SEQNO_FENCE_WAIT_NONZERO = 1,
1: +  SEQNO_FENCE_WAIT_GEQUAL = 0,
1: +  SEQNO_FENCE_WAIT_NONZERO = 1,
1:  };
1:  
1:  struct seqno_fence {
1: -	struct dma_fence base;
1: -	const struct dma_fence_ops *ops;
1: -	struct dma_buf *sync_buf;
1: -	uint32_t seqno_ofs;
1: -	enum seqno_fence_condition condition;
1: +  struct dma_fence base;
1: +  const struct dma_fence_ops *ops;
1: +  struct dma_buf *sync_buf;
1: +  uint32_t seqno_ofs;
1: +  enum seqno_fence_condition condition;
1:  };
1:  
1:  struct sync_file {
1: -	struct file *file;
1: -	char user_name[32];
1: -	struct list_head sync_file_list;
1: -	wait_queue_head_t wq;
1: -	long unsigned int flags;
1: -	struct dma_fence *fence;
1: -	struct dma_fence_cb cb;
1: +  struct file *file;
1: +  char user_name[32];
1: +  struct list_head sync_file_list;
1: +  wait_queue_head_t wq;
1: +  long unsigned int flags;
1: +  struct dma_fence *fence;
1: +  struct dma_fence_cb cb;
1:  };
1:  
1:  struct sync_merge_data {
1: -	char name[32];
1: -	__s32 fd2;
1: -	__s32 fence;
1: -	__u32 flags;
1: -	__u32 pad;
1: +  char name[32];
1: +  __s32 fd2;
1: +  __s32 fence;
1: +  __u32 flags;
1: +  __u32 pad;
1:  };
1:  
1:  struct sync_fence_info {
1: -	char obj_name[32];
1: -	char driver_name[32];
1: -	__s32 status;
1: -	__u32 flags;
1: -	__u64 timestamp_ns;
1: +  char obj_name[32];
1: +  char driver_name[32];
1: +  __s32 status;
1: +  __u32 flags;
1: +  __u64 timestamp_ns;
1:  };
1:  
1:  struct sync_file_info {
1: -	char name[32];
1: -	__s32 status;
1: -	__u32 flags;
1: -	__u32 num_fences;
1: -	__u32 pad;
1: -	__u64 sync_fence_info;
1: -};
1: -
1: -enum {
1: -	ATA_MAX_DEVICES = 2,
1: -	ATA_MAX_PRD = 256,
1: -	ATA_SECT_SIZE = 512,
1: -	ATA_MAX_SECTORS_128 = 128,
1: -	ATA_MAX_SECTORS = 256,
1: -	ATA_MAX_SECTORS_1024 = 1024,
1: -	ATA_MAX_SECTORS_LBA48 = 65535,
1: -	ATA_MAX_SECTORS_TAPE = 65535,
1: -	ATA_MAX_TRIM_RNUM = 64,
1: -	ATA_ID_WORDS = 256,
1: -	ATA_ID_CONFIG = 0,
1: -	ATA_ID_CYLS = 1,
1: -	ATA_ID_HEADS = 3,
1: -	ATA_ID_SECTORS = 6,
1: -	ATA_ID_SERNO = 10,
1: -	ATA_ID_BUF_SIZE = 21,
1: -	ATA_ID_FW_REV = 23,
1: -	ATA_ID_PROD = 27,
1: -	ATA_ID_MAX_MULTSECT = 47,
1: -	ATA_ID_DWORD_IO = 48,
1: -	ATA_ID_TRUSTED = 48,
1: -	ATA_ID_CAPABILITY = 49,
1: -	ATA_ID_OLD_PIO_MODES = 51,
1: -	ATA_ID_OLD_DMA_MODES = 52,
1: -	ATA_ID_FIELD_VALID = 53,
1: -	ATA_ID_CUR_CYLS = 54,
1: -	ATA_ID_CUR_HEADS = 55,
1: -	ATA_ID_CUR_SECTORS = 56,
1: -	ATA_ID_MULTSECT = 59,
1: -	ATA_ID_LBA_CAPACITY = 60,
1: -	ATA_ID_SWDMA_MODES = 62,
1: -	ATA_ID_MWDMA_MODES = 63,
1: -	ATA_ID_PIO_MODES = 64,
1: -	ATA_ID_EIDE_DMA_MIN = 65,
1: -	ATA_ID_EIDE_DMA_TIME = 66,
1: -	ATA_ID_EIDE_PIO = 67,
1: -	ATA_ID_EIDE_PIO_IORDY = 68,
1: -	ATA_ID_ADDITIONAL_SUPP = 69,
1: -	ATA_ID_QUEUE_DEPTH = 75,
1: -	ATA_ID_SATA_CAPABILITY = 76,
1: -	ATA_ID_SATA_CAPABILITY_2 = 77,
1: -	ATA_ID_FEATURE_SUPP = 78,
1: -	ATA_ID_MAJOR_VER = 80,
1: -	ATA_ID_COMMAND_SET_1 = 82,
1: -	ATA_ID_COMMAND_SET_2 = 83,
1: -	ATA_ID_CFSSE = 84,
1: -	ATA_ID_CFS_ENABLE_1 = 85,
1: -	ATA_ID_CFS_ENABLE_2 = 86,
1: -	ATA_ID_CSF_DEFAULT = 87,
1: -	ATA_ID_UDMA_MODES = 88,
1: -	ATA_ID_HW_CONFIG = 93,
1: -	ATA_ID_SPG = 98,
1: -	ATA_ID_LBA_CAPACITY_2 = 100,
1: -	ATA_ID_SECTOR_SIZE = 106,
1: -	ATA_ID_WWN = 108,
1: -	ATA_ID_LOGICAL_SECTOR_SIZE = 117,
1: -	ATA_ID_COMMAND_SET_3 = 119,
1: -	ATA_ID_COMMAND_SET_4 = 120,
1: -	ATA_ID_LAST_LUN = 126,
1: -	ATA_ID_DLF = 128,
1: -	ATA_ID_CSFO = 129,
1: -	ATA_ID_CFA_POWER = 160,
1: -	ATA_ID_CFA_KEY_MGMT = 162,
1: -	ATA_ID_CFA_MODES = 163,
1: -	ATA_ID_DATA_SET_MGMT = 169,
1: -	ATA_ID_SCT_CMD_XPORT = 206,
1: -	ATA_ID_ROT_SPEED = 217,
1: -	ATA_ID_PIO4 = 2,
1: -	ATA_ID_SERNO_LEN = 20,
1: -	ATA_ID_FW_REV_LEN = 8,
1: -	ATA_ID_PROD_LEN = 40,
1: -	ATA_ID_WWN_LEN = 8,
1: -	ATA_PCI_CTL_OFS = 2,
1: -	ATA_PIO0 = 1,
1: -	ATA_PIO1 = 3,
1: -	ATA_PIO2 = 7,
1: -	ATA_PIO3 = 15,
1: -	ATA_PIO4 = 31,
1: -	ATA_PIO5 = 63,
1: -	ATA_PIO6 = 127,
1: -	ATA_PIO4_ONLY = 16,
1: -	ATA_SWDMA0 = 1,
1: -	ATA_SWDMA1 = 3,
1: -	ATA_SWDMA2 = 7,
1: -	ATA_SWDMA2_ONLY = 4,
1: -	ATA_MWDMA0 = 1,
1: -	ATA_MWDMA1 = 3,
1: -	ATA_MWDMA2 = 7,
1: -	ATA_MWDMA3 = 15,
1: -	ATA_MWDMA4 = 31,
1: -	ATA_MWDMA12_ONLY = 6,
1: -	ATA_MWDMA2_ONLY = 4,
1: -	ATA_UDMA0 = 1,
1: -	ATA_UDMA1 = 3,
1: -	ATA_UDMA2 = 7,
1: -	ATA_UDMA3 = 15,
1: -	ATA_UDMA4 = 31,
1: -	ATA_UDMA5 = 63,
1: -	ATA_UDMA6 = 127,
1: -	ATA_UDMA7 = 255,
1: -	ATA_UDMA24_ONLY = 20,
1: -	ATA_UDMA_MASK_40C = 7,
1: -	ATA_PRD_SZ = 8,
1: -	ATA_PRD_TBL_SZ = 2048,
1: -	ATA_PRD_EOT = 2147483648,
1: -	ATA_DMA_TABLE_OFS = 4,
1: -	ATA_DMA_STATUS = 2,
1: -	ATA_DMA_CMD = 0,
1: -	ATA_DMA_WR = 8,
1: -	ATA_DMA_START = 1,
1: -	ATA_DMA_INTR = 4,
1: -	ATA_DMA_ERR = 2,
1: -	ATA_DMA_ACTIVE = 1,
1: -	ATA_HOB = 128,
1: -	ATA_NIEN = 2,
1: -	ATA_LBA = 64,
1: -	ATA_DEV1 = 16,
1: -	ATA_DEVICE_OBS = 160,
1: -	ATA_DEVCTL_OBS = 8,
1: -	ATA_BUSY = 128,
1: -	ATA_DRDY = 64,
1: -	ATA_DF = 32,
1: -	ATA_DSC = 16,
1: -	ATA_DRQ = 8,
1: -	ATA_CORR = 4,
1: -	ATA_SENSE = 2,
1: -	ATA_ERR = 1,
1: -	ATA_SRST = 4,
1: -	ATA_ICRC = 128,
1: -	ATA_BBK = 128,
1: -	ATA_UNC = 64,
1: -	ATA_MC = 32,
1: -	ATA_IDNF = 16,
1: -	ATA_MCR = 8,
1: -	ATA_ABORTED = 4,
1: -	ATA_TRK0NF = 2,
1: -	ATA_AMNF = 1,
1: -	ATAPI_LFS = 240,
1: -	ATAPI_EOM = 2,
1: -	ATAPI_ILI = 1,
1: -	ATAPI_IO = 2,
1: -	ATAPI_COD = 1,
1: -	ATA_REG_DATA = 0,
1: -	ATA_REG_ERR = 1,
1: -	ATA_REG_NSECT = 2,
1: -	ATA_REG_LBAL = 3,
1: -	ATA_REG_LBAM = 4,
1: -	ATA_REG_LBAH = 5,
1: -	ATA_REG_DEVICE = 6,
1: -	ATA_REG_STATUS = 7,
1: -	ATA_REG_FEATURE = 1,
1: -	ATA_REG_CMD = 7,
1: -	ATA_REG_BYTEL = 4,
1: -	ATA_REG_BYTEH = 5,
1: -	ATA_REG_DEVSEL = 6,
1: -	ATA_REG_IRQ = 2,
1: -	ATA_CMD_DEV_RESET = 8,
1: -	ATA_CMD_CHK_POWER = 229,
1: -	ATA_CMD_STANDBY = 226,
1: -	ATA_CMD_IDLE = 227,
1: -	ATA_CMD_EDD = 144,
1: -	ATA_CMD_DOWNLOAD_MICRO = 146,
1: -	ATA_CMD_DOWNLOAD_MICRO_DMA = 147,
1: -	ATA_CMD_NOP = 0,
1: -	ATA_CMD_FLUSH = 231,
1: -	ATA_CMD_FLUSH_EXT = 234,
1: -	ATA_CMD_ID_ATA = 236,
1: -	ATA_CMD_ID_ATAPI = 161,
1: -	ATA_CMD_SERVICE = 162,
1: -	ATA_CMD_READ = 200,
1: -	ATA_CMD_READ_EXT = 37,
1: -	ATA_CMD_READ_QUEUED = 38,
1: -	ATA_CMD_READ_STREAM_EXT = 43,
1: -	ATA_CMD_READ_STREAM_DMA_EXT = 42,
1: -	ATA_CMD_WRITE = 202,
1: -	ATA_CMD_WRITE_EXT = 53,
1: -	ATA_CMD_WRITE_QUEUED = 54,
1: -	ATA_CMD_WRITE_STREAM_EXT = 59,
1: -	ATA_CMD_WRITE_STREAM_DMA_EXT = 58,
1: -	ATA_CMD_WRITE_FUA_EXT = 61,
1: -	ATA_CMD_WRITE_QUEUED_FUA_EXT = 62,
1: -	ATA_CMD_FPDMA_READ = 96,
1: -	ATA_CMD_FPDMA_WRITE = 97,
1: -	ATA_CMD_NCQ_NON_DATA = 99,
1: -	ATA_CMD_FPDMA_SEND = 100,
1: -	ATA_CMD_FPDMA_RECV = 101,
1: -	ATA_CMD_PIO_READ = 32,
1: -	ATA_CMD_PIO_READ_EXT = 36,
1: -	ATA_CMD_PIO_WRITE = 48,
1: -	ATA_CMD_PIO_WRITE_EXT = 52,
1: -	ATA_CMD_READ_MULTI = 196,
1: -	ATA_CMD_READ_MULTI_EXT = 41,
1: -	ATA_CMD_WRITE_MULTI = 197,
1: -	ATA_CMD_WRITE_MULTI_EXT = 57,
1: -	ATA_CMD_WRITE_MULTI_FUA_EXT = 206,
1: -	ATA_CMD_SET_FEATURES = 239,
1: -	ATA_CMD_SET_MULTI = 198,
1: -	ATA_CMD_PACKET = 160,
1: -	ATA_CMD_VERIFY = 64,
1: -	ATA_CMD_VERIFY_EXT = 66,
1: -	ATA_CMD_WRITE_UNCORR_EXT = 69,
1: -	ATA_CMD_STANDBYNOW1 = 224,
1: -	ATA_CMD_IDLEIMMEDIATE = 225,
1: -	ATA_CMD_SLEEP = 230,
1: -	ATA_CMD_INIT_DEV_PARAMS = 145,
1: -	ATA_CMD_READ_NATIVE_MAX = 248,
1: -	ATA_CMD_READ_NATIVE_MAX_EXT = 39,
1: -	ATA_CMD_SET_MAX = 249,
1: -	ATA_CMD_SET_MAX_EXT = 55,
1: -	ATA_CMD_READ_LOG_EXT = 47,
1: -	ATA_CMD_WRITE_LOG_EXT = 63,
1: -	ATA_CMD_READ_LOG_DMA_EXT = 71,
1: -	ATA_CMD_WRITE_LOG_DMA_EXT = 87,
1: -	ATA_CMD_TRUSTED_NONDATA = 91,
1: -	ATA_CMD_TRUSTED_RCV = 92,
1: -	ATA_CMD_TRUSTED_RCV_DMA = 93,
1: -	ATA_CMD_TRUSTED_SND = 94,
1: -	ATA_CMD_TRUSTED_SND_DMA = 95,
1: -	ATA_CMD_PMP_READ = 228,
1: -	ATA_CMD_PMP_READ_DMA = 233,
1: -	ATA_CMD_PMP_WRITE = 232,
1: -	ATA_CMD_PMP_WRITE_DMA = 235,
1: -	ATA_CMD_CONF_OVERLAY = 177,
1: -	ATA_CMD_SEC_SET_PASS = 241,
1: -	ATA_CMD_SEC_UNLOCK = 242,
1: -	ATA_CMD_SEC_ERASE_PREP = 243,
1: -	ATA_CMD_SEC_ERASE_UNIT = 244,
1: -	ATA_CMD_SEC_FREEZE_LOCK = 245,
1: -	ATA_CMD_SEC_DISABLE_PASS = 246,
1: -	ATA_CMD_CONFIG_STREAM = 81,
1: -	ATA_CMD_SMART = 176,
1: -	ATA_CMD_MEDIA_LOCK = 222,
1: -	ATA_CMD_MEDIA_UNLOCK = 223,
1: -	ATA_CMD_DSM = 6,
1: -	ATA_CMD_CHK_MED_CRD_TYP = 209,
1: -	ATA_CMD_CFA_REQ_EXT_ERR = 3,
1: -	ATA_CMD_CFA_WRITE_NE = 56,
1: -	ATA_CMD_CFA_TRANS_SECT = 135,
1: -	ATA_CMD_CFA_ERASE = 192,
1: -	ATA_CMD_CFA_WRITE_MULT_NE = 205,
1: -	ATA_CMD_REQ_SENSE_DATA = 11,
1: -	ATA_CMD_SANITIZE_DEVICE = 180,
1: -	ATA_CMD_ZAC_MGMT_IN = 74,
1: -	ATA_CMD_ZAC_MGMT_OUT = 159,
1: -	ATA_CMD_RESTORE = 16,
1: -	ATA_SUBCMD_FPDMA_RECV_RD_LOG_DMA_EXT = 1,
1: -	ATA_SUBCMD_FPDMA_RECV_ZAC_MGMT_IN = 2,
1: -	ATA_SUBCMD_FPDMA_SEND_DSM = 0,
1: -	ATA_SUBCMD_FPDMA_SEND_WR_LOG_DMA_EXT = 2,
1: -	ATA_SUBCMD_NCQ_NON_DATA_ABORT_QUEUE = 0,
1: -	ATA_SUBCMD_NCQ_NON_DATA_SET_FEATURES = 5,
1: -	ATA_SUBCMD_NCQ_NON_DATA_ZERO_EXT = 6,
1: -	ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT = 7,
1: -	ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES = 0,
1: -	ATA_SUBCMD_ZAC_MGMT_OUT_CLOSE_ZONE = 1,
1: -	ATA_SUBCMD_ZAC_MGMT_OUT_FINISH_ZONE = 2,
1: -	ATA_SUBCMD_ZAC_MGMT_OUT_OPEN_ZONE = 3,
1: -	ATA_SUBCMD_ZAC_MGMT_OUT_RESET_WRITE_POINTER = 4,
1: -	ATA_LOG_DIRECTORY = 0,
1: -	ATA_LOG_SATA_NCQ = 16,
1: -	ATA_LOG_NCQ_NON_DATA = 18,
1: -	ATA_LOG_NCQ_SEND_RECV = 19,
1: -	ATA_LOG_IDENTIFY_DEVICE = 48,
1: -	ATA_LOG_SECURITY = 6,
1: -	ATA_LOG_SATA_SETTINGS = 8,
1: -	ATA_LOG_ZONED_INFORMATION = 9,
1: -	ATA_LOG_DEVSLP_OFFSET = 48,
1: -	ATA_LOG_DEVSLP_SIZE = 8,
1: -	ATA_LOG_DEVSLP_MDAT = 0,
1: -	ATA_LOG_DEVSLP_MDAT_MASK = 31,
1: -	ATA_LOG_DEVSLP_DETO = 1,
1: -	ATA_LOG_DEVSLP_VALID = 7,
1: -	ATA_LOG_DEVSLP_VALID_MASK = 128,
1: -	ATA_LOG_NCQ_PRIO_OFFSET = 9,
1: -	ATA_LOG_NCQ_SEND_RECV_SUBCMDS_OFFSET = 0,
1: -	ATA_LOG_NCQ_SEND_RECV_SUBCMDS_DSM = 1,
1: -	ATA_LOG_NCQ_SEND_RECV_DSM_OFFSET = 4,
1: -	ATA_LOG_NCQ_SEND_RECV_DSM_TRIM = 1,
1: -	ATA_LOG_NCQ_SEND_RECV_RD_LOG_OFFSET = 8,
1: -	ATA_LOG_NCQ_SEND_RECV_RD_LOG_SUPPORTED = 1,
1: -	ATA_LOG_NCQ_SEND_RECV_WR_LOG_OFFSET = 12,
1: -	ATA_LOG_NCQ_SEND_RECV_WR_LOG_SUPPORTED = 1,
1: -	ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_OFFSET = 16,
1: -	ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_OUT_SUPPORTED = 1,
1: -	ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_IN_SUPPORTED = 2,
1: -	ATA_LOG_NCQ_SEND_RECV_SIZE = 20,
1: -	ATA_LOG_NCQ_NON_DATA_SUBCMDS_OFFSET = 0,
1: -	ATA_LOG_NCQ_NON_DATA_ABORT_OFFSET = 0,
1: -	ATA_LOG_NCQ_NON_DATA_ABORT_NCQ = 1,
1: -	ATA_LOG_NCQ_NON_DATA_ABORT_ALL = 2,
1: -	ATA_LOG_NCQ_NON_DATA_ABORT_STREAMING = 4,
1: -	ATA_LOG_NCQ_NON_DATA_ABORT_NON_STREAMING = 8,
1: -	ATA_LOG_NCQ_NON_DATA_ABORT_SELECTED = 16,
1: -	ATA_LOG_NCQ_NON_DATA_ZAC_MGMT_OFFSET = 28,
1: -	ATA_LOG_NCQ_NON_DATA_ZAC_MGMT_OUT = 1,
1: -	ATA_LOG_NCQ_NON_DATA_SIZE = 64,
1: -	ATA_CMD_READ_LONG = 34,
1: -	ATA_CMD_READ_LONG_ONCE = 35,
1: -	ATA_CMD_WRITE_LONG = 50,
1: -	ATA_CMD_WRITE_LONG_ONCE = 51,
1: -	SETFEATURES_XFER = 3,
1: -	XFER_UDMA_7 = 71,
1: -	XFER_UDMA_6 = 70,
1: -	XFER_UDMA_5 = 69,
1: -	XFER_UDMA_4 = 68,
1: -	XFER_UDMA_3 = 67,
1: -	XFER_UDMA_2 = 66,
1: -	XFER_UDMA_1 = 65,
1: -	XFER_UDMA_0 = 64,
1: -	XFER_MW_DMA_4 = 36,
1: -	XFER_MW_DMA_3 = 35,
1: -	XFER_MW_DMA_2 = 34,
1: -	XFER_MW_DMA_1 = 33,
1: -	XFER_MW_DMA_0 = 32,
1: -	XFER_SW_DMA_2 = 18,
1: -	XFER_SW_DMA_1 = 17,
1: -	XFER_SW_DMA_0 = 16,
1: -	XFER_PIO_6 = 14,
1: -	XFER_PIO_5 = 13,
1: -	XFER_PIO_4 = 12,
1: -	XFER_PIO_3 = 11,
1: -	XFER_PIO_2 = 10,
1: -	XFER_PIO_1 = 9,
1: -	XFER_PIO_0 = 8,
1: -	XFER_PIO_SLOW = 0,
1: -	SETFEATURES_WC_ON = 2,
1: -	SETFEATURES_WC_OFF = 130,
1: -	SETFEATURES_RA_ON = 170,
1: -	SETFEATURES_RA_OFF = 85,
1: -	SETFEATURES_AAM_ON = 66,
1: -	SETFEATURES_AAM_OFF = 194,
1: -	SETFEATURES_SPINUP = 7,
1: -	SETFEATURES_SPINUP_TIMEOUT = 30000,
1: -	SETFEATURES_SATA_ENABLE = 16,
1: -	SETFEATURES_SATA_DISABLE = 144,
1: -	SATA_FPDMA_OFFSET = 1,
1: -	SATA_FPDMA_AA = 2,
1: -	SATA_DIPM = 3,
1: -	SATA_FPDMA_IN_ORDER = 4,
1: -	SATA_AN = 5,
1: -	SATA_SSP = 6,
1: -	SATA_DEVSLP = 9,
1: -	SETFEATURE_SENSE_DATA = 195,
1: -	ATA_SET_MAX_ADDR = 0,
1: -	ATA_SET_MAX_PASSWD = 1,
1: -	ATA_SET_MAX_LOCK = 2,
1: -	ATA_SET_MAX_UNLOCK = 3,
1: -	ATA_SET_MAX_FREEZE_LOCK = 4,
1: -	ATA_SET_MAX_PASSWD_DMA = 5,
1: -	ATA_SET_MAX_UNLOCK_DMA = 6,
1: -	ATA_DCO_RESTORE = 192,
1: -	ATA_DCO_FREEZE_LOCK = 193,
1: -	ATA_DCO_IDENTIFY = 194,
1: -	ATA_DCO_SET = 195,
1: -	ATA_SMART_ENABLE = 216,
1: -	ATA_SMART_READ_VALUES = 208,
1: -	ATA_SMART_READ_THRESHOLDS = 209,
1: -	ATA_DSM_TRIM = 1,
1: -	ATA_SMART_LBAM_PASS = 79,
1: -	ATA_SMART_LBAH_PASS = 194,
1: -	ATAPI_PKT_DMA = 1,
1: -	ATAPI_DMADIR = 4,
1: -	ATAPI_CDB_LEN = 16,
1: -	SATA_PMP_MAX_PORTS = 15,
1: -	SATA_PMP_CTRL_PORT = 15,
1: -	SATA_PMP_GSCR_DWORDS = 128,
1: -	SATA_PMP_GSCR_PROD_ID = 0,
1: -	SATA_PMP_GSCR_REV = 1,
1: -	SATA_PMP_GSCR_PORT_INFO = 2,
1: -	SATA_PMP_GSCR_ERROR = 32,
1: -	SATA_PMP_GSCR_ERROR_EN = 33,
1: -	SATA_PMP_GSCR_FEAT = 64,
1: -	SATA_PMP_GSCR_FEAT_EN = 96,
1: -	SATA_PMP_PSCR_STATUS = 0,
1: -	SATA_PMP_PSCR_ERROR = 1,
1: -	SATA_PMP_PSCR_CONTROL = 2,
1: -	SATA_PMP_FEAT_BIST = 1,
1: -	SATA_PMP_FEAT_PMREQ = 2,
1: -	SATA_PMP_FEAT_DYNSSC = 4,
1: -	SATA_PMP_FEAT_NOTIFY = 8,
1: -	ATA_CBL_NONE = 0,
1: -	ATA_CBL_PATA40 = 1,
1: -	ATA_CBL_PATA80 = 2,
1: -	ATA_CBL_PATA40_SHORT = 3,
1: -	ATA_CBL_PATA_UNK = 4,
1: -	ATA_CBL_PATA_IGN = 5,
1: -	ATA_CBL_SATA = 6,
1: -	SCR_STATUS = 0,
1: -	SCR_ERROR = 1,
1: -	SCR_CONTROL = 2,
1: -	SCR_ACTIVE = 3,
1: -	SCR_NOTIFICATION = 4,
1: -	SERR_DATA_RECOVERED = 1,
1: -	SERR_COMM_RECOVERED = 2,
1: -	SERR_DATA = 256,
1: -	SERR_PERSISTENT = 512,
1: -	SERR_PROTOCOL = 1024,
1: -	SERR_INTERNAL = 2048,
1: -	SERR_PHYRDY_CHG = 65536,
1: -	SERR_PHY_INT_ERR = 131072,
1: -	SERR_COMM_WAKE = 262144,
1: -	SERR_10B_8B_ERR = 524288,
1: -	SERR_DISPARITY = 1048576,
1: -	SERR_CRC = 2097152,
1: -	SERR_HANDSHAKE = 4194304,
1: -	SERR_LINK_SEQ_ERR = 8388608,
1: -	SERR_TRANS_ST_ERROR = 16777216,
1: -	SERR_UNRECOG_FIS = 33554432,
1: -	SERR_DEV_XCHG = 67108864,
1: +  char name[32];
1: +  __s32 status;
1: +  __u32 flags;
1: +  __u32 num_fences;
1: +  __u32 pad;
1: +  __u64 sync_fence_info;
1: +};
1: +
1: +enum {
1: +  ATA_MAX_DEVICES = 2,
1: +  ATA_MAX_PRD = 256,
1: +  ATA_SECT_SIZE = 512,
1: +  ATA_MAX_SECTORS_128 = 128,
1: +  ATA_MAX_SECTORS = 256,
1: +  ATA_MAX_SECTORS_1024 = 1024,
1: +  ATA_MAX_SECTORS_LBA48 = 65535,
1: +  ATA_MAX_SECTORS_TAPE = 65535,
1: +  ATA_MAX_TRIM_RNUM = 64,
1: +  ATA_ID_WORDS = 256,
1: +  ATA_ID_CONFIG = 0,
1: +  ATA_ID_CYLS = 1,
1: +  ATA_ID_HEADS = 3,
1: +  ATA_ID_SECTORS = 6,
1: +  ATA_ID_SERNO = 10,
1: +  ATA_ID_BUF_SIZE = 21,
1: +  ATA_ID_FW_REV = 23,
1: +  ATA_ID_PROD = 27,
1: +  ATA_ID_MAX_MULTSECT = 47,
1: +  ATA_ID_DWORD_IO = 48,
1: +  ATA_ID_TRUSTED = 48,
1: +  ATA_ID_CAPABILITY = 49,
1: +  ATA_ID_OLD_PIO_MODES = 51,
1: +  ATA_ID_OLD_DMA_MODES = 52,
1: +  ATA_ID_FIELD_VALID = 53,
1: +  ATA_ID_CUR_CYLS = 54,
1: +  ATA_ID_CUR_HEADS = 55,
1: +  ATA_ID_CUR_SECTORS = 56,
1: +  ATA_ID_MULTSECT = 59,
1: +  ATA_ID_LBA_CAPACITY = 60,
1: +  ATA_ID_SWDMA_MODES = 62,
1: +  ATA_ID_MWDMA_MODES = 63,
1: +  ATA_ID_PIO_MODES = 64,
1: +  ATA_ID_EIDE_DMA_MIN = 65,
1: +  ATA_ID_EIDE_DMA_TIME = 66,
1: +  ATA_ID_EIDE_PIO = 67,
1: +  ATA_ID_EIDE_PIO_IORDY = 68,
1: +  ATA_ID_ADDITIONAL_SUPP = 69,
1: +  ATA_ID_QUEUE_DEPTH = 75,
1: +  ATA_ID_SATA_CAPABILITY = 76,
1: +  ATA_ID_SATA_CAPABILITY_2 = 77,
1: +  ATA_ID_FEATURE_SUPP = 78,
1: +  ATA_ID_MAJOR_VER = 80,
1: +  ATA_ID_COMMAND_SET_1 = 82,
1: +  ATA_ID_COMMAND_SET_2 = 83,
1: +  ATA_ID_CFSSE = 84,
1: +  ATA_ID_CFS_ENABLE_1 = 85,
1: +  ATA_ID_CFS_ENABLE_2 = 86,
1: +  ATA_ID_CSF_DEFAULT = 87,
1: +  ATA_ID_UDMA_MODES = 88,
1: +  ATA_ID_HW_CONFIG = 93,
1: +  ATA_ID_SPG = 98,
1: +  ATA_ID_LBA_CAPACITY_2 = 100,
1: +  ATA_ID_SECTOR_SIZE = 106,
1: +  ATA_ID_WWN = 108,
1: +  ATA_ID_LOGICAL_SECTOR_SIZE = 117,
1: +  ATA_ID_COMMAND_SET_3 = 119,
1: +  ATA_ID_COMMAND_SET_4 = 120,
1: +  ATA_ID_LAST_LUN = 126,
1: +  ATA_ID_DLF = 128,
1: +  ATA_ID_CSFO = 129,
1: +  ATA_ID_CFA_POWER = 160,
1: +  ATA_ID_CFA_KEY_MGMT = 162,
1: +  ATA_ID_CFA_MODES = 163,
1: +  ATA_ID_DATA_SET_MGMT = 169,
1: +  ATA_ID_SCT_CMD_XPORT = 206,
1: +  ATA_ID_ROT_SPEED = 217,
1: +  ATA_ID_PIO4 = 2,
1: +  ATA_ID_SERNO_LEN = 20,
1: +  ATA_ID_FW_REV_LEN = 8,
1: +  ATA_ID_PROD_LEN = 40,
1: +  ATA_ID_WWN_LEN = 8,
1: +  ATA_PCI_CTL_OFS = 2,
1: +  ATA_PIO0 = 1,
1: +  ATA_PIO1 = 3,
1: +  ATA_PIO2 = 7,
1: +  ATA_PIO3 = 15,
1: +  ATA_PIO4 = 31,
1: +  ATA_PIO5 = 63,
1: +  ATA_PIO6 = 127,
1: +  ATA_PIO4_ONLY = 16,
1: +  ATA_SWDMA0 = 1,
1: +  ATA_SWDMA1 = 3,
1: +  ATA_SWDMA2 = 7,
1: +  ATA_SWDMA2_ONLY = 4,
1: +  ATA_MWDMA0 = 1,
1: +  ATA_MWDMA1 = 3,
1: +  ATA_MWDMA2 = 7,
1: +  ATA_MWDMA3 = 15,
1: +  ATA_MWDMA4 = 31,
1: +  ATA_MWDMA12_ONLY = 6,
1: +  ATA_MWDMA2_ONLY = 4,
1: +  ATA_UDMA0 = 1,
1: +  ATA_UDMA1 = 3,
1: +  ATA_UDMA2 = 7,
1: +  ATA_UDMA3 = 15,
1: +  ATA_UDMA4 = 31,
1: +  ATA_UDMA5 = 63,
1: +  ATA_UDMA6 = 127,
1: +  ATA_UDMA7 = 255,
1: +  ATA_UDMA24_ONLY = 20,
1: +  ATA_UDMA_MASK_40C = 7,
1: +  ATA_PRD_SZ = 8,
1: +  ATA_PRD_TBL_SZ = 2048,
1: +  ATA_PRD_EOT = 2147483648,
1: +  ATA_DMA_TABLE_OFS = 4,
1: +  ATA_DMA_STATUS = 2,
1: +  ATA_DMA_CMD = 0,
1: +  ATA_DMA_WR = 8,
1: +  ATA_DMA_START = 1,
1: +  ATA_DMA_INTR = 4,
1: +  ATA_DMA_ERR = 2,
1: +  ATA_DMA_ACTIVE = 1,
1: +  ATA_HOB = 128,
1: +  ATA_NIEN = 2,
1: +  ATA_LBA = 64,
1: +  ATA_DEV1 = 16,
1: +  ATA_DEVICE_OBS = 160,
1: +  ATA_DEVCTL_OBS = 8,
1: +  ATA_BUSY = 128,
1: +  ATA_DRDY = 64,
1: +  ATA_DF = 32,
1: +  ATA_DSC = 16,
1: +  ATA_DRQ = 8,
1: +  ATA_CORR = 4,
1: +  ATA_SENSE = 2,
1: +  ATA_ERR = 1,
1: +  ATA_SRST = 4,
1: +  ATA_ICRC = 128,
1: +  ATA_BBK = 128,
1: +  ATA_UNC = 64,
1: +  ATA_MC = 32,
1: +  ATA_IDNF = 16,
1: +  ATA_MCR = 8,
1: +  ATA_ABORTED = 4,
1: +  ATA_TRK0NF = 2,
1: +  ATA_AMNF = 1,
1: +  ATAPI_LFS = 240,
1: +  ATAPI_EOM = 2,
1: +  ATAPI_ILI = 1,
1: +  ATAPI_IO = 2,
1: +  ATAPI_COD = 1,
1: +  ATA_REG_DATA = 0,
1: +  ATA_REG_ERR = 1,
1: +  ATA_REG_NSECT = 2,
1: +  ATA_REG_LBAL = 3,
1: +  ATA_REG_LBAM = 4,
1: +  ATA_REG_LBAH = 5,
1: +  ATA_REG_DEVICE = 6,
1: +  ATA_REG_STATUS = 7,
1: +  ATA_REG_FEATURE = 1,
1: +  ATA_REG_CMD = 7,
1: +  ATA_REG_BYTEL = 4,
1: +  ATA_REG_BYTEH = 5,
1: +  ATA_REG_DEVSEL = 6,
1: +  ATA_REG_IRQ = 2,
1: +  ATA_CMD_DEV_RESET = 8,
1: +  ATA_CMD_CHK_POWER = 229,
1: +  ATA_CMD_STANDBY = 226,
1: +  ATA_CMD_IDLE = 227,
1: +  ATA_CMD_EDD = 144,
1: +  ATA_CMD_DOWNLOAD_MICRO = 146,
1: +  ATA_CMD_DOWNLOAD_MICRO_DMA = 147,
1: +  ATA_CMD_NOP = 0,
1: +  ATA_CMD_FLUSH = 231,
1: +  ATA_CMD_FLUSH_EXT = 234,
1: +  ATA_CMD_ID_ATA = 236,
1: +  ATA_CMD_ID_ATAPI = 161,
1: +  ATA_CMD_SERVICE = 162,
1: +  ATA_CMD_READ = 200,
1: +  ATA_CMD_READ_EXT = 37,
1: +  ATA_CMD_READ_QUEUED = 38,
1: +  ATA_CMD_READ_STREAM_EXT = 43,
1: +  ATA_CMD_READ_STREAM_DMA_EXT = 42,
1: +  ATA_CMD_WRITE = 202,
1: +  ATA_CMD_WRITE_EXT = 53,
1: +  ATA_CMD_WRITE_QUEUED = 54,
1: +  ATA_CMD_WRITE_STREAM_EXT = 59,
1: +  ATA_CMD_WRITE_STREAM_DMA_EXT = 58,
1: +  ATA_CMD_WRITE_FUA_EXT = 61,
1: +  ATA_CMD_WRITE_QUEUED_FUA_EXT = 62,
1: +  ATA_CMD_FPDMA_READ = 96,
1: +  ATA_CMD_FPDMA_WRITE = 97,
1: +  ATA_CMD_NCQ_NON_DATA = 99,
1: +  ATA_CMD_FPDMA_SEND = 100,
1: +  ATA_CMD_FPDMA_RECV = 101,
1: +  ATA_CMD_PIO_READ = 32,
1: +  ATA_CMD_PIO_READ_EXT = 36,
1: +  ATA_CMD_PIO_WRITE = 48,
1: +  ATA_CMD_PIO_WRITE_EXT = 52,
1: +  ATA_CMD_READ_MULTI = 196,
1: +  ATA_CMD_READ_MULTI_EXT = 41,
1: +  ATA_CMD_WRITE_MULTI = 197,
1: +  ATA_CMD_WRITE_MULTI_EXT = 57,
1: +  ATA_CMD_WRITE_MULTI_FUA_EXT = 206,
1: +  ATA_CMD_SET_FEATURES = 239,
1: +  ATA_CMD_SET_MULTI = 198,
1: +  ATA_CMD_PACKET = 160,
1: +  ATA_CMD_VERIFY = 64,
1: +  ATA_CMD_VERIFY_EXT = 66,
1: +  ATA_CMD_WRITE_UNCORR_EXT = 69,
1: +  ATA_CMD_STANDBYNOW1 = 224,
1: +  ATA_CMD_IDLEIMMEDIATE = 225,
1: +  ATA_CMD_SLEEP = 230,
1: +  ATA_CMD_INIT_DEV_PARAMS = 145,
1: +  ATA_CMD_READ_NATIVE_MAX = 248,
1: +  ATA_CMD_READ_NATIVE_MAX_EXT = 39,
1: +  ATA_CMD_SET_MAX = 249,
1: +  ATA_CMD_SET_MAX_EXT = 55,
1: +  ATA_CMD_READ_LOG_EXT = 47,
1: +  ATA_CMD_WRITE_LOG_EXT = 63,
1: +  ATA_CMD_READ_LOG_DMA_EXT = 71,
1: +  ATA_CMD_WRITE_LOG_DMA_EXT = 87,
1: +  ATA_CMD_TRUSTED_NONDATA = 91,
1: +  ATA_CMD_TRUSTED_RCV = 92,
1: +  ATA_CMD_TRUSTED_RCV_DMA = 93,
1: +  ATA_CMD_TRUSTED_SND = 94,
1: +  ATA_CMD_TRUSTED_SND_DMA = 95,
1: +  ATA_CMD_PMP_READ = 228,
1: +  ATA_CMD_PMP_READ_DMA = 233,
1: +  ATA_CMD_PMP_WRITE = 232,
1: +  ATA_CMD_PMP_WRITE_DMA = 235,
1: +  ATA_CMD_CONF_OVERLAY = 177,
1: +  ATA_CMD_SEC_SET_PASS = 241,
1: +  ATA_CMD_SEC_UNLOCK = 242,
1: +  ATA_CMD_SEC_ERASE_PREP = 243,
1: +  ATA_CMD_SEC_ERASE_UNIT = 244,
1: +  ATA_CMD_SEC_FREEZE_LOCK = 245,
1: +  ATA_CMD_SEC_DISABLE_PASS = 246,
1: +  ATA_CMD_CONFIG_STREAM = 81,
1: +  ATA_CMD_SMART = 176,
1: +  ATA_CMD_MEDIA_LOCK = 222,
1: +  ATA_CMD_MEDIA_UNLOCK = 223,
1: +  ATA_CMD_DSM = 6,
1: +  ATA_CMD_CHK_MED_CRD_TYP = 209,
1: +  ATA_CMD_CFA_REQ_EXT_ERR = 3,
1: +  ATA_CMD_CFA_WRITE_NE = 56,
1: +  ATA_CMD_CFA_TRANS_SECT = 135,
1: +  ATA_CMD_CFA_ERASE = 192,
1: +  ATA_CMD_CFA_WRITE_MULT_NE = 205,
1: +  ATA_CMD_REQ_SENSE_DATA = 11,
1: +  ATA_CMD_SANITIZE_DEVICE = 180,
1: +  ATA_CMD_ZAC_MGMT_IN = 74,
1: +  ATA_CMD_ZAC_MGMT_OUT = 159,
1: +  ATA_CMD_RESTORE = 16,
1: +  ATA_SUBCMD_FPDMA_RECV_RD_LOG_DMA_EXT = 1,
1: +  ATA_SUBCMD_FPDMA_RECV_ZAC_MGMT_IN = 2,
1: +  ATA_SUBCMD_FPDMA_SEND_DSM = 0,
1: +  ATA_SUBCMD_FPDMA_SEND_WR_LOG_DMA_EXT = 2,
1: +  ATA_SUBCMD_NCQ_NON_DATA_ABORT_QUEUE = 0,
1: +  ATA_SUBCMD_NCQ_NON_DATA_SET_FEATURES = 5,
1: +  ATA_SUBCMD_NCQ_NON_DATA_ZERO_EXT = 6,
1: +  ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT = 7,
1: +  ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES = 0,
1: +  ATA_SUBCMD_ZAC_MGMT_OUT_CLOSE_ZONE = 1,
1: +  ATA_SUBCMD_ZAC_MGMT_OUT_FINISH_ZONE = 2,
1: +  ATA_SUBCMD_ZAC_MGMT_OUT_OPEN_ZONE = 3,
1: +  ATA_SUBCMD_ZAC_MGMT_OUT_RESET_WRITE_POINTER = 4,
1: +  ATA_LOG_DIRECTORY = 0,
1: +  ATA_LOG_SATA_NCQ = 16,
1: +  ATA_LOG_NCQ_NON_DATA = 18,
1: +  ATA_LOG_NCQ_SEND_RECV = 19,
1: +  ATA_LOG_IDENTIFY_DEVICE = 48,
1: +  ATA_LOG_SECURITY = 6,
1: +  ATA_LOG_SATA_SETTINGS = 8,
1: +  ATA_LOG_ZONED_INFORMATION = 9,
1: +  ATA_LOG_DEVSLP_OFFSET = 48,
1: +  ATA_LOG_DEVSLP_SIZE = 8,
1: +  ATA_LOG_DEVSLP_MDAT = 0,
1: +  ATA_LOG_DEVSLP_MDAT_MASK = 31,
1: +  ATA_LOG_DEVSLP_DETO = 1,
1: +  ATA_LOG_DEVSLP_VALID = 7,
1: +  ATA_LOG_DEVSLP_VALID_MASK = 128,
1: +  ATA_LOG_NCQ_PRIO_OFFSET = 9,
1: +  ATA_LOG_NCQ_SEND_RECV_SUBCMDS_OFFSET = 0,
1: +  ATA_LOG_NCQ_SEND_RECV_SUBCMDS_DSM = 1,
1: +  ATA_LOG_NCQ_SEND_RECV_DSM_OFFSET = 4,
1: +  ATA_LOG_NCQ_SEND_RECV_DSM_TRIM = 1,
1: +  ATA_LOG_NCQ_SEND_RECV_RD_LOG_OFFSET = 8,
1: +  ATA_LOG_NCQ_SEND_RECV_RD_LOG_SUPPORTED = 1,
1: +  ATA_LOG_NCQ_SEND_RECV_WR_LOG_OFFSET = 12,
1: +  ATA_LOG_NCQ_SEND_RECV_WR_LOG_SUPPORTED = 1,
1: +  ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_OFFSET = 16,
1: +  ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_OUT_SUPPORTED = 1,
1: +  ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_IN_SUPPORTED = 2,
1: +  ATA_LOG_NCQ_SEND_RECV_SIZE = 20,
1: +  ATA_LOG_NCQ_NON_DATA_SUBCMDS_OFFSET = 0,
1: +  ATA_LOG_NCQ_NON_DATA_ABORT_OFFSET = 0,
1: +  ATA_LOG_NCQ_NON_DATA_ABORT_NCQ = 1,
1: +  ATA_LOG_NCQ_NON_DATA_ABORT_ALL = 2,
1: +  ATA_LOG_NCQ_NON_DATA_ABORT_STREAMING = 4,
1: +  ATA_LOG_NCQ_NON_DATA_ABORT_NON_STREAMING = 8,
1: +  ATA_LOG_NCQ_NON_DATA_ABORT_SELECTED = 16,
1: +  ATA_LOG_NCQ_NON_DATA_ZAC_MGMT_OFFSET = 28,
1: +  ATA_LOG_NCQ_NON_DATA_ZAC_MGMT_OUT = 1,
1: +  ATA_LOG_NCQ_NON_DATA_SIZE = 64,
1: +  ATA_CMD_READ_LONG = 34,
1: +  ATA_CMD_READ_LONG_ONCE = 35,
1: +  ATA_CMD_WRITE_LONG = 50,
1: +  ATA_CMD_WRITE_LONG_ONCE = 51,
1: +  SETFEATURES_XFER = 3,
1: +  XFER_UDMA_7 = 71,
1: +  XFER_UDMA_6 = 70,
1: +  XFER_UDMA_5 = 69,
1: +  XFER_UDMA_4 = 68,
1: +  XFER_UDMA_3 = 67,
1: +  XFER_UDMA_2 = 66,
1: +  XFER_UDMA_1 = 65,
1: +  XFER_UDMA_0 = 64,
1: +  XFER_MW_DMA_4 = 36,
1: +  XFER_MW_DMA_3 = 35,
1: +  XFER_MW_DMA_2 = 34,
1: +  XFER_MW_DMA_1 = 33,
1: +  XFER_MW_DMA_0 = 32,
1: +  XFER_SW_DMA_2 = 18,
1: +  XFER_SW_DMA_1 = 17,
1: +  XFER_SW_DMA_0 = 16,
1: +  XFER_PIO_6 = 14,
1: +  XFER_PIO_5 = 13,
1: +  XFER_PIO_4 = 12,
1: +  XFER_PIO_3 = 11,
1: +  XFER_PIO_2 = 10,
1: +  XFER_PIO_1 = 9,
1: +  XFER_PIO_0 = 8,
1: +  XFER_PIO_SLOW = 0,
1: +  SETFEATURES_WC_ON = 2,
1: +  SETFEATURES_WC_OFF = 130,
1: +  SETFEATURES_RA_ON = 170,
1: +  SETFEATURES_RA_OFF = 85,
1: +  SETFEATURES_AAM_ON = 66,
1: +  SETFEATURES_AAM_OFF = 194,
1: +  SETFEATURES_SPINUP = 7,
1: +  SETFEATURES_SPINUP_TIMEOUT = 30000,
1: +  SETFEATURES_SATA_ENABLE = 16,
1: +  SETFEATURES_SATA_DISABLE = 144,
1: +  SATA_FPDMA_OFFSET = 1,
1: +  SATA_FPDMA_AA = 2,
1: +  SATA_DIPM = 3,
1: +  SATA_FPDMA_IN_ORDER = 4,
1: +  SATA_AN = 5,
1: +  SATA_SSP = 6,
1: +  SATA_DEVSLP = 9,
1: +  SETFEATURE_SENSE_DATA = 195,
1: +  ATA_SET_MAX_ADDR = 0,
1: +  ATA_SET_MAX_PASSWD = 1,
1: +  ATA_SET_MAX_LOCK = 2,
1: +  ATA_SET_MAX_UNLOCK = 3,
1: +  ATA_SET_MAX_FREEZE_LOCK = 4,
1: +  ATA_SET_MAX_PASSWD_DMA = 5,
1: +  ATA_SET_MAX_UNLOCK_DMA = 6,
1: +  ATA_DCO_RESTORE = 192,
1: +  ATA_DCO_FREEZE_LOCK = 193,
1: +  ATA_DCO_IDENTIFY = 194,
1: +  ATA_DCO_SET = 195,
1: +  ATA_SMART_ENABLE = 216,
1: +  ATA_SMART_READ_VALUES = 208,
1: +  ATA_SMART_READ_THRESHOLDS = 209,
1: +  ATA_DSM_TRIM = 1,
1: +  ATA_SMART_LBAM_PASS = 79,
1: +  ATA_SMART_LBAH_PASS = 194,
1: +  ATAPI_PKT_DMA = 1,
1: +  ATAPI_DMADIR = 4,
1: +  ATAPI_CDB_LEN = 16,
1: +  SATA_PMP_MAX_PORTS = 15,
1: +  SATA_PMP_CTRL_PORT = 15,
1: +  SATA_PMP_GSCR_DWORDS = 128,
1: +  SATA_PMP_GSCR_PROD_ID = 0,
1: +  SATA_PMP_GSCR_REV = 1,
1: +  SATA_PMP_GSCR_PORT_INFO = 2,
1: +  SATA_PMP_GSCR_ERROR = 32,
1: +  SATA_PMP_GSCR_ERROR_EN = 33,
1: +  SATA_PMP_GSCR_FEAT = 64,
1: +  SATA_PMP_GSCR_FEAT_EN = 96,
1: +  SATA_PMP_PSCR_STATUS = 0,
1: +  SATA_PMP_PSCR_ERROR = 1,
1: +  SATA_PMP_PSCR_CONTROL = 2,
1: +  SATA_PMP_FEAT_BIST = 1,
1: +  SATA_PMP_FEAT_PMREQ = 2,
1: +  SATA_PMP_FEAT_DYNSSC = 4,
1: +  SATA_PMP_FEAT_NOTIFY = 8,
1: +  ATA_CBL_NONE = 0,
1: +  ATA_CBL_PATA40 = 1,
1: +  ATA_CBL_PATA80 = 2,
1: +  ATA_CBL_PATA40_SHORT = 3,
1: +  ATA_CBL_PATA_UNK = 4,
1: +  ATA_CBL_PATA_IGN = 5,
1: +  ATA_CBL_SATA = 6,
1: +  SCR_STATUS = 0,
1: +  SCR_ERROR = 1,
1: +  SCR_CONTROL = 2,
1: +  SCR_ACTIVE = 3,
1: +  SCR_NOTIFICATION = 4,
1: +  SERR_DATA_RECOVERED = 1,
1: +  SERR_COMM_RECOVERED = 2,
1: +  SERR_DATA = 256,
1: +  SERR_PERSISTENT = 512,
1: +  SERR_PROTOCOL = 1024,
1: +  SERR_INTERNAL = 2048,
1: +  SERR_PHYRDY_CHG = 65536,
1: +  SERR_PHY_INT_ERR = 131072,
1: +  SERR_COMM_WAKE = 262144,
1: +  SERR_10B_8B_ERR = 524288,
1: +  SERR_DISPARITY = 1048576,
1: +  SERR_CRC = 2097152,
1: +  SERR_HANDSHAKE = 4194304,
1: +  SERR_LINK_SEQ_ERR = 8388608,
1: +  SERR_TRANS_ST_ERROR = 16777216,
1: +  SERR_UNRECOG_FIS = 33554432,
1: +  SERR_DEV_XCHG = 67108864,
1:  };
1:  
1:  struct ide_io_ports {
1: -	long unsigned int data_addr;
1: -	union {
1: -		long unsigned int error_addr;
1: -		long unsigned int feature_addr;
1: -	};
1: -	long unsigned int nsect_addr;
1: -	long unsigned int lbal_addr;
1: -	long unsigned int lbam_addr;
1: -	long unsigned int lbah_addr;
1: -	long unsigned int device_addr;
1: -	union {
1: -		long unsigned int status_addr;
1: -		long unsigned int command_addr;
1: -	};
1: -	long unsigned int ctl_addr;
1: -	long unsigned int irq_addr;
1: +  long unsigned int data_addr;
1: +  union {
1: +    long unsigned int error_addr;
1: +    long unsigned int feature_addr;
1: +  };
1: +  long unsigned int nsect_addr;
1: +  long unsigned int lbal_addr;
1: +  long unsigned int lbam_addr;
1: +  long unsigned int lbah_addr;
1: +  long unsigned int device_addr;
1: +  union {
1: +    long unsigned int status_addr;
1: +    long unsigned int command_addr;
1: +  };
1: +  long unsigned int ctl_addr;
1: +  long unsigned int irq_addr;
1:  };
1:  
1:  typedef u8 hwif_chipset_t;
1:  
1:  typedef enum {
1: -	ide_stopped = 0,
1: -	ide_started = 1,
1: +  ide_stopped = 0,
1: +  ide_started = 1,
1:  } ide_startstop_t;
1:  
1:  struct ide_taskfile {
1: -	u8 data;
1: -	union {
1: -		u8 error;
1: -		u8 feature;
1: -	};
1: -	u8 nsect;
1: -	u8 lbal;
1: -	u8 lbam;
1: -	u8 lbah;
1: -	u8 device;
1: -	union {
1: -		u8 status;
1: -		u8 command;
1: -	};
1: +  u8 data;
1: +  union {
1: +    u8 error;
1: +    u8 feature;
1: +  };
1: +  u8 nsect;
1: +  u8 lbal;
1: +  u8 lbam;
1: +  u8 lbah;
1: +  u8 device;
1: +  union {
1: +    u8 status;
1: +    u8 command;
1: +  };
1:  };
1:  
1:  struct ide_cmd {
1: -	struct ide_taskfile tf;
1: -	struct ide_taskfile hob;
1: -	struct {
1: -		struct {
1: -			u8 tf;
1: -			u8 hob;
1: -		} out;
1: -		struct {
1: -			u8 tf;
1: -			u8 hob;
1: -		} in;
1: -	} valid;
1: -	u16 tf_flags;
1: -	u8 ftf_flags;
1: -	int protocol;
1: -	int sg_nents;
1: -	int orig_sg_nents;
1: -	int sg_dma_direction;
1: -	unsigned int nbytes;
1: -	unsigned int nleft;
1: -	unsigned int last_xfer_len;
1: -	struct scatterlist *cursg;
1: -	unsigned int cursg_ofs;
1: -	struct request *rq;
1: +  struct ide_taskfile tf;
1: +  struct ide_taskfile hob;
1: +  struct {
1: +    struct {
1: +      u8 tf;
1: +      u8 hob;
1: +    } out;
1: +    struct {
1: +      u8 tf;
1: +      u8 hob;
1: +    } in;
1: +  } valid;
1: +  u16 tf_flags;
1: +  u8 ftf_flags;
1: +  int protocol;
1: +  int sg_nents;
1: +  int orig_sg_nents;
1: +  int sg_dma_direction;
1: +  unsigned int nbytes;
1: +  unsigned int nleft;
1: +  unsigned int last_xfer_len;
1: +  struct scatterlist *cursg;
1: +  unsigned int cursg_ofs;
1: +  struct request *rq;
1:  };
1:  
1:  struct ide_atapi_pc {
1: -	u8 c[12];
1: -	int retries;
1: -	int error;
1: -	int req_xfer;
1: -	struct request *rq;
1: -	long unsigned int flags;
1: -	long unsigned int timeout;
1: +  u8 c[12];
1: +  int retries;
1: +  int error;
1: +  int req_xfer;
1: +  struct request *rq;
1: +  long unsigned int flags;
1: +  long unsigned int timeout;
1:  };
1:  
1:  struct ide_drive_s;
1:  
1:  struct ide_disk_ops {
1: -	int (*check)(struct ide_drive_s *, const char *);
1: -	int (*get_capacity)(struct ide_drive_s *);
1: -	void (*unlock_native_capacity)(struct ide_drive_s *);
1: -	void (*setup)(struct ide_drive_s *);
1: -	void (*flush)(struct ide_drive_s *);
1: -	int (*init_media)(struct ide_drive_s *, struct gendisk *);
1: -	int (*set_doorlock)(struct ide_drive_s *, struct gendisk *, int);
1: -	ide_startstop_t (*do_request)(struct ide_drive_s *, struct request *, sector_t);
1: -	int (*ioctl)(struct ide_drive_s *, struct block_device *, fmode_t, unsigned int, long unsigned int);
1: -	int (*compat_ioctl)(struct ide_drive_s *, struct block_device *, fmode_t, unsigned int, long unsigned int);
1: +  int (*check)(struct ide_drive_s *, const char *);
1: +  int (*get_capacity)(struct ide_drive_s *);
1: +  void (*unlock_native_capacity)(struct ide_drive_s *);
1: +  void (*setup)(struct ide_drive_s *);
1: +  void (*flush)(struct ide_drive_s *);
1: +  int (*init_media)(struct ide_drive_s *, struct gendisk *);
1: +  int (*set_doorlock)(struct ide_drive_s *, struct gendisk *, int);
1: +  ide_startstop_t (*do_request)(struct ide_drive_s *, struct request *,
1: +                                sector_t);
1: +  int (*ioctl)(struct ide_drive_s *, struct block_device *, fmode_t,
1: +               unsigned int, long unsigned int);
1: +  int (*compat_ioctl)(struct ide_drive_s *, struct block_device *, fmode_t,
1: +                      unsigned int, long unsigned int);
1:  };
1:  
1:  struct ide_proc_devset;
1: @@ -80694,103 +81791,103 @@ struct ide_proc_devset;
1:  struct hwif_s;
1:  
1:  struct ide_drive_s {
1: -	char name[4];
1: -	char driver_req[10];
1: -	struct request_queue *queue;
1: -	bool (*prep_rq)(struct ide_drive_s *, struct request *);
1: -	struct blk_mq_tag_set tag_set;
1: -	struct request *rq;
1: -	void *driver_data;
1: -	u16 *id;
1: -	struct proc_dir_entry *proc;
1: -	const struct ide_proc_devset *settings;
1: -	struct hwif_s *hwif;
1: -	const struct ide_disk_ops *disk_ops;
1: -	long unsigned int dev_flags;
1: -	long unsigned int sleep;
1: -	long unsigned int timeout;
1: -	u8 special_flags;
1: -	u8 select;
1: -	u8 retry_pio;
1: -	u8 waiting_for_dma;
1: -	u8 dma;
1: -	u8 init_speed;
1: -	u8 current_speed;
1: -	u8 desired_speed;
1: -	u8 pio_mode;
1: -	u8 dma_mode;
1: -	u8 dn;
1: -	u8 acoustic;
1: -	u8 media;
1: -	u8 ready_stat;
1: -	u8 mult_count;
1: -	u8 mult_req;
1: -	u8 io_32bit;
1: -	u8 bad_wstat;
1: -	u8 head;
1: -	u8 sect;
1: -	u8 bios_head;
1: -	u8 bios_sect;
1: -	u8 pc_delay;
1: -	unsigned int bios_cyl;
1: -	unsigned int cyl;
1: -	void *drive_data;
1: -	unsigned int failures;
1: -	unsigned int max_failures;
1: -	u64 probed_capacity;
1: -	u64 capacity64;
1: -	int lun;
1: -	int crc_count;
1: -	long unsigned int debug_mask;
1: -	struct list_head list;
1: -	struct device gendev;
1: -	struct completion gendev_rel_comp;
1: -	struct ide_atapi_pc *pc;
1: -	struct ide_atapi_pc *failed_pc;
1: -	int (*pc_callback)(struct ide_drive_s *, int);
1: -	ide_startstop_t (*irq_handler)(struct ide_drive_s *);
1: -	long unsigned int atapi_flags;
1: -	struct ide_atapi_pc request_sense_pc;
1: -	bool sense_rq_armed;
1: -	bool sense_rq_active;
1: -	struct request *sense_rq;
1: -	struct request_sense sense_data;
1: -	struct work_struct rq_work;
1: -	struct list_head rq_list;
1: -};
1: -
1: -enum {
1: -	IDE_DFLAG_KEEP_SETTINGS = 1,
1: -	IDE_DFLAG_USING_DMA = 2,
1: -	IDE_DFLAG_UNMASK = 4,
1: -	IDE_DFLAG_NOFLUSH = 8,
1: -	IDE_DFLAG_DSC_OVERLAP = 16,
1: -	IDE_DFLAG_NICE1 = 32,
1: -	IDE_DFLAG_PRESENT = 64,
1: -	IDE_DFLAG_NOHPA = 128,
1: -	IDE_DFLAG_ID_READ = 256,
1: -	IDE_DFLAG_NOPROBE = 512,
1: -	IDE_DFLAG_REMOVABLE = 1024,
1: -	IDE_DFLAG_FORCED_GEOM = 4096,
1: -	IDE_DFLAG_NO_UNMASK = 8192,
1: -	IDE_DFLAG_NO_IO_32BIT = 16384,
1: -	IDE_DFLAG_DOORLOCKING = 32768,
1: -	IDE_DFLAG_NODMA = 65536,
1: -	IDE_DFLAG_BLOCKED = 131072,
1: -	IDE_DFLAG_SLEEPING = 262144,
1: -	IDE_DFLAG_POST_RESET = 524288,
1: -	IDE_DFLAG_UDMA33_WARNED = 1048576,
1: -	IDE_DFLAG_LBA48 = 2097152,
1: -	IDE_DFLAG_WCACHE = 4194304,
1: -	IDE_DFLAG_NOWERR = 8388608,
1: -	IDE_DFLAG_DMA_PIO_RETRY = 16777216,
1: -	IDE_DFLAG_LBA = 33554432,
1: -	IDE_DFLAG_NO_UNLOAD = 67108864,
1: -	IDE_DFLAG_PARKED = 134217728,
1: -	IDE_DFLAG_MEDIA_CHANGED = 268435456,
1: -	IDE_DFLAG_WP = 536870912,
1: -	IDE_DFLAG_FORMAT_IN_PROGRESS = 1073741824,
1: -	IDE_DFLAG_NIEN_QUIRK = 2147483648,
1: +  char name[4];
1: +  char driver_req[10];
1: +  struct request_queue *queue;
1: +  bool (*prep_rq)(struct ide_drive_s *, struct request *);
1: +  struct blk_mq_tag_set tag_set;
1: +  struct request *rq;
1: +  void *driver_data;
1: +  u16 *id;
1: +  struct proc_dir_entry *proc;
1: +  const struct ide_proc_devset *settings;
1: +  struct hwif_s *hwif;
1: +  const struct ide_disk_ops *disk_ops;
1: +  long unsigned int dev_flags;
1: +  long unsigned int sleep;
1: +  long unsigned int timeout;
1: +  u8 special_flags;
1: +  u8 select;
1: +  u8 retry_pio;
1: +  u8 waiting_for_dma;
1: +  u8 dma;
1: +  u8 init_speed;
1: +  u8 current_speed;
1: +  u8 desired_speed;
1: +  u8 pio_mode;
1: +  u8 dma_mode;
1: +  u8 dn;
1: +  u8 acoustic;
1: +  u8 media;
1: +  u8 ready_stat;
1: +  u8 mult_count;
1: +  u8 mult_req;
1: +  u8 io_32bit;
1: +  u8 bad_wstat;
1: +  u8 head;
1: +  u8 sect;
1: +  u8 bios_head;
1: +  u8 bios_sect;
1: +  u8 pc_delay;
1: +  unsigned int bios_cyl;
1: +  unsigned int cyl;
1: +  void *drive_data;
1: +  unsigned int failures;
1: +  unsigned int max_failures;
1: +  u64 probed_capacity;
1: +  u64 capacity64;
1: +  int lun;
1: +  int crc_count;
1: +  long unsigned int debug_mask;
1: +  struct list_head list;
1: +  struct device gendev;
1: +  struct completion gendev_rel_comp;
1: +  struct ide_atapi_pc *pc;
1: +  struct ide_atapi_pc *failed_pc;
1: +  int (*pc_callback)(struct ide_drive_s *, int);
1: +  ide_startstop_t (*irq_handler)(struct ide_drive_s *);
1: +  long unsigned int atapi_flags;
1: +  struct ide_atapi_pc request_sense_pc;
1: +  bool sense_rq_armed;
1: +  bool sense_rq_active;
1: +  struct request *sense_rq;
1: +  struct request_sense sense_data;
1: +  struct work_struct rq_work;
1: +  struct list_head rq_list;
1: +};
1: +
1: +enum {
1: +  IDE_DFLAG_KEEP_SETTINGS = 1,
1: +  IDE_DFLAG_USING_DMA = 2,
1: +  IDE_DFLAG_UNMASK = 4,
1: +  IDE_DFLAG_NOFLUSH = 8,
1: +  IDE_DFLAG_DSC_OVERLAP = 16,
1: +  IDE_DFLAG_NICE1 = 32,
1: +  IDE_DFLAG_PRESENT = 64,
1: +  IDE_DFLAG_NOHPA = 128,
1: +  IDE_DFLAG_ID_READ = 256,
1: +  IDE_DFLAG_NOPROBE = 512,
1: +  IDE_DFLAG_REMOVABLE = 1024,
1: +  IDE_DFLAG_FORCED_GEOM = 4096,
1: +  IDE_DFLAG_NO_UNMASK = 8192,
1: +  IDE_DFLAG_NO_IO_32BIT = 16384,
1: +  IDE_DFLAG_DOORLOCKING = 32768,
1: +  IDE_DFLAG_NODMA = 65536,
1: +  IDE_DFLAG_BLOCKED = 131072,
1: +  IDE_DFLAG_SLEEPING = 262144,
1: +  IDE_DFLAG_POST_RESET = 524288,
1: +  IDE_DFLAG_UDMA33_WARNED = 1048576,
1: +  IDE_DFLAG_LBA48 = 2097152,
1: +  IDE_DFLAG_WCACHE = 4194304,
1: +  IDE_DFLAG_NOWERR = 8388608,
1: +  IDE_DFLAG_DMA_PIO_RETRY = 16777216,
1: +  IDE_DFLAG_LBA = 33554432,
1: +  IDE_DFLAG_NO_UNLOAD = 67108864,
1: +  IDE_DFLAG_PARKED = 134217728,
1: +  IDE_DFLAG_MEDIA_CHANGED = 268435456,
1: +  IDE_DFLAG_WP = 536870912,
1: +  IDE_DFLAG_FORMAT_IN_PROGRESS = 1073741824,
1: +  IDE_DFLAG_NIEN_QUIRK = 2147483648,
1:  };
1:  
1:  typedef struct ide_drive_s ide_drive_t;
1: @@ -80798,12 +81895,12 @@ typedef struct ide_drive_s ide_drive_t;
1:  struct ide_devset;
1:  
1:  struct ide_proc_devset {
1: -	const char *name;
1: -	const struct ide_devset *setting;
1: -	int min;
1: -	int max;
1: -	int (*mulf)(ide_drive_t *);
1: -	int (*divf)(ide_drive_t *);
1: +  const char *name;
1: +  const struct ide_devset *setting;
1: +  int min;
1: +  int max;
1: +  int (*mulf)(ide_drive_t *);
1: +  int (*divf)(ide_drive_t *);
1:  };
1:  
1:  struct ide_host;
1: @@ -80815,254 +81912,254 @@ struct ide_port_ops;
1:  struct ide_dma_ops;
1:  
1:  struct hwif_s {
1: -	struct hwif_s *mate;
1: -	struct proc_dir_entry *proc;
1: -	struct ide_host *host;
1: -	char name[6];
1: -	struct ide_io_ports io_ports;
1: -	long unsigned int sata_scr[3];
1: -	ide_drive_t *devices[3];
1: -	long unsigned int port_flags;
1: -	u8 major;
1: -	u8 index;
1: -	u8 channel;
1: -	u32 host_flags;
1: -	u8 pio_mask;
1: -	u8 ultra_mask;
1: -	u8 mwdma_mask;
1: -	u8 swdma_mask;
1: -	u8 cbl;
1: -	hwif_chipset_t chipset;
1: -	struct device *dev;
1: -	void (*rw_disk)(ide_drive_t *, struct request *);
1: -	const struct ide_tp_ops *tp_ops;
1: -	const struct ide_port_ops *port_ops;
1: -	const struct ide_dma_ops *dma_ops;
1: -	unsigned int *dmatable_cpu;
1: -	dma_addr_t dmatable_dma;
1: -	int prd_max_nents;
1: -	int prd_ent_size;
1: -	struct scatterlist *sg_table;
1: -	int sg_max_nents;
1: -	struct ide_cmd cmd;
1: -	int rqsize;
1: -	int irq;
1: -	long unsigned int dma_base;
1: -	long unsigned int config_data;
1: -	long unsigned int select_data;
1: -	long unsigned int extra_base;
1: -	unsigned int extra_ports;
1: -	unsigned int present: 1;
1: -	unsigned int busy: 1;
1: -	struct device gendev;
1: -	struct device *portdev;
1: -	struct completion gendev_rel_comp;
1: -	void *hwif_data;
1: -	ide_startstop_t (*handler)(ide_drive_t *);
1: -	unsigned int polling: 1;
1: -	ide_drive_t *cur_dev;
1: -	struct request *rq;
1: -	struct timer_list timer;
1: -	long unsigned int poll_timeout;
1: -	int (*expiry)(ide_drive_t *);
1: -	int req_gen;
1: -	int req_gen_timer;
1: -	spinlock_t lock;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct hwif_s *mate;
1: +  struct proc_dir_entry *proc;
1: +  struct ide_host *host;
1: +  char name[6];
1: +  struct ide_io_ports io_ports;
1: +  long unsigned int sata_scr[3];
1: +  ide_drive_t *devices[3];
1: +  long unsigned int port_flags;
1: +  u8 major;
1: +  u8 index;
1: +  u8 channel;
1: +  u32 host_flags;
1: +  u8 pio_mask;
1: +  u8 ultra_mask;
1: +  u8 mwdma_mask;
1: +  u8 swdma_mask;
1: +  u8 cbl;
1: +  hwif_chipset_t chipset;
1: +  struct device *dev;
1: +  void (*rw_disk)(ide_drive_t *, struct request *);
1: +  const struct ide_tp_ops *tp_ops;
1: +  const struct ide_port_ops *port_ops;
1: +  const struct ide_dma_ops *dma_ops;
1: +  unsigned int *dmatable_cpu;
1: +  dma_addr_t dmatable_dma;
1: +  int prd_max_nents;
1: +  int prd_ent_size;
1: +  struct scatterlist *sg_table;
1: +  int sg_max_nents;
1: +  struct ide_cmd cmd;
1: +  int rqsize;
1: +  int irq;
1: +  long unsigned int dma_base;
1: +  long unsigned int config_data;
1: +  long unsigned int select_data;
1: +  long unsigned int extra_base;
1: +  unsigned int extra_ports;
1: +  unsigned int present : 1;
1: +  unsigned int busy : 1;
1: +  struct device gendev;
1: +  struct device *portdev;
1: +  struct completion gendev_rel_comp;
1: +  void *hwif_data;
1: +  ide_startstop_t (*handler)(ide_drive_t *);
1: +  unsigned int polling : 1;
1: +  ide_drive_t *cur_dev;
1: +  struct request *rq;
1: +  struct timer_list timer;
1: +  long unsigned int poll_timeout;
1: +  int (*expiry)(ide_drive_t *);
1: +  int req_gen;
1: +  int req_gen_timer;
1: +  spinlock_t lock;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ide_tp_ops {
1: -	void (*exec_command)(struct hwif_s *, u8);
1: -	u8 (*read_status)(struct hwif_s *);
1: -	u8 (*read_altstatus)(struct hwif_s *);
1: -	void (*write_devctl)(struct hwif_s *, u8);
1: -	void (*dev_select)(ide_drive_t *);
1: -	void (*tf_load)(ide_drive_t *, struct ide_taskfile *, u8);
1: -	void (*tf_read)(ide_drive_t *, struct ide_taskfile *, u8);
1: -	void (*input_data)(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
1: -	void (*output_data)(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
1: +  void (*exec_command)(struct hwif_s *, u8);
1: +  u8 (*read_status)(struct hwif_s *);
1: +  u8 (*read_altstatus)(struct hwif_s *);
1: +  void (*write_devctl)(struct hwif_s *, u8);
1: +  void (*dev_select)(ide_drive_t *);
1: +  void (*tf_load)(ide_drive_t *, struct ide_taskfile *, u8);
1: +  void (*tf_read)(ide_drive_t *, struct ide_taskfile *, u8);
1: +  void (*input_data)(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
1: +  void (*output_data)(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
1:  };
1:  
1:  struct ide_port_ops {
1: -	void (*init_dev)(ide_drive_t *);
1: -	void (*set_pio_mode)(struct hwif_s *, ide_drive_t *);
1: -	void (*set_dma_mode)(struct hwif_s *, ide_drive_t *);
1: -	blk_status_t (*reset_poll)(ide_drive_t *);
1: -	void (*pre_reset)(ide_drive_t *);
1: -	void (*resetproc)(ide_drive_t *);
1: -	void (*maskproc)(ide_drive_t *, int);
1: -	void (*quirkproc)(ide_drive_t *);
1: -	void (*clear_irq)(ide_drive_t *);
1: -	int (*test_irq)(struct hwif_s *);
1: -	u8 (*mdma_filter)(ide_drive_t *);
1: -	u8 (*udma_filter)(ide_drive_t *);
1: -	u8 (*cable_detect)(struct hwif_s *);
1: +  void (*init_dev)(ide_drive_t *);
1: +  void (*set_pio_mode)(struct hwif_s *, ide_drive_t *);
1: +  void (*set_dma_mode)(struct hwif_s *, ide_drive_t *);
1: +  blk_status_t (*reset_poll)(ide_drive_t *);
1: +  void (*pre_reset)(ide_drive_t *);
1: +  void (*resetproc)(ide_drive_t *);
1: +  void (*maskproc)(ide_drive_t *, int);
1: +  void (*quirkproc)(ide_drive_t *);
1: +  void (*clear_irq)(ide_drive_t *);
1: +  int (*test_irq)(struct hwif_s *);
1: +  u8 (*mdma_filter)(ide_drive_t *);
1: +  u8 (*udma_filter)(ide_drive_t *);
1: +  u8 (*cable_detect)(struct hwif_s *);
1:  };
1:  
1:  struct ide_dma_ops {
1: -	void (*dma_host_set)(struct ide_drive_s *, int);
1: -	int (*dma_setup)(struct ide_drive_s *, struct ide_cmd *);
1: -	void (*dma_start)(struct ide_drive_s *);
1: -	int (*dma_end)(struct ide_drive_s *);
1: -	int (*dma_test_irq)(struct ide_drive_s *);
1: -	void (*dma_lost_irq)(struct ide_drive_s *);
1: -	int (*dma_check)(struct ide_drive_s *, struct ide_cmd *);
1: -	int (*dma_timer_expiry)(struct ide_drive_s *);
1: -	void (*dma_clear)(struct ide_drive_s *);
1: -	u8 (*dma_sff_read_status)(struct hwif_s *);
1: +  void (*dma_host_set)(struct ide_drive_s *, int);
1: +  int (*dma_setup)(struct ide_drive_s *, struct ide_cmd *);
1: +  void (*dma_start)(struct ide_drive_s *);
1: +  int (*dma_end)(struct ide_drive_s *);
1: +  int (*dma_test_irq)(struct ide_drive_s *);
1: +  void (*dma_lost_irq)(struct ide_drive_s *);
1: +  int (*dma_check)(struct ide_drive_s *, struct ide_cmd *);
1: +  int (*dma_timer_expiry)(struct ide_drive_s *);
1: +  void (*dma_clear)(struct ide_drive_s *);
1: +  u8 (*dma_sff_read_status)(struct hwif_s *);
1:  };
1:  
1:  typedef struct hwif_s ide_hwif_t;
1:  
1:  struct ide_host {
1: -	ide_hwif_t *ports[5];
1: -	unsigned int n_ports;
1: -	struct device *dev[2];
1: -	int (*init_chipset)(struct pci_dev *);
1: -	void (*get_lock)(irq_handler_t, void *);
1: -	void (*release_lock)();
1: -	irq_handler_t irq_handler;
1: -	long unsigned int host_flags;
1: -	int irq_flags;
1: -	void *host_priv;
1: -	ide_hwif_t *cur_port;
1: -	volatile long unsigned int host_busy;
1: +  ide_hwif_t *ports[5];
1: +  unsigned int n_ports;
1: +  struct device *dev[2];
1: +  int (*init_chipset)(struct pci_dev *);
1: +  void (*get_lock)(irq_handler_t, void *);
1: +  void (*release_lock)();
1: +  irq_handler_t irq_handler;
1: +  long unsigned int host_flags;
1: +  int irq_flags;
1: +  void *host_priv;
1: +  ide_hwif_t *cur_port;
1: +  volatile long unsigned int host_busy;
1:  };
1:  
1:  struct ide_devset {
1: -	int (*get)(ide_drive_t *);
1: -	int (*set)(ide_drive_t *, int);
1: -	unsigned int flags;
1: +  int (*get)(ide_drive_t *);
1: +  int (*set)(ide_drive_t *, int);
1: +  unsigned int flags;
1:  };
1:  
1:  typedef struct {
1: -	const char *name;
1: -	umode_t mode;
1: -	int (*show)(struct seq_file *, void *);
1: +  const char *name;
1: +  umode_t mode;
1: +  int (*show)(struct seq_file *, void *);
1:  } ide_proc_entry_t;
1:  
1:  struct ide_driver {
1: -	const char *version;
1: -	ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t);
1: -	struct device_driver gen_driver;
1: -	int (*probe)(ide_drive_t *);
1: -	void (*remove)(ide_drive_t *);
1: -	void (*resume)(ide_drive_t *);
1: -	void (*shutdown)(ide_drive_t *);
1: -	ide_proc_entry_t * (*proc_entries)(ide_drive_t *);
1: -	const struct ide_proc_devset * (*proc_devsets)(ide_drive_t *);
1: +  const char *version;
1: +  ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t);
1: +  struct device_driver gen_driver;
1: +  int (*probe)(ide_drive_t *);
1: +  void (*remove)(ide_drive_t *);
1: +  void (*resume)(ide_drive_t *);
1: +  void (*shutdown)(ide_drive_t *);
1: +  ide_proc_entry_t *(*proc_entries)(ide_drive_t *);
1: +  const struct ide_proc_devset *(*proc_devsets)(ide_drive_t *);
1:  };
1:  
1:  struct chs_geom {
1: -	unsigned int cyl;
1: -	u8 head;
1: -	u8 sect;
1: +  unsigned int cyl;
1: +  u8 head;
1: +  u8 sect;
1:  };
1:  
1:  enum {
1: -	BUSSTATE_OFF = 0,
1: -	BUSSTATE_ON = 1,
1: -	BUSSTATE_TRISTATE = 2,
1: +  BUSSTATE_OFF = 0,
1: +  BUSSTATE_ON = 1,
1: +  BUSSTATE_TRISTATE = 2,
1:  };
1:  
1:  enum ata_prot_flags {
1: -	ATA_PROT_FLAG_PIO = 1,
1: -	ATA_PROT_FLAG_DMA = 2,
1: -	ATA_PROT_FLAG_NCQ = 4,
1: -	ATA_PROT_FLAG_ATAPI = 8,
1: -	ATA_PROT_UNKNOWN = 255,
1: -	ATA_PROT_NODATA = 0,
1: -	ATA_PROT_PIO = 1,
1: -	ATA_PROT_DMA = 2,
1: -	ATA_PROT_NCQ_NODATA = 4,
1: -	ATA_PROT_NCQ = 6,
1: -	ATAPI_PROT_NODATA = 8,
1: -	ATAPI_PROT_PIO = 9,
1: -	ATAPI_PROT_DMA = 10,
1: +  ATA_PROT_FLAG_PIO = 1,
1: +  ATA_PROT_FLAG_DMA = 2,
1: +  ATA_PROT_FLAG_NCQ = 4,
1: +  ATA_PROT_FLAG_ATAPI = 8,
1: +  ATA_PROT_UNKNOWN = 255,
1: +  ATA_PROT_NODATA = 0,
1: +  ATA_PROT_PIO = 1,
1: +  ATA_PROT_DMA = 2,
1: +  ATA_PROT_NCQ_NODATA = 4,
1: +  ATA_PROT_NCQ = 6,
1: +  ATAPI_PROT_NODATA = 8,
1: +  ATAPI_PROT_PIO = 9,
1: +  ATAPI_PROT_DMA = 10,
1:  };
1:  
1:  enum ata_priv_type {
1: -	ATA_PRIV_MISC = 0,
1: -	ATA_PRIV_TASKFILE = 1,
1: -	ATA_PRIV_PC = 2,
1: -	ATA_PRIV_SENSE = 3,
1: -	ATA_PRIV_PM_SUSPEND = 4,
1: -	ATA_PRIV_PM_RESUME = 5,
1: +  ATA_PRIV_MISC = 0,
1: +  ATA_PRIV_TASKFILE = 1,
1: +  ATA_PRIV_PC = 2,
1: +  ATA_PRIV_SENSE = 3,
1: +  ATA_PRIV_PM_SUSPEND = 4,
1: +  ATA_PRIV_PM_RESUME = 5,
1:  };
1:  
1:  struct ide_request {
1: -	struct scsi_request sreq;
1: -	u8 sense[96];
1: -	u8 type;
1: -	void *special;
1: +  struct scsi_request sreq;
1: +  u8 sense[96];
1: +  u8 type;
1: +  void *special;
1:  };
1:  
1:  enum {
1: -	IDE_VALID_ERROR = 2,
1: -	IDE_VALID_FEATURE = 2,
1: -	IDE_VALID_NSECT = 4,
1: -	IDE_VALID_LBAL = 8,
1: -	IDE_VALID_LBAM = 16,
1: -	IDE_VALID_LBAH = 32,
1: -	IDE_VALID_DEVICE = 64,
1: -	IDE_VALID_LBA = 56,
1: -	IDE_VALID_OUT_TF = 62,
1: -	IDE_VALID_IN_TF = 60,
1: -	IDE_VALID_OUT_HOB = 62,
1: -	IDE_VALID_IN_HOB = 62,
1: +  IDE_VALID_ERROR = 2,
1: +  IDE_VALID_FEATURE = 2,
1: +  IDE_VALID_NSECT = 4,
1: +  IDE_VALID_LBAL = 8,
1: +  IDE_VALID_LBAM = 16,
1: +  IDE_VALID_LBAH = 32,
1: +  IDE_VALID_DEVICE = 64,
1: +  IDE_VALID_LBA = 56,
1: +  IDE_VALID_OUT_TF = 62,
1: +  IDE_VALID_IN_TF = 60,
1: +  IDE_VALID_OUT_HOB = 62,
1: +  IDE_VALID_IN_HOB = 62,
1:  };
1:  
1:  enum {
1: -	IDE_TFLAG_LBA48 = 1,
1: -	IDE_TFLAG_WRITE = 2,
1: -	IDE_TFLAG_CUSTOM_HANDLER = 4,
1: -	IDE_TFLAG_DMA_PIO_FALLBACK = 8,
1: -	IDE_TFLAG_IO_16BIT = 16,
1: -	IDE_TFLAG_DYN = 32,
1: -	IDE_TFLAG_FS = 64,
1: -	IDE_TFLAG_MULTI_PIO = 128,
1: -	IDE_TFLAG_SET_XFER = 256,
1: +  IDE_TFLAG_LBA48 = 1,
1: +  IDE_TFLAG_WRITE = 2,
1: +  IDE_TFLAG_CUSTOM_HANDLER = 4,
1: +  IDE_TFLAG_DMA_PIO_FALLBACK = 8,
1: +  IDE_TFLAG_IO_16BIT = 16,
1: +  IDE_TFLAG_DYN = 32,
1: +  IDE_TFLAG_FS = 64,
1: +  IDE_TFLAG_MULTI_PIO = 128,
1: +  IDE_TFLAG_SET_XFER = 256,
1:  };
1:  
1:  struct ide_ioctl_devset {
1: -	unsigned int get_ioctl;
1: -	unsigned int set_ioctl;
1: -	const struct ide_devset *setting;
1: +  unsigned int get_ioctl;
1: +  unsigned int set_ioctl;
1: +  const struct ide_devset *setting;
1:  };
1:  
1:  enum {
1: -	IDE_DRV_ERROR_GENERAL = 101,
1: -	IDE_DRV_ERROR_FILEMARK = 102,
1: -	IDE_DRV_ERROR_EOD = 103,
1: +  IDE_DRV_ERROR_GENERAL = 101,
1: +  IDE_DRV_ERROR_FILEMARK = 102,
1: +  IDE_DRV_ERROR_EOD = 103,
1:  };
1:  
1:  enum {
1: -	WAIT_DRQ = 1000,
1: -	WAIT_READY = 5000,
1: -	WAIT_PIDENTIFY = 10000,
1: -	WAIT_WORSTCASE = 30000,
1: -	WAIT_CMD = 10000,
1: -	WAIT_FLOPPY_CMD = 50000,
1: -	WAIT_TAPE_CMD = 900000,
1: -	WAIT_MIN_SLEEP = 20,
1: +  WAIT_DRQ = 1000,
1: +  WAIT_READY = 5000,
1: +  WAIT_PIDENTIFY = 10000,
1: +  WAIT_WORSTCASE = 30000,
1: +  WAIT_CMD = 10000,
1: +  WAIT_FLOPPY_CMD = 50000,
1: +  WAIT_TAPE_CMD = 900000,
1: +  WAIT_MIN_SLEEP = 20,
1:  };
1:  
1:  enum {
1: -	IDE_SFLAG_SET_GEOMETRY = 1,
1: -	IDE_SFLAG_RECALIBRATE = 2,
1: -	IDE_SFLAG_SET_MULTMODE = 4,
1: +  IDE_SFLAG_SET_GEOMETRY = 1,
1: +  IDE_SFLAG_RECALIBRATE = 2,
1: +  IDE_SFLAG_SET_MULTMODE = 4,
1:  };
1:  
1:  enum {
1: -	IDE_FTFLAG_FLAGGED = 1,
1: -	IDE_FTFLAG_SET_IN_FLAGS = 2,
1: -	IDE_FTFLAG_OUT_DATA = 4,
1: -	IDE_FTFLAG_IN_DATA = 8,
1: +  IDE_FTFLAG_FLAGGED = 1,
1: +  IDE_FTFLAG_SET_IN_FLAGS = 2,
1: +  IDE_FTFLAG_OUT_DATA = 4,
1: +  IDE_FTFLAG_IN_DATA = 8,
1:  };
1:  
1:  typedef ide_startstop_t ide_handler_t(ide_drive_t *);
1: @@ -81070,395 +82167,395 @@ typedef ide_startstop_t ide_handler_t(ide_drive_t *);
1:  typedef int ide_expiry_t(ide_drive_t *);
1:  
1:  enum {
1: -	IDE_PM_START_SUSPEND = 0,
1: -	IDE_PM_FLUSH_CACHE = 0,
1: -	IDE_PM_STANDBY = 1,
1: -	IDE_PM_START_RESUME = 2,
1: -	IDE_PM_RESTORE_PIO = 2,
1: -	IDE_PM_IDLE = 3,
1: -	IDE_PM_RESTORE_DMA = 4,
1: -	IDE_PM_COMPLETED = 5,
1: -};
1: -
1: -enum {
1: -	IDE_HFLAG_ISA_PORTS = 1,
1: -	IDE_HFLAG_SINGLE = 2,
1: -	IDE_HFLAG_PIO_NO_BLACKLIST = 4,
1: -	IDE_HFLAG_QD_2ND_PORT = 8,
1: -	IDE_HFLAG_ABUSE_PREFETCH = 16,
1: -	IDE_HFLAG_ABUSE_FAST_DEVSEL = 32,
1: -	IDE_HFLAG_ABUSE_DMA_MODES = 64,
1: -	IDE_HFLAG_SET_PIO_MODE_KEEP_DMA = 128,
1: -	IDE_HFLAG_POST_SET_MODE = 256,
1: -	IDE_HFLAG_NO_SET_MODE = 512,
1: -	IDE_HFLAG_TRUST_BIOS_FOR_DMA = 1024,
1: -	IDE_HFLAG_CS5520 = 2048,
1: -	IDE_HFLAG_NO_ATAPI_DMA = 4096,
1: -	IDE_HFLAG_NON_BOOTABLE = 8192,
1: -	IDE_HFLAG_NO_DMA = 16384,
1: -	IDE_HFLAG_NO_AUTODMA = 32768,
1: -	IDE_HFLAG_MMIO = 65536,
1: -	IDE_HFLAG_NO_LBA48 = 131072,
1: -	IDE_HFLAG_NO_LBA48_DMA = 262144,
1: -	IDE_HFLAG_ERROR_STOPS_FIFO = 524288,
1: -	IDE_HFLAG_SERIALIZE = 1048576,
1: -	IDE_HFLAG_DTC2278 = 2097152,
1: -	IDE_HFLAG_4DRIVES = 4194304,
1: -	IDE_HFLAG_TRM290 = 8388608,
1: -	IDE_HFLAG_IO_32BIT = 16777216,
1: -	IDE_HFLAG_UNMASK_IRQS = 33554432,
1: -	IDE_HFLAG_BROKEN_ALTSTATUS = 67108864,
1: -	IDE_HFLAG_SERIALIZE_DMA = 134217728,
1: -	IDE_HFLAG_CLEAR_SIMPLEX = 268435456,
1: -	IDE_HFLAG_NO_DSC = 536870912,
1: -	IDE_HFLAG_NO_IO_32BIT = 1073741824,
1: -	IDE_HFLAG_NO_UNMASK_IRQS = 2147483648,
1: +  IDE_PM_START_SUSPEND = 0,
1: +  IDE_PM_FLUSH_CACHE = 0,
1: +  IDE_PM_STANDBY = 1,
1: +  IDE_PM_START_RESUME = 2,
1: +  IDE_PM_RESTORE_PIO = 2,
1: +  IDE_PM_IDLE = 3,
1: +  IDE_PM_RESTORE_DMA = 4,
1: +  IDE_PM_COMPLETED = 5,
1: +};
1: +
1: +enum {
1: +  IDE_HFLAG_ISA_PORTS = 1,
1: +  IDE_HFLAG_SINGLE = 2,
1: +  IDE_HFLAG_PIO_NO_BLACKLIST = 4,
1: +  IDE_HFLAG_QD_2ND_PORT = 8,
1: +  IDE_HFLAG_ABUSE_PREFETCH = 16,
1: +  IDE_HFLAG_ABUSE_FAST_DEVSEL = 32,
1: +  IDE_HFLAG_ABUSE_DMA_MODES = 64,
1: +  IDE_HFLAG_SET_PIO_MODE_KEEP_DMA = 128,
1: +  IDE_HFLAG_POST_SET_MODE = 256,
1: +  IDE_HFLAG_NO_SET_MODE = 512,
1: +  IDE_HFLAG_TRUST_BIOS_FOR_DMA = 1024,
1: +  IDE_HFLAG_CS5520 = 2048,
1: +  IDE_HFLAG_NO_ATAPI_DMA = 4096,
1: +  IDE_HFLAG_NON_BOOTABLE = 8192,
1: +  IDE_HFLAG_NO_DMA = 16384,
1: +  IDE_HFLAG_NO_AUTODMA = 32768,
1: +  IDE_HFLAG_MMIO = 65536,
1: +  IDE_HFLAG_NO_LBA48 = 131072,
1: +  IDE_HFLAG_NO_LBA48_DMA = 262144,
1: +  IDE_HFLAG_ERROR_STOPS_FIFO = 524288,
1: +  IDE_HFLAG_SERIALIZE = 1048576,
1: +  IDE_HFLAG_DTC2278 = 2097152,
1: +  IDE_HFLAG_4DRIVES = 4194304,
1: +  IDE_HFLAG_TRM290 = 8388608,
1: +  IDE_HFLAG_IO_32BIT = 16777216,
1: +  IDE_HFLAG_UNMASK_IRQS = 33554432,
1: +  IDE_HFLAG_BROKEN_ALTSTATUS = 67108864,
1: +  IDE_HFLAG_SERIALIZE_DMA = 134217728,
1: +  IDE_HFLAG_CLEAR_SIMPLEX = 268435456,
1: +  IDE_HFLAG_NO_DSC = 536870912,
1: +  IDE_HFLAG_NO_IO_32BIT = 1073741824,
1: +  IDE_HFLAG_NO_UNMASK_IRQS = 2147483648,
1:  };
1:  
1:  struct ide_pm_state {
1: -	int pm_step;
1: -	u32 pm_state;
1: -	void *data;
1: -};
1: -
1: -enum {
1: -	IDE_AFLAG_DRQ_INTERRUPT = 1,
1: -	IDE_AFLAG_NO_EJECT = 2,
1: -	IDE_AFLAG_PRE_ATAPI12 = 4,
1: -	IDE_AFLAG_TOCADDR_AS_BCD = 8,
1: -	IDE_AFLAG_TOCTRACKS_AS_BCD = 16,
1: -	IDE_AFLAG_TOC_VALID = 64,
1: -	IDE_AFLAG_DOOR_LOCKED = 128,
1: -	IDE_AFLAG_NO_SPEED_SELECT = 256,
1: -	IDE_AFLAG_VERTOS_300_SSD = 512,
1: -	IDE_AFLAG_VERTOS_600_ESD = 1024,
1: -	IDE_AFLAG_SANYO_3CD = 2048,
1: -	IDE_AFLAG_FULL_CAPS_PAGE = 4096,
1: -	IDE_AFLAG_PLAY_AUDIO_OK = 8192,
1: -	IDE_AFLAG_LE_SPEED_FIELDS = 16384,
1: -	IDE_AFLAG_CLIK_DRIVE = 32768,
1: -	IDE_AFLAG_ZIP_DRIVE = 65536,
1: -	IDE_AFLAG_SRFP = 131072,
1: -	IDE_AFLAG_IGNORE_DSC = 262144,
1: -	IDE_AFLAG_ADDRESS_VALID = 524288,
1: -	IDE_AFLAG_BUSY = 1048576,
1: -	IDE_AFLAG_DETECT_BS = 2097152,
1: -	IDE_AFLAG_FILEMARK = 4194304,
1: -	IDE_AFLAG_MEDIUM_PRESENT = 8388608,
1: -	IDE_AFLAG_NO_AUTOCLOSE = 16777216,
1: +  int pm_step;
1: +  u32 pm_state;
1: +  void *data;
1: +};
1: +
1: +enum {
1: +  IDE_AFLAG_DRQ_INTERRUPT = 1,
1: +  IDE_AFLAG_NO_EJECT = 2,
1: +  IDE_AFLAG_PRE_ATAPI12 = 4,
1: +  IDE_AFLAG_TOCADDR_AS_BCD = 8,
1: +  IDE_AFLAG_TOCTRACKS_AS_BCD = 16,
1: +  IDE_AFLAG_TOC_VALID = 64,
1: +  IDE_AFLAG_DOOR_LOCKED = 128,
1: +  IDE_AFLAG_NO_SPEED_SELECT = 256,
1: +  IDE_AFLAG_VERTOS_300_SSD = 512,
1: +  IDE_AFLAG_VERTOS_600_ESD = 1024,
1: +  IDE_AFLAG_SANYO_3CD = 2048,
1: +  IDE_AFLAG_FULL_CAPS_PAGE = 4096,
1: +  IDE_AFLAG_PLAY_AUDIO_OK = 8192,
1: +  IDE_AFLAG_LE_SPEED_FIELDS = 16384,
1: +  IDE_AFLAG_CLIK_DRIVE = 32768,
1: +  IDE_AFLAG_ZIP_DRIVE = 65536,
1: +  IDE_AFLAG_SRFP = 131072,
1: +  IDE_AFLAG_IGNORE_DSC = 262144,
1: +  IDE_AFLAG_ADDRESS_VALID = 524288,
1: +  IDE_AFLAG_BUSY = 1048576,
1: +  IDE_AFLAG_DETECT_BS = 2097152,
1: +  IDE_AFLAG_FILEMARK = 4194304,
1: +  IDE_AFLAG_MEDIUM_PRESENT = 8388608,
1: +  IDE_AFLAG_NO_AUTOCLOSE = 16777216,
1:  };
1:  
1:  struct drive_list_entry {
1: -	const char *id_model;
1: -	const char *id_firmware;
1: +  const char *id_model;
1: +  const char *id_firmware;
1:  };
1:  
1:  enum {
1: -	ide_unknown = 0,
1: -	ide_generic = 1,
1: -	ide_pci = 2,
1: -	ide_cmd640 = 3,
1: -	ide_dtc2278 = 4,
1: -	ide_ali14xx = 5,
1: -	ide_qd65xx = 6,
1: -	ide_umc8672 = 7,
1: -	ide_ht6560b = 8,
1: -	ide_4drives = 9,
1: -	ide_pmac = 10,
1: -	ide_acorn = 11,
1: -	ide_au1xxx = 12,
1: -	ide_palm3710 = 13,
1: +  ide_unknown = 0,
1: +  ide_generic = 1,
1: +  ide_pci = 2,
1: +  ide_cmd640 = 3,
1: +  ide_dtc2278 = 4,
1: +  ide_ali14xx = 5,
1: +  ide_qd65xx = 6,
1: +  ide_umc8672 = 7,
1: +  ide_ht6560b = 8,
1: +  ide_4drives = 9,
1: +  ide_pmac = 10,
1: +  ide_acorn = 11,
1: +  ide_au1xxx = 12,
1: +  ide_palm3710 = 13,
1:  };
1:  
1:  struct ide_hw {
1: -	union {
1: -		struct ide_io_ports io_ports;
1: -		long unsigned int io_ports_array[10];
1: -	};
1: -	int irq;
1: -	struct device *dev;
1: -	struct device *parent;
1: -	long unsigned int config;
1: +  union {
1: +    struct ide_io_ports io_ports;
1: +    long unsigned int io_ports_array[10];
1: +  };
1: +  int irq;
1: +  struct device *dev;
1: +  struct device *parent;
1: +  long unsigned int config;
1:  };
1:  
1:  enum {
1: -	IDE_PFLAG_PROBING = 1,
1: +  IDE_PFLAG_PROBING = 1,
1:  };
1:  
1:  struct ide_pci_enablebit {
1: -	u8 reg;
1: -	u8 mask;
1: -	u8 val;
1: +  u8 reg;
1: +  u8 mask;
1: +  u8 val;
1:  };
1:  
1:  struct ide_port_info {
1: -	char *name;
1: -	int (*init_chipset)(struct pci_dev *);
1: -	void (*get_lock)(irq_handler_t, void *);
1: -	void (*release_lock)();
1: -	void (*init_iops)(ide_hwif_t *);
1: -	void (*init_hwif)(ide_hwif_t *);
1: -	int (*init_dma)(ide_hwif_t *, const struct ide_port_info *);
1: -	const struct ide_tp_ops *tp_ops;
1: -	const struct ide_port_ops *port_ops;
1: -	const struct ide_dma_ops *dma_ops;
1: -	struct ide_pci_enablebit enablebits[2];
1: -	hwif_chipset_t chipset;
1: -	u16 max_sectors;
1: -	u32 host_flags;
1: -	int irq_flags;
1: -	u8 pio_mask;
1: -	u8 swdma_mask;
1: -	u8 mwdma_mask;
1: -	u8 udma_mask;
1: +  char *name;
1: +  int (*init_chipset)(struct pci_dev *);
1: +  void (*get_lock)(irq_handler_t, void *);
1: +  void (*release_lock)();
1: +  void (*init_iops)(ide_hwif_t *);
1: +  void (*init_hwif)(ide_hwif_t *);
1: +  int (*init_dma)(ide_hwif_t *, const struct ide_port_info *);
1: +  const struct ide_tp_ops *tp_ops;
1: +  const struct ide_port_ops *port_ops;
1: +  const struct ide_dma_ops *dma_ops;
1: +  struct ide_pci_enablebit enablebits[2];
1: +  hwif_chipset_t chipset;
1: +  u16 max_sectors;
1: +  u32 host_flags;
1: +  int irq_flags;
1: +  u8 pio_mask;
1: +  u8 swdma_mask;
1: +  u8 mwdma_mask;
1: +  u8 udma_mask;
1:  };
1:  
1:  union ide_reg_valid_s {
1: -	unsigned int all: 16;
1: -	struct {
1: -		unsigned int data: 1;
1: -		unsigned int error_feature: 1;
1: -		unsigned int sector: 1;
1: -		unsigned int nsector: 1;
1: -		unsigned int lcyl: 1;
1: -		unsigned int hcyl: 1;
1: -		unsigned int select: 1;
1: -		unsigned int status_command: 1;
1: -		unsigned int data_hob: 1;
1: -		unsigned int error_feature_hob: 1;
1: -		unsigned int sector_hob: 1;
1: -		unsigned int nsector_hob: 1;
1: -		unsigned int lcyl_hob: 1;
1: -		unsigned int hcyl_hob: 1;
1: -		unsigned int select_hob: 1;
1: -		unsigned int control_hob: 1;
1: -	} b;
1: +  unsigned int all : 16;
1: +  struct {
1: +    unsigned int data : 1;
1: +    unsigned int error_feature : 1;
1: +    unsigned int sector : 1;
1: +    unsigned int nsector : 1;
1: +    unsigned int lcyl : 1;
1: +    unsigned int hcyl : 1;
1: +    unsigned int select : 1;
1: +    unsigned int status_command : 1;
1: +    unsigned int data_hob : 1;
1: +    unsigned int error_feature_hob : 1;
1: +    unsigned int sector_hob : 1;
1: +    unsigned int nsector_hob : 1;
1: +    unsigned int lcyl_hob : 1;
1: +    unsigned int hcyl_hob : 1;
1: +    unsigned int select_hob : 1;
1: +    unsigned int control_hob : 1;
1: +  } b;
1:  };
1:  
1:  typedef union ide_reg_valid_s ide_reg_valid_t;
1:  
1:  struct ide_task_request_s {
1: -	__u8 io_ports[8];
1: -	__u8 hob_ports[8];
1: -	ide_reg_valid_t out_flags;
1: -	ide_reg_valid_t in_flags;
1: -	int data_phase;
1: -	int req_cmd;
1: -	long unsigned int out_size;
1: -	long unsigned int in_size;
1: +  __u8 io_ports[8];
1: +  __u8 hob_ports[8];
1: +  ide_reg_valid_t out_flags;
1: +  ide_reg_valid_t in_flags;
1: +  int data_phase;
1: +  int req_cmd;
1: +  long unsigned int out_size;
1: +  long unsigned int in_size;
1:  };
1:  
1:  typedef struct ide_task_request_s ide_task_request_t;
1:  
1:  struct ide_pio_info {
1: -	const char *name;
1: -	int pio;
1: +  const char *name;
1: +  int pio;
1:  };
1:  
1:  struct ide_timing {
1: -	u8 mode;
1: -	u8 setup;
1: -	u16 act8b;
1: -	u16 rec8b;
1: -	u16 cyc8b;
1: -	u16 active;
1: -	u16 recover;
1: -	u16 cycle;
1: -	u16 udma;
1: +  u8 mode;
1: +  u8 setup;
1: +  u16 act8b;
1: +  u16 rec8b;
1: +  u16 cyc8b;
1: +  u16 active;
1: +  u16 recover;
1: +  u16 cycle;
1: +  u16 udma;
1:  };
1:  
1:  enum {
1: -	IDE_TIMING_SETUP = 1,
1: -	IDE_TIMING_ACT8B = 2,
1: -	IDE_TIMING_REC8B = 4,
1: -	IDE_TIMING_CYC8B = 8,
1: -	IDE_TIMING_8BIT = 14,
1: -	IDE_TIMING_ACTIVE = 16,
1: -	IDE_TIMING_RECOVER = 32,
1: -	IDE_TIMING_CYCLE = 64,
1: -	IDE_TIMING_UDMA = 128,
1: -	IDE_TIMING_ALL = 255,
1: +  IDE_TIMING_SETUP = 1,
1: +  IDE_TIMING_ACT8B = 2,
1: +  IDE_TIMING_REC8B = 4,
1: +  IDE_TIMING_CYC8B = 8,
1: +  IDE_TIMING_8BIT = 14,
1: +  IDE_TIMING_ACTIVE = 16,
1: +  IDE_TIMING_RECOVER = 32,
1: +  IDE_TIMING_CYCLE = 64,
1: +  IDE_TIMING_UDMA = 128,
1: +  IDE_TIMING_ALL = 255,
1:  };
1:  
1:  enum {
1: -	PC_FLAG_ABORT = 1,
1: -	PC_FLAG_SUPPRESS_ERROR = 2,
1: -	PC_FLAG_WAIT_FOR_DSC = 4,
1: -	PC_FLAG_DMA_OK = 8,
1: -	PC_FLAG_DMA_IN_PROGRESS = 16,
1: -	PC_FLAG_DMA_ERROR = 32,
1: -	PC_FLAG_WRITING = 64,
1: +  PC_FLAG_ABORT = 1,
1: +  PC_FLAG_SUPPRESS_ERROR = 2,
1: +  PC_FLAG_WAIT_FOR_DSC = 4,
1: +  PC_FLAG_DMA_OK = 8,
1: +  PC_FLAG_DMA_IN_PROGRESS = 16,
1: +  PC_FLAG_DMA_ERROR = 32,
1: +  PC_FLAG_WRITING = 64,
1:  };
1:  
1:  enum {
1: -	REQ_IDETAPE_PC1 = 1,
1: -	REQ_IDETAPE_PC2 = 2,
1: -	REQ_IDETAPE_READ = 4,
1: -	REQ_IDETAPE_WRITE = 8,
1: +  REQ_IDETAPE_PC1 = 1,
1: +  REQ_IDETAPE_PC2 = 2,
1: +  REQ_IDETAPE_READ = 4,
1: +  REQ_IDETAPE_WRITE = 8,
1:  };
1:  
1:  struct chipset_bus_clock_list_entry {
1: -	u8 xfer_speed;
1: -	u8 chipset_settings;
1: -	u8 ultra_settings;
1: +  u8 xfer_speed;
1: +  u8 chipset_settings;
1: +  u8 ultra_settings;
1:  };
1:  
1:  enum {
1: -	AMD_IDE_CONFIG = 65,
1: -	AMD_CABLE_DETECT = 66,
1: -	AMD_DRIVE_TIMING = 72,
1: -	AMD_8BIT_TIMING = 78,
1: -	AMD_ADDRESS_SETUP = 76,
1: -	AMD_UDMA_TIMING = 80,
1: +  AMD_IDE_CONFIG = 65,
1: +  AMD_CABLE_DETECT = 66,
1: +  AMD_DRIVE_TIMING = 72,
1: +  AMD_8BIT_TIMING = 78,
1: +  AMD_ADDRESS_SETUP = 76,
1: +  AMD_UDMA_TIMING = 80,
1:  };
1:  
1:  struct atiixp_ide_timing {
1: -	u8 command_width;
1: -	u8 recover_width;
1: +  u8 command_width;
1: +  u8 recover_width;
1:  };
1:  
1:  enum ata_clock {
1: -	ATA_CLOCK_25MHZ = 0,
1: -	ATA_CLOCK_33MHZ = 1,
1: -	ATA_CLOCK_40MHZ = 2,
1: -	ATA_CLOCK_50MHZ = 3,
1: -	ATA_CLOCK_66MHZ = 4,
1: -	NUM_ATA_CLOCKS = 5,
1: +  ATA_CLOCK_25MHZ = 0,
1: +  ATA_CLOCK_33MHZ = 1,
1: +  ATA_CLOCK_40MHZ = 2,
1: +  ATA_CLOCK_50MHZ = 3,
1: +  ATA_CLOCK_66MHZ = 4,
1: +  NUM_ATA_CLOCKS = 5,
1:  };
1:  
1:  struct hpt_timings {
1: -	u32 pio_mask;
1: -	u32 dma_mask;
1: -	u32 ultra_mask;
1: -	u32 *clock_table[5];
1: +  u32 pio_mask;
1: +  u32 dma_mask;
1: +  u32 ultra_mask;
1: +  u32 *clock_table[5];
1:  };
1:  
1:  struct hpt_info {
1: -	char *chip_name;
1: -	u8 chip_type;
1: -	u8 udma_mask;
1: -	u8 dpll_clk;
1: -	u8 pci_clk;
1: -	struct hpt_timings *timings;
1: -	u8 clock;
1: +  char *chip_name;
1: +  u8 chip_type;
1: +  u8 udma_mask;
1: +  u8 dpll_clk;
1: +  u8 pci_clk;
1: +  struct hpt_timings *timings;
1: +  u8 clock;
1:  };
1:  
1:  enum {
1: -	HPT36x = 0,
1: -	HPT370 = 1,
1: -	HPT370A = 2,
1: -	HPT374 = 3,
1: -	HPT372 = 4,
1: -	HPT372A = 5,
1: -	HPT302 = 6,
1: -	HPT371 = 7,
1: -	HPT372N = 8,
1: -	HPT302N = 9,
1: -	HPT371N = 10,
1: +  HPT36x = 0,
1: +  HPT370 = 1,
1: +  HPT370A = 2,
1: +  HPT374 = 3,
1: +  HPT372 = 4,
1: +  HPT372A = 5,
1: +  HPT302 = 6,
1: +  HPT371 = 7,
1: +  HPT372N = 8,
1: +  HPT302N = 9,
1: +  HPT371N = 10,
1:  };
1:  
1:  struct ide_info;
1:  
1:  struct it821x_dev {
1: -	unsigned int smart: 1;
1: -	unsigned int timing10: 1;
1: -	u8 clock_mode;
1: -	u8 want[4];
1: -	u16 pio[2];
1: -	u16 mwdma[2];
1: -	u16 udma[2];
1: -	u16 quirks;
1: +  unsigned int smart : 1;
1: +  unsigned int timing10 : 1;
1: +  u8 clock_mode;
1: +  u8 want[4];
1: +  u16 pio[2];
1: +  u16 mwdma[2];
1: +  u16 udma[2];
1: +  u16 quirks;
1:  };
1:  
1:  typedef enum {
1: -	PORT_PATA0 = 0,
1: -	PORT_PATA1 = 1,
1: -	PORT_SATA = 2,
1: +  PORT_PATA0 = 0,
1: +  PORT_PATA1 = 1,
1: +  PORT_SATA = 2,
1:  } port_type;
1:  
1:  struct pio_timing {
1: -	u8 reg0c;
1: -	u8 reg0d;
1: -	u8 reg13;
1: +  u8 reg0c;
1: +  u8 reg0d;
1: +  u8 reg13;
1:  };
1:  
1:  struct mwdma_timing {
1: -	u8 reg0e;
1: -	u8 reg0f;
1: +  u8 reg0e;
1: +  u8 reg0f;
1:  };
1:  
1:  struct udma_timing {
1: -	u8 reg10;
1: -	u8 reg11;
1: -	u8 reg12;
1: +  u8 reg10;
1: +  u8 reg11;
1: +  u8 reg12;
1:  };
1:  
1:  struct ich_laptop {
1: -	u16 device;
1: -	u16 subvendor;
1: -	u16 subdevice;
1: +  u16 device;
1: +  u16 subvendor;
1: +  u16 subdevice;
1:  };
1:  
1:  struct sis_laptop {
1: -	u16 device;
1: -	u16 subvendor;
1: -	u16 subdevice;
1: +  u16 device;
1: +  u16 subvendor;
1: +  u16 subdevice;
1:  };
1:  
1:  enum {
1: -	VIA_IDFLAG_SINGLE = 2,
1: +  VIA_IDFLAG_SINGLE = 2,
1:  };
1:  
1:  struct via_isa_bridge {
1: -	char *name;
1: -	u16 id;
1: -	u8 rev_min;
1: -	u8 rev_max;
1: -	u8 udma_mask;
1: -	u8 flags;
1: +  char *name;
1: +  u16 id;
1: +  u8 rev_min;
1: +  u8 rev_max;
1: +  u8 udma_mask;
1: +  u8 flags;
1:  };
1:  
1:  struct via82cxxx_dev {
1: -	struct via_isa_bridge *via_config;
1: -	unsigned int via_80w;
1: +  struct via_isa_bridge *via_config;
1: +  unsigned int via_80w;
1:  };
1:  
1:  struct ide_disk_obj {
1: -	ide_drive_t *drive;
1: -	struct ide_driver *driver;
1: -	struct gendisk *disk;
1: -	struct device dev;
1: -	unsigned int openers;
1: -	struct ide_atapi_pc queued_pc;
1: -	u8 sense_key;
1: -	u8 asc;
1: -	u8 ascq;
1: -	int progress_indication;
1: -	int blocks;
1: -	int block_size;
1: -	int bs_factor;
1: -	u8 cap_desc[8];
1: -	u8 flexible_disk_page[32];
1: +  ide_drive_t *drive;
1: +  struct ide_driver *driver;
1: +  struct gendisk *disk;
1: +  struct device dev;
1: +  unsigned int openers;
1: +  struct ide_atapi_pc queued_pc;
1: +  u8 sense_key;
1: +  u8 asc;
1: +  u8 ascq;
1: +  int progress_indication;
1: +  int blocks;
1: +  int block_size;
1: +  int bs_factor;
1: +  u8 cap_desc[8];
1: +  u8 flexible_disk_page[32];
1:  };
1:  
1:  typedef __u64 blist_flags_t;
1:  
1:  enum scsi_device_state {
1: -	SDEV_CREATED = 1,
1: -	SDEV_RUNNING = 2,
1: -	SDEV_CANCEL = 3,
1: -	SDEV_DEL = 4,
1: -	SDEV_QUIESCE = 5,
1: -	SDEV_OFFLINE = 6,
1: -	SDEV_TRANSPORT_OFFLINE = 7,
1: -	SDEV_BLOCK = 8,
1: -	SDEV_CREATED_BLOCK = 9,
1: +  SDEV_CREATED = 1,
1: +  SDEV_RUNNING = 2,
1: +  SDEV_CANCEL = 3,
1: +  SDEV_DEL = 4,
1: +  SDEV_QUIESCE = 5,
1: +  SDEV_OFFLINE = 6,
1: +  SDEV_TRANSPORT_OFFLINE = 7,
1: +  SDEV_BLOCK = 8,
1: +  SDEV_CREATED_BLOCK = 9,
1:  };
1:  
1:  struct scsi_vpd {
1: -	struct callback_head rcu;
1: -	int len;
1: -	unsigned char data[0];
1: +  struct callback_head rcu;
1: +  int len;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct Scsi_Host;
1: @@ -81468,125 +82565,125 @@ struct scsi_target;
1:  struct scsi_device_handler;
1:  
1:  struct scsi_device {
1: -	struct Scsi_Host *host;
1: -	struct request_queue *request_queue;
1: -	struct list_head siblings;
1: -	struct list_head same_target_siblings;
1: -	atomic_t device_busy;
1: -	atomic_t device_blocked;
1: -	atomic_t restarts;
1: -	spinlock_t list_lock;
1: -	struct list_head starved_entry;
1: -	short unsigned int queue_depth;
1: -	short unsigned int max_queue_depth;
1: -	short unsigned int last_queue_full_depth;
1: -	short unsigned int last_queue_full_count;
1: -	long unsigned int last_queue_full_time;
1: -	long unsigned int queue_ramp_up_period;
1: -	long unsigned int last_queue_ramp_up;
1: -	unsigned int id;
1: -	unsigned int channel;
1: -	u64 lun;
1: -	unsigned int manufacturer;
1: -	unsigned int sector_size;
1: -	void *hostdata;
1: -	unsigned char type;
1: -	char scsi_level;
1: -	char inq_periph_qual;
1: -	struct mutex inquiry_mutex;
1: -	unsigned char inquiry_len;
1: -	unsigned char *inquiry;
1: -	const char *vendor;
1: -	const char *model;
1: -	const char *rev;
1: -	struct scsi_vpd *vpd_pg0;
1: -	struct scsi_vpd *vpd_pg83;
1: -	struct scsi_vpd *vpd_pg80;
1: -	struct scsi_vpd *vpd_pg89;
1: -	unsigned char current_tag;
1: -	struct scsi_target *sdev_target;
1: -	blist_flags_t sdev_bflags;
1: -	unsigned int eh_timeout;
1: -	unsigned int removable: 1;
1: -	unsigned int changed: 1;
1: -	unsigned int busy: 1;
1: -	unsigned int lockable: 1;
1: -	unsigned int locked: 1;
1: -	unsigned int borken: 1;
1: -	unsigned int disconnect: 1;
1: -	unsigned int soft_reset: 1;
1: -	unsigned int sdtr: 1;
1: -	unsigned int wdtr: 1;
1: -	unsigned int ppr: 1;
1: -	unsigned int tagged_supported: 1;
1: -	unsigned int simple_tags: 1;
1: -	unsigned int was_reset: 1;
1: -	unsigned int expecting_cc_ua: 1;
1: -	unsigned int use_10_for_rw: 1;
1: -	unsigned int use_10_for_ms: 1;
1: -	unsigned int set_dbd_for_ms: 1;
1: -	unsigned int no_report_opcodes: 1;
1: -	unsigned int no_write_same: 1;
1: -	unsigned int use_16_for_rw: 1;
1: -	unsigned int skip_ms_page_8: 1;
1: -	unsigned int skip_ms_page_3f: 1;
1: -	unsigned int skip_vpd_pages: 1;
1: -	unsigned int try_vpd_pages: 1;
1: -	unsigned int use_192_bytes_for_3f: 1;
1: -	unsigned int no_start_on_add: 1;
1: -	unsigned int allow_restart: 1;
1: -	unsigned int manage_start_stop: 1;
1: -	unsigned int start_stop_pwr_cond: 1;
1: -	unsigned int no_uld_attach: 1;
1: -	unsigned int select_no_atn: 1;
1: -	unsigned int fix_capacity: 1;
1: -	unsigned int guess_capacity: 1;
1: -	unsigned int retry_hwerror: 1;
1: -	unsigned int last_sector_bug: 1;
1: -	unsigned int no_read_disc_info: 1;
1: -	unsigned int no_read_capacity_16: 1;
1: -	unsigned int try_rc_10_first: 1;
1: -	unsigned int security_supported: 1;
1: -	unsigned int is_visible: 1;
1: -	unsigned int wce_default_on: 1;
1: -	unsigned int no_dif: 1;
1: -	unsigned int broken_fua: 1;
1: -	unsigned int lun_in_cdb: 1;
1: -	unsigned int unmap_limit_for_ws: 1;
1: -	unsigned int rpm_autosuspend: 1;
1: -	bool offline_already;
1: -	atomic_t disk_events_disable_depth;
1: -	long unsigned int supported_events[1];
1: -	long unsigned int pending_events[1];
1: -	struct list_head event_list;
1: -	struct work_struct event_work;
1: -	unsigned int max_device_blocked;
1: -	atomic_t iorequest_cnt;
1: -	atomic_t iodone_cnt;
1: -	atomic_t ioerr_cnt;
1: -	struct device sdev_gendev;
1: -	struct device sdev_dev;
1: -	struct execute_work ew;
1: -	struct work_struct requeue_work;
1: -	struct scsi_device_handler *handler;
1: -	void *handler_data;
1: -	size_t dma_drain_len;
1: -	void *dma_drain_buf;
1: -	unsigned char access_state;
1: -	struct mutex state_mutex;
1: -	enum scsi_device_state sdev_state;
1: -	struct task_struct *quiesced_by;
1: -	long unsigned int sdev_data[0];
1: +  struct Scsi_Host *host;
1: +  struct request_queue *request_queue;
1: +  struct list_head siblings;
1: +  struct list_head same_target_siblings;
1: +  atomic_t device_busy;
1: +  atomic_t device_blocked;
1: +  atomic_t restarts;
1: +  spinlock_t list_lock;
1: +  struct list_head starved_entry;
1: +  short unsigned int queue_depth;
1: +  short unsigned int max_queue_depth;
1: +  short unsigned int last_queue_full_depth;
1: +  short unsigned int last_queue_full_count;
1: +  long unsigned int last_queue_full_time;
1: +  long unsigned int queue_ramp_up_period;
1: +  long unsigned int last_queue_ramp_up;
1: +  unsigned int id;
1: +  unsigned int channel;
1: +  u64 lun;
1: +  unsigned int manufacturer;
1: +  unsigned int sector_size;
1: +  void *hostdata;
1: +  unsigned char type;
1: +  char scsi_level;
1: +  char inq_periph_qual;
1: +  struct mutex inquiry_mutex;
1: +  unsigned char inquiry_len;
1: +  unsigned char *inquiry;
1: +  const char *vendor;
1: +  const char *model;
1: +  const char *rev;
1: +  struct scsi_vpd *vpd_pg0;
1: +  struct scsi_vpd *vpd_pg83;
1: +  struct scsi_vpd *vpd_pg80;
1: +  struct scsi_vpd *vpd_pg89;
1: +  unsigned char current_tag;
1: +  struct scsi_target *sdev_target;
1: +  blist_flags_t sdev_bflags;
1: +  unsigned int eh_timeout;
1: +  unsigned int removable : 1;
1: +  unsigned int changed : 1;
1: +  unsigned int busy : 1;
1: +  unsigned int lockable : 1;
1: +  unsigned int locked : 1;
1: +  unsigned int borken : 1;
1: +  unsigned int disconnect : 1;
1: +  unsigned int soft_reset : 1;
1: +  unsigned int sdtr : 1;
1: +  unsigned int wdtr : 1;
1: +  unsigned int ppr : 1;
1: +  unsigned int tagged_supported : 1;
1: +  unsigned int simple_tags : 1;
1: +  unsigned int was_reset : 1;
1: +  unsigned int expecting_cc_ua : 1;
1: +  unsigned int use_10_for_rw : 1;
1: +  unsigned int use_10_for_ms : 1;
1: +  unsigned int set_dbd_for_ms : 1;
1: +  unsigned int no_report_opcodes : 1;
1: +  unsigned int no_write_same : 1;
1: +  unsigned int use_16_for_rw : 1;
1: +  unsigned int skip_ms_page_8 : 1;
1: +  unsigned int skip_ms_page_3f : 1;
1: +  unsigned int skip_vpd_pages : 1;
1: +  unsigned int try_vpd_pages : 1;
1: +  unsigned int use_192_bytes_for_3f : 1;
1: +  unsigned int no_start_on_add : 1;
1: +  unsigned int allow_restart : 1;
1: +  unsigned int manage_start_stop : 1;
1: +  unsigned int start_stop_pwr_cond : 1;
1: +  unsigned int no_uld_attach : 1;
1: +  unsigned int select_no_atn : 1;
1: +  unsigned int fix_capacity : 1;
1: +  unsigned int guess_capacity : 1;
1: +  unsigned int retry_hwerror : 1;
1: +  unsigned int last_sector_bug : 1;
1: +  unsigned int no_read_disc_info : 1;
1: +  unsigned int no_read_capacity_16 : 1;
1: +  unsigned int try_rc_10_first : 1;
1: +  unsigned int security_supported : 1;
1: +  unsigned int is_visible : 1;
1: +  unsigned int wce_default_on : 1;
1: +  unsigned int no_dif : 1;
1: +  unsigned int broken_fua : 1;
1: +  unsigned int lun_in_cdb : 1;
1: +  unsigned int unmap_limit_for_ws : 1;
1: +  unsigned int rpm_autosuspend : 1;
1: +  bool offline_already;
1: +  atomic_t disk_events_disable_depth;
1: +  long unsigned int supported_events[1];
1: +  long unsigned int pending_events[1];
1: +  struct list_head event_list;
1: +  struct work_struct event_work;
1: +  unsigned int max_device_blocked;
1: +  atomic_t iorequest_cnt;
1: +  atomic_t iodone_cnt;
1: +  atomic_t ioerr_cnt;
1: +  struct device sdev_gendev;
1: +  struct device sdev_dev;
1: +  struct execute_work ew;
1: +  struct work_struct requeue_work;
1: +  struct scsi_device_handler *handler;
1: +  void *handler_data;
1: +  size_t dma_drain_len;
1: +  void *dma_drain_buf;
1: +  unsigned char access_state;
1: +  struct mutex state_mutex;
1: +  enum scsi_device_state sdev_state;
1: +  struct task_struct *quiesced_by;
1: +  long unsigned int sdev_data[0];
1:  };
1:  
1:  enum scsi_host_state {
1: -	SHOST_CREATED = 1,
1: -	SHOST_RUNNING = 2,
1: -	SHOST_CANCEL = 3,
1: -	SHOST_DEL = 4,
1: -	SHOST_RECOVERY = 5,
1: -	SHOST_CANCEL_RECOVERY = 6,
1: -	SHOST_DEL_RECOVERY = 7,
1: +  SHOST_CREATED = 1,
1: +  SHOST_RUNNING = 2,
1: +  SHOST_CANCEL = 3,
1: +  SHOST_DEL = 4,
1: +  SHOST_RECOVERY = 5,
1: +  SHOST_CANCEL_RECOVERY = 6,
1: +  SHOST_DEL_RECOVERY = 7,
1:  };
1:  
1:  struct scsi_host_template;
1: @@ -81594,304 +82691,306 @@ struct scsi_host_template;
1:  struct scsi_transport_template;
1:  
1:  struct Scsi_Host {
1: -	struct list_head __devices;
1: -	struct list_head __targets;
1: -	struct list_head starved_list;
1: -	spinlock_t default_lock;
1: -	spinlock_t *host_lock;
1: -	struct mutex scan_mutex;
1: -	struct list_head eh_cmd_q;
1: -	struct task_struct *ehandler;
1: -	struct completion *eh_action;
1: -	wait_queue_head_t host_wait;
1: -	struct scsi_host_template *hostt;
1: -	struct scsi_transport_template *transportt;
1: -	struct blk_mq_tag_set tag_set;
1: -	atomic_t host_blocked;
1: -	unsigned int host_failed;
1: -	unsigned int host_eh_scheduled;
1: -	unsigned int host_no;
1: -	int eh_deadline;
1: -	long unsigned int last_reset;
1: -	unsigned int max_channel;
1: -	unsigned int max_id;
1: -	u64 max_lun;
1: -	unsigned int unique_id;
1: -	short unsigned int max_cmd_len;
1: -	int this_id;
1: -	int can_queue;
1: -	short int cmd_per_lun;
1: -	short unsigned int sg_tablesize;
1: -	short unsigned int sg_prot_tablesize;
1: -	unsigned int max_sectors;
1: -	unsigned int max_segment_size;
1: -	long unsigned int dma_boundary;
1: -	long unsigned int virt_boundary_mask;
1: -	unsigned int nr_hw_queues;
1: -	unsigned int active_mode: 2;
1: -	unsigned int unchecked_isa_dma: 1;
1: -	unsigned int host_self_blocked: 1;
1: -	unsigned int reverse_ordering: 1;
1: -	unsigned int tmf_in_progress: 1;
1: -	unsigned int async_scan: 1;
1: -	unsigned int eh_noresume: 1;
1: -	unsigned int no_write_same: 1;
1: -	unsigned int host_tagset: 1;
1: -	unsigned int short_inquiry: 1;
1: -	unsigned int no_scsi2_lun_in_cdb: 1;
1: -	char work_q_name[20];
1: -	struct workqueue_struct *work_q;
1: -	struct workqueue_struct *tmf_work_q;
1: -	unsigned int max_host_blocked;
1: -	unsigned int prot_capabilities;
1: -	unsigned char prot_guard_type;
1: -	long unsigned int base;
1: -	long unsigned int io_port;
1: -	unsigned char n_io_port;
1: -	unsigned char dma_channel;
1: -	unsigned int irq;
1: -	enum scsi_host_state shost_state;
1: -	struct device shost_gendev;
1: -	struct device shost_dev;
1: -	void *shost_data;
1: -	struct device *dma_dev;
1: -	long unsigned int hostdata[0];
1: +  struct list_head __devices;
1: +  struct list_head __targets;
1: +  struct list_head starved_list;
1: +  spinlock_t default_lock;
1: +  spinlock_t *host_lock;
1: +  struct mutex scan_mutex;
1: +  struct list_head eh_cmd_q;
1: +  struct task_struct *ehandler;
1: +  struct completion *eh_action;
1: +  wait_queue_head_t host_wait;
1: +  struct scsi_host_template *hostt;
1: +  struct scsi_transport_template *transportt;
1: +  struct blk_mq_tag_set tag_set;
1: +  atomic_t host_blocked;
1: +  unsigned int host_failed;
1: +  unsigned int host_eh_scheduled;
1: +  unsigned int host_no;
1: +  int eh_deadline;
1: +  long unsigned int last_reset;
1: +  unsigned int max_channel;
1: +  unsigned int max_id;
1: +  u64 max_lun;
1: +  unsigned int unique_id;
1: +  short unsigned int max_cmd_len;
1: +  int this_id;
1: +  int can_queue;
1: +  short int cmd_per_lun;
1: +  short unsigned int sg_tablesize;
1: +  short unsigned int sg_prot_tablesize;
1: +  unsigned int max_sectors;
1: +  unsigned int max_segment_size;
1: +  long unsigned int dma_boundary;
1: +  long unsigned int virt_boundary_mask;
1: +  unsigned int nr_hw_queues;
1: +  unsigned int active_mode : 2;
1: +  unsigned int unchecked_isa_dma : 1;
1: +  unsigned int host_self_blocked : 1;
1: +  unsigned int reverse_ordering : 1;
1: +  unsigned int tmf_in_progress : 1;
1: +  unsigned int async_scan : 1;
1: +  unsigned int eh_noresume : 1;
1: +  unsigned int no_write_same : 1;
1: +  unsigned int host_tagset : 1;
1: +  unsigned int short_inquiry : 1;
1: +  unsigned int no_scsi2_lun_in_cdb : 1;
1: +  char work_q_name[20];
1: +  struct workqueue_struct *work_q;
1: +  struct workqueue_struct *tmf_work_q;
1: +  unsigned int max_host_blocked;
1: +  unsigned int prot_capabilities;
1: +  unsigned char prot_guard_type;
1: +  long unsigned int base;
1: +  long unsigned int io_port;
1: +  unsigned char n_io_port;
1: +  unsigned char dma_channel;
1: +  unsigned int irq;
1: +  enum scsi_host_state shost_state;
1: +  struct device shost_gendev;
1: +  struct device shost_dev;
1: +  void *shost_data;
1: +  struct device *dma_dev;
1: +  long unsigned int hostdata[0];
1:  };
1:  
1:  enum scsi_target_state {
1: -	STARGET_CREATED = 1,
1: -	STARGET_RUNNING = 2,
1: -	STARGET_REMOVE = 3,
1: -	STARGET_CREATED_REMOVE = 4,
1: -	STARGET_DEL = 5,
1: +  STARGET_CREATED = 1,
1: +  STARGET_RUNNING = 2,
1: +  STARGET_REMOVE = 3,
1: +  STARGET_CREATED_REMOVE = 4,
1: +  STARGET_DEL = 5,
1:  };
1:  
1:  struct scsi_target {
1: -	struct scsi_device *starget_sdev_user;
1: -	struct list_head siblings;
1: -	struct list_head devices;
1: -	struct device dev;
1: -	struct kref reap_ref;
1: -	unsigned int channel;
1: -	unsigned int id;
1: -	unsigned int create: 1;
1: -	unsigned int single_lun: 1;
1: -	unsigned int pdt_1f_for_no_lun: 1;
1: -	unsigned int no_report_luns: 1;
1: -	unsigned int expecting_lun_change: 1;
1: -	atomic_t target_busy;
1: -	atomic_t target_blocked;
1: -	unsigned int can_queue;
1: -	unsigned int max_target_blocked;
1: -	char scsi_level;
1: -	enum scsi_target_state state;
1: -	void *hostdata;
1: -	long unsigned int starget_data[0];
1: +  struct scsi_device *starget_sdev_user;
1: +  struct list_head siblings;
1: +  struct list_head devices;
1: +  struct device dev;
1: +  struct kref reap_ref;
1: +  unsigned int channel;
1: +  unsigned int id;
1: +  unsigned int create : 1;
1: +  unsigned int single_lun : 1;
1: +  unsigned int pdt_1f_for_no_lun : 1;
1: +  unsigned int no_report_luns : 1;
1: +  unsigned int expecting_lun_change : 1;
1: +  atomic_t target_busy;
1: +  atomic_t target_blocked;
1: +  unsigned int can_queue;
1: +  unsigned int max_target_blocked;
1: +  char scsi_level;
1: +  enum scsi_target_state state;
1: +  void *hostdata;
1: +  long unsigned int starget_data[0];
1:  };
1:  
1:  struct scsi_data_buffer {
1: -	struct sg_table table;
1: -	unsigned int length;
1: +  struct sg_table table;
1: +  unsigned int length;
1:  };
1:  
1:  struct scsi_pointer {
1: -	char *ptr;
1: -	int this_residual;
1: -	struct scatterlist *buffer;
1: -	int buffers_residual;
1: -	dma_addr_t dma_handle;
1: -	volatile int Status;
1: -	volatile int Message;
1: -	volatile int have_data_in;
1: -	volatile int sent_command;
1: -	volatile int phase;
1: +  char *ptr;
1: +  int this_residual;
1: +  struct scatterlist *buffer;
1: +  int buffers_residual;
1: +  dma_addr_t dma_handle;
1: +  volatile int Status;
1: +  volatile int Message;
1: +  volatile int have_data_in;
1: +  volatile int sent_command;
1: +  volatile int phase;
1:  };
1:  
1:  struct scsi_cmnd {
1: -	struct scsi_request req;
1: -	struct scsi_device *device;
1: -	struct list_head eh_entry;
1: -	struct delayed_work abort_work;
1: -	struct callback_head rcu;
1: -	int eh_eflags;
1: -	long unsigned int jiffies_at_alloc;
1: -	int retries;
1: -	int allowed;
1: -	unsigned char prot_op;
1: -	unsigned char prot_type;
1: -	unsigned char prot_flags;
1: -	short unsigned int cmd_len;
1: -	enum dma_data_direction sc_data_direction;
1: -	unsigned char *cmnd;
1: -	struct scsi_data_buffer sdb;
1: -	struct scsi_data_buffer *prot_sdb;
1: -	unsigned int underflow;
1: -	unsigned int transfersize;
1: -	struct request *request;
1: -	unsigned char *sense_buffer;
1: -	void (*scsi_done)(struct scsi_cmnd *);
1: -	struct scsi_pointer SCp;
1: -	unsigned char *host_scribble;
1: -	int result;
1: -	int flags;
1: -	long unsigned int state;
1: -	unsigned char tag;
1: -	unsigned int extra_len;
1: +  struct scsi_request req;
1: +  struct scsi_device *device;
1: +  struct list_head eh_entry;
1: +  struct delayed_work abort_work;
1: +  struct callback_head rcu;
1: +  int eh_eflags;
1: +  long unsigned int jiffies_at_alloc;
1: +  int retries;
1: +  int allowed;
1: +  unsigned char prot_op;
1: +  unsigned char prot_type;
1: +  unsigned char prot_flags;
1: +  short unsigned int cmd_len;
1: +  enum dma_data_direction sc_data_direction;
1: +  unsigned char *cmnd;
1: +  struct scsi_data_buffer sdb;
1: +  struct scsi_data_buffer *prot_sdb;
1: +  unsigned int underflow;
1: +  unsigned int transfersize;
1: +  struct request *request;
1: +  unsigned char *sense_buffer;
1: +  void (*scsi_done)(struct scsi_cmnd *);
1: +  struct scsi_pointer SCp;
1: +  unsigned char *host_scribble;
1: +  int result;
1: +  int flags;
1: +  long unsigned int state;
1: +  unsigned char tag;
1: +  unsigned int extra_len;
1:  };
1:  
1:  enum scsi_prot_operations {
1: -	SCSI_PROT_NORMAL = 0,
1: -	SCSI_PROT_READ_INSERT = 1,
1: -	SCSI_PROT_WRITE_STRIP = 2,
1: -	SCSI_PROT_READ_STRIP = 3,
1: -	SCSI_PROT_WRITE_INSERT = 4,
1: -	SCSI_PROT_READ_PASS = 5,
1: -	SCSI_PROT_WRITE_PASS = 6,
1: +  SCSI_PROT_NORMAL = 0,
1: +  SCSI_PROT_READ_INSERT = 1,
1: +  SCSI_PROT_WRITE_STRIP = 2,
1: +  SCSI_PROT_READ_STRIP = 3,
1: +  SCSI_PROT_WRITE_INSERT = 4,
1: +  SCSI_PROT_READ_PASS = 5,
1: +  SCSI_PROT_WRITE_PASS = 6,
1:  };
1:  
1:  struct scsi_driver {
1: -	struct device_driver gendrv;
1: -	void (*rescan)(struct device *);
1: -	blk_status_t (*init_command)(struct scsi_cmnd *);
1: -	void (*uninit_command)(struct scsi_cmnd *);
1: -	int (*done)(struct scsi_cmnd *);
1: -	int (*eh_action)(struct scsi_cmnd *, int);
1: -	void (*eh_reset)(struct scsi_cmnd *);
1: +  struct device_driver gendrv;
1: +  void (*rescan)(struct device *);
1: +  blk_status_t (*init_command)(struct scsi_cmnd *);
1: +  void (*uninit_command)(struct scsi_cmnd *);
1: +  int (*done)(struct scsi_cmnd *);
1: +  int (*eh_action)(struct scsi_cmnd *, int);
1: +  void (*eh_reset)(struct scsi_cmnd *);
1:  };
1:  
1:  struct scsi_host_cmd_pool;
1:  
1:  struct scsi_host_template {
1: -	struct module *module;
1: -	const char *name;
1: -	const char * (*info)(struct Scsi_Host *);
1: -	int (*ioctl)(struct scsi_device *, unsigned int, void *);
1: -	int (*compat_ioctl)(struct scsi_device *, unsigned int, void *);
1: -	int (*init_cmd_priv)(struct Scsi_Host *, struct scsi_cmnd *);
1: -	int (*exit_cmd_priv)(struct Scsi_Host *, struct scsi_cmnd *);
1: -	int (*queuecommand)(struct Scsi_Host *, struct scsi_cmnd *);
1: -	void (*commit_rqs)(struct Scsi_Host *, u16);
1: -	int (*eh_abort_handler)(struct scsi_cmnd *);
1: -	int (*eh_device_reset_handler)(struct scsi_cmnd *);
1: -	int (*eh_target_reset_handler)(struct scsi_cmnd *);
1: -	int (*eh_bus_reset_handler)(struct scsi_cmnd *);
1: -	int (*eh_host_reset_handler)(struct scsi_cmnd *);
1: -	int (*slave_alloc)(struct scsi_device *);
1: -	int (*slave_configure)(struct scsi_device *);
1: -	void (*slave_destroy)(struct scsi_device *);
1: -	int (*target_alloc)(struct scsi_target *);
1: -	void (*target_destroy)(struct scsi_target *);
1: -	int (*scan_finished)(struct Scsi_Host *, long unsigned int);
1: -	void (*scan_start)(struct Scsi_Host *);
1: -	int (*change_queue_depth)(struct scsi_device *, int);
1: -	int (*map_queues)(struct Scsi_Host *);
1: -	bool (*dma_need_drain)(struct request *);
1: -	int (*bios_param)(struct scsi_device *, struct block_device *, sector_t, int *);
1: -	void (*unlock_native_capacity)(struct scsi_device *);
1: -	int (*show_info)(struct seq_file *, struct Scsi_Host *);
1: -	int (*write_info)(struct Scsi_Host *, char *, int);
1: -	enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *);
1: -	int (*host_reset)(struct Scsi_Host *, int);
1: -	const char *proc_name;
1: -	struct proc_dir_entry *proc_dir;
1: -	int can_queue;
1: -	int this_id;
1: -	short unsigned int sg_tablesize;
1: -	short unsigned int sg_prot_tablesize;
1: -	unsigned int max_sectors;
1: -	unsigned int max_segment_size;
1: -	long unsigned int dma_boundary;
1: -	long unsigned int virt_boundary_mask;
1: -	short int cmd_per_lun;
1: -	unsigned char present;
1: -	int tag_alloc_policy;
1: -	unsigned int track_queue_depth: 1;
1: -	unsigned int supported_mode: 2;
1: -	unsigned int unchecked_isa_dma: 1;
1: -	unsigned int emulated: 1;
1: -	unsigned int skip_settle_delay: 1;
1: -	unsigned int no_write_same: 1;
1: -	unsigned int host_tagset: 1;
1: -	unsigned int max_host_blocked;
1: -	struct device_attribute **shost_attrs;
1: -	struct device_attribute **sdev_attrs;
1: -	const struct attribute_group **sdev_groups;
1: -	u64 vendor_id;
1: -	unsigned int cmd_size;
1: -	struct scsi_host_cmd_pool *cmd_pool;
1: -	int rpm_autosuspend_delay;
1: +  struct module *module;
1: +  const char *name;
1: +  const char *(*info)(struct Scsi_Host *);
1: +  int (*ioctl)(struct scsi_device *, unsigned int, void *);
1: +  int (*compat_ioctl)(struct scsi_device *, unsigned int, void *);
1: +  int (*init_cmd_priv)(struct Scsi_Host *, struct scsi_cmnd *);
1: +  int (*exit_cmd_priv)(struct Scsi_Host *, struct scsi_cmnd *);
1: +  int (*queuecommand)(struct Scsi_Host *, struct scsi_cmnd *);
1: +  void (*commit_rqs)(struct Scsi_Host *, u16);
1: +  int (*eh_abort_handler)(struct scsi_cmnd *);
1: +  int (*eh_device_reset_handler)(struct scsi_cmnd *);
1: +  int (*eh_target_reset_handler)(struct scsi_cmnd *);
1: +  int (*eh_bus_reset_handler)(struct scsi_cmnd *);
1: +  int (*eh_host_reset_handler)(struct scsi_cmnd *);
1: +  int (*slave_alloc)(struct scsi_device *);
1: +  int (*slave_configure)(struct scsi_device *);
1: +  void (*slave_destroy)(struct scsi_device *);
1: +  int (*target_alloc)(struct scsi_target *);
1: +  void (*target_destroy)(struct scsi_target *);
1: +  int (*scan_finished)(struct Scsi_Host *, long unsigned int);
1: +  void (*scan_start)(struct Scsi_Host *);
1: +  int (*change_queue_depth)(struct scsi_device *, int);
1: +  int (*map_queues)(struct Scsi_Host *);
1: +  bool (*dma_need_drain)(struct request *);
1: +  int (*bios_param)(struct scsi_device *, struct block_device *, sector_t,
1: +                    int *);
1: +  void (*unlock_native_capacity)(struct scsi_device *);
1: +  int (*show_info)(struct seq_file *, struct Scsi_Host *);
1: +  int (*write_info)(struct Scsi_Host *, char *, int);
1: +  enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *);
1: +  int (*host_reset)(struct Scsi_Host *, int);
1: +  const char *proc_name;
1: +  struct proc_dir_entry *proc_dir;
1: +  int can_queue;
1: +  int this_id;
1: +  short unsigned int sg_tablesize;
1: +  short unsigned int sg_prot_tablesize;
1: +  unsigned int max_sectors;
1: +  unsigned int max_segment_size;
1: +  long unsigned int dma_boundary;
1: +  long unsigned int virt_boundary_mask;
1: +  short int cmd_per_lun;
1: +  unsigned char present;
1: +  int tag_alloc_policy;
1: +  unsigned int track_queue_depth : 1;
1: +  unsigned int supported_mode : 2;
1: +  unsigned int unchecked_isa_dma : 1;
1: +  unsigned int emulated : 1;
1: +  unsigned int skip_settle_delay : 1;
1: +  unsigned int no_write_same : 1;
1: +  unsigned int host_tagset : 1;
1: +  unsigned int max_host_blocked;
1: +  struct device_attribute **shost_attrs;
1: +  struct device_attribute **sdev_attrs;
1: +  const struct attribute_group **sdev_groups;
1: +  u64 vendor_id;
1: +  unsigned int cmd_size;
1: +  struct scsi_host_cmd_pool *cmd_pool;
1: +  int rpm_autosuspend_delay;
1:  };
1:  
1:  struct trace_event_raw_scsi_dispatch_cmd_start {
1: -	struct trace_entry ent;
1: -	unsigned int host_no;
1: -	unsigned int channel;
1: -	unsigned int id;
1: -	unsigned int lun;
1: -	unsigned int opcode;
1: -	unsigned int cmd_len;
1: -	unsigned int data_sglen;
1: -	unsigned int prot_sglen;
1: -	unsigned char prot_op;
1: -	u32 __data_loc_cmnd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int host_no;
1: +  unsigned int channel;
1: +  unsigned int id;
1: +  unsigned int lun;
1: +  unsigned int opcode;
1: +  unsigned int cmd_len;
1: +  unsigned int data_sglen;
1: +  unsigned int prot_sglen;
1: +  unsigned char prot_op;
1: +  u32 __data_loc_cmnd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_scsi_dispatch_cmd_error {
1: -	struct trace_entry ent;
1: -	unsigned int host_no;
1: -	unsigned int channel;
1: -	unsigned int id;
1: -	unsigned int lun;
1: -	int rtn;
1: -	unsigned int opcode;
1: -	unsigned int cmd_len;
1: -	unsigned int data_sglen;
1: -	unsigned int prot_sglen;
1: -	unsigned char prot_op;
1: -	u32 __data_loc_cmnd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int host_no;
1: +  unsigned int channel;
1: +  unsigned int id;
1: +  unsigned int lun;
1: +  int rtn;
1: +  unsigned int opcode;
1: +  unsigned int cmd_len;
1: +  unsigned int data_sglen;
1: +  unsigned int prot_sglen;
1: +  unsigned char prot_op;
1: +  u32 __data_loc_cmnd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_scsi_cmd_done_timeout_template {
1: -	struct trace_entry ent;
1: -	unsigned int host_no;
1: -	unsigned int channel;
1: -	unsigned int id;
1: -	unsigned int lun;
1: -	int result;
1: -	unsigned int opcode;
1: -	unsigned int cmd_len;
1: -	unsigned int data_sglen;
1: -	unsigned int prot_sglen;
1: -	unsigned char prot_op;
1: -	u32 __data_loc_cmnd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int host_no;
1: +  unsigned int channel;
1: +  unsigned int id;
1: +  unsigned int lun;
1: +  int result;
1: +  unsigned int opcode;
1: +  unsigned int cmd_len;
1: +  unsigned int data_sglen;
1: +  unsigned int prot_sglen;
1: +  unsigned char prot_op;
1: +  u32 __data_loc_cmnd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_scsi_eh_wakeup {
1: -	struct trace_entry ent;
1: -	unsigned int host_no;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int host_no;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_scsi_dispatch_cmd_start {
1: -	u32 cmnd;
1: +  u32 cmnd;
1:  };
1:  
1:  struct trace_event_data_offsets_scsi_dispatch_cmd_error {
1: -	u32 cmnd;
1: +  u32 cmnd;
1:  };
1:  
1:  struct trace_event_data_offsets_scsi_cmd_done_timeout_template {
1: -	u32 cmnd;
1: +  u32 cmnd;
1:  };
1:  
1:  struct trace_event_data_offsets_scsi_eh_wakeup {};
1:  
1:  typedef void (*btf_trace_scsi_dispatch_cmd_start)(void *, struct scsi_cmnd *);
1:  
1: -typedef void (*btf_trace_scsi_dispatch_cmd_error)(void *, struct scsi_cmnd *, int);
1: +typedef void (*btf_trace_scsi_dispatch_cmd_error)(void *, struct scsi_cmnd *,
1: +                                                  int);
1:  
1:  typedef void (*btf_trace_scsi_dispatch_cmd_done)(void *, struct scsi_cmnd *);
1:  
1: @@ -81900,1057 +82999,1057 @@ typedef void (*btf_trace_scsi_dispatch_cmd_timeout)(void *, struct scsi_cmnd *);
1:  typedef void (*btf_trace_scsi_eh_wakeup)(void *, struct Scsi_Host *);
1:  
1:  struct scsi_transport_template {
1: -	struct transport_container host_attrs;
1: -	struct transport_container target_attrs;
1: -	struct transport_container device_attrs;
1: -	int (*user_scan)(struct Scsi_Host *, uint, uint, u64);
1: -	int device_size;
1: -	int device_private_offset;
1: -	int target_size;
1: -	int target_private_offset;
1: -	int host_size;
1: -	unsigned int create_work_queue: 1;
1: -	void (*eh_strategy_handler)(struct Scsi_Host *);
1: +  struct transport_container host_attrs;
1: +  struct transport_container target_attrs;
1: +  struct transport_container device_attrs;
1: +  int (*user_scan)(struct Scsi_Host *, uint, uint, u64);
1: +  int device_size;
1: +  int device_private_offset;
1: +  int target_size;
1: +  int target_private_offset;
1: +  int host_size;
1: +  unsigned int create_work_queue : 1;
1: +  void (*eh_strategy_handler)(struct Scsi_Host *);
1:  };
1:  
1:  struct scsi_host_busy_iter_data {
1: -	bool (*fn)(struct scsi_cmnd *, void *, bool);
1: -	void *priv;
1: +  bool (*fn)(struct scsi_cmnd *, void *, bool);
1: +  void *priv;
1:  };
1:  
1:  struct scsi_idlun {
1: -	__u32 dev_id;
1: -	__u32 host_unique_id;
1: +  __u32 dev_id;
1: +  __u32 host_unique_id;
1:  };
1:  
1:  typedef void (*activate_complete)(void *, int);
1:  
1:  struct scsi_device_handler {
1: -	struct list_head list;
1: -	struct module *module;
1: -	const char *name;
1: -	int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
1: -	int (*attach)(struct scsi_device *);
1: -	void (*detach)(struct scsi_device *);
1: -	int (*activate)(struct scsi_device *, activate_complete, void *);
1: -	blk_status_t (*prep_fn)(struct scsi_device *, struct request *);
1: -	int (*set_params)(struct scsi_device *, const char *);
1: -	void (*rescan)(struct scsi_device *);
1: +  struct list_head list;
1: +  struct module *module;
1: +  const char *name;
1: +  int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
1: +  int (*attach)(struct scsi_device *);
1: +  void (*detach)(struct scsi_device *);
1: +  int (*activate)(struct scsi_device *, activate_complete, void *);
1: +  blk_status_t (*prep_fn)(struct scsi_device *, struct request *);
1: +  int (*set_params)(struct scsi_device *, const char *);
1: +  void (*rescan)(struct scsi_device *);
1:  };
1:  
1:  struct scsi_eh_save {
1: -	int result;
1: -	unsigned int resid_len;
1: -	int eh_eflags;
1: -	enum dma_data_direction data_direction;
1: -	unsigned int underflow;
1: -	unsigned char cmd_len;
1: -	unsigned char prot_op;
1: -	unsigned char *cmnd;
1: -	struct scsi_data_buffer sdb;
1: -	unsigned char eh_cmnd[16];
1: -	struct scatterlist sense_sgl;
1: +  int result;
1: +  unsigned int resid_len;
1: +  int eh_eflags;
1: +  enum dma_data_direction data_direction;
1: +  unsigned int underflow;
1: +  unsigned char cmd_len;
1: +  unsigned char prot_op;
1: +  unsigned char *cmnd;
1: +  struct scsi_data_buffer sdb;
1: +  unsigned char eh_cmnd[16];
1: +  struct scatterlist sense_sgl;
1:  };
1:  
1:  struct scsi_varlen_cdb_hdr {
1: -	__u8 opcode;
1: -	__u8 control;
1: -	__u8 misc[5];
1: -	__u8 additional_cdb_length;
1: -	__be16 service_action;
1: +  __u8 opcode;
1: +  __u8 control;
1: +  __u8 misc[5];
1: +  __u8 additional_cdb_length;
1: +  __be16 service_action;
1:  };
1:  
1:  struct scsi_mode_data {
1: -	__u32 length;
1: -	__u16 block_descriptor_length;
1: -	__u8 medium_type;
1: -	__u8 device_specific;
1: -	__u8 header_length;
1: -	__u8 longlba: 1;
1: +  __u32 length;
1: +  __u16 block_descriptor_length;
1: +  __u8 medium_type;
1: +  __u8 device_specific;
1: +  __u8 header_length;
1: +  __u8 longlba : 1;
1:  };
1:  
1:  struct scsi_event {
1: -	enum scsi_device_event evt_type;
1: -	struct list_head node;
1: +  enum scsi_device_event evt_type;
1: +  struct list_head node;
1:  };
1:  
1:  enum scsi_host_prot_capabilities {
1: -	SHOST_DIF_TYPE1_PROTECTION = 1,
1: -	SHOST_DIF_TYPE2_PROTECTION = 2,
1: -	SHOST_DIF_TYPE3_PROTECTION = 4,
1: -	SHOST_DIX_TYPE0_PROTECTION = 8,
1: -	SHOST_DIX_TYPE1_PROTECTION = 16,
1: -	SHOST_DIX_TYPE2_PROTECTION = 32,
1: -	SHOST_DIX_TYPE3_PROTECTION = 64,
1: +  SHOST_DIF_TYPE1_PROTECTION = 1,
1: +  SHOST_DIF_TYPE2_PROTECTION = 2,
1: +  SHOST_DIF_TYPE3_PROTECTION = 4,
1: +  SHOST_DIX_TYPE0_PROTECTION = 8,
1: +  SHOST_DIX_TYPE1_PROTECTION = 16,
1: +  SHOST_DIX_TYPE2_PROTECTION = 32,
1: +  SHOST_DIX_TYPE3_PROTECTION = 64,
1:  };
1:  
1:  enum {
1: -	ACTION_FAIL = 0,
1: -	ACTION_REPREP = 1,
1: -	ACTION_RETRY = 2,
1: -	ACTION_DELAYED_RETRY = 3,
1: +  ACTION_FAIL = 0,
1: +  ACTION_REPREP = 1,
1: +  ACTION_RETRY = 2,
1: +  ACTION_DELAYED_RETRY = 3,
1:  };
1:  
1:  struct value_name_pair;
1:  
1:  struct sa_name_list {
1: -	int opcode;
1: -	const struct value_name_pair *arr;
1: -	int arr_sz;
1: +  int opcode;
1: +  const struct value_name_pair *arr;
1: +  int arr_sz;
1:  };
1:  
1:  struct value_name_pair {
1: -	int value;
1: -	const char *name;
1: +  int value;
1: +  const char *name;
1:  };
1:  
1:  struct error_info {
1: -	short unsigned int code12;
1: -	short unsigned int size;
1: +  short unsigned int code12;
1: +  short unsigned int size;
1:  };
1:  
1:  struct error_info2 {
1: -	unsigned char code1;
1: -	unsigned char code2_min;
1: -	unsigned char code2_max;
1: -	const char *str;
1: -	const char *fmt;
1: +  unsigned char code1;
1: +  unsigned char code2_min;
1: +  unsigned char code2_max;
1: +  const char *str;
1: +  const char *fmt;
1:  };
1:  
1:  struct scsi_lun {
1: -	__u8 scsi_lun[8];
1: +  __u8 scsi_lun[8];
1:  };
1:  
1:  enum scsi_timeouts {
1: -	SCSI_DEFAULT_EH_TIMEOUT = 10000,
1: +  SCSI_DEFAULT_EH_TIMEOUT = 10000,
1:  };
1:  
1:  enum scsi_scan_mode {
1: -	SCSI_SCAN_INITIAL = 0,
1: -	SCSI_SCAN_RESCAN = 1,
1: -	SCSI_SCAN_MANUAL = 2,
1: +  SCSI_SCAN_INITIAL = 0,
1: +  SCSI_SCAN_RESCAN = 1,
1: +  SCSI_SCAN_MANUAL = 2,
1:  };
1:  
1:  struct async_scan_data {
1: -	struct list_head list;
1: -	struct Scsi_Host *shost;
1: -	struct completion prev_finished;
1: +  struct list_head list;
1: +  struct Scsi_Host *shost;
1: +  struct completion prev_finished;
1:  };
1:  
1:  enum scsi_devinfo_key {
1: -	SCSI_DEVINFO_GLOBAL = 0,
1: -	SCSI_DEVINFO_SPI = 1,
1: +  SCSI_DEVINFO_GLOBAL = 0,
1: +  SCSI_DEVINFO_SPI = 1,
1:  };
1:  
1:  struct scsi_dev_info_list {
1: -	struct list_head dev_info_list;
1: -	char vendor[8];
1: -	char model[16];
1: -	blist_flags_t flags;
1: -	unsigned int compatible;
1: +  struct list_head dev_info_list;
1: +  char vendor[8];
1: +  char model[16];
1: +  blist_flags_t flags;
1: +  unsigned int compatible;
1:  };
1:  
1:  struct scsi_dev_info_list_table {
1: -	struct list_head node;
1: -	struct list_head scsi_dev_info_list;
1: -	const char *name;
1: -	int key;
1: +  struct list_head node;
1: +  struct list_head scsi_dev_info_list;
1: +  const char *name;
1: +  int key;
1:  };
1:  
1:  struct double_list {
1: -	struct list_head *top;
1: -	struct list_head *bottom;
1: +  struct list_head *top;
1: +  struct list_head *bottom;
1:  };
1:  
1:  struct scsi_nl_hdr {
1: -	__u8 version;
1: -	__u8 transport;
1: -	__u16 magic;
1: -	__u16 msgtype;
1: -	__u16 msglen;
1: +  __u8 version;
1: +  __u8 transport;
1: +  __u16 magic;
1: +  __u16 msgtype;
1: +  __u16 msglen;
1:  };
1:  
1:  struct spi_transport_attrs {
1: -	int period;
1: -	int min_period;
1: -	int offset;
1: -	int max_offset;
1: -	unsigned int width: 1;
1: -	unsigned int max_width: 1;
1: -	unsigned int iu: 1;
1: -	unsigned int max_iu: 1;
1: -	unsigned int dt: 1;
1: -	unsigned int qas: 1;
1: -	unsigned int max_qas: 1;
1: -	unsigned int wr_flow: 1;
1: -	unsigned int rd_strm: 1;
1: -	unsigned int rti: 1;
1: -	unsigned int pcomp_en: 1;
1: -	unsigned int hold_mcs: 1;
1: -	unsigned int initial_dv: 1;
1: -	long unsigned int flags;
1: -	unsigned int support_sync: 1;
1: -	unsigned int support_wide: 1;
1: -	unsigned int support_dt: 1;
1: -	unsigned int support_dt_only;
1: -	unsigned int support_ius;
1: -	unsigned int support_qas;
1: -	unsigned int dv_pending: 1;
1: -	unsigned int dv_in_progress: 1;
1: -	struct mutex dv_mutex;
1: +  int period;
1: +  int min_period;
1: +  int offset;
1: +  int max_offset;
1: +  unsigned int width : 1;
1: +  unsigned int max_width : 1;
1: +  unsigned int iu : 1;
1: +  unsigned int max_iu : 1;
1: +  unsigned int dt : 1;
1: +  unsigned int qas : 1;
1: +  unsigned int max_qas : 1;
1: +  unsigned int wr_flow : 1;
1: +  unsigned int rd_strm : 1;
1: +  unsigned int rti : 1;
1: +  unsigned int pcomp_en : 1;
1: +  unsigned int hold_mcs : 1;
1: +  unsigned int initial_dv : 1;
1: +  long unsigned int flags;
1: +  unsigned int support_sync : 1;
1: +  unsigned int support_wide : 1;
1: +  unsigned int support_dt : 1;
1: +  unsigned int support_dt_only;
1: +  unsigned int support_ius;
1: +  unsigned int support_qas;
1: +  unsigned int dv_pending : 1;
1: +  unsigned int dv_in_progress : 1;
1: +  struct mutex dv_mutex;
1:  };
1:  
1:  enum spi_signal_type {
1: -	SPI_SIGNAL_UNKNOWN = 1,
1: -	SPI_SIGNAL_SE = 2,
1: -	SPI_SIGNAL_LVD = 3,
1: -	SPI_SIGNAL_HVD = 4,
1: +  SPI_SIGNAL_UNKNOWN = 1,
1: +  SPI_SIGNAL_SE = 2,
1: +  SPI_SIGNAL_LVD = 3,
1: +  SPI_SIGNAL_HVD = 4,
1:  };
1:  
1:  struct spi_host_attrs {
1: -	enum spi_signal_type signalling;
1: +  enum spi_signal_type signalling;
1:  };
1:  
1:  struct spi_function_template {
1: -	void (*get_period)(struct scsi_target *);
1: -	void (*set_period)(struct scsi_target *, int);
1: -	void (*get_offset)(struct scsi_target *);
1: -	void (*set_offset)(struct scsi_target *, int);
1: -	void (*get_width)(struct scsi_target *);
1: -	void (*set_width)(struct scsi_target *, int);
1: -	void (*get_iu)(struct scsi_target *);
1: -	void (*set_iu)(struct scsi_target *, int);
1: -	void (*get_dt)(struct scsi_target *);
1: -	void (*set_dt)(struct scsi_target *, int);
1: -	void (*get_qas)(struct scsi_target *);
1: -	void (*set_qas)(struct scsi_target *, int);
1: -	void (*get_wr_flow)(struct scsi_target *);
1: -	void (*set_wr_flow)(struct scsi_target *, int);
1: -	void (*get_rd_strm)(struct scsi_target *);
1: -	void (*set_rd_strm)(struct scsi_target *, int);
1: -	void (*get_rti)(struct scsi_target *);
1: -	void (*set_rti)(struct scsi_target *, int);
1: -	void (*get_pcomp_en)(struct scsi_target *);
1: -	void (*set_pcomp_en)(struct scsi_target *, int);
1: -	void (*get_hold_mcs)(struct scsi_target *);
1: -	void (*set_hold_mcs)(struct scsi_target *, int);
1: -	void (*get_signalling)(struct Scsi_Host *);
1: -	void (*set_signalling)(struct Scsi_Host *, enum spi_signal_type);
1: -	int (*deny_binding)(struct scsi_target *);
1: -	long unsigned int show_period: 1;
1: -	long unsigned int show_offset: 1;
1: -	long unsigned int show_width: 1;
1: -	long unsigned int show_iu: 1;
1: -	long unsigned int show_dt: 1;
1: -	long unsigned int show_qas: 1;
1: -	long unsigned int show_wr_flow: 1;
1: -	long unsigned int show_rd_strm: 1;
1: -	long unsigned int show_rti: 1;
1: -	long unsigned int show_pcomp_en: 1;
1: -	long unsigned int show_hold_mcs: 1;
1: -};
1: -
1: -enum {
1: -	SPI_BLIST_NOIUS = 1,
1: +  void (*get_period)(struct scsi_target *);
1: +  void (*set_period)(struct scsi_target *, int);
1: +  void (*get_offset)(struct scsi_target *);
1: +  void (*set_offset)(struct scsi_target *, int);
1: +  void (*get_width)(struct scsi_target *);
1: +  void (*set_width)(struct scsi_target *, int);
1: +  void (*get_iu)(struct scsi_target *);
1: +  void (*set_iu)(struct scsi_target *, int);
1: +  void (*get_dt)(struct scsi_target *);
1: +  void (*set_dt)(struct scsi_target *, int);
1: +  void (*get_qas)(struct scsi_target *);
1: +  void (*set_qas)(struct scsi_target *, int);
1: +  void (*get_wr_flow)(struct scsi_target *);
1: +  void (*set_wr_flow)(struct scsi_target *, int);
1: +  void (*get_rd_strm)(struct scsi_target *);
1: +  void (*set_rd_strm)(struct scsi_target *, int);
1: +  void (*get_rti)(struct scsi_target *);
1: +  void (*set_rti)(struct scsi_target *, int);
1: +  void (*get_pcomp_en)(struct scsi_target *);
1: +  void (*set_pcomp_en)(struct scsi_target *, int);
1: +  void (*get_hold_mcs)(struct scsi_target *);
1: +  void (*set_hold_mcs)(struct scsi_target *, int);
1: +  void (*get_signalling)(struct Scsi_Host *);
1: +  void (*set_signalling)(struct Scsi_Host *, enum spi_signal_type);
1: +  int (*deny_binding)(struct scsi_target *);
1: +  long unsigned int show_period : 1;
1: +  long unsigned int show_offset : 1;
1: +  long unsigned int show_width : 1;
1: +  long unsigned int show_iu : 1;
1: +  long unsigned int show_dt : 1;
1: +  long unsigned int show_qas : 1;
1: +  long unsigned int show_wr_flow : 1;
1: +  long unsigned int show_rd_strm : 1;
1: +  long unsigned int show_rti : 1;
1: +  long unsigned int show_pcomp_en : 1;
1: +  long unsigned int show_hold_mcs : 1;
1: +};
1: +
1: +enum {
1: +  SPI_BLIST_NOIUS = 1,
1:  };
1:  
1:  struct spi_internal {
1: -	struct scsi_transport_template t;
1: -	struct spi_function_template *f;
1: +  struct scsi_transport_template t;
1: +  struct spi_function_template *f;
1:  };
1:  
1:  enum spi_compare_returns {
1: -	SPI_COMPARE_SUCCESS = 0,
1: -	SPI_COMPARE_FAILURE = 1,
1: -	SPI_COMPARE_SKIP_TEST = 2,
1: +  SPI_COMPARE_SUCCESS = 0,
1: +  SPI_COMPARE_FAILURE = 1,
1: +  SPI_COMPARE_SKIP_TEST = 2,
1:  };
1:  
1:  struct work_queue_wrapper {
1: -	struct work_struct work;
1: -	struct scsi_device *sdev;
1: +  struct work_struct work;
1: +  struct scsi_device *sdev;
1:  };
1:  
1:  enum fc_port_type {
1: -	FC_PORTTYPE_UNKNOWN = 0,
1: -	FC_PORTTYPE_OTHER = 1,
1: -	FC_PORTTYPE_NOTPRESENT = 2,
1: -	FC_PORTTYPE_NPORT = 3,
1: -	FC_PORTTYPE_NLPORT = 4,
1: -	FC_PORTTYPE_LPORT = 5,
1: -	FC_PORTTYPE_PTP = 6,
1: -	FC_PORTTYPE_NPIV = 7,
1: +  FC_PORTTYPE_UNKNOWN = 0,
1: +  FC_PORTTYPE_OTHER = 1,
1: +  FC_PORTTYPE_NOTPRESENT = 2,
1: +  FC_PORTTYPE_NPORT = 3,
1: +  FC_PORTTYPE_NLPORT = 4,
1: +  FC_PORTTYPE_LPORT = 5,
1: +  FC_PORTTYPE_PTP = 6,
1: +  FC_PORTTYPE_NPIV = 7,
1:  };
1:  
1:  enum fc_port_state {
1: -	FC_PORTSTATE_UNKNOWN = 0,
1: -	FC_PORTSTATE_NOTPRESENT = 1,
1: -	FC_PORTSTATE_ONLINE = 2,
1: -	FC_PORTSTATE_OFFLINE = 3,
1: -	FC_PORTSTATE_BLOCKED = 4,
1: -	FC_PORTSTATE_BYPASSED = 5,
1: -	FC_PORTSTATE_DIAGNOSTICS = 6,
1: -	FC_PORTSTATE_LINKDOWN = 7,
1: -	FC_PORTSTATE_ERROR = 8,
1: -	FC_PORTSTATE_LOOPBACK = 9,
1: -	FC_PORTSTATE_DELETED = 10,
1: +  FC_PORTSTATE_UNKNOWN = 0,
1: +  FC_PORTSTATE_NOTPRESENT = 1,
1: +  FC_PORTSTATE_ONLINE = 2,
1: +  FC_PORTSTATE_OFFLINE = 3,
1: +  FC_PORTSTATE_BLOCKED = 4,
1: +  FC_PORTSTATE_BYPASSED = 5,
1: +  FC_PORTSTATE_DIAGNOSTICS = 6,
1: +  FC_PORTSTATE_LINKDOWN = 7,
1: +  FC_PORTSTATE_ERROR = 8,
1: +  FC_PORTSTATE_LOOPBACK = 9,
1: +  FC_PORTSTATE_DELETED = 10,
1:  };
1:  
1:  enum fc_vport_state {
1: -	FC_VPORT_UNKNOWN = 0,
1: -	FC_VPORT_ACTIVE = 1,
1: -	FC_VPORT_DISABLED = 2,
1: -	FC_VPORT_LINKDOWN = 3,
1: -	FC_VPORT_INITIALIZING = 4,
1: -	FC_VPORT_NO_FABRIC_SUPP = 5,
1: -	FC_VPORT_NO_FABRIC_RSCS = 6,
1: -	FC_VPORT_FABRIC_LOGOUT = 7,
1: -	FC_VPORT_FABRIC_REJ_WWN = 8,
1: -	FC_VPORT_FAILED = 9,
1: +  FC_VPORT_UNKNOWN = 0,
1: +  FC_VPORT_ACTIVE = 1,
1: +  FC_VPORT_DISABLED = 2,
1: +  FC_VPORT_LINKDOWN = 3,
1: +  FC_VPORT_INITIALIZING = 4,
1: +  FC_VPORT_NO_FABRIC_SUPP = 5,
1: +  FC_VPORT_NO_FABRIC_RSCS = 6,
1: +  FC_VPORT_FABRIC_LOGOUT = 7,
1: +  FC_VPORT_FABRIC_REJ_WWN = 8,
1: +  FC_VPORT_FAILED = 9,
1:  };
1:  
1:  enum fc_tgtid_binding_type {
1: -	FC_TGTID_BIND_NONE = 0,
1: -	FC_TGTID_BIND_BY_WWPN = 1,
1: -	FC_TGTID_BIND_BY_WWNN = 2,
1: -	FC_TGTID_BIND_BY_ID = 3,
1: +  FC_TGTID_BIND_NONE = 0,
1: +  FC_TGTID_BIND_BY_WWPN = 1,
1: +  FC_TGTID_BIND_BY_WWNN = 2,
1: +  FC_TGTID_BIND_BY_ID = 3,
1:  };
1:  
1:  struct fc_vport_identifiers {
1: -	u64 node_name;
1: -	u64 port_name;
1: -	u32 roles;
1: -	bool disable;
1: -	enum fc_port_type vport_type;
1: -	char symbolic_name[64];
1: +  u64 node_name;
1: +  u64 port_name;
1: +  u32 roles;
1: +  bool disable;
1: +  enum fc_port_type vport_type;
1: +  char symbolic_name[64];
1:  };
1:  
1:  struct fc_vport {
1: -	enum fc_vport_state vport_state;
1: -	enum fc_vport_state vport_last_state;
1: -	u64 node_name;
1: -	u64 port_name;
1: -	u32 roles;
1: -	u32 vport_id;
1: -	enum fc_port_type vport_type;
1: -	char symbolic_name[64];
1: -	void *dd_data;
1: -	struct Scsi_Host *shost;
1: -	unsigned int channel;
1: -	u32 number;
1: -	u8 flags;
1: -	struct list_head peers;
1: -	struct device dev;
1: -	struct work_struct vport_delete_work;
1: +  enum fc_vport_state vport_state;
1: +  enum fc_vport_state vport_last_state;
1: +  u64 node_name;
1: +  u64 port_name;
1: +  u32 roles;
1: +  u32 vport_id;
1: +  enum fc_port_type vport_type;
1: +  char symbolic_name[64];
1: +  void *dd_data;
1: +  struct Scsi_Host *shost;
1: +  unsigned int channel;
1: +  u32 number;
1: +  u8 flags;
1: +  struct list_head peers;
1: +  struct device dev;
1: +  struct work_struct vport_delete_work;
1:  };
1:  
1:  struct fc_rport_identifiers {
1: -	u64 node_name;
1: -	u64 port_name;
1: -	u32 port_id;
1: -	u32 roles;
1: +  u64 node_name;
1: +  u64 port_name;
1: +  u32 port_id;
1: +  u32 roles;
1:  };
1:  
1:  struct fc_rport {
1: -	u32 maxframe_size;
1: -	u32 supported_classes;
1: -	u32 dev_loss_tmo;
1: -	u64 node_name;
1: -	u64 port_name;
1: -	u32 port_id;
1: -	u32 roles;
1: -	enum fc_port_state port_state;
1: -	u32 scsi_target_id;
1: -	u32 fast_io_fail_tmo;
1: -	void *dd_data;
1: -	unsigned int channel;
1: -	u32 number;
1: -	u8 flags;
1: -	struct list_head peers;
1: -	struct device dev;
1: -	struct delayed_work dev_loss_work;
1: -	struct work_struct scan_work;
1: -	struct delayed_work fail_io_work;
1: -	struct work_struct stgt_delete_work;
1: -	struct work_struct rport_delete_work;
1: -	struct request_queue *rqst_q;
1: +  u32 maxframe_size;
1: +  u32 supported_classes;
1: +  u32 dev_loss_tmo;
1: +  u64 node_name;
1: +  u64 port_name;
1: +  u32 port_id;
1: +  u32 roles;
1: +  enum fc_port_state port_state;
1: +  u32 scsi_target_id;
1: +  u32 fast_io_fail_tmo;
1: +  void *dd_data;
1: +  unsigned int channel;
1: +  u32 number;
1: +  u8 flags;
1: +  struct list_head peers;
1: +  struct device dev;
1: +  struct delayed_work dev_loss_work;
1: +  struct work_struct scan_work;
1: +  struct delayed_work fail_io_work;
1: +  struct work_struct stgt_delete_work;
1: +  struct work_struct rport_delete_work;
1: +  struct request_queue *rqst_q;
1:  };
1:  
1:  struct fc_starget_attrs {
1: -	u64 node_name;
1: -	u64 port_name;
1: -	u32 port_id;
1: +  u64 node_name;
1: +  u64 port_name;
1: +  u32 port_id;
1:  };
1:  
1:  struct fc_host_statistics {
1: -	u64 seconds_since_last_reset;
1: -	u64 tx_frames;
1: -	u64 tx_words;
1: -	u64 rx_frames;
1: -	u64 rx_words;
1: -	u64 lip_count;
1: -	u64 nos_count;
1: -	u64 error_frames;
1: -	u64 dumped_frames;
1: -	u64 link_failure_count;
1: -	u64 loss_of_sync_count;
1: -	u64 loss_of_signal_count;
1: -	u64 prim_seq_protocol_err_count;
1: -	u64 invalid_tx_word_count;
1: -	u64 invalid_crc_count;
1: -	u64 fcp_input_requests;
1: -	u64 fcp_output_requests;
1: -	u64 fcp_control_requests;
1: -	u64 fcp_input_megabytes;
1: -	u64 fcp_output_megabytes;
1: -	u64 fcp_packet_alloc_failures;
1: -	u64 fcp_packet_aborts;
1: -	u64 fcp_frame_alloc_failures;
1: -	u64 fc_no_free_exch;
1: -	u64 fc_no_free_exch_xid;
1: -	u64 fc_xid_not_found;
1: -	u64 fc_xid_busy;
1: -	u64 fc_seq_not_found;
1: -	u64 fc_non_bls_resp;
1: +  u64 seconds_since_last_reset;
1: +  u64 tx_frames;
1: +  u64 tx_words;
1: +  u64 rx_frames;
1: +  u64 rx_words;
1: +  u64 lip_count;
1: +  u64 nos_count;
1: +  u64 error_frames;
1: +  u64 dumped_frames;
1: +  u64 link_failure_count;
1: +  u64 loss_of_sync_count;
1: +  u64 loss_of_signal_count;
1: +  u64 prim_seq_protocol_err_count;
1: +  u64 invalid_tx_word_count;
1: +  u64 invalid_crc_count;
1: +  u64 fcp_input_requests;
1: +  u64 fcp_output_requests;
1: +  u64 fcp_control_requests;
1: +  u64 fcp_input_megabytes;
1: +  u64 fcp_output_megabytes;
1: +  u64 fcp_packet_alloc_failures;
1: +  u64 fcp_packet_aborts;
1: +  u64 fcp_frame_alloc_failures;
1: +  u64 fc_no_free_exch;
1: +  u64 fc_no_free_exch_xid;
1: +  u64 fc_xid_not_found;
1: +  u64 fc_xid_busy;
1: +  u64 fc_seq_not_found;
1: +  u64 fc_non_bls_resp;
1:  };
1:  
1:  enum fc_host_event_code {
1: -	FCH_EVT_LIP = 1,
1: -	FCH_EVT_LINKUP = 2,
1: -	FCH_EVT_LINKDOWN = 3,
1: -	FCH_EVT_LIPRESET = 4,
1: -	FCH_EVT_RSCN = 5,
1: -	FCH_EVT_ADAPTER_CHANGE = 259,
1: -	FCH_EVT_PORT_UNKNOWN = 512,
1: -	FCH_EVT_PORT_OFFLINE = 513,
1: -	FCH_EVT_PORT_ONLINE = 514,
1: -	FCH_EVT_PORT_FABRIC = 516,
1: -	FCH_EVT_LINK_UNKNOWN = 1280,
1: -	FCH_EVT_LINK_FPIN = 1281,
1: -	FCH_EVT_VENDOR_UNIQUE = 65535,
1: +  FCH_EVT_LIP = 1,
1: +  FCH_EVT_LINKUP = 2,
1: +  FCH_EVT_LINKDOWN = 3,
1: +  FCH_EVT_LIPRESET = 4,
1: +  FCH_EVT_RSCN = 5,
1: +  FCH_EVT_ADAPTER_CHANGE = 259,
1: +  FCH_EVT_PORT_UNKNOWN = 512,
1: +  FCH_EVT_PORT_OFFLINE = 513,
1: +  FCH_EVT_PORT_ONLINE = 514,
1: +  FCH_EVT_PORT_FABRIC = 516,
1: +  FCH_EVT_LINK_UNKNOWN = 1280,
1: +  FCH_EVT_LINK_FPIN = 1281,
1: +  FCH_EVT_VENDOR_UNIQUE = 65535,
1:  };
1:  
1:  struct fc_host_attrs {
1: -	u64 node_name;
1: -	u64 port_name;
1: -	u64 permanent_port_name;
1: -	u32 supported_classes;
1: -	u8 supported_fc4s[32];
1: -	u32 supported_speeds;
1: -	u32 maxframe_size;
1: -	u16 max_npiv_vports;
1: -	char serial_number[80];
1: -	char manufacturer[80];
1: -	char model[256];
1: -	char model_description[256];
1: -	char hardware_version[64];
1: -	char driver_version[64];
1: -	char firmware_version[64];
1: -	char optionrom_version[64];
1: -	u32 port_id;
1: -	enum fc_port_type port_type;
1: -	enum fc_port_state port_state;
1: -	u8 active_fc4s[32];
1: -	u32 speed;
1: -	u64 fabric_name;
1: -	char symbolic_name[256];
1: -	char system_hostname[256];
1: -	u32 dev_loss_tmo;
1: -	enum fc_tgtid_binding_type tgtid_bind_type;
1: -	struct list_head rports;
1: -	struct list_head rport_bindings;
1: -	struct list_head vports;
1: -	u32 next_rport_number;
1: -	u32 next_target_id;
1: -	u32 next_vport_number;
1: -	u16 npiv_vports_inuse;
1: -	char work_q_name[20];
1: -	struct workqueue_struct *work_q;
1: -	char devloss_work_q_name[20];
1: -	struct workqueue_struct *devloss_work_q;
1: -	struct request_queue *rqst_q;
1: +  u64 node_name;
1: +  u64 port_name;
1: +  u64 permanent_port_name;
1: +  u32 supported_classes;
1: +  u8 supported_fc4s[32];
1: +  u32 supported_speeds;
1: +  u32 maxframe_size;
1: +  u16 max_npiv_vports;
1: +  char serial_number[80];
1: +  char manufacturer[80];
1: +  char model[256];
1: +  char model_description[256];
1: +  char hardware_version[64];
1: +  char driver_version[64];
1: +  char firmware_version[64];
1: +  char optionrom_version[64];
1: +  u32 port_id;
1: +  enum fc_port_type port_type;
1: +  enum fc_port_state port_state;
1: +  u8 active_fc4s[32];
1: +  u32 speed;
1: +  u64 fabric_name;
1: +  char symbolic_name[256];
1: +  char system_hostname[256];
1: +  u32 dev_loss_tmo;
1: +  enum fc_tgtid_binding_type tgtid_bind_type;
1: +  struct list_head rports;
1: +  struct list_head rport_bindings;
1: +  struct list_head vports;
1: +  u32 next_rport_number;
1: +  u32 next_target_id;
1: +  u32 next_vport_number;
1: +  u16 npiv_vports_inuse;
1: +  char work_q_name[20];
1: +  struct workqueue_struct *work_q;
1: +  char devloss_work_q_name[20];
1: +  struct workqueue_struct *devloss_work_q;
1: +  struct request_queue *rqst_q;
1:  };
1:  
1:  struct fc_function_template {
1: -	void (*get_rport_dev_loss_tmo)(struct fc_rport *);
1: -	void (*set_rport_dev_loss_tmo)(struct fc_rport *, u32);
1: -	void (*get_starget_node_name)(struct scsi_target *);
1: -	void (*get_starget_port_name)(struct scsi_target *);
1: -	void (*get_starget_port_id)(struct scsi_target *);
1: -	void (*get_host_port_id)(struct Scsi_Host *);
1: -	void (*get_host_port_type)(struct Scsi_Host *);
1: -	void (*get_host_port_state)(struct Scsi_Host *);
1: -	void (*get_host_active_fc4s)(struct Scsi_Host *);
1: -	void (*get_host_speed)(struct Scsi_Host *);
1: -	void (*get_host_fabric_name)(struct Scsi_Host *);
1: -	void (*get_host_symbolic_name)(struct Scsi_Host *);
1: -	void (*set_host_system_hostname)(struct Scsi_Host *);
1: -	struct fc_host_statistics * (*get_fc_host_stats)(struct Scsi_Host *);
1: -	void (*reset_fc_host_stats)(struct Scsi_Host *);
1: -	int (*issue_fc_host_lip)(struct Scsi_Host *);
1: -	void (*dev_loss_tmo_callbk)(struct fc_rport *);
1: -	void (*terminate_rport_io)(struct fc_rport *);
1: -	void (*set_vport_symbolic_name)(struct fc_vport *);
1: -	int (*vport_create)(struct fc_vport *, bool);
1: -	int (*vport_disable)(struct fc_vport *, bool);
1: -	int (*vport_delete)(struct fc_vport *);
1: -	int (*bsg_request)(struct bsg_job *);
1: -	int (*bsg_timeout)(struct bsg_job *);
1: -	u32 dd_fcrport_size;
1: -	u32 dd_fcvport_size;
1: -	u32 dd_bsg_size;
1: -	long unsigned int show_rport_maxframe_size: 1;
1: -	long unsigned int show_rport_supported_classes: 1;
1: -	long unsigned int show_rport_dev_loss_tmo: 1;
1: -	long unsigned int show_starget_node_name: 1;
1: -	long unsigned int show_starget_port_name: 1;
1: -	long unsigned int show_starget_port_id: 1;
1: -	long unsigned int show_host_node_name: 1;
1: -	long unsigned int show_host_port_name: 1;
1: -	long unsigned int show_host_permanent_port_name: 1;
1: -	long unsigned int show_host_supported_classes: 1;
1: -	long unsigned int show_host_supported_fc4s: 1;
1: -	long unsigned int show_host_supported_speeds: 1;
1: -	long unsigned int show_host_maxframe_size: 1;
1: -	long unsigned int show_host_serial_number: 1;
1: -	long unsigned int show_host_manufacturer: 1;
1: -	long unsigned int show_host_model: 1;
1: -	long unsigned int show_host_model_description: 1;
1: -	long unsigned int show_host_hardware_version: 1;
1: -	long unsigned int show_host_driver_version: 1;
1: -	long unsigned int show_host_firmware_version: 1;
1: -	long unsigned int show_host_optionrom_version: 1;
1: -	long unsigned int show_host_port_id: 1;
1: -	long unsigned int show_host_port_type: 1;
1: -	long unsigned int show_host_port_state: 1;
1: -	long unsigned int show_host_active_fc4s: 1;
1: -	long unsigned int show_host_speed: 1;
1: -	long unsigned int show_host_fabric_name: 1;
1: -	long unsigned int show_host_symbolic_name: 1;
1: -	long unsigned int show_host_system_hostname: 1;
1: -	long unsigned int disable_target_scan: 1;
1: +  void (*get_rport_dev_loss_tmo)(struct fc_rport *);
1: +  void (*set_rport_dev_loss_tmo)(struct fc_rport *, u32);
1: +  void (*get_starget_node_name)(struct scsi_target *);
1: +  void (*get_starget_port_name)(struct scsi_target *);
1: +  void (*get_starget_port_id)(struct scsi_target *);
1: +  void (*get_host_port_id)(struct Scsi_Host *);
1: +  void (*get_host_port_type)(struct Scsi_Host *);
1: +  void (*get_host_port_state)(struct Scsi_Host *);
1: +  void (*get_host_active_fc4s)(struct Scsi_Host *);
1: +  void (*get_host_speed)(struct Scsi_Host *);
1: +  void (*get_host_fabric_name)(struct Scsi_Host *);
1: +  void (*get_host_symbolic_name)(struct Scsi_Host *);
1: +  void (*set_host_system_hostname)(struct Scsi_Host *);
1: +  struct fc_host_statistics *(*get_fc_host_stats)(struct Scsi_Host *);
1: +  void (*reset_fc_host_stats)(struct Scsi_Host *);
1: +  int (*issue_fc_host_lip)(struct Scsi_Host *);
1: +  void (*dev_loss_tmo_callbk)(struct fc_rport *);
1: +  void (*terminate_rport_io)(struct fc_rport *);
1: +  void (*set_vport_symbolic_name)(struct fc_vport *);
1: +  int (*vport_create)(struct fc_vport *, bool);
1: +  int (*vport_disable)(struct fc_vport *, bool);
1: +  int (*vport_delete)(struct fc_vport *);
1: +  int (*bsg_request)(struct bsg_job *);
1: +  int (*bsg_timeout)(struct bsg_job *);
1: +  u32 dd_fcrport_size;
1: +  u32 dd_fcvport_size;
1: +  u32 dd_bsg_size;
1: +  long unsigned int show_rport_maxframe_size : 1;
1: +  long unsigned int show_rport_supported_classes : 1;
1: +  long unsigned int show_rport_dev_loss_tmo : 1;
1: +  long unsigned int show_starget_node_name : 1;
1: +  long unsigned int show_starget_port_name : 1;
1: +  long unsigned int show_starget_port_id : 1;
1: +  long unsigned int show_host_node_name : 1;
1: +  long unsigned int show_host_port_name : 1;
1: +  long unsigned int show_host_permanent_port_name : 1;
1: +  long unsigned int show_host_supported_classes : 1;
1: +  long unsigned int show_host_supported_fc4s : 1;
1: +  long unsigned int show_host_supported_speeds : 1;
1: +  long unsigned int show_host_maxframe_size : 1;
1: +  long unsigned int show_host_serial_number : 1;
1: +  long unsigned int show_host_manufacturer : 1;
1: +  long unsigned int show_host_model : 1;
1: +  long unsigned int show_host_model_description : 1;
1: +  long unsigned int show_host_hardware_version : 1;
1: +  long unsigned int show_host_driver_version : 1;
1: +  long unsigned int show_host_firmware_version : 1;
1: +  long unsigned int show_host_optionrom_version : 1;
1: +  long unsigned int show_host_port_id : 1;
1: +  long unsigned int show_host_port_type : 1;
1: +  long unsigned int show_host_port_state : 1;
1: +  long unsigned int show_host_active_fc4s : 1;
1: +  long unsigned int show_host_speed : 1;
1: +  long unsigned int show_host_fabric_name : 1;
1: +  long unsigned int show_host_symbolic_name : 1;
1: +  long unsigned int show_host_system_hostname : 1;
1: +  long unsigned int disable_target_scan : 1;
1:  };
1:  
1:  struct fc_nl_event {
1: -	struct scsi_nl_hdr snlh;
1: -	__u64 seconds;
1: -	__u64 vendor_id;
1: -	__u16 host_no;
1: -	__u16 event_datalen;
1: -	__u32 event_num;
1: -	__u32 event_code;
1: -	__u32 event_data;
1: +  struct scsi_nl_hdr snlh;
1: +  __u64 seconds;
1: +  __u64 vendor_id;
1: +  __u16 host_no;
1: +  __u16 event_datalen;
1: +  __u32 event_num;
1: +  __u32 event_code;
1: +  __u32 event_data;
1:  };
1:  
1:  struct fc_bsg_host_add_rport {
1: -	__u8 reserved;
1: -	__u8 port_id[3];
1: +  __u8 reserved;
1: +  __u8 port_id[3];
1:  };
1:  
1:  struct fc_bsg_host_del_rport {
1: -	__u8 reserved;
1: -	__u8 port_id[3];
1: +  __u8 reserved;
1: +  __u8 port_id[3];
1:  };
1:  
1:  struct fc_bsg_host_els {
1: -	__u8 command_code;
1: -	__u8 port_id[3];
1: +  __u8 command_code;
1: +  __u8 port_id[3];
1:  };
1:  
1:  struct fc_bsg_ctels_reply {
1: -	__u32 status;
1: -	struct {
1: -		__u8 action;
1: -		__u8 reason_code;
1: -		__u8 reason_explanation;
1: -		__u8 vendor_unique;
1: -	} rjt_data;
1: +  __u32 status;
1: +  struct {
1: +    __u8 action;
1: +    __u8 reason_code;
1: +    __u8 reason_explanation;
1: +    __u8 vendor_unique;
1: +  } rjt_data;
1:  };
1:  
1:  struct fc_bsg_host_ct {
1: -	__u8 reserved;
1: -	__u8 port_id[3];
1: -	__u32 preamble_word0;
1: -	__u32 preamble_word1;
1: -	__u32 preamble_word2;
1: +  __u8 reserved;
1: +  __u8 port_id[3];
1: +  __u32 preamble_word0;
1: +  __u32 preamble_word1;
1: +  __u32 preamble_word2;
1:  };
1:  
1:  struct fc_bsg_host_vendor {
1: -	__u64 vendor_id;
1: -	__u32 vendor_cmd[0];
1: +  __u64 vendor_id;
1: +  __u32 vendor_cmd[0];
1:  };
1:  
1:  struct fc_bsg_host_vendor_reply {
1: -	__u32 vendor_rsp[0];
1: +  __u32 vendor_rsp[0];
1:  };
1:  
1:  struct fc_bsg_rport_els {
1: -	__u8 els_code;
1: +  __u8 els_code;
1:  };
1:  
1:  struct fc_bsg_rport_ct {
1: -	__u32 preamble_word0;
1: -	__u32 preamble_word1;
1: -	__u32 preamble_word2;
1: +  __u32 preamble_word0;
1: +  __u32 preamble_word1;
1: +  __u32 preamble_word2;
1:  };
1:  
1:  struct fc_bsg_request {
1: -	__u32 msgcode;
1: -	union {
1: -		struct fc_bsg_host_add_rport h_addrport;
1: -		struct fc_bsg_host_del_rport h_delrport;
1: -		struct fc_bsg_host_els h_els;
1: -		struct fc_bsg_host_ct h_ct;
1: -		struct fc_bsg_host_vendor h_vendor;
1: -		struct fc_bsg_rport_els r_els;
1: -		struct fc_bsg_rport_ct r_ct;
1: -	} rqst_data;
1: +  __u32 msgcode;
1: +  union {
1: +    struct fc_bsg_host_add_rport h_addrport;
1: +    struct fc_bsg_host_del_rport h_delrport;
1: +    struct fc_bsg_host_els h_els;
1: +    struct fc_bsg_host_ct h_ct;
1: +    struct fc_bsg_host_vendor h_vendor;
1: +    struct fc_bsg_rport_els r_els;
1: +    struct fc_bsg_rport_ct r_ct;
1: +  } rqst_data;
1:  } __attribute__((packed));
1:  
1:  struct fc_bsg_reply {
1: -	__u32 result;
1: -	__u32 reply_payload_rcv_len;
1: -	union {
1: -		struct fc_bsg_host_vendor_reply vendor_reply;
1: -		struct fc_bsg_ctels_reply ctels_reply;
1: -	} reply_data;
1: +  __u32 result;
1: +  __u32 reply_payload_rcv_len;
1: +  union {
1: +    struct fc_bsg_host_vendor_reply vendor_reply;
1: +    struct fc_bsg_ctels_reply ctels_reply;
1: +  } reply_data;
1:  };
1:  
1:  struct fc_internal {
1: -	struct scsi_transport_template t;
1: -	struct fc_function_template *f;
1: -	struct device_attribute private_starget_attrs[3];
1: -	struct device_attribute *starget_attrs[4];
1: -	struct device_attribute private_host_attrs[29];
1: -	struct device_attribute *host_attrs[30];
1: -	struct transport_container rport_attr_cont;
1: -	struct device_attribute private_rport_attrs[10];
1: -	struct device_attribute *rport_attrs[11];
1: -	struct transport_container vport_attr_cont;
1: -	struct device_attribute private_vport_attrs[9];
1: -	struct device_attribute *vport_attrs[10];
1: +  struct scsi_transport_template t;
1: +  struct fc_function_template *f;
1: +  struct device_attribute private_starget_attrs[3];
1: +  struct device_attribute *starget_attrs[4];
1: +  struct device_attribute private_host_attrs[29];
1: +  struct device_attribute *host_attrs[30];
1: +  struct transport_container rport_attr_cont;
1: +  struct device_attribute private_rport_attrs[10];
1: +  struct device_attribute *rport_attrs[11];
1: +  struct transport_container vport_attr_cont;
1: +  struct device_attribute private_vport_attrs[9];
1: +  struct device_attribute *vport_attrs[10];
1:  };
1:  
1:  enum sas_device_type {
1: -	SAS_PHY_UNUSED = 0,
1: -	SAS_END_DEVICE = 1,
1: -	SAS_EDGE_EXPANDER_DEVICE = 2,
1: -	SAS_FANOUT_EXPANDER_DEVICE = 3,
1: -	SAS_HA = 4,
1: -	SAS_SATA_DEV = 5,
1: -	SAS_SATA_PM = 7,
1: -	SAS_SATA_PM_PORT = 8,
1: -	SAS_SATA_PENDING = 9,
1: +  SAS_PHY_UNUSED = 0,
1: +  SAS_END_DEVICE = 1,
1: +  SAS_EDGE_EXPANDER_DEVICE = 2,
1: +  SAS_FANOUT_EXPANDER_DEVICE = 3,
1: +  SAS_HA = 4,
1: +  SAS_SATA_DEV = 5,
1: +  SAS_SATA_PM = 7,
1: +  SAS_SATA_PM_PORT = 8,
1: +  SAS_SATA_PENDING = 9,
1:  };
1:  
1:  enum sas_protocol {
1: -	SAS_PROTOCOL_NONE = 0,
1: -	SAS_PROTOCOL_SATA = 1,
1: -	SAS_PROTOCOL_SMP = 2,
1: -	SAS_PROTOCOL_STP = 4,
1: -	SAS_PROTOCOL_SSP = 8,
1: -	SAS_PROTOCOL_ALL = 14,
1: -	SAS_PROTOCOL_STP_ALL = 5,
1: +  SAS_PROTOCOL_NONE = 0,
1: +  SAS_PROTOCOL_SATA = 1,
1: +  SAS_PROTOCOL_SMP = 2,
1: +  SAS_PROTOCOL_STP = 4,
1: +  SAS_PROTOCOL_SSP = 8,
1: +  SAS_PROTOCOL_ALL = 14,
1: +  SAS_PROTOCOL_STP_ALL = 5,
1:  };
1:  
1:  enum sas_linkrate {
1: -	SAS_LINK_RATE_UNKNOWN = 0,
1: -	SAS_PHY_DISABLED = 1,
1: -	SAS_PHY_RESET_PROBLEM = 2,
1: -	SAS_SATA_SPINUP_HOLD = 3,
1: -	SAS_SATA_PORT_SELECTOR = 4,
1: -	SAS_PHY_RESET_IN_PROGRESS = 5,
1: -	SAS_LINK_RATE_1_5_GBPS = 8,
1: -	SAS_LINK_RATE_G1 = 8,
1: -	SAS_LINK_RATE_3_0_GBPS = 9,
1: -	SAS_LINK_RATE_G2 = 9,
1: -	SAS_LINK_RATE_6_0_GBPS = 10,
1: -	SAS_LINK_RATE_12_0_GBPS = 11,
1: -	SAS_LINK_RATE_FAILED = 16,
1: -	SAS_PHY_VIRTUAL = 17,
1: +  SAS_LINK_RATE_UNKNOWN = 0,
1: +  SAS_PHY_DISABLED = 1,
1: +  SAS_PHY_RESET_PROBLEM = 2,
1: +  SAS_SATA_SPINUP_HOLD = 3,
1: +  SAS_SATA_PORT_SELECTOR = 4,
1: +  SAS_PHY_RESET_IN_PROGRESS = 5,
1: +  SAS_LINK_RATE_1_5_GBPS = 8,
1: +  SAS_LINK_RATE_G1 = 8,
1: +  SAS_LINK_RATE_3_0_GBPS = 9,
1: +  SAS_LINK_RATE_G2 = 9,
1: +  SAS_LINK_RATE_6_0_GBPS = 10,
1: +  SAS_LINK_RATE_12_0_GBPS = 11,
1: +  SAS_LINK_RATE_FAILED = 16,
1: +  SAS_PHY_VIRTUAL = 17,
1:  };
1:  
1:  struct sas_identify {
1: -	enum sas_device_type device_type;
1: -	enum sas_protocol initiator_port_protocols;
1: -	enum sas_protocol target_port_protocols;
1: -	u64 sas_address;
1: -	u8 phy_identifier;
1: +  enum sas_device_type device_type;
1: +  enum sas_protocol initiator_port_protocols;
1: +  enum sas_protocol target_port_protocols;
1: +  u64 sas_address;
1: +  u8 phy_identifier;
1:  };
1:  
1:  struct sas_phy {
1: -	struct device dev;
1: -	int number;
1: -	int enabled;
1: -	struct sas_identify identify;
1: -	enum sas_linkrate negotiated_linkrate;
1: -	enum sas_linkrate minimum_linkrate_hw;
1: -	enum sas_linkrate minimum_linkrate;
1: -	enum sas_linkrate maximum_linkrate_hw;
1: -	enum sas_linkrate maximum_linkrate;
1: -	u32 invalid_dword_count;
1: -	u32 running_disparity_error_count;
1: -	u32 loss_of_dword_sync_count;
1: -	u32 phy_reset_problem_count;
1: -	struct list_head port_siblings;
1: -	void *hostdata;
1: +  struct device dev;
1: +  int number;
1: +  int enabled;
1: +  struct sas_identify identify;
1: +  enum sas_linkrate negotiated_linkrate;
1: +  enum sas_linkrate minimum_linkrate_hw;
1: +  enum sas_linkrate minimum_linkrate;
1: +  enum sas_linkrate maximum_linkrate_hw;
1: +  enum sas_linkrate maximum_linkrate;
1: +  u32 invalid_dword_count;
1: +  u32 running_disparity_error_count;
1: +  u32 loss_of_dword_sync_count;
1: +  u32 phy_reset_problem_count;
1: +  struct list_head port_siblings;
1: +  void *hostdata;
1:  };
1:  
1:  struct sas_rphy {
1: -	struct device dev;
1: -	struct sas_identify identify;
1: -	struct list_head list;
1: -	struct request_queue *q;
1: -	u32 scsi_target_id;
1: +  struct device dev;
1: +  struct sas_identify identify;
1: +  struct list_head list;
1: +  struct request_queue *q;
1: +  u32 scsi_target_id;
1:  };
1:  
1:  struct sas_end_device {
1: -	struct sas_rphy rphy;
1: -	unsigned int ready_led_meaning: 1;
1: -	unsigned int tlr_supported: 1;
1: -	unsigned int tlr_enabled: 1;
1: -	u16 I_T_nexus_loss_timeout;
1: -	u16 initiator_response_timeout;
1: +  struct sas_rphy rphy;
1: +  unsigned int ready_led_meaning : 1;
1: +  unsigned int tlr_supported : 1;
1: +  unsigned int tlr_enabled : 1;
1: +  u16 I_T_nexus_loss_timeout;
1: +  u16 initiator_response_timeout;
1:  };
1:  
1:  struct sas_expander_device {
1: -	int level;
1: -	int next_port_id;
1: -	char vendor_id[9];
1: -	char product_id[17];
1: -	char product_rev[5];
1: -	char component_vendor_id[9];
1: -	u16 component_id;
1: -	u8 component_revision_id;
1: -	struct sas_rphy rphy;
1: +  int level;
1: +  int next_port_id;
1: +  char vendor_id[9];
1: +  char product_id[17];
1: +  char product_rev[5];
1: +  char component_vendor_id[9];
1: +  u16 component_id;
1: +  u8 component_revision_id;
1: +  struct sas_rphy rphy;
1:  };
1:  
1:  struct sas_port {
1: -	struct device dev;
1: -	int port_identifier;
1: -	int num_phys;
1: -	unsigned int is_backlink: 1;
1: -	struct sas_rphy *rphy;
1: -	struct mutex phy_list_mutex;
1: -	struct list_head phy_list;
1: -	struct list_head del_list;
1: +  struct device dev;
1: +  int port_identifier;
1: +  int num_phys;
1: +  unsigned int is_backlink : 1;
1: +  struct sas_rphy *rphy;
1: +  struct mutex phy_list_mutex;
1: +  struct list_head phy_list;
1: +  struct list_head del_list;
1:  };
1:  
1:  struct sas_phy_linkrates {
1: -	enum sas_linkrate maximum_linkrate;
1: -	enum sas_linkrate minimum_linkrate;
1: +  enum sas_linkrate maximum_linkrate;
1: +  enum sas_linkrate minimum_linkrate;
1:  };
1:  
1:  struct sas_function_template {
1: -	int (*get_linkerrors)(struct sas_phy *);
1: -	int (*get_enclosure_identifier)(struct sas_rphy *, u64 *);
1: -	int (*get_bay_identifier)(struct sas_rphy *);
1: -	int (*phy_reset)(struct sas_phy *, int);
1: -	int (*phy_enable)(struct sas_phy *, int);
1: -	int (*phy_setup)(struct sas_phy *);
1: -	void (*phy_release)(struct sas_phy *);
1: -	int (*set_phy_speed)(struct sas_phy *, struct sas_phy_linkrates *);
1: -	void (*smp_handler)(struct bsg_job *, struct Scsi_Host *, struct sas_rphy *);
1: +  int (*get_linkerrors)(struct sas_phy *);
1: +  int (*get_enclosure_identifier)(struct sas_rphy *, u64 *);
1: +  int (*get_bay_identifier)(struct sas_rphy *);
1: +  int (*phy_reset)(struct sas_phy *, int);
1: +  int (*phy_enable)(struct sas_phy *, int);
1: +  int (*phy_setup)(struct sas_phy *);
1: +  void (*phy_release)(struct sas_phy *);
1: +  int (*set_phy_speed)(struct sas_phy *, struct sas_phy_linkrates *);
1: +  void (*smp_handler)(struct bsg_job *, struct Scsi_Host *, struct sas_rphy *);
1:  };
1:  
1:  struct sas_domain_function_template;
1:  
1:  struct sas_internal {
1: -	struct scsi_transport_template t;
1: -	struct sas_function_template *f;
1: -	struct sas_domain_function_template *dft;
1: -	struct device_attribute private_host_attrs[0];
1: -	struct device_attribute private_phy_attrs[17];
1: -	struct device_attribute private_port_attrs[1];
1: -	struct device_attribute private_rphy_attrs[8];
1: -	struct device_attribute private_end_dev_attrs[5];
1: -	struct device_attribute private_expander_attrs[7];
1: -	struct transport_container phy_attr_cont;
1: -	struct transport_container port_attr_cont;
1: -	struct transport_container rphy_attr_cont;
1: -	struct transport_container end_dev_attr_cont;
1: -	struct transport_container expander_attr_cont;
1: -	struct device_attribute *host_attrs[1];
1: -	struct device_attribute *phy_attrs[18];
1: -	struct device_attribute *port_attrs[2];
1: -	struct device_attribute *rphy_attrs[9];
1: -	struct device_attribute *end_dev_attrs[6];
1: -	struct device_attribute *expander_attrs[8];
1: +  struct scsi_transport_template t;
1: +  struct sas_function_template *f;
1: +  struct sas_domain_function_template *dft;
1: +  struct device_attribute private_host_attrs[0];
1: +  struct device_attribute private_phy_attrs[17];
1: +  struct device_attribute private_port_attrs[1];
1: +  struct device_attribute private_rphy_attrs[8];
1: +  struct device_attribute private_end_dev_attrs[5];
1: +  struct device_attribute private_expander_attrs[7];
1: +  struct transport_container phy_attr_cont;
1: +  struct transport_container port_attr_cont;
1: +  struct transport_container rphy_attr_cont;
1: +  struct transport_container end_dev_attr_cont;
1: +  struct transport_container expander_attr_cont;
1: +  struct device_attribute *host_attrs[1];
1: +  struct device_attribute *phy_attrs[18];
1: +  struct device_attribute *port_attrs[2];
1: +  struct device_attribute *rphy_attrs[9];
1: +  struct device_attribute *end_dev_attrs[6];
1: +  struct device_attribute *expander_attrs[8];
1:  };
1:  
1:  struct sas_host_attrs {
1: -	struct list_head rphy_list;
1: -	struct mutex lock;
1: -	struct request_queue *q;
1: -	u32 next_target_id;
1: -	u32 next_expander_id;
1: -	int next_port_id;
1: +  struct list_head rphy_list;
1: +  struct mutex lock;
1: +  struct request_queue *q;
1: +  u32 next_target_id;
1: +  u32 next_expander_id;
1: +  int next_port_id;
1:  };
1:  
1:  struct ata_bmdma_prd {
1: -	__le32 addr;
1: -	__le32 flags_len;
1: -};
1: -
1: -enum {
1: -	LIBATA_MAX_PRD = 128,
1: -	LIBATA_DUMB_MAX_PRD = 64,
1: -	ATA_DEF_QUEUE = 1,
1: -	ATA_MAX_QUEUE = 32,
1: -	ATA_TAG_INTERNAL = 32,
1: -	ATA_SHORT_PAUSE = 16,
1: -	ATAPI_MAX_DRAIN = 16384,
1: -	ATA_ALL_DEVICES = 3,
1: -	ATA_SHT_EMULATED = 1,
1: -	ATA_SHT_THIS_ID = 4294967295,
1: -	ATA_TFLAG_LBA48 = 1,
1: -	ATA_TFLAG_ISADDR = 2,
1: -	ATA_TFLAG_DEVICE = 4,
1: -	ATA_TFLAG_WRITE = 8,
1: -	ATA_TFLAG_LBA = 16,
1: -	ATA_TFLAG_FUA = 32,
1: -	ATA_TFLAG_POLLING = 64,
1: -	ATA_DFLAG_LBA = 1,
1: -	ATA_DFLAG_LBA48 = 2,
1: -	ATA_DFLAG_CDB_INTR = 4,
1: -	ATA_DFLAG_NCQ = 8,
1: -	ATA_DFLAG_FLUSH_EXT = 16,
1: -	ATA_DFLAG_ACPI_PENDING = 32,
1: -	ATA_DFLAG_ACPI_FAILED = 64,
1: -	ATA_DFLAG_AN = 128,
1: -	ATA_DFLAG_TRUSTED = 256,
1: -	ATA_DFLAG_DMADIR = 1024,
1: -	ATA_DFLAG_CFG_MASK = 4095,
1: -	ATA_DFLAG_PIO = 4096,
1: -	ATA_DFLAG_NCQ_OFF = 8192,
1: -	ATA_DFLAG_SLEEPING = 32768,
1: -	ATA_DFLAG_DUBIOUS_XFER = 65536,
1: -	ATA_DFLAG_NO_UNLOAD = 131072,
1: -	ATA_DFLAG_UNLOCK_HPA = 262144,
1: -	ATA_DFLAG_NCQ_SEND_RECV = 524288,
1: -	ATA_DFLAG_NCQ_PRIO = 1048576,
1: -	ATA_DFLAG_NCQ_PRIO_ENABLE = 2097152,
1: -	ATA_DFLAG_INIT_MASK = 16777215,
1: -	ATA_DFLAG_DETACH = 16777216,
1: -	ATA_DFLAG_DETACHED = 33554432,
1: -	ATA_DFLAG_DA = 67108864,
1: -	ATA_DFLAG_DEVSLP = 134217728,
1: -	ATA_DFLAG_ACPI_DISABLED = 268435456,
1: -	ATA_DFLAG_D_SENSE = 536870912,
1: -	ATA_DFLAG_ZAC = 1073741824,
1: -	ATA_DEV_UNKNOWN = 0,
1: -	ATA_DEV_ATA = 1,
1: -	ATA_DEV_ATA_UNSUP = 2,
1: -	ATA_DEV_ATAPI = 3,
1: -	ATA_DEV_ATAPI_UNSUP = 4,
1: -	ATA_DEV_PMP = 5,
1: -	ATA_DEV_PMP_UNSUP = 6,
1: -	ATA_DEV_SEMB = 7,
1: -	ATA_DEV_SEMB_UNSUP = 8,
1: -	ATA_DEV_ZAC = 9,
1: -	ATA_DEV_ZAC_UNSUP = 10,
1: -	ATA_DEV_NONE = 11,
1: -	ATA_LFLAG_NO_HRST = 2,
1: -	ATA_LFLAG_NO_SRST = 4,
1: -	ATA_LFLAG_ASSUME_ATA = 8,
1: -	ATA_LFLAG_ASSUME_SEMB = 16,
1: -	ATA_LFLAG_ASSUME_CLASS = 24,
1: -	ATA_LFLAG_NO_RETRY = 32,
1: -	ATA_LFLAG_DISABLED = 64,
1: -	ATA_LFLAG_SW_ACTIVITY = 128,
1: -	ATA_LFLAG_NO_LPM = 256,
1: -	ATA_LFLAG_RST_ONCE = 512,
1: -	ATA_LFLAG_CHANGED = 1024,
1: -	ATA_LFLAG_NO_DB_DELAY = 2048,
1: -	ATA_FLAG_SLAVE_POSS = 1,
1: -	ATA_FLAG_SATA = 2,
1: -	ATA_FLAG_NO_LPM = 4,
1: -	ATA_FLAG_NO_LOG_PAGE = 32,
1: -	ATA_FLAG_NO_ATAPI = 64,
1: -	ATA_FLAG_PIO_DMA = 128,
1: -	ATA_FLAG_PIO_LBA48 = 256,
1: -	ATA_FLAG_PIO_POLLING = 512,
1: -	ATA_FLAG_NCQ = 1024,
1: -	ATA_FLAG_NO_POWEROFF_SPINDOWN = 2048,
1: -	ATA_FLAG_NO_HIBERNATE_SPINDOWN = 4096,
1: -	ATA_FLAG_DEBUGMSG = 8192,
1: -	ATA_FLAG_FPDMA_AA = 16384,
1: -	ATA_FLAG_IGN_SIMPLEX = 32768,
1: -	ATA_FLAG_NO_IORDY = 65536,
1: -	ATA_FLAG_ACPI_SATA = 131072,
1: -	ATA_FLAG_AN = 262144,
1: -	ATA_FLAG_PMP = 524288,
1: -	ATA_FLAG_FPDMA_AUX = 1048576,
1: -	ATA_FLAG_EM = 2097152,
1: -	ATA_FLAG_SW_ACTIVITY = 4194304,
1: -	ATA_FLAG_NO_DIPM = 8388608,
1: -	ATA_FLAG_SAS_HOST = 16777216,
1: -	ATA_PFLAG_EH_PENDING = 1,
1: -	ATA_PFLAG_EH_IN_PROGRESS = 2,
1: -	ATA_PFLAG_FROZEN = 4,
1: -	ATA_PFLAG_RECOVERED = 8,
1: -	ATA_PFLAG_LOADING = 16,
1: -	ATA_PFLAG_SCSI_HOTPLUG = 64,
1: -	ATA_PFLAG_INITIALIZING = 128,
1: -	ATA_PFLAG_RESETTING = 256,
1: -	ATA_PFLAG_UNLOADING = 512,
1: -	ATA_PFLAG_UNLOADED = 1024,
1: -	ATA_PFLAG_SUSPENDED = 131072,
1: -	ATA_PFLAG_PM_PENDING = 262144,
1: -	ATA_PFLAG_INIT_GTM_VALID = 524288,
1: -	ATA_PFLAG_PIO32 = 1048576,
1: -	ATA_PFLAG_PIO32CHANGE = 2097152,
1: -	ATA_PFLAG_EXTERNAL = 4194304,
1: -	ATA_QCFLAG_ACTIVE = 1,
1: -	ATA_QCFLAG_DMAMAP = 2,
1: -	ATA_QCFLAG_IO = 8,
1: -	ATA_QCFLAG_RESULT_TF = 16,
1: -	ATA_QCFLAG_CLEAR_EXCL = 32,
1: -	ATA_QCFLAG_QUIET = 64,
1: -	ATA_QCFLAG_RETRY = 128,
1: -	ATA_QCFLAG_FAILED = 65536,
1: -	ATA_QCFLAG_SENSE_VALID = 131072,
1: -	ATA_QCFLAG_EH_SCHEDULED = 262144,
1: -	ATA_HOST_SIMPLEX = 1,
1: -	ATA_HOST_STARTED = 2,
1: -	ATA_HOST_PARALLEL_SCAN = 4,
1: -	ATA_HOST_IGNORE_ATA = 8,
1: -	ATA_TMOUT_BOOT = 30000,
1: -	ATA_TMOUT_BOOT_QUICK = 7000,
1: -	ATA_TMOUT_INTERNAL_QUICK = 5000,
1: -	ATA_TMOUT_MAX_PARK = 30000,
1: -	ATA_TMOUT_FF_WAIT_LONG = 2000,
1: -	ATA_TMOUT_FF_WAIT = 800,
1: -	ATA_WAIT_AFTER_RESET = 150,
1: -	ATA_TMOUT_PMP_SRST_WAIT = 5000,
1: -	ATA_TMOUT_SPURIOUS_PHY = 10000,
1: -	BUS_UNKNOWN = 0,
1: -	BUS_DMA = 1,
1: -	BUS_IDLE = 2,
1: -	BUS_NOINTR = 3,
1: -	BUS_NODATA = 4,
1: -	BUS_TIMER = 5,
1: -	BUS_PIO = 6,
1: -	BUS_EDD = 7,
1: -	BUS_IDENTIFY = 8,
1: -	BUS_PACKET = 9,
1: -	PORT_UNKNOWN = 0,
1: -	PORT_ENABLED = 1,
1: -	PORT_DISABLED = 2,
1: -	ATA_NR_PIO_MODES = 7,
1: -	ATA_NR_MWDMA_MODES = 5,
1: -	ATA_NR_UDMA_MODES = 8,
1: -	ATA_SHIFT_PIO = 0,
1: -	ATA_SHIFT_MWDMA = 7,
1: -	ATA_SHIFT_UDMA = 12,
1: -	ATA_SHIFT_PRIO = 6,
1: -	ATA_PRIO_HIGH = 2,
1: -	ATA_DMA_PAD_SZ = 4,
1: -	ATA_ERING_SIZE = 32,
1: -	ATA_DEFER_LINK = 1,
1: -	ATA_DEFER_PORT = 2,
1: -	ATA_EH_DESC_LEN = 80,
1: -	ATA_EH_REVALIDATE = 1,
1: -	ATA_EH_SOFTRESET = 2,
1: -	ATA_EH_HARDRESET = 4,
1: -	ATA_EH_RESET = 6,
1: -	ATA_EH_ENABLE_LINK = 8,
1: -	ATA_EH_PARK = 32,
1: -	ATA_EH_PERDEV_MASK = 33,
1: -	ATA_EH_ALL_ACTIONS = 15,
1: -	ATA_EHI_HOTPLUGGED = 1,
1: -	ATA_EHI_NO_AUTOPSY = 4,
1: -	ATA_EHI_QUIET = 8,
1: -	ATA_EHI_NO_RECOVERY = 16,
1: -	ATA_EHI_DID_SOFTRESET = 65536,
1: -	ATA_EHI_DID_HARDRESET = 131072,
1: -	ATA_EHI_PRINTINFO = 262144,
1: -	ATA_EHI_SETMODE = 524288,
1: -	ATA_EHI_POST_SETMODE = 1048576,
1: -	ATA_EHI_DID_RESET = 196608,
1: -	ATA_EHI_TO_SLAVE_MASK = 12,
1: -	ATA_EH_MAX_TRIES = 5,
1: -	ATA_LINK_RESUME_TRIES = 5,
1: -	ATA_PROBE_MAX_TRIES = 3,
1: -	ATA_EH_DEV_TRIES = 3,
1: -	ATA_EH_PMP_TRIES = 5,
1: -	ATA_EH_PMP_LINK_TRIES = 3,
1: -	SATA_PMP_RW_TIMEOUT = 3000,
1: -	ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6,
1: -	ATA_HORKAGE_DIAGNOSTIC = 1,
1: -	ATA_HORKAGE_NODMA = 2,
1: -	ATA_HORKAGE_NONCQ = 4,
1: -	ATA_HORKAGE_MAX_SEC_128 = 8,
1: -	ATA_HORKAGE_BROKEN_HPA = 16,
1: -	ATA_HORKAGE_DISABLE = 32,
1: -	ATA_HORKAGE_HPA_SIZE = 64,
1: -	ATA_HORKAGE_IVB = 256,
1: -	ATA_HORKAGE_STUCK_ERR = 512,
1: -	ATA_HORKAGE_BRIDGE_OK = 1024,
1: -	ATA_HORKAGE_ATAPI_MOD16_DMA = 2048,
1: -	ATA_HORKAGE_FIRMWARE_WARN = 4096,
1: -	ATA_HORKAGE_1_5_GBPS = 8192,
1: -	ATA_HORKAGE_NOSETXFER = 16384,
1: -	ATA_HORKAGE_BROKEN_FPDMA_AA = 32768,
1: -	ATA_HORKAGE_DUMP_ID = 65536,
1: -	ATA_HORKAGE_MAX_SEC_LBA48 = 131072,
1: -	ATA_HORKAGE_ATAPI_DMADIR = 262144,
1: -	ATA_HORKAGE_NO_NCQ_TRIM = 524288,
1: -	ATA_HORKAGE_NOLPM = 1048576,
1: -	ATA_HORKAGE_WD_BROKEN_LPM = 2097152,
1: -	ATA_HORKAGE_ZERO_AFTER_TRIM = 4194304,
1: -	ATA_HORKAGE_NO_DMA_LOG = 8388608,
1: -	ATA_HORKAGE_NOTRIM = 16777216,
1: -	ATA_HORKAGE_MAX_SEC_1024 = 33554432,
1: -	ATA_HORKAGE_MAX_TRIM_128M = 67108864,
1: -	ATA_DMA_MASK_ATA = 1,
1: -	ATA_DMA_MASK_ATAPI = 2,
1: -	ATA_DMA_MASK_CFA = 4,
1: -	ATAPI_READ = 0,
1: -	ATAPI_WRITE = 1,
1: -	ATAPI_READ_CD = 2,
1: -	ATAPI_PASS_THRU = 3,
1: -	ATAPI_MISC = 4,
1: -	ATA_TIMING_SETUP = 1,
1: -	ATA_TIMING_ACT8B = 2,
1: -	ATA_TIMING_REC8B = 4,
1: -	ATA_TIMING_CYC8B = 8,
1: -	ATA_TIMING_8BIT = 14,
1: -	ATA_TIMING_ACTIVE = 16,
1: -	ATA_TIMING_RECOVER = 32,
1: -	ATA_TIMING_DMACK_HOLD = 64,
1: -	ATA_TIMING_CYCLE = 128,
1: -	ATA_TIMING_UDMA = 256,
1: -	ATA_TIMING_ALL = 511,
1: -	ATA_ACPI_FILTER_SETXFER = 1,
1: -	ATA_ACPI_FILTER_LOCK = 2,
1: -	ATA_ACPI_FILTER_DIPM = 4,
1: -	ATA_ACPI_FILTER_FPDMA_OFFSET = 8,
1: -	ATA_ACPI_FILTER_FPDMA_AA = 16,
1: -	ATA_ACPI_FILTER_DEFAULT = 7,
1: +  __le32 addr;
1: +  __le32 flags_len;
1: +};
1: +
1: +enum {
1: +  LIBATA_MAX_PRD = 128,
1: +  LIBATA_DUMB_MAX_PRD = 64,
1: +  ATA_DEF_QUEUE = 1,
1: +  ATA_MAX_QUEUE = 32,
1: +  ATA_TAG_INTERNAL = 32,
1: +  ATA_SHORT_PAUSE = 16,
1: +  ATAPI_MAX_DRAIN = 16384,
1: +  ATA_ALL_DEVICES = 3,
1: +  ATA_SHT_EMULATED = 1,
1: +  ATA_SHT_THIS_ID = 4294967295,
1: +  ATA_TFLAG_LBA48 = 1,
1: +  ATA_TFLAG_ISADDR = 2,
1: +  ATA_TFLAG_DEVICE = 4,
1: +  ATA_TFLAG_WRITE = 8,
1: +  ATA_TFLAG_LBA = 16,
1: +  ATA_TFLAG_FUA = 32,
1: +  ATA_TFLAG_POLLING = 64,
1: +  ATA_DFLAG_LBA = 1,
1: +  ATA_DFLAG_LBA48 = 2,
1: +  ATA_DFLAG_CDB_INTR = 4,
1: +  ATA_DFLAG_NCQ = 8,
1: +  ATA_DFLAG_FLUSH_EXT = 16,
1: +  ATA_DFLAG_ACPI_PENDING = 32,
1: +  ATA_DFLAG_ACPI_FAILED = 64,
1: +  ATA_DFLAG_AN = 128,
1: +  ATA_DFLAG_TRUSTED = 256,
1: +  ATA_DFLAG_DMADIR = 1024,
1: +  ATA_DFLAG_CFG_MASK = 4095,
1: +  ATA_DFLAG_PIO = 4096,
1: +  ATA_DFLAG_NCQ_OFF = 8192,
1: +  ATA_DFLAG_SLEEPING = 32768,
1: +  ATA_DFLAG_DUBIOUS_XFER = 65536,
1: +  ATA_DFLAG_NO_UNLOAD = 131072,
1: +  ATA_DFLAG_UNLOCK_HPA = 262144,
1: +  ATA_DFLAG_NCQ_SEND_RECV = 524288,
1: +  ATA_DFLAG_NCQ_PRIO = 1048576,
1: +  ATA_DFLAG_NCQ_PRIO_ENABLE = 2097152,
1: +  ATA_DFLAG_INIT_MASK = 16777215,
1: +  ATA_DFLAG_DETACH = 16777216,
1: +  ATA_DFLAG_DETACHED = 33554432,
1: +  ATA_DFLAG_DA = 67108864,
1: +  ATA_DFLAG_DEVSLP = 134217728,
1: +  ATA_DFLAG_ACPI_DISABLED = 268435456,
1: +  ATA_DFLAG_D_SENSE = 536870912,
1: +  ATA_DFLAG_ZAC = 1073741824,
1: +  ATA_DEV_UNKNOWN = 0,
1: +  ATA_DEV_ATA = 1,
1: +  ATA_DEV_ATA_UNSUP = 2,
1: +  ATA_DEV_ATAPI = 3,
1: +  ATA_DEV_ATAPI_UNSUP = 4,
1: +  ATA_DEV_PMP = 5,
1: +  ATA_DEV_PMP_UNSUP = 6,
1: +  ATA_DEV_SEMB = 7,
1: +  ATA_DEV_SEMB_UNSUP = 8,
1: +  ATA_DEV_ZAC = 9,
1: +  ATA_DEV_ZAC_UNSUP = 10,
1: +  ATA_DEV_NONE = 11,
1: +  ATA_LFLAG_NO_HRST = 2,
1: +  ATA_LFLAG_NO_SRST = 4,
1: +  ATA_LFLAG_ASSUME_ATA = 8,
1: +  ATA_LFLAG_ASSUME_SEMB = 16,
1: +  ATA_LFLAG_ASSUME_CLASS = 24,
1: +  ATA_LFLAG_NO_RETRY = 32,
1: +  ATA_LFLAG_DISABLED = 64,
1: +  ATA_LFLAG_SW_ACTIVITY = 128,
1: +  ATA_LFLAG_NO_LPM = 256,
1: +  ATA_LFLAG_RST_ONCE = 512,
1: +  ATA_LFLAG_CHANGED = 1024,
1: +  ATA_LFLAG_NO_DB_DELAY = 2048,
1: +  ATA_FLAG_SLAVE_POSS = 1,
1: +  ATA_FLAG_SATA = 2,
1: +  ATA_FLAG_NO_LPM = 4,
1: +  ATA_FLAG_NO_LOG_PAGE = 32,
1: +  ATA_FLAG_NO_ATAPI = 64,
1: +  ATA_FLAG_PIO_DMA = 128,
1: +  ATA_FLAG_PIO_LBA48 = 256,
1: +  ATA_FLAG_PIO_POLLING = 512,
1: +  ATA_FLAG_NCQ = 1024,
1: +  ATA_FLAG_NO_POWEROFF_SPINDOWN = 2048,
1: +  ATA_FLAG_NO_HIBERNATE_SPINDOWN = 4096,
1: +  ATA_FLAG_DEBUGMSG = 8192,
1: +  ATA_FLAG_FPDMA_AA = 16384,
1: +  ATA_FLAG_IGN_SIMPLEX = 32768,
1: +  ATA_FLAG_NO_IORDY = 65536,
1: +  ATA_FLAG_ACPI_SATA = 131072,
1: +  ATA_FLAG_AN = 262144,
1: +  ATA_FLAG_PMP = 524288,
1: +  ATA_FLAG_FPDMA_AUX = 1048576,
1: +  ATA_FLAG_EM = 2097152,
1: +  ATA_FLAG_SW_ACTIVITY = 4194304,
1: +  ATA_FLAG_NO_DIPM = 8388608,
1: +  ATA_FLAG_SAS_HOST = 16777216,
1: +  ATA_PFLAG_EH_PENDING = 1,
1: +  ATA_PFLAG_EH_IN_PROGRESS = 2,
1: +  ATA_PFLAG_FROZEN = 4,
1: +  ATA_PFLAG_RECOVERED = 8,
1: +  ATA_PFLAG_LOADING = 16,
1: +  ATA_PFLAG_SCSI_HOTPLUG = 64,
1: +  ATA_PFLAG_INITIALIZING = 128,
1: +  ATA_PFLAG_RESETTING = 256,
1: +  ATA_PFLAG_UNLOADING = 512,
1: +  ATA_PFLAG_UNLOADED = 1024,
1: +  ATA_PFLAG_SUSPENDED = 131072,
1: +  ATA_PFLAG_PM_PENDING = 262144,
1: +  ATA_PFLAG_INIT_GTM_VALID = 524288,
1: +  ATA_PFLAG_PIO32 = 1048576,
1: +  ATA_PFLAG_PIO32CHANGE = 2097152,
1: +  ATA_PFLAG_EXTERNAL = 4194304,
1: +  ATA_QCFLAG_ACTIVE = 1,
1: +  ATA_QCFLAG_DMAMAP = 2,
1: +  ATA_QCFLAG_IO = 8,
1: +  ATA_QCFLAG_RESULT_TF = 16,
1: +  ATA_QCFLAG_CLEAR_EXCL = 32,
1: +  ATA_QCFLAG_QUIET = 64,
1: +  ATA_QCFLAG_RETRY = 128,
1: +  ATA_QCFLAG_FAILED = 65536,
1: +  ATA_QCFLAG_SENSE_VALID = 131072,
1: +  ATA_QCFLAG_EH_SCHEDULED = 262144,
1: +  ATA_HOST_SIMPLEX = 1,
1: +  ATA_HOST_STARTED = 2,
1: +  ATA_HOST_PARALLEL_SCAN = 4,
1: +  ATA_HOST_IGNORE_ATA = 8,
1: +  ATA_TMOUT_BOOT = 30000,
1: +  ATA_TMOUT_BOOT_QUICK = 7000,
1: +  ATA_TMOUT_INTERNAL_QUICK = 5000,
1: +  ATA_TMOUT_MAX_PARK = 30000,
1: +  ATA_TMOUT_FF_WAIT_LONG = 2000,
1: +  ATA_TMOUT_FF_WAIT = 800,
1: +  ATA_WAIT_AFTER_RESET = 150,
1: +  ATA_TMOUT_PMP_SRST_WAIT = 5000,
1: +  ATA_TMOUT_SPURIOUS_PHY = 10000,
1: +  BUS_UNKNOWN = 0,
1: +  BUS_DMA = 1,
1: +  BUS_IDLE = 2,
1: +  BUS_NOINTR = 3,
1: +  BUS_NODATA = 4,
1: +  BUS_TIMER = 5,
1: +  BUS_PIO = 6,
1: +  BUS_EDD = 7,
1: +  BUS_IDENTIFY = 8,
1: +  BUS_PACKET = 9,
1: +  PORT_UNKNOWN = 0,
1: +  PORT_ENABLED = 1,
1: +  PORT_DISABLED = 2,
1: +  ATA_NR_PIO_MODES = 7,
1: +  ATA_NR_MWDMA_MODES = 5,
1: +  ATA_NR_UDMA_MODES = 8,
1: +  ATA_SHIFT_PIO = 0,
1: +  ATA_SHIFT_MWDMA = 7,
1: +  ATA_SHIFT_UDMA = 12,
1: +  ATA_SHIFT_PRIO = 6,
1: +  ATA_PRIO_HIGH = 2,
1: +  ATA_DMA_PAD_SZ = 4,
1: +  ATA_ERING_SIZE = 32,
1: +  ATA_DEFER_LINK = 1,
1: +  ATA_DEFER_PORT = 2,
1: +  ATA_EH_DESC_LEN = 80,
1: +  ATA_EH_REVALIDATE = 1,
1: +  ATA_EH_SOFTRESET = 2,
1: +  ATA_EH_HARDRESET = 4,
1: +  ATA_EH_RESET = 6,
1: +  ATA_EH_ENABLE_LINK = 8,
1: +  ATA_EH_PARK = 32,
1: +  ATA_EH_PERDEV_MASK = 33,
1: +  ATA_EH_ALL_ACTIONS = 15,
1: +  ATA_EHI_HOTPLUGGED = 1,
1: +  ATA_EHI_NO_AUTOPSY = 4,
1: +  ATA_EHI_QUIET = 8,
1: +  ATA_EHI_NO_RECOVERY = 16,
1: +  ATA_EHI_DID_SOFTRESET = 65536,
1: +  ATA_EHI_DID_HARDRESET = 131072,
1: +  ATA_EHI_PRINTINFO = 262144,
1: +  ATA_EHI_SETMODE = 524288,
1: +  ATA_EHI_POST_SETMODE = 1048576,
1: +  ATA_EHI_DID_RESET = 196608,
1: +  ATA_EHI_TO_SLAVE_MASK = 12,
1: +  ATA_EH_MAX_TRIES = 5,
1: +  ATA_LINK_RESUME_TRIES = 5,
1: +  ATA_PROBE_MAX_TRIES = 3,
1: +  ATA_EH_DEV_TRIES = 3,
1: +  ATA_EH_PMP_TRIES = 5,
1: +  ATA_EH_PMP_LINK_TRIES = 3,
1: +  SATA_PMP_RW_TIMEOUT = 3000,
1: +  ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6,
1: +  ATA_HORKAGE_DIAGNOSTIC = 1,
1: +  ATA_HORKAGE_NODMA = 2,
1: +  ATA_HORKAGE_NONCQ = 4,
1: +  ATA_HORKAGE_MAX_SEC_128 = 8,
1: +  ATA_HORKAGE_BROKEN_HPA = 16,
1: +  ATA_HORKAGE_DISABLE = 32,
1: +  ATA_HORKAGE_HPA_SIZE = 64,
1: +  ATA_HORKAGE_IVB = 256,
1: +  ATA_HORKAGE_STUCK_ERR = 512,
1: +  ATA_HORKAGE_BRIDGE_OK = 1024,
1: +  ATA_HORKAGE_ATAPI_MOD16_DMA = 2048,
1: +  ATA_HORKAGE_FIRMWARE_WARN = 4096,
1: +  ATA_HORKAGE_1_5_GBPS = 8192,
1: +  ATA_HORKAGE_NOSETXFER = 16384,
1: +  ATA_HORKAGE_BROKEN_FPDMA_AA = 32768,
1: +  ATA_HORKAGE_DUMP_ID = 65536,
1: +  ATA_HORKAGE_MAX_SEC_LBA48 = 131072,
1: +  ATA_HORKAGE_ATAPI_DMADIR = 262144,
1: +  ATA_HORKAGE_NO_NCQ_TRIM = 524288,
1: +  ATA_HORKAGE_NOLPM = 1048576,
1: +  ATA_HORKAGE_WD_BROKEN_LPM = 2097152,
1: +  ATA_HORKAGE_ZERO_AFTER_TRIM = 4194304,
1: +  ATA_HORKAGE_NO_DMA_LOG = 8388608,
1: +  ATA_HORKAGE_NOTRIM = 16777216,
1: +  ATA_HORKAGE_MAX_SEC_1024 = 33554432,
1: +  ATA_HORKAGE_MAX_TRIM_128M = 67108864,
1: +  ATA_DMA_MASK_ATA = 1,
1: +  ATA_DMA_MASK_ATAPI = 2,
1: +  ATA_DMA_MASK_CFA = 4,
1: +  ATAPI_READ = 0,
1: +  ATAPI_WRITE = 1,
1: +  ATAPI_READ_CD = 2,
1: +  ATAPI_PASS_THRU = 3,
1: +  ATAPI_MISC = 4,
1: +  ATA_TIMING_SETUP = 1,
1: +  ATA_TIMING_ACT8B = 2,
1: +  ATA_TIMING_REC8B = 4,
1: +  ATA_TIMING_CYC8B = 8,
1: +  ATA_TIMING_8BIT = 14,
1: +  ATA_TIMING_ACTIVE = 16,
1: +  ATA_TIMING_RECOVER = 32,
1: +  ATA_TIMING_DMACK_HOLD = 64,
1: +  ATA_TIMING_CYCLE = 128,
1: +  ATA_TIMING_UDMA = 256,
1: +  ATA_TIMING_ALL = 511,
1: +  ATA_ACPI_FILTER_SETXFER = 1,
1: +  ATA_ACPI_FILTER_LOCK = 2,
1: +  ATA_ACPI_FILTER_DIPM = 4,
1: +  ATA_ACPI_FILTER_FPDMA_OFFSET = 8,
1: +  ATA_ACPI_FILTER_FPDMA_AA = 16,
1: +  ATA_ACPI_FILTER_DEFAULT = 7,
1:  };
1:  
1:  enum ata_completion_errors {
1: -	AC_ERR_OK = 0,
1: -	AC_ERR_DEV = 1,
1: -	AC_ERR_HSM = 2,
1: -	AC_ERR_TIMEOUT = 4,
1: -	AC_ERR_MEDIA = 8,
1: -	AC_ERR_ATA_BUS = 16,
1: -	AC_ERR_HOST_BUS = 32,
1: -	AC_ERR_SYSTEM = 64,
1: -	AC_ERR_INVALID = 128,
1: -	AC_ERR_OTHER = 256,
1: -	AC_ERR_NODEV_HINT = 512,
1: -	AC_ERR_NCQ = 1024,
1: +  AC_ERR_OK = 0,
1: +  AC_ERR_DEV = 1,
1: +  AC_ERR_HSM = 2,
1: +  AC_ERR_TIMEOUT = 4,
1: +  AC_ERR_MEDIA = 8,
1: +  AC_ERR_ATA_BUS = 16,
1: +  AC_ERR_HOST_BUS = 32,
1: +  AC_ERR_SYSTEM = 64,
1: +  AC_ERR_INVALID = 128,
1: +  AC_ERR_OTHER = 256,
1: +  AC_ERR_NODEV_HINT = 512,
1: +  AC_ERR_NCQ = 1024,
1:  };
1:  
1:  enum ata_lpm_policy {
1: -	ATA_LPM_UNKNOWN = 0,
1: -	ATA_LPM_MAX_POWER = 1,
1: -	ATA_LPM_MED_POWER = 2,
1: -	ATA_LPM_MED_POWER_WITH_DIPM = 3,
1: -	ATA_LPM_MIN_POWER_WITH_PARTIAL = 4,
1: -	ATA_LPM_MIN_POWER = 5,
1: +  ATA_LPM_UNKNOWN = 0,
1: +  ATA_LPM_MAX_POWER = 1,
1: +  ATA_LPM_MED_POWER = 2,
1: +  ATA_LPM_MED_POWER_WITH_DIPM = 3,
1: +  ATA_LPM_MIN_POWER_WITH_PARTIAL = 4,
1: +  ATA_LPM_MIN_POWER = 5,
1:  };
1:  
1:  struct ata_queued_cmd;
1: @@ -82958,22 +84057,22 @@ struct ata_queued_cmd;
1:  typedef void (*ata_qc_cb_t)(struct ata_queued_cmd *);
1:  
1:  struct ata_taskfile {
1: -	long unsigned int flags;
1: -	u8 protocol;
1: -	u8 ctl;
1: -	u8 hob_feature;
1: -	u8 hob_nsect;
1: -	u8 hob_lbal;
1: -	u8 hob_lbam;
1: -	u8 hob_lbah;
1: -	u8 feature;
1: -	u8 nsect;
1: -	u8 lbal;
1: -	u8 lbam;
1: -	u8 lbah;
1: -	u8 device;
1: -	u8 command;
1: -	u32 auxiliary;
1: +  long unsigned int flags;
1: +  u8 protocol;
1: +  u8 ctl;
1: +  u8 hob_feature;
1: +  u8 hob_nsect;
1: +  u8 hob_lbal;
1: +  u8 hob_lbam;
1: +  u8 hob_lbah;
1: +  u8 feature;
1: +  u8 nsect;
1: +  u8 lbal;
1: +  u8 lbam;
1: +  u8 lbah;
1: +  u8 device;
1: +  u8 command;
1: +  u32 auxiliary;
1:  };
1:  
1:  struct ata_port;
1: @@ -82981,31 +84080,31 @@ struct ata_port;
1:  struct ata_device;
1:  
1:  struct ata_queued_cmd {
1: -	struct ata_port *ap;
1: -	struct ata_device *dev;
1: -	struct scsi_cmnd *scsicmd;
1: -	void (*scsidone)(struct scsi_cmnd *);
1: -	struct ata_taskfile tf;
1: -	u8 cdb[16];
1: -	long unsigned int flags;
1: -	unsigned int tag;
1: -	unsigned int hw_tag;
1: -	unsigned int n_elem;
1: -	unsigned int orig_n_elem;
1: -	int dma_dir;
1: -	unsigned int sect_size;
1: -	unsigned int nbytes;
1: -	unsigned int extrabytes;
1: -	unsigned int curbytes;
1: -	struct scatterlist sgent;
1: -	struct scatterlist *sg;
1: -	struct scatterlist *cursg;
1: -	unsigned int cursg_ofs;
1: -	unsigned int err_mask;
1: -	struct ata_taskfile result_tf;
1: -	ata_qc_cb_t complete_fn;
1: -	void *private_data;
1: -	void *lldd_task;
1: +  struct ata_port *ap;
1: +  struct ata_device *dev;
1: +  struct scsi_cmnd *scsicmd;
1: +  void (*scsidone)(struct scsi_cmnd *);
1: +  struct ata_taskfile tf;
1: +  u8 cdb[16];
1: +  long unsigned int flags;
1: +  unsigned int tag;
1: +  unsigned int hw_tag;
1: +  unsigned int n_elem;
1: +  unsigned int orig_n_elem;
1: +  int dma_dir;
1: +  unsigned int sect_size;
1: +  unsigned int nbytes;
1: +  unsigned int extrabytes;
1: +  unsigned int curbytes;
1: +  struct scatterlist sgent;
1: +  struct scatterlist *sg;
1: +  struct scatterlist *cursg;
1: +  unsigned int cursg_ofs;
1: +  unsigned int err_mask;
1: +  struct ata_taskfile result_tf;
1: +  ata_qc_cb_t complete_fn;
1: +  void *private_data;
1: +  void *lldd_task;
1:  };
1:  
1:  struct ata_link;
1: @@ -83013,1487 +84112,1489 @@ struct ata_link;
1:  typedef int (*ata_prereset_fn_t)(struct ata_link *, long unsigned int);
1:  
1:  struct ata_eh_info {
1: -	struct ata_device *dev;
1: -	u32 serror;
1: -	unsigned int err_mask;
1: -	unsigned int action;
1: -	unsigned int dev_action[2];
1: -	unsigned int flags;
1: -	unsigned int probe_mask;
1: -	char desc[80];
1: -	int desc_len;
1: +  struct ata_device *dev;
1: +  u32 serror;
1: +  unsigned int err_mask;
1: +  unsigned int action;
1: +  unsigned int dev_action[2];
1: +  unsigned int flags;
1: +  unsigned int probe_mask;
1: +  char desc[80];
1: +  int desc_len;
1:  };
1:  
1:  struct ata_eh_context {
1: -	struct ata_eh_info i;
1: -	int tries[2];
1: -	int cmd_timeout_idx[12];
1: -	unsigned int classes[2];
1: -	unsigned int did_probe_mask;
1: -	unsigned int unloaded_mask;
1: -	unsigned int saved_ncq_enabled;
1: -	u8 saved_xfer_mode[2];
1: -	long unsigned int last_reset;
1: +  struct ata_eh_info i;
1: +  int tries[2];
1: +  int cmd_timeout_idx[12];
1: +  unsigned int classes[2];
1: +  unsigned int did_probe_mask;
1: +  unsigned int unloaded_mask;
1: +  unsigned int saved_ncq_enabled;
1: +  u8 saved_xfer_mode[2];
1: +  long unsigned int last_reset;
1:  };
1:  
1:  struct ata_ering_entry {
1: -	unsigned int eflags;
1: -	unsigned int err_mask;
1: -	u64 timestamp;
1: +  unsigned int eflags;
1: +  unsigned int err_mask;
1: +  u64 timestamp;
1:  };
1:  
1:  struct ata_ering {
1: -	int cursor;
1: -	struct ata_ering_entry ring[32];
1: +  int cursor;
1: +  struct ata_ering_entry ring[32];
1:  };
1:  
1:  struct ata_device {
1: -	struct ata_link *link;
1: -	unsigned int devno;
1: -	unsigned int horkage;
1: -	long unsigned int flags;
1: -	struct scsi_device *sdev;
1: -	void *private_data;
1: -	union acpi_object *gtf_cache;
1: -	unsigned int gtf_filter;
1: -	struct device tdev;
1: -	u64 n_sectors;
1: -	u64 n_native_sectors;
1: -	unsigned int class;
1: -	long unsigned int unpark_deadline;
1: -	u8 pio_mode;
1: -	u8 dma_mode;
1: -	u8 xfer_mode;
1: -	unsigned int xfer_shift;
1: -	unsigned int multi_count;
1: -	unsigned int max_sectors;
1: -	unsigned int cdb_len;
1: -	long unsigned int pio_mask;
1: -	long unsigned int mwdma_mask;
1: -	long unsigned int udma_mask;
1: -	u16 cylinders;
1: -	u16 heads;
1: -	u16 sectors;
1: -	long: 16;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	union {
1: -		u16 id[256];
1: -		u32 gscr[128];
1: -	};
1: -	u8 devslp_timing[8];
1: -	u8 ncq_send_recv_cmds[20];
1: -	u8 ncq_non_data_cmds[64];
1: -	u32 zac_zoned_cap;
1: -	u32 zac_zones_optimal_open;
1: -	u32 zac_zones_optimal_nonseq;
1: -	u32 zac_zones_max_open;
1: -	int spdn_cnt;
1: -	struct ata_ering ering;
1: -	long: 64;
1: +  struct ata_link *link;
1: +  unsigned int devno;
1: +  unsigned int horkage;
1: +  long unsigned int flags;
1: +  struct scsi_device *sdev;
1: +  void *private_data;
1: +  union acpi_object *gtf_cache;
1: +  unsigned int gtf_filter;
1: +  struct device tdev;
1: +  u64 n_sectors;
1: +  u64 n_native_sectors;
1: +  unsigned int class;
1: +  long unsigned int unpark_deadline;
1: +  u8 pio_mode;
1: +  u8 dma_mode;
1: +  u8 xfer_mode;
1: +  unsigned int xfer_shift;
1: +  unsigned int multi_count;
1: +  unsigned int max_sectors;
1: +  unsigned int cdb_len;
1: +  long unsigned int pio_mask;
1: +  long unsigned int mwdma_mask;
1: +  long unsigned int udma_mask;
1: +  u16 cylinders;
1: +  u16 heads;
1: +  u16 sectors;
1: +  long : 16;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  union {
1: +    u16 id[256];
1: +    u32 gscr[128];
1: +  };
1: +  u8 devslp_timing[8];
1: +  u8 ncq_send_recv_cmds[20];
1: +  u8 ncq_non_data_cmds[64];
1: +  u32 zac_zoned_cap;
1: +  u32 zac_zones_optimal_open;
1: +  u32 zac_zones_optimal_nonseq;
1: +  u32 zac_zones_max_open;
1: +  int spdn_cnt;
1: +  struct ata_ering ering;
1: +  long : 64;
1:  };
1:  
1:  struct ata_link {
1: -	struct ata_port *ap;
1: -	int pmp;
1: -	struct device tdev;
1: -	unsigned int active_tag;
1: -	u32 sactive;
1: -	unsigned int flags;
1: -	u32 saved_scontrol;
1: -	unsigned int hw_sata_spd_limit;
1: -	unsigned int sata_spd_limit;
1: -	unsigned int sata_spd;
1: -	enum ata_lpm_policy lpm_policy;
1: -	struct ata_eh_info eh_info;
1: -	struct ata_eh_context eh_context;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ata_device device[2];
1: -	long unsigned int last_lpm_change;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -};
1: -
1: -typedef int (*ata_reset_fn_t)(struct ata_link *, unsigned int *, long unsigned int);
1: +  struct ata_port *ap;
1: +  int pmp;
1: +  struct device tdev;
1: +  unsigned int active_tag;
1: +  u32 sactive;
1: +  unsigned int flags;
1: +  u32 saved_scontrol;
1: +  unsigned int hw_sata_spd_limit;
1: +  unsigned int sata_spd_limit;
1: +  unsigned int sata_spd;
1: +  enum ata_lpm_policy lpm_policy;
1: +  struct ata_eh_info eh_info;
1: +  struct ata_eh_context eh_context;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ata_device device[2];
1: +  long unsigned int last_lpm_change;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +};
1: +
1: +typedef int (*ata_reset_fn_t)(struct ata_link *, unsigned int *,
1: +                              long unsigned int);
1:  
1:  typedef void (*ata_postreset_fn_t)(struct ata_link *, unsigned int *);
1:  
1:  enum sw_activity {
1: -	OFF = 0,
1: -	BLINK_ON = 1,
1: -	BLINK_OFF = 2,
1: +  OFF = 0,
1: +  BLINK_ON = 1,
1: +  BLINK_OFF = 2,
1:  };
1:  
1:  struct ata_ioports {
1: -	void *cmd_addr;
1: -	void *data_addr;
1: -	void *error_addr;
1: -	void *feature_addr;
1: -	void *nsect_addr;
1: -	void *lbal_addr;
1: -	void *lbam_addr;
1: -	void *lbah_addr;
1: -	void *device_addr;
1: -	void *status_addr;
1: -	void *command_addr;
1: -	void *altstatus_addr;
1: -	void *ctl_addr;
1: -	void *bmdma_addr;
1: -	void *scr_addr;
1: +  void *cmd_addr;
1: +  void *data_addr;
1: +  void *error_addr;
1: +  void *feature_addr;
1: +  void *nsect_addr;
1: +  void *lbal_addr;
1: +  void *lbam_addr;
1: +  void *lbah_addr;
1: +  void *device_addr;
1: +  void *status_addr;
1: +  void *command_addr;
1: +  void *altstatus_addr;
1: +  void *ctl_addr;
1: +  void *bmdma_addr;
1: +  void *scr_addr;
1:  };
1:  
1:  struct ata_port_operations;
1:  
1:  struct ata_host {
1: -	spinlock_t lock;
1: -	struct device *dev;
1: -	void * const *iomap;
1: -	unsigned int n_ports;
1: -	unsigned int n_tags;
1: -	void *private_data;
1: -	struct ata_port_operations *ops;
1: -	long unsigned int flags;
1: -	struct kref kref;
1: -	struct mutex eh_mutex;
1: -	struct task_struct *eh_owner;
1: -	struct ata_port *simplex_claimed;
1: -	struct ata_port *ports[0];
1: +  spinlock_t lock;
1: +  struct device *dev;
1: +  void *const *iomap;
1: +  unsigned int n_ports;
1: +  unsigned int n_tags;
1: +  void *private_data;
1: +  struct ata_port_operations *ops;
1: +  long unsigned int flags;
1: +  struct kref kref;
1: +  struct mutex eh_mutex;
1: +  struct task_struct *eh_owner;
1: +  struct ata_port *simplex_claimed;
1: +  struct ata_port *ports[0];
1:  };
1:  
1:  struct ata_port_operations {
1: -	int (*qc_defer)(struct ata_queued_cmd *);
1: -	int (*check_atapi_dma)(struct ata_queued_cmd *);
1: -	enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *);
1: -	unsigned int (*qc_issue)(struct ata_queued_cmd *);
1: -	bool (*qc_fill_rtf)(struct ata_queued_cmd *);
1: -	int (*cable_detect)(struct ata_port *);
1: -	long unsigned int (*mode_filter)(struct ata_device *, long unsigned int);
1: -	void (*set_piomode)(struct ata_port *, struct ata_device *);
1: -	void (*set_dmamode)(struct ata_port *, struct ata_device *);
1: -	int (*set_mode)(struct ata_link *, struct ata_device **);
1: -	unsigned int (*read_id)(struct ata_device *, struct ata_taskfile *, u16 *);
1: -	void (*dev_config)(struct ata_device *);
1: -	void (*freeze)(struct ata_port *);
1: -	void (*thaw)(struct ata_port *);
1: -	ata_prereset_fn_t prereset;
1: -	ata_reset_fn_t softreset;
1: -	ata_reset_fn_t hardreset;
1: -	ata_postreset_fn_t postreset;
1: -	ata_prereset_fn_t pmp_prereset;
1: -	ata_reset_fn_t pmp_softreset;
1: -	ata_reset_fn_t pmp_hardreset;
1: -	ata_postreset_fn_t pmp_postreset;
1: -	void (*error_handler)(struct ata_port *);
1: -	void (*lost_interrupt)(struct ata_port *);
1: -	void (*post_internal_cmd)(struct ata_queued_cmd *);
1: -	void (*sched_eh)(struct ata_port *);
1: -	void (*end_eh)(struct ata_port *);
1: -	int (*scr_read)(struct ata_link *, unsigned int, u32 *);
1: -	int (*scr_write)(struct ata_link *, unsigned int, u32);
1: -	void (*pmp_attach)(struct ata_port *);
1: -	void (*pmp_detach)(struct ata_port *);
1: -	int (*set_lpm)(struct ata_link *, enum ata_lpm_policy, unsigned int);
1: -	int (*port_suspend)(struct ata_port *, pm_message_t);
1: -	int (*port_resume)(struct ata_port *);
1: -	int (*port_start)(struct ata_port *);
1: -	void (*port_stop)(struct ata_port *);
1: -	void (*host_stop)(struct ata_host *);
1: -	void (*sff_dev_select)(struct ata_port *, unsigned int);
1: -	void (*sff_set_devctl)(struct ata_port *, u8);
1: -	u8 (*sff_check_status)(struct ata_port *);
1: -	u8 (*sff_check_altstatus)(struct ata_port *);
1: -	void (*sff_tf_load)(struct ata_port *, const struct ata_taskfile *);
1: -	void (*sff_tf_read)(struct ata_port *, struct ata_taskfile *);
1: -	void (*sff_exec_command)(struct ata_port *, const struct ata_taskfile *);
1: -	unsigned int (*sff_data_xfer)(struct ata_queued_cmd *, unsigned char *, unsigned int, int);
1: -	void (*sff_irq_on)(struct ata_port *);
1: -	bool (*sff_irq_check)(struct ata_port *);
1: -	void (*sff_irq_clear)(struct ata_port *);
1: -	void (*sff_drain_fifo)(struct ata_queued_cmd *);
1: -	void (*bmdma_setup)(struct ata_queued_cmd *);
1: -	void (*bmdma_start)(struct ata_queued_cmd *);
1: -	void (*bmdma_stop)(struct ata_queued_cmd *);
1: -	u8 (*bmdma_status)(struct ata_port *);
1: -	ssize_t (*em_show)(struct ata_port *, char *);
1: -	ssize_t (*em_store)(struct ata_port *, const char *, size_t);
1: -	ssize_t (*sw_activity_show)(struct ata_device *, char *);
1: -	ssize_t (*sw_activity_store)(struct ata_device *, enum sw_activity);
1: -	ssize_t (*transmit_led_message)(struct ata_port *, u32, ssize_t);
1: -	void (*phy_reset)(struct ata_port *);
1: -	void (*eng_timeout)(struct ata_port *);
1: -	const struct ata_port_operations *inherits;
1: +  int (*qc_defer)(struct ata_queued_cmd *);
1: +  int (*check_atapi_dma)(struct ata_queued_cmd *);
1: +  enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *);
1: +  unsigned int (*qc_issue)(struct ata_queued_cmd *);
1: +  bool (*qc_fill_rtf)(struct ata_queued_cmd *);
1: +  int (*cable_detect)(struct ata_port *);
1: +  long unsigned int (*mode_filter)(struct ata_device *, long unsigned int);
1: +  void (*set_piomode)(struct ata_port *, struct ata_device *);
1: +  void (*set_dmamode)(struct ata_port *, struct ata_device *);
1: +  int (*set_mode)(struct ata_link *, struct ata_device **);
1: +  unsigned int (*read_id)(struct ata_device *, struct ata_taskfile *, u16 *);
1: +  void (*dev_config)(struct ata_device *);
1: +  void (*freeze)(struct ata_port *);
1: +  void (*thaw)(struct ata_port *);
1: +  ata_prereset_fn_t prereset;
1: +  ata_reset_fn_t softreset;
1: +  ata_reset_fn_t hardreset;
1: +  ata_postreset_fn_t postreset;
1: +  ata_prereset_fn_t pmp_prereset;
1: +  ata_reset_fn_t pmp_softreset;
1: +  ata_reset_fn_t pmp_hardreset;
1: +  ata_postreset_fn_t pmp_postreset;
1: +  void (*error_handler)(struct ata_port *);
1: +  void (*lost_interrupt)(struct ata_port *);
1: +  void (*post_internal_cmd)(struct ata_queued_cmd *);
1: +  void (*sched_eh)(struct ata_port *);
1: +  void (*end_eh)(struct ata_port *);
1: +  int (*scr_read)(struct ata_link *, unsigned int, u32 *);
1: +  int (*scr_write)(struct ata_link *, unsigned int, u32);
1: +  void (*pmp_attach)(struct ata_port *);
1: +  void (*pmp_detach)(struct ata_port *);
1: +  int (*set_lpm)(struct ata_link *, enum ata_lpm_policy, unsigned int);
1: +  int (*port_suspend)(struct ata_port *, pm_message_t);
1: +  int (*port_resume)(struct ata_port *);
1: +  int (*port_start)(struct ata_port *);
1: +  void (*port_stop)(struct ata_port *);
1: +  void (*host_stop)(struct ata_host *);
1: +  void (*sff_dev_select)(struct ata_port *, unsigned int);
1: +  void (*sff_set_devctl)(struct ata_port *, u8);
1: +  u8 (*sff_check_status)(struct ata_port *);
1: +  u8 (*sff_check_altstatus)(struct ata_port *);
1: +  void (*sff_tf_load)(struct ata_port *, const struct ata_taskfile *);
1: +  void (*sff_tf_read)(struct ata_port *, struct ata_taskfile *);
1: +  void (*sff_exec_command)(struct ata_port *, const struct ata_taskfile *);
1: +  unsigned int (*sff_data_xfer)(struct ata_queued_cmd *, unsigned char *,
1: +                                unsigned int, int);
1: +  void (*sff_irq_on)(struct ata_port *);
1: +  bool (*sff_irq_check)(struct ata_port *);
1: +  void (*sff_irq_clear)(struct ata_port *);
1: +  void (*sff_drain_fifo)(struct ata_queued_cmd *);
1: +  void (*bmdma_setup)(struct ata_queued_cmd *);
1: +  void (*bmdma_start)(struct ata_queued_cmd *);
1: +  void (*bmdma_stop)(struct ata_queued_cmd *);
1: +  u8 (*bmdma_status)(struct ata_port *);
1: +  ssize_t (*em_show)(struct ata_port *, char *);
1: +  ssize_t (*em_store)(struct ata_port *, const char *, size_t);
1: +  ssize_t (*sw_activity_show)(struct ata_device *, char *);
1: +  ssize_t (*sw_activity_store)(struct ata_device *, enum sw_activity);
1: +  ssize_t (*transmit_led_message)(struct ata_port *, u32, ssize_t);
1: +  void (*phy_reset)(struct ata_port *);
1: +  void (*eng_timeout)(struct ata_port *);
1: +  const struct ata_port_operations *inherits;
1:  };
1:  
1:  struct ata_port_stats {
1: -	long unsigned int unhandled_irq;
1: -	long unsigned int idle_irq;
1: -	long unsigned int rw_reqbuf;
1: +  long unsigned int unhandled_irq;
1: +  long unsigned int idle_irq;
1: +  long unsigned int rw_reqbuf;
1:  };
1:  
1:  struct ata_acpi_drive {
1: -	u32 pio;
1: -	u32 dma;
1: +  u32 pio;
1: +  u32 dma;
1:  };
1:  
1:  struct ata_acpi_gtm {
1: -	struct ata_acpi_drive drive[2];
1: -	u32 flags;
1: +  struct ata_acpi_drive drive[2];
1: +  u32 flags;
1:  };
1:  
1:  struct ata_port {
1: -	struct Scsi_Host *scsi_host;
1: -	struct ata_port_operations *ops;
1: -	spinlock_t *lock;
1: -	long unsigned int flags;
1: -	unsigned int pflags;
1: -	unsigned int print_id;
1: -	unsigned int local_port_no;
1: -	unsigned int port_no;
1: -	struct ata_ioports ioaddr;
1: -	u8 ctl;
1: -	u8 last_ctl;
1: -	struct ata_link *sff_pio_task_link;
1: -	struct delayed_work sff_pio_task;
1: -	struct ata_bmdma_prd *bmdma_prd;
1: -	dma_addr_t bmdma_prd_dma;
1: -	unsigned int pio_mask;
1: -	unsigned int mwdma_mask;
1: -	unsigned int udma_mask;
1: -	unsigned int cbl;
1: -	struct ata_queued_cmd qcmd[33];
1: -	long unsigned int sas_tag_allocated;
1: -	u64 qc_active;
1: -	int nr_active_links;
1: -	unsigned int sas_last_tag;
1: -	long: 64;
1: -	struct ata_link link;
1: -	struct ata_link *slave_link;
1: -	int nr_pmp_links;
1: -	struct ata_link *pmp_link;
1: -	struct ata_link *excl_link;
1: -	struct ata_port_stats stats;
1: -	struct ata_host *host;
1: -	struct device *dev;
1: -	struct device tdev;
1: -	struct mutex scsi_scan_mutex;
1: -	struct delayed_work hotplug_task;
1: -	struct work_struct scsi_rescan_task;
1: -	unsigned int hsm_task_state;
1: -	u32 msg_enable;
1: -	struct list_head eh_done_q;
1: -	wait_queue_head_t eh_wait_q;
1: -	int eh_tries;
1: -	struct completion park_req_pending;
1: -	pm_message_t pm_mesg;
1: -	enum ata_lpm_policy target_lpm_policy;
1: -	struct timer_list fastdrain_timer;
1: -	long unsigned int fastdrain_cnt;
1: -	async_cookie_t cookie;
1: -	int em_message_type;
1: -	void *private_data;
1: -	struct ata_acpi_gtm __acpi_init_gtm;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	u8 sector_buf[512];
1: +  struct Scsi_Host *scsi_host;
1: +  struct ata_port_operations *ops;
1: +  spinlock_t *lock;
1: +  long unsigned int flags;
1: +  unsigned int pflags;
1: +  unsigned int print_id;
1: +  unsigned int local_port_no;
1: +  unsigned int port_no;
1: +  struct ata_ioports ioaddr;
1: +  u8 ctl;
1: +  u8 last_ctl;
1: +  struct ata_link *sff_pio_task_link;
1: +  struct delayed_work sff_pio_task;
1: +  struct ata_bmdma_prd *bmdma_prd;
1: +  dma_addr_t bmdma_prd_dma;
1: +  unsigned int pio_mask;
1: +  unsigned int mwdma_mask;
1: +  unsigned int udma_mask;
1: +  unsigned int cbl;
1: +  struct ata_queued_cmd qcmd[33];
1: +  long unsigned int sas_tag_allocated;
1: +  u64 qc_active;
1: +  int nr_active_links;
1: +  unsigned int sas_last_tag;
1: +  long : 64;
1: +  struct ata_link link;
1: +  struct ata_link *slave_link;
1: +  int nr_pmp_links;
1: +  struct ata_link *pmp_link;
1: +  struct ata_link *excl_link;
1: +  struct ata_port_stats stats;
1: +  struct ata_host *host;
1: +  struct device *dev;
1: +  struct device tdev;
1: +  struct mutex scsi_scan_mutex;
1: +  struct delayed_work hotplug_task;
1: +  struct work_struct scsi_rescan_task;
1: +  unsigned int hsm_task_state;
1: +  u32 msg_enable;
1: +  struct list_head eh_done_q;
1: +  wait_queue_head_t eh_wait_q;
1: +  int eh_tries;
1: +  struct completion park_req_pending;
1: +  pm_message_t pm_mesg;
1: +  enum ata_lpm_policy target_lpm_policy;
1: +  struct timer_list fastdrain_timer;
1: +  long unsigned int fastdrain_cnt;
1: +  async_cookie_t cookie;
1: +  int em_message_type;
1: +  void *private_data;
1: +  struct ata_acpi_gtm __acpi_init_gtm;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  u8 sector_buf[512];
1:  };
1:  
1:  enum sas_oob_mode {
1: -	OOB_NOT_CONNECTED = 0,
1: -	SATA_OOB_MODE = 1,
1: -	SAS_OOB_MODE = 2,
1: +  OOB_NOT_CONNECTED = 0,
1: +  SATA_OOB_MODE = 1,
1: +  SAS_OOB_MODE = 2,
1:  };
1:  
1:  enum phy_func {
1: -	PHY_FUNC_NOP = 0,
1: -	PHY_FUNC_LINK_RESET = 1,
1: -	PHY_FUNC_HARD_RESET = 2,
1: -	PHY_FUNC_DISABLE = 3,
1: -	PHY_FUNC_CLEAR_ERROR_LOG = 5,
1: -	PHY_FUNC_CLEAR_AFFIL = 6,
1: -	PHY_FUNC_TX_SATA_PS_SIGNAL = 7,
1: -	PHY_FUNC_RELEASE_SPINUP_HOLD = 16,
1: -	PHY_FUNC_SET_LINK_RATE = 17,
1: -	PHY_FUNC_GET_EVENTS = 18,
1: +  PHY_FUNC_NOP = 0,
1: +  PHY_FUNC_LINK_RESET = 1,
1: +  PHY_FUNC_HARD_RESET = 2,
1: +  PHY_FUNC_DISABLE = 3,
1: +  PHY_FUNC_CLEAR_ERROR_LOG = 5,
1: +  PHY_FUNC_CLEAR_AFFIL = 6,
1: +  PHY_FUNC_TX_SATA_PS_SIGNAL = 7,
1: +  PHY_FUNC_RELEASE_SPINUP_HOLD = 16,
1: +  PHY_FUNC_SET_LINK_RATE = 17,
1: +  PHY_FUNC_GET_EVENTS = 18,
1:  };
1:  
1:  enum sas_open_rej_reason {
1: -	SAS_OREJ_UNKNOWN = 0,
1: -	SAS_OREJ_BAD_DEST = 1,
1: -	SAS_OREJ_CONN_RATE = 2,
1: -	SAS_OREJ_EPROTO = 3,
1: -	SAS_OREJ_RESV_AB0 = 4,
1: -	SAS_OREJ_RESV_AB1 = 5,
1: -	SAS_OREJ_RESV_AB2 = 6,
1: -	SAS_OREJ_RESV_AB3 = 7,
1: -	SAS_OREJ_WRONG_DEST = 8,
1: -	SAS_OREJ_STP_NORES = 9,
1: -	SAS_OREJ_NO_DEST = 10,
1: -	SAS_OREJ_PATH_BLOCKED = 11,
1: -	SAS_OREJ_RSVD_CONT0 = 12,
1: -	SAS_OREJ_RSVD_CONT1 = 13,
1: -	SAS_OREJ_RSVD_INIT0 = 14,
1: -	SAS_OREJ_RSVD_INIT1 = 15,
1: -	SAS_OREJ_RSVD_STOP0 = 16,
1: -	SAS_OREJ_RSVD_STOP1 = 17,
1: -	SAS_OREJ_RSVD_RETRY = 18,
1: +  SAS_OREJ_UNKNOWN = 0,
1: +  SAS_OREJ_BAD_DEST = 1,
1: +  SAS_OREJ_CONN_RATE = 2,
1: +  SAS_OREJ_EPROTO = 3,
1: +  SAS_OREJ_RESV_AB0 = 4,
1: +  SAS_OREJ_RESV_AB1 = 5,
1: +  SAS_OREJ_RESV_AB2 = 6,
1: +  SAS_OREJ_RESV_AB3 = 7,
1: +  SAS_OREJ_WRONG_DEST = 8,
1: +  SAS_OREJ_STP_NORES = 9,
1: +  SAS_OREJ_NO_DEST = 10,
1: +  SAS_OREJ_PATH_BLOCKED = 11,
1: +  SAS_OREJ_RSVD_CONT0 = 12,
1: +  SAS_OREJ_RSVD_CONT1 = 13,
1: +  SAS_OREJ_RSVD_INIT0 = 14,
1: +  SAS_OREJ_RSVD_INIT1 = 15,
1: +  SAS_OREJ_RSVD_STOP0 = 16,
1: +  SAS_OREJ_RSVD_STOP1 = 17,
1: +  SAS_OREJ_RSVD_RETRY = 18,
1:  };
1:  
1:  struct dev_to_host_fis {
1: -	u8 fis_type;
1: -	u8 flags;
1: -	u8 status;
1: -	u8 error;
1: -	u8 lbal;
1: -	union {
1: -		u8 lbam;
1: -		u8 byte_count_low;
1: -	};
1: -	union {
1: -		u8 lbah;
1: -		u8 byte_count_high;
1: -	};
1: -	u8 device;
1: -	u8 lbal_exp;
1: -	u8 lbam_exp;
1: -	u8 lbah_exp;
1: -	u8 _r_a;
1: -	union {
1: -		u8 sector_count;
1: -		u8 interrupt_reason;
1: -	};
1: -	u8 sector_count_exp;
1: -	u8 _r_b;
1: -	u8 _r_c;
1: -	u32 _r_d;
1: +  u8 fis_type;
1: +  u8 flags;
1: +  u8 status;
1: +  u8 error;
1: +  u8 lbal;
1: +  union {
1: +    u8 lbam;
1: +    u8 byte_count_low;
1: +  };
1: +  union {
1: +    u8 lbah;
1: +    u8 byte_count_high;
1: +  };
1: +  u8 device;
1: +  u8 lbal_exp;
1: +  u8 lbam_exp;
1: +  u8 lbah_exp;
1: +  u8 _r_a;
1: +  union {
1: +    u8 sector_count;
1: +    u8 interrupt_reason;
1: +  };
1: +  u8 sector_count_exp;
1: +  u8 _r_b;
1: +  u8 _r_c;
1: +  u32 _r_d;
1:  };
1:  
1:  struct host_to_dev_fis {
1: -	u8 fis_type;
1: -	u8 flags;
1: -	u8 command;
1: -	u8 features;
1: -	u8 lbal;
1: -	union {
1: -		u8 lbam;
1: -		u8 byte_count_low;
1: -	};
1: -	union {
1: -		u8 lbah;
1: -		u8 byte_count_high;
1: -	};
1: -	u8 device;
1: -	u8 lbal_exp;
1: -	u8 lbam_exp;
1: -	u8 lbah_exp;
1: -	u8 features_exp;
1: -	union {
1: -		u8 sector_count;
1: -		u8 interrupt_reason;
1: -	};
1: -	u8 sector_count_exp;
1: -	u8 _r_a;
1: -	u8 control;
1: -	u32 _r_b;
1: +  u8 fis_type;
1: +  u8 flags;
1: +  u8 command;
1: +  u8 features;
1: +  u8 lbal;
1: +  union {
1: +    u8 lbam;
1: +    u8 byte_count_low;
1: +  };
1: +  union {
1: +    u8 lbah;
1: +    u8 byte_count_high;
1: +  };
1: +  u8 device;
1: +  u8 lbal_exp;
1: +  u8 lbam_exp;
1: +  u8 lbah_exp;
1: +  u8 features_exp;
1: +  union {
1: +    u8 sector_count;
1: +    u8 interrupt_reason;
1: +  };
1: +  u8 sector_count_exp;
1: +  u8 _r_a;
1: +  u8 control;
1: +  u32 _r_b;
1:  };
1:  
1:  struct report_general_resp {
1: -	__be16 change_count;
1: -	__be16 route_indexes;
1: -	u8 _r_a;
1: -	u8 num_phys;
1: -	u8 conf_route_table: 1;
1: -	u8 configuring: 1;
1: -	u8 config_others: 1;
1: -	u8 orej_retry_supp: 1;
1: -	u8 stp_cont_awt: 1;
1: -	u8 self_config: 1;
1: -	u8 zone_config: 1;
1: -	u8 t2t_supp: 1;
1: -	u8 _r_c;
1: -	u8 enclosure_logical_id[8];
1: -	u8 _r_d[12];
1: +  __be16 change_count;
1: +  __be16 route_indexes;
1: +  u8 _r_a;
1: +  u8 num_phys;
1: +  u8 conf_route_table : 1;
1: +  u8 configuring : 1;
1: +  u8 config_others : 1;
1: +  u8 orej_retry_supp : 1;
1: +  u8 stp_cont_awt : 1;
1: +  u8 self_config : 1;
1: +  u8 zone_config : 1;
1: +  u8 t2t_supp : 1;
1: +  u8 _r_c;
1: +  u8 enclosure_logical_id[8];
1: +  u8 _r_d[12];
1:  };
1:  
1:  struct discover_resp {
1: -	u8 _r_a[5];
1: -	u8 phy_id;
1: -	__be16 _r_b;
1: -	u8 _r_c: 4;
1: -	u8 attached_dev_type: 3;
1: -	u8 _r_d: 1;
1: -	u8 linkrate: 4;
1: -	u8 _r_e: 4;
1: -	u8 attached_sata_host: 1;
1: -	u8 iproto: 3;
1: -	u8 _r_f: 4;
1: -	u8 attached_sata_dev: 1;
1: -	u8 tproto: 3;
1: -	u8 _r_g: 3;
1: -	u8 attached_sata_ps: 1;
1: -	u8 sas_addr[8];
1: -	u8 attached_sas_addr[8];
1: -	u8 attached_phy_id;
1: -	u8 _r_h[7];
1: -	u8 hmin_linkrate: 4;
1: -	u8 pmin_linkrate: 4;
1: -	u8 hmax_linkrate: 4;
1: -	u8 pmax_linkrate: 4;
1: -	u8 change_count;
1: -	u8 pptv: 4;
1: -	u8 _r_i: 3;
1: -	u8 virtual: 1;
1: -	u8 routing_attr: 4;
1: -	u8 _r_j: 4;
1: -	u8 conn_type;
1: -	u8 conn_el_index;
1: -	u8 conn_phy_link;
1: -	u8 _r_k[8];
1: +  u8 _r_a[5];
1: +  u8 phy_id;
1: +  __be16 _r_b;
1: +  u8 _r_c : 4;
1: +  u8 attached_dev_type : 3;
1: +  u8 _r_d : 1;
1: +  u8 linkrate : 4;
1: +  u8 _r_e : 4;
1: +  u8 attached_sata_host : 1;
1: +  u8 iproto : 3;
1: +  u8 _r_f : 4;
1: +  u8 attached_sata_dev : 1;
1: +  u8 tproto : 3;
1: +  u8 _r_g : 3;
1: +  u8 attached_sata_ps : 1;
1: +  u8 sas_addr[8];
1: +  u8 attached_sas_addr[8];
1: +  u8 attached_phy_id;
1: +  u8 _r_h[7];
1: +  u8 hmin_linkrate : 4;
1: +  u8 pmin_linkrate : 4;
1: +  u8 hmax_linkrate : 4;
1: +  u8 pmax_linkrate : 4;
1: +  u8 change_count;
1: +  u8 pptv : 4;
1: +  u8 _r_i : 3;
1: +  u8 virtual : 1;
1: +  u8 routing_attr : 4;
1: +  u8 _r_j : 4;
1: +  u8 conn_type;
1: +  u8 conn_el_index;
1: +  u8 conn_phy_link;
1: +  u8 _r_k[8];
1:  };
1:  
1:  struct report_phy_sata_resp {
1: -	u8 _r_a[5];
1: -	u8 phy_id;
1: -	u8 _r_b;
1: -	u8 affil_valid: 1;
1: -	u8 affil_supp: 1;
1: -	u8 _r_c: 6;
1: -	u32 _r_d;
1: -	u8 stp_sas_addr[8];
1: -	struct dev_to_host_fis fis;
1: -	u32 _r_e;
1: -	u8 affil_stp_ini_addr[8];
1: -	__be32 crc;
1: +  u8 _r_a[5];
1: +  u8 phy_id;
1: +  u8 _r_b;
1: +  u8 affil_valid : 1;
1: +  u8 affil_supp : 1;
1: +  u8 _r_c : 6;
1: +  u32 _r_d;
1: +  u8 stp_sas_addr[8];
1: +  struct dev_to_host_fis fis;
1: +  u32 _r_e;
1: +  u8 affil_stp_ini_addr[8];
1: +  __be32 crc;
1:  };
1:  
1:  struct smp_resp {
1: -	u8 frame_type;
1: -	u8 function;
1: -	u8 result;
1: -	u8 reserved;
1: -	union {
1: -		struct report_general_resp rg;
1: -		struct discover_resp disc;
1: -		struct report_phy_sata_resp rps;
1: -	};
1: +  u8 frame_type;
1: +  u8 function;
1: +  u8 result;
1: +  u8 reserved;
1: +  union {
1: +    struct report_general_resp rg;
1: +    struct discover_resp disc;
1: +    struct report_phy_sata_resp rps;
1: +  };
1:  };
1:  
1:  enum sas_class {
1: -	SAS = 0,
1: -	EXPANDER = 1,
1: +  SAS = 0,
1: +  EXPANDER = 1,
1:  };
1:  
1:  enum sas_phy_role {
1: -	PHY_ROLE_NONE = 0,
1: -	PHY_ROLE_TARGET = 64,
1: -	PHY_ROLE_INITIATOR = 128,
1: +  PHY_ROLE_NONE = 0,
1: +  PHY_ROLE_TARGET = 64,
1: +  PHY_ROLE_INITIATOR = 128,
1:  };
1:  
1:  enum sas_phy_type {
1: -	PHY_TYPE_PHYSICAL = 0,
1: -	PHY_TYPE_VIRTUAL = 1,
1: +  PHY_TYPE_PHYSICAL = 0,
1: +  PHY_TYPE_VIRTUAL = 1,
1:  };
1:  
1:  enum port_event {
1: -	PORTE_BYTES_DMAED = 0,
1: -	PORTE_BROADCAST_RCVD = 1,
1: -	PORTE_LINK_RESET_ERR = 2,
1: -	PORTE_TIMER_EVENT = 3,
1: -	PORTE_HARD_RESET = 4,
1: -	PORT_NUM_EVENTS = 5,
1: +  PORTE_BYTES_DMAED = 0,
1: +  PORTE_BROADCAST_RCVD = 1,
1: +  PORTE_LINK_RESET_ERR = 2,
1: +  PORTE_TIMER_EVENT = 3,
1: +  PORTE_HARD_RESET = 4,
1: +  PORT_NUM_EVENTS = 5,
1:  };
1:  
1:  enum phy_event {
1: -	PHYE_LOSS_OF_SIGNAL = 0,
1: -	PHYE_OOB_DONE = 1,
1: -	PHYE_OOB_ERROR = 2,
1: -	PHYE_SPINUP_HOLD = 3,
1: -	PHYE_RESUME_TIMEOUT = 4,
1: -	PHYE_SHUTDOWN = 5,
1: -	PHY_NUM_EVENTS = 6,
1: +  PHYE_LOSS_OF_SIGNAL = 0,
1: +  PHYE_OOB_DONE = 1,
1: +  PHYE_OOB_ERROR = 2,
1: +  PHYE_SPINUP_HOLD = 3,
1: +  PHYE_RESUME_TIMEOUT = 4,
1: +  PHYE_SHUTDOWN = 5,
1: +  PHY_NUM_EVENTS = 6,
1:  };
1:  
1:  enum discover_event {
1: -	DISCE_DISCOVER_DOMAIN = 0,
1: -	DISCE_REVALIDATE_DOMAIN = 1,
1: -	DISCE_SUSPEND = 2,
1: -	DISCE_RESUME = 3,
1: -	DISC_NUM_EVENTS = 4,
1: +  DISCE_DISCOVER_DOMAIN = 0,
1: +  DISCE_REVALIDATE_DOMAIN = 1,
1: +  DISCE_SUSPEND = 2,
1: +  DISCE_RESUME = 3,
1: +  DISC_NUM_EVENTS = 4,
1:  };
1:  
1:  enum routing_attribute {
1: -	DIRECT_ROUTING = 0,
1: -	SUBTRACTIVE_ROUTING = 1,
1: -	TABLE_ROUTING = 2,
1: +  DIRECT_ROUTING = 0,
1: +  SUBTRACTIVE_ROUTING = 1,
1: +  TABLE_ROUTING = 2,
1:  };
1:  
1:  enum ex_phy_state {
1: -	PHY_EMPTY = 0,
1: -	PHY_VACANT = 1,
1: -	PHY_NOT_PRESENT = 2,
1: -	PHY_DEVICE_DISCOVERED = 3,
1: +  PHY_EMPTY = 0,
1: +  PHY_VACANT = 1,
1: +  PHY_NOT_PRESENT = 2,
1: +  PHY_DEVICE_DISCOVERED = 3,
1:  };
1:  
1:  struct ex_phy {
1: -	int phy_id;
1: -	enum ex_phy_state phy_state;
1: -	enum sas_device_type attached_dev_type;
1: -	enum sas_linkrate linkrate;
1: -	u8 attached_sata_host: 1;
1: -	u8 attached_sata_dev: 1;
1: -	u8 attached_sata_ps: 1;
1: -	enum sas_protocol attached_tproto;
1: -	enum sas_protocol attached_iproto;
1: -	u8 attached_sas_addr[8];
1: -	u8 attached_phy_id;
1: -	int phy_change_count;
1: -	enum routing_attribute routing_attr;
1: -	u8 virtual: 1;
1: -	int last_da_index;
1: -	struct sas_phy *phy;
1: -	struct sas_port *port;
1: +  int phy_id;
1: +  enum ex_phy_state phy_state;
1: +  enum sas_device_type attached_dev_type;
1: +  enum sas_linkrate linkrate;
1: +  u8 attached_sata_host : 1;
1: +  u8 attached_sata_dev : 1;
1: +  u8 attached_sata_ps : 1;
1: +  enum sas_protocol attached_tproto;
1: +  enum sas_protocol attached_iproto;
1: +  u8 attached_sas_addr[8];
1: +  u8 attached_phy_id;
1: +  int phy_change_count;
1: +  enum routing_attribute routing_attr;
1: +  u8 virtual : 1;
1: +  int last_da_index;
1: +  struct sas_phy *phy;
1: +  struct sas_port *port;
1:  };
1:  
1:  struct expander_device {
1: -	struct list_head children;
1: -	int ex_change_count;
1: -	u16 max_route_indexes;
1: -	u8 num_phys;
1: -	u8 t2t_supp: 1;
1: -	u8 configuring: 1;
1: -	u8 conf_route_table: 1;
1: -	u8 enclosure_logical_id[8];
1: -	struct ex_phy *ex_phy;
1: -	struct sas_port *parent_port;
1: -	struct mutex cmd_mutex;
1: +  struct list_head children;
1: +  int ex_change_count;
1: +  u16 max_route_indexes;
1: +  u8 num_phys;
1: +  u8 t2t_supp : 1;
1: +  u8 configuring : 1;
1: +  u8 conf_route_table : 1;
1: +  u8 enclosure_logical_id[8];
1: +  struct ex_phy *ex_phy;
1: +  struct sas_port *parent_port;
1: +  struct mutex cmd_mutex;
1:  };
1:  
1:  struct sata_device {
1: -	unsigned int class;
1: -	u8 port_no;
1: -	struct ata_port *ap;
1: -	struct ata_host *ata_host;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct smp_resp rps_resp;
1: -	u8 fis[24];
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  unsigned int class;
1: +  u8 port_no;
1: +  struct ata_port *ap;
1: +  struct ata_host *ata_host;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct smp_resp rps_resp;
1: +  u8 fis[24];
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ssp_device {
1: -	struct list_head eh_list_node;
1: -	struct scsi_lun reset_lun;
1: +  struct list_head eh_list_node;
1: +  struct scsi_lun reset_lun;
1:  };
1:  
1:  struct asd_sas_port;
1:  
1:  struct domain_device {
1: -	spinlock_t done_lock;
1: -	enum sas_device_type dev_type;
1: -	enum sas_linkrate linkrate;
1: -	enum sas_linkrate min_linkrate;
1: -	enum sas_linkrate max_linkrate;
1: -	int pathways;
1: -	struct domain_device *parent;
1: -	struct list_head siblings;
1: -	struct asd_sas_port *port;
1: -	struct sas_phy *phy;
1: -	struct list_head dev_list_node;
1: -	struct list_head disco_list_node;
1: -	enum sas_protocol iproto;
1: -	enum sas_protocol tproto;
1: -	struct sas_rphy *rphy;
1: -	u8 sas_addr[8];
1: -	u8 hashed_sas_addr[3];
1: -	u8 frame_rcvd[32];
1: -	long: 40;
1: -	long: 64;
1: -	union {
1: -		struct expander_device ex_dev;
1: -		struct sata_device sata_dev;
1: -		struct ssp_device ssp_dev;
1: -	};
1: -	void *lldd_dev;
1: -	long unsigned int state;
1: -	struct kref kref;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  spinlock_t done_lock;
1: +  enum sas_device_type dev_type;
1: +  enum sas_linkrate linkrate;
1: +  enum sas_linkrate min_linkrate;
1: +  enum sas_linkrate max_linkrate;
1: +  int pathways;
1: +  struct domain_device *parent;
1: +  struct list_head siblings;
1: +  struct asd_sas_port *port;
1: +  struct sas_phy *phy;
1: +  struct list_head dev_list_node;
1: +  struct list_head disco_list_node;
1: +  enum sas_protocol iproto;
1: +  enum sas_protocol tproto;
1: +  struct sas_rphy *rphy;
1: +  u8 sas_addr[8];
1: +  u8 hashed_sas_addr[3];
1: +  u8 frame_rcvd[32];
1: +  long : 40;
1: +  long : 64;
1: +  union {
1: +    struct expander_device ex_dev;
1: +    struct sata_device sata_dev;
1: +    struct ssp_device ssp_dev;
1: +  };
1: +  void *lldd_dev;
1: +  long unsigned int state;
1: +  struct kref kref;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct sas_work {
1: -	struct list_head drain_node;
1: -	struct work_struct work;
1: +  struct list_head drain_node;
1: +  struct work_struct work;
1:  };
1:  
1:  struct sas_discovery_event {
1: -	struct sas_work work;
1: -	struct asd_sas_port *port;
1: +  struct sas_work work;
1: +  struct asd_sas_port *port;
1:  };
1:  
1:  struct sas_discovery {
1: -	struct sas_discovery_event disc_work[4];
1: -	long unsigned int pending;
1: -	u8 fanout_sas_addr[8];
1: -	u8 eeds_a[8];
1: -	u8 eeds_b[8];
1: -	int max_level;
1: +  struct sas_discovery_event disc_work[4];
1: +  long unsigned int pending;
1: +  u8 fanout_sas_addr[8];
1: +  u8 eeds_a[8];
1: +  u8 eeds_b[8];
1: +  int max_level;
1:  };
1:  
1:  struct sas_ha_struct;
1:  
1:  struct asd_sas_port {
1: -	struct sas_discovery disc;
1: -	struct domain_device *port_dev;
1: -	spinlock_t dev_list_lock;
1: -	struct list_head dev_list;
1: -	struct list_head disco_list;
1: -	struct list_head destroy_list;
1: -	struct list_head sas_port_del_list;
1: -	enum sas_linkrate linkrate;
1: -	struct sas_work work;
1: -	int suspended;
1: -	int id;
1: -	enum sas_class class;
1: -	u8 sas_addr[8];
1: -	u8 attached_sas_addr[8];
1: -	enum sas_protocol iproto;
1: -	enum sas_protocol tproto;
1: -	enum sas_oob_mode oob_mode;
1: -	spinlock_t phy_list_lock;
1: -	struct list_head phy_list;
1: -	int num_phys;
1: -	u32 phy_mask;
1: -	struct sas_ha_struct *ha;
1: -	struct sas_port *port;
1: -	void *lldd_port;
1: +  struct sas_discovery disc;
1: +  struct domain_device *port_dev;
1: +  spinlock_t dev_list_lock;
1: +  struct list_head dev_list;
1: +  struct list_head disco_list;
1: +  struct list_head destroy_list;
1: +  struct list_head sas_port_del_list;
1: +  enum sas_linkrate linkrate;
1: +  struct sas_work work;
1: +  int suspended;
1: +  int id;
1: +  enum sas_class class;
1: +  u8 sas_addr[8];
1: +  u8 attached_sas_addr[8];
1: +  enum sas_protocol iproto;
1: +  enum sas_protocol tproto;
1: +  enum sas_oob_mode oob_mode;
1: +  spinlock_t phy_list_lock;
1: +  struct list_head phy_list;
1: +  int num_phys;
1: +  u32 phy_mask;
1: +  struct sas_ha_struct *ha;
1: +  struct sas_port *port;
1: +  void *lldd_port;
1:  };
1:  
1:  struct scsi_core {
1: -	struct Scsi_Host *shost;
1: +  struct Scsi_Host *shost;
1:  };
1:  
1:  struct asd_sas_phy;
1:  
1:  struct sas_ha_struct {
1: -	struct list_head defer_q;
1: -	struct mutex drain_mutex;
1: -	long unsigned int state;
1: -	spinlock_t lock;
1: -	int eh_active;
1: -	wait_queue_head_t eh_wait_q;
1: -	struct list_head eh_dev_q;
1: -	struct mutex disco_mutex;
1: -	struct scsi_core core;
1: -	char *sas_ha_name;
1: -	struct device *dev;
1: -	struct module *lldd_module;
1: -	struct workqueue_struct *event_q;
1: -	struct workqueue_struct *disco_q;
1: -	u8 *sas_addr;
1: -	u8 hashed_sas_addr[3];
1: -	spinlock_t phy_port_lock;
1: -	struct asd_sas_phy **sas_phy;
1: -	struct asd_sas_port **sas_port;
1: -	int num_phys;
1: -	int strict_wide_ports;
1: -	int (*notify_port_event)(struct asd_sas_phy *, enum port_event);
1: -	int (*notify_phy_event)(struct asd_sas_phy *, enum phy_event);
1: -	void *lldd_ha;
1: -	struct list_head eh_done_q;
1: -	struct list_head eh_ata_q;
1: -	int event_thres;
1: +  struct list_head defer_q;
1: +  struct mutex drain_mutex;
1: +  long unsigned int state;
1: +  spinlock_t lock;
1: +  int eh_active;
1: +  wait_queue_head_t eh_wait_q;
1: +  struct list_head eh_dev_q;
1: +  struct mutex disco_mutex;
1: +  struct scsi_core core;
1: +  char *sas_ha_name;
1: +  struct device *dev;
1: +  struct module *lldd_module;
1: +  struct workqueue_struct *event_q;
1: +  struct workqueue_struct *disco_q;
1: +  u8 *sas_addr;
1: +  u8 hashed_sas_addr[3];
1: +  spinlock_t phy_port_lock;
1: +  struct asd_sas_phy **sas_phy;
1: +  struct asd_sas_port **sas_port;
1: +  int num_phys;
1: +  int strict_wide_ports;
1: +  int (*notify_port_event)(struct asd_sas_phy *, enum port_event);
1: +  int (*notify_phy_event)(struct asd_sas_phy *, enum phy_event);
1: +  void *lldd_ha;
1: +  struct list_head eh_done_q;
1: +  struct list_head eh_ata_q;
1: +  int event_thres;
1:  };
1:  
1:  struct asd_sas_event {
1: -	struct sas_work work;
1: -	struct asd_sas_phy *phy;
1: -	int event;
1: +  struct sas_work work;
1: +  struct asd_sas_phy *phy;
1: +  int event;
1:  };
1:  
1:  struct asd_sas_phy {
1: -	atomic_t event_nr;
1: -	int in_shutdown;
1: -	int error;
1: -	int suspended;
1: -	struct sas_phy *phy;
1: -	int enabled;
1: -	int id;
1: -	enum sas_class class;
1: -	enum sas_protocol iproto;
1: -	enum sas_protocol tproto;
1: -	enum sas_phy_type type;
1: -	enum sas_phy_role role;
1: -	enum sas_oob_mode oob_mode;
1: -	enum sas_linkrate linkrate;
1: -	u8 *sas_addr;
1: -	u8 attached_sas_addr[8];
1: -	spinlock_t frame_rcvd_lock;
1: -	u8 *frame_rcvd;
1: -	int frame_rcvd_size;
1: -	spinlock_t sas_prim_lock;
1: -	u32 sas_prim;
1: -	struct list_head port_phy_el;
1: -	struct asd_sas_port *port;
1: -	struct sas_ha_struct *ha;
1: -	void *lldd_phy;
1: +  atomic_t event_nr;
1: +  int in_shutdown;
1: +  int error;
1: +  int suspended;
1: +  struct sas_phy *phy;
1: +  int enabled;
1: +  int id;
1: +  enum sas_class class;
1: +  enum sas_protocol iproto;
1: +  enum sas_protocol tproto;
1: +  enum sas_phy_type type;
1: +  enum sas_phy_role role;
1: +  enum sas_oob_mode oob_mode;
1: +  enum sas_linkrate linkrate;
1: +  u8 *sas_addr;
1: +  u8 attached_sas_addr[8];
1: +  spinlock_t frame_rcvd_lock;
1: +  u8 *frame_rcvd;
1: +  int frame_rcvd_size;
1: +  spinlock_t sas_prim_lock;
1: +  u32 sas_prim;
1: +  struct list_head port_phy_el;
1: +  struct asd_sas_port *port;
1: +  struct sas_ha_struct *ha;
1: +  void *lldd_phy;
1:  };
1:  
1:  enum sas_ha_state {
1: -	SAS_HA_REGISTERED = 0,
1: -	SAS_HA_DRAINING = 1,
1: -	SAS_HA_ATA_EH_ACTIVE = 2,
1: -	SAS_HA_FROZEN = 3,
1: +  SAS_HA_REGISTERED = 0,
1: +  SAS_HA_DRAINING = 1,
1: +  SAS_HA_ATA_EH_ACTIVE = 2,
1: +  SAS_HA_FROZEN = 3,
1:  };
1:  
1:  enum service_response {
1: -	SAS_TASK_COMPLETE = 0,
1: -	SAS_TASK_UNDELIVERED = 4294967295,
1: +  SAS_TASK_COMPLETE = 0,
1: +  SAS_TASK_UNDELIVERED = 4294967295,
1:  };
1:  
1:  enum exec_status {
1: -	__SAM_STAT_CHECK_CONDITION = 2,
1: -	SAS_DEV_NO_RESPONSE = 128,
1: -	SAS_DATA_UNDERRUN = 129,
1: -	SAS_DATA_OVERRUN = 130,
1: -	SAS_INTERRUPTED = 131,
1: -	SAS_QUEUE_FULL = 132,
1: -	SAS_DEVICE_UNKNOWN = 133,
1: -	SAS_SG_ERR = 134,
1: -	SAS_OPEN_REJECT = 135,
1: -	SAS_OPEN_TO = 136,
1: -	SAS_PROTO_RESPONSE = 137,
1: -	SAS_PHY_DOWN = 138,
1: -	SAS_NAK_R_ERR = 139,
1: -	SAS_PENDING = 140,
1: -	SAS_ABORTED_TASK = 141,
1: +  __SAM_STAT_CHECK_CONDITION = 2,
1: +  SAS_DEV_NO_RESPONSE = 128,
1: +  SAS_DATA_UNDERRUN = 129,
1: +  SAS_DATA_OVERRUN = 130,
1: +  SAS_INTERRUPTED = 131,
1: +  SAS_QUEUE_FULL = 132,
1: +  SAS_DEVICE_UNKNOWN = 133,
1: +  SAS_SG_ERR = 134,
1: +  SAS_OPEN_REJECT = 135,
1: +  SAS_OPEN_TO = 136,
1: +  SAS_PROTO_RESPONSE = 137,
1: +  SAS_PHY_DOWN = 138,
1: +  SAS_NAK_R_ERR = 139,
1: +  SAS_PENDING = 140,
1: +  SAS_ABORTED_TASK = 141,
1:  };
1:  
1:  struct task_status_struct {
1: -	enum service_response resp;
1: -	enum exec_status stat;
1: -	int buf_valid_size;
1: -	u8 buf[96];
1: -	u32 residual;
1: -	enum sas_open_rej_reason open_rej_reason;
1: +  enum service_response resp;
1: +  enum exec_status stat;
1: +  int buf_valid_size;
1: +  u8 buf[96];
1: +  u32 residual;
1: +  enum sas_open_rej_reason open_rej_reason;
1:  };
1:  
1:  struct sas_ata_task {
1: -	struct host_to_dev_fis fis;
1: -	u8 atapi_packet[16];
1: -	u8 retry_count;
1: -	u8 dma_xfer: 1;
1: -	u8 use_ncq: 1;
1: -	u8 set_affil_pol: 1;
1: -	u8 stp_affil_pol: 1;
1: -	u8 device_control_reg_update: 1;
1: +  struct host_to_dev_fis fis;
1: +  u8 atapi_packet[16];
1: +  u8 retry_count;
1: +  u8 dma_xfer : 1;
1: +  u8 use_ncq : 1;
1: +  u8 set_affil_pol : 1;
1: +  u8 stp_affil_pol : 1;
1: +  u8 device_control_reg_update : 1;
1:  } __attribute__((packed));
1:  
1:  struct sas_smp_task {
1: -	struct scatterlist smp_req;
1: -	struct scatterlist smp_resp;
1: +  struct scatterlist smp_req;
1: +  struct scatterlist smp_resp;
1:  };
1:  
1:  enum task_attribute {
1: -	TASK_ATTR_SIMPLE = 0,
1: -	TASK_ATTR_HOQ = 1,
1: -	TASK_ATTR_ORDERED = 2,
1: -	TASK_ATTR_ACA = 4,
1: +  TASK_ATTR_SIMPLE = 0,
1: +  TASK_ATTR_HOQ = 1,
1: +  TASK_ATTR_ORDERED = 2,
1: +  TASK_ATTR_ACA = 4,
1:  };
1:  
1:  struct sas_ssp_task {
1: -	u8 retry_count;
1: -	u8 LUN[8];
1: -	u8 enable_first_burst: 1;
1: -	enum task_attribute task_attr;
1: -	u8 task_prio;
1: -	struct scsi_cmnd *cmd;
1: +  u8 retry_count;
1: +  u8 LUN[8];
1: +  u8 enable_first_burst : 1;
1: +  enum task_attribute task_attr;
1: +  u8 task_prio;
1: +  struct scsi_cmnd *cmd;
1:  };
1:  
1:  struct sas_task_slow;
1:  
1:  struct sas_task {
1: -	struct domain_device *dev;
1: -	spinlock_t task_state_lock;
1: -	unsigned int task_state_flags;
1: -	enum sas_protocol task_proto;
1: -	union {
1: -		struct sas_ata_task ata_task;
1: -		struct sas_smp_task smp_task;
1: -		struct sas_ssp_task ssp_task;
1: -	};
1: -	struct scatterlist *scatter;
1: -	int num_scatter;
1: -	u32 total_xfer_len;
1: -	u8 data_dir: 2;
1: -	struct task_status_struct task_status;
1: -	void (*task_done)(struct sas_task *);
1: -	void *lldd_task;
1: -	void *uldd_task;
1: -	struct sas_task_slow *slow_task;
1: +  struct domain_device *dev;
1: +  spinlock_t task_state_lock;
1: +  unsigned int task_state_flags;
1: +  enum sas_protocol task_proto;
1: +  union {
1: +    struct sas_ata_task ata_task;
1: +    struct sas_smp_task smp_task;
1: +    struct sas_ssp_task ssp_task;
1: +  };
1: +  struct scatterlist *scatter;
1: +  int num_scatter;
1: +  u32 total_xfer_len;
1: +  u8 data_dir : 2;
1: +  struct task_status_struct task_status;
1: +  void (*task_done)(struct sas_task *);
1: +  void *lldd_task;
1: +  void *uldd_task;
1: +  struct sas_task_slow *slow_task;
1:  };
1:  
1:  struct sas_task_slow {
1: -	struct timer_list timer;
1: -	struct completion completion;
1: -	struct sas_task *task;
1: +  struct timer_list timer;
1: +  struct completion completion;
1: +  struct sas_task *task;
1:  };
1:  
1:  struct sas_domain_function_template {
1: -	void (*lldd_port_formed)(struct asd_sas_phy *);
1: -	void (*lldd_port_deformed)(struct asd_sas_phy *);
1: -	int (*lldd_dev_found)(struct domain_device *);
1: -	void (*lldd_dev_gone)(struct domain_device *);
1: -	int (*lldd_execute_task)(struct sas_task *, gfp_t);
1: -	int (*lldd_abort_task)(struct sas_task *);
1: -	int (*lldd_abort_task_set)(struct domain_device *, u8 *);
1: -	int (*lldd_clear_aca)(struct domain_device *, u8 *);
1: -	int (*lldd_clear_task_set)(struct domain_device *, u8 *);
1: -	int (*lldd_I_T_nexus_reset)(struct domain_device *);
1: -	int (*lldd_ata_check_ready)(struct domain_device *);
1: -	void (*lldd_ata_set_dmamode)(struct domain_device *);
1: -	int (*lldd_lu_reset)(struct domain_device *, u8 *);
1: -	int (*lldd_query_task)(struct sas_task *);
1: -	int (*lldd_clear_nexus_port)(struct asd_sas_port *);
1: -	int (*lldd_clear_nexus_ha)(struct sas_ha_struct *);
1: -	int (*lldd_control_phy)(struct asd_sas_phy *, enum phy_func, void *);
1: -	int (*lldd_write_gpio)(struct sas_ha_struct *, u8, u8, u8, u8 *);
1: +  void (*lldd_port_formed)(struct asd_sas_phy *);
1: +  void (*lldd_port_deformed)(struct asd_sas_phy *);
1: +  int (*lldd_dev_found)(struct domain_device *);
1: +  void (*lldd_dev_gone)(struct domain_device *);
1: +  int (*lldd_execute_task)(struct sas_task *, gfp_t);
1: +  int (*lldd_abort_task)(struct sas_task *);
1: +  int (*lldd_abort_task_set)(struct domain_device *, u8 *);
1: +  int (*lldd_clear_aca)(struct domain_device *, u8 *);
1: +  int (*lldd_clear_task_set)(struct domain_device *, u8 *);
1: +  int (*lldd_I_T_nexus_reset)(struct domain_device *);
1: +  int (*lldd_ata_check_ready)(struct domain_device *);
1: +  void (*lldd_ata_set_dmamode)(struct domain_device *);
1: +  int (*lldd_lu_reset)(struct domain_device *, u8 *);
1: +  int (*lldd_query_task)(struct sas_task *);
1: +  int (*lldd_clear_nexus_port)(struct asd_sas_port *);
1: +  int (*lldd_clear_nexus_ha)(struct sas_ha_struct *);
1: +  int (*lldd_control_phy)(struct asd_sas_phy *, enum phy_func, void *);
1: +  int (*lldd_write_gpio)(struct sas_ha_struct *, u8, u8, u8, u8 *);
1:  };
1:  
1:  struct sas_phy_data {
1: -	struct sas_phy *phy;
1: -	struct mutex event_lock;
1: -	int hard_reset;
1: -	int reset_result;
1: -	struct sas_work reset_work;
1: -	int enable;
1: -	int enable_result;
1: -	struct sas_work enable_work;
1: +  struct sas_phy *phy;
1: +  struct mutex event_lock;
1: +  int hard_reset;
1: +  int reset_result;
1: +  struct sas_work reset_work;
1: +  int enable;
1: +  int enable_result;
1: +  struct sas_work enable_work;
1:  };
1:  
1:  struct sas_identify_frame {
1: -	u8 frame_type: 4;
1: -	u8 dev_type: 3;
1: -	u8 _un0: 1;
1: -	u8 _un1;
1: -	union {
1: -		struct {
1: -			u8 _un20: 1;
1: -			u8 smp_iport: 1;
1: -			u8 stp_iport: 1;
1: -			u8 ssp_iport: 1;
1: -			u8 _un247: 4;
1: -		};
1: -		u8 initiator_bits;
1: -	};
1: -	union {
1: -		struct {
1: -			u8 _un30: 1;
1: -			u8 smp_tport: 1;
1: -			u8 stp_tport: 1;
1: -			u8 ssp_tport: 1;
1: -			u8 _un347: 4;
1: -		};
1: -		u8 target_bits;
1: -	};
1: -	u8 _un4_11[8];
1: -	u8 sas_addr[8];
1: -	u8 phy_id;
1: -	u8 _un21_27[7];
1: -	__be32 crc;
1: -};
1: -
1: -enum {
1: -	SAS_DEV_GONE = 0,
1: -	SAS_DEV_FOUND = 1,
1: -	SAS_DEV_DESTROY = 2,
1: -	SAS_DEV_EH_PENDING = 3,
1: -	SAS_DEV_LU_RESET = 4,
1: -	SAS_DEV_RESET = 5,
1: +  u8 frame_type : 4;
1: +  u8 dev_type : 3;
1: +  u8 _un0 : 1;
1: +  u8 _un1;
1: +  union {
1: +    struct {
1: +      u8 _un20 : 1;
1: +      u8 smp_iport : 1;
1: +      u8 stp_iport : 1;
1: +      u8 ssp_iport : 1;
1: +      u8 _un247 : 4;
1: +    };
1: +    u8 initiator_bits;
1: +  };
1: +  union {
1: +    struct {
1: +      u8 _un30 : 1;
1: +      u8 smp_tport : 1;
1: +      u8 stp_tport : 1;
1: +      u8 ssp_tport : 1;
1: +      u8 _un347 : 4;
1: +    };
1: +    u8 target_bits;
1: +  };
1: +  u8 _un4_11[8];
1: +  u8 sas_addr[8];
1: +  u8 phy_id;
1: +  u8 _un21_27[7];
1: +  __be32 crc;
1: +};
1: +
1: +enum {
1: +  SAS_DEV_GONE = 0,
1: +  SAS_DEV_FOUND = 1,
1: +  SAS_DEV_DESTROY = 2,
1: +  SAS_DEV_EH_PENDING = 3,
1: +  SAS_DEV_LU_RESET = 4,
1: +  SAS_DEV_RESET = 5,
1:  };
1:  
1:  enum task_disposition {
1: -	TASK_IS_DONE = 0,
1: -	TASK_IS_ABORTED = 1,
1: -	TASK_IS_AT_LU = 2,
1: -	TASK_IS_NOT_AT_LU = 3,
1: -	TASK_ABORT_FAILED = 4,
1: +  TASK_IS_DONE = 0,
1: +  TASK_IS_ABORTED = 1,
1: +  TASK_IS_AT_LU = 2,
1: +  TASK_IS_NOT_AT_LU = 3,
1: +  TASK_ABORT_FAILED = 4,
1:  };
1:  
1:  struct ssp_response_iu {
1: -	u8 _r_a[10];
1: -	u8 datapres: 2;
1: -	u8 _r_b: 6;
1: -	u8 status;
1: -	u32 _r_c;
1: -	__be32 sense_data_len;
1: -	__be32 response_data_len;
1: -	u8 resp_data[0];
1: -	u8 sense_data[0];
1: +  u8 _r_a[10];
1: +  u8 datapres : 2;
1: +  u8 _r_b : 6;
1: +  u8 status;
1: +  u32 _r_c;
1: +  __be32 sense_data_len;
1: +  __be32 response_data_len;
1: +  u8 resp_data[0];
1: +  u8 sense_data[0];
1:  };
1:  
1:  enum blogic_msglevel {
1: -	BLOGIC_ANNOUNCE_LEVEL = 0,
1: -	BLOGIC_INFO_LEVEL = 1,
1: -	BLOGIC_NOTICE_LEVEL = 2,
1: -	BLOGIC_WARN_LEVEL = 3,
1: -	BLOGIC_ERR_LEVEL = 4,
1: +  BLOGIC_ANNOUNCE_LEVEL = 0,
1: +  BLOGIC_INFO_LEVEL = 1,
1: +  BLOGIC_NOTICE_LEVEL = 2,
1: +  BLOGIC_WARN_LEVEL = 3,
1: +  BLOGIC_ERR_LEVEL = 4,
1:  };
1:  
1:  enum blogic_adapter_type {
1: -	BLOGIC_MULTIMASTER = 1,
1: -	BLOGIC_FLASHPOINT = 2,
1: +  BLOGIC_MULTIMASTER = 1,
1: +  BLOGIC_FLASHPOINT = 2,
1:  };
1:  
1:  enum blogic_adapter_bus_type {
1: -	BLOGIC_UNKNOWN_BUS = 0,
1: -	BLOGIC_ISA_BUS = 1,
1: -	BLOGIC_EISA_BUS = 2,
1: -	BLOGIC_PCI_BUS = 3,
1: -	BLOGIC_VESA_BUS = 4,
1: -	BLOGIC_MCA_BUS = 5,
1: +  BLOGIC_UNKNOWN_BUS = 0,
1: +  BLOGIC_ISA_BUS = 1,
1: +  BLOGIC_EISA_BUS = 2,
1: +  BLOGIC_PCI_BUS = 3,
1: +  BLOGIC_VESA_BUS = 4,
1: +  BLOGIC_MCA_BUS = 5,
1:  };
1:  
1:  enum blogic_bios_diskgeometry {
1: -	BLOGIC_BIOS_NODISK = 0,
1: -	BLOGIC_BIOS_DISK64x32 = 1,
1: -	BLOGIC_BIOS_DISK128x32 = 2,
1: -	BLOGIC_BIOS_DISK255x63 = 3,
1: +  BLOGIC_BIOS_NODISK = 0,
1: +  BLOGIC_BIOS_DISK64x32 = 1,
1: +  BLOGIC_BIOS_DISK128x32 = 2,
1: +  BLOGIC_BIOS_DISK255x63 = 3,
1:  };
1:  
1:  struct blogic_byte_count {
1: -	unsigned int units;
1: -	unsigned int billions;
1: +  unsigned int units;
1: +  unsigned int billions;
1:  };
1:  
1:  struct blogic_probeinfo {
1: -	enum blogic_adapter_type adapter_type;
1: -	enum blogic_adapter_bus_type adapter_bus_type;
1: -	long unsigned int io_addr;
1: -	long unsigned int pci_addr;
1: -	struct pci_dev *pci_device;
1: -	unsigned char bus;
1: -	unsigned char dev;
1: -	unsigned char irq_ch;
1: +  enum blogic_adapter_type adapter_type;
1: +  enum blogic_adapter_bus_type adapter_bus_type;
1: +  long unsigned int io_addr;
1: +  long unsigned int pci_addr;
1: +  struct pci_dev *pci_device;
1: +  unsigned char bus;
1: +  unsigned char dev;
1: +  unsigned char irq_ch;
1:  };
1:  
1:  struct blogic_probe_options {
1: -	bool noprobe: 1;
1: -	bool noprobe_isa: 1;
1: -	bool noprobe_pci: 1;
1: -	bool nosort_pci: 1;
1: -	bool multimaster_first: 1;
1: -	bool flashpoint_first: 1;
1: -	bool limited_isa: 1;
1: -	bool probe330: 1;
1: -	bool probe334: 1;
1: -	bool probe230: 1;
1: -	bool probe234: 1;
1: -	bool probe130: 1;
1: -	bool probe134: 1;
1: +  bool noprobe : 1;
1: +  bool noprobe_isa : 1;
1: +  bool noprobe_pci : 1;
1: +  bool nosort_pci : 1;
1: +  bool multimaster_first : 1;
1: +  bool flashpoint_first : 1;
1: +  bool limited_isa : 1;
1: +  bool probe330 : 1;
1: +  bool probe334 : 1;
1: +  bool probe230 : 1;
1: +  bool probe234 : 1;
1: +  bool probe130 : 1;
1: +  bool probe134 : 1;
1:  };
1:  
1:  struct blogic_global_options {
1: -	bool trace_probe: 1;
1: -	bool trace_hw_reset: 1;
1: -	bool trace_config: 1;
1: -	bool trace_err: 1;
1: +  bool trace_probe : 1;
1: +  bool trace_hw_reset : 1;
1: +  bool trace_config : 1;
1: +  bool trace_err : 1;
1:  };
1:  
1:  union blogic_cntrl_reg {
1: -	unsigned char all;
1: -	struct {
1: -		char: 4;
1: -		bool bus_reset: 1;
1: -		bool int_reset: 1;
1: -		bool soft_reset: 1;
1: -		bool hard_reset: 1;
1: -	} cr;
1: +  unsigned char all;
1: +  struct {
1: +    char : 4;
1: +    bool bus_reset : 1;
1: +    bool int_reset : 1;
1: +    bool soft_reset : 1;
1: +    bool hard_reset : 1;
1: +  } cr;
1:  };
1:  
1:  union blogic_stat_reg {
1: -	unsigned char all;
1: -	struct {
1: -		bool cmd_invalid: 1;
1: -		bool rsvd: 1;
1: -		bool datain_ready: 1;
1: -		bool cmd_param_busy: 1;
1: -		bool adapter_ready: 1;
1: -		bool init_reqd: 1;
1: -		bool diag_failed: 1;
1: -		bool diag_active: 1;
1: -	} sr;
1: +  unsigned char all;
1: +  struct {
1: +    bool cmd_invalid : 1;
1: +    bool rsvd : 1;
1: +    bool datain_ready : 1;
1: +    bool cmd_param_busy : 1;
1: +    bool adapter_ready : 1;
1: +    bool init_reqd : 1;
1: +    bool diag_failed : 1;
1: +    bool diag_active : 1;
1: +  } sr;
1:  };
1:  
1:  union blogic_int_reg {
1: -	unsigned char all;
1: -	struct {
1: -		bool mailin_loaded: 1;
1: -		bool mailout_avail: 1;
1: -		bool cmd_complete: 1;
1: -		bool ext_busreset: 1;
1: -		unsigned char rsvd: 3;
1: -		bool int_valid: 1;
1: -	} ir;
1: +  unsigned char all;
1: +  struct {
1: +    bool mailin_loaded : 1;
1: +    bool mailout_avail : 1;
1: +    bool cmd_complete : 1;
1: +    bool ext_busreset : 1;
1: +    unsigned char rsvd : 3;
1: +    bool int_valid : 1;
1: +  } ir;
1:  };
1:  
1:  union blogic_geo_reg {
1: -	unsigned char all;
1: -	struct {
1: -		enum blogic_bios_diskgeometry d0_geo: 2;
1: -		enum blogic_bios_diskgeometry d1_geo: 2;
1: -		char: 3;
1: -		bool ext_trans_enable: 1;
1: -	} gr;
1: +  unsigned char all;
1: +  struct {
1: +    enum blogic_bios_diskgeometry d0_geo : 2;
1: +    enum blogic_bios_diskgeometry d1_geo : 2;
1: +    char : 3;
1: +    bool ext_trans_enable : 1;
1: +  } gr;
1:  };
1:  
1:  enum blogic_opcode {
1: -	BLOGIC_TEST_CMP_COMPLETE = 0,
1: -	BLOGIC_INIT_MBOX = 1,
1: -	BLOGIC_EXEC_MBOX_CMD = 2,
1: -	BLOGIC_EXEC_BIOS_CMD = 3,
1: -	BLOGIC_GET_BOARD_ID = 4,
1: -	BLOGIC_ENABLE_OUTBOX_AVAIL_INT = 5,
1: -	BLOGIC_SET_SELECT_TIMEOUT = 6,
1: -	BLOGIC_SET_PREEMPT_TIME = 7,
1: -	BLOGIC_SET_TIMEOFF_BUS = 8,
1: -	BLOGIC_SET_TXRATE = 9,
1: -	BLOGIC_INQ_DEV0TO7 = 10,
1: -	BLOGIC_INQ_CONFIG = 11,
1: -	BLOGIC_TGT_MODE = 12,
1: -	BLOGIC_INQ_SETUPINFO = 13,
1: -	BLOGIC_WRITE_LOCALRAM = 26,
1: -	BLOGIC_READ_LOCALRAM = 27,
1: -	BLOGIC_WRITE_BUSMASTER_FIFO = 28,
1: -	BLOGIC_READ_BUSMASTER_FIFO = 29,
1: -	BLOGIC_ECHO_CMDDATA = 31,
1: -	BLOGIC_ADAPTER_DIAG = 32,
1: -	BLOGIC_SET_OPTIONS = 33,
1: -	BLOGIC_INQ_DEV8TO15 = 35,
1: -	BLOGIC_INQ_DEV = 36,
1: -	BLOGIC_DISABLE_INT = 37,
1: -	BLOGIC_INIT_EXT_MBOX = 129,
1: -	BLOGIC_EXEC_SCS_CMD = 131,
1: -	BLOGIC_INQ_FWVER_D3 = 132,
1: -	BLOGIC_INQ_FWVER_LETTER = 133,
1: -	BLOGIC_INQ_PCI_INFO = 134,
1: -	BLOGIC_INQ_MODELNO = 139,
1: -	BLOGIC_INQ_SYNC_PERIOD = 140,
1: -	BLOGIC_INQ_EXTSETUP = 141,
1: -	BLOGIC_STRICT_RR = 143,
1: -	BLOGIC_STORE_LOCALRAM = 144,
1: -	BLOGIC_FETCH_LOCALRAM = 145,
1: -	BLOGIC_STORE_TO_EEPROM = 146,
1: -	BLOGIC_LOAD_AUTOSCSICODE = 148,
1: -	BLOGIC_MOD_IOADDR = 149,
1: -	BLOGIC_SETCCB_FMT = 150,
1: -	BLOGIC_WRITE_INQBUF = 154,
1: -	BLOGIC_READ_INQBUF = 155,
1: -	BLOGIC_FLASH_LOAD = 167,
1: -	BLOGIC_READ_SCAMDATA = 168,
1: -	BLOGIC_WRITE_SCAMDATA = 169,
1: +  BLOGIC_TEST_CMP_COMPLETE = 0,
1: +  BLOGIC_INIT_MBOX = 1,
1: +  BLOGIC_EXEC_MBOX_CMD = 2,
1: +  BLOGIC_EXEC_BIOS_CMD = 3,
1: +  BLOGIC_GET_BOARD_ID = 4,
1: +  BLOGIC_ENABLE_OUTBOX_AVAIL_INT = 5,
1: +  BLOGIC_SET_SELECT_TIMEOUT = 6,
1: +  BLOGIC_SET_PREEMPT_TIME = 7,
1: +  BLOGIC_SET_TIMEOFF_BUS = 8,
1: +  BLOGIC_SET_TXRATE = 9,
1: +  BLOGIC_INQ_DEV0TO7 = 10,
1: +  BLOGIC_INQ_CONFIG = 11,
1: +  BLOGIC_TGT_MODE = 12,
1: +  BLOGIC_INQ_SETUPINFO = 13,
1: +  BLOGIC_WRITE_LOCALRAM = 26,
1: +  BLOGIC_READ_LOCALRAM = 27,
1: +  BLOGIC_WRITE_BUSMASTER_FIFO = 28,
1: +  BLOGIC_READ_BUSMASTER_FIFO = 29,
1: +  BLOGIC_ECHO_CMDDATA = 31,
1: +  BLOGIC_ADAPTER_DIAG = 32,
1: +  BLOGIC_SET_OPTIONS = 33,
1: +  BLOGIC_INQ_DEV8TO15 = 35,
1: +  BLOGIC_INQ_DEV = 36,
1: +  BLOGIC_DISABLE_INT = 37,
1: +  BLOGIC_INIT_EXT_MBOX = 129,
1: +  BLOGIC_EXEC_SCS_CMD = 131,
1: +  BLOGIC_INQ_FWVER_D3 = 132,
1: +  BLOGIC_INQ_FWVER_LETTER = 133,
1: +  BLOGIC_INQ_PCI_INFO = 134,
1: +  BLOGIC_INQ_MODELNO = 139,
1: +  BLOGIC_INQ_SYNC_PERIOD = 140,
1: +  BLOGIC_INQ_EXTSETUP = 141,
1: +  BLOGIC_STRICT_RR = 143,
1: +  BLOGIC_STORE_LOCALRAM = 144,
1: +  BLOGIC_FETCH_LOCALRAM = 145,
1: +  BLOGIC_STORE_TO_EEPROM = 146,
1: +  BLOGIC_LOAD_AUTOSCSICODE = 148,
1: +  BLOGIC_MOD_IOADDR = 149,
1: +  BLOGIC_SETCCB_FMT = 150,
1: +  BLOGIC_WRITE_INQBUF = 154,
1: +  BLOGIC_READ_INQBUF = 155,
1: +  BLOGIC_FLASH_LOAD = 167,
1: +  BLOGIC_READ_SCAMDATA = 168,
1: +  BLOGIC_WRITE_SCAMDATA = 169,
1:  };
1:  
1:  struct blogic_board_id {
1: -	unsigned char type;
1: -	unsigned char custom_features;
1: -	unsigned char fw_ver_digit1;
1: -	unsigned char fw_ver_digit2;
1: +  unsigned char type;
1: +  unsigned char custom_features;
1: +  unsigned char fw_ver_digit1;
1: +  unsigned char fw_ver_digit2;
1:  };
1:  
1:  struct blogic_config {
1: -	char: 5;
1: -	bool dma_ch5: 1;
1: -	bool dma_ch6: 1;
1: -	bool dma_ch7: 1;
1: -	bool irq_ch9: 1;
1: -	bool irq_ch10: 1;
1: -	bool irq_ch11: 1;
1: -	bool irq_ch12: 1;
1: -	char: 1;
1: -	bool irq_ch14: 1;
1: -	bool irq_ch15: 1;
1: -	char: 1;
1: -	unsigned char id: 4;
1: +  char : 5;
1: +  bool dma_ch5 : 1;
1: +  bool dma_ch6 : 1;
1: +  bool dma_ch7 : 1;
1: +  bool irq_ch9 : 1;
1: +  bool irq_ch10 : 1;
1: +  bool irq_ch11 : 1;
1: +  bool irq_ch12 : 1;
1: +  char : 1;
1: +  bool irq_ch14 : 1;
1: +  bool irq_ch15 : 1;
1: +  char : 1;
1: +  unsigned char id : 4;
1:  };
1:  
1:  struct blogic_syncval {
1: -	unsigned char offset: 4;
1: -	unsigned char tx_period: 3;
1: -	bool sync: 1;
1: +  unsigned char offset : 4;
1: +  unsigned char tx_period : 3;
1: +  bool sync : 1;
1:  };
1:  
1:  struct blogic_setup_info {
1: -	bool sync: 1;
1: -	bool parity: 1;
1: -	unsigned char tx_rate;
1: -	unsigned char preempt_time;
1: -	unsigned char timeoff_bus;
1: -	unsigned char mbox_count;
1: -	unsigned char mbox_addr[3];
1: -	struct blogic_syncval sync0to7[8];
1: -	unsigned char disconnect_ok0to7;
1: -	unsigned char sig;
1: -	unsigned char char_d;
1: -	unsigned char bus_type;
1: -	unsigned char wide_tx_ok0to7;
1: -	unsigned char wide_tx_active0to7;
1: -	struct blogic_syncval sync8to15[8];
1: -	unsigned char disconnect_ok8to15;
1: -	char: 8;
1: -	unsigned char wide_tx_ok8to15;
1: -	unsigned char wide_tx_active8to15;
1: +  bool sync : 1;
1: +  bool parity : 1;
1: +  unsigned char tx_rate;
1: +  unsigned char preempt_time;
1: +  unsigned char timeoff_bus;
1: +  unsigned char mbox_count;
1: +  unsigned char mbox_addr[3];
1: +  struct blogic_syncval sync0to7[8];
1: +  unsigned char disconnect_ok0to7;
1: +  unsigned char sig;
1: +  unsigned char char_d;
1: +  unsigned char bus_type;
1: +  unsigned char wide_tx_ok0to7;
1: +  unsigned char wide_tx_active0to7;
1: +  struct blogic_syncval sync8to15[8];
1: +  unsigned char disconnect_ok8to15;
1: +  char : 8;
1: +  unsigned char wide_tx_ok8to15;
1: +  unsigned char wide_tx_active8to15;
1:  };
1:  
1:  struct blogic_extmbox_req {
1: -	unsigned char mbox_count;
1: -	u32 base_mbox_addr;
1: +  unsigned char mbox_count;
1: +  u32 base_mbox_addr;
1:  } __attribute__((packed));
1:  
1:  enum blogic_isa_ioport {
1: -	BLOGIC_IO_330 = 0,
1: -	BLOGIC_IO_334 = 1,
1: -	BLOGIC_IO_230 = 2,
1: -	BLOGIC_IO_234 = 3,
1: -	BLOGIC_IO_130 = 4,
1: -	BLOGIC_IO_134 = 5,
1: -	BLOGIC_IO_DISABLE = 6,
1: -	BLOGIC_IO_DISABLE2 = 7,
1: +  BLOGIC_IO_330 = 0,
1: +  BLOGIC_IO_334 = 1,
1: +  BLOGIC_IO_230 = 2,
1: +  BLOGIC_IO_234 = 3,
1: +  BLOGIC_IO_130 = 4,
1: +  BLOGIC_IO_134 = 5,
1: +  BLOGIC_IO_DISABLE = 6,
1: +  BLOGIC_IO_DISABLE2 = 7,
1:  };
1:  
1:  struct blogic_adapter_info {
1: -	enum blogic_isa_ioport isa_port;
1: -	unsigned char irq_ch;
1: -	bool low_term: 1;
1: -	bool high_term: 1;
1: -	char: 2;
1: -	bool JP1: 1;
1: -	bool JP2: 1;
1: -	bool JP3: 1;
1: -	bool genericinfo_valid: 1;
1: -	char: 8;
1: +  enum blogic_isa_ioport isa_port;
1: +  unsigned char irq_ch;
1: +  bool low_term : 1;
1: +  bool high_term : 1;
1: +  char : 2;
1: +  bool JP1 : 1;
1: +  bool JP2 : 1;
1: +  bool JP3 : 1;
1: +  bool genericinfo_valid : 1;
1: +  char : 8;
1:  };
1:  
1:  struct blogic_ext_setup {
1: -	unsigned char bus_type;
1: -	unsigned char bios_addr;
1: -	short unsigned int sg_limit;
1: -	unsigned char mbox_count;
1: -	u32 base_mbox_addr;
1: -	struct {
1: -		char: 2;
1: -		bool fast_on_eisa: 1;
1: -		char: 3;
1: -		bool level_int: 1;
1: -	} misc;
1: -	unsigned char fw_rev[3];
1: -	bool wide: 1;
1: -	bool differential: 1;
1: -	bool scam: 1;
1: -	bool ultra: 1;
1: -	bool smart_term: 1;
1: +  unsigned char bus_type;
1: +  unsigned char bios_addr;
1: +  short unsigned int sg_limit;
1: +  unsigned char mbox_count;
1: +  u32 base_mbox_addr;
1: +  struct {
1: +    char : 2;
1: +    bool fast_on_eisa : 1;
1: +    char : 3;
1: +    bool level_int : 1;
1: +  } misc;
1: +  unsigned char fw_rev[3];
1: +  bool wide : 1;
1: +  bool differential : 1;
1: +  bool scam : 1;
1: +  bool ultra : 1;
1: +  bool smart_term : 1;
1:  } __attribute__((packed));
1:  
1:  enum blogic_rr_req {
1: -	BLOGIC_AGGRESSIVE_RR = 0,
1: -	BLOGIC_STRICT_RR_MODE = 1,
1: +  BLOGIC_AGGRESSIVE_RR = 0,
1: +  BLOGIC_STRICT_RR_MODE = 1,
1:  };
1:  
1:  struct blogic_fetch_localram {
1: -	unsigned char offset;
1: -	unsigned char count;
1: +  unsigned char offset;
1: +  unsigned char count;
1:  };
1:  
1:  struct blogic_autoscsi {
1: -	unsigned char factory_sig[2];
1: -	unsigned char info_bytes;
1: -	unsigned char adapter_type[6];
1: -	char: 8;
1: -	bool floppy: 1;
1: -	bool floppy_sec: 1;
1: -	bool level_int: 1;
1: -	char: 2;
1: -	unsigned char systemram_bios: 3;
1: -	unsigned char dma_ch: 7;
1: -	bool dma_autoconf: 1;
1: -	unsigned char irq_ch: 7;
1: -	bool irq_autoconf: 1;
1: -	unsigned char dma_tx_rate;
1: -	unsigned char scsi_id;
1: -	bool low_term: 1;
1: -	bool parity: 1;
1: -	bool high_term: 1;
1: -	bool noisy_cable: 1;
1: -	bool fast_sync_neg: 1;
1: -	bool reset_enabled: 1;
1: -	char: 1;
1: -	bool active_negation: 1;
1: -	unsigned char bus_on_delay;
1: -	unsigned char bus_off_delay;
1: -	bool bios_enabled: 1;
1: -	bool int19_redir_enabled: 1;
1: -	bool ext_trans_enable: 1;
1: -	bool removable_as_fixed: 1;
1: -	char: 1;
1: -	bool morethan2_drives: 1;
1: -	bool bios_int: 1;
1: -	bool floptical: 1;
1: -	short unsigned int dev_enabled;
1: -	short unsigned int wide_ok;
1: -	short unsigned int fast_ok;
1: -	short unsigned int sync_ok;
1: -	short unsigned int discon_ok;
1: -	short unsigned int send_start_unit;
1: -	short unsigned int ignore_bios_scan;
1: -	unsigned char pci_int_pin: 2;
1: -	unsigned char adapter_ioport: 2;
1: -	bool strict_rr_enabled: 1;
1: -	bool vesabus_33mhzplus: 1;
1: -	bool vesa_burst_write: 1;
1: -	bool vesa_burst_read: 1;
1: -	short unsigned int ultra_ok;
1: -	long: 40;
1: -	unsigned char autoscsi_maxlun;
1: -	char: 1;
1: -	bool scam_dominant: 1;
1: -	bool scam_enabled: 1;
1: -	bool scam_lev2: 1;
1: -	char: 4;
1: -	bool int13_exten: 1;
1: -	char: 1;
1: -	bool cd_boot: 1;
1: -	char: 5;
1: -	unsigned char boot_id: 4;
1: -	unsigned char boot_ch: 4;
1: -	unsigned char force_scan_order: 1;
1: -	short unsigned int nontagged_to_alt_ok;
1: -	short unsigned int reneg_sync_on_check;
1: -	unsigned char rsvd[10];
1: -	unsigned char manuf_diag[2];
1: -	short unsigned int cksum;
1: +  unsigned char factory_sig[2];
1: +  unsigned char info_bytes;
1: +  unsigned char adapter_type[6];
1: +  char : 8;
1: +  bool floppy : 1;
1: +  bool floppy_sec : 1;
1: +  bool level_int : 1;
1: +  char : 2;
1: +  unsigned char systemram_bios : 3;
1: +  unsigned char dma_ch : 7;
1: +  bool dma_autoconf : 1;
1: +  unsigned char irq_ch : 7;
1: +  bool irq_autoconf : 1;
1: +  unsigned char dma_tx_rate;
1: +  unsigned char scsi_id;
1: +  bool low_term : 1;
1: +  bool parity : 1;
1: +  bool high_term : 1;
1: +  bool noisy_cable : 1;
1: +  bool fast_sync_neg : 1;
1: +  bool reset_enabled : 1;
1: +  char : 1;
1: +  bool active_negation : 1;
1: +  unsigned char bus_on_delay;
1: +  unsigned char bus_off_delay;
1: +  bool bios_enabled : 1;
1: +  bool int19_redir_enabled : 1;
1: +  bool ext_trans_enable : 1;
1: +  bool removable_as_fixed : 1;
1: +  char : 1;
1: +  bool morethan2_drives : 1;
1: +  bool bios_int : 1;
1: +  bool floptical : 1;
1: +  short unsigned int dev_enabled;
1: +  short unsigned int wide_ok;
1: +  short unsigned int fast_ok;
1: +  short unsigned int sync_ok;
1: +  short unsigned int discon_ok;
1: +  short unsigned int send_start_unit;
1: +  short unsigned int ignore_bios_scan;
1: +  unsigned char pci_int_pin : 2;
1: +  unsigned char adapter_ioport : 2;
1: +  bool strict_rr_enabled : 1;
1: +  bool vesabus_33mhzplus : 1;
1: +  bool vesa_burst_write : 1;
1: +  bool vesa_burst_read : 1;
1: +  short unsigned int ultra_ok;
1: +  long : 40;
1: +  unsigned char autoscsi_maxlun;
1: +  char : 1;
1: +  bool scam_dominant : 1;
1: +  bool scam_enabled : 1;
1: +  bool scam_lev2 : 1;
1: +  char : 4;
1: +  bool int13_exten : 1;
1: +  char : 1;
1: +  bool cd_boot : 1;
1: +  char : 5;
1: +  unsigned char boot_id : 4;
1: +  unsigned char boot_ch : 4;
1: +  unsigned char force_scan_order : 1;
1: +  short unsigned int nontagged_to_alt_ok;
1: +  short unsigned int reneg_sync_on_check;
1: +  unsigned char rsvd[10];
1: +  unsigned char manuf_diag[2];
1: +  short unsigned int cksum;
1:  } __attribute__((packed));
1:  
1:  struct blogic_autoscsi_byte45 {
1: -	unsigned char force_scan_order: 1;
1: +  unsigned char force_scan_order : 1;
1:  };
1:  
1:  struct blogic_bios_drvmap {
1: -	unsigned char tgt_idbit3: 1;
1: -	char: 2;
1: -	enum blogic_bios_diskgeometry diskgeom: 2;
1: -	unsigned char tgt_id: 3;
1: +  unsigned char tgt_idbit3 : 1;
1: +  char : 2;
1: +  enum blogic_bios_diskgeometry diskgeom : 2;
1: +  unsigned char tgt_id : 3;
1:  };
1:  
1:  enum blogic_setccb_fmt {
1: -	BLOGIC_LEGACY_LUN_CCB = 0,
1: -	BLOGIC_EXT_LUN_CCB = 1,
1: +  BLOGIC_LEGACY_LUN_CCB = 0,
1: +  BLOGIC_EXT_LUN_CCB = 1,
1:  };
1:  
1:  enum blogic_action {
1: -	BLOGIC_OUTBOX_FREE = 0,
1: -	BLOGIC_MBOX_START = 1,
1: -	BLOGIC_MBOX_ABORT = 2,
1: +  BLOGIC_OUTBOX_FREE = 0,
1: +  BLOGIC_MBOX_START = 1,
1: +  BLOGIC_MBOX_ABORT = 2,
1:  };
1:  
1:  enum blogic_cmplt_code {
1: -	BLOGIC_INBOX_FREE = 0,
1: -	BLOGIC_CMD_COMPLETE_GOOD = 1,
1: -	BLOGIC_CMD_ABORT_BY_HOST = 2,
1: -	BLOGIC_CMD_NOTFOUND = 3,
1: -	BLOGIC_CMD_COMPLETE_ERROR = 4,
1: -	BLOGIC_INVALID_CCB = 5,
1: +  BLOGIC_INBOX_FREE = 0,
1: +  BLOGIC_CMD_COMPLETE_GOOD = 1,
1: +  BLOGIC_CMD_ABORT_BY_HOST = 2,
1: +  BLOGIC_CMD_NOTFOUND = 3,
1: +  BLOGIC_CMD_COMPLETE_ERROR = 4,
1: +  BLOGIC_INVALID_CCB = 5,
1:  };
1:  
1:  enum blogic_ccb_opcode {
1: -	BLOGIC_INITIATOR_CCB = 0,
1: -	BLOGIC_TGT_CCB = 1,
1: -	BLOGIC_INITIATOR_CCB_SG = 2,
1: -	BLOGIC_INITIATOR_CCBB_RESIDUAL = 3,
1: -	BLOGIC_INITIATOR_CCB_SG_RESIDUAL = 4,
1: -	BLOGIC_BDR = 129,
1: +  BLOGIC_INITIATOR_CCB = 0,
1: +  BLOGIC_TGT_CCB = 1,
1: +  BLOGIC_INITIATOR_CCB_SG = 2,
1: +  BLOGIC_INITIATOR_CCBB_RESIDUAL = 3,
1: +  BLOGIC_INITIATOR_CCB_SG_RESIDUAL = 4,
1: +  BLOGIC_BDR = 129,
1:  };
1:  
1:  enum blogic_datadir {
1: -	BLOGIC_UNCHECKED_TX = 0,
1: -	BLOGIC_DATAIN_CHECKED = 1,
1: -	BLOGIC_DATAOUT_CHECKED = 2,
1: -	BLOGIC_NOTX = 3,
1: +  BLOGIC_UNCHECKED_TX = 0,
1: +  BLOGIC_DATAIN_CHECKED = 1,
1: +  BLOGIC_DATAOUT_CHECKED = 2,
1: +  BLOGIC_NOTX = 3,
1:  };
1:  
1:  enum blogic_adapter_status {
1: -	BLOGIC_CMD_CMPLT_NORMAL = 0,
1: -	BLOGIC_LINK_CMD_CMPLT = 10,
1: -	BLOGIC_LINK_CMD_CMPLT_FLAG = 11,
1: -	BLOGIC_DATA_UNDERRUN = 12,
1: -	BLOGIC_SELECT_TIMEOUT = 17,
1: -	BLOGIC_DATA_OVERRUN = 18,
1: -	BLOGIC_NOEXPECT_BUSFREE = 19,
1: -	BLOGIC_INVALID_BUSPHASE = 20,
1: -	BLOGIC_INVALID_OUTBOX_CODE = 21,
1: -	BLOGIC_INVALID_CMD_CODE = 22,
1: -	BLOGIC_LINKCCB_BADLUN = 23,
1: -	BLOGIC_BAD_CMD_PARAM = 26,
1: -	BLOGIC_AUTOREQSENSE_FAIL = 27,
1: -	BLOGIC_TAGQUEUE_REJECT = 28,
1: -	BLOGIC_BAD_MSG_RCVD = 29,
1: -	BLOGIC_HW_FAIL = 32,
1: -	BLOGIC_NORESPONSE_TO_ATN = 33,
1: -	BLOGIC_HW_RESET = 34,
1: -	BLOGIC_RST_FROM_OTHERDEV = 35,
1: -	BLOGIC_BAD_RECONNECT = 36,
1: -	BLOGIC_HW_BDR = 37,
1: -	BLOGIC_ABRT_QUEUE = 38,
1: -	BLOGIC_ADAPTER_SW_ERROR = 39,
1: -	BLOGIC_HW_TIMEOUT = 48,
1: -	BLOGIC_PARITY_ERR = 52,
1: +  BLOGIC_CMD_CMPLT_NORMAL = 0,
1: +  BLOGIC_LINK_CMD_CMPLT = 10,
1: +  BLOGIC_LINK_CMD_CMPLT_FLAG = 11,
1: +  BLOGIC_DATA_UNDERRUN = 12,
1: +  BLOGIC_SELECT_TIMEOUT = 17,
1: +  BLOGIC_DATA_OVERRUN = 18,
1: +  BLOGIC_NOEXPECT_BUSFREE = 19,
1: +  BLOGIC_INVALID_BUSPHASE = 20,
1: +  BLOGIC_INVALID_OUTBOX_CODE = 21,
1: +  BLOGIC_INVALID_CMD_CODE = 22,
1: +  BLOGIC_LINKCCB_BADLUN = 23,
1: +  BLOGIC_BAD_CMD_PARAM = 26,
1: +  BLOGIC_AUTOREQSENSE_FAIL = 27,
1: +  BLOGIC_TAGQUEUE_REJECT = 28,
1: +  BLOGIC_BAD_MSG_RCVD = 29,
1: +  BLOGIC_HW_FAIL = 32,
1: +  BLOGIC_NORESPONSE_TO_ATN = 33,
1: +  BLOGIC_HW_RESET = 34,
1: +  BLOGIC_RST_FROM_OTHERDEV = 35,
1: +  BLOGIC_BAD_RECONNECT = 36,
1: +  BLOGIC_HW_BDR = 37,
1: +  BLOGIC_ABRT_QUEUE = 38,
1: +  BLOGIC_ADAPTER_SW_ERROR = 39,
1: +  BLOGIC_HW_TIMEOUT = 48,
1: +  BLOGIC_PARITY_ERR = 52,
1:  };
1:  
1:  enum blogic_tgt_status {
1: -	BLOGIC_OP_GOOD = 0,
1: -	BLOGIC_CHECKCONDITION = 2,
1: -	BLOGIC_DEVBUSY = 8,
1: +  BLOGIC_OP_GOOD = 0,
1: +  BLOGIC_CHECKCONDITION = 2,
1: +  BLOGIC_DEVBUSY = 8,
1:  };
1:  
1:  enum blogic_queuetag {
1: -	BLOGIC_SIMPLETAG = 0,
1: -	BLOGIC_HEADTAG = 1,
1: -	BLOGIC_ORDEREDTAG = 2,
1: -	BLOGIC_RSVDTAG = 3,
1: +  BLOGIC_SIMPLETAG = 0,
1: +  BLOGIC_HEADTAG = 1,
1: +  BLOGIC_ORDEREDTAG = 2,
1: +  BLOGIC_RSVDTAG = 3,
1:  };
1:  
1:  struct blogic_sg_seg {
1: -	u32 segbytes;
1: -	u32 segdata;
1: +  u32 segbytes;
1: +  u32 segdata;
1:  };
1:  
1:  enum blogic_ccb_status {
1: -	BLOGIC_CCB_FREE = 0,
1: -	BLOGIC_CCB_ACTIVE = 1,
1: -	BLOGIC_CCB_COMPLETE = 2,
1: -	BLOGIC_CCB_RESET = 3,
1: +  BLOGIC_CCB_FREE = 0,
1: +  BLOGIC_CCB_ACTIVE = 1,
1: +  BLOGIC_CCB_COMPLETE = 2,
1: +  BLOGIC_CCB_RESET = 3,
1:  };
1:  
1:  struct blogic_adapter;
1:  
1:  struct blogic_ccb {
1: -	enum blogic_ccb_opcode opcode;
1: -	char: 3;
1: -	enum blogic_datadir datadir: 2;
1: -	bool tag_enable: 1;
1: -	enum blogic_queuetag queuetag: 2;
1: -	unsigned char cdblen;
1: -	unsigned char sense_datalen;
1: -	u32 datalen;
1: -	void *data;
1: -	short: 16;
1: -	enum blogic_adapter_status adapter_status;
1: -	enum blogic_tgt_status tgt_status;
1: -	unsigned char tgt_id;
1: -	unsigned char lun: 5;
1: -	bool legacytag_enable: 1;
1: -	enum blogic_queuetag legacy_tag: 2;
1: -	unsigned char cdb[12];
1: -	u32 rsvd_int;
1: -	u32 sensedata;
1: -	void (*callback)(struct blogic_ccb *);
1: -	u32 base_addr;
1: -	enum blogic_cmplt_code comp_code;
1: -	dma_addr_t allocgrp_head;
1: -	unsigned int allocgrp_size;
1: -	u32 dma_handle;
1: -	enum blogic_ccb_status status;
1: -	long unsigned int serial;
1: -	struct scsi_cmnd *command;
1: -	struct blogic_adapter *adapter;
1: -	struct blogic_ccb *next;
1: -	struct blogic_ccb *next_all;
1: -	struct blogic_sg_seg sglist[128];
1: +  enum blogic_ccb_opcode opcode;
1: +  char : 3;
1: +  enum blogic_datadir datadir : 2;
1: +  bool tag_enable : 1;
1: +  enum blogic_queuetag queuetag : 2;
1: +  unsigned char cdblen;
1: +  unsigned char sense_datalen;
1: +  u32 datalen;
1: +  void *data;
1: +  short : 16;
1: +  enum blogic_adapter_status adapter_status;
1: +  enum blogic_tgt_status tgt_status;
1: +  unsigned char tgt_id;
1: +  unsigned char lun : 5;
1: +  bool legacytag_enable : 1;
1: +  enum blogic_queuetag legacy_tag : 2;
1: +  unsigned char cdb[12];
1: +  u32 rsvd_int;
1: +  u32 sensedata;
1: +  void (*callback)(struct blogic_ccb *);
1: +  u32 base_addr;
1: +  enum blogic_cmplt_code comp_code;
1: +  dma_addr_t allocgrp_head;
1: +  unsigned int allocgrp_size;
1: +  u32 dma_handle;
1: +  enum blogic_ccb_status status;
1: +  long unsigned int serial;
1: +  struct scsi_cmnd *command;
1: +  struct blogic_adapter *adapter;
1: +  struct blogic_ccb *next;
1: +  struct blogic_ccb *next_all;
1: +  struct blogic_sg_seg sglist[128];
1:  };
1:  
1:  struct fpoint_info {
1: -	u32 base_addr;
1: -	bool present;
1: -	unsigned char irq_ch;
1: -	unsigned char scsi_id;
1: -	unsigned char scsi_lun;
1: -	u16 fw_rev;
1: -	u16 sync_ok;
1: -	u16 fast_ok;
1: -	u16 ultra_ok;
1: -	u16 discon_ok;
1: -	u16 wide_ok;
1: -	bool parity: 1;
1: -	bool wide: 1;
1: -	bool softreset: 1;
1: -	bool ext_trans_enable: 1;
1: -	bool low_term: 1;
1: -	bool high_term: 1;
1: -	bool report_underrun: 1;
1: -	bool scam_enabled: 1;
1: -	bool scam_lev2: 1;
1: -	unsigned char family;
1: -	unsigned char bus_type;
1: -	unsigned char model[3];
1: -	unsigned char relative_cardnum;
1: -	unsigned char rsvd[4];
1: -	u32 os_rsvd;
1: -	unsigned char translation_info[4];
1: -	u32 rsvd2[5];
1: -	u32 sec_range;
1: +  u32 base_addr;
1: +  bool present;
1: +  unsigned char irq_ch;
1: +  unsigned char scsi_id;
1: +  unsigned char scsi_lun;
1: +  u16 fw_rev;
1: +  u16 sync_ok;
1: +  u16 fast_ok;
1: +  u16 ultra_ok;
1: +  u16 discon_ok;
1: +  u16 wide_ok;
1: +  bool parity : 1;
1: +  bool wide : 1;
1: +  bool softreset : 1;
1: +  bool ext_trans_enable : 1;
1: +  bool low_term : 1;
1: +  bool high_term : 1;
1: +  bool report_underrun : 1;
1: +  bool scam_enabled : 1;
1: +  bool scam_lev2 : 1;
1: +  unsigned char family;
1: +  unsigned char bus_type;
1: +  unsigned char model[3];
1: +  unsigned char relative_cardnum;
1: +  unsigned char rsvd[4];
1: +  u32 os_rsvd;
1: +  unsigned char translation_info[4];
1: +  u32 rsvd2[5];
1: +  u32 sec_range;
1:  };
1:  
1:  struct blogic_tgt_flags {
1: -	bool tgt_exists: 1;
1: -	bool tagq_ok: 1;
1: -	bool wide_ok: 1;
1: -	bool tagq_active: 1;
1: -	bool wide_active: 1;
1: -	bool cmd_good: 1;
1: -	bool tgt_info_in: 1;
1: +  bool tgt_exists : 1;
1: +  bool tagq_ok : 1;
1: +  bool wide_ok : 1;
1: +  bool tagq_active : 1;
1: +  bool wide_active : 1;
1: +  bool cmd_good : 1;
1: +  bool tgt_info_in : 1;
1:  };
1:  
1:  struct blogic_tgt_stats {
1: -	unsigned int cmds_tried;
1: -	unsigned int cmds_complete;
1: -	unsigned int read_cmds;
1: -	unsigned int write_cmds;
1: -	struct blogic_byte_count bytesread;
1: -	struct blogic_byte_count byteswritten;
1: -	unsigned int read_sz_buckets[10];
1: -	unsigned int write_sz_buckets[10];
1: -	short unsigned int aborts_request;
1: -	short unsigned int aborts_tried;
1: -	short unsigned int aborts_done;
1: -	short unsigned int bdr_request;
1: -	short unsigned int bdr_tried;
1: -	short unsigned int bdr_done;
1: -	short unsigned int adapter_reset_req;
1: -	short unsigned int adapter_reset_attempt;
1: -	short unsigned int adapter_reset_done;
1: +  unsigned int cmds_tried;
1: +  unsigned int cmds_complete;
1: +  unsigned int read_cmds;
1: +  unsigned int write_cmds;
1: +  struct blogic_byte_count bytesread;
1: +  struct blogic_byte_count byteswritten;
1: +  unsigned int read_sz_buckets[10];
1: +  unsigned int write_sz_buckets[10];
1: +  short unsigned int aborts_request;
1: +  short unsigned int aborts_tried;
1: +  short unsigned int aborts_done;
1: +  short unsigned int bdr_request;
1: +  short unsigned int bdr_tried;
1: +  short unsigned int bdr_done;
1: +  short unsigned int adapter_reset_req;
1: +  short unsigned int adapter_reset_attempt;
1: +  short unsigned int adapter_reset_done;
1:  };
1:  
1:  struct blogic_drvr_options;
1: @@ -84503,219 +85604,219 @@ struct blogic_outbox;
1:  struct blogic_inbox;
1:  
1:  struct blogic_adapter {
1: -	struct Scsi_Host *scsi_host;
1: -	struct pci_dev *pci_device;
1: -	enum blogic_adapter_type adapter_type;
1: -	enum blogic_adapter_bus_type adapter_bus_type;
1: -	long unsigned int io_addr;
1: -	long unsigned int pci_addr;
1: -	short unsigned int addr_count;
1: -	unsigned char host_no;
1: -	unsigned char model[9];
1: -	unsigned char fw_ver[6];
1: -	unsigned char full_model[18];
1: -	unsigned char bus;
1: -	unsigned char dev;
1: -	unsigned char irq_ch;
1: -	unsigned char dma_ch;
1: -	unsigned char scsi_id;
1: -	bool irq_acquired: 1;
1: -	bool dma_chan_acquired: 1;
1: -	bool ext_trans_enable: 1;
1: -	bool parity: 1;
1: -	bool reset_enabled: 1;
1: -	bool level_int: 1;
1: -	bool wide: 1;
1: -	bool differential: 1;
1: -	bool scam: 1;
1: -	bool ultra: 1;
1: -	bool ext_lun: 1;
1: -	bool terminfo_valid: 1;
1: -	bool low_term: 1;
1: -	bool high_term: 1;
1: -	bool need_bouncebuf: 1;
1: -	bool strict_rr: 1;
1: -	bool scam_enabled: 1;
1: -	bool scam_lev2: 1;
1: -	bool adapter_initd: 1;
1: -	bool adapter_extreset: 1;
1: -	bool adapter_intern_err: 1;
1: -	bool processing_ccbs;
1: -	volatile bool adapter_cmd_complete;
1: -	short unsigned int adapter_sglimit;
1: -	short unsigned int drvr_sglimit;
1: -	short unsigned int maxdev;
1: -	short unsigned int maxlun;
1: -	short unsigned int mbox_count;
1: -	short unsigned int initccbs;
1: -	short unsigned int inc_ccbs;
1: -	short unsigned int alloc_ccbs;
1: -	short unsigned int drvr_qdepth;
1: -	short unsigned int adapter_qdepth;
1: -	short unsigned int untag_qdepth;
1: -	short unsigned int common_qdepth;
1: -	short unsigned int bus_settle_time;
1: -	short unsigned int sync_ok;
1: -	short unsigned int fast_ok;
1: -	short unsigned int ultra_ok;
1: -	short unsigned int wide_ok;
1: -	short unsigned int discon_ok;
1: -	short unsigned int tagq_ok;
1: -	short unsigned int ext_resets;
1: -	short unsigned int adapter_intern_errors;
1: -	short unsigned int tgt_count;
1: -	short unsigned int msgbuflen;
1: -	u32 bios_addr;
1: -	struct blogic_drvr_options *drvr_opts;
1: -	struct fpoint_info fpinfo;
1: -	void *cardhandle;
1: -	struct list_head host_list;
1: -	struct blogic_ccb *all_ccbs;
1: -	struct blogic_ccb *free_ccbs;
1: -	struct blogic_ccb *firstccb;
1: -	struct blogic_ccb *lastccb;
1: -	struct blogic_ccb *bdr_pend[16];
1: -	struct blogic_tgt_flags tgt_flags[16];
1: -	unsigned char qdepth[16];
1: -	unsigned char sync_period[16];
1: -	unsigned char sync_offset[16];
1: -	unsigned char active_cmds[16];
1: -	unsigned int cmds_since_rst[16];
1: -	long unsigned int last_seqpoint[16];
1: -	long unsigned int last_resettried[16];
1: -	long unsigned int last_resetdone[16];
1: -	struct blogic_outbox *first_outbox;
1: -	struct blogic_outbox *last_outbox;
1: -	struct blogic_outbox *next_outbox;
1: -	struct blogic_inbox *first_inbox;
1: -	struct blogic_inbox *last_inbox;
1: -	struct blogic_inbox *next_inbox;
1: -	struct blogic_tgt_stats tgt_stats[16];
1: -	unsigned char *mbox_space;
1: -	dma_addr_t mbox_space_handle;
1: -	unsigned int mbox_sz;
1: -	long unsigned int ccb_offset;
1: -	char msgbuf[9700];
1: +  struct Scsi_Host *scsi_host;
1: +  struct pci_dev *pci_device;
1: +  enum blogic_adapter_type adapter_type;
1: +  enum blogic_adapter_bus_type adapter_bus_type;
1: +  long unsigned int io_addr;
1: +  long unsigned int pci_addr;
1: +  short unsigned int addr_count;
1: +  unsigned char host_no;
1: +  unsigned char model[9];
1: +  unsigned char fw_ver[6];
1: +  unsigned char full_model[18];
1: +  unsigned char bus;
1: +  unsigned char dev;
1: +  unsigned char irq_ch;
1: +  unsigned char dma_ch;
1: +  unsigned char scsi_id;
1: +  bool irq_acquired : 1;
1: +  bool dma_chan_acquired : 1;
1: +  bool ext_trans_enable : 1;
1: +  bool parity : 1;
1: +  bool reset_enabled : 1;
1: +  bool level_int : 1;
1: +  bool wide : 1;
1: +  bool differential : 1;
1: +  bool scam : 1;
1: +  bool ultra : 1;
1: +  bool ext_lun : 1;
1: +  bool terminfo_valid : 1;
1: +  bool low_term : 1;
1: +  bool high_term : 1;
1: +  bool need_bouncebuf : 1;
1: +  bool strict_rr : 1;
1: +  bool scam_enabled : 1;
1: +  bool scam_lev2 : 1;
1: +  bool adapter_initd : 1;
1: +  bool adapter_extreset : 1;
1: +  bool adapter_intern_err : 1;
1: +  bool processing_ccbs;
1: +  volatile bool adapter_cmd_complete;
1: +  short unsigned int adapter_sglimit;
1: +  short unsigned int drvr_sglimit;
1: +  short unsigned int maxdev;
1: +  short unsigned int maxlun;
1: +  short unsigned int mbox_count;
1: +  short unsigned int initccbs;
1: +  short unsigned int inc_ccbs;
1: +  short unsigned int alloc_ccbs;
1: +  short unsigned int drvr_qdepth;
1: +  short unsigned int adapter_qdepth;
1: +  short unsigned int untag_qdepth;
1: +  short unsigned int common_qdepth;
1: +  short unsigned int bus_settle_time;
1: +  short unsigned int sync_ok;
1: +  short unsigned int fast_ok;
1: +  short unsigned int ultra_ok;
1: +  short unsigned int wide_ok;
1: +  short unsigned int discon_ok;
1: +  short unsigned int tagq_ok;
1: +  short unsigned int ext_resets;
1: +  short unsigned int adapter_intern_errors;
1: +  short unsigned int tgt_count;
1: +  short unsigned int msgbuflen;
1: +  u32 bios_addr;
1: +  struct blogic_drvr_options *drvr_opts;
1: +  struct fpoint_info fpinfo;
1: +  void *cardhandle;
1: +  struct list_head host_list;
1: +  struct blogic_ccb *all_ccbs;
1: +  struct blogic_ccb *free_ccbs;
1: +  struct blogic_ccb *firstccb;
1: +  struct blogic_ccb *lastccb;
1: +  struct blogic_ccb *bdr_pend[16];
1: +  struct blogic_tgt_flags tgt_flags[16];
1: +  unsigned char qdepth[16];
1: +  unsigned char sync_period[16];
1: +  unsigned char sync_offset[16];
1: +  unsigned char active_cmds[16];
1: +  unsigned int cmds_since_rst[16];
1: +  long unsigned int last_seqpoint[16];
1: +  long unsigned int last_resettried[16];
1: +  long unsigned int last_resetdone[16];
1: +  struct blogic_outbox *first_outbox;
1: +  struct blogic_outbox *last_outbox;
1: +  struct blogic_outbox *next_outbox;
1: +  struct blogic_inbox *first_inbox;
1: +  struct blogic_inbox *last_inbox;
1: +  struct blogic_inbox *next_inbox;
1: +  struct blogic_tgt_stats tgt_stats[16];
1: +  unsigned char *mbox_space;
1: +  dma_addr_t mbox_space_handle;
1: +  unsigned int mbox_sz;
1: +  long unsigned int ccb_offset;
1: +  char msgbuf[9700];
1:  };
1:  
1:  struct blogic_outbox {
1: -	u32 ccb;
1: -	int: 24;
1: -	enum blogic_action action;
1: +  u32 ccb;
1: +  int : 24;
1: +  enum blogic_action action;
1:  };
1:  
1:  struct blogic_inbox {
1: -	u32 ccb;
1: -	enum blogic_adapter_status adapter_status;
1: -	enum blogic_tgt_status tgt_status;
1: -	char: 8;
1: -	enum blogic_cmplt_code comp_code;
1: +  u32 ccb;
1: +  enum blogic_adapter_status adapter_status;
1: +  enum blogic_tgt_status tgt_status;
1: +  char : 8;
1: +  enum blogic_cmplt_code comp_code;
1:  };
1:  
1:  struct blogic_drvr_options {
1: -	short unsigned int tagq_ok;
1: -	short unsigned int tagq_ok_mask;
1: -	short unsigned int bus_settle_time;
1: -	short unsigned int stop_tgt_inquiry;
1: -	unsigned char common_qdepth;
1: -	unsigned char qdepth[16];
1: +  short unsigned int tagq_ok;
1: +  short unsigned int tagq_ok_mask;
1: +  short unsigned int bus_settle_time;
1: +  short unsigned int stop_tgt_inquiry;
1: +  unsigned char common_qdepth;
1: +  unsigned char qdepth[16];
1:  };
1:  
1:  struct bios_diskparam {
1: -	int heads;
1: -	int sectors;
1: -	int cylinders;
1: +  int heads;
1: +  int sectors;
1: +  int cylinders;
1:  };
1:  
1:  struct scsi_inquiry {
1: -	unsigned char devtype: 5;
1: -	unsigned char dev_qual: 3;
1: -	unsigned char dev_modifier: 7;
1: -	bool rmb: 1;
1: -	unsigned char ansi_ver: 3;
1: -	unsigned char ecma_ver: 3;
1: -	unsigned char iso_ver: 2;
1: -	unsigned char resp_fmt: 4;
1: -	char: 2;
1: -	bool TrmIOP: 1;
1: -	bool AENC: 1;
1: -	unsigned char addl_len;
1: -	short: 16;
1: -	bool SftRe: 1;
1: -	bool CmdQue: 1;
1: -	char: 1;
1: -	bool linked: 1;
1: -	bool sync: 1;
1: -	bool WBus16: 1;
1: -	bool WBus32: 1;
1: -	bool RelAdr: 1;
1: -	unsigned char vendor[8];
1: -	unsigned char product[16];
1: -	unsigned char product_rev[4];
1: +  unsigned char devtype : 5;
1: +  unsigned char dev_qual : 3;
1: +  unsigned char dev_modifier : 7;
1: +  bool rmb : 1;
1: +  unsigned char ansi_ver : 3;
1: +  unsigned char ecma_ver : 3;
1: +  unsigned char iso_ver : 2;
1: +  unsigned char resp_fmt : 4;
1: +  char : 2;
1: +  bool TrmIOP : 1;
1: +  bool AENC : 1;
1: +  unsigned char addl_len;
1: +  short : 16;
1: +  bool SftRe : 1;
1: +  bool CmdQue : 1;
1: +  char : 1;
1: +  bool linked : 1;
1: +  bool sync : 1;
1: +  bool WBus16 : 1;
1: +  bool WBus32 : 1;
1: +  bool RelAdr : 1;
1: +  unsigned char vendor[8];
1: +  unsigned char product[16];
1: +  unsigned char product_rev[4];
1:  };
1:  
1:  typedef long unsigned int u_long;
1:  
1:  typedef enum {
1: -	CAM_REQ_INPROG = 0,
1: -	CAM_REQ_CMP = 1,
1: -	CAM_REQ_ABORTED = 2,
1: -	CAM_UA_ABORT = 3,
1: -	CAM_REQ_CMP_ERR = 4,
1: -	CAM_BUSY = 5,
1: -	CAM_REQ_INVALID = 6,
1: -	CAM_PATH_INVALID = 7,
1: -	CAM_SEL_TIMEOUT = 8,
1: -	CAM_CMD_TIMEOUT = 9,
1: -	CAM_SCSI_STATUS_ERROR = 10,
1: -	CAM_SCSI_BUS_RESET = 11,
1: -	CAM_UNCOR_PARITY = 12,
1: -	CAM_AUTOSENSE_FAIL = 13,
1: -	CAM_NO_HBA = 14,
1: -	CAM_DATA_RUN_ERR = 15,
1: -	CAM_UNEXP_BUSFREE = 16,
1: -	CAM_SEQUENCE_FAIL = 17,
1: -	CAM_CCB_LEN_ERR = 18,
1: -	CAM_PROVIDE_FAIL = 19,
1: -	CAM_BDR_SENT = 20,
1: -	CAM_REQ_TERMIO = 21,
1: -	CAM_UNREC_HBA_ERROR = 22,
1: -	CAM_REQ_TOO_BIG = 23,
1: -	CAM_UA_TERMIO = 24,
1: -	CAM_MSG_REJECT_REC = 25,
1: -	CAM_DEV_NOT_THERE = 26,
1: -	CAM_RESRC_UNAVAIL = 27,
1: -	CAM_REQUEUE_REQ = 28,
1: -	CAM_DEV_QFRZN = 64,
1: -	CAM_STATUS_MASK = 63,
1: +  CAM_REQ_INPROG = 0,
1: +  CAM_REQ_CMP = 1,
1: +  CAM_REQ_ABORTED = 2,
1: +  CAM_UA_ABORT = 3,
1: +  CAM_REQ_CMP_ERR = 4,
1: +  CAM_BUSY = 5,
1: +  CAM_REQ_INVALID = 6,
1: +  CAM_PATH_INVALID = 7,
1: +  CAM_SEL_TIMEOUT = 8,
1: +  CAM_CMD_TIMEOUT = 9,
1: +  CAM_SCSI_STATUS_ERROR = 10,
1: +  CAM_SCSI_BUS_RESET = 11,
1: +  CAM_UNCOR_PARITY = 12,
1: +  CAM_AUTOSENSE_FAIL = 13,
1: +  CAM_NO_HBA = 14,
1: +  CAM_DATA_RUN_ERR = 15,
1: +  CAM_UNEXP_BUSFREE = 16,
1: +  CAM_SEQUENCE_FAIL = 17,
1: +  CAM_CCB_LEN_ERR = 18,
1: +  CAM_PROVIDE_FAIL = 19,
1: +  CAM_BDR_SENT = 20,
1: +  CAM_REQ_TERMIO = 21,
1: +  CAM_UNREC_HBA_ERROR = 22,
1: +  CAM_REQ_TOO_BIG = 23,
1: +  CAM_UA_TERMIO = 24,
1: +  CAM_MSG_REJECT_REC = 25,
1: +  CAM_DEV_NOT_THERE = 26,
1: +  CAM_RESRC_UNAVAIL = 27,
1: +  CAM_REQUEUE_REQ = 28,
1: +  CAM_DEV_QFRZN = 64,
1: +  CAM_STATUS_MASK = 63,
1:  } cam_status;
1:  
1:  enum {
1: -	CAM_DIR_IN = 2,
1: -	CAM_DIR_OUT = 1,
1: -	CAM_DIR_NONE = 3,
1: +  CAM_DIR_IN = 2,
1: +  CAM_DIR_OUT = 1,
1: +  CAM_DIR_NONE = 3,
1:  };
1:  
1:  struct scsi_sense {
1: -	uint8_t opcode;
1: -	uint8_t byte2;
1: -	uint8_t unused[2];
1: -	uint8_t length;
1: -	uint8_t control;
1: +  uint8_t opcode;
1: +  uint8_t byte2;
1: +  uint8_t unused[2];
1: +  uint8_t length;
1: +  uint8_t control;
1:  };
1:  
1:  struct scsi_sense_data {
1: -	uint8_t error_code;
1: -	uint8_t segment;
1: -	uint8_t flags;
1: -	uint8_t info[4];
1: -	uint8_t extra_len;
1: -	uint8_t cmd_spec_info[4];
1: -	uint8_t add_sense_code;
1: -	uint8_t add_sense_code_qual;
1: -	uint8_t fru;
1: -	uint8_t sense_key_spec[3];
1: -	uint8_t extra_bytes[14];
1: +  uint8_t error_code;
1: +  uint8_t segment;
1: +  uint8_t flags;
1: +  uint8_t info[4];
1: +  uint8_t extra_len;
1: +  uint8_t cmd_spec_info[4];
1: +  uint8_t add_sense_code;
1: +  uint8_t add_sense_code_qual;
1: +  uint8_t fru;
1: +  uint8_t sense_key_spec[3];
1: +  uint8_t extra_bytes[14];
1:  };
1:  
1:  typedef struct pci_dev *ahc_dev_softc_t;
1: @@ -84725,26 +85826,26 @@ typedef struct scsi_cmnd *ahc_io_ctx_t;
1:  typedef uint32_t bus_size_t;
1:  
1:  typedef enum {
1: -	BUS_SPACE_MEMIO = 0,
1: -	BUS_SPACE_PIO = 1,
1: +  BUS_SPACE_MEMIO = 0,
1: +  BUS_SPACE_PIO = 1,
1:  } bus_space_tag_t;
1:  
1:  typedef union {
1: -	u_long ioport;
1: -	volatile uint8_t *maddr;
1: +  u_long ioport;
1: +  volatile uint8_t *maddr;
1:  } bus_space_handle_t;
1:  
1:  struct bus_dma_segment {
1: -	dma_addr_t ds_addr;
1: -	bus_size_t ds_len;
1: +  dma_addr_t ds_addr;
1: +  bus_size_t ds_len;
1:  };
1:  
1:  typedef struct bus_dma_segment bus_dma_segment_t;
1:  
1:  struct ahc_linux_dma_tag {
1: -	bus_size_t alignment;
1: -	bus_size_t boundary;
1: -	bus_size_t maxsize;
1: +  bus_size_t alignment;
1: +  bus_size_t boundary;
1: +  bus_size_t maxsize;
1:  };
1:  
1:  typedef struct ahc_linux_dma_tag *bus_dma_tag_t;
1: @@ -84752,179 +85853,179 @@ typedef struct ahc_linux_dma_tag *bus_dma_tag_t;
1:  typedef dma_addr_t bus_dmamap_t;
1:  
1:  struct ahc_reg_parse_entry {
1: -	char *name;
1: -	uint8_t value;
1: -	uint8_t mask;
1: +  char *name;
1: +  uint8_t value;
1: +  uint8_t mask;
1:  };
1:  
1:  typedef struct ahc_reg_parse_entry ahc_reg_parse_entry_t;
1:  
1:  typedef enum {
1: -	AHC_NONE = 0,
1: -	AHC_CHIPID_MASK = 255,
1: -	AHC_AIC7770 = 1,
1: -	AHC_AIC7850 = 2,
1: -	AHC_AIC7855 = 3,
1: -	AHC_AIC7859 = 4,
1: -	AHC_AIC7860 = 5,
1: -	AHC_AIC7870 = 6,
1: -	AHC_AIC7880 = 7,
1: -	AHC_AIC7895 = 8,
1: -	AHC_AIC7895C = 9,
1: -	AHC_AIC7890 = 10,
1: -	AHC_AIC7896 = 11,
1: -	AHC_AIC7892 = 12,
1: -	AHC_AIC7899 = 13,
1: -	AHC_VL = 256,
1: -	AHC_EISA = 512,
1: -	AHC_PCI = 1024,
1: -	AHC_BUS_MASK = 3840,
1: +  AHC_NONE = 0,
1: +  AHC_CHIPID_MASK = 255,
1: +  AHC_AIC7770 = 1,
1: +  AHC_AIC7850 = 2,
1: +  AHC_AIC7855 = 3,
1: +  AHC_AIC7859 = 4,
1: +  AHC_AIC7860 = 5,
1: +  AHC_AIC7870 = 6,
1: +  AHC_AIC7880 = 7,
1: +  AHC_AIC7895 = 8,
1: +  AHC_AIC7895C = 9,
1: +  AHC_AIC7890 = 10,
1: +  AHC_AIC7896 = 11,
1: +  AHC_AIC7892 = 12,
1: +  AHC_AIC7899 = 13,
1: +  AHC_VL = 256,
1: +  AHC_EISA = 512,
1: +  AHC_PCI = 1024,
1: +  AHC_BUS_MASK = 3840,
1:  } ahc_chip;
1:  
1:  typedef enum {
1: -	AHC_FENONE = 0,
1: -	AHC_ULTRA = 1,
1: -	AHC_ULTRA2 = 2,
1: -	AHC_WIDE = 4,
1: -	AHC_TWIN = 8,
1: -	AHC_MORE_SRAM = 16,
1: -	AHC_CMD_CHAN = 32,
1: -	AHC_QUEUE_REGS = 64,
1: -	AHC_SG_PRELOAD = 128,
1: -	AHC_SPIOCAP = 256,
1: -	AHC_MULTI_TID = 512,
1: -	AHC_HS_MAILBOX = 1024,
1: -	AHC_DT = 2048,
1: -	AHC_NEW_TERMCTL = 4096,
1: -	AHC_MULTI_FUNC = 8192,
1: -	AHC_LARGE_SCBS = 16384,
1: -	AHC_AUTORATE = 32768,
1: -	AHC_AUTOPAUSE = 65536,
1: -	AHC_TARGETMODE = 131072,
1: -	AHC_MULTIROLE = 262144,
1: -	AHC_REMOVABLE = 524288,
1: -	AHC_HVD = 1048576,
1: -	AHC_AIC7770_FE = 0,
1: -	AHC_AIC7850_FE = 196865,
1: -	AHC_AIC7860_FE = 196865,
1: -	AHC_AIC7870_FE = 196608,
1: -	AHC_AIC7880_FE = 196609,
1: -	AHC_AIC7890_FE = 153330,
1: -	AHC_AIC7892_FE = 253682,
1: -	AHC_AIC7895_FE = 221233,
1: -	AHC_AIC7895C_FE = 221745,
1: -	AHC_AIC7896_FE = 161522,
1: -	AHC_AIC7899_FE = 261874,
1: +  AHC_FENONE = 0,
1: +  AHC_ULTRA = 1,
1: +  AHC_ULTRA2 = 2,
1: +  AHC_WIDE = 4,
1: +  AHC_TWIN = 8,
1: +  AHC_MORE_SRAM = 16,
1: +  AHC_CMD_CHAN = 32,
1: +  AHC_QUEUE_REGS = 64,
1: +  AHC_SG_PRELOAD = 128,
1: +  AHC_SPIOCAP = 256,
1: +  AHC_MULTI_TID = 512,
1: +  AHC_HS_MAILBOX = 1024,
1: +  AHC_DT = 2048,
1: +  AHC_NEW_TERMCTL = 4096,
1: +  AHC_MULTI_FUNC = 8192,
1: +  AHC_LARGE_SCBS = 16384,
1: +  AHC_AUTORATE = 32768,
1: +  AHC_AUTOPAUSE = 65536,
1: +  AHC_TARGETMODE = 131072,
1: +  AHC_MULTIROLE = 262144,
1: +  AHC_REMOVABLE = 524288,
1: +  AHC_HVD = 1048576,
1: +  AHC_AIC7770_FE = 0,
1: +  AHC_AIC7850_FE = 196865,
1: +  AHC_AIC7860_FE = 196865,
1: +  AHC_AIC7870_FE = 196608,
1: +  AHC_AIC7880_FE = 196609,
1: +  AHC_AIC7890_FE = 153330,
1: +  AHC_AIC7892_FE = 253682,
1: +  AHC_AIC7895_FE = 221233,
1: +  AHC_AIC7895C_FE = 221745,
1: +  AHC_AIC7896_FE = 161522,
1: +  AHC_AIC7899_FE = 261874,
1:  } ahc_feature;
1:  
1:  typedef enum {
1: -	AHC_BUGNONE = 0,
1: -	AHC_TMODE_WIDEODD_BUG = 1,
1: -	AHC_AUTOFLUSH_BUG = 2,
1: -	AHC_CACHETHEN_BUG = 4,
1: -	AHC_CACHETHEN_DIS_BUG = 8,
1: -	AHC_PCI_2_1_RETRY_BUG = 16,
1: -	AHC_PCI_MWI_BUG = 32,
1: -	AHC_SCBCHAN_UPLOAD_BUG = 64,
1: +  AHC_BUGNONE = 0,
1: +  AHC_TMODE_WIDEODD_BUG = 1,
1: +  AHC_AUTOFLUSH_BUG = 2,
1: +  AHC_CACHETHEN_BUG = 4,
1: +  AHC_CACHETHEN_DIS_BUG = 8,
1: +  AHC_PCI_2_1_RETRY_BUG = 16,
1: +  AHC_PCI_MWI_BUG = 32,
1: +  AHC_SCBCHAN_UPLOAD_BUG = 64,
1:  } ahc_bug;
1:  
1:  typedef enum {
1: -	AHC_FNONE = 0,
1: -	AHC_PRIMARY_CHANNEL = 3,
1: -	AHC_USEDEFAULTS = 4,
1: -	AHC_SEQUENCER_DEBUG = 8,
1: -	AHC_SHARED_SRAM = 16,
1: -	AHC_LARGE_SEEPROM = 32,
1: -	AHC_RESET_BUS_A = 64,
1: -	AHC_RESET_BUS_B = 128,
1: -	AHC_EXTENDED_TRANS_A = 256,
1: -	AHC_EXTENDED_TRANS_B = 512,
1: -	AHC_TERM_ENB_A = 1024,
1: -	AHC_TERM_ENB_B = 2048,
1: -	AHC_INITIATORROLE = 4096,
1: -	AHC_TARGETROLE = 8192,
1: -	AHC_NEWEEPROM_FMT = 16384,
1: -	AHC_TQINFIFO_BLOCKED = 65536,
1: -	AHC_INT50_SPEEDFLEX = 131072,
1: -	AHC_SCB_BTT = 262144,
1: -	AHC_BIOS_ENABLED = 524288,
1: -	AHC_ALL_INTERRUPTS = 1048576,
1: -	AHC_PAGESCBS = 4194304,
1: -	AHC_EDGE_INTERRUPT = 8388608,
1: -	AHC_39BIT_ADDRESSING = 16777216,
1: -	AHC_LSCBS_ENABLED = 33554432,
1: -	AHC_SCB_CONFIG_USED = 67108864,
1: -	AHC_NO_BIOS_INIT = 134217728,
1: -	AHC_DISABLE_PCI_PERR = 268435456,
1: -	AHC_HAS_TERM_LOGIC = 536870912,
1: +  AHC_FNONE = 0,
1: +  AHC_PRIMARY_CHANNEL = 3,
1: +  AHC_USEDEFAULTS = 4,
1: +  AHC_SEQUENCER_DEBUG = 8,
1: +  AHC_SHARED_SRAM = 16,
1: +  AHC_LARGE_SEEPROM = 32,
1: +  AHC_RESET_BUS_A = 64,
1: +  AHC_RESET_BUS_B = 128,
1: +  AHC_EXTENDED_TRANS_A = 256,
1: +  AHC_EXTENDED_TRANS_B = 512,
1: +  AHC_TERM_ENB_A = 1024,
1: +  AHC_TERM_ENB_B = 2048,
1: +  AHC_INITIATORROLE = 4096,
1: +  AHC_TARGETROLE = 8192,
1: +  AHC_NEWEEPROM_FMT = 16384,
1: +  AHC_TQINFIFO_BLOCKED = 65536,
1: +  AHC_INT50_SPEEDFLEX = 131072,
1: +  AHC_SCB_BTT = 262144,
1: +  AHC_BIOS_ENABLED = 524288,
1: +  AHC_ALL_INTERRUPTS = 1048576,
1: +  AHC_PAGESCBS = 4194304,
1: +  AHC_EDGE_INTERRUPT = 8388608,
1: +  AHC_39BIT_ADDRESSING = 16777216,
1: +  AHC_LSCBS_ENABLED = 33554432,
1: +  AHC_SCB_CONFIG_USED = 67108864,
1: +  AHC_NO_BIOS_INIT = 134217728,
1: +  AHC_DISABLE_PCI_PERR = 268435456,
1: +  AHC_HAS_TERM_LOGIC = 536870912,
1:  } ahc_flag;
1:  
1:  struct status_pkt {
1: -	uint32_t residual_datacnt;
1: -	uint32_t residual_sg_ptr;
1: -	uint8_t scsi_status;
1: +  uint32_t residual_datacnt;
1: +  uint32_t residual_sg_ptr;
1: +  uint8_t scsi_status;
1:  };
1:  
1:  struct target_data {
1: -	uint32_t residual_datacnt;
1: -	uint32_t residual_sg_ptr;
1: -	uint8_t scsi_status;
1: -	uint8_t target_phases;
1: -	uint8_t data_phase;
1: -	uint8_t initiator_tag;
1: +  uint32_t residual_datacnt;
1: +  uint32_t residual_sg_ptr;
1: +  uint8_t scsi_status;
1: +  uint8_t target_phases;
1: +  uint8_t data_phase;
1: +  uint8_t initiator_tag;
1:  };
1:  
1:  struct hardware_scb {
1: -	union {
1: -		uint8_t cdb[12];
1: -		uint32_t cdb_ptr;
1: -		struct status_pkt status;
1: -		struct target_data tdata;
1: -	} shared_data;
1: -	uint32_t dataptr;
1: -	uint32_t datacnt;
1: -	uint32_t sgptr;
1: -	uint8_t control;
1: -	uint8_t scsiid;
1: -	uint8_t lun;
1: -	uint8_t tag;
1: -	uint8_t cdb_len;
1: -	uint8_t scsirate;
1: -	uint8_t scsioffset;
1: -	uint8_t next;
1: -	uint8_t cdb32[32];
1: +  union {
1: +    uint8_t cdb[12];
1: +    uint32_t cdb_ptr;
1: +    struct status_pkt status;
1: +    struct target_data tdata;
1: +  } shared_data;
1: +  uint32_t dataptr;
1: +  uint32_t datacnt;
1: +  uint32_t sgptr;
1: +  uint8_t control;
1: +  uint8_t scsiid;
1: +  uint8_t lun;
1: +  uint8_t tag;
1: +  uint8_t cdb_len;
1: +  uint8_t scsirate;
1: +  uint8_t scsioffset;
1: +  uint8_t next;
1: +  uint8_t cdb32[32];
1:  };
1:  
1:  struct ahc_dma_seg {
1: -	uint32_t addr;
1: -	uint32_t len;
1: +  uint32_t addr;
1: +  uint32_t len;
1:  };
1:  
1:  struct sg_map_node {
1: -	bus_dmamap_t sg_dmamap;
1: -	dma_addr_t sg_physaddr;
1: -	struct ahc_dma_seg *sg_vaddr;
1: -	struct {
1: -		struct sg_map_node *sle_next;
1: -	} links;
1: +  bus_dmamap_t sg_dmamap;
1: +  dma_addr_t sg_physaddr;
1: +  struct ahc_dma_seg *sg_vaddr;
1: +  struct {
1: +    struct sg_map_node *sle_next;
1: +  } links;
1:  };
1:  
1:  typedef enum {
1: -	SCB_FREE = 0,
1: -	SCB_OTHERTCL_TIMEOUT = 2,
1: -	SCB_DEVICE_RESET = 4,
1: -	SCB_SENSE = 8,
1: -	SCB_CDB32_PTR = 16,
1: -	SCB_RECOVERY_SCB = 32,
1: -	SCB_AUTO_NEGOTIATE = 64,
1: -	SCB_NEGOTIATE = 128,
1: -	SCB_ABORT = 256,
1: -	SCB_UNTAGGEDQ = 512,
1: -	SCB_ACTIVE = 1024,
1: -	SCB_TARGET_IMMEDIATE = 2048,
1: -	SCB_TRANSMISSION_ERROR = 4096,
1: -	SCB_TARGET_SCB = 8192,
1: -	SCB_SILENT = 16384,
1: +  SCB_FREE = 0,
1: +  SCB_OTHERTCL_TIMEOUT = 2,
1: +  SCB_DEVICE_RESET = 4,
1: +  SCB_SENSE = 8,
1: +  SCB_CDB32_PTR = 16,
1: +  SCB_RECOVERY_SCB = 32,
1: +  SCB_AUTO_NEGOTIATE = 64,
1: +  SCB_NEGOTIATE = 128,
1: +  SCB_ABORT = 256,
1: +  SCB_UNTAGGEDQ = 512,
1: +  SCB_ACTIVE = 1024,
1: +  SCB_TARGET_IMMEDIATE = 2048,
1: +  SCB_TRANSMISSION_ERROR = 4096,
1: +  SCB_TARGET_SCB = 8192,
1: +  SCB_SILENT = 16384,
1:  } scb_flag;
1:  
1:  struct ahc_softc;
1: @@ -84932,56 +86033,56 @@ struct ahc_softc;
1:  struct scb_platform_data;
1:  
1:  struct scb {
1: -	struct hardware_scb *hscb;
1: -	union {
1: -		struct {
1: -			struct scb *sle_next;
1: -		} sle;
1: -		struct {
1: -			struct scb *tqe_next;
1: -			struct scb **tqe_prev;
1: -		} tqe;
1: -	} links;
1: -	struct {
1: -		struct scb *le_next;
1: -		struct scb **le_prev;
1: -	} pending_links;
1: -	ahc_io_ctx_t io_ctx;
1: -	struct ahc_softc *ahc_softc;
1: -	scb_flag flags;
1: -	struct scb_platform_data *platform_data;
1: -	struct sg_map_node *sg_map;
1: -	struct ahc_dma_seg *sg_list;
1: -	dma_addr_t sg_list_phys;
1: -	u_int sg_count;
1: +  struct hardware_scb *hscb;
1: +  union {
1: +    struct {
1: +      struct scb *sle_next;
1: +    } sle;
1: +    struct {
1: +      struct scb *tqe_next;
1: +      struct scb **tqe_prev;
1: +    } tqe;
1: +  } links;
1: +  struct {
1: +    struct scb *le_next;
1: +    struct scb **le_prev;
1: +  } pending_links;
1: +  ahc_io_ctx_t io_ctx;
1: +  struct ahc_softc *ahc_softc;
1: +  scb_flag flags;
1: +  struct scb_platform_data *platform_data;
1: +  struct sg_map_node *sg_map;
1: +  struct ahc_dma_seg *sg_list;
1: +  dma_addr_t sg_list_phys;
1: +  u_int sg_count;
1:  };
1:  
1:  struct scb_tailq {
1: -	struct scb *tqh_first;
1: -	struct scb **tqh_last;
1: +  struct scb *tqh_first;
1: +  struct scb **tqh_last;
1:  };
1:  
1:  struct ahc_aic7770_softc {
1: -	uint8_t busspd;
1: -	uint8_t bustime;
1: +  uint8_t busspd;
1: +  uint8_t bustime;
1:  };
1:  
1:  struct ahc_pci_softc {
1: -	uint32_t devconfig;
1: -	uint16_t targcrccnt;
1: -	uint8_t command;
1: -	uint8_t csize_lattime;
1: -	uint8_t optionmode;
1: -	uint8_t crccontrol1;
1: -	uint8_t dscommand0;
1: -	uint8_t dspcistatus;
1: -	uint8_t scbbaddr;
1: -	uint8_t dff_thrsh;
1: +  uint32_t devconfig;
1: +  uint16_t targcrccnt;
1: +  uint8_t command;
1: +  uint8_t csize_lattime;
1: +  uint8_t optionmode;
1: +  uint8_t crccontrol1;
1: +  uint8_t dscommand0;
1: +  uint8_t dspcistatus;
1: +  uint8_t scbbaddr;
1: +  uint8_t dff_thrsh;
1:  };
1:  
1:  union ahc_bus_softc {
1: -	struct ahc_aic7770_softc aic7770_softc;
1: -	struct ahc_pci_softc pci_softc;
1: +  struct ahc_aic7770_softc aic7770_softc;
1: +  struct ahc_pci_softc pci_softc;
1:  };
1:  
1:  typedef void (*ahc_bus_intr_t)(struct ahc_softc *);
1: @@ -84991,11 +86092,11 @@ typedef int (*ahc_bus_chip_init_t)(struct ahc_softc *);
1:  struct ahc_tmode_lstate;
1:  
1:  typedef enum {
1: -	MSG_TYPE_NONE = 0,
1: -	MSG_TYPE_INITIATOR_MSGOUT = 1,
1: -	MSG_TYPE_INITIATOR_MSGIN = 2,
1: -	MSG_TYPE_TARGET_MSGOUT = 3,
1: -	MSG_TYPE_TARGET_MSGIN = 4,
1: +  MSG_TYPE_NONE = 0,
1: +  MSG_TYPE_INITIATOR_MSGOUT = 1,
1: +  MSG_TYPE_INITIATOR_MSGIN = 2,
1: +  MSG_TYPE_TARGET_MSGOUT = 3,
1: +  MSG_TYPE_TARGET_MSGIN = 4,
1:  } ahc_msg_type;
1:  
1:  struct scb_data;
1: @@ -85011,390 +86112,388 @@ struct cs;
1:  struct target_cmd;
1:  
1:  struct ahc_softc {
1: -	bus_space_tag_t tag;
1: -	bus_space_handle_t bsh;
1: -	struct scb_data *scb_data;
1: -	struct scb *next_queued_scb;
1: -	struct {
1: -		struct scb *lh_first;
1: -	} pending_scbs;
1: -	u_int untagged_queue_lock;
1: -	struct scb_tailq untagged_queues[16];
1: -	union ahc_bus_softc bus_softc;
1: -	struct ahc_platform_data *platform_data;
1: -	ahc_dev_softc_t dev_softc;
1: -	struct device *dev;
1: -	ahc_bus_intr_t bus_intr;
1: -	ahc_bus_chip_init_t bus_chip_init;
1: -	struct ahc_tmode_tstate *enabled_targets[16];
1: -	struct ahc_tmode_lstate *black_hole;
1: -	struct ahc_tmode_lstate *pending_device;
1: -	ahc_chip chip;
1: -	ahc_feature features;
1: -	ahc_bug bugs;
1: -	ahc_flag flags;
1: -	struct seeprom_config *seep_config;
1: -	uint8_t unpause;
1: -	uint8_t pause;
1: -	uint8_t qoutfifonext;
1: -	uint8_t qinfifonext;
1: -	uint8_t *qoutfifo;
1: -	uint8_t *qinfifo;
1: -	struct cs *critical_sections;
1: -	u_int num_critical_sections;
1: -	char channel;
1: -	char channel_b;
1: -	uint8_t our_id;
1: -	uint8_t our_id_b;
1: -	int unsolicited_ints;
1: -	struct target_cmd *targetcmds;
1: -	uint8_t tqinfifonext;
1: -	uint8_t seqctl;
1: -	uint8_t send_msg_perror;
1: -	ahc_msg_type msg_type;
1: -	uint8_t msgout_buf[12];
1: -	uint8_t msgin_buf[12];
1: -	u_int msgout_len;
1: -	u_int msgout_index;
1: -	u_int msgin_index;
1: -	bus_dma_tag_t parent_dmat;
1: -	bus_dma_tag_t shared_data_dmat;
1: -	bus_dmamap_t shared_data_dmamap;
1: -	dma_addr_t shared_data_busaddr;
1: -	dma_addr_t dma_bug_buf;
1: -	u_int enabled_luns;
1: -	u_int init_level;
1: -	u_int pci_cachesize;
1: -	u_int pci_target_perr_count;
1: -	u_int instruction_ram_size;
1: -	const char *description;
1: -	char *name;
1: -	int unit;
1: -	int seltime;
1: -	int seltime_b;
1: -	uint16_t user_discenable;
1: -	uint16_t user_tagenable;
1: +  bus_space_tag_t tag;
1: +  bus_space_handle_t bsh;
1: +  struct scb_data *scb_data;
1: +  struct scb *next_queued_scb;
1: +  struct {
1: +    struct scb *lh_first;
1: +  } pending_scbs;
1: +  u_int untagged_queue_lock;
1: +  struct scb_tailq untagged_queues[16];
1: +  union ahc_bus_softc bus_softc;
1: +  struct ahc_platform_data *platform_data;
1: +  ahc_dev_softc_t dev_softc;
1: +  struct device *dev;
1: +  ahc_bus_intr_t bus_intr;
1: +  ahc_bus_chip_init_t bus_chip_init;
1: +  struct ahc_tmode_tstate *enabled_targets[16];
1: +  struct ahc_tmode_lstate *black_hole;
1: +  struct ahc_tmode_lstate *pending_device;
1: +  ahc_chip chip;
1: +  ahc_feature features;
1: +  ahc_bug bugs;
1: +  ahc_flag flags;
1: +  struct seeprom_config *seep_config;
1: +  uint8_t unpause;
1: +  uint8_t pause;
1: +  uint8_t qoutfifonext;
1: +  uint8_t qinfifonext;
1: +  uint8_t *qoutfifo;
1: +  uint8_t *qinfifo;
1: +  struct cs *critical_sections;
1: +  u_int num_critical_sections;
1: +  char channel;
1: +  char channel_b;
1: +  uint8_t our_id;
1: +  uint8_t our_id_b;
1: +  int unsolicited_ints;
1: +  struct target_cmd *targetcmds;
1: +  uint8_t tqinfifonext;
1: +  uint8_t seqctl;
1: +  uint8_t send_msg_perror;
1: +  ahc_msg_type msg_type;
1: +  uint8_t msgout_buf[12];
1: +  uint8_t msgin_buf[12];
1: +  u_int msgout_len;
1: +  u_int msgout_index;
1: +  u_int msgin_index;
1: +  bus_dma_tag_t parent_dmat;
1: +  bus_dma_tag_t shared_data_dmat;
1: +  bus_dmamap_t shared_data_dmamap;
1: +  dma_addr_t shared_data_busaddr;
1: +  dma_addr_t dma_bug_buf;
1: +  u_int enabled_luns;
1: +  u_int init_level;
1: +  u_int pci_cachesize;
1: +  u_int pci_target_perr_count;
1: +  u_int instruction_ram_size;
1: +  const char *description;
1: +  char *name;
1: +  int unit;
1: +  int seltime;
1: +  int seltime_b;
1: +  uint16_t user_discenable;
1: +  uint16_t user_tagenable;
1:  };
1:  
1:  struct ahc_linux_device;
1:  
1:  struct scb_platform_data {
1: -	struct ahc_linux_device *dev;
1: -	dma_addr_t buf_busaddr;
1: -	uint32_t xfer_len;
1: -	uint32_t sense_resid;
1: +  struct ahc_linux_device *dev;
1: +  dma_addr_t buf_busaddr;
1: +  uint32_t xfer_len;
1: +  uint32_t sense_resid;
1:  };
1:  
1:  struct scb_data {
1: -	struct {
1: -		struct scb *slh_first;
1: -	} free_scbs;
1: -	struct scb *scbindex[256];
1: -	struct hardware_scb *hscbs;
1: -	struct scb *scbarray;
1: -	struct scsi_sense_data *sense;
1: -	bus_dma_tag_t hscb_dmat;
1: -	bus_dmamap_t hscb_dmamap;
1: -	dma_addr_t hscb_busaddr;
1: -	bus_dma_tag_t sense_dmat;
1: -	bus_dmamap_t sense_dmamap;
1: -	dma_addr_t sense_busaddr;
1: -	bus_dma_tag_t sg_dmat;
1: -	struct {
1: -		struct sg_map_node *slh_first;
1: -	} sg_maps;
1: -	uint8_t numscbs;
1: -	uint8_t maxhscbs;
1: -	uint8_t init_level;
1: +  struct {
1: +    struct scb *slh_first;
1: +  } free_scbs;
1: +  struct scb *scbindex[256];
1: +  struct hardware_scb *hscbs;
1: +  struct scb *scbarray;
1: +  struct scsi_sense_data *sense;
1: +  bus_dma_tag_t hscb_dmat;
1: +  bus_dmamap_t hscb_dmamap;
1: +  dma_addr_t hscb_busaddr;
1: +  bus_dma_tag_t sense_dmat;
1: +  bus_dmamap_t sense_dmamap;
1: +  dma_addr_t sense_busaddr;
1: +  bus_dma_tag_t sg_dmat;
1: +  struct {
1: +    struct sg_map_node *slh_first;
1: +  } sg_maps;
1: +  uint8_t numscbs;
1: +  uint8_t maxhscbs;
1: +  uint8_t init_level;
1:  };
1:  
1:  struct target_cmd {
1: -	uint8_t scsiid;
1: -	uint8_t identify;
1: -	uint8_t bytes[22];
1: -	uint8_t cmd_valid;
1: -	uint8_t pad[7];
1: +  uint8_t scsiid;
1: +  uint8_t identify;
1: +  uint8_t bytes[22];
1: +  uint8_t cmd_valid;
1: +  uint8_t pad[7];
1:  };
1:  
1:  struct ahc_transinfo {
1: -	uint8_t protocol_version;
1: -	uint8_t transport_version;
1: -	uint8_t width;
1: -	uint8_t period;
1: -	uint8_t offset;
1: -	uint8_t ppr_options;
1: +  uint8_t protocol_version;
1: +  uint8_t transport_version;
1: +  uint8_t width;
1: +  uint8_t period;
1: +  uint8_t offset;
1: +  uint8_t ppr_options;
1:  };
1:  
1:  struct ahc_initiator_tinfo {
1: -	uint8_t scsirate;
1: -	struct ahc_transinfo curr;
1: -	struct ahc_transinfo goal;
1: -	struct ahc_transinfo user;
1: +  uint8_t scsirate;
1: +  struct ahc_transinfo curr;
1: +  struct ahc_transinfo goal;
1: +  struct ahc_transinfo user;
1:  };
1:  
1:  struct ahc_tmode_tstate {
1: -	struct ahc_tmode_lstate *enabled_luns[64];
1: -	struct ahc_initiator_tinfo transinfo[16];
1: -	uint16_t auto_negotiate;
1: -	uint16_t ultraenb;
1: -	uint16_t discenable;
1: -	uint16_t tagenable;
1: +  struct ahc_tmode_lstate *enabled_luns[64];
1: +  struct ahc_initiator_tinfo transinfo[16];
1: +  uint16_t auto_negotiate;
1: +  uint16_t ultraenb;
1: +  uint16_t discenable;
1: +  uint16_t tagenable;
1:  };
1:  
1:  struct ahc_syncrate {
1: -	u_int sxfr_u2;
1: -	u_int sxfr;
1: -	uint8_t period;
1: -	const char *rate;
1: +  u_int sxfr_u2;
1: +  u_int sxfr;
1: +  uint8_t period;
1: +  const char *rate;
1:  };
1:  
1:  struct ahc_phase_table_entry {
1: -	uint8_t phase;
1: -	uint8_t mesg_out;
1: -	char *phasemsg;
1: +  uint8_t phase;
1: +  uint8_t mesg_out;
1: +  char *phasemsg;
1:  };
1:  
1:  struct seeprom_config {
1: -	uint16_t device_flags[16];
1: -	uint16_t bios_control;
1: -	uint16_t adapter_control;
1: -	uint16_t brtime_id;
1: -	uint16_t max_targets;
1: -	uint16_t res_1[10];
1: -	uint16_t signature;
1: -	uint16_t checksum;
1: +  uint16_t device_flags[16];
1: +  uint16_t bios_control;
1: +  uint16_t adapter_control;
1: +  uint16_t brtime_id;
1: +  uint16_t max_targets;
1: +  uint16_t res_1[10];
1: +  uint16_t signature;
1: +  uint16_t checksum;
1:  };
1:  
1:  enum {
1: -	MSGLOOP_IN_PROG = 0,
1: -	MSGLOOP_MSGCOMPLETE = 1,
1: -	MSGLOOP_TERMINATED = 2,
1: +  MSGLOOP_IN_PROG = 0,
1: +  MSGLOOP_MSGCOMPLETE = 1,
1: +  MSGLOOP_TERMINATED = 2,
1:  };
1:  
1:  struct ahc_platform_data {
1: -	struct scsi_target *starget[16];
1: -	spinlock_t spin_lock;
1: -	u_int qfrozen;
1: -	struct completion *eh_done;
1: -	struct Scsi_Host *host;
1: -	uint32_t irq;
1: -	uint32_t bios_address;
1: -	resource_size_t mem_busaddr;
1: +  struct scsi_target *starget[16];
1: +  spinlock_t spin_lock;
1: +  u_int qfrozen;
1: +  struct completion *eh_done;
1: +  struct Scsi_Host *host;
1: +  uint32_t irq;
1: +  uint32_t bios_address;
1: +  resource_size_t mem_busaddr;
1:  };
1:  
1:  struct cs {
1: -	uint16_t begin;
1: -	uint16_t end;
1: +  uint16_t begin;
1: +  uint16_t end;
1:  };
1:  
1:  typedef enum {
1: -	ROLE_UNKNOWN = 0,
1: -	ROLE_INITIATOR = 1,
1: -	ROLE_TARGET = 2,
1: +  ROLE_UNKNOWN = 0,
1: +  ROLE_INITIATOR = 1,
1: +  ROLE_TARGET = 2,
1:  } role_t;
1:  
1:  struct ahc_devinfo {
1: -	int our_scsiid;
1: -	int target_offset;
1: -	uint16_t target_mask;
1: -	u_int target;
1: -	u_int lun;
1: -	char channel;
1: -	role_t role;
1: +  int our_scsiid;
1: +  int target_offset;
1: +  uint16_t target_mask;
1: +  u_int target;
1: +  u_int lun;
1: +  char channel;
1: +  role_t role;
1:  };
1:  
1:  typedef enum {
1: -	SEARCH_COMPLETE = 0,
1: -	SEARCH_COUNT = 1,
1: -	SEARCH_REMOVE = 2,
1: +  SEARCH_COMPLETE = 0,
1: +  SEARCH_COUNT = 1,
1: +  SEARCH_REMOVE = 2,
1:  } ahc_search_action;
1:  
1:  typedef enum {
1: -	AHC_NEG_TO_GOAL = 0,
1: -	AHC_NEG_IF_NON_ASYNC = 1,
1: -	AHC_NEG_ALWAYS = 2,
1: +  AHC_NEG_TO_GOAL = 0,
1: +  AHC_NEG_IF_NON_ASYNC = 1,
1: +  AHC_NEG_ALWAYS = 2,
1:  } ahc_neg_type;
1:  
1:  typedef enum {
1: -	AHC_QUEUE_NONE = 0,
1: -	AHC_QUEUE_BASIC = 1,
1: -	AHC_QUEUE_TAGGED = 2,
1: +  AHC_QUEUE_NONE = 0,
1: +  AHC_QUEUE_BASIC = 1,
1: +  AHC_QUEUE_TAGGED = 2,
1:  } ahc_queue_alg;
1:  
1:  typedef enum {
1: -	AHC_DEV_FREEZE_TIL_EMPTY = 2,
1: -	AHC_DEV_Q_BASIC = 16,
1: -	AHC_DEV_Q_TAGGED = 32,
1: -	AHC_DEV_PERIODIC_OTAG = 64,
1: +  AHC_DEV_FREEZE_TIL_EMPTY = 2,
1: +  AHC_DEV_Q_BASIC = 16,
1: +  AHC_DEV_Q_TAGGED = 32,
1: +  AHC_DEV_PERIODIC_OTAG = 64,
1:  } ahc_linux_dev_flags;
1:  
1:  struct ahc_linux_device {
1: -	int active;
1: -	int openings;
1: -	u_int qfrozen;
1: -	u_long commands_issued;
1: -	u_int tag_success_count;
1: -	ahc_linux_dev_flags flags;
1: -	u_int maxtags;
1: -	u_int tags_on_last_queuefull;
1: -	u_int last_queuefull_same_count;
1: -	u_int commands_since_idle_or_otag;
1: +  int active;
1: +  int openings;
1: +  u_int qfrozen;
1: +  u_long commands_issued;
1: +  u_int tag_success_count;
1: +  ahc_linux_dev_flags flags;
1: +  u_int maxtags;
1: +  u_int tags_on_last_queuefull;
1: +  u_int last_queuefull_same_count;
1: +  u_int commands_since_idle_or_otag;
1:  };
1:  
1:  struct ins_format1 {
1: -	uint32_t immediate: 8;
1: -	uint32_t source: 9;
1: -	uint32_t destination: 9;
1: -	uint32_t ret: 1;
1: -	uint32_t opcode: 4;
1: -	uint32_t parity: 1;
1: +  uint32_t immediate : 8;
1: +  uint32_t source : 9;
1: +  uint32_t destination : 9;
1: +  uint32_t ret : 1;
1: +  uint32_t opcode : 4;
1: +  uint32_t parity : 1;
1:  };
1:  
1:  struct ins_format2 {
1: -	uint32_t shift_control: 8;
1: -	uint32_t source: 9;
1: -	uint32_t destination: 9;
1: -	uint32_t ret: 1;
1: -	uint32_t opcode: 4;
1: -	uint32_t parity: 1;
1: +  uint32_t shift_control : 8;
1: +  uint32_t source : 9;
1: +  uint32_t destination : 9;
1: +  uint32_t ret : 1;
1: +  uint32_t opcode : 4;
1: +  uint32_t parity : 1;
1:  };
1:  
1:  struct ins_format3 {
1: -	uint32_t immediate: 8;
1: -	uint32_t source: 9;
1: -	uint32_t address: 10;
1: -	uint32_t opcode: 4;
1: -	uint32_t parity: 1;
1: +  uint32_t immediate : 8;
1: +  uint32_t source : 9;
1: +  uint32_t address : 10;
1: +  uint32_t opcode : 4;
1: +  uint32_t parity : 1;
1:  };
1:  
1:  struct ins_format4 {
1: -	uint32_t opcode_ext: 8;
1: -	uint32_t source: 9;
1: -	uint32_t destination: 9;
1: -	uint32_t ret: 1;
1: -	uint32_t opcode: 4;
1: -	uint32_t parity: 1;
1: +  uint32_t opcode_ext : 8;
1: +  uint32_t source : 9;
1: +  uint32_t destination : 9;
1: +  uint32_t ret : 1;
1: +  uint32_t opcode : 4;
1: +  uint32_t parity : 1;
1:  };
1:  
1:  struct ins_format5 {
1: -	uint32_t opcode_ext: 8;
1: -	uint32_t source: 9;
1: -	uint32_t address: 10;
1: -	uint32_t opcode: 4;
1: -	uint32_t parity: 1;
1: +  uint32_t opcode_ext : 8;
1: +  uint32_t source : 9;
1: +  uint32_t address : 10;
1: +  uint32_t opcode : 4;
1: +  uint32_t parity : 1;
1:  };
1:  
1:  struct ins_format6 {
1: -	uint32_t page: 3;
1: -	uint32_t opcode_ext: 5;
1: -	uint32_t source: 9;
1: -	uint32_t address: 10;
1: -	uint32_t opcode: 4;
1: -	uint32_t parity: 1;
1: +  uint32_t page : 3;
1: +  uint32_t opcode_ext : 5;
1: +  uint32_t source : 9;
1: +  uint32_t address : 10;
1: +  uint32_t opcode : 4;
1: +  uint32_t parity : 1;
1:  };
1:  
1:  union ins_formats {
1: -	struct ins_format1 format1;
1: -	struct ins_format2 format2;
1: -	struct ins_format3 format3;
1: -	struct ins_format4 format4;
1: -	struct ins_format5 format5;
1: -	struct ins_format6 format6;
1: -	uint8_t bytes[4];
1: -	uint32_t integer;
1: +  struct ins_format1 format1;
1: +  struct ins_format2 format2;
1: +  struct ins_format3 format3;
1: +  struct ins_format4 format4;
1: +  struct ins_format5 format5;
1: +  struct ins_format6 format6;
1: +  uint8_t bytes[4];
1: +  uint32_t integer;
1:  };
1:  
1:  struct ahc_hard_error_entry {
1: -	uint8_t errno;
1: -	const char *errmesg;
1: +  uint8_t errno;
1: +  const char *errmesg;
1:  };
1:  
1:  typedef int ahc_patch_func_t(struct ahc_softc *);
1:  
1:  struct patch {
1: -	ahc_patch_func_t *patch_func;
1: -	uint32_t begin: 10;
1: -	uint32_t skip_instr: 10;
1: -	uint32_t skip_patch: 12;
1: +  ahc_patch_func_t *patch_func;
1: +  uint32_t begin : 10;
1: +  uint32_t skip_instr : 10;
1: +  uint32_t skip_patch : 12;
1:  };
1:  
1:  typedef enum {
1: -	AHCMSG_1B = 0,
1: -	AHCMSG_2B = 1,
1: -	AHCMSG_EXT = 2,
1: +  AHCMSG_1B = 0,
1: +  AHCMSG_2B = 1,
1: +  AHCMSG_EXT = 2,
1:  } ahc_msgtype;
1:  
1:  typedef enum {
1: -	C46 = 6,
1: -	C56_66 = 8,
1: +  C46 = 6,
1: +  C56_66 = 8,
1:  } seeprom_chip_t;
1:  
1:  struct seeprom_descriptor {
1: -	struct ahc_softc *sd_ahc;
1: -	u_int sd_control_offset;
1: -	u_int sd_status_offset;
1: -	u_int sd_dataout_offset;
1: -	seeprom_chip_t sd_chip;
1: -	uint16_t sd_MS;
1: -	uint16_t sd_RDY;
1: -	uint16_t sd_CS;
1: -	uint16_t sd_CK;
1: -	uint16_t sd_DO;
1: -	uint16_t sd_DI;
1: +  struct ahc_softc *sd_ahc;
1: +  u_int sd_control_offset;
1: +  u_int sd_status_offset;
1: +  u_int sd_dataout_offset;
1: +  seeprom_chip_t sd_chip;
1: +  uint16_t sd_MS;
1: +  uint16_t sd_RDY;
1: +  uint16_t sd_CS;
1: +  uint16_t sd_CK;
1: +  uint16_t sd_DO;
1: +  uint16_t sd_DI;
1:  };
1:  
1:  struct seeprom_cmd {
1: -	uint8_t len;
1: -	uint8_t bits[11];
1: +  uint8_t len;
1: +  uint8_t bits[11];
1:  };
1:  
1:  typedef int ahc_device_setup_t(struct ahc_softc *);
1:  
1:  struct ahc_pci_identity {
1: -	uint64_t full_id;
1: -	uint64_t id_mask;
1: -	const char *name;
1: -	ahc_device_setup_t *setup;
1: +  uint64_t full_id;
1: +  uint64_t id_mask;
1: +  const char *name;
1: +  ahc_device_setup_t *setup;
1:  };
1:  
1:  enum {
1: -	AHC_POWER_STATE_D0 = 0,
1: -	AHC_POWER_STATE_D1 = 1,
1: -	AHC_POWER_STATE_D2 = 2,
1: -	AHC_POWER_STATE_D3 = 3,
1: +  AHC_POWER_STATE_D0 = 0,
1: +  AHC_POWER_STATE_D1 = 1,
1: +  AHC_POWER_STATE_D2 = 2,
1: +  AHC_POWER_STATE_D3 = 3,
1:  };
1:  
1:  typedef enum {
1: -	AC_GETDEV_CHANGED = 2048,
1: -	AC_INQ_CHANGED = 1024,
1: -	AC_TRANSFER_NEG = 512,
1: -	AC_LOST_DEVICE = 256,
1: -	AC_FOUND_DEVICE = 128,
1: -	AC_PATH_DEREGISTERED = 64,
1: -	AC_PATH_REGISTERED = 32,
1: -	AC_SENT_BDR = 16,
1: -	AC_SCSI_AEN = 8,
1: -	AC_UNSOL_RESEL = 2,
1: -	AC_BUS_RESET = 1,
1: +  AC_GETDEV_CHANGED = 2048,
1: +  AC_INQ_CHANGED = 1024,
1: +  AC_TRANSFER_NEG = 512,
1: +  AC_LOST_DEVICE = 256,
1: +  AC_FOUND_DEVICE = 128,
1: +  AC_PATH_DEREGISTERED = 64,
1: +  AC_PATH_REGISTERED = 32,
1: +  AC_SENT_BDR = 16,
1: +  AC_SCSI_AEN = 8,
1: +  AC_UNSOL_RESEL = 2,
1: +  AC_BUS_RESET = 1,
1:  } ac_code;
1:  
1:  typedef int bus_dma_filter_t(void *, dma_addr_t);
1:  
1:  typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
1:  
1: -typedef struct {
1: -	uint8_t tag_commands[16];
1: -} adapter_tag_info_t;
1: +typedef struct { uint8_t tag_commands[16]; } adapter_tag_info_t;
1:  
1:  typedef u16 u_int16_t;
1:  
1:  struct scsi_status_iu_header {
1: -	u_int8_t reserved[2];
1: -	u_int8_t flags;
1: -	u_int8_t status;
1: -	u_int8_t sense_length[4];
1: -	u_int8_t pkt_failures_length[4];
1: -	u_int8_t pkt_failures[1];
1: +  u_int8_t reserved[2];
1: +  u_int8_t flags;
1: +  u_int8_t status;
1: +  u_int8_t sense_length[4];
1: +  u_int8_t pkt_failures_length[4];
1: +  u_int8_t pkt_failures[1];
1:  };
1:  
1:  typedef struct pci_dev *ahd_dev_softc_t;
1: @@ -85402,205 +86501,205 @@ typedef struct pci_dev *ahd_dev_softc_t;
1:  typedef struct scsi_cmnd *ahd_io_ctx_t;
1:  
1:  struct ahd_linux_dma_tag {
1: -	bus_size_t alignment;
1: -	bus_size_t boundary;
1: -	bus_size_t maxsize;
1: +  bus_size_t alignment;
1: +  bus_size_t boundary;
1: +  bus_size_t maxsize;
1:  };
1:  
1:  typedef struct ahd_linux_dma_tag *bus_dma_tag_t___2;
1:  
1:  struct ahd_reg_parse_entry {
1: -	char *name;
1: -	uint8_t value;
1: -	uint8_t mask;
1: +  char *name;
1: +  uint8_t value;
1: +  uint8_t mask;
1:  };
1:  
1:  typedef struct ahd_reg_parse_entry ahd_reg_parse_entry_t;
1:  
1:  typedef enum {
1: -	AHD_NONE = 0,
1: -	AHD_CHIPID_MASK = 255,
1: -	AHD_AIC7901 = 1,
1: -	AHD_AIC7902 = 2,
1: -	AHD_AIC7901A = 3,
1: -	AHD_PCI = 256,
1: -	AHD_PCIX = 512,
1: -	AHD_BUS_MASK = 3840,
1: +  AHD_NONE = 0,
1: +  AHD_CHIPID_MASK = 255,
1: +  AHD_AIC7901 = 1,
1: +  AHD_AIC7902 = 2,
1: +  AHD_AIC7901A = 3,
1: +  AHD_PCI = 256,
1: +  AHD_PCIX = 512,
1: +  AHD_BUS_MASK = 3840,
1:  } ahd_chip;
1:  
1:  typedef enum {
1: -	AHD_FENONE = 0,
1: -	AHD_WIDE = 1,
1: -	AHD_AIC79XXB_SLOWCRC = 2,
1: -	AHD_MULTI_FUNC = 256,
1: -	AHD_TARGETMODE = 4096,
1: -	AHD_MULTIROLE = 8192,
1: -	AHD_RTI = 16384,
1: -	AHD_NEW_IOCELL_OPTS = 32768,
1: -	AHD_NEW_DFCNTRL_OPTS = 65536,
1: -	AHD_FAST_CDB_DELIVERY = 131072,
1: -	AHD_REMOVABLE = 0,
1: -	AHD_AIC7901_FE = 0,
1: -	AHD_AIC7901A_FE = 0,
1: -	AHD_AIC7902_FE = 256,
1: +  AHD_FENONE = 0,
1: +  AHD_WIDE = 1,
1: +  AHD_AIC79XXB_SLOWCRC = 2,
1: +  AHD_MULTI_FUNC = 256,
1: +  AHD_TARGETMODE = 4096,
1: +  AHD_MULTIROLE = 8192,
1: +  AHD_RTI = 16384,
1: +  AHD_NEW_IOCELL_OPTS = 32768,
1: +  AHD_NEW_DFCNTRL_OPTS = 65536,
1: +  AHD_FAST_CDB_DELIVERY = 131072,
1: +  AHD_REMOVABLE = 0,
1: +  AHD_AIC7901_FE = 0,
1: +  AHD_AIC7901A_FE = 0,
1: +  AHD_AIC7902_FE = 256,
1:  } ahd_feature;
1:  
1:  typedef enum {
1: -	AHD_BUGNONE = 0,
1: -	AHD_SENT_SCB_UPDATE_BUG = 1,
1: -	AHD_ABORT_LQI_BUG = 2,
1: -	AHD_PKT_BITBUCKET_BUG = 4,
1: -	AHD_LONG_SETIMO_BUG = 8,
1: -	AHD_NLQICRC_DELAYED_BUG = 16,
1: -	AHD_SCSIRST_BUG = 32,
1: -	AHD_PCIX_CHIPRST_BUG = 64,
1: -	AHD_PCIX_MMAPIO_BUG = 128,
1: -	AHD_PCIX_SCBRAM_RD_BUG = 256,
1: -	AHD_PCIX_BUG_MASK = 448,
1: -	AHD_LQO_ATNO_BUG = 512,
1: -	AHD_AUTOFLUSH_BUG = 1024,
1: -	AHD_CLRLQO_AUTOCLR_BUG = 2048,
1: -	AHD_PKTIZED_STATUS_BUG = 4096,
1: -	AHD_PKT_LUN_BUG = 8192,
1: -	AHD_NONPACKFIFO_BUG = 16384,
1: -	AHD_MDFF_WSCBPTR_BUG = 32768,
1: -	AHD_REG_SLOW_SETTLE_BUG = 65536,
1: -	AHD_SET_MODE_BUG = 131072,
1: -	AHD_BUSFREEREV_BUG = 262144,
1: -	AHD_PACED_NEGTABLE_BUG = 524288,
1: -	AHD_LQOOVERRUN_BUG = 1048576,
1: -	AHD_INTCOLLISION_BUG = 2097152,
1: -	AHD_EARLY_REQ_BUG = 4194304,
1: -	AHD_FAINT_LED_BUG = 8388608,
1: +  AHD_BUGNONE = 0,
1: +  AHD_SENT_SCB_UPDATE_BUG = 1,
1: +  AHD_ABORT_LQI_BUG = 2,
1: +  AHD_PKT_BITBUCKET_BUG = 4,
1: +  AHD_LONG_SETIMO_BUG = 8,
1: +  AHD_NLQICRC_DELAYED_BUG = 16,
1: +  AHD_SCSIRST_BUG = 32,
1: +  AHD_PCIX_CHIPRST_BUG = 64,
1: +  AHD_PCIX_MMAPIO_BUG = 128,
1: +  AHD_PCIX_SCBRAM_RD_BUG = 256,
1: +  AHD_PCIX_BUG_MASK = 448,
1: +  AHD_LQO_ATNO_BUG = 512,
1: +  AHD_AUTOFLUSH_BUG = 1024,
1: +  AHD_CLRLQO_AUTOCLR_BUG = 2048,
1: +  AHD_PKTIZED_STATUS_BUG = 4096,
1: +  AHD_PKT_LUN_BUG = 8192,
1: +  AHD_NONPACKFIFO_BUG = 16384,
1: +  AHD_MDFF_WSCBPTR_BUG = 32768,
1: +  AHD_REG_SLOW_SETTLE_BUG = 65536,
1: +  AHD_SET_MODE_BUG = 131072,
1: +  AHD_BUSFREEREV_BUG = 262144,
1: +  AHD_PACED_NEGTABLE_BUG = 524288,
1: +  AHD_LQOOVERRUN_BUG = 1048576,
1: +  AHD_INTCOLLISION_BUG = 2097152,
1: +  AHD_EARLY_REQ_BUG = 4194304,
1: +  AHD_FAINT_LED_BUG = 8388608,
1:  } ahd_bug;
1:  
1:  typedef enum {
1: -	AHD_FNONE = 0,
1: -	AHD_BOOT_CHANNEL = 1,
1: -	AHD_USEDEFAULTS = 4,
1: -	AHD_SEQUENCER_DEBUG = 8,
1: -	AHD_RESET_BUS_A = 16,
1: -	AHD_EXTENDED_TRANS_A = 32,
1: -	AHD_TERM_ENB_A = 64,
1: -	AHD_SPCHK_ENB_A = 128,
1: -	AHD_STPWLEVEL_A = 256,
1: -	AHD_INITIATORROLE = 512,
1: -	AHD_TARGETROLE = 1024,
1: -	AHD_RESOURCE_SHORTAGE = 2048,
1: -	AHD_TQINFIFO_BLOCKED = 4096,
1: -	AHD_INT50_SPEEDFLEX = 8192,
1: -	AHD_BIOS_ENABLED = 16384,
1: -	AHD_ALL_INTERRUPTS = 32768,
1: -	AHD_39BIT_ADDRESSING = 65536,
1: -	AHD_64BIT_ADDRESSING = 131072,
1: -	AHD_CURRENT_SENSING = 262144,
1: -	AHD_SCB_CONFIG_USED = 524288,
1: -	AHD_HP_BOARD = 1048576,
1: -	AHD_BUS_RESET_ACTIVE = 2097152,
1: -	AHD_UPDATE_PEND_CMDS = 4194304,
1: -	AHD_RUNNING_QOUTFIFO = 8388608,
1: -	AHD_HAD_FIRST_SEL = 16777216,
1: +  AHD_FNONE = 0,
1: +  AHD_BOOT_CHANNEL = 1,
1: +  AHD_USEDEFAULTS = 4,
1: +  AHD_SEQUENCER_DEBUG = 8,
1: +  AHD_RESET_BUS_A = 16,
1: +  AHD_EXTENDED_TRANS_A = 32,
1: +  AHD_TERM_ENB_A = 64,
1: +  AHD_SPCHK_ENB_A = 128,
1: +  AHD_STPWLEVEL_A = 256,
1: +  AHD_INITIATORROLE = 512,
1: +  AHD_TARGETROLE = 1024,
1: +  AHD_RESOURCE_SHORTAGE = 2048,
1: +  AHD_TQINFIFO_BLOCKED = 4096,
1: +  AHD_INT50_SPEEDFLEX = 8192,
1: +  AHD_BIOS_ENABLED = 16384,
1: +  AHD_ALL_INTERRUPTS = 32768,
1: +  AHD_39BIT_ADDRESSING = 65536,
1: +  AHD_64BIT_ADDRESSING = 131072,
1: +  AHD_CURRENT_SENSING = 262144,
1: +  AHD_SCB_CONFIG_USED = 524288,
1: +  AHD_HP_BOARD = 1048576,
1: +  AHD_BUS_RESET_ACTIVE = 2097152,
1: +  AHD_UPDATE_PEND_CMDS = 4194304,
1: +  AHD_RUNNING_QOUTFIFO = 8388608,
1: +  AHD_HAD_FIRST_SEL = 16777216,
1:  } ahd_flag;
1:  
1:  struct initiator_status {
1: -	uint32_t residual_datacnt;
1: -	uint32_t residual_sgptr;
1: -	uint8_t scsi_status;
1: +  uint32_t residual_datacnt;
1: +  uint32_t residual_sgptr;
1: +  uint8_t scsi_status;
1:  };
1:  
1:  struct target_status {
1: -	uint32_t residual_datacnt;
1: -	uint32_t residual_sgptr;
1: -	uint8_t scsi_status;
1: -	uint8_t target_phases;
1: -	uint8_t data_phase;
1: -	uint8_t initiator_tag;
1: +  uint32_t residual_datacnt;
1: +  uint32_t residual_sgptr;
1: +  uint8_t scsi_status;
1: +  uint8_t target_phases;
1: +  uint8_t data_phase;
1: +  uint8_t initiator_tag;
1:  };
1:  
1:  typedef uint32_t sense_addr_t;
1:  
1:  union initiator_data {
1: -	struct {
1: -		uint64_t cdbptr;
1: -		uint8_t cdblen;
1: -	} cdb_from_host;
1: -	uint8_t cdb[16];
1: -	struct {
1: -		uint8_t cdb[12];
1: -		sense_addr_t sense_addr;
1: -	} cdb_plus_saddr;
1: +  struct {
1: +    uint64_t cdbptr;
1: +    uint8_t cdblen;
1: +  } cdb_from_host;
1: +  uint8_t cdb[16];
1: +  struct {
1: +    uint8_t cdb[12];
1: +    sense_addr_t sense_addr;
1: +  } cdb_plus_saddr;
1:  };
1:  
1:  struct target_data___2 {
1: -	uint32_t spare[2];
1: -	uint8_t scsi_status;
1: -	uint8_t target_phases;
1: -	uint8_t data_phase;
1: -	uint8_t initiator_tag;
1: +  uint32_t spare[2];
1: +  uint8_t scsi_status;
1: +  uint8_t target_phases;
1: +  uint8_t data_phase;
1: +  uint8_t initiator_tag;
1:  };
1:  
1:  struct hardware_scb___2 {
1: -	union {
1: -		union initiator_data idata;
1: -		struct target_data___2 tdata;
1: -		struct initiator_status istatus;
1: -		struct target_status tstatus;
1: -	} shared_data;
1: -	uint16_t tag;
1: -	uint8_t control;
1: -	uint8_t scsiid;
1: -	uint8_t lun;
1: -	uint8_t task_attribute;
1: -	uint8_t cdb_len;
1: -	uint8_t task_management;
1: -	uint64_t dataptr;
1: -	uint32_t datacnt;
1: -	uint32_t sgptr;
1: -	uint32_t hscb_busaddr;
1: -	uint32_t next_hscb_busaddr;
1: -	uint8_t pkt_long_lun[8];
1: -	uint8_t spare[8];
1: +  union {
1: +    union initiator_data idata;
1: +    struct target_data___2 tdata;
1: +    struct initiator_status istatus;
1: +    struct target_status tstatus;
1: +  } shared_data;
1: +  uint16_t tag;
1: +  uint8_t control;
1: +  uint8_t scsiid;
1: +  uint8_t lun;
1: +  uint8_t task_attribute;
1: +  uint8_t cdb_len;
1: +  uint8_t task_management;
1: +  uint64_t dataptr;
1: +  uint32_t datacnt;
1: +  uint32_t sgptr;
1: +  uint32_t hscb_busaddr;
1: +  uint32_t next_hscb_busaddr;
1: +  uint8_t pkt_long_lun[8];
1: +  uint8_t spare[8];
1:  };
1:  
1:  struct ahd_dma_seg {
1: -	uint32_t addr;
1: -	uint32_t len;
1: +  uint32_t addr;
1: +  uint32_t len;
1:  };
1:  
1:  struct ahd_dma64_seg {
1: -	uint64_t addr;
1: -	uint32_t len;
1: -	uint32_t pad;
1: +  uint64_t addr;
1: +  uint32_t len;
1: +  uint32_t pad;
1:  };
1:  
1:  struct map_node {
1: -	bus_dmamap_t dmamap;
1: -	dma_addr_t physaddr;
1: -	uint8_t *vaddr;
1: -	struct {
1: -		struct map_node *sle_next;
1: -	} links;
1: +  bus_dmamap_t dmamap;
1: +  dma_addr_t physaddr;
1: +  uint8_t *vaddr;
1: +  struct {
1: +    struct map_node *sle_next;
1: +  } links;
1:  };
1:  
1:  typedef enum {
1: -	SCB_FLAG_NONE = 0,
1: -	SCB_TRANSMISSION_ERROR___2 = 1,
1: -	SCB_OTHERTCL_TIMEOUT___2 = 2,
1: -	SCB_DEVICE_RESET___2 = 4,
1: -	SCB_SENSE___2 = 8,
1: -	SCB_CDB32_PTR___2 = 16,
1: -	SCB_RECOVERY_SCB___2 = 32,
1: -	SCB_AUTO_NEGOTIATE___2 = 64,
1: -	SCB_NEGOTIATE___2 = 128,
1: -	SCB_ABORT___2 = 256,
1: -	SCB_ACTIVE___2 = 512,
1: -	SCB_TARGET_IMMEDIATE___2 = 1024,
1: -	SCB_PACKETIZED = 2048,
1: -	SCB_EXPECT_PPR_BUSFREE = 4096,
1: -	SCB_PKT_SENSE = 8192,
1: -	SCB_EXTERNAL_RESET = 16384,
1: -	SCB_ON_COL_LIST = 32768,
1: -	SCB_SILENT___2 = 65536,
1: +  SCB_FLAG_NONE = 0,
1: +  SCB_TRANSMISSION_ERROR___2 = 1,
1: +  SCB_OTHERTCL_TIMEOUT___2 = 2,
1: +  SCB_DEVICE_RESET___2 = 4,
1: +  SCB_SENSE___2 = 8,
1: +  SCB_CDB32_PTR___2 = 16,
1: +  SCB_RECOVERY_SCB___2 = 32,
1: +  SCB_AUTO_NEGOTIATE___2 = 64,
1: +  SCB_NEGOTIATE___2 = 128,
1: +  SCB_ABORT___2 = 256,
1: +  SCB_ACTIVE___2 = 512,
1: +  SCB_TARGET_IMMEDIATE___2 = 1024,
1: +  SCB_PACKETIZED = 2048,
1: +  SCB_EXPECT_PPR_BUSFREE = 4096,
1: +  SCB_PKT_SENSE = 8192,
1: +  SCB_EXTERNAL_RESET = 16384,
1: +  SCB_ON_COL_LIST = 32768,
1: +  SCB_SILENT___2 = 65536,
1:  } scb_flag___2;
1:  
1:  struct ahd_softc;
1: @@ -85608,90 +86707,90 @@ struct ahd_softc;
1:  struct scb_platform_data___2;
1:  
1:  struct scb___2 {
1: -	struct hardware_scb___2 *hscb;
1: -	union {
1: -		struct {
1: -			struct scb___2 *sle_next;
1: -		} sle;
1: -		struct {
1: -			struct scb___2 *le_next;
1: -			struct scb___2 **le_prev;
1: -		} le;
1: -		struct {
1: -			struct scb___2 *tqe_next;
1: -			struct scb___2 **tqe_prev;
1: -		} tqe;
1: -	} links;
1: -	union {
1: -		struct {
1: -			struct scb___2 *sle_next;
1: -		} sle;
1: -		struct {
1: -			struct scb___2 *le_next;
1: -			struct scb___2 **le_prev;
1: -		} le;
1: -		struct {
1: -			struct scb___2 *tqe_next;
1: -			struct scb___2 **tqe_prev;
1: -		} tqe;
1: -	} links2;
1: -	struct scb___2 *col_scb;
1: -	ahd_io_ctx_t io_ctx;
1: -	struct ahd_softc *ahd_softc;
1: -	scb_flag___2 flags;
1: -	struct scb_platform_data___2 *platform_data;
1: -	struct map_node *hscb_map;
1: -	struct map_node *sg_map;
1: -	struct map_node *sense_map;
1: -	void *sg_list;
1: -	uint8_t *sense_data;
1: -	dma_addr_t sg_list_busaddr;
1: -	dma_addr_t sense_busaddr;
1: -	u_int sg_count;
1: -	u_int crc_retry_count;
1: +  struct hardware_scb___2 *hscb;
1: +  union {
1: +    struct {
1: +      struct scb___2 *sle_next;
1: +    } sle;
1: +    struct {
1: +      struct scb___2 *le_next;
1: +      struct scb___2 **le_prev;
1: +    } le;
1: +    struct {
1: +      struct scb___2 *tqe_next;
1: +      struct scb___2 **tqe_prev;
1: +    } tqe;
1: +  } links;
1: +  union {
1: +    struct {
1: +      struct scb___2 *sle_next;
1: +    } sle;
1: +    struct {
1: +      struct scb___2 *le_next;
1: +      struct scb___2 **le_prev;
1: +    } le;
1: +    struct {
1: +      struct scb___2 *tqe_next;
1: +      struct scb___2 **tqe_prev;
1: +    } tqe;
1: +  } links2;
1: +  struct scb___2 *col_scb;
1: +  ahd_io_ctx_t io_ctx;
1: +  struct ahd_softc *ahd_softc;
1: +  scb_flag___2 flags;
1: +  struct scb_platform_data___2 *platform_data;
1: +  struct map_node *hscb_map;
1: +  struct map_node *sg_map;
1: +  struct map_node *sense_map;
1: +  void *sg_list;
1: +  uint8_t *sense_data;
1: +  dma_addr_t sg_list_busaddr;
1: +  dma_addr_t sense_busaddr;
1: +  u_int sg_count;
1: +  u_int crc_retry_count;
1:  };
1:  
1:  struct scb_tailq___2 {
1: -	struct scb___2 *tqh_first;
1: -	struct scb___2 **tqh_last;
1: +  struct scb___2 *tqh_first;
1: +  struct scb___2 **tqh_last;
1:  };
1:  
1:  struct scb_list {
1: -	struct scb___2 *lh_first;
1: +  struct scb___2 *lh_first;
1:  };
1:  
1:  struct scb_data___2 {
1: -	struct scb_tailq___2 free_scbs;
1: -	struct scb_list free_scb_lists[1024];
1: -	struct scb_list any_dev_free_scb_list;
1: -	struct scb___2 *scbindex[512];
1: -	bus_dma_tag_t___2 hscb_dmat;
1: -	bus_dma_tag_t___2 sg_dmat;
1: -	bus_dma_tag_t___2 sense_dmat;
1: -	struct {
1: -		struct map_node *slh_first;
1: -	} hscb_maps;
1: -	struct {
1: -		struct map_node *slh_first;
1: -	} sg_maps;
1: -	struct {
1: -		struct map_node *slh_first;
1: -	} sense_maps;
1: -	int scbs_left;
1: -	int sgs_left;
1: -	int sense_left;
1: -	uint16_t numscbs;
1: -	uint16_t maxhscbs;
1: -	uint8_t init_level;
1: +  struct scb_tailq___2 free_scbs;
1: +  struct scb_list free_scb_lists[1024];
1: +  struct scb_list any_dev_free_scb_list;
1: +  struct scb___2 *scbindex[512];
1: +  bus_dma_tag_t___2 hscb_dmat;
1: +  bus_dma_tag_t___2 sg_dmat;
1: +  bus_dma_tag_t___2 sense_dmat;
1: +  struct {
1: +    struct map_node *slh_first;
1: +  } hscb_maps;
1: +  struct {
1: +    struct map_node *slh_first;
1: +  } sg_maps;
1: +  struct {
1: +    struct map_node *slh_first;
1: +  } sense_maps;
1: +  int scbs_left;
1: +  int sgs_left;
1: +  int sense_left;
1: +  uint16_t numscbs;
1: +  uint16_t maxhscbs;
1: +  uint8_t init_level;
1:  };
1:  
1:  typedef enum {
1: -	AHD_MODE_DFF0 = 0,
1: -	AHD_MODE_DFF1 = 1,
1: -	AHD_MODE_CCHAN = 2,
1: -	AHD_MODE_SCSI = 3,
1: -	AHD_MODE_CFG = 4,
1: -	AHD_MODE_UNKNOWN = 5,
1: +  AHD_MODE_DFF0 = 0,
1: +  AHD_MODE_DFF1 = 1,
1: +  AHD_MODE_CCHAN = 2,
1: +  AHD_MODE_SCSI = 3,
1: +  AHD_MODE_CFG = 4,
1: +  AHD_MODE_UNKNOWN = 5,
1:  } ahd_mode;
1:  
1:  typedef void (*ahd_bus_intr_t)(struct ahd_softc *);
1: @@ -85699,49 +86798,49 @@ typedef void (*ahd_bus_intr_t)(struct ahd_softc *);
1:  struct ahd_tmode_lstate;
1:  
1:  typedef enum {
1: -	MSG_FLAG_NONE = 0,
1: -	MSG_FLAG_EXPECT_PPR_BUSFREE = 1,
1: -	MSG_FLAG_IU_REQ_CHANGED = 2,
1: -	MSG_FLAG_EXPECT_IDE_BUSFREE = 4,
1: -	MSG_FLAG_EXPECT_QASREJ_BUSFREE = 8,
1: -	MSG_FLAG_PACKETIZED = 16,
1: +  MSG_FLAG_NONE = 0,
1: +  MSG_FLAG_EXPECT_PPR_BUSFREE = 1,
1: +  MSG_FLAG_IU_REQ_CHANGED = 2,
1: +  MSG_FLAG_EXPECT_IDE_BUSFREE = 4,
1: +  MSG_FLAG_EXPECT_QASREJ_BUSFREE = 8,
1: +  MSG_FLAG_PACKETIZED = 16,
1:  } ahd_msg_flags;
1:  
1:  typedef enum {
1: -	MSG_TYPE_NONE___2 = 0,
1: -	MSG_TYPE_INITIATOR_MSGOUT___2 = 1,
1: -	MSG_TYPE_INITIATOR_MSGIN___2 = 2,
1: -	MSG_TYPE_TARGET_MSGOUT___2 = 3,
1: -	MSG_TYPE_TARGET_MSGIN___2 = 4,
1: +  MSG_TYPE_NONE___2 = 0,
1: +  MSG_TYPE_INITIATOR_MSGOUT___2 = 1,
1: +  MSG_TYPE_INITIATOR_MSGIN___2 = 2,
1: +  MSG_TYPE_TARGET_MSGOUT___2 = 3,
1: +  MSG_TYPE_TARGET_MSGIN___2 = 4,
1:  } ahd_msg_type;
1:  
1:  struct ahd_suspend_channel_state {
1: -	uint8_t scsiseq;
1: -	uint8_t sxfrctl0;
1: -	uint8_t sxfrctl1;
1: -	uint8_t simode0;
1: -	uint8_t simode1;
1: -	uint8_t seltimer;
1: -	uint8_t seqctl;
1: +  uint8_t scsiseq;
1: +  uint8_t sxfrctl0;
1: +  uint8_t sxfrctl1;
1: +  uint8_t simode0;
1: +  uint8_t simode1;
1: +  uint8_t seltimer;
1: +  uint8_t seqctl;
1:  };
1:  
1:  struct ahd_suspend_pci_state {
1: -	uint32_t devconfig;
1: -	uint8_t command;
1: -	uint8_t csize_lattime;
1: +  uint32_t devconfig;
1: +  uint8_t command;
1: +  uint8_t csize_lattime;
1:  };
1:  
1:  struct ahd_suspend_state {
1: -	struct ahd_suspend_channel_state channel[2];
1: -	struct ahd_suspend_pci_state pci_state;
1: -	uint8_t optionmode;
1: -	uint8_t dscommand0;
1: -	uint8_t dspcistatus;
1: -	uint8_t crccontrol1;
1: -	uint8_t scbbaddr;
1: -	uint8_t dff_thrsh;
1: -	uint8_t *scratch_ram;
1: -	uint8_t *btt;
1: +  struct ahd_suspend_channel_state channel[2];
1: +  struct ahd_suspend_pci_state pci_state;
1: +  uint8_t optionmode;
1: +  uint8_t dscommand0;
1: +  uint8_t dspcistatus;
1: +  uint8_t crccontrol1;
1: +  uint8_t scbbaddr;
1: +  uint8_t dff_thrsh;
1: +  uint8_t *scratch_ram;
1: +  uint8_t *btt;
1:  };
1:  
1:  struct ahd_platform_data;
1: @@ -85751,582 +86850,580 @@ struct ahd_tmode_tstate;
1:  struct ahd_completion;
1:  
1:  struct ahd_softc {
1: -	bus_space_tag_t tags[2];
1: -	bus_space_handle_t bshs[2];
1: -	struct scb_data___2 scb_data;
1: -	struct hardware_scb___2 *next_queued_hscb;
1: -	struct map_node *next_queued_hscb_map;
1: -	struct {
1: -		struct scb___2 *lh_first;
1: -	} pending_scbs;
1: -	ahd_mode dst_mode;
1: -	ahd_mode src_mode;
1: -	ahd_mode saved_dst_mode;
1: -	ahd_mode saved_src_mode;
1: -	struct ahd_platform_data *platform_data;
1: -	ahd_dev_softc_t dev_softc;
1: -	ahd_bus_intr_t bus_intr;
1: -	struct ahd_tmode_tstate *enabled_targets[16];
1: -	struct ahd_tmode_lstate *black_hole;
1: -	struct ahd_tmode_lstate *pending_device;
1: -	struct timer_list stat_timer;
1: -	u_int cmdcmplt_bucket;
1: -	uint32_t cmdcmplt_counts[4];
1: -	uint32_t cmdcmplt_total;
1: -	ahd_chip chip;
1: -	ahd_feature features;
1: -	ahd_bug bugs;
1: -	ahd_flag flags;
1: -	struct seeprom_config *seep_config;
1: -	struct ahd_completion *qoutfifo;
1: -	uint16_t qoutfifonext;
1: -	uint16_t qoutfifonext_valid_tag;
1: -	uint16_t qinfifonext;
1: -	uint16_t qinfifo[512];
1: -	uint16_t qfreeze_cnt;
1: -	uint8_t unpause;
1: -	uint8_t pause;
1: -	struct cs *critical_sections;
1: -	u_int num_critical_sections;
1: -	uint8_t *overrun_buf;
1: -	struct {
1: -		struct ahd_softc *tqe_next;
1: -		struct ahd_softc **tqe_prev;
1: -	} links;
1: -	char channel;
1: -	uint8_t our_id;
1: -	struct target_cmd *targetcmds;
1: -	uint8_t tqinfifonext;
1: -	uint8_t hs_mailbox;
1: -	uint8_t send_msg_perror;
1: -	ahd_msg_flags msg_flags;
1: -	ahd_msg_type msg_type;
1: -	uint8_t msgout_buf[12];
1: -	uint8_t msgin_buf[12];
1: -	u_int msgout_len;
1: -	u_int msgout_index;
1: -	u_int msgin_index;
1: -	bus_dma_tag_t___2 parent_dmat;
1: -	bus_dma_tag_t___2 shared_data_dmat;
1: -	struct map_node shared_data_map;
1: -	struct ahd_suspend_state suspend_state;
1: -	u_int enabled_luns;
1: -	u_int init_level;
1: -	u_int pci_cachesize;
1: -	uint8_t iocell_opts[4];
1: -	u_int stack_size;
1: -	uint16_t *saved_stack;
1: -	const char *description;
1: -	const char *bus_description;
1: -	char *name;
1: -	int unit;
1: -	int seltime;
1: -	u_int int_coalescing_timer;
1: -	u_int int_coalescing_maxcmds;
1: -	u_int int_coalescing_mincmds;
1: -	u_int int_coalescing_threshold;
1: -	u_int int_coalescing_stop_threshold;
1: -	uint16_t user_discenable;
1: -	uint16_t user_tagenable;
1: +  bus_space_tag_t tags[2];
1: +  bus_space_handle_t bshs[2];
1: +  struct scb_data___2 scb_data;
1: +  struct hardware_scb___2 *next_queued_hscb;
1: +  struct map_node *next_queued_hscb_map;
1: +  struct {
1: +    struct scb___2 *lh_first;
1: +  } pending_scbs;
1: +  ahd_mode dst_mode;
1: +  ahd_mode src_mode;
1: +  ahd_mode saved_dst_mode;
1: +  ahd_mode saved_src_mode;
1: +  struct ahd_platform_data *platform_data;
1: +  ahd_dev_softc_t dev_softc;
1: +  ahd_bus_intr_t bus_intr;
1: +  struct ahd_tmode_tstate *enabled_targets[16];
1: +  struct ahd_tmode_lstate *black_hole;
1: +  struct ahd_tmode_lstate *pending_device;
1: +  struct timer_list stat_timer;
1: +  u_int cmdcmplt_bucket;
1: +  uint32_t cmdcmplt_counts[4];
1: +  uint32_t cmdcmplt_total;
1: +  ahd_chip chip;
1: +  ahd_feature features;
1: +  ahd_bug bugs;
1: +  ahd_flag flags;
1: +  struct seeprom_config *seep_config;
1: +  struct ahd_completion *qoutfifo;
1: +  uint16_t qoutfifonext;
1: +  uint16_t qoutfifonext_valid_tag;
1: +  uint16_t qinfifonext;
1: +  uint16_t qinfifo[512];
1: +  uint16_t qfreeze_cnt;
1: +  uint8_t unpause;
1: +  uint8_t pause;
1: +  struct cs *critical_sections;
1: +  u_int num_critical_sections;
1: +  uint8_t *overrun_buf;
1: +  struct {
1: +    struct ahd_softc *tqe_next;
1: +    struct ahd_softc **tqe_prev;
1: +  } links;
1: +  char channel;
1: +  uint8_t our_id;
1: +  struct target_cmd *targetcmds;
1: +  uint8_t tqinfifonext;
1: +  uint8_t hs_mailbox;
1: +  uint8_t send_msg_perror;
1: +  ahd_msg_flags msg_flags;
1: +  ahd_msg_type msg_type;
1: +  uint8_t msgout_buf[12];
1: +  uint8_t msgin_buf[12];
1: +  u_int msgout_len;
1: +  u_int msgout_index;
1: +  u_int msgin_index;
1: +  bus_dma_tag_t___2 parent_dmat;
1: +  bus_dma_tag_t___2 shared_data_dmat;
1: +  struct map_node shared_data_map;
1: +  struct ahd_suspend_state suspend_state;
1: +  u_int enabled_luns;
1: +  u_int init_level;
1: +  u_int pci_cachesize;
1: +  uint8_t iocell_opts[4];
1: +  u_int stack_size;
1: +  uint16_t *saved_stack;
1: +  const char *description;
1: +  const char *bus_description;
1: +  char *name;
1: +  int unit;
1: +  int seltime;
1: +  u_int int_coalescing_timer;
1: +  u_int int_coalescing_maxcmds;
1: +  u_int int_coalescing_mincmds;
1: +  u_int int_coalescing_threshold;
1: +  u_int int_coalescing_stop_threshold;
1: +  uint16_t user_discenable;
1: +  uint16_t user_tagenable;
1:  };
1:  
1:  struct ahd_linux_device;
1:  
1:  struct scb_platform_data___2 {
1: -	struct ahd_linux_device *dev;
1: -	dma_addr_t buf_busaddr;
1: -	uint32_t xfer_len;
1: -	uint32_t sense_resid;
1: +  struct ahd_linux_device *dev;
1: +  dma_addr_t buf_busaddr;
1: +  uint32_t xfer_len;
1: +  uint32_t sense_resid;
1:  };
1:  
1:  struct ahd_transinfo {
1: -	uint8_t protocol_version;
1: -	uint8_t transport_version;
1: -	uint8_t width;
1: -	uint8_t period;
1: -	uint8_t offset;
1: -	uint8_t ppr_options;
1: +  uint8_t protocol_version;
1: +  uint8_t transport_version;
1: +  uint8_t width;
1: +  uint8_t period;
1: +  uint8_t offset;
1: +  uint8_t ppr_options;
1:  };
1:  
1:  struct ahd_initiator_tinfo {
1: -	struct ahd_transinfo curr;
1: -	struct ahd_transinfo goal;
1: -	struct ahd_transinfo user;
1: +  struct ahd_transinfo curr;
1: +  struct ahd_transinfo goal;
1: +  struct ahd_transinfo user;
1:  };
1:  
1:  struct ahd_tmode_tstate {
1: -	struct ahd_tmode_lstate *enabled_luns[256];
1: -	struct ahd_initiator_tinfo transinfo[16];
1: -	uint16_t auto_negotiate;
1: -	uint16_t discenable;
1: -	uint16_t tagenable;
1: +  struct ahd_tmode_lstate *enabled_luns[256];
1: +  struct ahd_initiator_tinfo transinfo[16];
1: +  uint16_t auto_negotiate;
1: +  uint16_t discenable;
1: +  uint16_t tagenable;
1:  };
1:  
1:  struct ahd_phase_table_entry {
1: -	uint8_t phase;
1: -	uint8_t mesg_out;
1: -	const char *phasemsg;
1: +  uint8_t phase;
1: +  uint8_t mesg_out;
1: +  const char *phasemsg;
1:  };
1:  
1:  struct vpd_config {
1: -	uint8_t bios_flags;
1: -	uint8_t reserved_1[21];
1: -	uint8_t resource_type;
1: -	uint8_t resource_len[2];
1: -	uint8_t resource_data[8];
1: -	uint8_t vpd_tag;
1: -	uint16_t vpd_len;
1: -	uint8_t vpd_keyword[2];
1: -	uint8_t length;
1: -	uint8_t revision;
1: -	uint8_t device_flags;
1: -	uint8_t termination_menus[2];
1: -	uint8_t fifo_threshold;
1: -	uint8_t end_tag;
1: -	uint8_t vpd_checksum;
1: -	uint16_t default_target_flags;
1: -	uint16_t default_bios_flags;
1: -	uint16_t default_ctrl_flags;
1: -	uint8_t default_irq;
1: -	uint8_t pci_lattime;
1: -	uint8_t max_target;
1: -	uint8_t boot_lun;
1: -	uint16_t signature;
1: -	uint8_t reserved_2;
1: -	uint8_t checksum;
1: -	uint8_t reserved_3[4];
1: +  uint8_t bios_flags;
1: +  uint8_t reserved_1[21];
1: +  uint8_t resource_type;
1: +  uint8_t resource_len[2];
1: +  uint8_t resource_data[8];
1: +  uint8_t vpd_tag;
1: +  uint16_t vpd_len;
1: +  uint8_t vpd_keyword[2];
1: +  uint8_t length;
1: +  uint8_t revision;
1: +  uint8_t device_flags;
1: +  uint8_t termination_menus[2];
1: +  uint8_t fifo_threshold;
1: +  uint8_t end_tag;
1: +  uint8_t vpd_checksum;
1: +  uint16_t default_target_flags;
1: +  uint16_t default_bios_flags;
1: +  uint16_t default_ctrl_flags;
1: +  uint8_t default_irq;
1: +  uint8_t pci_lattime;
1: +  uint8_t max_target;
1: +  uint8_t boot_lun;
1: +  uint16_t signature;
1: +  uint8_t reserved_2;
1: +  uint8_t checksum;
1: +  uint8_t reserved_3[4];
1:  };
1:  
1:  typedef uint8_t ahd_mode_state;
1:  
1:  struct ahd_completion {
1: -	uint16_t tag;
1: -	uint8_t sg_status;
1: -	uint8_t valid_tag;
1: +  uint16_t tag;
1: +  uint8_t sg_status;
1: +  uint8_t valid_tag;
1:  };
1:  
1:  struct ahd_platform_data {
1: -	struct scsi_target *starget[16];
1: -	spinlock_t spin_lock;
1: -	struct completion *eh_done;
1: -	struct Scsi_Host *host;
1: -	uint32_t irq;
1: -	uint32_t bios_address;
1: -	resource_size_t mem_busaddr;
1: +  struct scsi_target *starget[16];
1: +  spinlock_t spin_lock;
1: +  struct completion *eh_done;
1: +  struct Scsi_Host *host;
1: +  uint32_t irq;
1: +  uint32_t bios_address;
1: +  resource_size_t mem_busaddr;
1:  };
1:  
1:  struct ahd_devinfo {
1: -	int our_scsiid;
1: -	int target_offset;
1: -	uint16_t target_mask;
1: -	u_int target;
1: -	u_int lun;
1: -	char channel;
1: -	role_t role;
1: +  int our_scsiid;
1: +  int target_offset;
1: +  uint16_t target_mask;
1: +  u_int target;
1: +  u_int lun;
1: +  char channel;
1: +  role_t role;
1:  };
1:  
1:  typedef enum {
1: -	SEARCH_COMPLETE___2 = 0,
1: -	SEARCH_COUNT___2 = 1,
1: -	SEARCH_REMOVE___2 = 2,
1: -	SEARCH_PRINT = 3,
1: +  SEARCH_COMPLETE___2 = 0,
1: +  SEARCH_COUNT___2 = 1,
1: +  SEARCH_REMOVE___2 = 2,
1: +  SEARCH_PRINT = 3,
1:  } ahd_search_action;
1:  
1:  typedef enum {
1: -	AHD_NEG_TO_GOAL = 0,
1: -	AHD_NEG_IF_NON_ASYNC = 1,
1: -	AHD_NEG_ALWAYS = 2,
1: +  AHD_NEG_TO_GOAL = 0,
1: +  AHD_NEG_IF_NON_ASYNC = 1,
1: +  AHD_NEG_ALWAYS = 2,
1:  } ahd_neg_type;
1:  
1:  typedef enum {
1: -	AHD_QUEUE_NONE = 0,
1: -	AHD_QUEUE_BASIC = 1,
1: -	AHD_QUEUE_TAGGED = 2,
1: +  AHD_QUEUE_NONE = 0,
1: +  AHD_QUEUE_BASIC = 1,
1: +  AHD_QUEUE_TAGGED = 2,
1:  } ahd_queue_alg;
1:  
1:  typedef enum {
1: -	AHD_DEV_FREEZE_TIL_EMPTY = 2,
1: -	AHD_DEV_Q_BASIC = 16,
1: -	AHD_DEV_Q_TAGGED = 32,
1: -	AHD_DEV_PERIODIC_OTAG = 64,
1: +  AHD_DEV_FREEZE_TIL_EMPTY = 2,
1: +  AHD_DEV_Q_BASIC = 16,
1: +  AHD_DEV_Q_TAGGED = 32,
1: +  AHD_DEV_PERIODIC_OTAG = 64,
1:  } ahd_linux_dev_flags;
1:  
1:  struct ahd_linux_device {
1: -	struct {
1: -		struct ahd_linux_device *tqe_next;
1: -		struct ahd_linux_device **tqe_prev;
1: -	} links;
1: -	int active;
1: -	int openings;
1: -	u_int qfrozen;
1: -	u_long commands_issued;
1: -	u_int tag_success_count;
1: -	ahd_linux_dev_flags flags;
1: -	struct timer_list timer;
1: -	u_int maxtags;
1: -	u_int tags_on_last_queuefull;
1: -	u_int last_queuefull_same_count;
1: -	u_int commands_since_idle_or_otag;
1: +  struct {
1: +    struct ahd_linux_device *tqe_next;
1: +    struct ahd_linux_device **tqe_prev;
1: +  } links;
1: +  int active;
1: +  int openings;
1: +  u_int qfrozen;
1: +  u_long commands_issued;
1: +  u_int tag_success_count;
1: +  ahd_linux_dev_flags flags;
1: +  struct timer_list timer;
1: +  u_int maxtags;
1: +  u_int tags_on_last_queuefull;
1: +  u_int last_queuefull_same_count;
1: +  u_int commands_since_idle_or_otag;
1:  };
1:  
1:  struct ahd_hard_error_entry {
1: -	uint8_t errno;
1: -	const char *errmesg;
1: +  uint8_t errno;
1: +  const char *errmesg;
1:  };
1:  
1:  typedef int ahd_patch_func_t(struct ahd_softc *);
1:  
1:  struct patch___2 {
1: -	ahd_patch_func_t *patch_func;
1: -	uint32_t begin: 10;
1: -	uint32_t skip_instr: 10;
1: -	uint32_t skip_patch: 12;
1: +  ahd_patch_func_t *patch_func;
1: +  uint32_t begin : 10;
1: +  uint32_t skip_instr : 10;
1: +  uint32_t skip_patch : 12;
1:  };
1:  
1:  typedef enum {
1: -	AHDMSG_1B = 0,
1: -	AHDMSG_2B = 1,
1: -	AHDMSG_EXT = 2,
1: +  AHDMSG_1B = 0,
1: +  AHDMSG_2B = 1,
1: +  AHDMSG_EXT = 2,
1:  } ahd_msgtype;
1:  
1:  typedef int ahd_device_setup_t(struct ahd_softc *);
1:  
1:  struct ahd_pci_identity {
1: -	uint64_t full_id;
1: -	uint64_t id_mask;
1: -	const char *name;
1: -	ahd_device_setup_t *setup;
1: +  uint64_t full_id;
1: +  uint64_t id_mask;
1: +  const char *name;
1: +  ahd_device_setup_t *setup;
1:  };
1:  
1: -typedef struct {
1: -	uint16_t tag_commands[16];
1: -} adapter_tag_info_t___2;
1: +typedef struct { uint16_t tag_commands[16]; } adapter_tag_info_t___2;
1:  
1:  struct ahd_linux_iocell_opts {
1: -	uint8_t precomp;
1: -	uint8_t slewrate;
1: -	uint8_t amplitude;
1: +  uint8_t precomp;
1: +  uint8_t slewrate;
1: +  uint8_t amplitude;
1:  };
1:  
1:  typedef enum {
1: -	AHD_POWER_STATE_D0 = 0,
1: -	AHD_POWER_STATE_D1 = 1,
1: -	AHD_POWER_STATE_D2 = 2,
1: -	AHD_POWER_STATE_D3 = 3,
1: +  AHD_POWER_STATE_D0 = 0,
1: +  AHD_POWER_STATE_D1 = 1,
1: +  AHD_POWER_STATE_D2 = 2,
1: +  AHD_POWER_STATE_D3 = 3,
1:  } ahd_power_state;
1:  
1:  enum {
1: -	AAC_ENABLE_INTERRUPT = 0,
1: -	AAC_DISABLE_INTERRUPT = 1,
1: -	AAC_ENABLE_MSIX = 2,
1: -	AAC_DISABLE_MSIX = 3,
1: -	AAC_CLEAR_AIF_BIT = 4,
1: -	AAC_CLEAR_SYNC_BIT = 5,
1: -	AAC_ENABLE_INTX = 6,
1: +  AAC_ENABLE_INTERRUPT = 0,
1: +  AAC_DISABLE_INTERRUPT = 1,
1: +  AAC_ENABLE_MSIX = 2,
1: +  AAC_DISABLE_MSIX = 3,
1: +  AAC_CLEAR_AIF_BIT = 4,
1: +  AAC_CLEAR_SYNC_BIT = 5,
1: +  AAC_ENABLE_INTX = 6,
1:  };
1:  
1:  struct aac_hba_sgl {
1: -	u32 addr_lo;
1: -	u32 addr_hi;
1: -	u32 len;
1: -	u32 flags;
1: +  u32 addr_lo;
1: +  u32 addr_hi;
1: +  u32 len;
1: +  u32 flags;
1:  };
1:  
1:  enum {
1: -	HBA_IU_TYPE_SCSI_CMD_REQ = 64,
1: -	HBA_IU_TYPE_SCSI_TM_REQ = 65,
1: -	HBA_IU_TYPE_SATA_REQ = 66,
1: -	HBA_IU_TYPE_RESP = 96,
1: -	HBA_IU_TYPE_COALESCED_RESP = 97,
1: -	HBA_IU_TYPE_INT_COALESCING_CFG_REQ = 112,
1: +  HBA_IU_TYPE_SCSI_CMD_REQ = 64,
1: +  HBA_IU_TYPE_SCSI_TM_REQ = 65,
1: +  HBA_IU_TYPE_SATA_REQ = 66,
1: +  HBA_IU_TYPE_RESP = 96,
1: +  HBA_IU_TYPE_COALESCED_RESP = 97,
1: +  HBA_IU_TYPE_INT_COALESCING_CFG_REQ = 112,
1:  };
1:  
1:  enum {
1: -	HBA_RESP_SVCRES_TASK_COMPLETE = 0,
1: -	HBA_RESP_SVCRES_FAILURE = 1,
1: -	HBA_RESP_SVCRES_TMF_COMPLETE = 2,
1: -	HBA_RESP_SVCRES_TMF_SUCCEEDED = 3,
1: -	HBA_RESP_SVCRES_TMF_REJECTED = 4,
1: -	HBA_RESP_SVCRES_TMF_LUN_INVALID = 5,
1: +  HBA_RESP_SVCRES_TASK_COMPLETE = 0,
1: +  HBA_RESP_SVCRES_FAILURE = 1,
1: +  HBA_RESP_SVCRES_TMF_COMPLETE = 2,
1: +  HBA_RESP_SVCRES_TMF_SUCCEEDED = 3,
1: +  HBA_RESP_SVCRES_TMF_REJECTED = 4,
1: +  HBA_RESP_SVCRES_TMF_LUN_INVALID = 5,
1:  };
1:  
1:  struct aac_hba_cmd_req {
1: -	u8 iu_type;
1: -	u8 byte1;
1: -	u8 reply_qid;
1: -	u8 reserved1;
1: -	__le32 it_nexus;
1: -	__le32 request_id;
1: -	__le32 tweak_value_lo;
1: -	u8 cdb[16];
1: -	u8 lun[8];
1: -	__le32 data_length;
1: -	u8 attr_prio;
1: -	u8 emb_data_desc_count;
1: -	__le16 dek_index;
1: -	__le32 error_ptr_lo;
1: -	__le32 error_ptr_hi;
1: -	__le32 error_length;
1: -	__le32 tweak_value_hi;
1: -	struct aac_hba_sgl sge[92];
1: +  u8 iu_type;
1: +  u8 byte1;
1: +  u8 reply_qid;
1: +  u8 reserved1;
1: +  __le32 it_nexus;
1: +  __le32 request_id;
1: +  __le32 tweak_value_lo;
1: +  u8 cdb[16];
1: +  u8 lun[8];
1: +  __le32 data_length;
1: +  u8 attr_prio;
1: +  u8 emb_data_desc_count;
1: +  __le16 dek_index;
1: +  __le32 error_ptr_lo;
1: +  __le32 error_ptr_hi;
1: +  __le32 error_length;
1: +  __le32 tweak_value_hi;
1: +  struct aac_hba_sgl sge[92];
1:  };
1:  
1:  struct aac_hba_tm_req {
1: -	u8 iu_type;
1: -	u8 reply_qid;
1: -	u8 tmf;
1: -	u8 reserved1;
1: -	__le32 it_nexus;
1: -	u8 lun[8];
1: -	__le32 request_id;
1: -	__le32 reserved2;
1: -	__le32 managed_request_id;
1: -	__le32 reserved3;
1: -	__le32 error_ptr_lo;
1: -	__le32 error_ptr_hi;
1: -	__le32 error_length;
1: +  u8 iu_type;
1: +  u8 reply_qid;
1: +  u8 tmf;
1: +  u8 reserved1;
1: +  __le32 it_nexus;
1: +  u8 lun[8];
1: +  __le32 request_id;
1: +  __le32 reserved2;
1: +  __le32 managed_request_id;
1: +  __le32 reserved3;
1: +  __le32 error_ptr_lo;
1: +  __le32 error_ptr_hi;
1: +  __le32 error_length;
1:  };
1:  
1:  struct aac_hba_reset_req {
1: -	u8 iu_type;
1: -	u8 reset_type;
1: -	u8 reply_qid;
1: -	u8 reserved1;
1: -	__le32 it_nexus;
1: -	__le32 request_id;
1: -	__le32 error_ptr_lo;
1: -	__le32 error_ptr_hi;
1: -	__le32 error_length;
1: +  u8 iu_type;
1: +  u8 reset_type;
1: +  u8 reply_qid;
1: +  u8 reserved1;
1: +  __le32 it_nexus;
1: +  __le32 request_id;
1: +  __le32 error_ptr_lo;
1: +  __le32 error_ptr_hi;
1: +  __le32 error_length;
1:  };
1:  
1:  struct aac_hba_resp {
1: -	u8 iu_type;
1: -	u8 reserved1[3];
1: -	__le32 request_identifier;
1: -	__le32 reserved2;
1: -	u8 service_response;
1: -	u8 status;
1: -	u8 datapres;
1: -	u8 sense_response_data_len;
1: -	__le32 residual_count;
1: -	u8 sense_response_buf[32];
1: +  u8 iu_type;
1: +  u8 reserved1[3];
1: +  __le32 request_identifier;
1: +  __le32 reserved2;
1: +  u8 service_response;
1: +  u8 status;
1: +  u8 datapres;
1: +  u8 sense_response_data_len;
1: +  __le32 residual_count;
1: +  u8 sense_response_buf[32];
1:  };
1:  
1:  struct aac_native_hba {
1: -	union {
1: -		struct aac_hba_cmd_req cmd;
1: -		struct aac_hba_tm_req tmr;
1: -		u8 cmd_bytes[1536];
1: -	} cmd;
1: -	union {
1: -		struct aac_hba_resp err;
1: -		u8 resp_bytes[512];
1: -	} resp;
1: +  union {
1: +    struct aac_hba_cmd_req cmd;
1: +    struct aac_hba_tm_req tmr;
1: +    u8 cmd_bytes[1536];
1: +  } cmd;
1: +  union {
1: +    struct aac_hba_resp err;
1: +    u8 resp_bytes[512];
1: +  } resp;
1:  };
1:  
1:  struct _ciss_lun {
1: -	u8 tid[3];
1: -	u8 bus;
1: -	u8 level3[2];
1: -	u8 level2[2];
1: -	u8 node_ident[16];
1: +  u8 tid[3];
1: +  u8 bus;
1: +  u8 level3[2];
1: +  u8 level2[2];
1: +  u8 node_ident[16];
1:  };
1:  
1:  struct aac_ciss_phys_luns_resp {
1: -	u8 list_length[4];
1: -	u8 resp_flag;
1: -	u8 reserved[3];
1: -	struct _ciss_lun lun[1];
1: +  u8 list_length[4];
1: +  u8 resp_flag;
1: +  u8 reserved[3];
1: +  struct _ciss_lun lun[1];
1:  };
1:  
1:  struct aac_ciss_identify_pd {
1: -	u8 scsi_bus;
1: -	u8 scsi_id;
1: -	u16 block_size;
1: -	u32 total_blocks;
1: -	u32 reserved_blocks;
1: -	u8 model[40];
1: -	u8 serial_number[40];
1: -	u8 firmware_revision[8];
1: -	u8 scsi_inquiry_bits;
1: -	u8 compaq_drive_stamp;
1: -	u8 last_failure_reason;
1: -	u8 flags;
1: -	u8 more_flags;
1: -	u8 scsi_lun;
1: -	u8 yet_more_flags;
1: -	u8 even_more_flags;
1: -	u32 spi_speed_rules;
1: -	u8 phys_connector[2];
1: -	u8 phys_box_on_bus;
1: -	u8 phys_bay_in_box;
1: -	u32 rpm;
1: -	u8 device_type;
1: -	u8 sata_version;
1: -	u64 big_total_block_count;
1: -	u64 ris_starting_lba;
1: -	u32 ris_size;
1: -	u8 wwid[20];
1: -	u8 controller_phy_map[32];
1: -	u16 phy_count;
1: -	u8 phy_connected_dev_type[256];
1: -	u8 phy_to_drive_bay_num[256];
1: -	u16 phy_to_attached_dev_index[256];
1: -	u8 box_index;
1: -	u8 spitfire_support;
1: -	u16 extra_physical_drive_flags;
1: -	u8 negotiated_link_rate[256];
1: -	u8 phy_to_phy_map[256];
1: -	u8 redundant_path_present_map;
1: -	u8 redundant_path_failure_map;
1: -	u8 active_path_number;
1: -	u16 alternate_paths_phys_connector[8];
1: -	u8 alternate_paths_phys_box_on_port[8];
1: -	u8 multi_lun_device_lun_count;
1: -	u8 minimum_good_fw_revision[8];
1: -	u8 unique_inquiry_bytes[20];
1: -	u8 current_temperature_degreesC;
1: -	u8 temperature_threshold_degreesC;
1: -	u8 max_temperature_degreesC;
1: -	u8 logical_blocks_per_phys_block_exp;
1: -	u16 current_queue_depth_limit;
1: -	u8 switch_name[10];
1: -	u16 switch_port;
1: -	u8 alternate_paths_switch_name[40];
1: -	u8 alternate_paths_switch_port[8];
1: -	u16 power_on_hours;
1: -	u16 percent_endurance_used;
1: -	u8 drive_authentication;
1: -	u8 smart_carrier_authentication;
1: -	u8 smart_carrier_app_fw_version;
1: -	u8 smart_carrier_bootloader_fw_version;
1: -	u8 SanitizeSecureEraseSupport;
1: -	u8 DriveKeyFlags;
1: -	u8 encryption_key_name[64];
1: -	u32 misc_drive_flags;
1: -	u16 dek_index;
1: -	u16 drive_encryption_flags;
1: -	u8 sanitize_maximum_time[6];
1: -	u8 connector_info_mode;
1: -	u8 connector_info_number[4];
1: -	u8 long_connector_name[64];
1: -	u8 device_unique_identifier[16];
1: -	u8 padto_2K[17];
1: +  u8 scsi_bus;
1: +  u8 scsi_id;
1: +  u16 block_size;
1: +  u32 total_blocks;
1: +  u32 reserved_blocks;
1: +  u8 model[40];
1: +  u8 serial_number[40];
1: +  u8 firmware_revision[8];
1: +  u8 scsi_inquiry_bits;
1: +  u8 compaq_drive_stamp;
1: +  u8 last_failure_reason;
1: +  u8 flags;
1: +  u8 more_flags;
1: +  u8 scsi_lun;
1: +  u8 yet_more_flags;
1: +  u8 even_more_flags;
1: +  u32 spi_speed_rules;
1: +  u8 phys_connector[2];
1: +  u8 phys_box_on_bus;
1: +  u8 phys_bay_in_box;
1: +  u32 rpm;
1: +  u8 device_type;
1: +  u8 sata_version;
1: +  u64 big_total_block_count;
1: +  u64 ris_starting_lba;
1: +  u32 ris_size;
1: +  u8 wwid[20];
1: +  u8 controller_phy_map[32];
1: +  u16 phy_count;
1: +  u8 phy_connected_dev_type[256];
1: +  u8 phy_to_drive_bay_num[256];
1: +  u16 phy_to_attached_dev_index[256];
1: +  u8 box_index;
1: +  u8 spitfire_support;
1: +  u16 extra_physical_drive_flags;
1: +  u8 negotiated_link_rate[256];
1: +  u8 phy_to_phy_map[256];
1: +  u8 redundant_path_present_map;
1: +  u8 redundant_path_failure_map;
1: +  u8 active_path_number;
1: +  u16 alternate_paths_phys_connector[8];
1: +  u8 alternate_paths_phys_box_on_port[8];
1: +  u8 multi_lun_device_lun_count;
1: +  u8 minimum_good_fw_revision[8];
1: +  u8 unique_inquiry_bytes[20];
1: +  u8 current_temperature_degreesC;
1: +  u8 temperature_threshold_degreesC;
1: +  u8 max_temperature_degreesC;
1: +  u8 logical_blocks_per_phys_block_exp;
1: +  u16 current_queue_depth_limit;
1: +  u8 switch_name[10];
1: +  u16 switch_port;
1: +  u8 alternate_paths_switch_name[40];
1: +  u8 alternate_paths_switch_port[8];
1: +  u16 power_on_hours;
1: +  u16 percent_endurance_used;
1: +  u8 drive_authentication;
1: +  u8 smart_carrier_authentication;
1: +  u8 smart_carrier_app_fw_version;
1: +  u8 smart_carrier_bootloader_fw_version;
1: +  u8 SanitizeSecureEraseSupport;
1: +  u8 DriveKeyFlags;
1: +  u8 encryption_key_name[64];
1: +  u32 misc_drive_flags;
1: +  u16 dek_index;
1: +  u16 drive_encryption_flags;
1: +  u8 sanitize_maximum_time[6];
1: +  u8 connector_info_mode;
1: +  u8 connector_info_number[4];
1: +  u8 long_connector_name[64];
1: +  u8 device_unique_identifier[16];
1: +  u8 padto_2K[17];
1:  } __attribute__((packed));
1:  
1:  struct diskparm {
1: -	int heads;
1: -	int sectors;
1: -	int cylinders;
1: +  int heads;
1: +  int sectors;
1: +  int cylinders;
1:  };
1:  
1:  struct aac_entry {
1: -	__le32 size;
1: -	__le32 addr;
1: +  __le32 size;
1: +  __le32 addr;
1:  };
1:  
1:  struct aac_qhdr {
1: -	__le64 header_addr;
1: -	__le32 *producer;
1: -	__le32 *consumer;
1: +  __le64 header_addr;
1: +  __le32 *producer;
1: +  __le32 *consumer;
1:  };
1:  
1:  struct aac_fibhdr {
1: -	__le32 XferState;
1: -	__le16 Command;
1: -	u8 StructType;
1: -	u8 Unused;
1: -	__le16 Size;
1: -	__le16 SenderSize;
1: -	__le32 SenderFibAddress;
1: -	union {
1: -		__le32 ReceiverFibAddress;
1: -		__le32 SenderFibAddressHigh;
1: -		__le32 TimeStamp;
1: -	} u;
1: -	__le32 Handle;
1: -	u32 Previous;
1: -	u32 Next;
1: +  __le32 XferState;
1: +  __le16 Command;
1: +  u8 StructType;
1: +  u8 Unused;
1: +  __le16 Size;
1: +  __le16 SenderSize;
1: +  __le32 SenderFibAddress;
1: +  union {
1: +    __le32 ReceiverFibAddress;
1: +    __le32 SenderFibAddressHigh;
1: +    __le32 TimeStamp;
1: +  } u;
1: +  __le32 Handle;
1: +  u32 Previous;
1: +  u32 Next;
1:  };
1:  
1:  struct hw_fib {
1: -	struct aac_fibhdr header;
1: -	u8 data[480];
1: +  struct aac_fibhdr header;
1: +  u8 data[480];
1:  };
1:  
1:  enum fib_xfer_state {
1: -	HostOwned = 1,
1: -	AdapterOwned = 2,
1: -	FibInitialized = 4,
1: -	FibEmpty = 8,
1: -	AllocatedFromPool = 16,
1: -	SentFromHost = 32,
1: -	SentFromAdapter = 64,
1: -	ResponseExpected = 128,
1: -	NoResponseExpected = 256,
1: -	AdapterProcessed = 512,
1: -	HostProcessed = 1024,
1: -	HighPriority = 2048,
1: -	NormalPriority = 4096,
1: -	Async = 8192,
1: -	AsyncIo = 8192,
1: -	PageFileIo = 16384,
1: -	ShutdownRequest = 32768,
1: -	LazyWrite = 65536,
1: -	AdapterMicroFib = 131072,
1: -	BIOSFibPath = 262144,
1: -	FastResponseCapable = 524288,
1: -	ApiFib = 1048576,
1: -	NoMoreAifDataAvailable = 2097152,
1: +  HostOwned = 1,
1: +  AdapterOwned = 2,
1: +  FibInitialized = 4,
1: +  FibEmpty = 8,
1: +  AllocatedFromPool = 16,
1: +  SentFromHost = 32,
1: +  SentFromAdapter = 64,
1: +  ResponseExpected = 128,
1: +  NoResponseExpected = 256,
1: +  AdapterProcessed = 512,
1: +  HostProcessed = 1024,
1: +  HighPriority = 2048,
1: +  NormalPriority = 4096,
1: +  Async = 8192,
1: +  AsyncIo = 8192,
1: +  PageFileIo = 16384,
1: +  ShutdownRequest = 32768,
1: +  LazyWrite = 65536,
1: +  AdapterMicroFib = 131072,
1: +  BIOSFibPath = 262144,
1: +  FastResponseCapable = 524288,
1: +  ApiFib = 1048576,
1: +  NoMoreAifDataAvailable = 2097152,
1:  };
1:  
1:  struct _r7 {
1: -	__le32 init_struct_revision;
1: -	__le32 no_of_msix_vectors;
1: -	__le32 fsrev;
1: -	__le32 comm_header_address;
1: -	__le32 fast_io_comm_area_address;
1: -	__le32 adapter_fibs_physical_address;
1: -	__le32 adapter_fibs_virtual_address;
1: -	__le32 adapter_fibs_size;
1: -	__le32 adapter_fib_align;
1: -	__le32 printfbuf;
1: -	__le32 printfbufsiz;
1: -	__le32 host_phys_mem_pages;
1: -	__le32 host_elapsed_seconds;
1: -	__le32 init_flags;
1: -	__le32 max_io_commands;
1: -	__le32 max_io_size;
1: -	__le32 max_fib_size;
1: -	__le32 max_num_aif;
1: -	__le32 host_rrq_addr_low;
1: -	__le32 host_rrq_addr_high;
1: +  __le32 init_struct_revision;
1: +  __le32 no_of_msix_vectors;
1: +  __le32 fsrev;
1: +  __le32 comm_header_address;
1: +  __le32 fast_io_comm_area_address;
1: +  __le32 adapter_fibs_physical_address;
1: +  __le32 adapter_fibs_virtual_address;
1: +  __le32 adapter_fibs_size;
1: +  __le32 adapter_fib_align;
1: +  __le32 printfbuf;
1: +  __le32 printfbufsiz;
1: +  __le32 host_phys_mem_pages;
1: +  __le32 host_elapsed_seconds;
1: +  __le32 init_flags;
1: +  __le32 max_io_commands;
1: +  __le32 max_io_size;
1: +  __le32 max_fib_size;
1: +  __le32 max_num_aif;
1: +  __le32 host_rrq_addr_low;
1: +  __le32 host_rrq_addr_high;
1:  };
1:  
1:  struct _rrq {
1: -	__le32 host_addr_low;
1: -	__le32 host_addr_high;
1: -	__le16 msix_id;
1: -	__le16 element_count;
1: -	__le16 comp_thresh;
1: -	__le16 unused;
1: +  __le32 host_addr_low;
1: +  __le32 host_addr_high;
1: +  __le16 msix_id;
1: +  __le16 element_count;
1: +  __le16 comp_thresh;
1: +  __le16 unused;
1:  };
1:  
1:  struct _r8 {
1: -	__le32 init_struct_revision;
1: -	__le32 rr_queue_count;
1: -	__le32 host_elapsed_seconds;
1: -	__le32 init_flags;
1: -	__le32 max_io_size;
1: -	__le32 max_num_aif;
1: -	__le32 reserved1;
1: -	__le32 reserved2;
1: -	struct _rrq rrq[1];
1: +  __le32 init_struct_revision;
1: +  __le32 rr_queue_count;
1: +  __le32 host_elapsed_seconds;
1: +  __le32 init_flags;
1: +  __le32 max_io_size;
1: +  __le32 max_num_aif;
1: +  __le32 reserved1;
1: +  __le32 reserved2;
1: +  struct _rrq rrq[1];
1:  };
1:  
1:  union aac_init {
1: -	struct _r7 r7;
1: -	struct _r8 r8;
1: +  struct _r7 r7;
1: +  struct _r8 r8;
1:  };
1:  
1:  struct aac_dev;
1: @@ -86334,110 +87431,111 @@ struct aac_dev;
1:  struct fib;
1:  
1:  struct adapter_ops {
1: -	void (*adapter_interrupt)(struct aac_dev *);
1: -	void (*adapter_notify)(struct aac_dev *, u32);
1: -	void (*adapter_disable_int)(struct aac_dev *);
1: -	void (*adapter_enable_int)(struct aac_dev *);
1: -	int (*adapter_sync_cmd)(struct aac_dev *, u32, u32, u32, u32, u32, u32, u32, u32 *, u32 *, u32 *, u32 *, u32 *);
1: -	int (*adapter_check_health)(struct aac_dev *);
1: -	int (*adapter_restart)(struct aac_dev *, int, u8);
1: -	void (*adapter_start)(struct aac_dev *);
1: -	int (*adapter_ioremap)(struct aac_dev *, u32);
1: -	irq_handler_t adapter_intr;
1: -	int (*adapter_deliver)(struct fib *);
1: -	int (*adapter_bounds)(struct aac_dev *, struct scsi_cmnd *, u64);
1: -	int (*adapter_read)(struct fib *, struct scsi_cmnd *, u64, u32);
1: -	int (*adapter_write)(struct fib *, struct scsi_cmnd *, u64, u32, int);
1: -	int (*adapter_scsi)(struct fib *, struct scsi_cmnd *);
1: -	int (*adapter_comm)(struct aac_dev *, int);
1: +  void (*adapter_interrupt)(struct aac_dev *);
1: +  void (*adapter_notify)(struct aac_dev *, u32);
1: +  void (*adapter_disable_int)(struct aac_dev *);
1: +  void (*adapter_enable_int)(struct aac_dev *);
1: +  int (*adapter_sync_cmd)(struct aac_dev *, u32, u32, u32, u32, u32, u32, u32,
1: +                          u32 *, u32 *, u32 *, u32 *, u32 *);
1: +  int (*adapter_check_health)(struct aac_dev *);
1: +  int (*adapter_restart)(struct aac_dev *, int, u8);
1: +  void (*adapter_start)(struct aac_dev *);
1: +  int (*adapter_ioremap)(struct aac_dev *, u32);
1: +  irq_handler_t adapter_intr;
1: +  int (*adapter_deliver)(struct fib *);
1: +  int (*adapter_bounds)(struct aac_dev *, struct scsi_cmnd *, u64);
1: +  int (*adapter_read)(struct fib *, struct scsi_cmnd *, u64, u32);
1: +  int (*adapter_write)(struct fib *, struct scsi_cmnd *, u64, u32, int);
1: +  int (*adapter_scsi)(struct fib *, struct scsi_cmnd *);
1: +  int (*adapter_comm)(struct aac_dev *, int);
1:  };
1:  
1:  struct aac_adapter_info {
1: -	__le32 platform;
1: -	__le32 cpu;
1: -	__le32 subcpu;
1: -	__le32 clock;
1: -	__le32 execmem;
1: -	__le32 buffermem;
1: -	__le32 totalmem;
1: -	__le32 kernelrev;
1: -	__le32 kernelbuild;
1: -	__le32 monitorrev;
1: -	__le32 monitorbuild;
1: -	__le32 hwrev;
1: -	__le32 hwbuild;
1: -	__le32 biosrev;
1: -	__le32 biosbuild;
1: -	__le32 cluster;
1: -	__le32 clusterchannelmask;
1: -	__le32 serial[2];
1: -	__le32 battery;
1: -	__le32 options;
1: -	__le32 OEM;
1: +  __le32 platform;
1: +  __le32 cpu;
1: +  __le32 subcpu;
1: +  __le32 clock;
1: +  __le32 execmem;
1: +  __le32 buffermem;
1: +  __le32 totalmem;
1: +  __le32 kernelrev;
1: +  __le32 kernelbuild;
1: +  __le32 monitorrev;
1: +  __le32 monitorbuild;
1: +  __le32 hwrev;
1: +  __le32 hwbuild;
1: +  __le32 biosrev;
1: +  __le32 biosbuild;
1: +  __le32 cluster;
1: +  __le32 clusterchannelmask;
1: +  __le32 serial[2];
1: +  __le32 battery;
1: +  __le32 options;
1: +  __le32 OEM;
1:  };
1:  
1:  struct aac_supplement_adapter_info {
1: -	u8 adapter_type_text[18];
1: -	u8 pad[2];
1: -	__le32 flash_memory_byte_size;
1: -	__le32 flash_image_id;
1: -	__le32 max_number_ports;
1: -	__le32 version;
1: -	__le32 feature_bits;
1: -	u8 slot_number;
1: -	u8 reserved_pad0[3];
1: -	u8 build_date[12];
1: -	__le32 current_number_ports;
1: -	struct {
1: -		u8 assembly_pn[8];
1: -		u8 fru_pn[8];
1: -		u8 battery_fru_pn[8];
1: -		u8 ec_version_string[8];
1: -		u8 tsid[12];
1: -	} vpd_info;
1: -	__le32 flash_firmware_revision;
1: -	__le32 flash_firmware_build;
1: -	__le32 raid_type_morph_options;
1: -	__le32 flash_firmware_boot_revision;
1: -	__le32 flash_firmware_boot_build;
1: -	u8 mfg_pcba_serial_no[12];
1: -	u8 mfg_wwn_name[8];
1: -	__le32 supported_options2;
1: -	__le32 struct_expansion;
1: -	__le32 feature_bits3;
1: -	__le32 supported_performance_modes;
1: -	u8 host_bus_type;
1: -	u8 host_bus_width;
1: -	u16 host_bus_speed;
1: -	u8 max_rrc_drives;
1: -	u8 max_disk_xtasks;
1: -	u8 cpld_ver_loaded;
1: -	u8 cpld_ver_in_flash;
1: -	__le64 max_rrc_capacity;
1: -	__le32 compiled_max_hist_log_level;
1: -	u8 custom_board_name[12];
1: -	u16 supported_cntlr_mode;
1: -	u16 reserved_for_future16;
1: -	__le32 supported_options3;
1: -	__le16 virt_device_bus;
1: -	__le16 virt_device_target;
1: -	__le16 virt_device_lun;
1: -	__le16 unused;
1: -	__le32 reserved_for_future_growth[68];
1: +  u8 adapter_type_text[18];
1: +  u8 pad[2];
1: +  __le32 flash_memory_byte_size;
1: +  __le32 flash_image_id;
1: +  __le32 max_number_ports;
1: +  __le32 version;
1: +  __le32 feature_bits;
1: +  u8 slot_number;
1: +  u8 reserved_pad0[3];
1: +  u8 build_date[12];
1: +  __le32 current_number_ports;
1: +  struct {
1: +    u8 assembly_pn[8];
1: +    u8 fru_pn[8];
1: +    u8 battery_fru_pn[8];
1: +    u8 ec_version_string[8];
1: +    u8 tsid[12];
1: +  } vpd_info;
1: +  __le32 flash_firmware_revision;
1: +  __le32 flash_firmware_build;
1: +  __le32 raid_type_morph_options;
1: +  __le32 flash_firmware_boot_revision;
1: +  __le32 flash_firmware_boot_build;
1: +  u8 mfg_pcba_serial_no[12];
1: +  u8 mfg_wwn_name[8];
1: +  __le32 supported_options2;
1: +  __le32 struct_expansion;
1: +  __le32 feature_bits3;
1: +  __le32 supported_performance_modes;
1: +  u8 host_bus_type;
1: +  u8 host_bus_width;
1: +  u16 host_bus_speed;
1: +  u8 max_rrc_drives;
1: +  u8 max_disk_xtasks;
1: +  u8 cpld_ver_loaded;
1: +  u8 cpld_ver_in_flash;
1: +  __le64 max_rrc_capacity;
1: +  __le32 compiled_max_hist_log_level;
1: +  u8 custom_board_name[12];
1: +  u16 supported_cntlr_mode;
1: +  u16 reserved_for_future16;
1: +  __le32 supported_options3;
1: +  __le16 virt_device_bus;
1: +  __le16 virt_device_target;
1: +  __le16 virt_device_lun;
1: +  __le16 unused;
1: +  __le32 reserved_for_future_growth[68];
1:  };
1:  
1:  struct aac_msix_ctx {
1: -	int vector_no;
1: -	struct aac_dev *dev;
1: +  int vector_no;
1: +  struct aac_dev *dev;
1:  };
1:  
1:  struct aac_hba_map_info {
1: -	__le32 rmw_nexus;
1: -	u8 devtype;
1: -	s8 reset_state;
1: -	u16 qd_limit;
1: -	u32 scan_counter;
1: -	struct aac_ciss_identify_pd *safw_identify_resp;
1: +  __le32 rmw_nexus;
1: +  u8 devtype;
1: +  s8 reset_state;
1: +  u16 qd_limit;
1: +  u32 scan_counter;
1: +  struct aac_ciss_identify_pd *safw_identify_resp;
1:  };
1:  
1:  struct aac_queue_block;
1: @@ -86455,1168 +87553,1168 @@ struct src_registers;
1:  struct rx_inbound;
1:  
1:  struct aac_dev {
1: -	struct list_head entry;
1: -	const char *name;
1: -	int id;
1: -	unsigned int max_fib_size;
1: -	unsigned int sg_tablesize;
1: -	unsigned int max_num_aif;
1: -	unsigned int max_cmd_size;
1: -	dma_addr_t hw_fib_pa;
1: -	struct hw_fib *hw_fib_va;
1: -	struct hw_fib *aif_base_va;
1: -	struct fib *fibs;
1: -	struct fib *free_fib;
1: -	spinlock_t fib_lock;
1: -	struct mutex ioctl_mutex;
1: -	struct mutex scan_mutex;
1: -	struct aac_queue_block *queues;
1: -	struct list_head fib_list;
1: -	struct adapter_ops a_ops;
1: -	long unsigned int fsrev;
1: -	resource_size_t base_start;
1: -	resource_size_t dbg_base;
1: -	resource_size_t base_size;
1: -	resource_size_t dbg_size;
1: -	union aac_init *init;
1: -	dma_addr_t init_pa;
1: -	__le32 *host_rrq;
1: -	dma_addr_t host_rrq_pa;
1: -	u32 host_rrq_idx[32];
1: -	atomic_t rrq_outstanding[32];
1: -	u32 fibs_pushed_no;
1: -	struct pci_dev *pdev;
1: -	void *printfbuf;
1: -	void *comm_addr;
1: -	dma_addr_t comm_phys;
1: -	size_t comm_size;
1: -	struct Scsi_Host *scsi_host_ptr;
1: -	int maximum_num_containers;
1: -	int maximum_num_physicals;
1: -	int maximum_num_channels;
1: -	struct fsa_dev_info *fsa_dev;
1: -	struct task_struct *thread;
1: -	struct delayed_work safw_rescan_work;
1: -	struct delayed_work src_reinit_aif_worker;
1: -	int cardtype;
1: -	spinlock_t iq_lock;
1: -	union {
1: -		struct sa_registers *sa;
1: -		struct rx_registers *rx;
1: -		struct rkt_registers *rkt;
1: -		struct {
1: -			struct src_registers *bar0;
1: -			char *bar1;
1: -		} src;
1: -	} regs;
1: -	volatile void *base;
1: -	volatile void *dbg_base_mapped;
1: -	volatile struct rx_inbound *IndexRegs;
1: -	u32 OIMR;
1: -	u32 aif_thread;
1: -	struct aac_adapter_info adapter_info;
1: -	struct aac_supplement_adapter_info supplement_adapter_info;
1: -	u8 nondasd_support;
1: -	u8 jbod;
1: -	u8 cache_protected;
1: -	u8 dac_support;
1: -	u8 needs_dac;
1: -	u8 raid_scsi_mode;
1: -	u8 comm_interface;
1: -	u8 raw_io_interface;
1: -	u8 raw_io_64;
1: -	u8 printf_enabled;
1: -	u8 in_reset;
1: -	u8 in_soft_reset;
1: -	u8 msi;
1: -	u8 sa_firmware;
1: -	int management_fib_count;
1: -	spinlock_t manage_lock;
1: -	spinlock_t sync_lock;
1: -	int sync_mode;
1: -	struct fib *sync_fib;
1: -	struct list_head sync_fib_list;
1: -	u32 doorbell_mask;
1: -	u32 max_msix;
1: -	u32 vector_cap;
1: -	int msi_enabled;
1: -	atomic_t msix_counter;
1: -	u32 scan_counter;
1: -	struct msix_entry msixentry[32];
1: -	struct aac_msix_ctx aac_msix[32];
1: -	struct aac_hba_map_info hba_map[1280];
1: -	struct aac_ciss_phys_luns_resp *safw_phys_luns;
1: -	u8 adapter_shutdown;
1: -	u32 handle_pci_error;
1: -	bool init_reset;
1: -	u8 soft_reset_support;
1: +  struct list_head entry;
1: +  const char *name;
1: +  int id;
1: +  unsigned int max_fib_size;
1: +  unsigned int sg_tablesize;
1: +  unsigned int max_num_aif;
1: +  unsigned int max_cmd_size;
1: +  dma_addr_t hw_fib_pa;
1: +  struct hw_fib *hw_fib_va;
1: +  struct hw_fib *aif_base_va;
1: +  struct fib *fibs;
1: +  struct fib *free_fib;
1: +  spinlock_t fib_lock;
1: +  struct mutex ioctl_mutex;
1: +  struct mutex scan_mutex;
1: +  struct aac_queue_block *queues;
1: +  struct list_head fib_list;
1: +  struct adapter_ops a_ops;
1: +  long unsigned int fsrev;
1: +  resource_size_t base_start;
1: +  resource_size_t dbg_base;
1: +  resource_size_t base_size;
1: +  resource_size_t dbg_size;
1: +  union aac_init *init;
1: +  dma_addr_t init_pa;
1: +  __le32 *host_rrq;
1: +  dma_addr_t host_rrq_pa;
1: +  u32 host_rrq_idx[32];
1: +  atomic_t rrq_outstanding[32];
1: +  u32 fibs_pushed_no;
1: +  struct pci_dev *pdev;
1: +  void *printfbuf;
1: +  void *comm_addr;
1: +  dma_addr_t comm_phys;
1: +  size_t comm_size;
1: +  struct Scsi_Host *scsi_host_ptr;
1: +  int maximum_num_containers;
1: +  int maximum_num_physicals;
1: +  int maximum_num_channels;
1: +  struct fsa_dev_info *fsa_dev;
1: +  struct task_struct *thread;
1: +  struct delayed_work safw_rescan_work;
1: +  struct delayed_work src_reinit_aif_worker;
1: +  int cardtype;
1: +  spinlock_t iq_lock;
1: +  union {
1: +    struct sa_registers *sa;
1: +    struct rx_registers *rx;
1: +    struct rkt_registers *rkt;
1: +    struct {
1: +      struct src_registers *bar0;
1: +      char *bar1;
1: +    } src;
1: +  } regs;
1: +  volatile void *base;
1: +  volatile void *dbg_base_mapped;
1: +  volatile struct rx_inbound *IndexRegs;
1: +  u32 OIMR;
1: +  u32 aif_thread;
1: +  struct aac_adapter_info adapter_info;
1: +  struct aac_supplement_adapter_info supplement_adapter_info;
1: +  u8 nondasd_support;
1: +  u8 jbod;
1: +  u8 cache_protected;
1: +  u8 dac_support;
1: +  u8 needs_dac;
1: +  u8 raid_scsi_mode;
1: +  u8 comm_interface;
1: +  u8 raw_io_interface;
1: +  u8 raw_io_64;
1: +  u8 printf_enabled;
1: +  u8 in_reset;
1: +  u8 in_soft_reset;
1: +  u8 msi;
1: +  u8 sa_firmware;
1: +  int management_fib_count;
1: +  spinlock_t manage_lock;
1: +  spinlock_t sync_lock;
1: +  int sync_mode;
1: +  struct fib *sync_fib;
1: +  struct list_head sync_fib_list;
1: +  u32 doorbell_mask;
1: +  u32 max_msix;
1: +  u32 vector_cap;
1: +  int msi_enabled;
1: +  atomic_t msix_counter;
1: +  u32 scan_counter;
1: +  struct msix_entry msixentry[32];
1: +  struct aac_msix_ctx aac_msix[32];
1: +  struct aac_hba_map_info hba_map[1280];
1: +  struct aac_ciss_phys_luns_resp *safw_phys_luns;
1: +  u8 adapter_shutdown;
1: +  u32 handle_pci_error;
1: +  bool init_reset;
1: +  u8 soft_reset_support;
1:  };
1:  
1:  typedef void (*fib_callback)(void *, struct fib *);
1:  
1:  struct fib {
1: -	void *next;
1: -	s16 type;
1: -	s16 size;
1: -	struct aac_dev *dev;
1: -	struct completion event_wait;
1: -	spinlock_t event_lock;
1: -	u32 done;
1: -	fib_callback callback;
1: -	void *callback_data;
1: -	u32 flags;
1: -	struct list_head fiblink;
1: -	void *data;
1: -	u32 vector_no;
1: -	struct hw_fib *hw_fib_va;
1: -	dma_addr_t hw_fib_pa;
1: -	dma_addr_t hw_sgl_pa;
1: -	dma_addr_t hw_error_pa;
1: -	u32 hbacmd_size;
1: +  void *next;
1: +  s16 type;
1: +  s16 size;
1: +  struct aac_dev *dev;
1: +  struct completion event_wait;
1: +  spinlock_t event_lock;
1: +  u32 done;
1: +  fib_callback callback;
1: +  void *callback_data;
1: +  u32 flags;
1: +  struct list_head fiblink;
1: +  void *data;
1: +  u32 vector_no;
1: +  struct hw_fib *hw_fib_va;
1: +  dma_addr_t hw_fib_pa;
1: +  dma_addr_t hw_sgl_pa;
1: +  dma_addr_t hw_error_pa;
1: +  u32 hbacmd_size;
1:  };
1:  
1:  struct aac_driver_ident {
1: -	int (*init)(struct aac_dev *);
1: -	char *name;
1: -	char *vname;
1: -	char *model;
1: -	u16 channels;
1: -	int quirks;
1: +  int (*init)(struct aac_dev *);
1: +  char *name;
1: +  char *vname;
1: +  char *model;
1: +  u16 channels;
1: +  int quirks;
1:  };
1:  
1:  struct aac_queue {
1: -	u64 logical;
1: -	struct aac_entry *base;
1: -	struct aac_qhdr headers;
1: -	u32 entries;
1: -	wait_queue_head_t qfull;
1: -	wait_queue_head_t cmdready;
1: -	spinlock_t *lock;
1: -	spinlock_t lockdata;
1: -	struct list_head cmdq;
1: -	atomic_t numpending;
1: -	struct aac_dev *dev;
1: +  u64 logical;
1: +  struct aac_entry *base;
1: +  struct aac_qhdr headers;
1: +  u32 entries;
1: +  wait_queue_head_t qfull;
1: +  wait_queue_head_t cmdready;
1: +  spinlock_t *lock;
1: +  spinlock_t lockdata;
1: +  struct list_head cmdq;
1: +  atomic_t numpending;
1: +  struct aac_dev *dev;
1:  };
1:  
1:  struct aac_queue_block {
1: -	struct aac_queue queue[8];
1: +  struct aac_queue queue[8];
1:  };
1:  
1:  struct sa_drawbridge_CSR {
1: -	__le32 reserved[10];
1: -	u8 LUT_Offset;
1: -	u8 reserved1[3];
1: -	__le32 LUT_Data;
1: -	__le32 reserved2[26];
1: -	__le16 PRICLEARIRQ;
1: -	__le16 SECCLEARIRQ;
1: -	__le16 PRISETIRQ;
1: -	__le16 SECSETIRQ;
1: -	__le16 PRICLEARIRQMASK;
1: -	__le16 SECCLEARIRQMASK;
1: -	__le16 PRISETIRQMASK;
1: -	__le16 SECSETIRQMASK;
1: -	__le32 MAILBOX0;
1: -	__le32 MAILBOX1;
1: -	__le32 MAILBOX2;
1: -	__le32 MAILBOX3;
1: -	__le32 MAILBOX4;
1: -	__le32 MAILBOX5;
1: -	__le32 MAILBOX6;
1: -	__le32 MAILBOX7;
1: -	__le32 ROM_Setup_Data;
1: -	__le32 ROM_Control_Addr;
1: -	__le32 reserved3[12];
1: -	__le32 LUT[64];
1: +  __le32 reserved[10];
1: +  u8 LUT_Offset;
1: +  u8 reserved1[3];
1: +  __le32 LUT_Data;
1: +  __le32 reserved2[26];
1: +  __le16 PRICLEARIRQ;
1: +  __le16 SECCLEARIRQ;
1: +  __le16 PRISETIRQ;
1: +  __le16 SECSETIRQ;
1: +  __le16 PRICLEARIRQMASK;
1: +  __le16 SECCLEARIRQMASK;
1: +  __le16 PRISETIRQMASK;
1: +  __le16 SECSETIRQMASK;
1: +  __le32 MAILBOX0;
1: +  __le32 MAILBOX1;
1: +  __le32 MAILBOX2;
1: +  __le32 MAILBOX3;
1: +  __le32 MAILBOX4;
1: +  __le32 MAILBOX5;
1: +  __le32 MAILBOX6;
1: +  __le32 MAILBOX7;
1: +  __le32 ROM_Setup_Data;
1: +  __le32 ROM_Control_Addr;
1: +  __le32 reserved3[12];
1: +  __le32 LUT[64];
1:  };
1:  
1:  struct sa_registers {
1: -	struct sa_drawbridge_CSR SaDbCSR;
1: +  struct sa_drawbridge_CSR SaDbCSR;
1:  };
1:  
1:  struct rx_mu_registers {
1: -	__le32 ARSR;
1: -	__le32 reserved0;
1: -	__le32 AWR;
1: -	__le32 reserved1;
1: -	__le32 IMRx[2];
1: -	__le32 OMRx[2];
1: -	__le32 IDR;
1: -	__le32 IISR;
1: -	__le32 IIMR;
1: -	__le32 ODR;
1: -	__le32 OISR;
1: -	__le32 OIMR;
1: -	__le32 reserved2;
1: -	__le32 reserved3;
1: -	__le32 InboundQueue;
1: -	__le32 OutboundQueue;
1: +  __le32 ARSR;
1: +  __le32 reserved0;
1: +  __le32 AWR;
1: +  __le32 reserved1;
1: +  __le32 IMRx[2];
1: +  __le32 OMRx[2];
1: +  __le32 IDR;
1: +  __le32 IISR;
1: +  __le32 IIMR;
1: +  __le32 ODR;
1: +  __le32 OISR;
1: +  __le32 OIMR;
1: +  __le32 reserved2;
1: +  __le32 reserved3;
1: +  __le32 InboundQueue;
1: +  __le32 OutboundQueue;
1:  };
1:  
1:  struct rx_inbound {
1: -	__le32 Mailbox[8];
1: +  __le32 Mailbox[8];
1:  };
1:  
1:  struct rx_registers {
1: -	struct rx_mu_registers MUnit;
1: -	__le32 reserved1[2];
1: -	struct rx_inbound IndexRegs;
1: +  struct rx_mu_registers MUnit;
1: +  __le32 reserved1[2];
1: +  struct rx_inbound IndexRegs;
1:  };
1:  
1:  struct rkt_registers {
1: -	struct rx_mu_registers MUnit;
1: -	__le32 reserved1[1006];
1: -	struct rx_inbound IndexRegs;
1: +  struct rx_mu_registers MUnit;
1: +  __le32 reserved1[1006];
1: +  struct rx_inbound IndexRegs;
1:  };
1:  
1:  struct src_mu_registers {
1: -	__le32 reserved0[6];
1: -	__le32 IOAR[2];
1: -	__le32 IDR;
1: -	__le32 IISR;
1: -	__le32 reserved1[3];
1: -	__le32 OIMR;
1: -	__le32 reserved2[25];
1: -	__le32 ODR_R;
1: -	__le32 ODR_C;
1: -	__le32 reserved3[3];
1: -	__le32 SCR0;
1: -	__le32 reserved4[2];
1: -	__le32 OMR;
1: -	__le32 IQ_L;
1: -	__le32 IQ_H;
1: -	__le32 ODR_MSI;
1: -	__le32 reserved5;
1: -	__le32 IQN_L;
1: -	__le32 IQN_H;
1: +  __le32 reserved0[6];
1: +  __le32 IOAR[2];
1: +  __le32 IDR;
1: +  __le32 IISR;
1: +  __le32 reserved1[3];
1: +  __le32 OIMR;
1: +  __le32 reserved2[25];
1: +  __le32 ODR_R;
1: +  __le32 ODR_C;
1: +  __le32 reserved3[3];
1: +  __le32 SCR0;
1: +  __le32 reserved4[2];
1: +  __le32 OMR;
1: +  __le32 IQ_L;
1: +  __le32 IQ_H;
1: +  __le32 ODR_MSI;
1: +  __le32 reserved5;
1: +  __le32 IQN_L;
1: +  __le32 IQN_H;
1:  };
1:  
1:  struct src_registers {
1: -	struct src_mu_registers MUnit;
1: -	union {
1: -		struct {
1: -			__le32 reserved1[130786];
1: -			struct rx_inbound IndexRegs;
1: -		} tupelo;
1: -		struct {
1: -			__le32 reserved1[970];
1: -			struct rx_inbound IndexRegs;
1: -		} denali;
1: -	} u;
1: +  struct src_mu_registers MUnit;
1: +  union {
1: +    struct {
1: +      __le32 reserved1[130786];
1: +      struct rx_inbound IndexRegs;
1: +    } tupelo;
1: +    struct {
1: +      __le32 reserved1[970];
1: +      struct rx_inbound IndexRegs;
1: +    } denali;
1: +  } u;
1:  };
1:  
1:  struct sense_data {
1: -	u8 error_code;
1: -	u8 valid: 1;
1: -	u8 segment_number;
1: -	u8 sense_key: 4;
1: -	u8 reserved: 1;
1: -	u8 ILI: 1;
1: -	u8 EOM: 1;
1: -	u8 filemark: 1;
1: -	u8 information[4];
1: -	u8 add_sense_len;
1: -	u8 cmnd_info[4];
1: -	u8 ASC;
1: -	u8 ASCQ;
1: -	u8 FRUC;
1: -	u8 bit_ptr: 3;
1: -	u8 BPV: 1;
1: -	u8 reserved2: 2;
1: -	u8 CD: 1;
1: -	u8 SKSV: 1;
1: -	u8 field_ptr[2];
1: +  u8 error_code;
1: +  u8 valid : 1;
1: +  u8 segment_number;
1: +  u8 sense_key : 4;
1: +  u8 reserved : 1;
1: +  u8 ILI : 1;
1: +  u8 EOM : 1;
1: +  u8 filemark : 1;
1: +  u8 information[4];
1: +  u8 add_sense_len;
1: +  u8 cmnd_info[4];
1: +  u8 ASC;
1: +  u8 ASCQ;
1: +  u8 FRUC;
1: +  u8 bit_ptr : 3;
1: +  u8 BPV : 1;
1: +  u8 reserved2 : 2;
1: +  u8 CD : 1;
1: +  u8 SKSV : 1;
1: +  u8 field_ptr[2];
1:  };
1:  
1:  struct fsa_dev_info {
1: -	u64 last;
1: -	u64 size;
1: -	u32 type;
1: -	u32 config_waiting_on;
1: -	long unsigned int config_waiting_stamp;
1: -	u16 queue_depth;
1: -	u8 config_needed;
1: -	u8 valid;
1: -	u8 ro;
1: -	u8 locked;
1: -	u8 deleted;
1: -	char devname[8];
1: -	struct sense_data sense_data;
1: -	u32 block_size;
1: -	u8 identifier[16];
1: +  u64 last;
1: +  u64 size;
1: +  u32 type;
1: +  u32 config_waiting_on;
1: +  long unsigned int config_waiting_stamp;
1: +  u16 queue_depth;
1: +  u8 config_needed;
1: +  u8 valid;
1: +  u8 ro;
1: +  u8 locked;
1: +  u8 deleted;
1: +  char devname[8];
1: +  struct sense_data sense_data;
1: +  u32 block_size;
1: +  u8 identifier[16];
1:  };
1:  
1:  struct fib_ioctl {
1: -	u32 fibctx;
1: -	s32 wait;
1: -	char *fib;
1: +  u32 fibctx;
1: +  s32 wait;
1: +  char *fib;
1:  };
1:  
1:  struct fib_count_data {
1: -	int mlcnt;
1: -	int llcnt;
1: -	int ehcnt;
1: -	int fwcnt;
1: -	int krlcnt;
1: +  int mlcnt;
1: +  int llcnt;
1: +  int ehcnt;
1: +  int fwcnt;
1: +  int krlcnt;
1:  };
1:  
1:  enum {
1: -	HBA_RESP_STAT_IO_ERROR = 1,
1: -	HBA_RESP_STAT_IO_ABORTED = 2,
1: -	HBA_RESP_STAT_NO_PATH_TO_DEVICE = 3,
1: -	HBA_RESP_STAT_INVALID_DEVICE = 4,
1: -	HBA_RESP_STAT_HBAMODE_DISABLED = 14,
1: -	HBA_RESP_STAT_UNDERRUN = 81,
1: -	HBA_RESP_STAT_OVERRUN = 117,
1: +  HBA_RESP_STAT_IO_ERROR = 1,
1: +  HBA_RESP_STAT_IO_ABORTED = 2,
1: +  HBA_RESP_STAT_NO_PATH_TO_DEVICE = 3,
1: +  HBA_RESP_STAT_INVALID_DEVICE = 4,
1: +  HBA_RESP_STAT_HBAMODE_DISABLED = 14,
1: +  HBA_RESP_STAT_UNDERRUN = 81,
1: +  HBA_RESP_STAT_OVERRUN = 117,
1:  };
1:  
1:  struct sgentry {
1: -	__le32 addr;
1: -	__le32 count;
1: +  __le32 addr;
1: +  __le32 count;
1:  };
1:  
1:  struct sgentry64 {
1: -	__le32 addr[2];
1: -	__le32 count;
1: +  __le32 addr[2];
1: +  __le32 count;
1:  };
1:  
1:  struct sgentryraw {
1: -	__le32 next;
1: -	__le32 prev;
1: -	__le32 addr[2];
1: -	__le32 count;
1: -	__le32 flags;
1: +  __le32 next;
1: +  __le32 prev;
1: +  __le32 addr[2];
1: +  __le32 count;
1: +  __le32 flags;
1:  };
1:  
1:  struct sge_ieee1212 {
1: -	u32 addrLow;
1: -	u32 addrHigh;
1: -	u32 length;
1: -	u32 flags;
1: +  u32 addrLow;
1: +  u32 addrHigh;
1: +  u32 length;
1: +  u32 flags;
1:  };
1:  
1:  struct sgmap {
1: -	__le32 count;
1: -	struct sgentry sg[1];
1: +  __le32 count;
1: +  struct sgentry sg[1];
1:  };
1:  
1:  struct sgmap64 {
1: -	__le32 count;
1: -	struct sgentry64 sg[1];
1: +  __le32 count;
1: +  struct sgentry64 sg[1];
1:  };
1:  
1:  struct sgmapraw {
1: -	__le32 count;
1: -	struct sgentryraw sg[1];
1: +  __le32 count;
1: +  struct sgentryraw sg[1];
1:  };
1:  
1:  struct creation_info {
1: -	u8 buildnum;
1: -	u8 usec;
1: -	u8 via;
1: -	u8 year;
1: -	__le32 date;
1: -	__le32 serial[2];
1: +  u8 buildnum;
1: +  u8 usec;
1: +  u8 via;
1: +  u8 year;
1: +  __le32 date;
1: +  __le32 serial[2];
1:  };
1:  
1:  struct aac_bus_info {
1: -	__le32 Command;
1: -	__le32 ObjType;
1: -	__le32 MethodId;
1: -	__le32 ObjectId;
1: -	__le32 CtlCmd;
1: +  __le32 Command;
1: +  __le32 ObjType;
1: +  __le32 MethodId;
1: +  __le32 ObjectId;
1: +  __le32 CtlCmd;
1:  };
1:  
1:  struct aac_bus_info_response {
1: -	__le32 Status;
1: -	__le32 ObjType;
1: -	__le32 MethodId;
1: -	__le32 ObjectId;
1: -	__le32 CtlCmd;
1: -	__le32 ProbeComplete;
1: -	__le32 BusCount;
1: -	__le32 TargetsPerBus;
1: -	u8 InitiatorBusId[10];
1: -	u8 BusValid[10];
1: +  __le32 Status;
1: +  __le32 ObjType;
1: +  __le32 MethodId;
1: +  __le32 ObjectId;
1: +  __le32 CtlCmd;
1: +  __le32 ProbeComplete;
1: +  __le32 BusCount;
1: +  __le32 TargetsPerBus;
1: +  u8 InitiatorBusId[10];
1: +  u8 BusValid[10];
1:  };
1:  
1:  struct aac_read {
1: -	__le32 command;
1: -	__le32 cid;
1: -	__le32 block;
1: -	__le32 count;
1: -	struct sgmap sg;
1: +  __le32 command;
1: +  __le32 cid;
1: +  __le32 block;
1: +  __le32 count;
1: +  struct sgmap sg;
1:  };
1:  
1:  struct aac_read64 {
1: -	__le32 command;
1: -	__le16 cid;
1: -	__le16 sector_count;
1: -	__le32 block;
1: -	__le16 pad;
1: -	__le16 flags;
1: -	struct sgmap64 sg;
1: +  __le32 command;
1: +  __le16 cid;
1: +  __le16 sector_count;
1: +  __le32 block;
1: +  __le16 pad;
1: +  __le16 flags;
1: +  struct sgmap64 sg;
1:  };
1:  
1:  struct aac_read_reply {
1: -	__le32 status;
1: -	__le32 count;
1: +  __le32 status;
1: +  __le32 count;
1:  };
1:  
1:  struct aac_write {
1: -	__le32 command;
1: -	__le32 cid;
1: -	__le32 block;
1: -	__le32 count;
1: -	__le32 stable;
1: -	struct sgmap sg;
1: +  __le32 command;
1: +  __le32 cid;
1: +  __le32 block;
1: +  __le32 count;
1: +  __le32 stable;
1: +  struct sgmap sg;
1:  };
1:  
1:  struct aac_write64 {
1: -	__le32 command;
1: -	__le16 cid;
1: -	__le16 sector_count;
1: -	__le32 block;
1: -	__le16 pad;
1: -	__le16 flags;
1: -	struct sgmap64 sg;
1: +  __le32 command;
1: +  __le16 cid;
1: +  __le16 sector_count;
1: +  __le32 block;
1: +  __le16 pad;
1: +  __le16 flags;
1: +  struct sgmap64 sg;
1:  };
1:  
1:  struct aac_raw_io {
1: -	__le32 block[2];
1: -	__le32 count;
1: -	__le16 cid;
1: -	__le16 flags;
1: -	__le16 bpTotal;
1: -	__le16 bpComplete;
1: -	struct sgmapraw sg;
1: +  __le32 block[2];
1: +  __le32 count;
1: +  __le16 cid;
1: +  __le16 flags;
1: +  __le16 bpTotal;
1: +  __le16 bpComplete;
1: +  struct sgmapraw sg;
1:  };
1:  
1:  struct aac_raw_io2 {
1: -	__le32 blockLow;
1: -	__le32 blockHigh;
1: -	__le32 byteCount;
1: -	__le16 cid;
1: -	__le16 flags;
1: -	__le32 sgeFirstSize;
1: -	__le32 sgeNominalSize;
1: -	u8 sgeCnt;
1: -	u8 bpTotal;
1: -	u8 bpComplete;
1: -	u8 sgeFirstIndex;
1: -	u8 unused[4];
1: -	struct sge_ieee1212 sge[1];
1: +  __le32 blockLow;
1: +  __le32 blockHigh;
1: +  __le32 byteCount;
1: +  __le16 cid;
1: +  __le16 flags;
1: +  __le32 sgeFirstSize;
1: +  __le32 sgeNominalSize;
1: +  u8 sgeCnt;
1: +  u8 bpTotal;
1: +  u8 bpComplete;
1: +  u8 sgeFirstIndex;
1: +  u8 unused[4];
1: +  struct sge_ieee1212 sge[1];
1:  };
1:  
1:  struct aac_synchronize {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 cid;
1: -	__le32 parm1;
1: -	__le32 parm2;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 count;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 cid;
1: +  __le32 parm1;
1: +  __le32 parm2;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 count;
1:  };
1:  
1:  struct aac_synchronize_reply {
1: -	__le32 dummy0;
1: -	__le32 dummy1;
1: -	__le32 status;
1: -	__le32 parm1;
1: -	__le32 parm2;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 parm5;
1: -	u8 data[16];
1: +  __le32 dummy0;
1: +  __le32 dummy1;
1: +  __le32 status;
1: +  __le32 parm1;
1: +  __le32 parm2;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 parm5;
1: +  u8 data[16];
1:  };
1:  
1:  struct aac_power_management {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 sub;
1: -	__le32 cid;
1: -	__le32 parm;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 sub;
1: +  __le32 cid;
1: +  __le32 parm;
1:  };
1:  
1:  struct aac_srb {
1: -	__le32 function;
1: -	__le32 channel;
1: -	__le32 id;
1: -	__le32 lun;
1: -	__le32 timeout;
1: -	__le32 flags;
1: -	__le32 count;
1: -	__le32 retry_limit;
1: -	__le32 cdb_size;
1: -	u8 cdb[16];
1: -	struct sgmap sg;
1: +  __le32 function;
1: +  __le32 channel;
1: +  __le32 id;
1: +  __le32 lun;
1: +  __le32 timeout;
1: +  __le32 flags;
1: +  __le32 count;
1: +  __le32 retry_limit;
1: +  __le32 cdb_size;
1: +  u8 cdb[16];
1: +  struct sgmap sg;
1:  };
1:  
1:  struct aac_srb_reply {
1: -	__le32 status;
1: -	__le32 srb_status;
1: -	__le32 scsi_status;
1: -	__le32 data_xfer_length;
1: -	__le32 sense_data_size;
1: -	u8 sense_data[30];
1: +  __le32 status;
1: +  __le32 srb_status;
1: +  __le32 scsi_status;
1: +  __le32 data_xfer_length;
1: +  __le32 sense_data_size;
1: +  u8 sense_data[30];
1:  };
1:  
1:  struct aac_srb_unit {
1: -	struct aac_srb srb;
1: -	struct aac_srb_reply srb_reply;
1: +  struct aac_srb srb;
1: +  struct aac_srb_reply srb_reply;
1:  };
1:  
1:  struct aac_fsinfo {
1: -	__le32 fsTotalSize;
1: -	__le32 fsBlockSize;
1: -	__le32 fsFragSize;
1: -	__le32 fsMaxExtendSize;
1: -	__le32 fsSpaceUnits;
1: -	__le32 fsMaxNumFiles;
1: -	__le32 fsNumFreeFiles;
1: -	__le32 fsInodeDensity;
1: +  __le32 fsTotalSize;
1: +  __le32 fsBlockSize;
1: +  __le32 fsFragSize;
1: +  __le32 fsMaxExtendSize;
1: +  __le32 fsSpaceUnits;
1: +  __le32 fsMaxNumFiles;
1: +  __le32 fsNumFreeFiles;
1: +  __le32 fsInodeDensity;
1:  };
1:  
1:  struct aac_blockdevinfo {
1: -	__le32 block_size;
1: -	__le32 logical_phys_map;
1: -	u8 identifier[16];
1: +  __le32 block_size;
1: +  __le32 logical_phys_map;
1: +  u8 identifier[16];
1:  };
1:  
1:  union aac_contentinfo {
1: -	struct aac_fsinfo filesys;
1: -	struct aac_blockdevinfo bdevinfo;
1: +  struct aac_fsinfo filesys;
1: +  struct aac_blockdevinfo bdevinfo;
1:  };
1:  
1:  struct aac_get_config_status {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 parm1;
1: -	__le32 parm2;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 parm5;
1: -	__le32 count;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 parm1;
1: +  __le32 parm2;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 parm5;
1: +  __le32 count;
1:  };
1:  
1:  struct aac_get_config_status_resp {
1: -	__le32 response;
1: -	__le32 dummy0;
1: -	__le32 status;
1: -	__le32 parm1;
1: -	__le32 parm2;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 parm5;
1: -	struct {
1: -		__le32 action;
1: -		__le16 flags;
1: -		__le16 count;
1: -	} data;
1: +  __le32 response;
1: +  __le32 dummy0;
1: +  __le32 status;
1: +  __le32 parm1;
1: +  __le32 parm2;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 parm5;
1: +  struct {
1: +    __le32 action;
1: +    __le16 flags;
1: +    __le16 count;
1: +  } data;
1:  };
1:  
1:  struct aac_commit_config {
1: -	__le32 command;
1: -	__le32 type;
1: +  __le32 command;
1: +  __le32 type;
1:  };
1:  
1:  struct aac_get_container_count {
1: -	__le32 command;
1: -	__le32 type;
1: +  __le32 command;
1: +  __le32 type;
1:  };
1:  
1:  struct aac_get_container_count_resp {
1: -	__le32 response;
1: -	__le32 dummy0;
1: -	__le32 MaxContainers;
1: -	__le32 ContainerSwitchEntries;
1: -	__le32 MaxPartitions;
1: -	__le32 MaxSimpleVolumes;
1: +  __le32 response;
1: +  __le32 dummy0;
1: +  __le32 MaxContainers;
1: +  __le32 ContainerSwitchEntries;
1: +  __le32 MaxPartitions;
1: +  __le32 MaxSimpleVolumes;
1:  };
1:  
1:  struct aac_mntent {
1: -	__le32 oid;
1: -	u8 name[16];
1: -	struct creation_info create_info;
1: -	__le32 capacity;
1: -	__le32 vol;
1: -	__le32 obj;
1: -	__le32 state;
1: -	union aac_contentinfo fileinfo;
1: -	__le32 altoid;
1: -	__le32 capacityhigh;
1: +  __le32 oid;
1: +  u8 name[16];
1: +  struct creation_info create_info;
1: +  __le32 capacity;
1: +  __le32 vol;
1: +  __le32 obj;
1: +  __le32 state;
1: +  union aac_contentinfo fileinfo;
1: +  __le32 altoid;
1: +  __le32 capacityhigh;
1:  };
1:  
1:  struct aac_query_mount {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 count;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 count;
1:  };
1:  
1:  struct aac_mount {
1: -	__le32 status;
1: -	__le32 type;
1: -	__le32 count;
1: -	struct aac_mntent mnt[1];
1: +  __le32 status;
1: +  __le32 type;
1: +  __le32 count;
1: +  struct aac_mntent mnt[1];
1:  };
1:  
1:  struct aac_get_name {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 cid;
1: -	__le32 parm1;
1: -	__le32 parm2;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 count;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 cid;
1: +  __le32 parm1;
1: +  __le32 parm2;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 count;
1:  };
1:  
1:  struct aac_get_name_resp {
1: -	__le32 dummy0;
1: -	__le32 dummy1;
1: -	__le32 status;
1: -	__le32 parm1;
1: -	__le32 parm2;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 parm5;
1: -	u8 data[17];
1: +  __le32 dummy0;
1: +  __le32 dummy1;
1: +  __le32 status;
1: +  __le32 parm1;
1: +  __le32 parm2;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 parm5;
1: +  u8 data[17];
1:  };
1:  
1:  struct aac_get_serial {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 cid;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 cid;
1:  };
1:  
1:  struct aac_get_serial_resp {
1: -	__le32 dummy0;
1: -	__le32 dummy1;
1: -	__le32 status;
1: -	__le32 uid;
1: +  __le32 dummy0;
1: +  __le32 dummy1;
1: +  __le32 status;
1: +  __le32 uid;
1:  };
1:  
1:  struct aac_query_disk {
1: -	s32 cnum;
1: -	s32 bus;
1: -	s32 id;
1: -	s32 lun;
1: -	u32 valid;
1: -	u32 locked;
1: -	u32 deleted;
1: -	s32 instance;
1: -	s8 name[10];
1: -	u32 unmapped;
1: +  s32 cnum;
1: +  s32 bus;
1: +  s32 id;
1: +  s32 lun;
1: +  u32 valid;
1: +  u32 locked;
1: +  u32 deleted;
1: +  s32 instance;
1: +  s8 name[10];
1: +  u32 unmapped;
1:  };
1:  
1:  struct aac_delete_disk {
1: -	u32 disknum;
1: -	u32 cnum;
1: +  u32 disknum;
1: +  u32 cnum;
1:  };
1:  
1:  typedef struct {
1: -	struct {
1: -		u8 data_length;
1: -		u8 med_type;
1: -		u8 dev_par;
1: -		u8 bd_length;
1: -	} hd;
1: -	struct {
1: -		u8 dens_code;
1: -		u8 block_count[3];
1: -		u8 reserved;
1: -		u8 block_length[3];
1: -	} bd;
1: -	u8 mpc_buf[3];
1: +  struct {
1: +    u8 data_length;
1: +    u8 med_type;
1: +    u8 dev_par;
1: +    u8 bd_length;
1: +  } hd;
1: +  struct {
1: +    u8 dens_code;
1: +    u8 block_count[3];
1: +    u8 reserved;
1: +    u8 block_length[3];
1: +  } bd;
1: +  u8 mpc_buf[3];
1:  } aac_modep_data;
1:  
1:  typedef struct {
1: -	struct {
1: -		u8 data_length[2];
1: -		u8 med_type;
1: -		u8 dev_par;
1: -		u8 rsrvd[2];
1: -		u8 bd_length[2];
1: -	} hd;
1: -	struct {
1: -		u8 dens_code;
1: -		u8 block_count[3];
1: -		u8 reserved;
1: -		u8 block_length[3];
1: -	} bd;
1: -	u8 mpc_buf[3];
1: +  struct {
1: +    u8 data_length[2];
1: +    u8 med_type;
1: +    u8 dev_par;
1: +    u8 rsrvd[2];
1: +    u8 bd_length[2];
1: +  } hd;
1: +  struct {
1: +    u8 dens_code;
1: +    u8 block_count[3];
1: +    u8 reserved;
1: +    u8 block_length[3];
1: +  } bd;
1: +  u8 mpc_buf[3];
1:  } aac_modep10_data;
1:  
1:  struct inquiry_data {
1: -	u8 inqd_pdt;
1: -	u8 inqd_dtq;
1: -	u8 inqd_ver;
1: -	u8 inqd_rdf;
1: -	u8 inqd_len;
1: -	u8 inqd_pad1[2];
1: -	u8 inqd_pad2;
1: -	u8 inqd_vid[8];
1: -	u8 inqd_pid[16];
1: -	u8 inqd_prl[4];
1: +  u8 inqd_pdt;
1: +  u8 inqd_dtq;
1: +  u8 inqd_ver;
1: +  u8 inqd_rdf;
1: +  u8 inqd_len;
1: +  u8 inqd_pad1[2];
1: +  u8 inqd_pad2;
1: +  u8 inqd_vid[8];
1: +  u8 inqd_pid[16];
1: +  u8 inqd_prl[4];
1:  };
1:  
1:  struct tvpd_id_descriptor_type_1 {
1: -	u8 codeset: 4;
1: -	u8 reserved: 4;
1: -	u8 identifiertype: 4;
1: -	u8 reserved2: 4;
1: -	u8 reserved3;
1: -	u8 identifierlength;
1: -	u8 venid[8];
1: -	u8 productid[16];
1: -	u8 serialnumber[8];
1: +  u8 codeset : 4;
1: +  u8 reserved : 4;
1: +  u8 identifiertype : 4;
1: +  u8 reserved2 : 4;
1: +  u8 reserved3;
1: +  u8 identifierlength;
1: +  u8 venid[8];
1: +  u8 productid[16];
1: +  u8 serialnumber[8];
1:  };
1:  
1:  struct teu64id {
1: -	u32 Serial;
1: -	u8 reserved;
1: -	u8 venid[3];
1: +  u32 Serial;
1: +  u8 reserved;
1: +  u8 venid[3];
1:  };
1:  
1:  struct tvpd_id_descriptor_type_2 {
1: -	u8 codeset: 4;
1: -	u8 reserved: 4;
1: -	u8 identifiertype: 4;
1: -	u8 reserved2: 4;
1: -	u8 reserved3;
1: -	u8 identifierlength;
1: -	struct teu64id eu64id;
1: +  u8 codeset : 4;
1: +  u8 reserved : 4;
1: +  u8 identifiertype : 4;
1: +  u8 reserved2 : 4;
1: +  u8 reserved3;
1: +  u8 identifierlength;
1: +  struct teu64id eu64id;
1:  };
1:  
1:  struct tvpd_id_descriptor_type_3 {
1: -	u8 codeset: 4;
1: -	u8 reserved: 4;
1: -	u8 identifiertype: 4;
1: -	u8 reserved2: 4;
1: -	u8 reserved3;
1: -	u8 identifierlength;
1: -	u8 Identifier[16];
1: +  u8 codeset : 4;
1: +  u8 reserved : 4;
1: +  u8 identifiertype : 4;
1: +  u8 reserved2 : 4;
1: +  u8 reserved3;
1: +  u8 identifierlength;
1: +  u8 Identifier[16];
1:  };
1:  
1:  struct tvpd_page83 {
1: -	u8 DeviceType: 5;
1: -	u8 DeviceTypeQualifier: 3;
1: -	u8 PageCode;
1: -	u8 reserved;
1: -	u8 PageLength;
1: -	struct tvpd_id_descriptor_type_1 type1;
1: -	struct tvpd_id_descriptor_type_2 type2;
1: -	struct tvpd_id_descriptor_type_3 type3;
1: +  u8 DeviceType : 5;
1: +  u8 DeviceTypeQualifier : 3;
1: +  u8 PageCode;
1: +  u8 reserved;
1: +  u8 PageLength;
1: +  struct tvpd_id_descriptor_type_1 type1;
1: +  struct tvpd_id_descriptor_type_2 type2;
1: +  struct tvpd_id_descriptor_type_3 type3;
1:  };
1:  
1:  struct scsi_inq {
1: -	char vid[8];
1: -	char pid[16];
1: -	char prl[4];
1: +  char vid[8];
1: +  char pid[16];
1: +  char prl[4];
1:  };
1:  
1:  struct user_sgentry {
1: -	u32 addr;
1: -	u32 count;
1: +  u32 addr;
1: +  u32 count;
1:  };
1:  
1:  struct user_sgentry64 {
1: -	u32 addr[2];
1: -	u32 count;
1: +  u32 addr[2];
1: +  u32 count;
1:  };
1:  
1:  struct user_sgmap {
1: -	u32 count;
1: -	struct user_sgentry sg[1];
1: +  u32 count;
1: +  struct user_sgentry sg[1];
1:  };
1:  
1:  struct user_sgmap64 {
1: -	u32 count;
1: -	struct user_sgentry64 sg[1];
1: +  u32 count;
1: +  struct user_sgentry64 sg[1];
1:  };
1:  
1:  struct aac_fib_context {
1: -	s16 type;
1: -	s16 size;
1: -	u32 unique;
1: -	ulong jiffies;
1: -	struct list_head next;
1: -	struct completion completion;
1: -	int wait;
1: -	long unsigned int count;
1: -	struct list_head fib_list;
1: +  s16 type;
1: +  s16 size;
1: +  u32 unique;
1: +  ulong jiffies;
1: +  struct list_head next;
1: +  struct completion completion;
1: +  int wait;
1: +  long unsigned int count;
1: +  struct list_head fib_list;
1:  };
1:  
1:  struct user_aac_srb {
1: -	u32 function;
1: -	u32 channel;
1: -	u32 id;
1: -	u32 lun;
1: -	u32 timeout;
1: -	u32 flags;
1: -	u32 count;
1: -	u32 retry_limit;
1: -	u32 cdb_size;
1: -	u8 cdb[16];
1: -	struct user_sgmap sg;
1: +  u32 function;
1: +  u32 channel;
1: +  u32 id;
1: +  u32 lun;
1: +  u32 timeout;
1: +  u32 flags;
1: +  u32 count;
1: +  u32 retry_limit;
1: +  u32 cdb_size;
1: +  u8 cdb[16];
1: +  struct user_sgmap sg;
1:  };
1:  
1:  struct revision {
1: -	u32 compat;
1: -	__le32 version;
1: -	__le32 build;
1: +  u32 compat;
1: +  __le32 version;
1: +  __le32 build;
1:  };
1:  
1:  struct aac_hba_info {
1: -	u8 driver_name[50];
1: -	u8 adapter_number;
1: -	u8 system_io_bus_number;
1: -	u8 device_number;
1: -	u32 function_number;
1: -	u32 vendor_id;
1: -	u32 device_id;
1: -	u32 sub_vendor_id;
1: -	u32 sub_system_id;
1: -	u32 mapped_base_address_size;
1: -	u32 base_physical_address_high_part;
1: -	u32 base_physical_address_low_part;
1: -	u32 max_command_size;
1: -	u32 max_fib_size;
1: -	u32 max_scatter_gather_from_os;
1: -	u32 max_scatter_gather_to_fw;
1: -	u32 max_outstanding_fibs;
1: -	u32 queue_start_threshold;
1: -	u32 queue_dump_threshold;
1: -	u32 max_io_size_queued;
1: -	u32 outstanding_io;
1: -	u32 firmware_build_number;
1: -	u32 bios_build_number;
1: -	u32 driver_build_number;
1: -	u32 serial_number_high_part;
1: -	u32 serial_number_low_part;
1: -	u32 supported_options;
1: -	u32 feature_bits;
1: -	u32 currentnumber_ports;
1: -	u8 new_comm_interface: 1;
1: -	u8 new_commands_supported: 1;
1: -	u8 disable_passthrough: 1;
1: -	u8 expose_non_dasd: 1;
1: -	u8 queue_allowed: 1;
1: -	u8 bled_check_enabled: 1;
1: -	u8 reserved1: 1;
1: -	u8 reserted2: 1;
1: -	u32 reserved3[10];
1: +  u8 driver_name[50];
1: +  u8 adapter_number;
1: +  u8 system_io_bus_number;
1: +  u8 device_number;
1: +  u32 function_number;
1: +  u32 vendor_id;
1: +  u32 device_id;
1: +  u32 sub_vendor_id;
1: +  u32 sub_system_id;
1: +  u32 mapped_base_address_size;
1: +  u32 base_physical_address_high_part;
1: +  u32 base_physical_address_low_part;
1: +  u32 max_command_size;
1: +  u32 max_fib_size;
1: +  u32 max_scatter_gather_from_os;
1: +  u32 max_scatter_gather_to_fw;
1: +  u32 max_outstanding_fibs;
1: +  u32 queue_start_threshold;
1: +  u32 queue_dump_threshold;
1: +  u32 max_io_size_queued;
1: +  u32 outstanding_io;
1: +  u32 firmware_build_number;
1: +  u32 bios_build_number;
1: +  u32 driver_build_number;
1: +  u32 serial_number_high_part;
1: +  u32 serial_number_low_part;
1: +  u32 supported_options;
1: +  u32 feature_bits;
1: +  u32 currentnumber_ports;
1: +  u8 new_comm_interface : 1;
1: +  u8 new_commands_supported : 1;
1: +  u8 disable_passthrough : 1;
1: +  u8 expose_non_dasd : 1;
1: +  u8 queue_allowed : 1;
1: +  u8 bled_check_enabled : 1;
1: +  u8 reserved1 : 1;
1: +  u8 reserted2 : 1;
1: +  u32 reserved3[10];
1:  };
1:  
1:  struct aac_pci_info {
1: -	u32 bus;
1: -	u32 slot;
1: +  u32 bus;
1: +  u32 slot;
1:  };
1:  
1:  struct aac_reset_iop {
1: -	u8 reset_type;
1: +  u8 reset_type;
1:  };
1:  
1:  enum aac_queue_types {
1: -	HostNormCmdQueue = 0,
1: -	HostHighCmdQueue = 1,
1: -	AdapNormCmdQueue = 2,
1: -	AdapHighCmdQueue = 3,
1: -	HostNormRespQueue = 4,
1: -	HostHighRespQueue = 5,
1: -	AdapNormRespQueue = 6,
1: -	AdapHighRespQueue = 7,
1: +  HostNormCmdQueue = 0,
1: +  HostHighCmdQueue = 1,
1: +  AdapNormCmdQueue = 2,
1: +  AdapHighCmdQueue = 3,
1: +  HostNormRespQueue = 4,
1: +  HostHighRespQueue = 5,
1: +  AdapNormRespQueue = 6,
1: +  AdapHighRespQueue = 7,
1:  };
1:  
1:  struct aac_close {
1: -	__le32 command;
1: -	__le32 cid;
1: +  __le32 command;
1: +  __le32 cid;
1:  };
1:  
1:  struct aac_common {
1: -	u32 irq_mod;
1: -	u32 peak_fibs;
1: -	u32 zero_fibs;
1: -	u32 fib_timeouts;
1: +  u32 irq_mod;
1: +  u32 peak_fibs;
1: +  u32 zero_fibs;
1: +  u32 fib_timeouts;
1:  };
1:  
1:  enum aac_log_level {
1: -	LOG_AAC_INIT = 10,
1: -	LOG_AAC_INFORMATIONAL = 20,
1: -	LOG_AAC_WARNING = 30,
1: -	LOG_AAC_LOW_ERROR = 40,
1: -	LOG_AAC_MEDIUM_ERROR = 50,
1: -	LOG_AAC_HIGH_ERROR = 60,
1: -	LOG_AAC_PANIC = 70,
1: -	LOG_AAC_DEBUG = 80,
1: -	LOG_AAC_WINDBG_PRINT = 90,
1: +  LOG_AAC_INIT = 10,
1: +  LOG_AAC_INFORMATIONAL = 20,
1: +  LOG_AAC_WARNING = 30,
1: +  LOG_AAC_LOW_ERROR = 40,
1: +  LOG_AAC_MEDIUM_ERROR = 50,
1: +  LOG_AAC_HIGH_ERROR = 60,
1: +  LOG_AAC_PANIC = 70,
1: +  LOG_AAC_DEBUG = 80,
1: +  LOG_AAC_WINDBG_PRINT = 90,
1:  };
1:  
1:  struct aac_pause {
1: -	__le32 command;
1: -	__le32 type;
1: -	__le32 timeout;
1: -	__le32 min;
1: -	__le32 noRescan;
1: -	__le32 parm3;
1: -	__le32 parm4;
1: -	__le32 count;
1: +  __le32 command;
1: +  __le32 type;
1: +  __le32 timeout;
1: +  __le32 min;
1: +  __le32 noRescan;
1: +  __le32 parm3;
1: +  __le32 parm4;
1: +  __le32 count;
1:  };
1:  
1:  struct aac_aifcmd {
1: -	__le32 command;
1: -	__le32 seqnum;
1: -	u8 data[1];
1: +  __le32 command;
1: +  __le32 seqnum;
1: +  u8 data[1];
1:  };
1:  
1:  enum {
1: -	NOTHING = 0,
1: -	DELETE = 1,
1: -	ADD = 2,
1: -	CHANGE = 3,
1: +  NOTHING = 0,
1: +  DELETE = 1,
1: +  ADD = 2,
1: +  CHANGE = 3,
1:  };
1:  
1:  struct POSTSTATUS {
1: -	__le32 Post_Command;
1: -	__le32 Post_Address;
1: +  __le32 Post_Command;
1: +  __le32 Post_Address;
1:  };
1:  
1:  typedef u32 u_int32_t;
1:  
1:  struct aac_fib_xporthdr {
1: -	__le64 HostAddress;
1: -	__le32 Size;
1: -	__le32 Handle;
1: -	__le64 Reserved[2];
1: +  __le64 HostAddress;
1: +  __le32 Size;
1: +  __le32 Handle;
1: +  __le64 Reserved[2];
1:  };
1:  
1:  struct ssp_frame_hdr {
1: -	u8 frame_type;
1: -	u8 hashed_dest_addr[3];
1: -	u8 _r_a;
1: -	u8 hashed_src_addr[3];
1: -	__be16 _r_b;
1: -	u8 changing_data_ptr: 1;
1: -	u8 retransmit: 1;
1: -	u8 retry_data_frames: 1;
1: -	u8 _r_c: 5;
1: -	u8 num_fill_bytes: 2;
1: -	u8 _r_d: 6;
1: -	u32 _r_e;
1: -	__be16 tag;
1: -	__be16 tptt;
1: -	__be32 data_offs;
1: +  u8 frame_type;
1: +  u8 hashed_dest_addr[3];
1: +  u8 _r_a;
1: +  u8 hashed_src_addr[3];
1: +  __be16 _r_b;
1: +  u8 changing_data_ptr : 1;
1: +  u8 retransmit : 1;
1: +  u8 retry_data_frames : 1;
1: +  u8 _r_c : 5;
1: +  u8 num_fill_bytes : 2;
1: +  u8 _r_d : 6;
1: +  u32 _r_e;
1: +  __be16 tag;
1: +  __be16 tptt;
1: +  __be32 data_offs;
1:  };
1:  
1:  struct ssp_command_iu {
1: -	u8 lun[8];
1: -	u8 _r_a;
1: -	union {
1: -		struct {
1: -			u8 attr: 3;
1: -			u8 prio: 4;
1: -			u8 efb: 1;
1: -		};
1: -		u8 efb_prio_attr;
1: -	};
1: -	u8 _r_b;
1: -	u8 _r_c: 2;
1: -	u8 add_cdb_len: 6;
1: -	u8 cdb[16];
1: -	u8 add_cdb[0];
1: +  u8 lun[8];
1: +  u8 _r_a;
1: +  union {
1: +    struct {
1: +      u8 attr : 3;
1: +      u8 prio : 4;
1: +      u8 efb : 1;
1: +    };
1: +    u8 efb_prio_attr;
1: +  };
1: +  u8 _r_b;
1: +  u8 _r_c : 2;
1: +  u8 add_cdb_len : 6;
1: +  u8 cdb[16];
1: +  u8 add_cdb[0];
1:  };
1:  
1:  struct ssp_tmf_iu {
1: -	u8 lun[8];
1: -	u16 _r_a;
1: -	u8 tmf;
1: -	u8 _r_b;
1: -	__be16 tag;
1: -	u8 _r_c[14];
1: +  u8 lun[8];
1: +  u16 _r_a;
1: +  u8 tmf;
1: +  u8 _r_b;
1: +  __be16 tag;
1: +  u8 _r_c[14];
1:  };
1:  
1:  struct sg_el {
1: -	__le64 bus_addr;
1: -	__le32 size;
1: -	__le16 _r;
1: -	u8 next_sg_offs;
1: -	u8 flags;
1: +  __le64 bus_addr;
1: +  __le32 size;
1: +  __le16 _r;
1: +  u8 next_sg_offs;
1: +  u8 flags;
1:  };
1:  
1:  struct scb_header {
1: -	__le64 next_scb;
1: -	__le16 index;
1: -	u8 opcode;
1: +  __le64 next_scb;
1: +  __le16 index;
1: +  u8 opcode;
1:  } __attribute__((packed));
1:  
1:  struct initiate_ssp_task {
1: -	u8 proto_conn_rate;
1: -	__le32 total_xfer_len;
1: -	struct ssp_frame_hdr ssp_frame;
1: -	struct ssp_command_iu ssp_cmd;
1: -	__le16 sister_scb;
1: -	__le16 conn_handle;
1: -	u8 data_dir;
1: -	u8 _r_a;
1: -	u8 retry_count;
1: -	u8 _r_b[5];
1: -	struct sg_el sg_element[3];
1: +  u8 proto_conn_rate;
1: +  __le32 total_xfer_len;
1: +  struct ssp_frame_hdr ssp_frame;
1: +  struct ssp_command_iu ssp_cmd;
1: +  __le16 sister_scb;
1: +  __le16 conn_handle;
1: +  u8 data_dir;
1: +  u8 _r_a;
1: +  u8 retry_count;
1: +  u8 _r_b[5];
1: +  struct sg_el sg_element[3];
1:  } __attribute__((packed));
1:  
1:  struct initiate_ata_task {
1: -	u8 proto_conn_rate;
1: -	__le32 total_xfer_len;
1: -	struct host_to_dev_fis fis;
1: -	__le32 data_offs;
1: -	u8 atapi_packet[16];
1: -	u8 _r_a[12];
1: -	__le16 sister_scb;
1: -	__le16 conn_handle;
1: -	u8 ata_flags;
1: -	u8 _r_b;
1: -	u8 retry_count;
1: -	u8 _r_c;
1: -	u8 flags;
1: -	u8 _r_d[3];
1: -	struct sg_el sg_element[3];
1: +  u8 proto_conn_rate;
1: +  __le32 total_xfer_len;
1: +  struct host_to_dev_fis fis;
1: +  __le32 data_offs;
1: +  u8 atapi_packet[16];
1: +  u8 _r_a[12];
1: +  __le16 sister_scb;
1: +  __le16 conn_handle;
1: +  u8 ata_flags;
1: +  u8 _r_b;
1: +  u8 retry_count;
1: +  u8 _r_c;
1: +  u8 flags;
1: +  u8 _r_d[3];
1: +  struct sg_el sg_element[3];
1:  } __attribute__((packed));
1:  
1:  struct initiate_smp_task {
1: -	u8 proto_conn_rate;
1: -	u8 _r_a[40];
1: -	struct sg_el smp_req;
1: -	__le16 sister_scb;
1: -	__le16 conn_handle;
1: -	u8 _r_c[8];
1: -	struct sg_el smp_resp;
1: -	u8 _r_d[32];
1: +  u8 proto_conn_rate;
1: +  u8 _r_a[40];
1: +  struct sg_el smp_req;
1: +  __le16 sister_scb;
1: +  __le16 conn_handle;
1: +  u8 _r_c[8];
1: +  struct sg_el smp_resp;
1: +  u8 _r_d[32];
1:  } __attribute__((packed));
1:  
1:  struct control_phy {
1: -	u8 phy_id;
1: -	u8 sub_func;
1: -	u8 func_mask;
1: -	u8 speed_mask;
1: -	u8 hot_plug_delay;
1: -	u8 port_type;
1: -	u8 flags;
1: -	__le32 timeout_override;
1: -	u8 link_reset_retries;
1: -	u8 _r_a[47];
1: -	__le16 conn_handle;
1: -	u8 _r_b[56];
1: +  u8 phy_id;
1: +  u8 sub_func;
1: +  u8 func_mask;
1: +  u8 speed_mask;
1: +  u8 hot_plug_delay;
1: +  u8 port_type;
1: +  u8 flags;
1: +  __le32 timeout_override;
1: +  u8 link_reset_retries;
1: +  u8 _r_a[47];
1: +  __le16 conn_handle;
1: +  u8 _r_b[56];
1:  } __attribute__((packed));
1:  
1:  struct control_ata_dev {
1: -	u8 proto_conn_rate;
1: -	__le32 _r_a;
1: -	struct host_to_dev_fis fis;
1: -	u8 _r_b[32];
1: -	__le16 sister_scb;
1: -	__le16 conn_handle;
1: -	u8 ata_flags;
1: -	u8 _r_c[55];
1: +  u8 proto_conn_rate;
1: +  __le32 _r_a;
1: +  struct host_to_dev_fis fis;
1: +  u8 _r_b[32];
1: +  __le16 sister_scb;
1: +  __le16 conn_handle;
1: +  u8 ata_flags;
1: +  u8 _r_c[55];
1:  } __attribute__((packed));
1:  
1:  struct empty_scb {
1: -	u8 num_valid;
1: -	__le32 _r_a;
1: -	struct sg_el eb[7];
1: +  u8 num_valid;
1: +  __le32 _r_a;
1: +  struct sg_el eb[7];
1:  } __attribute__((packed));
1:  
1:  struct initiate_link_adm {
1: -	u8 phy_id;
1: -	u8 sub_func;
1: -	u8 _r_a[57];
1: -	__le16 conn_handle;
1: -	u8 _r_b[56];
1: +  u8 phy_id;
1: +  u8 sub_func;
1: +  u8 _r_a[57];
1: +  __le16 conn_handle;
1: +  u8 _r_b[56];
1:  } __attribute__((packed));
1:  
1:  struct copy_memory {
1: -	u8 _r_a;
1: -	__le16 xfer_len;
1: -	__le16 _r_b;
1: -	__le64 src_busaddr;
1: -	u8 src_ds;
1: -	u8 _r_c[45];
1: -	__le16 conn_handle;
1: -	__le64 _r_d;
1: -	__le64 dest_busaddr;
1: -	u8 dest_ds;
1: -	u8 _r_e[39];
1: +  u8 _r_a;
1: +  __le16 xfer_len;
1: +  __le16 _r_b;
1: +  __le64 src_busaddr;
1: +  u8 src_ds;
1: +  u8 _r_c[45];
1: +  __le16 conn_handle;
1: +  __le64 _r_d;
1: +  __le64 dest_busaddr;
1: +  u8 dest_ds;
1: +  u8 _r_e[39];
1:  } __attribute__((packed));
1:  
1:  struct abort_task {
1: -	u8 proto_conn_rate;
1: -	__le32 _r_a;
1: -	struct ssp_frame_hdr ssp_frame;
1: -	struct ssp_tmf_iu ssp_task;
1: -	__le16 sister_scb;
1: -	__le16 conn_handle;
1: -	u8 flags;
1: -	u8 _r_b;
1: -	u8 retry_count;
1: -	u8 _r_c[5];
1: -	__le16 index;
1: -	__le16 itnl_to;
1: -	u8 _r_d[44];
1: +  u8 proto_conn_rate;
1: +  __le32 _r_a;
1: +  struct ssp_frame_hdr ssp_frame;
1: +  struct ssp_tmf_iu ssp_task;
1: +  __le16 sister_scb;
1: +  __le16 conn_handle;
1: +  u8 flags;
1: +  u8 _r_b;
1: +  u8 retry_count;
1: +  u8 _r_c[5];
1: +  __le16 index;
1: +  __le16 itnl_to;
1: +  u8 _r_d[44];
1:  } __attribute__((packed));
1:  
1:  struct clear_nexus {
1: -	u8 nexus;
1: -	__le32 _r_a;
1: -	u8 flags;
1: -	u8 _r_b[3];
1: -	u8 conn_mask;
1: -	u8 _r_c[19];
1: -	struct ssp_tmf_iu ssp_task;
1: -	__le16 _r_d;
1: -	__le16 conn_handle;
1: -	__le64 _r_e;
1: -	__le16 index;
1: -	__le16 context;
1: -	u8 _r_f[44];
1: +  u8 nexus;
1: +  __le32 _r_a;
1: +  u8 flags;
1: +  u8 _r_b[3];
1: +  u8 conn_mask;
1: +  u8 _r_c[19];
1: +  struct ssp_tmf_iu ssp_task;
1: +  __le16 _r_d;
1: +  __le16 conn_handle;
1: +  __le64 _r_e;
1: +  __le16 index;
1: +  __le16 context;
1: +  u8 _r_f[44];
1:  } __attribute__((packed));
1:  
1:  struct initiate_ssp_tmf {
1: -	u8 proto_conn_rate;
1: -	__le32 _r_a;
1: -	struct ssp_frame_hdr ssp_frame;
1: -	struct ssp_tmf_iu ssp_task;
1: -	__le16 sister_scb;
1: -	__le16 conn_handle;
1: -	u8 flags;
1: -	u8 _r_b;
1: -	u8 retry_count;
1: -	u8 _r_c[5];
1: -	__le16 index;
1: -	__le16 itnl_to;
1: -	u8 _r_d[44];
1: +  u8 proto_conn_rate;
1: +  __le32 _r_a;
1: +  struct ssp_frame_hdr ssp_frame;
1: +  struct ssp_tmf_iu ssp_task;
1: +  __le16 sister_scb;
1: +  __le16 conn_handle;
1: +  u8 flags;
1: +  u8 _r_b;
1: +  u8 retry_count;
1: +  u8 _r_c[5];
1: +  __le16 index;
1: +  __le16 itnl_to;
1: +  u8 _r_d[44];
1:  } __attribute__((packed));
1:  
1:  struct scb___3 {
1: -	struct scb_header header;
1: -	union {
1: -		struct initiate_ssp_task ssp_task;
1: -		struct initiate_ata_task ata_task;
1: -		struct initiate_smp_task smp_task;
1: -		struct control_phy control_phy;
1: -		struct control_ata_dev control_ata_dev;
1: -		struct empty_scb escb;
1: -		struct initiate_link_adm link_adm;
1: -		struct copy_memory cp_mem;
1: -		struct abort_task abort_task;
1: -		struct clear_nexus clear_nexus;
1: -		struct initiate_ssp_tmf ssp_tmf;
1: -	};
1: +  struct scb_header header;
1: +  union {
1: +    struct initiate_ssp_task ssp_task;
1: +    struct initiate_ata_task ata_task;
1: +    struct initiate_smp_task smp_task;
1: +    struct control_phy control_phy;
1: +    struct control_ata_dev control_ata_dev;
1: +    struct empty_scb escb;
1: +    struct initiate_link_adm link_adm;
1: +    struct copy_memory cp_mem;
1: +    struct abort_task abort_task;
1: +    struct clear_nexus clear_nexus;
1: +    struct initiate_ssp_tmf ssp_tmf;
1: +  };
1:  } __attribute__((packed));
1:  
1:  struct done_list_struct {
1: -	__le16 index;
1: -	u8 opcode;
1: -	u8 status_block[4];
1: -	u8 toggle;
1: +  __le16 index;
1: +  u8 opcode;
1: +  u8 status_block[4];
1: +  u8 toggle;
1:  };
1:  
1:  struct asd_phy_desc;
1: @@ -87626,916 +88724,916 @@ struct asd_dma_tok;
1:  struct asd_port;
1:  
1:  struct asd_phy {
1: -	struct asd_sas_phy sas_phy;
1: -	struct asd_phy_desc *phy_desc;
1: -	struct sas_identify_frame *identify_frame;
1: -	struct asd_dma_tok *id_frm_tok;
1: -	struct asd_port *asd_port;
1: -	u8 frame_rcvd[1068];
1: +  struct asd_sas_phy sas_phy;
1: +  struct asd_phy_desc *phy_desc;
1: +  struct sas_identify_frame *identify_frame;
1: +  struct asd_dma_tok *id_frm_tok;
1: +  struct asd_port *asd_port;
1: +  u8 frame_rcvd[1068];
1:  };
1:  
1:  struct asd_phy_desc {
1: -	u8 sas_addr[8];
1: -	u8 max_sas_lrate;
1: -	u8 min_sas_lrate;
1: -	u8 max_sata_lrate;
1: -	u8 min_sata_lrate;
1: -	u8 flags;
1: -	u8 phy_control_0;
1: -	u8 phy_control_1;
1: -	u8 phy_control_2;
1: -	u8 phy_control_3;
1: +  u8 sas_addr[8];
1: +  u8 max_sas_lrate;
1: +  u8 min_sas_lrate;
1: +  u8 max_sata_lrate;
1: +  u8 min_sata_lrate;
1: +  u8 flags;
1: +  u8 phy_control_0;
1: +  u8 phy_control_1;
1: +  u8 phy_control_2;
1: +  u8 phy_control_3;
1:  };
1:  
1:  struct asd_dma_tok {
1: -	void *vaddr;
1: -	dma_addr_t dma_handle;
1: -	size_t size;
1: +  void *vaddr;
1: +  dma_addr_t dma_handle;
1: +  size_t size;
1:  };
1:  
1:  struct asd_port {
1: -	u8 sas_addr[8];
1: -	u8 attached_sas_addr[8];
1: -	u32 phy_mask;
1: -	int num_phys;
1: +  u8 sas_addr[8];
1: +  u8 attached_sas_addr[8];
1: +  u32 phy_mask;
1: +  int num_phys;
1:  };
1:  
1:  struct asd_ha_addrspace {
1: -	void *addr;
1: -	long unsigned int start;
1: -	long unsigned int len;
1: -	long unsigned int flags;
1: -	u32 swa_base;
1: -	u32 swb_base;
1: -	u32 swc_base;
1: +  void *addr;
1: +  long unsigned int start;
1: +  long unsigned int len;
1: +  long unsigned int flags;
1: +  u32 swa_base;
1: +  u32 swb_base;
1: +  u32 swc_base;
1:  };
1:  
1:  struct bios_struct {
1: -	int present;
1: -	u8 maj;
1: -	u8 min;
1: -	u32 bld;
1: +  int present;
1: +  u8 maj;
1: +  u8 min;
1: +  u32 bld;
1:  };
1:  
1:  struct unit_element_struct {
1: -	u16 num;
1: -	u16 size;
1: -	void *area;
1: +  u16 num;
1: +  u16 size;
1: +  void *area;
1:  };
1:  
1:  struct flash_struct {
1: -	u32 bar;
1: -	int present;
1: -	int wide;
1: -	u8 manuf;
1: -	u8 dev_id;
1: -	u8 sec_prot;
1: -	u8 method;
1: -	u32 dir_offs;
1: +  u32 bar;
1: +  int present;
1: +  int wide;
1: +  u8 manuf;
1: +  u8 dev_id;
1: +  u8 sec_prot;
1: +  u8 method;
1: +  u32 dir_offs;
1:  };
1:  
1:  struct hw_profile {
1: -	struct bios_struct bios;
1: -	struct unit_element_struct ue;
1: -	struct flash_struct flash;
1: -	u8 sas_addr[8];
1: -	char pcba_sn[13];
1: -	u8 enabled_phys;
1: -	struct asd_phy_desc phy_desc[8];
1: -	u32 max_scbs;
1: -	struct asd_dma_tok *scb_ext;
1: -	u32 max_ddbs;
1: -	struct asd_dma_tok *ddb_ext;
1: -	spinlock_t ddb_lock;
1: -	void *ddb_bitmap;
1: -	int num_phys;
1: -	int max_phys;
1: -	unsigned int addr_range;
1: -	unsigned int port_name_base;
1: -	unsigned int dev_name_base;
1: -	unsigned int sata_name_base;
1: +  struct bios_struct bios;
1: +  struct unit_element_struct ue;
1: +  struct flash_struct flash;
1: +  u8 sas_addr[8];
1: +  char pcba_sn[13];
1: +  u8 enabled_phys;
1: +  struct asd_phy_desc phy_desc[8];
1: +  u32 max_scbs;
1: +  struct asd_dma_tok *scb_ext;
1: +  u32 max_ddbs;
1: +  struct asd_dma_tok *ddb_ext;
1: +  spinlock_t ddb_lock;
1: +  void *ddb_bitmap;
1: +  int num_phys;
1: +  int max_phys;
1: +  unsigned int addr_range;
1: +  unsigned int port_name_base;
1: +  unsigned int dev_name_base;
1: +  unsigned int sata_name_base;
1:  };
1:  
1:  struct asd_ha_struct;
1:  
1:  struct asd_ascb {
1: -	struct list_head list;
1: -	struct asd_ha_struct *ha;
1: -	struct scb___3 *scb;
1: -	struct asd_dma_tok dma_scb;
1: -	struct asd_dma_tok *sg_arr;
1: -	void (*tasklet_complete)(struct asd_ascb *, struct done_list_struct *);
1: -	u8 uldd_timer: 1;
1: -	struct timer_list timer;
1: -	struct completion *completion;
1: -	u8 tag_valid: 1;
1: -	__be16 tag;
1: -	int edb_index;
1: -	int tc_index;
1: -	void *uldd_task;
1: +  struct list_head list;
1: +  struct asd_ha_struct *ha;
1: +  struct scb___3 *scb;
1: +  struct asd_dma_tok dma_scb;
1: +  struct asd_dma_tok *sg_arr;
1: +  void (*tasklet_complete)(struct asd_ascb *, struct done_list_struct *);
1: +  u8 uldd_timer : 1;
1: +  struct timer_list timer;
1: +  struct completion *completion;
1: +  u8 tag_valid : 1;
1: +  __be16 tag;
1: +  int edb_index;
1: +  int tc_index;
1: +  void *uldd_task;
1:  };
1:  
1:  struct asd_seq_data {
1: -	spinlock_t pend_q_lock;
1: -	u16 scbpro;
1: -	int pending;
1: -	struct list_head pend_q;
1: -	int can_queue;
1: -	struct asd_dma_tok next_scb;
1: -	spinlock_t tc_index_lock;
1: -	void **tc_index_array;
1: -	void *tc_index_bitmap;
1: -	int tc_index_bitmap_bits;
1: -	struct tasklet_struct dl_tasklet;
1: -	struct done_list_struct *dl;
1: -	struct asd_dma_tok *actual_dl;
1: -	int dl_toggle;
1: -	int dl_next;
1: -	int num_edbs;
1: -	struct asd_dma_tok **edb_arr;
1: -	int num_escbs;
1: -	struct asd_ascb **escb_arr;
1: +  spinlock_t pend_q_lock;
1: +  u16 scbpro;
1: +  int pending;
1: +  struct list_head pend_q;
1: +  int can_queue;
1: +  struct asd_dma_tok next_scb;
1: +  spinlock_t tc_index_lock;
1: +  void **tc_index_array;
1: +  void *tc_index_bitmap;
1: +  int tc_index_bitmap_bits;
1: +  struct tasklet_struct dl_tasklet;
1: +  struct done_list_struct *dl;
1: +  struct asd_dma_tok *actual_dl;
1: +  int dl_toggle;
1: +  int dl_next;
1: +  int num_edbs;
1: +  struct asd_dma_tok **edb_arr;
1: +  int num_escbs;
1: +  struct asd_ascb **escb_arr;
1:  };
1:  
1:  struct asd_ha_struct {
1: -	struct pci_dev *pcidev;
1: -	const char *name;
1: -	struct sas_ha_struct sas_ha;
1: -	u8 revision_id;
1: -	int iospace;
1: -	spinlock_t iolock;
1: -	struct asd_ha_addrspace io_handle[2];
1: -	struct hw_profile hw_prof;
1: -	struct asd_phy phys[8];
1: -	spinlock_t asd_ports_lock;
1: -	struct asd_port asd_ports[8];
1: -	struct asd_sas_port ports[8];
1: -	struct dma_pool___2 *scb_pool;
1: -	struct asd_seq_data seq;
1: -	u32 bios_status;
1: -	const struct firmware *bios_image;
1: +  struct pci_dev *pcidev;
1: +  const char *name;
1: +  struct sas_ha_struct sas_ha;
1: +  u8 revision_id;
1: +  int iospace;
1: +  spinlock_t iolock;
1: +  struct asd_ha_addrspace io_handle[2];
1: +  struct hw_profile hw_prof;
1: +  struct asd_phy phys[8];
1: +  spinlock_t asd_ports_lock;
1: +  struct asd_port asd_ports[8];
1: +  struct asd_sas_port ports[8];
1: +  struct dma_pool___2 *scb_pool;
1: +  struct asd_seq_data seq;
1: +  u32 bios_status;
1: +  const struct firmware *bios_image;
1:  };
1:  
1:  struct controller_id {
1: -	u32 vendor;
1: -	u32 device;
1: -	u32 sub_vendor;
1: -	u32 sub_device;
1: +  u32 vendor;
1: +  u32 device;
1: +  u32 sub_vendor;
1: +  u32 sub_device;
1:  };
1:  
1:  struct image_info {
1: -	u32 ImageId;
1: -	u32 ImageOffset;
1: -	u32 ImageLength;
1: -	u32 ImageChecksum;
1: -	u32 ImageVersion;
1: +  u32 ImageId;
1: +  u32 ImageOffset;
1: +  u32 ImageLength;
1: +  u32 ImageChecksum;
1: +  u32 ImageVersion;
1:  };
1:  
1:  struct bios_file_header {
1: -	u8 signature[32];
1: -	u32 checksum;
1: -	u32 antidote;
1: -	struct controller_id contrl_id;
1: -	u32 filelen;
1: -	u32 chunk_num;
1: -	u32 total_chunks;
1: -	u32 num_images;
1: -	u32 build_num;
1: -	struct image_info image_header;
1: +  u8 signature[32];
1: +  u32 checksum;
1: +  u32 antidote;
1: +  struct controller_id contrl_id;
1: +  u32 filelen;
1: +  u32 chunk_num;
1: +  u32 total_chunks;
1: +  u32 num_images;
1: +  u32 build_num;
1: +  struct image_info image_header;
1:  };
1:  
1:  struct flash_command {
1: -	u8 command[8];
1: -	int code;
1: +  u8 command[8];
1: +  int code;
1:  };
1:  
1:  struct error_bios {
1: -	char *reason;
1: -	int err_code;
1: +  char *reason;
1: +  int err_code;
1:  };
1:  
1:  struct asd_pcidev_struct {
1: -	const char *name;
1: -	int (*setup)(struct asd_ha_struct *);
1: +  const char *name;
1: +  int (*setup)(struct asd_ha_struct *);
1:  };
1:  
1:  enum {
1: -	FLASH_METHOD_UNKNOWN = 0,
1: -	FLASH_METHOD_A = 1,
1: -	FLASH_METHOD_B = 2,
1: +  FLASH_METHOD_UNKNOWN = 0,
1: +  FLASH_METHOD_A = 1,
1: +  FLASH_METHOD_B = 2,
1:  };
1:  
1:  struct asd_ocm_dir_ent {
1: -	u8 type;
1: -	u8 offs[3];
1: -	u8 _r1;
1: -	u8 size[3];
1: +  u8 type;
1: +  u8 offs[3];
1: +  u8 _r1;
1: +  u8 size[3];
1:  };
1:  
1:  struct asd_ocm_dir {
1: -	char sig[2];
1: -	u8 _r1[2];
1: -	u8 major;
1: -	u8 minor;
1: -	u8 _r2;
1: -	u8 num_de;
1: -	struct asd_ocm_dir_ent entry[15];
1: +  char sig[2];
1: +  u8 _r1[2];
1: +  u8 major;
1: +  u8 minor;
1: +  u8 _r2;
1: +  u8 num_de;
1: +  struct asd_ocm_dir_ent entry[15];
1:  };
1:  
1:  struct asd_bios_chim_struct {
1: -	char sig[4];
1: -	u8 major;
1: -	u8 minor;
1: -	u8 bios_major;
1: -	u8 bios_minor;
1: -	__le32 bios_build;
1: -	u8 flags;
1: -	u8 pci_slot;
1: -	__le16 ue_num;
1: -	__le16 ue_size;
1: -	u8 _r[14];
1: +  char sig[4];
1: +  u8 major;
1: +  u8 minor;
1: +  u8 bios_major;
1: +  u8 bios_minor;
1: +  __le32 bios_build;
1: +  u8 flags;
1: +  u8 pci_slot;
1: +  __le16 ue_num;
1: +  __le16 ue_size;
1: +  u8 _r[14];
1:  };
1:  
1:  struct asd_flash_de {
1: -	__le32 type;
1: -	__le32 offs;
1: -	__le32 pad_size;
1: -	__le32 image_size;
1: -	__le32 chksum;
1: -	u8 _r[12];
1: -	u8 version[32];
1: +  __le32 type;
1: +  __le32 offs;
1: +  __le32 pad_size;
1: +  __le32 image_size;
1: +  __le32 chksum;
1: +  u8 _r[12];
1: +  u8 version[32];
1:  };
1:  
1:  struct asd_flash_dir {
1: -	u8 cookie[32];
1: -	__le32 rev;
1: -	__le32 chksum;
1: -	__le32 chksum_antidote;
1: -	__le32 bld;
1: -	u8 bld_id[32];
1: -	u8 ver_data[32];
1: -	__le32 ae_mask;
1: -	__le32 v_mask;
1: -	__le32 oc_mask;
1: -	u8 _r[20];
1: -	struct asd_flash_de dir_entry[32];
1: +  u8 cookie[32];
1: +  __le32 rev;
1: +  __le32 chksum;
1: +  __le32 chksum_antidote;
1: +  __le32 bld;
1: +  u8 bld_id[32];
1: +  u8 ver_data[32];
1: +  __le32 ae_mask;
1: +  __le32 v_mask;
1: +  __le32 oc_mask;
1: +  u8 _r[20];
1: +  struct asd_flash_de dir_entry[32];
1:  };
1:  
1:  struct asd_manuf_sec {
1: -	char sig[2];
1: -	u16 offs_next;
1: -	u8 maj;
1: -	u8 min;
1: -	u16 chksum;
1: -	u16 size;
1: -	u8 _r[6];
1: -	u8 sas_addr[8];
1: -	u8 pcba_sn[12];
1: -	u8 linked_list[0];
1: +  char sig[2];
1: +  u16 offs_next;
1: +  u8 maj;
1: +  u8 min;
1: +  u16 chksum;
1: +  u16 size;
1: +  u8 _r[6];
1: +  u8 sas_addr[8];
1: +  u8 pcba_sn[12];
1: +  u8 linked_list[0];
1:  };
1:  
1:  struct asd_manuf_phy_desc {
1: -	u8 state;
1: -	u8 phy_id;
1: -	u16 _r;
1: -	u8 phy_control_0;
1: -	u8 phy_control_1;
1: -	u8 phy_control_2;
1: -	u8 phy_control_3;
1: +  u8 state;
1: +  u8 phy_id;
1: +  u16 _r;
1: +  u8 phy_control_0;
1: +  u8 phy_control_1;
1: +  u8 phy_control_2;
1: +  u8 phy_control_3;
1:  };
1:  
1:  struct asd_manuf_phy_param {
1: -	char sig[2];
1: -	u16 next;
1: -	u8 maj;
1: -	u8 min;
1: -	u8 num_phy_desc;
1: -	u8 phy_desc_size;
1: -	u8 _r[3];
1: -	u8 usage_model_id;
1: -	u32 _r2;
1: -	struct asd_manuf_phy_desc phy_desc[8];
1: +  char sig[2];
1: +  u16 next;
1: +  u8 maj;
1: +  u8 min;
1: +  u8 num_phy_desc;
1: +  u8 phy_desc_size;
1: +  u8 _r[3];
1: +  u8 usage_model_id;
1: +  u32 _r2;
1: +  struct asd_manuf_phy_desc phy_desc[8];
1:  };
1:  
1:  struct asd_ms_sb_desc {
1: -	u8 type;
1: -	u8 node_desc_index;
1: -	u8 conn_desc_index;
1: -	u8 _recvd[0];
1: +  u8 type;
1: +  u8 node_desc_index;
1: +  u8 conn_desc_index;
1: +  u8 _recvd[0];
1:  };
1:  
1:  struct asd_ms_conn_desc {
1: -	u8 type;
1: -	u8 location;
1: -	u8 num_sideband_desc;
1: -	u8 size_sideband_desc;
1: -	u32 _resvd;
1: -	u8 name[16];
1: -	struct asd_ms_sb_desc sb_desc[0];
1: +  u8 type;
1: +  u8 location;
1: +  u8 num_sideband_desc;
1: +  u8 size_sideband_desc;
1: +  u32 _resvd;
1: +  u8 name[16];
1: +  struct asd_ms_sb_desc sb_desc[0];
1:  };
1:  
1:  struct asd_nd_phy_desc {
1: -	u8 vp_attch_type;
1: -	u8 attch_specific[0];
1: +  u8 vp_attch_type;
1: +  u8 attch_specific[0];
1:  };
1:  
1:  struct asd_ms_node_desc {
1: -	u8 type;
1: -	u8 num_phy_desc;
1: -	u8 size_phy_desc;
1: -	u8 _resvd;
1: -	u8 name[16];
1: -	struct asd_nd_phy_desc phy_desc[0];
1: +  u8 type;
1: +  u8 num_phy_desc;
1: +  u8 size_phy_desc;
1: +  u8 _resvd;
1: +  u8 name[16];
1: +  struct asd_nd_phy_desc phy_desc[0];
1:  };
1:  
1:  struct asd_ms_conn_map {
1: -	char sig[2];
1: -	__le16 next;
1: -	u8 maj;
1: -	u8 min;
1: -	__le16 cm_size;
1: -	u8 num_conn;
1: -	u8 conn_size;
1: -	u8 num_nodes;
1: -	u8 usage_model_id;
1: -	u32 _resvd;
1: -	struct asd_ms_conn_desc conn_desc[0];
1: -	struct asd_ms_node_desc node_desc[0];
1: +  char sig[2];
1: +  __le16 next;
1: +  u8 maj;
1: +  u8 min;
1: +  __le16 cm_size;
1: +  u8 num_conn;
1: +  u8 conn_size;
1: +  u8 num_nodes;
1: +  u8 usage_model_id;
1: +  u32 _resvd;
1: +  struct asd_ms_conn_desc conn_desc[0];
1: +  struct asd_ms_node_desc node_desc[0];
1:  };
1:  
1:  struct asd_ctrla_phy_entry {
1: -	u8 sas_addr[8];
1: -	u8 sas_link_rates;
1: -	u8 flags;
1: -	u8 sata_link_rates;
1: -	u8 _r[5];
1: +  u8 sas_addr[8];
1: +  u8 sas_link_rates;
1: +  u8 flags;
1: +  u8 sata_link_rates;
1: +  u8 _r[5];
1:  };
1:  
1:  struct asd_ctrla_phy_settings {
1: -	u8 id0;
1: -	u8 _r;
1: -	u16 next;
1: -	u8 num_phys;
1: -	u8 _r2[3];
1: -	struct asd_ctrla_phy_entry phy_ent[8];
1: +  u8 id0;
1: +  u8 _r;
1: +  u16 next;
1: +  u8 num_phys;
1: +  u8 _r2[3];
1: +  struct asd_ctrla_phy_entry phy_ent[8];
1:  };
1:  
1:  struct asd_ll_el {
1: -	u8 id0;
1: -	u8 id1;
1: -	__le16 next;
1: -	u8 something_here[0];
1: +  u8 id0;
1: +  u8 id1;
1: +  __le16 next;
1: +  u8 something_here[0];
1:  };
1:  
1:  struct sequencer_file_header {
1: -	u32 csum;
1: -	u32 major;
1: -	u32 minor;
1: -	char version[16];
1: -	u32 cseq_table_offset;
1: -	u32 cseq_table_size;
1: -	u32 lseq_table_offset;
1: -	u32 lseq_table_size;
1: -	u32 cseq_code_offset;
1: -	u32 cseq_code_size;
1: -	u32 lseq_code_offset;
1: -	u32 lseq_code_size;
1: -	u16 mode2_task;
1: -	u16 cseq_idle_loop;
1: -	u16 lseq_idle_loop;
1: +  u32 csum;
1: +  u32 major;
1: +  u32 minor;
1: +  char version[16];
1: +  u32 cseq_table_offset;
1: +  u32 cseq_table_size;
1: +  u32 lseq_table_offset;
1: +  u32 lseq_table_size;
1: +  u32 cseq_code_offset;
1: +  u32 cseq_code_size;
1: +  u32 lseq_code_offset;
1: +  u32 lseq_code_size;
1: +  u16 mode2_task;
1: +  u16 cseq_idle_loop;
1: +  u16 lseq_idle_loop;
1:  } __attribute__((packed));
1:  
1:  struct tasklet_completion_status {
1: -	int dl_opcode;
1: -	int tmf_state;
1: -	u8 tag_valid: 1;
1: -	__be16 tag;
1: +  int dl_opcode;
1: +  int tmf_state;
1: +  u8 tag_valid : 1;
1: +  __be16 tag;
1:  };
1:  
1:  enum clear_nexus_phase {
1: -	NEXUS_PHASE_PRE = 0,
1: -	NEXUS_PHASE_POST = 1,
1: -	NEXUS_PHASE_RESUME = 2,
1: +  NEXUS_PHASE_PRE = 0,
1: +  NEXUS_PHASE_POST = 1,
1: +  NEXUS_PHASE_RESUME = 2,
1:  };
1:  
1:  struct tc_resp_sb_struct {
1: -	__le16 index_escb;
1: -	u8 len_lsb;
1: -	u8 flags;
1: +  __le16 index_escb;
1: +  u8 len_lsb;
1: +  u8 flags;
1:  };
1:  
1:  struct ata_task_resp {
1: -	u16 frame_len;
1: -	u8 ending_fis[24];
1: +  u16 frame_len;
1: +  u8 ending_fis[24];
1:  };
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t log_drv;
1: -	uint8_t sg_count;
1: -	uint32_t lba;
1: -	uint32_t sg_addr;
1: -	uint16_t sector_count;
1: -	uint8_t segment_4G;
1: -	uint8_t enhanced_sg;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t log_drv;
1: +  uint8_t sg_count;
1: +  uint32_t lba;
1: +  uint32_t sg_addr;
1: +  uint16_t sector_count;
1: +  uint8_t segment_4G;
1: +  uint8_t enhanced_sg;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_IO_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint16_t reserved;
1: -	uint32_t reserved2;
1: -	uint32_t buffer_addr;
1: -	uint32_t reserved3;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint16_t reserved;
1: +  uint32_t reserved2;
1: +  uint32_t buffer_addr;
1: +  uint32_t reserved3;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_LD_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t reserved;
1: -	uint8_t reserved2;
1: -	uint32_t reserved3;
1: -	uint32_t buffer_addr;
1: -	uint32_t reserved4;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t reserved;
1: +  uint8_t reserved2;
1: +  uint32_t reserved3;
1: +  uint32_t buffer_addr;
1: +  uint32_t reserved4;
1:  } IPS_IOCTL_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t channel;
1: -	uint8_t reserved3;
1: -	uint8_t reserved4;
1: -	uint8_t reserved5;
1: -	uint8_t reserved6;
1: -	uint8_t reserved7;
1: -	uint8_t reserved8;
1: -	uint8_t reserved9;
1: -	uint8_t reserved10;
1: -	uint8_t reserved11;
1: -	uint8_t reserved12;
1: -	uint8_t reserved13;
1: -	uint8_t reserved14;
1: -	uint8_t adapter_flag;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t channel;
1: +  uint8_t reserved3;
1: +  uint8_t reserved4;
1: +  uint8_t reserved5;
1: +  uint8_t reserved6;
1: +  uint8_t reserved7;
1: +  uint8_t reserved8;
1: +  uint8_t reserved9;
1: +  uint8_t reserved10;
1: +  uint8_t reserved11;
1: +  uint8_t reserved12;
1: +  uint8_t reserved13;
1: +  uint8_t reserved14;
1: +  uint8_t adapter_flag;
1:  } IPS_RESET_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint16_t reserved;
1: -	uint32_t reserved2;
1: -	uint32_t dcdb_address;
1: -	uint16_t reserved3;
1: -	uint8_t segment_4G;
1: -	uint8_t enhanced_sg;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint16_t reserved;
1: +  uint32_t reserved2;
1: +  uint32_t dcdb_address;
1: +  uint16_t reserved3;
1: +  uint8_t segment_4G;
1: +  uint8_t enhanced_sg;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_DCDB_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t channel;
1: -	uint8_t source_target;
1: -	uint32_t reserved;
1: -	uint32_t reserved2;
1: -	uint32_t reserved3;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t channel;
1: +  uint8_t source_target;
1: +  uint32_t reserved;
1: +  uint32_t reserved2;
1: +  uint32_t reserved3;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_CS_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t log_drv;
1: -	uint8_t control;
1: -	uint32_t reserved;
1: -	uint32_t reserved2;
1: -	uint32_t reserved3;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t log_drv;
1: +  uint8_t control;
1: +  uint32_t reserved;
1: +  uint32_t reserved2;
1: +  uint32_t reserved3;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_US_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t reserved;
1: -	uint8_t state;
1: -	uint32_t reserved2;
1: -	uint32_t reserved3;
1: -	uint32_t reserved4;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t reserved;
1: +  uint8_t state;
1: +  uint32_t reserved2;
1: +  uint32_t reserved3;
1: +  uint32_t reserved4;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_FC_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t reserved;
1: -	uint8_t desc;
1: -	uint32_t reserved2;
1: -	uint32_t buffer_addr;
1: -	uint32_t reserved3;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t reserved;
1: +  uint8_t desc;
1: +  uint32_t reserved2;
1: +  uint32_t buffer_addr;
1: +  uint32_t reserved3;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_STATUS_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t page;
1: -	uint8_t write;
1: -	uint32_t reserved;
1: -	uint32_t buffer_addr;
1: -	uint32_t reserved2;
1: -	uint32_t ccsar;
1: -	uint32_t cccr;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t page;
1: +  uint8_t write;
1: +  uint32_t reserved;
1: +  uint32_t buffer_addr;
1: +  uint32_t reserved2;
1: +  uint32_t ccsar;
1: +  uint32_t cccr;
1:  } IPS_NVRAM_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint16_t reserved;
1: -	uint32_t count;
1: -	uint32_t buffer_addr;
1: -	uint32_t reserved2;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint16_t reserved;
1: +  uint32_t count;
1: +  uint32_t buffer_addr;
1: +  uint32_t reserved2;
1:  } IPS_VERSION_INFO;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t reset_count;
1: -	uint8_t reset_type;
1: -	uint8_t second;
1: -	uint8_t minute;
1: -	uint8_t hour;
1: -	uint8_t day;
1: -	uint8_t reserved1[4];
1: -	uint8_t month;
1: -	uint8_t yearH;
1: -	uint8_t yearL;
1: -	uint8_t reserved2;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t reset_count;
1: +  uint8_t reset_type;
1: +  uint8_t second;
1: +  uint8_t minute;
1: +  uint8_t hour;
1: +  uint8_t day;
1: +  uint8_t reserved1[4];
1: +  uint8_t month;
1: +  uint8_t yearH;
1: +  uint8_t yearL;
1: +  uint8_t reserved2;
1:  } IPS_FFDC_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t type;
1: -	uint8_t direction;
1: -	uint32_t count;
1: -	uint32_t buffer_addr;
1: -	uint8_t total_packets;
1: -	uint8_t packet_num;
1: -	uint16_t reserved;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t type;
1: +  uint8_t direction;
1: +  uint32_t count;
1: +  uint32_t buffer_addr;
1: +  uint8_t total_packets;
1: +  uint8_t packet_num;
1: +  uint16_t reserved;
1:  } IPS_FLASHFW_CMD;
1:  
1:  typedef struct {
1: -	uint8_t op_code;
1: -	uint8_t command_id;
1: -	uint8_t type;
1: -	uint8_t direction;
1: -	uint32_t count;
1: -	uint32_t buffer_addr;
1: -	uint32_t offset;
1: +  uint8_t op_code;
1: +  uint8_t command_id;
1: +  uint8_t type;
1: +  uint8_t direction;
1: +  uint32_t count;
1: +  uint32_t buffer_addr;
1: +  uint32_t offset;
1:  } IPS_FLASHBIOS_CMD;
1:  
1:  typedef union {
1: -	IPS_IO_CMD basic_io;
1: -	IPS_LD_CMD logical_info;
1: -	IPS_IOCTL_CMD ioctl_info;
1: -	IPS_DCDB_CMD dcdb;
1: -	IPS_CS_CMD config_sync;
1: -	IPS_US_CMD unlock_stripe;
1: -	IPS_FC_CMD flush_cache;
1: -	IPS_STATUS_CMD status;
1: -	IPS_NVRAM_CMD nvram;
1: -	IPS_FFDC_CMD ffdc;
1: -	IPS_FLASHFW_CMD flashfw;
1: -	IPS_FLASHBIOS_CMD flashbios;
1: -	IPS_VERSION_INFO version_info;
1: -	IPS_RESET_CMD reset;
1: +  IPS_IO_CMD basic_io;
1: +  IPS_LD_CMD logical_info;
1: +  IPS_IOCTL_CMD ioctl_info;
1: +  IPS_DCDB_CMD dcdb;
1: +  IPS_CS_CMD config_sync;
1: +  IPS_US_CMD unlock_stripe;
1: +  IPS_FC_CMD flush_cache;
1: +  IPS_STATUS_CMD status;
1: +  IPS_NVRAM_CMD nvram;
1: +  IPS_FFDC_CMD ffdc;
1: +  IPS_FLASHFW_CMD flashfw;
1: +  IPS_FLASHBIOS_CMD flashbios;
1: +  IPS_VERSION_INFO version_info;
1: +  IPS_RESET_CMD reset;
1:  } IPS_HOST_COMMAND;
1:  
1:  typedef struct {
1: -	uint8_t logical_id;
1: -	uint8_t reserved;
1: -	uint8_t raid_level;
1: -	uint8_t state;
1: -	uint32_t sector_count;
1: +  uint8_t logical_id;
1: +  uint8_t reserved;
1: +  uint8_t raid_level;
1: +  uint8_t state;
1: +  uint32_t sector_count;
1:  } IPS_DRIVE_INFO;
1:  
1:  typedef struct {
1: -	uint8_t no_of_log_drive;
1: -	uint8_t reserved[3];
1: -	IPS_DRIVE_INFO drive_info[8];
1: +  uint8_t no_of_log_drive;
1: +  uint8_t reserved[3];
1: +  IPS_DRIVE_INFO drive_info[8];
1:  } IPS_LD_INFO;
1:  
1:  typedef struct {
1: -	uint8_t device_address;
1: -	uint8_t cmd_attribute;
1: -	uint16_t transfer_length;
1: -	uint32_t buffer_pointer;
1: -	uint8_t cdb_length;
1: -	uint8_t sense_length;
1: -	uint8_t sg_count;
1: -	uint8_t reserved;
1: -	uint8_t scsi_cdb[12];
1: -	uint8_t sense_info[64];
1: -	uint8_t scsi_status;
1: -	uint8_t reserved2[3];
1: +  uint8_t device_address;
1: +  uint8_t cmd_attribute;
1: +  uint16_t transfer_length;
1: +  uint32_t buffer_pointer;
1: +  uint8_t cdb_length;
1: +  uint8_t sense_length;
1: +  uint8_t sg_count;
1: +  uint8_t reserved;
1: +  uint8_t scsi_cdb[12];
1: +  uint8_t sense_info[64];
1: +  uint8_t scsi_status;
1: +  uint8_t reserved2[3];
1:  } IPS_DCDB_TABLE;
1:  
1:  typedef struct {
1: -	uint8_t device_address;
1: -	uint8_t cmd_attribute;
1: -	uint8_t cdb_length;
1: -	uint8_t reserved_for_LUN;
1: -	uint32_t transfer_length;
1: -	uint32_t buffer_pointer;
1: -	uint16_t sg_count;
1: -	uint8_t sense_length;
1: -	uint8_t scsi_status;
1: -	uint32_t reserved;
1: -	uint8_t scsi_cdb[16];
1: -	uint8_t sense_info[56];
1: +  uint8_t device_address;
1: +  uint8_t cmd_attribute;
1: +  uint8_t cdb_length;
1: +  uint8_t reserved_for_LUN;
1: +  uint32_t transfer_length;
1: +  uint32_t buffer_pointer;
1: +  uint16_t sg_count;
1: +  uint8_t sense_length;
1: +  uint8_t scsi_status;
1: +  uint32_t reserved;
1: +  uint8_t scsi_cdb[16];
1: +  uint8_t sense_info[56];
1:  } IPS_DCDB_TABLE_TAPE;
1:  
1:  typedef union {
1: -	struct {
1: -		volatile uint8_t reserved;
1: -		volatile uint8_t command_id;
1: -		volatile uint8_t basic_status;
1: -		volatile uint8_t extended_status;
1: -	} fields;
1: -	volatile uint32_t value;
1: +  struct {
1: +    volatile uint8_t reserved;
1: +    volatile uint8_t command_id;
1: +    volatile uint8_t basic_status;
1: +    volatile uint8_t extended_status;
1: +  } fields;
1: +  volatile uint32_t value;
1:  } IPS_STATUS;
1:  
1:  typedef union {
1: -	struct {
1: -		volatile uint8_t reserved;
1: -		volatile uint8_t command_id;
1: -		volatile uint8_t basic_status;
1: -		volatile uint8_t extended_status;
1: -	} fields;
1: -	volatile uint32_t value;
1: -} *PIPS_STATUS;
1: +  struct {
1: +    volatile uint8_t reserved;
1: +    volatile uint8_t command_id;
1: +    volatile uint8_t basic_status;
1: +    volatile uint8_t extended_status;
1: +  } fields;
1: +  volatile uint32_t value;
1: +} * PIPS_STATUS;
1:  
1:  typedef struct {
1: -	IPS_STATUS status[129];
1: -	volatile PIPS_STATUS p_status_start;
1: -	volatile PIPS_STATUS p_status_end;
1: -	volatile PIPS_STATUS p_status_tail;
1: -	volatile uint32_t hw_status_start;
1: -	volatile uint32_t hw_status_tail;
1: +  IPS_STATUS status[129];
1: +  volatile PIPS_STATUS p_status_start;
1: +  volatile PIPS_STATUS p_status_end;
1: +  volatile PIPS_STATUS p_status_tail;
1: +  volatile uint32_t hw_status_start;
1: +  volatile uint32_t hw_status_tail;
1:  } IPS_ADAPTER;
1:  
1:  typedef struct {
1: -	uint8_t ucLogDriveCount;
1: -	uint8_t ucMiscFlag;
1: -	uint8_t ucSLTFlag;
1: -	uint8_t ucBSTFlag;
1: -	uint8_t ucPwrChgCnt;
1: -	uint8_t ucWrongAdrCnt;
1: -	uint8_t ucUnidentCnt;
1: -	uint8_t ucNVramDevChgCnt;
1: -	uint8_t CodeBlkVersion[8];
1: -	uint8_t BootBlkVersion[8];
1: -	uint32_t ulDriveSize[8];
1: -	uint8_t ucConcurrentCmdCount;
1: -	uint8_t ucMaxPhysicalDevices;
1: -	uint16_t usFlashRepgmCount;
1: -	uint8_t ucDefunctDiskCount;
1: -	uint8_t ucRebuildFlag;
1: -	uint8_t ucOfflineLogDrvCount;
1: -	uint8_t ucCriticalDrvCount;
1: -	uint16_t usConfigUpdateCount;
1: -	uint8_t ucBlkFlag;
1: -	uint8_t reserved;
1: -	uint16_t usAddrDeadDisk[64];
1: +  uint8_t ucLogDriveCount;
1: +  uint8_t ucMiscFlag;
1: +  uint8_t ucSLTFlag;
1: +  uint8_t ucBSTFlag;
1: +  uint8_t ucPwrChgCnt;
1: +  uint8_t ucWrongAdrCnt;
1: +  uint8_t ucUnidentCnt;
1: +  uint8_t ucNVramDevChgCnt;
1: +  uint8_t CodeBlkVersion[8];
1: +  uint8_t BootBlkVersion[8];
1: +  uint32_t ulDriveSize[8];
1: +  uint8_t ucConcurrentCmdCount;
1: +  uint8_t ucMaxPhysicalDevices;
1: +  uint16_t usFlashRepgmCount;
1: +  uint8_t ucDefunctDiskCount;
1: +  uint8_t ucRebuildFlag;
1: +  uint8_t ucOfflineLogDrvCount;
1: +  uint8_t ucCriticalDrvCount;
1: +  uint16_t usConfigUpdateCount;
1: +  uint8_t ucBlkFlag;
1: +  uint8_t reserved;
1: +  uint16_t usAddrDeadDisk[64];
1:  } IPS_ENQ;
1:  
1:  typedef struct {
1: -	uint8_t ucInitiator;
1: -	uint8_t ucParameters;
1: -	uint8_t ucMiscFlag;
1: -	uint8_t ucState;
1: -	uint32_t ulBlockCount;
1: -	uint8_t ucDeviceId[28];
1: +  uint8_t ucInitiator;
1: +  uint8_t ucParameters;
1: +  uint8_t ucMiscFlag;
1: +  uint8_t ucState;
1: +  uint32_t ulBlockCount;
1: +  uint8_t ucDeviceId[28];
1:  } IPS_DEVSTATE;
1:  
1:  typedef struct {
1: -	uint8_t ucChn;
1: -	uint8_t ucTgt;
1: -	uint16_t ucReserved;
1: -	uint32_t ulStartSect;
1: -	uint32_t ulNoOfSects;
1: +  uint8_t ucChn;
1: +  uint8_t ucTgt;
1: +  uint16_t ucReserved;
1: +  uint32_t ulStartSect;
1: +  uint32_t ulNoOfSects;
1:  } IPS_CHUNK;
1:  
1:  typedef struct {
1: -	uint16_t ucUserField;
1: -	uint8_t ucState;
1: -	uint8_t ucRaidCacheParam;
1: -	uint8_t ucNoOfChunkUnits;
1: -	uint8_t ucStripeSize;
1: -	uint8_t ucParams;
1: -	uint8_t ucReserved;
1: -	uint32_t ulLogDrvSize;
1: -	IPS_CHUNK chunk[16];
1: +  uint16_t ucUserField;
1: +  uint8_t ucState;
1: +  uint8_t ucRaidCacheParam;
1: +  uint8_t ucNoOfChunkUnits;
1: +  uint8_t ucStripeSize;
1: +  uint8_t ucParams;
1: +  uint8_t ucReserved;
1: +  uint32_t ulLogDrvSize;
1: +  IPS_CHUNK chunk[16];
1:  } IPS_LD;
1:  
1:  typedef struct {
1: -	uint8_t board_disc[8];
1: -	uint8_t processor[8];
1: -	uint8_t ucNoChanType;
1: -	uint8_t ucNoHostIntType;
1: -	uint8_t ucCompression;
1: -	uint8_t ucNvramType;
1: -	uint32_t ulNvramSize;
1: +  uint8_t board_disc[8];
1: +  uint8_t processor[8];
1: +  uint8_t ucNoChanType;
1: +  uint8_t ucNoHostIntType;
1: +  uint8_t ucCompression;
1: +  uint8_t ucNvramType;
1: +  uint32_t ulNvramSize;
1:  } IPS_HARDWARE;
1:  
1:  typedef struct {
1: -	uint8_t ucLogDriveCount;
1: -	uint8_t ucDateD;
1: -	uint8_t ucDateM;
1: -	uint8_t ucDateY;
1: -	uint8_t init_id[4];
1: -	uint8_t host_id[12];
1: -	uint8_t time_sign[8];
1: -	uint32_t UserOpt;
1: -	uint16_t user_field;
1: -	uint8_t ucRebuildRate;
1: -	uint8_t ucReserve;
1: -	IPS_HARDWARE hardware_disc;
1: -	IPS_LD logical_drive[8];
1: -	IPS_DEVSTATE dev[64];
1: -	uint8_t reserved[512];
1: +  uint8_t ucLogDriveCount;
1: +  uint8_t ucDateD;
1: +  uint8_t ucDateM;
1: +  uint8_t ucDateY;
1: +  uint8_t init_id[4];
1: +  uint8_t host_id[12];
1: +  uint8_t time_sign[8];
1: +  uint32_t UserOpt;
1: +  uint16_t user_field;
1: +  uint8_t ucRebuildRate;
1: +  uint8_t ucReserve;
1: +  IPS_HARDWARE hardware_disc;
1: +  IPS_LD logical_drive[8];
1: +  IPS_DEVSTATE dev[64];
1: +  uint8_t reserved[512];
1:  } IPS_CONF;
1:  
1:  typedef struct {
1: -	uint32_t signature;
1: -	uint8_t reserved1;
1: -	uint8_t adapter_slot;
1: -	uint16_t adapter_type;
1: -	uint8_t ctrl_bios[8];
1: -	uint8_t versioning;
1: -	uint8_t version_mismatch;
1: -	uint8_t reserved2;
1: -	uint8_t operating_system;
1: -	uint8_t driver_high[4];
1: -	uint8_t driver_low[4];
1: -	uint8_t BiosCompatibilityID[8];
1: -	uint8_t ReservedForOS2[8];
1: -	uint8_t bios_high[4];
1: -	uint8_t bios_low[4];
1: -	uint8_t adapter_order[16];
1: -	uint8_t Filler[60];
1: +  uint32_t signature;
1: +  uint8_t reserved1;
1: +  uint8_t adapter_slot;
1: +  uint16_t adapter_type;
1: +  uint8_t ctrl_bios[8];
1: +  uint8_t versioning;
1: +  uint8_t version_mismatch;
1: +  uint8_t reserved2;
1: +  uint8_t operating_system;
1: +  uint8_t driver_high[4];
1: +  uint8_t driver_low[4];
1: +  uint8_t BiosCompatibilityID[8];
1: +  uint8_t ReservedForOS2[8];
1: +  uint8_t bios_high[4];
1: +  uint8_t bios_low[4];
1: +  uint8_t adapter_order[16];
1: +  uint8_t Filler[60];
1:  } IPS_NVRAM_P5;
1:  
1:  struct _IPS_SUBSYS {
1: -	uint32_t param[128];
1: +  uint32_t param[128];
1:  };
1:  
1:  typedef struct _IPS_SUBSYS IPS_SUBSYS;
1:  
1:  typedef struct {
1: -	uint8_t DeviceType;
1: -	uint8_t DeviceTypeQualifier;
1: -	uint8_t Version;
1: -	uint8_t ResponseDataFormat;
1: -	uint8_t AdditionalLength;
1: -	uint8_t Reserved;
1: -	uint8_t Flags[2];
1: -	uint8_t VendorId[8];
1: -	uint8_t ProductId[16];
1: -	uint8_t ProductRevisionLevel[4];
1: -	uint8_t Reserved2;
1: +  uint8_t DeviceType;
1: +  uint8_t DeviceTypeQualifier;
1: +  uint8_t Version;
1: +  uint8_t ResponseDataFormat;
1: +  uint8_t AdditionalLength;
1: +  uint8_t Reserved;
1: +  uint8_t Flags[2];
1: +  uint8_t VendorId[8];
1: +  uint8_t ProductId[16];
1: +  uint8_t ProductRevisionLevel[4];
1: +  uint8_t Reserved2;
1:  } IPS_SCSI_INQ_DATA;
1:  
1:  typedef struct {
1: -	uint32_t lba;
1: -	uint32_t len;
1: +  uint32_t lba;
1: +  uint32_t len;
1:  } IPS_SCSI_CAPACITY;
1:  
1:  typedef struct {
1: -	uint8_t ResponseCode;
1: -	uint8_t SegmentNumber;
1: -	uint8_t Flags;
1: -	uint8_t Information[4];
1: -	uint8_t AdditionalLength;
1: -	uint8_t CommandSpecific[4];
1: -	uint8_t AdditionalSenseCode;
1: -	uint8_t AdditionalSenseCodeQual;
1: -	uint8_t FRUCode;
1: -	uint8_t SenseKeySpecific[3];
1: +  uint8_t ResponseCode;
1: +  uint8_t SegmentNumber;
1: +  uint8_t Flags;
1: +  uint8_t Information[4];
1: +  uint8_t AdditionalLength;
1: +  uint8_t CommandSpecific[4];
1: +  uint8_t AdditionalSenseCode;
1: +  uint8_t AdditionalSenseCodeQual;
1: +  uint8_t FRUCode;
1: +  uint8_t SenseKeySpecific[3];
1:  } IPS_SCSI_REQSEN;
1:  
1:  typedef struct {
1: -	uint8_t PageCode;
1: -	uint8_t PageLength;
1: -	uint16_t TracksPerZone;
1: -	uint16_t AltSectorsPerZone;
1: -	uint16_t AltTracksPerZone;
1: -	uint16_t AltTracksPerVolume;
1: -	uint16_t SectorsPerTrack;
1: -	uint16_t BytesPerSector;
1: -	uint16_t Interleave;
1: -	uint16_t TrackSkew;
1: -	uint16_t CylinderSkew;
1: -	uint8_t flags;
1: -	uint8_t reserved[3];
1: +  uint8_t PageCode;
1: +  uint8_t PageLength;
1: +  uint16_t TracksPerZone;
1: +  uint16_t AltSectorsPerZone;
1: +  uint16_t AltTracksPerZone;
1: +  uint16_t AltTracksPerVolume;
1: +  uint16_t SectorsPerTrack;
1: +  uint16_t BytesPerSector;
1: +  uint16_t Interleave;
1: +  uint16_t TrackSkew;
1: +  uint16_t CylinderSkew;
1: +  uint8_t flags;
1: +  uint8_t reserved[3];
1:  } IPS_SCSI_MODE_PAGE3;
1:  
1:  typedef struct {
1: -	uint8_t PageCode;
1: -	uint8_t PageLength;
1: -	uint16_t CylindersHigh;
1: -	uint8_t CylindersLow;
1: -	uint8_t Heads;
1: -	uint16_t WritePrecompHigh;
1: -	uint8_t WritePrecompLow;
1: -	uint16_t ReducedWriteCurrentHigh;
1: -	uint8_t ReducedWriteCurrentLow;
1: -	uint16_t StepRate;
1: -	uint16_t LandingZoneHigh;
1: -	uint8_t LandingZoneLow;
1: -	uint8_t flags;
1: -	uint8_t RotationalOffset;
1: -	uint8_t Reserved;
1: -	uint16_t MediumRotationRate;
1: -	uint8_t Reserved2[2];
1: +  uint8_t PageCode;
1: +  uint8_t PageLength;
1: +  uint16_t CylindersHigh;
1: +  uint8_t CylindersLow;
1: +  uint8_t Heads;
1: +  uint16_t WritePrecompHigh;
1: +  uint8_t WritePrecompLow;
1: +  uint16_t ReducedWriteCurrentHigh;
1: +  uint8_t ReducedWriteCurrentLow;
1: +  uint16_t StepRate;
1: +  uint16_t LandingZoneHigh;
1: +  uint8_t LandingZoneLow;
1: +  uint8_t flags;
1: +  uint8_t RotationalOffset;
1: +  uint8_t Reserved;
1: +  uint16_t MediumRotationRate;
1: +  uint8_t Reserved2[2];
1:  } IPS_SCSI_MODE_PAGE4;
1:  
1:  typedef struct {
1: -	uint8_t PageCode;
1: -	uint8_t PageLength;
1: -	uint8_t flags;
1: -	uint8_t RetentPrio;
1: -	uint16_t DisPrefetchLen;
1: -	uint16_t MinPrefetchLen;
1: -	uint16_t MaxPrefetchLen;
1: -	uint16_t MaxPrefetchCeiling;
1: +  uint8_t PageCode;
1: +  uint8_t PageLength;
1: +  uint8_t flags;
1: +  uint8_t RetentPrio;
1: +  uint16_t DisPrefetchLen;
1: +  uint16_t MinPrefetchLen;
1: +  uint16_t MaxPrefetchLen;
1: +  uint16_t MaxPrefetchCeiling;
1:  } IPS_SCSI_MODE_PAGE8;
1:  
1:  typedef struct {
1: -	uint32_t NumberOfBlocks;
1: -	uint8_t DensityCode;
1: -	uint16_t BlockLengthHigh;
1: -	uint8_t BlockLengthLow;
1: +  uint32_t NumberOfBlocks;
1: +  uint8_t DensityCode;
1: +  uint16_t BlockLengthHigh;
1: +  uint8_t BlockLengthLow;
1:  } IPS_SCSI_MODE_PAGE_BLKDESC;
1:  
1:  typedef struct {
1: -	uint8_t DataLength;
1: -	uint8_t MediumType;
1: -	uint8_t Reserved;
1: -	uint8_t BlockDescLength;
1: +  uint8_t DataLength;
1: +  uint8_t MediumType;
1: +  uint8_t Reserved;
1: +  uint8_t BlockDescLength;
1:  } IPS_SCSI_MODE_PAGE_HEADER;
1:  
1:  typedef struct {
1: -	IPS_SCSI_MODE_PAGE_HEADER hdr;
1: -	IPS_SCSI_MODE_PAGE_BLKDESC blkdesc;
1: -	union {
1: -		IPS_SCSI_MODE_PAGE3 pg3;
1: -		IPS_SCSI_MODE_PAGE4 pg4;
1: -		IPS_SCSI_MODE_PAGE8 pg8;
1: -	} pdata;
1: +  IPS_SCSI_MODE_PAGE_HEADER hdr;
1: +  IPS_SCSI_MODE_PAGE_BLKDESC blkdesc;
1: +  union {
1: +    IPS_SCSI_MODE_PAGE3 pg3;
1: +    IPS_SCSI_MODE_PAGE4 pg4;
1: +    IPS_SCSI_MODE_PAGE8 pg8;
1: +  } pdata;
1:  } IPS_SCSI_MODE_PAGE_DATA;
1:  
1:  struct ips_sglist {
1: -	uint32_t address;
1: -	uint32_t length;
1: +  uint32_t address;
1: +  uint32_t length;
1:  };
1:  
1:  typedef struct ips_sglist IPS_STD_SG_LIST;
1:  
1:  struct ips_enh_sglist {
1: -	uint32_t address_lo;
1: -	uint32_t address_hi;
1: -	uint32_t length;
1: -	uint32_t reserved;
1: +  uint32_t address_lo;
1: +  uint32_t address_hi;
1: +  uint32_t length;
1: +  uint32_t reserved;
1:  };
1:  
1:  typedef struct ips_enh_sglist IPS_ENH_SG_LIST;
1:  
1:  typedef union {
1: -	void *list;
1: -	IPS_STD_SG_LIST *std_list;
1: -	IPS_ENH_SG_LIST *enh_list;
1: +  void *list;
1: +  IPS_STD_SG_LIST *std_list;
1: +  IPS_ENH_SG_LIST *enh_list;
1:  } IPS_SG_LIST;
1:  
1:  typedef struct {
1: -	char *option_name;
1: -	int *option_flag;
1: -	int option_value;
1: +  char *option_name;
1: +  int *option_flag;
1: +  int option_value;
1:  } IPS_OPTION;
1:  
1:  struct ips_stat {
1: -	uint32_t residue_len;
1: -	void *scb_addr;
1: -	uint8_t padding[4];
1: +  uint32_t residue_len;
1: +  void *scb_addr;
1: +  uint8_t padding[4];
1:  };
1:  
1:  typedef struct ips_stat ips_stat_t;
1: @@ -88543,9 +89641,9 @@ typedef struct ips_stat ips_stat_t;
1:  struct ips_scb;
1:  
1:  struct ips_scb_queue {
1: -	struct ips_scb *head;
1: -	struct ips_scb *tail;
1: -	int count;
1: +  struct ips_scb *head;
1: +  struct ips_scb *tail;
1: +  int count;
1:  };
1:  
1:  struct ips_ha;
1: @@ -88555,259 +89653,259 @@ typedef struct ips_ha ips_ha_t;
1:  typedef void (*ips_scb_callback)(ips_ha_t *, struct ips_scb *);
1:  
1:  struct ips_scb {
1: -	IPS_HOST_COMMAND cmd;
1: -	IPS_DCDB_TABLE dcdb;
1: -	uint8_t target_id;
1: -	uint8_t bus;
1: -	uint8_t lun;
1: -	uint8_t cdb[12];
1: -	uint32_t scb_busaddr;
1: -	uint32_t old_data_busaddr;
1: -	uint32_t timeout;
1: -	uint8_t basic_status;
1: -	uint8_t extended_status;
1: -	uint8_t breakup;
1: -	uint8_t sg_break;
1: -	uint32_t data_len;
1: -	uint32_t sg_len;
1: -	uint32_t flags;
1: -	uint32_t op_code;
1: -	IPS_SG_LIST sg_list;
1: -	struct scsi_cmnd *scsi_cmd;
1: -	struct ips_scb *q_next;
1: -	ips_scb_callback callback;
1: -	uint32_t sg_busaddr;
1: -	int sg_count;
1: -	dma_addr_t data_busaddr;
1: +  IPS_HOST_COMMAND cmd;
1: +  IPS_DCDB_TABLE dcdb;
1: +  uint8_t target_id;
1: +  uint8_t bus;
1: +  uint8_t lun;
1: +  uint8_t cdb[12];
1: +  uint32_t scb_busaddr;
1: +  uint32_t old_data_busaddr;
1: +  uint32_t timeout;
1: +  uint8_t basic_status;
1: +  uint8_t extended_status;
1: +  uint8_t breakup;
1: +  uint8_t sg_break;
1: +  uint32_t data_len;
1: +  uint32_t sg_len;
1: +  uint32_t flags;
1: +  uint32_t op_code;
1: +  IPS_SG_LIST sg_list;
1: +  struct scsi_cmnd *scsi_cmd;
1: +  struct ips_scb *q_next;
1: +  ips_scb_callback callback;
1: +  uint32_t sg_busaddr;
1: +  int sg_count;
1: +  dma_addr_t data_busaddr;
1:  };
1:  
1:  typedef struct ips_scb_queue ips_scb_queue_t;
1:  
1:  struct ips_wait_queue {
1: -	struct scsi_cmnd *head;
1: -	struct scsi_cmnd *tail;
1: -	int count;
1: +  struct scsi_cmnd *head;
1: +  struct scsi_cmnd *tail;
1: +  int count;
1:  };
1:  
1:  typedef struct ips_wait_queue ips_wait_queue_entry_t;
1:  
1:  struct ips_copp_wait_item {
1: -	struct scsi_cmnd *scsi_cmd;
1: -	struct ips_copp_wait_item *next;
1: +  struct scsi_cmnd *scsi_cmd;
1: +  struct ips_copp_wait_item *next;
1:  };
1:  
1:  typedef struct ips_copp_wait_item ips_copp_wait_item_t;
1:  
1:  struct ips_copp_queue {
1: -	struct ips_copp_wait_item *head;
1: -	struct ips_copp_wait_item *tail;
1: -	int count;
1: +  struct ips_copp_wait_item *head;
1: +  struct ips_copp_wait_item *tail;
1: +  int count;
1:  };
1:  
1:  typedef struct ips_copp_queue ips_copp_queue_t;
1:  
1:  typedef struct {
1: -	int (*reset)(struct ips_ha *);
1: -	int (*issue)(struct ips_ha *, struct ips_scb *);
1: -	int (*isinit)(struct ips_ha *);
1: -	int (*isintr)(struct ips_ha *);
1: -	int (*init)(struct ips_ha *);
1: -	int (*erasebios)(struct ips_ha *);
1: -	int (*programbios)(struct ips_ha *, char *, uint32_t, uint32_t);
1: -	int (*verifybios)(struct ips_ha *, char *, uint32_t, uint32_t);
1: -	void (*statinit)(struct ips_ha *);
1: -	int (*intr)(struct ips_ha *);
1: -	void (*enableint)(struct ips_ha *);
1: -	uint32_t (*statupd)(struct ips_ha *);
1: +  int (*reset)(struct ips_ha *);
1: +  int (*issue)(struct ips_ha *, struct ips_scb *);
1: +  int (*isinit)(struct ips_ha *);
1: +  int (*isintr)(struct ips_ha *);
1: +  int (*init)(struct ips_ha *);
1: +  int (*erasebios)(struct ips_ha *);
1: +  int (*programbios)(struct ips_ha *, char *, uint32_t, uint32_t);
1: +  int (*verifybios)(struct ips_ha *, char *, uint32_t, uint32_t);
1: +  void (*statinit)(struct ips_ha *);
1: +  int (*intr)(struct ips_ha *);
1: +  void (*enableint)(struct ips_ha *);
1: +  uint32_t (*statupd)(struct ips_ha *);
1:  } ips_hw_func_t;
1:  
1:  struct ips_ha {
1: -	uint8_t ha_id[5];
1: -	uint32_t dcdb_active[4];
1: -	uint32_t io_addr;
1: -	uint8_t ntargets;
1: -	uint8_t nbus;
1: -	uint8_t nlun;
1: -	uint16_t ad_type;
1: -	uint16_t host_num;
1: -	uint32_t max_xfer;
1: -	uint32_t max_cmds;
1: -	uint32_t num_ioctl;
1: -	ips_stat_t sp;
1: -	struct ips_scb *scbs;
1: -	struct ips_scb *scb_freelist;
1: -	ips_wait_queue_entry_t scb_waitlist;
1: -	ips_copp_queue_t copp_waitlist;
1: -	ips_scb_queue_t scb_activelist;
1: -	IPS_IO_CMD *dummy;
1: -	IPS_ADAPTER *adapt;
1: -	IPS_LD_INFO *logical_drive_info;
1: -	dma_addr_t logical_drive_info_dma_addr;
1: -	IPS_ENQ *enq;
1: -	IPS_CONF *conf;
1: -	IPS_NVRAM_P5 *nvram;
1: -	IPS_SUBSYS *subsys;
1: -	char *ioctl_data;
1: -	uint32_t ioctl_datasize;
1: -	uint32_t cmd_in_progress;
1: -	int flags;
1: -	uint8_t waitflag;
1: -	uint8_t active;
1: -	int ioctl_reset;
1: -	uint16_t reset_count;
1: -	time64_t last_ffdc;
1: -	uint8_t slot_num;
1: -	int ioctl_len;
1: -	dma_addr_t ioctl_busaddr;
1: -	uint8_t bios_version[8];
1: -	uint32_t mem_addr;
1: -	uint32_t io_len;
1: -	uint32_t mem_len;
1: -	char *mem_ptr;
1: -	char *ioremap_ptr;
1: -	ips_hw_func_t func;
1: -	struct pci_dev *pcidev;
1: -	char *flash_data;
1: -	int flash_len;
1: -	u32 flash_datasize;
1: -	dma_addr_t flash_busaddr;
1: -	dma_addr_t enq_busaddr;
1: -	uint8_t requires_esl;
1: +  uint8_t ha_id[5];
1: +  uint32_t dcdb_active[4];
1: +  uint32_t io_addr;
1: +  uint8_t ntargets;
1: +  uint8_t nbus;
1: +  uint8_t nlun;
1: +  uint16_t ad_type;
1: +  uint16_t host_num;
1: +  uint32_t max_xfer;
1: +  uint32_t max_cmds;
1: +  uint32_t num_ioctl;
1: +  ips_stat_t sp;
1: +  struct ips_scb *scbs;
1: +  struct ips_scb *scb_freelist;
1: +  ips_wait_queue_entry_t scb_waitlist;
1: +  ips_copp_queue_t copp_waitlist;
1: +  ips_scb_queue_t scb_activelist;
1: +  IPS_IO_CMD *dummy;
1: +  IPS_ADAPTER *adapt;
1: +  IPS_LD_INFO *logical_drive_info;
1: +  dma_addr_t logical_drive_info_dma_addr;
1: +  IPS_ENQ *enq;
1: +  IPS_CONF *conf;
1: +  IPS_NVRAM_P5 *nvram;
1: +  IPS_SUBSYS *subsys;
1: +  char *ioctl_data;
1: +  uint32_t ioctl_datasize;
1: +  uint32_t cmd_in_progress;
1: +  int flags;
1: +  uint8_t waitflag;
1: +  uint8_t active;
1: +  int ioctl_reset;
1: +  uint16_t reset_count;
1: +  time64_t last_ffdc;
1: +  uint8_t slot_num;
1: +  int ioctl_len;
1: +  dma_addr_t ioctl_busaddr;
1: +  uint8_t bios_version[8];
1: +  uint32_t mem_addr;
1: +  uint32_t io_len;
1: +  uint32_t mem_len;
1: +  char *mem_ptr;
1: +  char *ioremap_ptr;
1: +  ips_hw_func_t func;
1: +  struct pci_dev *pcidev;
1: +  char *flash_data;
1: +  int flash_len;
1: +  u32 flash_datasize;
1: +  dma_addr_t flash_busaddr;
1: +  dma_addr_t enq_busaddr;
1: +  uint8_t requires_esl;
1:  };
1:  
1:  typedef struct ips_scb ips_scb_t;
1:  
1:  struct ips_scb_pt {
1: -	IPS_HOST_COMMAND cmd;
1: -	IPS_DCDB_TABLE dcdb;
1: -	uint8_t target_id;
1: -	uint8_t bus;
1: -	uint8_t lun;
1: -	uint8_t cdb[12];
1: -	uint32_t scb_busaddr;
1: -	uint32_t data_busaddr;
1: -	uint32_t timeout;
1: -	uint8_t basic_status;
1: -	uint8_t extended_status;
1: -	uint16_t breakup;
1: -	uint32_t data_len;
1: -	uint32_t sg_len;
1: -	uint32_t flags;
1: -	uint32_t op_code;
1: -	IPS_SG_LIST *sg_list;
1: -	struct scsi_cmnd *scsi_cmd;
1: -	struct ips_scb *q_next;
1: -	ips_scb_callback callback;
1: +  IPS_HOST_COMMAND cmd;
1: +  IPS_DCDB_TABLE dcdb;
1: +  uint8_t target_id;
1: +  uint8_t bus;
1: +  uint8_t lun;
1: +  uint8_t cdb[12];
1: +  uint32_t scb_busaddr;
1: +  uint32_t data_busaddr;
1: +  uint32_t timeout;
1: +  uint8_t basic_status;
1: +  uint8_t extended_status;
1: +  uint16_t breakup;
1: +  uint32_t data_len;
1: +  uint32_t sg_len;
1: +  uint32_t flags;
1: +  uint32_t op_code;
1: +  IPS_SG_LIST *sg_list;
1: +  struct scsi_cmnd *scsi_cmd;
1: +  struct ips_scb *q_next;
1: +  ips_scb_callback callback;
1:  };
1:  
1:  typedef struct ips_scb_pt ips_scb_pt_t;
1:  
1:  typedef struct {
1: -	uint8_t CoppID[4];
1: -	uint32_t CoppCmd;
1: -	uint32_t PtBuffer;
1: -	uint8_t *CmdBuffer;
1: -	uint32_t CmdBSize;
1: -	ips_scb_pt_t CoppCP;
1: -	uint32_t TimeOut;
1: -	uint8_t BasicStatus;
1: -	uint8_t ExtendedStatus;
1: -	uint8_t AdapterType;
1: -	uint8_t reserved;
1: +  uint8_t CoppID[4];
1: +  uint32_t CoppCmd;
1: +  uint32_t PtBuffer;
1: +  uint8_t *CmdBuffer;
1: +  uint32_t CmdBSize;
1: +  ips_scb_pt_t CoppCP;
1: +  uint32_t TimeOut;
1: +  uint8_t BasicStatus;
1: +  uint8_t ExtendedStatus;
1: +  uint8_t AdapterType;
1: +  uint8_t reserved;
1:  } ips_passthru_t;
1:  
1:  struct sym_chip {
1: -	u_short device_id;
1: -	u_short revision_id;
1: -	char *name;
1: -	u_char burst_max;
1: -	u_char offset_max;
1: -	u_char nr_divisor;
1: -	u_char lp_probe_bit;
1: -	u_int features;
1: +  u_short device_id;
1: +  u_short revision_id;
1: +  char *name;
1: +  u_char burst_max;
1: +  u_char offset_max;
1: +  u_char nr_divisor;
1: +  u_char lp_probe_bit;
1: +  u_int features;
1:  };
1:  
1:  struct sym_tblmove {
1: -	u32 size;
1: -	u32 addr;
1: +  u32 size;
1: +  u32 addr;
1:  };
1:  
1:  struct sym_tblsel {
1: -	u_char sel_scntl4;
1: -	u_char sel_sxfer;
1: -	u_char sel_id;
1: -	u_char sel_scntl3;
1: +  u_char sel_scntl4;
1: +  u_char sel_sxfer;
1: +  u_char sel_id;
1: +  u_char sel_scntl3;
1:  };
1:  
1:  struct sym_quehead {
1: -	struct sym_quehead *flink;
1: -	struct sym_quehead *blink;
1: +  struct sym_quehead *flink;
1: +  struct sym_quehead *blink;
1:  };
1:  
1:  typedef struct sym_quehead SYM_QUEHEAD;
1:  
1:  struct sym_slcb {
1: -	u_short reqtags;
1: -	u_short scdev_depth;
1: +  u_short reqtags;
1: +  u_short scdev_depth;
1:  };
1:  
1:  struct sym_shcb {
1: -	int unit;
1: -	char inst_name[16];
1: -	char chip_name[8];
1: -	struct Scsi_Host *host;
1: -	void *ioaddr;
1: -	void *ramaddr;
1: -	struct timer_list timer;
1: -	u_long lasttime;
1: -	u_long settle_time;
1: -	u_char settle_time_valid;
1: +  int unit;
1: +  char inst_name[16];
1: +  char chip_name[8];
1: +  struct Scsi_Host *host;
1: +  void *ioaddr;
1: +  void *ramaddr;
1: +  struct timer_list timer;
1: +  u_long lasttime;
1: +  u_long settle_time;
1: +  u_char settle_time_valid;
1:  };
1:  
1:  struct sym_hcb;
1:  
1:  struct sym_data {
1: -	struct sym_hcb *ncb;
1: -	struct completion *io_reset;
1: -	struct pci_dev *pdev;
1: +  struct sym_hcb *ncb;
1: +  struct completion *io_reset;
1: +  struct pci_dev *pdev;
1:  };
1:  
1:  struct sym_actscr {
1: -	u32 start;
1: -	u32 restart;
1: +  u32 start;
1: +  u32 restart;
1:  };
1:  
1:  struct sym_ccbh {
1: -	struct sym_actscr go;
1: -	u32 savep;
1: -	u32 lastp;
1: -	u8 status[4];
1: +  struct sym_actscr go;
1: +  u32 savep;
1: +  u32 lastp;
1: +  u8 status[4];
1:  };
1:  
1:  struct sym_tcbh {
1: -	u32 luntbl_sa;
1: -	u32 lun0_sa;
1: -	u_char uval;
1: -	u_char sval;
1: -	u_char filler1;
1: -	u_char wval;
1: +  u32 luntbl_sa;
1: +  u32 lun0_sa;
1: +  u_char uval;
1: +  u_char sval;
1: +  u_char filler1;
1: +  u_char wval;
1:  };
1:  
1:  struct sym_lcbh {
1: -	u32 resel_sa;
1: -	u32 itl_task_sa;
1: -	u32 itlq_tbl_sa;
1: +  u32 resel_sa;
1: +  u32 itl_task_sa;
1: +  u32 itlq_tbl_sa;
1:  };
1:  
1:  struct sym_trans {
1: -	u8 period;
1: -	u8 offset;
1: -	unsigned int width: 1;
1: -	unsigned int iu: 1;
1: -	unsigned int dt: 1;
1: -	unsigned int qas: 1;
1: -	unsigned int check_nego: 1;
1: -	unsigned int renego: 2;
1: +  u8 period;
1: +  u8 offset;
1: +  unsigned int width : 1;
1: +  unsigned int iu : 1;
1: +  unsigned int dt : 1;
1: +  unsigned int qas : 1;
1: +  unsigned int check_nego : 1;
1: +  unsigned int renego : 2;
1:  };
1:  
1:  struct sym_lcb;
1: @@ -88815,696 +89913,696 @@ struct sym_lcb;
1:  struct sym_ccb;
1:  
1:  struct sym_tcb {
1: -	struct sym_tcbh head;
1: -	u32 *luntbl;
1: -	int nlcb;
1: -	struct sym_lcb *lun0p;
1: -	struct sym_lcb **lunmp;
1: -	struct sym_trans tgoal;
1: -	struct sym_trans tprint;
1: -	struct sym_ccb *nego_cp;
1: -	u_char to_reset;
1: -	unsigned char usrflags;
1: -	unsigned char usr_period;
1: -	unsigned char usr_width;
1: -	short unsigned int usrtags;
1: -	struct scsi_target *starget;
1: +  struct sym_tcbh head;
1: +  u32 *luntbl;
1: +  int nlcb;
1: +  struct sym_lcb *lun0p;
1: +  struct sym_lcb **lunmp;
1: +  struct sym_trans tgoal;
1: +  struct sym_trans tprint;
1: +  struct sym_ccb *nego_cp;
1: +  u_char to_reset;
1: +  unsigned char usrflags;
1: +  unsigned char usr_period;
1: +  unsigned char usr_width;
1: +  short unsigned int usrtags;
1: +  struct scsi_target *starget;
1:  };
1:  
1:  typedef struct device *m_pool_ident_t;
1:  
1:  struct sym_fwa_ba {
1: -	u32 start;
1: -	u32 getjob_begin;
1: -	u32 getjob_end;
1: -	u32 select;
1: -	u32 wf_sel_done;
1: -	u32 send_ident;
1: -	u32 dispatch;
1: -	u32 init;
1: -	u32 clrack;
1: -	u32 complete_error;
1: -	u32 done;
1: -	u32 done_end;
1: -	u32 idle;
1: -	u32 ungetjob;
1: -	u32 reselect;
1: -	u32 resel_tag;
1: -	u32 resel_dsa;
1: -	u32 resel_no_tag;
1: -	u32 data_in;
1: -	u32 data_in2;
1: -	u32 data_out;
1: -	u32 data_out2;
1: -	u32 pm0_data;
1: -	u32 pm1_data;
1: +  u32 start;
1: +  u32 getjob_begin;
1: +  u32 getjob_end;
1: +  u32 select;
1: +  u32 wf_sel_done;
1: +  u32 send_ident;
1: +  u32 dispatch;
1: +  u32 init;
1: +  u32 clrack;
1: +  u32 complete_error;
1: +  u32 done;
1: +  u32 done_end;
1: +  u32 idle;
1: +  u32 ungetjob;
1: +  u32 reselect;
1: +  u32 resel_tag;
1: +  u32 resel_dsa;
1: +  u32 resel_no_tag;
1: +  u32 data_in;
1: +  u32 data_in2;
1: +  u32 data_out;
1: +  u32 data_out2;
1: +  u32 pm0_data;
1: +  u32 pm1_data;
1:  };
1:  
1:  struct sym_fwb_ba {
1: -	u32 no_data;
1: -	u32 sel_for_abort;
1: -	u32 sel_for_abort_1;
1: -	u32 msg_bad;
1: -	u32 msg_weird;
1: -	u32 wdtr_resp;
1: -	u32 send_wdtr;
1: -	u32 sdtr_resp;
1: -	u32 send_sdtr;
1: -	u32 ppr_resp;
1: -	u32 send_ppr;
1: -	u32 nego_bad_phase;
1: -	u32 ident_break;
1: -	u32 ident_break_atn;
1: -	u32 sdata_in;
1: -	u32 resel_bad_lun;
1: -	u32 bad_i_t_l;
1: -	u32 bad_i_t_l_q;
1: -	u32 wsr_ma_helper;
1: -	u32 start64;
1: -	u32 pm_handle;
1: +  u32 no_data;
1: +  u32 sel_for_abort;
1: +  u32 sel_for_abort_1;
1: +  u32 msg_bad;
1: +  u32 msg_weird;
1: +  u32 wdtr_resp;
1: +  u32 send_wdtr;
1: +  u32 sdtr_resp;
1: +  u32 send_sdtr;
1: +  u32 ppr_resp;
1: +  u32 send_ppr;
1: +  u32 nego_bad_phase;
1: +  u32 ident_break;
1: +  u32 ident_break_atn;
1: +  u32 sdata_in;
1: +  u32 resel_bad_lun;
1: +  u32 bad_i_t_l;
1: +  u32 bad_i_t_l_q;
1: +  u32 wsr_ma_helper;
1: +  u32 start64;
1: +  u32 pm_handle;
1:  };
1:  
1:  struct sym_fwz_ba {
1: -	u32 snooptest;
1: -	u32 snoopend;
1: +  u32 snooptest;
1: +  u32 snoopend;
1:  };
1:  
1:  struct sym_fw;
1:  
1:  struct sym_hcb {
1: -	struct sym_ccbh ccb_head;
1: -	struct sym_tcbh tcb_head;
1: -	struct sym_lcbh lcb_head;
1: -	struct sym_actscr idletask;
1: -	struct sym_actscr notask;
1: -	struct sym_actscr bad_itl;
1: -	struct sym_actscr bad_itlq;
1: -	u32 idletask_ba;
1: -	u32 notask_ba;
1: -	u32 bad_itl_ba;
1: -	u32 bad_itlq_ba;
1: -	u32 *badluntbl;
1: -	u32 badlun_sa;
1: -	u32 hcb_ba;
1: -	u32 scr_ram_seg;
1: -	u_char sv_scntl0;
1: -	u_char sv_scntl3;
1: -	u_char sv_dmode;
1: -	u_char sv_dcntl;
1: -	u_char sv_ctest3;
1: -	u_char sv_ctest4;
1: -	u_char sv_ctest5;
1: -	u_char sv_gpcntl;
1: -	u_char sv_stest2;
1: -	u_char sv_stest4;
1: -	u_char sv_scntl4;
1: -	u_char sv_stest1;
1: -	u_char rv_scntl0;
1: -	u_char rv_scntl3;
1: -	u_char rv_dmode;
1: -	u_char rv_dcntl;
1: -	u_char rv_ctest3;
1: -	u_char rv_ctest4;
1: -	u_char rv_ctest5;
1: -	u_char rv_stest2;
1: -	u_char rv_ccntl0;
1: -	u_char rv_ccntl1;
1: -	u_char rv_scntl4;
1: -	struct sym_tcb target[16];
1: -	u32 *targtbl;
1: -	u32 targtbl_ba;
1: -	m_pool_ident_t bus_dmat;
1: -	struct sym_shcb s;
1: -	u32 mmio_ba;
1: -	u32 ram_ba;
1: -	u_char *scripta0;
1: -	u_char *scriptb0;
1: -	u_char *scriptz0;
1: -	u32 scripta_ba;
1: -	u32 scriptb_ba;
1: -	u32 scriptz_ba;
1: -	u_short scripta_sz;
1: -	u_short scriptb_sz;
1: -	u_short scriptz_sz;
1: -	struct sym_fwa_ba fwa_bas;
1: -	struct sym_fwb_ba fwb_bas;
1: -	struct sym_fwz_ba fwz_bas;
1: -	void (*fw_setup)(struct sym_hcb *, struct sym_fw *);
1: -	void (*fw_patch)(struct Scsi_Host *);
1: -	char *fw_name;
1: -	u_int features;
1: -	u_char myaddr;
1: -	u_char maxburst;
1: -	u_char maxwide;
1: -	u_char minsync;
1: -	u_char maxsync;
1: -	u_char maxoffs;
1: -	u_char minsync_dt;
1: -	u_char maxsync_dt;
1: -	u_char maxoffs_dt;
1: -	u_char multiplier;
1: -	u_char clock_divn;
1: -	u32 clock_khz;
1: -	u32 pciclk_khz;
1: -	volatile u32 *squeue;
1: -	u32 squeue_ba;
1: -	u_short squeueput;
1: -	u_short actccbs;
1: -	u_short dqueueget;
1: -	volatile u32 *dqueue;
1: -	u32 dqueue_ba;
1: -	u_char msgout[8];
1: -	u_char msgin[8];
1: -	u32 lastmsg;
1: -	u32 scratch;
1: -	u_char usrflags;
1: -	u_char scsi_mode;
1: -	u_char verbose;
1: -	struct sym_ccb **ccbh;
1: -	SYM_QUEHEAD free_ccbq;
1: -	SYM_QUEHEAD busy_ccbq;
1: -	SYM_QUEHEAD comp_ccbq;
1: -	u_char abrt_msg[4];
1: -	struct sym_tblmove abrt_tbl;
1: -	struct sym_tblsel abrt_sel;
1: -	u_char istat_sem;
1: -	u_char use_dac;
1: +  struct sym_ccbh ccb_head;
1: +  struct sym_tcbh tcb_head;
1: +  struct sym_lcbh lcb_head;
1: +  struct sym_actscr idletask;
1: +  struct sym_actscr notask;
1: +  struct sym_actscr bad_itl;
1: +  struct sym_actscr bad_itlq;
1: +  u32 idletask_ba;
1: +  u32 notask_ba;
1: +  u32 bad_itl_ba;
1: +  u32 bad_itlq_ba;
1: +  u32 *badluntbl;
1: +  u32 badlun_sa;
1: +  u32 hcb_ba;
1: +  u32 scr_ram_seg;
1: +  u_char sv_scntl0;
1: +  u_char sv_scntl3;
1: +  u_char sv_dmode;
1: +  u_char sv_dcntl;
1: +  u_char sv_ctest3;
1: +  u_char sv_ctest4;
1: +  u_char sv_ctest5;
1: +  u_char sv_gpcntl;
1: +  u_char sv_stest2;
1: +  u_char sv_stest4;
1: +  u_char sv_scntl4;
1: +  u_char sv_stest1;
1: +  u_char rv_scntl0;
1: +  u_char rv_scntl3;
1: +  u_char rv_dmode;
1: +  u_char rv_dcntl;
1: +  u_char rv_ctest3;
1: +  u_char rv_ctest4;
1: +  u_char rv_ctest5;
1: +  u_char rv_stest2;
1: +  u_char rv_ccntl0;
1: +  u_char rv_ccntl1;
1: +  u_char rv_scntl4;
1: +  struct sym_tcb target[16];
1: +  u32 *targtbl;
1: +  u32 targtbl_ba;
1: +  m_pool_ident_t bus_dmat;
1: +  struct sym_shcb s;
1: +  u32 mmio_ba;
1: +  u32 ram_ba;
1: +  u_char *scripta0;
1: +  u_char *scriptb0;
1: +  u_char *scriptz0;
1: +  u32 scripta_ba;
1: +  u32 scriptb_ba;
1: +  u32 scriptz_ba;
1: +  u_short scripta_sz;
1: +  u_short scriptb_sz;
1: +  u_short scriptz_sz;
1: +  struct sym_fwa_ba fwa_bas;
1: +  struct sym_fwb_ba fwb_bas;
1: +  struct sym_fwz_ba fwz_bas;
1: +  void (*fw_setup)(struct sym_hcb *, struct sym_fw *);
1: +  void (*fw_patch)(struct Scsi_Host *);
1: +  char *fw_name;
1: +  u_int features;
1: +  u_char myaddr;
1: +  u_char maxburst;
1: +  u_char maxwide;
1: +  u_char minsync;
1: +  u_char maxsync;
1: +  u_char maxoffs;
1: +  u_char minsync_dt;
1: +  u_char maxsync_dt;
1: +  u_char maxoffs_dt;
1: +  u_char multiplier;
1: +  u_char clock_divn;
1: +  u32 clock_khz;
1: +  u32 pciclk_khz;
1: +  volatile u32 *squeue;
1: +  u32 squeue_ba;
1: +  u_short squeueput;
1: +  u_short actccbs;
1: +  u_short dqueueget;
1: +  volatile u32 *dqueue;
1: +  u32 dqueue_ba;
1: +  u_char msgout[8];
1: +  u_char msgin[8];
1: +  u32 lastmsg;
1: +  u32 scratch;
1: +  u_char usrflags;
1: +  u_char scsi_mode;
1: +  u_char verbose;
1: +  struct sym_ccb **ccbh;
1: +  SYM_QUEHEAD free_ccbq;
1: +  SYM_QUEHEAD busy_ccbq;
1: +  SYM_QUEHEAD comp_ccbq;
1: +  u_char abrt_msg[4];
1: +  struct sym_tblmove abrt_tbl;
1: +  struct sym_tblsel abrt_sel;
1: +  u_char istat_sem;
1: +  u_char use_dac;
1:  };
1:  
1:  struct sym_fwa_ofs {
1: -	u_short start;
1: -	u_short getjob_begin;
1: -	u_short getjob_end;
1: -	u_short select;
1: -	u_short wf_sel_done;
1: -	u_short send_ident;
1: -	u_short dispatch;
1: -	u_short init;
1: -	u_short clrack;
1: -	u_short complete_error;
1: -	u_short done;
1: -	u_short done_end;
1: -	u_short idle;
1: -	u_short ungetjob;
1: -	u_short reselect;
1: -	u_short resel_tag;
1: -	u_short resel_dsa;
1: -	u_short resel_no_tag;
1: -	u_short data_in;
1: -	u_short data_in2;
1: -	u_short data_out;
1: -	u_short data_out2;
1: -	u_short pm0_data;
1: -	u_short pm1_data;
1: +  u_short start;
1: +  u_short getjob_begin;
1: +  u_short getjob_end;
1: +  u_short select;
1: +  u_short wf_sel_done;
1: +  u_short send_ident;
1: +  u_short dispatch;
1: +  u_short init;
1: +  u_short clrack;
1: +  u_short complete_error;
1: +  u_short done;
1: +  u_short done_end;
1: +  u_short idle;
1: +  u_short ungetjob;
1: +  u_short reselect;
1: +  u_short resel_tag;
1: +  u_short resel_dsa;
1: +  u_short resel_no_tag;
1: +  u_short data_in;
1: +  u_short data_in2;
1: +  u_short data_out;
1: +  u_short data_out2;
1: +  u_short pm0_data;
1: +  u_short pm1_data;
1:  };
1:  
1:  struct sym_fwb_ofs {
1: -	u_short no_data;
1: -	u_short sel_for_abort;
1: -	u_short sel_for_abort_1;
1: -	u_short msg_bad;
1: -	u_short msg_weird;
1: -	u_short wdtr_resp;
1: -	u_short send_wdtr;
1: -	u_short sdtr_resp;
1: -	u_short send_sdtr;
1: -	u_short ppr_resp;
1: -	u_short send_ppr;
1: -	u_short nego_bad_phase;
1: -	u_short ident_break;
1: -	u_short ident_break_atn;
1: -	u_short sdata_in;
1: -	u_short resel_bad_lun;
1: -	u_short bad_i_t_l;
1: -	u_short bad_i_t_l_q;
1: -	u_short wsr_ma_helper;
1: -	u_short start64;
1: -	u_short pm_handle;
1: +  u_short no_data;
1: +  u_short sel_for_abort;
1: +  u_short sel_for_abort_1;
1: +  u_short msg_bad;
1: +  u_short msg_weird;
1: +  u_short wdtr_resp;
1: +  u_short send_wdtr;
1: +  u_short sdtr_resp;
1: +  u_short send_sdtr;
1: +  u_short ppr_resp;
1: +  u_short send_ppr;
1: +  u_short nego_bad_phase;
1: +  u_short ident_break;
1: +  u_short ident_break_atn;
1: +  u_short sdata_in;
1: +  u_short resel_bad_lun;
1: +  u_short bad_i_t_l;
1: +  u_short bad_i_t_l_q;
1: +  u_short wsr_ma_helper;
1: +  u_short start64;
1: +  u_short pm_handle;
1:  };
1:  
1:  struct sym_fwz_ofs {
1: -	u_short snooptest;
1: -	u_short snoopend;
1: +  u_short snooptest;
1: +  u_short snoopend;
1:  };
1:  
1:  struct sym_fw {
1: -	char *name;
1: -	u32 *a_base;
1: -	int a_size;
1: -	struct sym_fwa_ofs *a_ofs;
1: -	u32 *b_base;
1: -	int b_size;
1: -	struct sym_fwb_ofs *b_ofs;
1: -	u32 *z_base;
1: -	int z_size;
1: -	struct sym_fwz_ofs *z_ofs;
1: -	void (*setup)(struct sym_hcb *, struct sym_fw *);
1: -	void (*patch)(struct Scsi_Host *);
1: +  char *name;
1: +  u32 *a_base;
1: +  int a_size;
1: +  struct sym_fwa_ofs *a_ofs;
1: +  u32 *b_base;
1: +  int b_size;
1: +  struct sym_fwb_ofs *b_ofs;
1: +  u32 *z_base;
1: +  int z_size;
1: +  struct sym_fwz_ofs *z_ofs;
1: +  void (*setup)(struct sym_hcb *, struct sym_fw *);
1: +  void (*patch)(struct Scsi_Host *);
1:  };
1:  
1:  struct sym_lcb {
1: -	struct sym_lcbh head;
1: -	u32 *itlq_tbl;
1: -	u_short busy_itlq;
1: -	u_short busy_itl;
1: -	u_short ia_tag;
1: -	u_short if_tag;
1: -	u_char *cb_tags;
1: -	struct sym_slcb s;
1: -	u_char tags_si;
1: -	u_short tags_sum[2];
1: -	u_short tags_since;
1: -	u_char to_clear;
1: -	u_char user_flags;
1: -	u_char curr_flags;
1: +  struct sym_lcbh head;
1: +  u32 *itlq_tbl;
1: +  u_short busy_itlq;
1: +  u_short busy_itl;
1: +  u_short ia_tag;
1: +  u_short if_tag;
1: +  u_char *cb_tags;
1: +  struct sym_slcb s;
1: +  u_char tags_si;
1: +  u_short tags_sum[2];
1: +  u_short tags_since;
1: +  u_char to_clear;
1: +  u_char user_flags;
1: +  u_char curr_flags;
1:  };
1:  
1:  struct sym_pmc {
1: -	struct sym_tblmove sg;
1: -	u32 ret;
1: +  struct sym_tblmove sg;
1: +  u32 ret;
1:  };
1:  
1:  struct sym_dsb {
1: -	struct sym_ccbh head;
1: -	struct sym_pmc pm0;
1: -	struct sym_pmc pm1;
1: -	struct sym_tblsel select;
1: -	struct sym_tblmove smsg;
1: -	struct sym_tblmove smsg_ext;
1: -	struct sym_tblmove cmd;
1: -	struct sym_tblmove sense;
1: -	struct sym_tblmove wresid;
1: -	struct sym_tblmove data[96];
1: +  struct sym_ccbh head;
1: +  struct sym_pmc pm0;
1: +  struct sym_pmc pm1;
1: +  struct sym_tblsel select;
1: +  struct sym_tblmove smsg;
1: +  struct sym_tblmove smsg_ext;
1: +  struct sym_tblmove cmd;
1: +  struct sym_tblmove sense;
1: +  struct sym_tblmove wresid;
1: +  struct sym_tblmove data[96];
1:  };
1:  
1:  struct sym_ccb {
1: -	struct sym_dsb phys;
1: -	struct scsi_cmnd *cmd;
1: -	u8 cdb_buf[16];
1: -	u8 sns_bbuf[32];
1: -	int data_len;
1: -	int segments;
1: -	u8 order;
1: -	unsigned char odd_byte_adjustment;
1: -	u_char nego_status;
1: -	u_char xerr_status;
1: -	u32 extra_bytes;
1: -	u_char scsi_smsg[12];
1: -	u_char scsi_smsg2[12];
1: -	u_char sensecmd[6];
1: -	u_char sv_scsi_status;
1: -	u_char sv_xerr_status;
1: -	int sv_resid;
1: -	u32 ccb_ba;
1: -	u_short tag;
1: -	u_char target;
1: -	u_char lun;
1: -	struct sym_ccb *link_ccbh;
1: -	SYM_QUEHEAD link_ccbq;
1: -	u32 startp;
1: -	u32 goalp;
1: -	int ext_sg;
1: -	int ext_ofs;
1: -	u_char to_abort;
1: -	u_char tags_si;
1: +  struct sym_dsb phys;
1: +  struct scsi_cmnd *cmd;
1: +  u8 cdb_buf[16];
1: +  u8 sns_bbuf[32];
1: +  int data_len;
1: +  int segments;
1: +  u8 order;
1: +  unsigned char odd_byte_adjustment;
1: +  u_char nego_status;
1: +  u_char xerr_status;
1: +  u32 extra_bytes;
1: +  u_char scsi_smsg[12];
1: +  u_char scsi_smsg2[12];
1: +  u_char sensecmd[6];
1: +  u_char sv_scsi_status;
1: +  u_char sv_xerr_status;
1: +  int sv_resid;
1: +  u32 ccb_ba;
1: +  u_short tag;
1: +  u_char target;
1: +  u_char lun;
1: +  struct sym_ccb *link_ccbh;
1: +  SYM_QUEHEAD link_ccbq;
1: +  u32 startp;
1: +  u32 goalp;
1: +  int ext_sg;
1: +  int ext_ofs;
1: +  u_char to_abort;
1: +  u_char tags_si;
1:  };
1:  
1:  struct sym_fw1a_scr {
1: -	u32 start[11];
1: -	u32 getjob_begin[4];
1: -	u32 _sms_a10[5];
1: -	u32 getjob_end[4];
1: -	u32 _sms_a20[4];
1: -	u32 select[6];
1: -	u32 _sms_a30[5];
1: -	u32 wf_sel_done[2];
1: -	u32 send_ident[2];
1: -	u32 select2[2];
1: -	u32 command[2];
1: -	u32 dispatch[28];
1: -	u32 sel_no_cmd[10];
1: -	u32 init[6];
1: -	u32 clrack[4];
1: -	u32 datai_done[11];
1: -	u32 datai_done_wsr[20];
1: -	u32 datao_done[11];
1: -	u32 datao_done_wss[6];
1: -	u32 datai_phase[5];
1: -	u32 datao_phase[5];
1: -	u32 msg_in[2];
1: -	u32 msg_in2[10];
1: -	u32 status[10];
1: -	u32 complete[6];
1: -	u32 complete2[8];
1: -	u32 _sms_a40[12];
1: -	u32 done[5];
1: -	u32 _sms_a50[5];
1: -	u32 _sms_a60[2];
1: -	u32 done_end[4];
1: -	u32 complete_error[5];
1: -	u32 save_dp[11];
1: -	u32 restore_dp[7];
1: -	u32 disconnect[11];
1: -	u32 disconnect2[5];
1: -	u32 _sms_a65[3];
1: -	u32 idle[2];
1: -	u32 ungetjob[5];
1: -	u32 reselect[2];
1: -	u32 reselected[19];
1: -	u32 _sms_a70[6];
1: -	u32 _sms_a80[4];
1: -	u32 reselected1[25];
1: -	u32 _sms_a90[4];
1: -	u32 resel_lun0[7];
1: -	u32 _sms_a100[4];
1: -	u32 resel_tag[8];
1: -	u32 _sms_a110[13];
1: -	u32 _sms_a120[2];
1: -	u32 resel_go[4];
1: -	u32 _sms_a130[7];
1: -	u32 resel_dsa[2];
1: -	u32 resel_dsa1[4];
1: -	u32 _sms_a140[7];
1: -	u32 resel_no_tag[4];
1: -	u32 _sms_a145[7];
1: -	u32 data_in[192];
1: -	u32 data_in2[4];
1: -	u32 data_out[192];
1: -	u32 data_out2[4];
1: -	u32 pm0_data[12];
1: -	u32 pm0_data_out[6];
1: -	u32 pm0_data_end[7];
1: -	u32 pm_data_end[4];
1: -	u32 _sms_a150[4];
1: -	u32 pm1_data[12];
1: -	u32 pm1_data_out[6];
1: -	u32 pm1_data_end[9];
1: +  u32 start[11];
1: +  u32 getjob_begin[4];
1: +  u32 _sms_a10[5];
1: +  u32 getjob_end[4];
1: +  u32 _sms_a20[4];
1: +  u32 select[6];
1: +  u32 _sms_a30[5];
1: +  u32 wf_sel_done[2];
1: +  u32 send_ident[2];
1: +  u32 select2[2];
1: +  u32 command[2];
1: +  u32 dispatch[28];
1: +  u32 sel_no_cmd[10];
1: +  u32 init[6];
1: +  u32 clrack[4];
1: +  u32 datai_done[11];
1: +  u32 datai_done_wsr[20];
1: +  u32 datao_done[11];
1: +  u32 datao_done_wss[6];
1: +  u32 datai_phase[5];
1: +  u32 datao_phase[5];
1: +  u32 msg_in[2];
1: +  u32 msg_in2[10];
1: +  u32 status[10];
1: +  u32 complete[6];
1: +  u32 complete2[8];
1: +  u32 _sms_a40[12];
1: +  u32 done[5];
1: +  u32 _sms_a50[5];
1: +  u32 _sms_a60[2];
1: +  u32 done_end[4];
1: +  u32 complete_error[5];
1: +  u32 save_dp[11];
1: +  u32 restore_dp[7];
1: +  u32 disconnect[11];
1: +  u32 disconnect2[5];
1: +  u32 _sms_a65[3];
1: +  u32 idle[2];
1: +  u32 ungetjob[5];
1: +  u32 reselect[2];
1: +  u32 reselected[19];
1: +  u32 _sms_a70[6];
1: +  u32 _sms_a80[4];
1: +  u32 reselected1[25];
1: +  u32 _sms_a90[4];
1: +  u32 resel_lun0[7];
1: +  u32 _sms_a100[4];
1: +  u32 resel_tag[8];
1: +  u32 _sms_a110[13];
1: +  u32 _sms_a120[2];
1: +  u32 resel_go[4];
1: +  u32 _sms_a130[7];
1: +  u32 resel_dsa[2];
1: +  u32 resel_dsa1[4];
1: +  u32 _sms_a140[7];
1: +  u32 resel_no_tag[4];
1: +  u32 _sms_a145[7];
1: +  u32 data_in[192];
1: +  u32 data_in2[4];
1: +  u32 data_out[192];
1: +  u32 data_out2[4];
1: +  u32 pm0_data[12];
1: +  u32 pm0_data_out[6];
1: +  u32 pm0_data_end[7];
1: +  u32 pm_data_end[4];
1: +  u32 _sms_a150[4];
1: +  u32 pm1_data[12];
1: +  u32 pm1_data_out[6];
1: +  u32 pm1_data_end[9];
1:  };
1:  
1:  struct sym_fw1b_scr {
1: -	u32 no_data[2];
1: -	u32 sel_for_abort[16];
1: -	u32 sel_for_abort_1[2];
1: -	u32 msg_in_etc[12];
1: -	u32 msg_received[5];
1: -	u32 msg_weird_seen[5];
1: -	u32 msg_extended[17];
1: -	u32 _sms_b10[4];
1: -	u32 msg_bad[6];
1: -	u32 msg_weird[4];
1: -	u32 msg_weird1[8];
1: -	u32 wdtr_resp[6];
1: -	u32 send_wdtr[4];
1: -	u32 sdtr_resp[6];
1: -	u32 send_sdtr[4];
1: -	u32 ppr_resp[6];
1: -	u32 send_ppr[4];
1: -	u32 nego_bad_phase[4];
1: -	u32 msg_out[4];
1: -	u32 msg_out_done[4];
1: -	u32 data_ovrun[3];
1: -	u32 data_ovrun1[22];
1: -	u32 data_ovrun2[8];
1: -	u32 abort_resel[16];
1: -	u32 resend_ident[4];
1: -	u32 ident_break[4];
1: -	u32 ident_break_atn[4];
1: -	u32 sdata_in[6];
1: -	u32 resel_bad_lun[4];
1: -	u32 bad_i_t_l[4];
1: -	u32 bad_i_t_l_q[4];
1: -	u32 bad_status[7];
1: -	u32 wsr_ma_helper[4];
1: -	u32 zero[1];
1: -	u32 scratch[1];
1: -	u32 scratch1[1];
1: -	u32 prev_done[1];
1: -	u32 done_pos[1];
1: -	u32 nextjob[1];
1: -	u32 startpos[1];
1: -	u32 targtbl[1];
1: +  u32 no_data[2];
1: +  u32 sel_for_abort[16];
1: +  u32 sel_for_abort_1[2];
1: +  u32 msg_in_etc[12];
1: +  u32 msg_received[5];
1: +  u32 msg_weird_seen[5];
1: +  u32 msg_extended[17];
1: +  u32 _sms_b10[4];
1: +  u32 msg_bad[6];
1: +  u32 msg_weird[4];
1: +  u32 msg_weird1[8];
1: +  u32 wdtr_resp[6];
1: +  u32 send_wdtr[4];
1: +  u32 sdtr_resp[6];
1: +  u32 send_sdtr[4];
1: +  u32 ppr_resp[6];
1: +  u32 send_ppr[4];
1: +  u32 nego_bad_phase[4];
1: +  u32 msg_out[4];
1: +  u32 msg_out_done[4];
1: +  u32 data_ovrun[3];
1: +  u32 data_ovrun1[22];
1: +  u32 data_ovrun2[8];
1: +  u32 abort_resel[16];
1: +  u32 resend_ident[4];
1: +  u32 ident_break[4];
1: +  u32 ident_break_atn[4];
1: +  u32 sdata_in[6];
1: +  u32 resel_bad_lun[4];
1: +  u32 bad_i_t_l[4];
1: +  u32 bad_i_t_l_q[4];
1: +  u32 bad_status[7];
1: +  u32 wsr_ma_helper[4];
1: +  u32 zero[1];
1: +  u32 scratch[1];
1: +  u32 scratch1[1];
1: +  u32 prev_done[1];
1: +  u32 done_pos[1];
1: +  u32 nextjob[1];
1: +  u32 startpos[1];
1: +  u32 targtbl[1];
1:  };
1:  
1:  struct sym_fw1z_scr {
1: -	u32 snooptest[9];
1: -	u32 snoopend[2];
1: +  u32 snooptest[9];
1: +  u32 snoopend[2];
1:  };
1:  
1:  struct sym_fw2a_scr {
1: -	u32 start[14];
1: -	u32 getjob_begin[4];
1: -	u32 getjob_end[4];
1: -	u32 select[4];
1: -	u32 wf_sel_done[2];
1: -	u32 sel_done[2];
1: -	u32 send_ident[2];
1: -	u32 select2[2];
1: -	u32 command[2];
1: -	u32 dispatch[28];
1: -	u32 sel_no_cmd[10];
1: -	u32 init[6];
1: -	u32 clrack[4];
1: -	u32 datai_done[10];
1: -	u32 datai_done_wsr[20];
1: -	u32 datao_done[10];
1: -	u32 datao_done_wss[6];
1: -	u32 datai_phase[4];
1: -	u32 datao_phase[6];
1: -	u32 msg_in[2];
1: -	u32 msg_in2[10];
1: -	u32 status[10];
1: -	u32 complete[6];
1: -	u32 complete2[12];
1: -	u32 done[14];
1: -	u32 done_end[2];
1: -	u32 complete_error[4];
1: -	u32 save_dp[12];
1: -	u32 restore_dp[8];
1: -	u32 disconnect[12];
1: -	u32 idle[2];
1: -	u32 ungetjob[4];
1: -	u32 reselect[2];
1: -	u32 reselected[22];
1: -	u32 resel_scntl4[20];
1: -	u32 resel_lun0[6];
1: -	u32 resel_tag[16];
1: -	u32 resel_dsa[2];
1: -	u32 resel_dsa1[4];
1: -	u32 resel_no_tag[6];
1: -	u32 data_in[192];
1: -	u32 data_in2[4];
1: -	u32 data_out[192];
1: -	u32 data_out2[4];
1: -	u32 pm0_data[12];
1: -	u32 pm0_data_out[6];
1: -	u32 pm0_data_end[6];
1: -	u32 pm1_data[12];
1: -	u32 pm1_data_out[6];
1: -	u32 pm1_data_end[6];
1: +  u32 start[14];
1: +  u32 getjob_begin[4];
1: +  u32 getjob_end[4];
1: +  u32 select[4];
1: +  u32 wf_sel_done[2];
1: +  u32 sel_done[2];
1: +  u32 send_ident[2];
1: +  u32 select2[2];
1: +  u32 command[2];
1: +  u32 dispatch[28];
1: +  u32 sel_no_cmd[10];
1: +  u32 init[6];
1: +  u32 clrack[4];
1: +  u32 datai_done[10];
1: +  u32 datai_done_wsr[20];
1: +  u32 datao_done[10];
1: +  u32 datao_done_wss[6];
1: +  u32 datai_phase[4];
1: +  u32 datao_phase[6];
1: +  u32 msg_in[2];
1: +  u32 msg_in2[10];
1: +  u32 status[10];
1: +  u32 complete[6];
1: +  u32 complete2[12];
1: +  u32 done[14];
1: +  u32 done_end[2];
1: +  u32 complete_error[4];
1: +  u32 save_dp[12];
1: +  u32 restore_dp[8];
1: +  u32 disconnect[12];
1: +  u32 idle[2];
1: +  u32 ungetjob[4];
1: +  u32 reselect[2];
1: +  u32 reselected[22];
1: +  u32 resel_scntl4[20];
1: +  u32 resel_lun0[6];
1: +  u32 resel_tag[16];
1: +  u32 resel_dsa[2];
1: +  u32 resel_dsa1[4];
1: +  u32 resel_no_tag[6];
1: +  u32 data_in[192];
1: +  u32 data_in2[4];
1: +  u32 data_out[192];
1: +  u32 data_out2[4];
1: +  u32 pm0_data[12];
1: +  u32 pm0_data_out[6];
1: +  u32 pm0_data_end[6];
1: +  u32 pm1_data[12];
1: +  u32 pm1_data_out[6];
1: +  u32 pm1_data_end[6];
1:  };
1:  
1:  struct sym_fw2b_scr {
1: -	u32 start64[2];
1: -	u32 no_data[2];
1: -	u32 sel_for_abort[16];
1: -	u32 sel_for_abort_1[2];
1: -	u32 msg_in_etc[12];
1: -	u32 msg_received[4];
1: -	u32 msg_weird_seen[4];
1: -	u32 msg_extended[20];
1: -	u32 msg_bad[6];
1: -	u32 msg_weird[4];
1: -	u32 msg_weird1[8];
1: -	u32 wdtr_resp[6];
1: -	u32 send_wdtr[4];
1: -	u32 sdtr_resp[6];
1: -	u32 send_sdtr[4];
1: -	u32 ppr_resp[6];
1: -	u32 send_ppr[4];
1: -	u32 nego_bad_phase[4];
1: -	u32 msg_out[4];
1: -	u32 msg_out_done[4];
1: -	u32 data_ovrun[2];
1: -	u32 data_ovrun1[22];
1: -	u32 data_ovrun2[8];
1: -	u32 abort_resel[16];
1: -	u32 resend_ident[4];
1: -	u32 ident_break[4];
1: -	u32 ident_break_atn[4];
1: -	u32 sdata_in[6];
1: -	u32 resel_bad_lun[4];
1: -	u32 bad_i_t_l[4];
1: -	u32 bad_i_t_l_q[4];
1: -	u32 bad_status[6];
1: -	u32 pm_handle[20];
1: -	u32 pm_handle1[4];
1: -	u32 pm_save[4];
1: -	u32 pm0_save[12];
1: -	u32 pm_save_end[4];
1: -	u32 pm1_save[14];
1: -	u32 pm_wsr_handle[38];
1: -	u32 wsr_ma_helper[4];
1: -	u32 zero[1];
1: -	u32 scratch[1];
1: -	u32 pm0_data_addr[1];
1: -	u32 pm1_data_addr[1];
1: -	u32 done_pos[1];
1: -	u32 startpos[1];
1: -	u32 targtbl[1];
1: +  u32 start64[2];
1: +  u32 no_data[2];
1: +  u32 sel_for_abort[16];
1: +  u32 sel_for_abort_1[2];
1: +  u32 msg_in_etc[12];
1: +  u32 msg_received[4];
1: +  u32 msg_weird_seen[4];
1: +  u32 msg_extended[20];
1: +  u32 msg_bad[6];
1: +  u32 msg_weird[4];
1: +  u32 msg_weird1[8];
1: +  u32 wdtr_resp[6];
1: +  u32 send_wdtr[4];
1: +  u32 sdtr_resp[6];
1: +  u32 send_sdtr[4];
1: +  u32 ppr_resp[6];
1: +  u32 send_ppr[4];
1: +  u32 nego_bad_phase[4];
1: +  u32 msg_out[4];
1: +  u32 msg_out_done[4];
1: +  u32 data_ovrun[2];
1: +  u32 data_ovrun1[22];
1: +  u32 data_ovrun2[8];
1: +  u32 abort_resel[16];
1: +  u32 resend_ident[4];
1: +  u32 ident_break[4];
1: +  u32 ident_break_atn[4];
1: +  u32 sdata_in[6];
1: +  u32 resel_bad_lun[4];
1: +  u32 bad_i_t_l[4];
1: +  u32 bad_i_t_l_q[4];
1: +  u32 bad_status[6];
1: +  u32 pm_handle[20];
1: +  u32 pm_handle1[4];
1: +  u32 pm_save[4];
1: +  u32 pm0_save[12];
1: +  u32 pm_save_end[4];
1: +  u32 pm1_save[14];
1: +  u32 pm_wsr_handle[38];
1: +  u32 wsr_ma_helper[4];
1: +  u32 zero[1];
1: +  u32 scratch[1];
1: +  u32 pm0_data_addr[1];
1: +  u32 pm1_data_addr[1];
1: +  u32 done_pos[1];
1: +  u32 startpos[1];
1: +  u32 targtbl[1];
1:  };
1:  
1:  struct sym_fw2z_scr {
1: -	u32 snooptest[6];
1: -	u32 snoopend[2];
1: +  u32 snooptest[6];
1: +  u32 snoopend[2];
1:  };
1:  
1:  struct sym_driver_setup {
1: -	u_short max_tag;
1: -	u_char burst_order;
1: -	u_char scsi_led;
1: -	u_char scsi_diff;
1: -	u_char irq_mode;
1: -	u_char scsi_bus_check;
1: -	u_char host_id;
1: -	u_char verbose;
1: -	u_char settle_delay;
1: -	u_char use_nvram;
1: -	u_long excludes[8];
1: +  u_short max_tag;
1: +  u_char burst_order;
1: +  u_char scsi_led;
1: +  u_char scsi_diff;
1: +  u_char irq_mode;
1: +  u_char scsi_bus_check;
1: +  u_char host_id;
1: +  u_char verbose;
1: +  u_char settle_delay;
1: +  u_char use_nvram;
1: +  u_long excludes[8];
1:  };
1:  
1:  struct sym_nvram;
1:  
1:  struct sym_device {
1: -	struct pci_dev *pdev;
1: -	long unsigned int mmio_base;
1: -	long unsigned int ram_base;
1: -	struct {
1: -		void *ioaddr;
1: -		void *ramaddr;
1: -	} s;
1: -	struct sym_chip chip;
1: -	struct sym_nvram *nvram;
1: -	u_char host_id;
1: +  struct pci_dev *pdev;
1: +  long unsigned int mmio_base;
1: +  long unsigned int ram_base;
1: +  struct {
1: +    void *ioaddr;
1: +    void *ramaddr;
1: +  } s;
1: +  struct sym_chip chip;
1: +  struct sym_nvram *nvram;
1: +  u_char host_id;
1:  };
1:  
1:  struct Symbios_host {
1: -	u_short type;
1: -	u_short device_id;
1: -	u_short vendor_id;
1: -	u_char bus_nr;
1: -	u_char device_fn;
1: -	u_short word8;
1: -	u_short flags;
1: -	u_short io_port;
1: +  u_short type;
1: +  u_short device_id;
1: +  u_short vendor_id;
1: +  u_char bus_nr;
1: +  u_char device_fn;
1: +  u_short word8;
1: +  u_short flags;
1: +  u_short io_port;
1:  };
1:  
1:  struct Symbios_target {
1: -	u_char flags;
1: -	u_char rsvd;
1: -	u_char bus_width;
1: -	u_char sync_offset;
1: -	u_short sync_period;
1: -	u_short timeout;
1: +  u_char flags;
1: +  u_char rsvd;
1: +  u_char bus_width;
1: +  u_char sync_offset;
1: +  u_short sync_period;
1: +  u_short timeout;
1:  };
1:  
1:  struct Symbios_scam {
1: -	u_short id;
1: -	u_short method;
1: -	u_short status;
1: -	u_char target_id;
1: -	u_char rsvd;
1: +  u_short id;
1: +  u_short method;
1: +  u_short status;
1: +  u_char target_id;
1: +  u_char rsvd;
1:  };
1:  
1:  struct Symbios_nvram {
1: -	u_short type;
1: -	u_short byte_count;
1: -	u_short checksum;
1: -	u_char v_major;
1: -	u_char v_minor;
1: -	u32 boot_crc;
1: -	u_short flags;
1: -	u_short flags1;
1: -	u_short term_state;
1: -	u_short rmvbl_flags;
1: -	u_char host_id;
1: -	u_char num_hba;
1: -	u_char num_devices;
1: -	u_char max_scam_devices;
1: -	u_char num_valid_scam_devices;
1: -	u_char flags2;
1: -	struct Symbios_host host[4];
1: -	struct Symbios_target target[16];
1: -	struct Symbios_scam scam[4];
1: -	u_char spare_devices[120];
1: -	u_char trailer[6];
1: +  u_short type;
1: +  u_short byte_count;
1: +  u_short checksum;
1: +  u_char v_major;
1: +  u_char v_minor;
1: +  u32 boot_crc;
1: +  u_short flags;
1: +  u_short flags1;
1: +  u_short term_state;
1: +  u_short rmvbl_flags;
1: +  u_char host_id;
1: +  u_char num_hba;
1: +  u_char num_devices;
1: +  u_char max_scam_devices;
1: +  u_char num_valid_scam_devices;
1: +  u_char flags2;
1: +  struct Symbios_host host[4];
1: +  struct Symbios_target target[16];
1: +  struct Symbios_scam scam[4];
1: +  u_char spare_devices[120];
1: +  u_char trailer[6];
1:  };
1:  
1:  typedef struct Symbios_nvram Symbios_nvram;
1:  
1:  struct Tekram_target {
1: -	u_char flags;
1: -	u_char sync_index;
1: -	u_short word2;
1: +  u_char flags;
1: +  u_char sync_index;
1: +  u_short word2;
1:  };
1:  
1:  struct Tekram_nvram {
1: -	struct Tekram_target target[16];
1: -	u_char host_id;
1: -	u_char flags;
1: -	u_char boot_delay_index;
1: -	u_char max_tags_index;
1: -	u_short flags1;
1: -	u_short spare[29];
1: +  struct Tekram_target target[16];
1: +  u_char host_id;
1: +  u_char flags;
1: +  u_char boot_delay_index;
1: +  u_char max_tags_index;
1: +  u_short flags1;
1: +  u_short spare[29];
1:  };
1:  
1:  typedef struct Tekram_nvram Tekram_nvram;
1:  
1:  struct pdc_initiator {
1: -	int dummy;
1: +  int dummy;
1:  };
1:  
1:  struct sym_nvram {
1: -	int type;
1: -	union {
1: -		Symbios_nvram Symbios;
1: -		Tekram_nvram Tekram;
1: -		struct pdc_initiator parisc;
1: -	} data;
1: +  int type;
1: +  union {
1: +    Symbios_nvram Symbios;
1: +    Tekram_nvram Tekram;
1: +    struct pdc_initiator parisc;
1: +  } data;
1:  };
1:  
1:  struct sym_ucmd {
1: -	struct completion *eh_done;
1: +  struct completion *eh_done;
1:  };
1:  
1:  struct sym_usrcmd {
1: -	u_long target;
1: -	u_long lun;
1: -	u_long data;
1: -	u_long cmd;
1: +  u_long target;
1: +  u_long lun;
1: +  u_long data;
1: +  u_long cmd;
1:  };
1:  
1:  struct sym_m_link {
1: -	struct sym_m_link *next;
1: +  struct sym_m_link *next;
1:  };
1:  
1:  typedef struct sym_m_link *m_link_p;
1:  
1:  struct sym_m_vtob {
1: -	struct sym_m_vtob *next;
1: -	void *vaddr;
1: -	dma_addr_t baddr;
1: +  struct sym_m_vtob *next;
1: +  void *vaddr;
1: +  dma_addr_t baddr;
1:  };
1:  
1:  typedef struct sym_m_vtob *m_vtob_p;
1:  
1:  struct sym_m_pool {
1: -	m_pool_ident_t dev_dmat;
1: -	void * (*get_mem_cluster)(struct sym_m_pool *);
1: -	void (*free_mem_cluster)(struct sym_m_pool *, void *);
1: -	int nump;
1: -	m_vtob_p vtob[32];
1: -	struct sym_m_pool *next;
1: -	struct sym_m_link h[9];
1: +  m_pool_ident_t dev_dmat;
1: +  void *(*get_mem_cluster)(struct sym_m_pool *);
1: +  void (*free_mem_cluster)(struct sym_m_pool *, void *);
1: +  int nump;
1: +  m_vtob_p vtob[32];
1: +  struct sym_m_pool *next;
1: +  struct sym_m_link h[9];
1:  };
1:  
1:  typedef struct sym_m_pool *m_pool_p;
1: @@ -89516,1467 +90614,1467 @@ typedef char *__kernel_caddr_t;
1:  typedef __kernel_caddr_t caddr_t;
1:  
1:  struct mbox_out {
1: -	u8 cmd;
1: -	u8 cmdid;
1: -	u16 numsectors;
1: -	u32 lba;
1: -	u32 xferaddr;
1: -	u8 logdrv;
1: -	u8 numsgelements;
1: -	u8 resvd;
1: +  u8 cmd;
1: +  u8 cmdid;
1: +  u16 numsectors;
1: +  u32 lba;
1: +  u32 xferaddr;
1: +  u8 logdrv;
1: +  u8 numsgelements;
1: +  u8 resvd;
1:  } __attribute__((packed));
1:  
1:  struct mbox_in {
1: -	volatile u8 busy;
1: -	volatile u8 numstatus;
1: -	volatile u8 status;
1: -	volatile u8 completed[46];
1: -	volatile u8 poll;
1: -	volatile u8 ack;
1: +  volatile u8 busy;
1: +  volatile u8 numstatus;
1: +  volatile u8 status;
1: +  volatile u8 completed[46];
1: +  volatile u8 poll;
1: +  volatile u8 ack;
1:  };
1:  
1:  typedef struct {
1: -	struct mbox_out m_out;
1: -	struct mbox_in m_in;
1: +  struct mbox_out m_out;
1: +  struct mbox_in m_in;
1:  } __attribute__((packed)) mbox_t;
1:  
1:  typedef struct {
1: -	u32 xfer_segment_lo;
1: -	u32 xfer_segment_hi;
1: -	mbox_t mbox;
1: +  u32 xfer_segment_lo;
1: +  u32 xfer_segment_hi;
1: +  mbox_t mbox;
1:  } __attribute__((packed)) mbox64_t;
1:  
1:  typedef struct {
1: -	u8 timeout: 3;
1: -	u8 ars: 1;
1: -	u8 reserved: 3;
1: -	u8 islogical: 1;
1: -	u8 logdrv;
1: -	u8 channel;
1: -	u8 target;
1: -	u8 queuetag;
1: -	u8 queueaction;
1: -	u8 cdb[10];
1: -	u8 cdblen;
1: -	u8 reqsenselen;
1: -	u8 reqsensearea[32];
1: -	u8 numsgelements;
1: -	u8 scsistatus;
1: -	u32 dataxferaddr;
1: -	u32 dataxferlen;
1: +  u8 timeout : 3;
1: +  u8 ars : 1;
1: +  u8 reserved : 3;
1: +  u8 islogical : 1;
1: +  u8 logdrv;
1: +  u8 channel;
1: +  u8 target;
1: +  u8 queuetag;
1: +  u8 queueaction;
1: +  u8 cdb[10];
1: +  u8 cdblen;
1: +  u8 reqsenselen;
1: +  u8 reqsensearea[32];
1: +  u8 numsgelements;
1: +  u8 scsistatus;
1: +  u32 dataxferaddr;
1: +  u32 dataxferlen;
1:  } mega_passthru;
1:  
1:  typedef struct {
1: -	u8 timeout: 3;
1: -	u8 ars: 1;
1: -	u8 rsvd1: 1;
1: -	u8 cd_rom: 1;
1: -	u8 rsvd2: 1;
1: -	u8 islogical: 1;
1: -	u8 logdrv;
1: -	u8 channel;
1: -	u8 target;
1: -	u8 queuetag;
1: -	u8 queueaction;
1: -	u8 cdblen;
1: -	u8 rsvd3;
1: -	u8 cdb[16];
1: -	u8 numsgelements;
1: -	u8 status;
1: -	u8 reqsenselen;
1: -	u8 reqsensearea[32];
1: -	u8 rsvd4;
1: -	u32 dataxferaddr;
1: -	u32 dataxferlen;
1: +  u8 timeout : 3;
1: +  u8 ars : 1;
1: +  u8 rsvd1 : 1;
1: +  u8 cd_rom : 1;
1: +  u8 rsvd2 : 1;
1: +  u8 islogical : 1;
1: +  u8 logdrv;
1: +  u8 channel;
1: +  u8 target;
1: +  u8 queuetag;
1: +  u8 queueaction;
1: +  u8 cdblen;
1: +  u8 rsvd3;
1: +  u8 cdb[16];
1: +  u8 numsgelements;
1: +  u8 status;
1: +  u8 reqsenselen;
1: +  u8 reqsensearea[32];
1: +  u8 rsvd4;
1: +  u32 dataxferaddr;
1: +  u32 dataxferlen;
1:  } mega_ext_passthru;
1:  
1:  typedef struct {
1: -	u64 address;
1: -	u32 length;
1: +  u64 address;
1: +  u32 length;
1:  } __attribute__((packed)) mega_sgl64;
1:  
1:  typedef struct {
1: -	u32 address;
1: -	u32 length;
1: +  u32 address;
1: +  u32 length;
1:  } mega_sglist;
1:  
1:  typedef struct {
1: -	int idx;
1: -	u32 state;
1: -	struct list_head list;
1: -	u8 raw_mbox[66];
1: -	u32 dma_type;
1: -	u32 dma_direction;
1: -	struct scsi_cmnd *cmd;
1: -	dma_addr_t dma_h_bulkdata;
1: -	dma_addr_t dma_h_sgdata;
1: -	mega_sglist *sgl;
1: -	mega_sgl64 *sgl64;
1: -	dma_addr_t sgl_dma_addr;
1: -	mega_passthru *pthru;
1: -	dma_addr_t pthru_dma_addr;
1: -	mega_ext_passthru *epthru;
1: -	dma_addr_t epthru_dma_addr;
1: +  int idx;
1: +  u32 state;
1: +  struct list_head list;
1: +  u8 raw_mbox[66];
1: +  u32 dma_type;
1: +  u32 dma_direction;
1: +  struct scsi_cmnd *cmd;
1: +  dma_addr_t dma_h_bulkdata;
1: +  dma_addr_t dma_h_sgdata;
1: +  mega_sglist *sgl;
1: +  mega_sgl64 *sgl64;
1: +  dma_addr_t sgl_dma_addr;
1: +  mega_passthru *pthru;
1: +  dma_addr_t pthru_dma_addr;
1: +  mega_ext_passthru *epthru;
1: +  dma_addr_t epthru_dma_addr;
1:  } scb_t;
1:  
1:  typedef struct {
1: -	u32 data_size;
1: -	u32 config_signature;
1: -	u8 fw_version[16];
1: -	u8 bios_version[16];
1: -	u8 product_name[80];
1: -	u8 max_commands;
1: -	u8 nchannels;
1: -	u8 fc_loop_present;
1: -	u8 mem_type;
1: -	u32 signature;
1: -	u16 dram_size;
1: -	u16 subsysid;
1: -	u16 subsysvid;
1: -	u8 notify_counters;
1: -	u8 pad1k[889];
1: +  u32 data_size;
1: +  u32 config_signature;
1: +  u8 fw_version[16];
1: +  u8 bios_version[16];
1: +  u8 product_name[80];
1: +  u8 max_commands;
1: +  u8 nchannels;
1: +  u8 fc_loop_present;
1: +  u8 mem_type;
1: +  u32 signature;
1: +  u16 dram_size;
1: +  u16 subsysid;
1: +  u16 subsysvid;
1: +  u8 notify_counters;
1: +  u8 pad1k[889];
1:  } mega_product_info;
1:  
1:  struct notify {
1: -	u32 global_counter;
1: -	u8 param_counter;
1: -	u8 param_id;
1: -	u16 param_val;
1: -	u8 write_config_counter;
1: -	u8 write_config_rsvd[3];
1: -	u8 ldrv_op_counter;
1: -	u8 ldrv_opid;
1: -	u8 ldrv_opcmd;
1: -	u8 ldrv_opstatus;
1: -	u8 ldrv_state_counter;
1: -	u8 ldrv_state_id;
1: -	u8 ldrv_state_new;
1: -	u8 ldrv_state_old;
1: -	u8 pdrv_state_counter;
1: -	u8 pdrv_state_id;
1: -	u8 pdrv_state_new;
1: -	u8 pdrv_state_old;
1: -	u8 pdrv_fmt_counter;
1: -	u8 pdrv_fmt_id;
1: -	u8 pdrv_fmt_val;
1: -	u8 pdrv_fmt_rsvd;
1: -	u8 targ_xfer_counter;
1: -	u8 targ_xfer_id;
1: -	u8 targ_xfer_val;
1: -	u8 targ_xfer_rsvd;
1: -	u8 fcloop_id_chg_counter;
1: -	u8 fcloopid_pdrvid;
1: -	u8 fcloop_id0;
1: -	u8 fcloop_id1;
1: -	u8 fcloop_state_counter;
1: -	u8 fcloop_state0;
1: -	u8 fcloop_state1;
1: -	u8 fcloop_state_rsvd;
1: +  u32 global_counter;
1: +  u8 param_counter;
1: +  u8 param_id;
1: +  u16 param_val;
1: +  u8 write_config_counter;
1: +  u8 write_config_rsvd[3];
1: +  u8 ldrv_op_counter;
1: +  u8 ldrv_opid;
1: +  u8 ldrv_opcmd;
1: +  u8 ldrv_opstatus;
1: +  u8 ldrv_state_counter;
1: +  u8 ldrv_state_id;
1: +  u8 ldrv_state_new;
1: +  u8 ldrv_state_old;
1: +  u8 pdrv_state_counter;
1: +  u8 pdrv_state_id;
1: +  u8 pdrv_state_new;
1: +  u8 pdrv_state_old;
1: +  u8 pdrv_fmt_counter;
1: +  u8 pdrv_fmt_id;
1: +  u8 pdrv_fmt_val;
1: +  u8 pdrv_fmt_rsvd;
1: +  u8 targ_xfer_counter;
1: +  u8 targ_xfer_id;
1: +  u8 targ_xfer_val;
1: +  u8 targ_xfer_rsvd;
1: +  u8 fcloop_id_chg_counter;
1: +  u8 fcloopid_pdrvid;
1: +  u8 fcloop_id0;
1: +  u8 fcloop_id1;
1: +  u8 fcloop_state_counter;
1: +  u8 fcloop_state0;
1: +  u8 fcloop_state1;
1: +  u8 fcloop_state_rsvd;
1:  };
1:  
1:  typedef struct {
1: -	u32 data_size;
1: -	struct notify notify;
1: -	u8 notify_rsvd[88];
1: -	u8 rebuild_rate;
1: -	u8 cache_flush_interval;
1: -	u8 sense_alert;
1: -	u8 drive_insert_count;
1: -	u8 battery_status;
1: -	u8 num_ldrv;
1: -	u8 recon_state[5];
1: -	u16 ldrv_op_status[5];
1: -	u32 ldrv_size[40];
1: -	u8 ldrv_prop[40];
1: -	u8 ldrv_state[40];
1: -	u8 pdrv_state[256];
1: -	u16 pdrv_format[16];
1: -	u8 targ_xfer[80];
1: -	u8 pad1k[263];
1: +  u32 data_size;
1: +  struct notify notify;
1: +  u8 notify_rsvd[88];
1: +  u8 rebuild_rate;
1: +  u8 cache_flush_interval;
1: +  u8 sense_alert;
1: +  u8 drive_insert_count;
1: +  u8 battery_status;
1: +  u8 num_ldrv;
1: +  u8 recon_state[5];
1: +  u16 ldrv_op_status[5];
1: +  u32 ldrv_size[40];
1: +  u8 ldrv_prop[40];
1: +  u8 ldrv_state[40];
1: +  u8 pdrv_state[256];
1: +  u16 pdrv_format[16];
1: +  u8 targ_xfer[80];
1: +  u8 pad1k[263];
1:  } __attribute__((packed)) mega_inquiry3;
1:  
1:  typedef struct {
1: -	u8 max_commands;
1: -	u8 rebuild_rate;
1: -	u8 max_targ_per_chan;
1: -	u8 nchannels;
1: -	u8 fw_version[4];
1: -	u16 age_of_flash;
1: -	u8 chip_set_value;
1: -	u8 dram_size;
1: -	u8 cache_flush_interval;
1: -	u8 bios_version[4];
1: -	u8 board_type;
1: -	u8 sense_alert;
1: -	u8 write_config_count;
1: -	u8 drive_inserted_count;
1: -	u8 inserted_drive;
1: -	u8 battery_status;
1: -	u8 dec_fault_bus_info;
1: +  u8 max_commands;
1: +  u8 rebuild_rate;
1: +  u8 max_targ_per_chan;
1: +  u8 nchannels;
1: +  u8 fw_version[4];
1: +  u16 age_of_flash;
1: +  u8 chip_set_value;
1: +  u8 dram_size;
1: +  u8 cache_flush_interval;
1: +  u8 bios_version[4];
1: +  u8 board_type;
1: +  u8 sense_alert;
1: +  u8 write_config_count;
1: +  u8 drive_inserted_count;
1: +  u8 inserted_drive;
1: +  u8 battery_status;
1: +  u8 dec_fault_bus_info;
1:  } mega_adp_info;
1:  
1:  typedef struct {
1: -	u8 num_ldrv;
1: -	u8 rsvd[3];
1: -	u32 ldrv_size[8];
1: -	u8 ldrv_prop[8];
1: -	u8 ldrv_state[8];
1: +  u8 num_ldrv;
1: +  u8 rsvd[3];
1: +  u32 ldrv_size[8];
1: +  u8 ldrv_prop[8];
1: +  u8 ldrv_state[8];
1:  } mega_ldrv_info;
1:  
1:  typedef struct {
1: -	u8 pdrv_state[75];
1: -	u8 rsvd;
1: +  u8 pdrv_state[75];
1: +  u8 rsvd;
1:  } mega_pdrv_info;
1:  
1:  typedef struct {
1: -	mega_adp_info adapter_info;
1: -	mega_ldrv_info logdrv_info;
1: -	mega_pdrv_info pdrv_info;
1: +  mega_adp_info adapter_info;
1: +  mega_ldrv_info logdrv_info;
1: +  mega_pdrv_info pdrv_info;
1:  } mraid_inquiry;
1:  
1:  typedef struct {
1: -	mraid_inquiry raid_inq;
1: -	u16 phys_drv_format[5];
1: -	u8 stack_attn;
1: -	u8 modem_status;
1: -	u8 rsvd[2];
1: +  mraid_inquiry raid_inq;
1: +  u16 phys_drv_format[5];
1: +  u8 stack_attn;
1: +  u8 modem_status;
1: +  u8 rsvd[2];
1:  } __attribute__((packed)) mraid_ext_inquiry;
1:  
1:  typedef struct {
1: -	u8 channel;
1: -	u8 target;
1: +  u8 channel;
1: +  u8 target;
1:  } adp_device;
1:  
1:  typedef struct {
1: -	u32 start_blk;
1: -	u32 num_blks;
1: -	adp_device device[32];
1: +  u32 start_blk;
1: +  u32 num_blks;
1: +  adp_device device[32];
1:  } adp_span_40ld;
1:  
1:  typedef struct {
1: -	u32 start_blk;
1: -	u32 num_blks;
1: -	adp_device device[8];
1: +  u32 start_blk;
1: +  u32 num_blks;
1: +  adp_device device[8];
1:  } adp_span_8ld;
1:  
1:  typedef struct {
1: -	u8 span_depth;
1: -	u8 level;
1: -	u8 read_ahead;
1: -	u8 stripe_sz;
1: -	u8 status;
1: -	u8 write_mode;
1: -	u8 direct_io;
1: -	u8 row_size;
1: +  u8 span_depth;
1: +  u8 level;
1: +  u8 read_ahead;
1: +  u8 stripe_sz;
1: +  u8 status;
1: +  u8 write_mode;
1: +  u8 direct_io;
1: +  u8 row_size;
1:  } logdrv_param;
1:  
1:  typedef struct {
1: -	logdrv_param lparam;
1: -	adp_span_40ld span[8];
1: +  logdrv_param lparam;
1: +  adp_span_40ld span[8];
1:  } logdrv_40ld;
1:  
1:  typedef struct {
1: -	logdrv_param lparam;
1: -	adp_span_8ld span[8];
1: +  logdrv_param lparam;
1: +  adp_span_8ld span[8];
1:  } logdrv_8ld;
1:  
1:  typedef struct {
1: -	u8 type;
1: -	u8 cur_status;
1: -	u8 tag_depth;
1: -	u8 sync_neg;
1: -	u32 size;
1: +  u8 type;
1: +  u8 cur_status;
1: +  u8 tag_depth;
1: +  u8 sync_neg;
1: +  u32 size;
1:  } phys_drv;
1:  
1:  typedef struct {
1: -	u8 nlog_drives;
1: -	u8 resvd[3];
1: -	logdrv_40ld ldrv[40];
1: -	phys_drv pdrv[75];
1: +  u8 nlog_drives;
1: +  u8 resvd[3];
1: +  logdrv_40ld ldrv[40];
1: +  phys_drv pdrv[75];
1:  } disk_array_40ld;
1:  
1:  typedef struct {
1: -	u8 nlog_drives;
1: -	u8 resvd[3];
1: -	logdrv_8ld ldrv[8];
1: -	phys_drv pdrv[75];
1: +  u8 nlog_drives;
1: +  u8 resvd[3];
1: +  logdrv_8ld ldrv[8];
1: +  phys_drv pdrv[75];
1:  } disk_array_8ld;
1:  
1:  struct uioctl_t {
1: -	u32 inlen;
1: -	u32 outlen;
1: -	union {
1: -		u8 fca[16];
1: -		struct {
1: -			u8 opcode;
1: -			u8 subopcode;
1: -			u16 adapno;
1: -			u8 *buffer;
1: -			u32 length;
1: -		} __attribute__((packed)) fcs;
1: -	} ui;
1: -	u8 mbox[18];
1: -	mega_passthru pthru;
1: -	char *data;
1: +  u32 inlen;
1: +  u32 outlen;
1: +  union {
1: +    u8 fca[16];
1: +    struct {
1: +      u8 opcode;
1: +      u8 subopcode;
1: +      u16 adapno;
1: +      u8 *buffer;
1: +      u32 length;
1: +    } __attribute__((packed)) fcs;
1: +  } ui;
1: +  u8 mbox[18];
1: +  mega_passthru pthru;
1: +  char *data;
1:  } __attribute__((packed));
1:  
1:  struct mcontroller {
1: -	u64 base;
1: -	u8 irq;
1: -	u8 numldrv;
1: -	u8 pcibus;
1: -	u16 pcidev;
1: -	u8 pcifun;
1: -	u16 pciid;
1: -	u16 pcivendor;
1: -	u8 pcislot;
1: -	u32 uid;
1: +  u64 base;
1: +  u8 irq;
1: +  u8 numldrv;
1: +  u8 pcibus;
1: +  u16 pcidev;
1: +  u8 pcifun;
1: +  u16 pciid;
1: +  u16 pcivendor;
1: +  u8 pcislot;
1: +  u32 uid;
1:  };
1:  
1:  typedef struct {
1: -	u8 cmd;
1: -	u8 cmdid;
1: -	u8 opcode;
1: -	u8 subopcode;
1: -	u32 lba;
1: -	u32 xferaddr;
1: -	u8 logdrv;
1: -	u8 rsvd[3];
1: -	u8 numstatus;
1: -	u8 status;
1: +  u8 cmd;
1: +  u8 cmdid;
1: +  u8 opcode;
1: +  u8 subopcode;
1: +  u32 lba;
1: +  u32 xferaddr;
1: +  u8 logdrv;
1: +  u8 rsvd[3];
1: +  u8 numstatus;
1: +  u8 status;
1:  } __attribute__((packed)) megacmd_t;
1:  
1:  typedef struct {
1: -	char signature[8];
1: -	u32 opcode;
1: -	u32 adapno;
1: -	union {
1: -		u8 __raw_mbox[18];
1: -		void *__uaddr;
1: -	} __ua;
1: -	u32 xferlen;
1: -	u32 flags;
1: +  char signature[8];
1: +  u32 opcode;
1: +  u32 adapno;
1: +  union {
1: +    u8 __raw_mbox[18];
1: +    void *__uaddr;
1: +  } __ua;
1: +  u32 xferlen;
1: +  u32 flags;
1:  } nitioctl_t;
1:  
1:  struct private_bios_data {
1: -	u8 geometry: 4;
1: -	u8 unused: 4;
1: -	u8 boot_drv;
1: -	u8 rsvd[12];
1: -	u16 cksum;
1: +  u8 geometry : 4;
1: +  u8 unused : 4;
1: +  u8 boot_drv;
1: +  u8 rsvd[12];
1: +  u16 cksum;
1:  };
1:  
1:  typedef struct {
1: -	int this_id;
1: -	u32 flag;
1: -	long unsigned int base;
1: -	void *mmio_base;
1: -	mbox64_t *una_mbox64;
1: -	dma_addr_t una_mbox64_dma;
1: -	volatile mbox64_t *mbox64;
1: -	volatile mbox_t *mbox;
1: -	dma_addr_t mbox_dma;
1: -	struct pci_dev *dev;
1: -	struct list_head free_list;
1: -	struct list_head pending_list;
1: -	struct list_head completed_list;
1: -	struct Scsi_Host *host;
1: -	u8 *mega_buffer;
1: -	dma_addr_t buf_dma_handle;
1: -	mega_product_info product_info;
1: -	u8 max_cmds;
1: -	scb_t *scb_list;
1: -	atomic_t pend_cmds;
1: -	u8 numldrv;
1: -	u8 fw_version[7];
1: -	u8 bios_version[7];
1: -	struct proc_dir_entry *controller_proc_dir_entry;
1: -	int has_64bit_addr;
1: -	int support_ext_cdb;
1: -	int boot_ldrv_enabled;
1: -	int boot_ldrv;
1: -	int boot_pdrv_enabled;
1: -	int boot_pdrv_ch;
1: -	int boot_pdrv_tgt;
1: -	int support_random_del;
1: -	int read_ldidmap;
1: -	atomic_t quiescent;
1: -	spinlock_t lock;
1: -	u8 logdrv_chan[9];
1: -	int mega_ch_class;
1: -	u8 sglen;
1: -	scb_t int_scb;
1: -	struct mutex int_mtx;
1: -	int int_status;
1: -	struct completion int_waitq;
1: -	int has_cluster;
1: +  int this_id;
1: +  u32 flag;
1: +  long unsigned int base;
1: +  void *mmio_base;
1: +  mbox64_t *una_mbox64;
1: +  dma_addr_t una_mbox64_dma;
1: +  volatile mbox64_t *mbox64;
1: +  volatile mbox_t *mbox;
1: +  dma_addr_t mbox_dma;
1: +  struct pci_dev *dev;
1: +  struct list_head free_list;
1: +  struct list_head pending_list;
1: +  struct list_head completed_list;
1: +  struct Scsi_Host *host;
1: +  u8 *mega_buffer;
1: +  dma_addr_t buf_dma_handle;
1: +  mega_product_info product_info;
1: +  u8 max_cmds;
1: +  scb_t *scb_list;
1: +  atomic_t pend_cmds;
1: +  u8 numldrv;
1: +  u8 fw_version[7];
1: +  u8 bios_version[7];
1: +  struct proc_dir_entry *controller_proc_dir_entry;
1: +  int has_64bit_addr;
1: +  int support_ext_cdb;
1: +  int boot_ldrv_enabled;
1: +  int boot_ldrv;
1: +  int boot_pdrv_enabled;
1: +  int boot_pdrv_ch;
1: +  int boot_pdrv_tgt;
1: +  int support_random_del;
1: +  int read_ldidmap;
1: +  atomic_t quiescent;
1: +  spinlock_t lock;
1: +  u8 logdrv_chan[9];
1: +  int mega_ch_class;
1: +  u8 sglen;
1: +  scb_t int_scb;
1: +  struct mutex int_mtx;
1: +  int int_status;
1: +  struct completion int_waitq;
1: +  int has_cluster;
1:  } adapter_t;
1:  
1:  struct mega_hbas {
1: -	int is_bios_enabled;
1: -	adapter_t *hostdata_addr;
1: +  int is_bios_enabled;
1: +  adapter_t *hostdata_addr;
1:  };
1:  
1:  typedef s8 int8_t;
1:  
1:  typedef struct {
1: -	uint8_t cmd;
1: -	uint8_t cmdid;
1: -	uint16_t numsectors;
1: -	uint32_t lba;
1: -	uint32_t xferaddr;
1: -	uint8_t logdrv;
1: -	uint8_t numsge;
1: -	uint8_t resvd;
1: -	uint8_t busy;
1: -	uint8_t numstatus;
1: -	uint8_t status;
1: -	uint8_t completed[46];
1: -	uint8_t poll;
1: -	uint8_t ack;
1: +  uint8_t cmd;
1: +  uint8_t cmdid;
1: +  uint16_t numsectors;
1: +  uint32_t lba;
1: +  uint32_t xferaddr;
1: +  uint8_t logdrv;
1: +  uint8_t numsge;
1: +  uint8_t resvd;
1: +  uint8_t busy;
1: +  uint8_t numstatus;
1: +  uint8_t status;
1: +  uint8_t completed[46];
1: +  uint8_t poll;
1: +  uint8_t ack;
1:  } __attribute__((packed)) mbox_t___2;
1:  
1:  typedef struct {
1: -	uint32_t xferaddr_lo;
1: -	uint32_t xferaddr_hi;
1: -	mbox_t___2 mbox32;
1: +  uint32_t xferaddr_lo;
1: +  uint32_t xferaddr_hi;
1: +  mbox_t___2 mbox32;
1:  } __attribute__((packed)) mbox64_t___2;
1:  
1:  typedef struct {
1: -	uint8_t timeout: 3;
1: -	uint8_t ars: 1;
1: -	uint8_t reserved: 3;
1: -	uint8_t islogical: 1;
1: -	uint8_t logdrv;
1: -	uint8_t channel;
1: -	uint8_t target;
1: -	uint8_t queuetag;
1: -	uint8_t queueaction;
1: -	uint8_t cdb[10];
1: -	uint8_t cdblen;
1: -	uint8_t reqsenselen;
1: -	uint8_t reqsensearea[32];
1: -	uint8_t numsge;
1: -	uint8_t scsistatus;
1: -	uint32_t dataxferaddr;
1: -	uint32_t dataxferlen;
1: +  uint8_t timeout : 3;
1: +  uint8_t ars : 1;
1: +  uint8_t reserved : 3;
1: +  uint8_t islogical : 1;
1: +  uint8_t logdrv;
1: +  uint8_t channel;
1: +  uint8_t target;
1: +  uint8_t queuetag;
1: +  uint8_t queueaction;
1: +  uint8_t cdb[10];
1: +  uint8_t cdblen;
1: +  uint8_t reqsenselen;
1: +  uint8_t reqsensearea[32];
1: +  uint8_t numsge;
1: +  uint8_t scsistatus;
1: +  uint32_t dataxferaddr;
1: +  uint32_t dataxferlen;
1:  } mraid_passthru_t;
1:  
1:  struct uioc {
1: -	uint8_t signature[16];
1: -	uint16_t mb_type;
1: -	uint16_t app_type;
1: -	uint32_t opcode;
1: -	uint32_t adapno;
1: -	uint64_t cmdbuf;
1: -	uint32_t xferlen;
1: -	uint32_t data_dir;
1: -	int32_t status;
1: -	uint8_t reserved[128];
1: -	void *user_data;
1: -	uint32_t user_data_len;
1: -	uint32_t pad_for_64bit_align;
1: -	mraid_passthru_t *user_pthru;
1: -	mraid_passthru_t *pthru32;
1: -	dma_addr_t pthru32_h;
1: -	struct list_head list;
1: -	void (*done)(struct uioc *);
1: -	caddr_t buf_vaddr;
1: -	dma_addr_t buf_paddr;
1: -	int8_t pool_index;
1: -	uint8_t free_buf;
1: -	uint8_t timedout;
1: -	long: 40;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  uint8_t signature[16];
1: +  uint16_t mb_type;
1: +  uint16_t app_type;
1: +  uint32_t opcode;
1: +  uint32_t adapno;
1: +  uint64_t cmdbuf;
1: +  uint32_t xferlen;
1: +  uint32_t data_dir;
1: +  int32_t status;
1: +  uint8_t reserved[128];
1: +  void *user_data;
1: +  uint32_t user_data_len;
1: +  uint32_t pad_for_64bit_align;
1: +  mraid_passthru_t *user_pthru;
1: +  mraid_passthru_t *pthru32;
1: +  dma_addr_t pthru32_h;
1: +  struct list_head list;
1: +  void (*done)(struct uioc *);
1: +  caddr_t buf_vaddr;
1: +  dma_addr_t buf_paddr;
1: +  int8_t pool_index;
1: +  uint8_t free_buf;
1: +  uint8_t timedout;
1: +  long : 40;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  } __attribute__((packed));
1:  
1:  typedef struct uioc uioc_t;
1:  
1:  struct uioc_timeout {
1: -	struct timer_list timer;
1: -	uioc_t *uioc;
1: +  struct timer_list timer;
1: +  uioc_t *uioc;
1:  };
1:  
1:  struct mraid_hba_info {
1: -	uint16_t pci_vendor_id;
1: -	uint16_t pci_device_id;
1: -	uint16_t subsys_vendor_id;
1: -	uint16_t subsys_device_id;
1: -	uint64_t baseport;
1: -	uint8_t pci_bus;
1: -	uint8_t pci_dev_fn;
1: -	uint8_t pci_slot;
1: -	uint8_t irq;
1: -	uint32_t unique_id;
1: -	uint32_t host_no;
1: -	uint8_t num_ldrv;
1: -	long: 24;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  uint16_t pci_vendor_id;
1: +  uint16_t pci_device_id;
1: +  uint16_t subsys_vendor_id;
1: +  uint16_t subsys_device_id;
1: +  uint64_t baseport;
1: +  uint8_t pci_bus;
1: +  uint8_t pci_dev_fn;
1: +  uint8_t pci_slot;
1: +  uint8_t irq;
1: +  uint32_t unique_id;
1: +  uint32_t host_no;
1: +  uint8_t num_ldrv;
1: +  long : 24;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  typedef struct mraid_hba_info mraid_hba_info_t;
1:  
1:  struct mcontroller___2 {
1: -	uint64_t base;
1: -	uint8_t irq;
1: -	uint8_t numldrv;
1: -	uint8_t pcibus;
1: -	uint16_t pcidev;
1: -	uint8_t pcifun;
1: -	uint16_t pciid;
1: -	uint16_t pcivendor;
1: -	uint8_t pcislot;
1: -	uint32_t uid;
1: +  uint64_t base;
1: +  uint8_t irq;
1: +  uint8_t numldrv;
1: +  uint8_t pcibus;
1: +  uint16_t pcidev;
1: +  uint8_t pcifun;
1: +  uint16_t pciid;
1: +  uint16_t pcivendor;
1: +  uint8_t pcislot;
1: +  uint32_t uid;
1:  } __attribute__((packed));
1:  
1:  typedef struct mcontroller___2 mcontroller_t;
1:  
1:  struct mm_dmapool {
1: -	caddr_t vaddr;
1: -	dma_addr_t paddr;
1: -	uint32_t buf_size;
1: -	struct dma_pool___2 *handle;
1: -	spinlock_t lock;
1: -	uint8_t in_use;
1: +  caddr_t vaddr;
1: +  dma_addr_t paddr;
1: +  uint32_t buf_size;
1: +  struct dma_pool___2 *handle;
1: +  spinlock_t lock;
1: +  uint8_t in_use;
1:  };
1:  
1:  typedef struct mm_dmapool mm_dmapool_t;
1:  
1:  struct mraid_mmadp {
1: -	uint32_t unique_id;
1: -	uint32_t drvr_type;
1: -	long unsigned int drvr_data;
1: -	uint16_t timeout;
1: -	uint8_t max_kioc;
1: -	struct pci_dev *pdev;
1: -	int (*issue_uioc)(long unsigned int, uioc_t *, uint32_t);
1: -	uint32_t quiescent;
1: -	struct list_head list;
1: -	uioc_t *kioc_list;
1: -	struct list_head kioc_pool;
1: -	spinlock_t kioc_pool_lock;
1: -	struct semaphore kioc_semaphore;
1: -	mbox64_t___2 *mbox_list;
1: -	struct dma_pool___2 *pthru_dma_pool;
1: -	mm_dmapool_t dma_pool_list[5];
1: +  uint32_t unique_id;
1: +  uint32_t drvr_type;
1: +  long unsigned int drvr_data;
1: +  uint16_t timeout;
1: +  uint8_t max_kioc;
1: +  struct pci_dev *pdev;
1: +  int (*issue_uioc)(long unsigned int, uioc_t *, uint32_t);
1: +  uint32_t quiescent;
1: +  struct list_head list;
1: +  uioc_t *kioc_list;
1: +  struct list_head kioc_pool;
1: +  spinlock_t kioc_pool_lock;
1: +  struct semaphore kioc_semaphore;
1: +  mbox64_t___2 *mbox_list;
1: +  struct dma_pool___2 *pthru_dma_pool;
1: +  mm_dmapool_t dma_pool_list[5];
1:  };
1:  
1:  typedef struct mraid_mmadp mraid_mmadp_t;
1:  
1:  struct mimd {
1: -	uint32_t inlen;
1: -	uint32_t outlen;
1: -	union {
1: -		uint8_t fca[16];
1: -		struct {
1: -			uint8_t opcode;
1: -			uint8_t subopcode;
1: -			uint16_t adapno;
1: -			uint8_t *buffer;
1: -			uint32_t length;
1: -		} __attribute__((packed)) fcs;
1: -	} ui;
1: -	uint8_t mbox[18];
1: -	mraid_passthru_t pthru;
1: -	char *data;
1: +  uint32_t inlen;
1: +  uint32_t outlen;
1: +  union {
1: +    uint8_t fca[16];
1: +    struct {
1: +      uint8_t opcode;
1: +      uint8_t subopcode;
1: +      uint16_t adapno;
1: +      uint8_t *buffer;
1: +      uint32_t length;
1: +    } __attribute__((packed)) fcs;
1: +  } ui;
1: +  uint8_t mbox[18];
1: +  mraid_passthru_t pthru;
1: +  char *data;
1:  } __attribute__((packed));
1:  
1:  typedef struct mimd mimd_t;
1:  
1:  typedef struct {
1: -	caddr_t ccb;
1: -	struct list_head list;
1: -	long unsigned int gp;
1: -	unsigned int sno;
1: -	struct scsi_cmnd *scp;
1: -	uint32_t state;
1: -	uint32_t dma_direction;
1: -	uint32_t dma_type;
1: -	uint16_t dev_channel;
1: -	uint16_t dev_target;
1: -	uint32_t status;
1: +  caddr_t ccb;
1: +  struct list_head list;
1: +  long unsigned int gp;
1: +  unsigned int sno;
1: +  struct scsi_cmnd *scp;
1: +  uint32_t state;
1: +  uint32_t dma_direction;
1: +  uint32_t dma_type;
1: +  uint16_t dev_channel;
1: +  uint16_t dev_target;
1: +  uint32_t status;
1:  } scb_t___2;
1:  
1:  typedef struct {
1: -	struct tasklet_struct dpc_h;
1: -	struct pci_dev *pdev;
1: -	struct Scsi_Host *host;
1: -	spinlock_t lock;
1: -	uint8_t quiescent;
1: -	int outstanding_cmds;
1: -	scb_t___2 *kscb_list;
1: -	struct list_head kscb_pool;
1: -	spinlock_t kscb_pool_lock;
1: -	struct list_head pend_list;
1: -	spinlock_t pend_list_lock;
1: -	struct list_head completed_list;
1: -	spinlock_t completed_list_lock;
1: -	uint16_t sglen;
1: -	int device_ids[1040];
1: -	caddr_t raid_device;
1: -	uint8_t max_channel;
1: -	uint16_t max_target;
1: -	uint8_t max_lun;
1: -	uint32_t unique_id;
1: -	int irq;
1: -	uint8_t ito;
1: -	caddr_t ibuf;
1: -	dma_addr_t ibuf_dma_h;
1: -	scb_t___2 *uscb_list;
1: -	struct list_head uscb_pool;
1: -	spinlock_t uscb_pool_lock;
1: -	int max_cmds;
1: -	uint8_t fw_version[16];
1: -	uint8_t bios_version[16];
1: -	uint8_t max_cdb_sz;
1: -	uint8_t ha;
1: -	uint16_t init_id;
1: -	uint16_t max_sectors;
1: -	uint16_t cmd_per_lun;
1: -	atomic_t being_detached;
1: +  struct tasklet_struct dpc_h;
1: +  struct pci_dev *pdev;
1: +  struct Scsi_Host *host;
1: +  spinlock_t lock;
1: +  uint8_t quiescent;
1: +  int outstanding_cmds;
1: +  scb_t___2 *kscb_list;
1: +  struct list_head kscb_pool;
1: +  spinlock_t kscb_pool_lock;
1: +  struct list_head pend_list;
1: +  spinlock_t pend_list_lock;
1: +  struct list_head completed_list;
1: +  spinlock_t completed_list_lock;
1: +  uint16_t sglen;
1: +  int device_ids[1040];
1: +  caddr_t raid_device;
1: +  uint8_t max_channel;
1: +  uint16_t max_target;
1: +  uint8_t max_lun;
1: +  uint32_t unique_id;
1: +  int irq;
1: +  uint8_t ito;
1: +  caddr_t ibuf;
1: +  dma_addr_t ibuf_dma_h;
1: +  scb_t___2 *uscb_list;
1: +  struct list_head uscb_pool;
1: +  spinlock_t uscb_pool_lock;
1: +  int max_cmds;
1: +  uint8_t fw_version[16];
1: +  uint8_t bios_version[16];
1: +  uint8_t max_cdb_sz;
1: +  uint8_t ha;
1: +  uint16_t init_id;
1: +  uint16_t max_sectors;
1: +  uint16_t cmd_per_lun;
1: +  atomic_t being_detached;
1:  } adapter_t___2;
1:  
1:  struct mraid_pci_blk {
1: -	caddr_t vaddr;
1: -	dma_addr_t dma_addr;
1: +  caddr_t vaddr;
1: +  dma_addr_t dma_addr;
1:  };
1:  
1:  typedef struct {
1: -	uint8_t timeout: 3;
1: -	uint8_t ars: 1;
1: -	uint8_t rsvd1: 1;
1: -	uint8_t cd_rom: 1;
1: -	uint8_t rsvd2: 1;
1: -	uint8_t islogical: 1;
1: -	uint8_t logdrv;
1: -	uint8_t channel;
1: -	uint8_t target;
1: -	uint8_t queuetag;
1: -	uint8_t queueaction;
1: -	uint8_t cdblen;
1: -	uint8_t rsvd3;
1: -	uint8_t cdb[16];
1: -	uint8_t numsge;
1: -	uint8_t status;
1: -	uint8_t reqsenselen;
1: -	uint8_t reqsensearea[32];
1: -	uint8_t rsvd4;
1: -	uint32_t dataxferaddr;
1: -	uint32_t dataxferlen;
1: +  uint8_t timeout : 3;
1: +  uint8_t ars : 1;
1: +  uint8_t rsvd1 : 1;
1: +  uint8_t cd_rom : 1;
1: +  uint8_t rsvd2 : 1;
1: +  uint8_t islogical : 1;
1: +  uint8_t logdrv;
1: +  uint8_t channel;
1: +  uint8_t target;
1: +  uint8_t queuetag;
1: +  uint8_t queueaction;
1: +  uint8_t cdblen;
1: +  uint8_t rsvd3;
1: +  uint8_t cdb[16];
1: +  uint8_t numsge;
1: +  uint8_t status;
1: +  uint8_t reqsenselen;
1: +  uint8_t reqsensearea[32];
1: +  uint8_t rsvd4;
1: +  uint32_t dataxferaddr;
1: +  uint32_t dataxferlen;
1:  } mraid_epassthru_t;
1:  
1:  typedef struct {
1: -	uint32_t data_size;
1: -	uint32_t config_signature;
1: -	uint8_t fw_version[16];
1: -	uint8_t bios_version[16];
1: -	uint8_t product_name[80];
1: -	uint8_t max_commands;
1: -	uint8_t nchannels;
1: -	uint8_t fc_loop_present;
1: -	uint8_t mem_type;
1: -	uint32_t signature;
1: -	uint16_t dram_size;
1: -	uint16_t subsysid;
1: -	uint16_t subsysvid;
1: -	uint8_t notify_counters;
1: -	uint8_t pad1k[889];
1: +  uint32_t data_size;
1: +  uint32_t config_signature;
1: +  uint8_t fw_version[16];
1: +  uint8_t bios_version[16];
1: +  uint8_t product_name[80];
1: +  uint8_t max_commands;
1: +  uint8_t nchannels;
1: +  uint8_t fc_loop_present;
1: +  uint8_t mem_type;
1: +  uint32_t signature;
1: +  uint16_t dram_size;
1: +  uint16_t subsysid;
1: +  uint16_t subsysvid;
1: +  uint8_t notify_counters;
1: +  uint8_t pad1k[889];
1:  } mraid_pinfo_t;
1:  
1:  typedef struct {
1: -	uint32_t global_counter;
1: -	uint8_t param_counter;
1: -	uint8_t param_id;
1: -	uint16_t param_val;
1: -	uint8_t write_config_counter;
1: -	uint8_t write_config_rsvd[3];
1: -	uint8_t ldrv_op_counter;
1: -	uint8_t ldrv_opid;
1: -	uint8_t ldrv_opcmd;
1: -	uint8_t ldrv_opstatus;
1: -	uint8_t ldrv_state_counter;
1: -	uint8_t ldrv_state_id;
1: -	uint8_t ldrv_state_new;
1: -	uint8_t ldrv_state_old;
1: -	uint8_t pdrv_state_counter;
1: -	uint8_t pdrv_state_id;
1: -	uint8_t pdrv_state_new;
1: -	uint8_t pdrv_state_old;
1: -	uint8_t pdrv_fmt_counter;
1: -	uint8_t pdrv_fmt_id;
1: -	uint8_t pdrv_fmt_val;
1: -	uint8_t pdrv_fmt_rsvd;
1: -	uint8_t targ_xfer_counter;
1: -	uint8_t targ_xfer_id;
1: -	uint8_t targ_xfer_val;
1: -	uint8_t targ_xfer_rsvd;
1: -	uint8_t fcloop_id_chg_counter;
1: -	uint8_t fcloopid_pdrvid;
1: -	uint8_t fcloop_id0;
1: -	uint8_t fcloop_id1;
1: -	uint8_t fcloop_state_counter;
1: -	uint8_t fcloop_state0;
1: -	uint8_t fcloop_state1;
1: -	uint8_t fcloop_state_rsvd;
1: +  uint32_t global_counter;
1: +  uint8_t param_counter;
1: +  uint8_t param_id;
1: +  uint16_t param_val;
1: +  uint8_t write_config_counter;
1: +  uint8_t write_config_rsvd[3];
1: +  uint8_t ldrv_op_counter;
1: +  uint8_t ldrv_opid;
1: +  uint8_t ldrv_opcmd;
1: +  uint8_t ldrv_opstatus;
1: +  uint8_t ldrv_state_counter;
1: +  uint8_t ldrv_state_id;
1: +  uint8_t ldrv_state_new;
1: +  uint8_t ldrv_state_old;
1: +  uint8_t pdrv_state_counter;
1: +  uint8_t pdrv_state_id;
1: +  uint8_t pdrv_state_new;
1: +  uint8_t pdrv_state_old;
1: +  uint8_t pdrv_fmt_counter;
1: +  uint8_t pdrv_fmt_id;
1: +  uint8_t pdrv_fmt_val;
1: +  uint8_t pdrv_fmt_rsvd;
1: +  uint8_t targ_xfer_counter;
1: +  uint8_t targ_xfer_id;
1: +  uint8_t targ_xfer_val;
1: +  uint8_t targ_xfer_rsvd;
1: +  uint8_t fcloop_id_chg_counter;
1: +  uint8_t fcloopid_pdrvid;
1: +  uint8_t fcloop_id0;
1: +  uint8_t fcloop_id1;
1: +  uint8_t fcloop_state_counter;
1: +  uint8_t fcloop_state0;
1: +  uint8_t fcloop_state1;
1: +  uint8_t fcloop_state_rsvd;
1:  } mraid_notify_t;
1:  
1:  typedef struct {
1: -	uint32_t data_size;
1: -	mraid_notify_t notify;
1: -	uint8_t notify_rsvd[88];
1: -	uint8_t rebuild_rate;
1: -	uint8_t cache_flush_int;
1: -	uint8_t sense_alert;
1: -	uint8_t drive_insert_count;
1: -	uint8_t battery_status;
1: -	uint8_t num_ldrv;
1: -	uint8_t recon_state[5];
1: -	uint16_t ldrv_op_status[5];
1: -	uint32_t ldrv_size[40];
1: -	uint8_t ldrv_prop[40];
1: -	uint8_t ldrv_state[40];
1: -	uint8_t pdrv_state[256];
1: -	uint16_t pdrv_format[16];
1: -	uint8_t targ_xfer[80];
1: -	uint8_t pad1k[263];
1: +  uint32_t data_size;
1: +  mraid_notify_t notify;
1: +  uint8_t notify_rsvd[88];
1: +  uint8_t rebuild_rate;
1: +  uint8_t cache_flush_int;
1: +  uint8_t sense_alert;
1: +  uint8_t drive_insert_count;
1: +  uint8_t battery_status;
1: +  uint8_t num_ldrv;
1: +  uint8_t recon_state[5];
1: +  uint16_t ldrv_op_status[5];
1: +  uint32_t ldrv_size[40];
1: +  uint8_t ldrv_prop[40];
1: +  uint8_t ldrv_state[40];
1: +  uint8_t pdrv_state[256];
1: +  uint16_t pdrv_format[16];
1: +  uint8_t targ_xfer[80];
1: +  uint8_t pad1k[263];
1:  } __attribute__((packed)) mraid_inquiry3_t;
1:  
1:  typedef struct {
1: -	uint64_t address;
1: -	uint32_t length;
1: +  uint64_t address;
1: +  uint32_t length;
1:  } __attribute__((packed)) mbox_sgl64;
1:  
1:  typedef struct {
1: -	uint32_t address;
1: -	uint32_t length;
1: +  uint32_t address;
1: +  uint32_t length;
1:  } mbox_sgl32;
1:  
1:  typedef struct {
1: -	uint8_t *raw_mbox;
1: -	mbox_t___2 *mbox;
1: -	mbox64_t___2 *mbox64;
1: -	dma_addr_t mbox_dma_h;
1: -	mbox_sgl64 *sgl64;
1: -	mbox_sgl32 *sgl32;
1: -	dma_addr_t sgl_dma_h;
1: -	mraid_passthru_t *pthru;
1: -	dma_addr_t pthru_dma_h;
1: -	mraid_epassthru_t *epthru;
1: -	dma_addr_t epthru_dma_h;
1: -	dma_addr_t buf_dma_h;
1: +  uint8_t *raw_mbox;
1: +  mbox_t___2 *mbox;
1: +  mbox64_t___2 *mbox64;
1: +  dma_addr_t mbox_dma_h;
1: +  mbox_sgl64 *sgl64;
1: +  mbox_sgl32 *sgl32;
1: +  dma_addr_t sgl_dma_h;
1: +  mraid_passthru_t *pthru;
1: +  dma_addr_t pthru_dma_h;
1: +  mraid_epassthru_t *epthru;
1: +  dma_addr_t epthru_dma_h;
1: +  dma_addr_t buf_dma_h;
1:  } mbox_ccb_t;
1:  
1:  typedef struct {
1: -	mbox64_t___2 *una_mbox64;
1: -	dma_addr_t una_mbox64_dma;
1: -	mbox_t___2 *mbox;
1: -	mbox64_t___2 *mbox64;
1: -	dma_addr_t mbox_dma;
1: -	spinlock_t mailbox_lock;
1: -	long unsigned int baseport;
1: -	void *baseaddr;
1: -	struct mraid_pci_blk mbox_pool[128];
1: -	struct dma_pool___2 *mbox_pool_handle;
1: -	struct mraid_pci_blk epthru_pool[128];
1: -	struct dma_pool___2 *epthru_pool_handle;
1: -	struct mraid_pci_blk sg_pool[128];
1: -	struct dma_pool___2 *sg_pool_handle;
1: -	mbox_ccb_t ccb_list[128];
1: -	mbox_ccb_t uccb_list[32];
1: -	mbox64_t___2 umbox64[32];
1: -	uint8_t pdrv_state[75];
1: -	uint32_t last_disp;
1: -	int hw_error;
1: -	int fast_load;
1: -	uint8_t channel_class;
1: -	struct mutex sysfs_mtx;
1: -	uioc_t *sysfs_uioc;
1: -	mbox64_t___2 *sysfs_mbox64;
1: -	caddr_t sysfs_buffer;
1: -	dma_addr_t sysfs_buffer_dma;
1: -	wait_queue_head_t sysfs_wait_q;
1: -	int random_del_supported;
1: -	uint16_t curr_ldmap[64];
1: +  mbox64_t___2 *una_mbox64;
1: +  dma_addr_t una_mbox64_dma;
1: +  mbox_t___2 *mbox;
1: +  mbox64_t___2 *mbox64;
1: +  dma_addr_t mbox_dma;
1: +  spinlock_t mailbox_lock;
1: +  long unsigned int baseport;
1: +  void *baseaddr;
1: +  struct mraid_pci_blk mbox_pool[128];
1: +  struct dma_pool___2 *mbox_pool_handle;
1: +  struct mraid_pci_blk epthru_pool[128];
1: +  struct dma_pool___2 *epthru_pool_handle;
1: +  struct mraid_pci_blk sg_pool[128];
1: +  struct dma_pool___2 *sg_pool_handle;
1: +  mbox_ccb_t ccb_list[128];
1: +  mbox_ccb_t uccb_list[32];
1: +  mbox64_t___2 umbox64[32];
1: +  uint8_t pdrv_state[75];
1: +  uint32_t last_disp;
1: +  int hw_error;
1: +  int fast_load;
1: +  uint8_t channel_class;
1: +  struct mutex sysfs_mtx;
1: +  uioc_t *sysfs_uioc;
1: +  mbox64_t___2 *sysfs_mbox64;
1: +  caddr_t sysfs_buffer;
1: +  dma_addr_t sysfs_buffer_dma;
1: +  wait_queue_head_t sysfs_wait_q;
1: +  int random_del_supported;
1: +  uint16_t curr_ldmap[64];
1:  } mraid_device_t;
1:  
1:  struct TAG_twa_message_type {
1: -	unsigned int code;
1: -	char *text;
1: +  unsigned int code;
1: +  char *text;
1:  };
1:  
1:  typedef struct TAG_twa_message_type twa_message_type;
1:  
1:  struct TAG_TW_SG_Entry {
1: -	dma_addr_t address;
1: -	u32 length;
1: +  dma_addr_t address;
1: +  u32 length;
1:  } __attribute__((packed));
1:  
1:  typedef struct TAG_TW_SG_Entry TW_SG_Entry;
1:  
1:  struct TW_Command {
1: -	unsigned char opcode__sgloffset;
1: -	unsigned char size;
1: -	unsigned char request_id;
1: -	unsigned char unit__hostid;
1: -	unsigned char status;
1: -	unsigned char flags;
1: -	union {
1: -		short unsigned int block_count;
1: -		short unsigned int parameter_count;
1: -	} byte6_offset;
1: -	union {
1: -		struct {
1: -			u32 lba;
1: -			TW_SG_Entry sgl[41];
1: -			dma_addr_t padding;
1: -		} __attribute__((packed)) io;
1: -		struct {
1: -			TW_SG_Entry sgl[41];
1: -			u32 padding;
1: -			dma_addr_t padding2;
1: -		} param;
1: -	} byte8_offset;
1: +  unsigned char opcode__sgloffset;
1: +  unsigned char size;
1: +  unsigned char request_id;
1: +  unsigned char unit__hostid;
1: +  unsigned char status;
1: +  unsigned char flags;
1: +  union {
1: +    short unsigned int block_count;
1: +    short unsigned int parameter_count;
1: +  } byte6_offset;
1: +  union {
1: +    struct {
1: +      u32 lba;
1: +      TW_SG_Entry sgl[41];
1: +      dma_addr_t padding;
1: +    } __attribute__((packed)) io;
1: +    struct {
1: +      TW_SG_Entry sgl[41];
1: +      u32 padding;
1: +      dma_addr_t padding2;
1: +    } param;
1: +  } byte8_offset;
1:  };
1:  
1:  typedef struct TW_Command TW_Command;
1:  
1:  struct TAG_TW_Command_Apache {
1: -	unsigned char opcode__reserved;
1: -	unsigned char unit;
1: -	short unsigned int request_id__lunl;
1: -	unsigned char status;
1: -	unsigned char sgl_offset;
1: -	short unsigned int sgl_entries__lunh;
1: -	unsigned char cdb[16];
1: -	TW_SG_Entry sg_list[72];
1: -	unsigned char padding[8];
1: +  unsigned char opcode__reserved;
1: +  unsigned char unit;
1: +  short unsigned int request_id__lunl;
1: +  unsigned char status;
1: +  unsigned char sgl_offset;
1: +  short unsigned int sgl_entries__lunh;
1: +  unsigned char cdb[16];
1: +  TW_SG_Entry sg_list[72];
1: +  unsigned char padding[8];
1:  };
1:  
1:  typedef struct TAG_TW_Command_Apache TW_Command_Apache;
1:  
1:  struct TAG_TW_Command_Apache_Header {
1: -	unsigned char sense_data[18];
1: -	struct {
1: -		char reserved[4];
1: -		short unsigned int error;
1: -		unsigned char padding;
1: -		unsigned char severity__reserved;
1: -	} status_block;
1: -	unsigned char err_specific_desc[98];
1: -	struct {
1: -		unsigned char size_header;
1: -		short unsigned int reserved;
1: -		unsigned char size_sense;
1: -	} __attribute__((packed)) header_desc;
1: +  unsigned char sense_data[18];
1: +  struct {
1: +    char reserved[4];
1: +    short unsigned int error;
1: +    unsigned char padding;
1: +    unsigned char severity__reserved;
1: +  } status_block;
1: +  unsigned char err_specific_desc[98];
1: +  struct {
1: +    unsigned char size_header;
1: +    short unsigned int reserved;
1: +    unsigned char size_sense;
1: +  } __attribute__((packed)) header_desc;
1:  };
1:  
1:  typedef struct TAG_TW_Command_Apache_Header TW_Command_Apache_Header;
1:  
1:  struct TAG_TW_Command_Full {
1: -	TW_Command_Apache_Header header;
1: -	union {
1: -		TW_Command oldcommand;
1: -		TW_Command_Apache newcommand;
1: -	} command;
1: +  TW_Command_Apache_Header header;
1: +  union {
1: +    TW_Command oldcommand;
1: +    TW_Command_Apache newcommand;
1: +  } command;
1:  };
1:  
1:  typedef struct TAG_TW_Command_Full TW_Command_Full;
1:  
1:  struct TAG_TW_Initconnect {
1: -	unsigned char opcode__reserved;
1: -	unsigned char size;
1: -	unsigned char request_id;
1: -	unsigned char res2;
1: -	unsigned char status;
1: -	unsigned char flags;
1: -	short unsigned int message_credits;
1: -	u32 features;
1: -	short unsigned int fw_srl;
1: -	short unsigned int fw_arch_id;
1: -	short unsigned int fw_branch;
1: -	short unsigned int fw_build;
1: -	u32 result;
1: +  unsigned char opcode__reserved;
1: +  unsigned char size;
1: +  unsigned char request_id;
1: +  unsigned char res2;
1: +  unsigned char status;
1: +  unsigned char flags;
1: +  short unsigned int message_credits;
1: +  u32 features;
1: +  short unsigned int fw_srl;
1: +  short unsigned int fw_arch_id;
1: +  short unsigned int fw_branch;
1: +  short unsigned int fw_build;
1: +  u32 result;
1:  };
1:  
1:  typedef struct TAG_TW_Initconnect TW_Initconnect;
1:  
1:  struct TAG_TW_Event {
1: -	unsigned int sequence_id;
1: -	unsigned int time_stamp_sec;
1: -	short unsigned int aen_code;
1: -	unsigned char severity;
1: -	unsigned char retrieved;
1: -	unsigned char repeat_count;
1: -	unsigned char parameter_len;
1: -	unsigned char parameter_data[98];
1: +  unsigned int sequence_id;
1: +  unsigned int time_stamp_sec;
1: +  short unsigned int aen_code;
1: +  unsigned char severity;
1: +  unsigned char retrieved;
1: +  unsigned char repeat_count;
1: +  unsigned char parameter_len;
1: +  unsigned char parameter_data[98];
1:  };
1:  
1:  typedef struct TAG_TW_Event TW_Event;
1:  
1:  struct TAG_TW_Ioctl_Driver_Command {
1: -	unsigned int control_code;
1: -	unsigned int status;
1: -	unsigned int unique_id;
1: -	unsigned int sequence_id;
1: -	unsigned int os_specific;
1: -	unsigned int buffer_length;
1: +  unsigned int control_code;
1: +  unsigned int status;
1: +  unsigned int unique_id;
1: +  unsigned int sequence_id;
1: +  unsigned int os_specific;
1: +  unsigned int buffer_length;
1:  };
1:  
1:  typedef struct TAG_TW_Ioctl_Driver_Command TW_Ioctl_Driver_Command;
1:  
1:  struct TAG_TW_Ioctl_Apache {
1: -	TW_Ioctl_Driver_Command driver_command;
1: -	char padding[488];
1: -	TW_Command_Full firmware_command;
1: -	char data_buffer[1];
1: +  TW_Ioctl_Driver_Command driver_command;
1: +  char padding[488];
1: +  TW_Command_Full firmware_command;
1: +  char data_buffer[1];
1:  } __attribute__((packed));
1:  
1:  typedef struct TAG_TW_Ioctl_Apache TW_Ioctl_Buf_Apache;
1:  
1:  struct TAG_TW_Lock {
1: -	long unsigned int timeout_msec;
1: -	long unsigned int time_remaining_msec;
1: -	long unsigned int force_flag;
1: +  long unsigned int timeout_msec;
1: +  long unsigned int time_remaining_msec;
1: +  long unsigned int force_flag;
1:  };
1:  
1:  typedef struct TAG_TW_Lock TW_Lock;
1:  
1:  typedef struct {
1: -	short unsigned int table_id;
1: -	short unsigned int parameter_id;
1: -	short unsigned int parameter_size_bytes;
1: -	short unsigned int actual_parameter_size_bytes;
1: -	unsigned char data[1];
1: +  short unsigned int table_id;
1: +  short unsigned int parameter_id;
1: +  short unsigned int parameter_size_bytes;
1: +  short unsigned int actual_parameter_size_bytes;
1: +  unsigned char data[1];
1:  } __attribute__((packed)) TW_Param_Apache;
1:  
1:  union TAG_TW_Response_Queue {
1: -	u32 response_id;
1: -	u32 value;
1: +  u32 response_id;
1: +  u32 value;
1:  };
1:  
1:  typedef union TAG_TW_Response_Queue TW_Response_Queue;
1:  
1:  struct TAG_TW_Compatibility_Info {
1: -	char driver_version[32];
1: -	short unsigned int working_srl;
1: -	short unsigned int working_branch;
1: -	short unsigned int working_build;
1: -	short unsigned int driver_srl_high;
1: -	short unsigned int driver_branch_high;
1: -	short unsigned int driver_build_high;
1: -	short unsigned int driver_srl_low;
1: -	short unsigned int driver_branch_low;
1: -	short unsigned int driver_build_low;
1: -	short unsigned int fw_on_ctlr_srl;
1: -	short unsigned int fw_on_ctlr_branch;
1: -	short unsigned int fw_on_ctlr_build;
1: +  char driver_version[32];
1: +  short unsigned int working_srl;
1: +  short unsigned int working_branch;
1: +  short unsigned int working_build;
1: +  short unsigned int driver_srl_high;
1: +  short unsigned int driver_branch_high;
1: +  short unsigned int driver_build_high;
1: +  short unsigned int driver_srl_low;
1: +  short unsigned int driver_branch_low;
1: +  short unsigned int driver_build_low;
1: +  short unsigned int fw_on_ctlr_srl;
1: +  short unsigned int fw_on_ctlr_branch;
1: +  short unsigned int fw_on_ctlr_build;
1:  };
1:  
1:  typedef struct TAG_TW_Compatibility_Info TW_Compatibility_Info;
1:  
1:  struct TAG_TW_Device_Extension {
1: -	u32 *base_addr;
1: -	long unsigned int *generic_buffer_virt[256];
1: -	dma_addr_t generic_buffer_phys[256];
1: -	TW_Command_Full *command_packet_virt[256];
1: -	dma_addr_t command_packet_phys[256];
1: -	struct pci_dev *tw_pci_dev;
1: -	struct scsi_cmnd *srb[256];
1: -	unsigned char free_queue[256];
1: -	unsigned char free_head;
1: -	unsigned char free_tail;
1: -	unsigned char pending_queue[256];
1: -	unsigned char pending_head;
1: -	unsigned char pending_tail;
1: -	int state[256];
1: -	unsigned int posted_request_count;
1: -	unsigned int max_posted_request_count;
1: -	unsigned int pending_request_count;
1: -	unsigned int max_pending_request_count;
1: -	unsigned int max_sgl_entries;
1: -	unsigned int sgl_entries;
1: -	unsigned int num_resets;
1: -	unsigned int sector_count;
1: -	unsigned int max_sector_count;
1: -	unsigned int aen_count;
1: -	int: 32;
1: -	struct Scsi_Host *host;
1: -	long int flags;
1: -	int reset_print;
1: -	int: 32;
1: -	TW_Event *event_queue[256];
1: -	unsigned char error_index;
1: -	unsigned char event_queue_wrapped;
1: -	short: 16;
1: -	unsigned int error_sequence_id;
1: -	int ioctl_sem_lock;
1: -	int: 32;
1: -	ktime_t ioctl_time;
1: -	int chrdev_request_id;
1: -	int: 32;
1: -	wait_queue_head_t ioctl_wqueue;
1: -	struct mutex ioctl_lock;
1: -	char aen_clobber;
1: -	TW_Compatibility_Info tw_compat_info;
1: -	long: 56;
1: +  u32 *base_addr;
1: +  long unsigned int *generic_buffer_virt[256];
1: +  dma_addr_t generic_buffer_phys[256];
1: +  TW_Command_Full *command_packet_virt[256];
1: +  dma_addr_t command_packet_phys[256];
1: +  struct pci_dev *tw_pci_dev;
1: +  struct scsi_cmnd *srb[256];
1: +  unsigned char free_queue[256];
1: +  unsigned char free_head;
1: +  unsigned char free_tail;
1: +  unsigned char pending_queue[256];
1: +  unsigned char pending_head;
1: +  unsigned char pending_tail;
1: +  int state[256];
1: +  unsigned int posted_request_count;
1: +  unsigned int max_posted_request_count;
1: +  unsigned int pending_request_count;
1: +  unsigned int max_pending_request_count;
1: +  unsigned int max_sgl_entries;
1: +  unsigned int sgl_entries;
1: +  unsigned int num_resets;
1: +  unsigned int sector_count;
1: +  unsigned int max_sector_count;
1: +  unsigned int aen_count;
1: +  int : 32;
1: +  struct Scsi_Host *host;
1: +  long int flags;
1: +  int reset_print;
1: +  int : 32;
1: +  TW_Event *event_queue[256];
1: +  unsigned char error_index;
1: +  unsigned char event_queue_wrapped;
1: +  short : 16;
1: +  unsigned int error_sequence_id;
1: +  int ioctl_sem_lock;
1: +  int : 32;
1: +  ktime_t ioctl_time;
1: +  int chrdev_request_id;
1: +  int : 32;
1: +  wait_queue_head_t ioctl_wqueue;
1: +  struct mutex ioctl_lock;
1: +  char aen_clobber;
1: +  TW_Compatibility_Info tw_compat_info;
1: +  long : 56;
1:  } __attribute__((packed));
1:  
1:  typedef struct TAG_TW_Device_Extension TW_Device_Extension;
1:  
1:  struct virtio_scsi_cmd_req {
1: -	__u8 lun[8];
1: -	__virtio64 tag;
1: -	__u8 task_attr;
1: -	__u8 prio;
1: -	__u8 crn;
1: -	__u8 cdb[32];
1: +  __u8 lun[8];
1: +  __virtio64 tag;
1: +  __u8 task_attr;
1: +  __u8 prio;
1: +  __u8 crn;
1: +  __u8 cdb[32];
1:  } __attribute__((packed));
1:  
1:  struct virtio_scsi_cmd_req_pi {
1: -	__u8 lun[8];
1: -	__virtio64 tag;
1: -	__u8 task_attr;
1: -	__u8 prio;
1: -	__u8 crn;
1: -	__virtio32 pi_bytesout;
1: -	__virtio32 pi_bytesin;
1: -	__u8 cdb[32];
1: +  __u8 lun[8];
1: +  __virtio64 tag;
1: +  __u8 task_attr;
1: +  __u8 prio;
1: +  __u8 crn;
1: +  __virtio32 pi_bytesout;
1: +  __virtio32 pi_bytesin;
1: +  __u8 cdb[32];
1:  } __attribute__((packed));
1:  
1:  struct virtio_scsi_cmd_resp {
1: -	__virtio32 sense_len;
1: -	__virtio32 resid;
1: -	__virtio16 status_qualifier;
1: -	__u8 status;
1: -	__u8 response;
1: -	__u8 sense[96];
1: +  __virtio32 sense_len;
1: +  __virtio32 resid;
1: +  __virtio16 status_qualifier;
1: +  __u8 status;
1: +  __u8 response;
1: +  __u8 sense[96];
1:  };
1:  
1:  struct virtio_scsi_ctrl_tmf_req {
1: -	__virtio32 type;
1: -	__virtio32 subtype;
1: -	__u8 lun[8];
1: -	__virtio64 tag;
1: +  __virtio32 type;
1: +  __virtio32 subtype;
1: +  __u8 lun[8];
1: +  __virtio64 tag;
1:  };
1:  
1:  struct virtio_scsi_ctrl_tmf_resp {
1: -	__u8 response;
1: +  __u8 response;
1:  };
1:  
1:  struct virtio_scsi_ctrl_an_req {
1: -	__virtio32 type;
1: -	__u8 lun[8];
1: -	__virtio32 event_requested;
1: +  __virtio32 type;
1: +  __u8 lun[8];
1: +  __virtio32 event_requested;
1:  };
1:  
1:  struct virtio_scsi_ctrl_an_resp {
1: -	__virtio32 event_actual;
1: -	__u8 response;
1: +  __virtio32 event_actual;
1: +  __u8 response;
1:  } __attribute__((packed));
1:  
1:  struct virtio_scsi_event {
1: -	__virtio32 event;
1: -	__u8 lun[8];
1: -	__virtio32 reason;
1: +  __virtio32 event;
1: +  __u8 lun[8];
1: +  __virtio32 reason;
1:  };
1:  
1:  struct virtio_scsi_config {
1: -	__virtio32 num_queues;
1: -	__virtio32 seg_max;
1: -	__virtio32 max_sectors;
1: -	__virtio32 cmd_per_lun;
1: -	__virtio32 event_info_size;
1: -	__virtio32 sense_size;
1: -	__virtio32 cdb_size;
1: -	__virtio16 max_channel;
1: -	__virtio16 max_target;
1: -	__virtio32 max_lun;
1: +  __virtio32 num_queues;
1: +  __virtio32 seg_max;
1: +  __virtio32 max_sectors;
1: +  __virtio32 cmd_per_lun;
1: +  __virtio32 event_info_size;
1: +  __virtio32 sense_size;
1: +  __virtio32 cdb_size;
1: +  __virtio16 max_channel;
1: +  __virtio16 max_target;
1: +  __virtio32 max_lun;
1:  };
1:  
1:  struct virtio_scsi_cmd {
1: -	struct scsi_cmnd *sc;
1: -	struct completion *comp;
1: -	union {
1: -		struct virtio_scsi_cmd_req cmd;
1: -		struct virtio_scsi_cmd_req_pi cmd_pi;
1: -		struct virtio_scsi_ctrl_tmf_req tmf;
1: -		struct virtio_scsi_ctrl_an_req an;
1: -	} req;
1: -	union {
1: -		struct virtio_scsi_cmd_resp cmd;
1: -		struct virtio_scsi_ctrl_tmf_resp tmf;
1: -		struct virtio_scsi_ctrl_an_resp an;
1: -		struct virtio_scsi_event evt;
1: -	} resp;
1: -	long: 8;
1: -	long: 64;
1: +  struct scsi_cmnd *sc;
1: +  struct completion *comp;
1: +  union {
1: +    struct virtio_scsi_cmd_req cmd;
1: +    struct virtio_scsi_cmd_req_pi cmd_pi;
1: +    struct virtio_scsi_ctrl_tmf_req tmf;
1: +    struct virtio_scsi_ctrl_an_req an;
1: +  } req;
1: +  union {
1: +    struct virtio_scsi_cmd_resp cmd;
1: +    struct virtio_scsi_ctrl_tmf_resp tmf;
1: +    struct virtio_scsi_ctrl_an_resp an;
1: +    struct virtio_scsi_event evt;
1: +  } resp;
1: +  long : 8;
1: +  long : 64;
1:  } __attribute__((packed));
1:  
1:  struct virtio_scsi;
1:  
1:  struct virtio_scsi_event_node {
1: -	struct virtio_scsi *vscsi;
1: -	struct virtio_scsi_event event;
1: -	struct work_struct work;
1: +  struct virtio_scsi *vscsi;
1: +  struct virtio_scsi_event event;
1: +  struct work_struct work;
1:  };
1:  
1:  struct virtio_scsi_vq {
1: -	spinlock_t vq_lock;
1: -	struct virtqueue *vq;
1: +  spinlock_t vq_lock;
1: +  struct virtqueue *vq;
1:  };
1:  
1:  struct virtio_scsi {
1: -	struct virtio_device *vdev;
1: -	struct virtio_scsi_event_node event_list[8];
1: -	u32 num_queues;
1: -	struct hlist_node node;
1: -	bool stop_events;
1: -	struct virtio_scsi_vq ctrl_vq;
1: -	struct virtio_scsi_vq event_vq;
1: -	struct virtio_scsi_vq req_vqs[0];
1: +  struct virtio_device *vdev;
1: +  struct virtio_scsi_event_node event_list[8];
1: +  u32 num_queues;
1: +  struct hlist_node node;
1: +  bool stop_events;
1: +  struct virtio_scsi_vq ctrl_vq;
1: +  struct virtio_scsi_vq event_vq;
1: +  struct virtio_scsi_vq req_vqs[0];
1:  };
1:  
1:  enum bip_flags {
1: -	BIP_BLOCK_INTEGRITY = 1,
1: -	BIP_MAPPED_INTEGRITY = 2,
1: -	BIP_CTRL_NOCHECK = 4,
1: -	BIP_DISK_NOCHECK = 8,
1: -	BIP_IP_CHECKSUM = 16,
1: +  BIP_BLOCK_INTEGRITY = 1,
1: +  BIP_MAPPED_INTEGRITY = 2,
1: +  BIP_CTRL_NOCHECK = 4,
1: +  BIP_DISK_NOCHECK = 8,
1: +  BIP_IP_CHECKSUM = 16,
1:  };
1:  
1:  enum t10_dif_type {
1: -	T10_PI_TYPE0_PROTECTION = 0,
1: -	T10_PI_TYPE1_PROTECTION = 1,
1: -	T10_PI_TYPE2_PROTECTION = 2,
1: -	T10_PI_TYPE3_PROTECTION = 3,
1: +  T10_PI_TYPE0_PROTECTION = 0,
1: +  T10_PI_TYPE1_PROTECTION = 1,
1: +  T10_PI_TYPE2_PROTECTION = 2,
1: +  T10_PI_TYPE3_PROTECTION = 3,
1:  };
1:  
1:  enum scsi_prot_flags {
1: -	SCSI_PROT_TRANSFER_PI = 1,
1: -	SCSI_PROT_GUARD_CHECK = 2,
1: -	SCSI_PROT_REF_CHECK = 4,
1: -	SCSI_PROT_REF_INCREMENT = 8,
1: -	SCSI_PROT_IP_CHECKSUM = 16,
1: +  SCSI_PROT_TRANSFER_PI = 1,
1: +  SCSI_PROT_GUARD_CHECK = 2,
1: +  SCSI_PROT_REF_CHECK = 4,
1: +  SCSI_PROT_REF_INCREMENT = 8,
1: +  SCSI_PROT_IP_CHECKSUM = 16,
1:  };
1:  
1:  enum {
1: -	SD_EXT_CDB_SIZE = 32,
1: -	SD_MEMPOOL_SIZE = 2,
1: +  SD_EXT_CDB_SIZE = 32,
1: +  SD_MEMPOOL_SIZE = 2,
1:  };
1:  
1:  enum {
1: -	SD_DEF_XFER_BLOCKS = 65535,
1: -	SD_MAX_XFER_BLOCKS = 4294967295,
1: -	SD_MAX_WS10_BLOCKS = 65535,
1: -	SD_MAX_WS16_BLOCKS = 8388607,
1: +  SD_DEF_XFER_BLOCKS = 65535,
1: +  SD_MAX_XFER_BLOCKS = 4294967295,
1: +  SD_MAX_WS10_BLOCKS = 65535,
1: +  SD_MAX_WS16_BLOCKS = 8388607,
1:  };
1:  
1:  enum {
1: -	SD_LBP_FULL = 0,
1: -	SD_LBP_UNMAP = 1,
1: -	SD_LBP_WS16 = 2,
1: -	SD_LBP_WS10 = 3,
1: -	SD_LBP_ZERO = 4,
1: -	SD_LBP_DISABLE = 5,
1: +  SD_LBP_FULL = 0,
1: +  SD_LBP_UNMAP = 1,
1: +  SD_LBP_WS16 = 2,
1: +  SD_LBP_WS10 = 3,
1: +  SD_LBP_ZERO = 4,
1: +  SD_LBP_DISABLE = 5,
1:  };
1:  
1:  enum {
1: -	SD_ZERO_WRITE = 0,
1: -	SD_ZERO_WS = 1,
1: -	SD_ZERO_WS16_UNMAP = 2,
1: -	SD_ZERO_WS10_UNMAP = 3,
1: +  SD_ZERO_WRITE = 0,
1: +  SD_ZERO_WS = 1,
1: +  SD_ZERO_WS16_UNMAP = 2,
1: +  SD_ZERO_WS10_UNMAP = 3,
1:  };
1:  
1:  struct opal_dev;
1:  
1:  struct scsi_disk {
1: -	struct scsi_driver *driver;
1: -	struct scsi_device *device;
1: -	struct device dev;
1: -	struct gendisk *disk;
1: -	struct opal_dev *opal_dev;
1: -	atomic_t openers;
1: -	sector_t capacity;
1: -	int max_retries;
1: -	u32 max_xfer_blocks;
1: -	u32 opt_xfer_blocks;
1: -	u32 max_ws_blocks;
1: -	u32 max_unmap_blocks;
1: -	u32 unmap_granularity;
1: -	u32 unmap_alignment;
1: -	u32 index;
1: -	unsigned int physical_block_size;
1: -	unsigned int max_medium_access_timeouts;
1: -	unsigned int medium_access_timed_out;
1: -	u8 media_present;
1: -	u8 write_prot;
1: -	u8 protection_type;
1: -	u8 provisioning_mode;
1: -	u8 zeroing_mode;
1: -	unsigned int ATO: 1;
1: -	unsigned int cache_override: 1;
1: -	unsigned int WCE: 1;
1: -	unsigned int RCD: 1;
1: -	unsigned int DPOFUA: 1;
1: -	unsigned int first_scan: 1;
1: -	unsigned int lbpme: 1;
1: -	unsigned int lbprz: 1;
1: -	unsigned int lbpu: 1;
1: -	unsigned int lbpws: 1;
1: -	unsigned int lbpws10: 1;
1: -	unsigned int lbpvpd: 1;
1: -	unsigned int ws10: 1;
1: -	unsigned int ws16: 1;
1: -	unsigned int rc_basis: 2;
1: -	unsigned int zoned: 2;
1: -	unsigned int urswrz: 1;
1: -	unsigned int security: 1;
1: -	unsigned int ignore_medium_access_errors: 1;
1: -};
1: -
1: -enum {
1: -	ATA_MSG_DRV = 1,
1: -	ATA_MSG_INFO = 2,
1: -	ATA_MSG_PROBE = 4,
1: -	ATA_MSG_WARN = 8,
1: -	ATA_MSG_MALLOC = 16,
1: -	ATA_MSG_CTL = 32,
1: -	ATA_MSG_INTR = 64,
1: -	ATA_MSG_ERR = 128,
1: +  struct scsi_driver *driver;
1: +  struct scsi_device *device;
1: +  struct device dev;
1: +  struct gendisk *disk;
1: +  struct opal_dev *opal_dev;
1: +  atomic_t openers;
1: +  sector_t capacity;
1: +  int max_retries;
1: +  u32 max_xfer_blocks;
1: +  u32 opt_xfer_blocks;
1: +  u32 max_ws_blocks;
1: +  u32 max_unmap_blocks;
1: +  u32 unmap_granularity;
1: +  u32 unmap_alignment;
1: +  u32 index;
1: +  unsigned int physical_block_size;
1: +  unsigned int max_medium_access_timeouts;
1: +  unsigned int medium_access_timed_out;
1: +  u8 media_present;
1: +  u8 write_prot;
1: +  u8 protection_type;
1: +  u8 provisioning_mode;
1: +  u8 zeroing_mode;
1: +  unsigned int ATO : 1;
1: +  unsigned int cache_override : 1;
1: +  unsigned int WCE : 1;
1: +  unsigned int RCD : 1;
1: +  unsigned int DPOFUA : 1;
1: +  unsigned int first_scan : 1;
1: +  unsigned int lbpme : 1;
1: +  unsigned int lbprz : 1;
1: +  unsigned int lbpu : 1;
1: +  unsigned int lbpws : 1;
1: +  unsigned int lbpws10 : 1;
1: +  unsigned int lbpvpd : 1;
1: +  unsigned int ws10 : 1;
1: +  unsigned int ws16 : 1;
1: +  unsigned int rc_basis : 2;
1: +  unsigned int zoned : 2;
1: +  unsigned int urswrz : 1;
1: +  unsigned int security : 1;
1: +  unsigned int ignore_medium_access_errors : 1;
1: +};
1: +
1: +enum {
1: +  ATA_MSG_DRV = 1,
1: +  ATA_MSG_INFO = 2,
1: +  ATA_MSG_PROBE = 4,
1: +  ATA_MSG_WARN = 8,
1: +  ATA_MSG_MALLOC = 16,
1: +  ATA_MSG_CTL = 32,
1: +  ATA_MSG_INTR = 64,
1: +  ATA_MSG_ERR = 128,
1:  };
1:  
1:  enum ata_xfer_mask {
1: -	ATA_MASK_PIO = 127,
1: -	ATA_MASK_MWDMA = 3968,
1: -	ATA_MASK_UDMA = 1044480,
1: +  ATA_MASK_PIO = 127,
1: +  ATA_MASK_MWDMA = 3968,
1: +  ATA_MASK_UDMA = 1044480,
1:  };
1:  
1:  struct ata_port_info {
1: -	long unsigned int flags;
1: -	long unsigned int link_flags;
1: -	long unsigned int pio_mask;
1: -	long unsigned int mwdma_mask;
1: -	long unsigned int udma_mask;
1: -	struct ata_port_operations *port_ops;
1: -	void *private_data;
1: +  long unsigned int flags;
1: +  long unsigned int link_flags;
1: +  long unsigned int pio_mask;
1: +  long unsigned int mwdma_mask;
1: +  long unsigned int udma_mask;
1: +  struct ata_port_operations *port_ops;
1: +  void *private_data;
1:  };
1:  
1:  struct ata_timing {
1: -	short unsigned int mode;
1: -	short unsigned int setup;
1: -	short unsigned int act8b;
1: -	short unsigned int rec8b;
1: -	short unsigned int cyc8b;
1: -	short unsigned int active;
1: -	short unsigned int recover;
1: -	short unsigned int dmack_hold;
1: -	short unsigned int cycle;
1: -	short unsigned int udma;
1: +  short unsigned int mode;
1: +  short unsigned int setup;
1: +  short unsigned int act8b;
1: +  short unsigned int rec8b;
1: +  short unsigned int cyc8b;
1: +  short unsigned int active;
1: +  short unsigned int recover;
1: +  short unsigned int dmack_hold;
1: +  short unsigned int cycle;
1: +  short unsigned int udma;
1:  };
1:  
1:  struct pci_bits {
1: -	unsigned int reg;
1: -	unsigned int width;
1: -	long unsigned int mask;
1: -	long unsigned int val;
1: +  unsigned int reg;
1: +  unsigned int width;
1: +  long unsigned int mask;
1: +  long unsigned int val;
1:  };
1:  
1:  enum ata_link_iter_mode {
1: -	ATA_LITER_EDGE = 0,
1: -	ATA_LITER_HOST_FIRST = 1,
1: -	ATA_LITER_PMP_FIRST = 2,
1: +  ATA_LITER_EDGE = 0,
1: +  ATA_LITER_HOST_FIRST = 1,
1: +  ATA_LITER_PMP_FIRST = 2,
1:  };
1:  
1:  enum ata_dev_iter_mode {
1: -	ATA_DITER_ENABLED = 0,
1: -	ATA_DITER_ENABLED_REVERSE = 1,
1: -	ATA_DITER_ALL = 2,
1: -	ATA_DITER_ALL_REVERSE = 3,
1: +  ATA_DITER_ENABLED = 0,
1: +  ATA_DITER_ENABLED_REVERSE = 1,
1: +  ATA_DITER_ALL = 2,
1: +  ATA_DITER_ALL_REVERSE = 3,
1:  };
1:  
1:  struct trace_event_raw_ata_qc_issue {
1: -	struct trace_entry ent;
1: -	unsigned int ata_port;
1: -	unsigned int ata_dev;
1: -	unsigned int tag;
1: -	unsigned char cmd;
1: -	unsigned char dev;
1: -	unsigned char lbal;
1: -	unsigned char lbam;
1: -	unsigned char lbah;
1: -	unsigned char nsect;
1: -	unsigned char feature;
1: -	unsigned char hob_lbal;
1: -	unsigned char hob_lbam;
1: -	unsigned char hob_lbah;
1: -	unsigned char hob_nsect;
1: -	unsigned char hob_feature;
1: -	unsigned char ctl;
1: -	unsigned char proto;
1: -	long unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int ata_port;
1: +  unsigned int ata_dev;
1: +  unsigned int tag;
1: +  unsigned char cmd;
1: +  unsigned char dev;
1: +  unsigned char lbal;
1: +  unsigned char lbam;
1: +  unsigned char lbah;
1: +  unsigned char nsect;
1: +  unsigned char feature;
1: +  unsigned char hob_lbal;
1: +  unsigned char hob_lbam;
1: +  unsigned char hob_lbah;
1: +  unsigned char hob_nsect;
1: +  unsigned char hob_feature;
1: +  unsigned char ctl;
1: +  unsigned char proto;
1: +  long unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ata_qc_complete_template {
1: -	struct trace_entry ent;
1: -	unsigned int ata_port;
1: -	unsigned int ata_dev;
1: -	unsigned int tag;
1: -	unsigned char status;
1: -	unsigned char dev;
1: -	unsigned char lbal;
1: -	unsigned char lbam;
1: -	unsigned char lbah;
1: -	unsigned char nsect;
1: -	unsigned char error;
1: -	unsigned char hob_lbal;
1: -	unsigned char hob_lbam;
1: -	unsigned char hob_lbah;
1: -	unsigned char hob_nsect;
1: -	unsigned char hob_feature;
1: -	unsigned char ctl;
1: -	long unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int ata_port;
1: +  unsigned int ata_dev;
1: +  unsigned int tag;
1: +  unsigned char status;
1: +  unsigned char dev;
1: +  unsigned char lbal;
1: +  unsigned char lbam;
1: +  unsigned char lbah;
1: +  unsigned char nsect;
1: +  unsigned char error;
1: +  unsigned char hob_lbal;
1: +  unsigned char hob_lbam;
1: +  unsigned char hob_lbah;
1: +  unsigned char hob_nsect;
1: +  unsigned char hob_feature;
1: +  unsigned char ctl;
1: +  long unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ata_eh_link_autopsy {
1: -	struct trace_entry ent;
1: -	unsigned int ata_port;
1: -	unsigned int ata_dev;
1: -	unsigned int eh_action;
1: -	unsigned int eh_err_mask;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int ata_port;
1: +  unsigned int ata_dev;
1: +  unsigned int eh_action;
1: +  unsigned int eh_err_mask;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_ata_eh_link_autopsy_qc {
1: -	struct trace_entry ent;
1: -	unsigned int ata_port;
1: -	unsigned int ata_dev;
1: -	unsigned int tag;
1: -	unsigned int qc_flags;
1: -	unsigned int eh_err_mask;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int ata_port;
1: +  unsigned int ata_dev;
1: +  unsigned int tag;
1: +  unsigned int qc_flags;
1: +  unsigned int eh_err_mask;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_ata_qc_issue {};
1: @@ -90989,1170 +92087,1176 @@ struct trace_event_data_offsets_ata_eh_link_autopsy_qc {};
1:  
1:  typedef void (*btf_trace_ata_qc_issue)(void *, struct ata_queued_cmd *);
1:  
1: -typedef void (*btf_trace_ata_qc_complete_internal)(void *, struct ata_queued_cmd *);
1: +typedef void (*btf_trace_ata_qc_complete_internal)(void *,
1: +                                                   struct ata_queued_cmd *);
1:  
1: -typedef void (*btf_trace_ata_qc_complete_failed)(void *, struct ata_queued_cmd *);
1: +typedef void (*btf_trace_ata_qc_complete_failed)(void *,
1: +                                                 struct ata_queued_cmd *);
1:  
1:  typedef void (*btf_trace_ata_qc_complete_done)(void *, struct ata_queued_cmd *);
1:  
1: -typedef void (*btf_trace_ata_eh_link_autopsy)(void *, struct ata_device *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_ata_eh_link_autopsy)(void *, struct ata_device *,
1: +                                              unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_ata_eh_link_autopsy_qc)(void *, struct ata_queued_cmd *);
1: +typedef void (*btf_trace_ata_eh_link_autopsy_qc)(void *,
1: +                                                 struct ata_queued_cmd *);
1:  
1:  enum {
1: -	ATA_READID_POSTRESET = 1,
1: -	ATA_DNXFER_PIO = 0,
1: -	ATA_DNXFER_DMA = 1,
1: -	ATA_DNXFER_40C = 2,
1: -	ATA_DNXFER_FORCE_PIO = 3,
1: -	ATA_DNXFER_FORCE_PIO0 = 4,
1: -	ATA_DNXFER_QUIET = 2147483648,
1: +  ATA_READID_POSTRESET = 1,
1: +  ATA_DNXFER_PIO = 0,
1: +  ATA_DNXFER_DMA = 1,
1: +  ATA_DNXFER_40C = 2,
1: +  ATA_DNXFER_FORCE_PIO = 3,
1: +  ATA_DNXFER_FORCE_PIO0 = 4,
1: +  ATA_DNXFER_QUIET = 2147483648,
1:  };
1:  
1:  struct ata_force_param {
1: -	const char *name;
1: -	u8 cbl;
1: -	u8 spd_limit;
1: -	long unsigned int xfer_mask;
1: -	unsigned int horkage_on;
1: -	unsigned int horkage_off;
1: -	u16 lflags;
1: +  const char *name;
1: +  u8 cbl;
1: +  u8 spd_limit;
1: +  long unsigned int xfer_mask;
1: +  unsigned int horkage_on;
1: +  unsigned int horkage_off;
1: +  u16 lflags;
1:  };
1:  
1:  struct ata_force_ent {
1: -	int port;
1: -	int device;
1: -	struct ata_force_param param;
1: +  int port;
1: +  int device;
1: +  struct ata_force_param param;
1:  };
1:  
1:  struct ata_xfer_ent {
1: -	int shift;
1: -	int bits;
1: -	u8 base;
1: +  int shift;
1: +  int bits;
1: +  u8 base;
1:  };
1:  
1:  struct ata_blacklist_entry {
1: -	const char *model_num;
1: -	const char *model_rev;
1: -	long unsigned int horkage;
1: +  const char *model_num;
1: +  const char *model_rev;
1: +  long unsigned int horkage;
1:  };
1:  
1:  typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *);
1:  
1:  struct ata_scsi_args {
1: -	struct ata_device *dev;
1: -	u16 *id;
1: -	struct scsi_cmnd *cmd;
1: +  struct ata_device *dev;
1: +  u16 *id;
1: +  struct scsi_cmnd *cmd;
1:  };
1:  
1:  enum ata_lpm_hints {
1: -	ATA_LPM_EMPTY = 1,
1: -	ATA_LPM_HIPM = 2,
1: -	ATA_LPM_WAKE_ONLY = 4,
1: -};
1: -
1: -enum {
1: -	ATA_EH_SPDN_NCQ_OFF = 1,
1: -	ATA_EH_SPDN_SPEED_DOWN = 2,
1: -	ATA_EH_SPDN_FALLBACK_TO_PIO = 4,
1: -	ATA_EH_SPDN_KEEP_ERRORS = 8,
1: -	ATA_EFLAG_IS_IO = 1,
1: -	ATA_EFLAG_DUBIOUS_XFER = 2,
1: -	ATA_EFLAG_OLD_ER = 2147483648,
1: -	ATA_ECAT_NONE = 0,
1: -	ATA_ECAT_ATA_BUS = 1,
1: -	ATA_ECAT_TOUT_HSM = 2,
1: -	ATA_ECAT_UNK_DEV = 3,
1: -	ATA_ECAT_DUBIOUS_NONE = 4,
1: -	ATA_ECAT_DUBIOUS_ATA_BUS = 5,
1: -	ATA_ECAT_DUBIOUS_TOUT_HSM = 6,
1: -	ATA_ECAT_DUBIOUS_UNK_DEV = 7,
1: -	ATA_ECAT_NR = 8,
1: -	ATA_EH_CMD_DFL_TIMEOUT = 5000,
1: -	ATA_EH_RESET_COOL_DOWN = 5000,
1: -	ATA_EH_PRERESET_TIMEOUT = 10000,
1: -	ATA_EH_FASTDRAIN_INTERVAL = 3000,
1: -	ATA_EH_UA_TRIES = 5,
1: -	ATA_EH_PROBE_TRIAL_INTERVAL = 60000,
1: -	ATA_EH_PROBE_TRIALS = 2,
1: +  ATA_LPM_EMPTY = 1,
1: +  ATA_LPM_HIPM = 2,
1: +  ATA_LPM_WAKE_ONLY = 4,
1: +};
1: +
1: +enum {
1: +  ATA_EH_SPDN_NCQ_OFF = 1,
1: +  ATA_EH_SPDN_SPEED_DOWN = 2,
1: +  ATA_EH_SPDN_FALLBACK_TO_PIO = 4,
1: +  ATA_EH_SPDN_KEEP_ERRORS = 8,
1: +  ATA_EFLAG_IS_IO = 1,
1: +  ATA_EFLAG_DUBIOUS_XFER = 2,
1: +  ATA_EFLAG_OLD_ER = 2147483648,
1: +  ATA_ECAT_NONE = 0,
1: +  ATA_ECAT_ATA_BUS = 1,
1: +  ATA_ECAT_TOUT_HSM = 2,
1: +  ATA_ECAT_UNK_DEV = 3,
1: +  ATA_ECAT_DUBIOUS_NONE = 4,
1: +  ATA_ECAT_DUBIOUS_ATA_BUS = 5,
1: +  ATA_ECAT_DUBIOUS_TOUT_HSM = 6,
1: +  ATA_ECAT_DUBIOUS_UNK_DEV = 7,
1: +  ATA_ECAT_NR = 8,
1: +  ATA_EH_CMD_DFL_TIMEOUT = 5000,
1: +  ATA_EH_RESET_COOL_DOWN = 5000,
1: +  ATA_EH_PRERESET_TIMEOUT = 10000,
1: +  ATA_EH_FASTDRAIN_INTERVAL = 3000,
1: +  ATA_EH_UA_TRIES = 5,
1: +  ATA_EH_PROBE_TRIAL_INTERVAL = 60000,
1: +  ATA_EH_PROBE_TRIALS = 2,
1:  };
1:  
1:  struct ata_eh_cmd_timeout_ent {
1: -	const u8 *commands;
1: -	const long unsigned int *timeouts;
1: +  const u8 *commands;
1: +  const long unsigned int *timeouts;
1:  };
1:  
1:  struct speed_down_verdict_arg {
1: -	u64 since;
1: -	int xfer_ok;
1: -	int nr_errors[8];
1: +  u64 since;
1: +  int xfer_ok;
1: +  int nr_errors[8];
1:  };
1:  
1:  struct ata_internal {
1: -	struct scsi_transport_template t;
1: -	struct device_attribute private_port_attrs[3];
1: -	struct device_attribute private_link_attrs[3];
1: -	struct device_attribute private_dev_attrs[9];
1: -	struct transport_container link_attr_cont;
1: -	struct transport_container dev_attr_cont;
1: -	struct device_attribute *link_attrs[4];
1: -	struct device_attribute *port_attrs[4];
1: -	struct device_attribute *dev_attrs[10];
1: +  struct scsi_transport_template t;
1: +  struct device_attribute private_port_attrs[3];
1: +  struct device_attribute private_link_attrs[3];
1: +  struct device_attribute private_dev_attrs[9];
1: +  struct transport_container link_attr_cont;
1: +  struct transport_container dev_attr_cont;
1: +  struct device_attribute *link_attrs[4];
1: +  struct device_attribute *port_attrs[4];
1: +  struct device_attribute *dev_attrs[10];
1:  };
1:  
1:  struct ata_show_ering_arg {
1: -	char *buf;
1: -	int written;
1: +  char *buf;
1: +  int written;
1:  };
1:  
1:  enum hsm_task_states {
1: -	HSM_ST_IDLE = 0,
1: -	HSM_ST_FIRST = 1,
1: -	HSM_ST = 2,
1: -	HSM_ST_LAST = 3,
1: -	HSM_ST_ERR = 4,
1: +  HSM_ST_IDLE = 0,
1: +  HSM_ST_FIRST = 1,
1: +  HSM_ST = 2,
1: +  HSM_ST_LAST = 3,
1: +  HSM_ST_ERR = 4,
1:  };
1:  
1:  struct ata_acpi_gtf {
1: -	u8 tf[7];
1: +  u8 tf[7];
1:  };
1:  
1:  struct ata_acpi_hotplug_context {
1: -	struct acpi_hotplug_context hp;
1: -	union {
1: -		struct ata_port *ap;
1: -		struct ata_device *dev;
1: -	} data;
1: -};
1: -
1: -enum {
1: -	AHCI_MAX_PORTS = 32,
1: -	AHCI_MAX_CLKS = 5,
1: -	AHCI_MAX_SG = 168,
1: -	AHCI_DMA_BOUNDARY = 4294967295,
1: -	AHCI_MAX_CMDS = 32,
1: -	AHCI_CMD_SZ = 32,
1: -	AHCI_CMD_SLOT_SZ = 1024,
1: -	AHCI_RX_FIS_SZ = 256,
1: -	AHCI_CMD_TBL_CDB = 64,
1: -	AHCI_CMD_TBL_HDR_SZ = 128,
1: -	AHCI_CMD_TBL_SZ = 2816,
1: -	AHCI_CMD_TBL_AR_SZ = 90112,
1: -	AHCI_PORT_PRIV_DMA_SZ = 91392,
1: -	AHCI_PORT_PRIV_FBS_DMA_SZ = 95232,
1: -	AHCI_IRQ_ON_SG = 2147483648,
1: -	AHCI_CMD_ATAPI = 32,
1: -	AHCI_CMD_WRITE = 64,
1: -	AHCI_CMD_PREFETCH = 128,
1: -	AHCI_CMD_RESET = 256,
1: -	AHCI_CMD_CLR_BUSY = 1024,
1: -	RX_FIS_PIO_SETUP = 32,
1: -	RX_FIS_D2H_REG = 64,
1: -	RX_FIS_SDB = 88,
1: -	RX_FIS_UNK = 96,
1: -	HOST_CAP = 0,
1: -	HOST_CTL = 4,
1: -	HOST_IRQ_STAT = 8,
1: -	HOST_PORTS_IMPL = 12,
1: -	HOST_VERSION = 16,
1: -	HOST_EM_LOC = 28,
1: -	HOST_EM_CTL = 32,
1: -	HOST_CAP2 = 36,
1: -	HOST_RESET = 1,
1: -	HOST_IRQ_EN = 2,
1: -	HOST_MRSM = 4,
1: -	HOST_AHCI_EN = 2147483648,
1: -	HOST_CAP_SXS = 32,
1: -	HOST_CAP_EMS = 64,
1: -	HOST_CAP_CCC = 128,
1: -	HOST_CAP_PART = 8192,
1: -	HOST_CAP_SSC = 16384,
1: -	HOST_CAP_PIO_MULTI = 32768,
1: -	HOST_CAP_FBS = 65536,
1: -	HOST_CAP_PMP = 131072,
1: -	HOST_CAP_ONLY = 262144,
1: -	HOST_CAP_CLO = 16777216,
1: -	HOST_CAP_LED = 33554432,
1: -	HOST_CAP_ALPM = 67108864,
1: -	HOST_CAP_SSS = 134217728,
1: -	HOST_CAP_MPS = 268435456,
1: -	HOST_CAP_SNTF = 536870912,
1: -	HOST_CAP_NCQ = 1073741824,
1: -	HOST_CAP_64 = 2147483648,
1: -	HOST_CAP2_BOH = 1,
1: -	HOST_CAP2_NVMHCI = 2,
1: -	HOST_CAP2_APST = 4,
1: -	HOST_CAP2_SDS = 8,
1: -	HOST_CAP2_SADM = 16,
1: -	HOST_CAP2_DESO = 32,
1: -	PORT_LST_ADDR = 0,
1: -	PORT_LST_ADDR_HI = 4,
1: -	PORT_FIS_ADDR = 8,
1: -	PORT_FIS_ADDR_HI = 12,
1: -	PORT_IRQ_STAT = 16,
1: -	PORT_IRQ_MASK = 20,
1: -	PORT_CMD = 24,
1: -	PORT_TFDATA = 32,
1: -	PORT_SIG = 36,
1: -	PORT_CMD_ISSUE = 56,
1: -	PORT_SCR_STAT = 40,
1: -	PORT_SCR_CTL = 44,
1: -	PORT_SCR_ERR = 48,
1: -	PORT_SCR_ACT = 52,
1: -	PORT_SCR_NTF = 60,
1: -	PORT_FBS = 64,
1: -	PORT_DEVSLP = 68,
1: -	PORT_IRQ_COLD_PRES = 2147483648,
1: -	PORT_IRQ_TF_ERR = 1073741824,
1: -	PORT_IRQ_HBUS_ERR = 536870912,
1: -	PORT_IRQ_HBUS_DATA_ERR = 268435456,
1: -	PORT_IRQ_IF_ERR = 134217728,
1: -	PORT_IRQ_IF_NONFATAL = 67108864,
1: -	PORT_IRQ_OVERFLOW = 16777216,
1: -	PORT_IRQ_BAD_PMP = 8388608,
1: -	PORT_IRQ_PHYRDY = 4194304,
1: -	PORT_IRQ_DEV_ILCK = 128,
1: -	PORT_IRQ_CONNECT = 64,
1: -	PORT_IRQ_SG_DONE = 32,
1: -	PORT_IRQ_UNK_FIS = 16,
1: -	PORT_IRQ_SDB_FIS = 8,
1: -	PORT_IRQ_DMAS_FIS = 4,
1: -	PORT_IRQ_PIOS_FIS = 2,
1: -	PORT_IRQ_D2H_REG_FIS = 1,
1: -	PORT_IRQ_FREEZE = 683671632,
1: -	PORT_IRQ_ERROR = 2025848912,
1: -	DEF_PORT_IRQ = 2025848959,
1: -	PORT_CMD_ASP = 134217728,
1: -	PORT_CMD_ALPE = 67108864,
1: -	PORT_CMD_ATAPI = 16777216,
1: -	PORT_CMD_FBSCP = 4194304,
1: -	PORT_CMD_ESP = 2097152,
1: -	PORT_CMD_HPCP = 262144,
1: -	PORT_CMD_PMP = 131072,
1: -	PORT_CMD_LIST_ON = 32768,
1: -	PORT_CMD_FIS_ON = 16384,
1: -	PORT_CMD_FIS_RX = 16,
1: -	PORT_CMD_CLO = 8,
1: -	PORT_CMD_POWER_ON = 4,
1: -	PORT_CMD_SPIN_UP = 2,
1: -	PORT_CMD_START = 1,
1: -	PORT_CMD_ICC_MASK = 4026531840,
1: -	PORT_CMD_ICC_ACTIVE = 268435456,
1: -	PORT_CMD_ICC_PARTIAL = 536870912,
1: -	PORT_CMD_ICC_SLUMBER = 1610612736,
1: -	PORT_FBS_DWE_OFFSET = 16,
1: -	PORT_FBS_ADO_OFFSET = 12,
1: -	PORT_FBS_DEV_OFFSET = 8,
1: -	PORT_FBS_DEV_MASK = 3840,
1: -	PORT_FBS_SDE = 4,
1: -	PORT_FBS_DEC = 2,
1: -	PORT_FBS_EN = 1,
1: -	PORT_DEVSLP_DM_OFFSET = 25,
1: -	PORT_DEVSLP_DM_MASK = 503316480,
1: -	PORT_DEVSLP_DITO_OFFSET = 15,
1: -	PORT_DEVSLP_MDAT_OFFSET = 10,
1: -	PORT_DEVSLP_DETO_OFFSET = 2,
1: -	PORT_DEVSLP_DSP = 2,
1: -	PORT_DEVSLP_ADSE = 1,
1: -	AHCI_HFLAG_NO_NCQ = 1,
1: -	AHCI_HFLAG_IGN_IRQ_IF_ERR = 2,
1: -	AHCI_HFLAG_IGN_SERR_INTERNAL = 4,
1: -	AHCI_HFLAG_32BIT_ONLY = 8,
1: -	AHCI_HFLAG_MV_PATA = 16,
1: -	AHCI_HFLAG_NO_MSI = 32,
1: -	AHCI_HFLAG_NO_PMP = 64,
1: -	AHCI_HFLAG_SECT255 = 256,
1: -	AHCI_HFLAG_YES_NCQ = 512,
1: -	AHCI_HFLAG_NO_SUSPEND = 1024,
1: -	AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = 2048,
1: -	AHCI_HFLAG_NO_SNTF = 4096,
1: -	AHCI_HFLAG_NO_FPDMA_AA = 8192,
1: -	AHCI_HFLAG_YES_FBS = 16384,
1: -	AHCI_HFLAG_DELAY_ENGINE = 32768,
1: -	AHCI_HFLAG_NO_DEVSLP = 131072,
1: -	AHCI_HFLAG_NO_FBS = 262144,
1: -	AHCI_HFLAG_MULTI_MSI = 1048576,
1: -	AHCI_HFLAG_WAKE_BEFORE_STOP = 4194304,
1: -	AHCI_HFLAG_YES_ALPM = 8388608,
1: -	AHCI_HFLAG_NO_WRITE_TO_RO = 16777216,
1: -	AHCI_HFLAG_IS_MOBILE = 33554432,
1: -	AHCI_HFLAG_SUSPEND_PHYS = 67108864,
1: -	AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = 134217728,
1: -	AHCI_FLAG_COMMON = 393346,
1: -	ICH_MAP = 144,
1: -	PCS_6 = 146,
1: -	PCS_7 = 148,
1: -	EM_MAX_SLOTS = 8,
1: -	EM_MAX_RETRY = 5,
1: -	EM_CTL_RST = 512,
1: -	EM_CTL_TM = 256,
1: -	EM_CTL_MR = 1,
1: -	EM_CTL_ALHD = 67108864,
1: -	EM_CTL_XMT = 33554432,
1: -	EM_CTL_SMB = 16777216,
1: -	EM_CTL_SGPIO = 524288,
1: -	EM_CTL_SES = 262144,
1: -	EM_CTL_SAFTE = 131072,
1: -	EM_CTL_LED = 65536,
1: -	EM_MSG_TYPE_LED = 1,
1: -	EM_MSG_TYPE_SAFTE = 2,
1: -	EM_MSG_TYPE_SES2 = 4,
1: -	EM_MSG_TYPE_SGPIO = 8,
1: +  struct acpi_hotplug_context hp;
1: +  union {
1: +    struct ata_port *ap;
1: +    struct ata_device *dev;
1: +  } data;
1: +};
1: +
1: +enum {
1: +  AHCI_MAX_PORTS = 32,
1: +  AHCI_MAX_CLKS = 5,
1: +  AHCI_MAX_SG = 168,
1: +  AHCI_DMA_BOUNDARY = 4294967295,
1: +  AHCI_MAX_CMDS = 32,
1: +  AHCI_CMD_SZ = 32,
1: +  AHCI_CMD_SLOT_SZ = 1024,
1: +  AHCI_RX_FIS_SZ = 256,
1: +  AHCI_CMD_TBL_CDB = 64,
1: +  AHCI_CMD_TBL_HDR_SZ = 128,
1: +  AHCI_CMD_TBL_SZ = 2816,
1: +  AHCI_CMD_TBL_AR_SZ = 90112,
1: +  AHCI_PORT_PRIV_DMA_SZ = 91392,
1: +  AHCI_PORT_PRIV_FBS_DMA_SZ = 95232,
1: +  AHCI_IRQ_ON_SG = 2147483648,
1: +  AHCI_CMD_ATAPI = 32,
1: +  AHCI_CMD_WRITE = 64,
1: +  AHCI_CMD_PREFETCH = 128,
1: +  AHCI_CMD_RESET = 256,
1: +  AHCI_CMD_CLR_BUSY = 1024,
1: +  RX_FIS_PIO_SETUP = 32,
1: +  RX_FIS_D2H_REG = 64,
1: +  RX_FIS_SDB = 88,
1: +  RX_FIS_UNK = 96,
1: +  HOST_CAP = 0,
1: +  HOST_CTL = 4,
1: +  HOST_IRQ_STAT = 8,
1: +  HOST_PORTS_IMPL = 12,
1: +  HOST_VERSION = 16,
1: +  HOST_EM_LOC = 28,
1: +  HOST_EM_CTL = 32,
1: +  HOST_CAP2 = 36,
1: +  HOST_RESET = 1,
1: +  HOST_IRQ_EN = 2,
1: +  HOST_MRSM = 4,
1: +  HOST_AHCI_EN = 2147483648,
1: +  HOST_CAP_SXS = 32,
1: +  HOST_CAP_EMS = 64,
1: +  HOST_CAP_CCC = 128,
1: +  HOST_CAP_PART = 8192,
1: +  HOST_CAP_SSC = 16384,
1: +  HOST_CAP_PIO_MULTI = 32768,
1: +  HOST_CAP_FBS = 65536,
1: +  HOST_CAP_PMP = 131072,
1: +  HOST_CAP_ONLY = 262144,
1: +  HOST_CAP_CLO = 16777216,
1: +  HOST_CAP_LED = 33554432,
1: +  HOST_CAP_ALPM = 67108864,
1: +  HOST_CAP_SSS = 134217728,
1: +  HOST_CAP_MPS = 268435456,
1: +  HOST_CAP_SNTF = 536870912,
1: +  HOST_CAP_NCQ = 1073741824,
1: +  HOST_CAP_64 = 2147483648,
1: +  HOST_CAP2_BOH = 1,
1: +  HOST_CAP2_NVMHCI = 2,
1: +  HOST_CAP2_APST = 4,
1: +  HOST_CAP2_SDS = 8,
1: +  HOST_CAP2_SADM = 16,
1: +  HOST_CAP2_DESO = 32,
1: +  PORT_LST_ADDR = 0,
1: +  PORT_LST_ADDR_HI = 4,
1: +  PORT_FIS_ADDR = 8,
1: +  PORT_FIS_ADDR_HI = 12,
1: +  PORT_IRQ_STAT = 16,
1: +  PORT_IRQ_MASK = 20,
1: +  PORT_CMD = 24,
1: +  PORT_TFDATA = 32,
1: +  PORT_SIG = 36,
1: +  PORT_CMD_ISSUE = 56,
1: +  PORT_SCR_STAT = 40,
1: +  PORT_SCR_CTL = 44,
1: +  PORT_SCR_ERR = 48,
1: +  PORT_SCR_ACT = 52,
1: +  PORT_SCR_NTF = 60,
1: +  PORT_FBS = 64,
1: +  PORT_DEVSLP = 68,
1: +  PORT_IRQ_COLD_PRES = 2147483648,
1: +  PORT_IRQ_TF_ERR = 1073741824,
1: +  PORT_IRQ_HBUS_ERR = 536870912,
1: +  PORT_IRQ_HBUS_DATA_ERR = 268435456,
1: +  PORT_IRQ_IF_ERR = 134217728,
1: +  PORT_IRQ_IF_NONFATAL = 67108864,
1: +  PORT_IRQ_OVERFLOW = 16777216,
1: +  PORT_IRQ_BAD_PMP = 8388608,
1: +  PORT_IRQ_PHYRDY = 4194304,
1: +  PORT_IRQ_DEV_ILCK = 128,
1: +  PORT_IRQ_CONNECT = 64,
1: +  PORT_IRQ_SG_DONE = 32,
1: +  PORT_IRQ_UNK_FIS = 16,
1: +  PORT_IRQ_SDB_FIS = 8,
1: +  PORT_IRQ_DMAS_FIS = 4,
1: +  PORT_IRQ_PIOS_FIS = 2,
1: +  PORT_IRQ_D2H_REG_FIS = 1,
1: +  PORT_IRQ_FREEZE = 683671632,
1: +  PORT_IRQ_ERROR = 2025848912,
1: +  DEF_PORT_IRQ = 2025848959,
1: +  PORT_CMD_ASP = 134217728,
1: +  PORT_CMD_ALPE = 67108864,
1: +  PORT_CMD_ATAPI = 16777216,
1: +  PORT_CMD_FBSCP = 4194304,
1: +  PORT_CMD_ESP = 2097152,
1: +  PORT_CMD_HPCP = 262144,
1: +  PORT_CMD_PMP = 131072,
1: +  PORT_CMD_LIST_ON = 32768,
1: +  PORT_CMD_FIS_ON = 16384,
1: +  PORT_CMD_FIS_RX = 16,
1: +  PORT_CMD_CLO = 8,
1: +  PORT_CMD_POWER_ON = 4,
1: +  PORT_CMD_SPIN_UP = 2,
1: +  PORT_CMD_START = 1,
1: +  PORT_CMD_ICC_MASK = 4026531840,
1: +  PORT_CMD_ICC_ACTIVE = 268435456,
1: +  PORT_CMD_ICC_PARTIAL = 536870912,
1: +  PORT_CMD_ICC_SLUMBER = 1610612736,
1: +  PORT_FBS_DWE_OFFSET = 16,
1: +  PORT_FBS_ADO_OFFSET = 12,
1: +  PORT_FBS_DEV_OFFSET = 8,
1: +  PORT_FBS_DEV_MASK = 3840,
1: +  PORT_FBS_SDE = 4,
1: +  PORT_FBS_DEC = 2,
1: +  PORT_FBS_EN = 1,
1: +  PORT_DEVSLP_DM_OFFSET = 25,
1: +  PORT_DEVSLP_DM_MASK = 503316480,
1: +  PORT_DEVSLP_DITO_OFFSET = 15,
1: +  PORT_DEVSLP_MDAT_OFFSET = 10,
1: +  PORT_DEVSLP_DETO_OFFSET = 2,
1: +  PORT_DEVSLP_DSP = 2,
1: +  PORT_DEVSLP_ADSE = 1,
1: +  AHCI_HFLAG_NO_NCQ = 1,
1: +  AHCI_HFLAG_IGN_IRQ_IF_ERR = 2,
1: +  AHCI_HFLAG_IGN_SERR_INTERNAL = 4,
1: +  AHCI_HFLAG_32BIT_ONLY = 8,
1: +  AHCI_HFLAG_MV_PATA = 16,
1: +  AHCI_HFLAG_NO_MSI = 32,
1: +  AHCI_HFLAG_NO_PMP = 64,
1: +  AHCI_HFLAG_SECT255 = 256,
1: +  AHCI_HFLAG_YES_NCQ = 512,
1: +  AHCI_HFLAG_NO_SUSPEND = 1024,
1: +  AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = 2048,
1: +  AHCI_HFLAG_NO_SNTF = 4096,
1: +  AHCI_HFLAG_NO_FPDMA_AA = 8192,
1: +  AHCI_HFLAG_YES_FBS = 16384,
1: +  AHCI_HFLAG_DELAY_ENGINE = 32768,
1: +  AHCI_HFLAG_NO_DEVSLP = 131072,
1: +  AHCI_HFLAG_NO_FBS = 262144,
1: +  AHCI_HFLAG_MULTI_MSI = 1048576,
1: +  AHCI_HFLAG_WAKE_BEFORE_STOP = 4194304,
1: +  AHCI_HFLAG_YES_ALPM = 8388608,
1: +  AHCI_HFLAG_NO_WRITE_TO_RO = 16777216,
1: +  AHCI_HFLAG_IS_MOBILE = 33554432,
1: +  AHCI_HFLAG_SUSPEND_PHYS = 67108864,
1: +  AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = 134217728,
1: +  AHCI_FLAG_COMMON = 393346,
1: +  ICH_MAP = 144,
1: +  PCS_6 = 146,
1: +  PCS_7 = 148,
1: +  EM_MAX_SLOTS = 8,
1: +  EM_MAX_RETRY = 5,
1: +  EM_CTL_RST = 512,
1: +  EM_CTL_TM = 256,
1: +  EM_CTL_MR = 1,
1: +  EM_CTL_ALHD = 67108864,
1: +  EM_CTL_XMT = 33554432,
1: +  EM_CTL_SMB = 16777216,
1: +  EM_CTL_SGPIO = 524288,
1: +  EM_CTL_SES = 262144,
1: +  EM_CTL_SAFTE = 131072,
1: +  EM_CTL_LED = 65536,
1: +  EM_MSG_TYPE_LED = 1,
1: +  EM_MSG_TYPE_SAFTE = 2,
1: +  EM_MSG_TYPE_SES2 = 4,
1: +  EM_MSG_TYPE_SGPIO = 8,
1:  };
1:  
1:  struct ahci_cmd_hdr {
1: -	__le32 opts;
1: -	__le32 status;
1: -	__le32 tbl_addr;
1: -	__le32 tbl_addr_hi;
1: -	__le32 reserved[4];
1: +  __le32 opts;
1: +  __le32 status;
1: +  __le32 tbl_addr;
1: +  __le32 tbl_addr_hi;
1: +  __le32 reserved[4];
1:  };
1:  
1:  struct ahci_em_priv {
1: -	enum sw_activity blink_policy;
1: -	struct timer_list timer;
1: -	long unsigned int saved_activity;
1: -	long unsigned int activity;
1: -	long unsigned int led_state;
1: -	struct ata_link *link;
1: +  enum sw_activity blink_policy;
1: +  struct timer_list timer;
1: +  long unsigned int saved_activity;
1: +  long unsigned int activity;
1: +  long unsigned int led_state;
1: +  struct ata_link *link;
1:  };
1:  
1:  struct ahci_port_priv {
1: -	struct ata_link *active_link;
1: -	struct ahci_cmd_hdr *cmd_slot;
1: -	dma_addr_t cmd_slot_dma;
1: -	void *cmd_tbl;
1: -	dma_addr_t cmd_tbl_dma;
1: -	void *rx_fis;
1: -	dma_addr_t rx_fis_dma;
1: -	unsigned int ncq_saw_d2h: 1;
1: -	unsigned int ncq_saw_dmas: 1;
1: -	unsigned int ncq_saw_sdb: 1;
1: -	spinlock_t lock;
1: -	u32 intr_mask;
1: -	bool fbs_supported;
1: -	bool fbs_enabled;
1: -	int fbs_last_dev;
1: -	struct ahci_em_priv em_priv[8];
1: -	char *irq_desc;
1: +  struct ata_link *active_link;
1: +  struct ahci_cmd_hdr *cmd_slot;
1: +  dma_addr_t cmd_slot_dma;
1: +  void *cmd_tbl;
1: +  dma_addr_t cmd_tbl_dma;
1: +  void *rx_fis;
1: +  dma_addr_t rx_fis_dma;
1: +  unsigned int ncq_saw_d2h : 1;
1: +  unsigned int ncq_saw_dmas : 1;
1: +  unsigned int ncq_saw_sdb : 1;
1: +  spinlock_t lock;
1: +  u32 intr_mask;
1: +  bool fbs_supported;
1: +  bool fbs_enabled;
1: +  int fbs_last_dev;
1: +  struct ahci_em_priv em_priv[8];
1: +  char *irq_desc;
1:  };
1:  
1:  struct ahci_host_priv {
1: -	unsigned int flags;
1: -	u32 force_port_map;
1: -	u32 mask_port_map;
1: -	void *mmio;
1: -	u32 cap;
1: -	u32 cap2;
1: -	u32 version;
1: -	u32 port_map;
1: -	u32 saved_cap;
1: -	u32 saved_cap2;
1: -	u32 saved_port_map;
1: -	u32 em_loc;
1: -	u32 em_buf_sz;
1: -	u32 em_msg_type;
1: -	u32 remapped_nvme;
1: -	bool got_runtime_pm;
1: -	struct clk *clks[5];
1: -	struct reset_control *rsts;
1: -	struct regulator **target_pwrs;
1: -	struct regulator *ahci_regulator;
1: -	struct regulator *phy_regulator;
1: -	struct phy **phys;
1: -	unsigned int nports;
1: -	void *plat_data;
1: -	unsigned int irq;
1: -	void (*start_engine)(struct ata_port *);
1: -	int (*stop_engine)(struct ata_port *);
1: -	irqreturn_t (*irq_handler)(int, void *);
1: -	int (*get_irq_vector)(struct ata_host *, int);
1: -};
1: -
1: -enum {
1: -	AHCI_PCI_BAR_STA2X11 = 0,
1: -	AHCI_PCI_BAR_CAVIUM = 0,
1: -	AHCI_PCI_BAR_LOONGSON = 0,
1: -	AHCI_PCI_BAR_ENMOTUS = 2,
1: -	AHCI_PCI_BAR_CAVIUM_GEN5 = 4,
1: -	AHCI_PCI_BAR_STANDARD = 5,
1: +  unsigned int flags;
1: +  u32 force_port_map;
1: +  u32 mask_port_map;
1: +  void *mmio;
1: +  u32 cap;
1: +  u32 cap2;
1: +  u32 version;
1: +  u32 port_map;
1: +  u32 saved_cap;
1: +  u32 saved_cap2;
1: +  u32 saved_port_map;
1: +  u32 em_loc;
1: +  u32 em_buf_sz;
1: +  u32 em_msg_type;
1: +  u32 remapped_nvme;
1: +  bool got_runtime_pm;
1: +  struct clk *clks[5];
1: +  struct reset_control *rsts;
1: +  struct regulator **target_pwrs;
1: +  struct regulator *ahci_regulator;
1: +  struct regulator *phy_regulator;
1: +  struct phy **phys;
1: +  unsigned int nports;
1: +  void *plat_data;
1: +  unsigned int irq;
1: +  void (*start_engine)(struct ata_port *);
1: +  int (*stop_engine)(struct ata_port *);
1: +  irqreturn_t (*irq_handler)(int, void *);
1: +  int (*get_irq_vector)(struct ata_host *, int);
1: +};
1: +
1: +enum {
1: +  AHCI_PCI_BAR_STA2X11 = 0,
1: +  AHCI_PCI_BAR_CAVIUM = 0,
1: +  AHCI_PCI_BAR_LOONGSON = 0,
1: +  AHCI_PCI_BAR_ENMOTUS = 2,
1: +  AHCI_PCI_BAR_CAVIUM_GEN5 = 4,
1: +  AHCI_PCI_BAR_STANDARD = 5,
1:  };
1:  
1:  enum board_ids {
1: -	board_ahci = 0,
1: -	board_ahci_ign_iferr = 1,
1: -	board_ahci_mobile = 2,
1: -	board_ahci_nomsi = 3,
1: -	board_ahci_noncq = 4,
1: -	board_ahci_nosntf = 5,
1: -	board_ahci_yes_fbs = 6,
1: -	board_ahci_al = 7,
1: -	board_ahci_avn = 8,
1: -	board_ahci_mcp65 = 9,
1: -	board_ahci_mcp77 = 10,
1: -	board_ahci_mcp89 = 11,
1: -	board_ahci_mv = 12,
1: -	board_ahci_sb600 = 13,
1: -	board_ahci_sb700 = 14,
1: -	board_ahci_vt8251 = 15,
1: -	board_ahci_pcs7 = 16,
1: -	board_ahci_mcp_linux = 9,
1: -	board_ahci_mcp67 = 9,
1: -	board_ahci_mcp73 = 9,
1: -	board_ahci_mcp79 = 10,
1: +  board_ahci = 0,
1: +  board_ahci_ign_iferr = 1,
1: +  board_ahci_mobile = 2,
1: +  board_ahci_nomsi = 3,
1: +  board_ahci_noncq = 4,
1: +  board_ahci_nosntf = 5,
1: +  board_ahci_yes_fbs = 6,
1: +  board_ahci_al = 7,
1: +  board_ahci_avn = 8,
1: +  board_ahci_mcp65 = 9,
1: +  board_ahci_mcp77 = 10,
1: +  board_ahci_mcp89 = 11,
1: +  board_ahci_mv = 12,
1: +  board_ahci_sb600 = 13,
1: +  board_ahci_sb700 = 14,
1: +  board_ahci_vt8251 = 15,
1: +  board_ahci_pcs7 = 16,
1: +  board_ahci_mcp_linux = 9,
1: +  board_ahci_mcp67 = 9,
1: +  board_ahci_mcp73 = 9,
1: +  board_ahci_mcp79 = 10,
1:  };
1:  
1:  struct ahci_sg {
1: -	__le32 addr;
1: -	__le32 addr_hi;
1: -	__le32 reserved;
1: -	__le32 flags_size;
1: -};
1: -
1: -enum {
1: -	PIIX_IOCFG = 84,
1: -	ICH5_PMR = 144,
1: -	ICH5_PCS = 146,
1: -	PIIX_SIDPR_BAR = 5,
1: -	PIIX_SIDPR_LEN = 16,
1: -	PIIX_SIDPR_IDX = 0,
1: -	PIIX_SIDPR_DATA = 4,
1: -	PIIX_FLAG_CHECKINTR = 268435456,
1: -	PIIX_FLAG_SIDPR = 536870912,
1: -	PIIX_PATA_FLAGS = 1,
1: -	PIIX_SATA_FLAGS = 268435458,
1: -	PIIX_FLAG_PIO16 = 1073741824,
1: -	PIIX_80C_PRI = 48,
1: -	PIIX_80C_SEC = 192,
1: -	P0 = 0,
1: -	P1 = 1,
1: -	P2 = 2,
1: -	P3 = 3,
1: -	IDE = 4294967295,
1: -	NA = 4294967294,
1: -	RV = 4294967293,
1: -	PIIX_AHCI_DEVICE = 6,
1: -	PIIX_HOST_BROKEN_SUSPEND = 16777216,
1: +  __le32 addr;
1: +  __le32 addr_hi;
1: +  __le32 reserved;
1: +  __le32 flags_size;
1: +};
1: +
1: +enum {
1: +  PIIX_IOCFG = 84,
1: +  ICH5_PMR = 144,
1: +  ICH5_PCS = 146,
1: +  PIIX_SIDPR_BAR = 5,
1: +  PIIX_SIDPR_LEN = 16,
1: +  PIIX_SIDPR_IDX = 0,
1: +  PIIX_SIDPR_DATA = 4,
1: +  PIIX_FLAG_CHECKINTR = 268435456,
1: +  PIIX_FLAG_SIDPR = 536870912,
1: +  PIIX_PATA_FLAGS = 1,
1: +  PIIX_SATA_FLAGS = 268435458,
1: +  PIIX_FLAG_PIO16 = 1073741824,
1: +  PIIX_80C_PRI = 48,
1: +  PIIX_80C_SEC = 192,
1: +  P0 = 0,
1: +  P1 = 1,
1: +  P2 = 2,
1: +  P3 = 3,
1: +  IDE = 4294967295,
1: +  NA = 4294967294,
1: +  RV = 4294967293,
1: +  PIIX_AHCI_DEVICE = 6,
1: +  PIIX_HOST_BROKEN_SUSPEND = 16777216,
1:  };
1:  
1:  enum piix_controller_ids {
1: -	piix_pata_mwdma = 0,
1: -	piix_pata_33 = 1,
1: -	ich_pata_33 = 2,
1: -	ich_pata_66 = 3,
1: -	ich_pata_100 = 4,
1: -	ich_pata_100_nomwdma1 = 5,
1: -	ich5_sata = 6,
1: -	ich6_sata = 7,
1: -	ich6m_sata = 8,
1: -	ich8_sata = 9,
1: -	ich8_2port_sata = 10,
1: -	ich8m_apple_sata = 11,
1: -	tolapai_sata = 12,
1: -	piix_pata_vmw = 13,
1: -	ich8_sata_snb = 14,
1: -	ich8_2port_sata_snb = 15,
1: -	ich8_2port_sata_byt = 16,
1: +  piix_pata_mwdma = 0,
1: +  piix_pata_33 = 1,
1: +  ich_pata_33 = 2,
1: +  ich_pata_66 = 3,
1: +  ich_pata_100 = 4,
1: +  ich_pata_100_nomwdma1 = 5,
1: +  ich5_sata = 6,
1: +  ich6_sata = 7,
1: +  ich6m_sata = 8,
1: +  ich8_sata = 9,
1: +  ich8_2port_sata = 10,
1: +  ich8m_apple_sata = 11,
1: +  tolapai_sata = 12,
1: +  piix_pata_vmw = 13,
1: +  ich8_sata_snb = 14,
1: +  ich8_2port_sata_snb = 15,
1: +  ich8_2port_sata_byt = 16,
1:  };
1:  
1:  struct piix_map_db {
1: -	const u32 mask;
1: -	const u16 port_enable;
1: -	const int map[0];
1: +  const u32 mask;
1: +  const u16 port_enable;
1: +  const int map[0];
1:  };
1:  
1:  struct piix_host_priv {
1: -	const int *map;
1: -	u32 saved_iocfg;
1: -	void *sidpr;
1: -};
1: -
1: -enum {
1: -	NV_MMIO_BAR = 5,
1: -	NV_PORTS = 2,
1: -	NV_PIO_MASK = 31,
1: -	NV_MWDMA_MASK = 7,
1: -	NV_UDMA_MASK = 127,
1: -	NV_PORT0_SCR_REG_OFFSET = 0,
1: -	NV_PORT1_SCR_REG_OFFSET = 64,
1: -	NV_INT_STATUS = 16,
1: -	NV_INT_ENABLE = 17,
1: -	NV_INT_STATUS_CK804 = 1088,
1: -	NV_INT_ENABLE_CK804 = 1089,
1: -	NV_INT_DEV = 1,
1: -	NV_INT_PM = 2,
1: -	NV_INT_ADDED = 4,
1: -	NV_INT_REMOVED = 8,
1: -	NV_INT_PORT_SHIFT = 4,
1: -	NV_INT_ALL = 15,
1: -	NV_INT_MASK = 13,
1: -	NV_INT_CONFIG = 18,
1: -	NV_INT_CONFIG_METHD = 1,
1: -	NV_MCP_SATA_CFG_20 = 80,
1: -	NV_MCP_SATA_CFG_20_SATA_SPACE_EN = 4,
1: -	NV_MCP_SATA_CFG_20_PORT0_EN = 131072,
1: -	NV_MCP_SATA_CFG_20_PORT1_EN = 65536,
1: -	NV_MCP_SATA_CFG_20_PORT0_PWB_EN = 16384,
1: -	NV_MCP_SATA_CFG_20_PORT1_PWB_EN = 4096,
1: -	NV_ADMA_MAX_CPBS = 32,
1: -	NV_ADMA_CPB_SZ = 128,
1: -	NV_ADMA_APRD_SZ = 16,
1: -	NV_ADMA_SGTBL_LEN = 56,
1: -	NV_ADMA_SGTBL_TOTAL_LEN = 61,
1: -	NV_ADMA_SGTBL_SZ = 896,
1: -	NV_ADMA_PORT_PRIV_DMA_SZ = 32768,
1: -	NV_ADMA_GEN = 1024,
1: -	NV_ADMA_GEN_CTL = 0,
1: -	NV_ADMA_NOTIFIER_CLEAR = 48,
1: -	NV_ADMA_PORT = 1152,
1: -	NV_ADMA_PORT_SIZE = 256,
1: -	NV_ADMA_CTL = 64,
1: -	NV_ADMA_CPB_COUNT = 66,
1: -	NV_ADMA_NEXT_CPB_IDX = 67,
1: -	NV_ADMA_STAT = 68,
1: -	NV_ADMA_CPB_BASE_LOW = 72,
1: -	NV_ADMA_CPB_BASE_HIGH = 76,
1: -	NV_ADMA_APPEND = 80,
1: -	NV_ADMA_NOTIFIER = 104,
1: -	NV_ADMA_NOTIFIER_ERROR = 108,
1: -	NV_ADMA_CTL_HOTPLUG_IEN = 1,
1: -	NV_ADMA_CTL_CHANNEL_RESET = 32,
1: -	NV_ADMA_CTL_GO = 128,
1: -	NV_ADMA_CTL_AIEN = 256,
1: -	NV_ADMA_CTL_READ_NON_COHERENT = 2048,
1: -	NV_ADMA_CTL_WRITE_NON_COHERENT = 4096,
1: -	NV_CPB_RESP_DONE = 1,
1: -	NV_CPB_RESP_ATA_ERR = 8,
1: -	NV_CPB_RESP_CMD_ERR = 16,
1: -	NV_CPB_RESP_CPB_ERR = 128,
1: -	NV_CPB_CTL_CPB_VALID = 1,
1: -	NV_CPB_CTL_QUEUE = 2,
1: -	NV_CPB_CTL_APRD_VALID = 4,
1: -	NV_CPB_CTL_IEN = 8,
1: -	NV_CPB_CTL_FPDMA = 16,
1: -	NV_APRD_WRITE = 2,
1: -	NV_APRD_END = 4,
1: -	NV_APRD_CONT = 8,
1: -	NV_ADMA_STAT_TIMEOUT = 1,
1: -	NV_ADMA_STAT_HOTUNPLUG = 2,
1: -	NV_ADMA_STAT_HOTPLUG = 4,
1: -	NV_ADMA_STAT_CPBERR = 16,
1: -	NV_ADMA_STAT_SERROR = 32,
1: -	NV_ADMA_STAT_CMD_COMPLETE = 64,
1: -	NV_ADMA_STAT_IDLE = 256,
1: -	NV_ADMA_STAT_LEGACY = 512,
1: -	NV_ADMA_STAT_STOPPED = 1024,
1: -	NV_ADMA_STAT_DONE = 4096,
1: -	NV_ADMA_STAT_ERR = 17,
1: -	NV_ADMA_PORT_REGISTER_MODE = 1,
1: -	NV_ADMA_ATAPI_SETUP_COMPLETE = 2,
1: -	NV_CTL_MCP55 = 1024,
1: -	NV_INT_STATUS_MCP55 = 1088,
1: -	NV_INT_ENABLE_MCP55 = 1092,
1: -	NV_NCQ_REG_MCP55 = 1096,
1: -	NV_INT_ALL_MCP55 = 65535,
1: -	NV_INT_PORT_SHIFT_MCP55 = 16,
1: -	NV_INT_MASK_MCP55 = 65533,
1: -	NV_CTL_PRI_SWNCQ = 2,
1: -	NV_CTL_SEC_SWNCQ = 4,
1: -	NV_SWNCQ_IRQ_DEV = 1,
1: -	NV_SWNCQ_IRQ_PM = 2,
1: -	NV_SWNCQ_IRQ_ADDED = 4,
1: -	NV_SWNCQ_IRQ_REMOVED = 8,
1: -	NV_SWNCQ_IRQ_BACKOUT = 16,
1: -	NV_SWNCQ_IRQ_SDBFIS = 32,
1: -	NV_SWNCQ_IRQ_DHREGFIS = 64,
1: -	NV_SWNCQ_IRQ_DMASETUP = 128,
1: -	NV_SWNCQ_IRQ_HOTPLUG = 12,
1: +  const int *map;
1: +  u32 saved_iocfg;
1: +  void *sidpr;
1: +};
1: +
1: +enum {
1: +  NV_MMIO_BAR = 5,
1: +  NV_PORTS = 2,
1: +  NV_PIO_MASK = 31,
1: +  NV_MWDMA_MASK = 7,
1: +  NV_UDMA_MASK = 127,
1: +  NV_PORT0_SCR_REG_OFFSET = 0,
1: +  NV_PORT1_SCR_REG_OFFSET = 64,
1: +  NV_INT_STATUS = 16,
1: +  NV_INT_ENABLE = 17,
1: +  NV_INT_STATUS_CK804 = 1088,
1: +  NV_INT_ENABLE_CK804 = 1089,
1: +  NV_INT_DEV = 1,
1: +  NV_INT_PM = 2,
1: +  NV_INT_ADDED = 4,
1: +  NV_INT_REMOVED = 8,
1: +  NV_INT_PORT_SHIFT = 4,
1: +  NV_INT_ALL = 15,
1: +  NV_INT_MASK = 13,
1: +  NV_INT_CONFIG = 18,
1: +  NV_INT_CONFIG_METHD = 1,
1: +  NV_MCP_SATA_CFG_20 = 80,
1: +  NV_MCP_SATA_CFG_20_SATA_SPACE_EN = 4,
1: +  NV_MCP_SATA_CFG_20_PORT0_EN = 131072,
1: +  NV_MCP_SATA_CFG_20_PORT1_EN = 65536,
1: +  NV_MCP_SATA_CFG_20_PORT0_PWB_EN = 16384,
1: +  NV_MCP_SATA_CFG_20_PORT1_PWB_EN = 4096,
1: +  NV_ADMA_MAX_CPBS = 32,
1: +  NV_ADMA_CPB_SZ = 128,
1: +  NV_ADMA_APRD_SZ = 16,
1: +  NV_ADMA_SGTBL_LEN = 56,
1: +  NV_ADMA_SGTBL_TOTAL_LEN = 61,
1: +  NV_ADMA_SGTBL_SZ = 896,
1: +  NV_ADMA_PORT_PRIV_DMA_SZ = 32768,
1: +  NV_ADMA_GEN = 1024,
1: +  NV_ADMA_GEN_CTL = 0,
1: +  NV_ADMA_NOTIFIER_CLEAR = 48,
1: +  NV_ADMA_PORT = 1152,
1: +  NV_ADMA_PORT_SIZE = 256,
1: +  NV_ADMA_CTL = 64,
1: +  NV_ADMA_CPB_COUNT = 66,
1: +  NV_ADMA_NEXT_CPB_IDX = 67,
1: +  NV_ADMA_STAT = 68,
1: +  NV_ADMA_CPB_BASE_LOW = 72,
1: +  NV_ADMA_CPB_BASE_HIGH = 76,
1: +  NV_ADMA_APPEND = 80,
1: +  NV_ADMA_NOTIFIER = 104,
1: +  NV_ADMA_NOTIFIER_ERROR = 108,
1: +  NV_ADMA_CTL_HOTPLUG_IEN = 1,
1: +  NV_ADMA_CTL_CHANNEL_RESET = 32,
1: +  NV_ADMA_CTL_GO = 128,
1: +  NV_ADMA_CTL_AIEN = 256,
1: +  NV_ADMA_CTL_READ_NON_COHERENT = 2048,
1: +  NV_ADMA_CTL_WRITE_NON_COHERENT = 4096,
1: +  NV_CPB_RESP_DONE = 1,
1: +  NV_CPB_RESP_ATA_ERR = 8,
1: +  NV_CPB_RESP_CMD_ERR = 16,
1: +  NV_CPB_RESP_CPB_ERR = 128,
1: +  NV_CPB_CTL_CPB_VALID = 1,
1: +  NV_CPB_CTL_QUEUE = 2,
1: +  NV_CPB_CTL_APRD_VALID = 4,
1: +  NV_CPB_CTL_IEN = 8,
1: +  NV_CPB_CTL_FPDMA = 16,
1: +  NV_APRD_WRITE = 2,
1: +  NV_APRD_END = 4,
1: +  NV_APRD_CONT = 8,
1: +  NV_ADMA_STAT_TIMEOUT = 1,
1: +  NV_ADMA_STAT_HOTUNPLUG = 2,
1: +  NV_ADMA_STAT_HOTPLUG = 4,
1: +  NV_ADMA_STAT_CPBERR = 16,
1: +  NV_ADMA_STAT_SERROR = 32,
1: +  NV_ADMA_STAT_CMD_COMPLETE = 64,
1: +  NV_ADMA_STAT_IDLE = 256,
1: +  NV_ADMA_STAT_LEGACY = 512,
1: +  NV_ADMA_STAT_STOPPED = 1024,
1: +  NV_ADMA_STAT_DONE = 4096,
1: +  NV_ADMA_STAT_ERR = 17,
1: +  NV_ADMA_PORT_REGISTER_MODE = 1,
1: +  NV_ADMA_ATAPI_SETUP_COMPLETE = 2,
1: +  NV_CTL_MCP55 = 1024,
1: +  NV_INT_STATUS_MCP55 = 1088,
1: +  NV_INT_ENABLE_MCP55 = 1092,
1: +  NV_NCQ_REG_MCP55 = 1096,
1: +  NV_INT_ALL_MCP55 = 65535,
1: +  NV_INT_PORT_SHIFT_MCP55 = 16,
1: +  NV_INT_MASK_MCP55 = 65533,
1: +  NV_CTL_PRI_SWNCQ = 2,
1: +  NV_CTL_SEC_SWNCQ = 4,
1: +  NV_SWNCQ_IRQ_DEV = 1,
1: +  NV_SWNCQ_IRQ_PM = 2,
1: +  NV_SWNCQ_IRQ_ADDED = 4,
1: +  NV_SWNCQ_IRQ_REMOVED = 8,
1: +  NV_SWNCQ_IRQ_BACKOUT = 16,
1: +  NV_SWNCQ_IRQ_SDBFIS = 32,
1: +  NV_SWNCQ_IRQ_DHREGFIS = 64,
1: +  NV_SWNCQ_IRQ_DMASETUP = 128,
1: +  NV_SWNCQ_IRQ_HOTPLUG = 12,
1:  };
1:  
1:  struct nv_adma_prd {
1: -	__le64 addr;
1: -	__le32 len;
1: -	u8 flags;
1: -	u8 packet_len;
1: -	__le16 reserved;
1: +  __le64 addr;
1: +  __le32 len;
1: +  u8 flags;
1: +  u8 packet_len;
1: +  __le16 reserved;
1:  };
1:  
1:  enum nv_adma_regbits {
1: -	CMDEND = 32768,
1: -	WNB = 16384,
1: -	IGN = 8192,
1: -	CS1n = 4096,
1: -	DA2 = 1024,
1: -	DA1 = 512,
1: -	DA0 = 256,
1: +  CMDEND = 32768,
1: +  WNB = 16384,
1: +  IGN = 8192,
1: +  CS1n = 4096,
1: +  DA2 = 1024,
1: +  DA1 = 512,
1: +  DA0 = 256,
1:  };
1:  
1:  struct nv_adma_cpb {
1: -	u8 resp_flags;
1: -	u8 reserved1;
1: -	u8 ctl_flags;
1: -	u8 len;
1: -	u8 tag;
1: -	u8 next_cpb_idx;
1: -	__le16 reserved2;
1: -	__le16 tf[12];
1: -	struct nv_adma_prd aprd[5];
1: -	__le64 next_aprd;
1: -	__le64 reserved3;
1: +  u8 resp_flags;
1: +  u8 reserved1;
1: +  u8 ctl_flags;
1: +  u8 len;
1: +  u8 tag;
1: +  u8 next_cpb_idx;
1: +  __le16 reserved2;
1: +  __le16 tf[12];
1: +  struct nv_adma_prd aprd[5];
1: +  __le64 next_aprd;
1: +  __le64 reserved3;
1:  };
1:  
1:  struct nv_adma_port_priv {
1: -	struct nv_adma_cpb *cpb;
1: -	dma_addr_t cpb_dma;
1: -	struct nv_adma_prd *aprd;
1: -	dma_addr_t aprd_dma;
1: -	void *ctl_block;
1: -	void *gen_block;
1: -	void *notifier_clear_block;
1: -	u64 adma_dma_mask;
1: -	u8 flags;
1: -	int last_issue_ncq;
1: +  struct nv_adma_cpb *cpb;
1: +  dma_addr_t cpb_dma;
1: +  struct nv_adma_prd *aprd;
1: +  dma_addr_t aprd_dma;
1: +  void *ctl_block;
1: +  void *gen_block;
1: +  void *notifier_clear_block;
1: +  u64 adma_dma_mask;
1: +  u8 flags;
1: +  int last_issue_ncq;
1:  };
1:  
1:  struct nv_host_priv {
1: -	long unsigned int type;
1: +  long unsigned int type;
1:  };
1:  
1:  struct defer_queue {
1: -	u32 defer_bits;
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	unsigned int tag[32];
1: +  u32 defer_bits;
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  unsigned int tag[32];
1:  };
1:  
1:  enum ncq_saw_flag_list {
1: -	ncq_saw_d2h = 1,
1: -	ncq_saw_dmas = 2,
1: -	ncq_saw_sdb = 4,
1: -	ncq_saw_backout = 8,
1: +  ncq_saw_d2h = 1,
1: +  ncq_saw_dmas = 2,
1: +  ncq_saw_sdb = 4,
1: +  ncq_saw_backout = 8,
1:  };
1:  
1:  struct nv_swncq_port_priv {
1: -	struct ata_bmdma_prd *prd;
1: -	dma_addr_t prd_dma;
1: -	void *sactive_block;
1: -	void *irq_block;
1: -	void *tag_block;
1: -	u32 qc_active;
1: -	unsigned int last_issue_tag;
1: -	struct defer_queue defer_queue;
1: -	u32 dhfis_bits;
1: -	u32 dmafis_bits;
1: -	u32 sdbfis_bits;
1: -	unsigned int ncq_flags;
1: +  struct ata_bmdma_prd *prd;
1: +  dma_addr_t prd_dma;
1: +  void *sactive_block;
1: +  void *irq_block;
1: +  void *tag_block;
1: +  u32 qc_active;
1: +  unsigned int last_issue_tag;
1: +  struct defer_queue defer_queue;
1: +  u32 dhfis_bits;
1: +  u32 dmafis_bits;
1: +  u32 sdbfis_bits;
1: +  unsigned int ncq_flags;
1:  };
1:  
1:  enum nv_host_type {
1: -	GENERIC = 0,
1: -	NFORCE2 = 1,
1: -	NFORCE3 = 1,
1: -	CK804 = 2,
1: -	ADMA = 3,
1: -	MCP5x = 4,
1: -	SWNCQ = 5,
1: +  GENERIC = 0,
1: +  NFORCE2 = 1,
1: +  NFORCE3 = 1,
1: +  CK804 = 2,
1: +  ADMA = 3,
1: +  MCP5x = 4,
1: +  SWNCQ = 5,
1:  };
1:  
1:  struct nv_pi_priv {
1: -	irq_handler_t irq_handler;
1: -	struct scsi_host_template *sht;
1: -};
1: -
1: -enum {
1: -	SIL_MMIO_BAR = 5,
1: -	SIL_FLAG_NO_SATA_IRQ = 268435456,
1: -	SIL_FLAG_RERR_ON_DMA_ACT = 536870912,
1: -	SIL_FLAG_MOD15WRITE = 1073741824,
1: -	SIL_DFL_PORT_FLAGS = 2,
1: -	sil_3112 = 0,
1: -	sil_3112_no_sata_irq = 1,
1: -	sil_3512 = 2,
1: -	sil_3114 = 3,
1: -	SIL_SYSCFG = 72,
1: -	SIL_MASK_IDE0_INT = 4194304,
1: -	SIL_MASK_IDE1_INT = 8388608,
1: -	SIL_MASK_IDE2_INT = 16777216,
1: -	SIL_MASK_IDE3_INT = 33554432,
1: -	SIL_MASK_2PORT = 12582912,
1: -	SIL_MASK_4PORT = 62914560,
1: -	SIL_INTR_STEERING = 2,
1: -	SIL_DMA_ENABLE = 1,
1: -	SIL_DMA_RDWR = 8,
1: -	SIL_DMA_SATA_IRQ = 16,
1: -	SIL_DMA_ACTIVE = 65536,
1: -	SIL_DMA_ERROR = 131072,
1: -	SIL_DMA_COMPLETE = 262144,
1: -	SIL_DMA_N_SATA_IRQ = 64,
1: -	SIL_DMA_N_ACTIVE = 16777216,
1: -	SIL_DMA_N_ERROR = 33554432,
1: -	SIL_DMA_N_COMPLETE = 67108864,
1: -	SIL_SIEN_N = 65536,
1: -	SIL_QUIRK_MOD15WRITE = 1,
1: -	SIL_QUIRK_UDMA5MAX = 2,
1: +  irq_handler_t irq_handler;
1: +  struct scsi_host_template *sht;
1: +};
1: +
1: +enum {
1: +  SIL_MMIO_BAR = 5,
1: +  SIL_FLAG_NO_SATA_IRQ = 268435456,
1: +  SIL_FLAG_RERR_ON_DMA_ACT = 536870912,
1: +  SIL_FLAG_MOD15WRITE = 1073741824,
1: +  SIL_DFL_PORT_FLAGS = 2,
1: +  sil_3112 = 0,
1: +  sil_3112_no_sata_irq = 1,
1: +  sil_3512 = 2,
1: +  sil_3114 = 3,
1: +  SIL_SYSCFG = 72,
1: +  SIL_MASK_IDE0_INT = 4194304,
1: +  SIL_MASK_IDE1_INT = 8388608,
1: +  SIL_MASK_IDE2_INT = 16777216,
1: +  SIL_MASK_IDE3_INT = 33554432,
1: +  SIL_MASK_2PORT = 12582912,
1: +  SIL_MASK_4PORT = 62914560,
1: +  SIL_INTR_STEERING = 2,
1: +  SIL_DMA_ENABLE = 1,
1: +  SIL_DMA_RDWR = 8,
1: +  SIL_DMA_SATA_IRQ = 16,
1: +  SIL_DMA_ACTIVE = 65536,
1: +  SIL_DMA_ERROR = 131072,
1: +  SIL_DMA_COMPLETE = 262144,
1: +  SIL_DMA_N_SATA_IRQ = 64,
1: +  SIL_DMA_N_ACTIVE = 16777216,
1: +  SIL_DMA_N_ERROR = 33554432,
1: +  SIL_DMA_N_COMPLETE = 67108864,
1: +  SIL_SIEN_N = 65536,
1: +  SIL_QUIRK_MOD15WRITE = 1,
1: +  SIL_QUIRK_UDMA5MAX = 2,
1:  };
1:  
1:  struct sil_drivelist {
1: -	const char *product;
1: -	unsigned int quirk;
1: +  const char *product;
1: +  unsigned int quirk;
1:  };
1:  
1:  struct ethtool_cmd {
1: -	__u32 cmd;
1: -	__u32 supported;
1: -	__u32 advertising;
1: -	__u16 speed;
1: -	__u8 duplex;
1: -	__u8 port;
1: -	__u8 phy_address;
1: -	__u8 transceiver;
1: -	__u8 autoneg;
1: -	__u8 mdio_support;
1: -	__u32 maxtxpkt;
1: -	__u32 maxrxpkt;
1: -	__u16 speed_hi;
1: -	__u8 eth_tp_mdix;
1: -	__u8 eth_tp_mdix_ctrl;
1: -	__u32 lp_advertising;
1: -	__u32 reserved[2];
1: +  __u32 cmd;
1: +  __u32 supported;
1: +  __u32 advertising;
1: +  __u16 speed;
1: +  __u8 duplex;
1: +  __u8 port;
1: +  __u8 phy_address;
1: +  __u8 transceiver;
1: +  __u8 autoneg;
1: +  __u8 mdio_support;
1: +  __u32 maxtxpkt;
1: +  __u32 maxrxpkt;
1: +  __u16 speed_hi;
1: +  __u8 eth_tp_mdix;
1: +  __u8 eth_tp_mdix_ctrl;
1: +  __u32 lp_advertising;
1: +  __u32 reserved[2];
1:  };
1:  
1:  struct mii_ioctl_data {
1: -	__u16 phy_id;
1: -	__u16 reg_num;
1: -	__u16 val_in;
1: -	__u16 val_out;
1: +  __u16 phy_id;
1: +  __u16 reg_num;
1: +  __u16 val_in;
1: +  __u16 val_out;
1:  };
1:  
1:  struct mdio_if_info {
1: -	int prtad;
1: -	u32 mmds;
1: -	unsigned int mode_support;
1: -	struct net_device *dev;
1: -	int (*mdio_read)(struct net_device *, int, int, u16);
1: -	int (*mdio_write)(struct net_device *, int, int, u16, u16);
1: +  int prtad;
1: +  u32 mmds;
1: +  unsigned int mode_support;
1: +  struct net_device *dev;
1: +  int (*mdio_read)(struct net_device *, int, int, u16);
1: +  int (*mdio_write)(struct net_device *, int, int, u16, u16);
1:  };
1:  
1:  struct devprobe2 {
1: -	struct net_device * (*probe)(int);
1: -	int status;
1: -};
1: -
1: -enum {
1: -	NETIF_F_SG_BIT = 0,
1: -	NETIF_F_IP_CSUM_BIT = 1,
1: -	__UNUSED_NETIF_F_1 = 2,
1: -	NETIF_F_HW_CSUM_BIT = 3,
1: -	NETIF_F_IPV6_CSUM_BIT = 4,
1: -	NETIF_F_HIGHDMA_BIT = 5,
1: -	NETIF_F_FRAGLIST_BIT = 6,
1: -	NETIF_F_HW_VLAN_CTAG_TX_BIT = 7,
1: -	NETIF_F_HW_VLAN_CTAG_RX_BIT = 8,
1: -	NETIF_F_HW_VLAN_CTAG_FILTER_BIT = 9,
1: -	NETIF_F_VLAN_CHALLENGED_BIT = 10,
1: -	NETIF_F_GSO_BIT = 11,
1: -	NETIF_F_LLTX_BIT = 12,
1: -	NETIF_F_NETNS_LOCAL_BIT = 13,
1: -	NETIF_F_GRO_BIT = 14,
1: -	NETIF_F_LRO_BIT = 15,
1: -	NETIF_F_GSO_SHIFT = 16,
1: -	NETIF_F_TSO_BIT = 16,
1: -	NETIF_F_GSO_ROBUST_BIT = 17,
1: -	NETIF_F_TSO_ECN_BIT = 18,
1: -	NETIF_F_TSO_MANGLEID_BIT = 19,
1: -	NETIF_F_TSO6_BIT = 20,
1: -	NETIF_F_FSO_BIT = 21,
1: -	NETIF_F_GSO_GRE_BIT = 22,
1: -	NETIF_F_GSO_GRE_CSUM_BIT = 23,
1: -	NETIF_F_GSO_IPXIP4_BIT = 24,
1: -	NETIF_F_GSO_IPXIP6_BIT = 25,
1: -	NETIF_F_GSO_UDP_TUNNEL_BIT = 26,
1: -	NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT = 27,
1: -	NETIF_F_GSO_PARTIAL_BIT = 28,
1: -	NETIF_F_GSO_TUNNEL_REMCSUM_BIT = 29,
1: -	NETIF_F_GSO_SCTP_BIT = 30,
1: -	NETIF_F_GSO_ESP_BIT = 31,
1: -	NETIF_F_GSO_UDP_BIT = 32,
1: -	NETIF_F_GSO_UDP_L4_BIT = 33,
1: -	NETIF_F_GSO_FRAGLIST_BIT = 34,
1: -	NETIF_F_GSO_LAST = 34,
1: -	NETIF_F_FCOE_CRC_BIT = 35,
1: -	NETIF_F_SCTP_CRC_BIT = 36,
1: -	NETIF_F_FCOE_MTU_BIT = 37,
1: -	NETIF_F_NTUPLE_BIT = 38,
1: -	NETIF_F_RXHASH_BIT = 39,
1: -	NETIF_F_RXCSUM_BIT = 40,
1: -	NETIF_F_NOCACHE_COPY_BIT = 41,
1: -	NETIF_F_LOOPBACK_BIT = 42,
1: -	NETIF_F_RXFCS_BIT = 43,
1: -	NETIF_F_RXALL_BIT = 44,
1: -	NETIF_F_HW_VLAN_STAG_TX_BIT = 45,
1: -	NETIF_F_HW_VLAN_STAG_RX_BIT = 46,
1: -	NETIF_F_HW_VLAN_STAG_FILTER_BIT = 47,
1: -	NETIF_F_HW_L2FW_DOFFLOAD_BIT = 48,
1: -	NETIF_F_HW_TC_BIT = 49,
1: -	NETIF_F_HW_ESP_BIT = 50,
1: -	NETIF_F_HW_ESP_TX_CSUM_BIT = 51,
1: -	NETIF_F_RX_UDP_TUNNEL_PORT_BIT = 52,
1: -	NETIF_F_HW_TLS_TX_BIT = 53,
1: -	NETIF_F_HW_TLS_RX_BIT = 54,
1: -	NETIF_F_GRO_HW_BIT = 55,
1: -	NETIF_F_HW_TLS_RECORD_BIT = 56,
1: -	NETIF_F_GRO_FRAGLIST_BIT = 57,
1: -	NETIF_F_HW_MACSEC_BIT = 58,
1: -	NETDEV_FEATURE_COUNT = 59,
1: -};
1: -
1: -enum {
1: -	SKBTX_HW_TSTAMP = 1,
1: -	SKBTX_SW_TSTAMP = 2,
1: -	SKBTX_IN_PROGRESS = 4,
1: -	SKBTX_DEV_ZEROCOPY = 8,
1: -	SKBTX_WIFI_STATUS = 16,
1: -	SKBTX_SHARED_FRAG = 32,
1: -	SKBTX_SCHED_TSTAMP = 64,
1: +  struct net_device *(*probe)(int);
1: +  int status;
1: +};
1: +
1: +enum {
1: +  NETIF_F_SG_BIT = 0,
1: +  NETIF_F_IP_CSUM_BIT = 1,
1: +  __UNUSED_NETIF_F_1 = 2,
1: +  NETIF_F_HW_CSUM_BIT = 3,
1: +  NETIF_F_IPV6_CSUM_BIT = 4,
1: +  NETIF_F_HIGHDMA_BIT = 5,
1: +  NETIF_F_FRAGLIST_BIT = 6,
1: +  NETIF_F_HW_VLAN_CTAG_TX_BIT = 7,
1: +  NETIF_F_HW_VLAN_CTAG_RX_BIT = 8,
1: +  NETIF_F_HW_VLAN_CTAG_FILTER_BIT = 9,
1: +  NETIF_F_VLAN_CHALLENGED_BIT = 10,
1: +  NETIF_F_GSO_BIT = 11,
1: +  NETIF_F_LLTX_BIT = 12,
1: +  NETIF_F_NETNS_LOCAL_BIT = 13,
1: +  NETIF_F_GRO_BIT = 14,
1: +  NETIF_F_LRO_BIT = 15,
1: +  NETIF_F_GSO_SHIFT = 16,
1: +  NETIF_F_TSO_BIT = 16,
1: +  NETIF_F_GSO_ROBUST_BIT = 17,
1: +  NETIF_F_TSO_ECN_BIT = 18,
1: +  NETIF_F_TSO_MANGLEID_BIT = 19,
1: +  NETIF_F_TSO6_BIT = 20,
1: +  NETIF_F_FSO_BIT = 21,
1: +  NETIF_F_GSO_GRE_BIT = 22,
1: +  NETIF_F_GSO_GRE_CSUM_BIT = 23,
1: +  NETIF_F_GSO_IPXIP4_BIT = 24,
1: +  NETIF_F_GSO_IPXIP6_BIT = 25,
1: +  NETIF_F_GSO_UDP_TUNNEL_BIT = 26,
1: +  NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT = 27,
1: +  NETIF_F_GSO_PARTIAL_BIT = 28,
1: +  NETIF_F_GSO_TUNNEL_REMCSUM_BIT = 29,
1: +  NETIF_F_GSO_SCTP_BIT = 30,
1: +  NETIF_F_GSO_ESP_BIT = 31,
1: +  NETIF_F_GSO_UDP_BIT = 32,
1: +  NETIF_F_GSO_UDP_L4_BIT = 33,
1: +  NETIF_F_GSO_FRAGLIST_BIT = 34,
1: +  NETIF_F_GSO_LAST = 34,
1: +  NETIF_F_FCOE_CRC_BIT = 35,
1: +  NETIF_F_SCTP_CRC_BIT = 36,
1: +  NETIF_F_FCOE_MTU_BIT = 37,
1: +  NETIF_F_NTUPLE_BIT = 38,
1: +  NETIF_F_RXHASH_BIT = 39,
1: +  NETIF_F_RXCSUM_BIT = 40,
1: +  NETIF_F_NOCACHE_COPY_BIT = 41,
1: +  NETIF_F_LOOPBACK_BIT = 42,
1: +  NETIF_F_RXFCS_BIT = 43,
1: +  NETIF_F_RXALL_BIT = 44,
1: +  NETIF_F_HW_VLAN_STAG_TX_BIT = 45,
1: +  NETIF_F_HW_VLAN_STAG_RX_BIT = 46,
1: +  NETIF_F_HW_VLAN_STAG_FILTER_BIT = 47,
1: +  NETIF_F_HW_L2FW_DOFFLOAD_BIT = 48,
1: +  NETIF_F_HW_TC_BIT = 49,
1: +  NETIF_F_HW_ESP_BIT = 50,
1: +  NETIF_F_HW_ESP_TX_CSUM_BIT = 51,
1: +  NETIF_F_RX_UDP_TUNNEL_PORT_BIT = 52,
1: +  NETIF_F_HW_TLS_TX_BIT = 53,
1: +  NETIF_F_HW_TLS_RX_BIT = 54,
1: +  NETIF_F_GRO_HW_BIT = 55,
1: +  NETIF_F_HW_TLS_RECORD_BIT = 56,
1: +  NETIF_F_GRO_FRAGLIST_BIT = 57,
1: +  NETIF_F_HW_MACSEC_BIT = 58,
1: +  NETDEV_FEATURE_COUNT = 59,
1: +};
1: +
1: +enum {
1: +  SKBTX_HW_TSTAMP = 1,
1: +  SKBTX_SW_TSTAMP = 2,
1: +  SKBTX_IN_PROGRESS = 4,
1: +  SKBTX_DEV_ZEROCOPY = 8,
1: +  SKBTX_WIFI_STATUS = 16,
1: +  SKBTX_SHARED_FRAG = 32,
1: +  SKBTX_SCHED_TSTAMP = 64,
1:  };
1:  
1:  enum netdev_priv_flags {
1: -	IFF_802_1Q_VLAN = 1,
1: -	IFF_EBRIDGE = 2,
1: -	IFF_BONDING = 4,
1: -	IFF_ISATAP = 8,
1: -	IFF_WAN_HDLC = 16,
1: -	IFF_XMIT_DST_RELEASE = 32,
1: -	IFF_DONT_BRIDGE = 64,
1: -	IFF_DISABLE_NETPOLL = 128,
1: -	IFF_MACVLAN_PORT = 256,
1: -	IFF_BRIDGE_PORT = 512,
1: -	IFF_OVS_DATAPATH = 1024,
1: -	IFF_TX_SKB_SHARING = 2048,
1: -	IFF_UNICAST_FLT = 4096,
1: -	IFF_TEAM_PORT = 8192,
1: -	IFF_SUPP_NOFCS = 16384,
1: -	IFF_LIVE_ADDR_CHANGE = 32768,
1: -	IFF_MACVLAN = 65536,
1: -	IFF_XMIT_DST_RELEASE_PERM = 131072,
1: -	IFF_L3MDEV_MASTER = 262144,
1: -	IFF_NO_QUEUE = 524288,
1: -	IFF_OPENVSWITCH = 1048576,
1: -	IFF_L3MDEV_SLAVE = 2097152,
1: -	IFF_TEAM = 4194304,
1: -	IFF_RXFH_CONFIGURED = 8388608,
1: -	IFF_PHONY_HEADROOM = 16777216,
1: -	IFF_MACSEC = 33554432,
1: -	IFF_NO_RX_HANDLER = 67108864,
1: -	IFF_FAILOVER = 134217728,
1: -	IFF_FAILOVER_SLAVE = 268435456,
1: -	IFF_L3MDEV_RX_HANDLER = 536870912,
1: -	IFF_LIVE_RENAME_OK = 1073741824,
1: +  IFF_802_1Q_VLAN = 1,
1: +  IFF_EBRIDGE = 2,
1: +  IFF_BONDING = 4,
1: +  IFF_ISATAP = 8,
1: +  IFF_WAN_HDLC = 16,
1: +  IFF_XMIT_DST_RELEASE = 32,
1: +  IFF_DONT_BRIDGE = 64,
1: +  IFF_DISABLE_NETPOLL = 128,
1: +  IFF_MACVLAN_PORT = 256,
1: +  IFF_BRIDGE_PORT = 512,
1: +  IFF_OVS_DATAPATH = 1024,
1: +  IFF_TX_SKB_SHARING = 2048,
1: +  IFF_UNICAST_FLT = 4096,
1: +  IFF_TEAM_PORT = 8192,
1: +  IFF_SUPP_NOFCS = 16384,
1: +  IFF_LIVE_ADDR_CHANGE = 32768,
1: +  IFF_MACVLAN = 65536,
1: +  IFF_XMIT_DST_RELEASE_PERM = 131072,
1: +  IFF_L3MDEV_MASTER = 262144,
1: +  IFF_NO_QUEUE = 524288,
1: +  IFF_OPENVSWITCH = 1048576,
1: +  IFF_L3MDEV_SLAVE = 2097152,
1: +  IFF_TEAM = 4194304,
1: +  IFF_RXFH_CONFIGURED = 8388608,
1: +  IFF_PHONY_HEADROOM = 16777216,
1: +  IFF_MACSEC = 33554432,
1: +  IFF_NO_RX_HANDLER = 67108864,
1: +  IFF_FAILOVER = 134217728,
1: +  IFF_FAILOVER_SLAVE = 268435456,
1: +  IFF_L3MDEV_RX_HANDLER = 536870912,
1: +  IFF_LIVE_RENAME_OK = 1073741824,
1:  };
1:  
1:  struct mdio_board_info {
1: -	const char *bus_id;
1: -	char modalias[32];
1: -	int mdio_addr;
1: -	const void *platform_data;
1: +  const char *bus_id;
1: +  char modalias[32];
1: +  int mdio_addr;
1: +  const void *platform_data;
1:  };
1:  
1:  struct mdio_board_entry {
1: -	struct list_head list;
1: -	struct mdio_board_info board_info;
1: +  struct list_head list;
1: +  struct mdio_board_info board_info;
1:  };
1:  
1:  struct mdiobus_devres {
1: -	struct mii_bus *mii;
1: +  struct mii_bus *mii;
1:  };
1:  
1:  enum netdev_state_t {
1: -	__LINK_STATE_START = 0,
1: -	__LINK_STATE_PRESENT = 1,
1: -	__LINK_STATE_NOCARRIER = 2,
1: -	__LINK_STATE_LINKWATCH_PENDING = 3,
1: -	__LINK_STATE_DORMANT = 4,
1: -	__LINK_STATE_TESTING = 5,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_MSG_KERNEL_NONE = 0,
1: -	ETHTOOL_MSG_STRSET_GET_REPLY = 1,
1: -	ETHTOOL_MSG_LINKINFO_GET_REPLY = 2,
1: -	ETHTOOL_MSG_LINKINFO_NTF = 3,
1: -	ETHTOOL_MSG_LINKMODES_GET_REPLY = 4,
1: -	ETHTOOL_MSG_LINKMODES_NTF = 5,
1: -	ETHTOOL_MSG_LINKSTATE_GET_REPLY = 6,
1: -	ETHTOOL_MSG_DEBUG_GET_REPLY = 7,
1: -	ETHTOOL_MSG_DEBUG_NTF = 8,
1: -	ETHTOOL_MSG_WOL_GET_REPLY = 9,
1: -	ETHTOOL_MSG_WOL_NTF = 10,
1: -	ETHTOOL_MSG_FEATURES_GET_REPLY = 11,
1: -	ETHTOOL_MSG_FEATURES_SET_REPLY = 12,
1: -	ETHTOOL_MSG_FEATURES_NTF = 13,
1: -	ETHTOOL_MSG_PRIVFLAGS_GET_REPLY = 14,
1: -	ETHTOOL_MSG_PRIVFLAGS_NTF = 15,
1: -	ETHTOOL_MSG_RINGS_GET_REPLY = 16,
1: -	ETHTOOL_MSG_RINGS_NTF = 17,
1: -	ETHTOOL_MSG_CHANNELS_GET_REPLY = 18,
1: -	ETHTOOL_MSG_CHANNELS_NTF = 19,
1: -	ETHTOOL_MSG_COALESCE_GET_REPLY = 20,
1: -	ETHTOOL_MSG_COALESCE_NTF = 21,
1: -	ETHTOOL_MSG_PAUSE_GET_REPLY = 22,
1: -	ETHTOOL_MSG_PAUSE_NTF = 23,
1: -	ETHTOOL_MSG_EEE_GET_REPLY = 24,
1: -	ETHTOOL_MSG_EEE_NTF = 25,
1: -	ETHTOOL_MSG_TSINFO_GET_REPLY = 26,
1: -	ETHTOOL_MSG_CABLE_TEST_NTF = 27,
1: -	ETHTOOL_MSG_CABLE_TEST_TDR_NTF = 28,
1: -	ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY = 29,
1: -	__ETHTOOL_MSG_KERNEL_CNT = 30,
1: -	ETHTOOL_MSG_KERNEL_MAX = 29,
1: +  __LINK_STATE_START = 0,
1: +  __LINK_STATE_PRESENT = 1,
1: +  __LINK_STATE_NOCARRIER = 2,
1: +  __LINK_STATE_LINKWATCH_PENDING = 3,
1: +  __LINK_STATE_DORMANT = 4,
1: +  __LINK_STATE_TESTING = 5,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_MSG_KERNEL_NONE = 0,
1: +  ETHTOOL_MSG_STRSET_GET_REPLY = 1,
1: +  ETHTOOL_MSG_LINKINFO_GET_REPLY = 2,
1: +  ETHTOOL_MSG_LINKINFO_NTF = 3,
1: +  ETHTOOL_MSG_LINKMODES_GET_REPLY = 4,
1: +  ETHTOOL_MSG_LINKMODES_NTF = 5,
1: +  ETHTOOL_MSG_LINKSTATE_GET_REPLY = 6,
1: +  ETHTOOL_MSG_DEBUG_GET_REPLY = 7,
1: +  ETHTOOL_MSG_DEBUG_NTF = 8,
1: +  ETHTOOL_MSG_WOL_GET_REPLY = 9,
1: +  ETHTOOL_MSG_WOL_NTF = 10,
1: +  ETHTOOL_MSG_FEATURES_GET_REPLY = 11,
1: +  ETHTOOL_MSG_FEATURES_SET_REPLY = 12,
1: +  ETHTOOL_MSG_FEATURES_NTF = 13,
1: +  ETHTOOL_MSG_PRIVFLAGS_GET_REPLY = 14,
1: +  ETHTOOL_MSG_PRIVFLAGS_NTF = 15,
1: +  ETHTOOL_MSG_RINGS_GET_REPLY = 16,
1: +  ETHTOOL_MSG_RINGS_NTF = 17,
1: +  ETHTOOL_MSG_CHANNELS_GET_REPLY = 18,
1: +  ETHTOOL_MSG_CHANNELS_NTF = 19,
1: +  ETHTOOL_MSG_COALESCE_GET_REPLY = 20,
1: +  ETHTOOL_MSG_COALESCE_NTF = 21,
1: +  ETHTOOL_MSG_PAUSE_GET_REPLY = 22,
1: +  ETHTOOL_MSG_PAUSE_NTF = 23,
1: +  ETHTOOL_MSG_EEE_GET_REPLY = 24,
1: +  ETHTOOL_MSG_EEE_NTF = 25,
1: +  ETHTOOL_MSG_TSINFO_GET_REPLY = 26,
1: +  ETHTOOL_MSG_CABLE_TEST_NTF = 27,
1: +  ETHTOOL_MSG_CABLE_TEST_TDR_NTF = 28,
1: +  ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY = 29,
1: +  __ETHTOOL_MSG_KERNEL_CNT = 30,
1: +  ETHTOOL_MSG_KERNEL_MAX = 29,
1:  };
1:  
1:  struct phy_setting {
1: -	u32 speed;
1: -	u8 duplex;
1: -	u8 bit;
1: +  u32 speed;
1: +  u8 duplex;
1: +  u8 bit;
1:  };
1:  
1:  struct ethtool_phy_ops {
1: -	int (*get_sset_count)(struct phy_device *);
1: -	int (*get_strings)(struct phy_device *, u8 *);
1: -	int (*get_stats)(struct phy_device *, struct ethtool_stats *, u64 *);
1: -	int (*start_cable_test)(struct phy_device *, struct netlink_ext_ack *);
1: -	int (*start_cable_test_tdr)(struct phy_device *, struct netlink_ext_ack *, const struct phy_tdr_config *);
1: +  int (*get_sset_count)(struct phy_device *);
1: +  int (*get_strings)(struct phy_device *, u8 *);
1: +  int (*get_stats)(struct phy_device *, struct ethtool_stats *, u64 *);
1: +  int (*start_cable_test)(struct phy_device *, struct netlink_ext_ack *);
1: +  int (*start_cable_test_tdr)(struct phy_device *, struct netlink_ext_ack *,
1: +                              const struct phy_tdr_config *);
1:  };
1:  
1:  struct phy_fixup {
1: -	struct list_head list;
1: -	char bus_id[64];
1: -	u32 phy_uid;
1: -	u32 phy_uid_mask;
1: -	int (*run)(struct phy_device *);
1: +  struct list_head list;
1: +  char bus_id[64];
1: +  u32 phy_uid;
1: +  u32 phy_uid_mask;
1: +  int (*run)(struct phy_device *);
1:  };
1:  
1:  struct sfp_eeprom_base {
1: -	u8 phys_id;
1: -	u8 phys_ext_id;
1: -	u8 connector;
1: -	u8 if_1x_copper_passive: 1;
1: -	u8 if_1x_copper_active: 1;
1: -	u8 if_1x_lx: 1;
1: -	u8 if_1x_sx: 1;
1: -	u8 e10g_base_sr: 1;
1: -	u8 e10g_base_lr: 1;
1: -	u8 e10g_base_lrm: 1;
1: -	u8 e10g_base_er: 1;
1: -	u8 sonet_oc3_short_reach: 1;
1: -	u8 sonet_oc3_smf_intermediate_reach: 1;
1: -	u8 sonet_oc3_smf_long_reach: 1;
1: -	u8 unallocated_5_3: 1;
1: -	u8 sonet_oc12_short_reach: 1;
1: -	u8 sonet_oc12_smf_intermediate_reach: 1;
1: -	u8 sonet_oc12_smf_long_reach: 1;
1: -	u8 unallocated_5_7: 1;
1: -	u8 sonet_oc48_short_reach: 1;
1: -	u8 sonet_oc48_intermediate_reach: 1;
1: -	u8 sonet_oc48_long_reach: 1;
1: -	u8 sonet_reach_bit2: 1;
1: -	u8 sonet_reach_bit1: 1;
1: -	u8 sonet_oc192_short_reach: 1;
1: -	u8 escon_smf_1310_laser: 1;
1: -	u8 escon_mmf_1310_led: 1;
1: -	u8 e1000_base_sx: 1;
1: -	u8 e1000_base_lx: 1;
1: -	u8 e1000_base_cx: 1;
1: -	u8 e1000_base_t: 1;
1: -	u8 e100_base_lx: 1;
1: -	u8 e100_base_fx: 1;
1: -	u8 e_base_bx10: 1;
1: -	u8 e_base_px: 1;
1: -	u8 fc_tech_electrical_inter_enclosure: 1;
1: -	u8 fc_tech_lc: 1;
1: -	u8 fc_tech_sa: 1;
1: -	u8 fc_ll_m: 1;
1: -	u8 fc_ll_l: 1;
1: -	u8 fc_ll_i: 1;
1: -	u8 fc_ll_s: 1;
1: -	u8 fc_ll_v: 1;
1: -	u8 unallocated_8_0: 1;
1: -	u8 unallocated_8_1: 1;
1: -	u8 sfp_ct_passive: 1;
1: -	u8 sfp_ct_active: 1;
1: -	u8 fc_tech_ll: 1;
1: -	u8 fc_tech_sl: 1;
1: -	u8 fc_tech_sn: 1;
1: -	u8 fc_tech_electrical_intra_enclosure: 1;
1: -	u8 fc_media_sm: 1;
1: -	u8 unallocated_9_1: 1;
1: -	u8 fc_media_m5: 1;
1: -	u8 fc_media_m6: 1;
1: -	u8 fc_media_tv: 1;
1: -	u8 fc_media_mi: 1;
1: -	u8 fc_media_tp: 1;
1: -	u8 fc_media_tw: 1;
1: -	u8 fc_speed_100: 1;
1: -	u8 unallocated_10_1: 1;
1: -	u8 fc_speed_200: 1;
1: -	u8 fc_speed_3200: 1;
1: -	u8 fc_speed_400: 1;
1: -	u8 fc_speed_1600: 1;
1: -	u8 fc_speed_800: 1;
1: -	u8 fc_speed_1200: 1;
1: -	u8 encoding;
1: -	u8 br_nominal;
1: -	u8 rate_id;
1: -	u8 link_len[6];
1: -	char vendor_name[16];
1: -	u8 extended_cc;
1: -	char vendor_oui[3];
1: -	char vendor_pn[16];
1: -	char vendor_rev[4];
1: -	union {
1: -		__be16 optical_wavelength;
1: -		__be16 cable_compliance;
1: -		struct {
1: -			u8 sff8431_app_e: 1;
1: -			u8 fc_pi_4_app_h: 1;
1: -			u8 reserved60_2: 6;
1: -			u8 reserved61: 8;
1: -		} passive;
1: -		struct {
1: -			u8 sff8431_app_e: 1;
1: -			u8 fc_pi_4_app_h: 1;
1: -			u8 sff8431_lim: 1;
1: -			u8 fc_pi_4_lim: 1;
1: -			u8 reserved60_4: 4;
1: -			u8 reserved61: 8;
1: -		} active;
1: -	};
1: -	u8 reserved62;
1: -	u8 cc_base;
1: +  u8 phys_id;
1: +  u8 phys_ext_id;
1: +  u8 connector;
1: +  u8 if_1x_copper_passive : 1;
1: +  u8 if_1x_copper_active : 1;
1: +  u8 if_1x_lx : 1;
1: +  u8 if_1x_sx : 1;
1: +  u8 e10g_base_sr : 1;
1: +  u8 e10g_base_lr : 1;
1: +  u8 e10g_base_lrm : 1;
1: +  u8 e10g_base_er : 1;
1: +  u8 sonet_oc3_short_reach : 1;
1: +  u8 sonet_oc3_smf_intermediate_reach : 1;
1: +  u8 sonet_oc3_smf_long_reach : 1;
1: +  u8 unallocated_5_3 : 1;
1: +  u8 sonet_oc12_short_reach : 1;
1: +  u8 sonet_oc12_smf_intermediate_reach : 1;
1: +  u8 sonet_oc12_smf_long_reach : 1;
1: +  u8 unallocated_5_7 : 1;
1: +  u8 sonet_oc48_short_reach : 1;
1: +  u8 sonet_oc48_intermediate_reach : 1;
1: +  u8 sonet_oc48_long_reach : 1;
1: +  u8 sonet_reach_bit2 : 1;
1: +  u8 sonet_reach_bit1 : 1;
1: +  u8 sonet_oc192_short_reach : 1;
1: +  u8 escon_smf_1310_laser : 1;
1: +  u8 escon_mmf_1310_led : 1;
1: +  u8 e1000_base_sx : 1;
1: +  u8 e1000_base_lx : 1;
1: +  u8 e1000_base_cx : 1;
1: +  u8 e1000_base_t : 1;
1: +  u8 e100_base_lx : 1;
1: +  u8 e100_base_fx : 1;
1: +  u8 e_base_bx10 : 1;
1: +  u8 e_base_px : 1;
1: +  u8 fc_tech_electrical_inter_enclosure : 1;
1: +  u8 fc_tech_lc : 1;
1: +  u8 fc_tech_sa : 1;
1: +  u8 fc_ll_m : 1;
1: +  u8 fc_ll_l : 1;
1: +  u8 fc_ll_i : 1;
1: +  u8 fc_ll_s : 1;
1: +  u8 fc_ll_v : 1;
1: +  u8 unallocated_8_0 : 1;
1: +  u8 unallocated_8_1 : 1;
1: +  u8 sfp_ct_passive : 1;
1: +  u8 sfp_ct_active : 1;
1: +  u8 fc_tech_ll : 1;
1: +  u8 fc_tech_sl : 1;
1: +  u8 fc_tech_sn : 1;
1: +  u8 fc_tech_electrical_intra_enclosure : 1;
1: +  u8 fc_media_sm : 1;
1: +  u8 unallocated_9_1 : 1;
1: +  u8 fc_media_m5 : 1;
1: +  u8 fc_media_m6 : 1;
1: +  u8 fc_media_tv : 1;
1: +  u8 fc_media_mi : 1;
1: +  u8 fc_media_tp : 1;
1: +  u8 fc_media_tw : 1;
1: +  u8 fc_speed_100 : 1;
1: +  u8 unallocated_10_1 : 1;
1: +  u8 fc_speed_200 : 1;
1: +  u8 fc_speed_3200 : 1;
1: +  u8 fc_speed_400 : 1;
1: +  u8 fc_speed_1600 : 1;
1: +  u8 fc_speed_800 : 1;
1: +  u8 fc_speed_1200 : 1;
1: +  u8 encoding;
1: +  u8 br_nominal;
1: +  u8 rate_id;
1: +  u8 link_len[6];
1: +  char vendor_name[16];
1: +  u8 extended_cc;
1: +  char vendor_oui[3];
1: +  char vendor_pn[16];
1: +  char vendor_rev[4];
1: +  union {
1: +    __be16 optical_wavelength;
1: +    __be16 cable_compliance;
1: +    struct {
1: +      u8 sff8431_app_e : 1;
1: +      u8 fc_pi_4_app_h : 1;
1: +      u8 reserved60_2 : 6;
1: +      u8 reserved61 : 8;
1: +    } passive;
1: +    struct {
1: +      u8 sff8431_app_e : 1;
1: +      u8 fc_pi_4_app_h : 1;
1: +      u8 sff8431_lim : 1;
1: +      u8 fc_pi_4_lim : 1;
1: +      u8 reserved60_4 : 4;
1: +      u8 reserved61 : 8;
1: +    } active;
1: +  };
1: +  u8 reserved62;
1: +  u8 cc_base;
1:  };
1:  
1:  struct sfp_eeprom_ext {
1: -	__be16 options;
1: -	u8 br_max;
1: -	u8 br_min;
1: -	char vendor_sn[16];
1: -	char datecode[8];
1: -	u8 diagmon;
1: -	u8 enhopts;
1: -	u8 sff8472_compliance;
1: -	u8 cc_ext;
1: +  __be16 options;
1: +  u8 br_max;
1: +  u8 br_min;
1: +  char vendor_sn[16];
1: +  char datecode[8];
1: +  u8 diagmon;
1: +  u8 enhopts;
1: +  u8 sff8472_compliance;
1: +  u8 cc_ext;
1:  };
1:  
1:  struct sfp_eeprom_id {
1: -	struct sfp_eeprom_base base;
1: -	struct sfp_eeprom_ext ext;
1: +  struct sfp_eeprom_base base;
1: +  struct sfp_eeprom_ext ext;
1:  };
1:  
1:  struct sfp_upstream_ops {
1: -	void (*attach)(void *, struct sfp_bus *);
1: -	void (*detach)(void *, struct sfp_bus *);
1: -	int (*module_insert)(void *, const struct sfp_eeprom_id *);
1: -	void (*module_remove)(void *);
1: -	int (*module_start)(void *);
1: -	void (*module_stop)(void *);
1: -	void (*link_down)(void *);
1: -	void (*link_up)(void *);
1: -	int (*connect_phy)(void *, struct phy_device *);
1: -	void (*disconnect_phy)(void *);
1: +  void (*attach)(void *, struct sfp_bus *);
1: +  void (*detach)(void *, struct sfp_bus *);
1: +  int (*module_insert)(void *, const struct sfp_eeprom_id *);
1: +  void (*module_remove)(void *);
1: +  int (*module_start)(void *);
1: +  void (*module_stop)(void *);
1: +  void (*link_down)(void *);
1: +  void (*link_up)(void *);
1: +  int (*connect_phy)(void *, struct phy_device *);
1: +  void (*disconnect_phy)(void *);
1:  };
1:  
1:  struct trace_event_raw_mdio_access {
1: -	struct trace_entry ent;
1: -	char busid[61];
1: -	char read;
1: -	u8 addr;
1: -	u16 val;
1: -	unsigned int regnum;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char busid[61];
1: +  char read;
1: +  u8 addr;
1: +  u16 val;
1: +  unsigned int regnum;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mdio_access {};
1:  
1: -typedef void (*btf_trace_mdio_access)(void *, struct mii_bus *, char, u8, unsigned int, u16, int);
1: +typedef void (*btf_trace_mdio_access)(void *, struct mii_bus *, char, u8,
1: +                                      unsigned int, u16, int);
1:  
1:  struct mdio_bus_stat_attr {
1: -	int addr;
1: -	unsigned int field_offset;
1: +  int addr;
1: +  unsigned int field_offset;
1:  };
1:  
1:  struct mdio_driver {
1: -	struct mdio_driver_common mdiodrv;
1: -	int (*probe)(struct mdio_device *);
1: -	void (*remove)(struct mdio_device *);
1: +  struct mdio_driver_common mdiodrv;
1: +  int (*probe)(struct mdio_device *);
1: +  void (*remove)(struct mdio_device *);
1:  };
1:  
1:  struct flow_dissector_key_control {
1: -	u16 thoff;
1: -	u16 addr_type;
1: -	u32 flags;
1: +  u16 thoff;
1: +  u16 addr_type;
1: +  u32 flags;
1:  };
1:  
1:  struct flow_dissector_key_basic {
1: -	__be16 n_proto;
1: -	u8 ip_proto;
1: -	u8 padding;
1: +  __be16 n_proto;
1: +  u8 ip_proto;
1: +  u8 padding;
1:  };
1:  
1:  struct flow_dissector {
1: -	unsigned int used_keys;
1: -	short unsigned int offset[28];
1: +  unsigned int used_keys;
1: +  short unsigned int offset[28];
1:  };
1:  
1:  struct flow_keys_basic {
1: -	struct flow_dissector_key_control control;
1: -	struct flow_dissector_key_basic basic;
1: +  struct flow_dissector_key_control control;
1: +  struct flow_dissector_key_basic basic;
1:  };
1:  
1:  struct mmpin {
1: -	struct user_struct *user;
1: -	unsigned int num_pg;
1: +  struct user_struct *user;
1: +  unsigned int num_pg;
1:  };
1:  
1:  struct ubuf_info {
1: -	void (*callback)(struct ubuf_info *, bool);
1: -	union {
1: -		struct {
1: -			long unsigned int desc;
1: -			void *ctx;
1: -		};
1: -		struct {
1: -			u32 id;
1: -			u16 len;
1: -			u16 zerocopy: 1;
1: -			u32 bytelen;
1: -		};
1: -	};
1: -	refcount_t refcnt;
1: -	struct mmpin mmp;
1: -};
1: -
1: -enum {
1: -	SKB_GSO_TCPV4 = 1,
1: -	SKB_GSO_DODGY = 2,
1: -	SKB_GSO_TCP_ECN = 4,
1: -	SKB_GSO_TCP_FIXEDID = 8,
1: -	SKB_GSO_TCPV6 = 16,
1: -	SKB_GSO_FCOE = 32,
1: -	SKB_GSO_GRE = 64,
1: -	SKB_GSO_GRE_CSUM = 128,
1: -	SKB_GSO_IPXIP4 = 256,
1: -	SKB_GSO_IPXIP6 = 512,
1: -	SKB_GSO_UDP_TUNNEL = 1024,
1: -	SKB_GSO_UDP_TUNNEL_CSUM = 2048,
1: -	SKB_GSO_PARTIAL = 4096,
1: -	SKB_GSO_TUNNEL_REMCSUM = 8192,
1: -	SKB_GSO_SCTP = 16384,
1: -	SKB_GSO_ESP = 32768,
1: -	SKB_GSO_UDP = 65536,
1: -	SKB_GSO_UDP_L4 = 131072,
1: -	SKB_GSO_FRAGLIST = 262144,
1: +  void (*callback)(struct ubuf_info *, bool);
1: +  union {
1: +    struct {
1: +      long unsigned int desc;
1: +      void *ctx;
1: +    };
1: +    struct {
1: +      u32 id;
1: +      u16 len;
1: +      u16 zerocopy : 1;
1: +      u32 bytelen;
1: +    };
1: +  };
1: +  refcount_t refcnt;
1: +  struct mmpin mmp;
1: +};
1: +
1: +enum {
1: +  SKB_GSO_TCPV4 = 1,
1: +  SKB_GSO_DODGY = 2,
1: +  SKB_GSO_TCP_ECN = 4,
1: +  SKB_GSO_TCP_FIXEDID = 8,
1: +  SKB_GSO_TCPV6 = 16,
1: +  SKB_GSO_FCOE = 32,
1: +  SKB_GSO_GRE = 64,
1: +  SKB_GSO_GRE_CSUM = 128,
1: +  SKB_GSO_IPXIP4 = 256,
1: +  SKB_GSO_IPXIP6 = 512,
1: +  SKB_GSO_UDP_TUNNEL = 1024,
1: +  SKB_GSO_UDP_TUNNEL_CSUM = 2048,
1: +  SKB_GSO_PARTIAL = 4096,
1: +  SKB_GSO_TUNNEL_REMCSUM = 8192,
1: +  SKB_GSO_SCTP = 16384,
1: +  SKB_GSO_ESP = 32768,
1: +  SKB_GSO_UDP = 65536,
1: +  SKB_GSO_UDP_L4 = 131072,
1: +  SKB_GSO_FRAGLIST = 262144,
1:  };
1:  
1:  struct rt6key {
1: -	struct in6_addr addr;
1: -	int plen;
1: +  struct in6_addr addr;
1: +  int plen;
1:  };
1:  
1:  struct rtable;
1: @@ -92160,31 +93264,31 @@ struct rtable;
1:  struct fnhe_hash_bucket;
1:  
1:  struct fib_nh_common {
1: -	struct net_device *nhc_dev;
1: -	int nhc_oif;
1: -	unsigned char nhc_scope;
1: -	u8 nhc_family;
1: -	u8 nhc_gw_family;
1: -	unsigned char nhc_flags;
1: -	struct lwtunnel_state *nhc_lwtstate;
1: -	union {
1: -		__be32 ipv4;
1: -		struct in6_addr ipv6;
1: -	} nhc_gw;
1: -	int nhc_weight;
1: -	atomic_t nhc_upper_bound;
1: -	struct rtable **nhc_pcpu_rth_output;
1: -	struct rtable *nhc_rth_input;
1: -	struct fnhe_hash_bucket *nhc_exceptions;
1: +  struct net_device *nhc_dev;
1: +  int nhc_oif;
1: +  unsigned char nhc_scope;
1: +  u8 nhc_family;
1: +  u8 nhc_gw_family;
1: +  unsigned char nhc_flags;
1: +  struct lwtunnel_state *nhc_lwtstate;
1: +  union {
1: +    __be32 ipv4;
1: +    struct in6_addr ipv6;
1: +  } nhc_gw;
1: +  int nhc_weight;
1: +  atomic_t nhc_upper_bound;
1: +  struct rtable **nhc_pcpu_rth_output;
1: +  struct rtable *nhc_rth_input;
1: +  struct fnhe_hash_bucket *nhc_exceptions;
1:  };
1:  
1:  struct rt6_exception_bucket;
1:  
1:  struct fib6_nh {
1: -	struct fib_nh_common nh_common;
1: -	long unsigned int last_probe;
1: -	struct rt6_info **rt6i_pcpu;
1: -	struct rt6_exception_bucket *rt6i_exception_bucket;
1: +  struct fib_nh_common nh_common;
1: +  long unsigned int last_probe;
1: +  struct rt6_info **rt6i_pcpu;
1: +  struct rt6_exception_bucket *rt6i_exception_bucket;
1:  };
1:  
1:  struct fib6_node;
1: @@ -92194,269 +93298,269 @@ struct dst_metrics;
1:  struct nexthop;
1:  
1:  struct fib6_info {
1: -	struct fib6_table *fib6_table;
1: -	struct fib6_info *fib6_next;
1: -	struct fib6_node *fib6_node;
1: -	union {
1: -		struct list_head fib6_siblings;
1: -		struct list_head nh_list;
1: -	};
1: -	unsigned int fib6_nsiblings;
1: -	refcount_t fib6_ref;
1: -	long unsigned int expires;
1: -	struct dst_metrics *fib6_metrics;
1: -	struct rt6key fib6_dst;
1: -	u32 fib6_flags;
1: -	struct rt6key fib6_src;
1: -	struct rt6key fib6_prefsrc;
1: -	u32 fib6_metric;
1: -	u8 fib6_protocol;
1: -	u8 fib6_type;
1: -	u8 should_flush: 1;
1: -	u8 dst_nocount: 1;
1: -	u8 dst_nopolicy: 1;
1: -	u8 fib6_destroying: 1;
1: -	u8 offload: 1;
1: -	u8 trap: 1;
1: -	u8 unused: 2;
1: -	struct callback_head rcu;
1: -	struct nexthop *nh;
1: -	struct fib6_nh fib6_nh[0];
1: +  struct fib6_table *fib6_table;
1: +  struct fib6_info *fib6_next;
1: +  struct fib6_node *fib6_node;
1: +  union {
1: +    struct list_head fib6_siblings;
1: +    struct list_head nh_list;
1: +  };
1: +  unsigned int fib6_nsiblings;
1: +  refcount_t fib6_ref;
1: +  long unsigned int expires;
1: +  struct dst_metrics *fib6_metrics;
1: +  struct rt6key fib6_dst;
1: +  u32 fib6_flags;
1: +  struct rt6key fib6_src;
1: +  struct rt6key fib6_prefsrc;
1: +  u32 fib6_metric;
1: +  u8 fib6_protocol;
1: +  u8 fib6_type;
1: +  u8 should_flush : 1;
1: +  u8 dst_nocount : 1;
1: +  u8 dst_nopolicy : 1;
1: +  u8 fib6_destroying : 1;
1: +  u8 offload : 1;
1: +  u8 trap : 1;
1: +  u8 unused : 2;
1: +  struct callback_head rcu;
1: +  struct nexthop *nh;
1: +  struct fib6_nh fib6_nh[0];
1:  };
1:  
1:  struct uncached_list;
1:  
1:  struct rt6_info {
1: -	struct dst_entry dst;
1: -	struct fib6_info *from;
1: -	int sernum;
1: -	struct rt6key rt6i_dst;
1: -	struct rt6key rt6i_src;
1: -	struct in6_addr rt6i_gateway;
1: -	struct inet6_dev *rt6i_idev;
1: -	u32 rt6i_flags;
1: -	struct list_head rt6i_uncached;
1: -	struct uncached_list *rt6i_uncached_list;
1: -	short unsigned int rt6i_nfheader_len;
1: +  struct dst_entry dst;
1: +  struct fib6_info *from;
1: +  int sernum;
1: +  struct rt6key rt6i_dst;
1: +  struct rt6key rt6i_src;
1: +  struct in6_addr rt6i_gateway;
1: +  struct inet6_dev *rt6i_idev;
1: +  u32 rt6i_flags;
1: +  struct list_head rt6i_uncached;
1: +  struct uncached_list *rt6i_uncached_list;
1: +  short unsigned int rt6i_nfheader_len;
1:  };
1:  
1:  struct rt6_statistics {
1: -	__u32 fib_nodes;
1: -	__u32 fib_route_nodes;
1: -	__u32 fib_rt_entries;
1: -	__u32 fib_rt_cache;
1: -	__u32 fib_discarded_routes;
1: -	atomic_t fib_rt_alloc;
1: -	atomic_t fib_rt_uncache;
1: +  __u32 fib_nodes;
1: +  __u32 fib_route_nodes;
1: +  __u32 fib_rt_entries;
1: +  __u32 fib_rt_cache;
1: +  __u32 fib_discarded_routes;
1: +  atomic_t fib_rt_alloc;
1: +  atomic_t fib_rt_uncache;
1:  };
1:  
1:  struct fib6_node {
1: -	struct fib6_node *parent;
1: -	struct fib6_node *left;
1: -	struct fib6_node *right;
1: -	struct fib6_node *subtree;
1: -	struct fib6_info *leaf;
1: -	__u16 fn_bit;
1: -	__u16 fn_flags;
1: -	int fn_sernum;
1: -	struct fib6_info *rr_ptr;
1: -	struct callback_head rcu;
1: +  struct fib6_node *parent;
1: +  struct fib6_node *left;
1: +  struct fib6_node *right;
1: +  struct fib6_node *subtree;
1: +  struct fib6_info *leaf;
1: +  __u16 fn_bit;
1: +  __u16 fn_flags;
1: +  int fn_sernum;
1: +  struct fib6_info *rr_ptr;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct fib6_table {
1: -	struct hlist_node tb6_hlist;
1: -	u32 tb6_id;
1: -	spinlock_t tb6_lock;
1: -	struct fib6_node tb6_root;
1: -	struct inet_peer_base tb6_peers;
1: -	unsigned int flags;
1: -	unsigned int fib_seq;
1: +  struct hlist_node tb6_hlist;
1: +  u32 tb6_id;
1: +  spinlock_t tb6_lock;
1: +  struct fib6_node tb6_root;
1: +  struct inet_peer_base tb6_peers;
1: +  unsigned int flags;
1: +  unsigned int fib_seq;
1:  };
1:  
1:  enum {
1: -	IFLA_TUN_UNSPEC = 0,
1: -	IFLA_TUN_OWNER = 1,
1: -	IFLA_TUN_GROUP = 2,
1: -	IFLA_TUN_TYPE = 3,
1: -	IFLA_TUN_PI = 4,
1: -	IFLA_TUN_VNET_HDR = 5,
1: -	IFLA_TUN_PERSIST = 6,
1: -	IFLA_TUN_MULTI_QUEUE = 7,
1: -	IFLA_TUN_NUM_QUEUES = 8,
1: -	IFLA_TUN_NUM_DISABLED_QUEUES = 9,
1: -	__IFLA_TUN_MAX = 10,
1: +  IFLA_TUN_UNSPEC = 0,
1: +  IFLA_TUN_OWNER = 1,
1: +  IFLA_TUN_GROUP = 2,
1: +  IFLA_TUN_TYPE = 3,
1: +  IFLA_TUN_PI = 4,
1: +  IFLA_TUN_VNET_HDR = 5,
1: +  IFLA_TUN_PERSIST = 6,
1: +  IFLA_TUN_MULTI_QUEUE = 7,
1: +  IFLA_TUN_NUM_QUEUES = 8,
1: +  IFLA_TUN_NUM_DISABLED_QUEUES = 9,
1: +  __IFLA_TUN_MAX = 10,
1:  };
1:  
1:  struct gro_list {
1: -	struct list_head list;
1: -	int count;
1: +  struct list_head list;
1: +  int count;
1:  };
1:  
1:  struct napi_struct {
1: -	struct list_head poll_list;
1: -	long unsigned int state;
1: -	int weight;
1: -	int defer_hard_irqs_count;
1: -	long unsigned int gro_bitmask;
1: -	int (*poll)(struct napi_struct *, int);
1: -	int poll_owner;
1: -	struct net_device *dev;
1: -	struct gro_list gro_hash[8];
1: -	struct sk_buff *skb;
1: -	struct list_head rx_list;
1: -	int rx_count;
1: -	struct hrtimer timer;
1: -	struct list_head dev_list;
1: -	struct hlist_node napi_hash_node;
1: -	unsigned int napi_id;
1: +  struct list_head poll_list;
1: +  long unsigned int state;
1: +  int weight;
1: +  int defer_hard_irqs_count;
1: +  long unsigned int gro_bitmask;
1: +  int (*poll)(struct napi_struct *, int);
1: +  int poll_owner;
1: +  struct net_device *dev;
1: +  struct gro_list gro_hash[8];
1: +  struct sk_buff *skb;
1: +  struct list_head rx_list;
1: +  int rx_count;
1: +  struct hrtimer timer;
1: +  struct list_head dev_list;
1: +  struct hlist_node napi_hash_node;
1: +  unsigned int napi_id;
1:  };
1:  
1:  enum netdev_queue_state_t {
1: -	__QUEUE_STATE_DRV_XOFF = 0,
1: -	__QUEUE_STATE_STACK_XOFF = 1,
1: -	__QUEUE_STATE_FROZEN = 2,
1: +  __QUEUE_STATE_DRV_XOFF = 0,
1: +  __QUEUE_STATE_STACK_XOFF = 1,
1: +  __QUEUE_STATE_FROZEN = 2,
1:  };
1:  
1:  struct rps_sock_flow_table {
1: -	u32 mask;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 ents[0];
1: +  u32 mask;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 ents[0];
1:  };
1:  
1:  struct ip_tunnel_parm {
1: -	char name[16];
1: -	int link;
1: -	__be16 i_flags;
1: -	__be16 o_flags;
1: -	__be32 i_key;
1: -	__be32 o_key;
1: -	struct iphdr iph;
1: +  char name[16];
1: +  int link;
1: +  __be16 i_flags;
1: +  __be16 o_flags;
1: +  __be32 i_key;
1: +  __be32 o_key;
1: +  struct iphdr iph;
1:  };
1:  
1:  struct tun_pi {
1: -	__u16 flags;
1: -	__be16 proto;
1: +  __u16 flags;
1: +  __be16 proto;
1:  };
1:  
1:  struct tun_filter {
1: -	__u16 flags;
1: -	__u16 count;
1: -	__u8 addr[0];
1: +  __u16 flags;
1: +  __u16 count;
1: +  __u8 addr[0];
1:  };
1:  
1:  struct virtio_net_hdr {
1: -	__u8 flags;
1: -	__u8 gso_type;
1: -	__virtio16 hdr_len;
1: -	__virtio16 gso_size;
1: -	__virtio16 csum_start;
1: -	__virtio16 csum_offset;
1: +  __u8 flags;
1: +  __u8 gso_type;
1: +  __virtio16 hdr_len;
1: +  __virtio16 gso_size;
1: +  __virtio16 csum_start;
1: +  __virtio16 csum_offset;
1:  };
1:  
1:  struct tun_msg_ctl {
1: -	short unsigned int type;
1: -	short unsigned int num;
1: -	void *ptr;
1: +  short unsigned int type;
1: +  short unsigned int num;
1: +  void *ptr;
1:  };
1:  
1:  struct tun_xdp_hdr {
1: -	int buflen;
1: -	struct virtio_net_hdr gso;
1: +  int buflen;
1: +  struct virtio_net_hdr gso;
1:  };
1:  
1:  struct lwtunnel_state {
1: -	__u16 type;
1: -	__u16 flags;
1: -	__u16 headroom;
1: -	atomic_t refcnt;
1: -	int (*orig_output)(struct net *, struct sock *, struct sk_buff *);
1: -	int (*orig_input)(struct sk_buff *);
1: -	struct callback_head rcu;
1: -	__u8 data[0];
1: +  __u16 type;
1: +  __u16 flags;
1: +  __u16 headroom;
1: +  atomic_t refcnt;
1: +  int (*orig_output)(struct net *, struct sock *, struct sk_buff *);
1: +  int (*orig_input)(struct sk_buff *);
1: +  struct callback_head rcu;
1: +  __u8 data[0];
1:  };
1:  
1:  struct dst_metrics {
1: -	u32 metrics[17];
1: -	refcount_t refcnt;
1: +  u32 metrics[17];
1: +  refcount_t refcnt;
1:  };
1:  
1:  struct fib_nh_exception {
1: -	struct fib_nh_exception *fnhe_next;
1: -	int fnhe_genid;
1: -	__be32 fnhe_daddr;
1: -	u32 fnhe_pmtu;
1: -	bool fnhe_mtu_locked;
1: -	__be32 fnhe_gw;
1: -	long unsigned int fnhe_expires;
1: -	struct rtable *fnhe_rth_input;
1: -	struct rtable *fnhe_rth_output;
1: -	long unsigned int fnhe_stamp;
1: -	struct callback_head rcu;
1: +  struct fib_nh_exception *fnhe_next;
1: +  int fnhe_genid;
1: +  __be32 fnhe_daddr;
1: +  u32 fnhe_pmtu;
1: +  bool fnhe_mtu_locked;
1: +  __be32 fnhe_gw;
1: +  long unsigned int fnhe_expires;
1: +  struct rtable *fnhe_rth_input;
1: +  struct rtable *fnhe_rth_output;
1: +  long unsigned int fnhe_stamp;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct rtable {
1: -	struct dst_entry dst;
1: -	int rt_genid;
1: -	unsigned int rt_flags;
1: -	__u16 rt_type;
1: -	__u8 rt_is_input;
1: -	__u8 rt_uses_gateway;
1: -	int rt_iif;
1: -	u8 rt_gw_family;
1: -	union {
1: -		__be32 rt_gw4;
1: -		struct in6_addr rt_gw6;
1: -	};
1: -	u32 rt_mtu_locked: 1;
1: -	u32 rt_pmtu: 31;
1: -	struct list_head rt_uncached;
1: -	struct uncached_list *rt_uncached_list;
1: +  struct dst_entry dst;
1: +  int rt_genid;
1: +  unsigned int rt_flags;
1: +  __u16 rt_type;
1: +  __u8 rt_is_input;
1: +  __u8 rt_uses_gateway;
1: +  int rt_iif;
1: +  u8 rt_gw_family;
1: +  union {
1: +    __be32 rt_gw4;
1: +    struct in6_addr rt_gw6;
1: +  };
1: +  u32 rt_mtu_locked : 1;
1: +  u32 rt_pmtu : 31;
1: +  struct list_head rt_uncached;
1: +  struct uncached_list *rt_uncached_list;
1:  };
1:  
1:  struct fnhe_hash_bucket {
1: -	struct fib_nh_exception *chain;
1: +  struct fib_nh_exception *chain;
1:  };
1:  
1:  struct fib_info;
1:  
1:  struct fib_nh {
1: -	struct fib_nh_common nh_common;
1: -	struct hlist_node nh_hash;
1: -	struct fib_info *nh_parent;
1: -	__u32 nh_tclassid;
1: -	__be32 nh_saddr;
1: -	int nh_saddr_genid;
1: +  struct fib_nh_common nh_common;
1: +  struct hlist_node nh_hash;
1: +  struct fib_info *nh_parent;
1: +  __u32 nh_tclassid;
1: +  __be32 nh_saddr;
1: +  int nh_saddr_genid;
1:  };
1:  
1:  struct fib_info {
1: -	struct hlist_node fib_hash;
1: -	struct hlist_node fib_lhash;
1: -	struct list_head nh_list;
1: -	struct net *fib_net;
1: -	int fib_treeref;
1: -	refcount_t fib_clntref;
1: -	unsigned int fib_flags;
1: -	unsigned char fib_dead;
1: -	unsigned char fib_protocol;
1: -	unsigned char fib_scope;
1: -	unsigned char fib_type;
1: -	__be32 fib_prefsrc;
1: -	u32 fib_tb_id;
1: -	u32 fib_priority;
1: -	struct dst_metrics *fib_metrics;
1: -	int fib_nhs;
1: -	bool fib_nh_is_v6;
1: -	bool nh_updated;
1: -	struct nexthop *nh;
1: -	struct callback_head rcu;
1: -	struct fib_nh fib_nh[0];
1: +  struct hlist_node fib_hash;
1: +  struct hlist_node fib_lhash;
1: +  struct list_head nh_list;
1: +  struct net *fib_net;
1: +  int fib_treeref;
1: +  refcount_t fib_clntref;
1: +  unsigned int fib_flags;
1: +  unsigned char fib_dead;
1: +  unsigned char fib_protocol;
1: +  unsigned char fib_scope;
1: +  unsigned char fib_type;
1: +  __be32 fib_prefsrc;
1: +  u32 fib_tb_id;
1: +  u32 fib_priority;
1: +  struct dst_metrics *fib_metrics;
1: +  int fib_nhs;
1: +  bool fib_nh_is_v6;
1: +  bool nh_updated;
1: +  struct nexthop *nh;
1: +  struct callback_head rcu;
1: +  struct fib_nh fib_nh[0];
1:  };
1:  
1:  struct nh_info;
1: @@ -92464,430 +93568,430 @@ struct nh_info;
1:  struct nh_group;
1:  
1:  struct nexthop {
1: -	struct rb_node rb_node;
1: -	struct list_head fi_list;
1: -	struct list_head f6i_list;
1: -	struct list_head fdb_list;
1: -	struct list_head grp_list;
1: -	struct net *net;
1: -	u32 id;
1: -	u8 protocol;
1: -	u8 nh_flags;
1: -	bool is_group;
1: -	refcount_t refcnt;
1: -	struct callback_head rcu;
1: -	union {
1: -		struct nh_info *nh_info;
1: -		struct nh_group *nh_grp;
1: -	};
1: +  struct rb_node rb_node;
1: +  struct list_head fi_list;
1: +  struct list_head f6i_list;
1: +  struct list_head fdb_list;
1: +  struct list_head grp_list;
1: +  struct net *net;
1: +  u32 id;
1: +  u8 protocol;
1: +  u8 nh_flags;
1: +  bool is_group;
1: +  refcount_t refcnt;
1: +  struct callback_head rcu;
1: +  union {
1: +    struct nh_info *nh_info;
1: +    struct nh_group *nh_grp;
1: +  };
1:  };
1:  
1:  struct rt6_exception_bucket {
1: -	struct hlist_head chain;
1: -	int depth;
1: +  struct hlist_head chain;
1: +  int depth;
1:  };
1:  
1:  struct nh_info {
1: -	struct hlist_node dev_hash;
1: -	struct nexthop *nh_parent;
1: -	u8 family;
1: -	bool reject_nh;
1: -	bool fdb_nh;
1: -	union {
1: -		struct fib_nh_common fib_nhc;
1: -		struct fib_nh fib_nh;
1: -		struct fib6_nh fib6_nh;
1: -	};
1: +  struct hlist_node dev_hash;
1: +  struct nexthop *nh_parent;
1: +  u8 family;
1: +  bool reject_nh;
1: +  bool fdb_nh;
1: +  union {
1: +    struct fib_nh_common fib_nhc;
1: +    struct fib_nh fib_nh;
1: +    struct fib6_nh fib6_nh;
1: +  };
1:  };
1:  
1:  struct nh_grp_entry {
1: -	struct nexthop *nh;
1: -	u8 weight;
1: -	atomic_t upper_bound;
1: -	struct list_head nh_list;
1: -	struct nexthop *nh_parent;
1: +  struct nexthop *nh;
1: +  u8 weight;
1: +  atomic_t upper_bound;
1: +  struct list_head nh_list;
1: +  struct nexthop *nh_parent;
1:  };
1:  
1:  struct nh_group {
1: -	struct nh_group *spare;
1: -	u16 num_nh;
1: -	bool mpath;
1: -	bool fdb_nh;
1: -	bool has_v4;
1: -	struct nh_grp_entry nh_entries[0];
1: +  struct nh_group *spare;
1: +  u16 num_nh;
1: +  bool mpath;
1: +  bool fdb_nh;
1: +  bool has_v4;
1: +  struct nh_grp_entry nh_entries[0];
1:  };
1:  
1:  struct tap_filter {
1: -	unsigned int count;
1: -	u32 mask[2];
1: -	unsigned char addr[48];
1: +  unsigned int count;
1: +  u32 mask[2];
1: +  unsigned char addr[48];
1:  };
1:  
1:  struct tun_struct;
1:  
1:  struct tun_file {
1: -	struct sock sk;
1: -	long: 64;
1: -	long: 64;
1: -	struct socket socket;
1: -	struct tun_struct *tun;
1: -	struct fasync_struct *fasync;
1: -	unsigned int flags;
1: -	union {
1: -		u16 queue_index;
1: -		unsigned int ifindex;
1: -	};
1: -	struct napi_struct napi;
1: -	bool napi_enabled;
1: -	bool napi_frags_enabled;
1: -	struct mutex napi_mutex;
1: -	struct list_head next;
1: -	struct tun_struct *detached;
1: -	struct ptr_ring tx_ring;
1: -	struct xdp_rxq_info xdp_rxq;
1: +  struct sock sk;
1: +  long : 64;
1: +  long : 64;
1: +  struct socket socket;
1: +  struct tun_struct *tun;
1: +  struct fasync_struct *fasync;
1: +  unsigned int flags;
1: +  union {
1: +    u16 queue_index;
1: +    unsigned int ifindex;
1: +  };
1: +  struct napi_struct napi;
1: +  bool napi_enabled;
1: +  bool napi_frags_enabled;
1: +  struct mutex napi_mutex;
1: +  struct list_head next;
1: +  struct tun_struct *detached;
1: +  struct ptr_ring tx_ring;
1: +  struct xdp_rxq_info xdp_rxq;
1:  };
1:  
1:  struct tun_prog;
1:  
1:  struct tun_struct {
1: -	struct tun_file *tfiles[256];
1: -	unsigned int numqueues;
1: -	unsigned int flags;
1: -	kuid_t owner;
1: -	kgid_t group;
1: -	struct net_device *dev;
1: -	netdev_features_t set_features;
1: -	int align;
1: -	int vnet_hdr_sz;
1: -	int sndbuf;
1: -	struct tap_filter txflt;
1: -	struct sock_fprog fprog;
1: -	bool filter_attached;
1: -	u32 msg_enable;
1: -	spinlock_t lock;
1: -	struct hlist_head flows[1024];
1: -	struct timer_list flow_gc_timer;
1: -	long unsigned int ageing_time;
1: -	unsigned int numdisabled;
1: -	struct list_head disabled;
1: -	void *security;
1: -	u32 flow_count;
1: -	u32 rx_batched;
1: -	atomic_long_t rx_frame_errors;
1: -	struct bpf_prog *xdp_prog;
1: -	struct tun_prog *steering_prog;
1: -	struct tun_prog *filter_prog;
1: -	struct ethtool_link_ksettings link_ksettings;
1: +  struct tun_file *tfiles[256];
1: +  unsigned int numqueues;
1: +  unsigned int flags;
1: +  kuid_t owner;
1: +  kgid_t group;
1: +  struct net_device *dev;
1: +  netdev_features_t set_features;
1: +  int align;
1: +  int vnet_hdr_sz;
1: +  int sndbuf;
1: +  struct tap_filter txflt;
1: +  struct sock_fprog fprog;
1: +  bool filter_attached;
1: +  u32 msg_enable;
1: +  spinlock_t lock;
1: +  struct hlist_head flows[1024];
1: +  struct timer_list flow_gc_timer;
1: +  long unsigned int ageing_time;
1: +  unsigned int numdisabled;
1: +  struct list_head disabled;
1: +  void *security;
1: +  u32 flow_count;
1: +  u32 rx_batched;
1: +  atomic_long_t rx_frame_errors;
1: +  struct bpf_prog *xdp_prog;
1: +  struct tun_prog *steering_prog;
1: +  struct tun_prog *filter_prog;
1: +  struct ethtool_link_ksettings link_ksettings;
1:  };
1:  
1:  struct tun_page {
1: -	struct page *page;
1: -	int count;
1: +  struct page *page;
1: +  int count;
1:  };
1:  
1:  struct tun_flow_entry {
1: -	struct hlist_node hash_link;
1: -	struct callback_head rcu;
1: -	struct tun_struct *tun;
1: -	u32 rxhash;
1: -	u32 rps_rxhash;
1: -	int queue_index;
1: -	long: 32;
1: -	long: 64;
1: -	long unsigned int updated;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct hlist_node hash_link;
1: +  struct callback_head rcu;
1: +  struct tun_struct *tun;
1: +  u32 rxhash;
1: +  u32 rps_rxhash;
1: +  int queue_index;
1: +  long : 32;
1: +  long : 64;
1: +  long unsigned int updated;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct tun_prog {
1: -	struct callback_head rcu;
1: -	struct bpf_prog *prog;
1: +  struct callback_head rcu;
1: +  struct bpf_prog *prog;
1:  };
1:  
1:  struct veth {
1: -	__be16 h_vlan_proto;
1: -	__be16 h_vlan_TCI;
1: +  __be16 h_vlan_proto;
1: +  __be16 h_vlan_TCI;
1:  };
1:  
1:  enum ethtool_stringset {
1: -	ETH_SS_TEST = 0,
1: -	ETH_SS_STATS = 1,
1: -	ETH_SS_PRIV_FLAGS = 2,
1: -	ETH_SS_NTUPLE_FILTERS = 3,
1: -	ETH_SS_FEATURES = 4,
1: -	ETH_SS_RSS_HASH_FUNCS = 5,
1: -	ETH_SS_TUNABLES = 6,
1: -	ETH_SS_PHY_STATS = 7,
1: -	ETH_SS_PHY_TUNABLES = 8,
1: -	ETH_SS_LINK_MODES = 9,
1: -	ETH_SS_MSG_CLASSES = 10,
1: -	ETH_SS_WOL_MODES = 11,
1: -	ETH_SS_SOF_TIMESTAMPING = 12,
1: -	ETH_SS_TS_TX_TYPES = 13,
1: -	ETH_SS_TS_RX_FILTERS = 14,
1: -	ETH_SS_UDP_TUNNEL_TYPES = 15,
1: -	ETH_SS_COUNT = 16,
1: +  ETH_SS_TEST = 0,
1: +  ETH_SS_STATS = 1,
1: +  ETH_SS_PRIV_FLAGS = 2,
1: +  ETH_SS_NTUPLE_FILTERS = 3,
1: +  ETH_SS_FEATURES = 4,
1: +  ETH_SS_RSS_HASH_FUNCS = 5,
1: +  ETH_SS_TUNABLES = 6,
1: +  ETH_SS_PHY_STATS = 7,
1: +  ETH_SS_PHY_TUNABLES = 8,
1: +  ETH_SS_LINK_MODES = 9,
1: +  ETH_SS_MSG_CLASSES = 10,
1: +  ETH_SS_WOL_MODES = 11,
1: +  ETH_SS_SOF_TIMESTAMPING = 12,
1: +  ETH_SS_TS_TX_TYPES = 13,
1: +  ETH_SS_TS_RX_FILTERS = 14,
1: +  ETH_SS_UDP_TUNNEL_TYPES = 15,
1: +  ETH_SS_COUNT = 16,
1:  };
1:  
1:  typedef union {
1: -	__be32 a4;
1: -	__be32 a6[4];
1: -	struct in6_addr in6;
1: +  __be32 a4;
1: +  __be32 a6[4];
1: +  struct in6_addr in6;
1:  } xfrm_address_t;
1:  
1:  struct xfrm_id {
1: -	xfrm_address_t daddr;
1: -	__be32 spi;
1: -	__u8 proto;
1: +  xfrm_address_t daddr;
1: +  __be32 spi;
1: +  __u8 proto;
1:  };
1:  
1:  struct xfrm_sec_ctx {
1: -	__u8 ctx_doi;
1: -	__u8 ctx_alg;
1: -	__u16 ctx_len;
1: -	__u32 ctx_sid;
1: -	char ctx_str[0];
1: +  __u8 ctx_doi;
1: +  __u8 ctx_alg;
1: +  __u16 ctx_len;
1: +  __u32 ctx_sid;
1: +  char ctx_str[0];
1:  };
1:  
1:  struct xfrm_selector {
1: -	xfrm_address_t daddr;
1: -	xfrm_address_t saddr;
1: -	__be16 dport;
1: -	__be16 dport_mask;
1: -	__be16 sport;
1: -	__be16 sport_mask;
1: -	__u16 family;
1: -	__u8 prefixlen_d;
1: -	__u8 prefixlen_s;
1: -	__u8 proto;
1: -	int ifindex;
1: -	__kernel_uid32_t user;
1: +  xfrm_address_t daddr;
1: +  xfrm_address_t saddr;
1: +  __be16 dport;
1: +  __be16 dport_mask;
1: +  __be16 sport;
1: +  __be16 sport_mask;
1: +  __u16 family;
1: +  __u8 prefixlen_d;
1: +  __u8 prefixlen_s;
1: +  __u8 proto;
1: +  int ifindex;
1: +  __kernel_uid32_t user;
1:  };
1:  
1:  struct xfrm_lifetime_cfg {
1: -	__u64 soft_byte_limit;
1: -	__u64 hard_byte_limit;
1: -	__u64 soft_packet_limit;
1: -	__u64 hard_packet_limit;
1: -	__u64 soft_add_expires_seconds;
1: -	__u64 hard_add_expires_seconds;
1: -	__u64 soft_use_expires_seconds;
1: -	__u64 hard_use_expires_seconds;
1: +  __u64 soft_byte_limit;
1: +  __u64 hard_byte_limit;
1: +  __u64 soft_packet_limit;
1: +  __u64 hard_packet_limit;
1: +  __u64 soft_add_expires_seconds;
1: +  __u64 hard_add_expires_seconds;
1: +  __u64 soft_use_expires_seconds;
1: +  __u64 hard_use_expires_seconds;
1:  };
1:  
1:  struct xfrm_lifetime_cur {
1: -	__u64 bytes;
1: -	__u64 packets;
1: -	__u64 add_time;
1: -	__u64 use_time;
1: +  __u64 bytes;
1: +  __u64 packets;
1: +  __u64 add_time;
1: +  __u64 use_time;
1:  };
1:  
1:  struct xfrm_replay_state {
1: -	__u32 oseq;
1: -	__u32 seq;
1: -	__u32 bitmap;
1: +  __u32 oseq;
1: +  __u32 seq;
1: +  __u32 bitmap;
1:  };
1:  
1:  struct xfrm_replay_state_esn {
1: -	unsigned int bmp_len;
1: -	__u32 oseq;
1: -	__u32 seq;
1: -	__u32 oseq_hi;
1: -	__u32 seq_hi;
1: -	__u32 replay_window;
1: -	__u32 bmp[0];
1: +  unsigned int bmp_len;
1: +  __u32 oseq;
1: +  __u32 seq;
1: +  __u32 oseq_hi;
1: +  __u32 seq_hi;
1: +  __u32 replay_window;
1: +  __u32 bmp[0];
1:  };
1:  
1:  struct xfrm_algo {
1: -	char alg_name[64];
1: -	unsigned int alg_key_len;
1: -	char alg_key[0];
1: +  char alg_name[64];
1: +  unsigned int alg_key_len;
1: +  char alg_key[0];
1:  };
1:  
1:  struct xfrm_algo_auth {
1: -	char alg_name[64];
1: -	unsigned int alg_key_len;
1: -	unsigned int alg_trunc_len;
1: -	char alg_key[0];
1: +  char alg_name[64];
1: +  unsigned int alg_key_len;
1: +  unsigned int alg_trunc_len;
1: +  char alg_key[0];
1:  };
1:  
1:  struct xfrm_algo_aead {
1: -	char alg_name[64];
1: -	unsigned int alg_key_len;
1: -	unsigned int alg_icv_len;
1: -	char alg_key[0];
1: +  char alg_name[64];
1: +  unsigned int alg_key_len;
1: +  unsigned int alg_icv_len;
1: +  char alg_key[0];
1:  };
1:  
1:  struct xfrm_stats {
1: -	__u32 replay_window;
1: -	__u32 replay;
1: -	__u32 integrity_failed;
1: +  __u32 replay_window;
1: +  __u32 replay;
1: +  __u32 integrity_failed;
1:  };
1:  
1:  enum {
1: -	XFRM_POLICY_TYPE_MAIN = 0,
1: -	XFRM_POLICY_TYPE_SUB = 1,
1: -	XFRM_POLICY_TYPE_MAX = 2,
1: -	XFRM_POLICY_TYPE_ANY = 255,
1: +  XFRM_POLICY_TYPE_MAIN = 0,
1: +  XFRM_POLICY_TYPE_SUB = 1,
1: +  XFRM_POLICY_TYPE_MAX = 2,
1: +  XFRM_POLICY_TYPE_ANY = 255,
1:  };
1:  
1:  struct xfrm_encap_tmpl {
1: -	__u16 encap_type;
1: -	__be16 encap_sport;
1: -	__be16 encap_dport;
1: -	xfrm_address_t encap_oa;
1: +  __u16 encap_type;
1: +  __be16 encap_sport;
1: +  __be16 encap_dport;
1: +  xfrm_address_t encap_oa;
1:  };
1:  
1:  enum xfrm_attr_type_t {
1: -	XFRMA_UNSPEC = 0,
1: -	XFRMA_ALG_AUTH = 1,
1: -	XFRMA_ALG_CRYPT = 2,
1: -	XFRMA_ALG_COMP = 3,
1: -	XFRMA_ENCAP = 4,
1: -	XFRMA_TMPL = 5,
1: -	XFRMA_SA = 6,
1: -	XFRMA_POLICY = 7,
1: -	XFRMA_SEC_CTX = 8,
1: -	XFRMA_LTIME_VAL = 9,
1: -	XFRMA_REPLAY_VAL = 10,
1: -	XFRMA_REPLAY_THRESH = 11,
1: -	XFRMA_ETIMER_THRESH = 12,
1: -	XFRMA_SRCADDR = 13,
1: -	XFRMA_COADDR = 14,
1: -	XFRMA_LASTUSED = 15,
1: -	XFRMA_POLICY_TYPE = 16,
1: -	XFRMA_MIGRATE = 17,
1: -	XFRMA_ALG_AEAD = 18,
1: -	XFRMA_KMADDRESS = 19,
1: -	XFRMA_ALG_AUTH_TRUNC = 20,
1: -	XFRMA_MARK = 21,
1: -	XFRMA_TFCPAD = 22,
1: -	XFRMA_REPLAY_ESN_VAL = 23,
1: -	XFRMA_SA_EXTRA_FLAGS = 24,
1: -	XFRMA_PROTO = 25,
1: -	XFRMA_ADDRESS_FILTER = 26,
1: -	XFRMA_PAD = 27,
1: -	XFRMA_OFFLOAD_DEV = 28,
1: -	XFRMA_SET_MARK = 29,
1: -	XFRMA_SET_MARK_MASK = 30,
1: -	XFRMA_IF_ID = 31,
1: -	__XFRMA_MAX = 32,
1: +  XFRMA_UNSPEC = 0,
1: +  XFRMA_ALG_AUTH = 1,
1: +  XFRMA_ALG_CRYPT = 2,
1: +  XFRMA_ALG_COMP = 3,
1: +  XFRMA_ENCAP = 4,
1: +  XFRMA_TMPL = 5,
1: +  XFRMA_SA = 6,
1: +  XFRMA_POLICY = 7,
1: +  XFRMA_SEC_CTX = 8,
1: +  XFRMA_LTIME_VAL = 9,
1: +  XFRMA_REPLAY_VAL = 10,
1: +  XFRMA_REPLAY_THRESH = 11,
1: +  XFRMA_ETIMER_THRESH = 12,
1: +  XFRMA_SRCADDR = 13,
1: +  XFRMA_COADDR = 14,
1: +  XFRMA_LASTUSED = 15,
1: +  XFRMA_POLICY_TYPE = 16,
1: +  XFRMA_MIGRATE = 17,
1: +  XFRMA_ALG_AEAD = 18,
1: +  XFRMA_KMADDRESS = 19,
1: +  XFRMA_ALG_AUTH_TRUNC = 20,
1: +  XFRMA_MARK = 21,
1: +  XFRMA_TFCPAD = 22,
1: +  XFRMA_REPLAY_ESN_VAL = 23,
1: +  XFRMA_SA_EXTRA_FLAGS = 24,
1: +  XFRMA_PROTO = 25,
1: +  XFRMA_ADDRESS_FILTER = 26,
1: +  XFRMA_PAD = 27,
1: +  XFRMA_OFFLOAD_DEV = 28,
1: +  XFRMA_SET_MARK = 29,
1: +  XFRMA_SET_MARK_MASK = 30,
1: +  XFRMA_IF_ID = 31,
1: +  __XFRMA_MAX = 32,
1:  };
1:  
1:  struct xfrm_mark {
1: -	__u32 v;
1: -	__u32 m;
1: +  __u32 v;
1: +  __u32 m;
1:  };
1:  
1:  struct xfrm_address_filter {
1: -	xfrm_address_t saddr;
1: -	xfrm_address_t daddr;
1: -	__u16 family;
1: -	__u8 splen;
1: -	__u8 dplen;
1: -};
1: -
1: -enum {
1: -	IFLA_UNSPEC = 0,
1: -	IFLA_ADDRESS = 1,
1: -	IFLA_BROADCAST = 2,
1: -	IFLA_IFNAME = 3,
1: -	IFLA_MTU = 4,
1: -	IFLA_LINK = 5,
1: -	IFLA_QDISC = 6,
1: -	IFLA_STATS = 7,
1: -	IFLA_COST = 8,
1: -	IFLA_PRIORITY = 9,
1: -	IFLA_MASTER = 10,
1: -	IFLA_WIRELESS = 11,
1: -	IFLA_PROTINFO = 12,
1: -	IFLA_TXQLEN = 13,
1: -	IFLA_MAP = 14,
1: -	IFLA_WEIGHT = 15,
1: -	IFLA_OPERSTATE = 16,
1: -	IFLA_LINKMODE = 17,
1: -	IFLA_LINKINFO = 18,
1: -	IFLA_NET_NS_PID = 19,
1: -	IFLA_IFALIAS = 20,
1: -	IFLA_NUM_VF = 21,
1: -	IFLA_VFINFO_LIST = 22,
1: -	IFLA_STATS64 = 23,
1: -	IFLA_VF_PORTS = 24,
1: -	IFLA_PORT_SELF = 25,
1: -	IFLA_AF_SPEC = 26,
1: -	IFLA_GROUP = 27,
1: -	IFLA_NET_NS_FD = 28,
1: -	IFLA_EXT_MASK = 29,
1: -	IFLA_PROMISCUITY = 30,
1: -	IFLA_NUM_TX_QUEUES = 31,
1: -	IFLA_NUM_RX_QUEUES = 32,
1: -	IFLA_CARRIER = 33,
1: -	IFLA_PHYS_PORT_ID = 34,
1: -	IFLA_CARRIER_CHANGES = 35,
1: -	IFLA_PHYS_SWITCH_ID = 36,
1: -	IFLA_LINK_NETNSID = 37,
1: -	IFLA_PHYS_PORT_NAME = 38,
1: -	IFLA_PROTO_DOWN = 39,
1: -	IFLA_GSO_MAX_SEGS = 40,
1: -	IFLA_GSO_MAX_SIZE = 41,
1: -	IFLA_PAD = 42,
1: -	IFLA_XDP = 43,
1: -	IFLA_EVENT = 44,
1: -	IFLA_NEW_NETNSID = 45,
1: -	IFLA_IF_NETNSID = 46,
1: -	IFLA_TARGET_NETNSID = 46,
1: -	IFLA_CARRIER_UP_COUNT = 47,
1: -	IFLA_CARRIER_DOWN_COUNT = 48,
1: -	IFLA_NEW_IFINDEX = 49,
1: -	IFLA_MIN_MTU = 50,
1: -	IFLA_MAX_MTU = 51,
1: -	IFLA_PROP_LIST = 52,
1: -	IFLA_ALT_IFNAME = 53,
1: -	IFLA_PERM_ADDRESS = 54,
1: -	IFLA_PROTO_DOWN_REASON = 55,
1: -	__IFLA_MAX = 56,
1: +  xfrm_address_t saddr;
1: +  xfrm_address_t daddr;
1: +  __u16 family;
1: +  __u8 splen;
1: +  __u8 dplen;
1: +};
1: +
1: +enum {
1: +  IFLA_UNSPEC = 0,
1: +  IFLA_ADDRESS = 1,
1: +  IFLA_BROADCAST = 2,
1: +  IFLA_IFNAME = 3,
1: +  IFLA_MTU = 4,
1: +  IFLA_LINK = 5,
1: +  IFLA_QDISC = 6,
1: +  IFLA_STATS = 7,
1: +  IFLA_COST = 8,
1: +  IFLA_PRIORITY = 9,
1: +  IFLA_MASTER = 10,
1: +  IFLA_WIRELESS = 11,
1: +  IFLA_PROTINFO = 12,
1: +  IFLA_TXQLEN = 13,
1: +  IFLA_MAP = 14,
1: +  IFLA_WEIGHT = 15,
1: +  IFLA_OPERSTATE = 16,
1: +  IFLA_LINKMODE = 17,
1: +  IFLA_LINKINFO = 18,
1: +  IFLA_NET_NS_PID = 19,
1: +  IFLA_IFALIAS = 20,
1: +  IFLA_NUM_VF = 21,
1: +  IFLA_VFINFO_LIST = 22,
1: +  IFLA_STATS64 = 23,
1: +  IFLA_VF_PORTS = 24,
1: +  IFLA_PORT_SELF = 25,
1: +  IFLA_AF_SPEC = 26,
1: +  IFLA_GROUP = 27,
1: +  IFLA_NET_NS_FD = 28,
1: +  IFLA_EXT_MASK = 29,
1: +  IFLA_PROMISCUITY = 30,
1: +  IFLA_NUM_TX_QUEUES = 31,
1: +  IFLA_NUM_RX_QUEUES = 32,
1: +  IFLA_CARRIER = 33,
1: +  IFLA_PHYS_PORT_ID = 34,
1: +  IFLA_CARRIER_CHANGES = 35,
1: +  IFLA_PHYS_SWITCH_ID = 36,
1: +  IFLA_LINK_NETNSID = 37,
1: +  IFLA_PHYS_PORT_NAME = 38,
1: +  IFLA_PROTO_DOWN = 39,
1: +  IFLA_GSO_MAX_SEGS = 40,
1: +  IFLA_GSO_MAX_SIZE = 41,
1: +  IFLA_PAD = 42,
1: +  IFLA_XDP = 43,
1: +  IFLA_EVENT = 44,
1: +  IFLA_NEW_NETNSID = 45,
1: +  IFLA_IF_NETNSID = 46,
1: +  IFLA_TARGET_NETNSID = 46,
1: +  IFLA_CARRIER_UP_COUNT = 47,
1: +  IFLA_CARRIER_DOWN_COUNT = 48,
1: +  IFLA_NEW_IFINDEX = 49,
1: +  IFLA_MIN_MTU = 50,
1: +  IFLA_MAX_MTU = 51,
1: +  IFLA_PROP_LIST = 52,
1: +  IFLA_ALT_IFNAME = 53,
1: +  IFLA_PERM_ADDRESS = 54,
1: +  IFLA_PROTO_DOWN_REASON = 55,
1: +  __IFLA_MAX = 56,
1:  };
1:  
1:  enum skb_free_reason {
1: -	SKB_REASON_CONSUMED = 0,
1: -	SKB_REASON_DROPPED = 1,
1: +  SKB_REASON_CONSUMED = 0,
1: +  SKB_REASON_DROPPED = 1,
1:  };
1:  
1:  struct ifinfomsg {
1: -	unsigned char ifi_family;
1: -	unsigned char __ifi_pad;
1: -	short unsigned int ifi_type;
1: -	int ifi_index;
1: -	unsigned int ifi_flags;
1: -	unsigned int ifi_change;
1: +  unsigned char ifi_family;
1: +  unsigned char __ifi_pad;
1: +  short unsigned int ifi_type;
1: +  int ifi_index;
1: +  unsigned int ifi_flags;
1: +  unsigned int ifi_change;
1:  };
1:  
1:  struct xfrm_state_walk {
1: -	struct list_head all;
1: -	u8 state;
1: -	u8 dying;
1: -	u8 proto;
1: -	u32 seq;
1: -	struct xfrm_address_filter *filter;
1: +  struct list_head all;
1: +  u8 state;
1: +  u8 dying;
1: +  u8 proto;
1: +  u32 seq;
1: +  struct xfrm_address_filter *filter;
1:  };
1:  
1:  struct xfrm_state_offload {
1: -	struct net_device *dev;
1: -	struct net_device *real_dev;
1: -	long unsigned int offload_handle;
1: -	unsigned int num_exthdrs;
1: -	u8 flags;
1: +  struct net_device *dev;
1: +  struct net_device *real_dev;
1: +  long unsigned int offload_handle;
1: +  unsigned int num_exthdrs;
1: +  u8 flags;
1:  };
1:  
1:  struct xfrm_mode {
1: -	u8 encap;
1: -	u8 family;
1: -	u8 flags;
1: +  u8 encap;
1: +  u8 family;
1: +  u8 flags;
1:  };
1:  
1:  struct xfrm_replay;
1: @@ -92897,708 +94001,708 @@ struct xfrm_type;
1:  struct xfrm_type_offload;
1:  
1:  struct xfrm_state {
1: -	possible_net_t xs_net;
1: -	union {
1: -		struct hlist_node gclist;
1: -		struct hlist_node bydst;
1: -	};
1: -	struct hlist_node bysrc;
1: -	struct hlist_node byspi;
1: -	refcount_t refcnt;
1: -	spinlock_t lock;
1: -	struct xfrm_id id;
1: -	struct xfrm_selector sel;
1: -	struct xfrm_mark mark;
1: -	u32 if_id;
1: -	u32 tfcpad;
1: -	u32 genid;
1: -	struct xfrm_state_walk km;
1: -	struct {
1: -		u32 reqid;
1: -		u8 mode;
1: -		u8 replay_window;
1: -		u8 aalgo;
1: -		u8 ealgo;
1: -		u8 calgo;
1: -		u8 flags;
1: -		u16 family;
1: -		xfrm_address_t saddr;
1: -		int header_len;
1: -		int trailer_len;
1: -		u32 extra_flags;
1: -		struct xfrm_mark smark;
1: -	} props;
1: -	struct xfrm_lifetime_cfg lft;
1: -	struct xfrm_algo_auth *aalg;
1: -	struct xfrm_algo *ealg;
1: -	struct xfrm_algo *calg;
1: -	struct xfrm_algo_aead *aead;
1: -	const char *geniv;
1: -	struct xfrm_encap_tmpl *encap;
1: -	struct sock *encap_sk;
1: -	xfrm_address_t *coaddr;
1: -	struct xfrm_state *tunnel;
1: -	atomic_t tunnel_users;
1: -	struct xfrm_replay_state replay;
1: -	struct xfrm_replay_state_esn *replay_esn;
1: -	struct xfrm_replay_state preplay;
1: -	struct xfrm_replay_state_esn *preplay_esn;
1: -	const struct xfrm_replay *repl;
1: -	u32 xflags;
1: -	u32 replay_maxage;
1: -	u32 replay_maxdiff;
1: -	struct timer_list rtimer;
1: -	struct xfrm_stats stats;
1: -	struct xfrm_lifetime_cur curlft;
1: -	struct hrtimer mtimer;
1: -	struct xfrm_state_offload xso;
1: -	long int saved_tmo;
1: -	time64_t lastused;
1: -	struct page_frag xfrag;
1: -	const struct xfrm_type *type;
1: -	struct xfrm_mode inner_mode;
1: -	struct xfrm_mode inner_mode_iaf;
1: -	struct xfrm_mode outer_mode;
1: -	const struct xfrm_type_offload *type_offload;
1: -	struct xfrm_sec_ctx *security;
1: -	void *data;
1: +  possible_net_t xs_net;
1: +  union {
1: +    struct hlist_node gclist;
1: +    struct hlist_node bydst;
1: +  };
1: +  struct hlist_node bysrc;
1: +  struct hlist_node byspi;
1: +  refcount_t refcnt;
1: +  spinlock_t lock;
1: +  struct xfrm_id id;
1: +  struct xfrm_selector sel;
1: +  struct xfrm_mark mark;
1: +  u32 if_id;
1: +  u32 tfcpad;
1: +  u32 genid;
1: +  struct xfrm_state_walk km;
1: +  struct {
1: +    u32 reqid;
1: +    u8 mode;
1: +    u8 replay_window;
1: +    u8 aalgo;
1: +    u8 ealgo;
1: +    u8 calgo;
1: +    u8 flags;
1: +    u16 family;
1: +    xfrm_address_t saddr;
1: +    int header_len;
1: +    int trailer_len;
1: +    u32 extra_flags;
1: +    struct xfrm_mark smark;
1: +  } props;
1: +  struct xfrm_lifetime_cfg lft;
1: +  struct xfrm_algo_auth *aalg;
1: +  struct xfrm_algo *ealg;
1: +  struct xfrm_algo *calg;
1: +  struct xfrm_algo_aead *aead;
1: +  const char *geniv;
1: +  struct xfrm_encap_tmpl *encap;
1: +  struct sock *encap_sk;
1: +  xfrm_address_t *coaddr;
1: +  struct xfrm_state *tunnel;
1: +  atomic_t tunnel_users;
1: +  struct xfrm_replay_state replay;
1: +  struct xfrm_replay_state_esn *replay_esn;
1: +  struct xfrm_replay_state preplay;
1: +  struct xfrm_replay_state_esn *preplay_esn;
1: +  const struct xfrm_replay *repl;
1: +  u32 xflags;
1: +  u32 replay_maxage;
1: +  u32 replay_maxdiff;
1: +  struct timer_list rtimer;
1: +  struct xfrm_stats stats;
1: +  struct xfrm_lifetime_cur curlft;
1: +  struct hrtimer mtimer;
1: +  struct xfrm_state_offload xso;
1: +  long int saved_tmo;
1: +  time64_t lastused;
1: +  struct page_frag xfrag;
1: +  const struct xfrm_type *type;
1: +  struct xfrm_mode inner_mode;
1: +  struct xfrm_mode inner_mode_iaf;
1: +  struct xfrm_mode outer_mode;
1: +  const struct xfrm_type_offload *type_offload;
1: +  struct xfrm_sec_ctx *security;
1: +  void *data;
1:  };
1:  
1:  struct xfrm_policy_walk_entry {
1: -	struct list_head all;
1: -	u8 dead;
1: +  struct list_head all;
1: +  u8 dead;
1:  };
1:  
1:  struct xfrm_policy_queue {
1: -	struct sk_buff_head hold_queue;
1: -	struct timer_list hold_timer;
1: -	long unsigned int timeout;
1: +  struct sk_buff_head hold_queue;
1: +  struct timer_list hold_timer;
1: +  long unsigned int timeout;
1:  };
1:  
1:  struct xfrm_tmpl {
1: -	struct xfrm_id id;
1: -	xfrm_address_t saddr;
1: -	short unsigned int encap_family;
1: -	u32 reqid;
1: -	u8 mode;
1: -	u8 share;
1: -	u8 optional;
1: -	u8 allalgs;
1: -	u32 aalgos;
1: -	u32 ealgos;
1: -	u32 calgos;
1: +  struct xfrm_id id;
1: +  xfrm_address_t saddr;
1: +  short unsigned int encap_family;
1: +  u32 reqid;
1: +  u8 mode;
1: +  u8 share;
1: +  u8 optional;
1: +  u8 allalgs;
1: +  u32 aalgos;
1: +  u32 ealgos;
1: +  u32 calgos;
1:  };
1:  
1:  struct xfrm_policy {
1: -	possible_net_t xp_net;
1: -	struct hlist_node bydst;
1: -	struct hlist_node byidx;
1: -	rwlock_t lock;
1: -	refcount_t refcnt;
1: -	u32 pos;
1: -	struct timer_list timer;
1: -	atomic_t genid;
1: -	u32 priority;
1: -	u32 index;
1: -	u32 if_id;
1: -	struct xfrm_mark mark;
1: -	struct xfrm_selector selector;
1: -	struct xfrm_lifetime_cfg lft;
1: -	struct xfrm_lifetime_cur curlft;
1: -	struct xfrm_policy_walk_entry walk;
1: -	struct xfrm_policy_queue polq;
1: -	bool bydst_reinsert;
1: -	u8 type;
1: -	u8 action;
1: -	u8 flags;
1: -	u8 xfrm_nr;
1: -	u16 family;
1: -	struct xfrm_sec_ctx *security;
1: -	struct xfrm_tmpl xfrm_vec[6];
1: -	struct hlist_node bydst_inexact_list;
1: -	struct callback_head rcu;
1: +  possible_net_t xp_net;
1: +  struct hlist_node bydst;
1: +  struct hlist_node byidx;
1: +  rwlock_t lock;
1: +  refcount_t refcnt;
1: +  u32 pos;
1: +  struct timer_list timer;
1: +  atomic_t genid;
1: +  u32 priority;
1: +  u32 index;
1: +  u32 if_id;
1: +  struct xfrm_mark mark;
1: +  struct xfrm_selector selector;
1: +  struct xfrm_lifetime_cfg lft;
1: +  struct xfrm_lifetime_cur curlft;
1: +  struct xfrm_policy_walk_entry walk;
1: +  struct xfrm_policy_queue polq;
1: +  bool bydst_reinsert;
1: +  u8 type;
1: +  u8 action;
1: +  u8 flags;
1: +  u8 xfrm_nr;
1: +  u16 family;
1: +  struct xfrm_sec_ctx *security;
1: +  struct xfrm_tmpl xfrm_vec[6];
1: +  struct hlist_node bydst_inexact_list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct xfrm_replay {
1: -	void (*advance)(struct xfrm_state *, __be32);
1: -	int (*check)(struct xfrm_state *, struct sk_buff *, __be32);
1: -	int (*recheck)(struct xfrm_state *, struct sk_buff *, __be32);
1: -	void (*notify)(struct xfrm_state *, int);
1: -	int (*overflow)(struct xfrm_state *, struct sk_buff *);
1: +  void (*advance)(struct xfrm_state *, __be32);
1: +  int (*check)(struct xfrm_state *, struct sk_buff *, __be32);
1: +  int (*recheck)(struct xfrm_state *, struct sk_buff *, __be32);
1: +  void (*notify)(struct xfrm_state *, int);
1: +  int (*overflow)(struct xfrm_state *, struct sk_buff *);
1:  };
1:  
1:  struct xfrm_type {
1: -	char *description;
1: -	struct module *owner;
1: -	u8 proto;
1: -	u8 flags;
1: -	int (*init_state)(struct xfrm_state *);
1: -	void (*destructor)(struct xfrm_state *);
1: -	int (*input)(struct xfrm_state *, struct sk_buff *);
1: -	int (*output)(struct xfrm_state *, struct sk_buff *);
1: -	int (*reject)(struct xfrm_state *, struct sk_buff *, const struct flowi *);
1: -	int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
1: +  char *description;
1: +  struct module *owner;
1: +  u8 proto;
1: +  u8 flags;
1: +  int (*init_state)(struct xfrm_state *);
1: +  void (*destructor)(struct xfrm_state *);
1: +  int (*input)(struct xfrm_state *, struct sk_buff *);
1: +  int (*output)(struct xfrm_state *, struct sk_buff *);
1: +  int (*reject)(struct xfrm_state *, struct sk_buff *, const struct flowi *);
1: +  int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
1:  };
1:  
1:  struct xfrm_type_offload {
1: -	char *description;
1: -	struct module *owner;
1: -	u8 proto;
1: -	void (*encap)(struct xfrm_state *, struct sk_buff *);
1: -	int (*input_tail)(struct xfrm_state *, struct sk_buff *);
1: -	int (*xmit)(struct xfrm_state *, struct sk_buff *, netdev_features_t);
1: +  char *description;
1: +  struct module *owner;
1: +  u8 proto;
1: +  void (*encap)(struct xfrm_state *, struct sk_buff *);
1: +  int (*input_tail)(struct xfrm_state *, struct sk_buff *);
1: +  int (*xmit)(struct xfrm_state *, struct sk_buff *, netdev_features_t);
1:  };
1:  
1:  enum {
1: -	VETH_INFO_UNSPEC = 0,
1: -	VETH_INFO_PEER = 1,
1: -	__VETH_INFO_MAX = 2,
1: +  VETH_INFO_UNSPEC = 0,
1: +  VETH_INFO_PEER = 1,
1: +  __VETH_INFO_MAX = 2,
1:  };
1:  
1:  struct veth_stats {
1: -	u64 rx_drops;
1: -	u64 xdp_packets;
1: -	u64 xdp_bytes;
1: -	u64 xdp_redirect;
1: -	u64 xdp_drops;
1: -	u64 xdp_tx;
1: -	u64 xdp_tx_err;
1: -	u64 peer_tq_xdp_xmit;
1: -	u64 peer_tq_xdp_xmit_err;
1: +  u64 rx_drops;
1: +  u64 xdp_packets;
1: +  u64 xdp_bytes;
1: +  u64 xdp_redirect;
1: +  u64 xdp_drops;
1: +  u64 xdp_tx;
1: +  u64 xdp_tx_err;
1: +  u64 peer_tq_xdp_xmit;
1: +  u64 peer_tq_xdp_xmit_err;
1:  };
1:  
1:  struct veth_rq_stats {
1: -	struct veth_stats vs;
1: -	struct u64_stats_sync syncp;
1: +  struct veth_stats vs;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct veth_rq {
1: -	struct napi_struct xdp_napi;
1: -	struct net_device *dev;
1: -	struct bpf_prog *xdp_prog;
1: -	struct xdp_mem_info xdp_mem;
1: -	struct veth_rq_stats stats;
1: -	bool rx_notify_masked;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	struct ptr_ring xdp_ring;
1: -	struct xdp_rxq_info xdp_rxq;
1: +  struct napi_struct xdp_napi;
1: +  struct net_device *dev;
1: +  struct bpf_prog *xdp_prog;
1: +  struct xdp_mem_info xdp_mem;
1: +  struct veth_rq_stats stats;
1: +  bool rx_notify_masked;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  struct ptr_ring xdp_ring;
1: +  struct xdp_rxq_info xdp_rxq;
1:  };
1:  
1:  struct veth_priv {
1: -	struct net_device *peer;
1: -	atomic64_t dropped;
1: -	struct bpf_prog *_xdp_prog;
1: -	struct veth_rq *rq;
1: -	unsigned int requested_headroom;
1: +  struct net_device *peer;
1: +  atomic64_t dropped;
1: +  struct bpf_prog *_xdp_prog;
1: +  struct veth_rq *rq;
1: +  unsigned int requested_headroom;
1:  };
1:  
1:  struct veth_xdp_tx_bq {
1: -	struct xdp_frame *q[16];
1: -	unsigned int count;
1: +  struct xdp_frame *q[16];
1: +  unsigned int count;
1:  };
1:  
1:  struct veth_q_stat_desc {
1: -	char desc[32];
1: -	size_t offset;
1: +  char desc[32];
1: +  size_t offset;
1:  };
1:  
1:  struct netdev_hw_addr {
1: -	struct list_head list;
1: -	unsigned char addr[32];
1: -	unsigned char type;
1: -	bool global_use;
1: -	int sync_cnt;
1: -	int refcount;
1: -	int synced;
1: -	struct callback_head callback_head;
1: +  struct list_head list;
1: +  unsigned char addr[32];
1: +  unsigned char type;
1: +  bool global_use;
1: +  int sync_cnt;
1: +  int refcount;
1: +  int synced;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct rx_queue_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct netdev_rx_queue *, char *);
1: -	ssize_t (*store)(struct netdev_rx_queue *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct netdev_rx_queue *, char *);
1: +  ssize_t (*store)(struct netdev_rx_queue *, const char *, size_t);
1:  };
1:  
1:  struct sd_flow_limit {
1: -	u64 count;
1: -	unsigned int num_buckets;
1: -	unsigned int history_head;
1: -	u16 history[128];
1: -	u8 buckets[0];
1: +  u64 count;
1: +  unsigned int num_buckets;
1: +  unsigned int history_head;
1: +  u16 history[128];
1: +  u8 buckets[0];
1:  };
1:  
1:  struct softnet_data {
1: -	struct list_head poll_list;
1: -	struct sk_buff_head process_queue;
1: -	unsigned int processed;
1: -	unsigned int time_squeeze;
1: -	unsigned int received_rps;
1: -	struct softnet_data *rps_ipi_list;
1: -	struct sd_flow_limit *flow_limit;
1: -	struct Qdisc *output_queue;
1: -	struct Qdisc **output_queue_tailp;
1: -	struct sk_buff *completion_queue;
1: -	struct {
1: -		u16 recursion;
1: -		u8 more;
1: -	} xmit;
1: -	int: 32;
1: -	unsigned int input_queue_head;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	call_single_data_t csd;
1: -	struct softnet_data *rps_ipi_next;
1: -	unsigned int cpu;
1: -	unsigned int input_queue_tail;
1: -	unsigned int dropped;
1: -	struct sk_buff_head input_pkt_queue;
1: -	struct napi_struct backlog;
1: -	long: 64;
1: -	long: 64;
1: +  struct list_head poll_list;
1: +  struct sk_buff_head process_queue;
1: +  unsigned int processed;
1: +  unsigned int time_squeeze;
1: +  unsigned int received_rps;
1: +  struct softnet_data *rps_ipi_list;
1: +  struct sd_flow_limit *flow_limit;
1: +  struct Qdisc *output_queue;
1: +  struct Qdisc **output_queue_tailp;
1: +  struct sk_buff *completion_queue;
1: +  struct {
1: +    u16 recursion;
1: +    u8 more;
1: +  } xmit;
1: +  int : 32;
1: +  unsigned int input_queue_head;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  call_single_data_t csd;
1: +  struct softnet_data *rps_ipi_next;
1: +  unsigned int cpu;
1: +  unsigned int input_queue_tail;
1: +  unsigned int dropped;
1: +  struct sk_buff_head input_pkt_queue;
1: +  struct napi_struct backlog;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct virtio_net_config {
1: -	__u8 mac[6];
1: -	__virtio16 status;
1: -	__virtio16 max_virtqueue_pairs;
1: -	__virtio16 mtu;
1: -	__le32 speed;
1: -	__u8 duplex;
1: -	__u8 rss_max_key_size;
1: -	__le16 rss_max_indirection_table_length;
1: -	__le32 supported_hash_types;
1: +  __u8 mac[6];
1: +  __virtio16 status;
1: +  __virtio16 max_virtqueue_pairs;
1: +  __virtio16 mtu;
1: +  __le32 speed;
1: +  __u8 duplex;
1: +  __u8 rss_max_key_size;
1: +  __le16 rss_max_indirection_table_length;
1: +  __le32 supported_hash_types;
1:  };
1:  
1:  struct virtio_net_hdr_mrg_rxbuf {
1: -	struct virtio_net_hdr hdr;
1: -	__virtio16 num_buffers;
1: +  struct virtio_net_hdr hdr;
1: +  __virtio16 num_buffers;
1:  };
1:  
1:  struct virtio_net_ctrl_hdr {
1: -	__u8 class;
1: -	__u8 cmd;
1: +  __u8 class;
1: +  __u8 cmd;
1:  };
1:  
1:  typedef __u8 virtio_net_ctrl_ack;
1:  
1:  struct virtio_net_ctrl_mac {
1: -	__virtio32 entries;
1: -	__u8 macs[0];
1: +  __virtio32 entries;
1: +  __u8 macs[0];
1:  };
1:  
1:  struct virtio_net_ctrl_mq {
1: -	__virtio16 virtqueue_pairs;
1: +  __virtio16 virtqueue_pairs;
1:  };
1:  
1:  struct failover_ops {
1: -	int (*slave_pre_register)(struct net_device *, struct net_device *);
1: -	int (*slave_register)(struct net_device *, struct net_device *);
1: -	int (*slave_pre_unregister)(struct net_device *, struct net_device *);
1: -	int (*slave_unregister)(struct net_device *, struct net_device *);
1: -	int (*slave_link_change)(struct net_device *, struct net_device *);
1: -	int (*slave_name_change)(struct net_device *, struct net_device *);
1: -	rx_handler_result_t (*slave_handle_frame)(struct sk_buff **);
1: +  int (*slave_pre_register)(struct net_device *, struct net_device *);
1: +  int (*slave_register)(struct net_device *, struct net_device *);
1: +  int (*slave_pre_unregister)(struct net_device *, struct net_device *);
1: +  int (*slave_unregister)(struct net_device *, struct net_device *);
1: +  int (*slave_link_change)(struct net_device *, struct net_device *);
1: +  int (*slave_name_change)(struct net_device *, struct net_device *);
1: +  rx_handler_result_t (*slave_handle_frame)(struct sk_buff **);
1:  };
1:  
1:  struct failover {
1: -	struct list_head list;
1: -	struct net_device *failover_dev;
1: -	struct failover_ops *ops;
1: +  struct list_head list;
1: +  struct net_device *failover_dev;
1: +  struct failover_ops *ops;
1:  };
1:  
1:  struct ewma_pkt_len {
1: -	long unsigned int internal;
1: +  long unsigned int internal;
1:  };
1:  
1:  struct virtnet_stat_desc {
1: -	char desc[32];
1: -	size_t offset;
1: +  char desc[32];
1: +  size_t offset;
1:  };
1:  
1:  struct virtnet_sq_stats {
1: -	struct u64_stats_sync syncp;
1: -	u64 packets;
1: -	u64 bytes;
1: -	u64 xdp_tx;
1: -	u64 xdp_tx_drops;
1: -	u64 kicks;
1: +  struct u64_stats_sync syncp;
1: +  u64 packets;
1: +  u64 bytes;
1: +  u64 xdp_tx;
1: +  u64 xdp_tx_drops;
1: +  u64 kicks;
1:  };
1:  
1:  struct virtnet_rq_stats {
1: -	struct u64_stats_sync syncp;
1: -	u64 packets;
1: -	u64 bytes;
1: -	u64 drops;
1: -	u64 xdp_packets;
1: -	u64 xdp_tx;
1: -	u64 xdp_redirects;
1: -	u64 xdp_drops;
1: -	u64 kicks;
1: +  struct u64_stats_sync syncp;
1: +  u64 packets;
1: +  u64 bytes;
1: +  u64 drops;
1: +  u64 xdp_packets;
1: +  u64 xdp_tx;
1: +  u64 xdp_redirects;
1: +  u64 xdp_drops;
1: +  u64 kicks;
1:  };
1:  
1:  struct send_queue {
1: -	struct virtqueue *vq;
1: -	struct scatterlist sg[19];
1: -	char name[40];
1: -	struct virtnet_sq_stats stats;
1: -	struct napi_struct napi;
1: +  struct virtqueue *vq;
1: +  struct scatterlist sg[19];
1: +  char name[40];
1: +  struct virtnet_sq_stats stats;
1: +  struct napi_struct napi;
1:  };
1:  
1:  struct receive_queue {
1: -	struct virtqueue *vq;
1: -	struct napi_struct napi;
1: -	struct bpf_prog *xdp_prog;
1: -	struct virtnet_rq_stats stats;
1: -	struct page *pages;
1: -	struct ewma_pkt_len mrg_avg_pkt_len;
1: -	struct page_frag alloc_frag;
1: -	struct scatterlist sg[19];
1: -	unsigned int min_buf_len;
1: -	char name[40];
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct xdp_rxq_info xdp_rxq;
1: +  struct virtqueue *vq;
1: +  struct napi_struct napi;
1: +  struct bpf_prog *xdp_prog;
1: +  struct virtnet_rq_stats stats;
1: +  struct page *pages;
1: +  struct ewma_pkt_len mrg_avg_pkt_len;
1: +  struct page_frag alloc_frag;
1: +  struct scatterlist sg[19];
1: +  unsigned int min_buf_len;
1: +  char name[40];
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct xdp_rxq_info xdp_rxq;
1:  };
1:  
1:  struct control_buf {
1: -	struct virtio_net_ctrl_hdr hdr;
1: -	virtio_net_ctrl_ack status;
1: -	struct virtio_net_ctrl_mq mq;
1: -	u8 promisc;
1: -	u8 allmulti;
1: -	__virtio16 vid;
1: -	__virtio64 offloads;
1: +  struct virtio_net_ctrl_hdr hdr;
1: +  virtio_net_ctrl_ack status;
1: +  struct virtio_net_ctrl_mq mq;
1: +  u8 promisc;
1: +  u8 allmulti;
1: +  __virtio16 vid;
1: +  __virtio64 offloads;
1:  };
1:  
1:  struct virtnet_info {
1: -	struct virtio_device *vdev;
1: -	struct virtqueue *cvq;
1: -	struct net_device *dev;
1: -	struct send_queue *sq;
1: -	struct receive_queue *rq;
1: -	unsigned int status;
1: -	u16 max_queue_pairs;
1: -	u16 curr_queue_pairs;
1: -	u16 xdp_queue_pairs;
1: -	bool big_packets;
1: -	bool mergeable_rx_bufs;
1: -	bool has_cvq;
1: -	bool any_header_sg;
1: -	u8 hdr_len;
1: -	struct delayed_work refill;
1: -	struct work_struct config_work;
1: -	bool affinity_hint_set;
1: -	struct hlist_node node;
1: -	struct hlist_node node_dead;
1: -	struct control_buf *ctrl;
1: -	u8 duplex;
1: -	u32 speed;
1: -	long unsigned int guest_offloads;
1: -	long unsigned int guest_offloads_capable;
1: -	struct failover *failover;
1: +  struct virtio_device *vdev;
1: +  struct virtqueue *cvq;
1: +  struct net_device *dev;
1: +  struct send_queue *sq;
1: +  struct receive_queue *rq;
1: +  unsigned int status;
1: +  u16 max_queue_pairs;
1: +  u16 curr_queue_pairs;
1: +  u16 xdp_queue_pairs;
1: +  bool big_packets;
1: +  bool mergeable_rx_bufs;
1: +  bool has_cvq;
1: +  bool any_header_sg;
1: +  u8 hdr_len;
1: +  struct delayed_work refill;
1: +  struct work_struct config_work;
1: +  bool affinity_hint_set;
1: +  struct hlist_node node;
1: +  struct hlist_node node_dead;
1: +  struct control_buf *ctrl;
1: +  u8 duplex;
1: +  u32 speed;
1: +  long unsigned int guest_offloads;
1: +  long unsigned int guest_offloads_capable;
1: +  struct failover *failover;
1:  };
1:  
1:  struct icmpv6_echo {
1: -	__be16 identifier;
1: -	__be16 sequence;
1: +  __be16 identifier;
1: +  __be16 sequence;
1:  };
1:  
1:  struct icmpv6_nd_advt {
1: -	__u32 reserved: 5;
1: -	__u32 override: 1;
1: -	__u32 solicited: 1;
1: -	__u32 router: 1;
1: -	__u32 reserved2: 24;
1: +  __u32 reserved : 5;
1: +  __u32 override : 1;
1: +  __u32 solicited : 1;
1: +  __u32 router : 1;
1: +  __u32 reserved2 : 24;
1:  };
1:  
1:  struct icmpv6_nd_ra {
1: -	__u8 hop_limit;
1: -	__u8 reserved: 3;
1: -	__u8 router_pref: 2;
1: -	__u8 home_agent: 1;
1: -	__u8 other: 1;
1: -	__u8 managed: 1;
1: -	__be16 rt_lifetime;
1: +  __u8 hop_limit;
1: +  __u8 reserved : 3;
1: +  __u8 router_pref : 2;
1: +  __u8 home_agent : 1;
1: +  __u8 other : 1;
1: +  __u8 managed : 1;
1: +  __be16 rt_lifetime;
1:  };
1:  
1:  struct icmp6hdr {
1: -	__u8 icmp6_type;
1: -	__u8 icmp6_code;
1: -	__sum16 icmp6_cksum;
1: -	union {
1: -		__be32 un_data32[1];
1: -		__be16 un_data16[2];
1: -		__u8 un_data8[4];
1: -		struct icmpv6_echo u_echo;
1: -		struct icmpv6_nd_advt u_nd_advt;
1: -		struct icmpv6_nd_ra u_nd_ra;
1: -	} icmp6_dataun;
1: +  __u8 icmp6_type;
1: +  __u8 icmp6_code;
1: +  __sum16 icmp6_cksum;
1: +  union {
1: +    __be32 un_data32[1];
1: +    __be16 un_data16[2];
1: +    __u8 un_data8[4];
1: +    struct icmpv6_echo u_echo;
1: +    struct icmpv6_nd_advt u_nd_advt;
1: +    struct icmpv6_nd_ra u_nd_ra;
1: +  } icmp6_dataun;
1:  };
1:  
1:  struct ip_mreqn {
1: -	struct in_addr imr_multiaddr;
1: -	struct in_addr imr_address;
1: -	int imr_ifindex;
1: -};
1: -
1: -enum {
1: -	NDA_UNSPEC = 0,
1: -	NDA_DST = 1,
1: -	NDA_LLADDR = 2,
1: -	NDA_CACHEINFO = 3,
1: -	NDA_PROBES = 4,
1: -	NDA_VLAN = 5,
1: -	NDA_PORT = 6,
1: -	NDA_VNI = 7,
1: -	NDA_IFINDEX = 8,
1: -	NDA_MASTER = 9,
1: -	NDA_LINK_NETNSID = 10,
1: -	NDA_SRC_VNI = 11,
1: -	NDA_PROTOCOL = 12,
1: -	NDA_NH_ID = 13,
1: -	NDA_FDB_EXT_ATTRS = 14,
1: -	__NDA_MAX = 15,
1: +  struct in_addr imr_multiaddr;
1: +  struct in_addr imr_address;
1: +  int imr_ifindex;
1: +};
1: +
1: +enum {
1: +  NDA_UNSPEC = 0,
1: +  NDA_DST = 1,
1: +  NDA_LLADDR = 2,
1: +  NDA_CACHEINFO = 3,
1: +  NDA_PROBES = 4,
1: +  NDA_VLAN = 5,
1: +  NDA_PORT = 6,
1: +  NDA_VNI = 7,
1: +  NDA_IFINDEX = 8,
1: +  NDA_MASTER = 9,
1: +  NDA_LINK_NETNSID = 10,
1: +  NDA_SRC_VNI = 11,
1: +  NDA_PROTOCOL = 12,
1: +  NDA_NH_ID = 13,
1: +  NDA_FDB_EXT_ATTRS = 14,
1: +  __NDA_MAX = 15,
1:  };
1:  
1:  struct nda_cacheinfo {
1: -	__u32 ndm_confirmed;
1: -	__u32 ndm_used;
1: -	__u32 ndm_updated;
1: -	__u32 ndm_refcnt;
1: -};
1: -
1: -enum {
1: -	IFLA_VXLAN_UNSPEC = 0,
1: -	IFLA_VXLAN_ID = 1,
1: -	IFLA_VXLAN_GROUP = 2,
1: -	IFLA_VXLAN_LINK = 3,
1: -	IFLA_VXLAN_LOCAL = 4,
1: -	IFLA_VXLAN_TTL = 5,
1: -	IFLA_VXLAN_TOS = 6,
1: -	IFLA_VXLAN_LEARNING = 7,
1: -	IFLA_VXLAN_AGEING = 8,
1: -	IFLA_VXLAN_LIMIT = 9,
1: -	IFLA_VXLAN_PORT_RANGE = 10,
1: -	IFLA_VXLAN_PROXY = 11,
1: -	IFLA_VXLAN_RSC = 12,
1: -	IFLA_VXLAN_L2MISS = 13,
1: -	IFLA_VXLAN_L3MISS = 14,
1: -	IFLA_VXLAN_PORT = 15,
1: -	IFLA_VXLAN_GROUP6 = 16,
1: -	IFLA_VXLAN_LOCAL6 = 17,
1: -	IFLA_VXLAN_UDP_CSUM = 18,
1: -	IFLA_VXLAN_UDP_ZERO_CSUM6_TX = 19,
1: -	IFLA_VXLAN_UDP_ZERO_CSUM6_RX = 20,
1: -	IFLA_VXLAN_REMCSUM_TX = 21,
1: -	IFLA_VXLAN_REMCSUM_RX = 22,
1: -	IFLA_VXLAN_GBP = 23,
1: -	IFLA_VXLAN_REMCSUM_NOPARTIAL = 24,
1: -	IFLA_VXLAN_COLLECT_METADATA = 25,
1: -	IFLA_VXLAN_LABEL = 26,
1: -	IFLA_VXLAN_GPE = 27,
1: -	IFLA_VXLAN_TTL_INHERIT = 28,
1: -	IFLA_VXLAN_DF = 29,
1: -	__IFLA_VXLAN_MAX = 30,
1: +  __u32 ndm_confirmed;
1: +  __u32 ndm_used;
1: +  __u32 ndm_updated;
1: +  __u32 ndm_refcnt;
1: +};
1: +
1: +enum {
1: +  IFLA_VXLAN_UNSPEC = 0,
1: +  IFLA_VXLAN_ID = 1,
1: +  IFLA_VXLAN_GROUP = 2,
1: +  IFLA_VXLAN_LINK = 3,
1: +  IFLA_VXLAN_LOCAL = 4,
1: +  IFLA_VXLAN_TTL = 5,
1: +  IFLA_VXLAN_TOS = 6,
1: +  IFLA_VXLAN_LEARNING = 7,
1: +  IFLA_VXLAN_AGEING = 8,
1: +  IFLA_VXLAN_LIMIT = 9,
1: +  IFLA_VXLAN_PORT_RANGE = 10,
1: +  IFLA_VXLAN_PROXY = 11,
1: +  IFLA_VXLAN_RSC = 12,
1: +  IFLA_VXLAN_L2MISS = 13,
1: +  IFLA_VXLAN_L3MISS = 14,
1: +  IFLA_VXLAN_PORT = 15,
1: +  IFLA_VXLAN_GROUP6 = 16,
1: +  IFLA_VXLAN_LOCAL6 = 17,
1: +  IFLA_VXLAN_UDP_CSUM = 18,
1: +  IFLA_VXLAN_UDP_ZERO_CSUM6_TX = 19,
1: +  IFLA_VXLAN_UDP_ZERO_CSUM6_RX = 20,
1: +  IFLA_VXLAN_REMCSUM_TX = 21,
1: +  IFLA_VXLAN_REMCSUM_RX = 22,
1: +  IFLA_VXLAN_GBP = 23,
1: +  IFLA_VXLAN_REMCSUM_NOPARTIAL = 24,
1: +  IFLA_VXLAN_COLLECT_METADATA = 25,
1: +  IFLA_VXLAN_LABEL = 26,
1: +  IFLA_VXLAN_GPE = 27,
1: +  IFLA_VXLAN_TTL_INHERIT = 28,
1: +  IFLA_VXLAN_DF = 29,
1: +  __IFLA_VXLAN_MAX = 30,
1:  };
1:  
1:  struct ifla_vxlan_port_range {
1: -	__be16 low;
1: -	__be16 high;
1: +  __be16 low;
1: +  __be16 high;
1:  };
1:  
1:  enum ifla_vxlan_df {
1: -	VXLAN_DF_UNSET = 0,
1: -	VXLAN_DF_SET = 1,
1: -	VXLAN_DF_INHERIT = 2,
1: -	__VXLAN_DF_END = 3,
1: -	VXLAN_DF_MAX = 2,
1: +  VXLAN_DF_UNSET = 0,
1: +  VXLAN_DF_SET = 1,
1: +  VXLAN_DF_INHERIT = 2,
1: +  __VXLAN_DF_END = 3,
1: +  VXLAN_DF_MAX = 2,
1:  };
1:  
1:  struct udp_tunnel_info {
1: -	short unsigned int type;
1: -	sa_family_t sa_family;
1: -	__be16 port;
1: -	u8 hw_priv;
1: +  short unsigned int type;
1: +  sa_family_t sa_family;
1: +  __be16 port;
1: +  u8 hw_priv;
1:  };
1:  
1:  struct napi_gro_cb {
1: -	void *frag0;
1: -	unsigned int frag0_len;
1: -	int data_offset;
1: -	u16 flush;
1: -	u16 flush_id;
1: -	u16 count;
1: -	u16 gro_remcsum_start;
1: -	long unsigned int age;
1: -	u16 proto;
1: -	u8 same_flow: 1;
1: -	u8 encap_mark: 1;
1: -	u8 csum_valid: 1;
1: -	u8 csum_cnt: 3;
1: -	u8 free: 2;
1: -	u8 is_ipv6: 1;
1: -	u8 is_fou: 1;
1: -	u8 is_atomic: 1;
1: -	u8 recursion_counter: 4;
1: -	u8 is_flist: 1;
1: -	__wsum csum;
1: -	struct sk_buff *last;
1: -};
1: -
1: -typedef struct sk_buff * (*gro_receive_t)(struct list_head *, struct sk_buff *);
1: +  void *frag0;
1: +  unsigned int frag0_len;
1: +  int data_offset;
1: +  u16 flush;
1: +  u16 flush_id;
1: +  u16 count;
1: +  u16 gro_remcsum_start;
1: +  long unsigned int age;
1: +  u16 proto;
1: +  u8 same_flow : 1;
1: +  u8 encap_mark : 1;
1: +  u8 csum_valid : 1;
1: +  u8 csum_cnt : 3;
1: +  u8 free : 2;
1: +  u8 is_ipv6 : 1;
1: +  u8 is_fou : 1;
1: +  u8 is_atomic : 1;
1: +  u8 recursion_counter : 4;
1: +  u8 is_flist : 1;
1: +  __wsum csum;
1: +  struct sk_buff *last;
1: +};
1: +
1: +typedef struct sk_buff *(*gro_receive_t)(struct list_head *, struct sk_buff *);
1:  
1:  struct gro_remcsum {
1: -	int offset;
1: -	__wsum delta;
1: +  int offset;
1: +  __wsum delta;
1:  };
1:  
1:  enum {
1: -	RTN_UNSPEC = 0,
1: -	RTN_UNICAST = 1,
1: -	RTN_LOCAL = 2,
1: -	RTN_BROADCAST = 3,
1: -	RTN_ANYCAST = 4,
1: -	RTN_MULTICAST = 5,
1: -	RTN_BLACKHOLE = 6,
1: -	RTN_UNREACHABLE = 7,
1: -	RTN_PROHIBIT = 8,
1: -	RTN_THROW = 9,
1: -	RTN_NAT = 10,
1: -	RTN_XRESOLVE = 11,
1: -	__RTN_MAX = 12,
1: +  RTN_UNSPEC = 0,
1: +  RTN_UNICAST = 1,
1: +  RTN_LOCAL = 2,
1: +  RTN_BROADCAST = 3,
1: +  RTN_ANYCAST = 4,
1: +  RTN_MULTICAST = 5,
1: +  RTN_BLACKHOLE = 6,
1: +  RTN_UNREACHABLE = 7,
1: +  RTN_PROHIBIT = 8,
1: +  RTN_THROW = 9,
1: +  RTN_NAT = 10,
1: +  RTN_XRESOLVE = 11,
1: +  __RTN_MAX = 12,
1:  };
1:  
1:  enum rtnetlink_groups {
1: -	RTNLGRP_NONE = 0,
1: -	RTNLGRP_LINK = 1,
1: -	RTNLGRP_NOTIFY = 2,
1: -	RTNLGRP_NEIGH = 3,
1: -	RTNLGRP_TC = 4,
1: -	RTNLGRP_IPV4_IFADDR = 5,
1: -	RTNLGRP_IPV4_MROUTE = 6,
1: -	RTNLGRP_IPV4_ROUTE = 7,
1: -	RTNLGRP_IPV4_RULE = 8,
1: -	RTNLGRP_IPV6_IFADDR = 9,
1: -	RTNLGRP_IPV6_MROUTE = 10,
1: -	RTNLGRP_IPV6_ROUTE = 11,
1: -	RTNLGRP_IPV6_IFINFO = 12,
1: -	RTNLGRP_DECnet_IFADDR = 13,
1: -	RTNLGRP_NOP2 = 14,
1: -	RTNLGRP_DECnet_ROUTE = 15,
1: -	RTNLGRP_DECnet_RULE = 16,
1: -	RTNLGRP_NOP4 = 17,
1: -	RTNLGRP_IPV6_PREFIX = 18,
1: -	RTNLGRP_IPV6_RULE = 19,
1: -	RTNLGRP_ND_USEROPT = 20,
1: -	RTNLGRP_PHONET_IFADDR = 21,
1: -	RTNLGRP_PHONET_ROUTE = 22,
1: -	RTNLGRP_DCB = 23,
1: -	RTNLGRP_IPV4_NETCONF = 24,
1: -	RTNLGRP_IPV6_NETCONF = 25,
1: -	RTNLGRP_MDB = 26,
1: -	RTNLGRP_MPLS_ROUTE = 27,
1: -	RTNLGRP_NSID = 28,
1: -	RTNLGRP_MPLS_NETCONF = 29,
1: -	RTNLGRP_IPV4_MROUTE_R = 30,
1: -	RTNLGRP_IPV6_MROUTE_R = 31,
1: -	RTNLGRP_NEXTHOP = 32,
1: -	RTNLGRP_BRVLAN = 33,
1: -	__RTNLGRP_MAX = 34,
1: +  RTNLGRP_NONE = 0,
1: +  RTNLGRP_LINK = 1,
1: +  RTNLGRP_NOTIFY = 2,
1: +  RTNLGRP_NEIGH = 3,
1: +  RTNLGRP_TC = 4,
1: +  RTNLGRP_IPV4_IFADDR = 5,
1: +  RTNLGRP_IPV4_MROUTE = 6,
1: +  RTNLGRP_IPV4_ROUTE = 7,
1: +  RTNLGRP_IPV4_RULE = 8,
1: +  RTNLGRP_IPV6_IFADDR = 9,
1: +  RTNLGRP_IPV6_MROUTE = 10,
1: +  RTNLGRP_IPV6_ROUTE = 11,
1: +  RTNLGRP_IPV6_IFINFO = 12,
1: +  RTNLGRP_DECnet_IFADDR = 13,
1: +  RTNLGRP_NOP2 = 14,
1: +  RTNLGRP_DECnet_ROUTE = 15,
1: +  RTNLGRP_DECnet_RULE = 16,
1: +  RTNLGRP_NOP4 = 17,
1: +  RTNLGRP_IPV6_PREFIX = 18,
1: +  RTNLGRP_IPV6_RULE = 19,
1: +  RTNLGRP_ND_USEROPT = 20,
1: +  RTNLGRP_PHONET_IFADDR = 21,
1: +  RTNLGRP_PHONET_ROUTE = 22,
1: +  RTNLGRP_DCB = 23,
1: +  RTNLGRP_IPV4_NETCONF = 24,
1: +  RTNLGRP_IPV6_NETCONF = 25,
1: +  RTNLGRP_MDB = 26,
1: +  RTNLGRP_MPLS_ROUTE = 27,
1: +  RTNLGRP_NSID = 28,
1: +  RTNLGRP_MPLS_NETCONF = 29,
1: +  RTNLGRP_IPV4_MROUTE_R = 30,
1: +  RTNLGRP_IPV6_MROUTE_R = 31,
1: +  RTNLGRP_NEXTHOP = 32,
1: +  RTNLGRP_BRVLAN = 33,
1: +  __RTNLGRP_MAX = 34,
1:  };
1:  
1:  struct vlan_hdr {
1: -	__be16 h_vlan_TCI;
1: -	__be16 h_vlan_encapsulated_proto;
1: +  __be16 h_vlan_TCI;
1: +  __be16 h_vlan_encapsulated_proto;
1:  };
1:  
1:  struct nl_info {
1: -	struct nlmsghdr *nlh;
1: -	struct net *nl_net;
1: -	u32 portid;
1: -	u8 skip_notify: 1;
1: -	u8 skip_notify_kernel: 1;
1: +  struct nlmsghdr *nlh;
1: +  struct net *nl_net;
1: +  u32 portid;
1: +  u8 skip_notify : 1;
1: +  u8 skip_notify_kernel : 1;
1:  };
1:  
1:  struct ip_tunnel_key {
1: -	__be64 tun_id;
1: -	union {
1: -		struct {
1: -			__be32 src;
1: -			__be32 dst;
1: -		} ipv4;
1: -		struct {
1: -			struct in6_addr src;
1: -			struct in6_addr dst;
1: -		} ipv6;
1: -	} u;
1: -	__be16 tun_flags;
1: -	u8 tos;
1: -	u8 ttl;
1: -	__be32 label;
1: -	__be16 tp_src;
1: -	__be16 tp_dst;
1: +  __be64 tun_id;
1: +  union {
1: +    struct {
1: +      __be32 src;
1: +      __be32 dst;
1: +    } ipv4;
1: +    struct {
1: +      struct in6_addr src;
1: +      struct in6_addr dst;
1: +    } ipv6;
1: +  } u;
1: +  __be16 tun_flags;
1: +  u8 tos;
1: +  u8 ttl;
1: +  __be32 label;
1: +  __be16 tp_src;
1: +  __be16 tp_dst;
1:  };
1:  
1:  struct dst_cache_pcpu;
1:  
1:  struct dst_cache {
1: -	struct dst_cache_pcpu *cache;
1: -	long unsigned int reset_ts;
1: +  struct dst_cache_pcpu *cache;
1: +  long unsigned int reset_ts;
1:  };
1:  
1:  struct ip_tunnel_info {
1: -	struct ip_tunnel_key key;
1: -	struct dst_cache dst_cache;
1: -	u8 options_len;
1: -	u8 mode;
1: +  struct ip_tunnel_key key;
1: +  struct dst_cache dst_cache;
1: +  u8 options_len;
1: +  u8 mode;
1:  };
1:  
1:  struct udp_hslot;
1:  
1:  struct udp_table {
1: -	struct udp_hslot *hash;
1: -	struct udp_hslot *hash2;
1: -	unsigned int mask;
1: -	unsigned int log;
1: +  struct udp_hslot *hash;
1: +  struct udp_hslot *hash2;
1: +  unsigned int mask;
1: +  unsigned int log;
1:  };
1:  
1:  struct ip_sf_socklist;
1:  
1:  struct ip_mc_socklist {
1: -	struct ip_mc_socklist *next_rcu;
1: -	struct ip_mreqn multi;
1: -	unsigned int sfmode;
1: -	struct ip_sf_socklist *sflist;
1: -	struct callback_head rcu;
1: +  struct ip_mc_socklist *next_rcu;
1: +  struct ip_mreqn multi;
1: +  unsigned int sfmode;
1: +  struct ip_sf_socklist *sflist;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ip_sf_socklist {
1: -	unsigned int sl_max;
1: -	unsigned int sl_count;
1: -	struct callback_head rcu;
1: -	__be32 sl_addr[0];
1: +  unsigned int sl_max;
1: +  unsigned int sl_count;
1: +  struct callback_head rcu;
1: +  __be32 sl_addr[0];
1:  };
1:  
1:  struct arphdr {
1: -	__be16 ar_hrd;
1: -	__be16 ar_pro;
1: -	unsigned char ar_hln;
1: -	unsigned char ar_pln;
1: -	__be16 ar_op;
1: +  __be16 ar_hrd;
1: +  __be16 ar_pro;
1: +  unsigned char ar_hln;
1: +  unsigned char ar_pln;
1: +  __be16 ar_op;
1:  };
1:  
1:  struct fib6_result;
1: @@ -93606,149 +94710,159 @@ struct fib6_result;
1:  struct fib6_config;
1:  
1:  struct ipv6_stub {
1: -	int (*ipv6_sock_mc_join)(struct sock *, int, const struct in6_addr *);
1: -	int (*ipv6_sock_mc_drop)(struct sock *, int, const struct in6_addr *);
1: -	struct dst_entry * (*ipv6_dst_lookup_flow)(struct net *, const struct sock *, struct flowi6 *, const struct in6_addr *);
1: -	int (*ipv6_route_input)(struct sk_buff *);
1: -	struct fib6_table * (*fib6_get_table)(struct net *, u32);
1: -	int (*fib6_lookup)(struct net *, int, struct flowi6 *, struct fib6_result *, int);
1: -	int (*fib6_table_lookup)(struct net *, struct fib6_table *, int, struct flowi6 *, struct fib6_result *, int);
1: -	void (*fib6_select_path)(const struct net *, struct fib6_result *, struct flowi6 *, int, bool, const struct sk_buff *, int);
1: -	u32 (*ip6_mtu_from_fib6)(const struct fib6_result *, const struct in6_addr *, const struct in6_addr *);
1: -	int (*fib6_nh_init)(struct net *, struct fib6_nh *, struct fib6_config *, gfp_t, struct netlink_ext_ack *);
1: -	void (*fib6_nh_release)(struct fib6_nh *);
1: -	void (*fib6_update_sernum)(struct net *, struct fib6_info *);
1: -	int (*ip6_del_rt)(struct net *, struct fib6_info *, bool);
1: -	void (*fib6_rt_update)(struct net *, struct fib6_info *, struct nl_info *);
1: -	void (*udpv6_encap_enable)();
1: -	void (*ndisc_send_na)(struct net_device *, const struct in6_addr *, const struct in6_addr *, bool, bool, bool, bool);
1: -	void (*xfrm6_local_rxpmtu)(struct sk_buff *, u32);
1: -	int (*xfrm6_udp_encap_rcv)(struct sock *, struct sk_buff *);
1: -	int (*xfrm6_rcv_encap)(struct sk_buff *, int, __be32, int);
1: -	struct neigh_table *nd_tbl;
1: -	int (*ipv6_fragment)(struct net *, struct sock *, struct sk_buff *, int (*)(struct net *, struct sock *, struct sk_buff *));
1: +  int (*ipv6_sock_mc_join)(struct sock *, int, const struct in6_addr *);
1: +  int (*ipv6_sock_mc_drop)(struct sock *, int, const struct in6_addr *);
1: +  struct dst_entry *(*ipv6_dst_lookup_flow)(struct net *, const struct sock *,
1: +                                            struct flowi6 *,
1: +                                            const struct in6_addr *);
1: +  int (*ipv6_route_input)(struct sk_buff *);
1: +  struct fib6_table *(*fib6_get_table)(struct net *, u32);
1: +  int (*fib6_lookup)(struct net *, int, struct flowi6 *, struct fib6_result *,
1: +                     int);
1: +  int (*fib6_table_lookup)(struct net *, struct fib6_table *, int,
1: +                           struct flowi6 *, struct fib6_result *, int);
1: +  void (*fib6_select_path)(const struct net *, struct fib6_result *,
1: +                           struct flowi6 *, int, bool, const struct sk_buff *,
1: +                           int);
1: +  u32 (*ip6_mtu_from_fib6)(const struct fib6_result *, const struct in6_addr *,
1: +                           const struct in6_addr *);
1: +  int (*fib6_nh_init)(struct net *, struct fib6_nh *, struct fib6_config *,
1: +                      gfp_t, struct netlink_ext_ack *);
1: +  void (*fib6_nh_release)(struct fib6_nh *);
1: +  void (*fib6_update_sernum)(struct net *, struct fib6_info *);
1: +  int (*ip6_del_rt)(struct net *, struct fib6_info *, bool);
1: +  void (*fib6_rt_update)(struct net *, struct fib6_info *, struct nl_info *);
1: +  void (*udpv6_encap_enable)();
1: +  void (*ndisc_send_na)(struct net_device *, const struct in6_addr *,
1: +                        const struct in6_addr *, bool, bool, bool, bool);
1: +  void (*xfrm6_local_rxpmtu)(struct sk_buff *, u32);
1: +  int (*xfrm6_udp_encap_rcv)(struct sock *, struct sk_buff *);
1: +  int (*xfrm6_rcv_encap)(struct sk_buff *, int, __be32, int);
1: +  struct neigh_table *nd_tbl;
1: +  int (*ipv6_fragment)(struct net *, struct sock *, struct sk_buff *,
1: +                       int (*)(struct net *, struct sock *, struct sk_buff *));
1:  };
1:  
1:  struct fib6_result {
1: -	struct fib6_nh *nh;
1: -	struct fib6_info *f6i;
1: -	u32 fib6_flags;
1: -	u8 fib6_type;
1: -	struct rt6_info *rt6;
1: +  struct fib6_nh *nh;
1: +  struct fib6_info *f6i;
1: +  u32 fib6_flags;
1: +  u8 fib6_type;
1: +  struct rt6_info *rt6;
1:  };
1:  
1:  struct fib6_config {
1: -	u32 fc_table;
1: -	u32 fc_metric;
1: -	int fc_dst_len;
1: -	int fc_src_len;
1: -	int fc_ifindex;
1: -	u32 fc_flags;
1: -	u32 fc_protocol;
1: -	u16 fc_type;
1: -	u16 fc_delete_all_nh: 1;
1: -	u16 fc_ignore_dev_down: 1;
1: -	u16 __unused: 14;
1: -	u32 fc_nh_id;
1: -	struct in6_addr fc_dst;
1: -	struct in6_addr fc_src;
1: -	struct in6_addr fc_prefsrc;
1: -	struct in6_addr fc_gateway;
1: -	long unsigned int fc_expires;
1: -	struct nlattr *fc_mx;
1: -	int fc_mx_len;
1: -	int fc_mp_len;
1: -	struct nlattr *fc_mp;
1: -	struct nl_info fc_nlinfo;
1: -	struct nlattr *fc_encap;
1: -	u16 fc_encap_type;
1: -	bool fc_is_fdb;
1: +  u32 fc_table;
1: +  u32 fc_metric;
1: +  int fc_dst_len;
1: +  int fc_src_len;
1: +  int fc_ifindex;
1: +  u32 fc_flags;
1: +  u32 fc_protocol;
1: +  u16 fc_type;
1: +  u16 fc_delete_all_nh : 1;
1: +  u16 fc_ignore_dev_down : 1;
1: +  u16 __unused : 14;
1: +  u32 fc_nh_id;
1: +  struct in6_addr fc_dst;
1: +  struct in6_addr fc_src;
1: +  struct in6_addr fc_prefsrc;
1: +  struct in6_addr fc_gateway;
1: +  long unsigned int fc_expires;
1: +  struct nlattr *fc_mx;
1: +  int fc_mx_len;
1: +  int fc_mp_len;
1: +  struct nlattr *fc_mp;
1: +  struct nl_info fc_nlinfo;
1: +  struct nlattr *fc_encap;
1: +  u16 fc_encap_type;
1: +  bool fc_is_fdb;
1:  };
1:  
1:  struct nd_msg {
1: -	struct icmp6hdr icmph;
1: -	struct in6_addr target;
1: -	__u8 opt[0];
1: +  struct icmp6hdr icmph;
1: +  struct in6_addr target;
1: +  __u8 opt[0];
1:  };
1:  
1:  enum {
1: -	INET_ECN_NOT_ECT = 0,
1: -	INET_ECN_ECT_1 = 1,
1: -	INET_ECN_ECT_0 = 2,
1: -	INET_ECN_CE = 3,
1: -	INET_ECN_MASK = 3,
1: +  INET_ECN_NOT_ECT = 0,
1: +  INET_ECN_ECT_1 = 1,
1: +  INET_ECN_ECT_0 = 2,
1: +  INET_ECN_CE = 3,
1: +  INET_ECN_MASK = 3,
1:  };
1:  
1:  struct gro_cell;
1:  
1:  struct gro_cells {
1: -	struct gro_cell *cells;
1: +  struct gro_cell *cells;
1:  };
1:  
1:  enum nexthop_event_type {
1: -	NEXTHOP_EVENT_DEL = 0,
1: -	NEXTHOP_EVENT_REPLACE = 1,
1: +  NEXTHOP_EVENT_DEL = 0,
1: +  NEXTHOP_EVENT_REPLACE = 1,
1:  };
1:  
1:  struct nh_notifier_single_info {
1: -	struct net_device *dev;
1: -	u8 gw_family;
1: -	union {
1: -		__be32 ipv4;
1: -		struct in6_addr ipv6;
1: -	};
1: -	u8 is_reject: 1;
1: -	u8 is_fdb: 1;
1: -	u8 has_encap: 1;
1: +  struct net_device *dev;
1: +  u8 gw_family;
1: +  union {
1: +    __be32 ipv4;
1: +    struct in6_addr ipv6;
1: +  };
1: +  u8 is_reject : 1;
1: +  u8 is_fdb : 1;
1: +  u8 has_encap : 1;
1:  };
1:  
1:  struct nh_notifier_grp_entry_info {
1: -	u8 weight;
1: -	u32 id;
1: -	struct nh_notifier_single_info nh;
1: +  u8 weight;
1: +  u32 id;
1: +  struct nh_notifier_single_info nh;
1:  };
1:  
1:  struct nh_notifier_grp_info {
1: -	u16 num_nh;
1: -	bool is_fdb;
1: -	struct nh_notifier_grp_entry_info nh_entries[0];
1: +  u16 num_nh;
1: +  bool is_fdb;
1: +  struct nh_notifier_grp_entry_info nh_entries[0];
1:  };
1:  
1:  struct nh_notifier_info {
1: -	struct net *net;
1: -	struct netlink_ext_ack *extack;
1: -	u32 id;
1: -	bool is_grp;
1: -	union {
1: -		struct nh_notifier_single_info *nh;
1: -		struct nh_notifier_grp_info *nh_grp;
1: -	};
1: +  struct net *net;
1: +  struct netlink_ext_ack *extack;
1: +  u32 id;
1: +  bool is_grp;
1: +  union {
1: +    struct nh_notifier_single_info *nh;
1: +    struct nh_notifier_grp_info *nh_grp;
1: +  };
1:  };
1:  
1:  struct udp_hslot {
1: -	struct hlist_head head;
1: -	int count;
1: -	spinlock_t lock;
1: -	long: 64;
1: +  struct hlist_head head;
1: +  int count;
1: +  spinlock_t lock;
1: +  long : 64;
1:  };
1:  
1:  struct udp_port_cfg {
1: -	u8 family;
1: -	union {
1: -		struct in_addr local_ip;
1: -		struct in6_addr local_ip6;
1: -	};
1: -	union {
1: -		struct in_addr peer_ip;
1: -		struct in6_addr peer_ip6;
1: -	};
1: -	__be16 local_udp_port;
1: -	__be16 peer_udp_port;
1: -	int bind_ifindex;
1: -	unsigned int use_udp_checksums: 1;
1: -	unsigned int use_udp6_tx_checksums: 1;
1: -	unsigned int use_udp6_rx_checksums: 1;
1: -	unsigned int ipv6_v6only: 1;
1: +  u8 family;
1: +  union {
1: +    struct in_addr local_ip;
1: +    struct in6_addr local_ip6;
1: +  };
1: +  union {
1: +    struct in_addr peer_ip;
1: +    struct in6_addr peer_ip6;
1: +  };
1: +  __be16 local_udp_port;
1: +  __be16 peer_udp_port;
1: +  int bind_ifindex;
1: +  unsigned int use_udp_checksums : 1;
1: +  unsigned int use_udp6_tx_checksums : 1;
1: +  unsigned int use_udp6_rx_checksums : 1;
1: +  unsigned int ipv6_v6only : 1;
1:  };
1:  
1:  typedef int (*udp_tunnel_encap_rcv_t)(struct sock *, struct sk_buff *);
1: @@ -93757,913 +94871,915 @@ typedef int (*udp_tunnel_encap_err_lookup_t)(struct sock *, struct sk_buff *);
1:  
1:  typedef void (*udp_tunnel_encap_destroy_t)(struct sock *);
1:  
1: -typedef struct sk_buff * (*udp_tunnel_gro_receive_t)(struct sock *, struct list_head *, struct sk_buff *);
1: +typedef struct sk_buff *(*udp_tunnel_gro_receive_t)(struct sock *,
1: +                                                    struct list_head *,
1: +                                                    struct sk_buff *);
1:  
1:  typedef int (*udp_tunnel_gro_complete_t)(struct sock *, struct sk_buff *, int);
1:  
1:  struct udp_tunnel_sock_cfg {
1: -	void *sk_user_data;
1: -	__u8 encap_type;
1: -	udp_tunnel_encap_rcv_t encap_rcv;
1: -	udp_tunnel_encap_err_lookup_t encap_err_lookup;
1: -	udp_tunnel_encap_destroy_t encap_destroy;
1: -	udp_tunnel_gro_receive_t gro_receive;
1: -	udp_tunnel_gro_complete_t gro_complete;
1: +  void *sk_user_data;
1: +  __u8 encap_type;
1: +  udp_tunnel_encap_rcv_t encap_rcv;
1: +  udp_tunnel_encap_err_lookup_t encap_err_lookup;
1: +  udp_tunnel_encap_destroy_t encap_destroy;
1: +  udp_tunnel_gro_receive_t gro_receive;
1: +  udp_tunnel_gro_complete_t gro_complete;
1:  };
1:  
1:  enum udp_parsable_tunnel_type {
1: -	UDP_TUNNEL_TYPE_VXLAN = 1,
1: -	UDP_TUNNEL_TYPE_GENEVE = 2,
1: -	UDP_TUNNEL_TYPE_VXLAN_GPE = 4,
1: +  UDP_TUNNEL_TYPE_VXLAN = 1,
1: +  UDP_TUNNEL_TYPE_GENEVE = 2,
1: +  UDP_TUNNEL_TYPE_VXLAN_GPE = 4,
1:  };
1:  
1:  struct udp_tunnel_nic_shared {
1: -	struct udp_tunnel_nic *udp_tunnel_nic_info;
1: -	struct list_head devices;
1: +  struct udp_tunnel_nic *udp_tunnel_nic_info;
1: +  struct list_head devices;
1:  };
1:  
1:  enum metadata_type {
1: -	METADATA_IP_TUNNEL = 0,
1: -	METADATA_HW_PORT_MUX = 1,
1: +  METADATA_IP_TUNNEL = 0,
1: +  METADATA_HW_PORT_MUX = 1,
1:  };
1:  
1:  struct hw_port_info {
1: -	struct net_device *lower_dev;
1: -	u32 port_id;
1: +  struct net_device *lower_dev;
1: +  u32 port_id;
1:  };
1:  
1:  struct metadata_dst {
1: -	struct dst_entry dst;
1: -	enum metadata_type type;
1: -	union {
1: -		struct ip_tunnel_info tun_info;
1: -		struct hw_port_info port_info;
1: -	} u;
1: +  struct dst_entry dst;
1: +  enum metadata_type type;
1: +  union {
1: +    struct ip_tunnel_info tun_info;
1: +    struct hw_port_info port_info;
1: +  } u;
1:  };
1:  
1:  enum switchdev_notifier_type {
1: -	SWITCHDEV_FDB_ADD_TO_BRIDGE = 1,
1: -	SWITCHDEV_FDB_DEL_TO_BRIDGE = 2,
1: -	SWITCHDEV_FDB_ADD_TO_DEVICE = 3,
1: -	SWITCHDEV_FDB_DEL_TO_DEVICE = 4,
1: -	SWITCHDEV_FDB_OFFLOADED = 5,
1: -	SWITCHDEV_FDB_FLUSH_TO_BRIDGE = 6,
1: -	SWITCHDEV_PORT_OBJ_ADD = 7,
1: -	SWITCHDEV_PORT_OBJ_DEL = 8,
1: -	SWITCHDEV_PORT_ATTR_SET = 9,
1: -	SWITCHDEV_VXLAN_FDB_ADD_TO_BRIDGE = 10,
1: -	SWITCHDEV_VXLAN_FDB_DEL_TO_BRIDGE = 11,
1: -	SWITCHDEV_VXLAN_FDB_ADD_TO_DEVICE = 12,
1: -	SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE = 13,
1: -	SWITCHDEV_VXLAN_FDB_OFFLOADED = 14,
1: +  SWITCHDEV_FDB_ADD_TO_BRIDGE = 1,
1: +  SWITCHDEV_FDB_DEL_TO_BRIDGE = 2,
1: +  SWITCHDEV_FDB_ADD_TO_DEVICE = 3,
1: +  SWITCHDEV_FDB_DEL_TO_DEVICE = 4,
1: +  SWITCHDEV_FDB_OFFLOADED = 5,
1: +  SWITCHDEV_FDB_FLUSH_TO_BRIDGE = 6,
1: +  SWITCHDEV_PORT_OBJ_ADD = 7,
1: +  SWITCHDEV_PORT_OBJ_DEL = 8,
1: +  SWITCHDEV_PORT_ATTR_SET = 9,
1: +  SWITCHDEV_VXLAN_FDB_ADD_TO_BRIDGE = 10,
1: +  SWITCHDEV_VXLAN_FDB_DEL_TO_BRIDGE = 11,
1: +  SWITCHDEV_VXLAN_FDB_ADD_TO_DEVICE = 12,
1: +  SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE = 13,
1: +  SWITCHDEV_VXLAN_FDB_OFFLOADED = 14,
1:  };
1:  
1:  struct switchdev_notifier_info {
1: -	struct net_device *dev;
1: -	struct netlink_ext_ack *extack;
1: +  struct net_device *dev;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct vxlanhdr {
1: -	__be32 vx_flags;
1: -	__be32 vx_vni;
1: +  __be32 vx_flags;
1: +  __be32 vx_vni;
1:  };
1:  
1:  struct vxlanhdr_gbp {
1: -	u8 vx_flags;
1: -	u8 reserved_flags1: 3;
1: -	u8 policy_applied: 1;
1: -	u8 reserved_flags2: 2;
1: -	u8 dont_learn: 1;
1: -	u8 reserved_flags3: 1;
1: -	__be16 policy_id;
1: -	__be32 vx_vni;
1: +  u8 vx_flags;
1: +  u8 reserved_flags1 : 3;
1: +  u8 policy_applied : 1;
1: +  u8 reserved_flags2 : 2;
1: +  u8 dont_learn : 1;
1: +  u8 reserved_flags3 : 1;
1: +  __be16 policy_id;
1: +  __be32 vx_vni;
1:  };
1:  
1:  struct vxlanhdr_gpe {
1: -	u8 oam_flag: 1;
1: -	u8 reserved_flags1: 1;
1: -	u8 np_applied: 1;
1: -	u8 instance_applied: 1;
1: -	u8 version: 2;
1: -	u8 reserved_flags2: 2;
1: -	u8 reserved_flags3;
1: -	u8 reserved_flags4;
1: -	u8 next_protocol;
1: -	__be32 vx_vni;
1: +  u8 oam_flag : 1;
1: +  u8 reserved_flags1 : 1;
1: +  u8 np_applied : 1;
1: +  u8 instance_applied : 1;
1: +  u8 version : 2;
1: +  u8 reserved_flags2 : 2;
1: +  u8 reserved_flags3;
1: +  u8 reserved_flags4;
1: +  u8 next_protocol;
1: +  __be32 vx_vni;
1:  };
1:  
1:  struct vxlan_metadata {
1: -	u32 gbp;
1: +  u32 gbp;
1:  };
1:  
1:  struct vxlan_sock {
1: -	struct hlist_node hlist;
1: -	struct socket *sock;
1: -	struct hlist_head vni_list[1024];
1: -	refcount_t refcnt;
1: -	u32 flags;
1: +  struct hlist_node hlist;
1: +  struct socket *sock;
1: +  struct hlist_head vni_list[1024];
1: +  refcount_t refcnt;
1: +  u32 flags;
1:  };
1:  
1:  union vxlan_addr {
1: -	struct sockaddr_in sin;
1: -	struct sockaddr_in6 sin6;
1: -	struct sockaddr sa;
1: +  struct sockaddr_in sin;
1: +  struct sockaddr_in6 sin6;
1: +  struct sockaddr sa;
1:  };
1:  
1:  struct vxlan_rdst {
1: -	union vxlan_addr remote_ip;
1: -	__be16 remote_port;
1: -	u8 offloaded: 1;
1: -	__be32 remote_vni;
1: -	u32 remote_ifindex;
1: -	struct net_device *remote_dev;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: -	struct dst_cache dst_cache;
1: +  union vxlan_addr remote_ip;
1: +  __be16 remote_port;
1: +  u8 offloaded : 1;
1: +  __be32 remote_vni;
1: +  u32 remote_ifindex;
1: +  struct net_device *remote_dev;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1: +  struct dst_cache dst_cache;
1:  };
1:  
1:  struct vxlan_config {
1: -	union vxlan_addr remote_ip;
1: -	union vxlan_addr saddr;
1: -	__be32 vni;
1: -	int remote_ifindex;
1: -	int mtu;
1: -	__be16 dst_port;
1: -	u16 port_min;
1: -	u16 port_max;
1: -	u8 tos;
1: -	u8 ttl;
1: -	__be32 label;
1: -	u32 flags;
1: -	long unsigned int age_interval;
1: -	unsigned int addrmax;
1: -	bool no_share;
1: -	enum ifla_vxlan_df df;
1: +  union vxlan_addr remote_ip;
1: +  union vxlan_addr saddr;
1: +  __be32 vni;
1: +  int remote_ifindex;
1: +  int mtu;
1: +  __be16 dst_port;
1: +  u16 port_min;
1: +  u16 port_max;
1: +  u8 tos;
1: +  u8 ttl;
1: +  __be32 label;
1: +  u32 flags;
1: +  long unsigned int age_interval;
1: +  unsigned int addrmax;
1: +  bool no_share;
1: +  enum ifla_vxlan_df df;
1:  };
1:  
1:  struct vxlan_dev;
1:  
1:  struct vxlan_dev_node {
1: -	struct hlist_node hlist;
1: -	struct vxlan_dev *vxlan;
1: +  struct hlist_node hlist;
1: +  struct vxlan_dev *vxlan;
1:  };
1:  
1:  struct vxlan_dev {
1: -	struct vxlan_dev_node hlist4;
1: -	struct vxlan_dev_node hlist6;
1: -	struct list_head next;
1: -	struct vxlan_sock *vn4_sock;
1: -	struct vxlan_sock *vn6_sock;
1: -	struct net_device *dev;
1: -	struct net *net;
1: -	struct vxlan_rdst default_dst;
1: -	struct timer_list age_timer;
1: -	spinlock_t hash_lock[256];
1: -	unsigned int addrcnt;
1: -	struct gro_cells gro_cells;
1: -	struct vxlan_config cfg;
1: -	struct hlist_head fdb_head[256];
1: +  struct vxlan_dev_node hlist4;
1: +  struct vxlan_dev_node hlist6;
1: +  struct list_head next;
1: +  struct vxlan_sock *vn4_sock;
1: +  struct vxlan_sock *vn6_sock;
1: +  struct net_device *dev;
1: +  struct net *net;
1: +  struct vxlan_rdst default_dst;
1: +  struct timer_list age_timer;
1: +  spinlock_t hash_lock[256];
1: +  unsigned int addrcnt;
1: +  struct gro_cells gro_cells;
1: +  struct vxlan_config cfg;
1: +  struct hlist_head fdb_head[256];
1:  };
1:  
1:  struct switchdev_notifier_vxlan_fdb_info {
1: -	struct switchdev_notifier_info info;
1: -	union vxlan_addr remote_ip;
1: -	__be16 remote_port;
1: -	__be32 remote_vni;
1: -	u32 remote_ifindex;
1: -	u8 eth_addr[6];
1: -	__be32 vni;
1: -	bool offloaded;
1: -	bool added_by_user;
1: +  struct switchdev_notifier_info info;
1: +  union vxlan_addr remote_ip;
1: +  __be16 remote_port;
1: +  __be32 remote_vni;
1: +  u32 remote_ifindex;
1: +  u8 eth_addr[6];
1: +  __be32 vni;
1: +  bool offloaded;
1: +  bool added_by_user;
1:  };
1:  
1:  struct vxlan_net {
1: -	struct list_head vxlan_list;
1: -	struct hlist_head sock_list[256];
1: -	spinlock_t sock_lock;
1: -	struct notifier_block nexthop_notifier_block;
1: +  struct list_head vxlan_list;
1: +  struct hlist_head sock_list[256];
1: +  spinlock_t sock_lock;
1: +  struct notifier_block nexthop_notifier_block;
1:  };
1:  
1:  struct vxlan_fdb {
1: -	struct hlist_node hlist;
1: -	struct callback_head rcu;
1: -	long unsigned int updated;
1: -	long unsigned int used;
1: -	struct list_head remotes;
1: -	u8 eth_addr[6];
1: -	u16 state;
1: -	__be32 vni;
1: -	u16 flags;
1: -	struct list_head nh_list;
1: -	struct nexthop *nh;
1: -	struct vxlan_dev *vdev;
1: +  struct hlist_node hlist;
1: +  struct callback_head rcu;
1: +  long unsigned int updated;
1: +  long unsigned int used;
1: +  struct list_head remotes;
1: +  u8 eth_addr[6];
1: +  u16 state;
1: +  __be32 vni;
1: +  u16 flags;
1: +  struct list_head nh_list;
1: +  struct nexthop *nh;
1: +  struct vxlan_dev *vdev;
1:  };
1:  
1:  struct qdisc_walker {
1: -	int stop;
1: -	int skip;
1: -	int count;
1: -	int (*fn)(struct Qdisc *, long unsigned int, struct qdisc_walker *);
1: +  int stop;
1: +  int skip;
1: +  int count;
1: +  int (*fn)(struct Qdisc *, long unsigned int, struct qdisc_walker *);
1:  };
1:  
1:  typedef enum {
1: -	e1000_undefined = 0,
1: -	e1000_82542_rev2_0 = 1,
1: -	e1000_82542_rev2_1 = 2,
1: -	e1000_82543 = 3,
1: -	e1000_82544 = 4,
1: -	e1000_82540 = 5,
1: -	e1000_82545 = 6,
1: -	e1000_82545_rev_3 = 7,
1: -	e1000_82546 = 8,
1: -	e1000_ce4100 = 9,
1: -	e1000_82546_rev_3 = 10,
1: -	e1000_82541 = 11,
1: -	e1000_82541_rev_2 = 12,
1: -	e1000_82547 = 13,
1: -	e1000_82547_rev_2 = 14,
1: -	e1000_num_macs = 15,
1: +  e1000_undefined = 0,
1: +  e1000_82542_rev2_0 = 1,
1: +  e1000_82542_rev2_1 = 2,
1: +  e1000_82543 = 3,
1: +  e1000_82544 = 4,
1: +  e1000_82540 = 5,
1: +  e1000_82545 = 6,
1: +  e1000_82545_rev_3 = 7,
1: +  e1000_82546 = 8,
1: +  e1000_ce4100 = 9,
1: +  e1000_82546_rev_3 = 10,
1: +  e1000_82541 = 11,
1: +  e1000_82541_rev_2 = 12,
1: +  e1000_82547 = 13,
1: +  e1000_82547_rev_2 = 14,
1: +  e1000_num_macs = 15,
1:  } e1000_mac_type;
1:  
1:  typedef enum {
1: -	e1000_eeprom_uninitialized = 0,
1: -	e1000_eeprom_spi = 1,
1: -	e1000_eeprom_microwire = 2,
1: -	e1000_eeprom_flash = 3,
1: -	e1000_eeprom_none = 4,
1: -	e1000_num_eeprom_types = 5,
1: +  e1000_eeprom_uninitialized = 0,
1: +  e1000_eeprom_spi = 1,
1: +  e1000_eeprom_microwire = 2,
1: +  e1000_eeprom_flash = 3,
1: +  e1000_eeprom_none = 4,
1: +  e1000_num_eeprom_types = 5,
1:  } e1000_eeprom_type;
1:  
1:  typedef enum {
1: -	e1000_media_type_copper = 0,
1: -	e1000_media_type_fiber = 1,
1: -	e1000_media_type_internal_serdes = 2,
1: -	e1000_num_media_types = 3,
1: +  e1000_media_type_copper = 0,
1: +  e1000_media_type_fiber = 1,
1: +  e1000_media_type_internal_serdes = 2,
1: +  e1000_num_media_types = 3,
1:  } e1000_media_type;
1:  
1:  enum {
1: -	e1000_10_half = 0,
1: -	e1000_10_full = 1,
1: -	e1000_100_half = 2,
1: -	e1000_100_full = 3,
1: +  e1000_10_half = 0,
1: +  e1000_10_full = 1,
1: +  e1000_100_half = 2,
1: +  e1000_100_full = 3,
1:  };
1:  
1:  typedef enum {
1: -	E1000_FC_NONE = 0,
1: -	E1000_FC_RX_PAUSE = 1,
1: -	E1000_FC_TX_PAUSE = 2,
1: -	E1000_FC_FULL = 3,
1: -	E1000_FC_DEFAULT = 255,
1: +  E1000_FC_NONE = 0,
1: +  E1000_FC_RX_PAUSE = 1,
1: +  E1000_FC_TX_PAUSE = 2,
1: +  E1000_FC_FULL = 3,
1: +  E1000_FC_DEFAULT = 255,
1:  } e1000_fc_type;
1:  
1:  struct e1000_shadow_ram {
1: -	u16 eeprom_word;
1: -	bool modified;
1: +  u16 eeprom_word;
1: +  bool modified;
1:  };
1:  
1:  typedef enum {
1: -	e1000_bus_type_unknown = 0,
1: -	e1000_bus_type_pci = 1,
1: -	e1000_bus_type_pcix = 2,
1: -	e1000_bus_type_reserved = 3,
1: +  e1000_bus_type_unknown = 0,
1: +  e1000_bus_type_pci = 1,
1: +  e1000_bus_type_pcix = 2,
1: +  e1000_bus_type_reserved = 3,
1:  } e1000_bus_type;
1:  
1:  typedef enum {
1: -	e1000_bus_speed_unknown = 0,
1: -	e1000_bus_speed_33 = 1,
1: -	e1000_bus_speed_66 = 2,
1: -	e1000_bus_speed_100 = 3,
1: -	e1000_bus_speed_120 = 4,
1: -	e1000_bus_speed_133 = 5,
1: -	e1000_bus_speed_reserved = 6,
1: +  e1000_bus_speed_unknown = 0,
1: +  e1000_bus_speed_33 = 1,
1: +  e1000_bus_speed_66 = 2,
1: +  e1000_bus_speed_100 = 3,
1: +  e1000_bus_speed_120 = 4,
1: +  e1000_bus_speed_133 = 5,
1: +  e1000_bus_speed_reserved = 6,
1:  } e1000_bus_speed;
1:  
1:  typedef enum {
1: -	e1000_bus_width_unknown = 0,
1: -	e1000_bus_width_32 = 1,
1: -	e1000_bus_width_64 = 2,
1: -	e1000_bus_width_reserved = 3,
1: +  e1000_bus_width_unknown = 0,
1: +  e1000_bus_width_32 = 1,
1: +  e1000_bus_width_64 = 2,
1: +  e1000_bus_width_reserved = 3,
1:  } e1000_bus_width;
1:  
1:  typedef enum {
1: -	e1000_cable_length_50 = 0,
1: -	e1000_cable_length_50_80 = 1,
1: -	e1000_cable_length_80_110 = 2,
1: -	e1000_cable_length_110_140 = 3,
1: -	e1000_cable_length_140 = 4,
1: -	e1000_cable_length_undefined = 255,
1: +  e1000_cable_length_50 = 0,
1: +  e1000_cable_length_50_80 = 1,
1: +  e1000_cable_length_80_110 = 2,
1: +  e1000_cable_length_110_140 = 3,
1: +  e1000_cable_length_140 = 4,
1: +  e1000_cable_length_undefined = 255,
1:  } e1000_cable_length;
1:  
1:  typedef enum {
1: -	e1000_10bt_ext_dist_enable_normal = 0,
1: -	e1000_10bt_ext_dist_enable_lower = 1,
1: -	e1000_10bt_ext_dist_enable_undefined = 255,
1: +  e1000_10bt_ext_dist_enable_normal = 0,
1: +  e1000_10bt_ext_dist_enable_lower = 1,
1: +  e1000_10bt_ext_dist_enable_undefined = 255,
1:  } e1000_10bt_ext_dist_enable;
1:  
1:  typedef enum {
1: -	e1000_rev_polarity_normal = 0,
1: -	e1000_rev_polarity_reversed = 1,
1: -	e1000_rev_polarity_undefined = 255,
1: +  e1000_rev_polarity_normal = 0,
1: +  e1000_rev_polarity_reversed = 1,
1: +  e1000_rev_polarity_undefined = 255,
1:  } e1000_rev_polarity;
1:  
1:  typedef enum {
1: -	e1000_downshift_normal = 0,
1: -	e1000_downshift_activated = 1,
1: -	e1000_downshift_undefined = 255,
1: +  e1000_downshift_normal = 0,
1: +  e1000_downshift_activated = 1,
1: +  e1000_downshift_undefined = 255,
1:  } e1000_downshift;
1:  
1:  typedef enum {
1: -	e1000_smart_speed_default = 0,
1: -	e1000_smart_speed_on = 1,
1: -	e1000_smart_speed_off = 2,
1: +  e1000_smart_speed_default = 0,
1: +  e1000_smart_speed_on = 1,
1: +  e1000_smart_speed_off = 2,
1:  } e1000_smart_speed;
1:  
1:  typedef enum {
1: -	e1000_polarity_reversal_enabled = 0,
1: -	e1000_polarity_reversal_disabled = 1,
1: -	e1000_polarity_reversal_undefined = 255,
1: +  e1000_polarity_reversal_enabled = 0,
1: +  e1000_polarity_reversal_disabled = 1,
1: +  e1000_polarity_reversal_undefined = 255,
1:  } e1000_polarity_reversal;
1:  
1:  typedef enum {
1: -	e1000_auto_x_mode_manual_mdi = 0,
1: -	e1000_auto_x_mode_manual_mdix = 1,
1: -	e1000_auto_x_mode_auto1 = 2,
1: -	e1000_auto_x_mode_auto2 = 3,
1: -	e1000_auto_x_mode_undefined = 255,
1: +  e1000_auto_x_mode_manual_mdi = 0,
1: +  e1000_auto_x_mode_manual_mdix = 1,
1: +  e1000_auto_x_mode_auto1 = 2,
1: +  e1000_auto_x_mode_auto2 = 3,
1: +  e1000_auto_x_mode_undefined = 255,
1:  } e1000_auto_x_mode;
1:  
1:  typedef enum {
1: -	e1000_1000t_rx_status_not_ok = 0,
1: -	e1000_1000t_rx_status_ok = 1,
1: -	e1000_1000t_rx_status_undefined = 255,
1: +  e1000_1000t_rx_status_not_ok = 0,
1: +  e1000_1000t_rx_status_ok = 1,
1: +  e1000_1000t_rx_status_undefined = 255,
1:  } e1000_1000t_rx_status;
1:  
1:  typedef enum {
1: -	e1000_phy_m88 = 0,
1: -	e1000_phy_igp = 1,
1: -	e1000_phy_8211 = 2,
1: -	e1000_phy_8201 = 3,
1: -	e1000_phy_undefined = 255,
1: +  e1000_phy_m88 = 0,
1: +  e1000_phy_igp = 1,
1: +  e1000_phy_8211 = 2,
1: +  e1000_phy_8201 = 3,
1: +  e1000_phy_undefined = 255,
1:  } e1000_phy_type;
1:  
1:  typedef enum {
1: -	e1000_ms_hw_default = 0,
1: -	e1000_ms_force_master = 1,
1: -	e1000_ms_force_slave = 2,
1: -	e1000_ms_auto = 3,
1: +  e1000_ms_hw_default = 0,
1: +  e1000_ms_force_master = 1,
1: +  e1000_ms_force_slave = 2,
1: +  e1000_ms_auto = 3,
1:  } e1000_ms_type;
1:  
1:  typedef enum {
1: -	e1000_ffe_config_enabled = 0,
1: -	e1000_ffe_config_active = 1,
1: -	e1000_ffe_config_blocked = 2,
1: +  e1000_ffe_config_enabled = 0,
1: +  e1000_ffe_config_active = 1,
1: +  e1000_ffe_config_blocked = 2,
1:  } e1000_ffe_config;
1:  
1:  typedef enum {
1: -	e1000_dsp_config_disabled = 0,
1: -	e1000_dsp_config_enabled = 1,
1: -	e1000_dsp_config_activated = 2,
1: -	e1000_dsp_config_undefined = 255,
1: +  e1000_dsp_config_disabled = 0,
1: +  e1000_dsp_config_enabled = 1,
1: +  e1000_dsp_config_activated = 2,
1: +  e1000_dsp_config_undefined = 255,
1:  } e1000_dsp_config;
1:  
1:  struct e1000_phy_info {
1: -	e1000_cable_length cable_length;
1: -	e1000_10bt_ext_dist_enable extended_10bt_distance;
1: -	e1000_rev_polarity cable_polarity;
1: -	e1000_downshift downshift;
1: -	e1000_polarity_reversal polarity_correction;
1: -	e1000_auto_x_mode mdix_mode;
1: -	e1000_1000t_rx_status local_rx;
1: -	e1000_1000t_rx_status remote_rx;
1: +  e1000_cable_length cable_length;
1: +  e1000_10bt_ext_dist_enable extended_10bt_distance;
1: +  e1000_rev_polarity cable_polarity;
1: +  e1000_downshift downshift;
1: +  e1000_polarity_reversal polarity_correction;
1: +  e1000_auto_x_mode mdix_mode;
1: +  e1000_1000t_rx_status local_rx;
1: +  e1000_1000t_rx_status remote_rx;
1:  };
1:  
1:  struct e1000_phy_stats {
1: -	u32 idle_errors;
1: -	u32 receive_errors;
1: +  u32 idle_errors;
1: +  u32 receive_errors;
1:  };
1:  
1:  struct e1000_eeprom_info {
1: -	e1000_eeprom_type type;
1: -	u16 word_size;
1: -	u16 opcode_bits;
1: -	u16 address_bits;
1: -	u16 delay_usec;
1: -	u16 page_size;
1: +  e1000_eeprom_type type;
1: +  u16 word_size;
1: +  u16 opcode_bits;
1: +  u16 address_bits;
1: +  u16 delay_usec;
1: +  u16 page_size;
1:  };
1:  
1:  struct e1000_host_mng_dhcp_cookie {
1: -	u32 signature;
1: -	u8 status;
1: -	u8 reserved0;
1: -	u16 vlan_id;
1: -	u32 reserved1;
1: -	u16 reserved2;
1: -	u8 reserved3;
1: -	u8 checksum;
1: +  u32 signature;
1: +  u8 status;
1: +  u8 reserved0;
1: +  u16 vlan_id;
1: +  u32 reserved1;
1: +  u16 reserved2;
1: +  u8 reserved3;
1: +  u8 checksum;
1:  };
1:  
1:  struct e1000_rx_desc {
1: -	__le64 buffer_addr;
1: -	__le16 length;
1: -	__le16 csum;
1: -	u8 status;
1: -	u8 errors;
1: -	__le16 special;
1: +  __le64 buffer_addr;
1: +  __le16 length;
1: +  __le16 csum;
1: +  u8 status;
1: +  u8 errors;
1: +  __le16 special;
1:  };
1:  
1:  struct e1000_tx_desc {
1: -	__le64 buffer_addr;
1: -	union {
1: -		__le32 data;
1: -		struct {
1: -			__le16 length;
1: -			u8 cso;
1: -			u8 cmd;
1: -		} flags;
1: -	} lower;
1: -	union {
1: -		__le32 data;
1: -		struct {
1: -			u8 status;
1: -			u8 css;
1: -			__le16 special;
1: -		} fields;
1: -	} upper;
1: +  __le64 buffer_addr;
1: +  union {
1: +    __le32 data;
1: +    struct {
1: +      __le16 length;
1: +      u8 cso;
1: +      u8 cmd;
1: +    } flags;
1: +  } lower;
1: +  union {
1: +    __le32 data;
1: +    struct {
1: +      u8 status;
1: +      u8 css;
1: +      __le16 special;
1: +    } fields;
1: +  } upper;
1:  };
1:  
1:  struct e1000_context_desc {
1: -	union {
1: -		__le32 ip_config;
1: -		struct {
1: -			u8 ipcss;
1: -			u8 ipcso;
1: -			__le16 ipcse;
1: -		} ip_fields;
1: -	} lower_setup;
1: -	union {
1: -		__le32 tcp_config;
1: -		struct {
1: -			u8 tucss;
1: -			u8 tucso;
1: -			__le16 tucse;
1: -		} tcp_fields;
1: -	} upper_setup;
1: -	__le32 cmd_and_length;
1: -	union {
1: -		__le32 data;
1: -		struct {
1: -			u8 status;
1: -			u8 hdr_len;
1: -			__le16 mss;
1: -		} fields;
1: -	} tcp_seg_setup;
1: +  union {
1: +    __le32 ip_config;
1: +    struct {
1: +      u8 ipcss;
1: +      u8 ipcso;
1: +      __le16 ipcse;
1: +    } ip_fields;
1: +  } lower_setup;
1: +  union {
1: +    __le32 tcp_config;
1: +    struct {
1: +      u8 tucss;
1: +      u8 tucso;
1: +      __le16 tucse;
1: +    } tcp_fields;
1: +  } upper_setup;
1: +  __le32 cmd_and_length;
1: +  union {
1: +    __le32 data;
1: +    struct {
1: +      u8 status;
1: +      u8 hdr_len;
1: +      __le16 mss;
1: +    } fields;
1: +  } tcp_seg_setup;
1:  };
1:  
1:  struct e1000_hw_stats {
1: -	u64 crcerrs;
1: -	u64 algnerrc;
1: -	u64 symerrs;
1: -	u64 rxerrc;
1: -	u64 txerrc;
1: -	u64 mpc;
1: -	u64 scc;
1: -	u64 ecol;
1: -	u64 mcc;
1: -	u64 latecol;
1: -	u64 colc;
1: -	u64 dc;
1: -	u64 tncrs;
1: -	u64 sec;
1: -	u64 cexterr;
1: -	u64 rlec;
1: -	u64 xonrxc;
1: -	u64 xontxc;
1: -	u64 xoffrxc;
1: -	u64 xofftxc;
1: -	u64 fcruc;
1: -	u64 prc64;
1: -	u64 prc127;
1: -	u64 prc255;
1: -	u64 prc511;
1: -	u64 prc1023;
1: -	u64 prc1522;
1: -	u64 gprc;
1: -	u64 bprc;
1: -	u64 mprc;
1: -	u64 gptc;
1: -	u64 gorcl;
1: -	u64 gorch;
1: -	u64 gotcl;
1: -	u64 gotch;
1: -	u64 rnbc;
1: -	u64 ruc;
1: -	u64 rfc;
1: -	u64 roc;
1: -	u64 rlerrc;
1: -	u64 rjc;
1: -	u64 mgprc;
1: -	u64 mgpdc;
1: -	u64 mgptc;
1: -	u64 torl;
1: -	u64 torh;
1: -	u64 totl;
1: -	u64 toth;
1: -	u64 tpr;
1: -	u64 tpt;
1: -	u64 ptc64;
1: -	u64 ptc127;
1: -	u64 ptc255;
1: -	u64 ptc511;
1: -	u64 ptc1023;
1: -	u64 ptc1522;
1: -	u64 mptc;
1: -	u64 bptc;
1: -	u64 tsctc;
1: -	u64 tsctfc;
1: -	u64 iac;
1: -	u64 icrxptc;
1: -	u64 icrxatc;
1: -	u64 ictxptc;
1: -	u64 ictxatc;
1: -	u64 ictxqec;
1: -	u64 ictxqmtc;
1: -	u64 icrxdmtc;
1: -	u64 icrxoc;
1: +  u64 crcerrs;
1: +  u64 algnerrc;
1: +  u64 symerrs;
1: +  u64 rxerrc;
1: +  u64 txerrc;
1: +  u64 mpc;
1: +  u64 scc;
1: +  u64 ecol;
1: +  u64 mcc;
1: +  u64 latecol;
1: +  u64 colc;
1: +  u64 dc;
1: +  u64 tncrs;
1: +  u64 sec;
1: +  u64 cexterr;
1: +  u64 rlec;
1: +  u64 xonrxc;
1: +  u64 xontxc;
1: +  u64 xoffrxc;
1: +  u64 xofftxc;
1: +  u64 fcruc;
1: +  u64 prc64;
1: +  u64 prc127;
1: +  u64 prc255;
1: +  u64 prc511;
1: +  u64 prc1023;
1: +  u64 prc1522;
1: +  u64 gprc;
1: +  u64 bprc;
1: +  u64 mprc;
1: +  u64 gptc;
1: +  u64 gorcl;
1: +  u64 gorch;
1: +  u64 gotcl;
1: +  u64 gotch;
1: +  u64 rnbc;
1: +  u64 ruc;
1: +  u64 rfc;
1: +  u64 roc;
1: +  u64 rlerrc;
1: +  u64 rjc;
1: +  u64 mgprc;
1: +  u64 mgpdc;
1: +  u64 mgptc;
1: +  u64 torl;
1: +  u64 torh;
1: +  u64 totl;
1: +  u64 toth;
1: +  u64 tpr;
1: +  u64 tpt;
1: +  u64 ptc64;
1: +  u64 ptc127;
1: +  u64 ptc255;
1: +  u64 ptc511;
1: +  u64 ptc1023;
1: +  u64 ptc1522;
1: +  u64 mptc;
1: +  u64 bptc;
1: +  u64 tsctc;
1: +  u64 tsctfc;
1: +  u64 iac;
1: +  u64 icrxptc;
1: +  u64 icrxatc;
1: +  u64 ictxptc;
1: +  u64 ictxatc;
1: +  u64 ictxqec;
1: +  u64 ictxqmtc;
1: +  u64 icrxdmtc;
1: +  u64 icrxoc;
1:  };
1:  
1:  struct e1000_hw {
1: -	u8 *hw_addr;
1: -	u8 *flash_address;
1: -	void *ce4100_gbe_mdio_base_virt;
1: -	e1000_mac_type mac_type;
1: -	e1000_phy_type phy_type;
1: -	u32 phy_init_script;
1: -	e1000_media_type media_type;
1: -	void *back;
1: -	struct e1000_shadow_ram *eeprom_shadow_ram;
1: -	u32 flash_bank_size;
1: -	u32 flash_base_addr;
1: -	e1000_fc_type fc;
1: -	e1000_bus_speed bus_speed;
1: -	e1000_bus_width bus_width;
1: -	e1000_bus_type bus_type;
1: -	struct e1000_eeprom_info eeprom;
1: -	e1000_ms_type master_slave;
1: -	e1000_ms_type original_master_slave;
1: -	e1000_ffe_config ffe_config_state;
1: -	u32 asf_firmware_present;
1: -	u32 eeprom_semaphore_present;
1: -	long unsigned int io_base;
1: -	u32 phy_id;
1: -	u32 phy_revision;
1: -	u32 phy_addr;
1: -	u32 original_fc;
1: -	u32 txcw;
1: -	u32 autoneg_failed;
1: -	u32 max_frame_size;
1: -	u32 min_frame_size;
1: -	u32 mc_filter_type;
1: -	u32 num_mc_addrs;
1: -	u32 collision_delta;
1: -	u32 tx_packet_delta;
1: -	u32 ledctl_default;
1: -	u32 ledctl_mode1;
1: -	u32 ledctl_mode2;
1: -	bool tx_pkt_filtering;
1: -	struct e1000_host_mng_dhcp_cookie mng_cookie;
1: -	u16 phy_spd_default;
1: -	u16 autoneg_advertised;
1: -	u16 pci_cmd_word;
1: -	u16 fc_high_water;
1: -	u16 fc_low_water;
1: -	u16 fc_pause_time;
1: -	u16 current_ifs_val;
1: -	u16 ifs_min_val;
1: -	u16 ifs_max_val;
1: -	u16 ifs_step_size;
1: -	u16 ifs_ratio;
1: -	u16 device_id;
1: -	u16 vendor_id;
1: -	u16 subsystem_id;
1: -	u16 subsystem_vendor_id;
1: -	u8 revision_id;
1: -	u8 autoneg;
1: -	u8 mdix;
1: -	u8 forced_speed_duplex;
1: -	u8 wait_autoneg_complete;
1: -	u8 dma_fairness;
1: -	u8 mac_addr[6];
1: -	u8 perm_mac_addr[6];
1: -	bool disable_polarity_correction;
1: -	bool speed_downgraded;
1: -	e1000_smart_speed smart_speed;
1: -	e1000_dsp_config dsp_config_state;
1: -	bool get_link_status;
1: -	bool serdes_has_link;
1: -	bool tbi_compatibility_en;
1: -	bool tbi_compatibility_on;
1: -	bool laa_is_present;
1: -	bool phy_reset_disable;
1: -	bool initialize_hw_bits_disable;
1: -	bool fc_send_xon;
1: -	bool fc_strict_ieee;
1: -	bool report_tx_early;
1: -	bool adaptive_ifs;
1: -	bool ifs_params_forced;
1: -	bool in_ifs_mode;
1: -	bool mng_reg_access_disabled;
1: -	bool leave_av_bit_off;
1: -	bool bad_tx_carr_stats_fd;
1: -	bool has_smbus;
1: +  u8 *hw_addr;
1: +  u8 *flash_address;
1: +  void *ce4100_gbe_mdio_base_virt;
1: +  e1000_mac_type mac_type;
1: +  e1000_phy_type phy_type;
1: +  u32 phy_init_script;
1: +  e1000_media_type media_type;
1: +  void *back;
1: +  struct e1000_shadow_ram *eeprom_shadow_ram;
1: +  u32 flash_bank_size;
1: +  u32 flash_base_addr;
1: +  e1000_fc_type fc;
1: +  e1000_bus_speed bus_speed;
1: +  e1000_bus_width bus_width;
1: +  e1000_bus_type bus_type;
1: +  struct e1000_eeprom_info eeprom;
1: +  e1000_ms_type master_slave;
1: +  e1000_ms_type original_master_slave;
1: +  e1000_ffe_config ffe_config_state;
1: +  u32 asf_firmware_present;
1: +  u32 eeprom_semaphore_present;
1: +  long unsigned int io_base;
1: +  u32 phy_id;
1: +  u32 phy_revision;
1: +  u32 phy_addr;
1: +  u32 original_fc;
1: +  u32 txcw;
1: +  u32 autoneg_failed;
1: +  u32 max_frame_size;
1: +  u32 min_frame_size;
1: +  u32 mc_filter_type;
1: +  u32 num_mc_addrs;
1: +  u32 collision_delta;
1: +  u32 tx_packet_delta;
1: +  u32 ledctl_default;
1: +  u32 ledctl_mode1;
1: +  u32 ledctl_mode2;
1: +  bool tx_pkt_filtering;
1: +  struct e1000_host_mng_dhcp_cookie mng_cookie;
1: +  u16 phy_spd_default;
1: +  u16 autoneg_advertised;
1: +  u16 pci_cmd_word;
1: +  u16 fc_high_water;
1: +  u16 fc_low_water;
1: +  u16 fc_pause_time;
1: +  u16 current_ifs_val;
1: +  u16 ifs_min_val;
1: +  u16 ifs_max_val;
1: +  u16 ifs_step_size;
1: +  u16 ifs_ratio;
1: +  u16 device_id;
1: +  u16 vendor_id;
1: +  u16 subsystem_id;
1: +  u16 subsystem_vendor_id;
1: +  u8 revision_id;
1: +  u8 autoneg;
1: +  u8 mdix;
1: +  u8 forced_speed_duplex;
1: +  u8 wait_autoneg_complete;
1: +  u8 dma_fairness;
1: +  u8 mac_addr[6];
1: +  u8 perm_mac_addr[6];
1: +  bool disable_polarity_correction;
1: +  bool speed_downgraded;
1: +  e1000_smart_speed smart_speed;
1: +  e1000_dsp_config dsp_config_state;
1: +  bool get_link_status;
1: +  bool serdes_has_link;
1: +  bool tbi_compatibility_en;
1: +  bool tbi_compatibility_on;
1: +  bool laa_is_present;
1: +  bool phy_reset_disable;
1: +  bool initialize_hw_bits_disable;
1: +  bool fc_send_xon;
1: +  bool fc_strict_ieee;
1: +  bool report_tx_early;
1: +  bool adaptive_ifs;
1: +  bool ifs_params_forced;
1: +  bool in_ifs_mode;
1: +  bool mng_reg_access_disabled;
1: +  bool leave_av_bit_off;
1: +  bool bad_tx_carr_stats_fd;
1: +  bool has_smbus;
1:  };
1:  
1:  struct e1000_tx_buffer {
1: -	struct sk_buff *skb;
1: -	dma_addr_t dma;
1: -	long unsigned int time_stamp;
1: -	u16 length;
1: -	u16 next_to_watch;
1: -	bool mapped_as_page;
1: -	short unsigned int segs;
1: -	unsigned int bytecount;
1: +  struct sk_buff *skb;
1: +  dma_addr_t dma;
1: +  long unsigned int time_stamp;
1: +  u16 length;
1: +  u16 next_to_watch;
1: +  bool mapped_as_page;
1: +  short unsigned int segs;
1: +  unsigned int bytecount;
1:  };
1:  
1:  struct e1000_rx_buffer {
1: -	union {
1: -		struct page *page;
1: -		u8 *data;
1: -	} rxbuf;
1: -	dma_addr_t dma;
1: +  union {
1: +    struct page *page;
1: +    u8 *data;
1: +  } rxbuf;
1: +  dma_addr_t dma;
1:  };
1:  
1:  struct e1000_tx_ring {
1: -	void *desc;
1: -	dma_addr_t dma;
1: -	unsigned int size;
1: -	unsigned int count;
1: -	unsigned int next_to_use;
1: -	unsigned int next_to_clean;
1: -	struct e1000_tx_buffer *buffer_info;
1: -	u16 tdh;
1: -	u16 tdt;
1: -	bool last_tx_tso;
1: +  void *desc;
1: +  dma_addr_t dma;
1: +  unsigned int size;
1: +  unsigned int count;
1: +  unsigned int next_to_use;
1: +  unsigned int next_to_clean;
1: +  struct e1000_tx_buffer *buffer_info;
1: +  u16 tdh;
1: +  u16 tdt;
1: +  bool last_tx_tso;
1:  };
1:  
1:  struct e1000_rx_ring {
1: -	void *desc;
1: -	dma_addr_t dma;
1: -	unsigned int size;
1: -	unsigned int count;
1: -	unsigned int next_to_use;
1: -	unsigned int next_to_clean;
1: -	struct e1000_rx_buffer *buffer_info;
1: -	struct sk_buff *rx_skb_top;
1: -	int cpu;
1: -	u16 rdh;
1: -	u16 rdt;
1: +  void *desc;
1: +  dma_addr_t dma;
1: +  unsigned int size;
1: +  unsigned int count;
1: +  unsigned int next_to_use;
1: +  unsigned int next_to_clean;
1: +  struct e1000_rx_buffer *buffer_info;
1: +  struct sk_buff *rx_skb_top;
1: +  int cpu;
1: +  u16 rdh;
1: +  u16 rdt;
1:  };
1:  
1:  struct e1000_adapter {
1: -	long unsigned int active_vlans[64];
1: -	u16 mng_vlan_id;
1: -	u32 bd_number;
1: -	u32 rx_buffer_len;
1: -	u32 wol;
1: -	u32 smartspeed;
1: -	u32 en_mng_pt;
1: -	u16 link_speed;
1: -	u16 link_duplex;
1: -	spinlock_t stats_lock;
1: -	unsigned int total_tx_bytes;
1: -	unsigned int total_tx_packets;
1: -	unsigned int total_rx_bytes;
1: -	unsigned int total_rx_packets;
1: -	u32 itr;
1: -	u32 itr_setting;
1: -	u16 tx_itr;
1: -	u16 rx_itr;
1: -	u8 fc_autoneg;
1: -	struct e1000_tx_ring *tx_ring;
1: -	unsigned int restart_queue;
1: -	u32 txd_cmd;
1: -	u32 tx_int_delay;
1: -	u32 tx_abs_int_delay;
1: -	u32 gotcl;
1: -	u64 gotcl_old;
1: -	u64 tpt_old;
1: -	u64 colc_old;
1: -	u32 tx_timeout_count;
1: -	u32 tx_fifo_head;
1: -	u32 tx_head_addr;
1: -	u32 tx_fifo_size;
1: -	u8 tx_timeout_factor;
1: -	atomic_t tx_fifo_stall;
1: -	bool pcix_82544;
1: -	bool detect_tx_hung;
1: -	bool dump_buffers;
1: -	bool (*clean_rx)(struct e1000_adapter *, struct e1000_rx_ring *, int *, int);
1: -	void (*alloc_rx_buf)(struct e1000_adapter *, struct e1000_rx_ring *, int);
1: -	struct e1000_rx_ring *rx_ring;
1: -	struct napi_struct napi;
1: -	int num_tx_queues;
1: -	int num_rx_queues;
1: -	u64 hw_csum_err;
1: -	u64 hw_csum_good;
1: -	u32 alloc_rx_buff_failed;
1: -	u32 rx_int_delay;
1: -	u32 rx_abs_int_delay;
1: -	bool rx_csum;
1: -	u32 gorcl;
1: -	u64 gorcl_old;
1: -	struct net_device *netdev;
1: -	struct pci_dev *pdev;
1: -	struct e1000_hw hw;
1: -	struct e1000_hw_stats stats;
1: -	struct e1000_phy_info phy_info;
1: -	struct e1000_phy_stats phy_stats;
1: -	u32 test_icr;
1: -	struct e1000_tx_ring test_tx_ring;
1: -	struct e1000_rx_ring test_rx_ring;
1: -	int msg_enable;
1: -	bool tso_force;
1: -	bool smart_power_down;
1: -	bool quad_port_a;
1: -	long unsigned int flags;
1: -	u32 eeprom_wol;
1: -	int bars;
1: -	int need_ioport;
1: -	bool discarding;
1: -	struct work_struct reset_task;
1: -	struct delayed_work watchdog_task;
1: -	struct delayed_work fifo_stall_task;
1: -	struct delayed_work phy_info_task;
1: +  long unsigned int active_vlans[64];
1: +  u16 mng_vlan_id;
1: +  u32 bd_number;
1: +  u32 rx_buffer_len;
1: +  u32 wol;
1: +  u32 smartspeed;
1: +  u32 en_mng_pt;
1: +  u16 link_speed;
1: +  u16 link_duplex;
1: +  spinlock_t stats_lock;
1: +  unsigned int total_tx_bytes;
1: +  unsigned int total_tx_packets;
1: +  unsigned int total_rx_bytes;
1: +  unsigned int total_rx_packets;
1: +  u32 itr;
1: +  u32 itr_setting;
1: +  u16 tx_itr;
1: +  u16 rx_itr;
1: +  u8 fc_autoneg;
1: +  struct e1000_tx_ring *tx_ring;
1: +  unsigned int restart_queue;
1: +  u32 txd_cmd;
1: +  u32 tx_int_delay;
1: +  u32 tx_abs_int_delay;
1: +  u32 gotcl;
1: +  u64 gotcl_old;
1: +  u64 tpt_old;
1: +  u64 colc_old;
1: +  u32 tx_timeout_count;
1: +  u32 tx_fifo_head;
1: +  u32 tx_head_addr;
1: +  u32 tx_fifo_size;
1: +  u8 tx_timeout_factor;
1: +  atomic_t tx_fifo_stall;
1: +  bool pcix_82544;
1: +  bool detect_tx_hung;
1: +  bool dump_buffers;
1: +  bool (*clean_rx)(struct e1000_adapter *, struct e1000_rx_ring *, int *, int);
1: +  void (*alloc_rx_buf)(struct e1000_adapter *, struct e1000_rx_ring *, int);
1: +  struct e1000_rx_ring *rx_ring;
1: +  struct napi_struct napi;
1: +  int num_tx_queues;
1: +  int num_rx_queues;
1: +  u64 hw_csum_err;
1: +  u64 hw_csum_good;
1: +  u32 alloc_rx_buff_failed;
1: +  u32 rx_int_delay;
1: +  u32 rx_abs_int_delay;
1: +  bool rx_csum;
1: +  u32 gorcl;
1: +  u64 gorcl_old;
1: +  struct net_device *netdev;
1: +  struct pci_dev *pdev;
1: +  struct e1000_hw hw;
1: +  struct e1000_hw_stats stats;
1: +  struct e1000_phy_info phy_info;
1: +  struct e1000_phy_stats phy_stats;
1: +  u32 test_icr;
1: +  struct e1000_tx_ring test_tx_ring;
1: +  struct e1000_rx_ring test_rx_ring;
1: +  int msg_enable;
1: +  bool tso_force;
1: +  bool smart_power_down;
1: +  bool quad_port_a;
1: +  long unsigned int flags;
1: +  u32 eeprom_wol;
1: +  int bars;
1: +  int need_ioport;
1: +  bool discarding;
1: +  struct work_struct reset_task;
1: +  struct delayed_work watchdog_task;
1: +  struct delayed_work fifo_stall_task;
1: +  struct delayed_work phy_info_task;
1:  };
1:  
1:  enum e1000_state_t {
1: -	__E1000_TESTING = 0,
1: -	__E1000_RESETTING = 1,
1: -	__E1000_DOWN = 2,
1: -	__E1000_DISABLED = 3,
1: +  __E1000_TESTING = 0,
1: +  __E1000_RESETTING = 1,
1: +  __E1000_DOWN = 2,
1: +  __E1000_DISABLED = 3,
1:  };
1:  
1:  enum latency_range {
1: -	lowest_latency = 0,
1: -	low_latency = 1,
1: -	bulk_latency = 2,
1: -	latency_invalid = 255,
1: +  lowest_latency = 0,
1: +  low_latency = 1,
1: +  bulk_latency = 2,
1: +  latency_invalid = 255,
1:  };
1:  
1:  struct my_u {
1: -	__le64 a;
1: -	__le64 b;
1: -};
1: -
1: -enum {
1: -	e1000_igp_cable_length_10 = 10,
1: -	e1000_igp_cable_length_20 = 20,
1: -	e1000_igp_cable_length_30 = 30,
1: -	e1000_igp_cable_length_40 = 40,
1: -	e1000_igp_cable_length_50 = 50,
1: -	e1000_igp_cable_length_60 = 60,
1: -	e1000_igp_cable_length_70 = 70,
1: -	e1000_igp_cable_length_80 = 80,
1: -	e1000_igp_cable_length_90 = 90,
1: -	e1000_igp_cable_length_100 = 100,
1: -	e1000_igp_cable_length_110 = 110,
1: -	e1000_igp_cable_length_115 = 115,
1: -	e1000_igp_cable_length_120 = 120,
1: -	e1000_igp_cable_length_130 = 130,
1: -	e1000_igp_cable_length_140 = 140,
1: -	e1000_igp_cable_length_150 = 150,
1: -	e1000_igp_cable_length_160 = 160,
1: -	e1000_igp_cable_length_170 = 170,
1: -	e1000_igp_cable_length_180 = 180,
1: +  __le64 a;
1: +  __le64 b;
1: +};
1: +
1: +enum {
1: +  e1000_igp_cable_length_10 = 10,
1: +  e1000_igp_cable_length_20 = 20,
1: +  e1000_igp_cable_length_30 = 30,
1: +  e1000_igp_cable_length_40 = 40,
1: +  e1000_igp_cable_length_50 = 50,
1: +  e1000_igp_cable_length_60 = 60,
1: +  e1000_igp_cable_length_70 = 70,
1: +  e1000_igp_cable_length_80 = 80,
1: +  e1000_igp_cable_length_90 = 90,
1: +  e1000_igp_cable_length_100 = 100,
1: +  e1000_igp_cable_length_110 = 110,
1: +  e1000_igp_cable_length_115 = 115,
1: +  e1000_igp_cable_length_120 = 120,
1: +  e1000_igp_cable_length_130 = 130,
1: +  e1000_igp_cable_length_140 = 140,
1: +  e1000_igp_cable_length_150 = 150,
1: +  e1000_igp_cable_length_160 = 160,
1: +  e1000_igp_cable_length_170 = 170,
1: +  e1000_igp_cable_length_180 = 180,
1:  };
1:  
1:  enum ethtool_test_flags {
1: -	ETH_TEST_FL_OFFLINE = 1,
1: -	ETH_TEST_FL_FAILED = 2,
1: -	ETH_TEST_FL_EXTERNAL_LB = 4,
1: -	ETH_TEST_FL_EXTERNAL_LB_DONE = 8,
1: +  ETH_TEST_FL_OFFLINE = 1,
1: +  ETH_TEST_FL_FAILED = 2,
1: +  ETH_TEST_FL_EXTERNAL_LB = 4,
1: +  ETH_TEST_FL_EXTERNAL_LB_DONE = 8,
1:  };
1:  
1:  enum {
1: -	NETDEV_STATS = 0,
1: -	E1000_STATS = 1,
1: +  NETDEV_STATS = 0,
1: +  E1000_STATS = 1,
1:  };
1:  
1:  struct e1000_stats {
1: -	char stat_string[32];
1: -	int type;
1: -	int sizeof_stat;
1: -	int stat_offset;
1: +  char stat_string[32];
1: +  int type;
1: +  int sizeof_stat;
1: +  int stat_offset;
1:  };
1:  
1:  struct e1000_opt_list {
1: -	int i;
1: -	char *str;
1: +  int i;
1: +  char *str;
1:  };
1:  
1:  struct e1000_option {
1: -	enum {
1: -		enable_option = 0,
1: -		range_option = 1,
1: -		list_option = 2,
1: -	} type;
1: -	const char *name;
1: -	const char *err;
1: -	int def;
1: -	union {
1: -		struct {
1: -			int min;
1: -			int max;
1: -		} r;
1: -		struct {
1: -			int nr;
1: -			const struct e1000_opt_list *p;
1: -		} l;
1: -	} arg;
1: +  enum {
1: +    enable_option = 0,
1: +    range_option = 1,
1: +    list_option = 2,
1: +  } type;
1: +  const char *name;
1: +  const char *err;
1: +  int def;
1: +  union {
1: +    struct {
1: +      int min;
1: +      int max;
1: +    } r;
1: +    struct {
1: +      int nr;
1: +      const struct e1000_opt_list *p;
1: +    } l;
1: +  } arg;
1:  };
1:  
1:  enum pkt_hash_types {
1: -	PKT_HASH_TYPE_NONE = 0,
1: -	PKT_HASH_TYPE_L2 = 1,
1: -	PKT_HASH_TYPE_L3 = 2,
1: -	PKT_HASH_TYPE_L4 = 3,
1: +  PKT_HASH_TYPE_NONE = 0,
1: +  PKT_HASH_TYPE_L2 = 1,
1: +  PKT_HASH_TYPE_L3 = 2,
1: +  PKT_HASH_TYPE_L4 = 3,
1:  };
1:  
1:  enum macvlan_mode {
1: -	MACVLAN_MODE_PRIVATE = 1,
1: -	MACVLAN_MODE_VEPA = 2,
1: -	MACVLAN_MODE_BRIDGE = 4,
1: -	MACVLAN_MODE_PASSTHRU = 8,
1: -	MACVLAN_MODE_SOURCE = 16,
1: +  MACVLAN_MODE_PRIVATE = 1,
1: +  MACVLAN_MODE_VEPA = 2,
1: +  MACVLAN_MODE_BRIDGE = 4,
1: +  MACVLAN_MODE_PASSTHRU = 8,
1: +  MACVLAN_MODE_SOURCE = 16,
1:  };
1:  
1:  enum {
1: -	TC_MQPRIO_HW_OFFLOAD_NONE = 0,
1: -	TC_MQPRIO_HW_OFFLOAD_TCS = 1,
1: -	__TC_MQPRIO_HW_OFFLOAD_MAX = 2,
1: +  TC_MQPRIO_HW_OFFLOAD_NONE = 0,
1: +  TC_MQPRIO_HW_OFFLOAD_TCS = 1,
1: +  __TC_MQPRIO_HW_OFFLOAD_MAX = 2,
1:  };
1:  
1:  struct tc_mqprio_qopt {
1: -	__u8 num_tc;
1: -	__u8 prio_tc_map[16];
1: -	__u8 hw;
1: -	__u16 count[16];
1: -	__u16 offset[16];
1: +  __u8 num_tc;
1: +  __u8 prio_tc_map[16];
1: +  __u8 hw;
1: +  __u16 count[16];
1: +  __u16 offset[16];
1:  };
1:  
1:  enum tca_id {
1: -	TCA_ID_UNSPEC = 0,
1: -	TCA_ID_POLICE = 1,
1: -	TCA_ID_GACT = 5,
1: -	TCA_ID_IPT = 6,
1: -	TCA_ID_PEDIT = 7,
1: -	TCA_ID_MIRRED = 8,
1: -	TCA_ID_NAT = 9,
1: -	TCA_ID_XT = 10,
1: -	TCA_ID_SKBEDIT = 11,
1: -	TCA_ID_VLAN = 12,
1: -	TCA_ID_BPF = 13,
1: -	TCA_ID_CONNMARK = 14,
1: -	TCA_ID_SKBMOD = 15,
1: -	TCA_ID_CSUM = 16,
1: -	TCA_ID_TUNNEL_KEY = 17,
1: -	TCA_ID_SIMP = 22,
1: -	TCA_ID_IFE = 25,
1: -	TCA_ID_SAMPLE = 26,
1: -	TCA_ID_CTINFO = 27,
1: -	TCA_ID_MPLS = 28,
1: -	TCA_ID_CT = 29,
1: -	TCA_ID_GATE = 30,
1: -	__TCA_ID_MAX = 255,
1: +  TCA_ID_UNSPEC = 0,
1: +  TCA_ID_POLICE = 1,
1: +  TCA_ID_GACT = 5,
1: +  TCA_ID_IPT = 6,
1: +  TCA_ID_PEDIT = 7,
1: +  TCA_ID_MIRRED = 8,
1: +  TCA_ID_NAT = 9,
1: +  TCA_ID_XT = 10,
1: +  TCA_ID_SKBEDIT = 11,
1: +  TCA_ID_VLAN = 12,
1: +  TCA_ID_BPF = 13,
1: +  TCA_ID_CONNMARK = 14,
1: +  TCA_ID_SKBMOD = 15,
1: +  TCA_ID_CSUM = 16,
1: +  TCA_ID_TUNNEL_KEY = 17,
1: +  TCA_ID_SIMP = 22,
1: +  TCA_ID_IFE = 25,
1: +  TCA_ID_SAMPLE = 26,
1: +  TCA_ID_CTINFO = 27,
1: +  TCA_ID_MPLS = 28,
1: +  TCA_ID_CT = 29,
1: +  TCA_ID_GATE = 30,
1: +  __TCA_ID_MAX = 255,
1:  };
1:  
1:  struct tcf_t {
1: -	__u64 install;
1: -	__u64 lastuse;
1: -	__u64 expires;
1: -	__u64 firstuse;
1: +  __u64 install;
1: +  __u64 lastuse;
1: +  __u64 expires;
1: +  __u64 firstuse;
1:  };
1:  
1:  struct tc_u32_key {
1: -	__be32 mask;
1: -	__be32 val;
1: -	int off;
1: -	int offmask;
1: +  __be32 mask;
1: +  __be32 val;
1: +  int off;
1: +  int offmask;
1:  };
1:  
1:  struct tc_u32_sel {
1: -	unsigned char flags;
1: -	unsigned char offshift;
1: -	unsigned char nkeys;
1: -	__be16 offmask;
1: -	__u16 off;
1: -	short int offoff;
1: -	short int hoff;
1: -	__be32 hmask;
1: -	struct tc_u32_key keys[0];
1: +  unsigned char flags;
1: +  unsigned char offshift;
1: +  unsigned char nkeys;
1: +  __be16 offmask;
1: +  __u16 off;
1: +  short int offoff;
1: +  short int hoff;
1: +  __be32 hmask;
1: +  struct tc_u32_key keys[0];
1:  };
1:  
1:  struct xdp_umem;
1: @@ -94673,93 +95789,93 @@ struct xsk_queue;
1:  struct xdp_buff_xsk;
1:  
1:  struct xsk_buff_pool {
1: -	struct device *dev;
1: -	struct net_device *netdev;
1: -	struct list_head xsk_tx_list;
1: -	spinlock_t xsk_tx_list_lock;
1: -	refcount_t users;
1: -	struct xdp_umem *umem;
1: -	struct work_struct work;
1: -	struct list_head free_list;
1: -	u32 heads_cnt;
1: -	u16 queue_id;
1: -	struct xsk_queue *fq;
1: -	struct xsk_queue *cq;
1: -	dma_addr_t *dma_pages;
1: -	struct xdp_buff_xsk *heads;
1: -	u64 chunk_mask;
1: -	u64 addrs_cnt;
1: -	u32 free_list_cnt;
1: -	u32 dma_pages_cnt;
1: -	u32 free_heads_cnt;
1: -	u32 headroom;
1: -	u32 chunk_size;
1: -	u32 frame_len;
1: -	u8 cached_need_wakeup;
1: -	bool uses_need_wakeup;
1: -	bool dma_need_sync;
1: -	bool unaligned;
1: -	void *addrs;
1: -	struct xdp_buff_xsk *free_heads[0];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct device *dev;
1: +  struct net_device *netdev;
1: +  struct list_head xsk_tx_list;
1: +  spinlock_t xsk_tx_list_lock;
1: +  refcount_t users;
1: +  struct xdp_umem *umem;
1: +  struct work_struct work;
1: +  struct list_head free_list;
1: +  u32 heads_cnt;
1: +  u16 queue_id;
1: +  struct xsk_queue *fq;
1: +  struct xsk_queue *cq;
1: +  dma_addr_t *dma_pages;
1: +  struct xdp_buff_xsk *heads;
1: +  u64 chunk_mask;
1: +  u64 addrs_cnt;
1: +  u32 free_list_cnt;
1: +  u32 dma_pages_cnt;
1: +  u32 free_heads_cnt;
1: +  u32 headroom;
1: +  u32 chunk_size;
1: +  u32 frame_len;
1: +  u8 cached_need_wakeup;
1: +  bool uses_need_wakeup;
1: +  bool dma_need_sync;
1: +  bool unaligned;
1: +  void *addrs;
1: +  struct xdp_buff_xsk *free_heads[0];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct netdev_nested_priv {
1: -	unsigned char flags;
1: -	void *data;
1: +  unsigned char flags;
1: +  void *data;
1:  };
1:  
1:  struct vlan_ethhdr {
1: -	unsigned char h_dest[6];
1: -	unsigned char h_source[6];
1: -	__be16 h_vlan_proto;
1: -	__be16 h_vlan_TCI;
1: -	__be16 h_vlan_encapsulated_proto;
1: +  unsigned char h_dest[6];
1: +  unsigned char h_source[6];
1: +  __be16 h_vlan_proto;
1: +  __be16 h_vlan_TCI;
1: +  __be16 h_vlan_encapsulated_proto;
1:  };
1:  
1:  struct vlan_pcpu_stats {
1: -	u64 rx_packets;
1: -	u64 rx_bytes;
1: -	u64 rx_multicast;
1: -	u64 tx_packets;
1: -	u64 tx_bytes;
1: -	struct u64_stats_sync syncp;
1: -	u32 rx_errors;
1: -	u32 tx_dropped;
1: +  u64 rx_packets;
1: +  u64 rx_bytes;
1: +  u64 rx_multicast;
1: +  u64 tx_packets;
1: +  u64 tx_bytes;
1: +  struct u64_stats_sync syncp;
1: +  u32 rx_errors;
1: +  u32 tx_dropped;
1:  };
1:  
1:  struct flow_cls_common_offload {
1: -	u32 chain_index;
1: -	__be16 protocol;
1: -	u32 prio;
1: -	struct netlink_ext_ack *extack;
1: +  u32 chain_index;
1: +  __be16 protocol;
1: +  u32 prio;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct tcf_walker {
1: -	int stop;
1: -	int skip;
1: -	int count;
1: -	bool nonempty;
1: -	long unsigned int cookie;
1: -	int (*fn)(struct tcf_proto *, void *, struct tcf_walker *);
1: +  int stop;
1: +  int skip;
1: +  int count;
1: +  bool nonempty;
1: +  long unsigned int cookie;
1: +  int (*fn)(struct tcf_proto *, void *, struct tcf_walker *);
1:  };
1:  
1:  struct hwtstamp_config {
1: -	int flags;
1: -	int tx_type;
1: -	int rx_filter;
1: +  int flags;
1: +  int tx_type;
1: +  int rx_filter;
1:  };
1:  
1:  enum hwtstamp_tx_types {
1: -	HWTSTAMP_TX_OFF = 0,
1: -	HWTSTAMP_TX_ON = 1,
1: -	HWTSTAMP_TX_ONESTEP_SYNC = 2,
1: -	HWTSTAMP_TX_ONESTEP_P2P = 3,
1: -	__HWTSTAMP_TX_CNT = 4,
1: +  HWTSTAMP_TX_OFF = 0,
1: +  HWTSTAMP_TX_ON = 1,
1: +  HWTSTAMP_TX_ONESTEP_SYNC = 2,
1: +  HWTSTAMP_TX_ONESTEP_P2P = 3,
1: +  __HWTSTAMP_TX_CNT = 4,
1:  };
1:  
1:  struct macvlan_port;
1: @@ -94767,58 +95883,59 @@ struct macvlan_port;
1:  struct netpoll;
1:  
1:  struct macvlan_dev {
1: -	struct net_device *dev;
1: -	struct list_head list;
1: -	struct hlist_node hlist;
1: -	struct macvlan_port *port;
1: -	struct net_device *lowerdev;
1: -	void *accel_priv;
1: -	struct vlan_pcpu_stats *pcpu_stats;
1: -	long unsigned int mc_filter[4];
1: -	netdev_features_t set_features;
1: -	enum macvlan_mode mode;
1: -	u16 flags;
1: -	unsigned int macaddr_count;
1: -	struct netpoll *netpoll;
1: +  struct net_device *dev;
1: +  struct list_head list;
1: +  struct hlist_node hlist;
1: +  struct macvlan_port *port;
1: +  struct net_device *lowerdev;
1: +  void *accel_priv;
1: +  struct vlan_pcpu_stats *pcpu_stats;
1: +  long unsigned int mc_filter[4];
1: +  netdev_features_t set_features;
1: +  enum macvlan_mode mode;
1: +  u16 flags;
1: +  unsigned int macaddr_count;
1: +  struct netpoll *netpoll;
1:  };
1:  
1:  enum {
1: -	IFLA_BRIDGE_FLAGS = 0,
1: -	IFLA_BRIDGE_MODE = 1,
1: -	IFLA_BRIDGE_VLAN_INFO = 2,
1: -	IFLA_BRIDGE_VLAN_TUNNEL_INFO = 3,
1: -	IFLA_BRIDGE_MRP = 4,
1: -	IFLA_BRIDGE_CFM = 5,
1: -	__IFLA_BRIDGE_MAX = 6,
1: +  IFLA_BRIDGE_FLAGS = 0,
1: +  IFLA_BRIDGE_MODE = 1,
1: +  IFLA_BRIDGE_VLAN_INFO = 2,
1: +  IFLA_BRIDGE_VLAN_TUNNEL_INFO = 3,
1: +  IFLA_BRIDGE_MRP = 4,
1: +  IFLA_BRIDGE_CFM = 5,
1: +  __IFLA_BRIDGE_MAX = 6,
1:  };
1:  
1:  enum {
1: -	BR_MCAST_DIR_RX = 0,
1: -	BR_MCAST_DIR_TX = 1,
1: -	BR_MCAST_DIR_SIZE = 2,
1: +  BR_MCAST_DIR_RX = 0,
1: +  BR_MCAST_DIR_TX = 1,
1: +  BR_MCAST_DIR_SIZE = 2,
1:  };
1:  
1:  enum udp_tunnel_nic_info_flags {
1: -	UDP_TUNNEL_NIC_INFO_MAY_SLEEP = 1,
1: -	UDP_TUNNEL_NIC_INFO_OPEN_ONLY = 2,
1: -	UDP_TUNNEL_NIC_INFO_IPV4_ONLY = 4,
1: -	UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN = 8,
1: +  UDP_TUNNEL_NIC_INFO_MAY_SLEEP = 1,
1: +  UDP_TUNNEL_NIC_INFO_OPEN_ONLY = 2,
1: +  UDP_TUNNEL_NIC_INFO_IPV4_ONLY = 4,
1: +  UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN = 8,
1:  };
1:  
1:  struct udp_tunnel_nic_ops {
1: -	void (*get_port)(struct net_device *, unsigned int, unsigned int, struct udp_tunnel_info *);
1: -	void (*set_port_priv)(struct net_device *, unsigned int, unsigned int, u8);
1: -	void (*add_port)(struct net_device *, struct udp_tunnel_info *);
1: -	void (*del_port)(struct net_device *, struct udp_tunnel_info *);
1: -	void (*reset_ntf)(struct net_device *);
1: -	size_t (*dump_size)(struct net_device *, unsigned int);
1: -	int (*dump_write)(struct net_device *, unsigned int, struct sk_buff *);
1: +  void (*get_port)(struct net_device *, unsigned int, unsigned int,
1: +                   struct udp_tunnel_info *);
1: +  void (*set_port_priv)(struct net_device *, unsigned int, unsigned int, u8);
1: +  void (*add_port)(struct net_device *, struct udp_tunnel_info *);
1: +  void (*del_port)(struct net_device *, struct udp_tunnel_info *);
1: +  void (*reset_ntf)(struct net_device *);
1: +  size_t (*dump_size)(struct net_device *, unsigned int);
1: +  int (*dump_write)(struct net_device *, unsigned int, struct sk_buff *);
1:  };
1:  
1:  struct tcf_idrinfo {
1: -	struct mutex lock;
1: -	struct idr action_idr;
1: -	struct net *net;
1: +  struct mutex lock;
1: +  struct idr action_idr;
1: +  struct net *net;
1:  };
1:  
1:  struct tc_action_ops;
1: @@ -94826,28 +95943,28 @@ struct tc_action_ops;
1:  struct tc_cookie;
1:  
1:  struct tc_action {
1: -	const struct tc_action_ops *ops;
1: -	__u32 type;
1: -	struct tcf_idrinfo *idrinfo;
1: -	u32 tcfa_index;
1: -	refcount_t tcfa_refcnt;
1: -	atomic_t tcfa_bindcnt;
1: -	int tcfa_action;
1: -	struct tcf_t tcfa_tm;
1: -	struct gnet_stats_basic_packed tcfa_bstats;
1: -	struct gnet_stats_basic_packed tcfa_bstats_hw;
1: -	struct gnet_stats_queue tcfa_qstats;
1: -	struct net_rate_estimator *tcfa_rate_est;
1: -	spinlock_t tcfa_lock;
1: -	struct gnet_stats_basic_cpu *cpu_bstats;
1: -	struct gnet_stats_basic_cpu *cpu_bstats_hw;
1: -	struct gnet_stats_queue *cpu_qstats;
1: -	struct tc_cookie *act_cookie;
1: -	struct tcf_chain *goto_chain;
1: -	u32 tcfa_flags;
1: -	u8 hw_stats;
1: -	u8 used_hw_stats;
1: -	bool used_hw_stats_valid;
1: +  const struct tc_action_ops *ops;
1: +  __u32 type;
1: +  struct tcf_idrinfo *idrinfo;
1: +  u32 tcfa_index;
1: +  refcount_t tcfa_refcnt;
1: +  atomic_t tcfa_bindcnt;
1: +  int tcfa_action;
1: +  struct tcf_t tcfa_tm;
1: +  struct gnet_stats_basic_packed tcfa_bstats;
1: +  struct gnet_stats_basic_packed tcfa_bstats_hw;
1: +  struct gnet_stats_queue tcfa_qstats;
1: +  struct net_rate_estimator *tcfa_rate_est;
1: +  spinlock_t tcfa_lock;
1: +  struct gnet_stats_basic_cpu *cpu_bstats;
1: +  struct gnet_stats_basic_cpu *cpu_bstats_hw;
1: +  struct gnet_stats_queue *cpu_qstats;
1: +  struct tc_cookie *act_cookie;
1: +  struct tcf_chain *goto_chain;
1: +  u32 tcfa_flags;
1: +  u8 hw_stats;
1: +  u8 used_hw_stats;
1: +  bool used_hw_stats_valid;
1:  };
1:  
1:  typedef void (*tc_action_priv_destructor)(void *);
1: @@ -94855,275 +95972,283 @@ typedef void (*tc_action_priv_destructor)(void *);
1:  struct psample_group;
1:  
1:  struct tc_action_ops {
1: -	struct list_head head;
1: -	char kind[16];
1: -	enum tca_id id;
1: -	size_t size;
1: -	struct module *owner;
1: -	int (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *);
1: -	int (*dump)(struct sk_buff *, struct tc_action *, int, int);
1: -	void (*cleanup)(struct tc_action *);
1: -	int (*lookup)(struct net *, struct tc_action **, u32);
1: -	int (*init)(struct net *, struct nlattr *, struct nlattr *, struct tc_action **, int, int, bool, struct tcf_proto *, u32, struct netlink_ext_ack *);
1: -	int (*walk)(struct net *, struct sk_buff *, struct netlink_callback *, int, const struct tc_action_ops *, struct netlink_ext_ack *);
1: -	void (*stats_update)(struct tc_action *, u64, u64, u64, u64, bool);
1: -	size_t (*get_fill_size)(const struct tc_action *);
1: -	struct net_device * (*get_dev)(const struct tc_action *, tc_action_priv_destructor *);
1: -	struct psample_group * (*get_psample_group)(const struct tc_action *, tc_action_priv_destructor *);
1: +  struct list_head head;
1: +  char kind[16];
1: +  enum tca_id id;
1: +  size_t size;
1: +  struct module *owner;
1: +  int (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *);
1: +  int (*dump)(struct sk_buff *, struct tc_action *, int, int);
1: +  void (*cleanup)(struct tc_action *);
1: +  int (*lookup)(struct net *, struct tc_action **, u32);
1: +  int (*init)(struct net *, struct nlattr *, struct nlattr *,
1: +              struct tc_action **, int, int, bool, struct tcf_proto *, u32,
1: +              struct netlink_ext_ack *);
1: +  int (*walk)(struct net *, struct sk_buff *, struct netlink_callback *, int,
1: +              const struct tc_action_ops *, struct netlink_ext_ack *);
1: +  void (*stats_update)(struct tc_action *, u64, u64, u64, u64, bool);
1: +  size_t (*get_fill_size)(const struct tc_action *);
1: +  struct net_device *(*get_dev)(const struct tc_action *,
1: +                                tc_action_priv_destructor *);
1: +  struct psample_group *(*get_psample_group)(const struct tc_action *,
1: +                                             tc_action_priv_destructor *);
1:  };
1:  
1:  struct tc_cookie {
1: -	u8 *data;
1: -	u32 len;
1: -	struct callback_head rcu;
1: +  u8 *data;
1: +  u32 len;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_exts {
1: -	__u32 type;
1: -	int nr_actions;
1: -	struct tc_action **actions;
1: -	struct net *net;
1: -	int action;
1: -	int police;
1: +  __u32 type;
1: +  int nr_actions;
1: +  struct tc_action **actions;
1: +  struct net *net;
1: +  int action;
1: +  int police;
1:  };
1:  
1:  struct tc_cls_u32_knode {
1: -	struct tcf_exts *exts;
1: -	struct tcf_result *res;
1: -	struct tc_u32_sel *sel;
1: -	u32 handle;
1: -	u32 val;
1: -	u32 mask;
1: -	u32 link_handle;
1: -	u8 fshift;
1: +  struct tcf_exts *exts;
1: +  struct tcf_result *res;
1: +  struct tc_u32_sel *sel;
1: +  u32 handle;
1: +  u32 val;
1: +  u32 mask;
1: +  u32 link_handle;
1: +  u8 fshift;
1:  };
1:  
1:  struct tc_cls_u32_hnode {
1: -	u32 handle;
1: -	u32 prio;
1: -	unsigned int divisor;
1: +  u32 handle;
1: +  u32 prio;
1: +  unsigned int divisor;
1:  };
1:  
1:  enum tc_clsu32_command {
1: -	TC_CLSU32_NEW_KNODE = 0,
1: -	TC_CLSU32_REPLACE_KNODE = 1,
1: -	TC_CLSU32_DELETE_KNODE = 2,
1: -	TC_CLSU32_NEW_HNODE = 3,
1: -	TC_CLSU32_REPLACE_HNODE = 4,
1: -	TC_CLSU32_DELETE_HNODE = 5,
1: +  TC_CLSU32_NEW_KNODE = 0,
1: +  TC_CLSU32_REPLACE_KNODE = 1,
1: +  TC_CLSU32_DELETE_KNODE = 2,
1: +  TC_CLSU32_NEW_HNODE = 3,
1: +  TC_CLSU32_REPLACE_HNODE = 4,
1: +  TC_CLSU32_DELETE_HNODE = 5,
1:  };
1:  
1:  struct tc_cls_u32_offload {
1: -	struct flow_cls_common_offload common;
1: -	enum tc_clsu32_command command;
1: -	union {
1: -		struct tc_cls_u32_knode knode;
1: -		struct tc_cls_u32_hnode hnode;
1: -	};
1: +  struct flow_cls_common_offload common;
1: +  enum tc_clsu32_command command;
1: +  union {
1: +    struct tc_cls_u32_knode knode;
1: +    struct tc_cls_u32_hnode hnode;
1: +  };
1:  };
1:  
1:  struct tcf_gact {
1: -	struct tc_action common;
1: -	u16 tcfg_ptype;
1: -	u16 tcfg_pval;
1: -	int tcfg_paction;
1: -	atomic_t packets;
1: +  struct tc_action common;
1: +  u16 tcfg_ptype;
1: +  u16 tcfg_pval;
1: +  int tcfg_paction;
1: +  atomic_t packets;
1:  };
1:  
1:  struct tcf_mirred {
1: -	struct tc_action common;
1: -	int tcfm_eaction;
1: -	bool tcfm_mac_header_xmit;
1: -	struct net_device *tcfm_dev;
1: -	struct list_head tcfm_list;
1: +  struct tc_action common;
1: +  int tcfm_eaction;
1: +  bool tcfm_mac_header_xmit;
1: +  struct net_device *tcfm_dev;
1: +  struct list_head tcfm_list;
1:  };
1:  
1:  struct xdp_umem {
1: -	void *addrs;
1: -	u64 size;
1: -	u32 headroom;
1: -	u32 chunk_size;
1: -	u32 chunks;
1: -	u32 npgs;
1: -	struct user_struct *user;
1: -	refcount_t users;
1: -	u8 flags;
1: -	bool zc;
1: -	struct page **pgs;
1: -	int id;
1: -	struct list_head xsk_dma_list;
1: +  void *addrs;
1: +  u64 size;
1: +  u32 headroom;
1: +  u32 chunk_size;
1: +  u32 chunks;
1: +  u32 npgs;
1: +  struct user_struct *user;
1: +  refcount_t users;
1: +  u8 flags;
1: +  bool zc;
1: +  struct page **pgs;
1: +  int id;
1: +  struct list_head xsk_dma_list;
1:  };
1:  
1:  struct xdp_buff_xsk {
1: -	struct xdp_buff xdp;
1: -	dma_addr_t dma;
1: -	dma_addr_t frame_dma;
1: -	struct xsk_buff_pool *pool;
1: -	bool unaligned;
1: -	u64 orig_addr;
1: -	struct list_head free_list_node;
1: +  struct xdp_buff xdp;
1: +  dma_addr_t dma;
1: +  dma_addr_t frame_dma;
1: +  struct xsk_buff_pool *pool;
1: +  bool unaligned;
1: +  u64 orig_addr;
1: +  struct list_head free_list_node;
1:  };
1:  
1:  struct ptp_clock_time {
1: -	__s64 sec;
1: -	__u32 nsec;
1: -	__u32 reserved;
1: +  __s64 sec;
1: +  __u32 nsec;
1: +  __u32 reserved;
1:  };
1:  
1:  struct ptp_extts_request {
1: -	unsigned int index;
1: -	unsigned int flags;
1: -	unsigned int rsv[2];
1: +  unsigned int index;
1: +  unsigned int flags;
1: +  unsigned int rsv[2];
1:  };
1:  
1:  struct ptp_perout_request {
1: -	union {
1: -		struct ptp_clock_time start;
1: -		struct ptp_clock_time phase;
1: -	};
1: -	struct ptp_clock_time period;
1: -	unsigned int index;
1: -	unsigned int flags;
1: -	union {
1: -		struct ptp_clock_time on;
1: -		unsigned int rsv[4];
1: -	};
1: +  union {
1: +    struct ptp_clock_time start;
1: +    struct ptp_clock_time phase;
1: +  };
1: +  struct ptp_clock_time period;
1: +  unsigned int index;
1: +  unsigned int flags;
1: +  union {
1: +    struct ptp_clock_time on;
1: +    unsigned int rsv[4];
1: +  };
1:  };
1:  
1:  enum ptp_pin_function {
1: -	PTP_PF_NONE = 0,
1: -	PTP_PF_EXTTS = 1,
1: -	PTP_PF_PEROUT = 2,
1: -	PTP_PF_PHYSYNC = 3,
1: +  PTP_PF_NONE = 0,
1: +  PTP_PF_EXTTS = 1,
1: +  PTP_PF_PEROUT = 2,
1: +  PTP_PF_PHYSYNC = 3,
1:  };
1:  
1:  struct ptp_pin_desc {
1: -	char name[64];
1: -	unsigned int index;
1: -	unsigned int func;
1: -	unsigned int chan;
1: -	unsigned int rsv[5];
1: +  char name[64];
1: +  unsigned int index;
1: +  unsigned int func;
1: +  unsigned int chan;
1: +  unsigned int rsv[5];
1:  };
1:  
1:  struct ptp_clock_request {
1: -	enum {
1: -		PTP_CLK_REQ_EXTTS = 0,
1: -		PTP_CLK_REQ_PEROUT = 1,
1: -		PTP_CLK_REQ_PPS = 2,
1: -	} type;
1: -	union {
1: -		struct ptp_extts_request extts;
1: -		struct ptp_perout_request perout;
1: -	};
1: +  enum {
1: +    PTP_CLK_REQ_EXTTS = 0,
1: +    PTP_CLK_REQ_PEROUT = 1,
1: +    PTP_CLK_REQ_PPS = 2,
1: +  } type;
1: +  union {
1: +    struct ptp_extts_request extts;
1: +    struct ptp_perout_request perout;
1: +  };
1:  };
1:  
1:  struct ptp_system_timestamp {
1: -	struct timespec64 pre_ts;
1: -	struct timespec64 post_ts;
1: +  struct timespec64 pre_ts;
1: +  struct timespec64 post_ts;
1:  };
1:  
1:  struct ptp_clock_info {
1: -	struct module *owner;
1: -	char name[16];
1: -	s32 max_adj;
1: -	int n_alarm;
1: -	int n_ext_ts;
1: -	int n_per_out;
1: -	int n_pins;
1: -	int pps;
1: -	struct ptp_pin_desc *pin_config;
1: -	int (*adjfine)(struct ptp_clock_info *, long int);
1: -	int (*adjfreq)(struct ptp_clock_info *, s32);
1: -	int (*adjphase)(struct ptp_clock_info *, s32);
1: -	int (*adjtime)(struct ptp_clock_info *, s64);
1: -	int (*gettime64)(struct ptp_clock_info *, struct timespec64 *);
1: -	int (*gettimex64)(struct ptp_clock_info *, struct timespec64 *, struct ptp_system_timestamp *);
1: -	int (*getcrosststamp)(struct ptp_clock_info *, struct system_device_crosststamp *);
1: -	int (*settime64)(struct ptp_clock_info *, const struct timespec64 *);
1: -	int (*enable)(struct ptp_clock_info *, struct ptp_clock_request *, int);
1: -	int (*verify)(struct ptp_clock_info *, unsigned int, enum ptp_pin_function, unsigned int);
1: -	long int (*do_aux_work)(struct ptp_clock_info *);
1: +  struct module *owner;
1: +  char name[16];
1: +  s32 max_adj;
1: +  int n_alarm;
1: +  int n_ext_ts;
1: +  int n_per_out;
1: +  int n_pins;
1: +  int pps;
1: +  struct ptp_pin_desc *pin_config;
1: +  int (*adjfine)(struct ptp_clock_info *, long int);
1: +  int (*adjfreq)(struct ptp_clock_info *, s32);
1: +  int (*adjphase)(struct ptp_clock_info *, s32);
1: +  int (*adjtime)(struct ptp_clock_info *, s64);
1: +  int (*gettime64)(struct ptp_clock_info *, struct timespec64 *);
1: +  int (*gettimex64)(struct ptp_clock_info *, struct timespec64 *,
1: +                    struct ptp_system_timestamp *);
1: +  int (*getcrosststamp)(struct ptp_clock_info *,
1: +                        struct system_device_crosststamp *);
1: +  int (*settime64)(struct ptp_clock_info *, const struct timespec64 *);
1: +  int (*enable)(struct ptp_clock_info *, struct ptp_clock_request *, int);
1: +  int (*verify)(struct ptp_clock_info *, unsigned int, enum ptp_pin_function,
1: +                unsigned int);
1: +  long int (*do_aux_work)(struct ptp_clock_info *);
1:  };
1:  
1:  struct ixgbe_thermal_diode_data {
1: -	u8 location;
1: -	u8 temp;
1: -	u8 caution_thresh;
1: -	u8 max_op_thresh;
1: +  u8 location;
1: +  u8 temp;
1: +  u8 caution_thresh;
1: +  u8 max_op_thresh;
1:  };
1:  
1:  struct ixgbe_thermal_sensor_data {
1: -	struct ixgbe_thermal_diode_data sensor[3];
1: +  struct ixgbe_thermal_diode_data sensor[3];
1:  };
1:  
1:  struct ixgbe_nvm_version {
1: -	u32 etk_id;
1: -	u8 nvm_major;
1: -	u16 nvm_minor;
1: -	u8 nvm_id;
1: -	bool oem_valid;
1: -	u8 oem_major;
1: -	u8 oem_minor;
1: -	u16 oem_release;
1: -	bool or_valid;
1: -	u8 or_major;
1: -	u16 or_build;
1: -	u8 or_patch;
1: +  u32 etk_id;
1: +  u8 nvm_major;
1: +  u16 nvm_minor;
1: +  u8 nvm_id;
1: +  bool oem_valid;
1: +  u8 oem_major;
1: +  u8 oem_minor;
1: +  u16 oem_release;
1: +  bool or_valid;
1: +  u8 or_major;
1: +  u16 or_build;
1: +  u8 or_patch;
1:  };
1:  
1:  enum {
1: -	PBA_STRATEGY_EQUAL = 0,
1: -	PBA_STRATEGY_WEIGHTED = 1,
1: +  PBA_STRATEGY_EQUAL = 0,
1: +  PBA_STRATEGY_WEIGHTED = 1,
1:  };
1:  
1:  enum ixgbe_fdir_pballoc_type {
1: -	IXGBE_FDIR_PBALLOC_NONE = 0,
1: -	IXGBE_FDIR_PBALLOC_64K = 1,
1: -	IXGBE_FDIR_PBALLOC_128K = 2,
1: -	IXGBE_FDIR_PBALLOC_256K = 3,
1: +  IXGBE_FDIR_PBALLOC_NONE = 0,
1: +  IXGBE_FDIR_PBALLOC_64K = 1,
1: +  IXGBE_FDIR_PBALLOC_128K = 2,
1: +  IXGBE_FDIR_PBALLOC_256K = 3,
1:  };
1:  
1:  union ixgbe_adv_tx_desc {
1: -	struct {
1: -		__le64 buffer_addr;
1: -		__le32 cmd_type_len;
1: -		__le32 olinfo_status;
1: -	} read;
1: -	struct {
1: -		__le64 rsvd;
1: -		__le32 nxtseq_seed;
1: -		__le32 status;
1: -	} wb;
1: +  struct {
1: +    __le64 buffer_addr;
1: +    __le32 cmd_type_len;
1: +    __le32 olinfo_status;
1: +  } read;
1: +  struct {
1: +    __le64 rsvd;
1: +    __le32 nxtseq_seed;
1: +    __le32 status;
1: +  } wb;
1:  };
1:  
1:  union ixgbe_adv_rx_desc {
1: -	struct {
1: -		__le64 pkt_addr;
1: -		__le64 hdr_addr;
1: -	} read;
1: -	struct {
1: -		struct {
1: -			union {
1: -				__le32 data;
1: -				struct {
1: -					__le16 pkt_info;
1: -					__le16 hdr_info;
1: -				} hs_rss;
1: -			} lo_dword;
1: -			union {
1: -				__le32 rss;
1: -				struct {
1: -					__le16 ip_id;
1: -					__le16 csum;
1: -				} csum_ip;
1: -			} hi_dword;
1: -		} lower;
1: -		struct {
1: -			__le32 status_error;
1: -			__le16 length;
1: -			__le16 vlan;
1: -		} upper;
1: -	} wb;
1: +  struct {
1: +    __le64 pkt_addr;
1: +    __le64 hdr_addr;
1: +  } read;
1: +  struct {
1: +    struct {
1: +      union {
1: +        __le32 data;
1: +        struct {
1: +          __le16 pkt_info;
1: +          __le16 hdr_info;
1: +        } hs_rss;
1: +      } lo_dword;
1: +      union {
1: +        __le32 rss;
1: +        struct {
1: +          __le16 ip_id;
1: +          __le16 csum;
1: +        } csum_ip;
1: +      } hi_dword;
1: +    } lower;
1: +    struct {
1: +      __le32 status_error;
1: +      __le16 length;
1: +      __le16 vlan;
1: +    } upper;
1: +  } wb;
1:  };
1:  
1:  typedef u32 ixgbe_autoneg_advertised;
1: @@ -95131,827 +96256,827 @@ typedef u32 ixgbe_autoneg_advertised;
1:  typedef u32 ixgbe_link_speed;
1:  
1:  enum ixgbe_atr_flow_type {
1: -	IXGBE_ATR_FLOW_TYPE_IPV4 = 0,
1: -	IXGBE_ATR_FLOW_TYPE_UDPV4 = 1,
1: -	IXGBE_ATR_FLOW_TYPE_TCPV4 = 2,
1: -	IXGBE_ATR_FLOW_TYPE_SCTPV4 = 3,
1: -	IXGBE_ATR_FLOW_TYPE_IPV6 = 4,
1: -	IXGBE_ATR_FLOW_TYPE_UDPV6 = 5,
1: -	IXGBE_ATR_FLOW_TYPE_TCPV6 = 6,
1: -	IXGBE_ATR_FLOW_TYPE_SCTPV6 = 7,
1: +  IXGBE_ATR_FLOW_TYPE_IPV4 = 0,
1: +  IXGBE_ATR_FLOW_TYPE_UDPV4 = 1,
1: +  IXGBE_ATR_FLOW_TYPE_TCPV4 = 2,
1: +  IXGBE_ATR_FLOW_TYPE_SCTPV4 = 3,
1: +  IXGBE_ATR_FLOW_TYPE_IPV6 = 4,
1: +  IXGBE_ATR_FLOW_TYPE_UDPV6 = 5,
1: +  IXGBE_ATR_FLOW_TYPE_TCPV6 = 6,
1: +  IXGBE_ATR_FLOW_TYPE_SCTPV6 = 7,
1:  };
1:  
1:  union ixgbe_atr_input {
1: -	struct {
1: -		u8 vm_pool;
1: -		u8 flow_type;
1: -		__be16 vlan_id;
1: -		__be32 dst_ip[4];
1: -		__be32 src_ip[4];
1: -		__be16 src_port;
1: -		__be16 dst_port;
1: -		__be16 flex_bytes;
1: -		__be16 bkt_hash;
1: -	} formatted;
1: -	__be32 dword_stream[11];
1: +  struct {
1: +    u8 vm_pool;
1: +    u8 flow_type;
1: +    __be16 vlan_id;
1: +    __be32 dst_ip[4];
1: +    __be32 src_ip[4];
1: +    __be16 src_port;
1: +    __be16 dst_port;
1: +    __be16 flex_bytes;
1: +    __be16 bkt_hash;
1: +  } formatted;
1: +  __be32 dword_stream[11];
1:  };
1:  
1:  union ixgbe_atr_hash_dword {
1: -	struct {
1: -		u8 vm_pool;
1: -		u8 flow_type;
1: -		__be16 vlan_id;
1: -	} formatted;
1: -	__be32 ip;
1: -	struct {
1: -		__be16 src;
1: -		__be16 dst;
1: -	} port;
1: -	__be16 flex_bytes;
1: -	__be32 dword;
1: +  struct {
1: +    u8 vm_pool;
1: +    u8 flow_type;
1: +    __be16 vlan_id;
1: +  } formatted;
1: +  __be32 ip;
1: +  struct {
1: +    __be16 src;
1: +    __be16 dst;
1: +  } port;
1: +  __be16 flex_bytes;
1: +  __be32 dword;
1:  };
1:  
1:  enum ixgbe_mvals {
1: -	IXGBE_EEC_IDX = 0,
1: -	IXGBE_FLA_IDX = 1,
1: -	IXGBE_GRC_IDX = 2,
1: -	IXGBE_FACTPS_IDX = 3,
1: -	IXGBE_SWSM_IDX = 4,
1: -	IXGBE_SWFW_SYNC_IDX = 5,
1: -	IXGBE_FWSM_IDX = 6,
1: -	IXGBE_SDP0_GPIEN_IDX = 7,
1: -	IXGBE_SDP1_GPIEN_IDX = 8,
1: -	IXGBE_SDP2_GPIEN_IDX = 9,
1: -	IXGBE_EICR_GPI_SDP0_IDX = 10,
1: -	IXGBE_EICR_GPI_SDP1_IDX = 11,
1: -	IXGBE_EICR_GPI_SDP2_IDX = 12,
1: -	IXGBE_CIAA_IDX = 13,
1: -	IXGBE_CIAD_IDX = 14,
1: -	IXGBE_I2C_CLK_IN_IDX = 15,
1: -	IXGBE_I2C_CLK_OUT_IDX = 16,
1: -	IXGBE_I2C_DATA_IN_IDX = 17,
1: -	IXGBE_I2C_DATA_OUT_IDX = 18,
1: -	IXGBE_I2C_DATA_OE_N_EN_IDX = 19,
1: -	IXGBE_I2C_BB_EN_IDX = 20,
1: -	IXGBE_I2C_CLK_OE_N_EN_IDX = 21,
1: -	IXGBE_I2CCTL_IDX = 22,
1: -	IXGBE_MVALS_IDX_LIMIT = 23,
1: +  IXGBE_EEC_IDX = 0,
1: +  IXGBE_FLA_IDX = 1,
1: +  IXGBE_GRC_IDX = 2,
1: +  IXGBE_FACTPS_IDX = 3,
1: +  IXGBE_SWSM_IDX = 4,
1: +  IXGBE_SWFW_SYNC_IDX = 5,
1: +  IXGBE_FWSM_IDX = 6,
1: +  IXGBE_SDP0_GPIEN_IDX = 7,
1: +  IXGBE_SDP1_GPIEN_IDX = 8,
1: +  IXGBE_SDP2_GPIEN_IDX = 9,
1: +  IXGBE_EICR_GPI_SDP0_IDX = 10,
1: +  IXGBE_EICR_GPI_SDP1_IDX = 11,
1: +  IXGBE_EICR_GPI_SDP2_IDX = 12,
1: +  IXGBE_CIAA_IDX = 13,
1: +  IXGBE_CIAD_IDX = 14,
1: +  IXGBE_I2C_CLK_IN_IDX = 15,
1: +  IXGBE_I2C_CLK_OUT_IDX = 16,
1: +  IXGBE_I2C_DATA_IN_IDX = 17,
1: +  IXGBE_I2C_DATA_OUT_IDX = 18,
1: +  IXGBE_I2C_DATA_OE_N_EN_IDX = 19,
1: +  IXGBE_I2C_BB_EN_IDX = 20,
1: +  IXGBE_I2C_CLK_OE_N_EN_IDX = 21,
1: +  IXGBE_I2CCTL_IDX = 22,
1: +  IXGBE_MVALS_IDX_LIMIT = 23,
1:  };
1:  
1:  enum ixgbe_eeprom_type {
1: -	ixgbe_eeprom_uninitialized = 0,
1: -	ixgbe_eeprom_spi = 1,
1: -	ixgbe_flash = 2,
1: -	ixgbe_eeprom_none = 3,
1: +  ixgbe_eeprom_uninitialized = 0,
1: +  ixgbe_eeprom_spi = 1,
1: +  ixgbe_flash = 2,
1: +  ixgbe_eeprom_none = 3,
1:  };
1:  
1:  enum ixgbe_mac_type {
1: -	ixgbe_mac_unknown = 0,
1: -	ixgbe_mac_82598EB = 1,
1: -	ixgbe_mac_82599EB = 2,
1: -	ixgbe_mac_X540 = 3,
1: -	ixgbe_mac_X550 = 4,
1: -	ixgbe_mac_X550EM_x = 5,
1: -	ixgbe_mac_x550em_a = 6,
1: -	ixgbe_num_macs = 7,
1: +  ixgbe_mac_unknown = 0,
1: +  ixgbe_mac_82598EB = 1,
1: +  ixgbe_mac_82599EB = 2,
1: +  ixgbe_mac_X540 = 3,
1: +  ixgbe_mac_X550 = 4,
1: +  ixgbe_mac_X550EM_x = 5,
1: +  ixgbe_mac_x550em_a = 6,
1: +  ixgbe_num_macs = 7,
1:  };
1:  
1:  enum ixgbe_phy_type {
1: -	ixgbe_phy_unknown = 0,
1: -	ixgbe_phy_none = 1,
1: -	ixgbe_phy_tn = 2,
1: -	ixgbe_phy_aq = 3,
1: -	ixgbe_phy_x550em_kr = 4,
1: -	ixgbe_phy_x550em_kx4 = 5,
1: -	ixgbe_phy_x550em_xfi = 6,
1: -	ixgbe_phy_x550em_ext_t = 7,
1: -	ixgbe_phy_ext_1g_t = 8,
1: -	ixgbe_phy_cu_unknown = 9,
1: -	ixgbe_phy_qt = 10,
1: -	ixgbe_phy_xaui = 11,
1: -	ixgbe_phy_nl = 12,
1: -	ixgbe_phy_sfp_passive_tyco = 13,
1: -	ixgbe_phy_sfp_passive_unknown = 14,
1: -	ixgbe_phy_sfp_active_unknown = 15,
1: -	ixgbe_phy_sfp_avago = 16,
1: -	ixgbe_phy_sfp_ftl = 17,
1: -	ixgbe_phy_sfp_ftl_active = 18,
1: -	ixgbe_phy_sfp_unknown = 19,
1: -	ixgbe_phy_sfp_intel = 20,
1: -	ixgbe_phy_qsfp_passive_unknown = 21,
1: -	ixgbe_phy_qsfp_active_unknown = 22,
1: -	ixgbe_phy_qsfp_intel = 23,
1: -	ixgbe_phy_qsfp_unknown = 24,
1: -	ixgbe_phy_sfp_unsupported = 25,
1: -	ixgbe_phy_sgmii = 26,
1: -	ixgbe_phy_fw = 27,
1: -	ixgbe_phy_generic = 28,
1: +  ixgbe_phy_unknown = 0,
1: +  ixgbe_phy_none = 1,
1: +  ixgbe_phy_tn = 2,
1: +  ixgbe_phy_aq = 3,
1: +  ixgbe_phy_x550em_kr = 4,
1: +  ixgbe_phy_x550em_kx4 = 5,
1: +  ixgbe_phy_x550em_xfi = 6,
1: +  ixgbe_phy_x550em_ext_t = 7,
1: +  ixgbe_phy_ext_1g_t = 8,
1: +  ixgbe_phy_cu_unknown = 9,
1: +  ixgbe_phy_qt = 10,
1: +  ixgbe_phy_xaui = 11,
1: +  ixgbe_phy_nl = 12,
1: +  ixgbe_phy_sfp_passive_tyco = 13,
1: +  ixgbe_phy_sfp_passive_unknown = 14,
1: +  ixgbe_phy_sfp_active_unknown = 15,
1: +  ixgbe_phy_sfp_avago = 16,
1: +  ixgbe_phy_sfp_ftl = 17,
1: +  ixgbe_phy_sfp_ftl_active = 18,
1: +  ixgbe_phy_sfp_unknown = 19,
1: +  ixgbe_phy_sfp_intel = 20,
1: +  ixgbe_phy_qsfp_passive_unknown = 21,
1: +  ixgbe_phy_qsfp_active_unknown = 22,
1: +  ixgbe_phy_qsfp_intel = 23,
1: +  ixgbe_phy_qsfp_unknown = 24,
1: +  ixgbe_phy_sfp_unsupported = 25,
1: +  ixgbe_phy_sgmii = 26,
1: +  ixgbe_phy_fw = 27,
1: +  ixgbe_phy_generic = 28,
1:  };
1:  
1:  enum ixgbe_sfp_type {
1: -	ixgbe_sfp_type_da_cu = 0,
1: -	ixgbe_sfp_type_sr = 1,
1: -	ixgbe_sfp_type_lr = 2,
1: -	ixgbe_sfp_type_da_cu_core0 = 3,
1: -	ixgbe_sfp_type_da_cu_core1 = 4,
1: -	ixgbe_sfp_type_srlr_core0 = 5,
1: -	ixgbe_sfp_type_srlr_core1 = 6,
1: -	ixgbe_sfp_type_da_act_lmt_core0 = 7,
1: -	ixgbe_sfp_type_da_act_lmt_core1 = 8,
1: -	ixgbe_sfp_type_1g_cu_core0 = 9,
1: -	ixgbe_sfp_type_1g_cu_core1 = 10,
1: -	ixgbe_sfp_type_1g_sx_core0 = 11,
1: -	ixgbe_sfp_type_1g_sx_core1 = 12,
1: -	ixgbe_sfp_type_1g_lx_core0 = 13,
1: -	ixgbe_sfp_type_1g_lx_core1 = 14,
1: -	ixgbe_sfp_type_not_present = 65534,
1: -	ixgbe_sfp_type_unknown = 65535,
1: +  ixgbe_sfp_type_da_cu = 0,
1: +  ixgbe_sfp_type_sr = 1,
1: +  ixgbe_sfp_type_lr = 2,
1: +  ixgbe_sfp_type_da_cu_core0 = 3,
1: +  ixgbe_sfp_type_da_cu_core1 = 4,
1: +  ixgbe_sfp_type_srlr_core0 = 5,
1: +  ixgbe_sfp_type_srlr_core1 = 6,
1: +  ixgbe_sfp_type_da_act_lmt_core0 = 7,
1: +  ixgbe_sfp_type_da_act_lmt_core1 = 8,
1: +  ixgbe_sfp_type_1g_cu_core0 = 9,
1: +  ixgbe_sfp_type_1g_cu_core1 = 10,
1: +  ixgbe_sfp_type_1g_sx_core0 = 11,
1: +  ixgbe_sfp_type_1g_sx_core1 = 12,
1: +  ixgbe_sfp_type_1g_lx_core0 = 13,
1: +  ixgbe_sfp_type_1g_lx_core1 = 14,
1: +  ixgbe_sfp_type_not_present = 65534,
1: +  ixgbe_sfp_type_unknown = 65535,
1:  };
1:  
1:  enum ixgbe_media_type {
1: -	ixgbe_media_type_unknown = 0,
1: -	ixgbe_media_type_fiber = 1,
1: -	ixgbe_media_type_fiber_qsfp = 2,
1: -	ixgbe_media_type_fiber_lco = 3,
1: -	ixgbe_media_type_copper = 4,
1: -	ixgbe_media_type_backplane = 5,
1: -	ixgbe_media_type_cx4 = 6,
1: -	ixgbe_media_type_virtual = 7,
1: +  ixgbe_media_type_unknown = 0,
1: +  ixgbe_media_type_fiber = 1,
1: +  ixgbe_media_type_fiber_qsfp = 2,
1: +  ixgbe_media_type_fiber_lco = 3,
1: +  ixgbe_media_type_copper = 4,
1: +  ixgbe_media_type_backplane = 5,
1: +  ixgbe_media_type_cx4 = 6,
1: +  ixgbe_media_type_virtual = 7,
1:  };
1:  
1:  enum ixgbe_fc_mode {
1: -	ixgbe_fc_none = 0,
1: -	ixgbe_fc_rx_pause = 1,
1: -	ixgbe_fc_tx_pause = 2,
1: -	ixgbe_fc_full = 3,
1: -	ixgbe_fc_default = 4,
1: +  ixgbe_fc_none = 0,
1: +  ixgbe_fc_rx_pause = 1,
1: +  ixgbe_fc_tx_pause = 2,
1: +  ixgbe_fc_full = 3,
1: +  ixgbe_fc_default = 4,
1:  };
1:  
1:  enum ixgbe_smart_speed {
1: -	ixgbe_smart_speed_auto = 0,
1: -	ixgbe_smart_speed_on = 1,
1: -	ixgbe_smart_speed_off = 2,
1: +  ixgbe_smart_speed_auto = 0,
1: +  ixgbe_smart_speed_on = 1,
1: +  ixgbe_smart_speed_off = 2,
1:  };
1:  
1:  enum ixgbe_bus_type {
1: -	ixgbe_bus_type_unknown = 0,
1: -	ixgbe_bus_type_pci_express = 1,
1: -	ixgbe_bus_type_internal = 2,
1: -	ixgbe_bus_type_reserved = 3,
1: +  ixgbe_bus_type_unknown = 0,
1: +  ixgbe_bus_type_pci_express = 1,
1: +  ixgbe_bus_type_internal = 2,
1: +  ixgbe_bus_type_reserved = 3,
1:  };
1:  
1:  enum ixgbe_bus_speed {
1: -	ixgbe_bus_speed_unknown = 0,
1: -	ixgbe_bus_speed_33 = 33,
1: -	ixgbe_bus_speed_66 = 66,
1: -	ixgbe_bus_speed_100 = 100,
1: -	ixgbe_bus_speed_120 = 120,
1: -	ixgbe_bus_speed_133 = 133,
1: -	ixgbe_bus_speed_2500 = 2500,
1: -	ixgbe_bus_speed_5000 = 5000,
1: -	ixgbe_bus_speed_8000 = 8000,
1: -	ixgbe_bus_speed_reserved = 8001,
1: +  ixgbe_bus_speed_unknown = 0,
1: +  ixgbe_bus_speed_33 = 33,
1: +  ixgbe_bus_speed_66 = 66,
1: +  ixgbe_bus_speed_100 = 100,
1: +  ixgbe_bus_speed_120 = 120,
1: +  ixgbe_bus_speed_133 = 133,
1: +  ixgbe_bus_speed_2500 = 2500,
1: +  ixgbe_bus_speed_5000 = 5000,
1: +  ixgbe_bus_speed_8000 = 8000,
1: +  ixgbe_bus_speed_reserved = 8001,
1:  };
1:  
1:  enum ixgbe_bus_width {
1: -	ixgbe_bus_width_unknown = 0,
1: -	ixgbe_bus_width_pcie_x1 = 1,
1: -	ixgbe_bus_width_pcie_x2 = 2,
1: -	ixgbe_bus_width_pcie_x4 = 4,
1: -	ixgbe_bus_width_pcie_x8 = 8,
1: -	ixgbe_bus_width_32 = 32,
1: -	ixgbe_bus_width_64 = 64,
1: -	ixgbe_bus_width_reserved = 65,
1: +  ixgbe_bus_width_unknown = 0,
1: +  ixgbe_bus_width_pcie_x1 = 1,
1: +  ixgbe_bus_width_pcie_x2 = 2,
1: +  ixgbe_bus_width_pcie_x4 = 4,
1: +  ixgbe_bus_width_pcie_x8 = 8,
1: +  ixgbe_bus_width_32 = 32,
1: +  ixgbe_bus_width_64 = 64,
1: +  ixgbe_bus_width_reserved = 65,
1:  };
1:  
1:  struct ixgbe_addr_filter_info {
1: -	u32 num_mc_addrs;
1: -	u32 rar_used_count;
1: -	u32 mta_in_use;
1: -	u32 overflow_promisc;
1: -	bool uc_set_promisc;
1: -	bool user_set_promisc;
1: +  u32 num_mc_addrs;
1: +  u32 rar_used_count;
1: +  u32 mta_in_use;
1: +  u32 overflow_promisc;
1: +  bool uc_set_promisc;
1: +  bool user_set_promisc;
1:  };
1:  
1:  struct ixgbe_bus_info {
1: -	enum ixgbe_bus_speed speed;
1: -	enum ixgbe_bus_width width;
1: -	enum ixgbe_bus_type type;
1: -	u8 func;
1: -	u8 lan_id;
1: -	u8 instance_id;
1: +  enum ixgbe_bus_speed speed;
1: +  enum ixgbe_bus_width width;
1: +  enum ixgbe_bus_type type;
1: +  u8 func;
1: +  u8 lan_id;
1: +  u8 instance_id;
1:  };
1:  
1:  struct ixgbe_fc_info {
1: -	u32 high_water[8];
1: -	u32 low_water[8];
1: -	u16 pause_time;
1: -	bool send_xon;
1: -	bool strict_ieee;
1: -	bool disable_fc_autoneg;
1: -	bool fc_was_autonegged;
1: -	enum ixgbe_fc_mode current_mode;
1: -	enum ixgbe_fc_mode requested_mode;
1: +  u32 high_water[8];
1: +  u32 low_water[8];
1: +  u16 pause_time;
1: +  bool send_xon;
1: +  bool strict_ieee;
1: +  bool disable_fc_autoneg;
1: +  bool fc_was_autonegged;
1: +  enum ixgbe_fc_mode current_mode;
1: +  enum ixgbe_fc_mode requested_mode;
1:  };
1:  
1:  struct ixgbe_hw_stats {
1: -	u64 crcerrs;
1: -	u64 illerrc;
1: -	u64 errbc;
1: -	u64 mspdc;
1: -	u64 mpctotal;
1: -	u64 mpc[8];
1: -	u64 mlfc;
1: -	u64 mrfc;
1: -	u64 rlec;
1: -	u64 lxontxc;
1: -	u64 lxonrxc;
1: -	u64 lxofftxc;
1: -	u64 lxoffrxc;
1: -	u64 pxontxc[8];
1: -	u64 pxonrxc[8];
1: -	u64 pxofftxc[8];
1: -	u64 pxoffrxc[8];
1: -	u64 prc64;
1: -	u64 prc127;
1: -	u64 prc255;
1: -	u64 prc511;
1: -	u64 prc1023;
1: -	u64 prc1522;
1: -	u64 gprc;
1: -	u64 bprc;
1: -	u64 mprc;
1: -	u64 gptc;
1: -	u64 gorc;
1: -	u64 gotc;
1: -	u64 rnbc[8];
1: -	u64 ruc;
1: -	u64 rfc;
1: -	u64 roc;
1: -	u64 rjc;
1: -	u64 mngprc;
1: -	u64 mngpdc;
1: -	u64 mngptc;
1: -	u64 tor;
1: -	u64 tpr;
1: -	u64 tpt;
1: -	u64 ptc64;
1: -	u64 ptc127;
1: -	u64 ptc255;
1: -	u64 ptc511;
1: -	u64 ptc1023;
1: -	u64 ptc1522;
1: -	u64 mptc;
1: -	u64 bptc;
1: -	u64 xec;
1: -	u64 rqsmr[16];
1: -	u64 tqsmr[8];
1: -	u64 qprc[16];
1: -	u64 qptc[16];
1: -	u64 qbrc[16];
1: -	u64 qbtc[16];
1: -	u64 qprdc[16];
1: -	u64 pxon2offc[8];
1: -	u64 fdirustat_add;
1: -	u64 fdirustat_remove;
1: -	u64 fdirfstat_fadd;
1: -	u64 fdirfstat_fremove;
1: -	u64 fdirmatch;
1: -	u64 fdirmiss;
1: -	u64 fccrc;
1: -	u64 fcoerpdc;
1: -	u64 fcoeprc;
1: -	u64 fcoeptc;
1: -	u64 fcoedwrc;
1: -	u64 fcoedwtc;
1: -	u64 fcoe_noddp;
1: -	u64 fcoe_noddp_ext_buff;
1: -	u64 b2ospc;
1: -	u64 b2ogprc;
1: -	u64 o2bgptc;
1: -	u64 o2bspc;
1: +  u64 crcerrs;
1: +  u64 illerrc;
1: +  u64 errbc;
1: +  u64 mspdc;
1: +  u64 mpctotal;
1: +  u64 mpc[8];
1: +  u64 mlfc;
1: +  u64 mrfc;
1: +  u64 rlec;
1: +  u64 lxontxc;
1: +  u64 lxonrxc;
1: +  u64 lxofftxc;
1: +  u64 lxoffrxc;
1: +  u64 pxontxc[8];
1: +  u64 pxonrxc[8];
1: +  u64 pxofftxc[8];
1: +  u64 pxoffrxc[8];
1: +  u64 prc64;
1: +  u64 prc127;
1: +  u64 prc255;
1: +  u64 prc511;
1: +  u64 prc1023;
1: +  u64 prc1522;
1: +  u64 gprc;
1: +  u64 bprc;
1: +  u64 mprc;
1: +  u64 gptc;
1: +  u64 gorc;
1: +  u64 gotc;
1: +  u64 rnbc[8];
1: +  u64 ruc;
1: +  u64 rfc;
1: +  u64 roc;
1: +  u64 rjc;
1: +  u64 mngprc;
1: +  u64 mngpdc;
1: +  u64 mngptc;
1: +  u64 tor;
1: +  u64 tpr;
1: +  u64 tpt;
1: +  u64 ptc64;
1: +  u64 ptc127;
1: +  u64 ptc255;
1: +  u64 ptc511;
1: +  u64 ptc1023;
1: +  u64 ptc1522;
1: +  u64 mptc;
1: +  u64 bptc;
1: +  u64 xec;
1: +  u64 rqsmr[16];
1: +  u64 tqsmr[8];
1: +  u64 qprc[16];
1: +  u64 qptc[16];
1: +  u64 qbrc[16];
1: +  u64 qbtc[16];
1: +  u64 qprdc[16];
1: +  u64 pxon2offc[8];
1: +  u64 fdirustat_add;
1: +  u64 fdirustat_remove;
1: +  u64 fdirfstat_fadd;
1: +  u64 fdirfstat_fremove;
1: +  u64 fdirmatch;
1: +  u64 fdirmiss;
1: +  u64 fccrc;
1: +  u64 fcoerpdc;
1: +  u64 fcoeprc;
1: +  u64 fcoeptc;
1: +  u64 fcoedwrc;
1: +  u64 fcoedwtc;
1: +  u64 fcoe_noddp;
1: +  u64 fcoe_noddp_ext_buff;
1: +  u64 b2ospc;
1: +  u64 b2ogprc;
1: +  u64 o2bgptc;
1: +  u64 o2bspc;
1:  };
1:  
1:  struct ixgbe_hw;
1:  
1:  struct ixgbe_mac_operations {
1: -	s32 (*init_hw)(struct ixgbe_hw *);
1: -	s32 (*reset_hw)(struct ixgbe_hw *);
1: -	s32 (*start_hw)(struct ixgbe_hw *);
1: -	s32 (*clear_hw_cntrs)(struct ixgbe_hw *);
1: -	enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);
1: -	s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);
1: -	s32 (*get_san_mac_addr)(struct ixgbe_hw *, u8 *);
1: -	s32 (*get_device_caps)(struct ixgbe_hw *, u16 *);
1: -	s32 (*get_wwn_prefix)(struct ixgbe_hw *, u16 *, u16 *);
1: -	s32 (*stop_adapter)(struct ixgbe_hw *);
1: -	s32 (*get_bus_info)(struct ixgbe_hw *);
1: -	void (*set_lan_id)(struct ixgbe_hw *);
1: -	s32 (*read_analog_reg8)(struct ixgbe_hw *, u32, u8 *);
1: -	s32 (*write_analog_reg8)(struct ixgbe_hw *, u32, u8);
1: -	s32 (*setup_sfp)(struct ixgbe_hw *);
1: -	s32 (*disable_rx_buff)(struct ixgbe_hw *);
1: -	s32 (*enable_rx_buff)(struct ixgbe_hw *);
1: -	s32 (*enable_rx_dma)(struct ixgbe_hw *, u32);
1: -	s32 (*acquire_swfw_sync)(struct ixgbe_hw *, u32);
1: -	void (*release_swfw_sync)(struct ixgbe_hw *, u32);
1: -	void (*init_swfw_sync)(struct ixgbe_hw *);
1: -	s32 (*prot_autoc_read)(struct ixgbe_hw *, bool *, u32 *);
1: -	s32 (*prot_autoc_write)(struct ixgbe_hw *, u32, bool);
1: -	void (*disable_tx_laser)(struct ixgbe_hw *);
1: -	void (*enable_tx_laser)(struct ixgbe_hw *);
1: -	void (*flap_tx_laser)(struct ixgbe_hw *);
1: -	void (*stop_link_on_d3)(struct ixgbe_hw *);
1: -	s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool);
1: -	s32 (*setup_mac_link)(struct ixgbe_hw *, ixgbe_link_speed, bool);
1: -	s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);
1: -	s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *, bool *);
1: -	void (*set_rate_select_speed)(struct ixgbe_hw *, ixgbe_link_speed);
1: -	void (*set_rxpba)(struct ixgbe_hw *, int, u32, int);
1: -	s32 (*led_on)(struct ixgbe_hw *, u32);
1: -	s32 (*led_off)(struct ixgbe_hw *, u32);
1: -	s32 (*blink_led_start)(struct ixgbe_hw *, u32);
1: -	s32 (*blink_led_stop)(struct ixgbe_hw *, u32);
1: -	s32 (*init_led_link_act)(struct ixgbe_hw *);
1: -	s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32);
1: -	s32 (*clear_rar)(struct ixgbe_hw *, u32);
1: -	s32 (*set_vmdq)(struct ixgbe_hw *, u32, u32);
1: -	s32 (*set_vmdq_san_mac)(struct ixgbe_hw *, u32);
1: -	s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);
1: -	s32 (*init_rx_addrs)(struct ixgbe_hw *);
1: -	s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
1: -	s32 (*enable_mc)(struct ixgbe_hw *);
1: -	s32 (*disable_mc)(struct ixgbe_hw *);
1: -	s32 (*clear_vfta)(struct ixgbe_hw *);
1: -	s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool, bool);
1: -	s32 (*init_uta_tables)(struct ixgbe_hw *);
1: -	void (*set_mac_anti_spoofing)(struct ixgbe_hw *, bool, int);
1: -	void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
1: -	s32 (*fc_enable)(struct ixgbe_hw *);
1: -	s32 (*setup_fc)(struct ixgbe_hw *);
1: -	void (*fc_autoneg)(struct ixgbe_hw *);
1: -	s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8, u16, const char *);
1: -	s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
1: -	s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *);
1: -	bool (*fw_recovery_mode)(struct ixgbe_hw *);
1: -	void (*disable_rx)(struct ixgbe_hw *);
1: -	void (*enable_rx)(struct ixgbe_hw *);
1: -	void (*set_source_address_pruning)(struct ixgbe_hw *, bool, unsigned int);
1: -	void (*set_ethertype_anti_spoofing)(struct ixgbe_hw *, bool, int);
1: -	s32 (*dmac_config)(struct ixgbe_hw *);
1: -	s32 (*dmac_update_tcs)(struct ixgbe_hw *);
1: -	s32 (*dmac_config_tcs)(struct ixgbe_hw *);
1: -	s32 (*read_iosf_sb_reg)(struct ixgbe_hw *, u32, u32, u32 *);
1: -	s32 (*write_iosf_sb_reg)(struct ixgbe_hw *, u32, u32, u32);
1: +  s32 (*init_hw)(struct ixgbe_hw *);
1: +  s32 (*reset_hw)(struct ixgbe_hw *);
1: +  s32 (*start_hw)(struct ixgbe_hw *);
1: +  s32 (*clear_hw_cntrs)(struct ixgbe_hw *);
1: +  enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);
1: +  s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);
1: +  s32 (*get_san_mac_addr)(struct ixgbe_hw *, u8 *);
1: +  s32 (*get_device_caps)(struct ixgbe_hw *, u16 *);
1: +  s32 (*get_wwn_prefix)(struct ixgbe_hw *, u16 *, u16 *);
1: +  s32 (*stop_adapter)(struct ixgbe_hw *);
1: +  s32 (*get_bus_info)(struct ixgbe_hw *);
1: +  void (*set_lan_id)(struct ixgbe_hw *);
1: +  s32 (*read_analog_reg8)(struct ixgbe_hw *, u32, u8 *);
1: +  s32 (*write_analog_reg8)(struct ixgbe_hw *, u32, u8);
1: +  s32 (*setup_sfp)(struct ixgbe_hw *);
1: +  s32 (*disable_rx_buff)(struct ixgbe_hw *);
1: +  s32 (*enable_rx_buff)(struct ixgbe_hw *);
1: +  s32 (*enable_rx_dma)(struct ixgbe_hw *, u32);
1: +  s32 (*acquire_swfw_sync)(struct ixgbe_hw *, u32);
1: +  void (*release_swfw_sync)(struct ixgbe_hw *, u32);
1: +  void (*init_swfw_sync)(struct ixgbe_hw *);
1: +  s32 (*prot_autoc_read)(struct ixgbe_hw *, bool *, u32 *);
1: +  s32 (*prot_autoc_write)(struct ixgbe_hw *, u32, bool);
1: +  void (*disable_tx_laser)(struct ixgbe_hw *);
1: +  void (*enable_tx_laser)(struct ixgbe_hw *);
1: +  void (*flap_tx_laser)(struct ixgbe_hw *);
1: +  void (*stop_link_on_d3)(struct ixgbe_hw *);
1: +  s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool);
1: +  s32 (*setup_mac_link)(struct ixgbe_hw *, ixgbe_link_speed, bool);
1: +  s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);
1: +  s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *, bool *);
1: +  void (*set_rate_select_speed)(struct ixgbe_hw *, ixgbe_link_speed);
1: +  void (*set_rxpba)(struct ixgbe_hw *, int, u32, int);
1: +  s32 (*led_on)(struct ixgbe_hw *, u32);
1: +  s32 (*led_off)(struct ixgbe_hw *, u32);
1: +  s32 (*blink_led_start)(struct ixgbe_hw *, u32);
1: +  s32 (*blink_led_stop)(struct ixgbe_hw *, u32);
1: +  s32 (*init_led_link_act)(struct ixgbe_hw *);
1: +  s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32);
1: +  s32 (*clear_rar)(struct ixgbe_hw *, u32);
1: +  s32 (*set_vmdq)(struct ixgbe_hw *, u32, u32);
1: +  s32 (*set_vmdq_san_mac)(struct ixgbe_hw *, u32);
1: +  s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);
1: +  s32 (*init_rx_addrs)(struct ixgbe_hw *);
1: +  s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
1: +  s32 (*enable_mc)(struct ixgbe_hw *);
1: +  s32 (*disable_mc)(struct ixgbe_hw *);
1: +  s32 (*clear_vfta)(struct ixgbe_hw *);
1: +  s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool, bool);
1: +  s32 (*init_uta_tables)(struct ixgbe_hw *);
1: +  void (*set_mac_anti_spoofing)(struct ixgbe_hw *, bool, int);
1: +  void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
1: +  s32 (*fc_enable)(struct ixgbe_hw *);
1: +  s32 (*setup_fc)(struct ixgbe_hw *);
1: +  void (*fc_autoneg)(struct ixgbe_hw *);
1: +  s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8, u16, const char *);
1: +  s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
1: +  s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *);
1: +  bool (*fw_recovery_mode)(struct ixgbe_hw *);
1: +  void (*disable_rx)(struct ixgbe_hw *);
1: +  void (*enable_rx)(struct ixgbe_hw *);
1: +  void (*set_source_address_pruning)(struct ixgbe_hw *, bool, unsigned int);
1: +  void (*set_ethertype_anti_spoofing)(struct ixgbe_hw *, bool, int);
1: +  s32 (*dmac_config)(struct ixgbe_hw *);
1: +  s32 (*dmac_update_tcs)(struct ixgbe_hw *);
1: +  s32 (*dmac_config_tcs)(struct ixgbe_hw *);
1: +  s32 (*read_iosf_sb_reg)(struct ixgbe_hw *, u32, u32, u32 *);
1: +  s32 (*write_iosf_sb_reg)(struct ixgbe_hw *, u32, u32, u32);
1:  };
1:  
1:  struct ixgbe_mac_info {
1: -	struct ixgbe_mac_operations ops;
1: -	enum ixgbe_mac_type type;
1: -	u8 addr[6];
1: -	u8 perm_addr[6];
1: -	u8 san_addr[6];
1: -	u16 wwnn_prefix;
1: -	u16 wwpn_prefix;
1: -	u16 max_msix_vectors;
1: -	u32 mta_shadow[128];
1: -	s32 mc_filter_type;
1: -	u32 mcft_size;
1: -	u32 vft_size;
1: -	u32 num_rar_entries;
1: -	u32 rar_highwater;
1: -	u32 rx_pb_size;
1: -	u32 max_tx_queues;
1: -	u32 max_rx_queues;
1: -	u32 orig_autoc;
1: -	u32 orig_autoc2;
1: -	bool orig_link_settings_stored;
1: -	bool autotry_restart;
1: -	u8 flags;
1: -	u8 san_mac_rar_index;
1: -	struct ixgbe_thermal_sensor_data thermal_sensor_data;
1: -	bool set_lben;
1: -	u8 led_link_act;
1: +  struct ixgbe_mac_operations ops;
1: +  enum ixgbe_mac_type type;
1: +  u8 addr[6];
1: +  u8 perm_addr[6];
1: +  u8 san_addr[6];
1: +  u16 wwnn_prefix;
1: +  u16 wwpn_prefix;
1: +  u16 max_msix_vectors;
1: +  u32 mta_shadow[128];
1: +  s32 mc_filter_type;
1: +  u32 mcft_size;
1: +  u32 vft_size;
1: +  u32 num_rar_entries;
1: +  u32 rar_highwater;
1: +  u32 rx_pb_size;
1: +  u32 max_tx_queues;
1: +  u32 max_rx_queues;
1: +  u32 orig_autoc;
1: +  u32 orig_autoc2;
1: +  bool orig_link_settings_stored;
1: +  bool autotry_restart;
1: +  u8 flags;
1: +  u8 san_mac_rar_index;
1: +  struct ixgbe_thermal_sensor_data thermal_sensor_data;
1: +  bool set_lben;
1: +  u8 led_link_act;
1:  };
1:  
1:  struct ixgbe_phy_operations {
1: -	s32 (*identify)(struct ixgbe_hw *);
1: -	s32 (*identify_sfp)(struct ixgbe_hw *);
1: -	s32 (*init)(struct ixgbe_hw *);
1: -	s32 (*reset)(struct ixgbe_hw *);
1: -	s32 (*read_reg)(struct ixgbe_hw *, u32, u32, u16 *);
1: -	s32 (*write_reg)(struct ixgbe_hw *, u32, u32, u16);
1: -	s32 (*read_reg_mdi)(struct ixgbe_hw *, u32, u32, u16 *);
1: -	s32 (*write_reg_mdi)(struct ixgbe_hw *, u32, u32, u16);
1: -	s32 (*setup_link)(struct ixgbe_hw *);
1: -	s32 (*setup_internal_link)(struct ixgbe_hw *);
1: -	s32 (*setup_link_speed)(struct ixgbe_hw *, ixgbe_link_speed, bool);
1: -	s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *);
1: -	s32 (*read_i2c_byte)(struct ixgbe_hw *, u8, u8, u8 *);
1: -	s32 (*write_i2c_byte)(struct ixgbe_hw *, u8, u8, u8);
1: -	s32 (*read_i2c_sff8472)(struct ixgbe_hw *, u8, u8 *);
1: -	s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8, u8 *);
1: -	s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
1: -	s32 (*check_overtemp)(struct ixgbe_hw *);
1: -	s32 (*set_phy_power)(struct ixgbe_hw *, bool);
1: -	s32 (*enter_lplu)(struct ixgbe_hw *);
1: -	s32 (*handle_lasi)(struct ixgbe_hw *);
1: -	s32 (*read_i2c_byte_unlocked)(struct ixgbe_hw *, u8, u8, u8 *);
1: -	s32 (*write_i2c_byte_unlocked)(struct ixgbe_hw *, u8, u8, u8);
1: +  s32 (*identify)(struct ixgbe_hw *);
1: +  s32 (*identify_sfp)(struct ixgbe_hw *);
1: +  s32 (*init)(struct ixgbe_hw *);
1: +  s32 (*reset)(struct ixgbe_hw *);
1: +  s32 (*read_reg)(struct ixgbe_hw *, u32, u32, u16 *);
1: +  s32 (*write_reg)(struct ixgbe_hw *, u32, u32, u16);
1: +  s32 (*read_reg_mdi)(struct ixgbe_hw *, u32, u32, u16 *);
1: +  s32 (*write_reg_mdi)(struct ixgbe_hw *, u32, u32, u16);
1: +  s32 (*setup_link)(struct ixgbe_hw *);
1: +  s32 (*setup_internal_link)(struct ixgbe_hw *);
1: +  s32 (*setup_link_speed)(struct ixgbe_hw *, ixgbe_link_speed, bool);
1: +  s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *);
1: +  s32 (*read_i2c_byte)(struct ixgbe_hw *, u8, u8, u8 *);
1: +  s32 (*write_i2c_byte)(struct ixgbe_hw *, u8, u8, u8);
1: +  s32 (*read_i2c_sff8472)(struct ixgbe_hw *, u8, u8 *);
1: +  s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8, u8 *);
1: +  s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
1: +  s32 (*check_overtemp)(struct ixgbe_hw *);
1: +  s32 (*set_phy_power)(struct ixgbe_hw *, bool);
1: +  s32 (*enter_lplu)(struct ixgbe_hw *);
1: +  s32 (*handle_lasi)(struct ixgbe_hw *);
1: +  s32 (*read_i2c_byte_unlocked)(struct ixgbe_hw *, u8, u8, u8 *);
1: +  s32 (*write_i2c_byte_unlocked)(struct ixgbe_hw *, u8, u8, u8);
1:  };
1:  
1:  struct ixgbe_phy_info {
1: -	struct ixgbe_phy_operations ops;
1: -	struct mdio_if_info mdio;
1: -	enum ixgbe_phy_type type;
1: -	u32 id;
1: -	enum ixgbe_sfp_type sfp_type;
1: -	bool sfp_setup_needed;
1: -	u32 revision;
1: -	enum ixgbe_media_type media_type;
1: -	u32 phy_semaphore_mask;
1: -	bool reset_disable;
1: -	ixgbe_autoneg_advertised autoneg_advertised;
1: -	ixgbe_link_speed speeds_supported;
1: -	ixgbe_link_speed eee_speeds_supported;
1: -	ixgbe_link_speed eee_speeds_advertised;
1: -	enum ixgbe_smart_speed smart_speed;
1: -	bool smart_speed_active;
1: -	bool multispeed_fiber;
1: -	bool reset_if_overtemp;
1: -	bool qsfp_shared_i2c_bus;
1: -	u32 nw_mng_if_sel;
1: +  struct ixgbe_phy_operations ops;
1: +  struct mdio_if_info mdio;
1: +  enum ixgbe_phy_type type;
1: +  u32 id;
1: +  enum ixgbe_sfp_type sfp_type;
1: +  bool sfp_setup_needed;
1: +  u32 revision;
1: +  enum ixgbe_media_type media_type;
1: +  u32 phy_semaphore_mask;
1: +  bool reset_disable;
1: +  ixgbe_autoneg_advertised autoneg_advertised;
1: +  ixgbe_link_speed speeds_supported;
1: +  ixgbe_link_speed eee_speeds_supported;
1: +  ixgbe_link_speed eee_speeds_advertised;
1: +  enum ixgbe_smart_speed smart_speed;
1: +  bool smart_speed_active;
1: +  bool multispeed_fiber;
1: +  bool reset_if_overtemp;
1: +  bool qsfp_shared_i2c_bus;
1: +  u32 nw_mng_if_sel;
1:  };
1:  
1:  struct ixgbe_link_operations {
1: -	s32 (*read_link)(struct ixgbe_hw *, u8, u16, u16 *);
1: -	s32 (*read_link_unlocked)(struct ixgbe_hw *, u8, u16, u16 *);
1: -	s32 (*write_link)(struct ixgbe_hw *, u8, u16, u16);
1: -	s32 (*write_link_unlocked)(struct ixgbe_hw *, u8, u16, u16);
1: +  s32 (*read_link)(struct ixgbe_hw *, u8, u16, u16 *);
1: +  s32 (*read_link_unlocked)(struct ixgbe_hw *, u8, u16, u16 *);
1: +  s32 (*write_link)(struct ixgbe_hw *, u8, u16, u16);
1: +  s32 (*write_link_unlocked)(struct ixgbe_hw *, u8, u16, u16);
1:  };
1:  
1:  struct ixgbe_link_info {
1: -	struct ixgbe_link_operations ops;
1: -	u8 addr;
1: +  struct ixgbe_link_operations ops;
1: +  u8 addr;
1:  };
1:  
1:  struct ixgbe_eeprom_operations {
1: -	s32 (*init_params)(struct ixgbe_hw *);
1: -	s32 (*read)(struct ixgbe_hw *, u16, u16 *);
1: -	s32 (*read_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
1: -	s32 (*write)(struct ixgbe_hw *, u16, u16);
1: -	s32 (*write_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
1: -	s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
1: -	s32 (*update_checksum)(struct ixgbe_hw *);
1: -	s32 (*calc_checksum)(struct ixgbe_hw *);
1: +  s32 (*init_params)(struct ixgbe_hw *);
1: +  s32 (*read)(struct ixgbe_hw *, u16, u16 *);
1: +  s32 (*read_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
1: +  s32 (*write)(struct ixgbe_hw *, u16, u16);
1: +  s32 (*write_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
1: +  s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
1: +  s32 (*update_checksum)(struct ixgbe_hw *);
1: +  s32 (*calc_checksum)(struct ixgbe_hw *);
1:  };
1:  
1:  struct ixgbe_eeprom_info {
1: -	struct ixgbe_eeprom_operations ops;
1: -	enum ixgbe_eeprom_type type;
1: -	u32 semaphore_delay;
1: -	u16 word_size;
1: -	u16 address_bits;
1: -	u16 word_page_size;
1: -	u16 ctrl_word_3;
1: +  struct ixgbe_eeprom_operations ops;
1: +  enum ixgbe_eeprom_type type;
1: +  u32 semaphore_delay;
1: +  u16 word_size;
1: +  u16 address_bits;
1: +  u16 word_page_size;
1: +  u16 ctrl_word_3;
1:  };
1:  
1:  struct ixgbe_mbx_stats {
1: -	u32 msgs_tx;
1: -	u32 msgs_rx;
1: -	u32 acks;
1: -	u32 reqs;
1: -	u32 rsts;
1: +  u32 msgs_tx;
1: +  u32 msgs_rx;
1: +  u32 acks;
1: +  u32 reqs;
1: +  u32 rsts;
1:  };
1:  
1:  struct ixgbe_mbx_operations;
1:  
1:  struct ixgbe_mbx_info {
1: -	const struct ixgbe_mbx_operations *ops;
1: -	struct ixgbe_mbx_stats stats;
1: -	u32 timeout;
1: -	u32 usec_delay;
1: -	u32 v2p_mailbox;
1: -	u16 size;
1: +  const struct ixgbe_mbx_operations *ops;
1: +  struct ixgbe_mbx_stats stats;
1: +  u32 timeout;
1: +  u32 usec_delay;
1: +  u32 v2p_mailbox;
1: +  u16 size;
1:  };
1:  
1:  struct ixgbe_hw {
1: -	u8 *hw_addr;
1: -	void *back;
1: -	struct ixgbe_mac_info mac;
1: -	struct ixgbe_addr_filter_info addr_ctrl;
1: -	struct ixgbe_fc_info fc;
1: -	struct ixgbe_phy_info phy;
1: -	struct ixgbe_link_info link;
1: -	struct ixgbe_eeprom_info eeprom;
1: -	struct ixgbe_bus_info bus;
1: -	struct ixgbe_mbx_info mbx;
1: -	const u32 *mvals;
1: -	u16 device_id;
1: -	u16 vendor_id;
1: -	u16 subsystem_device_id;
1: -	u16 subsystem_vendor_id;
1: -	u8 revision_id;
1: -	bool adapter_stopped;
1: -	bool force_full_reset;
1: -	bool allow_unsupported_sfp;
1: -	bool wol_enabled;
1: -	bool need_crosstalk_fix;
1: +  u8 *hw_addr;
1: +  void *back;
1: +  struct ixgbe_mac_info mac;
1: +  struct ixgbe_addr_filter_info addr_ctrl;
1: +  struct ixgbe_fc_info fc;
1: +  struct ixgbe_phy_info phy;
1: +  struct ixgbe_link_info link;
1: +  struct ixgbe_eeprom_info eeprom;
1: +  struct ixgbe_bus_info bus;
1: +  struct ixgbe_mbx_info mbx;
1: +  const u32 *mvals;
1: +  u16 device_id;
1: +  u16 vendor_id;
1: +  u16 subsystem_device_id;
1: +  u16 subsystem_vendor_id;
1: +  u8 revision_id;
1: +  bool adapter_stopped;
1: +  bool force_full_reset;
1: +  bool allow_unsupported_sfp;
1: +  bool wol_enabled;
1: +  bool need_crosstalk_fix;
1:  };
1:  
1:  struct ixgbe_mbx_operations {
1: -	s32 (*init_params)(struct ixgbe_hw *);
1: -	s32 (*read)(struct ixgbe_hw *, u32 *, u16, u16);
1: -	s32 (*write)(struct ixgbe_hw *, u32 *, u16, u16);
1: -	s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16, u16);
1: -	s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16, u16);
1: -	s32 (*check_for_msg)(struct ixgbe_hw *, u16);
1: -	s32 (*check_for_ack)(struct ixgbe_hw *, u16);
1: -	s32 (*check_for_rst)(struct ixgbe_hw *, u16);
1: +  s32 (*init_params)(struct ixgbe_hw *);
1: +  s32 (*read)(struct ixgbe_hw *, u32 *, u16, u16);
1: +  s32 (*write)(struct ixgbe_hw *, u32 *, u16, u16);
1: +  s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16, u16);
1: +  s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16, u16);
1: +  s32 (*check_for_msg)(struct ixgbe_hw *, u16);
1: +  s32 (*check_for_ack)(struct ixgbe_hw *, u16);
1: +  s32 (*check_for_rst)(struct ixgbe_hw *, u16);
1:  };
1:  
1:  struct ixgbe_info {
1: -	enum ixgbe_mac_type mac;
1: -	s32 (*get_invariants)(struct ixgbe_hw *);
1: -	const struct ixgbe_mac_operations *mac_ops;
1: -	const struct ixgbe_eeprom_operations *eeprom_ops;
1: -	const struct ixgbe_phy_operations *phy_ops;
1: -	const struct ixgbe_mbx_operations *mbx_ops;
1: -	const struct ixgbe_link_operations *link_ops;
1: -	const u32 *mvals;
1: +  enum ixgbe_mac_type mac;
1: +  s32 (*get_invariants)(struct ixgbe_hw *);
1: +  const struct ixgbe_mac_operations *mac_ops;
1: +  const struct ixgbe_eeprom_operations *eeprom_ops;
1: +  const struct ixgbe_phy_operations *phy_ops;
1: +  const struct ixgbe_mbx_operations *mbx_ops;
1: +  const struct ixgbe_link_operations *link_ops;
1: +  const u32 *mvals;
1:  };
1:  
1:  enum strict_prio_type {
1: -	prio_none = 0,
1: -	prio_group = 1,
1: -	prio_link = 2,
1: +  prio_none = 0,
1: +  prio_group = 1,
1: +  prio_link = 2,
1:  };
1:  
1:  struct dcb_support {
1: -	u32 capabilities;
1: -	u8 traffic_classes;
1: -	u8 pfc_traffic_classes;
1: +  u32 capabilities;
1: +  u8 traffic_classes;
1: +  u8 pfc_traffic_classes;
1:  };
1:  
1:  struct tc_bw_alloc {
1: -	u8 bwg_id;
1: -	u8 bwg_percent;
1: -	u8 link_percent;
1: -	u8 up_to_tc_bitmap;
1: -	u16 data_credits_refill;
1: -	u16 data_credits_max;
1: -	enum strict_prio_type prio_type;
1: +  u8 bwg_id;
1: +  u8 bwg_percent;
1: +  u8 link_percent;
1: +  u8 up_to_tc_bitmap;
1: +  u16 data_credits_refill;
1: +  u16 data_credits_max;
1: +  enum strict_prio_type prio_type;
1:  };
1:  
1:  enum dcb_pfc_type {
1: -	pfc_disabled = 0,
1: -	pfc_enabled_full = 1,
1: -	pfc_enabled_tx = 2,
1: -	pfc_enabled_rx = 3,
1: +  pfc_disabled = 0,
1: +  pfc_enabled_full = 1,
1: +  pfc_enabled_tx = 2,
1: +  pfc_enabled_rx = 3,
1:  };
1:  
1:  struct tc_configuration {
1: -	struct tc_bw_alloc path[2];
1: -	enum dcb_pfc_type dcb_pfc;
1: -	u16 desc_credits_max;
1: -	u8 tc;
1: +  struct tc_bw_alloc path[2];
1: +  enum dcb_pfc_type dcb_pfc;
1: +  u16 desc_credits_max;
1: +  u8 tc;
1:  };
1:  
1:  struct dcb_num_tcs {
1: -	u8 pg_tcs;
1: -	u8 pfc_tcs;
1: +  u8 pg_tcs;
1: +  u8 pfc_tcs;
1:  };
1:  
1:  struct ixgbe_dcb_config {
1: -	struct dcb_support support;
1: -	struct dcb_num_tcs num_tcs;
1: -	struct tc_configuration tc_config[8];
1: -	u8 bw_percentage[16];
1: -	bool pfc_mode_enable;
1: -	u32 dcb_cfg_version;
1: -	u32 link_speed;
1: +  struct dcb_support support;
1: +  struct dcb_num_tcs num_tcs;
1: +  struct tc_configuration tc_config[8];
1: +  u8 bw_percentage[16];
1: +  bool pfc_mode_enable;
1: +  u32 dcb_cfg_version;
1: +  u32 link_speed;
1:  };
1:  
1:  struct ixgbe_ipsec_tx_data {
1: -	u32 flags;
1: -	u16 trailer_len;
1: -	u16 sa_idx;
1: +  u32 flags;
1: +  u16 trailer_len;
1: +  u16 sa_idx;
1:  };
1:  
1:  enum ixgbe_tx_flags {
1: -	IXGBE_TX_FLAGS_HW_VLAN = 1,
1: -	IXGBE_TX_FLAGS_TSO = 2,
1: -	IXGBE_TX_FLAGS_TSTAMP = 4,
1: -	IXGBE_TX_FLAGS_CC = 8,
1: -	IXGBE_TX_FLAGS_IPV4 = 16,
1: -	IXGBE_TX_FLAGS_CSUM = 32,
1: -	IXGBE_TX_FLAGS_IPSEC = 64,
1: -	IXGBE_TX_FLAGS_SW_VLAN = 128,
1: -	IXGBE_TX_FLAGS_FCOE = 256,
1: +  IXGBE_TX_FLAGS_HW_VLAN = 1,
1: +  IXGBE_TX_FLAGS_TSO = 2,
1: +  IXGBE_TX_FLAGS_TSTAMP = 4,
1: +  IXGBE_TX_FLAGS_CC = 8,
1: +  IXGBE_TX_FLAGS_IPV4 = 16,
1: +  IXGBE_TX_FLAGS_CSUM = 32,
1: +  IXGBE_TX_FLAGS_IPSEC = 64,
1: +  IXGBE_TX_FLAGS_SW_VLAN = 128,
1: +  IXGBE_TX_FLAGS_FCOE = 256,
1:  };
1:  
1:  struct vf_data_storage {
1: -	struct pci_dev *vfdev;
1: -	unsigned char vf_mac_addresses[6];
1: -	u16 vf_mc_hashes[30];
1: -	u16 num_vf_mc_hashes;
1: -	bool clear_to_send;
1: -	bool pf_set_mac;
1: -	u16 pf_vlan;
1: -	u16 pf_qos;
1: -	u16 tx_rate;
1: -	u8 spoofchk_enabled;
1: -	bool rss_query_enabled;
1: -	u8 trusted;
1: -	int xcast_mode;
1: -	unsigned int vf_api;
1: +  struct pci_dev *vfdev;
1: +  unsigned char vf_mac_addresses[6];
1: +  u16 vf_mc_hashes[30];
1: +  u16 num_vf_mc_hashes;
1: +  bool clear_to_send;
1: +  bool pf_set_mac;
1: +  u16 pf_vlan;
1: +  u16 pf_qos;
1: +  u16 tx_rate;
1: +  u8 spoofchk_enabled;
1: +  bool rss_query_enabled;
1: +  u8 trusted;
1: +  int xcast_mode;
1: +  unsigned int vf_api;
1:  };
1:  
1:  struct vf_macvlans {
1: -	struct list_head l;
1: -	int vf;
1: -	bool free;
1: -	bool is_macvlan;
1: -	u8 vf_macvlan[6];
1: +  struct list_head l;
1: +  int vf;
1: +  bool free;
1: +  bool is_macvlan;
1: +  u8 vf_macvlan[6];
1:  };
1:  
1:  struct ixgbe_tx_buffer {
1: -	union ixgbe_adv_tx_desc *next_to_watch;
1: -	long unsigned int time_stamp;
1: -	union {
1: -		struct sk_buff *skb;
1: -		struct xdp_frame *xdpf;
1: -	};
1: -	unsigned int bytecount;
1: -	short unsigned int gso_segs;
1: -	__be16 protocol;
1: -	dma_addr_t dma;
1: -	__u32 len;
1: -	u32 tx_flags;
1: +  union ixgbe_adv_tx_desc *next_to_watch;
1: +  long unsigned int time_stamp;
1: +  union {
1: +    struct sk_buff *skb;
1: +    struct xdp_frame *xdpf;
1: +  };
1: +  unsigned int bytecount;
1: +  short unsigned int gso_segs;
1: +  __be16 protocol;
1: +  dma_addr_t dma;
1: +  __u32 len;
1: +  u32 tx_flags;
1:  };
1:  
1:  struct ixgbe_rx_buffer {
1: -	union {
1: -		struct {
1: -			struct sk_buff *skb;
1: -			dma_addr_t dma;
1: -			struct page *page;
1: -			__u32 page_offset;
1: -			__u16 pagecnt_bias;
1: -		};
1: -		struct {
1: -			bool discard;
1: -			struct xdp_buff *xdp;
1: -		};
1: -	};
1: +  union {
1: +    struct {
1: +      struct sk_buff *skb;
1: +      dma_addr_t dma;
1: +      struct page *page;
1: +      __u32 page_offset;
1: +      __u16 pagecnt_bias;
1: +    };
1: +    struct {
1: +      bool discard;
1: +      struct xdp_buff *xdp;
1: +    };
1: +  };
1:  };
1:  
1:  struct ixgbe_queue_stats {
1: -	u64 packets;
1: -	u64 bytes;
1: +  u64 packets;
1: +  u64 bytes;
1:  };
1:  
1:  struct ixgbe_tx_queue_stats {
1: -	u64 restart_queue;
1: -	u64 tx_busy;
1: -	u64 tx_done_old;
1: +  u64 restart_queue;
1: +  u64 tx_busy;
1: +  u64 tx_done_old;
1:  };
1:  
1:  struct ixgbe_rx_queue_stats {
1: -	u64 rsc_count;
1: -	u64 rsc_flush;
1: -	u64 non_eop_descs;
1: -	u64 alloc_rx_page;
1: -	u64 alloc_rx_page_failed;
1: -	u64 alloc_rx_buff_failed;
1: -	u64 csum_err;
1: +  u64 rsc_count;
1: +  u64 rsc_flush;
1: +  u64 non_eop_descs;
1: +  u64 alloc_rx_page;
1: +  u64 alloc_rx_page_failed;
1: +  u64 alloc_rx_buff_failed;
1: +  u64 csum_err;
1:  };
1:  
1:  enum ixgbe_ring_state_t {
1: -	__IXGBE_RX_3K_BUFFER = 0,
1: -	__IXGBE_RX_BUILD_SKB_ENABLED = 1,
1: -	__IXGBE_RX_RSC_ENABLED = 2,
1: -	__IXGBE_RX_CSUM_UDP_ZERO_ERR = 3,
1: -	__IXGBE_RX_FCOE = 4,
1: -	__IXGBE_TX_FDIR_INIT_DONE = 5,
1: -	__IXGBE_TX_XPS_INIT_DONE = 6,
1: -	__IXGBE_TX_DETECT_HANG = 7,
1: -	__IXGBE_HANG_CHECK_ARMED = 8,
1: -	__IXGBE_TX_XDP_RING = 9,
1: -	__IXGBE_TX_DISABLED = 10,
1: +  __IXGBE_RX_3K_BUFFER = 0,
1: +  __IXGBE_RX_BUILD_SKB_ENABLED = 1,
1: +  __IXGBE_RX_RSC_ENABLED = 2,
1: +  __IXGBE_RX_CSUM_UDP_ZERO_ERR = 3,
1: +  __IXGBE_RX_FCOE = 4,
1: +  __IXGBE_TX_FDIR_INIT_DONE = 5,
1: +  __IXGBE_TX_XPS_INIT_DONE = 6,
1: +  __IXGBE_TX_DETECT_HANG = 7,
1: +  __IXGBE_HANG_CHECK_ARMED = 8,
1: +  __IXGBE_TX_XDP_RING = 9,
1: +  __IXGBE_TX_DISABLED = 10,
1:  };
1:  
1:  struct ixgbe_fwd_adapter {
1: -	long unsigned int active_vlans[64];
1: -	struct net_device *netdev;
1: -	unsigned int tx_base_queue;
1: -	unsigned int rx_base_queue;
1: -	int pool;
1: +  long unsigned int active_vlans[64];
1: +  struct net_device *netdev;
1: +  unsigned int tx_base_queue;
1: +  unsigned int rx_base_queue;
1: +  int pool;
1:  };
1:  
1:  struct ixgbe_q_vector;
1:  
1:  struct ixgbe_ring {
1: -	struct ixgbe_ring *next;
1: -	struct ixgbe_q_vector *q_vector;
1: -	struct net_device *netdev;
1: -	struct bpf_prog *xdp_prog;
1: -	struct device *dev;
1: -	void *desc;
1: -	union {
1: -		struct ixgbe_tx_buffer *tx_buffer_info;
1: -		struct ixgbe_rx_buffer *rx_buffer_info;
1: -	};
1: -	long unsigned int state;
1: -	u8 *tail;
1: -	dma_addr_t dma;
1: -	unsigned int size;
1: -	u16 count;
1: -	u8 queue_index;
1: -	u8 reg_idx;
1: -	u16 next_to_use;
1: -	u16 next_to_clean;
1: -	long unsigned int last_rx_timestamp;
1: -	union {
1: -		u16 next_to_alloc;
1: -		struct {
1: -			u8 atr_sample_rate;
1: -			u8 atr_count;
1: -		};
1: -	};
1: -	u8 dcb_tc;
1: -	struct ixgbe_queue_stats stats;
1: -	struct u64_stats_sync syncp;
1: -	union {
1: -		struct ixgbe_tx_queue_stats tx_stats;
1: -		struct ixgbe_rx_queue_stats rx_stats;
1: -	};
1: -	long: 64;
1: -	struct xdp_rxq_info xdp_rxq;
1: -	struct xsk_buff_pool *xsk_pool;
1: -	u16 ring_idx;
1: -	u16 rx_buf_len;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct ixgbe_ring *next;
1: +  struct ixgbe_q_vector *q_vector;
1: +  struct net_device *netdev;
1: +  struct bpf_prog *xdp_prog;
1: +  struct device *dev;
1: +  void *desc;
1: +  union {
1: +    struct ixgbe_tx_buffer *tx_buffer_info;
1: +    struct ixgbe_rx_buffer *rx_buffer_info;
1: +  };
1: +  long unsigned int state;
1: +  u8 *tail;
1: +  dma_addr_t dma;
1: +  unsigned int size;
1: +  u16 count;
1: +  u8 queue_index;
1: +  u8 reg_idx;
1: +  u16 next_to_use;
1: +  u16 next_to_clean;
1: +  long unsigned int last_rx_timestamp;
1: +  union {
1: +    u16 next_to_alloc;
1: +    struct {
1: +      u8 atr_sample_rate;
1: +      u8 atr_count;
1: +    };
1: +  };
1: +  u8 dcb_tc;
1: +  struct ixgbe_queue_stats stats;
1: +  struct u64_stats_sync syncp;
1: +  union {
1: +    struct ixgbe_tx_queue_stats tx_stats;
1: +    struct ixgbe_rx_queue_stats rx_stats;
1: +  };
1: +  long : 64;
1: +  struct xdp_rxq_info xdp_rxq;
1: +  struct xsk_buff_pool *xsk_pool;
1: +  u16 ring_idx;
1: +  u16 rx_buf_len;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ixgbe_ring_container {
1: -	struct ixgbe_ring *ring;
1: -	long unsigned int next_update;
1: -	unsigned int total_bytes;
1: -	unsigned int total_packets;
1: -	u16 work_limit;
1: -	u8 count;
1: -	u8 itr;
1: +  struct ixgbe_ring *ring;
1: +  long unsigned int next_update;
1: +  unsigned int total_bytes;
1: +  unsigned int total_packets;
1: +  u16 work_limit;
1: +  u8 count;
1: +  u8 itr;
1:  };
1:  
1:  struct ixgbe_adapter;
1:  
1:  struct ixgbe_q_vector {
1: -	struct ixgbe_adapter *adapter;
1: -	int cpu;
1: -	u16 v_idx;
1: -	u16 itr;
1: -	struct ixgbe_ring_container rx;
1: -	struct ixgbe_ring_container tx;
1: -	struct napi_struct napi;
1: -	cpumask_t affinity_mask;
1: -	int numa_node;
1: -	struct callback_head rcu;
1: -	char name[25];
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ixgbe_ring ring[0];
1: +  struct ixgbe_adapter *adapter;
1: +  int cpu;
1: +  u16 v_idx;
1: +  u16 itr;
1: +  struct ixgbe_ring_container rx;
1: +  struct ixgbe_ring_container tx;
1: +  struct napi_struct napi;
1: +  cpumask_t affinity_mask;
1: +  int numa_node;
1: +  struct callback_head rcu;
1: +  char name[25];
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ixgbe_ring ring[0];
1:  };
1:  
1:  enum ixgbe_ring_f_enum {
1: -	RING_F_NONE = 0,
1: -	RING_F_VMDQ = 1,
1: -	RING_F_RSS = 2,
1: -	RING_F_FDIR = 3,
1: -	RING_F_ARRAY_SIZE = 4,
1: +  RING_F_NONE = 0,
1: +  RING_F_VMDQ = 1,
1: +  RING_F_RSS = 2,
1: +  RING_F_FDIR = 3,
1: +  RING_F_ARRAY_SIZE = 4,
1:  };
1:  
1:  struct ixgbe_ring_feature {
1: -	u16 limit;
1: -	u16 indices;
1: -	u16 mask;
1: -	u16 offset;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u16 limit;
1: +  u16 indices;
1: +  u16 mask;
1: +  u16 offset;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ptp_clock;
1: @@ -95963,162 +97088,162 @@ struct hwmon_buff;
1:  struct ixgbe_jump_table;
1:  
1:  struct ixgbe_adapter {
1: -	long unsigned int active_vlans[64];
1: -	struct net_device *netdev;
1: -	struct bpf_prog *xdp_prog;
1: -	struct pci_dev *pdev;
1: -	struct mii_bus *mii_bus;
1: -	long unsigned int state;
1: -	u32 flags;
1: -	u32 flags2;
1: -	int num_tx_queues;
1: -	u16 tx_itr_setting;
1: -	u16 tx_work_limit;
1: -	u64 tx_ipsec;
1: -	int num_rx_queues;
1: -	u16 rx_itr_setting;
1: -	u64 rx_ipsec;
1: -	__be16 vxlan_port;
1: -	__be16 geneve_port;
1: -	int num_xdp_queues;
1: -	struct ixgbe_ring *xdp_ring[64];
1: -	long unsigned int *af_xdp_zc_qps;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ixgbe_ring *tx_ring[64];
1: -	u64 restart_queue;
1: -	u64 lsc_int;
1: -	u32 tx_timeout_count;
1: -	struct ixgbe_ring *rx_ring[64];
1: -	int num_rx_pools;
1: -	int num_rx_queues_per_pool;
1: -	u64 hw_csum_rx_error;
1: -	u64 hw_rx_no_dma_resources;
1: -	u64 rsc_total_count;
1: -	u64 rsc_total_flush;
1: -	u64 non_eop_descs;
1: -	u32 alloc_rx_page;
1: -	u32 alloc_rx_page_failed;
1: -	u32 alloc_rx_buff_failed;
1: -	struct ixgbe_q_vector *q_vector[64];
1: -	struct ieee_pfc *ixgbe_ieee_pfc;
1: -	struct ieee_ets *ixgbe_ieee_ets;
1: -	struct ixgbe_dcb_config dcb_cfg;
1: -	struct ixgbe_dcb_config temp_dcb_cfg;
1: -	u8 hw_tcs;
1: -	u8 dcb_set_bitmap;
1: -	u8 dcbx_cap;
1: -	enum ixgbe_fc_mode last_lfc_mode;
1: -	int num_q_vectors;
1: -	int max_q_vectors;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ixgbe_ring_feature ring_feature[4];
1: -	struct msix_entry *msix_entries;
1: -	u32 test_icr;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ixgbe_ring test_tx_ring;
1: -	struct ixgbe_ring test_rx_ring;
1: -	struct ixgbe_hw hw;
1: -	u16 msg_enable;
1: -	struct ixgbe_hw_stats stats;
1: -	u64 tx_busy;
1: -	unsigned int tx_ring_count;
1: -	unsigned int xdp_ring_count;
1: -	unsigned int rx_ring_count;
1: -	u32 link_speed;
1: -	bool link_up;
1: -	long unsigned int sfp_poll_time;
1: -	long unsigned int link_check_timeout;
1: -	struct timer_list service_timer;
1: -	struct work_struct service_task;
1: -	struct hlist_head fdir_filter_list;
1: -	long unsigned int fdir_overflow;
1: -	union ixgbe_atr_input fdir_mask;
1: -	int fdir_filter_count;
1: -	u32 fdir_pballoc;
1: -	u32 atr_sample_rate;
1: -	spinlock_t fdir_perfect_lock;
1: -	u8 *io_addr;
1: -	u32 wol;
1: -	u16 bridge_mode;
1: -	char eeprom_id[32];
1: -	u16 eeprom_cap;
1: -	u32 interrupt_event;
1: -	u32 led_reg;
1: -	struct ptp_clock *ptp_clock;
1: -	struct ptp_clock_info ptp_caps;
1: -	struct work_struct ptp_tx_work;
1: -	struct sk_buff *ptp_tx_skb;
1: -	struct hwtstamp_config tstamp_config;
1: -	long unsigned int ptp_tx_start;
1: -	long unsigned int last_overflow_check;
1: -	long unsigned int last_rx_ptp_check;
1: -	long unsigned int last_rx_timestamp;
1: -	spinlock_t tmreg_lock;
1: -	struct cyclecounter hw_cc;
1: -	struct timecounter hw_tc;
1: -	u32 base_incval;
1: -	u32 tx_hwtstamp_timeouts;
1: -	u32 tx_hwtstamp_skipped;
1: -	u32 rx_hwtstamp_cleared;
1: -	void (*ptp_setup_sdp)(struct ixgbe_adapter *);
1: -	long unsigned int active_vfs[1];
1: -	unsigned int num_vfs;
1: -	struct vf_data_storage *vfinfo;
1: -	int vf_rate_link_speed;
1: -	struct vf_macvlans vf_mvs;
1: -	struct vf_macvlans *mv_list;
1: -	u32 timer_event_accumulator;
1: -	u32 vferr_refcount;
1: -	struct ixgbe_mac_addr *mac_table;
1: -	struct kobject *info_kobj;
1: -	struct hwmon_buff *ixgbe_hwmon_buff;
1: -	struct dentry *ixgbe_dbg_adapter;
1: -	u8 default_up;
1: -	long unsigned int fwd_bitmask[1];
1: -	struct ixgbe_jump_table *jump_tables[10];
1: -	long unsigned int tables;
1: -	u8 rss_indir_tbl[512];
1: -	u32 *rss_key;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  long unsigned int active_vlans[64];
1: +  struct net_device *netdev;
1: +  struct bpf_prog *xdp_prog;
1: +  struct pci_dev *pdev;
1: +  struct mii_bus *mii_bus;
1: +  long unsigned int state;
1: +  u32 flags;
1: +  u32 flags2;
1: +  int num_tx_queues;
1: +  u16 tx_itr_setting;
1: +  u16 tx_work_limit;
1: +  u64 tx_ipsec;
1: +  int num_rx_queues;
1: +  u16 rx_itr_setting;
1: +  u64 rx_ipsec;
1: +  __be16 vxlan_port;
1: +  __be16 geneve_port;
1: +  int num_xdp_queues;
1: +  struct ixgbe_ring *xdp_ring[64];
1: +  long unsigned int *af_xdp_zc_qps;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ixgbe_ring *tx_ring[64];
1: +  u64 restart_queue;
1: +  u64 lsc_int;
1: +  u32 tx_timeout_count;
1: +  struct ixgbe_ring *rx_ring[64];
1: +  int num_rx_pools;
1: +  int num_rx_queues_per_pool;
1: +  u64 hw_csum_rx_error;
1: +  u64 hw_rx_no_dma_resources;
1: +  u64 rsc_total_count;
1: +  u64 rsc_total_flush;
1: +  u64 non_eop_descs;
1: +  u32 alloc_rx_page;
1: +  u32 alloc_rx_page_failed;
1: +  u32 alloc_rx_buff_failed;
1: +  struct ixgbe_q_vector *q_vector[64];
1: +  struct ieee_pfc *ixgbe_ieee_pfc;
1: +  struct ieee_ets *ixgbe_ieee_ets;
1: +  struct ixgbe_dcb_config dcb_cfg;
1: +  struct ixgbe_dcb_config temp_dcb_cfg;
1: +  u8 hw_tcs;
1: +  u8 dcb_set_bitmap;
1: +  u8 dcbx_cap;
1: +  enum ixgbe_fc_mode last_lfc_mode;
1: +  int num_q_vectors;
1: +  int max_q_vectors;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ixgbe_ring_feature ring_feature[4];
1: +  struct msix_entry *msix_entries;
1: +  u32 test_icr;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ixgbe_ring test_tx_ring;
1: +  struct ixgbe_ring test_rx_ring;
1: +  struct ixgbe_hw hw;
1: +  u16 msg_enable;
1: +  struct ixgbe_hw_stats stats;
1: +  u64 tx_busy;
1: +  unsigned int tx_ring_count;
1: +  unsigned int xdp_ring_count;
1: +  unsigned int rx_ring_count;
1: +  u32 link_speed;
1: +  bool link_up;
1: +  long unsigned int sfp_poll_time;
1: +  long unsigned int link_check_timeout;
1: +  struct timer_list service_timer;
1: +  struct work_struct service_task;
1: +  struct hlist_head fdir_filter_list;
1: +  long unsigned int fdir_overflow;
1: +  union ixgbe_atr_input fdir_mask;
1: +  int fdir_filter_count;
1: +  u32 fdir_pballoc;
1: +  u32 atr_sample_rate;
1: +  spinlock_t fdir_perfect_lock;
1: +  u8 *io_addr;
1: +  u32 wol;
1: +  u16 bridge_mode;
1: +  char eeprom_id[32];
1: +  u16 eeprom_cap;
1: +  u32 interrupt_event;
1: +  u32 led_reg;
1: +  struct ptp_clock *ptp_clock;
1: +  struct ptp_clock_info ptp_caps;
1: +  struct work_struct ptp_tx_work;
1: +  struct sk_buff *ptp_tx_skb;
1: +  struct hwtstamp_config tstamp_config;
1: +  long unsigned int ptp_tx_start;
1: +  long unsigned int last_overflow_check;
1: +  long unsigned int last_rx_ptp_check;
1: +  long unsigned int last_rx_timestamp;
1: +  spinlock_t tmreg_lock;
1: +  struct cyclecounter hw_cc;
1: +  struct timecounter hw_tc;
1: +  u32 base_incval;
1: +  u32 tx_hwtstamp_timeouts;
1: +  u32 tx_hwtstamp_skipped;
1: +  u32 rx_hwtstamp_cleared;
1: +  void (*ptp_setup_sdp)(struct ixgbe_adapter *);
1: +  long unsigned int active_vfs[1];
1: +  unsigned int num_vfs;
1: +  struct vf_data_storage *vfinfo;
1: +  int vf_rate_link_speed;
1: +  struct vf_macvlans vf_mvs;
1: +  struct vf_macvlans *mv_list;
1: +  u32 timer_event_accumulator;
1: +  u32 vferr_refcount;
1: +  struct ixgbe_mac_addr *mac_table;
1: +  struct kobject *info_kobj;
1: +  struct hwmon_buff *ixgbe_hwmon_buff;
1: +  struct dentry *ixgbe_dbg_adapter;
1: +  u8 default_up;
1: +  long unsigned int fwd_bitmask[1];
1: +  struct ixgbe_jump_table *jump_tables[10];
1: +  long unsigned int tables;
1: +  u8 rss_indir_tbl[512];
1: +  u32 *rss_key;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct hwmon_attr {
1: -	struct device_attribute dev_attr;
1: -	struct ixgbe_hw *hw;
1: -	struct ixgbe_thermal_diode_data *sensor;
1: -	char name[12];
1: +  struct device_attribute dev_attr;
1: +  struct ixgbe_hw *hw;
1: +  struct ixgbe_thermal_diode_data *sensor;
1: +  char name[12];
1:  };
1:  
1:  struct hwmon_buff {
1: -	struct attribute_group group;
1: -	const struct attribute_group *groups[2];
1: -	struct attribute *attrs[13];
1: -	struct hwmon_attr hwmon_list[12];
1: -	unsigned int n_hwmon;
1: +  struct attribute_group group;
1: +  const struct attribute_group *groups[2];
1: +  struct attribute *attrs[13];
1: +  struct hwmon_attr hwmon_list[12];
1: +  unsigned int n_hwmon;
1:  };
1:  
1:  struct ixgbe_mac_addr {
1: -	u8 addr[6];
1: -	u16 pool;
1: -	u16 state;
1: +  u8 addr[6];
1: +  u16 pool;
1: +  u16 state;
1:  };
1:  
1:  struct ixgbe_mat_field;
1: @@ -96126,825 +97251,825 @@ struct ixgbe_mat_field;
1:  struct ixgbe_fdir_filter;
1:  
1:  struct ixgbe_jump_table {
1: -	struct ixgbe_mat_field *mat;
1: -	struct ixgbe_fdir_filter *input;
1: -	union ixgbe_atr_input *mask;
1: -	u32 link_hdl;
1: -	long unsigned int child_loc_map[32];
1: +  struct ixgbe_mat_field *mat;
1: +  struct ixgbe_fdir_filter *input;
1: +  union ixgbe_atr_input *mask;
1: +  u32 link_hdl;
1: +  long unsigned int child_loc_map[32];
1:  };
1:  
1:  struct ixgbe_fdir_filter {
1: -	struct hlist_node fdir_node;
1: -	union ixgbe_atr_input filter;
1: -	u16 sw_idx;
1: -	u64 action;
1: +  struct hlist_node fdir_node;
1: +  union ixgbe_atr_input filter;
1: +  u16 sw_idx;
1: +  u64 action;
1:  };
1:  
1:  enum ixgbe_state_t {
1: -	__IXGBE_TESTING = 0,
1: -	__IXGBE_RESETTING = 1,
1: -	__IXGBE_DOWN = 2,
1: -	__IXGBE_DISABLED = 3,
1: -	__IXGBE_REMOVING = 4,
1: -	__IXGBE_SERVICE_SCHED = 5,
1: -	__IXGBE_SERVICE_INITED = 6,
1: -	__IXGBE_IN_SFP_INIT = 7,
1: -	__IXGBE_PTP_RUNNING = 8,
1: -	__IXGBE_PTP_TX_IN_PROGRESS = 9,
1: -	__IXGBE_RESET_REQUESTED = 10,
1: +  __IXGBE_TESTING = 0,
1: +  __IXGBE_RESETTING = 1,
1: +  __IXGBE_DOWN = 2,
1: +  __IXGBE_DISABLED = 3,
1: +  __IXGBE_REMOVING = 4,
1: +  __IXGBE_SERVICE_SCHED = 5,
1: +  __IXGBE_SERVICE_INITED = 6,
1: +  __IXGBE_IN_SFP_INIT = 7,
1: +  __IXGBE_PTP_RUNNING = 8,
1: +  __IXGBE_PTP_TX_IN_PROGRESS = 9,
1: +  __IXGBE_RESET_REQUESTED = 10,
1:  };
1:  
1:  struct ixgbe_cb {
1: -	union {
1: -		struct sk_buff *head;
1: -		struct sk_buff *tail;
1: -	};
1: -	dma_addr_t dma;
1: -	u16 append_cnt;
1: -	bool page_released;
1: +  union {
1: +    struct sk_buff *head;
1: +    struct sk_buff *tail;
1: +  };
1: +  dma_addr_t dma;
1: +  u16 append_cnt;
1: +  bool page_released;
1:  };
1:  
1:  enum ixgbe_boards {
1: -	board_82598 = 0,
1: -	board_82599 = 1,
1: -	board_X540 = 2,
1: -	board_X550 = 3,
1: -	board_X550EM_x = 4,
1: -	board_x550em_x_fw = 5,
1: -	board_x550em_a = 6,
1: -	board_x550em_a_fw = 7,
1: +  board_82598 = 0,
1: +  board_82599 = 1,
1: +  board_X540 = 2,
1: +  board_X550 = 3,
1: +  board_X550EM_x = 4,
1: +  board_x550em_x_fw = 5,
1: +  board_x550em_a = 6,
1: +  board_x550em_a_fw = 7,
1:  };
1:  
1:  struct ixgbe_mat_field {
1: -	unsigned int off;
1: -	int (*val)(struct ixgbe_fdir_filter *, union ixgbe_atr_input *, u32, u32);
1: -	unsigned int type;
1: +  unsigned int off;
1: +  int (*val)(struct ixgbe_fdir_filter *, union ixgbe_atr_input *, u32, u32);
1: +  unsigned int type;
1:  };
1:  
1:  struct ixgbe_nexthdr {
1: -	unsigned int o;
1: -	u32 s;
1: -	u32 m;
1: -	unsigned int off;
1: -	u32 val;
1: -	u32 mask;
1: -	struct ixgbe_mat_field *jump;
1: +  unsigned int o;
1: +  u32 s;
1: +  u32 m;
1: +  unsigned int off;
1: +  u32 val;
1: +  u32 mask;
1: +  struct ixgbe_mat_field *jump;
1:  };
1:  
1:  struct ixgbe_reg_info {
1: -	u32 ofs;
1: -	char *name;
1: +  u32 ofs;
1: +  char *name;
1:  };
1:  
1:  struct upper_walk_data {
1: -	struct ixgbe_adapter *adapter;
1: -	u64 action;
1: -	int ifindex;
1: -	u8 queue;
1: +  struct ixgbe_adapter *adapter;
1: +  u64 action;
1: +  int ifindex;
1: +  u8 queue;
1:  };
1:  
1:  struct my_u0 {
1: -	u64 a;
1: -	u64 b;
1: +  u64 a;
1: +  u64 b;
1:  };
1:  
1:  struct ixgbe_hic_hdr {
1: -	u8 cmd;
1: -	u8 buf_len;
1: -	union {
1: -		u8 cmd_resv;
1: -		u8 ret_status;
1: -	} cmd_or_resp;
1: -	u8 checksum;
1: +  u8 cmd;
1: +  u8 buf_len;
1: +  union {
1: +    u8 cmd_resv;
1: +    u8 ret_status;
1: +  } cmd_or_resp;
1: +  u8 checksum;
1:  };
1:  
1:  struct ixgbe_hic_drv_info {
1: -	struct ixgbe_hic_hdr hdr;
1: -	u8 port_num;
1: -	u8 ver_sub;
1: -	u8 ver_build;
1: -	u8 ver_min;
1: -	u8 ver_maj;
1: -	u8 pad;
1: -	u16 pad2;
1: -};
1: -
1: -enum {
1: -	ETH_RSS_HASH_TOP_BIT = 0,
1: -	ETH_RSS_HASH_XOR_BIT = 1,
1: -	ETH_RSS_HASH_CRC32_BIT = 2,
1: -	ETH_RSS_HASH_FUNCS_COUNT = 3,
1: -};
1: -
1: -enum {
1: -	SOF_TIMESTAMPING_TX_HARDWARE = 1,
1: -	SOF_TIMESTAMPING_TX_SOFTWARE = 2,
1: -	SOF_TIMESTAMPING_RX_HARDWARE = 4,
1: -	SOF_TIMESTAMPING_RX_SOFTWARE = 8,
1: -	SOF_TIMESTAMPING_SOFTWARE = 16,
1: -	SOF_TIMESTAMPING_SYS_HARDWARE = 32,
1: -	SOF_TIMESTAMPING_RAW_HARDWARE = 64,
1: -	SOF_TIMESTAMPING_OPT_ID = 128,
1: -	SOF_TIMESTAMPING_TX_SCHED = 256,
1: -	SOF_TIMESTAMPING_TX_ACK = 512,
1: -	SOF_TIMESTAMPING_OPT_CMSG = 1024,
1: -	SOF_TIMESTAMPING_OPT_TSONLY = 2048,
1: -	SOF_TIMESTAMPING_OPT_STATS = 4096,
1: -	SOF_TIMESTAMPING_OPT_PKTINFO = 8192,
1: -	SOF_TIMESTAMPING_OPT_TX_SWHW = 16384,
1: -	SOF_TIMESTAMPING_LAST = 16384,
1: -	SOF_TIMESTAMPING_MASK = 32767,
1: +  struct ixgbe_hic_hdr hdr;
1: +  u8 port_num;
1: +  u8 ver_sub;
1: +  u8 ver_build;
1: +  u8 ver_min;
1: +  u8 ver_maj;
1: +  u8 pad;
1: +  u16 pad2;
1: +};
1: +
1: +enum {
1: +  ETH_RSS_HASH_TOP_BIT = 0,
1: +  ETH_RSS_HASH_XOR_BIT = 1,
1: +  ETH_RSS_HASH_CRC32_BIT = 2,
1: +  ETH_RSS_HASH_FUNCS_COUNT = 3,
1: +};
1: +
1: +enum {
1: +  SOF_TIMESTAMPING_TX_HARDWARE = 1,
1: +  SOF_TIMESTAMPING_TX_SOFTWARE = 2,
1: +  SOF_TIMESTAMPING_RX_HARDWARE = 4,
1: +  SOF_TIMESTAMPING_RX_SOFTWARE = 8,
1: +  SOF_TIMESTAMPING_SOFTWARE = 16,
1: +  SOF_TIMESTAMPING_SYS_HARDWARE = 32,
1: +  SOF_TIMESTAMPING_RAW_HARDWARE = 64,
1: +  SOF_TIMESTAMPING_OPT_ID = 128,
1: +  SOF_TIMESTAMPING_TX_SCHED = 256,
1: +  SOF_TIMESTAMPING_TX_ACK = 512,
1: +  SOF_TIMESTAMPING_OPT_CMSG = 1024,
1: +  SOF_TIMESTAMPING_OPT_TSONLY = 2048,
1: +  SOF_TIMESTAMPING_OPT_STATS = 4096,
1: +  SOF_TIMESTAMPING_OPT_PKTINFO = 8192,
1: +  SOF_TIMESTAMPING_OPT_TX_SWHW = 16384,
1: +  SOF_TIMESTAMPING_LAST = 16384,
1: +  SOF_TIMESTAMPING_MASK = 32767,
1:  };
1:  
1:  enum hwtstamp_rx_filters {
1: -	HWTSTAMP_FILTER_NONE = 0,
1: -	HWTSTAMP_FILTER_ALL = 1,
1: -	HWTSTAMP_FILTER_SOME = 2,
1: -	HWTSTAMP_FILTER_PTP_V1_L4_EVENT = 3,
1: -	HWTSTAMP_FILTER_PTP_V1_L4_SYNC = 4,
1: -	HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ = 5,
1: -	HWTSTAMP_FILTER_PTP_V2_L4_EVENT = 6,
1: -	HWTSTAMP_FILTER_PTP_V2_L4_SYNC = 7,
1: -	HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ = 8,
1: -	HWTSTAMP_FILTER_PTP_V2_L2_EVENT = 9,
1: -	HWTSTAMP_FILTER_PTP_V2_L2_SYNC = 10,
1: -	HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ = 11,
1: -	HWTSTAMP_FILTER_PTP_V2_EVENT = 12,
1: -	HWTSTAMP_FILTER_PTP_V2_SYNC = 13,
1: -	HWTSTAMP_FILTER_PTP_V2_DELAY_REQ = 14,
1: -	HWTSTAMP_FILTER_NTP_ALL = 15,
1: -	__HWTSTAMP_FILTER_CNT = 16,
1: -};
1: -
1: -enum {
1: -	NETDEV_STATS___2 = 0,
1: -	IXGBE_STATS = 1,
1: +  HWTSTAMP_FILTER_NONE = 0,
1: +  HWTSTAMP_FILTER_ALL = 1,
1: +  HWTSTAMP_FILTER_SOME = 2,
1: +  HWTSTAMP_FILTER_PTP_V1_L4_EVENT = 3,
1: +  HWTSTAMP_FILTER_PTP_V1_L4_SYNC = 4,
1: +  HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ = 5,
1: +  HWTSTAMP_FILTER_PTP_V2_L4_EVENT = 6,
1: +  HWTSTAMP_FILTER_PTP_V2_L4_SYNC = 7,
1: +  HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ = 8,
1: +  HWTSTAMP_FILTER_PTP_V2_L2_EVENT = 9,
1: +  HWTSTAMP_FILTER_PTP_V2_L2_SYNC = 10,
1: +  HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ = 11,
1: +  HWTSTAMP_FILTER_PTP_V2_EVENT = 12,
1: +  HWTSTAMP_FILTER_PTP_V2_SYNC = 13,
1: +  HWTSTAMP_FILTER_PTP_V2_DELAY_REQ = 14,
1: +  HWTSTAMP_FILTER_NTP_ALL = 15,
1: +  __HWTSTAMP_FILTER_CNT = 16,
1: +};
1: +
1: +enum {
1: +  NETDEV_STATS___2 = 0,
1: +  IXGBE_STATS = 1,
1:  };
1:  
1:  struct ixgbe_stats {
1: -	char stat_string[32];
1: -	int type;
1: -	int sizeof_stat;
1: -	int stat_offset;
1: +  char stat_string[32];
1: +  int type;
1: +  int sizeof_stat;
1: +  int stat_offset;
1:  };
1:  
1:  struct ixgbe_reg_test {
1: -	u16 reg;
1: -	u8 array_len;
1: -	u8 test_type;
1: -	u32 mask;
1: -	u32 write;
1: +  u16 reg;
1: +  u8 array_len;
1: +  u8 test_type;
1: +  u32 mask;
1: +  u32 write;
1:  };
1:  
1:  enum ixgbe_pfvf_api_rev {
1: -	ixgbe_mbox_api_10 = 0,
1: -	ixgbe_mbox_api_20 = 1,
1: -	ixgbe_mbox_api_11 = 2,
1: -	ixgbe_mbox_api_12 = 3,
1: -	ixgbe_mbox_api_13 = 4,
1: -	ixgbe_mbox_api_14 = 5,
1: -	ixgbe_mbox_api_unknown = 6,
1: +  ixgbe_mbox_api_10 = 0,
1: +  ixgbe_mbox_api_20 = 1,
1: +  ixgbe_mbox_api_11 = 2,
1: +  ixgbe_mbox_api_12 = 3,
1: +  ixgbe_mbox_api_13 = 4,
1: +  ixgbe_mbox_api_14 = 5,
1: +  ixgbe_mbox_api_unknown = 6,
1:  };
1:  
1:  enum ixgbevf_xcast_modes {
1: -	IXGBEVF_XCAST_MODE_NONE = 0,
1: -	IXGBEVF_XCAST_MODE_MULTI = 1,
1: -	IXGBEVF_XCAST_MODE_ALLMULTI = 2,
1: -	IXGBEVF_XCAST_MODE_PROMISC = 3,
1: +  IXGBEVF_XCAST_MODE_NONE = 0,
1: +  IXGBEVF_XCAST_MODE_MULTI = 1,
1: +  IXGBEVF_XCAST_MODE_ALLMULTI = 2,
1: +  IXGBEVF_XCAST_MODE_PROMISC = 3,
1:  };
1:  
1:  struct ixgbe_hic_hdr2_req {
1: -	u8 cmd;
1: -	u8 buf_lenh;
1: -	u8 buf_lenl;
1: -	u8 checksum;
1: +  u8 cmd;
1: +  u8 buf_lenh;
1: +  u8 buf_lenl;
1: +  u8 checksum;
1:  };
1:  
1:  struct ixgbe_hic_hdr2_rsp {
1: -	u8 cmd;
1: -	u8 buf_lenl;
1: -	u8 buf_lenh_status;
1: -	u8 checksum;
1: +  u8 cmd;
1: +  u8 buf_lenl;
1: +  u8 buf_lenh_status;
1: +  u8 checksum;
1:  };
1:  
1:  union ixgbe_hic_hdr2 {
1: -	struct ixgbe_hic_hdr2_req req;
1: -	struct ixgbe_hic_hdr2_rsp rsp;
1: +  struct ixgbe_hic_hdr2_req req;
1: +  struct ixgbe_hic_hdr2_rsp rsp;
1:  };
1:  
1:  struct ixgbe_hic_drv_info2 {
1: -	struct ixgbe_hic_hdr hdr;
1: -	u8 port_num;
1: -	u8 ver_sub;
1: -	u8 ver_build;
1: -	u8 ver_min;
1: -	u8 ver_maj;
1: -	char driver_string[39];
1: +  struct ixgbe_hic_hdr hdr;
1: +  u8 port_num;
1: +  u8 ver_sub;
1: +  u8 ver_build;
1: +  u8 ver_min;
1: +  u8 ver_maj;
1: +  char driver_string[39];
1:  };
1:  
1:  struct ixgbe_hic_read_shadow_ram {
1: -	union ixgbe_hic_hdr2 hdr;
1: -	u32 address;
1: -	u16 length;
1: -	u16 pad2;
1: -	u16 data;
1: -	u16 pad3;
1: +  union ixgbe_hic_hdr2 hdr;
1: +  u32 address;
1: +  u16 length;
1: +  u16 pad2;
1: +  u16 data;
1: +  u16 pad3;
1:  };
1:  
1:  struct ixgbe_hic_write_shadow_ram {
1: -	union ixgbe_hic_hdr2 hdr;
1: -	__be32 address;
1: -	__be16 length;
1: -	u16 pad2;
1: -	u16 data;
1: -	u16 pad3;
1: +  union ixgbe_hic_hdr2 hdr;
1: +  __be32 address;
1: +  __be16 length;
1: +  u16 pad2;
1: +  u16 data;
1: +  u16 pad3;
1:  };
1:  
1:  struct ixgbe_hic_disable_rxen {
1: -	struct ixgbe_hic_hdr hdr;
1: -	u8 port_number;
1: -	u8 pad2;
1: -	u16 pad3;
1: +  struct ixgbe_hic_hdr hdr;
1: +  u8 port_number;
1: +  u8 pad2;
1: +  u16 pad3;
1:  };
1:  
1:  struct ixgbe_hic_phy_token_req {
1: -	struct ixgbe_hic_hdr hdr;
1: -	u8 port_number;
1: -	u8 command_type;
1: -	u16 pad;
1: +  struct ixgbe_hic_hdr hdr;
1: +  u8 port_number;
1: +  u8 command_type;
1: +  u16 pad;
1:  };
1:  
1:  struct ixgbe_hic_internal_phy_req {
1: -	struct ixgbe_hic_hdr hdr;
1: -	u8 port_number;
1: -	u8 command_type;
1: -	__be16 address;
1: -	u16 rsv1;
1: -	__be32 write_data;
1: -	u16 pad;
1: +  struct ixgbe_hic_hdr hdr;
1: +  u8 port_number;
1: +  u8 command_type;
1: +  __be16 address;
1: +  u16 rsv1;
1: +  __be32 write_data;
1: +  u16 pad;
1:  } __attribute__((packed));
1:  
1:  struct ixgbe_hic_internal_phy_resp {
1: -	struct ixgbe_hic_hdr hdr;
1: -	__be32 read_data;
1: +  struct ixgbe_hic_hdr hdr;
1: +  __be32 read_data;
1:  };
1:  
1:  struct ixgbe_hic_phy_activity_req {
1: -	struct ixgbe_hic_hdr hdr;
1: -	u8 port_number;
1: -	u8 pad;
1: -	__le16 activity_id;
1: -	__be32 data[4];
1: +  struct ixgbe_hic_hdr hdr;
1: +  u8 port_number;
1: +  u8 pad;
1: +  __le16 activity_id;
1: +  __be32 data[4];
1:  };
1:  
1:  struct ixgbe_hic_phy_activity_resp {
1: -	struct ixgbe_hic_hdr hdr;
1: -	__be32 data[4];
1: +  struct ixgbe_hic_hdr hdr;
1: +  __be32 data[4];
1:  };
1:  
1:  struct ixgbe_adv_tx_context_desc {
1: -	__le32 vlan_macip_lens;
1: -	__le32 fceof_saidx;
1: -	__le32 type_tucmd_mlhl;
1: -	__le32 mss_l4len_idx;
1: +  __le32 vlan_macip_lens;
1: +  __le32 fceof_saidx;
1: +  __le32 type_tucmd_mlhl;
1: +  __le32 mss_l4len_idx;
1:  };
1:  
1:  struct pps_event_time {
1: -	struct timespec64 ts_real;
1: +  struct timespec64 ts_real;
1:  };
1:  
1:  enum ptp_clock_events {
1: -	PTP_CLOCK_ALARM = 0,
1: -	PTP_CLOCK_EXTTS = 1,
1: -	PTP_CLOCK_PPS = 2,
1: -	PTP_CLOCK_PPSUSR = 3,
1: +  PTP_CLOCK_ALARM = 0,
1: +  PTP_CLOCK_EXTTS = 1,
1: +  PTP_CLOCK_PPS = 2,
1: +  PTP_CLOCK_PPSUSR = 3,
1:  };
1:  
1:  struct ptp_clock_event {
1: -	int type;
1: -	int index;
1: -	union {
1: -		u64 timestamp;
1: -		struct pps_event_time pps_times;
1: -	};
1: +  int type;
1: +  int index;
1: +  union {
1: +    u64 timestamp;
1: +    struct pps_event_time pps_times;
1: +  };
1:  };
1:  
1:  enum {
1: -	NAPIF_STATE_SCHED = 1,
1: -	NAPIF_STATE_MISSED = 2,
1: -	NAPIF_STATE_DISABLE = 4,
1: -	NAPIF_STATE_NPSVC = 8,
1: -	NAPIF_STATE_LISTED = 16,
1: -	NAPIF_STATE_NO_BUSY_POLL = 32,
1: -	NAPIF_STATE_IN_BUSY_POLL = 64,
1: -	NAPIF_STATE_PREFER_BUSY_POLL = 128,
1: +  NAPIF_STATE_SCHED = 1,
1: +  NAPIF_STATE_MISSED = 2,
1: +  NAPIF_STATE_DISABLE = 4,
1: +  NAPIF_STATE_NPSVC = 8,
1: +  NAPIF_STATE_LISTED = 16,
1: +  NAPIF_STATE_NO_BUSY_POLL = 32,
1: +  NAPIF_STATE_IN_BUSY_POLL = 64,
1: +  NAPIF_STATE_PREFER_BUSY_POLL = 128,
1:  };
1:  
1:  struct xdp_desc {
1: -	__u64 addr;
1: -	__u32 len;
1: -	__u32 options;
1: +  __u64 addr;
1: +  __u32 len;
1: +  __u32 options;
1:  };
1:  
1:  enum dcbnl_pfc_up_attrs {
1: -	DCB_PFC_UP_ATTR_UNDEFINED = 0,
1: -	DCB_PFC_UP_ATTR_0 = 1,
1: -	DCB_PFC_UP_ATTR_1 = 2,
1: -	DCB_PFC_UP_ATTR_2 = 3,
1: -	DCB_PFC_UP_ATTR_3 = 4,
1: -	DCB_PFC_UP_ATTR_4 = 5,
1: -	DCB_PFC_UP_ATTR_5 = 6,
1: -	DCB_PFC_UP_ATTR_6 = 7,
1: -	DCB_PFC_UP_ATTR_7 = 8,
1: -	DCB_PFC_UP_ATTR_ALL = 9,
1: -	__DCB_PFC_UP_ATTR_ENUM_MAX = 10,
1: -	DCB_PFC_UP_ATTR_MAX = 9,
1: +  DCB_PFC_UP_ATTR_UNDEFINED = 0,
1: +  DCB_PFC_UP_ATTR_0 = 1,
1: +  DCB_PFC_UP_ATTR_1 = 2,
1: +  DCB_PFC_UP_ATTR_2 = 3,
1: +  DCB_PFC_UP_ATTR_3 = 4,
1: +  DCB_PFC_UP_ATTR_4 = 5,
1: +  DCB_PFC_UP_ATTR_5 = 6,
1: +  DCB_PFC_UP_ATTR_6 = 7,
1: +  DCB_PFC_UP_ATTR_7 = 8,
1: +  DCB_PFC_UP_ATTR_ALL = 9,
1: +  __DCB_PFC_UP_ATTR_ENUM_MAX = 10,
1: +  DCB_PFC_UP_ATTR_MAX = 9,
1:  };
1:  
1:  enum dcbnl_pg_attrs {
1: -	DCB_PG_ATTR_UNDEFINED = 0,
1: -	DCB_PG_ATTR_TC_0 = 1,
1: -	DCB_PG_ATTR_TC_1 = 2,
1: -	DCB_PG_ATTR_TC_2 = 3,
1: -	DCB_PG_ATTR_TC_3 = 4,
1: -	DCB_PG_ATTR_TC_4 = 5,
1: -	DCB_PG_ATTR_TC_5 = 6,
1: -	DCB_PG_ATTR_TC_6 = 7,
1: -	DCB_PG_ATTR_TC_7 = 8,
1: -	DCB_PG_ATTR_TC_MAX = 9,
1: -	DCB_PG_ATTR_TC_ALL = 10,
1: -	DCB_PG_ATTR_BW_ID_0 = 11,
1: -	DCB_PG_ATTR_BW_ID_1 = 12,
1: -	DCB_PG_ATTR_BW_ID_2 = 13,
1: -	DCB_PG_ATTR_BW_ID_3 = 14,
1: -	DCB_PG_ATTR_BW_ID_4 = 15,
1: -	DCB_PG_ATTR_BW_ID_5 = 16,
1: -	DCB_PG_ATTR_BW_ID_6 = 17,
1: -	DCB_PG_ATTR_BW_ID_7 = 18,
1: -	DCB_PG_ATTR_BW_ID_MAX = 19,
1: -	DCB_PG_ATTR_BW_ID_ALL = 20,
1: -	__DCB_PG_ATTR_ENUM_MAX = 21,
1: -	DCB_PG_ATTR_MAX = 20,
1: +  DCB_PG_ATTR_UNDEFINED = 0,
1: +  DCB_PG_ATTR_TC_0 = 1,
1: +  DCB_PG_ATTR_TC_1 = 2,
1: +  DCB_PG_ATTR_TC_2 = 3,
1: +  DCB_PG_ATTR_TC_3 = 4,
1: +  DCB_PG_ATTR_TC_4 = 5,
1: +  DCB_PG_ATTR_TC_5 = 6,
1: +  DCB_PG_ATTR_TC_6 = 7,
1: +  DCB_PG_ATTR_TC_7 = 8,
1: +  DCB_PG_ATTR_TC_MAX = 9,
1: +  DCB_PG_ATTR_TC_ALL = 10,
1: +  DCB_PG_ATTR_BW_ID_0 = 11,
1: +  DCB_PG_ATTR_BW_ID_1 = 12,
1: +  DCB_PG_ATTR_BW_ID_2 = 13,
1: +  DCB_PG_ATTR_BW_ID_3 = 14,
1: +  DCB_PG_ATTR_BW_ID_4 = 15,
1: +  DCB_PG_ATTR_BW_ID_5 = 16,
1: +  DCB_PG_ATTR_BW_ID_6 = 17,
1: +  DCB_PG_ATTR_BW_ID_7 = 18,
1: +  DCB_PG_ATTR_BW_ID_MAX = 19,
1: +  DCB_PG_ATTR_BW_ID_ALL = 20,
1: +  __DCB_PG_ATTR_ENUM_MAX = 21,
1: +  DCB_PG_ATTR_MAX = 20,
1:  };
1:  
1:  enum dcbnl_cap_attrs {
1: -	DCB_CAP_ATTR_UNDEFINED = 0,
1: -	DCB_CAP_ATTR_ALL = 1,
1: -	DCB_CAP_ATTR_PG = 2,
1: -	DCB_CAP_ATTR_PFC = 3,
1: -	DCB_CAP_ATTR_UP2TC = 4,
1: -	DCB_CAP_ATTR_PG_TCS = 5,
1: -	DCB_CAP_ATTR_PFC_TCS = 6,
1: -	DCB_CAP_ATTR_GSP = 7,
1: -	DCB_CAP_ATTR_BCN = 8,
1: -	DCB_CAP_ATTR_DCBX = 9,
1: -	__DCB_CAP_ATTR_ENUM_MAX = 10,
1: -	DCB_CAP_ATTR_MAX = 9,
1: +  DCB_CAP_ATTR_UNDEFINED = 0,
1: +  DCB_CAP_ATTR_ALL = 1,
1: +  DCB_CAP_ATTR_PG = 2,
1: +  DCB_CAP_ATTR_PFC = 3,
1: +  DCB_CAP_ATTR_UP2TC = 4,
1: +  DCB_CAP_ATTR_PG_TCS = 5,
1: +  DCB_CAP_ATTR_PFC_TCS = 6,
1: +  DCB_CAP_ATTR_GSP = 7,
1: +  DCB_CAP_ATTR_BCN = 8,
1: +  DCB_CAP_ATTR_DCBX = 9,
1: +  __DCB_CAP_ATTR_ENUM_MAX = 10,
1: +  DCB_CAP_ATTR_MAX = 9,
1:  };
1:  
1:  enum dcbnl_numtcs_attrs {
1: -	DCB_NUMTCS_ATTR_UNDEFINED = 0,
1: -	DCB_NUMTCS_ATTR_ALL = 1,
1: -	DCB_NUMTCS_ATTR_PG = 2,
1: -	DCB_NUMTCS_ATTR_PFC = 3,
1: -	__DCB_NUMTCS_ATTR_ENUM_MAX = 4,
1: -	DCB_NUMTCS_ATTR_MAX = 3,
1: +  DCB_NUMTCS_ATTR_UNDEFINED = 0,
1: +  DCB_NUMTCS_ATTR_ALL = 1,
1: +  DCB_NUMTCS_ATTR_PG = 2,
1: +  DCB_NUMTCS_ATTR_PFC = 3,
1: +  __DCB_NUMTCS_ATTR_ENUM_MAX = 4,
1: +  DCB_NUMTCS_ATTR_MAX = 3,
1:  };
1:  
1:  enum dcb_general_attr_values {
1: -	DCB_ATTR_VALUE_UNDEFINED = 255,
1: +  DCB_ATTR_VALUE_UNDEFINED = 255,
1:  };
1:  
1:  typedef enum {
1: -	ixgb_mac_unknown = 0,
1: -	ixgb_82597 = 1,
1: -	ixgb_num_macs = 2,
1: +  ixgb_mac_unknown = 0,
1: +  ixgb_82597 = 1,
1: +  ixgb_num_macs = 2,
1:  } ixgb_mac_type;
1:  
1:  typedef enum {
1: -	ixgb_phy_type_unknown = 0,
1: -	ixgb_phy_type_g6005 = 1,
1: -	ixgb_phy_type_g6104 = 2,
1: -	ixgb_phy_type_txn17201 = 3,
1: -	ixgb_phy_type_txn17401 = 4,
1: -	ixgb_phy_type_bcm = 5,
1: +  ixgb_phy_type_unknown = 0,
1: +  ixgb_phy_type_g6005 = 1,
1: +  ixgb_phy_type_g6104 = 2,
1: +  ixgb_phy_type_txn17201 = 3,
1: +  ixgb_phy_type_txn17401 = 4,
1: +  ixgb_phy_type_bcm = 5,
1:  } ixgb_phy_type;
1:  
1:  typedef enum {
1: -	ixgb_fc_none = 0,
1: -	ixgb_fc_rx_pause = 1,
1: -	ixgb_fc_tx_pause = 2,
1: -	ixgb_fc_full = 3,
1: -	ixgb_fc_default = 255,
1: +  ixgb_fc_none = 0,
1: +  ixgb_fc_rx_pause = 1,
1: +  ixgb_fc_tx_pause = 2,
1: +  ixgb_fc_full = 3,
1: +  ixgb_fc_default = 255,
1:  } ixgb_fc_type;
1:  
1:  typedef enum {
1: -	ixgb_bus_type_unknown = 0,
1: -	ixgb_bus_type_pci = 1,
1: -	ixgb_bus_type_pcix = 2,
1: +  ixgb_bus_type_unknown = 0,
1: +  ixgb_bus_type_pci = 1,
1: +  ixgb_bus_type_pcix = 2,
1:  } ixgb_bus_type;
1:  
1:  typedef enum {
1: -	ixgb_bus_speed_unknown = 0,
1: -	ixgb_bus_speed_33 = 1,
1: -	ixgb_bus_speed_66 = 2,
1: -	ixgb_bus_speed_100 = 3,
1: -	ixgb_bus_speed_133 = 4,
1: -	ixgb_bus_speed_reserved = 5,
1: +  ixgb_bus_speed_unknown = 0,
1: +  ixgb_bus_speed_33 = 1,
1: +  ixgb_bus_speed_66 = 2,
1: +  ixgb_bus_speed_100 = 3,
1: +  ixgb_bus_speed_133 = 4,
1: +  ixgb_bus_speed_reserved = 5,
1:  } ixgb_bus_speed;
1:  
1:  typedef enum {
1: -	ixgb_bus_width_unknown = 0,
1: -	ixgb_bus_width_32 = 1,
1: -	ixgb_bus_width_64 = 2,
1: +  ixgb_bus_width_unknown = 0,
1: +  ixgb_bus_width_32 = 1,
1: +  ixgb_bus_width_64 = 2,
1:  } ixgb_bus_width;
1:  
1:  struct ixgb_rx_desc {
1: -	__le64 buff_addr;
1: -	__le16 length;
1: -	__le16 reserved;
1: -	u8 status;
1: -	u8 errors;
1: -	__le16 special;
1: +  __le64 buff_addr;
1: +  __le16 length;
1: +  __le16 reserved;
1: +  u8 status;
1: +  u8 errors;
1: +  __le16 special;
1:  };
1:  
1:  struct ixgb_tx_desc {
1: -	__le64 buff_addr;
1: -	__le32 cmd_type_len;
1: -	u8 status;
1: -	u8 popts;
1: -	__le16 vlan;
1: +  __le64 buff_addr;
1: +  __le32 cmd_type_len;
1: +  u8 status;
1: +  u8 popts;
1: +  __le16 vlan;
1:  };
1:  
1:  struct ixgb_context_desc {
1: -	u8 ipcss;
1: -	u8 ipcso;
1: -	__le16 ipcse;
1: -	u8 tucss;
1: -	u8 tucso;
1: -	__le16 tucse;
1: -	__le32 cmd_type_len;
1: -	u8 status;
1: -	u8 hdr_len;
1: -	__le16 mss;
1: +  u8 ipcss;
1: +  u8 ipcso;
1: +  __le16 ipcse;
1: +  u8 tucss;
1: +  u8 tucso;
1: +  __le16 tucse;
1: +  __le32 cmd_type_len;
1: +  u8 status;
1: +  u8 hdr_len;
1: +  __le16 mss;
1:  };
1:  
1:  struct ixgb_fc {
1: -	u32 high_water;
1: -	u32 low_water;
1: -	u16 pause_time;
1: -	bool send_xon;
1: -	ixgb_fc_type type;
1: +  u32 high_water;
1: +  u32 low_water;
1: +  u16 pause_time;
1: +  bool send_xon;
1: +  ixgb_fc_type type;
1:  };
1:  
1:  struct ixgb_bus {
1: -	ixgb_bus_speed speed;
1: -	ixgb_bus_width width;
1: -	ixgb_bus_type type;
1: +  ixgb_bus_speed speed;
1: +  ixgb_bus_width width;
1: +  ixgb_bus_type type;
1:  };
1:  
1:  struct ixgb_hw {
1: -	u8 *hw_addr;
1: -	void *back;
1: -	struct ixgb_fc fc;
1: -	struct ixgb_bus bus;
1: -	u32 phy_id;
1: -	u32 phy_addr;
1: -	ixgb_mac_type mac_type;
1: -	ixgb_phy_type phy_type;
1: -	u32 max_frame_size;
1: -	u32 mc_filter_type;
1: -	u32 num_mc_addrs;
1: -	u8 curr_mac_addr[6];
1: -	u32 num_tx_desc;
1: -	u32 num_rx_desc;
1: -	u32 rx_buffer_size;
1: -	bool link_up;
1: -	bool adapter_stopped;
1: -	u16 device_id;
1: -	u16 vendor_id;
1: -	u8 revision_id;
1: -	u16 subsystem_vendor_id;
1: -	u16 subsystem_id;
1: -	u32 bar0;
1: -	u32 bar1;
1: -	u32 bar2;
1: -	u32 bar3;
1: -	u16 pci_cmd_word;
1: -	__le16 eeprom[64];
1: -	long unsigned int io_base;
1: -	u32 lastLFC;
1: -	u32 lastRFC;
1: +  u8 *hw_addr;
1: +  void *back;
1: +  struct ixgb_fc fc;
1: +  struct ixgb_bus bus;
1: +  u32 phy_id;
1: +  u32 phy_addr;
1: +  ixgb_mac_type mac_type;
1: +  ixgb_phy_type phy_type;
1: +  u32 max_frame_size;
1: +  u32 mc_filter_type;
1: +  u32 num_mc_addrs;
1: +  u8 curr_mac_addr[6];
1: +  u32 num_tx_desc;
1: +  u32 num_rx_desc;
1: +  u32 rx_buffer_size;
1: +  bool link_up;
1: +  bool adapter_stopped;
1: +  u16 device_id;
1: +  u16 vendor_id;
1: +  u8 revision_id;
1: +  u16 subsystem_vendor_id;
1: +  u16 subsystem_id;
1: +  u32 bar0;
1: +  u32 bar1;
1: +  u32 bar2;
1: +  u32 bar3;
1: +  u16 pci_cmd_word;
1: +  __le16 eeprom[64];
1: +  long unsigned int io_base;
1: +  u32 lastLFC;
1: +  u32 lastRFC;
1:  };
1:  
1:  struct ixgb_hw_stats {
1: -	u64 tprl;
1: -	u64 tprh;
1: -	u64 gprcl;
1: -	u64 gprch;
1: -	u64 bprcl;
1: -	u64 bprch;
1: -	u64 mprcl;
1: -	u64 mprch;
1: -	u64 uprcl;
1: -	u64 uprch;
1: -	u64 vprcl;
1: -	u64 vprch;
1: -	u64 jprcl;
1: -	u64 jprch;
1: -	u64 gorcl;
1: -	u64 gorch;
1: -	u64 torl;
1: -	u64 torh;
1: -	u64 rnbc;
1: -	u64 ruc;
1: -	u64 roc;
1: -	u64 rlec;
1: -	u64 crcerrs;
1: -	u64 icbc;
1: -	u64 ecbc;
1: -	u64 mpc;
1: -	u64 tptl;
1: -	u64 tpth;
1: -	u64 gptcl;
1: -	u64 gptch;
1: -	u64 bptcl;
1: -	u64 bptch;
1: -	u64 mptcl;
1: -	u64 mptch;
1: -	u64 uptcl;
1: -	u64 uptch;
1: -	u64 vptcl;
1: -	u64 vptch;
1: -	u64 jptcl;
1: -	u64 jptch;
1: -	u64 gotcl;
1: -	u64 gotch;
1: -	u64 totl;
1: -	u64 toth;
1: -	u64 dc;
1: -	u64 plt64c;
1: -	u64 tsctc;
1: -	u64 tsctfc;
1: -	u64 ibic;
1: -	u64 rfc;
1: -	u64 lfc;
1: -	u64 pfrc;
1: -	u64 pftc;
1: -	u64 mcfrc;
1: -	u64 mcftc;
1: -	u64 xonrxc;
1: -	u64 xontxc;
1: -	u64 xoffrxc;
1: -	u64 xofftxc;
1: -	u64 rjc;
1: +  u64 tprl;
1: +  u64 tprh;
1: +  u64 gprcl;
1: +  u64 gprch;
1: +  u64 bprcl;
1: +  u64 bprch;
1: +  u64 mprcl;
1: +  u64 mprch;
1: +  u64 uprcl;
1: +  u64 uprch;
1: +  u64 vprcl;
1: +  u64 vprch;
1: +  u64 jprcl;
1: +  u64 jprch;
1: +  u64 gorcl;
1: +  u64 gorch;
1: +  u64 torl;
1: +  u64 torh;
1: +  u64 rnbc;
1: +  u64 ruc;
1: +  u64 roc;
1: +  u64 rlec;
1: +  u64 crcerrs;
1: +  u64 icbc;
1: +  u64 ecbc;
1: +  u64 mpc;
1: +  u64 tptl;
1: +  u64 tpth;
1: +  u64 gptcl;
1: +  u64 gptch;
1: +  u64 bptcl;
1: +  u64 bptch;
1: +  u64 mptcl;
1: +  u64 mptch;
1: +  u64 uptcl;
1: +  u64 uptch;
1: +  u64 vptcl;
1: +  u64 vptch;
1: +  u64 jptcl;
1: +  u64 jptch;
1: +  u64 gotcl;
1: +  u64 gotch;
1: +  u64 totl;
1: +  u64 toth;
1: +  u64 dc;
1: +  u64 plt64c;
1: +  u64 tsctc;
1: +  u64 tsctfc;
1: +  u64 ibic;
1: +  u64 rfc;
1: +  u64 lfc;
1: +  u64 pfrc;
1: +  u64 pftc;
1: +  u64 mcfrc;
1: +  u64 mcftc;
1: +  u64 xonrxc;
1: +  u64 xontxc;
1: +  u64 xoffrxc;
1: +  u64 xofftxc;
1: +  u64 rjc;
1:  };
1:  
1:  struct ixgb_buffer {
1: -	struct sk_buff *skb;
1: -	dma_addr_t dma;
1: -	long unsigned int time_stamp;
1: -	u16 length;
1: -	u16 next_to_watch;
1: -	u16 mapped_as_page;
1: +  struct sk_buff *skb;
1: +  dma_addr_t dma;
1: +  long unsigned int time_stamp;
1: +  u16 length;
1: +  u16 next_to_watch;
1: +  u16 mapped_as_page;
1:  };
1:  
1:  struct ixgb_desc_ring {
1: -	void *desc;
1: -	dma_addr_t dma;
1: -	unsigned int size;
1: -	unsigned int count;
1: -	unsigned int next_to_use;
1: -	unsigned int next_to_clean;
1: -	struct ixgb_buffer *buffer_info;
1: +  void *desc;
1: +  dma_addr_t dma;
1: +  unsigned int size;
1: +  unsigned int count;
1: +  unsigned int next_to_use;
1: +  unsigned int next_to_clean;
1: +  struct ixgb_buffer *buffer_info;
1:  };
1:  
1:  struct ixgb_adapter {
1: -	struct timer_list watchdog_timer;
1: -	long unsigned int active_vlans[64];
1: -	u32 bd_number;
1: -	u32 rx_buffer_len;
1: -	u32 part_num;
1: -	u16 link_speed;
1: -	u16 link_duplex;
1: -	struct work_struct tx_timeout_task;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ixgb_desc_ring tx_ring;
1: -	unsigned int restart_queue;
1: -	long unsigned int timeo_start;
1: -	u32 tx_cmd_type;
1: -	u64 hw_csum_tx_good;
1: -	u64 hw_csum_tx_error;
1: -	u32 tx_int_delay;
1: -	u32 tx_timeout_count;
1: -	bool tx_int_delay_enable;
1: -	bool detect_tx_hung;
1: -	struct ixgb_desc_ring rx_ring;
1: -	u64 hw_csum_rx_error;
1: -	u64 hw_csum_rx_good;
1: -	u32 rx_int_delay;
1: -	bool rx_csum;
1: -	struct napi_struct napi;
1: -	struct net_device *netdev;
1: -	struct pci_dev *pdev;
1: -	struct ixgb_hw hw;
1: -	u16 msg_enable;
1: -	struct ixgb_hw_stats stats;
1: -	u32 alloc_rx_buff_failed;
1: -	bool have_msi;
1: -	long unsigned int flags;
1: +  struct timer_list watchdog_timer;
1: +  long unsigned int active_vlans[64];
1: +  u32 bd_number;
1: +  u32 rx_buffer_len;
1: +  u32 part_num;
1: +  u16 link_speed;
1: +  u16 link_duplex;
1: +  struct work_struct tx_timeout_task;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ixgb_desc_ring tx_ring;
1: +  unsigned int restart_queue;
1: +  long unsigned int timeo_start;
1: +  u32 tx_cmd_type;
1: +  u64 hw_csum_tx_good;
1: +  u64 hw_csum_tx_error;
1: +  u32 tx_int_delay;
1: +  u32 tx_timeout_count;
1: +  bool tx_int_delay_enable;
1: +  bool detect_tx_hung;
1: +  struct ixgb_desc_ring rx_ring;
1: +  u64 hw_csum_rx_error;
1: +  u64 hw_csum_rx_good;
1: +  u32 rx_int_delay;
1: +  bool rx_csum;
1: +  struct napi_struct napi;
1: +  struct net_device *netdev;
1: +  struct pci_dev *pdev;
1: +  struct ixgb_hw hw;
1: +  u16 msg_enable;
1: +  struct ixgb_hw_stats stats;
1: +  u32 alloc_rx_buff_failed;
1: +  bool have_msi;
1: +  long unsigned int flags;
1:  };
1:  
1:  enum ixgb_state_t {
1: -	__IXGB_DOWN = 0,
1: +  __IXGB_DOWN = 0,
1:  };
1:  
1:  typedef enum {
1: -	ixgb_xpak_vendor_intel = 0,
1: -	ixgb_xpak_vendor_infineon = 1,
1: +  ixgb_xpak_vendor_intel = 0,
1: +  ixgb_xpak_vendor_infineon = 1,
1:  } ixgb_xpak_vendor;
1:  
1:  struct ixgb_ee_map_type {
1: -	u8 mac_addr[6];
1: -	__le16 compatibility;
1: -	__le16 reserved1[4];
1: -	__le32 pba_number;
1: -	__le16 init_ctrl_reg_1;
1: -	__le16 subsystem_id;
1: -	__le16 subvendor_id;
1: -	__le16 device_id;
1: -	__le16 vendor_id;
1: -	__le16 init_ctrl_reg_2;
1: -	__le16 oem_reserved[16];
1: -	__le16 swdpins_reg;
1: -	__le16 circuit_ctrl_reg;
1: -	u8 d3_power;
1: -	u8 d0_power;
1: -	__le16 reserved2[28];
1: -	__le16 checksum;
1: -};
1: -
1: -enum {
1: -	NETDEV_STATS___3 = 0,
1: -	IXGB_STATS = 1,
1: +  u8 mac_addr[6];
1: +  __le16 compatibility;
1: +  __le16 reserved1[4];
1: +  __le32 pba_number;
1: +  __le16 init_ctrl_reg_1;
1: +  __le16 subsystem_id;
1: +  __le16 subvendor_id;
1: +  __le16 device_id;
1: +  __le16 vendor_id;
1: +  __le16 init_ctrl_reg_2;
1: +  __le16 oem_reserved[16];
1: +  __le16 swdpins_reg;
1: +  __le16 circuit_ctrl_reg;
1: +  u8 d3_power;
1: +  u8 d0_power;
1: +  __le16 reserved2[28];
1: +  __le16 checksum;
1: +};
1: +
1: +enum {
1: +  NETDEV_STATS___3 = 0,
1: +  IXGB_STATS = 1,
1:  };
1:  
1:  struct ixgb_stats {
1: -	char stat_string[32];
1: -	int type;
1: -	int sizeof_stat;
1: -	int stat_offset;
1: +  char stat_string[32];
1: +  int type;
1: +  int sizeof_stat;
1: +  int stat_offset;
1:  };
1:  
1:  struct ixgb_opt_list {
1: -	int i;
1: -	const char *str;
1: +  int i;
1: +  const char *str;
1:  };
1:  
1:  struct ixgb_option {
1: -	enum {
1: -		enable_option___2 = 0,
1: -		range_option___2 = 1,
1: -		list_option___2 = 2,
1: -	} type;
1: -	const char *name;
1: -	const char *err;
1: -	int def;
1: -	union {
1: -		struct {
1: -			int min;
1: -			int max;
1: -		} r;
1: -		struct {
1: -			int nr;
1: -			const struct ixgb_opt_list *p;
1: -		} l;
1: -	} arg;
1: +  enum {
1: +    enable_option___2 = 0,
1: +    range_option___2 = 1,
1: +    list_option___2 = 2,
1: +  } type;
1: +  const char *name;
1: +  const char *err;
1: +  int def;
1: +  union {
1: +    struct {
1: +      int min;
1: +      int max;
1: +    } r;
1: +    struct {
1: +      int nr;
1: +      const struct ixgb_opt_list *p;
1: +    } l;
1: +  } arg;
1:  };
1:  
1:  enum devlink_port_type {
1: -	DEVLINK_PORT_TYPE_NOTSET = 0,
1: -	DEVLINK_PORT_TYPE_AUTO = 1,
1: -	DEVLINK_PORT_TYPE_ETH = 2,
1: -	DEVLINK_PORT_TYPE_IB = 3,
1: +  DEVLINK_PORT_TYPE_NOTSET = 0,
1: +  DEVLINK_PORT_TYPE_AUTO = 1,
1: +  DEVLINK_PORT_TYPE_ETH = 2,
1: +  DEVLINK_PORT_TYPE_IB = 3,
1:  };
1:  
1:  enum devlink_port_flavour {
1: -	DEVLINK_PORT_FLAVOUR_PHYSICAL = 0,
1: -	DEVLINK_PORT_FLAVOUR_CPU = 1,
1: -	DEVLINK_PORT_FLAVOUR_DSA = 2,
1: -	DEVLINK_PORT_FLAVOUR_PCI_PF = 3,
1: -	DEVLINK_PORT_FLAVOUR_PCI_VF = 4,
1: -	DEVLINK_PORT_FLAVOUR_VIRTUAL = 5,
1: -	DEVLINK_PORT_FLAVOUR_UNUSED = 6,
1: +  DEVLINK_PORT_FLAVOUR_PHYSICAL = 0,
1: +  DEVLINK_PORT_FLAVOUR_CPU = 1,
1: +  DEVLINK_PORT_FLAVOUR_DSA = 2,
1: +  DEVLINK_PORT_FLAVOUR_PCI_PF = 3,
1: +  DEVLINK_PORT_FLAVOUR_PCI_VF = 4,
1: +  DEVLINK_PORT_FLAVOUR_VIRTUAL = 5,
1: +  DEVLINK_PORT_FLAVOUR_UNUSED = 6,
1:  };
1:  
1:  struct devlink_port_phys_attrs {
1: -	u32 port_number;
1: -	u32 split_subport_number;
1: +  u32 port_number;
1: +  u32 split_subport_number;
1:  };
1:  
1:  struct devlink_port_pci_pf_attrs {
1: -	u32 controller;
1: -	u16 pf;
1: -	u8 external: 1;
1: +  u32 controller;
1: +  u16 pf;
1: +  u8 external : 1;
1:  };
1:  
1:  struct devlink_port_pci_vf_attrs {
1: -	u32 controller;
1: -	u16 pf;
1: -	u16 vf;
1: -	u8 external: 1;
1: +  u32 controller;
1: +  u16 pf;
1: +  u16 vf;
1: +  u8 external : 1;
1:  };
1:  
1:  struct devlink_port_attrs {
1: -	u8 split: 1;
1: -	u8 splittable: 1;
1: -	u32 lanes;
1: -	enum devlink_port_flavour flavour;
1: -	struct netdev_phys_item_id switch_id;
1: -	union {
1: -		struct devlink_port_phys_attrs phys;
1: -		struct devlink_port_pci_pf_attrs pci_pf;
1: -		struct devlink_port_pci_vf_attrs pci_vf;
1: -	};
1: +  u8 split : 1;
1: +  u8 splittable : 1;
1: +  u32 lanes;
1: +  enum devlink_port_flavour flavour;
1: +  struct netdev_phys_item_id switch_id;
1: +  union {
1: +    struct devlink_port_phys_attrs phys;
1: +    struct devlink_port_pci_pf_attrs pci_pf;
1: +    struct devlink_port_pci_vf_attrs pci_vf;
1: +  };
1:  };
1:  
1:  struct devlink;
1:  
1:  struct devlink_port {
1: -	struct list_head list;
1: -	struct list_head param_list;
1: -	struct list_head region_list;
1: -	struct devlink *devlink;
1: -	unsigned int index;
1: -	bool registered;
1: -	spinlock_t type_lock;
1: -	enum devlink_port_type type;
1: -	enum devlink_port_type desired_type;
1: -	void *type_dev;
1: -	struct devlink_port_attrs attrs;
1: -	u8 attrs_set: 1;
1: -	u8 switch_port: 1;
1: -	struct delayed_work type_warn_dw;
1: -	struct list_head reporter_list;
1: -	struct mutex reporters_lock;
1: +  struct list_head list;
1: +  struct list_head param_list;
1: +  struct list_head region_list;
1: +  struct devlink *devlink;
1: +  unsigned int index;
1: +  bool registered;
1: +  spinlock_t type_lock;
1: +  enum devlink_port_type type;
1: +  enum devlink_port_type desired_type;
1: +  void *type_dev;
1: +  struct devlink_port_attrs attrs;
1: +  u8 attrs_set : 1;
1: +  u8 switch_port : 1;
1: +  struct delayed_work type_warn_dw;
1: +  struct list_head reporter_list;
1: +  struct mutex reporters_lock;
1:  };
1:  
1:  enum devlink_sb_pool_type {
1: -	DEVLINK_SB_POOL_TYPE_INGRESS = 0,
1: -	DEVLINK_SB_POOL_TYPE_EGRESS = 1,
1: +  DEVLINK_SB_POOL_TYPE_INGRESS = 0,
1: +  DEVLINK_SB_POOL_TYPE_EGRESS = 1,
1:  };
1:  
1:  enum devlink_sb_threshold_type {
1: -	DEVLINK_SB_THRESHOLD_TYPE_STATIC = 0,
1: -	DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC = 1,
1: +  DEVLINK_SB_THRESHOLD_TYPE_STATIC = 0,
1: +  DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC = 1,
1:  };
1:  
1:  enum devlink_eswitch_encap_mode {
1: -	DEVLINK_ESWITCH_ENCAP_MODE_NONE = 0,
1: -	DEVLINK_ESWITCH_ENCAP_MODE_BASIC = 1,
1: +  DEVLINK_ESWITCH_ENCAP_MODE_NONE = 0,
1: +  DEVLINK_ESWITCH_ENCAP_MODE_BASIC = 1,
1:  };
1:  
1:  enum devlink_trap_action {
1: -	DEVLINK_TRAP_ACTION_DROP = 0,
1: -	DEVLINK_TRAP_ACTION_TRAP = 1,
1: -	DEVLINK_TRAP_ACTION_MIRROR = 2,
1: +  DEVLINK_TRAP_ACTION_DROP = 0,
1: +  DEVLINK_TRAP_ACTION_TRAP = 1,
1: +  DEVLINK_TRAP_ACTION_MIRROR = 2,
1:  };
1:  
1:  enum devlink_trap_type {
1: -	DEVLINK_TRAP_TYPE_DROP = 0,
1: -	DEVLINK_TRAP_TYPE_EXCEPTION = 1,
1: -	DEVLINK_TRAP_TYPE_CONTROL = 2,
1: +  DEVLINK_TRAP_TYPE_DROP = 0,
1: +  DEVLINK_TRAP_TYPE_EXCEPTION = 1,
1: +  DEVLINK_TRAP_TYPE_CONTROL = 2,
1:  };
1:  
1:  enum devlink_reload_action {
1: -	DEVLINK_RELOAD_ACTION_UNSPEC = 0,
1: -	DEVLINK_RELOAD_ACTION_DRIVER_REINIT = 1,
1: -	DEVLINK_RELOAD_ACTION_FW_ACTIVATE = 2,
1: -	__DEVLINK_RELOAD_ACTION_MAX = 3,
1: -	DEVLINK_RELOAD_ACTION_MAX = 2,
1: +  DEVLINK_RELOAD_ACTION_UNSPEC = 0,
1: +  DEVLINK_RELOAD_ACTION_DRIVER_REINIT = 1,
1: +  DEVLINK_RELOAD_ACTION_FW_ACTIVATE = 2,
1: +  __DEVLINK_RELOAD_ACTION_MAX = 3,
1: +  DEVLINK_RELOAD_ACTION_MAX = 2,
1:  };
1:  
1:  enum devlink_reload_limit {
1: -	DEVLINK_RELOAD_LIMIT_UNSPEC = 0,
1: -	DEVLINK_RELOAD_LIMIT_NO_RESET = 1,
1: -	__DEVLINK_RELOAD_LIMIT_MAX = 2,
1: -	DEVLINK_RELOAD_LIMIT_MAX = 1,
1: +  DEVLINK_RELOAD_LIMIT_UNSPEC = 0,
1: +  DEVLINK_RELOAD_LIMIT_NO_RESET = 1,
1: +  __DEVLINK_RELOAD_LIMIT_MAX = 2,
1: +  DEVLINK_RELOAD_LIMIT_MAX = 1,
1:  };
1:  
1:  enum devlink_dpipe_field_mapping_type {
1: -	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE = 0,
1: -	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX = 1,
1: +  DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE = 0,
1: +  DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX = 1,
1:  };
1:  
1:  struct devlink_dev_stats {
1: -	u32 reload_stats[6];
1: -	u32 remote_reload_stats[6];
1: +  u32 reload_stats[6];
1: +  u32 remote_reload_stats[6];
1:  };
1:  
1:  struct devlink_dpipe_headers;
1: @@ -96952,39 +98077,39 @@ struct devlink_dpipe_headers;
1:  struct devlink_ops;
1:  
1:  struct devlink {
1: -	struct list_head list;
1: -	struct list_head port_list;
1: -	struct list_head sb_list;
1: -	struct list_head dpipe_table_list;
1: -	struct list_head resource_list;
1: -	struct list_head param_list;
1: -	struct list_head region_list;
1: -	struct list_head reporter_list;
1: -	struct mutex reporters_lock;
1: -	struct devlink_dpipe_headers *dpipe_headers;
1: -	struct list_head trap_list;
1: -	struct list_head trap_group_list;
1: -	struct list_head trap_policer_list;
1: -	const struct devlink_ops *ops;
1: -	struct xarray snapshot_ids;
1: -	struct devlink_dev_stats stats;
1: -	struct device *dev;
1: -	possible_net_t _net;
1: -	struct mutex lock;
1: -	u8 reload_failed: 1;
1: -	u8 reload_enabled: 1;
1: -	u8 registered: 1;
1: -	long: 61;
1: -	long: 64;
1: -	long: 64;
1: -	char priv[0];
1: +  struct list_head list;
1: +  struct list_head port_list;
1: +  struct list_head sb_list;
1: +  struct list_head dpipe_table_list;
1: +  struct list_head resource_list;
1: +  struct list_head param_list;
1: +  struct list_head region_list;
1: +  struct list_head reporter_list;
1: +  struct mutex reporters_lock;
1: +  struct devlink_dpipe_headers *dpipe_headers;
1: +  struct list_head trap_list;
1: +  struct list_head trap_group_list;
1: +  struct list_head trap_policer_list;
1: +  const struct devlink_ops *ops;
1: +  struct xarray snapshot_ids;
1: +  struct devlink_dev_stats stats;
1: +  struct device *dev;
1: +  possible_net_t _net;
1: +  struct mutex lock;
1: +  u8 reload_failed : 1;
1: +  u8 reload_enabled : 1;
1: +  u8 registered : 1;
1: +  long : 61;
1: +  long : 64;
1: +  long : 64;
1: +  char priv[0];
1:  };
1:  
1:  struct devlink_dpipe_header;
1:  
1:  struct devlink_dpipe_headers {
1: -	struct devlink_dpipe_header **headers;
1: -	unsigned int headers_count;
1: +  struct devlink_dpipe_header **headers;
1: +  unsigned int headers_count;
1:  };
1:  
1:  struct devlink_sb_pool_info;
1: @@ -97000,913 +98125,942 @@ struct devlink_trap_group;
1:  struct devlink_trap_policer;
1:  
1:  struct devlink_ops {
1: -	u32 supported_flash_update_params;
1: -	long unsigned int reload_actions;
1: -	long unsigned int reload_limits;
1: -	int (*reload_down)(struct devlink *, bool, enum devlink_reload_action, enum devlink_reload_limit, struct netlink_ext_ack *);
1: -	int (*reload_up)(struct devlink *, enum devlink_reload_action, enum devlink_reload_limit, u32 *, struct netlink_ext_ack *);
1: -	int (*port_type_set)(struct devlink_port *, enum devlink_port_type);
1: -	int (*port_split)(struct devlink *, unsigned int, unsigned int, struct netlink_ext_ack *);
1: -	int (*port_unsplit)(struct devlink *, unsigned int, struct netlink_ext_ack *);
1: -	int (*sb_pool_get)(struct devlink *, unsigned int, u16, struct devlink_sb_pool_info *);
1: -	int (*sb_pool_set)(struct devlink *, unsigned int, u16, u32, enum devlink_sb_threshold_type, struct netlink_ext_ack *);
1: -	int (*sb_port_pool_get)(struct devlink_port *, unsigned int, u16, u32 *);
1: -	int (*sb_port_pool_set)(struct devlink_port *, unsigned int, u16, u32, struct netlink_ext_ack *);
1: -	int (*sb_tc_pool_bind_get)(struct devlink_port *, unsigned int, u16, enum devlink_sb_pool_type, u16 *, u32 *);
1: -	int (*sb_tc_pool_bind_set)(struct devlink_port *, unsigned int, u16, enum devlink_sb_pool_type, u16, u32, struct netlink_ext_ack *);
1: -	int (*sb_occ_snapshot)(struct devlink *, unsigned int);
1: -	int (*sb_occ_max_clear)(struct devlink *, unsigned int);
1: -	int (*sb_occ_port_pool_get)(struct devlink_port *, unsigned int, u16, u32 *, u32 *);
1: -	int (*sb_occ_tc_port_bind_get)(struct devlink_port *, unsigned int, u16, enum devlink_sb_pool_type, u32 *, u32 *);
1: -	int (*eswitch_mode_get)(struct devlink *, u16 *);
1: -	int (*eswitch_mode_set)(struct devlink *, u16, struct netlink_ext_ack *);
1: -	int (*eswitch_inline_mode_get)(struct devlink *, u8 *);
1: -	int (*eswitch_inline_mode_set)(struct devlink *, u8, struct netlink_ext_ack *);
1: -	int (*eswitch_encap_mode_get)(struct devlink *, enum devlink_eswitch_encap_mode *);
1: -	int (*eswitch_encap_mode_set)(struct devlink *, enum devlink_eswitch_encap_mode, struct netlink_ext_ack *);
1: -	int (*info_get)(struct devlink *, struct devlink_info_req *, struct netlink_ext_ack *);
1: -	int (*flash_update)(struct devlink *, struct devlink_flash_update_params *, struct netlink_ext_ack *);
1: -	int (*trap_init)(struct devlink *, const struct devlink_trap *, void *);
1: -	void (*trap_fini)(struct devlink *, const struct devlink_trap *, void *);
1: -	int (*trap_action_set)(struct devlink *, const struct devlink_trap *, enum devlink_trap_action, struct netlink_ext_ack *);
1: -	int (*trap_group_init)(struct devlink *, const struct devlink_trap_group *);
1: -	int (*trap_group_set)(struct devlink *, const struct devlink_trap_group *, const struct devlink_trap_policer *, struct netlink_ext_ack *);
1: -	int (*trap_group_action_set)(struct devlink *, const struct devlink_trap_group *, enum devlink_trap_action, struct netlink_ext_ack *);
1: -	int (*trap_policer_init)(struct devlink *, const struct devlink_trap_policer *);
1: -	void (*trap_policer_fini)(struct devlink *, const struct devlink_trap_policer *);
1: -	int (*trap_policer_set)(struct devlink *, const struct devlink_trap_policer *, u64, u64, struct netlink_ext_ack *);
1: -	int (*trap_policer_counter_get)(struct devlink *, const struct devlink_trap_policer *, u64 *);
1: -	int (*port_function_hw_addr_get)(struct devlink *, struct devlink_port *, u8 *, int *, struct netlink_ext_ack *);
1: -	int (*port_function_hw_addr_set)(struct devlink *, struct devlink_port *, const u8 *, int, struct netlink_ext_ack *);
1: +  u32 supported_flash_update_params;
1: +  long unsigned int reload_actions;
1: +  long unsigned int reload_limits;
1: +  int (*reload_down)(struct devlink *, bool, enum devlink_reload_action,
1: +                     enum devlink_reload_limit, struct netlink_ext_ack *);
1: +  int (*reload_up)(struct devlink *, enum devlink_reload_action,
1: +                   enum devlink_reload_limit, u32 *, struct netlink_ext_ack *);
1: +  int (*port_type_set)(struct devlink_port *, enum devlink_port_type);
1: +  int (*port_split)(struct devlink *, unsigned int, unsigned int,
1: +                    struct netlink_ext_ack *);
1: +  int (*port_unsplit)(struct devlink *, unsigned int, struct netlink_ext_ack *);
1: +  int (*sb_pool_get)(struct devlink *, unsigned int, u16,
1: +                     struct devlink_sb_pool_info *);
1: +  int (*sb_pool_set)(struct devlink *, unsigned int, u16, u32,
1: +                     enum devlink_sb_threshold_type, struct netlink_ext_ack *);
1: +  int (*sb_port_pool_get)(struct devlink_port *, unsigned int, u16, u32 *);
1: +  int (*sb_port_pool_set)(struct devlink_port *, unsigned int, u16, u32,
1: +                          struct netlink_ext_ack *);
1: +  int (*sb_tc_pool_bind_get)(struct devlink_port *, unsigned int, u16,
1: +                             enum devlink_sb_pool_type, u16 *, u32 *);
1: +  int (*sb_tc_pool_bind_set)(struct devlink_port *, unsigned int, u16,
1: +                             enum devlink_sb_pool_type, u16, u32,
1: +                             struct netlink_ext_ack *);
1: +  int (*sb_occ_snapshot)(struct devlink *, unsigned int);
1: +  int (*sb_occ_max_clear)(struct devlink *, unsigned int);
1: +  int (*sb_occ_port_pool_get)(struct devlink_port *, unsigned int, u16, u32 *,
1: +                              u32 *);
1: +  int (*sb_occ_tc_port_bind_get)(struct devlink_port *, unsigned int, u16,
1: +                                 enum devlink_sb_pool_type, u32 *, u32 *);
1: +  int (*eswitch_mode_get)(struct devlink *, u16 *);
1: +  int (*eswitch_mode_set)(struct devlink *, u16, struct netlink_ext_ack *);
1: +  int (*eswitch_inline_mode_get)(struct devlink *, u8 *);
1: +  int (*eswitch_inline_mode_set)(struct devlink *, u8,
1: +                                 struct netlink_ext_ack *);
1: +  int (*eswitch_encap_mode_get)(struct devlink *,
1: +                                enum devlink_eswitch_encap_mode *);
1: +  int (*eswitch_encap_mode_set)(struct devlink *,
1: +                                enum devlink_eswitch_encap_mode,
1: +                                struct netlink_ext_ack *);
1: +  int (*info_get)(struct devlink *, struct devlink_info_req *,
1: +                  struct netlink_ext_ack *);
1: +  int (*flash_update)(struct devlink *, struct devlink_flash_update_params *,
1: +                      struct netlink_ext_ack *);
1: +  int (*trap_init)(struct devlink *, const struct devlink_trap *, void *);
1: +  void (*trap_fini)(struct devlink *, const struct devlink_trap *, void *);
1: +  int (*trap_action_set)(struct devlink *, const struct devlink_trap *,
1: +                         enum devlink_trap_action, struct netlink_ext_ack *);
1: +  int (*trap_group_init)(struct devlink *, const struct devlink_trap_group *);
1: +  int (*trap_group_set)(struct devlink *, const struct devlink_trap_group *,
1: +                        const struct devlink_trap_policer *,
1: +                        struct netlink_ext_ack *);
1: +  int (*trap_group_action_set)(struct devlink *,
1: +                               const struct devlink_trap_group *,
1: +                               enum devlink_trap_action,
1: +                               struct netlink_ext_ack *);
1: +  int (*trap_policer_init)(struct devlink *,
1: +                           const struct devlink_trap_policer *);
1: +  void (*trap_policer_fini)(struct devlink *,
1: +                            const struct devlink_trap_policer *);
1: +  int (*trap_policer_set)(struct devlink *, const struct devlink_trap_policer *,
1: +                          u64, u64, struct netlink_ext_ack *);
1: +  int (*trap_policer_counter_get)(struct devlink *,
1: +                                  const struct devlink_trap_policer *, u64 *);
1: +  int (*port_function_hw_addr_get)(struct devlink *, struct devlink_port *,
1: +                                   u8 *, int *, struct netlink_ext_ack *);
1: +  int (*port_function_hw_addr_set)(struct devlink *, struct devlink_port *,
1: +                                   const u8 *, int, struct netlink_ext_ack *);
1:  };
1:  
1:  struct devlink_sb_pool_info {
1: -	enum devlink_sb_pool_type pool_type;
1: -	u32 size;
1: -	enum devlink_sb_threshold_type threshold_type;
1: -	u32 cell_size;
1: +  enum devlink_sb_pool_type pool_type;
1: +  u32 size;
1: +  enum devlink_sb_threshold_type threshold_type;
1: +  u32 cell_size;
1:  };
1:  
1:  struct devlink_dpipe_field {
1: -	const char *name;
1: -	unsigned int id;
1: -	unsigned int bitwidth;
1: -	enum devlink_dpipe_field_mapping_type mapping_type;
1: +  const char *name;
1: +  unsigned int id;
1: +  unsigned int bitwidth;
1: +  enum devlink_dpipe_field_mapping_type mapping_type;
1:  };
1:  
1:  struct devlink_dpipe_header {
1: -	const char *name;
1: -	unsigned int id;
1: -	struct devlink_dpipe_field *fields;
1: -	unsigned int fields_count;
1: -	bool global;
1: +  const char *name;
1: +  unsigned int id;
1: +  struct devlink_dpipe_field *fields;
1: +  unsigned int fields_count;
1: +  bool global;
1:  };
1:  
1:  struct devlink_flash_update_params {
1: -	const char *file_name;
1: -	const char *component;
1: -	u32 overwrite_mask;
1: +  const char *file_name;
1: +  const char *component;
1: +  u32 overwrite_mask;
1:  };
1:  
1:  struct devlink_trap_policer {
1: -	u32 id;
1: -	u64 init_rate;
1: -	u64 init_burst;
1: -	u64 max_rate;
1: -	u64 min_rate;
1: -	u64 max_burst;
1: -	u64 min_burst;
1: +  u32 id;
1: +  u64 init_rate;
1: +  u64 init_burst;
1: +  u64 max_rate;
1: +  u64 min_rate;
1: +  u64 max_burst;
1: +  u64 min_burst;
1:  };
1:  
1:  struct devlink_trap_group {
1: -	const char *name;
1: -	u16 id;
1: -	bool generic;
1: -	u32 init_policer_id;
1: +  const char *name;
1: +  u16 id;
1: +  bool generic;
1: +  u32 init_policer_id;
1:  };
1:  
1:  struct devlink_trap {
1: -	enum devlink_trap_type type;
1: -	enum devlink_trap_action init_action;
1: -	bool generic;
1: -	u16 id;
1: -	const char *name;
1: -	u16 init_group_id;
1: -	u32 metadata_cap;
1: +  enum devlink_trap_type type;
1: +  enum devlink_trap_action init_action;
1: +  bool generic;
1: +  u16 id;
1: +  const char *name;
1: +  u16 init_group_id;
1: +  u32 metadata_cap;
1:  };
1:  
1:  enum {
1: -	MLX4_MAX_PORTS = 2,
1: -	MLX4_MAX_PORT_PKEYS = 128,
1: -	MLX4_MAX_PORT_GIDS = 128,
1: +  MLX4_MAX_PORTS = 2,
1: +  MLX4_MAX_PORT_PKEYS = 128,
1: +  MLX4_MAX_PORT_GIDS = 128,
1:  };
1:  
1:  enum {
1: -	MLX4_BOARD_ID_LEN = 64,
1: +  MLX4_BOARD_ID_LEN = 64,
1:  };
1:  
1:  enum {
1: -	MLX4_MAX_NUM_PF = 16,
1: -	MLX4_MAX_NUM_VF = 126,
1: -	MLX4_MAX_NUM_VF_P_PORT = 64,
1: -	MLX4_MFUNC_MAX = 128,
1: -	MLX4_MAX_EQ_NUM = 1024,
1: -	MLX4_MFUNC_EQ_NUM = 4,
1: -	MLX4_MFUNC_MAX_EQES = 8,
1: -	MLX4_MFUNC_EQE_MASK = 7,
1: +  MLX4_MAX_NUM_PF = 16,
1: +  MLX4_MAX_NUM_VF = 126,
1: +  MLX4_MAX_NUM_VF_P_PORT = 64,
1: +  MLX4_MFUNC_MAX = 128,
1: +  MLX4_MAX_EQ_NUM = 1024,
1: +  MLX4_MFUNC_EQ_NUM = 4,
1: +  MLX4_MFUNC_MAX_EQES = 8,
1: +  MLX4_MFUNC_EQE_MASK = 7,
1:  };
1:  
1:  enum {
1: -	MLX4_BMME_FLAG_WIN_TYPE_2B = 2,
1: -	MLX4_BMME_FLAG_LOCAL_INV = 64,
1: -	MLX4_BMME_FLAG_REMOTE_INV = 128,
1: -	MLX4_BMME_FLAG_TYPE_2_WIN = 512,
1: -	MLX4_BMME_FLAG_RESERVED_LKEY = 1024,
1: -	MLX4_BMME_FLAG_FAST_REG_WR = 2048,
1: -	MLX4_BMME_FLAG_ROCE_V1_V2 = 524288,
1: -	MLX4_BMME_FLAG_PORT_REMAP = 16777216,
1: -	MLX4_BMME_FLAG_VSD_INIT2RTR = 268435456,
1: +  MLX4_BMME_FLAG_WIN_TYPE_2B = 2,
1: +  MLX4_BMME_FLAG_LOCAL_INV = 64,
1: +  MLX4_BMME_FLAG_REMOTE_INV = 128,
1: +  MLX4_BMME_FLAG_TYPE_2_WIN = 512,
1: +  MLX4_BMME_FLAG_RESERVED_LKEY = 1024,
1: +  MLX4_BMME_FLAG_FAST_REG_WR = 2048,
1: +  MLX4_BMME_FLAG_ROCE_V1_V2 = 524288,
1: +  MLX4_BMME_FLAG_PORT_REMAP = 16777216,
1: +  MLX4_BMME_FLAG_VSD_INIT2RTR = 268435456,
1:  };
1:  
1:  enum slave_port_state {
1: -	SLAVE_PORT_DOWN = 0,
1: -	SLAVE_PENDING_UP = 1,
1: -	SLAVE_PORT_UP = 2,
1: +  SLAVE_PORT_DOWN = 0,
1: +  SLAVE_PENDING_UP = 1,
1: +  SLAVE_PORT_UP = 2,
1:  };
1:  
1:  enum mlx4_qp_region {
1: -	MLX4_QP_REGION_FW = 0,
1: -	MLX4_QP_REGION_RSS_RAW_ETH = 1,
1: -	MLX4_QP_REGION_BOTTOM = 1,
1: -	MLX4_QP_REGION_ETH_ADDR = 2,
1: -	MLX4_QP_REGION_FC_ADDR = 3,
1: -	MLX4_QP_REGION_FC_EXCH = 4,
1: -	MLX4_NUM_QP_REGION = 5,
1: +  MLX4_QP_REGION_FW = 0,
1: +  MLX4_QP_REGION_RSS_RAW_ETH = 1,
1: +  MLX4_QP_REGION_BOTTOM = 1,
1: +  MLX4_QP_REGION_ETH_ADDR = 2,
1: +  MLX4_QP_REGION_FC_ADDR = 3,
1: +  MLX4_QP_REGION_FC_EXCH = 4,
1: +  MLX4_NUM_QP_REGION = 5,
1:  };
1:  
1:  enum mlx4_port_type {
1: -	MLX4_PORT_TYPE_NONE = 0,
1: -	MLX4_PORT_TYPE_IB = 1,
1: -	MLX4_PORT_TYPE_ETH = 2,
1: -	MLX4_PORT_TYPE_AUTO = 3,
1: +  MLX4_PORT_TYPE_NONE = 0,
1: +  MLX4_PORT_TYPE_IB = 1,
1: +  MLX4_PORT_TYPE_ETH = 2,
1: +  MLX4_PORT_TYPE_AUTO = 3,
1:  };
1:  
1:  enum mlx4_steer_type {
1: -	MLX4_MC_STEER = 0,
1: -	MLX4_UC_STEER = 1,
1: -	MLX4_NUM_STEERS = 2,
1: +  MLX4_MC_STEER = 0,
1: +  MLX4_UC_STEER = 1,
1: +  MLX4_NUM_STEERS = 2,
1:  };
1:  
1:  struct mlx4_rate_limit_caps {
1: -	u16 num_rates;
1: -	u8 min_unit;
1: -	u16 min_val;
1: -	u8 max_unit;
1: -	u16 max_val;
1: +  u16 num_rates;
1: +  u8 min_unit;
1: +  u16 min_val;
1: +  u8 max_unit;
1: +  u16 max_val;
1:  };
1:  
1:  struct mlx4_phys_caps {
1: -	u32 gid_phys_table_len[3];
1: -	u32 pkey_phys_table_len[3];
1: -	u32 num_phys_eqs;
1: -	u32 base_sqpn;
1: -	u32 base_proxy_sqpn;
1: -	u32 base_tunnel_sqpn;
1: +  u32 gid_phys_table_len[3];
1: +  u32 pkey_phys_table_len[3];
1: +  u32 num_phys_eqs;
1: +  u32 base_sqpn;
1: +  u32 base_proxy_sqpn;
1: +  u32 base_tunnel_sqpn;
1:  };
1:  
1:  struct mlx4_spec_qps {
1: -	u32 qp0_qkey;
1: -	u32 qp0_proxy;
1: -	u32 qp0_tunnel;
1: -	u32 qp1_proxy;
1: -	u32 qp1_tunnel;
1: +  u32 qp0_qkey;
1: +  u32 qp0_proxy;
1: +  u32 qp0_tunnel;
1: +  u32 qp1_proxy;
1: +  u32 qp1_tunnel;
1:  };
1:  
1:  struct mlx4_caps {
1: -	u64 fw_ver;
1: -	u32 function;
1: -	int num_ports;
1: -	int vl_cap[3];
1: -	int ib_mtu_cap[3];
1: -	__be32 ib_port_def_cap[3];
1: -	u64 def_mac[3];
1: -	int eth_mtu_cap[3];
1: -	int gid_table_len[3];
1: -	int pkey_table_len[3];
1: -	int trans_type[3];
1: -	int vendor_oui[3];
1: -	int wavelength[3];
1: -	u64 trans_code[3];
1: -	int local_ca_ack_delay;
1: -	int num_uars;
1: -	u32 uar_page_size;
1: -	int bf_reg_size;
1: -	int bf_regs_per_page;
1: -	int max_sq_sg;
1: -	int max_rq_sg;
1: -	int num_qps;
1: -	int max_wqes;
1: -	int max_sq_desc_sz;
1: -	int max_rq_desc_sz;
1: -	int max_qp_init_rdma;
1: -	int max_qp_dest_rdma;
1: -	int max_tc_eth;
1: -	struct mlx4_spec_qps *spec_qps;
1: -	int num_srqs;
1: -	int max_srq_wqes;
1: -	int max_srq_sge;
1: -	int reserved_srqs;
1: -	int num_cqs;
1: -	int max_cqes;
1: -	int reserved_cqs;
1: -	int num_sys_eqs;
1: -	int num_eqs;
1: -	int reserved_eqs;
1: -	int num_comp_vectors;
1: -	int num_mpts;
1: -	int num_mtts;
1: -	int fmr_reserved_mtts;
1: -	int reserved_mtts;
1: -	int reserved_mrws;
1: -	int reserved_uars;
1: -	int num_mgms;
1: -	int num_amgms;
1: -	int reserved_mcgs;
1: -	int num_qp_per_mgm;
1: -	int steering_mode;
1: -	int dmfs_high_steer_mode;
1: -	int fs_log_max_ucast_qp_range_size;
1: -	int num_pds;
1: -	int reserved_pds;
1: -	int max_xrcds;
1: -	int reserved_xrcds;
1: -	int mtt_entry_sz;
1: -	u32 max_msg_sz;
1: -	u32 page_size_cap;
1: -	u64 flags;
1: -	u64 flags2;
1: -	u32 bmme_flags;
1: -	u32 reserved_lkey;
1: -	u16 stat_rate_support;
1: -	u8 port_width_cap[3];
1: -	int max_gso_sz;
1: -	int max_rss_tbl_sz;
1: -	int reserved_qps_cnt[5];
1: -	int reserved_qps;
1: -	int reserved_qps_base[5];
1: -	int log_num_macs;
1: -	int log_num_vlans;
1: -	enum mlx4_port_type port_type[3];
1: -	u8 supported_type[3];
1: -	u8 suggested_type[3];
1: -	u8 default_sense[3];
1: -	u32 port_mask[3];
1: -	enum mlx4_port_type possible_type[3];
1: -	u32 max_counters;
1: -	u8 port_ib_mtu[3];
1: -	u16 sqp_demux;
1: -	u32 eqe_size;
1: -	u32 cqe_size;
1: -	u8 eqe_factor;
1: -	u32 userspace_caps;
1: -	u32 function_caps;
1: -	u16 hca_core_clock;
1: -	u64 phys_port_id[3];
1: -	int tunnel_offload_mode;
1: -	u8 rx_checksum_flags_port[3];
1: -	u8 phv_bit[3];
1: -	u8 alloc_res_qp_mask;
1: -	u32 dmfs_high_rate_qpn_base;
1: -	u32 dmfs_high_rate_qpn_range;
1: -	u32 vf_caps;
1: -	bool wol_port[3];
1: -	struct mlx4_rate_limit_caps rl_caps;
1: -	u32 health_buffer_addrs;
1: +  u64 fw_ver;
1: +  u32 function;
1: +  int num_ports;
1: +  int vl_cap[3];
1: +  int ib_mtu_cap[3];
1: +  __be32 ib_port_def_cap[3];
1: +  u64 def_mac[3];
1: +  int eth_mtu_cap[3];
1: +  int gid_table_len[3];
1: +  int pkey_table_len[3];
1: +  int trans_type[3];
1: +  int vendor_oui[3];
1: +  int wavelength[3];
1: +  u64 trans_code[3];
1: +  int local_ca_ack_delay;
1: +  int num_uars;
1: +  u32 uar_page_size;
1: +  int bf_reg_size;
1: +  int bf_regs_per_page;
1: +  int max_sq_sg;
1: +  int max_rq_sg;
1: +  int num_qps;
1: +  int max_wqes;
1: +  int max_sq_desc_sz;
1: +  int max_rq_desc_sz;
1: +  int max_qp_init_rdma;
1: +  int max_qp_dest_rdma;
1: +  int max_tc_eth;
1: +  struct mlx4_spec_qps *spec_qps;
1: +  int num_srqs;
1: +  int max_srq_wqes;
1: +  int max_srq_sge;
1: +  int reserved_srqs;
1: +  int num_cqs;
1: +  int max_cqes;
1: +  int reserved_cqs;
1: +  int num_sys_eqs;
1: +  int num_eqs;
1: +  int reserved_eqs;
1: +  int num_comp_vectors;
1: +  int num_mpts;
1: +  int num_mtts;
1: +  int fmr_reserved_mtts;
1: +  int reserved_mtts;
1: +  int reserved_mrws;
1: +  int reserved_uars;
1: +  int num_mgms;
1: +  int num_amgms;
1: +  int reserved_mcgs;
1: +  int num_qp_per_mgm;
1: +  int steering_mode;
1: +  int dmfs_high_steer_mode;
1: +  int fs_log_max_ucast_qp_range_size;
1: +  int num_pds;
1: +  int reserved_pds;
1: +  int max_xrcds;
1: +  int reserved_xrcds;
1: +  int mtt_entry_sz;
1: +  u32 max_msg_sz;
1: +  u32 page_size_cap;
1: +  u64 flags;
1: +  u64 flags2;
1: +  u32 bmme_flags;
1: +  u32 reserved_lkey;
1: +  u16 stat_rate_support;
1: +  u8 port_width_cap[3];
1: +  int max_gso_sz;
1: +  int max_rss_tbl_sz;
1: +  int reserved_qps_cnt[5];
1: +  int reserved_qps;
1: +  int reserved_qps_base[5];
1: +  int log_num_macs;
1: +  int log_num_vlans;
1: +  enum mlx4_port_type port_type[3];
1: +  u8 supported_type[3];
1: +  u8 suggested_type[3];
1: +  u8 default_sense[3];
1: +  u32 port_mask[3];
1: +  enum mlx4_port_type possible_type[3];
1: +  u32 max_counters;
1: +  u8 port_ib_mtu[3];
1: +  u16 sqp_demux;
1: +  u32 eqe_size;
1: +  u32 cqe_size;
1: +  u8 eqe_factor;
1: +  u32 userspace_caps;
1: +  u32 function_caps;
1: +  u16 hca_core_clock;
1: +  u64 phys_port_id[3];
1: +  int tunnel_offload_mode;
1: +  u8 rx_checksum_flags_port[3];
1: +  u8 phv_bit[3];
1: +  u8 alloc_res_qp_mask;
1: +  u32 dmfs_high_rate_qpn_base;
1: +  u32 dmfs_high_rate_qpn_range;
1: +  u32 vf_caps;
1: +  bool wol_port[3];
1: +  struct mlx4_rate_limit_caps rl_caps;
1: +  u32 health_buffer_addrs;
1:  };
1:  
1:  struct mlx4_buf_list {
1: -	void *buf;
1: -	dma_addr_t map;
1: +  void *buf;
1: +  dma_addr_t map;
1:  };
1:  
1:  struct mlx4_buf {
1: -	struct mlx4_buf_list direct;
1: -	struct mlx4_buf_list *page_list;
1: -	int nbufs;
1: -	int npages;
1: -	int page_shift;
1: +  struct mlx4_buf_list direct;
1: +  struct mlx4_buf_list *page_list;
1: +  int nbufs;
1: +  int npages;
1: +  int page_shift;
1:  };
1:  
1:  struct mlx4_mtt {
1: -	u32 offset;
1: -	int order;
1: -	int page_shift;
1: +  u32 offset;
1: +  int order;
1: +  int page_shift;
1:  };
1:  
1:  enum {
1: -	MLX4_DB_PER_PAGE = 1024,
1: +  MLX4_DB_PER_PAGE = 1024,
1:  };
1:  
1:  struct mlx4_db_pgdir {
1: -	struct list_head list;
1: -	long unsigned int order0[16];
1: -	long unsigned int order1[8];
1: -	long unsigned int *bits[2];
1: -	__be32 *db_page;
1: -	dma_addr_t db_dma;
1: +  struct list_head list;
1: +  long unsigned int order0[16];
1: +  long unsigned int order1[8];
1: +  long unsigned int *bits[2];
1: +  __be32 *db_page;
1: +  dma_addr_t db_dma;
1:  };
1:  
1:  struct mlx4_ib_user_db_page;
1:  
1:  struct mlx4_db {
1: -	__be32 *db;
1: -	union {
1: -		struct mlx4_db_pgdir *pgdir;
1: -		struct mlx4_ib_user_db_page *user_page;
1: -	} u;
1: -	dma_addr_t dma;
1: -	int index;
1: -	int order;
1: +  __be32 *db;
1: +  union {
1: +    struct mlx4_db_pgdir *pgdir;
1: +    struct mlx4_ib_user_db_page *user_page;
1: +  } u;
1: +  dma_addr_t dma;
1: +  int index;
1: +  int order;
1:  };
1:  
1:  struct mlx4_hwq_resources {
1: -	struct mlx4_db db;
1: -	struct mlx4_mtt mtt;
1: -	struct mlx4_buf buf;
1: +  struct mlx4_db db;
1: +  struct mlx4_mtt mtt;
1: +  struct mlx4_buf buf;
1:  };
1:  
1:  struct mlx4_uar {
1: -	long unsigned int pfn;
1: -	int index;
1: -	struct list_head bf_list;
1: -	unsigned int free_bf_bmap;
1: -	void *map;
1: -	void *bf_map;
1: +  long unsigned int pfn;
1: +  int index;
1: +  struct list_head bf_list;
1: +  unsigned int free_bf_bmap;
1: +  void *map;
1: +  void *bf_map;
1:  };
1:  
1:  struct mlx4_quotas {
1: -	int qp;
1: -	int cq;
1: -	int srq;
1: -	int mpt;
1: -	int mtt;
1: -	int counter;
1: -	int xrcd;
1: +  int qp;
1: +  int cq;
1: +  int srq;
1: +  int mpt;
1: +  int mtt;
1: +  int counter;
1: +  int xrcd;
1:  };
1:  
1:  struct mlx4_vf_dev {
1: -	u8 min_port;
1: -	u8 n_ports;
1: +  u8 min_port;
1: +  u8 n_ports;
1:  };
1:  
1:  struct devlink_region;
1:  
1:  struct mlx4_fw_crdump {
1: -	bool snapshot_enable;
1: -	struct devlink_region *region_crspace;
1: -	struct devlink_region *region_fw_health;
1: +  bool snapshot_enable;
1: +  struct devlink_region *region_crspace;
1: +  struct devlink_region *region_fw_health;
1:  };
1:  
1:  enum mlx4_pci_status {
1: -	MLX4_PCI_STATUS_DISABLED = 0,
1: -	MLX4_PCI_STATUS_ENABLED = 1,
1: +  MLX4_PCI_STATUS_DISABLED = 0,
1: +  MLX4_PCI_STATUS_ENABLED = 1,
1:  };
1:  
1:  struct mlx4_dev;
1:  
1:  struct mlx4_dev_persistent {
1: -	struct pci_dev *pdev;
1: -	struct mlx4_dev *dev;
1: -	int nvfs[3];
1: -	int num_vfs;
1: -	enum mlx4_port_type curr_port_type[3];
1: -	enum mlx4_port_type curr_port_poss_type[3];
1: -	struct work_struct catas_work;
1: -	struct workqueue_struct *catas_wq;
1: -	struct mutex device_state_mutex;
1: -	u8 state;
1: -	struct mutex interface_state_mutex;
1: -	u8 interface_state;
1: -	struct mutex pci_status_mutex;
1: -	enum mlx4_pci_status pci_status;
1: -	struct mlx4_fw_crdump crdump;
1: +  struct pci_dev *pdev;
1: +  struct mlx4_dev *dev;
1: +  int nvfs[3];
1: +  int num_vfs;
1: +  enum mlx4_port_type curr_port_type[3];
1: +  enum mlx4_port_type curr_port_poss_type[3];
1: +  struct work_struct catas_work;
1: +  struct workqueue_struct *catas_wq;
1: +  struct mutex device_state_mutex;
1: +  u8 state;
1: +  struct mutex interface_state_mutex;
1: +  u8 interface_state;
1: +  struct mutex pci_status_mutex;
1: +  enum mlx4_pci_status pci_status;
1: +  struct mlx4_fw_crdump crdump;
1:  };
1:  
1:  struct mlx4_dev {
1: -	struct mlx4_dev_persistent *persist;
1: -	long unsigned int flags;
1: -	long unsigned int num_slaves;
1: -	struct mlx4_caps caps;
1: -	struct mlx4_phys_caps phys_caps;
1: -	struct mlx4_quotas quotas;
1: -	struct xarray qp_table_tree;
1: -	u8 rev_id;
1: -	u8 port_random_macs;
1: -	char board_id[64];
1: -	int numa_node;
1: -	int oper_log_mgm_entry_size;
1: -	u64 regid_promisc_array[3];
1: -	u64 regid_allmulti_array[3];
1: -	struct mlx4_vf_dev *dev_vfs;
1: -	u8 uar_page_shift;
1: +  struct mlx4_dev_persistent *persist;
1: +  long unsigned int flags;
1: +  long unsigned int num_slaves;
1: +  struct mlx4_caps caps;
1: +  struct mlx4_phys_caps phys_caps;
1: +  struct mlx4_quotas quotas;
1: +  struct xarray qp_table_tree;
1: +  u8 rev_id;
1: +  u8 port_random_macs;
1: +  char board_id[64];
1: +  int numa_node;
1: +  int oper_log_mgm_entry_size;
1: +  u64 regid_promisc_array[3];
1: +  u64 regid_allmulti_array[3];
1: +  struct mlx4_vf_dev *dev_vfs;
1: +  u8 uar_page_shift;
1:  };
1:  
1:  struct mlx4_eqe {
1: -	u8 reserved1;
1: -	u8 type;
1: -	u8 reserved2;
1: -	u8 subtype;
1: -	union {
1: -		u32 raw[6];
1: -		struct {
1: -			__be32 cqn;
1: -		} comp;
1: -		struct {
1: -			u16 reserved1;
1: -			__be16 token;
1: -			u32 reserved2;
1: -			u8 reserved3[3];
1: -			u8 status;
1: -			__be64 out_param;
1: -		} __attribute__((packed)) cmd;
1: -		struct {
1: -			__be32 qpn;
1: -		} qp;
1: -		struct {
1: -			__be32 srqn;
1: -		} srq;
1: -		struct {
1: -			__be32 cqn;
1: -			u32 reserved1;
1: -			u8 reserved2[3];
1: -			u8 syndrome;
1: -		} cq_err;
1: -		struct {
1: -			u32 reserved1[2];
1: -			__be32 port;
1: -		} port_change;
1: -		struct {
1: -			u32 reserved;
1: -			u32 bit_vec[4];
1: -		} comm_channel_arm;
1: -		struct {
1: -			u8 port;
1: -			u8 reserved[3];
1: -			__be64 mac;
1: -		} __attribute__((packed)) mac_update;
1: -		struct {
1: -			__be32 slave_id;
1: -		} flr_event;
1: -		struct {
1: -			__be16 current_temperature;
1: -			__be16 warning_threshold;
1: -		} warming;
1: -		struct {
1: -			u8 reserved[3];
1: -			u8 port;
1: -			union {
1: -				struct {
1: -					__be16 mstr_sm_lid;
1: -					__be16 port_lid;
1: -					__be32 changed_attr;
1: -					u8 reserved[3];
1: -					u8 mstr_sm_sl;
1: -					__be64 gid_prefix;
1: -				} __attribute__((packed)) port_info;
1: -				struct {
1: -					__be32 block_ptr;
1: -					__be32 tbl_entries_mask;
1: -				} tbl_change_info;
1: -				struct {
1: -					u8 sl2vl_table[8];
1: -				} sl2vl_tbl_change_info;
1: -			} params;
1: -		} __attribute__((packed)) port_mgmt_change;
1: -		struct {
1: -			u8 reserved[3];
1: -			u8 port;
1: -			u32 reserved1[5];
1: -		} bad_cable;
1: -	} event;
1: -	u8 slave_id;
1: -	u8 reserved3[2];
1: -	u8 owner;
1: +  u8 reserved1;
1: +  u8 type;
1: +  u8 reserved2;
1: +  u8 subtype;
1: +  union {
1: +    u32 raw[6];
1: +    struct {
1: +      __be32 cqn;
1: +    } comp;
1: +    struct {
1: +      u16 reserved1;
1: +      __be16 token;
1: +      u32 reserved2;
1: +      u8 reserved3[3];
1: +      u8 status;
1: +      __be64 out_param;
1: +    } __attribute__((packed)) cmd;
1: +    struct {
1: +      __be32 qpn;
1: +    } qp;
1: +    struct {
1: +      __be32 srqn;
1: +    } srq;
1: +    struct {
1: +      __be32 cqn;
1: +      u32 reserved1;
1: +      u8 reserved2[3];
1: +      u8 syndrome;
1: +    } cq_err;
1: +    struct {
1: +      u32 reserved1[2];
1: +      __be32 port;
1: +    } port_change;
1: +    struct {
1: +      u32 reserved;
1: +      u32 bit_vec[4];
1: +    } comm_channel_arm;
1: +    struct {
1: +      u8 port;
1: +      u8 reserved[3];
1: +      __be64 mac;
1: +    } __attribute__((packed)) mac_update;
1: +    struct {
1: +      __be32 slave_id;
1: +    } flr_event;
1: +    struct {
1: +      __be16 current_temperature;
1: +      __be16 warning_threshold;
1: +    } warming;
1: +    struct {
1: +      u8 reserved[3];
1: +      u8 port;
1: +      union {
1: +        struct {
1: +          __be16 mstr_sm_lid;
1: +          __be16 port_lid;
1: +          __be32 changed_attr;
1: +          u8 reserved[3];
1: +          u8 mstr_sm_sl;
1: +          __be64 gid_prefix;
1: +        } __attribute__((packed)) port_info;
1: +        struct {
1: +          __be32 block_ptr;
1: +          __be32 tbl_entries_mask;
1: +        } tbl_change_info;
1: +        struct {
1: +          u8 sl2vl_table[8];
1: +        } sl2vl_tbl_change_info;
1: +      } params;
1: +    } __attribute__((packed)) port_mgmt_change;
1: +    struct {
1: +      u8 reserved[3];
1: +      u8 port;
1: +      u32 reserved1[5];
1: +    } bad_cable;
1: +  } event;
1: +  u8 slave_id;
1: +  u8 reserved3[2];
1: +  u8 owner;
1:  } __attribute__((packed));
1:  
1:  struct mlx4_active_ports {
1: -	long unsigned int ports[1];
1: +  long unsigned int ports[1];
1:  };
1:  
1:  struct mlx4_port_map {
1: -	u8 port1;
1: -	u8 port2;
1: +  u8 port1;
1: +  u8 port2;
1:  };
1:  
1:  enum {
1: -	MLX4_DEFAULT_MGM_LOG_ENTRY_SIZE = 10,
1: -	MLX4_MIN_MGM_LOG_ENTRY_SIZE = 7,
1: -	MLX4_MAX_MGM_LOG_ENTRY_SIZE = 12,
1: -	MLX4_MAX_QP_PER_MGM = 1016,
1: +  MLX4_DEFAULT_MGM_LOG_ENTRY_SIZE = 10,
1: +  MLX4_MIN_MGM_LOG_ENTRY_SIZE = 7,
1: +  MLX4_MAX_MGM_LOG_ENTRY_SIZE = 12,
1: +  MLX4_MAX_QP_PER_MGM = 1016,
1:  };
1:  
1:  enum {
1: -	MLX4_CMPT_TYPE_QP = 0,
1: -	MLX4_CMPT_TYPE_SRQ = 1,
1: -	MLX4_CMPT_TYPE_CQ = 2,
1: -	MLX4_CMPT_TYPE_EQ = 3,
1: -	MLX4_CMPT_NUM_TYPE = 4,
1: +  MLX4_CMPT_TYPE_QP = 0,
1: +  MLX4_CMPT_TYPE_SRQ = 1,
1: +  MLX4_CMPT_TYPE_CQ = 2,
1: +  MLX4_CMPT_TYPE_EQ = 3,
1: +  MLX4_CMPT_NUM_TYPE = 4,
1:  };
1:  
1:  enum mlx4_resource {
1: -	RES_QP = 0,
1: -	RES_CQ = 1,
1: -	RES_SRQ = 2,
1: -	RES_XRCD = 3,
1: -	RES_MPT = 4,
1: -	RES_MTT = 5,
1: -	RES_MAC = 6,
1: -	RES_VLAN = 7,
1: -	RES_NPORT_ID = 8,
1: -	RES_COUNTER = 9,
1: -	RES_FS_RULE = 10,
1: -	RES_EQ = 11,
1: -	MLX4_NUM_OF_RESOURCE_TYPE = 12,
1: +  RES_QP = 0,
1: +  RES_CQ = 1,
1: +  RES_SRQ = 2,
1: +  RES_XRCD = 3,
1: +  RES_MPT = 4,
1: +  RES_MTT = 5,
1: +  RES_MAC = 6,
1: +  RES_VLAN = 7,
1: +  RES_NPORT_ID = 8,
1: +  RES_COUNTER = 9,
1: +  RES_FS_RULE = 10,
1: +  RES_EQ = 11,
1: +  MLX4_NUM_OF_RESOURCE_TYPE = 12,
1:  };
1:  
1:  struct mlx4_vhcr_cmd {
1: -	__be64 in_param;
1: -	__be32 in_modifier;
1: -	u32 reserved1;
1: -	__be64 out_param;
1: -	__be16 token;
1: -	u16 reserved;
1: -	u8 status;
1: -	u8 flags;
1: -	__be16 opcode;
1: +  __be64 in_param;
1: +  __be32 in_modifier;
1: +  u32 reserved1;
1: +  __be64 out_param;
1: +  __be16 token;
1: +  u16 reserved;
1: +  u8 status;
1: +  u8 flags;
1: +  __be16 opcode;
1:  };
1:  
1:  struct mlx4_bitmap {
1: -	u32 last;
1: -	u32 top;
1: -	u32 max;
1: -	u32 reserved_top;
1: -	u32 mask;
1: -	u32 avail;
1: -	u32 effective_len;
1: -	spinlock_t lock;
1: -	long unsigned int *table;
1: +  u32 last;
1: +  u32 top;
1: +  u32 max;
1: +  u32 reserved_top;
1: +  u32 mask;
1: +  u32 avail;
1: +  u32 effective_len;
1: +  spinlock_t lock;
1: +  long unsigned int *table;
1:  };
1:  
1:  struct mlx4_buddy {
1: -	long unsigned int **bits;
1: -	unsigned int *num_free;
1: -	u32 max_order;
1: -	spinlock_t lock;
1: +  long unsigned int **bits;
1: +  unsigned int *num_free;
1: +  u32 max_order;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct mlx4_icm;
1:  
1:  struct mlx4_icm_table {
1: -	u64 virt;
1: -	int num_icm;
1: -	u32 num_obj;
1: -	int obj_size;
1: -	int lowmem;
1: -	int coherent;
1: -	struct mutex mutex;
1: -	struct mlx4_icm **icm;
1: +  u64 virt;
1: +  int num_icm;
1: +  u32 num_obj;
1: +  int obj_size;
1: +  int lowmem;
1: +  int coherent;
1: +  struct mutex mutex;
1: +  struct mlx4_icm **icm;
1:  };
1:  
1:  struct mlx4_eq_tasklet {
1: -	struct list_head list;
1: -	struct list_head process_list;
1: -	struct tasklet_struct task;
1: -	spinlock_t lock;
1: +  struct list_head list;
1: +  struct list_head process_list;
1: +  struct tasklet_struct task;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct mlx4_eq {
1: -	struct mlx4_dev *dev;
1: -	void *doorbell;
1: -	int eqn;
1: -	u32 cons_index;
1: -	u16 irq;
1: -	u16 have_irq;
1: -	int nent;
1: -	struct mlx4_buf_list *page_list;
1: -	struct mlx4_mtt mtt;
1: -	struct mlx4_eq_tasklet tasklet_ctx;
1: -	struct mlx4_active_ports actv_ports;
1: -	u32 ref_count;
1: -	cpumask_var_t affinity_mask;
1: +  struct mlx4_dev *dev;
1: +  void *doorbell;
1: +  int eqn;
1: +  u32 cons_index;
1: +  u16 irq;
1: +  u16 have_irq;
1: +  int nent;
1: +  struct mlx4_buf_list *page_list;
1: +  struct mlx4_mtt mtt;
1: +  struct mlx4_eq_tasklet tasklet_ctx;
1: +  struct mlx4_active_ports actv_ports;
1: +  u32 ref_count;
1: +  cpumask_var_t affinity_mask;
1:  };
1:  
1:  struct mlx4_slave_eqe {
1: -	u8 type;
1: -	u8 port;
1: -	u32 param;
1: +  u8 type;
1: +  u8 port;
1: +  u32 param;
1:  };
1:  
1:  struct mlx4_slave_event_eq_info {
1: -	int eqn;
1: -	u16 token;
1: +  int eqn;
1: +  u16 token;
1:  };
1:  
1:  struct mlx4_fw {
1: -	u64 clr_int_base;
1: -	u64 catas_offset;
1: -	u64 comm_base;
1: -	u64 clock_offset;
1: -	struct mlx4_icm *fw_icm;
1: -	struct mlx4_icm *aux_icm;
1: -	u32 catas_size;
1: -	u16 fw_pages;
1: -	u8 clr_int_bar;
1: -	u8 catas_bar;
1: -	u8 comm_bar;
1: -	u8 clock_bar;
1: +  u64 clr_int_base;
1: +  u64 catas_offset;
1: +  u64 comm_base;
1: +  u64 clock_offset;
1: +  struct mlx4_icm *fw_icm;
1: +  struct mlx4_icm *aux_icm;
1: +  u32 catas_size;
1: +  u16 fw_pages;
1: +  u8 clr_int_bar;
1: +  u8 catas_bar;
1: +  u8 comm_bar;
1: +  u8 clock_bar;
1:  };
1:  
1:  struct mlx4_comm {
1: -	u32 slave_write;
1: -	u32 slave_read;
1: +  u32 slave_write;
1: +  u32 slave_read;
1:  };
1:  
1:  struct mlx4_vlan_fltr {
1: -	__be32 entry[128];
1: +  __be32 entry[128];
1:  };
1:  
1:  struct mlx4_slave_state {
1: -	u8 comm_toggle;
1: -	u8 last_cmd;
1: -	u8 init_port_mask;
1: -	bool active;
1: -	bool old_vlan_api;
1: -	bool vst_qinq_supported;
1: -	u8 function;
1: -	dma_addr_t vhcr_dma;
1: -	u16 user_mtu[3];
1: -	u16 mtu[3];
1: -	__be32 ib_cap_mask[3];
1: -	struct mlx4_slave_eqe eq[8];
1: -	struct list_head mcast_filters[3];
1: -	struct mlx4_vlan_fltr *vlan_filter[3];
1: -	struct mlx4_slave_event_eq_info event_eq[64];
1: -	u16 eq_pi;
1: -	u16 eq_ci;
1: -	spinlock_t lock;
1: -	u8 is_slave_going_down;
1: -	u32 cookie;
1: -	enum slave_port_state port_state[3];
1: +  u8 comm_toggle;
1: +  u8 last_cmd;
1: +  u8 init_port_mask;
1: +  bool active;
1: +  bool old_vlan_api;
1: +  bool vst_qinq_supported;
1: +  u8 function;
1: +  dma_addr_t vhcr_dma;
1: +  u16 user_mtu[3];
1: +  u16 mtu[3];
1: +  __be32 ib_cap_mask[3];
1: +  struct mlx4_slave_eqe eq[8];
1: +  struct list_head mcast_filters[3];
1: +  struct mlx4_vlan_fltr *vlan_filter[3];
1: +  struct mlx4_slave_event_eq_info event_eq[64];
1: +  u16 eq_pi;
1: +  u16 eq_ci;
1: +  spinlock_t lock;
1: +  u8 is_slave_going_down;
1: +  u32 cookie;
1: +  enum slave_port_state port_state[3];
1:  };
1:  
1:  struct mlx4_vport_state {
1: -	u64 mac;
1: -	u16 default_vlan;
1: -	u8 default_qos;
1: -	__be16 vlan_proto;
1: -	u32 tx_rate;
1: -	bool spoofchk;
1: -	u32 link_state;
1: -	u8 qos_vport;
1: -	__be64 guid;
1: +  u64 mac;
1: +  u16 default_vlan;
1: +  u8 default_qos;
1: +  __be16 vlan_proto;
1: +  u32 tx_rate;
1: +  bool spoofchk;
1: +  u32 link_state;
1: +  u8 qos_vport;
1: +  __be64 guid;
1:  };
1:  
1:  struct mlx4_vf_admin_state {
1: -	struct mlx4_vport_state vport[3];
1: -	u8 enable_smi[3];
1: +  struct mlx4_vport_state vport[3];
1: +  u8 enable_smi[3];
1:  };
1:  
1:  struct mlx4_vport_oper_state {
1: -	struct mlx4_vport_state state;
1: -	int mac_idx;
1: -	int vlan_idx;
1: +  struct mlx4_vport_state state;
1: +  int mac_idx;
1: +  int vlan_idx;
1:  };
1:  
1:  struct mlx4_vf_oper_state {
1: -	struct mlx4_vport_oper_state vport[3];
1: -	u8 smi_enabled[3];
1: +  struct mlx4_vport_oper_state vport[3];
1: +  u8 smi_enabled[3];
1:  };
1:  
1:  struct slave_list {
1: -	struct mutex mutex;
1: -	struct list_head res_list[12];
1: +  struct mutex mutex;
1: +  struct list_head res_list[12];
1:  };
1:  
1:  struct resource_allocator {
1: -	spinlock_t alloc_lock;
1: -	union {
1: -		unsigned int res_reserved;
1: -		unsigned int res_port_rsvd[2];
1: -	};
1: -	union {
1: -		int res_free;
1: -		int res_port_free[2];
1: -	};
1: -	int *quota;
1: -	int *allocated;
1: -	int *guaranteed;
1: +  spinlock_t alloc_lock;
1: +  union {
1: +    unsigned int res_reserved;
1: +    unsigned int res_port_rsvd[2];
1: +  };
1: +  union {
1: +    int res_free;
1: +    int res_port_free[2];
1: +  };
1: +  int *quota;
1: +  int *allocated;
1: +  int *guaranteed;
1:  };
1:  
1:  struct mlx4_resource_tracker {
1: -	spinlock_t lock;
1: -	struct rb_root res_tree[12];
1: -	struct slave_list *slave_list;
1: -	struct resource_allocator res_alloc[12];
1: +  spinlock_t lock;
1: +  struct rb_root res_tree[12];
1: +  struct slave_list *slave_list;
1: +  struct resource_allocator res_alloc[12];
1:  };
1:  
1:  struct mlx4_slave_event_eq {
1: -	u32 eqn;
1: -	u32 cons;
1: -	u32 prod;
1: -	spinlock_t event_lock;
1: -	struct mlx4_eqe event_eqe[128];
1: +  u32 eqn;
1: +  u32 cons;
1: +  u32 prod;
1: +  spinlock_t event_lock;
1: +  struct mlx4_eqe event_eqe[128];
1:  };
1:  
1:  struct mlx4_qos_manager {
1: -	int num_of_qos_vfs;
1: -	long unsigned int priority_bm[1];
1: +  int num_of_qos_vfs;
1: +  long unsigned int priority_bm[1];
1:  };
1:  
1:  struct mlx4_master_qp0_state {
1: -	int proxy_qp0_active;
1: -	int qp0_active;
1: -	int port_active;
1: +  int proxy_qp0_active;
1: +  int qp0_active;
1: +  int port_active;
1:  };
1:  
1:  struct mlx4_mfunc_master_ctx {
1: -	struct mlx4_slave_state *slave_state;
1: -	struct mlx4_vf_admin_state *vf_admin;
1: -	struct mlx4_vf_oper_state *vf_oper;
1: -	struct mlx4_master_qp0_state qp0_state[3];
1: -	int init_port_ref[3];
1: -	u16 max_mtu[3];
1: -	u16 max_user_mtu[3];
1: -	u8 pptx;
1: -	u8 pprx;
1: -	int disable_mcast_ref[3];
1: -	struct mlx4_resource_tracker res_tracker;
1: -	struct workqueue_struct *comm_wq;
1: -	struct work_struct comm_work;
1: -	struct work_struct slave_event_work;
1: -	struct work_struct slave_flr_event_work;
1: -	spinlock_t slave_state_lock;
1: -	__be32 comm_arm_bit_vector[4];
1: -	struct mlx4_eqe cmd_eqe;
1: -	struct mlx4_slave_event_eq slave_eq;
1: -	struct mutex gen_eqe_mutex[128];
1: -	struct mlx4_qos_manager qos_ctl[3];
1: +  struct mlx4_slave_state *slave_state;
1: +  struct mlx4_vf_admin_state *vf_admin;
1: +  struct mlx4_vf_oper_state *vf_oper;
1: +  struct mlx4_master_qp0_state qp0_state[3];
1: +  int init_port_ref[3];
1: +  u16 max_mtu[3];
1: +  u16 max_user_mtu[3];
1: +  u8 pptx;
1: +  u8 pprx;
1: +  int disable_mcast_ref[3];
1: +  struct mlx4_resource_tracker res_tracker;
1: +  struct workqueue_struct *comm_wq;
1: +  struct work_struct comm_work;
1: +  struct work_struct slave_event_work;
1: +  struct work_struct slave_flr_event_work;
1: +  spinlock_t slave_state_lock;
1: +  __be32 comm_arm_bit_vector[4];
1: +  struct mlx4_eqe cmd_eqe;
1: +  struct mlx4_slave_event_eq slave_eq;
1: +  struct mutex gen_eqe_mutex[128];
1: +  struct mlx4_qos_manager qos_ctl[3];
1:  };
1:  
1:  struct mlx4_mfunc {
1: -	struct mlx4_comm *comm;
1: -	struct mlx4_vhcr_cmd *vhcr;
1: -	dma_addr_t vhcr_dma;
1: -	struct mlx4_mfunc_master_ctx master;
1: +  struct mlx4_comm *comm;
1: +  struct mlx4_vhcr_cmd *vhcr;
1: +  dma_addr_t vhcr_dma;
1: +  struct mlx4_mfunc_master_ctx master;
1:  };
1:  
1:  struct mlx4_cmd_context;
1:  
1:  struct mlx4_cmd {
1: -	struct dma_pool___2 *pool;
1: -	void *hcr;
1: -	struct mutex slave_cmd_mutex;
1: -	struct semaphore poll_sem;
1: -	struct semaphore event_sem;
1: -	struct rw_semaphore switch_sem;
1: -	int max_cmds;
1: -	spinlock_t context_lock;
1: -	int free_head;
1: -	struct mlx4_cmd_context *context;
1: -	u16 token_mask;
1: -	u8 use_events;
1: -	u8 toggle;
1: -	u8 comm_toggle;
1: -	u8 initialized;
1: +  struct dma_pool___2 *pool;
1: +  void *hcr;
1: +  struct mutex slave_cmd_mutex;
1: +  struct semaphore poll_sem;
1: +  struct semaphore event_sem;
1: +  struct rw_semaphore switch_sem;
1: +  int max_cmds;
1: +  spinlock_t context_lock;
1: +  int free_head;
1: +  struct mlx4_cmd_context *context;
1: +  u16 token_mask;
1: +  u8 use_events;
1: +  u8 toggle;
1: +  u8 comm_toggle;
1: +  u8 initialized;
1:  };
1:  
1:  struct mlx4_uar_table {
1: -	struct mlx4_bitmap bitmap;
1: +  struct mlx4_bitmap bitmap;
1:  };
1:  
1:  struct mlx4_mr_table {
1: -	struct mlx4_bitmap mpt_bitmap;
1: -	struct mlx4_buddy mtt_buddy;
1: -	u64 mtt_base;
1: -	u64 mpt_base;
1: -	struct mlx4_icm_table mtt_table;
1: -	struct mlx4_icm_table dmpt_table;
1: +  struct mlx4_bitmap mpt_bitmap;
1: +  struct mlx4_buddy mtt_buddy;
1: +  u64 mtt_base;
1: +  u64 mpt_base;
1: +  struct mlx4_icm_table mtt_table;
1: +  struct mlx4_icm_table dmpt_table;
1:  };
1:  
1:  struct mlx4_cq_table {
1: -	struct mlx4_bitmap bitmap;
1: -	spinlock_t lock;
1: -	struct xarray tree;
1: -	struct mlx4_icm_table table;
1: -	struct mlx4_icm_table cmpt_table;
1: +  struct mlx4_bitmap bitmap;
1: +  spinlock_t lock;
1: +  struct xarray tree;
1: +  struct mlx4_icm_table table;
1: +  struct mlx4_icm_table cmpt_table;
1:  };
1:  
1:  struct mlx4_eq_table {
1: -	struct mlx4_bitmap bitmap;
1: -	char *irq_names;
1: -	void *clr_int;
1: -	void **uar_map;
1: -	u32 clr_mask;
1: -	struct mlx4_eq *eq;
1: -	struct mlx4_icm_table table;
1: -	struct mlx4_icm_table cmpt_table;
1: -	int have_irq;
1: -	u8 inta_pin;
1: +  struct mlx4_bitmap bitmap;
1: +  char *irq_names;
1: +  void *clr_int;
1: +  void **uar_map;
1: +  u32 clr_mask;
1: +  struct mlx4_eq *eq;
1: +  struct mlx4_icm_table table;
1: +  struct mlx4_icm_table cmpt_table;
1: +  int have_irq;
1: +  u8 inta_pin;
1:  };
1:  
1:  struct mlx4_srq_table {
1: -	struct mlx4_bitmap bitmap;
1: -	spinlock_t lock;
1: -	struct xarray tree;
1: -	struct mlx4_icm_table table;
1: -	struct mlx4_icm_table cmpt_table;
1: +  struct mlx4_bitmap bitmap;
1: +  spinlock_t lock;
1: +  struct xarray tree;
1: +  struct mlx4_icm_table table;
1: +  struct mlx4_icm_table cmpt_table;
1:  };
1:  
1:  struct mlx4_zone_allocator;
1:  
1:  struct mlx4_qp_table {
1: -	struct mlx4_bitmap *bitmap_gen;
1: -	struct mlx4_zone_allocator *zones;
1: -	u32 zones_uids[3];
1: -	u32 rdmarc_base;
1: -	int rdmarc_shift;
1: -	spinlock_t lock;
1: -	struct mlx4_icm_table qp_table;
1: -	struct mlx4_icm_table auxc_table;
1: -	struct mlx4_icm_table altc_table;
1: -	struct mlx4_icm_table rdmarc_table;
1: -	struct mlx4_icm_table cmpt_table;
1: +  struct mlx4_bitmap *bitmap_gen;
1: +  struct mlx4_zone_allocator *zones;
1: +  u32 zones_uids[3];
1: +  u32 rdmarc_base;
1: +  int rdmarc_shift;
1: +  spinlock_t lock;
1: +  struct mlx4_icm_table qp_table;
1: +  struct mlx4_icm_table auxc_table;
1: +  struct mlx4_icm_table altc_table;
1: +  struct mlx4_icm_table rdmarc_table;
1: +  struct mlx4_icm_table cmpt_table;
1:  };
1:  
1:  struct mlx4_mcg_table {
1: -	struct mutex mutex;
1: -	struct mlx4_bitmap bitmap;
1: -	struct mlx4_icm_table table;
1: +  struct mutex mutex;
1: +  struct mlx4_bitmap bitmap;
1: +  struct mlx4_icm_table table;
1:  };
1:  
1:  struct mlx4_catas_err {
1: -	u32 *map;
1: -	struct timer_list timer;
1: -	struct list_head list;
1: +  u32 *map;
1: +  struct timer_list timer;
1: +  struct list_head list;
1:  };
1:  
1:  struct mlx4_mac_table {
1: -	__be64 entries[128];
1: -	int refs[128];
1: -	bool is_dup[128];
1: -	struct mutex mutex;
1: -	int total;
1: -	int max;
1: +  __be64 entries[128];
1: +  int refs[128];
1: +  bool is_dup[128];
1: +  struct mutex mutex;
1: +  int total;
1: +  int max;
1:  };
1:  
1:  struct mlx4_vlan_table {
1: -	__be32 entries[128];
1: -	int refs[128];
1: -	int is_dup[128];
1: -	struct mutex mutex;
1: -	int total;
1: -	int max;
1: +  __be32 entries[128];
1: +  int refs[128];
1: +  int is_dup[128];
1: +  struct mutex mutex;
1: +  int total;
1: +  int max;
1:  };
1:  
1:  struct mlx4_roce_gid_entry {
1: -	u8 raw[16];
1: +  u8 raw[16];
1:  };
1:  
1:  struct mlx4_roce_gid_table {
1: -	struct mlx4_roce_gid_entry roce_gids[128];
1: -	struct mutex mutex;
1: +  struct mlx4_roce_gid_entry roce_gids[128];
1: +  struct mutex mutex;
1:  };
1:  
1:  struct mlx4_port_info {
1: -	struct mlx4_dev *dev;
1: -	int port;
1: -	char dev_name[16];
1: -	struct device_attribute port_attr;
1: -	enum mlx4_port_type tmp_type;
1: -	char dev_mtu_name[16];
1: -	struct device_attribute port_mtu_attr;
1: -	struct mlx4_mac_table mac_table;
1: -	struct mlx4_vlan_table vlan_table;
1: -	struct mlx4_roce_gid_table gid_table;
1: -	int base_qpn;
1: -	struct cpu_rmap *rmap;
1: -	struct devlink_port devlink_port;
1: +  struct mlx4_dev *dev;
1: +  int port;
1: +  char dev_name[16];
1: +  struct device_attribute port_attr;
1: +  enum mlx4_port_type tmp_type;
1: +  char dev_mtu_name[16];
1: +  struct device_attribute port_mtu_attr;
1: +  struct mlx4_mac_table mac_table;
1: +  struct mlx4_vlan_table vlan_table;
1: +  struct mlx4_roce_gid_table gid_table;
1: +  int base_qpn;
1: +  struct cpu_rmap *rmap;
1: +  struct devlink_port devlink_port;
1:  };
1:  
1:  struct mlx4_sense {
1: -	struct mlx4_dev *dev;
1: -	u8 do_sense_port[3];
1: -	u8 sense_allowed[3];
1: -	struct delayed_work sense_poll;
1: +  struct mlx4_dev *dev;
1: +  u8 do_sense_port[3];
1: +  u8 sense_allowed[3];
1: +  struct delayed_work sense_poll;
1:  };
1:  
1:  struct mlx4_msix_ctl {
1: -	long unsigned int pool_bm[2];
1: -	struct mutex pool_lock;
1: +  long unsigned int pool_bm[2];
1: +  struct mutex pool_lock;
1:  };
1:  
1:  struct mlx4_steer;
1: @@ -97914,1986 +99068,1991 @@ struct mlx4_steer;
1:  struct io_mapping;
1:  
1:  struct mlx4_priv {
1: -	struct mlx4_dev dev;
1: -	struct list_head dev_list;
1: -	struct list_head ctx_list;
1: -	spinlock_t ctx_lock;
1: -	int pci_dev_data;
1: -	int removed;
1: -	struct list_head pgdir_list;
1: -	struct mutex pgdir_mutex;
1: -	struct mlx4_fw fw;
1: -	struct mlx4_cmd cmd;
1: -	struct mlx4_mfunc mfunc;
1: -	struct mlx4_bitmap pd_bitmap;
1: -	struct mlx4_bitmap xrcd_bitmap;
1: -	struct mlx4_uar_table uar_table;
1: -	struct mlx4_mr_table mr_table;
1: -	struct mlx4_cq_table cq_table;
1: -	struct mlx4_eq_table eq_table;
1: -	struct mlx4_srq_table srq_table;
1: -	struct mlx4_qp_table qp_table;
1: -	struct mlx4_mcg_table mcg_table;
1: -	struct mlx4_bitmap counters_bitmap;
1: -	int def_counter[2];
1: -	struct mlx4_catas_err catas_err;
1: -	void *clr_base;
1: -	struct mlx4_uar driver_uar;
1: -	void *kar;
1: -	struct mlx4_port_info port[3];
1: -	struct mlx4_sense sense;
1: -	struct mutex port_mutex;
1: -	struct mlx4_msix_ctl msix_ctl;
1: -	struct mlx4_steer *steer;
1: -	struct list_head bf_list;
1: -	struct mutex bf_mutex;
1: -	struct io_mapping *bf_mapping;
1: -	void *clock_mapping;
1: -	int reserved_mtts;
1: -	int fs_hash_mode;
1: -	u8 virt2phys_pkey[32768];
1: -	struct mlx4_port_map v2p;
1: -	struct mutex bond_mutex;
1: -	__be64 slave_node_guids[128];
1: -	atomic_t opreq_count;
1: -	struct work_struct opreq_task;
1: +  struct mlx4_dev dev;
1: +  struct list_head dev_list;
1: +  struct list_head ctx_list;
1: +  spinlock_t ctx_lock;
1: +  int pci_dev_data;
1: +  int removed;
1: +  struct list_head pgdir_list;
1: +  struct mutex pgdir_mutex;
1: +  struct mlx4_fw fw;
1: +  struct mlx4_cmd cmd;
1: +  struct mlx4_mfunc mfunc;
1: +  struct mlx4_bitmap pd_bitmap;
1: +  struct mlx4_bitmap xrcd_bitmap;
1: +  struct mlx4_uar_table uar_table;
1: +  struct mlx4_mr_table mr_table;
1: +  struct mlx4_cq_table cq_table;
1: +  struct mlx4_eq_table eq_table;
1: +  struct mlx4_srq_table srq_table;
1: +  struct mlx4_qp_table qp_table;
1: +  struct mlx4_mcg_table mcg_table;
1: +  struct mlx4_bitmap counters_bitmap;
1: +  int def_counter[2];
1: +  struct mlx4_catas_err catas_err;
1: +  void *clr_base;
1: +  struct mlx4_uar driver_uar;
1: +  void *kar;
1: +  struct mlx4_port_info port[3];
1: +  struct mlx4_sense sense;
1: +  struct mutex port_mutex;
1: +  struct mlx4_msix_ctl msix_ctl;
1: +  struct mlx4_steer *steer;
1: +  struct list_head bf_list;
1: +  struct mutex bf_mutex;
1: +  struct io_mapping *bf_mapping;
1: +  void *clock_mapping;
1: +  int reserved_mtts;
1: +  int fs_hash_mode;
1: +  u8 virt2phys_pkey[32768];
1: +  struct mlx4_port_map v2p;
1: +  struct mutex bond_mutex;
1: +  __be64 slave_node_guids[128];
1: +  atomic_t opreq_count;
1: +  struct work_struct opreq_task;
1:  };
1:  
1:  enum mlx4_qp_table_zones {
1: -	MLX4_QP_TABLE_ZONE_GENERAL = 0,
1: -	MLX4_QP_TABLE_ZONE_RSS = 1,
1: -	MLX4_QP_TABLE_ZONE_RAW_ETH = 2,
1: -	MLX4_QP_TABLE_ZONE_NUM = 3,
1: +  MLX4_QP_TABLE_ZONE_GENERAL = 0,
1: +  MLX4_QP_TABLE_ZONE_RSS = 1,
1: +  MLX4_QP_TABLE_ZONE_RAW_ETH = 2,
1: +  MLX4_QP_TABLE_ZONE_NUM = 3,
1:  };
1:  
1:  enum mlx4_zone_alloc_flags {
1: -	MLX4_ZONE_ALLOC_FLAGS_NO_OVERLAP = 1,
1: +  MLX4_ZONE_ALLOC_FLAGS_NO_OVERLAP = 1,
1:  };
1:  
1:  struct mlx4_zone_allocator {
1: -	struct list_head entries;
1: -	struct list_head prios;
1: -	u32 last_uid;
1: -	u32 mask;
1: -	spinlock_t lock;
1: -	enum mlx4_zone_alloc_flags flags;
1: +  struct list_head entries;
1: +  struct list_head prios;
1: +  u32 last_uid;
1: +  u32 mask;
1: +  spinlock_t lock;
1: +  enum mlx4_zone_alloc_flags flags;
1:  };
1:  
1:  struct mlx4_steer {
1: -	struct list_head promisc_qps[2];
1: -	struct list_head steer_entries[2];
1: +  struct list_head promisc_qps[2];
1: +  struct list_head steer_entries[2];
1:  };
1:  
1:  enum {
1: -	MLX4_NO_RR = 0,
1: -	MLX4_USE_RR = 1,
1: +  MLX4_NO_RR = 0,
1: +  MLX4_USE_RR = 1,
1:  };
1:  
1:  enum mlx4_zone_flags {
1: -	MLX4_ZONE_ALLOW_ALLOC_FROM_LOWER_PRIO = 1,
1: -	MLX4_ZONE_ALLOW_ALLOC_FROM_EQ_PRIO = 2,
1: -	MLX4_ZONE_FALLBACK_TO_HIGHER_PRIO = 4,
1: -	MLX4_ZONE_USE_RR = 8,
1: +  MLX4_ZONE_ALLOW_ALLOC_FROM_LOWER_PRIO = 1,
1: +  MLX4_ZONE_ALLOW_ALLOC_FROM_EQ_PRIO = 2,
1: +  MLX4_ZONE_FALLBACK_TO_HIGHER_PRIO = 4,
1: +  MLX4_ZONE_USE_RR = 8,
1:  };
1:  
1:  struct mlx4_zone_entry {
1: -	struct list_head list;
1: -	struct list_head prio_list;
1: -	u32 uid;
1: -	struct mlx4_zone_allocator *allocator;
1: -	struct mlx4_bitmap *bitmap;
1: -	int use_rr;
1: -	int priority;
1: -	int offset;
1: -	enum mlx4_zone_flags flags;
1: +  struct list_head list;
1: +  struct list_head prio_list;
1: +  u32 uid;
1: +  struct mlx4_zone_allocator *allocator;
1: +  struct mlx4_bitmap *bitmap;
1: +  int use_rr;
1: +  int priority;
1: +  int offset;
1: +  enum mlx4_zone_flags flags;
1:  };
1:  
1:  enum {
1: -	MLX4_FLAG_MSI_X = 1,
1: -	MLX4_FLAG_OLD_PORT_CMDS = 2,
1: -	MLX4_FLAG_MASTER = 4,
1: -	MLX4_FLAG_SLAVE = 8,
1: -	MLX4_FLAG_SRIOV = 16,
1: -	MLX4_FLAG_OLD_REG_MAC = 64,
1: -	MLX4_FLAG_BONDED = 128,
1: -	MLX4_FLAG_SECURE_HOST = 256,
1: +  MLX4_FLAG_MSI_X = 1,
1: +  MLX4_FLAG_OLD_PORT_CMDS = 2,
1: +  MLX4_FLAG_MASTER = 4,
1: +  MLX4_FLAG_SLAVE = 8,
1: +  MLX4_FLAG_SRIOV = 16,
1: +  MLX4_FLAG_OLD_REG_MAC = 64,
1: +  MLX4_FLAG_BONDED = 128,
1: +  MLX4_FLAG_SECURE_HOST = 256,
1:  };
1:  
1:  enum {
1: -	MLX4_VF_CAP_FLAG_RESET = 1,
1: +  MLX4_VF_CAP_FLAG_RESET = 1,
1:  };
1:  
1:  enum {
1: -	MLX4_DEVICE_STATE_UP = 1,
1: -	MLX4_DEVICE_STATE_INTERNAL_ERROR = 2,
1: +  MLX4_DEVICE_STATE_UP = 1,
1: +  MLX4_DEVICE_STATE_INTERNAL_ERROR = 2,
1:  };
1:  
1:  enum {
1: -	MLX4_INTERFACE_STATE_UP = 1,
1: -	MLX4_INTERFACE_STATE_DELETION = 2,
1: -	MLX4_INTERFACE_STATE_NOWAIT = 4,
1: +  MLX4_INTERFACE_STATE_UP = 1,
1: +  MLX4_INTERFACE_STATE_DELETION = 2,
1: +  MLX4_INTERFACE_STATE_NOWAIT = 4,
1:  };
1:  
1:  enum mlx4_dev_event {
1: -	MLX4_DEV_EVENT_CATASTROPHIC_ERROR = 0,
1: -	MLX4_DEV_EVENT_PORT_UP = 1,
1: -	MLX4_DEV_EVENT_PORT_DOWN = 2,
1: -	MLX4_DEV_EVENT_PORT_REINIT = 3,
1: -	MLX4_DEV_EVENT_PORT_MGMT_CHANGE = 4,
1: -	MLX4_DEV_EVENT_SLAVE_INIT = 5,
1: -	MLX4_DEV_EVENT_SLAVE_SHUTDOWN = 6,
1: -};
1: -
1: -enum {
1: -	MLX4_HCR_BASE = 525952,
1: -	MLX4_HCR_SIZE = 28,
1: -	MLX4_CLR_INT_SIZE = 8,
1: -	MLX4_SLAVE_COMM_BASE = 0,
1: -	MLX4_COMM_PAGESIZE = 4096,
1: -	MLX4_CLOCK_SIZE = 8,
1: -	MLX4_COMM_CHAN_CAPS = 8,
1: -	MLX4_COMM_CHAN_FLAGS = 12,
1: -};
1: -
1: -enum {
1: -	MLX4_CATAS_POLL_INTERVAL = 5000,
1: -};
1: -
1: -enum {
1: -	IFLA_VF_LINK_STATE_AUTO = 0,
1: -	IFLA_VF_LINK_STATE_ENABLE = 1,
1: -	IFLA_VF_LINK_STATE_DISABLE = 2,
1: -	__IFLA_VF_LINK_STATE_MAX = 3,
1: -};
1: -
1: -enum {
1: -	MLX4_DEV_CAP_FLAG2_RSS = 1,
1: -	MLX4_DEV_CAP_FLAG2_RSS_TOP = 2,
1: -	MLX4_DEV_CAP_FLAG2_RSS_XOR = 4,
1: -	MLX4_DEV_CAP_FLAG2_FS_EN = 8,
1: -	MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN = 16,
1: -	MLX4_DEV_CAP_FLAG2_TS = 32,
1: -	MLX4_DEV_CAP_FLAG2_VLAN_CONTROL = 64,
1: -	MLX4_DEV_CAP_FLAG2_FSM = 128,
1: -	MLX4_DEV_CAP_FLAG2_UPDATE_QP = 256,
1: -	MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 512,
1: -	MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1024,
1: -	MLX4_DEV_CAP_FLAG2_MAD_DEMUX = 2048,
1: -	MLX4_DEV_CAP_FLAG2_CQE_STRIDE = 4096,
1: -	MLX4_DEV_CAP_FLAG2_EQE_STRIDE = 8192,
1: -	MLX4_DEV_CAP_FLAG2_ETH_PROT_CTRL = 16384,
1: -	MLX4_DEV_CAP_FLAG2_ETH_BACKPL_AN_REP = 32768,
1: -	MLX4_DEV_CAP_FLAG2_CONFIG_DEV = 65536,
1: -	MLX4_DEV_CAP_FLAG2_SYS_EQS = 131072,
1: -	MLX4_DEV_CAP_FLAG2_80_VFS = 262144,
1: -	MLX4_DEV_CAP_FLAG2_FS_A0 = 524288,
1: -	MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT = 1048576,
1: -	MLX4_DEV_CAP_FLAG2_PORT_REMAP = 2097152,
1: -	MLX4_DEV_CAP_FLAG2_QCN = 4194304,
1: -	MLX4_DEV_CAP_FLAG2_QP_RATE_LIMIT = 8388608,
1: -	MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN = 16777216,
1: -	MLX4_DEV_CAP_FLAG2_QOS_VPP = 33554432,
1: -	MLX4_DEV_CAP_FLAG2_ETS_CFG = 67108864,
1: -	MLX4_DEV_CAP_FLAG2_PORT_BEACON = 134217728,
1: -	MLX4_DEV_CAP_FLAG2_IGNORE_FCS = 268435456,
1: -	MLX4_DEV_CAP_FLAG2_PHV_EN = 536870912,
1: -	MLX4_DEV_CAP_FLAG2_SKIP_OUTER_VLAN = 1073741824,
1: -	MLX4_DEV_CAP_FLAG2_UPDATE_QP_SRC_CHECK_LB = 2147483648,
1: -	MLX4_DEV_CAP_FLAG2_LB_SRC_CHK = 0,
1: -	MLX4_DEV_CAP_FLAG2_ROCE_V1_V2 = 0,
1: -	MLX4_DEV_CAP_FLAG2_DMFS_UC_MC_SNIFFER = 0,
1: -	MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT = 0,
1: -	MLX4_DEV_CAP_FLAG2_SVLAN_BY_QP = 0,
1: -	MLX4_DEV_CAP_FLAG2_SL_TO_VL_CHANGE_EVENT = 0,
1: -	MLX4_DEV_CAP_FLAG2_USER_MAC_EN = 0,
1: -	MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW = 0,
1: -	MLX4_DEV_CAP_FLAG2_SW_CQ_INIT = 0,
1: +  MLX4_DEV_EVENT_CATASTROPHIC_ERROR = 0,
1: +  MLX4_DEV_EVENT_PORT_UP = 1,
1: +  MLX4_DEV_EVENT_PORT_DOWN = 2,
1: +  MLX4_DEV_EVENT_PORT_REINIT = 3,
1: +  MLX4_DEV_EVENT_PORT_MGMT_CHANGE = 4,
1: +  MLX4_DEV_EVENT_SLAVE_INIT = 5,
1: +  MLX4_DEV_EVENT_SLAVE_SHUTDOWN = 6,
1: +};
1: +
1: +enum {
1: +  MLX4_HCR_BASE = 525952,
1: +  MLX4_HCR_SIZE = 28,
1: +  MLX4_CLR_INT_SIZE = 8,
1: +  MLX4_SLAVE_COMM_BASE = 0,
1: +  MLX4_COMM_PAGESIZE = 4096,
1: +  MLX4_CLOCK_SIZE = 8,
1: +  MLX4_COMM_CHAN_CAPS = 8,
1: +  MLX4_COMM_CHAN_FLAGS = 12,
1: +};
1: +
1: +enum {
1: +  MLX4_CATAS_POLL_INTERVAL = 5000,
1: +};
1: +
1: +enum {
1: +  IFLA_VF_LINK_STATE_AUTO = 0,
1: +  IFLA_VF_LINK_STATE_ENABLE = 1,
1: +  IFLA_VF_LINK_STATE_DISABLE = 2,
1: +  __IFLA_VF_LINK_STATE_MAX = 3,
1: +};
1: +
1: +enum {
1: +  MLX4_DEV_CAP_FLAG2_RSS = 1,
1: +  MLX4_DEV_CAP_FLAG2_RSS_TOP = 2,
1: +  MLX4_DEV_CAP_FLAG2_RSS_XOR = 4,
1: +  MLX4_DEV_CAP_FLAG2_FS_EN = 8,
1: +  MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN = 16,
1: +  MLX4_DEV_CAP_FLAG2_TS = 32,
1: +  MLX4_DEV_CAP_FLAG2_VLAN_CONTROL = 64,
1: +  MLX4_DEV_CAP_FLAG2_FSM = 128,
1: +  MLX4_DEV_CAP_FLAG2_UPDATE_QP = 256,
1: +  MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 512,
1: +  MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1024,
1: +  MLX4_DEV_CAP_FLAG2_MAD_DEMUX = 2048,
1: +  MLX4_DEV_CAP_FLAG2_CQE_STRIDE = 4096,
1: +  MLX4_DEV_CAP_FLAG2_EQE_STRIDE = 8192,
1: +  MLX4_DEV_CAP_FLAG2_ETH_PROT_CTRL = 16384,
1: +  MLX4_DEV_CAP_FLAG2_ETH_BACKPL_AN_REP = 32768,
1: +  MLX4_DEV_CAP_FLAG2_CONFIG_DEV = 65536,
1: +  MLX4_DEV_CAP_FLAG2_SYS_EQS = 131072,
1: +  MLX4_DEV_CAP_FLAG2_80_VFS = 262144,
1: +  MLX4_DEV_CAP_FLAG2_FS_A0 = 524288,
1: +  MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT = 1048576,
1: +  MLX4_DEV_CAP_FLAG2_PORT_REMAP = 2097152,
1: +  MLX4_DEV_CAP_FLAG2_QCN = 4194304,
1: +  MLX4_DEV_CAP_FLAG2_QP_RATE_LIMIT = 8388608,
1: +  MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN = 16777216,
1: +  MLX4_DEV_CAP_FLAG2_QOS_VPP = 33554432,
1: +  MLX4_DEV_CAP_FLAG2_ETS_CFG = 67108864,
1: +  MLX4_DEV_CAP_FLAG2_PORT_BEACON = 134217728,
1: +  MLX4_DEV_CAP_FLAG2_IGNORE_FCS = 268435456,
1: +  MLX4_DEV_CAP_FLAG2_PHV_EN = 536870912,
1: +  MLX4_DEV_CAP_FLAG2_SKIP_OUTER_VLAN = 1073741824,
1: +  MLX4_DEV_CAP_FLAG2_UPDATE_QP_SRC_CHECK_LB = 2147483648,
1: +  MLX4_DEV_CAP_FLAG2_LB_SRC_CHK = 0,
1: +  MLX4_DEV_CAP_FLAG2_ROCE_V1_V2 = 0,
1: +  MLX4_DEV_CAP_FLAG2_DMFS_UC_MC_SNIFFER = 0,
1: +  MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT = 0,
1: +  MLX4_DEV_CAP_FLAG2_SVLAN_BY_QP = 0,
1: +  MLX4_DEV_CAP_FLAG2_SL_TO_VL_CHANGE_EVENT = 0,
1: +  MLX4_DEV_CAP_FLAG2_USER_MAC_EN = 0,
1: +  MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW = 0,
1: +  MLX4_DEV_CAP_FLAG2_SW_CQ_INIT = 0,
1:  };
1:  
1:  enum mlx4_event {
1: -	MLX4_EVENT_TYPE_COMP = 0,
1: -	MLX4_EVENT_TYPE_PATH_MIG = 1,
1: -	MLX4_EVENT_TYPE_COMM_EST = 2,
1: -	MLX4_EVENT_TYPE_SQ_DRAINED = 3,
1: -	MLX4_EVENT_TYPE_SRQ_QP_LAST_WQE = 19,
1: -	MLX4_EVENT_TYPE_SRQ_LIMIT = 20,
1: -	MLX4_EVENT_TYPE_CQ_ERROR = 4,
1: -	MLX4_EVENT_TYPE_WQ_CATAS_ERROR = 5,
1: -	MLX4_EVENT_TYPE_EEC_CATAS_ERROR = 6,
1: -	MLX4_EVENT_TYPE_PATH_MIG_FAILED = 7,
1: -	MLX4_EVENT_TYPE_WQ_INVAL_REQ_ERROR = 16,
1: -	MLX4_EVENT_TYPE_WQ_ACCESS_ERROR = 17,
1: -	MLX4_EVENT_TYPE_SRQ_CATAS_ERROR = 18,
1: -	MLX4_EVENT_TYPE_LOCAL_CATAS_ERROR = 8,
1: -	MLX4_EVENT_TYPE_PORT_CHANGE = 9,
1: -	MLX4_EVENT_TYPE_EQ_OVERFLOW = 15,
1: -	MLX4_EVENT_TYPE_ECC_DETECT = 14,
1: -	MLX4_EVENT_TYPE_CMD = 10,
1: -	MLX4_EVENT_TYPE_VEP_UPDATE = 25,
1: -	MLX4_EVENT_TYPE_COMM_CHANNEL = 24,
1: -	MLX4_EVENT_TYPE_OP_REQUIRED = 26,
1: -	MLX4_EVENT_TYPE_FATAL_WARNING = 27,
1: -	MLX4_EVENT_TYPE_FLR_EVENT = 28,
1: -	MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT = 29,
1: -	MLX4_EVENT_TYPE_RECOVERABLE_ERROR_EVENT = 62,
1: -	MLX4_EVENT_TYPE_NONE = 255,
1: -};
1: -
1: -enum {
1: -	MLX4_PORT_CHANGE_SUBTYPE_DOWN = 1,
1: -	MLX4_PORT_CHANGE_SUBTYPE_ACTIVE = 4,
1: +  MLX4_EVENT_TYPE_COMP = 0,
1: +  MLX4_EVENT_TYPE_PATH_MIG = 1,
1: +  MLX4_EVENT_TYPE_COMM_EST = 2,
1: +  MLX4_EVENT_TYPE_SQ_DRAINED = 3,
1: +  MLX4_EVENT_TYPE_SRQ_QP_LAST_WQE = 19,
1: +  MLX4_EVENT_TYPE_SRQ_LIMIT = 20,
1: +  MLX4_EVENT_TYPE_CQ_ERROR = 4,
1: +  MLX4_EVENT_TYPE_WQ_CATAS_ERROR = 5,
1: +  MLX4_EVENT_TYPE_EEC_CATAS_ERROR = 6,
1: +  MLX4_EVENT_TYPE_PATH_MIG_FAILED = 7,
1: +  MLX4_EVENT_TYPE_WQ_INVAL_REQ_ERROR = 16,
1: +  MLX4_EVENT_TYPE_WQ_ACCESS_ERROR = 17,
1: +  MLX4_EVENT_TYPE_SRQ_CATAS_ERROR = 18,
1: +  MLX4_EVENT_TYPE_LOCAL_CATAS_ERROR = 8,
1: +  MLX4_EVENT_TYPE_PORT_CHANGE = 9,
1: +  MLX4_EVENT_TYPE_EQ_OVERFLOW = 15,
1: +  MLX4_EVENT_TYPE_ECC_DETECT = 14,
1: +  MLX4_EVENT_TYPE_CMD = 10,
1: +  MLX4_EVENT_TYPE_VEP_UPDATE = 25,
1: +  MLX4_EVENT_TYPE_COMM_CHANNEL = 24,
1: +  MLX4_EVENT_TYPE_OP_REQUIRED = 26,
1: +  MLX4_EVENT_TYPE_FATAL_WARNING = 27,
1: +  MLX4_EVENT_TYPE_FLR_EVENT = 28,
1: +  MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT = 29,
1: +  MLX4_EVENT_TYPE_RECOVERABLE_ERROR_EVENT = 62,
1: +  MLX4_EVENT_TYPE_NONE = 255,
1: +};
1: +
1: +enum {
1: +  MLX4_PORT_CHANGE_SUBTYPE_DOWN = 1,
1: +  MLX4_PORT_CHANGE_SUBTYPE_ACTIVE = 4,
1:  };
1:  
1:  struct mlx4_counter {
1: -	u8 reserved1[3];
1: -	u8 counter_mode;
1: -	__be32 num_ifc;
1: -	u32 reserved2[2];
1: -	__be64 rx_frames;
1: -	__be64 rx_bytes;
1: -	__be64 tx_frames;
1: -	__be64 tx_bytes;
1: +  u8 reserved1[3];
1: +  u8 counter_mode;
1: +  __be32 num_ifc;
1: +  u32 reserved2[2];
1: +  __be64 rx_frames;
1: +  __be64 rx_bytes;
1: +  __be64 tx_frames;
1: +  __be64 tx_bytes;
1:  };
1:  
1:  struct mlx4_slaves_pport {
1: -	long unsigned int slaves[2];
1: -};
1: -
1: -enum {
1: -	MLX4_CMD_SYS_EN = 1,
1: -	MLX4_CMD_SYS_DIS = 2,
1: -	MLX4_CMD_MAP_FA = 4095,
1: -	MLX4_CMD_UNMAP_FA = 4094,
1: -	MLX4_CMD_RUN_FW = 4086,
1: -	MLX4_CMD_MOD_STAT_CFG = 52,
1: -	MLX4_CMD_QUERY_DEV_CAP = 3,
1: -	MLX4_CMD_QUERY_FW = 4,
1: -	MLX4_CMD_ENABLE_LAM = 4088,
1: -	MLX4_CMD_DISABLE_LAM = 4087,
1: -	MLX4_CMD_QUERY_DDR = 5,
1: -	MLX4_CMD_QUERY_ADAPTER = 6,
1: -	MLX4_CMD_INIT_HCA = 7,
1: -	MLX4_CMD_CLOSE_HCA = 8,
1: -	MLX4_CMD_INIT_PORT = 9,
1: -	MLX4_CMD_CLOSE_PORT = 10,
1: -	MLX4_CMD_QUERY_HCA = 11,
1: -	MLX4_CMD_QUERY_PORT = 67,
1: -	MLX4_CMD_SENSE_PORT = 77,
1: -	MLX4_CMD_HW_HEALTH_CHECK = 80,
1: -	MLX4_CMD_SET_PORT = 12,
1: -	MLX4_CMD_SET_NODE = 90,
1: -	MLX4_CMD_QUERY_FUNC = 86,
1: -	MLX4_CMD_ACCESS_DDR = 46,
1: -	MLX4_CMD_MAP_ICM = 4090,
1: -	MLX4_CMD_UNMAP_ICM = 4089,
1: -	MLX4_CMD_MAP_ICM_AUX = 4092,
1: -	MLX4_CMD_UNMAP_ICM_AUX = 4091,
1: -	MLX4_CMD_SET_ICM_SIZE = 4093,
1: -	MLX4_CMD_ACCESS_REG = 59,
1: -	MLX4_CMD_ALLOCATE_VPP = 128,
1: -	MLX4_CMD_SET_VPORT_QOS = 129,
1: -	MLX4_CMD_INFORM_FLR_DONE = 91,
1: -	MLX4_CMD_VIRT_PORT_MAP = 92,
1: -	MLX4_CMD_GET_OP_REQ = 89,
1: -	MLX4_CMD_SW2HW_MPT = 13,
1: -	MLX4_CMD_QUERY_MPT = 14,
1: -	MLX4_CMD_HW2SW_MPT = 15,
1: -	MLX4_CMD_READ_MTT = 16,
1: -	MLX4_CMD_WRITE_MTT = 17,
1: -	MLX4_CMD_SYNC_TPT = 47,
1: -	MLX4_CMD_MAP_EQ = 18,
1: -	MLX4_CMD_SW2HW_EQ = 19,
1: -	MLX4_CMD_HW2SW_EQ = 20,
1: -	MLX4_CMD_QUERY_EQ = 21,
1: -	MLX4_CMD_SW2HW_CQ = 22,
1: -	MLX4_CMD_HW2SW_CQ = 23,
1: -	MLX4_CMD_QUERY_CQ = 24,
1: -	MLX4_CMD_MODIFY_CQ = 44,
1: -	MLX4_CMD_SW2HW_SRQ = 53,
1: -	MLX4_CMD_HW2SW_SRQ = 54,
1: -	MLX4_CMD_QUERY_SRQ = 55,
1: -	MLX4_CMD_ARM_SRQ = 64,
1: -	MLX4_CMD_RST2INIT_QP = 25,
1: -	MLX4_CMD_INIT2RTR_QP = 26,
1: -	MLX4_CMD_RTR2RTS_QP = 27,
1: -	MLX4_CMD_RTS2RTS_QP = 28,
1: -	MLX4_CMD_SQERR2RTS_QP = 29,
1: -	MLX4_CMD_2ERR_QP = 30,
1: -	MLX4_CMD_RTS2SQD_QP = 31,
1: -	MLX4_CMD_SQD2SQD_QP = 56,
1: -	MLX4_CMD_SQD2RTS_QP = 32,
1: -	MLX4_CMD_2RST_QP = 33,
1: -	MLX4_CMD_QUERY_QP = 34,
1: -	MLX4_CMD_INIT2INIT_QP = 45,
1: -	MLX4_CMD_SUSPEND_QP = 50,
1: -	MLX4_CMD_UNSUSPEND_QP = 51,
1: -	MLX4_CMD_UPDATE_QP = 97,
1: -	MLX4_CMD_CONF_SPECIAL_QP = 35,
1: -	MLX4_CMD_MAD_IFC = 36,
1: -	MLX4_CMD_MAD_DEMUX = 515,
1: -	MLX4_CMD_READ_MCG = 37,
1: -	MLX4_CMD_WRITE_MCG = 38,
1: -	MLX4_CMD_MGID_HASH = 39,
1: -	MLX4_CMD_DIAG_RPRT = 48,
1: -	MLX4_CMD_NOP = 49,
1: -	MLX4_CMD_CONFIG_DEV = 58,
1: -	MLX4_CMD_ACCESS_MEM = 46,
1: -	MLX4_CMD_SET_VEP = 82,
1: -	MLX4_CMD_SET_VLAN_FLTR = 71,
1: -	MLX4_CMD_SET_MCAST_FLTR = 72,
1: -	MLX4_CMD_DUMP_ETH_STATS = 73,
1: -	MLX4_CMD_ARM_COMM_CHANNEL = 87,
1: -	MLX4_CMD_GEN_EQE = 88,
1: -	MLX4_CMD_ALLOC_RES = 3840,
1: -	MLX4_CMD_FREE_RES = 3841,
1: -	MLX4_CMD_MCAST_ATTACH = 3845,
1: -	MLX4_CMD_UCAST_ATTACH = 3846,
1: -	MLX4_CMD_PROMISC = 3848,
1: -	MLX4_CMD_QUERY_FUNC_CAP = 3850,
1: -	MLX4_CMD_QP_ATTACH = 3851,
1: -	MLX4_CMD_QUERY_DEBUG_MSG = 42,
1: -	MLX4_CMD_SET_DEBUG_MSG = 43,
1: -	MLX4_CMD_QUERY_IF_STAT = 84,
1: -	MLX4_CMD_SET_IF_STAT = 85,
1: -	MLX4_QP_FLOW_STEERING_ATTACH = 101,
1: -	MLX4_QP_FLOW_STEERING_DETACH = 102,
1: -	MLX4_FLOW_STEERING_IB_UC_QP_RANGE = 100,
1: -	MLX4_CMD_CONGESTION_CTRL_OPCODE = 104,
1: -};
1: -
1: -enum {
1: -	MLX4_CMD_TIME_CLASS_A = 60000,
1: -	MLX4_CMD_TIME_CLASS_B = 60000,
1: -	MLX4_CMD_TIME_CLASS_C = 60000,
1: -};
1: -
1: -enum {
1: -	MLX4_MAILBOX_SIZE = 4096,
1: -	MLX4_ACCESS_MEM_ALIGN = 256,
1: -};
1: -
1: -enum {
1: -	MLX4_SET_PORT_IB_OPCODE = 0,
1: -	MLX4_SET_PORT_ETH_OPCODE = 1,
1: -	MLX4_SET_PORT_BEACON_OPCODE = 4,
1: -};
1: -
1: -enum {
1: -	MLX4_CMD_WRAPPED = 0,
1: -	MLX4_CMD_NATIVE = 1,
1: +  long unsigned int slaves[2];
1: +};
1: +
1: +enum {
1: +  MLX4_CMD_SYS_EN = 1,
1: +  MLX4_CMD_SYS_DIS = 2,
1: +  MLX4_CMD_MAP_FA = 4095,
1: +  MLX4_CMD_UNMAP_FA = 4094,
1: +  MLX4_CMD_RUN_FW = 4086,
1: +  MLX4_CMD_MOD_STAT_CFG = 52,
1: +  MLX4_CMD_QUERY_DEV_CAP = 3,
1: +  MLX4_CMD_QUERY_FW = 4,
1: +  MLX4_CMD_ENABLE_LAM = 4088,
1: +  MLX4_CMD_DISABLE_LAM = 4087,
1: +  MLX4_CMD_QUERY_DDR = 5,
1: +  MLX4_CMD_QUERY_ADAPTER = 6,
1: +  MLX4_CMD_INIT_HCA = 7,
1: +  MLX4_CMD_CLOSE_HCA = 8,
1: +  MLX4_CMD_INIT_PORT = 9,
1: +  MLX4_CMD_CLOSE_PORT = 10,
1: +  MLX4_CMD_QUERY_HCA = 11,
1: +  MLX4_CMD_QUERY_PORT = 67,
1: +  MLX4_CMD_SENSE_PORT = 77,
1: +  MLX4_CMD_HW_HEALTH_CHECK = 80,
1: +  MLX4_CMD_SET_PORT = 12,
1: +  MLX4_CMD_SET_NODE = 90,
1: +  MLX4_CMD_QUERY_FUNC = 86,
1: +  MLX4_CMD_ACCESS_DDR = 46,
1: +  MLX4_CMD_MAP_ICM = 4090,
1: +  MLX4_CMD_UNMAP_ICM = 4089,
1: +  MLX4_CMD_MAP_ICM_AUX = 4092,
1: +  MLX4_CMD_UNMAP_ICM_AUX = 4091,
1: +  MLX4_CMD_SET_ICM_SIZE = 4093,
1: +  MLX4_CMD_ACCESS_REG = 59,
1: +  MLX4_CMD_ALLOCATE_VPP = 128,
1: +  MLX4_CMD_SET_VPORT_QOS = 129,
1: +  MLX4_CMD_INFORM_FLR_DONE = 91,
1: +  MLX4_CMD_VIRT_PORT_MAP = 92,
1: +  MLX4_CMD_GET_OP_REQ = 89,
1: +  MLX4_CMD_SW2HW_MPT = 13,
1: +  MLX4_CMD_QUERY_MPT = 14,
1: +  MLX4_CMD_HW2SW_MPT = 15,
1: +  MLX4_CMD_READ_MTT = 16,
1: +  MLX4_CMD_WRITE_MTT = 17,
1: +  MLX4_CMD_SYNC_TPT = 47,
1: +  MLX4_CMD_MAP_EQ = 18,
1: +  MLX4_CMD_SW2HW_EQ = 19,
1: +  MLX4_CMD_HW2SW_EQ = 20,
1: +  MLX4_CMD_QUERY_EQ = 21,
1: +  MLX4_CMD_SW2HW_CQ = 22,
1: +  MLX4_CMD_HW2SW_CQ = 23,
1: +  MLX4_CMD_QUERY_CQ = 24,
1: +  MLX4_CMD_MODIFY_CQ = 44,
1: +  MLX4_CMD_SW2HW_SRQ = 53,
1: +  MLX4_CMD_HW2SW_SRQ = 54,
1: +  MLX4_CMD_QUERY_SRQ = 55,
1: +  MLX4_CMD_ARM_SRQ = 64,
1: +  MLX4_CMD_RST2INIT_QP = 25,
1: +  MLX4_CMD_INIT2RTR_QP = 26,
1: +  MLX4_CMD_RTR2RTS_QP = 27,
1: +  MLX4_CMD_RTS2RTS_QP = 28,
1: +  MLX4_CMD_SQERR2RTS_QP = 29,
1: +  MLX4_CMD_2ERR_QP = 30,
1: +  MLX4_CMD_RTS2SQD_QP = 31,
1: +  MLX4_CMD_SQD2SQD_QP = 56,
1: +  MLX4_CMD_SQD2RTS_QP = 32,
1: +  MLX4_CMD_2RST_QP = 33,
1: +  MLX4_CMD_QUERY_QP = 34,
1: +  MLX4_CMD_INIT2INIT_QP = 45,
1: +  MLX4_CMD_SUSPEND_QP = 50,
1: +  MLX4_CMD_UNSUSPEND_QP = 51,
1: +  MLX4_CMD_UPDATE_QP = 97,
1: +  MLX4_CMD_CONF_SPECIAL_QP = 35,
1: +  MLX4_CMD_MAD_IFC = 36,
1: +  MLX4_CMD_MAD_DEMUX = 515,
1: +  MLX4_CMD_READ_MCG = 37,
1: +  MLX4_CMD_WRITE_MCG = 38,
1: +  MLX4_CMD_MGID_HASH = 39,
1: +  MLX4_CMD_DIAG_RPRT = 48,
1: +  MLX4_CMD_NOP = 49,
1: +  MLX4_CMD_CONFIG_DEV = 58,
1: +  MLX4_CMD_ACCESS_MEM = 46,
1: +  MLX4_CMD_SET_VEP = 82,
1: +  MLX4_CMD_SET_VLAN_FLTR = 71,
1: +  MLX4_CMD_SET_MCAST_FLTR = 72,
1: +  MLX4_CMD_DUMP_ETH_STATS = 73,
1: +  MLX4_CMD_ARM_COMM_CHANNEL = 87,
1: +  MLX4_CMD_GEN_EQE = 88,
1: +  MLX4_CMD_ALLOC_RES = 3840,
1: +  MLX4_CMD_FREE_RES = 3841,
1: +  MLX4_CMD_MCAST_ATTACH = 3845,
1: +  MLX4_CMD_UCAST_ATTACH = 3846,
1: +  MLX4_CMD_PROMISC = 3848,
1: +  MLX4_CMD_QUERY_FUNC_CAP = 3850,
1: +  MLX4_CMD_QP_ATTACH = 3851,
1: +  MLX4_CMD_QUERY_DEBUG_MSG = 42,
1: +  MLX4_CMD_SET_DEBUG_MSG = 43,
1: +  MLX4_CMD_QUERY_IF_STAT = 84,
1: +  MLX4_CMD_SET_IF_STAT = 85,
1: +  MLX4_QP_FLOW_STEERING_ATTACH = 101,
1: +  MLX4_QP_FLOW_STEERING_DETACH = 102,
1: +  MLX4_FLOW_STEERING_IB_UC_QP_RANGE = 100,
1: +  MLX4_CMD_CONGESTION_CTRL_OPCODE = 104,
1: +};
1: +
1: +enum {
1: +  MLX4_CMD_TIME_CLASS_A = 60000,
1: +  MLX4_CMD_TIME_CLASS_B = 60000,
1: +  MLX4_CMD_TIME_CLASS_C = 60000,
1: +};
1: +
1: +enum {
1: +  MLX4_MAILBOX_SIZE = 4096,
1: +  MLX4_ACCESS_MEM_ALIGN = 256,
1: +};
1: +
1: +enum {
1: +  MLX4_SET_PORT_IB_OPCODE = 0,
1: +  MLX4_SET_PORT_ETH_OPCODE = 1,
1: +  MLX4_SET_PORT_BEACON_OPCODE = 4,
1: +};
1: +
1: +enum {
1: +  MLX4_CMD_WRAPPED = 0,
1: +  MLX4_CMD_NATIVE = 1,
1:  };
1:  
1:  struct mlx4_cmd_mailbox {
1: -	void *buf;
1: -	dma_addr_t dma;
1: +  void *buf;
1: +  dma_addr_t dma;
1:  };
1:  
1:  enum {
1: -	IB_USER_MAD_USER_RMPP = 1,
1: +  IB_USER_MAD_USER_RMPP = 1,
1:  };
1:  
1:  enum {
1: -	IB_MGMT_MAD_HDR = 24,
1: -	IB_MGMT_MAD_DATA = 232,
1: -	IB_MGMT_RMPP_HDR = 36,
1: -	IB_MGMT_RMPP_DATA = 220,
1: -	IB_MGMT_VENDOR_HDR = 40,
1: -	IB_MGMT_VENDOR_DATA = 216,
1: -	IB_MGMT_SA_HDR = 56,
1: -	IB_MGMT_SA_DATA = 200,
1: -	IB_MGMT_DEVICE_HDR = 64,
1: -	IB_MGMT_DEVICE_DATA = 192,
1: -	IB_MGMT_MAD_SIZE = 256,
1: -	OPA_MGMT_MAD_DATA = 2024,
1: -	OPA_MGMT_RMPP_DATA = 2012,
1: -	OPA_MGMT_MAD_SIZE = 2048,
1: +  IB_MGMT_MAD_HDR = 24,
1: +  IB_MGMT_MAD_DATA = 232,
1: +  IB_MGMT_RMPP_HDR = 36,
1: +  IB_MGMT_RMPP_DATA = 220,
1: +  IB_MGMT_VENDOR_HDR = 40,
1: +  IB_MGMT_VENDOR_DATA = 216,
1: +  IB_MGMT_SA_HDR = 56,
1: +  IB_MGMT_SA_DATA = 200,
1: +  IB_MGMT_DEVICE_HDR = 64,
1: +  IB_MGMT_DEVICE_DATA = 192,
1: +  IB_MGMT_MAD_SIZE = 256,
1: +  OPA_MGMT_MAD_DATA = 2024,
1: +  OPA_MGMT_RMPP_DATA = 2012,
1: +  OPA_MGMT_MAD_SIZE = 2048,
1:  };
1:  
1:  struct ib_smp {
1: -	u8 base_version;
1: -	u8 mgmt_class;
1: -	u8 class_version;
1: -	u8 method;
1: -	__be16 status;
1: -	u8 hop_ptr;
1: -	u8 hop_cnt;
1: -	__be64 tid;
1: -	__be16 attr_id;
1: -	__be16 resv;
1: -	__be32 attr_mod;
1: -	__be64 mkey;
1: -	__be16 dr_slid;
1: -	__be16 dr_dlid;
1: -	u8 reserved[28];
1: -	u8 data[64];
1: -	u8 initial_path[64];
1: -	u8 return_path[64];
1: +  u8 base_version;
1: +  u8 mgmt_class;
1: +  u8 class_version;
1: +  u8 method;
1: +  __be16 status;
1: +  u8 hop_ptr;
1: +  u8 hop_cnt;
1: +  __be64 tid;
1: +  __be16 attr_id;
1: +  __be16 resv;
1: +  __be32 attr_mod;
1: +  __be64 mkey;
1: +  __be16 dr_slid;
1: +  __be16 dr_dlid;
1: +  u8 reserved[28];
1: +  u8 data[64];
1: +  u8 initial_path[64];
1: +  u8 return_path[64];
1:  };
1:  
1:  struct mlx4_vport_qos_param {
1: -	u32 bw_share;
1: -	u32 max_avg_bw;
1: -	u8 enable;
1: +  u32 bw_share;
1: +  u32 max_avg_bw;
1: +  u8 enable;
1:  };
1:  
1:  enum {
1: -	MLX4_COMM_CMD_RESET = 0,
1: -	MLX4_COMM_CMD_VHCR0 = 1,
1: -	MLX4_COMM_CMD_VHCR1 = 2,
1: -	MLX4_COMM_CMD_VHCR2 = 3,
1: -	MLX4_COMM_CMD_VHCR_EN = 4,
1: -	MLX4_COMM_CMD_VHCR_POST = 5,
1: -	MLX4_COMM_CMD_FLR = 254,
1: +  MLX4_COMM_CMD_RESET = 0,
1: +  MLX4_COMM_CMD_VHCR0 = 1,
1: +  MLX4_COMM_CMD_VHCR1 = 2,
1: +  MLX4_COMM_CMD_VHCR2 = 3,
1: +  MLX4_COMM_CMD_VHCR_EN = 4,
1: +  MLX4_COMM_CMD_VHCR_POST = 5,
1: +  MLX4_COMM_CMD_FLR = 254,
1:  };
1:  
1:  enum {
1: -	MLX4_VF_SMI_DISABLED = 0,
1: -	MLX4_VF_SMI_ENABLED = 1,
1: +  MLX4_VF_SMI_DISABLED = 0,
1: +  MLX4_VF_SMI_ENABLED = 1,
1:  };
1:  
1:  struct mlx4_vhcr {
1: -	u64 in_param;
1: -	u64 out_param;
1: -	u32 in_modifier;
1: -	u32 errno;
1: -	u16 op;
1: -	u16 token;
1: -	u8 op_modifier;
1: -	u8 e_bit;
1: +  u64 in_param;
1: +  u64 out_param;
1: +  u32 in_modifier;
1: +  u32 errno;
1: +  u16 op;
1: +  u16 token;
1: +  u8 op_modifier;
1: +  u8 e_bit;
1:  };
1:  
1:  struct mlx4_cmd_info {
1: -	u16 opcode;
1: -	bool has_inbox;
1: -	bool has_outbox;
1: -	bool out_is_imm;
1: -	bool encode_slave_id;
1: -	int (*verify)(struct mlx4_dev *, int, struct mlx4_vhcr *, struct mlx4_cmd_mailbox *);
1: -	int (*wrapper)(struct mlx4_dev *, int, struct mlx4_vhcr *, struct mlx4_cmd_mailbox *, struct mlx4_cmd_mailbox *, struct mlx4_cmd_info *);
1: +  u16 opcode;
1: +  bool has_inbox;
1: +  bool has_outbox;
1: +  bool out_is_imm;
1: +  bool encode_slave_id;
1: +  int (*verify)(struct mlx4_dev *, int, struct mlx4_vhcr *,
1: +                struct mlx4_cmd_mailbox *);
1: +  int (*wrapper)(struct mlx4_dev *, int, struct mlx4_vhcr *,
1: +                 struct mlx4_cmd_mailbox *, struct mlx4_cmd_mailbox *,
1: +                 struct mlx4_cmd_info *);
1:  };
1:  
1:  struct mlx4_icm {
1: -	struct list_head chunk_list;
1: -	int refcount;
1: +  struct list_head chunk_list;
1: +  int refcount;
1:  };
1:  
1:  struct mlx4_cmd_context {
1: -	struct completion done;
1: -	int result;
1: -	int next;
1: -	u64 out_param;
1: -	u16 token;
1: -	u8 fw_status;
1: +  struct completion done;
1: +  int result;
1: +  int next;
1: +  u64 out_param;
1: +  u16 token;
1: +  u8 fw_status;
1:  };
1:  
1:  enum {
1: -	MLX4_VF_IMMED_VLAN_FLAG_VLAN = 1,
1: -	MLX4_VF_IMMED_VLAN_FLAG_QOS = 2,
1: -	MLX4_VF_IMMED_VLAN_FLAG_LINK_DISABLE = 4,
1: +  MLX4_VF_IMMED_VLAN_FLAG_VLAN = 1,
1: +  MLX4_VF_IMMED_VLAN_FLAG_QOS = 2,
1: +  MLX4_VF_IMMED_VLAN_FLAG_LINK_DISABLE = 4,
1:  };
1:  
1:  struct mlx4_vf_immed_vlan_work {
1: -	struct work_struct work;
1: -	struct mlx4_priv *priv;
1: -	int flags;
1: -	int slave;
1: -	int vlan_ix;
1: -	int orig_vlan_ix;
1: -	u8 port;
1: -	u8 qos;
1: -	u8 qos_vport;
1: -	u16 vlan_id;
1: -	u16 orig_vlan_id;
1: -	__be16 vlan_proto;
1: -};
1: -
1: -enum {
1: -	MLX4_CMD_CLEANUP_STRUCT = 1,
1: -	MLX4_CMD_CLEANUP_POOL = 2,
1: -	MLX4_CMD_CLEANUP_HCR = 4,
1: -	MLX4_CMD_CLEANUP_VHCR = 8,
1: -	MLX4_CMD_CLEANUP_ALL = 15,
1: -};
1: -
1: -enum {
1: -	CMD_STAT_OK = 0,
1: -	CMD_STAT_INTERNAL_ERR = 1,
1: -	CMD_STAT_BAD_OP = 2,
1: -	CMD_STAT_BAD_PARAM = 3,
1: -	CMD_STAT_BAD_SYS_STATE = 4,
1: -	CMD_STAT_BAD_RESOURCE = 5,
1: -	CMD_STAT_RESOURCE_BUSY = 6,
1: -	CMD_STAT_EXCEED_LIM = 8,
1: -	CMD_STAT_BAD_RES_STATE = 9,
1: -	CMD_STAT_BAD_INDEX = 10,
1: -	CMD_STAT_BAD_NVMEM = 11,
1: -	CMD_STAT_ICM_ERROR = 12,
1: -	CMD_STAT_BAD_QP_STATE = 16,
1: -	CMD_STAT_BAD_SEG_PARAM = 32,
1: -	CMD_STAT_REG_BOUND = 33,
1: -	CMD_STAT_LAM_NOT_PRE = 34,
1: -	CMD_STAT_BAD_PKT = 48,
1: -	CMD_STAT_BAD_SIZE = 64,
1: -	CMD_STAT_MULTI_FUNC_REQ = 80,
1: -};
1: -
1: -enum {
1: -	HCR_IN_PARAM_OFFSET = 0,
1: -	HCR_IN_MODIFIER_OFFSET = 8,
1: -	HCR_OUT_PARAM_OFFSET = 12,
1: -	HCR_TOKEN_OFFSET = 20,
1: -	HCR_STATUS_OFFSET = 24,
1: -	HCR_OPMOD_SHIFT = 12,
1: -	HCR_T_BIT = 21,
1: -	HCR_E_BIT = 22,
1: -	HCR_GO_BIT = 23,
1: -};
1: -
1: -enum {
1: -	GO_BIT_TIMEOUT_MSECS = 10000,
1: +  struct work_struct work;
1: +  struct mlx4_priv *priv;
1: +  int flags;
1: +  int slave;
1: +  int vlan_ix;
1: +  int orig_vlan_ix;
1: +  u8 port;
1: +  u8 qos;
1: +  u8 qos_vport;
1: +  u16 vlan_id;
1: +  u16 orig_vlan_id;
1: +  __be16 vlan_proto;
1: +};
1: +
1: +enum {
1: +  MLX4_CMD_CLEANUP_STRUCT = 1,
1: +  MLX4_CMD_CLEANUP_POOL = 2,
1: +  MLX4_CMD_CLEANUP_HCR = 4,
1: +  MLX4_CMD_CLEANUP_VHCR = 8,
1: +  MLX4_CMD_CLEANUP_ALL = 15,
1: +};
1: +
1: +enum {
1: +  CMD_STAT_OK = 0,
1: +  CMD_STAT_INTERNAL_ERR = 1,
1: +  CMD_STAT_BAD_OP = 2,
1: +  CMD_STAT_BAD_PARAM = 3,
1: +  CMD_STAT_BAD_SYS_STATE = 4,
1: +  CMD_STAT_BAD_RESOURCE = 5,
1: +  CMD_STAT_RESOURCE_BUSY = 6,
1: +  CMD_STAT_EXCEED_LIM = 8,
1: +  CMD_STAT_BAD_RES_STATE = 9,
1: +  CMD_STAT_BAD_INDEX = 10,
1: +  CMD_STAT_BAD_NVMEM = 11,
1: +  CMD_STAT_ICM_ERROR = 12,
1: +  CMD_STAT_BAD_QP_STATE = 16,
1: +  CMD_STAT_BAD_SEG_PARAM = 32,
1: +  CMD_STAT_REG_BOUND = 33,
1: +  CMD_STAT_LAM_NOT_PRE = 34,
1: +  CMD_STAT_BAD_PKT = 48,
1: +  CMD_STAT_BAD_SIZE = 64,
1: +  CMD_STAT_MULTI_FUNC_REQ = 80,
1: +};
1: +
1: +enum {
1: +  HCR_IN_PARAM_OFFSET = 0,
1: +  HCR_IN_MODIFIER_OFFSET = 8,
1: +  HCR_OUT_PARAM_OFFSET = 12,
1: +  HCR_TOKEN_OFFSET = 20,
1: +  HCR_STATUS_OFFSET = 24,
1: +  HCR_OPMOD_SHIFT = 12,
1: +  HCR_T_BIT = 21,
1: +  HCR_E_BIT = 22,
1: +  HCR_GO_BIT = 23,
1: +};
1: +
1: +enum {
1: +  GO_BIT_TIMEOUT_MSECS = 10000,
1:  };
1:  
1:  struct mlx4_cq {
1: -	void (*comp)(struct mlx4_cq *);
1: -	void (*event)(struct mlx4_cq *, enum mlx4_event);
1: -	struct mlx4_uar *uar;
1: -	u32 cons_index;
1: -	u16 irq;
1: -	__be32 *set_ci_db;
1: -	__be32 *arm_db;
1: -	int arm_sn;
1: -	int cqn;
1: -	unsigned int vector;
1: -	refcount_t refcount;
1: -	struct completion free;
1: -	struct {
1: -		struct list_head list;
1: -		void (*comp)(struct mlx4_cq *);
1: -		void *priv;
1: -	} tasklet_ctx;
1: -	int reset_notify_added;
1: -	struct list_head reset_notify;
1: -	u8 usage;
1: +  void (*comp)(struct mlx4_cq *);
1: +  void (*event)(struct mlx4_cq *, enum mlx4_event);
1: +  struct mlx4_uar *uar;
1: +  u32 cons_index;
1: +  u16 irq;
1: +  __be32 *set_ci_db;
1: +  __be32 *arm_db;
1: +  int arm_sn;
1: +  int cqn;
1: +  unsigned int vector;
1: +  refcount_t refcount;
1: +  struct completion free;
1: +  struct {
1: +    struct list_head list;
1: +    void (*comp)(struct mlx4_cq *);
1: +    void *priv;
1: +  } tasklet_ctx;
1: +  int reset_notify_added;
1: +  struct list_head reset_notify;
1: +  u8 usage;
1:  };
1:  
1:  enum mlx4_alloc_mode {
1: -	RES_OP_RESERVE = 0,
1: -	RES_OP_RESERVE_AND_MAP = 1,
1: -	RES_OP_MAP_ICM = 2,
1: +  RES_OP_RESERVE = 0,
1: +  RES_OP_RESERVE_AND_MAP = 1,
1: +  RES_OP_MAP_ICM = 2,
1:  };
1:  
1:  struct mlx4_cq_context {
1: -	__be32 flags;
1: -	u16 reserved1[3];
1: -	__be16 page_offset;
1: -	__be32 logsize_usrpage;
1: -	__be16 cq_period;
1: -	__be16 cq_max_count;
1: -	u8 reserved2[3];
1: -	u8 comp_eqn;
1: -	u8 log_page_size;
1: -	u8 reserved3[2];
1: -	u8 mtt_base_addr_h;
1: -	__be32 mtt_base_addr_l;
1: -	__be32 last_notified_index;
1: -	__be32 solicit_producer_index;
1: -	__be32 consumer_index;
1: -	__be32 producer_index;
1: -	u32 reserved4[2];
1: -	__be64 db_rec_addr;
1: -};
1: -
1: -enum {
1: -	MLX4_ICM_PAGE_SHIFT = 12,
1: -	MLX4_ICM_PAGE_SIZE = 4096,
1: -};
1: -
1: -enum {
1: -	MLX4_DEV_CAP_FLAG_RC = 1,
1: -	MLX4_DEV_CAP_FLAG_UC = 2,
1: -	MLX4_DEV_CAP_FLAG_UD = 4,
1: -	MLX4_DEV_CAP_FLAG_XRC = 8,
1: -	MLX4_DEV_CAP_FLAG_SRQ = 64,
1: -	MLX4_DEV_CAP_FLAG_IPOIB_CSUM = 128,
1: -	MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 256,
1: -	MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR = 512,
1: -	MLX4_DEV_CAP_FLAG_DPDP = 4096,
1: -	MLX4_DEV_CAP_FLAG_BLH = 32768,
1: -	MLX4_DEV_CAP_FLAG_MEM_WINDOW = 65536,
1: -	MLX4_DEV_CAP_FLAG_APM = 131072,
1: -	MLX4_DEV_CAP_FLAG_ATOMIC = 262144,
1: -	MLX4_DEV_CAP_FLAG_RAW_MCAST = 524288,
1: -	MLX4_DEV_CAP_FLAG_UD_AV_PORT = 1048576,
1: -	MLX4_DEV_CAP_FLAG_UD_MCAST = 2097152,
1: -	MLX4_DEV_CAP_FLAG_IBOE = 1073741824,
1: -	MLX4_DEV_CAP_FLAG_UC_LOOPBACK = 0,
1: -	MLX4_DEV_CAP_FLAG_FCS_KEEP = 0,
1: -	MLX4_DEV_CAP_FLAG_WOL_PORT1 = 0,
1: -	MLX4_DEV_CAP_FLAG_WOL_PORT2 = 0,
1: -	MLX4_DEV_CAP_FLAG_UDP_RSS = 0,
1: -	MLX4_DEV_CAP_FLAG_VEP_UC_STEER = 0,
1: -	MLX4_DEV_CAP_FLAG_VEP_MC_STEER = 0,
1: -	MLX4_DEV_CAP_FLAG_COUNTERS = 0,
1: -	MLX4_DEV_CAP_FLAG_RSS_IP_FRAG = 0,
1: -	MLX4_DEV_CAP_FLAG_SET_ETH_SCHED = 0,
1: -	MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 0,
1: -	MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV = 0,
1: -	MLX4_DEV_CAP_FLAG_64B_EQE = 0,
1: -	MLX4_DEV_CAP_FLAG_64B_CQE = 0,
1: -};
1: -
1: -enum {
1: -	MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_BAD_CABLE = 1,
1: -	MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_UNSUPPORTED_CABLE = 2,
1: -};
1: -
1: -enum {
1: -	MLX4_FATAL_WARNING_SUBTYPE_WARMING = 0,
1: +  __be32 flags;
1: +  u16 reserved1[3];
1: +  __be16 page_offset;
1: +  __be32 logsize_usrpage;
1: +  __be16 cq_period;
1: +  __be16 cq_max_count;
1: +  u8 reserved2[3];
1: +  u8 comp_eqn;
1: +  u8 log_page_size;
1: +  u8 reserved3[2];
1: +  u8 mtt_base_addr_h;
1: +  __be32 mtt_base_addr_l;
1: +  __be32 last_notified_index;
1: +  __be32 solicit_producer_index;
1: +  __be32 consumer_index;
1: +  __be32 producer_index;
1: +  u32 reserved4[2];
1: +  __be64 db_rec_addr;
1: +};
1: +
1: +enum {
1: +  MLX4_ICM_PAGE_SHIFT = 12,
1: +  MLX4_ICM_PAGE_SIZE = 4096,
1: +};
1: +
1: +enum {
1: +  MLX4_DEV_CAP_FLAG_RC = 1,
1: +  MLX4_DEV_CAP_FLAG_UC = 2,
1: +  MLX4_DEV_CAP_FLAG_UD = 4,
1: +  MLX4_DEV_CAP_FLAG_XRC = 8,
1: +  MLX4_DEV_CAP_FLAG_SRQ = 64,
1: +  MLX4_DEV_CAP_FLAG_IPOIB_CSUM = 128,
1: +  MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 256,
1: +  MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR = 512,
1: +  MLX4_DEV_CAP_FLAG_DPDP = 4096,
1: +  MLX4_DEV_CAP_FLAG_BLH = 32768,
1: +  MLX4_DEV_CAP_FLAG_MEM_WINDOW = 65536,
1: +  MLX4_DEV_CAP_FLAG_APM = 131072,
1: +  MLX4_DEV_CAP_FLAG_ATOMIC = 262144,
1: +  MLX4_DEV_CAP_FLAG_RAW_MCAST = 524288,
1: +  MLX4_DEV_CAP_FLAG_UD_AV_PORT = 1048576,
1: +  MLX4_DEV_CAP_FLAG_UD_MCAST = 2097152,
1: +  MLX4_DEV_CAP_FLAG_IBOE = 1073741824,
1: +  MLX4_DEV_CAP_FLAG_UC_LOOPBACK = 0,
1: +  MLX4_DEV_CAP_FLAG_FCS_KEEP = 0,
1: +  MLX4_DEV_CAP_FLAG_WOL_PORT1 = 0,
1: +  MLX4_DEV_CAP_FLAG_WOL_PORT2 = 0,
1: +  MLX4_DEV_CAP_FLAG_UDP_RSS = 0,
1: +  MLX4_DEV_CAP_FLAG_VEP_UC_STEER = 0,
1: +  MLX4_DEV_CAP_FLAG_VEP_MC_STEER = 0,
1: +  MLX4_DEV_CAP_FLAG_COUNTERS = 0,
1: +  MLX4_DEV_CAP_FLAG_RSS_IP_FRAG = 0,
1: +  MLX4_DEV_CAP_FLAG_SET_ETH_SCHED = 0,
1: +  MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 0,
1: +  MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV = 0,
1: +  MLX4_DEV_CAP_FLAG_64B_EQE = 0,
1: +  MLX4_DEV_CAP_FLAG_64B_CQE = 0,
1: +};
1: +
1: +enum {
1: +  MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_BAD_CABLE = 1,
1: +  MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_UNSUPPORTED_CABLE = 2,
1: +};
1: +
1: +enum {
1: +  MLX4_FATAL_WARNING_SUBTYPE_WARMING = 0,
1:  };
1:  
1:  enum slave_port_gen_event {
1: -	SLAVE_PORT_GEN_EVENT_DOWN = 0,
1: -	SLAVE_PORT_GEN_EVENT_UP = 1,
1: -	SLAVE_PORT_GEN_EVENT_NONE = 2,
1: +  SLAVE_PORT_GEN_EVENT_DOWN = 0,
1: +  SLAVE_PORT_GEN_EVENT_UP = 1,
1: +  SLAVE_PORT_GEN_EVENT_NONE = 2,
1:  };
1:  
1:  enum slave_port_state_event {
1: -	MLX4_PORT_STATE_DEV_EVENT_PORT_DOWN = 0,
1: -	MLX4_PORT_STATE_DEV_EVENT_PORT_UP = 1,
1: -	MLX4_PORT_STATE_IB_PORT_STATE_EVENT_GID_VALID = 2,
1: -	MLX4_PORT_STATE_IB_EVENT_GID_INVALID = 3,
1: +  MLX4_PORT_STATE_DEV_EVENT_PORT_DOWN = 0,
1: +  MLX4_PORT_STATE_DEV_EVENT_PORT_UP = 1,
1: +  MLX4_PORT_STATE_IB_PORT_STATE_EVENT_GID_VALID = 2,
1: +  MLX4_PORT_STATE_IB_EVENT_GID_INVALID = 3,
1:  };
1:  
1:  enum {
1: -	MLX4_DEV_PMC_SUBTYPE_GUID_INFO = 20,
1: -	MLX4_DEV_PMC_SUBTYPE_PORT_INFO = 21,
1: -	MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE = 22,
1: -	MLX4_DEV_PMC_SUBTYPE_SL_TO_VL_MAP = 23,
1: +  MLX4_DEV_PMC_SUBTYPE_GUID_INFO = 20,
1: +  MLX4_DEV_PMC_SUBTYPE_PORT_INFO = 21,
1: +  MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE = 22,
1: +  MLX4_DEV_PMC_SUBTYPE_SL_TO_VL_MAP = 23,
1:  };
1:  
1:  struct mlx4_eq_context {
1: -	__be32 flags;
1: -	u16 reserved1[3];
1: -	__be16 page_offset;
1: -	u8 log_eq_size;
1: -	u8 reserved2[4];
1: -	u8 eq_period;
1: -	u8 reserved3;
1: -	u8 eq_max_count;
1: -	u8 reserved4[3];
1: -	u8 intr;
1: -	u8 log_page_size;
1: -	u8 reserved5[2];
1: -	u8 mtt_base_addr_h;
1: -	__be32 mtt_base_addr_l;
1: -	u32 reserved6[2];
1: -	__be32 consumer_index;
1: -	__be32 producer_index;
1: -	u32 reserved7[4];
1: +  __be32 flags;
1: +  u16 reserved1[3];
1: +  __be16 page_offset;
1: +  u8 log_eq_size;
1: +  u8 reserved2[4];
1: +  u8 eq_period;
1: +  u8 reserved3;
1: +  u8 eq_max_count;
1: +  u8 reserved4[3];
1: +  u8 intr;
1: +  u8 log_page_size;
1: +  u8 reserved5[2];
1: +  u8 mtt_base_addr_h;
1: +  __be32 mtt_base_addr_l;
1: +  u32 reserved6[2];
1: +  __be32 consumer_index;
1: +  __be32 producer_index;
1: +  u32 reserved7[4];
1:  };
1:  
1:  struct mlx4_port_cap {
1: -	u8 link_state;
1: -	u8 supported_port_types;
1: -	u8 suggested_type;
1: -	u8 default_sense;
1: -	u8 log_max_macs;
1: -	u8 log_max_vlans;
1: -	int ib_mtu;
1: -	int max_port_width;
1: -	int max_vl;
1: -	int max_tc_eth;
1: -	int max_gids;
1: -	int max_pkeys;
1: -	u64 def_mac;
1: -	u16 eth_mtu;
1: -	int trans_type;
1: -	int vendor_oui;
1: -	u16 wavelength;
1: -	u64 trans_code;
1: -	u8 dmfs_optimized_state;
1: +  u8 link_state;
1: +  u8 supported_port_types;
1: +  u8 suggested_type;
1: +  u8 default_sense;
1: +  u8 log_max_macs;
1: +  u8 log_max_vlans;
1: +  int ib_mtu;
1: +  int max_port_width;
1: +  int max_vl;
1: +  int max_tc_eth;
1: +  int max_gids;
1: +  int max_pkeys;
1: +  u64 def_mac;
1: +  u16 eth_mtu;
1: +  int trans_type;
1: +  int vendor_oui;
1: +  u16 wavelength;
1: +  u64 trans_code;
1: +  u8 dmfs_optimized_state;
1:  };
1:  
1:  enum {
1: -	MLX4_IRQNAME_SIZE = 32,
1: +  MLX4_IRQNAME_SIZE = 32,
1:  };
1:  
1:  enum {
1: -	MLX4_NUM_ASYNC_EQE = 256,
1: -	MLX4_NUM_SPARE_EQE = 128,
1: -	MLX4_EQ_ENTRY_SIZE = 32,
1: +  MLX4_NUM_ASYNC_EQE = 256,
1: +  MLX4_NUM_SPARE_EQE = 128,
1: +  MLX4_EQ_ENTRY_SIZE = 32,
1:  };
1:  
1:  enum {
1: -	MLX4_STEERING_MODE_A0 = 0,
1: -	MLX4_STEERING_MODE_B0 = 1,
1: -	MLX4_STEERING_MODE_DEVICE_MANAGED = 2,
1: +  MLX4_STEERING_MODE_A0 = 0,
1: +  MLX4_STEERING_MODE_B0 = 1,
1: +  MLX4_STEERING_MODE_DEVICE_MANAGED = 2,
1:  };
1:  
1:  enum {
1: -	MLX4_STEERING_DMFS_A0_DEFAULT = 0,
1: -	MLX4_STEERING_DMFS_A0_DYNAMIC = 1,
1: -	MLX4_STEERING_DMFS_A0_STATIC = 2,
1: -	MLX4_STEERING_DMFS_A0_DISABLE = 3,
1: -	MLX4_STEERING_DMFS_A0_NOT_SUPPORTED = 4,
1: +  MLX4_STEERING_DMFS_A0_DEFAULT = 0,
1: +  MLX4_STEERING_DMFS_A0_DYNAMIC = 1,
1: +  MLX4_STEERING_DMFS_A0_STATIC = 2,
1: +  MLX4_STEERING_DMFS_A0_DISABLE = 3,
1: +  MLX4_STEERING_DMFS_A0_NOT_SUPPORTED = 4,
1:  };
1:  
1:  enum {
1: -	MLX4_QUERY_FUNC_FLAGS_BF_RES_QP = 1,
1: -	MLX4_QUERY_FUNC_FLAGS_A0_RES_QP = 2,
1: +  MLX4_QUERY_FUNC_FLAGS_BF_RES_QP = 1,
1: +  MLX4_QUERY_FUNC_FLAGS_A0_RES_QP = 2,
1:  };
1:  
1:  enum {
1: -	MLX4_DEV_CAP_64B_EQE_ENABLED = 1,
1: -	MLX4_DEV_CAP_64B_CQE_ENABLED = 2,
1: -	MLX4_DEV_CAP_CQE_STRIDE_ENABLED = 4,
1: -	MLX4_DEV_CAP_EQE_STRIDE_ENABLED = 8,
1: +  MLX4_DEV_CAP_64B_EQE_ENABLED = 1,
1: +  MLX4_DEV_CAP_64B_CQE_ENABLED = 2,
1: +  MLX4_DEV_CAP_CQE_STRIDE_ENABLED = 4,
1: +  MLX4_DEV_CAP_EQE_STRIDE_ENABLED = 8,
1:  };
1:  
1:  enum {
1: -	MLX4_FLAG_PORT_REMAP = 16777216,
1: -	MLX4_FLAG_ROCE_V1_V2 = 524288,
1: +  MLX4_FLAG_PORT_REMAP = 16777216,
1: +  MLX4_FLAG_ROCE_V1_V2 = 524288,
1:  };
1:  
1:  struct mlx4_qp {
1: -	void (*event)(struct mlx4_qp *, enum mlx4_event);
1: -	int qpn;
1: -	refcount_t refcount;
1: -	struct completion free;
1: -	u8 usage;
1: +  void (*event)(struct mlx4_qp *, enum mlx4_event);
1: +  int qpn;
1: +  refcount_t refcount;
1: +  struct completion free;
1: +  u8 usage;
1:  };
1:  
1:  enum mlx4_access_reg_method {
1: -	MLX4_ACCESS_REG_QUERY = 1,
1: -	MLX4_ACCESS_REG_WRITE = 2,
1: +  MLX4_ACCESS_REG_QUERY = 1,
1: +  MLX4_ACCESS_REG_WRITE = 2,
1:  };
1:  
1:  struct mlx4_ptys_reg {
1: -	u8 flags;
1: -	u8 local_port;
1: -	u8 resrvd2;
1: -	u8 proto_mask;
1: -	__be32 resrvd3[2];
1: -	__be32 eth_proto_cap;
1: -	__be16 ib_width_cap;
1: -	__be16 ib_speed_cap;
1: -	__be32 resrvd4;
1: -	__be32 eth_proto_admin;
1: -	__be16 ib_width_admin;
1: -	__be16 ib_speed_admin;
1: -	__be32 resrvd5;
1: -	__be32 eth_proto_oper;
1: -	__be16 ib_width_oper;
1: -	__be16 ib_speed_oper;
1: -	__be32 resrvd6;
1: -	__be32 eth_proto_lp_adv;
1: +  u8 flags;
1: +  u8 local_port;
1: +  u8 resrvd2;
1: +  u8 proto_mask;
1: +  __be32 resrvd3[2];
1: +  __be32 eth_proto_cap;
1: +  __be16 ib_width_cap;
1: +  __be16 ib_speed_cap;
1: +  __be32 resrvd4;
1: +  __be32 eth_proto_admin;
1: +  __be16 ib_width_admin;
1: +  __be16 ib_speed_admin;
1: +  __be32 resrvd5;
1: +  __be32 eth_proto_oper;
1: +  __be16 ib_width_oper;
1: +  __be16 ib_speed_oper;
1: +  __be32 resrvd6;
1: +  __be32 eth_proto_lp_adv;
1:  };
1:  
1:  enum {
1: -	MLX4_GET_PORT_VIRT2PHY = 0,
1: -	MLX4_SET_PORT_VIRT2PHY = 1,
1: +  MLX4_GET_PORT_VIRT2PHY = 0,
1: +  MLX4_SET_PORT_VIRT2PHY = 1,
1:  };
1:  
1:  enum {
1: -	MLX4_SET_PORT_GENERAL = 0,
1: -	MLX4_SET_PORT_RQP_CALC = 1,
1: -	MLX4_SET_PORT_MAC_TABLE = 2,
1: -	MLX4_SET_PORT_VLAN_TABLE = 3,
1: -	MLX4_SET_PORT_PRIO_MAP = 4,
1: -	MLX4_SET_PORT_GID_TABLE = 5,
1: -	MLX4_SET_PORT_PRIO2TC = 8,
1: -	MLX4_SET_PORT_SCHEDULER = 9,
1: -	MLX4_SET_PORT_VXLAN = 11,
1: -	MLX4_SET_PORT_ROCE_ADDR = 13,
1: +  MLX4_SET_PORT_GENERAL = 0,
1: +  MLX4_SET_PORT_RQP_CALC = 1,
1: +  MLX4_SET_PORT_MAC_TABLE = 2,
1: +  MLX4_SET_PORT_VLAN_TABLE = 3,
1: +  MLX4_SET_PORT_PRIO_MAP = 4,
1: +  MLX4_SET_PORT_GID_TABLE = 5,
1: +  MLX4_SET_PORT_PRIO2TC = 8,
1: +  MLX4_SET_PORT_SCHEDULER = 9,
1: +  MLX4_SET_PORT_VXLAN = 11,
1: +  MLX4_SET_PORT_ROCE_ADDR = 13,
1:  };
1:  
1:  enum {
1: -	MLX4_CMD_MAD_DEMUX_CONFIG = 0,
1: -	MLX4_CMD_MAD_DEMUX_QUERY_STATE = 1,
1: -	MLX4_CMD_MAD_DEMUX_QUERY_RESTR = 2,
1: +  MLX4_CMD_MAD_DEMUX_CONFIG = 0,
1: +  MLX4_CMD_MAD_DEMUX_QUERY_STATE = 1,
1: +  MLX4_CMD_MAD_DEMUX_QUERY_RESTR = 2,
1:  };
1:  
1:  enum mlx4_rx_csum_mode {
1: -	MLX4_RX_CSUM_MODE_VAL_NON_TCP_UDP = 1,
1: -	MLX4_RX_CSUM_MODE_L4 = 2,
1: -	MLX4_RX_CSUM_MODE_IP_OK_IP_NON_TCP_UDP = 4,
1: -	MLX4_RX_CSUM_MODE_MULTI_VLAN = 8,
1: +  MLX4_RX_CSUM_MODE_VAL_NON_TCP_UDP = 1,
1: +  MLX4_RX_CSUM_MODE_L4 = 2,
1: +  MLX4_RX_CSUM_MODE_IP_OK_IP_NON_TCP_UDP = 4,
1: +  MLX4_RX_CSUM_MODE_MULTI_VLAN = 8,
1:  };
1:  
1:  struct mlx4_config_dev_params {
1: -	u16 vxlan_udp_dport;
1: -	u8 rx_csum_flags_port_1;
1: -	u8 rx_csum_flags_port_2;
1: +  u16 vxlan_udp_dport;
1: +  u8 rx_csum_flags_port_1;
1: +  u8 rx_csum_flags_port_2;
1:  };
1:  
1:  enum {
1: -	MLX4_USER_DEV_CAP_LARGE_CQE = 1,
1: +  MLX4_USER_DEV_CAP_LARGE_CQE = 1,
1:  };
1:  
1:  struct mlx4_mgm {
1: -	__be32 next_gid_index;
1: -	__be32 members_count;
1: -	u32 reserved[2];
1: -	u8 gid[16];
1: -	__be32 qp[1016];
1: +  __be32 next_gid_index;
1: +  __be32 members_count;
1: +  u32 reserved[2];
1: +  u8 gid[16];
1: +  __be32 qp[1016];
1:  };
1:  
1:  struct mlx4_set_port_general_context {
1: -	u16 reserved1;
1: -	u8 flags2;
1: -	u8 flags;
1: -	union {
1: -		u8 ignore_fcs;
1: -		u8 roce_mode;
1: -	};
1: -	u8 reserved2;
1: -	__be16 mtu;
1: -	u8 pptx;
1: -	u8 pfctx;
1: -	u16 reserved3;
1: -	u8 pprx;
1: -	u8 pfcrx;
1: -	u16 reserved4;
1: -	u32 reserved5;
1: -	u8 phv_en;
1: -	u8 reserved6[5];
1: -	__be16 user_mtu;
1: -	u16 reserved7;
1: -	u8 user_mac[6];
1: +  u16 reserved1;
1: +  u8 flags2;
1: +  u8 flags;
1: +  union {
1: +    u8 ignore_fcs;
1: +    u8 roce_mode;
1: +  };
1: +  u8 reserved2;
1: +  __be16 mtu;
1: +  u8 pptx;
1: +  u8 pfctx;
1: +  u16 reserved3;
1: +  u8 pprx;
1: +  u8 pfcrx;
1: +  u16 reserved4;
1: +  u32 reserved5;
1: +  u8 phv_en;
1: +  u8 reserved6[5];
1: +  __be16 user_mtu;
1: +  u16 reserved7;
1: +  u8 user_mac[6];
1:  };
1:  
1:  struct mlx4_icm_buf {
1: -	void *addr;
1: -	size_t size;
1: -	dma_addr_t dma_addr;
1: +  void *addr;
1: +  size_t size;
1: +  dma_addr_t dma_addr;
1:  };
1:  
1:  struct mlx4_icm_chunk {
1: -	struct list_head list;
1: -	int npages;
1: -	int nsg;
1: -	bool coherent;
1: -	union {
1: -		struct scatterlist sg[7];
1: -		struct mlx4_icm_buf buf[7];
1: -	};
1: +  struct list_head list;
1: +  int npages;
1: +  int nsg;
1: +  bool coherent;
1: +  union {
1: +    struct scatterlist sg[7];
1: +    struct mlx4_icm_buf buf[7];
1: +  };
1:  };
1:  
1:  struct mlx4_icm_iter {
1: -	struct mlx4_icm *icm;
1: -	struct mlx4_icm_chunk *chunk;
1: -	int page_idx;
1: +  struct mlx4_icm *icm;
1: +  struct mlx4_icm_chunk *chunk;
1: +  int page_idx;
1:  };
1:  
1:  struct mlx4_mod_stat_cfg {
1: -	u8 log_pg_sz;
1: -	u8 log_pg_sz_m;
1: +  u8 log_pg_sz;
1: +  u8 log_pg_sz_m;
1:  };
1:  
1:  struct mlx4_dev_cap {
1: -	int max_srq_sz;
1: -	int max_qp_sz;
1: -	int reserved_qps;
1: -	int max_qps;
1: -	int reserved_srqs;
1: -	int max_srqs;
1: -	int max_cq_sz;
1: -	int reserved_cqs;
1: -	int max_cqs;
1: -	int max_mpts;
1: -	int reserved_eqs;
1: -	int max_eqs;
1: -	int num_sys_eqs;
1: -	int reserved_mtts;
1: -	int reserved_mrws;
1: -	int max_requester_per_qp;
1: -	int max_responder_per_qp;
1: -	int max_rdma_global;
1: -	int local_ca_ack_delay;
1: -	int num_ports;
1: -	u32 max_msg_sz;
1: -	u16 stat_rate_support;
1: -	int fs_log_max_ucast_qp_range_size;
1: -	int fs_max_num_qp_per_entry;
1: -	u64 flags;
1: -	u64 flags2;
1: -	int reserved_uars;
1: -	int uar_size;
1: -	int min_page_sz;
1: -	int bf_reg_size;
1: -	int bf_regs_per_page;
1: -	int max_sq_sg;
1: -	int max_sq_desc_sz;
1: -	int max_rq_sg;
1: -	int max_rq_desc_sz;
1: -	int max_qp_per_mcg;
1: -	int reserved_mgms;
1: -	int max_mcgs;
1: -	int reserved_pds;
1: -	int max_pds;
1: -	int reserved_xrcds;
1: -	int max_xrcds;
1: -	int qpc_entry_sz;
1: -	int rdmarc_entry_sz;
1: -	int altc_entry_sz;
1: -	int aux_entry_sz;
1: -	int srq_entry_sz;
1: -	int cqc_entry_sz;
1: -	int eqc_entry_sz;
1: -	int dmpt_entry_sz;
1: -	int cmpt_entry_sz;
1: -	int mtt_entry_sz;
1: -	int resize_srq;
1: -	u32 bmme_flags;
1: -	u32 reserved_lkey;
1: -	u64 max_icm_sz;
1: -	int max_gso_sz;
1: -	int max_rss_tbl_sz;
1: -	u32 max_counters;
1: -	u32 dmfs_high_rate_qpn_base;
1: -	u32 dmfs_high_rate_qpn_range;
1: -	struct mlx4_rate_limit_caps rl_caps;
1: -	u32 health_buffer_addrs;
1: -	struct mlx4_port_cap port_cap[3];
1: -	bool wol_port[3];
1: +  int max_srq_sz;
1: +  int max_qp_sz;
1: +  int reserved_qps;
1: +  int max_qps;
1: +  int reserved_srqs;
1: +  int max_srqs;
1: +  int max_cq_sz;
1: +  int reserved_cqs;
1: +  int max_cqs;
1: +  int max_mpts;
1: +  int reserved_eqs;
1: +  int max_eqs;
1: +  int num_sys_eqs;
1: +  int reserved_mtts;
1: +  int reserved_mrws;
1: +  int max_requester_per_qp;
1: +  int max_responder_per_qp;
1: +  int max_rdma_global;
1: +  int local_ca_ack_delay;
1: +  int num_ports;
1: +  u32 max_msg_sz;
1: +  u16 stat_rate_support;
1: +  int fs_log_max_ucast_qp_range_size;
1: +  int fs_max_num_qp_per_entry;
1: +  u64 flags;
1: +  u64 flags2;
1: +  int reserved_uars;
1: +  int uar_size;
1: +  int min_page_sz;
1: +  int bf_reg_size;
1: +  int bf_regs_per_page;
1: +  int max_sq_sg;
1: +  int max_sq_desc_sz;
1: +  int max_rq_sg;
1: +  int max_rq_desc_sz;
1: +  int max_qp_per_mcg;
1: +  int reserved_mgms;
1: +  int max_mcgs;
1: +  int reserved_pds;
1: +  int max_pds;
1: +  int reserved_xrcds;
1: +  int max_xrcds;
1: +  int qpc_entry_sz;
1: +  int rdmarc_entry_sz;
1: +  int altc_entry_sz;
1: +  int aux_entry_sz;
1: +  int srq_entry_sz;
1: +  int cqc_entry_sz;
1: +  int eqc_entry_sz;
1: +  int dmpt_entry_sz;
1: +  int cmpt_entry_sz;
1: +  int mtt_entry_sz;
1: +  int resize_srq;
1: +  u32 bmme_flags;
1: +  u32 reserved_lkey;
1: +  u64 max_icm_sz;
1: +  int max_gso_sz;
1: +  int max_rss_tbl_sz;
1: +  u32 max_counters;
1: +  u32 dmfs_high_rate_qpn_base;
1: +  u32 dmfs_high_rate_qpn_range;
1: +  struct mlx4_rate_limit_caps rl_caps;
1: +  u32 health_buffer_addrs;
1: +  struct mlx4_port_cap port_cap[3];
1: +  bool wol_port[3];
1:  };
1:  
1:  struct mlx4_func_cap {
1: -	u8 num_ports;
1: -	u8 flags;
1: -	u32 pf_context_behaviour;
1: -	int qp_quota;
1: -	int cq_quota;
1: -	int srq_quota;
1: -	int mpt_quota;
1: -	int mtt_quota;
1: -	int max_eq;
1: -	int reserved_eq;
1: -	int mcg_quota;
1: -	struct mlx4_spec_qps spec_qps;
1: -	u32 reserved_lkey;
1: -	u8 physical_port;
1: -	u8 flags0;
1: -	u8 flags1;
1: -	u64 phys_port_id;
1: -	u32 extra_flags;
1: +  u8 num_ports;
1: +  u8 flags;
1: +  u32 pf_context_behaviour;
1: +  int qp_quota;
1: +  int cq_quota;
1: +  int srq_quota;
1: +  int mpt_quota;
1: +  int mtt_quota;
1: +  int max_eq;
1: +  int reserved_eq;
1: +  int mcg_quota;
1: +  struct mlx4_spec_qps spec_qps;
1: +  u32 reserved_lkey;
1: +  u8 physical_port;
1: +  u8 flags0;
1: +  u8 flags1;
1: +  u64 phys_port_id;
1: +  u32 extra_flags;
1:  };
1:  
1:  struct mlx4_func {
1: -	int bus;
1: -	int device;
1: -	int function;
1: -	int physical_function;
1: -	int rsvd_eqs;
1: -	int max_eq;
1: -	int rsvd_uars;
1: +  int bus;
1: +  int device;
1: +  int function;
1: +  int physical_function;
1: +  int rsvd_eqs;
1: +  int max_eq;
1: +  int rsvd_uars;
1:  };
1:  
1:  struct mlx4_adapter {
1: -	char board_id[64];
1: -	u8 inta_pin;
1: +  char board_id[64];
1: +  u8 inta_pin;
1:  };
1:  
1:  struct mlx4_init_hca_param {
1: -	u64 qpc_base;
1: -	u64 rdmarc_base;
1: -	u64 auxc_base;
1: -	u64 altc_base;
1: -	u64 srqc_base;
1: -	u64 cqc_base;
1: -	u64 eqc_base;
1: -	u64 mc_base;
1: -	u64 dmpt_base;
1: -	u64 cmpt_base;
1: -	u64 mtt_base;
1: -	u64 global_caps;
1: -	u16 log_mc_entry_sz;
1: -	u16 log_mc_hash_sz;
1: -	u16 hca_core_clock;
1: -	u8 log_num_qps;
1: -	u8 log_num_srqs;
1: -	u8 log_num_cqs;
1: -	u8 log_num_eqs;
1: -	u16 num_sys_eqs;
1: -	u8 log_rd_per_qp;
1: -	u8 log_mc_table_sz;
1: -	u8 log_mpt_sz;
1: -	u8 log_uar_sz;
1: -	u8 mw_enabled;
1: -	u8 uar_page_sz;
1: -	u8 steering_mode;
1: -	u8 dmfs_high_steer_mode;
1: -	u64 dev_cap_enabled;
1: -	u16 cqe_size;
1: -	u16 eqe_size;
1: -	u8 rss_ip_frags;
1: -	u8 phv_check_en;
1: -};
1: -
1: -enum {
1: -	MLX4_COMMAND_INTERFACE_MIN_REV = 2,
1: -	MLX4_COMMAND_INTERFACE_MAX_REV = 3,
1: -	MLX4_COMMAND_INTERFACE_NEW_PORT_CMDS = 3,
1: +  u64 qpc_base;
1: +  u64 rdmarc_base;
1: +  u64 auxc_base;
1: +  u64 altc_base;
1: +  u64 srqc_base;
1: +  u64 cqc_base;
1: +  u64 eqc_base;
1: +  u64 mc_base;
1: +  u64 dmpt_base;
1: +  u64 cmpt_base;
1: +  u64 mtt_base;
1: +  u64 global_caps;
1: +  u16 log_mc_entry_sz;
1: +  u16 log_mc_hash_sz;
1: +  u16 hca_core_clock;
1: +  u8 log_num_qps;
1: +  u8 log_num_srqs;
1: +  u8 log_num_cqs;
1: +  u8 log_num_eqs;
1: +  u16 num_sys_eqs;
1: +  u8 log_rd_per_qp;
1: +  u8 log_mc_table_sz;
1: +  u8 log_mpt_sz;
1: +  u8 log_uar_sz;
1: +  u8 mw_enabled;
1: +  u8 uar_page_sz;
1: +  u8 steering_mode;
1: +  u8 dmfs_high_steer_mode;
1: +  u64 dev_cap_enabled;
1: +  u16 cqe_size;
1: +  u16 eqe_size;
1: +  u8 rss_ip_frags;
1: +  u8 phv_check_en;
1: +};
1: +
1: +enum {
1: +  MLX4_COMMAND_INTERFACE_MIN_REV = 2,
1: +  MLX4_COMMAND_INTERFACE_MAX_REV = 3,
1: +  MLX4_COMMAND_INTERFACE_NEW_PORT_CMDS = 3,
1:  };
1:  
1:  struct mlx4_config_dev {
1: -	__be32 update_flags;
1: -	__be32 rsvd1[3];
1: -	__be16 vxlan_udp_dport;
1: -	__be16 rsvd2;
1: -	__be16 roce_v2_entropy;
1: -	__be16 roce_v2_udp_dport;
1: -	__be32 roce_flags;
1: -	__be32 rsvd4[25];
1: -	__be16 rsvd5;
1: -	u8 rsvd6;
1: -	u8 rx_checksum_val;
1: +  __be32 update_flags;
1: +  __be32 rsvd1[3];
1: +  __be16 vxlan_udp_dport;
1: +  __be16 rsvd2;
1: +  __be16 roce_v2_entropy;
1: +  __be16 roce_v2_udp_dport;
1: +  __be32 roce_flags;
1: +  __be32 rsvd4[25];
1: +  __be16 rsvd5;
1: +  u8 rsvd6;
1: +  u8 rx_checksum_val;
1:  };
1:  
1:  enum {
1: -	ADD_TO_MCG = 38,
1: +  ADD_TO_MCG = 38,
1:  };
1:  
1:  enum mlx4_access_reg_masks {
1: -	MLX4_ACCESS_REG_STATUS_MASK = 127,
1: -	MLX4_ACCESS_REG_METHOD_MASK = 127,
1: -	MLX4_ACCESS_REG_LEN_MASK = 2047,
1: +  MLX4_ACCESS_REG_STATUS_MASK = 127,
1: +  MLX4_ACCESS_REG_METHOD_MASK = 127,
1: +  MLX4_ACCESS_REG_LEN_MASK = 2047,
1:  };
1:  
1:  struct mlx4_access_reg {
1: -	__be16 constant1;
1: -	u8 status;
1: -	u8 resrvd1;
1: -	__be16 reg_id;
1: -	u8 method;
1: -	u8 constant2;
1: -	__be32 resrvd2[2];
1: -	__be16 len_const;
1: -	__be16 resrvd3;
1: -	u8 reg_data[4076];
1: +  __be16 constant1;
1: +  u8 status;
1: +  u8 resrvd1;
1: +  __be16 reg_id;
1: +  u8 method;
1: +  u8 constant2;
1: +  __be32 resrvd2[2];
1: +  __be16 len_const;
1: +  __be16 resrvd3;
1: +  u8 reg_data[4076];
1:  };
1:  
1:  enum mlx4_reg_id {
1: -	MLX4_REG_ID_PTYS = 20484,
1: +  MLX4_REG_ID_PTYS = 20484,
1:  };
1:  
1:  enum {
1: -	MLX4_ALLOCATE_VPP_ALLOCATE = 0,
1: -	MLX4_ALLOCATE_VPP_QUERY = 1,
1: +  MLX4_ALLOCATE_VPP_ALLOCATE = 0,
1: +  MLX4_ALLOCATE_VPP_QUERY = 1,
1:  };
1:  
1:  enum {
1: -	MLX4_SET_VPORT_QOS_SET = 0,
1: -	MLX4_SET_VPORT_QOS_QUERY = 1,
1: +  MLX4_SET_VPORT_QOS_SET = 0,
1: +  MLX4_SET_VPORT_QOS_QUERY = 1,
1:  };
1:  
1:  struct mlx4_set_port_prio2tc_context {
1: -	u8 prio2tc[4];
1: +  u8 prio2tc[4];
1:  };
1:  
1:  struct mlx4_port_scheduler_tc_cfg_be {
1: -	__be16 pg;
1: -	__be16 bw_precentage;
1: -	__be16 max_bw_units;
1: -	__be16 max_bw_value;
1: +  __be16 pg;
1: +  __be16 bw_precentage;
1: +  __be16 max_bw_units;
1: +  __be16 max_bw_value;
1:  };
1:  
1:  struct mlx4_set_port_scheduler_context {
1: -	struct mlx4_port_scheduler_tc_cfg_be tc[8];
1: +  struct mlx4_port_scheduler_tc_cfg_be tc[8];
1:  };
1:  
1:  struct mlx4_alloc_vpp_param {
1: -	__be32 available_vpp;
1: -	__be32 vpp_p_up[8];
1: +  __be32 available_vpp;
1: +  __be32 vpp_p_up[8];
1:  };
1:  
1:  struct mlx4_prio_qos_param {
1: -	__be32 bw_share;
1: -	__be32 max_avg_bw;
1: -	__be32 reserved;
1: -	__be32 enable;
1: -	__be32 reserved1[4];
1: +  __be32 bw_share;
1: +  __be32 max_avg_bw;
1: +  __be32 reserved;
1: +  __be32 enable;
1: +  __be32 reserved1[4];
1:  };
1:  
1:  struct mlx4_set_vport_context {
1: -	__be32 reserved[8];
1: -	struct mlx4_prio_qos_param qos_p_up[8];
1: +  __be32 reserved[8];
1: +  struct mlx4_prio_qos_param qos_p_up[8];
1:  };
1:  
1:  enum {
1: -	MLX4_ICM_ALLOC_SIZE = 262144,
1: -	MLX4_TABLE_CHUNK_SIZE = 262144,
1: +  MLX4_ICM_ALLOC_SIZE = 262144,
1: +  MLX4_TABLE_CHUNK_SIZE = 262144,
1:  };
1:  
1:  enum mlx4_protocol {
1: -	MLX4_PROT_IB_IPV6 = 0,
1: -	MLX4_PROT_ETH = 1,
1: -	MLX4_PROT_IB_IPV4 = 2,
1: -	MLX4_PROT_FCOE = 3,
1: +  MLX4_PROT_IB_IPV6 = 0,
1: +  MLX4_PROT_ETH = 1,
1: +  MLX4_PROT_IB_IPV4 = 2,
1: +  MLX4_PROT_FCOE = 3,
1:  };
1:  
1:  enum {
1: -	MLX4_INTFF_BONDING = 1,
1: +  MLX4_INTFF_BONDING = 1,
1:  };
1:  
1:  struct mlx4_interface {
1: -	void * (*add)(struct mlx4_dev *);
1: -	void (*remove)(struct mlx4_dev *, void *);
1: -	void (*event)(struct mlx4_dev *, void *, enum mlx4_dev_event, long unsigned int);
1: -	void * (*get_dev)(struct mlx4_dev *, void *, u8);
1: -	void (*activate)(struct mlx4_dev *, void *);
1: -	struct list_head list;
1: -	enum mlx4_protocol protocol;
1: -	int flags;
1: +  void *(*add)(struct mlx4_dev *);
1: +  void (*remove)(struct mlx4_dev *, void *);
1: +  void (*event)(struct mlx4_dev *, void *, enum mlx4_dev_event,
1: +                long unsigned int);
1: +  void *(*get_dev)(struct mlx4_dev *, void *, u8);
1: +  void (*activate)(struct mlx4_dev *, void *);
1: +  struct list_head list;
1: +  enum mlx4_protocol protocol;
1: +  int flags;
1:  };
1:  
1:  struct mlx4_device_context {
1: -	struct list_head list;
1: -	struct list_head bond_list;
1: -	struct mlx4_interface *intf;
1: -	void *context;
1: +  struct list_head list;
1: +  struct list_head bond_list;
1: +  struct mlx4_interface *intf;
1: +  void *context;
1:  };
1:  
1:  struct io_mapping {
1: -	resource_size_t base;
1: -	long unsigned int size;
1: -	pgprot_t prot;
1: -	void *iomem;
1: +  resource_size_t base;
1: +  long unsigned int size;
1: +  pgprot_t prot;
1: +  void *iomem;
1:  };
1:  
1:  enum devlink_param_cmode {
1: -	DEVLINK_PARAM_CMODE_RUNTIME = 0,
1: -	DEVLINK_PARAM_CMODE_DRIVERINIT = 1,
1: -	DEVLINK_PARAM_CMODE_PERMANENT = 2,
1: -	__DEVLINK_PARAM_CMODE_MAX = 3,
1: -	DEVLINK_PARAM_CMODE_MAX = 2,
1: +  DEVLINK_PARAM_CMODE_RUNTIME = 0,
1: +  DEVLINK_PARAM_CMODE_DRIVERINIT = 1,
1: +  DEVLINK_PARAM_CMODE_PERMANENT = 2,
1: +  __DEVLINK_PARAM_CMODE_MAX = 3,
1: +  DEVLINK_PARAM_CMODE_MAX = 2,
1:  };
1:  
1:  enum devlink_param_type {
1: -	DEVLINK_PARAM_TYPE_U8 = 0,
1: -	DEVLINK_PARAM_TYPE_U16 = 1,
1: -	DEVLINK_PARAM_TYPE_U32 = 2,
1: -	DEVLINK_PARAM_TYPE_STRING = 3,
1: -	DEVLINK_PARAM_TYPE_BOOL = 4,
1: +  DEVLINK_PARAM_TYPE_U8 = 0,
1: +  DEVLINK_PARAM_TYPE_U16 = 1,
1: +  DEVLINK_PARAM_TYPE_U32 = 2,
1: +  DEVLINK_PARAM_TYPE_STRING = 3,
1: +  DEVLINK_PARAM_TYPE_BOOL = 4,
1:  };
1:  
1:  union devlink_param_value {
1: -	u8 vu8;
1: -	u16 vu16;
1: -	u32 vu32;
1: -	char vstr[32];
1: -	bool vbool;
1: +  u8 vu8;
1: +  u16 vu16;
1: +  u32 vu32;
1: +  char vstr[32];
1: +  bool vbool;
1:  };
1:  
1:  struct devlink_param_gset_ctx {
1: -	union devlink_param_value val;
1: -	enum devlink_param_cmode cmode;
1: +  union devlink_param_value val;
1: +  enum devlink_param_cmode cmode;
1:  };
1:  
1:  struct devlink_param {
1: -	u32 id;
1: -	const char *name;
1: -	bool generic;
1: -	enum devlink_param_type type;
1: -	long unsigned int supported_cmodes;
1: -	int (*get)(struct devlink *, u32, struct devlink_param_gset_ctx *);
1: -	int (*set)(struct devlink *, u32, struct devlink_param_gset_ctx *);
1: -	int (*validate)(struct devlink *, u32, union devlink_param_value, struct netlink_ext_ack *);
1: +  u32 id;
1: +  const char *name;
1: +  bool generic;
1: +  enum devlink_param_type type;
1: +  long unsigned int supported_cmodes;
1: +  int (*get)(struct devlink *, u32, struct devlink_param_gset_ctx *);
1: +  int (*set)(struct devlink *, u32, struct devlink_param_gset_ctx *);
1: +  int (*validate)(struct devlink *, u32, union devlink_param_value,
1: +                  struct netlink_ext_ack *);
1:  };
1:  
1:  enum devlink_param_generic_id {
1: -	DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET = 0,
1: -	DEVLINK_PARAM_GENERIC_ID_MAX_MACS = 1,
1: -	DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV = 2,
1: -	DEVLINK_PARAM_GENERIC_ID_REGION_SNAPSHOT = 3,
1: -	DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI = 4,
1: -	DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX = 5,
1: -	DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN = 6,
1: -	DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY = 7,
1: -	DEVLINK_PARAM_GENERIC_ID_RESET_DEV_ON_DRV_PROBE = 8,
1: -	DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE = 9,
1: -	DEVLINK_PARAM_GENERIC_ID_ENABLE_REMOTE_DEV_RESET = 10,
1: -	__DEVLINK_PARAM_GENERIC_ID_MAX = 11,
1: -	DEVLINK_PARAM_GENERIC_ID_MAX = 10,
1: +  DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET = 0,
1: +  DEVLINK_PARAM_GENERIC_ID_MAX_MACS = 1,
1: +  DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV = 2,
1: +  DEVLINK_PARAM_GENERIC_ID_REGION_SNAPSHOT = 3,
1: +  DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI = 4,
1: +  DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX = 5,
1: +  DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN = 6,
1: +  DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY = 7,
1: +  DEVLINK_PARAM_GENERIC_ID_RESET_DEV_ON_DRV_PROBE = 8,
1: +  DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE = 9,
1: +  DEVLINK_PARAM_GENERIC_ID_ENABLE_REMOTE_DEV_RESET = 10,
1: +  __DEVLINK_PARAM_GENERIC_ID_MAX = 11,
1: +  DEVLINK_PARAM_GENERIC_ID_MAX = 10,
1:  };
1:  
1:  enum {
1: -	MLX4_TUNNEL_OFFLOAD_MODE_NONE = 0,
1: -	MLX4_TUNNEL_OFFLOAD_MODE_VXLAN = 1,
1: +  MLX4_TUNNEL_OFFLOAD_MODE_NONE = 0,
1: +  MLX4_TUNNEL_OFFLOAD_MODE_VXLAN = 1,
1:  };
1:  
1:  enum {
1: -	MLX4_RESERVE_A0_QP = 64,
1: -	MLX4_RESERVE_ETH_BF_QP = 128,
1: +  MLX4_RESERVE_A0_QP = 64,
1: +  MLX4_RESERVE_ETH_BF_QP = 128,
1:  };
1:  
1:  enum {
1: -	MLX4_FUNC_CAP_64B_EQE_CQE = 1,
1: -	MLX4_FUNC_CAP_EQE_CQE_STRIDE = 2,
1: -	MLX4_FUNC_CAP_DMFS_A0_STATIC = 4,
1: +  MLX4_FUNC_CAP_64B_EQE_CQE = 1,
1: +  MLX4_FUNC_CAP_EQE_CQE_STRIDE = 2,
1: +  MLX4_FUNC_CAP_DMFS_A0_STATIC = 4,
1:  };
1:  
1:  enum mlx4_resource_usage {
1: -	MLX4_RES_USAGE_NONE = 0,
1: -	MLX4_RES_USAGE_DRIVER = 1,
1: -	MLX4_RES_USAGE_USER_VERBS = 2,
1: +  MLX4_RES_USAGE_NONE = 0,
1: +  MLX4_RES_USAGE_DRIVER = 1,
1: +  MLX4_RES_USAGE_USER_VERBS = 2,
1:  };
1:  
1:  enum {
1: -	MLX4_NUM_FEXCH = 65536,
1: +  MLX4_NUM_FEXCH = 65536,
1:  };
1:  
1:  struct mlx4_clock_params {
1: -	u64 offset;
1: -	u8 bar;
1: -	u8 size;
1: +  u64 offset;
1: +  u8 bar;
1: +  u8 size;
1:  };
1:  
1:  enum {
1: -	MLX4_DOMAIN_UVERBS = 4096,
1: -	MLX4_DOMAIN_ETHTOOL = 8192,
1: -	MLX4_DOMAIN_RFS = 12288,
1: -	MLX4_DOMAIN_NIC = 20480,
1: +  MLX4_DOMAIN_UVERBS = 4096,
1: +  MLX4_DOMAIN_ETHTOOL = 8192,
1: +  MLX4_DOMAIN_RFS = 12288,
1: +  MLX4_DOMAIN_NIC = 20480,
1:  };
1:  
1:  struct mlx4_net_trans_rule_hw_ctrl {
1: -	__be16 prio;
1: -	u8 type;
1: -	u8 flags;
1: -	u8 rsvd1;
1: -	u8 funcid;
1: -	u8 vep;
1: -	u8 port;
1: -	__be32 qpn;
1: -	__be32 rsvd2;
1: +  __be16 prio;
1: +  u8 type;
1: +  u8 flags;
1: +  u8 rsvd1;
1: +  u8 funcid;
1: +  u8 vep;
1: +  u8 port;
1: +  __be32 qpn;
1: +  __be32 rsvd2;
1:  };
1:  
1:  struct mlx4_net_trans_rule_hw_ib {
1: -	u8 size;
1: -	u8 rsvd1;
1: -	__be16 id;
1: -	u32 rsvd2;
1: -	__be32 l3_qpn;
1: -	__be32 qpn_mask;
1: -	u8 dst_gid[16];
1: -	u8 dst_gid_msk[16];
1: +  u8 size;
1: +  u8 rsvd1;
1: +  __be16 id;
1: +  u32 rsvd2;
1: +  __be32 l3_qpn;
1: +  __be32 qpn_mask;
1: +  u8 dst_gid[16];
1: +  u8 dst_gid_msk[16];
1:  };
1:  
1:  struct mlx4_net_trans_rule_hw_eth {
1: -	u8 size;
1: -	u8 rsvd;
1: -	__be16 id;
1: -	u8 rsvd1[6];
1: -	u8 dst_mac[6];
1: -	u16 rsvd2;
1: -	u8 dst_mac_msk[6];
1: -	u16 rsvd3;
1: -	u8 src_mac[6];
1: -	u16 rsvd4;
1: -	u8 src_mac_msk[6];
1: -	u8 rsvd5;
1: -	u8 ether_type_enable;
1: -	__be16 ether_type;
1: -	__be16 vlan_tag_msk;
1: -	__be16 vlan_tag;
1: +  u8 size;
1: +  u8 rsvd;
1: +  __be16 id;
1: +  u8 rsvd1[6];
1: +  u8 dst_mac[6];
1: +  u16 rsvd2;
1: +  u8 dst_mac_msk[6];
1: +  u16 rsvd3;
1: +  u8 src_mac[6];
1: +  u16 rsvd4;
1: +  u8 src_mac_msk[6];
1: +  u8 rsvd5;
1: +  u8 ether_type_enable;
1: +  __be16 ether_type;
1: +  __be16 vlan_tag_msk;
1: +  __be16 vlan_tag;
1:  };
1:  
1:  struct mlx4_net_trans_rule_hw_tcp_udp {
1: -	u8 size;
1: -	u8 rsvd;
1: -	__be16 id;
1: -	__be16 rsvd1[3];
1: -	__be16 dst_port;
1: -	__be16 rsvd2;
1: -	__be16 dst_port_msk;
1: -	__be16 rsvd3;
1: -	__be16 src_port;
1: -	__be16 rsvd4;
1: -	__be16 src_port_msk;
1: +  u8 size;
1: +  u8 rsvd;
1: +  __be16 id;
1: +  __be16 rsvd1[3];
1: +  __be16 dst_port;
1: +  __be16 rsvd2;
1: +  __be16 dst_port_msk;
1: +  __be16 rsvd3;
1: +  __be16 src_port;
1: +  __be16 rsvd4;
1: +  __be16 src_port_msk;
1:  };
1:  
1:  struct mlx4_net_trans_rule_hw_ipv4 {
1: -	u8 size;
1: -	u8 rsvd;
1: -	__be16 id;
1: -	__be32 rsvd1;
1: -	__be32 dst_ip;
1: -	__be32 dst_ip_msk;
1: -	__be32 src_ip;
1: -	__be32 src_ip_msk;
1: +  u8 size;
1: +  u8 rsvd;
1: +  __be16 id;
1: +  __be32 rsvd1;
1: +  __be32 dst_ip;
1: +  __be32 dst_ip_msk;
1: +  __be32 src_ip;
1: +  __be32 src_ip_msk;
1:  };
1:  
1:  struct mlx4_net_trans_rule_hw_vxlan {
1: -	u8 size;
1: -	u8 rsvd;
1: -	__be16 id;
1: -	__be32 rsvd1;
1: -	__be32 vni;
1: -	__be32 vni_mask;
1: +  u8 size;
1: +  u8 rsvd;
1: +  __be16 id;
1: +  __be32 rsvd1;
1: +  __be32 vni;
1: +  __be32 vni_mask;
1:  };
1:  
1:  struct _rule_hw {
1: -	union {
1: -		struct {
1: -			u8 size;
1: -			u8 rsvd;
1: -			__be16 id;
1: -		};
1: -		struct mlx4_net_trans_rule_hw_eth eth;
1: -		struct mlx4_net_trans_rule_hw_ib ib;
1: -		struct mlx4_net_trans_rule_hw_ipv4 ipv4;
1: -		struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
1: -		struct mlx4_net_trans_rule_hw_vxlan vxlan;
1: -	};
1: +  union {
1: +    struct {
1: +      u8 size;
1: +      u8 rsvd;
1: +      __be16 id;
1: +    };
1: +    struct mlx4_net_trans_rule_hw_eth eth;
1: +    struct mlx4_net_trans_rule_hw_ib ib;
1: +    struct mlx4_net_trans_rule_hw_ipv4 ipv4;
1: +    struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
1: +    struct mlx4_net_trans_rule_hw_vxlan vxlan;
1: +  };
1:  };
1:  
1:  enum {
1: -	MLX4_NUM_PDS = 32768,
1: +  MLX4_NUM_PDS = 32768,
1:  };
1:  
1:  enum {
1: -	MLX4_CMPT_SHIFT = 24,
1: -	MLX4_NUM_CMPTS = 67108864,
1: +  MLX4_CMPT_SHIFT = 24,
1: +  MLX4_NUM_CMPTS = 67108864,
1:  };
1:  
1:  enum mlx4_res_tracker_free_type {
1: -	RES_TR_FREE_ALL = 0,
1: -	RES_TR_FREE_SLAVES_ONLY = 1,
1: -	RES_TR_FREE_STRUCTS_ONLY = 2,
1: +  RES_TR_FREE_ALL = 0,
1: +  RES_TR_FREE_SLAVES_ONLY = 1,
1: +  RES_TR_FREE_STRUCTS_ONLY = 2,
1:  };
1:  
1:  struct mlx4_profile {
1: -	int num_qp;
1: -	int rdmarc_per_qp;
1: -	int num_srq;
1: -	int num_cq;
1: -	int num_mcg;
1: -	int num_mpt;
1: -	unsigned int num_mtt;
1: +  int num_qp;
1: +  int rdmarc_per_qp;
1: +  int num_srq;
1: +  int num_cq;
1: +  int num_mcg;
1: +  int num_mpt;
1: +  unsigned int num_mtt;
1:  };
1:  
1:  struct mlx4_promisc_qp {
1: -	struct list_head list;
1: -	u32 qpn;
1: +  struct list_head list;
1: +  u32 qpn;
1:  };
1:  
1:  struct mlx4_steer_index {
1: -	struct list_head list;
1: -	unsigned int index;
1: -	struct list_head duplicates;
1: +  struct list_head list;
1: +  unsigned int index;
1: +  struct list_head duplicates;
1:  };
1:  
1:  enum {
1: -	MLX4_PCI_DEV_IS_VF = 1,
1: -	MLX4_PCI_DEV_FORCE_SENSE_PORT = 2,
1: +  MLX4_PCI_DEV_IS_VF = 1,
1: +  MLX4_PCI_DEV_FORCE_SENSE_PORT = 2,
1:  };
1:  
1:  enum mlx4_devlink_param_id {
1: -	MLX4_DEVLINK_PARAM_ID_BASE = 10,
1: -	MLX4_DEVLINK_PARAM_ID_ENABLE_64B_CQE_EQE = 11,
1: -	MLX4_DEVLINK_PARAM_ID_ENABLE_4K_UAR = 12,
1: +  MLX4_DEVLINK_PARAM_ID_BASE = 10,
1: +  MLX4_DEVLINK_PARAM_ID_ENABLE_64B_CQE_EQE = 11,
1: +  MLX4_DEVLINK_PARAM_ID_ENABLE_4K_UAR = 12,
1:  };
1:  
1:  enum {
1: -	MLX4_QUERY_FUNC_NUM_SYS_EQS = 1,
1: +  MLX4_QUERY_FUNC_NUM_SYS_EQS = 1,
1:  };
1:  
1:  enum ibta_mtu {
1: -	IB_MTU_256___2 = 1,
1: -	IB_MTU_512___2 = 2,
1: -	IB_MTU_1024___2 = 3,
1: -	IB_MTU_2048___2 = 4,
1: -	IB_MTU_4096___2 = 5,
1: +  IB_MTU_256___2 = 1,
1: +  IB_MTU_512___2 = 2,
1: +  IB_MTU_1024___2 = 3,
1: +  IB_MTU_2048___2 = 4,
1: +  IB_MTU_4096___2 = 5,
1:  };
1:  
1:  enum {
1: -	MLX4_DEV_CAP_CHECK_NUM_VFS_ABOVE_64 = 4294967295,
1: +  MLX4_DEV_CAP_CHECK_NUM_VFS_ABOVE_64 = 4294967295,
1:  };
1:  
1:  enum mlx4_net_trans_rule_id {
1: -	MLX4_NET_TRANS_RULE_ID_ETH = 0,
1: -	MLX4_NET_TRANS_RULE_ID_IB = 1,
1: -	MLX4_NET_TRANS_RULE_ID_IPV6 = 2,
1: -	MLX4_NET_TRANS_RULE_ID_IPV4 = 3,
1: -	MLX4_NET_TRANS_RULE_ID_TCP = 4,
1: -	MLX4_NET_TRANS_RULE_ID_UDP = 5,
1: -	MLX4_NET_TRANS_RULE_ID_VXLAN = 6,
1: -	MLX4_NET_TRANS_RULE_NUM = 7,
1: +  MLX4_NET_TRANS_RULE_ID_ETH = 0,
1: +  MLX4_NET_TRANS_RULE_ID_IB = 1,
1: +  MLX4_NET_TRANS_RULE_ID_IPV6 = 2,
1: +  MLX4_NET_TRANS_RULE_ID_IPV4 = 3,
1: +  MLX4_NET_TRANS_RULE_ID_TCP = 4,
1: +  MLX4_NET_TRANS_RULE_ID_UDP = 5,
1: +  MLX4_NET_TRANS_RULE_ID_VXLAN = 6,
1: +  MLX4_NET_TRANS_RULE_NUM = 7,
1:  };
1:  
1:  enum mlx4_net_trans_promisc_mode {
1: -	MLX4_FS_REGULAR = 1,
1: -	MLX4_FS_ALL_DEFAULT = 2,
1: -	MLX4_FS_MC_DEFAULT = 3,
1: -	MLX4_FS_MIRROR_RX_PORT = 4,
1: -	MLX4_FS_MIRROR_SX_PORT = 5,
1: -	MLX4_FS_UC_SNIFFER = 6,
1: -	MLX4_FS_MC_SNIFFER = 7,
1: -	MLX4_FS_MODE_NUM = 8,
1: +  MLX4_FS_REGULAR = 1,
1: +  MLX4_FS_ALL_DEFAULT = 2,
1: +  MLX4_FS_MC_DEFAULT = 3,
1: +  MLX4_FS_MIRROR_RX_PORT = 4,
1: +  MLX4_FS_MIRROR_SX_PORT = 5,
1: +  MLX4_FS_UC_SNIFFER = 6,
1: +  MLX4_FS_MC_SNIFFER = 7,
1: +  MLX4_FS_MODE_NUM = 8,
1:  };
1:  
1:  struct mlx4_spec_eth {
1: -	u8 dst_mac[6];
1: -	u8 dst_mac_msk[6];
1: -	u8 src_mac[6];
1: -	u8 src_mac_msk[6];
1: -	u8 ether_type_enable;
1: -	__be16 ether_type;
1: -	__be16 vlan_id_msk;
1: -	__be16 vlan_id;
1: +  u8 dst_mac[6];
1: +  u8 dst_mac_msk[6];
1: +  u8 src_mac[6];
1: +  u8 src_mac_msk[6];
1: +  u8 ether_type_enable;
1: +  __be16 ether_type;
1: +  __be16 vlan_id_msk;
1: +  __be16 vlan_id;
1:  };
1:  
1:  struct mlx4_spec_tcp_udp {
1: -	__be16 dst_port;
1: -	__be16 dst_port_msk;
1: -	__be16 src_port;
1: -	__be16 src_port_msk;
1: +  __be16 dst_port;
1: +  __be16 dst_port_msk;
1: +  __be16 src_port;
1: +  __be16 src_port_msk;
1:  };
1:  
1:  struct mlx4_spec_ipv4 {
1: -	__be32 dst_ip;
1: -	__be32 dst_ip_msk;
1: -	__be32 src_ip;
1: -	__be32 src_ip_msk;
1: +  __be32 dst_ip;
1: +  __be32 dst_ip_msk;
1: +  __be32 src_ip;
1: +  __be32 src_ip_msk;
1:  };
1:  
1:  struct mlx4_spec_ib {
1: -	__be32 l3_qpn;
1: -	__be32 qpn_msk;
1: -	u8 dst_gid[16];
1: -	u8 dst_gid_msk[16];
1: +  __be32 l3_qpn;
1: +  __be32 qpn_msk;
1: +  u8 dst_gid[16];
1: +  u8 dst_gid_msk[16];
1:  };
1:  
1:  struct mlx4_spec_vxlan {
1: -	__be32 vni;
1: -	__be32 vni_mask;
1: +  __be32 vni;
1: +  __be32 vni_mask;
1:  };
1:  
1:  struct mlx4_spec_list {
1: -	struct list_head list;
1: -	enum mlx4_net_trans_rule_id id;
1: -	union {
1: -		struct mlx4_spec_eth eth;
1: -		struct mlx4_spec_ib ib;
1: -		struct mlx4_spec_ipv4 ipv4;
1: -		struct mlx4_spec_tcp_udp tcp_udp;
1: -		struct mlx4_spec_vxlan vxlan;
1: -	};
1: +  struct list_head list;
1: +  enum mlx4_net_trans_rule_id id;
1: +  union {
1: +    struct mlx4_spec_eth eth;
1: +    struct mlx4_spec_ib ib;
1: +    struct mlx4_spec_ipv4 ipv4;
1: +    struct mlx4_spec_tcp_udp tcp_udp;
1: +    struct mlx4_spec_vxlan vxlan;
1: +  };
1:  };
1:  
1:  enum mlx4_net_trans_hw_rule_queue {
1: -	MLX4_NET_TRANS_Q_FIFO = 0,
1: -	MLX4_NET_TRANS_Q_LIFO = 1,
1: +  MLX4_NET_TRANS_Q_FIFO = 0,
1: +  MLX4_NET_TRANS_Q_LIFO = 1,
1:  };
1:  
1:  struct mlx4_net_trans_rule {
1: -	struct list_head list;
1: -	enum mlx4_net_trans_hw_rule_queue queue_mode;
1: -	bool exclusive;
1: -	bool allow_loopback;
1: -	enum mlx4_net_trans_promisc_mode promisc_mode;
1: -	u8 port;
1: -	u16 priority;
1: -	u32 qpn;
1: +  struct list_head list;
1: +  enum mlx4_net_trans_hw_rule_queue queue_mode;
1: +  bool exclusive;
1: +  bool allow_loopback;
1: +  enum mlx4_net_trans_promisc_mode promisc_mode;
1: +  u8 port;
1: +  u16 priority;
1: +  u32 qpn;
1:  };
1:  
1:  enum {
1: -	MLX4_PERM_LOCAL_READ = 1024,
1: -	MLX4_PERM_LOCAL_WRITE = 2048,
1: -	MLX4_PERM_REMOTE_READ = 4096,
1: -	MLX4_PERM_REMOTE_WRITE = 8192,
1: -	MLX4_PERM_ATOMIC = 16384,
1: -	MLX4_PERM_BIND_MW = 32768,
1: -	MLX4_PERM_MASK = 64512,
1: +  MLX4_PERM_LOCAL_READ = 1024,
1: +  MLX4_PERM_LOCAL_WRITE = 2048,
1: +  MLX4_PERM_REMOTE_READ = 4096,
1: +  MLX4_PERM_REMOTE_WRITE = 8192,
1: +  MLX4_PERM_ATOMIC = 16384,
1: +  MLX4_PERM_BIND_MW = 32768,
1: +  MLX4_PERM_MASK = 64512,
1:  };
1:  
1:  enum {
1: -	MLX4_MTT_FLAG_PRESENT = 1,
1: +  MLX4_MTT_FLAG_PRESENT = 1,
1:  };
1:  
1:  struct mlx4_mr {
1: -	struct mlx4_mtt mtt;
1: -	u64 iova;
1: -	u64 size;
1: -	u32 key;
1: -	u32 pd;
1: -	u32 access;
1: -	int enabled;
1: +  struct mlx4_mtt mtt;
1: +  u64 iova;
1: +  u64 size;
1: +  u32 key;
1: +  u32 pd;
1: +  u32 access;
1: +  int enabled;
1:  };
1:  
1:  enum mlx4_mw_type {
1: -	MLX4_MW_TYPE_1 = 1,
1: -	MLX4_MW_TYPE_2 = 2,
1: +  MLX4_MW_TYPE_1 = 1,
1: +  MLX4_MW_TYPE_2 = 2,
1:  };
1:  
1:  struct mlx4_mw {
1: -	u32 key;
1: -	u32 pd;
1: -	enum mlx4_mw_type type;
1: -	int enabled;
1: +  u32 key;
1: +  u32 pd;
1: +  enum mlx4_mw_type type;
1: +  int enabled;
1:  };
1:  
1:  enum mlx4_mpt_state {
1: -	MLX4_MPT_DISABLED = 0,
1: -	MLX4_MPT_EN_HW = 1,
1: -	MLX4_MPT_EN_SW = 2,
1: +  MLX4_MPT_DISABLED = 0,
1: +  MLX4_MPT_EN_HW = 1,
1: +  MLX4_MPT_EN_SW = 2,
1:  };
1:  
1:  struct mlx4_mpt_entry {
1: -	__be32 flags;
1: -	__be32 qpn;
1: -	__be32 key;
1: -	__be32 pd_flags;
1: -	__be64 start;
1: -	__be64 length;
1: -	__be32 lkey;
1: -	__be32 win_cnt;
1: -	u8 reserved1[3];
1: -	u8 mtt_rep;
1: -	__be64 mtt_addr;
1: -	__be32 mtt_sz;
1: -	__be32 entity_size;
1: -	__be32 first_byte_offset;
1: +  __be32 flags;
1: +  __be32 qpn;
1: +  __be32 key;
1: +  __be32 pd_flags;
1: +  __be64 start;
1: +  __be64 length;
1: +  __be32 lkey;
1: +  __be32 win_cnt;
1: +  u8 reserved1[3];
1: +  u8 mtt_rep;
1: +  __be64 mtt_addr;
1: +  __be32 mtt_sz;
1: +  __be32 entity_size;
1: +  __be32 first_byte_offset;
1:  } __attribute__((packed));
1:  
1:  struct mlx4_bf {
1: -	unsigned int offset;
1: -	int buf_size;
1: -	struct mlx4_uar *uar;
1: -	void *reg;
1: +  unsigned int offset;
1: +  int buf_size;
1: +  struct mlx4_uar *uar;
1: +  void *reg;
1:  };
1:  
1:  enum {
1: -	MLX4_NUM_RESERVED_UARS = 8,
1: +  MLX4_NUM_RESERVED_UARS = 8,
1:  };
1:  
1:  enum {
1: -	MLX4_PORT_CAP_IS_SM = 2,
1: -	MLX4_PORT_CAP_DEV_MGMT_SUP = 524288,
1: +  MLX4_PORT_CAP_IS_SM = 2,
1: +  MLX4_PORT_CAP_DEV_MGMT_SUP = 524288,
1:  };
1:  
1:  enum mlx4_special_vlan_idx {
1: -	MLX4_NO_VLAN_IDX = 0,
1: -	MLX4_VLAN_MISS_IDX = 1,
1: -	MLX4_VLAN_REGULAR = 2,
1: +  MLX4_NO_VLAN_IDX = 0,
1: +  MLX4_VLAN_MISS_IDX = 1,
1: +  MLX4_VLAN_REGULAR = 2,
1:  };
1:  
1:  struct mlx4_mad_ifc {
1: -	u8 base_version;
1: -	u8 mgmt_class;
1: -	u8 class_version;
1: -	u8 method;
1: -	__be16 status;
1: -	__be16 class_specific;
1: -	__be64 tid;
1: -	__be16 attr_id;
1: -	__be16 resv;
1: -	__be32 attr_mod;
1: -	__be64 mkey;
1: -	__be16 dr_slid;
1: -	__be16 dr_dlid;
1: -	u8 reserved[28];
1: -	u8 data[192];
1: +  u8 base_version;
1: +  u8 mgmt_class;
1: +  u8 class_version;
1: +  u8 method;
1: +  __be16 status;
1: +  __be16 class_specific;
1: +  __be64 tid;
1: +  __be16 attr_id;
1: +  __be16 resv;
1: +  __be32 attr_mod;
1: +  __be64 mkey;
1: +  __be16 dr_slid;
1: +  __be16 dr_dlid;
1: +  u8 reserved[28];
1: +  u8 data[192];
1:  };
1:  
1:  enum {
1: -	MCAST_DIRECT_ONLY = 0,
1: -	MCAST_DIRECT = 1,
1: -	MCAST_DEFAULT = 2,
1: +  MCAST_DIRECT_ONLY = 0,
1: +  MCAST_DIRECT = 1,
1: +  MCAST_DEFAULT = 2,
1:  };
1:  
1:  struct mlx4_set_port_rqp_calc_context {
1: -	__be32 base_qpn;
1: -	u8 rererved;
1: -	u8 n_mac;
1: -	u8 n_vlan;
1: -	u8 n_prio;
1: -	u8 reserved2[3];
1: -	u8 mac_miss;
1: -	u8 intra_no_vlan;
1: -	u8 no_vlan;
1: -	u8 intra_vlan_miss;
1: -	u8 vlan_miss;
1: -	u8 reserved3[3];
1: -	u8 no_vlan_prio;
1: -	__be32 promisc;
1: -	__be32 mcast;
1: +  __be32 base_qpn;
1: +  u8 rererved;
1: +  u8 n_mac;
1: +  u8 n_vlan;
1: +  u8 n_prio;
1: +  u8 reserved2[3];
1: +  u8 mac_miss;
1: +  u8 intra_no_vlan;
1: +  u8 no_vlan;
1: +  u8 intra_vlan_miss;
1: +  u8 vlan_miss;
1: +  u8 reserved3[3];
1: +  u8 no_vlan_prio;
1: +  __be32 promisc;
1: +  __be32 mcast;
1:  };
1:  
1:  enum {
1: -	MLX4_SET_PORT_VL_CAP = 4,
1: -	MLX4_SET_PORT_MTU_CAP = 12,
1: -	MLX4_CHANGE_PORT_PKEY_TBL_SZ = 20,
1: -	MLX4_CHANGE_PORT_VL_CAP = 21,
1: -	MLX4_CHANGE_PORT_MTU_CAP = 22,
1: +  MLX4_SET_PORT_VL_CAP = 4,
1: +  MLX4_SET_PORT_MTU_CAP = 12,
1: +  MLX4_CHANGE_PORT_PKEY_TBL_SZ = 20,
1: +  MLX4_CHANGE_PORT_VL_CAP = 21,
1: +  MLX4_CHANGE_PORT_MTU_CAP = 22,
1:  };
1:  
1:  enum {
1: -	VXLAN_ENABLE_MODIFY = 128,
1: -	VXLAN_STEERING_MODIFY = 64,
1: -	VXLAN_ENABLE = 128,
1: +  VXLAN_ENABLE_MODIFY = 128,
1: +  VXLAN_STEERING_MODIFY = 64,
1: +  VXLAN_ENABLE = 128,
1:  };
1:  
1:  struct mlx4_set_port_vxlan_context {
1: -	u32 reserved1;
1: -	u8 modify_flags;
1: -	u8 reserved2;
1: -	u8 enable_flags;
1: -	u8 steering;
1: +  u32 reserved1;
1: +  u8 modify_flags;
1: +  u8 reserved2;
1: +  u8 enable_flags;
1: +  u8 steering;
1:  };
1:  
1:  struct mlx4_cable_info {
1: -	u8 i2c_addr;
1: -	u8 page_num;
1: -	__be16 dev_mem_address;
1: -	__be16 reserved1;
1: -	__be16 size;
1: -	__be32 reserved2[2];
1: -	u8 data[48];
1: +  u8 i2c_addr;
1: +  u8 page_num;
1: +  __be16 dev_mem_address;
1: +  __be16 reserved1;
1: +  __be16 size;
1: +  __be32 reserved2[2];
1: +  u8 data[48];
1:  };
1:  
1:  enum cable_info_err {
1: -	CABLE_INF_INV_PORT = 1,
1: -	CABLE_INF_OP_NOSUP = 2,
1: -	CABLE_INF_NOT_CONN = 3,
1: -	CABLE_INF_NO_EEPRM = 4,
1: -	CABLE_INF_PAGE_ERR = 5,
1: -	CABLE_INF_INV_ADDR = 6,
1: -	CABLE_INF_I2C_ADDR = 7,
1: -	CABLE_INF_QSFP_VIO = 8,
1: -	CABLE_INF_I2C_BUSY = 9,
1: -};
1: -
1: -enum {
1: -	MLX4_RES_QP = 0,
1: -	MLX4_RES_RDMARC = 1,
1: -	MLX4_RES_ALTC = 2,
1: -	MLX4_RES_AUXC = 3,
1: -	MLX4_RES_SRQ = 4,
1: -	MLX4_RES_CQ = 5,
1: -	MLX4_RES_EQ = 6,
1: -	MLX4_RES_DMPT = 7,
1: -	MLX4_RES_CMPT = 8,
1: -	MLX4_RES_MTT = 9,
1: -	MLX4_RES_MCG = 10,
1: -	MLX4_RES_NUM = 11,
1: +  CABLE_INF_INV_PORT = 1,
1: +  CABLE_INF_OP_NOSUP = 2,
1: +  CABLE_INF_NOT_CONN = 3,
1: +  CABLE_INF_NO_EEPRM = 4,
1: +  CABLE_INF_PAGE_ERR = 5,
1: +  CABLE_INF_INV_ADDR = 6,
1: +  CABLE_INF_I2C_ADDR = 7,
1: +  CABLE_INF_QSFP_VIO = 8,
1: +  CABLE_INF_I2C_BUSY = 9,
1: +};
1: +
1: +enum {
1: +  MLX4_RES_QP = 0,
1: +  MLX4_RES_RDMARC = 1,
1: +  MLX4_RES_ALTC = 2,
1: +  MLX4_RES_AUXC = 3,
1: +  MLX4_RES_SRQ = 4,
1: +  MLX4_RES_CQ = 5,
1: +  MLX4_RES_EQ = 6,
1: +  MLX4_RES_DMPT = 7,
1: +  MLX4_RES_CMPT = 8,
1: +  MLX4_RES_MTT = 9,
1: +  MLX4_RES_MCG = 10,
1: +  MLX4_RES_NUM = 11,
1:  };
1:  
1:  struct mlx4_resource___2 {
1: -	u64 size;
1: -	u64 start;
1: -	int type;
1: -	u32 num;
1: -	int log_num;
1: +  u64 size;
1: +  u64 start;
1: +  int type;
1: +  u32 num;
1: +  int log_num;
1:  };
1:  
1:  enum mlx4_qp_optpar {
1: -	MLX4_QP_OPTPAR_ALT_ADDR_PATH = 1,
1: -	MLX4_QP_OPTPAR_RRE = 2,
1: -	MLX4_QP_OPTPAR_RAE = 4,
1: -	MLX4_QP_OPTPAR_RWE = 8,
1: -	MLX4_QP_OPTPAR_PKEY_INDEX = 16,
1: -	MLX4_QP_OPTPAR_Q_KEY = 32,
1: -	MLX4_QP_OPTPAR_RNR_TIMEOUT = 64,
1: -	MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH = 128,
1: -	MLX4_QP_OPTPAR_SRA_MAX = 256,
1: -	MLX4_QP_OPTPAR_RRA_MAX = 512,
1: -	MLX4_QP_OPTPAR_PM_STATE = 1024,
1: -	MLX4_QP_OPTPAR_RETRY_COUNT = 4096,
1: -	MLX4_QP_OPTPAR_RNR_RETRY = 8192,
1: -	MLX4_QP_OPTPAR_ACK_TIMEOUT = 16384,
1: -	MLX4_QP_OPTPAR_SCHED_QUEUE = 65536,
1: -	MLX4_QP_OPTPAR_COUNTER_INDEX = 1048576,
1: -	MLX4_QP_OPTPAR_VLAN_STRIPPING = 2097152,
1: +  MLX4_QP_OPTPAR_ALT_ADDR_PATH = 1,
1: +  MLX4_QP_OPTPAR_RRE = 2,
1: +  MLX4_QP_OPTPAR_RAE = 4,
1: +  MLX4_QP_OPTPAR_RWE = 8,
1: +  MLX4_QP_OPTPAR_PKEY_INDEX = 16,
1: +  MLX4_QP_OPTPAR_Q_KEY = 32,
1: +  MLX4_QP_OPTPAR_RNR_TIMEOUT = 64,
1: +  MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH = 128,
1: +  MLX4_QP_OPTPAR_SRA_MAX = 256,
1: +  MLX4_QP_OPTPAR_RRA_MAX = 512,
1: +  MLX4_QP_OPTPAR_PM_STATE = 1024,
1: +  MLX4_QP_OPTPAR_RETRY_COUNT = 4096,
1: +  MLX4_QP_OPTPAR_RNR_RETRY = 8192,
1: +  MLX4_QP_OPTPAR_ACK_TIMEOUT = 16384,
1: +  MLX4_QP_OPTPAR_SCHED_QUEUE = 65536,
1: +  MLX4_QP_OPTPAR_COUNTER_INDEX = 1048576,
1: +  MLX4_QP_OPTPAR_VLAN_STRIPPING = 2097152,
1:  };
1:  
1:  enum mlx4_qp_state {
1: -	MLX4_QP_STATE_RST = 0,
1: -	MLX4_QP_STATE_INIT = 1,
1: -	MLX4_QP_STATE_RTR = 2,
1: -	MLX4_QP_STATE_RTS = 3,
1: -	MLX4_QP_STATE_SQER = 4,
1: -	MLX4_QP_STATE_SQD = 5,
1: -	MLX4_QP_STATE_ERR = 6,
1: -	MLX4_QP_STATE_SQ_DRAINING = 7,
1: -	MLX4_QP_NUM_STATE = 8,
1: +  MLX4_QP_STATE_RST = 0,
1: +  MLX4_QP_STATE_INIT = 1,
1: +  MLX4_QP_STATE_RTR = 2,
1: +  MLX4_QP_STATE_RTS = 3,
1: +  MLX4_QP_STATE_SQER = 4,
1: +  MLX4_QP_STATE_SQD = 5,
1: +  MLX4_QP_STATE_ERR = 6,
1: +  MLX4_QP_STATE_SQ_DRAINING = 7,
1: +  MLX4_QP_NUM_STATE = 8,
1:  };
1:  
1:  enum {
1: -	MLX4_QP_BIT_SRE = 32768,
1: -	MLX4_QP_BIT_SWE = 16384,
1: -	MLX4_QP_BIT_SAE = 8192,
1: -	MLX4_QP_BIT_RRE = 32768,
1: -	MLX4_QP_BIT_RWE = 16384,
1: -	MLX4_QP_BIT_RAE = 8192,
1: -	MLX4_QP_BIT_FPP = 8,
1: -	MLX4_QP_BIT_RIC = 16,
1: +  MLX4_QP_BIT_SRE = 32768,
1: +  MLX4_QP_BIT_SWE = 16384,
1: +  MLX4_QP_BIT_SAE = 8192,
1: +  MLX4_QP_BIT_RRE = 32768,
1: +  MLX4_QP_BIT_RWE = 16384,
1: +  MLX4_QP_BIT_RAE = 8192,
1: +  MLX4_QP_BIT_FPP = 8,
1: +  MLX4_QP_BIT_RIC = 16,
1:  };
1:  
1:  struct mlx4_qp_path {
1: -	u8 fl;
1: -	union {
1: -		u8 vlan_control;
1: -		u8 control;
1: -	};
1: -	u8 disable_pkey_check;
1: -	u8 pkey_index;
1: -	u8 counter_index;
1: -	u8 grh_mylmc;
1: -	__be16 rlid;
1: -	u8 ackto;
1: -	u8 mgid_index;
1: -	u8 static_rate;
1: -	u8 hop_limit;
1: -	__be32 tclass_flowlabel;
1: -	u8 rgid[16];
1: -	u8 sched_queue;
1: -	u8 vlan_index;
1: -	u8 feup;
1: -	u8 fvl_rx;
1: -	u8 reserved4[2];
1: -	u8 dmac[6];
1: -};
1: -
1: -enum {
1: -	MLX4_FL_CV = 64,
1: -	MLX4_FL_SV = 32,
1: -	MLX4_FL_ETH_HIDE_CQE_VLAN = 4,
1: -	MLX4_FL_ETH_SRC_CHECK_MC_LB = 2,
1: -	MLX4_FL_ETH_SRC_CHECK_UC_LB = 1,
1: +  u8 fl;
1: +  union {
1: +    u8 vlan_control;
1: +    u8 control;
1: +  };
1: +  u8 disable_pkey_check;
1: +  u8 pkey_index;
1: +  u8 counter_index;
1: +  u8 grh_mylmc;
1: +  __be16 rlid;
1: +  u8 ackto;
1: +  u8 mgid_index;
1: +  u8 static_rate;
1: +  u8 hop_limit;
1: +  __be32 tclass_flowlabel;
1: +  u8 rgid[16];
1: +  u8 sched_queue;
1: +  u8 vlan_index;
1: +  u8 feup;
1: +  u8 fvl_rx;
1: +  u8 reserved4[2];
1: +  u8 dmac[6];
1: +};
1: +
1: +enum {
1: +  MLX4_FL_CV = 64,
1: +  MLX4_FL_SV = 32,
1: +  MLX4_FL_ETH_HIDE_CQE_VLAN = 4,
1: +  MLX4_FL_ETH_SRC_CHECK_MC_LB = 2,
1: +  MLX4_FL_ETH_SRC_CHECK_UC_LB = 1,
1:  };
1:  
1:  struct mlx4_qp_context {
1: -	__be32 flags;
1: -	__be32 pd;
1: -	u8 mtu_msgmax;
1: -	u8 rq_size_stride;
1: -	u8 sq_size_stride;
1: -	u8 rlkey_roce_mode;
1: -	__be32 usr_page;
1: -	__be32 local_qpn;
1: -	__be32 remote_qpn;
1: -	struct mlx4_qp_path pri_path;
1: -	struct mlx4_qp_path alt_path;
1: -	__be32 params1;
1: -	u32 reserved1;
1: -	__be32 next_send_psn;
1: -	__be32 cqn_send;
1: -	__be16 roce_entropy;
1: -	__be16 reserved2[3];
1: -	__be32 last_acked_psn;
1: -	__be32 ssn;
1: -	__be32 params2;
1: -	__be32 rnr_nextrecvpsn;
1: -	__be32 xrcd;
1: -	__be32 cqn_recv;
1: -	__be64 db_rec_addr;
1: -	__be32 qkey;
1: -	__be32 srqn;
1: -	__be32 msn;
1: -	__be16 rq_wqe_counter;
1: -	__be16 sq_wqe_counter;
1: -	u32 reserved3;
1: -	__be16 rate_limit_params;
1: -	u8 reserved4;
1: -	u8 qos_vport;
1: -	__be32 param3;
1: -	__be32 nummmcpeers_basemkey;
1: -	u8 log_page_size;
1: -	u8 reserved5[2];
1: -	u8 mtt_base_addr_h;
1: -	__be32 mtt_base_addr_l;
1: -	u32 reserved6[10];
1: +  __be32 flags;
1: +  __be32 pd;
1: +  u8 mtu_msgmax;
1: +  u8 rq_size_stride;
1: +  u8 sq_size_stride;
1: +  u8 rlkey_roce_mode;
1: +  __be32 usr_page;
1: +  __be32 local_qpn;
1: +  __be32 remote_qpn;
1: +  struct mlx4_qp_path pri_path;
1: +  struct mlx4_qp_path alt_path;
1: +  __be32 params1;
1: +  u32 reserved1;
1: +  __be32 next_send_psn;
1: +  __be32 cqn_send;
1: +  __be16 roce_entropy;
1: +  __be16 reserved2[3];
1: +  __be32 last_acked_psn;
1: +  __be32 ssn;
1: +  __be32 params2;
1: +  __be32 rnr_nextrecvpsn;
1: +  __be32 xrcd;
1: +  __be32 cqn_recv;
1: +  __be64 db_rec_addr;
1: +  __be32 qkey;
1: +  __be32 srqn;
1: +  __be32 msn;
1: +  __be16 rq_wqe_counter;
1: +  __be16 sq_wqe_counter;
1: +  u32 reserved3;
1: +  __be16 rate_limit_params;
1: +  u8 reserved4;
1: +  u8 qos_vport;
1: +  __be32 param3;
1: +  __be32 nummmcpeers_basemkey;
1: +  u8 log_page_size;
1: +  u8 reserved5[2];
1: +  u8 mtt_base_addr_h;
1: +  __be32 mtt_base_addr_l;
1: +  u32 reserved6[10];
1:  };
1:  
1:  struct mlx4_update_qp_context {
1: -	__be64 qp_mask;
1: -	__be64 primary_addr_path_mask;
1: -	__be64 secondary_addr_path_mask;
1: -	u64 reserved1;
1: -	struct mlx4_qp_context qp_context;
1: -	u64 reserved2[58];
1: +  __be64 qp_mask;
1: +  __be64 primary_addr_path_mask;
1: +  __be64 secondary_addr_path_mask;
1: +  u64 reserved1;
1: +  struct mlx4_qp_context qp_context;
1: +  u64 reserved2[58];
1:  };
1:  
1:  enum {
1: -	MLX4_UPD_QP_MASK_PM_STATE = 32,
1: -	MLX4_UPD_QP_MASK_VSD = 33,
1: -	MLX4_UPD_QP_MASK_QOS_VPP = 34,
1: -	MLX4_UPD_QP_MASK_RATE_LIMIT = 35,
1: +  MLX4_UPD_QP_MASK_PM_STATE = 32,
1: +  MLX4_UPD_QP_MASK_VSD = 33,
1: +  MLX4_UPD_QP_MASK_QOS_VPP = 34,
1: +  MLX4_UPD_QP_MASK_RATE_LIMIT = 35,
1:  };
1:  
1:  enum {
1: -	MLX4_UPD_QP_PATH_MASK_PKEY_INDEX = 32,
1: -	MLX4_UPD_QP_PATH_MASK_FSM = 33,
1: -	MLX4_UPD_QP_PATH_MASK_MAC_INDEX = 34,
1: -	MLX4_UPD_QP_PATH_MASK_FVL = 35,
1: -	MLX4_UPD_QP_PATH_MASK_CV = 36,
1: -	MLX4_UPD_QP_PATH_MASK_VLAN_INDEX = 37,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_HIDE_CQE_VLAN = 38,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_UNTAGGED = 39,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_1P = 40,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_TAGGED = 41,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_UNTAGGED = 42,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_1P = 43,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_TAGGED = 44,
1: -	MLX4_UPD_QP_PATH_MASK_FEUP = 45,
1: -	MLX4_UPD_QP_PATH_MASK_SCHED_QUEUE = 46,
1: -	MLX4_UPD_QP_PATH_MASK_IF_COUNTER_INDEX = 47,
1: -	MLX4_UPD_QP_PATH_MASK_FVL_RX = 48,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_SRC_CHECK_UC_LB = 50,
1: -	MLX4_UPD_QP_PATH_MASK_ETH_SRC_CHECK_MC_LB = 51,
1: -	MLX4_UPD_QP_PATH_MASK_SV = 54,
1: +  MLX4_UPD_QP_PATH_MASK_PKEY_INDEX = 32,
1: +  MLX4_UPD_QP_PATH_MASK_FSM = 33,
1: +  MLX4_UPD_QP_PATH_MASK_MAC_INDEX = 34,
1: +  MLX4_UPD_QP_PATH_MASK_FVL = 35,
1: +  MLX4_UPD_QP_PATH_MASK_CV = 36,
1: +  MLX4_UPD_QP_PATH_MASK_VLAN_INDEX = 37,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_HIDE_CQE_VLAN = 38,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_UNTAGGED = 39,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_1P = 40,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_TAGGED = 41,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_UNTAGGED = 42,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_1P = 43,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_TAGGED = 44,
1: +  MLX4_UPD_QP_PATH_MASK_FEUP = 45,
1: +  MLX4_UPD_QP_PATH_MASK_SCHED_QUEUE = 46,
1: +  MLX4_UPD_QP_PATH_MASK_IF_COUNTER_INDEX = 47,
1: +  MLX4_UPD_QP_PATH_MASK_FVL_RX = 48,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_SRC_CHECK_UC_LB = 50,
1: +  MLX4_UPD_QP_PATH_MASK_ETH_SRC_CHECK_MC_LB = 51,
1: +  MLX4_UPD_QP_PATH_MASK_SV = 54,
1:  };
1:  
1:  enum {
1: -	MLX4_STRIP_VLAN = 1073741824,
1: +  MLX4_STRIP_VLAN = 1073741824,
1:  };
1:  
1:  enum mlx4_update_qp_attr {
1: -	MLX4_UPDATE_QP_SMAC = 1,
1: -	MLX4_UPDATE_QP_VSD = 2,
1: -	MLX4_UPDATE_QP_RATE_LIMIT = 4,
1: -	MLX4_UPDATE_QP_QOS_VPORT = 8,
1: -	MLX4_UPDATE_QP_ETH_SRC_CHECK_MC_LB = 16,
1: -	MLX4_UPDATE_QP_SUPPORTED_ATTRS = 31,
1: +  MLX4_UPDATE_QP_SMAC = 1,
1: +  MLX4_UPDATE_QP_VSD = 2,
1: +  MLX4_UPDATE_QP_RATE_LIMIT = 4,
1: +  MLX4_UPDATE_QP_QOS_VPORT = 8,
1: +  MLX4_UPDATE_QP_ETH_SRC_CHECK_MC_LB = 16,
1: +  MLX4_UPDATE_QP_SUPPORTED_ATTRS = 31,
1:  };
1:  
1:  enum mlx4_update_qp_params_flags {
1: -	MLX4_UPDATE_QP_PARAMS_FLAGS_ETH_CHECK_MC_LB = 1,
1: -	MLX4_UPDATE_QP_PARAMS_FLAGS_VSD_ENABLE = 2,
1: +  MLX4_UPDATE_QP_PARAMS_FLAGS_ETH_CHECK_MC_LB = 1,
1: +  MLX4_UPDATE_QP_PARAMS_FLAGS_VSD_ENABLE = 2,
1:  };
1:  
1:  struct mlx4_update_qp_params {
1: -	u8 smac_index;
1: -	u8 qos_vport;
1: -	u32 flags;
1: -	u16 rate_unit;
1: -	u16 rate_val;
1: +  u8 smac_index;
1: +  u8 qos_vport;
1: +  u32 flags;
1: +  u16 rate_unit;
1: +  u16 rate_val;
1:  };
1:  
1:  struct mlx4_srq {
1: -	void (*event)(struct mlx4_srq *, enum mlx4_event);
1: -	int srqn;
1: -	int max;
1: -	int max_gs;
1: -	int wqe_shift;
1: -	refcount_t refcount;
1: -	struct completion free;
1: +  void (*event)(struct mlx4_srq *, enum mlx4_event);
1: +  int srqn;
1: +  int max;
1: +  int max_gs;
1: +  int wqe_shift;
1: +  refcount_t refcount;
1: +  struct completion free;
1:  };
1:  
1:  struct mlx4_srq_context {
1: -	__be32 state_logsize_srqn;
1: -	u8 logstride;
1: -	u8 reserved1;
1: -	__be16 xrcd;
1: -	__be32 pg_offset_cqn;
1: -	u32 reserved2;
1: -	u8 log_page_size;
1: -	u8 reserved3[2];
1: -	u8 mtt_base_addr_h;
1: -	__be32 mtt_base_addr_l;
1: -	__be32 pd;
1: -	__be16 limit_watermark;
1: -	__be16 wqe_cnt;
1: -	u16 reserved4;
1: -	__be16 wqe_counter;
1: -	u32 reserved5;
1: -	__be64 db_rec_addr;
1: +  __be32 state_logsize_srqn;
1: +  u8 logstride;
1: +  u8 reserved1;
1: +  __be16 xrcd;
1: +  __be32 pg_offset_cqn;
1: +  u32 reserved2;
1: +  u8 log_page_size;
1: +  u8 reserved3[2];
1: +  u8 mtt_base_addr_h;
1: +  __be32 mtt_base_addr_l;
1: +  __be32 pd;
1: +  __be16 limit_watermark;
1: +  __be16 wqe_cnt;
1: +  u16 reserved4;
1: +  __be16 wqe_counter;
1: +  u32 reserved5;
1: +  __be64 db_rec_addr;
1:  };
1:  
1:  enum {
1: -	MLX4_QP_ST_RC = 0,
1: -	MLX4_QP_ST_UC = 1,
1: -	MLX4_QP_ST_RD = 2,
1: -	MLX4_QP_ST_UD = 3,
1: -	MLX4_QP_ST_XRC = 6,
1: -	MLX4_QP_ST_MLX = 7,
1: +  MLX4_QP_ST_RC = 0,
1: +  MLX4_QP_ST_UC = 1,
1: +  MLX4_QP_ST_RD = 2,
1: +  MLX4_QP_ST_UD = 3,
1: +  MLX4_QP_ST_XRC = 6,
1: +  MLX4_QP_ST_MLX = 7,
1:  };
1:  
1:  enum {
1: -	MLX4_RSS_HASH_XOR = 0,
1: -	MLX4_RSS_HASH_TOP = 1,
1: -	MLX4_RSS_UDP_IPV6 = 1,
1: -	MLX4_RSS_UDP_IPV4 = 2,
1: -	MLX4_RSS_TCP_IPV6 = 4,
1: -	MLX4_RSS_IPV6 = 8,
1: -	MLX4_RSS_TCP_IPV4 = 16,
1: -	MLX4_RSS_IPV4 = 32,
1: -	MLX4_RSS_BY_OUTER_HEADERS = 0,
1: -	MLX4_RSS_BY_INNER_HEADERS = 128,
1: -	MLX4_RSS_BY_INNER_HEADERS_IPONLY = 192,
1: -	MLX4_RSS_OFFSET_IN_QPC_PRI_PATH = 36,
1: -	MLX4_RSS_QPC_FLAG_OFFSET = 13,
1: +  MLX4_RSS_HASH_XOR = 0,
1: +  MLX4_RSS_HASH_TOP = 1,
1: +  MLX4_RSS_UDP_IPV6 = 1,
1: +  MLX4_RSS_UDP_IPV4 = 2,
1: +  MLX4_RSS_TCP_IPV6 = 4,
1: +  MLX4_RSS_IPV6 = 8,
1: +  MLX4_RSS_TCP_IPV4 = 16,
1: +  MLX4_RSS_IPV4 = 32,
1: +  MLX4_RSS_BY_OUTER_HEADERS = 0,
1: +  MLX4_RSS_BY_INNER_HEADERS = 128,
1: +  MLX4_RSS_BY_INNER_HEADERS_IPONLY = 192,
1: +  MLX4_RSS_OFFSET_IN_QPC_PRI_PATH = 36,
1: +  MLX4_RSS_QPC_FLAG_OFFSET = 13,
1:  };
1:  
1:  enum {
1: -	MLX4_CTRL_ETH_SRC_CHECK_IF_COUNTER = 128,
1: +  MLX4_CTRL_ETH_SRC_CHECK_IF_COUNTER = 128,
1:  };
1:  
1:  enum {
1: -	MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED = 64,
1: -	MLX4_VLAN_CTRL_ETH_TX_BLOCK_PRIO_TAGGED = 32,
1: -	MLX4_VLAN_CTRL_ETH_TX_BLOCK_UNTAGGED = 16,
1: -	MLX4_VLAN_CTRL_ETH_RX_BLOCK_TAGGED = 4,
1: -	MLX4_VLAN_CTRL_ETH_RX_BLOCK_PRIO_TAGGED = 2,
1: -	MLX4_VLAN_CTRL_ETH_RX_BLOCK_UNTAGGED = 1,
1: +  MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED = 64,
1: +  MLX4_VLAN_CTRL_ETH_TX_BLOCK_PRIO_TAGGED = 32,
1: +  MLX4_VLAN_CTRL_ETH_TX_BLOCK_UNTAGGED = 16,
1: +  MLX4_VLAN_CTRL_ETH_RX_BLOCK_TAGGED = 4,
1: +  MLX4_VLAN_CTRL_ETH_RX_BLOCK_PRIO_TAGGED = 2,
1: +  MLX4_VLAN_CTRL_ETH_RX_BLOCK_UNTAGGED = 1,
1:  };
1:  
1:  enum {
1: -	MLX4_FEUP_FORCE_ETH_UP = 64,
1: -	MLX4_FSM_FORCE_ETH_SRC_MAC = 32,
1: -	MLX4_FVL_FORCE_ETH_VLAN = 8,
1: +  MLX4_FEUP_FORCE_ETH_UP = 64,
1: +  MLX4_FSM_FORCE_ETH_SRC_MAC = 32,
1: +  MLX4_FVL_FORCE_ETH_VLAN = 8,
1:  };
1:  
1:  enum {
1: -	MLX4_FVL_RX_FORCE_ETH_VLAN = 1,
1: +  MLX4_FVL_RX_FORCE_ETH_VLAN = 1,
1:  };
1:  
1:  struct mac_res {
1: -	struct list_head list;
1: -	u64 mac;
1: -	int ref_count;
1: -	u8 smac_index;
1: -	u8 port;
1: +  struct list_head list;
1: +  u64 mac;
1: +  int ref_count;
1: +  u8 smac_index;
1: +  u8 port;
1:  };
1:  
1:  struct vlan_res {
1: -	struct list_head list;
1: -	u16 vlan;
1: -	int ref_count;
1: -	int vlan_index;
1: -	u8 port;
1: +  struct list_head list;
1: +  u16 vlan;
1: +  int ref_count;
1: +  int vlan_index;
1: +  u8 port;
1:  };
1:  
1:  struct res_common {
1: -	struct list_head list;
1: -	struct rb_node node;
1: -	u64 res_id;
1: -	int owner;
1: -	int state;
1: -	int from_state;
1: -	int to_state;
1: -	int removing;
1: -	const char *func_name;
1: +  struct list_head list;
1: +  struct rb_node node;
1: +  u64 res_id;
1: +  int owner;
1: +  int state;
1: +  int from_state;
1: +  int to_state;
1: +  int removing;
1: +  const char *func_name;
1:  };
1:  
1:  enum {
1: -	RES_ANY_BUSY = 1,
1: +  RES_ANY_BUSY = 1,
1:  };
1:  
1:  struct res_gid {
1: -	struct list_head list;
1: -	u8 gid[16];
1: -	enum mlx4_protocol prot;
1: -	enum mlx4_steer_type steer;
1: -	u64 reg_id;
1: +  struct list_head list;
1: +  u8 gid[16];
1: +  enum mlx4_protocol prot;
1: +  enum mlx4_steer_type steer;
1: +  u64 reg_id;
1:  };
1:  
1:  enum res_qp_states {
1: -	RES_QP_BUSY = 1,
1: -	RES_QP_RESERVED = 2,
1: -	RES_QP_MAPPED = 3,
1: -	RES_QP_HW = 4,
1: +  RES_QP_BUSY = 1,
1: +  RES_QP_RESERVED = 2,
1: +  RES_QP_MAPPED = 3,
1: +  RES_QP_HW = 4,
1:  };
1:  
1:  struct res_mtt;
1: @@ -99903,663 +101062,664 @@ struct res_cq;
1:  struct res_srq;
1:  
1:  struct res_qp {
1: -	struct res_common com;
1: -	struct res_mtt *mtt;
1: -	struct res_cq *rcq;
1: -	struct res_cq *scq;
1: -	struct res_srq *srq;
1: -	struct list_head mcg_list;
1: -	spinlock_t mcg_spl;
1: -	int local_qpn;
1: -	atomic_t ref_count;
1: -	u32 qpc_flags;
1: -	u8 sched_queue;
1: -	__be32 param3;
1: -	u8 vlan_control;
1: -	u8 fvl_rx;
1: -	u8 pri_path_fl;
1: -	u8 vlan_index;
1: -	u8 feup;
1: +  struct res_common com;
1: +  struct res_mtt *mtt;
1: +  struct res_cq *rcq;
1: +  struct res_cq *scq;
1: +  struct res_srq *srq;
1: +  struct list_head mcg_list;
1: +  spinlock_t mcg_spl;
1: +  int local_qpn;
1: +  atomic_t ref_count;
1: +  u32 qpc_flags;
1: +  u8 sched_queue;
1: +  __be32 param3;
1: +  u8 vlan_control;
1: +  u8 fvl_rx;
1: +  u8 pri_path_fl;
1: +  u8 vlan_index;
1: +  u8 feup;
1:  };
1:  
1:  struct res_mtt {
1: -	struct res_common com;
1: -	int order;
1: -	atomic_t ref_count;
1: +  struct res_common com;
1: +  int order;
1: +  atomic_t ref_count;
1:  };
1:  
1:  struct res_cq {
1: -	struct res_common com;
1: -	struct res_mtt *mtt;
1: -	atomic_t ref_count;
1: +  struct res_common com;
1: +  struct res_mtt *mtt;
1: +  atomic_t ref_count;
1:  };
1:  
1:  struct res_srq {
1: -	struct res_common com;
1: -	struct res_mtt *mtt;
1: -	struct res_cq *cq;
1: -	atomic_t ref_count;
1: +  struct res_common com;
1: +  struct res_mtt *mtt;
1: +  struct res_cq *cq;
1: +  atomic_t ref_count;
1:  };
1:  
1:  enum res_mtt_states {
1: -	RES_MTT_BUSY = 1,
1: -	RES_MTT_ALLOCATED = 2,
1: +  RES_MTT_BUSY = 1,
1: +  RES_MTT_ALLOCATED = 2,
1:  };
1:  
1:  enum res_mpt_states {
1: -	RES_MPT_BUSY = 1,
1: -	RES_MPT_RESERVED = 2,
1: -	RES_MPT_MAPPED = 3,
1: -	RES_MPT_HW = 4,
1: +  RES_MPT_BUSY = 1,
1: +  RES_MPT_RESERVED = 2,
1: +  RES_MPT_MAPPED = 3,
1: +  RES_MPT_HW = 4,
1:  };
1:  
1:  struct res_mpt {
1: -	struct res_common com;
1: -	struct res_mtt *mtt;
1: -	int key;
1: +  struct res_common com;
1: +  struct res_mtt *mtt;
1: +  int key;
1:  };
1:  
1:  enum res_eq_states {
1: -	RES_EQ_BUSY = 1,
1: -	RES_EQ_RESERVED = 2,
1: -	RES_EQ_HW = 3,
1: +  RES_EQ_BUSY = 1,
1: +  RES_EQ_RESERVED = 2,
1: +  RES_EQ_HW = 3,
1:  };
1:  
1:  struct res_eq {
1: -	struct res_common com;
1: -	struct res_mtt *mtt;
1: +  struct res_common com;
1: +  struct res_mtt *mtt;
1:  };
1:  
1:  enum res_cq_states {
1: -	RES_CQ_BUSY = 1,
1: -	RES_CQ_ALLOCATED = 2,
1: -	RES_CQ_HW = 3,
1: +  RES_CQ_BUSY = 1,
1: +  RES_CQ_ALLOCATED = 2,
1: +  RES_CQ_HW = 3,
1:  };
1:  
1:  enum res_srq_states {
1: -	RES_SRQ_BUSY = 1,
1: -	RES_SRQ_ALLOCATED = 2,
1: -	RES_SRQ_HW = 3,
1: +  RES_SRQ_BUSY = 1,
1: +  RES_SRQ_ALLOCATED = 2,
1: +  RES_SRQ_HW = 3,
1:  };
1:  
1:  enum res_counter_states {
1: -	RES_COUNTER_BUSY = 1,
1: -	RES_COUNTER_ALLOCATED = 2,
1: +  RES_COUNTER_BUSY = 1,
1: +  RES_COUNTER_ALLOCATED = 2,
1:  };
1:  
1:  struct res_counter {
1: -	struct res_common com;
1: -	int port;
1: +  struct res_common com;
1: +  int port;
1:  };
1:  
1:  enum res_xrcdn_states {
1: -	RES_XRCD_BUSY = 1,
1: -	RES_XRCD_ALLOCATED = 2,
1: +  RES_XRCD_BUSY = 1,
1: +  RES_XRCD_ALLOCATED = 2,
1:  };
1:  
1:  struct res_xrcdn {
1: -	struct res_common com;
1: -	int port;
1: +  struct res_common com;
1: +  int port;
1:  };
1:  
1:  enum res_fs_rule_states {
1: -	RES_FS_RULE_BUSY = 1,
1: -	RES_FS_RULE_ALLOCATED = 2,
1: +  RES_FS_RULE_BUSY = 1,
1: +  RES_FS_RULE_ALLOCATED = 2,
1:  };
1:  
1:  struct res_fs_rule {
1: -	struct res_common com;
1: -	int qpn;
1: -	void *mirr_mbox;
1: -	u32 mirr_mbox_size;
1: -	struct list_head mirr_list;
1: -	u64 mirr_rule_id;
1: +  struct res_common com;
1: +  int qpn;
1: +  void *mirr_mbox;
1: +  u32 mirr_mbox_size;
1: +  struct list_head mirr_list;
1: +  u64 mirr_rule_id;
1:  };
1:  
1:  enum qp_transition {
1: -	QP_TRANS_INIT2RTR = 0,
1: -	QP_TRANS_RTR2RTS = 1,
1: -	QP_TRANS_RTS2RTS = 2,
1: -	QP_TRANS_SQERR2RTS = 3,
1: -	QP_TRANS_SQD2SQD = 4,
1: -	QP_TRANS_SQD2RTS = 5,
1: +  QP_TRANS_INIT2RTR = 0,
1: +  QP_TRANS_RTR2RTS = 1,
1: +  QP_TRANS_RTS2RTS = 2,
1: +  QP_TRANS_SQERR2RTS = 3,
1: +  QP_TRANS_SQD2SQD = 4,
1: +  QP_TRANS_SQD2RTS = 5,
1:  };
1:  
1:  struct devlink_region_ops {
1: -	const char *name;
1: -	void (*destructor)(const void *);
1: -	int (*snapshot)(struct devlink *, const struct devlink_region_ops *, struct netlink_ext_ack *, u8 **);
1: -	void *priv;
1: +  const char *name;
1: +  void (*destructor)(const void *);
1: +  int (*snapshot)(struct devlink *, const struct devlink_region_ops *,
1: +                  struct netlink_ext_ack *, u8 **);
1: +  void *priv;
1:  };
1:  
1:  enum dcbnl_cndd_states {
1: -	DCB_CNDD_RESET = 0,
1: -	DCB_CNDD_EDGE = 1,
1: -	DCB_CNDD_INTERIOR = 2,
1: -	DCB_CNDD_INTERIOR_READY = 3,
1: +  DCB_CNDD_RESET = 0,
1: +  DCB_CNDD_EDGE = 1,
1: +  DCB_CNDD_INTERIOR = 2,
1: +  DCB_CNDD_INTERIOR_READY = 3,
1:  };
1:  
1:  enum {
1: -	MLX4_WQE_CTRL_NEC = 536870912,
1: -	MLX4_WQE_CTRL_IIP = 268435456,
1: -	MLX4_WQE_CTRL_ILP = 134217728,
1: -	MLX4_WQE_CTRL_FENCE = 64,
1: -	MLX4_WQE_CTRL_CQ_UPDATE = 12,
1: -	MLX4_WQE_CTRL_SOLICITED = 2,
1: -	MLX4_WQE_CTRL_IP_CSUM = 16,
1: -	MLX4_WQE_CTRL_TCP_UDP_CSUM = 32,
1: -	MLX4_WQE_CTRL_INS_CVLAN = 64,
1: -	MLX4_WQE_CTRL_INS_SVLAN = 128,
1: -	MLX4_WQE_CTRL_STRONG_ORDER = 128,
1: -	MLX4_WQE_CTRL_FORCE_LOOPBACK = 1,
1: +  MLX4_WQE_CTRL_NEC = 536870912,
1: +  MLX4_WQE_CTRL_IIP = 268435456,
1: +  MLX4_WQE_CTRL_ILP = 134217728,
1: +  MLX4_WQE_CTRL_FENCE = 64,
1: +  MLX4_WQE_CTRL_CQ_UPDATE = 12,
1: +  MLX4_WQE_CTRL_SOLICITED = 2,
1: +  MLX4_WQE_CTRL_IP_CSUM = 16,
1: +  MLX4_WQE_CTRL_TCP_UDP_CSUM = 32,
1: +  MLX4_WQE_CTRL_INS_CVLAN = 64,
1: +  MLX4_WQE_CTRL_INS_SVLAN = 128,
1: +  MLX4_WQE_CTRL_STRONG_ORDER = 128,
1: +  MLX4_WQE_CTRL_FORCE_LOOPBACK = 1,
1:  };
1:  
1:  struct mlx4_cqe {
1: -	__be32 vlan_my_qpn;
1: -	__be32 immed_rss_invalid;
1: -	__be32 g_mlpath_rqpn;
1: -	__be16 sl_vid;
1: -	union {
1: -		struct {
1: -			__be16 rlid;
1: -			__be16 status;
1: -			u8 ipv6_ext_mask;
1: -			u8 badfcs_enc;
1: -		};
1: -		u8 smac[6];
1: -	};
1: -	__be32 byte_cnt;
1: -	__be16 wqe_index;
1: -	__be16 checksum;
1: -	u8 reserved[3];
1: -	u8 owner_sr_opcode;
1: +  __be32 vlan_my_qpn;
1: +  __be32 immed_rss_invalid;
1: +  __be32 g_mlpath_rqpn;
1: +  __be16 sl_vid;
1: +  union {
1: +    struct {
1: +      __be16 rlid;
1: +      __be16 status;
1: +      u8 ipv6_ext_mask;
1: +      u8 badfcs_enc;
1: +    };
1: +    u8 smac[6];
1: +  };
1: +  __be32 byte_cnt;
1: +  __be16 wqe_index;
1: +  __be16 checksum;
1: +  u8 reserved[3];
1: +  u8 owner_sr_opcode;
1:  };
1:  
1:  struct mlx4_en_stat_out_mbox {
1: -	__be64 R64_prio_0;
1: -	__be64 R64_prio_1;
1: -	__be64 R64_prio_2;
1: -	__be64 R64_prio_3;
1: -	__be64 R64_prio_4;
1: -	__be64 R64_prio_5;
1: -	__be64 R64_prio_6;
1: -	__be64 R64_prio_7;
1: -	__be64 R64_novlan;
1: -	__be64 R127_prio_0;
1: -	__be64 R127_prio_1;
1: -	__be64 R127_prio_2;
1: -	__be64 R127_prio_3;
1: -	__be64 R127_prio_4;
1: -	__be64 R127_prio_5;
1: -	__be64 R127_prio_6;
1: -	__be64 R127_prio_7;
1: -	__be64 R127_novlan;
1: -	__be64 R255_prio_0;
1: -	__be64 R255_prio_1;
1: -	__be64 R255_prio_2;
1: -	__be64 R255_prio_3;
1: -	__be64 R255_prio_4;
1: -	__be64 R255_prio_5;
1: -	__be64 R255_prio_6;
1: -	__be64 R255_prio_7;
1: -	__be64 R255_novlan;
1: -	__be64 R511_prio_0;
1: -	__be64 R511_prio_1;
1: -	__be64 R511_prio_2;
1: -	__be64 R511_prio_3;
1: -	__be64 R511_prio_4;
1: -	__be64 R511_prio_5;
1: -	__be64 R511_prio_6;
1: -	__be64 R511_prio_7;
1: -	__be64 R511_novlan;
1: -	__be64 R1023_prio_0;
1: -	__be64 R1023_prio_1;
1: -	__be64 R1023_prio_2;
1: -	__be64 R1023_prio_3;
1: -	__be64 R1023_prio_4;
1: -	__be64 R1023_prio_5;
1: -	__be64 R1023_prio_6;
1: -	__be64 R1023_prio_7;
1: -	__be64 R1023_novlan;
1: -	__be64 R1518_prio_0;
1: -	__be64 R1518_prio_1;
1: -	__be64 R1518_prio_2;
1: -	__be64 R1518_prio_3;
1: -	__be64 R1518_prio_4;
1: -	__be64 R1518_prio_5;
1: -	__be64 R1518_prio_6;
1: -	__be64 R1518_prio_7;
1: -	__be64 R1518_novlan;
1: -	__be64 R1522_prio_0;
1: -	__be64 R1522_prio_1;
1: -	__be64 R1522_prio_2;
1: -	__be64 R1522_prio_3;
1: -	__be64 R1522_prio_4;
1: -	__be64 R1522_prio_5;
1: -	__be64 R1522_prio_6;
1: -	__be64 R1522_prio_7;
1: -	__be64 R1522_novlan;
1: -	__be64 R1548_prio_0;
1: -	__be64 R1548_prio_1;
1: -	__be64 R1548_prio_2;
1: -	__be64 R1548_prio_3;
1: -	__be64 R1548_prio_4;
1: -	__be64 R1548_prio_5;
1: -	__be64 R1548_prio_6;
1: -	__be64 R1548_prio_7;
1: -	__be64 R1548_novlan;
1: -	__be64 R2MTU_prio_0;
1: -	__be64 R2MTU_prio_1;
1: -	__be64 R2MTU_prio_2;
1: -	__be64 R2MTU_prio_3;
1: -	__be64 R2MTU_prio_4;
1: -	__be64 R2MTU_prio_5;
1: -	__be64 R2MTU_prio_6;
1: -	__be64 R2MTU_prio_7;
1: -	__be64 R2MTU_novlan;
1: -	__be64 RGIANT_prio_0;
1: -	__be64 RGIANT_prio_1;
1: -	__be64 RGIANT_prio_2;
1: -	__be64 RGIANT_prio_3;
1: -	__be64 RGIANT_prio_4;
1: -	__be64 RGIANT_prio_5;
1: -	__be64 RGIANT_prio_6;
1: -	__be64 RGIANT_prio_7;
1: -	__be64 RGIANT_novlan;
1: -	__be64 RBCAST_prio_0;
1: -	__be64 RBCAST_prio_1;
1: -	__be64 RBCAST_prio_2;
1: -	__be64 RBCAST_prio_3;
1: -	__be64 RBCAST_prio_4;
1: -	__be64 RBCAST_prio_5;
1: -	__be64 RBCAST_prio_6;
1: -	__be64 RBCAST_prio_7;
1: -	__be64 RBCAST_novlan;
1: -	__be64 MCAST_prio_0;
1: -	__be64 MCAST_prio_1;
1: -	__be64 MCAST_prio_2;
1: -	__be64 MCAST_prio_3;
1: -	__be64 MCAST_prio_4;
1: -	__be64 MCAST_prio_5;
1: -	__be64 MCAST_prio_6;
1: -	__be64 MCAST_prio_7;
1: -	__be64 MCAST_novlan;
1: -	__be64 RTOTG_prio_0;
1: -	__be64 RTOTG_prio_1;
1: -	__be64 RTOTG_prio_2;
1: -	__be64 RTOTG_prio_3;
1: -	__be64 RTOTG_prio_4;
1: -	__be64 RTOTG_prio_5;
1: -	__be64 RTOTG_prio_6;
1: -	__be64 RTOTG_prio_7;
1: -	__be64 RTOTG_novlan;
1: -	__be64 RTTLOCT_prio_0;
1: -	__be64 RTTLOCT_NOFRM_prio_0;
1: -	__be64 ROCT_prio_0;
1: -	__be64 RTTLOCT_prio_1;
1: -	__be64 RTTLOCT_NOFRM_prio_1;
1: -	__be64 ROCT_prio_1;
1: -	__be64 RTTLOCT_prio_2;
1: -	__be64 RTTLOCT_NOFRM_prio_2;
1: -	__be64 ROCT_prio_2;
1: -	__be64 RTTLOCT_prio_3;
1: -	__be64 RTTLOCT_NOFRM_prio_3;
1: -	__be64 ROCT_prio_3;
1: -	__be64 RTTLOCT_prio_4;
1: -	__be64 RTTLOCT_NOFRM_prio_4;
1: -	__be64 ROCT_prio_4;
1: -	__be64 RTTLOCT_prio_5;
1: -	__be64 RTTLOCT_NOFRM_prio_5;
1: -	__be64 ROCT_prio_5;
1: -	__be64 RTTLOCT_prio_6;
1: -	__be64 RTTLOCT_NOFRM_prio_6;
1: -	__be64 ROCT_prio_6;
1: -	__be64 RTTLOCT_prio_7;
1: -	__be64 RTTLOCT_NOFRM_prio_7;
1: -	__be64 ROCT_prio_7;
1: -	__be64 RTTLOCT_novlan;
1: -	__be64 RTTLOCT_NOFRM_novlan;
1: -	__be64 ROCT_novlan;
1: -	__be64 RTOT_prio_0;
1: -	__be64 R1Q_prio_0;
1: -	__be64 reserved1;
1: -	__be64 RTOT_prio_1;
1: -	__be64 R1Q_prio_1;
1: -	__be64 reserved2;
1: -	__be64 RTOT_prio_2;
1: -	__be64 R1Q_prio_2;
1: -	__be64 reserved3;
1: -	__be64 RTOT_prio_3;
1: -	__be64 R1Q_prio_3;
1: -	__be64 reserved4;
1: -	__be64 RTOT_prio_4;
1: -	__be64 R1Q_prio_4;
1: -	__be64 reserved5;
1: -	__be64 RTOT_prio_5;
1: -	__be64 R1Q_prio_5;
1: -	__be64 reserved6;
1: -	__be64 RTOT_prio_6;
1: -	__be64 R1Q_prio_6;
1: -	__be64 reserved7;
1: -	__be64 RTOT_prio_7;
1: -	__be64 R1Q_prio_7;
1: -	__be64 reserved8;
1: -	__be64 RTOT_novlan;
1: -	__be64 R1Q_novlan;
1: -	__be64 reserved9;
1: -	__be64 RCNTL;
1: -	__be64 reserved10;
1: -	__be64 reserved11;
1: -	__be64 reserved12;
1: -	__be64 RInRangeLengthErr;
1: -	__be64 ROutRangeLengthErr;
1: -	__be64 RFrmTooLong;
1: -	__be64 PCS;
1: -	__be64 T64_prio_0;
1: -	__be64 T64_prio_1;
1: -	__be64 T64_prio_2;
1: -	__be64 T64_prio_3;
1: -	__be64 T64_prio_4;
1: -	__be64 T64_prio_5;
1: -	__be64 T64_prio_6;
1: -	__be64 T64_prio_7;
1: -	__be64 T64_novlan;
1: -	__be64 T64_loopbk;
1: -	__be64 T127_prio_0;
1: -	__be64 T127_prio_1;
1: -	__be64 T127_prio_2;
1: -	__be64 T127_prio_3;
1: -	__be64 T127_prio_4;
1: -	__be64 T127_prio_5;
1: -	__be64 T127_prio_6;
1: -	__be64 T127_prio_7;
1: -	__be64 T127_novlan;
1: -	__be64 T127_loopbk;
1: -	__be64 T255_prio_0;
1: -	__be64 T255_prio_1;
1: -	__be64 T255_prio_2;
1: -	__be64 T255_prio_3;
1: -	__be64 T255_prio_4;
1: -	__be64 T255_prio_5;
1: -	__be64 T255_prio_6;
1: -	__be64 T255_prio_7;
1: -	__be64 T255_novlan;
1: -	__be64 T255_loopbk;
1: -	__be64 T511_prio_0;
1: -	__be64 T511_prio_1;
1: -	__be64 T511_prio_2;
1: -	__be64 T511_prio_3;
1: -	__be64 T511_prio_4;
1: -	__be64 T511_prio_5;
1: -	__be64 T511_prio_6;
1: -	__be64 T511_prio_7;
1: -	__be64 T511_novlan;
1: -	__be64 T511_loopbk;
1: -	__be64 T1023_prio_0;
1: -	__be64 T1023_prio_1;
1: -	__be64 T1023_prio_2;
1: -	__be64 T1023_prio_3;
1: -	__be64 T1023_prio_4;
1: -	__be64 T1023_prio_5;
1: -	__be64 T1023_prio_6;
1: -	__be64 T1023_prio_7;
1: -	__be64 T1023_novlan;
1: -	__be64 T1023_loopbk;
1: -	__be64 T1518_prio_0;
1: -	__be64 T1518_prio_1;
1: -	__be64 T1518_prio_2;
1: -	__be64 T1518_prio_3;
1: -	__be64 T1518_prio_4;
1: -	__be64 T1518_prio_5;
1: -	__be64 T1518_prio_6;
1: -	__be64 T1518_prio_7;
1: -	__be64 T1518_novlan;
1: -	__be64 T1518_loopbk;
1: -	__be64 T1522_prio_0;
1: -	__be64 T1522_prio_1;
1: -	__be64 T1522_prio_2;
1: -	__be64 T1522_prio_3;
1: -	__be64 T1522_prio_4;
1: -	__be64 T1522_prio_5;
1: -	__be64 T1522_prio_6;
1: -	__be64 T1522_prio_7;
1: -	__be64 T1522_novlan;
1: -	__be64 T1522_loopbk;
1: -	__be64 T1548_prio_0;
1: -	__be64 T1548_prio_1;
1: -	__be64 T1548_prio_2;
1: -	__be64 T1548_prio_3;
1: -	__be64 T1548_prio_4;
1: -	__be64 T1548_prio_5;
1: -	__be64 T1548_prio_6;
1: -	__be64 T1548_prio_7;
1: -	__be64 T1548_novlan;
1: -	__be64 T1548_loopbk;
1: -	__be64 T2MTU_prio_0;
1: -	__be64 T2MTU_prio_1;
1: -	__be64 T2MTU_prio_2;
1: -	__be64 T2MTU_prio_3;
1: -	__be64 T2MTU_prio_4;
1: -	__be64 T2MTU_prio_5;
1: -	__be64 T2MTU_prio_6;
1: -	__be64 T2MTU_prio_7;
1: -	__be64 T2MTU_novlan;
1: -	__be64 T2MTU_loopbk;
1: -	__be64 TGIANT_prio_0;
1: -	__be64 TGIANT_prio_1;
1: -	__be64 TGIANT_prio_2;
1: -	__be64 TGIANT_prio_3;
1: -	__be64 TGIANT_prio_4;
1: -	__be64 TGIANT_prio_5;
1: -	__be64 TGIANT_prio_6;
1: -	__be64 TGIANT_prio_7;
1: -	__be64 TGIANT_novlan;
1: -	__be64 TGIANT_loopbk;
1: -	__be64 TBCAST_prio_0;
1: -	__be64 TBCAST_prio_1;
1: -	__be64 TBCAST_prio_2;
1: -	__be64 TBCAST_prio_3;
1: -	__be64 TBCAST_prio_4;
1: -	__be64 TBCAST_prio_5;
1: -	__be64 TBCAST_prio_6;
1: -	__be64 TBCAST_prio_7;
1: -	__be64 TBCAST_novlan;
1: -	__be64 TBCAST_loopbk;
1: -	__be64 TMCAST_prio_0;
1: -	__be64 TMCAST_prio_1;
1: -	__be64 TMCAST_prio_2;
1: -	__be64 TMCAST_prio_3;
1: -	__be64 TMCAST_prio_4;
1: -	__be64 TMCAST_prio_5;
1: -	__be64 TMCAST_prio_6;
1: -	__be64 TMCAST_prio_7;
1: -	__be64 TMCAST_novlan;
1: -	__be64 TMCAST_loopbk;
1: -	__be64 TTOTG_prio_0;
1: -	__be64 TTOTG_prio_1;
1: -	__be64 TTOTG_prio_2;
1: -	__be64 TTOTG_prio_3;
1: -	__be64 TTOTG_prio_4;
1: -	__be64 TTOTG_prio_5;
1: -	__be64 TTOTG_prio_6;
1: -	__be64 TTOTG_prio_7;
1: -	__be64 TTOTG_novlan;
1: -	__be64 TTOTG_loopbk;
1: -	__be64 TTTLOCT_prio_0;
1: -	__be64 TTTLOCT_NOFRM_prio_0;
1: -	__be64 TOCT_prio_0;
1: -	__be64 TTTLOCT_prio_1;
1: -	__be64 TTTLOCT_NOFRM_prio_1;
1: -	__be64 TOCT_prio_1;
1: -	__be64 TTTLOCT_prio_2;
1: -	__be64 TTTLOCT_NOFRM_prio_2;
1: -	__be64 TOCT_prio_2;
1: -	__be64 TTTLOCT_prio_3;
1: -	__be64 TTTLOCT_NOFRM_prio_3;
1: -	__be64 TOCT_prio_3;
1: -	__be64 TTTLOCT_prio_4;
1: -	__be64 TTTLOCT_NOFRM_prio_4;
1: -	__be64 TOCT_prio_4;
1: -	__be64 TTTLOCT_prio_5;
1: -	__be64 TTTLOCT_NOFRM_prio_5;
1: -	__be64 TOCT_prio_5;
1: -	__be64 TTTLOCT_prio_6;
1: -	__be64 TTTLOCT_NOFRM_prio_6;
1: -	__be64 TOCT_prio_6;
1: -	__be64 TTTLOCT_prio_7;
1: -	__be64 TTTLOCT_NOFRM_prio_7;
1: -	__be64 TOCT_prio_7;
1: -	__be64 TTTLOCT_novlan;
1: -	__be64 TTTLOCT_NOFRM_novlan;
1: -	__be64 TOCT_novlan;
1: -	__be64 TTTLOCT_loopbk;
1: -	__be64 TTTLOCT_NOFRM_loopbk;
1: -	__be64 TOCT_loopbk;
1: -	__be64 TTOT_prio_0;
1: -	__be64 T1Q_prio_0;
1: -	__be64 reserved13;
1: -	__be64 TTOT_prio_1;
1: -	__be64 T1Q_prio_1;
1: -	__be64 reserved14;
1: -	__be64 TTOT_prio_2;
1: -	__be64 T1Q_prio_2;
1: -	__be64 reserved15;
1: -	__be64 TTOT_prio_3;
1: -	__be64 T1Q_prio_3;
1: -	__be64 reserved16;
1: -	__be64 TTOT_prio_4;
1: -	__be64 T1Q_prio_4;
1: -	__be64 reserved17;
1: -	__be64 TTOT_prio_5;
1: -	__be64 T1Q_prio_5;
1: -	__be64 reserved18;
1: -	__be64 TTOT_prio_6;
1: -	__be64 T1Q_prio_6;
1: -	__be64 reserved19;
1: -	__be64 TTOT_prio_7;
1: -	__be64 T1Q_prio_7;
1: -	__be64 reserved20;
1: -	__be64 TTOT_novlan;
1: -	__be64 T1Q_novlan;
1: -	__be64 reserved21;
1: -	__be64 TTOT_loopbk;
1: -	__be64 T1Q_loopbk;
1: -	__be64 reserved22;
1: -	__be32 RJBBR;
1: -	__be32 RCRC;
1: -	__be32 RRUNT;
1: -	__be32 RSHORT;
1: -	__be32 RDROP;
1: -	__be32 RdropOvflw;
1: -	__be32 RdropLength;
1: -	__be32 RTOTFRMS;
1: -	__be32 TDROP;
1: +  __be64 R64_prio_0;
1: +  __be64 R64_prio_1;
1: +  __be64 R64_prio_2;
1: +  __be64 R64_prio_3;
1: +  __be64 R64_prio_4;
1: +  __be64 R64_prio_5;
1: +  __be64 R64_prio_6;
1: +  __be64 R64_prio_7;
1: +  __be64 R64_novlan;
1: +  __be64 R127_prio_0;
1: +  __be64 R127_prio_1;
1: +  __be64 R127_prio_2;
1: +  __be64 R127_prio_3;
1: +  __be64 R127_prio_4;
1: +  __be64 R127_prio_5;
1: +  __be64 R127_prio_6;
1: +  __be64 R127_prio_7;
1: +  __be64 R127_novlan;
1: +  __be64 R255_prio_0;
1: +  __be64 R255_prio_1;
1: +  __be64 R255_prio_2;
1: +  __be64 R255_prio_3;
1: +  __be64 R255_prio_4;
1: +  __be64 R255_prio_5;
1: +  __be64 R255_prio_6;
1: +  __be64 R255_prio_7;
1: +  __be64 R255_novlan;
1: +  __be64 R511_prio_0;
1: +  __be64 R511_prio_1;
1: +  __be64 R511_prio_2;
1: +  __be64 R511_prio_3;
1: +  __be64 R511_prio_4;
1: +  __be64 R511_prio_5;
1: +  __be64 R511_prio_6;
1: +  __be64 R511_prio_7;
1: +  __be64 R511_novlan;
1: +  __be64 R1023_prio_0;
1: +  __be64 R1023_prio_1;
1: +  __be64 R1023_prio_2;
1: +  __be64 R1023_prio_3;
1: +  __be64 R1023_prio_4;
1: +  __be64 R1023_prio_5;
1: +  __be64 R1023_prio_6;
1: +  __be64 R1023_prio_7;
1: +  __be64 R1023_novlan;
1: +  __be64 R1518_prio_0;
1: +  __be64 R1518_prio_1;
1: +  __be64 R1518_prio_2;
1: +  __be64 R1518_prio_3;
1: +  __be64 R1518_prio_4;
1: +  __be64 R1518_prio_5;
1: +  __be64 R1518_prio_6;
1: +  __be64 R1518_prio_7;
1: +  __be64 R1518_novlan;
1: +  __be64 R1522_prio_0;
1: +  __be64 R1522_prio_1;
1: +  __be64 R1522_prio_2;
1: +  __be64 R1522_prio_3;
1: +  __be64 R1522_prio_4;
1: +  __be64 R1522_prio_5;
1: +  __be64 R1522_prio_6;
1: +  __be64 R1522_prio_7;
1: +  __be64 R1522_novlan;
1: +  __be64 R1548_prio_0;
1: +  __be64 R1548_prio_1;
1: +  __be64 R1548_prio_2;
1: +  __be64 R1548_prio_3;
1: +  __be64 R1548_prio_4;
1: +  __be64 R1548_prio_5;
1: +  __be64 R1548_prio_6;
1: +  __be64 R1548_prio_7;
1: +  __be64 R1548_novlan;
1: +  __be64 R2MTU_prio_0;
1: +  __be64 R2MTU_prio_1;
1: +  __be64 R2MTU_prio_2;
1: +  __be64 R2MTU_prio_3;
1: +  __be64 R2MTU_prio_4;
1: +  __be64 R2MTU_prio_5;
1: +  __be64 R2MTU_prio_6;
1: +  __be64 R2MTU_prio_7;
1: +  __be64 R2MTU_novlan;
1: +  __be64 RGIANT_prio_0;
1: +  __be64 RGIANT_prio_1;
1: +  __be64 RGIANT_prio_2;
1: +  __be64 RGIANT_prio_3;
1: +  __be64 RGIANT_prio_4;
1: +  __be64 RGIANT_prio_5;
1: +  __be64 RGIANT_prio_6;
1: +  __be64 RGIANT_prio_7;
1: +  __be64 RGIANT_novlan;
1: +  __be64 RBCAST_prio_0;
1: +  __be64 RBCAST_prio_1;
1: +  __be64 RBCAST_prio_2;
1: +  __be64 RBCAST_prio_3;
1: +  __be64 RBCAST_prio_4;
1: +  __be64 RBCAST_prio_5;
1: +  __be64 RBCAST_prio_6;
1: +  __be64 RBCAST_prio_7;
1: +  __be64 RBCAST_novlan;
1: +  __be64 MCAST_prio_0;
1: +  __be64 MCAST_prio_1;
1: +  __be64 MCAST_prio_2;
1: +  __be64 MCAST_prio_3;
1: +  __be64 MCAST_prio_4;
1: +  __be64 MCAST_prio_5;
1: +  __be64 MCAST_prio_6;
1: +  __be64 MCAST_prio_7;
1: +  __be64 MCAST_novlan;
1: +  __be64 RTOTG_prio_0;
1: +  __be64 RTOTG_prio_1;
1: +  __be64 RTOTG_prio_2;
1: +  __be64 RTOTG_prio_3;
1: +  __be64 RTOTG_prio_4;
1: +  __be64 RTOTG_prio_5;
1: +  __be64 RTOTG_prio_6;
1: +  __be64 RTOTG_prio_7;
1: +  __be64 RTOTG_novlan;
1: +  __be64 RTTLOCT_prio_0;
1: +  __be64 RTTLOCT_NOFRM_prio_0;
1: +  __be64 ROCT_prio_0;
1: +  __be64 RTTLOCT_prio_1;
1: +  __be64 RTTLOCT_NOFRM_prio_1;
1: +  __be64 ROCT_prio_1;
1: +  __be64 RTTLOCT_prio_2;
1: +  __be64 RTTLOCT_NOFRM_prio_2;
1: +  __be64 ROCT_prio_2;
1: +  __be64 RTTLOCT_prio_3;
1: +  __be64 RTTLOCT_NOFRM_prio_3;
1: +  __be64 ROCT_prio_3;
1: +  __be64 RTTLOCT_prio_4;
1: +  __be64 RTTLOCT_NOFRM_prio_4;
1: +  __be64 ROCT_prio_4;
1: +  __be64 RTTLOCT_prio_5;
1: +  __be64 RTTLOCT_NOFRM_prio_5;
1: +  __be64 ROCT_prio_5;
1: +  __be64 RTTLOCT_prio_6;
1: +  __be64 RTTLOCT_NOFRM_prio_6;
1: +  __be64 ROCT_prio_6;
1: +  __be64 RTTLOCT_prio_7;
1: +  __be64 RTTLOCT_NOFRM_prio_7;
1: +  __be64 ROCT_prio_7;
1: +  __be64 RTTLOCT_novlan;
1: +  __be64 RTTLOCT_NOFRM_novlan;
1: +  __be64 ROCT_novlan;
1: +  __be64 RTOT_prio_0;
1: +  __be64 R1Q_prio_0;
1: +  __be64 reserved1;
1: +  __be64 RTOT_prio_1;
1: +  __be64 R1Q_prio_1;
1: +  __be64 reserved2;
1: +  __be64 RTOT_prio_2;
1: +  __be64 R1Q_prio_2;
1: +  __be64 reserved3;
1: +  __be64 RTOT_prio_3;
1: +  __be64 R1Q_prio_3;
1: +  __be64 reserved4;
1: +  __be64 RTOT_prio_4;
1: +  __be64 R1Q_prio_4;
1: +  __be64 reserved5;
1: +  __be64 RTOT_prio_5;
1: +  __be64 R1Q_prio_5;
1: +  __be64 reserved6;
1: +  __be64 RTOT_prio_6;
1: +  __be64 R1Q_prio_6;
1: +  __be64 reserved7;
1: +  __be64 RTOT_prio_7;
1: +  __be64 R1Q_prio_7;
1: +  __be64 reserved8;
1: +  __be64 RTOT_novlan;
1: +  __be64 R1Q_novlan;
1: +  __be64 reserved9;
1: +  __be64 RCNTL;
1: +  __be64 reserved10;
1: +  __be64 reserved11;
1: +  __be64 reserved12;
1: +  __be64 RInRangeLengthErr;
1: +  __be64 ROutRangeLengthErr;
1: +  __be64 RFrmTooLong;
1: +  __be64 PCS;
1: +  __be64 T64_prio_0;
1: +  __be64 T64_prio_1;
1: +  __be64 T64_prio_2;
1: +  __be64 T64_prio_3;
1: +  __be64 T64_prio_4;
1: +  __be64 T64_prio_5;
1: +  __be64 T64_prio_6;
1: +  __be64 T64_prio_7;
1: +  __be64 T64_novlan;
1: +  __be64 T64_loopbk;
1: +  __be64 T127_prio_0;
1: +  __be64 T127_prio_1;
1: +  __be64 T127_prio_2;
1: +  __be64 T127_prio_3;
1: +  __be64 T127_prio_4;
1: +  __be64 T127_prio_5;
1: +  __be64 T127_prio_6;
1: +  __be64 T127_prio_7;
1: +  __be64 T127_novlan;
1: +  __be64 T127_loopbk;
1: +  __be64 T255_prio_0;
1: +  __be64 T255_prio_1;
1: +  __be64 T255_prio_2;
1: +  __be64 T255_prio_3;
1: +  __be64 T255_prio_4;
1: +  __be64 T255_prio_5;
1: +  __be64 T255_prio_6;
1: +  __be64 T255_prio_7;
1: +  __be64 T255_novlan;
1: +  __be64 T255_loopbk;
1: +  __be64 T511_prio_0;
1: +  __be64 T511_prio_1;
1: +  __be64 T511_prio_2;
1: +  __be64 T511_prio_3;
1: +  __be64 T511_prio_4;
1: +  __be64 T511_prio_5;
1: +  __be64 T511_prio_6;
1: +  __be64 T511_prio_7;
1: +  __be64 T511_novlan;
1: +  __be64 T511_loopbk;
1: +  __be64 T1023_prio_0;
1: +  __be64 T1023_prio_1;
1: +  __be64 T1023_prio_2;
1: +  __be64 T1023_prio_3;
1: +  __be64 T1023_prio_4;
1: +  __be64 T1023_prio_5;
1: +  __be64 T1023_prio_6;
1: +  __be64 T1023_prio_7;
1: +  __be64 T1023_novlan;
1: +  __be64 T1023_loopbk;
1: +  __be64 T1518_prio_0;
1: +  __be64 T1518_prio_1;
1: +  __be64 T1518_prio_2;
1: +  __be64 T1518_prio_3;
1: +  __be64 T1518_prio_4;
1: +  __be64 T1518_prio_5;
1: +  __be64 T1518_prio_6;
1: +  __be64 T1518_prio_7;
1: +  __be64 T1518_novlan;
1: +  __be64 T1518_loopbk;
1: +  __be64 T1522_prio_0;
1: +  __be64 T1522_prio_1;
1: +  __be64 T1522_prio_2;
1: +  __be64 T1522_prio_3;
1: +  __be64 T1522_prio_4;
1: +  __be64 T1522_prio_5;
1: +  __be64 T1522_prio_6;
1: +  __be64 T1522_prio_7;
1: +  __be64 T1522_novlan;
1: +  __be64 T1522_loopbk;
1: +  __be64 T1548_prio_0;
1: +  __be64 T1548_prio_1;
1: +  __be64 T1548_prio_2;
1: +  __be64 T1548_prio_3;
1: +  __be64 T1548_prio_4;
1: +  __be64 T1548_prio_5;
1: +  __be64 T1548_prio_6;
1: +  __be64 T1548_prio_7;
1: +  __be64 T1548_novlan;
1: +  __be64 T1548_loopbk;
1: +  __be64 T2MTU_prio_0;
1: +  __be64 T2MTU_prio_1;
1: +  __be64 T2MTU_prio_2;
1: +  __be64 T2MTU_prio_3;
1: +  __be64 T2MTU_prio_4;
1: +  __be64 T2MTU_prio_5;
1: +  __be64 T2MTU_prio_6;
1: +  __be64 T2MTU_prio_7;
1: +  __be64 T2MTU_novlan;
1: +  __be64 T2MTU_loopbk;
1: +  __be64 TGIANT_prio_0;
1: +  __be64 TGIANT_prio_1;
1: +  __be64 TGIANT_prio_2;
1: +  __be64 TGIANT_prio_3;
1: +  __be64 TGIANT_prio_4;
1: +  __be64 TGIANT_prio_5;
1: +  __be64 TGIANT_prio_6;
1: +  __be64 TGIANT_prio_7;
1: +  __be64 TGIANT_novlan;
1: +  __be64 TGIANT_loopbk;
1: +  __be64 TBCAST_prio_0;
1: +  __be64 TBCAST_prio_1;
1: +  __be64 TBCAST_prio_2;
1: +  __be64 TBCAST_prio_3;
1: +  __be64 TBCAST_prio_4;
1: +  __be64 TBCAST_prio_5;
1: +  __be64 TBCAST_prio_6;
1: +  __be64 TBCAST_prio_7;
1: +  __be64 TBCAST_novlan;
1: +  __be64 TBCAST_loopbk;
1: +  __be64 TMCAST_prio_0;
1: +  __be64 TMCAST_prio_1;
1: +  __be64 TMCAST_prio_2;
1: +  __be64 TMCAST_prio_3;
1: +  __be64 TMCAST_prio_4;
1: +  __be64 TMCAST_prio_5;
1: +  __be64 TMCAST_prio_6;
1: +  __be64 TMCAST_prio_7;
1: +  __be64 TMCAST_novlan;
1: +  __be64 TMCAST_loopbk;
1: +  __be64 TTOTG_prio_0;
1: +  __be64 TTOTG_prio_1;
1: +  __be64 TTOTG_prio_2;
1: +  __be64 TTOTG_prio_3;
1: +  __be64 TTOTG_prio_4;
1: +  __be64 TTOTG_prio_5;
1: +  __be64 TTOTG_prio_6;
1: +  __be64 TTOTG_prio_7;
1: +  __be64 TTOTG_novlan;
1: +  __be64 TTOTG_loopbk;
1: +  __be64 TTTLOCT_prio_0;
1: +  __be64 TTTLOCT_NOFRM_prio_0;
1: +  __be64 TOCT_prio_0;
1: +  __be64 TTTLOCT_prio_1;
1: +  __be64 TTTLOCT_NOFRM_prio_1;
1: +  __be64 TOCT_prio_1;
1: +  __be64 TTTLOCT_prio_2;
1: +  __be64 TTTLOCT_NOFRM_prio_2;
1: +  __be64 TOCT_prio_2;
1: +  __be64 TTTLOCT_prio_3;
1: +  __be64 TTTLOCT_NOFRM_prio_3;
1: +  __be64 TOCT_prio_3;
1: +  __be64 TTTLOCT_prio_4;
1: +  __be64 TTTLOCT_NOFRM_prio_4;
1: +  __be64 TOCT_prio_4;
1: +  __be64 TTTLOCT_prio_5;
1: +  __be64 TTTLOCT_NOFRM_prio_5;
1: +  __be64 TOCT_prio_5;
1: +  __be64 TTTLOCT_prio_6;
1: +  __be64 TTTLOCT_NOFRM_prio_6;
1: +  __be64 TOCT_prio_6;
1: +  __be64 TTTLOCT_prio_7;
1: +  __be64 TTTLOCT_NOFRM_prio_7;
1: +  __be64 TOCT_prio_7;
1: +  __be64 TTTLOCT_novlan;
1: +  __be64 TTTLOCT_NOFRM_novlan;
1: +  __be64 TOCT_novlan;
1: +  __be64 TTTLOCT_loopbk;
1: +  __be64 TTTLOCT_NOFRM_loopbk;
1: +  __be64 TOCT_loopbk;
1: +  __be64 TTOT_prio_0;
1: +  __be64 T1Q_prio_0;
1: +  __be64 reserved13;
1: +  __be64 TTOT_prio_1;
1: +  __be64 T1Q_prio_1;
1: +  __be64 reserved14;
1: +  __be64 TTOT_prio_2;
1: +  __be64 T1Q_prio_2;
1: +  __be64 reserved15;
1: +  __be64 TTOT_prio_3;
1: +  __be64 T1Q_prio_3;
1: +  __be64 reserved16;
1: +  __be64 TTOT_prio_4;
1: +  __be64 T1Q_prio_4;
1: +  __be64 reserved17;
1: +  __be64 TTOT_prio_5;
1: +  __be64 T1Q_prio_5;
1: +  __be64 reserved18;
1: +  __be64 TTOT_prio_6;
1: +  __be64 T1Q_prio_6;
1: +  __be64 reserved19;
1: +  __be64 TTOT_prio_7;
1: +  __be64 T1Q_prio_7;
1: +  __be64 reserved20;
1: +  __be64 TTOT_novlan;
1: +  __be64 T1Q_novlan;
1: +  __be64 reserved21;
1: +  __be64 TTOT_loopbk;
1: +  __be64 T1Q_loopbk;
1: +  __be64 reserved22;
1: +  __be32 RJBBR;
1: +  __be32 RCRC;
1: +  __be32 RRUNT;
1: +  __be32 RSHORT;
1: +  __be32 RDROP;
1: +  __be32 RdropOvflw;
1: +  __be32 RdropLength;
1: +  __be32 RTOTFRMS;
1: +  __be32 TDROP;
1:  };
1:  
1:  struct mlx4_en_pkt_stats {
1: -	long unsigned int rx_multicast_packets;
1: -	long unsigned int rx_broadcast_packets;
1: -	long unsigned int rx_jabbers;
1: -	long unsigned int rx_in_range_length_error;
1: -	long unsigned int rx_out_range_length_error;
1: -	long unsigned int tx_multicast_packets;
1: -	long unsigned int tx_broadcast_packets;
1: -	long unsigned int rx_prio[18];
1: -	long unsigned int tx_prio[18];
1: +  long unsigned int rx_multicast_packets;
1: +  long unsigned int rx_broadcast_packets;
1: +  long unsigned int rx_jabbers;
1: +  long unsigned int rx_in_range_length_error;
1: +  long unsigned int rx_out_range_length_error;
1: +  long unsigned int tx_multicast_packets;
1: +  long unsigned int tx_broadcast_packets;
1: +  long unsigned int rx_prio[18];
1: +  long unsigned int tx_prio[18];
1:  };
1:  
1:  struct mlx4_en_counter_stats {
1: -	long unsigned int rx_packets;
1: -	long unsigned int rx_bytes;
1: -	long unsigned int tx_packets;
1: -	long unsigned int tx_bytes;
1: +  long unsigned int rx_packets;
1: +  long unsigned int rx_bytes;
1: +  long unsigned int tx_packets;
1: +  long unsigned int tx_bytes;
1:  };
1:  
1:  struct mlx4_en_port_stats {
1: -	long unsigned int tso_packets;
1: -	long unsigned int xmit_more;
1: -	long unsigned int queue_stopped;
1: -	long unsigned int wake_queue;
1: -	long unsigned int tx_timeout;
1: -	long unsigned int rx_alloc_pages;
1: -	long unsigned int rx_chksum_good;
1: -	long unsigned int rx_chksum_none;
1: -	long unsigned int rx_chksum_complete;
1: -	long unsigned int tx_chksum_offload;
1: +  long unsigned int tso_packets;
1: +  long unsigned int xmit_more;
1: +  long unsigned int queue_stopped;
1: +  long unsigned int wake_queue;
1: +  long unsigned int tx_timeout;
1: +  long unsigned int rx_alloc_pages;
1: +  long unsigned int rx_chksum_good;
1: +  long unsigned int rx_chksum_none;
1: +  long unsigned int rx_chksum_complete;
1: +  long unsigned int tx_chksum_offload;
1:  };
1:  
1:  struct mlx4_en_perf_stats {
1: -	u32 tx_poll;
1: -	u64 tx_pktsz_avg;
1: -	u32 inflight_avg;
1: -	u16 tx_coal_avg;
1: -	u16 rx_coal_avg;
1: -	u32 napi_quota;
1: +  u32 tx_poll;
1: +  u64 tx_pktsz_avg;
1: +  u32 inflight_avg;
1: +  u16 tx_coal_avg;
1: +  u16 rx_coal_avg;
1: +  u32 napi_quota;
1:  };
1:  
1:  struct mlx4_en_xdp_stats {
1: -	long unsigned int rx_xdp_drop;
1: -	long unsigned int rx_xdp_tx;
1: -	long unsigned int rx_xdp_tx_full;
1: +  long unsigned int rx_xdp_drop;
1: +  long unsigned int rx_xdp_tx;
1: +  long unsigned int rx_xdp_tx_full;
1:  };
1:  
1:  struct mlx4_en_phy_stats {
1: -	long unsigned int rx_packets_phy;
1: -	long unsigned int rx_bytes_phy;
1: -	long unsigned int tx_packets_phy;
1: -	long unsigned int tx_bytes_phy;
1: +  long unsigned int rx_packets_phy;
1: +  long unsigned int rx_bytes_phy;
1: +  long unsigned int tx_packets_phy;
1: +  long unsigned int tx_bytes_phy;
1:  };
1:  
1:  struct mlx4_en_flow_stats_rx {
1: -	u64 rx_pause;
1: -	u64 rx_pause_duration;
1: -	u64 rx_pause_transition;
1: +  u64 rx_pause;
1: +  u64 rx_pause_duration;
1: +  u64 rx_pause_transition;
1:  };
1:  
1:  struct mlx4_en_flow_stats_tx {
1: -	u64 tx_pause;
1: -	u64 tx_pause_duration;
1: -	u64 tx_pause_transition;
1: +  u64 tx_pause;
1: +  u64 tx_pause_duration;
1: +  u64 tx_pause_transition;
1:  };
1:  
1:  enum {
1: -	MAX_INLINE = 104,
1: -	MAX_BF = 256,
1: -	MIN_PKT_LEN = 17,
1: +  MAX_INLINE = 104,
1: +  MAX_BF = 256,
1: +  MIN_PKT_LEN = 17,
1:  };
1:  
1:  enum cq_type {
1: -	TX = 0,
1: -	TX_XDP = 1,
1: -	RX = 2,
1: +  TX = 0,
1: +  TX_XDP = 1,
1: +  RX = 2,
1:  };
1:  
1:  struct mlx4_en_tx_info {
1: -	union {
1: -		struct sk_buff *skb;
1: -		struct page *page;
1: -	};
1: -	dma_addr_t map0_dma;
1: -	u32 map0_byte_count;
1: -	u32 nr_txbb;
1: -	u32 nr_bytes;
1: -	u8 linear;
1: -	u8 data_offset;
1: -	u8 inl;
1: -	u8 ts_requested;
1: -	u8 nr_maps;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  union {
1: +    struct sk_buff *skb;
1: +    struct page *page;
1: +  };
1: +  dma_addr_t map0_dma;
1: +  u32 map0_byte_count;
1: +  u32 nr_txbb;
1: +  u32 nr_bytes;
1: +  u8 linear;
1: +  u8 data_offset;
1: +  u8 inl;
1: +  u8 ts_requested;
1: +  u8 nr_maps;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct mlx4_en_page_cache {
1: -	u32 index;
1: -	struct {
1: -		struct page *page;
1: -		dma_addr_t dma;
1: -	} buf[128];
1: +  u32 index;
1: +  struct {
1: +    struct page *page;
1: +    dma_addr_t dma;
1: +  } buf[128];
1:  };
1:  
1:  struct mlx4_en_priv;
1: @@ -100567,82 +101727,83 @@ struct mlx4_en_priv;
1:  struct mlx4_en_rx_ring;
1:  
1:  struct mlx4_en_tx_ring {
1: -	u32 last_nr_txbb;
1: -	u32 cons;
1: -	long unsigned int wake_queue;
1: -	struct netdev_queue *tx_queue;
1: -	u32 (*free_tx_desc)(struct mlx4_en_priv *, struct mlx4_en_tx_ring *, int, u64, int);
1: -	struct mlx4_en_rx_ring *recycle_ring;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 prod;
1: -	unsigned int tx_dropped;
1: -	long unsigned int bytes;
1: -	long unsigned int packets;
1: -	long unsigned int tx_csum;
1: -	long unsigned int tso_packets;
1: -	long unsigned int xmit_more;
1: -	struct mlx4_bf bf;
1: -	__be32 doorbell_qpn;
1: -	__be32 mr_key;
1: -	u32 size;
1: -	u32 size_mask;
1: -	u32 full_size;
1: -	u32 buf_size;
1: -	void *buf;
1: -	struct mlx4_en_tx_info *tx_info;
1: -	int qpn;
1: -	u8 queue_index;
1: -	bool bf_enabled;
1: -	bool bf_alloced;
1: -	u8 hwtstamp_tx_type;
1: -	u8 *bounce_buf;
1: -	long unsigned int queue_stopped;
1: -	struct mlx4_hwq_resources sp_wqres;
1: -	struct mlx4_qp sp_qp;
1: -	struct mlx4_qp_context sp_context;
1: -	cpumask_t sp_affinity_mask;
1: -	enum mlx4_qp_state sp_qp_state;
1: -	u16 sp_stride;
1: -	u16 sp_cqn;
1: -	long: 64;
1: +  u32 last_nr_txbb;
1: +  u32 cons;
1: +  long unsigned int wake_queue;
1: +  struct netdev_queue *tx_queue;
1: +  u32 (*free_tx_desc)(struct mlx4_en_priv *, struct mlx4_en_tx_ring *, int, u64,
1: +                      int);
1: +  struct mlx4_en_rx_ring *recycle_ring;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 prod;
1: +  unsigned int tx_dropped;
1: +  long unsigned int bytes;
1: +  long unsigned int packets;
1: +  long unsigned int tx_csum;
1: +  long unsigned int tso_packets;
1: +  long unsigned int xmit_more;
1: +  struct mlx4_bf bf;
1: +  __be32 doorbell_qpn;
1: +  __be32 mr_key;
1: +  u32 size;
1: +  u32 size_mask;
1: +  u32 full_size;
1: +  u32 buf_size;
1: +  void *buf;
1: +  struct mlx4_en_tx_info *tx_info;
1: +  int qpn;
1: +  u8 queue_index;
1: +  bool bf_enabled;
1: +  bool bf_alloced;
1: +  u8 hwtstamp_tx_type;
1: +  u8 *bounce_buf;
1: +  long unsigned int queue_stopped;
1: +  struct mlx4_hwq_resources sp_wqres;
1: +  struct mlx4_qp sp_qp;
1: +  struct mlx4_qp_context sp_context;
1: +  cpumask_t sp_affinity_mask;
1: +  enum mlx4_qp_state sp_qp_state;
1: +  u16 sp_stride;
1: +  u16 sp_cqn;
1: +  long : 64;
1:  };
1:  
1:  struct mlx4_en_port_state {
1: -	int link_state;
1: -	int link_speed;
1: -	int transceiver;
1: -	u32 flags;
1: +  int link_state;
1: +  int link_speed;
1: +  int transceiver;
1: +  u32 flags;
1:  };
1:  
1:  struct ethtool_flow_id {
1: -	struct list_head list;
1: -	struct ethtool_rx_flow_spec flow_spec;
1: -	u64 id;
1: +  struct list_head list;
1: +  struct ethtool_rx_flow_spec flow_spec;
1: +  u64 id;
1:  };
1:  
1:  struct mlx4_en_rss_map {
1: -	int base_qpn;
1: -	struct mlx4_qp qps[128];
1: -	enum mlx4_qp_state state[128];
1: -	struct mlx4_qp *indir_qp;
1: -	enum mlx4_qp_state indir_state;
1: +  int base_qpn;
1: +  struct mlx4_qp qps[128];
1: +  enum mlx4_qp_state state[128];
1: +  struct mlx4_qp *indir_qp;
1: +  enum mlx4_qp_state indir_state;
1:  };
1:  
1:  struct mlx4_en_frag_info {
1: -	u16 frag_size;
1: -	u32 frag_stride;
1: +  u16 frag_size;
1: +  u32 frag_stride;
1:  };
1:  
1:  struct mlx4_en_stats_bitmap {
1: -	long unsigned int bitmap[3];
1: -	struct mutex mutex;
1: +  long unsigned int bitmap[3];
1: +  struct mutex mutex;
1:  };
1:  
1:  struct mlx4_en_cee_config {
1: -	bool pfc_state;
1: -	enum dcb_pfc_type dcb_pfc[8];
1: +  bool pfc_state;
1: +  enum dcb_pfc_type dcb_pfc[8];
1:  };
1:  
1:  struct mlx4_en_dev;
1: @@ -100652,660 +101813,660 @@ struct mlx4_en_port_profile;
1:  struct mlx4_en_cq;
1:  
1:  struct mlx4_en_priv {
1: -	struct mlx4_en_dev *mdev;
1: -	struct mlx4_en_port_profile *prof;
1: -	struct net_device *dev;
1: -	long unsigned int active_vlans[64];
1: -	struct mlx4_en_port_state port_state;
1: -	spinlock_t stats_lock;
1: -	struct ethtool_flow_id ethtool_rules[256];
1: -	struct list_head ethtool_list;
1: -	long unsigned int last_moder_packets[128];
1: -	long unsigned int last_moder_tx_packets;
1: -	long unsigned int last_moder_bytes[128];
1: -	long unsigned int last_moder_jiffies;
1: -	int last_moder_time[128];
1: -	u16 rx_usecs;
1: -	u16 rx_frames;
1: -	u16 tx_usecs;
1: -	u16 tx_frames;
1: -	u32 pkt_rate_low;
1: -	u16 rx_usecs_low;
1: -	u32 pkt_rate_high;
1: -	u16 rx_usecs_high;
1: -	u32 sample_interval;
1: -	u32 adaptive_rx_coal;
1: -	u32 msg_enable;
1: -	u32 loopback_ok;
1: -	u32 validate_loopback;
1: -	struct mlx4_hwq_resources res;
1: -	int link_state;
1: -	int last_link_state;
1: -	bool port_up;
1: -	int port;
1: -	int registered;
1: -	int allocated;
1: -	int stride;
1: -	unsigned char current_mac[8];
1: -	int mac_index;
1: -	unsigned int max_mtu;
1: -	int base_qpn;
1: -	int cqe_factor;
1: -	int cqe_size;
1: -	struct mlx4_en_rss_map rss_map;
1: -	__be32 ctrl_flags;
1: -	u32 flags;
1: -	u8 num_tx_rings_p_up;
1: -	u32 tx_work_limit;
1: -	u32 tx_ring_num[2];
1: -	u32 rx_ring_num;
1: -	u32 rx_skb_size;
1: -	struct mlx4_en_frag_info frag_info[4];
1: -	u8 num_frags;
1: -	u8 log_rx_info;
1: -	u8 dma_dir;
1: -	u16 rx_headroom;
1: -	struct mlx4_en_tx_ring **tx_ring[2];
1: -	struct mlx4_en_rx_ring *rx_ring[128];
1: -	struct mlx4_en_cq **tx_cq[2];
1: -	struct mlx4_en_cq *rx_cq[128];
1: -	struct mlx4_qp drop_qp;
1: -	struct work_struct rx_mode_task;
1: -	struct work_struct watchdog_task;
1: -	struct work_struct linkstate_task;
1: -	struct delayed_work stats_task;
1: -	struct delayed_work service_task;
1: -	struct mlx4_en_perf_stats pstats;
1: -	struct mlx4_en_pkt_stats pkstats;
1: -	struct mlx4_en_counter_stats pf_stats;
1: -	struct mlx4_en_flow_stats_rx rx_priority_flowstats[8];
1: -	struct mlx4_en_flow_stats_tx tx_priority_flowstats[8];
1: -	struct mlx4_en_flow_stats_rx rx_flowstats;
1: -	struct mlx4_en_flow_stats_tx tx_flowstats;
1: -	struct mlx4_en_port_stats port_stats;
1: -	struct mlx4_en_xdp_stats xdp_stats;
1: -	struct mlx4_en_phy_stats phy_stats;
1: -	struct mlx4_en_stats_bitmap stats_bitmap;
1: -	struct list_head mc_list;
1: -	struct list_head curr_list;
1: -	u64 broadcast_id;
1: -	struct mlx4_en_stat_out_mbox hw_stats;
1: -	int vids[128];
1: -	bool wol;
1: -	struct device *ddev;
1: -	struct hlist_head mac_hash[256];
1: -	struct hwtstamp_config hwtstamp_config;
1: -	u32 counter_index;
1: -	struct ieee_ets ets;
1: -	u16 maxrate[8];
1: -	enum dcbnl_cndd_states cndd_state[8];
1: -	struct mlx4_en_cee_config cee_config;
1: -	u8 dcbx_cap;
1: -	spinlock_t filters_lock;
1: -	int last_filter_id;
1: -	struct list_head filters;
1: -	struct hlist_head filter_hash[16];
1: -	u64 tunnel_reg_id;
1: -	__be16 vxlan_port;
1: -	u32 pflags;
1: -	u8 rss_key[40];
1: -	u8 rss_hash_fn;
1: +  struct mlx4_en_dev *mdev;
1: +  struct mlx4_en_port_profile *prof;
1: +  struct net_device *dev;
1: +  long unsigned int active_vlans[64];
1: +  struct mlx4_en_port_state port_state;
1: +  spinlock_t stats_lock;
1: +  struct ethtool_flow_id ethtool_rules[256];
1: +  struct list_head ethtool_list;
1: +  long unsigned int last_moder_packets[128];
1: +  long unsigned int last_moder_tx_packets;
1: +  long unsigned int last_moder_bytes[128];
1: +  long unsigned int last_moder_jiffies;
1: +  int last_moder_time[128];
1: +  u16 rx_usecs;
1: +  u16 rx_frames;
1: +  u16 tx_usecs;
1: +  u16 tx_frames;
1: +  u32 pkt_rate_low;
1: +  u16 rx_usecs_low;
1: +  u32 pkt_rate_high;
1: +  u16 rx_usecs_high;
1: +  u32 sample_interval;
1: +  u32 adaptive_rx_coal;
1: +  u32 msg_enable;
1: +  u32 loopback_ok;
1: +  u32 validate_loopback;
1: +  struct mlx4_hwq_resources res;
1: +  int link_state;
1: +  int last_link_state;
1: +  bool port_up;
1: +  int port;
1: +  int registered;
1: +  int allocated;
1: +  int stride;
1: +  unsigned char current_mac[8];
1: +  int mac_index;
1: +  unsigned int max_mtu;
1: +  int base_qpn;
1: +  int cqe_factor;
1: +  int cqe_size;
1: +  struct mlx4_en_rss_map rss_map;
1: +  __be32 ctrl_flags;
1: +  u32 flags;
1: +  u8 num_tx_rings_p_up;
1: +  u32 tx_work_limit;
1: +  u32 tx_ring_num[2];
1: +  u32 rx_ring_num;
1: +  u32 rx_skb_size;
1: +  struct mlx4_en_frag_info frag_info[4];
1: +  u8 num_frags;
1: +  u8 log_rx_info;
1: +  u8 dma_dir;
1: +  u16 rx_headroom;
1: +  struct mlx4_en_tx_ring **tx_ring[2];
1: +  struct mlx4_en_rx_ring *rx_ring[128];
1: +  struct mlx4_en_cq **tx_cq[2];
1: +  struct mlx4_en_cq *rx_cq[128];
1: +  struct mlx4_qp drop_qp;
1: +  struct work_struct rx_mode_task;
1: +  struct work_struct watchdog_task;
1: +  struct work_struct linkstate_task;
1: +  struct delayed_work stats_task;
1: +  struct delayed_work service_task;
1: +  struct mlx4_en_perf_stats pstats;
1: +  struct mlx4_en_pkt_stats pkstats;
1: +  struct mlx4_en_counter_stats pf_stats;
1: +  struct mlx4_en_flow_stats_rx rx_priority_flowstats[8];
1: +  struct mlx4_en_flow_stats_tx tx_priority_flowstats[8];
1: +  struct mlx4_en_flow_stats_rx rx_flowstats;
1: +  struct mlx4_en_flow_stats_tx tx_flowstats;
1: +  struct mlx4_en_port_stats port_stats;
1: +  struct mlx4_en_xdp_stats xdp_stats;
1: +  struct mlx4_en_phy_stats phy_stats;
1: +  struct mlx4_en_stats_bitmap stats_bitmap;
1: +  struct list_head mc_list;
1: +  struct list_head curr_list;
1: +  u64 broadcast_id;
1: +  struct mlx4_en_stat_out_mbox hw_stats;
1: +  int vids[128];
1: +  bool wol;
1: +  struct device *ddev;
1: +  struct hlist_head mac_hash[256];
1: +  struct hwtstamp_config hwtstamp_config;
1: +  u32 counter_index;
1: +  struct ieee_ets ets;
1: +  u16 maxrate[8];
1: +  enum dcbnl_cndd_states cndd_state[8];
1: +  struct mlx4_en_cee_config cee_config;
1: +  u8 dcbx_cap;
1: +  spinlock_t filters_lock;
1: +  int last_filter_id;
1: +  struct list_head filters;
1: +  struct hlist_head filter_hash[16];
1: +  u64 tunnel_reg_id;
1: +  __be16 vxlan_port;
1: +  u32 pflags;
1: +  u8 rss_key[40];
1: +  u8 rss_hash_fn;
1:  };
1:  
1:  struct mlx4_en_rx_ring {
1: -	struct mlx4_hwq_resources wqres;
1: -	u32 size;
1: -	u32 actual_size;
1: -	u32 size_mask;
1: -	u16 stride;
1: -	u16 log_stride;
1: -	u16 cqn;
1: -	u32 prod;
1: -	u32 cons;
1: -	u32 buf_size;
1: -	u8 fcs_del;
1: -	void *buf;
1: -	void *rx_info;
1: -	struct bpf_prog *xdp_prog;
1: -	struct mlx4_en_page_cache page_cache;
1: -	long unsigned int bytes;
1: -	long unsigned int packets;
1: -	long unsigned int csum_ok;
1: -	long unsigned int csum_none;
1: -	long unsigned int csum_complete;
1: -	long unsigned int rx_alloc_pages;
1: -	long unsigned int xdp_drop;
1: -	long unsigned int xdp_tx;
1: -	long unsigned int xdp_tx_full;
1: -	long unsigned int dropped;
1: -	int hwtstamp_rx_filter;
1: -	cpumask_var_t affinity_mask;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct xdp_rxq_info xdp_rxq;
1: +  struct mlx4_hwq_resources wqres;
1: +  u32 size;
1: +  u32 actual_size;
1: +  u32 size_mask;
1: +  u16 stride;
1: +  u16 log_stride;
1: +  u16 cqn;
1: +  u32 prod;
1: +  u32 cons;
1: +  u32 buf_size;
1: +  u8 fcs_del;
1: +  void *buf;
1: +  void *rx_info;
1: +  struct bpf_prog *xdp_prog;
1: +  struct mlx4_en_page_cache page_cache;
1: +  long unsigned int bytes;
1: +  long unsigned int packets;
1: +  long unsigned int csum_ok;
1: +  long unsigned int csum_none;
1: +  long unsigned int csum_complete;
1: +  long unsigned int rx_alloc_pages;
1: +  long unsigned int xdp_drop;
1: +  long unsigned int xdp_tx;
1: +  long unsigned int xdp_tx_full;
1: +  long unsigned int dropped;
1: +  int hwtstamp_rx_filter;
1: +  cpumask_var_t affinity_mask;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct xdp_rxq_info xdp_rxq;
1:  };
1:  
1:  struct mlx4_en_cq {
1: -	struct mlx4_cq mcq;
1: -	struct mlx4_hwq_resources wqres;
1: -	int ring;
1: -	struct net_device *dev;
1: -	union {
1: -		struct napi_struct napi;
1: -		bool xdp_busy;
1: -	};
1: -	int size;
1: -	int buf_size;
1: -	int vector;
1: -	enum cq_type type;
1: -	u16 moder_time;
1: -	u16 moder_cnt;
1: -	struct mlx4_cqe *buf;
1: -	struct irq_desc *irq_desc;
1: +  struct mlx4_cq mcq;
1: +  struct mlx4_hwq_resources wqres;
1: +  int ring;
1: +  struct net_device *dev;
1: +  union {
1: +    struct napi_struct napi;
1: +    bool xdp_busy;
1: +  };
1: +  int size;
1: +  int buf_size;
1: +  int vector;
1: +  enum cq_type type;
1: +  u16 moder_time;
1: +  u16 moder_cnt;
1: +  struct mlx4_cqe *buf;
1: +  struct irq_desc *irq_desc;
1:  };
1:  
1:  struct mlx4_en_port_profile {
1: -	u32 flags;
1: -	u32 tx_ring_num[2];
1: -	u32 rx_ring_num;
1: -	u32 tx_ring_size;
1: -	u32 rx_ring_size;
1: -	u8 num_tx_rings_p_up;
1: -	u8 rx_pause;
1: -	u8 rx_ppp;
1: -	u8 tx_pause;
1: -	u8 tx_ppp;
1: -	u8 num_up;
1: -	int rss_rings;
1: -	int inline_thold;
1: -	struct hwtstamp_config hwtstamp_config;
1: +  u32 flags;
1: +  u32 tx_ring_num[2];
1: +  u32 rx_ring_num;
1: +  u32 tx_ring_size;
1: +  u32 rx_ring_size;
1: +  u8 num_tx_rings_p_up;
1: +  u8 rx_pause;
1: +  u8 rx_ppp;
1: +  u8 tx_pause;
1: +  u8 tx_ppp;
1: +  u8 num_up;
1: +  int rss_rings;
1: +  int inline_thold;
1: +  struct hwtstamp_config hwtstamp_config;
1:  };
1:  
1:  struct mlx4_en_profile {
1: -	int udp_rss;
1: -	u8 rss_mask;
1: -	u32 active_ports;
1: -	u32 small_pkt_int;
1: -	u8 no_reset;
1: -	u8 max_num_tx_rings_p_up;
1: -	struct mlx4_en_port_profile prof[3];
1: +  int udp_rss;
1: +  u8 rss_mask;
1: +  u32 active_ports;
1: +  u32 small_pkt_int;
1: +  u8 no_reset;
1: +  u8 max_num_tx_rings_p_up;
1: +  struct mlx4_en_port_profile prof[3];
1:  };
1:  
1:  struct mlx4_en_dev {
1: -	struct mlx4_dev *dev;
1: -	struct pci_dev *pdev;
1: -	struct mutex state_lock;
1: -	struct net_device *pndev[3];
1: -	struct net_device *upper[3];
1: -	u32 port_cnt;
1: -	bool device_up;
1: -	struct mlx4_en_profile profile;
1: -	u32 LSO_support;
1: -	struct workqueue_struct *workqueue;
1: -	struct device *dma_device;
1: -	void *uar_map;
1: -	struct mlx4_uar priv_uar;
1: -	struct mlx4_mr mr;
1: -	u32 priv_pdn;
1: -	spinlock_t uar_lock;
1: -	u8 mac_removed[3];
1: -	u32 nominal_c_mult;
1: -	struct cyclecounter cycles;
1: -	seqlock_t clock_lock;
1: -	struct timecounter clock;
1: -	long unsigned int last_overflow_check;
1: -	struct ptp_clock *ptp_clock;
1: -	struct ptp_clock_info ptp_clock_info;
1: -	struct notifier_block nb;
1: -};
1: -
1: -enum {
1: -	MLX4_EN_FLAG_PROMISC = 1,
1: -	MLX4_EN_FLAG_MC_PROMISC = 2,
1: -	MLX4_EN_FLAG_ENABLE_HW_LOOPBACK = 4,
1: -	MLX4_EN_FLAG_RX_FILTER_NEEDED = 8,
1: -	MLX4_EN_FLAG_FORCE_PROMISC = 16,
1: -	MLX4_EN_FLAG_RX_CSUM_NON_TCP_UDP = 32,
1: -	MLX4_EN_FLAG_DCB_ENABLED = 64,
1: -};
1: -
1: -enum {
1: -	MLX4_OPCODE_NOP = 0,
1: -	MLX4_OPCODE_SEND_INVAL = 1,
1: -	MLX4_OPCODE_RDMA_WRITE = 8,
1: -	MLX4_OPCODE_RDMA_WRITE_IMM = 9,
1: -	MLX4_OPCODE_SEND = 10,
1: -	MLX4_OPCODE_SEND_IMM = 11,
1: -	MLX4_OPCODE_LSO = 14,
1: -	MLX4_OPCODE_RDMA_READ = 16,
1: -	MLX4_OPCODE_ATOMIC_CS = 17,
1: -	MLX4_OPCODE_ATOMIC_FA = 18,
1: -	MLX4_OPCODE_MASKED_ATOMIC_CS = 20,
1: -	MLX4_OPCODE_MASKED_ATOMIC_FA = 21,
1: -	MLX4_OPCODE_BIND_MW = 24,
1: -	MLX4_OPCODE_FMR = 25,
1: -	MLX4_OPCODE_LOCAL_INVAL = 27,
1: -	MLX4_OPCODE_CONFIG_CMD = 31,
1: -	MLX4_RECV_OPCODE_RDMA_WRITE_IMM = 0,
1: -	MLX4_RECV_OPCODE_SEND = 1,
1: -	MLX4_RECV_OPCODE_SEND_IMM = 2,
1: -	MLX4_RECV_OPCODE_SEND_INVAL = 3,
1: -	MLX4_CQE_OPCODE_ERROR = 30,
1: -	MLX4_CQE_OPCODE_RESIZE = 22,
1: +  struct mlx4_dev *dev;
1: +  struct pci_dev *pdev;
1: +  struct mutex state_lock;
1: +  struct net_device *pndev[3];
1: +  struct net_device *upper[3];
1: +  u32 port_cnt;
1: +  bool device_up;
1: +  struct mlx4_en_profile profile;
1: +  u32 LSO_support;
1: +  struct workqueue_struct *workqueue;
1: +  struct device *dma_device;
1: +  void *uar_map;
1: +  struct mlx4_uar priv_uar;
1: +  struct mlx4_mr mr;
1: +  u32 priv_pdn;
1: +  spinlock_t uar_lock;
1: +  u8 mac_removed[3];
1: +  u32 nominal_c_mult;
1: +  struct cyclecounter cycles;
1: +  seqlock_t clock_lock;
1: +  struct timecounter clock;
1: +  long unsigned int last_overflow_check;
1: +  struct ptp_clock *ptp_clock;
1: +  struct ptp_clock_info ptp_clock_info;
1: +  struct notifier_block nb;
1: +};
1: +
1: +enum {
1: +  MLX4_EN_FLAG_PROMISC = 1,
1: +  MLX4_EN_FLAG_MC_PROMISC = 2,
1: +  MLX4_EN_FLAG_ENABLE_HW_LOOPBACK = 4,
1: +  MLX4_EN_FLAG_RX_FILTER_NEEDED = 8,
1: +  MLX4_EN_FLAG_FORCE_PROMISC = 16,
1: +  MLX4_EN_FLAG_RX_CSUM_NON_TCP_UDP = 32,
1: +  MLX4_EN_FLAG_DCB_ENABLED = 64,
1: +};
1: +
1: +enum {
1: +  MLX4_OPCODE_NOP = 0,
1: +  MLX4_OPCODE_SEND_INVAL = 1,
1: +  MLX4_OPCODE_RDMA_WRITE = 8,
1: +  MLX4_OPCODE_RDMA_WRITE_IMM = 9,
1: +  MLX4_OPCODE_SEND = 10,
1: +  MLX4_OPCODE_SEND_IMM = 11,
1: +  MLX4_OPCODE_LSO = 14,
1: +  MLX4_OPCODE_RDMA_READ = 16,
1: +  MLX4_OPCODE_ATOMIC_CS = 17,
1: +  MLX4_OPCODE_ATOMIC_FA = 18,
1: +  MLX4_OPCODE_MASKED_ATOMIC_CS = 20,
1: +  MLX4_OPCODE_MASKED_ATOMIC_FA = 21,
1: +  MLX4_OPCODE_BIND_MW = 24,
1: +  MLX4_OPCODE_FMR = 25,
1: +  MLX4_OPCODE_LOCAL_INVAL = 27,
1: +  MLX4_OPCODE_CONFIG_CMD = 31,
1: +  MLX4_RECV_OPCODE_RDMA_WRITE_IMM = 0,
1: +  MLX4_RECV_OPCODE_SEND = 1,
1: +  MLX4_RECV_OPCODE_SEND_IMM = 2,
1: +  MLX4_RECV_OPCODE_SEND_INVAL = 3,
1: +  MLX4_CQE_OPCODE_ERROR = 30,
1: +  MLX4_CQE_OPCODE_RESIZE = 22,
1:  };
1:  
1:  struct mlx4_err_cqe {
1: -	__be32 my_qpn;
1: -	u32 reserved1[5];
1: -	__be16 wqe_index;
1: -	u8 vendor_err_syndrome;
1: -	u8 syndrome;
1: -	u8 reserved2[3];
1: -	u8 owner_sr_opcode;
1: +  __be32 my_qpn;
1: +  u32 reserved1[5];
1: +  __be16 wqe_index;
1: +  u8 vendor_err_syndrome;
1: +  u8 syndrome;
1: +  u8 reserved2[3];
1: +  u8 owner_sr_opcode;
1:  };
1:  
1:  enum {
1: -	MLX4_CQE_OWNER_MASK = 128,
1: -	MLX4_CQE_IS_SEND_MASK = 64,
1: -	MLX4_CQE_OPCODE_MASK = 31,
1: +  MLX4_CQE_OWNER_MASK = 128,
1: +  MLX4_CQE_IS_SEND_MASK = 64,
1: +  MLX4_CQE_OPCODE_MASK = 31,
1:  };
1:  
1:  union mlx4_wqe_qpn_vlan {
1: -	struct {
1: -		__be16 vlan_tag;
1: -		u8 ins_vlan;
1: -		u8 fence_size;
1: -	};
1: -	__be32 bf_qpn;
1: +  struct {
1: +    __be16 vlan_tag;
1: +    u8 ins_vlan;
1: +    u8 fence_size;
1: +  };
1: +  __be32 bf_qpn;
1:  };
1:  
1:  struct mlx4_wqe_ctrl_seg {
1: -	__be32 owner_opcode;
1: -	union mlx4_wqe_qpn_vlan qpn_vlan;
1: -	union {
1: -		__be32 srcrb_flags;
1: -		__be16 srcrb_flags16[2];
1: -	};
1: -	__be32 imm;
1: +  __be32 owner_opcode;
1: +  union mlx4_wqe_qpn_vlan qpn_vlan;
1: +  union {
1: +    __be32 srcrb_flags;
1: +    __be16 srcrb_flags16[2];
1: +  };
1: +  __be32 imm;
1:  };
1:  
1:  struct mlx4_wqe_lso_seg {
1: -	__be32 mss_hdr_size;
1: -	__be32 header[0];
1: +  __be32 mss_hdr_size;
1: +  __be32 header[0];
1:  };
1:  
1:  struct mlx4_wqe_data_seg {
1: -	__be32 byte_count;
1: -	__be32 lkey;
1: -	__be64 addr;
1: +  __be32 byte_count;
1: +  __be32 lkey;
1: +  __be64 addr;
1:  };
1:  
1:  enum {
1: -	MLX4_INLINE_ALIGN = 64,
1: -	MLX4_INLINE_SEG = 2147483648,
1: +  MLX4_INLINE_ALIGN = 64,
1: +  MLX4_INLINE_SEG = 2147483648,
1:  };
1:  
1:  struct mlx4_wqe_inline_seg {
1: -	__be32 byte_count;
1: +  __be32 byte_count;
1:  };
1:  
1:  struct mlx4_en_tx_desc {
1: -	struct mlx4_wqe_ctrl_seg ctrl;
1: -	union {
1: -		struct mlx4_wqe_data_seg data;
1: -		struct mlx4_wqe_lso_seg lso;
1: -		struct mlx4_wqe_inline_seg inl;
1: -	};
1: +  struct mlx4_wqe_ctrl_seg ctrl;
1: +  union {
1: +    struct mlx4_wqe_data_seg data;
1: +    struct mlx4_wqe_lso_seg lso;
1: +    struct mlx4_wqe_inline_seg inl;
1: +  };
1:  };
1:  
1:  struct mlx4_en_rx_alloc {
1: -	struct page *page;
1: -	dma_addr_t dma;
1: -	u32 page_offset;
1: +  struct page *page;
1: +  dma_addr_t dma;
1: +  u32 page_offset;
1:  };
1:  
1:  enum {
1: -	MLX4_CQE_L2_TUNNEL_IPOK = 2147483648,
1: -	MLX4_CQE_CVLAN_PRESENT_MASK = 536870912,
1: -	MLX4_CQE_SVLAN_PRESENT_MASK = 1073741824,
1: -	MLX4_CQE_L2_TUNNEL = 134217728,
1: -	MLX4_CQE_L2_TUNNEL_CSUM = 67108864,
1: -	MLX4_CQE_L2_TUNNEL_IPV4 = 33554432,
1: -	MLX4_CQE_QPN_MASK = 16777215,
1: -	MLX4_CQE_VID_MASK = 4095,
1: +  MLX4_CQE_L2_TUNNEL_IPOK = 2147483648,
1: +  MLX4_CQE_CVLAN_PRESENT_MASK = 536870912,
1: +  MLX4_CQE_SVLAN_PRESENT_MASK = 1073741824,
1: +  MLX4_CQE_L2_TUNNEL = 134217728,
1: +  MLX4_CQE_L2_TUNNEL_CSUM = 67108864,
1: +  MLX4_CQE_L2_TUNNEL_IPV4 = 33554432,
1: +  MLX4_CQE_QPN_MASK = 16777215,
1: +  MLX4_CQE_VID_MASK = 4095,
1:  };
1:  
1:  enum {
1: -	MLX4_CQE_STATUS_IPV4 = 64,
1: -	MLX4_CQE_STATUS_IPV4F = 128,
1: -	MLX4_CQE_STATUS_IPV6 = 256,
1: -	MLX4_CQE_STATUS_IPV4OPT = 512,
1: -	MLX4_CQE_STATUS_TCP = 1024,
1: -	MLX4_CQE_STATUS_UDP = 2048,
1: -	MLX4_CQE_STATUS_IPOK = 4096,
1: +  MLX4_CQE_STATUS_IPV4 = 64,
1: +  MLX4_CQE_STATUS_IPV4F = 128,
1: +  MLX4_CQE_STATUS_IPV6 = 256,
1: +  MLX4_CQE_STATUS_IPV4OPT = 512,
1: +  MLX4_CQE_STATUS_TCP = 1024,
1: +  MLX4_CQE_STATUS_UDP = 2048,
1: +  MLX4_CQE_STATUS_IPOK = 4096,
1:  };
1:  
1:  enum {
1: -	MLX4_CQE_LLC = 1,
1: -	MLX4_CQE_SNAP = 2,
1: -	MLX4_CQE_BAD_FCS = 16,
1: +  MLX4_CQE_LLC = 1,
1: +  MLX4_CQE_SNAP = 2,
1: +  MLX4_CQE_BAD_FCS = 16,
1:  };
1:  
1:  struct mlx4_rss_context {
1: -	__be32 base_qpn;
1: -	__be32 default_qpn;
1: -	u16 reserved;
1: -	u8 hash_fn;
1: -	u8 flags;
1: -	__be32 rss_key[10];
1: -	__be32 base_qpn_udp;
1: +  __be32 base_qpn;
1: +  __be32 default_qpn;
1: +  u16 reserved;
1: +  u8 hash_fn;
1: +  u8 flags;
1: +  __be32 rss_key[10];
1: +  __be32 base_qpn_udp;
1:  };
1:  
1:  struct mlx4_en_rx_desc {
1: -	struct mlx4_wqe_data_seg data[0];
1: +  struct mlx4_wqe_data_seg data[0];
1:  };
1:  
1:  struct mlx4_mac_entry {
1: -	struct hlist_node hlist;
1: -	unsigned char mac[8];
1: -	u64 reg_id;
1: -	struct callback_head rcu;
1: +  struct hlist_node hlist;
1: +  unsigned char mac[8];
1: +  u64 reg_id;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum tunable_id {
1: -	ETHTOOL_ID_UNSPEC = 0,
1: -	ETHTOOL_RX_COPYBREAK = 1,
1: -	ETHTOOL_TX_COPYBREAK = 2,
1: -	ETHTOOL_PFC_PREVENTION_TOUT = 3,
1: -	__ETHTOOL_TUNABLE_COUNT = 4,
1: +  ETHTOOL_ID_UNSPEC = 0,
1: +  ETHTOOL_RX_COPYBREAK = 1,
1: +  ETHTOOL_TX_COPYBREAK = 2,
1: +  ETHTOOL_PFC_PREVENTION_TOUT = 3,
1: +  __ETHTOOL_TUNABLE_COUNT = 4,
1:  };
1:  
1:  enum mlx4_module_id {
1: -	MLX4_MODULE_ID_SFP = 3,
1: -	MLX4_MODULE_ID_QSFP = 12,
1: -	MLX4_MODULE_ID_QSFP_PLUS = 13,
1: -	MLX4_MODULE_ID_QSFP28 = 17,
1: +  MLX4_MODULE_ID_SFP = 3,
1: +  MLX4_MODULE_ID_QSFP = 12,
1: +  MLX4_MODULE_ID_QSFP_PLUS = 13,
1: +  MLX4_MODULE_ID_QSFP28 = 17,
1:  };
1:  
1:  enum mlx4_ptys_proto {
1: -	MLX4_PTYS_IB = 1,
1: -	MLX4_PTYS_EN = 4,
1: +  MLX4_PTYS_IB = 1,
1: +  MLX4_PTYS_EN = 4,
1:  };
1:  
1:  enum mlx4_ptys_flags {
1: -	MLX4_PTYS_AN_DISABLE_CAP = 32,
1: -	MLX4_PTYS_AN_DISABLE_ADMIN = 64,
1: +  MLX4_PTYS_AN_DISABLE_CAP = 32,
1: +  MLX4_PTYS_AN_DISABLE_ADMIN = 64,
1:  };
1:  
1:  enum mlx4_link_mode {
1: -	MLX4_1000BASE_CX_SGMII = 0,
1: -	MLX4_1000BASE_KX = 1,
1: -	MLX4_10GBASE_CX4 = 2,
1: -	MLX4_10GBASE_KX4 = 3,
1: -	MLX4_10GBASE_KR = 4,
1: -	MLX4_20GBASE_KR2 = 5,
1: -	MLX4_40GBASE_CR4 = 6,
1: -	MLX4_40GBASE_KR4 = 7,
1: -	MLX4_56GBASE_KR4 = 8,
1: -	MLX4_10GBASE_CR = 12,
1: -	MLX4_10GBASE_SR = 13,
1: -	MLX4_40GBASE_SR4 = 15,
1: -	MLX4_56GBASE_CR4 = 17,
1: -	MLX4_56GBASE_SR4 = 18,
1: -	MLX4_100BASE_TX = 24,
1: -	MLX4_1000BASE_T = 25,
1: -	MLX4_10GBASE_T = 26,
1: +  MLX4_1000BASE_CX_SGMII = 0,
1: +  MLX4_1000BASE_KX = 1,
1: +  MLX4_10GBASE_CX4 = 2,
1: +  MLX4_10GBASE_KX4 = 3,
1: +  MLX4_10GBASE_KR = 4,
1: +  MLX4_20GBASE_KR2 = 5,
1: +  MLX4_40GBASE_CR4 = 6,
1: +  MLX4_40GBASE_KR4 = 7,
1: +  MLX4_56GBASE_KR4 = 8,
1: +  MLX4_10GBASE_CR = 12,
1: +  MLX4_10GBASE_SR = 13,
1: +  MLX4_40GBASE_SR4 = 15,
1: +  MLX4_56GBASE_CR4 = 17,
1: +  MLX4_56GBASE_SR4 = 18,
1: +  MLX4_100BASE_TX = 24,
1: +  MLX4_1000BASE_T = 25,
1: +  MLX4_10GBASE_T = 26,
1:  };
1:  
1:  enum mlx4_en_port_flag {
1: -	MLX4_EN_PORT_ANC = 1,
1: -	MLX4_EN_PORT_ANE = 2,
1: +  MLX4_EN_PORT_ANC = 1,
1: +  MLX4_EN_PORT_ANE = 2,
1:  };
1:  
1:  enum mlx4_en_wol {
1: -	MLX4_EN_WOL_MAGIC = 0,
1: -	MLX4_EN_WOL_ENABLED = 0,
1: +  MLX4_EN_WOL_MAGIC = 0,
1: +  MLX4_EN_WOL_ENABLED = 0,
1:  };
1:  
1:  struct bitmap_iterator {
1: -	long unsigned int *stats_bitmap;
1: -	unsigned int count;
1: -	unsigned int iterator;
1: -	bool advance_array;
1: +  long unsigned int *stats_bitmap;
1: +  unsigned int count;
1: +  unsigned int iterator;
1: +  bool advance_array;
1:  };
1:  
1:  enum ethtool_report {
1: -	SUPPORTED___2 = 0,
1: -	ADVERTISED = 1,
1: +  SUPPORTED___2 = 0,
1: +  ADVERTISED = 1,
1:  };
1:  
1:  struct ptys2ethtool_config {
1: -	long unsigned int supported[2];
1: -	long unsigned int advertised[2];
1: -	u32 speed;
1: +  long unsigned int supported[2];
1: +  long unsigned int advertised[2];
1: +  u32 speed;
1:  };
1:  
1:  struct mlx4_set_vlan_fltr_mbox {
1: -	__be32 entry[128];
1: +  __be32 entry[128];
1:  };
1:  
1:  enum {
1: -	MLX4_EN_100M_SPEED = 4,
1: -	MLX4_EN_10G_SPEED_XAUI = 0,
1: -	MLX4_EN_10G_SPEED_XFI = 1,
1: -	MLX4_EN_1G_SPEED = 2,
1: -	MLX4_EN_20G_SPEED = 8,
1: -	MLX4_EN_40G_SPEED = 64,
1: -	MLX4_EN_56G_SPEED = 32,
1: -	MLX4_EN_OTHER_SPEED = 15,
1: +  MLX4_EN_100M_SPEED = 4,
1: +  MLX4_EN_10G_SPEED_XAUI = 0,
1: +  MLX4_EN_10G_SPEED_XFI = 1,
1: +  MLX4_EN_1G_SPEED = 2,
1: +  MLX4_EN_20G_SPEED = 8,
1: +  MLX4_EN_40G_SPEED = 64,
1: +  MLX4_EN_56G_SPEED = 32,
1: +  MLX4_EN_OTHER_SPEED = 15,
1:  };
1:  
1:  struct mlx4_en_query_port_context {
1: -	u8 link_up;
1: -	u8 autoneg;
1: -	__be16 mtu;
1: -	u8 reserved2;
1: -	u8 link_speed;
1: -	u16 reserved3[5];
1: -	__be64 mac;
1: -	u8 transceiver;
1: +  u8 link_up;
1: +  u8 autoneg;
1: +  __be16 mtu;
1: +  u8 reserved2;
1: +  u8 link_speed;
1: +  u16 reserved3[5];
1: +  __be64 mac;
1: +  u8 transceiver;
1:  };
1:  
1:  struct mlx4_en_stat_out_flow_control_mbox {
1: -	__be64 rx_pause;
1: -	__be64 rx_pause_duration;
1: -	__be64 rx_pause_transition;
1: -	__be64 tx_pause;
1: -	__be64 tx_pause_duration;
1: -	__be64 tx_pause_transition;
1: -	__be64 reserved[2];
1: +  __be64 rx_pause;
1: +  __be64 rx_pause_duration;
1: +  __be64 rx_pause_transition;
1: +  __be64 tx_pause;
1: +  __be64 tx_pause_duration;
1: +  __be64 tx_pause_transition;
1: +  __be64 reserved[2];
1:  };
1:  
1:  enum {
1: -	MLX4_DUMP_ETH_STATS_FLOW_CONTROL = 4096,
1: +  MLX4_DUMP_ETH_STATS_FLOW_CONTROL = 4096,
1:  };
1:  
1:  enum {
1: -	MLX4_CQ_DB_REQ_NOT_SOL = 16777216,
1: -	MLX4_CQ_DB_REQ_NOT = 33554432,
1: +  MLX4_CQ_DB_REQ_NOT_SOL = 16777216,
1: +  MLX4_CQ_DB_REQ_NOT = 33554432,
1:  };
1:  
1:  struct ifbond {
1: -	__s32 bond_mode;
1: -	__s32 num_slaves;
1: -	__s32 miimon;
1: +  __s32 bond_mode;
1: +  __s32 num_slaves;
1: +  __s32 miimon;
1:  };
1:  
1:  typedef struct ifbond ifbond;
1:  
1:  struct ifslave {
1: -	__s32 slave_id;
1: -	char slave_name[16];
1: -	__s8 link;
1: -	__s8 state;
1: -	__u32 link_failure_count;
1: +  __s32 slave_id;
1: +  char slave_name[16];
1: +  __s8 link;
1: +  __s8 state;
1: +  __u32 link_failure_count;
1:  };
1:  
1:  typedef struct ifslave ifslave;
1:  
1:  struct netdev_bonding_info {
1: -	ifslave slave;
1: -	ifbond master;
1: +  ifslave slave;
1: +  ifbond master;
1:  };
1:  
1:  struct netdev_notifier_bonding_info {
1: -	struct netdev_notifier_info info;
1: -	struct netdev_bonding_info bonding_info;
1: +  struct netdev_notifier_info info;
1: +  struct netdev_bonding_info bonding_info;
1:  };
1:  
1:  enum {
1: -	MLX4_QP_RATE_LIMIT_NONE = 0,
1: -	MLX4_QP_RATE_LIMIT_KBS = 1,
1: -	MLX4_QP_RATE_LIMIT_MBS = 2,
1: -	MLX4_QP_RATE_LIMIT_GBS = 3,
1: +  MLX4_QP_RATE_LIMIT_NONE = 0,
1: +  MLX4_QP_RATE_LIMIT_KBS = 1,
1: +  MLX4_QP_RATE_LIMIT_MBS = 2,
1: +  MLX4_QP_RATE_LIMIT_GBS = 3,
1:  };
1:  
1:  enum {
1: -	VXLAN_STEER_BY_OUTER_MAC = 1,
1: -	VXLAN_STEER_BY_OUTER_VLAN = 2,
1: -	VXLAN_STEER_BY_VSID_VNI = 4,
1: -	VXLAN_STEER_BY_INNER_MAC = 8,
1: -	VXLAN_STEER_BY_INNER_VLAN = 16,
1: +  VXLAN_STEER_BY_OUTER_MAC = 1,
1: +  VXLAN_STEER_BY_OUTER_VLAN = 2,
1: +  VXLAN_STEER_BY_VSID_VNI = 4,
1: +  VXLAN_STEER_BY_INNER_MAC = 8,
1: +  VXLAN_STEER_BY_INNER_VLAN = 16,
1:  };
1:  
1:  enum {
1: -	MLX4_MCAST_CONFIG = 0,
1: -	MLX4_MCAST_DISABLE = 1,
1: -	MLX4_MCAST_ENABLE = 2,
1: +  MLX4_MCAST_CONFIG = 0,
1: +  MLX4_MCAST_DISABLE = 1,
1: +  MLX4_MCAST_ENABLE = 2,
1:  };
1:  
1:  enum mlx4_en_mclist_act {
1: -	MCLIST_NONE = 0,
1: -	MCLIST_REM = 1,
1: -	MCLIST_ADD = 2,
1: +  MCLIST_NONE = 0,
1: +  MCLIST_REM = 1,
1: +  MCLIST_ADD = 2,
1:  };
1:  
1:  struct mlx4_en_mc_list {
1: -	struct list_head list;
1: -	enum mlx4_en_mclist_act action;
1: -	u8 addr[6];
1: -	u64 reg_id;
1: -	u64 tunnel_reg_id;
1: +  struct list_head list;
1: +  enum mlx4_en_mclist_act action;
1: +  u8 addr[6];
1: +  u64 reg_id;
1: +  u64 tunnel_reg_id;
1:  };
1:  
1:  struct mlx4_en_filter {
1: -	struct list_head next;
1: -	struct work_struct work;
1: -	u8 ip_proto;
1: -	__be32 src_ip;
1: -	__be32 dst_ip;
1: -	__be16 src_port;
1: -	__be16 dst_port;
1: -	int rxq_index;
1: -	struct mlx4_en_priv *priv;
1: -	u32 flow_id;
1: -	int id;
1: -	u64 reg_id;
1: -	u8 activated;
1: -	struct hlist_node filter_chain;
1: +  struct list_head next;
1: +  struct work_struct work;
1: +  u8 ip_proto;
1: +  __be32 src_ip;
1: +  __be32 dst_ip;
1: +  __be16 src_port;
1: +  __be16 dst_port;
1: +  int rxq_index;
1: +  struct mlx4_en_priv *priv;
1: +  u32 flow_id;
1: +  int id;
1: +  u64 reg_id;
1: +  u8 activated;
1: +  struct hlist_node filter_chain;
1:  };
1:  
1:  struct mlx4_en_bond {
1: -	struct work_struct work;
1: -	struct mlx4_en_priv *priv;
1: -	int is_bonded;
1: -	struct mlx4_port_map port_map;
1: +  struct work_struct work;
1: +  struct mlx4_en_priv *priv;
1: +  int is_bonded;
1: +  struct mlx4_port_map port_map;
1:  };
1:  
1:  struct mlx4_ts_cqe {
1: -	__be32 vlan_my_qpn;
1: -	__be32 immed_rss_invalid;
1: -	__be32 g_mlpath_rqpn;
1: -	__be32 timestamp_hi;
1: -	__be16 status;
1: -	u8 ipv6_ext_mask;
1: -	u8 badfcs_enc;
1: -	__be32 byte_cnt;
1: -	__be16 wqe_index;
1: -	__be16 checksum;
1: -	u8 reserved;
1: -	__be16 timestamp_lo;
1: -	u8 owner_sr_opcode;
1: +  __be32 vlan_my_qpn;
1: +  __be32 immed_rss_invalid;
1: +  __be32 g_mlpath_rqpn;
1: +  __be32 timestamp_hi;
1: +  __be16 status;
1: +  u8 ipv6_ext_mask;
1: +  u8 badfcs_enc;
1: +  __be32 byte_cnt;
1: +  __be16 wqe_index;
1: +  __be16 checksum;
1: +  u8 reserved;
1: +  __be16 timestamp_lo;
1: +  u8 owner_sr_opcode;
1:  } __attribute__((packed));
1:  
1:  enum mlx4_en_congestion_control_algorithm {
1: -	MLX4_CTRL_ALGO_802_1_QAU_REACTION_POINT = 0,
1: +  MLX4_CTRL_ALGO_802_1_QAU_REACTION_POINT = 0,
1:  };
1:  
1:  enum mlx4_en_congestion_control_opmod {
1: -	MLX4_CONGESTION_CONTROL_GET_PARAMS = 0,
1: -	MLX4_CONGESTION_CONTROL_GET_STATISTICS = 1,
1: -	MLX4_CONGESTION_CONTROL_SET_PARAMS = 4,
1: +  MLX4_CONGESTION_CONTROL_GET_PARAMS = 0,
1: +  MLX4_CONGESTION_CONTROL_GET_STATISTICS = 1,
1: +  MLX4_CONGESTION_CONTROL_SET_PARAMS = 4,
1:  };
1:  
1:  enum {
1: -	MLX4_CEE_STATE_DOWN = 0,
1: -	MLX4_CEE_STATE_UP = 1,
1: +  MLX4_CEE_STATE_DOWN = 0,
1: +  MLX4_CEE_STATE_UP = 1,
1:  };
1:  
1:  struct mlx4_congestion_control_mb_prio_802_1_qau_params {
1: -	__be32 modify_enable_high;
1: -	__be32 modify_enable_low;
1: -	__be32 reserved1;
1: -	__be32 extended_enable;
1: -	__be32 rppp_max_rps;
1: -	__be32 rpg_time_reset;
1: -	__be32 rpg_byte_reset;
1: -	__be32 rpg_threshold;
1: -	__be32 rpg_max_rate;
1: -	__be32 rpg_ai_rate;
1: -	__be32 rpg_hai_rate;
1: -	__be32 rpg_gd;
1: -	__be32 rpg_min_dec_fac;
1: -	__be32 rpg_min_rate;
1: -	__be32 max_time_rise;
1: -	__be32 max_byte_rise;
1: -	__be32 max_qdelta;
1: -	__be32 min_qoffset;
1: -	__be32 gd_coefficient;
1: -	__be32 reserved2[5];
1: -	__be32 cp_sample_base;
1: -	__be32 reserved3[39];
1: +  __be32 modify_enable_high;
1: +  __be32 modify_enable_low;
1: +  __be32 reserved1;
1: +  __be32 extended_enable;
1: +  __be32 rppp_max_rps;
1: +  __be32 rpg_time_reset;
1: +  __be32 rpg_byte_reset;
1: +  __be32 rpg_threshold;
1: +  __be32 rpg_max_rate;
1: +  __be32 rpg_ai_rate;
1: +  __be32 rpg_hai_rate;
1: +  __be32 rpg_gd;
1: +  __be32 rpg_min_dec_fac;
1: +  __be32 rpg_min_rate;
1: +  __be32 max_time_rise;
1: +  __be32 max_byte_rise;
1: +  __be32 max_qdelta;
1: +  __be32 min_qoffset;
1: +  __be32 gd_coefficient;
1: +  __be32 reserved2[5];
1: +  __be32 cp_sample_base;
1: +  __be32 reserved3[39];
1:  };
1:  
1:  struct mlx4_congestion_control_mb_prio_802_1_qau_statistics {
1: -	__be64 rppp_rp_centiseconds;
1: -	__be32 reserved1;
1: -	__be32 ignored_cnm;
1: -	__be32 rppp_created_rps;
1: -	__be32 estimated_total_rate;
1: -	__be32 max_active_rate_limiter_index;
1: -	__be32 dropped_cnms_busy_fw;
1: -	__be32 reserved2;
1: -	__be32 cnms_handled_successfully;
1: -	__be32 min_total_limiters_rate;
1: -	__be32 max_total_limiters_rate;
1: -	__be32 reserved3[4];
1: +  __be64 rppp_rp_centiseconds;
1: +  __be32 reserved1;
1: +  __be32 ignored_cnm;
1: +  __be32 rppp_created_rps;
1: +  __be32 estimated_total_rate;
1: +  __be32 max_active_rate_limiter_index;
1: +  __be32 dropped_cnms_busy_fw;
1: +  __be32 reserved2;
1: +  __be32 cnms_handled_successfully;
1: +  __be32 min_total_limiters_rate;
1: +  __be32 max_total_limiters_rate;
1: +  __be32 reserved3[4];
1:  };
1:  
1:  struct nfp_cpp_explicit_command {
1: -	u32 cpp_id;
1: -	u16 data_ref;
1: -	u8 data_master;
1: -	u8 len;
1: -	u8 byte_mask;
1: -	u8 signal_master;
1: -	u8 signal_ref;
1: -	u8 posted;
1: -	u8 siga;
1: -	u8 sigb;
1: -	s8 siga_mode;
1: -	s8 sigb_mode;
1: +  u32 cpp_id;
1: +  u16 data_ref;
1: +  u8 data_master;
1: +  u8 len;
1: +  u8 byte_mask;
1: +  u8 signal_master;
1: +  u8 signal_ref;
1: +  u8 posted;
1: +  u8 siga;
1: +  u8 sigb;
1: +  s8 siga_mode;
1: +  s8 sigb_mode;
1:  };
1:  
1:  struct nfp_cpp;
1: @@ -101315,541 +102476,545 @@ struct nfp_cpp_area;
1:  struct nfp_cpp_explicit;
1:  
1:  struct nfp_cpp_operations {
1: -	size_t area_priv_size;
1: -	struct module *owner;
1: -	int (*init)(struct nfp_cpp *);
1: -	void (*free)(struct nfp_cpp *);
1: -	int (*read_serial)(struct device *, u8 *);
1: -	int (*get_interface)(struct device *);
1: -	int (*area_init)(struct nfp_cpp_area *, u32, long long unsigned int, long unsigned int);
1: -	void (*area_cleanup)(struct nfp_cpp_area *);
1: -	int (*area_acquire)(struct nfp_cpp_area *);
1: -	void (*area_release)(struct nfp_cpp_area *);
1: -	struct resource * (*area_resource)(struct nfp_cpp_area *);
1: -	phys_addr_t (*area_phys)(struct nfp_cpp_area *);
1: -	void * (*area_iomem)(struct nfp_cpp_area *);
1: -	int (*area_read)(struct nfp_cpp_area *, void *, long unsigned int, unsigned int);
1: -	int (*area_write)(struct nfp_cpp_area *, const void *, long unsigned int, unsigned int);
1: -	size_t explicit_priv_size;
1: -	int (*explicit_acquire)(struct nfp_cpp_explicit *);
1: -	void (*explicit_release)(struct nfp_cpp_explicit *);
1: -	int (*explicit_put)(struct nfp_cpp_explicit *, const void *, size_t);
1: -	int (*explicit_get)(struct nfp_cpp_explicit *, void *, size_t);
1: -	int (*explicit_do)(struct nfp_cpp_explicit *, const struct nfp_cpp_explicit_command *, u64);
1: +  size_t area_priv_size;
1: +  struct module *owner;
1: +  int (*init)(struct nfp_cpp *);
1: +  void (*free)(struct nfp_cpp *);
1: +  int (*read_serial)(struct device *, u8 *);
1: +  int (*get_interface)(struct device *);
1: +  int (*area_init)(struct nfp_cpp_area *, u32, long long unsigned int,
1: +                   long unsigned int);
1: +  void (*area_cleanup)(struct nfp_cpp_area *);
1: +  int (*area_acquire)(struct nfp_cpp_area *);
1: +  void (*area_release)(struct nfp_cpp_area *);
1: +  struct resource *(*area_resource)(struct nfp_cpp_area *);
1: +  phys_addr_t (*area_phys)(struct nfp_cpp_area *);
1: +  void *(*area_iomem)(struct nfp_cpp_area *);
1: +  int (*area_read)(struct nfp_cpp_area *, void *, long unsigned int,
1: +                   unsigned int);
1: +  int (*area_write)(struct nfp_cpp_area *, const void *, long unsigned int,
1: +                    unsigned int);
1: +  size_t explicit_priv_size;
1: +  int (*explicit_acquire)(struct nfp_cpp_explicit *);
1: +  void (*explicit_release)(struct nfp_cpp_explicit *);
1: +  int (*explicit_put)(struct nfp_cpp_explicit *, const void *, size_t);
1: +  int (*explicit_get)(struct nfp_cpp_explicit *, void *, size_t);
1: +  int (*explicit_do)(struct nfp_cpp_explicit *,
1: +                     const struct nfp_cpp_explicit_command *, u64);
1:  };
1:  
1:  struct nfp6000_pcie;
1:  
1:  struct nfp_bar {
1: -	struct nfp6000_pcie *nfp;
1: -	u32 barcfg;
1: -	u64 base;
1: -	u64 mask;
1: -	u32 bitsize;
1: -	int index;
1: -	atomic_t refcnt;
1: -	void *iomem;
1: -	struct resource *resource;
1: +  struct nfp6000_pcie *nfp;
1: +  u32 barcfg;
1: +  u64 base;
1: +  u64 mask;
1: +  u32 bitsize;
1: +  int index;
1: +  atomic_t refcnt;
1: +  void *iomem;
1: +  struct resource *resource;
1:  };
1:  
1:  struct nfp6000_pcie {
1: -	struct pci_dev *pdev;
1: -	struct device *dev;
1: -	spinlock_t bar_lock;
1: -	int bars;
1: -	struct nfp_bar bar[24];
1: -	wait_queue_head_t bar_waiters;
1: -	struct {
1: -		void *csr;
1: -		void *em;
1: -		void *expl[4];
1: -	} iomem;
1: -	struct {
1: -		struct mutex mutex;
1: -		u8 master_id;
1: -		u8 signal_ref;
1: -		void *data;
1: -		struct {
1: -			void *addr;
1: -			int bitsize;
1: -			int free[4];
1: -		} group[4];
1: -	} expl;
1: +  struct pci_dev *pdev;
1: +  struct device *dev;
1: +  spinlock_t bar_lock;
1: +  int bars;
1: +  struct nfp_bar bar[24];
1: +  wait_queue_head_t bar_waiters;
1: +  struct {
1: +    void *csr;
1: +    void *em;
1: +    void *expl[4];
1: +  } iomem;
1: +  struct {
1: +    struct mutex mutex;
1: +    u8 master_id;
1: +    u8 signal_ref;
1: +    void *data;
1: +    struct {
1: +      void *addr;
1: +      int bitsize;
1: +      int free[4];
1: +    } group[4];
1: +  } expl;
1:  };
1:  
1:  struct nfp6000_area_priv {
1: -	atomic_t refcnt;
1: -	struct nfp_bar *bar;
1: -	u32 bar_offset;
1: -	u32 target;
1: -	u32 action;
1: -	u32 token;
1: -	u64 offset;
1: -	struct {
1: -		int read;
1: -		int write;
1: -		int bar;
1: -	} width;
1: -	size_t size;
1: -	void *iomem;
1: -	phys_addr_t phys;
1: -	struct resource resource;
1: +  atomic_t refcnt;
1: +  struct nfp_bar *bar;
1: +  u32 bar_offset;
1: +  u32 target;
1: +  u32 action;
1: +  u32 token;
1: +  u64 offset;
1: +  struct {
1: +    int read;
1: +    int write;
1: +    int bar;
1: +  } width;
1: +  size_t size;
1: +  void *iomem;
1: +  phys_addr_t phys;
1: +  struct resource resource;
1:  };
1:  
1:  struct nfp6000_explicit_priv {
1: -	struct nfp6000_pcie *nfp;
1: -	struct {
1: -		int group;
1: -		int area;
1: -	} bar;
1: -	int bitsize;
1: -	void *data;
1: -	void *addr;
1: +  struct nfp6000_pcie *nfp;
1: +  struct {
1: +    int group;
1: +    int area;
1: +  } bar;
1: +  int bitsize;
1: +  void *data;
1: +  void *addr;
1:  };
1:  
1:  struct nfp_cpp {
1: -	struct device dev;
1: -	void *priv;
1: -	u32 model;
1: -	u16 interface;
1: -	u8 serial[6];
1: -	const struct nfp_cpp_operations *op;
1: -	struct list_head resource_list;
1: -	rwlock_t resource_lock;
1: -	wait_queue_head_t waitq;
1: -	u32 imb_cat_table[16];
1: -	unsigned int mu_locality_lsb;
1: -	struct mutex area_cache_mutex;
1: -	struct list_head area_cache_list;
1: +  struct device dev;
1: +  void *priv;
1: +  u32 model;
1: +  u16 interface;
1: +  u8 serial[6];
1: +  const struct nfp_cpp_operations *op;
1: +  struct list_head resource_list;
1: +  rwlock_t resource_lock;
1: +  wait_queue_head_t waitq;
1: +  u32 imb_cat_table[16];
1: +  unsigned int mu_locality_lsb;
1: +  struct mutex area_cache_mutex;
1: +  struct list_head area_cache_list;
1:  };
1:  
1:  struct nfp_cpp_resource {
1: -	struct list_head list;
1: -	const char *name;
1: -	u32 cpp_id;
1: -	u64 start;
1: -	u64 end;
1: +  struct list_head list;
1: +  const char *name;
1: +  u32 cpp_id;
1: +  u64 start;
1: +  u64 end;
1:  };
1:  
1:  struct nfp_cpp_area {
1: -	struct nfp_cpp *cpp;
1: -	struct kref kref;
1: -	atomic_t refcount;
1: -	struct mutex mutex;
1: -	long long unsigned int offset;
1: -	long unsigned int size;
1: -	struct nfp_cpp_resource resource;
1: -	void *iomem;
1: +  struct nfp_cpp *cpp;
1: +  struct kref kref;
1: +  atomic_t refcount;
1: +  struct mutex mutex;
1: +  long long unsigned int offset;
1: +  long unsigned int size;
1: +  struct nfp_cpp_resource resource;
1: +  void *iomem;
1:  };
1:  
1:  struct nfp_cpp_explicit {
1: -	struct nfp_cpp *cpp;
1: -	struct nfp_cpp_explicit_command cmd;
1: +  struct nfp_cpp *cpp;
1: +  struct nfp_cpp_explicit_command cmd;
1:  };
1:  
1:  enum nfp_cpp_explicit_signal_mode {
1: -	NFP_SIGNAL_NONE = 0,
1: -	NFP_SIGNAL_PUSH = 1,
1: -	NFP_SIGNAL_PUSH_OPTIONAL = 4294967295,
1: -	NFP_SIGNAL_PULL = 2,
1: -	NFP_SIGNAL_PULL_OPTIONAL = 4294967294,
1: +  NFP_SIGNAL_NONE = 0,
1: +  NFP_SIGNAL_PUSH = 1,
1: +  NFP_SIGNAL_PUSH_OPTIONAL = 4294967295,
1: +  NFP_SIGNAL_PULL = 2,
1: +  NFP_SIGNAL_PULL_OPTIONAL = 4294967294,
1:  };
1:  
1:  struct nfp_cpp_area_cache {
1: -	struct list_head entry;
1: -	u32 id;
1: -	u64 addr;
1: -	u32 size;
1: -	struct nfp_cpp_area *area;
1: +  struct list_head entry;
1: +  u32 id;
1: +  u64 addr;
1: +  u32 size;
1: +  struct nfp_cpp_area *area;
1:  };
1:  
1:  struct nfp_hwinfo {
1: -	u8 start[0];
1: -	__le32 version;
1: -	__le32 size;
1: -	__le32 limit;
1: -	__le32 resv;
1: -	char data[0];
1: +  u8 start[0];
1: +  __le32 version;
1: +  __le32 size;
1: +  __le32 limit;
1: +  __le32 resv;
1: +  char data[0];
1:  };
1:  
1:  struct nfp_resource;
1:  
1:  struct nfp_mip {
1: -	__le32 signature;
1: -	__le32 mip_version;
1: -	__le32 mip_size;
1: -	__le32 first_entry;
1: -	__le32 version;
1: -	__le32 buildnum;
1: -	__le32 buildtime;
1: -	__le32 loadtime;
1: -	__le32 symtab_addr;
1: -	__le32 symtab_size;
1: -	__le32 strtab_addr;
1: -	__le32 strtab_size;
1: -	char name[16];
1: -	char toolchain[32];
1: +  __le32 signature;
1: +  __le32 mip_version;
1: +  __le32 mip_size;
1: +  __le32 first_entry;
1: +  __le32 version;
1: +  __le32 buildnum;
1: +  __le32 buildtime;
1: +  __le32 loadtime;
1: +  __le32 symtab_addr;
1: +  __le32 symtab_size;
1: +  __le32 strtab_addr;
1: +  __le32 strtab_size;
1: +  char name[16];
1: +  char toolchain[32];
1:  };
1:  
1:  struct nfp_nffw_info;
1:  
1:  struct nfp_cpp_mutex {
1: -	struct nfp_cpp *cpp;
1: -	int target;
1: -	u16 depth;
1: -	long long unsigned int address;
1: -	u32 key;
1: +  struct nfp_cpp *cpp;
1: +  int target;
1: +  u16 depth;
1: +  long long unsigned int address;
1: +  u32 key;
1:  };
1:  
1:  struct nffw_meinfo {
1: -	__le32 ctxmask__fwid__meid;
1: +  __le32 ctxmask__fwid__meid;
1:  };
1:  
1:  struct nffw_fwinfo {
1: -	__le32 loaded__mu_da__mip_off_hi;
1: -	__le32 mip_cppid;
1: -	__le32 mip_offset_lo;
1: +  __le32 loaded__mu_da__mip_off_hi;
1: +  __le32 mip_cppid;
1: +  __le32 mip_offset_lo;
1:  };
1:  
1:  struct nfp_nffw_info_v1 {
1: -	struct nffw_meinfo meinfo[120];
1: -	struct nffw_fwinfo fwinfo[120];
1: +  struct nffw_meinfo meinfo[120];
1: +  struct nffw_fwinfo fwinfo[120];
1:  };
1:  
1:  struct nfp_nffw_info_v2 {
1: -	struct nffw_meinfo meinfo[200];
1: -	struct nffw_fwinfo fwinfo[200];
1: +  struct nffw_meinfo meinfo[200];
1: +  struct nffw_fwinfo fwinfo[200];
1:  };
1:  
1:  struct nfp_nffw_info_data {
1: -	__le32 flags[2];
1: -	union {
1: -		struct nfp_nffw_info_v1 v1;
1: -		struct nfp_nffw_info_v2 v2;
1: -	} info;
1: +  __le32 flags[2];
1: +  union {
1: +    struct nfp_nffw_info_v1 v1;
1: +    struct nfp_nffw_info_v2 v2;
1: +  } info;
1:  };
1:  
1:  struct nfp_nffw_info___2 {
1: -	struct nfp_cpp *cpp;
1: -	struct nfp_resource *res;
1: -	struct nfp_nffw_info_data fwinf;
1: +  struct nfp_cpp *cpp;
1: +  struct nfp_resource *res;
1: +  struct nfp_nffw_info_data fwinf;
1:  };
1:  
1:  enum nfp_nsp_versions {
1: -	NFP_VERSIONS_BSP = 0,
1: -	NFP_VERSIONS_CPLD = 1,
1: -	NFP_VERSIONS_APP = 2,
1: -	NFP_VERSIONS_BUNDLE = 3,
1: -	NFP_VERSIONS_UNDI = 4,
1: -	NFP_VERSIONS_NCSI = 5,
1: -	NFP_VERSIONS_CFGR = 6,
1: +  NFP_VERSIONS_BSP = 0,
1: +  NFP_VERSIONS_CPLD = 1,
1: +  NFP_VERSIONS_APP = 2,
1: +  NFP_VERSIONS_BUNDLE = 3,
1: +  NFP_VERSIONS_UNDI = 4,
1: +  NFP_VERSIONS_NCSI = 5,
1: +  NFP_VERSIONS_CFGR = 6,
1:  };
1:  
1:  enum nfp_nsp_cmd {
1: -	SPCODE_NOOP = 0,
1: -	SPCODE_SOFT_RESET = 1,
1: -	SPCODE_FW_DEFAULT = 2,
1: -	SPCODE_PHY_INIT = 3,
1: -	SPCODE_MAC_INIT = 4,
1: -	SPCODE_PHY_RXADAPT = 5,
1: -	SPCODE_FW_LOAD = 6,
1: -	SPCODE_ETH_RESCAN = 7,
1: -	SPCODE_ETH_CONTROL = 8,
1: -	SPCODE_NSP_WRITE_FLASH = 11,
1: -	SPCODE_NSP_SENSORS = 12,
1: -	SPCODE_NSP_IDENTIFY = 13,
1: -	SPCODE_FW_STORED = 16,
1: -	SPCODE_HWINFO_LOOKUP = 17,
1: -	SPCODE_HWINFO_SET = 18,
1: -	SPCODE_FW_LOADED = 19,
1: -	SPCODE_VERSIONS = 21,
1: -	SPCODE_READ_SFF_EEPROM = 22,
1: +  SPCODE_NOOP = 0,
1: +  SPCODE_SOFT_RESET = 1,
1: +  SPCODE_FW_DEFAULT = 2,
1: +  SPCODE_PHY_INIT = 3,
1: +  SPCODE_MAC_INIT = 4,
1: +  SPCODE_PHY_RXADAPT = 5,
1: +  SPCODE_FW_LOAD = 6,
1: +  SPCODE_ETH_RESCAN = 7,
1: +  SPCODE_ETH_CONTROL = 8,
1: +  SPCODE_NSP_WRITE_FLASH = 11,
1: +  SPCODE_NSP_SENSORS = 12,
1: +  SPCODE_NSP_IDENTIFY = 13,
1: +  SPCODE_FW_STORED = 16,
1: +  SPCODE_HWINFO_LOOKUP = 17,
1: +  SPCODE_HWINFO_SET = 18,
1: +  SPCODE_FW_LOADED = 19,
1: +  SPCODE_VERSIONS = 21,
1: +  SPCODE_READ_SFF_EEPROM = 22,
1:  };
1:  
1:  struct nfp_nsp_dma_buf {
1: -	__le32 chunk_cnt;
1: -	__le32 reserved[3];
1: -	struct {
1: -		__le32 size;
1: -		__le32 reserved;
1: -		__le64 addr;
1: -	} descs[0];
1: +  __le32 chunk_cnt;
1: +  __le32 reserved[3];
1: +  struct {
1: +    __le32 size;
1: +    __le32 reserved;
1: +    __le64 addr;
1: +  } descs[0];
1:  };
1:  
1:  struct nfp_nsp {
1: -	struct nfp_cpp *cpp;
1: -	struct nfp_resource *res;
1: -	struct {
1: -		u16 major;
1: -		u16 minor;
1: -	} ver;
1: -	bool modified;
1: -	unsigned int idx;
1: -	void *entries;
1: +  struct nfp_cpp *cpp;
1: +  struct nfp_resource *res;
1: +  struct {
1: +    u16 major;
1: +    u16 minor;
1: +  } ver;
1: +  bool modified;
1: +  unsigned int idx;
1: +  void *entries;
1:  };
1:  
1:  struct nfp_nsp_command_arg {
1: -	u16 code;
1: -	bool dma;
1: -	unsigned int timeout_sec;
1: -	u32 option;
1: -	u64 buf;
1: -	void (*error_cb)(struct nfp_nsp *, u32);
1: -	bool error_quiet;
1: +  u16 code;
1: +  bool dma;
1: +  unsigned int timeout_sec;
1: +  u32 option;
1: +  u64 buf;
1: +  void (*error_cb)(struct nfp_nsp *, u32);
1: +  bool error_quiet;
1:  };
1:  
1:  struct nfp_nsp_command_buf_arg {
1: -	struct nfp_nsp_command_arg arg;
1: -	const void *in_buf;
1: -	unsigned int in_size;
1: -	void *out_buf;
1: -	unsigned int out_size;
1: +  struct nfp_nsp_command_arg arg;
1: +  const void *in_buf;
1: +  unsigned int in_size;
1: +  void *out_buf;
1: +  unsigned int out_size;
1:  };
1:  
1:  struct eeprom_buf {
1: -	u8 metalen;
1: -	__le16 length;
1: -	__le16 offset;
1: -	__le16 readlen;
1: -	u8 eth_index;
1: -	u8 data[0];
1: +  u8 metalen;
1: +  __le16 length;
1: +  __le16 offset;
1: +  __le16 readlen;
1: +  u8 eth_index;
1: +  u8 data[0];
1:  } __attribute__((packed));
1:  
1:  struct nfp_nsp_identify {
1: -	char version[40];
1: -	u8 flags;
1: -	u8 br_primary;
1: -	u8 br_secondary;
1: -	u8 br_nsp;
1: -	u16 primary;
1: -	u16 secondary;
1: -	u16 nsp;
1: -	u64 sensor_mask;
1: +  char version[40];
1: +  u8 flags;
1: +  u8 br_primary;
1: +  u8 br_secondary;
1: +  u8 br_nsp;
1: +  u16 primary;
1: +  u16 secondary;
1: +  u16 nsp;
1: +  u64 sensor_mask;
1:  };
1:  
1:  enum nfp_nsp_sensor_id {
1: -	NFP_SENSOR_CHIP_TEMPERATURE = 0,
1: -	NFP_SENSOR_ASSEMBLY_POWER = 1,
1: -	NFP_SENSOR_ASSEMBLY_12V_POWER = 2,
1: -	NFP_SENSOR_ASSEMBLY_3V3_POWER = 3,
1: +  NFP_SENSOR_CHIP_TEMPERATURE = 0,
1: +  NFP_SENSOR_ASSEMBLY_POWER = 1,
1: +  NFP_SENSOR_ASSEMBLY_12V_POWER = 2,
1: +  NFP_SENSOR_ASSEMBLY_3V3_POWER = 3,
1:  };
1:  
1:  struct nsp_identify {
1: -	u8 version[40];
1: -	u8 flags;
1: -	u8 br_primary;
1: -	u8 br_secondary;
1: -	u8 br_nsp;
1: -	__le16 primary;
1: -	__le16 secondary;
1: -	__le16 nsp;
1: -	u8 reserved[6];
1: -	__le64 sensor_mask;
1: +  u8 version[40];
1: +  u8 flags;
1: +  u8 br_primary;
1: +  u8 br_secondary;
1: +  u8 br_nsp;
1: +  __le16 primary;
1: +  __le16 secondary;
1: +  __le16 nsp;
1: +  u8 reserved[6];
1: +  __le64 sensor_mask;
1:  };
1:  
1:  struct nfp_sensors {
1: -	__le32 chip_temp;
1: -	__le32 assembly_power;
1: -	__le32 assembly_12v_power;
1: -	__le32 assembly_3v3_power;
1: +  __le32 chip_temp;
1: +  __le32 assembly_power;
1: +  __le32 assembly_12v_power;
1: +  __le32 assembly_3v3_power;
1:  };
1:  
1:  struct nfp_nsp___2;
1:  
1:  enum nfp_eth_interface {
1: -	NFP_INTERFACE_NONE = 0,
1: -	NFP_INTERFACE_SFP = 1,
1: -	NFP_INTERFACE_SFPP = 10,
1: -	NFP_INTERFACE_SFP28 = 28,
1: -	NFP_INTERFACE_QSFP = 40,
1: -	NFP_INTERFACE_RJ45 = 45,
1: -	NFP_INTERFACE_CXP = 100,
1: -	NFP_INTERFACE_QSFP28 = 112,
1: +  NFP_INTERFACE_NONE = 0,
1: +  NFP_INTERFACE_SFP = 1,
1: +  NFP_INTERFACE_SFPP = 10,
1: +  NFP_INTERFACE_SFP28 = 28,
1: +  NFP_INTERFACE_QSFP = 40,
1: +  NFP_INTERFACE_RJ45 = 45,
1: +  NFP_INTERFACE_CXP = 100,
1: +  NFP_INTERFACE_QSFP28 = 112,
1:  };
1:  
1:  enum nfp_eth_media {
1: -	NFP_MEDIA_DAC_PASSIVE = 0,
1: -	NFP_MEDIA_DAC_ACTIVE = 1,
1: -	NFP_MEDIA_FIBRE = 2,
1: +  NFP_MEDIA_DAC_PASSIVE = 0,
1: +  NFP_MEDIA_DAC_ACTIVE = 1,
1: +  NFP_MEDIA_FIBRE = 2,
1:  };
1:  
1:  enum nfp_eth_aneg {
1: -	NFP_ANEG_AUTO = 0,
1: -	NFP_ANEG_SEARCH = 1,
1: -	NFP_ANEG_25G_CONSORTIUM = 2,
1: -	NFP_ANEG_25G_IEEE = 3,
1: -	NFP_ANEG_DISABLED = 4,
1: +  NFP_ANEG_AUTO = 0,
1: +  NFP_ANEG_SEARCH = 1,
1: +  NFP_ANEG_25G_CONSORTIUM = 2,
1: +  NFP_ANEG_25G_IEEE = 3,
1: +  NFP_ANEG_DISABLED = 4,
1:  };
1:  
1:  enum nfp_eth_fec {
1: -	NFP_FEC_AUTO_BIT = 0,
1: -	NFP_FEC_BASER_BIT = 1,
1: -	NFP_FEC_REED_SOLOMON_BIT = 2,
1: -	NFP_FEC_DISABLED_BIT = 3,
1: +  NFP_FEC_AUTO_BIT = 0,
1: +  NFP_FEC_BASER_BIT = 1,
1: +  NFP_FEC_REED_SOLOMON_BIT = 2,
1: +  NFP_FEC_DISABLED_BIT = 3,
1:  };
1:  
1:  struct nfp_eth_table_port {
1: -	unsigned int eth_index;
1: -	unsigned int index;
1: -	unsigned int nbi;
1: -	unsigned int base;
1: -	unsigned int lanes;
1: -	unsigned int speed;
1: -	unsigned int interface;
1: -	enum nfp_eth_media media;
1: -	enum nfp_eth_fec fec;
1: -	enum nfp_eth_aneg aneg;
1: -	u8 mac_addr[6];
1: -	u8 label_port;
1: -	u8 label_subport;
1: -	bool enabled;
1: -	bool tx_enabled;
1: -	bool rx_enabled;
1: -	bool override_changed;
1: -	u8 port_type;
1: -	unsigned int port_lanes;
1: -	bool is_split;
1: -	unsigned int fec_modes_supported;
1: +  unsigned int eth_index;
1: +  unsigned int index;
1: +  unsigned int nbi;
1: +  unsigned int base;
1: +  unsigned int lanes;
1: +  unsigned int speed;
1: +  unsigned int interface;
1: +  enum nfp_eth_media media;
1: +  enum nfp_eth_fec fec;
1: +  enum nfp_eth_aneg aneg;
1: +  u8 mac_addr[6];
1: +  u8 label_port;
1: +  u8 label_subport;
1: +  bool enabled;
1: +  bool tx_enabled;
1: +  bool rx_enabled;
1: +  bool override_changed;
1: +  u8 port_type;
1: +  unsigned int port_lanes;
1: +  bool is_split;
1: +  unsigned int fec_modes_supported;
1:  };
1:  
1:  struct nfp_eth_table {
1: -	unsigned int count;
1: -	unsigned int max_index;
1: -	struct nfp_eth_table_port ports[0];
1: +  unsigned int count;
1: +  unsigned int max_index;
1: +  struct nfp_eth_table_port ports[0];
1:  };
1:  
1:  enum nfp_eth_raw {
1: -	NSP_ETH_RAW_PORT = 0,
1: -	NSP_ETH_RAW_STATE = 1,
1: -	NSP_ETH_RAW_MAC = 2,
1: -	NSP_ETH_RAW_CONTROL = 3,
1: -	NSP_ETH_NUM_RAW = 4,
1: +  NSP_ETH_RAW_PORT = 0,
1: +  NSP_ETH_RAW_STATE = 1,
1: +  NSP_ETH_RAW_MAC = 2,
1: +  NSP_ETH_RAW_CONTROL = 3,
1: +  NSP_ETH_NUM_RAW = 4,
1:  };
1:  
1:  enum nfp_eth_rate {
1: -	RATE_INVALID = 0,
1: -	RATE_10M = 1,
1: -	RATE_100M = 2,
1: -	RATE_1G = 3,
1: -	RATE_10G = 4,
1: -	RATE_25G = 5,
1: +  RATE_INVALID = 0,
1: +  RATE_10M = 1,
1: +  RATE_100M = 2,
1: +  RATE_1G = 3,
1: +  RATE_10G = 4,
1: +  RATE_25G = 5,
1:  };
1:  
1:  union eth_table_entry {
1: -	struct {
1: -		__le64 port;
1: -		__le64 state;
1: -		u8 mac_addr[6];
1: -		u8 resv[2];
1: -		__le64 control;
1: -	};
1: -	__le64 raw[4];
1: +  struct {
1: +    __le64 port;
1: +    __le64 state;
1: +    u8 mac_addr[6];
1: +    u8 resv[2];
1: +    __le64 control;
1: +  };
1: +  __le64 raw[4];
1:  };
1:  
1:  struct nfp_resource_entry_mutex {
1: -	u32 owner;
1: -	u32 key;
1: +  u32 owner;
1: +  u32 key;
1:  };
1:  
1:  struct nfp_resource_entry_region {
1: -	u8 name[8];
1: -	u8 reserved[5];
1: -	u8 cpp_action;
1: -	u8 cpp_token;
1: -	u8 cpp_target;
1: -	u32 page_offset;
1: -	u32 page_size;
1: +  u8 name[8];
1: +  u8 reserved[5];
1: +  u8 cpp_action;
1: +  u8 cpp_token;
1: +  u8 cpp_target;
1: +  u32 page_offset;
1: +  u32 page_size;
1:  };
1:  
1:  struct nfp_resource_entry {
1: -	struct nfp_resource_entry_mutex mutex;
1: -	struct nfp_resource_entry_region region;
1: +  struct nfp_resource_entry_mutex mutex;
1: +  struct nfp_resource_entry_region region;
1:  };
1:  
1:  struct nfp_cpp_mutex___2;
1:  
1:  struct nfp_resource___2 {
1: -	char name[9];
1: -	u32 cpp_id;
1: -	u64 addr;
1: -	u64 size;
1: -	struct nfp_cpp_mutex___2 *mutex;
1: +  char name[9];
1: +  u32 cpp_id;
1: +  u64 addr;
1: +  u64 size;
1: +  struct nfp_cpp_mutex___2 *mutex;
1:  };
1:  
1:  enum nfp_rtsym_type {
1: -	NFP_RTSYM_TYPE_NONE = 0,
1: -	NFP_RTSYM_TYPE_OBJECT = 1,
1: -	NFP_RTSYM_TYPE_FUNCTION = 2,
1: -	NFP_RTSYM_TYPE_ABS = 3,
1: +  NFP_RTSYM_TYPE_NONE = 0,
1: +  NFP_RTSYM_TYPE_OBJECT = 1,
1: +  NFP_RTSYM_TYPE_FUNCTION = 2,
1: +  NFP_RTSYM_TYPE_ABS = 3,
1:  };
1:  
1:  struct nfp_rtsym {
1: -	const char *name;
1: -	u64 addr;
1: -	u64 size;
1: -	enum nfp_rtsym_type type;
1: -	int target;
1: -	int domain;
1: +  const char *name;
1: +  u64 addr;
1: +  u64 size;
1: +  enum nfp_rtsym_type type;
1: +  int target;
1: +  int domain;
1:  };
1:  
1:  struct nfp_rtsym_entry {
1: -	u8 type;
1: -	u8 target;
1: -	u8 island;
1: -	u8 addr_hi;
1: -	__le32 addr_lo;
1: -	__le16 name;
1: -	u8 menum;
1: -	u8 size_hi;
1: -	__le32 size_lo;
1: +  u8 type;
1: +  u8 target;
1: +  u8 island;
1: +  u8 addr_hi;
1: +  __le32 addr_lo;
1: +  __le16 name;
1: +  u8 menum;
1: +  u8 size_hi;
1: +  __le32 size_lo;
1:  };
1:  
1:  struct nfp_rtsym_table {
1: -	struct nfp_cpp *cpp;
1: -	int num;
1: -	char *strtab;
1: -	struct nfp_rtsym symtab[0];
1: +  struct nfp_cpp *cpp;
1: +  int num;
1: +  char *strtab;
1: +  struct nfp_rtsym symtab[0];
1:  };
1:  
1:  struct nfp_mip___2;
1:  
1:  enum nfp_ccm_type {
1: -	NFP_CCM_TYPE_BPF_MAP_ALLOC = 1,
1: -	NFP_CCM_TYPE_BPF_MAP_FREE = 2,
1: -	NFP_CCM_TYPE_BPF_MAP_LOOKUP = 3,
1: -	NFP_CCM_TYPE_BPF_MAP_UPDATE = 4,
1: -	NFP_CCM_TYPE_BPF_MAP_DELETE = 5,
1: -	NFP_CCM_TYPE_BPF_MAP_GETNEXT = 6,
1: -	NFP_CCM_TYPE_BPF_MAP_GETFIRST = 7,
1: -	NFP_CCM_TYPE_BPF_BPF_EVENT = 8,
1: -	NFP_CCM_TYPE_CRYPTO_RESET = 9,
1: -	NFP_CCM_TYPE_CRYPTO_ADD = 10,
1: -	NFP_CCM_TYPE_CRYPTO_DEL = 11,
1: -	NFP_CCM_TYPE_CRYPTO_UPDATE = 12,
1: -	NFP_CCM_TYPE_CRYPTO_RESYNC = 13,
1: -	__NFP_CCM_TYPE_MAX = 14,
1: +  NFP_CCM_TYPE_BPF_MAP_ALLOC = 1,
1: +  NFP_CCM_TYPE_BPF_MAP_FREE = 2,
1: +  NFP_CCM_TYPE_BPF_MAP_LOOKUP = 3,
1: +  NFP_CCM_TYPE_BPF_MAP_UPDATE = 4,
1: +  NFP_CCM_TYPE_BPF_MAP_DELETE = 5,
1: +  NFP_CCM_TYPE_BPF_MAP_GETNEXT = 6,
1: +  NFP_CCM_TYPE_BPF_MAP_GETFIRST = 7,
1: +  NFP_CCM_TYPE_BPF_BPF_EVENT = 8,
1: +  NFP_CCM_TYPE_CRYPTO_RESET = 9,
1: +  NFP_CCM_TYPE_CRYPTO_ADD = 10,
1: +  NFP_CCM_TYPE_CRYPTO_DEL = 11,
1: +  NFP_CCM_TYPE_CRYPTO_UPDATE = 12,
1: +  NFP_CCM_TYPE_CRYPTO_RESYNC = 13,
1: +  __NFP_CCM_TYPE_MAX = 14,
1:  };
1:  
1:  struct nfp_ccm_hdr {
1: -	union {
1: -		struct {
1: -			u8 type;
1: -			u8 ver;
1: -			__be16 tag;
1: -		};
1: -		__be32 raw;
1: -	};
1: +  union {
1: +    struct {
1: +      u8 type;
1: +      u8 ver;
1: +      __be16 tag;
1: +    };
1: +    __be32 raw;
1: +  };
1:  };
1:  
1:  struct nfp_app;
1:  
1:  struct nfp_ccm {
1: -	struct nfp_app *app;
1: -	long unsigned int tag_allocator[1024];
1: -	u16 tag_alloc_next;
1: -	u16 tag_alloc_last;
1: -	struct sk_buff_head replies;
1: -	wait_queue_head_t wq;
1: +  struct nfp_app *app;
1: +  long unsigned int tag_allocator[1024];
1: +  u16 tag_alloc_next;
1: +  u16 tag_alloc_last;
1: +  struct sk_buff_head replies;
1: +  wait_queue_head_t wq;
1:  };
1:  
1:  struct nfp_pf;
1: @@ -101861,96 +103026,99 @@ struct nfp_reprs;
1:  struct nfp_app_type;
1:  
1:  struct nfp_app {
1: -	struct pci_dev *pdev;
1: -	struct nfp_pf *pf;
1: -	struct nfp_cpp *cpp;
1: -	struct nfp_net *ctrl;
1: -	struct nfp_reprs *reprs[3];
1: -	const struct nfp_app_type *type;
1: -	unsigned int ctrl_mtu;
1: -	struct notifier_block netdev_nb;
1: -	void *priv;
1: +  struct pci_dev *pdev;
1: +  struct nfp_pf *pf;
1: +  struct nfp_cpp *cpp;
1: +  struct nfp_net *ctrl;
1: +  struct nfp_reprs *reprs[3];
1: +  const struct nfp_app_type *type;
1: +  unsigned int ctrl_mtu;
1: +  struct notifier_block netdev_nb;
1: +  void *priv;
1:  };
1:  
1:  struct xdp_attachment_info {
1: -	struct bpf_prog *prog;
1: -	u32 flags;
1: +  struct bpf_prog *prog;
1: +  u32 flags;
1:  };
1:  
1:  enum devlink_eswitch_mode {
1: -	DEVLINK_ESWITCH_MODE_LEGACY = 0,
1: -	DEVLINK_ESWITCH_MODE_SWITCHDEV = 1,
1: +  DEVLINK_ESWITCH_MODE_LEGACY = 0,
1: +  DEVLINK_ESWITCH_MODE_SWITCHDEV = 1,
1:  };
1:  
1:  struct nfp_reprs {
1: -	unsigned int num_reprs;
1: -	struct net_device *reprs[0];
1: +  unsigned int num_reprs;
1: +  struct net_device *reprs[0];
1:  };
1:  
1:  struct nfp_repr_pcpu_stats {
1: -	u64 rx_packets;
1: -	u64 rx_bytes;
1: -	u64 tx_packets;
1: -	u64 tx_bytes;
1: -	u64 tx_drops;
1: -	struct u64_stats_sync syncp;
1: +  u64 rx_packets;
1: +  u64 rx_bytes;
1: +  u64 tx_packets;
1: +  u64 tx_bytes;
1: +  u64 tx_drops;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct nfp_port;
1:  
1:  struct nfp_repr {
1: -	struct net_device *netdev;
1: -	struct metadata_dst *dst;
1: -	struct nfp_port *port;
1: -	struct nfp_app *app;
1: -	struct nfp_repr_pcpu_stats *stats;
1: -	void *app_priv;
1: +  struct net_device *netdev;
1: +  struct metadata_dst *dst;
1: +  struct nfp_port *port;
1: +  struct nfp_app *app;
1: +  struct nfp_repr_pcpu_stats *stats;
1: +  void *app_priv;
1:  };
1:  
1:  enum nfp_app_id {
1: -	NFP_APP_CORE_NIC = 1,
1: -	NFP_APP_BPF_NIC = 2,
1: -	NFP_APP_FLOWER_NIC = 3,
1: -	NFP_APP_ACTIVE_BUFFER_MGMT_NIC = 4,
1: +  NFP_APP_CORE_NIC = 1,
1: +  NFP_APP_BPF_NIC = 2,
1: +  NFP_APP_FLOWER_NIC = 3,
1: +  NFP_APP_ACTIVE_BUFFER_MGMT_NIC = 4,
1:  };
1:  
1:  struct nfp_app_type {
1: -	enum nfp_app_id id;
1: -	const char *name;
1: -	u32 ctrl_cap_mask;
1: -	bool ctrl_has_meta;
1: -	int (*init)(struct nfp_app *);
1: -	void (*clean)(struct nfp_app *);
1: -	const char * (*extra_cap)(struct nfp_app *, struct nfp_net *);
1: -	int (*ndo_init)(struct nfp_app *, struct net_device *);
1: -	void (*ndo_uninit)(struct nfp_app *, struct net_device *);
1: -	int (*vnic_alloc)(struct nfp_app *, struct nfp_net *, unsigned int);
1: -	void (*vnic_free)(struct nfp_app *, struct nfp_net *);
1: -	int (*vnic_init)(struct nfp_app *, struct nfp_net *);
1: -	void (*vnic_clean)(struct nfp_app *, struct nfp_net *);
1: -	int (*repr_init)(struct nfp_app *, struct net_device *);
1: -	void (*repr_preclean)(struct nfp_app *, struct net_device *);
1: -	void (*repr_clean)(struct nfp_app *, struct net_device *);
1: -	int (*repr_open)(struct nfp_app *, struct nfp_repr *);
1: -	int (*repr_stop)(struct nfp_app *, struct nfp_repr *);
1: -	int (*check_mtu)(struct nfp_app *, struct net_device *, int);
1: -	int (*repr_change_mtu)(struct nfp_app *, struct net_device *, int);
1: -	u64 * (*port_get_stats)(struct nfp_app *, struct nfp_port *, u64 *);
1: -	int (*port_get_stats_count)(struct nfp_app *, struct nfp_port *);
1: -	u8 * (*port_get_stats_strings)(struct nfp_app *, struct nfp_port *, u8 *);
1: -	int (*start)(struct nfp_app *);
1: -	void (*stop)(struct nfp_app *);
1: -	int (*netdev_event)(struct nfp_app *, struct net_device *, long unsigned int, void *);
1: -	void (*ctrl_msg_rx)(struct nfp_app *, struct sk_buff *);
1: -	void (*ctrl_msg_rx_raw)(struct nfp_app *, const void *, unsigned int);
1: -	int (*setup_tc)(struct nfp_app *, struct net_device *, enum tc_setup_type, void *);
1: -	int (*bpf)(struct nfp_app *, struct nfp_net *, struct netdev_bpf *);
1: -	int (*xdp_offload)(struct nfp_app *, struct nfp_net *, struct bpf_prog *, struct netlink_ext_ack *);
1: -	int (*sriov_enable)(struct nfp_app *, int);
1: -	void (*sriov_disable)(struct nfp_app *);
1: -	enum devlink_eswitch_mode (*eswitch_mode_get)(struct nfp_app *);
1: -	int (*eswitch_mode_set)(struct nfp_app *, u16);
1: -	struct net_device * (*dev_get)(struct nfp_app *, u32, bool *);
1: +  enum nfp_app_id id;
1: +  const char *name;
1: +  u32 ctrl_cap_mask;
1: +  bool ctrl_has_meta;
1: +  int (*init)(struct nfp_app *);
1: +  void (*clean)(struct nfp_app *);
1: +  const char *(*extra_cap)(struct nfp_app *, struct nfp_net *);
1: +  int (*ndo_init)(struct nfp_app *, struct net_device *);
1: +  void (*ndo_uninit)(struct nfp_app *, struct net_device *);
1: +  int (*vnic_alloc)(struct nfp_app *, struct nfp_net *, unsigned int);
1: +  void (*vnic_free)(struct nfp_app *, struct nfp_net *);
1: +  int (*vnic_init)(struct nfp_app *, struct nfp_net *);
1: +  void (*vnic_clean)(struct nfp_app *, struct nfp_net *);
1: +  int (*repr_init)(struct nfp_app *, struct net_device *);
1: +  void (*repr_preclean)(struct nfp_app *, struct net_device *);
1: +  void (*repr_clean)(struct nfp_app *, struct net_device *);
1: +  int (*repr_open)(struct nfp_app *, struct nfp_repr *);
1: +  int (*repr_stop)(struct nfp_app *, struct nfp_repr *);
1: +  int (*check_mtu)(struct nfp_app *, struct net_device *, int);
1: +  int (*repr_change_mtu)(struct nfp_app *, struct net_device *, int);
1: +  u64 *(*port_get_stats)(struct nfp_app *, struct nfp_port *, u64 *);
1: +  int (*port_get_stats_count)(struct nfp_app *, struct nfp_port *);
1: +  u8 *(*port_get_stats_strings)(struct nfp_app *, struct nfp_port *, u8 *);
1: +  int (*start)(struct nfp_app *);
1: +  void (*stop)(struct nfp_app *);
1: +  int (*netdev_event)(struct nfp_app *, struct net_device *, long unsigned int,
1: +                      void *);
1: +  void (*ctrl_msg_rx)(struct nfp_app *, struct sk_buff *);
1: +  void (*ctrl_msg_rx_raw)(struct nfp_app *, const void *, unsigned int);
1: +  int (*setup_tc)(struct nfp_app *, struct net_device *, enum tc_setup_type,
1: +                  void *);
1: +  int (*bpf)(struct nfp_app *, struct nfp_net *, struct netdev_bpf *);
1: +  int (*xdp_offload)(struct nfp_app *, struct nfp_net *, struct bpf_prog *,
1: +                     struct netlink_ext_ack *);
1: +  int (*sriov_enable)(struct nfp_app *, int);
1: +  void (*sriov_disable)(struct nfp_app *);
1: +  enum devlink_eswitch_mode (*eswitch_mode_get)(struct nfp_app *);
1: +  int (*eswitch_mode_set)(struct nfp_app *, u16);
1: +  struct net_device *(*dev_get)(struct nfp_app *, u32, bool *);
1:  };
1:  
1:  struct nfp_net_tx_ring;
1: @@ -101958,319 +103126,319 @@ struct nfp_net_tx_ring;
1:  struct nfp_net_rx_ring;
1:  
1:  struct nfp_net_dp {
1: -	struct device *dev;
1: -	struct net_device *netdev;
1: -	u8 is_vf: 1;
1: -	u8 chained_metadata_format: 1;
1: -	u8 ktls_tx: 1;
1: -	u8 rx_dma_dir;
1: -	u8 rx_offset;
1: -	u32 rx_dma_off;
1: -	u32 ctrl;
1: -	u32 fl_bufsz;
1: -	struct bpf_prog *xdp_prog;
1: -	struct nfp_net_tx_ring *tx_rings;
1: -	struct nfp_net_rx_ring *rx_rings;
1: -	u8 *ctrl_bar;
1: -	unsigned int txd_cnt;
1: -	unsigned int rxd_cnt;
1: -	unsigned int num_r_vecs;
1: -	unsigned int num_tx_rings;
1: -	unsigned int num_stack_tx_rings;
1: -	unsigned int num_rx_rings;
1: -	unsigned int mtu;
1: +  struct device *dev;
1: +  struct net_device *netdev;
1: +  u8 is_vf : 1;
1: +  u8 chained_metadata_format : 1;
1: +  u8 ktls_tx : 1;
1: +  u8 rx_dma_dir;
1: +  u8 rx_offset;
1: +  u32 rx_dma_off;
1: +  u32 ctrl;
1: +  u32 fl_bufsz;
1: +  struct bpf_prog *xdp_prog;
1: +  struct nfp_net_tx_ring *tx_rings;
1: +  struct nfp_net_rx_ring *rx_rings;
1: +  u8 *ctrl_bar;
1: +  unsigned int txd_cnt;
1: +  unsigned int rxd_cnt;
1: +  unsigned int num_r_vecs;
1: +  unsigned int num_tx_rings;
1: +  unsigned int num_stack_tx_rings;
1: +  unsigned int num_rx_rings;
1: +  unsigned int mtu;
1:  };
1:  
1:  struct nfp_net_fw_version {
1: -	u8 minor;
1: -	u8 major;
1: -	u8 class;
1: -	u8 resv;
1: +  u8 minor;
1: +  u8 major;
1: +  u8 class;
1: +  u8 resv;
1:  };
1:  
1:  struct nfp_net_r_vector {
1: -	struct nfp_net *nfp_net;
1: -	union {
1: -		struct napi_struct napi;
1: -		struct {
1: -			struct tasklet_struct tasklet;
1: -			struct sk_buff_head queue;
1: -			spinlock_t lock;
1: -		};
1: -	};
1: -	struct nfp_net_tx_ring *tx_ring;
1: -	struct nfp_net_rx_ring *rx_ring;
1: -	u16 irq_entry;
1: -	struct u64_stats_sync rx_sync;
1: -	u64 rx_pkts;
1: -	u64 rx_bytes;
1: -	u64 rx_drops;
1: -	u64 hw_csum_rx_ok;
1: -	u64 hw_csum_rx_inner_ok;
1: -	u64 hw_csum_rx_complete;
1: -	u64 hw_tls_rx;
1: -	u64 hw_csum_rx_error;
1: -	u64 rx_replace_buf_alloc_fail;
1: -	struct nfp_net_tx_ring *xdp_ring;
1: -	struct u64_stats_sync tx_sync;
1: -	u64 tx_pkts;
1: -	u64 tx_bytes;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u64 hw_csum_tx;
1: -	u64 hw_csum_tx_inner;
1: -	u64 tx_gather;
1: -	u64 tx_lso;
1: -	u64 hw_tls_tx;
1: -	u64 tls_tx_fallback;
1: -	u64 tls_tx_no_fallback;
1: -	u64 tx_errors;
1: -	u64 tx_busy;
1: -	u32 irq_vector;
1: -	irq_handler_t handler;
1: -	char name[24];
1: -	cpumask_t affinity_mask;
1: +  struct nfp_net *nfp_net;
1: +  union {
1: +    struct napi_struct napi;
1: +    struct {
1: +      struct tasklet_struct tasklet;
1: +      struct sk_buff_head queue;
1: +      spinlock_t lock;
1: +    };
1: +  };
1: +  struct nfp_net_tx_ring *tx_ring;
1: +  struct nfp_net_rx_ring *rx_ring;
1: +  u16 irq_entry;
1: +  struct u64_stats_sync rx_sync;
1: +  u64 rx_pkts;
1: +  u64 rx_bytes;
1: +  u64 rx_drops;
1: +  u64 hw_csum_rx_ok;
1: +  u64 hw_csum_rx_inner_ok;
1: +  u64 hw_csum_rx_complete;
1: +  u64 hw_tls_rx;
1: +  u64 hw_csum_rx_error;
1: +  u64 rx_replace_buf_alloc_fail;
1: +  struct nfp_net_tx_ring *xdp_ring;
1: +  struct u64_stats_sync tx_sync;
1: +  u64 tx_pkts;
1: +  u64 tx_bytes;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u64 hw_csum_tx;
1: +  u64 hw_csum_tx_inner;
1: +  u64 tx_gather;
1: +  u64 tx_lso;
1: +  u64 hw_tls_tx;
1: +  u64 tls_tx_fallback;
1: +  u64 tls_tx_no_fallback;
1: +  u64 tx_errors;
1: +  u64 tx_busy;
1: +  u32 irq_vector;
1: +  irq_handler_t handler;
1: +  char name[24];
1: +  cpumask_t affinity_mask;
1:  };
1:  
1:  struct nfp_net_tlv_caps {
1: -	u32 me_freq_mhz;
1: -	unsigned int mbox_off;
1: -	unsigned int mbox_len;
1: -	u32 repr_cap;
1: -	u32 mbox_cmsg_types;
1: -	u32 crypto_ops;
1: -	unsigned int crypto_enable_off;
1: -	unsigned int vnic_stats_off;
1: -	unsigned int vnic_stats_cnt;
1: -	unsigned int tls_resync_ss: 1;
1: +  u32 me_freq_mhz;
1: +  unsigned int mbox_off;
1: +  unsigned int mbox_len;
1: +  u32 repr_cap;
1: +  u32 mbox_cmsg_types;
1: +  u32 crypto_ops;
1: +  unsigned int crypto_enable_off;
1: +  unsigned int vnic_stats_off;
1: +  unsigned int vnic_stats_cnt;
1: +  unsigned int tls_resync_ss : 1;
1:  };
1:  
1:  struct nfp_net {
1: -	struct nfp_net_dp dp;
1: -	struct nfp_net_fw_version fw_ver;
1: -	u32 id;
1: -	u32 cap;
1: -	u32 max_mtu;
1: -	u8 rss_hfunc;
1: -	u32 rss_cfg;
1: -	u8 rss_key[40];
1: -	u8 rss_itbl[128];
1: -	struct xdp_attachment_info xdp;
1: -	struct xdp_attachment_info xdp_hw;
1: -	unsigned int max_tx_rings;
1: -	unsigned int max_rx_rings;
1: -	int stride_tx;
1: -	int stride_rx;
1: -	unsigned int max_r_vecs;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct nfp_net_r_vector r_vecs[64];
1: -	struct msix_entry irq_entries[66];
1: -	irq_handler_t lsc_handler;
1: -	char lsc_name[24];
1: -	irq_handler_t exn_handler;
1: -	char exn_name[24];
1: -	irq_handler_t shared_handler;
1: -	char shared_name[24];
1: -	u32 me_freq_mhz;
1: -	bool link_up;
1: -	spinlock_t link_status_lock;
1: -	spinlock_t reconfig_lock;
1: -	u32 reconfig_posted;
1: -	bool reconfig_timer_active;
1: -	bool reconfig_sync_present;
1: -	struct timer_list reconfig_timer;
1: -	u32 reconfig_in_progress_update;
1: -	struct semaphore bar_lock;
1: -	u32 rx_coalesce_usecs;
1: -	u32 rx_coalesce_max_frames;
1: -	u32 tx_coalesce_usecs;
1: -	u32 tx_coalesce_max_frames;
1: -	u8 *qcp_cfg;
1: -	u8 *tx_bar;
1: -	u8 *rx_bar;
1: -	struct nfp_net_tlv_caps tlv_caps;
1: -	unsigned int ktls_tx_conn_cnt;
1: -	unsigned int ktls_rx_conn_cnt;
1: -	atomic64_t ktls_conn_id_gen;
1: -	atomic_t ktls_no_space;
1: -	atomic_t ktls_rx_resync_req;
1: -	atomic_t ktls_rx_resync_ign;
1: -	atomic_t ktls_rx_resync_sent;
1: -	struct {
1: -		struct sk_buff_head queue;
1: -		wait_queue_head_t wq;
1: -		struct workqueue_struct *workq;
1: -		struct work_struct wait_work;
1: -		struct work_struct runq_work;
1: -		u16 tag;
1: -	} mbox_cmsg;
1: -	struct dentry *debugfs_dir;
1: -	struct list_head vnic_list;
1: -	struct pci_dev *pdev;
1: -	struct nfp_app *app;
1: -	bool vnic_no_name;
1: -	struct nfp_port *port;
1: -	void *app_priv;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct nfp_net_dp dp;
1: +  struct nfp_net_fw_version fw_ver;
1: +  u32 id;
1: +  u32 cap;
1: +  u32 max_mtu;
1: +  u8 rss_hfunc;
1: +  u32 rss_cfg;
1: +  u8 rss_key[40];
1: +  u8 rss_itbl[128];
1: +  struct xdp_attachment_info xdp;
1: +  struct xdp_attachment_info xdp_hw;
1: +  unsigned int max_tx_rings;
1: +  unsigned int max_rx_rings;
1: +  int stride_tx;
1: +  int stride_rx;
1: +  unsigned int max_r_vecs;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct nfp_net_r_vector r_vecs[64];
1: +  struct msix_entry irq_entries[66];
1: +  irq_handler_t lsc_handler;
1: +  char lsc_name[24];
1: +  irq_handler_t exn_handler;
1: +  char exn_name[24];
1: +  irq_handler_t shared_handler;
1: +  char shared_name[24];
1: +  u32 me_freq_mhz;
1: +  bool link_up;
1: +  spinlock_t link_status_lock;
1: +  spinlock_t reconfig_lock;
1: +  u32 reconfig_posted;
1: +  bool reconfig_timer_active;
1: +  bool reconfig_sync_present;
1: +  struct timer_list reconfig_timer;
1: +  u32 reconfig_in_progress_update;
1: +  struct semaphore bar_lock;
1: +  u32 rx_coalesce_usecs;
1: +  u32 rx_coalesce_max_frames;
1: +  u32 tx_coalesce_usecs;
1: +  u32 tx_coalesce_max_frames;
1: +  u8 *qcp_cfg;
1: +  u8 *tx_bar;
1: +  u8 *rx_bar;
1: +  struct nfp_net_tlv_caps tlv_caps;
1: +  unsigned int ktls_tx_conn_cnt;
1: +  unsigned int ktls_rx_conn_cnt;
1: +  atomic64_t ktls_conn_id_gen;
1: +  atomic_t ktls_no_space;
1: +  atomic_t ktls_rx_resync_req;
1: +  atomic_t ktls_rx_resync_ign;
1: +  atomic_t ktls_rx_resync_sent;
1: +  struct {
1: +    struct sk_buff_head queue;
1: +    wait_queue_head_t wq;
1: +    struct workqueue_struct *workq;
1: +    struct work_struct wait_work;
1: +    struct work_struct runq_work;
1: +    u16 tag;
1: +  } mbox_cmsg;
1: +  struct dentry *debugfs_dir;
1: +  struct list_head vnic_list;
1: +  struct pci_dev *pdev;
1: +  struct nfp_app *app;
1: +  bool vnic_no_name;
1: +  struct nfp_port *port;
1: +  void *app_priv;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct nfp_net_tx_desc {
1: -	union {
1: -		struct {
1: -			u8 dma_addr_hi;
1: -			__le16 dma_len;
1: -			u8 offset_eop;
1: -			__le32 dma_addr_lo;
1: -			__le16 mss;
1: -			u8 lso_hdrlen;
1: -			u8 flags;
1: -			union {
1: -				struct {
1: -					u8 l3_offset;
1: -					u8 l4_offset;
1: -				};
1: -				__le16 vlan;
1: -			};
1: -			__le16 data_len;
1: -		} __attribute__((packed));
1: -		__le32 vals[4];
1: -		__le64 vals8[2];
1: -	};
1: +  union {
1: +    struct {
1: +      u8 dma_addr_hi;
1: +      __le16 dma_len;
1: +      u8 offset_eop;
1: +      __le32 dma_addr_lo;
1: +      __le16 mss;
1: +      u8 lso_hdrlen;
1: +      u8 flags;
1: +      union {
1: +        struct {
1: +          u8 l3_offset;
1: +          u8 l4_offset;
1: +        };
1: +        __le16 vlan;
1: +      };
1: +      __le16 data_len;
1: +    } __attribute__((packed));
1: +    __le32 vals[4];
1: +    __le64 vals8[2];
1: +  };
1:  };
1:  
1:  struct nfp_net_tx_buf {
1: -	union {
1: -		struct sk_buff *skb;
1: -		void *frag;
1: -	};
1: -	dma_addr_t dma_addr;
1: -	short int fidx;
1: -	u16 pkt_cnt;
1: -	u32 real_len;
1: +  union {
1: +    struct sk_buff *skb;
1: +    void *frag;
1: +  };
1: +  dma_addr_t dma_addr;
1: +  short int fidx;
1: +  u16 pkt_cnt;
1: +  u32 real_len;
1:  };
1:  
1:  struct nfp_net_tx_ring {
1: -	struct nfp_net_r_vector *r_vec;
1: -	u32 idx;
1: -	int qcidx;
1: -	u8 *qcp_q;
1: -	u32 cnt;
1: -	u32 wr_p;
1: -	u32 rd_p;
1: -	u32 qcp_rd_p;
1: -	u32 wr_ptr_add;
1: -	struct nfp_net_tx_buf *txbufs;
1: -	struct nfp_net_tx_desc *txds;
1: -	dma_addr_t dma;
1: -	size_t size;
1: -	bool is_xdp;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct nfp_net_r_vector *r_vec;
1: +  u32 idx;
1: +  int qcidx;
1: +  u8 *qcp_q;
1: +  u32 cnt;
1: +  u32 wr_p;
1: +  u32 rd_p;
1: +  u32 qcp_rd_p;
1: +  u32 wr_ptr_add;
1: +  struct nfp_net_tx_buf *txbufs;
1: +  struct nfp_net_tx_desc *txds;
1: +  dma_addr_t dma;
1: +  size_t size;
1: +  bool is_xdp;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct nfp_net_rx_desc {
1: -	union {
1: -		struct {
1: -			u8 dma_addr_hi;
1: -			__le16 reserved;
1: -			u8 meta_len_dd;
1: -			__le32 dma_addr_lo;
1: -		} __attribute__((packed)) fld;
1: -		struct {
1: -			__le16 data_len;
1: -			u8 reserved;
1: -			u8 meta_len_dd;
1: -			__le16 flags;
1: -			__le16 vlan;
1: -		} rxd;
1: -		__le32 vals[2];
1: -	};
1: +  union {
1: +    struct {
1: +      u8 dma_addr_hi;
1: +      __le16 reserved;
1: +      u8 meta_len_dd;
1: +      __le32 dma_addr_lo;
1: +    } __attribute__((packed)) fld;
1: +    struct {
1: +      __le16 data_len;
1: +      u8 reserved;
1: +      u8 meta_len_dd;
1: +      __le16 flags;
1: +      __le16 vlan;
1: +    } rxd;
1: +    __le32 vals[2];
1: +  };
1:  };
1:  
1:  struct nfp_net_rx_buf {
1: -	void *frag;
1: -	dma_addr_t dma_addr;
1: +  void *frag;
1: +  dma_addr_t dma_addr;
1:  };
1:  
1:  struct nfp_net_rx_ring {
1: -	struct nfp_net_r_vector *r_vec;
1: -	u32 cnt;
1: -	u32 wr_p;
1: -	u32 rd_p;
1: -	u32 idx;
1: -	int fl_qcidx;
1: -	u8 *qcp_fl;
1: -	struct nfp_net_rx_buf *rxbufs;
1: -	struct nfp_net_rx_desc *rxds;
1: -	long: 64;
1: -	struct xdp_rxq_info xdp_rxq;
1: -	dma_addr_t dma;
1: -	size_t size;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct nfp_net_r_vector *r_vec;
1: +  u32 cnt;
1: +  u32 wr_p;
1: +  u32 rd_p;
1: +  u32 idx;
1: +  int fl_qcidx;
1: +  u8 *qcp_fl;
1: +  struct nfp_net_rx_buf *rxbufs;
1: +  struct nfp_net_rx_desc *rxds;
1: +  long : 64;
1: +  struct xdp_rxq_info xdp_rxq;
1: +  dma_addr_t dma;
1: +  size_t size;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum nfp_ccm_mbox_tlv_type {
1: -	NFP_NET_MBOX_TLV_TYPE_UNKNOWN = 0,
1: -	NFP_NET_MBOX_TLV_TYPE_END = 1,
1: -	NFP_NET_MBOX_TLV_TYPE_MSG = 2,
1: -	NFP_NET_MBOX_TLV_TYPE_MSG_NOSUP = 3,
1: -	NFP_NET_MBOX_TLV_TYPE_RESV = 4,
1: +  NFP_NET_MBOX_TLV_TYPE_UNKNOWN = 0,
1: +  NFP_NET_MBOX_TLV_TYPE_END = 1,
1: +  NFP_NET_MBOX_TLV_TYPE_MSG = 2,
1: +  NFP_NET_MBOX_TLV_TYPE_MSG_NOSUP = 3,
1: +  NFP_NET_MBOX_TLV_TYPE_RESV = 4,
1:  };
1:  
1:  enum nfp_net_mbox_cmsg_state {
1: -	NFP_NET_MBOX_CMSG_STATE_QUEUED = 0,
1: -	NFP_NET_MBOX_CMSG_STATE_NEXT = 1,
1: -	NFP_NET_MBOX_CMSG_STATE_BUSY = 2,
1: -	NFP_NET_MBOX_CMSG_STATE_REPLY_FOUND = 3,
1: -	NFP_NET_MBOX_CMSG_STATE_DONE = 4,
1: +  NFP_NET_MBOX_CMSG_STATE_QUEUED = 0,
1: +  NFP_NET_MBOX_CMSG_STATE_NEXT = 1,
1: +  NFP_NET_MBOX_CMSG_STATE_BUSY = 2,
1: +  NFP_NET_MBOX_CMSG_STATE_REPLY_FOUND = 3,
1: +  NFP_NET_MBOX_CMSG_STATE_DONE = 4,
1:  };
1:  
1:  struct nfp_ccm_mbox_cmsg_cb {
1: -	enum nfp_net_mbox_cmsg_state state;
1: -	int err;
1: -	unsigned int max_len;
1: -	unsigned int exp_reply;
1: -	bool posted;
1: +  enum nfp_net_mbox_cmsg_state state;
1: +  int err;
1: +  unsigned int max_len;
1: +  unsigned int exp_reply;
1: +  bool posted;
1:  };
1:  
1:  enum devlink_param_fw_load_policy_value {
1: -	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER = 0,
1: -	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH = 1,
1: -	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK = 2,
1: -	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN = 3,
1: +  DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER = 0,
1: +  DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH = 1,
1: +  DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK = 2,
1: +  DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN = 3,
1:  };
1:  
1:  enum devlink_param_reset_dev_on_drv_probe_value {
1: -	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_UNKNOWN = 0,
1: -	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_ALWAYS = 1,
1: -	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_NEVER = 2,
1: -	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_DISK = 3,
1: +  DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_UNKNOWN = 0,
1: +  DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_ALWAYS = 1,
1: +  DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_NEVER = 2,
1: +  DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_DISK = 3,
1:  };
1:  
1:  struct nfp_dumpspec {
1: -	u32 size;
1: -	u8 data[0];
1: +  u32 size;
1: +  u8 data[0];
1:  };
1:  
1:  struct nfp_rtsym_table___2;
1: @@ -102280,727 +103448,728 @@ struct nfp_hwinfo___2;
1:  struct nfp_shared_buf;
1:  
1:  struct nfp_pf {
1: -	struct pci_dev *pdev;
1: -	struct nfp_cpp *cpp;
1: -	struct nfp_app *app;
1: -	struct nfp_cpp_area *data_vnic_bar;
1: -	struct nfp_cpp_area *ctrl_vnic_bar;
1: -	struct nfp_cpp_area *qc_area;
1: -	struct nfp_cpp_area *mac_stats_bar;
1: -	u8 *mac_stats_mem;
1: -	struct nfp_cpp_area *vf_cfg_bar;
1: -	u8 *vf_cfg_mem;
1: -	struct nfp_cpp_area *vfcfg_tbl2_area;
1: -	u8 *vfcfg_tbl2;
1: -	const struct nfp_rtsym *mbox;
1: -	struct msix_entry *irq_entries;
1: -	unsigned int limit_vfs;
1: -	unsigned int num_vfs;
1: -	bool fw_loaded;
1: -	bool unload_fw_on_remove;
1: -	struct nfp_net *ctrl_vnic;
1: -	const struct nfp_mip___2 *mip;
1: -	struct nfp_rtsym_table___2 *rtbl;
1: -	struct nfp_hwinfo___2 *hwinfo;
1: -	struct nfp_dumpspec *dumpspec;
1: -	u32 dump_flag;
1: -	u32 dump_len;
1: -	struct nfp_eth_table *eth_tbl;
1: -	struct nfp_nsp_identify *nspi;
1: -	struct device *hwmon_dev;
1: -	struct dentry *ddir;
1: -	unsigned int max_data_vnics;
1: -	unsigned int num_vnics;
1: -	struct list_head vnics;
1: -	struct list_head ports;
1: -	struct workqueue_struct *wq;
1: -	struct work_struct port_refresh_work;
1: -	struct nfp_shared_buf *shared_bufs;
1: -	unsigned int num_shared_bufs;
1: -	struct mutex lock;
1: +  struct pci_dev *pdev;
1: +  struct nfp_cpp *cpp;
1: +  struct nfp_app *app;
1: +  struct nfp_cpp_area *data_vnic_bar;
1: +  struct nfp_cpp_area *ctrl_vnic_bar;
1: +  struct nfp_cpp_area *qc_area;
1: +  struct nfp_cpp_area *mac_stats_bar;
1: +  u8 *mac_stats_mem;
1: +  struct nfp_cpp_area *vf_cfg_bar;
1: +  u8 *vf_cfg_mem;
1: +  struct nfp_cpp_area *vfcfg_tbl2_area;
1: +  u8 *vfcfg_tbl2;
1: +  const struct nfp_rtsym *mbox;
1: +  struct msix_entry *irq_entries;
1: +  unsigned int limit_vfs;
1: +  unsigned int num_vfs;
1: +  bool fw_loaded;
1: +  bool unload_fw_on_remove;
1: +  struct nfp_net *ctrl_vnic;
1: +  const struct nfp_mip___2 *mip;
1: +  struct nfp_rtsym_table___2 *rtbl;
1: +  struct nfp_hwinfo___2 *hwinfo;
1: +  struct nfp_dumpspec *dumpspec;
1: +  u32 dump_flag;
1: +  u32 dump_len;
1: +  struct nfp_eth_table *eth_tbl;
1: +  struct nfp_nsp_identify *nspi;
1: +  struct device *hwmon_dev;
1: +  struct dentry *ddir;
1: +  unsigned int max_data_vnics;
1: +  unsigned int num_vnics;
1: +  struct list_head vnics;
1: +  struct list_head ports;
1: +  struct workqueue_struct *wq;
1: +  struct work_struct port_refresh_work;
1: +  struct nfp_shared_buf *shared_bufs;
1: +  unsigned int num_shared_bufs;
1: +  struct mutex lock;
1:  };
1:  
1:  struct nfp_devlink_param_u8_arg {
1: -	const char *hwinfo_name;
1: -	const char *default_hi_val;
1: -	int invalid_dl_val;
1: -	u8 hi_to_dl[4];
1: -	u8 dl_to_hi[4];
1: -	u8 max_dl_val;
1: -	u8 max_hi_val;
1: +  const char *hwinfo_name;
1: +  const char *default_hi_val;
1: +  int invalid_dl_val;
1: +  u8 hi_to_dl[4];
1: +  u8 dl_to_hi[4];
1: +  u8 max_dl_val;
1: +  u8 max_hi_val;
1:  };
1:  
1:  enum immed_width {
1: -	IMMED_WIDTH_ALL = 0,
1: -	IMMED_WIDTH_BYTE = 1,
1: -	IMMED_WIDTH_WORD = 2,
1: +  IMMED_WIDTH_ALL = 0,
1: +  IMMED_WIDTH_BYTE = 1,
1: +  IMMED_WIDTH_WORD = 2,
1:  };
1:  
1:  enum alu_dst_ab {
1: -	ALU_DST_A = 0,
1: -	ALU_DST_B = 1,
1: +  ALU_DST_A = 0,
1: +  ALU_DST_B = 1,
1:  };
1:  
1:  struct cmd_tgt_act {
1: -	u8 token;
1: -	u8 tgt_cmd;
1: +  u8 token;
1: +  u8 tgt_cmd;
1:  };
1:  
1:  enum cmd_tgt_map {
1: -	CMD_TGT_READ8 = 0,
1: -	CMD_TGT_WRITE8_SWAP = 1,
1: -	CMD_TGT_WRITE32_SWAP = 2,
1: -	CMD_TGT_READ32 = 3,
1: -	CMD_TGT_READ32_LE = 4,
1: -	CMD_TGT_READ32_SWAP = 5,
1: -	CMD_TGT_READ_LE = 6,
1: -	CMD_TGT_READ_SWAP_LE = 7,
1: -	CMD_TGT_ADD = 8,
1: -	CMD_TGT_ADD_IMM = 9,
1: -	__CMD_TGT_MAP_SIZE = 10,
1: +  CMD_TGT_READ8 = 0,
1: +  CMD_TGT_WRITE8_SWAP = 1,
1: +  CMD_TGT_WRITE32_SWAP = 2,
1: +  CMD_TGT_READ32 = 3,
1: +  CMD_TGT_READ32_LE = 4,
1: +  CMD_TGT_READ32_SWAP = 5,
1: +  CMD_TGT_READ_LE = 6,
1: +  CMD_TGT_READ_SWAP_LE = 7,
1: +  CMD_TGT_ADD = 8,
1: +  CMD_TGT_ADD_IMM = 9,
1: +  __CMD_TGT_MAP_SIZE = 10,
1:  };
1:  
1:  enum nfp_bpf_reg_type {
1: -	NN_REG_GPR_A = 1,
1: -	NN_REG_GPR_B = 2,
1: -	NN_REG_GPR_BOTH = 3,
1: -	NN_REG_NNR = 4,
1: -	NN_REG_XFER = 8,
1: -	NN_REG_IMM = 16,
1: -	NN_REG_NONE = 32,
1: -	NN_REG_LMEM = 64,
1: +  NN_REG_GPR_A = 1,
1: +  NN_REG_GPR_B = 2,
1: +  NN_REG_GPR_BOTH = 3,
1: +  NN_REG_NNR = 4,
1: +  NN_REG_XFER = 8,
1: +  NN_REG_IMM = 16,
1: +  NN_REG_NONE = 32,
1: +  NN_REG_LMEM = 64,
1:  };
1:  
1:  enum nfp_bpf_lm_mode {
1: -	NN_LM_MOD_NONE = 0,
1: -	NN_LM_MOD_INC = 1,
1: -	NN_LM_MOD_DEC = 2,
1: +  NN_LM_MOD_NONE = 0,
1: +  NN_LM_MOD_INC = 1,
1: +  NN_LM_MOD_DEC = 2,
1:  };
1:  
1:  typedef __u32 swreg;
1:  
1:  struct nfp_insn_ur_regs {
1: -	enum alu_dst_ab dst_ab;
1: -	u16 dst;
1: -	u16 areg;
1: -	u16 breg;
1: -	bool swap;
1: -	bool wr_both;
1: -	bool dst_lmextn;
1: -	bool src_lmextn;
1: +  enum alu_dst_ab dst_ab;
1: +  u16 dst;
1: +  u16 areg;
1: +  u16 breg;
1: +  bool swap;
1: +  bool wr_both;
1: +  bool dst_lmextn;
1: +  bool src_lmextn;
1:  };
1:  
1:  struct nfp_insn_re_regs {
1: -	enum alu_dst_ab dst_ab;
1: -	u8 dst;
1: -	u8 areg;
1: -	u8 breg;
1: -	bool swap;
1: -	bool wr_both;
1: -	bool i8;
1: -	bool dst_lmextn;
1: -	bool src_lmextn;
1: +  enum alu_dst_ab dst_ab;
1: +  u8 dst;
1: +  u8 areg;
1: +  u8 breg;
1: +  bool swap;
1: +  bool wr_both;
1: +  bool i8;
1: +  bool dst_lmextn;
1: +  bool src_lmextn;
1:  };
1:  
1:  enum nfp_port_type {
1: -	NFP_PORT_INVALID = 0,
1: -	NFP_PORT_PHYS_PORT = 1,
1: -	NFP_PORT_PF_PORT = 2,
1: -	NFP_PORT_VF_PORT = 3,
1: +  NFP_PORT_INVALID = 0,
1: +  NFP_PORT_PHYS_PORT = 1,
1: +  NFP_PORT_PF_PORT = 2,
1: +  NFP_PORT_VF_PORT = 3,
1:  };
1:  
1:  struct nfp_port {
1: -	struct net_device *netdev;
1: -	enum nfp_port_type type;
1: -	long unsigned int flags;
1: -	long unsigned int tc_offload_cnt;
1: -	struct nfp_app *app;
1: -	struct devlink_port dl_port;
1: -	union {
1: -		struct {
1: -			unsigned int eth_id;
1: -			bool eth_forced;
1: -			struct nfp_eth_table_port *eth_port;
1: -			u8 *eth_stats;
1: -		};
1: -		struct {
1: -			unsigned int pf_id;
1: -			unsigned int vf_id;
1: -			bool pf_split;
1: -			unsigned int pf_split_id;
1: -			u8 *vnic;
1: -		};
1: -	};
1: -	struct list_head port_list;
1: +  struct net_device *netdev;
1: +  enum nfp_port_type type;
1: +  long unsigned int flags;
1: +  long unsigned int tc_offload_cnt;
1: +  struct nfp_app *app;
1: +  struct devlink_port dl_port;
1: +  union {
1: +    struct {
1: +      unsigned int eth_id;
1: +      bool eth_forced;
1: +      struct nfp_eth_table_port *eth_port;
1: +      u8 *eth_stats;
1: +    };
1: +    struct {
1: +      unsigned int pf_id;
1: +      unsigned int vf_id;
1: +      bool pf_split;
1: +      unsigned int pf_split_id;
1: +      u8 *vnic;
1: +    };
1: +  };
1: +  struct list_head port_list;
1:  };
1:  
1:  enum nfp_repr_type {
1: -	NFP_REPR_TYPE_PHYS_PORT = 0,
1: -	NFP_REPR_TYPE_PF = 1,
1: -	NFP_REPR_TYPE_VF = 2,
1: -	__NFP_REPR_TYPE_MAX = 3,
1: +  NFP_REPR_TYPE_PHYS_PORT = 0,
1: +  NFP_REPR_TYPE_PF = 1,
1: +  NFP_REPR_TYPE_VF = 2,
1: +  __NFP_REPR_TYPE_MAX = 3,
1:  };
1:  
1:  struct nfp_devlink_versions_simple {
1: -	const char *key;
1: -	const char *hwinfo;
1: +  const char *key;
1: +  const char *hwinfo;
1:  };
1:  
1:  struct nfp_devlink_versions {
1: -	enum nfp_nsp_versions id;
1: -	const char *key;
1: +  enum nfp_nsp_versions id;
1: +  const char *key;
1:  };
1:  
1:  enum hwmon_sensor_types {
1: -	hwmon_chip = 0,
1: -	hwmon_temp = 1,
1: -	hwmon_in = 2,
1: -	hwmon_curr = 3,
1: -	hwmon_power = 4,
1: -	hwmon_energy = 5,
1: -	hwmon_humidity = 6,
1: -	hwmon_fan = 7,
1: -	hwmon_pwm = 8,
1: -	hwmon_intrusion = 9,
1: -	hwmon_max = 10,
1: +  hwmon_chip = 0,
1: +  hwmon_temp = 1,
1: +  hwmon_in = 2,
1: +  hwmon_curr = 3,
1: +  hwmon_power = 4,
1: +  hwmon_energy = 5,
1: +  hwmon_humidity = 6,
1: +  hwmon_fan = 7,
1: +  hwmon_pwm = 8,
1: +  hwmon_intrusion = 9,
1: +  hwmon_max = 10,
1:  };
1:  
1:  enum hwmon_chip_attributes {
1: -	hwmon_chip_temp_reset_history = 0,
1: -	hwmon_chip_in_reset_history = 1,
1: -	hwmon_chip_curr_reset_history = 2,
1: -	hwmon_chip_power_reset_history = 3,
1: -	hwmon_chip_register_tz = 4,
1: -	hwmon_chip_update_interval = 5,
1: -	hwmon_chip_alarms = 6,
1: -	hwmon_chip_samples = 7,
1: -	hwmon_chip_curr_samples = 8,
1: -	hwmon_chip_in_samples = 9,
1: -	hwmon_chip_power_samples = 10,
1: -	hwmon_chip_temp_samples = 11,
1: +  hwmon_chip_temp_reset_history = 0,
1: +  hwmon_chip_in_reset_history = 1,
1: +  hwmon_chip_curr_reset_history = 2,
1: +  hwmon_chip_power_reset_history = 3,
1: +  hwmon_chip_register_tz = 4,
1: +  hwmon_chip_update_interval = 5,
1: +  hwmon_chip_alarms = 6,
1: +  hwmon_chip_samples = 7,
1: +  hwmon_chip_curr_samples = 8,
1: +  hwmon_chip_in_samples = 9,
1: +  hwmon_chip_power_samples = 10,
1: +  hwmon_chip_temp_samples = 11,
1:  };
1:  
1:  enum hwmon_temp_attributes {
1: -	hwmon_temp_enable = 0,
1: -	hwmon_temp_input = 1,
1: -	hwmon_temp_type = 2,
1: -	hwmon_temp_lcrit = 3,
1: -	hwmon_temp_lcrit_hyst = 4,
1: -	hwmon_temp_min = 5,
1: -	hwmon_temp_min_hyst = 6,
1: -	hwmon_temp_max = 7,
1: -	hwmon_temp_max_hyst = 8,
1: -	hwmon_temp_crit = 9,
1: -	hwmon_temp_crit_hyst = 10,
1: -	hwmon_temp_emergency = 11,
1: -	hwmon_temp_emergency_hyst = 12,
1: -	hwmon_temp_alarm = 13,
1: -	hwmon_temp_lcrit_alarm = 14,
1: -	hwmon_temp_min_alarm = 15,
1: -	hwmon_temp_max_alarm = 16,
1: -	hwmon_temp_crit_alarm = 17,
1: -	hwmon_temp_emergency_alarm = 18,
1: -	hwmon_temp_fault = 19,
1: -	hwmon_temp_offset = 20,
1: -	hwmon_temp_label = 21,
1: -	hwmon_temp_lowest = 22,
1: -	hwmon_temp_highest = 23,
1: -	hwmon_temp_reset_history = 24,
1: -	hwmon_temp_rated_min = 25,
1: -	hwmon_temp_rated_max = 26,
1: +  hwmon_temp_enable = 0,
1: +  hwmon_temp_input = 1,
1: +  hwmon_temp_type = 2,
1: +  hwmon_temp_lcrit = 3,
1: +  hwmon_temp_lcrit_hyst = 4,
1: +  hwmon_temp_min = 5,
1: +  hwmon_temp_min_hyst = 6,
1: +  hwmon_temp_max = 7,
1: +  hwmon_temp_max_hyst = 8,
1: +  hwmon_temp_crit = 9,
1: +  hwmon_temp_crit_hyst = 10,
1: +  hwmon_temp_emergency = 11,
1: +  hwmon_temp_emergency_hyst = 12,
1: +  hwmon_temp_alarm = 13,
1: +  hwmon_temp_lcrit_alarm = 14,
1: +  hwmon_temp_min_alarm = 15,
1: +  hwmon_temp_max_alarm = 16,
1: +  hwmon_temp_crit_alarm = 17,
1: +  hwmon_temp_emergency_alarm = 18,
1: +  hwmon_temp_fault = 19,
1: +  hwmon_temp_offset = 20,
1: +  hwmon_temp_label = 21,
1: +  hwmon_temp_lowest = 22,
1: +  hwmon_temp_highest = 23,
1: +  hwmon_temp_reset_history = 24,
1: +  hwmon_temp_rated_min = 25,
1: +  hwmon_temp_rated_max = 26,
1:  };
1:  
1:  enum hwmon_power_attributes {
1: -	hwmon_power_enable = 0,
1: -	hwmon_power_average = 1,
1: -	hwmon_power_average_interval = 2,
1: -	hwmon_power_average_interval_max = 3,
1: -	hwmon_power_average_interval_min = 4,
1: -	hwmon_power_average_highest = 5,
1: -	hwmon_power_average_lowest = 6,
1: -	hwmon_power_average_max = 7,
1: -	hwmon_power_average_min = 8,
1: -	hwmon_power_input = 9,
1: -	hwmon_power_input_highest = 10,
1: -	hwmon_power_input_lowest = 11,
1: -	hwmon_power_reset_history = 12,
1: -	hwmon_power_accuracy = 13,
1: -	hwmon_power_cap = 14,
1: -	hwmon_power_cap_hyst = 15,
1: -	hwmon_power_cap_max = 16,
1: -	hwmon_power_cap_min = 17,
1: -	hwmon_power_min = 18,
1: -	hwmon_power_max = 19,
1: -	hwmon_power_crit = 20,
1: -	hwmon_power_lcrit = 21,
1: -	hwmon_power_label = 22,
1: -	hwmon_power_alarm = 23,
1: -	hwmon_power_cap_alarm = 24,
1: -	hwmon_power_min_alarm = 25,
1: -	hwmon_power_max_alarm = 26,
1: -	hwmon_power_lcrit_alarm = 27,
1: -	hwmon_power_crit_alarm = 28,
1: -	hwmon_power_rated_min = 29,
1: -	hwmon_power_rated_max = 30,
1: +  hwmon_power_enable = 0,
1: +  hwmon_power_average = 1,
1: +  hwmon_power_average_interval = 2,
1: +  hwmon_power_average_interval_max = 3,
1: +  hwmon_power_average_interval_min = 4,
1: +  hwmon_power_average_highest = 5,
1: +  hwmon_power_average_lowest = 6,
1: +  hwmon_power_average_max = 7,
1: +  hwmon_power_average_min = 8,
1: +  hwmon_power_input = 9,
1: +  hwmon_power_input_highest = 10,
1: +  hwmon_power_input_lowest = 11,
1: +  hwmon_power_reset_history = 12,
1: +  hwmon_power_accuracy = 13,
1: +  hwmon_power_cap = 14,
1: +  hwmon_power_cap_hyst = 15,
1: +  hwmon_power_cap_max = 16,
1: +  hwmon_power_cap_min = 17,
1: +  hwmon_power_min = 18,
1: +  hwmon_power_max = 19,
1: +  hwmon_power_crit = 20,
1: +  hwmon_power_lcrit = 21,
1: +  hwmon_power_label = 22,
1: +  hwmon_power_alarm = 23,
1: +  hwmon_power_cap_alarm = 24,
1: +  hwmon_power_min_alarm = 25,
1: +  hwmon_power_max_alarm = 26,
1: +  hwmon_power_lcrit_alarm = 27,
1: +  hwmon_power_crit_alarm = 28,
1: +  hwmon_power_rated_min = 29,
1: +  hwmon_power_rated_max = 30,
1:  };
1:  
1:  struct hwmon_ops {
1: -	umode_t (*is_visible)(const void *, enum hwmon_sensor_types, u32, int);
1: -	int (*read)(struct device *, enum hwmon_sensor_types, u32, int, long int *);
1: -	int (*read_string)(struct device *, enum hwmon_sensor_types, u32, int, const char **);
1: -	int (*write)(struct device *, enum hwmon_sensor_types, u32, int, long int);
1: +  umode_t (*is_visible)(const void *, enum hwmon_sensor_types, u32, int);
1: +  int (*read)(struct device *, enum hwmon_sensor_types, u32, int, long int *);
1: +  int (*read_string)(struct device *, enum hwmon_sensor_types, u32, int,
1: +                     const char **);
1: +  int (*write)(struct device *, enum hwmon_sensor_types, u32, int, long int);
1:  };
1:  
1:  struct hwmon_channel_info {
1: -	enum hwmon_sensor_types type;
1: -	const u32 *config;
1: +  enum hwmon_sensor_types type;
1: +  const u32 *config;
1:  };
1:  
1:  struct hwmon_chip_info {
1: -	const struct hwmon_ops *ops;
1: -	const struct hwmon_channel_info **info;
1: +  const struct hwmon_ops *ops;
1: +  const struct hwmon_channel_info **info;
1:  };
1:  
1:  struct nfp_shared_buf {
1: -	__le32 id;
1: -	__le32 size;
1: -	__le16 ingress_pools_count;
1: -	__le16 egress_pools_count;
1: -	__le16 ingress_tc_count;
1: -	__le16 egress_tc_count;
1: -	__le32 pool_size_unit;
1: +  __le32 id;
1: +  __le32 size;
1: +  __le16 ingress_pools_count;
1: +  __le16 egress_pools_count;
1: +  __le16 ingress_tc_count;
1: +  __le16 egress_tc_count;
1: +  __le32 pool_size_unit;
1:  };
1:  
1:  enum nfp_dump_diag {
1: -	NFP_DUMP_NSP_DIAG = 0,
1: +  NFP_DUMP_NSP_DIAG = 0,
1:  };
1:  
1:  struct nfp_meta_parsed {
1: -	u8 hash_type;
1: -	u8 csum_type;
1: -	u32 hash;
1: -	u32 mark;
1: -	u32 portid;
1: -	__wsum csum;
1: +  u8 hash_type;
1: +  u8 csum_type;
1: +  u32 hash;
1: +  u32 mark;
1: +  u32 portid;
1: +  __wsum csum;
1:  };
1:  
1:  struct nfp_net_rx_hash {
1: -	__be32 hash_type;
1: -	__be32 hash;
1: +  __be32 hash_type;
1: +  __be32 hash;
1:  };
1:  
1:  enum nfp_qcp_ptr {
1: -	NFP_QCP_READ_PTR = 0,
1: -	NFP_QCP_WRITE_PTR = 1,
1: +  NFP_QCP_READ_PTR = 0,
1: +  NFP_QCP_WRITE_PTR = 1,
1:  };
1:  
1:  enum nfp_port_flags {
1: -	NFP_PORT_CHANGED = 0,
1: +  NFP_PORT_CHANGED = 0,
1:  };
1:  
1:  struct nfp_net_tls_resync_req {
1: -	__be32 fw_handle[2];
1: -	__be32 tcp_seq;
1: -	u8 l3_offset;
1: -	u8 l4_offset;
1: -	u8 resv[2];
1: +  __be32 fw_handle[2];
1: +  __be32 tcp_seq;
1: +  u8 l3_offset;
1: +  u8 l4_offset;
1: +  u8 resv[2];
1:  };
1:  
1:  enum nfp_dumpspec_type {
1: -	NFP_DUMPSPEC_TYPE_CPP_CSR = 0,
1: -	NFP_DUMPSPEC_TYPE_XPB_CSR = 1,
1: -	NFP_DUMPSPEC_TYPE_ME_CSR = 2,
1: -	NFP_DUMPSPEC_TYPE_INDIRECT_ME_CSR = 3,
1: -	NFP_DUMPSPEC_TYPE_RTSYM = 4,
1: -	NFP_DUMPSPEC_TYPE_HWINFO = 5,
1: -	NFP_DUMPSPEC_TYPE_FWNAME = 6,
1: -	NFP_DUMPSPEC_TYPE_HWINFO_FIELD = 7,
1: -	NFP_DUMPSPEC_TYPE_PROLOG = 10000,
1: -	NFP_DUMPSPEC_TYPE_ERROR = 10001,
1: +  NFP_DUMPSPEC_TYPE_CPP_CSR = 0,
1: +  NFP_DUMPSPEC_TYPE_XPB_CSR = 1,
1: +  NFP_DUMPSPEC_TYPE_ME_CSR = 2,
1: +  NFP_DUMPSPEC_TYPE_INDIRECT_ME_CSR = 3,
1: +  NFP_DUMPSPEC_TYPE_RTSYM = 4,
1: +  NFP_DUMPSPEC_TYPE_HWINFO = 5,
1: +  NFP_DUMPSPEC_TYPE_FWNAME = 6,
1: +  NFP_DUMPSPEC_TYPE_HWINFO_FIELD = 7,
1: +  NFP_DUMPSPEC_TYPE_PROLOG = 10000,
1: +  NFP_DUMPSPEC_TYPE_ERROR = 10001,
1:  };
1:  
1:  struct nfp_dump_tl {
1: -	__be32 type;
1: -	__be32 length;
1: -	char data[0];
1: +  __be32 type;
1: +  __be32 length;
1: +  char data[0];
1:  };
1:  
1:  struct nfp_dumpspec_cpp_isl_id {
1: -	u8 target;
1: -	u8 action;
1: -	u8 token;
1: -	u8 island;
1: +  u8 target;
1: +  u8 action;
1: +  u8 token;
1: +  u8 island;
1:  };
1:  
1:  struct nfp_dump_common_cpp {
1: -	struct nfp_dumpspec_cpp_isl_id cpp_id;
1: -	__be32 offset;
1: -	__be32 dump_length;
1: +  struct nfp_dumpspec_cpp_isl_id cpp_id;
1: +  __be32 offset;
1: +  __be32 dump_length;
1:  };
1:  
1:  struct nfp_dumpspec_csr {
1: -	struct nfp_dump_tl tl;
1: -	struct nfp_dump_common_cpp cpp;
1: -	__be32 register_width;
1: +  struct nfp_dump_tl tl;
1: +  struct nfp_dump_common_cpp cpp;
1: +  __be32 register_width;
1:  };
1:  
1:  struct nfp_dumpspec_rtsym {
1: -	struct nfp_dump_tl tl;
1: -	char rtsym[0];
1: +  struct nfp_dump_tl tl;
1: +  char rtsym[0];
1:  };
1:  
1:  struct nfp_dump_csr {
1: -	struct nfp_dump_tl tl;
1: -	struct nfp_dump_common_cpp cpp;
1: -	__be32 register_width;
1: -	__be32 error;
1: -	__be32 error_offset;
1: +  struct nfp_dump_tl tl;
1: +  struct nfp_dump_common_cpp cpp;
1: +  __be32 register_width;
1: +  __be32 error;
1: +  __be32 error_offset;
1:  };
1:  
1:  struct nfp_dump_rtsym {
1: -	struct nfp_dump_tl tl;
1: -	struct nfp_dump_common_cpp cpp;
1: -	__be32 error;
1: -	u8 padded_name_length;
1: -	char rtsym[0];
1: +  struct nfp_dump_tl tl;
1: +  struct nfp_dump_common_cpp cpp;
1: +  __be32 error;
1: +  u8 padded_name_length;
1: +  char rtsym[0];
1:  };
1:  
1:  struct nfp_dump_prolog {
1: -	struct nfp_dump_tl tl;
1: -	__be32 dump_level;
1: +  struct nfp_dump_tl tl;
1: +  __be32 dump_level;
1:  };
1:  
1:  struct nfp_dump_error {
1: -	struct nfp_dump_tl tl;
1: -	__be32 error;
1: -	char padding[4];
1: -	char spec[0];
1: +  struct nfp_dump_tl tl;
1: +  __be32 error;
1: +  char padding[4];
1: +  char spec[0];
1:  };
1:  
1:  struct nfp_level_size {
1: -	__be32 requested_level;
1: -	u32 total_size;
1: +  __be32 requested_level;
1: +  u32 total_size;
1:  };
1:  
1:  struct nfp_dump_state {
1: -	__be32 requested_level;
1: -	u32 dumped_size;
1: -	u32 buf_size;
1: -	void *p;
1: +  __be32 requested_level;
1: +  u32 dumped_size;
1: +  u32 buf_size;
1: +  void *p;
1:  };
1:  
1:  typedef int (*nfp_tlv_visit)(struct nfp_pf *, struct nfp_dump_tl *, void *);
1:  
1:  enum ethtool_fec_config_bits {
1: -	ETHTOOL_FEC_NONE_BIT = 0,
1: -	ETHTOOL_FEC_AUTO_BIT = 1,
1: -	ETHTOOL_FEC_OFF_BIT = 2,
1: -	ETHTOOL_FEC_RS_BIT = 3,
1: -	ETHTOOL_FEC_BASER_BIT = 4,
1: -	ETHTOOL_FEC_LLRS_BIT = 5,
1: -};
1: -
1: -enum {
1: -	SFP_PHYS_ID = 0,
1: -	SFP_PHYS_EXT_ID = 1,
1: -	SFP_CONNECTOR = 2,
1: -	SFP_COMPLIANCE = 3,
1: -	SFP_ENCODING = 11,
1: -	SFP_BR_NOMINAL = 12,
1: -	SFP_RATE_ID = 13,
1: -	SFP_LINK_LEN_SM_KM = 14,
1: -	SFP_LINK_LEN_SM_100M = 15,
1: -	SFP_LINK_LEN_50UM_OM2_10M = 16,
1: -	SFP_LINK_LEN_62_5UM_OM1_10M = 17,
1: -	SFP_LINK_LEN_COPPER_1M = 18,
1: -	SFP_LINK_LEN_50UM_OM4_10M = 18,
1: -	SFP_LINK_LEN_50UM_OM3_10M = 19,
1: -	SFP_VENDOR_NAME = 20,
1: -	SFP_VENDOR_OUI = 37,
1: -	SFP_VENDOR_PN = 40,
1: -	SFP_VENDOR_REV = 56,
1: -	SFP_OPTICAL_WAVELENGTH_MSB = 60,
1: -	SFP_OPTICAL_WAVELENGTH_LSB = 61,
1: -	SFP_CABLE_SPEC = 60,
1: -	SFP_CC_BASE = 63,
1: -	SFP_OPTIONS = 64,
1: -	SFP_BR_MAX = 66,
1: -	SFP_BR_MIN = 67,
1: -	SFP_VENDOR_SN = 68,
1: -	SFP_DATECODE = 84,
1: -	SFP_DIAGMON = 92,
1: -	SFP_ENHOPTS = 93,
1: -	SFP_SFF8472_COMPLIANCE = 94,
1: -	SFP_CC_EXT = 95,
1: -	SFP_PHYS_EXT_ID_SFP = 4,
1: -	SFP_OPTIONS_HIGH_POWER_LEVEL = 8192,
1: -	SFP_OPTIONS_PAGING_A2 = 4096,
1: -	SFP_OPTIONS_RETIMER = 2048,
1: -	SFP_OPTIONS_COOLED_XCVR = 1024,
1: -	SFP_OPTIONS_POWER_DECL = 512,
1: -	SFP_OPTIONS_RX_LINEAR_OUT = 256,
1: -	SFP_OPTIONS_RX_DECISION_THRESH = 128,
1: -	SFP_OPTIONS_TUNABLE_TX = 64,
1: -	SFP_OPTIONS_RATE_SELECT = 32,
1: -	SFP_OPTIONS_TX_DISABLE = 16,
1: -	SFP_OPTIONS_TX_FAULT = 8,
1: -	SFP_OPTIONS_LOS_INVERTED = 4,
1: -	SFP_OPTIONS_LOS_NORMAL = 2,
1: -	SFP_DIAGMON_DDM = 64,
1: -	SFP_DIAGMON_INT_CAL = 32,
1: -	SFP_DIAGMON_EXT_CAL = 16,
1: -	SFP_DIAGMON_RXPWR_AVG = 8,
1: -	SFP_DIAGMON_ADDRMODE = 4,
1: -	SFP_ENHOPTS_ALARMWARN = 128,
1: -	SFP_ENHOPTS_SOFT_TX_DISABLE = 64,
1: -	SFP_ENHOPTS_SOFT_TX_FAULT = 32,
1: -	SFP_ENHOPTS_SOFT_RX_LOS = 16,
1: -	SFP_ENHOPTS_SOFT_RATE_SELECT = 8,
1: -	SFP_ENHOPTS_APP_SELECT_SFF8079 = 4,
1: -	SFP_ENHOPTS_SOFT_RATE_SFF8431 = 2,
1: -	SFP_SFF8472_COMPLIANCE_NONE = 0,
1: -	SFP_SFF8472_COMPLIANCE_REV9_3 = 1,
1: -	SFP_SFF8472_COMPLIANCE_REV9_5 = 2,
1: -	SFP_SFF8472_COMPLIANCE_REV10_2 = 3,
1: -	SFP_SFF8472_COMPLIANCE_REV10_4 = 4,
1: -	SFP_SFF8472_COMPLIANCE_REV11_0 = 5,
1: -	SFP_SFF8472_COMPLIANCE_REV11_3 = 6,
1: -	SFP_SFF8472_COMPLIANCE_REV11_4 = 7,
1: -	SFP_SFF8472_COMPLIANCE_REV12_0 = 8,
1: +  ETHTOOL_FEC_NONE_BIT = 0,
1: +  ETHTOOL_FEC_AUTO_BIT = 1,
1: +  ETHTOOL_FEC_OFF_BIT = 2,
1: +  ETHTOOL_FEC_RS_BIT = 3,
1: +  ETHTOOL_FEC_BASER_BIT = 4,
1: +  ETHTOOL_FEC_LLRS_BIT = 5,
1: +};
1: +
1: +enum {
1: +  SFP_PHYS_ID = 0,
1: +  SFP_PHYS_EXT_ID = 1,
1: +  SFP_CONNECTOR = 2,
1: +  SFP_COMPLIANCE = 3,
1: +  SFP_ENCODING = 11,
1: +  SFP_BR_NOMINAL = 12,
1: +  SFP_RATE_ID = 13,
1: +  SFP_LINK_LEN_SM_KM = 14,
1: +  SFP_LINK_LEN_SM_100M = 15,
1: +  SFP_LINK_LEN_50UM_OM2_10M = 16,
1: +  SFP_LINK_LEN_62_5UM_OM1_10M = 17,
1: +  SFP_LINK_LEN_COPPER_1M = 18,
1: +  SFP_LINK_LEN_50UM_OM4_10M = 18,
1: +  SFP_LINK_LEN_50UM_OM3_10M = 19,
1: +  SFP_VENDOR_NAME = 20,
1: +  SFP_VENDOR_OUI = 37,
1: +  SFP_VENDOR_PN = 40,
1: +  SFP_VENDOR_REV = 56,
1: +  SFP_OPTICAL_WAVELENGTH_MSB = 60,
1: +  SFP_OPTICAL_WAVELENGTH_LSB = 61,
1: +  SFP_CABLE_SPEC = 60,
1: +  SFP_CC_BASE = 63,
1: +  SFP_OPTIONS = 64,
1: +  SFP_BR_MAX = 66,
1: +  SFP_BR_MIN = 67,
1: +  SFP_VENDOR_SN = 68,
1: +  SFP_DATECODE = 84,
1: +  SFP_DIAGMON = 92,
1: +  SFP_ENHOPTS = 93,
1: +  SFP_SFF8472_COMPLIANCE = 94,
1: +  SFP_CC_EXT = 95,
1: +  SFP_PHYS_EXT_ID_SFP = 4,
1: +  SFP_OPTIONS_HIGH_POWER_LEVEL = 8192,
1: +  SFP_OPTIONS_PAGING_A2 = 4096,
1: +  SFP_OPTIONS_RETIMER = 2048,
1: +  SFP_OPTIONS_COOLED_XCVR = 1024,
1: +  SFP_OPTIONS_POWER_DECL = 512,
1: +  SFP_OPTIONS_RX_LINEAR_OUT = 256,
1: +  SFP_OPTIONS_RX_DECISION_THRESH = 128,
1: +  SFP_OPTIONS_TUNABLE_TX = 64,
1: +  SFP_OPTIONS_RATE_SELECT = 32,
1: +  SFP_OPTIONS_TX_DISABLE = 16,
1: +  SFP_OPTIONS_TX_FAULT = 8,
1: +  SFP_OPTIONS_LOS_INVERTED = 4,
1: +  SFP_OPTIONS_LOS_NORMAL = 2,
1: +  SFP_DIAGMON_DDM = 64,
1: +  SFP_DIAGMON_INT_CAL = 32,
1: +  SFP_DIAGMON_EXT_CAL = 16,
1: +  SFP_DIAGMON_RXPWR_AVG = 8,
1: +  SFP_DIAGMON_ADDRMODE = 4,
1: +  SFP_ENHOPTS_ALARMWARN = 128,
1: +  SFP_ENHOPTS_SOFT_TX_DISABLE = 64,
1: +  SFP_ENHOPTS_SOFT_TX_FAULT = 32,
1: +  SFP_ENHOPTS_SOFT_RX_LOS = 16,
1: +  SFP_ENHOPTS_SOFT_RATE_SELECT = 8,
1: +  SFP_ENHOPTS_APP_SELECT_SFF8079 = 4,
1: +  SFP_ENHOPTS_SOFT_RATE_SFF8431 = 2,
1: +  SFP_SFF8472_COMPLIANCE_NONE = 0,
1: +  SFP_SFF8472_COMPLIANCE_REV9_3 = 1,
1: +  SFP_SFF8472_COMPLIANCE_REV9_5 = 2,
1: +  SFP_SFF8472_COMPLIANCE_REV10_2 = 3,
1: +  SFP_SFF8472_COMPLIANCE_REV10_4 = 4,
1: +  SFP_SFF8472_COMPLIANCE_REV11_0 = 5,
1: +  SFP_SFF8472_COMPLIANCE_REV11_3 = 6,
1: +  SFP_SFF8472_COMPLIANCE_REV11_4 = 7,
1: +  SFP_SFF8472_COMPLIANCE_REV12_0 = 8,
1:  };
1:  
1:  struct nfp_et_stat {
1: -	char name[32];
1: -	int off;
1: +  char name[32];
1: +  int off;
1:  };
1:  
1:  enum {
1: -	IFLA_OFFLOAD_XSTATS_UNSPEC = 0,
1: -	IFLA_OFFLOAD_XSTATS_CPU_HIT = 1,
1: -	__IFLA_OFFLOAD_XSTATS_MAX = 2,
1: +  IFLA_OFFLOAD_XSTATS_UNSPEC = 0,
1: +  IFLA_OFFLOAD_XSTATS_CPU_HIT = 1,
1: +  __IFLA_OFFLOAD_XSTATS_MAX = 2,
1:  };
1:  
1:  struct nfp_net_vf {
1: -	struct nfp_net *nn;
1: -	struct msix_entry irq_entries[66];
1: -	u8 *q_bar;
1: -	struct dentry *ddir;
1: +  struct nfp_net *nn;
1: +  struct msix_entry irq_entries[66];
1: +  u8 *q_bar;
1: +  struct dentry *ddir;
1:  };
1:  
1:  enum nfp_mbox_cmd {
1: -	NFP_MBOX_NO_CMD = 0,
1: -	NFP_MBOX_POOL_GET = 1,
1: -	NFP_MBOX_POOL_SET = 2,
1: -	NFP_MBOX_PCIE_ABM_ENABLE = 3,
1: -	NFP_MBOX_PCIE_ABM_DISABLE = 4,
1: +  NFP_MBOX_NO_CMD = 0,
1: +  NFP_MBOX_POOL_GET = 1,
1: +  NFP_MBOX_POOL_SET = 2,
1: +  NFP_MBOX_PCIE_ABM_ENABLE = 3,
1: +  NFP_MBOX_PCIE_ABM_DISABLE = 4,
1:  };
1:  
1:  struct nfp_shared_buf_pool_id {
1: -	__le32 shared_buf;
1: -	__le32 pool;
1: +  __le32 shared_buf;
1: +  __le32 pool;
1:  };
1:  
1:  struct nfp_shared_buf_pool_info_get {
1: -	__le32 pool_type;
1: -	__le32 size;
1: -	__le32 threshold_type;
1: +  __le32 pool_type;
1: +  __le32 size;
1: +  __le32 threshold_type;
1:  };
1:  
1:  struct nfp_shared_buf_pool_info_set {
1: -	struct nfp_shared_buf_pool_id id;
1: -	__le32 size;
1: -	__le32 threshold_type;
1: +  struct nfp_shared_buf_pool_id id;
1: +  __le32 size;
1: +  __le32 threshold_type;
1:  };
1:  
1:  enum nfp_bpf_cmsg_status {
1: -	CMSG_RC_SUCCESS = 0,
1: -	CMSG_RC_ERR_MAP_FD = 1,
1: -	CMSG_RC_ERR_MAP_NOENT = 2,
1: -	CMSG_RC_ERR_MAP_ERR = 3,
1: -	CMSG_RC_ERR_MAP_PARSE = 4,
1: -	CMSG_RC_ERR_MAP_EXIST = 5,
1: -	CMSG_RC_ERR_MAP_NOMEM = 6,
1: -	CMSG_RC_ERR_MAP_E2BIG = 7,
1: +  CMSG_RC_SUCCESS = 0,
1: +  CMSG_RC_ERR_MAP_FD = 1,
1: +  CMSG_RC_ERR_MAP_NOENT = 2,
1: +  CMSG_RC_ERR_MAP_ERR = 3,
1: +  CMSG_RC_ERR_MAP_PARSE = 4,
1: +  CMSG_RC_ERR_MAP_EXIST = 5,
1: +  CMSG_RC_ERR_MAP_NOMEM = 6,
1: +  CMSG_RC_ERR_MAP_E2BIG = 7,
1:  };
1:  
1:  struct cmsg_reply_map_simple {
1: -	struct nfp_ccm_hdr hdr;
1: -	__be32 rc;
1: +  struct nfp_ccm_hdr hdr;
1: +  __be32 rc;
1:  };
1:  
1:  struct cmsg_req_map_alloc_tbl {
1: -	struct nfp_ccm_hdr hdr;
1: -	__be32 key_size;
1: -	__be32 value_size;
1: -	__be32 max_entries;
1: -	__be32 map_type;
1: -	__be32 map_flags;
1: +  struct nfp_ccm_hdr hdr;
1: +  __be32 key_size;
1: +  __be32 value_size;
1: +  __be32 max_entries;
1: +  __be32 map_type;
1: +  __be32 map_flags;
1:  };
1:  
1:  struct cmsg_reply_map_alloc_tbl {
1: -	struct cmsg_reply_map_simple reply_hdr;
1: -	__be32 tid;
1: +  struct cmsg_reply_map_simple reply_hdr;
1: +  __be32 tid;
1:  };
1:  
1:  struct cmsg_req_map_free_tbl {
1: -	struct nfp_ccm_hdr hdr;
1: -	__be32 tid;
1: +  struct nfp_ccm_hdr hdr;
1: +  __be32 tid;
1:  };
1:  
1:  struct cmsg_reply_map_free_tbl {
1: -	struct cmsg_reply_map_simple reply_hdr;
1: -	__be32 count;
1: +  struct cmsg_reply_map_simple reply_hdr;
1: +  __be32 count;
1:  };
1:  
1:  struct cmsg_req_map_op {
1: -	struct nfp_ccm_hdr hdr;
1: -	__be32 tid;
1: -	__be32 count;
1: -	__be32 flags;
1: -	u8 data[0];
1: +  struct nfp_ccm_hdr hdr;
1: +  __be32 tid;
1: +  __be32 count;
1: +  __be32 flags;
1: +  u8 data[0];
1:  };
1:  
1:  struct cmsg_reply_map_op {
1: -	struct cmsg_reply_map_simple reply_hdr;
1: -	__be32 count;
1: -	__be32 resv;
1: -	u8 data[0];
1: +  struct cmsg_reply_map_simple reply_hdr;
1: +  __be32 count;
1: +  __be32 resv;
1: +  u8 data[0];
1:  };
1:  
1:  struct nfp_bpf_cap_adjust_head {
1: -	u32 flags;
1: -	int off_min;
1: -	int off_max;
1: -	int guaranteed_sub;
1: -	int guaranteed_add;
1: +  u32 flags;
1: +  int off_min;
1: +  int off_max;
1: +  int guaranteed_sub;
1: +  int guaranteed_add;
1:  };
1:  
1:  struct nfp_app_bpf {
1: -	struct nfp_app *app;
1: -	struct nfp_ccm ccm;
1: -	struct bpf_offload_dev *bpf_dev;
1: -	unsigned int cmsg_key_sz;
1: -	unsigned int cmsg_val_sz;
1: -	unsigned int cmsg_cache_cnt;
1: -	struct list_head map_list;
1: -	unsigned int maps_in_use;
1: -	unsigned int map_elems_in_use;
1: -	struct rhashtable maps_neutral;
1: -	u32 abi_version;
1: -	struct nfp_bpf_cap_adjust_head adjust_head;
1: -	struct {
1: -		u32 types;
1: -		u32 max_maps;
1: -		u32 max_elems;
1: -		u32 max_key_sz;
1: -		u32 max_val_sz;
1: -		u32 max_elem_sz;
1: -	} maps;
1: -	struct {
1: -		u32 map_lookup;
1: -		u32 map_update;
1: -		u32 map_delete;
1: -		u32 perf_event_output;
1: -	} helpers;
1: -	bool pseudo_random;
1: -	bool queue_select;
1: -	bool adjust_tail;
1: -	bool cmsg_multi_ent;
1: +  struct nfp_app *app;
1: +  struct nfp_ccm ccm;
1: +  struct bpf_offload_dev *bpf_dev;
1: +  unsigned int cmsg_key_sz;
1: +  unsigned int cmsg_val_sz;
1: +  unsigned int cmsg_cache_cnt;
1: +  struct list_head map_list;
1: +  unsigned int maps_in_use;
1: +  unsigned int map_elems_in_use;
1: +  struct rhashtable maps_neutral;
1: +  u32 abi_version;
1: +  struct nfp_bpf_cap_adjust_head adjust_head;
1: +  struct {
1: +    u32 types;
1: +    u32 max_maps;
1: +    u32 max_elems;
1: +    u32 max_key_sz;
1: +    u32 max_val_sz;
1: +    u32 max_elem_sz;
1: +  } maps;
1: +  struct {
1: +    u32 map_lookup;
1: +    u32 map_update;
1: +    u32 map_delete;
1: +    u32 perf_event_output;
1: +  } helpers;
1: +  bool pseudo_random;
1: +  bool queue_select;
1: +  bool adjust_tail;
1: +  bool cmsg_multi_ent;
1:  };
1:  
1:  struct nfp_bpf_map_word {
1: -	unsigned char type: 4;
1: -	unsigned char non_zero_update: 1;
1: +  unsigned char type : 4;
1: +  unsigned char non_zero_update : 1;
1:  };
1:  
1:  struct nfp_bpf_map {
1: -	struct bpf_offloaded_map *offmap;
1: -	struct nfp_app_bpf *bpf;
1: -	u32 tid;
1: -	spinlock_t cache_lock;
1: -	u32 cache_blockers;
1: -	u32 cache_gen;
1: -	u64 cache_to;
1: -	struct sk_buff *cache;
1: -	struct list_head l;
1: -	struct nfp_bpf_map_word use_map[0];
1: +  struct bpf_offloaded_map *offmap;
1: +  struct nfp_app_bpf *bpf;
1: +  u32 tid;
1: +  spinlock_t cache_lock;
1: +  u32 cache_blockers;
1: +  u32 cache_gen;
1: +  u64 cache_to;
1: +  struct sk_buff *cache;
1: +  struct list_head l;
1: +  struct nfp_bpf_map_word use_map[0];
1:  };
1:  
1:  enum tc_clsbpf_command {
1: -	TC_CLSBPF_OFFLOAD = 0,
1: -	TC_CLSBPF_STATS = 1,
1: +  TC_CLSBPF_OFFLOAD = 0,
1: +  TC_CLSBPF_STATS = 1,
1:  };
1:  
1:  struct tc_cls_bpf_offload {
1: -	struct flow_cls_common_offload common;
1: -	enum tc_clsbpf_command command;
1: -	struct tcf_exts *exts;
1: -	struct bpf_prog *prog;
1: -	struct bpf_prog *oldprog;
1: -	const char *name;
1: -	bool exts_integrated;
1: +  struct flow_cls_common_offload common;
1: +  enum tc_clsbpf_command command;
1: +  struct tcf_exts *exts;
1: +  struct bpf_prog *prog;
1: +  struct bpf_prog *oldprog;
1: +  const char *name;
1: +  bool exts_integrated;
1:  };
1:  
1:  enum bpf_cap_tlv_type {
1: -	NFP_BPF_CAP_TYPE_FUNC = 1,
1: -	NFP_BPF_CAP_TYPE_ADJUST_HEAD = 2,
1: -	NFP_BPF_CAP_TYPE_MAPS = 3,
1: -	NFP_BPF_CAP_TYPE_RANDOM = 4,
1: -	NFP_BPF_CAP_TYPE_QUEUE_SELECT = 5,
1: -	NFP_BPF_CAP_TYPE_ADJUST_TAIL = 6,
1: -	NFP_BPF_CAP_TYPE_ABI_VERSION = 7,
1: -	NFP_BPF_CAP_TYPE_CMSG_MULTI_ENT = 8,
1: +  NFP_BPF_CAP_TYPE_FUNC = 1,
1: +  NFP_BPF_CAP_TYPE_ADJUST_HEAD = 2,
1: +  NFP_BPF_CAP_TYPE_MAPS = 3,
1: +  NFP_BPF_CAP_TYPE_RANDOM = 4,
1: +  NFP_BPF_CAP_TYPE_QUEUE_SELECT = 5,
1: +  NFP_BPF_CAP_TYPE_ADJUST_TAIL = 6,
1: +  NFP_BPF_CAP_TYPE_ABI_VERSION = 7,
1: +  NFP_BPF_CAP_TYPE_CMSG_MULTI_ENT = 8,
1:  };
1:  
1:  struct nfp_bpf_cap_tlv_func {
1: -	__le32 func_id;
1: -	__le32 func_addr;
1: +  __le32 func_id;
1: +  __le32 func_addr;
1:  };
1:  
1:  struct nfp_bpf_cap_tlv_adjust_head {
1: -	__le32 flags;
1: -	__le32 off_min;
1: -	__le32 off_max;
1: -	__le32 guaranteed_sub;
1: -	__le32 guaranteed_add;
1: +  __le32 flags;
1: +  __le32 off_min;
1: +  __le32 off_max;
1: +  __le32 guaranteed_sub;
1: +  __le32 guaranteed_add;
1:  };
1:  
1:  struct nfp_bpf_cap_tlv_maps {
1: -	__le32 types;
1: -	__le32 max_maps;
1: -	__le32 max_elems;
1: -	__le32 max_key_sz;
1: -	__le32 max_val_sz;
1: -	__le32 max_elem_sz;
1: +  __le32 types;
1: +  __le32 max_maps;
1: +  __le32 max_elems;
1: +  __le32 max_key_sz;
1: +  __le32 max_val_sz;
1: +  __le32 max_elem_sz;
1:  };
1:  
1:  struct nfp_bpf_vnic {
1: -	struct bpf_prog *tc_prog;
1: -	unsigned int start_off;
1: -	unsigned int tgt_done;
1: +  struct bpf_prog *tc_prog;
1: +  unsigned int start_off;
1: +  unsigned int tgt_done;
1:  };
1:  
1:  struct cmsg_bpf_event {
1: -	struct nfp_ccm_hdr hdr;
1: -	__be32 cpu_id;
1: -	__be64 map_ptr;
1: -	__be32 data_size;
1: -	__be32 pkt_size;
1: -	u8 data[0];
1: +  struct nfp_ccm_hdr hdr;
1: +  __be32 cpu_id;
1: +  __be64 map_ptr;
1: +  __be32 data_size;
1: +  __be32 pkt_size;
1: +  u8 data[0];
1:  };
1:  
1:  enum nfp_bpf_map_use {
1: -	NFP_MAP_UNUSED = 0,
1: -	NFP_MAP_USE_READ = 1,
1: -	NFP_MAP_USE_WRITE = 2,
1: -	NFP_MAP_USE_ATOMIC_CNT = 3,
1: +  NFP_MAP_UNUSED = 0,
1: +  NFP_MAP_USE_READ = 1,
1: +  NFP_MAP_USE_WRITE = 2,
1: +  NFP_MAP_USE_ATOMIC_CNT = 3,
1:  };
1:  
1:  struct nfp_bpf_neutral_map {
1: -	struct rhash_head l;
1: -	struct bpf_map *ptr;
1: -	u32 map_id;
1: -	u32 count;
1: +  struct rhash_head l;
1: +  struct bpf_map *ptr;
1: +  u32 map_id;
1: +  u32 count;
1:  };
1:  
1:  struct nfp_prog;
1: @@ -103012,229 +104181,230 @@ typedef int (*instr_cb_t)(struct nfp_prog *, struct nfp_insn_meta *);
1:  struct nfp_bpf_subprog_info;
1:  
1:  struct nfp_prog {
1: -	struct nfp_app_bpf *bpf;
1: -	u64 *prog;
1: -	unsigned int prog_len;
1: -	unsigned int __prog_alloc_len;
1: -	unsigned int stack_size;
1: -	struct nfp_insn_meta *verifier_meta;
1: -	enum bpf_prog_type type;
1: -	unsigned int last_bpf_off;
1: -	unsigned int tgt_out;
1: -	unsigned int tgt_abort;
1: -	unsigned int tgt_call_push_regs;
1: -	unsigned int tgt_call_pop_regs;
1: -	unsigned int n_translated;
1: -	int error;
1: -	unsigned int stack_frame_depth;
1: -	unsigned int adjust_head_location;
1: -	unsigned int map_records_cnt;
1: -	unsigned int subprog_cnt;
1: -	struct nfp_bpf_neutral_map **map_records;
1: -	struct nfp_bpf_subprog_info *subprog;
1: -	unsigned int n_insns;
1: -	struct list_head insns;
1: +  struct nfp_app_bpf *bpf;
1: +  u64 *prog;
1: +  unsigned int prog_len;
1: +  unsigned int __prog_alloc_len;
1: +  unsigned int stack_size;
1: +  struct nfp_insn_meta *verifier_meta;
1: +  enum bpf_prog_type type;
1: +  unsigned int last_bpf_off;
1: +  unsigned int tgt_out;
1: +  unsigned int tgt_abort;
1: +  unsigned int tgt_call_push_regs;
1: +  unsigned int tgt_call_pop_regs;
1: +  unsigned int n_translated;
1: +  int error;
1: +  unsigned int stack_frame_depth;
1: +  unsigned int adjust_head_location;
1: +  unsigned int map_records_cnt;
1: +  unsigned int subprog_cnt;
1: +  struct nfp_bpf_neutral_map **map_records;
1: +  struct nfp_bpf_subprog_info *subprog;
1: +  unsigned int n_insns;
1: +  struct list_head insns;
1:  };
1:  
1:  struct nfp_bpf_reg_state {
1: -	struct bpf_reg_state reg;
1: -	bool var_off;
1: +  struct bpf_reg_state reg;
1: +  bool var_off;
1:  };
1:  
1:  struct nfp_insn_meta {
1: -	struct bpf_insn insn;
1: -	union {
1: -		struct {
1: -			struct bpf_reg_state ptr;
1: -			struct bpf_insn *paired_st;
1: -			s16 ldst_gather_len;
1: -			bool ptr_not_const;
1: -			struct {
1: -				s16 range_start;
1: -				s16 range_end;
1: -				bool do_init;
1: -			} pkt_cache;
1: -			bool xadd_over_16bit;
1: -			bool xadd_maybe_16bit;
1: -		};
1: -		struct {
1: -			struct nfp_insn_meta *jmp_dst;
1: -			bool jump_neg_op;
1: -			u32 num_insns_after_br;
1: -		};
1: -		struct {
1: -			u32 func_id;
1: -			struct bpf_reg_state arg1;
1: -			struct nfp_bpf_reg_state arg2;
1: -		};
1: -		struct {
1: -			u64 umin_src;
1: -			u64 umax_src;
1: -			u64 umin_dst;
1: -			u64 umax_dst;
1: -		};
1: -	};
1: -	unsigned int off;
1: -	short unsigned int n;
1: -	short unsigned int flags;
1: -	short unsigned int subprog_idx;
1: -	instr_cb_t double_cb;
1: -	struct list_head l;
1: +  struct bpf_insn insn;
1: +  union {
1: +    struct {
1: +      struct bpf_reg_state ptr;
1: +      struct bpf_insn *paired_st;
1: +      s16 ldst_gather_len;
1: +      bool ptr_not_const;
1: +      struct {
1: +        s16 range_start;
1: +        s16 range_end;
1: +        bool do_init;
1: +      } pkt_cache;
1: +      bool xadd_over_16bit;
1: +      bool xadd_maybe_16bit;
1: +    };
1: +    struct {
1: +      struct nfp_insn_meta *jmp_dst;
1: +      bool jump_neg_op;
1: +      u32 num_insns_after_br;
1: +    };
1: +    struct {
1: +      u32 func_id;
1: +      struct bpf_reg_state arg1;
1: +      struct nfp_bpf_reg_state arg2;
1: +    };
1: +    struct {
1: +      u64 umin_src;
1: +      u64 umax_src;
1: +      u64 umin_dst;
1: +      u64 umax_dst;
1: +    };
1: +  };
1: +  unsigned int off;
1: +  short unsigned int n;
1: +  short unsigned int flags;
1: +  short unsigned int subprog_idx;
1: +  instr_cb_t double_cb;
1: +  struct list_head l;
1:  };
1:  
1:  struct nfp_bpf_subprog_info {
1: -	u16 stack_depth;
1: -	u8 needs_reg_push: 1;
1: +  u16 stack_depth;
1: +  u8 needs_reg_push : 1;
1:  };
1:  
1:  enum br_mask {
1: -	BR_BEQ = 0,
1: -	BR_BNE = 1,
1: -	BR_BMI = 2,
1: -	BR_BHS = 4,
1: -	BR_BCC = 5,
1: -	BR_BLO = 5,
1: -	BR_BGE = 8,
1: -	BR_BLT = 9,
1: -	BR_UNC = 24,
1: +  BR_BEQ = 0,
1: +  BR_BNE = 1,
1: +  BR_BMI = 2,
1: +  BR_BHS = 4,
1: +  BR_BCC = 5,
1: +  BR_BLO = 5,
1: +  BR_BGE = 8,
1: +  BR_BLT = 9,
1: +  BR_UNC = 24,
1:  };
1:  
1:  enum br_ev_pip {
1: -	BR_EV_PIP_UNCOND = 0,
1: -	BR_EV_PIP_COND = 1,
1: +  BR_EV_PIP_UNCOND = 0,
1: +  BR_EV_PIP_COND = 1,
1:  };
1:  
1:  enum br_ctx_signal_state {
1: -	BR_CSS_NONE = 2,
1: +  BR_CSS_NONE = 2,
1:  };
1:  
1:  enum immed_shift {
1: -	IMMED_SHIFT_0B = 0,
1: -	IMMED_SHIFT_1B = 1,
1: -	IMMED_SHIFT_2B = 2,
1: +  IMMED_SHIFT_0B = 0,
1: +  IMMED_SHIFT_1B = 1,
1: +  IMMED_SHIFT_2B = 2,
1:  };
1:  
1:  enum shf_op {
1: -	SHF_OP_NONE = 0,
1: -	SHF_OP_AND = 2,
1: -	SHF_OP_OR = 5,
1: -	SHF_OP_ASHR = 6,
1: +  SHF_OP_NONE = 0,
1: +  SHF_OP_AND = 2,
1: +  SHF_OP_OR = 5,
1: +  SHF_OP_ASHR = 6,
1:  };
1:  
1:  enum shf_sc {
1: -	SHF_SC_R_ROT = 0,
1: -	SHF_SC_NONE = 0,
1: -	SHF_SC_R_SHF = 1,
1: -	SHF_SC_L_SHF = 2,
1: -	SHF_SC_R_DSHF = 3,
1: +  SHF_SC_R_ROT = 0,
1: +  SHF_SC_NONE = 0,
1: +  SHF_SC_R_SHF = 1,
1: +  SHF_SC_L_SHF = 2,
1: +  SHF_SC_R_DSHF = 3,
1:  };
1:  
1:  enum alu_op {
1: -	ALU_OP_NONE = 0,
1: -	ALU_OP_ADD = 1,
1: -	ALU_OP_NOT = 4,
1: -	ALU_OP_ADD_2B = 5,
1: -	ALU_OP_AND = 8,
1: -	ALU_OP_AND_NOT_A = 12,
1: -	ALU_OP_SUB_C = 13,
1: -	ALU_OP_AND_NOT_B = 16,
1: -	ALU_OP_ADD_C = 17,
1: -	ALU_OP_OR = 20,
1: -	ALU_OP_SUB = 21,
1: -	ALU_OP_XOR = 24,
1: +  ALU_OP_NONE = 0,
1: +  ALU_OP_ADD = 1,
1: +  ALU_OP_NOT = 4,
1: +  ALU_OP_ADD_2B = 5,
1: +  ALU_OP_AND = 8,
1: +  ALU_OP_AND_NOT_A = 12,
1: +  ALU_OP_SUB_C = 13,
1: +  ALU_OP_AND_NOT_B = 16,
1: +  ALU_OP_ADD_C = 17,
1: +  ALU_OP_OR = 20,
1: +  ALU_OP_SUB = 21,
1: +  ALU_OP_XOR = 24,
1:  };
1:  
1:  enum cmd_mode {
1: -	CMD_MODE_40b_AB = 0,
1: -	CMD_MODE_40b_BA = 1,
1: -	CMD_MODE_32b = 4,
1: +  CMD_MODE_40b_AB = 0,
1: +  CMD_MODE_40b_BA = 1,
1: +  CMD_MODE_32b = 4,
1:  };
1:  
1:  enum cmd_ctx_swap {
1: -	CMD_CTX_SWAP = 0,
1: -	CMD_CTX_SWAP_DEFER1 = 1,
1: -	CMD_CTX_SWAP_DEFER2 = 2,
1: -	CMD_CTX_NO_SWAP = 3,
1: +  CMD_CTX_SWAP = 0,
1: +  CMD_CTX_SWAP_DEFER1 = 1,
1: +  CMD_CTX_SWAP_DEFER2 = 2,
1: +  CMD_CTX_NO_SWAP = 3,
1:  };
1:  
1:  enum mul_type {
1: -	MUL_TYPE_START = 0,
1: -	MUL_TYPE_STEP_24x8 = 1,
1: -	MUL_TYPE_STEP_16x16 = 2,
1: -	MUL_TYPE_STEP_32x32 = 3,
1: +  MUL_TYPE_START = 0,
1: +  MUL_TYPE_STEP_24x8 = 1,
1: +  MUL_TYPE_STEP_16x16 = 2,
1: +  MUL_TYPE_STEP_32x32 = 3,
1:  };
1:  
1:  enum mul_step {
1: -	MUL_STEP_1 = 0,
1: -	MUL_STEP_NONE = 0,
1: -	MUL_STEP_2 = 1,
1: -	MUL_STEP_3 = 2,
1: -	MUL_STEP_4 = 3,
1: -	MUL_LAST = 4,
1: -	MUL_LAST_2 = 5,
1: +  MUL_STEP_1 = 0,
1: +  MUL_STEP_NONE = 0,
1: +  MUL_STEP_2 = 1,
1: +  MUL_STEP_3 = 2,
1: +  MUL_STEP_4 = 3,
1: +  MUL_LAST = 4,
1: +  MUL_LAST_2 = 5,
1:  };
1:  
1:  enum nfp_relo_type {
1: -	RELO_NONE = 0,
1: -	RELO_BR_REL = 1,
1: -	RELO_BR_GO_OUT = 2,
1: -	RELO_BR_GO_ABORT = 3,
1: -	RELO_BR_GO_CALL_PUSH_REGS = 4,
1: -	RELO_BR_GO_CALL_POP_REGS = 5,
1: -	RELO_BR_NEXT_PKT = 6,
1: -	RELO_BR_HELPER = 7,
1: -	RELO_IMMED_REL = 8,
1: +  RELO_NONE = 0,
1: +  RELO_BR_REL = 1,
1: +  RELO_BR_GO_OUT = 2,
1: +  RELO_BR_GO_ABORT = 3,
1: +  RELO_BR_GO_CALL_PUSH_REGS = 4,
1: +  RELO_BR_GO_CALL_POP_REGS = 5,
1: +  RELO_BR_NEXT_PKT = 6,
1: +  RELO_BR_HELPER = 7,
1: +  RELO_IMMED_REL = 8,
1:  };
1:  
1:  enum static_regs {
1: -	STATIC_REG_IMMA = 20,
1: -	STATIC_REG_IMM = 21,
1: -	STATIC_REG_STACK = 22,
1: -	STATIC_REG_PKT_LEN = 22,
1: +  STATIC_REG_IMMA = 20,
1: +  STATIC_REG_IMM = 21,
1: +  STATIC_REG_STACK = 22,
1: +  STATIC_REG_PKT_LEN = 22,
1:  };
1:  
1:  enum pkt_vec {
1: -	PKT_VEC_PKT_LEN = 0,
1: -	PKT_VEC_PKT_PTR = 2,
1: -	PKT_VEC_QSEL_SET = 4,
1: -	PKT_VEC_QSEL_VAL = 6,
1: +  PKT_VEC_PKT_LEN = 0,
1: +  PKT_VEC_PKT_PTR = 2,
1: +  PKT_VEC_QSEL_SET = 4,
1: +  PKT_VEC_QSEL_VAL = 6,
1:  };
1:  
1: -typedef int (*lmem_step)(struct nfp_prog *, u8, u8, s32, unsigned int, bool, bool, bool, bool, bool);
1: +typedef int (*lmem_step)(struct nfp_prog *, u8, u8, s32, unsigned int, bool,
1: +                         bool, bool, bool, bool);
1:  
1:  struct jmp_code_map {
1: -	enum br_mask br_mask;
1: -	bool swap;
1: +  enum br_mask br_mask;
1: +  bool swap;
1:  };
1:  
1:  struct flow_action_cookie {
1: -	u32 cookie_len;
1: -	u8 cookie[0];
1: +  u32 cookie_len;
1: +  u8 cookie[0];
1:  };
1:  
1:  struct nsim_sa {
1: -	struct xfrm_state *xs;
1: -	__be32 ipaddr[4];
1: -	u32 key[4];
1: -	u32 salt;
1: -	bool used;
1: -	bool crypt;
1: -	bool rx;
1: +  struct xfrm_state *xs;
1: +  __be32 ipaddr[4];
1: +  u32 key[4];
1: +  u32 salt;
1: +  bool used;
1: +  bool crypt;
1: +  bool rx;
1:  };
1:  
1:  struct nsim_ipsec {
1: -	struct nsim_sa sa[33];
1: -	struct dentry *pfile;
1: -	u32 count;
1: -	u32 tx;
1: -	u32 ok;
1: +  struct nsim_sa sa[33];
1: +  struct dentry *pfile;
1: +  u32 count;
1: +  u32 tx;
1: +  u32 ok;
1:  };
1:  
1:  struct nsim_ethtool {
1: -	bool rx;
1: -	bool tx;
1: -	bool report_stats_rx;
1: -	bool report_stats_tx;
1: +  bool rx;
1: +  bool tx;
1: +  bool report_stats_rx;
1: +  bool report_stats_tx;
1:  };
1:  
1:  struct nsim_dev;
1: @@ -103244,31 +104414,31 @@ struct nsim_dev_port;
1:  struct nsim_bus_dev;
1:  
1:  struct netdevsim {
1: -	struct net_device *netdev;
1: -	struct nsim_dev *nsim_dev;
1: -	struct nsim_dev_port *nsim_dev_port;
1: -	u64 tx_packets;
1: -	u64 tx_bytes;
1: -	struct u64_stats_sync syncp;
1: -	struct nsim_bus_dev *nsim_bus_dev;
1: -	struct bpf_prog *bpf_offloaded;
1: -	u32 bpf_offloaded_id;
1: -	struct xdp_attachment_info xdp;
1: -	struct xdp_attachment_info xdp_hw;
1: -	bool bpf_tc_accept;
1: -	bool bpf_tc_non_bound_accept;
1: -	bool bpf_xdpdrv_accept;
1: -	bool bpf_xdpoffload_accept;
1: -	bool bpf_map_accept;
1: -	struct nsim_ipsec ipsec;
1: -	struct {
1: -		u32 inject_error;
1: -		u32 sleep;
1: -		u32 __ports[8];
1: -		u32 (*ports)[4];
1: -		struct debugfs_u32_array dfs_ports[2];
1: -	} udp_ports;
1: -	struct nsim_ethtool ethtool;
1: +  struct net_device *netdev;
1: +  struct nsim_dev *nsim_dev;
1: +  struct nsim_dev_port *nsim_dev_port;
1: +  u64 tx_packets;
1: +  u64 tx_bytes;
1: +  struct u64_stats_sync syncp;
1: +  struct nsim_bus_dev *nsim_bus_dev;
1: +  struct bpf_prog *bpf_offloaded;
1: +  u32 bpf_offloaded_id;
1: +  struct xdp_attachment_info xdp;
1: +  struct xdp_attachment_info xdp_hw;
1: +  bool bpf_tc_accept;
1: +  bool bpf_tc_non_bound_accept;
1: +  bool bpf_xdpdrv_accept;
1: +  bool bpf_xdpoffload_accept;
1: +  bool bpf_map_accept;
1: +  struct nsim_ipsec ipsec;
1: +  struct {
1: +    u32 inject_error;
1: +    u32 sleep;
1: +    u32 __ports[8];
1: +    u32 (*ports)[4];
1: +    struct debugfs_u32_array dfs_ports[2];
1: +  } udp_ports;
1: +  struct nsim_ethtool ethtool;
1:  };
1:  
1:  struct nsim_fib_data;
1: @@ -103276,448 +104446,451 @@ struct nsim_fib_data;
1:  struct devlink_health_reporter;
1:  
1:  struct nsim_dev_health {
1: -	struct devlink_health_reporter *empty_reporter;
1: -	struct devlink_health_reporter *dummy_reporter;
1: -	struct dentry *ddir;
1: -	char *recovered_break_msg;
1: -	u32 binary_len;
1: -	bool fail_recover;
1: +  struct devlink_health_reporter *empty_reporter;
1: +  struct devlink_health_reporter *dummy_reporter;
1: +  struct dentry *ddir;
1: +  char *recovered_break_msg;
1: +  u32 binary_len;
1: +  bool fail_recover;
1:  };
1:  
1:  struct nsim_trap_data;
1:  
1:  struct nsim_dev {
1: -	struct nsim_bus_dev *nsim_bus_dev;
1: -	struct nsim_fib_data *fib_data;
1: -	struct nsim_trap_data *trap_data;
1: -	struct dentry *ddir;
1: -	struct dentry *ports_ddir;
1: -	struct dentry *take_snapshot;
1: -	struct bpf_offload_dev *bpf_dev;
1: -	bool bpf_bind_accept;
1: -	u32 bpf_bind_verifier_delay;
1: -	struct dentry *ddir_bpf_bound_progs;
1: -	u32 prog_id_gen;
1: -	struct list_head bpf_bound_progs;
1: -	struct list_head bpf_bound_maps;
1: -	struct netdev_phys_item_id switch_id;
1: -	struct list_head port_list;
1: -	struct mutex port_list_lock;
1: -	bool fw_update_status;
1: -	u32 fw_update_overwrite_mask;
1: -	u32 max_macs;
1: -	bool test1;
1: -	bool dont_allow_reload;
1: -	bool fail_reload;
1: -	struct devlink_region *dummy_region;
1: -	struct nsim_dev_health health;
1: -	struct flow_action_cookie *fa_cookie;
1: -	spinlock_t fa_cookie_lock;
1: -	bool fail_trap_group_set;
1: -	bool fail_trap_policer_set;
1: -	bool fail_trap_policer_counter_get;
1: -	struct {
1: -		struct udp_tunnel_nic_shared utn_shared;
1: -		u32 __ports[8];
1: -		bool sync_all;
1: -		bool open_only;
1: -		bool ipv4_only;
1: -		bool shared;
1: -		bool static_iana_vxlan;
1: -		u32 sleep;
1: -	} udp_ports;
1: +  struct nsim_bus_dev *nsim_bus_dev;
1: +  struct nsim_fib_data *fib_data;
1: +  struct nsim_trap_data *trap_data;
1: +  struct dentry *ddir;
1: +  struct dentry *ports_ddir;
1: +  struct dentry *take_snapshot;
1: +  struct bpf_offload_dev *bpf_dev;
1: +  bool bpf_bind_accept;
1: +  u32 bpf_bind_verifier_delay;
1: +  struct dentry *ddir_bpf_bound_progs;
1: +  u32 prog_id_gen;
1: +  struct list_head bpf_bound_progs;
1: +  struct list_head bpf_bound_maps;
1: +  struct netdev_phys_item_id switch_id;
1: +  struct list_head port_list;
1: +  struct mutex port_list_lock;
1: +  bool fw_update_status;
1: +  u32 fw_update_overwrite_mask;
1: +  u32 max_macs;
1: +  bool test1;
1: +  bool dont_allow_reload;
1: +  bool fail_reload;
1: +  struct devlink_region *dummy_region;
1: +  struct nsim_dev_health health;
1: +  struct flow_action_cookie *fa_cookie;
1: +  spinlock_t fa_cookie_lock;
1: +  bool fail_trap_group_set;
1: +  bool fail_trap_policer_set;
1: +  bool fail_trap_policer_counter_get;
1: +  struct {
1: +    struct udp_tunnel_nic_shared utn_shared;
1: +    u32 __ports[8];
1: +    bool sync_all;
1: +    bool open_only;
1: +    bool ipv4_only;
1: +    bool shared;
1: +    bool static_iana_vxlan;
1: +    u32 sleep;
1: +  } udp_ports;
1:  };
1:  
1:  struct nsim_dev_port {
1: -	struct list_head list;
1: -	struct devlink_port devlink_port;
1: -	unsigned int port_index;
1: -	struct dentry *ddir;
1: -	struct netdevsim *ns;
1: +  struct list_head list;
1: +  struct devlink_port devlink_port;
1: +  unsigned int port_index;
1: +  struct dentry *ddir;
1: +  struct netdevsim *ns;
1:  };
1:  
1:  struct nsim_vf_config;
1:  
1:  struct nsim_bus_dev {
1: -	struct device dev;
1: -	struct list_head list;
1: -	unsigned int port_count;
1: -	struct net *initial_net;
1: -	unsigned int num_vfs;
1: -	struct nsim_vf_config *vfconfigs;
1: -	struct mutex nsim_bus_reload_lock;
1: -	bool init;
1: +  struct device dev;
1: +  struct list_head list;
1: +  unsigned int port_count;
1: +  struct net *initial_net;
1: +  unsigned int num_vfs;
1: +  struct nsim_vf_config *vfconfigs;
1: +  struct mutex nsim_bus_reload_lock;
1: +  bool init;
1:  };
1:  
1:  struct nsim_vf_config {
1: -	int link_state;
1: -	u16 min_tx_rate;
1: -	u16 max_tx_rate;
1: -	u16 vlan;
1: -	__be16 vlan_proto;
1: -	u16 qos;
1: -	u8 vf_mac[6];
1: -	bool spoofchk_enabled;
1: -	bool trusted;
1: -	bool rss_query_enabled;
1: +  int link_state;
1: +  u16 min_tx_rate;
1: +  u16 max_tx_rate;
1: +  u16 vlan;
1: +  __be16 vlan_proto;
1: +  u16 qos;
1: +  u8 vf_mac[6];
1: +  bool spoofchk_enabled;
1: +  bool trusted;
1: +  bool rss_query_enabled;
1:  };
1:  
1:  enum devlink_resource_unit {
1: -	DEVLINK_RESOURCE_UNIT_ENTRY = 0,
1: +  DEVLINK_RESOURCE_UNIT_ENTRY = 0,
1:  };
1:  
1:  struct devlink_resource_size_params {
1: -	u64 size_min;
1: -	u64 size_max;
1: -	u64 size_granularity;
1: -	enum devlink_resource_unit unit;
1: +  u64 size_min;
1: +  u64 size_max;
1: +  u64 size_granularity;
1: +  enum devlink_resource_unit unit;
1:  };
1:  
1:  enum devlink_trap_generic_id {
1: -	DEVLINK_TRAP_GENERIC_ID_SMAC_MC = 0,
1: -	DEVLINK_TRAP_GENERIC_ID_VLAN_TAG_MISMATCH = 1,
1: -	DEVLINK_TRAP_GENERIC_ID_INGRESS_VLAN_FILTER = 2,
1: -	DEVLINK_TRAP_GENERIC_ID_INGRESS_STP_FILTER = 3,
1: -	DEVLINK_TRAP_GENERIC_ID_EMPTY_TX_LIST = 4,
1: -	DEVLINK_TRAP_GENERIC_ID_PORT_LOOPBACK_FILTER = 5,
1: -	DEVLINK_TRAP_GENERIC_ID_BLACKHOLE_ROUTE = 6,
1: -	DEVLINK_TRAP_GENERIC_ID_TTL_ERROR = 7,
1: -	DEVLINK_TRAP_GENERIC_ID_TAIL_DROP = 8,
1: -	DEVLINK_TRAP_GENERIC_ID_NON_IP_PACKET = 9,
1: -	DEVLINK_TRAP_GENERIC_ID_UC_DIP_MC_DMAC = 10,
1: -	DEVLINK_TRAP_GENERIC_ID_DIP_LB = 11,
1: -	DEVLINK_TRAP_GENERIC_ID_SIP_MC = 12,
1: -	DEVLINK_TRAP_GENERIC_ID_SIP_LB = 13,
1: -	DEVLINK_TRAP_GENERIC_ID_CORRUPTED_IP_HDR = 14,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_SIP_BC = 15,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_MC_DIP_RESERVED_SCOPE = 16,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_MC_DIP_INTERFACE_LOCAL_SCOPE = 17,
1: -	DEVLINK_TRAP_GENERIC_ID_MTU_ERROR = 18,
1: -	DEVLINK_TRAP_GENERIC_ID_UNRESOLVED_NEIGH = 19,
1: -	DEVLINK_TRAP_GENERIC_ID_RPF = 20,
1: -	DEVLINK_TRAP_GENERIC_ID_REJECT_ROUTE = 21,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_LPM_UNICAST_MISS = 22,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_LPM_UNICAST_MISS = 23,
1: -	DEVLINK_TRAP_GENERIC_ID_NON_ROUTABLE = 24,
1: -	DEVLINK_TRAP_GENERIC_ID_DECAP_ERROR = 25,
1: -	DEVLINK_TRAP_GENERIC_ID_OVERLAY_SMAC_MC = 26,
1: -	DEVLINK_TRAP_GENERIC_ID_INGRESS_FLOW_ACTION_DROP = 27,
1: -	DEVLINK_TRAP_GENERIC_ID_EGRESS_FLOW_ACTION_DROP = 28,
1: -	DEVLINK_TRAP_GENERIC_ID_STP = 29,
1: -	DEVLINK_TRAP_GENERIC_ID_LACP = 30,
1: -	DEVLINK_TRAP_GENERIC_ID_LLDP = 31,
1: -	DEVLINK_TRAP_GENERIC_ID_IGMP_QUERY = 32,
1: -	DEVLINK_TRAP_GENERIC_ID_IGMP_V1_REPORT = 33,
1: -	DEVLINK_TRAP_GENERIC_ID_IGMP_V2_REPORT = 34,
1: -	DEVLINK_TRAP_GENERIC_ID_IGMP_V3_REPORT = 35,
1: -	DEVLINK_TRAP_GENERIC_ID_IGMP_V2_LEAVE = 36,
1: -	DEVLINK_TRAP_GENERIC_ID_MLD_QUERY = 37,
1: -	DEVLINK_TRAP_GENERIC_ID_MLD_V1_REPORT = 38,
1: -	DEVLINK_TRAP_GENERIC_ID_MLD_V2_REPORT = 39,
1: -	DEVLINK_TRAP_GENERIC_ID_MLD_V1_DONE = 40,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_DHCP = 41,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_DHCP = 42,
1: -	DEVLINK_TRAP_GENERIC_ID_ARP_REQUEST = 43,
1: -	DEVLINK_TRAP_GENERIC_ID_ARP_RESPONSE = 44,
1: -	DEVLINK_TRAP_GENERIC_ID_ARP_OVERLAY = 45,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_NEIGH_SOLICIT = 46,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_NEIGH_ADVERT = 47,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_BFD = 48,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_BFD = 49,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_OSPF = 50,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_OSPF = 51,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_BGP = 52,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_BGP = 53,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_VRRP = 54,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_VRRP = 55,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_PIM = 56,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_PIM = 57,
1: -	DEVLINK_TRAP_GENERIC_ID_UC_LB = 58,
1: -	DEVLINK_TRAP_GENERIC_ID_LOCAL_ROUTE = 59,
1: -	DEVLINK_TRAP_GENERIC_ID_EXTERNAL_ROUTE = 60,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_UC_DIP_LINK_LOCAL_SCOPE = 61,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_DIP_ALL_NODES = 62,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_DIP_ALL_ROUTERS = 63,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_SOLICIT = 64,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_ADVERT = 65,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_REDIRECT = 66,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV4_ROUTER_ALERT = 67,
1: -	DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_ALERT = 68,
1: -	DEVLINK_TRAP_GENERIC_ID_PTP_EVENT = 69,
1: -	DEVLINK_TRAP_GENERIC_ID_PTP_GENERAL = 70,
1: -	DEVLINK_TRAP_GENERIC_ID_FLOW_ACTION_SAMPLE = 71,
1: -	DEVLINK_TRAP_GENERIC_ID_FLOW_ACTION_TRAP = 72,
1: -	DEVLINK_TRAP_GENERIC_ID_EARLY_DROP = 73,
1: -	DEVLINK_TRAP_GENERIC_ID_VXLAN_PARSING = 74,
1: -	DEVLINK_TRAP_GENERIC_ID_LLC_SNAP_PARSING = 75,
1: -	DEVLINK_TRAP_GENERIC_ID_VLAN_PARSING = 76,
1: -	DEVLINK_TRAP_GENERIC_ID_PPPOE_PPP_PARSING = 77,
1: -	DEVLINK_TRAP_GENERIC_ID_MPLS_PARSING = 78,
1: -	DEVLINK_TRAP_GENERIC_ID_ARP_PARSING = 79,
1: -	DEVLINK_TRAP_GENERIC_ID_IP_1_PARSING = 80,
1: -	DEVLINK_TRAP_GENERIC_ID_IP_N_PARSING = 81,
1: -	DEVLINK_TRAP_GENERIC_ID_GRE_PARSING = 82,
1: -	DEVLINK_TRAP_GENERIC_ID_UDP_PARSING = 83,
1: -	DEVLINK_TRAP_GENERIC_ID_TCP_PARSING = 84,
1: -	DEVLINK_TRAP_GENERIC_ID_IPSEC_PARSING = 85,
1: -	DEVLINK_TRAP_GENERIC_ID_SCTP_PARSING = 86,
1: -	DEVLINK_TRAP_GENERIC_ID_DCCP_PARSING = 87,
1: -	DEVLINK_TRAP_GENERIC_ID_GTP_PARSING = 88,
1: -	DEVLINK_TRAP_GENERIC_ID_ESP_PARSING = 89,
1: -	__DEVLINK_TRAP_GENERIC_ID_MAX = 90,
1: -	DEVLINK_TRAP_GENERIC_ID_MAX = 89,
1: +  DEVLINK_TRAP_GENERIC_ID_SMAC_MC = 0,
1: +  DEVLINK_TRAP_GENERIC_ID_VLAN_TAG_MISMATCH = 1,
1: +  DEVLINK_TRAP_GENERIC_ID_INGRESS_VLAN_FILTER = 2,
1: +  DEVLINK_TRAP_GENERIC_ID_INGRESS_STP_FILTER = 3,
1: +  DEVLINK_TRAP_GENERIC_ID_EMPTY_TX_LIST = 4,
1: +  DEVLINK_TRAP_GENERIC_ID_PORT_LOOPBACK_FILTER = 5,
1: +  DEVLINK_TRAP_GENERIC_ID_BLACKHOLE_ROUTE = 6,
1: +  DEVLINK_TRAP_GENERIC_ID_TTL_ERROR = 7,
1: +  DEVLINK_TRAP_GENERIC_ID_TAIL_DROP = 8,
1: +  DEVLINK_TRAP_GENERIC_ID_NON_IP_PACKET = 9,
1: +  DEVLINK_TRAP_GENERIC_ID_UC_DIP_MC_DMAC = 10,
1: +  DEVLINK_TRAP_GENERIC_ID_DIP_LB = 11,
1: +  DEVLINK_TRAP_GENERIC_ID_SIP_MC = 12,
1: +  DEVLINK_TRAP_GENERIC_ID_SIP_LB = 13,
1: +  DEVLINK_TRAP_GENERIC_ID_CORRUPTED_IP_HDR = 14,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_SIP_BC = 15,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_MC_DIP_RESERVED_SCOPE = 16,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_MC_DIP_INTERFACE_LOCAL_SCOPE = 17,
1: +  DEVLINK_TRAP_GENERIC_ID_MTU_ERROR = 18,
1: +  DEVLINK_TRAP_GENERIC_ID_UNRESOLVED_NEIGH = 19,
1: +  DEVLINK_TRAP_GENERIC_ID_RPF = 20,
1: +  DEVLINK_TRAP_GENERIC_ID_REJECT_ROUTE = 21,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_LPM_UNICAST_MISS = 22,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_LPM_UNICAST_MISS = 23,
1: +  DEVLINK_TRAP_GENERIC_ID_NON_ROUTABLE = 24,
1: +  DEVLINK_TRAP_GENERIC_ID_DECAP_ERROR = 25,
1: +  DEVLINK_TRAP_GENERIC_ID_OVERLAY_SMAC_MC = 26,
1: +  DEVLINK_TRAP_GENERIC_ID_INGRESS_FLOW_ACTION_DROP = 27,
1: +  DEVLINK_TRAP_GENERIC_ID_EGRESS_FLOW_ACTION_DROP = 28,
1: +  DEVLINK_TRAP_GENERIC_ID_STP = 29,
1: +  DEVLINK_TRAP_GENERIC_ID_LACP = 30,
1: +  DEVLINK_TRAP_GENERIC_ID_LLDP = 31,
1: +  DEVLINK_TRAP_GENERIC_ID_IGMP_QUERY = 32,
1: +  DEVLINK_TRAP_GENERIC_ID_IGMP_V1_REPORT = 33,
1: +  DEVLINK_TRAP_GENERIC_ID_IGMP_V2_REPORT = 34,
1: +  DEVLINK_TRAP_GENERIC_ID_IGMP_V3_REPORT = 35,
1: +  DEVLINK_TRAP_GENERIC_ID_IGMP_V2_LEAVE = 36,
1: +  DEVLINK_TRAP_GENERIC_ID_MLD_QUERY = 37,
1: +  DEVLINK_TRAP_GENERIC_ID_MLD_V1_REPORT = 38,
1: +  DEVLINK_TRAP_GENERIC_ID_MLD_V2_REPORT = 39,
1: +  DEVLINK_TRAP_GENERIC_ID_MLD_V1_DONE = 40,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_DHCP = 41,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_DHCP = 42,
1: +  DEVLINK_TRAP_GENERIC_ID_ARP_REQUEST = 43,
1: +  DEVLINK_TRAP_GENERIC_ID_ARP_RESPONSE = 44,
1: +  DEVLINK_TRAP_GENERIC_ID_ARP_OVERLAY = 45,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_NEIGH_SOLICIT = 46,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_NEIGH_ADVERT = 47,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_BFD = 48,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_BFD = 49,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_OSPF = 50,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_OSPF = 51,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_BGP = 52,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_BGP = 53,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_VRRP = 54,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_VRRP = 55,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_PIM = 56,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_PIM = 57,
1: +  DEVLINK_TRAP_GENERIC_ID_UC_LB = 58,
1: +  DEVLINK_TRAP_GENERIC_ID_LOCAL_ROUTE = 59,
1: +  DEVLINK_TRAP_GENERIC_ID_EXTERNAL_ROUTE = 60,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_UC_DIP_LINK_LOCAL_SCOPE = 61,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_DIP_ALL_NODES = 62,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_DIP_ALL_ROUTERS = 63,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_SOLICIT = 64,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_ADVERT = 65,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_REDIRECT = 66,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV4_ROUTER_ALERT = 67,
1: +  DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_ALERT = 68,
1: +  DEVLINK_TRAP_GENERIC_ID_PTP_EVENT = 69,
1: +  DEVLINK_TRAP_GENERIC_ID_PTP_GENERAL = 70,
1: +  DEVLINK_TRAP_GENERIC_ID_FLOW_ACTION_SAMPLE = 71,
1: +  DEVLINK_TRAP_GENERIC_ID_FLOW_ACTION_TRAP = 72,
1: +  DEVLINK_TRAP_GENERIC_ID_EARLY_DROP = 73,
1: +  DEVLINK_TRAP_GENERIC_ID_VXLAN_PARSING = 74,
1: +  DEVLINK_TRAP_GENERIC_ID_LLC_SNAP_PARSING = 75,
1: +  DEVLINK_TRAP_GENERIC_ID_VLAN_PARSING = 76,
1: +  DEVLINK_TRAP_GENERIC_ID_PPPOE_PPP_PARSING = 77,
1: +  DEVLINK_TRAP_GENERIC_ID_MPLS_PARSING = 78,
1: +  DEVLINK_TRAP_GENERIC_ID_ARP_PARSING = 79,
1: +  DEVLINK_TRAP_GENERIC_ID_IP_1_PARSING = 80,
1: +  DEVLINK_TRAP_GENERIC_ID_IP_N_PARSING = 81,
1: +  DEVLINK_TRAP_GENERIC_ID_GRE_PARSING = 82,
1: +  DEVLINK_TRAP_GENERIC_ID_UDP_PARSING = 83,
1: +  DEVLINK_TRAP_GENERIC_ID_TCP_PARSING = 84,
1: +  DEVLINK_TRAP_GENERIC_ID_IPSEC_PARSING = 85,
1: +  DEVLINK_TRAP_GENERIC_ID_SCTP_PARSING = 86,
1: +  DEVLINK_TRAP_GENERIC_ID_DCCP_PARSING = 87,
1: +  DEVLINK_TRAP_GENERIC_ID_GTP_PARSING = 88,
1: +  DEVLINK_TRAP_GENERIC_ID_ESP_PARSING = 89,
1: +  __DEVLINK_TRAP_GENERIC_ID_MAX = 90,
1: +  DEVLINK_TRAP_GENERIC_ID_MAX = 89,
1:  };
1:  
1:  enum devlink_trap_group_generic_id {
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_L2_DROPS = 0,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_L3_DROPS = 1,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_L3_EXCEPTIONS = 2,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_BUFFER_DROPS = 3,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_TUNNEL_DROPS = 4,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_DROPS = 5,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_STP = 6,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_LACP = 7,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_LLDP = 8,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_MC_SNOOPING = 9,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_DHCP = 10,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_NEIGH_DISCOVERY = 11,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_BFD = 12,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_OSPF = 13,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_BGP = 14,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_VRRP = 15,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_PIM = 16,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_UC_LB = 17,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_LOCAL_DELIVERY = 18,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_EXTERNAL_DELIVERY = 19,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_IPV6 = 20,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_PTP_EVENT = 21,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_PTP_GENERAL = 22,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_SAMPLE = 23,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_TRAP = 24,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_PARSER_ERROR_DROPS = 25,
1: -	__DEVLINK_TRAP_GROUP_GENERIC_ID_MAX = 26,
1: -	DEVLINK_TRAP_GROUP_GENERIC_ID_MAX = 25,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_L2_DROPS = 0,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_L3_DROPS = 1,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_L3_EXCEPTIONS = 2,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_BUFFER_DROPS = 3,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_TUNNEL_DROPS = 4,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_DROPS = 5,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_STP = 6,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_LACP = 7,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_LLDP = 8,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_MC_SNOOPING = 9,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_DHCP = 10,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_NEIGH_DISCOVERY = 11,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_BFD = 12,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_OSPF = 13,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_BGP = 14,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_VRRP = 15,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_PIM = 16,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_UC_LB = 17,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_LOCAL_DELIVERY = 18,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_EXTERNAL_DELIVERY = 19,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_IPV6 = 20,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_PTP_EVENT = 21,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_PTP_GENERAL = 22,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_SAMPLE = 23,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_TRAP = 24,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_PARSER_ERROR_DROPS = 25,
1: +  __DEVLINK_TRAP_GROUP_GENERIC_ID_MAX = 26,
1: +  DEVLINK_TRAP_GROUP_GENERIC_ID_MAX = 25,
1:  };
1:  
1:  enum nsim_resource_id {
1: -	NSIM_RESOURCE_NONE = 0,
1: -	NSIM_RESOURCE_IPV4 = 1,
1: -	NSIM_RESOURCE_IPV4_FIB = 2,
1: -	NSIM_RESOURCE_IPV4_FIB_RULES = 3,
1: -	NSIM_RESOURCE_IPV6 = 4,
1: -	NSIM_RESOURCE_IPV6_FIB = 5,
1: -	NSIM_RESOURCE_IPV6_FIB_RULES = 6,
1: -	NSIM_RESOURCE_NEXTHOPS = 7,
1: +  NSIM_RESOURCE_NONE = 0,
1: +  NSIM_RESOURCE_IPV4 = 1,
1: +  NSIM_RESOURCE_IPV4_FIB = 2,
1: +  NSIM_RESOURCE_IPV4_FIB_RULES = 3,
1: +  NSIM_RESOURCE_IPV6 = 4,
1: +  NSIM_RESOURCE_IPV6_FIB = 5,
1: +  NSIM_RESOURCE_IPV6_FIB_RULES = 6,
1: +  NSIM_RESOURCE_NEXTHOPS = 7,
1:  };
1:  
1:  struct nsim_trap_item;
1:  
1:  struct nsim_trap_data {
1: -	struct delayed_work trap_report_dw;
1: -	struct nsim_trap_item *trap_items_arr;
1: -	u64 *trap_policers_cnt_arr;
1: -	struct nsim_dev *nsim_dev;
1: -	spinlock_t trap_lock;
1: +  struct delayed_work trap_report_dw;
1: +  struct nsim_trap_item *trap_items_arr;
1: +  u64 *trap_policers_cnt_arr;
1: +  struct nsim_dev *nsim_dev;
1: +  spinlock_t trap_lock;
1:  };
1:  
1:  enum nsim_devlink_param_id {
1: -	NSIM_DEVLINK_PARAM_ID_BASE = 10,
1: -	NSIM_DEVLINK_PARAM_ID_TEST1 = 11,
1: +  NSIM_DEVLINK_PARAM_ID_BASE = 10,
1: +  NSIM_DEVLINK_PARAM_ID_TEST1 = 11,
1:  };
1:  
1:  struct nsim_trap_item {
1: -	void *trap_ctx;
1: -	enum devlink_trap_action action;
1: +  void *trap_ctx;
1: +  enum devlink_trap_action action;
1:  };
1:  
1:  enum {
1: -	NSIM_TRAP_ID_BASE = 89,
1: -	NSIM_TRAP_ID_FID_MISS = 90,
1: +  NSIM_TRAP_ID_BASE = 89,
1: +  NSIM_TRAP_ID_FID_MISS = 90,
1:  };
1:  
1:  struct fib_notifier_info {
1: -	int family;
1: -	struct netlink_ext_ack *extack;
1: +  int family;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  enum fib_event_type {
1: -	FIB_EVENT_ENTRY_REPLACE = 0,
1: -	FIB_EVENT_ENTRY_APPEND = 1,
1: -	FIB_EVENT_ENTRY_ADD = 2,
1: -	FIB_EVENT_ENTRY_DEL = 3,
1: -	FIB_EVENT_RULE_ADD = 4,
1: -	FIB_EVENT_RULE_DEL = 5,
1: -	FIB_EVENT_NH_ADD = 6,
1: -	FIB_EVENT_NH_DEL = 7,
1: -	FIB_EVENT_VIF_ADD = 8,
1: -	FIB_EVENT_VIF_DEL = 9,
1: +  FIB_EVENT_ENTRY_REPLACE = 0,
1: +  FIB_EVENT_ENTRY_APPEND = 1,
1: +  FIB_EVENT_ENTRY_ADD = 2,
1: +  FIB_EVENT_ENTRY_DEL = 3,
1: +  FIB_EVENT_RULE_ADD = 4,
1: +  FIB_EVENT_RULE_DEL = 5,
1: +  FIB_EVENT_NH_ADD = 6,
1: +  FIB_EVENT_NH_DEL = 7,
1: +  FIB_EVENT_VIF_ADD = 8,
1: +  FIB_EVENT_VIF_DEL = 9,
1:  };
1:  
1:  struct fib_rt_info {
1: -	struct fib_info *fi;
1: -	u32 tb_id;
1: -	__be32 dst;
1: -	int dst_len;
1: -	u8 tos;
1: -	u8 type;
1: -	u8 offload: 1;
1: -	u8 trap: 1;
1: -	u8 unused: 6;
1: +  struct fib_info *fi;
1: +  u32 tb_id;
1: +  __be32 dst;
1: +  int dst_len;
1: +  u8 tos;
1: +  u8 type;
1: +  u8 offload : 1;
1: +  u8 trap : 1;
1: +  u8 unused : 6;
1:  };
1:  
1:  struct fib_entry_notifier_info {
1: -	struct fib_notifier_info info;
1: -	u32 dst;
1: -	int dst_len;
1: -	struct fib_info *fi;
1: -	u8 tos;
1: -	u8 type;
1: -	u32 tb_id;
1: +  struct fib_notifier_info info;
1: +  u32 dst;
1: +  int dst_len;
1: +  struct fib_info *fi;
1: +  u8 tos;
1: +  u8 type;
1: +  u32 tb_id;
1:  };
1:  
1:  struct fib6_entry_notifier_info {
1: -	struct fib_notifier_info info;
1: -	struct fib6_info *rt;
1: -	unsigned int nsiblings;
1: +  struct fib_notifier_info info;
1: +  struct fib6_info *rt;
1: +  unsigned int nsiblings;
1:  };
1:  
1:  struct nsim_fib_entry {
1: -	u64 max;
1: -	u64 num;
1: +  u64 max;
1: +  u64 num;
1:  };
1:  
1:  struct nsim_per_fib_data {
1: -	struct nsim_fib_entry fib;
1: -	struct nsim_fib_entry rules;
1: +  struct nsim_fib_entry fib;
1: +  struct nsim_fib_entry rules;
1:  };
1:  
1:  struct nsim_fib_data___2 {
1: -	struct notifier_block fib_nb;
1: -	struct nsim_per_fib_data ipv4;
1: -	struct nsim_per_fib_data ipv6;
1: -	struct nsim_fib_entry nexthops;
1: -	struct rhashtable fib_rt_ht;
1: -	struct list_head fib_rt_list;
1: -	spinlock_t fib_lock;
1: -	struct notifier_block nexthop_nb;
1: -	struct rhashtable nexthop_ht;
1: -	struct devlink *devlink;
1: +  struct notifier_block fib_nb;
1: +  struct nsim_per_fib_data ipv4;
1: +  struct nsim_per_fib_data ipv6;
1: +  struct nsim_fib_entry nexthops;
1: +  struct rhashtable fib_rt_ht;
1: +  struct list_head fib_rt_list;
1: +  spinlock_t fib_lock;
1: +  struct notifier_block nexthop_nb;
1: +  struct rhashtable nexthop_ht;
1: +  struct devlink *devlink;
1:  };
1:  
1:  struct nsim_fib_rt_key {
1: -	unsigned char addr[16];
1: -	unsigned char prefix_len;
1: -	int family;
1: -	u32 tb_id;
1: +  unsigned char addr[16];
1: +  unsigned char prefix_len;
1: +  int family;
1: +  u32 tb_id;
1:  };
1:  
1:  struct nsim_fib_rt {
1: -	struct nsim_fib_rt_key key;
1: -	struct rhash_head ht_node;
1: -	struct list_head list;
1: +  struct nsim_fib_rt_key key;
1: +  struct rhash_head ht_node;
1: +  struct list_head list;
1:  };
1:  
1:  struct nsim_fib4_rt {
1: -	struct nsim_fib_rt common;
1: -	struct fib_info *fi;
1: -	u8 tos;
1: -	u8 type;
1: +  struct nsim_fib_rt common;
1: +  struct fib_info *fi;
1: +  u8 tos;
1: +  u8 type;
1:  };
1:  
1:  struct nsim_fib6_rt {
1: -	struct nsim_fib_rt common;
1: -	struct list_head nh_list;
1: -	unsigned int nhs;
1: +  struct nsim_fib_rt common;
1: +  struct list_head nh_list;
1: +  unsigned int nhs;
1:  };
1:  
1:  struct nsim_fib6_rt_nh {
1: -	struct list_head list;
1: -	struct fib6_info *rt;
1: +  struct list_head list;
1: +  struct fib6_info *rt;
1:  };
1:  
1:  struct nsim_nexthop {
1: -	struct rhash_head ht_node;
1: -	u64 occ;
1: -	u32 id;
1: +  struct rhash_head ht_node;
1: +  u64 occ;
1: +  u32 id;
1:  };
1:  
1:  struct devlink_fmsg;
1:  
1:  struct devlink_health_reporter_ops {
1: -	char *name;
1: -	int (*recover)(struct devlink_health_reporter *, void *, struct netlink_ext_ack *);
1: -	int (*dump)(struct devlink_health_reporter *, struct devlink_fmsg *, void *, struct netlink_ext_ack *);
1: -	int (*diagnose)(struct devlink_health_reporter *, struct devlink_fmsg *, struct netlink_ext_ack *);
1: -	int (*test)(struct devlink_health_reporter *, struct netlink_ext_ack *);
1: +  char *name;
1: +  int (*recover)(struct devlink_health_reporter *, void *,
1: +                 struct netlink_ext_ack *);
1: +  int (*dump)(struct devlink_health_reporter *, struct devlink_fmsg *, void *,
1: +              struct netlink_ext_ack *);
1: +  int (*diagnose)(struct devlink_health_reporter *, struct devlink_fmsg *,
1: +                  struct netlink_ext_ack *);
1: +  int (*test)(struct devlink_health_reporter *, struct netlink_ext_ack *);
1:  };
1:  
1:  struct nsim_dev_dummy_reporter_ctx {
1: -	char *break_msg;
1: +  char *break_msg;
1:  };
1:  
1:  struct nsim_bpf_bound_prog {
1: -	struct nsim_dev *nsim_dev;
1: -	struct bpf_prog *prog;
1: -	struct dentry *ddir;
1: -	const char *state;
1: -	bool is_loaded;
1: -	struct list_head l;
1: +  struct nsim_dev *nsim_dev;
1: +  struct bpf_prog *prog;
1: +  struct dentry *ddir;
1: +  const char *state;
1: +  bool is_loaded;
1: +  struct list_head l;
1:  };
1:  
1:  struct nsim_map_entry {
1: -	void *key;
1: -	void *value;
1: +  void *key;
1: +  void *value;
1:  };
1:  
1:  struct nsim_bpf_bound_map {
1: -	struct netdevsim *ns;
1: -	struct bpf_offloaded_map *map;
1: -	struct mutex mutex;
1: -	struct nsim_map_entry entry[2];
1: -	struct list_head l;
1: +  struct netdevsim *ns;
1: +  struct bpf_offloaded_map *map;
1: +  struct mutex mutex;
1: +  struct nsim_map_entry entry[2];
1: +  struct list_head l;
1:  };
1:  
1:  struct netpoll_info {
1: -	refcount_t refcnt;
1: -	struct semaphore dev_lock;
1: -	struct sk_buff_head txq;
1: -	struct delayed_work tx_work;
1: -	struct netpoll *netpoll;
1: -	struct callback_head rcu;
1: +  refcount_t refcnt;
1: +  struct semaphore dev_lock;
1: +  struct sk_buff_head txq;
1: +  struct delayed_work tx_work;
1: +  struct netpoll *netpoll;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netdev_lag_lower_state_info {
1: -	u8 link_up: 1;
1: -	u8 tx_enabled: 1;
1: +  u8 link_up : 1;
1: +  u8 tx_enabled : 1;
1:  };
1:  
1:  union inet_addr {
1: -	__u32 all[4];
1: -	__be32 ip;
1: -	__be32 ip6[4];
1: -	struct in_addr in;
1: -	struct in6_addr in6;
1: +  __u32 all[4];
1: +  __be32 ip;
1: +  __be32 ip6[4];
1: +  struct in_addr in;
1: +  struct in6_addr in6;
1:  };
1:  
1:  struct netpoll {
1: -	struct net_device *dev;
1: -	char dev_name[16];
1: -	const char *name;
1: -	union inet_addr local_ip;
1: -	union inet_addr remote_ip;
1: -	bool ipv6;
1: -	u16 local_port;
1: -	u16 remote_port;
1: -	u8 remote_mac[6];
1: +  struct net_device *dev;
1: +  char dev_name[16];
1: +  const char *name;
1: +  union inet_addr local_ip;
1: +  union inet_addr remote_ip;
1: +  bool ipv6;
1: +  u16 local_port;
1: +  u16 remote_port;
1: +  u8 remote_mac[6];
1:  };
1:  
1:  struct net_failover_info {
1: -	struct net_device *primary_dev;
1: -	struct net_device *standby_dev;
1: -	struct rtnl_link_stats64 primary_stats;
1: -	struct rtnl_link_stats64 standby_stats;
1: -	struct rtnl_link_stats64 failover_stats;
1: -	spinlock_t stats_lock;
1: +  struct net_device *primary_dev;
1: +  struct net_device *standby_dev;
1: +  struct rtnl_link_stats64 primary_stats;
1: +  struct rtnl_link_stats64 standby_stats;
1: +  struct rtnl_link_stats64 failover_stats;
1: +  spinlock_t stats_lock;
1:  };
1:  
1:  typedef unsigned char U8;
1: @@ -103727,144 +104900,144 @@ typedef short unsigned int U16___2;
1:  typedef u_int32_t U32___2;
1:  
1:  struct _U64 {
1: -	U32___2 Low;
1: -	U32___2 High;
1: +  U32___2 Low;
1: +  U32___2 High;
1:  };
1:  
1:  typedef struct _U64 U64___2;
1:  
1:  struct _SGE_SIMPLE32 {
1: -	U32___2 FlagsLength;
1: -	U32___2 Address;
1: +  U32___2 FlagsLength;
1: +  U32___2 Address;
1:  };
1:  
1:  typedef struct _SGE_SIMPLE32 SGESimple32_t;
1:  
1:  struct _SGE_SIMPLE64 {
1: -	U32___2 FlagsLength;
1: -	U64___2 Address;
1: +  U32___2 FlagsLength;
1: +  U64___2 Address;
1:  };
1:  
1:  typedef struct _SGE_SIMPLE64 SGESimple64_t;
1:  
1:  struct _SGE_SIMPLE_UNION {
1: -	U32___2 FlagsLength;
1: -	union {
1: -		U32___2 Address32;
1: -		U64___2 Address64;
1: -	} u;
1: +  U32___2 FlagsLength;
1: +  union {
1: +    U32___2 Address32;
1: +    U64___2 Address64;
1: +  } u;
1:  };
1:  
1:  typedef struct _SGE_SIMPLE_UNION SGE_SIMPLE_UNION;
1:  
1:  struct _SGE_CHAIN32 {
1: -	U16___2 Length;
1: -	U8 NextChainOffset;
1: -	U8 Flags;
1: -	U32___2 Address;
1: +  U16___2 Length;
1: +  U8 NextChainOffset;
1: +  U8 Flags;
1: +  U32___2 Address;
1:  };
1:  
1:  typedef struct _SGE_CHAIN32 SGEChain32_t;
1:  
1:  struct _SGE_CHAIN64 {
1: -	U16___2 Length;
1: -	U8 NextChainOffset;
1: -	U8 Flags;
1: -	U64___2 Address;
1: +  U16___2 Length;
1: +  U8 NextChainOffset;
1: +  U8 Flags;
1: +  U64___2 Address;
1:  };
1:  
1:  typedef struct _SGE_CHAIN64 SGEChain64_t;
1:  
1:  struct _SGE_CHAIN_UNION {
1: -	U16___2 Length;
1: -	U8 NextChainOffset;
1: -	U8 Flags;
1: -	union {
1: -		U32___2 Address32;
1: -		U64___2 Address64;
1: -	} u;
1: +  U16___2 Length;
1: +  U8 NextChainOffset;
1: +  U8 Flags;
1: +  union {
1: +    U32___2 Address32;
1: +    U64___2 Address64;
1: +  } u;
1:  };
1:  
1:  typedef struct _SGE_CHAIN_UNION SGE_CHAIN_UNION;
1:  
1:  struct _SGE_TRANSACTION_UNION {
1: -	U8 Reserved;
1: -	U8 ContextSize;
1: -	U8 DetailsLength;
1: -	U8 Flags;
1: -	union {
1: -		U32___2 TransactionContext32[1];
1: -		U32___2 TransactionContext64[2];
1: -		U32___2 TransactionContext96[3];
1: -		U32___2 TransactionContext128[4];
1: -	} u;
1: -	U32___2 TransactionDetails[1];
1: +  U8 Reserved;
1: +  U8 ContextSize;
1: +  U8 DetailsLength;
1: +  U8 Flags;
1: +  union {
1: +    U32___2 TransactionContext32[1];
1: +    U32___2 TransactionContext64[2];
1: +    U32___2 TransactionContext96[3];
1: +    U32___2 TransactionContext128[4];
1: +  } u;
1: +  U32___2 TransactionDetails[1];
1:  };
1:  
1:  typedef struct _SGE_TRANSACTION_UNION SGE_TRANSACTION_UNION;
1:  
1:  struct _SGE_IO_UNION {
1: -	union {
1: -		SGE_SIMPLE_UNION Simple;
1: -		SGE_CHAIN_UNION Chain;
1: -	} u;
1: +  union {
1: +    SGE_SIMPLE_UNION Simple;
1: +    SGE_CHAIN_UNION Chain;
1: +  } u;
1:  };
1:  
1:  typedef struct _SGE_IO_UNION SGE_IO_UNION;
1:  
1:  struct _SGE_MPI_UNION {
1: -	union {
1: -		SGE_SIMPLE_UNION Simple;
1: -		SGE_CHAIN_UNION Chain;
1: -		SGE_TRANSACTION_UNION Transaction;
1: -	} u;
1: +  union {
1: +    SGE_SIMPLE_UNION Simple;
1: +    SGE_CHAIN_UNION Chain;
1: +    SGE_TRANSACTION_UNION Transaction;
1: +  } u;
1:  };
1:  
1:  typedef struct _SGE_MPI_UNION SGE_MPI_UNION;
1:  
1:  struct _MSG_REQUEST_HEADER {
1: -	U8 Reserved[2];
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: +  U8 Reserved[2];
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1:  };
1:  
1:  typedef struct _MSG_REQUEST_HEADER MPIHeader_t;
1:  
1:  struct _MSG_DEFAULT_REPLY {
1: -	U8 Reserved[2];
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 Reserved2[2];
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: +  U8 Reserved[2];
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 Reserved2[2];
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1:  };
1:  
1:  typedef struct _MSG_DEFAULT_REPLY MPIDefaultReply_t;
1:  
1:  struct _MSG_IOC_INIT {
1: -	U8 WhoInit;
1: -	U8 Reserved;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Flags;
1: -	U8 MaxDevices;
1: -	U8 MaxBuses;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U16___2 ReplyFrameSize;
1: -	U8 Reserved1[2];
1: -	U32___2 HostMfaHighAddr;
1: -	U32___2 SenseBufferHighAddr;
1: -	U32___2 ReplyFifoHostSignalingAddr;
1: -	SGE_SIMPLE_UNION HostPageBufferSGE;
1: -	U16___2 MsgVersion;
1: -	U16___2 HeaderVersion;
1: +  U8 WhoInit;
1: +  U8 Reserved;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Flags;
1: +  U8 MaxDevices;
1: +  U8 MaxBuses;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U16___2 ReplyFrameSize;
1: +  U8 Reserved1[2];
1: +  U32___2 HostMfaHighAddr;
1: +  U32___2 SenseBufferHighAddr;
1: +  U32___2 ReplyFifoHostSignalingAddr;
1: +  SGE_SIMPLE_UNION HostPageBufferSGE;
1: +  U16___2 MsgVersion;
1: +  U16___2 HeaderVersion;
1:  };
1:  
1:  typedef struct _MSG_IOC_INIT IOCInit_t;
1: @@ -103872,261 +105045,261 @@ typedef struct _MSG_IOC_INIT IOCInit_t;
1:  typedef struct _MSG_IOC_INIT *pIOCInit_t;
1:  
1:  struct _MSG_IOC_FACTS {
1: -	U8 Reserved[2];
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: +  U8 Reserved[2];
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1:  };
1:  
1:  typedef struct _MSG_IOC_FACTS IOCFacts_t;
1:  
1:  struct _MPI_FW_VERSION_STRUCT {
1: -	U8 Dev;
1: -	U8 Unit;
1: -	U8 Minor;
1: -	U8 Major;
1: +  U8 Dev;
1: +  U8 Unit;
1: +  U8 Minor;
1: +  U8 Major;
1:  };
1:  
1:  typedef struct _MPI_FW_VERSION_STRUCT MPI_FW_VERSION_STRUCT;
1:  
1:  union _MPI_FW_VERSION {
1: -	MPI_FW_VERSION_STRUCT Struct;
1: -	U32___2 Word;
1: +  MPI_FW_VERSION_STRUCT Struct;
1: +  U32___2 Word;
1:  };
1:  
1:  typedef union _MPI_FW_VERSION MPI_FW_VERSION;
1:  
1:  struct _MSG_IOC_FACTS_REPLY {
1: -	U16___2 MsgVersion;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U16___2 HeaderVersion;
1: -	U8 IOCNumber;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U16___2 IOCExceptions;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U8 MaxChainDepth;
1: -	U8 WhoInit;
1: -	U8 BlockSize;
1: -	U8 Flags;
1: -	U16___2 ReplyQueueDepth;
1: -	U16___2 RequestFrameSize;
1: -	U16___2 Reserved_0101_FWVersion;
1: -	U16___2 ProductID;
1: -	U32___2 CurrentHostMfaHighAddr;
1: -	U16___2 GlobalCredits;
1: -	U8 NumberOfPorts;
1: -	U8 EventState;
1: -	U32___2 CurrentSenseBufferHighAddr;
1: -	U16___2 CurReplyFrameSize;
1: -	U8 MaxDevices;
1: -	U8 MaxBuses;
1: -	U32___2 FWImageSize;
1: -	U32___2 IOCCapabilities;
1: -	MPI_FW_VERSION FWVersion;
1: -	U16___2 HighPriorityQueueDepth;
1: -	U16___2 Reserved2;
1: -	SGE_SIMPLE_UNION HostPageBufferSGE;
1: -	U32___2 ReplyFifoHostSignalingAddr;
1: +  U16___2 MsgVersion;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U16___2 HeaderVersion;
1: +  U8 IOCNumber;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U16___2 IOCExceptions;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U8 MaxChainDepth;
1: +  U8 WhoInit;
1: +  U8 BlockSize;
1: +  U8 Flags;
1: +  U16___2 ReplyQueueDepth;
1: +  U16___2 RequestFrameSize;
1: +  U16___2 Reserved_0101_FWVersion;
1: +  U16___2 ProductID;
1: +  U32___2 CurrentHostMfaHighAddr;
1: +  U16___2 GlobalCredits;
1: +  U8 NumberOfPorts;
1: +  U8 EventState;
1: +  U32___2 CurrentSenseBufferHighAddr;
1: +  U16___2 CurReplyFrameSize;
1: +  U8 MaxDevices;
1: +  U8 MaxBuses;
1: +  U32___2 FWImageSize;
1: +  U32___2 IOCCapabilities;
1: +  MPI_FW_VERSION FWVersion;
1: +  U16___2 HighPriorityQueueDepth;
1: +  U16___2 Reserved2;
1: +  SGE_SIMPLE_UNION HostPageBufferSGE;
1: +  U32___2 ReplyFifoHostSignalingAddr;
1:  };
1:  
1:  typedef struct _MSG_IOC_FACTS_REPLY IOCFactsReply_t;
1:  
1:  struct _MSG_PORT_FACTS {
1: -	U8 Reserved[2];
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[2];
1: -	U8 PortNumber;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: +  U8 Reserved[2];
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[2];
1: +  U8 PortNumber;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1:  };
1:  
1:  typedef struct _MSG_PORT_FACTS PortFacts_t;
1:  
1:  struct _MSG_PORT_FACTS_REPLY {
1: -	U16___2 Reserved;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U16___2 Reserved1;
1: -	U8 PortNumber;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U16___2 Reserved2;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U8 Reserved3;
1: -	U8 PortType;
1: -	U16___2 MaxDevices;
1: -	U16___2 PortSCSIID;
1: -	U16___2 ProtocolFlags;
1: -	U16___2 MaxPostedCmdBuffers;
1: -	U16___2 MaxPersistentIDs;
1: -	U16___2 MaxLanBuckets;
1: -	U8 MaxInitiators;
1: -	U8 Reserved4;
1: -	U32___2 Reserved5;
1: +  U16___2 Reserved;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U16___2 Reserved1;
1: +  U8 PortNumber;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U16___2 Reserved2;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U8 Reserved3;
1: +  U8 PortType;
1: +  U16___2 MaxDevices;
1: +  U16___2 PortSCSIID;
1: +  U16___2 ProtocolFlags;
1: +  U16___2 MaxPostedCmdBuffers;
1: +  U16___2 MaxPersistentIDs;
1: +  U16___2 MaxLanBuckets;
1: +  U8 MaxInitiators;
1: +  U8 Reserved4;
1: +  U32___2 Reserved5;
1:  };
1:  
1:  typedef struct _MSG_PORT_FACTS_REPLY PortFactsReply_t;
1:  
1:  struct _MSG_PORT_ENABLE {
1: -	U8 Reserved[2];
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[2];
1: -	U8 PortNumber;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: +  U8 Reserved[2];
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[2];
1: +  U8 PortNumber;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1:  };
1:  
1:  typedef struct _MSG_PORT_ENABLE PortEnable_t;
1:  
1:  struct _MSG_EVENT_NOTIFY {
1: -	U8 Switch;
1: -	U8 Reserved;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: +  U8 Switch;
1: +  U8 Reserved;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1:  };
1:  
1:  typedef struct _MSG_EVENT_NOTIFY EventNotification_t;
1:  
1:  struct _MSG_EVENT_NOTIFY_REPLY {
1: -	U16___2 EventDataLength;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U8 Reserved1[2];
1: -	U8 AckRequired;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 Reserved2[2];
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U32___2 Event;
1: -	U32___2 EventContext;
1: -	U32___2 Data[1];
1: +  U16___2 EventDataLength;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U8 Reserved1[2];
1: +  U8 AckRequired;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 Reserved2[2];
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U32___2 Event;
1: +  U32___2 EventContext;
1: +  U32___2 Data[1];
1:  };
1:  
1:  typedef struct _MSG_EVENT_NOTIFY_REPLY EventNotificationReply_t;
1:  
1:  struct _MSG_EVENT_ACK {
1: -	U8 Reserved[2];
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U32___2 Event;
1: -	U32___2 EventContext;
1: +  U8 Reserved[2];
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U32___2 Event;
1: +  U32___2 EventContext;
1:  };
1:  
1:  typedef struct _MSG_EVENT_ACK EventAck_t;
1:  
1:  struct _EVENT_DATA_RAID {
1: -	U8 VolumeID;
1: -	U8 VolumeBus;
1: -	U8 ReasonCode;
1: -	U8 PhysDiskNum;
1: -	U8 ASC;
1: -	U8 ASCQ;
1: -	U16___2 Reserved;
1: -	U32___2 SettingsStatus;
1: +  U8 VolumeID;
1: +  U8 VolumeBus;
1: +  U8 ReasonCode;
1: +  U8 PhysDiskNum;
1: +  U8 ASC;
1: +  U8 ASCQ;
1: +  U16___2 Reserved;
1: +  U32___2 SettingsStatus;
1:  };
1:  
1:  typedef struct _EVENT_DATA_RAID MpiEventDataRaid_t;
1:  
1:  struct _MSG_FW_UPLOAD {
1: -	U8 ImageType;
1: -	U8 Reserved;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	SGE_MPI_UNION SGL;
1: +  U8 ImageType;
1: +  U8 Reserved;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  SGE_MPI_UNION SGL;
1:  };
1:  
1:  typedef struct _MSG_FW_UPLOAD FWUpload_t;
1:  
1:  struct _FWUploadTCSGE {
1: -	U8 Reserved;
1: -	U8 ContextSize;
1: -	U8 DetailsLength;
1: -	U8 Flags;
1: -	U32___2 Reserved1;
1: -	U32___2 ImageOffset;
1: -	U32___2 ImageSize;
1: +  U8 Reserved;
1: +  U8 ContextSize;
1: +  U8 DetailsLength;
1: +  U8 Flags;
1: +  U32___2 Reserved1;
1: +  U32___2 ImageOffset;
1: +  U32___2 ImageSize;
1:  };
1:  
1:  typedef struct _FWUploadTCSGE FWUploadTCSGE_t;
1:  
1:  struct _MSG_FW_UPLOAD_REPLY {
1: -	U8 ImageType;
1: -	U8 Reserved;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U8 Reserved1[3];
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U16___2 Reserved2;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U32___2 ActualImageSize;
1: +  U8 ImageType;
1: +  U8 Reserved;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U8 Reserved1[3];
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U16___2 Reserved2;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U32___2 ActualImageSize;
1:  };
1:  
1:  typedef struct _MSG_FW_UPLOAD_REPLY FWUploadReply_t;
1:  
1:  struct _MPI_FW_HEADER {
1: -	U32___2 ArmBranchInstruction0;
1: -	U32___2 Signature0;
1: -	U32___2 Signature1;
1: -	U32___2 Signature2;
1: -	U32___2 ArmBranchInstruction1;
1: -	U32___2 ArmBranchInstruction2;
1: -	U32___2 Reserved;
1: -	U32___2 Checksum;
1: -	U16___2 VendorId;
1: -	U16___2 ProductId;
1: -	MPI_FW_VERSION FWVersion;
1: -	U32___2 SeqCodeVersion;
1: -	U32___2 ImageSize;
1: -	U32___2 NextImageHeaderOffset;
1: -	U32___2 LoadStartAddress;
1: -	U32___2 IopResetVectorValue;
1: -	U32___2 IopResetRegAddr;
1: -	U32___2 VersionNameWhat;
1: -	U8 VersionName[32];
1: -	U32___2 VendorNameWhat;
1: -	U8 VendorName[32];
1: +  U32___2 ArmBranchInstruction0;
1: +  U32___2 Signature0;
1: +  U32___2 Signature1;
1: +  U32___2 Signature2;
1: +  U32___2 ArmBranchInstruction1;
1: +  U32___2 ArmBranchInstruction2;
1: +  U32___2 Reserved;
1: +  U32___2 Checksum;
1: +  U16___2 VendorId;
1: +  U16___2 ProductId;
1: +  MPI_FW_VERSION FWVersion;
1: +  U32___2 SeqCodeVersion;
1: +  U32___2 ImageSize;
1: +  U32___2 NextImageHeaderOffset;
1: +  U32___2 LoadStartAddress;
1: +  U32___2 IopResetVectorValue;
1: +  U32___2 IopResetRegAddr;
1: +  U32___2 VersionNameWhat;
1: +  U8 VersionName[32];
1: +  U32___2 VendorNameWhat;
1: +  U8 VendorName[32];
1:  };
1:  
1:  typedef struct _MPI_FW_HEADER MpiFwHeader_t;
1:  
1:  struct _MPI_EXT_IMAGE_HEADER {
1: -	U8 ImageType;
1: -	U8 Reserved;
1: -	U16___2 Reserved1;
1: -	U32___2 Checksum;
1: -	U32___2 ImageSize;
1: -	U32___2 NextImageHeaderOffset;
1: -	U32___2 LoadStartAddress;
1: -	U32___2 Reserved2;
1: +  U8 ImageType;
1: +  U8 Reserved;
1: +  U16___2 Reserved1;
1: +  U32___2 Checksum;
1: +  U32___2 ImageSize;
1: +  U32___2 NextImageHeaderOffset;
1: +  U32___2 LoadStartAddress;
1: +  U32___2 Reserved2;
1:  };
1:  
1:  typedef struct _MPI_EXT_IMAGE_HEADER MpiExtImageHeader_t;
1:  
1:  struct _CONFIG_PAGE_HEADER {
1: -	U8 PageVersion;
1: -	U8 PageLength;
1: -	U8 PageNumber;
1: -	U8 PageType;
1: +  U8 PageVersion;
1: +  U8 PageLength;
1: +  U8 PageNumber;
1: +  U8 PageType;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_HEADER CONFIG_PAGE_HEADER;
1: @@ -104134,13 +105307,13 @@ typedef struct _CONFIG_PAGE_HEADER CONFIG_PAGE_HEADER;
1:  typedef struct _CONFIG_PAGE_HEADER ConfigPageHeader_t;
1:  
1:  struct _CONFIG_EXTENDED_PAGE_HEADER {
1: -	U8 PageVersion;
1: -	U8 Reserved1;
1: -	U8 PageNumber;
1: -	U8 PageType;
1: -	U16___2 ExtPageLength;
1: -	U8 ExtPageType;
1: -	U8 Reserved2;
1: +  U8 PageVersion;
1: +  U8 Reserved1;
1: +  U8 PageNumber;
1: +  U8 PageType;
1: +  U16___2 ExtPageLength;
1: +  U8 ExtPageType;
1: +  U8 Reserved2;
1:  };
1:  
1:  typedef struct _CONFIG_EXTENDED_PAGE_HEADER CONFIG_EXTENDED_PAGE_HEADER;
1: @@ -104148,152 +105321,152 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER CONFIG_EXTENDED_PAGE_HEADER;
1:  typedef struct _CONFIG_EXTENDED_PAGE_HEADER ConfigExtendedPageHeader_t;
1:  
1:  struct _MSG_CONFIG {
1: -	U8 Action;
1: -	U8 Reserved;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U16___2 ExtPageLength;
1: -	U8 ExtPageType;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 Reserved2[8];
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 PageAddress;
1: -	SGE_IO_UNION PageBufferSGE;
1: +  U8 Action;
1: +  U8 Reserved;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U16___2 ExtPageLength;
1: +  U8 ExtPageType;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 Reserved2[8];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 PageAddress;
1: +  SGE_IO_UNION PageBufferSGE;
1:  };
1:  
1:  typedef struct _MSG_CONFIG Config_t;
1:  
1:  struct _MSG_CONFIG_REPLY {
1: -	U8 Action;
1: -	U8 Reserved;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U16___2 ExtPageLength;
1: -	U8 ExtPageType;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 Reserved2[2];
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	CONFIG_PAGE_HEADER Header;
1: +  U8 Action;
1: +  U8 Reserved;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U16___2 ExtPageLength;
1: +  U8 ExtPageType;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 Reserved2[2];
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  CONFIG_PAGE_HEADER Header;
1:  };
1:  
1:  typedef struct _MSG_CONFIG_REPLY ConfigReply_t;
1:  
1:  struct _CONFIG_PAGE_MANUFACTURING_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U8 ChipName[16];
1: -	U8 ChipRevision[8];
1: -	U8 BoardName[16];
1: -	U8 BoardAssembly[16];
1: -	U8 BoardTracerNumber[16];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U8 ChipName[16];
1: +  U8 ChipRevision[8];
1: +  U8 BoardName[16];
1: +  U8 BoardAssembly[16];
1: +  U8 BoardTracerNumber[16];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_MANUFACTURING_0 ManufacturingPage0_t;
1:  
1:  struct _MPI_ADAPTER_INFO {
1: -	U8 PciBusNumber;
1: -	U8 PciDeviceAndFunctionNumber;
1: -	U16___2 AdapterFlags;
1: +  U8 PciBusNumber;
1: +  U8 PciDeviceAndFunctionNumber;
1: +  U16___2 AdapterFlags;
1:  };
1:  
1:  typedef struct _MPI_ADAPTER_INFO MPI_ADAPTER_INFO;
1:  
1:  struct _CONFIG_PAGE_IO_UNIT_2 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 Flags;
1: -	U32___2 BiosVersion;
1: -	MPI_ADAPTER_INFO AdapterOrder[4];
1: -	U32___2 Reserved1;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 Flags;
1: +  U32___2 BiosVersion;
1: +  MPI_ADAPTER_INFO AdapterOrder[4];
1: +  U32___2 Reserved1;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_IO_UNIT_2 IOUnitPage2_t;
1:  
1:  struct _CONFIG_PAGE_IOC_1 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 Flags;
1: -	U32___2 CoalescingTimeout;
1: -	U8 CoalescingDepth;
1: -	U8 PCISlotNum;
1: -	U8 Reserved[2];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 Flags;
1: +  U32___2 CoalescingTimeout;
1: +  U8 CoalescingDepth;
1: +  U8 PCISlotNum;
1: +  U8 Reserved[2];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_IOC_1 IOCPage1_t;
1:  
1:  struct _CONFIG_PAGE_IOC_2_RAID_VOL {
1: -	U8 VolumeID;
1: -	U8 VolumeBus;
1: -	U8 VolumeIOC;
1: -	U8 VolumePageNumber;
1: -	U8 VolumeType;
1: -	U8 Flags;
1: -	U16___2 Reserved3;
1: +  U8 VolumeID;
1: +  U8 VolumeBus;
1: +  U8 VolumeIOC;
1: +  U8 VolumePageNumber;
1: +  U8 VolumeType;
1: +  U8 Flags;
1: +  U16___2 Reserved3;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL CONFIG_PAGE_IOC_2_RAID_VOL;
1:  
1:  struct _CONFIG_PAGE_IOC_2 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 CapabilitiesFlags;
1: -	U8 NumActiveVolumes;
1: -	U8 MaxVolumes;
1: -	U8 NumActivePhysDisks;
1: -	U8 MaxPhysDisks;
1: -	CONFIG_PAGE_IOC_2_RAID_VOL RaidVolume[1];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 CapabilitiesFlags;
1: +  U8 NumActiveVolumes;
1: +  U8 MaxVolumes;
1: +  U8 NumActivePhysDisks;
1: +  U8 MaxPhysDisks;
1: +  CONFIG_PAGE_IOC_2_RAID_VOL RaidVolume[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_IOC_2 IOCPage2_t;
1:  
1:  struct _IOC_3_PHYS_DISK {
1: -	U8 PhysDiskID;
1: -	U8 PhysDiskBus;
1: -	U8 PhysDiskIOC;
1: -	U8 PhysDiskNum;
1: +  U8 PhysDiskID;
1: +  U8 PhysDiskBus;
1: +  U8 PhysDiskIOC;
1: +  U8 PhysDiskNum;
1:  };
1:  
1:  typedef struct _IOC_3_PHYS_DISK IOC_3_PHYS_DISK;
1:  
1:  struct _CONFIG_PAGE_IOC_3 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U8 NumPhysDisks;
1: -	U8 Reserved1;
1: -	U16___2 Reserved2;
1: -	IOC_3_PHYS_DISK PhysDisk[1];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U8 NumPhysDisks;
1: +  U8 Reserved1;
1: +  U16___2 Reserved2;
1: +  IOC_3_PHYS_DISK PhysDisk[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_IOC_3 IOCPage3_t;
1:  
1:  struct _IOC_4_SEP {
1: -	U8 SEPTargetID;
1: -	U8 SEPBus;
1: -	U16___2 Reserved;
1: +  U8 SEPTargetID;
1: +  U8 SEPBus;
1: +  U16___2 Reserved;
1:  };
1:  
1:  typedef struct _IOC_4_SEP IOC_4_SEP;
1:  
1:  struct _CONFIG_PAGE_IOC_4 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U8 ActiveSEP;
1: -	U8 MaxSEP;
1: -	U16___2 Reserved1;
1: -	IOC_4_SEP SEP[1];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U8 ActiveSEP;
1: +  U8 MaxSEP;
1: +  U16___2 Reserved1;
1: +  IOC_4_SEP SEP[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_IOC_4 IOCPage4_t;
1:  
1:  struct _CONFIG_PAGE_SCSI_PORT_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 Capabilities;
1: -	U32___2 PhysicalInterface;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 Capabilities;
1: +  U32___2 PhysicalInterface;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SCSI_PORT_0 SCSIPortPage0_t;
1:  
1:  struct _MPI_DEVICE_INFO {
1: -	U8 Timeout;
1: -	U8 SyncFactor;
1: -	U16___2 DeviceFlags;
1: +  U8 Timeout;
1: +  U8 SyncFactor;
1: +  U16___2 DeviceFlags;
1:  };
1:  
1:  typedef struct _MPI_DEVICE_INFO MPI_DEVICE_INFO;
1: @@ -104301,157 +105474,157 @@ typedef struct _MPI_DEVICE_INFO MPI_DEVICE_INFO;
1:  typedef struct _MPI_DEVICE_INFO MpiDeviceInfo_t;
1:  
1:  struct _CONFIG_PAGE_SCSI_PORT_2 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 PortFlags;
1: -	U32___2 PortSettings;
1: -	MPI_DEVICE_INFO DeviceSettings[16];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 PortFlags;
1: +  U32___2 PortSettings;
1: +  MPI_DEVICE_INFO DeviceSettings[16];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SCSI_PORT_2 SCSIPortPage2_t;
1:  
1:  struct _CONFIG_PAGE_FC_PORT_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 Flags;
1: -	U8 MPIPortNumber;
1: -	U8 LinkType;
1: -	U8 PortState;
1: -	U8 Reserved;
1: -	U32___2 PortIdentifier;
1: -	U64___2 WWNN;
1: -	U64___2 WWPN;
1: -	U32___2 SupportedServiceClass;
1: -	U32___2 SupportedSpeeds;
1: -	U32___2 CurrentSpeed;
1: -	U32___2 MaxFrameSize;
1: -	U64___2 FabricWWNN;
1: -	U64___2 FabricWWPN;
1: -	U32___2 DiscoveredPortsCount;
1: -	U32___2 MaxInitiators;
1: -	U8 MaxAliasesSupported;
1: -	U8 MaxHardAliasesSupported;
1: -	U8 NumCurrentAliases;
1: -	U8 Reserved1;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 Flags;
1: +  U8 MPIPortNumber;
1: +  U8 LinkType;
1: +  U8 PortState;
1: +  U8 Reserved;
1: +  U32___2 PortIdentifier;
1: +  U64___2 WWNN;
1: +  U64___2 WWPN;
1: +  U32___2 SupportedServiceClass;
1: +  U32___2 SupportedSpeeds;
1: +  U32___2 CurrentSpeed;
1: +  U32___2 MaxFrameSize;
1: +  U64___2 FabricWWNN;
1: +  U64___2 FabricWWPN;
1: +  U32___2 DiscoveredPortsCount;
1: +  U32___2 MaxInitiators;
1: +  U8 MaxAliasesSupported;
1: +  U8 MaxHardAliasesSupported;
1: +  U8 NumCurrentAliases;
1: +  U8 Reserved1;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_FC_PORT_0 FCPortPage0_t;
1:  
1:  struct _CONFIG_PAGE_FC_PORT_1 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 Flags;
1: -	U64___2 NoSEEPROMWWNN;
1: -	U64___2 NoSEEPROMWWPN;
1: -	U8 HardALPA;
1: -	U8 LinkConfig;
1: -	U8 TopologyConfig;
1: -	U8 AltConnector;
1: -	U8 NumRequestedAliases;
1: -	U8 RR_TOV;
1: -	U8 InitiatorDeviceTimeout;
1: -	U8 InitiatorIoPendTimeout;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 Flags;
1: +  U64___2 NoSEEPROMWWNN;
1: +  U64___2 NoSEEPROMWWPN;
1: +  U8 HardALPA;
1: +  U8 LinkConfig;
1: +  U8 TopologyConfig;
1: +  U8 AltConnector;
1: +  U8 NumRequestedAliases;
1: +  U8 RR_TOV;
1: +  U8 InitiatorDeviceTimeout;
1: +  U8 InitiatorIoPendTimeout;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_FC_PORT_1 FCPortPage1_t;
1:  
1:  struct _RAID_VOL0_PHYS_DISK {
1: -	U16___2 Reserved;
1: -	U8 PhysDiskMap;
1: -	U8 PhysDiskNum;
1: +  U16___2 Reserved;
1: +  U8 PhysDiskMap;
1: +  U8 PhysDiskNum;
1:  };
1:  
1:  typedef struct _RAID_VOL0_PHYS_DISK RAID_VOL0_PHYS_DISK;
1:  
1:  struct _RAID_VOL0_STATUS {
1: -	U8 Flags;
1: -	U8 State;
1: -	U16___2 Reserved;
1: +  U8 Flags;
1: +  U8 State;
1: +  U16___2 Reserved;
1:  };
1:  
1:  typedef struct _RAID_VOL0_STATUS RAID_VOL0_STATUS;
1:  
1:  struct _RAID_VOL0_SETTINGS {
1: -	U16___2 Settings;
1: -	U8 HotSparePool;
1: -	U8 Reserved;
1: +  U16___2 Settings;
1: +  U8 HotSparePool;
1: +  U8 Reserved;
1:  };
1:  
1:  typedef struct _RAID_VOL0_SETTINGS RAID_VOL0_SETTINGS;
1:  
1:  struct _CONFIG_PAGE_RAID_VOL_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U8 VolumeID;
1: -	U8 VolumeBus;
1: -	U8 VolumeIOC;
1: -	U8 VolumeType;
1: -	RAID_VOL0_STATUS VolumeStatus;
1: -	RAID_VOL0_SETTINGS VolumeSettings;
1: -	U32___2 MaxLBA;
1: -	U32___2 MaxLBAHigh;
1: -	U32___2 StripeSize;
1: -	U32___2 Reserved2;
1: -	U32___2 Reserved3;
1: -	U8 NumPhysDisks;
1: -	U8 DataScrubRate;
1: -	U8 ResyncRate;
1: -	U8 InactiveStatus;
1: -	RAID_VOL0_PHYS_DISK PhysDisk[1];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U8 VolumeID;
1: +  U8 VolumeBus;
1: +  U8 VolumeIOC;
1: +  U8 VolumeType;
1: +  RAID_VOL0_STATUS VolumeStatus;
1: +  RAID_VOL0_SETTINGS VolumeSettings;
1: +  U32___2 MaxLBA;
1: +  U32___2 MaxLBAHigh;
1: +  U32___2 StripeSize;
1: +  U32___2 Reserved2;
1: +  U32___2 Reserved3;
1: +  U8 NumPhysDisks;
1: +  U8 DataScrubRate;
1: +  U8 ResyncRate;
1: +  U8 InactiveStatus;
1: +  RAID_VOL0_PHYS_DISK PhysDisk[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_RAID_VOL_0 *pRaidVolumePage0_t;
1:  
1:  struct _RAID_PHYS_DISK0_ERROR_DATA {
1: -	U8 ErrorCdbByte;
1: -	U8 ErrorSenseKey;
1: -	U16___2 Reserved;
1: -	U16___2 ErrorCount;
1: -	U8 ErrorASC;
1: -	U8 ErrorASCQ;
1: -	U16___2 SmartCount;
1: -	U8 SmartASC;
1: -	U8 SmartASCQ;
1: +  U8 ErrorCdbByte;
1: +  U8 ErrorSenseKey;
1: +  U16___2 Reserved;
1: +  U16___2 ErrorCount;
1: +  U8 ErrorASC;
1: +  U8 ErrorASCQ;
1: +  U16___2 SmartCount;
1: +  U8 SmartASC;
1: +  U8 SmartASCQ;
1:  };
1:  
1:  typedef struct _RAID_PHYS_DISK0_ERROR_DATA RAID_PHYS_DISK0_ERROR_DATA;
1:  
1:  struct _RAID_PHYS_DISK_INQUIRY_DATA {
1: -	U8 VendorID[8];
1: -	U8 ProductID[16];
1: -	U8 ProductRevLevel[4];
1: -	U8 Info[32];
1: +  U8 VendorID[8];
1: +  U8 ProductID[16];
1: +  U8 ProductRevLevel[4];
1: +  U8 Info[32];
1:  };
1:  
1:  typedef struct _RAID_PHYS_DISK_INQUIRY_DATA RAID_PHYS_DISK0_INQUIRY_DATA;
1:  
1:  struct _RAID_PHYS_DISK0_SETTINGS {
1: -	U8 SepID;
1: -	U8 SepBus;
1: -	U8 HotSparePool;
1: -	U8 PhysDiskSettings;
1: +  U8 SepID;
1: +  U8 SepBus;
1: +  U8 HotSparePool;
1: +  U8 PhysDiskSettings;
1:  };
1:  
1:  typedef struct _RAID_PHYS_DISK0_SETTINGS RAID_PHYS_DISK0_SETTINGS;
1:  
1:  struct _RAID_PHYS_DISK0_STATUS {
1: -	U8 Flags;
1: -	U8 State;
1: -	U16___2 Reserved;
1: +  U8 Flags;
1: +  U8 State;
1: +  U16___2 Reserved;
1:  };
1:  
1:  typedef struct _RAID_PHYS_DISK0_STATUS RAID_PHYS_DISK0_STATUS;
1:  
1:  struct _CONFIG_PAGE_RAID_PHYS_DISK_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U8 PhysDiskID;
1: -	U8 PhysDiskBus;
1: -	U8 PhysDiskIOC;
1: -	U8 PhysDiskNum;
1: -	RAID_PHYS_DISK0_SETTINGS PhysDiskSettings;
1: -	U32___2 Reserved1;
1: -	U8 ExtDiskIdentifier[8];
1: -	U8 DiskIdentifier[16];
1: -	RAID_PHYS_DISK0_INQUIRY_DATA InquiryData;
1: -	RAID_PHYS_DISK0_STATUS PhysDiskStatus;
1: -	U32___2 MaxLBA;
1: -	RAID_PHYS_DISK0_ERROR_DATA ErrorData;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U8 PhysDiskID;
1: +  U8 PhysDiskBus;
1: +  U8 PhysDiskIOC;
1: +  U8 PhysDiskNum;
1: +  RAID_PHYS_DISK0_SETTINGS PhysDiskSettings;
1: +  U32___2 Reserved1;
1: +  U8 ExtDiskIdentifier[8];
1: +  U8 DiskIdentifier[16];
1: +  RAID_PHYS_DISK0_INQUIRY_DATA InquiryData;
1: +  RAID_PHYS_DISK0_STATUS PhysDiskStatus;
1: +  U32___2 MaxLBA;
1: +  RAID_PHYS_DISK0_ERROR_DATA ErrorData;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0 RaidPhysDiskPage0_t;
1: @@ -104459,25 +105632,25 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0 RaidPhysDiskPage0_t;
1:  typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0 *pRaidPhysDiskPage0_t;
1:  
1:  struct _RAID_PHYS_DISK1_PATH {
1: -	U8 PhysDiskID;
1: -	U8 PhysDiskBus;
1: -	U16___2 Reserved1;
1: -	U64___2 WWID;
1: -	U64___2 OwnerWWID;
1: -	U8 OwnerIdentifier;
1: -	U8 Reserved2;
1: -	U16___2 Flags;
1: +  U8 PhysDiskID;
1: +  U8 PhysDiskBus;
1: +  U16___2 Reserved1;
1: +  U64___2 WWID;
1: +  U64___2 OwnerWWID;
1: +  U8 OwnerIdentifier;
1: +  U8 Reserved2;
1: +  U16___2 Flags;
1:  };
1:  
1:  typedef struct _RAID_PHYS_DISK1_PATH RAID_PHYS_DISK1_PATH;
1:  
1:  struct _CONFIG_PAGE_RAID_PHYS_DISK_1 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U8 NumPhysDiskPaths;
1: -	U8 PhysDiskNum;
1: -	U16___2 Reserved2;
1: -	U32___2 Reserved1;
1: -	RAID_PHYS_DISK1_PATH Path[1];
1: +  CONFIG_PAGE_HEADER Header;
1: +  U8 NumPhysDiskPaths;
1: +  U8 PhysDiskNum;
1: +  U16___2 Reserved2;
1: +  U32___2 Reserved1;
1: +  RAID_PHYS_DISK1_PATH Path[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 RaidPhysDiskPage1_t;
1: @@ -104485,141 +105658,141 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 RaidPhysDiskPage1_t;
1:  typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 *pRaidPhysDiskPage1_t;
1:  
1:  struct _CONFIG_PAGE_LAN_0 {
1: -	ConfigPageHeader_t Header;
1: -	U16___2 TxRxModes;
1: -	U16___2 Reserved;
1: -	U32___2 PacketPrePad;
1: +  ConfigPageHeader_t Header;
1: +  U16___2 TxRxModes;
1: +  U16___2 Reserved;
1: +  U32___2 PacketPrePad;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_LAN_0 LANPage0_t;
1:  
1:  struct _CONFIG_PAGE_LAN_1 {
1: -	ConfigPageHeader_t Header;
1: -	U16___2 Reserved;
1: -	U8 CurrentDeviceState;
1: -	U8 Reserved1;
1: -	U32___2 MinPacketSize;
1: -	U32___2 MaxPacketSize;
1: -	U32___2 HardwareAddressLow;
1: -	U32___2 HardwareAddressHigh;
1: -	U32___2 MaxWireSpeedLow;
1: -	U32___2 MaxWireSpeedHigh;
1: -	U32___2 BucketsRemaining;
1: -	U32___2 MaxReplySize;
1: -	U32___2 NegWireSpeedLow;
1: -	U32___2 NegWireSpeedHigh;
1: +  ConfigPageHeader_t Header;
1: +  U16___2 Reserved;
1: +  U8 CurrentDeviceState;
1: +  U8 Reserved1;
1: +  U32___2 MinPacketSize;
1: +  U32___2 MaxPacketSize;
1: +  U32___2 HardwareAddressLow;
1: +  U32___2 HardwareAddressHigh;
1: +  U32___2 MaxWireSpeedLow;
1: +  U32___2 MaxWireSpeedHigh;
1: +  U32___2 BucketsRemaining;
1: +  U32___2 MaxReplySize;
1: +  U32___2 NegWireSpeedLow;
1: +  U32___2 NegWireSpeedHigh;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_LAN_1 LANPage1_t;
1:  
1:  struct _MPI_SAS_IO_UNIT0_PHY_DATA {
1: -	U8 Port;
1: -	U8 PortFlags;
1: -	U8 PhyFlags;
1: -	U8 NegotiatedLinkRate;
1: -	U32___2 ControllerPhyDeviceInfo;
1: -	U16___2 AttachedDeviceHandle;
1: -	U16___2 ControllerDevHandle;
1: -	U32___2 DiscoveryStatus;
1: +  U8 Port;
1: +  U8 PortFlags;
1: +  U8 PhyFlags;
1: +  U8 NegotiatedLinkRate;
1: +  U32___2 ControllerPhyDeviceInfo;
1: +  U16___2 AttachedDeviceHandle;
1: +  U16___2 ControllerDevHandle;
1: +  U32___2 DiscoveryStatus;
1:  };
1:  
1:  typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA MPI_SAS_IO_UNIT0_PHY_DATA;
1:  
1:  struct _CONFIG_PAGE_SAS_IO_UNIT_0 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U16___2 NvdataVersionDefault;
1: -	U16___2 NvdataVersionPersistent;
1: -	U8 NumPhys;
1: -	U8 Reserved2;
1: -	U16___2 Reserved3;
1: -	MPI_SAS_IO_UNIT0_PHY_DATA PhyData[1];
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U16___2 NvdataVersionDefault;
1: +  U16___2 NvdataVersionPersistent;
1: +  U8 NumPhys;
1: +  U8 Reserved2;
1: +  U16___2 Reserved3;
1: +  MPI_SAS_IO_UNIT0_PHY_DATA PhyData[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0 SasIOUnitPage0_t;
1:  
1:  struct _MSG_SCSI_IO_REQUEST {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 CDBLength;
1: -	U8 SenseBufferLength;
1: -	U8 Reserved;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 LUN[8];
1: -	U32___2 Control;
1: -	U8 CDB[16];
1: -	U32___2 DataLength;
1: -	U32___2 SenseBufferLowAddr;
1: -	SGE_IO_UNION SGL;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 CDBLength;
1: +  U8 SenseBufferLength;
1: +  U8 Reserved;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 LUN[8];
1: +  U32___2 Control;
1: +  U8 CDB[16];
1: +  U32___2 DataLength;
1: +  U32___2 SenseBufferLowAddr;
1: +  SGE_IO_UNION SGL;
1:  };
1:  
1:  typedef struct _MSG_SCSI_IO_REQUEST SCSIIORequest_t;
1:  
1:  struct _MSG_SCSI_IO_REPLY {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U8 CDBLength;
1: -	U8 SenseBufferLength;
1: -	U8 Reserved;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 SCSIStatus;
1: -	U8 SCSIState;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U32___2 TransferCount;
1: -	U32___2 SenseCount;
1: -	U32___2 ResponseInfo;
1: -	U16___2 TaskTag;
1: -	U16___2 Reserved1;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U8 CDBLength;
1: +  U8 SenseBufferLength;
1: +  U8 Reserved;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 SCSIStatus;
1: +  U8 SCSIState;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U32___2 TransferCount;
1: +  U32___2 SenseCount;
1: +  U32___2 ResponseInfo;
1: +  U16___2 TaskTag;
1: +  U16___2 Reserved1;
1:  };
1:  
1:  typedef struct _MSG_SCSI_IO_REPLY SCSIIOReply_t;
1:  
1:  struct _MSG_SAS_IOUNIT_CONTROL_REQUEST {
1: -	U8 Operation;
1: -	U8 Reserved1;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U16___2 DevHandle;
1: -	U8 IOCParameter;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 PhyNum;
1: -	U8 PrimFlags;
1: -	U32___2 Primitive;
1: -	U64___2 SASAddress;
1: -	U32___2 IOCParameterValue;
1: +  U8 Operation;
1: +  U8 Reserved1;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U16___2 DevHandle;
1: +  U8 IOCParameter;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 PhyNum;
1: +  U8 PrimFlags;
1: +  U32___2 Primitive;
1: +  U64___2 SASAddress;
1: +  U32___2 IOCParameterValue;
1:  };
1:  
1:  typedef struct _MSG_SAS_IOUNIT_CONTROL_REQUEST SasIoUnitControlRequest_t;
1:  
1:  struct _MSG_SAS_IOUNIT_CONTROL_REPLY {
1: -	U8 Operation;
1: -	U8 Reserved1;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U16___2 DevHandle;
1: -	U8 IOCParameter;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U16___2 Reserved4;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: +  U8 Operation;
1: +  U8 Reserved1;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U16___2 DevHandle;
1: +  U8 IOCParameter;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U16___2 Reserved4;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1:  };
1:  
1:  typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY SasIoUnitControlReply_t;
1:  
1:  struct _ATTO_DEVICE_INFO {
1: -	u8 Offset;
1: -	u8 Period;
1: -	u16 ATTOFlags;
1: +  u8 Offset;
1: +  u8 Period;
1: +  u16 ATTOFlags;
1:  };
1:  
1:  typedef struct _ATTO_DEVICE_INFO ATTO_DEVICE_INFO;
1: @@ -104627,178 +105800,178 @@ typedef struct _ATTO_DEVICE_INFO ATTO_DEVICE_INFO;
1:  typedef struct _ATTO_DEVICE_INFO ATTODeviceInfo_t;
1:  
1:  struct _ATTO_CONFIG_PAGE_SCSI_PORT_2 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	u16 PortFlags;
1: -	u16 Unused1;
1: -	u32 Unused2;
1: -	ATTO_DEVICE_INFO DeviceSettings[16];
1: +  CONFIG_PAGE_HEADER Header;
1: +  u16 PortFlags;
1: +  u16 Unused1;
1: +  u32 Unused2;
1: +  ATTO_DEVICE_INFO DeviceSettings[16];
1:  };
1:  
1:  typedef struct _ATTO_CONFIG_PAGE_SCSI_PORT_2 ATTO_SCSIPortPage2_t;
1:  
1:  typedef enum {
1: -	MPTBASE_DRIVER = 0,
1: -	MPTCTL_DRIVER = 1,
1: -	MPTSPI_DRIVER = 2,
1: -	MPTFC_DRIVER = 3,
1: -	MPTSAS_DRIVER = 4,
1: -	MPTLAN_DRIVER = 5,
1: -	MPTSTM_DRIVER = 6,
1: -	MPTUNKNOWN_DRIVER = 7,
1: +  MPTBASE_DRIVER = 0,
1: +  MPTCTL_DRIVER = 1,
1: +  MPTSPI_DRIVER = 2,
1: +  MPTFC_DRIVER = 3,
1: +  MPTSAS_DRIVER = 4,
1: +  MPTLAN_DRIVER = 5,
1: +  MPTSTM_DRIVER = 6,
1: +  MPTUNKNOWN_DRIVER = 7,
1:  } MPT_DRIVER_CLASS;
1:  
1:  struct mpt_pci_driver {
1: -	int (*probe)(struct pci_dev *, const struct pci_device_id *);
1: -	void (*remove)(struct pci_dev *);
1: +  int (*probe)(struct pci_dev *, const struct pci_device_id *);
1: +  void (*remove)(struct pci_dev *);
1:  };
1:  
1:  union _MPT_FRAME_TRACKER {
1: -	struct {
1: -		struct list_head list;
1: -		u32 arg1;
1: -		u32 pad;
1: -		void *argp1;
1: -	} linkage;
1: -	struct {
1: -		u32 __hdr[2];
1: -		union {
1: -			u32 MsgContext;
1: -			struct {
1: -				u16 req_idx;
1: -				u8 cb_idx;
1: -				u8 rsvd;
1: -			} fld;
1: -		} msgctxu;
1: -	} hwhdr;
1: +  struct {
1: +    struct list_head list;
1: +    u32 arg1;
1: +    u32 pad;
1: +    void *argp1;
1: +  } linkage;
1: +  struct {
1: +    u32 __hdr[2];
1: +    union {
1: +      u32 MsgContext;
1: +      struct {
1: +        u16 req_idx;
1: +        u8 cb_idx;
1: +        u8 rsvd;
1: +      } fld;
1: +    } msgctxu;
1: +  } hwhdr;
1:  };
1:  
1:  typedef union _MPT_FRAME_TRACKER MPT_FRAME_TRACKER;
1:  
1:  struct _MPT_FRAME_HDR {
1: -	union {
1: -		MPIHeader_t hdr;
1: -		SCSIIORequest_t scsireq;
1: -		SCSIIOReply_t sreply;
1: -		ConfigReply_t configreply;
1: -		MPIDefaultReply_t reply;
1: -		MPT_FRAME_TRACKER frame;
1: -	} u;
1: +  union {
1: +    MPIHeader_t hdr;
1: +    SCSIIORequest_t scsireq;
1: +    SCSIIOReply_t sreply;
1: +    ConfigReply_t configreply;
1: +    MPIDefaultReply_t reply;
1: +    MPT_FRAME_TRACKER frame;
1: +  } u;
1:  };
1:  
1:  typedef struct _MPT_FRAME_HDR MPT_FRAME_HDR;
1:  
1:  struct _SYSIF_REGS {
1: -	u32 Doorbell;
1: -	u32 WriteSequence;
1: -	u32 Diagnostic;
1: -	u32 TestBase;
1: -	u32 DiagRwData;
1: -	u32 DiagRwAddress;
1: -	u32 Reserved1[6];
1: -	u32 IntStatus;
1: -	u32 IntMask;
1: -	u32 Reserved2[2];
1: -	u32 RequestFifo;
1: -	u32 ReplyFifo;
1: -	u32 RequestHiPriFifo;
1: -	u32 Reserved3;
1: -	u32 HostIndex;
1: -	u32 Reserved4[15];
1: -	u32 Fubar;
1: -	u32 Reserved5[1050];
1: -	u32 Reset_1078;
1: +  u32 Doorbell;
1: +  u32 WriteSequence;
1: +  u32 Diagnostic;
1: +  u32 TestBase;
1: +  u32 DiagRwData;
1: +  u32 DiagRwAddress;
1: +  u32 Reserved1[6];
1: +  u32 IntStatus;
1: +  u32 IntMask;
1: +  u32 Reserved2[2];
1: +  u32 RequestFifo;
1: +  u32 ReplyFifo;
1: +  u32 RequestHiPriFifo;
1: +  u32 Reserved3;
1: +  u32 HostIndex;
1: +  u32 Reserved4[15];
1: +  u32 Fubar;
1: +  u32 Reserved5[1050];
1: +  u32 Reset_1078;
1:  };
1:  
1:  typedef struct _SYSIF_REGS SYSIF_REGS;
1:  
1:  struct _MPT_MGMT {
1: -	struct mutex mutex;
1: -	struct completion done;
1: -	u8 reply[128];
1: -	u8 sense[64];
1: -	u8 status;
1: -	int completion_code;
1: -	u32 msg_context;
1: +  struct mutex mutex;
1: +  struct completion done;
1: +  u8 reply[128];
1: +  u8 sense[64];
1: +  u8 status;
1: +  int completion_code;
1: +  u32 msg_context;
1:  };
1:  
1:  typedef struct _MPT_MGMT MPT_MGMT;
1:  
1:  struct _mpt_ioctl_events {
1: -	u32 event;
1: -	u32 eventContext;
1: -	u32 data[2];
1: +  u32 event;
1: +  u32 eventContext;
1: +  u32 data[2];
1:  };
1:  
1:  struct _SpiCfgData {
1: -	u32 PortFlags;
1: -	int *nvram;
1: -	IOCPage4_t *pIocPg4;
1: -	dma_addr_t IocPg4_dma;
1: -	int IocPg4Sz;
1: -	u8 minSyncFactor;
1: -	u8 maxSyncOffset;
1: -	u8 maxBusWidth;
1: -	u8 busType;
1: -	u8 sdp1version;
1: -	u8 sdp1length;
1: -	u8 sdp0version;
1: -	u8 sdp0length;
1: -	u8 dvScheduled;
1: -	u8 noQas;
1: -	u8 Saf_Te;
1: -	u8 bus_reset;
1: -	u8 rsvd[1];
1: +  u32 PortFlags;
1: +  int *nvram;
1: +  IOCPage4_t *pIocPg4;
1: +  dma_addr_t IocPg4_dma;
1: +  int IocPg4Sz;
1: +  u8 minSyncFactor;
1: +  u8 maxSyncOffset;
1: +  u8 maxBusWidth;
1: +  u8 busType;
1: +  u8 sdp1version;
1: +  u8 sdp1length;
1: +  u8 sdp0version;
1: +  u8 sdp0length;
1: +  u8 dvScheduled;
1: +  u8 noQas;
1: +  u8 Saf_Te;
1: +  u8 bus_reset;
1: +  u8 rsvd[1];
1:  };
1:  
1:  typedef struct _SpiCfgData SpiCfgData;
1:  
1:  struct _SasCfgData {
1: -	u8 ptClear;
1: +  u8 ptClear;
1:  };
1:  
1:  typedef struct _SasCfgData SasCfgData;
1:  
1:  struct inactive_raid_component_info {
1: -	struct list_head list;
1: -	u8 volumeID;
1: -	u8 volumeBus;
1: -	IOC_3_PHYS_DISK d;
1: +  struct list_head list;
1: +  u8 volumeID;
1: +  u8 volumeBus;
1: +  IOC_3_PHYS_DISK d;
1:  };
1:  
1:  struct _RaidCfgData {
1: -	IOCPage2_t *pIocPg2;
1: -	IOCPage3_t *pIocPg3;
1: -	struct mutex inactive_list_mutex;
1: -	struct list_head inactive_list;
1: +  IOCPage2_t *pIocPg2;
1: +  IOCPage3_t *pIocPg3;
1: +  struct mutex inactive_list_mutex;
1: +  struct list_head inactive_list;
1:  };
1:  
1:  typedef struct _RaidCfgData RaidCfgData;
1:  
1:  struct _FcCfgData {
1: -	struct {
1: -		FCPortPage1_t *data;
1: -		dma_addr_t dma;
1: -		int pg_sz;
1: -	} fc_port_page1[2];
1: +  struct {
1: +    FCPortPage1_t *data;
1: +    dma_addr_t dma;
1: +    int pg_sz;
1: +  } fc_port_page1[2];
1:  };
1:  
1:  typedef struct _FcCfgData FcCfgData;
1:  
1:  enum {
1: -	FC = 0,
1: -	SPI = 1,
1: -	SAS___2 = 2,
1: +  FC = 0,
1: +  SPI = 1,
1: +  SAS___2 = 2,
1:  };
1:  
1:  struct _MPT_ADAPTER;
1:  
1:  struct _MPT_SCSI_HOST {
1: -	struct _MPT_ADAPTER *ioc;
1: -	ushort sel_timeout[255];
1: -	char *info_kbuf;
1: -	long int last_queue_full;
1: -	u16 spi_pending;
1: -	struct list_head target_reset_list;
1: +  struct _MPT_ADAPTER *ioc;
1: +  ushort sel_timeout[255];
1: +  char *info_kbuf;
1: +  long int last_queue_full;
1: +  u16 spi_pending;
1: +  struct list_head target_reset_list;
1:  };
1:  
1:  typedef void (*MPT_ADD_SGE)(void *, u32, dma_addr_t);
1: @@ -104814,152 +105987,152 @@ typedef void (*MPT_FLUSH_RUNNING_CMDS)(MPT_SCSI_HOST *);
1:  struct mptsas_portinfo;
1:  
1:  struct _MPT_ADAPTER {
1: -	int id;
1: -	int pci_irq;
1: -	char name[32];
1: -	const char *prod_name;
1: -	char board_name[16];
1: -	char board_assembly[16];
1: -	char board_tracer[16];
1: -	u16 nvdata_version_persistent;
1: -	u16 nvdata_version_default;
1: -	int debug_level;
1: -	u8 io_missing_delay;
1: -	u16 device_missing_delay;
1: -	SYSIF_REGS *chip;
1: -	SYSIF_REGS *pio_chip;
1: -	u8 bus_type;
1: -	u32 mem_phys;
1: -	u32 pio_mem_phys;
1: -	int mem_size;
1: -	int number_of_buses;
1: -	int devices_per_bus;
1: -	int alloc_total;
1: -	u32 last_state;
1: -	int active;
1: -	u8 *alloc;
1: -	dma_addr_t alloc_dma;
1: -	u32 alloc_sz;
1: -	MPT_FRAME_HDR *reply_frames;
1: -	u32 reply_frames_low_dma;
1: -	int reply_depth;
1: -	int reply_sz;
1: -	int num_chain;
1: -	MPT_ADD_SGE add_sge;
1: -	MPT_ADD_CHAIN add_chain;
1: -	int *ReqToChain;
1: -	int *RequestNB;
1: -	int *ChainToChain;
1: -	u8 *ChainBuffer;
1: -	dma_addr_t ChainBufferDMA;
1: -	struct list_head FreeChainQ;
1: -	spinlock_t FreeChainQlock;
1: -	dma_addr_t req_frames_dma;
1: -	MPT_FRAME_HDR *req_frames;
1: -	u32 req_frames_low_dma;
1: -	int req_depth;
1: -	int req_sz;
1: -	spinlock_t FreeQlock;
1: -	struct list_head FreeQ;
1: -	u8 *sense_buf_pool;
1: -	dma_addr_t sense_buf_pool_dma;
1: -	u32 sense_buf_low_dma;
1: -	u8 *HostPageBuffer;
1: -	u32 HostPageBuffer_sz;
1: -	dma_addr_t HostPageBuffer_dma;
1: -	struct pci_dev *pcidev;
1: -	int bars;
1: -	int msi_enable;
1: -	u8 *memmap;
1: -	struct Scsi_Host *sh;
1: -	SpiCfgData spi_data;
1: -	RaidCfgData raid_data;
1: -	SasCfgData sas_data;
1: -	FcCfgData fc_data;
1: -	struct proc_dir_entry *ioc_dentry;
1: -	struct _MPT_ADAPTER *alt_ioc;
1: -	u32 biosVersion;
1: -	int eventTypes;
1: -	int eventContext;
1: -	int eventLogSize;
1: -	struct _mpt_ioctl_events *events;
1: -	u8 *cached_fw;
1: -	dma_addr_t cached_fw_dma;
1: -	int hs_reply_idx;
1: -	u32 pad0;
1: -	u32 NB_for_64_byte_frame;
1: -	u32 hs_req[32];
1: -	u16 hs_reply[64];
1: -	IOCFactsReply_t facts;
1: -	PortFactsReply_t pfacts[2];
1: -	FCPortPage0_t fc_port_page0[2];
1: -	LANPage0_t lan_cnfg_page0;
1: -	LANPage1_t lan_cnfg_page1;
1: -	u8 ir_firmware;
1: -	int errata_flag_1064;
1: -	int aen_event_read_flag;
1: -	u8 FirstWhoInit;
1: -	u8 upload_fw;
1: -	u8 NBShiftFactor;
1: -	u8 pad1[4];
1: -	u8 DoneCtx;
1: -	u8 TaskCtx;
1: -	u8 InternalCtx;
1: -	struct list_head list;
1: -	struct net_device *netdev;
1: -	struct list_head sas_topology;
1: -	struct mutex sas_topology_mutex;
1: -	struct workqueue_struct *fw_event_q;
1: -	struct list_head fw_event_list;
1: -	spinlock_t fw_event_lock;
1: -	u8 fw_events_off;
1: -	char fw_event_q_name[20];
1: -	struct mutex sas_discovery_mutex;
1: -	u8 sas_discovery_runtime;
1: -	u8 sas_discovery_ignore_events;
1: -	struct mptsas_portinfo *hba_port_info;
1: -	u64 hba_port_sas_addr;
1: -	u16 hba_port_num_phy;
1: -	struct list_head sas_device_info_list;
1: -	struct mutex sas_device_info_mutex;
1: -	u8 old_sas_discovery_protocal;
1: -	u8 sas_discovery_quiesce_io;
1: -	int sas_index;
1: -	MPT_MGMT sas_mgmt;
1: -	MPT_MGMT mptbase_cmds;
1: -	MPT_MGMT internal_cmds;
1: -	MPT_MGMT taskmgmt_cmds;
1: -	MPT_MGMT ioctl_cmds;
1: -	spinlock_t taskmgmt_lock;
1: -	int taskmgmt_in_progress;
1: -	u8 taskmgmt_quiesce_io;
1: -	u8 ioc_reset_in_progress;
1: -	u8 reset_status;
1: -	u8 wait_on_reset_completion;
1: -	MPT_SCHEDULE_TARGET_RESET schedule_target_reset;
1: -	MPT_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;
1: -	struct work_struct sas_persist_task;
1: -	struct work_struct fc_setup_reset_work;
1: -	struct list_head fc_rports;
1: -	struct work_struct fc_lsc_work;
1: -	u8 fc_link_speed[2];
1: -	spinlock_t fc_rescan_work_lock;
1: -	struct work_struct fc_rescan_work;
1: -	char fc_rescan_work_q_name[20];
1: -	struct workqueue_struct *fc_rescan_work_q;
1: -	long unsigned int hard_resets;
1: -	long unsigned int soft_resets;
1: -	long unsigned int timeouts;
1: -	struct scsi_cmnd **ScsiLookup;
1: -	spinlock_t scsi_lookup_lock;
1: -	u64 dma_mask;
1: -	u32 broadcast_aen_busy;
1: -	char reset_work_q_name[20];
1: -	struct workqueue_struct *reset_work_q;
1: -	struct delayed_work fault_reset_work;
1: -	u8 sg_addr_size;
1: -	u8 in_rescan;
1: -	u8 SGE_size;
1: +  int id;
1: +  int pci_irq;
1: +  char name[32];
1: +  const char *prod_name;
1: +  char board_name[16];
1: +  char board_assembly[16];
1: +  char board_tracer[16];
1: +  u16 nvdata_version_persistent;
1: +  u16 nvdata_version_default;
1: +  int debug_level;
1: +  u8 io_missing_delay;
1: +  u16 device_missing_delay;
1: +  SYSIF_REGS *chip;
1: +  SYSIF_REGS *pio_chip;
1: +  u8 bus_type;
1: +  u32 mem_phys;
1: +  u32 pio_mem_phys;
1: +  int mem_size;
1: +  int number_of_buses;
1: +  int devices_per_bus;
1: +  int alloc_total;
1: +  u32 last_state;
1: +  int active;
1: +  u8 *alloc;
1: +  dma_addr_t alloc_dma;
1: +  u32 alloc_sz;
1: +  MPT_FRAME_HDR *reply_frames;
1: +  u32 reply_frames_low_dma;
1: +  int reply_depth;
1: +  int reply_sz;
1: +  int num_chain;
1: +  MPT_ADD_SGE add_sge;
1: +  MPT_ADD_CHAIN add_chain;
1: +  int *ReqToChain;
1: +  int *RequestNB;
1: +  int *ChainToChain;
1: +  u8 *ChainBuffer;
1: +  dma_addr_t ChainBufferDMA;
1: +  struct list_head FreeChainQ;
1: +  spinlock_t FreeChainQlock;
1: +  dma_addr_t req_frames_dma;
1: +  MPT_FRAME_HDR *req_frames;
1: +  u32 req_frames_low_dma;
1: +  int req_depth;
1: +  int req_sz;
1: +  spinlock_t FreeQlock;
1: +  struct list_head FreeQ;
1: +  u8 *sense_buf_pool;
1: +  dma_addr_t sense_buf_pool_dma;
1: +  u32 sense_buf_low_dma;
1: +  u8 *HostPageBuffer;
1: +  u32 HostPageBuffer_sz;
1: +  dma_addr_t HostPageBuffer_dma;
1: +  struct pci_dev *pcidev;
1: +  int bars;
1: +  int msi_enable;
1: +  u8 *memmap;
1: +  struct Scsi_Host *sh;
1: +  SpiCfgData spi_data;
1: +  RaidCfgData raid_data;
1: +  SasCfgData sas_data;
1: +  FcCfgData fc_data;
1: +  struct proc_dir_entry *ioc_dentry;
1: +  struct _MPT_ADAPTER *alt_ioc;
1: +  u32 biosVersion;
1: +  int eventTypes;
1: +  int eventContext;
1: +  int eventLogSize;
1: +  struct _mpt_ioctl_events *events;
1: +  u8 *cached_fw;
1: +  dma_addr_t cached_fw_dma;
1: +  int hs_reply_idx;
1: +  u32 pad0;
1: +  u32 NB_for_64_byte_frame;
1: +  u32 hs_req[32];
1: +  u16 hs_reply[64];
1: +  IOCFactsReply_t facts;
1: +  PortFactsReply_t pfacts[2];
1: +  FCPortPage0_t fc_port_page0[2];
1: +  LANPage0_t lan_cnfg_page0;
1: +  LANPage1_t lan_cnfg_page1;
1: +  u8 ir_firmware;
1: +  int errata_flag_1064;
1: +  int aen_event_read_flag;
1: +  u8 FirstWhoInit;
1: +  u8 upload_fw;
1: +  u8 NBShiftFactor;
1: +  u8 pad1[4];
1: +  u8 DoneCtx;
1: +  u8 TaskCtx;
1: +  u8 InternalCtx;
1: +  struct list_head list;
1: +  struct net_device *netdev;
1: +  struct list_head sas_topology;
1: +  struct mutex sas_topology_mutex;
1: +  struct workqueue_struct *fw_event_q;
1: +  struct list_head fw_event_list;
1: +  spinlock_t fw_event_lock;
1: +  u8 fw_events_off;
1: +  char fw_event_q_name[20];
1: +  struct mutex sas_discovery_mutex;
1: +  u8 sas_discovery_runtime;
1: +  u8 sas_discovery_ignore_events;
1: +  struct mptsas_portinfo *hba_port_info;
1: +  u64 hba_port_sas_addr;
1: +  u16 hba_port_num_phy;
1: +  struct list_head sas_device_info_list;
1: +  struct mutex sas_device_info_mutex;
1: +  u8 old_sas_discovery_protocal;
1: +  u8 sas_discovery_quiesce_io;
1: +  int sas_index;
1: +  MPT_MGMT sas_mgmt;
1: +  MPT_MGMT mptbase_cmds;
1: +  MPT_MGMT internal_cmds;
1: +  MPT_MGMT taskmgmt_cmds;
1: +  MPT_MGMT ioctl_cmds;
1: +  spinlock_t taskmgmt_lock;
1: +  int taskmgmt_in_progress;
1: +  u8 taskmgmt_quiesce_io;
1: +  u8 ioc_reset_in_progress;
1: +  u8 reset_status;
1: +  u8 wait_on_reset_completion;
1: +  MPT_SCHEDULE_TARGET_RESET schedule_target_reset;
1: +  MPT_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;
1: +  struct work_struct sas_persist_task;
1: +  struct work_struct fc_setup_reset_work;
1: +  struct list_head fc_rports;
1: +  struct work_struct fc_lsc_work;
1: +  u8 fc_link_speed[2];
1: +  spinlock_t fc_rescan_work_lock;
1: +  struct work_struct fc_rescan_work;
1: +  char fc_rescan_work_q_name[20];
1: +  struct workqueue_struct *fc_rescan_work_q;
1: +  long unsigned int hard_resets;
1: +  long unsigned int soft_resets;
1: +  long unsigned int timeouts;
1: +  struct scsi_cmnd **ScsiLookup;
1: +  spinlock_t scsi_lookup_lock;
1: +  u64 dma_mask;
1: +  u32 broadcast_aen_busy;
1: +  char reset_work_q_name[20];
1: +  struct workqueue_struct *reset_work_q;
1: +  struct delayed_work fault_reset_work;
1: +  u8 sg_addr_size;
1: +  u8 in_rescan;
1: +  u8 SGE_size;
1:  };
1:  
1:  typedef struct _MPT_ADAPTER MPT_ADAPTER;
1: @@ -104971,281 +106144,283 @@ typedef int (*MPT_EVHANDLER)(MPT_ADAPTER *, EventNotificationReply_t *);
1:  typedef int (*MPT_RESETHANDLER)(MPT_ADAPTER *, int);
1:  
1:  struct _x_config_parms {
1: -	union {
1: -		ConfigExtendedPageHeader_t *ehdr;
1: -		ConfigPageHeader_t *hdr;
1: -	} cfghdr;
1: -	dma_addr_t physAddr;
1: -	u32 pageAddr;
1: -	u16 status;
1: -	u8 action;
1: -	u8 dir;
1: -	u8 timeout;
1: +  union {
1: +    ConfigExtendedPageHeader_t *ehdr;
1: +    ConfigPageHeader_t *hdr;
1: +  } cfghdr;
1: +  dma_addr_t physAddr;
1: +  u32 pageAddr;
1: +  u16 status;
1: +  u8 action;
1: +  u8 dir;
1: +  u8 timeout;
1:  };
1:  
1:  typedef struct _x_config_parms CONFIGPARMS;
1:  
1:  enum _MpiIocLogInfoFc {
1: -	MPI_IOCLOGINFO_FC_INIT_BASE = 536870912,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 536870913,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 536870914,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME = 536870915,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN = 536870916,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER = 536870917,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD = 536870918,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OVERRUN = 536870919,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_BAD_STATUS = 536870920,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_RX_UNEXPECTED_FRAME = 536870921,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_LINK_FAILURE = 536870922,
1: -	MPI_IOCLOGINFO_FC_INIT_ERROR_TX_TIMEOUT = 536870923,
1: -	MPI_IOCLOGINFO_FC_TARGET_BASE = 553648128,
1: -	MPI_IOCLOGINFO_FC_TARGET_NO_PDISC = 553648129,
1: -	MPI_IOCLOGINFO_FC_TARGET_NO_LOGIN = 553648130,
1: -	MPI_IOCLOGINFO_FC_TARGET_DOAR_KILLED_BY_LIP = 553648131,
1: -	MPI_IOCLOGINFO_FC_TARGET_DIAR_KILLED_BY_LIP = 553648132,
1: -	MPI_IOCLOGINFO_FC_TARGET_DIAR_MISSING_DATA = 553648133,
1: -	MPI_IOCLOGINFO_FC_TARGET_DONR_KILLED_BY_LIP = 553648134,
1: -	MPI_IOCLOGINFO_FC_TARGET_WRSP_KILLED_BY_LIP = 553648135,
1: -	MPI_IOCLOGINFO_FC_TARGET_DINR_KILLED_BY_LIP = 553648136,
1: -	MPI_IOCLOGINFO_FC_TARGET_DINR_MISSING_DATA = 553648137,
1: -	MPI_IOCLOGINFO_FC_TARGET_MRSP_KILLED_BY_LIP = 553648138,
1: -	MPI_IOCLOGINFO_FC_TARGET_NO_CLASS_3 = 553648139,
1: -	MPI_IOCLOGINFO_FC_TARGET_LOGIN_NOT_VALID = 553648140,
1: -	MPI_IOCLOGINFO_FC_TARGET_FROM_OUTBOUND = 553648142,
1: -	MPI_IOCLOGINFO_FC_TARGET_WAITING_FOR_DATA_IN = 553648143,
1: -	MPI_IOCLOGINFO_FC_LAN_BASE = 570425344,
1: -	MPI_IOCLOGINFO_FC_LAN_TRANS_SGL_MISSING = 570425345,
1: -	MPI_IOCLOGINFO_FC_LAN_TRANS_WRONG_PLACE = 570425346,
1: -	MPI_IOCLOGINFO_FC_LAN_TRANS_RES_BITS_SET = 570425347,
1: -	MPI_IOCLOGINFO_FC_LAN_WRONG_SGL_FLAG = 570425348,
1: -	MPI_IOCLOGINFO_FC_MSG_BASE = 587202560,
1: -	MPI_IOCLOGINFO_FC_LINK_BASE = 603979776,
1: -	MPI_IOCLOGINFO_FC_LINK_LOOP_INIT_TIMEOUT = 603979777,
1: -	MPI_IOCLOGINFO_FC_LINK_ALREADY_INITIALIZED = 603979778,
1: -	MPI_IOCLOGINFO_FC_LINK_LINK_NOT_ESTABLISHED = 603979779,
1: -	MPI_IOCLOGINFO_FC_LINK_CRC_ERROR = 603979780,
1: -	MPI_IOCLOGINFO_FC_CTX_BASE = 620756992,
1: -	MPI_IOCLOGINFO_FC_INVALID_FIELD_BYTE_OFFSET = 637534208,
1: -	MPI_IOCLOGINFO_FC_INVALID_FIELD_MAX_OFFSET = 654311423,
1: -	MPI_IOCLOGINFO_FC_STATE_CHANGE = 654311424,
1: +  MPI_IOCLOGINFO_FC_INIT_BASE = 536870912,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 536870913,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 536870914,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME = 536870915,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN = 536870916,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER = 536870917,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD = 536870918,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OVERRUN = 536870919,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_RX_BAD_STATUS = 536870920,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_RX_UNEXPECTED_FRAME = 536870921,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_LINK_FAILURE = 536870922,
1: +  MPI_IOCLOGINFO_FC_INIT_ERROR_TX_TIMEOUT = 536870923,
1: +  MPI_IOCLOGINFO_FC_TARGET_BASE = 553648128,
1: +  MPI_IOCLOGINFO_FC_TARGET_NO_PDISC = 553648129,
1: +  MPI_IOCLOGINFO_FC_TARGET_NO_LOGIN = 553648130,
1: +  MPI_IOCLOGINFO_FC_TARGET_DOAR_KILLED_BY_LIP = 553648131,
1: +  MPI_IOCLOGINFO_FC_TARGET_DIAR_KILLED_BY_LIP = 553648132,
1: +  MPI_IOCLOGINFO_FC_TARGET_DIAR_MISSING_DATA = 553648133,
1: +  MPI_IOCLOGINFO_FC_TARGET_DONR_KILLED_BY_LIP = 553648134,
1: +  MPI_IOCLOGINFO_FC_TARGET_WRSP_KILLED_BY_LIP = 553648135,
1: +  MPI_IOCLOGINFO_FC_TARGET_DINR_KILLED_BY_LIP = 553648136,
1: +  MPI_IOCLOGINFO_FC_TARGET_DINR_MISSING_DATA = 553648137,
1: +  MPI_IOCLOGINFO_FC_TARGET_MRSP_KILLED_BY_LIP = 553648138,
1: +  MPI_IOCLOGINFO_FC_TARGET_NO_CLASS_3 = 553648139,
1: +  MPI_IOCLOGINFO_FC_TARGET_LOGIN_NOT_VALID = 553648140,
1: +  MPI_IOCLOGINFO_FC_TARGET_FROM_OUTBOUND = 553648142,
1: +  MPI_IOCLOGINFO_FC_TARGET_WAITING_FOR_DATA_IN = 553648143,
1: +  MPI_IOCLOGINFO_FC_LAN_BASE = 570425344,
1: +  MPI_IOCLOGINFO_FC_LAN_TRANS_SGL_MISSING = 570425345,
1: +  MPI_IOCLOGINFO_FC_LAN_TRANS_WRONG_PLACE = 570425346,
1: +  MPI_IOCLOGINFO_FC_LAN_TRANS_RES_BITS_SET = 570425347,
1: +  MPI_IOCLOGINFO_FC_LAN_WRONG_SGL_FLAG = 570425348,
1: +  MPI_IOCLOGINFO_FC_MSG_BASE = 587202560,
1: +  MPI_IOCLOGINFO_FC_LINK_BASE = 603979776,
1: +  MPI_IOCLOGINFO_FC_LINK_LOOP_INIT_TIMEOUT = 603979777,
1: +  MPI_IOCLOGINFO_FC_LINK_ALREADY_INITIALIZED = 603979778,
1: +  MPI_IOCLOGINFO_FC_LINK_LINK_NOT_ESTABLISHED = 603979779,
1: +  MPI_IOCLOGINFO_FC_LINK_CRC_ERROR = 603979780,
1: +  MPI_IOCLOGINFO_FC_CTX_BASE = 620756992,
1: +  MPI_IOCLOGINFO_FC_INVALID_FIELD_BYTE_OFFSET = 637534208,
1: +  MPI_IOCLOGINFO_FC_INVALID_FIELD_MAX_OFFSET = 654311423,
1: +  MPI_IOCLOGINFO_FC_STATE_CHANGE = 654311424,
1:  };
1:  
1:  union loginfo_type {
1: -	u32 loginfo;
1: -	struct {
1: -		u32 subcode: 16;
1: -		u32 code: 8;
1: -		u32 originator: 4;
1: -		u32 bus_type: 4;
1: -	} dw;
1: +  u32 loginfo;
1: +  struct {
1: +    u32 subcode : 16;
1: +    u32 code : 8;
1: +    u32 originator : 4;
1: +    u32 bus_type : 4;
1: +  } dw;
1:  };
1:  
1:  struct _MSG_SCSI_TASK_MGMT {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Reserved;
1: -	U8 TaskType;
1: -	U8 Reserved1;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 LUN[8];
1: -	U32___2 Reserved2[7];
1: -	U32___2 TaskMsgContext;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Reserved;
1: +  U8 TaskType;
1: +  U8 Reserved1;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 LUN[8];
1: +  U32___2 Reserved2[7];
1: +  U32___2 TaskMsgContext;
1:  };
1:  
1:  typedef struct _MSG_SCSI_TASK_MGMT SCSITaskMgmt_t;
1:  
1:  struct _MSG_SCSI_TASK_MGMT_REPLY {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U8 ResponseCode;
1: -	U8 TaskType;
1: -	U8 Reserved1;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 Reserved2[2];
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U32___2 TerminationCount;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U8 ResponseCode;
1: +  U8 TaskType;
1: +  U8 Reserved1;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 Reserved2[2];
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U32___2 TerminationCount;
1:  };
1:  
1:  typedef struct _MSG_SCSI_TASK_MGMT_REPLY SCSITaskMgmtReply_t;
1:  
1:  struct _MSG_SEP_REQUEST {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 Action;
1: -	U8 Flags;
1: -	U8 Reserved1;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U32___2 SlotStatus;
1: -	U32___2 Reserved2;
1: -	U32___2 Reserved3;
1: -	U32___2 Reserved4;
1: -	U16___2 Slot;
1: -	U16___2 EnclosureHandle;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 Action;
1: +  U8 Flags;
1: +  U8 Reserved1;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U32___2 SlotStatus;
1: +  U32___2 Reserved2;
1: +  U32___2 Reserved3;
1: +  U32___2 Reserved4;
1: +  U16___2 Slot;
1: +  U16___2 EnclosureHandle;
1:  };
1:  
1:  typedef struct _MSG_SEP_REQUEST SEPRequest_t;
1:  
1:  struct _MSG_RAID_ACTION_REPLY {
1: -	U8 Action;
1: -	U8 Reserved;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U8 VolumeID;
1: -	U8 VolumeBus;
1: -	U8 PhysDiskNum;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U16___2 ActionStatus;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U32___2 VolumeStatus;
1: -	U32___2 ActionData;
1: +  U8 Action;
1: +  U8 Reserved;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U8 VolumeID;
1: +  U8 VolumeBus;
1: +  U8 PhysDiskNum;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U16___2 ActionStatus;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U32___2 VolumeStatus;
1: +  U32___2 ActionData;
1:  };
1:  
1:  typedef struct _MSG_RAID_ACTION_REPLY MpiRaidActionReply_t;
1:  
1:  struct _VirtTarget {
1: -	struct scsi_target *starget;
1: -	u8 tflags;
1: -	u8 ioc_id;
1: -	u8 id;
1: -	u8 channel;
1: -	u8 minSyncFactor;
1: -	u8 maxOffset;
1: -	u8 maxWidth;
1: -	u8 negoFlags;
1: -	u8 raidVolume;
1: -	u8 type;
1: -	u8 deleted;
1: -	u8 inDMD;
1: -	u32 num_luns;
1: +  struct scsi_target *starget;
1: +  u8 tflags;
1: +  u8 ioc_id;
1: +  u8 id;
1: +  u8 channel;
1: +  u8 minSyncFactor;
1: +  u8 maxOffset;
1: +  u8 maxWidth;
1: +  u8 negoFlags;
1: +  u8 raidVolume;
1: +  u8 type;
1: +  u8 deleted;
1: +  u8 inDMD;
1: +  u32 num_luns;
1:  };
1:  
1:  typedef struct _VirtTarget VirtTarget;
1:  
1:  struct _VirtDevice {
1: -	VirtTarget *vtarget;
1: -	u8 configured_lun;
1: -	u64 lun;
1: +  VirtTarget *vtarget;
1: +  u8 configured_lun;
1: +  u64 lun;
1:  };
1:  
1:  typedef struct _VirtDevice VirtDevice;
1:  
1:  struct _internal_cmd {
1: -	char *data;
1: -	dma_addr_t data_dma;
1: -	int size;
1: -	u8 cmd;
1: -	u8 channel;
1: -	u8 id;
1: -	u64 lun;
1: -	u8 flags;
1: -	u8 physDiskNum;
1: -	u8 rsvd2;
1: -	u8 rsvd;
1: +  char *data;
1: +  dma_addr_t data_dma;
1: +  int size;
1: +  u8 cmd;
1: +  u8 channel;
1: +  u8 id;
1: +  u64 lun;
1: +  u8 flags;
1: +  u8 physDiskNum;
1: +  u8 rsvd2;
1: +  u8 rsvd;
1:  };
1:  
1:  typedef struct _internal_cmd INTERNAL_CMD;
1:  
1:  struct _CONFIG_PAGE_SCSI_DEVICE_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 NegotiatedParameters;
1: -	U32___2 Information;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 NegotiatedParameters;
1: +  U32___2 Information;
1:  };
1:  
1:  struct _CONFIG_PAGE_SCSI_DEVICE_1 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U32___2 RequestedParameters;
1: -	U32___2 Reserved;
1: -	U32___2 Configuration;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U32___2 RequestedParameters;
1: +  U32___2 Reserved;
1: +  U32___2 Configuration;
1:  };
1:  
1:  struct _MSG_RAID_ACTION {
1: -	U8 Action;
1: -	U8 Reserved1;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U8 VolumeID;
1: -	U8 VolumeBus;
1: -	U8 PhysDiskNum;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U32___2 Reserved2;
1: -	U32___2 ActionDataWord;
1: -	SGE_SIMPLE_UNION ActionDataSGE;
1: +  U8 Action;
1: +  U8 Reserved1;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U8 VolumeID;
1: +  U8 VolumeBus;
1: +  U8 PhysDiskNum;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U32___2 Reserved2;
1: +  U32___2 ActionDataWord;
1: +  SGE_SIMPLE_UNION ActionDataSGE;
1:  };
1:  
1:  typedef struct _MSG_RAID_ACTION MpiRaidActionRequest_t;
1:  
1:  struct work_queue_wrapper___2 {
1: -	struct work_struct work;
1: -	struct _MPT_SCSI_HOST *hd;
1: -	int disk;
1: +  struct work_struct work;
1: +  struct _MPT_SCSI_HOST *hd;
1: +  int disk;
1:  };
1:  
1:  struct _CONFIG_PAGE_FC_DEVICE_0 {
1: -	CONFIG_PAGE_HEADER Header;
1: -	U64___2 WWNN;
1: -	U64___2 WWPN;
1: -	U32___2 PortIdentifier;
1: -	U8 Protocol;
1: -	U8 Flags;
1: -	U16___2 BBCredit;
1: -	U16___2 MaxRxFrameSize;
1: -	U8 ADISCHardALPA;
1: -	U8 PortNumber;
1: -	U8 FcPhLowestVersion;
1: -	U8 FcPhHighestVersion;
1: -	U8 CurrentTargetID;
1: -	U8 CurrentBus;
1: +  CONFIG_PAGE_HEADER Header;
1: +  U64___2 WWNN;
1: +  U64___2 WWPN;
1: +  U32___2 PortIdentifier;
1: +  U8 Protocol;
1: +  U8 Flags;
1: +  U16___2 BBCredit;
1: +  U16___2 MaxRxFrameSize;
1: +  U8 ADISCHardALPA;
1: +  U8 PortNumber;
1: +  U8 FcPhLowestVersion;
1: +  U8 FcPhHighestVersion;
1: +  U8 CurrentTargetID;
1: +  U8 CurrentBus;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_FC_DEVICE_0 FCDevicePage0_t;
1:  
1:  struct mptfc_rport_info {
1: -	struct list_head list;
1: -	struct fc_rport *rport;
1: -	struct scsi_target *starget;
1: -	FCDevicePage0_t pg0;
1: -	u8 flags;
1: +  struct list_head list;
1: +  struct fc_rport *rport;
1: +  struct scsi_target *starget;
1: +  FCDevicePage0_t pg0;
1: +  u8 flags;
1:  };
1:  
1:  struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 ReasonCode;
1: -	U8 Reserved;
1: -	U8 ASC;
1: -	U8 ASCQ;
1: -	U16___2 DevHandle;
1: -	U32___2 DeviceInfo;
1: -	U16___2 ParentDevHandle;
1: -	U8 PhyNum;
1: -	U8 Reserved1;
1: -	U64___2 SASAddress;
1: -	U8 LUN[8];
1: -	U16___2 TaskTag;
1: -	U16___2 Reserved2;
1: -};
1: -
1: -typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE EVENT_DATA_SAS_DEVICE_STATUS_CHANGE;
1: -
1: -typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE MpiEventDataSasDeviceStatusChange_t;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 ReasonCode;
1: +  U8 Reserved;
1: +  U8 ASC;
1: +  U8 ASCQ;
1: +  U16___2 DevHandle;
1: +  U32___2 DeviceInfo;
1: +  U16___2 ParentDevHandle;
1: +  U8 PhyNum;
1: +  U8 Reserved1;
1: +  U64___2 SASAddress;
1: +  U8 LUN[8];
1: +  U16___2 TaskTag;
1: +  U16___2 Reserved2;
1: +};
1: +
1: +typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
1: +    EVENT_DATA_SAS_DEVICE_STATUS_CHANGE;
1: +
1: +typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
1: +    MpiEventDataSasDeviceStatusChange_t;
1:  
1:  struct _EVENT_DATA_QUEUE_FULL {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U16___2 CurrentDepth;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U16___2 CurrentDepth;
1:  };
1:  
1:  typedef struct _EVENT_DATA_QUEUE_FULL EventDataQueueFull_t;
1: @@ -105253,254 +106428,256 @@ typedef struct _EVENT_DATA_QUEUE_FULL EventDataQueueFull_t;
1:  typedef struct _EVENT_DATA_RAID EVENT_DATA_RAID;
1:  
1:  struct _IR2_STATE_CHANGED {
1: -	U16___2 PreviousState;
1: -	U16___2 NewState;
1: +  U16___2 PreviousState;
1: +  U16___2 NewState;
1:  };
1:  
1:  typedef struct _IR2_STATE_CHANGED IR2_STATE_CHANGED;
1:  
1:  struct _IR2_PD_INFO {
1: -	U16___2 DeviceHandle;
1: -	U8 TruncEnclosureHandle;
1: -	U8 TruncatedSlot;
1: +  U16___2 DeviceHandle;
1: +  U8 TruncEnclosureHandle;
1: +  U8 TruncatedSlot;
1:  };
1:  
1:  typedef struct _IR2_PD_INFO IR2_PD_INFO;
1:  
1:  union _MPI_IR2_RC_EVENT_DATA {
1: -	IR2_STATE_CHANGED StateChanged;
1: -	U32___2 Lba;
1: -	IR2_PD_INFO PdInfo;
1: +  IR2_STATE_CHANGED StateChanged;
1: +  U32___2 Lba;
1: +  IR2_PD_INFO PdInfo;
1:  };
1:  
1:  typedef union _MPI_IR2_RC_EVENT_DATA MPI_IR2_RC_EVENT_DATA;
1:  
1:  struct _MPI_EVENT_DATA_IR2 {
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U8 ReasonCode;
1: -	U8 PhysDiskNum;
1: -	MPI_IR2_RC_EVENT_DATA IR2EventData;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U8 ReasonCode;
1: +  U8 PhysDiskNum;
1: +  MPI_IR2_RC_EVENT_DATA IR2EventData;
1:  };
1:  
1:  typedef struct _MPI_EVENT_DATA_IR2 MPI_EVENT_DATA_IR2;
1:  
1:  struct _EVENT_DATA_SAS_BROADCAST_PRIMITIVE {
1: -	U8 PhyNum;
1: -	U8 Port;
1: -	U8 PortWidth;
1: -	U8 Primitive;
1: +  U8 PhyNum;
1: +  U8 Port;
1: +  U8 PortWidth;
1: +  U8 Primitive;
1:  };
1:  
1: -typedef struct _EVENT_DATA_SAS_BROADCAST_PRIMITIVE EVENT_DATA_SAS_BROADCAST_PRIMITIVE;
1: +typedef struct _EVENT_DATA_SAS_BROADCAST_PRIMITIVE
1: +    EVENT_DATA_SAS_BROADCAST_PRIMITIVE;
1:  
1:  struct _EVENT_DATA_SAS_PHY_LINK_STATUS {
1: -	U8 PhyNum;
1: -	U8 LinkRates;
1: -	U16___2 DevHandle;
1: -	U64___2 SASAddress;
1: +  U8 PhyNum;
1: +  U8 LinkRates;
1: +  U16___2 DevHandle;
1: +  U64___2 SASAddress;
1:  };
1:  
1:  typedef struct _EVENT_DATA_SAS_PHY_LINK_STATUS MpiEventDataSasPhyLinkStatus_t;
1:  
1:  struct _EVENT_DATA_SAS_DISCOVERY {
1: -	U32___2 DiscoveryStatus;
1: -	U32___2 Reserved1;
1: +  U32___2 DiscoveryStatus;
1: +  U32___2 Reserved1;
1:  };
1:  
1:  typedef struct _EVENT_DATA_SAS_DISCOVERY EventDataSasDiscovery_t;
1:  
1:  struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE {
1: -	U8 ReasonCode;
1: -	U8 Reserved1;
1: -	U16___2 Reserved2;
1: -	U8 PhysicalPort;
1: -	U8 Reserved3;
1: -	U16___2 EnclosureHandle;
1: -	U64___2 SASAddress;
1: -	U32___2 DiscoveryStatus;
1: -	U16___2 DevHandle;
1: -	U16___2 ParentDevHandle;
1: -	U16___2 ExpanderChangeCount;
1: -	U16___2 ExpanderRouteIndexes;
1: -	U8 NumPhys;
1: -	U8 SASLevel;
1: -	U8 Flags;
1: -	U8 Reserved4;
1: -};
1: -
1: -typedef struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE MpiEventDataSasExpanderStatusChange_t;
1: +  U8 ReasonCode;
1: +  U8 Reserved1;
1: +  U16___2 Reserved2;
1: +  U8 PhysicalPort;
1: +  U8 Reserved3;
1: +  U16___2 EnclosureHandle;
1: +  U64___2 SASAddress;
1: +  U32___2 DiscoveryStatus;
1: +  U16___2 DevHandle;
1: +  U16___2 ParentDevHandle;
1: +  U16___2 ExpanderChangeCount;
1: +  U16___2 ExpanderRouteIndexes;
1: +  U8 NumPhys;
1: +  U8 SASLevel;
1: +  U8 Flags;
1: +  U8 Reserved4;
1: +};
1: +
1: +typedef struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE
1: +    MpiEventDataSasExpanderStatusChange_t;
1:  
1:  struct _MPI_SAS_IO_UNIT1_PHY_DATA {
1: -	U8 Port;
1: -	U8 PortFlags;
1: -	U8 PhyFlags;
1: -	U8 MaxMinLinkRate;
1: -	U32___2 ControllerPhyDeviceInfo;
1: -	U16___2 MaxTargetPortConnectTime;
1: -	U16___2 Reserved1;
1: +  U8 Port;
1: +  U8 PortFlags;
1: +  U8 PhyFlags;
1: +  U8 MaxMinLinkRate;
1: +  U32___2 ControllerPhyDeviceInfo;
1: +  U16___2 MaxTargetPortConnectTime;
1: +  U16___2 Reserved1;
1:  };
1:  
1:  typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA MPI_SAS_IO_UNIT1_PHY_DATA;
1:  
1:  struct _CONFIG_PAGE_SAS_IO_UNIT_1 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U16___2 ControlFlags;
1: -	U16___2 MaxNumSATATargets;
1: -	U16___2 AdditionalControlFlags;
1: -	U16___2 Reserved1;
1: -	U8 NumPhys;
1: -	U8 SATAMaxQDepth;
1: -	U8 ReportDeviceMissingDelay;
1: -	U8 IODeviceMissingDelay;
1: -	MPI_SAS_IO_UNIT1_PHY_DATA PhyData[1];
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U16___2 ControlFlags;
1: +  U16___2 MaxNumSATATargets;
1: +  U16___2 AdditionalControlFlags;
1: +  U16___2 Reserved1;
1: +  U8 NumPhys;
1: +  U8 SATAMaxQDepth;
1: +  U8 ReportDeviceMissingDelay;
1: +  U8 IODeviceMissingDelay;
1: +  MPI_SAS_IO_UNIT1_PHY_DATA PhyData[1];
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1 SasIOUnitPage1_t;
1:  
1:  struct _CONFIG_PAGE_SAS_EXPANDER_0 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U8 PhysicalPort;
1: -	U8 Reserved1;
1: -	U16___2 EnclosureHandle;
1: -	U64___2 SASAddress;
1: -	U32___2 DiscoveryStatus;
1: -	U16___2 DevHandle;
1: -	U16___2 ParentDevHandle;
1: -	U16___2 ExpanderChangeCount;
1: -	U16___2 ExpanderRouteIndexes;
1: -	U8 NumPhys;
1: -	U8 SASLevel;
1: -	U8 Flags;
1: -	U8 Reserved3;
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U8 PhysicalPort;
1: +  U8 Reserved1;
1: +  U16___2 EnclosureHandle;
1: +  U64___2 SASAddress;
1: +  U32___2 DiscoveryStatus;
1: +  U16___2 DevHandle;
1: +  U16___2 ParentDevHandle;
1: +  U16___2 ExpanderChangeCount;
1: +  U16___2 ExpanderRouteIndexes;
1: +  U8 NumPhys;
1: +  U8 SASLevel;
1: +  U8 Flags;
1: +  U8 Reserved3;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_EXPANDER_0 SasExpanderPage0_t;
1:  
1:  struct _CONFIG_PAGE_SAS_EXPANDER_1 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U8 PhysicalPort;
1: -	U8 Reserved1;
1: -	U16___2 Reserved2;
1: -	U8 NumPhys;
1: -	U8 Phy;
1: -	U16___2 NumTableEntriesProgrammed;
1: -	U8 ProgrammedLinkRate;
1: -	U8 HwLinkRate;
1: -	U16___2 AttachedDevHandle;
1: -	U32___2 PhyInfo;
1: -	U32___2 AttachedDeviceInfo;
1: -	U16___2 OwnerDevHandle;
1: -	U8 ChangeCount;
1: -	U8 NegotiatedLinkRate;
1: -	U8 PhyIdentifier;
1: -	U8 AttachedPhyIdentifier;
1: -	U8 Reserved3;
1: -	U8 DiscoveryInfo;
1: -	U32___2 Reserved4;
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U8 PhysicalPort;
1: +  U8 Reserved1;
1: +  U16___2 Reserved2;
1: +  U8 NumPhys;
1: +  U8 Phy;
1: +  U16___2 NumTableEntriesProgrammed;
1: +  U8 ProgrammedLinkRate;
1: +  U8 HwLinkRate;
1: +  U16___2 AttachedDevHandle;
1: +  U32___2 PhyInfo;
1: +  U32___2 AttachedDeviceInfo;
1: +  U16___2 OwnerDevHandle;
1: +  U8 ChangeCount;
1: +  U8 NegotiatedLinkRate;
1: +  U8 PhyIdentifier;
1: +  U8 AttachedPhyIdentifier;
1: +  U8 Reserved3;
1: +  U8 DiscoveryInfo;
1: +  U32___2 Reserved4;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_EXPANDER_1 SasExpanderPage1_t;
1:  
1:  struct _CONFIG_PAGE_SAS_DEVICE_0 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U16___2 Slot;
1: -	U16___2 EnclosureHandle;
1: -	U64___2 SASAddress;
1: -	U16___2 ParentDevHandle;
1: -	U8 PhyNum;
1: -	U8 AccessStatus;
1: -	U16___2 DevHandle;
1: -	U8 TargetID;
1: -	U8 Bus;
1: -	U32___2 DeviceInfo;
1: -	U16___2 Flags;
1: -	U8 PhysicalPort;
1: -	U8 Reserved2;
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U16___2 Slot;
1: +  U16___2 EnclosureHandle;
1: +  U64___2 SASAddress;
1: +  U16___2 ParentDevHandle;
1: +  U8 PhyNum;
1: +  U8 AccessStatus;
1: +  U16___2 DevHandle;
1: +  U8 TargetID;
1: +  U8 Bus;
1: +  U32___2 DeviceInfo;
1: +  U16___2 Flags;
1: +  U8 PhysicalPort;
1: +  U8 Reserved2;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_DEVICE_0 SasDevicePage0_t;
1:  
1:  struct _CONFIG_PAGE_SAS_PHY_0 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U16___2 OwnerDevHandle;
1: -	U16___2 Reserved1;
1: -	U64___2 SASAddress;
1: -	U16___2 AttachedDevHandle;
1: -	U8 AttachedPhyIdentifier;
1: -	U8 Reserved2;
1: -	U32___2 AttachedDeviceInfo;
1: -	U8 ProgrammedLinkRate;
1: -	U8 HwLinkRate;
1: -	U8 ChangeCount;
1: -	U8 Flags;
1: -	U32___2 PhyInfo;
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U16___2 OwnerDevHandle;
1: +  U16___2 Reserved1;
1: +  U64___2 SASAddress;
1: +  U16___2 AttachedDevHandle;
1: +  U8 AttachedPhyIdentifier;
1: +  U8 Reserved2;
1: +  U32___2 AttachedDeviceInfo;
1: +  U8 ProgrammedLinkRate;
1: +  U8 HwLinkRate;
1: +  U8 ChangeCount;
1: +  U8 Flags;
1: +  U32___2 PhyInfo;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_PHY_0 SasPhyPage0_t;
1:  
1:  struct _CONFIG_PAGE_SAS_PHY_1 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U32___2 Reserved1;
1: -	U32___2 InvalidDwordCount;
1: -	U32___2 RunningDisparityErrorCount;
1: -	U32___2 LossDwordSynchCount;
1: -	U32___2 PhyResetProblemCount;
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U32___2 Reserved1;
1: +  U32___2 InvalidDwordCount;
1: +  U32___2 RunningDisparityErrorCount;
1: +  U32___2 LossDwordSynchCount;
1: +  U32___2 PhyResetProblemCount;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_PHY_1 SasPhyPage1_t;
1:  
1:  struct _CONFIG_PAGE_SAS_ENCLOSURE_0 {
1: -	CONFIG_EXTENDED_PAGE_HEADER Header;
1: -	U32___2 Reserved1;
1: -	U64___2 EnclosureLogicalID;
1: -	U16___2 Flags;
1: -	U16___2 EnclosureHandle;
1: -	U16___2 NumSlots;
1: -	U16___2 StartSlot;
1: -	U8 StartTargetID;
1: -	U8 StartBus;
1: -	U8 SEPTargetID;
1: -	U8 SEPBus;
1: -	U32___2 Reserved2;
1: -	U32___2 Reserved3;
1: +  CONFIG_EXTENDED_PAGE_HEADER Header;
1: +  U32___2 Reserved1;
1: +  U64___2 EnclosureLogicalID;
1: +  U16___2 Flags;
1: +  U16___2 EnclosureHandle;
1: +  U16___2 NumSlots;
1: +  U16___2 StartSlot;
1: +  U8 StartTargetID;
1: +  U8 StartBus;
1: +  U8 SEPTargetID;
1: +  U8 SEPBus;
1: +  U32___2 Reserved2;
1: +  U32___2 Reserved3;
1:  };
1:  
1:  typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0 SasEnclosurePage0_t;
1:  
1:  struct _MSG_SMP_PASSTHROUGH_REQUEST {
1: -	U8 PassthroughFlags;
1: -	U8 PhysicalPort;
1: -	U8 ChainOffset;
1: -	U8 Function;
1: -	U16___2 RequestDataLength;
1: -	U8 ConnectionRate;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U32___2 Reserved1;
1: -	U64___2 SASAddress;
1: -	U32___2 Reserved2;
1: -	U32___2 Reserved3;
1: -	SGE_SIMPLE_UNION SGL;
1: +  U8 PassthroughFlags;
1: +  U8 PhysicalPort;
1: +  U8 ChainOffset;
1: +  U8 Function;
1: +  U16___2 RequestDataLength;
1: +  U8 ConnectionRate;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U32___2 Reserved1;
1: +  U64___2 SASAddress;
1: +  U32___2 Reserved2;
1: +  U32___2 Reserved3;
1: +  SGE_SIMPLE_UNION SGL;
1:  };
1:  
1:  typedef struct _MSG_SMP_PASSTHROUGH_REQUEST SmpPassthroughRequest_t;
1:  
1:  struct _MSG_SMP_PASSTHROUGH_REPLY {
1: -	U8 PassthroughFlags;
1: -	U8 PhysicalPort;
1: -	U8 MsgLength;
1: -	U8 Function;
1: -	U16___2 ResponseDataLength;
1: -	U8 Reserved1;
1: -	U8 MsgFlags;
1: -	U32___2 MsgContext;
1: -	U8 Reserved2;
1: -	U8 SASStatus;
1: -	U16___2 IOCStatus;
1: -	U32___2 IOCLogInfo;
1: -	U32___2 Reserved3;
1: -	U8 ResponseData[4];
1: +  U8 PassthroughFlags;
1: +  U8 PhysicalPort;
1: +  U8 MsgLength;
1: +  U8 Function;
1: +  U16___2 ResponseDataLength;
1: +  U8 Reserved1;
1: +  U8 MsgFlags;
1: +  U32___2 MsgContext;
1: +  U8 Reserved2;
1: +  U8 SASStatus;
1: +  U16___2 IOCStatus;
1: +  U32___2 IOCLogInfo;
1: +  U32___2 Reserved3;
1: +  U8 ResponseData[4];
1:  };
1:  
1:  typedef struct _MSG_SMP_PASSTHROUGH_REPLY SmpPassthroughReply_t;
1: @@ -105508,184 +106685,184 @@ typedef struct _MSG_SMP_PASSTHROUGH_REPLY SmpPassthroughReply_t;
1:  struct mptsas_phyinfo;
1:  
1:  struct mptsas_portinfo {
1: -	struct list_head list;
1: -	u16 num_phys;
1: -	struct mptsas_phyinfo *phy_info;
1: +  struct list_head list;
1: +  u16 num_phys;
1: +  struct mptsas_phyinfo *phy_info;
1:  };
1:  
1:  struct mptsas_target_reset_event {
1: -	struct list_head list;
1: -	EVENT_DATA_SAS_DEVICE_STATUS_CHANGE sas_event_data;
1: -	u8 target_reset_issued;
1: -	long unsigned int time_count;
1: +  struct list_head list;
1: +  EVENT_DATA_SAS_DEVICE_STATUS_CHANGE sas_event_data;
1: +  u8 target_reset_issued;
1: +  long unsigned int time_count;
1:  };
1:  
1:  enum mptsas_hotplug_action {
1: -	MPTSAS_ADD_DEVICE = 0,
1: -	MPTSAS_DEL_DEVICE = 1,
1: -	MPTSAS_ADD_RAID = 2,
1: -	MPTSAS_DEL_RAID = 3,
1: -	MPTSAS_ADD_PHYSDISK = 4,
1: -	MPTSAS_ADD_PHYSDISK_REPROBE = 5,
1: -	MPTSAS_DEL_PHYSDISK = 6,
1: -	MPTSAS_DEL_PHYSDISK_REPROBE = 7,
1: -	MPTSAS_ADD_INACTIVE_VOLUME = 8,
1: -	MPTSAS_IGNORE_EVENT = 9,
1: +  MPTSAS_ADD_DEVICE = 0,
1: +  MPTSAS_DEL_DEVICE = 1,
1: +  MPTSAS_ADD_RAID = 2,
1: +  MPTSAS_DEL_RAID = 3,
1: +  MPTSAS_ADD_PHYSDISK = 4,
1: +  MPTSAS_ADD_PHYSDISK_REPROBE = 5,
1: +  MPTSAS_DEL_PHYSDISK = 6,
1: +  MPTSAS_DEL_PHYSDISK_REPROBE = 7,
1: +  MPTSAS_ADD_INACTIVE_VOLUME = 8,
1: +  MPTSAS_IGNORE_EVENT = 9,
1:  };
1:  
1:  struct mptsas_mapping {
1: -	u8 id;
1: -	u8 channel;
1: +  u8 id;
1: +  u8 channel;
1:  };
1:  
1:  struct mptsas_device_info {
1: -	struct list_head list;
1: -	struct mptsas_mapping os;
1: -	struct mptsas_mapping fw;
1: -	u64 sas_address;
1: -	u32 device_info;
1: -	u16 slot;
1: -	u64 enclosure_logical_id;
1: -	u8 is_logical_volume;
1: -	u8 is_hidden_raid_component;
1: -	u8 volume_id;
1: -	u8 is_cached;
1: +  struct list_head list;
1: +  struct mptsas_mapping os;
1: +  struct mptsas_mapping fw;
1: +  u64 sas_address;
1: +  u32 device_info;
1: +  u16 slot;
1: +  u64 enclosure_logical_id;
1: +  u8 is_logical_volume;
1: +  u8 is_hidden_raid_component;
1: +  u8 volume_id;
1: +  u8 is_cached;
1:  };
1:  
1:  struct mptsas_hotplug_event {
1: -	MPT_ADAPTER *ioc;
1: -	enum mptsas_hotplug_action event_type;
1: -	u64 sas_address;
1: -	u8 channel;
1: -	u8 id;
1: -	u32 device_info;
1: -	u16 handle;
1: -	u8 phy_id;
1: -	u8 phys_disk_num;
1: -	struct scsi_device *sdev;
1: +  MPT_ADAPTER *ioc;
1: +  enum mptsas_hotplug_action event_type;
1: +  u64 sas_address;
1: +  u8 channel;
1: +  u8 id;
1: +  u32 device_info;
1: +  u16 handle;
1: +  u8 phy_id;
1: +  u8 phys_disk_num;
1: +  struct scsi_device *sdev;
1:  };
1:  
1:  struct fw_event_work {
1: -	struct list_head list;
1: -	struct delayed_work work;
1: -	MPT_ADAPTER *ioc;
1: -	u32 event;
1: -	u8 retries;
1: -	int: 24;
1: -	char event_data[0];
1: +  struct list_head list;
1: +  struct delayed_work work;
1: +  MPT_ADAPTER *ioc;
1: +  u32 event;
1: +  u8 retries;
1: +  int : 24;
1: +  char event_data[0];
1:  };
1:  
1:  struct mptsas_devinfo {
1: -	u16 handle;
1: -	u16 handle_parent;
1: -	u16 handle_enclosure;
1: -	u16 slot;
1: -	u8 phy_id;
1: -	u8 port_id;
1: -	u8 id;
1: -	u32 phys_disk_num;
1: -	u8 channel;
1: -	u64 sas_address;
1: -	u32 device_info;
1: -	u16 flags;
1: +  u16 handle;
1: +  u16 handle_parent;
1: +  u16 handle_enclosure;
1: +  u16 slot;
1: +  u8 phy_id;
1: +  u8 port_id;
1: +  u8 id;
1: +  u32 phys_disk_num;
1: +  u8 channel;
1: +  u64 sas_address;
1: +  u32 device_info;
1: +  u16 flags;
1:  };
1:  
1:  struct mptsas_portinfo_details {
1: -	u16 num_phys;
1: -	u64 phy_bitmask;
1: -	struct sas_rphy *rphy;
1: -	struct sas_port *port;
1: -	struct scsi_target *starget;
1: -	struct mptsas_portinfo *port_info;
1: +  u16 num_phys;
1: +  u64 phy_bitmask;
1: +  struct sas_rphy *rphy;
1: +  struct sas_port *port;
1: +  struct scsi_target *starget;
1: +  struct mptsas_portinfo *port_info;
1:  };
1:  
1:  struct mptsas_phyinfo {
1: -	u16 handle;
1: -	u8 phy_id;
1: -	u8 port_id;
1: -	u8 negotiated_link_rate;
1: -	u8 hw_link_rate;
1: -	u8 programmed_link_rate;
1: -	u8 sas_port_add_phy;
1: -	struct mptsas_devinfo identify;
1: -	struct mptsas_devinfo attached;
1: -	struct sas_phy *phy;
1: -	struct mptsas_portinfo *portinfo;
1: -	struct mptsas_portinfo_details *port_details;
1: +  u16 handle;
1: +  u8 phy_id;
1: +  u8 port_id;
1: +  u8 negotiated_link_rate;
1: +  u8 hw_link_rate;
1: +  u8 programmed_link_rate;
1: +  u8 sas_port_add_phy;
1: +  struct mptsas_devinfo identify;
1: +  struct mptsas_devinfo attached;
1: +  struct sas_phy *phy;
1: +  struct mptsas_portinfo *portinfo;
1: +  struct mptsas_portinfo_details *port_details;
1:  };
1:  
1:  struct mptsas_enclosure {
1: -	u64 enclosure_logical_id;
1: -	u16 enclosure_handle;
1: -	u16 flags;
1: -	u16 num_slot;
1: -	u16 start_slot;
1: -	u8 start_id;
1: -	u8 start_channel;
1: -	u8 sep_id;
1: -	u8 sep_channel;
1: +  u64 enclosure_logical_id;
1: +  u16 enclosure_handle;
1: +  u16 flags;
1: +  u16 num_slot;
1: +  u16 start_slot;
1: +  u8 start_id;
1: +  u8 start_channel;
1: +  u8 sep_id;
1: +  u8 sep_channel;
1:  };
1:  
1:  struct rep_manu_request {
1: -	u8 smp_frame_type;
1: -	u8 function;
1: -	u8 reserved;
1: -	u8 request_length;
1: +  u8 smp_frame_type;
1: +  u8 function;
1: +  u8 reserved;
1: +  u8 request_length;
1:  };
1:  
1:  struct rep_manu_reply {
1: -	u8 smp_frame_type;
1: -	u8 function;
1: -	u8 function_result;
1: -	u8 response_length;
1: -	u16 expander_change_count;
1: -	u8 reserved0[2];
1: -	u8 sas_format: 1;
1: -	u8 reserved1: 7;
1: -	u8 reserved2[3];
1: -	u8 vendor_id[8];
1: -	u8 product_id[16];
1: -	u8 product_rev[4];
1: -	u8 component_vendor_id[8];
1: -	u16 component_id;
1: -	u8 component_revision_id;
1: -	u8 reserved3;
1: -	u8 vendor_specific[8];
1: +  u8 smp_frame_type;
1: +  u8 function;
1: +  u8 function_result;
1: +  u8 response_length;
1: +  u16 expander_change_count;
1: +  u8 reserved0[2];
1: +  u8 sas_format : 1;
1: +  u8 reserved1 : 7;
1: +  u8 reserved2[3];
1: +  u8 vendor_id[8];
1: +  u8 product_id[16];
1: +  u8 product_rev[4];
1: +  u8 component_vendor_id[8];
1: +  u16 component_id;
1: +  u8 component_revision_id;
1: +  u8 reserved3;
1: +  u8 vendor_specific[8];
1:  };
1:  
1:  struct socket_state_t {
1: -	u_int flags;
1: -	u_int csc_mask;
1: -	u_char Vcc;
1: -	u_char Vpp;
1: -	u_char io_irq;
1: +  u_int flags;
1: +  u_int csc_mask;
1: +  u_char Vcc;
1: +  u_char Vpp;
1: +  u_char io_irq;
1:  };
1:  
1:  typedef struct socket_state_t socket_state_t;
1:  
1:  struct pccard_io_map {
1: -	u_char map;
1: -	u_char flags;
1: -	u_short speed;
1: -	phys_addr_t start;
1: -	phys_addr_t stop;
1: +  u_char map;
1: +  u_char flags;
1: +  u_short speed;
1: +  phys_addr_t start;
1: +  phys_addr_t stop;
1:  };
1:  
1:  struct pccard_mem_map {
1: -	u_char map;
1: -	u_char flags;
1: -	u_short speed;
1: -	phys_addr_t static_start;
1: -	u_int card_start;
1: -	struct resource *res;
1: +  u_char map;
1: +  u_char flags;
1: +  u_short speed;
1: +  phys_addr_t static_start;
1: +  u_int card_start;
1: +  struct resource *res;
1:  };
1:  
1:  typedef struct pccard_mem_map pccard_mem_map;
1:  
1:  struct io_window_t {
1: -	u_int InUse;
1: -	u_int Config;
1: -	struct resource *res;
1: +  u_int InUse;
1: +  u_int Config;
1: +  struct resource *res;
1:  };
1:  
1:  typedef struct io_window_t io_window_t;
1: @@ -105693,12 +106870,12 @@ typedef struct io_window_t io_window_t;
1:  struct pcmcia_socket;
1:  
1:  struct pccard_operations {
1: -	int (*init)(struct pcmcia_socket *);
1: -	int (*suspend)(struct pcmcia_socket *);
1: -	int (*get_status)(struct pcmcia_socket *, u_int *);
1: -	int (*set_socket)(struct pcmcia_socket *, socket_state_t *);
1: -	int (*set_io_map)(struct pcmcia_socket *, struct pccard_io_map *);
1: -	int (*set_mem_map)(struct pcmcia_socket *, struct pccard_mem_map *);
1: +  int (*init)(struct pcmcia_socket *);
1: +  int (*suspend)(struct pcmcia_socket *);
1: +  int (*get_status)(struct pcmcia_socket *, u_int *);
1: +  int (*set_socket)(struct pcmcia_socket *, socket_state_t *);
1: +  int (*set_io_map)(struct pcmcia_socket *, struct pccard_io_map *);
1: +  int (*set_mem_map)(struct pcmcia_socket *, struct pccard_mem_map *);
1:  };
1:  
1:  struct pccard_resource_ops;
1: @@ -105706,221 +106883,223 @@ struct pccard_resource_ops;
1:  struct pcmcia_callback;
1:  
1:  struct pcmcia_socket {
1: -	struct module *owner;
1: -	socket_state_t socket;
1: -	u_int state;
1: -	u_int suspended_state;
1: -	u_short functions;
1: -	u_short lock_count;
1: -	pccard_mem_map cis_mem;
1: -	void *cis_virt;
1: -	io_window_t io[2];
1: -	pccard_mem_map win[4];
1: -	struct list_head cis_cache;
1: -	size_t fake_cis_len;
1: -	u8 *fake_cis;
1: -	struct list_head socket_list;
1: -	struct completion socket_released;
1: -	unsigned int sock;
1: -	u_int features;
1: -	u_int irq_mask;
1: -	u_int map_size;
1: -	u_int io_offset;
1: -	u_int pci_irq;
1: -	struct pci_dev *cb_dev;
1: -	u8 resource_setup_done;
1: -	struct pccard_operations *ops;
1: -	struct pccard_resource_ops *resource_ops;
1: -	void *resource_data;
1: -	void (*zoom_video)(struct pcmcia_socket *, int);
1: -	int (*power_hook)(struct pcmcia_socket *, int);
1: -	void (*tune_bridge)(struct pcmcia_socket *, struct pci_bus *);
1: -	struct task_struct *thread;
1: -	struct completion thread_done;
1: -	unsigned int thread_events;
1: -	unsigned int sysfs_events;
1: -	struct mutex skt_mutex;
1: -	struct mutex ops_mutex;
1: -	spinlock_t thread_lock;
1: -	struct pcmcia_callback *callback;
1: -	struct list_head devices_list;
1: -	u8 device_count;
1: -	u8 pcmcia_pfc;
1: -	atomic_t present;
1: -	unsigned int pcmcia_irq;
1: -	struct device dev;
1: -	void *driver_data;
1: -	int resume_status;
1: +  struct module *owner;
1: +  socket_state_t socket;
1: +  u_int state;
1: +  u_int suspended_state;
1: +  u_short functions;
1: +  u_short lock_count;
1: +  pccard_mem_map cis_mem;
1: +  void *cis_virt;
1: +  io_window_t io[2];
1: +  pccard_mem_map win[4];
1: +  struct list_head cis_cache;
1: +  size_t fake_cis_len;
1: +  u8 *fake_cis;
1: +  struct list_head socket_list;
1: +  struct completion socket_released;
1: +  unsigned int sock;
1: +  u_int features;
1: +  u_int irq_mask;
1: +  u_int map_size;
1: +  u_int io_offset;
1: +  u_int pci_irq;
1: +  struct pci_dev *cb_dev;
1: +  u8 resource_setup_done;
1: +  struct pccard_operations *ops;
1: +  struct pccard_resource_ops *resource_ops;
1: +  void *resource_data;
1: +  void (*zoom_video)(struct pcmcia_socket *, int);
1: +  int (*power_hook)(struct pcmcia_socket *, int);
1: +  void (*tune_bridge)(struct pcmcia_socket *, struct pci_bus *);
1: +  struct task_struct *thread;
1: +  struct completion thread_done;
1: +  unsigned int thread_events;
1: +  unsigned int sysfs_events;
1: +  struct mutex skt_mutex;
1: +  struct mutex ops_mutex;
1: +  spinlock_t thread_lock;
1: +  struct pcmcia_callback *callback;
1: +  struct list_head devices_list;
1: +  u8 device_count;
1: +  u8 pcmcia_pfc;
1: +  atomic_t present;
1: +  unsigned int pcmcia_irq;
1: +  struct device dev;
1: +  void *driver_data;
1: +  int resume_status;
1:  };
1:  
1:  struct pccard_resource_ops {
1: -	int (*validate_mem)(struct pcmcia_socket *);
1: -	int (*find_io)(struct pcmcia_socket *, unsigned int, unsigned int *, unsigned int, unsigned int, struct resource **);
1: -	struct resource * (*find_mem)(long unsigned int, long unsigned int, long unsigned int, int, struct pcmcia_socket *);
1: -	int (*init)(struct pcmcia_socket *);
1: -	void (*exit)(struct pcmcia_socket *);
1: +  int (*validate_mem)(struct pcmcia_socket *);
1: +  int (*find_io)(struct pcmcia_socket *, unsigned int, unsigned int *,
1: +                 unsigned int, unsigned int, struct resource **);
1: +  struct resource *(*find_mem)(long unsigned int, long unsigned int,
1: +                               long unsigned int, int, struct pcmcia_socket *);
1: +  int (*init)(struct pcmcia_socket *);
1: +  void (*exit)(struct pcmcia_socket *);
1:  };
1:  
1:  struct pcmcia_callback {
1: -	struct module *owner;
1: -	int (*add)(struct pcmcia_socket *);
1: -	int (*remove)(struct pcmcia_socket *);
1: -	void (*requery)(struct pcmcia_socket *);
1: -	int (*validate)(struct pcmcia_socket *, unsigned int *);
1: -	int (*suspend)(struct pcmcia_socket *);
1: -	int (*early_resume)(struct pcmcia_socket *);
1: -	int (*resume)(struct pcmcia_socket *);
1: +  struct module *owner;
1: +  int (*add)(struct pcmcia_socket *);
1: +  int (*remove)(struct pcmcia_socket *);
1: +  void (*requery)(struct pcmcia_socket *);
1: +  int (*validate)(struct pcmcia_socket *, unsigned int *);
1: +  int (*suspend)(struct pcmcia_socket *);
1: +  int (*early_resume)(struct pcmcia_socket *);
1: +  int (*resume)(struct pcmcia_socket *);
1:  };
1:  
1:  enum {
1: -	PCMCIA_IOPORT_0 = 0,
1: -	PCMCIA_IOPORT_1 = 1,
1: -	PCMCIA_IOMEM_0 = 2,
1: -	PCMCIA_IOMEM_1 = 3,
1: -	PCMCIA_IOMEM_2 = 4,
1: -	PCMCIA_IOMEM_3 = 5,
1: -	PCMCIA_NUM_RESOURCES = 6,
1: +  PCMCIA_IOPORT_0 = 0,
1: +  PCMCIA_IOPORT_1 = 1,
1: +  PCMCIA_IOMEM_0 = 2,
1: +  PCMCIA_IOMEM_1 = 3,
1: +  PCMCIA_IOMEM_2 = 4,
1: +  PCMCIA_IOMEM_3 = 5,
1: +  PCMCIA_NUM_RESOURCES = 6,
1:  };
1:  
1:  struct cistpl_longlink_mfc_t {
1: -	u_char nfn;
1: -	struct {
1: -		u_char space;
1: -		u_int addr;
1: -	} fn[8];
1: +  u_char nfn;
1: +  struct {
1: +    u_char space;
1: +    u_int addr;
1: +  } fn[8];
1:  };
1:  
1:  typedef struct cistpl_longlink_mfc_t cistpl_longlink_mfc_t;
1:  
1:  struct cistpl_vers_1_t {
1: -	u_char major;
1: -	u_char minor;
1: -	u_char ns;
1: -	u_char ofs[4];
1: -	char str[254];
1: +  u_char major;
1: +  u_char minor;
1: +  u_char ns;
1: +  u_char ofs[4];
1: +  char str[254];
1:  };
1:  
1:  typedef struct cistpl_vers_1_t cistpl_vers_1_t;
1:  
1:  struct cistpl_manfid_t {
1: -	u_short manf;
1: -	u_short card;
1: +  u_short manf;
1: +  u_short card;
1:  };
1:  
1:  typedef struct cistpl_manfid_t cistpl_manfid_t;
1:  
1:  struct cistpl_funcid_t {
1: -	u_char func;
1: -	u_char sysinit;
1: +  u_char func;
1: +  u_char sysinit;
1:  };
1:  
1:  typedef struct cistpl_funcid_t cistpl_funcid_t;
1:  
1:  struct cistpl_config_t {
1: -	u_char last_idx;
1: -	u_int base;
1: -	u_int rmask[4];
1: -	u_char subtuples;
1: +  u_char last_idx;
1: +  u_int base;
1: +  u_int rmask[4];
1: +  u_char subtuples;
1:  };
1:  
1:  typedef struct cistpl_config_t cistpl_config_t;
1:  
1:  struct cistpl_device_geo_t {
1: -	u_char ngeo;
1: -	struct {
1: -		u_char buswidth;
1: -		u_int erase_block;
1: -		u_int read_block;
1: -		u_int write_block;
1: -		u_int partition;
1: -		u_int interleave;
1: -	} geo[4];
1: +  u_char ngeo;
1: +  struct {
1: +    u_char buswidth;
1: +    u_int erase_block;
1: +    u_int read_block;
1: +    u_int write_block;
1: +    u_int partition;
1: +    u_int interleave;
1: +  } geo[4];
1:  };
1:  
1:  typedef struct cistpl_device_geo_t cistpl_device_geo_t;
1:  
1:  struct pcmcia_device_id {
1: -	__u16 match_flags;
1: -	__u16 manf_id;
1: -	__u16 card_id;
1: -	__u8 func_id;
1: -	__u8 function;
1: -	__u8 device_no;
1: -	__u32 prod_id_hash[4];
1: -	const char *prod_id[4];
1: -	kernel_ulong_t driver_info;
1: -	char *cisfile;
1: +  __u16 match_flags;
1: +  __u16 manf_id;
1: +  __u16 card_id;
1: +  __u8 func_id;
1: +  __u8 function;
1: +  __u8 device_no;
1: +  __u32 prod_id_hash[4];
1: +  const char *prod_id[4];
1: +  kernel_ulong_t driver_info;
1: +  char *cisfile;
1:  };
1:  
1:  struct pcmcia_dynids {
1: -	struct mutex lock;
1: -	struct list_head list;
1: +  struct mutex lock;
1: +  struct list_head list;
1:  };
1:  
1:  struct pcmcia_device;
1:  
1:  struct pcmcia_driver {
1: -	const char *name;
1: -	int (*probe)(struct pcmcia_device *);
1: -	void (*remove)(struct pcmcia_device *);
1: -	int (*suspend)(struct pcmcia_device *);
1: -	int (*resume)(struct pcmcia_device *);
1: -	struct module *owner;
1: -	const struct pcmcia_device_id *id_table;
1: -	struct device_driver drv;
1: -	struct pcmcia_dynids dynids;
1: +  const char *name;
1: +  int (*probe)(struct pcmcia_device *);
1: +  void (*remove)(struct pcmcia_device *);
1: +  int (*suspend)(struct pcmcia_device *);
1: +  int (*resume)(struct pcmcia_device *);
1: +  struct module *owner;
1: +  const struct pcmcia_device_id *id_table;
1: +  struct device_driver drv;
1: +  struct pcmcia_dynids dynids;
1:  };
1:  
1:  struct config_t;
1:  
1:  struct pcmcia_device {
1: -	struct pcmcia_socket *socket;
1: -	char *devname;
1: -	u8 device_no;
1: -	u8 func;
1: -	struct config_t *function_config;
1: -	struct list_head socket_device_list;
1: -	unsigned int irq;
1: -	struct resource *resource[6];
1: -	resource_size_t card_addr;
1: -	unsigned int vpp;
1: -	unsigned int config_flags;
1: -	unsigned int config_base;
1: -	unsigned int config_index;
1: -	unsigned int config_regs;
1: -	unsigned int io_lines;
1: -	u16 suspended: 1;
1: -	u16 _irq: 1;
1: -	u16 _io: 1;
1: -	u16 _win: 4;
1: -	u16 _locked: 1;
1: -	u16 allow_func_id_match: 1;
1: -	u16 has_manf_id: 1;
1: -	u16 has_card_id: 1;
1: -	u16 has_func_id: 1;
1: -	u16 reserved: 4;
1: -	u8 func_id;
1: -	u16 manf_id;
1: -	u16 card_id;
1: -	char *prod_id[4];
1: -	u64 dma_mask;
1: -	struct device dev;
1: -	void *priv;
1: -	unsigned int open;
1: +  struct pcmcia_socket *socket;
1: +  char *devname;
1: +  u8 device_no;
1: +  u8 func;
1: +  struct config_t *function_config;
1: +  struct list_head socket_device_list;
1: +  unsigned int irq;
1: +  struct resource *resource[6];
1: +  resource_size_t card_addr;
1: +  unsigned int vpp;
1: +  unsigned int config_flags;
1: +  unsigned int config_base;
1: +  unsigned int config_index;
1: +  unsigned int config_regs;
1: +  unsigned int io_lines;
1: +  u16 suspended : 1;
1: +  u16 _irq : 1;
1: +  u16 _io : 1;
1: +  u16 _win : 4;
1: +  u16 _locked : 1;
1: +  u16 allow_func_id_match : 1;
1: +  u16 has_manf_id : 1;
1: +  u16 has_card_id : 1;
1: +  u16 has_func_id : 1;
1: +  u16 reserved : 4;
1: +  u8 func_id;
1: +  u16 manf_id;
1: +  u16 card_id;
1: +  char *prod_id[4];
1: +  u64 dma_mask;
1: +  struct device dev;
1: +  void *priv;
1: +  unsigned int open;
1:  };
1:  
1:  struct config_t {
1: -	struct kref ref;
1: -	unsigned int state;
1: -	struct resource io[2];
1: -	struct resource mem[4];
1: +  struct kref ref;
1: +  unsigned int state;
1: +  struct resource io[2];
1: +  struct resource mem[4];
1:  };
1:  
1:  typedef struct config_t config_t;
1:  
1:  struct pcmcia_dynid {
1: -	struct list_head node;
1: -	struct pcmcia_device_id id;
1: +  struct list_head node;
1: +  struct pcmcia_device_id id;
1:  };
1:  
1:  typedef struct pccard_io_map pccard_io_map;
1: @@ -105928,579 +107107,579 @@ typedef struct pccard_io_map pccard_io_map;
1:  typedef unsigned char cisdata_t;
1:  
1:  struct cistpl_longlink_t {
1: -	u_int addr;
1: +  u_int addr;
1:  };
1:  
1:  typedef struct cistpl_longlink_t cistpl_longlink_t;
1:  
1:  struct cistpl_checksum_t {
1: -	u_short addr;
1: -	u_short len;
1: -	u_char sum;
1: +  u_short addr;
1: +  u_short len;
1: +  u_char sum;
1:  };
1:  
1:  typedef struct cistpl_checksum_t cistpl_checksum_t;
1:  
1:  struct cistpl_altstr_t {
1: -	u_char ns;
1: -	u_char ofs[4];
1: -	char str[254];
1: +  u_char ns;
1: +  u_char ofs[4];
1: +  char str[254];
1:  };
1:  
1:  typedef struct cistpl_altstr_t cistpl_altstr_t;
1:  
1:  struct cistpl_device_t {
1: -	u_char ndev;
1: -	struct {
1: -		u_char type;
1: -		u_char wp;
1: -		u_int speed;
1: -		u_int size;
1: -	} dev[4];
1: +  u_char ndev;
1: +  struct {
1: +    u_char type;
1: +    u_char wp;
1: +    u_int speed;
1: +    u_int size;
1: +  } dev[4];
1:  };
1:  
1:  typedef struct cistpl_device_t cistpl_device_t;
1:  
1:  struct cistpl_jedec_t {
1: -	u_char nid;
1: -	struct {
1: -		u_char mfr;
1: -		u_char info;
1: -	} id[4];
1: +  u_char nid;
1: +  struct {
1: +    u_char mfr;
1: +    u_char info;
1: +  } id[4];
1:  };
1:  
1:  typedef struct cistpl_jedec_t cistpl_jedec_t;
1:  
1:  struct cistpl_funce_t {
1: -	u_char type;
1: -	u_char data[0];
1: +  u_char type;
1: +  u_char data[0];
1:  };
1:  
1:  typedef struct cistpl_funce_t cistpl_funce_t;
1:  
1:  struct cistpl_bar_t {
1: -	u_char attr;
1: -	u_int size;
1: +  u_char attr;
1: +  u_int size;
1:  };
1:  
1:  typedef struct cistpl_bar_t cistpl_bar_t;
1:  
1:  struct cistpl_power_t {
1: -	u_char present;
1: -	u_char flags;
1: -	u_int param[7];
1: +  u_char present;
1: +  u_char flags;
1: +  u_int param[7];
1:  };
1:  
1:  typedef struct cistpl_power_t cistpl_power_t;
1:  
1:  struct cistpl_timing_t {
1: -	u_int wait;
1: -	u_int waitscale;
1: -	u_int ready;
1: -	u_int rdyscale;
1: -	u_int reserved;
1: -	u_int rsvscale;
1: +  u_int wait;
1: +  u_int waitscale;
1: +  u_int ready;
1: +  u_int rdyscale;
1: +  u_int reserved;
1: +  u_int rsvscale;
1:  };
1:  
1:  typedef struct cistpl_timing_t cistpl_timing_t;
1:  
1:  struct cistpl_io_t {
1: -	u_char flags;
1: -	u_char nwin;
1: -	struct {
1: -		u_int base;
1: -		u_int len;
1: -	} win[16];
1: +  u_char flags;
1: +  u_char nwin;
1: +  struct {
1: +    u_int base;
1: +    u_int len;
1: +  } win[16];
1:  };
1:  
1:  typedef struct cistpl_io_t cistpl_io_t;
1:  
1:  struct cistpl_irq_t {
1: -	u_int IRQInfo1;
1: -	u_int IRQInfo2;
1: +  u_int IRQInfo1;
1: +  u_int IRQInfo2;
1:  };
1:  
1:  typedef struct cistpl_irq_t cistpl_irq_t;
1:  
1:  struct cistpl_mem_t {
1: -	u_char flags;
1: -	u_char nwin;
1: -	struct {
1: -		u_int len;
1: -		u_int card_addr;
1: -		u_int host_addr;
1: -	} win[8];
1: +  u_char flags;
1: +  u_char nwin;
1: +  struct {
1: +    u_int len;
1: +    u_int card_addr;
1: +    u_int host_addr;
1: +  } win[8];
1:  };
1:  
1:  typedef struct cistpl_mem_t cistpl_mem_t;
1:  
1:  struct cistpl_cftable_entry_t {
1: -	u_char index;
1: -	u_short flags;
1: -	u_char interface;
1: -	cistpl_power_t vcc;
1: -	cistpl_power_t vpp1;
1: -	cistpl_power_t vpp2;
1: -	cistpl_timing_t timing;
1: -	cistpl_io_t io;
1: -	cistpl_irq_t irq;
1: -	cistpl_mem_t mem;
1: -	u_char subtuples;
1: +  u_char index;
1: +  u_short flags;
1: +  u_char interface;
1: +  cistpl_power_t vcc;
1: +  cistpl_power_t vpp1;
1: +  cistpl_power_t vpp2;
1: +  cistpl_timing_t timing;
1: +  cistpl_io_t io;
1: +  cistpl_irq_t irq;
1: +  cistpl_mem_t mem;
1: +  u_char subtuples;
1:  };
1:  
1:  typedef struct cistpl_cftable_entry_t cistpl_cftable_entry_t;
1:  
1:  struct cistpl_cftable_entry_cb_t {
1: -	u_char index;
1: -	u_int flags;
1: -	cistpl_power_t vcc;
1: -	cistpl_power_t vpp1;
1: -	cistpl_power_t vpp2;
1: -	u_char io;
1: -	cistpl_irq_t irq;
1: -	u_char mem;
1: -	u_char subtuples;
1: +  u_char index;
1: +  u_int flags;
1: +  cistpl_power_t vcc;
1: +  cistpl_power_t vpp1;
1: +  cistpl_power_t vpp2;
1: +  u_char io;
1: +  cistpl_irq_t irq;
1: +  u_char mem;
1: +  u_char subtuples;
1:  };
1:  
1:  typedef struct cistpl_cftable_entry_cb_t cistpl_cftable_entry_cb_t;
1:  
1:  struct cistpl_vers_2_t {
1: -	u_char vers;
1: -	u_char comply;
1: -	u_short dindex;
1: -	u_char vspec8;
1: -	u_char vspec9;
1: -	u_char nhdr;
1: -	u_char vendor;
1: -	u_char info;
1: -	char str[244];
1: +  u_char vers;
1: +  u_char comply;
1: +  u_short dindex;
1: +  u_char vspec8;
1: +  u_char vspec9;
1: +  u_char nhdr;
1: +  u_char vendor;
1: +  u_char info;
1: +  char str[244];
1:  };
1:  
1:  typedef struct cistpl_vers_2_t cistpl_vers_2_t;
1:  
1:  struct cistpl_org_t {
1: -	u_char data_org;
1: -	char desc[30];
1: +  u_char data_org;
1: +  char desc[30];
1:  };
1:  
1:  typedef struct cistpl_org_t cistpl_org_t;
1:  
1:  struct cistpl_format_t {
1: -	u_char type;
1: -	u_char edc;
1: -	u_int offset;
1: -	u_int length;
1: +  u_char type;
1: +  u_char edc;
1: +  u_int offset;
1: +  u_int length;
1:  };
1:  
1:  typedef struct cistpl_format_t cistpl_format_t;
1:  
1:  union cisparse_t {
1: -	cistpl_device_t device;
1: -	cistpl_checksum_t checksum;
1: -	cistpl_longlink_t longlink;
1: -	cistpl_longlink_mfc_t longlink_mfc;
1: -	cistpl_vers_1_t version_1;
1: -	cistpl_altstr_t altstr;
1: -	cistpl_jedec_t jedec;
1: -	cistpl_manfid_t manfid;
1: -	cistpl_funcid_t funcid;
1: -	cistpl_funce_t funce;
1: -	cistpl_bar_t bar;
1: -	cistpl_config_t config;
1: -	cistpl_cftable_entry_t cftable_entry;
1: -	cistpl_cftable_entry_cb_t cftable_entry_cb;
1: -	cistpl_device_geo_t device_geo;
1: -	cistpl_vers_2_t vers_2;
1: -	cistpl_org_t org;
1: -	cistpl_format_t format;
1: +  cistpl_device_t device;
1: +  cistpl_checksum_t checksum;
1: +  cistpl_longlink_t longlink;
1: +  cistpl_longlink_mfc_t longlink_mfc;
1: +  cistpl_vers_1_t version_1;
1: +  cistpl_altstr_t altstr;
1: +  cistpl_jedec_t jedec;
1: +  cistpl_manfid_t manfid;
1: +  cistpl_funcid_t funcid;
1: +  cistpl_funce_t funce;
1: +  cistpl_bar_t bar;
1: +  cistpl_config_t config;
1: +  cistpl_cftable_entry_t cftable_entry;
1: +  cistpl_cftable_entry_cb_t cftable_entry_cb;
1: +  cistpl_device_geo_t device_geo;
1: +  cistpl_vers_2_t vers_2;
1: +  cistpl_org_t org;
1: +  cistpl_format_t format;
1:  };
1:  
1:  typedef union cisparse_t cisparse_t;
1:  
1:  struct tuple_t {
1: -	u_int Attributes;
1: -	cisdata_t DesiredTuple;
1: -	u_int Flags;
1: -	u_int LinkOffset;
1: -	u_int CISOffset;
1: -	cisdata_t TupleCode;
1: -	cisdata_t TupleLink;
1: -	cisdata_t TupleOffset;
1: -	cisdata_t TupleDataMax;
1: -	cisdata_t TupleDataLen;
1: -	cisdata_t *TupleData;
1: +  u_int Attributes;
1: +  cisdata_t DesiredTuple;
1: +  u_int Flags;
1: +  u_int LinkOffset;
1: +  u_int CISOffset;
1: +  cisdata_t TupleCode;
1: +  cisdata_t TupleLink;
1: +  cisdata_t TupleOffset;
1: +  cisdata_t TupleDataMax;
1: +  cisdata_t TupleDataLen;
1: +  cisdata_t *TupleData;
1:  };
1:  
1:  typedef struct tuple_t tuple_t;
1:  
1:  struct cis_cache_entry {
1: -	struct list_head node;
1: -	unsigned int addr;
1: -	unsigned int len;
1: -	unsigned int attr;
1: -	unsigned char cache[0];
1: +  struct list_head node;
1: +  unsigned int addr;
1: +  unsigned int len;
1: +  unsigned int attr;
1: +  unsigned char cache[0];
1:  };
1:  
1:  struct tuple_flags {
1: -	u_int link_space: 4;
1: -	u_int has_link: 1;
1: -	u_int mfc_fn: 3;
1: -	u_int space: 4;
1: +  u_int link_space : 4;
1: +  u_int has_link : 1;
1: +  u_int mfc_fn : 3;
1: +  u_int space : 4;
1:  };
1:  
1:  struct pcmcia_cfg_mem {
1: -	struct pcmcia_device *p_dev;
1: -	int (*conf_check)(struct pcmcia_device *, void *);
1: -	void *priv_data;
1: -	cisparse_t parse;
1: -	cistpl_cftable_entry_t dflt;
1: +  struct pcmcia_device *p_dev;
1: +  int (*conf_check)(struct pcmcia_device *, void *);
1: +  void *priv_data;
1: +  cisparse_t parse;
1: +  cistpl_cftable_entry_t dflt;
1:  };
1:  
1:  struct pcmcia_loop_mem {
1: -	struct pcmcia_device *p_dev;
1: -	void *priv_data;
1: -	int (*loop_tuple)(struct pcmcia_device *, tuple_t *, void *);
1: +  struct pcmcia_device *p_dev;
1: +  void *priv_data;
1: +  int (*loop_tuple)(struct pcmcia_device *, tuple_t *, void *);
1:  };
1:  
1:  struct pcmcia_loop_get {
1: -	size_t len;
1: -	cisdata_t **buf;
1: +  size_t len;
1: +  cisdata_t **buf;
1:  };
1:  
1:  struct resource_map {
1: -	u_long base;
1: -	u_long num;
1: -	struct resource_map *next;
1: +  u_long base;
1: +  u_long num;
1: +  struct resource_map *next;
1:  };
1:  
1:  struct socket_data {
1: -	struct resource_map mem_db;
1: -	struct resource_map mem_db_valid;
1: -	struct resource_map io_db;
1: +  struct resource_map mem_db;
1: +  struct resource_map mem_db_valid;
1: +  struct resource_map io_db;
1:  };
1:  
1:  struct pcmcia_align_data {
1: -	long unsigned int mask;
1: -	long unsigned int offset;
1: -	struct resource_map *map;
1: +  long unsigned int mask;
1: +  long unsigned int offset;
1: +  struct resource_map *map;
1:  };
1:  
1:  struct yenta_socket;
1:  
1:  struct cardbus_type {
1: -	int (*override)(struct yenta_socket *);
1: -	void (*save_state)(struct yenta_socket *);
1: -	void (*restore_state)(struct yenta_socket *);
1: -	int (*sock_init)(struct yenta_socket *);
1: +  int (*override)(struct yenta_socket *);
1: +  void (*save_state)(struct yenta_socket *);
1: +  void (*restore_state)(struct yenta_socket *);
1: +  int (*sock_init)(struct yenta_socket *);
1:  };
1:  
1:  struct yenta_socket {
1: -	struct pci_dev *dev;
1: -	int cb_irq;
1: -	int io_irq;
1: -	void *base;
1: -	struct timer_list poll_timer;
1: -	struct pcmcia_socket socket;
1: -	struct cardbus_type *type;
1: -	u32 flags;
1: -	unsigned int probe_status;
1: -	unsigned int private[8];
1: -	u32 saved_state[2];
1: -};
1: -
1: -enum {
1: -	CARDBUS_TYPE_DEFAULT = 4294967295,
1: -	CARDBUS_TYPE_TI = 0,
1: -	CARDBUS_TYPE_TI113X = 1,
1: -	CARDBUS_TYPE_TI12XX = 2,
1: -	CARDBUS_TYPE_TI1250 = 3,
1: -	CARDBUS_TYPE_RICOH = 4,
1: -	CARDBUS_TYPE_TOPIC95 = 5,
1: -	CARDBUS_TYPE_TOPIC97 = 6,
1: -	CARDBUS_TYPE_O2MICRO = 7,
1: -	CARDBUS_TYPE_ENE = 8,
1: +  struct pci_dev *dev;
1: +  int cb_irq;
1: +  int io_irq;
1: +  void *base;
1: +  struct timer_list poll_timer;
1: +  struct pcmcia_socket socket;
1: +  struct cardbus_type *type;
1: +  u32 flags;
1: +  unsigned int probe_status;
1: +  unsigned int private[8];
1: +  u32 saved_state[2];
1: +};
1: +
1: +enum {
1: +  CARDBUS_TYPE_DEFAULT = 4294967295,
1: +  CARDBUS_TYPE_TI = 0,
1: +  CARDBUS_TYPE_TI113X = 1,
1: +  CARDBUS_TYPE_TI12XX = 2,
1: +  CARDBUS_TYPE_TI1250 = 3,
1: +  CARDBUS_TYPE_RICOH = 4,
1: +  CARDBUS_TYPE_TOPIC95 = 5,
1: +  CARDBUS_TYPE_TOPIC97 = 6,
1: +  CARDBUS_TYPE_O2MICRO = 7,
1: +  CARDBUS_TYPE_ENE = 8,
1:  };
1:  
1:  enum usb_device_speed {
1: -	USB_SPEED_UNKNOWN = 0,
1: -	USB_SPEED_LOW = 1,
1: -	USB_SPEED_FULL = 2,
1: -	USB_SPEED_HIGH = 3,
1: -	USB_SPEED_WIRELESS = 4,
1: -	USB_SPEED_SUPER = 5,
1: -	USB_SPEED_SUPER_PLUS = 6,
1: +  USB_SPEED_UNKNOWN = 0,
1: +  USB_SPEED_LOW = 1,
1: +  USB_SPEED_FULL = 2,
1: +  USB_SPEED_HIGH = 3,
1: +  USB_SPEED_WIRELESS = 4,
1: +  USB_SPEED_SUPER = 5,
1: +  USB_SPEED_SUPER_PLUS = 6,
1:  };
1:  
1:  enum usb_device_state {
1: -	USB_STATE_NOTATTACHED = 0,
1: -	USB_STATE_ATTACHED = 1,
1: -	USB_STATE_POWERED = 2,
1: -	USB_STATE_RECONNECTING = 3,
1: -	USB_STATE_UNAUTHENTICATED = 4,
1: -	USB_STATE_DEFAULT = 5,
1: -	USB_STATE_ADDRESS = 6,
1: -	USB_STATE_CONFIGURED = 7,
1: -	USB_STATE_SUSPENDED = 8,
1: +  USB_STATE_NOTATTACHED = 0,
1: +  USB_STATE_ATTACHED = 1,
1: +  USB_STATE_POWERED = 2,
1: +  USB_STATE_RECONNECTING = 3,
1: +  USB_STATE_UNAUTHENTICATED = 4,
1: +  USB_STATE_DEFAULT = 5,
1: +  USB_STATE_ADDRESS = 6,
1: +  USB_STATE_CONFIGURED = 7,
1: +  USB_STATE_SUSPENDED = 8,
1:  };
1:  
1:  enum usb_otg_state {
1: -	OTG_STATE_UNDEFINED = 0,
1: -	OTG_STATE_B_IDLE = 1,
1: -	OTG_STATE_B_SRP_INIT = 2,
1: -	OTG_STATE_B_PERIPHERAL = 3,
1: -	OTG_STATE_B_WAIT_ACON = 4,
1: -	OTG_STATE_B_HOST = 5,
1: -	OTG_STATE_A_IDLE = 6,
1: -	OTG_STATE_A_WAIT_VRISE = 7,
1: -	OTG_STATE_A_WAIT_BCON = 8,
1: -	OTG_STATE_A_HOST = 9,
1: -	OTG_STATE_A_SUSPEND = 10,
1: -	OTG_STATE_A_PERIPHERAL = 11,
1: -	OTG_STATE_A_WAIT_VFALL = 12,
1: -	OTG_STATE_A_VBUS_ERR = 13,
1: +  OTG_STATE_UNDEFINED = 0,
1: +  OTG_STATE_B_IDLE = 1,
1: +  OTG_STATE_B_SRP_INIT = 2,
1: +  OTG_STATE_B_PERIPHERAL = 3,
1: +  OTG_STATE_B_WAIT_ACON = 4,
1: +  OTG_STATE_B_HOST = 5,
1: +  OTG_STATE_A_IDLE = 6,
1: +  OTG_STATE_A_WAIT_VRISE = 7,
1: +  OTG_STATE_A_WAIT_BCON = 8,
1: +  OTG_STATE_A_HOST = 9,
1: +  OTG_STATE_A_SUSPEND = 10,
1: +  OTG_STATE_A_PERIPHERAL = 11,
1: +  OTG_STATE_A_WAIT_VFALL = 12,
1: +  OTG_STATE_A_VBUS_ERR = 13,
1:  };
1:  
1:  enum usb_dr_mode {
1: -	USB_DR_MODE_UNKNOWN = 0,
1: -	USB_DR_MODE_HOST = 1,
1: -	USB_DR_MODE_PERIPHERAL = 2,
1: -	USB_DR_MODE_OTG = 3,
1: +  USB_DR_MODE_UNKNOWN = 0,
1: +  USB_DR_MODE_HOST = 1,
1: +  USB_DR_MODE_PERIPHERAL = 2,
1: +  USB_DR_MODE_OTG = 3,
1:  };
1:  
1:  struct usb_device_id {
1: -	__u16 match_flags;
1: -	__u16 idVendor;
1: -	__u16 idProduct;
1: -	__u16 bcdDevice_lo;
1: -	__u16 bcdDevice_hi;
1: -	__u8 bDeviceClass;
1: -	__u8 bDeviceSubClass;
1: -	__u8 bDeviceProtocol;
1: -	__u8 bInterfaceClass;
1: -	__u8 bInterfaceSubClass;
1: -	__u8 bInterfaceProtocol;
1: -	__u8 bInterfaceNumber;
1: -	kernel_ulong_t driver_info;
1: +  __u16 match_flags;
1: +  __u16 idVendor;
1: +  __u16 idProduct;
1: +  __u16 bcdDevice_lo;
1: +  __u16 bcdDevice_hi;
1: +  __u8 bDeviceClass;
1: +  __u8 bDeviceSubClass;
1: +  __u8 bDeviceProtocol;
1: +  __u8 bInterfaceClass;
1: +  __u8 bInterfaceSubClass;
1: +  __u8 bInterfaceProtocol;
1: +  __u8 bInterfaceNumber;
1: +  kernel_ulong_t driver_info;
1:  };
1:  
1:  struct usb_descriptor_header {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1:  };
1:  
1:  struct usb_device_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__le16 bcdUSB;
1: -	__u8 bDeviceClass;
1: -	__u8 bDeviceSubClass;
1: -	__u8 bDeviceProtocol;
1: -	__u8 bMaxPacketSize0;
1: -	__le16 idVendor;
1: -	__le16 idProduct;
1: -	__le16 bcdDevice;
1: -	__u8 iManufacturer;
1: -	__u8 iProduct;
1: -	__u8 iSerialNumber;
1: -	__u8 bNumConfigurations;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __le16 bcdUSB;
1: +  __u8 bDeviceClass;
1: +  __u8 bDeviceSubClass;
1: +  __u8 bDeviceProtocol;
1: +  __u8 bMaxPacketSize0;
1: +  __le16 idVendor;
1: +  __le16 idProduct;
1: +  __le16 bcdDevice;
1: +  __u8 iManufacturer;
1: +  __u8 iProduct;
1: +  __u8 iSerialNumber;
1: +  __u8 bNumConfigurations;
1:  };
1:  
1:  struct usb_config_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__le16 wTotalLength;
1: -	__u8 bNumInterfaces;
1: -	__u8 bConfigurationValue;
1: -	__u8 iConfiguration;
1: -	__u8 bmAttributes;
1: -	__u8 bMaxPower;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __le16 wTotalLength;
1: +  __u8 bNumInterfaces;
1: +  __u8 bConfigurationValue;
1: +  __u8 iConfiguration;
1: +  __u8 bmAttributes;
1: +  __u8 bMaxPower;
1:  } __attribute__((packed));
1:  
1:  struct usb_interface_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bInterfaceNumber;
1: -	__u8 bAlternateSetting;
1: -	__u8 bNumEndpoints;
1: -	__u8 bInterfaceClass;
1: -	__u8 bInterfaceSubClass;
1: -	__u8 bInterfaceProtocol;
1: -	__u8 iInterface;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bInterfaceNumber;
1: +  __u8 bAlternateSetting;
1: +  __u8 bNumEndpoints;
1: +  __u8 bInterfaceClass;
1: +  __u8 bInterfaceSubClass;
1: +  __u8 bInterfaceProtocol;
1: +  __u8 iInterface;
1:  };
1:  
1:  struct usb_endpoint_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bEndpointAddress;
1: -	__u8 bmAttributes;
1: -	__le16 wMaxPacketSize;
1: -	__u8 bInterval;
1: -	__u8 bRefresh;
1: -	__u8 bSynchAddress;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bEndpointAddress;
1: +  __u8 bmAttributes;
1: +  __le16 wMaxPacketSize;
1: +  __u8 bInterval;
1: +  __u8 bRefresh;
1: +  __u8 bSynchAddress;
1:  } __attribute__((packed));
1:  
1:  struct usb_ssp_isoc_ep_comp_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__le16 wReseved;
1: -	__le32 dwBytesPerInterval;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __le16 wReseved;
1: +  __le32 dwBytesPerInterval;
1:  };
1:  
1:  struct usb_ss_ep_comp_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bMaxBurst;
1: -	__u8 bmAttributes;
1: -	__le16 wBytesPerInterval;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bMaxBurst;
1: +  __u8 bmAttributes;
1: +  __le16 wBytesPerInterval;
1:  };
1:  
1:  struct usb_interface_assoc_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bFirstInterface;
1: -	__u8 bInterfaceCount;
1: -	__u8 bFunctionClass;
1: -	__u8 bFunctionSubClass;
1: -	__u8 bFunctionProtocol;
1: -	__u8 iFunction;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bFirstInterface;
1: +  __u8 bInterfaceCount;
1: +  __u8 bFunctionClass;
1: +  __u8 bFunctionSubClass;
1: +  __u8 bFunctionProtocol;
1: +  __u8 iFunction;
1:  };
1:  
1:  struct usb_bos_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__le16 wTotalLength;
1: -	__u8 bNumDeviceCaps;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __le16 wTotalLength;
1: +  __u8 bNumDeviceCaps;
1:  } __attribute__((packed));
1:  
1:  struct usb_ext_cap_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDevCapabilityType;
1: -	__le32 bmAttributes;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDevCapabilityType;
1: +  __le32 bmAttributes;
1:  } __attribute__((packed));
1:  
1:  struct usb_ss_cap_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDevCapabilityType;
1: -	__u8 bmAttributes;
1: -	__le16 wSpeedSupported;
1: -	__u8 bFunctionalitySupport;
1: -	__u8 bU1devExitLat;
1: -	__le16 bU2DevExitLat;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDevCapabilityType;
1: +  __u8 bmAttributes;
1: +  __le16 wSpeedSupported;
1: +  __u8 bFunctionalitySupport;
1: +  __u8 bU1devExitLat;
1: +  __le16 bU2DevExitLat;
1:  };
1:  
1:  struct usb_ss_container_id_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDevCapabilityType;
1: -	__u8 bReserved;
1: -	__u8 ContainerID[16];
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDevCapabilityType;
1: +  __u8 bReserved;
1: +  __u8 ContainerID[16];
1:  };
1:  
1:  struct usb_ssp_cap_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDevCapabilityType;
1: -	__u8 bReserved;
1: -	__le32 bmAttributes;
1: -	__le16 wFunctionalitySupport;
1: -	__le16 wReserved;
1: -	__le32 bmSublinkSpeedAttr[1];
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDevCapabilityType;
1: +  __u8 bReserved;
1: +  __le32 bmAttributes;
1: +  __le16 wFunctionalitySupport;
1: +  __le16 wReserved;
1: +  __le32 bmSublinkSpeedAttr[1];
1:  };
1:  
1:  struct usb_ptm_cap_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDevCapabilityType;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDevCapabilityType;
1:  };
1:  
1:  enum usb3_link_state {
1: -	USB3_LPM_U0 = 0,
1: -	USB3_LPM_U1 = 1,
1: -	USB3_LPM_U2 = 2,
1: -	USB3_LPM_U3 = 3,
1: +  USB3_LPM_U0 = 0,
1: +  USB3_LPM_U1 = 1,
1: +  USB3_LPM_U2 = 2,
1: +  USB3_LPM_U3 = 3,
1:  };
1:  
1:  struct ep_device;
1:  
1:  struct usb_host_endpoint {
1: -	struct usb_endpoint_descriptor desc;
1: -	struct usb_ss_ep_comp_descriptor ss_ep_comp;
1: -	struct usb_ssp_isoc_ep_comp_descriptor ssp_isoc_ep_comp;
1: -	char: 8;
1: -	struct list_head urb_list;
1: -	void *hcpriv;
1: -	struct ep_device *ep_dev;
1: -	unsigned char *extra;
1: -	int extralen;
1: -	int enabled;
1: -	int streams;
1: -	int: 32;
1: +  struct usb_endpoint_descriptor desc;
1: +  struct usb_ss_ep_comp_descriptor ss_ep_comp;
1: +  struct usb_ssp_isoc_ep_comp_descriptor ssp_isoc_ep_comp;
1: +  char : 8;
1: +  struct list_head urb_list;
1: +  void *hcpriv;
1: +  struct ep_device *ep_dev;
1: +  unsigned char *extra;
1: +  int extralen;
1: +  int enabled;
1: +  int streams;
1: +  int : 32;
1:  } __attribute__((packed));
1:  
1:  struct usb_host_interface {
1: -	struct usb_interface_descriptor desc;
1: -	int extralen;
1: -	unsigned char *extra;
1: -	struct usb_host_endpoint *endpoint;
1: -	char *string;
1: +  struct usb_interface_descriptor desc;
1: +  int extralen;
1: +  unsigned char *extra;
1: +  struct usb_host_endpoint *endpoint;
1: +  char *string;
1:  };
1:  
1:  enum usb_interface_condition {
1: -	USB_INTERFACE_UNBOUND = 0,
1: -	USB_INTERFACE_BINDING = 1,
1: -	USB_INTERFACE_BOUND = 2,
1: -	USB_INTERFACE_UNBINDING = 3,
1: +  USB_INTERFACE_UNBOUND = 0,
1: +  USB_INTERFACE_BINDING = 1,
1: +  USB_INTERFACE_BOUND = 2,
1: +  USB_INTERFACE_UNBINDING = 3,
1:  };
1:  
1:  struct usb_interface {
1: -	struct usb_host_interface *altsetting;
1: -	struct usb_host_interface *cur_altsetting;
1: -	unsigned int num_altsetting;
1: -	struct usb_interface_assoc_descriptor *intf_assoc;
1: -	int minor;
1: -	enum usb_interface_condition condition;
1: -	unsigned int sysfs_files_created: 1;
1: -	unsigned int ep_devs_created: 1;
1: -	unsigned int unregistering: 1;
1: -	unsigned int needs_remote_wakeup: 1;
1: -	unsigned int needs_altsetting0: 1;
1: -	unsigned int needs_binding: 1;
1: -	unsigned int resetting_device: 1;
1: -	unsigned int authorized: 1;
1: -	struct device dev;
1: -	struct device *usb_dev;
1: -	struct work_struct reset_ws;
1: +  struct usb_host_interface *altsetting;
1: +  struct usb_host_interface *cur_altsetting;
1: +  unsigned int num_altsetting;
1: +  struct usb_interface_assoc_descriptor *intf_assoc;
1: +  int minor;
1: +  enum usb_interface_condition condition;
1: +  unsigned int sysfs_files_created : 1;
1: +  unsigned int ep_devs_created : 1;
1: +  unsigned int unregistering : 1;
1: +  unsigned int needs_remote_wakeup : 1;
1: +  unsigned int needs_altsetting0 : 1;
1: +  unsigned int needs_binding : 1;
1: +  unsigned int resetting_device : 1;
1: +  unsigned int authorized : 1;
1: +  struct device dev;
1: +  struct device *usb_dev;
1: +  struct work_struct reset_ws;
1:  };
1:  
1:  struct usb_interface_cache {
1: -	unsigned int num_altsetting;
1: -	struct kref ref;
1: -	struct usb_host_interface altsetting[0];
1: +  unsigned int num_altsetting;
1: +  struct kref ref;
1: +  struct usb_host_interface altsetting[0];
1:  };
1:  
1:  struct usb_host_config {
1: -	struct usb_config_descriptor desc;
1: -	char *string;
1: -	struct usb_interface_assoc_descriptor *intf_assoc[16];
1: -	struct usb_interface *interface[32];
1: -	struct usb_interface_cache *intf_cache[32];
1: -	unsigned char *extra;
1: -	int extralen;
1: +  struct usb_config_descriptor desc;
1: +  char *string;
1: +  struct usb_interface_assoc_descriptor *intf_assoc[16];
1: +  struct usb_interface *interface[32];
1: +  struct usb_interface_cache *intf_cache[32];
1: +  unsigned char *extra;
1: +  int extralen;
1:  };
1:  
1:  struct usb_host_bos {
1: -	struct usb_bos_descriptor *desc;
1: -	struct usb_ext_cap_descriptor *ext_cap;
1: -	struct usb_ss_cap_descriptor *ss_cap;
1: -	struct usb_ssp_cap_descriptor *ssp_cap;
1: -	struct usb_ss_container_id_descriptor *ss_id;
1: -	struct usb_ptm_cap_descriptor *ptm_cap;
1: +  struct usb_bos_descriptor *desc;
1: +  struct usb_ext_cap_descriptor *ext_cap;
1: +  struct usb_ss_cap_descriptor *ss_cap;
1: +  struct usb_ssp_cap_descriptor *ssp_cap;
1: +  struct usb_ss_container_id_descriptor *ss_id;
1: +  struct usb_ptm_cap_descriptor *ptm_cap;
1:  };
1:  
1:  struct usb_devmap {
1: -	long unsigned int devicemap[2];
1: +  long unsigned int devicemap[2];
1:  };
1:  
1:  struct usb_device;
1: @@ -106508,189 +107687,189 @@ struct usb_device;
1:  struct mon_bus;
1:  
1:  struct usb_bus {
1: -	struct device *controller;
1: -	struct device *sysdev;
1: -	int busnum;
1: -	const char *bus_name;
1: -	u8 uses_pio_for_control;
1: -	u8 otg_port;
1: -	unsigned int is_b_host: 1;
1: -	unsigned int b_hnp_enable: 1;
1: -	unsigned int no_stop_on_short: 1;
1: -	unsigned int no_sg_constraint: 1;
1: -	unsigned int sg_tablesize;
1: -	int devnum_next;
1: -	struct mutex devnum_next_mutex;
1: -	struct usb_devmap devmap;
1: -	struct usb_device *root_hub;
1: -	struct usb_bus *hs_companion;
1: -	int bandwidth_allocated;
1: -	int bandwidth_int_reqs;
1: -	int bandwidth_isoc_reqs;
1: -	unsigned int resuming_ports;
1: -	struct mon_bus *mon_bus;
1: -	int monitored;
1: +  struct device *controller;
1: +  struct device *sysdev;
1: +  int busnum;
1: +  const char *bus_name;
1: +  u8 uses_pio_for_control;
1: +  u8 otg_port;
1: +  unsigned int is_b_host : 1;
1: +  unsigned int b_hnp_enable : 1;
1: +  unsigned int no_stop_on_short : 1;
1: +  unsigned int no_sg_constraint : 1;
1: +  unsigned int sg_tablesize;
1: +  int devnum_next;
1: +  struct mutex devnum_next_mutex;
1: +  struct usb_devmap devmap;
1: +  struct usb_device *root_hub;
1: +  struct usb_bus *hs_companion;
1: +  int bandwidth_allocated;
1: +  int bandwidth_int_reqs;
1: +  int bandwidth_isoc_reqs;
1: +  unsigned int resuming_ports;
1: +  struct mon_bus *mon_bus;
1: +  int monitored;
1:  };
1:  
1:  struct wusb_dev;
1:  
1:  enum usb_device_removable {
1: -	USB_DEVICE_REMOVABLE_UNKNOWN = 0,
1: -	USB_DEVICE_REMOVABLE = 1,
1: -	USB_DEVICE_FIXED = 2,
1: +  USB_DEVICE_REMOVABLE_UNKNOWN = 0,
1: +  USB_DEVICE_REMOVABLE = 1,
1: +  USB_DEVICE_FIXED = 2,
1:  };
1:  
1:  struct usb2_lpm_parameters {
1: -	unsigned int besl;
1: -	int timeout;
1: +  unsigned int besl;
1: +  int timeout;
1:  };
1:  
1:  struct usb3_lpm_parameters {
1: -	unsigned int mel;
1: -	unsigned int pel;
1: -	unsigned int sel;
1: -	int timeout;
1: +  unsigned int mel;
1: +  unsigned int pel;
1: +  unsigned int sel;
1: +  int timeout;
1:  };
1:  
1:  struct usb_tt;
1:  
1:  struct usb_device {
1: -	int devnum;
1: -	char devpath[16];
1: -	u32 route;
1: -	enum usb_device_state state;
1: -	enum usb_device_speed speed;
1: -	unsigned int rx_lanes;
1: -	unsigned int tx_lanes;
1: -	struct usb_tt *tt;
1: -	int ttport;
1: -	unsigned int toggle[2];
1: -	struct usb_device *parent;
1: -	struct usb_bus *bus;
1: -	struct usb_host_endpoint ep0;
1: -	struct device dev;
1: -	struct usb_device_descriptor descriptor;
1: -	struct usb_host_bos *bos;
1: -	struct usb_host_config *config;
1: -	struct usb_host_config *actconfig;
1: -	struct usb_host_endpoint *ep_in[16];
1: -	struct usb_host_endpoint *ep_out[16];
1: -	char **rawdescriptors;
1: -	short unsigned int bus_mA;
1: -	u8 portnum;
1: -	u8 level;
1: -	u8 devaddr;
1: -	unsigned int can_submit: 1;
1: -	unsigned int persist_enabled: 1;
1: -	unsigned int have_langid: 1;
1: -	unsigned int authorized: 1;
1: -	unsigned int authenticated: 1;
1: -	unsigned int wusb: 1;
1: -	unsigned int lpm_capable: 1;
1: -	unsigned int usb2_hw_lpm_capable: 1;
1: -	unsigned int usb2_hw_lpm_besl_capable: 1;
1: -	unsigned int usb2_hw_lpm_enabled: 1;
1: -	unsigned int usb2_hw_lpm_allowed: 1;
1: -	unsigned int usb3_lpm_u1_enabled: 1;
1: -	unsigned int usb3_lpm_u2_enabled: 1;
1: -	int string_langid;
1: -	char *product;
1: -	char *manufacturer;
1: -	char *serial;
1: -	struct list_head filelist;
1: -	int maxchild;
1: -	u32 quirks;
1: -	atomic_t urbnum;
1: -	long unsigned int active_duration;
1: -	long unsigned int connect_time;
1: -	unsigned int do_remote_wakeup: 1;
1: -	unsigned int reset_resume: 1;
1: -	unsigned int port_is_suspended: 1;
1: -	struct wusb_dev *wusb_dev;
1: -	int slot_id;
1: -	enum usb_device_removable removable;
1: -	struct usb2_lpm_parameters l1_params;
1: -	struct usb3_lpm_parameters u1_params;
1: -	struct usb3_lpm_parameters u2_params;
1: -	unsigned int lpm_disable_count;
1: -	u16 hub_delay;
1: -	unsigned int use_generic_driver: 1;
1: +  int devnum;
1: +  char devpath[16];
1: +  u32 route;
1: +  enum usb_device_state state;
1: +  enum usb_device_speed speed;
1: +  unsigned int rx_lanes;
1: +  unsigned int tx_lanes;
1: +  struct usb_tt *tt;
1: +  int ttport;
1: +  unsigned int toggle[2];
1: +  struct usb_device *parent;
1: +  struct usb_bus *bus;
1: +  struct usb_host_endpoint ep0;
1: +  struct device dev;
1: +  struct usb_device_descriptor descriptor;
1: +  struct usb_host_bos *bos;
1: +  struct usb_host_config *config;
1: +  struct usb_host_config *actconfig;
1: +  struct usb_host_endpoint *ep_in[16];
1: +  struct usb_host_endpoint *ep_out[16];
1: +  char **rawdescriptors;
1: +  short unsigned int bus_mA;
1: +  u8 portnum;
1: +  u8 level;
1: +  u8 devaddr;
1: +  unsigned int can_submit : 1;
1: +  unsigned int persist_enabled : 1;
1: +  unsigned int have_langid : 1;
1: +  unsigned int authorized : 1;
1: +  unsigned int authenticated : 1;
1: +  unsigned int wusb : 1;
1: +  unsigned int lpm_capable : 1;
1: +  unsigned int usb2_hw_lpm_capable : 1;
1: +  unsigned int usb2_hw_lpm_besl_capable : 1;
1: +  unsigned int usb2_hw_lpm_enabled : 1;
1: +  unsigned int usb2_hw_lpm_allowed : 1;
1: +  unsigned int usb3_lpm_u1_enabled : 1;
1: +  unsigned int usb3_lpm_u2_enabled : 1;
1: +  int string_langid;
1: +  char *product;
1: +  char *manufacturer;
1: +  char *serial;
1: +  struct list_head filelist;
1: +  int maxchild;
1: +  u32 quirks;
1: +  atomic_t urbnum;
1: +  long unsigned int active_duration;
1: +  long unsigned int connect_time;
1: +  unsigned int do_remote_wakeup : 1;
1: +  unsigned int reset_resume : 1;
1: +  unsigned int port_is_suspended : 1;
1: +  struct wusb_dev *wusb_dev;
1: +  int slot_id;
1: +  enum usb_device_removable removable;
1: +  struct usb2_lpm_parameters l1_params;
1: +  struct usb3_lpm_parameters u1_params;
1: +  struct usb3_lpm_parameters u2_params;
1: +  unsigned int lpm_disable_count;
1: +  u16 hub_delay;
1: +  unsigned int use_generic_driver : 1;
1:  };
1:  
1:  enum usb_port_connect_type {
1: -	USB_PORT_CONNECT_TYPE_UNKNOWN = 0,
1: -	USB_PORT_CONNECT_TYPE_HOT_PLUG = 1,
1: -	USB_PORT_CONNECT_TYPE_HARD_WIRED = 2,
1: -	USB_PORT_NOT_USED = 3,
1: +  USB_PORT_CONNECT_TYPE_UNKNOWN = 0,
1: +  USB_PORT_CONNECT_TYPE_HOT_PLUG = 1,
1: +  USB_PORT_CONNECT_TYPE_HARD_WIRED = 2,
1: +  USB_PORT_NOT_USED = 3,
1:  };
1:  
1:  struct usb_tt {
1: -	struct usb_device *hub;
1: -	int multi;
1: -	unsigned int think_time;
1: -	void *hcpriv;
1: -	spinlock_t lock;
1: -	struct list_head clear_list;
1: -	struct work_struct clear_work;
1: +  struct usb_device *hub;
1: +  int multi;
1: +  unsigned int think_time;
1: +  void *hcpriv;
1: +  spinlock_t lock;
1: +  struct list_head clear_list;
1: +  struct work_struct clear_work;
1:  };
1:  
1:  struct usb_dynids {
1: -	spinlock_t lock;
1: -	struct list_head list;
1: +  spinlock_t lock;
1: +  struct list_head list;
1:  };
1:  
1:  struct usbdrv_wrap {
1: -	struct device_driver driver;
1: -	int for_devices;
1: +  struct device_driver driver;
1: +  int for_devices;
1:  };
1:  
1:  struct usb_driver {
1: -	const char *name;
1: -	int (*probe)(struct usb_interface *, const struct usb_device_id *);
1: -	void (*disconnect)(struct usb_interface *);
1: -	int (*unlocked_ioctl)(struct usb_interface *, unsigned int, void *);
1: -	int (*suspend)(struct usb_interface *, pm_message_t);
1: -	int (*resume)(struct usb_interface *);
1: -	int (*reset_resume)(struct usb_interface *);
1: -	int (*pre_reset)(struct usb_interface *);
1: -	int (*post_reset)(struct usb_interface *);
1: -	const struct usb_device_id *id_table;
1: -	const struct attribute_group **dev_groups;
1: -	struct usb_dynids dynids;
1: -	struct usbdrv_wrap drvwrap;
1: -	unsigned int no_dynamic_id: 1;
1: -	unsigned int supports_autosuspend: 1;
1: -	unsigned int disable_hub_initiated_lpm: 1;
1: -	unsigned int soft_unbind: 1;
1: +  const char *name;
1: +  int (*probe)(struct usb_interface *, const struct usb_device_id *);
1: +  void (*disconnect)(struct usb_interface *);
1: +  int (*unlocked_ioctl)(struct usb_interface *, unsigned int, void *);
1: +  int (*suspend)(struct usb_interface *, pm_message_t);
1: +  int (*resume)(struct usb_interface *);
1: +  int (*reset_resume)(struct usb_interface *);
1: +  int (*pre_reset)(struct usb_interface *);
1: +  int (*post_reset)(struct usb_interface *);
1: +  const struct usb_device_id *id_table;
1: +  const struct attribute_group **dev_groups;
1: +  struct usb_dynids dynids;
1: +  struct usbdrv_wrap drvwrap;
1: +  unsigned int no_dynamic_id : 1;
1: +  unsigned int supports_autosuspend : 1;
1: +  unsigned int disable_hub_initiated_lpm : 1;
1: +  unsigned int soft_unbind : 1;
1:  };
1:  
1:  struct usb_device_driver {
1: -	const char *name;
1: -	bool (*match)(struct usb_device *);
1: -	int (*probe)(struct usb_device *);
1: -	void (*disconnect)(struct usb_device *);
1: -	int (*suspend)(struct usb_device *, pm_message_t);
1: -	int (*resume)(struct usb_device *, pm_message_t);
1: -	const struct attribute_group **dev_groups;
1: -	struct usbdrv_wrap drvwrap;
1: -	const struct usb_device_id *id_table;
1: -	unsigned int supports_autosuspend: 1;
1: -	unsigned int generic_subclass: 1;
1: +  const char *name;
1: +  bool (*match)(struct usb_device *);
1: +  int (*probe)(struct usb_device *);
1: +  void (*disconnect)(struct usb_device *);
1: +  int (*suspend)(struct usb_device *, pm_message_t);
1: +  int (*resume)(struct usb_device *, pm_message_t);
1: +  const struct attribute_group **dev_groups;
1: +  struct usbdrv_wrap drvwrap;
1: +  const struct usb_device_id *id_table;
1: +  unsigned int supports_autosuspend : 1;
1: +  unsigned int generic_subclass : 1;
1:  };
1:  
1:  struct usb_iso_packet_descriptor {
1: -	unsigned int offset;
1: -	unsigned int length;
1: -	unsigned int actual_length;
1: -	int status;
1: +  unsigned int offset;
1: +  unsigned int length;
1: +  unsigned int actual_length;
1: +  int status;
1:  };
1:  
1:  struct usb_anchor {
1: -	struct list_head urb_list;
1: -	wait_queue_head_t wait;
1: -	spinlock_t lock;
1: -	atomic_t suspend_wakeups;
1: -	unsigned int poisoned: 1;
1: +  struct list_head urb_list;
1: +  wait_queue_head_t wait;
1: +  spinlock_t lock;
1: +  atomic_t suspend_wakeups;
1: +  unsigned int poisoned : 1;
1:  };
1:  
1:  struct urb;
1: @@ -106698,50 +107877,50 @@ struct urb;
1:  typedef void (*usb_complete_t)(struct urb *);
1:  
1:  struct urb {
1: -	struct kref kref;
1: -	int unlinked;
1: -	void *hcpriv;
1: -	atomic_t use_count;
1: -	atomic_t reject;
1: -	struct list_head urb_list;
1: -	struct list_head anchor_list;
1: -	struct usb_anchor *anchor;
1: -	struct usb_device *dev;
1: -	struct usb_host_endpoint *ep;
1: -	unsigned int pipe;
1: -	unsigned int stream_id;
1: -	int status;
1: -	unsigned int transfer_flags;
1: -	void *transfer_buffer;
1: -	dma_addr_t transfer_dma;
1: -	struct scatterlist *sg;
1: -	int num_mapped_sgs;
1: -	int num_sgs;
1: -	u32 transfer_buffer_length;
1: -	u32 actual_length;
1: -	unsigned char *setup_packet;
1: -	dma_addr_t setup_dma;
1: -	int start_frame;
1: -	int number_of_packets;
1: -	int interval;
1: -	int error_count;
1: -	void *context;
1: -	usb_complete_t complete;
1: -	struct usb_iso_packet_descriptor iso_frame_desc[0];
1: +  struct kref kref;
1: +  int unlinked;
1: +  void *hcpriv;
1: +  atomic_t use_count;
1: +  atomic_t reject;
1: +  struct list_head urb_list;
1: +  struct list_head anchor_list;
1: +  struct usb_anchor *anchor;
1: +  struct usb_device *dev;
1: +  struct usb_host_endpoint *ep;
1: +  unsigned int pipe;
1: +  unsigned int stream_id;
1: +  int status;
1: +  unsigned int transfer_flags;
1: +  void *transfer_buffer;
1: +  dma_addr_t transfer_dma;
1: +  struct scatterlist *sg;
1: +  int num_mapped_sgs;
1: +  int num_sgs;
1: +  u32 transfer_buffer_length;
1: +  u32 actual_length;
1: +  unsigned char *setup_packet;
1: +  dma_addr_t setup_dma;
1: +  int start_frame;
1: +  int number_of_packets;
1: +  int interval;
1: +  int error_count;
1: +  void *context;
1: +  usb_complete_t complete;
1: +  struct usb_iso_packet_descriptor iso_frame_desc[0];
1:  };
1:  
1:  struct giveback_urb_bh {
1: -	bool running;
1: -	spinlock_t lock;
1: -	struct list_head head;
1: -	struct tasklet_struct bh;
1: -	struct usb_host_endpoint *completing_ep;
1: +  bool running;
1: +  spinlock_t lock;
1: +  struct list_head head;
1: +  struct tasklet_struct bh;
1: +  struct usb_host_endpoint *completing_ep;
1:  };
1:  
1:  enum usb_dev_authorize_policy {
1: -	USB_DEVICE_AUTHORIZE_NONE = 0,
1: -	USB_DEVICE_AUTHORIZE_ALL = 1,
1: -	USB_DEVICE_AUTHORIZE_INTERNAL = 2,
1: +  USB_DEVICE_AUTHORIZE_NONE = 0,
1: +  USB_DEVICE_AUTHORIZE_ALL = 1,
1: +  USB_DEVICE_AUTHORIZE_INTERNAL = 2,
1:  };
1:  
1:  struct usb_phy_roothub;
1: @@ -106751,136 +107930,145 @@ struct hc_driver;
1:  struct usb_phy;
1:  
1:  struct usb_hcd {
1: -	struct usb_bus self;
1: -	struct kref kref;
1: -	const char *product_desc;
1: -	int speed;
1: -	char irq_descr[24];
1: -	struct timer_list rh_timer;
1: -	struct urb *status_urb;
1: -	struct work_struct wakeup_work;
1: -	struct work_struct died_work;
1: -	const struct hc_driver *driver;
1: -	struct usb_phy *usb_phy;
1: -	struct usb_phy_roothub *phy_roothub;
1: -	long unsigned int flags;
1: -	enum usb_dev_authorize_policy dev_policy;
1: -	unsigned int rh_registered: 1;
1: -	unsigned int rh_pollable: 1;
1: -	unsigned int msix_enabled: 1;
1: -	unsigned int msi_enabled: 1;
1: -	unsigned int skip_phy_initialization: 1;
1: -	unsigned int uses_new_polling: 1;
1: -	unsigned int wireless: 1;
1: -	unsigned int has_tt: 1;
1: -	unsigned int amd_resume_bug: 1;
1: -	unsigned int can_do_streams: 1;
1: -	unsigned int tpl_support: 1;
1: -	unsigned int cant_recv_wakeups: 1;
1: -	unsigned int irq;
1: -	void *regs;
1: -	resource_size_t rsrc_start;
1: -	resource_size_t rsrc_len;
1: -	unsigned int power_budget;
1: -	struct giveback_urb_bh high_prio_bh;
1: -	struct giveback_urb_bh low_prio_bh;
1: -	struct mutex *address0_mutex;
1: -	struct mutex *bandwidth_mutex;
1: -	struct usb_hcd *shared_hcd;
1: -	struct usb_hcd *primary_hcd;
1: -	struct dma_pool___2 *pool[4];
1: -	int state;
1: -	struct gen_pool *localmem_pool;
1: -	long unsigned int hcd_priv[0];
1: +  struct usb_bus self;
1: +  struct kref kref;
1: +  const char *product_desc;
1: +  int speed;
1: +  char irq_descr[24];
1: +  struct timer_list rh_timer;
1: +  struct urb *status_urb;
1: +  struct work_struct wakeup_work;
1: +  struct work_struct died_work;
1: +  const struct hc_driver *driver;
1: +  struct usb_phy *usb_phy;
1: +  struct usb_phy_roothub *phy_roothub;
1: +  long unsigned int flags;
1: +  enum usb_dev_authorize_policy dev_policy;
1: +  unsigned int rh_registered : 1;
1: +  unsigned int rh_pollable : 1;
1: +  unsigned int msix_enabled : 1;
1: +  unsigned int msi_enabled : 1;
1: +  unsigned int skip_phy_initialization : 1;
1: +  unsigned int uses_new_polling : 1;
1: +  unsigned int wireless : 1;
1: +  unsigned int has_tt : 1;
1: +  unsigned int amd_resume_bug : 1;
1: +  unsigned int can_do_streams : 1;
1: +  unsigned int tpl_support : 1;
1: +  unsigned int cant_recv_wakeups : 1;
1: +  unsigned int irq;
1: +  void *regs;
1: +  resource_size_t rsrc_start;
1: +  resource_size_t rsrc_len;
1: +  unsigned int power_budget;
1: +  struct giveback_urb_bh high_prio_bh;
1: +  struct giveback_urb_bh low_prio_bh;
1: +  struct mutex *address0_mutex;
1: +  struct mutex *bandwidth_mutex;
1: +  struct usb_hcd *shared_hcd;
1: +  struct usb_hcd *primary_hcd;
1: +  struct dma_pool___2 *pool[4];
1: +  int state;
1: +  struct gen_pool *localmem_pool;
1: +  long unsigned int hcd_priv[0];
1:  };
1:  
1:  struct hc_driver {
1: -	const char *description;
1: -	const char *product_desc;
1: -	size_t hcd_priv_size;
1: -	irqreturn_t (*irq)(struct usb_hcd *);
1: -	int flags;
1: -	int (*reset)(struct usb_hcd *);
1: -	int (*start)(struct usb_hcd *);
1: -	int (*pci_suspend)(struct usb_hcd *, bool);
1: -	int (*pci_resume)(struct usb_hcd *, bool);
1: -	void (*stop)(struct usb_hcd *);
1: -	void (*shutdown)(struct usb_hcd *);
1: -	int (*get_frame_number)(struct usb_hcd *);
1: -	int (*urb_enqueue)(struct usb_hcd *, struct urb *, gfp_t);
1: -	int (*urb_dequeue)(struct usb_hcd *, struct urb *, int);
1: -	int (*map_urb_for_dma)(struct usb_hcd *, struct urb *, gfp_t);
1: -	void (*unmap_urb_for_dma)(struct usb_hcd *, struct urb *);
1: -	void (*endpoint_disable)(struct usb_hcd *, struct usb_host_endpoint *);
1: -	void (*endpoint_reset)(struct usb_hcd *, struct usb_host_endpoint *);
1: -	int (*hub_status_data)(struct usb_hcd *, char *);
1: -	int (*hub_control)(struct usb_hcd *, u16, u16, u16, char *, u16);
1: -	int (*bus_suspend)(struct usb_hcd *);
1: -	int (*bus_resume)(struct usb_hcd *);
1: -	int (*start_port_reset)(struct usb_hcd *, unsigned int);
1: -	long unsigned int (*get_resuming_ports)(struct usb_hcd *);
1: -	void (*relinquish_port)(struct usb_hcd *, int);
1: -	int (*port_handed_over)(struct usb_hcd *, int);
1: -	void (*clear_tt_buffer_complete)(struct usb_hcd *, struct usb_host_endpoint *);
1: -	int (*alloc_dev)(struct usb_hcd *, struct usb_device *);
1: -	void (*free_dev)(struct usb_hcd *, struct usb_device *);
1: -	int (*alloc_streams)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint **, unsigned int, unsigned int, gfp_t);
1: -	int (*free_streams)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint **, unsigned int, gfp_t);
1: -	int (*add_endpoint)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint *);
1: -	int (*drop_endpoint)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint *);
1: -	int (*check_bandwidth)(struct usb_hcd *, struct usb_device *);
1: -	void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
1: -	int (*address_device)(struct usb_hcd *, struct usb_device *);
1: -	int (*enable_device)(struct usb_hcd *, struct usb_device *);
1: -	int (*update_hub_device)(struct usb_hcd *, struct usb_device *, struct usb_tt *, gfp_t);
1: -	int (*reset_device)(struct usb_hcd *, struct usb_device *);
1: -	int (*update_device)(struct usb_hcd *, struct usb_device *);
1: -	int (*set_usb2_hw_lpm)(struct usb_hcd *, struct usb_device *, int);
1: -	int (*enable_usb3_lpm_timeout)(struct usb_hcd *, struct usb_device *, enum usb3_link_state);
1: -	int (*disable_usb3_lpm_timeout)(struct usb_hcd *, struct usb_device *, enum usb3_link_state);
1: -	int (*find_raw_port_number)(struct usb_hcd *, int);
1: -	int (*port_power)(struct usb_hcd *, int, bool);
1: +  const char *description;
1: +  const char *product_desc;
1: +  size_t hcd_priv_size;
1: +  irqreturn_t (*irq)(struct usb_hcd *);
1: +  int flags;
1: +  int (*reset)(struct usb_hcd *);
1: +  int (*start)(struct usb_hcd *);
1: +  int (*pci_suspend)(struct usb_hcd *, bool);
1: +  int (*pci_resume)(struct usb_hcd *, bool);
1: +  void (*stop)(struct usb_hcd *);
1: +  void (*shutdown)(struct usb_hcd *);
1: +  int (*get_frame_number)(struct usb_hcd *);
1: +  int (*urb_enqueue)(struct usb_hcd *, struct urb *, gfp_t);
1: +  int (*urb_dequeue)(struct usb_hcd *, struct urb *, int);
1: +  int (*map_urb_for_dma)(struct usb_hcd *, struct urb *, gfp_t);
1: +  void (*unmap_urb_for_dma)(struct usb_hcd *, struct urb *);
1: +  void (*endpoint_disable)(struct usb_hcd *, struct usb_host_endpoint *);
1: +  void (*endpoint_reset)(struct usb_hcd *, struct usb_host_endpoint *);
1: +  int (*hub_status_data)(struct usb_hcd *, char *);
1: +  int (*hub_control)(struct usb_hcd *, u16, u16, u16, char *, u16);
1: +  int (*bus_suspend)(struct usb_hcd *);
1: +  int (*bus_resume)(struct usb_hcd *);
1: +  int (*start_port_reset)(struct usb_hcd *, unsigned int);
1: +  long unsigned int (*get_resuming_ports)(struct usb_hcd *);
1: +  void (*relinquish_port)(struct usb_hcd *, int);
1: +  int (*port_handed_over)(struct usb_hcd *, int);
1: +  void (*clear_tt_buffer_complete)(struct usb_hcd *,
1: +                                   struct usb_host_endpoint *);
1: +  int (*alloc_dev)(struct usb_hcd *, struct usb_device *);
1: +  void (*free_dev)(struct usb_hcd *, struct usb_device *);
1: +  int (*alloc_streams)(struct usb_hcd *, struct usb_device *,
1: +                       struct usb_host_endpoint **, unsigned int, unsigned int,
1: +                       gfp_t);
1: +  int (*free_streams)(struct usb_hcd *, struct usb_device *,
1: +                      struct usb_host_endpoint **, unsigned int, gfp_t);
1: +  int (*add_endpoint)(struct usb_hcd *, struct usb_device *,
1: +                      struct usb_host_endpoint *);
1: +  int (*drop_endpoint)(struct usb_hcd *, struct usb_device *,
1: +                       struct usb_host_endpoint *);
1: +  int (*check_bandwidth)(struct usb_hcd *, struct usb_device *);
1: +  void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
1: +  int (*address_device)(struct usb_hcd *, struct usb_device *);
1: +  int (*enable_device)(struct usb_hcd *, struct usb_device *);
1: +  int (*update_hub_device)(struct usb_hcd *, struct usb_device *,
1: +                           struct usb_tt *, gfp_t);
1: +  int (*reset_device)(struct usb_hcd *, struct usb_device *);
1: +  int (*update_device)(struct usb_hcd *, struct usb_device *);
1: +  int (*set_usb2_hw_lpm)(struct usb_hcd *, struct usb_device *, int);
1: +  int (*enable_usb3_lpm_timeout)(struct usb_hcd *, struct usb_device *,
1: +                                 enum usb3_link_state);
1: +  int (*disable_usb3_lpm_timeout)(struct usb_hcd *, struct usb_device *,
1: +                                  enum usb3_link_state);
1: +  int (*find_raw_port_number)(struct usb_hcd *, int);
1: +  int (*port_power)(struct usb_hcd *, int, bool);
1:  };
1:  
1:  enum usb_phy_type {
1: -	USB_PHY_TYPE_UNDEFINED = 0,
1: -	USB_PHY_TYPE_USB2 = 1,
1: -	USB_PHY_TYPE_USB3 = 2,
1: +  USB_PHY_TYPE_UNDEFINED = 0,
1: +  USB_PHY_TYPE_USB2 = 1,
1: +  USB_PHY_TYPE_USB3 = 2,
1:  };
1:  
1:  enum usb_phy_events {
1: -	USB_EVENT_NONE = 0,
1: -	USB_EVENT_VBUS = 1,
1: -	USB_EVENT_ID = 2,
1: -	USB_EVENT_CHARGER = 3,
1: -	USB_EVENT_ENUMERATED = 4,
1: +  USB_EVENT_NONE = 0,
1: +  USB_EVENT_VBUS = 1,
1: +  USB_EVENT_ID = 2,
1: +  USB_EVENT_CHARGER = 3,
1: +  USB_EVENT_ENUMERATED = 4,
1:  };
1:  
1:  struct extcon_dev;
1:  
1:  enum usb_charger_type {
1: -	UNKNOWN_TYPE = 0,
1: -	SDP_TYPE = 1,
1: -	DCP_TYPE = 2,
1: -	CDP_TYPE = 3,
1: -	ACA_TYPE = 4,
1: +  UNKNOWN_TYPE = 0,
1: +  SDP_TYPE = 1,
1: +  DCP_TYPE = 2,
1: +  CDP_TYPE = 3,
1: +  ACA_TYPE = 4,
1:  };
1:  
1:  enum usb_charger_state {
1: -	USB_CHARGER_DEFAULT = 0,
1: -	USB_CHARGER_PRESENT = 1,
1: -	USB_CHARGER_ABSENT = 2,
1: +  USB_CHARGER_DEFAULT = 0,
1: +  USB_CHARGER_PRESENT = 1,
1: +  USB_CHARGER_ABSENT = 2,
1:  };
1:  
1:  struct usb_charger_current {
1: -	unsigned int sdp_min;
1: -	unsigned int sdp_max;
1: -	unsigned int dcp_min;
1: -	unsigned int dcp_max;
1: -	unsigned int cdp_min;
1: -	unsigned int cdp_max;
1: -	unsigned int aca_min;
1: -	unsigned int aca_max;
1: +  unsigned int sdp_min;
1: +  unsigned int sdp_max;
1: +  unsigned int dcp_min;
1: +  unsigned int dcp_max;
1: +  unsigned int cdp_min;
1: +  unsigned int cdp_max;
1: +  unsigned int aca_min;
1: +  unsigned int aca_max;
1:  };
1:  
1:  struct usb_otg;
1: @@ -106888,89 +108076,89 @@ struct usb_otg;
1:  struct usb_phy_io_ops;
1:  
1:  struct usb_phy {
1: -	struct device *dev;
1: -	const char *label;
1: -	unsigned int flags;
1: -	enum usb_phy_type type;
1: -	enum usb_phy_events last_event;
1: -	struct usb_otg *otg;
1: -	struct device *io_dev;
1: -	struct usb_phy_io_ops *io_ops;
1: -	void *io_priv;
1: -	struct extcon_dev *edev;
1: -	struct extcon_dev *id_edev;
1: -	struct notifier_block vbus_nb;
1: -	struct notifier_block id_nb;
1: -	struct notifier_block type_nb;
1: -	enum usb_charger_type chg_type;
1: -	enum usb_charger_state chg_state;
1: -	struct usb_charger_current chg_cur;
1: -	struct work_struct chg_work;
1: -	struct atomic_notifier_head notifier;
1: -	u16 port_status;
1: -	u16 port_change;
1: -	struct list_head head;
1: -	int (*init)(struct usb_phy *);
1: -	void (*shutdown)(struct usb_phy *);
1: -	int (*set_vbus)(struct usb_phy *, int);
1: -	int (*set_power)(struct usb_phy *, unsigned int);
1: -	int (*set_suspend)(struct usb_phy *, int);
1: -	int (*set_wakeup)(struct usb_phy *, bool);
1: -	int (*notify_connect)(struct usb_phy *, enum usb_device_speed);
1: -	int (*notify_disconnect)(struct usb_phy *, enum usb_device_speed);
1: -	enum usb_charger_type (*charger_detect)(struct usb_phy *);
1: +  struct device *dev;
1: +  const char *label;
1: +  unsigned int flags;
1: +  enum usb_phy_type type;
1: +  enum usb_phy_events last_event;
1: +  struct usb_otg *otg;
1: +  struct device *io_dev;
1: +  struct usb_phy_io_ops *io_ops;
1: +  void *io_priv;
1: +  struct extcon_dev *edev;
1: +  struct extcon_dev *id_edev;
1: +  struct notifier_block vbus_nb;
1: +  struct notifier_block id_nb;
1: +  struct notifier_block type_nb;
1: +  enum usb_charger_type chg_type;
1: +  enum usb_charger_state chg_state;
1: +  struct usb_charger_current chg_cur;
1: +  struct work_struct chg_work;
1: +  struct atomic_notifier_head notifier;
1: +  u16 port_status;
1: +  u16 port_change;
1: +  struct list_head head;
1: +  int (*init)(struct usb_phy *);
1: +  void (*shutdown)(struct usb_phy *);
1: +  int (*set_vbus)(struct usb_phy *, int);
1: +  int (*set_power)(struct usb_phy *, unsigned int);
1: +  int (*set_suspend)(struct usb_phy *, int);
1: +  int (*set_wakeup)(struct usb_phy *, bool);
1: +  int (*notify_connect)(struct usb_phy *, enum usb_device_speed);
1: +  int (*notify_disconnect)(struct usb_phy *, enum usb_device_speed);
1: +  enum usb_charger_type (*charger_detect)(struct usb_phy *);
1:  };
1:  
1:  struct usb_port_status {
1: -	__le16 wPortStatus;
1: -	__le16 wPortChange;
1: -	__le32 dwExtPortStatus;
1: +  __le16 wPortStatus;
1: +  __le16 wPortChange;
1: +  __le32 dwExtPortStatus;
1:  };
1:  
1:  struct usb_hub_status {
1: -	__le16 wHubStatus;
1: -	__le16 wHubChange;
1: +  __le16 wHubStatus;
1: +  __le16 wHubChange;
1:  };
1:  
1:  struct usb_hub_descriptor {
1: -	__u8 bDescLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bNbrPorts;
1: -	__le16 wHubCharacteristics;
1: -	__u8 bPwrOn2PwrGood;
1: -	__u8 bHubContrCurrent;
1: -	union {
1: -		struct {
1: -			__u8 DeviceRemovable[4];
1: -			__u8 PortPwrCtrlMask[4];
1: -		} hs;
1: -		struct {
1: -			__u8 bHubHdrDecLat;
1: -			__le16 wHubDelay;
1: -			__le16 DeviceRemovable;
1: -		} __attribute__((packed)) ss;
1: -	} u;
1: +  __u8 bDescLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bNbrPorts;
1: +  __le16 wHubCharacteristics;
1: +  __u8 bPwrOn2PwrGood;
1: +  __u8 bHubContrCurrent;
1: +  union {
1: +    struct {
1: +      __u8 DeviceRemovable[4];
1: +      __u8 PortPwrCtrlMask[4];
1: +    } hs;
1: +    struct {
1: +      __u8 bHubHdrDecLat;
1: +      __le16 wHubDelay;
1: +      __le16 DeviceRemovable;
1: +    } __attribute__((packed)) ss;
1: +  } u;
1:  } __attribute__((packed));
1:  
1:  struct usb_phy_io_ops {
1: -	int (*read)(struct usb_phy *, u32);
1: -	int (*write)(struct usb_phy *, u32, u32);
1: +  int (*read)(struct usb_phy *, u32);
1: +  int (*write)(struct usb_phy *, u32, u32);
1:  };
1:  
1:  struct usb_gadget;
1:  
1:  struct usb_otg {
1: -	u8 default_a;
1: -	struct phy *phy;
1: -	struct usb_phy *usb_phy;
1: -	struct usb_bus *host;
1: -	struct usb_gadget *gadget;
1: -	enum usb_otg_state state;
1: -	int (*set_host)(struct usb_otg *, struct usb_bus *);
1: -	int (*set_peripheral)(struct usb_otg *, struct usb_gadget *);
1: -	int (*set_vbus)(struct usb_otg *, bool);
1: -	int (*start_srp)(struct usb_otg *);
1: -	int (*start_hnp)(struct usb_otg *);
1: +  u8 default_a;
1: +  struct phy *phy;
1: +  struct usb_phy *usb_phy;
1: +  struct usb_bus *host;
1: +  struct usb_gadget *gadget;
1: +  enum usb_otg_state state;
1: +  int (*set_host)(struct usb_otg *, struct usb_bus *);
1: +  int (*set_peripheral)(struct usb_otg *, struct usb_gadget *);
1: +  int (*set_vbus)(struct usb_otg *, bool);
1: +  int (*start_srp)(struct usb_otg *);
1: +  int (*start_hnp)(struct usb_otg *);
1:  };
1:  
1:  typedef u32 usb_port_location_t;
1: @@ -106978,1461 +108166,1462 @@ typedef u32 usb_port_location_t;
1:  struct usb_port;
1:  
1:  struct usb_hub {
1: -	struct device *intfdev;
1: -	struct usb_device *hdev;
1: -	struct kref kref;
1: -	struct urb *urb;
1: -	u8 (*buffer)[8];
1: -	union {
1: -		struct usb_hub_status hub;
1: -		struct usb_port_status port;
1: -	} *status;
1: -	struct mutex status_mutex;
1: -	int error;
1: -	int nerrors;
1: -	long unsigned int event_bits[1];
1: -	long unsigned int change_bits[1];
1: -	long unsigned int removed_bits[1];
1: -	long unsigned int wakeup_bits[1];
1: -	long unsigned int power_bits[1];
1: -	long unsigned int child_usage_bits[1];
1: -	long unsigned int warm_reset_bits[1];
1: -	struct usb_hub_descriptor *descriptor;
1: -	struct usb_tt tt;
1: -	unsigned int mA_per_port;
1: -	unsigned int wakeup_enabled_descendants;
1: -	unsigned int limited_power: 1;
1: -	unsigned int quiescing: 1;
1: -	unsigned int disconnected: 1;
1: -	unsigned int in_reset: 1;
1: -	unsigned int quirk_disable_autosuspend: 1;
1: -	unsigned int quirk_check_port_auto_suspend: 1;
1: -	unsigned int has_indicators: 1;
1: -	u8 indicator[31];
1: -	struct delayed_work leds;
1: -	struct delayed_work init_work;
1: -	struct work_struct events;
1: -	spinlock_t irq_urb_lock;
1: -	struct timer_list irq_urb_retry;
1: -	struct usb_port **ports;
1: +  struct device *intfdev;
1: +  struct usb_device *hdev;
1: +  struct kref kref;
1: +  struct urb *urb;
1: +  u8 (*buffer)[8];
1: +  union {
1: +    struct usb_hub_status hub;
1: +    struct usb_port_status port;
1: +  } * status;
1: +  struct mutex status_mutex;
1: +  int error;
1: +  int nerrors;
1: +  long unsigned int event_bits[1];
1: +  long unsigned int change_bits[1];
1: +  long unsigned int removed_bits[1];
1: +  long unsigned int wakeup_bits[1];
1: +  long unsigned int power_bits[1];
1: +  long unsigned int child_usage_bits[1];
1: +  long unsigned int warm_reset_bits[1];
1: +  struct usb_hub_descriptor *descriptor;
1: +  struct usb_tt tt;
1: +  unsigned int mA_per_port;
1: +  unsigned int wakeup_enabled_descendants;
1: +  unsigned int limited_power : 1;
1: +  unsigned int quiescing : 1;
1: +  unsigned int disconnected : 1;
1: +  unsigned int in_reset : 1;
1: +  unsigned int quirk_disable_autosuspend : 1;
1: +  unsigned int quirk_check_port_auto_suspend : 1;
1: +  unsigned int has_indicators : 1;
1: +  u8 indicator[31];
1: +  struct delayed_work leds;
1: +  struct delayed_work init_work;
1: +  struct work_struct events;
1: +  spinlock_t irq_urb_lock;
1: +  struct timer_list irq_urb_retry;
1: +  struct usb_port **ports;
1:  };
1:  
1:  struct usb_dev_state;
1:  
1:  struct usb_port {
1: -	struct usb_device *child;
1: -	struct device dev;
1: -	struct usb_dev_state *port_owner;
1: -	struct usb_port *peer;
1: -	struct dev_pm_qos_request *req;
1: -	enum usb_port_connect_type connect_type;
1: -	usb_port_location_t location;
1: -	struct mutex status_lock;
1: -	u32 over_current_count;
1: -	u8 portnum;
1: -	u32 quirks;
1: -	unsigned int is_superspeed: 1;
1: -	unsigned int usb3_lpm_u1_permit: 1;
1: -	unsigned int usb3_lpm_u2_permit: 1;
1: +  struct usb_device *child;
1: +  struct device dev;
1: +  struct usb_dev_state *port_owner;
1: +  struct usb_port *peer;
1: +  struct dev_pm_qos_request *req;
1: +  enum usb_port_connect_type connect_type;
1: +  usb_port_location_t location;
1: +  struct mutex status_lock;
1: +  u32 over_current_count;
1: +  u8 portnum;
1: +  u32 quirks;
1: +  unsigned int is_superspeed : 1;
1: +  unsigned int usb3_lpm_u1_permit : 1;
1: +  unsigned int usb3_lpm_u2_permit : 1;
1:  };
1:  
1:  struct find_interface_arg {
1: -	int minor;
1: -	struct device_driver *drv;
1: +  int minor;
1: +  struct device_driver *drv;
1:  };
1:  
1:  struct each_dev_arg {
1: -	void *data;
1: -	int (*fn)(struct usb_device *, void *);
1: +  void *data;
1: +  int (*fn)(struct usb_device *, void *);
1:  };
1:  
1:  struct usb_qualifier_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__le16 bcdUSB;
1: -	__u8 bDeviceClass;
1: -	__u8 bDeviceSubClass;
1: -	__u8 bDeviceProtocol;
1: -	__u8 bMaxPacketSize0;
1: -	__u8 bNumConfigurations;
1: -	__u8 bRESERVED;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __le16 bcdUSB;
1: +  __u8 bDeviceClass;
1: +  __u8 bDeviceSubClass;
1: +  __u8 bDeviceProtocol;
1: +  __u8 bMaxPacketSize0;
1: +  __u8 bNumConfigurations;
1: +  __u8 bRESERVED;
1:  };
1:  
1:  struct usb_set_sel_req {
1: -	__u8 u1_sel;
1: -	__u8 u1_pel;
1: -	__le16 u2_sel;
1: -	__le16 u2_pel;
1: +  __u8 u1_sel;
1: +  __u8 u1_pel;
1: +  __le16 u2_sel;
1: +  __le16 u2_pel;
1:  };
1:  
1:  struct usbdevfs_hub_portinfo {
1: -	char nports;
1: -	char port[127];
1: +  char nports;
1: +  char port[127];
1:  };
1:  
1:  enum hub_led_mode {
1: -	INDICATOR_AUTO = 0,
1: -	INDICATOR_CYCLE = 1,
1: -	INDICATOR_GREEN_BLINK = 2,
1: -	INDICATOR_GREEN_BLINK_OFF = 3,
1: -	INDICATOR_AMBER_BLINK = 4,
1: -	INDICATOR_AMBER_BLINK_OFF = 5,
1: -	INDICATOR_ALT_BLINK = 6,
1: -	INDICATOR_ALT_BLINK_OFF = 7,
1: +  INDICATOR_AUTO = 0,
1: +  INDICATOR_CYCLE = 1,
1: +  INDICATOR_GREEN_BLINK = 2,
1: +  INDICATOR_GREEN_BLINK_OFF = 3,
1: +  INDICATOR_AMBER_BLINK = 4,
1: +  INDICATOR_AMBER_BLINK_OFF = 5,
1: +  INDICATOR_ALT_BLINK = 6,
1: +  INDICATOR_ALT_BLINK_OFF = 7,
1:  };
1:  
1:  struct usb_tt_clear {
1: -	struct list_head clear_list;
1: -	unsigned int tt;
1: -	u16 devinfo;
1: -	struct usb_hcd *hcd;
1: -	struct usb_host_endpoint *ep;
1: +  struct list_head clear_list;
1: +  unsigned int tt;
1: +  u16 devinfo;
1: +  struct usb_hcd *hcd;
1: +  struct usb_host_endpoint *ep;
1:  };
1:  
1:  enum hub_activation_type {
1: -	HUB_INIT = 0,
1: -	HUB_INIT2 = 1,
1: -	HUB_INIT3 = 2,
1: -	HUB_POST_RESET = 3,
1: -	HUB_RESUME = 4,
1: -	HUB_RESET_RESUME = 5,
1: +  HUB_INIT = 0,
1: +  HUB_INIT2 = 1,
1: +  HUB_INIT3 = 2,
1: +  HUB_POST_RESET = 3,
1: +  HUB_RESUME = 4,
1: +  HUB_RESET_RESUME = 5,
1:  };
1:  
1:  enum hub_quiescing_type {
1: -	HUB_DISCONNECT = 0,
1: -	HUB_PRE_RESET = 1,
1: -	HUB_SUSPEND = 2,
1: +  HUB_DISCONNECT = 0,
1: +  HUB_PRE_RESET = 1,
1: +  HUB_SUSPEND = 2,
1:  };
1:  
1:  struct usb_ctrlrequest {
1: -	__u8 bRequestType;
1: -	__u8 bRequest;
1: -	__le16 wValue;
1: -	__le16 wIndex;
1: -	__le16 wLength;
1: +  __u8 bRequestType;
1: +  __u8 bRequest;
1: +  __le16 wValue;
1: +  __le16 wIndex;
1: +  __le16 wLength;
1:  };
1:  
1:  enum usb_led_event {
1: -	USB_LED_EVENT_HOST = 0,
1: -	USB_LED_EVENT_GADGET = 1,
1: +  USB_LED_EVENT_HOST = 0,
1: +  USB_LED_EVENT_GADGET = 1,
1:  };
1:  
1:  struct usb_mon_operations {
1: -	void (*urb_submit)(struct usb_bus *, struct urb *);
1: -	void (*urb_submit_error)(struct usb_bus *, struct urb *, int);
1: -	void (*urb_complete)(struct usb_bus *, struct urb *, int);
1: +  void (*urb_submit)(struct usb_bus *, struct urb *);
1: +  void (*urb_submit_error)(struct usb_bus *, struct urb *, int);
1: +  void (*urb_complete)(struct usb_bus *, struct urb *, int);
1:  };
1:  
1:  struct usb_sg_request {
1: -	int status;
1: -	size_t bytes;
1: -	spinlock_t lock;
1: -	struct usb_device *dev;
1: -	int pipe;
1: -	int entries;
1: -	struct urb **urbs;
1: -	int count;
1: -	struct completion complete;
1: +  int status;
1: +  size_t bytes;
1: +  spinlock_t lock;
1: +  struct usb_device *dev;
1: +  int pipe;
1: +  int entries;
1: +  struct urb **urbs;
1: +  int count;
1: +  struct completion complete;
1:  };
1:  
1:  struct usb_cdc_header_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__le16 bcdCDC;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __le16 bcdCDC;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_call_mgmt_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 bmCapabilities;
1: -	__u8 bDataInterface;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 bmCapabilities;
1: +  __u8 bDataInterface;
1:  };
1:  
1:  struct usb_cdc_acm_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 bmCapabilities;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 bmCapabilities;
1:  };
1:  
1:  struct usb_cdc_union_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 bMasterInterface0;
1: -	__u8 bSlaveInterface0;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 bMasterInterface0;
1: +  __u8 bSlaveInterface0;
1:  };
1:  
1:  struct usb_cdc_country_functional_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 iCountryCodeRelDate;
1: -	__le16 wCountyCode0;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 iCountryCodeRelDate;
1: +  __le16 wCountyCode0;
1:  };
1:  
1:  struct usb_cdc_network_terminal_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 bEntityId;
1: -	__u8 iName;
1: -	__u8 bChannelIndex;
1: -	__u8 bPhysicalInterface;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 bEntityId;
1: +  __u8 iName;
1: +  __u8 bChannelIndex;
1: +  __u8 bPhysicalInterface;
1:  };
1:  
1:  struct usb_cdc_ether_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 iMACAddress;
1: -	__le32 bmEthernetStatistics;
1: -	__le16 wMaxSegmentSize;
1: -	__le16 wNumberMCFilters;
1: -	__u8 bNumberPowerFilters;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 iMACAddress;
1: +  __le32 bmEthernetStatistics;
1: +  __le16 wMaxSegmentSize;
1: +  __le16 wNumberMCFilters;
1: +  __u8 bNumberPowerFilters;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_dmm_desc {
1: -	__u8 bFunctionLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubtype;
1: -	__u16 bcdVersion;
1: -	__le16 wMaxCommand;
1: +  __u8 bFunctionLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubtype;
1: +  __u16 bcdVersion;
1: +  __le16 wMaxCommand;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_mdlm_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__le16 bcdVersion;
1: -	__u8 bGUID[16];
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __le16 bcdVersion;
1: +  __u8 bGUID[16];
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_mdlm_detail_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__u8 bGuidDescriptorType;
1: -	__u8 bDetailData[0];
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __u8 bGuidDescriptorType;
1: +  __u8 bDetailData[0];
1:  };
1:  
1:  struct usb_cdc_obex_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__le16 bcdVersion;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __le16 bcdVersion;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_ncm_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__le16 bcdNcmVersion;
1: -	__u8 bmNetworkCapabilities;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __le16 bcdNcmVersion;
1: +  __u8 bmNetworkCapabilities;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_mbim_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__le16 bcdMBIMVersion;
1: -	__le16 wMaxControlMessage;
1: -	__u8 bNumberFilters;
1: -	__u8 bMaxFilterSize;
1: -	__le16 wMaxSegmentSize;
1: -	__u8 bmNetworkCapabilities;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __le16 bcdMBIMVersion;
1: +  __le16 wMaxControlMessage;
1: +  __u8 bNumberFilters;
1: +  __u8 bMaxFilterSize;
1: +  __le16 wMaxSegmentSize;
1: +  __u8 bmNetworkCapabilities;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_mbim_extended_desc {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDescriptorSubType;
1: -	__le16 bcdMBIMExtendedVersion;
1: -	__u8 bMaxOutstandingCommandMessages;
1: -	__le16 wMTU;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDescriptorSubType;
1: +  __le16 bcdMBIMExtendedVersion;
1: +  __u8 bMaxOutstandingCommandMessages;
1: +  __le16 wMTU;
1:  } __attribute__((packed));
1:  
1:  struct usb_cdc_parsed_header {
1: -	struct usb_cdc_union_desc *usb_cdc_union_desc;
1: -	struct usb_cdc_header_desc *usb_cdc_header_desc;
1: -	struct usb_cdc_call_mgmt_descriptor *usb_cdc_call_mgmt_descriptor;
1: -	struct usb_cdc_acm_descriptor *usb_cdc_acm_descriptor;
1: -	struct usb_cdc_country_functional_desc *usb_cdc_country_functional_desc;
1: -	struct usb_cdc_network_terminal_desc *usb_cdc_network_terminal_desc;
1: -	struct usb_cdc_ether_desc *usb_cdc_ether_desc;
1: -	struct usb_cdc_dmm_desc *usb_cdc_dmm_desc;
1: -	struct usb_cdc_mdlm_desc *usb_cdc_mdlm_desc;
1: -	struct usb_cdc_mdlm_detail_desc *usb_cdc_mdlm_detail_desc;
1: -	struct usb_cdc_obex_desc *usb_cdc_obex_desc;
1: -	struct usb_cdc_ncm_desc *usb_cdc_ncm_desc;
1: -	struct usb_cdc_mbim_desc *usb_cdc_mbim_desc;
1: -	struct usb_cdc_mbim_extended_desc *usb_cdc_mbim_extended_desc;
1: -	bool phonet_magic_present;
1: +  struct usb_cdc_union_desc *usb_cdc_union_desc;
1: +  struct usb_cdc_header_desc *usb_cdc_header_desc;
1: +  struct usb_cdc_call_mgmt_descriptor *usb_cdc_call_mgmt_descriptor;
1: +  struct usb_cdc_acm_descriptor *usb_cdc_acm_descriptor;
1: +  struct usb_cdc_country_functional_desc *usb_cdc_country_functional_desc;
1: +  struct usb_cdc_network_terminal_desc *usb_cdc_network_terminal_desc;
1: +  struct usb_cdc_ether_desc *usb_cdc_ether_desc;
1: +  struct usb_cdc_dmm_desc *usb_cdc_dmm_desc;
1: +  struct usb_cdc_mdlm_desc *usb_cdc_mdlm_desc;
1: +  struct usb_cdc_mdlm_detail_desc *usb_cdc_mdlm_detail_desc;
1: +  struct usb_cdc_obex_desc *usb_cdc_obex_desc;
1: +  struct usb_cdc_ncm_desc *usb_cdc_ncm_desc;
1: +  struct usb_cdc_mbim_desc *usb_cdc_mbim_desc;
1: +  struct usb_cdc_mbim_extended_desc *usb_cdc_mbim_extended_desc;
1: +  bool phonet_magic_present;
1:  };
1:  
1:  struct api_context {
1: -	struct completion done;
1: -	int status;
1: +  struct completion done;
1: +  int status;
1:  };
1:  
1:  struct set_config_request {
1: -	struct usb_device *udev;
1: -	int config;
1: -	struct work_struct work;
1: -	struct list_head node;
1: +  struct usb_device *udev;
1: +  int config;
1: +  struct work_struct work;
1: +  struct list_head node;
1:  };
1:  
1:  struct usb_dynid {
1: -	struct list_head node;
1: -	struct usb_device_id id;
1: +  struct list_head node;
1: +  struct usb_device_id id;
1:  };
1:  
1:  struct usb_dev_cap_header {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__u8 bDevCapabilityType;
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __u8 bDevCapabilityType;
1:  };
1:  
1:  struct usb_class_driver {
1: -	char *name;
1: -	char * (*devnode)(struct device *, umode_t *);
1: -	const struct file_operations *fops;
1: -	int minor_base;
1: +  char *name;
1: +  char *(*devnode)(struct device *, umode_t *);
1: +  const struct file_operations *fops;
1: +  int minor_base;
1:  };
1:  
1:  struct usb_class {
1: -	struct kref kref;
1: -	struct class *class;
1: +  struct kref kref;
1: +  struct class *class;
1:  };
1:  
1:  struct ep_device {
1: -	struct usb_endpoint_descriptor *desc;
1: -	struct usb_device *udev;
1: -	struct device dev;
1: +  struct usb_endpoint_descriptor *desc;
1: +  struct usb_device *udev;
1: +  struct device dev;
1:  };
1:  
1:  struct usbdevfs_ctrltransfer {
1: -	__u8 bRequestType;
1: -	__u8 bRequest;
1: -	__u16 wValue;
1: -	__u16 wIndex;
1: -	__u16 wLength;
1: -	__u32 timeout;
1: -	void *data;
1: +  __u8 bRequestType;
1: +  __u8 bRequest;
1: +  __u16 wValue;
1: +  __u16 wIndex;
1: +  __u16 wLength;
1: +  __u32 timeout;
1: +  void *data;
1:  };
1:  
1:  struct usbdevfs_bulktransfer {
1: -	unsigned int ep;
1: -	unsigned int len;
1: -	unsigned int timeout;
1: -	void *data;
1: +  unsigned int ep;
1: +  unsigned int len;
1: +  unsigned int timeout;
1: +  void *data;
1:  };
1:  
1:  struct usbdevfs_setinterface {
1: -	unsigned int interface;
1: -	unsigned int altsetting;
1: +  unsigned int interface;
1: +  unsigned int altsetting;
1:  };
1:  
1:  struct usbdevfs_disconnectsignal {
1: -	unsigned int signr;
1: -	void *context;
1: +  unsigned int signr;
1: +  void *context;
1:  };
1:  
1:  struct usbdevfs_getdriver {
1: -	unsigned int interface;
1: -	char driver[256];
1: +  unsigned int interface;
1: +  char driver[256];
1:  };
1:  
1:  struct usbdevfs_connectinfo {
1: -	unsigned int devnum;
1: -	unsigned char slow;
1: +  unsigned int devnum;
1: +  unsigned char slow;
1:  };
1:  
1:  struct usbdevfs_conninfo_ex {
1: -	__u32 size;
1: -	__u32 busnum;
1: -	__u32 devnum;
1: -	__u32 speed;
1: -	__u8 num_ports;
1: -	__u8 ports[7];
1: +  __u32 size;
1: +  __u32 busnum;
1: +  __u32 devnum;
1: +  __u32 speed;
1: +  __u8 num_ports;
1: +  __u8 ports[7];
1:  };
1:  
1:  struct usbdevfs_iso_packet_desc {
1: -	unsigned int length;
1: -	unsigned int actual_length;
1: -	unsigned int status;
1: +  unsigned int length;
1: +  unsigned int actual_length;
1: +  unsigned int status;
1:  };
1:  
1:  struct usbdevfs_urb {
1: -	unsigned char type;
1: -	unsigned char endpoint;
1: -	int status;
1: -	unsigned int flags;
1: -	void *buffer;
1: -	int buffer_length;
1: -	int actual_length;
1: -	int start_frame;
1: -	union {
1: -		int number_of_packets;
1: -		unsigned int stream_id;
1: -	};
1: -	int error_count;
1: -	unsigned int signr;
1: -	void *usercontext;
1: -	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
1: +  unsigned char type;
1: +  unsigned char endpoint;
1: +  int status;
1: +  unsigned int flags;
1: +  void *buffer;
1: +  int buffer_length;
1: +  int actual_length;
1: +  int start_frame;
1: +  union {
1: +    int number_of_packets;
1: +    unsigned int stream_id;
1: +  };
1: +  int error_count;
1: +  unsigned int signr;
1: +  void *usercontext;
1: +  struct usbdevfs_iso_packet_desc iso_frame_desc[0];
1:  };
1:  
1:  struct usbdevfs_ioctl {
1: -	int ifno;
1: -	int ioctl_code;
1: -	void *data;
1: +  int ifno;
1: +  int ioctl_code;
1: +  void *data;
1:  };
1:  
1:  struct usbdevfs_disconnect_claim {
1: -	unsigned int interface;
1: -	unsigned int flags;
1: -	char driver[256];
1: +  unsigned int interface;
1: +  unsigned int flags;
1: +  char driver[256];
1:  };
1:  
1:  struct usbdevfs_streams {
1: -	unsigned int num_streams;
1: -	unsigned int num_eps;
1: -	unsigned char eps[0];
1: +  unsigned int num_streams;
1: +  unsigned int num_eps;
1: +  unsigned char eps[0];
1:  };
1:  
1:  struct usbdevfs_ctrltransfer32 {
1: -	u8 bRequestType;
1: -	u8 bRequest;
1: -	u16 wValue;
1: -	u16 wIndex;
1: -	u16 wLength;
1: -	u32 timeout;
1: -	compat_caddr_t data;
1: +  u8 bRequestType;
1: +  u8 bRequest;
1: +  u16 wValue;
1: +  u16 wIndex;
1: +  u16 wLength;
1: +  u32 timeout;
1: +  compat_caddr_t data;
1:  };
1:  
1:  struct usbdevfs_bulktransfer32 {
1: -	compat_uint_t ep;
1: -	compat_uint_t len;
1: -	compat_uint_t timeout;
1: -	compat_caddr_t data;
1: +  compat_uint_t ep;
1: +  compat_uint_t len;
1: +  compat_uint_t timeout;
1: +  compat_caddr_t data;
1:  };
1:  
1:  struct usbdevfs_disconnectsignal32 {
1: -	compat_int_t signr;
1: -	compat_caddr_t context;
1: +  compat_int_t signr;
1: +  compat_caddr_t context;
1:  };
1:  
1:  struct usbdevfs_urb32 {
1: -	unsigned char type;
1: -	unsigned char endpoint;
1: -	compat_int_t status;
1: -	compat_uint_t flags;
1: -	compat_caddr_t buffer;
1: -	compat_int_t buffer_length;
1: -	compat_int_t actual_length;
1: -	compat_int_t start_frame;
1: -	compat_int_t number_of_packets;
1: -	compat_int_t error_count;
1: -	compat_uint_t signr;
1: -	compat_caddr_t usercontext;
1: -	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
1: +  unsigned char type;
1: +  unsigned char endpoint;
1: +  compat_int_t status;
1: +  compat_uint_t flags;
1: +  compat_caddr_t buffer;
1: +  compat_int_t buffer_length;
1: +  compat_int_t actual_length;
1: +  compat_int_t start_frame;
1: +  compat_int_t number_of_packets;
1: +  compat_int_t error_count;
1: +  compat_uint_t signr;
1: +  compat_caddr_t usercontext;
1: +  struct usbdevfs_iso_packet_desc iso_frame_desc[0];
1:  };
1:  
1:  struct usbdevfs_ioctl32 {
1: -	s32 ifno;
1: -	s32 ioctl_code;
1: -	compat_caddr_t data;
1: +  s32 ifno;
1: +  s32 ioctl_code;
1: +  compat_caddr_t data;
1:  };
1:  
1:  struct usb_dev_state___2 {
1: -	struct list_head list;
1: -	struct usb_device *dev;
1: -	struct file *file;
1: -	spinlock_t lock;
1: -	struct list_head async_pending;
1: -	struct list_head async_completed;
1: -	struct list_head memory_list;
1: -	wait_queue_head_t wait;
1: -	wait_queue_head_t wait_for_resume;
1: -	unsigned int discsignr;
1: -	struct pid *disc_pid;
1: -	const struct cred *cred;
1: -	sigval_t disccontext;
1: -	long unsigned int ifclaimed;
1: -	u32 disabled_bulk_eps;
1: -	long unsigned int interface_allowed_mask;
1: -	int not_yet_resumed;
1: -	bool suspend_allowed;
1: -	bool privileges_dropped;
1: +  struct list_head list;
1: +  struct usb_device *dev;
1: +  struct file *file;
1: +  spinlock_t lock;
1: +  struct list_head async_pending;
1: +  struct list_head async_completed;
1: +  struct list_head memory_list;
1: +  wait_queue_head_t wait;
1: +  wait_queue_head_t wait_for_resume;
1: +  unsigned int discsignr;
1: +  struct pid *disc_pid;
1: +  const struct cred *cred;
1: +  sigval_t disccontext;
1: +  long unsigned int ifclaimed;
1: +  u32 disabled_bulk_eps;
1: +  long unsigned int interface_allowed_mask;
1: +  int not_yet_resumed;
1: +  bool suspend_allowed;
1: +  bool privileges_dropped;
1:  };
1:  
1:  struct usb_memory {
1: -	struct list_head memlist;
1: -	int vma_use_count;
1: -	int urb_use_count;
1: -	u32 size;
1: -	void *mem;
1: -	dma_addr_t dma_handle;
1: -	long unsigned int vm_start;
1: -	struct usb_dev_state___2 *ps;
1: +  struct list_head memlist;
1: +  int vma_use_count;
1: +  int urb_use_count;
1: +  u32 size;
1: +  void *mem;
1: +  dma_addr_t dma_handle;
1: +  long unsigned int vm_start;
1: +  struct usb_dev_state___2 *ps;
1:  };
1:  
1:  struct async {
1: -	struct list_head asynclist;
1: -	struct usb_dev_state___2 *ps;
1: -	struct pid *pid;
1: -	const struct cred *cred;
1: -	unsigned int signr;
1: -	unsigned int ifnum;
1: -	void *userbuffer;
1: -	void *userurb;
1: -	sigval_t userurb_sigval;
1: -	struct urb *urb;
1: -	struct usb_memory *usbm;
1: -	unsigned int mem_usage;
1: -	int status;
1: -	u8 bulk_addr;
1: -	u8 bulk_status;
1: +  struct list_head asynclist;
1: +  struct usb_dev_state___2 *ps;
1: +  struct pid *pid;
1: +  const struct cred *cred;
1: +  unsigned int signr;
1: +  unsigned int ifnum;
1: +  void *userbuffer;
1: +  void *userurb;
1: +  sigval_t userurb_sigval;
1: +  struct urb *urb;
1: +  struct usb_memory *usbm;
1: +  unsigned int mem_usage;
1: +  int status;
1: +  u8 bulk_addr;
1: +  u8 bulk_status;
1:  };
1:  
1:  enum snoop_when {
1: -	SUBMIT = 0,
1: -	COMPLETE = 1,
1: +  SUBMIT = 0,
1: +  COMPLETE = 1,
1:  };
1:  
1:  struct quirk_entry {
1: -	u16 vid;
1: -	u16 pid;
1: -	u32 flags;
1: +  u16 vid;
1: +  u16 pid;
1: +  u32 flags;
1:  };
1:  
1:  struct class_info {
1: -	int class;
1: -	char *class_name;
1: +  int class;
1: +  char *class_name;
1:  };
1:  
1:  struct usb_phy_roothub___2 {
1: -	struct phy *phy;
1: -	struct list_head list;
1: +  struct phy *phy;
1: +  struct list_head list;
1:  };
1:  
1: -typedef void (*companion_fn)(struct pci_dev *, struct usb_hcd *, struct pci_dev *, struct usb_hcd *);
1: +typedef void (*companion_fn)(struct pci_dev *, struct usb_hcd *,
1: +                             struct pci_dev *, struct usb_hcd *);
1:  
1:  struct mon_bus {
1: -	struct list_head bus_link;
1: -	spinlock_t lock;
1: -	struct usb_bus *u_bus;
1: -	int text_inited;
1: -	int bin_inited;
1: -	struct dentry *dent_s;
1: -	struct dentry *dent_t;
1: -	struct dentry *dent_u;
1: -	struct device *classdev;
1: -	int nreaders;
1: -	struct list_head r_list;
1: -	struct kref ref;
1: -	unsigned int cnt_events;
1: -	unsigned int cnt_text_lost;
1: +  struct list_head bus_link;
1: +  spinlock_t lock;
1: +  struct usb_bus *u_bus;
1: +  int text_inited;
1: +  int bin_inited;
1: +  struct dentry *dent_s;
1: +  struct dentry *dent_t;
1: +  struct dentry *dent_u;
1: +  struct device *classdev;
1: +  int nreaders;
1: +  struct list_head r_list;
1: +  struct kref ref;
1: +  unsigned int cnt_events;
1: +  unsigned int cnt_text_lost;
1:  };
1:  
1:  struct mon_reader {
1: -	struct list_head r_link;
1: -	struct mon_bus *m_bus;
1: -	void *r_data;
1: -	void (*rnf_submit)(void *, struct urb *);
1: -	void (*rnf_error)(void *, struct urb *, int);
1: -	void (*rnf_complete)(void *, struct urb *, int);
1: +  struct list_head r_link;
1: +  struct mon_bus *m_bus;
1: +  void *r_data;
1: +  void (*rnf_submit)(void *, struct urb *);
1: +  void (*rnf_error)(void *, struct urb *, int);
1: +  void (*rnf_complete)(void *, struct urb *, int);
1:  };
1:  
1:  struct snap {
1: -	int slen;
1: -	char str[80];
1: +  int slen;
1: +  char str[80];
1:  };
1:  
1:  struct mon_iso_desc {
1: -	int status;
1: -	unsigned int offset;
1: -	unsigned int length;
1: +  int status;
1: +  unsigned int offset;
1: +  unsigned int length;
1:  };
1:  
1:  struct mon_event_text {
1: -	struct list_head e_link;
1: -	int type;
1: -	long unsigned int id;
1: -	unsigned int tstamp;
1: -	int busnum;
1: -	char devnum;
1: -	char epnum;
1: -	char is_in;
1: -	char xfertype;
1: -	int length;
1: -	int status;
1: -	int interval;
1: -	int start_frame;
1: -	int error_count;
1: -	char setup_flag;
1: -	char data_flag;
1: -	int numdesc;
1: -	struct mon_iso_desc isodesc[5];
1: -	unsigned char setup[8];
1: -	unsigned char data[32];
1: +  struct list_head e_link;
1: +  int type;
1: +  long unsigned int id;
1: +  unsigned int tstamp;
1: +  int busnum;
1: +  char devnum;
1: +  char epnum;
1: +  char is_in;
1: +  char xfertype;
1: +  int length;
1: +  int status;
1: +  int interval;
1: +  int start_frame;
1: +  int error_count;
1: +  char setup_flag;
1: +  char data_flag;
1: +  int numdesc;
1: +  struct mon_iso_desc isodesc[5];
1: +  unsigned char setup[8];
1: +  unsigned char data[32];
1:  };
1:  
1:  struct mon_reader_text {
1: -	struct kmem_cache *e_slab;
1: -	int nevents;
1: -	struct list_head e_list;
1: -	struct mon_reader r;
1: -	wait_queue_head_t wait;
1: -	int printf_size;
1: -	size_t printf_offset;
1: -	size_t printf_togo;
1: -	char *printf_buf;
1: -	struct mutex printf_lock;
1: -	char slab_name[30];
1: +  struct kmem_cache *e_slab;
1: +  int nevents;
1: +  struct list_head e_list;
1: +  struct mon_reader r;
1: +  wait_queue_head_t wait;
1: +  int printf_size;
1: +  size_t printf_offset;
1: +  size_t printf_togo;
1: +  char *printf_buf;
1: +  struct mutex printf_lock;
1: +  char slab_name[30];
1:  };
1:  
1:  struct mon_text_ptr {
1: -	int cnt;
1: -	int limit;
1: -	char *pbuf;
1: +  int cnt;
1: +  int limit;
1: +  char *pbuf;
1:  };
1:  
1:  enum {
1: -	NAMESZ = 10,
1: +  NAMESZ = 10,
1:  };
1:  
1:  struct iso_rec {
1: -	int error_count;
1: -	int numdesc;
1: +  int error_count;
1: +  int numdesc;
1:  };
1:  
1:  struct mon_bin_hdr {
1: -	u64 id;
1: -	unsigned char type;
1: -	unsigned char xfer_type;
1: -	unsigned char epnum;
1: -	unsigned char devnum;
1: -	short unsigned int busnum;
1: -	char flag_setup;
1: -	char flag_data;
1: -	s64 ts_sec;
1: -	s32 ts_usec;
1: -	int status;
1: -	unsigned int len_urb;
1: -	unsigned int len_cap;
1: -	union {
1: -		unsigned char setup[8];
1: -		struct iso_rec iso;
1: -	} s;
1: -	int interval;
1: -	int start_frame;
1: -	unsigned int xfer_flags;
1: -	unsigned int ndesc;
1: +  u64 id;
1: +  unsigned char type;
1: +  unsigned char xfer_type;
1: +  unsigned char epnum;
1: +  unsigned char devnum;
1: +  short unsigned int busnum;
1: +  char flag_setup;
1: +  char flag_data;
1: +  s64 ts_sec;
1: +  s32 ts_usec;
1: +  int status;
1: +  unsigned int len_urb;
1: +  unsigned int len_cap;
1: +  union {
1: +    unsigned char setup[8];
1: +    struct iso_rec iso;
1: +  } s;
1: +  int interval;
1: +  int start_frame;
1: +  unsigned int xfer_flags;
1: +  unsigned int ndesc;
1:  };
1:  
1:  struct mon_bin_isodesc {
1: -	int iso_status;
1: -	unsigned int iso_off;
1: -	unsigned int iso_len;
1: -	u32 _pad;
1: +  int iso_status;
1: +  unsigned int iso_off;
1: +  unsigned int iso_len;
1: +  u32 _pad;
1:  };
1:  
1:  struct mon_bin_stats {
1: -	u32 queued;
1: -	u32 dropped;
1: +  u32 queued;
1: +  u32 dropped;
1:  };
1:  
1:  struct mon_bin_get {
1: -	struct mon_bin_hdr *hdr;
1: -	void *data;
1: -	size_t alloc;
1: +  struct mon_bin_hdr *hdr;
1: +  void *data;
1: +  size_t alloc;
1:  };
1:  
1:  struct mon_bin_mfetch {
1: -	u32 *offvec;
1: -	u32 nfetch;
1: -	u32 nflush;
1: +  u32 *offvec;
1: +  u32 nfetch;
1: +  u32 nflush;
1:  };
1:  
1:  struct mon_bin_get32 {
1: -	u32 hdr32;
1: -	u32 data32;
1: -	u32 alloc32;
1: +  u32 hdr32;
1: +  u32 data32;
1: +  u32 alloc32;
1:  };
1:  
1:  struct mon_bin_mfetch32 {
1: -	u32 offvec32;
1: -	u32 nfetch32;
1: -	u32 nflush32;
1: +  u32 offvec32;
1: +  u32 nfetch32;
1: +  u32 nflush32;
1:  };
1:  
1:  struct mon_pgmap {
1: -	struct page *pg;
1: -	unsigned char *ptr;
1: +  struct page *pg;
1: +  unsigned char *ptr;
1:  };
1:  
1:  struct mon_reader_bin {
1: -	spinlock_t b_lock;
1: -	unsigned int b_size;
1: -	unsigned int b_cnt;
1: -	unsigned int b_in;
1: -	unsigned int b_out;
1: -	unsigned int b_read;
1: -	struct mon_pgmap *b_vec;
1: -	wait_queue_head_t b_wait;
1: -	struct mutex fetch_lock;
1: -	int mmap_active;
1: -	struct mon_reader r;
1: -	unsigned int cnt_lost;
1: +  spinlock_t b_lock;
1: +  unsigned int b_size;
1: +  unsigned int b_cnt;
1: +  unsigned int b_in;
1: +  unsigned int b_out;
1: +  unsigned int b_read;
1: +  struct mon_pgmap *b_vec;
1: +  wait_queue_head_t b_wait;
1: +  struct mutex fetch_lock;
1: +  int mmap_active;
1: +  struct mon_reader r;
1: +  unsigned int cnt_lost;
1:  };
1:  
1:  enum amd_chipset_gen {
1: -	NOT_AMD_CHIPSET = 0,
1: -	AMD_CHIPSET_SB600 = 1,
1: -	AMD_CHIPSET_SB700 = 2,
1: -	AMD_CHIPSET_SB800 = 3,
1: -	AMD_CHIPSET_HUDSON2 = 4,
1: -	AMD_CHIPSET_BOLTON = 5,
1: -	AMD_CHIPSET_YANGTZE = 6,
1: -	AMD_CHIPSET_TAISHAN = 7,
1: -	AMD_CHIPSET_UNKNOWN = 8,
1: +  NOT_AMD_CHIPSET = 0,
1: +  AMD_CHIPSET_SB600 = 1,
1: +  AMD_CHIPSET_SB700 = 2,
1: +  AMD_CHIPSET_SB800 = 3,
1: +  AMD_CHIPSET_HUDSON2 = 4,
1: +  AMD_CHIPSET_BOLTON = 5,
1: +  AMD_CHIPSET_YANGTZE = 6,
1: +  AMD_CHIPSET_TAISHAN = 7,
1: +  AMD_CHIPSET_UNKNOWN = 8,
1:  };
1:  
1:  struct amd_chipset_type {
1: -	enum amd_chipset_gen gen;
1: -	u8 rev;
1: +  enum amd_chipset_gen gen;
1: +  u8 rev;
1:  };
1:  
1:  struct amd_chipset_info {
1: -	struct pci_dev *nb_dev;
1: -	struct pci_dev *smbus_dev;
1: -	int nb_type;
1: -	struct amd_chipset_type sb_type;
1: -	int isoc_reqs;
1: -	int probe_count;
1: -	bool need_pll_quirk;
1: +  struct pci_dev *nb_dev;
1: +  struct pci_dev *smbus_dev;
1: +  int nb_type;
1: +  struct amd_chipset_type sb_type;
1: +  int isoc_reqs;
1: +  int probe_count;
1: +  bool need_pll_quirk;
1:  };
1:  
1:  struct serio_device_id {
1: -	__u8 type;
1: -	__u8 extra;
1: -	__u8 id;
1: -	__u8 proto;
1: +  __u8 type;
1: +  __u8 extra;
1: +  __u8 id;
1: +  __u8 proto;
1:  };
1:  
1:  struct serio_driver;
1:  
1:  struct serio {
1: -	void *port_data;
1: -	char name[32];
1: -	char phys[32];
1: -	char firmware_id[128];
1: -	bool manual_bind;
1: -	struct serio_device_id id;
1: -	spinlock_t lock;
1: -	int (*write)(struct serio *, unsigned char);
1: -	int (*open)(struct serio *);
1: -	void (*close)(struct serio *);
1: -	int (*start)(struct serio *);
1: -	void (*stop)(struct serio *);
1: -	struct serio *parent;
1: -	struct list_head child_node;
1: -	struct list_head children;
1: -	unsigned int depth;
1: -	struct serio_driver *drv;
1: -	struct mutex drv_mutex;
1: -	struct device dev;
1: -	struct list_head node;
1: -	struct mutex *ps2_cmd_mutex;
1: +  void *port_data;
1: +  char name[32];
1: +  char phys[32];
1: +  char firmware_id[128];
1: +  bool manual_bind;
1: +  struct serio_device_id id;
1: +  spinlock_t lock;
1: +  int (*write)(struct serio *, unsigned char);
1: +  int (*open)(struct serio *);
1: +  void (*close)(struct serio *);
1: +  int (*start)(struct serio *);
1: +  void (*stop)(struct serio *);
1: +  struct serio *parent;
1: +  struct list_head child_node;
1: +  struct list_head children;
1: +  unsigned int depth;
1: +  struct serio_driver *drv;
1: +  struct mutex drv_mutex;
1: +  struct device dev;
1: +  struct list_head node;
1: +  struct mutex *ps2_cmd_mutex;
1:  };
1:  
1:  struct serio_driver {
1: -	const char *description;
1: -	const struct serio_device_id *id_table;
1: -	bool manual_bind;
1: -	void (*write_wakeup)(struct serio *);
1: -	irqreturn_t (*interrupt)(struct serio *, unsigned char, unsigned int);
1: -	int (*connect)(struct serio *, struct serio_driver *);
1: -	int (*reconnect)(struct serio *);
1: -	int (*fast_reconnect)(struct serio *);
1: -	void (*disconnect)(struct serio *);
1: -	void (*cleanup)(struct serio *);
1: -	struct device_driver driver;
1: +  const char *description;
1: +  const struct serio_device_id *id_table;
1: +  bool manual_bind;
1: +  void (*write_wakeup)(struct serio *);
1: +  irqreturn_t (*interrupt)(struct serio *, unsigned char, unsigned int);
1: +  int (*connect)(struct serio *, struct serio_driver *);
1: +  int (*reconnect)(struct serio *);
1: +  int (*fast_reconnect)(struct serio *);
1: +  void (*disconnect)(struct serio *);
1: +  void (*cleanup)(struct serio *);
1: +  struct device_driver driver;
1:  };
1:  
1:  enum serio_event_type {
1: -	SERIO_RESCAN_PORT = 0,
1: -	SERIO_RECONNECT_PORT = 1,
1: -	SERIO_RECONNECT_SUBTREE = 2,
1: -	SERIO_REGISTER_PORT = 3,
1: -	SERIO_ATTACH_DRIVER = 4,
1: +  SERIO_RESCAN_PORT = 0,
1: +  SERIO_RECONNECT_PORT = 1,
1: +  SERIO_RECONNECT_SUBTREE = 2,
1: +  SERIO_REGISTER_PORT = 3,
1: +  SERIO_ATTACH_DRIVER = 4,
1:  };
1:  
1:  struct serio_event {
1: -	enum serio_event_type type;
1: -	void *object;
1: -	struct module *owner;
1: -	struct list_head node;
1: +  enum serio_event_type type;
1: +  void *object;
1: +  struct module *owner;
1: +  struct list_head node;
1:  };
1:  
1:  enum i8042_controller_reset_mode {
1: -	I8042_RESET_NEVER = 0,
1: -	I8042_RESET_ALWAYS = 1,
1: -	I8042_RESET_ON_S2RAM = 2,
1: +  I8042_RESET_NEVER = 0,
1: +  I8042_RESET_ALWAYS = 1,
1: +  I8042_RESET_ON_S2RAM = 2,
1:  };
1:  
1:  struct i8042_port {
1: -	struct serio *serio;
1: -	int irq;
1: -	bool exists;
1: -	bool driver_bound;
1: -	signed char mux;
1: +  struct serio *serio;
1: +  int irq;
1: +  bool exists;
1: +  bool driver_bound;
1: +  signed char mux;
1:  };
1:  
1:  struct serport {
1: -	struct tty_struct *tty;
1: -	wait_queue_head_t wait;
1: -	struct serio *serio;
1: -	struct serio_device_id id;
1: -	spinlock_t lock;
1: -	long unsigned int flags;
1: +  struct tty_struct *tty;
1: +  wait_queue_head_t wait;
1: +  struct serio *serio;
1: +  struct serio_device_id id;
1: +  spinlock_t lock;
1: +  long unsigned int flags;
1:  };
1:  
1:  struct ps2dev {
1: -	struct serio *serio;
1: -	struct mutex cmd_mutex;
1: -	wait_queue_head_t wait;
1: -	long unsigned int flags;
1: -	u8 cmdbuf[8];
1: -	u8 cmdcnt;
1: -	u8 nak;
1: +  struct serio *serio;
1: +  struct mutex cmd_mutex;
1: +  wait_queue_head_t wait;
1: +  long unsigned int flags;
1: +  u8 cmdbuf[8];
1: +  u8 cmdcnt;
1: +  u8 nak;
1:  };
1:  
1:  struct input_mt_slot {
1: -	int abs[14];
1: -	unsigned int frame;
1: -	unsigned int key;
1: +  int abs[14];
1: +  unsigned int frame;
1: +  unsigned int key;
1:  };
1:  
1:  struct input_mt {
1: -	int trkid;
1: -	int num_slots;
1: -	int slot;
1: -	unsigned int flags;
1: -	unsigned int frame;
1: -	int *red;
1: -	struct input_mt_slot slots[0];
1: +  int trkid;
1: +  int num_slots;
1: +  int slot;
1: +  unsigned int flags;
1: +  unsigned int frame;
1: +  int *red;
1: +  struct input_mt_slot slots[0];
1:  };
1:  
1:  union input_seq_state {
1: -	struct {
1: -		short unsigned int pos;
1: -		bool mutex_acquired;
1: -	};
1: -	void *p;
1: +  struct {
1: +    short unsigned int pos;
1: +    bool mutex_acquired;
1: +  };
1: +  void *p;
1:  };
1:  
1:  struct input_devres {
1: -	struct input_dev *input;
1: +  struct input_dev *input;
1:  };
1:  
1:  struct input_event {
1: -	__kernel_ulong_t __sec;
1: -	__kernel_ulong_t __usec;
1: -	__u16 type;
1: -	__u16 code;
1: -	__s32 value;
1: +  __kernel_ulong_t __sec;
1: +  __kernel_ulong_t __usec;
1: +  __u16 type;
1: +  __u16 code;
1: +  __s32 value;
1:  };
1:  
1:  struct input_event_compat {
1: -	compat_ulong_t sec;
1: -	compat_ulong_t usec;
1: -	__u16 type;
1: -	__u16 code;
1: -	__s32 value;
1: +  compat_ulong_t sec;
1: +  compat_ulong_t usec;
1: +  __u16 type;
1: +  __u16 code;
1: +  __s32 value;
1:  };
1:  
1:  struct ff_periodic_effect_compat {
1: -	__u16 waveform;
1: -	__u16 period;
1: -	__s16 magnitude;
1: -	__s16 offset;
1: -	__u16 phase;
1: -	struct ff_envelope envelope;
1: -	__u32 custom_len;
1: -	compat_uptr_t custom_data;
1: +  __u16 waveform;
1: +  __u16 period;
1: +  __s16 magnitude;
1: +  __s16 offset;
1: +  __u16 phase;
1: +  struct ff_envelope envelope;
1: +  __u32 custom_len;
1: +  compat_uptr_t custom_data;
1:  };
1:  
1:  struct ff_effect_compat {
1: -	__u16 type;
1: -	__s16 id;
1: -	__u16 direction;
1: -	struct ff_trigger trigger;
1: -	struct ff_replay replay;
1: -	union {
1: -		struct ff_constant_effect constant;
1: -		struct ff_ramp_effect ramp;
1: -		struct ff_periodic_effect_compat periodic;
1: -		struct ff_condition_effect condition[2];
1: -		struct ff_rumble_effect rumble;
1: -	} u;
1: +  __u16 type;
1: +  __s16 id;
1: +  __u16 direction;
1: +  struct ff_trigger trigger;
1: +  struct ff_replay replay;
1: +  union {
1: +    struct ff_constant_effect constant;
1: +    struct ff_ramp_effect ramp;
1: +    struct ff_periodic_effect_compat periodic;
1: +    struct ff_condition_effect condition[2];
1: +    struct ff_rumble_effect rumble;
1: +  } u;
1:  };
1:  
1:  struct input_mt_pos {
1: -	s16 x;
1: -	s16 y;
1: +  s16 x;
1: +  s16 y;
1:  };
1:  
1:  struct input_dev_poller {
1: -	void (*poll)(struct input_dev *);
1: -	unsigned int poll_interval;
1: -	unsigned int poll_interval_max;
1: -	unsigned int poll_interval_min;
1: -	struct input_dev *input;
1: -	struct delayed_work work;
1: +  void (*poll)(struct input_dev *);
1: +  unsigned int poll_interval;
1: +  unsigned int poll_interval_max;
1: +  unsigned int poll_interval_min;
1: +  struct input_dev *input;
1: +  struct delayed_work work;
1:  };
1:  
1:  struct ml_effect_state {
1: -	struct ff_effect *effect;
1: -	long unsigned int flags;
1: -	int count;
1: -	long unsigned int play_at;
1: -	long unsigned int stop_at;
1: -	long unsigned int adj_at;
1: +  struct ff_effect *effect;
1: +  long unsigned int flags;
1: +  int count;
1: +  long unsigned int play_at;
1: +  long unsigned int stop_at;
1: +  long unsigned int adj_at;
1:  };
1:  
1:  struct ml_device {
1: -	void *private;
1: -	struct ml_effect_state states[16];
1: -	int gain;
1: -	struct timer_list timer;
1: -	struct input_dev *dev;
1: -	int (*play_effect)(struct input_dev *, void *, struct ff_effect *);
1: +  void *private;
1: +  struct ml_effect_state states[16];
1: +  int gain;
1: +  struct timer_list timer;
1: +  struct input_dev *dev;
1: +  int (*play_effect)(struct input_dev *, void *, struct ff_effect *);
1:  };
1:  
1:  struct mousedev_hw_data {
1: -	int dx;
1: -	int dy;
1: -	int dz;
1: -	int x;
1: -	int y;
1: -	int abs_event;
1: -	long unsigned int buttons;
1: +  int dx;
1: +  int dy;
1: +  int dz;
1: +  int x;
1: +  int y;
1: +  int abs_event;
1: +  long unsigned int buttons;
1:  };
1:  
1:  struct mousedev {
1: -	int open;
1: -	struct input_handle handle;
1: -	wait_queue_head_t wait;
1: -	struct list_head client_list;
1: -	spinlock_t client_lock;
1: -	struct mutex mutex;
1: -	struct device dev;
1: -	struct cdev cdev;
1: -	bool exist;
1: -	struct list_head mixdev_node;
1: -	bool opened_by_mixdev;
1: -	struct mousedev_hw_data packet;
1: -	unsigned int pkt_count;
1: -	int old_x[4];
1: -	int old_y[4];
1: -	int frac_dx;
1: -	int frac_dy;
1: -	long unsigned int touch;
1: -	int (*open_device)(struct mousedev *);
1: -	void (*close_device)(struct mousedev *);
1: +  int open;
1: +  struct input_handle handle;
1: +  wait_queue_head_t wait;
1: +  struct list_head client_list;
1: +  spinlock_t client_lock;
1: +  struct mutex mutex;
1: +  struct device dev;
1: +  struct cdev cdev;
1: +  bool exist;
1: +  struct list_head mixdev_node;
1: +  bool opened_by_mixdev;
1: +  struct mousedev_hw_data packet;
1: +  unsigned int pkt_count;
1: +  int old_x[4];
1: +  int old_y[4];
1: +  int frac_dx;
1: +  int frac_dy;
1: +  long unsigned int touch;
1: +  int (*open_device)(struct mousedev *);
1: +  void (*close_device)(struct mousedev *);
1:  };
1:  
1:  enum mousedev_emul {
1: -	MOUSEDEV_EMUL_PS2 = 0,
1: -	MOUSEDEV_EMUL_IMPS = 1,
1: -	MOUSEDEV_EMUL_EXPS = 2,
1: +  MOUSEDEV_EMUL_PS2 = 0,
1: +  MOUSEDEV_EMUL_IMPS = 1,
1: +  MOUSEDEV_EMUL_EXPS = 2,
1:  };
1:  
1:  struct mousedev_motion {
1: -	int dx;
1: -	int dy;
1: -	int dz;
1: -	long unsigned int buttons;
1: +  int dx;
1: +  int dy;
1: +  int dz;
1: +  long unsigned int buttons;
1:  };
1:  
1:  struct mousedev_client {
1: -	struct fasync_struct *fasync;
1: -	struct mousedev *mousedev;
1: -	struct list_head node;
1: -	struct mousedev_motion packets[16];
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	spinlock_t packet_lock;
1: -	int pos_x;
1: -	int pos_y;
1: -	u8 ps2[6];
1: -	unsigned char ready;
1: -	unsigned char buffer;
1: -	unsigned char bufsiz;
1: -	unsigned char imexseq;
1: -	unsigned char impsseq;
1: -	enum mousedev_emul mode;
1: -	long unsigned int last_buttons;
1: +  struct fasync_struct *fasync;
1: +  struct mousedev *mousedev;
1: +  struct list_head node;
1: +  struct mousedev_motion packets[16];
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  spinlock_t packet_lock;
1: +  int pos_x;
1: +  int pos_y;
1: +  u8 ps2[6];
1: +  unsigned char ready;
1: +  unsigned char buffer;
1: +  unsigned char bufsiz;
1: +  unsigned char imexseq;
1: +  unsigned char impsseq;
1: +  enum mousedev_emul mode;
1: +  long unsigned int last_buttons;
1:  };
1:  
1:  enum {
1: -	FRACTION_DENOM = 128,
1: +  FRACTION_DENOM = 128,
1:  };
1:  
1:  struct input_mask {
1: -	__u32 type;
1: -	__u32 codes_size;
1: -	__u64 codes_ptr;
1: +  __u32 type;
1: +  __u32 codes_size;
1: +  __u64 codes_ptr;
1:  };
1:  
1:  struct evdev_client;
1:  
1:  struct evdev {
1: -	int open;
1: -	struct input_handle handle;
1: -	struct evdev_client *grab;
1: -	struct list_head client_list;
1: -	spinlock_t client_lock;
1: -	struct mutex mutex;
1: -	struct device dev;
1: -	struct cdev cdev;
1: -	bool exist;
1: +  int open;
1: +  struct input_handle handle;
1: +  struct evdev_client *grab;
1: +  struct list_head client_list;
1: +  spinlock_t client_lock;
1: +  struct mutex mutex;
1: +  struct device dev;
1: +  struct cdev cdev;
1: +  bool exist;
1:  };
1:  
1:  struct evdev_client {
1: -	unsigned int head;
1: -	unsigned int tail;
1: -	unsigned int packet_head;
1: -	spinlock_t buffer_lock;
1: -	wait_queue_head_t wait;
1: -	struct fasync_struct *fasync;
1: -	struct evdev *evdev;
1: -	struct list_head node;
1: -	enum input_clock_type clk_type;
1: -	bool revoked;
1: -	long unsigned int *evmasks[32];
1: -	unsigned int bufsize;
1: -	struct input_event buffer[0];
1: +  unsigned int head;
1: +  unsigned int tail;
1: +  unsigned int packet_head;
1: +  spinlock_t buffer_lock;
1: +  wait_queue_head_t wait;
1: +  struct fasync_struct *fasync;
1: +  struct evdev *evdev;
1: +  struct list_head node;
1: +  enum input_clock_type clk_type;
1: +  bool revoked;
1: +  long unsigned int *evmasks[32];
1: +  unsigned int bufsize;
1: +  struct input_event buffer[0];
1:  };
1:  
1:  struct atkbd {
1: -	struct ps2dev ps2dev;
1: -	struct input_dev *dev;
1: -	char name[64];
1: -	char phys[32];
1: -	short unsigned int id;
1: -	short unsigned int keycode[512];
1: -	long unsigned int force_release_mask[8];
1: -	unsigned char set;
1: -	bool translated;
1: -	bool extra;
1: -	bool write;
1: -	bool softrepeat;
1: -	bool softraw;
1: -	bool scroll;
1: -	bool enabled;
1: -	unsigned char emul;
1: -	bool resend;
1: -	bool release;
1: -	long unsigned int xl_bit;
1: -	unsigned int last;
1: -	long unsigned int time;
1: -	long unsigned int err_count;
1: -	struct delayed_work event_work;
1: -	long unsigned int event_jiffies;
1: -	long unsigned int event_mask;
1: -	struct mutex mutex;
1: -	u32 function_row_physmap[24];
1: -	int num_function_row_keys;
1: +  struct ps2dev ps2dev;
1: +  struct input_dev *dev;
1: +  char name[64];
1: +  char phys[32];
1: +  short unsigned int id;
1: +  short unsigned int keycode[512];
1: +  long unsigned int force_release_mask[8];
1: +  unsigned char set;
1: +  bool translated;
1: +  bool extra;
1: +  bool write;
1: +  bool softrepeat;
1: +  bool softraw;
1: +  bool scroll;
1: +  bool enabled;
1: +  unsigned char emul;
1: +  bool resend;
1: +  bool release;
1: +  long unsigned int xl_bit;
1: +  unsigned int last;
1: +  long unsigned int time;
1: +  long unsigned int err_count;
1: +  struct delayed_work event_work;
1: +  long unsigned int event_jiffies;
1: +  long unsigned int event_mask;
1: +  struct mutex mutex;
1: +  u32 function_row_physmap[24];
1: +  int num_function_row_keys;
1:  };
1:  
1:  enum psmouse_state {
1: -	PSMOUSE_IGNORE = 0,
1: -	PSMOUSE_INITIALIZING = 1,
1: -	PSMOUSE_RESYNCING = 2,
1: -	PSMOUSE_CMD_MODE = 3,
1: -	PSMOUSE_ACTIVATED = 4,
1: +  PSMOUSE_IGNORE = 0,
1: +  PSMOUSE_INITIALIZING = 1,
1: +  PSMOUSE_RESYNCING = 2,
1: +  PSMOUSE_CMD_MODE = 3,
1: +  PSMOUSE_ACTIVATED = 4,
1:  };
1:  
1:  typedef enum {
1: -	PSMOUSE_BAD_DATA = 0,
1: -	PSMOUSE_GOOD_DATA = 1,
1: -	PSMOUSE_FULL_PACKET = 2,
1: +  PSMOUSE_BAD_DATA = 0,
1: +  PSMOUSE_GOOD_DATA = 1,
1: +  PSMOUSE_FULL_PACKET = 2,
1:  } psmouse_ret_t;
1:  
1:  enum psmouse_scale {
1: -	PSMOUSE_SCALE11 = 0,
1: -	PSMOUSE_SCALE21 = 1,
1: +  PSMOUSE_SCALE11 = 0,
1: +  PSMOUSE_SCALE21 = 1,
1:  };
1:  
1:  enum psmouse_type {
1: -	PSMOUSE_NONE = 0,
1: -	PSMOUSE_PS2 = 1,
1: -	PSMOUSE_PS2PP = 2,
1: -	PSMOUSE_THINKPS = 3,
1: -	PSMOUSE_GENPS = 4,
1: -	PSMOUSE_IMPS = 5,
1: -	PSMOUSE_IMEX = 6,
1: -	PSMOUSE_SYNAPTICS = 7,
1: -	PSMOUSE_ALPS = 8,
1: -	PSMOUSE_LIFEBOOK = 9,
1: -	PSMOUSE_TRACKPOINT = 10,
1: -	PSMOUSE_TOUCHKIT_PS2 = 11,
1: -	PSMOUSE_CORTRON = 12,
1: -	PSMOUSE_HGPK = 13,
1: -	PSMOUSE_ELANTECH = 14,
1: -	PSMOUSE_FSP = 15,
1: -	PSMOUSE_SYNAPTICS_RELATIVE = 16,
1: -	PSMOUSE_CYPRESS = 17,
1: -	PSMOUSE_FOCALTECH = 18,
1: -	PSMOUSE_VMMOUSE = 19,
1: -	PSMOUSE_BYD = 20,
1: -	PSMOUSE_SYNAPTICS_SMBUS = 21,
1: -	PSMOUSE_ELANTECH_SMBUS = 22,
1: -	PSMOUSE_AUTO = 23,
1: +  PSMOUSE_NONE = 0,
1: +  PSMOUSE_PS2 = 1,
1: +  PSMOUSE_PS2PP = 2,
1: +  PSMOUSE_THINKPS = 3,
1: +  PSMOUSE_GENPS = 4,
1: +  PSMOUSE_IMPS = 5,
1: +  PSMOUSE_IMEX = 6,
1: +  PSMOUSE_SYNAPTICS = 7,
1: +  PSMOUSE_ALPS = 8,
1: +  PSMOUSE_LIFEBOOK = 9,
1: +  PSMOUSE_TRACKPOINT = 10,
1: +  PSMOUSE_TOUCHKIT_PS2 = 11,
1: +  PSMOUSE_CORTRON = 12,
1: +  PSMOUSE_HGPK = 13,
1: +  PSMOUSE_ELANTECH = 14,
1: +  PSMOUSE_FSP = 15,
1: +  PSMOUSE_SYNAPTICS_RELATIVE = 16,
1: +  PSMOUSE_CYPRESS = 17,
1: +  PSMOUSE_FOCALTECH = 18,
1: +  PSMOUSE_VMMOUSE = 19,
1: +  PSMOUSE_BYD = 20,
1: +  PSMOUSE_SYNAPTICS_SMBUS = 21,
1: +  PSMOUSE_ELANTECH_SMBUS = 22,
1: +  PSMOUSE_AUTO = 23,
1:  };
1:  
1:  struct psmouse;
1:  
1:  struct psmouse_protocol {
1: -	enum psmouse_type type;
1: -	bool maxproto;
1: -	bool ignore_parity;
1: -	bool try_passthru;
1: -	bool smbus_companion;
1: -	const char *name;
1: -	const char *alias;
1: -	int (*detect)(struct psmouse *, bool);
1: -	int (*init)(struct psmouse *);
1: +  enum psmouse_type type;
1: +  bool maxproto;
1: +  bool ignore_parity;
1: +  bool try_passthru;
1: +  bool smbus_companion;
1: +  const char *name;
1: +  const char *alias;
1: +  int (*detect)(struct psmouse *, bool);
1: +  int (*init)(struct psmouse *);
1:  };
1:  
1:  struct psmouse {
1: -	void *private;
1: -	struct input_dev *dev;
1: -	struct ps2dev ps2dev;
1: -	struct delayed_work resync_work;
1: -	const char *vendor;
1: -	const char *name;
1: -	const struct psmouse_protocol *protocol;
1: -	unsigned char packet[8];
1: -	unsigned char badbyte;
1: -	unsigned char pktcnt;
1: -	unsigned char pktsize;
1: -	unsigned char oob_data_type;
1: -	unsigned char extra_buttons;
1: -	bool acks_disable_command;
1: -	unsigned int model;
1: -	long unsigned int last;
1: -	long unsigned int out_of_sync_cnt;
1: -	long unsigned int num_resyncs;
1: -	enum psmouse_state state;
1: -	char devname[64];
1: -	char phys[32];
1: -	unsigned int rate;
1: -	unsigned int resolution;
1: -	unsigned int resetafter;
1: -	unsigned int resync_time;
1: -	bool smartscroll;
1: -	psmouse_ret_t (*protocol_handler)(struct psmouse *);
1: -	void (*set_rate)(struct psmouse *, unsigned int);
1: -	void (*set_resolution)(struct psmouse *, unsigned int);
1: -	void (*set_scale)(struct psmouse *, enum psmouse_scale);
1: -	int (*reconnect)(struct psmouse *);
1: -	int (*fast_reconnect)(struct psmouse *);
1: -	void (*disconnect)(struct psmouse *);
1: -	void (*cleanup)(struct psmouse *);
1: -	int (*poll)(struct psmouse *);
1: -	void (*pt_activate)(struct psmouse *);
1: -	void (*pt_deactivate)(struct psmouse *);
1: +  void *private;
1: +  struct input_dev *dev;
1: +  struct ps2dev ps2dev;
1: +  struct delayed_work resync_work;
1: +  const char *vendor;
1: +  const char *name;
1: +  const struct psmouse_protocol *protocol;
1: +  unsigned char packet[8];
1: +  unsigned char badbyte;
1: +  unsigned char pktcnt;
1: +  unsigned char pktsize;
1: +  unsigned char oob_data_type;
1: +  unsigned char extra_buttons;
1: +  bool acks_disable_command;
1: +  unsigned int model;
1: +  long unsigned int last;
1: +  long unsigned int out_of_sync_cnt;
1: +  long unsigned int num_resyncs;
1: +  enum psmouse_state state;
1: +  char devname[64];
1: +  char phys[32];
1: +  unsigned int rate;
1: +  unsigned int resolution;
1: +  unsigned int resetafter;
1: +  unsigned int resync_time;
1: +  bool smartscroll;
1: +  psmouse_ret_t (*protocol_handler)(struct psmouse *);
1: +  void (*set_rate)(struct psmouse *, unsigned int);
1: +  void (*set_resolution)(struct psmouse *, unsigned int);
1: +  void (*set_scale)(struct psmouse *, enum psmouse_scale);
1: +  int (*reconnect)(struct psmouse *);
1: +  int (*fast_reconnect)(struct psmouse *);
1: +  void (*disconnect)(struct psmouse *);
1: +  void (*cleanup)(struct psmouse *);
1: +  int (*poll)(struct psmouse *);
1: +  void (*pt_activate)(struct psmouse *);
1: +  void (*pt_deactivate)(struct psmouse *);
1:  };
1:  
1:  struct psmouse_attribute {
1: -	struct device_attribute dattr;
1: -	void *data;
1: -	ssize_t (*show)(struct psmouse *, void *, char *);
1: -	ssize_t (*set)(struct psmouse *, void *, const char *, size_t);
1: -	bool protect;
1: +  struct device_attribute dattr;
1: +  void *data;
1: +  ssize_t (*show)(struct psmouse *, void *, char *);
1: +  ssize_t (*set)(struct psmouse *, void *, const char *, size_t);
1: +  bool protect;
1:  };
1:  
1:  enum synaptics_pkt_type {
1: -	SYN_NEWABS = 0,
1: -	SYN_NEWABS_STRICT = 1,
1: -	SYN_NEWABS_RELAXED = 2,
1: -	SYN_OLDABS = 3,
1: +  SYN_NEWABS = 0,
1: +  SYN_NEWABS_STRICT = 1,
1: +  SYN_NEWABS_RELAXED = 2,
1: +  SYN_OLDABS = 3,
1:  };
1:  
1:  struct synaptics_hw_state {
1: -	int x;
1: -	int y;
1: -	int z;
1: -	int w;
1: -	unsigned int left: 1;
1: -	unsigned int right: 1;
1: -	unsigned int middle: 1;
1: -	unsigned int up: 1;
1: -	unsigned int down: 1;
1: -	u8 ext_buttons;
1: -	s8 scroll;
1: +  int x;
1: +  int y;
1: +  int z;
1: +  int w;
1: +  unsigned int left : 1;
1: +  unsigned int right : 1;
1: +  unsigned int middle : 1;
1: +  unsigned int up : 1;
1: +  unsigned int down : 1;
1: +  u8 ext_buttons;
1: +  s8 scroll;
1:  };
1:  
1:  struct synaptics_device_info {
1: -	u32 model_id;
1: -	u32 firmware_id;
1: -	u32 board_id;
1: -	u32 capabilities;
1: -	u32 ext_cap;
1: -	u32 ext_cap_0c;
1: -	u32 ext_cap_10;
1: -	u32 identity;
1: -	u32 x_res;
1: -	u32 y_res;
1: -	u32 x_max;
1: -	u32 y_max;
1: -	u32 x_min;
1: -	u32 y_min;
1: +  u32 model_id;
1: +  u32 firmware_id;
1: +  u32 board_id;
1: +  u32 capabilities;
1: +  u32 ext_cap;
1: +  u32 ext_cap_0c;
1: +  u32 ext_cap_10;
1: +  u32 identity;
1: +  u32 x_res;
1: +  u32 y_res;
1: +  u32 x_max;
1: +  u32 y_max;
1: +  u32 x_min;
1: +  u32 y_min;
1:  };
1:  
1:  struct synaptics_data {
1: -	struct synaptics_device_info info;
1: -	enum synaptics_pkt_type pkt_type;
1: -	u8 mode;
1: -	int scroll;
1: -	bool absolute_mode;
1: -	bool disable_gesture;
1: -	struct serio *pt_port;
1: -	struct synaptics_hw_state agm;
1: -	unsigned int agm_count;
1: -	long unsigned int press_start;
1: -	bool press;
1: -	bool report_press;
1: -	bool is_forcepad;
1: +  struct synaptics_device_info info;
1: +  enum synaptics_pkt_type pkt_type;
1: +  u8 mode;
1: +  int scroll;
1: +  bool absolute_mode;
1: +  bool disable_gesture;
1: +  struct serio *pt_port;
1: +  struct synaptics_hw_state agm;
1: +  unsigned int agm_count;
1: +  long unsigned int press_start;
1: +  bool press;
1: +  bool report_press;
1: +  bool is_forcepad;
1:  };
1:  
1:  struct min_max_quirk {
1: -	const char * const *pnp_ids;
1: -	struct {
1: -		u32 min;
1: -		u32 max;
1: -	} board_id;
1: -	u32 x_min;
1: -	u32 x_max;
1: -	u32 y_min;
1: -	u32 y_max;
1: +  const char *const *pnp_ids;
1: +  struct {
1: +    u32 min;
1: +    u32 max;
1: +  } board_id;
1: +  u32 x_min;
1: +  u32 x_max;
1: +  u32 y_min;
1: +  u32 y_max;
1:  };
1:  
1:  enum SS4_PACKET_ID {
1: -	SS4_PACKET_ID_IDLE = 0,
1: -	SS4_PACKET_ID_ONE = 1,
1: -	SS4_PACKET_ID_TWO = 2,
1: -	SS4_PACKET_ID_MULTI = 3,
1: -	SS4_PACKET_ID_STICK = 4,
1: +  SS4_PACKET_ID_IDLE = 0,
1: +  SS4_PACKET_ID_ONE = 1,
1: +  SS4_PACKET_ID_TWO = 2,
1: +  SS4_PACKET_ID_MULTI = 3,
1: +  SS4_PACKET_ID_STICK = 4,
1:  };
1:  
1:  enum V7_PACKET_ID {
1: -	V7_PACKET_ID_IDLE = 0,
1: -	V7_PACKET_ID_TWO = 1,
1: -	V7_PACKET_ID_MULTI = 2,
1: -	V7_PACKET_ID_NEW = 3,
1: -	V7_PACKET_ID_UNKNOWN = 4,
1: +  V7_PACKET_ID_IDLE = 0,
1: +  V7_PACKET_ID_TWO = 1,
1: +  V7_PACKET_ID_MULTI = 2,
1: +  V7_PACKET_ID_NEW = 3,
1: +  V7_PACKET_ID_UNKNOWN = 4,
1:  };
1:  
1:  struct alps_protocol_info {
1: -	u16 version;
1: -	u8 byte0;
1: -	u8 mask0;
1: -	unsigned int flags;
1: +  u16 version;
1: +  u8 byte0;
1: +  u8 mask0;
1: +  unsigned int flags;
1:  };
1:  
1:  struct alps_model_info {
1: -	u8 signature[3];
1: -	struct alps_protocol_info protocol_info;
1: +  u8 signature[3];
1: +  struct alps_protocol_info protocol_info;
1:  };
1:  
1:  struct alps_nibble_commands {
1: -	int command;
1: -	unsigned char data;
1: +  int command;
1: +  unsigned char data;
1:  };
1:  
1:  struct alps_bitmap_point {
1: -	int start_bit;
1: -	int num_bits;
1: +  int start_bit;
1: +  int num_bits;
1:  };
1:  
1:  struct alps_fields {
1: -	unsigned int x_map;
1: -	unsigned int y_map;
1: -	unsigned int fingers;
1: -	int pressure;
1: -	struct input_mt_pos st;
1: -	struct input_mt_pos mt[4];
1: -	unsigned int first_mp: 1;
1: -	unsigned int is_mp: 1;
1: -	unsigned int left: 1;
1: -	unsigned int right: 1;
1: -	unsigned int middle: 1;
1: -	unsigned int ts_left: 1;
1: -	unsigned int ts_right: 1;
1: -	unsigned int ts_middle: 1;
1: +  unsigned int x_map;
1: +  unsigned int y_map;
1: +  unsigned int fingers;
1: +  int pressure;
1: +  struct input_mt_pos st;
1: +  struct input_mt_pos mt[4];
1: +  unsigned int first_mp : 1;
1: +  unsigned int is_mp : 1;
1: +  unsigned int left : 1;
1: +  unsigned int right : 1;
1: +  unsigned int middle : 1;
1: +  unsigned int ts_left : 1;
1: +  unsigned int ts_right : 1;
1: +  unsigned int ts_middle : 1;
1:  };
1:  
1:  struct alps_data {
1: -	struct psmouse *psmouse;
1: -	struct input_dev *dev2;
1: -	struct input_dev *dev3;
1: -	char phys2[32];
1: -	char phys3[32];
1: -	struct delayed_work dev3_register_work;
1: -	const struct alps_nibble_commands *nibble_commands;
1: -	int addr_command;
1: -	u16 proto_version;
1: -	u8 byte0;
1: -	u8 mask0;
1: -	u8 dev_id[3];
1: -	u8 fw_ver[3];
1: -	int flags;
1: -	int x_max;
1: -	int y_max;
1: -	int x_bits;
1: -	int y_bits;
1: -	unsigned int x_res;
1: -	unsigned int y_res;
1: -	int (*hw_init)(struct psmouse *);
1: -	void (*process_packet)(struct psmouse *);
1: -	int (*decode_fields)(struct alps_fields *, unsigned char *, struct psmouse *);
1: -	void (*set_abs_params)(struct alps_data *, struct input_dev *);
1: -	int prev_fin;
1: -	int multi_packet;
1: -	int second_touch;
1: -	unsigned char multi_data[6];
1: -	struct alps_fields f;
1: -	u8 quirks;
1: -	struct timer_list timer;
1: +  struct psmouse *psmouse;
1: +  struct input_dev *dev2;
1: +  struct input_dev *dev3;
1: +  char phys2[32];
1: +  char phys3[32];
1: +  struct delayed_work dev3_register_work;
1: +  const struct alps_nibble_commands *nibble_commands;
1: +  int addr_command;
1: +  u16 proto_version;
1: +  u8 byte0;
1: +  u8 mask0;
1: +  u8 dev_id[3];
1: +  u8 fw_ver[3];
1: +  int flags;
1: +  int x_max;
1: +  int y_max;
1: +  int x_bits;
1: +  int y_bits;
1: +  unsigned int x_res;
1: +  unsigned int y_res;
1: +  int (*hw_init)(struct psmouse *);
1: +  void (*process_packet)(struct psmouse *);
1: +  int (*decode_fields)(struct alps_fields *, unsigned char *, struct psmouse *);
1: +  void (*set_abs_params)(struct alps_data *, struct input_dev *);
1: +  int prev_fin;
1: +  int multi_packet;
1: +  int second_touch;
1: +  unsigned char multi_data[6];
1: +  struct alps_fields f;
1: +  u8 quirks;
1: +  struct timer_list timer;
1:  };
1:  
1:  struct byd_data {
1: -	struct timer_list timer;
1: -	struct psmouse *psmouse;
1: -	s32 abs_x;
1: -	s32 abs_y;
1: -	volatile long unsigned int last_touch_time;
1: -	bool btn_left;
1: -	bool btn_right;
1: -	bool touch;
1: +  struct timer_list timer;
1: +  struct psmouse *psmouse;
1: +  s32 abs_x;
1: +  s32 abs_y;
1: +  volatile long unsigned int last_touch_time;
1: +  bool btn_left;
1: +  bool btn_right;
1: +  bool touch;
1:  };
1:  
1:  struct ps2pp_info {
1: -	u8 model;
1: -	u8 kind;
1: -	u16 features;
1: +  u8 model;
1: +  u8 kind;
1: +  u16 features;
1:  };
1:  
1:  struct lifebook_data {
1: -	struct input_dev *dev2;
1: -	char phys[32];
1: +  struct input_dev *dev2;
1: +  char phys[32];
1:  };
1:  
1:  struct trackpoint_data {
1: -	u8 variant_id;
1: -	u8 firmware_id;
1: -	u8 sensitivity;
1: -	u8 speed;
1: -	u8 inertia;
1: -	u8 reach;
1: -	u8 draghys;
1: -	u8 mindrag;
1: -	u8 thresh;
1: -	u8 upthresh;
1: -	u8 ztime;
1: -	u8 jenks;
1: -	u8 drift_time;
1: -	bool press_to_select;
1: -	bool skipback;
1: -	bool ext_dev;
1: +  u8 variant_id;
1: +  u8 firmware_id;
1: +  u8 sensitivity;
1: +  u8 speed;
1: +  u8 inertia;
1: +  u8 reach;
1: +  u8 draghys;
1: +  u8 mindrag;
1: +  u8 thresh;
1: +  u8 upthresh;
1: +  u8 ztime;
1: +  u8 jenks;
1: +  u8 drift_time;
1: +  bool press_to_select;
1: +  bool skipback;
1: +  bool ext_dev;
1:  };
1:  
1:  struct trackpoint_attr_data {
1: -	size_t field_offset;
1: -	u8 command;
1: -	u8 mask;
1: -	bool inverted;
1: -	u8 power_on_default;
1: +  size_t field_offset;
1: +  u8 command;
1: +  u8 mask;
1: +  bool inverted;
1: +  u8 power_on_default;
1:  };
1:  
1:  struct cytp_contact {
1: -	int x;
1: -	int y;
1: -	int z;
1: +  int x;
1: +  int y;
1: +  int z;
1:  };
1:  
1:  struct cytp_report_data {
1: -	int contact_cnt;
1: -	struct cytp_contact contacts[2];
1: -	unsigned int left: 1;
1: -	unsigned int right: 1;
1: -	unsigned int middle: 1;
1: -	unsigned int tap: 1;
1: +  int contact_cnt;
1: +  struct cytp_contact contacts[2];
1: +  unsigned int left : 1;
1: +  unsigned int right : 1;
1: +  unsigned int middle : 1;
1: +  unsigned int tap : 1;
1:  };
1:  
1:  struct cytp_data {
1: -	int fw_version;
1: -	int pkt_size;
1: -	int mode;
1: -	int tp_min_pressure;
1: -	int tp_max_pressure;
1: -	int tp_width;
1: -	int tp_high;
1: -	int tp_max_abs_x;
1: -	int tp_max_abs_y;
1: -	int tp_res_x;
1: -	int tp_res_y;
1: -	int tp_metrics_supported;
1: +  int fw_version;
1: +  int pkt_size;
1: +  int mode;
1: +  int tp_min_pressure;
1: +  int tp_max_pressure;
1: +  int tp_width;
1: +  int tp_high;
1: +  int tp_max_abs_x;
1: +  int tp_max_abs_y;
1: +  int tp_res_x;
1: +  int tp_res_y;
1: +  int tp_metrics_supported;
1:  };
1:  
1:  struct trace_event_raw_rtc_time_alarm_class {
1: -	struct trace_entry ent;
1: -	time64_t secs;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  time64_t secs;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rtc_irq_set_freq {
1: -	struct trace_entry ent;
1: -	int freq;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int freq;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rtc_irq_set_state {
1: -	struct trace_entry ent;
1: -	int enabled;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int enabled;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rtc_alarm_irq_enable {
1: -	struct trace_entry ent;
1: -	unsigned int enabled;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int enabled;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rtc_offset_class {
1: -	struct trace_entry ent;
1: -	long int offset;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long int offset;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rtc_timer_class {
1: -	struct trace_entry ent;
1: -	struct rtc_timer *timer;
1: -	ktime_t expires;
1: -	ktime_t period;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct rtc_timer *timer;
1: +  ktime_t expires;
1: +  ktime_t period;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_rtc_time_alarm_class {};
1: @@ -108472,18 +109661,18 @@ typedef void (*btf_trace_rtc_timer_dequeue)(void *, struct rtc_timer *);
1:  typedef void (*btf_trace_rtc_timer_fired)(void *, struct rtc_timer *);
1:  
1:  enum {
1: -	none = 0,
1: -	day = 1,
1: -	month = 2,
1: -	year = 3,
1: +  none = 0,
1: +  day = 1,
1: +  month = 2,
1: +  year = 3,
1:  };
1:  
1:  struct nvmem_cell_info {
1: -	const char *name;
1: -	unsigned int offset;
1: -	unsigned int bytes;
1: -	unsigned int bit_offset;
1: -	unsigned int nbits;
1: +  const char *name;
1: +  unsigned int offset;
1: +  unsigned int bytes;
1: +  unsigned int bit_offset;
1: +  unsigned int nbits;
1:  };
1:  
1:  typedef int (*nvmem_reg_read_t)(void *, unsigned int, void *, size_t);
1: @@ -108491,237 +109680,237 @@ typedef int (*nvmem_reg_read_t)(void *, unsigned int, void *, size_t);
1:  typedef int (*nvmem_reg_write_t)(void *, unsigned int, void *, size_t);
1:  
1:  enum nvmem_type {
1: -	NVMEM_TYPE_UNKNOWN = 0,
1: -	NVMEM_TYPE_EEPROM = 1,
1: -	NVMEM_TYPE_OTP = 2,
1: -	NVMEM_TYPE_BATTERY_BACKED = 3,
1: +  NVMEM_TYPE_UNKNOWN = 0,
1: +  NVMEM_TYPE_EEPROM = 1,
1: +  NVMEM_TYPE_OTP = 2,
1: +  NVMEM_TYPE_BATTERY_BACKED = 3,
1:  };
1:  
1:  struct nvmem_config {
1: -	struct device *dev;
1: -	const char *name;
1: -	int id;
1: -	struct module *owner;
1: -	struct gpio_desc___2 *wp_gpio;
1: -	const struct nvmem_cell_info *cells;
1: -	int ncells;
1: -	enum nvmem_type type;
1: -	bool read_only;
1: -	bool root_only;
1: -	bool no_of_node;
1: -	nvmem_reg_read_t reg_read;
1: -	nvmem_reg_write_t reg_write;
1: -	int size;
1: -	int word_size;
1: -	int stride;
1: -	void *priv;
1: -	bool compat;
1: -	struct device *base_dev;
1: +  struct device *dev;
1: +  const char *name;
1: +  int id;
1: +  struct module *owner;
1: +  struct gpio_desc___2 *wp_gpio;
1: +  const struct nvmem_cell_info *cells;
1: +  int ncells;
1: +  enum nvmem_type type;
1: +  bool read_only;
1: +  bool root_only;
1: +  bool no_of_node;
1: +  nvmem_reg_read_t reg_read;
1: +  nvmem_reg_write_t reg_write;
1: +  int size;
1: +  int word_size;
1: +  int stride;
1: +  void *priv;
1: +  bool compat;
1: +  struct device *base_dev;
1:  };
1:  
1:  struct nvmem_device;
1:  
1:  struct cmos_rtc_board_info {
1: -	void (*wake_on)(struct device *);
1: -	void (*wake_off)(struct device *);
1: -	u32 flags;
1: -	int address_space;
1: -	u8 rtc_day_alarm;
1: -	u8 rtc_mon_alarm;
1: -	u8 rtc_century;
1: +  void (*wake_on)(struct device *);
1: +  void (*wake_off)(struct device *);
1: +  u32 flags;
1: +  int address_space;
1: +  u8 rtc_day_alarm;
1: +  u8 rtc_mon_alarm;
1: +  u8 rtc_century;
1:  };
1:  
1:  struct cmos_rtc {
1: -	struct rtc_device *rtc;
1: -	struct device *dev;
1: -	int irq;
1: -	struct resource *iomem;
1: -	time64_t alarm_expires;
1: -	void (*wake_on)(struct device *);
1: -	void (*wake_off)(struct device *);
1: -	u8 enabled_wake;
1: -	u8 suspend_ctrl;
1: -	u8 day_alrm;
1: -	u8 mon_alrm;
1: -	u8 century;
1: -	struct rtc_wkalrm saved_wkalrm;
1: +  struct rtc_device *rtc;
1: +  struct device *dev;
1: +  int irq;
1: +  struct resource *iomem;
1: +  time64_t alarm_expires;
1: +  void (*wake_on)(struct device *);
1: +  void (*wake_off)(struct device *);
1: +  u8 enabled_wake;
1: +  u8 suspend_ctrl;
1: +  u8 day_alrm;
1: +  u8 mon_alrm;
1: +  u8 century;
1: +  struct rtc_wkalrm saved_wkalrm;
1:  };
1:  
1:  struct i2c_board_info {
1: -	char type[20];
1: -	short unsigned int flags;
1: -	short unsigned int addr;
1: -	const char *dev_name;
1: -	void *platform_data;
1: -	struct device_node *of_node;
1: -	struct fwnode_handle *fwnode;
1: -	const struct property_entry *properties;
1: -	const struct resource *resources;
1: -	unsigned int num_resources;
1: -	int irq;
1: +  char type[20];
1: +  short unsigned int flags;
1: +  short unsigned int addr;
1: +  const char *dev_name;
1: +  void *platform_data;
1: +  struct device_node *of_node;
1: +  struct fwnode_handle *fwnode;
1: +  const struct property_entry *properties;
1: +  const struct resource *resources;
1: +  unsigned int num_resources;
1: +  int irq;
1:  };
1:  
1:  struct i2c_devinfo {
1: -	struct list_head list;
1: -	int busnum;
1: -	struct i2c_board_info board_info;
1: +  struct list_head list;
1: +  int busnum;
1: +  struct i2c_board_info board_info;
1:  };
1:  
1:  struct pps_ktime {
1: -	__s64 sec;
1: -	__s32 nsec;
1: -	__u32 flags;
1: +  __s64 sec;
1: +  __s32 nsec;
1: +  __u32 flags;
1:  };
1:  
1:  struct pps_ktime_compat {
1: -	__s64 sec;
1: -	__s32 nsec;
1: -	__u32 flags;
1: +  __s64 sec;
1: +  __s32 nsec;
1: +  __u32 flags;
1:  };
1:  
1:  struct pps_kinfo {
1: -	__u32 assert_sequence;
1: -	__u32 clear_sequence;
1: -	struct pps_ktime assert_tu;
1: -	struct pps_ktime clear_tu;
1: -	int current_mode;
1: +  __u32 assert_sequence;
1: +  __u32 clear_sequence;
1: +  struct pps_ktime assert_tu;
1: +  struct pps_ktime clear_tu;
1: +  int current_mode;
1:  };
1:  
1:  struct pps_kinfo_compat {
1: -	__u32 assert_sequence;
1: -	__u32 clear_sequence;
1: -	struct pps_ktime_compat assert_tu;
1: -	struct pps_ktime_compat clear_tu;
1: -	int current_mode;
1: +  __u32 assert_sequence;
1: +  __u32 clear_sequence;
1: +  struct pps_ktime_compat assert_tu;
1: +  struct pps_ktime_compat clear_tu;
1: +  int current_mode;
1:  } __attribute__((packed));
1:  
1:  struct pps_kparams {
1: -	int api_version;
1: -	int mode;
1: -	struct pps_ktime assert_off_tu;
1: -	struct pps_ktime clear_off_tu;
1: +  int api_version;
1: +  int mode;
1: +  struct pps_ktime assert_off_tu;
1: +  struct pps_ktime clear_off_tu;
1:  };
1:  
1:  struct pps_fdata {
1: -	struct pps_kinfo info;
1: -	struct pps_ktime timeout;
1: +  struct pps_kinfo info;
1: +  struct pps_ktime timeout;
1:  };
1:  
1:  struct pps_fdata_compat {
1: -	struct pps_kinfo_compat info;
1: -	struct pps_ktime_compat timeout;
1: +  struct pps_kinfo_compat info;
1: +  struct pps_ktime_compat timeout;
1:  } __attribute__((packed));
1:  
1:  struct pps_bind_args {
1: -	int tsformat;
1: -	int edge;
1: -	int consumer;
1: +  int tsformat;
1: +  int edge;
1: +  int consumer;
1:  };
1:  
1:  struct pps_device;
1:  
1:  struct pps_source_info {
1: -	char name[32];
1: -	char path[32];
1: -	int mode;
1: -	void (*echo)(struct pps_device *, int, void *);
1: -	struct module *owner;
1: -	struct device *dev;
1: +  char name[32];
1: +  char path[32];
1: +  int mode;
1: +  void (*echo)(struct pps_device *, int, void *);
1: +  struct module *owner;
1: +  struct device *dev;
1:  };
1:  
1:  struct pps_device {
1: -	struct pps_source_info info;
1: -	struct pps_kparams params;
1: -	__u32 assert_sequence;
1: -	__u32 clear_sequence;
1: -	struct pps_ktime assert_tu;
1: -	struct pps_ktime clear_tu;
1: -	int current_mode;
1: -	unsigned int last_ev;
1: -	wait_queue_head_t queue;
1: -	unsigned int id;
1: -	const void *lookup_cookie;
1: -	struct cdev cdev;
1: -	struct device *dev;
1: -	struct fasync_struct *async_queue;
1: -	spinlock_t lock;
1: +  struct pps_source_info info;
1: +  struct pps_kparams params;
1: +  __u32 assert_sequence;
1: +  __u32 clear_sequence;
1: +  struct pps_ktime assert_tu;
1: +  struct pps_ktime clear_tu;
1: +  int current_mode;
1: +  unsigned int last_ev;
1: +  wait_queue_head_t queue;
1: +  unsigned int id;
1: +  const void *lookup_cookie;
1: +  struct cdev cdev;
1: +  struct device *dev;
1: +  struct fasync_struct *async_queue;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct ptp_extts_event {
1: -	struct ptp_clock_time t;
1: -	unsigned int index;
1: -	unsigned int flags;
1: -	unsigned int rsv[2];
1: +  struct ptp_clock_time t;
1: +  unsigned int index;
1: +  unsigned int flags;
1: +  unsigned int rsv[2];
1:  };
1:  
1:  struct timestamp_event_queue {
1: -	struct ptp_extts_event buf[128];
1: -	int head;
1: -	int tail;
1: -	spinlock_t lock;
1: +  struct ptp_extts_event buf[128];
1: +  int head;
1: +  int tail;
1: +  spinlock_t lock;
1:  };
1:  
1:  struct ptp_clock___2 {
1: -	struct posix_clock clock;
1: -	struct device dev;
1: -	struct ptp_clock_info *info;
1: -	dev_t devid;
1: -	int index;
1: -	struct pps_device *pps_source;
1: -	long int dialed_frequency;
1: -	struct timestamp_event_queue tsevq;
1: -	struct mutex tsevq_mux;
1: -	struct mutex pincfg_mux;
1: -	wait_queue_head_t tsev_wq;
1: -	int defunct;
1: -	struct device_attribute *pin_dev_attr;
1: -	struct attribute **pin_attr;
1: -	struct attribute_group pin_attr_group;
1: -	const struct attribute_group *pin_attr_groups[2];
1: -	struct kthread_worker *kworker;
1: -	struct kthread_delayed_work aux_work;
1: +  struct posix_clock clock;
1: +  struct device dev;
1: +  struct ptp_clock_info *info;
1: +  dev_t devid;
1: +  int index;
1: +  struct pps_device *pps_source;
1: +  long int dialed_frequency;
1: +  struct timestamp_event_queue tsevq;
1: +  struct mutex tsevq_mux;
1: +  struct mutex pincfg_mux;
1: +  wait_queue_head_t tsev_wq;
1: +  int defunct;
1: +  struct device_attribute *pin_dev_attr;
1: +  struct attribute **pin_attr;
1: +  struct attribute_group pin_attr_group;
1: +  const struct attribute_group *pin_attr_groups[2];
1: +  struct kthread_worker *kworker;
1: +  struct kthread_delayed_work aux_work;
1:  };
1:  
1:  struct ptp_clock_caps {
1: -	int max_adj;
1: -	int n_alarm;
1: -	int n_ext_ts;
1: -	int n_per_out;
1: -	int pps;
1: -	int n_pins;
1: -	int cross_timestamping;
1: -	int adjust_phase;
1: -	int rsv[12];
1: +  int max_adj;
1: +  int n_alarm;
1: +  int n_ext_ts;
1: +  int n_per_out;
1: +  int pps;
1: +  int n_pins;
1: +  int cross_timestamping;
1: +  int adjust_phase;
1: +  int rsv[12];
1:  };
1:  
1:  struct ptp_sys_offset {
1: -	unsigned int n_samples;
1: -	unsigned int rsv[3];
1: -	struct ptp_clock_time ts[51];
1: +  unsigned int n_samples;
1: +  unsigned int rsv[3];
1: +  struct ptp_clock_time ts[51];
1:  };
1:  
1:  struct ptp_sys_offset_extended {
1: -	unsigned int n_samples;
1: -	unsigned int rsv[3];
1: -	struct ptp_clock_time ts[75];
1: +  unsigned int n_samples;
1: +  unsigned int rsv[3];
1: +  struct ptp_clock_time ts[75];
1:  };
1:  
1:  struct ptp_sys_offset_precise {
1: -	struct ptp_clock_time device;
1: -	struct ptp_clock_time sys_realtime;
1: -	struct ptp_clock_time sys_monoraw;
1: -	unsigned int rsv[4];
1: +  struct ptp_clock_time device;
1: +  struct ptp_clock_time sys_realtime;
1: +  struct ptp_clock_time sys_monoraw;
1: +  unsigned int rsv[4];
1:  };
1:  
1:  enum led_brightness {
1: -	LED_OFF = 0,
1: -	LED_ON = 1,
1: -	LED_HALF = 127,
1: -	LED_FULL = 255,
1: +  LED_OFF = 0,
1: +  LED_ON = 1,
1: +  LED_HALF = 127,
1: +  LED_FULL = 255,
1:  };
1:  
1:  struct led_hw_trigger_type {
1: -	int dummy;
1: +  int dummy;
1:  };
1:  
1:  struct led_pattern;
1: @@ -108729,607 +109918,616 @@ struct led_pattern;
1:  struct led_trigger;
1:  
1:  struct led_classdev {
1: -	const char *name;
1: -	enum led_brightness brightness;
1: -	enum led_brightness max_brightness;
1: -	int flags;
1: -	long unsigned int work_flags;
1: -	void (*brightness_set)(struct led_classdev *, enum led_brightness);
1: -	int (*brightness_set_blocking)(struct led_classdev *, enum led_brightness);
1: -	enum led_brightness (*brightness_get)(struct led_classdev *);
1: -	int (*blink_set)(struct led_classdev *, long unsigned int *, long unsigned int *);
1: -	int (*pattern_set)(struct led_classdev *, struct led_pattern *, u32, int);
1: -	int (*pattern_clear)(struct led_classdev *);
1: -	struct device *dev;
1: -	const struct attribute_group **groups;
1: -	struct list_head node;
1: -	const char *default_trigger;
1: -	long unsigned int blink_delay_on;
1: -	long unsigned int blink_delay_off;
1: -	struct timer_list blink_timer;
1: -	int blink_brightness;
1: -	int new_blink_brightness;
1: -	void (*flash_resume)(struct led_classdev *);
1: -	struct work_struct set_brightness_work;
1: -	int delayed_set_value;
1: -	struct rw_semaphore trigger_lock;
1: -	struct led_trigger *trigger;
1: -	struct list_head trig_list;
1: -	void *trigger_data;
1: -	bool activated;
1: -	struct led_hw_trigger_type *trigger_type;
1: -	struct mutex led_access;
1: +  const char *name;
1: +  enum led_brightness brightness;
1: +  enum led_brightness max_brightness;
1: +  int flags;
1: +  long unsigned int work_flags;
1: +  void (*brightness_set)(struct led_classdev *, enum led_brightness);
1: +  int (*brightness_set_blocking)(struct led_classdev *, enum led_brightness);
1: +  enum led_brightness (*brightness_get)(struct led_classdev *);
1: +  int (*blink_set)(struct led_classdev *, long unsigned int *,
1: +                   long unsigned int *);
1: +  int (*pattern_set)(struct led_classdev *, struct led_pattern *, u32, int);
1: +  int (*pattern_clear)(struct led_classdev *);
1: +  struct device *dev;
1: +  const struct attribute_group **groups;
1: +  struct list_head node;
1: +  const char *default_trigger;
1: +  long unsigned int blink_delay_on;
1: +  long unsigned int blink_delay_off;
1: +  struct timer_list blink_timer;
1: +  int blink_brightness;
1: +  int new_blink_brightness;
1: +  void (*flash_resume)(struct led_classdev *);
1: +  struct work_struct set_brightness_work;
1: +  int delayed_set_value;
1: +  struct rw_semaphore trigger_lock;
1: +  struct led_trigger *trigger;
1: +  struct list_head trig_list;
1: +  void *trigger_data;
1: +  bool activated;
1: +  struct led_hw_trigger_type *trigger_type;
1: +  struct mutex led_access;
1:  };
1:  
1:  struct led_pattern {
1: -	u32 delta_t;
1: -	int brightness;
1: +  u32 delta_t;
1: +  int brightness;
1:  };
1:  
1:  struct led_trigger {
1: -	const char *name;
1: -	int (*activate)(struct led_classdev *);
1: -	void (*deactivate)(struct led_classdev *);
1: -	struct led_hw_trigger_type *trigger_type;
1: -	rwlock_t leddev_list_lock;
1: -	struct list_head led_cdevs;
1: -	struct list_head next_trig;
1: -	const struct attribute_group **groups;
1: +  const char *name;
1: +  int (*activate)(struct led_classdev *);
1: +  void (*deactivate)(struct led_classdev *);
1: +  struct led_hw_trigger_type *trigger_type;
1: +  rwlock_t leddev_list_lock;
1: +  struct list_head led_cdevs;
1: +  struct list_head next_trig;
1: +  const struct attribute_group **groups;
1:  };
1:  
1:  enum power_supply_property {
1: -	POWER_SUPPLY_PROP_STATUS = 0,
1: -	POWER_SUPPLY_PROP_CHARGE_TYPE = 1,
1: -	POWER_SUPPLY_PROP_HEALTH = 2,
1: -	POWER_SUPPLY_PROP_PRESENT = 3,
1: -	POWER_SUPPLY_PROP_ONLINE = 4,
1: -	POWER_SUPPLY_PROP_AUTHENTIC = 5,
1: -	POWER_SUPPLY_PROP_TECHNOLOGY = 6,
1: -	POWER_SUPPLY_PROP_CYCLE_COUNT = 7,
1: -	POWER_SUPPLY_PROP_VOLTAGE_MAX = 8,
1: -	POWER_SUPPLY_PROP_VOLTAGE_MIN = 9,
1: -	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN = 10,
1: -	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN = 11,
1: -	POWER_SUPPLY_PROP_VOLTAGE_NOW = 12,
1: -	POWER_SUPPLY_PROP_VOLTAGE_AVG = 13,
1: -	POWER_SUPPLY_PROP_VOLTAGE_OCV = 14,
1: -	POWER_SUPPLY_PROP_VOLTAGE_BOOT = 15,
1: -	POWER_SUPPLY_PROP_CURRENT_MAX = 16,
1: -	POWER_SUPPLY_PROP_CURRENT_NOW = 17,
1: -	POWER_SUPPLY_PROP_CURRENT_AVG = 18,
1: -	POWER_SUPPLY_PROP_CURRENT_BOOT = 19,
1: -	POWER_SUPPLY_PROP_POWER_NOW = 20,
1: -	POWER_SUPPLY_PROP_POWER_AVG = 21,
1: -	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN = 22,
1: -	POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN = 23,
1: -	POWER_SUPPLY_PROP_CHARGE_FULL = 24,
1: -	POWER_SUPPLY_PROP_CHARGE_EMPTY = 25,
1: -	POWER_SUPPLY_PROP_CHARGE_NOW = 26,
1: -	POWER_SUPPLY_PROP_CHARGE_AVG = 27,
1: -	POWER_SUPPLY_PROP_CHARGE_COUNTER = 28,
1: -	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT = 29,
1: -	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX = 30,
1: -	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE = 31,
1: -	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX = 32,
1: -	POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT = 33,
1: -	POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX = 34,
1: -	POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD = 35,
1: -	POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD = 36,
1: -	POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT = 37,
1: -	POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT = 38,
1: -	POWER_SUPPLY_PROP_INPUT_POWER_LIMIT = 39,
1: -	POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN = 40,
1: -	POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN = 41,
1: -	POWER_SUPPLY_PROP_ENERGY_FULL = 42,
1: -	POWER_SUPPLY_PROP_ENERGY_EMPTY = 43,
1: -	POWER_SUPPLY_PROP_ENERGY_NOW = 44,
1: -	POWER_SUPPLY_PROP_ENERGY_AVG = 45,
1: -	POWER_SUPPLY_PROP_CAPACITY = 46,
1: -	POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN = 47,
1: -	POWER_SUPPLY_PROP_CAPACITY_ALERT_MAX = 48,
1: -	POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN = 49,
1: -	POWER_SUPPLY_PROP_CAPACITY_LEVEL = 50,
1: -	POWER_SUPPLY_PROP_TEMP = 51,
1: -	POWER_SUPPLY_PROP_TEMP_MAX = 52,
1: -	POWER_SUPPLY_PROP_TEMP_MIN = 53,
1: -	POWER_SUPPLY_PROP_TEMP_ALERT_MIN = 54,
1: -	POWER_SUPPLY_PROP_TEMP_ALERT_MAX = 55,
1: -	POWER_SUPPLY_PROP_TEMP_AMBIENT = 56,
1: -	POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN = 57,
1: -	POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX = 58,
1: -	POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW = 59,
1: -	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG = 60,
1: -	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW = 61,
1: -	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG = 62,
1: -	POWER_SUPPLY_PROP_TYPE = 63,
1: -	POWER_SUPPLY_PROP_USB_TYPE = 64,
1: -	POWER_SUPPLY_PROP_SCOPE = 65,
1: -	POWER_SUPPLY_PROP_PRECHARGE_CURRENT = 66,
1: -	POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT = 67,
1: -	POWER_SUPPLY_PROP_CALIBRATE = 68,
1: -	POWER_SUPPLY_PROP_MANUFACTURE_YEAR = 69,
1: -	POWER_SUPPLY_PROP_MANUFACTURE_MONTH = 70,
1: -	POWER_SUPPLY_PROP_MANUFACTURE_DAY = 71,
1: -	POWER_SUPPLY_PROP_MODEL_NAME = 72,
1: -	POWER_SUPPLY_PROP_MANUFACTURER = 73,
1: -	POWER_SUPPLY_PROP_SERIAL_NUMBER = 74,
1: +  POWER_SUPPLY_PROP_STATUS = 0,
1: +  POWER_SUPPLY_PROP_CHARGE_TYPE = 1,
1: +  POWER_SUPPLY_PROP_HEALTH = 2,
1: +  POWER_SUPPLY_PROP_PRESENT = 3,
1: +  POWER_SUPPLY_PROP_ONLINE = 4,
1: +  POWER_SUPPLY_PROP_AUTHENTIC = 5,
1: +  POWER_SUPPLY_PROP_TECHNOLOGY = 6,
1: +  POWER_SUPPLY_PROP_CYCLE_COUNT = 7,
1: +  POWER_SUPPLY_PROP_VOLTAGE_MAX = 8,
1: +  POWER_SUPPLY_PROP_VOLTAGE_MIN = 9,
1: +  POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN = 10,
1: +  POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN = 11,
1: +  POWER_SUPPLY_PROP_VOLTAGE_NOW = 12,
1: +  POWER_SUPPLY_PROP_VOLTAGE_AVG = 13,
1: +  POWER_SUPPLY_PROP_VOLTAGE_OCV = 14,
1: +  POWER_SUPPLY_PROP_VOLTAGE_BOOT = 15,
1: +  POWER_SUPPLY_PROP_CURRENT_MAX = 16,
1: +  POWER_SUPPLY_PROP_CURRENT_NOW = 17,
1: +  POWER_SUPPLY_PROP_CURRENT_AVG = 18,
1: +  POWER_SUPPLY_PROP_CURRENT_BOOT = 19,
1: +  POWER_SUPPLY_PROP_POWER_NOW = 20,
1: +  POWER_SUPPLY_PROP_POWER_AVG = 21,
1: +  POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN = 22,
1: +  POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN = 23,
1: +  POWER_SUPPLY_PROP_CHARGE_FULL = 24,
1: +  POWER_SUPPLY_PROP_CHARGE_EMPTY = 25,
1: +  POWER_SUPPLY_PROP_CHARGE_NOW = 26,
1: +  POWER_SUPPLY_PROP_CHARGE_AVG = 27,
1: +  POWER_SUPPLY_PROP_CHARGE_COUNTER = 28,
1: +  POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT = 29,
1: +  POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX = 30,
1: +  POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE = 31,
1: +  POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX = 32,
1: +  POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT = 33,
1: +  POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX = 34,
1: +  POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD = 35,
1: +  POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD = 36,
1: +  POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT = 37,
1: +  POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT = 38,
1: +  POWER_SUPPLY_PROP_INPUT_POWER_LIMIT = 39,
1: +  POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN = 40,
1: +  POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN = 41,
1: +  POWER_SUPPLY_PROP_ENERGY_FULL = 42,
1: +  POWER_SUPPLY_PROP_ENERGY_EMPTY = 43,
1: +  POWER_SUPPLY_PROP_ENERGY_NOW = 44,
1: +  POWER_SUPPLY_PROP_ENERGY_AVG = 45,
1: +  POWER_SUPPLY_PROP_CAPACITY = 46,
1: +  POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN = 47,
1: +  POWER_SUPPLY_PROP_CAPACITY_ALERT_MAX = 48,
1: +  POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN = 49,
1: +  POWER_SUPPLY_PROP_CAPACITY_LEVEL = 50,
1: +  POWER_SUPPLY_PROP_TEMP = 51,
1: +  POWER_SUPPLY_PROP_TEMP_MAX = 52,
1: +  POWER_SUPPLY_PROP_TEMP_MIN = 53,
1: +  POWER_SUPPLY_PROP_TEMP_ALERT_MIN = 54,
1: +  POWER_SUPPLY_PROP_TEMP_ALERT_MAX = 55,
1: +  POWER_SUPPLY_PROP_TEMP_AMBIENT = 56,
1: +  POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN = 57,
1: +  POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX = 58,
1: +  POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW = 59,
1: +  POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG = 60,
1: +  POWER_SUPPLY_PROP_TIME_TO_FULL_NOW = 61,
1: +  POWER_SUPPLY_PROP_TIME_TO_FULL_AVG = 62,
1: +  POWER_SUPPLY_PROP_TYPE = 63,
1: +  POWER_SUPPLY_PROP_USB_TYPE = 64,
1: +  POWER_SUPPLY_PROP_SCOPE = 65,
1: +  POWER_SUPPLY_PROP_PRECHARGE_CURRENT = 66,
1: +  POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT = 67,
1: +  POWER_SUPPLY_PROP_CALIBRATE = 68,
1: +  POWER_SUPPLY_PROP_MANUFACTURE_YEAR = 69,
1: +  POWER_SUPPLY_PROP_MANUFACTURE_MONTH = 70,
1: +  POWER_SUPPLY_PROP_MANUFACTURE_DAY = 71,
1: +  POWER_SUPPLY_PROP_MODEL_NAME = 72,
1: +  POWER_SUPPLY_PROP_MANUFACTURER = 73,
1: +  POWER_SUPPLY_PROP_SERIAL_NUMBER = 74,
1:  };
1:  
1:  enum power_supply_type {
1: -	POWER_SUPPLY_TYPE_UNKNOWN = 0,
1: -	POWER_SUPPLY_TYPE_BATTERY = 1,
1: -	POWER_SUPPLY_TYPE_UPS = 2,
1: -	POWER_SUPPLY_TYPE_MAINS = 3,
1: -	POWER_SUPPLY_TYPE_USB = 4,
1: -	POWER_SUPPLY_TYPE_USB_DCP = 5,
1: -	POWER_SUPPLY_TYPE_USB_CDP = 6,
1: -	POWER_SUPPLY_TYPE_USB_ACA = 7,
1: -	POWER_SUPPLY_TYPE_USB_TYPE_C = 8,
1: -	POWER_SUPPLY_TYPE_USB_PD = 9,
1: -	POWER_SUPPLY_TYPE_USB_PD_DRP = 10,
1: -	POWER_SUPPLY_TYPE_APPLE_BRICK_ID = 11,
1: -	POWER_SUPPLY_TYPE_WIRELESS = 12,
1: +  POWER_SUPPLY_TYPE_UNKNOWN = 0,
1: +  POWER_SUPPLY_TYPE_BATTERY = 1,
1: +  POWER_SUPPLY_TYPE_UPS = 2,
1: +  POWER_SUPPLY_TYPE_MAINS = 3,
1: +  POWER_SUPPLY_TYPE_USB = 4,
1: +  POWER_SUPPLY_TYPE_USB_DCP = 5,
1: +  POWER_SUPPLY_TYPE_USB_CDP = 6,
1: +  POWER_SUPPLY_TYPE_USB_ACA = 7,
1: +  POWER_SUPPLY_TYPE_USB_TYPE_C = 8,
1: +  POWER_SUPPLY_TYPE_USB_PD = 9,
1: +  POWER_SUPPLY_TYPE_USB_PD_DRP = 10,
1: +  POWER_SUPPLY_TYPE_APPLE_BRICK_ID = 11,
1: +  POWER_SUPPLY_TYPE_WIRELESS = 12,
1:  };
1:  
1:  enum power_supply_usb_type {
1: -	POWER_SUPPLY_USB_TYPE_UNKNOWN = 0,
1: -	POWER_SUPPLY_USB_TYPE_SDP = 1,
1: -	POWER_SUPPLY_USB_TYPE_DCP = 2,
1: -	POWER_SUPPLY_USB_TYPE_CDP = 3,
1: -	POWER_SUPPLY_USB_TYPE_ACA = 4,
1: -	POWER_SUPPLY_USB_TYPE_C = 5,
1: -	POWER_SUPPLY_USB_TYPE_PD = 6,
1: -	POWER_SUPPLY_USB_TYPE_PD_DRP = 7,
1: -	POWER_SUPPLY_USB_TYPE_PD_PPS = 8,
1: -	POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID = 9,
1: +  POWER_SUPPLY_USB_TYPE_UNKNOWN = 0,
1: +  POWER_SUPPLY_USB_TYPE_SDP = 1,
1: +  POWER_SUPPLY_USB_TYPE_DCP = 2,
1: +  POWER_SUPPLY_USB_TYPE_CDP = 3,
1: +  POWER_SUPPLY_USB_TYPE_ACA = 4,
1: +  POWER_SUPPLY_USB_TYPE_C = 5,
1: +  POWER_SUPPLY_USB_TYPE_PD = 6,
1: +  POWER_SUPPLY_USB_TYPE_PD_DRP = 7,
1: +  POWER_SUPPLY_USB_TYPE_PD_PPS = 8,
1: +  POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID = 9,
1:  };
1:  
1:  enum power_supply_notifier_events {
1: -	PSY_EVENT_PROP_CHANGED = 0,
1: +  PSY_EVENT_PROP_CHANGED = 0,
1:  };
1:  
1:  union power_supply_propval {
1: -	int intval;
1: -	const char *strval;
1: +  int intval;
1: +  const char *strval;
1:  };
1:  
1:  struct power_supply_config {
1: -	struct device_node *of_node;
1: -	struct fwnode_handle *fwnode;
1: -	void *drv_data;
1: -	const struct attribute_group **attr_grp;
1: -	char **supplied_to;
1: -	size_t num_supplicants;
1: +  struct device_node *of_node;
1: +  struct fwnode_handle *fwnode;
1: +  void *drv_data;
1: +  const struct attribute_group **attr_grp;
1: +  char **supplied_to;
1: +  size_t num_supplicants;
1:  };
1:  
1:  struct power_supply;
1:  
1:  struct power_supply_desc {
1: -	const char *name;
1: -	enum power_supply_type type;
1: -	const enum power_supply_usb_type *usb_types;
1: -	size_t num_usb_types;
1: -	const enum power_supply_property *properties;
1: -	size_t num_properties;
1: -	int (*get_property)(struct power_supply *, enum power_supply_property, union power_supply_propval *);
1: -	int (*set_property)(struct power_supply *, enum power_supply_property, const union power_supply_propval *);
1: -	int (*property_is_writeable)(struct power_supply *, enum power_supply_property);
1: -	void (*external_power_changed)(struct power_supply *);
1: -	void (*set_charged)(struct power_supply *);
1: -	bool no_thermal;
1: -	int use_for_apm;
1: +  const char *name;
1: +  enum power_supply_type type;
1: +  const enum power_supply_usb_type *usb_types;
1: +  size_t num_usb_types;
1: +  const enum power_supply_property *properties;
1: +  size_t num_properties;
1: +  int (*get_property)(struct power_supply *, enum power_supply_property,
1: +                      union power_supply_propval *);
1: +  int (*set_property)(struct power_supply *, enum power_supply_property,
1: +                      const union power_supply_propval *);
1: +  int (*property_is_writeable)(struct power_supply *,
1: +                               enum power_supply_property);
1: +  void (*external_power_changed)(struct power_supply *);
1: +  void (*set_charged)(struct power_supply *);
1: +  bool no_thermal;
1: +  int use_for_apm;
1:  };
1:  
1:  struct power_supply {
1: -	const struct power_supply_desc *desc;
1: -	char **supplied_to;
1: -	size_t num_supplicants;
1: -	char **supplied_from;
1: -	size_t num_supplies;
1: -	struct device_node *of_node;
1: -	void *drv_data;
1: -	struct device dev;
1: -	struct work_struct changed_work;
1: -	struct delayed_work deferred_register_work;
1: -	spinlock_t changed_lock;
1: -	bool changed;
1: -	bool initialized;
1: -	bool removing;
1: -	atomic_t use_cnt;
1: -	struct thermal_zone_device *tzd;
1: -	struct thermal_cooling_device *tcd;
1: -	struct led_trigger *charging_full_trig;
1: -	char *charging_full_trig_name;
1: -	struct led_trigger *charging_trig;
1: -	char *charging_trig_name;
1: -	struct led_trigger *full_trig;
1: -	char *full_trig_name;
1: -	struct led_trigger *online_trig;
1: -	char *online_trig_name;
1: -	struct led_trigger *charging_blink_full_solid_trig;
1: -	char *charging_blink_full_solid_trig_name;
1: +  const struct power_supply_desc *desc;
1: +  char **supplied_to;
1: +  size_t num_supplicants;
1: +  char **supplied_from;
1: +  size_t num_supplies;
1: +  struct device_node *of_node;
1: +  void *drv_data;
1: +  struct device dev;
1: +  struct work_struct changed_work;
1: +  struct delayed_work deferred_register_work;
1: +  spinlock_t changed_lock;
1: +  bool changed;
1: +  bool initialized;
1: +  bool removing;
1: +  atomic_t use_cnt;
1: +  struct thermal_zone_device *tzd;
1: +  struct thermal_cooling_device *tcd;
1: +  struct led_trigger *charging_full_trig;
1: +  char *charging_full_trig_name;
1: +  struct led_trigger *charging_trig;
1: +  char *charging_trig_name;
1: +  struct led_trigger *full_trig;
1: +  char *full_trig_name;
1: +  struct led_trigger *online_trig;
1: +  char *online_trig_name;
1: +  struct led_trigger *charging_blink_full_solid_trig;
1: +  char *charging_blink_full_solid_trig_name;
1:  };
1:  
1:  struct power_supply_battery_ocv_table {
1: -	int ocv;
1: -	int capacity;
1: +  int ocv;
1: +  int capacity;
1:  };
1:  
1:  struct power_supply_resistance_temp_table {
1: -	int temp;
1: -	int resistance;
1: +  int temp;
1: +  int resistance;
1:  };
1:  
1:  struct power_supply_battery_info {
1: -	int energy_full_design_uwh;
1: -	int charge_full_design_uah;
1: -	int voltage_min_design_uv;
1: -	int voltage_max_design_uv;
1: -	int tricklecharge_current_ua;
1: -	int precharge_current_ua;
1: -	int precharge_voltage_max_uv;
1: -	int charge_term_current_ua;
1: -	int charge_restart_voltage_uv;
1: -	int overvoltage_limit_uv;
1: -	int constant_charge_current_max_ua;
1: -	int constant_charge_voltage_max_uv;
1: -	int factory_internal_resistance_uohm;
1: -	int ocv_temp[20];
1: -	int temp_ambient_alert_min;
1: -	int temp_ambient_alert_max;
1: -	int temp_alert_min;
1: -	int temp_alert_max;
1: -	int temp_min;
1: -	int temp_max;
1: -	struct power_supply_battery_ocv_table *ocv_table[20];
1: -	int ocv_table_size[20];
1: -	struct power_supply_resistance_temp_table *resist_table;
1: -	int resist_table_size;
1: +  int energy_full_design_uwh;
1: +  int charge_full_design_uah;
1: +  int voltage_min_design_uv;
1: +  int voltage_max_design_uv;
1: +  int tricklecharge_current_ua;
1: +  int precharge_current_ua;
1: +  int precharge_voltage_max_uv;
1: +  int charge_term_current_ua;
1: +  int charge_restart_voltage_uv;
1: +  int overvoltage_limit_uv;
1: +  int constant_charge_current_max_ua;
1: +  int constant_charge_voltage_max_uv;
1: +  int factory_internal_resistance_uohm;
1: +  int ocv_temp[20];
1: +  int temp_ambient_alert_min;
1: +  int temp_ambient_alert_max;
1: +  int temp_alert_min;
1: +  int temp_alert_max;
1: +  int temp_min;
1: +  int temp_max;
1: +  struct power_supply_battery_ocv_table *ocv_table[20];
1: +  int ocv_table_size[20];
1: +  struct power_supply_resistance_temp_table *resist_table;
1: +  int resist_table_size;
1:  };
1:  
1:  struct psy_am_i_supplied_data {
1: -	struct power_supply *psy;
1: -	unsigned int count;
1: +  struct power_supply *psy;
1: +  unsigned int count;
1:  };
1:  
1:  enum {
1: -	POWER_SUPPLY_STATUS_UNKNOWN = 0,
1: -	POWER_SUPPLY_STATUS_CHARGING = 1,
1: -	POWER_SUPPLY_STATUS_DISCHARGING = 2,
1: -	POWER_SUPPLY_STATUS_NOT_CHARGING = 3,
1: -	POWER_SUPPLY_STATUS_FULL = 4,
1: +  POWER_SUPPLY_STATUS_UNKNOWN = 0,
1: +  POWER_SUPPLY_STATUS_CHARGING = 1,
1: +  POWER_SUPPLY_STATUS_DISCHARGING = 2,
1: +  POWER_SUPPLY_STATUS_NOT_CHARGING = 3,
1: +  POWER_SUPPLY_STATUS_FULL = 4,
1:  };
1:  
1:  enum {
1: -	POWER_SUPPLY_CHARGE_TYPE_UNKNOWN = 0,
1: -	POWER_SUPPLY_CHARGE_TYPE_NONE = 1,
1: -	POWER_SUPPLY_CHARGE_TYPE_TRICKLE = 2,
1: -	POWER_SUPPLY_CHARGE_TYPE_FAST = 3,
1: -	POWER_SUPPLY_CHARGE_TYPE_STANDARD = 4,
1: -	POWER_SUPPLY_CHARGE_TYPE_ADAPTIVE = 5,
1: -	POWER_SUPPLY_CHARGE_TYPE_CUSTOM = 6,
1: -	POWER_SUPPLY_CHARGE_TYPE_LONGLIFE = 7,
1: +  POWER_SUPPLY_CHARGE_TYPE_UNKNOWN = 0,
1: +  POWER_SUPPLY_CHARGE_TYPE_NONE = 1,
1: +  POWER_SUPPLY_CHARGE_TYPE_TRICKLE = 2,
1: +  POWER_SUPPLY_CHARGE_TYPE_FAST = 3,
1: +  POWER_SUPPLY_CHARGE_TYPE_STANDARD = 4,
1: +  POWER_SUPPLY_CHARGE_TYPE_ADAPTIVE = 5,
1: +  POWER_SUPPLY_CHARGE_TYPE_CUSTOM = 6,
1: +  POWER_SUPPLY_CHARGE_TYPE_LONGLIFE = 7,
1:  };
1:  
1:  enum {
1: -	POWER_SUPPLY_HEALTH_UNKNOWN = 0,
1: -	POWER_SUPPLY_HEALTH_GOOD = 1,
1: -	POWER_SUPPLY_HEALTH_OVERHEAT = 2,
1: -	POWER_SUPPLY_HEALTH_DEAD = 3,
1: -	POWER_SUPPLY_HEALTH_OVERVOLTAGE = 4,
1: -	POWER_SUPPLY_HEALTH_UNSPEC_FAILURE = 5,
1: -	POWER_SUPPLY_HEALTH_COLD = 6,
1: -	POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE = 7,
1: -	POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE = 8,
1: -	POWER_SUPPLY_HEALTH_OVERCURRENT = 9,
1: -	POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED = 10,
1: -	POWER_SUPPLY_HEALTH_WARM = 11,
1: -	POWER_SUPPLY_HEALTH_COOL = 12,
1: -	POWER_SUPPLY_HEALTH_HOT = 13,
1: +  POWER_SUPPLY_HEALTH_UNKNOWN = 0,
1: +  POWER_SUPPLY_HEALTH_GOOD = 1,
1: +  POWER_SUPPLY_HEALTH_OVERHEAT = 2,
1: +  POWER_SUPPLY_HEALTH_DEAD = 3,
1: +  POWER_SUPPLY_HEALTH_OVERVOLTAGE = 4,
1: +  POWER_SUPPLY_HEALTH_UNSPEC_FAILURE = 5,
1: +  POWER_SUPPLY_HEALTH_COLD = 6,
1: +  POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE = 7,
1: +  POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE = 8,
1: +  POWER_SUPPLY_HEALTH_OVERCURRENT = 9,
1: +  POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED = 10,
1: +  POWER_SUPPLY_HEALTH_WARM = 11,
1: +  POWER_SUPPLY_HEALTH_COOL = 12,
1: +  POWER_SUPPLY_HEALTH_HOT = 13,
1:  };
1:  
1:  enum {
1: -	POWER_SUPPLY_TECHNOLOGY_UNKNOWN = 0,
1: -	POWER_SUPPLY_TECHNOLOGY_NiMH = 1,
1: -	POWER_SUPPLY_TECHNOLOGY_LION = 2,
1: -	POWER_SUPPLY_TECHNOLOGY_LIPO = 3,
1: -	POWER_SUPPLY_TECHNOLOGY_LiFe = 4,
1: -	POWER_SUPPLY_TECHNOLOGY_NiCd = 5,
1: -	POWER_SUPPLY_TECHNOLOGY_LiMn = 6,
1: +  POWER_SUPPLY_TECHNOLOGY_UNKNOWN = 0,
1: +  POWER_SUPPLY_TECHNOLOGY_NiMH = 1,
1: +  POWER_SUPPLY_TECHNOLOGY_LION = 2,
1: +  POWER_SUPPLY_TECHNOLOGY_LIPO = 3,
1: +  POWER_SUPPLY_TECHNOLOGY_LiFe = 4,
1: +  POWER_SUPPLY_TECHNOLOGY_NiCd = 5,
1: +  POWER_SUPPLY_TECHNOLOGY_LiMn = 6,
1:  };
1:  
1:  enum {
1: -	POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN = 0,
1: -	POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL = 1,
1: -	POWER_SUPPLY_CAPACITY_LEVEL_LOW = 2,
1: -	POWER_SUPPLY_CAPACITY_LEVEL_NORMAL = 3,
1: -	POWER_SUPPLY_CAPACITY_LEVEL_HIGH = 4,
1: -	POWER_SUPPLY_CAPACITY_LEVEL_FULL = 5,
1: +  POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN = 0,
1: +  POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL = 1,
1: +  POWER_SUPPLY_CAPACITY_LEVEL_LOW = 2,
1: +  POWER_SUPPLY_CAPACITY_LEVEL_NORMAL = 3,
1: +  POWER_SUPPLY_CAPACITY_LEVEL_HIGH = 4,
1: +  POWER_SUPPLY_CAPACITY_LEVEL_FULL = 5,
1:  };
1:  
1:  enum {
1: -	POWER_SUPPLY_SCOPE_UNKNOWN = 0,
1: -	POWER_SUPPLY_SCOPE_SYSTEM = 1,
1: -	POWER_SUPPLY_SCOPE_DEVICE = 2,
1: +  POWER_SUPPLY_SCOPE_UNKNOWN = 0,
1: +  POWER_SUPPLY_SCOPE_SYSTEM = 1,
1: +  POWER_SUPPLY_SCOPE_DEVICE = 2,
1:  };
1:  
1:  struct power_supply_attr {
1: -	const char *prop_name;
1: -	char attr_name[31];
1: -	struct device_attribute dev_attr;
1: -	const char * const *text_values;
1: -	int text_values_len;
1: +  const char *prop_name;
1: +  char attr_name[31];
1: +  struct device_attribute dev_attr;
1: +  const char *const *text_values;
1: +  int text_values_len;
1:  };
1:  
1:  enum hwmon_in_attributes {
1: -	hwmon_in_enable = 0,
1: -	hwmon_in_input = 1,
1: -	hwmon_in_min = 2,
1: -	hwmon_in_max = 3,
1: -	hwmon_in_lcrit = 4,
1: -	hwmon_in_crit = 5,
1: -	hwmon_in_average = 6,
1: -	hwmon_in_lowest = 7,
1: -	hwmon_in_highest = 8,
1: -	hwmon_in_reset_history = 9,
1: -	hwmon_in_label = 10,
1: -	hwmon_in_alarm = 11,
1: -	hwmon_in_min_alarm = 12,
1: -	hwmon_in_max_alarm = 13,
1: -	hwmon_in_lcrit_alarm = 14,
1: -	hwmon_in_crit_alarm = 15,
1: -	hwmon_in_rated_min = 16,
1: -	hwmon_in_rated_max = 17,
1: +  hwmon_in_enable = 0,
1: +  hwmon_in_input = 1,
1: +  hwmon_in_min = 2,
1: +  hwmon_in_max = 3,
1: +  hwmon_in_lcrit = 4,
1: +  hwmon_in_crit = 5,
1: +  hwmon_in_average = 6,
1: +  hwmon_in_lowest = 7,
1: +  hwmon_in_highest = 8,
1: +  hwmon_in_reset_history = 9,
1: +  hwmon_in_label = 10,
1: +  hwmon_in_alarm = 11,
1: +  hwmon_in_min_alarm = 12,
1: +  hwmon_in_max_alarm = 13,
1: +  hwmon_in_lcrit_alarm = 14,
1: +  hwmon_in_crit_alarm = 15,
1: +  hwmon_in_rated_min = 16,
1: +  hwmon_in_rated_max = 17,
1:  };
1:  
1:  enum hwmon_curr_attributes {
1: -	hwmon_curr_enable = 0,
1: -	hwmon_curr_input = 1,
1: -	hwmon_curr_min = 2,
1: -	hwmon_curr_max = 3,
1: -	hwmon_curr_lcrit = 4,
1: -	hwmon_curr_crit = 5,
1: -	hwmon_curr_average = 6,
1: -	hwmon_curr_lowest = 7,
1: -	hwmon_curr_highest = 8,
1: -	hwmon_curr_reset_history = 9,
1: -	hwmon_curr_label = 10,
1: -	hwmon_curr_alarm = 11,
1: -	hwmon_curr_min_alarm = 12,
1: -	hwmon_curr_max_alarm = 13,
1: -	hwmon_curr_lcrit_alarm = 14,
1: -	hwmon_curr_crit_alarm = 15,
1: -	hwmon_curr_rated_min = 16,
1: -	hwmon_curr_rated_max = 17,
1: +  hwmon_curr_enable = 0,
1: +  hwmon_curr_input = 1,
1: +  hwmon_curr_min = 2,
1: +  hwmon_curr_max = 3,
1: +  hwmon_curr_lcrit = 4,
1: +  hwmon_curr_crit = 5,
1: +  hwmon_curr_average = 6,
1: +  hwmon_curr_lowest = 7,
1: +  hwmon_curr_highest = 8,
1: +  hwmon_curr_reset_history = 9,
1: +  hwmon_curr_label = 10,
1: +  hwmon_curr_alarm = 11,
1: +  hwmon_curr_min_alarm = 12,
1: +  hwmon_curr_max_alarm = 13,
1: +  hwmon_curr_lcrit_alarm = 14,
1: +  hwmon_curr_crit_alarm = 15,
1: +  hwmon_curr_rated_min = 16,
1: +  hwmon_curr_rated_max = 17,
1:  };
1:  
1:  enum hwmon_energy_attributes {
1: -	hwmon_energy_enable = 0,
1: -	hwmon_energy_input = 1,
1: -	hwmon_energy_label = 2,
1: +  hwmon_energy_enable = 0,
1: +  hwmon_energy_input = 1,
1: +  hwmon_energy_label = 2,
1:  };
1:  
1:  enum hwmon_humidity_attributes {
1: -	hwmon_humidity_enable = 0,
1: -	hwmon_humidity_input = 1,
1: -	hwmon_humidity_label = 2,
1: -	hwmon_humidity_min = 3,
1: -	hwmon_humidity_min_hyst = 4,
1: -	hwmon_humidity_max = 5,
1: -	hwmon_humidity_max_hyst = 6,
1: -	hwmon_humidity_alarm = 7,
1: -	hwmon_humidity_fault = 8,
1: -	hwmon_humidity_rated_min = 9,
1: -	hwmon_humidity_rated_max = 10,
1: +  hwmon_humidity_enable = 0,
1: +  hwmon_humidity_input = 1,
1: +  hwmon_humidity_label = 2,
1: +  hwmon_humidity_min = 3,
1: +  hwmon_humidity_min_hyst = 4,
1: +  hwmon_humidity_max = 5,
1: +  hwmon_humidity_max_hyst = 6,
1: +  hwmon_humidity_alarm = 7,
1: +  hwmon_humidity_fault = 8,
1: +  hwmon_humidity_rated_min = 9,
1: +  hwmon_humidity_rated_max = 10,
1:  };
1:  
1:  enum hwmon_fan_attributes {
1: -	hwmon_fan_enable = 0,
1: -	hwmon_fan_input = 1,
1: -	hwmon_fan_label = 2,
1: -	hwmon_fan_min = 3,
1: -	hwmon_fan_max = 4,
1: -	hwmon_fan_div = 5,
1: -	hwmon_fan_pulses = 6,
1: -	hwmon_fan_target = 7,
1: -	hwmon_fan_alarm = 8,
1: -	hwmon_fan_min_alarm = 9,
1: -	hwmon_fan_max_alarm = 10,
1: -	hwmon_fan_fault = 11,
1: +  hwmon_fan_enable = 0,
1: +  hwmon_fan_input = 1,
1: +  hwmon_fan_label = 2,
1: +  hwmon_fan_min = 3,
1: +  hwmon_fan_max = 4,
1: +  hwmon_fan_div = 5,
1: +  hwmon_fan_pulses = 6,
1: +  hwmon_fan_target = 7,
1: +  hwmon_fan_alarm = 8,
1: +  hwmon_fan_min_alarm = 9,
1: +  hwmon_fan_max_alarm = 10,
1: +  hwmon_fan_fault = 11,
1:  };
1:  
1:  enum hwmon_pwm_attributes {
1: -	hwmon_pwm_input = 0,
1: -	hwmon_pwm_enable = 1,
1: -	hwmon_pwm_mode = 2,
1: -	hwmon_pwm_freq = 3,
1: +  hwmon_pwm_input = 0,
1: +  hwmon_pwm_enable = 1,
1: +  hwmon_pwm_mode = 2,
1: +  hwmon_pwm_freq = 3,
1:  };
1:  
1:  enum hwmon_intrusion_attributes {
1: -	hwmon_intrusion_alarm = 0,
1: -	hwmon_intrusion_beep = 1,
1: +  hwmon_intrusion_alarm = 0,
1: +  hwmon_intrusion_beep = 1,
1:  };
1:  
1:  struct trace_event_raw_hwmon_attr_class {
1: -	struct trace_entry ent;
1: -	int index;
1: -	u32 __data_loc_attr_name;
1: -	long int val;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int index;
1: +  u32 __data_loc_attr_name;
1: +  long int val;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_hwmon_attr_show_string {
1: -	struct trace_entry ent;
1: -	int index;
1: -	u32 __data_loc_attr_name;
1: -	u32 __data_loc_label;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int index;
1: +  u32 __data_loc_attr_name;
1: +  u32 __data_loc_label;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_hwmon_attr_class {
1: -	u32 attr_name;
1: +  u32 attr_name;
1:  };
1:  
1:  struct trace_event_data_offsets_hwmon_attr_show_string {
1: -	u32 attr_name;
1: -	u32 label;
1: +  u32 attr_name;
1: +  u32 label;
1:  };
1:  
1:  typedef void (*btf_trace_hwmon_attr_show)(void *, int, const char *, long int);
1:  
1:  typedef void (*btf_trace_hwmon_attr_store)(void *, int, const char *, long int);
1:  
1: -typedef void (*btf_trace_hwmon_attr_show_string)(void *, int, const char *, const char *);
1: +typedef void (*btf_trace_hwmon_attr_show_string)(void *, int, const char *,
1: +                                                 const char *);
1:  
1:  struct hwmon_device {
1: -	const char *name;
1: -	struct device dev;
1: -	const struct hwmon_chip_info *chip;
1: -	struct list_head tzdata;
1: -	struct attribute_group group;
1: -	const struct attribute_group **groups;
1: +  const char *name;
1: +  struct device dev;
1: +  const struct hwmon_chip_info *chip;
1: +  struct list_head tzdata;
1: +  struct attribute_group group;
1: +  const struct attribute_group **groups;
1:  };
1:  
1:  struct hwmon_device_attribute {
1: -	struct device_attribute dev_attr;
1: -	const struct hwmon_ops *ops;
1: -	enum hwmon_sensor_types type;
1: -	u32 attr;
1: -	int index;
1: -	char name[32];
1: +  struct device_attribute dev_attr;
1: +  const struct hwmon_ops *ops;
1: +  enum hwmon_sensor_types type;
1: +  u32 attr;
1: +  int index;
1: +  char name[32];
1:  };
1:  
1:  struct thermal_attr {
1: -	struct device_attribute attr;
1: -	char name[20];
1: +  struct device_attribute attr;
1: +  char name[20];
1:  };
1:  
1:  struct trace_event_raw_thermal_temperature {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_thermal_zone;
1: -	int id;
1: -	int temp_prev;
1: -	int temp;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_thermal_zone;
1: +  int id;
1: +  int temp_prev;
1: +  int temp;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cdev_update {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_type;
1: -	long unsigned int target;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_type;
1: +  long unsigned int target;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_thermal_zone_trip {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_thermal_zone;
1: -	int id;
1: -	int trip;
1: -	enum thermal_trip_type trip_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_thermal_zone;
1: +  int id;
1: +  int trip;
1: +  enum thermal_trip_type trip_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_thermal_temperature {
1: -	u32 thermal_zone;
1: +  u32 thermal_zone;
1:  };
1:  
1:  struct trace_event_data_offsets_cdev_update {
1: -	u32 type;
1: +  u32 type;
1:  };
1:  
1:  struct trace_event_data_offsets_thermal_zone_trip {
1: -	u32 thermal_zone;
1: +  u32 thermal_zone;
1:  };
1:  
1: -typedef void (*btf_trace_thermal_temperature)(void *, struct thermal_zone_device *);
1: +typedef void (*btf_trace_thermal_temperature)(void *,
1: +                                              struct thermal_zone_device *);
1:  
1: -typedef void (*btf_trace_cdev_update)(void *, struct thermal_cooling_device *, long unsigned int);
1: +typedef void (*btf_trace_cdev_update)(void *, struct thermal_cooling_device *,
1: +                                      long unsigned int);
1:  
1: -typedef void (*btf_trace_thermal_zone_trip)(void *, struct thermal_zone_device *, int, enum thermal_trip_type);
1: +typedef void (*btf_trace_thermal_zone_trip)(void *,
1: +                                            struct thermal_zone_device *, int,
1: +                                            enum thermal_trip_type);
1:  
1:  struct thermal_instance {
1: -	int id;
1: -	char name[20];
1: -	struct thermal_zone_device *tz;
1: -	struct thermal_cooling_device *cdev;
1: -	int trip;
1: -	bool initialized;
1: -	long unsigned int upper;
1: -	long unsigned int lower;
1: -	long unsigned int target;
1: -	char attr_name[20];
1: -	struct device_attribute attr;
1: -	char weight_attr_name[20];
1: -	struct device_attribute weight_attr;
1: -	struct list_head tz_node;
1: -	struct list_head cdev_node;
1: -	unsigned int weight;
1: +  int id;
1: +  char name[20];
1: +  struct thermal_zone_device *tz;
1: +  struct thermal_cooling_device *cdev;
1: +  int trip;
1: +  bool initialized;
1: +  long unsigned int upper;
1: +  long unsigned int lower;
1: +  long unsigned int target;
1: +  char attr_name[20];
1: +  struct device_attribute attr;
1: +  char weight_attr_name[20];
1: +  struct device_attribute weight_attr;
1: +  struct list_head tz_node;
1: +  struct list_head cdev_node;
1: +  unsigned int weight;
1:  };
1:  
1:  struct thermal_hwmon_device {
1: -	char type[20];
1: -	struct device *device;
1: -	int count;
1: -	struct list_head tz_list;
1: -	struct list_head node;
1: +  char type[20];
1: +  struct device *device;
1: +  int count;
1: +  struct list_head tz_list;
1: +  struct list_head node;
1:  };
1:  
1:  struct thermal_hwmon_attr {
1: -	struct device_attribute attr;
1: -	char name[16];
1: +  struct device_attribute attr;
1: +  char name[16];
1:  };
1:  
1:  struct thermal_hwmon_temp {
1: -	struct list_head hwmon_node;
1: -	struct thermal_zone_device *tz;
1: -	struct thermal_hwmon_attr temp_input;
1: -	struct thermal_hwmon_attr temp_crit;
1: +  struct list_head hwmon_node;
1: +  struct thermal_zone_device *tz;
1: +  struct thermal_hwmon_attr temp_input;
1: +  struct thermal_hwmon_attr temp_crit;
1:  };
1:  
1:  struct powerclamp_worker_data {
1: -	struct kthread_worker *worker;
1: -	struct kthread_work balancing_work;
1: -	struct kthread_delayed_work idle_injection_work;
1: -	unsigned int cpu;
1: -	unsigned int count;
1: -	unsigned int guard;
1: -	unsigned int window_size_now;
1: -	unsigned int target_ratio;
1: -	unsigned int duration_jiffies;
1: -	bool clamping;
1: +  struct kthread_worker *worker;
1: +  struct kthread_work balancing_work;
1: +  struct kthread_delayed_work idle_injection_work;
1: +  unsigned int cpu;
1: +  unsigned int count;
1: +  unsigned int guard;
1: +  unsigned int window_size_now;
1: +  unsigned int target_ratio;
1: +  unsigned int duration_jiffies;
1: +  bool clamping;
1:  };
1:  
1:  struct powerclamp_calibration_data {
1: -	long unsigned int confidence;
1: -	long unsigned int steady_comp;
1: -	long unsigned int dynamic_comp;
1: +  long unsigned int confidence;
1: +  long unsigned int steady_comp;
1: +  long unsigned int dynamic_comp;
1:  };
1:  
1:  struct pkg_cstate_info {
1: -	bool skip;
1: -	int msr_index;
1: -	int cstate_id;
1: +  bool skip;
1: +  int msr_index;
1: +  int cstate_id;
1:  };
1:  
1:  struct watchdog_info {
1: -	__u32 options;
1: -	__u32 firmware_version;
1: -	__u8 identity[32];
1: +  __u32 options;
1: +  __u32 firmware_version;
1: +  __u8 identity[32];
1:  };
1:  
1:  struct watchdog_device;
1:  
1:  struct watchdog_ops {
1: -	struct module *owner;
1: -	int (*start)(struct watchdog_device *);
1: -	int (*stop)(struct watchdog_device *);
1: -	int (*ping)(struct watchdog_device *);
1: -	unsigned int (*status)(struct watchdog_device *);
1: -	int (*set_timeout)(struct watchdog_device *, unsigned int);
1: -	int (*set_pretimeout)(struct watchdog_device *, unsigned int);
1: -	unsigned int (*get_timeleft)(struct watchdog_device *);
1: -	int (*restart)(struct watchdog_device *, long unsigned int, void *);
1: -	long int (*ioctl)(struct watchdog_device *, unsigned int, long unsigned int);
1: +  struct module *owner;
1: +  int (*start)(struct watchdog_device *);
1: +  int (*stop)(struct watchdog_device *);
1: +  int (*ping)(struct watchdog_device *);
1: +  unsigned int (*status)(struct watchdog_device *);
1: +  int (*set_timeout)(struct watchdog_device *, unsigned int);
1: +  int (*set_pretimeout)(struct watchdog_device *, unsigned int);
1: +  unsigned int (*get_timeleft)(struct watchdog_device *);
1: +  int (*restart)(struct watchdog_device *, long unsigned int, void *);
1: +  long int (*ioctl)(struct watchdog_device *, unsigned int, long unsigned int);
1:  };
1:  
1:  struct watchdog_governor;
1: @@ -109337,196 +110535,196 @@ struct watchdog_governor;
1:  struct watchdog_core_data;
1:  
1:  struct watchdog_device {
1: -	int id;
1: -	struct device *parent;
1: -	const struct attribute_group **groups;
1: -	const struct watchdog_info *info;
1: -	const struct watchdog_ops *ops;
1: -	const struct watchdog_governor *gov;
1: -	unsigned int bootstatus;
1: -	unsigned int timeout;
1: -	unsigned int pretimeout;
1: -	unsigned int min_timeout;
1: -	unsigned int max_timeout;
1: -	unsigned int min_hw_heartbeat_ms;
1: -	unsigned int max_hw_heartbeat_ms;
1: -	struct notifier_block reboot_nb;
1: -	struct notifier_block restart_nb;
1: -	void *driver_data;
1: -	struct watchdog_core_data *wd_data;
1: -	long unsigned int status;
1: -	struct list_head deferred;
1: +  int id;
1: +  struct device *parent;
1: +  const struct attribute_group **groups;
1: +  const struct watchdog_info *info;
1: +  const struct watchdog_ops *ops;
1: +  const struct watchdog_governor *gov;
1: +  unsigned int bootstatus;
1: +  unsigned int timeout;
1: +  unsigned int pretimeout;
1: +  unsigned int min_timeout;
1: +  unsigned int max_timeout;
1: +  unsigned int min_hw_heartbeat_ms;
1: +  unsigned int max_hw_heartbeat_ms;
1: +  struct notifier_block reboot_nb;
1: +  struct notifier_block restart_nb;
1: +  void *driver_data;
1: +  struct watchdog_core_data *wd_data;
1: +  long unsigned int status;
1: +  struct list_head deferred;
1:  };
1:  
1:  struct watchdog_governor {
1: -	const char name[20];
1: -	void (*pretimeout)(struct watchdog_device *);
1: +  const char name[20];
1: +  void (*pretimeout)(struct watchdog_device *);
1:  };
1:  
1:  struct watchdog_core_data {
1: -	struct device dev;
1: -	struct cdev cdev;
1: -	struct watchdog_device *wdd;
1: -	struct mutex lock;
1: -	ktime_t last_keepalive;
1: -	ktime_t last_hw_keepalive;
1: -	ktime_t open_deadline;
1: -	struct hrtimer timer;
1: -	struct kthread_work work;
1: -	long unsigned int status;
1: +  struct device dev;
1: +  struct cdev cdev;
1: +  struct watchdog_device *wdd;
1: +  struct mutex lock;
1: +  ktime_t last_keepalive;
1: +  ktime_t last_hw_keepalive;
1: +  ktime_t open_deadline;
1: +  struct hrtimer timer;
1: +  struct kthread_work work;
1: +  long unsigned int status;
1:  };
1:  
1:  struct mdp_device_descriptor_s {
1: -	__u32 number;
1: -	__u32 major;
1: -	__u32 minor;
1: -	__u32 raid_disk;
1: -	__u32 state;
1: -	__u32 reserved[27];
1: +  __u32 number;
1: +  __u32 major;
1: +  __u32 minor;
1: +  __u32 raid_disk;
1: +  __u32 state;
1: +  __u32 reserved[27];
1:  };
1:  
1:  typedef struct mdp_device_descriptor_s mdp_disk_t;
1:  
1:  struct mdp_superblock_s {
1: -	__u32 md_magic;
1: -	__u32 major_version;
1: -	__u32 minor_version;
1: -	__u32 patch_version;
1: -	__u32 gvalid_words;
1: -	__u32 set_uuid0;
1: -	__u32 ctime;
1: -	__u32 level;
1: -	__u32 size;
1: -	__u32 nr_disks;
1: -	__u32 raid_disks;
1: -	__u32 md_minor;
1: -	__u32 not_persistent;
1: -	__u32 set_uuid1;
1: -	__u32 set_uuid2;
1: -	__u32 set_uuid3;
1: -	__u32 gstate_creserved[16];
1: -	__u32 utime;
1: -	__u32 state;
1: -	__u32 active_disks;
1: -	__u32 working_disks;
1: -	__u32 failed_disks;
1: -	__u32 spare_disks;
1: -	__u32 sb_csum;
1: -	__u32 events_lo;
1: -	__u32 events_hi;
1: -	__u32 cp_events_lo;
1: -	__u32 cp_events_hi;
1: -	__u32 recovery_cp;
1: -	__u64 reshape_position;
1: -	__u32 new_level;
1: -	__u32 delta_disks;
1: -	__u32 new_layout;
1: -	__u32 new_chunk;
1: -	__u32 gstate_sreserved[14];
1: -	__u32 layout;
1: -	__u32 chunk_size;
1: -	__u32 root_pv;
1: -	__u32 root_block;
1: -	__u32 pstate_reserved[60];
1: -	mdp_disk_t disks[27];
1: -	__u32 reserved[0];
1: -	mdp_disk_t this_disk;
1: +  __u32 md_magic;
1: +  __u32 major_version;
1: +  __u32 minor_version;
1: +  __u32 patch_version;
1: +  __u32 gvalid_words;
1: +  __u32 set_uuid0;
1: +  __u32 ctime;
1: +  __u32 level;
1: +  __u32 size;
1: +  __u32 nr_disks;
1: +  __u32 raid_disks;
1: +  __u32 md_minor;
1: +  __u32 not_persistent;
1: +  __u32 set_uuid1;
1: +  __u32 set_uuid2;
1: +  __u32 set_uuid3;
1: +  __u32 gstate_creserved[16];
1: +  __u32 utime;
1: +  __u32 state;
1: +  __u32 active_disks;
1: +  __u32 working_disks;
1: +  __u32 failed_disks;
1: +  __u32 spare_disks;
1: +  __u32 sb_csum;
1: +  __u32 events_lo;
1: +  __u32 events_hi;
1: +  __u32 cp_events_lo;
1: +  __u32 cp_events_hi;
1: +  __u32 recovery_cp;
1: +  __u64 reshape_position;
1: +  __u32 new_level;
1: +  __u32 delta_disks;
1: +  __u32 new_layout;
1: +  __u32 new_chunk;
1: +  __u32 gstate_sreserved[14];
1: +  __u32 layout;
1: +  __u32 chunk_size;
1: +  __u32 root_pv;
1: +  __u32 root_block;
1: +  __u32 pstate_reserved[60];
1: +  mdp_disk_t disks[27];
1: +  __u32 reserved[0];
1: +  mdp_disk_t this_disk;
1:  };
1:  
1:  typedef struct mdp_superblock_s mdp_super_t;
1:  
1:  struct mdp_superblock_1 {
1: -	__le32 magic;
1: -	__le32 major_version;
1: -	__le32 feature_map;
1: -	__le32 pad0;
1: -	__u8 set_uuid[16];
1: -	char set_name[32];
1: -	__le64 ctime;
1: -	__le32 level;
1: -	__le32 layout;
1: -	__le64 size;
1: -	__le32 chunksize;
1: -	__le32 raid_disks;
1: -	union {
1: -		__le32 bitmap_offset;
1: -		struct {
1: -			__le16 offset;
1: -			__le16 size;
1: -		} ppl;
1: -	};
1: -	__le32 new_level;
1: -	__le64 reshape_position;
1: -	__le32 delta_disks;
1: -	__le32 new_layout;
1: -	__le32 new_chunk;
1: -	__le32 new_offset;
1: -	__le64 data_offset;
1: -	__le64 data_size;
1: -	__le64 super_offset;
1: -	union {
1: -		__le64 recovery_offset;
1: -		__le64 journal_tail;
1: -	};
1: -	__le32 dev_number;
1: -	__le32 cnt_corrected_read;
1: -	__u8 device_uuid[16];
1: -	__u8 devflags;
1: -	__u8 bblog_shift;
1: -	__le16 bblog_size;
1: -	__le32 bblog_offset;
1: -	__le64 utime;
1: -	__le64 events;
1: -	__le64 resync_offset;
1: -	__le32 sb_csum;
1: -	__le32 max_dev;
1: -	__u8 pad3[32];
1: -	__le16 dev_roles[0];
1: +  __le32 magic;
1: +  __le32 major_version;
1: +  __le32 feature_map;
1: +  __le32 pad0;
1: +  __u8 set_uuid[16];
1: +  char set_name[32];
1: +  __le64 ctime;
1: +  __le32 level;
1: +  __le32 layout;
1: +  __le64 size;
1: +  __le32 chunksize;
1: +  __le32 raid_disks;
1: +  union {
1: +    __le32 bitmap_offset;
1: +    struct {
1: +      __le16 offset;
1: +      __le16 size;
1: +    } ppl;
1: +  };
1: +  __le32 new_level;
1: +  __le64 reshape_position;
1: +  __le32 delta_disks;
1: +  __le32 new_layout;
1: +  __le32 new_chunk;
1: +  __le32 new_offset;
1: +  __le64 data_offset;
1: +  __le64 data_size;
1: +  __le64 super_offset;
1: +  union {
1: +    __le64 recovery_offset;
1: +    __le64 journal_tail;
1: +  };
1: +  __le32 dev_number;
1: +  __le32 cnt_corrected_read;
1: +  __u8 device_uuid[16];
1: +  __u8 devflags;
1: +  __u8 bblog_shift;
1: +  __le16 bblog_size;
1: +  __le32 bblog_offset;
1: +  __le64 utime;
1: +  __le64 events;
1: +  __le64 resync_offset;
1: +  __le32 sb_csum;
1: +  __le32 max_dev;
1: +  __u8 pad3[32];
1: +  __le16 dev_roles[0];
1:  };
1:  
1:  struct mdu_version_s {
1: -	int major;
1: -	int minor;
1: -	int patchlevel;
1: +  int major;
1: +  int minor;
1: +  int patchlevel;
1:  };
1:  
1:  typedef struct mdu_version_s mdu_version_t;
1:  
1:  struct mdu_array_info_s {
1: -	int major_version;
1: -	int minor_version;
1: -	int patch_version;
1: -	unsigned int ctime;
1: -	int level;
1: -	int size;
1: -	int nr_disks;
1: -	int raid_disks;
1: -	int md_minor;
1: -	int not_persistent;
1: -	unsigned int utime;
1: -	int state;
1: -	int active_disks;
1: -	int working_disks;
1: -	int failed_disks;
1: -	int spare_disks;
1: -	int layout;
1: -	int chunk_size;
1: +  int major_version;
1: +  int minor_version;
1: +  int patch_version;
1: +  unsigned int ctime;
1: +  int level;
1: +  int size;
1: +  int nr_disks;
1: +  int raid_disks;
1: +  int md_minor;
1: +  int not_persistent;
1: +  unsigned int utime;
1: +  int state;
1: +  int active_disks;
1: +  int working_disks;
1: +  int failed_disks;
1: +  int spare_disks;
1: +  int layout;
1: +  int chunk_size;
1:  };
1:  
1:  typedef struct mdu_array_info_s mdu_array_info_t;
1:  
1:  struct mdu_disk_info_s {
1: -	int number;
1: -	int major;
1: -	int minor;
1: -	int raid_disk;
1: -	int state;
1: +  int number;
1: +  int major;
1: +  int minor;
1: +  int raid_disk;
1: +  int state;
1:  };
1:  
1:  typedef struct mdu_disk_info_s mdu_disk_info_t;
1:  
1:  struct mdu_bitmap_file_s {
1: -	char pathname[4096];
1: +  char pathname[4096];
1:  };
1:  
1:  typedef struct mdu_bitmap_file_s mdu_bitmap_file_t;
1: @@ -109536,27 +110734,27 @@ struct mddev;
1:  struct md_rdev;
1:  
1:  struct md_cluster_operations {
1: -	int (*join)(struct mddev *, int);
1: -	int (*leave)(struct mddev *);
1: -	int (*slot_number)(struct mddev *);
1: -	int (*resync_info_update)(struct mddev *, sector_t, sector_t);
1: -	void (*resync_info_get)(struct mddev *, sector_t *, sector_t *);
1: -	int (*metadata_update_start)(struct mddev *);
1: -	int (*metadata_update_finish)(struct mddev *);
1: -	void (*metadata_update_cancel)(struct mddev *);
1: -	int (*resync_start)(struct mddev *);
1: -	int (*resync_finish)(struct mddev *);
1: -	int (*area_resyncing)(struct mddev *, int, sector_t, sector_t);
1: -	int (*add_new_disk)(struct mddev *, struct md_rdev *);
1: -	void (*add_new_disk_cancel)(struct mddev *);
1: -	int (*new_disk_ack)(struct mddev *, bool);
1: -	int (*remove_disk)(struct mddev *, struct md_rdev *);
1: -	void (*load_bitmaps)(struct mddev *, int);
1: -	int (*gather_bitmaps)(struct md_rdev *);
1: -	int (*resize_bitmaps)(struct mddev *, sector_t, sector_t);
1: -	int (*lock_all_bitmaps)(struct mddev *);
1: -	void (*unlock_all_bitmaps)(struct mddev *);
1: -	void (*update_size)(struct mddev *, sector_t);
1: +  int (*join)(struct mddev *, int);
1: +  int (*leave)(struct mddev *);
1: +  int (*slot_number)(struct mddev *);
1: +  int (*resync_info_update)(struct mddev *, sector_t, sector_t);
1: +  void (*resync_info_get)(struct mddev *, sector_t *, sector_t *);
1: +  int (*metadata_update_start)(struct mddev *);
1: +  int (*metadata_update_finish)(struct mddev *);
1: +  void (*metadata_update_cancel)(struct mddev *);
1: +  int (*resync_start)(struct mddev *);
1: +  int (*resync_finish)(struct mddev *);
1: +  int (*area_resyncing)(struct mddev *, int, sector_t, sector_t);
1: +  int (*add_new_disk)(struct mddev *, struct md_rdev *);
1: +  void (*add_new_disk_cancel)(struct mddev *);
1: +  int (*new_disk_ack)(struct mddev *, bool);
1: +  int (*remove_disk)(struct mddev *, struct md_rdev *);
1: +  void (*load_bitmaps)(struct mddev *, int);
1: +  int (*gather_bitmaps)(struct md_rdev *);
1: +  int (*resize_bitmaps)(struct mddev *, sector_t, sector_t);
1: +  int (*lock_all_bitmaps)(struct mddev *);
1: +  void (*unlock_all_bitmaps)(struct mddev *);
1: +  void (*update_size)(struct mddev *, sector_t);
1:  };
1:  
1:  struct md_cluster_info;
1: @@ -109568,960 +110766,962 @@ struct md_thread;
1:  struct bitmap;
1:  
1:  struct mddev {
1: -	void *private;
1: -	struct md_personality *pers;
1: -	dev_t unit;
1: -	int md_minor;
1: -	struct list_head disks;
1: -	long unsigned int flags;
1: -	long unsigned int sb_flags;
1: -	int suspended;
1: -	atomic_t active_io;
1: -	int ro;
1: -	int sysfs_active;
1: -	struct gendisk *gendisk;
1: -	struct kobject kobj;
1: -	int hold_active;
1: -	int major_version;
1: -	int minor_version;
1: -	int patch_version;
1: -	int persistent;
1: -	int external;
1: -	char metadata_type[17];
1: -	int chunk_sectors;
1: -	time64_t ctime;
1: -	time64_t utime;
1: -	int level;
1: -	int layout;
1: -	char clevel[16];
1: -	int raid_disks;
1: -	int max_disks;
1: -	sector_t dev_sectors;
1: -	sector_t array_sectors;
1: -	int external_size;
1: -	__u64 events;
1: -	int can_decrease_events;
1: -	char uuid[16];
1: -	sector_t reshape_position;
1: -	int delta_disks;
1: -	int new_level;
1: -	int new_layout;
1: -	int new_chunk_sectors;
1: -	int reshape_backwards;
1: -	struct md_thread *thread;
1: -	struct md_thread *sync_thread;
1: -	char *last_sync_action;
1: -	sector_t curr_resync;
1: -	sector_t curr_resync_completed;
1: -	long unsigned int resync_mark;
1: -	sector_t resync_mark_cnt;
1: -	sector_t curr_mark_cnt;
1: -	sector_t resync_max_sectors;
1: -	atomic64_t resync_mismatches;
1: -	sector_t suspend_lo;
1: -	sector_t suspend_hi;
1: -	int sync_speed_min;
1: -	int sync_speed_max;
1: -	int parallel_resync;
1: -	int ok_start_degraded;
1: -	long unsigned int recovery;
1: -	int recovery_disabled;
1: -	int in_sync;
1: -	struct mutex open_mutex;
1: -	struct mutex reconfig_mutex;
1: -	atomic_t active;
1: -	atomic_t openers;
1: -	int changed;
1: -	int degraded;
1: -	atomic_t recovery_active;
1: -	wait_queue_head_t recovery_wait;
1: -	sector_t recovery_cp;
1: -	sector_t resync_min;
1: -	sector_t resync_max;
1: -	struct kernfs_node *sysfs_state;
1: -	struct kernfs_node *sysfs_action;
1: -	struct kernfs_node *sysfs_completed;
1: -	struct kernfs_node *sysfs_degraded;
1: -	struct kernfs_node *sysfs_level;
1: -	struct work_struct del_work;
1: -	spinlock_t lock;
1: -	wait_queue_head_t sb_wait;
1: -	atomic_t pending_writes;
1: -	unsigned int safemode;
1: -	unsigned int safemode_delay;
1: -	struct timer_list safemode_timer;
1: -	struct percpu_ref writes_pending;
1: -	int sync_checkers;
1: -	struct request_queue *queue;
1: -	struct bitmap *bitmap;
1: -	struct {
1: -		struct file *file;
1: -		loff_t offset;
1: -		long unsigned int space;
1: -		loff_t default_offset;
1: -		long unsigned int default_space;
1: -		struct mutex mutex;
1: -		long unsigned int chunksize;
1: -		long unsigned int daemon_sleep;
1: -		long unsigned int max_write_behind;
1: -		int external;
1: -		int nodes;
1: -		char cluster_name[64];
1: -	} bitmap_info;
1: -	atomic_t max_corr_read_errors;
1: -	struct list_head all_mddevs;
1: -	struct attribute_group *to_remove;
1: -	struct bio_set bio_set;
1: -	struct bio_set sync_set;
1: -	mempool_t md_io_pool;
1: -	struct bio *flush_bio;
1: -	atomic_t flush_pending;
1: -	ktime_t start_flush;
1: -	ktime_t last_flush;
1: -	struct work_struct flush_work;
1: -	struct work_struct event_work;
1: -	mempool_t *serial_info_pool;
1: -	void (*sync_super)(struct mddev *, struct md_rdev *);
1: -	struct md_cluster_info *cluster_info;
1: -	unsigned int good_device_nr;
1: -	unsigned int noio_flag;
1: -	bool has_superblocks: 1;
1: -	bool fail_last_dev: 1;
1: -	bool serialize_policy: 1;
1: +  void *private;
1: +  struct md_personality *pers;
1: +  dev_t unit;
1: +  int md_minor;
1: +  struct list_head disks;
1: +  long unsigned int flags;
1: +  long unsigned int sb_flags;
1: +  int suspended;
1: +  atomic_t active_io;
1: +  int ro;
1: +  int sysfs_active;
1: +  struct gendisk *gendisk;
1: +  struct kobject kobj;
1: +  int hold_active;
1: +  int major_version;
1: +  int minor_version;
1: +  int patch_version;
1: +  int persistent;
1: +  int external;
1: +  char metadata_type[17];
1: +  int chunk_sectors;
1: +  time64_t ctime;
1: +  time64_t utime;
1: +  int level;
1: +  int layout;
1: +  char clevel[16];
1: +  int raid_disks;
1: +  int max_disks;
1: +  sector_t dev_sectors;
1: +  sector_t array_sectors;
1: +  int external_size;
1: +  __u64 events;
1: +  int can_decrease_events;
1: +  char uuid[16];
1: +  sector_t reshape_position;
1: +  int delta_disks;
1: +  int new_level;
1: +  int new_layout;
1: +  int new_chunk_sectors;
1: +  int reshape_backwards;
1: +  struct md_thread *thread;
1: +  struct md_thread *sync_thread;
1: +  char *last_sync_action;
1: +  sector_t curr_resync;
1: +  sector_t curr_resync_completed;
1: +  long unsigned int resync_mark;
1: +  sector_t resync_mark_cnt;
1: +  sector_t curr_mark_cnt;
1: +  sector_t resync_max_sectors;
1: +  atomic64_t resync_mismatches;
1: +  sector_t suspend_lo;
1: +  sector_t suspend_hi;
1: +  int sync_speed_min;
1: +  int sync_speed_max;
1: +  int parallel_resync;
1: +  int ok_start_degraded;
1: +  long unsigned int recovery;
1: +  int recovery_disabled;
1: +  int in_sync;
1: +  struct mutex open_mutex;
1: +  struct mutex reconfig_mutex;
1: +  atomic_t active;
1: +  atomic_t openers;
1: +  int changed;
1: +  int degraded;
1: +  atomic_t recovery_active;
1: +  wait_queue_head_t recovery_wait;
1: +  sector_t recovery_cp;
1: +  sector_t resync_min;
1: +  sector_t resync_max;
1: +  struct kernfs_node *sysfs_state;
1: +  struct kernfs_node *sysfs_action;
1: +  struct kernfs_node *sysfs_completed;
1: +  struct kernfs_node *sysfs_degraded;
1: +  struct kernfs_node *sysfs_level;
1: +  struct work_struct del_work;
1: +  spinlock_t lock;
1: +  wait_queue_head_t sb_wait;
1: +  atomic_t pending_writes;
1: +  unsigned int safemode;
1: +  unsigned int safemode_delay;
1: +  struct timer_list safemode_timer;
1: +  struct percpu_ref writes_pending;
1: +  int sync_checkers;
1: +  struct request_queue *queue;
1: +  struct bitmap *bitmap;
1: +  struct {
1: +    struct file *file;
1: +    loff_t offset;
1: +    long unsigned int space;
1: +    loff_t default_offset;
1: +    long unsigned int default_space;
1: +    struct mutex mutex;
1: +    long unsigned int chunksize;
1: +    long unsigned int daemon_sleep;
1: +    long unsigned int max_write_behind;
1: +    int external;
1: +    int nodes;
1: +    char cluster_name[64];
1: +  } bitmap_info;
1: +  atomic_t max_corr_read_errors;
1: +  struct list_head all_mddevs;
1: +  struct attribute_group *to_remove;
1: +  struct bio_set bio_set;
1: +  struct bio_set sync_set;
1: +  mempool_t md_io_pool;
1: +  struct bio *flush_bio;
1: +  atomic_t flush_pending;
1: +  ktime_t start_flush;
1: +  ktime_t last_flush;
1: +  struct work_struct flush_work;
1: +  struct work_struct event_work;
1: +  mempool_t *serial_info_pool;
1: +  void (*sync_super)(struct mddev *, struct md_rdev *);
1: +  struct md_cluster_info *cluster_info;
1: +  unsigned int good_device_nr;
1: +  unsigned int noio_flag;
1: +  bool has_superblocks : 1;
1: +  bool fail_last_dev : 1;
1: +  bool serialize_policy : 1;
1:  };
1:  
1:  struct serial_in_rdev;
1:  
1:  struct md_rdev {
1: -	struct list_head same_set;
1: -	sector_t sectors;
1: -	struct mddev *mddev;
1: -	int last_events;
1: -	struct block_device *meta_bdev;
1: -	struct block_device *bdev;
1: -	struct page *sb_page;
1: -	struct page *bb_page;
1: -	int sb_loaded;
1: -	__u64 sb_events;
1: -	sector_t data_offset;
1: -	sector_t new_data_offset;
1: -	sector_t sb_start;
1: -	int sb_size;
1: -	int preferred_minor;
1: -	struct kobject kobj;
1: -	long unsigned int flags;
1: -	wait_queue_head_t blocked_wait;
1: -	int desc_nr;
1: -	int raid_disk;
1: -	int new_raid_disk;
1: -	int saved_raid_disk;
1: -	union {
1: -		sector_t recovery_offset;
1: -		sector_t journal_tail;
1: -	};
1: -	atomic_t nr_pending;
1: -	atomic_t read_errors;
1: -	time64_t last_read_error;
1: -	atomic_t corrected_errors;
1: -	struct serial_in_rdev *serial;
1: -	struct work_struct del_work;
1: -	struct kernfs_node *sysfs_state;
1: -	struct kernfs_node *sysfs_unack_badblocks;
1: -	struct kernfs_node *sysfs_badblocks;
1: -	struct badblocks badblocks;
1: -	struct {
1: -		short int offset;
1: -		unsigned int size;
1: -		sector_t sector;
1: -	} ppl;
1: +  struct list_head same_set;
1: +  sector_t sectors;
1: +  struct mddev *mddev;
1: +  int last_events;
1: +  struct block_device *meta_bdev;
1: +  struct block_device *bdev;
1: +  struct page *sb_page;
1: +  struct page *bb_page;
1: +  int sb_loaded;
1: +  __u64 sb_events;
1: +  sector_t data_offset;
1: +  sector_t new_data_offset;
1: +  sector_t sb_start;
1: +  int sb_size;
1: +  int preferred_minor;
1: +  struct kobject kobj;
1: +  long unsigned int flags;
1: +  wait_queue_head_t blocked_wait;
1: +  int desc_nr;
1: +  int raid_disk;
1: +  int new_raid_disk;
1: +  int saved_raid_disk;
1: +  union {
1: +    sector_t recovery_offset;
1: +    sector_t journal_tail;
1: +  };
1: +  atomic_t nr_pending;
1: +  atomic_t read_errors;
1: +  time64_t last_read_error;
1: +  atomic_t corrected_errors;
1: +  struct serial_in_rdev *serial;
1: +  struct work_struct del_work;
1: +  struct kernfs_node *sysfs_state;
1: +  struct kernfs_node *sysfs_unack_badblocks;
1: +  struct kernfs_node *sysfs_badblocks;
1: +  struct badblocks badblocks;
1: +  struct {
1: +    short int offset;
1: +    unsigned int size;
1: +    sector_t sector;
1: +  } ppl;
1:  };
1:  
1:  struct serial_in_rdev {
1: -	struct rb_root_cached serial_rb;
1: -	spinlock_t serial_lock;
1: -	wait_queue_head_t serial_io_wait;
1: +  struct rb_root_cached serial_rb;
1: +  spinlock_t serial_lock;
1: +  wait_queue_head_t serial_io_wait;
1:  };
1:  
1:  enum flag_bits {
1: -	Faulty = 0,
1: -	In_sync = 1,
1: -	Bitmap_sync = 2,
1: -	WriteMostly = 3,
1: -	AutoDetected = 4,
1: -	Blocked = 5,
1: -	WriteErrorSeen = 6,
1: -	FaultRecorded = 7,
1: -	BlockedBadBlocks = 8,
1: -	WantReplacement = 9,
1: -	Replacement = 10,
1: -	Candidate = 11,
1: -	Journal = 12,
1: -	ClusterRemove = 13,
1: -	RemoveSynchronized = 14,
1: -	ExternalBbl = 15,
1: -	FailFast = 16,
1: -	LastDev = 17,
1: -	CollisionCheck = 18,
1: +  Faulty = 0,
1: +  In_sync = 1,
1: +  Bitmap_sync = 2,
1: +  WriteMostly = 3,
1: +  AutoDetected = 4,
1: +  Blocked = 5,
1: +  WriteErrorSeen = 6,
1: +  FaultRecorded = 7,
1: +  BlockedBadBlocks = 8,
1: +  WantReplacement = 9,
1: +  Replacement = 10,
1: +  Candidate = 11,
1: +  Journal = 12,
1: +  ClusterRemove = 13,
1: +  RemoveSynchronized = 14,
1: +  ExternalBbl = 15,
1: +  FailFast = 16,
1: +  LastDev = 17,
1: +  CollisionCheck = 18,
1:  };
1:  
1:  enum mddev_flags {
1: -	MD_ARRAY_FIRST_USE = 0,
1: -	MD_CLOSING = 1,
1: -	MD_JOURNAL_CLEAN = 2,
1: -	MD_HAS_JOURNAL = 3,
1: -	MD_CLUSTER_RESYNC_LOCKED = 4,
1: -	MD_FAILFAST_SUPPORTED = 5,
1: -	MD_HAS_PPL = 6,
1: -	MD_HAS_MULTIPLE_PPLS = 7,
1: -	MD_ALLOW_SB_UPDATE = 8,
1: -	MD_UPDATING_SB = 9,
1: -	MD_NOT_READY = 10,
1: -	MD_BROKEN = 11,
1: +  MD_ARRAY_FIRST_USE = 0,
1: +  MD_CLOSING = 1,
1: +  MD_JOURNAL_CLEAN = 2,
1: +  MD_HAS_JOURNAL = 3,
1: +  MD_CLUSTER_RESYNC_LOCKED = 4,
1: +  MD_FAILFAST_SUPPORTED = 5,
1: +  MD_HAS_PPL = 6,
1: +  MD_HAS_MULTIPLE_PPLS = 7,
1: +  MD_ALLOW_SB_UPDATE = 8,
1: +  MD_UPDATING_SB = 9,
1: +  MD_NOT_READY = 10,
1: +  MD_BROKEN = 11,
1:  };
1:  
1:  enum mddev_sb_flags {
1: -	MD_SB_CHANGE_DEVS = 0,
1: -	MD_SB_CHANGE_CLEAN = 1,
1: -	MD_SB_CHANGE_PENDING = 2,
1: -	MD_SB_NEED_REWRITE = 3,
1: +  MD_SB_CHANGE_DEVS = 0,
1: +  MD_SB_CHANGE_CLEAN = 1,
1: +  MD_SB_CHANGE_PENDING = 2,
1: +  MD_SB_NEED_REWRITE = 3,
1:  };
1:  
1:  struct md_personality {
1: -	char *name;
1: -	int level;
1: -	struct list_head list;
1: -	struct module *owner;
1: -	bool (*make_request)(struct mddev *, struct bio *);
1: -	int (*run)(struct mddev *);
1: -	int (*start)(struct mddev *);
1: -	void (*free)(struct mddev *, void *);
1: -	void (*status)(struct seq_file *, struct mddev *);
1: -	void (*error_handler)(struct mddev *, struct md_rdev *);
1: -	int (*hot_add_disk)(struct mddev *, struct md_rdev *);
1: -	int (*hot_remove_disk)(struct mddev *, struct md_rdev *);
1: -	int (*spare_active)(struct mddev *);
1: -	sector_t (*sync_request)(struct mddev *, sector_t, int *);
1: -	int (*resize)(struct mddev *, sector_t);
1: -	sector_t (*size)(struct mddev *, sector_t, int);
1: -	int (*check_reshape)(struct mddev *);
1: -	int (*start_reshape)(struct mddev *);
1: -	void (*finish_reshape)(struct mddev *);
1: -	void (*update_reshape_pos)(struct mddev *);
1: -	void (*quiesce)(struct mddev *, int);
1: -	void * (*takeover)(struct mddev *);
1: -	int (*change_consistency_policy)(struct mddev *, const char *);
1: +  char *name;
1: +  int level;
1: +  struct list_head list;
1: +  struct module *owner;
1: +  bool (*make_request)(struct mddev *, struct bio *);
1: +  int (*run)(struct mddev *);
1: +  int (*start)(struct mddev *);
1: +  void (*free)(struct mddev *, void *);
1: +  void (*status)(struct seq_file *, struct mddev *);
1: +  void (*error_handler)(struct mddev *, struct md_rdev *);
1: +  int (*hot_add_disk)(struct mddev *, struct md_rdev *);
1: +  int (*hot_remove_disk)(struct mddev *, struct md_rdev *);
1: +  int (*spare_active)(struct mddev *);
1: +  sector_t (*sync_request)(struct mddev *, sector_t, int *);
1: +  int (*resize)(struct mddev *, sector_t);
1: +  sector_t (*size)(struct mddev *, sector_t, int);
1: +  int (*check_reshape)(struct mddev *);
1: +  int (*start_reshape)(struct mddev *);
1: +  void (*finish_reshape)(struct mddev *);
1: +  void (*update_reshape_pos)(struct mddev *);
1: +  void (*quiesce)(struct mddev *, int);
1: +  void *(*takeover)(struct mddev *);
1: +  int (*change_consistency_policy)(struct mddev *, const char *);
1:  };
1:  
1:  struct md_thread {
1: -	void (*run)(struct md_thread *);
1: -	struct mddev *mddev;
1: -	wait_queue_head_t wqueue;
1: -	long unsigned int flags;
1: -	struct task_struct *tsk;
1: -	long unsigned int timeout;
1: -	void *private;
1: +  void (*run)(struct md_thread *);
1: +  struct mddev *mddev;
1: +  wait_queue_head_t wqueue;
1: +  long unsigned int flags;
1: +  struct task_struct *tsk;
1: +  long unsigned int timeout;
1: +  void *private;
1:  };
1:  
1:  struct bitmap_page;
1:  
1:  struct bitmap_counts {
1: -	spinlock_t lock;
1: -	struct bitmap_page *bp;
1: -	long unsigned int pages;
1: -	long unsigned int missing_pages;
1: -	long unsigned int chunkshift;
1: -	long unsigned int chunks;
1: +  spinlock_t lock;
1: +  struct bitmap_page *bp;
1: +  long unsigned int pages;
1: +  long unsigned int missing_pages;
1: +  long unsigned int chunkshift;
1: +  long unsigned int chunks;
1:  };
1:  
1:  struct bitmap_storage {
1: -	struct file *file;
1: -	struct page *sb_page;
1: -	struct page **filemap;
1: -	long unsigned int *filemap_attr;
1: -	long unsigned int file_pages;
1: -	long unsigned int bytes;
1: +  struct file *file;
1: +  struct page *sb_page;
1: +  struct page **filemap;
1: +  long unsigned int *filemap_attr;
1: +  long unsigned int file_pages;
1: +  long unsigned int bytes;
1:  };
1:  
1:  struct bitmap {
1: -	struct bitmap_counts counts;
1: -	struct mddev *mddev;
1: -	__u64 events_cleared;
1: -	int need_sync;
1: -	struct bitmap_storage storage;
1: -	long unsigned int flags;
1: -	int allclean;
1: -	atomic_t behind_writes;
1: -	long unsigned int behind_writes_used;
1: -	long unsigned int daemon_lastrun;
1: -	long unsigned int last_end_sync;
1: -	atomic_t pending_writes;
1: -	wait_queue_head_t write_wait;
1: -	wait_queue_head_t overflow_wait;
1: -	wait_queue_head_t behind_wait;
1: -	struct kernfs_node *sysfs_can_clear;
1: -	int cluster_slot;
1: +  struct bitmap_counts counts;
1: +  struct mddev *mddev;
1: +  __u64 events_cleared;
1: +  int need_sync;
1: +  struct bitmap_storage storage;
1: +  long unsigned int flags;
1: +  int allclean;
1: +  atomic_t behind_writes;
1: +  long unsigned int behind_writes_used;
1: +  long unsigned int daemon_lastrun;
1: +  long unsigned int last_end_sync;
1: +  atomic_t pending_writes;
1: +  wait_queue_head_t write_wait;
1: +  wait_queue_head_t overflow_wait;
1: +  wait_queue_head_t behind_wait;
1: +  struct kernfs_node *sysfs_can_clear;
1: +  int cluster_slot;
1:  };
1:  
1:  enum recovery_flags {
1: -	MD_RECOVERY_RUNNING = 0,
1: -	MD_RECOVERY_SYNC = 1,
1: -	MD_RECOVERY_RECOVER = 2,
1: -	MD_RECOVERY_INTR = 3,
1: -	MD_RECOVERY_DONE = 4,
1: -	MD_RECOVERY_NEEDED = 5,
1: -	MD_RECOVERY_REQUESTED = 6,
1: -	MD_RECOVERY_CHECK = 7,
1: -	MD_RECOVERY_RESHAPE = 8,
1: -	MD_RECOVERY_FROZEN = 9,
1: -	MD_RECOVERY_ERROR = 10,
1: -	MD_RECOVERY_WAIT = 11,
1: -	MD_RESYNCING_REMOTE = 12,
1: +  MD_RECOVERY_RUNNING = 0,
1: +  MD_RECOVERY_SYNC = 1,
1: +  MD_RECOVERY_RECOVER = 2,
1: +  MD_RECOVERY_INTR = 3,
1: +  MD_RECOVERY_DONE = 4,
1: +  MD_RECOVERY_NEEDED = 5,
1: +  MD_RECOVERY_REQUESTED = 6,
1: +  MD_RECOVERY_CHECK = 7,
1: +  MD_RECOVERY_RESHAPE = 8,
1: +  MD_RECOVERY_FROZEN = 9,
1: +  MD_RECOVERY_ERROR = 10,
1: +  MD_RECOVERY_WAIT = 11,
1: +  MD_RESYNCING_REMOTE = 12,
1:  };
1:  
1:  struct md_sysfs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct mddev *, char *);
1: -	ssize_t (*store)(struct mddev *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct mddev *, char *);
1: +  ssize_t (*store)(struct mddev *, const char *, size_t);
1:  };
1:  
1:  struct bitmap_page {
1: -	char *map;
1: -	unsigned int hijacked: 1;
1: -	unsigned int pending: 1;
1: -	unsigned int count: 30;
1: +  char *map;
1: +  unsigned int hijacked : 1;
1: +  unsigned int pending : 1;
1: +  unsigned int count : 30;
1:  };
1:  
1:  struct md_io {
1: -	struct mddev *mddev;
1: -	bio_end_io_t *orig_bi_end_io;
1: -	void *orig_bi_private;
1: -	long unsigned int start_time;
1: -	struct hd_struct *part;
1: +  struct mddev *mddev;
1: +  bio_end_io_t *orig_bi_end_io;
1: +  void *orig_bi_private;
1: +  long unsigned int start_time;
1: +  struct hd_struct *part;
1:  };
1:  
1:  struct super_type {
1: -	char *name;
1: -	struct module *owner;
1: -	int (*load_super)(struct md_rdev *, struct md_rdev *, int);
1: -	int (*validate_super)(struct mddev *, struct md_rdev *);
1: -	void (*sync_super)(struct mddev *, struct md_rdev *);
1: -	long long unsigned int (*rdev_size_change)(struct md_rdev *, sector_t);
1: -	int (*allow_new_offset)(struct md_rdev *, long long unsigned int);
1: +  char *name;
1: +  struct module *owner;
1: +  int (*load_super)(struct md_rdev *, struct md_rdev *, int);
1: +  int (*validate_super)(struct mddev *, struct md_rdev *);
1: +  void (*sync_super)(struct mddev *, struct md_rdev *);
1: +  long long unsigned int (*rdev_size_change)(struct md_rdev *, sector_t);
1: +  int (*allow_new_offset)(struct md_rdev *, long long unsigned int);
1:  };
1:  
1:  struct rdev_sysfs_entry {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct md_rdev *, char *);
1: -	ssize_t (*store)(struct md_rdev *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct md_rdev *, char *);
1: +  ssize_t (*store)(struct md_rdev *, const char *, size_t);
1:  };
1:  
1:  enum array_state {
1: -	clear = 0,
1: -	inactive = 1,
1: -	suspended = 2,
1: -	readonly = 3,
1: -	read_auto = 4,
1: -	clean = 5,
1: -	active = 6,
1: -	write_pending = 7,
1: -	active_idle = 8,
1: -	broken = 9,
1: -	bad_word = 10,
1: +  clear = 0,
1: +  inactive = 1,
1: +  suspended = 2,
1: +  readonly = 3,
1: +  read_auto = 4,
1: +  clean = 5,
1: +  active = 6,
1: +  write_pending = 7,
1: +  active_idle = 8,
1: +  broken = 9,
1: +  bad_word = 10,
1:  };
1:  
1:  struct detected_devices_node {
1: -	struct list_head list;
1: -	dev_t dev;
1: +  struct list_head list;
1: +  dev_t dev;
1:  };
1:  
1:  typedef __u16 bitmap_counter_t;
1:  
1:  enum bitmap_state {
1: -	BITMAP_STALE = 1,
1: -	BITMAP_WRITE_ERROR = 2,
1: -	BITMAP_HOSTENDIAN = 15,
1: +  BITMAP_STALE = 1,
1: +  BITMAP_WRITE_ERROR = 2,
1: +  BITMAP_HOSTENDIAN = 15,
1:  };
1:  
1:  struct bitmap_super_s {
1: -	__le32 magic;
1: -	__le32 version;
1: -	__u8 uuid[16];
1: -	__le64 events;
1: -	__le64 events_cleared;
1: -	__le64 sync_size;
1: -	__le32 state;
1: -	__le32 chunksize;
1: -	__le32 daemon_sleep;
1: -	__le32 write_behind;
1: -	__le32 sectors_reserved;
1: -	__le32 nodes;
1: -	__u8 cluster_name[64];
1: -	__u8 pad[120];
1: +  __le32 magic;
1: +  __le32 version;
1: +  __u8 uuid[16];
1: +  __le64 events;
1: +  __le64 events_cleared;
1: +  __le64 sync_size;
1: +  __le32 state;
1: +  __le32 chunksize;
1: +  __le32 daemon_sleep;
1: +  __le32 write_behind;
1: +  __le32 sectors_reserved;
1: +  __le32 nodes;
1: +  __u8 cluster_name[64];
1: +  __u8 pad[120];
1:  };
1:  
1:  typedef struct bitmap_super_s bitmap_super_t;
1:  
1:  enum bitmap_page_attr {
1: -	BITMAP_PAGE_DIRTY = 0,
1: -	BITMAP_PAGE_PENDING = 1,
1: -	BITMAP_PAGE_NEEDWRITE = 2,
1: +  BITMAP_PAGE_DIRTY = 0,
1: +  BITMAP_PAGE_PENDING = 1,
1: +  BITMAP_PAGE_NEEDWRITE = 2,
1:  };
1:  
1:  struct md_setup_args {
1: -	int minor;
1: -	int partitioned;
1: -	int level;
1: -	int chunk;
1: -	char *device_names;
1: +  int minor;
1: +  int partitioned;
1: +  int level;
1: +  int chunk;
1: +  char *device_names;
1:  };
1:  
1:  struct dm_kobject_holder {
1: -	struct kobject kobj;
1: -	struct completion completion;
1: +  struct kobject kobj;
1: +  struct completion completion;
1:  };
1:  
1:  struct cpufreq_policy_data {
1: -	struct cpufreq_cpuinfo cpuinfo;
1: -	struct cpufreq_frequency_table *freq_table;
1: -	unsigned int cpu;
1: -	unsigned int min;
1: -	unsigned int max;
1: +  struct cpufreq_cpuinfo cpuinfo;
1: +  struct cpufreq_frequency_table *freq_table;
1: +  unsigned int cpu;
1: +  unsigned int min;
1: +  unsigned int max;
1:  };
1:  
1:  struct freq_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct cpufreq_policy *, char *);
1: -	ssize_t (*store)(struct cpufreq_policy *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct cpufreq_policy *, char *);
1: +  ssize_t (*store)(struct cpufreq_policy *, const char *, size_t);
1:  };
1:  
1:  struct cpufreq_driver {
1: -	char name[16];
1: -	u16 flags;
1: -	void *driver_data;
1: -	int (*init)(struct cpufreq_policy *);
1: -	int (*verify)(struct cpufreq_policy_data *);
1: -	int (*setpolicy)(struct cpufreq_policy *);
1: -	int (*target)(struct cpufreq_policy *, unsigned int, unsigned int);
1: -	int (*target_index)(struct cpufreq_policy *, unsigned int);
1: -	unsigned int (*fast_switch)(struct cpufreq_policy *, unsigned int);
1: -	unsigned int (*resolve_freq)(struct cpufreq_policy *, unsigned int);
1: -	unsigned int (*get_intermediate)(struct cpufreq_policy *, unsigned int);
1: -	int (*target_intermediate)(struct cpufreq_policy *, unsigned int);
1: -	unsigned int (*get)(unsigned int);
1: -	void (*update_limits)(unsigned int);
1: -	int (*bios_limit)(int, unsigned int *);
1: -	int (*online)(struct cpufreq_policy *);
1: -	int (*offline)(struct cpufreq_policy *);
1: -	int (*exit)(struct cpufreq_policy *);
1: -	void (*stop_cpu)(struct cpufreq_policy *);
1: -	int (*suspend)(struct cpufreq_policy *);
1: -	int (*resume)(struct cpufreq_policy *);
1: -	void (*ready)(struct cpufreq_policy *);
1: -	struct freq_attr **attr;
1: -	bool boost_enabled;
1: -	int (*set_boost)(struct cpufreq_policy *, int);
1: +  char name[16];
1: +  u16 flags;
1: +  void *driver_data;
1: +  int (*init)(struct cpufreq_policy *);
1: +  int (*verify)(struct cpufreq_policy_data *);
1: +  int (*setpolicy)(struct cpufreq_policy *);
1: +  int (*target)(struct cpufreq_policy *, unsigned int, unsigned int);
1: +  int (*target_index)(struct cpufreq_policy *, unsigned int);
1: +  unsigned int (*fast_switch)(struct cpufreq_policy *, unsigned int);
1: +  unsigned int (*resolve_freq)(struct cpufreq_policy *, unsigned int);
1: +  unsigned int (*get_intermediate)(struct cpufreq_policy *, unsigned int);
1: +  int (*target_intermediate)(struct cpufreq_policy *, unsigned int);
1: +  unsigned int (*get)(unsigned int);
1: +  void (*update_limits)(unsigned int);
1: +  int (*bios_limit)(int, unsigned int *);
1: +  int (*online)(struct cpufreq_policy *);
1: +  int (*offline)(struct cpufreq_policy *);
1: +  int (*exit)(struct cpufreq_policy *);
1: +  void (*stop_cpu)(struct cpufreq_policy *);
1: +  int (*suspend)(struct cpufreq_policy *);
1: +  int (*resume)(struct cpufreq_policy *);
1: +  void (*ready)(struct cpufreq_policy *);
1: +  struct freq_attr **attr;
1: +  bool boost_enabled;
1: +  int (*set_boost)(struct cpufreq_policy *, int);
1:  };
1:  
1:  struct cpufreq_stats {
1: -	unsigned int total_trans;
1: -	long long unsigned int last_time;
1: -	unsigned int max_state;
1: -	unsigned int state_num;
1: -	unsigned int last_index;
1: -	u64 *time_in_state;
1: -	unsigned int *freq_table;
1: -	unsigned int *trans_table;
1: -	unsigned int reset_pending;
1: -	long long unsigned int reset_time;
1: +  unsigned int total_trans;
1: +  long long unsigned int last_time;
1: +  unsigned int max_state;
1: +  unsigned int state_num;
1: +  unsigned int last_index;
1: +  u64 *time_in_state;
1: +  unsigned int *freq_table;
1: +  unsigned int *trans_table;
1: +  unsigned int reset_pending;
1: +  long long unsigned int reset_time;
1:  };
1:  
1:  enum {
1: -	OD_NORMAL_SAMPLE = 0,
1: -	OD_SUB_SAMPLE = 1,
1: +  OD_NORMAL_SAMPLE = 0,
1: +  OD_SUB_SAMPLE = 1,
1:  };
1:  
1:  struct dbs_data {
1: -	struct gov_attr_set attr_set;
1: -	void *tuners;
1: -	unsigned int ignore_nice_load;
1: -	unsigned int sampling_rate;
1: -	unsigned int sampling_down_factor;
1: -	unsigned int up_threshold;
1: -	unsigned int io_is_busy;
1: +  struct gov_attr_set attr_set;
1: +  void *tuners;
1: +  unsigned int ignore_nice_load;
1: +  unsigned int sampling_rate;
1: +  unsigned int sampling_down_factor;
1: +  unsigned int up_threshold;
1: +  unsigned int io_is_busy;
1:  };
1:  
1:  struct policy_dbs_info {
1: -	struct cpufreq_policy *policy;
1: -	struct mutex update_mutex;
1: -	u64 last_sample_time;
1: -	s64 sample_delay_ns;
1: -	atomic_t work_count;
1: -	struct irq_work irq_work;
1: -	struct work_struct work;
1: -	struct dbs_data *dbs_data;
1: -	struct list_head list;
1: -	unsigned int rate_mult;
1: -	unsigned int idle_periods;
1: -	bool is_shared;
1: -	bool work_in_progress;
1: +  struct cpufreq_policy *policy;
1: +  struct mutex update_mutex;
1: +  u64 last_sample_time;
1: +  s64 sample_delay_ns;
1: +  atomic_t work_count;
1: +  struct irq_work irq_work;
1: +  struct work_struct work;
1: +  struct dbs_data *dbs_data;
1: +  struct list_head list;
1: +  unsigned int rate_mult;
1: +  unsigned int idle_periods;
1: +  bool is_shared;
1: +  bool work_in_progress;
1:  };
1:  
1:  struct dbs_governor {
1: -	struct cpufreq_governor gov;
1: -	struct kobj_type kobj_type;
1: -	struct dbs_data *gdbs_data;
1: -	unsigned int (*gov_dbs_update)(struct cpufreq_policy *);
1: -	struct policy_dbs_info * (*alloc)();
1: -	void (*free)(struct policy_dbs_info *);
1: -	int (*init)(struct dbs_data *);
1: -	void (*exit)(struct dbs_data *);
1: -	void (*start)(struct cpufreq_policy *);
1: +  struct cpufreq_governor gov;
1: +  struct kobj_type kobj_type;
1: +  struct dbs_data *gdbs_data;
1: +  unsigned int (*gov_dbs_update)(struct cpufreq_policy *);
1: +  struct policy_dbs_info *(*alloc)();
1: +  void (*free)(struct policy_dbs_info *);
1: +  int (*init)(struct dbs_data *);
1: +  void (*exit)(struct dbs_data *);
1: +  void (*start)(struct cpufreq_policy *);
1:  };
1:  
1:  struct od_ops {
1: -	unsigned int (*powersave_bias_target)(struct cpufreq_policy *, unsigned int, unsigned int);
1: +  unsigned int (*powersave_bias_target)(struct cpufreq_policy *, unsigned int,
1: +                                        unsigned int);
1:  };
1:  
1:  struct od_policy_dbs_info {
1: -	struct policy_dbs_info policy_dbs;
1: -	unsigned int freq_lo;
1: -	unsigned int freq_lo_delay_us;
1: -	unsigned int freq_hi_delay_us;
1: -	unsigned int sample_type: 1;
1: +  struct policy_dbs_info policy_dbs;
1: +  unsigned int freq_lo;
1: +  unsigned int freq_lo_delay_us;
1: +  unsigned int freq_hi_delay_us;
1: +  unsigned int sample_type : 1;
1:  };
1:  
1:  struct od_dbs_tuners {
1: -	unsigned int powersave_bias;
1: +  unsigned int powersave_bias;
1:  };
1:  
1:  struct cs_policy_dbs_info {
1: -	struct policy_dbs_info policy_dbs;
1: -	unsigned int down_skip;
1: -	unsigned int requested_freq;
1: +  struct policy_dbs_info policy_dbs;
1: +  unsigned int down_skip;
1: +  unsigned int requested_freq;
1:  };
1:  
1:  struct cs_dbs_tuners {
1: -	unsigned int down_threshold;
1: -	unsigned int freq_step;
1: +  unsigned int down_threshold;
1: +  unsigned int freq_step;
1:  };
1:  
1:  struct cpu_dbs_info {
1: -	u64 prev_cpu_idle;
1: -	u64 prev_update_time;
1: -	u64 prev_cpu_nice;
1: -	unsigned int prev_load;
1: -	struct update_util_data update_util;
1: -	struct policy_dbs_info *policy_dbs;
1: +  u64 prev_cpu_idle;
1: +  u64 prev_update_time;
1: +  u64 prev_cpu_nice;
1: +  unsigned int prev_load;
1: +  struct update_util_data update_util;
1: +  struct policy_dbs_info *policy_dbs;
1:  };
1:  
1:  enum {
1: -	UNDEFINED_CAPABLE = 0,
1: -	SYSTEM_INTEL_MSR_CAPABLE = 1,
1: -	SYSTEM_AMD_MSR_CAPABLE = 2,
1: -	SYSTEM_IO_CAPABLE = 3,
1: +  UNDEFINED_CAPABLE = 0,
1: +  SYSTEM_INTEL_MSR_CAPABLE = 1,
1: +  SYSTEM_AMD_MSR_CAPABLE = 2,
1: +  SYSTEM_IO_CAPABLE = 3,
1:  };
1:  
1:  struct acpi_cpufreq_data {
1: -	unsigned int resume;
1: -	unsigned int cpu_feature;
1: -	unsigned int acpi_perf_cpu;
1: -	cpumask_var_t freqdomain_cpus;
1: -	void (*cpu_freq_write)(struct acpi_pct_register *, u32);
1: -	u32 (*cpu_freq_read)(struct acpi_pct_register *);
1: +  unsigned int resume;
1: +  unsigned int cpu_feature;
1: +  unsigned int acpi_perf_cpu;
1: +  cpumask_var_t freqdomain_cpus;
1: +  void (*cpu_freq_write)(struct acpi_pct_register *, u32);
1: +  u32 (*cpu_freq_read)(struct acpi_pct_register *);
1:  };
1:  
1:  struct drv_cmd {
1: -	struct acpi_pct_register *reg;
1: -	u32 val;
1: -	union {
1: -		void (*write)(struct acpi_pct_register *, u32);
1: -		u32 (*read)(struct acpi_pct_register *);
1: -	} func;
1: +  struct acpi_pct_register *reg;
1: +  u32 val;
1: +  union {
1: +    void (*write)(struct acpi_pct_register *, u32);
1: +    u32 (*read)(struct acpi_pct_register *);
1: +  } func;
1:  };
1:  
1:  struct powernow_k8_data {
1: -	unsigned int cpu;
1: -	u32 numps;
1: -	u32 batps;
1: -	u32 rvo;
1: -	u32 irt;
1: -	u32 vidmvs;
1: -	u32 vstable;
1: -	u32 plllock;
1: -	u32 exttype;
1: -	u32 currvid;
1: -	u32 currfid;
1: -	struct cpufreq_frequency_table *powernow_table;
1: -	struct acpi_processor_performance acpi_data;
1: -	struct cpumask *available_cores;
1: +  unsigned int cpu;
1: +  u32 numps;
1: +  u32 batps;
1: +  u32 rvo;
1: +  u32 irt;
1: +  u32 vidmvs;
1: +  u32 vstable;
1: +  u32 plllock;
1: +  u32 exttype;
1: +  u32 currvid;
1: +  u32 currfid;
1: +  struct cpufreq_frequency_table *powernow_table;
1: +  struct acpi_processor_performance acpi_data;
1: +  struct cpumask *available_cores;
1:  };
1:  
1:  struct psb_s {
1: -	u8 signature[10];
1: -	u8 tableversion;
1: -	u8 flags1;
1: -	u16 vstable;
1: -	u8 flags2;
1: -	u8 num_tables;
1: -	u32 cpuid;
1: -	u8 plllocktime;
1: -	u8 maxfid;
1: -	u8 maxvid;
1: -	u8 numps;
1: +  u8 signature[10];
1: +  u8 tableversion;
1: +  u8 flags1;
1: +  u16 vstable;
1: +  u8 flags2;
1: +  u8 num_tables;
1: +  u32 cpuid;
1: +  u8 plllocktime;
1: +  u8 maxfid;
1: +  u8 maxvid;
1: +  u8 numps;
1:  };
1:  
1:  struct pst_s {
1: -	u8 fid;
1: -	u8 vid;
1: +  u8 fid;
1: +  u8 vid;
1:  };
1:  
1:  struct powernowk8_target_arg {
1: -	struct cpufreq_policy *pol;
1: -	unsigned int newstate;
1: +  struct cpufreq_policy *pol;
1: +  unsigned int newstate;
1:  };
1:  
1:  struct init_on_cpu {
1: -	struct powernow_k8_data *data;
1: -	int rc;
1: +  struct powernow_k8_data *data;
1: +  int rc;
1:  };
1:  
1:  enum acpi_preferred_pm_profiles {
1: -	PM_UNSPECIFIED = 0,
1: -	PM_DESKTOP = 1,
1: -	PM_MOBILE = 2,
1: -	PM_WORKSTATION = 3,
1: -	PM_ENTERPRISE_SERVER = 4,
1: -	PM_SOHO_SERVER = 5,
1: -	PM_APPLIANCE_PC = 6,
1: -	PM_PERFORMANCE_SERVER = 7,
1: -	PM_TABLET = 8,
1: +  PM_UNSPECIFIED = 0,
1: +  PM_DESKTOP = 1,
1: +  PM_MOBILE = 2,
1: +  PM_WORKSTATION = 3,
1: +  PM_ENTERPRISE_SERVER = 4,
1: +  PM_SOHO_SERVER = 5,
1: +  PM_APPLIANCE_PC = 6,
1: +  PM_PERFORMANCE_SERVER = 7,
1: +  PM_TABLET = 8,
1:  };
1:  
1:  struct sample {
1: -	int32_t core_avg_perf;
1: -	int32_t busy_scaled;
1: -	u64 aperf;
1: -	u64 mperf;
1: -	u64 tsc;
1: -	u64 time;
1: +  int32_t core_avg_perf;
1: +  int32_t busy_scaled;
1: +  u64 aperf;
1: +  u64 mperf;
1: +  u64 tsc;
1: +  u64 time;
1:  };
1:  
1:  struct pstate_data {
1: -	int current_pstate;
1: -	int min_pstate;
1: -	int max_pstate;
1: -	int max_pstate_physical;
1: -	int scaling;
1: -	int turbo_pstate;
1: -	unsigned int max_freq;
1: -	unsigned int turbo_freq;
1: +  int current_pstate;
1: +  int min_pstate;
1: +  int max_pstate;
1: +  int max_pstate_physical;
1: +  int scaling;
1: +  int turbo_pstate;
1: +  unsigned int max_freq;
1: +  unsigned int turbo_freq;
1:  };
1:  
1:  struct vid_data {
1: -	int min;
1: -	int max;
1: -	int turbo;
1: -	int32_t ratio;
1: +  int min;
1: +  int max;
1: +  int turbo;
1: +  int32_t ratio;
1:  };
1:  
1:  struct global_params {
1: -	bool no_turbo;
1: -	bool turbo_disabled;
1: -	bool turbo_disabled_mf;
1: -	int max_perf_pct;
1: -	int min_perf_pct;
1: +  bool no_turbo;
1: +  bool turbo_disabled;
1: +  bool turbo_disabled_mf;
1: +  int max_perf_pct;
1: +  int min_perf_pct;
1:  };
1:  
1:  struct cpudata {
1: -	int cpu;
1: -	unsigned int policy;
1: -	struct update_util_data update_util;
1: -	bool update_util_set;
1: -	struct pstate_data pstate;
1: -	struct vid_data vid;
1: -	u64 last_update;
1: -	u64 last_sample_time;
1: -	u64 aperf_mperf_shift;
1: -	u64 prev_aperf;
1: -	u64 prev_mperf;
1: -	u64 prev_tsc;
1: -	u64 prev_cummulative_iowait;
1: -	struct sample sample;
1: -	int32_t min_perf_ratio;
1: -	int32_t max_perf_ratio;
1: -	struct acpi_processor_performance acpi_perf_data;
1: -	bool valid_pss_table;
1: -	unsigned int iowait_boost;
1: -	s16 epp_powersave;
1: -	s16 epp_policy;
1: -	s16 epp_default;
1: -	s16 epp_cached;
1: -	u64 hwp_req_cached;
1: -	u64 hwp_cap_cached;
1: -	u64 last_io_update;
1: -	unsigned int sched_flags;
1: -	u32 hwp_boost_min;
1: -	bool suspended;
1: +  int cpu;
1: +  unsigned int policy;
1: +  struct update_util_data update_util;
1: +  bool update_util_set;
1: +  struct pstate_data pstate;
1: +  struct vid_data vid;
1: +  u64 last_update;
1: +  u64 last_sample_time;
1: +  u64 aperf_mperf_shift;
1: +  u64 prev_aperf;
1: +  u64 prev_mperf;
1: +  u64 prev_tsc;
1: +  u64 prev_cummulative_iowait;
1: +  struct sample sample;
1: +  int32_t min_perf_ratio;
1: +  int32_t max_perf_ratio;
1: +  struct acpi_processor_performance acpi_perf_data;
1: +  bool valid_pss_table;
1: +  unsigned int iowait_boost;
1: +  s16 epp_powersave;
1: +  s16 epp_policy;
1: +  s16 epp_default;
1: +  s16 epp_cached;
1: +  u64 hwp_req_cached;
1: +  u64 hwp_cap_cached;
1: +  u64 last_io_update;
1: +  unsigned int sched_flags;
1: +  u32 hwp_boost_min;
1: +  bool suspended;
1:  };
1:  
1:  struct pstate_funcs {
1: -	int (*get_max)();
1: -	int (*get_max_physical)();
1: -	int (*get_min)();
1: -	int (*get_turbo)();
1: -	int (*get_scaling)();
1: -	int (*get_aperf_mperf_shift)();
1: -	u64 (*get_val)(struct cpudata *, int);
1: -	void (*get_vid)(struct cpudata *);
1: +  int (*get_max)();
1: +  int (*get_max_physical)();
1: +  int (*get_min)();
1: +  int (*get_turbo)();
1: +  int (*get_scaling)();
1: +  int (*get_aperf_mperf_shift)();
1: +  u64 (*get_val)(struct cpudata *, int);
1: +  void (*get_vid)(struct cpudata *);
1:  };
1:  
1:  enum {
1: -	PSS = 0,
1: -	PPC = 1,
1: +  PSS = 0,
1: +  PPC = 1,
1:  };
1:  
1:  struct cpuidle_governor {
1: -	char name[16];
1: -	struct list_head governor_list;
1: -	unsigned int rating;
1: -	int (*enable)(struct cpuidle_driver *, struct cpuidle_device *);
1: -	void (*disable)(struct cpuidle_driver *, struct cpuidle_device *);
1: -	int (*select)(struct cpuidle_driver *, struct cpuidle_device *, bool *);
1: -	void (*reflect)(struct cpuidle_device *, int);
1: +  char name[16];
1: +  struct list_head governor_list;
1: +  unsigned int rating;
1: +  int (*enable)(struct cpuidle_driver *, struct cpuidle_device *);
1: +  void (*disable)(struct cpuidle_driver *, struct cpuidle_device *);
1: +  int (*select)(struct cpuidle_driver *, struct cpuidle_device *, bool *);
1: +  void (*reflect)(struct cpuidle_device *, int);
1:  };
1:  
1:  struct cpuidle_state_kobj {
1: -	struct cpuidle_state *state;
1: -	struct cpuidle_state_usage *state_usage;
1: -	struct completion kobj_unregister;
1: -	struct kobject kobj;
1: -	struct cpuidle_device *device;
1: +  struct cpuidle_state *state;
1: +  struct cpuidle_state_usage *state_usage;
1: +  struct completion kobj_unregister;
1: +  struct kobject kobj;
1: +  struct cpuidle_device *device;
1:  };
1:  
1:  struct cpuidle_device_kobj {
1: -	struct cpuidle_device *dev;
1: -	struct completion kobj_unregister;
1: -	struct kobject kobj;
1: +  struct cpuidle_device *dev;
1: +  struct completion kobj_unregister;
1: +  struct kobject kobj;
1:  };
1:  
1:  struct cpuidle_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct cpuidle_device *, char *);
1: -	ssize_t (*store)(struct cpuidle_device *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct cpuidle_device *, char *);
1: +  ssize_t (*store)(struct cpuidle_device *, const char *, size_t);
1:  };
1:  
1:  struct cpuidle_state_attr {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct cpuidle_state *, struct cpuidle_state_usage *, char *);
1: -	ssize_t (*store)(struct cpuidle_state *, struct cpuidle_state_usage *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct cpuidle_state *, struct cpuidle_state_usage *, char *);
1: +  ssize_t (*store)(struct cpuidle_state *, struct cpuidle_state_usage *,
1: +                   const char *, size_t);
1:  };
1:  
1:  struct ladder_device_state {
1: -	struct {
1: -		u32 promotion_count;
1: -		u32 demotion_count;
1: -		u64 promotion_time_ns;
1: -		u64 demotion_time_ns;
1: -	} threshold;
1: -	struct {
1: -		int promotion_count;
1: -		int demotion_count;
1: -	} stats;
1: +  struct {
1: +    u32 promotion_count;
1: +    u32 demotion_count;
1: +    u64 promotion_time_ns;
1: +    u64 demotion_time_ns;
1: +  } threshold;
1: +  struct {
1: +    int promotion_count;
1: +    int demotion_count;
1: +  } stats;
1:  };
1:  
1:  struct ladder_device {
1: -	struct ladder_device_state states[10];
1: +  struct ladder_device_state states[10];
1:  };
1:  
1:  struct menu_device {
1: -	int needs_update;
1: -	int tick_wakeup;
1: -	u64 next_timer_ns;
1: -	unsigned int bucket;
1: -	unsigned int correction_factor[12];
1: -	unsigned int intervals[8];
1: -	int interval_ptr;
1: +  int needs_update;
1: +  int tick_wakeup;
1: +  u64 next_timer_ns;
1: +  unsigned int bucket;
1: +  unsigned int correction_factor[12];
1: +  unsigned int intervals[8];
1: +  int interval_ptr;
1:  };
1:  
1:  struct led_init_data {
1: -	struct fwnode_handle *fwnode;
1: -	const char *default_label;
1: -	const char *devicename;
1: -	bool devname_mandatory;
1: +  struct fwnode_handle *fwnode;
1: +  const char *default_label;
1: +  const char *devicename;
1: +  bool devname_mandatory;
1:  };
1:  
1:  struct led_properties {
1: -	u32 color;
1: -	bool color_present;
1: -	const char *function;
1: -	u32 func_enum;
1: -	bool func_enum_present;
1: -	const char *label;
1: +  u32 color;
1: +  bool color_present;
1: +  const char *function;
1: +  u32 func_enum;
1: +  bool func_enum_present;
1: +  const char *label;
1:  };
1:  
1:  enum dmi_entry_type {
1: -	DMI_ENTRY_BIOS = 0,
1: -	DMI_ENTRY_SYSTEM = 1,
1: -	DMI_ENTRY_BASEBOARD = 2,
1: -	DMI_ENTRY_CHASSIS = 3,
1: -	DMI_ENTRY_PROCESSOR = 4,
1: -	DMI_ENTRY_MEM_CONTROLLER = 5,
1: -	DMI_ENTRY_MEM_MODULE = 6,
1: -	DMI_ENTRY_CACHE = 7,
1: -	DMI_ENTRY_PORT_CONNECTOR = 8,
1: -	DMI_ENTRY_SYSTEM_SLOT = 9,
1: -	DMI_ENTRY_ONBOARD_DEVICE = 10,
1: -	DMI_ENTRY_OEMSTRINGS = 11,
1: -	DMI_ENTRY_SYSCONF = 12,
1: -	DMI_ENTRY_BIOS_LANG = 13,
1: -	DMI_ENTRY_GROUP_ASSOC = 14,
1: -	DMI_ENTRY_SYSTEM_EVENT_LOG = 15,
1: -	DMI_ENTRY_PHYS_MEM_ARRAY = 16,
1: -	DMI_ENTRY_MEM_DEVICE = 17,
1: -	DMI_ENTRY_32_MEM_ERROR = 18,
1: -	DMI_ENTRY_MEM_ARRAY_MAPPED_ADDR = 19,
1: -	DMI_ENTRY_MEM_DEV_MAPPED_ADDR = 20,
1: -	DMI_ENTRY_BUILTIN_POINTING_DEV = 21,
1: -	DMI_ENTRY_PORTABLE_BATTERY = 22,
1: -	DMI_ENTRY_SYSTEM_RESET = 23,
1: -	DMI_ENTRY_HW_SECURITY = 24,
1: -	DMI_ENTRY_SYSTEM_POWER_CONTROLS = 25,
1: -	DMI_ENTRY_VOLTAGE_PROBE = 26,
1: -	DMI_ENTRY_COOLING_DEV = 27,
1: -	DMI_ENTRY_TEMP_PROBE = 28,
1: -	DMI_ENTRY_ELECTRICAL_CURRENT_PROBE = 29,
1: -	DMI_ENTRY_OOB_REMOTE_ACCESS = 30,
1: -	DMI_ENTRY_BIS_ENTRY = 31,
1: -	DMI_ENTRY_SYSTEM_BOOT = 32,
1: -	DMI_ENTRY_MGMT_DEV = 33,
1: -	DMI_ENTRY_MGMT_DEV_COMPONENT = 34,
1: -	DMI_ENTRY_MGMT_DEV_THRES = 35,
1: -	DMI_ENTRY_MEM_CHANNEL = 36,
1: -	DMI_ENTRY_IPMI_DEV = 37,
1: -	DMI_ENTRY_SYS_POWER_SUPPLY = 38,
1: -	DMI_ENTRY_ADDITIONAL = 39,
1: -	DMI_ENTRY_ONBOARD_DEV_EXT = 40,
1: -	DMI_ENTRY_MGMT_CONTROLLER_HOST = 41,
1: -	DMI_ENTRY_INACTIVE = 126,
1: -	DMI_ENTRY_END_OF_TABLE = 127,
1: +  DMI_ENTRY_BIOS = 0,
1: +  DMI_ENTRY_SYSTEM = 1,
1: +  DMI_ENTRY_BASEBOARD = 2,
1: +  DMI_ENTRY_CHASSIS = 3,
1: +  DMI_ENTRY_PROCESSOR = 4,
1: +  DMI_ENTRY_MEM_CONTROLLER = 5,
1: +  DMI_ENTRY_MEM_MODULE = 6,
1: +  DMI_ENTRY_CACHE = 7,
1: +  DMI_ENTRY_PORT_CONNECTOR = 8,
1: +  DMI_ENTRY_SYSTEM_SLOT = 9,
1: +  DMI_ENTRY_ONBOARD_DEVICE = 10,
1: +  DMI_ENTRY_OEMSTRINGS = 11,
1: +  DMI_ENTRY_SYSCONF = 12,
1: +  DMI_ENTRY_BIOS_LANG = 13,
1: +  DMI_ENTRY_GROUP_ASSOC = 14,
1: +  DMI_ENTRY_SYSTEM_EVENT_LOG = 15,
1: +  DMI_ENTRY_PHYS_MEM_ARRAY = 16,
1: +  DMI_ENTRY_MEM_DEVICE = 17,
1: +  DMI_ENTRY_32_MEM_ERROR = 18,
1: +  DMI_ENTRY_MEM_ARRAY_MAPPED_ADDR = 19,
1: +  DMI_ENTRY_MEM_DEV_MAPPED_ADDR = 20,
1: +  DMI_ENTRY_BUILTIN_POINTING_DEV = 21,
1: +  DMI_ENTRY_PORTABLE_BATTERY = 22,
1: +  DMI_ENTRY_SYSTEM_RESET = 23,
1: +  DMI_ENTRY_HW_SECURITY = 24,
1: +  DMI_ENTRY_SYSTEM_POWER_CONTROLS = 25,
1: +  DMI_ENTRY_VOLTAGE_PROBE = 26,
1: +  DMI_ENTRY_COOLING_DEV = 27,
1: +  DMI_ENTRY_TEMP_PROBE = 28,
1: +  DMI_ENTRY_ELECTRICAL_CURRENT_PROBE = 29,
1: +  DMI_ENTRY_OOB_REMOTE_ACCESS = 30,
1: +  DMI_ENTRY_BIS_ENTRY = 31,
1: +  DMI_ENTRY_SYSTEM_BOOT = 32,
1: +  DMI_ENTRY_MGMT_DEV = 33,
1: +  DMI_ENTRY_MGMT_DEV_COMPONENT = 34,
1: +  DMI_ENTRY_MGMT_DEV_THRES = 35,
1: +  DMI_ENTRY_MEM_CHANNEL = 36,
1: +  DMI_ENTRY_IPMI_DEV = 37,
1: +  DMI_ENTRY_SYS_POWER_SUPPLY = 38,
1: +  DMI_ENTRY_ADDITIONAL = 39,
1: +  DMI_ENTRY_ONBOARD_DEV_EXT = 40,
1: +  DMI_ENTRY_MGMT_CONTROLLER_HOST = 41,
1: +  DMI_ENTRY_INACTIVE = 126,
1: +  DMI_ENTRY_END_OF_TABLE = 127,
1:  };
1:  
1:  struct dmi_memdev_info {
1: -	const char *device;
1: -	const char *bank;
1: -	u64 size;
1: -	u16 handle;
1: -	u8 type;
1: +  const char *device;
1: +  const char *bank;
1: +  u64 size;
1: +  u16 handle;
1: +  u8 type;
1:  };
1:  
1:  struct dmi_device_attribute {
1: -	struct device_attribute dev_attr;
1: -	int field;
1: +  struct device_attribute dev_attr;
1: +  int field;
1:  };
1:  
1:  struct mafield {
1: -	const char *prefix;
1: -	int field;
1: +  const char *prefix;
1: +  int field;
1:  };
1:  
1:  struct firmware_map_entry {
1: -	u64 start;
1: -	u64 end;
1: -	const char *type;
1: -	struct list_head list;
1: -	struct kobject kobj;
1: +  u64 start;
1: +  u64 end;
1: +  const char *type;
1: +  struct list_head list;
1: +  struct kobject kobj;
1:  };
1:  
1:  struct memmap_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct firmware_map_entry *, char *);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct firmware_map_entry *, char *);
1:  };
1:  
1:  typedef efi_status_t efi_query_variable_store_t(u32, long unsigned int, bool);
1:  
1:  typedef struct {
1: -	efi_guid_t guid;
1: -	u32 table;
1: +  efi_guid_t guid;
1: +  u32 table;
1:  } efi_config_table_32_t;
1:  
1:  typedef union {
1: -	struct {
1: -		efi_guid_t guid;
1: -		void *table;
1: -	};
1: -	efi_config_table_32_t mixed_mode;
1: +  struct {
1: +    efi_guid_t guid;
1: +    void *table;
1: +  };
1: +  efi_config_table_32_t mixed_mode;
1:  } efi_config_table_t;
1:  
1:  typedef struct {
1: -	u16 version;
1: -	u16 length;
1: -	u32 runtime_services_supported;
1: +  u16 version;
1: +  u16 length;
1: +  u32 runtime_services_supported;
1:  } efi_rt_properties_table_t;
1:  
1:  struct efivar_operations {
1: -	efi_get_variable_t *get_variable;
1: -	efi_get_next_variable_t *get_next_variable;
1: -	efi_set_variable_t *set_variable;
1: -	efi_set_variable_t *set_variable_nonblocking;
1: -	efi_query_variable_store_t *query_variable_store;
1: +  efi_get_variable_t *get_variable;
1: +  efi_get_next_variable_t *get_next_variable;
1: +  efi_set_variable_t *set_variable;
1: +  efi_set_variable_t *set_variable_nonblocking;
1: +  efi_query_variable_store_t *query_variable_store;
1:  };
1:  
1:  struct efivars {
1: -	struct kset *kset;
1: -	struct kobject *kobject;
1: -	const struct efivar_operations *ops;
1: +  struct kset *kset;
1: +  struct kobject *kobject;
1: +  const struct efivar_operations *ops;
1:  };
1:  
1:  struct linux_efi_random_seed {
1: -	u32 size;
1: -	u8 bits[0];
1: +  u32 size;
1: +  u8 bits[0];
1:  };
1:  
1:  struct linux_efi_memreserve {
1: -	int size;
1: -	atomic_t count;
1: -	phys_addr_t next;
1: -	struct {
1: -		phys_addr_t base;
1: -		phys_addr_t size;
1: -	} entry[0];
1: +  int size;
1: +  atomic_t count;
1: +  phys_addr_t next;
1: +  struct {
1: +    phys_addr_t base;
1: +    phys_addr_t size;
1: +  } entry[0];
1:  };
1:  
1:  struct efi_generic_dev_path {
1: -	u8 type;
1: -	u8 sub_type;
1: -	u16 length;
1: +  u8 type;
1: +  u8 sub_type;
1: +  u16 length;
1:  };
1:  
1:  struct efi_variable {
1: -	efi_char16_t VariableName[512];
1: -	efi_guid_t VendorGuid;
1: -	long unsigned int DataSize;
1: -	__u8 Data[1024];
1: -	efi_status_t Status;
1: -	__u32 Attributes;
1: +  efi_char16_t VariableName[512];
1: +  efi_guid_t VendorGuid;
1: +  long unsigned int DataSize;
1: +  __u8 Data[1024];
1: +  efi_status_t Status;
1: +  __u32 Attributes;
1:  } __attribute__((packed));
1:  
1:  struct efivar_entry {
1: -	struct efi_variable var;
1: -	struct list_head list;
1: -	struct kobject kobj;
1: -	bool scanning;
1: -	bool deleting;
1: +  struct efi_variable var;
1: +  struct list_head list;
1: +  struct kobject kobj;
1: +  bool scanning;
1: +  bool deleting;
1:  };
1:  
1:  struct variable_validate {
1: -	efi_guid_t vendor;
1: -	char *name;
1: -	bool (*validate)(efi_char16_t *, int, u8 *, long unsigned int);
1: +  efi_guid_t vendor;
1: +  char *name;
1: +  bool (*validate)(efi_char16_t *, int, u8 *, long unsigned int);
1:  };
1:  
1:  typedef struct {
1: -	u32 version;
1: -	u32 num_entries;
1: -	u32 desc_size;
1: -	u32 reserved;
1: -	efi_memory_desc_t entry[0];
1: +  u32 version;
1: +  u32 num_entries;
1: +  u32 desc_size;
1: +  u32 reserved;
1: +  efi_memory_desc_t entry[0];
1:  } efi_memory_attributes_table_t;
1:  
1:  typedef int (*efi_memattr_perm_setter)(struct mm_struct *, efi_memory_desc_t *);
1: @@ -110529,123 +111729,123 @@ typedef int (*efi_memattr_perm_setter)(struct mm_struct *, efi_memory_desc_t *);
1:  typedef u64 efi_physical_addr_t;
1:  
1:  typedef struct {
1: -	u64 length;
1: -	u64 data;
1: +  u64 length;
1: +  u64 data;
1:  } efi_capsule_block_desc_t;
1:  
1:  struct efi_system_resource_entry_v1 {
1: -	efi_guid_t fw_class;
1: -	u32 fw_type;
1: -	u32 fw_version;
1: -	u32 lowest_supported_fw_version;
1: -	u32 capsule_flags;
1: -	u32 last_attempt_version;
1: -	u32 last_attempt_status;
1: +  efi_guid_t fw_class;
1: +  u32 fw_type;
1: +  u32 fw_version;
1: +  u32 lowest_supported_fw_version;
1: +  u32 capsule_flags;
1: +  u32 last_attempt_version;
1: +  u32 last_attempt_status;
1:  };
1:  
1:  struct efi_system_resource_table {
1: -	u32 fw_resource_count;
1: -	u32 fw_resource_count_max;
1: -	u64 fw_resource_version;
1: -	u8 entries[0];
1: +  u32 fw_resource_count;
1: +  u32 fw_resource_count_max;
1: +  u64 fw_resource_version;
1: +  u8 entries[0];
1:  };
1:  
1:  struct esre_entry {
1: -	union {
1: -		struct efi_system_resource_entry_v1 *esre1;
1: -	} esre;
1: -	struct kobject kobj;
1: -	struct list_head list;
1: +  union {
1: +    struct efi_system_resource_entry_v1 *esre1;
1: +  } esre;
1: +  struct kobject kobj;
1: +  struct list_head list;
1:  };
1:  
1:  struct esre_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct esre_entry *, char *);
1: -	ssize_t (*store)(struct esre_entry *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct esre_entry *, char *);
1: +  ssize_t (*store)(struct esre_entry *, const char *, size_t);
1:  };
1:  
1:  struct efi_runtime_map_entry {
1: -	efi_memory_desc_t md;
1: -	struct kobject kobj;
1: +  efi_memory_desc_t md;
1: +  struct kobject kobj;
1:  };
1:  
1:  struct map_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct efi_runtime_map_entry *, char *);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct efi_runtime_map_entry *, char *);
1:  };
1:  
1:  struct dca_domain {
1: -	struct list_head node;
1: -	struct list_head dca_providers;
1: -	struct pci_bus *pci_rc;
1: +  struct list_head node;
1: +  struct list_head dca_providers;
1: +  struct pci_bus *pci_rc;
1:  };
1:  
1:  struct hid_device_id {
1: -	__u16 bus;
1: -	__u16 group;
1: -	__u32 vendor;
1: -	__u32 product;
1: -	kernel_ulong_t driver_data;
1: +  __u16 bus;
1: +  __u16 group;
1: +  __u32 vendor;
1: +  __u32 product;
1: +  kernel_ulong_t driver_data;
1:  };
1:  
1:  struct hid_item {
1: -	unsigned int format;
1: -	__u8 size;
1: -	__u8 type;
1: -	__u8 tag;
1: -	union {
1: -		__u8 u8;
1: -		__s8 s8;
1: -		__u16 u16;
1: -		__s16 s16;
1: -		__u32 u32;
1: -		__s32 s32;
1: -		__u8 *longdata;
1: -	} data;
1: +  unsigned int format;
1: +  __u8 size;
1: +  __u8 type;
1: +  __u8 tag;
1: +  union {
1: +    __u8 u8;
1: +    __s8 s8;
1: +    __u16 u16;
1: +    __s16 s16;
1: +    __u32 u32;
1: +    __s32 s32;
1: +    __u8 *longdata;
1: +  } data;
1:  };
1:  
1:  struct hid_global {
1: -	unsigned int usage_page;
1: -	__s32 logical_minimum;
1: -	__s32 logical_maximum;
1: -	__s32 physical_minimum;
1: -	__s32 physical_maximum;
1: -	__s32 unit_exponent;
1: -	unsigned int unit;
1: -	unsigned int report_id;
1: -	unsigned int report_size;
1: -	unsigned int report_count;
1: +  unsigned int usage_page;
1: +  __s32 logical_minimum;
1: +  __s32 logical_maximum;
1: +  __s32 physical_minimum;
1: +  __s32 physical_maximum;
1: +  __s32 unit_exponent;
1: +  unsigned int unit;
1: +  unsigned int report_id;
1: +  unsigned int report_size;
1: +  unsigned int report_count;
1:  };
1:  
1:  struct hid_local {
1: -	unsigned int usage[12288];
1: -	u8 usage_size[12288];
1: -	unsigned int collection_index[12288];
1: -	unsigned int usage_index;
1: -	unsigned int usage_minimum;
1: -	unsigned int delimiter_depth;
1: -	unsigned int delimiter_branch;
1: +  unsigned int usage[12288];
1: +  u8 usage_size[12288];
1: +  unsigned int collection_index[12288];
1: +  unsigned int usage_index;
1: +  unsigned int usage_minimum;
1: +  unsigned int delimiter_depth;
1: +  unsigned int delimiter_branch;
1:  };
1:  
1:  struct hid_collection {
1: -	int parent_idx;
1: -	unsigned int type;
1: -	unsigned int usage;
1: -	unsigned int level;
1: +  int parent_idx;
1: +  unsigned int type;
1: +  unsigned int usage;
1: +  unsigned int level;
1:  };
1:  
1:  struct hid_usage {
1: -	unsigned int hid;
1: -	unsigned int collection_index;
1: -	unsigned int usage_index;
1: -	__s8 resolution_multiplier;
1: -	__s8 wheel_factor;
1: -	__u16 code;
1: -	__u8 type;
1: -	__s8 hat_min;
1: -	__s8 hat_max;
1: -	__s8 hat_dir;
1: -	__s16 wheel_accumulated;
1: +  unsigned int hid;
1: +  unsigned int collection_index;
1: +  unsigned int usage_index;
1: +  __s8 resolution_multiplier;
1: +  __s8 wheel_factor;
1: +  __u16 code;
1: +  __u8 type;
1: +  __s8 hat_min;
1: +  __s8 hat_max;
1: +  __s8 hat_dir;
1: +  __s16 wheel_accumulated;
1:  };
1:  
1:  struct hid_report;
1: @@ -110653,63 +111853,63 @@ struct hid_report;
1:  struct hid_input;
1:  
1:  struct hid_field {
1: -	unsigned int physical;
1: -	unsigned int logical;
1: -	unsigned int application;
1: -	struct hid_usage *usage;
1: -	unsigned int maxusage;
1: -	unsigned int flags;
1: -	unsigned int report_offset;
1: -	unsigned int report_size;
1: -	unsigned int report_count;
1: -	unsigned int report_type;
1: -	__s32 *value;
1: -	__s32 logical_minimum;
1: -	__s32 logical_maximum;
1: -	__s32 physical_minimum;
1: -	__s32 physical_maximum;
1: -	__s32 unit_exponent;
1: -	unsigned int unit;
1: -	struct hid_report *report;
1: -	unsigned int index;
1: -	struct hid_input *hidinput;
1: -	__u16 dpad;
1: +  unsigned int physical;
1: +  unsigned int logical;
1: +  unsigned int application;
1: +  struct hid_usage *usage;
1: +  unsigned int maxusage;
1: +  unsigned int flags;
1: +  unsigned int report_offset;
1: +  unsigned int report_size;
1: +  unsigned int report_count;
1: +  unsigned int report_type;
1: +  __s32 *value;
1: +  __s32 logical_minimum;
1: +  __s32 logical_maximum;
1: +  __s32 physical_minimum;
1: +  __s32 physical_maximum;
1: +  __s32 unit_exponent;
1: +  unsigned int unit;
1: +  struct hid_report *report;
1: +  unsigned int index;
1: +  struct hid_input *hidinput;
1: +  __u16 dpad;
1:  };
1:  
1:  struct hid_device;
1:  
1:  struct hid_report {
1: -	struct list_head list;
1: -	struct list_head hidinput_list;
1: -	unsigned int id;
1: -	unsigned int type;
1: -	unsigned int application;
1: -	struct hid_field *field[256];
1: -	unsigned int maxfield;
1: -	unsigned int size;
1: -	struct hid_device *device;
1: +  struct list_head list;
1: +  struct list_head hidinput_list;
1: +  unsigned int id;
1: +  unsigned int type;
1: +  unsigned int application;
1: +  struct hid_field *field[256];
1: +  unsigned int maxfield;
1: +  unsigned int size;
1: +  struct hid_device *device;
1:  };
1:  
1:  struct hid_input {
1: -	struct list_head list;
1: -	struct hid_report *report;
1: -	struct input_dev *input;
1: -	const char *name;
1: -	bool registered;
1: -	struct list_head reports;
1: -	unsigned int application;
1: +  struct list_head list;
1: +  struct hid_report *report;
1: +  struct input_dev *input;
1: +  const char *name;
1: +  bool registered;
1: +  struct list_head reports;
1: +  unsigned int application;
1:  };
1:  
1:  enum hid_type {
1: -	HID_TYPE_OTHER = 0,
1: -	HID_TYPE_USBMOUSE = 1,
1: -	HID_TYPE_USBNONE = 2,
1: +  HID_TYPE_OTHER = 0,
1: +  HID_TYPE_USBMOUSE = 1,
1: +  HID_TYPE_USBNONE = 2,
1:  };
1:  
1:  struct hid_report_enum {
1: -	unsigned int numbered;
1: -	struct list_head report_list;
1: -	struct hid_report *report_id_hash[256];
1: +  unsigned int numbered;
1: +  struct list_head report_list;
1: +  struct hid_report *report_id_hash[256];
1:  };
1:  
1:  struct hid_driver;
1: @@ -110717,52 +111917,53 @@ struct hid_driver;
1:  struct hid_ll_driver;
1:  
1:  struct hid_device {
1: -	__u8 *dev_rdesc;
1: -	unsigned int dev_rsize;
1: -	__u8 *rdesc;
1: -	unsigned int rsize;
1: -	struct hid_collection *collection;
1: -	unsigned int collection_size;
1: -	unsigned int maxcollection;
1: -	unsigned int maxapplication;
1: -	__u16 bus;
1: -	__u16 group;
1: -	__u32 vendor;
1: -	__u32 product;
1: -	__u32 version;
1: -	enum hid_type type;
1: -	unsigned int country;
1: -	struct hid_report_enum report_enum[3];
1: -	struct work_struct led_work;
1: -	struct semaphore driver_input_lock;
1: -	struct device dev;
1: -	struct hid_driver *driver;
1: -	struct hid_ll_driver *ll_driver;
1: -	struct mutex ll_open_lock;
1: -	unsigned int ll_open_count;
1: -	long unsigned int status;
1: -	unsigned int claimed;
1: -	unsigned int quirks;
1: -	bool io_started;
1: -	struct list_head inputs;
1: -	void *hiddev;
1: -	void *hidraw;
1: -	char name[128];
1: -	char phys[64];
1: -	char uniq[64];
1: -	void *driver_data;
1: -	int (*ff_init)(struct hid_device *);
1: -	int (*hiddev_connect)(struct hid_device *, unsigned int);
1: -	void (*hiddev_disconnect)(struct hid_device *);
1: -	void (*hiddev_hid_event)(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
1: -	void (*hiddev_report_event)(struct hid_device *, struct hid_report *);
1: -	short unsigned int debug;
1: -	struct dentry *debug_dir;
1: -	struct dentry *debug_rdesc;
1: -	struct dentry *debug_events;
1: -	struct list_head debug_list;
1: -	spinlock_t debug_list_lock;
1: -	wait_queue_head_t debug_wait;
1: +  __u8 *dev_rdesc;
1: +  unsigned int dev_rsize;
1: +  __u8 *rdesc;
1: +  unsigned int rsize;
1: +  struct hid_collection *collection;
1: +  unsigned int collection_size;
1: +  unsigned int maxcollection;
1: +  unsigned int maxapplication;
1: +  __u16 bus;
1: +  __u16 group;
1: +  __u32 vendor;
1: +  __u32 product;
1: +  __u32 version;
1: +  enum hid_type type;
1: +  unsigned int country;
1: +  struct hid_report_enum report_enum[3];
1: +  struct work_struct led_work;
1: +  struct semaphore driver_input_lock;
1: +  struct device dev;
1: +  struct hid_driver *driver;
1: +  struct hid_ll_driver *ll_driver;
1: +  struct mutex ll_open_lock;
1: +  unsigned int ll_open_count;
1: +  long unsigned int status;
1: +  unsigned int claimed;
1: +  unsigned int quirks;
1: +  bool io_started;
1: +  struct list_head inputs;
1: +  void *hiddev;
1: +  void *hidraw;
1: +  char name[128];
1: +  char phys[64];
1: +  char uniq[64];
1: +  void *driver_data;
1: +  int (*ff_init)(struct hid_device *);
1: +  int (*hiddev_connect)(struct hid_device *, unsigned int);
1: +  void (*hiddev_disconnect)(struct hid_device *);
1: +  void (*hiddev_hid_event)(struct hid_device *, struct hid_field *,
1: +                           struct hid_usage *, __s32);
1: +  void (*hiddev_report_event)(struct hid_device *, struct hid_report *);
1: +  short unsigned int debug;
1: +  struct dentry *debug_dir;
1: +  struct dentry *debug_rdesc;
1: +  struct dentry *debug_events;
1: +  struct list_head debug_list;
1: +  spinlock_t debug_list_lock;
1: +  wait_queue_head_t debug_wait;
1:  };
1:  
1:  struct hid_report_id;
1: @@ -110770,1021 +111971,1037 @@ struct hid_report_id;
1:  struct hid_usage_id;
1:  
1:  struct hid_driver {
1: -	char *name;
1: -	const struct hid_device_id *id_table;
1: -	struct list_head dyn_list;
1: -	spinlock_t dyn_lock;
1: -	bool (*match)(struct hid_device *, bool);
1: -	int (*probe)(struct hid_device *, const struct hid_device_id *);
1: -	void (*remove)(struct hid_device *);
1: -	const struct hid_report_id *report_table;
1: -	int (*raw_event)(struct hid_device *, struct hid_report *, u8 *, int);
1: -	const struct hid_usage_id *usage_table;
1: -	int (*event)(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
1: -	void (*report)(struct hid_device *, struct hid_report *);
1: -	__u8 * (*report_fixup)(struct hid_device *, __u8 *, unsigned int *);
1: -	int (*input_mapping)(struct hid_device *, struct hid_input *, struct hid_field *, struct hid_usage *, long unsigned int **, int *);
1: -	int (*input_mapped)(struct hid_device *, struct hid_input *, struct hid_field *, struct hid_usage *, long unsigned int **, int *);
1: -	int (*input_configured)(struct hid_device *, struct hid_input *);
1: -	void (*feature_mapping)(struct hid_device *, struct hid_field *, struct hid_usage *);
1: -	int (*suspend)(struct hid_device *, pm_message_t);
1: -	int (*resume)(struct hid_device *);
1: -	int (*reset_resume)(struct hid_device *);
1: -	struct device_driver driver;
1: +  char *name;
1: +  const struct hid_device_id *id_table;
1: +  struct list_head dyn_list;
1: +  spinlock_t dyn_lock;
1: +  bool (*match)(struct hid_device *, bool);
1: +  int (*probe)(struct hid_device *, const struct hid_device_id *);
1: +  void (*remove)(struct hid_device *);
1: +  const struct hid_report_id *report_table;
1: +  int (*raw_event)(struct hid_device *, struct hid_report *, u8 *, int);
1: +  const struct hid_usage_id *usage_table;
1: +  int (*event)(struct hid_device *, struct hid_field *, struct hid_usage *,
1: +               __s32);
1: +  void (*report)(struct hid_device *, struct hid_report *);
1: +  __u8 *(*report_fixup)(struct hid_device *, __u8 *, unsigned int *);
1: +  int (*input_mapping)(struct hid_device *, struct hid_input *,
1: +                       struct hid_field *, struct hid_usage *,
1: +                       long unsigned int **, int *);
1: +  int (*input_mapped)(struct hid_device *, struct hid_input *,
1: +                      struct hid_field *, struct hid_usage *,
1: +                      long unsigned int **, int *);
1: +  int (*input_configured)(struct hid_device *, struct hid_input *);
1: +  void (*feature_mapping)(struct hid_device *, struct hid_field *,
1: +                          struct hid_usage *);
1: +  int (*suspend)(struct hid_device *, pm_message_t);
1: +  int (*resume)(struct hid_device *);
1: +  int (*reset_resume)(struct hid_device *);
1: +  struct device_driver driver;
1:  };
1:  
1:  struct hid_ll_driver {
1: -	int (*start)(struct hid_device *);
1: -	void (*stop)(struct hid_device *);
1: -	int (*open)(struct hid_device *);
1: -	void (*close)(struct hid_device *);
1: -	int (*power)(struct hid_device *, int);
1: -	int (*parse)(struct hid_device *);
1: -	void (*request)(struct hid_device *, struct hid_report *, int);
1: -	int (*wait)(struct hid_device *);
1: -	int (*raw_request)(struct hid_device *, unsigned char, __u8 *, size_t, unsigned char, int);
1: -	int (*output_report)(struct hid_device *, __u8 *, size_t);
1: -	int (*idle)(struct hid_device *, int, int, int);
1: +  int (*start)(struct hid_device *);
1: +  void (*stop)(struct hid_device *);
1: +  int (*open)(struct hid_device *);
1: +  void (*close)(struct hid_device *);
1: +  int (*power)(struct hid_device *, int);
1: +  int (*parse)(struct hid_device *);
1: +  void (*request)(struct hid_device *, struct hid_report *, int);
1: +  int (*wait)(struct hid_device *);
1: +  int (*raw_request)(struct hid_device *, unsigned char, __u8 *, size_t,
1: +                     unsigned char, int);
1: +  int (*output_report)(struct hid_device *, __u8 *, size_t);
1: +  int (*idle)(struct hid_device *, int, int, int);
1:  };
1:  
1:  struct hid_parser {
1: -	struct hid_global global;
1: -	struct hid_global global_stack[4];
1: -	unsigned int global_stack_ptr;
1: -	struct hid_local local;
1: -	unsigned int *collection_stack;
1: -	unsigned int collection_stack_ptr;
1: -	unsigned int collection_stack_size;
1: -	struct hid_device *device;
1: -	unsigned int scan_flags;
1: +  struct hid_global global;
1: +  struct hid_global global_stack[4];
1: +  unsigned int global_stack_ptr;
1: +  struct hid_local local;
1: +  unsigned int *collection_stack;
1: +  unsigned int collection_stack_ptr;
1: +  unsigned int collection_stack_size;
1: +  struct hid_device *device;
1: +  unsigned int scan_flags;
1:  };
1:  
1:  struct hid_report_id {
1: -	__u32 report_type;
1: +  __u32 report_type;
1:  };
1:  
1:  struct hid_usage_id {
1: -	__u32 usage_hid;
1: -	__u32 usage_type;
1: -	__u32 usage_code;
1: +  __u32 usage_hid;
1: +  __u32 usage_type;
1: +  __u32 usage_code;
1:  };
1:  
1:  struct hiddev {
1: -	int minor;
1: -	int exist;
1: -	int open;
1: -	struct mutex existancelock;
1: -	wait_queue_head_t wait;
1: -	struct hid_device *hid;
1: -	struct list_head list;
1: -	spinlock_t list_lock;
1: -	bool initialized;
1: +  int minor;
1: +  int exist;
1: +  int open;
1: +  struct mutex existancelock;
1: +  wait_queue_head_t wait;
1: +  struct hid_device *hid;
1: +  struct list_head list;
1: +  spinlock_t list_lock;
1: +  bool initialized;
1:  };
1:  
1:  struct hidraw {
1: -	unsigned int minor;
1: -	int exist;
1: -	int open;
1: -	wait_queue_head_t wait;
1: -	struct hid_device *hid;
1: -	struct device *dev;
1: -	spinlock_t list_lock;
1: -	struct list_head list;
1: +  unsigned int minor;
1: +  int exist;
1: +  int open;
1: +  wait_queue_head_t wait;
1: +  struct hid_device *hid;
1: +  struct device *dev;
1: +  spinlock_t list_lock;
1: +  struct list_head list;
1:  };
1:  
1:  struct hid_dynid {
1: -	struct list_head list;
1: -	struct hid_device_id id;
1: +  struct list_head list;
1: +  struct hid_device_id id;
1:  };
1:  
1:  typedef bool (*hid_usage_cmp_t)(struct hid_usage *, unsigned int, unsigned int);
1:  
1:  struct quirks_list_struct {
1: -	struct hid_device_id hid_bl_item;
1: -	struct list_head node;
1: +  struct hid_device_id hid_bl_item;
1: +  struct list_head node;
1:  };
1:  
1:  struct hid_debug_list {
1: -	struct {
1: -		union {
1: -			struct __kfifo kfifo;
1: -			char *type;
1: -			const char *const_type;
1: -			char (*rectype)[0];
1: -			char *ptr;
1: -			const char *ptr_const;
1: -		};
1: -		char buf[0];
1: -	} hid_debug_fifo;
1: -	struct fasync_struct *fasync;
1: -	struct hid_device *hdev;
1: -	struct list_head node;
1: -	struct mutex read_mutex;
1: +  struct {
1: +    union {
1: +      struct __kfifo kfifo;
1: +      char *type;
1: +      const char *const_type;
1: +      char (*rectype)[0];
1: +      char *ptr;
1: +      const char *ptr_const;
1: +    };
1: +    char buf[0];
1: +  } hid_debug_fifo;
1: +  struct fasync_struct *fasync;
1: +  struct hid_device *hdev;
1: +  struct list_head node;
1: +  struct mutex read_mutex;
1:  };
1:  
1:  struct hid_usage_entry {
1: -	unsigned int page;
1: -	unsigned int usage;
1: -	const char *description;
1: +  unsigned int page;
1: +  unsigned int usage;
1: +  const char *description;
1:  };
1:  
1:  struct a4tech_sc {
1: -	long unsigned int quirks;
1: -	unsigned int hw_wheel;
1: -	__s32 delayed_value;
1: +  long unsigned int quirks;
1: +  unsigned int hw_wheel;
1: +  __s32 delayed_value;
1:  };
1:  
1:  struct apple_sc {
1: -	long unsigned int quirks;
1: -	unsigned int fn_on;
1: -	unsigned int fn_found;
1: -	long unsigned int pressed_numlock[12];
1: +  long unsigned int quirks;
1: +  unsigned int fn_on;
1: +  unsigned int fn_found;
1: +  long unsigned int pressed_numlock[12];
1:  };
1:  
1:  struct apple_key_translation {
1: -	u16 from;
1: -	u16 to;
1: -	u8 flags;
1: +  u16 from;
1: +  u16 to;
1: +  u8 flags;
1:  };
1:  
1:  struct lg_drv_data {
1: -	long unsigned int quirks;
1: -	void *device_props;
1: +  long unsigned int quirks;
1: +  void *device_props;
1:  };
1:  
1:  struct dev_type {
1: -	u16 idVendor;
1: -	u16 idProduct;
1: -	const short int *ff;
1: +  u16 idVendor;
1: +  u16 idProduct;
1: +  const short int *ff;
1:  };
1:  
1:  struct lg4ff_wheel_data {
1: -	const u32 product_id;
1: -	u16 combine;
1: -	u16 range;
1: -	const u16 min_range;
1: -	const u16 max_range;
1: -	u8 led_state;
1: -	struct led_classdev *led[5];
1: -	const u32 alternate_modes;
1: -	const char * const real_tag;
1: -	const char * const real_name;
1: -	const u16 real_product_id;
1: -	void (*set_range)(struct hid_device *, u16);
1: +  const u32 product_id;
1: +  u16 combine;
1: +  u16 range;
1: +  const u16 min_range;
1: +  const u16 max_range;
1: +  u8 led_state;
1: +  struct led_classdev *led[5];
1: +  const u32 alternate_modes;
1: +  const char *const real_tag;
1: +  const char *const real_name;
1: +  const u16 real_product_id;
1: +  void (*set_range)(struct hid_device *, u16);
1:  };
1:  
1:  struct lg4ff_device_entry {
1: -	spinlock_t report_lock;
1: -	struct hid_report *report;
1: -	struct lg4ff_wheel_data wdata;
1: +  spinlock_t report_lock;
1: +  struct hid_report *report;
1: +  struct lg4ff_wheel_data wdata;
1:  };
1:  
1:  struct lg4ff_wheel {
1: -	const u32 product_id;
1: -	const short int *ff_effects;
1: -	const u16 min_range;
1: -	const u16 max_range;
1: -	void (*set_range)(struct hid_device *, u16);
1: +  const u32 product_id;
1: +  const short int *ff_effects;
1: +  const u16 min_range;
1: +  const u16 max_range;
1: +  void (*set_range)(struct hid_device *, u16);
1:  };
1:  
1:  struct lg4ff_compat_mode_switch {
1: -	const u8 cmd_count;
1: -	const u8 cmd[0];
1: +  const u8 cmd_count;
1: +  const u8 cmd[0];
1:  };
1:  
1:  struct lg4ff_wheel_ident_info {
1: -	const u32 modes;
1: -	const u16 mask;
1: -	const u16 result;
1: -	const u16 real_product_id;
1: +  const u32 modes;
1: +  const u16 mask;
1: +  const u16 result;
1: +  const u16 real_product_id;
1:  };
1:  
1:  struct lg4ff_multimode_wheel {
1: -	const u16 product_id;
1: -	const u32 alternate_modes;
1: -	const char *real_tag;
1: -	const char *real_name;
1: +  const u16 product_id;
1: +  const u32 alternate_modes;
1: +  const char *real_tag;
1: +  const char *real_name;
1:  };
1:  
1:  struct lg4ff_alternate_mode {
1: -	const u16 product_id;
1: -	const char *tag;
1: -	const char *name;
1: +  const u16 product_id;
1: +  const char *tag;
1: +  const char *name;
1:  };
1:  
1:  enum lg_g15_model {
1: -	LG_G15 = 0,
1: -	LG_G15_V2 = 1,
1: -	LG_G510 = 2,
1: -	LG_G510_USB_AUDIO = 3,
1: +  LG_G15 = 0,
1: +  LG_G15_V2 = 1,
1: +  LG_G510 = 2,
1: +  LG_G510_USB_AUDIO = 3,
1:  };
1:  
1:  enum lg_g15_led_type {
1: -	LG_G15_KBD_BRIGHTNESS = 0,
1: -	LG_G15_LCD_BRIGHTNESS = 1,
1: -	LG_G15_BRIGHTNESS_MAX = 2,
1: -	LG_G15_MACRO_PRESET1 = 2,
1: -	LG_G15_MACRO_PRESET2 = 3,
1: -	LG_G15_MACRO_PRESET3 = 4,
1: -	LG_G15_MACRO_RECORD = 5,
1: -	LG_G15_LED_MAX = 6,
1: +  LG_G15_KBD_BRIGHTNESS = 0,
1: +  LG_G15_LCD_BRIGHTNESS = 1,
1: +  LG_G15_BRIGHTNESS_MAX = 2,
1: +  LG_G15_MACRO_PRESET1 = 2,
1: +  LG_G15_MACRO_PRESET2 = 3,
1: +  LG_G15_MACRO_PRESET3 = 4,
1: +  LG_G15_MACRO_RECORD = 5,
1: +  LG_G15_LED_MAX = 6,
1:  };
1:  
1:  struct lg_g15_led {
1: -	struct led_classdev cdev;
1: -	enum led_brightness brightness;
1: -	enum lg_g15_led_type led;
1: -	u8 red;
1: -	u8 green;
1: -	u8 blue;
1: +  struct led_classdev cdev;
1: +  enum led_brightness brightness;
1: +  enum lg_g15_led_type led;
1: +  u8 red;
1: +  u8 green;
1: +  u8 blue;
1:  };
1:  
1:  struct lg_g15_data {
1: -	u8 transfer_buf[20];
1: -	struct mutex mutex;
1: -	struct work_struct work;
1: -	struct input_dev *input;
1: -	struct hid_device *hdev;
1: -	enum lg_g15_model model;
1: -	struct lg_g15_led leds[6];
1: -	bool game_mode_enabled;
1: +  u8 transfer_buf[20];
1: +  struct mutex mutex;
1: +  struct work_struct work;
1: +  struct input_dev *input;
1: +  struct hid_device *hdev;
1: +  enum lg_g15_model model;
1: +  struct lg_g15_led leds[6];
1: +  bool game_mode_enabled;
1:  };
1:  
1:  struct ms_data {
1: -	long unsigned int quirks;
1: -	struct hid_device *hdev;
1: -	struct work_struct ff_worker;
1: -	__u8 strong;
1: -	__u8 weak;
1: -	void *output_report_dmabuf;
1: +  long unsigned int quirks;
1: +  struct hid_device *hdev;
1: +  struct work_struct ff_worker;
1: +  __u8 strong;
1: +  __u8 weak;
1: +  void *output_report_dmabuf;
1:  };
1:  
1:  enum {
1: -	MAGNITUDE_STRONG = 2,
1: -	MAGNITUDE_WEAK = 3,
1: -	MAGNITUDE_NUM = 4,
1: +  MAGNITUDE_STRONG = 2,
1: +  MAGNITUDE_WEAK = 3,
1: +  MAGNITUDE_NUM = 4,
1:  };
1:  
1:  struct xb1s_ff_report {
1: -	__u8 report_id;
1: -	__u8 enable;
1: -	__u8 magnitude[4];
1: -	__u8 duration_10ms;
1: -	__u8 start_delay_10ms;
1: -	__u8 loop_count;
1: +  __u8 report_id;
1: +  __u8 enable;
1: +  __u8 magnitude[4];
1: +  __u8 duration_10ms;
1: +  __u8 start_delay_10ms;
1: +  __u8 loop_count;
1:  };
1:  
1:  struct ntrig_data {
1: -	__u16 x;
1: -	__u16 y;
1: -	__u16 w;
1: -	__u16 h;
1: -	__u16 id;
1: -	bool tipswitch;
1: -	bool confidence;
1: -	bool first_contact_touch;
1: -	bool reading_mt;
1: -	__u8 mt_footer[4];
1: -	__u8 mt_foot_count;
1: -	__s8 act_state;
1: -	__s8 deactivate_slack;
1: -	__s8 activate_slack;
1: -	__u16 min_width;
1: -	__u16 min_height;
1: -	__u16 activation_width;
1: -	__u16 activation_height;
1: -	__u16 sensor_logical_width;
1: -	__u16 sensor_logical_height;
1: -	__u16 sensor_physical_width;
1: -	__u16 sensor_physical_height;
1: +  __u16 x;
1: +  __u16 y;
1: +  __u16 w;
1: +  __u16 h;
1: +  __u16 id;
1: +  bool tipswitch;
1: +  bool confidence;
1: +  bool first_contact_touch;
1: +  bool reading_mt;
1: +  __u8 mt_footer[4];
1: +  __u8 mt_foot_count;
1: +  __s8 act_state;
1: +  __s8 deactivate_slack;
1: +  __s8 activate_slack;
1: +  __u16 min_width;
1: +  __u16 min_height;
1: +  __u16 activation_width;
1: +  __u16 activation_height;
1: +  __u16 sensor_logical_width;
1: +  __u16 sensor_logical_height;
1: +  __u16 sensor_physical_width;
1: +  __u16 sensor_physical_height;
1:  };
1:  
1:  struct sixaxis_led {
1: -	u8 time_enabled;
1: -	u8 duty_length;
1: -	u8 enabled;
1: -	u8 duty_off;
1: -	u8 duty_on;
1: +  u8 time_enabled;
1: +  u8 duty_length;
1: +  u8 enabled;
1: +  u8 duty_off;
1: +  u8 duty_on;
1:  };
1:  
1:  struct sixaxis_rumble {
1: -	u8 padding;
1: -	u8 right_duration;
1: -	u8 right_motor_on;
1: -	u8 left_duration;
1: -	u8 left_motor_force;
1: +  u8 padding;
1: +  u8 right_duration;
1: +  u8 right_motor_on;
1: +  u8 left_duration;
1: +  u8 left_motor_force;
1:  };
1:  
1:  struct sixaxis_output_report {
1: -	u8 report_id;
1: -	struct sixaxis_rumble rumble;
1: -	u8 padding[4];
1: -	u8 leds_bitmap;
1: -	struct sixaxis_led led[4];
1: -	struct sixaxis_led _reserved;
1: +  u8 report_id;
1: +  struct sixaxis_rumble rumble;
1: +  u8 padding[4];
1: +  u8 leds_bitmap;
1: +  struct sixaxis_led led[4];
1: +  struct sixaxis_led _reserved;
1:  };
1:  
1:  union sixaxis_output_report_01 {
1: -	struct sixaxis_output_report data;
1: -	u8 buf[36];
1: +  struct sixaxis_output_report data;
1: +  u8 buf[36];
1:  };
1:  
1:  struct motion_output_report_02 {
1: -	u8 type;
1: -	u8 zero;
1: -	u8 r;
1: -	u8 g;
1: -	u8 b;
1: -	u8 zero2;
1: -	u8 rumble;
1: +  u8 type;
1: +  u8 zero;
1: +  u8 r;
1: +  u8 g;
1: +  u8 b;
1: +  u8 zero2;
1: +  u8 rumble;
1:  };
1:  
1:  struct ds4_calibration_data {
1: -	int abs_code;
1: -	short int bias;
1: -	int sens_numer;
1: -	int sens_denom;
1: +  int abs_code;
1: +  short int bias;
1: +  int sens_numer;
1: +  int sens_denom;
1:  };
1:  
1:  enum ds4_dongle_state {
1: -	DONGLE_DISCONNECTED = 0,
1: -	DONGLE_CALIBRATING = 1,
1: -	DONGLE_CONNECTED = 2,
1: -	DONGLE_DISABLED = 3,
1: +  DONGLE_DISCONNECTED = 0,
1: +  DONGLE_CALIBRATING = 1,
1: +  DONGLE_CONNECTED = 2,
1: +  DONGLE_DISABLED = 3,
1:  };
1:  
1:  enum sony_worker {
1: -	SONY_WORKER_STATE = 0,
1: -	SONY_WORKER_HOTPLUG = 1,
1: +  SONY_WORKER_STATE = 0,
1: +  SONY_WORKER_HOTPLUG = 1,
1:  };
1:  
1:  struct sony_sc {
1: -	spinlock_t lock;
1: -	struct list_head list_node;
1: -	struct hid_device *hdev;
1: -	struct input_dev *touchpad;
1: -	struct input_dev *sensor_dev;
1: -	struct led_classdev *leds[4];
1: -	long unsigned int quirks;
1: -	struct work_struct hotplug_worker;
1: -	struct work_struct state_worker;
1: -	void (*send_output_report)(struct sony_sc *);
1: -	struct power_supply *battery;
1: -	struct power_supply_desc battery_desc;
1: -	int device_id;
1: -	unsigned int fw_version;
1: -	unsigned int hw_version;
1: -	u8 *output_report_dmabuf;
1: -	u8 mac_address[6];
1: -	u8 hotplug_worker_initialized;
1: -	u8 state_worker_initialized;
1: -	u8 defer_initialization;
1: -	u8 cable_state;
1: -	u8 battery_charging;
1: -	u8 battery_capacity;
1: -	u8 led_state[4];
1: -	u8 led_delay_on[4];
1: -	u8 led_delay_off[4];
1: -	u8 led_count;
1: -	bool timestamp_initialized;
1: -	u16 prev_timestamp;
1: -	unsigned int timestamp_us;
1: -	u8 ds4_bt_poll_interval;
1: -	enum ds4_dongle_state ds4_dongle_state;
1: -	struct ds4_calibration_data ds4_calib_data[6];
1: +  spinlock_t lock;
1: +  struct list_head list_node;
1: +  struct hid_device *hdev;
1: +  struct input_dev *touchpad;
1: +  struct input_dev *sensor_dev;
1: +  struct led_classdev *leds[4];
1: +  long unsigned int quirks;
1: +  struct work_struct hotplug_worker;
1: +  struct work_struct state_worker;
1: +  void (*send_output_report)(struct sony_sc *);
1: +  struct power_supply *battery;
1: +  struct power_supply_desc battery_desc;
1: +  int device_id;
1: +  unsigned int fw_version;
1: +  unsigned int hw_version;
1: +  u8 *output_report_dmabuf;
1: +  u8 mac_address[6];
1: +  u8 hotplug_worker_initialized;
1: +  u8 state_worker_initialized;
1: +  u8 defer_initialization;
1: +  u8 cable_state;
1: +  u8 battery_charging;
1: +  u8 battery_capacity;
1: +  u8 led_state[4];
1: +  u8 led_delay_on[4];
1: +  u8 led_delay_off[4];
1: +  u8 led_count;
1: +  bool timestamp_initialized;
1: +  u16 prev_timestamp;
1: +  unsigned int timestamp_us;
1: +  u8 ds4_bt_poll_interval;
1: +  enum ds4_dongle_state ds4_dongle_state;
1: +  struct ds4_calibration_data ds4_calib_data[6];
1:  };
1:  
1:  struct tmff_device {
1: -	struct hid_report *report;
1: -	struct hid_field *ff_field;
1: +  struct hid_report *report;
1: +  struct hid_field *ff_field;
1:  };
1:  
1:  struct zpff_device {
1: -	struct hid_report *report;
1: +  struct hid_report *report;
1:  };
1:  
1:  struct hid_control_fifo {
1: -	unsigned char dir;
1: -	struct hid_report *report;
1: -	char *raw_report;
1: +  unsigned char dir;
1: +  struct hid_report *report;
1: +  char *raw_report;
1:  };
1:  
1:  struct hid_output_fifo {
1: -	struct hid_report *report;
1: -	char *raw_report;
1: +  struct hid_report *report;
1: +  char *raw_report;
1:  };
1:  
1:  struct hid_class_descriptor {
1: -	__u8 bDescriptorType;
1: -	__le16 wDescriptorLength;
1: +  __u8 bDescriptorType;
1: +  __le16 wDescriptorLength;
1:  } __attribute__((packed));
1:  
1:  struct hid_descriptor {
1: -	__u8 bLength;
1: -	__u8 bDescriptorType;
1: -	__le16 bcdHID;
1: -	__u8 bCountryCode;
1: -	__u8 bNumDescriptors;
1: -	struct hid_class_descriptor desc[1];
1: +  __u8 bLength;
1: +  __u8 bDescriptorType;
1: +  __le16 bcdHID;
1: +  __u8 bCountryCode;
1: +  __u8 bNumDescriptors;
1: +  struct hid_class_descriptor desc[1];
1:  } __attribute__((packed));
1:  
1:  struct usbhid_device {
1: -	struct hid_device *hid;
1: -	struct usb_interface *intf;
1: -	int ifnum;
1: -	unsigned int bufsize;
1: -	struct urb *urbin;
1: -	char *inbuf;
1: -	dma_addr_t inbuf_dma;
1: -	struct urb *urbctrl;
1: -	struct usb_ctrlrequest *cr;
1: -	struct hid_control_fifo ctrl[256];
1: -	unsigned char ctrlhead;
1: -	unsigned char ctrltail;
1: -	char *ctrlbuf;
1: -	dma_addr_t ctrlbuf_dma;
1: -	long unsigned int last_ctrl;
1: -	struct urb *urbout;
1: -	struct hid_output_fifo out[256];
1: -	unsigned char outhead;
1: -	unsigned char outtail;
1: -	char *outbuf;
1: -	dma_addr_t outbuf_dma;
1: -	long unsigned int last_out;
1: -	struct mutex mutex;
1: -	spinlock_t lock;
1: -	long unsigned int iofl;
1: -	struct timer_list io_retry;
1: -	long unsigned int stop_retry;
1: -	unsigned int retry_delay;
1: -	struct work_struct reset_work;
1: -	wait_queue_head_t wait;
1: +  struct hid_device *hid;
1: +  struct usb_interface *intf;
1: +  int ifnum;
1: +  unsigned int bufsize;
1: +  struct urb *urbin;
1: +  char *inbuf;
1: +  dma_addr_t inbuf_dma;
1: +  struct urb *urbctrl;
1: +  struct usb_ctrlrequest *cr;
1: +  struct hid_control_fifo ctrl[256];
1: +  unsigned char ctrlhead;
1: +  unsigned char ctrltail;
1: +  char *ctrlbuf;
1: +  dma_addr_t ctrlbuf_dma;
1: +  long unsigned int last_ctrl;
1: +  struct urb *urbout;
1: +  struct hid_output_fifo out[256];
1: +  unsigned char outhead;
1: +  unsigned char outtail;
1: +  char *outbuf;
1: +  dma_addr_t outbuf_dma;
1: +  long unsigned int last_out;
1: +  struct mutex mutex;
1: +  spinlock_t lock;
1: +  long unsigned int iofl;
1: +  struct timer_list io_retry;
1: +  long unsigned int stop_retry;
1: +  unsigned int retry_delay;
1: +  struct work_struct reset_work;
1: +  wait_queue_head_t wait;
1:  };
1:  
1:  struct hiddev_event {
1: -	unsigned int hid;
1: -	int value;
1: +  unsigned int hid;
1: +  int value;
1:  };
1:  
1:  struct hiddev_devinfo {
1: -	__u32 bustype;
1: -	__u32 busnum;
1: -	__u32 devnum;
1: -	__u32 ifnum;
1: -	__s16 vendor;
1: -	__s16 product;
1: -	__s16 version;
1: -	__u32 num_applications;
1: +  __u32 bustype;
1: +  __u32 busnum;
1: +  __u32 devnum;
1: +  __u32 ifnum;
1: +  __s16 vendor;
1: +  __s16 product;
1: +  __s16 version;
1: +  __u32 num_applications;
1:  };
1:  
1:  struct hiddev_collection_info {
1: -	__u32 index;
1: -	__u32 type;
1: -	__u32 usage;
1: -	__u32 level;
1: +  __u32 index;
1: +  __u32 type;
1: +  __u32 usage;
1: +  __u32 level;
1:  };
1:  
1:  struct hiddev_report_info {
1: -	__u32 report_type;
1: -	__u32 report_id;
1: -	__u32 num_fields;
1: +  __u32 report_type;
1: +  __u32 report_id;
1: +  __u32 num_fields;
1:  };
1:  
1:  struct hiddev_field_info {
1: -	__u32 report_type;
1: -	__u32 report_id;
1: -	__u32 field_index;
1: -	__u32 maxusage;
1: -	__u32 flags;
1: -	__u32 physical;
1: -	__u32 logical;
1: -	__u32 application;
1: -	__s32 logical_minimum;
1: -	__s32 logical_maximum;
1: -	__s32 physical_minimum;
1: -	__s32 physical_maximum;
1: -	__u32 unit_exponent;
1: -	__u32 unit;
1: +  __u32 report_type;
1: +  __u32 report_id;
1: +  __u32 field_index;
1: +  __u32 maxusage;
1: +  __u32 flags;
1: +  __u32 physical;
1: +  __u32 logical;
1: +  __u32 application;
1: +  __s32 logical_minimum;
1: +  __s32 logical_maximum;
1: +  __s32 physical_minimum;
1: +  __s32 physical_maximum;
1: +  __u32 unit_exponent;
1: +  __u32 unit;
1:  };
1:  
1:  struct hiddev_usage_ref {
1: -	__u32 report_type;
1: -	__u32 report_id;
1: -	__u32 field_index;
1: -	__u32 usage_index;
1: -	__u32 usage_code;
1: -	__s32 value;
1: +  __u32 report_type;
1: +  __u32 report_id;
1: +  __u32 field_index;
1: +  __u32 usage_index;
1: +  __u32 usage_code;
1: +  __s32 value;
1:  };
1:  
1:  struct hiddev_usage_ref_multi {
1: -	struct hiddev_usage_ref uref;
1: -	__u32 num_values;
1: -	__s32 values[1024];
1: +  struct hiddev_usage_ref uref;
1: +  __u32 num_values;
1: +  __s32 values[1024];
1:  };
1:  
1:  struct hiddev_list {
1: -	struct hiddev_usage_ref buffer[2048];
1: -	int head;
1: -	int tail;
1: -	unsigned int flags;
1: -	struct fasync_struct *fasync;
1: -	struct hiddev *hiddev;
1: -	struct list_head node;
1: -	struct mutex thread_lock;
1: +  struct hiddev_usage_ref buffer[2048];
1: +  int head;
1: +  int tail;
1: +  unsigned int flags;
1: +  struct fasync_struct *fasync;
1: +  struct hiddev *hiddev;
1: +  struct list_head node;
1: +  struct mutex thread_lock;
1:  };
1:  
1:  struct pidff_usage {
1: -	struct hid_field *field;
1: -	s32 *value;
1: +  struct hid_field *field;
1: +  s32 *value;
1:  };
1:  
1:  struct pidff_device {
1: -	struct hid_device *hid;
1: -	struct hid_report *reports[13];
1: -	struct pidff_usage set_effect[7];
1: -	struct pidff_usage set_envelope[5];
1: -	struct pidff_usage set_condition[8];
1: -	struct pidff_usage set_periodic[5];
1: -	struct pidff_usage set_constant[2];
1: -	struct pidff_usage set_ramp[3];
1: -	struct pidff_usage device_gain[1];
1: -	struct pidff_usage block_load[2];
1: -	struct pidff_usage pool[3];
1: -	struct pidff_usage effect_operation[2];
1: -	struct pidff_usage block_free[1];
1: -	struct hid_field *create_new_effect_type;
1: -	struct hid_field *set_effect_type;
1: -	struct hid_field *effect_direction;
1: -	struct hid_field *device_control;
1: -	struct hid_field *block_load_status;
1: -	struct hid_field *effect_operation_status;
1: -	int control_id[2];
1: -	int type_id[11];
1: -	int status_id[2];
1: -	int operation_id[2];
1: -	int pid_id[64];
1: +  struct hid_device *hid;
1: +  struct hid_report *reports[13];
1: +  struct pidff_usage set_effect[7];
1: +  struct pidff_usage set_envelope[5];
1: +  struct pidff_usage set_condition[8];
1: +  struct pidff_usage set_periodic[5];
1: +  struct pidff_usage set_constant[2];
1: +  struct pidff_usage set_ramp[3];
1: +  struct pidff_usage device_gain[1];
1: +  struct pidff_usage block_load[2];
1: +  struct pidff_usage pool[3];
1: +  struct pidff_usage effect_operation[2];
1: +  struct pidff_usage block_free[1];
1: +  struct hid_field *create_new_effect_type;
1: +  struct hid_field *set_effect_type;
1: +  struct hid_field *effect_direction;
1: +  struct hid_field *device_control;
1: +  struct hid_field *block_load_status;
1: +  struct hid_field *effect_operation_status;
1: +  int control_id[2];
1: +  int type_id[11];
1: +  int status_id[2];
1: +  int operation_id[2];
1: +  int pid_id[64];
1:  };
1:  
1:  struct pmc_bit_map {
1: -	const char *name;
1: -	u32 bit_mask;
1: +  const char *name;
1: +  u32 bit_mask;
1:  };
1:  
1:  struct pmc_reg_map {
1: -	const struct pmc_bit_map *d3_sts_0;
1: -	const struct pmc_bit_map *d3_sts_1;
1: -	const struct pmc_bit_map *func_dis;
1: -	const struct pmc_bit_map *func_dis_2;
1: -	const struct pmc_bit_map *pss;
1: +  const struct pmc_bit_map *d3_sts_0;
1: +  const struct pmc_bit_map *d3_sts_1;
1: +  const struct pmc_bit_map *func_dis;
1: +  const struct pmc_bit_map *func_dis_2;
1: +  const struct pmc_bit_map *pss;
1:  };
1:  
1:  struct pmc_data {
1: -	const struct pmc_reg_map *map;
1: -	const struct pmc_clk *clks;
1: +  const struct pmc_reg_map *map;
1: +  const struct pmc_clk *clks;
1:  };
1:  
1:  struct pmc_dev {
1: -	u32 base_addr;
1: -	void *regmap;
1: -	const struct pmc_reg_map *map;
1: -	struct dentry *dbgfs_dir;
1: -	bool init;
1: +  u32 base_addr;
1: +  void *regmap;
1: +  const struct pmc_reg_map *map;
1: +  struct dentry *dbgfs_dir;
1: +  bool init;
1:  };
1:  
1:  struct acpi_table_pcct {
1: -	struct acpi_table_header header;
1: -	u32 flags;
1: -	u64 reserved;
1: +  struct acpi_table_header header;
1: +  u32 flags;
1: +  u64 reserved;
1:  };
1:  
1:  enum acpi_pcct_type {
1: -	ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0,
1: -	ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE = 1,
1: -	ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2 = 2,
1: -	ACPI_PCCT_TYPE_EXT_PCC_MASTER_SUBSPACE = 3,
1: -	ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE = 4,
1: -	ACPI_PCCT_TYPE_RESERVED = 5,
1: +  ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0,
1: +  ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE = 1,
1: +  ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2 = 2,
1: +  ACPI_PCCT_TYPE_EXT_PCC_MASTER_SUBSPACE = 3,
1: +  ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE = 4,
1: +  ACPI_PCCT_TYPE_RESERVED = 5,
1:  };
1:  
1:  struct acpi_pcct_subspace {
1: -	struct acpi_subtable_header header;
1: -	u8 reserved[6];
1: -	u64 base_address;
1: -	u64 length;
1: -	struct acpi_generic_address doorbell_register;
1: -	u64 preserve_mask;
1: -	u64 write_mask;
1: -	u32 latency;
1: -	u32 max_access_rate;
1: -	u16 min_turnaround_time;
1: +  struct acpi_subtable_header header;
1: +  u8 reserved[6];
1: +  u64 base_address;
1: +  u64 length;
1: +  struct acpi_generic_address doorbell_register;
1: +  u64 preserve_mask;
1: +  u64 write_mask;
1: +  u32 latency;
1: +  u32 max_access_rate;
1: +  u16 min_turnaround_time;
1:  } __attribute__((packed));
1:  
1:  struct acpi_pcct_hw_reduced_type2 {
1: -	struct acpi_subtable_header header;
1: -	u32 platform_interrupt;
1: -	u8 flags;
1: -	u8 reserved;
1: -	u64 base_address;
1: -	u64 length;
1: -	struct acpi_generic_address doorbell_register;
1: -	u64 preserve_mask;
1: -	u64 write_mask;
1: -	u32 latency;
1: -	u32 max_access_rate;
1: -	u16 min_turnaround_time;
1: -	struct acpi_generic_address platform_ack_register;
1: -	u64 ack_preserve_mask;
1: -	u64 ack_write_mask;
1: +  struct acpi_subtable_header header;
1: +  u32 platform_interrupt;
1: +  u8 flags;
1: +  u8 reserved;
1: +  u64 base_address;
1: +  u64 length;
1: +  struct acpi_generic_address doorbell_register;
1: +  u64 preserve_mask;
1: +  u64 write_mask;
1: +  u32 latency;
1: +  u32 max_access_rate;
1: +  u16 min_turnaround_time;
1: +  struct acpi_generic_address platform_ack_register;
1: +  u64 ack_preserve_mask;
1: +  u64 ack_write_mask;
1:  } __attribute__((packed));
1:  
1:  struct cper_sec_proc_arm {
1: -	u32 validation_bits;
1: -	u16 err_info_num;
1: -	u16 context_info_num;
1: -	u32 section_length;
1: -	u8 affinity_level;
1: -	u8 reserved[3];
1: -	u64 mpidr;
1: -	u64 midr;
1: -	u32 running_state;
1: -	u32 psci_state;
1: +  u32 validation_bits;
1: +  u16 err_info_num;
1: +  u16 context_info_num;
1: +  u32 section_length;
1: +  u8 affinity_level;
1: +  u8 reserved[3];
1: +  u64 mpidr;
1: +  u64 midr;
1: +  u32 running_state;
1: +  u32 psci_state;
1:  };
1:  
1:  enum hw_event_mc_err_type {
1: -	HW_EVENT_ERR_CORRECTED = 0,
1: -	HW_EVENT_ERR_UNCORRECTED = 1,
1: -	HW_EVENT_ERR_DEFERRED = 2,
1: -	HW_EVENT_ERR_FATAL = 3,
1: -	HW_EVENT_ERR_INFO = 4,
1: +  HW_EVENT_ERR_CORRECTED = 0,
1: +  HW_EVENT_ERR_UNCORRECTED = 1,
1: +  HW_EVENT_ERR_DEFERRED = 2,
1: +  HW_EVENT_ERR_FATAL = 3,
1: +  HW_EVENT_ERR_INFO = 4,
1:  };
1:  
1:  struct aer_header_log_regs {
1: -	unsigned int dw0;
1: -	unsigned int dw1;
1: -	unsigned int dw2;
1: -	unsigned int dw3;
1: +  unsigned int dw0;
1: +  unsigned int dw1;
1: +  unsigned int dw2;
1: +  unsigned int dw3;
1:  };
1:  
1:  struct trace_event_raw_mc_event {
1: -	struct trace_entry ent;
1: -	unsigned int error_type;
1: -	u32 __data_loc_msg;
1: -	u32 __data_loc_label;
1: -	u16 error_count;
1: -	u8 mc_index;
1: -	s8 top_layer;
1: -	s8 middle_layer;
1: -	s8 lower_layer;
1: -	long int address;
1: -	u8 grain_bits;
1: -	long int syndrome;
1: -	u32 __data_loc_driver_detail;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int error_type;
1: +  u32 __data_loc_msg;
1: +  u32 __data_loc_label;
1: +  u16 error_count;
1: +  u8 mc_index;
1: +  s8 top_layer;
1: +  s8 middle_layer;
1: +  s8 lower_layer;
1: +  long int address;
1: +  u8 grain_bits;
1: +  long int syndrome;
1: +  u32 __data_loc_driver_detail;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_arm_event {
1: -	struct trace_entry ent;
1: -	u64 mpidr;
1: -	u64 midr;
1: -	u32 running_state;
1: -	u32 psci_state;
1: -	u8 affinity;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u64 mpidr;
1: +  u64 midr;
1: +  u32 running_state;
1: +  u32 psci_state;
1: +  u8 affinity;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_non_standard_event {
1: -	struct trace_entry ent;
1: -	char sec_type[16];
1: -	char fru_id[16];
1: -	u32 __data_loc_fru_text;
1: -	u8 sev;
1: -	u32 len;
1: -	u32 __data_loc_buf;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char sec_type[16];
1: +  char fru_id[16];
1: +  u32 __data_loc_fru_text;
1: +  u8 sev;
1: +  u32 len;
1: +  u32 __data_loc_buf;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_aer_event {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev_name;
1: -	u32 status;
1: -	u8 severity;
1: -	u8 tlp_header_valid;
1: -	u32 tlp_header[4];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev_name;
1: +  u32 status;
1: +  u8 severity;
1: +  u8 tlp_header_valid;
1: +  u32 tlp_header[4];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_memory_failure_event {
1: -	struct trace_entry ent;
1: -	long unsigned int pfn;
1: -	int type;
1: -	int result;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int pfn;
1: +  int type;
1: +  int result;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_mc_event {
1: -	u32 msg;
1: -	u32 label;
1: -	u32 driver_detail;
1: +  u32 msg;
1: +  u32 label;
1: +  u32 driver_detail;
1:  };
1:  
1:  struct trace_event_data_offsets_arm_event {};
1:  
1:  struct trace_event_data_offsets_non_standard_event {
1: -	u32 fru_text;
1: -	u32 buf;
1: +  u32 fru_text;
1: +  u32 buf;
1:  };
1:  
1:  struct trace_event_data_offsets_aer_event {
1: -	u32 dev_name;
1: +  u32 dev_name;
1:  };
1:  
1:  struct trace_event_data_offsets_memory_failure_event {};
1:  
1: -typedef void (*btf_trace_mc_event)(void *, const unsigned int, const char *, const char *, const int, const u8, const s8, const s8, const s8, long unsigned int, const u8, long unsigned int, const char *);
1: +typedef void (*btf_trace_mc_event)(void *, const unsigned int, const char *,
1: +                                   const char *, const int, const u8, const s8,
1: +                                   const s8, const s8, long unsigned int,
1: +                                   const u8, long unsigned int, const char *);
1:  
1:  typedef void (*btf_trace_arm_event)(void *, const struct cper_sec_proc_arm *);
1:  
1: -typedef void (*btf_trace_non_standard_event)(void *, const guid_t *, const guid_t *, const char *, const u8, const u8 *, const u32);
1: +typedef void (*btf_trace_non_standard_event)(void *, const guid_t *,
1: +                                             const guid_t *, const char *,
1: +                                             const u8, const u8 *, const u32);
1:  
1: -typedef void (*btf_trace_aer_event)(void *, const char *, const u32, const u8, const u8, struct aer_header_log_regs *);
1: +typedef void (*btf_trace_aer_event)(void *, const char *, const u32, const u8,
1: +                                    const u8, struct aer_header_log_regs *);
1:  
1: -typedef void (*btf_trace_memory_failure_event)(void *, long unsigned int, int, int);
1: +typedef void (*btf_trace_memory_failure_event)(void *, long unsigned int, int,
1: +                                               int);
1:  
1:  struct nvmem_cell_lookup {
1: -	const char *nvmem_name;
1: -	const char *cell_name;
1: -	const char *dev_id;
1: -	const char *con_id;
1: -	struct list_head node;
1: +  const char *nvmem_name;
1: +  const char *cell_name;
1: +  const char *dev_id;
1: +  const char *con_id;
1: +  struct list_head node;
1:  };
1:  
1:  enum {
1: -	NVMEM_ADD = 1,
1: -	NVMEM_REMOVE = 2,
1: -	NVMEM_CELL_ADD = 3,
1: -	NVMEM_CELL_REMOVE = 4,
1: +  NVMEM_ADD = 1,
1: +  NVMEM_REMOVE = 2,
1: +  NVMEM_CELL_ADD = 3,
1: +  NVMEM_CELL_REMOVE = 4,
1:  };
1:  
1:  struct nvmem_cell_table {
1: -	const char *nvmem_name;
1: -	const struct nvmem_cell_info *cells;
1: -	size_t ncells;
1: -	struct list_head node;
1: +  const char *nvmem_name;
1: +  const struct nvmem_cell_info *cells;
1: +  size_t ncells;
1: +  struct list_head node;
1:  };
1:  
1:  struct nvmem_device___2 {
1: -	struct module *owner;
1: -	struct device dev;
1: -	int stride;
1: -	int word_size;
1: -	int id;
1: -	struct kref refcnt;
1: -	size_t size;
1: -	bool read_only;
1: -	bool root_only;
1: -	int flags;
1: -	enum nvmem_type type;
1: -	struct bin_attribute eeprom;
1: -	struct device *base_dev;
1: -	struct list_head cells;
1: -	nvmem_reg_read_t reg_read;
1: -	nvmem_reg_write_t reg_write;
1: -	struct gpio_desc___2 *wp_gpio;
1: -	void *priv;
1: +  struct module *owner;
1: +  struct device dev;
1: +  int stride;
1: +  int word_size;
1: +  int id;
1: +  struct kref refcnt;
1: +  size_t size;
1: +  bool read_only;
1: +  bool root_only;
1: +  int flags;
1: +  enum nvmem_type type;
1: +  struct bin_attribute eeprom;
1: +  struct device *base_dev;
1: +  struct list_head cells;
1: +  nvmem_reg_read_t reg_read;
1: +  nvmem_reg_write_t reg_write;
1: +  struct gpio_desc___2 *wp_gpio;
1: +  void *priv;
1:  };
1:  
1:  struct nvmem_cell {
1: -	const char *name;
1: -	int offset;
1: -	int bytes;
1: -	int bit_offset;
1: -	int nbits;
1: -	struct device_node *np;
1: -	struct nvmem_device___2 *nvmem;
1: -	struct list_head node;
1: +  const char *name;
1: +  int offset;
1: +  int bytes;
1: +  int bit_offset;
1: +  int nbits;
1: +  struct device_node *np;
1: +  struct nvmem_device___2 *nvmem;
1: +  struct list_head node;
1:  };
1:  
1:  struct net_device_devres {
1: -	struct net_device *ndev;
1: +  struct net_device *ndev;
1:  };
1:  
1:  struct __kernel_old_timespec {
1: -	__kernel_old_time_t tv_sec;
1: -	long int tv_nsec;
1: +  __kernel_old_time_t tv_sec;
1: +  long int tv_nsec;
1:  };
1:  
1:  struct __kernel_sock_timeval {
1: -	__s64 tv_sec;
1: -	__s64 tv_usec;
1: +  __s64 tv_sec;
1: +  __s64 tv_usec;
1:  };
1:  
1:  struct mmsghdr {
1: -	struct user_msghdr msg_hdr;
1: -	unsigned int msg_len;
1: +  struct user_msghdr msg_hdr;
1: +  unsigned int msg_len;
1:  };
1:  
1:  struct scm_timestamping_internal {
1: -	struct timespec64 ts[3];
1: +  struct timespec64 ts[3];
1:  };
1:  
1:  enum sock_shutdown_cmd {
1: -	SHUT_RD = 0,
1: -	SHUT_WR = 1,
1: -	SHUT_RDWR = 2,
1: +  SHUT_RD = 0,
1: +  SHUT_WR = 1,
1: +  SHUT_RDWR = 2,
1:  };
1:  
1:  struct ifconf {
1: -	int ifc_len;
1: -	union {
1: -		char *ifcu_buf;
1: -		struct ifreq *ifcu_req;
1: -	} ifc_ifcu;
1: +  int ifc_len;
1: +  union {
1: +    char *ifcu_buf;
1: +    struct ifreq *ifcu_req;
1: +  } ifc_ifcu;
1:  };
1:  
1:  struct compat_ifmap {
1: -	compat_ulong_t mem_start;
1: -	compat_ulong_t mem_end;
1: -	short unsigned int base_addr;
1: -	unsigned char irq;
1: -	unsigned char dma;
1: -	unsigned char port;
1: +  compat_ulong_t mem_start;
1: +  compat_ulong_t mem_end;
1: +  short unsigned int base_addr;
1: +  unsigned char irq;
1: +  unsigned char dma;
1: +  unsigned char port;
1:  };
1:  
1:  struct compat_if_settings {
1: -	unsigned int type;
1: -	unsigned int size;
1: -	compat_uptr_t ifs_ifsu;
1: +  unsigned int type;
1: +  unsigned int size;
1: +  compat_uptr_t ifs_ifsu;
1:  };
1:  
1:  struct compat_ifreq {
1: -	union {
1: -		char ifrn_name[16];
1: -	} ifr_ifrn;
1: -	union {
1: -		struct sockaddr ifru_addr;
1: -		struct sockaddr ifru_dstaddr;
1: -		struct sockaddr ifru_broadaddr;
1: -		struct sockaddr ifru_netmask;
1: -		struct sockaddr ifru_hwaddr;
1: -		short int ifru_flags;
1: -		compat_int_t ifru_ivalue;
1: -		compat_int_t ifru_mtu;
1: -		struct compat_ifmap ifru_map;
1: -		char ifru_slave[16];
1: -		char ifru_newname[16];
1: -		compat_caddr_t ifru_data;
1: -		struct compat_if_settings ifru_settings;
1: -	} ifr_ifru;
1: +  union {
1: +    char ifrn_name[16];
1: +  } ifr_ifrn;
1: +  union {
1: +    struct sockaddr ifru_addr;
1: +    struct sockaddr ifru_dstaddr;
1: +    struct sockaddr ifru_broadaddr;
1: +    struct sockaddr ifru_netmask;
1: +    struct sockaddr ifru_hwaddr;
1: +    short int ifru_flags;
1: +    compat_int_t ifru_ivalue;
1: +    compat_int_t ifru_mtu;
1: +    struct compat_ifmap ifru_map;
1: +    char ifru_slave[16];
1: +    char ifru_newname[16];
1: +    compat_caddr_t ifru_data;
1: +    struct compat_if_settings ifru_settings;
1: +  } ifr_ifru;
1:  };
1:  
1:  struct compat_ifconf {
1: -	compat_int_t ifc_len;
1: -	compat_caddr_t ifcbuf;
1: +  compat_int_t ifc_len;
1: +  compat_caddr_t ifcbuf;
1:  };
1:  
1:  struct compat_ethtool_rx_flow_spec {
1: -	u32 flow_type;
1: -	union ethtool_flow_union h_u;
1: -	struct ethtool_flow_ext h_ext;
1: -	union ethtool_flow_union m_u;
1: -	struct ethtool_flow_ext m_ext;
1: -	compat_u64 ring_cookie;
1: -	u32 location;
1: +  u32 flow_type;
1: +  union ethtool_flow_union h_u;
1: +  struct ethtool_flow_ext h_ext;
1: +  union ethtool_flow_union m_u;
1: +  struct ethtool_flow_ext m_ext;
1: +  compat_u64 ring_cookie;
1: +  u32 location;
1:  } __attribute__((packed));
1:  
1:  struct compat_ethtool_rxnfc {
1: -	u32 cmd;
1: -	u32 flow_type;
1: -	compat_u64 data;
1: -	struct compat_ethtool_rx_flow_spec fs;
1: -	u32 rule_cnt;
1: -	u32 rule_locs[0];
1: +  u32 cmd;
1: +  u32 flow_type;
1: +  compat_u64 data;
1: +  struct compat_ethtool_rx_flow_spec fs;
1: +  u32 rule_cnt;
1: +  u32 rule_locs[0];
1:  } __attribute__((packed));
1:  
1:  struct compat_mmsghdr {
1: -	struct compat_msghdr msg_hdr;
1: -	compat_uint_t msg_len;
1: +  struct compat_msghdr msg_hdr;
1: +  compat_uint_t msg_len;
1:  };
1:  
1:  struct scm_ts_pktinfo {
1: -	__u32 if_index;
1: -	__u32 pkt_length;
1: -	__u32 reserved[2];
1: +  __u32 if_index;
1: +  __u32 pkt_length;
1: +  __u32 reserved[2];
1:  };
1:  
1:  struct sock_skb_cb {
1: -	u32 dropcount;
1: +  u32 dropcount;
1:  };
1:  
1:  struct sock_ee_data_rfc4884 {
1: -	__u16 len;
1: -	__u8 flags;
1: -	__u8 reserved;
1: +  __u16 len;
1: +  __u8 flags;
1: +  __u8 reserved;
1:  };
1:  
1:  struct sock_extended_err {
1: -	__u32 ee_errno;
1: -	__u8 ee_origin;
1: -	__u8 ee_type;
1: -	__u8 ee_code;
1: -	__u8 ee_pad;
1: -	__u32 ee_info;
1: -	union {
1: -		__u32 ee_data;
1: -		struct sock_ee_data_rfc4884 ee_rfc4884;
1: -	};
1: +  __u32 ee_errno;
1: +  __u8 ee_origin;
1: +  __u8 ee_type;
1: +  __u8 ee_code;
1: +  __u8 ee_pad;
1: +  __u32 ee_info;
1: +  union {
1: +    __u32 ee_data;
1: +    struct sock_ee_data_rfc4884 ee_rfc4884;
1: +  };
1:  };
1:  
1:  struct sock_exterr_skb {
1: -	union {
1: -		struct inet_skb_parm h4;
1: -		struct inet6_skb_parm h6;
1: -	} header;
1: -	struct sock_extended_err ee;
1: -	u16 addr_offset;
1: -	__be16 port;
1: -	u8 opt_stats: 1;
1: -	u8 unused: 7;
1: +  union {
1: +    struct inet_skb_parm h4;
1: +    struct inet6_skb_parm h6;
1: +  } header;
1: +  struct sock_extended_err ee;
1: +  u16 addr_offset;
1: +  __be16 port;
1: +  u8 opt_stats : 1;
1: +  u8 unused : 7;
1:  };
1:  
1:  struct used_address {
1: -	struct __kernel_sockaddr_storage name;
1: -	unsigned int name_len;
1: +  struct __kernel_sockaddr_storage name;
1: +  unsigned int name_len;
1:  };
1:  
1:  struct linger {
1: -	int l_onoff;
1: -	int l_linger;
1: +  int l_onoff;
1: +  int l_linger;
1:  };
1:  
1:  struct ucred {
1: -	__u32 pid;
1: -	__u32 uid;
1: -	__u32 gid;
1: +  __u32 pid;
1: +  __u32 uid;
1: +  __u32 gid;
1:  };
1:  
1:  struct prot_inuse {
1: -	int val[64];
1: +  int val[64];
1:  };
1:  
1:  enum txtime_flags {
1: -	SOF_TXTIME_DEADLINE_MODE = 1,
1: -	SOF_TXTIME_REPORT_ERRORS = 2,
1: -	SOF_TXTIME_FLAGS_LAST = 2,
1: -	SOF_TXTIME_FLAGS_MASK = 3,
1: +  SOF_TXTIME_DEADLINE_MODE = 1,
1: +  SOF_TXTIME_REPORT_ERRORS = 2,
1: +  SOF_TXTIME_FLAGS_LAST = 2,
1: +  SOF_TXTIME_FLAGS_MASK = 3,
1:  };
1:  
1:  struct sock_txtime {
1: -	__kernel_clockid_t clockid;
1: -	__u32 flags;
1: +  __kernel_clockid_t clockid;
1: +  __u32 flags;
1:  };
1:  
1:  enum sk_pacing {
1: -	SK_PACING_NONE = 0,
1: -	SK_PACING_NEEDED = 1,
1: -	SK_PACING_FQ = 2,
1: +  SK_PACING_NONE = 0,
1: +  SK_PACING_NEEDED = 1,
1: +  SK_PACING_FQ = 2,
1:  };
1:  
1:  struct sockcm_cookie {
1: -	u64 transmit_time;
1: -	u32 mark;
1: -	u16 tsflags;
1: +  u64 transmit_time;
1: +  u32 mark;
1: +  u16 tsflags;
1:  };
1:  
1:  struct fastopen_queue {
1: -	struct request_sock *rskq_rst_head;
1: -	struct request_sock *rskq_rst_tail;
1: -	spinlock_t lock;
1: -	int qlen;
1: -	int max_qlen;
1: -	struct tcp_fastopen_context *ctx;
1: +  struct request_sock *rskq_rst_head;
1: +  struct request_sock *rskq_rst_tail;
1: +  spinlock_t lock;
1: +  int qlen;
1: +  int max_qlen;
1: +  struct tcp_fastopen_context *ctx;
1:  };
1:  
1:  struct request_sock_queue {
1: -	spinlock_t rskq_lock;
1: -	u8 rskq_defer_accept;
1: -	u32 synflood_warned;
1: -	atomic_t qlen;
1: -	atomic_t young;
1: -	struct request_sock *rskq_accept_head;
1: -	struct request_sock *rskq_accept_tail;
1: -	struct fastopen_queue fastopenq;
1: +  spinlock_t rskq_lock;
1: +  u8 rskq_defer_accept;
1: +  u32 synflood_warned;
1: +  atomic_t qlen;
1: +  atomic_t young;
1: +  struct request_sock *rskq_accept_head;
1: +  struct request_sock *rskq_accept_tail;
1: +  struct fastopen_queue fastopenq;
1:  };
1:  
1:  struct inet_connection_sock_af_ops {
1: -	int (*queue_xmit)(struct sock *, struct sk_buff *, struct flowi *);
1: -	void (*send_check)(struct sock *, struct sk_buff *);
1: -	int (*rebuild_header)(struct sock *);
1: -	void (*sk_rx_dst_set)(struct sock *, const struct sk_buff *);
1: -	int (*conn_request)(struct sock *, struct sk_buff *);
1: -	struct sock * (*syn_recv_sock)(const struct sock *, struct sk_buff *, struct request_sock *, struct dst_entry *, struct request_sock *, bool *);
1: -	u16 net_header_len;
1: -	u16 net_frag_header_len;
1: -	u16 sockaddr_len;
1: -	int (*setsockopt)(struct sock *, int, int, sockptr_t, unsigned int);
1: -	int (*getsockopt)(struct sock *, int, int, char *, int *);
1: -	void (*addr2sockaddr)(struct sock *, struct sockaddr *);
1: -	void (*mtu_reduced)(struct sock *);
1: +  int (*queue_xmit)(struct sock *, struct sk_buff *, struct flowi *);
1: +  void (*send_check)(struct sock *, struct sk_buff *);
1: +  int (*rebuild_header)(struct sock *);
1: +  void (*sk_rx_dst_set)(struct sock *, const struct sk_buff *);
1: +  int (*conn_request)(struct sock *, struct sk_buff *);
1: +  struct sock *(*syn_recv_sock)(const struct sock *, struct sk_buff *,
1: +                                struct request_sock *, struct dst_entry *,
1: +                                struct request_sock *, bool *);
1: +  u16 net_header_len;
1: +  u16 net_frag_header_len;
1: +  u16 sockaddr_len;
1: +  int (*setsockopt)(struct sock *, int, int, sockptr_t, unsigned int);
1: +  int (*getsockopt)(struct sock *, int, int, char *, int *);
1: +  void (*addr2sockaddr)(struct sock *, struct sockaddr *);
1: +  void (*mtu_reduced)(struct sock *);
1:  };
1:  
1:  struct inet_bind_bucket;
1: @@ -111792,122 +113009,122 @@ struct inet_bind_bucket;
1:  struct tcp_ulp_ops;
1:  
1:  struct inet_connection_sock {
1: -	struct inet_sock icsk_inet;
1: -	struct request_sock_queue icsk_accept_queue;
1: -	struct inet_bind_bucket *icsk_bind_hash;
1: -	long unsigned int icsk_timeout;
1: -	struct timer_list icsk_retransmit_timer;
1: -	struct timer_list icsk_delack_timer;
1: -	__u32 icsk_rto;
1: -	__u32 icsk_rto_min;
1: -	__u32 icsk_delack_max;
1: -	__u32 icsk_pmtu_cookie;
1: -	const struct tcp_congestion_ops *icsk_ca_ops;
1: -	const struct inet_connection_sock_af_ops *icsk_af_ops;
1: -	const struct tcp_ulp_ops *icsk_ulp_ops;
1: -	void *icsk_ulp_data;
1: -	void (*icsk_clean_acked)(struct sock *, u32);
1: -	struct hlist_node icsk_listen_portaddr_node;
1: -	unsigned int (*icsk_sync_mss)(struct sock *, u32);
1: -	__u8 icsk_ca_state: 5;
1: -	__u8 icsk_ca_initialized: 1;
1: -	__u8 icsk_ca_setsockopt: 1;
1: -	__u8 icsk_ca_dst_locked: 1;
1: -	__u8 icsk_retransmits;
1: -	__u8 icsk_pending;
1: -	__u8 icsk_backoff;
1: -	__u8 icsk_syn_retries;
1: -	__u8 icsk_probes_out;
1: -	__u16 icsk_ext_hdr_len;
1: -	struct {
1: -		__u8 pending;
1: -		__u8 quick;
1: -		__u8 pingpong;
1: -		__u8 retry;
1: -		__u32 ato;
1: -		long unsigned int timeout;
1: -		__u32 lrcvtime;
1: -		__u16 last_seg_size;
1: -		__u16 rcv_mss;
1: -	} icsk_ack;
1: -	struct {
1: -		int enabled;
1: -		int search_high;
1: -		int search_low;
1: -		int probe_size;
1: -		u32 probe_timestamp;
1: -	} icsk_mtup;
1: -	u32 icsk_user_timeout;
1: -	u64 icsk_ca_priv[13];
1: +  struct inet_sock icsk_inet;
1: +  struct request_sock_queue icsk_accept_queue;
1: +  struct inet_bind_bucket *icsk_bind_hash;
1: +  long unsigned int icsk_timeout;
1: +  struct timer_list icsk_retransmit_timer;
1: +  struct timer_list icsk_delack_timer;
1: +  __u32 icsk_rto;
1: +  __u32 icsk_rto_min;
1: +  __u32 icsk_delack_max;
1: +  __u32 icsk_pmtu_cookie;
1: +  const struct tcp_congestion_ops *icsk_ca_ops;
1: +  const struct inet_connection_sock_af_ops *icsk_af_ops;
1: +  const struct tcp_ulp_ops *icsk_ulp_ops;
1: +  void *icsk_ulp_data;
1: +  void (*icsk_clean_acked)(struct sock *, u32);
1: +  struct hlist_node icsk_listen_portaddr_node;
1: +  unsigned int (*icsk_sync_mss)(struct sock *, u32);
1: +  __u8 icsk_ca_state : 5;
1: +  __u8 icsk_ca_initialized : 1;
1: +  __u8 icsk_ca_setsockopt : 1;
1: +  __u8 icsk_ca_dst_locked : 1;
1: +  __u8 icsk_retransmits;
1: +  __u8 icsk_pending;
1: +  __u8 icsk_backoff;
1: +  __u8 icsk_syn_retries;
1: +  __u8 icsk_probes_out;
1: +  __u16 icsk_ext_hdr_len;
1: +  struct {
1: +    __u8 pending;
1: +    __u8 quick;
1: +    __u8 pingpong;
1: +    __u8 retry;
1: +    __u32 ato;
1: +    long unsigned int timeout;
1: +    __u32 lrcvtime;
1: +    __u16 last_seg_size;
1: +    __u16 rcv_mss;
1: +  } icsk_ack;
1: +  struct {
1: +    int enabled;
1: +    int search_high;
1: +    int search_low;
1: +    int probe_size;
1: +    u32 probe_timestamp;
1: +  } icsk_mtup;
1: +  u32 icsk_user_timeout;
1: +  u64 icsk_ca_priv[13];
1:  };
1:  
1:  struct inet_bind_bucket {
1: -	possible_net_t ib_net;
1: -	int l3mdev;
1: -	short unsigned int port;
1: -	signed char fastreuse;
1: -	signed char fastreuseport;
1: -	kuid_t fastuid;
1: -	struct in6_addr fast_v6_rcv_saddr;
1: -	__be32 fast_rcv_saddr;
1: -	short unsigned int fast_sk_family;
1: -	bool fast_ipv6_only;
1: -	struct hlist_node node;
1: -	struct hlist_head owners;
1: +  possible_net_t ib_net;
1: +  int l3mdev;
1: +  short unsigned int port;
1: +  signed char fastreuse;
1: +  signed char fastreuseport;
1: +  kuid_t fastuid;
1: +  struct in6_addr fast_v6_rcv_saddr;
1: +  __be32 fast_rcv_saddr;
1: +  short unsigned int fast_sk_family;
1: +  bool fast_ipv6_only;
1: +  struct hlist_node node;
1: +  struct hlist_head owners;
1:  };
1:  
1:  struct tcp_ulp_ops {
1: -	struct list_head list;
1: -	int (*init)(struct sock *);
1: -	void (*update)(struct sock *, struct proto *, void (*)(struct sock *));
1: -	void (*release)(struct sock *);
1: -	int (*get_info)(const struct sock *, struct sk_buff *);
1: -	size_t (*get_info_size)(const struct sock *);
1: -	void (*clone)(const struct request_sock *, struct sock *, const gfp_t);
1: -	char name[16];
1: -	struct module *owner;
1: +  struct list_head list;
1: +  int (*init)(struct sock *);
1: +  void (*update)(struct sock *, struct proto *, void (*)(struct sock *));
1: +  void (*release)(struct sock *);
1: +  int (*get_info)(const struct sock *, struct sk_buff *);
1: +  size_t (*get_info_size)(const struct sock *);
1: +  void (*clone)(const struct request_sock *, struct sock *, const gfp_t);
1: +  char name[16];
1: +  struct module *owner;
1:  };
1:  
1:  struct tcp_fastopen_cookie {
1: -	__le64 val[2];
1: -	s8 len;
1: -	bool exp;
1: +  __le64 val[2];
1: +  s8 len;
1: +  bool exp;
1:  };
1:  
1:  struct tcp_sack_block {
1: -	u32 start_seq;
1: -	u32 end_seq;
1: +  u32 start_seq;
1: +  u32 end_seq;
1:  };
1:  
1:  struct tcp_options_received {
1: -	int ts_recent_stamp;
1: -	u32 ts_recent;
1: -	u32 rcv_tsval;
1: -	u32 rcv_tsecr;
1: -	u16 saw_tstamp: 1;
1: -	u16 tstamp_ok: 1;
1: -	u16 dsack: 1;
1: -	u16 wscale_ok: 1;
1: -	u16 sack_ok: 3;
1: -	u16 smc_ok: 1;
1: -	u16 snd_wscale: 4;
1: -	u16 rcv_wscale: 4;
1: -	u8 saw_unknown: 1;
1: -	u8 unused: 7;
1: -	u8 num_sacks;
1: -	u16 user_mss;
1: -	u16 mss_clamp;
1: +  int ts_recent_stamp;
1: +  u32 ts_recent;
1: +  u32 rcv_tsval;
1: +  u32 rcv_tsecr;
1: +  u16 saw_tstamp : 1;
1: +  u16 tstamp_ok : 1;
1: +  u16 dsack : 1;
1: +  u16 wscale_ok : 1;
1: +  u16 sack_ok : 3;
1: +  u16 smc_ok : 1;
1: +  u16 snd_wscale : 4;
1: +  u16 rcv_wscale : 4;
1: +  u8 saw_unknown : 1;
1: +  u8 unused : 7;
1: +  u8 num_sacks;
1: +  u16 user_mss;
1: +  u16 mss_clamp;
1:  };
1:  
1:  struct tcp_rack {
1: -	u64 mstamp;
1: -	u32 rtt_us;
1: -	u32 end_seq;
1: -	u32 last_delivered;
1: -	u8 reo_wnd_steps;
1: -	u8 reo_wnd_persist: 5;
1: -	u8 dsack_seen: 1;
1: -	u8 advanced: 1;
1: +  u64 mstamp;
1: +  u32 rtt_us;
1: +  u32 end_seq;
1: +  u32 last_delivered;
1: +  u8 reo_wnd_steps;
1: +  u8 reo_wnd_persist : 5;
1: +  u8 dsack_seen : 1;
1: +  u8 advanced : 1;
1:  };
1:  
1:  struct tcp_sock_af_ops;
1: @@ -111917,1993 +113134,2008 @@ struct tcp_md5sig_info;
1:  struct tcp_fastopen_request;
1:  
1:  struct tcp_sock {
1: -	struct inet_connection_sock inet_conn;
1: -	u16 tcp_header_len;
1: -	u16 gso_segs;
1: -	__be32 pred_flags;
1: -	u64 bytes_received;
1: -	u32 segs_in;
1: -	u32 data_segs_in;
1: -	u32 rcv_nxt;
1: -	u32 copied_seq;
1: -	u32 rcv_wup;
1: -	u32 snd_nxt;
1: -	u32 segs_out;
1: -	u32 data_segs_out;
1: -	u64 bytes_sent;
1: -	u64 bytes_acked;
1: -	u32 dsack_dups;
1: -	u32 snd_una;
1: -	u32 snd_sml;
1: -	u32 rcv_tstamp;
1: -	u32 lsndtime;
1: -	u32 last_oow_ack_time;
1: -	u32 compressed_ack_rcv_nxt;
1: -	u32 tsoffset;
1: -	struct list_head tsq_node;
1: -	struct list_head tsorted_sent_queue;
1: -	u32 snd_wl1;
1: -	u32 snd_wnd;
1: -	u32 max_window;
1: -	u32 mss_cache;
1: -	u32 window_clamp;
1: -	u32 rcv_ssthresh;
1: -	struct tcp_rack rack;
1: -	u16 advmss;
1: -	u8 compressed_ack;
1: -	u8 dup_ack_counter: 2;
1: -	u8 tlp_retrans: 1;
1: -	u8 unused: 5;
1: -	u32 chrono_start;
1: -	u32 chrono_stat[3];
1: -	u8 chrono_type: 2;
1: -	u8 rate_app_limited: 1;
1: -	u8 fastopen_connect: 1;
1: -	u8 fastopen_no_cookie: 1;
1: -	u8 is_sack_reneg: 1;
1: -	u8 fastopen_client_fail: 2;
1: -	u8 nonagle: 4;
1: -	u8 thin_lto: 1;
1: -	u8 recvmsg_inq: 1;
1: -	u8 repair: 1;
1: -	u8 frto: 1;
1: -	u8 repair_queue;
1: -	u8 save_syn: 2;
1: -	u8 syn_data: 1;
1: -	u8 syn_fastopen: 1;
1: -	u8 syn_fastopen_exp: 1;
1: -	u8 syn_fastopen_ch: 1;
1: -	u8 syn_data_acked: 1;
1: -	u8 is_cwnd_limited: 1;
1: -	u32 tlp_high_seq;
1: -	u32 tcp_tx_delay;
1: -	u64 tcp_wstamp_ns;
1: -	u64 tcp_clock_cache;
1: -	u64 tcp_mstamp;
1: -	u32 srtt_us;
1: -	u32 mdev_us;
1: -	u32 mdev_max_us;
1: -	u32 rttvar_us;
1: -	u32 rtt_seq;
1: -	struct minmax rtt_min;
1: -	u32 packets_out;
1: -	u32 retrans_out;
1: -	u32 max_packets_out;
1: -	u32 max_packets_seq;
1: -	u16 urg_data;
1: -	u8 ecn_flags;
1: -	u8 keepalive_probes;
1: -	u32 reordering;
1: -	u32 reord_seen;
1: -	u32 snd_up;
1: -	struct tcp_options_received rx_opt;
1: -	u32 snd_ssthresh;
1: -	u32 snd_cwnd;
1: -	u32 snd_cwnd_cnt;
1: -	u32 snd_cwnd_clamp;
1: -	u32 snd_cwnd_used;
1: -	u32 snd_cwnd_stamp;
1: -	u32 prior_cwnd;
1: -	u32 prr_delivered;
1: -	u32 prr_out;
1: -	u32 delivered;
1: -	u32 delivered_ce;
1: -	u32 lost;
1: -	u32 app_limited;
1: -	u64 first_tx_mstamp;
1: -	u64 delivered_mstamp;
1: -	u32 rate_delivered;
1: -	u32 rate_interval_us;
1: -	u32 rcv_wnd;
1: -	u32 write_seq;
1: -	u32 notsent_lowat;
1: -	u32 pushed_seq;
1: -	u32 lost_out;
1: -	u32 sacked_out;
1: -	struct hrtimer pacing_timer;
1: -	struct hrtimer compressed_ack_timer;
1: -	struct sk_buff *lost_skb_hint;
1: -	struct sk_buff *retransmit_skb_hint;
1: -	struct rb_root out_of_order_queue;
1: -	struct sk_buff *ooo_last_skb;
1: -	struct tcp_sack_block duplicate_sack[1];
1: -	struct tcp_sack_block selective_acks[4];
1: -	struct tcp_sack_block recv_sack_cache[4];
1: -	struct sk_buff *highest_sack;
1: -	int lost_cnt_hint;
1: -	u32 prior_ssthresh;
1: -	u32 high_seq;
1: -	u32 retrans_stamp;
1: -	u32 undo_marker;
1: -	int undo_retrans;
1: -	u64 bytes_retrans;
1: -	u32 total_retrans;
1: -	u32 urg_seq;
1: -	unsigned int keepalive_time;
1: -	unsigned int keepalive_intvl;
1: -	int linger2;
1: -	u8 bpf_sock_ops_cb_flags;
1: -	u16 timeout_rehash;
1: -	u32 rcv_ooopack;
1: -	u32 rcv_rtt_last_tsecr;
1: -	struct {
1: -		u32 rtt_us;
1: -		u32 seq;
1: -		u64 time;
1: -	} rcv_rtt_est;
1: -	struct {
1: -		u32 space;
1: -		u32 seq;
1: -		u64 time;
1: -	} rcvq_space;
1: -	struct {
1: -		u32 probe_seq_start;
1: -		u32 probe_seq_end;
1: -	} mtu_probe;
1: -	u32 mtu_info;
1: -	const struct tcp_sock_af_ops *af_specific;
1: -	struct tcp_md5sig_info *md5sig_info;
1: -	struct tcp_fastopen_request *fastopen_req;
1: -	struct request_sock *fastopen_rsk;
1: -	struct saved_syn *saved_syn;
1: +  struct inet_connection_sock inet_conn;
1: +  u16 tcp_header_len;
1: +  u16 gso_segs;
1: +  __be32 pred_flags;
1: +  u64 bytes_received;
1: +  u32 segs_in;
1: +  u32 data_segs_in;
1: +  u32 rcv_nxt;
1: +  u32 copied_seq;
1: +  u32 rcv_wup;
1: +  u32 snd_nxt;
1: +  u32 segs_out;
1: +  u32 data_segs_out;
1: +  u64 bytes_sent;
1: +  u64 bytes_acked;
1: +  u32 dsack_dups;
1: +  u32 snd_una;
1: +  u32 snd_sml;
1: +  u32 rcv_tstamp;
1: +  u32 lsndtime;
1: +  u32 last_oow_ack_time;
1: +  u32 compressed_ack_rcv_nxt;
1: +  u32 tsoffset;
1: +  struct list_head tsq_node;
1: +  struct list_head tsorted_sent_queue;
1: +  u32 snd_wl1;
1: +  u32 snd_wnd;
1: +  u32 max_window;
1: +  u32 mss_cache;
1: +  u32 window_clamp;
1: +  u32 rcv_ssthresh;
1: +  struct tcp_rack rack;
1: +  u16 advmss;
1: +  u8 compressed_ack;
1: +  u8 dup_ack_counter : 2;
1: +  u8 tlp_retrans : 1;
1: +  u8 unused : 5;
1: +  u32 chrono_start;
1: +  u32 chrono_stat[3];
1: +  u8 chrono_type : 2;
1: +  u8 rate_app_limited : 1;
1: +  u8 fastopen_connect : 1;
1: +  u8 fastopen_no_cookie : 1;
1: +  u8 is_sack_reneg : 1;
1: +  u8 fastopen_client_fail : 2;
1: +  u8 nonagle : 4;
1: +  u8 thin_lto : 1;
1: +  u8 recvmsg_inq : 1;
1: +  u8 repair : 1;
1: +  u8 frto : 1;
1: +  u8 repair_queue;
1: +  u8 save_syn : 2;
1: +  u8 syn_data : 1;
1: +  u8 syn_fastopen : 1;
1: +  u8 syn_fastopen_exp : 1;
1: +  u8 syn_fastopen_ch : 1;
1: +  u8 syn_data_acked : 1;
1: +  u8 is_cwnd_limited : 1;
1: +  u32 tlp_high_seq;
1: +  u32 tcp_tx_delay;
1: +  u64 tcp_wstamp_ns;
1: +  u64 tcp_clock_cache;
1: +  u64 tcp_mstamp;
1: +  u32 srtt_us;
1: +  u32 mdev_us;
1: +  u32 mdev_max_us;
1: +  u32 rttvar_us;
1: +  u32 rtt_seq;
1: +  struct minmax rtt_min;
1: +  u32 packets_out;
1: +  u32 retrans_out;
1: +  u32 max_packets_out;
1: +  u32 max_packets_seq;
1: +  u16 urg_data;
1: +  u8 ecn_flags;
1: +  u8 keepalive_probes;
1: +  u32 reordering;
1: +  u32 reord_seen;
1: +  u32 snd_up;
1: +  struct tcp_options_received rx_opt;
1: +  u32 snd_ssthresh;
1: +  u32 snd_cwnd;
1: +  u32 snd_cwnd_cnt;
1: +  u32 snd_cwnd_clamp;
1: +  u32 snd_cwnd_used;
1: +  u32 snd_cwnd_stamp;
1: +  u32 prior_cwnd;
1: +  u32 prr_delivered;
1: +  u32 prr_out;
1: +  u32 delivered;
1: +  u32 delivered_ce;
1: +  u32 lost;
1: +  u32 app_limited;
1: +  u64 first_tx_mstamp;
1: +  u64 delivered_mstamp;
1: +  u32 rate_delivered;
1: +  u32 rate_interval_us;
1: +  u32 rcv_wnd;
1: +  u32 write_seq;
1: +  u32 notsent_lowat;
1: +  u32 pushed_seq;
1: +  u32 lost_out;
1: +  u32 sacked_out;
1: +  struct hrtimer pacing_timer;
1: +  struct hrtimer compressed_ack_timer;
1: +  struct sk_buff *lost_skb_hint;
1: +  struct sk_buff *retransmit_skb_hint;
1: +  struct rb_root out_of_order_queue;
1: +  struct sk_buff *ooo_last_skb;
1: +  struct tcp_sack_block duplicate_sack[1];
1: +  struct tcp_sack_block selective_acks[4];
1: +  struct tcp_sack_block recv_sack_cache[4];
1: +  struct sk_buff *highest_sack;
1: +  int lost_cnt_hint;
1: +  u32 prior_ssthresh;
1: +  u32 high_seq;
1: +  u32 retrans_stamp;
1: +  u32 undo_marker;
1: +  int undo_retrans;
1: +  u64 bytes_retrans;
1: +  u32 total_retrans;
1: +  u32 urg_seq;
1: +  unsigned int keepalive_time;
1: +  unsigned int keepalive_intvl;
1: +  int linger2;
1: +  u8 bpf_sock_ops_cb_flags;
1: +  u16 timeout_rehash;
1: +  u32 rcv_ooopack;
1: +  u32 rcv_rtt_last_tsecr;
1: +  struct {
1: +    u32 rtt_us;
1: +    u32 seq;
1: +    u64 time;
1: +  } rcv_rtt_est;
1: +  struct {
1: +    u32 space;
1: +    u32 seq;
1: +    u64 time;
1: +  } rcvq_space;
1: +  struct {
1: +    u32 probe_seq_start;
1: +    u32 probe_seq_end;
1: +  } mtu_probe;
1: +  u32 mtu_info;
1: +  const struct tcp_sock_af_ops *af_specific;
1: +  struct tcp_md5sig_info *md5sig_info;
1: +  struct tcp_fastopen_request *fastopen_req;
1: +  struct request_sock *fastopen_rsk;
1: +  struct saved_syn *saved_syn;
1:  };
1:  
1:  struct tcp_md5sig_key;
1:  
1:  struct tcp_sock_af_ops {
1: -	struct tcp_md5sig_key * (*md5_lookup)(const struct sock *, const struct sock *);
1: -	int (*calc_md5_hash)(char *, const struct tcp_md5sig_key *, const struct sock *, const struct sk_buff *);
1: -	int (*md5_parse)(struct sock *, int, sockptr_t, int);
1: +  struct tcp_md5sig_key *(*md5_lookup)(const struct sock *,
1: +                                       const struct sock *);
1: +  int (*calc_md5_hash)(char *, const struct tcp_md5sig_key *,
1: +                       const struct sock *, const struct sk_buff *);
1: +  int (*md5_parse)(struct sock *, int, sockptr_t, int);
1:  };
1:  
1:  struct tcp_md5sig_info {
1: -	struct hlist_head head;
1: -	struct callback_head rcu;
1: +  struct hlist_head head;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcp_fastopen_request {
1: -	struct tcp_fastopen_cookie cookie;
1: -	struct msghdr *data;
1: -	size_t size;
1: -	int copied;
1: -	struct ubuf_info *uarg;
1: +  struct tcp_fastopen_cookie cookie;
1: +  struct msghdr *data;
1: +  size_t size;
1: +  int copied;
1: +  struct ubuf_info *uarg;
1:  };
1:  
1:  union tcp_md5_addr {
1: -	struct in_addr a4;
1: -	struct in6_addr a6;
1: +  struct in_addr a4;
1: +  struct in6_addr a6;
1:  };
1:  
1:  struct tcp_md5sig_key {
1: -	struct hlist_node node;
1: -	u8 keylen;
1: -	u8 family;
1: -	u8 prefixlen;
1: -	union tcp_md5_addr addr;
1: -	int l3index;
1: -	u8 key[80];
1: -	struct callback_head rcu;
1: +  struct hlist_node node;
1: +  u8 keylen;
1: +  u8 family;
1: +  u8 prefixlen;
1: +  union tcp_md5_addr addr;
1: +  int l3index;
1: +  u8 key[80];
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct net_protocol {
1: -	int (*early_demux)(struct sk_buff *);
1: -	int (*early_demux_handler)(struct sk_buff *);
1: -	int (*handler)(struct sk_buff *);
1: -	int (*err_handler)(struct sk_buff *, u32);
1: -	unsigned int no_policy: 1;
1: -	unsigned int netns_ok: 1;
1: -	unsigned int icmp_strict_tag_validation: 1;
1: +  int (*early_demux)(struct sk_buff *);
1: +  int (*early_demux_handler)(struct sk_buff *);
1: +  int (*handler)(struct sk_buff *);
1: +  int (*err_handler)(struct sk_buff *, u32);
1: +  unsigned int no_policy : 1;
1: +  unsigned int netns_ok : 1;
1: +  unsigned int icmp_strict_tag_validation : 1;
1:  };
1:  
1:  struct cgroup_cls_state {
1: -	struct cgroup_subsys_state css;
1: -	u32 classid;
1: +  struct cgroup_subsys_state css;
1: +  u32 classid;
1:  };
1:  
1:  enum {
1: -	SK_MEMINFO_RMEM_ALLOC = 0,
1: -	SK_MEMINFO_RCVBUF = 1,
1: -	SK_MEMINFO_WMEM_ALLOC = 2,
1: -	SK_MEMINFO_SNDBUF = 3,
1: -	SK_MEMINFO_FWD_ALLOC = 4,
1: -	SK_MEMINFO_WMEM_QUEUED = 5,
1: -	SK_MEMINFO_OPTMEM = 6,
1: -	SK_MEMINFO_BACKLOG = 7,
1: -	SK_MEMINFO_DROPS = 8,
1: -	SK_MEMINFO_VARS = 9,
1: +  SK_MEMINFO_RMEM_ALLOC = 0,
1: +  SK_MEMINFO_RCVBUF = 1,
1: +  SK_MEMINFO_WMEM_ALLOC = 2,
1: +  SK_MEMINFO_SNDBUF = 3,
1: +  SK_MEMINFO_FWD_ALLOC = 4,
1: +  SK_MEMINFO_WMEM_QUEUED = 5,
1: +  SK_MEMINFO_OPTMEM = 6,
1: +  SK_MEMINFO_BACKLOG = 7,
1: +  SK_MEMINFO_DROPS = 8,
1: +  SK_MEMINFO_VARS = 9,
1:  };
1:  
1:  enum sknetlink_groups {
1: -	SKNLGRP_NONE = 0,
1: -	SKNLGRP_INET_TCP_DESTROY = 1,
1: -	SKNLGRP_INET_UDP_DESTROY = 2,
1: -	SKNLGRP_INET6_TCP_DESTROY = 3,
1: -	SKNLGRP_INET6_UDP_DESTROY = 4,
1: -	__SKNLGRP_MAX = 5,
1: +  SKNLGRP_NONE = 0,
1: +  SKNLGRP_INET_TCP_DESTROY = 1,
1: +  SKNLGRP_INET_UDP_DESTROY = 2,
1: +  SKNLGRP_INET6_TCP_DESTROY = 3,
1: +  SKNLGRP_INET6_UDP_DESTROY = 4,
1: +  __SKNLGRP_MAX = 5,
1:  };
1:  
1:  struct inet_request_sock {
1: -	struct request_sock req;
1: -	u16 snd_wscale: 4;
1: -	u16 rcv_wscale: 4;
1: -	u16 tstamp_ok: 1;
1: -	u16 sack_ok: 1;
1: -	u16 wscale_ok: 1;
1: -	u16 ecn_ok: 1;
1: -	u16 acked: 1;
1: -	u16 no_srccheck: 1;
1: -	u16 smc_ok: 1;
1: -	u32 ir_mark;
1: -	union {
1: -		struct ip_options_rcu *ireq_opt;
1: -		struct {
1: -			struct ipv6_txoptions *ipv6_opt;
1: -			struct sk_buff *pktopts;
1: -		};
1: -	};
1: +  struct request_sock req;
1: +  u16 snd_wscale : 4;
1: +  u16 rcv_wscale : 4;
1: +  u16 tstamp_ok : 1;
1: +  u16 sack_ok : 1;
1: +  u16 wscale_ok : 1;
1: +  u16 ecn_ok : 1;
1: +  u16 acked : 1;
1: +  u16 no_srccheck : 1;
1: +  u16 smc_ok : 1;
1: +  u32 ir_mark;
1: +  union {
1: +    struct ip_options_rcu *ireq_opt;
1: +    struct {
1: +      struct ipv6_txoptions *ipv6_opt;
1: +      struct sk_buff *pktopts;
1: +    };
1: +  };
1:  };
1:  
1:  struct tcp_request_sock_ops;
1:  
1:  struct tcp_request_sock {
1: -	struct inet_request_sock req;
1: -	const struct tcp_request_sock_ops *af_specific;
1: -	u64 snt_synack;
1: -	bool tfo_listener;
1: -	bool is_mptcp;
1: -	u32 txhash;
1: -	u32 rcv_isn;
1: -	u32 snt_isn;
1: -	u32 ts_off;
1: -	u32 last_oow_ack_time;
1: -	u32 rcv_nxt;
1: -	u8 syn_tos;
1: +  struct inet_request_sock req;
1: +  const struct tcp_request_sock_ops *af_specific;
1: +  u64 snt_synack;
1: +  bool tfo_listener;
1: +  bool is_mptcp;
1: +  u32 txhash;
1: +  u32 rcv_isn;
1: +  u32 snt_isn;
1: +  u32 ts_off;
1: +  u32 last_oow_ack_time;
1: +  u32 rcv_nxt;
1: +  u8 syn_tos;
1:  };
1:  
1:  enum tcp_synack_type {
1: -	TCP_SYNACK_NORMAL = 0,
1: -	TCP_SYNACK_FASTOPEN = 1,
1: -	TCP_SYNACK_COOKIE = 2,
1: +  TCP_SYNACK_NORMAL = 0,
1: +  TCP_SYNACK_FASTOPEN = 1,
1: +  TCP_SYNACK_COOKIE = 2,
1:  };
1:  
1:  struct tcp_request_sock_ops {
1: -	u16 mss_clamp;
1: -	struct tcp_md5sig_key * (*req_md5_lookup)(const struct sock *, const struct sock *);
1: -	int (*calc_md5_hash)(char *, const struct tcp_md5sig_key *, const struct sock *, const struct sk_buff *);
1: -	void (*init_req)(struct request_sock *, const struct sock *, struct sk_buff *);
1: -	__u32 (*cookie_init_seq)(const struct sk_buff *, __u16 *);
1: -	struct dst_entry * (*route_req)(const struct sock *, struct flowi *, const struct request_sock *);
1: -	u32 (*init_seq)(const struct sk_buff *);
1: -	u32 (*init_ts_off)(const struct net *, const struct sk_buff *);
1: -	int (*send_synack)(const struct sock *, struct dst_entry *, struct flowi *, struct request_sock *, struct tcp_fastopen_cookie *, enum tcp_synack_type, struct sk_buff *);
1: +  u16 mss_clamp;
1: +  struct tcp_md5sig_key *(*req_md5_lookup)(const struct sock *,
1: +                                           const struct sock *);
1: +  int (*calc_md5_hash)(char *, const struct tcp_md5sig_key *,
1: +                       const struct sock *, const struct sk_buff *);
1: +  void (*init_req)(struct request_sock *, const struct sock *,
1: +                   struct sk_buff *);
1: +  __u32 (*cookie_init_seq)(const struct sk_buff *, __u16 *);
1: +  struct dst_entry *(*route_req)(const struct sock *, struct flowi *,
1: +                                 const struct request_sock *);
1: +  u32 (*init_seq)(const struct sk_buff *);
1: +  u32 (*init_ts_off)(const struct net *, const struct sk_buff *);
1: +  int (*send_synack)(const struct sock *, struct dst_entry *, struct flowi *,
1: +                     struct request_sock *, struct tcp_fastopen_cookie *,
1: +                     enum tcp_synack_type, struct sk_buff *);
1:  };
1:  
1:  enum {
1: -	SKB_FCLONE_UNAVAILABLE = 0,
1: -	SKB_FCLONE_ORIG = 1,
1: -	SKB_FCLONE_CLONE = 2,
1: +  SKB_FCLONE_UNAVAILABLE = 0,
1: +  SKB_FCLONE_ORIG = 1,
1: +  SKB_FCLONE_CLONE = 2,
1:  };
1:  
1:  struct sk_buff_fclones {
1: -	struct sk_buff skb1;
1: -	struct sk_buff skb2;
1: -	refcount_t fclone_ref;
1: +  struct sk_buff skb1;
1: +  struct sk_buff skb2;
1: +  refcount_t fclone_ref;
1:  };
1:  
1:  struct skb_seq_state {
1: -	__u32 lower_offset;
1: -	__u32 upper_offset;
1: -	__u32 frag_idx;
1: -	__u32 stepped_offset;
1: -	struct sk_buff *root_skb;
1: -	struct sk_buff *cur_skb;
1: -	__u8 *frag_data;
1: +  __u32 lower_offset;
1: +  __u32 upper_offset;
1: +  __u32 frag_idx;
1: +  __u32 stepped_offset;
1: +  struct sk_buff *root_skb;
1: +  struct sk_buff *cur_skb;
1: +  __u8 *frag_data;
1:  };
1:  
1:  struct skb_checksum_ops {
1: -	__wsum (*update)(const void *, int, __wsum);
1: -	__wsum (*combine)(__wsum, __wsum, int, int);
1: +  __wsum (*update)(const void *, int, __wsum);
1: +  __wsum (*combine)(__wsum, __wsum, int, int);
1:  };
1:  
1:  struct skb_gso_cb {
1: -	union {
1: -		int mac_offset;
1: -		int data_offset;
1: -	};
1: -	int encap_level;
1: -	__wsum csum;
1: -	__u16 csum_start;
1: +  union {
1: +    int mac_offset;
1: +    int data_offset;
1: +  };
1: +  int encap_level;
1: +  __wsum csum;
1: +  __u16 csum_start;
1:  };
1:  
1:  struct ip_auth_hdr {
1: -	__u8 nexthdr;
1: -	__u8 hdrlen;
1: -	__be16 reserved;
1: -	__be32 spi;
1: -	__be32 seq_no;
1: -	__u8 auth_data[0];
1: +  __u8 nexthdr;
1: +  __u8 hdrlen;
1: +  __be16 reserved;
1: +  __be32 spi;
1: +  __be32 seq_no;
1: +  __u8 auth_data[0];
1:  };
1:  
1:  struct frag_hdr {
1: -	__u8 nexthdr;
1: -	__u8 reserved;
1: -	__be16 frag_off;
1: -	__be32 identification;
1: +  __u8 nexthdr;
1: +  __u8 reserved;
1: +  __be16 frag_off;
1: +  __be32 identification;
1:  };
1:  
1:  enum {
1: -	SCM_TSTAMP_SND = 0,
1: -	SCM_TSTAMP_SCHED = 1,
1: -	SCM_TSTAMP_ACK = 2,
1: +  SCM_TSTAMP_SND = 0,
1: +  SCM_TSTAMP_SCHED = 1,
1: +  SCM_TSTAMP_ACK = 2,
1:  };
1:  
1:  struct xfrm_offload {
1: -	struct {
1: -		__u32 low;
1: -		__u32 hi;
1: -	} seq;
1: -	__u32 flags;
1: -	__u32 status;
1: -	__u8 proto;
1: +  struct {
1: +    __u32 low;
1: +    __u32 hi;
1: +  } seq;
1: +  __u32 flags;
1: +  __u32 status;
1: +  __u8 proto;
1:  };
1:  
1:  struct sec_path {
1: -	int len;
1: -	int olen;
1: -	struct xfrm_state *xvec[6];
1: -	struct xfrm_offload ovec[1];
1: +  int len;
1: +  int olen;
1: +  struct xfrm_state *xvec[6];
1: +  struct xfrm_offload ovec[1];
1:  };
1:  
1:  struct mpls_shim_hdr {
1: -	__be32 label_stack_entry;
1: +  __be32 label_stack_entry;
1:  };
1:  
1:  struct napi_alloc_cache {
1: -	struct page_frag_cache page;
1: -	unsigned int skb_count;
1: -	void *skb_cache[64];
1: +  struct page_frag_cache page;
1: +  unsigned int skb_count;
1: +  void *skb_cache[64];
1:  };
1:  
1:  struct ahash_request___2;
1:  
1:  struct scm_cookie {
1: -	struct pid *pid;
1: -	struct scm_fp_list *fp;
1: -	struct scm_creds creds;
1: -	u32 secid;
1: +  struct pid *pid;
1: +  struct scm_fp_list *fp;
1: +  struct scm_creds creds;
1: +  u32 secid;
1:  };
1:  
1:  struct scm_timestamping {
1: -	struct __kernel_old_timespec ts[3];
1: +  struct __kernel_old_timespec ts[3];
1:  };
1:  
1:  struct scm_timestamping64 {
1: -	struct __kernel_timespec ts[3];
1: +  struct __kernel_timespec ts[3];
1:  };
1:  
1:  enum {
1: -	TCA_STATS_UNSPEC = 0,
1: -	TCA_STATS_BASIC = 1,
1: -	TCA_STATS_RATE_EST = 2,
1: -	TCA_STATS_QUEUE = 3,
1: -	TCA_STATS_APP = 4,
1: -	TCA_STATS_RATE_EST64 = 5,
1: -	TCA_STATS_PAD = 6,
1: -	TCA_STATS_BASIC_HW = 7,
1: -	TCA_STATS_PKT64 = 8,
1: -	__TCA_STATS_MAX = 9,
1: +  TCA_STATS_UNSPEC = 0,
1: +  TCA_STATS_BASIC = 1,
1: +  TCA_STATS_RATE_EST = 2,
1: +  TCA_STATS_QUEUE = 3,
1: +  TCA_STATS_APP = 4,
1: +  TCA_STATS_RATE_EST64 = 5,
1: +  TCA_STATS_PAD = 6,
1: +  TCA_STATS_BASIC_HW = 7,
1: +  TCA_STATS_PKT64 = 8,
1: +  __TCA_STATS_MAX = 9,
1:  };
1:  
1:  struct gnet_stats_basic {
1: -	__u64 bytes;
1: -	__u32 packets;
1: +  __u64 bytes;
1: +  __u32 packets;
1:  };
1:  
1:  struct gnet_stats_rate_est {
1: -	__u32 bps;
1: -	__u32 pps;
1: +  __u32 bps;
1: +  __u32 pps;
1:  };
1:  
1:  struct gnet_stats_rate_est64 {
1: -	__u64 bps;
1: -	__u64 pps;
1: +  __u64 bps;
1: +  __u64 pps;
1:  };
1:  
1:  struct gnet_estimator {
1: -	signed char interval;
1: -	unsigned char ewma_log;
1: +  signed char interval;
1: +  unsigned char ewma_log;
1:  };
1:  
1:  struct net_rate_estimator___2 {
1: -	struct gnet_stats_basic_packed *bstats;
1: -	spinlock_t *stats_lock;
1: -	seqcount_t *running;
1: -	struct gnet_stats_basic_cpu *cpu_bstats;
1: -	u8 ewma_log;
1: -	u8 intvl_log;
1: -	seqcount_t seq;
1: -	u64 last_packets;
1: -	u64 last_bytes;
1: -	u64 avpps;
1: -	u64 avbps;
1: -	long unsigned int next_jiffies;
1: -	struct timer_list timer;
1: -	struct callback_head rcu;
1: +  struct gnet_stats_basic_packed *bstats;
1: +  spinlock_t *stats_lock;
1: +  seqcount_t *running;
1: +  struct gnet_stats_basic_cpu *cpu_bstats;
1: +  u8 ewma_log;
1: +  u8 intvl_log;
1: +  seqcount_t seq;
1: +  u64 last_packets;
1: +  u64 last_bytes;
1: +  u64 avpps;
1: +  u64 avbps;
1: +  long unsigned int next_jiffies;
1: +  struct timer_list timer;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct rtgenmsg {
1: -	unsigned char rtgen_family;
1: +  unsigned char rtgen_family;
1:  };
1:  
1:  enum {
1: -	NETNSA_NONE = 0,
1: -	NETNSA_NSID = 1,
1: -	NETNSA_PID = 2,
1: -	NETNSA_FD = 3,
1: -	NETNSA_TARGET_NSID = 4,
1: -	NETNSA_CURRENT_NSID = 5,
1: -	__NETNSA_MAX = 6,
1: +  NETNSA_NONE = 0,
1: +  NETNSA_NSID = 1,
1: +  NETNSA_PID = 2,
1: +  NETNSA_FD = 3,
1: +  NETNSA_TARGET_NSID = 4,
1: +  NETNSA_CURRENT_NSID = 5,
1: +  __NETNSA_MAX = 6,
1:  };
1:  
1:  struct pcpu_gen_cookie {
1: -	local_t nesting;
1: -	u64 last;
1: +  local_t nesting;
1: +  u64 last;
1:  };
1:  
1:  struct gen_cookie {
1: -	struct pcpu_gen_cookie *local;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	atomic64_t forward_last;
1: -	atomic64_t reverse_last;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct pcpu_gen_cookie *local;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  atomic64_t forward_last;
1: +  atomic64_t reverse_last;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  enum rtnl_link_flags {
1: -	RTNL_FLAG_DOIT_UNLOCKED = 1,
1: +  RTNL_FLAG_DOIT_UNLOCKED = 1,
1:  };
1:  
1:  struct net_fill_args {
1: -	u32 portid;
1: -	u32 seq;
1: -	int flags;
1: -	int cmd;
1: -	int nsid;
1: -	bool add_ref;
1: -	int ref_nsid;
1: +  u32 portid;
1: +  u32 seq;
1: +  int flags;
1: +  int cmd;
1: +  int nsid;
1: +  bool add_ref;
1: +  int ref_nsid;
1:  };
1:  
1:  struct rtnl_net_dump_cb {
1: -	struct net *tgt_net;
1: -	struct net *ref_net;
1: -	struct sk_buff *skb;
1: -	struct net_fill_args fillargs;
1: -	int idx;
1: -	int s_idx;
1: +  struct net *tgt_net;
1: +  struct net *ref_net;
1: +  struct sk_buff *skb;
1: +  struct net_fill_args fillargs;
1: +  int idx;
1: +  int s_idx;
1:  };
1:  
1:  enum flow_dissect_ret {
1: -	FLOW_DISSECT_RET_OUT_GOOD = 0,
1: -	FLOW_DISSECT_RET_OUT_BAD = 1,
1: -	FLOW_DISSECT_RET_PROTO_AGAIN = 2,
1: -	FLOW_DISSECT_RET_IPPROTO_AGAIN = 3,
1: -	FLOW_DISSECT_RET_CONTINUE = 4,
1: +  FLOW_DISSECT_RET_OUT_GOOD = 0,
1: +  FLOW_DISSECT_RET_OUT_BAD = 1,
1: +  FLOW_DISSECT_RET_PROTO_AGAIN = 2,
1: +  FLOW_DISSECT_RET_IPPROTO_AGAIN = 3,
1: +  FLOW_DISSECT_RET_CONTINUE = 4,
1:  };
1:  
1:  struct flow_dissector_key_tags {
1: -	u32 flow_label;
1: +  u32 flow_label;
1:  };
1:  
1:  struct flow_dissector_key_vlan {
1: -	union {
1: -		struct {
1: -			u16 vlan_id: 12;
1: -			u16 vlan_dei: 1;
1: -			u16 vlan_priority: 3;
1: -		};
1: -		__be16 vlan_tci;
1: -	};
1: -	__be16 vlan_tpid;
1: +  union {
1: +    struct {
1: +      u16 vlan_id : 12;
1: +      u16 vlan_dei : 1;
1: +      u16 vlan_priority : 3;
1: +    };
1: +    __be16 vlan_tci;
1: +  };
1: +  __be16 vlan_tpid;
1:  };
1:  
1:  struct flow_dissector_mpls_lse {
1: -	u32 mpls_ttl: 8;
1: -	u32 mpls_bos: 1;
1: -	u32 mpls_tc: 3;
1: -	u32 mpls_label: 20;
1: +  u32 mpls_ttl : 8;
1: +  u32 mpls_bos : 1;
1: +  u32 mpls_tc : 3;
1: +  u32 mpls_label : 20;
1:  };
1:  
1:  struct flow_dissector_key_mpls {
1: -	struct flow_dissector_mpls_lse ls[7];
1: -	u8 used_lses;
1: +  struct flow_dissector_mpls_lse ls[7];
1: +  u8 used_lses;
1:  };
1:  
1:  struct flow_dissector_key_enc_opts {
1: -	u8 data[255];
1: -	u8 len;
1: -	__be16 dst_opt_type;
1: +  u8 data[255];
1: +  u8 len;
1: +  __be16 dst_opt_type;
1:  };
1:  
1:  struct flow_dissector_key_keyid {
1: -	__be32 keyid;
1: +  __be32 keyid;
1:  };
1:  
1:  struct flow_dissector_key_ipv4_addrs {
1: -	__be32 src;
1: -	__be32 dst;
1: +  __be32 src;
1: +  __be32 dst;
1:  };
1:  
1:  struct flow_dissector_key_ipv6_addrs {
1: -	struct in6_addr src;
1: -	struct in6_addr dst;
1: +  struct in6_addr src;
1: +  struct in6_addr dst;
1:  };
1:  
1:  struct flow_dissector_key_tipc {
1: -	__be32 key;
1: +  __be32 key;
1:  };
1:  
1:  struct flow_dissector_key_addrs {
1: -	union {
1: -		struct flow_dissector_key_ipv4_addrs v4addrs;
1: -		struct flow_dissector_key_ipv6_addrs v6addrs;
1: -		struct flow_dissector_key_tipc tipckey;
1: -	};
1: +  union {
1: +    struct flow_dissector_key_ipv4_addrs v4addrs;
1: +    struct flow_dissector_key_ipv6_addrs v6addrs;
1: +    struct flow_dissector_key_tipc tipckey;
1: +  };
1:  };
1:  
1:  struct flow_dissector_key_arp {
1: -	__u32 sip;
1: -	__u32 tip;
1: -	__u8 op;
1: -	unsigned char sha[6];
1: -	unsigned char tha[6];
1: +  __u32 sip;
1: +  __u32 tip;
1: +  __u8 op;
1: +  unsigned char sha[6];
1: +  unsigned char tha[6];
1:  };
1:  
1:  struct flow_dissector_key_ports {
1: -	union {
1: -		__be32 ports;
1: -		struct {
1: -			__be16 src;
1: -			__be16 dst;
1: -		};
1: -	};
1: +  union {
1: +    __be32 ports;
1: +    struct {
1: +      __be16 src;
1: +      __be16 dst;
1: +    };
1: +  };
1:  };
1:  
1:  struct flow_dissector_key_icmp {
1: -	struct {
1: -		u8 type;
1: -		u8 code;
1: -	};
1: -	u16 id;
1: +  struct {
1: +    u8 type;
1: +    u8 code;
1: +  };
1: +  u16 id;
1:  };
1:  
1:  struct flow_dissector_key_eth_addrs {
1: -	unsigned char dst[6];
1: -	unsigned char src[6];
1: +  unsigned char dst[6];
1: +  unsigned char src[6];
1:  };
1:  
1:  struct flow_dissector_key_tcp {
1: -	__be16 flags;
1: +  __be16 flags;
1:  };
1:  
1:  struct flow_dissector_key_ip {
1: -	__u8 tos;
1: -	__u8 ttl;
1: +  __u8 tos;
1: +  __u8 ttl;
1:  };
1:  
1:  struct flow_dissector_key_meta {
1: -	int ingress_ifindex;
1: -	u16 ingress_iftype;
1: +  int ingress_ifindex;
1: +  u16 ingress_iftype;
1:  };
1:  
1:  struct flow_dissector_key_hash {
1: -	u32 hash;
1: +  u32 hash;
1:  };
1:  
1:  struct flow_dissector_key {
1: -	enum flow_dissector_key_id key_id;
1: -	size_t offset;
1: +  enum flow_dissector_key_id key_id;
1: +  size_t offset;
1:  };
1:  
1:  struct flow_keys {
1: -	struct flow_dissector_key_control control;
1: -	struct flow_dissector_key_basic basic;
1: -	struct flow_dissector_key_tags tags;
1: -	struct flow_dissector_key_vlan vlan;
1: -	struct flow_dissector_key_vlan cvlan;
1: -	struct flow_dissector_key_keyid keyid;
1: -	struct flow_dissector_key_ports ports;
1: -	struct flow_dissector_key_icmp icmp;
1: -	struct flow_dissector_key_addrs addrs;
1: -	int: 32;
1: +  struct flow_dissector_key_control control;
1: +  struct flow_dissector_key_basic basic;
1: +  struct flow_dissector_key_tags tags;
1: +  struct flow_dissector_key_vlan vlan;
1: +  struct flow_dissector_key_vlan cvlan;
1: +  struct flow_dissector_key_keyid keyid;
1: +  struct flow_dissector_key_ports ports;
1: +  struct flow_dissector_key_icmp icmp;
1: +  struct flow_dissector_key_addrs addrs;
1: +  int : 32;
1:  };
1:  
1:  struct flow_keys_digest {
1: -	u8 data[16];
1: +  u8 data[16];
1:  };
1:  
1:  enum bpf_ret_code {
1: -	BPF_OK = 0,
1: -	BPF_DROP = 2,
1: -	BPF_REDIRECT = 7,
1: -	BPF_LWT_REROUTE = 128,
1: +  BPF_OK = 0,
1: +  BPF_DROP = 2,
1: +  BPF_REDIRECT = 7,
1: +  BPF_LWT_REROUTE = 128,
1:  };
1:  
1:  enum {
1: -	BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG = 1,
1: -	BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL = 2,
1: -	BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP = 4,
1: +  BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG = 1,
1: +  BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL = 2,
1: +  BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP = 4,
1:  };
1:  
1:  union tcp_word_hdr {
1: -	struct tcphdr hdr;
1: -	__be32 words[5];
1: +  struct tcphdr hdr;
1: +  __be32 words[5];
1:  };
1:  
1:  struct gre_base_hdr {
1: -	__be16 flags;
1: -	__be16 protocol;
1: +  __be16 flags;
1: +  __be16 protocol;
1:  };
1:  
1:  struct gre_full_hdr {
1: -	struct gre_base_hdr fixed_header;
1: -	__be16 csum;
1: -	__be16 reserved1;
1: -	__be32 key;
1: -	__be32 seq;
1: +  struct gre_base_hdr fixed_header;
1: +  __be16 csum;
1: +  __be16 reserved1;
1: +  __be32 key;
1: +  __be32 seq;
1:  };
1:  
1:  struct pptp_gre_header {
1: -	struct gre_base_hdr gre_hd;
1: -	__be16 payload_len;
1: -	__be16 call_id;
1: -	__be32 seq;
1: -	__be32 ack;
1: +  struct gre_base_hdr gre_hd;
1: +  __be16 payload_len;
1: +  __be16 call_id;
1: +  __be32 seq;
1: +  __be32 ack;
1:  };
1:  
1:  struct tipc_basic_hdr {
1: -	__be32 w[4];
1: +  __be32 w[4];
1:  };
1:  
1:  struct icmphdr {
1: -	__u8 type;
1: -	__u8 code;
1: -	__sum16 checksum;
1: -	union {
1: -		struct {
1: -			__be16 id;
1: -			__be16 sequence;
1: -		} echo;
1: -		__be32 gateway;
1: -		struct {
1: -			__be16 __unused;
1: -			__be16 mtu;
1: -		} frag;
1: -		__u8 reserved[4];
1: -	} un;
1: +  __u8 type;
1: +  __u8 code;
1: +  __sum16 checksum;
1: +  union {
1: +    struct {
1: +      __be16 id;
1: +      __be16 sequence;
1: +    } echo;
1: +    __be32 gateway;
1: +    struct {
1: +      __be16 __unused;
1: +      __be16 mtu;
1: +    } frag;
1: +    __u8 reserved[4];
1: +  } un;
1:  };
1:  
1:  enum l2tp_debug_flags {
1: -	L2TP_MSG_DEBUG = 1,
1: -	L2TP_MSG_CONTROL = 2,
1: -	L2TP_MSG_SEQ = 4,
1: -	L2TP_MSG_DATA = 8,
1: +  L2TP_MSG_DEBUG = 1,
1: +  L2TP_MSG_CONTROL = 2,
1: +  L2TP_MSG_SEQ = 4,
1: +  L2TP_MSG_DATA = 8,
1:  };
1:  
1:  struct pppoe_tag {
1: -	__be16 tag_type;
1: -	__be16 tag_len;
1: -	char tag_data[0];
1: +  __be16 tag_type;
1: +  __be16 tag_len;
1: +  char tag_data[0];
1:  };
1:  
1:  struct pppoe_hdr {
1: -	__u8 type: 4;
1: -	__u8 ver: 4;
1: -	__u8 code;
1: -	__be16 sid;
1: -	__be16 length;
1: -	struct pppoe_tag tag[0];
1: +  __u8 type : 4;
1: +  __u8 ver : 4;
1: +  __u8 code;
1: +  __be16 sid;
1: +  __be16 length;
1: +  struct pppoe_tag tag[0];
1:  };
1:  
1:  struct mpls_label {
1: -	__be32 entry;
1: +  __be32 entry;
1:  };
1:  
1:  enum batadv_packettype {
1: -	BATADV_IV_OGM = 0,
1: -	BATADV_BCAST = 1,
1: -	BATADV_CODED = 2,
1: -	BATADV_ELP = 3,
1: -	BATADV_OGM2 = 4,
1: -	BATADV_UNICAST = 64,
1: -	BATADV_UNICAST_FRAG = 65,
1: -	BATADV_UNICAST_4ADDR = 66,
1: -	BATADV_ICMP = 67,
1: -	BATADV_UNICAST_TVLV = 68,
1: +  BATADV_IV_OGM = 0,
1: +  BATADV_BCAST = 1,
1: +  BATADV_CODED = 2,
1: +  BATADV_ELP = 3,
1: +  BATADV_OGM2 = 4,
1: +  BATADV_UNICAST = 64,
1: +  BATADV_UNICAST_FRAG = 65,
1: +  BATADV_UNICAST_4ADDR = 66,
1: +  BATADV_ICMP = 67,
1: +  BATADV_UNICAST_TVLV = 68,
1:  };
1:  
1:  struct batadv_unicast_packet {
1: -	__u8 packet_type;
1: -	__u8 version;
1: -	__u8 ttl;
1: -	__u8 ttvn;
1: -	__u8 dest[6];
1: +  __u8 packet_type;
1: +  __u8 version;
1: +  __u8 ttl;
1: +  __u8 ttvn;
1: +  __u8 dest[6];
1:  };
1:  
1:  struct _flow_keys_digest_data {
1: -	__be16 n_proto;
1: -	u8 ip_proto;
1: -	u8 padding;
1: -	__be32 ports;
1: -	__be32 src;
1: -	__be32 dst;
1: +  __be16 n_proto;
1: +  u8 ip_proto;
1: +  u8 padding;
1: +  __be32 ports;
1: +  __be32 src;
1: +  __be32 dst;
1:  };
1:  
1:  enum {
1: -	IF_OPER_UNKNOWN = 0,
1: -	IF_OPER_NOTPRESENT = 1,
1: -	IF_OPER_DOWN = 2,
1: -	IF_OPER_LOWERLAYERDOWN = 3,
1: -	IF_OPER_TESTING = 4,
1: -	IF_OPER_DORMANT = 5,
1: -	IF_OPER_UP = 6,
1: +  IF_OPER_UNKNOWN = 0,
1: +  IF_OPER_NOTPRESENT = 1,
1: +  IF_OPER_DOWN = 2,
1: +  IF_OPER_LOWERLAYERDOWN = 3,
1: +  IF_OPER_TESTING = 4,
1: +  IF_OPER_DORMANT = 5,
1: +  IF_OPER_UP = 6,
1:  };
1:  
1:  enum nf_dev_hooks {
1: -	NF_NETDEV_INGRESS = 0,
1: -	NF_NETDEV_NUMHOOKS = 1,
1: +  NF_NETDEV_INGRESS = 0,
1: +  NF_NETDEV_NUMHOOKS = 1,
1:  };
1:  
1:  struct netdev_boot_setup {
1: -	char name[16];
1: -	struct ifmap map;
1: +  char name[16];
1: +  struct ifmap map;
1:  };
1:  
1:  enum gro_result {
1: -	GRO_MERGED = 0,
1: -	GRO_MERGED_FREE = 1,
1: -	GRO_HELD = 2,
1: -	GRO_NORMAL = 3,
1: -	GRO_DROP = 4,
1: -	GRO_CONSUMED = 5,
1: +  GRO_MERGED = 0,
1: +  GRO_MERGED_FREE = 1,
1: +  GRO_HELD = 2,
1: +  GRO_NORMAL = 3,
1: +  GRO_DROP = 4,
1: +  GRO_CONSUMED = 5,
1:  };
1:  
1:  typedef enum gro_result gro_result_t;
1:  
1:  struct bpf_xdp_link {
1: -	struct bpf_link link;
1: -	struct net_device *dev;
1: -	int flags;
1: +  struct bpf_link link;
1: +  struct net_device *dev;
1: +  int flags;
1:  };
1:  
1:  struct netdev_net_notifier {
1: -	struct list_head list;
1: -	struct notifier_block *nb;
1: +  struct list_head list;
1: +  struct notifier_block *nb;
1:  };
1:  
1:  struct packet_type {
1: -	__be16 type;
1: -	bool ignore_outgoing;
1: -	struct net_device *dev;
1: -	int (*func)(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
1: -	void (*list_func)(struct list_head *, struct packet_type *, struct net_device *);
1: -	bool (*id_match)(struct packet_type *, struct sock *);
1: -	void *af_packet_priv;
1: -	struct list_head list;
1: +  __be16 type;
1: +  bool ignore_outgoing;
1: +  struct net_device *dev;
1: +  int (*func)(struct sk_buff *, struct net_device *, struct packet_type *,
1: +              struct net_device *);
1: +  void (*list_func)(struct list_head *, struct packet_type *,
1: +                    struct net_device *);
1: +  bool (*id_match)(struct packet_type *, struct sock *);
1: +  void *af_packet_priv;
1: +  struct list_head list;
1:  };
1:  
1:  struct offload_callbacks {
1: -	struct sk_buff * (*gso_segment)(struct sk_buff *, netdev_features_t);
1: -	struct sk_buff * (*gro_receive)(struct list_head *, struct sk_buff *);
1: -	int (*gro_complete)(struct sk_buff *, int);
1: +  struct sk_buff *(*gso_segment)(struct sk_buff *, netdev_features_t);
1: +  struct sk_buff *(*gro_receive)(struct list_head *, struct sk_buff *);
1: +  int (*gro_complete)(struct sk_buff *, int);
1:  };
1:  
1:  struct packet_offload {
1: -	__be16 type;
1: -	u16 priority;
1: -	struct offload_callbacks callbacks;
1: -	struct list_head list;
1: +  __be16 type;
1: +  u16 priority;
1: +  struct offload_callbacks callbacks;
1: +  struct list_head list;
1:  };
1:  
1:  struct netdev_notifier_info_ext {
1: -	struct netdev_notifier_info info;
1: -	union {
1: -		u32 mtu;
1: -	} ext;
1: +  struct netdev_notifier_info info;
1: +  union {
1: +    u32 mtu;
1: +  } ext;
1:  };
1:  
1:  struct netdev_notifier_change_info {
1: -	struct netdev_notifier_info info;
1: -	unsigned int flags_changed;
1: +  struct netdev_notifier_info info;
1: +  unsigned int flags_changed;
1:  };
1:  
1:  struct netdev_notifier_changeupper_info {
1: -	struct netdev_notifier_info info;
1: -	struct net_device *upper_dev;
1: -	bool master;
1: -	bool linking;
1: -	void *upper_info;
1: +  struct netdev_notifier_info info;
1: +  struct net_device *upper_dev;
1: +  bool master;
1: +  bool linking;
1: +  void *upper_info;
1:  };
1:  
1:  struct netdev_notifier_changelowerstate_info {
1: -	struct netdev_notifier_info info;
1: -	void *lower_state_info;
1: +  struct netdev_notifier_info info;
1: +  void *lower_state_info;
1:  };
1:  
1:  struct netdev_notifier_pre_changeaddr_info {
1: -	struct netdev_notifier_info info;
1: -	const unsigned char *dev_addr;
1: +  struct netdev_notifier_info info;
1: +  const unsigned char *dev_addr;
1:  };
1:  
1:  typedef int (*bpf_op_t)(struct net_device *, struct netdev_bpf *);
1:  
1:  enum {
1: -	NESTED_SYNC_IMM_BIT = 0,
1: -	NESTED_SYNC_TODO_BIT = 1,
1: +  NESTED_SYNC_IMM_BIT = 0,
1: +  NESTED_SYNC_TODO_BIT = 1,
1:  };
1:  
1:  enum qdisc_state_t {
1: -	__QDISC_STATE_SCHED = 0,
1: -	__QDISC_STATE_DEACTIVATED = 1,
1: -};
1: -
1: -enum {
1: -	IPV4_DEVCONF_FORWARDING = 1,
1: -	IPV4_DEVCONF_MC_FORWARDING = 2,
1: -	IPV4_DEVCONF_PROXY_ARP = 3,
1: -	IPV4_DEVCONF_ACCEPT_REDIRECTS = 4,
1: -	IPV4_DEVCONF_SECURE_REDIRECTS = 5,
1: -	IPV4_DEVCONF_SEND_REDIRECTS = 6,
1: -	IPV4_DEVCONF_SHARED_MEDIA = 7,
1: -	IPV4_DEVCONF_RP_FILTER = 8,
1: -	IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE = 9,
1: -	IPV4_DEVCONF_BOOTP_RELAY = 10,
1: -	IPV4_DEVCONF_LOG_MARTIANS = 11,
1: -	IPV4_DEVCONF_TAG = 12,
1: -	IPV4_DEVCONF_ARPFILTER = 13,
1: -	IPV4_DEVCONF_MEDIUM_ID = 14,
1: -	IPV4_DEVCONF_NOXFRM = 15,
1: -	IPV4_DEVCONF_NOPOLICY = 16,
1: -	IPV4_DEVCONF_FORCE_IGMP_VERSION = 17,
1: -	IPV4_DEVCONF_ARP_ANNOUNCE = 18,
1: -	IPV4_DEVCONF_ARP_IGNORE = 19,
1: -	IPV4_DEVCONF_PROMOTE_SECONDARIES = 20,
1: -	IPV4_DEVCONF_ARP_ACCEPT = 21,
1: -	IPV4_DEVCONF_ARP_NOTIFY = 22,
1: -	IPV4_DEVCONF_ACCEPT_LOCAL = 23,
1: -	IPV4_DEVCONF_SRC_VMARK = 24,
1: -	IPV4_DEVCONF_PROXY_ARP_PVLAN = 25,
1: -	IPV4_DEVCONF_ROUTE_LOCALNET = 26,
1: -	IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL = 27,
1: -	IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL = 28,
1: -	IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN = 29,
1: -	IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST = 30,
1: -	IPV4_DEVCONF_DROP_GRATUITOUS_ARP = 31,
1: -	IPV4_DEVCONF_BC_FORWARDING = 32,
1: -	__IPV4_DEVCONF_MAX = 33,
1: +  __QDISC_STATE_SCHED = 0,
1: +  __QDISC_STATE_DEACTIVATED = 1,
1: +};
1: +
1: +enum {
1: +  IPV4_DEVCONF_FORWARDING = 1,
1: +  IPV4_DEVCONF_MC_FORWARDING = 2,
1: +  IPV4_DEVCONF_PROXY_ARP = 3,
1: +  IPV4_DEVCONF_ACCEPT_REDIRECTS = 4,
1: +  IPV4_DEVCONF_SECURE_REDIRECTS = 5,
1: +  IPV4_DEVCONF_SEND_REDIRECTS = 6,
1: +  IPV4_DEVCONF_SHARED_MEDIA = 7,
1: +  IPV4_DEVCONF_RP_FILTER = 8,
1: +  IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE = 9,
1: +  IPV4_DEVCONF_BOOTP_RELAY = 10,
1: +  IPV4_DEVCONF_LOG_MARTIANS = 11,
1: +  IPV4_DEVCONF_TAG = 12,
1: +  IPV4_DEVCONF_ARPFILTER = 13,
1: +  IPV4_DEVCONF_MEDIUM_ID = 14,
1: +  IPV4_DEVCONF_NOXFRM = 15,
1: +  IPV4_DEVCONF_NOPOLICY = 16,
1: +  IPV4_DEVCONF_FORCE_IGMP_VERSION = 17,
1: +  IPV4_DEVCONF_ARP_ANNOUNCE = 18,
1: +  IPV4_DEVCONF_ARP_IGNORE = 19,
1: +  IPV4_DEVCONF_PROMOTE_SECONDARIES = 20,
1: +  IPV4_DEVCONF_ARP_ACCEPT = 21,
1: +  IPV4_DEVCONF_ARP_NOTIFY = 22,
1: +  IPV4_DEVCONF_ACCEPT_LOCAL = 23,
1: +  IPV4_DEVCONF_SRC_VMARK = 24,
1: +  IPV4_DEVCONF_PROXY_ARP_PVLAN = 25,
1: +  IPV4_DEVCONF_ROUTE_LOCALNET = 26,
1: +  IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL = 27,
1: +  IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL = 28,
1: +  IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN = 29,
1: +  IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST = 30,
1: +  IPV4_DEVCONF_DROP_GRATUITOUS_ARP = 31,
1: +  IPV4_DEVCONF_BC_FORWARDING = 32,
1: +  __IPV4_DEVCONF_MAX = 33,
1:  };
1:  
1:  struct dev_kfree_skb_cb {
1: -	enum skb_free_reason reason;
1: +  enum skb_free_reason reason;
1:  };
1:  
1:  struct netdev_adjacent {
1: -	struct net_device *dev;
1: -	bool master;
1: -	bool ignore;
1: -	u16 ref_nr;
1: -	void *private;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  struct net_device *dev;
1: +  bool master;
1: +  bool ignore;
1: +  u16 ref_nr;
1: +  void *private;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct xfrm_dst {
1: -	union {
1: -		struct dst_entry dst;
1: -		struct rtable rt;
1: -		struct rt6_info rt6;
1: -	} u;
1: -	struct dst_entry *route;
1: -	struct dst_entry *child;
1: -	struct dst_entry *path;
1: -	struct xfrm_policy *pols[2];
1: -	int num_pols;
1: -	int num_xfrms;
1: -	u32 xfrm_genid;
1: -	u32 policy_genid;
1: -	u32 route_mtu_cached;
1: -	u32 child_mtu_cached;
1: -	u32 route_cookie;
1: -	u32 path_cookie;
1: +  union {
1: +    struct dst_entry dst;
1: +    struct rtable rt;
1: +    struct rt6_info rt6;
1: +  } u;
1: +  struct dst_entry *route;
1: +  struct dst_entry *child;
1: +  struct dst_entry *path;
1: +  struct xfrm_policy *pols[2];
1: +  int num_pols;
1: +  int num_xfrms;
1: +  u32 xfrm_genid;
1: +  u32 policy_genid;
1: +  u32 route_mtu_cached;
1: +  u32 child_mtu_cached;
1: +  u32 route_cookie;
1: +  u32 path_cookie;
1:  };
1:  
1:  struct ndt_stats {
1: -	__u64 ndts_allocs;
1: -	__u64 ndts_destroys;
1: -	__u64 ndts_hash_grows;
1: -	__u64 ndts_res_failed;
1: -	__u64 ndts_lookups;
1: -	__u64 ndts_hits;
1: -	__u64 ndts_rcv_probes_mcast;
1: -	__u64 ndts_rcv_probes_ucast;
1: -	__u64 ndts_periodic_gc_runs;
1: -	__u64 ndts_forced_gc_runs;
1: -	__u64 ndts_table_fulls;
1: -};
1: -
1: -enum {
1: -	NDTPA_UNSPEC = 0,
1: -	NDTPA_IFINDEX = 1,
1: -	NDTPA_REFCNT = 2,
1: -	NDTPA_REACHABLE_TIME = 3,
1: -	NDTPA_BASE_REACHABLE_TIME = 4,
1: -	NDTPA_RETRANS_TIME = 5,
1: -	NDTPA_GC_STALETIME = 6,
1: -	NDTPA_DELAY_PROBE_TIME = 7,
1: -	NDTPA_QUEUE_LEN = 8,
1: -	NDTPA_APP_PROBES = 9,
1: -	NDTPA_UCAST_PROBES = 10,
1: -	NDTPA_MCAST_PROBES = 11,
1: -	NDTPA_ANYCAST_DELAY = 12,
1: -	NDTPA_PROXY_DELAY = 13,
1: -	NDTPA_PROXY_QLEN = 14,
1: -	NDTPA_LOCKTIME = 15,
1: -	NDTPA_QUEUE_LENBYTES = 16,
1: -	NDTPA_MCAST_REPROBES = 17,
1: -	NDTPA_PAD = 18,
1: -	__NDTPA_MAX = 19,
1: +  __u64 ndts_allocs;
1: +  __u64 ndts_destroys;
1: +  __u64 ndts_hash_grows;
1: +  __u64 ndts_res_failed;
1: +  __u64 ndts_lookups;
1: +  __u64 ndts_hits;
1: +  __u64 ndts_rcv_probes_mcast;
1: +  __u64 ndts_rcv_probes_ucast;
1: +  __u64 ndts_periodic_gc_runs;
1: +  __u64 ndts_forced_gc_runs;
1: +  __u64 ndts_table_fulls;
1: +};
1: +
1: +enum {
1: +  NDTPA_UNSPEC = 0,
1: +  NDTPA_IFINDEX = 1,
1: +  NDTPA_REFCNT = 2,
1: +  NDTPA_REACHABLE_TIME = 3,
1: +  NDTPA_BASE_REACHABLE_TIME = 4,
1: +  NDTPA_RETRANS_TIME = 5,
1: +  NDTPA_GC_STALETIME = 6,
1: +  NDTPA_DELAY_PROBE_TIME = 7,
1: +  NDTPA_QUEUE_LEN = 8,
1: +  NDTPA_APP_PROBES = 9,
1: +  NDTPA_UCAST_PROBES = 10,
1: +  NDTPA_MCAST_PROBES = 11,
1: +  NDTPA_ANYCAST_DELAY = 12,
1: +  NDTPA_PROXY_DELAY = 13,
1: +  NDTPA_PROXY_QLEN = 14,
1: +  NDTPA_LOCKTIME = 15,
1: +  NDTPA_QUEUE_LENBYTES = 16,
1: +  NDTPA_MCAST_REPROBES = 17,
1: +  NDTPA_PAD = 18,
1: +  __NDTPA_MAX = 19,
1:  };
1:  
1:  struct ndtmsg {
1: -	__u8 ndtm_family;
1: -	__u8 ndtm_pad1;
1: -	__u16 ndtm_pad2;
1: +  __u8 ndtm_family;
1: +  __u8 ndtm_pad1;
1: +  __u16 ndtm_pad2;
1:  };
1:  
1:  struct ndt_config {
1: -	__u16 ndtc_key_len;
1: -	__u16 ndtc_entry_size;
1: -	__u32 ndtc_entries;
1: -	__u32 ndtc_last_flush;
1: -	__u32 ndtc_last_rand;
1: -	__u32 ndtc_hash_rnd;
1: -	__u32 ndtc_hash_mask;
1: -	__u32 ndtc_hash_chain_gc;
1: -	__u32 ndtc_proxy_qlen;
1: +  __u16 ndtc_key_len;
1: +  __u16 ndtc_entry_size;
1: +  __u32 ndtc_entries;
1: +  __u32 ndtc_last_flush;
1: +  __u32 ndtc_last_rand;
1: +  __u32 ndtc_hash_rnd;
1: +  __u32 ndtc_hash_mask;
1: +  __u32 ndtc_hash_chain_gc;
1: +  __u32 ndtc_proxy_qlen;
1:  };
1:  
1:  enum {
1: -	NDTA_UNSPEC = 0,
1: -	NDTA_NAME = 1,
1: -	NDTA_THRESH1 = 2,
1: -	NDTA_THRESH2 = 3,
1: -	NDTA_THRESH3 = 4,
1: -	NDTA_CONFIG = 5,
1: -	NDTA_PARMS = 6,
1: -	NDTA_STATS = 7,
1: -	NDTA_GC_INTERVAL = 8,
1: -	NDTA_PAD = 9,
1: -	__NDTA_MAX = 10,
1: +  NDTA_UNSPEC = 0,
1: +  NDTA_NAME = 1,
1: +  NDTA_THRESH1 = 2,
1: +  NDTA_THRESH2 = 3,
1: +  NDTA_THRESH3 = 4,
1: +  NDTA_CONFIG = 5,
1: +  NDTA_PARMS = 6,
1: +  NDTA_STATS = 7,
1: +  NDTA_GC_INTERVAL = 8,
1: +  NDTA_PAD = 9,
1: +  __NDTA_MAX = 10,
1:  };
1:  
1:  enum {
1: -	NEIGH_ARP_TABLE = 0,
1: -	NEIGH_ND_TABLE = 1,
1: -	NEIGH_DN_TABLE = 2,
1: -	NEIGH_NR_TABLES = 3,
1: -	NEIGH_LINK_TABLE = 3,
1: +  NEIGH_ARP_TABLE = 0,
1: +  NEIGH_ND_TABLE = 1,
1: +  NEIGH_DN_TABLE = 2,
1: +  NEIGH_NR_TABLES = 3,
1: +  NEIGH_LINK_TABLE = 3,
1:  };
1:  
1:  struct neigh_seq_state {
1: -	struct seq_net_private p;
1: -	struct neigh_table *tbl;
1: -	struct neigh_hash_table *nht;
1: -	void * (*neigh_sub_iter)(struct neigh_seq_state *, struct neighbour *, loff_t *);
1: -	unsigned int bucket;
1: -	unsigned int flags;
1: +  struct seq_net_private p;
1: +  struct neigh_table *tbl;
1: +  struct neigh_hash_table *nht;
1: +  void *(*neigh_sub_iter)(struct neigh_seq_state *, struct neighbour *,
1: +                          loff_t *);
1: +  unsigned int bucket;
1: +  unsigned int flags;
1:  };
1:  
1:  struct neighbour_cb {
1: -	long unsigned int sched_next;
1: -	unsigned int flags;
1: +  long unsigned int sched_next;
1: +  unsigned int flags;
1:  };
1:  
1:  enum netevent_notif_type {
1: -	NETEVENT_NEIGH_UPDATE = 1,
1: -	NETEVENT_REDIRECT = 2,
1: -	NETEVENT_DELAY_PROBE_TIME_UPDATE = 3,
1: -	NETEVENT_IPV4_MPATH_HASH_UPDATE = 4,
1: -	NETEVENT_IPV6_MPATH_HASH_UPDATE = 5,
1: -	NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE = 6,
1: +  NETEVENT_NEIGH_UPDATE = 1,
1: +  NETEVENT_REDIRECT = 2,
1: +  NETEVENT_DELAY_PROBE_TIME_UPDATE = 3,
1: +  NETEVENT_IPV4_MPATH_HASH_UPDATE = 4,
1: +  NETEVENT_IPV6_MPATH_HASH_UPDATE = 5,
1: +  NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE = 6,
1:  };
1:  
1:  struct neigh_dump_filter {
1: -	int master_idx;
1: -	int dev_idx;
1: +  int master_idx;
1: +  int dev_idx;
1:  };
1:  
1:  struct neigh_sysctl_table {
1: -	struct ctl_table_header *sysctl_header;
1: -	struct ctl_table neigh_vars[21];
1: +  struct ctl_table_header *sysctl_header;
1: +  struct ctl_table neigh_vars[21];
1:  };
1:  
1:  struct netlink_dump_control {
1: -	int (*start)(struct netlink_callback *);
1: -	int (*dump)(struct sk_buff *, struct netlink_callback *);
1: -	int (*done)(struct netlink_callback *);
1: -	void *data;
1: -	struct module *module;
1: -	u32 min_dump_alloc;
1: +  int (*start)(struct netlink_callback *);
1: +  int (*dump)(struct sk_buff *, struct netlink_callback *);
1: +  int (*done)(struct netlink_callback *);
1: +  void *data;
1: +  struct module *module;
1: +  u32 min_dump_alloc;
1:  };
1:  
1:  struct rtnl_link_stats {
1: -	__u32 rx_packets;
1: -	__u32 tx_packets;
1: -	__u32 rx_bytes;
1: -	__u32 tx_bytes;
1: -	__u32 rx_errors;
1: -	__u32 tx_errors;
1: -	__u32 rx_dropped;
1: -	__u32 tx_dropped;
1: -	__u32 multicast;
1: -	__u32 collisions;
1: -	__u32 rx_length_errors;
1: -	__u32 rx_over_errors;
1: -	__u32 rx_crc_errors;
1: -	__u32 rx_frame_errors;
1: -	__u32 rx_fifo_errors;
1: -	__u32 rx_missed_errors;
1: -	__u32 tx_aborted_errors;
1: -	__u32 tx_carrier_errors;
1: -	__u32 tx_fifo_errors;
1: -	__u32 tx_heartbeat_errors;
1: -	__u32 tx_window_errors;
1: -	__u32 rx_compressed;
1: -	__u32 tx_compressed;
1: -	__u32 rx_nohandler;
1: +  __u32 rx_packets;
1: +  __u32 tx_packets;
1: +  __u32 rx_bytes;
1: +  __u32 tx_bytes;
1: +  __u32 rx_errors;
1: +  __u32 tx_errors;
1: +  __u32 rx_dropped;
1: +  __u32 tx_dropped;
1: +  __u32 multicast;
1: +  __u32 collisions;
1: +  __u32 rx_length_errors;
1: +  __u32 rx_over_errors;
1: +  __u32 rx_crc_errors;
1: +  __u32 rx_frame_errors;
1: +  __u32 rx_fifo_errors;
1: +  __u32 rx_missed_errors;
1: +  __u32 tx_aborted_errors;
1: +  __u32 tx_carrier_errors;
1: +  __u32 tx_fifo_errors;
1: +  __u32 tx_heartbeat_errors;
1: +  __u32 tx_window_errors;
1: +  __u32 rx_compressed;
1: +  __u32 tx_compressed;
1: +  __u32 rx_nohandler;
1:  };
1:  
1:  struct rtnl_link_ifmap {
1: -	__u64 mem_start;
1: -	__u64 mem_end;
1: -	__u64 base_addr;
1: -	__u16 irq;
1: -	__u8 dma;
1: -	__u8 port;
1: -};
1: -
1: -enum {
1: -	IFLA_PROTO_DOWN_REASON_UNSPEC = 0,
1: -	IFLA_PROTO_DOWN_REASON_MASK = 1,
1: -	IFLA_PROTO_DOWN_REASON_VALUE = 2,
1: -	__IFLA_PROTO_DOWN_REASON_CNT = 3,
1: -	IFLA_PROTO_DOWN_REASON_MAX = 2,
1: -};
1: -
1: -enum {
1: -	IFLA_BRPORT_UNSPEC = 0,
1: -	IFLA_BRPORT_STATE = 1,
1: -	IFLA_BRPORT_PRIORITY = 2,
1: -	IFLA_BRPORT_COST = 3,
1: -	IFLA_BRPORT_MODE = 4,
1: -	IFLA_BRPORT_GUARD = 5,
1: -	IFLA_BRPORT_PROTECT = 6,
1: -	IFLA_BRPORT_FAST_LEAVE = 7,
1: -	IFLA_BRPORT_LEARNING = 8,
1: -	IFLA_BRPORT_UNICAST_FLOOD = 9,
1: -	IFLA_BRPORT_PROXYARP = 10,
1: -	IFLA_BRPORT_LEARNING_SYNC = 11,
1: -	IFLA_BRPORT_PROXYARP_WIFI = 12,
1: -	IFLA_BRPORT_ROOT_ID = 13,
1: -	IFLA_BRPORT_BRIDGE_ID = 14,
1: -	IFLA_BRPORT_DESIGNATED_PORT = 15,
1: -	IFLA_BRPORT_DESIGNATED_COST = 16,
1: -	IFLA_BRPORT_ID = 17,
1: -	IFLA_BRPORT_NO = 18,
1: -	IFLA_BRPORT_TOPOLOGY_CHANGE_ACK = 19,
1: -	IFLA_BRPORT_CONFIG_PENDING = 20,
1: -	IFLA_BRPORT_MESSAGE_AGE_TIMER = 21,
1: -	IFLA_BRPORT_FORWARD_DELAY_TIMER = 22,
1: -	IFLA_BRPORT_HOLD_TIMER = 23,
1: -	IFLA_BRPORT_FLUSH = 24,
1: -	IFLA_BRPORT_MULTICAST_ROUTER = 25,
1: -	IFLA_BRPORT_PAD = 26,
1: -	IFLA_BRPORT_MCAST_FLOOD = 27,
1: -	IFLA_BRPORT_MCAST_TO_UCAST = 28,
1: -	IFLA_BRPORT_VLAN_TUNNEL = 29,
1: -	IFLA_BRPORT_BCAST_FLOOD = 30,
1: -	IFLA_BRPORT_GROUP_FWD_MASK = 31,
1: -	IFLA_BRPORT_NEIGH_SUPPRESS = 32,
1: -	IFLA_BRPORT_ISOLATED = 33,
1: -	IFLA_BRPORT_BACKUP_PORT = 34,
1: -	IFLA_BRPORT_MRP_RING_OPEN = 35,
1: -	IFLA_BRPORT_MRP_IN_OPEN = 36,
1: -	__IFLA_BRPORT_MAX = 37,
1: -};
1: -
1: -enum {
1: -	IFLA_INFO_UNSPEC = 0,
1: -	IFLA_INFO_KIND = 1,
1: -	IFLA_INFO_DATA = 2,
1: -	IFLA_INFO_XSTATS = 3,
1: -	IFLA_INFO_SLAVE_KIND = 4,
1: -	IFLA_INFO_SLAVE_DATA = 5,
1: -	__IFLA_INFO_MAX = 6,
1: -};
1: -
1: -enum {
1: -	IFLA_VF_INFO_UNSPEC = 0,
1: -	IFLA_VF_INFO = 1,
1: -	__IFLA_VF_INFO_MAX = 2,
1: -};
1: -
1: -enum {
1: -	IFLA_VF_UNSPEC = 0,
1: -	IFLA_VF_MAC = 1,
1: -	IFLA_VF_VLAN = 2,
1: -	IFLA_VF_TX_RATE = 3,
1: -	IFLA_VF_SPOOFCHK = 4,
1: -	IFLA_VF_LINK_STATE = 5,
1: -	IFLA_VF_RATE = 6,
1: -	IFLA_VF_RSS_QUERY_EN = 7,
1: -	IFLA_VF_STATS = 8,
1: -	IFLA_VF_TRUST = 9,
1: -	IFLA_VF_IB_NODE_GUID = 10,
1: -	IFLA_VF_IB_PORT_GUID = 11,
1: -	IFLA_VF_VLAN_LIST = 12,
1: -	IFLA_VF_BROADCAST = 13,
1: -	__IFLA_VF_MAX = 14,
1: +  __u64 mem_start;
1: +  __u64 mem_end;
1: +  __u64 base_addr;
1: +  __u16 irq;
1: +  __u8 dma;
1: +  __u8 port;
1: +};
1: +
1: +enum {
1: +  IFLA_PROTO_DOWN_REASON_UNSPEC = 0,
1: +  IFLA_PROTO_DOWN_REASON_MASK = 1,
1: +  IFLA_PROTO_DOWN_REASON_VALUE = 2,
1: +  __IFLA_PROTO_DOWN_REASON_CNT = 3,
1: +  IFLA_PROTO_DOWN_REASON_MAX = 2,
1: +};
1: +
1: +enum {
1: +  IFLA_BRPORT_UNSPEC = 0,
1: +  IFLA_BRPORT_STATE = 1,
1: +  IFLA_BRPORT_PRIORITY = 2,
1: +  IFLA_BRPORT_COST = 3,
1: +  IFLA_BRPORT_MODE = 4,
1: +  IFLA_BRPORT_GUARD = 5,
1: +  IFLA_BRPORT_PROTECT = 6,
1: +  IFLA_BRPORT_FAST_LEAVE = 7,
1: +  IFLA_BRPORT_LEARNING = 8,
1: +  IFLA_BRPORT_UNICAST_FLOOD = 9,
1: +  IFLA_BRPORT_PROXYARP = 10,
1: +  IFLA_BRPORT_LEARNING_SYNC = 11,
1: +  IFLA_BRPORT_PROXYARP_WIFI = 12,
1: +  IFLA_BRPORT_ROOT_ID = 13,
1: +  IFLA_BRPORT_BRIDGE_ID = 14,
1: +  IFLA_BRPORT_DESIGNATED_PORT = 15,
1: +  IFLA_BRPORT_DESIGNATED_COST = 16,
1: +  IFLA_BRPORT_ID = 17,
1: +  IFLA_BRPORT_NO = 18,
1: +  IFLA_BRPORT_TOPOLOGY_CHANGE_ACK = 19,
1: +  IFLA_BRPORT_CONFIG_PENDING = 20,
1: +  IFLA_BRPORT_MESSAGE_AGE_TIMER = 21,
1: +  IFLA_BRPORT_FORWARD_DELAY_TIMER = 22,
1: +  IFLA_BRPORT_HOLD_TIMER = 23,
1: +  IFLA_BRPORT_FLUSH = 24,
1: +  IFLA_BRPORT_MULTICAST_ROUTER = 25,
1: +  IFLA_BRPORT_PAD = 26,
1: +  IFLA_BRPORT_MCAST_FLOOD = 27,
1: +  IFLA_BRPORT_MCAST_TO_UCAST = 28,
1: +  IFLA_BRPORT_VLAN_TUNNEL = 29,
1: +  IFLA_BRPORT_BCAST_FLOOD = 30,
1: +  IFLA_BRPORT_GROUP_FWD_MASK = 31,
1: +  IFLA_BRPORT_NEIGH_SUPPRESS = 32,
1: +  IFLA_BRPORT_ISOLATED = 33,
1: +  IFLA_BRPORT_BACKUP_PORT = 34,
1: +  IFLA_BRPORT_MRP_RING_OPEN = 35,
1: +  IFLA_BRPORT_MRP_IN_OPEN = 36,
1: +  __IFLA_BRPORT_MAX = 37,
1: +};
1: +
1: +enum {
1: +  IFLA_INFO_UNSPEC = 0,
1: +  IFLA_INFO_KIND = 1,
1: +  IFLA_INFO_DATA = 2,
1: +  IFLA_INFO_XSTATS = 3,
1: +  IFLA_INFO_SLAVE_KIND = 4,
1: +  IFLA_INFO_SLAVE_DATA = 5,
1: +  __IFLA_INFO_MAX = 6,
1: +};
1: +
1: +enum {
1: +  IFLA_VF_INFO_UNSPEC = 0,
1: +  IFLA_VF_INFO = 1,
1: +  __IFLA_VF_INFO_MAX = 2,
1: +};
1: +
1: +enum {
1: +  IFLA_VF_UNSPEC = 0,
1: +  IFLA_VF_MAC = 1,
1: +  IFLA_VF_VLAN = 2,
1: +  IFLA_VF_TX_RATE = 3,
1: +  IFLA_VF_SPOOFCHK = 4,
1: +  IFLA_VF_LINK_STATE = 5,
1: +  IFLA_VF_RATE = 6,
1: +  IFLA_VF_RSS_QUERY_EN = 7,
1: +  IFLA_VF_STATS = 8,
1: +  IFLA_VF_TRUST = 9,
1: +  IFLA_VF_IB_NODE_GUID = 10,
1: +  IFLA_VF_IB_PORT_GUID = 11,
1: +  IFLA_VF_VLAN_LIST = 12,
1: +  IFLA_VF_BROADCAST = 13,
1: +  __IFLA_VF_MAX = 14,
1:  };
1:  
1:  struct ifla_vf_mac {
1: -	__u32 vf;
1: -	__u8 mac[32];
1: +  __u32 vf;
1: +  __u8 mac[32];
1:  };
1:  
1:  struct ifla_vf_broadcast {
1: -	__u8 broadcast[32];
1: +  __u8 broadcast[32];
1:  };
1:  
1:  struct ifla_vf_vlan {
1: -	__u32 vf;
1: -	__u32 vlan;
1: -	__u32 qos;
1: +  __u32 vf;
1: +  __u32 vlan;
1: +  __u32 qos;
1:  };
1:  
1:  enum {
1: -	IFLA_VF_VLAN_INFO_UNSPEC = 0,
1: -	IFLA_VF_VLAN_INFO = 1,
1: -	__IFLA_VF_VLAN_INFO_MAX = 2,
1: +  IFLA_VF_VLAN_INFO_UNSPEC = 0,
1: +  IFLA_VF_VLAN_INFO = 1,
1: +  __IFLA_VF_VLAN_INFO_MAX = 2,
1:  };
1:  
1:  struct ifla_vf_vlan_info {
1: -	__u32 vf;
1: -	__u32 vlan;
1: -	__u32 qos;
1: -	__be16 vlan_proto;
1: +  __u32 vf;
1: +  __u32 vlan;
1: +  __u32 qos;
1: +  __be16 vlan_proto;
1:  };
1:  
1:  struct ifla_vf_tx_rate {
1: -	__u32 vf;
1: -	__u32 rate;
1: +  __u32 vf;
1: +  __u32 rate;
1:  };
1:  
1:  struct ifla_vf_rate {
1: -	__u32 vf;
1: -	__u32 min_tx_rate;
1: -	__u32 max_tx_rate;
1: +  __u32 vf;
1: +  __u32 min_tx_rate;
1: +  __u32 max_tx_rate;
1:  };
1:  
1:  struct ifla_vf_spoofchk {
1: -	__u32 vf;
1: -	__u32 setting;
1: +  __u32 vf;
1: +  __u32 setting;
1:  };
1:  
1:  struct ifla_vf_link_state {
1: -	__u32 vf;
1: -	__u32 link_state;
1: +  __u32 vf;
1: +  __u32 link_state;
1:  };
1:  
1:  struct ifla_vf_rss_query_en {
1: -	__u32 vf;
1: -	__u32 setting;
1: +  __u32 vf;
1: +  __u32 setting;
1:  };
1:  
1:  enum {
1: -	IFLA_VF_STATS_RX_PACKETS = 0,
1: -	IFLA_VF_STATS_TX_PACKETS = 1,
1: -	IFLA_VF_STATS_RX_BYTES = 2,
1: -	IFLA_VF_STATS_TX_BYTES = 3,
1: -	IFLA_VF_STATS_BROADCAST = 4,
1: -	IFLA_VF_STATS_MULTICAST = 5,
1: -	IFLA_VF_STATS_PAD = 6,
1: -	IFLA_VF_STATS_RX_DROPPED = 7,
1: -	IFLA_VF_STATS_TX_DROPPED = 8,
1: -	__IFLA_VF_STATS_MAX = 9,
1: +  IFLA_VF_STATS_RX_PACKETS = 0,
1: +  IFLA_VF_STATS_TX_PACKETS = 1,
1: +  IFLA_VF_STATS_RX_BYTES = 2,
1: +  IFLA_VF_STATS_TX_BYTES = 3,
1: +  IFLA_VF_STATS_BROADCAST = 4,
1: +  IFLA_VF_STATS_MULTICAST = 5,
1: +  IFLA_VF_STATS_PAD = 6,
1: +  IFLA_VF_STATS_RX_DROPPED = 7,
1: +  IFLA_VF_STATS_TX_DROPPED = 8,
1: +  __IFLA_VF_STATS_MAX = 9,
1:  };
1:  
1:  struct ifla_vf_trust {
1: -	__u32 vf;
1: -	__u32 setting;
1: +  __u32 vf;
1: +  __u32 setting;
1:  };
1:  
1:  enum {
1: -	IFLA_VF_PORT_UNSPEC = 0,
1: -	IFLA_VF_PORT = 1,
1: -	__IFLA_VF_PORT_MAX = 2,
1: +  IFLA_VF_PORT_UNSPEC = 0,
1: +  IFLA_VF_PORT = 1,
1: +  __IFLA_VF_PORT_MAX = 2,
1:  };
1:  
1:  enum {
1: -	IFLA_PORT_UNSPEC = 0,
1: -	IFLA_PORT_VF = 1,
1: -	IFLA_PORT_PROFILE = 2,
1: -	IFLA_PORT_VSI_TYPE = 3,
1: -	IFLA_PORT_INSTANCE_UUID = 4,
1: -	IFLA_PORT_HOST_UUID = 5,
1: -	IFLA_PORT_REQUEST = 6,
1: -	IFLA_PORT_RESPONSE = 7,
1: -	__IFLA_PORT_MAX = 8,
1: +  IFLA_PORT_UNSPEC = 0,
1: +  IFLA_PORT_VF = 1,
1: +  IFLA_PORT_PROFILE = 2,
1: +  IFLA_PORT_VSI_TYPE = 3,
1: +  IFLA_PORT_INSTANCE_UUID = 4,
1: +  IFLA_PORT_HOST_UUID = 5,
1: +  IFLA_PORT_REQUEST = 6,
1: +  IFLA_PORT_RESPONSE = 7,
1: +  __IFLA_PORT_MAX = 8,
1:  };
1:  
1:  struct if_stats_msg {
1: -	__u8 family;
1: -	__u8 pad1;
1: -	__u16 pad2;
1: -	__u32 ifindex;
1: -	__u32 filter_mask;
1: +  __u8 family;
1: +  __u8 pad1;
1: +  __u16 pad2;
1: +  __u32 ifindex;
1: +  __u32 filter_mask;
1:  };
1:  
1:  enum {
1: -	IFLA_STATS_UNSPEC = 0,
1: -	IFLA_STATS_LINK_64 = 1,
1: -	IFLA_STATS_LINK_XSTATS = 2,
1: -	IFLA_STATS_LINK_XSTATS_SLAVE = 3,
1: -	IFLA_STATS_LINK_OFFLOAD_XSTATS = 4,
1: -	IFLA_STATS_AF_SPEC = 5,
1: -	__IFLA_STATS_MAX = 6,
1: +  IFLA_STATS_UNSPEC = 0,
1: +  IFLA_STATS_LINK_64 = 1,
1: +  IFLA_STATS_LINK_XSTATS = 2,
1: +  IFLA_STATS_LINK_XSTATS_SLAVE = 3,
1: +  IFLA_STATS_LINK_OFFLOAD_XSTATS = 4,
1: +  IFLA_STATS_AF_SPEC = 5,
1: +  __IFLA_STATS_MAX = 6,
1:  };
1:  
1:  enum {
1: -	XDP_ATTACHED_NONE = 0,
1: -	XDP_ATTACHED_DRV = 1,
1: -	XDP_ATTACHED_SKB = 2,
1: -	XDP_ATTACHED_HW = 3,
1: -	XDP_ATTACHED_MULTI = 4,
1: +  XDP_ATTACHED_NONE = 0,
1: +  XDP_ATTACHED_DRV = 1,
1: +  XDP_ATTACHED_SKB = 2,
1: +  XDP_ATTACHED_HW = 3,
1: +  XDP_ATTACHED_MULTI = 4,
1:  };
1:  
1:  enum {
1: -	IFLA_XDP_UNSPEC = 0,
1: -	IFLA_XDP_FD = 1,
1: -	IFLA_XDP_ATTACHED = 2,
1: -	IFLA_XDP_FLAGS = 3,
1: -	IFLA_XDP_PROG_ID = 4,
1: -	IFLA_XDP_DRV_PROG_ID = 5,
1: -	IFLA_XDP_SKB_PROG_ID = 6,
1: -	IFLA_XDP_HW_PROG_ID = 7,
1: -	IFLA_XDP_EXPECTED_FD = 8,
1: -	__IFLA_XDP_MAX = 9,
1: +  IFLA_XDP_UNSPEC = 0,
1: +  IFLA_XDP_FD = 1,
1: +  IFLA_XDP_ATTACHED = 2,
1: +  IFLA_XDP_FLAGS = 3,
1: +  IFLA_XDP_PROG_ID = 4,
1: +  IFLA_XDP_DRV_PROG_ID = 5,
1: +  IFLA_XDP_SKB_PROG_ID = 6,
1: +  IFLA_XDP_HW_PROG_ID = 7,
1: +  IFLA_XDP_EXPECTED_FD = 8,
1: +  __IFLA_XDP_MAX = 9,
1:  };
1:  
1:  enum {
1: -	IFLA_EVENT_NONE = 0,
1: -	IFLA_EVENT_REBOOT = 1,
1: -	IFLA_EVENT_FEATURES = 2,
1: -	IFLA_EVENT_BONDING_FAILOVER = 3,
1: -	IFLA_EVENT_NOTIFY_PEERS = 4,
1: -	IFLA_EVENT_IGMP_RESEND = 5,
1: -	IFLA_EVENT_BONDING_OPTIONS = 6,
1: +  IFLA_EVENT_NONE = 0,
1: +  IFLA_EVENT_REBOOT = 1,
1: +  IFLA_EVENT_FEATURES = 2,
1: +  IFLA_EVENT_BONDING_FAILOVER = 3,
1: +  IFLA_EVENT_NOTIFY_PEERS = 4,
1: +  IFLA_EVENT_IGMP_RESEND = 5,
1: +  IFLA_EVENT_BONDING_OPTIONS = 6,
1:  };
1:  
1:  enum rtattr_type_t {
1: -	RTA_UNSPEC = 0,
1: -	RTA_DST = 1,
1: -	RTA_SRC = 2,
1: -	RTA_IIF = 3,
1: -	RTA_OIF = 4,
1: -	RTA_GATEWAY = 5,
1: -	RTA_PRIORITY = 6,
1: -	RTA_PREFSRC = 7,
1: -	RTA_METRICS = 8,
1: -	RTA_MULTIPATH = 9,
1: -	RTA_PROTOINFO = 10,
1: -	RTA_FLOW = 11,
1: -	RTA_CACHEINFO = 12,
1: -	RTA_SESSION = 13,
1: -	RTA_MP_ALGO = 14,
1: -	RTA_TABLE = 15,
1: -	RTA_MARK = 16,
1: -	RTA_MFC_STATS = 17,
1: -	RTA_VIA = 18,
1: -	RTA_NEWDST = 19,
1: -	RTA_PREF = 20,
1: -	RTA_ENCAP_TYPE = 21,
1: -	RTA_ENCAP = 22,
1: -	RTA_EXPIRES = 23,
1: -	RTA_PAD = 24,
1: -	RTA_UID = 25,
1: -	RTA_TTL_PROPAGATE = 26,
1: -	RTA_IP_PROTO = 27,
1: -	RTA_SPORT = 28,
1: -	RTA_DPORT = 29,
1: -	RTA_NH_ID = 30,
1: -	__RTA_MAX = 31,
1: +  RTA_UNSPEC = 0,
1: +  RTA_DST = 1,
1: +  RTA_SRC = 2,
1: +  RTA_IIF = 3,
1: +  RTA_OIF = 4,
1: +  RTA_GATEWAY = 5,
1: +  RTA_PRIORITY = 6,
1: +  RTA_PREFSRC = 7,
1: +  RTA_METRICS = 8,
1: +  RTA_MULTIPATH = 9,
1: +  RTA_PROTOINFO = 10,
1: +  RTA_FLOW = 11,
1: +  RTA_CACHEINFO = 12,
1: +  RTA_SESSION = 13,
1: +  RTA_MP_ALGO = 14,
1: +  RTA_TABLE = 15,
1: +  RTA_MARK = 16,
1: +  RTA_MFC_STATS = 17,
1: +  RTA_VIA = 18,
1: +  RTA_NEWDST = 19,
1: +  RTA_PREF = 20,
1: +  RTA_ENCAP_TYPE = 21,
1: +  RTA_ENCAP = 22,
1: +  RTA_EXPIRES = 23,
1: +  RTA_PAD = 24,
1: +  RTA_UID = 25,
1: +  RTA_TTL_PROPAGATE = 26,
1: +  RTA_IP_PROTO = 27,
1: +  RTA_SPORT = 28,
1: +  RTA_DPORT = 29,
1: +  RTA_NH_ID = 30,
1: +  __RTA_MAX = 31,
1:  };
1:  
1:  struct rta_cacheinfo {
1: -	__u32 rta_clntref;
1: -	__u32 rta_lastuse;
1: -	__s32 rta_expires;
1: -	__u32 rta_error;
1: -	__u32 rta_used;
1: -	__u32 rta_id;
1: -	__u32 rta_ts;
1: -	__u32 rta_tsage;
1: +  __u32 rta_clntref;
1: +  __u32 rta_lastuse;
1: +  __s32 rta_expires;
1: +  __u32 rta_error;
1: +  __u32 rta_used;
1: +  __u32 rta_id;
1: +  __u32 rta_ts;
1: +  __u32 rta_tsage;
1:  };
1:  
1: -typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *, struct netlink_ext_ack *);
1: +typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *,
1: +                              struct netlink_ext_ack *);
1:  
1:  typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
1:  
1:  struct rtnl_af_ops {
1: -	struct list_head list;
1: -	int family;
1: -	int (*fill_link_af)(struct sk_buff *, const struct net_device *, u32);
1: -	size_t (*get_link_af_size)(const struct net_device *, u32);
1: -	int (*validate_link_af)(const struct net_device *, const struct nlattr *);
1: -	int (*set_link_af)(struct net_device *, const struct nlattr *);
1: -	int (*fill_stats_af)(struct sk_buff *, const struct net_device *);
1: -	size_t (*get_stats_af_size)(const struct net_device *);
1: +  struct list_head list;
1: +  int family;
1: +  int (*fill_link_af)(struct sk_buff *, const struct net_device *, u32);
1: +  size_t (*get_link_af_size)(const struct net_device *, u32);
1: +  int (*validate_link_af)(const struct net_device *, const struct nlattr *);
1: +  int (*set_link_af)(struct net_device *, const struct nlattr *);
1: +  int (*fill_stats_af)(struct sk_buff *, const struct net_device *);
1: +  size_t (*get_stats_af_size)(const struct net_device *);
1:  };
1:  
1:  struct rtnl_link {
1: -	rtnl_doit_func doit;
1: -	rtnl_dumpit_func dumpit;
1: -	struct module *owner;
1: -	unsigned int flags;
1: -	struct callback_head rcu;
1: +  rtnl_doit_func doit;
1: +  rtnl_dumpit_func dumpit;
1: +  struct module *owner;
1: +  unsigned int flags;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum {
1: -	IF_LINK_MODE_DEFAULT = 0,
1: -	IF_LINK_MODE_DORMANT = 1,
1: -	IF_LINK_MODE_TESTING = 2,
1: +  IF_LINK_MODE_DEFAULT = 0,
1: +  IF_LINK_MODE_DORMANT = 1,
1: +  IF_LINK_MODE_TESTING = 2,
1:  };
1:  
1:  enum lw_bits {
1: -	LW_URGENT = 0,
1: +  LW_URGENT = 0,
1:  };
1:  
1:  struct seg6_pernet_data {
1: -	struct mutex lock;
1: -	struct in6_addr *tun_src;
1: +  struct mutex lock;
1: +  struct in6_addr *tun_src;
1:  };
1:  
1:  enum {
1: -	BPF_F_RECOMPUTE_CSUM = 1,
1: -	BPF_F_INVALIDATE_HASH = 2,
1: +  BPF_F_RECOMPUTE_CSUM = 1,
1: +  BPF_F_INVALIDATE_HASH = 2,
1:  };
1:  
1:  enum {
1: -	BPF_F_HDR_FIELD_MASK = 15,
1: +  BPF_F_HDR_FIELD_MASK = 15,
1:  };
1:  
1:  enum {
1: -	BPF_F_PSEUDO_HDR = 16,
1: -	BPF_F_MARK_MANGLED_0 = 32,
1: -	BPF_F_MARK_ENFORCE = 64,
1: +  BPF_F_PSEUDO_HDR = 16,
1: +  BPF_F_MARK_MANGLED_0 = 32,
1: +  BPF_F_MARK_ENFORCE = 64,
1:  };
1:  
1:  enum {
1: -	BPF_F_INGRESS = 1,
1: +  BPF_F_INGRESS = 1,
1:  };
1:  
1:  enum {
1: -	BPF_F_TUNINFO_IPV6 = 1,
1: +  BPF_F_TUNINFO_IPV6 = 1,
1:  };
1:  
1:  enum {
1: -	BPF_F_ZERO_CSUM_TX = 2,
1: -	BPF_F_DONT_FRAGMENT = 4,
1: -	BPF_F_SEQ_NUMBER = 8,
1: +  BPF_F_ZERO_CSUM_TX = 2,
1: +  BPF_F_DONT_FRAGMENT = 4,
1: +  BPF_F_SEQ_NUMBER = 8,
1:  };
1:  
1:  enum {
1: -	BPF_CSUM_LEVEL_QUERY = 0,
1: -	BPF_CSUM_LEVEL_INC = 1,
1: -	BPF_CSUM_LEVEL_DEC = 2,
1: -	BPF_CSUM_LEVEL_RESET = 3,
1: +  BPF_CSUM_LEVEL_QUERY = 0,
1: +  BPF_CSUM_LEVEL_INC = 1,
1: +  BPF_CSUM_LEVEL_DEC = 2,
1: +  BPF_CSUM_LEVEL_RESET = 3,
1:  };
1:  
1:  enum {
1: -	BPF_F_ADJ_ROOM_FIXED_GSO = 1,
1: -	BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 2,
1: -	BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 4,
1: -	BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 8,
1: -	BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 16,
1: -	BPF_F_ADJ_ROOM_NO_CSUM_RESET = 32,
1: +  BPF_F_ADJ_ROOM_FIXED_GSO = 1,
1: +  BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 = 2,
1: +  BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 = 4,
1: +  BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 8,
1: +  BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 16,
1: +  BPF_F_ADJ_ROOM_NO_CSUM_RESET = 32,
1:  };
1:  
1:  enum {
1: -	BPF_ADJ_ROOM_ENCAP_L2_MASK = 255,
1: -	BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 56,
1: +  BPF_ADJ_ROOM_ENCAP_L2_MASK = 255,
1: +  BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 56,
1:  };
1:  
1:  enum {
1: -	BPF_SK_LOOKUP_F_REPLACE = 1,
1: -	BPF_SK_LOOKUP_F_NO_REUSEPORT = 2,
1: +  BPF_SK_LOOKUP_F_REPLACE = 1,
1: +  BPF_SK_LOOKUP_F_NO_REUSEPORT = 2,
1:  };
1:  
1:  enum bpf_adj_room_mode {
1: -	BPF_ADJ_ROOM_NET = 0,
1: -	BPF_ADJ_ROOM_MAC = 1,
1: +  BPF_ADJ_ROOM_NET = 0,
1: +  BPF_ADJ_ROOM_MAC = 1,
1:  };
1:  
1:  enum bpf_hdr_start_off {
1: -	BPF_HDR_START_MAC = 0,
1: -	BPF_HDR_START_NET = 1,
1: +  BPF_HDR_START_MAC = 0,
1: +  BPF_HDR_START_NET = 1,
1:  };
1:  
1:  enum bpf_lwt_encap_mode {
1: -	BPF_LWT_ENCAP_SEG6 = 0,
1: -	BPF_LWT_ENCAP_SEG6_INLINE = 1,
1: -	BPF_LWT_ENCAP_IP = 2,
1: +  BPF_LWT_ENCAP_SEG6 = 0,
1: +  BPF_LWT_ENCAP_SEG6_INLINE = 1,
1: +  BPF_LWT_ENCAP_IP = 2,
1:  };
1:  
1:  struct bpf_tunnel_key {
1: -	__u32 tunnel_id;
1: -	union {
1: -		__u32 remote_ipv4;
1: -		__u32 remote_ipv6[4];
1: -	};
1: -	__u8 tunnel_tos;
1: -	__u8 tunnel_ttl;
1: -	__u16 tunnel_ext;
1: -	__u32 tunnel_label;
1: +  __u32 tunnel_id;
1: +  union {
1: +    __u32 remote_ipv4;
1: +    __u32 remote_ipv6[4];
1: +  };
1: +  __u8 tunnel_tos;
1: +  __u8 tunnel_ttl;
1: +  __u16 tunnel_ext;
1: +  __u32 tunnel_label;
1:  };
1:  
1:  struct bpf_xfrm_state {
1: -	__u32 reqid;
1: -	__u32 spi;
1: -	__u16 family;
1: -	__u16 ext;
1: -	union {
1: -		__u32 remote_ipv4;
1: -		__u32 remote_ipv6[4];
1: -	};
1: +  __u32 reqid;
1: +  __u32 spi;
1: +  __u16 family;
1: +  __u16 ext;
1: +  union {
1: +    __u32 remote_ipv4;
1: +    __u32 remote_ipv6[4];
1: +  };
1:  };
1:  
1:  struct bpf_tcp_sock {
1: -	__u32 snd_cwnd;
1: -	__u32 srtt_us;
1: -	__u32 rtt_min;
1: -	__u32 snd_ssthresh;
1: -	__u32 rcv_nxt;
1: -	__u32 snd_nxt;
1: -	__u32 snd_una;
1: -	__u32 mss_cache;
1: -	__u32 ecn_flags;
1: -	__u32 rate_delivered;
1: -	__u32 rate_interval_us;
1: -	__u32 packets_out;
1: -	__u32 retrans_out;
1: -	__u32 total_retrans;
1: -	__u32 segs_in;
1: -	__u32 data_segs_in;
1: -	__u32 segs_out;
1: -	__u32 data_segs_out;
1: -	__u32 lost_out;
1: -	__u32 sacked_out;
1: -	__u64 bytes_received;
1: -	__u64 bytes_acked;
1: -	__u32 dsack_dups;
1: -	__u32 delivered;
1: -	__u32 delivered_ce;
1: -	__u32 icsk_retransmits;
1: +  __u32 snd_cwnd;
1: +  __u32 srtt_us;
1: +  __u32 rtt_min;
1: +  __u32 snd_ssthresh;
1: +  __u32 rcv_nxt;
1: +  __u32 snd_nxt;
1: +  __u32 snd_una;
1: +  __u32 mss_cache;
1: +  __u32 ecn_flags;
1: +  __u32 rate_delivered;
1: +  __u32 rate_interval_us;
1: +  __u32 packets_out;
1: +  __u32 retrans_out;
1: +  __u32 total_retrans;
1: +  __u32 segs_in;
1: +  __u32 data_segs_in;
1: +  __u32 segs_out;
1: +  __u32 data_segs_out;
1: +  __u32 lost_out;
1: +  __u32 sacked_out;
1: +  __u64 bytes_received;
1: +  __u64 bytes_acked;
1: +  __u32 dsack_dups;
1: +  __u32 delivered;
1: +  __u32 delivered_ce;
1: +  __u32 icsk_retransmits;
1:  };
1:  
1:  struct bpf_sock_tuple {
1: -	union {
1: -		struct {
1: -			__be32 saddr;
1: -			__be32 daddr;
1: -			__be16 sport;
1: -			__be16 dport;
1: -		} ipv4;
1: -		struct {
1: -			__be32 saddr[4];
1: -			__be32 daddr[4];
1: -			__be16 sport;
1: -			__be16 dport;
1: -		} ipv6;
1: -	};
1: +  union {
1: +    struct {
1: +      __be32 saddr;
1: +      __be32 daddr;
1: +      __be16 sport;
1: +      __be16 dport;
1: +    } ipv4;
1: +    struct {
1: +      __be32 saddr[4];
1: +      __be32 daddr[4];
1: +      __be16 sport;
1: +      __be16 dport;
1: +    } ipv6;
1: +  };
1:  };
1:  
1:  struct bpf_xdp_sock {
1: -	__u32 queue_id;
1: +  __u32 queue_id;
1:  };
1:  
1:  enum {
1: -	BPF_SOCK_OPS_RTO_CB_FLAG = 1,
1: -	BPF_SOCK_OPS_RETRANS_CB_FLAG = 2,
1: -	BPF_SOCK_OPS_STATE_CB_FLAG = 4,
1: -	BPF_SOCK_OPS_RTT_CB_FLAG = 8,
1: -	BPF_SOCK_OPS_PARSE_ALL_HDR_OPT_CB_FLAG = 16,
1: -	BPF_SOCK_OPS_PARSE_UNKNOWN_HDR_OPT_CB_FLAG = 32,
1: -	BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG = 64,
1: -	BPF_SOCK_OPS_ALL_CB_FLAGS = 127,
1: +  BPF_SOCK_OPS_RTO_CB_FLAG = 1,
1: +  BPF_SOCK_OPS_RETRANS_CB_FLAG = 2,
1: +  BPF_SOCK_OPS_STATE_CB_FLAG = 4,
1: +  BPF_SOCK_OPS_RTT_CB_FLAG = 8,
1: +  BPF_SOCK_OPS_PARSE_ALL_HDR_OPT_CB_FLAG = 16,
1: +  BPF_SOCK_OPS_PARSE_UNKNOWN_HDR_OPT_CB_FLAG = 32,
1: +  BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG = 64,
1: +  BPF_SOCK_OPS_ALL_CB_FLAGS = 127,
1:  };
1:  
1:  enum {
1: -	BPF_SOCK_OPS_VOID = 0,
1: -	BPF_SOCK_OPS_TIMEOUT_INIT = 1,
1: -	BPF_SOCK_OPS_RWND_INIT = 2,
1: -	BPF_SOCK_OPS_TCP_CONNECT_CB = 3,
1: -	BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 4,
1: -	BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 5,
1: -	BPF_SOCK_OPS_NEEDS_ECN = 6,
1: -	BPF_SOCK_OPS_BASE_RTT = 7,
1: -	BPF_SOCK_OPS_RTO_CB = 8,
1: -	BPF_SOCK_OPS_RETRANS_CB = 9,
1: -	BPF_SOCK_OPS_STATE_CB = 10,
1: -	BPF_SOCK_OPS_TCP_LISTEN_CB = 11,
1: -	BPF_SOCK_OPS_RTT_CB = 12,
1: -	BPF_SOCK_OPS_PARSE_HDR_OPT_CB = 13,
1: -	BPF_SOCK_OPS_HDR_OPT_LEN_CB = 14,
1: -	BPF_SOCK_OPS_WRITE_HDR_OPT_CB = 15,
1: +  BPF_SOCK_OPS_VOID = 0,
1: +  BPF_SOCK_OPS_TIMEOUT_INIT = 1,
1: +  BPF_SOCK_OPS_RWND_INIT = 2,
1: +  BPF_SOCK_OPS_TCP_CONNECT_CB = 3,
1: +  BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB = 4,
1: +  BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB = 5,
1: +  BPF_SOCK_OPS_NEEDS_ECN = 6,
1: +  BPF_SOCK_OPS_BASE_RTT = 7,
1: +  BPF_SOCK_OPS_RTO_CB = 8,
1: +  BPF_SOCK_OPS_RETRANS_CB = 9,
1: +  BPF_SOCK_OPS_STATE_CB = 10,
1: +  BPF_SOCK_OPS_TCP_LISTEN_CB = 11,
1: +  BPF_SOCK_OPS_RTT_CB = 12,
1: +  BPF_SOCK_OPS_PARSE_HDR_OPT_CB = 13,
1: +  BPF_SOCK_OPS_HDR_OPT_LEN_CB = 14,
1: +  BPF_SOCK_OPS_WRITE_HDR_OPT_CB = 15,
1:  };
1:  
1:  enum {
1: -	TCP_BPF_IW = 1001,
1: -	TCP_BPF_SNDCWND_CLAMP = 1002,
1: -	TCP_BPF_DELACK_MAX = 1003,
1: -	TCP_BPF_RTO_MIN = 1004,
1: -	TCP_BPF_SYN = 1005,
1: -	TCP_BPF_SYN_IP = 1006,
1: -	TCP_BPF_SYN_MAC = 1007,
1: +  TCP_BPF_IW = 1001,
1: +  TCP_BPF_SNDCWND_CLAMP = 1002,
1: +  TCP_BPF_DELACK_MAX = 1003,
1: +  TCP_BPF_RTO_MIN = 1004,
1: +  TCP_BPF_SYN = 1005,
1: +  TCP_BPF_SYN_IP = 1006,
1: +  TCP_BPF_SYN_MAC = 1007,
1:  };
1:  
1:  enum {
1: -	BPF_LOAD_HDR_OPT_TCP_SYN = 1,
1: +  BPF_LOAD_HDR_OPT_TCP_SYN = 1,
1:  };
1:  
1:  enum {
1: -	BPF_FIB_LOOKUP_DIRECT = 1,
1: -	BPF_FIB_LOOKUP_OUTPUT = 2,
1: +  BPF_FIB_LOOKUP_DIRECT = 1,
1: +  BPF_FIB_LOOKUP_OUTPUT = 2,
1:  };
1:  
1:  enum {
1: -	BPF_FIB_LKUP_RET_SUCCESS = 0,
1: -	BPF_FIB_LKUP_RET_BLACKHOLE = 1,
1: -	BPF_FIB_LKUP_RET_UNREACHABLE = 2,
1: -	BPF_FIB_LKUP_RET_PROHIBIT = 3,
1: -	BPF_FIB_LKUP_RET_NOT_FWDED = 4,
1: -	BPF_FIB_LKUP_RET_FWD_DISABLED = 5,
1: -	BPF_FIB_LKUP_RET_UNSUPP_LWT = 6,
1: -	BPF_FIB_LKUP_RET_NO_NEIGH = 7,
1: -	BPF_FIB_LKUP_RET_FRAG_NEEDED = 8,
1: +  BPF_FIB_LKUP_RET_SUCCESS = 0,
1: +  BPF_FIB_LKUP_RET_BLACKHOLE = 1,
1: +  BPF_FIB_LKUP_RET_UNREACHABLE = 2,
1: +  BPF_FIB_LKUP_RET_PROHIBIT = 3,
1: +  BPF_FIB_LKUP_RET_NOT_FWDED = 4,
1: +  BPF_FIB_LKUP_RET_FWD_DISABLED = 5,
1: +  BPF_FIB_LKUP_RET_UNSUPP_LWT = 6,
1: +  BPF_FIB_LKUP_RET_NO_NEIGH = 7,
1: +  BPF_FIB_LKUP_RET_FRAG_NEEDED = 8,
1:  };
1:  
1:  struct bpf_fib_lookup {
1: -	__u8 family;
1: -	__u8 l4_protocol;
1: -	__be16 sport;
1: -	__be16 dport;
1: -	__u16 tot_len;
1: -	__u32 ifindex;
1: -	union {
1: -		__u8 tos;
1: -		__be32 flowinfo;
1: -		__u32 rt_metric;
1: -	};
1: -	union {
1: -		__be32 ipv4_src;
1: -		__u32 ipv6_src[4];
1: -	};
1: -	union {
1: -		__be32 ipv4_dst;
1: -		__u32 ipv6_dst[4];
1: -	};
1: -	__be16 h_vlan_proto;
1: -	__be16 h_vlan_TCI;
1: -	__u8 smac[6];
1: -	__u8 dmac[6];
1: +  __u8 family;
1: +  __u8 l4_protocol;
1: +  __be16 sport;
1: +  __be16 dport;
1: +  __u16 tot_len;
1: +  __u32 ifindex;
1: +  union {
1: +    __u8 tos;
1: +    __be32 flowinfo;
1: +    __u32 rt_metric;
1: +  };
1: +  union {
1: +    __be32 ipv4_src;
1: +    __u32 ipv6_src[4];
1: +  };
1: +  union {
1: +    __be32 ipv4_dst;
1: +    __u32 ipv6_dst[4];
1: +  };
1: +  __be16 h_vlan_proto;
1: +  __be16 h_vlan_TCI;
1: +  __u8 smac[6];
1: +  __u8 dmac[6];
1:  };
1:  
1:  struct bpf_redir_neigh {
1: -	__u32 nh_family;
1: -	union {
1: -		__be32 ipv4_nh;
1: -		__u32 ipv6_nh[4];
1: -	};
1: +  __u32 nh_family;
1: +  union {
1: +    __be32 ipv4_nh;
1: +    __u32 ipv6_nh[4];
1: +  };
1:  };
1:  
1:  enum rt_scope_t {
1: -	RT_SCOPE_UNIVERSE = 0,
1: -	RT_SCOPE_SITE = 200,
1: -	RT_SCOPE_LINK = 253,
1: -	RT_SCOPE_HOST = 254,
1: -	RT_SCOPE_NOWHERE = 255,
1: +  RT_SCOPE_UNIVERSE = 0,
1: +  RT_SCOPE_SITE = 200,
1: +  RT_SCOPE_LINK = 253,
1: +  RT_SCOPE_HOST = 254,
1: +  RT_SCOPE_NOWHERE = 255,
1:  };
1:  
1:  enum rt_class_t {
1: -	RT_TABLE_UNSPEC = 0,
1: -	RT_TABLE_COMPAT = 252,
1: -	RT_TABLE_DEFAULT = 253,
1: -	RT_TABLE_MAIN = 254,
1: -	RT_TABLE_LOCAL = 255,
1: -	RT_TABLE_MAX = 4294967295,
1: +  RT_TABLE_UNSPEC = 0,
1: +  RT_TABLE_COMPAT = 252,
1: +  RT_TABLE_DEFAULT = 253,
1: +  RT_TABLE_MAIN = 254,
1: +  RT_TABLE_LOCAL = 255,
1: +  RT_TABLE_MAX = 4294967295,
1:  };
1:  
1:  typedef int (*bpf_aux_classic_check_t)(struct sock_filter *, unsigned int);
1:  
1:  struct inet_timewait_sock {
1: -	struct sock_common __tw_common;
1: -	__u32 tw_mark;
1: -	volatile unsigned char tw_substate;
1: -	unsigned char tw_rcv_wscale;
1: -	__be16 tw_sport;
1: -	unsigned int tw_kill: 1;
1: -	unsigned int tw_transparent: 1;
1: -	unsigned int tw_flowlabel: 20;
1: -	unsigned int tw_pad: 2;
1: -	unsigned int tw_tos: 8;
1: -	u32 tw_txhash;
1: -	u32 tw_priority;
1: -	struct timer_list tw_timer;
1: -	struct inet_bind_bucket *tw_tb;
1: +  struct sock_common __tw_common;
1: +  __u32 tw_mark;
1: +  volatile unsigned char tw_substate;
1: +  unsigned char tw_rcv_wscale;
1: +  __be16 tw_sport;
1: +  unsigned int tw_kill : 1;
1: +  unsigned int tw_transparent : 1;
1: +  unsigned int tw_flowlabel : 20;
1: +  unsigned int tw_pad : 2;
1: +  unsigned int tw_tos : 8;
1: +  u32 tw_txhash;
1: +  u32 tw_priority;
1: +  struct timer_list tw_timer;
1: +  struct inet_bind_bucket *tw_tb;
1:  };
1:  
1:  struct tcp_timewait_sock {
1: -	struct inet_timewait_sock tw_sk;
1: -	u32 tw_rcv_wnd;
1: -	u32 tw_ts_offset;
1: -	u32 tw_ts_recent;
1: -	u32 tw_last_oow_ack_time;
1: -	int tw_ts_recent_stamp;
1: -	u32 tw_tx_delay;
1: -	struct tcp_md5sig_key *tw_md5_key;
1: +  struct inet_timewait_sock tw_sk;
1: +  u32 tw_rcv_wnd;
1: +  u32 tw_ts_offset;
1: +  u32 tw_ts_recent;
1: +  u32 tw_last_oow_ack_time;
1: +  int tw_ts_recent_stamp;
1: +  u32 tw_tx_delay;
1: +  struct tcp_md5sig_key *tw_md5_key;
1:  };
1:  
1:  struct udp_sock {
1: -	struct inet_sock inet;
1: -	int pending;
1: -	unsigned int corkflag;
1: -	__u8 encap_type;
1: -	unsigned char no_check6_tx: 1;
1: -	unsigned char no_check6_rx: 1;
1: -	unsigned char encap_enabled: 1;
1: -	unsigned char gro_enabled: 1;
1: -	__u16 len;
1: -	__u16 gso_size;
1: -	__u16 pcslen;
1: -	__u16 pcrlen;
1: -	__u8 pcflag;
1: -	__u8 unused[3];
1: -	int (*encap_rcv)(struct sock *, struct sk_buff *);
1: -	int (*encap_err_lookup)(struct sock *, struct sk_buff *);
1: -	void (*encap_destroy)(struct sock *);
1: -	struct sk_buff * (*gro_receive)(struct sock *, struct list_head *, struct sk_buff *);
1: -	int (*gro_complete)(struct sock *, struct sk_buff *, int);
1: -	struct sk_buff_head reader_queue;
1: -	int forward_deficit;
1: -	long: 32;
1: -	long: 64;
1: +  struct inet_sock inet;
1: +  int pending;
1: +  unsigned int corkflag;
1: +  __u8 encap_type;
1: +  unsigned char no_check6_tx : 1;
1: +  unsigned char no_check6_rx : 1;
1: +  unsigned char encap_enabled : 1;
1: +  unsigned char gro_enabled : 1;
1: +  __u16 len;
1: +  __u16 gso_size;
1: +  __u16 pcslen;
1: +  __u16 pcrlen;
1: +  __u8 pcflag;
1: +  __u8 unused[3];
1: +  int (*encap_rcv)(struct sock *, struct sk_buff *);
1: +  int (*encap_err_lookup)(struct sock *, struct sk_buff *);
1: +  void (*encap_destroy)(struct sock *);
1: +  struct sk_buff *(*gro_receive)(struct sock *, struct list_head *,
1: +                                 struct sk_buff *);
1: +  int (*gro_complete)(struct sock *, struct sk_buff *, int);
1: +  struct sk_buff_head reader_queue;
1: +  int forward_deficit;
1: +  long : 32;
1: +  long : 64;
1:  };
1:  
1:  struct udp6_sock {
1: -	struct udp_sock udp;
1: -	struct ipv6_pinfo inet6;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct udp_sock udp;
1: +  struct ipv6_pinfo inet6;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct tcp6_sock {
1: -	struct tcp_sock tcp;
1: -	struct ipv6_pinfo inet6;
1: +  struct tcp_sock tcp;
1: +  struct ipv6_pinfo inet6;
1:  };
1:  
1:  struct ipv6_bpf_stub {
1: -	int (*inet6_bind)(struct sock *, struct sockaddr *, int, u32);
1: -	struct sock * (*udp6_lib_lookup)(struct net *, const struct in6_addr *, __be16, const struct in6_addr *, __be16, int, int, struct udp_table *, struct sk_buff *);
1: +  int (*inet6_bind)(struct sock *, struct sockaddr *, int, u32);
1: +  struct sock *(*udp6_lib_lookup)(struct net *, const struct in6_addr *, __be16,
1: +                                  const struct in6_addr *, __be16, int, int,
1: +                                  struct udp_table *, struct sk_buff *);
1:  };
1:  
1:  struct fib_result {
1: -	__be32 prefix;
1: -	unsigned char prefixlen;
1: -	unsigned char nh_sel;
1: -	unsigned char type;
1: -	unsigned char scope;
1: -	u32 tclassid;
1: -	struct fib_nh_common *nhc;
1: -	struct fib_info *fi;
1: -	struct fib_table *table;
1: -	struct hlist_head *fa_head;
1: +  __be32 prefix;
1: +  unsigned char prefixlen;
1: +  unsigned char nh_sel;
1: +  unsigned char type;
1: +  unsigned char scope;
1: +  u32 tclassid;
1: +  struct fib_nh_common *nhc;
1: +  struct fib_info *fi;
1: +  struct fib_table *table;
1: +  struct hlist_head *fa_head;
1:  };
1:  
1:  struct tcp_skb_cb {
1: -	__u32 seq;
1: -	__u32 end_seq;
1: -	union {
1: -		__u32 tcp_tw_isn;
1: -		struct {
1: -			u16 tcp_gso_segs;
1: -			u16 tcp_gso_size;
1: -		};
1: -	};
1: -	__u8 tcp_flags;
1: -	__u8 sacked;
1: -	__u8 ip_dsfield;
1: -	__u8 txstamp_ack: 1;
1: -	__u8 eor: 1;
1: -	__u8 has_rxtstamp: 1;
1: -	__u8 unused: 5;
1: -	__u32 ack_seq;
1: -	union {
1: -		struct {
1: -			__u32 in_flight: 30;
1: -			__u32 is_app_limited: 1;
1: -			__u32 unused: 1;
1: -			__u32 delivered;
1: -			u64 first_tx_mstamp;
1: -			u64 delivered_mstamp;
1: -		} tx;
1: -		union {
1: -			struct inet_skb_parm h4;
1: -			struct inet6_skb_parm h6;
1: -		} header;
1: -		struct {
1: -			__u32 flags;
1: -			struct sock *sk_redir;
1: -			void *data_end;
1: -		} bpf;
1: -	};
1: +  __u32 seq;
1: +  __u32 end_seq;
1: +  union {
1: +    __u32 tcp_tw_isn;
1: +    struct {
1: +      u16 tcp_gso_segs;
1: +      u16 tcp_gso_size;
1: +    };
1: +  };
1: +  __u8 tcp_flags;
1: +  __u8 sacked;
1: +  __u8 ip_dsfield;
1: +  __u8 txstamp_ack : 1;
1: +  __u8 eor : 1;
1: +  __u8 has_rxtstamp : 1;
1: +  __u8 unused : 5;
1: +  __u32 ack_seq;
1: +  union {
1: +    struct {
1: +      __u32 in_flight : 30;
1: +      __u32 is_app_limited : 1;
1: +      __u32 unused : 1;
1: +      __u32 delivered;
1: +      u64 first_tx_mstamp;
1: +      u64 delivered_mstamp;
1: +    } tx;
1: +    union {
1: +      struct inet_skb_parm h4;
1: +      struct inet6_skb_parm h6;
1: +    } header;
1: +    struct {
1: +      __u32 flags;
1: +      struct sock *sk_redir;
1: +      void *data_end;
1: +    } bpf;
1: +  };
1:  };
1:  
1:  struct strp_stats {
1: -	long long unsigned int msgs;
1: -	long long unsigned int bytes;
1: -	unsigned int mem_fail;
1: -	unsigned int need_more_hdr;
1: -	unsigned int msg_too_big;
1: -	unsigned int msg_timeouts;
1: -	unsigned int bad_hdr_len;
1: +  long long unsigned int msgs;
1: +  long long unsigned int bytes;
1: +  unsigned int mem_fail;
1: +  unsigned int need_more_hdr;
1: +  unsigned int msg_too_big;
1: +  unsigned int msg_timeouts;
1: +  unsigned int bad_hdr_len;
1:  };
1:  
1:  struct strparser;
1:  
1:  struct strp_callbacks {
1: -	int (*parse_msg)(struct strparser *, struct sk_buff *);
1: -	void (*rcv_msg)(struct strparser *, struct sk_buff *);
1: -	int (*read_sock_done)(struct strparser *, int);
1: -	void (*abort_parser)(struct strparser *, int);
1: -	void (*lock)(struct strparser *);
1: -	void (*unlock)(struct strparser *);
1: +  int (*parse_msg)(struct strparser *, struct sk_buff *);
1: +  void (*rcv_msg)(struct strparser *, struct sk_buff *);
1: +  int (*read_sock_done)(struct strparser *, int);
1: +  void (*abort_parser)(struct strparser *, int);
1: +  void (*lock)(struct strparser *);
1: +  void (*unlock)(struct strparser *);
1:  };
1:  
1:  struct strparser {
1: -	struct sock *sk;
1: -	u32 stopped: 1;
1: -	u32 paused: 1;
1: -	u32 aborted: 1;
1: -	u32 interrupted: 1;
1: -	u32 unrecov_intr: 1;
1: -	struct sk_buff **skb_nextp;
1: -	struct sk_buff *skb_head;
1: -	unsigned int need_bytes;
1: -	struct delayed_work msg_timer_work;
1: -	struct work_struct work;
1: -	struct strp_stats stats;
1: -	struct strp_callbacks cb;
1: +  struct sock *sk;
1: +  u32 stopped : 1;
1: +  u32 paused : 1;
1: +  u32 aborted : 1;
1: +  u32 interrupted : 1;
1: +  u32 unrecov_intr : 1;
1: +  struct sk_buff **skb_nextp;
1: +  struct sk_buff *skb_head;
1: +  unsigned int need_bytes;
1: +  struct delayed_work msg_timer_work;
1: +  struct work_struct work;
1: +  struct strp_stats stats;
1: +  struct strp_callbacks cb;
1:  };
1:  
1:  struct strp_msg {
1: -	int full_len;
1: -	int offset;
1: +  int full_len;
1: +  int offset;
1:  };
1:  
1:  struct xdp_sock;
1:  
1:  struct xsk_map {
1: -	struct bpf_map map;
1: -	spinlock_t lock;
1: -	struct xdp_sock *xsk_map[0];
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  spinlock_t lock;
1: +  struct xdp_sock *xsk_map[0];
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct xdp_sock {
1: -	struct sock sk;
1: -	long: 64;
1: -	long: 64;
1: -	struct xsk_queue *rx;
1: -	struct net_device *dev;
1: -	struct xdp_umem *umem;
1: -	struct list_head flush_node;
1: -	struct xsk_buff_pool *pool;
1: -	u16 queue_id;
1: -	bool zc;
1: -	enum {
1: -		XSK_READY = 0,
1: -		XSK_BOUND = 1,
1: -		XSK_UNBOUND = 2,
1: -	} state;
1: -	long: 64;
1: -	struct xsk_queue *tx;
1: -	struct list_head tx_list;
1: -	spinlock_t tx_completion_lock;
1: -	spinlock_t rx_lock;
1: -	u64 rx_dropped;
1: -	u64 rx_queue_full;
1: -	struct list_head map_list;
1: -	spinlock_t map_list_lock;
1: -	struct mutex mutex;
1: -	struct xsk_queue *fq_tmp;
1: -	struct xsk_queue *cq_tmp;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct sock sk;
1: +  long : 64;
1: +  long : 64;
1: +  struct xsk_queue *rx;
1: +  struct net_device *dev;
1: +  struct xdp_umem *umem;
1: +  struct list_head flush_node;
1: +  struct xsk_buff_pool *pool;
1: +  u16 queue_id;
1: +  bool zc;
1: +  enum {
1: +    XSK_READY = 0,
1: +    XSK_BOUND = 1,
1: +    XSK_UNBOUND = 2,
1: +  } state;
1: +  long : 64;
1: +  struct xsk_queue *tx;
1: +  struct list_head tx_list;
1: +  spinlock_t tx_completion_lock;
1: +  spinlock_t rx_lock;
1: +  u64 rx_dropped;
1: +  u64 rx_queue_full;
1: +  struct list_head map_list;
1: +  spinlock_t map_list_lock;
1: +  struct mutex mutex;
1: +  struct xsk_queue *fq_tmp;
1: +  struct xsk_queue *cq_tmp;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct ipv6_sr_hdr {
1: -	__u8 nexthdr;
1: -	__u8 hdrlen;
1: -	__u8 type;
1: -	__u8 segments_left;
1: -	__u8 first_segment;
1: -	__u8 flags;
1: -	__u16 tag;
1: -	struct in6_addr segments[0];
1: -};
1: -
1: -enum {
1: -	SEG6_LOCAL_ACTION_UNSPEC = 0,
1: -	SEG6_LOCAL_ACTION_END = 1,
1: -	SEG6_LOCAL_ACTION_END_X = 2,
1: -	SEG6_LOCAL_ACTION_END_T = 3,
1: -	SEG6_LOCAL_ACTION_END_DX2 = 4,
1: -	SEG6_LOCAL_ACTION_END_DX6 = 5,
1: -	SEG6_LOCAL_ACTION_END_DX4 = 6,
1: -	SEG6_LOCAL_ACTION_END_DT6 = 7,
1: -	SEG6_LOCAL_ACTION_END_DT4 = 8,
1: -	SEG6_LOCAL_ACTION_END_B6 = 9,
1: -	SEG6_LOCAL_ACTION_END_B6_ENCAP = 10,
1: -	SEG6_LOCAL_ACTION_END_BM = 11,
1: -	SEG6_LOCAL_ACTION_END_S = 12,
1: -	SEG6_LOCAL_ACTION_END_AS = 13,
1: -	SEG6_LOCAL_ACTION_END_AM = 14,
1: -	SEG6_LOCAL_ACTION_END_BPF = 15,
1: -	__SEG6_LOCAL_ACTION_MAX = 16,
1: +  __u8 nexthdr;
1: +  __u8 hdrlen;
1: +  __u8 type;
1: +  __u8 segments_left;
1: +  __u8 first_segment;
1: +  __u8 flags;
1: +  __u16 tag;
1: +  struct in6_addr segments[0];
1: +};
1: +
1: +enum {
1: +  SEG6_LOCAL_ACTION_UNSPEC = 0,
1: +  SEG6_LOCAL_ACTION_END = 1,
1: +  SEG6_LOCAL_ACTION_END_X = 2,
1: +  SEG6_LOCAL_ACTION_END_T = 3,
1: +  SEG6_LOCAL_ACTION_END_DX2 = 4,
1: +  SEG6_LOCAL_ACTION_END_DX6 = 5,
1: +  SEG6_LOCAL_ACTION_END_DX4 = 6,
1: +  SEG6_LOCAL_ACTION_END_DT6 = 7,
1: +  SEG6_LOCAL_ACTION_END_DT4 = 8,
1: +  SEG6_LOCAL_ACTION_END_B6 = 9,
1: +  SEG6_LOCAL_ACTION_END_B6_ENCAP = 10,
1: +  SEG6_LOCAL_ACTION_END_BM = 11,
1: +  SEG6_LOCAL_ACTION_END_S = 12,
1: +  SEG6_LOCAL_ACTION_END_AS = 13,
1: +  SEG6_LOCAL_ACTION_END_AM = 14,
1: +  SEG6_LOCAL_ACTION_END_BPF = 15,
1: +  __SEG6_LOCAL_ACTION_MAX = 16,
1:  };
1:  
1:  struct seg6_bpf_srh_state {
1: -	struct ipv6_sr_hdr *srh;
1: -	u16 hdrlen;
1: -	bool valid;
1: +  struct ipv6_sr_hdr *srh;
1: +  u16 hdrlen;
1: +  bool valid;
1:  };
1:  
1:  struct tls_crypto_info {
1: -	__u16 version;
1: -	__u16 cipher_type;
1: +  __u16 version;
1: +  __u16 cipher_type;
1:  };
1:  
1:  struct tls12_crypto_info_aes_gcm_128 {
1: -	struct tls_crypto_info info;
1: -	unsigned char iv[8];
1: -	unsigned char key[16];
1: -	unsigned char salt[4];
1: -	unsigned char rec_seq[8];
1: +  struct tls_crypto_info info;
1: +  unsigned char iv[8];
1: +  unsigned char key[16];
1: +  unsigned char salt[4];
1: +  unsigned char rec_seq[8];
1:  };
1:  
1:  struct tls12_crypto_info_aes_gcm_256 {
1: -	struct tls_crypto_info info;
1: -	unsigned char iv[8];
1: -	unsigned char key[32];
1: -	unsigned char salt[4];
1: -	unsigned char rec_seq[8];
1: +  struct tls_crypto_info info;
1: +  unsigned char iv[8];
1: +  unsigned char key[32];
1: +  unsigned char salt[4];
1: +  unsigned char rec_seq[8];
1:  };
1:  
1:  struct tls_sw_context_rx {
1: -	struct crypto_aead *aead_recv;
1: -	struct crypto_wait async_wait;
1: -	struct strparser strp;
1: -	struct sk_buff_head rx_list;
1: -	void (*saved_data_ready)(struct sock *);
1: -	struct sk_buff *recv_pkt;
1: -	u8 control;
1: -	u8 async_capable: 1;
1: -	u8 decrypted: 1;
1: -	atomic_t decrypt_pending;
1: -	spinlock_t decrypt_compl_lock;
1: -	bool async_notify;
1: +  struct crypto_aead *aead_recv;
1: +  struct crypto_wait async_wait;
1: +  struct strparser strp;
1: +  struct sk_buff_head rx_list;
1: +  void (*saved_data_ready)(struct sock *);
1: +  struct sk_buff *recv_pkt;
1: +  u8 control;
1: +  u8 async_capable : 1;
1: +  u8 decrypted : 1;
1: +  atomic_t decrypt_pending;
1: +  spinlock_t decrypt_compl_lock;
1: +  bool async_notify;
1:  };
1:  
1:  struct cipher_context {
1: -	char *iv;
1: -	char *rec_seq;
1: +  char *iv;
1: +  char *rec_seq;
1:  };
1:  
1:  union tls_crypto_context {
1: -	struct tls_crypto_info info;
1: -	union {
1: -		struct tls12_crypto_info_aes_gcm_128 aes_gcm_128;
1: -		struct tls12_crypto_info_aes_gcm_256 aes_gcm_256;
1: -	};
1: +  struct tls_crypto_info info;
1: +  union {
1: +    struct tls12_crypto_info_aes_gcm_128 aes_gcm_128;
1: +    struct tls12_crypto_info_aes_gcm_256 aes_gcm_256;
1: +  };
1:  };
1:  
1:  struct tls_prot_info {
1: -	u16 version;
1: -	u16 cipher_type;
1: -	u16 prepend_size;
1: -	u16 tag_size;
1: -	u16 overhead_size;
1: -	u16 iv_size;
1: -	u16 salt_size;
1: -	u16 rec_seq_size;
1: -	u16 aad_size;
1: -	u16 tail_size;
1: +  u16 version;
1: +  u16 cipher_type;
1: +  u16 prepend_size;
1: +  u16 tag_size;
1: +  u16 overhead_size;
1: +  u16 iv_size;
1: +  u16 salt_size;
1: +  u16 rec_seq_size;
1: +  u16 aad_size;
1: +  u16 tail_size;
1:  };
1:  
1:  struct tls_context {
1: -	struct tls_prot_info prot_info;
1: -	u8 tx_conf: 3;
1: -	u8 rx_conf: 3;
1: -	int (*push_pending_record)(struct sock *, int);
1: -	void (*sk_write_space)(struct sock *);
1: -	void *priv_ctx_tx;
1: -	void *priv_ctx_rx;
1: -	struct net_device *netdev;
1: -	struct cipher_context tx;
1: -	struct cipher_context rx;
1: -	struct scatterlist *partially_sent_record;
1: -	u16 partially_sent_offset;
1: -	bool in_tcp_sendpages;
1: -	bool pending_open_record_frags;
1: -	struct mutex tx_lock;
1: -	long unsigned int flags;
1: -	struct proto *sk_proto;
1: -	void (*sk_destruct)(struct sock *);
1: -	union tls_crypto_context crypto_send;
1: -	union tls_crypto_context crypto_recv;
1: -	struct list_head list;
1: -	refcount_t refcount;
1: -	struct callback_head rcu;
1: +  struct tls_prot_info prot_info;
1: +  u8 tx_conf : 3;
1: +  u8 rx_conf : 3;
1: +  int (*push_pending_record)(struct sock *, int);
1: +  void (*sk_write_space)(struct sock *);
1: +  void *priv_ctx_tx;
1: +  void *priv_ctx_rx;
1: +  struct net_device *netdev;
1: +  struct cipher_context tx;
1: +  struct cipher_context rx;
1: +  struct scatterlist *partially_sent_record;
1: +  u16 partially_sent_offset;
1: +  bool in_tcp_sendpages;
1: +  bool pending_open_record_frags;
1: +  struct mutex tx_lock;
1: +  long unsigned int flags;
1: +  struct proto *sk_proto;
1: +  void (*sk_destruct)(struct sock *);
1: +  union tls_crypto_context crypto_send;
1: +  union tls_crypto_context crypto_recv;
1: +  struct list_head list;
1: +  refcount_t refcount;
1: +  struct callback_head rcu;
1:  };
1:  
1:  typedef u64 (*btf_bpf_skb_get_pay_offset)(struct sk_buff *);
1: @@ -113912,32 +115144,38 @@ typedef u64 (*btf_bpf_skb_get_nlattr)(struct sk_buff *, u32, u32);
1:  
1:  typedef u64 (*btf_bpf_skb_get_nlattr_nest)(struct sk_buff *, u32, u32);
1:  
1: -typedef u64 (*btf_bpf_skb_load_helper_8)(const struct sk_buff *, const void *, int, int);
1: +typedef u64 (*btf_bpf_skb_load_helper_8)(const struct sk_buff *, const void *,
1: +                                         int, int);
1:  
1:  typedef u64 (*btf_bpf_skb_load_helper_8_no_cache)(const struct sk_buff *, int);
1:  
1: -typedef u64 (*btf_bpf_skb_load_helper_16)(const struct sk_buff *, const void *, int, int);
1: +typedef u64 (*btf_bpf_skb_load_helper_16)(const struct sk_buff *, const void *,
1: +                                          int, int);
1:  
1:  typedef u64 (*btf_bpf_skb_load_helper_16_no_cache)(const struct sk_buff *, int);
1:  
1: -typedef u64 (*btf_bpf_skb_load_helper_32)(const struct sk_buff *, const void *, int, int);
1: +typedef u64 (*btf_bpf_skb_load_helper_32)(const struct sk_buff *, const void *,
1: +                                          int, int);
1:  
1:  typedef u64 (*btf_bpf_skb_load_helper_32_no_cache)(const struct sk_buff *, int);
1:  
1:  struct bpf_scratchpad {
1: -	union {
1: -		__be32 diff[128];
1: -		u8 buff[512];
1: -	};
1: +  union {
1: +    __be32 diff[128];
1: +    u8 buff[512];
1: +  };
1:  };
1:  
1: -typedef u64 (*btf_bpf_skb_store_bytes)(struct sk_buff *, u32, const void *, u32, u64);
1: +typedef u64 (*btf_bpf_skb_store_bytes)(struct sk_buff *, u32, const void *, u32,
1: +                                       u64);
1:  
1:  typedef u64 (*btf_bpf_skb_load_bytes)(const struct sk_buff *, u32, void *, u32);
1:  
1: -typedef u64 (*btf_bpf_flow_dissector_load_bytes)(const struct bpf_flow_dissector *, u32, void *, u32);
1: +typedef u64 (*btf_bpf_flow_dissector_load_bytes)(
1: +    const struct bpf_flow_dissector *, u32, void *, u32);
1:  
1: -typedef u64 (*btf_bpf_skb_load_bytes_relative)(const struct sk_buff *, u32, void *, u32, u32);
1: +typedef u64 (*btf_bpf_skb_load_bytes_relative)(const struct sk_buff *, u32,
1: +                                               void *, u32, u32);
1:  
1:  typedef u64 (*btf_bpf_skb_pull_data)(struct sk_buff *, u32);
1:  
1: @@ -113956,9 +115194,9 @@ typedef u64 (*btf_bpf_csum_update)(struct sk_buff *, __wsum);
1:  typedef u64 (*btf_bpf_csum_level)(struct sk_buff *, u64);
1:  
1:  enum {
1: -	BPF_F_NEIGH = 2,
1: -	BPF_F_PEER = 4,
1: -	BPF_F_NEXTHOP = 8,
1: +  BPF_F_NEIGH = 2,
1: +  BPF_F_PEER = 4,
1: +  BPF_F_NEXTHOP = 8,
1:  };
1:  
1:  typedef u64 (*btf_bpf_clone_redirect)(struct sk_buff *, u32, u64);
1: @@ -114023,17 +115261,22 @@ typedef u64 (*btf_bpf_xdp_redirect)(u32, u64);
1:  
1:  typedef u64 (*btf_bpf_xdp_redirect_map)(struct bpf_map *, u32, u64);
1:  
1: -typedef u64 (*btf_bpf_skb_event_output)(struct sk_buff *, struct bpf_map *, u64, void *, u64);
1: +typedef u64 (*btf_bpf_skb_event_output)(struct sk_buff *, struct bpf_map *, u64,
1: +                                        void *, u64);
1:  
1: -typedef u64 (*btf_bpf_skb_get_tunnel_key)(struct sk_buff *, struct bpf_tunnel_key *, u32, u64);
1: +typedef u64 (*btf_bpf_skb_get_tunnel_key)(struct sk_buff *,
1: +                                          struct bpf_tunnel_key *, u32, u64);
1:  
1:  typedef u64 (*btf_bpf_skb_get_tunnel_opt)(struct sk_buff *, u8 *, u32);
1:  
1: -typedef u64 (*btf_bpf_skb_set_tunnel_key)(struct sk_buff *, const struct bpf_tunnel_key *, u32, u64);
1: +typedef u64 (*btf_bpf_skb_set_tunnel_key)(struct sk_buff *,
1: +                                          const struct bpf_tunnel_key *, u32,
1: +                                          u64);
1:  
1:  typedef u64 (*btf_bpf_skb_set_tunnel_opt)(struct sk_buff *, const u8 *, u32);
1:  
1: -typedef u64 (*btf_bpf_skb_under_cgroup)(struct sk_buff *, struct bpf_map *, u32);
1: +typedef u64 (*btf_bpf_skb_under_cgroup)(struct sk_buff *, struct bpf_map *,
1: +                                        u32);
1:  
1:  typedef u64 (*btf_bpf_skb_cgroup_id)(const struct sk_buff *);
1:  
1: @@ -114043,7 +115286,8 @@ typedef u64 (*btf_bpf_sk_cgroup_id)(struct sock *);
1:  
1:  typedef u64 (*btf_bpf_sk_ancestor_cgroup_id)(struct sock *, int);
1:  
1: -typedef u64 (*btf_bpf_xdp_event_output)(struct xdp_buff *, struct bpf_map *, u64, void *, u64);
1: +typedef u64 (*btf_bpf_xdp_event_output)(struct xdp_buff *, struct bpf_map *,
1: +                                        u64, void *, u64);
1:  
1:  typedef u64 (*btf_bpf_get_socket_cookie)(struct sk_buff *);
1:  
1: @@ -114059,53 +115303,77 @@ typedef u64 (*btf_bpf_get_netns_cookie_sock_addr)(struct bpf_sock_addr_kern *);
1:  
1:  typedef u64 (*btf_bpf_get_socket_uid)(struct sk_buff *);
1:  
1: -typedef u64 (*btf_bpf_sock_addr_setsockopt)(struct bpf_sock_addr_kern *, int, int, char *, int);
1: +typedef u64 (*btf_bpf_sock_addr_setsockopt)(struct bpf_sock_addr_kern *, int,
1: +                                            int, char *, int);
1:  
1: -typedef u64 (*btf_bpf_sock_addr_getsockopt)(struct bpf_sock_addr_kern *, int, int, char *, int);
1: +typedef u64 (*btf_bpf_sock_addr_getsockopt)(struct bpf_sock_addr_kern *, int,
1: +                                            int, char *, int);
1:  
1: -typedef u64 (*btf_bpf_sock_ops_setsockopt)(struct bpf_sock_ops_kern *, int, int, char *, int);
1: +typedef u64 (*btf_bpf_sock_ops_setsockopt)(struct bpf_sock_ops_kern *, int, int,
1: +                                           char *, int);
1:  
1: -typedef u64 (*btf_bpf_sock_ops_getsockopt)(struct bpf_sock_ops_kern *, int, int, char *, int);
1: +typedef u64 (*btf_bpf_sock_ops_getsockopt)(struct bpf_sock_ops_kern *, int, int,
1: +                                           char *, int);
1:  
1:  typedef u64 (*btf_bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops_kern *, int);
1:  
1: -typedef u64 (*btf_bpf_bind)(struct bpf_sock_addr_kern *, struct sockaddr *, int);
1: +typedef u64 (*btf_bpf_bind)(struct bpf_sock_addr_kern *, struct sockaddr *,
1: +                            int);
1:  
1: -typedef u64 (*btf_bpf_skb_get_xfrm_state)(struct sk_buff *, u32, struct bpf_xfrm_state *, u32, u64);
1: +typedef u64 (*btf_bpf_skb_get_xfrm_state)(struct sk_buff *, u32,
1: +                                          struct bpf_xfrm_state *, u32, u64);
1:  
1: -typedef u64 (*btf_bpf_xdp_fib_lookup)(struct xdp_buff *, struct bpf_fib_lookup *, int, u32);
1: +typedef u64 (*btf_bpf_xdp_fib_lookup)(struct xdp_buff *,
1: +                                      struct bpf_fib_lookup *, int, u32);
1:  
1: -typedef u64 (*btf_bpf_skb_fib_lookup)(struct sk_buff *, struct bpf_fib_lookup *, int, u32);
1: +typedef u64 (*btf_bpf_skb_fib_lookup)(struct sk_buff *, struct bpf_fib_lookup *,
1: +                                      int, u32);
1:  
1:  typedef u64 (*btf_bpf_lwt_in_push_encap)(struct sk_buff *, u32, void *, u32);
1:  
1:  typedef u64 (*btf_bpf_lwt_xmit_push_encap)(struct sk_buff *, u32, void *, u32);
1:  
1: -typedef u64 (*btf_bpf_lwt_seg6_store_bytes)(struct sk_buff *, u32, const void *, u32);
1: +typedef u64 (*btf_bpf_lwt_seg6_store_bytes)(struct sk_buff *, u32, const void *,
1: +                                            u32);
1:  
1:  typedef u64 (*btf_bpf_lwt_seg6_action)(struct sk_buff *, u32, void *, u32);
1:  
1:  typedef u64 (*btf_bpf_lwt_seg6_adjust_srh)(struct sk_buff *, u32, s32);
1:  
1: -typedef u64 (*btf_bpf_skc_lookup_tcp)(struct sk_buff *, struct bpf_sock_tuple *, u32, u64, u64);
1: +typedef u64 (*btf_bpf_skc_lookup_tcp)(struct sk_buff *, struct bpf_sock_tuple *,
1: +                                      u32, u64, u64);
1:  
1: -typedef u64 (*btf_bpf_sk_lookup_tcp)(struct sk_buff *, struct bpf_sock_tuple *, u32, u64, u64);
1: +typedef u64 (*btf_bpf_sk_lookup_tcp)(struct sk_buff *, struct bpf_sock_tuple *,
1: +                                     u32, u64, u64);
1:  
1: -typedef u64 (*btf_bpf_sk_lookup_udp)(struct sk_buff *, struct bpf_sock_tuple *, u32, u64, u64);
1: +typedef u64 (*btf_bpf_sk_lookup_udp)(struct sk_buff *, struct bpf_sock_tuple *,
1: +                                     u32, u64, u64);
1:  
1:  typedef u64 (*btf_bpf_sk_release)(struct sock *);
1:  
1: -typedef u64 (*btf_bpf_xdp_sk_lookup_udp)(struct xdp_buff *, struct bpf_sock_tuple *, u32, u32, u64);
1: +typedef u64 (*btf_bpf_xdp_sk_lookup_udp)(struct xdp_buff *,
1: +                                         struct bpf_sock_tuple *, u32, u32,
1: +                                         u64);
1:  
1: -typedef u64 (*btf_bpf_xdp_skc_lookup_tcp)(struct xdp_buff *, struct bpf_sock_tuple *, u32, u32, u64);
1: +typedef u64 (*btf_bpf_xdp_skc_lookup_tcp)(struct xdp_buff *,
1: +                                          struct bpf_sock_tuple *, u32, u32,
1: +                                          u64);
1:  
1: -typedef u64 (*btf_bpf_xdp_sk_lookup_tcp)(struct xdp_buff *, struct bpf_sock_tuple *, u32, u32, u64);
1: +typedef u64 (*btf_bpf_xdp_sk_lookup_tcp)(struct xdp_buff *,
1: +                                         struct bpf_sock_tuple *, u32, u32,
1: +                                         u64);
1:  
1: -typedef u64 (*btf_bpf_sock_addr_skc_lookup_tcp)(struct bpf_sock_addr_kern *, struct bpf_sock_tuple *, u32, u64, u64);
1: +typedef u64 (*btf_bpf_sock_addr_skc_lookup_tcp)(struct bpf_sock_addr_kern *,
1: +                                                struct bpf_sock_tuple *, u32,
1: +                                                u64, u64);
1:  
1: -typedef u64 (*btf_bpf_sock_addr_sk_lookup_tcp)(struct bpf_sock_addr_kern *, struct bpf_sock_tuple *, u32, u64, u64);
1: +typedef u64 (*btf_bpf_sock_addr_sk_lookup_tcp)(struct bpf_sock_addr_kern *,
1: +                                               struct bpf_sock_tuple *, u32,
1: +                                               u64, u64);
1:  
1: -typedef u64 (*btf_bpf_sock_addr_sk_lookup_udp)(struct bpf_sock_addr_kern *, struct bpf_sock_tuple *, u32, u64, u64);
1: +typedef u64 (*btf_bpf_sock_addr_sk_lookup_udp)(struct bpf_sock_addr_kern *,
1: +                                               struct bpf_sock_tuple *, u32,
1: +                                               u64, u64);
1:  
1:  typedef u64 (*btf_bpf_tcp_sock)(struct sock *);
1:  
1: @@ -114113,25 +115381,34 @@ typedef u64 (*btf_bpf_get_listener_sock)(struct sock *);
1:  
1:  typedef u64 (*btf_bpf_skb_ecn_set_ce)(struct sk_buff *);
1:  
1: -typedef u64 (*btf_bpf_tcp_check_syncookie)(struct sock *, void *, u32, struct tcphdr *, u32);
1: +typedef u64 (*btf_bpf_tcp_check_syncookie)(struct sock *, void *, u32,
1: +                                           struct tcphdr *, u32);
1:  
1: -typedef u64 (*btf_bpf_tcp_gen_syncookie)(struct sock *, void *, u32, struct tcphdr *, u32);
1: +typedef u64 (*btf_bpf_tcp_gen_syncookie)(struct sock *, void *, u32,
1: +                                         struct tcphdr *, u32);
1:  
1:  typedef u64 (*btf_bpf_sk_assign)(struct sk_buff *, struct sock *, u64);
1:  
1: -typedef u64 (*btf_bpf_sock_ops_load_hdr_opt)(struct bpf_sock_ops_kern *, void *, u32, u64);
1: +typedef u64 (*btf_bpf_sock_ops_load_hdr_opt)(struct bpf_sock_ops_kern *, void *,
1: +                                             u32, u64);
1:  
1: -typedef u64 (*btf_bpf_sock_ops_store_hdr_opt)(struct bpf_sock_ops_kern *, const void *, u32, u64);
1: +typedef u64 (*btf_bpf_sock_ops_store_hdr_opt)(struct bpf_sock_ops_kern *,
1: +                                              const void *, u32, u64);
1:  
1: -typedef u64 (*btf_bpf_sock_ops_reserve_hdr_opt)(struct bpf_sock_ops_kern *, u32, u64);
1: +typedef u64 (*btf_bpf_sock_ops_reserve_hdr_opt)(struct bpf_sock_ops_kern *, u32,
1: +                                                u64);
1:  
1: -typedef u64 (*btf_sk_select_reuseport)(struct sk_reuseport_kern *, struct bpf_map *, void *, u32);
1: +typedef u64 (*btf_sk_select_reuseport)(struct sk_reuseport_kern *,
1: +                                       struct bpf_map *, void *, u32);
1:  
1: -typedef u64 (*btf_sk_reuseport_load_bytes)(const struct sk_reuseport_kern *, u32, void *, u32);
1: +typedef u64 (*btf_sk_reuseport_load_bytes)(const struct sk_reuseport_kern *,
1: +                                           u32, void *, u32);
1:  
1: -typedef u64 (*btf_sk_reuseport_load_bytes_relative)(const struct sk_reuseport_kern *, u32, void *, u32, u32);
1: +typedef u64 (*btf_sk_reuseport_load_bytes_relative)(
1: +    const struct sk_reuseport_kern *, u32, void *, u32, u32);
1:  
1: -typedef u64 (*btf_bpf_sk_lookup_assign)(struct bpf_sk_lookup_kern *, struct sock *, u64);
1: +typedef u64 (*btf_bpf_sk_lookup_assign)(struct bpf_sk_lookup_kern *,
1: +                                        struct sock *, u64);
1:  
1:  typedef u64 (*btf_bpf_skc_to_tcp6_sock)(struct sock *);
1:  
1: @@ -114146,237 +115423,237 @@ typedef u64 (*btf_bpf_skc_to_udp6_sock)(struct sock *);
1:  struct bpf_dtab_netdev___2;
1:  
1:  enum {
1: -	INET_DIAG_REQ_NONE = 0,
1: -	INET_DIAG_REQ_BYTECODE = 1,
1: -	INET_DIAG_REQ_SK_BPF_STORAGES = 2,
1: -	INET_DIAG_REQ_PROTOCOL = 3,
1: -	__INET_DIAG_REQ_MAX = 4,
1: +  INET_DIAG_REQ_NONE = 0,
1: +  INET_DIAG_REQ_BYTECODE = 1,
1: +  INET_DIAG_REQ_SK_BPF_STORAGES = 2,
1: +  INET_DIAG_REQ_PROTOCOL = 3,
1: +  __INET_DIAG_REQ_MAX = 4,
1:  };
1:  
1:  struct sock_diag_req {
1: -	__u8 sdiag_family;
1: -	__u8 sdiag_protocol;
1: +  __u8 sdiag_family;
1: +  __u8 sdiag_protocol;
1:  };
1:  
1:  struct sock_diag_handler {
1: -	__u8 family;
1: -	int (*dump)(struct sk_buff *, struct nlmsghdr *);
1: -	int (*get_info)(struct sk_buff *, struct sock *);
1: -	int (*destroy)(struct sk_buff *, struct nlmsghdr *);
1: +  __u8 family;
1: +  int (*dump)(struct sk_buff *, struct nlmsghdr *);
1: +  int (*get_info)(struct sk_buff *, struct sock *);
1: +  int (*destroy)(struct sk_buff *, struct nlmsghdr *);
1:  };
1:  
1:  struct broadcast_sk {
1: -	struct sock *sk;
1: -	struct work_struct work;
1: +  struct sock *sk;
1: +  struct work_struct work;
1:  };
1:  
1:  typedef int gifconf_func_t(struct net_device *, char *, int, int);
1:  
1:  struct tso_t {
1: -	int next_frag_idx;
1: -	int size;
1: -	void *data;
1: -	u16 ip_id;
1: -	u8 tlen;
1: -	bool ipv6;
1: -	u32 tcp_seq;
1: +  int next_frag_idx;
1: +  int size;
1: +  void *data;
1: +  u16 ip_id;
1: +  u8 tlen;
1: +  bool ipv6;
1: +  u32 tcp_seq;
1:  };
1:  
1:  struct fib_notifier_net {
1: -	struct list_head fib_notifier_ops;
1: -	struct atomic_notifier_head fib_chain;
1: +  struct list_head fib_notifier_ops;
1: +  struct atomic_notifier_head fib_chain;
1:  };
1:  
1:  struct xdp_frame_bulk {
1: -	int count;
1: -	void *xa;
1: -	void *q[16];
1: +  int count;
1: +  void *xa;
1: +  void *q[16];
1:  };
1:  
1:  struct pp_alloc_cache {
1: -	u32 count;
1: -	void *cache[128];
1: +  u32 count;
1: +  void *cache[128];
1:  };
1:  
1:  struct page_pool_params {
1: -	unsigned int flags;
1: -	unsigned int order;
1: -	unsigned int pool_size;
1: -	int nid;
1: -	struct device *dev;
1: -	enum dma_data_direction dma_dir;
1: -	unsigned int max_len;
1: -	unsigned int offset;
1: +  unsigned int flags;
1: +  unsigned int order;
1: +  unsigned int pool_size;
1: +  int nid;
1: +  struct device *dev;
1: +  enum dma_data_direction dma_dir;
1: +  unsigned int max_len;
1: +  unsigned int offset;
1:  };
1:  
1:  struct page_pool {
1: -	struct page_pool_params p;
1: -	struct delayed_work release_dw;
1: -	void (*disconnect)(void *);
1: -	long unsigned int defer_start;
1: -	long unsigned int defer_warn;
1: -	u32 pages_state_hold_cnt;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct pp_alloc_cache alloc;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct ptr_ring ring;
1: -	atomic_t pages_state_release_cnt;
1: -	refcount_t user_cnt;
1: -	u64 destroy_cnt;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct page_pool_params p;
1: +  struct delayed_work release_dw;
1: +  void (*disconnect)(void *);
1: +  long unsigned int defer_start;
1: +  long unsigned int defer_warn;
1: +  u32 pages_state_hold_cnt;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct pp_alloc_cache alloc;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct ptr_ring ring;
1: +  atomic_t pages_state_release_cnt;
1: +  refcount_t user_cnt;
1: +  u64 destroy_cnt;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct flow_dissector_key_ct {
1: -	u16 ct_state;
1: -	u16 ct_zone;
1: -	u32 ct_mark;
1: -	u32 ct_labels[4];
1: +  u16 ct_state;
1: +  u16 ct_zone;
1: +  u32 ct_mark;
1: +  u32 ct_labels[4];
1:  };
1:  
1:  struct flow_match {
1: -	struct flow_dissector *dissector;
1: -	void *mask;
1: -	void *key;
1: +  struct flow_dissector *dissector;
1: +  void *mask;
1: +  void *key;
1:  };
1:  
1:  struct flow_match_meta {
1: -	struct flow_dissector_key_meta *key;
1: -	struct flow_dissector_key_meta *mask;
1: +  struct flow_dissector_key_meta *key;
1: +  struct flow_dissector_key_meta *mask;
1:  };
1:  
1:  struct flow_match_basic {
1: -	struct flow_dissector_key_basic *key;
1: -	struct flow_dissector_key_basic *mask;
1: +  struct flow_dissector_key_basic *key;
1: +  struct flow_dissector_key_basic *mask;
1:  };
1:  
1:  struct flow_match_control {
1: -	struct flow_dissector_key_control *key;
1: -	struct flow_dissector_key_control *mask;
1: +  struct flow_dissector_key_control *key;
1: +  struct flow_dissector_key_control *mask;
1:  };
1:  
1:  struct flow_match_eth_addrs {
1: -	struct flow_dissector_key_eth_addrs *key;
1: -	struct flow_dissector_key_eth_addrs *mask;
1: +  struct flow_dissector_key_eth_addrs *key;
1: +  struct flow_dissector_key_eth_addrs *mask;
1:  };
1:  
1:  struct flow_match_vlan {
1: -	struct flow_dissector_key_vlan *key;
1: -	struct flow_dissector_key_vlan *mask;
1: +  struct flow_dissector_key_vlan *key;
1: +  struct flow_dissector_key_vlan *mask;
1:  };
1:  
1:  struct flow_match_ipv4_addrs {
1: -	struct flow_dissector_key_ipv4_addrs *key;
1: -	struct flow_dissector_key_ipv4_addrs *mask;
1: +  struct flow_dissector_key_ipv4_addrs *key;
1: +  struct flow_dissector_key_ipv4_addrs *mask;
1:  };
1:  
1:  struct flow_match_ipv6_addrs {
1: -	struct flow_dissector_key_ipv6_addrs *key;
1: -	struct flow_dissector_key_ipv6_addrs *mask;
1: +  struct flow_dissector_key_ipv6_addrs *key;
1: +  struct flow_dissector_key_ipv6_addrs *mask;
1:  };
1:  
1:  struct flow_match_ip {
1: -	struct flow_dissector_key_ip *key;
1: -	struct flow_dissector_key_ip *mask;
1: +  struct flow_dissector_key_ip *key;
1: +  struct flow_dissector_key_ip *mask;
1:  };
1:  
1:  struct flow_match_ports {
1: -	struct flow_dissector_key_ports *key;
1: -	struct flow_dissector_key_ports *mask;
1: +  struct flow_dissector_key_ports *key;
1: +  struct flow_dissector_key_ports *mask;
1:  };
1:  
1:  struct flow_match_icmp {
1: -	struct flow_dissector_key_icmp *key;
1: -	struct flow_dissector_key_icmp *mask;
1: +  struct flow_dissector_key_icmp *key;
1: +  struct flow_dissector_key_icmp *mask;
1:  };
1:  
1:  struct flow_match_tcp {
1: -	struct flow_dissector_key_tcp *key;
1: -	struct flow_dissector_key_tcp *mask;
1: +  struct flow_dissector_key_tcp *key;
1: +  struct flow_dissector_key_tcp *mask;
1:  };
1:  
1:  struct flow_match_mpls {
1: -	struct flow_dissector_key_mpls *key;
1: -	struct flow_dissector_key_mpls *mask;
1: +  struct flow_dissector_key_mpls *key;
1: +  struct flow_dissector_key_mpls *mask;
1:  };
1:  
1:  struct flow_match_enc_keyid {
1: -	struct flow_dissector_key_keyid *key;
1: -	struct flow_dissector_key_keyid *mask;
1: +  struct flow_dissector_key_keyid *key;
1: +  struct flow_dissector_key_keyid *mask;
1:  };
1:  
1:  struct flow_match_enc_opts {
1: -	struct flow_dissector_key_enc_opts *key;
1: -	struct flow_dissector_key_enc_opts *mask;
1: +  struct flow_dissector_key_enc_opts *key;
1: +  struct flow_dissector_key_enc_opts *mask;
1:  };
1:  
1:  struct flow_match_ct {
1: -	struct flow_dissector_key_ct *key;
1: -	struct flow_dissector_key_ct *mask;
1: +  struct flow_dissector_key_ct *key;
1: +  struct flow_dissector_key_ct *mask;
1:  };
1:  
1:  enum flow_action_id {
1: -	FLOW_ACTION_ACCEPT = 0,
1: -	FLOW_ACTION_DROP = 1,
1: -	FLOW_ACTION_TRAP = 2,
1: -	FLOW_ACTION_GOTO = 3,
1: -	FLOW_ACTION_REDIRECT = 4,
1: -	FLOW_ACTION_MIRRED = 5,
1: -	FLOW_ACTION_REDIRECT_INGRESS = 6,
1: -	FLOW_ACTION_MIRRED_INGRESS = 7,
1: -	FLOW_ACTION_VLAN_PUSH = 8,
1: -	FLOW_ACTION_VLAN_POP = 9,
1: -	FLOW_ACTION_VLAN_MANGLE = 10,
1: -	FLOW_ACTION_TUNNEL_ENCAP = 11,
1: -	FLOW_ACTION_TUNNEL_DECAP = 12,
1: -	FLOW_ACTION_MANGLE = 13,
1: -	FLOW_ACTION_ADD = 14,
1: -	FLOW_ACTION_CSUM = 15,
1: -	FLOW_ACTION_MARK = 16,
1: -	FLOW_ACTION_PTYPE = 17,
1: -	FLOW_ACTION_PRIORITY = 18,
1: -	FLOW_ACTION_WAKE = 19,
1: -	FLOW_ACTION_QUEUE = 20,
1: -	FLOW_ACTION_SAMPLE = 21,
1: -	FLOW_ACTION_POLICE = 22,
1: -	FLOW_ACTION_CT = 23,
1: -	FLOW_ACTION_CT_METADATA = 24,
1: -	FLOW_ACTION_MPLS_PUSH = 25,
1: -	FLOW_ACTION_MPLS_POP = 26,
1: -	FLOW_ACTION_MPLS_MANGLE = 27,
1: -	FLOW_ACTION_GATE = 28,
1: -	NUM_FLOW_ACTIONS = 29,
1: +  FLOW_ACTION_ACCEPT = 0,
1: +  FLOW_ACTION_DROP = 1,
1: +  FLOW_ACTION_TRAP = 2,
1: +  FLOW_ACTION_GOTO = 3,
1: +  FLOW_ACTION_REDIRECT = 4,
1: +  FLOW_ACTION_MIRRED = 5,
1: +  FLOW_ACTION_REDIRECT_INGRESS = 6,
1: +  FLOW_ACTION_MIRRED_INGRESS = 7,
1: +  FLOW_ACTION_VLAN_PUSH = 8,
1: +  FLOW_ACTION_VLAN_POP = 9,
1: +  FLOW_ACTION_VLAN_MANGLE = 10,
1: +  FLOW_ACTION_TUNNEL_ENCAP = 11,
1: +  FLOW_ACTION_TUNNEL_DECAP = 12,
1: +  FLOW_ACTION_MANGLE = 13,
1: +  FLOW_ACTION_ADD = 14,
1: +  FLOW_ACTION_CSUM = 15,
1: +  FLOW_ACTION_MARK = 16,
1: +  FLOW_ACTION_PTYPE = 17,
1: +  FLOW_ACTION_PRIORITY = 18,
1: +  FLOW_ACTION_WAKE = 19,
1: +  FLOW_ACTION_QUEUE = 20,
1: +  FLOW_ACTION_SAMPLE = 21,
1: +  FLOW_ACTION_POLICE = 22,
1: +  FLOW_ACTION_CT = 23,
1: +  FLOW_ACTION_CT_METADATA = 24,
1: +  FLOW_ACTION_MPLS_PUSH = 25,
1: +  FLOW_ACTION_MPLS_POP = 26,
1: +  FLOW_ACTION_MPLS_MANGLE = 27,
1: +  FLOW_ACTION_GATE = 28,
1: +  NUM_FLOW_ACTIONS = 29,
1:  };
1:  
1:  enum flow_action_mangle_base {
1: -	FLOW_ACT_MANGLE_UNSPEC = 0,
1: -	FLOW_ACT_MANGLE_HDR_TYPE_ETH = 1,
1: -	FLOW_ACT_MANGLE_HDR_TYPE_IP4 = 2,
1: -	FLOW_ACT_MANGLE_HDR_TYPE_IP6 = 3,
1: -	FLOW_ACT_MANGLE_HDR_TYPE_TCP = 4,
1: -	FLOW_ACT_MANGLE_HDR_TYPE_UDP = 5,
1: +  FLOW_ACT_MANGLE_UNSPEC = 0,
1: +  FLOW_ACT_MANGLE_HDR_TYPE_ETH = 1,
1: +  FLOW_ACT_MANGLE_HDR_TYPE_IP4 = 2,
1: +  FLOW_ACT_MANGLE_HDR_TYPE_IP6 = 3,
1: +  FLOW_ACT_MANGLE_HDR_TYPE_TCP = 4,
1: +  FLOW_ACT_MANGLE_HDR_TYPE_UDP = 5,
1:  };
1:  
1:  enum flow_action_hw_stats {
1: -	FLOW_ACTION_HW_STATS_IMMEDIATE = 1,
1: -	FLOW_ACTION_HW_STATS_DELAYED = 2,
1: -	FLOW_ACTION_HW_STATS_ANY = 3,
1: -	FLOW_ACTION_HW_STATS_DISABLED = 4,
1: -	FLOW_ACTION_HW_STATS_DONT_CARE = 7,
1: +  FLOW_ACTION_HW_STATS_IMMEDIATE = 1,
1: +  FLOW_ACTION_HW_STATS_DELAYED = 2,
1: +  FLOW_ACTION_HW_STATS_ANY = 3,
1: +  FLOW_ACTION_HW_STATS_DISABLED = 4,
1: +  FLOW_ACTION_HW_STATS_DONT_CARE = 7,
1:  };
1:  
1:  typedef void (*action_destr)(void *);
1: @@ -114386,293 +115663,295 @@ struct nf_flowtable;
1:  struct action_gate_entry;
1:  
1:  struct flow_action_entry {
1: -	enum flow_action_id id;
1: -	enum flow_action_hw_stats hw_stats;
1: -	action_destr destructor;
1: -	void *destructor_priv;
1: -	union {
1: -		u32 chain_index;
1: -		struct net_device *dev;
1: -		struct {
1: -			u16 vid;
1: -			__be16 proto;
1: -			u8 prio;
1: -		} vlan;
1: -		struct {
1: -			enum flow_action_mangle_base htype;
1: -			u32 offset;
1: -			u32 mask;
1: -			u32 val;
1: -		} mangle;
1: -		struct ip_tunnel_info *tunnel;
1: -		u32 csum_flags;
1: -		u32 mark;
1: -		u16 ptype;
1: -		u32 priority;
1: -		struct {
1: -			u32 ctx;
1: -			u32 index;
1: -			u8 vf;
1: -		} queue;
1: -		struct {
1: -			struct psample_group *psample_group;
1: -			u32 rate;
1: -			u32 trunc_size;
1: -			bool truncate;
1: -		} sample;
1: -		struct {
1: -			u32 index;
1: -			u32 burst;
1: -			u64 rate_bytes_ps;
1: -			u32 mtu;
1: -		} police;
1: -		struct {
1: -			int action;
1: -			u16 zone;
1: -			struct nf_flowtable *flow_table;
1: -		} ct;
1: -		struct {
1: -			long unsigned int cookie;
1: -			u32 mark;
1: -			u32 labels[4];
1: -		} ct_metadata;
1: -		struct {
1: -			u32 label;
1: -			__be16 proto;
1: -			u8 tc;
1: -			u8 bos;
1: -			u8 ttl;
1: -		} mpls_push;
1: -		struct {
1: -			__be16 proto;
1: -		} mpls_pop;
1: -		struct {
1: -			u32 label;
1: -			u8 tc;
1: -			u8 bos;
1: -			u8 ttl;
1: -		} mpls_mangle;
1: -		struct {
1: -			u32 index;
1: -			s32 prio;
1: -			u64 basetime;
1: -			u64 cycletime;
1: -			u64 cycletimeext;
1: -			u32 num_entries;
1: -			struct action_gate_entry *entries;
1: -		} gate;
1: -	};
1: -	struct flow_action_cookie *cookie;
1: +  enum flow_action_id id;
1: +  enum flow_action_hw_stats hw_stats;
1: +  action_destr destructor;
1: +  void *destructor_priv;
1: +  union {
1: +    u32 chain_index;
1: +    struct net_device *dev;
1: +    struct {
1: +      u16 vid;
1: +      __be16 proto;
1: +      u8 prio;
1: +    } vlan;
1: +    struct {
1: +      enum flow_action_mangle_base htype;
1: +      u32 offset;
1: +      u32 mask;
1: +      u32 val;
1: +    } mangle;
1: +    struct ip_tunnel_info *tunnel;
1: +    u32 csum_flags;
1: +    u32 mark;
1: +    u16 ptype;
1: +    u32 priority;
1: +    struct {
1: +      u32 ctx;
1: +      u32 index;
1: +      u8 vf;
1: +    } queue;
1: +    struct {
1: +      struct psample_group *psample_group;
1: +      u32 rate;
1: +      u32 trunc_size;
1: +      bool truncate;
1: +    } sample;
1: +    struct {
1: +      u32 index;
1: +      u32 burst;
1: +      u64 rate_bytes_ps;
1: +      u32 mtu;
1: +    } police;
1: +    struct {
1: +      int action;
1: +      u16 zone;
1: +      struct nf_flowtable *flow_table;
1: +    } ct;
1: +    struct {
1: +      long unsigned int cookie;
1: +      u32 mark;
1: +      u32 labels[4];
1: +    } ct_metadata;
1: +    struct {
1: +      u32 label;
1: +      __be16 proto;
1: +      u8 tc;
1: +      u8 bos;
1: +      u8 ttl;
1: +    } mpls_push;
1: +    struct {
1: +      __be16 proto;
1: +    } mpls_pop;
1: +    struct {
1: +      u32 label;
1: +      u8 tc;
1: +      u8 bos;
1: +      u8 ttl;
1: +    } mpls_mangle;
1: +    struct {
1: +      u32 index;
1: +      s32 prio;
1: +      u64 basetime;
1: +      u64 cycletime;
1: +      u64 cycletimeext;
1: +      u32 num_entries;
1: +      struct action_gate_entry *entries;
1: +    } gate;
1: +  };
1: +  struct flow_action_cookie *cookie;
1:  };
1:  
1:  struct flow_action {
1: -	unsigned int num_entries;
1: -	struct flow_action_entry entries[0];
1: +  unsigned int num_entries;
1: +  struct flow_action_entry entries[0];
1:  };
1:  
1:  struct flow_rule {
1: -	struct flow_match match;
1: -	struct flow_action action;
1: +  struct flow_match match;
1: +  struct flow_action action;
1:  };
1:  
1:  enum flow_block_command {
1: -	FLOW_BLOCK_BIND = 0,
1: -	FLOW_BLOCK_UNBIND = 1,
1: +  FLOW_BLOCK_BIND = 0,
1: +  FLOW_BLOCK_UNBIND = 1,
1:  };
1:  
1:  enum flow_block_binder_type {
1: -	FLOW_BLOCK_BINDER_TYPE_UNSPEC = 0,
1: -	FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS = 1,
1: -	FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS = 2,
1: -	FLOW_BLOCK_BINDER_TYPE_RED_EARLY_DROP = 3,
1: -	FLOW_BLOCK_BINDER_TYPE_RED_MARK = 4,
1: +  FLOW_BLOCK_BINDER_TYPE_UNSPEC = 0,
1: +  FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS = 1,
1: +  FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS = 2,
1: +  FLOW_BLOCK_BINDER_TYPE_RED_EARLY_DROP = 3,
1: +  FLOW_BLOCK_BINDER_TYPE_RED_MARK = 4,
1:  };
1:  
1:  struct flow_block_offload {
1: -	enum flow_block_command command;
1: -	enum flow_block_binder_type binder_type;
1: -	bool block_shared;
1: -	bool unlocked_driver_cb;
1: -	struct net *net;
1: -	struct flow_block *block;
1: -	struct list_head cb_list;
1: -	struct list_head *driver_block_list;
1: -	struct netlink_ext_ack *extack;
1: -	struct Qdisc *sch;
1: +  enum flow_block_command command;
1: +  enum flow_block_binder_type binder_type;
1: +  bool block_shared;
1: +  bool unlocked_driver_cb;
1: +  struct net *net;
1: +  struct flow_block *block;
1: +  struct list_head cb_list;
1: +  struct list_head *driver_block_list;
1: +  struct netlink_ext_ack *extack;
1: +  struct Qdisc *sch;
1:  };
1:  
1:  struct flow_block_cb;
1:  
1:  struct flow_block_indr {
1: -	struct list_head list;
1: -	struct net_device *dev;
1: -	struct Qdisc *sch;
1: -	enum flow_block_binder_type binder_type;
1: -	void *data;
1: -	void *cb_priv;
1: -	void (*cleanup)(struct flow_block_cb *);
1: +  struct list_head list;
1: +  struct net_device *dev;
1: +  struct Qdisc *sch;
1: +  enum flow_block_binder_type binder_type;
1: +  void *data;
1: +  void *cb_priv;
1: +  void (*cleanup)(struct flow_block_cb *);
1:  };
1:  
1:  struct flow_block_cb {
1: -	struct list_head driver_list;
1: -	struct list_head list;
1: -	flow_setup_cb_t *cb;
1: -	void *cb_ident;
1: -	void *cb_priv;
1: -	void (*release)(void *);
1: -	struct flow_block_indr indr;
1: -	unsigned int refcnt;
1: +  struct list_head driver_list;
1: +  struct list_head list;
1: +  flow_setup_cb_t *cb;
1: +  void *cb_ident;
1: +  void *cb_priv;
1: +  void (*release)(void *);
1: +  struct flow_block_indr indr;
1: +  unsigned int refcnt;
1:  };
1:  
1: -typedef int flow_indr_block_bind_cb_t(struct net_device *, struct Qdisc *, void *, enum tc_setup_type, void *, void *, void (*)(struct flow_block_cb *));
1: +typedef int flow_indr_block_bind_cb_t(struct net_device *, struct Qdisc *,
1: +                                      void *, enum tc_setup_type, void *,
1: +                                      void *, void (*)(struct flow_block_cb *));
1:  
1:  struct flow_indr_dev {
1: -	struct list_head list;
1: -	flow_indr_block_bind_cb_t *cb;
1: -	void *cb_priv;
1: -	refcount_t refcnt;
1: -	struct callback_head rcu;
1: +  struct list_head list;
1: +  flow_indr_block_bind_cb_t *cb;
1: +  void *cb_priv;
1: +  refcount_t refcnt;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netdev_queue_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct netdev_queue *, char *);
1: -	ssize_t (*store)(struct netdev_queue *, const char *, size_t);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct netdev_queue *, char *);
1: +  ssize_t (*store)(struct netdev_queue *, const char *, size_t);
1:  };
1:  
1:  enum __sk_action {
1: -	__SK_DROP = 0,
1: -	__SK_PASS = 1,
1: -	__SK_REDIRECT = 2,
1: -	__SK_NONE = 3,
1: +  __SK_DROP = 0,
1: +  __SK_PASS = 1,
1: +  __SK_REDIRECT = 2,
1: +  __SK_NONE = 3,
1:  };
1:  
1:  struct sk_psock_progs {
1: -	struct bpf_prog *msg_parser;
1: -	struct bpf_prog *skb_parser;
1: -	struct bpf_prog *skb_verdict;
1: +  struct bpf_prog *msg_parser;
1: +  struct bpf_prog *skb_parser;
1: +  struct bpf_prog *skb_verdict;
1:  };
1:  
1:  enum sk_psock_state_bits {
1: -	SK_PSOCK_TX_ENABLED = 0,
1: +  SK_PSOCK_TX_ENABLED = 0,
1:  };
1:  
1:  struct sk_psock_link {
1: -	struct list_head list;
1: -	struct bpf_map *map;
1: -	void *link_raw;
1: +  struct list_head list;
1: +  struct bpf_map *map;
1: +  void *link_raw;
1:  };
1:  
1:  struct sk_psock_parser {
1: -	struct strparser strp;
1: -	bool enabled;
1: -	void (*saved_data_ready)(struct sock *);
1: +  struct strparser strp;
1: +  bool enabled;
1: +  void (*saved_data_ready)(struct sock *);
1:  };
1:  
1:  struct sk_psock_work_state {
1: -	struct sk_buff *skb;
1: -	u32 len;
1: -	u32 off;
1: +  struct sk_buff *skb;
1: +  u32 len;
1: +  u32 off;
1:  };
1:  
1:  struct sk_psock {
1: -	struct sock *sk;
1: -	struct sock *sk_redir;
1: -	u32 apply_bytes;
1: -	u32 cork_bytes;
1: -	u32 eval;
1: -	struct sk_msg *cork;
1: -	struct sk_psock_progs progs;
1: -	struct sk_psock_parser parser;
1: -	struct sk_buff_head ingress_skb;
1: -	struct list_head ingress_msg;
1: -	long unsigned int state;
1: -	struct list_head link;
1: -	spinlock_t link_lock;
1: -	refcount_t refcnt;
1: -	void (*saved_unhash)(struct sock *);
1: -	void (*saved_close)(struct sock *, long int);
1: -	void (*saved_write_space)(struct sock *);
1: -	struct proto *sk_proto;
1: -	struct sk_psock_work_state work_state;
1: -	struct work_struct work;
1: -	union {
1: -		struct callback_head rcu;
1: -		struct work_struct gc;
1: -	};
1: +  struct sock *sk;
1: +  struct sock *sk_redir;
1: +  u32 apply_bytes;
1: +  u32 cork_bytes;
1: +  u32 eval;
1: +  struct sk_msg *cork;
1: +  struct sk_psock_progs progs;
1: +  struct sk_psock_parser parser;
1: +  struct sk_buff_head ingress_skb;
1: +  struct list_head ingress_msg;
1: +  long unsigned int state;
1: +  struct list_head link;
1: +  spinlock_t link_lock;
1: +  refcount_t refcnt;
1: +  void (*saved_unhash)(struct sock *);
1: +  void (*saved_close)(struct sock *, long int);
1: +  void (*saved_write_space)(struct sock *);
1: +  struct proto *sk_proto;
1: +  struct sk_psock_work_state work_state;
1: +  struct work_struct work;
1: +  union {
1: +    struct callback_head rcu;
1: +    struct work_struct gc;
1: +  };
1:  };
1:  
1:  struct fib_rule_uid_range {
1: -	__u32 start;
1: -	__u32 end;
1: -};
1: -
1: -enum {
1: -	FRA_UNSPEC = 0,
1: -	FRA_DST = 1,
1: -	FRA_SRC = 2,
1: -	FRA_IIFNAME = 3,
1: -	FRA_GOTO = 4,
1: -	FRA_UNUSED2 = 5,
1: -	FRA_PRIORITY = 6,
1: -	FRA_UNUSED3 = 7,
1: -	FRA_UNUSED4 = 8,
1: -	FRA_UNUSED5 = 9,
1: -	FRA_FWMARK = 10,
1: -	FRA_FLOW = 11,
1: -	FRA_TUN_ID = 12,
1: -	FRA_SUPPRESS_IFGROUP = 13,
1: -	FRA_SUPPRESS_PREFIXLEN = 14,
1: -	FRA_TABLE = 15,
1: -	FRA_FWMASK = 16,
1: -	FRA_OIFNAME = 17,
1: -	FRA_PAD = 18,
1: -	FRA_L3MDEV = 19,
1: -	FRA_UID_RANGE = 20,
1: -	FRA_PROTOCOL = 21,
1: -	FRA_IP_PROTO = 22,
1: -	FRA_SPORT_RANGE = 23,
1: -	FRA_DPORT_RANGE = 24,
1: -	__FRA_MAX = 25,
1: -};
1: -
1: -enum {
1: -	FR_ACT_UNSPEC = 0,
1: -	FR_ACT_TO_TBL = 1,
1: -	FR_ACT_GOTO = 2,
1: -	FR_ACT_NOP = 3,
1: -	FR_ACT_RES3 = 4,
1: -	FR_ACT_RES4 = 5,
1: -	FR_ACT_BLACKHOLE = 6,
1: -	FR_ACT_UNREACHABLE = 7,
1: -	FR_ACT_PROHIBIT = 8,
1: -	__FR_ACT_MAX = 9,
1: +  __u32 start;
1: +  __u32 end;
1: +};
1: +
1: +enum {
1: +  FRA_UNSPEC = 0,
1: +  FRA_DST = 1,
1: +  FRA_SRC = 2,
1: +  FRA_IIFNAME = 3,
1: +  FRA_GOTO = 4,
1: +  FRA_UNUSED2 = 5,
1: +  FRA_PRIORITY = 6,
1: +  FRA_UNUSED3 = 7,
1: +  FRA_UNUSED4 = 8,
1: +  FRA_UNUSED5 = 9,
1: +  FRA_FWMARK = 10,
1: +  FRA_FLOW = 11,
1: +  FRA_TUN_ID = 12,
1: +  FRA_SUPPRESS_IFGROUP = 13,
1: +  FRA_SUPPRESS_PREFIXLEN = 14,
1: +  FRA_TABLE = 15,
1: +  FRA_FWMASK = 16,
1: +  FRA_OIFNAME = 17,
1: +  FRA_PAD = 18,
1: +  FRA_L3MDEV = 19,
1: +  FRA_UID_RANGE = 20,
1: +  FRA_PROTOCOL = 21,
1: +  FRA_IP_PROTO = 22,
1: +  FRA_SPORT_RANGE = 23,
1: +  FRA_DPORT_RANGE = 24,
1: +  __FRA_MAX = 25,
1: +};
1: +
1: +enum {
1: +  FR_ACT_UNSPEC = 0,
1: +  FR_ACT_TO_TBL = 1,
1: +  FR_ACT_GOTO = 2,
1: +  FR_ACT_NOP = 3,
1: +  FR_ACT_RES3 = 4,
1: +  FR_ACT_RES4 = 5,
1: +  FR_ACT_BLACKHOLE = 6,
1: +  FR_ACT_UNREACHABLE = 7,
1: +  FR_ACT_PROHIBIT = 8,
1: +  __FR_ACT_MAX = 9,
1:  };
1:  
1:  struct fib_rule_notifier_info {
1: -	struct fib_notifier_info info;
1: -	struct fib_rule *rule;
1: +  struct fib_notifier_info info;
1: +  struct fib_rule *rule;
1:  };
1:  
1:  struct trace_event_raw_kfree_skb {
1: -	struct trace_entry ent;
1: -	void *skbaddr;
1: -	void *location;
1: -	short unsigned int protocol;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *skbaddr;
1: +  void *location;
1: +  short unsigned int protocol;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_consume_skb {
1: -	struct trace_entry ent;
1: -	void *skbaddr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *skbaddr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_skb_copy_datagram_iovec {
1: -	struct trace_entry ent;
1: -	const void *skbaddr;
1: -	int len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *skbaddr;
1: +  int len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_kfree_skb {};
1: @@ -114685,113 +115964,117 @@ typedef void (*btf_trace_kfree_skb)(void *, struct sk_buff *, void *);
1:  
1:  typedef void (*btf_trace_consume_skb)(void *, struct sk_buff *);
1:  
1: -typedef void (*btf_trace_skb_copy_datagram_iovec)(void *, const struct sk_buff *, int);
1: +typedef void (*btf_trace_skb_copy_datagram_iovec)(void *,
1: +                                                  const struct sk_buff *, int);
1:  
1:  struct trace_event_raw_net_dev_start_xmit {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u16 queue_mapping;
1: -	const void *skbaddr;
1: -	bool vlan_tagged;
1: -	u16 vlan_proto;
1: -	u16 vlan_tci;
1: -	u16 protocol;
1: -	u8 ip_summed;
1: -	unsigned int len;
1: -	unsigned int data_len;
1: -	int network_offset;
1: -	bool transport_offset_valid;
1: -	int transport_offset;
1: -	u8 tx_flags;
1: -	u16 gso_size;
1: -	u16 gso_segs;
1: -	u16 gso_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u16 queue_mapping;
1: +  const void *skbaddr;
1: +  bool vlan_tagged;
1: +  u16 vlan_proto;
1: +  u16 vlan_tci;
1: +  u16 protocol;
1: +  u8 ip_summed;
1: +  unsigned int len;
1: +  unsigned int data_len;
1: +  int network_offset;
1: +  bool transport_offset_valid;
1: +  int transport_offset;
1: +  u8 tx_flags;
1: +  u16 gso_size;
1: +  u16 gso_segs;
1: +  u16 gso_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_net_dev_xmit {
1: -	struct trace_entry ent;
1: -	void *skbaddr;
1: -	unsigned int len;
1: -	int rc;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *skbaddr;
1: +  unsigned int len;
1: +  int rc;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_net_dev_xmit_timeout {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	u32 __data_loc_driver;
1: -	int queue_index;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  u32 __data_loc_driver;
1: +  int queue_index;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_net_dev_template {
1: -	struct trace_entry ent;
1: -	void *skbaddr;
1: -	unsigned int len;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *skbaddr;
1: +  unsigned int len;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_net_dev_rx_verbose_template {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_name;
1: -	unsigned int napi_id;
1: -	u16 queue_mapping;
1: -	const void *skbaddr;
1: -	bool vlan_tagged;
1: -	u16 vlan_proto;
1: -	u16 vlan_tci;
1: -	u16 protocol;
1: -	u8 ip_summed;
1: -	u32 hash;
1: -	bool l4_hash;
1: -	unsigned int len;
1: -	unsigned int data_len;
1: -	unsigned int truesize;
1: -	bool mac_header_valid;
1: -	int mac_header;
1: -	unsigned char nr_frags;
1: -	u16 gso_size;
1: -	u16 gso_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_name;
1: +  unsigned int napi_id;
1: +  u16 queue_mapping;
1: +  const void *skbaddr;
1: +  bool vlan_tagged;
1: +  u16 vlan_proto;
1: +  u16 vlan_tci;
1: +  u16 protocol;
1: +  u8 ip_summed;
1: +  u32 hash;
1: +  bool l4_hash;
1: +  unsigned int len;
1: +  unsigned int data_len;
1: +  unsigned int truesize;
1: +  bool mac_header_valid;
1: +  int mac_header;
1: +  unsigned char nr_frags;
1: +  u16 gso_size;
1: +  u16 gso_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_net_dev_rx_exit_template {
1: -	struct trace_entry ent;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_net_dev_start_xmit {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_net_dev_xmit {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_net_dev_xmit_timeout {
1: -	u32 name;
1: -	u32 driver;
1: +  u32 name;
1: +  u32 driver;
1:  };
1:  
1:  struct trace_event_data_offsets_net_dev_template {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_net_dev_rx_verbose_template {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_net_dev_rx_exit_template {};
1:  
1: -typedef void (*btf_trace_net_dev_start_xmit)(void *, const struct sk_buff *, const struct net_device *);
1: +typedef void (*btf_trace_net_dev_start_xmit)(void *, const struct sk_buff *,
1: +                                             const struct net_device *);
1:  
1: -typedef void (*btf_trace_net_dev_xmit)(void *, struct sk_buff *, int, struct net_device *, unsigned int);
1: +typedef void (*btf_trace_net_dev_xmit)(void *, struct sk_buff *, int,
1: +                                       struct net_device *, unsigned int);
1:  
1: -typedef void (*btf_trace_net_dev_xmit_timeout)(void *, struct net_device *, int);
1: +typedef void (*btf_trace_net_dev_xmit_timeout)(void *, struct net_device *,
1: +                                               int);
1:  
1:  typedef void (*btf_trace_net_dev_queue)(void *, struct sk_buff *);
1:  
1: @@ -114801,11 +116084,14 @@ typedef void (*btf_trace_netif_rx)(void *, struct sk_buff *);
1:  
1:  typedef void (*btf_trace_napi_gro_frags_entry)(void *, const struct sk_buff *);
1:  
1: -typedef void (*btf_trace_napi_gro_receive_entry)(void *, const struct sk_buff *);
1: +typedef void (*btf_trace_napi_gro_receive_entry)(void *,
1: +                                                 const struct sk_buff *);
1:  
1: -typedef void (*btf_trace_netif_receive_skb_entry)(void *, const struct sk_buff *);
1: +typedef void (*btf_trace_netif_receive_skb_entry)(void *,
1: +                                                  const struct sk_buff *);
1:  
1: -typedef void (*btf_trace_netif_receive_skb_list_entry)(void *, const struct sk_buff *);
1: +typedef void (*btf_trace_netif_receive_skb_list_entry)(void *,
1: +                                                       const struct sk_buff *);
1:  
1:  typedef void (*btf_trace_netif_rx_entry)(void *, const struct sk_buff *);
1:  
1: @@ -114824,64 +116110,64 @@ typedef void (*btf_trace_netif_rx_ni_exit)(void *, int);
1:  typedef void (*btf_trace_netif_receive_skb_list_exit)(void *, int);
1:  
1:  struct trace_event_raw_napi_poll {
1: -	struct trace_entry ent;
1: -	struct napi_struct *napi;
1: -	u32 __data_loc_dev_name;
1: -	int work;
1: -	int budget;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct napi_struct *napi;
1: +  u32 __data_loc_dev_name;
1: +  int work;
1: +  int budget;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_napi_poll {
1: -	u32 dev_name;
1: +  u32 dev_name;
1:  };
1:  
1:  typedef void (*btf_trace_napi_poll)(void *, struct napi_struct *, int, int);
1:  
1:  enum tcp_ca_state {
1: -	TCP_CA_Open = 0,
1: -	TCP_CA_Disorder = 1,
1: -	TCP_CA_CWR = 2,
1: -	TCP_CA_Recovery = 3,
1: -	TCP_CA_Loss = 4,
1: +  TCP_CA_Open = 0,
1: +  TCP_CA_Disorder = 1,
1: +  TCP_CA_CWR = 2,
1: +  TCP_CA_Recovery = 3,
1: +  TCP_CA_Loss = 4,
1:  };
1:  
1:  struct trace_event_raw_sock_rcvqueue_full {
1: -	struct trace_entry ent;
1: -	int rmem_alloc;
1: -	unsigned int truesize;
1: -	int sk_rcvbuf;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int rmem_alloc;
1: +  unsigned int truesize;
1: +  int sk_rcvbuf;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sock_exceed_buf_limit {
1: -	struct trace_entry ent;
1: -	char name[32];
1: -	long int *sysctl_mem;
1: -	long int allocated;
1: -	int sysctl_rmem;
1: -	int rmem_alloc;
1: -	int sysctl_wmem;
1: -	int wmem_alloc;
1: -	int wmem_queued;
1: -	int kind;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[32];
1: +  long int *sysctl_mem;
1: +  long int allocated;
1: +  int sysctl_rmem;
1: +  int rmem_alloc;
1: +  int sysctl_wmem;
1: +  int wmem_alloc;
1: +  int wmem_queued;
1: +  int kind;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_inet_sock_set_state {
1: -	struct trace_entry ent;
1: -	const void *skaddr;
1: -	int oldstate;
1: -	int newstate;
1: -	__u16 sport;
1: -	__u16 dport;
1: -	__u16 family;
1: -	__u16 protocol;
1: -	__u8 saddr[4];
1: -	__u8 daddr[4];
1: -	__u8 saddr_v6[16];
1: -	__u8 daddr_v6[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *skaddr;
1: +  int oldstate;
1: +  int newstate;
1: +  __u16 sport;
1: +  __u16 dport;
1: +  __u16 family;
1: +  __u16 protocol;
1: +  __u8 saddr[4];
1: +  __u8 daddr[4];
1: +  __u8 saddr_v6[16];
1: +  __u8 daddr_v6[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_sock_rcvqueue_full {};
1: @@ -114890,17 +116176,20 @@ struct trace_event_data_offsets_sock_exceed_buf_limit {};
1:  
1:  struct trace_event_data_offsets_inet_sock_set_state {};
1:  
1: -typedef void (*btf_trace_sock_rcvqueue_full)(void *, struct sock *, struct sk_buff *);
1: +typedef void (*btf_trace_sock_rcvqueue_full)(void *, struct sock *,
1: +                                             struct sk_buff *);
1:  
1: -typedef void (*btf_trace_sock_exceed_buf_limit)(void *, struct sock *, struct proto *, long int, int);
1: +typedef void (*btf_trace_sock_exceed_buf_limit)(void *, struct sock *,
1: +                                                struct proto *, long int, int);
1:  
1: -typedef void (*btf_trace_inet_sock_set_state)(void *, const struct sock *, const int, const int);
1: +typedef void (*btf_trace_inet_sock_set_state)(void *, const struct sock *,
1: +                                              const int, const int);
1:  
1:  struct trace_event_raw_udp_fail_queue_rcv_skb {
1: -	struct trace_entry ent;
1: -	int rc;
1: -	__u16 lport;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int rc;
1: +  __u16 lport;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_udp_fail_queue_rcv_skb {};
1: @@ -114908,62 +116197,62 @@ struct trace_event_data_offsets_udp_fail_queue_rcv_skb {};
1:  typedef void (*btf_trace_udp_fail_queue_rcv_skb)(void *, int, struct sock *);
1:  
1:  struct trace_event_raw_tcp_event_sk_skb {
1: -	struct trace_entry ent;
1: -	const void *skbaddr;
1: -	const void *skaddr;
1: -	int state;
1: -	__u16 sport;
1: -	__u16 dport;
1: -	__u8 saddr[4];
1: -	__u8 daddr[4];
1: -	__u8 saddr_v6[16];
1: -	__u8 daddr_v6[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *skbaddr;
1: +  const void *skaddr;
1: +  int state;
1: +  __u16 sport;
1: +  __u16 dport;
1: +  __u8 saddr[4];
1: +  __u8 daddr[4];
1: +  __u8 saddr_v6[16];
1: +  __u8 daddr_v6[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tcp_event_sk {
1: -	struct trace_entry ent;
1: -	const void *skaddr;
1: -	__u16 sport;
1: -	__u16 dport;
1: -	__u8 saddr[4];
1: -	__u8 daddr[4];
1: -	__u8 saddr_v6[16];
1: -	__u8 daddr_v6[16];
1: -	__u64 sock_cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *skaddr;
1: +  __u16 sport;
1: +  __u16 dport;
1: +  __u8 saddr[4];
1: +  __u8 daddr[4];
1: +  __u8 saddr_v6[16];
1: +  __u8 daddr_v6[16];
1: +  __u64 sock_cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tcp_retransmit_synack {
1: -	struct trace_entry ent;
1: -	const void *skaddr;
1: -	const void *req;
1: -	__u16 sport;
1: -	__u16 dport;
1: -	__u8 saddr[4];
1: -	__u8 daddr[4];
1: -	__u8 saddr_v6[16];
1: -	__u8 daddr_v6[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *skaddr;
1: +  const void *req;
1: +  __u16 sport;
1: +  __u16 dport;
1: +  __u8 saddr[4];
1: +  __u8 daddr[4];
1: +  __u8 saddr_v6[16];
1: +  __u8 daddr_v6[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tcp_probe {
1: -	struct trace_entry ent;
1: -	__u8 saddr[28];
1: -	__u8 daddr[28];
1: -	__u16 sport;
1: -	__u16 dport;
1: -	__u32 mark;
1: -	__u16 data_len;
1: -	__u32 snd_nxt;
1: -	__u32 snd_una;
1: -	__u32 snd_cwnd;
1: -	__u32 ssthresh;
1: -	__u32 snd_wnd;
1: -	__u32 srtt;
1: -	__u32 rcv_wnd;
1: -	__u64 sock_cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  __u8 saddr[28];
1: +  __u8 daddr[28];
1: +  __u16 sport;
1: +  __u16 dport;
1: +  __u32 mark;
1: +  __u16 data_len;
1: +  __u32 snd_nxt;
1: +  __u32 snd_una;
1: +  __u32 snd_cwnd;
1: +  __u32 ssthresh;
1: +  __u32 snd_wnd;
1: +  __u32 srtt;
1: +  __u32 rcv_wnd;
1: +  __u64 sock_cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_tcp_event_sk_skb {};
1: @@ -114974,9 +116263,11 @@ struct trace_event_data_offsets_tcp_retransmit_synack {};
1:  
1:  struct trace_event_data_offsets_tcp_probe {};
1:  
1: -typedef void (*btf_trace_tcp_retransmit_skb)(void *, const struct sock *, const struct sk_buff *);
1: +typedef void (*btf_trace_tcp_retransmit_skb)(void *, const struct sock *,
1: +                                             const struct sk_buff *);
1:  
1: -typedef void (*btf_trace_tcp_send_reset)(void *, const struct sock *, const struct sk_buff *);
1: +typedef void (*btf_trace_tcp_send_reset)(void *, const struct sock *,
1: +                                         const struct sk_buff *);
1:  
1:  typedef void (*btf_trace_tcp_receive_reset)(void *, struct sock *);
1:  
1: @@ -114984,151 +116275,156 @@ typedef void (*btf_trace_tcp_destroy_sock)(void *, struct sock *);
1:  
1:  typedef void (*btf_trace_tcp_rcv_space_adjust)(void *, struct sock *);
1:  
1: -typedef void (*btf_trace_tcp_retransmit_synack)(void *, const struct sock *, const struct request_sock *);
1: +typedef void (*btf_trace_tcp_retransmit_synack)(void *, const struct sock *,
1: +                                                const struct request_sock *);
1:  
1:  typedef void (*btf_trace_tcp_probe)(void *, struct sock *, struct sk_buff *);
1:  
1:  struct trace_event_raw_fib_table_lookup {
1: -	struct trace_entry ent;
1: -	u32 tb_id;
1: -	int err;
1: -	int oif;
1: -	int iif;
1: -	u8 proto;
1: -	__u8 tos;
1: -	__u8 scope;
1: -	__u8 flags;
1: -	__u8 src[4];
1: -	__u8 dst[4];
1: -	__u8 gw4[4];
1: -	__u8 gw6[16];
1: -	u16 sport;
1: -	u16 dport;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 tb_id;
1: +  int err;
1: +  int oif;
1: +  int iif;
1: +  u8 proto;
1: +  __u8 tos;
1: +  __u8 scope;
1: +  __u8 flags;
1: +  __u8 src[4];
1: +  __u8 dst[4];
1: +  __u8 gw4[4];
1: +  __u8 gw6[16];
1: +  u16 sport;
1: +  u16 dport;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_fib_table_lookup {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1: -typedef void (*btf_trace_fib_table_lookup)(void *, u32, const struct flowi4 *, const struct fib_nh_common *, int);
1: +typedef void (*btf_trace_fib_table_lookup)(void *, u32, const struct flowi4 *,
1: +                                           const struct fib_nh_common *, int);
1:  
1:  struct trace_event_raw_qdisc_dequeue {
1: -	struct trace_entry ent;
1: -	struct Qdisc *qdisc;
1: -	const struct netdev_queue *txq;
1: -	int packets;
1: -	void *skbaddr;
1: -	int ifindex;
1: -	u32 handle;
1: -	u32 parent;
1: -	long unsigned int txq_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct Qdisc *qdisc;
1: +  const struct netdev_queue *txq;
1: +  int packets;
1: +  void *skbaddr;
1: +  int ifindex;
1: +  u32 handle;
1: +  u32 parent;
1: +  long unsigned int txq_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qdisc_reset {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev;
1: -	u32 __data_loc_kind;
1: -	u32 parent;
1: -	u32 handle;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev;
1: +  u32 __data_loc_kind;
1: +  u32 parent;
1: +  u32 handle;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qdisc_destroy {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev;
1: -	u32 __data_loc_kind;
1: -	u32 parent;
1: -	u32 handle;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev;
1: +  u32 __data_loc_kind;
1: +  u32 parent;
1: +  u32 handle;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_qdisc_create {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_dev;
1: -	u32 __data_loc_kind;
1: -	u32 parent;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_dev;
1: +  u32 __data_loc_kind;
1: +  u32 parent;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_qdisc_dequeue {};
1:  
1:  struct trace_event_data_offsets_qdisc_reset {
1: -	u32 dev;
1: -	u32 kind;
1: +  u32 dev;
1: +  u32 kind;
1:  };
1:  
1:  struct trace_event_data_offsets_qdisc_destroy {
1: -	u32 dev;
1: -	u32 kind;
1: +  u32 dev;
1: +  u32 kind;
1:  };
1:  
1:  struct trace_event_data_offsets_qdisc_create {
1: -	u32 dev;
1: -	u32 kind;
1: +  u32 dev;
1: +  u32 kind;
1:  };
1:  
1: -typedef void (*btf_trace_qdisc_dequeue)(void *, struct Qdisc *, const struct netdev_queue *, int, struct sk_buff *);
1: +typedef void (*btf_trace_qdisc_dequeue)(void *, struct Qdisc *,
1: +                                        const struct netdev_queue *, int,
1: +                                        struct sk_buff *);
1:  
1:  typedef void (*btf_trace_qdisc_reset)(void *, struct Qdisc *);
1:  
1:  typedef void (*btf_trace_qdisc_destroy)(void *, struct Qdisc *);
1:  
1: -typedef void (*btf_trace_qdisc_create)(void *, const struct Qdisc_ops *, struct net_device *, u32);
1: +typedef void (*btf_trace_qdisc_create)(void *, const struct Qdisc_ops *,
1: +                                       struct net_device *, u32);
1:  
1:  struct bridge_stp_xstats {
1: -	__u64 transition_blk;
1: -	__u64 transition_fwd;
1: -	__u64 rx_bpdu;
1: -	__u64 tx_bpdu;
1: -	__u64 rx_tcn;
1: -	__u64 tx_tcn;
1: +  __u64 transition_blk;
1: +  __u64 transition_fwd;
1: +  __u64 rx_bpdu;
1: +  __u64 tx_bpdu;
1: +  __u64 rx_tcn;
1: +  __u64 tx_tcn;
1:  };
1:  
1:  struct br_mcast_stats {
1: -	__u64 igmp_v1queries[2];
1: -	__u64 igmp_v2queries[2];
1: -	__u64 igmp_v3queries[2];
1: -	__u64 igmp_leaves[2];
1: -	__u64 igmp_v1reports[2];
1: -	__u64 igmp_v2reports[2];
1: -	__u64 igmp_v3reports[2];
1: -	__u64 igmp_parse_errors;
1: -	__u64 mld_v1queries[2];
1: -	__u64 mld_v2queries[2];
1: -	__u64 mld_leaves[2];
1: -	__u64 mld_v1reports[2];
1: -	__u64 mld_v2reports[2];
1: -	__u64 mld_parse_errors;
1: -	__u64 mcast_bytes[2];
1: -	__u64 mcast_packets[2];
1: +  __u64 igmp_v1queries[2];
1: +  __u64 igmp_v2queries[2];
1: +  __u64 igmp_v3queries[2];
1: +  __u64 igmp_leaves[2];
1: +  __u64 igmp_v1reports[2];
1: +  __u64 igmp_v2reports[2];
1: +  __u64 igmp_v3reports[2];
1: +  __u64 igmp_parse_errors;
1: +  __u64 mld_v1queries[2];
1: +  __u64 mld_v2queries[2];
1: +  __u64 mld_leaves[2];
1: +  __u64 mld_v1reports[2];
1: +  __u64 mld_v2reports[2];
1: +  __u64 mld_parse_errors;
1: +  __u64 mcast_bytes[2];
1: +  __u64 mcast_packets[2];
1:  };
1:  
1:  struct br_ip {
1: -	union {
1: -		__be32 ip4;
1: -		struct in6_addr ip6;
1: -	} src;
1: -	union {
1: -		__be32 ip4;
1: -		struct in6_addr ip6;
1: -		unsigned char mac_addr[6];
1: -	} dst;
1: -	__be16 proto;
1: -	__u16 vid;
1: +  union {
1: +    __be32 ip4;
1: +    struct in6_addr ip6;
1: +  } src;
1: +  union {
1: +    __be32 ip4;
1: +    struct in6_addr ip6;
1: +    unsigned char mac_addr[6];
1: +  } dst;
1: +  __be16 proto;
1: +  __u16 vid;
1:  };
1:  
1:  struct bridge_id {
1: -	unsigned char prio[2];
1: -	unsigned char addr[6];
1: +  unsigned char prio[2];
1: +  unsigned char addr[6];
1:  };
1:  
1:  typedef struct bridge_id bridge_id;
1:  
1:  struct mac_addr {
1: -	unsigned char addr[6];
1: +  unsigned char addr[6];
1:  };
1:  
1:  typedef struct mac_addr mac_addr;
1: @@ -115136,20 +116432,20 @@ typedef struct mac_addr mac_addr;
1:  typedef __u16 port_id;
1:  
1:  struct bridge_mcast_own_query {
1: -	struct timer_list timer;
1: -	u32 startup_sent;
1: +  struct timer_list timer;
1: +  u32 startup_sent;
1:  };
1:  
1:  struct bridge_mcast_other_query {
1: -	struct timer_list timer;
1: -	long unsigned int delay_time;
1: +  struct timer_list timer;
1: +  long unsigned int delay_time;
1:  };
1:  
1:  struct net_bridge_port;
1:  
1:  struct bridge_mcast_querier {
1: -	struct br_ip addr;
1: -	struct net_bridge_port *port;
1: +  struct br_ip addr;
1: +  struct net_bridge_port *port;
1:  };
1:  
1:  struct net_bridge;
1: @@ -115159,1844 +116455,1880 @@ struct net_bridge_vlan_group;
1:  struct bridge_mcast_stats;
1:  
1:  struct net_bridge_port {
1: -	struct net_bridge *br;
1: -	struct net_device *dev;
1: -	struct list_head list;
1: -	long unsigned int flags;
1: -	struct net_bridge_vlan_group *vlgrp;
1: -	struct net_bridge_port *backup_port;
1: -	u8 priority;
1: -	u8 state;
1: -	u16 port_no;
1: -	unsigned char topology_change_ack;
1: -	unsigned char config_pending;
1: -	port_id port_id;
1: -	port_id designated_port;
1: -	bridge_id designated_root;
1: -	bridge_id designated_bridge;
1: -	u32 path_cost;
1: -	u32 designated_cost;
1: -	long unsigned int designated_age;
1: -	struct timer_list forward_delay_timer;
1: -	struct timer_list hold_timer;
1: -	struct timer_list message_age_timer;
1: -	struct kobject kobj;
1: -	struct callback_head rcu;
1: -	struct bridge_mcast_own_query ip4_own_query;
1: -	struct bridge_mcast_own_query ip6_own_query;
1: -	unsigned char multicast_router;
1: -	struct bridge_mcast_stats *mcast_stats;
1: -	struct timer_list multicast_router_timer;
1: -	struct hlist_head mglist;
1: -	struct hlist_node rlist;
1: -	char sysfs_name[16];
1: -	struct netpoll *np;
1: -	u16 group_fwd_mask;
1: -	u16 backup_redirected_cnt;
1: -	struct bridge_stp_xstats stp_xstats;
1: +  struct net_bridge *br;
1: +  struct net_device *dev;
1: +  struct list_head list;
1: +  long unsigned int flags;
1: +  struct net_bridge_vlan_group *vlgrp;
1: +  struct net_bridge_port *backup_port;
1: +  u8 priority;
1: +  u8 state;
1: +  u16 port_no;
1: +  unsigned char topology_change_ack;
1: +  unsigned char config_pending;
1: +  port_id port_id;
1: +  port_id designated_port;
1: +  bridge_id designated_root;
1: +  bridge_id designated_bridge;
1: +  u32 path_cost;
1: +  u32 designated_cost;
1: +  long unsigned int designated_age;
1: +  struct timer_list forward_delay_timer;
1: +  struct timer_list hold_timer;
1: +  struct timer_list message_age_timer;
1: +  struct kobject kobj;
1: +  struct callback_head rcu;
1: +  struct bridge_mcast_own_query ip4_own_query;
1: +  struct bridge_mcast_own_query ip6_own_query;
1: +  unsigned char multicast_router;
1: +  struct bridge_mcast_stats *mcast_stats;
1: +  struct timer_list multicast_router_timer;
1: +  struct hlist_head mglist;
1: +  struct hlist_node rlist;
1: +  char sysfs_name[16];
1: +  struct netpoll *np;
1: +  u16 group_fwd_mask;
1: +  u16 backup_redirected_cnt;
1: +  struct bridge_stp_xstats stp_xstats;
1:  };
1:  
1:  struct bridge_mcast_stats {
1: -	struct br_mcast_stats mstats;
1: -	struct u64_stats_sync syncp;
1: +  struct br_mcast_stats mstats;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct net_bridge {
1: -	spinlock_t lock;
1: -	spinlock_t hash_lock;
1: -	struct hlist_head frame_type_list;
1: -	struct net_device *dev;
1: -	struct pcpu_sw_netstats *stats;
1: -	long unsigned int options;
1: -	__be16 vlan_proto;
1: -	u16 default_pvid;
1: -	struct net_bridge_vlan_group *vlgrp;
1: -	struct rhashtable fdb_hash_tbl;
1: -	struct list_head port_list;
1: -	union {
1: -		struct rtable fake_rtable;
1: -		struct rt6_info fake_rt6_info;
1: -	};
1: -	u16 group_fwd_mask;
1: -	u16 group_fwd_mask_required;
1: -	bridge_id designated_root;
1: -	bridge_id bridge_id;
1: -	unsigned char topology_change;
1: -	unsigned char topology_change_detected;
1: -	u16 root_port;
1: -	long unsigned int max_age;
1: -	long unsigned int hello_time;
1: -	long unsigned int forward_delay;
1: -	long unsigned int ageing_time;
1: -	long unsigned int bridge_max_age;
1: -	long unsigned int bridge_hello_time;
1: -	long unsigned int bridge_forward_delay;
1: -	long unsigned int bridge_ageing_time;
1: -	u32 root_path_cost;
1: -	u8 group_addr[6];
1: -	enum {
1: -		BR_NO_STP = 0,
1: -		BR_KERNEL_STP = 1,
1: -		BR_USER_STP = 2,
1: -	} stp_enabled;
1: -	u32 hash_max;
1: -	u32 multicast_last_member_count;
1: -	u32 multicast_startup_query_count;
1: -	u8 multicast_igmp_version;
1: -	u8 multicast_router;
1: -	u8 multicast_mld_version;
1: -	spinlock_t multicast_lock;
1: -	long unsigned int multicast_last_member_interval;
1: -	long unsigned int multicast_membership_interval;
1: -	long unsigned int multicast_querier_interval;
1: -	long unsigned int multicast_query_interval;
1: -	long unsigned int multicast_query_response_interval;
1: -	long unsigned int multicast_startup_query_interval;
1: -	struct rhashtable mdb_hash_tbl;
1: -	struct rhashtable sg_port_tbl;
1: -	struct hlist_head mcast_gc_list;
1: -	struct hlist_head mdb_list;
1: -	struct hlist_head router_list;
1: -	struct timer_list multicast_router_timer;
1: -	struct bridge_mcast_other_query ip4_other_query;
1: -	struct bridge_mcast_own_query ip4_own_query;
1: -	struct bridge_mcast_querier ip4_querier;
1: -	struct bridge_mcast_stats *mcast_stats;
1: -	struct bridge_mcast_other_query ip6_other_query;
1: -	struct bridge_mcast_own_query ip6_own_query;
1: -	struct bridge_mcast_querier ip6_querier;
1: -	struct work_struct mcast_gc_work;
1: -	struct timer_list hello_timer;
1: -	struct timer_list tcn_timer;
1: -	struct timer_list topology_change_timer;
1: -	struct delayed_work gc_work;
1: -	struct kobject *ifobj;
1: -	u32 auto_cnt;
1: -	struct hlist_head fdb_list;
1: +  spinlock_t lock;
1: +  spinlock_t hash_lock;
1: +  struct hlist_head frame_type_list;
1: +  struct net_device *dev;
1: +  struct pcpu_sw_netstats *stats;
1: +  long unsigned int options;
1: +  __be16 vlan_proto;
1: +  u16 default_pvid;
1: +  struct net_bridge_vlan_group *vlgrp;
1: +  struct rhashtable fdb_hash_tbl;
1: +  struct list_head port_list;
1: +  union {
1: +    struct rtable fake_rtable;
1: +    struct rt6_info fake_rt6_info;
1: +  };
1: +  u16 group_fwd_mask;
1: +  u16 group_fwd_mask_required;
1: +  bridge_id designated_root;
1: +  bridge_id bridge_id;
1: +  unsigned char topology_change;
1: +  unsigned char topology_change_detected;
1: +  u16 root_port;
1: +  long unsigned int max_age;
1: +  long unsigned int hello_time;
1: +  long unsigned int forward_delay;
1: +  long unsigned int ageing_time;
1: +  long unsigned int bridge_max_age;
1: +  long unsigned int bridge_hello_time;
1: +  long unsigned int bridge_forward_delay;
1: +  long unsigned int bridge_ageing_time;
1: +  u32 root_path_cost;
1: +  u8 group_addr[6];
1: +  enum {
1: +    BR_NO_STP = 0,
1: +    BR_KERNEL_STP = 1,
1: +    BR_USER_STP = 2,
1: +  } stp_enabled;
1: +  u32 hash_max;
1: +  u32 multicast_last_member_count;
1: +  u32 multicast_startup_query_count;
1: +  u8 multicast_igmp_version;
1: +  u8 multicast_router;
1: +  u8 multicast_mld_version;
1: +  spinlock_t multicast_lock;
1: +  long unsigned int multicast_last_member_interval;
1: +  long unsigned int multicast_membership_interval;
1: +  long unsigned int multicast_querier_interval;
1: +  long unsigned int multicast_query_interval;
1: +  long unsigned int multicast_query_response_interval;
1: +  long unsigned int multicast_startup_query_interval;
1: +  struct rhashtable mdb_hash_tbl;
1: +  struct rhashtable sg_port_tbl;
1: +  struct hlist_head mcast_gc_list;
1: +  struct hlist_head mdb_list;
1: +  struct hlist_head router_list;
1: +  struct timer_list multicast_router_timer;
1: +  struct bridge_mcast_other_query ip4_other_query;
1: +  struct bridge_mcast_own_query ip4_own_query;
1: +  struct bridge_mcast_querier ip4_querier;
1: +  struct bridge_mcast_stats *mcast_stats;
1: +  struct bridge_mcast_other_query ip6_other_query;
1: +  struct bridge_mcast_own_query ip6_own_query;
1: +  struct bridge_mcast_querier ip6_querier;
1: +  struct work_struct mcast_gc_work;
1: +  struct timer_list hello_timer;
1: +  struct timer_list tcn_timer;
1: +  struct timer_list topology_change_timer;
1: +  struct delayed_work gc_work;
1: +  struct kobject *ifobj;
1: +  u32 auto_cnt;
1: +  struct hlist_head fdb_list;
1:  };
1:  
1:  struct net_bridge_vlan_group {
1: -	struct rhashtable vlan_hash;
1: -	struct rhashtable tunnel_hash;
1: -	struct list_head vlan_list;
1: -	u16 num_vlans;
1: -	u16 pvid;
1: -	u8 pvid_state;
1: +  struct rhashtable vlan_hash;
1: +  struct rhashtable tunnel_hash;
1: +  struct list_head vlan_list;
1: +  u16 num_vlans;
1: +  u16 pvid;
1: +  u8 pvid_state;
1:  };
1:  
1:  struct net_bridge_fdb_key {
1: -	mac_addr addr;
1: -	u16 vlan_id;
1: +  mac_addr addr;
1: +  u16 vlan_id;
1:  };
1:  
1:  struct net_bridge_fdb_entry {
1: -	struct rhash_head rhnode;
1: -	struct net_bridge_port *dst;
1: -	struct net_bridge_fdb_key key;
1: -	struct hlist_node fdb_node;
1: -	long unsigned int flags;
1: -	long: 64;
1: -	long: 64;
1: -	long unsigned int updated;
1: -	long unsigned int used;
1: -	struct callback_head rcu;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct rhash_head rhnode;
1: +  struct net_bridge_port *dst;
1: +  struct net_bridge_fdb_key key;
1: +  struct hlist_node fdb_node;
1: +  long unsigned int flags;
1: +  long : 64;
1: +  long : 64;
1: +  long unsigned int updated;
1: +  long unsigned int used;
1: +  struct callback_head rcu;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct trace_event_raw_br_fdb_add {
1: -	struct trace_entry ent;
1: -	u8 ndm_flags;
1: -	u32 __data_loc_dev;
1: -	unsigned char addr[6];
1: -	u16 vid;
1: -	u16 nlh_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 ndm_flags;
1: +  u32 __data_loc_dev;
1: +  unsigned char addr[6];
1: +  u16 vid;
1: +  u16 nlh_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_br_fdb_external_learn_add {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_br_dev;
1: -	u32 __data_loc_dev;
1: -	unsigned char addr[6];
1: -	u16 vid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_br_dev;
1: +  u32 __data_loc_dev;
1: +  unsigned char addr[6];
1: +  u16 vid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_fdb_delete {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_br_dev;
1: -	u32 __data_loc_dev;
1: -	unsigned char addr[6];
1: -	u16 vid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_br_dev;
1: +  u32 __data_loc_dev;
1: +  unsigned char addr[6];
1: +  u16 vid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_br_fdb_update {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_br_dev;
1: -	u32 __data_loc_dev;
1: -	unsigned char addr[6];
1: -	u16 vid;
1: -	long unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_br_dev;
1: +  u32 __data_loc_dev;
1: +  unsigned char addr[6];
1: +  u16 vid;
1: +  long unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_br_fdb_add {
1: -	u32 dev;
1: +  u32 dev;
1:  };
1:  
1:  struct trace_event_data_offsets_br_fdb_external_learn_add {
1: -	u32 br_dev;
1: -	u32 dev;
1: +  u32 br_dev;
1: +  u32 dev;
1:  };
1:  
1:  struct trace_event_data_offsets_fdb_delete {
1: -	u32 br_dev;
1: -	u32 dev;
1: +  u32 br_dev;
1: +  u32 dev;
1:  };
1:  
1:  struct trace_event_data_offsets_br_fdb_update {
1: -	u32 br_dev;
1: -	u32 dev;
1: +  u32 br_dev;
1: +  u32 dev;
1:  };
1:  
1: -typedef void (*btf_trace_br_fdb_add)(void *, struct ndmsg *, struct net_device *, const unsigned char *, u16, u16);
1: +typedef void (*btf_trace_br_fdb_add)(void *, struct ndmsg *,
1: +                                     struct net_device *, const unsigned char *,
1: +                                     u16, u16);
1:  
1: -typedef void (*btf_trace_br_fdb_external_learn_add)(void *, struct net_bridge *, struct net_bridge_port *, const unsigned char *, u16);
1: +typedef void (*btf_trace_br_fdb_external_learn_add)(void *, struct net_bridge *,
1: +                                                    struct net_bridge_port *,
1: +                                                    const unsigned char *, u16);
1:  
1: -typedef void (*btf_trace_fdb_delete)(void *, struct net_bridge *, struct net_bridge_fdb_entry *);
1: +typedef void (*btf_trace_fdb_delete)(void *, struct net_bridge *,
1: +                                     struct net_bridge_fdb_entry *);
1:  
1: -typedef void (*btf_trace_br_fdb_update)(void *, struct net_bridge *, struct net_bridge_port *, const unsigned char *, u16, long unsigned int);
1: +typedef void (*btf_trace_br_fdb_update)(void *, struct net_bridge *,
1: +                                        struct net_bridge_port *,
1: +                                        const unsigned char *, u16,
1: +                                        long unsigned int);
1:  
1:  struct trace_event_raw_neigh_create {
1: -	struct trace_entry ent;
1: -	u32 family;
1: -	u32 __data_loc_dev;
1: -	int entries;
1: -	u8 created;
1: -	u8 gc_exempt;
1: -	u8 primary_key4[4];
1: -	u8 primary_key6[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 family;
1: +  u32 __data_loc_dev;
1: +  int entries;
1: +  u8 created;
1: +  u8 gc_exempt;
1: +  u8 primary_key4[4];
1: +  u8 primary_key6[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_neigh_update {
1: -	struct trace_entry ent;
1: -	u32 family;
1: -	u32 __data_loc_dev;
1: -	u8 lladdr[32];
1: -	u8 lladdr_len;
1: -	u8 flags;
1: -	u8 nud_state;
1: -	u8 type;
1: -	u8 dead;
1: -	int refcnt;
1: -	__u8 primary_key4[4];
1: -	__u8 primary_key6[16];
1: -	long unsigned int confirmed;
1: -	long unsigned int updated;
1: -	long unsigned int used;
1: -	u8 new_lladdr[32];
1: -	u8 new_state;
1: -	u32 update_flags;
1: -	u32 pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 family;
1: +  u32 __data_loc_dev;
1: +  u8 lladdr[32];
1: +  u8 lladdr_len;
1: +  u8 flags;
1: +  u8 nud_state;
1: +  u8 type;
1: +  u8 dead;
1: +  int refcnt;
1: +  __u8 primary_key4[4];
1: +  __u8 primary_key6[16];
1: +  long unsigned int confirmed;
1: +  long unsigned int updated;
1: +  long unsigned int used;
1: +  u8 new_lladdr[32];
1: +  u8 new_state;
1: +  u32 update_flags;
1: +  u32 pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_neigh__update {
1: -	struct trace_entry ent;
1: -	u32 family;
1: -	u32 __data_loc_dev;
1: -	u8 lladdr[32];
1: -	u8 lladdr_len;
1: -	u8 flags;
1: -	u8 nud_state;
1: -	u8 type;
1: -	u8 dead;
1: -	int refcnt;
1: -	__u8 primary_key4[4];
1: -	__u8 primary_key6[16];
1: -	long unsigned int confirmed;
1: -	long unsigned int updated;
1: -	long unsigned int used;
1: -	u32 err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 family;
1: +  u32 __data_loc_dev;
1: +  u8 lladdr[32];
1: +  u8 lladdr_len;
1: +  u8 flags;
1: +  u8 nud_state;
1: +  u8 type;
1: +  u8 dead;
1: +  int refcnt;
1: +  __u8 primary_key4[4];
1: +  __u8 primary_key6[16];
1: +  long unsigned int confirmed;
1: +  long unsigned int updated;
1: +  long unsigned int used;
1: +  u32 err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_neigh_create {
1: -	u32 dev;
1: +  u32 dev;
1:  };
1:  
1:  struct trace_event_data_offsets_neigh_update {
1: -	u32 dev;
1: +  u32 dev;
1:  };
1:  
1:  struct trace_event_data_offsets_neigh__update {
1: -	u32 dev;
1: +  u32 dev;
1:  };
1:  
1: -typedef void (*btf_trace_neigh_create)(void *, struct neigh_table *, struct net_device *, const void *, const struct neighbour *, bool);
1: +typedef void (*btf_trace_neigh_create)(void *, struct neigh_table *,
1: +                                       struct net_device *, const void *,
1: +                                       const struct neighbour *, bool);
1:  
1: -typedef void (*btf_trace_neigh_update)(void *, struct neighbour *, const u8 *, u8, u32, u32);
1: +typedef void (*btf_trace_neigh_update)(void *, struct neighbour *, const u8 *,
1: +                                       u8, u32, u32);
1:  
1:  typedef void (*btf_trace_neigh_update_done)(void *, struct neighbour *, int);
1:  
1:  typedef void (*btf_trace_neigh_timer_handler)(void *, struct neighbour *, int);
1:  
1: -typedef void (*btf_trace_neigh_event_send_done)(void *, struct neighbour *, int);
1: +typedef void (*btf_trace_neigh_event_send_done)(void *, struct neighbour *,
1: +                                                int);
1:  
1: -typedef void (*btf_trace_neigh_event_send_dead)(void *, struct neighbour *, int);
1: +typedef void (*btf_trace_neigh_event_send_dead)(void *, struct neighbour *,
1: +                                                int);
1:  
1: -typedef void (*btf_trace_neigh_cleanup_and_release)(void *, struct neighbour *, int);
1: +typedef void (*btf_trace_neigh_cleanup_and_release)(void *, struct neighbour *,
1: +                                                    int);
1:  
1:  struct clock_identity {
1: -	u8 id[8];
1: +  u8 id[8];
1:  };
1:  
1:  struct port_identity {
1: -	struct clock_identity clock_identity;
1: -	__be16 port_number;
1: +  struct clock_identity clock_identity;
1: +  __be16 port_number;
1:  };
1:  
1:  struct ptp_header {
1: -	u8 tsmt;
1: -	u8 ver;
1: -	__be16 message_length;
1: -	u8 domain_number;
1: -	u8 reserved1;
1: -	u8 flag_field[2];
1: -	__be64 correction;
1: -	__be32 reserved2;
1: -	struct port_identity source_port_identity;
1: -	__be16 sequence_id;
1: -	u8 control;
1: -	u8 log_message_interval;
1: +  u8 tsmt;
1: +  u8 ver;
1: +  __be16 message_length;
1: +  u8 domain_number;
1: +  u8 reserved1;
1: +  u8 flag_field[2];
1: +  __be64 correction;
1: +  __be32 reserved2;
1: +  struct port_identity source_port_identity;
1: +  __be16 sequence_id;
1: +  u8 control;
1: +  u8 log_message_interval;
1:  } __attribute__((packed));
1:  
1:  struct update_classid_context {
1: -	u32 classid;
1: -	unsigned int batch;
1: +  u32 classid;
1: +  unsigned int batch;
1:  };
1:  
1:  enum lwtunnel_encap_types {
1: -	LWTUNNEL_ENCAP_NONE = 0,
1: -	LWTUNNEL_ENCAP_MPLS = 1,
1: -	LWTUNNEL_ENCAP_IP = 2,
1: -	LWTUNNEL_ENCAP_ILA = 3,
1: -	LWTUNNEL_ENCAP_IP6 = 4,
1: -	LWTUNNEL_ENCAP_SEG6 = 5,
1: -	LWTUNNEL_ENCAP_BPF = 6,
1: -	LWTUNNEL_ENCAP_SEG6_LOCAL = 7,
1: -	LWTUNNEL_ENCAP_RPL = 8,
1: -	__LWTUNNEL_ENCAP_MAX = 9,
1: +  LWTUNNEL_ENCAP_NONE = 0,
1: +  LWTUNNEL_ENCAP_MPLS = 1,
1: +  LWTUNNEL_ENCAP_IP = 2,
1: +  LWTUNNEL_ENCAP_ILA = 3,
1: +  LWTUNNEL_ENCAP_IP6 = 4,
1: +  LWTUNNEL_ENCAP_SEG6 = 5,
1: +  LWTUNNEL_ENCAP_BPF = 6,
1: +  LWTUNNEL_ENCAP_SEG6_LOCAL = 7,
1: +  LWTUNNEL_ENCAP_RPL = 8,
1: +  __LWTUNNEL_ENCAP_MAX = 9,
1:  };
1:  
1:  struct rtnexthop {
1: -	short unsigned int rtnh_len;
1: -	unsigned char rtnh_flags;
1: -	unsigned char rtnh_hops;
1: -	int rtnh_ifindex;
1: +  short unsigned int rtnh_len;
1: +  unsigned char rtnh_flags;
1: +  unsigned char rtnh_hops;
1: +  int rtnh_ifindex;
1:  };
1:  
1:  struct lwtunnel_encap_ops {
1: -	int (*build_state)(struct net *, struct nlattr *, unsigned int, const void *, struct lwtunnel_state **, struct netlink_ext_ack *);
1: -	void (*destroy_state)(struct lwtunnel_state *);
1: -	int (*output)(struct net *, struct sock *, struct sk_buff *);
1: -	int (*input)(struct sk_buff *);
1: -	int (*fill_encap)(struct sk_buff *, struct lwtunnel_state *);
1: -	int (*get_encap_size)(struct lwtunnel_state *);
1: -	int (*cmp_encap)(struct lwtunnel_state *, struct lwtunnel_state *);
1: -	int (*xmit)(struct sk_buff *);
1: -	struct module *owner;
1: +  int (*build_state)(struct net *, struct nlattr *, unsigned int, const void *,
1: +                     struct lwtunnel_state **, struct netlink_ext_ack *);
1: +  void (*destroy_state)(struct lwtunnel_state *);
1: +  int (*output)(struct net *, struct sock *, struct sk_buff *);
1: +  int (*input)(struct sk_buff *);
1: +  int (*fill_encap)(struct sk_buff *, struct lwtunnel_state *);
1: +  int (*get_encap_size)(struct lwtunnel_state *);
1: +  int (*cmp_encap)(struct lwtunnel_state *, struct lwtunnel_state *);
1: +  int (*xmit)(struct sk_buff *);
1: +  struct module *owner;
1:  };
1:  
1:  enum {
1: -	LWT_BPF_PROG_UNSPEC = 0,
1: -	LWT_BPF_PROG_FD = 1,
1: -	LWT_BPF_PROG_NAME = 2,
1: -	__LWT_BPF_PROG_MAX = 3,
1: +  LWT_BPF_PROG_UNSPEC = 0,
1: +  LWT_BPF_PROG_FD = 1,
1: +  LWT_BPF_PROG_NAME = 2,
1: +  __LWT_BPF_PROG_MAX = 3,
1:  };
1:  
1:  enum {
1: -	LWT_BPF_UNSPEC = 0,
1: -	LWT_BPF_IN = 1,
1: -	LWT_BPF_OUT = 2,
1: -	LWT_BPF_XMIT = 3,
1: -	LWT_BPF_XMIT_HEADROOM = 4,
1: -	__LWT_BPF_MAX = 5,
1: +  LWT_BPF_UNSPEC = 0,
1: +  LWT_BPF_IN = 1,
1: +  LWT_BPF_OUT = 2,
1: +  LWT_BPF_XMIT = 3,
1: +  LWT_BPF_XMIT_HEADROOM = 4,
1: +  __LWT_BPF_MAX = 5,
1:  };
1:  
1:  enum {
1: -	LWTUNNEL_XMIT_DONE = 0,
1: -	LWTUNNEL_XMIT_CONTINUE = 1,
1: +  LWTUNNEL_XMIT_DONE = 0,
1: +  LWTUNNEL_XMIT_CONTINUE = 1,
1:  };
1:  
1:  struct bpf_lwt_prog {
1: -	struct bpf_prog *prog;
1: -	char *name;
1: +  struct bpf_prog *prog;
1: +  char *name;
1:  };
1:  
1:  struct bpf_lwt {
1: -	struct bpf_lwt_prog in;
1: -	struct bpf_lwt_prog out;
1: -	struct bpf_lwt_prog xmit;
1: -	int family;
1: +  struct bpf_lwt_prog in;
1: +  struct bpf_lwt_prog out;
1: +  struct bpf_lwt_prog xmit;
1: +  int family;
1:  };
1:  
1:  struct bpf_stab {
1: -	struct bpf_map map;
1: -	struct sock **sks;
1: -	struct sk_psock_progs progs;
1: -	raw_spinlock_t lock;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct sock **sks;
1: +  struct sk_psock_progs progs;
1: +  raw_spinlock_t lock;
1: +  long : 64;
1:  };
1:  
1: -typedef u64 (*btf_bpf_sock_map_update)(struct bpf_sock_ops_kern *, struct bpf_map *, void *, u64);
1: +typedef u64 (*btf_bpf_sock_map_update)(struct bpf_sock_ops_kern *,
1: +                                       struct bpf_map *, void *, u64);
1:  
1: -typedef u64 (*btf_bpf_sk_redirect_map)(struct sk_buff *, struct bpf_map *, u32, u64);
1: +typedef u64 (*btf_bpf_sk_redirect_map)(struct sk_buff *, struct bpf_map *, u32,
1: +                                       u64);
1:  
1: -typedef u64 (*btf_bpf_msg_redirect_map)(struct sk_msg *, struct bpf_map *, u32, u64);
1: +typedef u64 (*btf_bpf_msg_redirect_map)(struct sk_msg *, struct bpf_map *, u32,
1: +                                        u64);
1:  
1:  struct sock_map_seq_info {
1: -	struct bpf_map *map;
1: -	struct sock *sk;
1: -	u32 index;
1: +  struct bpf_map *map;
1: +  struct sock *sk;
1: +  u32 index;
1:  };
1:  
1:  struct bpf_iter__sockmap {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct bpf_map *map;
1: -	};
1: -	union {
1: -		void *key;
1: -	};
1: -	union {
1: -		struct sock *sk;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct bpf_map *map;
1: +  };
1: +  union {
1: +    void *key;
1: +  };
1: +  union {
1: +    struct sock *sk;
1: +  };
1:  };
1:  
1:  struct bpf_shtab_elem {
1: -	struct callback_head rcu;
1: -	u32 hash;
1: -	struct sock *sk;
1: -	struct hlist_node node;
1: -	u8 key[0];
1: +  struct callback_head rcu;
1: +  u32 hash;
1: +  struct sock *sk;
1: +  struct hlist_node node;
1: +  u8 key[0];
1:  };
1:  
1:  struct bpf_shtab_bucket {
1: -	struct hlist_head head;
1: -	raw_spinlock_t lock;
1: +  struct hlist_head head;
1: +  raw_spinlock_t lock;
1:  };
1:  
1:  struct bpf_shtab {
1: -	struct bpf_map map;
1: -	struct bpf_shtab_bucket *buckets;
1: -	u32 buckets_num;
1: -	u32 elem_size;
1: -	struct sk_psock_progs progs;
1: -	atomic_t count;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: +  struct bpf_map map;
1: +  struct bpf_shtab_bucket *buckets;
1: +  u32 buckets_num;
1: +  u32 elem_size;
1: +  struct sk_psock_progs progs;
1: +  atomic_t count;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1: -typedef u64 (*btf_bpf_sock_hash_update)(struct bpf_sock_ops_kern *, struct bpf_map *, void *, u64);
1: +typedef u64 (*btf_bpf_sock_hash_update)(struct bpf_sock_ops_kern *,
1: +                                        struct bpf_map *, void *, u64);
1:  
1: -typedef u64 (*btf_bpf_sk_redirect_hash)(struct sk_buff *, struct bpf_map *, void *, u64);
1: +typedef u64 (*btf_bpf_sk_redirect_hash)(struct sk_buff *, struct bpf_map *,
1: +                                        void *, u64);
1:  
1: -typedef u64 (*btf_bpf_msg_redirect_hash)(struct sk_msg *, struct bpf_map *, void *, u64);
1: +typedef u64 (*btf_bpf_msg_redirect_hash)(struct sk_msg *, struct bpf_map *,
1: +                                         void *, u64);
1:  
1:  struct sock_hash_seq_info {
1: -	struct bpf_map *map;
1: -	struct bpf_shtab *htab;
1: -	u32 bucket_id;
1: +  struct bpf_map *map;
1: +  struct bpf_shtab *htab;
1: +  u32 bucket_id;
1:  };
1:  
1:  struct dst_cache_pcpu {
1: -	long unsigned int refresh_ts;
1: -	struct dst_entry *dst;
1: -	u32 cookie;
1: -	union {
1: -		struct in_addr in_saddr;
1: -		struct in6_addr in6_saddr;
1: -	};
1: +  long unsigned int refresh_ts;
1: +  struct dst_entry *dst;
1: +  u32 cookie;
1: +  union {
1: +    struct in_addr in_saddr;
1: +    struct in6_addr in6_saddr;
1: +  };
1:  };
1:  
1:  struct genl_dumpit_info {
1: -	const struct genl_family *family;
1: -	struct genl_ops op;
1: -	struct nlattr **attrs;
1: +  const struct genl_family *family;
1: +  struct genl_ops op;
1: +  struct nlattr **attrs;
1:  };
1:  
1:  enum devlink_command {
1: -	DEVLINK_CMD_UNSPEC = 0,
1: -	DEVLINK_CMD_GET = 1,
1: -	DEVLINK_CMD_SET = 2,
1: -	DEVLINK_CMD_NEW = 3,
1: -	DEVLINK_CMD_DEL = 4,
1: -	DEVLINK_CMD_PORT_GET = 5,
1: -	DEVLINK_CMD_PORT_SET = 6,
1: -	DEVLINK_CMD_PORT_NEW = 7,
1: -	DEVLINK_CMD_PORT_DEL = 8,
1: -	DEVLINK_CMD_PORT_SPLIT = 9,
1: -	DEVLINK_CMD_PORT_UNSPLIT = 10,
1: -	DEVLINK_CMD_SB_GET = 11,
1: -	DEVLINK_CMD_SB_SET = 12,
1: -	DEVLINK_CMD_SB_NEW = 13,
1: -	DEVLINK_CMD_SB_DEL = 14,
1: -	DEVLINK_CMD_SB_POOL_GET = 15,
1: -	DEVLINK_CMD_SB_POOL_SET = 16,
1: -	DEVLINK_CMD_SB_POOL_NEW = 17,
1: -	DEVLINK_CMD_SB_POOL_DEL = 18,
1: -	DEVLINK_CMD_SB_PORT_POOL_GET = 19,
1: -	DEVLINK_CMD_SB_PORT_POOL_SET = 20,
1: -	DEVLINK_CMD_SB_PORT_POOL_NEW = 21,
1: -	DEVLINK_CMD_SB_PORT_POOL_DEL = 22,
1: -	DEVLINK_CMD_SB_TC_POOL_BIND_GET = 23,
1: -	DEVLINK_CMD_SB_TC_POOL_BIND_SET = 24,
1: -	DEVLINK_CMD_SB_TC_POOL_BIND_NEW = 25,
1: -	DEVLINK_CMD_SB_TC_POOL_BIND_DEL = 26,
1: -	DEVLINK_CMD_SB_OCC_SNAPSHOT = 27,
1: -	DEVLINK_CMD_SB_OCC_MAX_CLEAR = 28,
1: -	DEVLINK_CMD_ESWITCH_GET = 29,
1: -	DEVLINK_CMD_ESWITCH_SET = 30,
1: -	DEVLINK_CMD_DPIPE_TABLE_GET = 31,
1: -	DEVLINK_CMD_DPIPE_ENTRIES_GET = 32,
1: -	DEVLINK_CMD_DPIPE_HEADERS_GET = 33,
1: -	DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET = 34,
1: -	DEVLINK_CMD_RESOURCE_SET = 35,
1: -	DEVLINK_CMD_RESOURCE_DUMP = 36,
1: -	DEVLINK_CMD_RELOAD = 37,
1: -	DEVLINK_CMD_PARAM_GET = 38,
1: -	DEVLINK_CMD_PARAM_SET = 39,
1: -	DEVLINK_CMD_PARAM_NEW = 40,
1: -	DEVLINK_CMD_PARAM_DEL = 41,
1: -	DEVLINK_CMD_REGION_GET = 42,
1: -	DEVLINK_CMD_REGION_SET = 43,
1: -	DEVLINK_CMD_REGION_NEW = 44,
1: -	DEVLINK_CMD_REGION_DEL = 45,
1: -	DEVLINK_CMD_REGION_READ = 46,
1: -	DEVLINK_CMD_PORT_PARAM_GET = 47,
1: -	DEVLINK_CMD_PORT_PARAM_SET = 48,
1: -	DEVLINK_CMD_PORT_PARAM_NEW = 49,
1: -	DEVLINK_CMD_PORT_PARAM_DEL = 50,
1: -	DEVLINK_CMD_INFO_GET = 51,
1: -	DEVLINK_CMD_HEALTH_REPORTER_GET = 52,
1: -	DEVLINK_CMD_HEALTH_REPORTER_SET = 53,
1: -	DEVLINK_CMD_HEALTH_REPORTER_RECOVER = 54,
1: -	DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE = 55,
1: -	DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET = 56,
1: -	DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR = 57,
1: -	DEVLINK_CMD_FLASH_UPDATE = 58,
1: -	DEVLINK_CMD_FLASH_UPDATE_END = 59,
1: -	DEVLINK_CMD_FLASH_UPDATE_STATUS = 60,
1: -	DEVLINK_CMD_TRAP_GET = 61,
1: -	DEVLINK_CMD_TRAP_SET = 62,
1: -	DEVLINK_CMD_TRAP_NEW = 63,
1: -	DEVLINK_CMD_TRAP_DEL = 64,
1: -	DEVLINK_CMD_TRAP_GROUP_GET = 65,
1: -	DEVLINK_CMD_TRAP_GROUP_SET = 66,
1: -	DEVLINK_CMD_TRAP_GROUP_NEW = 67,
1: -	DEVLINK_CMD_TRAP_GROUP_DEL = 68,
1: -	DEVLINK_CMD_TRAP_POLICER_GET = 69,
1: -	DEVLINK_CMD_TRAP_POLICER_SET = 70,
1: -	DEVLINK_CMD_TRAP_POLICER_NEW = 71,
1: -	DEVLINK_CMD_TRAP_POLICER_DEL = 72,
1: -	DEVLINK_CMD_HEALTH_REPORTER_TEST = 73,
1: -	__DEVLINK_CMD_MAX = 74,
1: -	DEVLINK_CMD_MAX = 73,
1: -};
1: -
1: -enum {
1: -	DEVLINK_ATTR_STATS_RX_PACKETS = 0,
1: -	DEVLINK_ATTR_STATS_RX_BYTES = 1,
1: -	DEVLINK_ATTR_STATS_RX_DROPPED = 2,
1: -	__DEVLINK_ATTR_STATS_MAX = 3,
1: -	DEVLINK_ATTR_STATS_MAX = 2,
1: -};
1: -
1: -enum {
1: -	DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT = 0,
1: -	DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT = 1,
1: -	__DEVLINK_FLASH_OVERWRITE_MAX_BIT = 2,
1: -	DEVLINK_FLASH_OVERWRITE_MAX_BIT = 1,
1: -};
1: -
1: -enum {
1: -	DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT = 0,
1: -	DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE = 1,
1: +  DEVLINK_CMD_UNSPEC = 0,
1: +  DEVLINK_CMD_GET = 1,
1: +  DEVLINK_CMD_SET = 2,
1: +  DEVLINK_CMD_NEW = 3,
1: +  DEVLINK_CMD_DEL = 4,
1: +  DEVLINK_CMD_PORT_GET = 5,
1: +  DEVLINK_CMD_PORT_SET = 6,
1: +  DEVLINK_CMD_PORT_NEW = 7,
1: +  DEVLINK_CMD_PORT_DEL = 8,
1: +  DEVLINK_CMD_PORT_SPLIT = 9,
1: +  DEVLINK_CMD_PORT_UNSPLIT = 10,
1: +  DEVLINK_CMD_SB_GET = 11,
1: +  DEVLINK_CMD_SB_SET = 12,
1: +  DEVLINK_CMD_SB_NEW = 13,
1: +  DEVLINK_CMD_SB_DEL = 14,
1: +  DEVLINK_CMD_SB_POOL_GET = 15,
1: +  DEVLINK_CMD_SB_POOL_SET = 16,
1: +  DEVLINK_CMD_SB_POOL_NEW = 17,
1: +  DEVLINK_CMD_SB_POOL_DEL = 18,
1: +  DEVLINK_CMD_SB_PORT_POOL_GET = 19,
1: +  DEVLINK_CMD_SB_PORT_POOL_SET = 20,
1: +  DEVLINK_CMD_SB_PORT_POOL_NEW = 21,
1: +  DEVLINK_CMD_SB_PORT_POOL_DEL = 22,
1: +  DEVLINK_CMD_SB_TC_POOL_BIND_GET = 23,
1: +  DEVLINK_CMD_SB_TC_POOL_BIND_SET = 24,
1: +  DEVLINK_CMD_SB_TC_POOL_BIND_NEW = 25,
1: +  DEVLINK_CMD_SB_TC_POOL_BIND_DEL = 26,
1: +  DEVLINK_CMD_SB_OCC_SNAPSHOT = 27,
1: +  DEVLINK_CMD_SB_OCC_MAX_CLEAR = 28,
1: +  DEVLINK_CMD_ESWITCH_GET = 29,
1: +  DEVLINK_CMD_ESWITCH_SET = 30,
1: +  DEVLINK_CMD_DPIPE_TABLE_GET = 31,
1: +  DEVLINK_CMD_DPIPE_ENTRIES_GET = 32,
1: +  DEVLINK_CMD_DPIPE_HEADERS_GET = 33,
1: +  DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET = 34,
1: +  DEVLINK_CMD_RESOURCE_SET = 35,
1: +  DEVLINK_CMD_RESOURCE_DUMP = 36,
1: +  DEVLINK_CMD_RELOAD = 37,
1: +  DEVLINK_CMD_PARAM_GET = 38,
1: +  DEVLINK_CMD_PARAM_SET = 39,
1: +  DEVLINK_CMD_PARAM_NEW = 40,
1: +  DEVLINK_CMD_PARAM_DEL = 41,
1: +  DEVLINK_CMD_REGION_GET = 42,
1: +  DEVLINK_CMD_REGION_SET = 43,
1: +  DEVLINK_CMD_REGION_NEW = 44,
1: +  DEVLINK_CMD_REGION_DEL = 45,
1: +  DEVLINK_CMD_REGION_READ = 46,
1: +  DEVLINK_CMD_PORT_PARAM_GET = 47,
1: +  DEVLINK_CMD_PORT_PARAM_SET = 48,
1: +  DEVLINK_CMD_PORT_PARAM_NEW = 49,
1: +  DEVLINK_CMD_PORT_PARAM_DEL = 50,
1: +  DEVLINK_CMD_INFO_GET = 51,
1: +  DEVLINK_CMD_HEALTH_REPORTER_GET = 52,
1: +  DEVLINK_CMD_HEALTH_REPORTER_SET = 53,
1: +  DEVLINK_CMD_HEALTH_REPORTER_RECOVER = 54,
1: +  DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE = 55,
1: +  DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET = 56,
1: +  DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR = 57,
1: +  DEVLINK_CMD_FLASH_UPDATE = 58,
1: +  DEVLINK_CMD_FLASH_UPDATE_END = 59,
1: +  DEVLINK_CMD_FLASH_UPDATE_STATUS = 60,
1: +  DEVLINK_CMD_TRAP_GET = 61,
1: +  DEVLINK_CMD_TRAP_SET = 62,
1: +  DEVLINK_CMD_TRAP_NEW = 63,
1: +  DEVLINK_CMD_TRAP_DEL = 64,
1: +  DEVLINK_CMD_TRAP_GROUP_GET = 65,
1: +  DEVLINK_CMD_TRAP_GROUP_SET = 66,
1: +  DEVLINK_CMD_TRAP_GROUP_NEW = 67,
1: +  DEVLINK_CMD_TRAP_GROUP_DEL = 68,
1: +  DEVLINK_CMD_TRAP_POLICER_GET = 69,
1: +  DEVLINK_CMD_TRAP_POLICER_SET = 70,
1: +  DEVLINK_CMD_TRAP_POLICER_NEW = 71,
1: +  DEVLINK_CMD_TRAP_POLICER_DEL = 72,
1: +  DEVLINK_CMD_HEALTH_REPORTER_TEST = 73,
1: +  __DEVLINK_CMD_MAX = 74,
1: +  DEVLINK_CMD_MAX = 73,
1: +};
1: +
1: +enum {
1: +  DEVLINK_ATTR_STATS_RX_PACKETS = 0,
1: +  DEVLINK_ATTR_STATS_RX_BYTES = 1,
1: +  DEVLINK_ATTR_STATS_RX_DROPPED = 2,
1: +  __DEVLINK_ATTR_STATS_MAX = 3,
1: +  DEVLINK_ATTR_STATS_MAX = 2,
1: +};
1: +
1: +enum {
1: +  DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT = 0,
1: +  DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT = 1,
1: +  __DEVLINK_FLASH_OVERWRITE_MAX_BIT = 2,
1: +  DEVLINK_FLASH_OVERWRITE_MAX_BIT = 1,
1: +};
1: +
1: +enum {
1: +  DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT = 0,
1: +  DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE = 1,
1:  };
1:  
1:  enum devlink_attr {
1: -	DEVLINK_ATTR_UNSPEC = 0,
1: -	DEVLINK_ATTR_BUS_NAME = 1,
1: -	DEVLINK_ATTR_DEV_NAME = 2,
1: -	DEVLINK_ATTR_PORT_INDEX = 3,
1: -	DEVLINK_ATTR_PORT_TYPE = 4,
1: -	DEVLINK_ATTR_PORT_DESIRED_TYPE = 5,
1: -	DEVLINK_ATTR_PORT_NETDEV_IFINDEX = 6,
1: -	DEVLINK_ATTR_PORT_NETDEV_NAME = 7,
1: -	DEVLINK_ATTR_PORT_IBDEV_NAME = 8,
1: -	DEVLINK_ATTR_PORT_SPLIT_COUNT = 9,
1: -	DEVLINK_ATTR_PORT_SPLIT_GROUP = 10,
1: -	DEVLINK_ATTR_SB_INDEX = 11,
1: -	DEVLINK_ATTR_SB_SIZE = 12,
1: -	DEVLINK_ATTR_SB_INGRESS_POOL_COUNT = 13,
1: -	DEVLINK_ATTR_SB_EGRESS_POOL_COUNT = 14,
1: -	DEVLINK_ATTR_SB_INGRESS_TC_COUNT = 15,
1: -	DEVLINK_ATTR_SB_EGRESS_TC_COUNT = 16,
1: -	DEVLINK_ATTR_SB_POOL_INDEX = 17,
1: -	DEVLINK_ATTR_SB_POOL_TYPE = 18,
1: -	DEVLINK_ATTR_SB_POOL_SIZE = 19,
1: -	DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE = 20,
1: -	DEVLINK_ATTR_SB_THRESHOLD = 21,
1: -	DEVLINK_ATTR_SB_TC_INDEX = 22,
1: -	DEVLINK_ATTR_SB_OCC_CUR = 23,
1: -	DEVLINK_ATTR_SB_OCC_MAX = 24,
1: -	DEVLINK_ATTR_ESWITCH_MODE = 25,
1: -	DEVLINK_ATTR_ESWITCH_INLINE_MODE = 26,
1: -	DEVLINK_ATTR_DPIPE_TABLES = 27,
1: -	DEVLINK_ATTR_DPIPE_TABLE = 28,
1: -	DEVLINK_ATTR_DPIPE_TABLE_NAME = 29,
1: -	DEVLINK_ATTR_DPIPE_TABLE_SIZE = 30,
1: -	DEVLINK_ATTR_DPIPE_TABLE_MATCHES = 31,
1: -	DEVLINK_ATTR_DPIPE_TABLE_ACTIONS = 32,
1: -	DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED = 33,
1: -	DEVLINK_ATTR_DPIPE_ENTRIES = 34,
1: -	DEVLINK_ATTR_DPIPE_ENTRY = 35,
1: -	DEVLINK_ATTR_DPIPE_ENTRY_INDEX = 36,
1: -	DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES = 37,
1: -	DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES = 38,
1: -	DEVLINK_ATTR_DPIPE_ENTRY_COUNTER = 39,
1: -	DEVLINK_ATTR_DPIPE_MATCH = 40,
1: -	DEVLINK_ATTR_DPIPE_MATCH_VALUE = 41,
1: -	DEVLINK_ATTR_DPIPE_MATCH_TYPE = 42,
1: -	DEVLINK_ATTR_DPIPE_ACTION = 43,
1: -	DEVLINK_ATTR_DPIPE_ACTION_VALUE = 44,
1: -	DEVLINK_ATTR_DPIPE_ACTION_TYPE = 45,
1: -	DEVLINK_ATTR_DPIPE_VALUE = 46,
1: -	DEVLINK_ATTR_DPIPE_VALUE_MASK = 47,
1: -	DEVLINK_ATTR_DPIPE_VALUE_MAPPING = 48,
1: -	DEVLINK_ATTR_DPIPE_HEADERS = 49,
1: -	DEVLINK_ATTR_DPIPE_HEADER = 50,
1: -	DEVLINK_ATTR_DPIPE_HEADER_NAME = 51,
1: -	DEVLINK_ATTR_DPIPE_HEADER_ID = 52,
1: -	DEVLINK_ATTR_DPIPE_HEADER_FIELDS = 53,
1: -	DEVLINK_ATTR_DPIPE_HEADER_GLOBAL = 54,
1: -	DEVLINK_ATTR_DPIPE_HEADER_INDEX = 55,
1: -	DEVLINK_ATTR_DPIPE_FIELD = 56,
1: -	DEVLINK_ATTR_DPIPE_FIELD_NAME = 57,
1: -	DEVLINK_ATTR_DPIPE_FIELD_ID = 58,
1: -	DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH = 59,
1: -	DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE = 60,
1: -	DEVLINK_ATTR_PAD = 61,
1: -	DEVLINK_ATTR_ESWITCH_ENCAP_MODE = 62,
1: -	DEVLINK_ATTR_RESOURCE_LIST = 63,
1: -	DEVLINK_ATTR_RESOURCE = 64,
1: -	DEVLINK_ATTR_RESOURCE_NAME = 65,
1: -	DEVLINK_ATTR_RESOURCE_ID = 66,
1: -	DEVLINK_ATTR_RESOURCE_SIZE = 67,
1: -	DEVLINK_ATTR_RESOURCE_SIZE_NEW = 68,
1: -	DEVLINK_ATTR_RESOURCE_SIZE_VALID = 69,
1: -	DEVLINK_ATTR_RESOURCE_SIZE_MIN = 70,
1: -	DEVLINK_ATTR_RESOURCE_SIZE_MAX = 71,
1: -	DEVLINK_ATTR_RESOURCE_SIZE_GRAN = 72,
1: -	DEVLINK_ATTR_RESOURCE_UNIT = 73,
1: -	DEVLINK_ATTR_RESOURCE_OCC = 74,
1: -	DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID = 75,
1: -	DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS = 76,
1: -	DEVLINK_ATTR_PORT_FLAVOUR = 77,
1: -	DEVLINK_ATTR_PORT_NUMBER = 78,
1: -	DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER = 79,
1: -	DEVLINK_ATTR_PARAM = 80,
1: -	DEVLINK_ATTR_PARAM_NAME = 81,
1: -	DEVLINK_ATTR_PARAM_GENERIC = 82,
1: -	DEVLINK_ATTR_PARAM_TYPE = 83,
1: -	DEVLINK_ATTR_PARAM_VALUES_LIST = 84,
1: -	DEVLINK_ATTR_PARAM_VALUE = 85,
1: -	DEVLINK_ATTR_PARAM_VALUE_DATA = 86,
1: -	DEVLINK_ATTR_PARAM_VALUE_CMODE = 87,
1: -	DEVLINK_ATTR_REGION_NAME = 88,
1: -	DEVLINK_ATTR_REGION_SIZE = 89,
1: -	DEVLINK_ATTR_REGION_SNAPSHOTS = 90,
1: -	DEVLINK_ATTR_REGION_SNAPSHOT = 91,
1: -	DEVLINK_ATTR_REGION_SNAPSHOT_ID = 92,
1: -	DEVLINK_ATTR_REGION_CHUNKS = 93,
1: -	DEVLINK_ATTR_REGION_CHUNK = 94,
1: -	DEVLINK_ATTR_REGION_CHUNK_DATA = 95,
1: -	DEVLINK_ATTR_REGION_CHUNK_ADDR = 96,
1: -	DEVLINK_ATTR_REGION_CHUNK_LEN = 97,
1: -	DEVLINK_ATTR_INFO_DRIVER_NAME = 98,
1: -	DEVLINK_ATTR_INFO_SERIAL_NUMBER = 99,
1: -	DEVLINK_ATTR_INFO_VERSION_FIXED = 100,
1: -	DEVLINK_ATTR_INFO_VERSION_RUNNING = 101,
1: -	DEVLINK_ATTR_INFO_VERSION_STORED = 102,
1: -	DEVLINK_ATTR_INFO_VERSION_NAME = 103,
1: -	DEVLINK_ATTR_INFO_VERSION_VALUE = 104,
1: -	DEVLINK_ATTR_SB_POOL_CELL_SIZE = 105,
1: -	DEVLINK_ATTR_FMSG = 106,
1: -	DEVLINK_ATTR_FMSG_OBJ_NEST_START = 107,
1: -	DEVLINK_ATTR_FMSG_PAIR_NEST_START = 108,
1: -	DEVLINK_ATTR_FMSG_ARR_NEST_START = 109,
1: -	DEVLINK_ATTR_FMSG_NEST_END = 110,
1: -	DEVLINK_ATTR_FMSG_OBJ_NAME = 111,
1: -	DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE = 112,
1: -	DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA = 113,
1: -	DEVLINK_ATTR_HEALTH_REPORTER = 114,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_NAME = 115,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_STATE = 116,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT = 117,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT = 118,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS = 119,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD = 120,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER = 121,
1: -	DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME = 122,
1: -	DEVLINK_ATTR_FLASH_UPDATE_COMPONENT = 123,
1: -	DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG = 124,
1: -	DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE = 125,
1: -	DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL = 126,
1: -	DEVLINK_ATTR_PORT_PCI_PF_NUMBER = 127,
1: -	DEVLINK_ATTR_PORT_PCI_VF_NUMBER = 128,
1: -	DEVLINK_ATTR_STATS = 129,
1: -	DEVLINK_ATTR_TRAP_NAME = 130,
1: -	DEVLINK_ATTR_TRAP_ACTION = 131,
1: -	DEVLINK_ATTR_TRAP_TYPE = 132,
1: -	DEVLINK_ATTR_TRAP_GENERIC = 133,
1: -	DEVLINK_ATTR_TRAP_METADATA = 134,
1: -	DEVLINK_ATTR_TRAP_GROUP_NAME = 135,
1: -	DEVLINK_ATTR_RELOAD_FAILED = 136,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS = 137,
1: -	DEVLINK_ATTR_NETNS_FD = 138,
1: -	DEVLINK_ATTR_NETNS_PID = 139,
1: -	DEVLINK_ATTR_NETNS_ID = 140,
1: -	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP = 141,
1: -	DEVLINK_ATTR_TRAP_POLICER_ID = 142,
1: -	DEVLINK_ATTR_TRAP_POLICER_RATE = 143,
1: -	DEVLINK_ATTR_TRAP_POLICER_BURST = 144,
1: -	DEVLINK_ATTR_PORT_FUNCTION = 145,
1: -	DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER = 146,
1: -	DEVLINK_ATTR_PORT_LANES = 147,
1: -	DEVLINK_ATTR_PORT_SPLITTABLE = 148,
1: -	DEVLINK_ATTR_PORT_EXTERNAL = 149,
1: -	DEVLINK_ATTR_PORT_CONTROLLER_NUMBER = 150,
1: -	DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT = 151,
1: -	DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK = 152,
1: -	DEVLINK_ATTR_RELOAD_ACTION = 153,
1: -	DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED = 154,
1: -	DEVLINK_ATTR_RELOAD_LIMITS = 155,
1: -	DEVLINK_ATTR_DEV_STATS = 156,
1: -	DEVLINK_ATTR_RELOAD_STATS = 157,
1: -	DEVLINK_ATTR_RELOAD_STATS_ENTRY = 158,
1: -	DEVLINK_ATTR_RELOAD_STATS_LIMIT = 159,
1: -	DEVLINK_ATTR_RELOAD_STATS_VALUE = 160,
1: -	DEVLINK_ATTR_REMOTE_RELOAD_STATS = 161,
1: -	__DEVLINK_ATTR_MAX = 162,
1: -	DEVLINK_ATTR_MAX = 161,
1: +  DEVLINK_ATTR_UNSPEC = 0,
1: +  DEVLINK_ATTR_BUS_NAME = 1,
1: +  DEVLINK_ATTR_DEV_NAME = 2,
1: +  DEVLINK_ATTR_PORT_INDEX = 3,
1: +  DEVLINK_ATTR_PORT_TYPE = 4,
1: +  DEVLINK_ATTR_PORT_DESIRED_TYPE = 5,
1: +  DEVLINK_ATTR_PORT_NETDEV_IFINDEX = 6,
1: +  DEVLINK_ATTR_PORT_NETDEV_NAME = 7,
1: +  DEVLINK_ATTR_PORT_IBDEV_NAME = 8,
1: +  DEVLINK_ATTR_PORT_SPLIT_COUNT = 9,
1: +  DEVLINK_ATTR_PORT_SPLIT_GROUP = 10,
1: +  DEVLINK_ATTR_SB_INDEX = 11,
1: +  DEVLINK_ATTR_SB_SIZE = 12,
1: +  DEVLINK_ATTR_SB_INGRESS_POOL_COUNT = 13,
1: +  DEVLINK_ATTR_SB_EGRESS_POOL_COUNT = 14,
1: +  DEVLINK_ATTR_SB_INGRESS_TC_COUNT = 15,
1: +  DEVLINK_ATTR_SB_EGRESS_TC_COUNT = 16,
1: +  DEVLINK_ATTR_SB_POOL_INDEX = 17,
1: +  DEVLINK_ATTR_SB_POOL_TYPE = 18,
1: +  DEVLINK_ATTR_SB_POOL_SIZE = 19,
1: +  DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE = 20,
1: +  DEVLINK_ATTR_SB_THRESHOLD = 21,
1: +  DEVLINK_ATTR_SB_TC_INDEX = 22,
1: +  DEVLINK_ATTR_SB_OCC_CUR = 23,
1: +  DEVLINK_ATTR_SB_OCC_MAX = 24,
1: +  DEVLINK_ATTR_ESWITCH_MODE = 25,
1: +  DEVLINK_ATTR_ESWITCH_INLINE_MODE = 26,
1: +  DEVLINK_ATTR_DPIPE_TABLES = 27,
1: +  DEVLINK_ATTR_DPIPE_TABLE = 28,
1: +  DEVLINK_ATTR_DPIPE_TABLE_NAME = 29,
1: +  DEVLINK_ATTR_DPIPE_TABLE_SIZE = 30,
1: +  DEVLINK_ATTR_DPIPE_TABLE_MATCHES = 31,
1: +  DEVLINK_ATTR_DPIPE_TABLE_ACTIONS = 32,
1: +  DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED = 33,
1: +  DEVLINK_ATTR_DPIPE_ENTRIES = 34,
1: +  DEVLINK_ATTR_DPIPE_ENTRY = 35,
1: +  DEVLINK_ATTR_DPIPE_ENTRY_INDEX = 36,
1: +  DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES = 37,
1: +  DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES = 38,
1: +  DEVLINK_ATTR_DPIPE_ENTRY_COUNTER = 39,
1: +  DEVLINK_ATTR_DPIPE_MATCH = 40,
1: +  DEVLINK_ATTR_DPIPE_MATCH_VALUE = 41,
1: +  DEVLINK_ATTR_DPIPE_MATCH_TYPE = 42,
1: +  DEVLINK_ATTR_DPIPE_ACTION = 43,
1: +  DEVLINK_ATTR_DPIPE_ACTION_VALUE = 44,
1: +  DEVLINK_ATTR_DPIPE_ACTION_TYPE = 45,
1: +  DEVLINK_ATTR_DPIPE_VALUE = 46,
1: +  DEVLINK_ATTR_DPIPE_VALUE_MASK = 47,
1: +  DEVLINK_ATTR_DPIPE_VALUE_MAPPING = 48,
1: +  DEVLINK_ATTR_DPIPE_HEADERS = 49,
1: +  DEVLINK_ATTR_DPIPE_HEADER = 50,
1: +  DEVLINK_ATTR_DPIPE_HEADER_NAME = 51,
1: +  DEVLINK_ATTR_DPIPE_HEADER_ID = 52,
1: +  DEVLINK_ATTR_DPIPE_HEADER_FIELDS = 53,
1: +  DEVLINK_ATTR_DPIPE_HEADER_GLOBAL = 54,
1: +  DEVLINK_ATTR_DPIPE_HEADER_INDEX = 55,
1: +  DEVLINK_ATTR_DPIPE_FIELD = 56,
1: +  DEVLINK_ATTR_DPIPE_FIELD_NAME = 57,
1: +  DEVLINK_ATTR_DPIPE_FIELD_ID = 58,
1: +  DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH = 59,
1: +  DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE = 60,
1: +  DEVLINK_ATTR_PAD = 61,
1: +  DEVLINK_ATTR_ESWITCH_ENCAP_MODE = 62,
1: +  DEVLINK_ATTR_RESOURCE_LIST = 63,
1: +  DEVLINK_ATTR_RESOURCE = 64,
1: +  DEVLINK_ATTR_RESOURCE_NAME = 65,
1: +  DEVLINK_ATTR_RESOURCE_ID = 66,
1: +  DEVLINK_ATTR_RESOURCE_SIZE = 67,
1: +  DEVLINK_ATTR_RESOURCE_SIZE_NEW = 68,
1: +  DEVLINK_ATTR_RESOURCE_SIZE_VALID = 69,
1: +  DEVLINK_ATTR_RESOURCE_SIZE_MIN = 70,
1: +  DEVLINK_ATTR_RESOURCE_SIZE_MAX = 71,
1: +  DEVLINK_ATTR_RESOURCE_SIZE_GRAN = 72,
1: +  DEVLINK_ATTR_RESOURCE_UNIT = 73,
1: +  DEVLINK_ATTR_RESOURCE_OCC = 74,
1: +  DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID = 75,
1: +  DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS = 76,
1: +  DEVLINK_ATTR_PORT_FLAVOUR = 77,
1: +  DEVLINK_ATTR_PORT_NUMBER = 78,
1: +  DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER = 79,
1: +  DEVLINK_ATTR_PARAM = 80,
1: +  DEVLINK_ATTR_PARAM_NAME = 81,
1: +  DEVLINK_ATTR_PARAM_GENERIC = 82,
1: +  DEVLINK_ATTR_PARAM_TYPE = 83,
1: +  DEVLINK_ATTR_PARAM_VALUES_LIST = 84,
1: +  DEVLINK_ATTR_PARAM_VALUE = 85,
1: +  DEVLINK_ATTR_PARAM_VALUE_DATA = 86,
1: +  DEVLINK_ATTR_PARAM_VALUE_CMODE = 87,
1: +  DEVLINK_ATTR_REGION_NAME = 88,
1: +  DEVLINK_ATTR_REGION_SIZE = 89,
1: +  DEVLINK_ATTR_REGION_SNAPSHOTS = 90,
1: +  DEVLINK_ATTR_REGION_SNAPSHOT = 91,
1: +  DEVLINK_ATTR_REGION_SNAPSHOT_ID = 92,
1: +  DEVLINK_ATTR_REGION_CHUNKS = 93,
1: +  DEVLINK_ATTR_REGION_CHUNK = 94,
1: +  DEVLINK_ATTR_REGION_CHUNK_DATA = 95,
1: +  DEVLINK_ATTR_REGION_CHUNK_ADDR = 96,
1: +  DEVLINK_ATTR_REGION_CHUNK_LEN = 97,
1: +  DEVLINK_ATTR_INFO_DRIVER_NAME = 98,
1: +  DEVLINK_ATTR_INFO_SERIAL_NUMBER = 99,
1: +  DEVLINK_ATTR_INFO_VERSION_FIXED = 100,
1: +  DEVLINK_ATTR_INFO_VERSION_RUNNING = 101,
1: +  DEVLINK_ATTR_INFO_VERSION_STORED = 102,
1: +  DEVLINK_ATTR_INFO_VERSION_NAME = 103,
1: +  DEVLINK_ATTR_INFO_VERSION_VALUE = 104,
1: +  DEVLINK_ATTR_SB_POOL_CELL_SIZE = 105,
1: +  DEVLINK_ATTR_FMSG = 106,
1: +  DEVLINK_ATTR_FMSG_OBJ_NEST_START = 107,
1: +  DEVLINK_ATTR_FMSG_PAIR_NEST_START = 108,
1: +  DEVLINK_ATTR_FMSG_ARR_NEST_START = 109,
1: +  DEVLINK_ATTR_FMSG_NEST_END = 110,
1: +  DEVLINK_ATTR_FMSG_OBJ_NAME = 111,
1: +  DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE = 112,
1: +  DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA = 113,
1: +  DEVLINK_ATTR_HEALTH_REPORTER = 114,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_NAME = 115,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_STATE = 116,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT = 117,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT = 118,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS = 119,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD = 120,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER = 121,
1: +  DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME = 122,
1: +  DEVLINK_ATTR_FLASH_UPDATE_COMPONENT = 123,
1: +  DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG = 124,
1: +  DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE = 125,
1: +  DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL = 126,
1: +  DEVLINK_ATTR_PORT_PCI_PF_NUMBER = 127,
1: +  DEVLINK_ATTR_PORT_PCI_VF_NUMBER = 128,
1: +  DEVLINK_ATTR_STATS = 129,
1: +  DEVLINK_ATTR_TRAP_NAME = 130,
1: +  DEVLINK_ATTR_TRAP_ACTION = 131,
1: +  DEVLINK_ATTR_TRAP_TYPE = 132,
1: +  DEVLINK_ATTR_TRAP_GENERIC = 133,
1: +  DEVLINK_ATTR_TRAP_METADATA = 134,
1: +  DEVLINK_ATTR_TRAP_GROUP_NAME = 135,
1: +  DEVLINK_ATTR_RELOAD_FAILED = 136,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS = 137,
1: +  DEVLINK_ATTR_NETNS_FD = 138,
1: +  DEVLINK_ATTR_NETNS_PID = 139,
1: +  DEVLINK_ATTR_NETNS_ID = 140,
1: +  DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP = 141,
1: +  DEVLINK_ATTR_TRAP_POLICER_ID = 142,
1: +  DEVLINK_ATTR_TRAP_POLICER_RATE = 143,
1: +  DEVLINK_ATTR_TRAP_POLICER_BURST = 144,
1: +  DEVLINK_ATTR_PORT_FUNCTION = 145,
1: +  DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER = 146,
1: +  DEVLINK_ATTR_PORT_LANES = 147,
1: +  DEVLINK_ATTR_PORT_SPLITTABLE = 148,
1: +  DEVLINK_ATTR_PORT_EXTERNAL = 149,
1: +  DEVLINK_ATTR_PORT_CONTROLLER_NUMBER = 150,
1: +  DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT = 151,
1: +  DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK = 152,
1: +  DEVLINK_ATTR_RELOAD_ACTION = 153,
1: +  DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED = 154,
1: +  DEVLINK_ATTR_RELOAD_LIMITS = 155,
1: +  DEVLINK_ATTR_DEV_STATS = 156,
1: +  DEVLINK_ATTR_RELOAD_STATS = 157,
1: +  DEVLINK_ATTR_RELOAD_STATS_ENTRY = 158,
1: +  DEVLINK_ATTR_RELOAD_STATS_LIMIT = 159,
1: +  DEVLINK_ATTR_RELOAD_STATS_VALUE = 160,
1: +  DEVLINK_ATTR_REMOTE_RELOAD_STATS = 161,
1: +  __DEVLINK_ATTR_MAX = 162,
1: +  DEVLINK_ATTR_MAX = 161,
1:  };
1:  
1:  enum devlink_dpipe_match_type {
1: -	DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT = 0,
1: +  DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT = 0,
1:  };
1:  
1:  enum devlink_dpipe_action_type {
1: -	DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY = 0,
1: +  DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY = 0,
1:  };
1:  
1:  enum devlink_dpipe_field_ethernet_id {
1: -	DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC = 0,
1: +  DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC = 0,
1:  };
1:  
1:  enum devlink_dpipe_field_ipv4_id {
1: -	DEVLINK_DPIPE_FIELD_IPV4_DST_IP = 0,
1: +  DEVLINK_DPIPE_FIELD_IPV4_DST_IP = 0,
1:  };
1:  
1:  enum devlink_dpipe_field_ipv6_id {
1: -	DEVLINK_DPIPE_FIELD_IPV6_DST_IP = 0,
1: +  DEVLINK_DPIPE_FIELD_IPV6_DST_IP = 0,
1:  };
1:  
1:  enum devlink_dpipe_header_id {
1: -	DEVLINK_DPIPE_HEADER_ETHERNET = 0,
1: -	DEVLINK_DPIPE_HEADER_IPV4 = 1,
1: -	DEVLINK_DPIPE_HEADER_IPV6 = 2,
1: +  DEVLINK_DPIPE_HEADER_ETHERNET = 0,
1: +  DEVLINK_DPIPE_HEADER_IPV4 = 1,
1: +  DEVLINK_DPIPE_HEADER_IPV6 = 2,
1:  };
1:  
1:  enum devlink_port_function_attr {
1: -	DEVLINK_PORT_FUNCTION_ATTR_UNSPEC = 0,
1: -	DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR = 1,
1: -	__DEVLINK_PORT_FUNCTION_ATTR_MAX = 2,
1: -	DEVLINK_PORT_FUNCTION_ATTR_MAX = 1,
1: +  DEVLINK_PORT_FUNCTION_ATTR_UNSPEC = 0,
1: +  DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR = 1,
1: +  __DEVLINK_PORT_FUNCTION_ATTR_MAX = 2,
1: +  DEVLINK_PORT_FUNCTION_ATTR_MAX = 1,
1:  };
1:  
1:  struct devlink_dpipe_match {
1: -	enum devlink_dpipe_match_type type;
1: -	unsigned int header_index;
1: -	struct devlink_dpipe_header *header;
1: -	unsigned int field_id;
1: +  enum devlink_dpipe_match_type type;
1: +  unsigned int header_index;
1: +  struct devlink_dpipe_header *header;
1: +  unsigned int field_id;
1:  };
1:  
1:  struct devlink_dpipe_action {
1: -	enum devlink_dpipe_action_type type;
1: -	unsigned int header_index;
1: -	struct devlink_dpipe_header *header;
1: -	unsigned int field_id;
1: +  enum devlink_dpipe_action_type type;
1: +  unsigned int header_index;
1: +  struct devlink_dpipe_header *header;
1: +  unsigned int field_id;
1:  };
1:  
1:  struct devlink_dpipe_value {
1: -	union {
1: -		struct devlink_dpipe_action *action;
1: -		struct devlink_dpipe_match *match;
1: -	};
1: -	unsigned int mapping_value;
1: -	bool mapping_valid;
1: -	unsigned int value_size;
1: -	void *value;
1: -	void *mask;
1: +  union {
1: +    struct devlink_dpipe_action *action;
1: +    struct devlink_dpipe_match *match;
1: +  };
1: +  unsigned int mapping_value;
1: +  bool mapping_valid;
1: +  unsigned int value_size;
1: +  void *value;
1: +  void *mask;
1:  };
1:  
1:  struct devlink_dpipe_entry {
1: -	u64 index;
1: -	struct devlink_dpipe_value *match_values;
1: -	unsigned int match_values_count;
1: -	struct devlink_dpipe_value *action_values;
1: -	unsigned int action_values_count;
1: -	u64 counter;
1: -	bool counter_valid;
1: +  u64 index;
1: +  struct devlink_dpipe_value *match_values;
1: +  unsigned int match_values_count;
1: +  struct devlink_dpipe_value *action_values;
1: +  unsigned int action_values_count;
1: +  u64 counter;
1: +  bool counter_valid;
1:  };
1:  
1:  struct devlink_dpipe_dump_ctx {
1: -	struct genl_info *info;
1: -	enum devlink_command cmd;
1: -	struct sk_buff *skb;
1: -	struct nlattr *nest;
1: -	void *hdr;
1: +  struct genl_info *info;
1: +  enum devlink_command cmd;
1: +  struct sk_buff *skb;
1: +  struct nlattr *nest;
1: +  void *hdr;
1:  };
1:  
1:  struct devlink_dpipe_table_ops;
1:  
1:  struct devlink_dpipe_table {
1: -	void *priv;
1: -	struct list_head list;
1: -	const char *name;
1: -	bool counters_enabled;
1: -	bool counter_control_extern;
1: -	bool resource_valid;
1: -	u64 resource_id;
1: -	u64 resource_units;
1: -	struct devlink_dpipe_table_ops *table_ops;
1: -	struct callback_head rcu;
1: +  void *priv;
1: +  struct list_head list;
1: +  const char *name;
1: +  bool counters_enabled;
1: +  bool counter_control_extern;
1: +  bool resource_valid;
1: +  u64 resource_id;
1: +  u64 resource_units;
1: +  struct devlink_dpipe_table_ops *table_ops;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct devlink_dpipe_table_ops {
1: -	int (*actions_dump)(void *, struct sk_buff *);
1: -	int (*matches_dump)(void *, struct sk_buff *);
1: -	int (*entries_dump)(void *, bool, struct devlink_dpipe_dump_ctx *);
1: -	int (*counters_set_update)(void *, bool);
1: -	u64 (*size_get)(void *);
1: +  int (*actions_dump)(void *, struct sk_buff *);
1: +  int (*matches_dump)(void *, struct sk_buff *);
1: +  int (*entries_dump)(void *, bool, struct devlink_dpipe_dump_ctx *);
1: +  int (*counters_set_update)(void *, bool);
1: +  u64 (*size_get)(void *);
1:  };
1:  
1:  typedef u64 devlink_resource_occ_get_t(void *);
1:  
1:  struct devlink_resource {
1: -	const char *name;
1: -	u64 id;
1: -	u64 size;
1: -	u64 size_new;
1: -	bool size_valid;
1: -	struct devlink_resource *parent;
1: -	struct devlink_resource_size_params size_params;
1: -	struct list_head list;
1: -	struct list_head resource_list;
1: -	devlink_resource_occ_get_t *occ_get;
1: -	void *occ_get_priv;
1: +  const char *name;
1: +  u64 id;
1: +  u64 size;
1: +  u64 size_new;
1: +  bool size_valid;
1: +  struct devlink_resource *parent;
1: +  struct devlink_resource_size_params size_params;
1: +  struct list_head list;
1: +  struct list_head resource_list;
1: +  devlink_resource_occ_get_t *occ_get;
1: +  void *occ_get_priv;
1:  };
1:  
1:  struct devlink_flash_notify {
1: -	const char *status_msg;
1: -	const char *component;
1: -	long unsigned int done;
1: -	long unsigned int total;
1: -	long unsigned int timeout;
1: +  const char *status_msg;
1: +  const char *component;
1: +  long unsigned int done;
1: +  long unsigned int total;
1: +  long unsigned int timeout;
1:  };
1:  
1:  struct devlink_param_item {
1: -	struct list_head list;
1: -	const struct devlink_param *param;
1: -	union devlink_param_value driverinit_value;
1: -	bool driverinit_value_valid;
1: -	bool published;
1: +  struct list_head list;
1: +  const struct devlink_param *param;
1: +  union devlink_param_value driverinit_value;
1: +  bool driverinit_value_valid;
1: +  bool published;
1:  };
1:  
1:  struct devlink_port_region_ops {
1: -	const char *name;
1: -	void (*destructor)(const void *);
1: -	int (*snapshot)(struct devlink_port *, const struct devlink_port_region_ops *, struct netlink_ext_ack *, u8 **);
1: -	void *priv;
1: +  const char *name;
1: +  void (*destructor)(const void *);
1: +  int (*snapshot)(struct devlink_port *, const struct devlink_port_region_ops *,
1: +                  struct netlink_ext_ack *, u8 **);
1: +  void *priv;
1:  };
1:  
1:  enum devlink_health_reporter_state {
1: -	DEVLINK_HEALTH_REPORTER_STATE_HEALTHY = 0,
1: -	DEVLINK_HEALTH_REPORTER_STATE_ERROR = 1,
1: +  DEVLINK_HEALTH_REPORTER_STATE_HEALTHY = 0,
1: +  DEVLINK_HEALTH_REPORTER_STATE_ERROR = 1,
1:  };
1:  
1:  struct devlink_health_reporter {
1: -	struct list_head list;
1: -	void *priv;
1: -	const struct devlink_health_reporter_ops *ops;
1: -	struct devlink *devlink;
1: -	struct devlink_port *devlink_port;
1: -	struct devlink_fmsg *dump_fmsg;
1: -	struct mutex dump_lock;
1: -	u64 graceful_period;
1: -	bool auto_recover;
1: -	bool auto_dump;
1: -	u8 health_state;
1: -	u64 dump_ts;
1: -	u64 dump_real_ts;
1: -	u64 error_count;
1: -	u64 recovery_count;
1: -	u64 last_recovery_ts;
1: -	refcount_t refcount;
1: +  struct list_head list;
1: +  void *priv;
1: +  const struct devlink_health_reporter_ops *ops;
1: +  struct devlink *devlink;
1: +  struct devlink_port *devlink_port;
1: +  struct devlink_fmsg *dump_fmsg;
1: +  struct mutex dump_lock;
1: +  u64 graceful_period;
1: +  bool auto_recover;
1: +  bool auto_dump;
1: +  u8 health_state;
1: +  u64 dump_ts;
1: +  u64 dump_real_ts;
1: +  u64 error_count;
1: +  u64 recovery_count;
1: +  u64 last_recovery_ts;
1: +  refcount_t refcount;
1:  };
1:  
1:  struct devlink_fmsg {
1: -	struct list_head item_list;
1: -	bool putting_binary;
1: +  struct list_head item_list;
1: +  bool putting_binary;
1:  };
1:  
1:  struct devlink_trap_metadata {
1: -	const char *trap_name;
1: -	const char *trap_group_name;
1: -	struct net_device *input_dev;
1: -	const struct flow_action_cookie *fa_cookie;
1: -	enum devlink_trap_type trap_type;
1: +  const char *trap_name;
1: +  const char *trap_group_name;
1: +  struct net_device *input_dev;
1: +  const struct flow_action_cookie *fa_cookie;
1: +  enum devlink_trap_type trap_type;
1:  };
1:  
1:  struct devlink_info_req {
1: -	struct sk_buff *msg;
1: +  struct sk_buff *msg;
1:  };
1:  
1:  struct trace_event_raw_devlink_hwmsg {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bus_name;
1: -	u32 __data_loc_dev_name;
1: -	u32 __data_loc_driver_name;
1: -	bool incoming;
1: -	long unsigned int type;
1: -	u32 __data_loc_buf;
1: -	size_t len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bus_name;
1: +  u32 __data_loc_dev_name;
1: +  u32 __data_loc_driver_name;
1: +  bool incoming;
1: +  long unsigned int type;
1: +  u32 __data_loc_buf;
1: +  size_t len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_devlink_hwerr {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bus_name;
1: -	u32 __data_loc_dev_name;
1: -	u32 __data_loc_driver_name;
1: -	int err;
1: -	u32 __data_loc_msg;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bus_name;
1: +  u32 __data_loc_dev_name;
1: +  u32 __data_loc_driver_name;
1: +  int err;
1: +  u32 __data_loc_msg;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_devlink_health_report {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bus_name;
1: -	u32 __data_loc_dev_name;
1: -	u32 __data_loc_driver_name;
1: -	u32 __data_loc_reporter_name;
1: -	u32 __data_loc_msg;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bus_name;
1: +  u32 __data_loc_dev_name;
1: +  u32 __data_loc_driver_name;
1: +  u32 __data_loc_reporter_name;
1: +  u32 __data_loc_msg;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_devlink_health_recover_aborted {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bus_name;
1: -	u32 __data_loc_dev_name;
1: -	u32 __data_loc_driver_name;
1: -	u32 __data_loc_reporter_name;
1: -	bool health_state;
1: -	u64 time_since_last_recover;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bus_name;
1: +  u32 __data_loc_dev_name;
1: +  u32 __data_loc_driver_name;
1: +  u32 __data_loc_reporter_name;
1: +  bool health_state;
1: +  u64 time_since_last_recover;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_devlink_health_reporter_state_update {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bus_name;
1: -	u32 __data_loc_dev_name;
1: -	u32 __data_loc_driver_name;
1: -	u32 __data_loc_reporter_name;
1: -	u8 new_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bus_name;
1: +  u32 __data_loc_dev_name;
1: +  u32 __data_loc_driver_name;
1: +  u32 __data_loc_reporter_name;
1: +  u8 new_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_devlink_trap_report {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_bus_name;
1: -	u32 __data_loc_dev_name;
1: -	u32 __data_loc_driver_name;
1: -	u32 __data_loc_trap_name;
1: -	u32 __data_loc_trap_group_name;
1: -	u32 __data_loc_input_dev_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_bus_name;
1: +  u32 __data_loc_dev_name;
1: +  u32 __data_loc_driver_name;
1: +  u32 __data_loc_trap_name;
1: +  u32 __data_loc_trap_group_name;
1: +  u32 __data_loc_input_dev_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_devlink_hwmsg {
1: -	u32 bus_name;
1: -	u32 dev_name;
1: -	u32 driver_name;
1: -	u32 buf;
1: +  u32 bus_name;
1: +  u32 dev_name;
1: +  u32 driver_name;
1: +  u32 buf;
1:  };
1:  
1:  struct trace_event_data_offsets_devlink_hwerr {
1: -	u32 bus_name;
1: -	u32 dev_name;
1: -	u32 driver_name;
1: -	u32 msg;
1: +  u32 bus_name;
1: +  u32 dev_name;
1: +  u32 driver_name;
1: +  u32 msg;
1:  };
1:  
1:  struct trace_event_data_offsets_devlink_health_report {
1: -	u32 bus_name;
1: -	u32 dev_name;
1: -	u32 driver_name;
1: -	u32 reporter_name;
1: -	u32 msg;
1: +  u32 bus_name;
1: +  u32 dev_name;
1: +  u32 driver_name;
1: +  u32 reporter_name;
1: +  u32 msg;
1:  };
1:  
1:  struct trace_event_data_offsets_devlink_health_recover_aborted {
1: -	u32 bus_name;
1: -	u32 dev_name;
1: -	u32 driver_name;
1: -	u32 reporter_name;
1: +  u32 bus_name;
1: +  u32 dev_name;
1: +  u32 driver_name;
1: +  u32 reporter_name;
1:  };
1:  
1:  struct trace_event_data_offsets_devlink_health_reporter_state_update {
1: -	u32 bus_name;
1: -	u32 dev_name;
1: -	u32 driver_name;
1: -	u32 reporter_name;
1: +  u32 bus_name;
1: +  u32 dev_name;
1: +  u32 driver_name;
1: +  u32 reporter_name;
1:  };
1:  
1:  struct trace_event_data_offsets_devlink_trap_report {
1: -	u32 bus_name;
1: -	u32 dev_name;
1: -	u32 driver_name;
1: -	u32 trap_name;
1: -	u32 trap_group_name;
1: -	u32 input_dev_name;
1: +  u32 bus_name;
1: +  u32 dev_name;
1: +  u32 driver_name;
1: +  u32 trap_name;
1: +  u32 trap_group_name;
1: +  u32 input_dev_name;
1:  };
1:  
1: -typedef void (*btf_trace_devlink_hwmsg)(void *, const struct devlink *, bool, long unsigned int, const u8 *, size_t);
1: +typedef void (*btf_trace_devlink_hwmsg)(void *, const struct devlink *, bool,
1: +                                        long unsigned int, const u8 *, size_t);
1:  
1: -typedef void (*btf_trace_devlink_hwerr)(void *, const struct devlink *, int, const char *);
1: +typedef void (*btf_trace_devlink_hwerr)(void *, const struct devlink *, int,
1: +                                        const char *);
1:  
1: -typedef void (*btf_trace_devlink_health_report)(void *, const struct devlink *, const char *, const char *);
1: +typedef void (*btf_trace_devlink_health_report)(void *, const struct devlink *,
1: +                                                const char *, const char *);
1:  
1: -typedef void (*btf_trace_devlink_health_recover_aborted)(void *, const struct devlink *, const char *, bool, u64);
1: +typedef void (*btf_trace_devlink_health_recover_aborted)(void *,
1: +                                                         const struct devlink *,
1: +                                                         const char *, bool,
1: +                                                         u64);
1:  
1: -typedef void (*btf_trace_devlink_health_reporter_state_update)(void *, const struct devlink *, const char *, bool);
1: +typedef void (*btf_trace_devlink_health_reporter_state_update)(
1: +    void *, const struct devlink *, const char *, bool);
1:  
1: -typedef void (*btf_trace_devlink_trap_report)(void *, const struct devlink *, struct sk_buff *, const struct devlink_trap_metadata *);
1: +typedef void (*btf_trace_devlink_trap_report)(
1: +    void *, const struct devlink *, struct sk_buff *,
1: +    const struct devlink_trap_metadata *);
1:  
1:  struct devlink_sb {
1: -	struct list_head list;
1: -	unsigned int index;
1: -	u32 size;
1: -	u16 ingress_pools_count;
1: -	u16 egress_pools_count;
1: -	u16 ingress_tc_count;
1: -	u16 egress_tc_count;
1: +  struct list_head list;
1: +  unsigned int index;
1: +  u32 size;
1: +  u16 ingress_pools_count;
1: +  u16 egress_pools_count;
1: +  u16 ingress_tc_count;
1: +  u16 egress_tc_count;
1:  };
1:  
1:  struct devlink_region___2 {
1: -	struct devlink *devlink;
1: -	struct devlink_port *port;
1: -	struct list_head list;
1: -	union {
1: -		const struct devlink_region_ops *ops;
1: -		const struct devlink_port_region_ops *port_ops;
1: -	};
1: -	struct list_head snapshot_list;
1: -	u32 max_snapshots;
1: -	u32 cur_snapshots;
1: -	u64 size;
1: +  struct devlink *devlink;
1: +  struct devlink_port *port;
1: +  struct list_head list;
1: +  union {
1: +    const struct devlink_region_ops *ops;
1: +    const struct devlink_port_region_ops *port_ops;
1: +  };
1: +  struct list_head snapshot_list;
1: +  u32 max_snapshots;
1: +  u32 cur_snapshots;
1: +  u64 size;
1:  };
1:  
1:  struct devlink_snapshot {
1: -	struct list_head list;
1: -	struct devlink_region___2 *region;
1: -	u8 *data;
1: -	u32 id;
1: +  struct list_head list;
1: +  struct devlink_region___2 *region;
1: +  u8 *data;
1: +  u32 id;
1:  };
1:  
1:  enum devlink_multicast_groups {
1: -	DEVLINK_MCGRP_CONFIG = 0,
1: +  DEVLINK_MCGRP_CONFIG = 0,
1:  };
1:  
1:  struct devlink_reload_combination {
1: -	enum devlink_reload_action action;
1: -	enum devlink_reload_limit limit;
1: +  enum devlink_reload_action action;
1: +  enum devlink_reload_limit limit;
1:  };
1:  
1:  struct devlink_fmsg_item {
1: -	struct list_head list;
1: -	int attrtype;
1: -	u8 nla_type;
1: -	u16 len;
1: -	int value[0];
1: +  struct list_head list;
1: +  int attrtype;
1: +  u8 nla_type;
1: +  u16 len;
1: +  int value[0];
1:  };
1:  
1:  struct devlink_stats {
1: -	u64 rx_bytes;
1: -	u64 rx_packets;
1: -	struct u64_stats_sync syncp;
1: +  u64 rx_bytes;
1: +  u64 rx_packets;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct devlink_trap_policer_item {
1: -	const struct devlink_trap_policer *policer;
1: -	u64 rate;
1: -	u64 burst;
1: -	struct list_head list;
1: +  const struct devlink_trap_policer *policer;
1: +  u64 rate;
1: +  u64 burst;
1: +  struct list_head list;
1:  };
1:  
1:  struct devlink_trap_group_item {
1: -	const struct devlink_trap_group *group;
1: -	struct devlink_trap_policer_item *policer_item;
1: -	struct list_head list;
1: -	struct devlink_stats *stats;
1: +  const struct devlink_trap_group *group;
1: +  struct devlink_trap_policer_item *policer_item;
1: +  struct list_head list;
1: +  struct devlink_stats *stats;
1:  };
1:  
1:  struct devlink_trap_item {
1: -	const struct devlink_trap *trap;
1: -	struct devlink_trap_group_item *group_item;
1: -	struct list_head list;
1: -	enum devlink_trap_action action;
1: -	struct devlink_stats *stats;
1: -	void *priv;
1: +  const struct devlink_trap *trap;
1: +  struct devlink_trap_group_item *group_item;
1: +  struct list_head list;
1: +  enum devlink_trap_action action;
1: +  struct devlink_stats *stats;
1: +  void *priv;
1:  };
1:  
1:  struct gro_cell {
1: -	struct sk_buff_head napi_skbs;
1: -	struct napi_struct napi;
1: +  struct sk_buff_head napi_skbs;
1: +  struct napi_struct napi;
1:  };
1:  
1:  enum netdev_lag_tx_type {
1: -	NETDEV_LAG_TX_TYPE_UNKNOWN = 0,
1: -	NETDEV_LAG_TX_TYPE_RANDOM = 1,
1: -	NETDEV_LAG_TX_TYPE_BROADCAST = 2,
1: -	NETDEV_LAG_TX_TYPE_ROUNDROBIN = 3,
1: -	NETDEV_LAG_TX_TYPE_ACTIVEBACKUP = 4,
1: -	NETDEV_LAG_TX_TYPE_HASH = 5,
1: +  NETDEV_LAG_TX_TYPE_UNKNOWN = 0,
1: +  NETDEV_LAG_TX_TYPE_RANDOM = 1,
1: +  NETDEV_LAG_TX_TYPE_BROADCAST = 2,
1: +  NETDEV_LAG_TX_TYPE_ROUNDROBIN = 3,
1: +  NETDEV_LAG_TX_TYPE_ACTIVEBACKUP = 4,
1: +  NETDEV_LAG_TX_TYPE_HASH = 5,
1:  };
1:  
1:  enum netdev_lag_hash {
1: -	NETDEV_LAG_HASH_NONE = 0,
1: -	NETDEV_LAG_HASH_L2 = 1,
1: -	NETDEV_LAG_HASH_L34 = 2,
1: -	NETDEV_LAG_HASH_L23 = 3,
1: -	NETDEV_LAG_HASH_E23 = 4,
1: -	NETDEV_LAG_HASH_E34 = 5,
1: -	NETDEV_LAG_HASH_UNKNOWN = 6,
1: +  NETDEV_LAG_HASH_NONE = 0,
1: +  NETDEV_LAG_HASH_L2 = 1,
1: +  NETDEV_LAG_HASH_L34 = 2,
1: +  NETDEV_LAG_HASH_L23 = 3,
1: +  NETDEV_LAG_HASH_E23 = 4,
1: +  NETDEV_LAG_HASH_E34 = 5,
1: +  NETDEV_LAG_HASH_UNKNOWN = 6,
1:  };
1:  
1:  struct netdev_lag_upper_info {
1: -	enum netdev_lag_tx_type tx_type;
1: -	enum netdev_lag_hash hash_type;
1: +  enum netdev_lag_tx_type tx_type;
1: +  enum netdev_lag_hash hash_type;
1:  };
1:  
1:  enum {
1: -	SK_DIAG_BPF_STORAGE_REQ_NONE = 0,
1: -	SK_DIAG_BPF_STORAGE_REQ_MAP_FD = 1,
1: -	__SK_DIAG_BPF_STORAGE_REQ_MAX = 2,
1: +  SK_DIAG_BPF_STORAGE_REQ_NONE = 0,
1: +  SK_DIAG_BPF_STORAGE_REQ_MAP_FD = 1,
1: +  __SK_DIAG_BPF_STORAGE_REQ_MAX = 2,
1:  };
1:  
1:  enum {
1: -	SK_DIAG_BPF_STORAGE_REP_NONE = 0,
1: -	SK_DIAG_BPF_STORAGE = 1,
1: -	__SK_DIAG_BPF_STORAGE_REP_MAX = 2,
1: +  SK_DIAG_BPF_STORAGE_REP_NONE = 0,
1: +  SK_DIAG_BPF_STORAGE = 1,
1: +  __SK_DIAG_BPF_STORAGE_REP_MAX = 2,
1:  };
1:  
1:  enum {
1: -	SK_DIAG_BPF_STORAGE_NONE = 0,
1: -	SK_DIAG_BPF_STORAGE_PAD = 1,
1: -	SK_DIAG_BPF_STORAGE_MAP_ID = 2,
1: -	SK_DIAG_BPF_STORAGE_MAP_VALUE = 3,
1: -	__SK_DIAG_BPF_STORAGE_MAX = 4,
1: +  SK_DIAG_BPF_STORAGE_NONE = 0,
1: +  SK_DIAG_BPF_STORAGE_PAD = 1,
1: +  SK_DIAG_BPF_STORAGE_MAP_ID = 2,
1: +  SK_DIAG_BPF_STORAGE_MAP_VALUE = 3,
1: +  __SK_DIAG_BPF_STORAGE_MAX = 4,
1:  };
1:  
1: -typedef u64 (*btf_bpf_sk_storage_get)(struct bpf_map *, struct sock *, void *, u64);
1: +typedef u64 (*btf_bpf_sk_storage_get)(struct bpf_map *, struct sock *, void *,
1: +                                      u64);
1:  
1:  typedef u64 (*btf_bpf_sk_storage_delete)(struct bpf_map *, struct sock *);
1:  
1: -typedef u64 (*btf_bpf_sk_storage_get_tracing)(struct bpf_map *, struct sock *, void *, u64);
1: +typedef u64 (*btf_bpf_sk_storage_get_tracing)(struct bpf_map *, struct sock *,
1: +                                              void *, u64);
1:  
1: -typedef u64 (*btf_bpf_sk_storage_delete_tracing)(struct bpf_map *, struct sock *);
1: +typedef u64 (*btf_bpf_sk_storage_delete_tracing)(struct bpf_map *,
1: +                                                 struct sock *);
1:  
1:  struct bpf_sk_storage_diag {
1: -	u32 nr_maps;
1: -	struct bpf_map *maps[0];
1: +  u32 nr_maps;
1: +  struct bpf_map *maps[0];
1:  };
1:  
1:  struct bpf_iter_seq_sk_storage_map_info {
1: -	struct bpf_map *map;
1: -	unsigned int bucket_id;
1: -	unsigned int skip_elems;
1: +  struct bpf_map *map;
1: +  unsigned int bucket_id;
1: +  unsigned int skip_elems;
1:  };
1:  
1:  struct bpf_iter__bpf_sk_storage_map {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct bpf_map *map;
1: -	};
1: -	union {
1: -		struct sock *sk;
1: -	};
1: -	union {
1: -		void *value;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct bpf_map *map;
1: +  };
1: +  union {
1: +    struct sock *sk;
1: +  };
1: +  union {
1: +    void *value;
1: +  };
1:  };
1:  
1:  struct compat_cmsghdr {
1: -	compat_size_t cmsg_len;
1: -	compat_int_t cmsg_level;
1: -	compat_int_t cmsg_type;
1: +  compat_size_t cmsg_len;
1: +  compat_int_t cmsg_level;
1: +  compat_int_t cmsg_type;
1:  };
1:  
1:  struct llc_addr {
1: -	unsigned char lsap;
1: -	unsigned char mac[6];
1: +  unsigned char lsap;
1: +  unsigned char mac[6];
1:  };
1:  
1:  struct llc_sap {
1: -	unsigned char state;
1: -	unsigned char p_bit;
1: -	unsigned char f_bit;
1: -	refcount_t refcnt;
1: -	int (*rcv_func)(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
1: -	struct llc_addr laddr;
1: -	struct list_head node;
1: -	spinlock_t sk_lock;
1: -	int sk_count;
1: -	struct hlist_nulls_head sk_laddr_hash[64];
1: -	struct hlist_head sk_dev_hash[64];
1: -	struct callback_head rcu;
1: +  unsigned char state;
1: +  unsigned char p_bit;
1: +  unsigned char f_bit;
1: +  refcount_t refcnt;
1: +  int (*rcv_func)(struct sk_buff *, struct net_device *, struct packet_type *,
1: +                  struct net_device *);
1: +  struct llc_addr laddr;
1: +  struct list_head node;
1: +  spinlock_t sk_lock;
1: +  int sk_count;
1: +  struct hlist_nulls_head sk_laddr_hash[64];
1: +  struct hlist_head sk_dev_hash[64];
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct llc_pdu_sn {
1: -	u8 dsap;
1: -	u8 ssap;
1: -	u8 ctrl_1;
1: -	u8 ctrl_2;
1: +  u8 dsap;
1: +  u8 ssap;
1: +  u8 ctrl_1;
1: +  u8 ctrl_2;
1:  };
1:  
1:  struct llc_pdu_un {
1: -	u8 dsap;
1: -	u8 ssap;
1: -	u8 ctrl_1;
1: +  u8 dsap;
1: +  u8 ssap;
1: +  u8 ctrl_1;
1:  };
1:  
1:  struct nvmem_cell___2;
1:  
1:  struct datalink_proto {
1: -	unsigned char type[8];
1: -	struct llc_sap *sap;
1: -	short unsigned int header_length;
1: -	int (*rcvfunc)(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
1: -	int (*request)(struct datalink_proto *, struct sk_buff *, unsigned char *);
1: -	struct list_head node;
1: +  unsigned char type[8];
1: +  struct llc_sap *sap;
1: +  short unsigned int header_length;
1: +  int (*rcvfunc)(struct sk_buff *, struct net_device *, struct packet_type *,
1: +                 struct net_device *);
1: +  int (*request)(struct datalink_proto *, struct sk_buff *, unsigned char *);
1: +  struct list_head node;
1:  };
1:  
1:  struct fch_hdr {
1: -	__u8 daddr[6];
1: -	__u8 saddr[6];
1: +  __u8 daddr[6];
1: +  __u8 saddr[6];
1:  };
1:  
1:  struct fcllc {
1: -	__u8 dsap;
1: -	__u8 ssap;
1: -	__u8 llc;
1: -	__u8 protid[3];
1: -	__be16 ethertype;
1: +  __u8 dsap;
1: +  __u8 ssap;
1: +  __u8 llc;
1: +  __u8 protid[3];
1: +  __be16 ethertype;
1:  };
1:  
1:  struct stp_proto {
1: -	unsigned char group_address[6];
1: -	void (*rcv)(const struct stp_proto *, struct sk_buff *, struct net_device *);
1: -	void *data;
1: +  unsigned char group_address[6];
1: +  void (*rcv)(const struct stp_proto *, struct sk_buff *, struct net_device *);
1: +  void *data;
1:  };
1:  
1:  struct tc_ratespec {
1: -	unsigned char cell_log;
1: -	__u8 linklayer;
1: -	short unsigned int overhead;
1: -	short int cell_align;
1: -	short unsigned int mpu;
1: -	__u32 rate;
1: +  unsigned char cell_log;
1: +  __u8 linklayer;
1: +  short unsigned int overhead;
1: +  short int cell_align;
1: +  short unsigned int mpu;
1: +  __u32 rate;
1:  };
1:  
1:  struct tc_prio_qopt {
1: -	int bands;
1: -	__u8 priomap[16];
1: -};
1: -
1: -enum {
1: -	TCA_UNSPEC = 0,
1: -	TCA_KIND = 1,
1: -	TCA_OPTIONS = 2,
1: -	TCA_STATS = 3,
1: -	TCA_XSTATS = 4,
1: -	TCA_RATE = 5,
1: -	TCA_FCNT = 6,
1: -	TCA_STATS2 = 7,
1: -	TCA_STAB = 8,
1: -	TCA_PAD = 9,
1: -	TCA_DUMP_INVISIBLE = 10,
1: -	TCA_CHAIN = 11,
1: -	TCA_HW_OFFLOAD = 12,
1: -	TCA_INGRESS_BLOCK = 13,
1: -	TCA_EGRESS_BLOCK = 14,
1: -	TCA_DUMP_FLAGS = 15,
1: -	__TCA_MAX = 16,
1: +  int bands;
1: +  __u8 priomap[16];
1: +};
1: +
1: +enum {
1: +  TCA_UNSPEC = 0,
1: +  TCA_KIND = 1,
1: +  TCA_OPTIONS = 2,
1: +  TCA_STATS = 3,
1: +  TCA_XSTATS = 4,
1: +  TCA_RATE = 5,
1: +  TCA_FCNT = 6,
1: +  TCA_STATS2 = 7,
1: +  TCA_STAB = 8,
1: +  TCA_PAD = 9,
1: +  TCA_DUMP_INVISIBLE = 10,
1: +  TCA_CHAIN = 11,
1: +  TCA_HW_OFFLOAD = 12,
1: +  TCA_INGRESS_BLOCK = 13,
1: +  TCA_EGRESS_BLOCK = 14,
1: +  TCA_DUMP_FLAGS = 15,
1: +  __TCA_MAX = 16,
1:  };
1:  
1:  struct skb_array {
1: -	struct ptr_ring ring;
1: +  struct ptr_ring ring;
1:  };
1:  
1:  struct psched_ratecfg {
1: -	u64 rate_bytes_ps;
1: -	u32 mult;
1: -	u16 overhead;
1: -	u8 linklayer;
1: -	u8 shift;
1: +  u64 rate_bytes_ps;
1: +  u32 mult;
1: +  u16 overhead;
1: +  u8 linklayer;
1: +  u8 shift;
1:  };
1:  
1:  struct mini_Qdisc_pair {
1: -	struct mini_Qdisc miniq1;
1: -	struct mini_Qdisc miniq2;
1: -	struct mini_Qdisc **p_miniq;
1: +  struct mini_Qdisc miniq1;
1: +  struct mini_Qdisc miniq2;
1: +  struct mini_Qdisc **p_miniq;
1:  };
1:  
1:  struct pfifo_fast_priv {
1: -	struct skb_array q[3];
1: +  struct skb_array q[3];
1:  };
1:  
1:  struct tc_qopt_offload_stats {
1: -	struct gnet_stats_basic_packed *bstats;
1: -	struct gnet_stats_queue *qstats;
1: +  struct gnet_stats_basic_packed *bstats;
1: +  struct gnet_stats_queue *qstats;
1:  };
1:  
1:  enum tc_mq_command {
1: -	TC_MQ_CREATE = 0,
1: -	TC_MQ_DESTROY = 1,
1: -	TC_MQ_STATS = 2,
1: -	TC_MQ_GRAFT = 3,
1: +  TC_MQ_CREATE = 0,
1: +  TC_MQ_DESTROY = 1,
1: +  TC_MQ_STATS = 2,
1: +  TC_MQ_GRAFT = 3,
1:  };
1:  
1:  struct tc_mq_opt_offload_graft_params {
1: -	long unsigned int queue;
1: -	u32 child_handle;
1: +  long unsigned int queue;
1: +  u32 child_handle;
1:  };
1:  
1:  struct tc_mq_qopt_offload {
1: -	enum tc_mq_command command;
1: -	u32 handle;
1: -	union {
1: -		struct tc_qopt_offload_stats stats;
1: -		struct tc_mq_opt_offload_graft_params graft_params;
1: -	};
1: +  enum tc_mq_command command;
1: +  u32 handle;
1: +  union {
1: +    struct tc_qopt_offload_stats stats;
1: +    struct tc_mq_opt_offload_graft_params graft_params;
1: +  };
1:  };
1:  
1:  struct mq_sched {
1: -	struct Qdisc **qdiscs;
1: +  struct Qdisc **qdiscs;
1:  };
1:  
1:  enum tc_link_layer {
1: -	TC_LINKLAYER_UNAWARE = 0,
1: -	TC_LINKLAYER_ETHERNET = 1,
1: -	TC_LINKLAYER_ATM = 2,
1: +  TC_LINKLAYER_UNAWARE = 0,
1: +  TC_LINKLAYER_ETHERNET = 1,
1: +  TC_LINKLAYER_ATM = 2,
1:  };
1:  
1:  enum {
1: -	TCA_STAB_UNSPEC = 0,
1: -	TCA_STAB_BASE = 1,
1: -	TCA_STAB_DATA = 2,
1: -	__TCA_STAB_MAX = 3,
1: +  TCA_STAB_UNSPEC = 0,
1: +  TCA_STAB_BASE = 1,
1: +  TCA_STAB_DATA = 2,
1: +  __TCA_STAB_MAX = 3,
1:  };
1:  
1:  struct qdisc_rate_table {
1: -	struct tc_ratespec rate;
1: -	u32 data[256];
1: -	struct qdisc_rate_table *next;
1: -	int refcnt;
1: +  struct tc_ratespec rate;
1: +  u32 data[256];
1: +  struct qdisc_rate_table *next;
1: +  int refcnt;
1:  };
1:  
1:  struct Qdisc_class_common {
1: -	u32 classid;
1: -	struct hlist_node hnode;
1: +  u32 classid;
1: +  struct hlist_node hnode;
1:  };
1:  
1:  struct Qdisc_class_hash {
1: -	struct hlist_head *hash;
1: -	unsigned int hashsize;
1: -	unsigned int hashmask;
1: -	unsigned int hashelems;
1: +  struct hlist_head *hash;
1: +  unsigned int hashsize;
1: +  unsigned int hashmask;
1: +  unsigned int hashelems;
1:  };
1:  
1:  struct qdisc_watchdog {
1: -	u64 last_expires;
1: -	struct hrtimer timer;
1: -	struct Qdisc *qdisc;
1: +  u64 last_expires;
1: +  struct hrtimer timer;
1: +  struct Qdisc *qdisc;
1:  };
1:  
1:  enum tc_root_command {
1: -	TC_ROOT_GRAFT = 0,
1: +  TC_ROOT_GRAFT = 0,
1:  };
1:  
1:  struct tc_root_qopt_offload {
1: -	enum tc_root_command command;
1: -	u32 handle;
1: -	bool ingress;
1: +  enum tc_root_command command;
1: +  u32 handle;
1: +  bool ingress;
1:  };
1:  
1:  struct check_loop_arg {
1: -	struct qdisc_walker w;
1: -	struct Qdisc *p;
1: -	int depth;
1: +  struct qdisc_walker w;
1: +  struct Qdisc *p;
1: +  int depth;
1:  };
1:  
1:  struct tcf_bind_args {
1: -	struct tcf_walker w;
1: -	long unsigned int base;
1: -	long unsigned int cl;
1: -	u32 classid;
1: +  struct tcf_walker w;
1: +  long unsigned int base;
1: +  long unsigned int cl;
1: +  u32 classid;
1:  };
1:  
1:  struct tc_bind_class_args {
1: -	struct qdisc_walker w;
1: -	long unsigned int new_cl;
1: -	u32 portid;
1: -	u32 clid;
1: +  struct qdisc_walker w;
1: +  long unsigned int new_cl;
1: +  u32 portid;
1: +  u32 clid;
1:  };
1:  
1:  struct qdisc_dump_args {
1: -	struct qdisc_walker w;
1: -	struct sk_buff *skb;
1: -	struct netlink_callback *cb;
1: +  struct qdisc_walker w;
1: +  struct sk_buff *skb;
1: +  struct netlink_callback *cb;
1:  };
1:  
1:  enum net_xmit_qdisc_t {
1: -	__NET_XMIT_STOLEN = 65536,
1: -	__NET_XMIT_BYPASS = 131072,
1: +  __NET_XMIT_STOLEN = 65536,
1: +  __NET_XMIT_BYPASS = 131072,
1:  };
1:  
1:  enum {
1: -	TCA_ACT_UNSPEC = 0,
1: -	TCA_ACT_KIND = 1,
1: -	TCA_ACT_OPTIONS = 2,
1: -	TCA_ACT_INDEX = 3,
1: -	TCA_ACT_STATS = 4,
1: -	TCA_ACT_PAD = 5,
1: -	TCA_ACT_COOKIE = 6,
1: -	TCA_ACT_FLAGS = 7,
1: -	TCA_ACT_HW_STATS = 8,
1: -	TCA_ACT_USED_HW_STATS = 9,
1: -	__TCA_ACT_MAX = 10,
1: +  TCA_ACT_UNSPEC = 0,
1: +  TCA_ACT_KIND = 1,
1: +  TCA_ACT_OPTIONS = 2,
1: +  TCA_ACT_INDEX = 3,
1: +  TCA_ACT_STATS = 4,
1: +  TCA_ACT_PAD = 5,
1: +  TCA_ACT_COOKIE = 6,
1: +  TCA_ACT_FLAGS = 7,
1: +  TCA_ACT_HW_STATS = 8,
1: +  TCA_ACT_USED_HW_STATS = 9,
1: +  __TCA_ACT_MAX = 10,
1:  };
1:  
1:  struct psample_group {
1: -	struct list_head list;
1: -	struct net *net;
1: -	u32 group_num;
1: -	u32 refcount;
1: -	u32 seq;
1: -	struct callback_head rcu;
1: +  struct list_head list;
1: +  struct net *net;
1: +  u32 group_num;
1: +  u32 refcount;
1: +  u32 seq;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct action_gate_entry {
1: -	u8 gate_state;
1: -	u32 interval;
1: -	s32 ipv;
1: -	s32 maxoctets;
1: +  u8 gate_state;
1: +  u32 interval;
1: +  s32 ipv;
1: +  s32 maxoctets;
1:  };
1:  
1:  enum qdisc_class_ops_flags {
1: -	QDISC_CLASS_OPS_DOIT_UNLOCKED = 1,
1: +  QDISC_CLASS_OPS_DOIT_UNLOCKED = 1,
1:  };
1:  
1:  enum tcf_proto_ops_flags {
1: -	TCF_PROTO_OPS_DOIT_UNLOCKED = 1,
1: +  TCF_PROTO_OPS_DOIT_UNLOCKED = 1,
1:  };
1:  
1:  typedef void tcf_chain_head_change_t(struct tcf_proto *, void *);
1:  
1:  struct tcf_block_ext_info {
1: -	enum flow_block_binder_type binder_type;
1: -	tcf_chain_head_change_t *chain_head_change;
1: -	void *chain_head_change_priv;
1: -	u32 block_index;
1: +  enum flow_block_binder_type binder_type;
1: +  tcf_chain_head_change_t *chain_head_change;
1: +  void *chain_head_change_priv;
1: +  u32 block_index;
1:  };
1:  
1:  struct tcf_qevent {
1: -	struct tcf_block *block;
1: -	struct tcf_block_ext_info info;
1: -	struct tcf_proto *filter_chain;
1: +  struct tcf_block *block;
1: +  struct tcf_block_ext_info info;
1: +  struct tcf_proto *filter_chain;
1:  };
1:  
1:  enum pedit_header_type {
1: -	TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK = 0,
1: -	TCA_PEDIT_KEY_EX_HDR_TYPE_ETH = 1,
1: -	TCA_PEDIT_KEY_EX_HDR_TYPE_IP4 = 2,
1: -	TCA_PEDIT_KEY_EX_HDR_TYPE_IP6 = 3,
1: -	TCA_PEDIT_KEY_EX_HDR_TYPE_TCP = 4,
1: -	TCA_PEDIT_KEY_EX_HDR_TYPE_UDP = 5,
1: -	__PEDIT_HDR_TYPE_MAX = 6,
1: +  TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK = 0,
1: +  TCA_PEDIT_KEY_EX_HDR_TYPE_ETH = 1,
1: +  TCA_PEDIT_KEY_EX_HDR_TYPE_IP4 = 2,
1: +  TCA_PEDIT_KEY_EX_HDR_TYPE_IP6 = 3,
1: +  TCA_PEDIT_KEY_EX_HDR_TYPE_TCP = 4,
1: +  TCA_PEDIT_KEY_EX_HDR_TYPE_UDP = 5,
1: +  __PEDIT_HDR_TYPE_MAX = 6,
1:  };
1:  
1:  enum pedit_cmd {
1: -	TCA_PEDIT_KEY_EX_CMD_SET = 0,
1: -	TCA_PEDIT_KEY_EX_CMD_ADD = 1,
1: -	__PEDIT_CMD_MAX = 2,
1: +  TCA_PEDIT_KEY_EX_CMD_SET = 0,
1: +  TCA_PEDIT_KEY_EX_CMD_ADD = 1,
1: +  __PEDIT_CMD_MAX = 2,
1:  };
1:  
1:  struct tc_pedit_key {
1: -	__u32 mask;
1: -	__u32 val;
1: -	__u32 off;
1: -	__u32 at;
1: -	__u32 offmask;
1: -	__u32 shift;
1: +  __u32 mask;
1: +  __u32 val;
1: +  __u32 off;
1: +  __u32 at;
1: +  __u32 offmask;
1: +  __u32 shift;
1:  };
1:  
1:  struct tcf_pedit_key_ex {
1: -	enum pedit_header_type htype;
1: -	enum pedit_cmd cmd;
1: +  enum pedit_header_type htype;
1: +  enum pedit_cmd cmd;
1:  };
1:  
1:  struct tcf_pedit {
1: -	struct tc_action common;
1: -	unsigned char tcfp_nkeys;
1: -	unsigned char tcfp_flags;
1: -	struct tc_pedit_key *tcfp_keys;
1: -	struct tcf_pedit_key_ex *tcfp_keys_ex;
1: +  struct tc_action common;
1: +  unsigned char tcfp_nkeys;
1: +  unsigned char tcfp_flags;
1: +  struct tc_pedit_key *tcfp_keys;
1: +  struct tcf_pedit_key_ex *tcfp_keys_ex;
1:  };
1:  
1:  struct tcf_vlan_params {
1: -	int tcfv_action;
1: -	unsigned char tcfv_push_dst[6];
1: -	unsigned char tcfv_push_src[6];
1: -	u16 tcfv_push_vid;
1: -	__be16 tcfv_push_proto;
1: -	u8 tcfv_push_prio;
1: -	struct callback_head rcu;
1: +  int tcfv_action;
1: +  unsigned char tcfv_push_dst[6];
1: +  unsigned char tcfv_push_src[6];
1: +  u16 tcfv_push_vid;
1: +  __be16 tcfv_push_proto;
1: +  u8 tcfv_push_prio;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_vlan {
1: -	struct tc_action common;
1: -	struct tcf_vlan_params *vlan_p;
1: +  struct tc_action common;
1: +  struct tcf_vlan_params *vlan_p;
1:  };
1:  
1:  struct tcf_tunnel_key_params {
1: -	struct callback_head rcu;
1: -	int tcft_action;
1: -	struct metadata_dst *tcft_enc_metadata;
1: +  struct callback_head rcu;
1: +  int tcft_action;
1: +  struct metadata_dst *tcft_enc_metadata;
1:  };
1:  
1:  struct tcf_tunnel_key {
1: -	struct tc_action common;
1: -	struct tcf_tunnel_key_params *params;
1: +  struct tc_action common;
1: +  struct tcf_tunnel_key_params *params;
1:  };
1:  
1:  struct tcf_csum_params {
1: -	u32 update_flags;
1: -	struct callback_head rcu;
1: +  u32 update_flags;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_csum {
1: -	struct tc_action common;
1: -	struct tcf_csum_params *params;
1: +  struct tc_action common;
1: +  struct tcf_csum_params *params;
1:  };
1:  
1:  struct tcf_police_params {
1: -	int tcfp_result;
1: -	u32 tcfp_ewma_rate;
1: -	s64 tcfp_burst;
1: -	u32 tcfp_mtu;
1: -	s64 tcfp_mtu_ptoks;
1: -	struct psched_ratecfg rate;
1: -	bool rate_present;
1: -	struct psched_ratecfg peak;
1: -	bool peak_present;
1: -	struct callback_head rcu;
1: +  int tcfp_result;
1: +  u32 tcfp_ewma_rate;
1: +  s64 tcfp_burst;
1: +  u32 tcfp_mtu;
1: +  s64 tcfp_mtu_ptoks;
1: +  struct psched_ratecfg rate;
1: +  bool rate_present;
1: +  struct psched_ratecfg peak;
1: +  bool peak_present;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_police {
1: -	struct tc_action common;
1: -	struct tcf_police_params *params;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	spinlock_t tcfp_lock;
1: -	s64 tcfp_toks;
1: -	s64 tcfp_ptoks;
1: -	s64 tcfp_t_c;
1: -	long: 64;
1: -	long: 64;
1: +  struct tc_action common;
1: +  struct tcf_police_params *params;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  spinlock_t tcfp_lock;
1: +  s64 tcfp_toks;
1: +  s64 tcfp_ptoks;
1: +  s64 tcfp_t_c;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct tcf_sample {
1: -	struct tc_action common;
1: -	u32 rate;
1: -	bool truncate;
1: -	u32 trunc_size;
1: -	struct psample_group *psample_group;
1: -	u32 psample_group_num;
1: -	struct list_head tcfm_list;
1: +  struct tc_action common;
1: +  u32 rate;
1: +  bool truncate;
1: +  u32 trunc_size;
1: +  struct psample_group *psample_group;
1: +  u32 psample_group_num;
1: +  struct list_head tcfm_list;
1:  };
1:  
1:  struct tcf_skbedit_params {
1: -	u32 flags;
1: -	u32 priority;
1: -	u32 mark;
1: -	u32 mask;
1: -	u16 queue_mapping;
1: -	u16 ptype;
1: -	struct callback_head rcu;
1: +  u32 flags;
1: +  u32 priority;
1: +  u32 mark;
1: +  u32 mask;
1: +  u16 queue_mapping;
1: +  u16 ptype;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_skbedit {
1: -	struct tc_action common;
1: -	struct tcf_skbedit_params *params;
1: +  struct tc_action common;
1: +  struct tcf_skbedit_params *params;
1:  };
1:  
1:  struct tcf_mpls_params {
1: -	int tcfm_action;
1: -	u32 tcfm_label;
1: -	u8 tcfm_tc;
1: -	u8 tcfm_ttl;
1: -	u8 tcfm_bos;
1: -	__be16 tcfm_proto;
1: -	struct callback_head rcu;
1: +  int tcfm_action;
1: +  u32 tcfm_label;
1: +  u8 tcfm_tc;
1: +  u8 tcfm_ttl;
1: +  u8 tcfm_bos;
1: +  __be16 tcfm_proto;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct tcf_mpls {
1: -	struct tc_action common;
1: -	struct tcf_mpls_params *mpls_p;
1: +  struct tc_action common;
1: +  struct tcf_mpls_params *mpls_p;
1:  };
1:  
1:  struct tcfg_gate_entry {
1: -	int index;
1: -	u8 gate_state;
1: -	u32 interval;
1: -	s32 ipv;
1: -	s32 maxoctets;
1: -	struct list_head list;
1: +  int index;
1: +  u8 gate_state;
1: +  u32 interval;
1: +  s32 ipv;
1: +  s32 maxoctets;
1: +  struct list_head list;
1:  };
1:  
1:  struct tcf_gate_params {
1: -	s32 tcfg_priority;
1: -	u64 tcfg_basetime;
1: -	u64 tcfg_cycletime;
1: -	u64 tcfg_cycletime_ext;
1: -	u32 tcfg_flags;
1: -	s32 tcfg_clockid;
1: -	size_t num_entries;
1: -	struct list_head entries;
1: +  s32 tcfg_priority;
1: +  u64 tcfg_basetime;
1: +  u64 tcfg_cycletime;
1: +  u64 tcfg_cycletime_ext;
1: +  u32 tcfg_flags;
1: +  s32 tcfg_clockid;
1: +  size_t num_entries;
1: +  struct list_head entries;
1:  };
1:  
1:  struct tcf_gate {
1: -	struct tc_action common;
1: -	struct tcf_gate_params param;
1: -	u8 current_gate_status;
1: -	ktime_t current_close_time;
1: -	u32 current_entry_octets;
1: -	s32 current_max_octets;
1: -	struct tcfg_gate_entry *next_entry;
1: -	struct hrtimer hitimer;
1: -	enum tk_offsets tk_offset;
1: +  struct tc_action common;
1: +  struct tcf_gate_params param;
1: +  u8 current_gate_status;
1: +  ktime_t current_close_time;
1: +  u32 current_entry_octets;
1: +  s32 current_max_octets;
1: +  struct tcfg_gate_entry *next_entry;
1: +  struct hrtimer hitimer;
1: +  enum tk_offsets tk_offset;
1:  };
1:  
1:  struct tcf_filter_chain_list_item {
1: -	struct list_head list;
1: -	tcf_chain_head_change_t *chain_head_change;
1: -	void *chain_head_change_priv;
1: +  struct list_head list;
1: +  tcf_chain_head_change_t *chain_head_change;
1: +  void *chain_head_change_priv;
1:  };
1:  
1:  struct tcf_net {
1: -	spinlock_t idr_lock;
1: -	struct idr idr;
1: +  spinlock_t idr_lock;
1: +  struct idr idr;
1:  };
1:  
1:  struct tcf_block_owner_item {
1: -	struct list_head list;
1: -	struct Qdisc *q;
1: -	enum flow_block_binder_type binder_type;
1: +  struct list_head list;
1: +  struct Qdisc *q;
1: +  enum flow_block_binder_type binder_type;
1:  };
1:  
1:  struct tcf_chain_info {
1: -	struct tcf_proto **pprev;
1: -	struct tcf_proto *next;
1: +  struct tcf_proto **pprev;
1: +  struct tcf_proto *next;
1:  };
1:  
1:  struct tcf_dump_args {
1: -	struct tcf_walker w;
1: -	struct sk_buff *skb;
1: -	struct netlink_callback *cb;
1: -	struct tcf_block *block;
1: -	struct Qdisc *q;
1: -	u32 parent;
1: -	bool terse_dump;
1: +  struct tcf_walker w;
1: +  struct sk_buff *skb;
1: +  struct netlink_callback *cb;
1: +  struct tcf_block *block;
1: +  struct Qdisc *q;
1: +  u32 parent;
1: +  bool terse_dump;
1:  };
1:  
1:  struct tcamsg {
1: -	unsigned char tca_family;
1: -	unsigned char tca__pad1;
1: -	short unsigned int tca__pad2;
1: +  unsigned char tca_family;
1: +  unsigned char tca__pad1;
1: +  short unsigned int tca__pad2;
1:  };
1:  
1:  enum {
1: -	TCA_ROOT_UNSPEC = 0,
1: -	TCA_ROOT_TAB = 1,
1: -	TCA_ROOT_FLAGS = 2,
1: -	TCA_ROOT_COUNT = 3,
1: -	TCA_ROOT_TIME_DELTA = 4,
1: -	__TCA_ROOT_MAX = 5,
1: +  TCA_ROOT_UNSPEC = 0,
1: +  TCA_ROOT_TAB = 1,
1: +  TCA_ROOT_FLAGS = 2,
1: +  TCA_ROOT_COUNT = 3,
1: +  TCA_ROOT_TIME_DELTA = 4,
1: +  __TCA_ROOT_MAX = 5,
1:  };
1:  
1:  struct tc_action_net {
1: -	struct tcf_idrinfo *idrinfo;
1: -	const struct tc_action_ops *ops;
1: +  struct tcf_idrinfo *idrinfo;
1: +  const struct tc_action_ops *ops;
1:  };
1:  
1:  struct tc_act_bpf {
1: -	__u32 index;
1: -	__u32 capab;
1: -	int action;
1: -	int refcnt;
1: -	int bindcnt;
1: +  __u32 index;
1: +  __u32 capab;
1: +  int action;
1: +  int refcnt;
1: +  int bindcnt;
1:  };
1:  
1:  enum {
1: -	TCA_ACT_BPF_UNSPEC = 0,
1: -	TCA_ACT_BPF_TM = 1,
1: -	TCA_ACT_BPF_PARMS = 2,
1: -	TCA_ACT_BPF_OPS_LEN = 3,
1: -	TCA_ACT_BPF_OPS = 4,
1: -	TCA_ACT_BPF_FD = 5,
1: -	TCA_ACT_BPF_NAME = 6,
1: -	TCA_ACT_BPF_PAD = 7,
1: -	TCA_ACT_BPF_TAG = 8,
1: -	TCA_ACT_BPF_ID = 9,
1: -	__TCA_ACT_BPF_MAX = 10,
1: +  TCA_ACT_BPF_UNSPEC = 0,
1: +  TCA_ACT_BPF_TM = 1,
1: +  TCA_ACT_BPF_PARMS = 2,
1: +  TCA_ACT_BPF_OPS_LEN = 3,
1: +  TCA_ACT_BPF_OPS = 4,
1: +  TCA_ACT_BPF_FD = 5,
1: +  TCA_ACT_BPF_NAME = 6,
1: +  TCA_ACT_BPF_PAD = 7,
1: +  TCA_ACT_BPF_TAG = 8,
1: +  TCA_ACT_BPF_ID = 9,
1: +  __TCA_ACT_BPF_MAX = 10,
1:  };
1:  
1:  struct tcf_bpf {
1: -	struct tc_action common;
1: -	struct bpf_prog *filter;
1: -	union {
1: -		u32 bpf_fd;
1: -		u16 bpf_num_ops;
1: -	};
1: -	struct sock_filter *bpf_ops;
1: -	const char *bpf_name;
1: +  struct tc_action common;
1: +  struct bpf_prog *filter;
1: +  union {
1: +    u32 bpf_fd;
1: +    u16 bpf_num_ops;
1: +  };
1: +  struct sock_filter *bpf_ops;
1: +  const char *bpf_name;
1:  };
1:  
1:  struct tcf_bpf_cfg {
1: -	struct bpf_prog *filter;
1: -	struct sock_filter *bpf_ops;
1: -	const char *bpf_name;
1: -	u16 bpf_num_ops;
1: -	bool is_ebpf;
1: +  struct bpf_prog *filter;
1: +  struct sock_filter *bpf_ops;
1: +  const char *bpf_name;
1: +  u16 bpf_num_ops;
1: +  bool is_ebpf;
1:  };
1:  
1:  struct tc_fifo_qopt {
1: -	__u32 limit;
1: +  __u32 limit;
1:  };
1:  
1:  enum tc_fifo_command {
1: -	TC_FIFO_REPLACE = 0,
1: -	TC_FIFO_DESTROY = 1,
1: -	TC_FIFO_STATS = 2,
1: +  TC_FIFO_REPLACE = 0,
1: +  TC_FIFO_DESTROY = 1,
1: +  TC_FIFO_STATS = 2,
1:  };
1:  
1:  struct tc_fifo_qopt_offload {
1: -	enum tc_fifo_command command;
1: -	u32 handle;
1: -	u32 parent;
1: -	union {
1: -		struct tc_qopt_offload_stats stats;
1: -	};
1: +  enum tc_fifo_command command;
1: +  u32 handle;
1: +  u32 parent;
1: +  union {
1: +    struct tc_qopt_offload_stats stats;
1: +  };
1:  };
1:  
1:  struct ingress_sched_data {
1: -	struct tcf_block *block;
1: -	struct tcf_block_ext_info block_info;
1: -	struct mini_Qdisc_pair miniqp;
1: +  struct tcf_block *block;
1: +  struct tcf_block_ext_info block_info;
1: +  struct mini_Qdisc_pair miniqp;
1:  };
1:  
1:  struct clsact_sched_data {
1: -	struct tcf_block *ingress_block;
1: -	struct tcf_block *egress_block;
1: -	struct tcf_block_ext_info ingress_block_info;
1: -	struct tcf_block_ext_info egress_block_info;
1: -	struct mini_Qdisc_pair miniqp_ingress;
1: -	struct mini_Qdisc_pair miniqp_egress;
1: +  struct tcf_block *ingress_block;
1: +  struct tcf_block *egress_block;
1: +  struct tcf_block_ext_info ingress_block_info;
1: +  struct tcf_block_ext_info egress_block_info;
1: +  struct mini_Qdisc_pair miniqp_ingress;
1: +  struct mini_Qdisc_pair miniqp_egress;
1:  };
1:  
1:  enum {
1: -	TCA_FQ_CODEL_UNSPEC = 0,
1: -	TCA_FQ_CODEL_TARGET = 1,
1: -	TCA_FQ_CODEL_LIMIT = 2,
1: -	TCA_FQ_CODEL_INTERVAL = 3,
1: -	TCA_FQ_CODEL_ECN = 4,
1: -	TCA_FQ_CODEL_FLOWS = 5,
1: -	TCA_FQ_CODEL_QUANTUM = 6,
1: -	TCA_FQ_CODEL_CE_THRESHOLD = 7,
1: -	TCA_FQ_CODEL_DROP_BATCH_SIZE = 8,
1: -	TCA_FQ_CODEL_MEMORY_LIMIT = 9,
1: -	__TCA_FQ_CODEL_MAX = 10,
1: +  TCA_FQ_CODEL_UNSPEC = 0,
1: +  TCA_FQ_CODEL_TARGET = 1,
1: +  TCA_FQ_CODEL_LIMIT = 2,
1: +  TCA_FQ_CODEL_INTERVAL = 3,
1: +  TCA_FQ_CODEL_ECN = 4,
1: +  TCA_FQ_CODEL_FLOWS = 5,
1: +  TCA_FQ_CODEL_QUANTUM = 6,
1: +  TCA_FQ_CODEL_CE_THRESHOLD = 7,
1: +  TCA_FQ_CODEL_DROP_BATCH_SIZE = 8,
1: +  TCA_FQ_CODEL_MEMORY_LIMIT = 9,
1: +  __TCA_FQ_CODEL_MAX = 10,
1:  };
1:  
1:  enum {
1: -	TCA_FQ_CODEL_XSTATS_QDISC = 0,
1: -	TCA_FQ_CODEL_XSTATS_CLASS = 1,
1: +  TCA_FQ_CODEL_XSTATS_QDISC = 0,
1: +  TCA_FQ_CODEL_XSTATS_CLASS = 1,
1:  };
1:  
1:  struct tc_fq_codel_qd_stats {
1: -	__u32 maxpacket;
1: -	__u32 drop_overlimit;
1: -	__u32 ecn_mark;
1: -	__u32 new_flow_count;
1: -	__u32 new_flows_len;
1: -	__u32 old_flows_len;
1: -	__u32 ce_mark;
1: -	__u32 memory_usage;
1: -	__u32 drop_overmemory;
1: +  __u32 maxpacket;
1: +  __u32 drop_overlimit;
1: +  __u32 ecn_mark;
1: +  __u32 new_flow_count;
1: +  __u32 new_flows_len;
1: +  __u32 old_flows_len;
1: +  __u32 ce_mark;
1: +  __u32 memory_usage;
1: +  __u32 drop_overmemory;
1:  };
1:  
1:  struct tc_fq_codel_cl_stats {
1: -	__s32 deficit;
1: -	__u32 ldelay;
1: -	__u32 count;
1: -	__u32 lastcount;
1: -	__u32 dropping;
1: -	__s32 drop_next;
1: +  __s32 deficit;
1: +  __u32 ldelay;
1: +  __u32 count;
1: +  __u32 lastcount;
1: +  __u32 dropping;
1: +  __s32 drop_next;
1:  };
1:  
1:  struct tc_fq_codel_xstats {
1: -	__u32 type;
1: -	union {
1: -		struct tc_fq_codel_qd_stats qdisc_stats;
1: -		struct tc_fq_codel_cl_stats class_stats;
1: -	};
1: +  __u32 type;
1: +  union {
1: +    struct tc_fq_codel_qd_stats qdisc_stats;
1: +    struct tc_fq_codel_cl_stats class_stats;
1: +  };
1:  };
1:  
1:  typedef u32 codel_time_t;
1: @@ -117004,29 +118336,29 @@ typedef u32 codel_time_t;
1:  typedef s32 codel_tdiff_t;
1:  
1:  struct codel_params {
1: -	codel_time_t target;
1: -	codel_time_t ce_threshold;
1: -	codel_time_t interval;
1: -	u32 mtu;
1: -	bool ecn;
1: +  codel_time_t target;
1: +  codel_time_t ce_threshold;
1: +  codel_time_t interval;
1: +  u32 mtu;
1: +  bool ecn;
1:  };
1:  
1:  struct codel_vars {
1: -	u32 count;
1: -	u32 lastcount;
1: -	bool dropping;
1: -	u16 rec_inv_sqrt;
1: -	codel_time_t first_above_time;
1: -	codel_time_t drop_next;
1: -	codel_time_t ldelay;
1: +  u32 count;
1: +  u32 lastcount;
1: +  bool dropping;
1: +  u16 rec_inv_sqrt;
1: +  codel_time_t first_above_time;
1: +  codel_time_t drop_next;
1: +  codel_time_t ldelay;
1:  };
1:  
1:  struct codel_stats {
1: -	u32 maxpacket;
1: -	u32 drop_count;
1: -	u32 drop_len;
1: -	u32 ecn_mark;
1: -	u32 ce_mark;
1: +  u32 maxpacket;
1: +  u32 drop_count;
1: +  u32 drop_len;
1: +  u32 ecn_mark;
1: +  u32 ce_mark;
1:  };
1:  
1:  typedef u32 (*codel_skb_len_t)(const struct sk_buff *);
1: @@ -117035,840 +118367,840 @@ typedef codel_time_t (*codel_skb_time_t)(const struct sk_buff *);
1:  
1:  typedef void (*codel_skb_drop_t)(struct sk_buff *, void *);
1:  
1: -typedef struct sk_buff * (*codel_skb_dequeue_t)(struct codel_vars *, void *);
1: +typedef struct sk_buff *(*codel_skb_dequeue_t)(struct codel_vars *, void *);
1:  
1:  struct codel_skb_cb {
1: -	codel_time_t enqueue_time;
1: -	unsigned int mem_usage;
1: +  codel_time_t enqueue_time;
1: +  unsigned int mem_usage;
1:  };
1:  
1:  struct fq_codel_flow {
1: -	struct sk_buff *head;
1: -	struct sk_buff *tail;
1: -	struct list_head flowchain;
1: -	int deficit;
1: -	struct codel_vars cvars;
1: +  struct sk_buff *head;
1: +  struct sk_buff *tail;
1: +  struct list_head flowchain;
1: +  int deficit;
1: +  struct codel_vars cvars;
1:  };
1:  
1:  struct fq_codel_sched_data {
1: -	struct tcf_proto *filter_list;
1: -	struct tcf_block *block;
1: -	struct fq_codel_flow *flows;
1: -	u32 *backlogs;
1: -	u32 flows_cnt;
1: -	u32 quantum;
1: -	u32 drop_batch_size;
1: -	u32 memory_limit;
1: -	struct codel_params cparams;
1: -	struct codel_stats cstats;
1: -	u32 memory_usage;
1: -	u32 drop_overmemory;
1: -	u32 drop_overlimit;
1: -	u32 new_flow_count;
1: -	struct list_head new_flows;
1: -	struct list_head old_flows;
1: -};
1: -
1: -enum {
1: -	TCA_FQ_UNSPEC = 0,
1: -	TCA_FQ_PLIMIT = 1,
1: -	TCA_FQ_FLOW_PLIMIT = 2,
1: -	TCA_FQ_QUANTUM = 3,
1: -	TCA_FQ_INITIAL_QUANTUM = 4,
1: -	TCA_FQ_RATE_ENABLE = 5,
1: -	TCA_FQ_FLOW_DEFAULT_RATE = 6,
1: -	TCA_FQ_FLOW_MAX_RATE = 7,
1: -	TCA_FQ_BUCKETS_LOG = 8,
1: -	TCA_FQ_FLOW_REFILL_DELAY = 9,
1: -	TCA_FQ_ORPHAN_MASK = 10,
1: -	TCA_FQ_LOW_RATE_THRESHOLD = 11,
1: -	TCA_FQ_CE_THRESHOLD = 12,
1: -	TCA_FQ_TIMER_SLACK = 13,
1: -	TCA_FQ_HORIZON = 14,
1: -	TCA_FQ_HORIZON_DROP = 15,
1: -	__TCA_FQ_MAX = 16,
1: +  struct tcf_proto *filter_list;
1: +  struct tcf_block *block;
1: +  struct fq_codel_flow *flows;
1: +  u32 *backlogs;
1: +  u32 flows_cnt;
1: +  u32 quantum;
1: +  u32 drop_batch_size;
1: +  u32 memory_limit;
1: +  struct codel_params cparams;
1: +  struct codel_stats cstats;
1: +  u32 memory_usage;
1: +  u32 drop_overmemory;
1: +  u32 drop_overlimit;
1: +  u32 new_flow_count;
1: +  struct list_head new_flows;
1: +  struct list_head old_flows;
1: +};
1: +
1: +enum {
1: +  TCA_FQ_UNSPEC = 0,
1: +  TCA_FQ_PLIMIT = 1,
1: +  TCA_FQ_FLOW_PLIMIT = 2,
1: +  TCA_FQ_QUANTUM = 3,
1: +  TCA_FQ_INITIAL_QUANTUM = 4,
1: +  TCA_FQ_RATE_ENABLE = 5,
1: +  TCA_FQ_FLOW_DEFAULT_RATE = 6,
1: +  TCA_FQ_FLOW_MAX_RATE = 7,
1: +  TCA_FQ_BUCKETS_LOG = 8,
1: +  TCA_FQ_FLOW_REFILL_DELAY = 9,
1: +  TCA_FQ_ORPHAN_MASK = 10,
1: +  TCA_FQ_LOW_RATE_THRESHOLD = 11,
1: +  TCA_FQ_CE_THRESHOLD = 12,
1: +  TCA_FQ_TIMER_SLACK = 13,
1: +  TCA_FQ_HORIZON = 14,
1: +  TCA_FQ_HORIZON_DROP = 15,
1: +  __TCA_FQ_MAX = 16,
1:  };
1:  
1:  struct tc_fq_qd_stats {
1: -	__u64 gc_flows;
1: -	__u64 highprio_packets;
1: -	__u64 tcp_retrans;
1: -	__u64 throttled;
1: -	__u64 flows_plimit;
1: -	__u64 pkts_too_long;
1: -	__u64 allocation_errors;
1: -	__s64 time_next_delayed_flow;
1: -	__u32 flows;
1: -	__u32 inactive_flows;
1: -	__u32 throttled_flows;
1: -	__u32 unthrottle_latency_ns;
1: -	__u64 ce_mark;
1: -	__u64 horizon_drops;
1: -	__u64 horizon_caps;
1: +  __u64 gc_flows;
1: +  __u64 highprio_packets;
1: +  __u64 tcp_retrans;
1: +  __u64 throttled;
1: +  __u64 flows_plimit;
1: +  __u64 pkts_too_long;
1: +  __u64 allocation_errors;
1: +  __s64 time_next_delayed_flow;
1: +  __u32 flows;
1: +  __u32 inactive_flows;
1: +  __u32 throttled_flows;
1: +  __u32 unthrottle_latency_ns;
1: +  __u64 ce_mark;
1: +  __u64 horizon_drops;
1: +  __u64 horizon_caps;
1:  };
1:  
1:  struct fq_skb_cb {
1: -	u64 time_to_send;
1: +  u64 time_to_send;
1:  };
1:  
1:  struct fq_flow {
1: -	struct rb_root t_root;
1: -	struct sk_buff *head;
1: -	union {
1: -		struct sk_buff *tail;
1: -		long unsigned int age;
1: -	};
1: -	struct rb_node fq_node;
1: -	struct sock *sk;
1: -	u32 socket_hash;
1: -	int qlen;
1: -	int credit;
1: -	struct fq_flow *next;
1: -	struct rb_node rate_node;
1: -	u64 time_next_packet;
1: -	long: 64;
1: -	long: 64;
1: +  struct rb_root t_root;
1: +  struct sk_buff *head;
1: +  union {
1: +    struct sk_buff *tail;
1: +    long unsigned int age;
1: +  };
1: +  struct rb_node fq_node;
1: +  struct sock *sk;
1: +  u32 socket_hash;
1: +  int qlen;
1: +  int credit;
1: +  struct fq_flow *next;
1: +  struct rb_node rate_node;
1: +  u64 time_next_packet;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct fq_flow_head {
1: -	struct fq_flow *first;
1: -	struct fq_flow *last;
1: +  struct fq_flow *first;
1: +  struct fq_flow *last;
1:  };
1:  
1:  struct fq_sched_data {
1: -	struct fq_flow_head new_flows;
1: -	struct fq_flow_head old_flows;
1: -	struct rb_root delayed;
1: -	u64 time_next_delayed_flow;
1: -	u64 ktime_cache;
1: -	long unsigned int unthrottle_latency_ns;
1: -	struct fq_flow internal;
1: -	u32 quantum;
1: -	u32 initial_quantum;
1: -	u32 flow_refill_delay;
1: -	u32 flow_plimit;
1: -	long unsigned int flow_max_rate;
1: -	u64 ce_threshold;
1: -	u64 horizon;
1: -	u32 orphan_mask;
1: -	u32 low_rate_threshold;
1: -	struct rb_root *fq_root;
1: -	u8 rate_enable;
1: -	u8 fq_trees_log;
1: -	u8 horizon_drop;
1: -	u32 flows;
1: -	u32 inactive_flows;
1: -	u32 throttled_flows;
1: -	u64 stat_gc_flows;
1: -	u64 stat_internal_packets;
1: -	u64 stat_throttled;
1: -	u64 stat_ce_mark;
1: -	u64 stat_horizon_drops;
1: -	u64 stat_horizon_caps;
1: -	u64 stat_flows_plimit;
1: -	u64 stat_pkts_too_long;
1: -	u64 stat_allocation_errors;
1: -	u32 timer_slack;
1: -	struct qdisc_watchdog watchdog;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -};
1: -
1: -enum {
1: -	TCA_CGROUP_UNSPEC = 0,
1: -	TCA_CGROUP_ACT = 1,
1: -	TCA_CGROUP_POLICE = 2,
1: -	TCA_CGROUP_EMATCHES = 3,
1: -	__TCA_CGROUP_MAX = 4,
1: +  struct fq_flow_head new_flows;
1: +  struct fq_flow_head old_flows;
1: +  struct rb_root delayed;
1: +  u64 time_next_delayed_flow;
1: +  u64 ktime_cache;
1: +  long unsigned int unthrottle_latency_ns;
1: +  struct fq_flow internal;
1: +  u32 quantum;
1: +  u32 initial_quantum;
1: +  u32 flow_refill_delay;
1: +  u32 flow_plimit;
1: +  long unsigned int flow_max_rate;
1: +  u64 ce_threshold;
1: +  u64 horizon;
1: +  u32 orphan_mask;
1: +  u32 low_rate_threshold;
1: +  struct rb_root *fq_root;
1: +  u8 rate_enable;
1: +  u8 fq_trees_log;
1: +  u8 horizon_drop;
1: +  u32 flows;
1: +  u32 inactive_flows;
1: +  u32 throttled_flows;
1: +  u64 stat_gc_flows;
1: +  u64 stat_internal_packets;
1: +  u64 stat_throttled;
1: +  u64 stat_ce_mark;
1: +  u64 stat_horizon_drops;
1: +  u64 stat_horizon_caps;
1: +  u64 stat_flows_plimit;
1: +  u64 stat_pkts_too_long;
1: +  u64 stat_allocation_errors;
1: +  u32 timer_slack;
1: +  struct qdisc_watchdog watchdog;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +};
1: +
1: +enum {
1: +  TCA_CGROUP_UNSPEC = 0,
1: +  TCA_CGROUP_ACT = 1,
1: +  TCA_CGROUP_POLICE = 2,
1: +  TCA_CGROUP_EMATCHES = 3,
1: +  __TCA_CGROUP_MAX = 4,
1:  };
1:  
1:  struct tcf_ematch_tree_hdr {
1: -	__u16 nmatches;
1: -	__u16 progid;
1: +  __u16 nmatches;
1: +  __u16 progid;
1:  };
1:  
1:  struct tcf_pkt_info {
1: -	unsigned char *ptr;
1: -	int nexthdr;
1: +  unsigned char *ptr;
1: +  int nexthdr;
1:  };
1:  
1:  struct tcf_ematch_ops;
1:  
1:  struct tcf_ematch {
1: -	struct tcf_ematch_ops *ops;
1: -	long unsigned int data;
1: -	unsigned int datalen;
1: -	u16 matchid;
1: -	u16 flags;
1: -	struct net *net;
1: +  struct tcf_ematch_ops *ops;
1: +  long unsigned int data;
1: +  unsigned int datalen;
1: +  u16 matchid;
1: +  u16 flags;
1: +  struct net *net;
1:  };
1:  
1:  struct tcf_ematch_ops {
1: -	int kind;
1: -	int datalen;
1: -	int (*change)(struct net *, void *, int, struct tcf_ematch *);
1: -	int (*match)(struct sk_buff *, struct tcf_ematch *, struct tcf_pkt_info *);
1: -	void (*destroy)(struct tcf_ematch *);
1: -	int (*dump)(struct sk_buff *, struct tcf_ematch *);
1: -	struct module *owner;
1: -	struct list_head link;
1: +  int kind;
1: +  int datalen;
1: +  int (*change)(struct net *, void *, int, struct tcf_ematch *);
1: +  int (*match)(struct sk_buff *, struct tcf_ematch *, struct tcf_pkt_info *);
1: +  void (*destroy)(struct tcf_ematch *);
1: +  int (*dump)(struct sk_buff *, struct tcf_ematch *);
1: +  struct module *owner;
1: +  struct list_head link;
1:  };
1:  
1:  struct tcf_ematch_tree {
1: -	struct tcf_ematch_tree_hdr hdr;
1: -	struct tcf_ematch *matches;
1: +  struct tcf_ematch_tree_hdr hdr;
1: +  struct tcf_ematch *matches;
1:  };
1:  
1:  struct cls_cgroup_head {
1: -	u32 handle;
1: -	struct tcf_exts exts;
1: -	struct tcf_ematch_tree ematches;
1: -	struct tcf_proto *tp;
1: -	struct rcu_work rwork;
1: +  u32 handle;
1: +  struct tcf_exts exts;
1: +  struct tcf_ematch_tree ematches;
1: +  struct tcf_proto *tp;
1: +  struct rcu_work rwork;
1:  };
1:  
1:  enum {
1: -	TCA_BPF_UNSPEC = 0,
1: -	TCA_BPF_ACT = 1,
1: -	TCA_BPF_POLICE = 2,
1: -	TCA_BPF_CLASSID = 3,
1: -	TCA_BPF_OPS_LEN = 4,
1: -	TCA_BPF_OPS = 5,
1: -	TCA_BPF_FD = 6,
1: -	TCA_BPF_NAME = 7,
1: -	TCA_BPF_FLAGS = 8,
1: -	TCA_BPF_FLAGS_GEN = 9,
1: -	TCA_BPF_TAG = 10,
1: -	TCA_BPF_ID = 11,
1: -	__TCA_BPF_MAX = 12,
1: +  TCA_BPF_UNSPEC = 0,
1: +  TCA_BPF_ACT = 1,
1: +  TCA_BPF_POLICE = 2,
1: +  TCA_BPF_CLASSID = 3,
1: +  TCA_BPF_OPS_LEN = 4,
1: +  TCA_BPF_OPS = 5,
1: +  TCA_BPF_FD = 6,
1: +  TCA_BPF_NAME = 7,
1: +  TCA_BPF_FLAGS = 8,
1: +  TCA_BPF_FLAGS_GEN = 9,
1: +  TCA_BPF_TAG = 10,
1: +  TCA_BPF_ID = 11,
1: +  __TCA_BPF_MAX = 12,
1:  };
1:  
1:  struct cls_bpf_head {
1: -	struct list_head plist;
1: -	struct idr handle_idr;
1: -	struct callback_head rcu;
1: +  struct list_head plist;
1: +  struct idr handle_idr;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct cls_bpf_prog {
1: -	struct bpf_prog *filter;
1: -	struct list_head link;
1: -	struct tcf_result res;
1: -	bool exts_integrated;
1: -	u32 gen_flags;
1: -	unsigned int in_hw_count;
1: -	struct tcf_exts exts;
1: -	u32 handle;
1: -	u16 bpf_num_ops;
1: -	struct sock_filter *bpf_ops;
1: -	const char *bpf_name;
1: -	struct tcf_proto *tp;
1: -	struct rcu_work rwork;
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_UNSPEC = 0,
1: -	TCA_FLOWER_CLASSID = 1,
1: -	TCA_FLOWER_INDEV = 2,
1: -	TCA_FLOWER_ACT = 3,
1: -	TCA_FLOWER_KEY_ETH_DST = 4,
1: -	TCA_FLOWER_KEY_ETH_DST_MASK = 5,
1: -	TCA_FLOWER_KEY_ETH_SRC = 6,
1: -	TCA_FLOWER_KEY_ETH_SRC_MASK = 7,
1: -	TCA_FLOWER_KEY_ETH_TYPE = 8,
1: -	TCA_FLOWER_KEY_IP_PROTO = 9,
1: -	TCA_FLOWER_KEY_IPV4_SRC = 10,
1: -	TCA_FLOWER_KEY_IPV4_SRC_MASK = 11,
1: -	TCA_FLOWER_KEY_IPV4_DST = 12,
1: -	TCA_FLOWER_KEY_IPV4_DST_MASK = 13,
1: -	TCA_FLOWER_KEY_IPV6_SRC = 14,
1: -	TCA_FLOWER_KEY_IPV6_SRC_MASK = 15,
1: -	TCA_FLOWER_KEY_IPV6_DST = 16,
1: -	TCA_FLOWER_KEY_IPV6_DST_MASK = 17,
1: -	TCA_FLOWER_KEY_TCP_SRC = 18,
1: -	TCA_FLOWER_KEY_TCP_DST = 19,
1: -	TCA_FLOWER_KEY_UDP_SRC = 20,
1: -	TCA_FLOWER_KEY_UDP_DST = 21,
1: -	TCA_FLOWER_FLAGS = 22,
1: -	TCA_FLOWER_KEY_VLAN_ID = 23,
1: -	TCA_FLOWER_KEY_VLAN_PRIO = 24,
1: -	TCA_FLOWER_KEY_VLAN_ETH_TYPE = 25,
1: -	TCA_FLOWER_KEY_ENC_KEY_ID = 26,
1: -	TCA_FLOWER_KEY_ENC_IPV4_SRC = 27,
1: -	TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK = 28,
1: -	TCA_FLOWER_KEY_ENC_IPV4_DST = 29,
1: -	TCA_FLOWER_KEY_ENC_IPV4_DST_MASK = 30,
1: -	TCA_FLOWER_KEY_ENC_IPV6_SRC = 31,
1: -	TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK = 32,
1: -	TCA_FLOWER_KEY_ENC_IPV6_DST = 33,
1: -	TCA_FLOWER_KEY_ENC_IPV6_DST_MASK = 34,
1: -	TCA_FLOWER_KEY_TCP_SRC_MASK = 35,
1: -	TCA_FLOWER_KEY_TCP_DST_MASK = 36,
1: -	TCA_FLOWER_KEY_UDP_SRC_MASK = 37,
1: -	TCA_FLOWER_KEY_UDP_DST_MASK = 38,
1: -	TCA_FLOWER_KEY_SCTP_SRC_MASK = 39,
1: -	TCA_FLOWER_KEY_SCTP_DST_MASK = 40,
1: -	TCA_FLOWER_KEY_SCTP_SRC = 41,
1: -	TCA_FLOWER_KEY_SCTP_DST = 42,
1: -	TCA_FLOWER_KEY_ENC_UDP_SRC_PORT = 43,
1: -	TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK = 44,
1: -	TCA_FLOWER_KEY_ENC_UDP_DST_PORT = 45,
1: -	TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK = 46,
1: -	TCA_FLOWER_KEY_FLAGS = 47,
1: -	TCA_FLOWER_KEY_FLAGS_MASK = 48,
1: -	TCA_FLOWER_KEY_ICMPV4_CODE = 49,
1: -	TCA_FLOWER_KEY_ICMPV4_CODE_MASK = 50,
1: -	TCA_FLOWER_KEY_ICMPV4_TYPE = 51,
1: -	TCA_FLOWER_KEY_ICMPV4_TYPE_MASK = 52,
1: -	TCA_FLOWER_KEY_ICMPV6_CODE = 53,
1: -	TCA_FLOWER_KEY_ICMPV6_CODE_MASK = 54,
1: -	TCA_FLOWER_KEY_ICMPV6_TYPE = 55,
1: -	TCA_FLOWER_KEY_ICMPV6_TYPE_MASK = 56,
1: -	TCA_FLOWER_KEY_ARP_SIP = 57,
1: -	TCA_FLOWER_KEY_ARP_SIP_MASK = 58,
1: -	TCA_FLOWER_KEY_ARP_TIP = 59,
1: -	TCA_FLOWER_KEY_ARP_TIP_MASK = 60,
1: -	TCA_FLOWER_KEY_ARP_OP = 61,
1: -	TCA_FLOWER_KEY_ARP_OP_MASK = 62,
1: -	TCA_FLOWER_KEY_ARP_SHA = 63,
1: -	TCA_FLOWER_KEY_ARP_SHA_MASK = 64,
1: -	TCA_FLOWER_KEY_ARP_THA = 65,
1: -	TCA_FLOWER_KEY_ARP_THA_MASK = 66,
1: -	TCA_FLOWER_KEY_MPLS_TTL = 67,
1: -	TCA_FLOWER_KEY_MPLS_BOS = 68,
1: -	TCA_FLOWER_KEY_MPLS_TC = 69,
1: -	TCA_FLOWER_KEY_MPLS_LABEL = 70,
1: -	TCA_FLOWER_KEY_TCP_FLAGS = 71,
1: -	TCA_FLOWER_KEY_TCP_FLAGS_MASK = 72,
1: -	TCA_FLOWER_KEY_IP_TOS = 73,
1: -	TCA_FLOWER_KEY_IP_TOS_MASK = 74,
1: -	TCA_FLOWER_KEY_IP_TTL = 75,
1: -	TCA_FLOWER_KEY_IP_TTL_MASK = 76,
1: -	TCA_FLOWER_KEY_CVLAN_ID = 77,
1: -	TCA_FLOWER_KEY_CVLAN_PRIO = 78,
1: -	TCA_FLOWER_KEY_CVLAN_ETH_TYPE = 79,
1: -	TCA_FLOWER_KEY_ENC_IP_TOS = 80,
1: -	TCA_FLOWER_KEY_ENC_IP_TOS_MASK = 81,
1: -	TCA_FLOWER_KEY_ENC_IP_TTL = 82,
1: -	TCA_FLOWER_KEY_ENC_IP_TTL_MASK = 83,
1: -	TCA_FLOWER_KEY_ENC_OPTS = 84,
1: -	TCA_FLOWER_KEY_ENC_OPTS_MASK = 85,
1: -	TCA_FLOWER_IN_HW_COUNT = 86,
1: -	TCA_FLOWER_KEY_PORT_SRC_MIN = 87,
1: -	TCA_FLOWER_KEY_PORT_SRC_MAX = 88,
1: -	TCA_FLOWER_KEY_PORT_DST_MIN = 89,
1: -	TCA_FLOWER_KEY_PORT_DST_MAX = 90,
1: -	TCA_FLOWER_KEY_CT_STATE = 91,
1: -	TCA_FLOWER_KEY_CT_STATE_MASK = 92,
1: -	TCA_FLOWER_KEY_CT_ZONE = 93,
1: -	TCA_FLOWER_KEY_CT_ZONE_MASK = 94,
1: -	TCA_FLOWER_KEY_CT_MARK = 95,
1: -	TCA_FLOWER_KEY_CT_MARK_MASK = 96,
1: -	TCA_FLOWER_KEY_CT_LABELS = 97,
1: -	TCA_FLOWER_KEY_CT_LABELS_MASK = 98,
1: -	TCA_FLOWER_KEY_MPLS_OPTS = 99,
1: -	TCA_FLOWER_KEY_HASH = 100,
1: -	TCA_FLOWER_KEY_HASH_MASK = 101,
1: -	__TCA_FLOWER_MAX = 102,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_CT_FLAGS_NEW = 1,
1: -	TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED = 2,
1: -	TCA_FLOWER_KEY_CT_FLAGS_RELATED = 4,
1: -	TCA_FLOWER_KEY_CT_FLAGS_TRACKED = 8,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_ENC_OPTS_UNSPEC = 0,
1: -	TCA_FLOWER_KEY_ENC_OPTS_GENEVE = 1,
1: -	TCA_FLOWER_KEY_ENC_OPTS_VXLAN = 2,
1: -	TCA_FLOWER_KEY_ENC_OPTS_ERSPAN = 3,
1: -	__TCA_FLOWER_KEY_ENC_OPTS_MAX = 4,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_UNSPEC = 0,
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS = 1,
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE = 2,
1: -	TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA = 3,
1: -	__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX = 4,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_ENC_OPT_VXLAN_UNSPEC = 0,
1: -	TCA_FLOWER_KEY_ENC_OPT_VXLAN_GBP = 1,
1: -	__TCA_FLOWER_KEY_ENC_OPT_VXLAN_MAX = 2,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_ENC_OPT_ERSPAN_UNSPEC = 0,
1: -	TCA_FLOWER_KEY_ENC_OPT_ERSPAN_VER = 1,
1: -	TCA_FLOWER_KEY_ENC_OPT_ERSPAN_INDEX = 2,
1: -	TCA_FLOWER_KEY_ENC_OPT_ERSPAN_DIR = 3,
1: -	TCA_FLOWER_KEY_ENC_OPT_ERSPAN_HWID = 4,
1: -	__TCA_FLOWER_KEY_ENC_OPT_ERSPAN_MAX = 5,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_MPLS_OPTS_UNSPEC = 0,
1: -	TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1,
1: -	__TCA_FLOWER_KEY_MPLS_OPTS_MAX = 2,
1: -};
1: -
1: -enum {
1: -	TCA_FLOWER_KEY_MPLS_OPT_LSE_UNSPEC = 0,
1: -	TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1,
1: -	TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2,
1: -	TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3,
1: -	TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4,
1: -	TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5,
1: -	__TCA_FLOWER_KEY_MPLS_OPT_LSE_MAX = 6,
1: +  struct bpf_prog *filter;
1: +  struct list_head link;
1: +  struct tcf_result res;
1: +  bool exts_integrated;
1: +  u32 gen_flags;
1: +  unsigned int in_hw_count;
1: +  struct tcf_exts exts;
1: +  u32 handle;
1: +  u16 bpf_num_ops;
1: +  struct sock_filter *bpf_ops;
1: +  const char *bpf_name;
1: +  struct tcf_proto *tp;
1: +  struct rcu_work rwork;
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_UNSPEC = 0,
1: +  TCA_FLOWER_CLASSID = 1,
1: +  TCA_FLOWER_INDEV = 2,
1: +  TCA_FLOWER_ACT = 3,
1: +  TCA_FLOWER_KEY_ETH_DST = 4,
1: +  TCA_FLOWER_KEY_ETH_DST_MASK = 5,
1: +  TCA_FLOWER_KEY_ETH_SRC = 6,
1: +  TCA_FLOWER_KEY_ETH_SRC_MASK = 7,
1: +  TCA_FLOWER_KEY_ETH_TYPE = 8,
1: +  TCA_FLOWER_KEY_IP_PROTO = 9,
1: +  TCA_FLOWER_KEY_IPV4_SRC = 10,
1: +  TCA_FLOWER_KEY_IPV4_SRC_MASK = 11,
1: +  TCA_FLOWER_KEY_IPV4_DST = 12,
1: +  TCA_FLOWER_KEY_IPV4_DST_MASK = 13,
1: +  TCA_FLOWER_KEY_IPV6_SRC = 14,
1: +  TCA_FLOWER_KEY_IPV6_SRC_MASK = 15,
1: +  TCA_FLOWER_KEY_IPV6_DST = 16,
1: +  TCA_FLOWER_KEY_IPV6_DST_MASK = 17,
1: +  TCA_FLOWER_KEY_TCP_SRC = 18,
1: +  TCA_FLOWER_KEY_TCP_DST = 19,
1: +  TCA_FLOWER_KEY_UDP_SRC = 20,
1: +  TCA_FLOWER_KEY_UDP_DST = 21,
1: +  TCA_FLOWER_FLAGS = 22,
1: +  TCA_FLOWER_KEY_VLAN_ID = 23,
1: +  TCA_FLOWER_KEY_VLAN_PRIO = 24,
1: +  TCA_FLOWER_KEY_VLAN_ETH_TYPE = 25,
1: +  TCA_FLOWER_KEY_ENC_KEY_ID = 26,
1: +  TCA_FLOWER_KEY_ENC_IPV4_SRC = 27,
1: +  TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK = 28,
1: +  TCA_FLOWER_KEY_ENC_IPV4_DST = 29,
1: +  TCA_FLOWER_KEY_ENC_IPV4_DST_MASK = 30,
1: +  TCA_FLOWER_KEY_ENC_IPV6_SRC = 31,
1: +  TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK = 32,
1: +  TCA_FLOWER_KEY_ENC_IPV6_DST = 33,
1: +  TCA_FLOWER_KEY_ENC_IPV6_DST_MASK = 34,
1: +  TCA_FLOWER_KEY_TCP_SRC_MASK = 35,
1: +  TCA_FLOWER_KEY_TCP_DST_MASK = 36,
1: +  TCA_FLOWER_KEY_UDP_SRC_MASK = 37,
1: +  TCA_FLOWER_KEY_UDP_DST_MASK = 38,
1: +  TCA_FLOWER_KEY_SCTP_SRC_MASK = 39,
1: +  TCA_FLOWER_KEY_SCTP_DST_MASK = 40,
1: +  TCA_FLOWER_KEY_SCTP_SRC = 41,
1: +  TCA_FLOWER_KEY_SCTP_DST = 42,
1: +  TCA_FLOWER_KEY_ENC_UDP_SRC_PORT = 43,
1: +  TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK = 44,
1: +  TCA_FLOWER_KEY_ENC_UDP_DST_PORT = 45,
1: +  TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK = 46,
1: +  TCA_FLOWER_KEY_FLAGS = 47,
1: +  TCA_FLOWER_KEY_FLAGS_MASK = 48,
1: +  TCA_FLOWER_KEY_ICMPV4_CODE = 49,
1: +  TCA_FLOWER_KEY_ICMPV4_CODE_MASK = 50,
1: +  TCA_FLOWER_KEY_ICMPV4_TYPE = 51,
1: +  TCA_FLOWER_KEY_ICMPV4_TYPE_MASK = 52,
1: +  TCA_FLOWER_KEY_ICMPV6_CODE = 53,
1: +  TCA_FLOWER_KEY_ICMPV6_CODE_MASK = 54,
1: +  TCA_FLOWER_KEY_ICMPV6_TYPE = 55,
1: +  TCA_FLOWER_KEY_ICMPV6_TYPE_MASK = 56,
1: +  TCA_FLOWER_KEY_ARP_SIP = 57,
1: +  TCA_FLOWER_KEY_ARP_SIP_MASK = 58,
1: +  TCA_FLOWER_KEY_ARP_TIP = 59,
1: +  TCA_FLOWER_KEY_ARP_TIP_MASK = 60,
1: +  TCA_FLOWER_KEY_ARP_OP = 61,
1: +  TCA_FLOWER_KEY_ARP_OP_MASK = 62,
1: +  TCA_FLOWER_KEY_ARP_SHA = 63,
1: +  TCA_FLOWER_KEY_ARP_SHA_MASK = 64,
1: +  TCA_FLOWER_KEY_ARP_THA = 65,
1: +  TCA_FLOWER_KEY_ARP_THA_MASK = 66,
1: +  TCA_FLOWER_KEY_MPLS_TTL = 67,
1: +  TCA_FLOWER_KEY_MPLS_BOS = 68,
1: +  TCA_FLOWER_KEY_MPLS_TC = 69,
1: +  TCA_FLOWER_KEY_MPLS_LABEL = 70,
1: +  TCA_FLOWER_KEY_TCP_FLAGS = 71,
1: +  TCA_FLOWER_KEY_TCP_FLAGS_MASK = 72,
1: +  TCA_FLOWER_KEY_IP_TOS = 73,
1: +  TCA_FLOWER_KEY_IP_TOS_MASK = 74,
1: +  TCA_FLOWER_KEY_IP_TTL = 75,
1: +  TCA_FLOWER_KEY_IP_TTL_MASK = 76,
1: +  TCA_FLOWER_KEY_CVLAN_ID = 77,
1: +  TCA_FLOWER_KEY_CVLAN_PRIO = 78,
1: +  TCA_FLOWER_KEY_CVLAN_ETH_TYPE = 79,
1: +  TCA_FLOWER_KEY_ENC_IP_TOS = 80,
1: +  TCA_FLOWER_KEY_ENC_IP_TOS_MASK = 81,
1: +  TCA_FLOWER_KEY_ENC_IP_TTL = 82,
1: +  TCA_FLOWER_KEY_ENC_IP_TTL_MASK = 83,
1: +  TCA_FLOWER_KEY_ENC_OPTS = 84,
1: +  TCA_FLOWER_KEY_ENC_OPTS_MASK = 85,
1: +  TCA_FLOWER_IN_HW_COUNT = 86,
1: +  TCA_FLOWER_KEY_PORT_SRC_MIN = 87,
1: +  TCA_FLOWER_KEY_PORT_SRC_MAX = 88,
1: +  TCA_FLOWER_KEY_PORT_DST_MIN = 89,
1: +  TCA_FLOWER_KEY_PORT_DST_MAX = 90,
1: +  TCA_FLOWER_KEY_CT_STATE = 91,
1: +  TCA_FLOWER_KEY_CT_STATE_MASK = 92,
1: +  TCA_FLOWER_KEY_CT_ZONE = 93,
1: +  TCA_FLOWER_KEY_CT_ZONE_MASK = 94,
1: +  TCA_FLOWER_KEY_CT_MARK = 95,
1: +  TCA_FLOWER_KEY_CT_MARK_MASK = 96,
1: +  TCA_FLOWER_KEY_CT_LABELS = 97,
1: +  TCA_FLOWER_KEY_CT_LABELS_MASK = 98,
1: +  TCA_FLOWER_KEY_MPLS_OPTS = 99,
1: +  TCA_FLOWER_KEY_HASH = 100,
1: +  TCA_FLOWER_KEY_HASH_MASK = 101,
1: +  __TCA_FLOWER_MAX = 102,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_CT_FLAGS_NEW = 1,
1: +  TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED = 2,
1: +  TCA_FLOWER_KEY_CT_FLAGS_RELATED = 4,
1: +  TCA_FLOWER_KEY_CT_FLAGS_TRACKED = 8,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_ENC_OPTS_UNSPEC = 0,
1: +  TCA_FLOWER_KEY_ENC_OPTS_GENEVE = 1,
1: +  TCA_FLOWER_KEY_ENC_OPTS_VXLAN = 2,
1: +  TCA_FLOWER_KEY_ENC_OPTS_ERSPAN = 3,
1: +  __TCA_FLOWER_KEY_ENC_OPTS_MAX = 4,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_UNSPEC = 0,
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS = 1,
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE = 2,
1: +  TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA = 3,
1: +  __TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX = 4,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_ENC_OPT_VXLAN_UNSPEC = 0,
1: +  TCA_FLOWER_KEY_ENC_OPT_VXLAN_GBP = 1,
1: +  __TCA_FLOWER_KEY_ENC_OPT_VXLAN_MAX = 2,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_ENC_OPT_ERSPAN_UNSPEC = 0,
1: +  TCA_FLOWER_KEY_ENC_OPT_ERSPAN_VER = 1,
1: +  TCA_FLOWER_KEY_ENC_OPT_ERSPAN_INDEX = 2,
1: +  TCA_FLOWER_KEY_ENC_OPT_ERSPAN_DIR = 3,
1: +  TCA_FLOWER_KEY_ENC_OPT_ERSPAN_HWID = 4,
1: +  __TCA_FLOWER_KEY_ENC_OPT_ERSPAN_MAX = 5,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_MPLS_OPTS_UNSPEC = 0,
1: +  TCA_FLOWER_KEY_MPLS_OPTS_LSE = 1,
1: +  __TCA_FLOWER_KEY_MPLS_OPTS_MAX = 2,
1: +};
1: +
1: +enum {
1: +  TCA_FLOWER_KEY_MPLS_OPT_LSE_UNSPEC = 0,
1: +  TCA_FLOWER_KEY_MPLS_OPT_LSE_DEPTH = 1,
1: +  TCA_FLOWER_KEY_MPLS_OPT_LSE_TTL = 2,
1: +  TCA_FLOWER_KEY_MPLS_OPT_LSE_BOS = 3,
1: +  TCA_FLOWER_KEY_MPLS_OPT_LSE_TC = 4,
1: +  TCA_FLOWER_KEY_MPLS_OPT_LSE_LABEL = 5,
1: +  __TCA_FLOWER_KEY_MPLS_OPT_LSE_MAX = 6,
1:  };
1:  
1:  enum {
1: -	TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = 1,
1: -	TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = 2,
1: +  TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = 1,
1: +  TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = 2,
1:  };
1:  
1:  struct flow_stats {
1: -	u64 pkts;
1: -	u64 bytes;
1: -	u64 drops;
1: -	u64 lastused;
1: -	enum flow_action_hw_stats used_hw_stats;
1: -	bool used_hw_stats_valid;
1: +  u64 pkts;
1: +  u64 bytes;
1: +  u64 drops;
1: +  u64 lastused;
1: +  enum flow_action_hw_stats used_hw_stats;
1: +  bool used_hw_stats_valid;
1:  };
1:  
1:  enum flow_cls_command {
1: -	FLOW_CLS_REPLACE = 0,
1: -	FLOW_CLS_DESTROY = 1,
1: -	FLOW_CLS_STATS = 2,
1: -	FLOW_CLS_TMPLT_CREATE = 3,
1: -	FLOW_CLS_TMPLT_DESTROY = 4,
1: +  FLOW_CLS_REPLACE = 0,
1: +  FLOW_CLS_DESTROY = 1,
1: +  FLOW_CLS_STATS = 2,
1: +  FLOW_CLS_TMPLT_CREATE = 3,
1: +  FLOW_CLS_TMPLT_DESTROY = 4,
1:  };
1:  
1:  struct flow_cls_offload {
1: -	struct flow_cls_common_offload common;
1: -	enum flow_cls_command command;
1: -	long unsigned int cookie;
1: -	struct flow_rule *rule;
1: -	struct flow_stats stats;
1: -	u32 classid;
1: +  struct flow_cls_common_offload common;
1: +  enum flow_cls_command command;
1: +  long unsigned int cookie;
1: +  struct flow_rule *rule;
1: +  struct flow_stats stats;
1: +  u32 classid;
1:  };
1:  
1:  struct geneve_opt {
1: -	__be16 opt_class;
1: -	u8 type;
1: -	u8 length: 5;
1: -	u8 r3: 1;
1: -	u8 r2: 1;
1: -	u8 r1: 1;
1: -	u8 opt_data[0];
1: +  __be16 opt_class;
1: +  u8 type;
1: +  u8 length : 5;
1: +  u8 r3 : 1;
1: +  u8 r2 : 1;
1: +  u8 r1 : 1;
1: +  u8 opt_data[0];
1:  };
1:  
1:  struct erspan_md2 {
1: -	__be32 timestamp;
1: -	__be16 sgt;
1: -	__u8 hwid_upper: 2;
1: -	__u8 ft: 5;
1: -	__u8 p: 1;
1: -	__u8 o: 1;
1: -	__u8 gra: 2;
1: -	__u8 dir: 1;
1: -	__u8 hwid: 4;
1: +  __be32 timestamp;
1: +  __be16 sgt;
1: +  __u8 hwid_upper : 2;
1: +  __u8 ft : 5;
1: +  __u8 p : 1;
1: +  __u8 o : 1;
1: +  __u8 gra : 2;
1: +  __u8 dir : 1;
1: +  __u8 hwid : 4;
1:  };
1:  
1:  struct erspan_metadata {
1: -	int version;
1: -	union {
1: -		__be32 index;
1: -		struct erspan_md2 md2;
1: -	} u;
1: +  int version;
1: +  union {
1: +    __be32 index;
1: +    struct erspan_md2 md2;
1: +  } u;
1:  };
1:  
1:  enum ip_conntrack_info {
1: -	IP_CT_ESTABLISHED = 0,
1: -	IP_CT_RELATED = 1,
1: -	IP_CT_NEW = 2,
1: -	IP_CT_IS_REPLY = 3,
1: -	IP_CT_ESTABLISHED_REPLY = 3,
1: -	IP_CT_RELATED_REPLY = 4,
1: -	IP_CT_NUMBER = 5,
1: -	IP_CT_UNTRACKED = 7,
1: +  IP_CT_ESTABLISHED = 0,
1: +  IP_CT_RELATED = 1,
1: +  IP_CT_NEW = 2,
1: +  IP_CT_IS_REPLY = 3,
1: +  IP_CT_ESTABLISHED_REPLY = 3,
1: +  IP_CT_RELATED_REPLY = 4,
1: +  IP_CT_NUMBER = 5,
1: +  IP_CT_UNTRACKED = 7,
1:  };
1:  
1:  struct fl_flow_key {
1: -	struct flow_dissector_key_meta meta;
1: -	struct flow_dissector_key_control control;
1: -	struct flow_dissector_key_control enc_control;
1: -	struct flow_dissector_key_basic basic;
1: -	struct flow_dissector_key_eth_addrs eth;
1: -	struct flow_dissector_key_vlan vlan;
1: -	struct flow_dissector_key_vlan cvlan;
1: -	union {
1: -		struct flow_dissector_key_ipv4_addrs ipv4;
1: -		struct flow_dissector_key_ipv6_addrs ipv6;
1: -	};
1: -	struct flow_dissector_key_ports tp;
1: -	struct flow_dissector_key_icmp icmp;
1: -	struct flow_dissector_key_arp arp;
1: -	struct flow_dissector_key_keyid enc_key_id;
1: -	union {
1: -		struct flow_dissector_key_ipv4_addrs enc_ipv4;
1: -		struct flow_dissector_key_ipv6_addrs enc_ipv6;
1: -	};
1: -	struct flow_dissector_key_ports enc_tp;
1: -	struct flow_dissector_key_mpls mpls;
1: -	struct flow_dissector_key_tcp tcp;
1: -	struct flow_dissector_key_ip ip;
1: -	struct flow_dissector_key_ip enc_ip;
1: -	struct flow_dissector_key_enc_opts enc_opts;
1: -	union {
1: -		struct flow_dissector_key_ports tp;
1: -		struct {
1: -			struct flow_dissector_key_ports tp_min;
1: -			struct flow_dissector_key_ports tp_max;
1: -		};
1: -	} tp_range;
1: -	struct flow_dissector_key_ct ct;
1: -	struct flow_dissector_key_hash hash;
1: -	int: 32;
1: +  struct flow_dissector_key_meta meta;
1: +  struct flow_dissector_key_control control;
1: +  struct flow_dissector_key_control enc_control;
1: +  struct flow_dissector_key_basic basic;
1: +  struct flow_dissector_key_eth_addrs eth;
1: +  struct flow_dissector_key_vlan vlan;
1: +  struct flow_dissector_key_vlan cvlan;
1: +  union {
1: +    struct flow_dissector_key_ipv4_addrs ipv4;
1: +    struct flow_dissector_key_ipv6_addrs ipv6;
1: +  };
1: +  struct flow_dissector_key_ports tp;
1: +  struct flow_dissector_key_icmp icmp;
1: +  struct flow_dissector_key_arp arp;
1: +  struct flow_dissector_key_keyid enc_key_id;
1: +  union {
1: +    struct flow_dissector_key_ipv4_addrs enc_ipv4;
1: +    struct flow_dissector_key_ipv6_addrs enc_ipv6;
1: +  };
1: +  struct flow_dissector_key_ports enc_tp;
1: +  struct flow_dissector_key_mpls mpls;
1: +  struct flow_dissector_key_tcp tcp;
1: +  struct flow_dissector_key_ip ip;
1: +  struct flow_dissector_key_ip enc_ip;
1: +  struct flow_dissector_key_enc_opts enc_opts;
1: +  union {
1: +    struct flow_dissector_key_ports tp;
1: +    struct {
1: +      struct flow_dissector_key_ports tp_min;
1: +      struct flow_dissector_key_ports tp_max;
1: +    };
1: +  } tp_range;
1: +  struct flow_dissector_key_ct ct;
1: +  struct flow_dissector_key_hash hash;
1: +  int : 32;
1:  };
1:  
1:  struct fl_flow_mask_range {
1: -	short unsigned int start;
1: -	short unsigned int end;
1: +  short unsigned int start;
1: +  short unsigned int end;
1:  };
1:  
1:  struct fl_flow_mask {
1: -	struct fl_flow_key key;
1: -	struct fl_flow_mask_range range;
1: -	u32 flags;
1: -	struct rhash_head ht_node;
1: -	struct rhashtable ht;
1: -	struct rhashtable_params filter_ht_params;
1: -	struct flow_dissector dissector;
1: -	struct list_head filters;
1: -	struct rcu_work rwork;
1: -	struct list_head list;
1: -	refcount_t refcnt;
1: +  struct fl_flow_key key;
1: +  struct fl_flow_mask_range range;
1: +  u32 flags;
1: +  struct rhash_head ht_node;
1: +  struct rhashtable ht;
1: +  struct rhashtable_params filter_ht_params;
1: +  struct flow_dissector dissector;
1: +  struct list_head filters;
1: +  struct rcu_work rwork;
1: +  struct list_head list;
1: +  refcount_t refcnt;
1:  };
1:  
1:  struct fl_flow_tmplt {
1: -	struct fl_flow_key dummy_key;
1: -	struct fl_flow_key mask;
1: -	struct flow_dissector dissector;
1: -	struct tcf_chain *chain;
1: +  struct fl_flow_key dummy_key;
1: +  struct fl_flow_key mask;
1: +  struct flow_dissector dissector;
1: +  struct tcf_chain *chain;
1:  };
1:  
1:  struct cls_fl_head {
1: -	struct rhashtable ht;
1: -	spinlock_t masks_lock;
1: -	struct list_head masks;
1: -	struct list_head hw_filters;
1: -	struct rcu_work rwork;
1: -	struct idr handle_idr;
1: +  struct rhashtable ht;
1: +  spinlock_t masks_lock;
1: +  struct list_head masks;
1: +  struct list_head hw_filters;
1: +  struct rcu_work rwork;
1: +  struct idr handle_idr;
1:  };
1:  
1:  struct cls_fl_filter {
1: -	struct fl_flow_mask *mask;
1: -	struct rhash_head ht_node;
1: -	struct fl_flow_key mkey;
1: -	struct tcf_exts exts;
1: -	struct tcf_result res;
1: -	struct fl_flow_key key;
1: -	struct list_head list;
1: -	struct list_head hw_list;
1: -	u32 handle;
1: -	u32 flags;
1: -	u32 in_hw_count;
1: -	struct rcu_work rwork;
1: -	struct net_device *hw_dev;
1: -	refcount_t refcnt;
1: -	bool deleted;
1: -};
1: -
1: -enum {
1: -	TCA_EMATCH_TREE_UNSPEC = 0,
1: -	TCA_EMATCH_TREE_HDR = 1,
1: -	TCA_EMATCH_TREE_LIST = 2,
1: -	__TCA_EMATCH_TREE_MAX = 3,
1: +  struct fl_flow_mask *mask;
1: +  struct rhash_head ht_node;
1: +  struct fl_flow_key mkey;
1: +  struct tcf_exts exts;
1: +  struct tcf_result res;
1: +  struct fl_flow_key key;
1: +  struct list_head list;
1: +  struct list_head hw_list;
1: +  u32 handle;
1: +  u32 flags;
1: +  u32 in_hw_count;
1: +  struct rcu_work rwork;
1: +  struct net_device *hw_dev;
1: +  refcount_t refcnt;
1: +  bool deleted;
1: +};
1: +
1: +enum {
1: +  TCA_EMATCH_TREE_UNSPEC = 0,
1: +  TCA_EMATCH_TREE_HDR = 1,
1: +  TCA_EMATCH_TREE_LIST = 2,
1: +  __TCA_EMATCH_TREE_MAX = 3,
1:  };
1:  
1:  struct tcf_ematch_hdr {
1: -	__u16 matchid;
1: -	__u16 kind;
1: -	__u16 flags;
1: -	__u16 pad;
1: +  __u16 matchid;
1: +  __u16 kind;
1: +  __u16 flags;
1: +  __u16 pad;
1:  };
1:  
1:  struct sockaddr_nl {
1: -	__kernel_sa_family_t nl_family;
1: -	short unsigned int nl_pad;
1: -	__u32 nl_pid;
1: -	__u32 nl_groups;
1: +  __kernel_sa_family_t nl_family;
1: +  short unsigned int nl_pad;
1: +  __u32 nl_pid;
1: +  __u32 nl_groups;
1:  };
1:  
1:  struct nlmsgerr {
1: -	int error;
1: -	struct nlmsghdr msg;
1: +  int error;
1: +  struct nlmsghdr msg;
1:  };
1:  
1:  enum nlmsgerr_attrs {
1: -	NLMSGERR_ATTR_UNUSED = 0,
1: -	NLMSGERR_ATTR_MSG = 1,
1: -	NLMSGERR_ATTR_OFFS = 2,
1: -	NLMSGERR_ATTR_COOKIE = 3,
1: -	NLMSGERR_ATTR_POLICY = 4,
1: -	__NLMSGERR_ATTR_MAX = 5,
1: -	NLMSGERR_ATTR_MAX = 4,
1: +  NLMSGERR_ATTR_UNUSED = 0,
1: +  NLMSGERR_ATTR_MSG = 1,
1: +  NLMSGERR_ATTR_OFFS = 2,
1: +  NLMSGERR_ATTR_COOKIE = 3,
1: +  NLMSGERR_ATTR_POLICY = 4,
1: +  __NLMSGERR_ATTR_MAX = 5,
1: +  NLMSGERR_ATTR_MAX = 4,
1:  };
1:  
1:  struct nl_pktinfo {
1: -	__u32 group;
1: +  __u32 group;
1:  };
1:  
1:  enum {
1: -	NETLINK_UNCONNECTED = 0,
1: -	NETLINK_CONNECTED = 1,
1: +  NETLINK_UNCONNECTED = 0,
1: +  NETLINK_CONNECTED = 1,
1:  };
1:  
1:  enum netlink_skb_flags {
1: -	NETLINK_SKB_DST = 8,
1: +  NETLINK_SKB_DST = 8,
1:  };
1:  
1:  struct netlink_notify {
1: -	struct net *net;
1: -	u32 portid;
1: -	int protocol;
1: +  struct net *net;
1: +  u32 portid;
1: +  int protocol;
1:  };
1:  
1:  struct netlink_tap {
1: -	struct net_device *dev;
1: -	struct module *module;
1: -	struct list_head list;
1: +  struct net_device *dev;
1: +  struct module *module;
1: +  struct list_head list;
1:  };
1:  
1:  struct netlink_sock {
1: -	struct sock sk;
1: -	u32 portid;
1: -	u32 dst_portid;
1: -	u32 dst_group;
1: -	u32 flags;
1: -	u32 subscriptions;
1: -	u32 ngroups;
1: -	long unsigned int *groups;
1: -	long unsigned int state;
1: -	size_t max_recvmsg_len;
1: -	wait_queue_head_t wait;
1: -	bool bound;
1: -	bool cb_running;
1: -	int dump_done_errno;
1: -	struct netlink_callback cb;
1: -	struct mutex *cb_mutex;
1: -	struct mutex cb_def_mutex;
1: -	void (*netlink_rcv)(struct sk_buff *);
1: -	int (*netlink_bind)(struct net *, int);
1: -	void (*netlink_unbind)(struct net *, int);
1: -	struct module *module;
1: -	struct rhash_head node;
1: -	struct callback_head rcu;
1: -	struct work_struct work;
1: +  struct sock sk;
1: +  u32 portid;
1: +  u32 dst_portid;
1: +  u32 dst_group;
1: +  u32 flags;
1: +  u32 subscriptions;
1: +  u32 ngroups;
1: +  long unsigned int *groups;
1: +  long unsigned int state;
1: +  size_t max_recvmsg_len;
1: +  wait_queue_head_t wait;
1: +  bool bound;
1: +  bool cb_running;
1: +  int dump_done_errno;
1: +  struct netlink_callback cb;
1: +  struct mutex *cb_mutex;
1: +  struct mutex cb_def_mutex;
1: +  void (*netlink_rcv)(struct sk_buff *);
1: +  int (*netlink_bind)(struct net *, int);
1: +  void (*netlink_unbind)(struct net *, int);
1: +  struct module *module;
1: +  struct rhash_head node;
1: +  struct callback_head rcu;
1: +  struct work_struct work;
1:  };
1:  
1:  struct listeners;
1:  
1:  struct netlink_table {
1: -	struct rhashtable hash;
1: -	struct hlist_head mc_list;
1: -	struct listeners *listeners;
1: -	unsigned int flags;
1: -	unsigned int groups;
1: -	struct mutex *cb_mutex;
1: -	struct module *module;
1: -	int (*bind)(struct net *, int);
1: -	void (*unbind)(struct net *, int);
1: -	bool (*compare)(struct net *, struct sock *);
1: -	int registered;
1: +  struct rhashtable hash;
1: +  struct hlist_head mc_list;
1: +  struct listeners *listeners;
1: +  unsigned int flags;
1: +  unsigned int groups;
1: +  struct mutex *cb_mutex;
1: +  struct module *module;
1: +  int (*bind)(struct net *, int);
1: +  void (*unbind)(struct net *, int);
1: +  bool (*compare)(struct net *, struct sock *);
1: +  int registered;
1:  };
1:  
1:  struct listeners {
1: -	struct callback_head rcu;
1: -	long unsigned int masks[0];
1: +  struct callback_head rcu;
1: +  long unsigned int masks[0];
1:  };
1:  
1:  struct netlink_tap_net {
1: -	struct list_head netlink_tap_all;
1: -	struct mutex netlink_tap_lock;
1: +  struct list_head netlink_tap_all;
1: +  struct mutex netlink_tap_lock;
1:  };
1:  
1:  struct netlink_compare_arg {
1: -	possible_net_t pnet;
1: -	u32 portid;
1: +  possible_net_t pnet;
1: +  u32 portid;
1:  };
1:  
1:  struct netlink_broadcast_data {
1: -	struct sock *exclude_sk;
1: -	struct net *net;
1: -	u32 portid;
1: -	u32 group;
1: -	int failure;
1: -	int delivery_failure;
1: -	int congested;
1: -	int delivered;
1: -	gfp_t allocation;
1: -	struct sk_buff *skb;
1: -	struct sk_buff *skb2;
1: -	int (*tx_filter)(struct sock *, struct sk_buff *, void *);
1: -	void *tx_data;
1: +  struct sock *exclude_sk;
1: +  struct net *net;
1: +  u32 portid;
1: +  u32 group;
1: +  int failure;
1: +  int delivery_failure;
1: +  int congested;
1: +  int delivered;
1: +  gfp_t allocation;
1: +  struct sk_buff *skb;
1: +  struct sk_buff *skb2;
1: +  int (*tx_filter)(struct sock *, struct sk_buff *, void *);
1: +  void *tx_data;
1:  };
1:  
1:  struct netlink_set_err_data {
1: -	struct sock *exclude_sk;
1: -	u32 portid;
1: -	u32 group;
1: -	int code;
1: +  struct sock *exclude_sk;
1: +  u32 portid;
1: +  u32 group;
1: +  int code;
1:  };
1:  
1:  struct nl_seq_iter {
1: -	struct seq_net_private p;
1: -	struct rhashtable_iter hti;
1: -	int link;
1: +  struct seq_net_private p;
1: +  struct rhashtable_iter hti;
1: +  int link;
1:  };
1:  
1:  struct bpf_iter__netlink {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct netlink_sock *sk;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct netlink_sock *sk;
1: +  };
1:  };
1:  
1:  enum {
1: -	CTRL_CMD_UNSPEC = 0,
1: -	CTRL_CMD_NEWFAMILY = 1,
1: -	CTRL_CMD_DELFAMILY = 2,
1: -	CTRL_CMD_GETFAMILY = 3,
1: -	CTRL_CMD_NEWOPS = 4,
1: -	CTRL_CMD_DELOPS = 5,
1: -	CTRL_CMD_GETOPS = 6,
1: -	CTRL_CMD_NEWMCAST_GRP = 7,
1: -	CTRL_CMD_DELMCAST_GRP = 8,
1: -	CTRL_CMD_GETMCAST_GRP = 9,
1: -	CTRL_CMD_GETPOLICY = 10,
1: -	__CTRL_CMD_MAX = 11,
1: +  CTRL_CMD_UNSPEC = 0,
1: +  CTRL_CMD_NEWFAMILY = 1,
1: +  CTRL_CMD_DELFAMILY = 2,
1: +  CTRL_CMD_GETFAMILY = 3,
1: +  CTRL_CMD_NEWOPS = 4,
1: +  CTRL_CMD_DELOPS = 5,
1: +  CTRL_CMD_GETOPS = 6,
1: +  CTRL_CMD_NEWMCAST_GRP = 7,
1: +  CTRL_CMD_DELMCAST_GRP = 8,
1: +  CTRL_CMD_GETMCAST_GRP = 9,
1: +  CTRL_CMD_GETPOLICY = 10,
1: +  __CTRL_CMD_MAX = 11,
1:  };
1:  
1:  enum {
1: -	CTRL_ATTR_UNSPEC = 0,
1: -	CTRL_ATTR_FAMILY_ID = 1,
1: -	CTRL_ATTR_FAMILY_NAME = 2,
1: -	CTRL_ATTR_VERSION = 3,
1: -	CTRL_ATTR_HDRSIZE = 4,
1: -	CTRL_ATTR_MAXATTR = 5,
1: -	CTRL_ATTR_OPS = 6,
1: -	CTRL_ATTR_MCAST_GROUPS = 7,
1: -	CTRL_ATTR_POLICY = 8,
1: -	CTRL_ATTR_OP_POLICY = 9,
1: -	CTRL_ATTR_OP = 10,
1: -	__CTRL_ATTR_MAX = 11,
1: +  CTRL_ATTR_UNSPEC = 0,
1: +  CTRL_ATTR_FAMILY_ID = 1,
1: +  CTRL_ATTR_FAMILY_NAME = 2,
1: +  CTRL_ATTR_VERSION = 3,
1: +  CTRL_ATTR_HDRSIZE = 4,
1: +  CTRL_ATTR_MAXATTR = 5,
1: +  CTRL_ATTR_OPS = 6,
1: +  CTRL_ATTR_MCAST_GROUPS = 7,
1: +  CTRL_ATTR_POLICY = 8,
1: +  CTRL_ATTR_OP_POLICY = 9,
1: +  CTRL_ATTR_OP = 10,
1: +  __CTRL_ATTR_MAX = 11,
1:  };
1:  
1:  enum {
1: -	CTRL_ATTR_OP_UNSPEC = 0,
1: -	CTRL_ATTR_OP_ID = 1,
1: -	CTRL_ATTR_OP_FLAGS = 2,
1: -	__CTRL_ATTR_OP_MAX = 3,
1: +  CTRL_ATTR_OP_UNSPEC = 0,
1: +  CTRL_ATTR_OP_ID = 1,
1: +  CTRL_ATTR_OP_FLAGS = 2,
1: +  __CTRL_ATTR_OP_MAX = 3,
1:  };
1:  
1:  enum {
1: -	CTRL_ATTR_MCAST_GRP_UNSPEC = 0,
1: -	CTRL_ATTR_MCAST_GRP_NAME = 1,
1: -	CTRL_ATTR_MCAST_GRP_ID = 2,
1: -	__CTRL_ATTR_MCAST_GRP_MAX = 3,
1: +  CTRL_ATTR_MCAST_GRP_UNSPEC = 0,
1: +  CTRL_ATTR_MCAST_GRP_NAME = 1,
1: +  CTRL_ATTR_MCAST_GRP_ID = 2,
1: +  __CTRL_ATTR_MCAST_GRP_MAX = 3,
1:  };
1:  
1:  enum {
1: -	CTRL_ATTR_POLICY_UNSPEC = 0,
1: -	CTRL_ATTR_POLICY_DO = 1,
1: -	CTRL_ATTR_POLICY_DUMP = 2,
1: -	__CTRL_ATTR_POLICY_DUMP_MAX = 3,
1: -	CTRL_ATTR_POLICY_DUMP_MAX = 2,
1: +  CTRL_ATTR_POLICY_UNSPEC = 0,
1: +  CTRL_ATTR_POLICY_DO = 1,
1: +  CTRL_ATTR_POLICY_DUMP = 2,
1: +  __CTRL_ATTR_POLICY_DUMP_MAX = 3,
1: +  CTRL_ATTR_POLICY_DUMP_MAX = 2,
1:  };
1:  
1:  struct genl_start_context {
1: -	const struct genl_family *family;
1: -	struct nlmsghdr *nlh;
1: -	struct netlink_ext_ack *extack;
1: -	const struct genl_ops *ops;
1: -	int hdrlen;
1: +  const struct genl_family *family;
1: +  struct nlmsghdr *nlh;
1: +  struct netlink_ext_ack *extack;
1: +  const struct genl_ops *ops;
1: +  int hdrlen;
1:  };
1:  
1:  struct netlink_policy_dump_state;
1:  
1:  struct ctrl_dump_policy_ctx {
1: -	struct netlink_policy_dump_state *state;
1: -	const struct genl_family *rt;
1: -	unsigned int opidx;
1: -	u32 op;
1: -	u16 fam_id;
1: -	u8 policies: 1;
1: -	u8 single_op: 1;
1: +  struct netlink_policy_dump_state *state;
1: +  const struct genl_family *rt;
1: +  unsigned int opidx;
1: +  u32 op;
1: +  u16 fam_id;
1: +  u8 policies : 1;
1: +  u8 single_op : 1;
1:  };
1:  
1:  enum netlink_attribute_type {
1: -	NL_ATTR_TYPE_INVALID = 0,
1: -	NL_ATTR_TYPE_FLAG = 1,
1: -	NL_ATTR_TYPE_U8 = 2,
1: -	NL_ATTR_TYPE_U16 = 3,
1: -	NL_ATTR_TYPE_U32 = 4,
1: -	NL_ATTR_TYPE_U64 = 5,
1: -	NL_ATTR_TYPE_S8 = 6,
1: -	NL_ATTR_TYPE_S16 = 7,
1: -	NL_ATTR_TYPE_S32 = 8,
1: -	NL_ATTR_TYPE_S64 = 9,
1: -	NL_ATTR_TYPE_BINARY = 10,
1: -	NL_ATTR_TYPE_STRING = 11,
1: -	NL_ATTR_TYPE_NUL_STRING = 12,
1: -	NL_ATTR_TYPE_NESTED = 13,
1: -	NL_ATTR_TYPE_NESTED_ARRAY = 14,
1: -	NL_ATTR_TYPE_BITFIELD32 = 15,
1: +  NL_ATTR_TYPE_INVALID = 0,
1: +  NL_ATTR_TYPE_FLAG = 1,
1: +  NL_ATTR_TYPE_U8 = 2,
1: +  NL_ATTR_TYPE_U16 = 3,
1: +  NL_ATTR_TYPE_U32 = 4,
1: +  NL_ATTR_TYPE_U64 = 5,
1: +  NL_ATTR_TYPE_S8 = 6,
1: +  NL_ATTR_TYPE_S16 = 7,
1: +  NL_ATTR_TYPE_S32 = 8,
1: +  NL_ATTR_TYPE_S64 = 9,
1: +  NL_ATTR_TYPE_BINARY = 10,
1: +  NL_ATTR_TYPE_STRING = 11,
1: +  NL_ATTR_TYPE_NUL_STRING = 12,
1: +  NL_ATTR_TYPE_NESTED = 13,
1: +  NL_ATTR_TYPE_NESTED_ARRAY = 14,
1: +  NL_ATTR_TYPE_BITFIELD32 = 15,
1:  };
1:  
1:  enum netlink_policy_type_attr {
1: -	NL_POLICY_TYPE_ATTR_UNSPEC = 0,
1: -	NL_POLICY_TYPE_ATTR_TYPE = 1,
1: -	NL_POLICY_TYPE_ATTR_MIN_VALUE_S = 2,
1: -	NL_POLICY_TYPE_ATTR_MAX_VALUE_S = 3,
1: -	NL_POLICY_TYPE_ATTR_MIN_VALUE_U = 4,
1: -	NL_POLICY_TYPE_ATTR_MAX_VALUE_U = 5,
1: -	NL_POLICY_TYPE_ATTR_MIN_LENGTH = 6,
1: -	NL_POLICY_TYPE_ATTR_MAX_LENGTH = 7,
1: -	NL_POLICY_TYPE_ATTR_POLICY_IDX = 8,
1: -	NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE = 9,
1: -	NL_POLICY_TYPE_ATTR_BITFIELD32_MASK = 10,
1: -	NL_POLICY_TYPE_ATTR_PAD = 11,
1: -	NL_POLICY_TYPE_ATTR_MASK = 12,
1: -	__NL_POLICY_TYPE_ATTR_MAX = 13,
1: -	NL_POLICY_TYPE_ATTR_MAX = 12,
1: +  NL_POLICY_TYPE_ATTR_UNSPEC = 0,
1: +  NL_POLICY_TYPE_ATTR_TYPE = 1,
1: +  NL_POLICY_TYPE_ATTR_MIN_VALUE_S = 2,
1: +  NL_POLICY_TYPE_ATTR_MAX_VALUE_S = 3,
1: +  NL_POLICY_TYPE_ATTR_MIN_VALUE_U = 4,
1: +  NL_POLICY_TYPE_ATTR_MAX_VALUE_U = 5,
1: +  NL_POLICY_TYPE_ATTR_MIN_LENGTH = 6,
1: +  NL_POLICY_TYPE_ATTR_MAX_LENGTH = 7,
1: +  NL_POLICY_TYPE_ATTR_POLICY_IDX = 8,
1: +  NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE = 9,
1: +  NL_POLICY_TYPE_ATTR_BITFIELD32_MASK = 10,
1: +  NL_POLICY_TYPE_ATTR_PAD = 11,
1: +  NL_POLICY_TYPE_ATTR_MASK = 12,
1: +  __NL_POLICY_TYPE_ATTR_MAX = 13,
1: +  NL_POLICY_TYPE_ATTR_MAX = 12,
1:  };
1:  
1:  struct netlink_policy_dump_state___2 {
1: -	unsigned int policy_idx;
1: -	unsigned int attr_idx;
1: -	unsigned int n_alloc;
1: -	struct {
1: -		const struct nla_policy *policy;
1: -		unsigned int maxtype;
1: -	} policies[0];
1: +  unsigned int policy_idx;
1: +  unsigned int attr_idx;
1: +  unsigned int n_alloc;
1: +  struct {
1: +    const struct nla_policy *policy;
1: +    unsigned int maxtype;
1: +  } policies[0];
1:  };
1:  
1:  struct trace_event_raw_bpf_test_finish {
1: -	struct trace_entry ent;
1: -	int err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_bpf_test_finish {};
1: @@ -117876,738 +119208,743 @@ struct trace_event_data_offsets_bpf_test_finish {};
1:  typedef void (*btf_trace_bpf_test_finish)(void *, int *);
1:  
1:  struct bpf_fentry_test_t {
1: -	struct bpf_fentry_test_t *a;
1: +  struct bpf_fentry_test_t *a;
1:  };
1:  
1:  struct bpf_raw_tp_test_run_info {
1: -	struct bpf_prog *prog;
1: -	void *ctx;
1: -	u32 retval;
1: +  struct bpf_prog *prog;
1: +  void *ctx;
1: +  u32 retval;
1:  };
1:  
1:  struct ethtool_value {
1: -	__u32 cmd;
1: -	__u32 data;
1: +  __u32 cmd;
1: +  __u32 data;
1:  };
1:  
1:  enum tunable_type_id {
1: -	ETHTOOL_TUNABLE_UNSPEC = 0,
1: -	ETHTOOL_TUNABLE_U8 = 1,
1: -	ETHTOOL_TUNABLE_U16 = 2,
1: -	ETHTOOL_TUNABLE_U32 = 3,
1: -	ETHTOOL_TUNABLE_U64 = 4,
1: -	ETHTOOL_TUNABLE_STRING = 5,
1: -	ETHTOOL_TUNABLE_S8 = 6,
1: -	ETHTOOL_TUNABLE_S16 = 7,
1: -	ETHTOOL_TUNABLE_S32 = 8,
1: -	ETHTOOL_TUNABLE_S64 = 9,
1: +  ETHTOOL_TUNABLE_UNSPEC = 0,
1: +  ETHTOOL_TUNABLE_U8 = 1,
1: +  ETHTOOL_TUNABLE_U16 = 2,
1: +  ETHTOOL_TUNABLE_U32 = 3,
1: +  ETHTOOL_TUNABLE_U64 = 4,
1: +  ETHTOOL_TUNABLE_STRING = 5,
1: +  ETHTOOL_TUNABLE_S8 = 6,
1: +  ETHTOOL_TUNABLE_S16 = 7,
1: +  ETHTOOL_TUNABLE_S32 = 8,
1: +  ETHTOOL_TUNABLE_S64 = 9,
1:  };
1:  
1:  enum phy_tunable_id {
1: -	ETHTOOL_PHY_ID_UNSPEC = 0,
1: -	ETHTOOL_PHY_DOWNSHIFT = 1,
1: -	ETHTOOL_PHY_FAST_LINK_DOWN = 2,
1: -	ETHTOOL_PHY_EDPD = 3,
1: -	__ETHTOOL_PHY_TUNABLE_COUNT = 4,
1: +  ETHTOOL_PHY_ID_UNSPEC = 0,
1: +  ETHTOOL_PHY_DOWNSHIFT = 1,
1: +  ETHTOOL_PHY_FAST_LINK_DOWN = 2,
1: +  ETHTOOL_PHY_EDPD = 3,
1: +  __ETHTOOL_PHY_TUNABLE_COUNT = 4,
1:  };
1:  
1:  struct ethtool_gstrings {
1: -	__u32 cmd;
1: -	__u32 string_set;
1: -	__u32 len;
1: -	__u8 data[0];
1: +  __u32 cmd;
1: +  __u32 string_set;
1: +  __u32 len;
1: +  __u8 data[0];
1:  };
1:  
1:  struct ethtool_sset_info {
1: -	__u32 cmd;
1: -	__u32 reserved;
1: -	__u64 sset_mask;
1: -	__u32 data[0];
1: +  __u32 cmd;
1: +  __u32 reserved;
1: +  __u64 sset_mask;
1: +  __u32 data[0];
1:  };
1:  
1:  struct ethtool_perm_addr {
1: -	__u32 cmd;
1: -	__u32 size;
1: -	__u8 data[0];
1: +  __u32 cmd;
1: +  __u32 size;
1: +  __u8 data[0];
1:  };
1:  
1:  enum ethtool_flags {
1: -	ETH_FLAG_TXVLAN = 128,
1: -	ETH_FLAG_RXVLAN = 256,
1: -	ETH_FLAG_LRO = 32768,
1: -	ETH_FLAG_NTUPLE = 134217728,
1: -	ETH_FLAG_RXHASH = 268435456,
1: +  ETH_FLAG_TXVLAN = 128,
1: +  ETH_FLAG_RXVLAN = 256,
1: +  ETH_FLAG_LRO = 32768,
1: +  ETH_FLAG_NTUPLE = 134217728,
1: +  ETH_FLAG_RXHASH = 268435456,
1:  };
1:  
1:  struct ethtool_rxfh {
1: -	__u32 cmd;
1: -	__u32 rss_context;
1: -	__u32 indir_size;
1: -	__u32 key_size;
1: -	__u8 hfunc;
1: -	__u8 rsvd8[3];
1: -	__u32 rsvd32;
1: -	__u32 rss_config[0];
1: +  __u32 cmd;
1: +  __u32 rss_context;
1: +  __u32 indir_size;
1: +  __u32 key_size;
1: +  __u8 hfunc;
1: +  __u8 rsvd8[3];
1: +  __u32 rsvd32;
1: +  __u32 rss_config[0];
1:  };
1:  
1:  struct ethtool_get_features_block {
1: -	__u32 available;
1: -	__u32 requested;
1: -	__u32 active;
1: -	__u32 never_changed;
1: +  __u32 available;
1: +  __u32 requested;
1: +  __u32 active;
1: +  __u32 never_changed;
1:  };
1:  
1:  struct ethtool_gfeatures {
1: -	__u32 cmd;
1: -	__u32 size;
1: -	struct ethtool_get_features_block features[0];
1: +  __u32 cmd;
1: +  __u32 size;
1: +  struct ethtool_get_features_block features[0];
1:  };
1:  
1:  struct ethtool_set_features_block {
1: -	__u32 valid;
1: -	__u32 requested;
1: +  __u32 valid;
1: +  __u32 requested;
1:  };
1:  
1:  struct ethtool_sfeatures {
1: -	__u32 cmd;
1: -	__u32 size;
1: -	struct ethtool_set_features_block features[0];
1: +  __u32 cmd;
1: +  __u32 size;
1: +  struct ethtool_set_features_block features[0];
1:  };
1:  
1:  enum ethtool_sfeatures_retval_bits {
1: -	ETHTOOL_F_UNSUPPORTED__BIT = 0,
1: -	ETHTOOL_F_WISH__BIT = 1,
1: -	ETHTOOL_F_COMPAT__BIT = 2,
1: +  ETHTOOL_F_UNSUPPORTED__BIT = 0,
1: +  ETHTOOL_F_WISH__BIT = 1,
1: +  ETHTOOL_F_COMPAT__BIT = 2,
1:  };
1:  
1:  struct ethtool_per_queue_op {
1: -	__u32 cmd;
1: -	__u32 sub_command;
1: -	__u32 queue_mask[128];
1: -	char data[0];
1: +  __u32 cmd;
1: +  __u32 sub_command;
1: +  __u32 queue_mask[128];
1: +  char data[0];
1:  };
1:  
1:  struct ethtool_rx_flow_rule {
1: -	struct flow_rule *rule;
1: -	long unsigned int priv[0];
1: +  struct flow_rule *rule;
1: +  long unsigned int priv[0];
1:  };
1:  
1:  struct ethtool_rx_flow_spec_input {
1: -	const struct ethtool_rx_flow_spec *fs;
1: -	u32 rss_ctx;
1: +  const struct ethtool_rx_flow_spec *fs;
1: +  u32 rss_ctx;
1:  };
1:  
1:  struct ethtool_link_usettings {
1: -	struct ethtool_link_settings base;
1: -	struct {
1: -		__u32 supported[3];
1: -		__u32 advertising[3];
1: -		__u32 lp_advertising[3];
1: -	} link_modes;
1: +  struct ethtool_link_settings base;
1: +  struct {
1: +    __u32 supported[3];
1: +    __u32 advertising[3];
1: +    __u32 lp_advertising[3];
1: +  } link_modes;
1:  };
1:  
1:  struct ethtool_rx_flow_key {
1: -	struct flow_dissector_key_basic basic;
1: -	union {
1: -		struct flow_dissector_key_ipv4_addrs ipv4;
1: -		struct flow_dissector_key_ipv6_addrs ipv6;
1: -	};
1: -	struct flow_dissector_key_ports tp;
1: -	struct flow_dissector_key_ip ip;
1: -	struct flow_dissector_key_vlan vlan;
1: -	struct flow_dissector_key_eth_addrs eth_addrs;
1: -	long: 48;
1: +  struct flow_dissector_key_basic basic;
1: +  union {
1: +    struct flow_dissector_key_ipv4_addrs ipv4;
1: +    struct flow_dissector_key_ipv6_addrs ipv6;
1: +  };
1: +  struct flow_dissector_key_ports tp;
1: +  struct flow_dissector_key_ip ip;
1: +  struct flow_dissector_key_vlan vlan;
1: +  struct flow_dissector_key_eth_addrs eth_addrs;
1: +  long : 48;
1:  };
1:  
1:  struct ethtool_rx_flow_match {
1: -	struct flow_dissector dissector;
1: -	int: 32;
1: -	struct ethtool_rx_flow_key key;
1: -	struct ethtool_rx_flow_key mask;
1: -};
1: -
1: -enum {
1: -	ETHTOOL_UDP_TUNNEL_TYPE_VXLAN = 0,
1: -	ETHTOOL_UDP_TUNNEL_TYPE_GENEVE = 1,
1: -	ETHTOOL_UDP_TUNNEL_TYPE_VXLAN_GPE = 2,
1: -	__ETHTOOL_UDP_TUNNEL_TYPE_CNT = 3,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_MSG_USER_NONE = 0,
1: -	ETHTOOL_MSG_STRSET_GET = 1,
1: -	ETHTOOL_MSG_LINKINFO_GET = 2,
1: -	ETHTOOL_MSG_LINKINFO_SET = 3,
1: -	ETHTOOL_MSG_LINKMODES_GET = 4,
1: -	ETHTOOL_MSG_LINKMODES_SET = 5,
1: -	ETHTOOL_MSG_LINKSTATE_GET = 6,
1: -	ETHTOOL_MSG_DEBUG_GET = 7,
1: -	ETHTOOL_MSG_DEBUG_SET = 8,
1: -	ETHTOOL_MSG_WOL_GET = 9,
1: -	ETHTOOL_MSG_WOL_SET = 10,
1: -	ETHTOOL_MSG_FEATURES_GET = 11,
1: -	ETHTOOL_MSG_FEATURES_SET = 12,
1: -	ETHTOOL_MSG_PRIVFLAGS_GET = 13,
1: -	ETHTOOL_MSG_PRIVFLAGS_SET = 14,
1: -	ETHTOOL_MSG_RINGS_GET = 15,
1: -	ETHTOOL_MSG_RINGS_SET = 16,
1: -	ETHTOOL_MSG_CHANNELS_GET = 17,
1: -	ETHTOOL_MSG_CHANNELS_SET = 18,
1: -	ETHTOOL_MSG_COALESCE_GET = 19,
1: -	ETHTOOL_MSG_COALESCE_SET = 20,
1: -	ETHTOOL_MSG_PAUSE_GET = 21,
1: -	ETHTOOL_MSG_PAUSE_SET = 22,
1: -	ETHTOOL_MSG_EEE_GET = 23,
1: -	ETHTOOL_MSG_EEE_SET = 24,
1: -	ETHTOOL_MSG_TSINFO_GET = 25,
1: -	ETHTOOL_MSG_CABLE_TEST_ACT = 26,
1: -	ETHTOOL_MSG_CABLE_TEST_TDR_ACT = 27,
1: -	ETHTOOL_MSG_TUNNEL_INFO_GET = 28,
1: -	__ETHTOOL_MSG_USER_CNT = 29,
1: -	ETHTOOL_MSG_USER_MAX = 28,
1: +  struct flow_dissector dissector;
1: +  int : 32;
1: +  struct ethtool_rx_flow_key key;
1: +  struct ethtool_rx_flow_key mask;
1: +};
1: +
1: +enum {
1: +  ETHTOOL_UDP_TUNNEL_TYPE_VXLAN = 0,
1: +  ETHTOOL_UDP_TUNNEL_TYPE_GENEVE = 1,
1: +  ETHTOOL_UDP_TUNNEL_TYPE_VXLAN_GPE = 2,
1: +  __ETHTOOL_UDP_TUNNEL_TYPE_CNT = 3,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_MSG_USER_NONE = 0,
1: +  ETHTOOL_MSG_STRSET_GET = 1,
1: +  ETHTOOL_MSG_LINKINFO_GET = 2,
1: +  ETHTOOL_MSG_LINKINFO_SET = 3,
1: +  ETHTOOL_MSG_LINKMODES_GET = 4,
1: +  ETHTOOL_MSG_LINKMODES_SET = 5,
1: +  ETHTOOL_MSG_LINKSTATE_GET = 6,
1: +  ETHTOOL_MSG_DEBUG_GET = 7,
1: +  ETHTOOL_MSG_DEBUG_SET = 8,
1: +  ETHTOOL_MSG_WOL_GET = 9,
1: +  ETHTOOL_MSG_WOL_SET = 10,
1: +  ETHTOOL_MSG_FEATURES_GET = 11,
1: +  ETHTOOL_MSG_FEATURES_SET = 12,
1: +  ETHTOOL_MSG_PRIVFLAGS_GET = 13,
1: +  ETHTOOL_MSG_PRIVFLAGS_SET = 14,
1: +  ETHTOOL_MSG_RINGS_GET = 15,
1: +  ETHTOOL_MSG_RINGS_SET = 16,
1: +  ETHTOOL_MSG_CHANNELS_GET = 17,
1: +  ETHTOOL_MSG_CHANNELS_SET = 18,
1: +  ETHTOOL_MSG_COALESCE_GET = 19,
1: +  ETHTOOL_MSG_COALESCE_SET = 20,
1: +  ETHTOOL_MSG_PAUSE_GET = 21,
1: +  ETHTOOL_MSG_PAUSE_SET = 22,
1: +  ETHTOOL_MSG_EEE_GET = 23,
1: +  ETHTOOL_MSG_EEE_SET = 24,
1: +  ETHTOOL_MSG_TSINFO_GET = 25,
1: +  ETHTOOL_MSG_CABLE_TEST_ACT = 26,
1: +  ETHTOOL_MSG_CABLE_TEST_TDR_ACT = 27,
1: +  ETHTOOL_MSG_TUNNEL_INFO_GET = 28,
1: +  __ETHTOOL_MSG_USER_CNT = 29,
1: +  ETHTOOL_MSG_USER_MAX = 28,
1:  };
1:  
1: -enum {
1: -	ETHTOOL_A_HEADER_UNSPEC = 0,
1: -	ETHTOOL_A_HEADER_DEV_INDEX = 1,
1: -	ETHTOOL_A_HEADER_DEV_NAME = 2,
1: -	ETHTOOL_A_HEADER_FLAGS = 3,
1: -	__ETHTOOL_A_HEADER_CNT = 4,
1: -	ETHTOOL_A_HEADER_MAX = 3,
1: +enum {
1: +  ETHTOOL_A_HEADER_UNSPEC = 0,
1: +  ETHTOOL_A_HEADER_DEV_INDEX = 1,
1: +  ETHTOOL_A_HEADER_DEV_NAME = 2,
1: +  ETHTOOL_A_HEADER_FLAGS = 3,
1: +  __ETHTOOL_A_HEADER_CNT = 4,
1: +  ETHTOOL_A_HEADER_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_STRSET_UNSPEC = 0,
1: -	ETHTOOL_A_STRSET_HEADER = 1,
1: -	ETHTOOL_A_STRSET_STRINGSETS = 2,
1: -	ETHTOOL_A_STRSET_COUNTS_ONLY = 3,
1: -	__ETHTOOL_A_STRSET_CNT = 4,
1: -	ETHTOOL_A_STRSET_MAX = 3,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_LINKINFO_UNSPEC = 0,
1: -	ETHTOOL_A_LINKINFO_HEADER = 1,
1: -	ETHTOOL_A_LINKINFO_PORT = 2,
1: -	ETHTOOL_A_LINKINFO_PHYADDR = 3,
1: -	ETHTOOL_A_LINKINFO_TP_MDIX = 4,
1: -	ETHTOOL_A_LINKINFO_TP_MDIX_CTRL = 5,
1: -	ETHTOOL_A_LINKINFO_TRANSCEIVER = 6,
1: -	__ETHTOOL_A_LINKINFO_CNT = 7,
1: -	ETHTOOL_A_LINKINFO_MAX = 6,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_LINKMODES_UNSPEC = 0,
1: -	ETHTOOL_A_LINKMODES_HEADER = 1,
1: -	ETHTOOL_A_LINKMODES_AUTONEG = 2,
1: -	ETHTOOL_A_LINKMODES_OURS = 3,
1: -	ETHTOOL_A_LINKMODES_PEER = 4,
1: -	ETHTOOL_A_LINKMODES_SPEED = 5,
1: -	ETHTOOL_A_LINKMODES_DUPLEX = 6,
1: -	ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG = 7,
1: -	ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE = 8,
1: -	__ETHTOOL_A_LINKMODES_CNT = 9,
1: -	ETHTOOL_A_LINKMODES_MAX = 8,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_LINKSTATE_UNSPEC = 0,
1: -	ETHTOOL_A_LINKSTATE_HEADER = 1,
1: -	ETHTOOL_A_LINKSTATE_LINK = 2,
1: -	ETHTOOL_A_LINKSTATE_SQI = 3,
1: -	ETHTOOL_A_LINKSTATE_SQI_MAX = 4,
1: -	ETHTOOL_A_LINKSTATE_EXT_STATE = 5,
1: -	ETHTOOL_A_LINKSTATE_EXT_SUBSTATE = 6,
1: -	__ETHTOOL_A_LINKSTATE_CNT = 7,
1: -	ETHTOOL_A_LINKSTATE_MAX = 6,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_DEBUG_UNSPEC = 0,
1: -	ETHTOOL_A_DEBUG_HEADER = 1,
1: -	ETHTOOL_A_DEBUG_MSGMASK = 2,
1: -	__ETHTOOL_A_DEBUG_CNT = 3,
1: -	ETHTOOL_A_DEBUG_MAX = 2,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_WOL_UNSPEC = 0,
1: -	ETHTOOL_A_WOL_HEADER = 1,
1: -	ETHTOOL_A_WOL_MODES = 2,
1: -	ETHTOOL_A_WOL_SOPASS = 3,
1: -	__ETHTOOL_A_WOL_CNT = 4,
1: -	ETHTOOL_A_WOL_MAX = 3,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_FEATURES_UNSPEC = 0,
1: -	ETHTOOL_A_FEATURES_HEADER = 1,
1: -	ETHTOOL_A_FEATURES_HW = 2,
1: -	ETHTOOL_A_FEATURES_WANTED = 3,
1: -	ETHTOOL_A_FEATURES_ACTIVE = 4,
1: -	ETHTOOL_A_FEATURES_NOCHANGE = 5,
1: -	__ETHTOOL_A_FEATURES_CNT = 6,
1: -	ETHTOOL_A_FEATURES_MAX = 5,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_PRIVFLAGS_UNSPEC = 0,
1: -	ETHTOOL_A_PRIVFLAGS_HEADER = 1,
1: -	ETHTOOL_A_PRIVFLAGS_FLAGS = 2,
1: -	__ETHTOOL_A_PRIVFLAGS_CNT = 3,
1: -	ETHTOOL_A_PRIVFLAGS_MAX = 2,
1: -};
1: -
1: +  ETHTOOL_A_STRSET_UNSPEC = 0,
1: +  ETHTOOL_A_STRSET_HEADER = 1,
1: +  ETHTOOL_A_STRSET_STRINGSETS = 2,
1: +  ETHTOOL_A_STRSET_COUNTS_ONLY = 3,
1: +  __ETHTOOL_A_STRSET_CNT = 4,
1: +  ETHTOOL_A_STRSET_MAX = 3,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_LINKINFO_UNSPEC = 0,
1: +  ETHTOOL_A_LINKINFO_HEADER = 1,
1: +  ETHTOOL_A_LINKINFO_PORT = 2,
1: +  ETHTOOL_A_LINKINFO_PHYADDR = 3,
1: +  ETHTOOL_A_LINKINFO_TP_MDIX = 4,
1: +  ETHTOOL_A_LINKINFO_TP_MDIX_CTRL = 5,
1: +  ETHTOOL_A_LINKINFO_TRANSCEIVER = 6,
1: +  __ETHTOOL_A_LINKINFO_CNT = 7,
1: +  ETHTOOL_A_LINKINFO_MAX = 6,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_LINKMODES_UNSPEC = 0,
1: +  ETHTOOL_A_LINKMODES_HEADER = 1,
1: +  ETHTOOL_A_LINKMODES_AUTONEG = 2,
1: +  ETHTOOL_A_LINKMODES_OURS = 3,
1: +  ETHTOOL_A_LINKMODES_PEER = 4,
1: +  ETHTOOL_A_LINKMODES_SPEED = 5,
1: +  ETHTOOL_A_LINKMODES_DUPLEX = 6,
1: +  ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG = 7,
1: +  ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE = 8,
1: +  __ETHTOOL_A_LINKMODES_CNT = 9,
1: +  ETHTOOL_A_LINKMODES_MAX = 8,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_LINKSTATE_UNSPEC = 0,
1: +  ETHTOOL_A_LINKSTATE_HEADER = 1,
1: +  ETHTOOL_A_LINKSTATE_LINK = 2,
1: +  ETHTOOL_A_LINKSTATE_SQI = 3,
1: +  ETHTOOL_A_LINKSTATE_SQI_MAX = 4,
1: +  ETHTOOL_A_LINKSTATE_EXT_STATE = 5,
1: +  ETHTOOL_A_LINKSTATE_EXT_SUBSTATE = 6,
1: +  __ETHTOOL_A_LINKSTATE_CNT = 7,
1: +  ETHTOOL_A_LINKSTATE_MAX = 6,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_DEBUG_UNSPEC = 0,
1: +  ETHTOOL_A_DEBUG_HEADER = 1,
1: +  ETHTOOL_A_DEBUG_MSGMASK = 2,
1: +  __ETHTOOL_A_DEBUG_CNT = 3,
1: +  ETHTOOL_A_DEBUG_MAX = 2,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_WOL_UNSPEC = 0,
1: +  ETHTOOL_A_WOL_HEADER = 1,
1: +  ETHTOOL_A_WOL_MODES = 2,
1: +  ETHTOOL_A_WOL_SOPASS = 3,
1: +  __ETHTOOL_A_WOL_CNT = 4,
1: +  ETHTOOL_A_WOL_MAX = 3,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_FEATURES_UNSPEC = 0,
1: +  ETHTOOL_A_FEATURES_HEADER = 1,
1: +  ETHTOOL_A_FEATURES_HW = 2,
1: +  ETHTOOL_A_FEATURES_WANTED = 3,
1: +  ETHTOOL_A_FEATURES_ACTIVE = 4,
1: +  ETHTOOL_A_FEATURES_NOCHANGE = 5,
1: +  __ETHTOOL_A_FEATURES_CNT = 6,
1: +  ETHTOOL_A_FEATURES_MAX = 5,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_PRIVFLAGS_UNSPEC = 0,
1: +  ETHTOOL_A_PRIVFLAGS_HEADER = 1,
1: +  ETHTOOL_A_PRIVFLAGS_FLAGS = 2,
1: +  __ETHTOOL_A_PRIVFLAGS_CNT = 3,
1: +  ETHTOOL_A_PRIVFLAGS_MAX = 2,
1: +};
1: +
1:  enum {
1: -	ETHTOOL_A_RINGS_UNSPEC = 0,
1: -	ETHTOOL_A_RINGS_HEADER = 1,
1: -	ETHTOOL_A_RINGS_RX_MAX = 2,
1: -	ETHTOOL_A_RINGS_RX_MINI_MAX = 3,
1: -	ETHTOOL_A_RINGS_RX_JUMBO_MAX = 4,
1: -	ETHTOOL_A_RINGS_TX_MAX = 5,
1: -	ETHTOOL_A_RINGS_RX = 6,
1: -	ETHTOOL_A_RINGS_RX_MINI = 7,
1: -	ETHTOOL_A_RINGS_RX_JUMBO = 8,
1: -	ETHTOOL_A_RINGS_TX = 9,
1: -	__ETHTOOL_A_RINGS_CNT = 10,
1: -	ETHTOOL_A_RINGS_MAX = 9,
1: +  ETHTOOL_A_RINGS_UNSPEC = 0,
1: +  ETHTOOL_A_RINGS_HEADER = 1,
1: +  ETHTOOL_A_RINGS_RX_MAX = 2,
1: +  ETHTOOL_A_RINGS_RX_MINI_MAX = 3,
1: +  ETHTOOL_A_RINGS_RX_JUMBO_MAX = 4,
1: +  ETHTOOL_A_RINGS_TX_MAX = 5,
1: +  ETHTOOL_A_RINGS_RX = 6,
1: +  ETHTOOL_A_RINGS_RX_MINI = 7,
1: +  ETHTOOL_A_RINGS_RX_JUMBO = 8,
1: +  ETHTOOL_A_RINGS_TX = 9,
1: +  __ETHTOOL_A_RINGS_CNT = 10,
1: +  ETHTOOL_A_RINGS_MAX = 9,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CHANNELS_UNSPEC = 0,
1: -	ETHTOOL_A_CHANNELS_HEADER = 1,
1: -	ETHTOOL_A_CHANNELS_RX_MAX = 2,
1: -	ETHTOOL_A_CHANNELS_TX_MAX = 3,
1: -	ETHTOOL_A_CHANNELS_OTHER_MAX = 4,
1: -	ETHTOOL_A_CHANNELS_COMBINED_MAX = 5,
1: -	ETHTOOL_A_CHANNELS_RX_COUNT = 6,
1: -	ETHTOOL_A_CHANNELS_TX_COUNT = 7,
1: -	ETHTOOL_A_CHANNELS_OTHER_COUNT = 8,
1: -	ETHTOOL_A_CHANNELS_COMBINED_COUNT = 9,
1: -	__ETHTOOL_A_CHANNELS_CNT = 10,
1: -	ETHTOOL_A_CHANNELS_MAX = 9,
1: +  ETHTOOL_A_CHANNELS_UNSPEC = 0,
1: +  ETHTOOL_A_CHANNELS_HEADER = 1,
1: +  ETHTOOL_A_CHANNELS_RX_MAX = 2,
1: +  ETHTOOL_A_CHANNELS_TX_MAX = 3,
1: +  ETHTOOL_A_CHANNELS_OTHER_MAX = 4,
1: +  ETHTOOL_A_CHANNELS_COMBINED_MAX = 5,
1: +  ETHTOOL_A_CHANNELS_RX_COUNT = 6,
1: +  ETHTOOL_A_CHANNELS_TX_COUNT = 7,
1: +  ETHTOOL_A_CHANNELS_OTHER_COUNT = 8,
1: +  ETHTOOL_A_CHANNELS_COMBINED_COUNT = 9,
1: +  __ETHTOOL_A_CHANNELS_CNT = 10,
1: +  ETHTOOL_A_CHANNELS_MAX = 9,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_COALESCE_UNSPEC = 0,
1: -	ETHTOOL_A_COALESCE_HEADER = 1,
1: -	ETHTOOL_A_COALESCE_RX_USECS = 2,
1: -	ETHTOOL_A_COALESCE_RX_MAX_FRAMES = 3,
1: -	ETHTOOL_A_COALESCE_RX_USECS_IRQ = 4,
1: -	ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ = 5,
1: -	ETHTOOL_A_COALESCE_TX_USECS = 6,
1: -	ETHTOOL_A_COALESCE_TX_MAX_FRAMES = 7,
1: -	ETHTOOL_A_COALESCE_TX_USECS_IRQ = 8,
1: -	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ = 9,
1: -	ETHTOOL_A_COALESCE_STATS_BLOCK_USECS = 10,
1: -	ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX = 11,
1: -	ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX = 12,
1: -	ETHTOOL_A_COALESCE_PKT_RATE_LOW = 13,
1: -	ETHTOOL_A_COALESCE_RX_USECS_LOW = 14,
1: -	ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW = 15,
1: -	ETHTOOL_A_COALESCE_TX_USECS_LOW = 16,
1: -	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW = 17,
1: -	ETHTOOL_A_COALESCE_PKT_RATE_HIGH = 18,
1: -	ETHTOOL_A_COALESCE_RX_USECS_HIGH = 19,
1: -	ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH = 20,
1: -	ETHTOOL_A_COALESCE_TX_USECS_HIGH = 21,
1: -	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH = 22,
1: -	ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL = 23,
1: -	__ETHTOOL_A_COALESCE_CNT = 24,
1: -	ETHTOOL_A_COALESCE_MAX = 23,
1: +  ETHTOOL_A_COALESCE_UNSPEC = 0,
1: +  ETHTOOL_A_COALESCE_HEADER = 1,
1: +  ETHTOOL_A_COALESCE_RX_USECS = 2,
1: +  ETHTOOL_A_COALESCE_RX_MAX_FRAMES = 3,
1: +  ETHTOOL_A_COALESCE_RX_USECS_IRQ = 4,
1: +  ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ = 5,
1: +  ETHTOOL_A_COALESCE_TX_USECS = 6,
1: +  ETHTOOL_A_COALESCE_TX_MAX_FRAMES = 7,
1: +  ETHTOOL_A_COALESCE_TX_USECS_IRQ = 8,
1: +  ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ = 9,
1: +  ETHTOOL_A_COALESCE_STATS_BLOCK_USECS = 10,
1: +  ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX = 11,
1: +  ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX = 12,
1: +  ETHTOOL_A_COALESCE_PKT_RATE_LOW = 13,
1: +  ETHTOOL_A_COALESCE_RX_USECS_LOW = 14,
1: +  ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW = 15,
1: +  ETHTOOL_A_COALESCE_TX_USECS_LOW = 16,
1: +  ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW = 17,
1: +  ETHTOOL_A_COALESCE_PKT_RATE_HIGH = 18,
1: +  ETHTOOL_A_COALESCE_RX_USECS_HIGH = 19,
1: +  ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH = 20,
1: +  ETHTOOL_A_COALESCE_TX_USECS_HIGH = 21,
1: +  ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH = 22,
1: +  ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL = 23,
1: +  __ETHTOOL_A_COALESCE_CNT = 24,
1: +  ETHTOOL_A_COALESCE_MAX = 23,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_PAUSE_UNSPEC = 0,
1: -	ETHTOOL_A_PAUSE_HEADER = 1,
1: -	ETHTOOL_A_PAUSE_AUTONEG = 2,
1: -	ETHTOOL_A_PAUSE_RX = 3,
1: -	ETHTOOL_A_PAUSE_TX = 4,
1: -	ETHTOOL_A_PAUSE_STATS = 5,
1: -	__ETHTOOL_A_PAUSE_CNT = 6,
1: -	ETHTOOL_A_PAUSE_MAX = 5,
1: +  ETHTOOL_A_PAUSE_UNSPEC = 0,
1: +  ETHTOOL_A_PAUSE_HEADER = 1,
1: +  ETHTOOL_A_PAUSE_AUTONEG = 2,
1: +  ETHTOOL_A_PAUSE_RX = 3,
1: +  ETHTOOL_A_PAUSE_TX = 4,
1: +  ETHTOOL_A_PAUSE_STATS = 5,
1: +  __ETHTOOL_A_PAUSE_CNT = 6,
1: +  ETHTOOL_A_PAUSE_MAX = 5,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_EEE_UNSPEC = 0,
1: -	ETHTOOL_A_EEE_HEADER = 1,
1: -	ETHTOOL_A_EEE_MODES_OURS = 2,
1: -	ETHTOOL_A_EEE_MODES_PEER = 3,
1: -	ETHTOOL_A_EEE_ACTIVE = 4,
1: -	ETHTOOL_A_EEE_ENABLED = 5,
1: -	ETHTOOL_A_EEE_TX_LPI_ENABLED = 6,
1: -	ETHTOOL_A_EEE_TX_LPI_TIMER = 7,
1: -	__ETHTOOL_A_EEE_CNT = 8,
1: -	ETHTOOL_A_EEE_MAX = 7,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_TSINFO_UNSPEC = 0,
1: -	ETHTOOL_A_TSINFO_HEADER = 1,
1: -	ETHTOOL_A_TSINFO_TIMESTAMPING = 2,
1: -	ETHTOOL_A_TSINFO_TX_TYPES = 3,
1: -	ETHTOOL_A_TSINFO_RX_FILTERS = 4,
1: -	ETHTOOL_A_TSINFO_PHC_INDEX = 5,
1: -	__ETHTOOL_A_TSINFO_CNT = 6,
1: -	ETHTOOL_A_TSINFO_MAX = 5,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_CABLE_TEST_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_TEST_HEADER = 1,
1: -	__ETHTOOL_A_CABLE_TEST_CNT = 2,
1: -	ETHTOOL_A_CABLE_TEST_MAX = 1,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_CABLE_TEST_TDR_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_TEST_TDR_HEADER = 1,
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG = 2,
1: -	__ETHTOOL_A_CABLE_TEST_TDR_CNT = 3,
1: -	ETHTOOL_A_CABLE_TEST_TDR_MAX = 2,
1: -};
1: -
1: -enum {
1: -	ETHTOOL_A_TUNNEL_INFO_UNSPEC = 0,
1: -	ETHTOOL_A_TUNNEL_INFO_HEADER = 1,
1: -	ETHTOOL_A_TUNNEL_INFO_UDP_PORTS = 2,
1: -	__ETHTOOL_A_TUNNEL_INFO_CNT = 3,
1: -	ETHTOOL_A_TUNNEL_INFO_MAX = 2,
1: +  ETHTOOL_A_EEE_UNSPEC = 0,
1: +  ETHTOOL_A_EEE_HEADER = 1,
1: +  ETHTOOL_A_EEE_MODES_OURS = 2,
1: +  ETHTOOL_A_EEE_MODES_PEER = 3,
1: +  ETHTOOL_A_EEE_ACTIVE = 4,
1: +  ETHTOOL_A_EEE_ENABLED = 5,
1: +  ETHTOOL_A_EEE_TX_LPI_ENABLED = 6,
1: +  ETHTOOL_A_EEE_TX_LPI_TIMER = 7,
1: +  __ETHTOOL_A_EEE_CNT = 8,
1: +  ETHTOOL_A_EEE_MAX = 7,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_TSINFO_UNSPEC = 0,
1: +  ETHTOOL_A_TSINFO_HEADER = 1,
1: +  ETHTOOL_A_TSINFO_TIMESTAMPING = 2,
1: +  ETHTOOL_A_TSINFO_TX_TYPES = 3,
1: +  ETHTOOL_A_TSINFO_RX_FILTERS = 4,
1: +  ETHTOOL_A_TSINFO_PHC_INDEX = 5,
1: +  __ETHTOOL_A_TSINFO_CNT = 6,
1: +  ETHTOOL_A_TSINFO_MAX = 5,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_CABLE_TEST_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_TEST_HEADER = 1,
1: +  __ETHTOOL_A_CABLE_TEST_CNT = 2,
1: +  ETHTOOL_A_CABLE_TEST_MAX = 1,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_CABLE_TEST_TDR_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_TEST_TDR_HEADER = 1,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG = 2,
1: +  __ETHTOOL_A_CABLE_TEST_TDR_CNT = 3,
1: +  ETHTOOL_A_CABLE_TEST_TDR_MAX = 2,
1: +};
1: +
1: +enum {
1: +  ETHTOOL_A_TUNNEL_INFO_UNSPEC = 0,
1: +  ETHTOOL_A_TUNNEL_INFO_HEADER = 1,
1: +  ETHTOOL_A_TUNNEL_INFO_UDP_PORTS = 2,
1: +  __ETHTOOL_A_TUNNEL_INFO_CNT = 3,
1: +  ETHTOOL_A_TUNNEL_INFO_MAX = 2,
1:  };
1:  
1:  enum ethtool_multicast_groups {
1: -	ETHNL_MCGRP_MONITOR = 0,
1: +  ETHNL_MCGRP_MONITOR = 0,
1:  };
1:  
1:  struct ethnl_req_info {
1: -	struct net_device *dev;
1: -	u32 flags;
1: +  struct net_device *dev;
1: +  u32 flags;
1:  };
1:  
1:  struct ethnl_reply_data {
1: -	struct net_device *dev;
1: +  struct net_device *dev;
1:  };
1:  
1:  struct ethnl_request_ops {
1: -	u8 request_cmd;
1: -	u8 reply_cmd;
1: -	u16 hdr_attr;
1: -	unsigned int req_info_size;
1: -	unsigned int reply_data_size;
1: -	bool allow_nodev_do;
1: -	int (*parse_request)(struct ethnl_req_info *, struct nlattr **, struct netlink_ext_ack *);
1: -	int (*prepare_data)(const struct ethnl_req_info *, struct ethnl_reply_data *, struct genl_info *);
1: -	int (*reply_size)(const struct ethnl_req_info *, const struct ethnl_reply_data *);
1: -	int (*fill_reply)(struct sk_buff *, const struct ethnl_req_info *, const struct ethnl_reply_data *);
1: -	void (*cleanup_data)(struct ethnl_reply_data *);
1: +  u8 request_cmd;
1: +  u8 reply_cmd;
1: +  u16 hdr_attr;
1: +  unsigned int req_info_size;
1: +  unsigned int reply_data_size;
1: +  bool allow_nodev_do;
1: +  int (*parse_request)(struct ethnl_req_info *, struct nlattr **,
1: +                       struct netlink_ext_ack *);
1: +  int (*prepare_data)(const struct ethnl_req_info *, struct ethnl_reply_data *,
1: +                      struct genl_info *);
1: +  int (*reply_size)(const struct ethnl_req_info *,
1: +                    const struct ethnl_reply_data *);
1: +  int (*fill_reply)(struct sk_buff *, const struct ethnl_req_info *,
1: +                    const struct ethnl_reply_data *);
1: +  void (*cleanup_data)(struct ethnl_reply_data *);
1:  };
1:  
1:  struct ethnl_dump_ctx {
1: -	const struct ethnl_request_ops *ops;
1: -	struct ethnl_req_info *req_info;
1: -	struct ethnl_reply_data *reply_data;
1: -	int pos_hash;
1: -	int pos_idx;
1: +  const struct ethnl_request_ops *ops;
1: +  struct ethnl_req_info *req_info;
1: +  struct ethnl_reply_data *reply_data;
1: +  int pos_hash;
1: +  int pos_idx;
1:  };
1:  
1: -typedef void (*ethnl_notify_handler_t)(struct net_device *, unsigned int, const void *);
1: +typedef void (*ethnl_notify_handler_t)(struct net_device *, unsigned int,
1: +                                       const void *);
1:  
1:  enum {
1: -	ETHTOOL_A_BITSET_BIT_UNSPEC = 0,
1: -	ETHTOOL_A_BITSET_BIT_INDEX = 1,
1: -	ETHTOOL_A_BITSET_BIT_NAME = 2,
1: -	ETHTOOL_A_BITSET_BIT_VALUE = 3,
1: -	__ETHTOOL_A_BITSET_BIT_CNT = 4,
1: -	ETHTOOL_A_BITSET_BIT_MAX = 3,
1: +  ETHTOOL_A_BITSET_BIT_UNSPEC = 0,
1: +  ETHTOOL_A_BITSET_BIT_INDEX = 1,
1: +  ETHTOOL_A_BITSET_BIT_NAME = 2,
1: +  ETHTOOL_A_BITSET_BIT_VALUE = 3,
1: +  __ETHTOOL_A_BITSET_BIT_CNT = 4,
1: +  ETHTOOL_A_BITSET_BIT_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_BITSET_BITS_UNSPEC = 0,
1: -	ETHTOOL_A_BITSET_BITS_BIT = 1,
1: -	__ETHTOOL_A_BITSET_BITS_CNT = 2,
1: -	ETHTOOL_A_BITSET_BITS_MAX = 1,
1: +  ETHTOOL_A_BITSET_BITS_UNSPEC = 0,
1: +  ETHTOOL_A_BITSET_BITS_BIT = 1,
1: +  __ETHTOOL_A_BITSET_BITS_CNT = 2,
1: +  ETHTOOL_A_BITSET_BITS_MAX = 1,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_BITSET_UNSPEC = 0,
1: -	ETHTOOL_A_BITSET_NOMASK = 1,
1: -	ETHTOOL_A_BITSET_SIZE = 2,
1: -	ETHTOOL_A_BITSET_BITS = 3,
1: -	ETHTOOL_A_BITSET_VALUE = 4,
1: -	ETHTOOL_A_BITSET_MASK = 5,
1: -	__ETHTOOL_A_BITSET_CNT = 6,
1: -	ETHTOOL_A_BITSET_MAX = 5,
1: +  ETHTOOL_A_BITSET_UNSPEC = 0,
1: +  ETHTOOL_A_BITSET_NOMASK = 1,
1: +  ETHTOOL_A_BITSET_SIZE = 2,
1: +  ETHTOOL_A_BITSET_BITS = 3,
1: +  ETHTOOL_A_BITSET_VALUE = 4,
1: +  ETHTOOL_A_BITSET_MASK = 5,
1: +  __ETHTOOL_A_BITSET_CNT = 6,
1: +  ETHTOOL_A_BITSET_MAX = 5,
1:  };
1:  
1: -typedef const char (* const ethnl_string_array_t)[32];
1: +typedef const char (*const ethnl_string_array_t)[32];
1:  
1:  enum {
1: -	ETHTOOL_A_STRING_UNSPEC = 0,
1: -	ETHTOOL_A_STRING_INDEX = 1,
1: -	ETHTOOL_A_STRING_VALUE = 2,
1: -	__ETHTOOL_A_STRING_CNT = 3,
1: -	ETHTOOL_A_STRING_MAX = 2,
1: +  ETHTOOL_A_STRING_UNSPEC = 0,
1: +  ETHTOOL_A_STRING_INDEX = 1,
1: +  ETHTOOL_A_STRING_VALUE = 2,
1: +  __ETHTOOL_A_STRING_CNT = 3,
1: +  ETHTOOL_A_STRING_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_STRINGS_UNSPEC = 0,
1: -	ETHTOOL_A_STRINGS_STRING = 1,
1: -	__ETHTOOL_A_STRINGS_CNT = 2,
1: -	ETHTOOL_A_STRINGS_MAX = 1,
1: +  ETHTOOL_A_STRINGS_UNSPEC = 0,
1: +  ETHTOOL_A_STRINGS_STRING = 1,
1: +  __ETHTOOL_A_STRINGS_CNT = 2,
1: +  ETHTOOL_A_STRINGS_MAX = 1,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_STRINGSET_UNSPEC = 0,
1: -	ETHTOOL_A_STRINGSET_ID = 1,
1: -	ETHTOOL_A_STRINGSET_COUNT = 2,
1: -	ETHTOOL_A_STRINGSET_STRINGS = 3,
1: -	__ETHTOOL_A_STRINGSET_CNT = 4,
1: -	ETHTOOL_A_STRINGSET_MAX = 3,
1: +  ETHTOOL_A_STRINGSET_UNSPEC = 0,
1: +  ETHTOOL_A_STRINGSET_ID = 1,
1: +  ETHTOOL_A_STRINGSET_COUNT = 2,
1: +  ETHTOOL_A_STRINGSET_STRINGS = 3,
1: +  __ETHTOOL_A_STRINGSET_CNT = 4,
1: +  ETHTOOL_A_STRINGSET_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_STRINGSETS_UNSPEC = 0,
1: -	ETHTOOL_A_STRINGSETS_STRINGSET = 1,
1: -	__ETHTOOL_A_STRINGSETS_CNT = 2,
1: -	ETHTOOL_A_STRINGSETS_MAX = 1,
1: +  ETHTOOL_A_STRINGSETS_UNSPEC = 0,
1: +  ETHTOOL_A_STRINGSETS_STRINGSET = 1,
1: +  __ETHTOOL_A_STRINGSETS_CNT = 2,
1: +  ETHTOOL_A_STRINGSETS_MAX = 1,
1:  };
1:  
1:  struct strset_info {
1: -	bool per_dev;
1: -	bool free_strings;
1: -	unsigned int count;
1: -	const char (*strings)[32];
1: +  bool per_dev;
1: +  bool free_strings;
1: +  unsigned int count;
1: +  const char (*strings)[32];
1:  };
1:  
1:  struct strset_req_info {
1: -	struct ethnl_req_info base;
1: -	u32 req_ids;
1: -	bool counts_only;
1: +  struct ethnl_req_info base;
1: +  u32 req_ids;
1: +  bool counts_only;
1:  };
1:  
1:  struct strset_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct strset_info sets[16];
1: +  struct ethnl_reply_data base;
1: +  struct strset_info sets[16];
1:  };
1:  
1:  struct linkinfo_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_link_ksettings ksettings;
1: -	struct ethtool_link_settings *lsettings;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_link_ksettings ksettings;
1: +  struct ethtool_link_settings *lsettings;
1:  };
1:  
1:  struct linkmodes_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_link_ksettings ksettings;
1: -	struct ethtool_link_settings *lsettings;
1: -	bool peer_empty;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_link_ksettings ksettings;
1: +  struct ethtool_link_settings *lsettings;
1: +  bool peer_empty;
1:  };
1:  
1:  struct link_mode_info {
1: -	int speed;
1: -	u8 duplex;
1: +  int speed;
1: +  u8 duplex;
1:  };
1:  
1:  struct linkstate_reply_data {
1: -	struct ethnl_reply_data base;
1: -	int link;
1: -	int sqi;
1: -	int sqi_max;
1: -	bool link_ext_state_provided;
1: -	struct ethtool_link_ext_state_info ethtool_link_ext_state_info;
1: +  struct ethnl_reply_data base;
1: +  int link;
1: +  int sqi;
1: +  int sqi_max;
1: +  bool link_ext_state_provided;
1: +  struct ethtool_link_ext_state_info ethtool_link_ext_state_info;
1:  };
1:  
1:  struct debug_reply_data {
1: -	struct ethnl_reply_data base;
1: -	u32 msg_mask;
1: +  struct ethnl_reply_data base;
1: +  u32 msg_mask;
1:  };
1:  
1:  struct wol_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_wolinfo wol;
1: -	bool show_sopass;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_wolinfo wol;
1: +  bool show_sopass;
1:  };
1:  
1:  struct features_reply_data {
1: -	struct ethnl_reply_data base;
1: -	u32 hw[2];
1: -	u32 wanted[2];
1: -	u32 active[2];
1: -	u32 nochange[2];
1: -	u32 all[2];
1: +  struct ethnl_reply_data base;
1: +  u32 hw[2];
1: +  u32 wanted[2];
1: +  u32 active[2];
1: +  u32 nochange[2];
1: +  u32 all[2];
1:  };
1:  
1:  struct privflags_reply_data {
1: -	struct ethnl_reply_data base;
1: -	const char (*priv_flag_names)[32];
1: -	unsigned int n_priv_flags;
1: -	u32 priv_flags;
1: +  struct ethnl_reply_data base;
1: +  const char (*priv_flag_names)[32];
1: +  unsigned int n_priv_flags;
1: +  u32 priv_flags;
1:  };
1:  
1:  struct rings_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_ringparam ringparam;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_ringparam ringparam;
1:  };
1:  
1:  struct channels_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_channels channels;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_channels channels;
1:  };
1:  
1:  struct coalesce_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_coalesce coalesce;
1: -	u32 supported_params;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_coalesce coalesce;
1: +  u32 supported_params;
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_PAUSE_STAT_UNSPEC = 0,
1: -	ETHTOOL_A_PAUSE_STAT_PAD = 1,
1: -	ETHTOOL_A_PAUSE_STAT_TX_FRAMES = 2,
1: -	ETHTOOL_A_PAUSE_STAT_RX_FRAMES = 3,
1: -	__ETHTOOL_A_PAUSE_STAT_CNT = 4,
1: -	ETHTOOL_A_PAUSE_STAT_MAX = 3,
1: +  ETHTOOL_A_PAUSE_STAT_UNSPEC = 0,
1: +  ETHTOOL_A_PAUSE_STAT_PAD = 1,
1: +  ETHTOOL_A_PAUSE_STAT_TX_FRAMES = 2,
1: +  ETHTOOL_A_PAUSE_STAT_RX_FRAMES = 3,
1: +  __ETHTOOL_A_PAUSE_STAT_CNT = 4,
1: +  ETHTOOL_A_PAUSE_STAT_MAX = 3,
1:  };
1:  
1:  struct pause_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_pauseparam pauseparam;
1: -	struct ethtool_pause_stats pausestat;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_pauseparam pauseparam;
1: +  struct ethtool_pause_stats pausestat;
1:  };
1:  
1:  struct eee_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_eee eee;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_eee eee;
1:  };
1:  
1:  struct tsinfo_reply_data {
1: -	struct ethnl_reply_data base;
1: -	struct ethtool_ts_info ts_info;
1: +  struct ethnl_reply_data base;
1: +  struct ethtool_ts_info ts_info;
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_PAIR_A = 0,
1: -	ETHTOOL_A_CABLE_PAIR_B = 1,
1: -	ETHTOOL_A_CABLE_PAIR_C = 2,
1: -	ETHTOOL_A_CABLE_PAIR_D = 3,
1: +  ETHTOOL_A_CABLE_PAIR_A = 0,
1: +  ETHTOOL_A_CABLE_PAIR_B = 1,
1: +  ETHTOOL_A_CABLE_PAIR_C = 2,
1: +  ETHTOOL_A_CABLE_PAIR_D = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_RESULT_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_RESULT_PAIR = 1,
1: -	ETHTOOL_A_CABLE_RESULT_CODE = 2,
1: -	__ETHTOOL_A_CABLE_RESULT_CNT = 3,
1: -	ETHTOOL_A_CABLE_RESULT_MAX = 2,
1: +  ETHTOOL_A_CABLE_RESULT_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_RESULT_PAIR = 1,
1: +  ETHTOOL_A_CABLE_RESULT_CODE = 2,
1: +  __ETHTOOL_A_CABLE_RESULT_CNT = 3,
1: +  ETHTOOL_A_CABLE_RESULT_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_FAULT_LENGTH_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_FAULT_LENGTH_PAIR = 1,
1: -	ETHTOOL_A_CABLE_FAULT_LENGTH_CM = 2,
1: -	__ETHTOOL_A_CABLE_FAULT_LENGTH_CNT = 3,
1: -	ETHTOOL_A_CABLE_FAULT_LENGTH_MAX = 2,
1: +  ETHTOOL_A_CABLE_FAULT_LENGTH_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_FAULT_LENGTH_PAIR = 1,
1: +  ETHTOOL_A_CABLE_FAULT_LENGTH_CM = 2,
1: +  __ETHTOOL_A_CABLE_FAULT_LENGTH_CNT = 3,
1: +  ETHTOOL_A_CABLE_FAULT_LENGTH_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_TEST_NTF_STATUS_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_TEST_NTF_STATUS_STARTED = 1,
1: -	ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED = 2,
1: +  ETHTOOL_A_CABLE_TEST_NTF_STATUS_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_TEST_NTF_STATUS_STARTED = 1,
1: +  ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_NEST_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_NEST_RESULT = 1,
1: -	ETHTOOL_A_CABLE_NEST_FAULT_LENGTH = 2,
1: -	__ETHTOOL_A_CABLE_NEST_CNT = 3,
1: -	ETHTOOL_A_CABLE_NEST_MAX = 2,
1: +  ETHTOOL_A_CABLE_NEST_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_NEST_RESULT = 1,
1: +  ETHTOOL_A_CABLE_NEST_FAULT_LENGTH = 2,
1: +  __ETHTOOL_A_CABLE_NEST_CNT = 3,
1: +  ETHTOOL_A_CABLE_NEST_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_TEST_NTF_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_TEST_NTF_HEADER = 1,
1: -	ETHTOOL_A_CABLE_TEST_NTF_STATUS = 2,
1: -	ETHTOOL_A_CABLE_TEST_NTF_NEST = 3,
1: -	__ETHTOOL_A_CABLE_TEST_NTF_CNT = 4,
1: -	ETHTOOL_A_CABLE_TEST_NTF_MAX = 3,
1: +  ETHTOOL_A_CABLE_TEST_NTF_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_TEST_NTF_HEADER = 1,
1: +  ETHTOOL_A_CABLE_TEST_NTF_STATUS = 2,
1: +  ETHTOOL_A_CABLE_TEST_NTF_NEST = 3,
1: +  __ETHTOOL_A_CABLE_TEST_NTF_CNT = 4,
1: +  ETHTOOL_A_CABLE_TEST_NTF_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST = 1,
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST = 2,
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP = 3,
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR = 4,
1: -	__ETHTOOL_A_CABLE_TEST_TDR_CFG_CNT = 5,
1: -	ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX = 4,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST = 1,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST = 2,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP = 3,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR = 4,
1: +  __ETHTOOL_A_CABLE_TEST_TDR_CFG_CNT = 5,
1: +  ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX = 4,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_AMPLITUDE_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_AMPLITUDE_PAIR = 1,
1: -	ETHTOOL_A_CABLE_AMPLITUDE_mV = 2,
1: -	__ETHTOOL_A_CABLE_AMPLITUDE_CNT = 3,
1: -	ETHTOOL_A_CABLE_AMPLITUDE_MAX = 2,
1: +  ETHTOOL_A_CABLE_AMPLITUDE_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_AMPLITUDE_PAIR = 1,
1: +  ETHTOOL_A_CABLE_AMPLITUDE_mV = 2,
1: +  __ETHTOOL_A_CABLE_AMPLITUDE_CNT = 3,
1: +  ETHTOOL_A_CABLE_AMPLITUDE_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_PULSE_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_PULSE_mV = 1,
1: -	__ETHTOOL_A_CABLE_PULSE_CNT = 2,
1: -	ETHTOOL_A_CABLE_PULSE_MAX = 1,
1: +  ETHTOOL_A_CABLE_PULSE_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_PULSE_mV = 1,
1: +  __ETHTOOL_A_CABLE_PULSE_CNT = 2,
1: +  ETHTOOL_A_CABLE_PULSE_MAX = 1,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_STEP_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_STEP_FIRST_DISTANCE = 1,
1: -	ETHTOOL_A_CABLE_STEP_LAST_DISTANCE = 2,
1: -	ETHTOOL_A_CABLE_STEP_STEP_DISTANCE = 3,
1: -	__ETHTOOL_A_CABLE_STEP_CNT = 4,
1: -	ETHTOOL_A_CABLE_STEP_MAX = 3,
1: +  ETHTOOL_A_CABLE_STEP_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_STEP_FIRST_DISTANCE = 1,
1: +  ETHTOOL_A_CABLE_STEP_LAST_DISTANCE = 2,
1: +  ETHTOOL_A_CABLE_STEP_STEP_DISTANCE = 3,
1: +  __ETHTOOL_A_CABLE_STEP_CNT = 4,
1: +  ETHTOOL_A_CABLE_STEP_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_CABLE_TDR_NEST_UNSPEC = 0,
1: -	ETHTOOL_A_CABLE_TDR_NEST_STEP = 1,
1: -	ETHTOOL_A_CABLE_TDR_NEST_AMPLITUDE = 2,
1: -	ETHTOOL_A_CABLE_TDR_NEST_PULSE = 3,
1: -	__ETHTOOL_A_CABLE_TDR_NEST_CNT = 4,
1: -	ETHTOOL_A_CABLE_TDR_NEST_MAX = 3,
1: +  ETHTOOL_A_CABLE_TDR_NEST_UNSPEC = 0,
1: +  ETHTOOL_A_CABLE_TDR_NEST_STEP = 1,
1: +  ETHTOOL_A_CABLE_TDR_NEST_AMPLITUDE = 2,
1: +  ETHTOOL_A_CABLE_TDR_NEST_PULSE = 3,
1: +  __ETHTOOL_A_CABLE_TDR_NEST_CNT = 4,
1: +  ETHTOOL_A_CABLE_TDR_NEST_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_TUNNEL_UDP_ENTRY_UNSPEC = 0,
1: -	ETHTOOL_A_TUNNEL_UDP_ENTRY_PORT = 1,
1: -	ETHTOOL_A_TUNNEL_UDP_ENTRY_TYPE = 2,
1: -	__ETHTOOL_A_TUNNEL_UDP_ENTRY_CNT = 3,
1: -	ETHTOOL_A_TUNNEL_UDP_ENTRY_MAX = 2,
1: +  ETHTOOL_A_TUNNEL_UDP_ENTRY_UNSPEC = 0,
1: +  ETHTOOL_A_TUNNEL_UDP_ENTRY_PORT = 1,
1: +  ETHTOOL_A_TUNNEL_UDP_ENTRY_TYPE = 2,
1: +  __ETHTOOL_A_TUNNEL_UDP_ENTRY_CNT = 3,
1: +  ETHTOOL_A_TUNNEL_UDP_ENTRY_MAX = 2,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_TUNNEL_UDP_TABLE_UNSPEC = 0,
1: -	ETHTOOL_A_TUNNEL_UDP_TABLE_SIZE = 1,
1: -	ETHTOOL_A_TUNNEL_UDP_TABLE_TYPES = 2,
1: -	ETHTOOL_A_TUNNEL_UDP_TABLE_ENTRY = 3,
1: -	__ETHTOOL_A_TUNNEL_UDP_TABLE_CNT = 4,
1: -	ETHTOOL_A_TUNNEL_UDP_TABLE_MAX = 3,
1: +  ETHTOOL_A_TUNNEL_UDP_TABLE_UNSPEC = 0,
1: +  ETHTOOL_A_TUNNEL_UDP_TABLE_SIZE = 1,
1: +  ETHTOOL_A_TUNNEL_UDP_TABLE_TYPES = 2,
1: +  ETHTOOL_A_TUNNEL_UDP_TABLE_ENTRY = 3,
1: +  __ETHTOOL_A_TUNNEL_UDP_TABLE_CNT = 4,
1: +  ETHTOOL_A_TUNNEL_UDP_TABLE_MAX = 3,
1:  };
1:  
1:  enum {
1: -	ETHTOOL_A_TUNNEL_UDP_UNSPEC = 0,
1: -	ETHTOOL_A_TUNNEL_UDP_TABLE = 1,
1: -	__ETHTOOL_A_TUNNEL_UDP_CNT = 2,
1: -	ETHTOOL_A_TUNNEL_UDP_MAX = 1,
1: +  ETHTOOL_A_TUNNEL_UDP_UNSPEC = 0,
1: +  ETHTOOL_A_TUNNEL_UDP_TABLE = 1,
1: +  __ETHTOOL_A_TUNNEL_UDP_CNT = 2,
1: +  ETHTOOL_A_TUNNEL_UDP_MAX = 1,
1:  };
1:  
1:  struct ethnl_tunnel_info_dump_ctx {
1: -	struct ethnl_req_info req_info;
1: -	int pos_hash;
1: -	int pos_idx;
1: +  struct ethnl_req_info req_info;
1: +  int pos_hash;
1: +  int pos_idx;
1:  };
1:  
1:  struct nf_hook_entries_rcu_head {
1: -	struct callback_head head;
1: -	void *allocation;
1: +  struct callback_head head;
1: +  void *allocation;
1:  };
1:  
1:  struct nf_conn;
1: @@ -118617,422 +119954,431 @@ struct nf_conntrack_tuple;
1:  struct nf_conntrack;
1:  
1:  struct nf_ct_hook {
1: -	int (*update)(struct net *, struct sk_buff *);
1: -	void (*destroy)(struct nf_conntrack *);
1: -	bool (*get_tuple_skb)(struct nf_conntrack_tuple *, const struct sk_buff *);
1: +  int (*update)(struct net *, struct sk_buff *);
1: +  void (*destroy)(struct nf_conntrack *);
1: +  bool (*get_tuple_skb)(struct nf_conntrack_tuple *, const struct sk_buff *);
1:  };
1:  
1:  struct nfnl_ct_hook {
1: -	struct nf_conn * (*get_ct)(const struct sk_buff *, enum ip_conntrack_info *);
1: -	size_t (*build_size)(const struct nf_conn *);
1: -	int (*build)(struct sk_buff *, struct nf_conn *, enum ip_conntrack_info, u_int16_t, u_int16_t);
1: -	int (*parse)(const struct nlattr *, struct nf_conn *);
1: -	int (*attach_expect)(const struct nlattr *, struct nf_conn *, u32, u32);
1: -	void (*seq_adjust)(struct sk_buff *, struct nf_conn *, enum ip_conntrack_info, s32);
1: +  struct nf_conn *(*get_ct)(const struct sk_buff *, enum ip_conntrack_info *);
1: +  size_t (*build_size)(const struct nf_conn *);
1: +  int (*build)(struct sk_buff *, struct nf_conn *, enum ip_conntrack_info,
1: +               u_int16_t, u_int16_t);
1: +  int (*parse)(const struct nlattr *, struct nf_conn *);
1: +  int (*attach_expect)(const struct nlattr *, struct nf_conn *, u32, u32);
1: +  void (*seq_adjust)(struct sk_buff *, struct nf_conn *, enum ip_conntrack_info,
1: +                     s32);
1:  };
1:  
1:  struct nf_ipv6_ops {
1: -	void (*route_input)(struct sk_buff *);
1: -	int (*fragment)(struct net *, struct sock *, struct sk_buff *, int (*)(struct net *, struct sock *, struct sk_buff *));
1: -	int (*reroute)(struct sk_buff *, const struct nf_queue_entry *);
1: +  void (*route_input)(struct sk_buff *);
1: +  int (*fragment)(struct net *, struct sock *, struct sk_buff *,
1: +                  int (*)(struct net *, struct sock *, struct sk_buff *));
1: +  int (*reroute)(struct sk_buff *, const struct nf_queue_entry *);
1:  };
1:  
1:  struct nf_queue_entry {
1: -	struct list_head list;
1: -	struct sk_buff *skb;
1: -	unsigned int id;
1: -	unsigned int hook_index;
1: -	struct net_device *physin;
1: -	struct net_device *physout;
1: -	struct nf_hook_state state;
1: -	u16 size;
1: +  struct list_head list;
1: +  struct sk_buff *skb;
1: +  unsigned int id;
1: +  unsigned int hook_index;
1: +  struct net_device *physin;
1: +  struct net_device *physout;
1: +  struct nf_hook_state state;
1: +  u16 size;
1:  };
1:  
1:  struct nf_loginfo {
1: -	u_int8_t type;
1: -	union {
1: -		struct {
1: -			u_int32_t copy_len;
1: -			u_int16_t group;
1: -			u_int16_t qthreshold;
1: -			u_int16_t flags;
1: -		} ulog;
1: -		struct {
1: -			u_int8_t level;
1: -			u_int8_t logflags;
1: -		} log;
1: -	} u;
1: +  u_int8_t type;
1: +  union {
1: +    struct {
1: +      u_int32_t copy_len;
1: +      u_int16_t group;
1: +      u_int16_t qthreshold;
1: +      u_int16_t flags;
1: +    } ulog;
1: +    struct {
1: +      u_int8_t level;
1: +      u_int8_t logflags;
1: +    } log;
1: +  } u;
1:  };
1:  
1:  struct nf_log_buf {
1: -	unsigned int count;
1: -	char buf[1020];
1: +  unsigned int count;
1: +  char buf[1020];
1:  };
1:  
1:  struct nf_bridge_info {
1: -	enum {
1: -		BRNF_PROTO_UNCHANGED = 0,
1: -		BRNF_PROTO_8021Q = 1,
1: -		BRNF_PROTO_PPPOE = 2,
1: -	} orig_proto: 8;
1: -	u8 pkt_otherhost: 1;
1: -	u8 in_prerouting: 1;
1: -	u8 bridged_dnat: 1;
1: -	__u16 frag_max_size;
1: -	struct net_device *physindev;
1: -	struct net_device *physoutdev;
1: -	union {
1: -		__be32 ipv4_daddr;
1: -		struct in6_addr ipv6_daddr;
1: -		char neigh_header[8];
1: -	};
1: +  enum {
1: +    BRNF_PROTO_UNCHANGED = 0,
1: +    BRNF_PROTO_8021Q = 1,
1: +    BRNF_PROTO_PPPOE = 2,
1: +  } orig_proto : 8;
1: +  u8 pkt_otherhost : 1;
1: +  u8 in_prerouting : 1;
1: +  u8 bridged_dnat : 1;
1: +  __u16 frag_max_size;
1: +  struct net_device *physindev;
1: +  struct net_device *physoutdev;
1: +  union {
1: +    __be32 ipv4_daddr;
1: +    struct in6_addr ipv6_daddr;
1: +    char neigh_header[8];
1: +  };
1:  };
1:  
1:  struct ip_rt_info {
1: -	__be32 daddr;
1: -	__be32 saddr;
1: -	u_int8_t tos;
1: -	u_int32_t mark;
1: +  __be32 daddr;
1: +  __be32 saddr;
1: +  u_int8_t tos;
1: +  u_int32_t mark;
1:  };
1:  
1:  struct ip6_rt_info {
1: -	struct in6_addr daddr;
1: -	struct in6_addr saddr;
1: -	u_int32_t mark;
1: +  struct in6_addr daddr;
1: +  struct in6_addr saddr;
1: +  u_int32_t mark;
1:  };
1:  
1:  struct nf_sockopt_ops {
1: -	struct list_head list;
1: -	u_int8_t pf;
1: -	int set_optmin;
1: -	int set_optmax;
1: -	int (*set)(struct sock *, int, sockptr_t, unsigned int);
1: -	int get_optmin;
1: -	int get_optmax;
1: -	int (*get)(struct sock *, int, void *, int *);
1: -	struct module *owner;
1: +  struct list_head list;
1: +  u_int8_t pf;
1: +  int set_optmin;
1: +  int set_optmax;
1: +  int (*set)(struct sock *, int, sockptr_t, unsigned int);
1: +  int get_optmin;
1: +  int get_optmax;
1: +  int (*get)(struct sock *, int, void *, int *);
1: +  struct module *owner;
1:  };
1:  
1:  enum nfnetlink_groups {
1: -	NFNLGRP_NONE = 0,
1: -	NFNLGRP_CONNTRACK_NEW = 1,
1: -	NFNLGRP_CONNTRACK_UPDATE = 2,
1: -	NFNLGRP_CONNTRACK_DESTROY = 3,
1: -	NFNLGRP_CONNTRACK_EXP_NEW = 4,
1: -	NFNLGRP_CONNTRACK_EXP_UPDATE = 5,
1: -	NFNLGRP_CONNTRACK_EXP_DESTROY = 6,
1: -	NFNLGRP_NFTABLES = 7,
1: -	NFNLGRP_ACCT_QUOTA = 8,
1: -	NFNLGRP_NFTRACE = 9,
1: -	__NFNLGRP_MAX = 10,
1: +  NFNLGRP_NONE = 0,
1: +  NFNLGRP_CONNTRACK_NEW = 1,
1: +  NFNLGRP_CONNTRACK_UPDATE = 2,
1: +  NFNLGRP_CONNTRACK_DESTROY = 3,
1: +  NFNLGRP_CONNTRACK_EXP_NEW = 4,
1: +  NFNLGRP_CONNTRACK_EXP_UPDATE = 5,
1: +  NFNLGRP_CONNTRACK_EXP_DESTROY = 6,
1: +  NFNLGRP_NFTABLES = 7,
1: +  NFNLGRP_ACCT_QUOTA = 8,
1: +  NFNLGRP_NFTRACE = 9,
1: +  __NFNLGRP_MAX = 10,
1:  };
1:  
1:  struct nfgenmsg {
1: -	__u8 nfgen_family;
1: -	__u8 version;
1: -	__be16 res_id;
1: +  __u8 nfgen_family;
1: +  __u8 version;
1: +  __be16 res_id;
1:  };
1:  
1:  enum nfnl_batch_attributes {
1: -	NFNL_BATCH_UNSPEC = 0,
1: -	NFNL_BATCH_GENID = 1,
1: -	__NFNL_BATCH_MAX = 2,
1: +  NFNL_BATCH_UNSPEC = 0,
1: +  NFNL_BATCH_GENID = 1,
1: +  __NFNL_BATCH_MAX = 2,
1:  };
1:  
1:  struct nfnl_callback {
1: -	int (*call)(struct net *, struct sock *, struct sk_buff *, const struct nlmsghdr *, const struct nlattr * const *, struct netlink_ext_ack *);
1: -	int (*call_rcu)(struct net *, struct sock *, struct sk_buff *, const struct nlmsghdr *, const struct nlattr * const *, struct netlink_ext_ack *);
1: -	int (*call_batch)(struct net *, struct sock *, struct sk_buff *, const struct nlmsghdr *, const struct nlattr * const *, struct netlink_ext_ack *);
1: -	const struct nla_policy *policy;
1: -	const u_int16_t attr_count;
1: +  int (*call)(struct net *, struct sock *, struct sk_buff *,
1: +              const struct nlmsghdr *, const struct nlattr *const *,
1: +              struct netlink_ext_ack *);
1: +  int (*call_rcu)(struct net *, struct sock *, struct sk_buff *,
1: +                  const struct nlmsghdr *, const struct nlattr *const *,
1: +                  struct netlink_ext_ack *);
1: +  int (*call_batch)(struct net *, struct sock *, struct sk_buff *,
1: +                    const struct nlmsghdr *, const struct nlattr *const *,
1: +                    struct netlink_ext_ack *);
1: +  const struct nla_policy *policy;
1: +  const u_int16_t attr_count;
1:  };
1:  
1:  enum nfnl_abort_action {
1: -	NFNL_ABORT_NONE = 0,
1: -	NFNL_ABORT_AUTOLOAD = 1,
1: -	NFNL_ABORT_VALIDATE = 2,
1: +  NFNL_ABORT_NONE = 0,
1: +  NFNL_ABORT_AUTOLOAD = 1,
1: +  NFNL_ABORT_VALIDATE = 2,
1:  };
1:  
1:  struct nfnetlink_subsystem {
1: -	const char *name;
1: -	__u8 subsys_id;
1: -	__u8 cb_count;
1: -	const struct nfnl_callback *cb;
1: -	struct module *owner;
1: -	int (*commit)(struct net *, struct sk_buff *);
1: -	int (*abort)(struct net *, struct sk_buff *, enum nfnl_abort_action);
1: -	void (*cleanup)(struct net *);
1: -	bool (*valid_genid)(struct net *, u32);
1: +  const char *name;
1: +  __u8 subsys_id;
1: +  __u8 cb_count;
1: +  const struct nfnl_callback *cb;
1: +  struct module *owner;
1: +  int (*commit)(struct net *, struct sk_buff *);
1: +  int (*abort)(struct net *, struct sk_buff *, enum nfnl_abort_action);
1: +  void (*cleanup)(struct net *);
1: +  bool (*valid_genid)(struct net *, u32);
1:  };
1:  
1:  struct nfnl_err {
1: -	struct list_head head;
1: -	struct nlmsghdr *nlh;
1: -	int err;
1: -	struct netlink_ext_ack extack;
1: +  struct list_head head;
1: +  struct nlmsghdr *nlh;
1: +  int err;
1: +  struct netlink_ext_ack extack;
1:  };
1:  
1:  enum {
1: -	NFNL_BATCH_FAILURE = 1,
1: -	NFNL_BATCH_DONE = 2,
1: -	NFNL_BATCH_REPLAY = 4,
1: +  NFNL_BATCH_FAILURE = 1,
1: +  NFNL_BATCH_DONE = 2,
1: +  NFNL_BATCH_REPLAY = 4,
1:  };
1:  
1:  struct nf_conntrack {
1: -	atomic_t use;
1: +  atomic_t use;
1:  };
1:  
1:  enum nfqnl_msg_types {
1: -	NFQNL_MSG_PACKET = 0,
1: -	NFQNL_MSG_VERDICT = 1,
1: -	NFQNL_MSG_CONFIG = 2,
1: -	NFQNL_MSG_VERDICT_BATCH = 3,
1: -	NFQNL_MSG_MAX = 4,
1: +  NFQNL_MSG_PACKET = 0,
1: +  NFQNL_MSG_VERDICT = 1,
1: +  NFQNL_MSG_CONFIG = 2,
1: +  NFQNL_MSG_VERDICT_BATCH = 3,
1: +  NFQNL_MSG_MAX = 4,
1:  };
1:  
1:  struct nfqnl_msg_packet_hdr {
1: -	__be32 packet_id;
1: -	__be16 hw_protocol;
1: -	__u8 hook;
1: +  __be32 packet_id;
1: +  __be16 hw_protocol;
1: +  __u8 hook;
1:  } __attribute__((packed));
1:  
1:  struct nfqnl_msg_packet_hw {
1: -	__be16 hw_addrlen;
1: -	__u16 _pad;
1: -	__u8 hw_addr[8];
1: +  __be16 hw_addrlen;
1: +  __u16 _pad;
1: +  __u8 hw_addr[8];
1:  };
1:  
1:  struct nfqnl_msg_packet_timestamp {
1: -	__be64 sec;
1: -	__be64 usec;
1: +  __be64 sec;
1: +  __be64 usec;
1:  };
1:  
1:  enum nfqnl_vlan_attr {
1: -	NFQA_VLAN_UNSPEC = 0,
1: -	NFQA_VLAN_PROTO = 1,
1: -	NFQA_VLAN_TCI = 2,
1: -	__NFQA_VLAN_MAX = 3,
1: +  NFQA_VLAN_UNSPEC = 0,
1: +  NFQA_VLAN_PROTO = 1,
1: +  NFQA_VLAN_TCI = 2,
1: +  __NFQA_VLAN_MAX = 3,
1:  };
1:  
1:  enum nfqnl_attr_type {
1: -	NFQA_UNSPEC = 0,
1: -	NFQA_PACKET_HDR = 1,
1: -	NFQA_VERDICT_HDR = 2,
1: -	NFQA_MARK = 3,
1: -	NFQA_TIMESTAMP = 4,
1: -	NFQA_IFINDEX_INDEV = 5,
1: -	NFQA_IFINDEX_OUTDEV = 6,
1: -	NFQA_IFINDEX_PHYSINDEV = 7,
1: -	NFQA_IFINDEX_PHYSOUTDEV = 8,
1: -	NFQA_HWADDR = 9,
1: -	NFQA_PAYLOAD = 10,
1: -	NFQA_CT = 11,
1: -	NFQA_CT_INFO = 12,
1: -	NFQA_CAP_LEN = 13,
1: -	NFQA_SKB_INFO = 14,
1: -	NFQA_EXP = 15,
1: -	NFQA_UID = 16,
1: -	NFQA_GID = 17,
1: -	NFQA_SECCTX = 18,
1: -	NFQA_VLAN = 19,
1: -	NFQA_L2HDR = 20,
1: -	__NFQA_MAX = 21,
1: +  NFQA_UNSPEC = 0,
1: +  NFQA_PACKET_HDR = 1,
1: +  NFQA_VERDICT_HDR = 2,
1: +  NFQA_MARK = 3,
1: +  NFQA_TIMESTAMP = 4,
1: +  NFQA_IFINDEX_INDEV = 5,
1: +  NFQA_IFINDEX_OUTDEV = 6,
1: +  NFQA_IFINDEX_PHYSINDEV = 7,
1: +  NFQA_IFINDEX_PHYSOUTDEV = 8,
1: +  NFQA_HWADDR = 9,
1: +  NFQA_PAYLOAD = 10,
1: +  NFQA_CT = 11,
1: +  NFQA_CT_INFO = 12,
1: +  NFQA_CAP_LEN = 13,
1: +  NFQA_SKB_INFO = 14,
1: +  NFQA_EXP = 15,
1: +  NFQA_UID = 16,
1: +  NFQA_GID = 17,
1: +  NFQA_SECCTX = 18,
1: +  NFQA_VLAN = 19,
1: +  NFQA_L2HDR = 20,
1: +  __NFQA_MAX = 21,
1:  };
1:  
1:  struct nfqnl_msg_verdict_hdr {
1: -	__be32 verdict;
1: -	__be32 id;
1: +  __be32 verdict;
1: +  __be32 id;
1:  };
1:  
1:  enum nfqnl_msg_config_cmds {
1: -	NFQNL_CFG_CMD_NONE = 0,
1: -	NFQNL_CFG_CMD_BIND = 1,
1: -	NFQNL_CFG_CMD_UNBIND = 2,
1: -	NFQNL_CFG_CMD_PF_BIND = 3,
1: -	NFQNL_CFG_CMD_PF_UNBIND = 4,
1: +  NFQNL_CFG_CMD_NONE = 0,
1: +  NFQNL_CFG_CMD_BIND = 1,
1: +  NFQNL_CFG_CMD_UNBIND = 2,
1: +  NFQNL_CFG_CMD_PF_BIND = 3,
1: +  NFQNL_CFG_CMD_PF_UNBIND = 4,
1:  };
1:  
1:  struct nfqnl_msg_config_cmd {
1: -	__u8 command;
1: -	__u8 _pad;
1: -	__be16 pf;
1: +  __u8 command;
1: +  __u8 _pad;
1: +  __be16 pf;
1:  };
1:  
1:  enum nfqnl_config_mode {
1: -	NFQNL_COPY_NONE = 0,
1: -	NFQNL_COPY_META = 1,
1: -	NFQNL_COPY_PACKET = 2,
1: +  NFQNL_COPY_NONE = 0,
1: +  NFQNL_COPY_META = 1,
1: +  NFQNL_COPY_PACKET = 2,
1:  };
1:  
1:  struct nfqnl_msg_config_params {
1: -	__be32 copy_range;
1: -	__u8 copy_mode;
1: +  __be32 copy_range;
1: +  __u8 copy_mode;
1:  } __attribute__((packed));
1:  
1:  enum nfqnl_attr_config {
1: -	NFQA_CFG_UNSPEC = 0,
1: -	NFQA_CFG_CMD = 1,
1: -	NFQA_CFG_PARAMS = 2,
1: -	NFQA_CFG_QUEUE_MAXLEN = 3,
1: -	NFQA_CFG_MASK = 4,
1: -	NFQA_CFG_FLAGS = 5,
1: -	__NFQA_CFG_MAX = 6,
1: +  NFQA_CFG_UNSPEC = 0,
1: +  NFQA_CFG_CMD = 1,
1: +  NFQA_CFG_PARAMS = 2,
1: +  NFQA_CFG_QUEUE_MAXLEN = 3,
1: +  NFQA_CFG_MASK = 4,
1: +  NFQA_CFG_FLAGS = 5,
1: +  __NFQA_CFG_MAX = 6,
1:  };
1:  
1:  struct nfqnl_instance {
1: -	struct hlist_node hlist;
1: -	struct callback_head rcu;
1: -	u32 peer_portid;
1: -	unsigned int queue_maxlen;
1: -	unsigned int copy_range;
1: -	unsigned int queue_dropped;
1: -	unsigned int queue_user_dropped;
1: -	u_int16_t queue_num;
1: -	u_int8_t copy_mode;
1: -	u_int32_t flags;
1: -	spinlock_t lock;
1: -	unsigned int queue_total;
1: -	unsigned int id_sequence;
1: -	struct list_head queue_list;
1: -	long: 64;
1: -	long: 64;
1: +  struct hlist_node hlist;
1: +  struct callback_head rcu;
1: +  u32 peer_portid;
1: +  unsigned int queue_maxlen;
1: +  unsigned int copy_range;
1: +  unsigned int queue_dropped;
1: +  unsigned int queue_user_dropped;
1: +  u_int16_t queue_num;
1: +  u_int8_t copy_mode;
1: +  u_int32_t flags;
1: +  spinlock_t lock;
1: +  unsigned int queue_total;
1: +  unsigned int id_sequence;
1: +  struct list_head queue_list;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  typedef int (*nfqnl_cmpfn)(struct nf_queue_entry *, long unsigned int);
1:  
1:  struct nfnl_queue_net {
1: -	spinlock_t instances_lock;
1: -	struct hlist_head instance_table[16];
1: +  spinlock_t instances_lock;
1: +  struct hlist_head instance_table[16];
1:  };
1:  
1:  struct iter_state {
1: -	struct seq_net_private p;
1: -	unsigned int bucket;
1: +  struct seq_net_private p;
1: +  unsigned int bucket;
1:  };
1:  
1:  enum nfulnl_msg_types {
1: -	NFULNL_MSG_PACKET = 0,
1: -	NFULNL_MSG_CONFIG = 1,
1: -	NFULNL_MSG_MAX = 2,
1: +  NFULNL_MSG_PACKET = 0,
1: +  NFULNL_MSG_CONFIG = 1,
1: +  NFULNL_MSG_MAX = 2,
1:  };
1:  
1:  struct nfulnl_msg_packet_hdr {
1: -	__be16 hw_protocol;
1: -	__u8 hook;
1: -	__u8 _pad;
1: +  __be16 hw_protocol;
1: +  __u8 hook;
1: +  __u8 _pad;
1:  };
1:  
1:  struct nfulnl_msg_packet_hw {
1: -	__be16 hw_addrlen;
1: -	__u16 _pad;
1: -	__u8 hw_addr[8];
1: +  __be16 hw_addrlen;
1: +  __u16 _pad;
1: +  __u8 hw_addr[8];
1:  };
1:  
1:  struct nfulnl_msg_packet_timestamp {
1: -	__be64 sec;
1: -	__be64 usec;
1: +  __be64 sec;
1: +  __be64 usec;
1:  };
1:  
1:  enum nfulnl_vlan_attr {
1: -	NFULA_VLAN_UNSPEC = 0,
1: -	NFULA_VLAN_PROTO = 1,
1: -	NFULA_VLAN_TCI = 2,
1: -	__NFULA_VLAN_MAX = 3,
1: +  NFULA_VLAN_UNSPEC = 0,
1: +  NFULA_VLAN_PROTO = 1,
1: +  NFULA_VLAN_TCI = 2,
1: +  __NFULA_VLAN_MAX = 3,
1:  };
1:  
1:  enum nfulnl_attr_type {
1: -	NFULA_UNSPEC = 0,
1: -	NFULA_PACKET_HDR = 1,
1: -	NFULA_MARK = 2,
1: -	NFULA_TIMESTAMP = 3,
1: -	NFULA_IFINDEX_INDEV = 4,
1: -	NFULA_IFINDEX_OUTDEV = 5,
1: -	NFULA_IFINDEX_PHYSINDEV = 6,
1: -	NFULA_IFINDEX_PHYSOUTDEV = 7,
1: -	NFULA_HWADDR = 8,
1: -	NFULA_PAYLOAD = 9,
1: -	NFULA_PREFIX = 10,
1: -	NFULA_UID = 11,
1: -	NFULA_SEQ = 12,
1: -	NFULA_SEQ_GLOBAL = 13,
1: -	NFULA_GID = 14,
1: -	NFULA_HWTYPE = 15,
1: -	NFULA_HWHEADER = 16,
1: -	NFULA_HWLEN = 17,
1: -	NFULA_CT = 18,
1: -	NFULA_CT_INFO = 19,
1: -	NFULA_VLAN = 20,
1: -	NFULA_L2HDR = 21,
1: -	__NFULA_MAX = 22,
1: +  NFULA_UNSPEC = 0,
1: +  NFULA_PACKET_HDR = 1,
1: +  NFULA_MARK = 2,
1: +  NFULA_TIMESTAMP = 3,
1: +  NFULA_IFINDEX_INDEV = 4,
1: +  NFULA_IFINDEX_OUTDEV = 5,
1: +  NFULA_IFINDEX_PHYSINDEV = 6,
1: +  NFULA_IFINDEX_PHYSOUTDEV = 7,
1: +  NFULA_HWADDR = 8,
1: +  NFULA_PAYLOAD = 9,
1: +  NFULA_PREFIX = 10,
1: +  NFULA_UID = 11,
1: +  NFULA_SEQ = 12,
1: +  NFULA_SEQ_GLOBAL = 13,
1: +  NFULA_GID = 14,
1: +  NFULA_HWTYPE = 15,
1: +  NFULA_HWHEADER = 16,
1: +  NFULA_HWLEN = 17,
1: +  NFULA_CT = 18,
1: +  NFULA_CT_INFO = 19,
1: +  NFULA_VLAN = 20,
1: +  NFULA_L2HDR = 21,
1: +  __NFULA_MAX = 22,
1:  };
1:  
1:  enum nfulnl_msg_config_cmds {
1: -	NFULNL_CFG_CMD_NONE = 0,
1: -	NFULNL_CFG_CMD_BIND = 1,
1: -	NFULNL_CFG_CMD_UNBIND = 2,
1: -	NFULNL_CFG_CMD_PF_BIND = 3,
1: -	NFULNL_CFG_CMD_PF_UNBIND = 4,
1: +  NFULNL_CFG_CMD_NONE = 0,
1: +  NFULNL_CFG_CMD_BIND = 1,
1: +  NFULNL_CFG_CMD_UNBIND = 2,
1: +  NFULNL_CFG_CMD_PF_BIND = 3,
1: +  NFULNL_CFG_CMD_PF_UNBIND = 4,
1:  };
1:  
1:  struct nfulnl_msg_config_cmd {
1: -	__u8 command;
1: +  __u8 command;
1:  };
1:  
1:  struct nfulnl_msg_config_mode {
1: -	__be32 copy_range;
1: -	__u8 copy_mode;
1: -	__u8 _pad;
1: +  __be32 copy_range;
1: +  __u8 copy_mode;
1: +  __u8 _pad;
1:  } __attribute__((packed));
1:  
1:  enum nfulnl_attr_config {
1: -	NFULA_CFG_UNSPEC = 0,
1: -	NFULA_CFG_CMD = 1,
1: -	NFULA_CFG_MODE = 2,
1: -	NFULA_CFG_NLBUFSIZ = 3,
1: -	NFULA_CFG_TIMEOUT = 4,
1: -	NFULA_CFG_QTHRESH = 5,
1: -	NFULA_CFG_FLAGS = 6,
1: -	__NFULA_CFG_MAX = 7,
1: +  NFULA_CFG_UNSPEC = 0,
1: +  NFULA_CFG_CMD = 1,
1: +  NFULA_CFG_MODE = 2,
1: +  NFULA_CFG_NLBUFSIZ = 3,
1: +  NFULA_CFG_TIMEOUT = 4,
1: +  NFULA_CFG_QTHRESH = 5,
1: +  NFULA_CFG_FLAGS = 6,
1: +  __NFULA_CFG_MAX = 7,
1:  };
1:  
1:  struct nfulnl_instance {
1: -	struct hlist_node hlist;
1: -	spinlock_t lock;
1: -	refcount_t use;
1: -	unsigned int qlen;
1: -	struct sk_buff *skb;
1: -	struct timer_list timer;
1: -	struct net *net;
1: -	struct user_namespace *peer_user_ns;
1: -	u32 peer_portid;
1: -	unsigned int flushtimeout;
1: -	unsigned int nlbufsiz;
1: -	unsigned int qthreshold;
1: -	u_int32_t copy_range;
1: -	u_int32_t seq;
1: -	u_int16_t group_num;
1: -	u_int16_t flags;
1: -	u_int8_t copy_mode;
1: -	struct callback_head rcu;
1: +  struct hlist_node hlist;
1: +  spinlock_t lock;
1: +  refcount_t use;
1: +  unsigned int qlen;
1: +  struct sk_buff *skb;
1: +  struct timer_list timer;
1: +  struct net *net;
1: +  struct user_namespace *peer_user_ns;
1: +  u32 peer_portid;
1: +  unsigned int flushtimeout;
1: +  unsigned int nlbufsiz;
1: +  unsigned int qthreshold;
1: +  u_int32_t copy_range;
1: +  u_int32_t seq;
1: +  u_int16_t group_num;
1: +  u_int16_t flags;
1: +  u_int8_t copy_mode;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct nfnl_log_net {
1: -	spinlock_t instances_lock;
1: -	struct hlist_head instance_table[16];
1: -	atomic_t global_seq;
1: +  spinlock_t instances_lock;
1: +  struct hlist_head instance_table[16];
1: +  atomic_t global_seq;
1:  };
1:  
1:  struct xt_table_info;
1:  
1:  struct xt_table {
1: -	struct list_head list;
1: -	unsigned int valid_hooks;
1: -	struct xt_table_info *private;
1: -	struct module *me;
1: -	u_int8_t af;
1: -	int priority;
1: -	int (*table_init)(struct net *);
1: -	const char name[32];
1: +  struct list_head list;
1: +  unsigned int valid_hooks;
1: +  struct xt_table_info *private;
1: +  struct module *me;
1: +  u_int8_t af;
1: +  int priority;
1: +  int (*table_init)(struct net *);
1: +  const char name[32];
1:  };
1:  
1:  struct xt_action_param;
1: @@ -119042,38 +120388,38 @@ struct xt_mtchk_param;
1:  struct xt_mtdtor_param;
1:  
1:  struct xt_match {
1: -	struct list_head list;
1: -	const char name[29];
1: -	u_int8_t revision;
1: -	bool (*match)(const struct sk_buff *, struct xt_action_param *);
1: -	int (*checkentry)(const struct xt_mtchk_param *);
1: -	void (*destroy)(const struct xt_mtdtor_param *);
1: -	void (*compat_from_user)(void *, const void *);
1: -	int (*compat_to_user)(void *, const void *);
1: -	struct module *me;
1: -	const char *table;
1: -	unsigned int matchsize;
1: -	unsigned int usersize;
1: -	unsigned int compatsize;
1: -	unsigned int hooks;
1: -	short unsigned int proto;
1: -	short unsigned int family;
1: +  struct list_head list;
1: +  const char name[29];
1: +  u_int8_t revision;
1: +  bool (*match)(const struct sk_buff *, struct xt_action_param *);
1: +  int (*checkentry)(const struct xt_mtchk_param *);
1: +  void (*destroy)(const struct xt_mtdtor_param *);
1: +  void (*compat_from_user)(void *, const void *);
1: +  int (*compat_to_user)(void *, const void *);
1: +  struct module *me;
1: +  const char *table;
1: +  unsigned int matchsize;
1: +  unsigned int usersize;
1: +  unsigned int compatsize;
1: +  unsigned int hooks;
1: +  short unsigned int proto;
1: +  short unsigned int family;
1:  };
1:  
1:  struct xt_entry_match {
1: -	union {
1: -		struct {
1: -			__u16 match_size;
1: -			char name[29];
1: -			__u8 revision;
1: -		} user;
1: -		struct {
1: -			__u16 match_size;
1: -			struct xt_match *match;
1: -		} kernel;
1: -		__u16 match_size;
1: -	} u;
1: -	unsigned char data[0];
1: +  union {
1: +    struct {
1: +      __u16 match_size;
1: +      char name[29];
1: +      __u8 revision;
1: +    } user;
1: +    struct {
1: +      __u16 match_size;
1: +      struct xt_match *match;
1: +    } kernel;
1: +    __u16 match_size;
1: +  } u;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct xt_tgchk_param;
1: @@ -119081,2401 +120427,2412 @@ struct xt_tgchk_param;
1:  struct xt_tgdtor_param;
1:  
1:  struct xt_target {
1: -	struct list_head list;
1: -	const char name[29];
1: -	u_int8_t revision;
1: -	unsigned int (*target)(struct sk_buff *, const struct xt_action_param *);
1: -	int (*checkentry)(const struct xt_tgchk_param *);
1: -	void (*destroy)(const struct xt_tgdtor_param *);
1: -	void (*compat_from_user)(void *, const void *);
1: -	int (*compat_to_user)(void *, const void *);
1: -	struct module *me;
1: -	const char *table;
1: -	unsigned int targetsize;
1: -	unsigned int usersize;
1: -	unsigned int compatsize;
1: -	unsigned int hooks;
1: -	short unsigned int proto;
1: -	short unsigned int family;
1: +  struct list_head list;
1: +  const char name[29];
1: +  u_int8_t revision;
1: +  unsigned int (*target)(struct sk_buff *, const struct xt_action_param *);
1: +  int (*checkentry)(const struct xt_tgchk_param *);
1: +  void (*destroy)(const struct xt_tgdtor_param *);
1: +  void (*compat_from_user)(void *, const void *);
1: +  int (*compat_to_user)(void *, const void *);
1: +  struct module *me;
1: +  const char *table;
1: +  unsigned int targetsize;
1: +  unsigned int usersize;
1: +  unsigned int compatsize;
1: +  unsigned int hooks;
1: +  short unsigned int proto;
1: +  short unsigned int family;
1:  };
1:  
1:  struct xt_entry_target {
1: -	union {
1: -		struct {
1: -			__u16 target_size;
1: -			char name[29];
1: -			__u8 revision;
1: -		} user;
1: -		struct {
1: -			__u16 target_size;
1: -			struct xt_target *target;
1: -		} kernel;
1: -		__u16 target_size;
1: -	} u;
1: -	unsigned char data[0];
1: +  union {
1: +    struct {
1: +      __u16 target_size;
1: +      char name[29];
1: +      __u8 revision;
1: +    } user;
1: +    struct {
1: +      __u16 target_size;
1: +      struct xt_target *target;
1: +    } kernel;
1: +    __u16 target_size;
1: +  } u;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct xt_standard_target {
1: -	struct xt_entry_target target;
1: -	int verdict;
1: +  struct xt_entry_target target;
1: +  int verdict;
1:  };
1:  
1:  struct xt_error_target {
1: -	struct xt_entry_target target;
1: -	char errorname[30];
1: +  struct xt_entry_target target;
1: +  char errorname[30];
1:  };
1:  
1:  struct xt_counters {
1: -	__u64 pcnt;
1: -	__u64 bcnt;
1: +  __u64 pcnt;
1: +  __u64 bcnt;
1:  };
1:  
1:  struct xt_counters_info {
1: -	char name[32];
1: -	unsigned int num_counters;
1: -	struct xt_counters counters[0];
1: +  char name[32];
1: +  unsigned int num_counters;
1: +  struct xt_counters counters[0];
1:  };
1:  
1:  struct xt_action_param {
1: -	union {
1: -		const struct xt_match *match;
1: -		const struct xt_target *target;
1: -	};
1: -	union {
1: -		const void *matchinfo;
1: -		const void *targinfo;
1: -	};
1: -	const struct nf_hook_state *state;
1: -	int fragoff;
1: -	unsigned int thoff;
1: -	bool hotdrop;
1: +  union {
1: +    const struct xt_match *match;
1: +    const struct xt_target *target;
1: +  };
1: +  union {
1: +    const void *matchinfo;
1: +    const void *targinfo;
1: +  };
1: +  const struct nf_hook_state *state;
1: +  int fragoff;
1: +  unsigned int thoff;
1: +  bool hotdrop;
1:  };
1:  
1:  struct xt_mtchk_param {
1: -	struct net *net;
1: -	const char *table;
1: -	const void *entryinfo;
1: -	const struct xt_match *match;
1: -	void *matchinfo;
1: -	unsigned int hook_mask;
1: -	u_int8_t family;
1: -	bool nft_compat;
1: +  struct net *net;
1: +  const char *table;
1: +  const void *entryinfo;
1: +  const struct xt_match *match;
1: +  void *matchinfo;
1: +  unsigned int hook_mask;
1: +  u_int8_t family;
1: +  bool nft_compat;
1:  };
1:  
1:  struct xt_mtdtor_param {
1: -	struct net *net;
1: -	const struct xt_match *match;
1: -	void *matchinfo;
1: -	u_int8_t family;
1: +  struct net *net;
1: +  const struct xt_match *match;
1: +  void *matchinfo;
1: +  u_int8_t family;
1:  };
1:  
1:  struct xt_tgchk_param {
1: -	struct net *net;
1: -	const char *table;
1: -	const void *entryinfo;
1: -	const struct xt_target *target;
1: -	void *targinfo;
1: -	unsigned int hook_mask;
1: -	u_int8_t family;
1: -	bool nft_compat;
1: +  struct net *net;
1: +  const char *table;
1: +  const void *entryinfo;
1: +  const struct xt_target *target;
1: +  void *targinfo;
1: +  unsigned int hook_mask;
1: +  u_int8_t family;
1: +  bool nft_compat;
1:  };
1:  
1:  struct xt_tgdtor_param {
1: -	struct net *net;
1: -	const struct xt_target *target;
1: -	void *targinfo;
1: -	u_int8_t family;
1: +  struct net *net;
1: +  const struct xt_target *target;
1: +  void *targinfo;
1: +  u_int8_t family;
1:  };
1:  
1:  struct xt_table_info {
1: -	unsigned int size;
1: -	unsigned int number;
1: -	unsigned int initial_entries;
1: -	unsigned int hook_entry[5];
1: -	unsigned int underflow[5];
1: -	unsigned int stacksize;
1: -	void ***jumpstack;
1: -	unsigned char entries[0];
1: +  unsigned int size;
1: +  unsigned int number;
1: +  unsigned int initial_entries;
1: +  unsigned int hook_entry[5];
1: +  unsigned int underflow[5];
1: +  unsigned int stacksize;
1: +  void ***jumpstack;
1: +  unsigned char entries[0];
1:  };
1:  
1:  struct xt_percpu_counter_alloc_state {
1: -	unsigned int off;
1: -	const char *mem;
1: +  unsigned int off;
1: +  const char *mem;
1:  };
1:  
1:  struct compat_xt_entry_match {
1: -	union {
1: -		struct {
1: -			u_int16_t match_size;
1: -			char name[29];
1: -			u_int8_t revision;
1: -		} user;
1: -		struct {
1: -			u_int16_t match_size;
1: -			compat_uptr_t match;
1: -		} kernel;
1: -		u_int16_t match_size;
1: -	} u;
1: -	unsigned char data[0];
1: +  union {
1: +    struct {
1: +      u_int16_t match_size;
1: +      char name[29];
1: +      u_int8_t revision;
1: +    } user;
1: +    struct {
1: +      u_int16_t match_size;
1: +      compat_uptr_t match;
1: +    } kernel;
1: +    u_int16_t match_size;
1: +  } u;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct compat_xt_entry_target {
1: -	union {
1: -		struct {
1: -			u_int16_t target_size;
1: -			char name[29];
1: -			u_int8_t revision;
1: -		} user;
1: -		struct {
1: -			u_int16_t target_size;
1: -			compat_uptr_t target;
1: -		} kernel;
1: -		u_int16_t target_size;
1: -	} u;
1: -	unsigned char data[0];
1: +  union {
1: +    struct {
1: +      u_int16_t target_size;
1: +      char name[29];
1: +      u_int8_t revision;
1: +    } user;
1: +    struct {
1: +      u_int16_t target_size;
1: +      compat_uptr_t target;
1: +    } kernel;
1: +    u_int16_t target_size;
1: +  } u;
1: +  unsigned char data[0];
1:  };
1:  
1:  struct compat_xt_counters {
1: -	compat_u64 pcnt;
1: -	compat_u64 bcnt;
1: +  compat_u64 pcnt;
1: +  compat_u64 bcnt;
1:  };
1:  
1:  struct compat_xt_counters_info {
1: -	char name[32];
1: -	compat_uint_t num_counters;
1: -	struct compat_xt_counters counters[0];
1: +  char name[32];
1: +  compat_uint_t num_counters;
1: +  struct compat_xt_counters counters[0];
1:  } __attribute__((packed));
1:  
1:  struct compat_delta {
1: -	unsigned int offset;
1: -	int delta;
1: +  unsigned int offset;
1: +  int delta;
1:  };
1:  
1:  struct xt_af {
1: -	struct mutex mutex;
1: -	struct list_head match;
1: -	struct list_head target;
1: -	struct mutex compat_mutex;
1: -	struct compat_delta *compat_tab;
1: -	unsigned int number;
1: -	unsigned int cur;
1: +  struct mutex mutex;
1: +  struct list_head match;
1: +  struct list_head target;
1: +  struct mutex compat_mutex;
1: +  struct compat_delta *compat_tab;
1: +  unsigned int number;
1: +  unsigned int cur;
1:  };
1:  
1:  struct compat_xt_standard_target {
1: -	struct compat_xt_entry_target t;
1: -	compat_uint_t verdict;
1: +  struct compat_xt_entry_target t;
1: +  compat_uint_t verdict;
1:  };
1:  
1:  struct compat_xt_error_target {
1: -	struct compat_xt_entry_target t;
1: -	char errorname[30];
1: +  struct compat_xt_entry_target t;
1: +  char errorname[30];
1:  };
1:  
1:  struct nf_mttg_trav {
1: -	struct list_head *head;
1: -	struct list_head *curr;
1: -	uint8_t class;
1: +  struct list_head *head;
1: +  struct list_head *curr;
1: +  uint8_t class;
1:  };
1:  
1:  enum {
1: -	MTTG_TRAV_INIT = 0,
1: -	MTTG_TRAV_NFP_UNSPEC = 1,
1: -	MTTG_TRAV_NFP_SPEC = 2,
1: -	MTTG_TRAV_DONE = 3,
1: +  MTTG_TRAV_INIT = 0,
1: +  MTTG_TRAV_NFP_UNSPEC = 1,
1: +  MTTG_TRAV_NFP_SPEC = 2,
1: +  MTTG_TRAV_DONE = 3,
1:  };
1:  
1:  struct xt_tcp {
1: -	__u16 spts[2];
1: -	__u16 dpts[2];
1: -	__u8 option;
1: -	__u8 flg_mask;
1: -	__u8 flg_cmp;
1: -	__u8 invflags;
1: +  __u16 spts[2];
1: +  __u16 dpts[2];
1: +  __u8 option;
1: +  __u8 flg_mask;
1: +  __u8 flg_cmp;
1: +  __u8 invflags;
1:  };
1:  
1:  struct xt_udp {
1: -	__u16 spts[2];
1: -	__u16 dpts[2];
1: -	__u8 invflags;
1: +  __u16 spts[2];
1: +  __u16 dpts[2];
1: +  __u8 invflags;
1:  };
1:  
1:  struct xt_bpf_info {
1: -	__u16 bpf_program_num_elem;
1: -	struct sock_filter bpf_program[64];
1: -	struct bpf_prog *filter;
1: +  __u16 bpf_program_num_elem;
1: +  struct sock_filter bpf_program[64];
1: +  struct bpf_prog *filter;
1:  };
1:  
1:  enum xt_bpf_modes {
1: -	XT_BPF_MODE_BYTECODE = 0,
1: -	XT_BPF_MODE_FD_PINNED = 1,
1: -	XT_BPF_MODE_FD_ELF = 2,
1: +  XT_BPF_MODE_BYTECODE = 0,
1: +  XT_BPF_MODE_FD_PINNED = 1,
1: +  XT_BPF_MODE_FD_ELF = 2,
1:  };
1:  
1:  struct xt_bpf_info_v1 {
1: -	__u16 mode;
1: -	__u16 bpf_program_num_elem;
1: -	__s32 fd;
1: -	union {
1: -		struct sock_filter bpf_program[64];
1: -		char path[512];
1: -	};
1: -	struct bpf_prog *filter;
1: +  __u16 mode;
1: +  __u16 bpf_program_num_elem;
1: +  __s32 fd;
1: +  union {
1: +    struct sock_filter bpf_program[64];
1: +    char path[512];
1: +  };
1: +  struct bpf_prog *filter;
1:  };
1:  
1:  enum xt_statistic_mode {
1: -	XT_STATISTIC_MODE_RANDOM = 0,
1: -	XT_STATISTIC_MODE_NTH = 1,
1: -	__XT_STATISTIC_MODE_MAX = 2,
1: +  XT_STATISTIC_MODE_RANDOM = 0,
1: +  XT_STATISTIC_MODE_NTH = 1,
1: +  __XT_STATISTIC_MODE_MAX = 2,
1:  };
1:  
1:  enum xt_statistic_flags {
1: -	XT_STATISTIC_INVERT = 1,
1: +  XT_STATISTIC_INVERT = 1,
1:  };
1:  
1:  struct xt_statistic_priv;
1:  
1:  struct xt_statistic_info {
1: -	__u16 mode;
1: -	__u16 flags;
1: -	union {
1: -		struct {
1: -			__u32 probability;
1: -		} random;
1: -		struct {
1: -			__u32 every;
1: -			__u32 packet;
1: -			__u32 count;
1: -		} nth;
1: -	} u;
1: -	struct xt_statistic_priv *master;
1: +  __u16 mode;
1: +  __u16 flags;
1: +  union {
1: +    struct {
1: +      __u32 probability;
1: +    } random;
1: +    struct {
1: +      __u32 every;
1: +      __u32 packet;
1: +      __u32 count;
1: +    } nth;
1: +  } u;
1: +  struct xt_statistic_priv *master;
1:  };
1:  
1:  struct xt_statistic_priv {
1: -	atomic_t count;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  atomic_t count;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct mr_table_ops {
1: -	const struct rhashtable_params *rht_params;
1: -	void *cmparg_any;
1: +  const struct rhashtable_params *rht_params;
1: +  void *cmparg_any;
1:  };
1:  
1:  struct vif_device {
1: -	struct net_device *dev;
1: -	long unsigned int bytes_in;
1: -	long unsigned int bytes_out;
1: -	long unsigned int pkt_in;
1: -	long unsigned int pkt_out;
1: -	long unsigned int rate_limit;
1: -	unsigned char threshold;
1: -	short unsigned int flags;
1: -	int link;
1: -	struct netdev_phys_item_id dev_parent_id;
1: -	__be32 local;
1: -	__be32 remote;
1: +  struct net_device *dev;
1: +  long unsigned int bytes_in;
1: +  long unsigned int bytes_out;
1: +  long unsigned int pkt_in;
1: +  long unsigned int pkt_out;
1: +  long unsigned int rate_limit;
1: +  unsigned char threshold;
1: +  short unsigned int flags;
1: +  int link;
1: +  struct netdev_phys_item_id dev_parent_id;
1: +  __be32 local;
1: +  __be32 remote;
1:  };
1:  
1:  struct mr_table {
1: -	struct list_head list;
1: -	possible_net_t net;
1: -	struct mr_table_ops ops;
1: -	u32 id;
1: -	struct sock *mroute_sk;
1: -	struct timer_list ipmr_expire_timer;
1: -	struct list_head mfc_unres_queue;
1: -	struct vif_device vif_table[32];
1: -	struct rhltable mfc_hash;
1: -	struct list_head mfc_cache_list;
1: -	int maxvif;
1: -	atomic_t cache_resolve_queue_len;
1: -	bool mroute_do_assert;
1: -	bool mroute_do_pim;
1: -	bool mroute_do_wrvifwhole;
1: -	int mroute_reg_vif_num;
1: +  struct list_head list;
1: +  possible_net_t net;
1: +  struct mr_table_ops ops;
1: +  u32 id;
1: +  struct sock *mroute_sk;
1: +  struct timer_list ipmr_expire_timer;
1: +  struct list_head mfc_unres_queue;
1: +  struct vif_device vif_table[32];
1: +  struct rhltable mfc_hash;
1: +  struct list_head mfc_cache_list;
1: +  int maxvif;
1: +  atomic_t cache_resolve_queue_len;
1: +  bool mroute_do_assert;
1: +  bool mroute_do_pim;
1: +  bool mroute_do_wrvifwhole;
1: +  int mroute_reg_vif_num;
1:  };
1:  
1:  struct rtmsg {
1: -	unsigned char rtm_family;
1: -	unsigned char rtm_dst_len;
1: -	unsigned char rtm_src_len;
1: -	unsigned char rtm_tos;
1: -	unsigned char rtm_table;
1: -	unsigned char rtm_protocol;
1: -	unsigned char rtm_scope;
1: -	unsigned char rtm_type;
1: -	unsigned int rtm_flags;
1: +  unsigned char rtm_family;
1: +  unsigned char rtm_dst_len;
1: +  unsigned char rtm_src_len;
1: +  unsigned char rtm_tos;
1: +  unsigned char rtm_table;
1: +  unsigned char rtm_protocol;
1: +  unsigned char rtm_scope;
1: +  unsigned char rtm_type;
1: +  unsigned int rtm_flags;
1:  };
1:  
1:  struct rtvia {
1: -	__kernel_sa_family_t rtvia_family;
1: -	__u8 rtvia_addr[0];
1: +  __kernel_sa_family_t rtvia_family;
1: +  __u8 rtvia_addr[0];
1:  };
1:  
1:  struct ip_sf_list;
1:  
1:  struct ip_mc_list {
1: -	struct in_device *interface;
1: -	__be32 multiaddr;
1: -	unsigned int sfmode;
1: -	struct ip_sf_list *sources;
1: -	struct ip_sf_list *tomb;
1: -	long unsigned int sfcount[2];
1: -	union {
1: -		struct ip_mc_list *next;
1: -		struct ip_mc_list *next_rcu;
1: -	};
1: -	struct ip_mc_list *next_hash;
1: -	struct timer_list timer;
1: -	int users;
1: -	refcount_t refcnt;
1: -	spinlock_t lock;
1: -	char tm_running;
1: -	char reporter;
1: -	char unsolicit_count;
1: -	char loaded;
1: -	unsigned char gsquery;
1: -	unsigned char crcount;
1: -	struct callback_head rcu;
1: +  struct in_device *interface;
1: +  __be32 multiaddr;
1: +  unsigned int sfmode;
1: +  struct ip_sf_list *sources;
1: +  struct ip_sf_list *tomb;
1: +  long unsigned int sfcount[2];
1: +  union {
1: +    struct ip_mc_list *next;
1: +    struct ip_mc_list *next_rcu;
1: +  };
1: +  struct ip_mc_list *next_hash;
1: +  struct timer_list timer;
1: +  int users;
1: +  refcount_t refcnt;
1: +  spinlock_t lock;
1: +  char tm_running;
1: +  char reporter;
1: +  char unsolicit_count;
1: +  char loaded;
1: +  unsigned char gsquery;
1: +  unsigned char crcount;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ip_sf_list {
1: -	struct ip_sf_list *sf_next;
1: -	long unsigned int sf_count[2];
1: -	__be32 sf_inaddr;
1: -	unsigned char sf_gsresp;
1: -	unsigned char sf_oldin;
1: -	unsigned char sf_crcount;
1: +  struct ip_sf_list *sf_next;
1: +  long unsigned int sf_count[2];
1: +  __be32 sf_inaddr;
1: +  unsigned char sf_gsresp;
1: +  unsigned char sf_oldin;
1: +  unsigned char sf_crcount;
1:  };
1:  
1:  struct ipv4_addr_key {
1: -	__be32 addr;
1: -	int vif;
1: +  __be32 addr;
1: +  int vif;
1:  };
1:  
1:  struct inetpeer_addr {
1: -	union {
1: -		struct ipv4_addr_key a4;
1: -		struct in6_addr a6;
1: -		u32 key[4];
1: -	};
1: -	__u16 family;
1: +  union {
1: +    struct ipv4_addr_key a4;
1: +    struct in6_addr a6;
1: +    u32 key[4];
1: +  };
1: +  __u16 family;
1:  };
1:  
1:  struct inet_peer {
1: -	struct rb_node rb_node;
1: -	struct inetpeer_addr daddr;
1: -	u32 metrics[17];
1: -	u32 rate_tokens;
1: -	u32 n_redirects;
1: -	long unsigned int rate_last;
1: -	union {
1: -		struct {
1: -			atomic_t rid;
1: -		};
1: -		struct callback_head rcu;
1: -	};
1: -	__u32 dtime;
1: -	refcount_t refcnt;
1: +  struct rb_node rb_node;
1: +  struct inetpeer_addr daddr;
1: +  u32 metrics[17];
1: +  u32 rate_tokens;
1: +  u32 n_redirects;
1: +  long unsigned int rate_last;
1: +  union {
1: +    struct {
1: +      atomic_t rid;
1: +    };
1: +    struct callback_head rcu;
1: +  };
1: +  __u32 dtime;
1: +  refcount_t refcnt;
1:  };
1:  
1:  struct uncached_list {
1: -	spinlock_t lock;
1: -	struct list_head head;
1: +  spinlock_t lock;
1: +  struct list_head head;
1:  };
1:  
1:  struct ip_rt_acct {
1: -	__u32 o_bytes;
1: -	__u32 o_packets;
1: -	__u32 i_bytes;
1: -	__u32 i_packets;
1: +  __u32 o_bytes;
1: +  __u32 o_packets;
1: +  __u32 i_bytes;
1: +  __u32 i_packets;
1:  };
1:  
1:  struct rt_cache_stat {
1: -	unsigned int in_slow_tot;
1: -	unsigned int in_slow_mc;
1: -	unsigned int in_no_route;
1: -	unsigned int in_brd;
1: -	unsigned int in_martian_dst;
1: -	unsigned int in_martian_src;
1: -	unsigned int out_slow_tot;
1: -	unsigned int out_slow_mc;
1: +  unsigned int in_slow_tot;
1: +  unsigned int in_slow_mc;
1: +  unsigned int in_no_route;
1: +  unsigned int in_brd;
1: +  unsigned int in_martian_dst;
1: +  unsigned int in_martian_src;
1: +  unsigned int out_slow_tot;
1: +  unsigned int out_slow_mc;
1:  };
1:  
1:  struct fib_alias {
1: -	struct hlist_node fa_list;
1: -	struct fib_info *fa_info;
1: -	u8 fa_tos;
1: -	u8 fa_type;
1: -	u8 fa_state;
1: -	u8 fa_slen;
1: -	u32 tb_id;
1: -	s16 fa_default;
1: -	u8 offload: 1;
1: -	u8 trap: 1;
1: -	u8 unused: 6;
1: -	struct callback_head rcu;
1: +  struct hlist_node fa_list;
1: +  struct fib_info *fa_info;
1: +  u8 fa_tos;
1: +  u8 fa_type;
1: +  u8 fa_state;
1: +  u8 fa_slen;
1: +  u32 tb_id;
1: +  s16 fa_default;
1: +  u8 offload : 1;
1: +  u8 trap : 1;
1: +  u8 unused : 6;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct fib_prop {
1: -	int error;
1: -	u8 scope;
1: +  int error;
1: +  u8 scope;
1:  };
1:  
1:  struct net_offload {
1: -	struct offload_callbacks callbacks;
1: -	unsigned int flags;
1: +  struct offload_callbacks callbacks;
1: +  unsigned int flags;
1:  };
1:  
1:  struct raw_hashinfo {
1: -	rwlock_t lock;
1: -	struct hlist_head ht[256];
1: +  rwlock_t lock;
1: +  struct hlist_head ht[256];
1:  };
1:  
1:  enum ip_defrag_users {
1: -	IP_DEFRAG_LOCAL_DELIVER = 0,
1: -	IP_DEFRAG_CALL_RA_CHAIN = 1,
1: -	IP_DEFRAG_CONNTRACK_IN = 2,
1: -	__IP_DEFRAG_CONNTRACK_IN_END = 65537,
1: -	IP_DEFRAG_CONNTRACK_OUT = 65538,
1: -	__IP_DEFRAG_CONNTRACK_OUT_END = 131073,
1: -	IP_DEFRAG_CONNTRACK_BRIDGE_IN = 131074,
1: -	__IP_DEFRAG_CONNTRACK_BRIDGE_IN = 196609,
1: -	IP_DEFRAG_VS_IN = 196610,
1: -	IP_DEFRAG_VS_OUT = 196611,
1: -	IP_DEFRAG_VS_FWD = 196612,
1: -	IP_DEFRAG_AF_PACKET = 196613,
1: -	IP_DEFRAG_MACVLAN = 196614,
1: +  IP_DEFRAG_LOCAL_DELIVER = 0,
1: +  IP_DEFRAG_CALL_RA_CHAIN = 1,
1: +  IP_DEFRAG_CONNTRACK_IN = 2,
1: +  __IP_DEFRAG_CONNTRACK_IN_END = 65537,
1: +  IP_DEFRAG_CONNTRACK_OUT = 65538,
1: +  __IP_DEFRAG_CONNTRACK_OUT_END = 131073,
1: +  IP_DEFRAG_CONNTRACK_BRIDGE_IN = 131074,
1: +  __IP_DEFRAG_CONNTRACK_BRIDGE_IN = 196609,
1: +  IP_DEFRAG_VS_IN = 196610,
1: +  IP_DEFRAG_VS_OUT = 196611,
1: +  IP_DEFRAG_VS_FWD = 196612,
1: +  IP_DEFRAG_AF_PACKET = 196613,
1: +  IP_DEFRAG_MACVLAN = 196614,
1:  };
1:  
1:  enum {
1: -	INET_FRAG_FIRST_IN = 1,
1: -	INET_FRAG_LAST_IN = 2,
1: -	INET_FRAG_COMPLETE = 4,
1: -	INET_FRAG_HASH_DEAD = 8,
1: +  INET_FRAG_FIRST_IN = 1,
1: +  INET_FRAG_LAST_IN = 2,
1: +  INET_FRAG_COMPLETE = 4,
1: +  INET_FRAG_HASH_DEAD = 8,
1:  };
1:  
1:  struct ipq {
1: -	struct inet_frag_queue q;
1: -	u8 ecn;
1: -	u16 max_df_size;
1: -	int iif;
1: -	unsigned int rid;
1: -	struct inet_peer *peer;
1: +  struct inet_frag_queue q;
1: +  u8 ecn;
1: +  u16 max_df_size;
1: +  int iif;
1: +  unsigned int rid;
1: +  struct inet_peer *peer;
1:  };
1:  
1:  struct ip_options_data {
1: -	struct ip_options_rcu opt;
1: -	char data[40];
1: +  struct ip_options_rcu opt;
1: +  char data[40];
1:  };
1:  
1:  struct ipcm_cookie {
1: -	struct sockcm_cookie sockc;
1: -	__be32 addr;
1: -	int oif;
1: -	struct ip_options_rcu *opt;
1: -	__u8 ttl;
1: -	__s16 tos;
1: -	char priority;
1: -	__u16 gso_size;
1: +  struct sockcm_cookie sockc;
1: +  __be32 addr;
1: +  int oif;
1: +  struct ip_options_rcu *opt;
1: +  __u8 ttl;
1: +  __s16 tos;
1: +  char priority;
1: +  __u16 gso_size;
1:  };
1:  
1:  struct ip_fraglist_iter {
1: -	struct sk_buff *frag;
1: -	struct iphdr *iph;
1: -	int offset;
1: -	unsigned int hlen;
1: +  struct sk_buff *frag;
1: +  struct iphdr *iph;
1: +  int offset;
1: +  unsigned int hlen;
1:  };
1:  
1:  struct ip_frag_state {
1: -	bool DF;
1: -	unsigned int hlen;
1: -	unsigned int ll_rs;
1: -	unsigned int mtu;
1: -	unsigned int left;
1: -	int offset;
1: -	int ptr;
1: -	__be16 not_last_frag;
1: +  bool DF;
1: +  unsigned int hlen;
1: +  unsigned int ll_rs;
1: +  unsigned int mtu;
1: +  unsigned int left;
1: +  int offset;
1: +  int ptr;
1: +  __be16 not_last_frag;
1:  };
1:  
1:  struct ip_reply_arg {
1: -	struct kvec iov[1];
1: -	int flags;
1: -	__wsum csum;
1: -	int csumoffset;
1: -	int bound_dev_if;
1: -	u8 tos;
1: -	kuid_t uid;
1: +  struct kvec iov[1];
1: +  int flags;
1: +  __wsum csum;
1: +  int csumoffset;
1: +  int bound_dev_if;
1: +  u8 tos;
1: +  kuid_t uid;
1:  };
1:  
1:  struct ip_mreq_source {
1: -	__be32 imr_multiaddr;
1: -	__be32 imr_interface;
1: -	__be32 imr_sourceaddr;
1: +  __be32 imr_multiaddr;
1: +  __be32 imr_interface;
1: +  __be32 imr_sourceaddr;
1:  };
1:  
1:  struct ip_msfilter {
1: -	__be32 imsf_multiaddr;
1: -	__be32 imsf_interface;
1: -	__u32 imsf_fmode;
1: -	__u32 imsf_numsrc;
1: -	__be32 imsf_slist[1];
1: +  __be32 imsf_multiaddr;
1: +  __be32 imsf_interface;
1: +  __u32 imsf_fmode;
1: +  __u32 imsf_numsrc;
1: +  __be32 imsf_slist[1];
1:  };
1:  
1:  struct group_req {
1: -	__u32 gr_interface;
1: -	struct __kernel_sockaddr_storage gr_group;
1: +  __u32 gr_interface;
1: +  struct __kernel_sockaddr_storage gr_group;
1:  };
1:  
1:  struct group_source_req {
1: -	__u32 gsr_interface;
1: -	struct __kernel_sockaddr_storage gsr_group;
1: -	struct __kernel_sockaddr_storage gsr_source;
1: +  __u32 gsr_interface;
1: +  struct __kernel_sockaddr_storage gsr_group;
1: +  struct __kernel_sockaddr_storage gsr_source;
1:  };
1:  
1:  struct group_filter {
1: -	__u32 gf_interface;
1: -	struct __kernel_sockaddr_storage gf_group;
1: -	__u32 gf_fmode;
1: -	__u32 gf_numsrc;
1: -	struct __kernel_sockaddr_storage gf_slist[1];
1: +  __u32 gf_interface;
1: +  struct __kernel_sockaddr_storage gf_group;
1: +  __u32 gf_fmode;
1: +  __u32 gf_numsrc;
1: +  struct __kernel_sockaddr_storage gf_slist[1];
1:  };
1:  
1:  struct in_pktinfo {
1: -	int ipi_ifindex;
1: -	struct in_addr ipi_spec_dst;
1: -	struct in_addr ipi_addr;
1: +  int ipi_ifindex;
1: +  struct in_addr ipi_spec_dst;
1: +  struct in_addr ipi_addr;
1:  };
1:  
1:  struct compat_group_req {
1: -	__u32 gr_interface;
1: -	struct __kernel_sockaddr_storage gr_group;
1: +  __u32 gr_interface;
1: +  struct __kernel_sockaddr_storage gr_group;
1:  } __attribute__((packed));
1:  
1:  struct compat_group_source_req {
1: -	__u32 gsr_interface;
1: -	struct __kernel_sockaddr_storage gsr_group;
1: -	struct __kernel_sockaddr_storage gsr_source;
1: +  __u32 gsr_interface;
1: +  struct __kernel_sockaddr_storage gsr_group;
1: +  struct __kernel_sockaddr_storage gsr_source;
1:  } __attribute__((packed));
1:  
1:  struct compat_group_filter {
1: -	__u32 gf_interface;
1: -	struct __kernel_sockaddr_storage gf_group;
1: -	__u32 gf_fmode;
1: -	__u32 gf_numsrc;
1: -	struct __kernel_sockaddr_storage gf_slist[1];
1: +  __u32 gf_interface;
1: +  struct __kernel_sockaddr_storage gf_group;
1: +  __u32 gf_fmode;
1: +  __u32 gf_numsrc;
1: +  struct __kernel_sockaddr_storage gf_slist[1];
1:  } __attribute__((packed));
1:  
1:  enum {
1: -	BPFILTER_IPT_SO_SET_REPLACE = 64,
1: -	BPFILTER_IPT_SO_SET_ADD_COUNTERS = 65,
1: -	BPFILTER_IPT_SET_MAX = 66,
1: +  BPFILTER_IPT_SO_SET_REPLACE = 64,
1: +  BPFILTER_IPT_SO_SET_ADD_COUNTERS = 65,
1: +  BPFILTER_IPT_SET_MAX = 66,
1:  };
1:  
1:  enum {
1: -	BPFILTER_IPT_SO_GET_INFO = 64,
1: -	BPFILTER_IPT_SO_GET_ENTRIES = 65,
1: -	BPFILTER_IPT_SO_GET_REVISION_MATCH = 66,
1: -	BPFILTER_IPT_SO_GET_REVISION_TARGET = 67,
1: -	BPFILTER_IPT_GET_MAX = 68,
1: +  BPFILTER_IPT_SO_GET_INFO = 64,
1: +  BPFILTER_IPT_SO_GET_ENTRIES = 65,
1: +  BPFILTER_IPT_SO_GET_REVISION_MATCH = 66,
1: +  BPFILTER_IPT_SO_GET_REVISION_TARGET = 67,
1: +  BPFILTER_IPT_GET_MAX = 68,
1:  };
1:  
1:  struct tcpvegas_info {
1: -	__u32 tcpv_enabled;
1: -	__u32 tcpv_rttcnt;
1: -	__u32 tcpv_rtt;
1: -	__u32 tcpv_minrtt;
1: +  __u32 tcpv_enabled;
1: +  __u32 tcpv_rttcnt;
1: +  __u32 tcpv_rtt;
1: +  __u32 tcpv_minrtt;
1:  };
1:  
1:  struct tcp_dctcp_info {
1: -	__u16 dctcp_enabled;
1: -	__u16 dctcp_ce_state;
1: -	__u32 dctcp_alpha;
1: -	__u32 dctcp_ab_ecn;
1: -	__u32 dctcp_ab_tot;
1: +  __u16 dctcp_enabled;
1: +  __u16 dctcp_ce_state;
1: +  __u32 dctcp_alpha;
1: +  __u32 dctcp_ab_ecn;
1: +  __u32 dctcp_ab_tot;
1:  };
1:  
1:  struct tcp_bbr_info {
1: -	__u32 bbr_bw_lo;
1: -	__u32 bbr_bw_hi;
1: -	__u32 bbr_min_rtt;
1: -	__u32 bbr_pacing_gain;
1: -	__u32 bbr_cwnd_gain;
1: +  __u32 bbr_bw_lo;
1: +  __u32 bbr_bw_hi;
1: +  __u32 bbr_min_rtt;
1: +  __u32 bbr_pacing_gain;
1: +  __u32 bbr_cwnd_gain;
1:  };
1:  
1:  union tcp_cc_info {
1: -	struct tcpvegas_info vegas;
1: -	struct tcp_dctcp_info dctcp;
1: -	struct tcp_bbr_info bbr;
1: +  struct tcpvegas_info vegas;
1: +  struct tcp_dctcp_info dctcp;
1: +  struct tcp_bbr_info bbr;
1:  };
1:  
1:  enum {
1: -	BPF_TCP_ESTABLISHED = 1,
1: -	BPF_TCP_SYN_SENT = 2,
1: -	BPF_TCP_SYN_RECV = 3,
1: -	BPF_TCP_FIN_WAIT1 = 4,
1: -	BPF_TCP_FIN_WAIT2 = 5,
1: -	BPF_TCP_TIME_WAIT = 6,
1: -	BPF_TCP_CLOSE = 7,
1: -	BPF_TCP_CLOSE_WAIT = 8,
1: -	BPF_TCP_LAST_ACK = 9,
1: -	BPF_TCP_LISTEN = 10,
1: -	BPF_TCP_CLOSING = 11,
1: -	BPF_TCP_NEW_SYN_RECV = 12,
1: -	BPF_TCP_MAX_STATES = 13,
1: +  BPF_TCP_ESTABLISHED = 1,
1: +  BPF_TCP_SYN_SENT = 2,
1: +  BPF_TCP_SYN_RECV = 3,
1: +  BPF_TCP_FIN_WAIT1 = 4,
1: +  BPF_TCP_FIN_WAIT2 = 5,
1: +  BPF_TCP_TIME_WAIT = 6,
1: +  BPF_TCP_CLOSE = 7,
1: +  BPF_TCP_CLOSE_WAIT = 8,
1: +  BPF_TCP_LAST_ACK = 9,
1: +  BPF_TCP_LISTEN = 10,
1: +  BPF_TCP_CLOSING = 11,
1: +  BPF_TCP_NEW_SYN_RECV = 12,
1: +  BPF_TCP_MAX_STATES = 13,
1:  };
1:  
1:  enum inet_csk_ack_state_t {
1: -	ICSK_ACK_SCHED = 1,
1: -	ICSK_ACK_TIMER = 2,
1: -	ICSK_ACK_PUSHED = 4,
1: -	ICSK_ACK_PUSHED2 = 8,
1: -	ICSK_ACK_NOW = 16,
1: +  ICSK_ACK_SCHED = 1,
1: +  ICSK_ACK_TIMER = 2,
1: +  ICSK_ACK_PUSHED = 4,
1: +  ICSK_ACK_PUSHED2 = 8,
1: +  ICSK_ACK_NOW = 16,
1:  };
1:  
1:  enum {
1: -	TCP_FLAG_CWR = 32768,
1: -	TCP_FLAG_ECE = 16384,
1: -	TCP_FLAG_URG = 8192,
1: -	TCP_FLAG_ACK = 4096,
1: -	TCP_FLAG_PSH = 2048,
1: -	TCP_FLAG_RST = 1024,
1: -	TCP_FLAG_SYN = 512,
1: -	TCP_FLAG_FIN = 256,
1: -	TCP_RESERVED_BITS = 15,
1: -	TCP_DATA_OFFSET = 240,
1: +  TCP_FLAG_CWR = 32768,
1: +  TCP_FLAG_ECE = 16384,
1: +  TCP_FLAG_URG = 8192,
1: +  TCP_FLAG_ACK = 4096,
1: +  TCP_FLAG_PSH = 2048,
1: +  TCP_FLAG_RST = 1024,
1: +  TCP_FLAG_SYN = 512,
1: +  TCP_FLAG_FIN = 256,
1: +  TCP_RESERVED_BITS = 15,
1: +  TCP_DATA_OFFSET = 240,
1:  };
1:  
1:  struct tcp_repair_opt {
1: -	__u32 opt_code;
1: -	__u32 opt_val;
1: +  __u32 opt_code;
1: +  __u32 opt_val;
1:  };
1:  
1:  struct tcp_repair_window {
1: -	__u32 snd_wl1;
1: -	__u32 snd_wnd;
1: -	__u32 max_window;
1: -	__u32 rcv_wnd;
1: -	__u32 rcv_wup;
1: +  __u32 snd_wl1;
1: +  __u32 snd_wnd;
1: +  __u32 max_window;
1: +  __u32 rcv_wnd;
1: +  __u32 rcv_wup;
1:  };
1:  
1:  enum {
1: -	TCP_NO_QUEUE = 0,
1: -	TCP_RECV_QUEUE = 1,
1: -	TCP_SEND_QUEUE = 2,
1: -	TCP_QUEUES_NR = 3,
1: +  TCP_NO_QUEUE = 0,
1: +  TCP_RECV_QUEUE = 1,
1: +  TCP_SEND_QUEUE = 2,
1: +  TCP_QUEUES_NR = 3,
1:  };
1:  
1:  struct tcp_info {
1: -	__u8 tcpi_state;
1: -	__u8 tcpi_ca_state;
1: -	__u8 tcpi_retransmits;
1: -	__u8 tcpi_probes;
1: -	__u8 tcpi_backoff;
1: -	__u8 tcpi_options;
1: -	__u8 tcpi_snd_wscale: 4;
1: -	__u8 tcpi_rcv_wscale: 4;
1: -	__u8 tcpi_delivery_rate_app_limited: 1;
1: -	__u8 tcpi_fastopen_client_fail: 2;
1: -	__u32 tcpi_rto;
1: -	__u32 tcpi_ato;
1: -	__u32 tcpi_snd_mss;
1: -	__u32 tcpi_rcv_mss;
1: -	__u32 tcpi_unacked;
1: -	__u32 tcpi_sacked;
1: -	__u32 tcpi_lost;
1: -	__u32 tcpi_retrans;
1: -	__u32 tcpi_fackets;
1: -	__u32 tcpi_last_data_sent;
1: -	__u32 tcpi_last_ack_sent;
1: -	__u32 tcpi_last_data_recv;
1: -	__u32 tcpi_last_ack_recv;
1: -	__u32 tcpi_pmtu;
1: -	__u32 tcpi_rcv_ssthresh;
1: -	__u32 tcpi_rtt;
1: -	__u32 tcpi_rttvar;
1: -	__u32 tcpi_snd_ssthresh;
1: -	__u32 tcpi_snd_cwnd;
1: -	__u32 tcpi_advmss;
1: -	__u32 tcpi_reordering;
1: -	__u32 tcpi_rcv_rtt;
1: -	__u32 tcpi_rcv_space;
1: -	__u32 tcpi_total_retrans;
1: -	__u64 tcpi_pacing_rate;
1: -	__u64 tcpi_max_pacing_rate;
1: -	__u64 tcpi_bytes_acked;
1: -	__u64 tcpi_bytes_received;
1: -	__u32 tcpi_segs_out;
1: -	__u32 tcpi_segs_in;
1: -	__u32 tcpi_notsent_bytes;
1: -	__u32 tcpi_min_rtt;
1: -	__u32 tcpi_data_segs_in;
1: -	__u32 tcpi_data_segs_out;
1: -	__u64 tcpi_delivery_rate;
1: -	__u64 tcpi_busy_time;
1: -	__u64 tcpi_rwnd_limited;
1: -	__u64 tcpi_sndbuf_limited;
1: -	__u32 tcpi_delivered;
1: -	__u32 tcpi_delivered_ce;
1: -	__u64 tcpi_bytes_sent;
1: -	__u64 tcpi_bytes_retrans;
1: -	__u32 tcpi_dsack_dups;
1: -	__u32 tcpi_reord_seen;
1: -	__u32 tcpi_rcv_ooopack;
1: -	__u32 tcpi_snd_wnd;
1: -};
1: -
1: -enum {
1: -	TCP_NLA_PAD = 0,
1: -	TCP_NLA_BUSY = 1,
1: -	TCP_NLA_RWND_LIMITED = 2,
1: -	TCP_NLA_SNDBUF_LIMITED = 3,
1: -	TCP_NLA_DATA_SEGS_OUT = 4,
1: -	TCP_NLA_TOTAL_RETRANS = 5,
1: -	TCP_NLA_PACING_RATE = 6,
1: -	TCP_NLA_DELIVERY_RATE = 7,
1: -	TCP_NLA_SND_CWND = 8,
1: -	TCP_NLA_REORDERING = 9,
1: -	TCP_NLA_MIN_RTT = 10,
1: -	TCP_NLA_RECUR_RETRANS = 11,
1: -	TCP_NLA_DELIVERY_RATE_APP_LMT = 12,
1: -	TCP_NLA_SNDQ_SIZE = 13,
1: -	TCP_NLA_CA_STATE = 14,
1: -	TCP_NLA_SND_SSTHRESH = 15,
1: -	TCP_NLA_DELIVERED = 16,
1: -	TCP_NLA_DELIVERED_CE = 17,
1: -	TCP_NLA_BYTES_SENT = 18,
1: -	TCP_NLA_BYTES_RETRANS = 19,
1: -	TCP_NLA_DSACK_DUPS = 20,
1: -	TCP_NLA_REORD_SEEN = 21,
1: -	TCP_NLA_SRTT = 22,
1: -	TCP_NLA_TIMEOUT_REHASH = 23,
1: -	TCP_NLA_BYTES_NOTSENT = 24,
1: -	TCP_NLA_EDT = 25,
1: +  __u8 tcpi_state;
1: +  __u8 tcpi_ca_state;
1: +  __u8 tcpi_retransmits;
1: +  __u8 tcpi_probes;
1: +  __u8 tcpi_backoff;
1: +  __u8 tcpi_options;
1: +  __u8 tcpi_snd_wscale : 4;
1: +  __u8 tcpi_rcv_wscale : 4;
1: +  __u8 tcpi_delivery_rate_app_limited : 1;
1: +  __u8 tcpi_fastopen_client_fail : 2;
1: +  __u32 tcpi_rto;
1: +  __u32 tcpi_ato;
1: +  __u32 tcpi_snd_mss;
1: +  __u32 tcpi_rcv_mss;
1: +  __u32 tcpi_unacked;
1: +  __u32 tcpi_sacked;
1: +  __u32 tcpi_lost;
1: +  __u32 tcpi_retrans;
1: +  __u32 tcpi_fackets;
1: +  __u32 tcpi_last_data_sent;
1: +  __u32 tcpi_last_ack_sent;
1: +  __u32 tcpi_last_data_recv;
1: +  __u32 tcpi_last_ack_recv;
1: +  __u32 tcpi_pmtu;
1: +  __u32 tcpi_rcv_ssthresh;
1: +  __u32 tcpi_rtt;
1: +  __u32 tcpi_rttvar;
1: +  __u32 tcpi_snd_ssthresh;
1: +  __u32 tcpi_snd_cwnd;
1: +  __u32 tcpi_advmss;
1: +  __u32 tcpi_reordering;
1: +  __u32 tcpi_rcv_rtt;
1: +  __u32 tcpi_rcv_space;
1: +  __u32 tcpi_total_retrans;
1: +  __u64 tcpi_pacing_rate;
1: +  __u64 tcpi_max_pacing_rate;
1: +  __u64 tcpi_bytes_acked;
1: +  __u64 tcpi_bytes_received;
1: +  __u32 tcpi_segs_out;
1: +  __u32 tcpi_segs_in;
1: +  __u32 tcpi_notsent_bytes;
1: +  __u32 tcpi_min_rtt;
1: +  __u32 tcpi_data_segs_in;
1: +  __u32 tcpi_data_segs_out;
1: +  __u64 tcpi_delivery_rate;
1: +  __u64 tcpi_busy_time;
1: +  __u64 tcpi_rwnd_limited;
1: +  __u64 tcpi_sndbuf_limited;
1: +  __u32 tcpi_delivered;
1: +  __u32 tcpi_delivered_ce;
1: +  __u64 tcpi_bytes_sent;
1: +  __u64 tcpi_bytes_retrans;
1: +  __u32 tcpi_dsack_dups;
1: +  __u32 tcpi_reord_seen;
1: +  __u32 tcpi_rcv_ooopack;
1: +  __u32 tcpi_snd_wnd;
1: +};
1: +
1: +enum {
1: +  TCP_NLA_PAD = 0,
1: +  TCP_NLA_BUSY = 1,
1: +  TCP_NLA_RWND_LIMITED = 2,
1: +  TCP_NLA_SNDBUF_LIMITED = 3,
1: +  TCP_NLA_DATA_SEGS_OUT = 4,
1: +  TCP_NLA_TOTAL_RETRANS = 5,
1: +  TCP_NLA_PACING_RATE = 6,
1: +  TCP_NLA_DELIVERY_RATE = 7,
1: +  TCP_NLA_SND_CWND = 8,
1: +  TCP_NLA_REORDERING = 9,
1: +  TCP_NLA_MIN_RTT = 10,
1: +  TCP_NLA_RECUR_RETRANS = 11,
1: +  TCP_NLA_DELIVERY_RATE_APP_LMT = 12,
1: +  TCP_NLA_SNDQ_SIZE = 13,
1: +  TCP_NLA_CA_STATE = 14,
1: +  TCP_NLA_SND_SSTHRESH = 15,
1: +  TCP_NLA_DELIVERED = 16,
1: +  TCP_NLA_DELIVERED_CE = 17,
1: +  TCP_NLA_BYTES_SENT = 18,
1: +  TCP_NLA_BYTES_RETRANS = 19,
1: +  TCP_NLA_DSACK_DUPS = 20,
1: +  TCP_NLA_REORD_SEEN = 21,
1: +  TCP_NLA_SRTT = 22,
1: +  TCP_NLA_TIMEOUT_REHASH = 23,
1: +  TCP_NLA_BYTES_NOTSENT = 24,
1: +  TCP_NLA_EDT = 25,
1:  };
1:  
1:  struct tcp_zerocopy_receive {
1: -	__u64 address;
1: -	__u32 length;
1: -	__u32 recv_skip_hint;
1: -	__u32 inq;
1: -	__s32 err;
1: +  __u64 address;
1: +  __u32 length;
1: +  __u32 recv_skip_hint;
1: +  __u32 inq;
1: +  __s32 err;
1:  };
1:  
1:  struct tcp_md5sig_pool {
1: -	struct ahash_request *md5_req;
1: -	void *scratch;
1: +  struct ahash_request *md5_req;
1: +  void *scratch;
1:  };
1:  
1:  enum tcp_chrono {
1: -	TCP_CHRONO_UNSPEC = 0,
1: -	TCP_CHRONO_BUSY = 1,
1: -	TCP_CHRONO_RWND_LIMITED = 2,
1: -	TCP_CHRONO_SNDBUF_LIMITED = 3,
1: -	__TCP_CHRONO_MAX = 4,
1: +  TCP_CHRONO_UNSPEC = 0,
1: +  TCP_CHRONO_BUSY = 1,
1: +  TCP_CHRONO_RWND_LIMITED = 2,
1: +  TCP_CHRONO_SNDBUF_LIMITED = 3,
1: +  __TCP_CHRONO_MAX = 4,
1:  };
1:  
1:  struct tcp_splice_state {
1: -	struct pipe_inode_info *pipe;
1: -	size_t len;
1: -	unsigned int flags;
1: +  struct pipe_inode_info *pipe;
1: +  size_t len;
1: +  unsigned int flags;
1:  };
1:  
1:  enum tcp_fastopen_client_fail {
1: -	TFO_STATUS_UNSPEC = 0,
1: -	TFO_COOKIE_UNAVAILABLE = 1,
1: -	TFO_DATA_NOT_ACKED = 2,
1: -	TFO_SYN_RETRANSMITTED = 3,
1: +  TFO_STATUS_UNSPEC = 0,
1: +  TFO_COOKIE_UNAVAILABLE = 1,
1: +  TFO_DATA_NOT_ACKED = 2,
1: +  TFO_SYN_RETRANSMITTED = 3,
1:  };
1:  
1:  struct tcp_sack_block_wire {
1: -	__be32 start_seq;
1: -	__be32 end_seq;
1: +  __be32 start_seq;
1: +  __be32 end_seq;
1:  };
1:  
1:  enum tcp_queue {
1: -	TCP_FRAG_IN_WRITE_QUEUE = 0,
1: -	TCP_FRAG_IN_RTX_QUEUE = 1,
1: +  TCP_FRAG_IN_WRITE_QUEUE = 0,
1: +  TCP_FRAG_IN_RTX_QUEUE = 1,
1:  };
1:  
1:  enum tcp_ca_ack_event_flags {
1: -	CA_ACK_SLOWPATH = 1,
1: -	CA_ACK_WIN_UPDATE = 2,
1: -	CA_ACK_ECE = 4,
1: +  CA_ACK_SLOWPATH = 1,
1: +  CA_ACK_WIN_UPDATE = 2,
1: +  CA_ACK_ECE = 4,
1:  };
1:  
1:  struct tcp_sacktag_state {
1: -	u64 first_sackt;
1: -	u64 last_sackt;
1: -	u32 reord;
1: -	u32 sack_delivered;
1: -	int flag;
1: -	unsigned int mss_now;
1: -	struct rate_sample *rate;
1: +  u64 first_sackt;
1: +  u64 last_sackt;
1: +  u32 reord;
1: +  u32 sack_delivered;
1: +  int flag;
1: +  unsigned int mss_now;
1: +  struct rate_sample *rate;
1:  };
1:  
1:  enum {
1: -	BPF_WRITE_HDR_TCP_CURRENT_MSS = 1,
1: -	BPF_WRITE_HDR_TCP_SYNACK_COOKIE = 2,
1: +  BPF_WRITE_HDR_TCP_CURRENT_MSS = 1,
1: +  BPF_WRITE_HDR_TCP_SYNACK_COOKIE = 2,
1:  };
1:  
1:  enum tsq_flags {
1: -	TSQF_THROTTLED = 1,
1: -	TSQF_QUEUED = 2,
1: -	TCPF_TSQ_DEFERRED = 4,
1: -	TCPF_WRITE_TIMER_DEFERRED = 8,
1: -	TCPF_DELACK_TIMER_DEFERRED = 16,
1: -	TCPF_MTU_REDUCED_DEFERRED = 32,
1: +  TSQF_THROTTLED = 1,
1: +  TSQF_QUEUED = 2,
1: +  TCPF_TSQ_DEFERRED = 4,
1: +  TCPF_WRITE_TIMER_DEFERRED = 8,
1: +  TCPF_DELACK_TIMER_DEFERRED = 16,
1: +  TCPF_MTU_REDUCED_DEFERRED = 32,
1:  };
1:  
1:  struct mptcp_out_options {};
1:  
1:  struct tcp_out_options {
1: -	u16 options;
1: -	u16 mss;
1: -	u8 ws;
1: -	u8 num_sack_blocks;
1: -	u8 hash_size;
1: -	u8 bpf_opt_len;
1: -	__u8 *hash_location;
1: -	__u32 tsval;
1: -	__u32 tsecr;
1: -	struct tcp_fastopen_cookie *fastopen_cookie;
1: -	struct mptcp_out_options mptcp;
1: +  u16 options;
1: +  u16 mss;
1: +  u8 ws;
1: +  u8 num_sack_blocks;
1: +  u8 hash_size;
1: +  u8 bpf_opt_len;
1: +  __u8 *hash_location;
1: +  __u32 tsval;
1: +  __u32 tsecr;
1: +  struct tcp_fastopen_cookie *fastopen_cookie;
1: +  struct mptcp_out_options mptcp;
1:  };
1:  
1:  struct tsq_tasklet {
1: -	struct tasklet_struct tasklet;
1: -	struct list_head head;
1: +  struct tasklet_struct tasklet;
1: +  struct list_head head;
1:  };
1:  
1:  struct tcp_md5sig {
1: -	struct __kernel_sockaddr_storage tcpm_addr;
1: -	__u8 tcpm_flags;
1: -	__u8 tcpm_prefixlen;
1: -	__u16 tcpm_keylen;
1: -	int tcpm_ifindex;
1: -	__u8 tcpm_key[80];
1: +  struct __kernel_sockaddr_storage tcpm_addr;
1: +  __u8 tcpm_flags;
1: +  __u8 tcpm_prefixlen;
1: +  __u16 tcpm_keylen;
1: +  int tcpm_ifindex;
1: +  __u8 tcpm_key[80];
1:  };
1:  
1:  struct icmp_err {
1: -	int errno;
1: -	unsigned int fatal: 1;
1: +  int errno;
1: +  unsigned int fatal : 1;
1:  };
1:  
1:  enum tcp_tw_status {
1: -	TCP_TW_SUCCESS = 0,
1: -	TCP_TW_RST = 1,
1: -	TCP_TW_ACK = 2,
1: -	TCP_TW_SYN = 3,
1: +  TCP_TW_SUCCESS = 0,
1: +  TCP_TW_RST = 1,
1: +  TCP_TW_ACK = 2,
1: +  TCP_TW_SYN = 3,
1:  };
1:  
1:  struct tcp4_pseudohdr {
1: -	__be32 saddr;
1: -	__be32 daddr;
1: -	__u8 pad;
1: -	__u8 protocol;
1: -	__be16 len;
1: +  __be32 saddr;
1: +  __be32 daddr;
1: +  __u8 pad;
1: +  __u8 protocol;
1: +  __be16 len;
1:  };
1:  
1:  enum tcp_seq_states {
1: -	TCP_SEQ_STATE_LISTENING = 0,
1: -	TCP_SEQ_STATE_ESTABLISHED = 1,
1: +  TCP_SEQ_STATE_LISTENING = 0,
1: +  TCP_SEQ_STATE_ESTABLISHED = 1,
1:  };
1:  
1:  struct tcp_seq_afinfo {
1: -	sa_family_t family;
1: +  sa_family_t family;
1:  };
1:  
1:  struct tcp_iter_state {
1: -	struct seq_net_private p;
1: -	enum tcp_seq_states state;
1: -	struct sock *syn_wait_sk;
1: -	struct tcp_seq_afinfo *bpf_seq_afinfo;
1: -	int bucket;
1: -	int offset;
1: -	int sbucket;
1: -	int num;
1: -	loff_t last_pos;
1: +  struct seq_net_private p;
1: +  enum tcp_seq_states state;
1: +  struct sock *syn_wait_sk;
1: +  struct tcp_seq_afinfo *bpf_seq_afinfo;
1: +  int bucket;
1: +  int offset;
1: +  int sbucket;
1: +  int num;
1: +  loff_t last_pos;
1:  };
1:  
1:  struct bpf_iter__tcp {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct sock_common *sk_common;
1: -	};
1: -	uid_t uid;
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct sock_common *sk_common;
1: +  };
1: +  uid_t uid;
1:  };
1:  
1:  enum tcp_metric_index {
1: -	TCP_METRIC_RTT = 0,
1: -	TCP_METRIC_RTTVAR = 1,
1: -	TCP_METRIC_SSTHRESH = 2,
1: -	TCP_METRIC_CWND = 3,
1: -	TCP_METRIC_REORDERING = 4,
1: -	TCP_METRIC_RTT_US = 5,
1: -	TCP_METRIC_RTTVAR_US = 6,
1: -	__TCP_METRIC_MAX = 7,
1: +  TCP_METRIC_RTT = 0,
1: +  TCP_METRIC_RTTVAR = 1,
1: +  TCP_METRIC_SSTHRESH = 2,
1: +  TCP_METRIC_CWND = 3,
1: +  TCP_METRIC_REORDERING = 4,
1: +  TCP_METRIC_RTT_US = 5,
1: +  TCP_METRIC_RTTVAR_US = 6,
1: +  __TCP_METRIC_MAX = 7,
1:  };
1:  
1:  enum {
1: -	TCP_METRICS_ATTR_UNSPEC = 0,
1: -	TCP_METRICS_ATTR_ADDR_IPV4 = 1,
1: -	TCP_METRICS_ATTR_ADDR_IPV6 = 2,
1: -	TCP_METRICS_ATTR_AGE = 3,
1: -	TCP_METRICS_ATTR_TW_TSVAL = 4,
1: -	TCP_METRICS_ATTR_TW_TS_STAMP = 5,
1: -	TCP_METRICS_ATTR_VALS = 6,
1: -	TCP_METRICS_ATTR_FOPEN_MSS = 7,
1: -	TCP_METRICS_ATTR_FOPEN_SYN_DROPS = 8,
1: -	TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS = 9,
1: -	TCP_METRICS_ATTR_FOPEN_COOKIE = 10,
1: -	TCP_METRICS_ATTR_SADDR_IPV4 = 11,
1: -	TCP_METRICS_ATTR_SADDR_IPV6 = 12,
1: -	TCP_METRICS_ATTR_PAD = 13,
1: -	__TCP_METRICS_ATTR_MAX = 14,
1: +  TCP_METRICS_ATTR_UNSPEC = 0,
1: +  TCP_METRICS_ATTR_ADDR_IPV4 = 1,
1: +  TCP_METRICS_ATTR_ADDR_IPV6 = 2,
1: +  TCP_METRICS_ATTR_AGE = 3,
1: +  TCP_METRICS_ATTR_TW_TSVAL = 4,
1: +  TCP_METRICS_ATTR_TW_TS_STAMP = 5,
1: +  TCP_METRICS_ATTR_VALS = 6,
1: +  TCP_METRICS_ATTR_FOPEN_MSS = 7,
1: +  TCP_METRICS_ATTR_FOPEN_SYN_DROPS = 8,
1: +  TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS = 9,
1: +  TCP_METRICS_ATTR_FOPEN_COOKIE = 10,
1: +  TCP_METRICS_ATTR_SADDR_IPV4 = 11,
1: +  TCP_METRICS_ATTR_SADDR_IPV6 = 12,
1: +  TCP_METRICS_ATTR_PAD = 13,
1: +  __TCP_METRICS_ATTR_MAX = 14,
1:  };
1:  
1:  enum {
1: -	TCP_METRICS_CMD_UNSPEC = 0,
1: -	TCP_METRICS_CMD_GET = 1,
1: -	TCP_METRICS_CMD_DEL = 2,
1: -	__TCP_METRICS_CMD_MAX = 3,
1: +  TCP_METRICS_CMD_UNSPEC = 0,
1: +  TCP_METRICS_CMD_GET = 1,
1: +  TCP_METRICS_CMD_DEL = 2,
1: +  __TCP_METRICS_CMD_MAX = 3,
1:  };
1:  
1:  struct tcp_fastopen_metrics {
1: -	u16 mss;
1: -	u16 syn_loss: 10;
1: -	u16 try_exp: 2;
1: -	long unsigned int last_syn_loss;
1: -	struct tcp_fastopen_cookie cookie;
1: +  u16 mss;
1: +  u16 syn_loss : 10;
1: +  u16 try_exp : 2;
1: +  long unsigned int last_syn_loss;
1: +  struct tcp_fastopen_cookie cookie;
1:  };
1:  
1:  struct tcp_metrics_block {
1: -	struct tcp_metrics_block *tcpm_next;
1: -	possible_net_t tcpm_net;
1: -	struct inetpeer_addr tcpm_saddr;
1: -	struct inetpeer_addr tcpm_daddr;
1: -	long unsigned int tcpm_stamp;
1: -	u32 tcpm_lock;
1: -	u32 tcpm_vals[5];
1: -	struct tcp_fastopen_metrics tcpm_fastopen;
1: -	struct callback_head callback_head;
1: +  struct tcp_metrics_block *tcpm_next;
1: +  possible_net_t tcpm_net;
1: +  struct inetpeer_addr tcpm_saddr;
1: +  struct inetpeer_addr tcpm_daddr;
1: +  long unsigned int tcpm_stamp;
1: +  u32 tcpm_lock;
1: +  u32 tcpm_vals[5];
1: +  struct tcp_fastopen_metrics tcpm_fastopen;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct tcpm_hash_bucket {
1: -	struct tcp_metrics_block *chain;
1: +  struct tcp_metrics_block *chain;
1:  };
1:  
1:  struct icmp_filter {
1: -	__u32 data;
1: +  __u32 data;
1:  };
1:  
1:  struct raw_iter_state {
1: -	struct seq_net_private p;
1: -	int bucket;
1: +  struct seq_net_private p;
1: +  int bucket;
1:  };
1:  
1:  struct raw_sock {
1: -	struct inet_sock inet;
1: -	struct icmp_filter filter;
1: -	u32 ipmr_table;
1: +  struct inet_sock inet;
1: +  struct icmp_filter filter;
1: +  u32 ipmr_table;
1:  };
1:  
1:  struct raw_frag_vec {
1: -	struct msghdr *msg;
1: -	union {
1: -		struct icmphdr icmph;
1: -		char c[1];
1: -	} hdr;
1: -	int hlen;
1: +  struct msghdr *msg;
1: +  union {
1: +    struct icmphdr icmph;
1: +    char c[1];
1: +  } hdr;
1: +  int hlen;
1:  };
1:  
1:  struct ip_tunnel_encap {
1: -	u16 type;
1: -	u16 flags;
1: -	__be16 sport;
1: -	__be16 dport;
1: +  u16 type;
1: +  u16 flags;
1: +  __be16 sport;
1: +  __be16 dport;
1:  };
1:  
1:  struct ip_tunnel_encap_ops {
1: -	size_t (*encap_hlen)(struct ip_tunnel_encap *);
1: -	int (*build_header)(struct sk_buff *, struct ip_tunnel_encap *, u8 *, struct flowi4 *);
1: -	int (*err_handler)(struct sk_buff *, u32);
1: +  size_t (*encap_hlen)(struct ip_tunnel_encap *);
1: +  int (*build_header)(struct sk_buff *, struct ip_tunnel_encap *, u8 *,
1: +                      struct flowi4 *);
1: +  int (*err_handler)(struct sk_buff *, u32);
1:  };
1:  
1:  struct udp_skb_cb {
1: -	union {
1: -		struct inet_skb_parm h4;
1: -		struct inet6_skb_parm h6;
1: -	} header;
1: -	__u16 cscov;
1: -	__u8 partial_cov;
1: +  union {
1: +    struct inet_skb_parm h4;
1: +    struct inet6_skb_parm h6;
1: +  } header;
1: +  __u16 cscov;
1: +  __u8 partial_cov;
1:  };
1:  
1:  struct udp_dev_scratch {
1: -	u32 _tsize_state;
1: -	u16 len;
1: -	bool is_linear;
1: -	bool csum_unnecessary;
1: +  u32 _tsize_state;
1: +  u16 len;
1: +  bool is_linear;
1: +  bool csum_unnecessary;
1:  };
1:  
1:  struct udp_seq_afinfo {
1: -	sa_family_t family;
1: -	struct udp_table *udp_table;
1: +  sa_family_t family;
1: +  struct udp_table *udp_table;
1:  };
1:  
1:  struct udp_iter_state {
1: -	struct seq_net_private p;
1: -	int bucket;
1: -	struct udp_seq_afinfo *bpf_seq_afinfo;
1: +  struct seq_net_private p;
1: +  int bucket;
1: +  struct udp_seq_afinfo *bpf_seq_afinfo;
1:  };
1:  
1:  struct bpf_iter__udp {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct udp_sock *udp_sk;
1: -	};
1: -	uid_t uid;
1: -	int: 32;
1: -	int bucket;
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct udp_sock *udp_sk;
1: +  };
1: +  uid_t uid;
1: +  int : 32;
1: +  int bucket;
1:  };
1:  
1:  struct inet_protosw {
1: -	struct list_head list;
1: -	short unsigned int type;
1: -	short unsigned int protocol;
1: -	struct proto *prot;
1: -	const struct proto_ops *ops;
1: -	unsigned char flags;
1: +  struct list_head list;
1: +  short unsigned int type;
1: +  short unsigned int protocol;
1: +  struct proto *prot;
1: +  const struct proto_ops *ops;
1: +  unsigned char flags;
1:  };
1:  
1: -typedef struct sk_buff * (*gro_receive_sk_t)(struct sock *, struct list_head *, struct sk_buff *);
1: +typedef struct sk_buff *(*gro_receive_sk_t)(struct sock *, struct list_head *,
1: +                                            struct sk_buff *);
1:  
1: -typedef struct sock * (*udp_lookup_t)(const struct sk_buff *, __be16, __be16);
1: +typedef struct sock *(*udp_lookup_t)(const struct sk_buff *, __be16, __be16);
1:  
1:  struct arpreq {
1: -	struct sockaddr arp_pa;
1: -	struct sockaddr arp_ha;
1: -	int arp_flags;
1: -	struct sockaddr arp_netmask;
1: -	char arp_dev[16];
1: +  struct sockaddr arp_pa;
1: +  struct sockaddr arp_ha;
1: +  int arp_flags;
1: +  struct sockaddr arp_netmask;
1: +  char arp_dev[16];
1:  };
1:  
1:  enum {
1: -	AX25_VALUES_IPDEFMODE = 0,
1: -	AX25_VALUES_AXDEFMODE = 1,
1: -	AX25_VALUES_BACKOFF = 2,
1: -	AX25_VALUES_CONMODE = 3,
1: -	AX25_VALUES_WINDOW = 4,
1: -	AX25_VALUES_EWINDOW = 5,
1: -	AX25_VALUES_T1 = 6,
1: -	AX25_VALUES_T2 = 7,
1: -	AX25_VALUES_T3 = 8,
1: -	AX25_VALUES_IDLE = 9,
1: -	AX25_VALUES_N2 = 10,
1: -	AX25_VALUES_PACLEN = 11,
1: -	AX25_VALUES_PROTOCOL = 12,
1: -	AX25_VALUES_DS_TIMEOUT = 13,
1: -	AX25_MAX_VALUES = 14,
1: +  AX25_VALUES_IPDEFMODE = 0,
1: +  AX25_VALUES_AXDEFMODE = 1,
1: +  AX25_VALUES_BACKOFF = 2,
1: +  AX25_VALUES_CONMODE = 3,
1: +  AX25_VALUES_WINDOW = 4,
1: +  AX25_VALUES_EWINDOW = 5,
1: +  AX25_VALUES_T1 = 6,
1: +  AX25_VALUES_T2 = 7,
1: +  AX25_VALUES_T3 = 8,
1: +  AX25_VALUES_IDLE = 9,
1: +  AX25_VALUES_N2 = 10,
1: +  AX25_VALUES_PACLEN = 11,
1: +  AX25_VALUES_PROTOCOL = 12,
1: +  AX25_VALUES_DS_TIMEOUT = 13,
1: +  AX25_MAX_VALUES = 14,
1:  };
1:  
1:  enum {
1: -	XFRM_LOOKUP_ICMP = 1,
1: -	XFRM_LOOKUP_QUEUE = 2,
1: -	XFRM_LOOKUP_KEEP_DST_REF = 4,
1: +  XFRM_LOOKUP_ICMP = 1,
1: +  XFRM_LOOKUP_QUEUE = 2,
1: +  XFRM_LOOKUP_KEEP_DST_REF = 4,
1:  };
1:  
1:  struct icmp_ext_hdr {
1: -	__u8 reserved1: 4;
1: -	__u8 version: 4;
1: -	__u8 reserved2;
1: -	__sum16 checksum;
1: +  __u8 reserved1 : 4;
1: +  __u8 version : 4;
1: +  __u8 reserved2;
1: +  __sum16 checksum;
1:  };
1:  
1:  struct icmp_extobj_hdr {
1: -	__be16 length;
1: -	__u8 class_num;
1: -	__u8 class_type;
1: +  __be16 length;
1: +  __u8 class_num;
1: +  __u8 class_type;
1:  };
1:  
1:  struct icmp_bxm {
1: -	struct sk_buff *skb;
1: -	int offset;
1: -	int data_len;
1: -	struct {
1: -		struct icmphdr icmph;
1: -		__be32 times[3];
1: -	} data;
1: -	int head_len;
1: -	struct ip_options_data replyopts;
1: +  struct sk_buff *skb;
1: +  int offset;
1: +  int data_len;
1: +  struct {
1: +    struct icmphdr icmph;
1: +    __be32 times[3];
1: +  } data;
1: +  int head_len;
1: +  struct ip_options_data replyopts;
1:  };
1:  
1:  struct icmp_control {
1: -	bool (*handler)(struct sk_buff *);
1: -	short int error;
1: +  bool (*handler)(struct sk_buff *);
1: +  short int error;
1:  };
1:  
1:  struct ifaddrmsg {
1: -	__u8 ifa_family;
1: -	__u8 ifa_prefixlen;
1: -	__u8 ifa_flags;
1: -	__u8 ifa_scope;
1: -	__u32 ifa_index;
1: +  __u8 ifa_family;
1: +  __u8 ifa_prefixlen;
1: +  __u8 ifa_flags;
1: +  __u8 ifa_scope;
1: +  __u32 ifa_index;
1:  };
1:  
1:  enum {
1: -	IFA_UNSPEC = 0,
1: -	IFA_ADDRESS = 1,
1: -	IFA_LOCAL = 2,
1: -	IFA_LABEL = 3,
1: -	IFA_BROADCAST = 4,
1: -	IFA_ANYCAST = 5,
1: -	IFA_CACHEINFO = 6,
1: -	IFA_MULTICAST = 7,
1: -	IFA_FLAGS = 8,
1: -	IFA_RT_PRIORITY = 9,
1: -	IFA_TARGET_NETNSID = 10,
1: -	__IFA_MAX = 11,
1: +  IFA_UNSPEC = 0,
1: +  IFA_ADDRESS = 1,
1: +  IFA_LOCAL = 2,
1: +  IFA_LABEL = 3,
1: +  IFA_BROADCAST = 4,
1: +  IFA_ANYCAST = 5,
1: +  IFA_CACHEINFO = 6,
1: +  IFA_MULTICAST = 7,
1: +  IFA_FLAGS = 8,
1: +  IFA_RT_PRIORITY = 9,
1: +  IFA_TARGET_NETNSID = 10,
1: +  __IFA_MAX = 11,
1:  };
1:  
1:  struct ifa_cacheinfo {
1: -	__u32 ifa_prefered;
1: -	__u32 ifa_valid;
1: -	__u32 cstamp;
1: -	__u32 tstamp;
1: +  __u32 ifa_prefered;
1: +  __u32 ifa_valid;
1: +  __u32 cstamp;
1: +  __u32 tstamp;
1:  };
1:  
1:  enum {
1: -	IFLA_INET_UNSPEC = 0,
1: -	IFLA_INET_CONF = 1,
1: -	__IFLA_INET_MAX = 2,
1: +  IFLA_INET_UNSPEC = 0,
1: +  IFLA_INET_CONF = 1,
1: +  __IFLA_INET_MAX = 2,
1:  };
1:  
1:  struct in_validator_info {
1: -	__be32 ivi_addr;
1: -	struct in_device *ivi_dev;
1: -	struct netlink_ext_ack *extack;
1: +  __be32 ivi_addr;
1: +  struct in_device *ivi_dev;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct netconfmsg {
1: -	__u8 ncm_family;
1: +  __u8 ncm_family;
1:  };
1:  
1:  enum {
1: -	NETCONFA_UNSPEC = 0,
1: -	NETCONFA_IFINDEX = 1,
1: -	NETCONFA_FORWARDING = 2,
1: -	NETCONFA_RP_FILTER = 3,
1: -	NETCONFA_MC_FORWARDING = 4,
1: -	NETCONFA_PROXY_NEIGH = 5,
1: -	NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN = 6,
1: -	NETCONFA_INPUT = 7,
1: -	NETCONFA_BC_FORWARDING = 8,
1: -	__NETCONFA_MAX = 9,
1: +  NETCONFA_UNSPEC = 0,
1: +  NETCONFA_IFINDEX = 1,
1: +  NETCONFA_FORWARDING = 2,
1: +  NETCONFA_RP_FILTER = 3,
1: +  NETCONFA_MC_FORWARDING = 4,
1: +  NETCONFA_PROXY_NEIGH = 5,
1: +  NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN = 6,
1: +  NETCONFA_INPUT = 7,
1: +  NETCONFA_BC_FORWARDING = 8,
1: +  __NETCONFA_MAX = 9,
1:  };
1:  
1:  struct inet_fill_args {
1: -	u32 portid;
1: -	u32 seq;
1: -	int event;
1: -	unsigned int flags;
1: -	int netnsid;
1: -	int ifindex;
1: +  u32 portid;
1: +  u32 seq;
1: +  int event;
1: +  unsigned int flags;
1: +  int netnsid;
1: +  int ifindex;
1:  };
1:  
1:  struct devinet_sysctl_table {
1: -	struct ctl_table_header *sysctl_header;
1: -	struct ctl_table devinet_vars[33];
1: +  struct ctl_table_header *sysctl_header;
1: +  struct ctl_table devinet_vars[33];
1:  };
1:  
1:  struct rtentry {
1: -	long unsigned int rt_pad1;
1: -	struct sockaddr rt_dst;
1: -	struct sockaddr rt_gateway;
1: -	struct sockaddr rt_genmask;
1: -	short unsigned int rt_flags;
1: -	short int rt_pad2;
1: -	long unsigned int rt_pad3;
1: -	void *rt_pad4;
1: -	short int rt_metric;
1: -	char *rt_dev;
1: -	long unsigned int rt_mtu;
1: -	long unsigned int rt_window;
1: -	short unsigned int rt_irtt;
1: +  long unsigned int rt_pad1;
1: +  struct sockaddr rt_dst;
1: +  struct sockaddr rt_gateway;
1: +  struct sockaddr rt_genmask;
1: +  short unsigned int rt_flags;
1: +  short int rt_pad2;
1: +  long unsigned int rt_pad3;
1: +  void *rt_pad4;
1: +  short int rt_metric;
1: +  char *rt_dev;
1: +  long unsigned int rt_mtu;
1: +  long unsigned int rt_window;
1: +  short unsigned int rt_irtt;
1:  };
1:  
1:  struct pingv6_ops {
1: -	int (*ipv6_recv_error)(struct sock *, struct msghdr *, int, int *);
1: -	void (*ip6_datagram_recv_common_ctl)(struct sock *, struct msghdr *, struct sk_buff *);
1: -	void (*ip6_datagram_recv_specific_ctl)(struct sock *, struct msghdr *, struct sk_buff *);
1: -	int (*icmpv6_err_convert)(u8, u8, int *);
1: -	void (*ipv6_icmp_error)(struct sock *, struct sk_buff *, int, __be16, u32, u8 *);
1: -	int (*ipv6_chk_addr)(struct net *, const struct in6_addr *, const struct net_device *, int);
1: +  int (*ipv6_recv_error)(struct sock *, struct msghdr *, int, int *);
1: +  void (*ip6_datagram_recv_common_ctl)(struct sock *, struct msghdr *,
1: +                                       struct sk_buff *);
1: +  void (*ip6_datagram_recv_specific_ctl)(struct sock *, struct msghdr *,
1: +                                         struct sk_buff *);
1: +  int (*icmpv6_err_convert)(u8, u8, int *);
1: +  void (*ipv6_icmp_error)(struct sock *, struct sk_buff *, int, __be16, u32,
1: +                          u8 *);
1: +  int (*ipv6_chk_addr)(struct net *, const struct in6_addr *,
1: +                       const struct net_device *, int);
1:  };
1:  
1:  struct compat_rtentry {
1: -	u32 rt_pad1;
1: -	struct sockaddr rt_dst;
1: -	struct sockaddr rt_gateway;
1: -	struct sockaddr rt_genmask;
1: -	short unsigned int rt_flags;
1: -	short int rt_pad2;
1: -	u32 rt_pad3;
1: -	unsigned char rt_tos;
1: -	unsigned char rt_class;
1: -	short int rt_pad4;
1: -	short int rt_metric;
1: -	compat_uptr_t rt_dev;
1: -	u32 rt_mtu;
1: -	u32 rt_window;
1: -	short unsigned int rt_irtt;
1: +  u32 rt_pad1;
1: +  struct sockaddr rt_dst;
1: +  struct sockaddr rt_gateway;
1: +  struct sockaddr rt_genmask;
1: +  short unsigned int rt_flags;
1: +  short int rt_pad2;
1: +  u32 rt_pad3;
1: +  unsigned char rt_tos;
1: +  unsigned char rt_class;
1: +  short int rt_pad4;
1: +  short int rt_metric;
1: +  compat_uptr_t rt_dev;
1: +  u32 rt_mtu;
1: +  u32 rt_window;
1: +  short unsigned int rt_irtt;
1:  };
1:  
1:  struct igmphdr {
1: -	__u8 type;
1: -	__u8 code;
1: -	__sum16 csum;
1: -	__be32 group;
1: +  __u8 type;
1: +  __u8 code;
1: +  __sum16 csum;
1: +  __be32 group;
1:  };
1:  
1:  struct igmpv3_grec {
1: -	__u8 grec_type;
1: -	__u8 grec_auxwords;
1: -	__be16 grec_nsrcs;
1: -	__be32 grec_mca;
1: -	__be32 grec_src[0];
1: +  __u8 grec_type;
1: +  __u8 grec_auxwords;
1: +  __be16 grec_nsrcs;
1: +  __be32 grec_mca;
1: +  __be32 grec_src[0];
1:  };
1:  
1:  struct igmpv3_report {
1: -	__u8 type;
1: -	__u8 resv1;
1: -	__sum16 csum;
1: -	__be16 resv2;
1: -	__be16 ngrec;
1: -	struct igmpv3_grec grec[0];
1: +  __u8 type;
1: +  __u8 resv1;
1: +  __sum16 csum;
1: +  __be16 resv2;
1: +  __be16 ngrec;
1: +  struct igmpv3_grec grec[0];
1:  };
1:  
1:  struct igmpv3_query {
1: -	__u8 type;
1: -	__u8 code;
1: -	__sum16 csum;
1: -	__be32 group;
1: -	__u8 qrv: 3;
1: -	__u8 suppress: 1;
1: -	__u8 resv: 4;
1: -	__u8 qqic;
1: -	__be16 nsrcs;
1: -	__be32 srcs[0];
1: +  __u8 type;
1: +  __u8 code;
1: +  __sum16 csum;
1: +  __be32 group;
1: +  __u8 qrv : 3;
1: +  __u8 suppress : 1;
1: +  __u8 resv : 4;
1: +  __u8 qqic;
1: +  __be16 nsrcs;
1: +  __be32 srcs[0];
1:  };
1:  
1:  struct igmp_mc_iter_state {
1: -	struct seq_net_private p;
1: -	struct net_device *dev;
1: -	struct in_device *in_dev;
1: +  struct seq_net_private p;
1: +  struct net_device *dev;
1: +  struct in_device *in_dev;
1:  };
1:  
1:  struct igmp_mcf_iter_state {
1: -	struct seq_net_private p;
1: -	struct net_device *dev;
1: -	struct in_device *idev;
1: -	struct ip_mc_list *im;
1: +  struct seq_net_private p;
1: +  struct net_device *dev;
1: +  struct in_device *idev;
1: +  struct ip_mc_list *im;
1:  };
1:  
1:  struct fib_config {
1: -	u8 fc_dst_len;
1: -	u8 fc_tos;
1: -	u8 fc_protocol;
1: -	u8 fc_scope;
1: -	u8 fc_type;
1: -	u8 fc_gw_family;
1: -	u32 fc_table;
1: -	__be32 fc_dst;
1: -	union {
1: -		__be32 fc_gw4;
1: -		struct in6_addr fc_gw6;
1: -	};
1: -	int fc_oif;
1: -	u32 fc_flags;
1: -	u32 fc_priority;
1: -	__be32 fc_prefsrc;
1: -	u32 fc_nh_id;
1: -	struct nlattr *fc_mx;
1: -	struct rtnexthop *fc_mp;
1: -	int fc_mx_len;
1: -	int fc_mp_len;
1: -	u32 fc_flow;
1: -	u32 fc_nlflags;
1: -	struct nl_info fc_nlinfo;
1: -	struct nlattr *fc_encap;
1: -	u16 fc_encap_type;
1: +  u8 fc_dst_len;
1: +  u8 fc_tos;
1: +  u8 fc_protocol;
1: +  u8 fc_scope;
1: +  u8 fc_type;
1: +  u8 fc_gw_family;
1: +  u32 fc_table;
1: +  __be32 fc_dst;
1: +  union {
1: +    __be32 fc_gw4;
1: +    struct in6_addr fc_gw6;
1: +  };
1: +  int fc_oif;
1: +  u32 fc_flags;
1: +  u32 fc_priority;
1: +  __be32 fc_prefsrc;
1: +  u32 fc_nh_id;
1: +  struct nlattr *fc_mx;
1: +  struct rtnexthop *fc_mp;
1: +  int fc_mx_len;
1: +  int fc_mp_len;
1: +  u32 fc_flow;
1: +  u32 fc_nlflags;
1: +  struct nl_info fc_nlinfo;
1: +  struct nlattr *fc_encap;
1: +  u16 fc_encap_type;
1:  };
1:  
1:  struct fib_result_nl {
1: -	__be32 fl_addr;
1: -	u32 fl_mark;
1: -	unsigned char fl_tos;
1: -	unsigned char fl_scope;
1: -	unsigned char tb_id_in;
1: -	unsigned char tb_id;
1: -	unsigned char prefixlen;
1: -	unsigned char nh_sel;
1: -	unsigned char type;
1: -	unsigned char scope;
1: -	int err;
1: +  __be32 fl_addr;
1: +  u32 fl_mark;
1: +  unsigned char fl_tos;
1: +  unsigned char fl_scope;
1: +  unsigned char tb_id_in;
1: +  unsigned char tb_id;
1: +  unsigned char prefixlen;
1: +  unsigned char nh_sel;
1: +  unsigned char type;
1: +  unsigned char scope;
1: +  int err;
1:  };
1:  
1:  struct fib_dump_filter {
1: -	u32 table_id;
1: -	bool filter_set;
1: -	bool dump_routes;
1: -	bool dump_exceptions;
1: -	unsigned char protocol;
1: -	unsigned char rt_type;
1: -	unsigned int flags;
1: -	struct net_device *dev;
1: +  u32 table_id;
1: +  bool filter_set;
1: +  bool dump_routes;
1: +  bool dump_exceptions;
1: +  unsigned char protocol;
1: +  unsigned char rt_type;
1: +  unsigned int flags;
1: +  struct net_device *dev;
1:  };
1:  
1:  struct fib_nh_notifier_info {
1: -	struct fib_notifier_info info;
1: -	struct fib_nh *fib_nh;
1: +  struct fib_notifier_info info;
1: +  struct fib_nh *fib_nh;
1:  };
1:  
1:  typedef unsigned int t_key;
1:  
1:  struct key_vector {
1: -	t_key key;
1: -	unsigned char pos;
1: -	unsigned char bits;
1: -	unsigned char slen;
1: -	union {
1: -		struct hlist_head leaf;
1: -		struct key_vector *tnode[0];
1: -	};
1: +  t_key key;
1: +  unsigned char pos;
1: +  unsigned char bits;
1: +  unsigned char slen;
1: +  union {
1: +    struct hlist_head leaf;
1: +    struct key_vector *tnode[0];
1: +  };
1:  };
1:  
1:  struct tnode {
1: -	struct callback_head rcu;
1: -	t_key empty_children;
1: -	t_key full_children;
1: -	struct key_vector *parent;
1: -	struct key_vector kv[1];
1: +  struct callback_head rcu;
1: +  t_key empty_children;
1: +  t_key full_children;
1: +  struct key_vector *parent;
1: +  struct key_vector kv[1];
1:  };
1:  
1:  struct trie_stat {
1: -	unsigned int totdepth;
1: -	unsigned int maxdepth;
1: -	unsigned int tnodes;
1: -	unsigned int leaves;
1: -	unsigned int nullpointers;
1: -	unsigned int prefixes;
1: -	unsigned int nodesizes[32];
1: +  unsigned int totdepth;
1: +  unsigned int maxdepth;
1: +  unsigned int tnodes;
1: +  unsigned int leaves;
1: +  unsigned int nullpointers;
1: +  unsigned int prefixes;
1: +  unsigned int nodesizes[32];
1:  };
1:  
1:  struct trie {
1: -	struct key_vector kv[1];
1: +  struct key_vector kv[1];
1:  };
1:  
1:  struct fib_trie_iter {
1: -	struct seq_net_private p;
1: -	struct fib_table *tb;
1: -	struct key_vector *tnode;
1: -	unsigned int index;
1: -	unsigned int depth;
1: +  struct seq_net_private p;
1: +  struct fib_table *tb;
1: +  struct key_vector *tnode;
1: +  unsigned int index;
1: +  unsigned int depth;
1:  };
1:  
1:  struct fib_route_iter {
1: -	struct seq_net_private p;
1: -	struct fib_table *main_tb;
1: -	struct key_vector *tnode;
1: -	loff_t pos;
1: -	t_key key;
1: +  struct seq_net_private p;
1: +  struct fib_table *main_tb;
1: +  struct key_vector *tnode;
1: +  loff_t pos;
1: +  t_key key;
1:  };
1:  
1:  struct ipfrag_skb_cb {
1: -	union {
1: -		struct inet_skb_parm h4;
1: -		struct inet6_skb_parm h6;
1: -	};
1: -	struct sk_buff *next_frag;
1: -	int frag_run_len;
1: +  union {
1: +    struct inet_skb_parm h4;
1: +    struct inet6_skb_parm h6;
1: +  };
1: +  struct sk_buff *next_frag;
1: +  int frag_run_len;
1:  };
1:  
1:  struct ping_iter_state {
1: -	struct seq_net_private p;
1: -	int bucket;
1: -	sa_family_t family;
1: +  struct seq_net_private p;
1: +  int bucket;
1: +  sa_family_t family;
1:  };
1:  
1:  struct pingfakehdr {
1: -	struct icmphdr icmph;
1: -	struct msghdr *msg;
1: -	sa_family_t family;
1: -	__wsum wcheck;
1: +  struct icmphdr icmph;
1: +  struct msghdr *msg;
1: +  sa_family_t family;
1: +  __wsum wcheck;
1:  };
1:  
1:  struct ping_table {
1: -	struct hlist_nulls_head hash[64];
1: -	rwlock_t lock;
1: +  struct hlist_nulls_head hash[64];
1: +  rwlock_t lock;
1:  };
1:  
1:  enum lwtunnel_ip_t {
1: -	LWTUNNEL_IP_UNSPEC = 0,
1: -	LWTUNNEL_IP_ID = 1,
1: -	LWTUNNEL_IP_DST = 2,
1: -	LWTUNNEL_IP_SRC = 3,
1: -	LWTUNNEL_IP_TTL = 4,
1: -	LWTUNNEL_IP_TOS = 5,
1: -	LWTUNNEL_IP_FLAGS = 6,
1: -	LWTUNNEL_IP_PAD = 7,
1: -	LWTUNNEL_IP_OPTS = 8,
1: -	__LWTUNNEL_IP_MAX = 9,
1: +  LWTUNNEL_IP_UNSPEC = 0,
1: +  LWTUNNEL_IP_ID = 1,
1: +  LWTUNNEL_IP_DST = 2,
1: +  LWTUNNEL_IP_SRC = 3,
1: +  LWTUNNEL_IP_TTL = 4,
1: +  LWTUNNEL_IP_TOS = 5,
1: +  LWTUNNEL_IP_FLAGS = 6,
1: +  LWTUNNEL_IP_PAD = 7,
1: +  LWTUNNEL_IP_OPTS = 8,
1: +  __LWTUNNEL_IP_MAX = 9,
1:  };
1:  
1:  enum lwtunnel_ip6_t {
1: -	LWTUNNEL_IP6_UNSPEC = 0,
1: -	LWTUNNEL_IP6_ID = 1,
1: -	LWTUNNEL_IP6_DST = 2,
1: -	LWTUNNEL_IP6_SRC = 3,
1: -	LWTUNNEL_IP6_HOPLIMIT = 4,
1: -	LWTUNNEL_IP6_TC = 5,
1: -	LWTUNNEL_IP6_FLAGS = 6,
1: -	LWTUNNEL_IP6_PAD = 7,
1: -	LWTUNNEL_IP6_OPTS = 8,
1: -	__LWTUNNEL_IP6_MAX = 9,
1: +  LWTUNNEL_IP6_UNSPEC = 0,
1: +  LWTUNNEL_IP6_ID = 1,
1: +  LWTUNNEL_IP6_DST = 2,
1: +  LWTUNNEL_IP6_SRC = 3,
1: +  LWTUNNEL_IP6_HOPLIMIT = 4,
1: +  LWTUNNEL_IP6_TC = 5,
1: +  LWTUNNEL_IP6_FLAGS = 6,
1: +  LWTUNNEL_IP6_PAD = 7,
1: +  LWTUNNEL_IP6_OPTS = 8,
1: +  __LWTUNNEL_IP6_MAX = 9,
1:  };
1:  
1:  enum {
1: -	LWTUNNEL_IP_OPTS_UNSPEC = 0,
1: -	LWTUNNEL_IP_OPTS_GENEVE = 1,
1: -	LWTUNNEL_IP_OPTS_VXLAN = 2,
1: -	LWTUNNEL_IP_OPTS_ERSPAN = 3,
1: -	__LWTUNNEL_IP_OPTS_MAX = 4,
1: +  LWTUNNEL_IP_OPTS_UNSPEC = 0,
1: +  LWTUNNEL_IP_OPTS_GENEVE = 1,
1: +  LWTUNNEL_IP_OPTS_VXLAN = 2,
1: +  LWTUNNEL_IP_OPTS_ERSPAN = 3,
1: +  __LWTUNNEL_IP_OPTS_MAX = 4,
1:  };
1:  
1:  enum {
1: -	LWTUNNEL_IP_OPT_GENEVE_UNSPEC = 0,
1: -	LWTUNNEL_IP_OPT_GENEVE_CLASS = 1,
1: -	LWTUNNEL_IP_OPT_GENEVE_TYPE = 2,
1: -	LWTUNNEL_IP_OPT_GENEVE_DATA = 3,
1: -	__LWTUNNEL_IP_OPT_GENEVE_MAX = 4,
1: +  LWTUNNEL_IP_OPT_GENEVE_UNSPEC = 0,
1: +  LWTUNNEL_IP_OPT_GENEVE_CLASS = 1,
1: +  LWTUNNEL_IP_OPT_GENEVE_TYPE = 2,
1: +  LWTUNNEL_IP_OPT_GENEVE_DATA = 3,
1: +  __LWTUNNEL_IP_OPT_GENEVE_MAX = 4,
1:  };
1:  
1:  enum {
1: -	LWTUNNEL_IP_OPT_VXLAN_UNSPEC = 0,
1: -	LWTUNNEL_IP_OPT_VXLAN_GBP = 1,
1: -	__LWTUNNEL_IP_OPT_VXLAN_MAX = 2,
1: +  LWTUNNEL_IP_OPT_VXLAN_UNSPEC = 0,
1: +  LWTUNNEL_IP_OPT_VXLAN_GBP = 1,
1: +  __LWTUNNEL_IP_OPT_VXLAN_MAX = 2,
1:  };
1:  
1:  enum {
1: -	LWTUNNEL_IP_OPT_ERSPAN_UNSPEC = 0,
1: -	LWTUNNEL_IP_OPT_ERSPAN_VER = 1,
1: -	LWTUNNEL_IP_OPT_ERSPAN_INDEX = 2,
1: -	LWTUNNEL_IP_OPT_ERSPAN_DIR = 3,
1: -	LWTUNNEL_IP_OPT_ERSPAN_HWID = 4,
1: -	__LWTUNNEL_IP_OPT_ERSPAN_MAX = 5,
1: +  LWTUNNEL_IP_OPT_ERSPAN_UNSPEC = 0,
1: +  LWTUNNEL_IP_OPT_ERSPAN_VER = 1,
1: +  LWTUNNEL_IP_OPT_ERSPAN_INDEX = 2,
1: +  LWTUNNEL_IP_OPT_ERSPAN_DIR = 3,
1: +  LWTUNNEL_IP_OPT_ERSPAN_HWID = 4,
1: +  __LWTUNNEL_IP_OPT_ERSPAN_MAX = 5,
1:  };
1:  
1:  struct ip6_tnl_encap_ops {
1: -	size_t (*encap_hlen)(struct ip_tunnel_encap *);
1: -	int (*build_header)(struct sk_buff *, struct ip_tunnel_encap *, u8 *, struct flowi6 *);
1: -	int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int, __be32);
1: +  size_t (*encap_hlen)(struct ip_tunnel_encap *);
1: +  int (*build_header)(struct sk_buff *, struct ip_tunnel_encap *, u8 *,
1: +                      struct flowi6 *);
1: +  int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int,
1: +                     __be32);
1:  };
1:  
1:  struct nhmsg {
1: -	unsigned char nh_family;
1: -	unsigned char nh_scope;
1: -	unsigned char nh_protocol;
1: -	unsigned char resvd;
1: -	unsigned int nh_flags;
1: +  unsigned char nh_family;
1: +  unsigned char nh_scope;
1: +  unsigned char nh_protocol;
1: +  unsigned char resvd;
1: +  unsigned int nh_flags;
1:  };
1:  
1:  struct nexthop_grp {
1: -	__u32 id;
1: -	__u8 weight;
1: -	__u8 resvd1;
1: -	__u16 resvd2;
1: +  __u32 id;
1: +  __u8 weight;
1: +  __u8 resvd1;
1: +  __u16 resvd2;
1:  };
1:  
1:  enum {
1: -	NEXTHOP_GRP_TYPE_MPATH = 0,
1: -	__NEXTHOP_GRP_TYPE_MAX = 1,
1: +  NEXTHOP_GRP_TYPE_MPATH = 0,
1: +  __NEXTHOP_GRP_TYPE_MAX = 1,
1:  };
1:  
1:  enum {
1: -	NHA_UNSPEC = 0,
1: -	NHA_ID = 1,
1: -	NHA_GROUP = 2,
1: -	NHA_GROUP_TYPE = 3,
1: -	NHA_BLACKHOLE = 4,
1: -	NHA_OIF = 5,
1: -	NHA_GATEWAY = 6,
1: -	NHA_ENCAP_TYPE = 7,
1: -	NHA_ENCAP = 8,
1: -	NHA_GROUPS = 9,
1: -	NHA_MASTER = 10,
1: -	NHA_FDB = 11,
1: -	__NHA_MAX = 12,
1: +  NHA_UNSPEC = 0,
1: +  NHA_ID = 1,
1: +  NHA_GROUP = 2,
1: +  NHA_GROUP_TYPE = 3,
1: +  NHA_BLACKHOLE = 4,
1: +  NHA_OIF = 5,
1: +  NHA_GATEWAY = 6,
1: +  NHA_ENCAP_TYPE = 7,
1: +  NHA_ENCAP = 8,
1: +  NHA_GROUPS = 9,
1: +  NHA_MASTER = 10,
1: +  NHA_FDB = 11,
1: +  __NHA_MAX = 12,
1:  };
1:  
1:  struct nh_config {
1: -	u32 nh_id;
1: -	u8 nh_family;
1: -	u8 nh_protocol;
1: -	u8 nh_blackhole;
1: -	u8 nh_fdb;
1: -	u32 nh_flags;
1: -	int nh_ifindex;
1: -	struct net_device *dev;
1: -	union {
1: -		__be32 ipv4;
1: -		struct in6_addr ipv6;
1: -	} gw;
1: -	struct nlattr *nh_grp;
1: -	u16 nh_grp_type;
1: -	struct nlattr *nh_encap;
1: -	u16 nh_encap_type;
1: -	u32 nlflags;
1: -	struct nl_info nlinfo;
1: +  u32 nh_id;
1: +  u8 nh_family;
1: +  u8 nh_protocol;
1: +  u8 nh_blackhole;
1: +  u8 nh_fdb;
1: +  u32 nh_flags;
1: +  int nh_ifindex;
1: +  struct net_device *dev;
1: +  union {
1: +    __be32 ipv4;
1: +    struct in6_addr ipv6;
1: +  } gw;
1: +  struct nlattr *nh_grp;
1: +  u16 nh_grp_type;
1: +  struct nlattr *nh_encap;
1: +  u16 nh_encap_type;
1: +  u32 nlflags;
1: +  struct nl_info nlinfo;
1:  };
1:  
1:  struct bpfilter_umh_ops {
1: -	struct umd_info info;
1: -	struct mutex lock;
1: -	int (*sockopt)(struct sock *, int, sockptr_t, unsigned int, bool);
1: -	int (*start)();
1: +  struct umd_info info;
1: +  struct mutex lock;
1: +  int (*sockopt)(struct sock *, int, sockptr_t, unsigned int, bool);
1: +  int (*start)();
1:  };
1:  
1:  enum tunnel_encap_types {
1: -	TUNNEL_ENCAP_NONE = 0,
1: -	TUNNEL_ENCAP_FOU = 1,
1: -	TUNNEL_ENCAP_GUE = 2,
1: -	TUNNEL_ENCAP_MPLS = 3,
1: +  TUNNEL_ENCAP_NONE = 0,
1: +  TUNNEL_ENCAP_FOU = 1,
1: +  TUNNEL_ENCAP_GUE = 2,
1: +  TUNNEL_ENCAP_MPLS = 3,
1:  };
1:  
1:  struct ip_tunnel_prl_entry {
1: -	struct ip_tunnel_prl_entry *next;
1: -	__be32 addr;
1: -	u16 flags;
1: -	struct callback_head callback_head;
1: +  struct ip_tunnel_prl_entry *next;
1: +  __be32 addr;
1: +  u16 flags;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct ip_tunnel {
1: -	struct ip_tunnel *next;
1: -	struct hlist_node hash_node;
1: -	struct net_device *dev;
1: -	struct net *net;
1: -	long unsigned int err_time;
1: -	int err_count;
1: -	u32 i_seqno;
1: -	u32 o_seqno;
1: -	int tun_hlen;
1: -	u32 index;
1: -	u8 erspan_ver;
1: -	u8 dir;
1: -	u16 hwid;
1: -	struct dst_cache dst_cache;
1: -	struct ip_tunnel_parm parms;
1: -	int mlink;
1: -	int encap_hlen;
1: -	int hlen;
1: -	struct ip_tunnel_encap encap;
1: -	struct ip_tunnel_prl_entry *prl;
1: -	unsigned int prl_count;
1: -	unsigned int ip_tnl_net_id;
1: -	struct gro_cells gro_cells;
1: -	__u32 fwmark;
1: -	bool collect_md;
1: -	bool ignore_df;
1: +  struct ip_tunnel *next;
1: +  struct hlist_node hash_node;
1: +  struct net_device *dev;
1: +  struct net *net;
1: +  long unsigned int err_time;
1: +  int err_count;
1: +  u32 i_seqno;
1: +  u32 o_seqno;
1: +  int tun_hlen;
1: +  u32 index;
1: +  u8 erspan_ver;
1: +  u8 dir;
1: +  u16 hwid;
1: +  struct dst_cache dst_cache;
1: +  struct ip_tunnel_parm parms;
1: +  int mlink;
1: +  int encap_hlen;
1: +  int hlen;
1: +  struct ip_tunnel_encap encap;
1: +  struct ip_tunnel_prl_entry *prl;
1: +  unsigned int prl_count;
1: +  unsigned int ip_tnl_net_id;
1: +  struct gro_cells gro_cells;
1: +  __u32 fwmark;
1: +  bool collect_md;
1: +  bool ignore_df;
1:  };
1:  
1:  struct tnl_ptk_info {
1: -	__be16 flags;
1: -	__be16 proto;
1: -	__be32 key;
1: -	__be32 seq;
1: -	int hdr_len;
1: +  __be16 flags;
1: +  __be16 proto;
1: +  __be32 key;
1: +  __be32 seq;
1: +  int hdr_len;
1:  };
1:  
1:  struct ip_tunnel_net {
1: -	struct net_device *fb_tunnel_dev;
1: -	struct rtnl_link_ops *rtnl_link_ops;
1: -	struct hlist_head tunnels[128];
1: -	struct ip_tunnel *collect_md_tun;
1: -	int type;
1: +  struct net_device *fb_tunnel_dev;
1: +  struct rtnl_link_ops *rtnl_link_ops;
1: +  struct hlist_head tunnels[128];
1: +  struct ip_tunnel *collect_md_tun;
1: +  int type;
1:  };
1:  
1:  struct inet6_protocol {
1: -	void (*early_demux)(struct sk_buff *);
1: -	void (*early_demux_handler)(struct sk_buff *);
1: -	int (*handler)(struct sk_buff *);
1: -	int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int, __be32);
1: -	unsigned int flags;
1: +  void (*early_demux)(struct sk_buff *);
1: +  void (*early_demux_handler)(struct sk_buff *);
1: +  int (*handler)(struct sk_buff *);
1: +  int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int,
1: +                     __be32);
1: +  unsigned int flags;
1:  };
1:  
1:  struct snmp_mib {
1: -	const char *name;
1: -	int entry;
1: +  const char *name;
1: +  int entry;
1:  };
1:  
1:  struct fib4_rule {
1: -	struct fib_rule common;
1: -	u8 dst_len;
1: -	u8 src_len;
1: -	u8 tos;
1: -	__be32 src;
1: -	__be32 srcmask;
1: -	__be32 dst;
1: -	__be32 dstmask;
1: -	u32 tclassid;
1: +  struct fib_rule common;
1: +  u8 dst_len;
1: +  u8 src_len;
1: +  u8 tos;
1: +  __be32 src;
1: +  __be32 srcmask;
1: +  __be32 dst;
1: +  __be32 dstmask;
1: +  u32 tclassid;
1:  };
1:  
1:  enum {
1: -	PIM_TYPE_HELLO = 0,
1: -	PIM_TYPE_REGISTER = 1,
1: -	PIM_TYPE_REGISTER_STOP = 2,
1: -	PIM_TYPE_JOIN_PRUNE = 3,
1: -	PIM_TYPE_BOOTSTRAP = 4,
1: -	PIM_TYPE_ASSERT = 5,
1: -	PIM_TYPE_GRAFT = 6,
1: -	PIM_TYPE_GRAFT_ACK = 7,
1: -	PIM_TYPE_CANDIDATE_RP_ADV = 8,
1: +  PIM_TYPE_HELLO = 0,
1: +  PIM_TYPE_REGISTER = 1,
1: +  PIM_TYPE_REGISTER_STOP = 2,
1: +  PIM_TYPE_JOIN_PRUNE = 3,
1: +  PIM_TYPE_BOOTSTRAP = 4,
1: +  PIM_TYPE_ASSERT = 5,
1: +  PIM_TYPE_GRAFT = 6,
1: +  PIM_TYPE_GRAFT_ACK = 7,
1: +  PIM_TYPE_CANDIDATE_RP_ADV = 8,
1:  };
1:  
1:  struct pimreghdr {
1: -	__u8 type;
1: -	__u8 reserved;
1: -	__be16 csum;
1: -	__be32 flags;
1: +  __u8 type;
1: +  __u8 reserved;
1: +  __be16 csum;
1: +  __be32 flags;
1:  };
1:  
1:  typedef short unsigned int vifi_t;
1:  
1:  struct vifctl {
1: -	vifi_t vifc_vifi;
1: -	unsigned char vifc_flags;
1: -	unsigned char vifc_threshold;
1: -	unsigned int vifc_rate_limit;
1: -	union {
1: -		struct in_addr vifc_lcl_addr;
1: -		int vifc_lcl_ifindex;
1: -	};
1: -	struct in_addr vifc_rmt_addr;
1: +  vifi_t vifc_vifi;
1: +  unsigned char vifc_flags;
1: +  unsigned char vifc_threshold;
1: +  unsigned int vifc_rate_limit;
1: +  union {
1: +    struct in_addr vifc_lcl_addr;
1: +    int vifc_lcl_ifindex;
1: +  };
1: +  struct in_addr vifc_rmt_addr;
1:  };
1:  
1:  struct mfcctl {
1: -	struct in_addr mfcc_origin;
1: -	struct in_addr mfcc_mcastgrp;
1: -	vifi_t mfcc_parent;
1: -	unsigned char mfcc_ttls[32];
1: -	unsigned int mfcc_pkt_cnt;
1: -	unsigned int mfcc_byte_cnt;
1: -	unsigned int mfcc_wrong_if;
1: -	int mfcc_expire;
1: +  struct in_addr mfcc_origin;
1: +  struct in_addr mfcc_mcastgrp;
1: +  vifi_t mfcc_parent;
1: +  unsigned char mfcc_ttls[32];
1: +  unsigned int mfcc_pkt_cnt;
1: +  unsigned int mfcc_byte_cnt;
1: +  unsigned int mfcc_wrong_if;
1: +  int mfcc_expire;
1:  };
1:  
1:  struct sioc_sg_req {
1: -	struct in_addr src;
1: -	struct in_addr grp;
1: -	long unsigned int pktcnt;
1: -	long unsigned int bytecnt;
1: -	long unsigned int wrong_if;
1: +  struct in_addr src;
1: +  struct in_addr grp;
1: +  long unsigned int pktcnt;
1: +  long unsigned int bytecnt;
1: +  long unsigned int wrong_if;
1:  };
1:  
1:  struct sioc_vif_req {
1: -	vifi_t vifi;
1: -	long unsigned int icount;
1: -	long unsigned int ocount;
1: -	long unsigned int ibytes;
1: -	long unsigned int obytes;
1: +  vifi_t vifi;
1: +  long unsigned int icount;
1: +  long unsigned int ocount;
1: +  long unsigned int ibytes;
1: +  long unsigned int obytes;
1:  };
1:  
1:  struct igmpmsg {
1: -	__u32 unused1;
1: -	__u32 unused2;
1: -	unsigned char im_msgtype;
1: -	unsigned char im_mbz;
1: -	unsigned char im_vif;
1: -	unsigned char im_vif_hi;
1: -	struct in_addr im_src;
1: -	struct in_addr im_dst;
1: +  __u32 unused1;
1: +  __u32 unused2;
1: +  unsigned char im_msgtype;
1: +  unsigned char im_mbz;
1: +  unsigned char im_vif;
1: +  unsigned char im_vif_hi;
1: +  struct in_addr im_src;
1: +  struct in_addr im_dst;
1:  };
1:  
1:  enum {
1: -	IPMRA_TABLE_UNSPEC = 0,
1: -	IPMRA_TABLE_ID = 1,
1: -	IPMRA_TABLE_CACHE_RES_QUEUE_LEN = 2,
1: -	IPMRA_TABLE_MROUTE_REG_VIF_NUM = 3,
1: -	IPMRA_TABLE_MROUTE_DO_ASSERT = 4,
1: -	IPMRA_TABLE_MROUTE_DO_PIM = 5,
1: -	IPMRA_TABLE_VIFS = 6,
1: -	IPMRA_TABLE_MROUTE_DO_WRVIFWHOLE = 7,
1: -	__IPMRA_TABLE_MAX = 8,
1: +  IPMRA_TABLE_UNSPEC = 0,
1: +  IPMRA_TABLE_ID = 1,
1: +  IPMRA_TABLE_CACHE_RES_QUEUE_LEN = 2,
1: +  IPMRA_TABLE_MROUTE_REG_VIF_NUM = 3,
1: +  IPMRA_TABLE_MROUTE_DO_ASSERT = 4,
1: +  IPMRA_TABLE_MROUTE_DO_PIM = 5,
1: +  IPMRA_TABLE_VIFS = 6,
1: +  IPMRA_TABLE_MROUTE_DO_WRVIFWHOLE = 7,
1: +  __IPMRA_TABLE_MAX = 8,
1:  };
1:  
1:  enum {
1: -	IPMRA_VIF_UNSPEC = 0,
1: -	IPMRA_VIF = 1,
1: -	__IPMRA_VIF_MAX = 2,
1: +  IPMRA_VIF_UNSPEC = 0,
1: +  IPMRA_VIF = 1,
1: +  __IPMRA_VIF_MAX = 2,
1:  };
1:  
1:  enum {
1: -	IPMRA_VIFA_UNSPEC = 0,
1: -	IPMRA_VIFA_IFINDEX = 1,
1: -	IPMRA_VIFA_VIF_ID = 2,
1: -	IPMRA_VIFA_FLAGS = 3,
1: -	IPMRA_VIFA_BYTES_IN = 4,
1: -	IPMRA_VIFA_BYTES_OUT = 5,
1: -	IPMRA_VIFA_PACKETS_IN = 6,
1: -	IPMRA_VIFA_PACKETS_OUT = 7,
1: -	IPMRA_VIFA_LOCAL_ADDR = 8,
1: -	IPMRA_VIFA_REMOTE_ADDR = 9,
1: -	IPMRA_VIFA_PAD = 10,
1: -	__IPMRA_VIFA_MAX = 11,
1: +  IPMRA_VIFA_UNSPEC = 0,
1: +  IPMRA_VIFA_IFINDEX = 1,
1: +  IPMRA_VIFA_VIF_ID = 2,
1: +  IPMRA_VIFA_FLAGS = 3,
1: +  IPMRA_VIFA_BYTES_IN = 4,
1: +  IPMRA_VIFA_BYTES_OUT = 5,
1: +  IPMRA_VIFA_PACKETS_IN = 6,
1: +  IPMRA_VIFA_PACKETS_OUT = 7,
1: +  IPMRA_VIFA_LOCAL_ADDR = 8,
1: +  IPMRA_VIFA_REMOTE_ADDR = 9,
1: +  IPMRA_VIFA_PAD = 10,
1: +  __IPMRA_VIFA_MAX = 11,
1:  };
1:  
1:  enum {
1: -	IPMRA_CREPORT_UNSPEC = 0,
1: -	IPMRA_CREPORT_MSGTYPE = 1,
1: -	IPMRA_CREPORT_VIF_ID = 2,
1: -	IPMRA_CREPORT_SRC_ADDR = 3,
1: -	IPMRA_CREPORT_DST_ADDR = 4,
1: -	IPMRA_CREPORT_PKT = 5,
1: -	IPMRA_CREPORT_TABLE = 6,
1: -	__IPMRA_CREPORT_MAX = 7,
1: +  IPMRA_CREPORT_UNSPEC = 0,
1: +  IPMRA_CREPORT_MSGTYPE = 1,
1: +  IPMRA_CREPORT_VIF_ID = 2,
1: +  IPMRA_CREPORT_SRC_ADDR = 3,
1: +  IPMRA_CREPORT_DST_ADDR = 4,
1: +  IPMRA_CREPORT_PKT = 5,
1: +  IPMRA_CREPORT_TABLE = 6,
1: +  __IPMRA_CREPORT_MAX = 7,
1:  };
1:  
1:  struct vif_entry_notifier_info {
1: -	struct fib_notifier_info info;
1: -	struct net_device *dev;
1: -	short unsigned int vif_index;
1: -	short unsigned int vif_flags;
1: -	u32 tb_id;
1: +  struct fib_notifier_info info;
1: +  struct net_device *dev;
1: +  short unsigned int vif_index;
1: +  short unsigned int vif_flags;
1: +  u32 tb_id;
1:  };
1:  
1:  enum {
1: -	MFC_STATIC = 1,
1: -	MFC_OFFLOAD = 2,
1: +  MFC_STATIC = 1,
1: +  MFC_OFFLOAD = 2,
1:  };
1:  
1:  struct mr_mfc {
1: -	struct rhlist_head mnode;
1: -	short unsigned int mfc_parent;
1: -	int mfc_flags;
1: -	union {
1: -		struct {
1: -			long unsigned int expires;
1: -			struct sk_buff_head unresolved;
1: -		} unres;
1: -		struct {
1: -			long unsigned int last_assert;
1: -			int minvif;
1: -			int maxvif;
1: -			long unsigned int bytes;
1: -			long unsigned int pkt;
1: -			long unsigned int wrong_if;
1: -			long unsigned int lastuse;
1: -			unsigned char ttls[32];
1: -			refcount_t refcount;
1: -		} res;
1: -	} mfc_un;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: -	void (*free)(struct callback_head *);
1: +  struct rhlist_head mnode;
1: +  short unsigned int mfc_parent;
1: +  int mfc_flags;
1: +  union {
1: +    struct {
1: +      long unsigned int expires;
1: +      struct sk_buff_head unresolved;
1: +    } unres;
1: +    struct {
1: +      long unsigned int last_assert;
1: +      int minvif;
1: +      int maxvif;
1: +      long unsigned int bytes;
1: +      long unsigned int pkt;
1: +      long unsigned int wrong_if;
1: +      long unsigned int lastuse;
1: +      unsigned char ttls[32];
1: +      refcount_t refcount;
1: +    } res;
1: +  } mfc_un;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1: +  void (*free)(struct callback_head *);
1:  };
1:  
1:  struct mfc_entry_notifier_info {
1: -	struct fib_notifier_info info;
1: -	struct mr_mfc *mfc;
1: -	u32 tb_id;
1: +  struct fib_notifier_info info;
1: +  struct mr_mfc *mfc;
1: +  u32 tb_id;
1:  };
1:  
1:  struct mr_vif_iter {
1: -	struct seq_net_private p;
1: -	struct mr_table *mrt;
1: -	int ct;
1: +  struct seq_net_private p;
1: +  struct mr_table *mrt;
1: +  int ct;
1:  };
1:  
1:  struct mr_mfc_iter {
1: -	struct seq_net_private p;
1: -	struct mr_table *mrt;
1: -	struct list_head *cache;
1: -	spinlock_t *lock;
1: +  struct seq_net_private p;
1: +  struct mr_table *mrt;
1: +  struct list_head *cache;
1: +  spinlock_t *lock;
1:  };
1:  
1:  struct mfc_cache_cmp_arg {
1: -	__be32 mfc_mcastgrp;
1: -	__be32 mfc_origin;
1: +  __be32 mfc_mcastgrp;
1: +  __be32 mfc_origin;
1:  };
1:  
1:  struct mfc_cache {
1: -	struct mr_mfc _c;
1: -	union {
1: -		struct {
1: -			__be32 mfc_mcastgrp;
1: -			__be32 mfc_origin;
1: -		};
1: -		struct mfc_cache_cmp_arg cmparg;
1: -	};
1: +  struct mr_mfc _c;
1: +  union {
1: +    struct {
1: +      __be32 mfc_mcastgrp;
1: +      __be32 mfc_origin;
1: +    };
1: +    struct mfc_cache_cmp_arg cmparg;
1: +  };
1:  };
1:  
1:  struct compat_sioc_sg_req {
1: -	struct in_addr src;
1: -	struct in_addr grp;
1: -	compat_ulong_t pktcnt;
1: -	compat_ulong_t bytecnt;
1: -	compat_ulong_t wrong_if;
1: +  struct in_addr src;
1: +  struct in_addr grp;
1: +  compat_ulong_t pktcnt;
1: +  compat_ulong_t bytecnt;
1: +  compat_ulong_t wrong_if;
1:  };
1:  
1:  struct compat_sioc_vif_req {
1: -	vifi_t vifi;
1: -	compat_ulong_t icount;
1: -	compat_ulong_t ocount;
1: -	compat_ulong_t ibytes;
1: -	compat_ulong_t obytes;
1: +  vifi_t vifi;
1: +  compat_ulong_t icount;
1: +  compat_ulong_t ocount;
1: +  compat_ulong_t ibytes;
1: +  compat_ulong_t obytes;
1:  };
1:  
1:  struct rta_mfc_stats {
1: -	__u64 mfcs_packets;
1: -	__u64 mfcs_bytes;
1: -	__u64 mfcs_wrong_if;
1: -};
1: -
1: -enum {
1: -	IFLA_IPTUN_UNSPEC = 0,
1: -	IFLA_IPTUN_LINK = 1,
1: -	IFLA_IPTUN_LOCAL = 2,
1: -	IFLA_IPTUN_REMOTE = 3,
1: -	IFLA_IPTUN_TTL = 4,
1: -	IFLA_IPTUN_TOS = 5,
1: -	IFLA_IPTUN_ENCAP_LIMIT = 6,
1: -	IFLA_IPTUN_FLOWINFO = 7,
1: -	IFLA_IPTUN_FLAGS = 8,
1: -	IFLA_IPTUN_PROTO = 9,
1: -	IFLA_IPTUN_PMTUDISC = 10,
1: -	IFLA_IPTUN_6RD_PREFIX = 11,
1: -	IFLA_IPTUN_6RD_RELAY_PREFIX = 12,
1: -	IFLA_IPTUN_6RD_PREFIXLEN = 13,
1: -	IFLA_IPTUN_6RD_RELAY_PREFIXLEN = 14,
1: -	IFLA_IPTUN_ENCAP_TYPE = 15,
1: -	IFLA_IPTUN_ENCAP_FLAGS = 16,
1: -	IFLA_IPTUN_ENCAP_SPORT = 17,
1: -	IFLA_IPTUN_ENCAP_DPORT = 18,
1: -	IFLA_IPTUN_COLLECT_METADATA = 19,
1: -	IFLA_IPTUN_FWMARK = 20,
1: -	__IFLA_IPTUN_MAX = 21,
1: +  __u64 mfcs_packets;
1: +  __u64 mfcs_bytes;
1: +  __u64 mfcs_wrong_if;
1: +};
1: +
1: +enum {
1: +  IFLA_IPTUN_UNSPEC = 0,
1: +  IFLA_IPTUN_LINK = 1,
1: +  IFLA_IPTUN_LOCAL = 2,
1: +  IFLA_IPTUN_REMOTE = 3,
1: +  IFLA_IPTUN_TTL = 4,
1: +  IFLA_IPTUN_TOS = 5,
1: +  IFLA_IPTUN_ENCAP_LIMIT = 6,
1: +  IFLA_IPTUN_FLOWINFO = 7,
1: +  IFLA_IPTUN_FLAGS = 8,
1: +  IFLA_IPTUN_PROTO = 9,
1: +  IFLA_IPTUN_PMTUDISC = 10,
1: +  IFLA_IPTUN_6RD_PREFIX = 11,
1: +  IFLA_IPTUN_6RD_RELAY_PREFIX = 12,
1: +  IFLA_IPTUN_6RD_PREFIXLEN = 13,
1: +  IFLA_IPTUN_6RD_RELAY_PREFIXLEN = 14,
1: +  IFLA_IPTUN_ENCAP_TYPE = 15,
1: +  IFLA_IPTUN_ENCAP_FLAGS = 16,
1: +  IFLA_IPTUN_ENCAP_SPORT = 17,
1: +  IFLA_IPTUN_ENCAP_DPORT = 18,
1: +  IFLA_IPTUN_COLLECT_METADATA = 19,
1: +  IFLA_IPTUN_FWMARK = 20,
1: +  __IFLA_IPTUN_MAX = 21,
1:  };
1:  
1:  struct xfrm_tunnel {
1: -	int (*handler)(struct sk_buff *);
1: -	int (*cb_handler)(struct sk_buff *, int);
1: -	int (*err_handler)(struct sk_buff *, u32);
1: -	struct xfrm_tunnel *next;
1: -	int priority;
1: +  int (*handler)(struct sk_buff *);
1: +  int (*cb_handler)(struct sk_buff *, int);
1: +  int (*err_handler)(struct sk_buff *, u32);
1: +  struct xfrm_tunnel *next;
1: +  int priority;
1:  };
1:  
1:  struct gre_protocol {
1: -	int (*handler)(struct sk_buff *);
1: -	void (*err_handler)(struct sk_buff *, u32);
1: +  int (*handler)(struct sk_buff *);
1: +  void (*err_handler)(struct sk_buff *, u32);
1:  };
1:  
1:  struct erspan_base_hdr {
1: -	__u8 vlan_upper: 4;
1: -	__u8 ver: 4;
1: -	__u8 vlan: 8;
1: -	__u8 session_id_upper: 2;
1: -	__u8 t: 1;
1: -	__u8 en: 2;
1: -	__u8 cos: 3;
1: -	__u8 session_id: 8;
1: -};
1: -
1: -enum {
1: -	IFLA_GRE_UNSPEC = 0,
1: -	IFLA_GRE_LINK = 1,
1: -	IFLA_GRE_IFLAGS = 2,
1: -	IFLA_GRE_OFLAGS = 3,
1: -	IFLA_GRE_IKEY = 4,
1: -	IFLA_GRE_OKEY = 5,
1: -	IFLA_GRE_LOCAL = 6,
1: -	IFLA_GRE_REMOTE = 7,
1: -	IFLA_GRE_TTL = 8,
1: -	IFLA_GRE_TOS = 9,
1: -	IFLA_GRE_PMTUDISC = 10,
1: -	IFLA_GRE_ENCAP_LIMIT = 11,
1: -	IFLA_GRE_FLOWINFO = 12,
1: -	IFLA_GRE_FLAGS = 13,
1: -	IFLA_GRE_ENCAP_TYPE = 14,
1: -	IFLA_GRE_ENCAP_FLAGS = 15,
1: -	IFLA_GRE_ENCAP_SPORT = 16,
1: -	IFLA_GRE_ENCAP_DPORT = 17,
1: -	IFLA_GRE_COLLECT_METADATA = 18,
1: -	IFLA_GRE_IGNORE_DF = 19,
1: -	IFLA_GRE_FWMARK = 20,
1: -	IFLA_GRE_ERSPAN_INDEX = 21,
1: -	IFLA_GRE_ERSPAN_VER = 22,
1: -	IFLA_GRE_ERSPAN_DIR = 23,
1: -	IFLA_GRE_ERSPAN_HWID = 24,
1: -	__IFLA_GRE_MAX = 25,
1: +  __u8 vlan_upper : 4;
1: +  __u8 ver : 4;
1: +  __u8 vlan : 8;
1: +  __u8 session_id_upper : 2;
1: +  __u8 t : 1;
1: +  __u8 en : 2;
1: +  __u8 cos : 3;
1: +  __u8 session_id : 8;
1: +};
1: +
1: +enum {
1: +  IFLA_GRE_UNSPEC = 0,
1: +  IFLA_GRE_LINK = 1,
1: +  IFLA_GRE_IFLAGS = 2,
1: +  IFLA_GRE_OFLAGS = 3,
1: +  IFLA_GRE_IKEY = 4,
1: +  IFLA_GRE_OKEY = 5,
1: +  IFLA_GRE_LOCAL = 6,
1: +  IFLA_GRE_REMOTE = 7,
1: +  IFLA_GRE_TTL = 8,
1: +  IFLA_GRE_TOS = 9,
1: +  IFLA_GRE_PMTUDISC = 10,
1: +  IFLA_GRE_ENCAP_LIMIT = 11,
1: +  IFLA_GRE_FLOWINFO = 12,
1: +  IFLA_GRE_FLAGS = 13,
1: +  IFLA_GRE_ENCAP_TYPE = 14,
1: +  IFLA_GRE_ENCAP_FLAGS = 15,
1: +  IFLA_GRE_ENCAP_SPORT = 16,
1: +  IFLA_GRE_ENCAP_DPORT = 17,
1: +  IFLA_GRE_COLLECT_METADATA = 18,
1: +  IFLA_GRE_IGNORE_DF = 19,
1: +  IFLA_GRE_FWMARK = 20,
1: +  IFLA_GRE_ERSPAN_INDEX = 21,
1: +  IFLA_GRE_ERSPAN_VER = 22,
1: +  IFLA_GRE_ERSPAN_DIR = 23,
1: +  IFLA_GRE_ERSPAN_HWID = 24,
1: +  __IFLA_GRE_MAX = 25,
1:  };
1:  
1:  enum erspan_encap_type {
1: -	ERSPAN_ENCAP_NOVLAN = 0,
1: -	ERSPAN_ENCAP_ISL = 1,
1: -	ERSPAN_ENCAP_8021Q = 2,
1: -	ERSPAN_ENCAP_INFRAME = 3,
1: +  ERSPAN_ENCAP_NOVLAN = 0,
1: +  ERSPAN_ENCAP_ISL = 1,
1: +  ERSPAN_ENCAP_8021Q = 2,
1: +  ERSPAN_ENCAP_INFRAME = 3,
1:  };
1:  
1:  enum erspan_bso {
1: -	BSO_NOERROR = 0,
1: -	BSO_SHORT = 1,
1: -	BSO_OVERSIZED = 2,
1: -	BSO_BAD = 3,
1: +  BSO_NOERROR = 0,
1: +  BSO_SHORT = 1,
1: +  BSO_OVERSIZED = 2,
1: +  BSO_BAD = 3,
1:  };
1:  
1:  struct qtag_prefix {
1: -	__be16 eth_type;
1: -	__be16 tci;
1: +  __be16 eth_type;
1: +  __be16 tci;
1:  };
1:  
1:  struct udp_tunnel_nic_table_entry;
1:  
1:  struct udp_tunnel_nic {
1: -	struct work_struct work;
1: -	struct net_device *dev;
1: -	u8 need_sync: 1;
1: -	u8 need_replay: 1;
1: -	u8 work_pending: 1;
1: -	unsigned int n_tables;
1: -	long unsigned int missed;
1: -	struct udp_tunnel_nic_table_entry **entries;
1: +  struct work_struct work;
1: +  struct net_device *dev;
1: +  u8 need_sync : 1;
1: +  u8 need_replay : 1;
1: +  u8 work_pending : 1;
1: +  unsigned int n_tables;
1: +  long unsigned int missed;
1: +  struct udp_tunnel_nic_table_entry **entries;
1:  };
1:  
1:  struct udp_tunnel_nic_shared_node {
1: -	struct net_device *dev;
1: -	struct list_head list;
1: +  struct net_device *dev;
1: +  struct list_head list;
1:  };
1:  
1:  enum udp_tunnel_nic_table_entry_flags {
1: -	UDP_TUNNEL_NIC_ENTRY_ADD = 1,
1: -	UDP_TUNNEL_NIC_ENTRY_DEL = 2,
1: -	UDP_TUNNEL_NIC_ENTRY_OP_FAIL = 4,
1: -	UDP_TUNNEL_NIC_ENTRY_FROZEN = 8,
1: +  UDP_TUNNEL_NIC_ENTRY_ADD = 1,
1: +  UDP_TUNNEL_NIC_ENTRY_DEL = 2,
1: +  UDP_TUNNEL_NIC_ENTRY_OP_FAIL = 4,
1: +  UDP_TUNNEL_NIC_ENTRY_FROZEN = 8,
1:  };
1:  
1:  struct udp_tunnel_nic_table_entry {
1: -	__be16 port;
1: -	u8 type;
1: -	u8 flags;
1: -	u16 use_cnt;
1: -	u8 hw_priv;
1: +  __be16 port;
1: +  u8 type;
1: +  u8 flags;
1: +  u16 use_cnt;
1: +  u8 hw_priv;
1:  };
1:  
1:  struct xfrm_input_afinfo {
1: -	u8 family;
1: -	bool is_ipip;
1: -	int (*callback)(struct sk_buff *, u8, int);
1: +  u8 family;
1: +  bool is_ipip;
1: +  int (*callback)(struct sk_buff *, u8, int);
1:  };
1:  
1:  struct xt_get_revision {
1: -	char name[29];
1: -	__u8 revision;
1: +  char name[29];
1: +  __u8 revision;
1:  };
1:  
1:  struct ipt_ip {
1: -	struct in_addr src;
1: -	struct in_addr dst;
1: -	struct in_addr smsk;
1: -	struct in_addr dmsk;
1: -	char iniface[16];
1: -	char outiface[16];
1: -	unsigned char iniface_mask[16];
1: -	unsigned char outiface_mask[16];
1: -	__u16 proto;
1: -	__u8 flags;
1: -	__u8 invflags;
1: +  struct in_addr src;
1: +  struct in_addr dst;
1: +  struct in_addr smsk;
1: +  struct in_addr dmsk;
1: +  char iniface[16];
1: +  char outiface[16];
1: +  unsigned char iniface_mask[16];
1: +  unsigned char outiface_mask[16];
1: +  __u16 proto;
1: +  __u8 flags;
1: +  __u8 invflags;
1:  };
1:  
1:  struct ipt_entry {
1: -	struct ipt_ip ip;
1: -	unsigned int nfcache;
1: -	__u16 target_offset;
1: -	__u16 next_offset;
1: -	unsigned int comefrom;
1: -	struct xt_counters counters;
1: -	unsigned char elems[0];
1: +  struct ipt_ip ip;
1: +  unsigned int nfcache;
1: +  __u16 target_offset;
1: +  __u16 next_offset;
1: +  unsigned int comefrom;
1: +  struct xt_counters counters;
1: +  unsigned char elems[0];
1:  };
1:  
1:  struct ipt_icmp {
1: -	__u8 type;
1: -	__u8 code[2];
1: -	__u8 invflags;
1: +  __u8 type;
1: +  __u8 code[2];
1: +  __u8 invflags;
1:  };
1:  
1:  struct ipt_getinfo {
1: -	char name[32];
1: -	unsigned int valid_hooks;
1: -	unsigned int hook_entry[5];
1: -	unsigned int underflow[5];
1: -	unsigned int num_entries;
1: -	unsigned int size;
1: +  char name[32];
1: +  unsigned int valid_hooks;
1: +  unsigned int hook_entry[5];
1: +  unsigned int underflow[5];
1: +  unsigned int num_entries;
1: +  unsigned int size;
1:  };
1:  
1:  struct ipt_replace {
1: -	char name[32];
1: -	unsigned int valid_hooks;
1: -	unsigned int num_entries;
1: -	unsigned int size;
1: -	unsigned int hook_entry[5];
1: -	unsigned int underflow[5];
1: -	unsigned int num_counters;
1: -	struct xt_counters *counters;
1: -	struct ipt_entry entries[0];
1: +  char name[32];
1: +  unsigned int valid_hooks;
1: +  unsigned int num_entries;
1: +  unsigned int size;
1: +  unsigned int hook_entry[5];
1: +  unsigned int underflow[5];
1: +  unsigned int num_counters;
1: +  struct xt_counters *counters;
1: +  struct ipt_entry entries[0];
1:  };
1:  
1:  struct ipt_get_entries {
1: -	char name[32];
1: -	unsigned int size;
1: -	struct ipt_entry entrytable[0];
1: +  char name[32];
1: +  unsigned int size;
1: +  struct ipt_entry entrytable[0];
1:  };
1:  
1:  struct ipt_standard {
1: -	struct ipt_entry entry;
1: -	struct xt_standard_target target;
1: +  struct ipt_entry entry;
1: +  struct xt_standard_target target;
1:  };
1:  
1:  struct ipt_error {
1: -	struct ipt_entry entry;
1: -	struct xt_error_target target;
1: +  struct ipt_entry entry;
1: +  struct xt_error_target target;
1:  };
1:  
1:  struct compat_ipt_entry {
1: -	struct ipt_ip ip;
1: -	compat_uint_t nfcache;
1: -	__u16 target_offset;
1: -	__u16 next_offset;
1: -	compat_uint_t comefrom;
1: -	struct compat_xt_counters counters;
1: -	unsigned char elems[0];
1: +  struct ipt_ip ip;
1: +  compat_uint_t nfcache;
1: +  __u16 target_offset;
1: +  __u16 next_offset;
1: +  compat_uint_t comefrom;
1: +  struct compat_xt_counters counters;
1: +  unsigned char elems[0];
1:  };
1:  
1:  struct compat_ipt_replace {
1: -	char name[32];
1: -	u32 valid_hooks;
1: -	u32 num_entries;
1: -	u32 size;
1: -	u32 hook_entry[5];
1: -	u32 underflow[5];
1: -	u32 num_counters;
1: -	compat_uptr_t counters;
1: -	struct compat_ipt_entry entries[0];
1: +  char name[32];
1: +  u32 valid_hooks;
1: +  u32 num_entries;
1: +  u32 size;
1: +  u32 hook_entry[5];
1: +  u32 underflow[5];
1: +  u32 num_counters;
1: +  compat_uptr_t counters;
1: +  struct compat_ipt_entry entries[0];
1:  } __attribute__((packed));
1:  
1:  struct compat_ipt_get_entries {
1: -	char name[32];
1: -	compat_uint_t size;
1: -	struct compat_ipt_entry entrytable[0];
1: +  char name[32];
1: +  compat_uint_t size;
1: +  struct compat_ipt_entry entrytable[0];
1:  } __attribute__((packed));
1:  
1:  struct bictcp {
1: -	u32 cnt;
1: -	u32 last_max_cwnd;
1: -	u32 last_cwnd;
1: -	u32 last_time;
1: -	u32 bic_origin_point;
1: -	u32 bic_K;
1: -	u32 delay_min;
1: -	u32 epoch_start;
1: -	u32 ack_cnt;
1: -	u32 tcp_cwnd;
1: -	u16 unused;
1: -	u8 sample_cnt;
1: -	u8 found;
1: -	u32 round_start;
1: -	u32 end_seq;
1: -	u32 last_ack;
1: -	u32 curr_rtt;
1: +  u32 cnt;
1: +  u32 last_max_cwnd;
1: +  u32 last_cwnd;
1: +  u32 last_time;
1: +  u32 bic_origin_point;
1: +  u32 bic_K;
1: +  u32 delay_min;
1: +  u32 epoch_start;
1: +  u32 ack_cnt;
1: +  u32 tcp_cwnd;
1: +  u16 unused;
1: +  u8 sample_cnt;
1: +  u8 found;
1: +  u32 round_start;
1: +  u32 end_seq;
1: +  u32 last_ack;
1: +  u32 curr_rtt;
1:  };
1:  
1:  struct tls_rec {
1: -	struct list_head list;
1: -	int tx_ready;
1: -	int tx_flags;
1: -	struct sk_msg msg_plaintext;
1: -	struct sk_msg msg_encrypted;
1: -	struct scatterlist sg_aead_in[2];
1: -	struct scatterlist sg_aead_out[2];
1: -	char content_type;
1: -	struct scatterlist sg_content_type;
1: -	char aad_space[13];
1: -	u8 iv_data[16];
1: -	struct aead_request aead_req;
1: -	u8 aead_req_ctx[0];
1: +  struct list_head list;
1: +  int tx_ready;
1: +  int tx_flags;
1: +  struct sk_msg msg_plaintext;
1: +  struct sk_msg msg_encrypted;
1: +  struct scatterlist sg_aead_in[2];
1: +  struct scatterlist sg_aead_out[2];
1: +  char content_type;
1: +  struct scatterlist sg_content_type;
1: +  char aad_space[13];
1: +  u8 iv_data[16];
1: +  struct aead_request aead_req;
1: +  u8 aead_req_ctx[0];
1:  };
1:  
1:  struct tx_work {
1: -	struct delayed_work work;
1: -	struct sock *sk;
1: +  struct delayed_work work;
1: +  struct sock *sk;
1:  };
1:  
1:  struct tls_sw_context_tx {
1: -	struct crypto_aead *aead_send;
1: -	struct crypto_wait async_wait;
1: -	struct tx_work tx_work;
1: -	struct tls_rec *open_rec;
1: -	struct list_head tx_list;
1: -	atomic_t encrypt_pending;
1: -	spinlock_t encrypt_compl_lock;
1: -	int async_notify;
1: -	u8 async_capable: 1;
1: -	long unsigned int tx_bitmask;
1: +  struct crypto_aead *aead_send;
1: +  struct crypto_wait async_wait;
1: +  struct tx_work tx_work;
1: +  struct tls_rec *open_rec;
1: +  struct list_head tx_list;
1: +  atomic_t encrypt_pending;
1: +  spinlock_t encrypt_compl_lock;
1: +  int async_notify;
1: +  u8 async_capable : 1;
1: +  long unsigned int tx_bitmask;
1:  };
1:  
1:  enum {
1: -	TCP_BPF_IPV4 = 0,
1: -	TCP_BPF_IPV6 = 1,
1: -	TCP_BPF_NUM_PROTS = 2,
1: +  TCP_BPF_IPV4 = 0,
1: +  TCP_BPF_IPV6 = 1,
1: +  TCP_BPF_NUM_PROTS = 2,
1:  };
1:  
1:  enum {
1: -	TCP_BPF_BASE = 0,
1: -	TCP_BPF_TX = 1,
1: -	TCP_BPF_NUM_CFGS = 2,
1: +  TCP_BPF_BASE = 0,
1: +  TCP_BPF_TX = 1,
1: +  TCP_BPF_NUM_CFGS = 2,
1:  };
1:  
1:  enum {
1: -	UDP_BPF_IPV4 = 0,
1: -	UDP_BPF_IPV6 = 1,
1: -	UDP_BPF_NUM_PROTS = 2,
1: +  UDP_BPF_IPV4 = 0,
1: +  UDP_BPF_IPV6 = 1,
1: +  UDP_BPF_NUM_PROTS = 2,
1:  };
1:  
1:  struct netlbl_audit {
1: -	u32 secid;
1: -	kuid_t loginuid;
1: -	unsigned int sessionid;
1: +  u32 secid;
1: +  kuid_t loginuid;
1: +  unsigned int sessionid;
1:  };
1:  
1:  struct cipso_v4_std_map_tbl {
1: -	struct {
1: -		u32 *cipso;
1: -		u32 *local;
1: -		u32 cipso_size;
1: -		u32 local_size;
1: -	} lvl;
1: -	struct {
1: -		u32 *cipso;
1: -		u32 *local;
1: -		u32 cipso_size;
1: -		u32 local_size;
1: -	} cat;
1: +  struct {
1: +    u32 *cipso;
1: +    u32 *local;
1: +    u32 cipso_size;
1: +    u32 local_size;
1: +  } lvl;
1: +  struct {
1: +    u32 *cipso;
1: +    u32 *local;
1: +    u32 cipso_size;
1: +    u32 local_size;
1: +  } cat;
1:  };
1:  
1:  struct cipso_v4_doi {
1: -	u32 doi;
1: -	u32 type;
1: -	union {
1: -		struct cipso_v4_std_map_tbl *std;
1: -	} map;
1: -	u8 tags[5];
1: -	refcount_t refcount;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  u32 doi;
1: +  u32 type;
1: +  union {
1: +    struct cipso_v4_std_map_tbl *std;
1: +  } map;
1: +  u8 tags[5];
1: +  refcount_t refcount;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct cipso_v4_map_cache_bkt {
1: -	spinlock_t lock;
1: -	u32 size;
1: -	struct list_head list;
1: +  spinlock_t lock;
1: +  u32 size;
1: +  struct list_head list;
1:  };
1:  
1:  struct cipso_v4_map_cache_entry {
1: -	u32 hash;
1: -	unsigned char *key;
1: -	size_t key_len;
1: -	struct netlbl_lsm_cache *lsm_data;
1: -	u32 activity;
1: -	struct list_head list;
1: +  u32 hash;
1: +  unsigned char *key;
1: +  size_t key_len;
1: +  struct netlbl_lsm_cache *lsm_data;
1: +  u32 activity;
1: +  struct list_head list;
1:  };
1:  
1:  struct xfrm_policy_afinfo {
1: -	struct dst_ops *dst_ops;
1: -	struct dst_entry * (*dst_lookup)(struct net *, int, int, const xfrm_address_t *, const xfrm_address_t *, u32);
1: -	int (*get_saddr)(struct net *, int, xfrm_address_t *, xfrm_address_t *, u32);
1: -	int (*fill_dst)(struct xfrm_dst *, struct net_device *, const struct flowi *);
1: -	struct dst_entry * (*blackhole_route)(struct net *, struct dst_entry *);
1: +  struct dst_ops *dst_ops;
1: +  struct dst_entry *(*dst_lookup)(struct net *, int, int,
1: +                                  const xfrm_address_t *,
1: +                                  const xfrm_address_t *, u32);
1: +  int (*get_saddr)(struct net *, int, xfrm_address_t *, xfrm_address_t *, u32);
1: +  int (*fill_dst)(struct xfrm_dst *, struct net_device *, const struct flowi *);
1: +  struct dst_entry *(*blackhole_route)(struct net *, struct dst_entry *);
1:  };
1:  
1:  struct xfrm_state_afinfo {
1: -	u8 family;
1: -	u8 proto;
1: -	const struct xfrm_type_offload *type_offload_esp;
1: -	const struct xfrm_type *type_esp;
1: -	const struct xfrm_type *type_ipip;
1: -	const struct xfrm_type *type_ipip6;
1: -	const struct xfrm_type *type_comp;
1: -	const struct xfrm_type *type_ah;
1: -	const struct xfrm_type *type_routing;
1: -	const struct xfrm_type *type_dstopts;
1: -	int (*output)(struct net *, struct sock *, struct sk_buff *);
1: -	int (*transport_finish)(struct sk_buff *, int);
1: -	void (*local_error)(struct sk_buff *, u32);
1: +  u8 family;
1: +  u8 proto;
1: +  const struct xfrm_type_offload *type_offload_esp;
1: +  const struct xfrm_type *type_esp;
1: +  const struct xfrm_type *type_ipip;
1: +  const struct xfrm_type *type_ipip6;
1: +  const struct xfrm_type *type_comp;
1: +  const struct xfrm_type *type_ah;
1: +  const struct xfrm_type *type_routing;
1: +  const struct xfrm_type *type_dstopts;
1: +  int (*output)(struct net *, struct sock *, struct sk_buff *);
1: +  int (*transport_finish)(struct sk_buff *, int);
1: +  void (*local_error)(struct sk_buff *, u32);
1:  };
1:  
1:  struct ip6_tnl;
1:  
1:  struct xfrm_tunnel_skb_cb {
1: -	union {
1: -		struct inet_skb_parm h4;
1: -		struct inet6_skb_parm h6;
1: -	} header;
1: -	union {
1: -		struct ip_tunnel *ip4;
1: -		struct ip6_tnl *ip6;
1: -	} tunnel;
1: +  union {
1: +    struct inet_skb_parm h4;
1: +    struct inet6_skb_parm h6;
1: +  } header;
1: +  union {
1: +    struct ip_tunnel *ip4;
1: +    struct ip6_tnl *ip6;
1: +  } tunnel;
1:  };
1:  
1:  struct xfrm_mode_skb_cb {
1: -	struct xfrm_tunnel_skb_cb header;
1: -	__be16 id;
1: -	__be16 frag_off;
1: -	u8 ihl;
1: -	u8 tos;
1: -	u8 ttl;
1: -	u8 protocol;
1: -	u8 optlen;
1: -	u8 flow_lbl[3];
1: +  struct xfrm_tunnel_skb_cb header;
1: +  __be16 id;
1: +  __be16 frag_off;
1: +  u8 ihl;
1: +  u8 tos;
1: +  u8 ttl;
1: +  u8 protocol;
1: +  u8 optlen;
1: +  u8 flow_lbl[3];
1:  };
1:  
1:  struct xfrm_spi_skb_cb {
1: -	struct xfrm_tunnel_skb_cb header;
1: -	unsigned int daddroff;
1: -	unsigned int family;
1: -	__be32 seq;
1: +  struct xfrm_tunnel_skb_cb header;
1: +  unsigned int daddroff;
1: +  unsigned int family;
1: +  __be32 seq;
1:  };
1:  
1:  struct xfrm4_protocol {
1: -	int (*handler)(struct sk_buff *);
1: -	int (*input_handler)(struct sk_buff *, int, __be32, int);
1: -	int (*cb_handler)(struct sk_buff *, int);
1: -	int (*err_handler)(struct sk_buff *, u32);
1: -	struct xfrm4_protocol *next;
1: -	int priority;
1: +  int (*handler)(struct sk_buff *);
1: +  int (*input_handler)(struct sk_buff *, int, __be32, int);
1: +  int (*cb_handler)(struct sk_buff *, int);
1: +  int (*err_handler)(struct sk_buff *, u32);
1: +  struct xfrm4_protocol *next;
1: +  int priority;
1:  };
1:  
1:  typedef u64 (*btf_bpf_tcp_send_ack)(struct tcp_sock *, u32);
1:  
1:  enum {
1: -	INET_ULP_INFO_UNSPEC = 0,
1: -	INET_ULP_INFO_NAME = 1,
1: -	INET_ULP_INFO_TLS = 2,
1: -	INET_ULP_INFO_MPTCP = 3,
1: -	__INET_ULP_INFO_MAX = 4,
1: +  INET_ULP_INFO_UNSPEC = 0,
1: +  INET_ULP_INFO_NAME = 1,
1: +  INET_ULP_INFO_TLS = 2,
1: +  INET_ULP_INFO_MPTCP = 3,
1: +  __INET_ULP_INFO_MAX = 4,
1:  };
1:  
1:  enum {
1: -	TLS_INFO_UNSPEC = 0,
1: -	TLS_INFO_VERSION = 1,
1: -	TLS_INFO_CIPHER = 2,
1: -	TLS_INFO_TXCONF = 3,
1: -	TLS_INFO_RXCONF = 4,
1: -	__TLS_INFO_MAX = 5,
1: +  TLS_INFO_UNSPEC = 0,
1: +  TLS_INFO_VERSION = 1,
1: +  TLS_INFO_CIPHER = 2,
1: +  TLS_INFO_TXCONF = 3,
1: +  TLS_INFO_RXCONF = 4,
1: +  __TLS_INFO_MAX = 5,
1:  };
1:  
1:  enum {
1: -	TLS_BASE = 0,
1: -	TLS_SW = 1,
1: -	TLS_HW = 2,
1: -	TLS_HW_RECORD = 3,
1: -	TLS_NUM_CONFIG = 4,
1: +  TLS_BASE = 0,
1: +  TLS_SW = 1,
1: +  TLS_HW = 2,
1: +  TLS_HW_RECORD = 3,
1: +  TLS_NUM_CONFIG = 4,
1:  };
1:  
1:  enum {
1: -	TLSV4 = 0,
1: -	TLSV6 = 1,
1: -	TLS_NUM_PROTS = 2,
1: +  TLSV4 = 0,
1: +  TLSV6 = 1,
1: +  TLS_NUM_PROTS = 2,
1:  };
1:  
1:  struct tls12_crypto_info_aes_ccm_128 {
1: -	struct tls_crypto_info info;
1: -	unsigned char iv[8];
1: -	unsigned char key[16];
1: -	unsigned char salt[4];
1: -	unsigned char rec_seq[8];
1: +  struct tls_crypto_info info;
1: +  unsigned char iv[8];
1: +  unsigned char key[16];
1: +  unsigned char salt[4];
1: +  unsigned char rec_seq[8];
1:  };
1:  
1:  struct tls_msg {
1: -	struct strp_msg rxm;
1: -	u8 control;
1: +  struct strp_msg rxm;
1: +  u8 control;
1:  };
1:  
1:  struct trace_event_raw_tls_device_offload_set {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	u64 rec_no;
1: -	int dir;
1: -	u32 tcp_seq;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  u64 rec_no;
1: +  int dir;
1: +  u32 tcp_seq;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tls_device_decrypted {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	u64 rec_no;
1: -	u32 tcp_seq;
1: -	u32 rec_len;
1: -	bool encrypted;
1: -	bool decrypted;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  u64 rec_no;
1: +  u32 tcp_seq;
1: +  u32 rec_len;
1: +  bool encrypted;
1: +  bool decrypted;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tls_device_rx_resync_send {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	u64 rec_no;
1: -	u32 tcp_seq;
1: -	int sync_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  u64 rec_no;
1: +  u32 tcp_seq;
1: +  int sync_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tls_device_rx_resync_nh_schedule {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tls_device_rx_resync_nh_delay {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	u32 sock_data;
1: -	u32 rec_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  u32 sock_data;
1: +  u32 rec_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tls_device_tx_resync_req {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	u32 tcp_seq;
1: -	u32 exp_tcp_seq;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  u32 tcp_seq;
1: +  u32 exp_tcp_seq;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tls_device_tx_resync_send {
1: -	struct trace_entry ent;
1: -	struct sock *sk;
1: -	u64 rec_no;
1: -	u32 tcp_seq;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  struct sock *sk;
1: +  u64 rec_no;
1: +  u32 tcp_seq;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_tls_device_offload_set {};
1: @@ -121492,648 +122849,660 @@ struct trace_event_data_offsets_tls_device_tx_resync_req {};
1:  
1:  struct trace_event_data_offsets_tls_device_tx_resync_send {};
1:  
1: -typedef void (*btf_trace_tls_device_offload_set)(void *, struct sock *, int, u32, u8 *, int);
1: +typedef void (*btf_trace_tls_device_offload_set)(void *, struct sock *, int,
1: +                                                 u32, u8 *, int);
1:  
1: -typedef void (*btf_trace_tls_device_decrypted)(void *, struct sock *, u32, u8 *, u32, bool, bool);
1: +typedef void (*btf_trace_tls_device_decrypted)(void *, struct sock *, u32, u8 *,
1: +                                               u32, bool, bool);
1:  
1: -typedef void (*btf_trace_tls_device_rx_resync_send)(void *, struct sock *, u32, u8 *, int);
1: +typedef void (*btf_trace_tls_device_rx_resync_send)(void *, struct sock *, u32,
1: +                                                    u8 *, int);
1:  
1: -typedef void (*btf_trace_tls_device_rx_resync_nh_schedule)(void *, struct sock *);
1: +typedef void (*btf_trace_tls_device_rx_resync_nh_schedule)(void *,
1: +                                                           struct sock *);
1:  
1: -typedef void (*btf_trace_tls_device_rx_resync_nh_delay)(void *, struct sock *, u32, u32);
1: +typedef void (*btf_trace_tls_device_rx_resync_nh_delay)(void *, struct sock *,
1: +                                                        u32, u32);
1:  
1: -typedef void (*btf_trace_tls_device_tx_resync_req)(void *, struct sock *, u32, u32);
1: +typedef void (*btf_trace_tls_device_tx_resync_req)(void *, struct sock *, u32,
1: +                                                   u32);
1:  
1: -typedef void (*btf_trace_tls_device_tx_resync_send)(void *, struct sock *, u32, u8 *);
1: +typedef void (*btf_trace_tls_device_tx_resync_send)(void *, struct sock *, u32,
1: +                                                    u8 *);
1:  
1:  struct seqcount_mutex {
1: -	seqcount_t seqcount;
1: +  seqcount_t seqcount;
1:  };
1:  
1:  typedef struct seqcount_mutex seqcount_mutex_t;
1:  
1:  enum {
1: -	XFRM_STATE_VOID = 0,
1: -	XFRM_STATE_ACQ = 1,
1: -	XFRM_STATE_VALID = 2,
1: -	XFRM_STATE_ERROR = 3,
1: -	XFRM_STATE_EXPIRED = 4,
1: -	XFRM_STATE_DEAD = 5,
1: +  XFRM_STATE_VOID = 0,
1: +  XFRM_STATE_ACQ = 1,
1: +  XFRM_STATE_VALID = 2,
1: +  XFRM_STATE_ERROR = 3,
1: +  XFRM_STATE_EXPIRED = 4,
1: +  XFRM_STATE_DEAD = 5,
1:  };
1:  
1:  struct xfrm_if;
1:  
1:  struct xfrm_if_cb {
1: -	struct xfrm_if * (*decode_session)(struct sk_buff *, short unsigned int);
1: +  struct xfrm_if *(*decode_session)(struct sk_buff *, short unsigned int);
1:  };
1:  
1:  struct xfrm_if_parms {
1: -	int link;
1: -	u32 if_id;
1: +  int link;
1: +  u32 if_id;
1:  };
1:  
1:  struct xfrm_if {
1: -	struct xfrm_if *next;
1: -	struct net_device *dev;
1: -	struct net *net;
1: -	struct xfrm_if_parms p;
1: -	struct gro_cells gro_cells;
1: +  struct xfrm_if *next;
1: +  struct net_device *dev;
1: +  struct net *net;
1: +  struct xfrm_if_parms p;
1: +  struct gro_cells gro_cells;
1:  };
1:  
1:  struct xfrm_policy_walk {
1: -	struct xfrm_policy_walk_entry walk;
1: -	u8 type;
1: -	u32 seq;
1: +  struct xfrm_policy_walk_entry walk;
1: +  u8 type;
1: +  u32 seq;
1:  };
1:  
1:  struct xfrmk_spdinfo {
1: -	u32 incnt;
1: -	u32 outcnt;
1: -	u32 fwdcnt;
1: -	u32 inscnt;
1: -	u32 outscnt;
1: -	u32 fwdscnt;
1: -	u32 spdhcnt;
1: -	u32 spdhmcnt;
1: +  u32 incnt;
1: +  u32 outcnt;
1: +  u32 fwdcnt;
1: +  u32 inscnt;
1: +  u32 outscnt;
1: +  u32 fwdscnt;
1: +  u32 spdhcnt;
1: +  u32 spdhmcnt;
1:  };
1:  
1:  struct ip6_mh {
1: -	__u8 ip6mh_proto;
1: -	__u8 ip6mh_hdrlen;
1: -	__u8 ip6mh_type;
1: -	__u8 ip6mh_reserved;
1: -	__u16 ip6mh_cksum;
1: -	__u8 data[0];
1: +  __u8 ip6mh_proto;
1: +  __u8 ip6mh_hdrlen;
1: +  __u8 ip6mh_type;
1: +  __u8 ip6mh_reserved;
1: +  __u16 ip6mh_cksum;
1: +  __u8 data[0];
1:  };
1:  
1:  struct xfrm_flo {
1: -	struct dst_entry *dst_orig;
1: -	u8 flags;
1: +  struct dst_entry *dst_orig;
1: +  u8 flags;
1:  };
1:  
1:  struct xfrm_pol_inexact_node {
1: -	struct rb_node node;
1: -	union {
1: -		xfrm_address_t addr;
1: -		struct callback_head rcu;
1: -	};
1: -	u8 prefixlen;
1: -	struct rb_root root;
1: -	struct hlist_head hhead;
1: +  struct rb_node node;
1: +  union {
1: +    xfrm_address_t addr;
1: +    struct callback_head rcu;
1: +  };
1: +  u8 prefixlen;
1: +  struct rb_root root;
1: +  struct hlist_head hhead;
1:  };
1:  
1:  struct xfrm_pol_inexact_key {
1: -	possible_net_t net;
1: -	u32 if_id;
1: -	u16 family;
1: -	u8 dir;
1: -	u8 type;
1: +  possible_net_t net;
1: +  u32 if_id;
1: +  u16 family;
1: +  u8 dir;
1: +  u8 type;
1:  };
1:  
1:  struct xfrm_pol_inexact_bin {
1: -	struct xfrm_pol_inexact_key k;
1: -	struct rhash_head head;
1: -	struct hlist_head hhead;
1: -	seqcount_spinlock_t count;
1: -	struct rb_root root_d;
1: -	struct rb_root root_s;
1: -	struct list_head inexact_bins;
1: -	struct callback_head rcu;
1: +  struct xfrm_pol_inexact_key k;
1: +  struct rhash_head head;
1: +  struct hlist_head hhead;
1: +  seqcount_spinlock_t count;
1: +  struct rb_root root_d;
1: +  struct rb_root root_s;
1: +  struct list_head inexact_bins;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum xfrm_pol_inexact_candidate_type {
1: -	XFRM_POL_CAND_BOTH = 0,
1: -	XFRM_POL_CAND_SADDR = 1,
1: -	XFRM_POL_CAND_DADDR = 2,
1: -	XFRM_POL_CAND_ANY = 3,
1: -	XFRM_POL_CAND_MAX = 4,
1: +  XFRM_POL_CAND_BOTH = 0,
1: +  XFRM_POL_CAND_SADDR = 1,
1: +  XFRM_POL_CAND_DADDR = 2,
1: +  XFRM_POL_CAND_ANY = 3,
1: +  XFRM_POL_CAND_MAX = 4,
1:  };
1:  
1:  struct xfrm_pol_inexact_candidates {
1: -	struct hlist_head *res[4];
1: +  struct hlist_head *res[4];
1:  };
1:  
1:  enum xfrm_ae_ftype_t {
1: -	XFRM_AE_UNSPEC = 0,
1: -	XFRM_AE_RTHR = 1,
1: -	XFRM_AE_RVAL = 2,
1: -	XFRM_AE_LVAL = 4,
1: -	XFRM_AE_ETHR = 8,
1: -	XFRM_AE_CR = 16,
1: -	XFRM_AE_CE = 32,
1: -	XFRM_AE_CU = 64,
1: -	__XFRM_AE_MAX = 65,
1: +  XFRM_AE_UNSPEC = 0,
1: +  XFRM_AE_RTHR = 1,
1: +  XFRM_AE_RVAL = 2,
1: +  XFRM_AE_LVAL = 4,
1: +  XFRM_AE_ETHR = 8,
1: +  XFRM_AE_CR = 16,
1: +  XFRM_AE_CE = 32,
1: +  XFRM_AE_CU = 64,
1: +  __XFRM_AE_MAX = 65,
1:  };
1:  
1:  enum xfrm_nlgroups {
1: -	XFRMNLGRP_NONE = 0,
1: -	XFRMNLGRP_ACQUIRE = 1,
1: -	XFRMNLGRP_EXPIRE = 2,
1: -	XFRMNLGRP_SA = 3,
1: -	XFRMNLGRP_POLICY = 4,
1: -	XFRMNLGRP_AEVENTS = 5,
1: -	XFRMNLGRP_REPORT = 6,
1: -	XFRMNLGRP_MIGRATE = 7,
1: -	XFRMNLGRP_MAPPING = 8,
1: -	__XFRMNLGRP_MAX = 9,
1: +  XFRMNLGRP_NONE = 0,
1: +  XFRMNLGRP_ACQUIRE = 1,
1: +  XFRMNLGRP_EXPIRE = 2,
1: +  XFRMNLGRP_SA = 3,
1: +  XFRMNLGRP_POLICY = 4,
1: +  XFRMNLGRP_AEVENTS = 5,
1: +  XFRMNLGRP_REPORT = 6,
1: +  XFRMNLGRP_MIGRATE = 7,
1: +  XFRMNLGRP_MAPPING = 8,
1: +  __XFRMNLGRP_MAX = 9,
1:  };
1:  
1:  enum {
1: -	XFRM_MODE_FLAG_TUNNEL = 1,
1: +  XFRM_MODE_FLAG_TUNNEL = 1,
1:  };
1:  
1:  struct km_event {
1: -	union {
1: -		u32 hard;
1: -		u32 proto;
1: -		u32 byid;
1: -		u32 aevent;
1: -		u32 type;
1: -	} data;
1: -	u32 seq;
1: -	u32 portid;
1: -	u32 event;
1: -	struct net *net;
1: +  union {
1: +    u32 hard;
1: +    u32 proto;
1: +    u32 byid;
1: +    u32 aevent;
1: +    u32 type;
1: +  } data;
1: +  u32 seq;
1: +  u32 portid;
1: +  u32 event;
1: +  struct net *net;
1:  };
1:  
1:  struct xfrm_kmaddress {
1: -	xfrm_address_t local;
1: -	xfrm_address_t remote;
1: -	u32 reserved;
1: -	u16 family;
1: +  xfrm_address_t local;
1: +  xfrm_address_t remote;
1: +  u32 reserved;
1: +  u16 family;
1:  };
1:  
1:  struct xfrm_migrate {
1: -	xfrm_address_t old_daddr;
1: -	xfrm_address_t old_saddr;
1: -	xfrm_address_t new_daddr;
1: -	xfrm_address_t new_saddr;
1: -	u8 proto;
1: -	u8 mode;
1: -	u16 reserved;
1: -	u32 reqid;
1: -	u16 old_family;
1: -	u16 new_family;
1: +  xfrm_address_t old_daddr;
1: +  xfrm_address_t old_saddr;
1: +  xfrm_address_t new_daddr;
1: +  xfrm_address_t new_saddr;
1: +  u8 proto;
1: +  u8 mode;
1: +  u16 reserved;
1: +  u32 reqid;
1: +  u16 old_family;
1: +  u16 new_family;
1:  };
1:  
1:  struct xfrm_mgr {
1: -	struct list_head list;
1: -	int (*notify)(struct xfrm_state *, const struct km_event *);
1: -	int (*acquire)(struct xfrm_state *, struct xfrm_tmpl *, struct xfrm_policy *);
1: -	struct xfrm_policy * (*compile_policy)(struct sock *, int, u8 *, int, int *);
1: -	int (*new_mapping)(struct xfrm_state *, xfrm_address_t *, __be16);
1: -	int (*notify_policy)(struct xfrm_policy *, int, const struct km_event *);
1: -	int (*report)(struct net *, u8, struct xfrm_selector *, xfrm_address_t *);
1: -	int (*migrate)(const struct xfrm_selector *, u8, u8, const struct xfrm_migrate *, int, const struct xfrm_kmaddress *, const struct xfrm_encap_tmpl *);
1: -	bool (*is_alive)(const struct km_event *);
1: +  struct list_head list;
1: +  int (*notify)(struct xfrm_state *, const struct km_event *);
1: +  int (*acquire)(struct xfrm_state *, struct xfrm_tmpl *, struct xfrm_policy *);
1: +  struct xfrm_policy *(*compile_policy)(struct sock *, int, u8 *, int, int *);
1: +  int (*new_mapping)(struct xfrm_state *, xfrm_address_t *, __be16);
1: +  int (*notify_policy)(struct xfrm_policy *, int, const struct km_event *);
1: +  int (*report)(struct net *, u8, struct xfrm_selector *, xfrm_address_t *);
1: +  int (*migrate)(const struct xfrm_selector *, u8, u8,
1: +                 const struct xfrm_migrate *, int,
1: +                 const struct xfrm_kmaddress *, const struct xfrm_encap_tmpl *);
1: +  bool (*is_alive)(const struct km_event *);
1:  };
1:  
1:  struct xfrmk_sadinfo {
1: -	u32 sadhcnt;
1: -	u32 sadhmcnt;
1: -	u32 sadcnt;
1: +  u32 sadhcnt;
1: +  u32 sadhmcnt;
1: +  u32 sadcnt;
1:  };
1:  
1:  struct xfrm_translator {
1: -	int (*alloc_compat)(struct sk_buff *, const struct nlmsghdr *);
1: -	struct nlmsghdr * (*rcv_msg_compat)(const struct nlmsghdr *, int, const struct nla_policy *, struct netlink_ext_ack *);
1: -	int (*xlate_user_policy_sockptr)(u8 **, int);
1: -	struct module *owner;
1: +  int (*alloc_compat)(struct sk_buff *, const struct nlmsghdr *);
1: +  struct nlmsghdr *(*rcv_msg_compat)(const struct nlmsghdr *, int,
1: +                                     const struct nla_policy *,
1: +                                     struct netlink_ext_ack *);
1: +  int (*xlate_user_policy_sockptr)(u8 **, int);
1: +  struct module *owner;
1:  };
1:  
1:  struct ip_beet_phdr {
1: -	__u8 nexthdr;
1: -	__u8 hdrlen;
1: -	__u8 padlen;
1: -	__u8 reserved;
1: +  __u8 nexthdr;
1: +  __u8 hdrlen;
1: +  __u8 padlen;
1: +  __u8 reserved;
1:  };
1:  
1:  struct __ip6_tnl_parm {
1: -	char name[16];
1: -	int link;
1: -	__u8 proto;
1: -	__u8 encap_limit;
1: -	__u8 hop_limit;
1: -	bool collect_md;
1: -	__be32 flowinfo;
1: -	__u32 flags;
1: -	struct in6_addr laddr;
1: -	struct in6_addr raddr;
1: -	__be16 i_flags;
1: -	__be16 o_flags;
1: -	__be32 i_key;
1: -	__be32 o_key;
1: -	__u32 fwmark;
1: -	__u32 index;
1: -	__u8 erspan_ver;
1: -	__u8 dir;
1: -	__u16 hwid;
1: +  char name[16];
1: +  int link;
1: +  __u8 proto;
1: +  __u8 encap_limit;
1: +  __u8 hop_limit;
1: +  bool collect_md;
1: +  __be32 flowinfo;
1: +  __u32 flags;
1: +  struct in6_addr laddr;
1: +  struct in6_addr raddr;
1: +  __be16 i_flags;
1: +  __be16 o_flags;
1: +  __be32 i_key;
1: +  __be32 o_key;
1: +  __u32 fwmark;
1: +  __u32 index;
1: +  __u8 erspan_ver;
1: +  __u8 dir;
1: +  __u16 hwid;
1:  };
1:  
1:  struct ip6_tnl {
1: -	struct ip6_tnl *next;
1: -	struct net_device *dev;
1: -	struct net *net;
1: -	struct __ip6_tnl_parm parms;
1: -	struct flowi fl;
1: -	struct dst_cache dst_cache;
1: -	struct gro_cells gro_cells;
1: -	int err_count;
1: -	long unsigned int err_time;
1: -	__u32 i_seqno;
1: -	__u32 o_seqno;
1: -	int hlen;
1: -	int tun_hlen;
1: -	int encap_hlen;
1: -	struct ip_tunnel_encap encap;
1: -	int mlink;
1: +  struct ip6_tnl *next;
1: +  struct net_device *dev;
1: +  struct net *net;
1: +  struct __ip6_tnl_parm parms;
1: +  struct flowi fl;
1: +  struct dst_cache dst_cache;
1: +  struct gro_cells gro_cells;
1: +  int err_count;
1: +  long unsigned int err_time;
1: +  __u32 i_seqno;
1: +  __u32 o_seqno;
1: +  int hlen;
1: +  int tun_hlen;
1: +  int encap_hlen;
1: +  struct ip_tunnel_encap encap;
1: +  int mlink;
1:  };
1:  
1:  struct xfrm_skb_cb {
1: -	struct xfrm_tunnel_skb_cb header;
1: -	union {
1: -		struct {
1: -			__u32 low;
1: -			__u32 hi;
1: -		} output;
1: -		struct {
1: -			__be32 low;
1: -			__be32 hi;
1: -		} input;
1: -	} seq;
1: +  struct xfrm_tunnel_skb_cb header;
1: +  union {
1: +    struct {
1: +      __u32 low;
1: +      __u32 hi;
1: +    } output;
1: +    struct {
1: +      __be32 low;
1: +      __be32 hi;
1: +    } input;
1: +  } seq;
1:  };
1:  
1:  struct xfrm_trans_tasklet {
1: -	struct tasklet_struct tasklet;
1: -	struct sk_buff_head queue;
1: +  struct tasklet_struct tasklet;
1: +  struct sk_buff_head queue;
1:  };
1:  
1:  struct xfrm_trans_cb {
1: -	union {
1: -		struct inet_skb_parm h4;
1: -		struct inet6_skb_parm h6;
1: -	} header;
1: -	int (*finish)(struct net *, struct sock *, struct sk_buff *);
1: -	struct net *net;
1: +  union {
1: +    struct inet_skb_parm h4;
1: +    struct inet6_skb_parm h6;
1: +  } header;
1: +  int (*finish)(struct net *, struct sock *, struct sk_buff *);
1: +  struct net *net;
1:  };
1:  
1:  struct sadb_alg {
1: -	__u8 sadb_alg_id;
1: -	__u8 sadb_alg_ivlen;
1: -	__u16 sadb_alg_minbits;
1: -	__u16 sadb_alg_maxbits;
1: -	__u16 sadb_alg_reserved;
1: +  __u8 sadb_alg_id;
1: +  __u8 sadb_alg_ivlen;
1: +  __u16 sadb_alg_minbits;
1: +  __u16 sadb_alg_maxbits;
1: +  __u16 sadb_alg_reserved;
1:  };
1:  
1:  struct xfrm_algo_aead_info {
1: -	char *geniv;
1: -	u16 icv_truncbits;
1: +  char *geniv;
1: +  u16 icv_truncbits;
1:  };
1:  
1:  struct xfrm_algo_auth_info {
1: -	u16 icv_truncbits;
1: -	u16 icv_fullbits;
1: +  u16 icv_truncbits;
1: +  u16 icv_fullbits;
1:  };
1:  
1:  struct xfrm_algo_encr_info {
1: -	char *geniv;
1: -	u16 blockbits;
1: -	u16 defkeybits;
1: +  char *geniv;
1: +  u16 blockbits;
1: +  u16 defkeybits;
1:  };
1:  
1:  struct xfrm_algo_comp_info {
1: -	u16 threshold;
1: +  u16 threshold;
1:  };
1:  
1:  struct xfrm_algo_desc {
1: -	char *name;
1: -	char *compat;
1: -	u8 available: 1;
1: -	u8 pfkey_supported: 1;
1: -	union {
1: -		struct xfrm_algo_aead_info aead;
1: -		struct xfrm_algo_auth_info auth;
1: -		struct xfrm_algo_encr_info encr;
1: -		struct xfrm_algo_comp_info comp;
1: -	} uinfo;
1: -	struct sadb_alg desc;
1: +  char *name;
1: +  char *compat;
1: +  u8 available : 1;
1: +  u8 pfkey_supported : 1;
1: +  union {
1: +    struct xfrm_algo_aead_info aead;
1: +    struct xfrm_algo_auth_info auth;
1: +    struct xfrm_algo_encr_info encr;
1: +    struct xfrm_algo_comp_info comp;
1: +  } uinfo;
1: +  struct sadb_alg desc;
1:  };
1:  
1:  struct xfrm_algo_list {
1: -	struct xfrm_algo_desc *algs;
1: -	int entries;
1: -	u32 type;
1: -	u32 mask;
1: +  struct xfrm_algo_desc *algs;
1: +  int entries;
1: +  u32 type;
1: +  u32 mask;
1:  };
1:  
1:  struct xfrm_aead_name {
1: -	const char *name;
1: -	int icvbits;
1: +  const char *name;
1: +  int icvbits;
1:  };
1:  
1:  enum {
1: -	XFRM_SHARE_ANY = 0,
1: -	XFRM_SHARE_SESSION = 1,
1: -	XFRM_SHARE_USER = 2,
1: -	XFRM_SHARE_UNIQUE = 3,
1: +  XFRM_SHARE_ANY = 0,
1: +  XFRM_SHARE_SESSION = 1,
1: +  XFRM_SHARE_USER = 2,
1: +  XFRM_SHARE_UNIQUE = 3,
1:  };
1:  
1:  struct xfrm_user_sec_ctx {
1: -	__u16 len;
1: -	__u16 exttype;
1: -	__u8 ctx_alg;
1: -	__u8 ctx_doi;
1: -	__u16 ctx_len;
1: +  __u16 len;
1: +  __u16 exttype;
1: +  __u8 ctx_alg;
1: +  __u8 ctx_doi;
1: +  __u16 ctx_len;
1:  };
1:  
1:  struct xfrm_user_tmpl {
1: -	struct xfrm_id id;
1: -	__u16 family;
1: -	xfrm_address_t saddr;
1: -	__u32 reqid;
1: -	__u8 mode;
1: -	__u8 share;
1: -	__u8 optional;
1: -	__u32 aalgos;
1: -	__u32 ealgos;
1: -	__u32 calgos;
1: +  struct xfrm_id id;
1: +  __u16 family;
1: +  xfrm_address_t saddr;
1: +  __u32 reqid;
1: +  __u8 mode;
1: +  __u8 share;
1: +  __u8 optional;
1: +  __u32 aalgos;
1: +  __u32 ealgos;
1: +  __u32 calgos;
1:  };
1:  
1:  struct xfrm_userpolicy_type {
1: -	__u8 type;
1: -	__u16 reserved1;
1: -	__u8 reserved2;
1: +  __u8 type;
1: +  __u16 reserved1;
1: +  __u8 reserved2;
1:  };
1:  
1:  enum xfrm_sadattr_type_t {
1: -	XFRMA_SAD_UNSPEC = 0,
1: -	XFRMA_SAD_CNT = 1,
1: -	XFRMA_SAD_HINFO = 2,
1: -	__XFRMA_SAD_MAX = 3,
1: +  XFRMA_SAD_UNSPEC = 0,
1: +  XFRMA_SAD_CNT = 1,
1: +  XFRMA_SAD_HINFO = 2,
1: +  __XFRMA_SAD_MAX = 3,
1:  };
1:  
1:  struct xfrmu_sadhinfo {
1: -	__u32 sadhcnt;
1: -	__u32 sadhmcnt;
1: +  __u32 sadhcnt;
1: +  __u32 sadhmcnt;
1:  };
1:  
1:  enum xfrm_spdattr_type_t {
1: -	XFRMA_SPD_UNSPEC = 0,
1: -	XFRMA_SPD_INFO = 1,
1: -	XFRMA_SPD_HINFO = 2,
1: -	XFRMA_SPD_IPV4_HTHRESH = 3,
1: -	XFRMA_SPD_IPV6_HTHRESH = 4,
1: -	__XFRMA_SPD_MAX = 5,
1: +  XFRMA_SPD_UNSPEC = 0,
1: +  XFRMA_SPD_INFO = 1,
1: +  XFRMA_SPD_HINFO = 2,
1: +  XFRMA_SPD_IPV4_HTHRESH = 3,
1: +  XFRMA_SPD_IPV6_HTHRESH = 4,
1: +  __XFRMA_SPD_MAX = 5,
1:  };
1:  
1:  struct xfrmu_spdinfo {
1: -	__u32 incnt;
1: -	__u32 outcnt;
1: -	__u32 fwdcnt;
1: -	__u32 inscnt;
1: -	__u32 outscnt;
1: -	__u32 fwdscnt;
1: +  __u32 incnt;
1: +  __u32 outcnt;
1: +  __u32 fwdcnt;
1: +  __u32 inscnt;
1: +  __u32 outscnt;
1: +  __u32 fwdscnt;
1:  };
1:  
1:  struct xfrmu_spdhinfo {
1: -	__u32 spdhcnt;
1: -	__u32 spdhmcnt;
1: +  __u32 spdhcnt;
1: +  __u32 spdhmcnt;
1:  };
1:  
1:  struct xfrmu_spdhthresh {
1: -	__u8 lbits;
1: -	__u8 rbits;
1: +  __u8 lbits;
1: +  __u8 rbits;
1:  };
1:  
1:  struct xfrm_usersa_info {
1: -	struct xfrm_selector sel;
1: -	struct xfrm_id id;
1: -	xfrm_address_t saddr;
1: -	struct xfrm_lifetime_cfg lft;
1: -	struct xfrm_lifetime_cur curlft;
1: -	struct xfrm_stats stats;
1: -	__u32 seq;
1: -	__u32 reqid;
1: -	__u16 family;
1: -	__u8 mode;
1: -	__u8 replay_window;
1: -	__u8 flags;
1: +  struct xfrm_selector sel;
1: +  struct xfrm_id id;
1: +  xfrm_address_t saddr;
1: +  struct xfrm_lifetime_cfg lft;
1: +  struct xfrm_lifetime_cur curlft;
1: +  struct xfrm_stats stats;
1: +  __u32 seq;
1: +  __u32 reqid;
1: +  __u16 family;
1: +  __u8 mode;
1: +  __u8 replay_window;
1: +  __u8 flags;
1:  };
1:  
1:  struct xfrm_usersa_id {
1: -	xfrm_address_t daddr;
1: -	__be32 spi;
1: -	__u16 family;
1: -	__u8 proto;
1: +  xfrm_address_t daddr;
1: +  __be32 spi;
1: +  __u16 family;
1: +  __u8 proto;
1:  };
1:  
1:  struct xfrm_aevent_id {
1: -	struct xfrm_usersa_id sa_id;
1: -	xfrm_address_t saddr;
1: -	__u32 flags;
1: -	__u32 reqid;
1: +  struct xfrm_usersa_id sa_id;
1: +  xfrm_address_t saddr;
1: +  __u32 flags;
1: +  __u32 reqid;
1:  };
1:  
1:  struct xfrm_userspi_info {
1: -	struct xfrm_usersa_info info;
1: -	__u32 min;
1: -	__u32 max;
1: +  struct xfrm_usersa_info info;
1: +  __u32 min;
1: +  __u32 max;
1:  };
1:  
1:  struct xfrm_userpolicy_info {
1: -	struct xfrm_selector sel;
1: -	struct xfrm_lifetime_cfg lft;
1: -	struct xfrm_lifetime_cur curlft;
1: -	__u32 priority;
1: -	__u32 index;
1: -	__u8 dir;
1: -	__u8 action;
1: -	__u8 flags;
1: -	__u8 share;
1: +  struct xfrm_selector sel;
1: +  struct xfrm_lifetime_cfg lft;
1: +  struct xfrm_lifetime_cur curlft;
1: +  __u32 priority;
1: +  __u32 index;
1: +  __u8 dir;
1: +  __u8 action;
1: +  __u8 flags;
1: +  __u8 share;
1:  };
1:  
1:  struct xfrm_userpolicy_id {
1: -	struct xfrm_selector sel;
1: -	__u32 index;
1: -	__u8 dir;
1: +  struct xfrm_selector sel;
1: +  __u32 index;
1: +  __u8 dir;
1:  };
1:  
1:  struct xfrm_user_acquire {
1: -	struct xfrm_id id;
1: -	xfrm_address_t saddr;
1: -	struct xfrm_selector sel;
1: -	struct xfrm_userpolicy_info policy;
1: -	__u32 aalgos;
1: -	__u32 ealgos;
1: -	__u32 calgos;
1: -	__u32 seq;
1: +  struct xfrm_id id;
1: +  xfrm_address_t saddr;
1: +  struct xfrm_selector sel;
1: +  struct xfrm_userpolicy_info policy;
1: +  __u32 aalgos;
1: +  __u32 ealgos;
1: +  __u32 calgos;
1: +  __u32 seq;
1:  };
1:  
1:  struct xfrm_user_expire {
1: -	struct xfrm_usersa_info state;
1: -	__u8 hard;
1: +  struct xfrm_usersa_info state;
1: +  __u8 hard;
1:  };
1:  
1:  struct xfrm_user_polexpire {
1: -	struct xfrm_userpolicy_info pol;
1: -	__u8 hard;
1: +  struct xfrm_userpolicy_info pol;
1: +  __u8 hard;
1:  };
1:  
1:  struct xfrm_usersa_flush {
1: -	__u8 proto;
1: +  __u8 proto;
1:  };
1:  
1:  struct xfrm_user_report {
1: -	__u8 proto;
1: -	struct xfrm_selector sel;
1: +  __u8 proto;
1: +  struct xfrm_selector sel;
1:  };
1:  
1:  struct xfrm_user_mapping {
1: -	struct xfrm_usersa_id id;
1: -	__u32 reqid;
1: -	xfrm_address_t old_saddr;
1: -	xfrm_address_t new_saddr;
1: -	__be16 old_sport;
1: -	__be16 new_sport;
1: +  struct xfrm_usersa_id id;
1: +  __u32 reqid;
1: +  xfrm_address_t old_saddr;
1: +  xfrm_address_t new_saddr;
1: +  __be16 old_sport;
1: +  __be16 new_sport;
1:  };
1:  
1:  struct xfrm_user_offload {
1: -	int ifindex;
1: -	__u8 flags;
1: +  int ifindex;
1: +  __u8 flags;
1:  };
1:  
1:  struct xfrm_dump_info {
1: -	struct sk_buff *in_skb;
1: -	struct sk_buff *out_skb;
1: -	u32 nlmsg_seq;
1: -	u16 nlmsg_flags;
1: +  struct sk_buff *in_skb;
1: +  struct sk_buff *out_skb;
1: +  u32 nlmsg_seq;
1: +  u16 nlmsg_flags;
1:  };
1:  
1:  struct xfrm_link {
1: -	int (*doit)(struct sk_buff *, struct nlmsghdr *, struct nlattr **);
1: -	int (*start)(struct netlink_callback *);
1: -	int (*dump)(struct sk_buff *, struct netlink_callback *);
1: -	int (*done)(struct netlink_callback *);
1: -	const struct nla_policy *nla_pol;
1: -	int nla_max;
1: +  int (*doit)(struct sk_buff *, struct nlmsghdr *, struct nlattr **);
1: +  int (*start)(struct netlink_callback *);
1: +  int (*dump)(struct sk_buff *, struct netlink_callback *);
1: +  int (*done)(struct netlink_callback *);
1: +  const struct nla_policy *nla_pol;
1: +  int nla_max;
1:  };
1:  
1:  struct unix_stream_read_state {
1: -	int (*recv_actor)(struct sk_buff *, int, int, struct unix_stream_read_state *);
1: -	struct socket *socket;
1: -	struct msghdr *msg;
1: -	struct pipe_inode_info *pipe;
1: -	size_t size;
1: -	int flags;
1: -	unsigned int splice_flags;
1: +  int (*recv_actor)(struct sk_buff *, int, int,
1: +                    struct unix_stream_read_state *);
1: +  struct socket *socket;
1: +  struct msghdr *msg;
1: +  struct pipe_inode_info *pipe;
1: +  size_t size;
1: +  int flags;
1: +  unsigned int splice_flags;
1:  };
1:  
1:  struct ipv6_params {
1: -	__s32 disable_ipv6;
1: -	__s32 autoconf;
1: +  __s32 disable_ipv6;
1: +  __s32 autoconf;
1:  };
1:  
1:  enum flowlabel_reflect {
1: -	FLOWLABEL_REFLECT_ESTABLISHED = 1,
1: -	FLOWLABEL_REFLECT_TCP_RESET = 2,
1: -	FLOWLABEL_REFLECT_ICMPV6_ECHO_REPLIES = 4,
1: +  FLOWLABEL_REFLECT_ESTABLISHED = 1,
1: +  FLOWLABEL_REFLECT_TCP_RESET = 2,
1: +  FLOWLABEL_REFLECT_ICMPV6_ECHO_REPLIES = 4,
1:  };
1:  
1:  struct in6_rtmsg {
1: -	struct in6_addr rtmsg_dst;
1: -	struct in6_addr rtmsg_src;
1: -	struct in6_addr rtmsg_gateway;
1: -	__u32 rtmsg_type;
1: -	__u16 rtmsg_dst_len;
1: -	__u16 rtmsg_src_len;
1: -	__u32 rtmsg_metric;
1: -	long unsigned int rtmsg_info;
1: -	__u32 rtmsg_flags;
1: -	int rtmsg_ifindex;
1: +  struct in6_addr rtmsg_dst;
1: +  struct in6_addr rtmsg_src;
1: +  struct in6_addr rtmsg_gateway;
1: +  __u32 rtmsg_type;
1: +  __u16 rtmsg_dst_len;
1: +  __u16 rtmsg_src_len;
1: +  __u32 rtmsg_metric;
1: +  long unsigned int rtmsg_info;
1: +  __u32 rtmsg_flags;
1: +  int rtmsg_ifindex;
1:  };
1:  
1:  struct compat_in6_rtmsg {
1: -	struct in6_addr rtmsg_dst;
1: -	struct in6_addr rtmsg_src;
1: -	struct in6_addr rtmsg_gateway;
1: -	u32 rtmsg_type;
1: -	u16 rtmsg_dst_len;
1: -	u16 rtmsg_src_len;
1: -	u32 rtmsg_metric;
1: -	u32 rtmsg_info;
1: -	u32 rtmsg_flags;
1: -	s32 rtmsg_ifindex;
1: +  struct in6_addr rtmsg_dst;
1: +  struct in6_addr rtmsg_src;
1: +  struct in6_addr rtmsg_gateway;
1: +  u32 rtmsg_type;
1: +  u16 rtmsg_dst_len;
1: +  u16 rtmsg_src_len;
1: +  u32 rtmsg_metric;
1: +  u32 rtmsg_info;
1: +  u32 rtmsg_flags;
1: +  s32 rtmsg_ifindex;
1:  };
1:  
1:  struct ac6_iter_state {
1: -	struct seq_net_private p;
1: -	struct net_device *dev;
1: -	struct inet6_dev *idev;
1: +  struct seq_net_private p;
1: +  struct net_device *dev;
1: +  struct inet6_dev *idev;
1:  };
1:  
1:  struct ip6_fraglist_iter {
1: -	struct ipv6hdr *tmp_hdr;
1: -	struct sk_buff *frag;
1: -	int offset;
1: -	unsigned int hlen;
1: -	__be32 frag_id;
1: -	u8 nexthdr;
1: +  struct ipv6hdr *tmp_hdr;
1: +  struct sk_buff *frag;
1: +  int offset;
1: +  unsigned int hlen;
1: +  __be32 frag_id;
1: +  u8 nexthdr;
1:  };
1:  
1:  struct ip6_frag_state {
1: -	u8 *prevhdr;
1: -	unsigned int hlen;
1: -	unsigned int mtu;
1: -	unsigned int left;
1: -	int offset;
1: -	int ptr;
1: -	int hroom;
1: -	int troom;
1: -	__be32 frag_id;
1: -	u8 nexthdr;
1: +  u8 *prevhdr;
1: +  unsigned int hlen;
1: +  unsigned int mtu;
1: +  unsigned int left;
1: +  int offset;
1: +  int ptr;
1: +  int hroom;
1: +  int troom;
1: +  __be32 frag_id;
1: +  u8 nexthdr;
1:  };
1:  
1:  struct ip6_ra_chain {
1: -	struct ip6_ra_chain *next;
1: -	struct sock *sk;
1: -	int sel;
1: -	void (*destructor)(struct sock *);
1: +  struct ip6_ra_chain *next;
1: +  struct sock *sk;
1: +  int sel;
1: +  void (*destructor)(struct sock *);
1:  };
1:  
1:  struct ipcm6_cookie {
1: -	struct sockcm_cookie sockc;
1: -	__s16 hlimit;
1: -	__s16 tclass;
1: -	__s8 dontfrag;
1: -	struct ipv6_txoptions *opt;
1: -	__u16 gso_size;
1: +  struct sockcm_cookie sockc;
1: +  __s16 hlimit;
1: +  __s16 tclass;
1: +  __s8 dontfrag;
1: +  struct ipv6_txoptions *opt;
1: +  __u16 gso_size;
1:  };
1:  
1:  enum {
1: -	IFLA_INET6_UNSPEC = 0,
1: -	IFLA_INET6_FLAGS = 1,
1: -	IFLA_INET6_CONF = 2,
1: -	IFLA_INET6_STATS = 3,
1: -	IFLA_INET6_MCAST = 4,
1: -	IFLA_INET6_CACHEINFO = 5,
1: -	IFLA_INET6_ICMP6STATS = 6,
1: -	IFLA_INET6_TOKEN = 7,
1: -	IFLA_INET6_ADDR_GEN_MODE = 8,
1: -	__IFLA_INET6_MAX = 9,
1: +  IFLA_INET6_UNSPEC = 0,
1: +  IFLA_INET6_FLAGS = 1,
1: +  IFLA_INET6_CONF = 2,
1: +  IFLA_INET6_STATS = 3,
1: +  IFLA_INET6_MCAST = 4,
1: +  IFLA_INET6_CACHEINFO = 5,
1: +  IFLA_INET6_ICMP6STATS = 6,
1: +  IFLA_INET6_TOKEN = 7,
1: +  IFLA_INET6_ADDR_GEN_MODE = 8,
1: +  __IFLA_INET6_MAX = 9,
1:  };
1:  
1:  enum in6_addr_gen_mode {
1: -	IN6_ADDR_GEN_MODE_EUI64 = 0,
1: -	IN6_ADDR_GEN_MODE_NONE = 1,
1: -	IN6_ADDR_GEN_MODE_STABLE_PRIVACY = 2,
1: -	IN6_ADDR_GEN_MODE_RANDOM = 3,
1: +  IN6_ADDR_GEN_MODE_EUI64 = 0,
1: +  IN6_ADDR_GEN_MODE_NONE = 1,
1: +  IN6_ADDR_GEN_MODE_STABLE_PRIVACY = 2,
1: +  IN6_ADDR_GEN_MODE_RANDOM = 3,
1:  };
1:  
1:  struct ifla_cacheinfo {
1: -	__u32 max_reasm_len;
1: -	__u32 tstamp;
1: -	__u32 reachable_time;
1: -	__u32 retrans_time;
1: +  __u32 max_reasm_len;
1: +  __u32 tstamp;
1: +  __u32 reachable_time;
1: +  __u32 retrans_time;
1:  };
1:  
1:  struct wpan_phy;
1: @@ -122141,2694 +123510,2707 @@ struct wpan_phy;
1:  struct wpan_dev_header_ops;
1:  
1:  struct wpan_dev {
1: -	struct wpan_phy *wpan_phy;
1: -	int iftype;
1: -	struct list_head list;
1: -	struct net_device *netdev;
1: -	const struct wpan_dev_header_ops *header_ops;
1: -	struct net_device *lowpan_dev;
1: -	u32 identifier;
1: -	__le16 pan_id;
1: -	__le16 short_addr;
1: -	__le64 extended_addr;
1: -	atomic_t bsn;
1: -	atomic_t dsn;
1: -	u8 min_be;
1: -	u8 max_be;
1: -	u8 csma_retries;
1: -	s8 frame_retries;
1: -	bool lbt;
1: -	bool promiscuous_mode;
1: -	bool ackreq;
1: +  struct wpan_phy *wpan_phy;
1: +  int iftype;
1: +  struct list_head list;
1: +  struct net_device *netdev;
1: +  const struct wpan_dev_header_ops *header_ops;
1: +  struct net_device *lowpan_dev;
1: +  u32 identifier;
1: +  __le16 pan_id;
1: +  __le16 short_addr;
1: +  __le64 extended_addr;
1: +  atomic_t bsn;
1: +  atomic_t dsn;
1: +  u8 min_be;
1: +  u8 max_be;
1: +  u8 csma_retries;
1: +  s8 frame_retries;
1: +  bool lbt;
1: +  bool promiscuous_mode;
1: +  bool ackreq;
1:  };
1:  
1:  struct prefixmsg {
1: -	unsigned char prefix_family;
1: -	unsigned char prefix_pad1;
1: -	short unsigned int prefix_pad2;
1: -	int prefix_ifindex;
1: -	unsigned char prefix_type;
1: -	unsigned char prefix_len;
1: -	unsigned char prefix_flags;
1: -	unsigned char prefix_pad3;
1: +  unsigned char prefix_family;
1: +  unsigned char prefix_pad1;
1: +  short unsigned int prefix_pad2;
1: +  int prefix_ifindex;
1: +  unsigned char prefix_type;
1: +  unsigned char prefix_len;
1: +  unsigned char prefix_flags;
1: +  unsigned char prefix_pad3;
1:  };
1:  
1:  enum {
1: -	PREFIX_UNSPEC = 0,
1: -	PREFIX_ADDRESS = 1,
1: -	PREFIX_CACHEINFO = 2,
1: -	__PREFIX_MAX = 3,
1: +  PREFIX_UNSPEC = 0,
1: +  PREFIX_ADDRESS = 1,
1: +  PREFIX_CACHEINFO = 2,
1: +  __PREFIX_MAX = 3,
1:  };
1:  
1:  struct prefix_cacheinfo {
1: -	__u32 preferred_time;
1: -	__u32 valid_time;
1: +  __u32 preferred_time;
1: +  __u32 valid_time;
1:  };
1:  
1:  struct in6_ifreq {
1: -	struct in6_addr ifr6_addr;
1: -	__u32 ifr6_prefixlen;
1: -	int ifr6_ifindex;
1: -};
1: -
1: -enum {
1: -	DEVCONF_FORWARDING = 0,
1: -	DEVCONF_HOPLIMIT = 1,
1: -	DEVCONF_MTU6 = 2,
1: -	DEVCONF_ACCEPT_RA = 3,
1: -	DEVCONF_ACCEPT_REDIRECTS = 4,
1: -	DEVCONF_AUTOCONF = 5,
1: -	DEVCONF_DAD_TRANSMITS = 6,
1: -	DEVCONF_RTR_SOLICITS = 7,
1: -	DEVCONF_RTR_SOLICIT_INTERVAL = 8,
1: -	DEVCONF_RTR_SOLICIT_DELAY = 9,
1: -	DEVCONF_USE_TEMPADDR = 10,
1: -	DEVCONF_TEMP_VALID_LFT = 11,
1: -	DEVCONF_TEMP_PREFERED_LFT = 12,
1: -	DEVCONF_REGEN_MAX_RETRY = 13,
1: -	DEVCONF_MAX_DESYNC_FACTOR = 14,
1: -	DEVCONF_MAX_ADDRESSES = 15,
1: -	DEVCONF_FORCE_MLD_VERSION = 16,
1: -	DEVCONF_ACCEPT_RA_DEFRTR = 17,
1: -	DEVCONF_ACCEPT_RA_PINFO = 18,
1: -	DEVCONF_ACCEPT_RA_RTR_PREF = 19,
1: -	DEVCONF_RTR_PROBE_INTERVAL = 20,
1: -	DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN = 21,
1: -	DEVCONF_PROXY_NDP = 22,
1: -	DEVCONF_OPTIMISTIC_DAD = 23,
1: -	DEVCONF_ACCEPT_SOURCE_ROUTE = 24,
1: -	DEVCONF_MC_FORWARDING = 25,
1: -	DEVCONF_DISABLE_IPV6 = 26,
1: -	DEVCONF_ACCEPT_DAD = 27,
1: -	DEVCONF_FORCE_TLLAO = 28,
1: -	DEVCONF_NDISC_NOTIFY = 29,
1: -	DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL = 30,
1: -	DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL = 31,
1: -	DEVCONF_SUPPRESS_FRAG_NDISC = 32,
1: -	DEVCONF_ACCEPT_RA_FROM_LOCAL = 33,
1: -	DEVCONF_USE_OPTIMISTIC = 34,
1: -	DEVCONF_ACCEPT_RA_MTU = 35,
1: -	DEVCONF_STABLE_SECRET = 36,
1: -	DEVCONF_USE_OIF_ADDRS_ONLY = 37,
1: -	DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT = 38,
1: -	DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN = 39,
1: -	DEVCONF_DROP_UNICAST_IN_L2_MULTICAST = 40,
1: -	DEVCONF_DROP_UNSOLICITED_NA = 41,
1: -	DEVCONF_KEEP_ADDR_ON_DOWN = 42,
1: -	DEVCONF_RTR_SOLICIT_MAX_INTERVAL = 43,
1: -	DEVCONF_SEG6_ENABLED = 44,
1: -	DEVCONF_SEG6_REQUIRE_HMAC = 45,
1: -	DEVCONF_ENHANCED_DAD = 46,
1: -	DEVCONF_ADDR_GEN_MODE = 47,
1: -	DEVCONF_DISABLE_POLICY = 48,
1: -	DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN = 49,
1: -	DEVCONF_NDISC_TCLASS = 50,
1: -	DEVCONF_RPL_SEG_ENABLED = 51,
1: -	DEVCONF_MAX = 52,
1: -};
1: -
1: -enum {
1: -	INET6_IFADDR_STATE_PREDAD = 0,
1: -	INET6_IFADDR_STATE_DAD = 1,
1: -	INET6_IFADDR_STATE_POSTDAD = 2,
1: -	INET6_IFADDR_STATE_ERRDAD = 3,
1: -	INET6_IFADDR_STATE_DEAD = 4,
1: +  struct in6_addr ifr6_addr;
1: +  __u32 ifr6_prefixlen;
1: +  int ifr6_ifindex;
1: +};
1: +
1: +enum {
1: +  DEVCONF_FORWARDING = 0,
1: +  DEVCONF_HOPLIMIT = 1,
1: +  DEVCONF_MTU6 = 2,
1: +  DEVCONF_ACCEPT_RA = 3,
1: +  DEVCONF_ACCEPT_REDIRECTS = 4,
1: +  DEVCONF_AUTOCONF = 5,
1: +  DEVCONF_DAD_TRANSMITS = 6,
1: +  DEVCONF_RTR_SOLICITS = 7,
1: +  DEVCONF_RTR_SOLICIT_INTERVAL = 8,
1: +  DEVCONF_RTR_SOLICIT_DELAY = 9,
1: +  DEVCONF_USE_TEMPADDR = 10,
1: +  DEVCONF_TEMP_VALID_LFT = 11,
1: +  DEVCONF_TEMP_PREFERED_LFT = 12,
1: +  DEVCONF_REGEN_MAX_RETRY = 13,
1: +  DEVCONF_MAX_DESYNC_FACTOR = 14,
1: +  DEVCONF_MAX_ADDRESSES = 15,
1: +  DEVCONF_FORCE_MLD_VERSION = 16,
1: +  DEVCONF_ACCEPT_RA_DEFRTR = 17,
1: +  DEVCONF_ACCEPT_RA_PINFO = 18,
1: +  DEVCONF_ACCEPT_RA_RTR_PREF = 19,
1: +  DEVCONF_RTR_PROBE_INTERVAL = 20,
1: +  DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN = 21,
1: +  DEVCONF_PROXY_NDP = 22,
1: +  DEVCONF_OPTIMISTIC_DAD = 23,
1: +  DEVCONF_ACCEPT_SOURCE_ROUTE = 24,
1: +  DEVCONF_MC_FORWARDING = 25,
1: +  DEVCONF_DISABLE_IPV6 = 26,
1: +  DEVCONF_ACCEPT_DAD = 27,
1: +  DEVCONF_FORCE_TLLAO = 28,
1: +  DEVCONF_NDISC_NOTIFY = 29,
1: +  DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL = 30,
1: +  DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL = 31,
1: +  DEVCONF_SUPPRESS_FRAG_NDISC = 32,
1: +  DEVCONF_ACCEPT_RA_FROM_LOCAL = 33,
1: +  DEVCONF_USE_OPTIMISTIC = 34,
1: +  DEVCONF_ACCEPT_RA_MTU = 35,
1: +  DEVCONF_STABLE_SECRET = 36,
1: +  DEVCONF_USE_OIF_ADDRS_ONLY = 37,
1: +  DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT = 38,
1: +  DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN = 39,
1: +  DEVCONF_DROP_UNICAST_IN_L2_MULTICAST = 40,
1: +  DEVCONF_DROP_UNSOLICITED_NA = 41,
1: +  DEVCONF_KEEP_ADDR_ON_DOWN = 42,
1: +  DEVCONF_RTR_SOLICIT_MAX_INTERVAL = 43,
1: +  DEVCONF_SEG6_ENABLED = 44,
1: +  DEVCONF_SEG6_REQUIRE_HMAC = 45,
1: +  DEVCONF_ENHANCED_DAD = 46,
1: +  DEVCONF_ADDR_GEN_MODE = 47,
1: +  DEVCONF_DISABLE_POLICY = 48,
1: +  DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN = 49,
1: +  DEVCONF_NDISC_TCLASS = 50,
1: +  DEVCONF_RPL_SEG_ENABLED = 51,
1: +  DEVCONF_MAX = 52,
1: +};
1: +
1: +enum {
1: +  INET6_IFADDR_STATE_PREDAD = 0,
1: +  INET6_IFADDR_STATE_DAD = 1,
1: +  INET6_IFADDR_STATE_POSTDAD = 2,
1: +  INET6_IFADDR_STATE_ERRDAD = 3,
1: +  INET6_IFADDR_STATE_DEAD = 4,
1:  };
1:  
1:  enum nl802154_cca_modes {
1: -	__NL802154_CCA_INVALID = 0,
1: -	NL802154_CCA_ENERGY = 1,
1: -	NL802154_CCA_CARRIER = 2,
1: -	NL802154_CCA_ENERGY_CARRIER = 3,
1: -	NL802154_CCA_ALOHA = 4,
1: -	NL802154_CCA_UWB_SHR = 5,
1: -	NL802154_CCA_UWB_MULTIPLEXED = 6,
1: -	__NL802154_CCA_ATTR_AFTER_LAST = 7,
1: -	NL802154_CCA_ATTR_MAX = 6,
1: +  __NL802154_CCA_INVALID = 0,
1: +  NL802154_CCA_ENERGY = 1,
1: +  NL802154_CCA_CARRIER = 2,
1: +  NL802154_CCA_ENERGY_CARRIER = 3,
1: +  NL802154_CCA_ALOHA = 4,
1: +  NL802154_CCA_UWB_SHR = 5,
1: +  NL802154_CCA_UWB_MULTIPLEXED = 6,
1: +  __NL802154_CCA_ATTR_AFTER_LAST = 7,
1: +  NL802154_CCA_ATTR_MAX = 6,
1:  };
1:  
1:  enum nl802154_cca_opts {
1: -	NL802154_CCA_OPT_ENERGY_CARRIER_AND = 0,
1: -	NL802154_CCA_OPT_ENERGY_CARRIER_OR = 1,
1: -	__NL802154_CCA_OPT_ATTR_AFTER_LAST = 2,
1: -	NL802154_CCA_OPT_ATTR_MAX = 1,
1: +  NL802154_CCA_OPT_ENERGY_CARRIER_AND = 0,
1: +  NL802154_CCA_OPT_ENERGY_CARRIER_OR = 1,
1: +  __NL802154_CCA_OPT_ATTR_AFTER_LAST = 2,
1: +  NL802154_CCA_OPT_ATTR_MAX = 1,
1:  };
1:  
1:  enum nl802154_supported_bool_states {
1: -	NL802154_SUPPORTED_BOOL_FALSE = 0,
1: -	NL802154_SUPPORTED_BOOL_TRUE = 1,
1: -	__NL802154_SUPPORTED_BOOL_INVALD = 2,
1: -	NL802154_SUPPORTED_BOOL_BOTH = 3,
1: -	__NL802154_SUPPORTED_BOOL_AFTER_LAST = 4,
1: -	NL802154_SUPPORTED_BOOL_MAX = 3,
1: +  NL802154_SUPPORTED_BOOL_FALSE = 0,
1: +  NL802154_SUPPORTED_BOOL_TRUE = 1,
1: +  __NL802154_SUPPORTED_BOOL_INVALD = 2,
1: +  NL802154_SUPPORTED_BOOL_BOTH = 3,
1: +  __NL802154_SUPPORTED_BOOL_AFTER_LAST = 4,
1: +  NL802154_SUPPORTED_BOOL_MAX = 3,
1:  };
1:  
1:  struct wpan_phy_supported {
1: -	u32 channels[32];
1: -	u32 cca_modes;
1: -	u32 cca_opts;
1: -	u32 iftypes;
1: -	enum nl802154_supported_bool_states lbt;
1: -	u8 min_minbe;
1: -	u8 max_minbe;
1: -	u8 min_maxbe;
1: -	u8 max_maxbe;
1: -	u8 min_csma_backoffs;
1: -	u8 max_csma_backoffs;
1: -	s8 min_frame_retries;
1: -	s8 max_frame_retries;
1: -	size_t tx_powers_size;
1: -	size_t cca_ed_levels_size;
1: -	const s32 *tx_powers;
1: -	const s32 *cca_ed_levels;
1: +  u32 channels[32];
1: +  u32 cca_modes;
1: +  u32 cca_opts;
1: +  u32 iftypes;
1: +  enum nl802154_supported_bool_states lbt;
1: +  u8 min_minbe;
1: +  u8 max_minbe;
1: +  u8 min_maxbe;
1: +  u8 max_maxbe;
1: +  u8 min_csma_backoffs;
1: +  u8 max_csma_backoffs;
1: +  s8 min_frame_retries;
1: +  s8 max_frame_retries;
1: +  size_t tx_powers_size;
1: +  size_t cca_ed_levels_size;
1: +  const s32 *tx_powers;
1: +  const s32 *cca_ed_levels;
1:  };
1:  
1:  struct wpan_phy_cca {
1: -	enum nl802154_cca_modes mode;
1: -	enum nl802154_cca_opts opt;
1: +  enum nl802154_cca_modes mode;
1: +  enum nl802154_cca_opts opt;
1:  };
1:  
1:  struct wpan_phy {
1: -	const void *privid;
1: -	u32 flags;
1: -	u8 current_channel;
1: -	u8 current_page;
1: -	struct wpan_phy_supported supported;
1: -	s32 transmit_power;
1: -	struct wpan_phy_cca cca;
1: -	__le64 perm_extended_addr;
1: -	s32 cca_ed_level;
1: -	u8 symbol_duration;
1: -	u16 lifs_period;
1: -	u16 sifs_period;
1: -	struct device dev;
1: -	possible_net_t _net;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	char priv[0];
1: +  const void *privid;
1: +  u32 flags;
1: +  u8 current_channel;
1: +  u8 current_page;
1: +  struct wpan_phy_supported supported;
1: +  s32 transmit_power;
1: +  struct wpan_phy_cca cca;
1: +  __le64 perm_extended_addr;
1: +  s32 cca_ed_level;
1: +  u8 symbol_duration;
1: +  u16 lifs_period;
1: +  u16 sifs_period;
1: +  struct device dev;
1: +  possible_net_t _net;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  char priv[0];
1:  };
1:  
1:  struct ieee802154_addr {
1: -	u8 mode;
1: -	__le16 pan_id;
1: -	union {
1: -		__le16 short_addr;
1: -		__le64 extended_addr;
1: -	};
1: +  u8 mode;
1: +  __le16 pan_id;
1: +  union {
1: +    __le16 short_addr;
1: +    __le64 extended_addr;
1: +  };
1:  };
1:  
1:  struct wpan_dev_header_ops {
1: -	int (*create)(struct sk_buff *, struct net_device *, const struct ieee802154_addr *, const struct ieee802154_addr *, unsigned int);
1: +  int (*create)(struct sk_buff *, struct net_device *,
1: +                const struct ieee802154_addr *, const struct ieee802154_addr *,
1: +                unsigned int);
1:  };
1:  
1:  union fwnet_hwaddr {
1: -	u8 u[16];
1: -	struct {
1: -		__be64 uniq_id;
1: -		u8 max_rec;
1: -		u8 sspd;
1: -		__be16 fifo_hi;
1: -		__be32 fifo_lo;
1: -	} uc;
1: +  u8 u[16];
1: +  struct {
1: +    __be64 uniq_id;
1: +    u8 max_rec;
1: +    u8 sspd;
1: +    __be16 fifo_hi;
1: +    __be32 fifo_lo;
1: +  } uc;
1:  };
1:  
1:  struct in6_validator_info {
1: -	struct in6_addr i6vi_addr;
1: -	struct inet6_dev *i6vi_dev;
1: -	struct netlink_ext_ack *extack;
1: +  struct in6_addr i6vi_addr;
1: +  struct inet6_dev *i6vi_dev;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct ifa6_config {
1: -	const struct in6_addr *pfx;
1: -	unsigned int plen;
1: -	const struct in6_addr *peer_pfx;
1: -	u32 rt_priority;
1: -	u32 ifa_flags;
1: -	u32 preferred_lft;
1: -	u32 valid_lft;
1: -	u16 scope;
1: +  const struct in6_addr *pfx;
1: +  unsigned int plen;
1: +  const struct in6_addr *peer_pfx;
1: +  u32 rt_priority;
1: +  u32 ifa_flags;
1: +  u32 preferred_lft;
1: +  u32 valid_lft;
1: +  u16 scope;
1:  };
1:  
1:  enum cleanup_prefix_rt_t {
1: -	CLEANUP_PREFIX_RT_NOP = 0,
1: -	CLEANUP_PREFIX_RT_DEL = 1,
1: -	CLEANUP_PREFIX_RT_EXPIRE = 2,
1: +  CLEANUP_PREFIX_RT_NOP = 0,
1: +  CLEANUP_PREFIX_RT_DEL = 1,
1: +  CLEANUP_PREFIX_RT_EXPIRE = 2,
1:  };
1:  
1:  enum {
1: -	IPV6_SADDR_RULE_INIT = 0,
1: -	IPV6_SADDR_RULE_LOCAL = 1,
1: -	IPV6_SADDR_RULE_SCOPE = 2,
1: -	IPV6_SADDR_RULE_PREFERRED = 3,
1: -	IPV6_SADDR_RULE_OIF = 4,
1: -	IPV6_SADDR_RULE_LABEL = 5,
1: -	IPV6_SADDR_RULE_PRIVACY = 6,
1: -	IPV6_SADDR_RULE_ORCHID = 7,
1: -	IPV6_SADDR_RULE_PREFIX = 8,
1: -	IPV6_SADDR_RULE_MAX = 9,
1: +  IPV6_SADDR_RULE_INIT = 0,
1: +  IPV6_SADDR_RULE_LOCAL = 1,
1: +  IPV6_SADDR_RULE_SCOPE = 2,
1: +  IPV6_SADDR_RULE_PREFERRED = 3,
1: +  IPV6_SADDR_RULE_OIF = 4,
1: +  IPV6_SADDR_RULE_LABEL = 5,
1: +  IPV6_SADDR_RULE_PRIVACY = 6,
1: +  IPV6_SADDR_RULE_ORCHID = 7,
1: +  IPV6_SADDR_RULE_PREFIX = 8,
1: +  IPV6_SADDR_RULE_MAX = 9,
1:  };
1:  
1:  struct ipv6_saddr_score {
1: -	int rule;
1: -	int addr_type;
1: -	struct inet6_ifaddr *ifa;
1: -	long unsigned int scorebits[1];
1: -	int scopedist;
1: -	int matchlen;
1: +  int rule;
1: +  int addr_type;
1: +  struct inet6_ifaddr *ifa;
1: +  long unsigned int scorebits[1];
1: +  int scopedist;
1: +  int matchlen;
1:  };
1:  
1:  struct ipv6_saddr_dst {
1: -	const struct in6_addr *addr;
1: -	int ifindex;
1: -	int scope;
1: -	int label;
1: -	unsigned int prefs;
1: +  const struct in6_addr *addr;
1: +  int ifindex;
1: +  int scope;
1: +  int label;
1: +  unsigned int prefs;
1:  };
1:  
1:  struct if6_iter_state {
1: -	struct seq_net_private p;
1: -	int bucket;
1: -	int offset;
1: +  struct seq_net_private p;
1: +  int bucket;
1: +  int offset;
1:  };
1:  
1:  enum addr_type_t {
1: -	UNICAST_ADDR = 0,
1: -	MULTICAST_ADDR = 1,
1: -	ANYCAST_ADDR = 2,
1: +  UNICAST_ADDR = 0,
1: +  MULTICAST_ADDR = 1,
1: +  ANYCAST_ADDR = 2,
1:  };
1:  
1:  struct inet6_fill_args {
1: -	u32 portid;
1: -	u32 seq;
1: -	int event;
1: -	unsigned int flags;
1: -	int netnsid;
1: -	int ifindex;
1: -	enum addr_type_t type;
1: +  u32 portid;
1: +  u32 seq;
1: +  int event;
1: +  unsigned int flags;
1: +  int netnsid;
1: +  int ifindex;
1: +  enum addr_type_t type;
1:  };
1:  
1:  enum {
1: -	DAD_PROCESS = 0,
1: -	DAD_BEGIN = 1,
1: -	DAD_ABORT = 2,
1: +  DAD_PROCESS = 0,
1: +  DAD_BEGIN = 1,
1: +  DAD_ABORT = 2,
1:  };
1:  
1:  struct ifaddrlblmsg {
1: -	__u8 ifal_family;
1: -	__u8 __ifal_reserved;
1: -	__u8 ifal_prefixlen;
1: -	__u8 ifal_flags;
1: -	__u32 ifal_index;
1: -	__u32 ifal_seq;
1: +  __u8 ifal_family;
1: +  __u8 __ifal_reserved;
1: +  __u8 ifal_prefixlen;
1: +  __u8 ifal_flags;
1: +  __u32 ifal_index;
1: +  __u32 ifal_seq;
1:  };
1:  
1:  enum {
1: -	IFAL_ADDRESS = 1,
1: -	IFAL_LABEL = 2,
1: -	__IFAL_MAX = 3,
1: +  IFAL_ADDRESS = 1,
1: +  IFAL_LABEL = 2,
1: +  __IFAL_MAX = 3,
1:  };
1:  
1:  struct ip6addrlbl_entry {
1: -	struct in6_addr prefix;
1: -	int prefixlen;
1: -	int ifindex;
1: -	int addrtype;
1: -	u32 label;
1: -	struct hlist_node list;
1: -	struct callback_head rcu;
1: +  struct in6_addr prefix;
1: +  int prefixlen;
1: +  int ifindex;
1: +  int addrtype;
1: +  u32 label;
1: +  struct hlist_node list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct ip6addrlbl_init_table {
1: -	const struct in6_addr *prefix;
1: -	int prefixlen;
1: -	u32 label;
1: +  const struct in6_addr *prefix;
1: +  int prefixlen;
1: +  u32 label;
1:  };
1:  
1:  struct rd_msg {
1: -	struct icmp6hdr icmph;
1: -	struct in6_addr target;
1: -	struct in6_addr dest;
1: -	__u8 opt[0];
1: +  struct icmp6hdr icmph;
1: +  struct in6_addr target;
1: +  struct in6_addr dest;
1: +  __u8 opt[0];
1:  };
1:  
1:  struct fib6_gc_args {
1: -	int timeout;
1: -	int more;
1: +  int timeout;
1: +  int more;
1:  };
1:  
1:  struct rt6_exception {
1: -	struct hlist_node hlist;
1: -	struct rt6_info *rt6i;
1: -	long unsigned int stamp;
1: -	struct callback_head rcu;
1: +  struct hlist_node hlist;
1: +  struct rt6_info *rt6i;
1: +  long unsigned int stamp;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct route_info {
1: -	__u8 type;
1: -	__u8 length;
1: -	__u8 prefix_len;
1: -	__u8 reserved_l: 3;
1: -	__u8 route_pref: 2;
1: -	__u8 reserved_h: 3;
1: -	__be32 lifetime;
1: -	__u8 prefix[0];
1: +  __u8 type;
1: +  __u8 length;
1: +  __u8 prefix_len;
1: +  __u8 reserved_l : 3;
1: +  __u8 route_pref : 2;
1: +  __u8 reserved_h : 3;
1: +  __be32 lifetime;
1: +  __u8 prefix[0];
1:  };
1:  
1:  struct rt6_rtnl_dump_arg {
1: -	struct sk_buff *skb;
1: -	struct netlink_callback *cb;
1: -	struct net *net;
1: -	struct fib_dump_filter filter;
1: +  struct sk_buff *skb;
1: +  struct netlink_callback *cb;
1: +  struct net *net;
1: +  struct fib_dump_filter filter;
1:  };
1:  
1:  struct netevent_redirect {
1: -	struct dst_entry *old;
1: -	struct dst_entry *new;
1: -	struct neighbour *neigh;
1: -	const void *daddr;
1: +  struct dst_entry *old;
1: +  struct dst_entry *new;
1: +  struct neighbour *neigh;
1: +  const void *daddr;
1:  };
1:  
1:  struct trace_event_raw_fib6_table_lookup {
1: -	struct trace_entry ent;
1: -	u32 tb_id;
1: -	int err;
1: -	int oif;
1: -	int iif;
1: -	__u8 tos;
1: -	__u8 scope;
1: -	__u8 flags;
1: -	__u8 src[16];
1: -	__u8 dst[16];
1: -	u16 sport;
1: -	u16 dport;
1: -	u8 proto;
1: -	u8 rt_type;
1: -	u32 __data_loc_name;
1: -	__u8 gw[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 tb_id;
1: +  int err;
1: +  int oif;
1: +  int iif;
1: +  __u8 tos;
1: +  __u8 scope;
1: +  __u8 flags;
1: +  __u8 src[16];
1: +  __u8 dst[16];
1: +  u16 sport;
1: +  u16 dport;
1: +  u8 proto;
1: +  u8 rt_type;
1: +  u32 __data_loc_name;
1: +  __u8 gw[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_fib6_table_lookup {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1: -typedef void (*btf_trace_fib6_table_lookup)(void *, const struct net *, const struct fib6_result *, struct fib6_table *, const struct flowi6 *);
1: +typedef void (*btf_trace_fib6_table_lookup)(void *, const struct net *,
1: +                                            const struct fib6_result *,
1: +                                            struct fib6_table *,
1: +                                            const struct flowi6 *);
1:  
1:  enum rt6_nud_state {
1: -	RT6_NUD_FAIL_HARD = 4294967293,
1: -	RT6_NUD_FAIL_PROBE = 4294967294,
1: -	RT6_NUD_FAIL_DO_RR = 4294967295,
1: -	RT6_NUD_SUCCEED = 1,
1: +  RT6_NUD_FAIL_HARD = 4294967293,
1: +  RT6_NUD_FAIL_PROBE = 4294967294,
1: +  RT6_NUD_FAIL_DO_RR = 4294967295,
1: +  RT6_NUD_SUCCEED = 1,
1:  };
1:  
1:  struct fib6_nh_dm_arg {
1: -	struct net *net;
1: -	const struct in6_addr *saddr;
1: -	int oif;
1: -	int flags;
1: -	struct fib6_nh *nh;
1: +  struct net *net;
1: +  const struct in6_addr *saddr;
1: +  int oif;
1: +  int flags;
1: +  struct fib6_nh *nh;
1:  };
1:  
1:  struct __rt6_probe_work {
1: -	struct work_struct work;
1: -	struct in6_addr target;
1: -	struct net_device *dev;
1: +  struct work_struct work;
1: +  struct in6_addr target;
1: +  struct net_device *dev;
1:  };
1:  
1:  struct fib6_nh_frl_arg {
1: -	u32 flags;
1: -	int oif;
1: -	int strict;
1: -	int *mpri;
1: -	bool *do_rr;
1: -	struct fib6_nh *nh;
1: +  u32 flags;
1: +  int oif;
1: +  int strict;
1: +  int *mpri;
1: +  bool *do_rr;
1: +  struct fib6_nh *nh;
1:  };
1:  
1:  struct fib6_nh_excptn_arg {
1: -	struct rt6_info *rt;
1: -	int plen;
1: +  struct rt6_info *rt;
1: +  int plen;
1:  };
1:  
1:  struct fib6_nh_match_arg {
1: -	const struct net_device *dev;
1: -	const struct in6_addr *gw;
1: -	struct fib6_nh *match;
1: +  const struct net_device *dev;
1: +  const struct in6_addr *gw;
1: +  struct fib6_nh *match;
1:  };
1:  
1:  struct fib6_nh_age_excptn_arg {
1: -	struct fib6_gc_args *gc_args;
1: -	long unsigned int now;
1: +  struct fib6_gc_args *gc_args;
1: +  long unsigned int now;
1:  };
1:  
1:  struct fib6_nh_rd_arg {
1: -	struct fib6_result *res;
1: -	struct flowi6 *fl6;
1: -	const struct in6_addr *gw;
1: -	struct rt6_info **ret;
1: +  struct fib6_result *res;
1: +  struct flowi6 *fl6;
1: +  const struct in6_addr *gw;
1: +  struct rt6_info **ret;
1:  };
1:  
1:  struct ip6rd_flowi {
1: -	struct flowi6 fl6;
1: -	struct in6_addr gateway;
1: +  struct flowi6 fl6;
1: +  struct in6_addr gateway;
1:  };
1:  
1:  struct fib6_nh_del_cached_rt_arg {
1: -	struct fib6_config *cfg;
1: -	struct fib6_info *f6i;
1: +  struct fib6_config *cfg;
1: +  struct fib6_info *f6i;
1:  };
1:  
1:  struct arg_dev_net_ip {
1: -	struct net_device *dev;
1: -	struct net *net;
1: -	struct in6_addr *addr;
1: +  struct net_device *dev;
1: +  struct net *net;
1: +  struct in6_addr *addr;
1:  };
1:  
1:  struct arg_netdev_event {
1: -	const struct net_device *dev;
1: -	union {
1: -		unsigned char nh_flags;
1: -		long unsigned int event;
1: -	};
1: +  const struct net_device *dev;
1: +  union {
1: +    unsigned char nh_flags;
1: +    long unsigned int event;
1: +  };
1:  };
1:  
1:  struct rt6_mtu_change_arg {
1: -	struct net_device *dev;
1: -	unsigned int mtu;
1: -	struct fib6_info *f6i;
1: +  struct net_device *dev;
1: +  unsigned int mtu;
1: +  struct fib6_info *f6i;
1:  };
1:  
1:  struct rt6_nh {
1: -	struct fib6_info *fib6_info;
1: -	struct fib6_config r_cfg;
1: -	struct list_head next;
1: +  struct fib6_info *fib6_info;
1: +  struct fib6_config r_cfg;
1: +  struct list_head next;
1:  };
1:  
1:  struct fib6_nh_exception_dump_walker {
1: -	struct rt6_rtnl_dump_arg *dump;
1: -	struct fib6_info *rt;
1: -	unsigned int flags;
1: -	unsigned int skip;
1: -	unsigned int count;
1: +  struct rt6_rtnl_dump_arg *dump;
1: +  struct fib6_info *rt;
1: +  unsigned int flags;
1: +  unsigned int skip;
1: +  unsigned int count;
1:  };
1:  
1:  enum fib6_walk_state {
1: -	FWS_S = 0,
1: -	FWS_L = 1,
1: -	FWS_R = 2,
1: -	FWS_C = 3,
1: -	FWS_U = 4,
1: +  FWS_S = 0,
1: +  FWS_L = 1,
1: +  FWS_R = 2,
1: +  FWS_C = 3,
1: +  FWS_U = 4,
1:  };
1:  
1:  struct fib6_walker {
1: -	struct list_head lh;
1: -	struct fib6_node *root;
1: -	struct fib6_node *node;
1: -	struct fib6_info *leaf;
1: -	enum fib6_walk_state state;
1: -	unsigned int skip;
1: -	unsigned int count;
1: -	unsigned int skip_in_node;
1: -	int (*func)(struct fib6_walker *);
1: -	void *args;
1: +  struct list_head lh;
1: +  struct fib6_node *root;
1: +  struct fib6_node *node;
1: +  struct fib6_info *leaf;
1: +  enum fib6_walk_state state;
1: +  unsigned int skip;
1: +  unsigned int count;
1: +  unsigned int skip_in_node;
1: +  int (*func)(struct fib6_walker *);
1: +  void *args;
1:  };
1:  
1:  struct ipv6_route_iter {
1: -	struct seq_net_private p;
1: -	struct fib6_walker w;
1: -	loff_t skip;
1: -	struct fib6_table *tbl;
1: -	int sernum;
1: +  struct seq_net_private p;
1: +  struct fib6_walker w;
1: +  loff_t skip;
1: +  struct fib6_table *tbl;
1: +  int sernum;
1:  };
1:  
1:  struct bpf_iter__ipv6_route {
1: -	union {
1: -		struct bpf_iter_meta *meta;
1: -	};
1: -	union {
1: -		struct fib6_info *rt;
1: -	};
1: +  union {
1: +    struct bpf_iter_meta *meta;
1: +  };
1: +  union {
1: +    struct fib6_info *rt;
1: +  };
1:  };
1:  
1:  struct fib6_cleaner {
1: -	struct fib6_walker w;
1: -	struct net *net;
1: -	int (*func)(struct fib6_info *, void *);
1: -	int sernum;
1: -	void *arg;
1: -	bool skip_notify;
1: +  struct fib6_walker w;
1: +  struct net *net;
1: +  int (*func)(struct fib6_info *, void *);
1: +  int sernum;
1: +  void *arg;
1: +  bool skip_notify;
1:  };
1:  
1:  enum {
1: -	FIB6_NO_SERNUM_CHANGE = 0,
1: +  FIB6_NO_SERNUM_CHANGE = 0,
1:  };
1:  
1:  struct fib6_dump_arg {
1: -	struct net *net;
1: -	struct notifier_block *nb;
1: -	struct netlink_ext_ack *extack;
1: +  struct net *net;
1: +  struct notifier_block *nb;
1: +  struct netlink_ext_ack *extack;
1:  };
1:  
1:  struct fib6_nh_pcpu_arg {
1: -	struct fib6_info *from;
1: -	const struct fib6_table *table;
1: +  struct fib6_info *from;
1: +  const struct fib6_table *table;
1:  };
1:  
1:  struct lookup_args {
1: -	int offset;
1: -	const struct in6_addr *addr;
1: +  int offset;
1: +  const struct in6_addr *addr;
1:  };
1:  
1:  struct ipv6_mreq {
1: -	struct in6_addr ipv6mr_multiaddr;
1: -	int ipv6mr_ifindex;
1: +  struct in6_addr ipv6mr_multiaddr;
1: +  int ipv6mr_ifindex;
1:  };
1:  
1:  struct in6_flowlabel_req {
1: -	struct in6_addr flr_dst;
1: -	__be32 flr_label;
1: -	__u8 flr_action;
1: -	__u8 flr_share;
1: -	__u16 flr_flags;
1: -	__u16 flr_expires;
1: -	__u16 flr_linger;
1: -	__u32 __flr_pad;
1: +  struct in6_addr flr_dst;
1: +  __be32 flr_label;
1: +  __u8 flr_action;
1: +  __u8 flr_share;
1: +  __u16 flr_flags;
1: +  __u16 flr_expires;
1: +  __u16 flr_linger;
1: +  __u32 __flr_pad;
1:  };
1:  
1:  struct ip6_mtuinfo {
1: -	struct sockaddr_in6 ip6m_addr;
1: -	__u32 ip6m_mtu;
1: +  struct sockaddr_in6 ip6m_addr;
1: +  __u32 ip6m_mtu;
1:  };
1:  
1:  struct nduseroptmsg {
1: -	unsigned char nduseropt_family;
1: -	unsigned char nduseropt_pad1;
1: -	short unsigned int nduseropt_opts_len;
1: -	int nduseropt_ifindex;
1: -	__u8 nduseropt_icmp_type;
1: -	__u8 nduseropt_icmp_code;
1: -	short unsigned int nduseropt_pad2;
1: -	unsigned int nduseropt_pad3;
1: +  unsigned char nduseropt_family;
1: +  unsigned char nduseropt_pad1;
1: +  short unsigned int nduseropt_opts_len;
1: +  int nduseropt_ifindex;
1: +  __u8 nduseropt_icmp_type;
1: +  __u8 nduseropt_icmp_code;
1: +  short unsigned int nduseropt_pad2;
1: +  unsigned int nduseropt_pad3;
1:  };
1:  
1:  enum {
1: -	NDUSEROPT_UNSPEC = 0,
1: -	NDUSEROPT_SRCADDR = 1,
1: -	__NDUSEROPT_MAX = 2,
1: +  NDUSEROPT_UNSPEC = 0,
1: +  NDUSEROPT_SRCADDR = 1,
1: +  __NDUSEROPT_MAX = 2,
1:  };
1:  
1:  struct rs_msg {
1: -	struct icmp6hdr icmph;
1: -	__u8 opt[0];
1: +  struct icmp6hdr icmph;
1: +  __u8 opt[0];
1:  };
1:  
1:  struct ra_msg {
1: -	struct icmp6hdr icmph;
1: -	__be32 reachable_time;
1: -	__be32 retrans_timer;
1: +  struct icmp6hdr icmph;
1: +  __be32 reachable_time;
1: +  __be32 retrans_timer;
1:  };
1:  
1:  struct static_key_false_deferred {
1: -	struct static_key_false key;
1: -	long unsigned int timeout;
1: -	struct delayed_work work;
1: +  struct static_key_false key;
1: +  long unsigned int timeout;
1: +  struct delayed_work work;
1:  };
1:  
1:  struct icmp6_filter {
1: -	__u32 data[8];
1: +  __u32 data[8];
1:  };
1:  
1:  struct raw6_sock {
1: -	struct inet_sock inet;
1: -	__u32 checksum;
1: -	__u32 offset;
1: -	struct icmp6_filter filter;
1: -	__u32 ip6mr_table;
1: -	struct ipv6_pinfo inet6;
1: +  struct inet_sock inet;
1: +  __u32 checksum;
1: +  __u32 offset;
1: +  struct icmp6_filter filter;
1: +  __u32 ip6mr_table;
1: +  struct ipv6_pinfo inet6;
1:  };
1:  
1:  typedef int mh_filter_t(struct sock *, struct sk_buff *);
1:  
1:  struct raw6_frag_vec {
1: -	struct msghdr *msg;
1: -	int hlen;
1: -	char c[4];
1: +  struct msghdr *msg;
1: +  int hlen;
1: +  char c[4];
1:  };
1:  
1: -typedef void ip6_icmp_send_t(struct sk_buff *, u8, u8, __u32, const struct in6_addr *);
1: +typedef void ip6_icmp_send_t(struct sk_buff *, u8, u8, __u32,
1: +                             const struct in6_addr *);
1:  
1:  struct ipv6_destopt_hao {
1: -	__u8 type;
1: -	__u8 length;
1: -	struct in6_addr addr;
1: +  __u8 type;
1: +  __u8 length;
1: +  struct in6_addr addr;
1:  } __attribute__((packed));
1:  
1:  struct icmpv6_msg {
1: -	struct sk_buff *skb;
1: -	int offset;
1: -	uint8_t type;
1: +  struct sk_buff *skb;
1: +  int offset;
1: +  uint8_t type;
1:  };
1:  
1:  struct icmp6_err {
1: -	int err;
1: -	int fatal;
1: +  int err;
1: +  int fatal;
1:  };
1:  
1:  struct mld_msg {
1: -	struct icmp6hdr mld_hdr;
1: -	struct in6_addr mld_mca;
1: +  struct icmp6hdr mld_hdr;
1: +  struct in6_addr mld_mca;
1:  };
1:  
1:  struct mld2_grec {
1: -	__u8 grec_type;
1: -	__u8 grec_auxwords;
1: -	__be16 grec_nsrcs;
1: -	struct in6_addr grec_mca;
1: -	struct in6_addr grec_src[0];
1: +  __u8 grec_type;
1: +  __u8 grec_auxwords;
1: +  __be16 grec_nsrcs;
1: +  struct in6_addr grec_mca;
1: +  struct in6_addr grec_src[0];
1:  };
1:  
1:  struct mld2_report {
1: -	struct icmp6hdr mld2r_hdr;
1: -	struct mld2_grec mld2r_grec[0];
1: +  struct icmp6hdr mld2r_hdr;
1: +  struct mld2_grec mld2r_grec[0];
1:  };
1:  
1:  struct mld2_query {
1: -	struct icmp6hdr mld2q_hdr;
1: -	struct in6_addr mld2q_mca;
1: -	__u8 mld2q_qrv: 3;
1: -	__u8 mld2q_suppress: 1;
1: -	__u8 mld2q_resv2: 4;
1: -	__u8 mld2q_qqic;
1: -	__be16 mld2q_nsrcs;
1: -	struct in6_addr mld2q_srcs[0];
1: +  struct icmp6hdr mld2q_hdr;
1: +  struct in6_addr mld2q_mca;
1: +  __u8 mld2q_qrv : 3;
1: +  __u8 mld2q_suppress : 1;
1: +  __u8 mld2q_resv2 : 4;
1: +  __u8 mld2q_qqic;
1: +  __be16 mld2q_nsrcs;
1: +  struct in6_addr mld2q_srcs[0];
1:  };
1:  
1:  struct igmp6_mc_iter_state {
1: -	struct seq_net_private p;
1: -	struct net_device *dev;
1: -	struct inet6_dev *idev;
1: +  struct seq_net_private p;
1: +  struct net_device *dev;
1: +  struct inet6_dev *idev;
1:  };
1:  
1:  struct igmp6_mcf_iter_state {
1: -	struct seq_net_private p;
1: -	struct net_device *dev;
1: -	struct inet6_dev *idev;
1: -	struct ifmcaddr6 *im;
1: +  struct seq_net_private p;
1: +  struct net_device *dev;
1: +  struct inet6_dev *idev;
1: +  struct ifmcaddr6 *im;
1:  };
1:  
1:  enum ip6_defrag_users {
1: -	IP6_DEFRAG_LOCAL_DELIVER = 0,
1: -	IP6_DEFRAG_CONNTRACK_IN = 1,
1: -	__IP6_DEFRAG_CONNTRACK_IN = 65536,
1: -	IP6_DEFRAG_CONNTRACK_OUT = 65537,
1: -	__IP6_DEFRAG_CONNTRACK_OUT = 131072,
1: -	IP6_DEFRAG_CONNTRACK_BRIDGE_IN = 131073,
1: -	__IP6_DEFRAG_CONNTRACK_BRIDGE_IN = 196608,
1: +  IP6_DEFRAG_LOCAL_DELIVER = 0,
1: +  IP6_DEFRAG_CONNTRACK_IN = 1,
1: +  __IP6_DEFRAG_CONNTRACK_IN = 65536,
1: +  IP6_DEFRAG_CONNTRACK_OUT = 65537,
1: +  __IP6_DEFRAG_CONNTRACK_OUT = 131072,
1: +  IP6_DEFRAG_CONNTRACK_BRIDGE_IN = 131073,
1: +  __IP6_DEFRAG_CONNTRACK_BRIDGE_IN = 196608,
1:  };
1:  
1:  struct frag_queue {
1: -	struct inet_frag_queue q;
1: -	int iif;
1: -	__u16 nhoffset;
1: -	u8 ecn;
1: +  struct inet_frag_queue q;
1: +  int iif;
1: +  __u16 nhoffset;
1: +  u8 ecn;
1:  };
1:  
1:  struct tcp6_pseudohdr {
1: -	struct in6_addr saddr;
1: -	struct in6_addr daddr;
1: -	__be32 len;
1: -	__be32 protocol;
1: +  struct in6_addr saddr;
1: +  struct in6_addr daddr;
1: +  __be32 len;
1: +  __be32 protocol;
1:  };
1:  
1:  struct rt0_hdr {
1: -	struct ipv6_rt_hdr rt_hdr;
1: -	__u32 reserved;
1: -	struct in6_addr addr[0];
1: +  struct ipv6_rt_hdr rt_hdr;
1: +  __u32 reserved;
1: +  struct in6_addr addr[0];
1:  };
1:  
1:  struct ipv6_rpl_sr_hdr {
1: -	__u8 nexthdr;
1: -	__u8 hdrlen;
1: -	__u8 type;
1: -	__u8 segments_left;
1: -	__u32 cmpre: 4;
1: -	__u32 cmpri: 4;
1: -	__u32 reserved: 4;
1: -	__u32 pad: 4;
1: -	__u32 reserved1: 16;
1: -	union {
1: -		struct in6_addr addr[0];
1: -		__u8 data[0];
1: -	} segments;
1: +  __u8 nexthdr;
1: +  __u8 hdrlen;
1: +  __u8 type;
1: +  __u8 segments_left;
1: +  __u32 cmpre : 4;
1: +  __u32 cmpri : 4;
1: +  __u32 reserved : 4;
1: +  __u32 pad : 4;
1: +  __u32 reserved1 : 16;
1: +  union {
1: +    struct in6_addr addr[0];
1: +    __u8 data[0];
1: +  } segments;
1:  };
1:  
1:  struct tlvtype_proc {
1: -	int type;
1: -	bool (*func)(struct sk_buff *, int);
1: +  int type;
1: +  bool (*func)(struct sk_buff *, int);
1:  };
1:  
1:  struct ip6fl_iter_state {
1: -	struct seq_net_private p;
1: -	struct pid_namespace *pid_ns;
1: -	int bucket;
1: +  struct seq_net_private p;
1: +  struct pid_namespace *pid_ns;
1: +  int bucket;
1:  };
1:  
1:  struct sr6_tlv {
1: -	__u8 type;
1: -	__u8 len;
1: -	__u8 data[0];
1: +  __u8 type;
1: +  __u8 len;
1: +  __u8 data[0];
1:  };
1:  
1:  enum {
1: -	SEG6_ATTR_UNSPEC = 0,
1: -	SEG6_ATTR_DST = 1,
1: -	SEG6_ATTR_DSTLEN = 2,
1: -	SEG6_ATTR_HMACKEYID = 3,
1: -	SEG6_ATTR_SECRET = 4,
1: -	SEG6_ATTR_SECRETLEN = 5,
1: -	SEG6_ATTR_ALGID = 6,
1: -	SEG6_ATTR_HMACINFO = 7,
1: -	__SEG6_ATTR_MAX = 8,
1: +  SEG6_ATTR_UNSPEC = 0,
1: +  SEG6_ATTR_DST = 1,
1: +  SEG6_ATTR_DSTLEN = 2,
1: +  SEG6_ATTR_HMACKEYID = 3,
1: +  SEG6_ATTR_SECRET = 4,
1: +  SEG6_ATTR_SECRETLEN = 5,
1: +  SEG6_ATTR_ALGID = 6,
1: +  SEG6_ATTR_HMACINFO = 7,
1: +  __SEG6_ATTR_MAX = 8,
1:  };
1:  
1:  enum {
1: -	SEG6_CMD_UNSPEC = 0,
1: -	SEG6_CMD_SETHMAC = 1,
1: -	SEG6_CMD_DUMPHMAC = 2,
1: -	SEG6_CMD_SET_TUNSRC = 3,
1: -	SEG6_CMD_GET_TUNSRC = 4,
1: -	__SEG6_CMD_MAX = 5,
1: +  SEG6_CMD_UNSPEC = 0,
1: +  SEG6_CMD_SETHMAC = 1,
1: +  SEG6_CMD_DUMPHMAC = 2,
1: +  SEG6_CMD_SET_TUNSRC = 3,
1: +  SEG6_CMD_GET_TUNSRC = 4,
1: +  __SEG6_CMD_MAX = 5,
1:  };
1:  
1:  struct xfrm6_protocol {
1: -	int (*handler)(struct sk_buff *);
1: -	int (*input_handler)(struct sk_buff *, int, __be32, int);
1: -	int (*cb_handler)(struct sk_buff *, int);
1: -	int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int, __be32);
1: -	struct xfrm6_protocol *next;
1: -	int priority;
1: +  int (*handler)(struct sk_buff *);
1: +  int (*input_handler)(struct sk_buff *, int, __be32, int);
1: +  int (*cb_handler)(struct sk_buff *, int);
1: +  int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int,
1: +                     __be32);
1: +  struct xfrm6_protocol *next;
1: +  int priority;
1:  };
1:  
1:  struct br_input_skb_cb {
1: -	struct net_device *brdev;
1: -	u16 frag_max_size;
1: -	u8 igmp;
1: -	u8 mrouters_only: 1;
1: -	u8 proxyarp_replied: 1;
1: -	u8 src_port_isolated: 1;
1: -	u8 vlan_filtered: 1;
1: -	u8 br_netfilter_broute: 1;
1: +  struct net_device *brdev;
1: +  u16 frag_max_size;
1: +  u8 igmp;
1: +  u8 mrouters_only : 1;
1: +  u8 proxyarp_replied : 1;
1: +  u8 src_port_isolated : 1;
1: +  u8 vlan_filtered : 1;
1: +  u8 br_netfilter_broute : 1;
1:  };
1:  
1:  struct nf_bridge_frag_data;
1:  
1: -typedef struct rt6_info * (*pol_lookup_t)(struct net *, struct fib6_table *, struct flowi6 *, const struct sk_buff *, int);
1: +typedef struct rt6_info *(*pol_lookup_t)(struct net *, struct fib6_table *,
1: +                                         struct flowi6 *,
1: +                                         const struct sk_buff *, int);
1:  
1:  struct fib6_rule {
1: -	struct fib_rule common;
1: -	struct rt6key src;
1: -	struct rt6key dst;
1: -	u8 tclass;
1: +  struct fib_rule common;
1: +  struct rt6key src;
1: +  struct rt6key dst;
1: +  u8 tclass;
1:  };
1:  
1:  struct calipso_doi;
1:  
1:  struct netlbl_calipso_ops {
1: -	int (*doi_add)(struct calipso_doi *, struct netlbl_audit *);
1: -	void (*doi_free)(struct calipso_doi *);
1: -	int (*doi_remove)(u32, struct netlbl_audit *);
1: -	struct calipso_doi * (*doi_getdef)(u32);
1: -	void (*doi_putdef)(struct calipso_doi *);
1: -	int (*doi_walk)(u32 *, int (*)(struct calipso_doi *, void *), void *);
1: -	int (*sock_getattr)(struct sock *, struct netlbl_lsm_secattr *);
1: -	int (*sock_setattr)(struct sock *, const struct calipso_doi *, const struct netlbl_lsm_secattr *);
1: -	void (*sock_delattr)(struct sock *);
1: -	int (*req_setattr)(struct request_sock *, const struct calipso_doi *, const struct netlbl_lsm_secattr *);
1: -	void (*req_delattr)(struct request_sock *);
1: -	int (*opt_getattr)(const unsigned char *, struct netlbl_lsm_secattr *);
1: -	unsigned char * (*skbuff_optptr)(const struct sk_buff *);
1: -	int (*skbuff_setattr)(struct sk_buff *, const struct calipso_doi *, const struct netlbl_lsm_secattr *);
1: -	int (*skbuff_delattr)(struct sk_buff *);
1: -	void (*cache_invalidate)();
1: -	int (*cache_add)(const unsigned char *, const struct netlbl_lsm_secattr *);
1: +  int (*doi_add)(struct calipso_doi *, struct netlbl_audit *);
1: +  void (*doi_free)(struct calipso_doi *);
1: +  int (*doi_remove)(u32, struct netlbl_audit *);
1: +  struct calipso_doi *(*doi_getdef)(u32);
1: +  void (*doi_putdef)(struct calipso_doi *);
1: +  int (*doi_walk)(u32 *, int (*)(struct calipso_doi *, void *), void *);
1: +  int (*sock_getattr)(struct sock *, struct netlbl_lsm_secattr *);
1: +  int (*sock_setattr)(struct sock *, const struct calipso_doi *,
1: +                      const struct netlbl_lsm_secattr *);
1: +  void (*sock_delattr)(struct sock *);
1: +  int (*req_setattr)(struct request_sock *, const struct calipso_doi *,
1: +                     const struct netlbl_lsm_secattr *);
1: +  void (*req_delattr)(struct request_sock *);
1: +  int (*opt_getattr)(const unsigned char *, struct netlbl_lsm_secattr *);
1: +  unsigned char *(*skbuff_optptr)(const struct sk_buff *);
1: +  int (*skbuff_setattr)(struct sk_buff *, const struct calipso_doi *,
1: +                        const struct netlbl_lsm_secattr *);
1: +  int (*skbuff_delattr)(struct sk_buff *);
1: +  void (*cache_invalidate)();
1: +  int (*cache_add)(const unsigned char *, const struct netlbl_lsm_secattr *);
1:  };
1:  
1:  struct calipso_doi {
1: -	u32 doi;
1: -	u32 type;
1: -	refcount_t refcount;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  u32 doi;
1: +  u32 type;
1: +  refcount_t refcount;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct calipso_map_cache_bkt {
1: -	spinlock_t lock;
1: -	u32 size;
1: -	struct list_head list;
1: +  spinlock_t lock;
1: +  u32 size;
1: +  struct list_head list;
1:  };
1:  
1:  struct calipso_map_cache_entry {
1: -	u32 hash;
1: -	unsigned char *key;
1: -	size_t key_len;
1: -	struct netlbl_lsm_cache *lsm_data;
1: -	u32 activity;
1: -	struct list_head list;
1: +  u32 hash;
1: +  unsigned char *key;
1: +  size_t key_len;
1: +  struct netlbl_lsm_cache *lsm_data;
1: +  u32 activity;
1: +  struct list_head list;
1:  };
1:  
1:  enum {
1: -	SEG6_IPTUNNEL_UNSPEC = 0,
1: -	SEG6_IPTUNNEL_SRH = 1,
1: -	__SEG6_IPTUNNEL_MAX = 2,
1: +  SEG6_IPTUNNEL_UNSPEC = 0,
1: +  SEG6_IPTUNNEL_SRH = 1,
1: +  __SEG6_IPTUNNEL_MAX = 2,
1:  };
1:  
1:  struct seg6_iptunnel_encap {
1: -	int mode;
1: -	struct ipv6_sr_hdr srh[0];
1: +  int mode;
1: +  struct ipv6_sr_hdr srh[0];
1:  };
1:  
1:  enum {
1: -	SEG6_IPTUN_MODE_INLINE = 0,
1: -	SEG6_IPTUN_MODE_ENCAP = 1,
1: -	SEG6_IPTUN_MODE_L2ENCAP = 2,
1: +  SEG6_IPTUN_MODE_INLINE = 0,
1: +  SEG6_IPTUN_MODE_ENCAP = 1,
1: +  SEG6_IPTUN_MODE_L2ENCAP = 2,
1:  };
1:  
1:  struct seg6_lwt {
1: -	struct dst_cache cache;
1: -	struct seg6_iptunnel_encap tuninfo[0];
1: +  struct dst_cache cache;
1: +  struct seg6_iptunnel_encap tuninfo[0];
1:  };
1:  
1:  enum {
1: -	SEG6_LOCAL_UNSPEC = 0,
1: -	SEG6_LOCAL_ACTION = 1,
1: -	SEG6_LOCAL_SRH = 2,
1: -	SEG6_LOCAL_TABLE = 3,
1: -	SEG6_LOCAL_NH4 = 4,
1: -	SEG6_LOCAL_NH6 = 5,
1: -	SEG6_LOCAL_IIF = 6,
1: -	SEG6_LOCAL_OIF = 7,
1: -	SEG6_LOCAL_BPF = 8,
1: -	__SEG6_LOCAL_MAX = 9,
1: +  SEG6_LOCAL_UNSPEC = 0,
1: +  SEG6_LOCAL_ACTION = 1,
1: +  SEG6_LOCAL_SRH = 2,
1: +  SEG6_LOCAL_TABLE = 3,
1: +  SEG6_LOCAL_NH4 = 4,
1: +  SEG6_LOCAL_NH6 = 5,
1: +  SEG6_LOCAL_IIF = 6,
1: +  SEG6_LOCAL_OIF = 7,
1: +  SEG6_LOCAL_BPF = 8,
1: +  __SEG6_LOCAL_MAX = 9,
1:  };
1:  
1:  enum {
1: -	SEG6_LOCAL_BPF_PROG_UNSPEC = 0,
1: -	SEG6_LOCAL_BPF_PROG = 1,
1: -	SEG6_LOCAL_BPF_PROG_NAME = 2,
1: -	__SEG6_LOCAL_BPF_PROG_MAX = 3,
1: +  SEG6_LOCAL_BPF_PROG_UNSPEC = 0,
1: +  SEG6_LOCAL_BPF_PROG = 1,
1: +  SEG6_LOCAL_BPF_PROG_NAME = 2,
1: +  __SEG6_LOCAL_BPF_PROG_MAX = 3,
1:  };
1:  
1:  struct seg6_local_lwt;
1:  
1:  struct seg6_action_desc {
1: -	int action;
1: -	long unsigned int attrs;
1: -	int (*input)(struct sk_buff *, struct seg6_local_lwt *);
1: -	int static_headroom;
1: +  int action;
1: +  long unsigned int attrs;
1: +  int (*input)(struct sk_buff *, struct seg6_local_lwt *);
1: +  int static_headroom;
1:  };
1:  
1:  struct seg6_local_lwt {
1: -	int action;
1: -	struct ipv6_sr_hdr *srh;
1: -	int table;
1: -	struct in_addr nh4;
1: -	struct in6_addr nh6;
1: -	int iif;
1: -	int oif;
1: -	struct bpf_lwt_prog bpf;
1: -	int headroom;
1: -	struct seg6_action_desc *desc;
1: +  int action;
1: +  struct ipv6_sr_hdr *srh;
1: +  int table;
1: +  struct in_addr nh4;
1: +  struct in6_addr nh6;
1: +  int iif;
1: +  int oif;
1: +  struct bpf_lwt_prog bpf;
1: +  int headroom;
1: +  struct seg6_action_desc *desc;
1:  };
1:  
1:  struct seg6_action_param {
1: -	int (*parse)(struct nlattr **, struct seg6_local_lwt *);
1: -	int (*put)(struct sk_buff *, struct seg6_local_lwt *);
1: -	int (*cmp)(struct seg6_local_lwt *, struct seg6_local_lwt *);
1: +  int (*parse)(struct nlattr **, struct seg6_local_lwt *);
1: +  int (*put)(struct sk_buff *, struct seg6_local_lwt *);
1: +  int (*cmp)(struct seg6_local_lwt *, struct seg6_local_lwt *);
1:  };
1:  
1:  struct xfrm6_tunnel {
1: -	int (*handler)(struct sk_buff *);
1: -	int (*cb_handler)(struct sk_buff *, int);
1: -	int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int, __be32);
1: -	struct xfrm6_tunnel *next;
1: -	int priority;
1: +  int (*handler)(struct sk_buff *);
1: +  int (*cb_handler)(struct sk_buff *, int);
1: +  int (*err_handler)(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int,
1: +                     __be32);
1: +  struct xfrm6_tunnel *next;
1: +  int priority;
1:  };
1:  
1:  struct ip6t_ip6 {
1: -	struct in6_addr src;
1: -	struct in6_addr dst;
1: -	struct in6_addr smsk;
1: -	struct in6_addr dmsk;
1: -	char iniface[16];
1: -	char outiface[16];
1: -	unsigned char iniface_mask[16];
1: -	unsigned char outiface_mask[16];
1: -	__u16 proto;
1: -	__u8 tos;
1: -	__u8 flags;
1: -	__u8 invflags;
1: +  struct in6_addr src;
1: +  struct in6_addr dst;
1: +  struct in6_addr smsk;
1: +  struct in6_addr dmsk;
1: +  char iniface[16];
1: +  char outiface[16];
1: +  unsigned char iniface_mask[16];
1: +  unsigned char outiface_mask[16];
1: +  __u16 proto;
1: +  __u8 tos;
1: +  __u8 flags;
1: +  __u8 invflags;
1:  };
1:  
1:  struct ip6t_entry {
1: -	struct ip6t_ip6 ipv6;
1: -	unsigned int nfcache;
1: -	__u16 target_offset;
1: -	__u16 next_offset;
1: -	unsigned int comefrom;
1: -	struct xt_counters counters;
1: -	unsigned char elems[0];
1: +  struct ip6t_ip6 ipv6;
1: +  unsigned int nfcache;
1: +  __u16 target_offset;
1: +  __u16 next_offset;
1: +  unsigned int comefrom;
1: +  struct xt_counters counters;
1: +  unsigned char elems[0];
1:  };
1:  
1:  struct ip6t_standard {
1: -	struct ip6t_entry entry;
1: -	struct xt_standard_target target;
1: +  struct ip6t_entry entry;
1: +  struct xt_standard_target target;
1:  };
1:  
1:  struct ip6t_error {
1: -	struct ip6t_entry entry;
1: -	struct xt_error_target target;
1: +  struct ip6t_entry entry;
1: +  struct xt_error_target target;
1:  };
1:  
1:  struct ip6t_icmp {
1: -	__u8 type;
1: -	__u8 code[2];
1: -	__u8 invflags;
1: +  __u8 type;
1: +  __u8 code[2];
1: +  __u8 invflags;
1:  };
1:  
1:  struct ip6t_getinfo {
1: -	char name[32];
1: -	unsigned int valid_hooks;
1: -	unsigned int hook_entry[5];
1: -	unsigned int underflow[5];
1: -	unsigned int num_entries;
1: -	unsigned int size;
1: +  char name[32];
1: +  unsigned int valid_hooks;
1: +  unsigned int hook_entry[5];
1: +  unsigned int underflow[5];
1: +  unsigned int num_entries;
1: +  unsigned int size;
1:  };
1:  
1:  struct ip6t_replace {
1: -	char name[32];
1: -	unsigned int valid_hooks;
1: -	unsigned int num_entries;
1: -	unsigned int size;
1: -	unsigned int hook_entry[5];
1: -	unsigned int underflow[5];
1: -	unsigned int num_counters;
1: -	struct xt_counters *counters;
1: -	struct ip6t_entry entries[0];
1: +  char name[32];
1: +  unsigned int valid_hooks;
1: +  unsigned int num_entries;
1: +  unsigned int size;
1: +  unsigned int hook_entry[5];
1: +  unsigned int underflow[5];
1: +  unsigned int num_counters;
1: +  struct xt_counters *counters;
1: +  struct ip6t_entry entries[0];
1:  };
1:  
1:  struct ip6t_get_entries {
1: -	char name[32];
1: -	unsigned int size;
1: -	struct ip6t_entry entrytable[0];
1: +  char name[32];
1: +  unsigned int size;
1: +  struct ip6t_entry entrytable[0];
1:  };
1:  
1:  struct compat_ip6t_entry {
1: -	struct ip6t_ip6 ipv6;
1: -	compat_uint_t nfcache;
1: -	__u16 target_offset;
1: -	__u16 next_offset;
1: -	compat_uint_t comefrom;
1: -	struct compat_xt_counters counters;
1: -	unsigned char elems[0];
1: +  struct ip6t_ip6 ipv6;
1: +  compat_uint_t nfcache;
1: +  __u16 target_offset;
1: +  __u16 next_offset;
1: +  compat_uint_t comefrom;
1: +  struct compat_xt_counters counters;
1: +  unsigned char elems[0];
1:  } __attribute__((packed));
1:  
1:  struct compat_ip6t_replace {
1: -	char name[32];
1: -	u32 valid_hooks;
1: -	u32 num_entries;
1: -	u32 size;
1: -	u32 hook_entry[5];
1: -	u32 underflow[5];
1: -	u32 num_counters;
1: -	compat_uptr_t counters;
1: -	struct compat_ip6t_entry entries[0];
1: +  char name[32];
1: +  u32 valid_hooks;
1: +  u32 num_entries;
1: +  u32 size;
1: +  u32 hook_entry[5];
1: +  u32 underflow[5];
1: +  u32 num_counters;
1: +  compat_uptr_t counters;
1: +  struct compat_ip6t_entry entries[0];
1:  } __attribute__((packed));
1:  
1:  struct compat_ip6t_get_entries {
1: -	char name[32];
1: -	compat_uint_t size;
1: -	struct compat_ip6t_entry entrytable[0];
1: +  char name[32];
1: +  compat_uint_t size;
1: +  struct compat_ip6t_entry entrytable[0];
1:  } __attribute__((packed));
1:  
1:  struct ip6_tnl_parm {
1: -	char name[16];
1: -	int link;
1: -	__u8 proto;
1: -	__u8 encap_limit;
1: -	__u8 hop_limit;
1: -	__be32 flowinfo;
1: -	__u32 flags;
1: -	struct in6_addr laddr;
1: -	struct in6_addr raddr;
1: +  char name[16];
1: +  int link;
1: +  __u8 proto;
1: +  __u8 encap_limit;
1: +  __u8 hop_limit;
1: +  __be32 flowinfo;
1: +  __u32 flags;
1: +  struct in6_addr laddr;
1: +  struct in6_addr raddr;
1:  };
1:  
1:  struct ipv6_tlv_tnl_enc_lim {
1: -	__u8 type;
1: -	__u8 length;
1: -	__u8 encap_limit;
1: +  __u8 type;
1: +  __u8 length;
1: +  __u8 encap_limit;
1:  };
1:  
1:  struct ip6_tnl_net {
1: -	struct net_device *fb_tnl_dev;
1: -	struct ip6_tnl *tnls_r_l[32];
1: -	struct ip6_tnl *tnls_wc[1];
1: -	struct ip6_tnl **tnls[2];
1: -	struct ip6_tnl *collect_md_tun;
1: +  struct net_device *fb_tnl_dev;
1: +  struct ip6_tnl *tnls_r_l[32];
1: +  struct ip6_tnl *tnls_wc[1];
1: +  struct ip6_tnl **tnls[2];
1: +  struct ip6_tnl *collect_md_tun;
1:  };
1:  
1:  struct ipv6_tel_txoption {
1: -	struct ipv6_txoptions ops;
1: -	__u8 dst_opt[8];
1: +  struct ipv6_txoptions ops;
1: +  __u8 dst_opt[8];
1:  };
1:  
1:  struct ip6_tnl_parm2 {
1: -	char name[16];
1: -	int link;
1: -	__u8 proto;
1: -	__u8 encap_limit;
1: -	__u8 hop_limit;
1: -	__be32 flowinfo;
1: -	__u32 flags;
1: -	struct in6_addr laddr;
1: -	struct in6_addr raddr;
1: -	__be16 i_flags;
1: -	__be16 o_flags;
1: -	__be32 i_key;
1: -	__be32 o_key;
1: +  char name[16];
1: +  int link;
1: +  __u8 proto;
1: +  __u8 encap_limit;
1: +  __u8 hop_limit;
1: +  __be32 flowinfo;
1: +  __u32 flags;
1: +  struct in6_addr laddr;
1: +  struct in6_addr raddr;
1: +  __be16 i_flags;
1: +  __be16 o_flags;
1: +  __be32 i_key;
1: +  __be32 o_key;
1:  };
1:  
1:  struct ip6gre_net {
1: -	struct ip6_tnl *tunnels[128];
1: -	struct ip6_tnl *collect_md_tun;
1: -	struct ip6_tnl *collect_md_tun_erspan;
1: -	struct net_device *fb_tunnel_dev;
1: +  struct ip6_tnl *tunnels[128];
1: +  struct ip6_tnl *collect_md_tun;
1: +  struct ip6_tnl *collect_md_tun_erspan;
1: +  struct net_device *fb_tunnel_dev;
1:  };
1:  
1:  enum {
1: -	IP6_FH_F_FRAG = 1,
1: -	IP6_FH_F_AUTH = 2,
1: -	IP6_FH_F_SKIP_RH = 4,
1: +  IP6_FH_F_FRAG = 1,
1: +  IP6_FH_F_AUTH = 2,
1: +  IP6_FH_F_SKIP_RH = 4,
1:  };
1:  
1:  struct sockaddr_pkt {
1: -	short unsigned int spkt_family;
1: -	unsigned char spkt_device[14];
1: -	__be16 spkt_protocol;
1: +  short unsigned int spkt_family;
1: +  unsigned char spkt_device[14];
1: +  __be16 spkt_protocol;
1:  };
1:  
1:  struct sockaddr_ll {
1: -	short unsigned int sll_family;
1: -	__be16 sll_protocol;
1: -	int sll_ifindex;
1: -	short unsigned int sll_hatype;
1: -	unsigned char sll_pkttype;
1: -	unsigned char sll_halen;
1: -	unsigned char sll_addr[8];
1: +  short unsigned int sll_family;
1: +  __be16 sll_protocol;
1: +  int sll_ifindex;
1: +  short unsigned int sll_hatype;
1: +  unsigned char sll_pkttype;
1: +  unsigned char sll_halen;
1: +  unsigned char sll_addr[8];
1:  };
1:  
1:  struct tpacket_stats {
1: -	unsigned int tp_packets;
1: -	unsigned int tp_drops;
1: +  unsigned int tp_packets;
1: +  unsigned int tp_drops;
1:  };
1:  
1:  struct tpacket_stats_v3 {
1: -	unsigned int tp_packets;
1: -	unsigned int tp_drops;
1: -	unsigned int tp_freeze_q_cnt;
1: +  unsigned int tp_packets;
1: +  unsigned int tp_drops;
1: +  unsigned int tp_freeze_q_cnt;
1:  };
1:  
1:  struct tpacket_rollover_stats {
1: -	__u64 tp_all;
1: -	__u64 tp_huge;
1: -	__u64 tp_failed;
1: +  __u64 tp_all;
1: +  __u64 tp_huge;
1: +  __u64 tp_failed;
1:  };
1:  
1:  union tpacket_stats_u {
1: -	struct tpacket_stats stats1;
1: -	struct tpacket_stats_v3 stats3;
1: +  struct tpacket_stats stats1;
1: +  struct tpacket_stats_v3 stats3;
1:  };
1:  
1:  struct tpacket_auxdata {
1: -	__u32 tp_status;
1: -	__u32 tp_len;
1: -	__u32 tp_snaplen;
1: -	__u16 tp_mac;
1: -	__u16 tp_net;
1: -	__u16 tp_vlan_tci;
1: -	__u16 tp_vlan_tpid;
1: +  __u32 tp_status;
1: +  __u32 tp_len;
1: +  __u32 tp_snaplen;
1: +  __u16 tp_mac;
1: +  __u16 tp_net;
1: +  __u16 tp_vlan_tci;
1: +  __u16 tp_vlan_tpid;
1:  };
1:  
1:  struct tpacket_hdr {
1: -	long unsigned int tp_status;
1: -	unsigned int tp_len;
1: -	unsigned int tp_snaplen;
1: -	short unsigned int tp_mac;
1: -	short unsigned int tp_net;
1: -	unsigned int tp_sec;
1: -	unsigned int tp_usec;
1: +  long unsigned int tp_status;
1: +  unsigned int tp_len;
1: +  unsigned int tp_snaplen;
1: +  short unsigned int tp_mac;
1: +  short unsigned int tp_net;
1: +  unsigned int tp_sec;
1: +  unsigned int tp_usec;
1:  };
1:  
1:  struct tpacket2_hdr {
1: -	__u32 tp_status;
1: -	__u32 tp_len;
1: -	__u32 tp_snaplen;
1: -	__u16 tp_mac;
1: -	__u16 tp_net;
1: -	__u32 tp_sec;
1: -	__u32 tp_nsec;
1: -	__u16 tp_vlan_tci;
1: -	__u16 tp_vlan_tpid;
1: -	__u8 tp_padding[4];
1: +  __u32 tp_status;
1: +  __u32 tp_len;
1: +  __u32 tp_snaplen;
1: +  __u16 tp_mac;
1: +  __u16 tp_net;
1: +  __u32 tp_sec;
1: +  __u32 tp_nsec;
1: +  __u16 tp_vlan_tci;
1: +  __u16 tp_vlan_tpid;
1: +  __u8 tp_padding[4];
1:  };
1:  
1:  struct tpacket_hdr_variant1 {
1: -	__u32 tp_rxhash;
1: -	__u32 tp_vlan_tci;
1: -	__u16 tp_vlan_tpid;
1: -	__u16 tp_padding;
1: +  __u32 tp_rxhash;
1: +  __u32 tp_vlan_tci;
1: +  __u16 tp_vlan_tpid;
1: +  __u16 tp_padding;
1:  };
1:  
1:  struct tpacket3_hdr {
1: -	__u32 tp_next_offset;
1: -	__u32 tp_sec;
1: -	__u32 tp_nsec;
1: -	__u32 tp_snaplen;
1: -	__u32 tp_len;
1: -	__u32 tp_status;
1: -	__u16 tp_mac;
1: -	__u16 tp_net;
1: -	union {
1: -		struct tpacket_hdr_variant1 hv1;
1: -	};
1: -	__u8 tp_padding[8];
1: +  __u32 tp_next_offset;
1: +  __u32 tp_sec;
1: +  __u32 tp_nsec;
1: +  __u32 tp_snaplen;
1: +  __u32 tp_len;
1: +  __u32 tp_status;
1: +  __u16 tp_mac;
1: +  __u16 tp_net;
1: +  union {
1: +    struct tpacket_hdr_variant1 hv1;
1: +  };
1: +  __u8 tp_padding[8];
1:  };
1:  
1:  struct tpacket_bd_ts {
1: -	unsigned int ts_sec;
1: -	union {
1: -		unsigned int ts_usec;
1: -		unsigned int ts_nsec;
1: -	};
1: +  unsigned int ts_sec;
1: +  union {
1: +    unsigned int ts_usec;
1: +    unsigned int ts_nsec;
1: +  };
1:  };
1:  
1:  struct tpacket_hdr_v1 {
1: -	__u32 block_status;
1: -	__u32 num_pkts;
1: -	__u32 offset_to_first_pkt;
1: -	__u32 blk_len;
1: -	__u64 seq_num;
1: -	struct tpacket_bd_ts ts_first_pkt;
1: -	struct tpacket_bd_ts ts_last_pkt;
1: +  __u32 block_status;
1: +  __u32 num_pkts;
1: +  __u32 offset_to_first_pkt;
1: +  __u32 blk_len;
1: +  __u64 seq_num;
1: +  struct tpacket_bd_ts ts_first_pkt;
1: +  struct tpacket_bd_ts ts_last_pkt;
1:  };
1:  
1:  union tpacket_bd_header_u {
1: -	struct tpacket_hdr_v1 bh1;
1: +  struct tpacket_hdr_v1 bh1;
1:  };
1:  
1:  struct tpacket_block_desc {
1: -	__u32 version;
1: -	__u32 offset_to_priv;
1: -	union tpacket_bd_header_u hdr;
1: +  __u32 version;
1: +  __u32 offset_to_priv;
1: +  union tpacket_bd_header_u hdr;
1:  };
1:  
1:  enum tpacket_versions {
1: -	TPACKET_V1 = 0,
1: -	TPACKET_V2 = 1,
1: -	TPACKET_V3 = 2,
1: +  TPACKET_V1 = 0,
1: +  TPACKET_V2 = 1,
1: +  TPACKET_V3 = 2,
1:  };
1:  
1:  struct tpacket_req {
1: -	unsigned int tp_block_size;
1: -	unsigned int tp_block_nr;
1: -	unsigned int tp_frame_size;
1: -	unsigned int tp_frame_nr;
1: +  unsigned int tp_block_size;
1: +  unsigned int tp_block_nr;
1: +  unsigned int tp_frame_size;
1: +  unsigned int tp_frame_nr;
1:  };
1:  
1:  struct tpacket_req3 {
1: -	unsigned int tp_block_size;
1: -	unsigned int tp_block_nr;
1: -	unsigned int tp_frame_size;
1: -	unsigned int tp_frame_nr;
1: -	unsigned int tp_retire_blk_tov;
1: -	unsigned int tp_sizeof_priv;
1: -	unsigned int tp_feature_req_word;
1: +  unsigned int tp_block_size;
1: +  unsigned int tp_block_nr;
1: +  unsigned int tp_frame_size;
1: +  unsigned int tp_frame_nr;
1: +  unsigned int tp_retire_blk_tov;
1: +  unsigned int tp_sizeof_priv;
1: +  unsigned int tp_feature_req_word;
1:  };
1:  
1:  union tpacket_req_u {
1: -	struct tpacket_req req;
1: -	struct tpacket_req3 req3;
1: +  struct tpacket_req req;
1: +  struct tpacket_req3 req3;
1:  };
1:  
1:  struct fanout_args {
1: -	__u16 id;
1: -	__u16 type_flags;
1: -	__u32 max_num_members;
1: +  __u16 id;
1: +  __u16 type_flags;
1: +  __u32 max_num_members;
1:  };
1:  
1:  struct packet_mclist {
1: -	struct packet_mclist *next;
1: -	int ifindex;
1: -	int count;
1: -	short unsigned int type;
1: -	short unsigned int alen;
1: -	unsigned char addr[32];
1: +  struct packet_mclist *next;
1: +  int ifindex;
1: +  int count;
1: +  short unsigned int type;
1: +  short unsigned int alen;
1: +  unsigned char addr[32];
1:  };
1:  
1:  struct pgv;
1:  
1:  struct tpacket_kbdq_core {
1: -	struct pgv *pkbdq;
1: -	unsigned int feature_req_word;
1: -	unsigned int hdrlen;
1: -	unsigned char reset_pending_on_curr_blk;
1: -	unsigned char delete_blk_timer;
1: -	short unsigned int kactive_blk_num;
1: -	short unsigned int blk_sizeof_priv;
1: -	short unsigned int last_kactive_blk_num;
1: -	char *pkblk_start;
1: -	char *pkblk_end;
1: -	int kblk_size;
1: -	unsigned int max_frame_len;
1: -	unsigned int knum_blocks;
1: -	uint64_t knxt_seq_num;
1: -	char *prev;
1: -	char *nxt_offset;
1: -	struct sk_buff *skb;
1: -	rwlock_t blk_fill_in_prog_lock;
1: -	short unsigned int retire_blk_tov;
1: -	short unsigned int version;
1: -	long unsigned int tov_in_jiffies;
1: -	struct timer_list retire_blk_timer;
1: +  struct pgv *pkbdq;
1: +  unsigned int feature_req_word;
1: +  unsigned int hdrlen;
1: +  unsigned char reset_pending_on_curr_blk;
1: +  unsigned char delete_blk_timer;
1: +  short unsigned int kactive_blk_num;
1: +  short unsigned int blk_sizeof_priv;
1: +  short unsigned int last_kactive_blk_num;
1: +  char *pkblk_start;
1: +  char *pkblk_end;
1: +  int kblk_size;
1: +  unsigned int max_frame_len;
1: +  unsigned int knum_blocks;
1: +  uint64_t knxt_seq_num;
1: +  char *prev;
1: +  char *nxt_offset;
1: +  struct sk_buff *skb;
1: +  rwlock_t blk_fill_in_prog_lock;
1: +  short unsigned int retire_blk_tov;
1: +  short unsigned int version;
1: +  long unsigned int tov_in_jiffies;
1: +  struct timer_list retire_blk_timer;
1:  };
1:  
1:  struct pgv {
1: -	char *buffer;
1: +  char *buffer;
1:  };
1:  
1:  struct packet_ring_buffer {
1: -	struct pgv *pg_vec;
1: -	unsigned int head;
1: -	unsigned int frames_per_block;
1: -	unsigned int frame_size;
1: -	unsigned int frame_max;
1: -	unsigned int pg_vec_order;
1: -	unsigned int pg_vec_pages;
1: -	unsigned int pg_vec_len;
1: -	unsigned int *pending_refcnt;
1: -	union {
1: -		long unsigned int *rx_owner_map;
1: -		struct tpacket_kbdq_core prb_bdqc;
1: -	};
1: +  struct pgv *pg_vec;
1: +  unsigned int head;
1: +  unsigned int frames_per_block;
1: +  unsigned int frame_size;
1: +  unsigned int frame_max;
1: +  unsigned int pg_vec_order;
1: +  unsigned int pg_vec_pages;
1: +  unsigned int pg_vec_len;
1: +  unsigned int *pending_refcnt;
1: +  union {
1: +    long unsigned int *rx_owner_map;
1: +    struct tpacket_kbdq_core prb_bdqc;
1: +  };
1:  };
1:  
1:  struct packet_fanout {
1: -	possible_net_t net;
1: -	unsigned int num_members;
1: -	u32 max_num_members;
1: -	u16 id;
1: -	u8 type;
1: -	u8 flags;
1: -	union {
1: -		atomic_t rr_cur;
1: -		struct bpf_prog *bpf_prog;
1: -	};
1: -	struct list_head list;
1: -	spinlock_t lock;
1: -	refcount_t sk_ref;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct packet_type prot_hook;
1: -	struct sock *arr[0];
1: +  possible_net_t net;
1: +  unsigned int num_members;
1: +  u32 max_num_members;
1: +  u16 id;
1: +  u8 type;
1: +  u8 flags;
1: +  union {
1: +    atomic_t rr_cur;
1: +    struct bpf_prog *bpf_prog;
1: +  };
1: +  struct list_head list;
1: +  spinlock_t lock;
1: +  refcount_t sk_ref;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct packet_type prot_hook;
1: +  struct sock *arr[0];
1:  };
1:  
1:  struct packet_rollover {
1: -	int sock;
1: -	atomic_long_t num;
1: -	atomic_long_t num_huge;
1: -	atomic_long_t num_failed;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 history[16];
1: +  int sock;
1: +  atomic_long_t num;
1: +  atomic_long_t num_huge;
1: +  atomic_long_t num_failed;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 history[16];
1:  };
1:  
1:  struct packet_sock {
1: -	struct sock sk;
1: -	struct packet_fanout *fanout;
1: -	union tpacket_stats_u stats;
1: -	struct packet_ring_buffer rx_ring;
1: -	struct packet_ring_buffer tx_ring;
1: -	int copy_thresh;
1: -	spinlock_t bind_lock;
1: -	struct mutex pg_vec_lock;
1: -	unsigned int running;
1: -	unsigned int auxdata: 1;
1: -	unsigned int origdev: 1;
1: -	unsigned int has_vnet_hdr: 1;
1: -	unsigned int tp_loss: 1;
1: -	unsigned int tp_tx_has_off: 1;
1: -	int pressure;
1: -	int ifindex;
1: -	__be16 num;
1: -	struct packet_rollover *rollover;
1: -	struct packet_mclist *mclist;
1: -	atomic_t mapped;
1: -	enum tpacket_versions tp_version;
1: -	unsigned int tp_hdrlen;
1: -	unsigned int tp_reserve;
1: -	unsigned int tp_tstamp;
1: -	struct completion skb_completion;
1: -	struct net_device *cached_dev;
1: -	int (*xmit)(struct sk_buff *);
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	struct packet_type prot_hook;
1: -	atomic_t tp_drops;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  struct sock sk;
1: +  struct packet_fanout *fanout;
1: +  union tpacket_stats_u stats;
1: +  struct packet_ring_buffer rx_ring;
1: +  struct packet_ring_buffer tx_ring;
1: +  int copy_thresh;
1: +  spinlock_t bind_lock;
1: +  struct mutex pg_vec_lock;
1: +  unsigned int running;
1: +  unsigned int auxdata : 1;
1: +  unsigned int origdev : 1;
1: +  unsigned int has_vnet_hdr : 1;
1: +  unsigned int tp_loss : 1;
1: +  unsigned int tp_tx_has_off : 1;
1: +  int pressure;
1: +  int ifindex;
1: +  __be16 num;
1: +  struct packet_rollover *rollover;
1: +  struct packet_mclist *mclist;
1: +  atomic_t mapped;
1: +  enum tpacket_versions tp_version;
1: +  unsigned int tp_hdrlen;
1: +  unsigned int tp_reserve;
1: +  unsigned int tp_tstamp;
1: +  struct completion skb_completion;
1: +  struct net_device *cached_dev;
1: +  int (*xmit)(struct sk_buff *);
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  struct packet_type prot_hook;
1: +  atomic_t tp_drops;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct packet_mreq_max {
1: -	int mr_ifindex;
1: -	short unsigned int mr_type;
1: -	short unsigned int mr_alen;
1: -	unsigned char mr_address[32];
1: +  int mr_ifindex;
1: +  short unsigned int mr_type;
1: +  short unsigned int mr_alen;
1: +  unsigned char mr_address[32];
1:  };
1:  
1:  union tpacket_uhdr {
1: -	struct tpacket_hdr *h1;
1: -	struct tpacket2_hdr *h2;
1: -	struct tpacket3_hdr *h3;
1: -	void *raw;
1: +  struct tpacket_hdr *h1;
1: +  struct tpacket2_hdr *h2;
1: +  struct tpacket3_hdr *h3;
1: +  void *raw;
1:  };
1:  
1:  struct packet_skb_cb {
1: -	union {
1: -		struct sockaddr_pkt pkt;
1: -		union {
1: -			unsigned int origlen;
1: -			struct sockaddr_ll ll;
1: -		};
1: -	} sa;
1: +  union {
1: +    struct sockaddr_pkt pkt;
1: +    union {
1: +      unsigned int origlen;
1: +      struct sockaddr_ll ll;
1: +    };
1: +  } sa;
1:  };
1:  
1:  struct switchdev_notifier_fdb_info {
1: -	struct switchdev_notifier_info info;
1: -	const unsigned char *addr;
1: -	u16 vid;
1: -	u8 added_by_user: 1;
1: -	u8 offloaded: 1;
1: +  struct switchdev_notifier_info info;
1: +  const unsigned char *addr;
1: +  u16 vid;
1: +  u8 added_by_user : 1;
1: +  u8 offloaded : 1;
1:  };
1:  
1:  enum br_boolopt_id {
1: -	BR_BOOLOPT_NO_LL_LEARN = 0,
1: -	BR_BOOLOPT_MAX = 1,
1: +  BR_BOOLOPT_NO_LL_LEARN = 0,
1: +  BR_BOOLOPT_MAX = 1,
1:  };
1:  
1:  struct br_boolopt_multi {
1: -	__u32 optval;
1: -	__u32 optmask;
1: +  __u32 optval;
1: +  __u32 optmask;
1:  };
1:  
1:  enum net_bridge_opts {
1: -	BROPT_VLAN_ENABLED = 0,
1: -	BROPT_VLAN_STATS_ENABLED = 1,
1: -	BROPT_NF_CALL_IPTABLES = 2,
1: -	BROPT_NF_CALL_IP6TABLES = 3,
1: -	BROPT_NF_CALL_ARPTABLES = 4,
1: -	BROPT_GROUP_ADDR_SET = 5,
1: -	BROPT_MULTICAST_ENABLED = 6,
1: -	BROPT_MULTICAST_QUERIER = 7,
1: -	BROPT_MULTICAST_QUERY_USE_IFADDR = 8,
1: -	BROPT_MULTICAST_STATS_ENABLED = 9,
1: -	BROPT_HAS_IPV6_ADDR = 10,
1: -	BROPT_NEIGH_SUPPRESS_ENABLED = 11,
1: -	BROPT_MTU_SET_BY_USER = 12,
1: -	BROPT_VLAN_STATS_PER_PORT = 13,
1: -	BROPT_NO_LL_LEARN = 14,
1: -	BROPT_VLAN_BRIDGE_BINDING = 15,
1: +  BROPT_VLAN_ENABLED = 0,
1: +  BROPT_VLAN_STATS_ENABLED = 1,
1: +  BROPT_NF_CALL_IPTABLES = 2,
1: +  BROPT_NF_CALL_IP6TABLES = 3,
1: +  BROPT_NF_CALL_ARPTABLES = 4,
1: +  BROPT_GROUP_ADDR_SET = 5,
1: +  BROPT_MULTICAST_ENABLED = 6,
1: +  BROPT_MULTICAST_QUERIER = 7,
1: +  BROPT_MULTICAST_QUERY_USE_IFADDR = 8,
1: +  BROPT_MULTICAST_STATS_ENABLED = 9,
1: +  BROPT_HAS_IPV6_ADDR = 10,
1: +  BROPT_NEIGH_SUPPRESS_ENABLED = 11,
1: +  BROPT_MTU_SET_BY_USER = 12,
1: +  BROPT_VLAN_STATS_PER_PORT = 13,
1: +  BROPT_NO_LL_LEARN = 14,
1: +  BROPT_VLAN_BRIDGE_BINDING = 15,
1:  };
1:  
1:  struct net_bridge_mcast_gc {
1: -	struct hlist_node gc_node;
1: -	void (*destroy)(struct net_bridge_mcast_gc *);
1: +  struct hlist_node gc_node;
1: +  void (*destroy)(struct net_bridge_mcast_gc *);
1:  };
1:  
1:  struct net_bridge_port_group_sg_key {
1: -	struct net_bridge_port *port;
1: -	struct br_ip addr;
1: +  struct net_bridge_port *port;
1: +  struct br_ip addr;
1:  };
1:  
1:  struct net_bridge_port_group {
1: -	struct net_bridge_port_group *next;
1: -	struct net_bridge_port_group_sg_key key;
1: -	unsigned char eth_addr[6];
1: -	unsigned char flags;
1: -	unsigned char filter_mode;
1: -	unsigned char grp_query_rexmit_cnt;
1: -	unsigned char rt_protocol;
1: -	struct hlist_head src_list;
1: -	unsigned int src_ents;
1: -	struct timer_list timer;
1: -	struct timer_list rexmit_timer;
1: -	struct hlist_node mglist;
1: -	struct rhash_head rhnode;
1: -	struct net_bridge_mcast_gc mcast_gc;
1: -	struct callback_head rcu;
1: +  struct net_bridge_port_group *next;
1: +  struct net_bridge_port_group_sg_key key;
1: +  unsigned char eth_addr[6];
1: +  unsigned char flags;
1: +  unsigned char filter_mode;
1: +  unsigned char grp_query_rexmit_cnt;
1: +  unsigned char rt_protocol;
1: +  struct hlist_head src_list;
1: +  unsigned int src_ents;
1: +  struct timer_list timer;
1: +  struct timer_list rexmit_timer;
1: +  struct hlist_node mglist;
1: +  struct rhash_head rhnode;
1: +  struct net_bridge_mcast_gc mcast_gc;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct net_bridge_mdb_entry {
1: -	struct rhash_head rhnode;
1: -	struct net_bridge *br;
1: -	struct net_bridge_port_group *ports;
1: -	struct br_ip addr;
1: -	bool host_joined;
1: -	struct timer_list timer;
1: -	struct hlist_node mdb_node;
1: -	struct net_bridge_mcast_gc mcast_gc;
1: -	struct callback_head rcu;
1: +  struct rhash_head rhnode;
1: +  struct net_bridge *br;
1: +  struct net_bridge_port_group *ports;
1: +  struct br_ip addr;
1: +  bool host_joined;
1: +  struct timer_list timer;
1: +  struct hlist_node mdb_node;
1: +  struct net_bridge_mcast_gc mcast_gc;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum br_pkt_type {
1: -	BR_PKT_UNICAST = 0,
1: -	BR_PKT_MULTICAST = 1,
1: -	BR_PKT_BROADCAST = 2,
1: +  BR_PKT_UNICAST = 0,
1: +  BR_PKT_MULTICAST = 1,
1: +  BR_PKT_BROADCAST = 2,
1:  };
1:  
1:  struct nf_br_ops {
1: -	int (*br_dev_xmit_hook)(struct sk_buff *);
1: +  int (*br_dev_xmit_hook)(struct sk_buff *);
1:  };
1:  
1:  enum {
1: -	FDB_NOTIFY_BIT = 1,
1: -	FDB_NOTIFY_INACTIVE_BIT = 2,
1: +  FDB_NOTIFY_BIT = 1,
1: +  FDB_NOTIFY_INACTIVE_BIT = 2,
1:  };
1:  
1:  enum {
1: -	NFEA_UNSPEC = 0,
1: -	NFEA_ACTIVITY_NOTIFY = 1,
1: -	NFEA_DONT_REFRESH = 2,
1: -	__NFEA_MAX = 3,
1: +  NFEA_UNSPEC = 0,
1: +  NFEA_ACTIVITY_NOTIFY = 1,
1: +  NFEA_DONT_REFRESH = 2,
1: +  __NFEA_MAX = 3,
1:  };
1:  
1:  struct __fdb_entry {
1: -	__u8 mac_addr[6];
1: -	__u8 port_no;
1: -	__u8 is_local;
1: -	__u32 ageing_timer_value;
1: -	__u8 port_hi;
1: -	__u8 pad0;
1: -	__u16 unused;
1: +  __u8 mac_addr[6];
1: +  __u8 port_no;
1: +  __u8 is_local;
1: +  __u32 ageing_timer_value;
1: +  __u8 port_hi;
1: +  __u8 pad0;
1: +  __u16 unused;
1:  };
1:  
1:  struct br_vlan_stats {
1: -	u64 rx_bytes;
1: -	u64 rx_packets;
1: -	u64 tx_bytes;
1: -	u64 tx_packets;
1: -	struct u64_stats_sync syncp;
1: +  u64 rx_bytes;
1: +  u64 rx_packets;
1: +  u64 tx_bytes;
1: +  u64 tx_packets;
1: +  struct u64_stats_sync syncp;
1:  };
1:  
1:  struct br_tunnel_info {
1: -	__be64 tunnel_id;
1: -	struct metadata_dst *tunnel_dst;
1: +  __be64 tunnel_id;
1: +  struct metadata_dst *tunnel_dst;
1:  };
1:  
1:  struct net_bridge_vlan {
1: -	struct rhash_head vnode;
1: -	struct rhash_head tnode;
1: -	u16 vid;
1: -	u16 flags;
1: -	u16 priv_flags;
1: -	u8 state;
1: -	struct br_vlan_stats *stats;
1: -	union {
1: -		struct net_bridge *br;
1: -		struct net_bridge_port *port;
1: -	};
1: -	union {
1: -		refcount_t refcnt;
1: -		struct net_bridge_vlan *brvlan;
1: -	};
1: -	struct br_tunnel_info tinfo;
1: -	struct list_head vlist;
1: -	struct callback_head rcu;
1: -};
1: -
1: -enum {
1: -	BR_FDB_LOCAL = 0,
1: -	BR_FDB_STATIC = 1,
1: -	BR_FDB_STICKY = 2,
1: -	BR_FDB_ADDED_BY_USER = 3,
1: -	BR_FDB_ADDED_BY_EXT_LEARN = 4,
1: -	BR_FDB_OFFLOADED = 5,
1: -	BR_FDB_NOTIFY = 6,
1: -	BR_FDB_NOTIFY_INACTIVE = 7,
1: +  struct rhash_head vnode;
1: +  struct rhash_head tnode;
1: +  u16 vid;
1: +  u16 flags;
1: +  u16 priv_flags;
1: +  u8 state;
1: +  struct br_vlan_stats *stats;
1: +  union {
1: +    struct net_bridge *br;
1: +    struct net_bridge_port *port;
1: +  };
1: +  union {
1: +    refcount_t refcnt;
1: +    struct net_bridge_vlan *brvlan;
1: +  };
1: +  struct br_tunnel_info tinfo;
1: +  struct list_head vlist;
1: +  struct callback_head rcu;
1: +};
1: +
1: +enum {
1: +  BR_FDB_LOCAL = 0,
1: +  BR_FDB_STATIC = 1,
1: +  BR_FDB_STICKY = 2,
1: +  BR_FDB_ADDED_BY_USER = 3,
1: +  BR_FDB_ADDED_BY_EXT_LEARN = 4,
1: +  BR_FDB_OFFLOADED = 5,
1: +  BR_FDB_NOTIFY = 6,
1: +  BR_FDB_NOTIFY_INACTIVE = 7,
1:  };
1:  
1:  struct br_frame_type {
1: -	__be16 type;
1: -	int (*frame_handler)(struct net_bridge_port *, struct sk_buff *);
1: -	struct hlist_node list;
1: +  __be16 type;
1: +  int (*frame_handler)(struct net_bridge_port *, struct sk_buff *);
1: +  struct hlist_node list;
1:  };
1:  
1:  struct __bridge_info {
1: -	__u64 designated_root;
1: -	__u64 bridge_id;
1: -	__u32 root_path_cost;
1: -	__u32 max_age;
1: -	__u32 hello_time;
1: -	__u32 forward_delay;
1: -	__u32 bridge_max_age;
1: -	__u32 bridge_hello_time;
1: -	__u32 bridge_forward_delay;
1: -	__u8 topology_change;
1: -	__u8 topology_change_detected;
1: -	__u8 root_port;
1: -	__u8 stp_enabled;
1: -	__u32 ageing_time;
1: -	__u32 gc_interval;
1: -	__u32 hello_timer_value;
1: -	__u32 tcn_timer_value;
1: -	__u32 topology_change_timer_value;
1: -	__u32 gc_timer_value;
1: +  __u64 designated_root;
1: +  __u64 bridge_id;
1: +  __u32 root_path_cost;
1: +  __u32 max_age;
1: +  __u32 hello_time;
1: +  __u32 forward_delay;
1: +  __u32 bridge_max_age;
1: +  __u32 bridge_hello_time;
1: +  __u32 bridge_forward_delay;
1: +  __u8 topology_change;
1: +  __u8 topology_change_detected;
1: +  __u8 root_port;
1: +  __u8 stp_enabled;
1: +  __u32 ageing_time;
1: +  __u32 gc_interval;
1: +  __u32 hello_timer_value;
1: +  __u32 tcn_timer_value;
1: +  __u32 topology_change_timer_value;
1: +  __u32 gc_timer_value;
1:  };
1:  
1:  struct __port_info {
1: -	__u64 designated_root;
1: -	__u64 designated_bridge;
1: -	__u16 port_id;
1: -	__u16 designated_port;
1: -	__u32 path_cost;
1: -	__u32 designated_cost;
1: -	__u8 state;
1: -	__u8 top_change_ack;
1: -	__u8 config_pending;
1: -	__u8 unused0;
1: -	__u32 message_age_timer_value;
1: -	__u32 forward_delay_timer_value;
1: -	__u32 hold_timer_value;
1: +  __u64 designated_root;
1: +  __u64 designated_bridge;
1: +  __u16 port_id;
1: +  __u16 designated_port;
1: +  __u32 path_cost;
1: +  __u32 designated_cost;
1: +  __u8 state;
1: +  __u8 top_change_ack;
1: +  __u8 config_pending;
1: +  __u8 unused0;
1: +  __u32 message_age_timer_value;
1: +  __u32 forward_delay_timer_value;
1: +  __u32 hold_timer_value;
1:  };
1:  
1:  enum switchdev_attr_id {
1: -	SWITCHDEV_ATTR_ID_UNDEFINED = 0,
1: -	SWITCHDEV_ATTR_ID_PORT_STP_STATE = 1,
1: -	SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS = 2,
1: -	SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS = 3,
1: -	SWITCHDEV_ATTR_ID_PORT_MROUTER = 4,
1: -	SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME = 5,
1: -	SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING = 6,
1: -	SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED = 7,
1: -	SWITCHDEV_ATTR_ID_BRIDGE_MROUTER = 8,
1: +  SWITCHDEV_ATTR_ID_UNDEFINED = 0,
1: +  SWITCHDEV_ATTR_ID_PORT_STP_STATE = 1,
1: +  SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS = 2,
1: +  SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS = 3,
1: +  SWITCHDEV_ATTR_ID_PORT_MROUTER = 4,
1: +  SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME = 5,
1: +  SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING = 6,
1: +  SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED = 7,
1: +  SWITCHDEV_ATTR_ID_BRIDGE_MROUTER = 8,
1:  };
1:  
1:  struct switchdev_attr {
1: -	struct net_device *orig_dev;
1: -	enum switchdev_attr_id id;
1: -	u32 flags;
1: -	void *complete_priv;
1: -	void (*complete)(struct net_device *, int, void *);
1: -	union {
1: -		u8 stp_state;
1: -		long unsigned int brport_flags;
1: -		bool mrouter;
1: -		clock_t ageing_time;
1: -		bool vlan_filtering;
1: -		bool mc_disabled;
1: -	} u;
1: +  struct net_device *orig_dev;
1: +  enum switchdev_attr_id id;
1: +  u32 flags;
1: +  void *complete_priv;
1: +  void (*complete)(struct net_device *, int, void *);
1: +  union {
1: +    u8 stp_state;
1: +    long unsigned int brport_flags;
1: +    bool mrouter;
1: +    clock_t ageing_time;
1: +    bool vlan_filtering;
1: +    bool mc_disabled;
1: +  } u;
1:  };
1:  
1:  struct br_config_bpdu {
1: -	unsigned int topology_change: 1;
1: -	unsigned int topology_change_ack: 1;
1: -	bridge_id root;
1: -	int root_path_cost;
1: -	bridge_id bridge_id;
1: -	port_id port_id;
1: -	int message_age;
1: -	int max_age;
1: -	int hello_time;
1: -	int forward_delay;
1: -};
1: -
1: -enum {
1: -	IFLA_BR_UNSPEC = 0,
1: -	IFLA_BR_FORWARD_DELAY = 1,
1: -	IFLA_BR_HELLO_TIME = 2,
1: -	IFLA_BR_MAX_AGE = 3,
1: -	IFLA_BR_AGEING_TIME = 4,
1: -	IFLA_BR_STP_STATE = 5,
1: -	IFLA_BR_PRIORITY = 6,
1: -	IFLA_BR_VLAN_FILTERING = 7,
1: -	IFLA_BR_VLAN_PROTOCOL = 8,
1: -	IFLA_BR_GROUP_FWD_MASK = 9,
1: -	IFLA_BR_ROOT_ID = 10,
1: -	IFLA_BR_BRIDGE_ID = 11,
1: -	IFLA_BR_ROOT_PORT = 12,
1: -	IFLA_BR_ROOT_PATH_COST = 13,
1: -	IFLA_BR_TOPOLOGY_CHANGE = 14,
1: -	IFLA_BR_TOPOLOGY_CHANGE_DETECTED = 15,
1: -	IFLA_BR_HELLO_TIMER = 16,
1: -	IFLA_BR_TCN_TIMER = 17,
1: -	IFLA_BR_TOPOLOGY_CHANGE_TIMER = 18,
1: -	IFLA_BR_GC_TIMER = 19,
1: -	IFLA_BR_GROUP_ADDR = 20,
1: -	IFLA_BR_FDB_FLUSH = 21,
1: -	IFLA_BR_MCAST_ROUTER = 22,
1: -	IFLA_BR_MCAST_SNOOPING = 23,
1: -	IFLA_BR_MCAST_QUERY_USE_IFADDR = 24,
1: -	IFLA_BR_MCAST_QUERIER = 25,
1: -	IFLA_BR_MCAST_HASH_ELASTICITY = 26,
1: -	IFLA_BR_MCAST_HASH_MAX = 27,
1: -	IFLA_BR_MCAST_LAST_MEMBER_CNT = 28,
1: -	IFLA_BR_MCAST_STARTUP_QUERY_CNT = 29,
1: -	IFLA_BR_MCAST_LAST_MEMBER_INTVL = 30,
1: -	IFLA_BR_MCAST_MEMBERSHIP_INTVL = 31,
1: -	IFLA_BR_MCAST_QUERIER_INTVL = 32,
1: -	IFLA_BR_MCAST_QUERY_INTVL = 33,
1: -	IFLA_BR_MCAST_QUERY_RESPONSE_INTVL = 34,
1: -	IFLA_BR_MCAST_STARTUP_QUERY_INTVL = 35,
1: -	IFLA_BR_NF_CALL_IPTABLES = 36,
1: -	IFLA_BR_NF_CALL_IP6TABLES = 37,
1: -	IFLA_BR_NF_CALL_ARPTABLES = 38,
1: -	IFLA_BR_VLAN_DEFAULT_PVID = 39,
1: -	IFLA_BR_PAD = 40,
1: -	IFLA_BR_VLAN_STATS_ENABLED = 41,
1: -	IFLA_BR_MCAST_STATS_ENABLED = 42,
1: -	IFLA_BR_MCAST_IGMP_VERSION = 43,
1: -	IFLA_BR_MCAST_MLD_VERSION = 44,
1: -	IFLA_BR_VLAN_STATS_PER_PORT = 45,
1: -	IFLA_BR_MULTI_BOOLOPT = 46,
1: -	__IFLA_BR_MAX = 47,
1: -};
1: -
1: -enum {
1: -	LINK_XSTATS_TYPE_UNSPEC = 0,
1: -	LINK_XSTATS_TYPE_BRIDGE = 1,
1: -	LINK_XSTATS_TYPE_BOND = 2,
1: -	__LINK_XSTATS_TYPE_MAX = 3,
1: +  unsigned int topology_change : 1;
1: +  unsigned int topology_change_ack : 1;
1: +  bridge_id root;
1: +  int root_path_cost;
1: +  bridge_id bridge_id;
1: +  port_id port_id;
1: +  int message_age;
1: +  int max_age;
1: +  int hello_time;
1: +  int forward_delay;
1: +};
1: +
1: +enum {
1: +  IFLA_BR_UNSPEC = 0,
1: +  IFLA_BR_FORWARD_DELAY = 1,
1: +  IFLA_BR_HELLO_TIME = 2,
1: +  IFLA_BR_MAX_AGE = 3,
1: +  IFLA_BR_AGEING_TIME = 4,
1: +  IFLA_BR_STP_STATE = 5,
1: +  IFLA_BR_PRIORITY = 6,
1: +  IFLA_BR_VLAN_FILTERING = 7,
1: +  IFLA_BR_VLAN_PROTOCOL = 8,
1: +  IFLA_BR_GROUP_FWD_MASK = 9,
1: +  IFLA_BR_ROOT_ID = 10,
1: +  IFLA_BR_BRIDGE_ID = 11,
1: +  IFLA_BR_ROOT_PORT = 12,
1: +  IFLA_BR_ROOT_PATH_COST = 13,
1: +  IFLA_BR_TOPOLOGY_CHANGE = 14,
1: +  IFLA_BR_TOPOLOGY_CHANGE_DETECTED = 15,
1: +  IFLA_BR_HELLO_TIMER = 16,
1: +  IFLA_BR_TCN_TIMER = 17,
1: +  IFLA_BR_TOPOLOGY_CHANGE_TIMER = 18,
1: +  IFLA_BR_GC_TIMER = 19,
1: +  IFLA_BR_GROUP_ADDR = 20,
1: +  IFLA_BR_FDB_FLUSH = 21,
1: +  IFLA_BR_MCAST_ROUTER = 22,
1: +  IFLA_BR_MCAST_SNOOPING = 23,
1: +  IFLA_BR_MCAST_QUERY_USE_IFADDR = 24,
1: +  IFLA_BR_MCAST_QUERIER = 25,
1: +  IFLA_BR_MCAST_HASH_ELASTICITY = 26,
1: +  IFLA_BR_MCAST_HASH_MAX = 27,
1: +  IFLA_BR_MCAST_LAST_MEMBER_CNT = 28,
1: +  IFLA_BR_MCAST_STARTUP_QUERY_CNT = 29,
1: +  IFLA_BR_MCAST_LAST_MEMBER_INTVL = 30,
1: +  IFLA_BR_MCAST_MEMBERSHIP_INTVL = 31,
1: +  IFLA_BR_MCAST_QUERIER_INTVL = 32,
1: +  IFLA_BR_MCAST_QUERY_INTVL = 33,
1: +  IFLA_BR_MCAST_QUERY_RESPONSE_INTVL = 34,
1: +  IFLA_BR_MCAST_STARTUP_QUERY_INTVL = 35,
1: +  IFLA_BR_NF_CALL_IPTABLES = 36,
1: +  IFLA_BR_NF_CALL_IP6TABLES = 37,
1: +  IFLA_BR_NF_CALL_ARPTABLES = 38,
1: +  IFLA_BR_VLAN_DEFAULT_PVID = 39,
1: +  IFLA_BR_PAD = 40,
1: +  IFLA_BR_VLAN_STATS_ENABLED = 41,
1: +  IFLA_BR_MCAST_STATS_ENABLED = 42,
1: +  IFLA_BR_MCAST_IGMP_VERSION = 43,
1: +  IFLA_BR_MCAST_MLD_VERSION = 44,
1: +  IFLA_BR_VLAN_STATS_PER_PORT = 45,
1: +  IFLA_BR_MULTI_BOOLOPT = 46,
1: +  __IFLA_BR_MAX = 47,
1: +};
1: +
1: +enum {
1: +  LINK_XSTATS_TYPE_UNSPEC = 0,
1: +  LINK_XSTATS_TYPE_BRIDGE = 1,
1: +  LINK_XSTATS_TYPE_BOND = 2,
1: +  __LINK_XSTATS_TYPE_MAX = 3,
1:  };
1:  
1:  struct bridge_vlan_info {
1: -	__u16 flags;
1: -	__u16 vid;
1: +  __u16 flags;
1: +  __u16 vid;
1:  };
1:  
1:  struct bridge_vlan_xstats {
1: -	__u64 rx_bytes;
1: -	__u64 rx_packets;
1: -	__u64 tx_bytes;
1: -	__u64 tx_packets;
1: -	__u16 vid;
1: -	__u16 flags;
1: -	__u32 pad2;
1: +  __u64 rx_bytes;
1: +  __u64 rx_packets;
1: +  __u64 tx_bytes;
1: +  __u64 tx_packets;
1: +  __u16 vid;
1: +  __u16 flags;
1: +  __u32 pad2;
1:  };
1:  
1:  enum {
1: -	BRIDGE_XSTATS_UNSPEC = 0,
1: -	BRIDGE_XSTATS_VLAN = 1,
1: -	BRIDGE_XSTATS_MCAST = 2,
1: -	BRIDGE_XSTATS_PAD = 3,
1: -	BRIDGE_XSTATS_STP = 4,
1: -	__BRIDGE_XSTATS_MAX = 5,
1: +  BRIDGE_XSTATS_UNSPEC = 0,
1: +  BRIDGE_XSTATS_VLAN = 1,
1: +  BRIDGE_XSTATS_MCAST = 2,
1: +  BRIDGE_XSTATS_PAD = 3,
1: +  BRIDGE_XSTATS_STP = 4,
1: +  __BRIDGE_XSTATS_MAX = 5,
1:  };
1:  
1:  enum {
1: -	BR_GROUPFWD_STP = 1,
1: -	BR_GROUPFWD_MACPAUSE = 2,
1: -	BR_GROUPFWD_LACP = 4,
1: +  BR_GROUPFWD_STP = 1,
1: +  BR_GROUPFWD_MACPAUSE = 2,
1: +  BR_GROUPFWD_LACP = 4,
1:  };
1:  
1:  struct vtunnel_info {
1: -	u32 tunid;
1: -	u16 vid;
1: -	u16 flags;
1: +  u32 tunid;
1: +  u16 vid;
1: +  u16 flags;
1:  };
1:  
1:  enum {
1: -	IFLA_BRIDGE_VLAN_TUNNEL_UNSPEC = 0,
1: -	IFLA_BRIDGE_VLAN_TUNNEL_ID = 1,
1: -	IFLA_BRIDGE_VLAN_TUNNEL_VID = 2,
1: -	IFLA_BRIDGE_VLAN_TUNNEL_FLAGS = 3,
1: -	__IFLA_BRIDGE_VLAN_TUNNEL_MAX = 4,
1: +  IFLA_BRIDGE_VLAN_TUNNEL_UNSPEC = 0,
1: +  IFLA_BRIDGE_VLAN_TUNNEL_ID = 1,
1: +  IFLA_BRIDGE_VLAN_TUNNEL_VID = 2,
1: +  IFLA_BRIDGE_VLAN_TUNNEL_FLAGS = 3,
1: +  __IFLA_BRIDGE_VLAN_TUNNEL_MAX = 4,
1:  };
1:  
1:  struct brport_attribute {
1: -	struct attribute attr;
1: -	ssize_t (*show)(struct net_bridge_port *, char *);
1: -	int (*store)(struct net_bridge_port *, long unsigned int);
1: -	int (*store_raw)(struct net_bridge_port *, char *);
1: +  struct attribute attr;
1: +  ssize_t (*show)(struct net_bridge_port *, char *);
1: +  int (*store)(struct net_bridge_port *, long unsigned int);
1: +  int (*store_raw)(struct net_bridge_port *, char *);
1:  };
1:  
1:  struct pimhdr {
1: -	__u8 type;
1: -	__u8 reserved;
1: -	__be16 csum;
1: +  __u8 type;
1: +  __u8 reserved;
1: +  __be16 csum;
1:  };
1:  
1:  enum {
1: -	MDB_RTR_TYPE_DISABLED = 0,
1: -	MDB_RTR_TYPE_TEMP_QUERY = 1,
1: -	MDB_RTR_TYPE_PERM = 2,
1: -	MDB_RTR_TYPE_TEMP = 3,
1: +  MDB_RTR_TYPE_DISABLED = 0,
1: +  MDB_RTR_TYPE_TEMP_QUERY = 1,
1: +  MDB_RTR_TYPE_PERM = 2,
1: +  MDB_RTR_TYPE_TEMP = 3,
1:  };
1:  
1:  struct br_ip_list {
1: -	struct list_head list;
1: -	struct br_ip addr;
1: +  struct list_head list;
1: +  struct br_ip addr;
1:  };
1:  
1:  struct net_bridge_group_src {
1: -	struct hlist_node node;
1: -	struct br_ip addr;
1: -	struct net_bridge_port_group *pg;
1: -	u8 flags;
1: -	u8 src_query_rexmit_cnt;
1: -	struct timer_list timer;
1: -	struct net_bridge *br;
1: -	struct net_bridge_mcast_gc mcast_gc;
1: -	struct callback_head rcu;
1: +  struct hlist_node node;
1: +  struct br_ip addr;
1: +  struct net_bridge_port_group *pg;
1: +  u8 flags;
1: +  u8 src_query_rexmit_cnt;
1: +  struct timer_list timer;
1: +  struct net_bridge *br;
1: +  struct net_bridge_mcast_gc mcast_gc;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum switchdev_obj_id {
1: -	SWITCHDEV_OBJ_ID_UNDEFINED = 0,
1: -	SWITCHDEV_OBJ_ID_PORT_VLAN = 1,
1: -	SWITCHDEV_OBJ_ID_PORT_MDB = 2,
1: -	SWITCHDEV_OBJ_ID_HOST_MDB = 3,
1: +  SWITCHDEV_OBJ_ID_UNDEFINED = 0,
1: +  SWITCHDEV_OBJ_ID_PORT_VLAN = 1,
1: +  SWITCHDEV_OBJ_ID_PORT_MDB = 2,
1: +  SWITCHDEV_OBJ_ID_HOST_MDB = 3,
1:  };
1:  
1:  struct switchdev_obj {
1: -	struct net_device *orig_dev;
1: -	enum switchdev_obj_id id;
1: -	u32 flags;
1: -	void *complete_priv;
1: -	void (*complete)(struct net_device *, int, void *);
1: +  struct net_device *orig_dev;
1: +  enum switchdev_obj_id id;
1: +  u32 flags;
1: +  void *complete_priv;
1: +  void (*complete)(struct net_device *, int, void *);
1:  };
1:  
1:  struct switchdev_obj_port_mdb {
1: -	struct switchdev_obj obj;
1: -	unsigned char addr[6];
1: -	u16 vid;
1: +  struct switchdev_obj obj;
1: +  unsigned char addr[6];
1: +  u16 vid;
1:  };
1:  
1:  enum {
1: -	MDBA_UNSPEC = 0,
1: -	MDBA_MDB = 1,
1: -	MDBA_ROUTER = 2,
1: -	__MDBA_MAX = 3,
1: +  MDBA_UNSPEC = 0,
1: +  MDBA_MDB = 1,
1: +  MDBA_ROUTER = 2,
1: +  __MDBA_MAX = 3,
1:  };
1:  
1:  enum {
1: -	MDBA_MDB_UNSPEC = 0,
1: -	MDBA_MDB_ENTRY = 1,
1: -	__MDBA_MDB_MAX = 2,
1: +  MDBA_MDB_UNSPEC = 0,
1: +  MDBA_MDB_ENTRY = 1,
1: +  __MDBA_MDB_MAX = 2,
1:  };
1:  
1:  enum {
1: -	MDBA_MDB_ENTRY_UNSPEC = 0,
1: -	MDBA_MDB_ENTRY_INFO = 1,
1: -	__MDBA_MDB_ENTRY_MAX = 2,
1: +  MDBA_MDB_ENTRY_UNSPEC = 0,
1: +  MDBA_MDB_ENTRY_INFO = 1,
1: +  __MDBA_MDB_ENTRY_MAX = 2,
1:  };
1:  
1:  enum {
1: -	MDBA_MDB_EATTR_UNSPEC = 0,
1: -	MDBA_MDB_EATTR_TIMER = 1,
1: -	MDBA_MDB_EATTR_SRC_LIST = 2,
1: -	MDBA_MDB_EATTR_GROUP_MODE = 3,
1: -	MDBA_MDB_EATTR_SOURCE = 4,
1: -	MDBA_MDB_EATTR_RTPROT = 5,
1: -	__MDBA_MDB_EATTR_MAX = 6,
1: +  MDBA_MDB_EATTR_UNSPEC = 0,
1: +  MDBA_MDB_EATTR_TIMER = 1,
1: +  MDBA_MDB_EATTR_SRC_LIST = 2,
1: +  MDBA_MDB_EATTR_GROUP_MODE = 3,
1: +  MDBA_MDB_EATTR_SOURCE = 4,
1: +  MDBA_MDB_EATTR_RTPROT = 5,
1: +  __MDBA_MDB_EATTR_MAX = 6,
1:  };
1:  
1:  enum {
1: -	MDBA_MDB_SRCLIST_UNSPEC = 0,
1: -	MDBA_MDB_SRCLIST_ENTRY = 1,
1: -	__MDBA_MDB_SRCLIST_MAX = 2,
1: +  MDBA_MDB_SRCLIST_UNSPEC = 0,
1: +  MDBA_MDB_SRCLIST_ENTRY = 1,
1: +  __MDBA_MDB_SRCLIST_MAX = 2,
1:  };
1:  
1:  enum {
1: -	MDBA_MDB_SRCATTR_UNSPEC = 0,
1: -	MDBA_MDB_SRCATTR_ADDRESS = 1,
1: -	MDBA_MDB_SRCATTR_TIMER = 2,
1: -	__MDBA_MDB_SRCATTR_MAX = 3,
1: +  MDBA_MDB_SRCATTR_UNSPEC = 0,
1: +  MDBA_MDB_SRCATTR_ADDRESS = 1,
1: +  MDBA_MDB_SRCATTR_TIMER = 2,
1: +  __MDBA_MDB_SRCATTR_MAX = 3,
1:  };
1:  
1:  enum {
1: -	MDBA_ROUTER_UNSPEC = 0,
1: -	MDBA_ROUTER_PORT = 1,
1: -	__MDBA_ROUTER_MAX = 2,
1: +  MDBA_ROUTER_UNSPEC = 0,
1: +  MDBA_ROUTER_PORT = 1,
1: +  __MDBA_ROUTER_MAX = 2,
1:  };
1:  
1:  enum {
1: -	MDBA_ROUTER_PATTR_UNSPEC = 0,
1: -	MDBA_ROUTER_PATTR_TIMER = 1,
1: -	MDBA_ROUTER_PATTR_TYPE = 2,
1: -	__MDBA_ROUTER_PATTR_MAX = 3,
1: +  MDBA_ROUTER_PATTR_UNSPEC = 0,
1: +  MDBA_ROUTER_PATTR_TIMER = 1,
1: +  MDBA_ROUTER_PATTR_TYPE = 2,
1: +  __MDBA_ROUTER_PATTR_MAX = 3,
1:  };
1:  
1:  struct br_port_msg {
1: -	__u8 family;
1: -	__u32 ifindex;
1: +  __u8 family;
1: +  __u32 ifindex;
1:  };
1:  
1:  struct br_mdb_entry {
1: -	__u32 ifindex;
1: -	__u8 state;
1: -	__u8 flags;
1: -	__u16 vid;
1: -	struct {
1: -		union {
1: -			__be32 ip4;
1: -			struct in6_addr ip6;
1: -			unsigned char mac_addr[6];
1: -		} u;
1: -		__be16 proto;
1: -	} addr;
1: +  __u32 ifindex;
1: +  __u8 state;
1: +  __u8 flags;
1: +  __u16 vid;
1: +  struct {
1: +    union {
1: +      __be32 ip4;
1: +      struct in6_addr ip6;
1: +      unsigned char mac_addr[6];
1: +    } u;
1: +    __be16 proto;
1: +  } addr;
1:  };
1:  
1:  enum {
1: -	MDBA_SET_ENTRY_UNSPEC = 0,
1: -	MDBA_SET_ENTRY = 1,
1: -	MDBA_SET_ENTRY_ATTRS = 2,
1: -	__MDBA_SET_ENTRY_MAX = 3,
1: +  MDBA_SET_ENTRY_UNSPEC = 0,
1: +  MDBA_SET_ENTRY = 1,
1: +  MDBA_SET_ENTRY_ATTRS = 2,
1: +  __MDBA_SET_ENTRY_MAX = 3,
1:  };
1:  
1:  enum {
1: -	MDBE_ATTR_UNSPEC = 0,
1: -	MDBE_ATTR_SOURCE = 1,
1: -	__MDBE_ATTR_MAX = 2,
1: +  MDBE_ATTR_UNSPEC = 0,
1: +  MDBE_ATTR_SOURCE = 1,
1: +  __MDBE_ATTR_MAX = 2,
1:  };
1:  
1:  struct br_mdb_complete_info {
1: -	struct net_bridge_port *port;
1: -	struct br_ip ip;
1: +  struct net_bridge_port *port;
1: +  struct br_ip ip;
1:  };
1:  
1:  enum vlan_flags {
1: -	VLAN_FLAG_REORDER_HDR = 1,
1: -	VLAN_FLAG_GVRP = 2,
1: -	VLAN_FLAG_LOOSE_BINDING = 4,
1: -	VLAN_FLAG_MVRP = 8,
1: -	VLAN_FLAG_BRIDGE_BINDING = 16,
1: +  VLAN_FLAG_REORDER_HDR = 1,
1: +  VLAN_FLAG_GVRP = 2,
1: +  VLAN_FLAG_LOOSE_BINDING = 4,
1: +  VLAN_FLAG_MVRP = 8,
1: +  VLAN_FLAG_BRIDGE_BINDING = 16,
1:  };
1:  
1:  struct vlan_priority_tci_mapping {
1: -	u32 priority;
1: -	u16 vlan_qos;
1: -	struct vlan_priority_tci_mapping *next;
1: +  u32 priority;
1: +  u16 vlan_qos;
1: +  struct vlan_priority_tci_mapping *next;
1:  };
1:  
1:  struct vlan_dev_priv {
1: -	unsigned int nr_ingress_mappings;
1: -	u32 ingress_priority_map[8];
1: -	unsigned int nr_egress_mappings;
1: -	struct vlan_priority_tci_mapping *egress_priority_map[16];
1: -	__be16 vlan_proto;
1: -	u16 vlan_id;
1: -	u16 flags;
1: -	struct net_device *real_dev;
1: -	unsigned char real_dev_addr[6];
1: -	struct proc_dir_entry *dent;
1: -	struct vlan_pcpu_stats *vlan_pcpu_stats;
1: -	struct netpoll *netpoll;
1: +  unsigned int nr_ingress_mappings;
1: +  u32 ingress_priority_map[8];
1: +  unsigned int nr_egress_mappings;
1: +  struct vlan_priority_tci_mapping *egress_priority_map[16];
1: +  __be16 vlan_proto;
1: +  u16 vlan_id;
1: +  u16 flags;
1: +  struct net_device *real_dev;
1: +  unsigned char real_dev_addr[6];
1: +  struct proc_dir_entry *dent;
1: +  struct vlan_pcpu_stats *vlan_pcpu_stats;
1: +  struct netpoll *netpoll;
1:  };
1:  
1:  struct br_vlan_msg {
1: -	__u8 family;
1: -	__u8 reserved1;
1: -	__u16 reserved2;
1: -	__u32 ifindex;
1: +  __u8 family;
1: +  __u8 reserved1;
1: +  __u16 reserved2;
1: +  __u32 ifindex;
1:  };
1:  
1:  enum {
1: -	BRIDGE_VLANDB_DUMP_UNSPEC = 0,
1: -	BRIDGE_VLANDB_DUMP_FLAGS = 1,
1: -	__BRIDGE_VLANDB_DUMP_MAX = 2,
1: +  BRIDGE_VLANDB_DUMP_UNSPEC = 0,
1: +  BRIDGE_VLANDB_DUMP_FLAGS = 1,
1: +  __BRIDGE_VLANDB_DUMP_MAX = 2,
1:  };
1:  
1:  enum {
1: -	BRIDGE_VLANDB_UNSPEC = 0,
1: -	BRIDGE_VLANDB_ENTRY = 1,
1: -	__BRIDGE_VLANDB_MAX = 2,
1: +  BRIDGE_VLANDB_UNSPEC = 0,
1: +  BRIDGE_VLANDB_ENTRY = 1,
1: +  __BRIDGE_VLANDB_MAX = 2,
1:  };
1:  
1:  enum {
1: -	BRIDGE_VLANDB_ENTRY_UNSPEC = 0,
1: -	BRIDGE_VLANDB_ENTRY_INFO = 1,
1: -	BRIDGE_VLANDB_ENTRY_RANGE = 2,
1: -	BRIDGE_VLANDB_ENTRY_STATE = 3,
1: -	BRIDGE_VLANDB_ENTRY_TUNNEL_INFO = 4,
1: -	BRIDGE_VLANDB_ENTRY_STATS = 5,
1: -	__BRIDGE_VLANDB_ENTRY_MAX = 6,
1: +  BRIDGE_VLANDB_ENTRY_UNSPEC = 0,
1: +  BRIDGE_VLANDB_ENTRY_INFO = 1,
1: +  BRIDGE_VLANDB_ENTRY_RANGE = 2,
1: +  BRIDGE_VLANDB_ENTRY_STATE = 3,
1: +  BRIDGE_VLANDB_ENTRY_TUNNEL_INFO = 4,
1: +  BRIDGE_VLANDB_ENTRY_STATS = 5,
1: +  __BRIDGE_VLANDB_ENTRY_MAX = 6,
1:  };
1:  
1:  enum {
1: -	BRIDGE_VLANDB_STATS_UNSPEC = 0,
1: -	BRIDGE_VLANDB_STATS_RX_BYTES = 1,
1: -	BRIDGE_VLANDB_STATS_RX_PACKETS = 2,
1: -	BRIDGE_VLANDB_STATS_TX_BYTES = 3,
1: -	BRIDGE_VLANDB_STATS_TX_PACKETS = 4,
1: -	BRIDGE_VLANDB_STATS_PAD = 5,
1: -	__BRIDGE_VLANDB_STATS_MAX = 6,
1: +  BRIDGE_VLANDB_STATS_UNSPEC = 0,
1: +  BRIDGE_VLANDB_STATS_RX_BYTES = 1,
1: +  BRIDGE_VLANDB_STATS_RX_PACKETS = 2,
1: +  BRIDGE_VLANDB_STATS_TX_BYTES = 3,
1: +  BRIDGE_VLANDB_STATS_TX_PACKETS = 4,
1: +  BRIDGE_VLANDB_STATS_PAD = 5,
1: +  __BRIDGE_VLANDB_STATS_MAX = 6,
1:  };
1:  
1:  enum {
1: -	BR_VLFLAG_PER_PORT_STATS = 1,
1: -	BR_VLFLAG_ADDED_BY_SWITCHDEV = 2,
1: +  BR_VLFLAG_PER_PORT_STATS = 1,
1: +  BR_VLFLAG_ADDED_BY_SWITCHDEV = 2,
1:  };
1:  
1:  struct br_vlan_bind_walk_data {
1: -	u16 vid;
1: -	struct net_device *result;
1: +  u16 vid;
1: +  struct net_device *result;
1:  };
1:  
1:  struct br_vlan_link_state_walk_data {
1: -	struct net_bridge *br;
1: +  struct net_bridge *br;
1:  };
1:  
1:  enum {
1: -	BRIDGE_VLANDB_TINFO_UNSPEC = 0,
1: -	BRIDGE_VLANDB_TINFO_ID = 1,
1: -	BRIDGE_VLANDB_TINFO_CMD = 2,
1: -	__BRIDGE_VLANDB_TINFO_MAX = 3,
1: +  BRIDGE_VLANDB_TINFO_UNSPEC = 0,
1: +  BRIDGE_VLANDB_TINFO_ID = 1,
1: +  BRIDGE_VLANDB_TINFO_CMD = 2,
1: +  __BRIDGE_VLANDB_TINFO_MAX = 3,
1:  };
1:  
1:  enum rpc_msg_type {
1: -	RPC_CALL = 0,
1: -	RPC_REPLY = 1,
1: +  RPC_CALL = 0,
1: +  RPC_REPLY = 1,
1:  };
1:  
1:  enum rpc_reply_stat {
1: -	RPC_MSG_ACCEPTED = 0,
1: -	RPC_MSG_DENIED = 1,
1: +  RPC_MSG_ACCEPTED = 0,
1: +  RPC_MSG_DENIED = 1,
1:  };
1:  
1:  enum rpc_reject_stat {
1: -	RPC_MISMATCH = 0,
1: -	RPC_AUTH_ERROR = 1,
1: +  RPC_MISMATCH = 0,
1: +  RPC_AUTH_ERROR = 1,
1:  };
1:  
1:  enum rpc_auth_stat {
1: -	RPC_AUTH_OK = 0,
1: -	RPC_AUTH_BADCRED = 1,
1: -	RPC_AUTH_REJECTEDCRED = 2,
1: -	RPC_AUTH_BADVERF = 3,
1: -	RPC_AUTH_REJECTEDVERF = 4,
1: -	RPC_AUTH_TOOWEAK = 5,
1: -	RPCSEC_GSS_CREDPROBLEM = 13,
1: -	RPCSEC_GSS_CTXPROBLEM = 14,
1: +  RPC_AUTH_OK = 0,
1: +  RPC_AUTH_BADCRED = 1,
1: +  RPC_AUTH_REJECTEDCRED = 2,
1: +  RPC_AUTH_BADVERF = 3,
1: +  RPC_AUTH_REJECTEDVERF = 4,
1: +  RPC_AUTH_TOOWEAK = 5,
1: +  RPCSEC_GSS_CREDPROBLEM = 13,
1: +  RPCSEC_GSS_CTXPROBLEM = 14,
1:  };
1:  
1:  struct xprt_create {
1: -	int ident;
1: -	struct net *net;
1: -	struct sockaddr *srcaddr;
1: -	struct sockaddr *dstaddr;
1: -	size_t addrlen;
1: -	const char *servername;
1: -	struct svc_xprt *bc_xprt;
1: -	struct rpc_xprt_switch *bc_xps;
1: -	unsigned int flags;
1: +  int ident;
1: +  struct net *net;
1: +  struct sockaddr *srcaddr;
1: +  struct sockaddr *dstaddr;
1: +  size_t addrlen;
1: +  const char *servername;
1: +  struct svc_xprt *bc_xprt;
1: +  struct rpc_xprt_switch *bc_xps;
1: +  unsigned int flags;
1:  };
1:  
1:  enum {
1: -	SUNRPC_PIPEFS_NFS_PRIO = 0,
1: -	SUNRPC_PIPEFS_RPC_PRIO = 1,
1: +  SUNRPC_PIPEFS_NFS_PRIO = 0,
1: +  SUNRPC_PIPEFS_RPC_PRIO = 1,
1:  };
1:  
1:  enum {
1: -	RPC_PIPEFS_MOUNT = 0,
1: -	RPC_PIPEFS_UMOUNT = 1,
1: +  RPC_PIPEFS_MOUNT = 0,
1: +  RPC_PIPEFS_UMOUNT = 1,
1:  };
1:  
1:  struct rpc_add_xprt_test {
1: -	void (*add_xprt_test)(struct rpc_clnt *, struct rpc_xprt *, void *);
1: -	void *data;
1: +  void (*add_xprt_test)(struct rpc_clnt *, struct rpc_xprt *, void *);
1: +  void *data;
1:  };
1:  
1:  struct sunrpc_net {
1: -	struct proc_dir_entry *proc_net_rpc;
1: -	struct cache_detail *ip_map_cache;
1: -	struct cache_detail *unix_gid_cache;
1: -	struct cache_detail *rsc_cache;
1: -	struct cache_detail *rsi_cache;
1: -	struct super_block *pipefs_sb;
1: -	struct rpc_pipe *gssd_dummy;
1: -	struct mutex pipefs_sb_lock;
1: -	struct list_head all_clients;
1: -	spinlock_t rpc_client_lock;
1: -	struct rpc_clnt *rpcb_local_clnt;
1: -	struct rpc_clnt *rpcb_local_clnt4;
1: -	spinlock_t rpcb_clnt_lock;
1: -	unsigned int rpcb_users;
1: -	unsigned int rpcb_is_af_local: 1;
1: -	struct mutex gssp_lock;
1: -	struct rpc_clnt *gssp_clnt;
1: -	int use_gss_proxy;
1: -	int pipe_version;
1: -	atomic_t pipe_users;
1: -	struct proc_dir_entry *use_gssp_proc;
1: +  struct proc_dir_entry *proc_net_rpc;
1: +  struct cache_detail *ip_map_cache;
1: +  struct cache_detail *unix_gid_cache;
1: +  struct cache_detail *rsc_cache;
1: +  struct cache_detail *rsi_cache;
1: +  struct super_block *pipefs_sb;
1: +  struct rpc_pipe *gssd_dummy;
1: +  struct mutex pipefs_sb_lock;
1: +  struct list_head all_clients;
1: +  spinlock_t rpc_client_lock;
1: +  struct rpc_clnt *rpcb_local_clnt;
1: +  struct rpc_clnt *rpcb_local_clnt4;
1: +  spinlock_t rpcb_clnt_lock;
1: +  unsigned int rpcb_users;
1: +  unsigned int rpcb_is_af_local : 1;
1: +  struct mutex gssp_lock;
1: +  struct rpc_clnt *gssp_clnt;
1: +  int use_gss_proxy;
1: +  int pipe_version;
1: +  atomic_t pipe_users;
1: +  struct proc_dir_entry *use_gssp_proc;
1:  };
1:  
1:  struct rpc_cb_add_xprt_calldata {
1: -	struct rpc_xprt_switch *xps;
1: -	struct rpc_xprt *xprt;
1: +  struct rpc_xprt_switch *xps;
1: +  struct rpc_xprt *xprt;
1:  };
1:  
1:  struct connect_timeout_data {
1: -	long unsigned int connect_timeout;
1: -	long unsigned int reconnect_timeout;
1: +  long unsigned int connect_timeout;
1: +  long unsigned int reconnect_timeout;
1:  };
1:  
1:  struct xprt_class {
1: -	struct list_head list;
1: -	int ident;
1: -	struct rpc_xprt * (*setup)(struct xprt_create *);
1: -	struct module *owner;
1: -	char name[32];
1: +  struct list_head list;
1: +  int ident;
1: +  struct rpc_xprt *(*setup)(struct xprt_create *);
1: +  struct module *owner;
1: +  char name[32];
1:  };
1:  
1:  enum xprt_xid_rb_cmp {
1: -	XID_RB_EQUAL = 0,
1: -	XID_RB_LEFT = 1,
1: -	XID_RB_RIGHT = 2,
1: +  XID_RB_EQUAL = 0,
1: +  XID_RB_LEFT = 1,
1: +  XID_RB_RIGHT = 2,
1:  };
1:  
1:  typedef __be32 rpc_fraghdr;
1:  
1:  struct xdr_skb_reader {
1: -	struct sk_buff *skb;
1: -	unsigned int offset;
1: -	size_t count;
1: -	__wsum csum;
1: +  struct sk_buff *skb;
1: +  unsigned int offset;
1: +  size_t count;
1: +  __wsum csum;
1:  };
1:  
1:  typedef size_t (*xdr_skb_read_actor)(struct xdr_skb_reader *, void *, size_t);
1:  
1:  struct svc_sock {
1: -	struct svc_xprt sk_xprt;
1: -	struct socket *sk_sock;
1: -	struct sock *sk_sk;
1: -	void (*sk_ostate)(struct sock *);
1: -	void (*sk_odata)(struct sock *);
1: -	void (*sk_owspace)(struct sock *);
1: -	__be32 sk_marker;
1: -	u32 sk_tcplen;
1: -	u32 sk_datalen;
1: -	struct page *sk_pages[259];
1: +  struct svc_xprt sk_xprt;
1: +  struct socket *sk_sock;
1: +  struct sock *sk_sk;
1: +  void (*sk_ostate)(struct sock *);
1: +  void (*sk_odata)(struct sock *);
1: +  void (*sk_owspace)(struct sock *);
1: +  __be32 sk_marker;
1: +  u32 sk_tcplen;
1: +  u32 sk_datalen;
1: +  struct page *sk_pages[259];
1:  };
1:  
1:  struct sock_xprt {
1: -	struct rpc_xprt xprt;
1: -	struct socket *sock;
1: -	struct sock *inet;
1: -	struct file *file;
1: -	struct {
1: -		struct {
1: -			__be32 fraghdr;
1: -			__be32 xid;
1: -			__be32 calldir;
1: -		};
1: -		u32 offset;
1: -		u32 len;
1: -		long unsigned int copied;
1: -	} recv;
1: -	struct {
1: -		u32 offset;
1: -	} xmit;
1: -	long unsigned int sock_state;
1: -	struct delayed_work connect_worker;
1: -	struct work_struct error_worker;
1: -	struct work_struct recv_worker;
1: -	struct mutex recv_mutex;
1: -	struct __kernel_sockaddr_storage srcaddr;
1: -	short unsigned int srcport;
1: -	int xprt_err;
1: -	size_t rcvsize;
1: -	size_t sndsize;
1: -	struct rpc_timeout tcp_timeout;
1: -	void (*old_data_ready)(struct sock *);
1: -	void (*old_state_change)(struct sock *);
1: -	void (*old_write_space)(struct sock *);
1: -	void (*old_error_report)(struct sock *);
1: +  struct rpc_xprt xprt;
1: +  struct socket *sock;
1: +  struct sock *inet;
1: +  struct file *file;
1: +  struct {
1: +    struct {
1: +      __be32 fraghdr;
1: +      __be32 xid;
1: +      __be32 calldir;
1: +    };
1: +    u32 offset;
1: +    u32 len;
1: +    long unsigned int copied;
1: +  } recv;
1: +  struct {
1: +    u32 offset;
1: +  } xmit;
1: +  long unsigned int sock_state;
1: +  struct delayed_work connect_worker;
1: +  struct work_struct error_worker;
1: +  struct work_struct recv_worker;
1: +  struct mutex recv_mutex;
1: +  struct __kernel_sockaddr_storage srcaddr;
1: +  short unsigned int srcport;
1: +  int xprt_err;
1: +  size_t rcvsize;
1: +  size_t sndsize;
1: +  struct rpc_timeout tcp_timeout;
1: +  void (*old_data_ready)(struct sock *);
1: +  void (*old_state_change)(struct sock *);
1: +  void (*old_write_space)(struct sock *);
1: +  void (*old_error_report)(struct sock *);
1:  };
1:  
1:  struct rpc_buffer {
1: -	size_t len;
1: -	char data[0];
1: +  size_t len;
1: +  char data[0];
1:  };
1:  
1:  typedef void (*rpc_action)(struct rpc_task *);
1:  
1:  struct trace_event_raw_rpc_xdr_buf_class {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	const void *head_base;
1: -	size_t head_len;
1: -	const void *tail_base;
1: -	size_t tail_len;
1: -	unsigned int page_len;
1: -	unsigned int msg_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  const void *head_base;
1: +  size_t head_len;
1: +  const void *tail_base;
1: +  size_t tail_len;
1: +  unsigned int page_len;
1: +  unsigned int msg_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_clnt_class {
1: -	struct trace_entry ent;
1: -	unsigned int client_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int client_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_clnt_new {
1: -	struct trace_entry ent;
1: -	unsigned int client_id;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_port;
1: -	u32 __data_loc_program;
1: -	u32 __data_loc_server;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int client_id;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_port;
1: +  u32 __data_loc_program;
1: +  u32 __data_loc_server;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_clnt_new_err {
1: -	struct trace_entry ent;
1: -	int error;
1: -	u32 __data_loc_program;
1: -	u32 __data_loc_server;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int error;
1: +  u32 __data_loc_program;
1: +  u32 __data_loc_server;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_clnt_clone_err {
1: -	struct trace_entry ent;
1: -	unsigned int client_id;
1: -	int error;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int client_id;
1: +  int error;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_task_status {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_request {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	int version;
1: -	bool async;
1: -	u32 __data_loc_progname;
1: -	u32 __data_loc_procname;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  int version;
1: +  bool async;
1: +  u32 __data_loc_progname;
1: +  u32 __data_loc_procname;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_task_running {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	const void *action;
1: -	long unsigned int runstate;
1: -	int status;
1: -	short unsigned int flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  const void *action;
1: +  long unsigned int runstate;
1: +  int status;
1: +  short unsigned int flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_task_queued {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	long unsigned int timeout;
1: -	long unsigned int runstate;
1: -	int status;
1: -	short unsigned int flags;
1: -	u32 __data_loc_q_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  long unsigned int timeout;
1: +  long unsigned int runstate;
1: +  int status;
1: +  short unsigned int flags;
1: +  u32 __data_loc_q_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_failure {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_reply_event {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	u32 xid;
1: -	u32 __data_loc_progname;
1: -	u32 version;
1: -	u32 __data_loc_procname;
1: -	u32 __data_loc_servername;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  u32 xid;
1: +  u32 __data_loc_progname;
1: +  u32 version;
1: +  u32 __data_loc_procname;
1: +  u32 __data_loc_servername;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_buf_alloc {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	size_t callsize;
1: -	size_t recvsize;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  size_t callsize;
1: +  size_t recvsize;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_call_rpcerror {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	int tk_status;
1: -	int rpc_status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  int tk_status;
1: +  int rpc_status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_stats_latency {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	u32 xid;
1: -	int version;
1: -	u32 __data_loc_progname;
1: -	u32 __data_loc_procname;
1: -	long unsigned int backlog;
1: -	long unsigned int rtt;
1: -	long unsigned int execute;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  u32 xid;
1: +  int version;
1: +  u32 __data_loc_progname;
1: +  u32 __data_loc_procname;
1: +  long unsigned int backlog;
1: +  long unsigned int rtt;
1: +  long unsigned int execute;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_xdr_overflow {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	int version;
1: -	size_t requested;
1: -	const void *end;
1: -	const void *p;
1: -	const void *head_base;
1: -	size_t head_len;
1: -	const void *tail_base;
1: -	size_t tail_len;
1: -	unsigned int page_len;
1: -	unsigned int len;
1: -	u32 __data_loc_progname;
1: -	u32 __data_loc_procedure;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  int version;
1: +  size_t requested;
1: +  const void *end;
1: +  const void *p;
1: +  const void *head_base;
1: +  size_t head_len;
1: +  const void *tail_base;
1: +  size_t tail_len;
1: +  unsigned int page_len;
1: +  unsigned int len;
1: +  u32 __data_loc_progname;
1: +  u32 __data_loc_procedure;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_xdr_alignment {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	int version;
1: -	size_t offset;
1: -	unsigned int copied;
1: -	const void *head_base;
1: -	size_t head_len;
1: -	const void *tail_base;
1: -	size_t tail_len;
1: -	unsigned int page_len;
1: -	unsigned int len;
1: -	u32 __data_loc_progname;
1: -	u32 __data_loc_procedure;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  int version;
1: +  size_t offset;
1: +  unsigned int copied;
1: +  const void *head_base;
1: +  size_t head_len;
1: +  const void *tail_base;
1: +  size_t tail_len;
1: +  unsigned int page_len;
1: +  unsigned int len;
1: +  u32 __data_loc_progname;
1: +  u32 __data_loc_procedure;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xs_socket_event {
1: -	struct trace_entry ent;
1: -	unsigned int socket_state;
1: -	unsigned int sock_state;
1: -	long long unsigned int ino;
1: -	u32 __data_loc_dstaddr;
1: -	u32 __data_loc_dstport;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int socket_state;
1: +  unsigned int sock_state;
1: +  long long unsigned int ino;
1: +  u32 __data_loc_dstaddr;
1: +  u32 __data_loc_dstport;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xs_socket_event_done {
1: -	struct trace_entry ent;
1: -	int error;
1: -	unsigned int socket_state;
1: -	unsigned int sock_state;
1: -	long long unsigned int ino;
1: -	u32 __data_loc_dstaddr;
1: -	u32 __data_loc_dstport;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int error;
1: +  unsigned int socket_state;
1: +  unsigned int sock_state;
1: +  long long unsigned int ino;
1: +  u32 __data_loc_dstaddr;
1: +  u32 __data_loc_dstport;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_socket_nospace {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	unsigned int total;
1: -	unsigned int remaining;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  unsigned int total;
1: +  unsigned int remaining;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_xprt_lifetime_class {
1: -	struct trace_entry ent;
1: -	long unsigned int state;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_port;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int state;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_port;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpc_xprt_event {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	int status;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_port;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  int status;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_port;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xprt_transmit {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	u32 xid;
1: -	u32 seqno;
1: -	int status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  u32 xid;
1: +  u32 seqno;
1: +  int status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xprt_ping {
1: -	struct trace_entry ent;
1: -	int status;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_port;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int status;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_port;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xprt_writelock_event {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	unsigned int snd_task_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  unsigned int snd_task_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xprt_cong_event {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	unsigned int snd_task_id;
1: -	long unsigned int cong;
1: -	long unsigned int cwnd;
1: -	bool wait;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  unsigned int snd_task_id;
1: +  long unsigned int cong;
1: +  long unsigned int cwnd;
1: +  bool wait;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xprt_reserve {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	u32 xid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  u32 xid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xs_stream_read_data {
1: -	struct trace_entry ent;
1: -	ssize_t err;
1: -	size_t total;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_port;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  ssize_t err;
1: +  size_t total;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_port;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_xs_stream_read_request {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_port;
1: -	u32 xid;
1: -	long unsigned int copied;
1: -	unsigned int reclen;
1: -	unsigned int offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_port;
1: +  u32 xid;
1: +  long unsigned int copied;
1: +  unsigned int reclen;
1: +  unsigned int offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpcb_getport {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	unsigned int program;
1: -	unsigned int version;
1: -	int protocol;
1: -	unsigned int bind_version;
1: -	u32 __data_loc_servername;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  unsigned int program;
1: +  unsigned int version;
1: +  int protocol;
1: +  unsigned int bind_version;
1: +  u32 __data_loc_servername;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpcb_setport {
1: -	struct trace_entry ent;
1: -	unsigned int task_id;
1: -	unsigned int client_id;
1: -	int status;
1: -	short unsigned int port;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int task_id;
1: +  unsigned int client_id;
1: +  int status;
1: +  short unsigned int port;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_pmap_register {
1: -	struct trace_entry ent;
1: -	unsigned int program;
1: -	unsigned int version;
1: -	int protocol;
1: -	unsigned int port;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int program;
1: +  unsigned int version;
1: +  int protocol;
1: +  unsigned int port;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpcb_register {
1: -	struct trace_entry ent;
1: -	unsigned int program;
1: -	unsigned int version;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_netid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int program;
1: +  unsigned int version;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_netid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rpcb_unregister {
1: -	struct trace_entry ent;
1: -	unsigned int program;
1: -	unsigned int version;
1: -	u32 __data_loc_netid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int program;
1: +  unsigned int version;
1: +  u32 __data_loc_netid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_xdr_buf_class {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	const void *head_base;
1: -	size_t head_len;
1: -	const void *tail_base;
1: -	size_t tail_len;
1: -	unsigned int page_len;
1: -	unsigned int msg_len;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  const void *head_base;
1: +  size_t head_len;
1: +  const void *tail_base;
1: +  size_t tail_len;
1: +  unsigned int page_len;
1: +  unsigned int msg_len;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_recv {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	int len;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  int len;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_authenticate {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	long unsigned int svc_status;
1: -	long unsigned int auth_stat;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  long unsigned int svc_status;
1: +  long unsigned int auth_stat;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_process {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	u32 vers;
1: -	u32 proc;
1: -	u32 __data_loc_service;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  u32 vers;
1: +  u32 proc;
1: +  u32 __data_loc_service;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_rqst_event {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_rqst_status {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	int status;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  int status;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_xprt_create_err {
1: -	struct trace_entry ent;
1: -	long int error;
1: -	u32 __data_loc_program;
1: -	u32 __data_loc_protocol;
1: -	unsigned char addr[28];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long int error;
1: +  u32 __data_loc_program;
1: +  u32 __data_loc_protocol;
1: +  unsigned char addr[28];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_xprt_do_enqueue {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_xprt_event {
1: -	struct trace_entry ent;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_xprt_accept {
1: -	struct trace_entry ent;
1: -	u32 __data_loc_addr;
1: -	u32 __data_loc_protocol;
1: -	u32 __data_loc_service;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 __data_loc_addr;
1: +  u32 __data_loc_protocol;
1: +  u32 __data_loc_service;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_xprt_dequeue {
1: -	struct trace_entry ent;
1: -	long unsigned int flags;
1: -	long unsigned int wakeup;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int flags;
1: +  long unsigned int wakeup;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_wake_up {
1: -	struct trace_entry ent;
1: -	int pid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int pid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_handle_xprt {
1: -	struct trace_entry ent;
1: -	int len;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  int len;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_stats_latency {
1: -	struct trace_entry ent;
1: -	u32 xid;
1: -	long unsigned int execute;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 xid;
1: +  long unsigned int execute;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_deferred_event {
1: -	struct trace_entry ent;
1: -	const void *dr;
1: -	u32 xid;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const void *dr;
1: +  u32 xid;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svcsock_new_socket {
1: -	struct trace_entry ent;
1: -	long unsigned int type;
1: -	long unsigned int family;
1: -	bool listener;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int type;
1: +  long unsigned int family;
1: +  bool listener;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svcsock_marker {
1: -	struct trace_entry ent;
1: -	unsigned int length;
1: -	bool last;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int length;
1: +  bool last;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svcsock_class {
1: -	struct trace_entry ent;
1: -	ssize_t result;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  ssize_t result;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svcsock_tcp_recv_short {
1: -	struct trace_entry ent;
1: -	u32 expected;
1: -	u32 received;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 expected;
1: +  u32 received;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svcsock_tcp_state {
1: -	struct trace_entry ent;
1: -	long unsigned int socket_state;
1: -	long unsigned int sock_state;
1: -	long unsigned int flags;
1: -	u32 __data_loc_addr;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long unsigned int socket_state;
1: +  long unsigned int sock_state;
1: +  long unsigned int flags;
1: +  u32 __data_loc_addr;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svcsock_accept_class {
1: -	struct trace_entry ent;
1: -	long int status;
1: -	u32 __data_loc_service;
1: -	unsigned char addr[28];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  long int status;
1: +  u32 __data_loc_service;
1: +  unsigned char addr[28];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cache_event {
1: -	struct trace_entry ent;
1: -	const struct cache_head *h;
1: -	u32 __data_loc_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  const struct cache_head *h;
1: +  u32 __data_loc_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_register_class {
1: -	struct trace_entry ent;
1: -	u32 version;
1: -	long unsigned int family;
1: -	short unsigned int protocol;
1: -	short unsigned int port;
1: -	int error;
1: -	u32 __data_loc_program;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 version;
1: +  long unsigned int family;
1: +  short unsigned int protocol;
1: +  short unsigned int port;
1: +  int error;
1: +  u32 __data_loc_program;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_svc_unregister {
1: -	struct trace_entry ent;
1: -	u32 version;
1: -	int error;
1: -	u32 __data_loc_program;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 version;
1: +  int error;
1: +  u32 __data_loc_program;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_xdr_buf_class {};
1: @@ -124836,15 +126218,15 @@ struct trace_event_data_offsets_rpc_xdr_buf_class {};
1:  struct trace_event_data_offsets_rpc_clnt_class {};
1:  
1:  struct trace_event_data_offsets_rpc_clnt_new {
1: -	u32 addr;
1: -	u32 port;
1: -	u32 program;
1: -	u32 server;
1: +  u32 addr;
1: +  u32 port;
1: +  u32 program;
1: +  u32 server;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_clnt_new_err {
1: -	u32 program;
1: -	u32 server;
1: +  u32 program;
1: +  u32 server;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_clnt_clone_err {};
1: @@ -124852,22 +126234,22 @@ struct trace_event_data_offsets_rpc_clnt_clone_err {};
1:  struct trace_event_data_offsets_rpc_task_status {};
1:  
1:  struct trace_event_data_offsets_rpc_request {
1: -	u32 progname;
1: -	u32 procname;
1: +  u32 progname;
1: +  u32 procname;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_task_running {};
1:  
1:  struct trace_event_data_offsets_rpc_task_queued {
1: -	u32 q_name;
1: +  u32 q_name;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_failure {};
1:  
1:  struct trace_event_data_offsets_rpc_reply_event {
1: -	u32 progname;
1: -	u32 procname;
1: -	u32 servername;
1: +  u32 progname;
1: +  u32 procname;
1: +  u32 servername;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_buf_alloc {};
1: @@ -124875,47 +126257,47 @@ struct trace_event_data_offsets_rpc_buf_alloc {};
1:  struct trace_event_data_offsets_rpc_call_rpcerror {};
1:  
1:  struct trace_event_data_offsets_rpc_stats_latency {
1: -	u32 progname;
1: -	u32 procname;
1: +  u32 progname;
1: +  u32 procname;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_xdr_overflow {
1: -	u32 progname;
1: -	u32 procedure;
1: +  u32 progname;
1: +  u32 procedure;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_xdr_alignment {
1: -	u32 progname;
1: -	u32 procedure;
1: +  u32 progname;
1: +  u32 procedure;
1:  };
1:  
1:  struct trace_event_data_offsets_xs_socket_event {
1: -	u32 dstaddr;
1: -	u32 dstport;
1: +  u32 dstaddr;
1: +  u32 dstport;
1:  };
1:  
1:  struct trace_event_data_offsets_xs_socket_event_done {
1: -	u32 dstaddr;
1: -	u32 dstport;
1: +  u32 dstaddr;
1: +  u32 dstport;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_socket_nospace {};
1:  
1:  struct trace_event_data_offsets_rpc_xprt_lifetime_class {
1: -	u32 addr;
1: -	u32 port;
1: +  u32 addr;
1: +  u32 port;
1:  };
1:  
1:  struct trace_event_data_offsets_rpc_xprt_event {
1: -	u32 addr;
1: -	u32 port;
1: +  u32 addr;
1: +  u32 port;
1:  };
1:  
1:  struct trace_event_data_offsets_xprt_transmit {};
1:  
1:  struct trace_event_data_offsets_xprt_ping {
1: -	u32 addr;
1: -	u32 port;
1: +  u32 addr;
1: +  u32 port;
1:  };
1:  
1:  struct trace_event_data_offsets_xprt_writelock_event {};
1: @@ -124925,17 +126307,17 @@ struct trace_event_data_offsets_xprt_cong_event {};
1:  struct trace_event_data_offsets_xprt_reserve {};
1:  
1:  struct trace_event_data_offsets_xs_stream_read_data {
1: -	u32 addr;
1: -	u32 port;
1: +  u32 addr;
1: +  u32 port;
1:  };
1:  
1:  struct trace_event_data_offsets_xs_stream_read_request {
1: -	u32 addr;
1: -	u32 port;
1: +  u32 addr;
1: +  u32 port;
1:  };
1:  
1:  struct trace_event_data_offsets_rpcb_getport {
1: -	u32 servername;
1: +  u32 servername;
1:  };
1:  
1:  struct trace_event_data_offsets_rpcb_setport {};
1: @@ -124943,111 +126325,114 @@ struct trace_event_data_offsets_rpcb_setport {};
1:  struct trace_event_data_offsets_pmap_register {};
1:  
1:  struct trace_event_data_offsets_rpcb_register {
1: -	u32 addr;
1: -	u32 netid;
1: +  u32 addr;
1: +  u32 netid;
1:  };
1:  
1:  struct trace_event_data_offsets_rpcb_unregister {
1: -	u32 netid;
1: +  u32 netid;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_xdr_buf_class {};
1:  
1:  struct trace_event_data_offsets_svc_recv {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_authenticate {};
1:  
1:  struct trace_event_data_offsets_svc_process {
1: -	u32 service;
1: -	u32 addr;
1: +  u32 service;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_rqst_event {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_rqst_status {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_xprt_create_err {
1: -	u32 program;
1: -	u32 protocol;
1: +  u32 program;
1: +  u32 protocol;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_xprt_do_enqueue {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_xprt_event {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_xprt_accept {
1: -	u32 addr;
1: -	u32 protocol;
1: -	u32 service;
1: +  u32 addr;
1: +  u32 protocol;
1: +  u32 service;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_xprt_dequeue {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_wake_up {};
1:  
1:  struct trace_event_data_offsets_svc_handle_xprt {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_stats_latency {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_deferred_event {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svcsock_new_socket {};
1:  
1:  struct trace_event_data_offsets_svcsock_marker {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svcsock_class {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svcsock_tcp_recv_short {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svcsock_tcp_state {
1: -	u32 addr;
1: +  u32 addr;
1:  };
1:  
1:  struct trace_event_data_offsets_svcsock_accept_class {
1: -	u32 service;
1: +  u32 service;
1:  };
1:  
1:  struct trace_event_data_offsets_cache_event {
1: -	u32 name;
1: +  u32 name;
1:  };
1:  
1:  struct trace_event_data_offsets_register_class {
1: -	u32 program;
1: +  u32 program;
1:  };
1:  
1:  struct trace_event_data_offsets_svc_unregister {
1: -	u32 program;
1: +  u32 program;
1:  };
1:  
1: -typedef void (*btf_trace_rpc_xdr_sendto)(void *, const struct rpc_task *, const struct xdr_buf *);
1: +typedef void (*btf_trace_rpc_xdr_sendto)(void *, const struct rpc_task *,
1: +                                         const struct xdr_buf *);
1:  
1: -typedef void (*btf_trace_rpc_xdr_recvfrom)(void *, const struct rpc_task *, const struct xdr_buf *);
1: +typedef void (*btf_trace_rpc_xdr_recvfrom)(void *, const struct rpc_task *,
1: +                                           const struct xdr_buf *);
1:  
1: -typedef void (*btf_trace_rpc_xdr_reply_pages)(void *, const struct rpc_task *, const struct xdr_buf *);
1: +typedef void (*btf_trace_rpc_xdr_reply_pages)(void *, const struct rpc_task *,
1: +                                              const struct xdr_buf *);
1:  
1:  typedef void (*btf_trace_rpc_clnt_free)(void *, const struct rpc_clnt *);
1:  
1: @@ -125057,15 +126442,21 @@ typedef void (*btf_trace_rpc_clnt_shutdown)(void *, const struct rpc_clnt *);
1:  
1:  typedef void (*btf_trace_rpc_clnt_release)(void *, const struct rpc_clnt *);
1:  
1: -typedef void (*btf_trace_rpc_clnt_replace_xprt)(void *, const struct rpc_clnt *);
1: +typedef void (*btf_trace_rpc_clnt_replace_xprt)(void *,
1: +                                                const struct rpc_clnt *);
1:  
1: -typedef void (*btf_trace_rpc_clnt_replace_xprt_err)(void *, const struct rpc_clnt *);
1: +typedef void (*btf_trace_rpc_clnt_replace_xprt_err)(void *,
1: +                                                    const struct rpc_clnt *);
1:  
1: -typedef void (*btf_trace_rpc_clnt_new)(void *, const struct rpc_clnt *, const struct rpc_xprt *, const char *, const char *);
1: +typedef void (*btf_trace_rpc_clnt_new)(void *, const struct rpc_clnt *,
1: +                                       const struct rpc_xprt *, const char *,
1: +                                       const char *);
1:  
1: -typedef void (*btf_trace_rpc_clnt_new_err)(void *, const char *, const char *, int);
1: +typedef void (*btf_trace_rpc_clnt_new_err)(void *, const char *, const char *,
1: +                                           int);
1:  
1: -typedef void (*btf_trace_rpc_clnt_clone_err)(void *, const struct rpc_clnt *, int);
1: +typedef void (*btf_trace_rpc_clnt_clone_err)(void *, const struct rpc_clnt *,
1: +                                             int);
1:  
1:  typedef void (*btf_trace_rpc_call_status)(void *, const struct rpc_task *);
1:  
1: @@ -125073,31 +126464,42 @@ typedef void (*btf_trace_rpc_connect_status)(void *, const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpc_timeout_status)(void *, const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_rpc_retry_refresh_status)(void *, const struct rpc_task *);
1: +typedef void (*btf_trace_rpc_retry_refresh_status)(void *,
1: +                                                   const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpc_refresh_status)(void *, const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpc_request)(void *, const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_rpc_task_begin)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_begin)(void *, const struct rpc_task *,
1: +                                         const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_run_action)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_run_action)(void *, const struct rpc_task *,
1: +                                              const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_sync_sleep)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_sync_sleep)(void *, const struct rpc_task *,
1: +                                              const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_sync_wake)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_sync_wake)(void *, const struct rpc_task *,
1: +                                             const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_complete)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_complete)(void *, const struct rpc_task *,
1: +                                            const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_timeout)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_timeout)(void *, const struct rpc_task *,
1: +                                           const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_signalled)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_signalled)(void *, const struct rpc_task *,
1: +                                             const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_end)(void *, const struct rpc_task *, const void *);
1: +typedef void (*btf_trace_rpc_task_end)(void *, const struct rpc_task *,
1: +                                       const void *);
1:  
1: -typedef void (*btf_trace_rpc_task_sleep)(void *, const struct rpc_task *, const struct rpc_wait_queue *);
1: +typedef void (*btf_trace_rpc_task_sleep)(void *, const struct rpc_task *,
1: +                                         const struct rpc_wait_queue *);
1:  
1: -typedef void (*btf_trace_rpc_task_wakeup)(void *, const struct rpc_task *, const struct rpc_wait_queue *);
1: +typedef void (*btf_trace_rpc_task_wakeup)(void *, const struct rpc_task *,
1: +                                          const struct rpc_wait_queue *);
1:  
1:  typedef void (*btf_trace_rpc_bad_callhdr)(void *, const struct rpc_task *);
1:  
1: @@ -125121,39 +126523,53 @@ typedef void (*btf_trace_rpc__bad_creds)(void *, const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpc__auth_tooweak)(void *, const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_rpcb_prog_unavail_err)(void *, const struct rpc_task *);
1: +typedef void (*btf_trace_rpcb_prog_unavail_err)(void *,
1: +                                                const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpcb_timeout_err)(void *, const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_rpcb_bind_version_err)(void *, const struct rpc_task *);
1: +typedef void (*btf_trace_rpcb_bind_version_err)(void *,
1: +                                                const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpcb_unreachable_err)(void *, const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_rpcb_unrecognized_err)(void *, const struct rpc_task *);
1: +typedef void (*btf_trace_rpcb_unrecognized_err)(void *,
1: +                                                const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_rpc_buf_alloc)(void *, const struct rpc_task *, int);
1:  
1: -typedef void (*btf_trace_rpc_call_rpcerror)(void *, const struct rpc_task *, int, int);
1: +typedef void (*btf_trace_rpc_call_rpcerror)(void *, const struct rpc_task *,
1: +                                            int, int);
1:  
1: -typedef void (*btf_trace_rpc_stats_latency)(void *, const struct rpc_task *, ktime_t, ktime_t, ktime_t);
1: +typedef void (*btf_trace_rpc_stats_latency)(void *, const struct rpc_task *,
1: +                                            ktime_t, ktime_t, ktime_t);
1:  
1: -typedef void (*btf_trace_rpc_xdr_overflow)(void *, const struct xdr_stream *, size_t);
1: +typedef void (*btf_trace_rpc_xdr_overflow)(void *, const struct xdr_stream *,
1: +                                           size_t);
1:  
1: -typedef void (*btf_trace_rpc_xdr_alignment)(void *, const struct xdr_stream *, size_t, unsigned int);
1: +typedef void (*btf_trace_rpc_xdr_alignment)(void *, const struct xdr_stream *,
1: +                                            size_t, unsigned int);
1:  
1: -typedef void (*btf_trace_rpc_socket_state_change)(void *, struct rpc_xprt *, struct socket *);
1: +typedef void (*btf_trace_rpc_socket_state_change)(void *, struct rpc_xprt *,
1: +                                                  struct socket *);
1:  
1: -typedef void (*btf_trace_rpc_socket_connect)(void *, struct rpc_xprt *, struct socket *, int);
1: +typedef void (*btf_trace_rpc_socket_connect)(void *, struct rpc_xprt *,
1: +                                             struct socket *, int);
1:  
1: -typedef void (*btf_trace_rpc_socket_error)(void *, struct rpc_xprt *, struct socket *, int);
1: +typedef void (*btf_trace_rpc_socket_error)(void *, struct rpc_xprt *,
1: +                                           struct socket *, int);
1:  
1: -typedef void (*btf_trace_rpc_socket_reset_connection)(void *, struct rpc_xprt *, struct socket *, int);
1: +typedef void (*btf_trace_rpc_socket_reset_connection)(void *, struct rpc_xprt *,
1: +                                                      struct socket *, int);
1:  
1: -typedef void (*btf_trace_rpc_socket_close)(void *, struct rpc_xprt *, struct socket *);
1: +typedef void (*btf_trace_rpc_socket_close)(void *, struct rpc_xprt *,
1: +                                           struct socket *);
1:  
1: -typedef void (*btf_trace_rpc_socket_shutdown)(void *, struct rpc_xprt *, struct socket *);
1: +typedef void (*btf_trace_rpc_socket_shutdown)(void *, struct rpc_xprt *,
1: +                                              struct socket *);
1:  
1: -typedef void (*btf_trace_rpc_socket_nospace)(void *, const struct rpc_rqst *, const struct sock_xprt *);
1: +typedef void (*btf_trace_rpc_socket_nospace)(void *, const struct rpc_rqst *,
1: +                                             const struct sock_xprt *);
1:  
1:  typedef void (*btf_trace_xprt_create)(void *, const struct rpc_xprt *);
1:  
1: @@ -125163,59 +126579,79 @@ typedef void (*btf_trace_xprt_disconnect_auto)(void *, const struct rpc_xprt *);
1:  
1:  typedef void (*btf_trace_xprt_disconnect_done)(void *, const struct rpc_xprt *);
1:  
1: -typedef void (*btf_trace_xprt_disconnect_force)(void *, const struct rpc_xprt *);
1: +typedef void (*btf_trace_xprt_disconnect_force)(void *,
1: +                                                const struct rpc_xprt *);
1:  
1: -typedef void (*btf_trace_xprt_disconnect_cleanup)(void *, const struct rpc_xprt *);
1: +typedef void (*btf_trace_xprt_disconnect_cleanup)(void *,
1: +                                                  const struct rpc_xprt *);
1:  
1:  typedef void (*btf_trace_xprt_destroy)(void *, const struct rpc_xprt *);
1:  
1: -typedef void (*btf_trace_xprt_timer)(void *, const struct rpc_xprt *, __be32, int);
1: +typedef void (*btf_trace_xprt_timer)(void *, const struct rpc_xprt *, __be32,
1: +                                     int);
1:  
1: -typedef void (*btf_trace_xprt_lookup_rqst)(void *, const struct rpc_xprt *, __be32, int);
1: +typedef void (*btf_trace_xprt_lookup_rqst)(void *, const struct rpc_xprt *,
1: +                                           __be32, int);
1:  
1:  typedef void (*btf_trace_xprt_transmit)(void *, const struct rpc_rqst *, int);
1:  
1:  typedef void (*btf_trace_xprt_ping)(void *, const struct rpc_xprt *, int);
1:  
1: -typedef void (*btf_trace_xprt_reserve_xprt)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_reserve_xprt)(void *, const struct rpc_xprt *,
1: +                                            const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_xprt_release_xprt)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_release_xprt)(void *, const struct rpc_xprt *,
1: +                                            const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_xprt_transmit_queued)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_transmit_queued)(void *, const struct rpc_xprt *,
1: +                                               const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_xprt_reserve_cong)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_reserve_cong)(void *, const struct rpc_xprt *,
1: +                                            const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_xprt_release_cong)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_release_cong)(void *, const struct rpc_xprt *,
1: +                                            const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_xprt_get_cong)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_get_cong)(void *, const struct rpc_xprt *,
1: +                                        const struct rpc_task *);
1:  
1: -typedef void (*btf_trace_xprt_put_cong)(void *, const struct rpc_xprt *, const struct rpc_task *);
1: +typedef void (*btf_trace_xprt_put_cong)(void *, const struct rpc_xprt *,
1: +                                        const struct rpc_task *);
1:  
1:  typedef void (*btf_trace_xprt_reserve)(void *, const struct rpc_rqst *);
1:  
1: -typedef void (*btf_trace_xs_stream_read_data)(void *, struct rpc_xprt *, ssize_t, size_t);
1: +typedef void (*btf_trace_xs_stream_read_data)(void *, struct rpc_xprt *,
1: +                                              ssize_t, size_t);
1:  
1:  typedef void (*btf_trace_xs_stream_read_request)(void *, struct sock_xprt *);
1:  
1: -typedef void (*btf_trace_rpcb_getport)(void *, const struct rpc_clnt *, const struct rpc_task *, unsigned int);
1: +typedef void (*btf_trace_rpcb_getport)(void *, const struct rpc_clnt *,
1: +                                       const struct rpc_task *, unsigned int);
1:  
1: -typedef void (*btf_trace_rpcb_setport)(void *, const struct rpc_task *, int, short unsigned int);
1: +typedef void (*btf_trace_rpcb_setport)(void *, const struct rpc_task *, int,
1: +                                       short unsigned int);
1:  
1: -typedef void (*btf_trace_pmap_register)(void *, u32, u32, int, short unsigned int);
1: +typedef void (*btf_trace_pmap_register)(void *, u32, u32, int,
1: +                                        short unsigned int);
1:  
1: -typedef void (*btf_trace_rpcb_register)(void *, u32, u32, const char *, const char *);
1: +typedef void (*btf_trace_rpcb_register)(void *, u32, u32, const char *,
1: +                                        const char *);
1:  
1:  typedef void (*btf_trace_rpcb_unregister)(void *, u32, u32, const char *);
1:  
1: -typedef void (*btf_trace_svc_xdr_recvfrom)(void *, const struct svc_rqst *, const struct xdr_buf *);
1: +typedef void (*btf_trace_svc_xdr_recvfrom)(void *, const struct svc_rqst *,
1: +                                           const struct xdr_buf *);
1:  
1: -typedef void (*btf_trace_svc_xdr_sendto)(void *, const struct svc_rqst *, const struct xdr_buf *);
1: +typedef void (*btf_trace_svc_xdr_sendto)(void *, const struct svc_rqst *,
1: +                                         const struct xdr_buf *);
1:  
1:  typedef void (*btf_trace_svc_recv)(void *, struct svc_rqst *, int);
1:  
1: -typedef void (*btf_trace_svc_authenticate)(void *, const struct svc_rqst *, int, __be32);
1: +typedef void (*btf_trace_svc_authenticate)(void *, const struct svc_rqst *, int,
1: +                                           __be32);
1:  
1: -typedef void (*btf_trace_svc_process)(void *, const struct svc_rqst *, const char *);
1: +typedef void (*btf_trace_svc_process)(void *, const struct svc_rqst *,
1: +                                      const char *);
1:  
1:  typedef void (*btf_trace_svc_defer)(void *, const struct svc_rqst *);
1:  
1: @@ -125223,9 +126659,12 @@ typedef void (*btf_trace_svc_drop)(void *, const struct svc_rqst *);
1:  
1:  typedef void (*btf_trace_svc_send)(void *, struct svc_rqst *, int);
1:  
1: -typedef void (*btf_trace_svc_xprt_create_err)(void *, const char *, const char *, struct sockaddr *, const struct svc_xprt *);
1: +typedef void (*btf_trace_svc_xprt_create_err)(void *, const char *,
1: +                                              const char *, struct sockaddr *,
1: +                                              const struct svc_xprt *);
1:  
1: -typedef void (*btf_trace_svc_xprt_do_enqueue)(void *, struct svc_xprt *, struct svc_rqst *);
1: +typedef void (*btf_trace_svc_xprt_do_enqueue)(void *, struct svc_xprt *,
1: +                                              struct svc_rqst *);
1:  
1:  typedef void (*btf_trace_svc_xprt_no_write_space)(void *, struct svc_xprt *);
1:  
1: @@ -125235,7 +126674,8 @@ typedef void (*btf_trace_svc_xprt_detach)(void *, struct svc_xprt *);
1:  
1:  typedef void (*btf_trace_svc_xprt_free)(void *, struct svc_xprt *);
1:  
1: -typedef void (*btf_trace_svc_xprt_accept)(void *, const struct svc_xprt *, const char *);
1: +typedef void (*btf_trace_svc_xprt_accept)(void *, const struct svc_xprt *,
1: +                                          const char *);
1:  
1:  typedef void (*btf_trace_svc_xprt_dequeue)(void *, struct svc_rqst *);
1:  
1: @@ -125245,876 +126685,911 @@ typedef void (*btf_trace_svc_handle_xprt)(void *, struct svc_xprt *, int);
1:  
1:  typedef void (*btf_trace_svc_stats_latency)(void *, const struct svc_rqst *);
1:  
1: -typedef void (*btf_trace_svc_defer_drop)(void *, const struct svc_deferred_req *);
1: +typedef void (*btf_trace_svc_defer_drop)(void *,
1: +                                         const struct svc_deferred_req *);
1:  
1: -typedef void (*btf_trace_svc_defer_queue)(void *, const struct svc_deferred_req *);
1: +typedef void (*btf_trace_svc_defer_queue)(void *,
1: +                                          const struct svc_deferred_req *);
1:  
1: -typedef void (*btf_trace_svc_defer_recv)(void *, const struct svc_deferred_req *);
1: +typedef void (*btf_trace_svc_defer_recv)(void *,
1: +                                         const struct svc_deferred_req *);
1:  
1:  typedef void (*btf_trace_svcsock_new_socket)(void *, const struct socket *);
1:  
1: -typedef void (*btf_trace_svcsock_marker)(void *, const struct svc_xprt *, __be32);
1: +typedef void (*btf_trace_svcsock_marker)(void *, const struct svc_xprt *,
1: +                                         __be32);
1:  
1: -typedef void (*btf_trace_svcsock_udp_send)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_udp_send)(void *, const struct svc_xprt *,
1: +                                           ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_udp_recv)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_udp_recv)(void *, const struct svc_xprt *,
1: +                                           ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_udp_recv_err)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_udp_recv_err)(void *, const struct svc_xprt *,
1: +                                               ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_tcp_send)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_tcp_send)(void *, const struct svc_xprt *,
1: +                                           ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_tcp_recv)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_tcp_recv)(void *, const struct svc_xprt *,
1: +                                           ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_tcp_recv_eagain)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_tcp_recv_eagain)(void *,
1: +                                                  const struct svc_xprt *,
1: +                                                  ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_tcp_recv_err)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_tcp_recv_err)(void *, const struct svc_xprt *,
1: +                                               ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_data_ready)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_data_ready)(void *, const struct svc_xprt *,
1: +                                             ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_write_space)(void *, const struct svc_xprt *, ssize_t);
1: +typedef void (*btf_trace_svcsock_write_space)(void *, const struct svc_xprt *,
1: +                                              ssize_t);
1:  
1: -typedef void (*btf_trace_svcsock_tcp_recv_short)(void *, const struct svc_xprt *, u32, u32);
1: +typedef void (*btf_trace_svcsock_tcp_recv_short)(void *,
1: +                                                 const struct svc_xprt *, u32,
1: +                                                 u32);
1:  
1: -typedef void (*btf_trace_svcsock_tcp_state)(void *, const struct svc_xprt *, const struct socket *);
1: +typedef void (*btf_trace_svcsock_tcp_state)(void *, const struct svc_xprt *,
1: +                                            const struct socket *);
1:  
1: -typedef void (*btf_trace_svcsock_accept_err)(void *, const struct svc_xprt *, const char *, long int);
1: +typedef void (*btf_trace_svcsock_accept_err)(void *, const struct svc_xprt *,
1: +                                             const char *, long int);
1:  
1: -typedef void (*btf_trace_svcsock_getpeername_err)(void *, const struct svc_xprt *, const char *, long int);
1: +typedef void (*btf_trace_svcsock_getpeername_err)(void *,
1: +                                                  const struct svc_xprt *,
1: +                                                  const char *, long int);
1:  
1: -typedef void (*btf_trace_cache_entry_expired)(void *, const struct cache_detail *, const struct cache_head *);
1: +typedef void (*btf_trace_cache_entry_expired)(void *,
1: +                                              const struct cache_detail *,
1: +                                              const struct cache_head *);
1:  
1: -typedef void (*btf_trace_cache_entry_upcall)(void *, const struct cache_detail *, const struct cache_head *);
1: +typedef void (*btf_trace_cache_entry_upcall)(void *,
1: +                                             const struct cache_detail *,
1: +                                             const struct cache_head *);
1:  
1: -typedef void (*btf_trace_cache_entry_update)(void *, const struct cache_detail *, const struct cache_head *);
1: +typedef void (*btf_trace_cache_entry_update)(void *,
1: +                                             const struct cache_detail *,
1: +                                             const struct cache_head *);
1:  
1: -typedef void (*btf_trace_cache_entry_make_negative)(void *, const struct cache_detail *, const struct cache_head *);
1: +typedef void (*btf_trace_cache_entry_make_negative)(void *,
1: +                                                    const struct cache_detail *,
1: +                                                    const struct cache_head *);
1:  
1: -typedef void (*btf_trace_cache_entry_no_listener)(void *, const struct cache_detail *, const struct cache_head *);
1: +typedef void (*btf_trace_cache_entry_no_listener)(void *,
1: +                                                  const struct cache_detail *,
1: +                                                  const struct cache_head *);
1:  
1: -typedef void (*btf_trace_svc_register)(void *, const char *, const u32, const int, const short unsigned int, const short unsigned int, int);
1: +typedef void (*btf_trace_svc_register)(void *, const char *, const u32,
1: +                                       const int, const short unsigned int,
1: +                                       const short unsigned int, int);
1:  
1: -typedef void (*btf_trace_svc_noregister)(void *, const char *, const u32, const int, const short unsigned int, const short unsigned int, int);
1: +typedef void (*btf_trace_svc_noregister)(void *, const char *, const u32,
1: +                                         const int, const short unsigned int,
1: +                                         const short unsigned int, int);
1:  
1:  typedef void (*btf_trace_svc_unregister)(void *, const char *, const u32, int);
1:  
1:  struct rpc_cred_cache {
1: -	struct hlist_head *hashtable;
1: -	unsigned int hashbits;
1: -	spinlock_t lock;
1: +  struct hlist_head *hashtable;
1: +  unsigned int hashbits;
1: +  spinlock_t lock;
1:  };
1:  
1:  enum {
1: -	SVC_POOL_AUTO = 4294967295,
1: -	SVC_POOL_GLOBAL = 0,
1: -	SVC_POOL_PERCPU = 1,
1: -	SVC_POOL_PERNODE = 2,
1: +  SVC_POOL_AUTO = 4294967295,
1: +  SVC_POOL_GLOBAL = 0,
1: +  SVC_POOL_PERCPU = 1,
1: +  SVC_POOL_PERNODE = 2,
1:  };
1:  
1:  struct svc_pool_map {
1: -	int count;
1: -	int mode;
1: -	unsigned int npools;
1: -	unsigned int *pool_to;
1: -	unsigned int *to_pool;
1: +  int count;
1: +  int mode;
1: +  unsigned int npools;
1: +  unsigned int *pool_to;
1: +  unsigned int *to_pool;
1:  };
1:  
1:  struct unix_domain {
1: -	struct auth_domain h;
1: +  struct auth_domain h;
1:  };
1:  
1:  struct ip_map {
1: -	struct cache_head h;
1: -	char m_class[8];
1: -	struct in6_addr m_addr;
1: -	struct unix_domain *m_client;
1: -	struct callback_head m_rcu;
1: +  struct cache_head h;
1: +  char m_class[8];
1: +  struct in6_addr m_addr;
1: +  struct unix_domain *m_client;
1: +  struct callback_head m_rcu;
1:  };
1:  
1:  struct unix_gid {
1: -	struct cache_head h;
1: -	kuid_t uid;
1: -	struct group_info *gi;
1: -	struct callback_head rcu;
1: -};
1: -
1: -enum {
1: -	RPCBPROC_NULL = 0,
1: -	RPCBPROC_SET = 1,
1: -	RPCBPROC_UNSET = 2,
1: -	RPCBPROC_GETPORT = 3,
1: -	RPCBPROC_GETADDR = 3,
1: -	RPCBPROC_DUMP = 4,
1: -	RPCBPROC_CALLIT = 5,
1: -	RPCBPROC_BCAST = 5,
1: -	RPCBPROC_GETTIME = 6,
1: -	RPCBPROC_UADDR2TADDR = 7,
1: -	RPCBPROC_TADDR2UADDR = 8,
1: -	RPCBPROC_GETVERSADDR = 9,
1: -	RPCBPROC_INDIRECT = 10,
1: -	RPCBPROC_GETADDRLIST = 11,
1: -	RPCBPROC_GETSTAT = 12,
1: +  struct cache_head h;
1: +  kuid_t uid;
1: +  struct group_info *gi;
1: +  struct callback_head rcu;
1: +};
1: +
1: +enum {
1: +  RPCBPROC_NULL = 0,
1: +  RPCBPROC_SET = 1,
1: +  RPCBPROC_UNSET = 2,
1: +  RPCBPROC_GETPORT = 3,
1: +  RPCBPROC_GETADDR = 3,
1: +  RPCBPROC_DUMP = 4,
1: +  RPCBPROC_CALLIT = 5,
1: +  RPCBPROC_BCAST = 5,
1: +  RPCBPROC_GETTIME = 6,
1: +  RPCBPROC_UADDR2TADDR = 7,
1: +  RPCBPROC_TADDR2UADDR = 8,
1: +  RPCBPROC_GETVERSADDR = 9,
1: +  RPCBPROC_INDIRECT = 10,
1: +  RPCBPROC_GETADDRLIST = 11,
1: +  RPCBPROC_GETSTAT = 12,
1:  };
1:  
1:  struct rpcbind_args {
1: -	struct rpc_xprt *r_xprt;
1: -	u32 r_prog;
1: -	u32 r_vers;
1: -	u32 r_prot;
1: -	short unsigned int r_port;
1: -	const char *r_netid;
1: -	const char *r_addr;
1: -	const char *r_owner;
1: -	int r_status;
1: +  struct rpc_xprt *r_xprt;
1: +  u32 r_prog;
1: +  u32 r_vers;
1: +  u32 r_prot;
1: +  short unsigned int r_port;
1: +  const char *r_netid;
1: +  const char *r_addr;
1: +  const char *r_owner;
1: +  int r_status;
1:  };
1:  
1:  struct rpcb_info {
1: -	u32 rpc_vers;
1: -	const struct rpc_procinfo *rpc_proc;
1: +  u32 rpc_vers;
1: +  const struct rpc_procinfo *rpc_proc;
1:  };
1:  
1:  struct rpc_inode {
1: -	struct inode vfs_inode;
1: -	void *private;
1: -	struct rpc_pipe *pipe;
1: -	wait_queue_head_t waitq;
1: +  struct inode vfs_inode;
1: +  void *private;
1: +  struct rpc_pipe *pipe;
1: +  wait_queue_head_t waitq;
1:  };
1:  
1:  struct thread_deferred_req {
1: -	struct cache_deferred_req handle;
1: -	struct completion completion;
1: +  struct cache_deferred_req handle;
1: +  struct completion completion;
1:  };
1:  
1:  struct cache_queue {
1: -	struct list_head list;
1: -	int reader;
1: +  struct list_head list;
1: +  int reader;
1:  };
1:  
1:  struct cache_request {
1: -	struct cache_queue q;
1: -	struct cache_head *item;
1: -	char *buf;
1: -	int len;
1: -	int readers;
1: +  struct cache_queue q;
1: +  struct cache_head *item;
1: +  char *buf;
1: +  int len;
1: +  int readers;
1:  };
1:  
1:  struct cache_reader {
1: -	struct cache_queue q;
1: -	int offset;
1: +  struct cache_queue q;
1: +  int offset;
1:  };
1:  
1:  struct rpc_pipe_dir_object_ops;
1:  
1:  struct rpc_pipe_dir_object {
1: -	struct list_head pdo_head;
1: -	const struct rpc_pipe_dir_object_ops *pdo_ops;
1: -	void *pdo_data;
1: +  struct list_head pdo_head;
1: +  const struct rpc_pipe_dir_object_ops *pdo_ops;
1: +  void *pdo_data;
1:  };
1:  
1:  struct rpc_pipe_dir_object_ops {
1: -	int (*create)(struct dentry *, struct rpc_pipe_dir_object *);
1: -	void (*destroy)(struct dentry *, struct rpc_pipe_dir_object *);
1: +  int (*create)(struct dentry *, struct rpc_pipe_dir_object *);
1: +  void (*destroy)(struct dentry *, struct rpc_pipe_dir_object *);
1:  };
1:  
1:  struct rpc_filelist {
1: -	const char *name;
1: -	const struct file_operations *i_fop;
1: -	umode_t mode;
1: +  const char *name;
1: +  const struct file_operations *i_fop;
1: +  umode_t mode;
1:  };
1:  
1:  enum {
1: -	RPCAUTH_info = 0,
1: -	RPCAUTH_EOF = 1,
1: +  RPCAUTH_info = 0,
1: +  RPCAUTH_EOF = 1,
1:  };
1:  
1:  enum {
1: -	RPCAUTH_lockd = 0,
1: -	RPCAUTH_mount = 1,
1: -	RPCAUTH_nfs = 2,
1: -	RPCAUTH_portmap = 3,
1: -	RPCAUTH_statd = 4,
1: -	RPCAUTH_nfsd4_cb = 5,
1: -	RPCAUTH_cache = 6,
1: -	RPCAUTH_nfsd = 7,
1: -	RPCAUTH_gssd = 8,
1: -	RPCAUTH_RootEOF = 9,
1: +  RPCAUTH_lockd = 0,
1: +  RPCAUTH_mount = 1,
1: +  RPCAUTH_nfs = 2,
1: +  RPCAUTH_portmap = 3,
1: +  RPCAUTH_statd = 4,
1: +  RPCAUTH_nfsd4_cb = 5,
1: +  RPCAUTH_cache = 6,
1: +  RPCAUTH_nfsd = 7,
1: +  RPCAUTH_gssd = 8,
1: +  RPCAUTH_RootEOF = 9,
1:  };
1:  
1:  struct svc_xpt_user {
1: -	struct list_head list;
1: -	void (*callback)(struct svc_xpt_user *);
1: +  struct list_head list;
1: +  void (*callback)(struct svc_xpt_user *);
1:  };
1:  
1: -typedef struct rpc_xprt * (*xprt_switch_find_xprt_t)(struct rpc_xprt_switch *, const struct rpc_xprt *);
1: +typedef struct rpc_xprt *(*xprt_switch_find_xprt_t)(struct rpc_xprt_switch *,
1: +                                                    const struct rpc_xprt *);
1:  
1:  struct _strp_msg {
1: -	struct strp_msg strp;
1: -	int accum_len;
1: +  struct strp_msg strp;
1: +  int accum_len;
1:  };
1:  
1:  struct vlan_group {
1: -	unsigned int nr_vlan_devs;
1: -	struct hlist_node hlist;
1: -	struct net_device **vlan_devices_arrays[16];
1: +  unsigned int nr_vlan_devs;
1: +  struct hlist_node hlist;
1: +  struct net_device **vlan_devices_arrays[16];
1:  };
1:  
1:  struct vlan_info {
1: -	struct net_device *real_dev;
1: -	struct vlan_group grp;
1: -	struct list_head vid_list;
1: -	unsigned int nr_vids;
1: -	struct callback_head rcu;
1: +  struct net_device *real_dev;
1: +  struct vlan_group grp;
1: +  struct list_head vid_list;
1: +  unsigned int nr_vids;
1: +  struct callback_head rcu;
1:  };
1:  
1:  enum vlan_protos {
1: -	VLAN_PROTO_8021Q = 0,
1: -	VLAN_PROTO_8021AD = 1,
1: -	VLAN_PROTO_NUM = 2,
1: +  VLAN_PROTO_8021Q = 0,
1: +  VLAN_PROTO_8021AD = 1,
1: +  VLAN_PROTO_NUM = 2,
1:  };
1:  
1:  struct vlan_vid_info {
1: -	struct list_head list;
1: -	__be16 proto;
1: -	u16 vid;
1: -	int refcount;
1: +  struct list_head list;
1: +  __be16 proto;
1: +  u16 vid;
1: +  int refcount;
1:  };
1:  
1:  enum vlan_ioctl_cmds {
1: -	ADD_VLAN_CMD = 0,
1: -	DEL_VLAN_CMD = 1,
1: -	SET_VLAN_INGRESS_PRIORITY_CMD = 2,
1: -	SET_VLAN_EGRESS_PRIORITY_CMD = 3,
1: -	GET_VLAN_INGRESS_PRIORITY_CMD = 4,
1: -	GET_VLAN_EGRESS_PRIORITY_CMD = 5,
1: -	SET_VLAN_NAME_TYPE_CMD = 6,
1: -	SET_VLAN_FLAG_CMD = 7,
1: -	GET_VLAN_REALDEV_NAME_CMD = 8,
1: -	GET_VLAN_VID_CMD = 9,
1: +  ADD_VLAN_CMD = 0,
1: +  DEL_VLAN_CMD = 1,
1: +  SET_VLAN_INGRESS_PRIORITY_CMD = 2,
1: +  SET_VLAN_EGRESS_PRIORITY_CMD = 3,
1: +  GET_VLAN_INGRESS_PRIORITY_CMD = 4,
1: +  GET_VLAN_EGRESS_PRIORITY_CMD = 5,
1: +  SET_VLAN_NAME_TYPE_CMD = 6,
1: +  SET_VLAN_FLAG_CMD = 7,
1: +  GET_VLAN_REALDEV_NAME_CMD = 8,
1: +  GET_VLAN_VID_CMD = 9,
1:  };
1:  
1:  enum vlan_name_types {
1: -	VLAN_NAME_TYPE_PLUS_VID = 0,
1: -	VLAN_NAME_TYPE_RAW_PLUS_VID = 1,
1: -	VLAN_NAME_TYPE_PLUS_VID_NO_PAD = 2,
1: -	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD = 3,
1: -	VLAN_NAME_TYPE_HIGHEST = 4,
1: +  VLAN_NAME_TYPE_PLUS_VID = 0,
1: +  VLAN_NAME_TYPE_RAW_PLUS_VID = 1,
1: +  VLAN_NAME_TYPE_PLUS_VID_NO_PAD = 2,
1: +  VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD = 3,
1: +  VLAN_NAME_TYPE_HIGHEST = 4,
1:  };
1:  
1:  struct vlan_ioctl_args {
1: -	int cmd;
1: -	char device1[24];
1: -	union {
1: -		char device2[24];
1: -		int VID;
1: -		unsigned int skb_priority;
1: -		unsigned int name_type;
1: -		unsigned int bind_type;
1: -		unsigned int flag;
1: -	} u;
1: -	short int vlan_qos;
1: +  int cmd;
1: +  char device1[24];
1: +  union {
1: +    char device2[24];
1: +    int VID;
1: +    unsigned int skb_priority;
1: +    unsigned int name_type;
1: +    unsigned int bind_type;
1: +    unsigned int flag;
1: +  } u;
1: +  short int vlan_qos;
1:  };
1:  
1:  struct vlan_net {
1: -	struct proc_dir_entry *proc_vlan_dir;
1: -	struct proc_dir_entry *proc_vlan_conf;
1: -	short unsigned int name_type;
1: +  struct proc_dir_entry *proc_vlan_dir;
1: +  struct proc_dir_entry *proc_vlan_conf;
1: +  short unsigned int name_type;
1:  };
1:  
1:  enum {
1: -	IFLA_VLAN_UNSPEC = 0,
1: -	IFLA_VLAN_ID = 1,
1: -	IFLA_VLAN_FLAGS = 2,
1: -	IFLA_VLAN_EGRESS_QOS = 3,
1: -	IFLA_VLAN_INGRESS_QOS = 4,
1: -	IFLA_VLAN_PROTOCOL = 5,
1: -	__IFLA_VLAN_MAX = 6,
1: +  IFLA_VLAN_UNSPEC = 0,
1: +  IFLA_VLAN_ID = 1,
1: +  IFLA_VLAN_FLAGS = 2,
1: +  IFLA_VLAN_EGRESS_QOS = 3,
1: +  IFLA_VLAN_INGRESS_QOS = 4,
1: +  IFLA_VLAN_PROTOCOL = 5,
1: +  __IFLA_VLAN_MAX = 6,
1:  };
1:  
1:  struct ifla_vlan_flags {
1: -	__u32 flags;
1: -	__u32 mask;
1: +  __u32 flags;
1: +  __u32 mask;
1:  };
1:  
1:  enum {
1: -	IFLA_VLAN_QOS_UNSPEC = 0,
1: -	IFLA_VLAN_QOS_MAPPING = 1,
1: -	__IFLA_VLAN_QOS_MAX = 2,
1: +  IFLA_VLAN_QOS_UNSPEC = 0,
1: +  IFLA_VLAN_QOS_MAPPING = 1,
1: +  __IFLA_VLAN_QOS_MAX = 2,
1:  };
1:  
1:  struct ifla_vlan_qos_mapping {
1: -	__u32 from;
1: -	__u32 to;
1: +  __u32 from;
1: +  __u32 to;
1:  };
1:  
1:  enum nl80211_commands {
1: -	NL80211_CMD_UNSPEC = 0,
1: -	NL80211_CMD_GET_WIPHY = 1,
1: -	NL80211_CMD_SET_WIPHY = 2,
1: -	NL80211_CMD_NEW_WIPHY = 3,
1: -	NL80211_CMD_DEL_WIPHY = 4,
1: -	NL80211_CMD_GET_INTERFACE = 5,
1: -	NL80211_CMD_SET_INTERFACE = 6,
1: -	NL80211_CMD_NEW_INTERFACE = 7,
1: -	NL80211_CMD_DEL_INTERFACE = 8,
1: -	NL80211_CMD_GET_KEY = 9,
1: -	NL80211_CMD_SET_KEY = 10,
1: -	NL80211_CMD_NEW_KEY = 11,
1: -	NL80211_CMD_DEL_KEY = 12,
1: -	NL80211_CMD_GET_BEACON = 13,
1: -	NL80211_CMD_SET_BEACON = 14,
1: -	NL80211_CMD_START_AP = 15,
1: -	NL80211_CMD_NEW_BEACON = 15,
1: -	NL80211_CMD_STOP_AP = 16,
1: -	NL80211_CMD_DEL_BEACON = 16,
1: -	NL80211_CMD_GET_STATION = 17,
1: -	NL80211_CMD_SET_STATION = 18,
1: -	NL80211_CMD_NEW_STATION = 19,
1: -	NL80211_CMD_DEL_STATION = 20,
1: -	NL80211_CMD_GET_MPATH = 21,
1: -	NL80211_CMD_SET_MPATH = 22,
1: -	NL80211_CMD_NEW_MPATH = 23,
1: -	NL80211_CMD_DEL_MPATH = 24,
1: -	NL80211_CMD_SET_BSS = 25,
1: -	NL80211_CMD_SET_REG = 26,
1: -	NL80211_CMD_REQ_SET_REG = 27,
1: -	NL80211_CMD_GET_MESH_CONFIG = 28,
1: -	NL80211_CMD_SET_MESH_CONFIG = 29,
1: -	NL80211_CMD_SET_MGMT_EXTRA_IE = 30,
1: -	NL80211_CMD_GET_REG = 31,
1: -	NL80211_CMD_GET_SCAN = 32,
1: -	NL80211_CMD_TRIGGER_SCAN = 33,
1: -	NL80211_CMD_NEW_SCAN_RESULTS = 34,
1: -	NL80211_CMD_SCAN_ABORTED = 35,
1: -	NL80211_CMD_REG_CHANGE = 36,
1: -	NL80211_CMD_AUTHENTICATE = 37,
1: -	NL80211_CMD_ASSOCIATE = 38,
1: -	NL80211_CMD_DEAUTHENTICATE = 39,
1: -	NL80211_CMD_DISASSOCIATE = 40,
1: -	NL80211_CMD_MICHAEL_MIC_FAILURE = 41,
1: -	NL80211_CMD_REG_BEACON_HINT = 42,
1: -	NL80211_CMD_JOIN_IBSS = 43,
1: -	NL80211_CMD_LEAVE_IBSS = 44,
1: -	NL80211_CMD_TESTMODE = 45,
1: -	NL80211_CMD_CONNECT = 46,
1: -	NL80211_CMD_ROAM = 47,
1: -	NL80211_CMD_DISCONNECT = 48,
1: -	NL80211_CMD_SET_WIPHY_NETNS = 49,
1: -	NL80211_CMD_GET_SURVEY = 50,
1: -	NL80211_CMD_NEW_SURVEY_RESULTS = 51,
1: -	NL80211_CMD_SET_PMKSA = 52,
1: -	NL80211_CMD_DEL_PMKSA = 53,
1: -	NL80211_CMD_FLUSH_PMKSA = 54,
1: -	NL80211_CMD_REMAIN_ON_CHANNEL = 55,
1: -	NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL = 56,
1: -	NL80211_CMD_SET_TX_BITRATE_MASK = 57,
1: -	NL80211_CMD_REGISTER_FRAME = 58,
1: -	NL80211_CMD_REGISTER_ACTION = 58,
1: -	NL80211_CMD_FRAME = 59,
1: -	NL80211_CMD_ACTION = 59,
1: -	NL80211_CMD_FRAME_TX_STATUS = 60,
1: -	NL80211_CMD_ACTION_TX_STATUS = 60,
1: -	NL80211_CMD_SET_POWER_SAVE = 61,
1: -	NL80211_CMD_GET_POWER_SAVE = 62,
1: -	NL80211_CMD_SET_CQM = 63,
1: -	NL80211_CMD_NOTIFY_CQM = 64,
1: -	NL80211_CMD_SET_CHANNEL = 65,
1: -	NL80211_CMD_SET_WDS_PEER = 66,
1: -	NL80211_CMD_FRAME_WAIT_CANCEL = 67,
1: -	NL80211_CMD_JOIN_MESH = 68,
1: -	NL80211_CMD_LEAVE_MESH = 69,
1: -	NL80211_CMD_UNPROT_DEAUTHENTICATE = 70,
1: -	NL80211_CMD_UNPROT_DISASSOCIATE = 71,
1: -	NL80211_CMD_NEW_PEER_CANDIDATE = 72,
1: -	NL80211_CMD_GET_WOWLAN = 73,
1: -	NL80211_CMD_SET_WOWLAN = 74,
1: -	NL80211_CMD_START_SCHED_SCAN = 75,
1: -	NL80211_CMD_STOP_SCHED_SCAN = 76,
1: -	NL80211_CMD_SCHED_SCAN_RESULTS = 77,
1: -	NL80211_CMD_SCHED_SCAN_STOPPED = 78,
1: -	NL80211_CMD_SET_REKEY_OFFLOAD = 79,
1: -	NL80211_CMD_PMKSA_CANDIDATE = 80,
1: -	NL80211_CMD_TDLS_OPER = 81,
1: -	NL80211_CMD_TDLS_MGMT = 82,
1: -	NL80211_CMD_UNEXPECTED_FRAME = 83,
1: -	NL80211_CMD_PROBE_CLIENT = 84,
1: -	NL80211_CMD_REGISTER_BEACONS = 85,
1: -	NL80211_CMD_UNEXPECTED_4ADDR_FRAME = 86,
1: -	NL80211_CMD_SET_NOACK_MAP = 87,
1: -	NL80211_CMD_CH_SWITCH_NOTIFY = 88,
1: -	NL80211_CMD_START_P2P_DEVICE = 89,
1: -	NL80211_CMD_STOP_P2P_DEVICE = 90,
1: -	NL80211_CMD_CONN_FAILED = 91,
1: -	NL80211_CMD_SET_MCAST_RATE = 92,
1: -	NL80211_CMD_SET_MAC_ACL = 93,
1: -	NL80211_CMD_RADAR_DETECT = 94,
1: -	NL80211_CMD_GET_PROTOCOL_FEATURES = 95,
1: -	NL80211_CMD_UPDATE_FT_IES = 96,
1: -	NL80211_CMD_FT_EVENT = 97,
1: -	NL80211_CMD_CRIT_PROTOCOL_START = 98,
1: -	NL80211_CMD_CRIT_PROTOCOL_STOP = 99,
1: -	NL80211_CMD_GET_COALESCE = 100,
1: -	NL80211_CMD_SET_COALESCE = 101,
1: -	NL80211_CMD_CHANNEL_SWITCH = 102,
1: -	NL80211_CMD_VENDOR = 103,
1: -	NL80211_CMD_SET_QOS_MAP = 104,
1: -	NL80211_CMD_ADD_TX_TS = 105,
1: -	NL80211_CMD_DEL_TX_TS = 106,
1: -	NL80211_CMD_GET_MPP = 107,
1: -	NL80211_CMD_JOIN_OCB = 108,
1: -	NL80211_CMD_LEAVE_OCB = 109,
1: -	NL80211_CMD_CH_SWITCH_STARTED_NOTIFY = 110,
1: -	NL80211_CMD_TDLS_CHANNEL_SWITCH = 111,
1: -	NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH = 112,
1: -	NL80211_CMD_WIPHY_REG_CHANGE = 113,
1: -	NL80211_CMD_ABORT_SCAN = 114,
1: -	NL80211_CMD_START_NAN = 115,
1: -	NL80211_CMD_STOP_NAN = 116,
1: -	NL80211_CMD_ADD_NAN_FUNCTION = 117,
1: -	NL80211_CMD_DEL_NAN_FUNCTION = 118,
1: -	NL80211_CMD_CHANGE_NAN_CONFIG = 119,
1: -	NL80211_CMD_NAN_MATCH = 120,
1: -	NL80211_CMD_SET_MULTICAST_TO_UNICAST = 121,
1: -	NL80211_CMD_UPDATE_CONNECT_PARAMS = 122,
1: -	NL80211_CMD_SET_PMK = 123,
1: -	NL80211_CMD_DEL_PMK = 124,
1: -	NL80211_CMD_PORT_AUTHORIZED = 125,
1: -	NL80211_CMD_RELOAD_REGDB = 126,
1: -	NL80211_CMD_EXTERNAL_AUTH = 127,
1: -	NL80211_CMD_STA_OPMODE_CHANGED = 128,
1: -	NL80211_CMD_CONTROL_PORT_FRAME = 129,
1: -	NL80211_CMD_GET_FTM_RESPONDER_STATS = 130,
1: -	NL80211_CMD_PEER_MEASUREMENT_START = 131,
1: -	NL80211_CMD_PEER_MEASUREMENT_RESULT = 132,
1: -	NL80211_CMD_PEER_MEASUREMENT_COMPLETE = 133,
1: -	NL80211_CMD_NOTIFY_RADAR = 134,
1: -	NL80211_CMD_UPDATE_OWE_INFO = 135,
1: -	NL80211_CMD_PROBE_MESH_LINK = 136,
1: -	NL80211_CMD_SET_TID_CONFIG = 137,
1: -	NL80211_CMD_UNPROT_BEACON = 138,
1: -	NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS = 139,
1: -	__NL80211_CMD_AFTER_LAST = 140,
1: -	NL80211_CMD_MAX = 139,
1: +  NL80211_CMD_UNSPEC = 0,
1: +  NL80211_CMD_GET_WIPHY = 1,
1: +  NL80211_CMD_SET_WIPHY = 2,
1: +  NL80211_CMD_NEW_WIPHY = 3,
1: +  NL80211_CMD_DEL_WIPHY = 4,
1: +  NL80211_CMD_GET_INTERFACE = 5,
1: +  NL80211_CMD_SET_INTERFACE = 6,
1: +  NL80211_CMD_NEW_INTERFACE = 7,
1: +  NL80211_CMD_DEL_INTERFACE = 8,
1: +  NL80211_CMD_GET_KEY = 9,
1: +  NL80211_CMD_SET_KEY = 10,
1: +  NL80211_CMD_NEW_KEY = 11,
1: +  NL80211_CMD_DEL_KEY = 12,
1: +  NL80211_CMD_GET_BEACON = 13,
1: +  NL80211_CMD_SET_BEACON = 14,
1: +  NL80211_CMD_START_AP = 15,
1: +  NL80211_CMD_NEW_BEACON = 15,
1: +  NL80211_CMD_STOP_AP = 16,
1: +  NL80211_CMD_DEL_BEACON = 16,
1: +  NL80211_CMD_GET_STATION = 17,
1: +  NL80211_CMD_SET_STATION = 18,
1: +  NL80211_CMD_NEW_STATION = 19,
1: +  NL80211_CMD_DEL_STATION = 20,
1: +  NL80211_CMD_GET_MPATH = 21,
1: +  NL80211_CMD_SET_MPATH = 22,
1: +  NL80211_CMD_NEW_MPATH = 23,
1: +  NL80211_CMD_DEL_MPATH = 24,
1: +  NL80211_CMD_SET_BSS = 25,
1: +  NL80211_CMD_SET_REG = 26,
1: +  NL80211_CMD_REQ_SET_REG = 27,
1: +  NL80211_CMD_GET_MESH_CONFIG = 28,
1: +  NL80211_CMD_SET_MESH_CONFIG = 29,
1: +  NL80211_CMD_SET_MGMT_EXTRA_IE = 30,
1: +  NL80211_CMD_GET_REG = 31,
1: +  NL80211_CMD_GET_SCAN = 32,
1: +  NL80211_CMD_TRIGGER_SCAN = 33,
1: +  NL80211_CMD_NEW_SCAN_RESULTS = 34,
1: +  NL80211_CMD_SCAN_ABORTED = 35,
1: +  NL80211_CMD_REG_CHANGE = 36,
1: +  NL80211_CMD_AUTHENTICATE = 37,
1: +  NL80211_CMD_ASSOCIATE = 38,
1: +  NL80211_CMD_DEAUTHENTICATE = 39,
1: +  NL80211_CMD_DISASSOCIATE = 40,
1: +  NL80211_CMD_MICHAEL_MIC_FAILURE = 41,
1: +  NL80211_CMD_REG_BEACON_HINT = 42,
1: +  NL80211_CMD_JOIN_IBSS = 43,
1: +  NL80211_CMD_LEAVE_IBSS = 44,
1: +  NL80211_CMD_TESTMODE = 45,
1: +  NL80211_CMD_CONNECT = 46,
1: +  NL80211_CMD_ROAM = 47,
1: +  NL80211_CMD_DISCONNECT = 48,
1: +  NL80211_CMD_SET_WIPHY_NETNS = 49,
1: +  NL80211_CMD_GET_SURVEY = 50,
1: +  NL80211_CMD_NEW_SURVEY_RESULTS = 51,
1: +  NL80211_CMD_SET_PMKSA = 52,
1: +  NL80211_CMD_DEL_PMKSA = 53,
1: +  NL80211_CMD_FLUSH_PMKSA = 54,
1: +  NL80211_CMD_REMAIN_ON_CHANNEL = 55,
1: +  NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL = 56,
1: +  NL80211_CMD_SET_TX_BITRATE_MASK = 57,
1: +  NL80211_CMD_REGISTER_FRAME = 58,
1: +  NL80211_CMD_REGISTER_ACTION = 58,
1: +  NL80211_CMD_FRAME = 59,
1: +  NL80211_CMD_ACTION = 59,
1: +  NL80211_CMD_FRAME_TX_STATUS = 60,
1: +  NL80211_CMD_ACTION_TX_STATUS = 60,
1: +  NL80211_CMD_SET_POWER_SAVE = 61,
1: +  NL80211_CMD_GET_POWER_SAVE = 62,
1: +  NL80211_CMD_SET_CQM = 63,
1: +  NL80211_CMD_NOTIFY_CQM = 64,
1: +  NL80211_CMD_SET_CHANNEL = 65,
1: +  NL80211_CMD_SET_WDS_PEER = 66,
1: +  NL80211_CMD_FRAME_WAIT_CANCEL = 67,
1: +  NL80211_CMD_JOIN_MESH = 68,
1: +  NL80211_CMD_LEAVE_MESH = 69,
1: +  NL80211_CMD_UNPROT_DEAUTHENTICATE = 70,
1: +  NL80211_CMD_UNPROT_DISASSOCIATE = 71,
1: +  NL80211_CMD_NEW_PEER_CANDIDATE = 72,
1: +  NL80211_CMD_GET_WOWLAN = 73,
1: +  NL80211_CMD_SET_WOWLAN = 74,
1: +  NL80211_CMD_START_SCHED_SCAN = 75,
1: +  NL80211_CMD_STOP_SCHED_SCAN = 76,
1: +  NL80211_CMD_SCHED_SCAN_RESULTS = 77,
1: +  NL80211_CMD_SCHED_SCAN_STOPPED = 78,
1: +  NL80211_CMD_SET_REKEY_OFFLOAD = 79,
1: +  NL80211_CMD_PMKSA_CANDIDATE = 80,
1: +  NL80211_CMD_TDLS_OPER = 81,
1: +  NL80211_CMD_TDLS_MGMT = 82,
1: +  NL80211_CMD_UNEXPECTED_FRAME = 83,
1: +  NL80211_CMD_PROBE_CLIENT = 84,
1: +  NL80211_CMD_REGISTER_BEACONS = 85,
1: +  NL80211_CMD_UNEXPECTED_4ADDR_FRAME = 86,
1: +  NL80211_CMD_SET_NOACK_MAP = 87,
1: +  NL80211_CMD_CH_SWITCH_NOTIFY = 88,
1: +  NL80211_CMD_START_P2P_DEVICE = 89,
1: +  NL80211_CMD_STOP_P2P_DEVICE = 90,
1: +  NL80211_CMD_CONN_FAILED = 91,
1: +  NL80211_CMD_SET_MCAST_RATE = 92,
1: +  NL80211_CMD_SET_MAC_ACL = 93,
1: +  NL80211_CMD_RADAR_DETECT = 94,
1: +  NL80211_CMD_GET_PROTOCOL_FEATURES = 95,
1: +  NL80211_CMD_UPDATE_FT_IES = 96,
1: +  NL80211_CMD_FT_EVENT = 97,
1: +  NL80211_CMD_CRIT_PROTOCOL_START = 98,
1: +  NL80211_CMD_CRIT_PROTOCOL_STOP = 99,
1: +  NL80211_CMD_GET_COALESCE = 100,
1: +  NL80211_CMD_SET_COALESCE = 101,
1: +  NL80211_CMD_CHANNEL_SWITCH = 102,
1: +  NL80211_CMD_VENDOR = 103,
1: +  NL80211_CMD_SET_QOS_MAP = 104,
1: +  NL80211_CMD_ADD_TX_TS = 105,
1: +  NL80211_CMD_DEL_TX_TS = 106,
1: +  NL80211_CMD_GET_MPP = 107,
1: +  NL80211_CMD_JOIN_OCB = 108,
1: +  NL80211_CMD_LEAVE_OCB = 109,
1: +  NL80211_CMD_CH_SWITCH_STARTED_NOTIFY = 110,
1: +  NL80211_CMD_TDLS_CHANNEL_SWITCH = 111,
1: +  NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH = 112,
1: +  NL80211_CMD_WIPHY_REG_CHANGE = 113,
1: +  NL80211_CMD_ABORT_SCAN = 114,
1: +  NL80211_CMD_START_NAN = 115,
1: +  NL80211_CMD_STOP_NAN = 116,
1: +  NL80211_CMD_ADD_NAN_FUNCTION = 117,
1: +  NL80211_CMD_DEL_NAN_FUNCTION = 118,
1: +  NL80211_CMD_CHANGE_NAN_CONFIG = 119,
1: +  NL80211_CMD_NAN_MATCH = 120,
1: +  NL80211_CMD_SET_MULTICAST_TO_UNICAST = 121,
1: +  NL80211_CMD_UPDATE_CONNECT_PARAMS = 122,
1: +  NL80211_CMD_SET_PMK = 123,
1: +  NL80211_CMD_DEL_PMK = 124,
1: +  NL80211_CMD_PORT_AUTHORIZED = 125,
1: +  NL80211_CMD_RELOAD_REGDB = 126,
1: +  NL80211_CMD_EXTERNAL_AUTH = 127,
1: +  NL80211_CMD_STA_OPMODE_CHANGED = 128,
1: +  NL80211_CMD_CONTROL_PORT_FRAME = 129,
1: +  NL80211_CMD_GET_FTM_RESPONDER_STATS = 130,
1: +  NL80211_CMD_PEER_MEASUREMENT_START = 131,
1: +  NL80211_CMD_PEER_MEASUREMENT_RESULT = 132,
1: +  NL80211_CMD_PEER_MEASUREMENT_COMPLETE = 133,
1: +  NL80211_CMD_NOTIFY_RADAR = 134,
1: +  NL80211_CMD_UPDATE_OWE_INFO = 135,
1: +  NL80211_CMD_PROBE_MESH_LINK = 136,
1: +  NL80211_CMD_SET_TID_CONFIG = 137,
1: +  NL80211_CMD_UNPROT_BEACON = 138,
1: +  NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS = 139,
1: +  __NL80211_CMD_AFTER_LAST = 140,
1: +  NL80211_CMD_MAX = 139,
1:  };
1:  
1:  enum nl80211_iftype {
1: -	NL80211_IFTYPE_UNSPECIFIED = 0,
1: -	NL80211_IFTYPE_ADHOC = 1,
1: -	NL80211_IFTYPE_STATION = 2,
1: -	NL80211_IFTYPE_AP = 3,
1: -	NL80211_IFTYPE_AP_VLAN = 4,
1: -	NL80211_IFTYPE_WDS = 5,
1: -	NL80211_IFTYPE_MONITOR = 6,
1: -	NL80211_IFTYPE_MESH_POINT = 7,
1: -	NL80211_IFTYPE_P2P_CLIENT = 8,
1: -	NL80211_IFTYPE_P2P_GO = 9,
1: -	NL80211_IFTYPE_P2P_DEVICE = 10,
1: -	NL80211_IFTYPE_OCB = 11,
1: -	NL80211_IFTYPE_NAN = 12,
1: -	NUM_NL80211_IFTYPES = 13,
1: -	NL80211_IFTYPE_MAX = 12,
1: +  NL80211_IFTYPE_UNSPECIFIED = 0,
1: +  NL80211_IFTYPE_ADHOC = 1,
1: +  NL80211_IFTYPE_STATION = 2,
1: +  NL80211_IFTYPE_AP = 3,
1: +  NL80211_IFTYPE_AP_VLAN = 4,
1: +  NL80211_IFTYPE_WDS = 5,
1: +  NL80211_IFTYPE_MONITOR = 6,
1: +  NL80211_IFTYPE_MESH_POINT = 7,
1: +  NL80211_IFTYPE_P2P_CLIENT = 8,
1: +  NL80211_IFTYPE_P2P_GO = 9,
1: +  NL80211_IFTYPE_P2P_DEVICE = 10,
1: +  NL80211_IFTYPE_OCB = 11,
1: +  NL80211_IFTYPE_NAN = 12,
1: +  NUM_NL80211_IFTYPES = 13,
1: +  NL80211_IFTYPE_MAX = 12,
1:  };
1:  
1:  struct nl80211_sta_flag_update {
1: -	__u32 mask;
1: -	__u32 set;
1: +  __u32 mask;
1: +  __u32 set;
1:  };
1:  
1:  enum nl80211_he_gi {
1: -	NL80211_RATE_INFO_HE_GI_0_8 = 0,
1: -	NL80211_RATE_INFO_HE_GI_1_6 = 1,
1: -	NL80211_RATE_INFO_HE_GI_3_2 = 2,
1: +  NL80211_RATE_INFO_HE_GI_0_8 = 0,
1: +  NL80211_RATE_INFO_HE_GI_1_6 = 1,
1: +  NL80211_RATE_INFO_HE_GI_3_2 = 2,
1:  };
1:  
1:  enum nl80211_he_ltf {
1: -	NL80211_RATE_INFO_HE_1XLTF = 0,
1: -	NL80211_RATE_INFO_HE_2XLTF = 1,
1: -	NL80211_RATE_INFO_HE_4XLTF = 2,
1: +  NL80211_RATE_INFO_HE_1XLTF = 0,
1: +  NL80211_RATE_INFO_HE_2XLTF = 1,
1: +  NL80211_RATE_INFO_HE_4XLTF = 2,
1:  };
1:  
1:  enum nl80211_reg_initiator {
1: -	NL80211_REGDOM_SET_BY_CORE = 0,
1: -	NL80211_REGDOM_SET_BY_USER = 1,
1: -	NL80211_REGDOM_SET_BY_DRIVER = 2,
1: -	NL80211_REGDOM_SET_BY_COUNTRY_IE = 3,
1: +  NL80211_REGDOM_SET_BY_CORE = 0,
1: +  NL80211_REGDOM_SET_BY_USER = 1,
1: +  NL80211_REGDOM_SET_BY_DRIVER = 2,
1: +  NL80211_REGDOM_SET_BY_COUNTRY_IE = 3,
1:  };
1:  
1:  enum nl80211_dfs_regions {
1: -	NL80211_DFS_UNSET = 0,
1: -	NL80211_DFS_FCC = 1,
1: -	NL80211_DFS_ETSI = 2,
1: -	NL80211_DFS_JP = 3,
1: +  NL80211_DFS_UNSET = 0,
1: +  NL80211_DFS_FCC = 1,
1: +  NL80211_DFS_ETSI = 2,
1: +  NL80211_DFS_JP = 3,
1:  };
1:  
1:  enum nl80211_user_reg_hint_type {
1: -	NL80211_USER_REG_HINT_USER = 0,
1: -	NL80211_USER_REG_HINT_CELL_BASE = 1,
1: -	NL80211_USER_REG_HINT_INDOOR = 2,
1: +  NL80211_USER_REG_HINT_USER = 0,
1: +  NL80211_USER_REG_HINT_CELL_BASE = 1,
1: +  NL80211_USER_REG_HINT_INDOOR = 2,
1:  };
1:  
1:  enum nl80211_mntr_flags {
1: -	__NL80211_MNTR_FLAG_INVALID = 0,
1: -	NL80211_MNTR_FLAG_FCSFAIL = 1,
1: -	NL80211_MNTR_FLAG_PLCPFAIL = 2,
1: -	NL80211_MNTR_FLAG_CONTROL = 3,
1: -	NL80211_MNTR_FLAG_OTHER_BSS = 4,
1: -	NL80211_MNTR_FLAG_COOK_FRAMES = 5,
1: -	NL80211_MNTR_FLAG_ACTIVE = 6,
1: -	__NL80211_MNTR_FLAG_AFTER_LAST = 7,
1: -	NL80211_MNTR_FLAG_MAX = 6,
1: +  __NL80211_MNTR_FLAG_INVALID = 0,
1: +  NL80211_MNTR_FLAG_FCSFAIL = 1,
1: +  NL80211_MNTR_FLAG_PLCPFAIL = 2,
1: +  NL80211_MNTR_FLAG_CONTROL = 3,
1: +  NL80211_MNTR_FLAG_OTHER_BSS = 4,
1: +  NL80211_MNTR_FLAG_COOK_FRAMES = 5,
1: +  NL80211_MNTR_FLAG_ACTIVE = 6,
1: +  __NL80211_MNTR_FLAG_AFTER_LAST = 7,
1: +  NL80211_MNTR_FLAG_MAX = 6,
1:  };
1:  
1:  enum nl80211_mesh_power_mode {
1: -	NL80211_MESH_POWER_UNKNOWN = 0,
1: -	NL80211_MESH_POWER_ACTIVE = 1,
1: -	NL80211_MESH_POWER_LIGHT_SLEEP = 2,
1: -	NL80211_MESH_POWER_DEEP_SLEEP = 3,
1: -	__NL80211_MESH_POWER_AFTER_LAST = 4,
1: -	NL80211_MESH_POWER_MAX = 3,
1: +  NL80211_MESH_POWER_UNKNOWN = 0,
1: +  NL80211_MESH_POWER_ACTIVE = 1,
1: +  NL80211_MESH_POWER_LIGHT_SLEEP = 2,
1: +  NL80211_MESH_POWER_DEEP_SLEEP = 3,
1: +  __NL80211_MESH_POWER_AFTER_LAST = 4,
1: +  NL80211_MESH_POWER_MAX = 3,
1:  };
1:  
1:  enum nl80211_ac {
1: -	NL80211_AC_VO = 0,
1: -	NL80211_AC_VI = 1,
1: -	NL80211_AC_BE = 2,
1: -	NL80211_AC_BK = 3,
1: -	NL80211_NUM_ACS = 4,
1: +  NL80211_AC_VO = 0,
1: +  NL80211_AC_VI = 1,
1: +  NL80211_AC_BE = 2,
1: +  NL80211_AC_BK = 3,
1: +  NL80211_NUM_ACS = 4,
1:  };
1:  
1:  enum nl80211_key_mode {
1: -	NL80211_KEY_RX_TX = 0,
1: -	NL80211_KEY_NO_TX = 1,
1: -	NL80211_KEY_SET_TX = 2,
1: +  NL80211_KEY_RX_TX = 0,
1: +  NL80211_KEY_NO_TX = 1,
1: +  NL80211_KEY_SET_TX = 2,
1:  };
1:  
1:  enum nl80211_chan_width {
1: -	NL80211_CHAN_WIDTH_20_NOHT = 0,
1: -	NL80211_CHAN_WIDTH_20 = 1,
1: -	NL80211_CHAN_WIDTH_40 = 2,
1: -	NL80211_CHAN_WIDTH_80 = 3,
1: -	NL80211_CHAN_WIDTH_80P80 = 4,
1: -	NL80211_CHAN_WIDTH_160 = 5,
1: -	NL80211_CHAN_WIDTH_5 = 6,
1: -	NL80211_CHAN_WIDTH_10 = 7,
1: -	NL80211_CHAN_WIDTH_1 = 8,
1: -	NL80211_CHAN_WIDTH_2 = 9,
1: -	NL80211_CHAN_WIDTH_4 = 10,
1: -	NL80211_CHAN_WIDTH_8 = 11,
1: -	NL80211_CHAN_WIDTH_16 = 12,
1: +  NL80211_CHAN_WIDTH_20_NOHT = 0,
1: +  NL80211_CHAN_WIDTH_20 = 1,
1: +  NL80211_CHAN_WIDTH_40 = 2,
1: +  NL80211_CHAN_WIDTH_80 = 3,
1: +  NL80211_CHAN_WIDTH_80P80 = 4,
1: +  NL80211_CHAN_WIDTH_160 = 5,
1: +  NL80211_CHAN_WIDTH_5 = 6,
1: +  NL80211_CHAN_WIDTH_10 = 7,
1: +  NL80211_CHAN_WIDTH_1 = 8,
1: +  NL80211_CHAN_WIDTH_2 = 9,
1: +  NL80211_CHAN_WIDTH_4 = 10,
1: +  NL80211_CHAN_WIDTH_8 = 11,
1: +  NL80211_CHAN_WIDTH_16 = 12,
1:  };
1:  
1:  enum nl80211_bss_scan_width {
1: -	NL80211_BSS_CHAN_WIDTH_20 = 0,
1: -	NL80211_BSS_CHAN_WIDTH_10 = 1,
1: -	NL80211_BSS_CHAN_WIDTH_5 = 2,
1: -	NL80211_BSS_CHAN_WIDTH_1 = 3,
1: -	NL80211_BSS_CHAN_WIDTH_2 = 4,
1: +  NL80211_BSS_CHAN_WIDTH_20 = 0,
1: +  NL80211_BSS_CHAN_WIDTH_10 = 1,
1: +  NL80211_BSS_CHAN_WIDTH_5 = 2,
1: +  NL80211_BSS_CHAN_WIDTH_1 = 3,
1: +  NL80211_BSS_CHAN_WIDTH_2 = 4,
1:  };
1:  
1:  enum nl80211_auth_type {
1: -	NL80211_AUTHTYPE_OPEN_SYSTEM = 0,
1: -	NL80211_AUTHTYPE_SHARED_KEY = 1,
1: -	NL80211_AUTHTYPE_FT = 2,
1: -	NL80211_AUTHTYPE_NETWORK_EAP = 3,
1: -	NL80211_AUTHTYPE_SAE = 4,
1: -	NL80211_AUTHTYPE_FILS_SK = 5,
1: -	NL80211_AUTHTYPE_FILS_SK_PFS = 6,
1: -	NL80211_AUTHTYPE_FILS_PK = 7,
1: -	__NL80211_AUTHTYPE_NUM = 8,
1: -	NL80211_AUTHTYPE_MAX = 7,
1: -	NL80211_AUTHTYPE_AUTOMATIC = 8,
1: +  NL80211_AUTHTYPE_OPEN_SYSTEM = 0,
1: +  NL80211_AUTHTYPE_SHARED_KEY = 1,
1: +  NL80211_AUTHTYPE_FT = 2,
1: +  NL80211_AUTHTYPE_NETWORK_EAP = 3,
1: +  NL80211_AUTHTYPE_SAE = 4,
1: +  NL80211_AUTHTYPE_FILS_SK = 5,
1: +  NL80211_AUTHTYPE_FILS_SK_PFS = 6,
1: +  NL80211_AUTHTYPE_FILS_PK = 7,
1: +  __NL80211_AUTHTYPE_NUM = 8,
1: +  NL80211_AUTHTYPE_MAX = 7,
1: +  NL80211_AUTHTYPE_AUTOMATIC = 8,
1:  };
1:  
1:  enum nl80211_mfp {
1: -	NL80211_MFP_NO = 0,
1: -	NL80211_MFP_REQUIRED = 1,
1: -	NL80211_MFP_OPTIONAL = 2,
1: +  NL80211_MFP_NO = 0,
1: +  NL80211_MFP_REQUIRED = 1,
1: +  NL80211_MFP_OPTIONAL = 2,
1:  };
1:  
1:  enum nl80211_txrate_gi {
1: -	NL80211_TXRATE_DEFAULT_GI = 0,
1: -	NL80211_TXRATE_FORCE_SGI = 1,
1: -	NL80211_TXRATE_FORCE_LGI = 2,
1: +  NL80211_TXRATE_DEFAULT_GI = 0,
1: +  NL80211_TXRATE_FORCE_SGI = 1,
1: +  NL80211_TXRATE_FORCE_LGI = 2,
1:  };
1:  
1:  enum nl80211_band {
1: -	NL80211_BAND_2GHZ = 0,
1: -	NL80211_BAND_5GHZ = 1,
1: -	NL80211_BAND_60GHZ = 2,
1: -	NL80211_BAND_6GHZ = 3,
1: -	NL80211_BAND_S1GHZ = 4,
1: -	NUM_NL80211_BANDS = 5,
1: +  NL80211_BAND_2GHZ = 0,
1: +  NL80211_BAND_5GHZ = 1,
1: +  NL80211_BAND_60GHZ = 2,
1: +  NL80211_BAND_6GHZ = 3,
1: +  NL80211_BAND_S1GHZ = 4,
1: +  NUM_NL80211_BANDS = 5,
1:  };
1:  
1:  enum nl80211_tx_power_setting {
1: -	NL80211_TX_POWER_AUTOMATIC = 0,
1: -	NL80211_TX_POWER_LIMITED = 1,
1: -	NL80211_TX_POWER_FIXED = 2,
1: +  NL80211_TX_POWER_AUTOMATIC = 0,
1: +  NL80211_TX_POWER_LIMITED = 1,
1: +  NL80211_TX_POWER_FIXED = 2,
1:  };
1:  
1:  enum nl80211_tid_config {
1: -	NL80211_TID_CONFIG_ENABLE = 0,
1: -	NL80211_TID_CONFIG_DISABLE = 1,
1: +  NL80211_TID_CONFIG_ENABLE = 0,
1: +  NL80211_TID_CONFIG_DISABLE = 1,
1:  };
1:  
1:  enum nl80211_tx_rate_setting {
1: -	NL80211_TX_RATE_AUTOMATIC = 0,
1: -	NL80211_TX_RATE_LIMITED = 1,
1: -	NL80211_TX_RATE_FIXED = 2,
1: +  NL80211_TX_RATE_AUTOMATIC = 0,
1: +  NL80211_TX_RATE_LIMITED = 1,
1: +  NL80211_TX_RATE_FIXED = 2,
1:  };
1:  
1:  struct nl80211_wowlan_tcp_data_seq {
1: -	__u32 start;
1: -	__u32 offset;
1: -	__u32 len;
1: +  __u32 start;
1: +  __u32 offset;
1: +  __u32 len;
1:  };
1:  
1:  struct nl80211_wowlan_tcp_data_token {
1: -	__u32 offset;
1: -	__u32 len;
1: -	__u8 token_stream[0];
1: +  __u32 offset;
1: +  __u32 len;
1: +  __u8 token_stream[0];
1:  };
1:  
1:  struct nl80211_wowlan_tcp_data_token_feature {
1: -	__u32 min_len;
1: -	__u32 max_len;
1: -	__u32 bufsize;
1: +  __u32 min_len;
1: +  __u32 max_len;
1: +  __u32 bufsize;
1:  };
1:  
1:  enum nl80211_coalesce_condition {
1: -	NL80211_COALESCE_CONDITION_MATCH = 0,
1: -	NL80211_COALESCE_CONDITION_NO_MATCH = 1,
1: +  NL80211_COALESCE_CONDITION_MATCH = 0,
1: +  NL80211_COALESCE_CONDITION_NO_MATCH = 1,
1:  };
1:  
1:  enum nl80211_hidden_ssid {
1: -	NL80211_HIDDEN_SSID_NOT_IN_USE = 0,
1: -	NL80211_HIDDEN_SSID_ZERO_LEN = 1,
1: -	NL80211_HIDDEN_SSID_ZERO_CONTENTS = 2,
1: +  NL80211_HIDDEN_SSID_NOT_IN_USE = 0,
1: +  NL80211_HIDDEN_SSID_ZERO_LEN = 1,
1: +  NL80211_HIDDEN_SSID_ZERO_CONTENTS = 2,
1:  };
1:  
1:  enum nl80211_tdls_operation {
1: -	NL80211_TDLS_DISCOVERY_REQ = 0,
1: -	NL80211_TDLS_SETUP = 1,
1: -	NL80211_TDLS_TEARDOWN = 2,
1: -	NL80211_TDLS_ENABLE_LINK = 3,
1: -	NL80211_TDLS_DISABLE_LINK = 4,
1: +  NL80211_TDLS_DISCOVERY_REQ = 0,
1: +  NL80211_TDLS_SETUP = 1,
1: +  NL80211_TDLS_TEARDOWN = 2,
1: +  NL80211_TDLS_ENABLE_LINK = 3,
1: +  NL80211_TDLS_DISABLE_LINK = 4,
1:  };
1:  
1:  enum nl80211_feature_flags {
1: -	NL80211_FEATURE_SK_TX_STATUS = 1,
1: -	NL80211_FEATURE_HT_IBSS = 2,
1: -	NL80211_FEATURE_INACTIVITY_TIMER = 4,
1: -	NL80211_FEATURE_CELL_BASE_REG_HINTS = 8,
1: -	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 16,
1: -	NL80211_FEATURE_SAE = 32,
1: -	NL80211_FEATURE_LOW_PRIORITY_SCAN = 64,
1: -	NL80211_FEATURE_SCAN_FLUSH = 128,
1: -	NL80211_FEATURE_AP_SCAN = 256,
1: -	NL80211_FEATURE_VIF_TXPOWER = 512,
1: -	NL80211_FEATURE_NEED_OBSS_SCAN = 1024,
1: -	NL80211_FEATURE_P2P_GO_CTWIN = 2048,
1: -	NL80211_FEATURE_P2P_GO_OPPPS = 4096,
1: -	NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 16384,
1: -	NL80211_FEATURE_FULL_AP_CLIENT_STATE = 32768,
1: -	NL80211_FEATURE_USERSPACE_MPM = 65536,
1: -	NL80211_FEATURE_ACTIVE_MONITOR = 131072,
1: -	NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE = 262144,
1: -	NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES = 524288,
1: -	NL80211_FEATURE_WFA_TPC_IE_IN_PROBES = 1048576,
1: -	NL80211_FEATURE_QUIET = 2097152,
1: -	NL80211_FEATURE_TX_POWER_INSERTION = 4194304,
1: -	NL80211_FEATURE_ACKTO_ESTIMATION = 8388608,
1: -	NL80211_FEATURE_STATIC_SMPS = 16777216,
1: -	NL80211_FEATURE_DYNAMIC_SMPS = 33554432,
1: -	NL80211_FEATURE_SUPPORTS_WMM_ADMISSION = 67108864,
1: -	NL80211_FEATURE_MAC_ON_CREATE = 134217728,
1: -	NL80211_FEATURE_TDLS_CHANNEL_SWITCH = 268435456,
1: -	NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR = 536870912,
1: -	NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR = 1073741824,
1: -	NL80211_FEATURE_ND_RANDOM_MAC_ADDR = 2147483648,
1: +  NL80211_FEATURE_SK_TX_STATUS = 1,
1: +  NL80211_FEATURE_HT_IBSS = 2,
1: +  NL80211_FEATURE_INACTIVITY_TIMER = 4,
1: +  NL80211_FEATURE_CELL_BASE_REG_HINTS = 8,
1: +  NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 16,
1: +  NL80211_FEATURE_SAE = 32,
1: +  NL80211_FEATURE_LOW_PRIORITY_SCAN = 64,
1: +  NL80211_FEATURE_SCAN_FLUSH = 128,
1: +  NL80211_FEATURE_AP_SCAN = 256,
1: +  NL80211_FEATURE_VIF_TXPOWER = 512,
1: +  NL80211_FEATURE_NEED_OBSS_SCAN = 1024,
1: +  NL80211_FEATURE_P2P_GO_CTWIN = 2048,
1: +  NL80211_FEATURE_P2P_GO_OPPPS = 4096,
1: +  NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 16384,
1: +  NL80211_FEATURE_FULL_AP_CLIENT_STATE = 32768,
1: +  NL80211_FEATURE_USERSPACE_MPM = 65536,
1: +  NL80211_FEATURE_ACTIVE_MONITOR = 131072,
1: +  NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE = 262144,
1: +  NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES = 524288,
1: +  NL80211_FEATURE_WFA_TPC_IE_IN_PROBES = 1048576,
1: +  NL80211_FEATURE_QUIET = 2097152,
1: +  NL80211_FEATURE_TX_POWER_INSERTION = 4194304,
1: +  NL80211_FEATURE_ACKTO_ESTIMATION = 8388608,
1: +  NL80211_FEATURE_STATIC_SMPS = 16777216,
1: +  NL80211_FEATURE_DYNAMIC_SMPS = 33554432,
1: +  NL80211_FEATURE_SUPPORTS_WMM_ADMISSION = 67108864,
1: +  NL80211_FEATURE_MAC_ON_CREATE = 134217728,
1: +  NL80211_FEATURE_TDLS_CHANNEL_SWITCH = 268435456,
1: +  NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR = 536870912,
1: +  NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR = 1073741824,
1: +  NL80211_FEATURE_ND_RANDOM_MAC_ADDR = 2147483648,
1:  };
1:  
1:  enum nl80211_ext_feature_index {
1: -	NL80211_EXT_FEATURE_VHT_IBSS = 0,
1: -	NL80211_EXT_FEATURE_RRM = 1,
1: -	NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER = 2,
1: -	NL80211_EXT_FEATURE_SCAN_START_TIME = 3,
1: -	NL80211_EXT_FEATURE_BSS_PARENT_TSF = 4,
1: -	NL80211_EXT_FEATURE_SET_SCAN_DWELL = 5,
1: -	NL80211_EXT_FEATURE_BEACON_RATE_LEGACY = 6,
1: -	NL80211_EXT_FEATURE_BEACON_RATE_HT = 7,
1: -	NL80211_EXT_FEATURE_BEACON_RATE_VHT = 8,
1: -	NL80211_EXT_FEATURE_FILS_STA = 9,
1: -	NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA = 10,
1: -	NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED = 11,
1: -	NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI = 12,
1: -	NL80211_EXT_FEATURE_CQM_RSSI_LIST = 13,
1: -	NL80211_EXT_FEATURE_FILS_SK_OFFLOAD = 14,
1: -	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK = 15,
1: -	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X = 16,
1: -	NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME = 17,
1: -	NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP = 18,
1: -	NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE = 19,
1: -	NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 20,
1: -	NL80211_EXT_FEATURE_MFP_OPTIONAL = 21,
1: -	NL80211_EXT_FEATURE_LOW_SPAN_SCAN = 22,
1: -	NL80211_EXT_FEATURE_LOW_POWER_SCAN = 23,
1: -	NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN = 24,
1: -	NL80211_EXT_FEATURE_DFS_OFFLOAD = 25,
1: -	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211 = 26,
1: -	NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT = 27,
1: -	NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT = 27,
1: -	NL80211_EXT_FEATURE_TXQS = 28,
1: -	NL80211_EXT_FEATURE_SCAN_RANDOM_SN = 29,
1: -	NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT = 30,
1: -	NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 = 31,
1: -	NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER = 32,
1: -	NL80211_EXT_FEATURE_AIRTIME_FAIRNESS = 33,
1: -	NL80211_EXT_FEATURE_AP_PMKSA_CACHING = 34,
1: -	NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD = 35,
1: -	NL80211_EXT_FEATURE_EXT_KEY_ID = 36,
1: -	NL80211_EXT_FEATURE_STA_TX_PWR = 37,
1: -	NL80211_EXT_FEATURE_SAE_OFFLOAD = 38,
1: -	NL80211_EXT_FEATURE_VLAN_OFFLOAD = 39,
1: -	NL80211_EXT_FEATURE_AQL = 40,
1: -	NL80211_EXT_FEATURE_BEACON_PROTECTION = 41,
1: -	NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH = 42,
1: -	NL80211_EXT_FEATURE_PROTECTED_TWT = 43,
1: -	NL80211_EXT_FEATURE_DEL_IBSS_STA = 44,
1: -	NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS = 45,
1: -	NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT = 46,
1: -	NL80211_EXT_FEATURE_SCAN_FREQ_KHZ = 47,
1: -	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS = 48,
1: -	NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION = 49,
1: -	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK = 50,
1: -	NL80211_EXT_FEATURE_SAE_OFFLOAD_AP = 51,
1: -	NL80211_EXT_FEATURE_FILS_DISCOVERY = 52,
1: -	NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP = 53,
1: -	NL80211_EXT_FEATURE_BEACON_RATE_HE = 54,
1: -	NUM_NL80211_EXT_FEATURES = 55,
1: -	MAX_NL80211_EXT_FEATURES = 54,
1: +  NL80211_EXT_FEATURE_VHT_IBSS = 0,
1: +  NL80211_EXT_FEATURE_RRM = 1,
1: +  NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER = 2,
1: +  NL80211_EXT_FEATURE_SCAN_START_TIME = 3,
1: +  NL80211_EXT_FEATURE_BSS_PARENT_TSF = 4,
1: +  NL80211_EXT_FEATURE_SET_SCAN_DWELL = 5,
1: +  NL80211_EXT_FEATURE_BEACON_RATE_LEGACY = 6,
1: +  NL80211_EXT_FEATURE_BEACON_RATE_HT = 7,
1: +  NL80211_EXT_FEATURE_BEACON_RATE_VHT = 8,
1: +  NL80211_EXT_FEATURE_FILS_STA = 9,
1: +  NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA = 10,
1: +  NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED = 11,
1: +  NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI = 12,
1: +  NL80211_EXT_FEATURE_CQM_RSSI_LIST = 13,
1: +  NL80211_EXT_FEATURE_FILS_SK_OFFLOAD = 14,
1: +  NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK = 15,
1: +  NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X = 16,
1: +  NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME = 17,
1: +  NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP = 18,
1: +  NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE = 19,
1: +  NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 20,
1: +  NL80211_EXT_FEATURE_MFP_OPTIONAL = 21,
1: +  NL80211_EXT_FEATURE_LOW_SPAN_SCAN = 22,
1: +  NL80211_EXT_FEATURE_LOW_POWER_SCAN = 23,
1: +  NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN = 24,
1: +  NL80211_EXT_FEATURE_DFS_OFFLOAD = 25,
1: +  NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211 = 26,
1: +  NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT = 27,
1: +  NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT = 27,
1: +  NL80211_EXT_FEATURE_TXQS = 28,
1: +  NL80211_EXT_FEATURE_SCAN_RANDOM_SN = 29,
1: +  NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT = 30,
1: +  NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 = 31,
1: +  NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER = 32,
1: +  NL80211_EXT_FEATURE_AIRTIME_FAIRNESS = 33,
1: +  NL80211_EXT_FEATURE_AP_PMKSA_CACHING = 34,
1: +  NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD = 35,
1: +  NL80211_EXT_FEATURE_EXT_KEY_ID = 36,
1: +  NL80211_EXT_FEATURE_STA_TX_PWR = 37,
1: +  NL80211_EXT_FEATURE_SAE_OFFLOAD = 38,
1: +  NL80211_EXT_FEATURE_VLAN_OFFLOAD = 39,
1: +  NL80211_EXT_FEATURE_AQL = 40,
1: +  NL80211_EXT_FEATURE_BEACON_PROTECTION = 41,
1: +  NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH = 42,
1: +  NL80211_EXT_FEATURE_PROTECTED_TWT = 43,
1: +  NL80211_EXT_FEATURE_DEL_IBSS_STA = 44,
1: +  NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS = 45,
1: +  NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT = 46,
1: +  NL80211_EXT_FEATURE_SCAN_FREQ_KHZ = 47,
1: +  NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS = 48,
1: +  NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION = 49,
1: +  NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK = 50,
1: +  NL80211_EXT_FEATURE_SAE_OFFLOAD_AP = 51,
1: +  NL80211_EXT_FEATURE_FILS_DISCOVERY = 52,
1: +  NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP = 53,
1: +  NL80211_EXT_FEATURE_BEACON_RATE_HE = 54,
1: +  NUM_NL80211_EXT_FEATURES = 55,
1: +  MAX_NL80211_EXT_FEATURES = 54,
1:  };
1:  
1:  enum nl80211_timeout_reason {
1: -	NL80211_TIMEOUT_UNSPECIFIED = 0,
1: -	NL80211_TIMEOUT_SCAN = 1,
1: -	NL80211_TIMEOUT_AUTH = 2,
1: -	NL80211_TIMEOUT_ASSOC = 3,
1: +  NL80211_TIMEOUT_UNSPECIFIED = 0,
1: +  NL80211_TIMEOUT_SCAN = 1,
1: +  NL80211_TIMEOUT_AUTH = 2,
1: +  NL80211_TIMEOUT_ASSOC = 3,
1:  };
1:  
1:  enum nl80211_acl_policy {
1: -	NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED = 0,
1: -	NL80211_ACL_POLICY_DENY_UNLESS_LISTED = 1,
1: +  NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED = 0,
1: +  NL80211_ACL_POLICY_DENY_UNLESS_LISTED = 1,
1:  };
1:  
1:  enum nl80211_smps_mode {
1: -	NL80211_SMPS_OFF = 0,
1: -	NL80211_SMPS_STATIC = 1,
1: -	NL80211_SMPS_DYNAMIC = 2,
1: -	__NL80211_SMPS_AFTER_LAST = 3,
1: -	NL80211_SMPS_MAX = 2,
1: +  NL80211_SMPS_OFF = 0,
1: +  NL80211_SMPS_STATIC = 1,
1: +  NL80211_SMPS_DYNAMIC = 2,
1: +  __NL80211_SMPS_AFTER_LAST = 3,
1: +  NL80211_SMPS_MAX = 2,
1:  };
1:  
1:  enum nl80211_radar_event {
1: -	NL80211_RADAR_DETECTED = 0,
1: -	NL80211_RADAR_CAC_FINISHED = 1,
1: -	NL80211_RADAR_CAC_ABORTED = 2,
1: -	NL80211_RADAR_NOP_FINISHED = 3,
1: -	NL80211_RADAR_PRE_CAC_EXPIRED = 4,
1: -	NL80211_RADAR_CAC_STARTED = 5,
1: +  NL80211_RADAR_DETECTED = 0,
1: +  NL80211_RADAR_CAC_FINISHED = 1,
1: +  NL80211_RADAR_CAC_ABORTED = 2,
1: +  NL80211_RADAR_NOP_FINISHED = 3,
1: +  NL80211_RADAR_PRE_CAC_EXPIRED = 4,
1: +  NL80211_RADAR_CAC_STARTED = 5,
1:  };
1:  
1:  enum nl80211_dfs_state {
1: -	NL80211_DFS_USABLE = 0,
1: -	NL80211_DFS_UNAVAILABLE = 1,
1: -	NL80211_DFS_AVAILABLE = 2,
1: +  NL80211_DFS_USABLE = 0,
1: +  NL80211_DFS_UNAVAILABLE = 1,
1: +  NL80211_DFS_AVAILABLE = 2,
1:  };
1:  
1:  enum nl80211_crit_proto_id {
1: -	NL80211_CRIT_PROTO_UNSPEC = 0,
1: -	NL80211_CRIT_PROTO_DHCP = 1,
1: -	NL80211_CRIT_PROTO_EAPOL = 2,
1: -	NL80211_CRIT_PROTO_APIPA = 3,
1: -	NUM_NL80211_CRIT_PROTO = 4,
1: +  NL80211_CRIT_PROTO_UNSPEC = 0,
1: +  NL80211_CRIT_PROTO_DHCP = 1,
1: +  NL80211_CRIT_PROTO_EAPOL = 2,
1: +  NL80211_CRIT_PROTO_APIPA = 3,
1: +  NUM_NL80211_CRIT_PROTO = 4,
1:  };
1:  
1:  struct nl80211_vendor_cmd_info {
1: -	__u32 vendor_id;
1: -	__u32 subcmd;
1: +  __u32 vendor_id;
1: +  __u32 subcmd;
1:  };
1:  
1:  enum nl80211_bss_select_attr {
1: -	__NL80211_BSS_SELECT_ATTR_INVALID = 0,
1: -	NL80211_BSS_SELECT_ATTR_RSSI = 1,
1: -	NL80211_BSS_SELECT_ATTR_BAND_PREF = 2,
1: -	NL80211_BSS_SELECT_ATTR_RSSI_ADJUST = 3,
1: -	__NL80211_BSS_SELECT_ATTR_AFTER_LAST = 4,
1: -	NL80211_BSS_SELECT_ATTR_MAX = 3,
1: +  __NL80211_BSS_SELECT_ATTR_INVALID = 0,
1: +  NL80211_BSS_SELECT_ATTR_RSSI = 1,
1: +  NL80211_BSS_SELECT_ATTR_BAND_PREF = 2,
1: +  NL80211_BSS_SELECT_ATTR_RSSI_ADJUST = 3,
1: +  __NL80211_BSS_SELECT_ATTR_AFTER_LAST = 4,
1: +  NL80211_BSS_SELECT_ATTR_MAX = 3,
1:  };
1:  
1:  enum nl80211_nan_function_type {
1: -	NL80211_NAN_FUNC_PUBLISH = 0,
1: -	NL80211_NAN_FUNC_SUBSCRIBE = 1,
1: -	NL80211_NAN_FUNC_FOLLOW_UP = 2,
1: -	__NL80211_NAN_FUNC_TYPE_AFTER_LAST = 3,
1: -	NL80211_NAN_FUNC_MAX_TYPE = 2,
1: +  NL80211_NAN_FUNC_PUBLISH = 0,
1: +  NL80211_NAN_FUNC_SUBSCRIBE = 1,
1: +  NL80211_NAN_FUNC_FOLLOW_UP = 2,
1: +  __NL80211_NAN_FUNC_TYPE_AFTER_LAST = 3,
1: +  NL80211_NAN_FUNC_MAX_TYPE = 2,
1:  };
1:  
1:  enum nl80211_external_auth_action {
1: -	NL80211_EXTERNAL_AUTH_START = 0,
1: -	NL80211_EXTERNAL_AUTH_ABORT = 1,
1: +  NL80211_EXTERNAL_AUTH_START = 0,
1: +  NL80211_EXTERNAL_AUTH_ABORT = 1,
1:  };
1:  
1:  enum nl80211_preamble {
1: -	NL80211_PREAMBLE_LEGACY = 0,
1: -	NL80211_PREAMBLE_HT = 1,
1: -	NL80211_PREAMBLE_VHT = 2,
1: -	NL80211_PREAMBLE_DMG = 3,
1: -	NL80211_PREAMBLE_HE = 4,
1: +  NL80211_PREAMBLE_LEGACY = 0,
1: +  NL80211_PREAMBLE_HT = 1,
1: +  NL80211_PREAMBLE_VHT = 2,
1: +  NL80211_PREAMBLE_DMG = 3,
1: +  NL80211_PREAMBLE_HE = 4,
1:  };
1:  
1:  enum nl80211_sae_pwe_mechanism {
1: -	NL80211_SAE_PWE_UNSPECIFIED = 0,
1: -	NL80211_SAE_PWE_HUNT_AND_PECK = 1,
1: -	NL80211_SAE_PWE_HASH_TO_ELEMENT = 2,
1: -	NL80211_SAE_PWE_BOTH = 3,
1: +  NL80211_SAE_PWE_UNSPECIFIED = 0,
1: +  NL80211_SAE_PWE_HUNT_AND_PECK = 1,
1: +  NL80211_SAE_PWE_HASH_TO_ELEMENT = 2,
1: +  NL80211_SAE_PWE_BOTH = 3,
1:  };
1:  
1:  enum ieee80211_bss_type {
1: -	IEEE80211_BSS_TYPE_ESS = 0,
1: -	IEEE80211_BSS_TYPE_PBSS = 1,
1: -	IEEE80211_BSS_TYPE_IBSS = 2,
1: -	IEEE80211_BSS_TYPE_MBSS = 3,
1: -	IEEE80211_BSS_TYPE_ANY = 4,
1: +  IEEE80211_BSS_TYPE_ESS = 0,
1: +  IEEE80211_BSS_TYPE_PBSS = 1,
1: +  IEEE80211_BSS_TYPE_IBSS = 2,
1: +  IEEE80211_BSS_TYPE_MBSS = 3,
1: +  IEEE80211_BSS_TYPE_ANY = 4,
1:  };
1:  
1:  enum ieee80211_edmg_bw_config {
1: -	IEEE80211_EDMG_BW_CONFIG_4 = 4,
1: -	IEEE80211_EDMG_BW_CONFIG_5 = 5,
1: -	IEEE80211_EDMG_BW_CONFIG_6 = 6,
1: -	IEEE80211_EDMG_BW_CONFIG_7 = 7,
1: -	IEEE80211_EDMG_BW_CONFIG_8 = 8,
1: -	IEEE80211_EDMG_BW_CONFIG_9 = 9,
1: -	IEEE80211_EDMG_BW_CONFIG_10 = 10,
1: -	IEEE80211_EDMG_BW_CONFIG_11 = 11,
1: -	IEEE80211_EDMG_BW_CONFIG_12 = 12,
1: -	IEEE80211_EDMG_BW_CONFIG_13 = 13,
1: -	IEEE80211_EDMG_BW_CONFIG_14 = 14,
1: -	IEEE80211_EDMG_BW_CONFIG_15 = 15,
1: +  IEEE80211_EDMG_BW_CONFIG_4 = 4,
1: +  IEEE80211_EDMG_BW_CONFIG_5 = 5,
1: +  IEEE80211_EDMG_BW_CONFIG_6 = 6,
1: +  IEEE80211_EDMG_BW_CONFIG_7 = 7,
1: +  IEEE80211_EDMG_BW_CONFIG_8 = 8,
1: +  IEEE80211_EDMG_BW_CONFIG_9 = 9,
1: +  IEEE80211_EDMG_BW_CONFIG_10 = 10,
1: +  IEEE80211_EDMG_BW_CONFIG_11 = 11,
1: +  IEEE80211_EDMG_BW_CONFIG_12 = 12,
1: +  IEEE80211_EDMG_BW_CONFIG_13 = 13,
1: +  IEEE80211_EDMG_BW_CONFIG_14 = 14,
1: +  IEEE80211_EDMG_BW_CONFIG_15 = 15,
1:  };
1:  
1:  struct ieee80211_edmg {
1: -	u8 channels;
1: -	enum ieee80211_edmg_bw_config bw_config;
1: +  u8 channels;
1: +  enum ieee80211_edmg_bw_config bw_config;
1:  };
1:  
1:  struct ieee80211_channel;
1:  
1:  struct cfg80211_chan_def {
1: -	struct ieee80211_channel *chan;
1: -	enum nl80211_chan_width width;
1: -	u32 center_freq1;
1: -	u32 center_freq2;
1: -	struct ieee80211_edmg edmg;
1: -	u16 freq1_offset;
1: +  struct ieee80211_channel *chan;
1: +  enum nl80211_chan_width width;
1: +  u32 center_freq1;
1: +  u32 center_freq2;
1: +  struct ieee80211_edmg edmg;
1: +  u16 freq1_offset;
1:  };
1:  
1:  struct wiphy;
1: @@ -126128,787 +127603,787 @@ struct cfg80211_internal_bss;
1:  struct cfg80211_cqm_config;
1:  
1:  struct wireless_dev {
1: -	struct wiphy *wiphy;
1: -	enum nl80211_iftype iftype;
1: -	struct list_head list;
1: -	struct net_device *netdev;
1: -	u32 identifier;
1: -	struct list_head mgmt_registrations;
1: -	spinlock_t mgmt_registrations_lock;
1: -	u8 mgmt_registrations_need_update: 1;
1: -	struct mutex mtx;
1: -	bool use_4addr;
1: -	bool is_running;
1: -	u8 address[6];
1: -	u8 ssid[32];
1: -	u8 ssid_len;
1: -	u8 mesh_id_len;
1: -	u8 mesh_id_up_len;
1: -	struct cfg80211_conn *conn;
1: -	struct cfg80211_cached_keys *connect_keys;
1: -	enum ieee80211_bss_type conn_bss_type;
1: -	u32 conn_owner_nlportid;
1: -	struct work_struct disconnect_wk;
1: -	u8 disconnect_bssid[6];
1: -	struct list_head event_list;
1: -	spinlock_t event_lock;
1: -	struct cfg80211_internal_bss *current_bss;
1: -	struct cfg80211_chan_def preset_chandef;
1: -	struct cfg80211_chan_def chandef;
1: -	bool ibss_fixed;
1: -	bool ibss_dfs_possible;
1: -	bool ps;
1: -	int ps_timeout;
1: -	int beacon_interval;
1: -	u32 ap_unexpected_nlportid;
1: -	u32 owner_nlportid;
1: -	bool nl_owner_dead;
1: -	bool cac_started;
1: -	long unsigned int cac_start_time;
1: -	unsigned int cac_time_ms;
1: -	struct cfg80211_cqm_config *cqm_config;
1: -	struct list_head pmsr_list;
1: -	spinlock_t pmsr_lock;
1: -	struct work_struct pmsr_free_wk;
1: -	long unsigned int unprot_beacon_reported;
1: +  struct wiphy *wiphy;
1: +  enum nl80211_iftype iftype;
1: +  struct list_head list;
1: +  struct net_device *netdev;
1: +  u32 identifier;
1: +  struct list_head mgmt_registrations;
1: +  spinlock_t mgmt_registrations_lock;
1: +  u8 mgmt_registrations_need_update : 1;
1: +  struct mutex mtx;
1: +  bool use_4addr;
1: +  bool is_running;
1: +  u8 address[6];
1: +  u8 ssid[32];
1: +  u8 ssid_len;
1: +  u8 mesh_id_len;
1: +  u8 mesh_id_up_len;
1: +  struct cfg80211_conn *conn;
1: +  struct cfg80211_cached_keys *connect_keys;
1: +  enum ieee80211_bss_type conn_bss_type;
1: +  u32 conn_owner_nlportid;
1: +  struct work_struct disconnect_wk;
1: +  u8 disconnect_bssid[6];
1: +  struct list_head event_list;
1: +  spinlock_t event_lock;
1: +  struct cfg80211_internal_bss *current_bss;
1: +  struct cfg80211_chan_def preset_chandef;
1: +  struct cfg80211_chan_def chandef;
1: +  bool ibss_fixed;
1: +  bool ibss_dfs_possible;
1: +  bool ps;
1: +  int ps_timeout;
1: +  int beacon_interval;
1: +  u32 ap_unexpected_nlportid;
1: +  u32 owner_nlportid;
1: +  bool nl_owner_dead;
1: +  bool cac_started;
1: +  long unsigned int cac_start_time;
1: +  unsigned int cac_time_ms;
1: +  struct cfg80211_cqm_config *cqm_config;
1: +  struct list_head pmsr_list;
1: +  spinlock_t pmsr_lock;
1: +  struct work_struct pmsr_free_wk;
1: +  long unsigned int unprot_beacon_reported;
1:  };
1:  
1:  struct ieee80211_s1g_cap {
1: -	u8 capab_info[10];
1: -	u8 supp_mcs_nss[5];
1: +  u8 capab_info[10];
1: +  u8 supp_mcs_nss[5];
1:  };
1:  
1:  struct ieee80211_mcs_info {
1: -	u8 rx_mask[10];
1: -	__le16 rx_highest;
1: -	u8 tx_params;
1: -	u8 reserved[3];
1: +  u8 rx_mask[10];
1: +  __le16 rx_highest;
1: +  u8 tx_params;
1: +  u8 reserved[3];
1:  };
1:  
1:  struct ieee80211_ht_cap {
1: -	__le16 cap_info;
1: -	u8 ampdu_params_info;
1: -	struct ieee80211_mcs_info mcs;
1: -	__le16 extended_ht_cap_info;
1: -	__le32 tx_BF_cap_info;
1: -	u8 antenna_selection_info;
1: +  __le16 cap_info;
1: +  u8 ampdu_params_info;
1: +  struct ieee80211_mcs_info mcs;
1: +  __le16 extended_ht_cap_info;
1: +  __le32 tx_BF_cap_info;
1: +  u8 antenna_selection_info;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_vht_mcs_info {
1: -	__le16 rx_mcs_map;
1: -	__le16 rx_highest;
1: -	__le16 tx_mcs_map;
1: -	__le16 tx_highest;
1: +  __le16 rx_mcs_map;
1: +  __le16 rx_highest;
1: +  __le16 tx_mcs_map;
1: +  __le16 tx_highest;
1:  };
1:  
1:  struct ieee80211_vht_cap {
1: -	__le32 vht_cap_info;
1: -	struct ieee80211_vht_mcs_info supp_mcs;
1: +  __le32 vht_cap_info;
1: +  struct ieee80211_vht_mcs_info supp_mcs;
1:  };
1:  
1:  struct ieee80211_he_cap_elem {
1: -	u8 mac_cap_info[6];
1: -	u8 phy_cap_info[11];
1: +  u8 mac_cap_info[6];
1: +  u8 phy_cap_info[11];
1:  };
1:  
1:  struct ieee80211_he_mcs_nss_supp {
1: -	__le16 rx_mcs_80;
1: -	__le16 tx_mcs_80;
1: -	__le16 rx_mcs_160;
1: -	__le16 tx_mcs_160;
1: -	__le16 rx_mcs_80p80;
1: -	__le16 tx_mcs_80p80;
1: +  __le16 rx_mcs_80;
1: +  __le16 tx_mcs_80;
1: +  __le16 rx_mcs_160;
1: +  __le16 tx_mcs_160;
1: +  __le16 rx_mcs_80p80;
1: +  __le16 tx_mcs_80p80;
1:  };
1:  
1:  struct ieee80211_he_operation {
1: -	__le32 he_oper_params;
1: -	__le16 he_mcs_nss_set;
1: -	u8 optional[0];
1: +  __le32 he_oper_params;
1: +  __le16 he_mcs_nss_set;
1: +  u8 optional[0];
1:  } __attribute__((packed));
1:  
1:  enum ieee80211_reasoncode {
1: -	WLAN_REASON_UNSPECIFIED = 1,
1: -	WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
1: -	WLAN_REASON_DEAUTH_LEAVING = 3,
1: -	WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
1: -	WLAN_REASON_DISASSOC_AP_BUSY = 5,
1: -	WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
1: -	WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
1: -	WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
1: -	WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
1: -	WLAN_REASON_DISASSOC_BAD_POWER = 10,
1: -	WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
1: -	WLAN_REASON_INVALID_IE = 13,
1: -	WLAN_REASON_MIC_FAILURE = 14,
1: -	WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
1: -	WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
1: -	WLAN_REASON_IE_DIFFERENT = 17,
1: -	WLAN_REASON_INVALID_GROUP_CIPHER = 18,
1: -	WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
1: -	WLAN_REASON_INVALID_AKMP = 20,
1: -	WLAN_REASON_UNSUPP_RSN_VERSION = 21,
1: -	WLAN_REASON_INVALID_RSN_IE_CAP = 22,
1: -	WLAN_REASON_IEEE8021X_FAILED = 23,
1: -	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
1: -	WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE = 25,
1: -	WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED = 26,
1: -	WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
1: -	WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
1: -	WLAN_REASON_DISASSOC_LOW_ACK = 34,
1: -	WLAN_REASON_DISASSOC_QAP_EXCEED_TXOP = 35,
1: -	WLAN_REASON_QSTA_LEAVE_QBSS = 36,
1: -	WLAN_REASON_QSTA_NOT_USE = 37,
1: -	WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
1: -	WLAN_REASON_QSTA_TIMEOUT = 39,
1: -	WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
1: -	WLAN_REASON_MESH_PEER_CANCELED = 52,
1: -	WLAN_REASON_MESH_MAX_PEERS = 53,
1: -	WLAN_REASON_MESH_CONFIG = 54,
1: -	WLAN_REASON_MESH_CLOSE = 55,
1: -	WLAN_REASON_MESH_MAX_RETRIES = 56,
1: -	WLAN_REASON_MESH_CONFIRM_TIMEOUT = 57,
1: -	WLAN_REASON_MESH_INVALID_GTK = 58,
1: -	WLAN_REASON_MESH_INCONSISTENT_PARAM = 59,
1: -	WLAN_REASON_MESH_INVALID_SECURITY = 60,
1: -	WLAN_REASON_MESH_PATH_ERROR = 61,
1: -	WLAN_REASON_MESH_PATH_NOFORWARD = 62,
1: -	WLAN_REASON_MESH_PATH_DEST_UNREACHABLE = 63,
1: -	WLAN_REASON_MAC_EXISTS_IN_MBSS = 64,
1: -	WLAN_REASON_MESH_CHAN_REGULATORY = 65,
1: -	WLAN_REASON_MESH_CHAN = 66,
1: +  WLAN_REASON_UNSPECIFIED = 1,
1: +  WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
1: +  WLAN_REASON_DEAUTH_LEAVING = 3,
1: +  WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
1: +  WLAN_REASON_DISASSOC_AP_BUSY = 5,
1: +  WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
1: +  WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
1: +  WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
1: +  WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
1: +  WLAN_REASON_DISASSOC_BAD_POWER = 10,
1: +  WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
1: +  WLAN_REASON_INVALID_IE = 13,
1: +  WLAN_REASON_MIC_FAILURE = 14,
1: +  WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
1: +  WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
1: +  WLAN_REASON_IE_DIFFERENT = 17,
1: +  WLAN_REASON_INVALID_GROUP_CIPHER = 18,
1: +  WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
1: +  WLAN_REASON_INVALID_AKMP = 20,
1: +  WLAN_REASON_UNSUPP_RSN_VERSION = 21,
1: +  WLAN_REASON_INVALID_RSN_IE_CAP = 22,
1: +  WLAN_REASON_IEEE8021X_FAILED = 23,
1: +  WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
1: +  WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE = 25,
1: +  WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED = 26,
1: +  WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
1: +  WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
1: +  WLAN_REASON_DISASSOC_LOW_ACK = 34,
1: +  WLAN_REASON_DISASSOC_QAP_EXCEED_TXOP = 35,
1: +  WLAN_REASON_QSTA_LEAVE_QBSS = 36,
1: +  WLAN_REASON_QSTA_NOT_USE = 37,
1: +  WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
1: +  WLAN_REASON_QSTA_TIMEOUT = 39,
1: +  WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
1: +  WLAN_REASON_MESH_PEER_CANCELED = 52,
1: +  WLAN_REASON_MESH_MAX_PEERS = 53,
1: +  WLAN_REASON_MESH_CONFIG = 54,
1: +  WLAN_REASON_MESH_CLOSE = 55,
1: +  WLAN_REASON_MESH_MAX_RETRIES = 56,
1: +  WLAN_REASON_MESH_CONFIRM_TIMEOUT = 57,
1: +  WLAN_REASON_MESH_INVALID_GTK = 58,
1: +  WLAN_REASON_MESH_INCONSISTENT_PARAM = 59,
1: +  WLAN_REASON_MESH_INVALID_SECURITY = 60,
1: +  WLAN_REASON_MESH_PATH_ERROR = 61,
1: +  WLAN_REASON_MESH_PATH_NOFORWARD = 62,
1: +  WLAN_REASON_MESH_PATH_DEST_UNREACHABLE = 63,
1: +  WLAN_REASON_MAC_EXISTS_IN_MBSS = 64,
1: +  WLAN_REASON_MESH_CHAN_REGULATORY = 65,
1: +  WLAN_REASON_MESH_CHAN = 66,
1:  };
1:  
1:  enum ieee80211_key_len {
1: -	WLAN_KEY_LEN_WEP40 = 5,
1: -	WLAN_KEY_LEN_WEP104 = 13,
1: -	WLAN_KEY_LEN_CCMP = 16,
1: -	WLAN_KEY_LEN_CCMP_256 = 32,
1: -	WLAN_KEY_LEN_TKIP = 32,
1: -	WLAN_KEY_LEN_AES_CMAC = 16,
1: -	WLAN_KEY_LEN_SMS4 = 32,
1: -	WLAN_KEY_LEN_GCMP = 16,
1: -	WLAN_KEY_LEN_GCMP_256 = 32,
1: -	WLAN_KEY_LEN_BIP_CMAC_256 = 32,
1: -	WLAN_KEY_LEN_BIP_GMAC_128 = 16,
1: -	WLAN_KEY_LEN_BIP_GMAC_256 = 32,
1: +  WLAN_KEY_LEN_WEP40 = 5,
1: +  WLAN_KEY_LEN_WEP104 = 13,
1: +  WLAN_KEY_LEN_CCMP = 16,
1: +  WLAN_KEY_LEN_CCMP_256 = 32,
1: +  WLAN_KEY_LEN_TKIP = 32,
1: +  WLAN_KEY_LEN_AES_CMAC = 16,
1: +  WLAN_KEY_LEN_SMS4 = 32,
1: +  WLAN_KEY_LEN_GCMP = 16,
1: +  WLAN_KEY_LEN_GCMP_256 = 32,
1: +  WLAN_KEY_LEN_BIP_CMAC_256 = 32,
1: +  WLAN_KEY_LEN_BIP_GMAC_128 = 16,
1: +  WLAN_KEY_LEN_BIP_GMAC_256 = 32,
1:  };
1:  
1:  struct ieee80211_he_6ghz_capa {
1: -	__le16 capa;
1: +  __le16 capa;
1:  };
1:  
1:  enum environment_cap {
1: -	ENVIRON_ANY = 0,
1: -	ENVIRON_INDOOR = 1,
1: -	ENVIRON_OUTDOOR = 2,
1: +  ENVIRON_ANY = 0,
1: +  ENVIRON_INDOOR = 1,
1: +  ENVIRON_OUTDOOR = 2,
1:  };
1:  
1:  struct regulatory_request {
1: -	struct callback_head callback_head;
1: -	int wiphy_idx;
1: -	enum nl80211_reg_initiator initiator;
1: -	enum nl80211_user_reg_hint_type user_reg_hint_type;
1: -	char alpha2[3];
1: -	enum nl80211_dfs_regions dfs_region;
1: -	bool intersect;
1: -	bool processed;
1: -	enum environment_cap country_ie_env;
1: -	struct list_head list;
1: +  struct callback_head callback_head;
1: +  int wiphy_idx;
1: +  enum nl80211_reg_initiator initiator;
1: +  enum nl80211_user_reg_hint_type user_reg_hint_type;
1: +  char alpha2[3];
1: +  enum nl80211_dfs_regions dfs_region;
1: +  bool intersect;
1: +  bool processed;
1: +  enum environment_cap country_ie_env;
1: +  struct list_head list;
1:  };
1:  
1:  enum ieee80211_regulatory_flags {
1: -	REGULATORY_CUSTOM_REG = 1,
1: -	REGULATORY_STRICT_REG = 2,
1: -	REGULATORY_DISABLE_BEACON_HINTS = 4,
1: -	REGULATORY_COUNTRY_IE_FOLLOW_POWER = 8,
1: -	REGULATORY_COUNTRY_IE_IGNORE = 16,
1: -	REGULATORY_ENABLE_RELAX_NO_IR = 32,
1: -	REGULATORY_IGNORE_STALE_KICKOFF = 64,
1: -	REGULATORY_WIPHY_SELF_MANAGED = 128,
1: +  REGULATORY_CUSTOM_REG = 1,
1: +  REGULATORY_STRICT_REG = 2,
1: +  REGULATORY_DISABLE_BEACON_HINTS = 4,
1: +  REGULATORY_COUNTRY_IE_FOLLOW_POWER = 8,
1: +  REGULATORY_COUNTRY_IE_IGNORE = 16,
1: +  REGULATORY_ENABLE_RELAX_NO_IR = 32,
1: +  REGULATORY_IGNORE_STALE_KICKOFF = 64,
1: +  REGULATORY_WIPHY_SELF_MANAGED = 128,
1:  };
1:  
1:  struct ieee80211_freq_range {
1: -	u32 start_freq_khz;
1: -	u32 end_freq_khz;
1: -	u32 max_bandwidth_khz;
1: +  u32 start_freq_khz;
1: +  u32 end_freq_khz;
1: +  u32 max_bandwidth_khz;
1:  };
1:  
1:  struct ieee80211_power_rule {
1: -	u32 max_antenna_gain;
1: -	u32 max_eirp;
1: +  u32 max_antenna_gain;
1: +  u32 max_eirp;
1:  };
1:  
1:  struct ieee80211_wmm_ac {
1: -	u16 cw_min;
1: -	u16 cw_max;
1: -	u16 cot;
1: -	u8 aifsn;
1: +  u16 cw_min;
1: +  u16 cw_max;
1: +  u16 cot;
1: +  u8 aifsn;
1:  };
1:  
1:  struct ieee80211_wmm_rule {
1: -	struct ieee80211_wmm_ac client[4];
1: -	struct ieee80211_wmm_ac ap[4];
1: +  struct ieee80211_wmm_ac client[4];
1: +  struct ieee80211_wmm_ac ap[4];
1:  };
1:  
1:  struct ieee80211_reg_rule {
1: -	struct ieee80211_freq_range freq_range;
1: -	struct ieee80211_power_rule power_rule;
1: -	struct ieee80211_wmm_rule wmm_rule;
1: -	u32 flags;
1: -	u32 dfs_cac_ms;
1: -	bool has_wmm;
1: +  struct ieee80211_freq_range freq_range;
1: +  struct ieee80211_power_rule power_rule;
1: +  struct ieee80211_wmm_rule wmm_rule;
1: +  u32 flags;
1: +  u32 dfs_cac_ms;
1: +  bool has_wmm;
1:  };
1:  
1:  struct ieee80211_regdomain {
1: -	struct callback_head callback_head;
1: -	u32 n_reg_rules;
1: -	char alpha2[3];
1: -	enum nl80211_dfs_regions dfs_region;
1: -	struct ieee80211_reg_rule reg_rules[0];
1: +  struct callback_head callback_head;
1: +  u32 n_reg_rules;
1: +  char alpha2[3];
1: +  enum nl80211_dfs_regions dfs_region;
1: +  struct ieee80211_reg_rule reg_rules[0];
1:  };
1:  
1:  struct ieee80211_channel {
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	u16 hw_value;
1: -	u32 flags;
1: -	int max_antenna_gain;
1: -	int max_power;
1: -	int max_reg_power;
1: -	bool beacon_found;
1: -	u32 orig_flags;
1: -	int orig_mag;
1: -	int orig_mpwr;
1: -	enum nl80211_dfs_state dfs_state;
1: -	long unsigned int dfs_state_entered;
1: -	unsigned int dfs_cac_ms;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  u16 hw_value;
1: +  u32 flags;
1: +  int max_antenna_gain;
1: +  int max_power;
1: +  int max_reg_power;
1: +  bool beacon_found;
1: +  u32 orig_flags;
1: +  int orig_mag;
1: +  int orig_mpwr;
1: +  enum nl80211_dfs_state dfs_state;
1: +  long unsigned int dfs_state_entered;
1: +  unsigned int dfs_cac_ms;
1:  };
1:  
1:  struct ieee80211_rate {
1: -	u32 flags;
1: -	u16 bitrate;
1: -	u16 hw_value;
1: -	u16 hw_value_short;
1: +  u32 flags;
1: +  u16 bitrate;
1: +  u16 hw_value;
1: +  u16 hw_value_short;
1:  };
1:  
1:  struct ieee80211_he_obss_pd {
1: -	bool enable;
1: -	u8 sr_ctrl;
1: -	u8 non_srg_max_offset;
1: -	u8 min_offset;
1: -	u8 max_offset;
1: -	u8 bss_color_bitmap[8];
1: -	u8 partial_bssid_bitmap[8];
1: +  bool enable;
1: +  u8 sr_ctrl;
1: +  u8 non_srg_max_offset;
1: +  u8 min_offset;
1: +  u8 max_offset;
1: +  u8 bss_color_bitmap[8];
1: +  u8 partial_bssid_bitmap[8];
1:  };
1:  
1:  struct cfg80211_he_bss_color {
1: -	u8 color;
1: -	bool enabled;
1: -	bool partial;
1: +  u8 color;
1: +  bool enabled;
1: +  bool partial;
1:  };
1:  
1:  struct ieee80211_sta_ht_cap {
1: -	u16 cap;
1: -	bool ht_supported;
1: -	u8 ampdu_factor;
1: -	u8 ampdu_density;
1: -	struct ieee80211_mcs_info mcs;
1: -	char: 8;
1: +  u16 cap;
1: +  bool ht_supported;
1: +  u8 ampdu_factor;
1: +  u8 ampdu_density;
1: +  struct ieee80211_mcs_info mcs;
1: +  char : 8;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_sta_vht_cap {
1: -	bool vht_supported;
1: -	u32 cap;
1: -	struct ieee80211_vht_mcs_info vht_mcs;
1: +  bool vht_supported;
1: +  u32 cap;
1: +  struct ieee80211_vht_mcs_info vht_mcs;
1:  };
1:  
1:  struct ieee80211_sta_he_cap {
1: -	bool has_he;
1: -	struct ieee80211_he_cap_elem he_cap_elem;
1: -	struct ieee80211_he_mcs_nss_supp he_mcs_nss_supp;
1: -	u8 ppe_thres[25];
1: +  bool has_he;
1: +  struct ieee80211_he_cap_elem he_cap_elem;
1: +  struct ieee80211_he_mcs_nss_supp he_mcs_nss_supp;
1: +  u8 ppe_thres[25];
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_sband_iftype_data {
1: -	u16 types_mask;
1: -	struct ieee80211_sta_he_cap he_cap;
1: -	struct ieee80211_he_6ghz_capa he_6ghz_capa;
1: -	char: 8;
1: +  u16 types_mask;
1: +  struct ieee80211_sta_he_cap he_cap;
1: +  struct ieee80211_he_6ghz_capa he_6ghz_capa;
1: +  char : 8;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_sta_s1g_cap {
1: -	bool s1g;
1: -	u8 cap[10];
1: -	u8 nss_mcs[5];
1: +  bool s1g;
1: +  u8 cap[10];
1: +  u8 nss_mcs[5];
1:  };
1:  
1:  struct ieee80211_supported_band {
1: -	struct ieee80211_channel *channels;
1: -	struct ieee80211_rate *bitrates;
1: -	enum nl80211_band band;
1: -	int n_channels;
1: -	int n_bitrates;
1: -	struct ieee80211_sta_ht_cap ht_cap;
1: -	struct ieee80211_sta_vht_cap vht_cap;
1: -	struct ieee80211_sta_s1g_cap s1g_cap;
1: -	struct ieee80211_edmg edmg_cap;
1: -	u16 n_iftype_data;
1: -	const struct ieee80211_sband_iftype_data *iftype_data;
1: +  struct ieee80211_channel *channels;
1: +  struct ieee80211_rate *bitrates;
1: +  enum nl80211_band band;
1: +  int n_channels;
1: +  int n_bitrates;
1: +  struct ieee80211_sta_ht_cap ht_cap;
1: +  struct ieee80211_sta_vht_cap vht_cap;
1: +  struct ieee80211_sta_s1g_cap s1g_cap;
1: +  struct ieee80211_edmg edmg_cap;
1: +  u16 n_iftype_data;
1: +  const struct ieee80211_sband_iftype_data *iftype_data;
1:  };
1:  
1:  struct vif_params {
1: -	u32 flags;
1: -	int use_4addr;
1: -	u8 macaddr[6];
1: -	const u8 *vht_mumimo_groups;
1: -	const u8 *vht_mumimo_follow_addr;
1: +  u32 flags;
1: +  int use_4addr;
1: +  u8 macaddr[6];
1: +  const u8 *vht_mumimo_groups;
1: +  const u8 *vht_mumimo_follow_addr;
1:  };
1:  
1:  struct key_params {
1: -	const u8 *key;
1: -	const u8 *seq;
1: -	int key_len;
1: -	int seq_len;
1: -	u16 vlan_id;
1: -	u32 cipher;
1: -	enum nl80211_key_mode mode;
1: +  const u8 *key;
1: +  const u8 *seq;
1: +  int key_len;
1: +  int seq_len;
1: +  u16 vlan_id;
1: +  u32 cipher;
1: +  enum nl80211_key_mode mode;
1:  };
1:  
1:  struct cfg80211_bitrate_mask {
1: -	struct {
1: -		u32 legacy;
1: -		u8 ht_mcs[10];
1: -		u16 vht_mcs[8];
1: -		u16 he_mcs[8];
1: -		enum nl80211_txrate_gi gi;
1: -		enum nl80211_he_gi he_gi;
1: -		enum nl80211_he_ltf he_ltf;
1: -	} control[5];
1: +  struct {
1: +    u32 legacy;
1: +    u8 ht_mcs[10];
1: +    u16 vht_mcs[8];
1: +    u16 he_mcs[8];
1: +    enum nl80211_txrate_gi gi;
1: +    enum nl80211_he_gi he_gi;
1: +    enum nl80211_he_ltf he_ltf;
1: +  } control[5];
1:  };
1:  
1:  struct cfg80211_tid_cfg {
1: -	bool config_override;
1: -	u8 tids;
1: -	u64 mask;
1: -	enum nl80211_tid_config noack;
1: -	u8 retry_long;
1: -	u8 retry_short;
1: -	enum nl80211_tid_config ampdu;
1: -	enum nl80211_tid_config rtscts;
1: -	enum nl80211_tid_config amsdu;
1: -	enum nl80211_tx_rate_setting txrate_type;
1: -	struct cfg80211_bitrate_mask txrate_mask;
1: +  bool config_override;
1: +  u8 tids;
1: +  u64 mask;
1: +  enum nl80211_tid_config noack;
1: +  u8 retry_long;
1: +  u8 retry_short;
1: +  enum nl80211_tid_config ampdu;
1: +  enum nl80211_tid_config rtscts;
1: +  enum nl80211_tid_config amsdu;
1: +  enum nl80211_tx_rate_setting txrate_type;
1: +  struct cfg80211_bitrate_mask txrate_mask;
1:  };
1:  
1:  struct cfg80211_tid_config {
1: -	const u8 *peer;
1: -	u32 n_tid_conf;
1: -	struct cfg80211_tid_cfg tid_conf[0];
1: +  const u8 *peer;
1: +  u32 n_tid_conf;
1: +  struct cfg80211_tid_cfg tid_conf[0];
1:  };
1:  
1:  struct survey_info {
1: -	struct ieee80211_channel *channel;
1: -	u64 time;
1: -	u64 time_busy;
1: -	u64 time_ext_busy;
1: -	u64 time_rx;
1: -	u64 time_tx;
1: -	u64 time_scan;
1: -	u64 time_bss_rx;
1: -	u32 filled;
1: -	s8 noise;
1: +  struct ieee80211_channel *channel;
1: +  u64 time;
1: +  u64 time_busy;
1: +  u64 time_ext_busy;
1: +  u64 time_rx;
1: +  u64 time_tx;
1: +  u64 time_scan;
1: +  u64 time_bss_rx;
1: +  u32 filled;
1: +  s8 noise;
1:  };
1:  
1:  struct cfg80211_crypto_settings {
1: -	u32 wpa_versions;
1: -	u32 cipher_group;
1: -	int n_ciphers_pairwise;
1: -	u32 ciphers_pairwise[5];
1: -	int n_akm_suites;
1: -	u32 akm_suites[2];
1: -	bool control_port;
1: -	__be16 control_port_ethertype;
1: -	bool control_port_no_encrypt;
1: -	bool control_port_over_nl80211;
1: -	bool control_port_no_preauth;
1: -	struct key_params *wep_keys;
1: -	int wep_tx_key;
1: -	const u8 *psk;
1: -	const u8 *sae_pwd;
1: -	u8 sae_pwd_len;
1: -	enum nl80211_sae_pwe_mechanism sae_pwe;
1: +  u32 wpa_versions;
1: +  u32 cipher_group;
1: +  int n_ciphers_pairwise;
1: +  u32 ciphers_pairwise[5];
1: +  int n_akm_suites;
1: +  u32 akm_suites[2];
1: +  bool control_port;
1: +  __be16 control_port_ethertype;
1: +  bool control_port_no_encrypt;
1: +  bool control_port_over_nl80211;
1: +  bool control_port_no_preauth;
1: +  struct key_params *wep_keys;
1: +  int wep_tx_key;
1: +  const u8 *psk;
1: +  const u8 *sae_pwd;
1: +  u8 sae_pwd_len;
1: +  enum nl80211_sae_pwe_mechanism sae_pwe;
1:  };
1:  
1:  struct cfg80211_beacon_data {
1: -	const u8 *head;
1: -	const u8 *tail;
1: -	const u8 *beacon_ies;
1: -	const u8 *proberesp_ies;
1: -	const u8 *assocresp_ies;
1: -	const u8 *probe_resp;
1: -	const u8 *lci;
1: -	const u8 *civicloc;
1: -	s8 ftm_responder;
1: -	size_t head_len;
1: -	size_t tail_len;
1: -	size_t beacon_ies_len;
1: -	size_t proberesp_ies_len;
1: -	size_t assocresp_ies_len;
1: -	size_t probe_resp_len;
1: -	size_t lci_len;
1: -	size_t civicloc_len;
1: +  const u8 *head;
1: +  const u8 *tail;
1: +  const u8 *beacon_ies;
1: +  const u8 *proberesp_ies;
1: +  const u8 *assocresp_ies;
1: +  const u8 *probe_resp;
1: +  const u8 *lci;
1: +  const u8 *civicloc;
1: +  s8 ftm_responder;
1: +  size_t head_len;
1: +  size_t tail_len;
1: +  size_t beacon_ies_len;
1: +  size_t proberesp_ies_len;
1: +  size_t assocresp_ies_len;
1: +  size_t probe_resp_len;
1: +  size_t lci_len;
1: +  size_t civicloc_len;
1:  };
1:  
1:  struct mac_address {
1: -	u8 addr[6];
1: +  u8 addr[6];
1:  };
1:  
1:  struct cfg80211_acl_data {
1: -	enum nl80211_acl_policy acl_policy;
1: -	int n_acl_entries;
1: -	struct mac_address mac_addrs[0];
1: +  enum nl80211_acl_policy acl_policy;
1: +  int n_acl_entries;
1: +  struct mac_address mac_addrs[0];
1:  };
1:  
1:  struct cfg80211_fils_discovery {
1: -	u32 min_interval;
1: -	u32 max_interval;
1: -	size_t tmpl_len;
1: -	const u8 *tmpl;
1: +  u32 min_interval;
1: +  u32 max_interval;
1: +  size_t tmpl_len;
1: +  const u8 *tmpl;
1:  };
1:  
1:  struct cfg80211_unsol_bcast_probe_resp {
1: -	u32 interval;
1: -	size_t tmpl_len;
1: -	const u8 *tmpl;
1: +  u32 interval;
1: +  size_t tmpl_len;
1: +  const u8 *tmpl;
1:  };
1:  
1:  struct cfg80211_ap_settings {
1: -	struct cfg80211_chan_def chandef;
1: -	struct cfg80211_beacon_data beacon;
1: -	int beacon_interval;
1: -	int dtim_period;
1: -	const u8 *ssid;
1: -	size_t ssid_len;
1: -	enum nl80211_hidden_ssid hidden_ssid;
1: -	struct cfg80211_crypto_settings crypto;
1: -	bool privacy;
1: -	enum nl80211_auth_type auth_type;
1: -	enum nl80211_smps_mode smps_mode;
1: -	int inactivity_timeout;
1: -	u8 p2p_ctwindow;
1: -	bool p2p_opp_ps;
1: -	const struct cfg80211_acl_data *acl;
1: -	bool pbss;
1: -	struct cfg80211_bitrate_mask beacon_rate;
1: -	const struct ieee80211_ht_cap *ht_cap;
1: -	const struct ieee80211_vht_cap *vht_cap;
1: -	const struct ieee80211_he_cap_elem *he_cap;
1: -	const struct ieee80211_he_operation *he_oper;
1: -	bool ht_required;
1: -	bool vht_required;
1: -	bool he_required;
1: -	bool twt_responder;
1: -	u32 flags;
1: -	struct ieee80211_he_obss_pd he_obss_pd;
1: -	struct cfg80211_he_bss_color he_bss_color;
1: -	struct cfg80211_fils_discovery fils_discovery;
1: -	struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
1: +  struct cfg80211_chan_def chandef;
1: +  struct cfg80211_beacon_data beacon;
1: +  int beacon_interval;
1: +  int dtim_period;
1: +  const u8 *ssid;
1: +  size_t ssid_len;
1: +  enum nl80211_hidden_ssid hidden_ssid;
1: +  struct cfg80211_crypto_settings crypto;
1: +  bool privacy;
1: +  enum nl80211_auth_type auth_type;
1: +  enum nl80211_smps_mode smps_mode;
1: +  int inactivity_timeout;
1: +  u8 p2p_ctwindow;
1: +  bool p2p_opp_ps;
1: +  const struct cfg80211_acl_data *acl;
1: +  bool pbss;
1: +  struct cfg80211_bitrate_mask beacon_rate;
1: +  const struct ieee80211_ht_cap *ht_cap;
1: +  const struct ieee80211_vht_cap *vht_cap;
1: +  const struct ieee80211_he_cap_elem *he_cap;
1: +  const struct ieee80211_he_operation *he_oper;
1: +  bool ht_required;
1: +  bool vht_required;
1: +  bool he_required;
1: +  bool twt_responder;
1: +  u32 flags;
1: +  struct ieee80211_he_obss_pd he_obss_pd;
1: +  struct cfg80211_he_bss_color he_bss_color;
1: +  struct cfg80211_fils_discovery fils_discovery;
1: +  struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
1:  };
1:  
1:  struct cfg80211_csa_settings {
1: -	struct cfg80211_chan_def chandef;
1: -	struct cfg80211_beacon_data beacon_csa;
1: -	const u16 *counter_offsets_beacon;
1: -	const u16 *counter_offsets_presp;
1: -	unsigned int n_counter_offsets_beacon;
1: -	unsigned int n_counter_offsets_presp;
1: -	struct cfg80211_beacon_data beacon_after;
1: -	bool radar_required;
1: -	bool block_tx;
1: -	u8 count;
1: +  struct cfg80211_chan_def chandef;
1: +  struct cfg80211_beacon_data beacon_csa;
1: +  const u16 *counter_offsets_beacon;
1: +  const u16 *counter_offsets_presp;
1: +  unsigned int n_counter_offsets_beacon;
1: +  unsigned int n_counter_offsets_presp;
1: +  struct cfg80211_beacon_data beacon_after;
1: +  bool radar_required;
1: +  bool block_tx;
1: +  u8 count;
1:  };
1:  
1:  struct sta_txpwr {
1: -	s16 power;
1: -	enum nl80211_tx_power_setting type;
1: +  s16 power;
1: +  enum nl80211_tx_power_setting type;
1:  };
1:  
1:  struct station_parameters {
1: -	const u8 *supported_rates;
1: -	struct net_device *vlan;
1: -	u32 sta_flags_mask;
1: -	u32 sta_flags_set;
1: -	u32 sta_modify_mask;
1: -	int listen_interval;
1: -	u16 aid;
1: -	u16 vlan_id;
1: -	u16 peer_aid;
1: -	u8 supported_rates_len;
1: -	u8 plink_action;
1: -	u8 plink_state;
1: -	const struct ieee80211_ht_cap *ht_capa;
1: -	const struct ieee80211_vht_cap *vht_capa;
1: -	u8 uapsd_queues;
1: -	u8 max_sp;
1: -	enum nl80211_mesh_power_mode local_pm;
1: -	u16 capability;
1: -	const u8 *ext_capab;
1: -	u8 ext_capab_len;
1: -	const u8 *supported_channels;
1: -	u8 supported_channels_len;
1: -	const u8 *supported_oper_classes;
1: -	u8 supported_oper_classes_len;
1: -	u8 opmode_notif;
1: -	bool opmode_notif_used;
1: -	int support_p2p_ps;
1: -	const struct ieee80211_he_cap_elem *he_capa;
1: -	u8 he_capa_len;
1: -	u16 airtime_weight;
1: -	struct sta_txpwr txpwr;
1: -	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
1: +  const u8 *supported_rates;
1: +  struct net_device *vlan;
1: +  u32 sta_flags_mask;
1: +  u32 sta_flags_set;
1: +  u32 sta_modify_mask;
1: +  int listen_interval;
1: +  u16 aid;
1: +  u16 vlan_id;
1: +  u16 peer_aid;
1: +  u8 supported_rates_len;
1: +  u8 plink_action;
1: +  u8 plink_state;
1: +  const struct ieee80211_ht_cap *ht_capa;
1: +  const struct ieee80211_vht_cap *vht_capa;
1: +  u8 uapsd_queues;
1: +  u8 max_sp;
1: +  enum nl80211_mesh_power_mode local_pm;
1: +  u16 capability;
1: +  const u8 *ext_capab;
1: +  u8 ext_capab_len;
1: +  const u8 *supported_channels;
1: +  u8 supported_channels_len;
1: +  const u8 *supported_oper_classes;
1: +  u8 supported_oper_classes_len;
1: +  u8 opmode_notif;
1: +  bool opmode_notif_used;
1: +  int support_p2p_ps;
1: +  const struct ieee80211_he_cap_elem *he_capa;
1: +  u8 he_capa_len;
1: +  u16 airtime_weight;
1: +  struct sta_txpwr txpwr;
1: +  const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
1:  };
1:  
1:  struct station_del_parameters {
1: -	const u8 *mac;
1: -	u8 subtype;
1: -	u16 reason_code;
1: +  const u8 *mac;
1: +  u8 subtype;
1: +  u16 reason_code;
1:  };
1:  
1:  struct rate_info {
1: -	u8 flags;
1: -	u8 mcs;
1: -	u16 legacy;
1: -	u8 nss;
1: -	u8 bw;
1: -	u8 he_gi;
1: -	u8 he_dcm;
1: -	u8 he_ru_alloc;
1: -	u8 n_bonded_ch;
1: +  u8 flags;
1: +  u8 mcs;
1: +  u16 legacy;
1: +  u8 nss;
1: +  u8 bw;
1: +  u8 he_gi;
1: +  u8 he_dcm;
1: +  u8 he_ru_alloc;
1: +  u8 n_bonded_ch;
1:  };
1:  
1:  struct sta_bss_parameters {
1: -	u8 flags;
1: -	u8 dtim_period;
1: -	u16 beacon_interval;
1: +  u8 flags;
1: +  u8 dtim_period;
1: +  u16 beacon_interval;
1:  };
1:  
1:  struct cfg80211_txq_stats {
1: -	u32 filled;
1: -	u32 backlog_bytes;
1: -	u32 backlog_packets;
1: -	u32 flows;
1: -	u32 drops;
1: -	u32 ecn_marks;
1: -	u32 overlimit;
1: -	u32 overmemory;
1: -	u32 collisions;
1: -	u32 tx_bytes;
1: -	u32 tx_packets;
1: -	u32 max_flows;
1: +  u32 filled;
1: +  u32 backlog_bytes;
1: +  u32 backlog_packets;
1: +  u32 flows;
1: +  u32 drops;
1: +  u32 ecn_marks;
1: +  u32 overlimit;
1: +  u32 overmemory;
1: +  u32 collisions;
1: +  u32 tx_bytes;
1: +  u32 tx_packets;
1: +  u32 max_flows;
1:  };
1:  
1:  struct cfg80211_tid_stats {
1: -	u32 filled;
1: -	u64 rx_msdu;
1: -	u64 tx_msdu;
1: -	u64 tx_msdu_retries;
1: -	u64 tx_msdu_failed;
1: -	struct cfg80211_txq_stats txq_stats;
1: +  u32 filled;
1: +  u64 rx_msdu;
1: +  u64 tx_msdu;
1: +  u64 tx_msdu_retries;
1: +  u64 tx_msdu_failed;
1: +  struct cfg80211_txq_stats txq_stats;
1:  };
1:  
1:  struct station_info {
1: -	u64 filled;
1: -	u32 connected_time;
1: -	u32 inactive_time;
1: -	u64 assoc_at;
1: -	u64 rx_bytes;
1: -	u64 tx_bytes;
1: -	u16 llid;
1: -	u16 plid;
1: -	u8 plink_state;
1: -	s8 signal;
1: -	s8 signal_avg;
1: -	u8 chains;
1: -	s8 chain_signal[4];
1: -	s8 chain_signal_avg[4];
1: -	struct rate_info txrate;
1: -	struct rate_info rxrate;
1: -	u32 rx_packets;
1: -	u32 tx_packets;
1: -	u32 tx_retries;
1: -	u32 tx_failed;
1: -	u32 rx_dropped_misc;
1: -	struct sta_bss_parameters bss_param;
1: -	struct nl80211_sta_flag_update sta_flags;
1: -	int generation;
1: -	const u8 *assoc_req_ies;
1: -	size_t assoc_req_ies_len;
1: -	u32 beacon_loss_count;
1: -	s64 t_offset;
1: -	enum nl80211_mesh_power_mode local_pm;
1: -	enum nl80211_mesh_power_mode peer_pm;
1: -	enum nl80211_mesh_power_mode nonpeer_pm;
1: -	u32 expected_throughput;
1: -	u64 tx_duration;
1: -	u64 rx_duration;
1: -	u64 rx_beacon;
1: -	u8 rx_beacon_signal_avg;
1: -	u8 connected_to_gate;
1: -	struct cfg80211_tid_stats *pertid;
1: -	s8 ack_signal;
1: -	s8 avg_ack_signal;
1: -	u16 airtime_weight;
1: -	u32 rx_mpdu_count;
1: -	u32 fcs_err_count;
1: -	u32 airtime_link_metric;
1: -	u8 connected_to_as;
1: +  u64 filled;
1: +  u32 connected_time;
1: +  u32 inactive_time;
1: +  u64 assoc_at;
1: +  u64 rx_bytes;
1: +  u64 tx_bytes;
1: +  u16 llid;
1: +  u16 plid;
1: +  u8 plink_state;
1: +  s8 signal;
1: +  s8 signal_avg;
1: +  u8 chains;
1: +  s8 chain_signal[4];
1: +  s8 chain_signal_avg[4];
1: +  struct rate_info txrate;
1: +  struct rate_info rxrate;
1: +  u32 rx_packets;
1: +  u32 tx_packets;
1: +  u32 tx_retries;
1: +  u32 tx_failed;
1: +  u32 rx_dropped_misc;
1: +  struct sta_bss_parameters bss_param;
1: +  struct nl80211_sta_flag_update sta_flags;
1: +  int generation;
1: +  const u8 *assoc_req_ies;
1: +  size_t assoc_req_ies_len;
1: +  u32 beacon_loss_count;
1: +  s64 t_offset;
1: +  enum nl80211_mesh_power_mode local_pm;
1: +  enum nl80211_mesh_power_mode peer_pm;
1: +  enum nl80211_mesh_power_mode nonpeer_pm;
1: +  u32 expected_throughput;
1: +  u64 tx_duration;
1: +  u64 rx_duration;
1: +  u64 rx_beacon;
1: +  u8 rx_beacon_signal_avg;
1: +  u8 connected_to_gate;
1: +  struct cfg80211_tid_stats *pertid;
1: +  s8 ack_signal;
1: +  s8 avg_ack_signal;
1: +  u16 airtime_weight;
1: +  u32 rx_mpdu_count;
1: +  u32 fcs_err_count;
1: +  u32 airtime_link_metric;
1: +  u8 connected_to_as;
1:  };
1:  
1:  struct mpath_info {
1: -	u32 filled;
1: -	u32 frame_qlen;
1: -	u32 sn;
1: -	u32 metric;
1: -	u32 exptime;
1: -	u32 discovery_timeout;
1: -	u8 discovery_retries;
1: -	u8 flags;
1: -	u8 hop_count;
1: -	u32 path_change_count;
1: -	int generation;
1: +  u32 filled;
1: +  u32 frame_qlen;
1: +  u32 sn;
1: +  u32 metric;
1: +  u32 exptime;
1: +  u32 discovery_timeout;
1: +  u8 discovery_retries;
1: +  u8 flags;
1: +  u8 hop_count;
1: +  u32 path_change_count;
1: +  int generation;
1:  };
1:  
1:  struct bss_parameters {
1: -	int use_cts_prot;
1: -	int use_short_preamble;
1: -	int use_short_slot_time;
1: -	const u8 *basic_rates;
1: -	u8 basic_rates_len;
1: -	int ap_isolate;
1: -	int ht_opmode;
1: -	s8 p2p_ctwindow;
1: -	s8 p2p_opp_ps;
1: +  int use_cts_prot;
1: +  int use_short_preamble;
1: +  int use_short_slot_time;
1: +  const u8 *basic_rates;
1: +  u8 basic_rates_len;
1: +  int ap_isolate;
1: +  int ht_opmode;
1: +  s8 p2p_ctwindow;
1: +  s8 p2p_opp_ps;
1:  };
1:  
1:  struct mesh_config {
1: -	u16 dot11MeshRetryTimeout;
1: -	u16 dot11MeshConfirmTimeout;
1: -	u16 dot11MeshHoldingTimeout;
1: -	u16 dot11MeshMaxPeerLinks;
1: -	u8 dot11MeshMaxRetries;
1: -	u8 dot11MeshTTL;
1: -	u8 element_ttl;
1: -	bool auto_open_plinks;
1: -	u32 dot11MeshNbrOffsetMaxNeighbor;
1: -	u8 dot11MeshHWMPmaxPREQretries;
1: -	u32 path_refresh_time;
1: -	u16 min_discovery_timeout;
1: -	u32 dot11MeshHWMPactivePathTimeout;
1: -	u16 dot11MeshHWMPpreqMinInterval;
1: -	u16 dot11MeshHWMPperrMinInterval;
1: -	u16 dot11MeshHWMPnetDiameterTraversalTime;
1: -	u8 dot11MeshHWMPRootMode;
1: -	bool dot11MeshConnectedToMeshGate;
1: -	bool dot11MeshConnectedToAuthServer;
1: -	u16 dot11MeshHWMPRannInterval;
1: -	bool dot11MeshGateAnnouncementProtocol;
1: -	bool dot11MeshForwarding;
1: -	s32 rssi_threshold;
1: -	u16 ht_opmode;
1: -	u32 dot11MeshHWMPactivePathToRootTimeout;
1: -	u16 dot11MeshHWMProotInterval;
1: -	u16 dot11MeshHWMPconfirmationInterval;
1: -	enum nl80211_mesh_power_mode power_mode;
1: -	u16 dot11MeshAwakeWindowDuration;
1: -	u32 plink_timeout;
1: -	bool dot11MeshNolearn;
1: +  u16 dot11MeshRetryTimeout;
1: +  u16 dot11MeshConfirmTimeout;
1: +  u16 dot11MeshHoldingTimeout;
1: +  u16 dot11MeshMaxPeerLinks;
1: +  u8 dot11MeshMaxRetries;
1: +  u8 dot11MeshTTL;
1: +  u8 element_ttl;
1: +  bool auto_open_plinks;
1: +  u32 dot11MeshNbrOffsetMaxNeighbor;
1: +  u8 dot11MeshHWMPmaxPREQretries;
1: +  u32 path_refresh_time;
1: +  u16 min_discovery_timeout;
1: +  u32 dot11MeshHWMPactivePathTimeout;
1: +  u16 dot11MeshHWMPpreqMinInterval;
1: +  u16 dot11MeshHWMPperrMinInterval;
1: +  u16 dot11MeshHWMPnetDiameterTraversalTime;
1: +  u8 dot11MeshHWMPRootMode;
1: +  bool dot11MeshConnectedToMeshGate;
1: +  bool dot11MeshConnectedToAuthServer;
1: +  u16 dot11MeshHWMPRannInterval;
1: +  bool dot11MeshGateAnnouncementProtocol;
1: +  bool dot11MeshForwarding;
1: +  s32 rssi_threshold;
1: +  u16 ht_opmode;
1: +  u32 dot11MeshHWMPactivePathToRootTimeout;
1: +  u16 dot11MeshHWMProotInterval;
1: +  u16 dot11MeshHWMPconfirmationInterval;
1: +  enum nl80211_mesh_power_mode power_mode;
1: +  u16 dot11MeshAwakeWindowDuration;
1: +  u32 plink_timeout;
1: +  bool dot11MeshNolearn;
1:  };
1:  
1:  struct mesh_setup {
1: -	struct cfg80211_chan_def chandef;
1: -	const u8 *mesh_id;
1: -	u8 mesh_id_len;
1: -	u8 sync_method;
1: -	u8 path_sel_proto;
1: -	u8 path_metric;
1: -	u8 auth_id;
1: -	const u8 *ie;
1: -	u8 ie_len;
1: -	bool is_authenticated;
1: -	bool is_secure;
1: -	bool user_mpm;
1: -	u8 dtim_period;
1: -	u16 beacon_interval;
1: -	int mcast_rate[5];
1: -	u32 basic_rates;
1: -	struct cfg80211_bitrate_mask beacon_rate;
1: -	bool userspace_handles_dfs;
1: -	bool control_port_over_nl80211;
1: +  struct cfg80211_chan_def chandef;
1: +  const u8 *mesh_id;
1: +  u8 mesh_id_len;
1: +  u8 sync_method;
1: +  u8 path_sel_proto;
1: +  u8 path_metric;
1: +  u8 auth_id;
1: +  const u8 *ie;
1: +  u8 ie_len;
1: +  bool is_authenticated;
1: +  bool is_secure;
1: +  bool user_mpm;
1: +  u8 dtim_period;
1: +  u16 beacon_interval;
1: +  int mcast_rate[5];
1: +  u32 basic_rates;
1: +  struct cfg80211_bitrate_mask beacon_rate;
1: +  bool userspace_handles_dfs;
1: +  bool control_port_over_nl80211;
1:  };
1:  
1:  struct ocb_setup {
1: -	struct cfg80211_chan_def chandef;
1: +  struct cfg80211_chan_def chandef;
1:  };
1:  
1:  struct ieee80211_txq_params {
1: -	enum nl80211_ac ac;
1: -	u16 txop;
1: -	u16 cwmin;
1: -	u16 cwmax;
1: -	u8 aifs;
1: +  enum nl80211_ac ac;
1: +  u16 txop;
1: +  u16 cwmin;
1: +  u16 cwmax;
1: +  u8 aifs;
1:  };
1:  
1:  struct cfg80211_ssid {
1: -	u8 ssid[32];
1: -	u8 ssid_len;
1: +  u8 ssid[32];
1: +  u8 ssid_len;
1:  };
1:  
1:  struct cfg80211_scan_info {
1: -	u64 scan_start_tsf;
1: -	u8 tsf_bssid[6];
1: -	bool aborted;
1: +  u64 scan_start_tsf;
1: +  u8 tsf_bssid[6];
1: +  bool aborted;
1:  };
1:  
1:  struct cfg80211_scan_6ghz_params {
1: -	u32 short_ssid;
1: -	u32 channel_idx;
1: -	u8 bssid[6];
1: -	bool unsolicited_probe;
1: -	bool short_ssid_valid;
1: -	bool psc_no_listen;
1: +  u32 short_ssid;
1: +  u32 channel_idx;
1: +  u8 bssid[6];
1: +  bool unsolicited_probe;
1: +  bool short_ssid_valid;
1: +  bool psc_no_listen;
1:  };
1:  
1:  struct cfg80211_scan_request {
1: -	struct cfg80211_ssid *ssids;
1: -	int n_ssids;
1: -	u32 n_channels;
1: -	enum nl80211_bss_scan_width scan_width;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	u16 duration;
1: -	bool duration_mandatory;
1: -	u32 flags;
1: -	u32 rates[5];
1: -	struct wireless_dev *wdev;
1: -	u8 mac_addr[6];
1: -	u8 mac_addr_mask[6];
1: -	u8 bssid[6];
1: -	struct wiphy *wiphy;
1: -	long unsigned int scan_start;
1: -	struct cfg80211_scan_info info;
1: -	bool notified;
1: -	bool no_cck;
1: -	bool scan_6ghz;
1: -	u32 n_6ghz_params;
1: -	struct cfg80211_scan_6ghz_params *scan_6ghz_params;
1: -	struct ieee80211_channel *channels[0];
1: +  struct cfg80211_ssid *ssids;
1: +  int n_ssids;
1: +  u32 n_channels;
1: +  enum nl80211_bss_scan_width scan_width;
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  u16 duration;
1: +  bool duration_mandatory;
1: +  u32 flags;
1: +  u32 rates[5];
1: +  struct wireless_dev *wdev;
1: +  u8 mac_addr[6];
1: +  u8 mac_addr_mask[6];
1: +  u8 bssid[6];
1: +  struct wiphy *wiphy;
1: +  long unsigned int scan_start;
1: +  struct cfg80211_scan_info info;
1: +  bool notified;
1: +  bool no_cck;
1: +  bool scan_6ghz;
1: +  u32 n_6ghz_params;
1: +  struct cfg80211_scan_6ghz_params *scan_6ghz_params;
1: +  struct ieee80211_channel *channels[0];
1:  };
1:  
1:  enum cfg80211_signal_type {
1: -	CFG80211_SIGNAL_TYPE_NONE = 0,
1: -	CFG80211_SIGNAL_TYPE_MBM = 1,
1: -	CFG80211_SIGNAL_TYPE_UNSPEC = 2,
1: +  CFG80211_SIGNAL_TYPE_NONE = 0,
1: +  CFG80211_SIGNAL_TYPE_MBM = 1,
1: +  CFG80211_SIGNAL_TYPE_UNSPEC = 2,
1:  };
1:  
1:  struct ieee80211_txrx_stypes;
1: @@ -126930,4784 +128405,4853 @@ struct wiphy_vendor_command;
1:  struct cfg80211_pmsr_capabilities;
1:  
1:  struct wiphy {
1: -	u8 perm_addr[6];
1: -	u8 addr_mask[6];
1: -	struct mac_address *addresses;
1: -	const struct ieee80211_txrx_stypes *mgmt_stypes;
1: -	const struct ieee80211_iface_combination *iface_combinations;
1: -	int n_iface_combinations;
1: -	u16 software_iftypes;
1: -	u16 n_addresses;
1: -	u16 interface_modes;
1: -	u16 max_acl_mac_addrs;
1: -	u32 flags;
1: -	u32 regulatory_flags;
1: -	u32 features;
1: -	u8 ext_features[7];
1: -	u32 ap_sme_capa;
1: -	enum cfg80211_signal_type signal_type;
1: -	int bss_priv_size;
1: -	u8 max_scan_ssids;
1: -	u8 max_sched_scan_reqs;
1: -	u8 max_sched_scan_ssids;
1: -	u8 max_match_sets;
1: -	u16 max_scan_ie_len;
1: -	u16 max_sched_scan_ie_len;
1: -	u32 max_sched_scan_plans;
1: -	u32 max_sched_scan_plan_interval;
1: -	u32 max_sched_scan_plan_iterations;
1: -	int n_cipher_suites;
1: -	const u32 *cipher_suites;
1: -	int n_akm_suites;
1: -	const u32 *akm_suites;
1: -	const struct wiphy_iftype_akm_suites *iftype_akm_suites;
1: -	unsigned int num_iftype_akm_suites;
1: -	u8 retry_short;
1: -	u8 retry_long;
1: -	u32 frag_threshold;
1: -	u32 rts_threshold;
1: -	u8 coverage_class;
1: -	char fw_version[32];
1: -	u32 hw_version;
1: -	const struct wiphy_wowlan_support *wowlan;
1: -	struct cfg80211_wowlan *wowlan_config;
1: -	u16 max_remain_on_channel_duration;
1: -	u8 max_num_pmkids;
1: -	u32 available_antennas_tx;
1: -	u32 available_antennas_rx;
1: -	u32 probe_resp_offload;
1: -	const u8 *extended_capabilities;
1: -	const u8 *extended_capabilities_mask;
1: -	u8 extended_capabilities_len;
1: -	const struct wiphy_iftype_ext_capab *iftype_ext_capab;
1: -	unsigned int num_iftype_ext_capab;
1: -	const void *privid;
1: -	struct ieee80211_supported_band *bands[5];
1: -	void (*reg_notifier)(struct wiphy *, struct regulatory_request *);
1: -	const struct ieee80211_regdomain *regd;
1: -	struct device dev;
1: -	bool registered;
1: -	struct dentry *debugfsdir;
1: -	const struct ieee80211_ht_cap *ht_capa_mod_mask;
1: -	const struct ieee80211_vht_cap *vht_capa_mod_mask;
1: -	struct list_head wdev_list;
1: -	possible_net_t _net;
1: -	const struct wiphy_coalesce_support *coalesce;
1: -	const struct wiphy_vendor_command *vendor_commands;
1: -	const struct nl80211_vendor_cmd_info *vendor_events;
1: -	int n_vendor_commands;
1: -	int n_vendor_events;
1: -	u16 max_ap_assoc_sta;
1: -	u8 max_num_csa_counters;
1: -	u32 bss_select_support;
1: -	u8 nan_supported_bands;
1: -	u32 txq_limit;
1: -	u32 txq_memory_limit;
1: -	u32 txq_quantum;
1: -	long unsigned int tx_queue_len;
1: -	u8 support_mbssid: 1;
1: -	u8 support_only_he_mbssid: 1;
1: -	const struct cfg80211_pmsr_capabilities *pmsr_capa;
1: -	struct {
1: -		u64 peer;
1: -		u64 vif;
1: -		u8 max_retry;
1: -	} tid_config_support;
1: -	u8 max_data_retry_count;
1: -	long: 56;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	char priv[0];
1: +  u8 perm_addr[6];
1: +  u8 addr_mask[6];
1: +  struct mac_address *addresses;
1: +  const struct ieee80211_txrx_stypes *mgmt_stypes;
1: +  const struct ieee80211_iface_combination *iface_combinations;
1: +  int n_iface_combinations;
1: +  u16 software_iftypes;
1: +  u16 n_addresses;
1: +  u16 interface_modes;
1: +  u16 max_acl_mac_addrs;
1: +  u32 flags;
1: +  u32 regulatory_flags;
1: +  u32 features;
1: +  u8 ext_features[7];
1: +  u32 ap_sme_capa;
1: +  enum cfg80211_signal_type signal_type;
1: +  int bss_priv_size;
1: +  u8 max_scan_ssids;
1: +  u8 max_sched_scan_reqs;
1: +  u8 max_sched_scan_ssids;
1: +  u8 max_match_sets;
1: +  u16 max_scan_ie_len;
1: +  u16 max_sched_scan_ie_len;
1: +  u32 max_sched_scan_plans;
1: +  u32 max_sched_scan_plan_interval;
1: +  u32 max_sched_scan_plan_iterations;
1: +  int n_cipher_suites;
1: +  const u32 *cipher_suites;
1: +  int n_akm_suites;
1: +  const u32 *akm_suites;
1: +  const struct wiphy_iftype_akm_suites *iftype_akm_suites;
1: +  unsigned int num_iftype_akm_suites;
1: +  u8 retry_short;
1: +  u8 retry_long;
1: +  u32 frag_threshold;
1: +  u32 rts_threshold;
1: +  u8 coverage_class;
1: +  char fw_version[32];
1: +  u32 hw_version;
1: +  const struct wiphy_wowlan_support *wowlan;
1: +  struct cfg80211_wowlan *wowlan_config;
1: +  u16 max_remain_on_channel_duration;
1: +  u8 max_num_pmkids;
1: +  u32 available_antennas_tx;
1: +  u32 available_antennas_rx;
1: +  u32 probe_resp_offload;
1: +  const u8 *extended_capabilities;
1: +  const u8 *extended_capabilities_mask;
1: +  u8 extended_capabilities_len;
1: +  const struct wiphy_iftype_ext_capab *iftype_ext_capab;
1: +  unsigned int num_iftype_ext_capab;
1: +  const void *privid;
1: +  struct ieee80211_supported_band *bands[5];
1: +  void (*reg_notifier)(struct wiphy *, struct regulatory_request *);
1: +  const struct ieee80211_regdomain *regd;
1: +  struct device dev;
1: +  bool registered;
1: +  struct dentry *debugfsdir;
1: +  const struct ieee80211_ht_cap *ht_capa_mod_mask;
1: +  const struct ieee80211_vht_cap *vht_capa_mod_mask;
1: +  struct list_head wdev_list;
1: +  possible_net_t _net;
1: +  const struct wiphy_coalesce_support *coalesce;
1: +  const struct wiphy_vendor_command *vendor_commands;
1: +  const struct nl80211_vendor_cmd_info *vendor_events;
1: +  int n_vendor_commands;
1: +  int n_vendor_events;
1: +  u16 max_ap_assoc_sta;
1: +  u8 max_num_csa_counters;
1: +  u32 bss_select_support;
1: +  u8 nan_supported_bands;
1: +  u32 txq_limit;
1: +  u32 txq_memory_limit;
1: +  u32 txq_quantum;
1: +  long unsigned int tx_queue_len;
1: +  u8 support_mbssid : 1;
1: +  u8 support_only_he_mbssid : 1;
1: +  const struct cfg80211_pmsr_capabilities *pmsr_capa;
1: +  struct {
1: +    u64 peer;
1: +    u64 vif;
1: +    u8 max_retry;
1: +  } tid_config_support;
1: +  u8 max_data_retry_count;
1: +  long : 56;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  char priv[0];
1:  };
1:  
1:  struct cfg80211_match_set {
1: -	struct cfg80211_ssid ssid;
1: -	u8 bssid[6];
1: -	s32 rssi_thold;
1: -	s32 per_band_rssi_thold[5];
1: +  struct cfg80211_ssid ssid;
1: +  u8 bssid[6];
1: +  s32 rssi_thold;
1: +  s32 per_band_rssi_thold[5];
1:  };
1:  
1:  struct cfg80211_sched_scan_plan {
1: -	u32 interval;
1: -	u32 iterations;
1: +  u32 interval;
1: +  u32 iterations;
1:  };
1:  
1:  struct cfg80211_bss_select_adjust {
1: -	enum nl80211_band band;
1: -	s8 delta;
1: +  enum nl80211_band band;
1: +  s8 delta;
1:  };
1:  
1:  struct cfg80211_sched_scan_request {
1: -	u64 reqid;
1: -	struct cfg80211_ssid *ssids;
1: -	int n_ssids;
1: -	u32 n_channels;
1: -	enum nl80211_bss_scan_width scan_width;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	u32 flags;
1: -	struct cfg80211_match_set *match_sets;
1: -	int n_match_sets;
1: -	s32 min_rssi_thold;
1: -	u32 delay;
1: -	struct cfg80211_sched_scan_plan *scan_plans;
1: -	int n_scan_plans;
1: -	u8 mac_addr[6];
1: -	u8 mac_addr_mask[6];
1: -	bool relative_rssi_set;
1: -	s8 relative_rssi;
1: -	struct cfg80211_bss_select_adjust rssi_adjust;
1: -	struct wiphy *wiphy;
1: -	struct net_device *dev;
1: -	long unsigned int scan_start;
1: -	bool report_results;
1: -	struct callback_head callback_head;
1: -	u32 owner_nlportid;
1: -	bool nl_owner_dead;
1: -	struct list_head list;
1: -	struct ieee80211_channel *channels[0];
1: +  u64 reqid;
1: +  struct cfg80211_ssid *ssids;
1: +  int n_ssids;
1: +  u32 n_channels;
1: +  enum nl80211_bss_scan_width scan_width;
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  u32 flags;
1: +  struct cfg80211_match_set *match_sets;
1: +  int n_match_sets;
1: +  s32 min_rssi_thold;
1: +  u32 delay;
1: +  struct cfg80211_sched_scan_plan *scan_plans;
1: +  int n_scan_plans;
1: +  u8 mac_addr[6];
1: +  u8 mac_addr_mask[6];
1: +  bool relative_rssi_set;
1: +  s8 relative_rssi;
1: +  struct cfg80211_bss_select_adjust rssi_adjust;
1: +  struct wiphy *wiphy;
1: +  struct net_device *dev;
1: +  long unsigned int scan_start;
1: +  bool report_results;
1: +  struct callback_head callback_head;
1: +  u32 owner_nlportid;
1: +  bool nl_owner_dead;
1: +  struct list_head list;
1: +  struct ieee80211_channel *channels[0];
1:  };
1:  
1:  struct cfg80211_bss_ies {
1: -	u64 tsf;
1: -	struct callback_head callback_head;
1: -	int len;
1: -	bool from_beacon;
1: -	u8 data[0];
1: +  u64 tsf;
1: +  struct callback_head callback_head;
1: +  int len;
1: +  bool from_beacon;
1: +  u8 data[0];
1:  };
1:  
1:  struct cfg80211_bss {
1: -	struct ieee80211_channel *channel;
1: -	enum nl80211_bss_scan_width scan_width;
1: -	const struct cfg80211_bss_ies *ies;
1: -	const struct cfg80211_bss_ies *beacon_ies;
1: -	const struct cfg80211_bss_ies *proberesp_ies;
1: -	struct cfg80211_bss *hidden_beacon_bss;
1: -	struct cfg80211_bss *transmitted_bss;
1: -	struct list_head nontrans_list;
1: -	s32 signal;
1: -	u16 beacon_interval;
1: -	u16 capability;
1: -	u8 bssid[6];
1: -	u8 chains;
1: -	s8 chain_signal[4];
1: -	u8 bssid_index;
1: -	u8 max_bssid_indicator;
1: -	int: 24;
1: -	u8 priv[0];
1: +  struct ieee80211_channel *channel;
1: +  enum nl80211_bss_scan_width scan_width;
1: +  const struct cfg80211_bss_ies *ies;
1: +  const struct cfg80211_bss_ies *beacon_ies;
1: +  const struct cfg80211_bss_ies *proberesp_ies;
1: +  struct cfg80211_bss *hidden_beacon_bss;
1: +  struct cfg80211_bss *transmitted_bss;
1: +  struct list_head nontrans_list;
1: +  s32 signal;
1: +  u16 beacon_interval;
1: +  u16 capability;
1: +  u8 bssid[6];
1: +  u8 chains;
1: +  s8 chain_signal[4];
1: +  u8 bssid_index;
1: +  u8 max_bssid_indicator;
1: +  int : 24;
1: +  u8 priv[0];
1:  };
1:  
1:  struct cfg80211_auth_request {
1: -	struct cfg80211_bss *bss;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	enum nl80211_auth_type auth_type;
1: -	const u8 *key;
1: -	u8 key_len;
1: -	u8 key_idx;
1: -	const u8 *auth_data;
1: -	size_t auth_data_len;
1: +  struct cfg80211_bss *bss;
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  enum nl80211_auth_type auth_type;
1: +  const u8 *key;
1: +  u8 key_len;
1: +  u8 key_idx;
1: +  const u8 *auth_data;
1: +  size_t auth_data_len;
1:  };
1:  
1:  struct cfg80211_assoc_request {
1: -	struct cfg80211_bss *bss;
1: -	const u8 *ie;
1: -	const u8 *prev_bssid;
1: -	size_t ie_len;
1: -	struct cfg80211_crypto_settings crypto;
1: -	bool use_mfp;
1: -	int: 24;
1: -	u32 flags;
1: -	struct ieee80211_ht_cap ht_capa;
1: -	struct ieee80211_ht_cap ht_capa_mask;
1: -	struct ieee80211_vht_cap vht_capa;
1: -	struct ieee80211_vht_cap vht_capa_mask;
1: -	int: 32;
1: -	const u8 *fils_kek;
1: -	size_t fils_kek_len;
1: -	const u8 *fils_nonces;
1: -	struct ieee80211_s1g_cap s1g_capa;
1: -	struct ieee80211_s1g_cap s1g_capa_mask;
1: -	short: 16;
1: +  struct cfg80211_bss *bss;
1: +  const u8 *ie;
1: +  const u8 *prev_bssid;
1: +  size_t ie_len;
1: +  struct cfg80211_crypto_settings crypto;
1: +  bool use_mfp;
1: +  int : 24;
1: +  u32 flags;
1: +  struct ieee80211_ht_cap ht_capa;
1: +  struct ieee80211_ht_cap ht_capa_mask;
1: +  struct ieee80211_vht_cap vht_capa;
1: +  struct ieee80211_vht_cap vht_capa_mask;
1: +  int : 32;
1: +  const u8 *fils_kek;
1: +  size_t fils_kek_len;
1: +  const u8 *fils_nonces;
1: +  struct ieee80211_s1g_cap s1g_capa;
1: +  struct ieee80211_s1g_cap s1g_capa_mask;
1: +  short : 16;
1:  } __attribute__((packed));
1:  
1:  struct cfg80211_deauth_request {
1: -	const u8 *bssid;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	u16 reason_code;
1: -	bool local_state_change;
1: +  const u8 *bssid;
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  u16 reason_code;
1: +  bool local_state_change;
1:  };
1:  
1:  struct cfg80211_disassoc_request {
1: -	struct cfg80211_bss *bss;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	u16 reason_code;
1: -	bool local_state_change;
1: +  struct cfg80211_bss *bss;
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  u16 reason_code;
1: +  bool local_state_change;
1:  };
1:  
1:  struct cfg80211_ibss_params {
1: -	const u8 *ssid;
1: -	const u8 *bssid;
1: -	struct cfg80211_chan_def chandef;
1: -	const u8 *ie;
1: -	u8 ssid_len;
1: -	u8 ie_len;
1: -	u16 beacon_interval;
1: -	u32 basic_rates;
1: -	bool channel_fixed;
1: -	bool privacy;
1: -	bool control_port;
1: -	bool control_port_over_nl80211;
1: -	bool userspace_handles_dfs;
1: -	int: 24;
1: -	int mcast_rate[5];
1: -	struct ieee80211_ht_cap ht_capa;
1: -	struct ieee80211_ht_cap ht_capa_mask;
1: -	struct key_params *wep_keys;
1: -	int wep_tx_key;
1: -	int: 32;
1: +  const u8 *ssid;
1: +  const u8 *bssid;
1: +  struct cfg80211_chan_def chandef;
1: +  const u8 *ie;
1: +  u8 ssid_len;
1: +  u8 ie_len;
1: +  u16 beacon_interval;
1: +  u32 basic_rates;
1: +  bool channel_fixed;
1: +  bool privacy;
1: +  bool control_port;
1: +  bool control_port_over_nl80211;
1: +  bool userspace_handles_dfs;
1: +  int : 24;
1: +  int mcast_rate[5];
1: +  struct ieee80211_ht_cap ht_capa;
1: +  struct ieee80211_ht_cap ht_capa_mask;
1: +  struct key_params *wep_keys;
1: +  int wep_tx_key;
1: +  int : 32;
1:  } __attribute__((packed));
1:  
1:  struct cfg80211_bss_selection {
1: -	enum nl80211_bss_select_attr behaviour;
1: -	union {
1: -		enum nl80211_band band_pref;
1: -		struct cfg80211_bss_select_adjust adjust;
1: -	} param;
1: +  enum nl80211_bss_select_attr behaviour;
1: +  union {
1: +    enum nl80211_band band_pref;
1: +    struct cfg80211_bss_select_adjust adjust;
1: +  } param;
1:  };
1:  
1:  struct cfg80211_connect_params {
1: -	struct ieee80211_channel *channel;
1: -	struct ieee80211_channel *channel_hint;
1: -	const u8 *bssid;
1: -	const u8 *bssid_hint;
1: -	const u8 *ssid;
1: -	size_t ssid_len;
1: -	enum nl80211_auth_type auth_type;
1: -	int: 32;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	bool privacy;
1: -	int: 24;
1: -	enum nl80211_mfp mfp;
1: -	struct cfg80211_crypto_settings crypto;
1: -	const u8 *key;
1: -	u8 key_len;
1: -	u8 key_idx;
1: -	short: 16;
1: -	u32 flags;
1: -	int bg_scan_period;
1: -	struct ieee80211_ht_cap ht_capa;
1: -	struct ieee80211_ht_cap ht_capa_mask;
1: -	struct ieee80211_vht_cap vht_capa;
1: -	struct ieee80211_vht_cap vht_capa_mask;
1: -	bool pbss;
1: -	int: 24;
1: -	struct cfg80211_bss_selection bss_select;
1: -	const u8 *prev_bssid;
1: -	const u8 *fils_erp_username;
1: -	size_t fils_erp_username_len;
1: -	const u8 *fils_erp_realm;
1: -	size_t fils_erp_realm_len;
1: -	u16 fils_erp_next_seq_num;
1: -	long: 48;
1: -	const u8 *fils_erp_rrk;
1: -	size_t fils_erp_rrk_len;
1: -	bool want_1x;
1: -	int: 24;
1: -	struct ieee80211_edmg edmg;
1: -	int: 32;
1: +  struct ieee80211_channel *channel;
1: +  struct ieee80211_channel *channel_hint;
1: +  const u8 *bssid;
1: +  const u8 *bssid_hint;
1: +  const u8 *ssid;
1: +  size_t ssid_len;
1: +  enum nl80211_auth_type auth_type;
1: +  int : 32;
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  bool privacy;
1: +  int : 24;
1: +  enum nl80211_mfp mfp;
1: +  struct cfg80211_crypto_settings crypto;
1: +  const u8 *key;
1: +  u8 key_len;
1: +  u8 key_idx;
1: +  short : 16;
1: +  u32 flags;
1: +  int bg_scan_period;
1: +  struct ieee80211_ht_cap ht_capa;
1: +  struct ieee80211_ht_cap ht_capa_mask;
1: +  struct ieee80211_vht_cap vht_capa;
1: +  struct ieee80211_vht_cap vht_capa_mask;
1: +  bool pbss;
1: +  int : 24;
1: +  struct cfg80211_bss_selection bss_select;
1: +  const u8 *prev_bssid;
1: +  const u8 *fils_erp_username;
1: +  size_t fils_erp_username_len;
1: +  const u8 *fils_erp_realm;
1: +  size_t fils_erp_realm_len;
1: +  u16 fils_erp_next_seq_num;
1: +  long : 48;
1: +  const u8 *fils_erp_rrk;
1: +  size_t fils_erp_rrk_len;
1: +  bool want_1x;
1: +  int : 24;
1: +  struct ieee80211_edmg edmg;
1: +  int : 32;
1:  } __attribute__((packed));
1:  
1:  struct cfg80211_pmksa {
1: -	const u8 *bssid;
1: -	const u8 *pmkid;
1: -	const u8 *pmk;
1: -	size_t pmk_len;
1: -	const u8 *ssid;
1: -	size_t ssid_len;
1: -	const u8 *cache_id;
1: -	u32 pmk_lifetime;
1: -	u8 pmk_reauth_threshold;
1: +  const u8 *bssid;
1: +  const u8 *pmkid;
1: +  const u8 *pmk;
1: +  size_t pmk_len;
1: +  const u8 *ssid;
1: +  size_t ssid_len;
1: +  const u8 *cache_id;
1: +  u32 pmk_lifetime;
1: +  u8 pmk_reauth_threshold;
1:  };
1:  
1:  struct cfg80211_pkt_pattern {
1: -	const u8 *mask;
1: -	const u8 *pattern;
1: -	int pattern_len;
1: -	int pkt_offset;
1: +  const u8 *mask;
1: +  const u8 *pattern;
1: +  int pattern_len;
1: +  int pkt_offset;
1:  };
1:  
1:  struct cfg80211_wowlan_tcp {
1: -	struct socket *sock;
1: -	__be32 src;
1: -	__be32 dst;
1: -	u16 src_port;
1: -	u16 dst_port;
1: -	u8 dst_mac[6];
1: -	int payload_len;
1: -	const u8 *payload;
1: -	struct nl80211_wowlan_tcp_data_seq payload_seq;
1: -	u32 data_interval;
1: -	u32 wake_len;
1: -	const u8 *wake_data;
1: -	const u8 *wake_mask;
1: -	u32 tokens_size;
1: -	struct nl80211_wowlan_tcp_data_token payload_tok;
1: +  struct socket *sock;
1: +  __be32 src;
1: +  __be32 dst;
1: +  u16 src_port;
1: +  u16 dst_port;
1: +  u8 dst_mac[6];
1: +  int payload_len;
1: +  const u8 *payload;
1: +  struct nl80211_wowlan_tcp_data_seq payload_seq;
1: +  u32 data_interval;
1: +  u32 wake_len;
1: +  const u8 *wake_data;
1: +  const u8 *wake_mask;
1: +  u32 tokens_size;
1: +  struct nl80211_wowlan_tcp_data_token payload_tok;
1:  };
1:  
1:  struct cfg80211_wowlan {
1: -	bool any;
1: -	bool disconnect;
1: -	bool magic_pkt;
1: -	bool gtk_rekey_failure;
1: -	bool eap_identity_req;
1: -	bool four_way_handshake;
1: -	bool rfkill_release;
1: -	struct cfg80211_pkt_pattern *patterns;
1: -	struct cfg80211_wowlan_tcp *tcp;
1: -	int n_patterns;
1: -	struct cfg80211_sched_scan_request *nd_config;
1: +  bool any;
1: +  bool disconnect;
1: +  bool magic_pkt;
1: +  bool gtk_rekey_failure;
1: +  bool eap_identity_req;
1: +  bool four_way_handshake;
1: +  bool rfkill_release;
1: +  struct cfg80211_pkt_pattern *patterns;
1: +  struct cfg80211_wowlan_tcp *tcp;
1: +  int n_patterns;
1: +  struct cfg80211_sched_scan_request *nd_config;
1:  };
1:  
1:  struct cfg80211_coalesce_rules {
1: -	int delay;
1: -	enum nl80211_coalesce_condition condition;
1: -	struct cfg80211_pkt_pattern *patterns;
1: -	int n_patterns;
1: +  int delay;
1: +  enum nl80211_coalesce_condition condition;
1: +  struct cfg80211_pkt_pattern *patterns;
1: +  int n_patterns;
1:  };
1:  
1:  struct cfg80211_coalesce {
1: -	struct cfg80211_coalesce_rules *rules;
1: -	int n_rules;
1: +  struct cfg80211_coalesce_rules *rules;
1: +  int n_rules;
1:  };
1:  
1:  struct cfg80211_gtk_rekey_data {
1: -	const u8 *kek;
1: -	const u8 *kck;
1: -	const u8 *replay_ctr;
1: -	u32 akm;
1: -	u8 kek_len;
1: -	u8 kck_len;
1: +  const u8 *kek;
1: +  const u8 *kck;
1: +  const u8 *replay_ctr;
1: +  u32 akm;
1: +  u8 kek_len;
1: +  u8 kck_len;
1:  };
1:  
1:  struct cfg80211_update_ft_ies_params {
1: -	u16 md;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: +  u16 md;
1: +  const u8 *ie;
1: +  size_t ie_len;
1:  };
1:  
1:  struct cfg80211_mgmt_tx_params {
1: -	struct ieee80211_channel *chan;
1: -	bool offchan;
1: -	unsigned int wait;
1: -	const u8 *buf;
1: -	size_t len;
1: -	bool no_cck;
1: -	bool dont_wait_for_ack;
1: -	int n_csa_offsets;
1: -	const u16 *csa_offsets;
1: +  struct ieee80211_channel *chan;
1: +  bool offchan;
1: +  unsigned int wait;
1: +  const u8 *buf;
1: +  size_t len;
1: +  bool no_cck;
1: +  bool dont_wait_for_ack;
1: +  int n_csa_offsets;
1: +  const u16 *csa_offsets;
1:  };
1:  
1:  struct cfg80211_dscp_exception {
1: -	u8 dscp;
1: -	u8 up;
1: +  u8 dscp;
1: +  u8 up;
1:  };
1:  
1:  struct cfg80211_dscp_range {
1: -	u8 low;
1: -	u8 high;
1: +  u8 low;
1: +  u8 high;
1:  };
1:  
1:  struct cfg80211_qos_map {
1: -	u8 num_des;
1: -	struct cfg80211_dscp_exception dscp_exception[21];
1: -	struct cfg80211_dscp_range up[8];
1: +  u8 num_des;
1: +  struct cfg80211_dscp_exception dscp_exception[21];
1: +  struct cfg80211_dscp_range up[8];
1:  };
1:  
1:  struct cfg80211_nan_conf {
1: -	u8 master_pref;
1: -	u8 bands;
1: +  u8 master_pref;
1: +  u8 bands;
1:  };
1:  
1:  struct cfg80211_nan_func_filter {
1: -	const u8 *filter;
1: -	u8 len;
1: +  const u8 *filter;
1: +  u8 len;
1:  };
1:  
1:  struct cfg80211_nan_func {
1: -	enum nl80211_nan_function_type type;
1: -	u8 service_id[6];
1: -	u8 publish_type;
1: -	bool close_range;
1: -	bool publish_bcast;
1: -	bool subscribe_active;
1: -	u8 followup_id;
1: -	u8 followup_reqid;
1: -	struct mac_address followup_dest;
1: -	u32 ttl;
1: -	const u8 *serv_spec_info;
1: -	u8 serv_spec_info_len;
1: -	bool srf_include;
1: -	const u8 *srf_bf;
1: -	u8 srf_bf_len;
1: -	u8 srf_bf_idx;
1: -	struct mac_address *srf_macs;
1: -	int srf_num_macs;
1: -	struct cfg80211_nan_func_filter *rx_filters;
1: -	struct cfg80211_nan_func_filter *tx_filters;
1: -	u8 num_tx_filters;
1: -	u8 num_rx_filters;
1: -	u8 instance_id;
1: -	u64 cookie;
1: +  enum nl80211_nan_function_type type;
1: +  u8 service_id[6];
1: +  u8 publish_type;
1: +  bool close_range;
1: +  bool publish_bcast;
1: +  bool subscribe_active;
1: +  u8 followup_id;
1: +  u8 followup_reqid;
1: +  struct mac_address followup_dest;
1: +  u32 ttl;
1: +  const u8 *serv_spec_info;
1: +  u8 serv_spec_info_len;
1: +  bool srf_include;
1: +  const u8 *srf_bf;
1: +  u8 srf_bf_len;
1: +  u8 srf_bf_idx;
1: +  struct mac_address *srf_macs;
1: +  int srf_num_macs;
1: +  struct cfg80211_nan_func_filter *rx_filters;
1: +  struct cfg80211_nan_func_filter *tx_filters;
1: +  u8 num_tx_filters;
1: +  u8 num_rx_filters;
1: +  u8 instance_id;
1: +  u64 cookie;
1:  };
1:  
1:  struct cfg80211_pmk_conf {
1: -	const u8 *aa;
1: -	u8 pmk_len;
1: -	const u8 *pmk;
1: -	const u8 *pmk_r0_name;
1: +  const u8 *aa;
1: +  u8 pmk_len;
1: +  const u8 *pmk;
1: +  const u8 *pmk_r0_name;
1:  };
1:  
1:  struct cfg80211_external_auth_params {
1: -	enum nl80211_external_auth_action action;
1: -	u8 bssid[6];
1: -	struct cfg80211_ssid ssid;
1: -	unsigned int key_mgmt_suite;
1: -	u16 status;
1: -	const u8 *pmkid;
1: +  enum nl80211_external_auth_action action;
1: +  u8 bssid[6];
1: +  struct cfg80211_ssid ssid;
1: +  unsigned int key_mgmt_suite;
1: +  u16 status;
1: +  const u8 *pmkid;
1:  };
1:  
1:  struct cfg80211_ftm_responder_stats {
1: -	u32 filled;
1: -	u32 success_num;
1: -	u32 partial_num;
1: -	u32 failed_num;
1: -	u32 asap_num;
1: -	u32 non_asap_num;
1: -	u64 total_duration_ms;
1: -	u32 unknown_triggers_num;
1: -	u32 reschedule_requests_num;
1: -	u32 out_of_window_triggers_num;
1: +  u32 filled;
1: +  u32 success_num;
1: +  u32 partial_num;
1: +  u32 failed_num;
1: +  u32 asap_num;
1: +  u32 non_asap_num;
1: +  u64 total_duration_ms;
1: +  u32 unknown_triggers_num;
1: +  u32 reschedule_requests_num;
1: +  u32 out_of_window_triggers_num;
1:  };
1:  
1:  struct cfg80211_pmsr_ftm_request_peer {
1: -	enum nl80211_preamble preamble;
1: -	u16 burst_period;
1: -	u8 requested: 1;
1: -	u8 asap: 1;
1: -	u8 request_lci: 1;
1: -	u8 request_civicloc: 1;
1: -	u8 trigger_based: 1;
1: -	u8 non_trigger_based: 1;
1: -	u8 num_bursts_exp;
1: -	u8 burst_duration;
1: -	u8 ftms_per_burst;
1: -	u8 ftmr_retries;
1: +  enum nl80211_preamble preamble;
1: +  u16 burst_period;
1: +  u8 requested : 1;
1: +  u8 asap : 1;
1: +  u8 request_lci : 1;
1: +  u8 request_civicloc : 1;
1: +  u8 trigger_based : 1;
1: +  u8 non_trigger_based : 1;
1: +  u8 num_bursts_exp;
1: +  u8 burst_duration;
1: +  u8 ftms_per_burst;
1: +  u8 ftmr_retries;
1:  };
1:  
1:  struct cfg80211_pmsr_request_peer {
1: -	u8 addr[6];
1: -	struct cfg80211_chan_def chandef;
1: -	u8 report_ap_tsf: 1;
1: -	struct cfg80211_pmsr_ftm_request_peer ftm;
1: +  u8 addr[6];
1: +  struct cfg80211_chan_def chandef;
1: +  u8 report_ap_tsf : 1;
1: +  struct cfg80211_pmsr_ftm_request_peer ftm;
1:  };
1:  
1:  struct cfg80211_pmsr_request {
1: -	u64 cookie;
1: -	void *drv_data;
1: -	u32 n_peers;
1: -	u32 nl_portid;
1: -	u32 timeout;
1: -	u8 mac_addr[6];
1: -	u8 mac_addr_mask[6];
1: -	struct list_head list;
1: -	struct cfg80211_pmsr_request_peer peers[0];
1: +  u64 cookie;
1: +  void *drv_data;
1: +  u32 n_peers;
1: +  u32 nl_portid;
1: +  u32 timeout;
1: +  u8 mac_addr[6];
1: +  u8 mac_addr_mask[6];
1: +  struct list_head list;
1: +  struct cfg80211_pmsr_request_peer peers[0];
1:  };
1:  
1:  struct cfg80211_update_owe_info {
1: -	u8 peer[6];
1: -	u16 status;
1: -	const u8 *ie;
1: -	size_t ie_len;
1: +  u8 peer[6];
1: +  u16 status;
1: +  const u8 *ie;
1: +  size_t ie_len;
1:  };
1:  
1:  struct mgmt_frame_regs {
1: -	u32 global_stypes;
1: -	u32 interface_stypes;
1: -	u32 global_mcast_stypes;
1: -	u32 interface_mcast_stypes;
1: +  u32 global_stypes;
1: +  u32 interface_stypes;
1: +  u32 global_mcast_stypes;
1: +  u32 interface_mcast_stypes;
1:  };
1:  
1:  struct cfg80211_ops {
1: -	int (*suspend)(struct wiphy *, struct cfg80211_wowlan *);
1: -	int (*resume)(struct wiphy *);
1: -	void (*set_wakeup)(struct wiphy *, bool);
1: -	struct wireless_dev * (*add_virtual_intf)(struct wiphy *, const char *, unsigned char, enum nl80211_iftype, struct vif_params *);
1: -	int (*del_virtual_intf)(struct wiphy *, struct wireless_dev *);
1: -	int (*change_virtual_intf)(struct wiphy *, struct net_device *, enum nl80211_iftype, struct vif_params *);
1: -	int (*add_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *, struct key_params *);
1: -	int (*get_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *, void *, void (*)(void *, struct key_params *));
1: -	int (*del_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *);
1: -	int (*set_default_key)(struct wiphy *, struct net_device *, u8, bool, bool);
1: -	int (*set_default_mgmt_key)(struct wiphy *, struct net_device *, u8);
1: -	int (*set_default_beacon_key)(struct wiphy *, struct net_device *, u8);
1: -	int (*start_ap)(struct wiphy *, struct net_device *, struct cfg80211_ap_settings *);
1: -	int (*change_beacon)(struct wiphy *, struct net_device *, struct cfg80211_beacon_data *);
1: -	int (*stop_ap)(struct wiphy *, struct net_device *);
1: -	int (*add_station)(struct wiphy *, struct net_device *, const u8 *, struct station_parameters *);
1: -	int (*del_station)(struct wiphy *, struct net_device *, struct station_del_parameters *);
1: -	int (*change_station)(struct wiphy *, struct net_device *, const u8 *, struct station_parameters *);
1: -	int (*get_station)(struct wiphy *, struct net_device *, const u8 *, struct station_info *);
1: -	int (*dump_station)(struct wiphy *, struct net_device *, int, u8 *, struct station_info *);
1: -	int (*add_mpath)(struct wiphy *, struct net_device *, const u8 *, const u8 *);
1: -	int (*del_mpath)(struct wiphy *, struct net_device *, const u8 *);
1: -	int (*change_mpath)(struct wiphy *, struct net_device *, const u8 *, const u8 *);
1: -	int (*get_mpath)(struct wiphy *, struct net_device *, u8 *, u8 *, struct mpath_info *);
1: -	int (*dump_mpath)(struct wiphy *, struct net_device *, int, u8 *, u8 *, struct mpath_info *);
1: -	int (*get_mpp)(struct wiphy *, struct net_device *, u8 *, u8 *, struct mpath_info *);
1: -	int (*dump_mpp)(struct wiphy *, struct net_device *, int, u8 *, u8 *, struct mpath_info *);
1: -	int (*get_mesh_config)(struct wiphy *, struct net_device *, struct mesh_config *);
1: -	int (*update_mesh_config)(struct wiphy *, struct net_device *, u32, const struct mesh_config *);
1: -	int (*join_mesh)(struct wiphy *, struct net_device *, const struct mesh_config *, const struct mesh_setup *);
1: -	int (*leave_mesh)(struct wiphy *, struct net_device *);
1: -	int (*join_ocb)(struct wiphy *, struct net_device *, struct ocb_setup *);
1: -	int (*leave_ocb)(struct wiphy *, struct net_device *);
1: -	int (*change_bss)(struct wiphy *, struct net_device *, struct bss_parameters *);
1: -	int (*set_txq_params)(struct wiphy *, struct net_device *, struct ieee80211_txq_params *);
1: -	int (*libertas_set_mesh_channel)(struct wiphy *, struct net_device *, struct ieee80211_channel *);
1: -	int (*set_monitor_channel)(struct wiphy *, struct cfg80211_chan_def *);
1: -	int (*scan)(struct wiphy *, struct cfg80211_scan_request *);
1: -	void (*abort_scan)(struct wiphy *, struct wireless_dev *);
1: -	int (*auth)(struct wiphy *, struct net_device *, struct cfg80211_auth_request *);
1: -	int (*assoc)(struct wiphy *, struct net_device *, struct cfg80211_assoc_request *);
1: -	int (*deauth)(struct wiphy *, struct net_device *, struct cfg80211_deauth_request *);
1: -	int (*disassoc)(struct wiphy *, struct net_device *, struct cfg80211_disassoc_request *);
1: -	int (*connect)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *);
1: -	int (*update_connect_params)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *, u32);
1: -	int (*disconnect)(struct wiphy *, struct net_device *, u16);
1: -	int (*join_ibss)(struct wiphy *, struct net_device *, struct cfg80211_ibss_params *);
1: -	int (*leave_ibss)(struct wiphy *, struct net_device *);
1: -	int (*set_mcast_rate)(struct wiphy *, struct net_device *, int *);
1: -	int (*set_wiphy_params)(struct wiphy *, u32);
1: -	int (*set_tx_power)(struct wiphy *, struct wireless_dev *, enum nl80211_tx_power_setting, int);
1: -	int (*get_tx_power)(struct wiphy *, struct wireless_dev *, int *);
1: -	void (*rfkill_poll)(struct wiphy *);
1: -	int (*set_bitrate_mask)(struct wiphy *, struct net_device *, const u8 *, const struct cfg80211_bitrate_mask *);
1: -	int (*dump_survey)(struct wiphy *, struct net_device *, int, struct survey_info *);
1: -	int (*set_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *);
1: -	int (*del_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *);
1: -	int (*flush_pmksa)(struct wiphy *, struct net_device *);
1: -	int (*remain_on_channel)(struct wiphy *, struct wireless_dev *, struct ieee80211_channel *, unsigned int, u64 *);
1: -	int (*cancel_remain_on_channel)(struct wiphy *, struct wireless_dev *, u64);
1: -	int (*mgmt_tx)(struct wiphy *, struct wireless_dev *, struct cfg80211_mgmt_tx_params *, u64 *);
1: -	int (*mgmt_tx_cancel_wait)(struct wiphy *, struct wireless_dev *, u64);
1: -	int (*set_power_mgmt)(struct wiphy *, struct net_device *, bool, int);
1: -	int (*set_cqm_rssi_config)(struct wiphy *, struct net_device *, s32, u32);
1: -	int (*set_cqm_rssi_range_config)(struct wiphy *, struct net_device *, s32, s32);
1: -	int (*set_cqm_txe_config)(struct wiphy *, struct net_device *, u32, u32, u32);
1: -	void (*update_mgmt_frame_registrations)(struct wiphy *, struct wireless_dev *, struct mgmt_frame_regs *);
1: -	int (*set_antenna)(struct wiphy *, u32, u32);
1: -	int (*get_antenna)(struct wiphy *, u32 *, u32 *);
1: -	int (*sched_scan_start)(struct wiphy *, struct net_device *, struct cfg80211_sched_scan_request *);
1: -	int (*sched_scan_stop)(struct wiphy *, struct net_device *, u64);
1: -	int (*set_rekey_data)(struct wiphy *, struct net_device *, struct cfg80211_gtk_rekey_data *);
1: -	int (*tdls_mgmt)(struct wiphy *, struct net_device *, const u8 *, u8, u8, u16, u32, bool, const u8 *, size_t);
1: -	int (*tdls_oper)(struct wiphy *, struct net_device *, const u8 *, enum nl80211_tdls_operation);
1: -	int (*probe_client)(struct wiphy *, struct net_device *, const u8 *, u64 *);
1: -	int (*set_noack_map)(struct wiphy *, struct net_device *, u16);
1: -	int (*get_channel)(struct wiphy *, struct wireless_dev *, struct cfg80211_chan_def *);
1: -	int (*start_p2p_device)(struct wiphy *, struct wireless_dev *);
1: -	void (*stop_p2p_device)(struct wiphy *, struct wireless_dev *);
1: -	int (*set_mac_acl)(struct wiphy *, struct net_device *, const struct cfg80211_acl_data *);
1: -	int (*start_radar_detection)(struct wiphy *, struct net_device *, struct cfg80211_chan_def *, u32);
1: -	void (*end_cac)(struct wiphy *, struct net_device *);
1: -	int (*update_ft_ies)(struct wiphy *, struct net_device *, struct cfg80211_update_ft_ies_params *);
1: -	int (*crit_proto_start)(struct wiphy *, struct wireless_dev *, enum nl80211_crit_proto_id, u16);
1: -	void (*crit_proto_stop)(struct wiphy *, struct wireless_dev *);
1: -	int (*set_coalesce)(struct wiphy *, struct cfg80211_coalesce *);
1: -	int (*channel_switch)(struct wiphy *, struct net_device *, struct cfg80211_csa_settings *);
1: -	int (*set_qos_map)(struct wiphy *, struct net_device *, struct cfg80211_qos_map *);
1: -	int (*set_ap_chanwidth)(struct wiphy *, struct net_device *, struct cfg80211_chan_def *);
1: -	int (*add_tx_ts)(struct wiphy *, struct net_device *, u8, const u8 *, u8, u16);
1: -	int (*del_tx_ts)(struct wiphy *, struct net_device *, u8, const u8 *);
1: -	int (*tdls_channel_switch)(struct wiphy *, struct net_device *, const u8 *, u8, struct cfg80211_chan_def *);
1: -	void (*tdls_cancel_channel_switch)(struct wiphy *, struct net_device *, const u8 *);
1: -	int (*start_nan)(struct wiphy *, struct wireless_dev *, struct cfg80211_nan_conf *);
1: -	void (*stop_nan)(struct wiphy *, struct wireless_dev *);
1: -	int (*add_nan_func)(struct wiphy *, struct wireless_dev *, struct cfg80211_nan_func *);
1: -	void (*del_nan_func)(struct wiphy *, struct wireless_dev *, u64);
1: -	int (*nan_change_conf)(struct wiphy *, struct wireless_dev *, struct cfg80211_nan_conf *, u32);
1: -	int (*set_multicast_to_unicast)(struct wiphy *, struct net_device *, const bool);
1: -	int (*get_txq_stats)(struct wiphy *, struct wireless_dev *, struct cfg80211_txq_stats *);
1: -	int (*set_pmk)(struct wiphy *, struct net_device *, const struct cfg80211_pmk_conf *);
1: -	int (*del_pmk)(struct wiphy *, struct net_device *, const u8 *);
1: -	int (*external_auth)(struct wiphy *, struct net_device *, struct cfg80211_external_auth_params *);
1: -	int (*tx_control_port)(struct wiphy *, struct net_device *, const u8 *, size_t, const u8 *, const __be16, const bool, u64 *);
1: -	int (*get_ftm_responder_stats)(struct wiphy *, struct net_device *, struct cfg80211_ftm_responder_stats *);
1: -	int (*start_pmsr)(struct wiphy *, struct wireless_dev *, struct cfg80211_pmsr_request *);
1: -	void (*abort_pmsr)(struct wiphy *, struct wireless_dev *, struct cfg80211_pmsr_request *);
1: -	int (*update_owe_info)(struct wiphy *, struct net_device *, struct cfg80211_update_owe_info *);
1: -	int (*probe_mesh_link)(struct wiphy *, struct net_device *, const u8 *, size_t);
1: -	int (*set_tid_config)(struct wiphy *, struct net_device *, struct cfg80211_tid_config *);
1: -	int (*reset_tid_config)(struct wiphy *, struct net_device *, const u8 *, u8);
1: +  int (*suspend)(struct wiphy *, struct cfg80211_wowlan *);
1: +  int (*resume)(struct wiphy *);
1: +  void (*set_wakeup)(struct wiphy *, bool);
1: +  struct wireless_dev *(*add_virtual_intf)(struct wiphy *, const char *,
1: +                                           unsigned char, enum nl80211_iftype,
1: +                                           struct vif_params *);
1: +  int (*del_virtual_intf)(struct wiphy *, struct wireless_dev *);
1: +  int (*change_virtual_intf)(struct wiphy *, struct net_device *,
1: +                             enum nl80211_iftype, struct vif_params *);
1: +  int (*add_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *,
1: +                 struct key_params *);
1: +  int (*get_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *,
1: +                 void *, void (*)(void *, struct key_params *));
1: +  int (*del_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *);
1: +  int (*set_default_key)(struct wiphy *, struct net_device *, u8, bool, bool);
1: +  int (*set_default_mgmt_key)(struct wiphy *, struct net_device *, u8);
1: +  int (*set_default_beacon_key)(struct wiphy *, struct net_device *, u8);
1: +  int (*start_ap)(struct wiphy *, struct net_device *,
1: +                  struct cfg80211_ap_settings *);
1: +  int (*change_beacon)(struct wiphy *, struct net_device *,
1: +                       struct cfg80211_beacon_data *);
1: +  int (*stop_ap)(struct wiphy *, struct net_device *);
1: +  int (*add_station)(struct wiphy *, struct net_device *, const u8 *,
1: +                     struct station_parameters *);
1: +  int (*del_station)(struct wiphy *, struct net_device *,
1: +                     struct station_del_parameters *);
1: +  int (*change_station)(struct wiphy *, struct net_device *, const u8 *,
1: +                        struct station_parameters *);
1: +  int (*get_station)(struct wiphy *, struct net_device *, const u8 *,
1: +                     struct station_info *);
1: +  int (*dump_station)(struct wiphy *, struct net_device *, int, u8 *,
1: +                      struct station_info *);
1: +  int (*add_mpath)(struct wiphy *, struct net_device *, const u8 *, const u8 *);
1: +  int (*del_mpath)(struct wiphy *, struct net_device *, const u8 *);
1: +  int (*change_mpath)(struct wiphy *, struct net_device *, const u8 *,
1: +                      const u8 *);
1: +  int (*get_mpath)(struct wiphy *, struct net_device *, u8 *, u8 *,
1: +                   struct mpath_info *);
1: +  int (*dump_mpath)(struct wiphy *, struct net_device *, int, u8 *, u8 *,
1: +                    struct mpath_info *);
1: +  int (*get_mpp)(struct wiphy *, struct net_device *, u8 *, u8 *,
1: +                 struct mpath_info *);
1: +  int (*dump_mpp)(struct wiphy *, struct net_device *, int, u8 *, u8 *,
1: +                  struct mpath_info *);
1: +  int (*get_mesh_config)(struct wiphy *, struct net_device *,
1: +                         struct mesh_config *);
1: +  int (*update_mesh_config)(struct wiphy *, struct net_device *, u32,
1: +                            const struct mesh_config *);
1: +  int (*join_mesh)(struct wiphy *, struct net_device *,
1: +                   const struct mesh_config *, const struct mesh_setup *);
1: +  int (*leave_mesh)(struct wiphy *, struct net_device *);
1: +  int (*join_ocb)(struct wiphy *, struct net_device *, struct ocb_setup *);
1: +  int (*leave_ocb)(struct wiphy *, struct net_device *);
1: +  int (*change_bss)(struct wiphy *, struct net_device *,
1: +                    struct bss_parameters *);
1: +  int (*set_txq_params)(struct wiphy *, struct net_device *,
1: +                        struct ieee80211_txq_params *);
1: +  int (*libertas_set_mesh_channel)(struct wiphy *, struct net_device *,
1: +                                   struct ieee80211_channel *);
1: +  int (*set_monitor_channel)(struct wiphy *, struct cfg80211_chan_def *);
1: +  int (*scan)(struct wiphy *, struct cfg80211_scan_request *);
1: +  void (*abort_scan)(struct wiphy *, struct wireless_dev *);
1: +  int (*auth)(struct wiphy *, struct net_device *,
1: +              struct cfg80211_auth_request *);
1: +  int (*assoc)(struct wiphy *, struct net_device *,
1: +               struct cfg80211_assoc_request *);
1: +  int (*deauth)(struct wiphy *, struct net_device *,
1: +                struct cfg80211_deauth_request *);
1: +  int (*disassoc)(struct wiphy *, struct net_device *,
1: +                  struct cfg80211_disassoc_request *);
1: +  int (*connect)(struct wiphy *, struct net_device *,
1: +                 struct cfg80211_connect_params *);
1: +  int (*update_connect_params)(struct wiphy *, struct net_device *,
1: +                               struct cfg80211_connect_params *, u32);
1: +  int (*disconnect)(struct wiphy *, struct net_device *, u16);
1: +  int (*join_ibss)(struct wiphy *, struct net_device *,
1: +                   struct cfg80211_ibss_params *);
1: +  int (*leave_ibss)(struct wiphy *, struct net_device *);
1: +  int (*set_mcast_rate)(struct wiphy *, struct net_device *, int *);
1: +  int (*set_wiphy_params)(struct wiphy *, u32);
1: +  int (*set_tx_power)(struct wiphy *, struct wireless_dev *,
1: +                      enum nl80211_tx_power_setting, int);
1: +  int (*get_tx_power)(struct wiphy *, struct wireless_dev *, int *);
1: +  void (*rfkill_poll)(struct wiphy *);
1: +  int (*set_bitrate_mask)(struct wiphy *, struct net_device *, const u8 *,
1: +                          const struct cfg80211_bitrate_mask *);
1: +  int (*dump_survey)(struct wiphy *, struct net_device *, int,
1: +                     struct survey_info *);
1: +  int (*set_pmksa)(struct wiphy *, struct net_device *,
1: +                   struct cfg80211_pmksa *);
1: +  int (*del_pmksa)(struct wiphy *, struct net_device *,
1: +                   struct cfg80211_pmksa *);
1: +  int (*flush_pmksa)(struct wiphy *, struct net_device *);
1: +  int (*remain_on_channel)(struct wiphy *, struct wireless_dev *,
1: +                           struct ieee80211_channel *, unsigned int, u64 *);
1: +  int (*cancel_remain_on_channel)(struct wiphy *, struct wireless_dev *, u64);
1: +  int (*mgmt_tx)(struct wiphy *, struct wireless_dev *,
1: +                 struct cfg80211_mgmt_tx_params *, u64 *);
1: +  int (*mgmt_tx_cancel_wait)(struct wiphy *, struct wireless_dev *, u64);
1: +  int (*set_power_mgmt)(struct wiphy *, struct net_device *, bool, int);
1: +  int (*set_cqm_rssi_config)(struct wiphy *, struct net_device *, s32, u32);
1: +  int (*set_cqm_rssi_range_config)(struct wiphy *, struct net_device *, s32,
1: +                                   s32);
1: +  int (*set_cqm_txe_config)(struct wiphy *, struct net_device *, u32, u32, u32);
1: +  void (*update_mgmt_frame_registrations)(struct wiphy *, struct wireless_dev *,
1: +                                          struct mgmt_frame_regs *);
1: +  int (*set_antenna)(struct wiphy *, u32, u32);
1: +  int (*get_antenna)(struct wiphy *, u32 *, u32 *);
1: +  int (*sched_scan_start)(struct wiphy *, struct net_device *,
1: +                          struct cfg80211_sched_scan_request *);
1: +  int (*sched_scan_stop)(struct wiphy *, struct net_device *, u64);
1: +  int (*set_rekey_data)(struct wiphy *, struct net_device *,
1: +                        struct cfg80211_gtk_rekey_data *);
1: +  int (*tdls_mgmt)(struct wiphy *, struct net_device *, const u8 *, u8, u8, u16,
1: +                   u32, bool, const u8 *, size_t);
1: +  int (*tdls_oper)(struct wiphy *, struct net_device *, const u8 *,
1: +                   enum nl80211_tdls_operation);
1: +  int (*probe_client)(struct wiphy *, struct net_device *, const u8 *, u64 *);
1: +  int (*set_noack_map)(struct wiphy *, struct net_device *, u16);
1: +  int (*get_channel)(struct wiphy *, struct wireless_dev *,
1: +                     struct cfg80211_chan_def *);
1: +  int (*start_p2p_device)(struct wiphy *, struct wireless_dev *);
1: +  void (*stop_p2p_device)(struct wiphy *, struct wireless_dev *);
1: +  int (*set_mac_acl)(struct wiphy *, struct net_device *,
1: +                     const struct cfg80211_acl_data *);
1: +  int (*start_radar_detection)(struct wiphy *, struct net_device *,
1: +                               struct cfg80211_chan_def *, u32);
1: +  void (*end_cac)(struct wiphy *, struct net_device *);
1: +  int (*update_ft_ies)(struct wiphy *, struct net_device *,
1: +                       struct cfg80211_update_ft_ies_params *);
1: +  int (*crit_proto_start)(struct wiphy *, struct wireless_dev *,
1: +                          enum nl80211_crit_proto_id, u16);
1: +  void (*crit_proto_stop)(struct wiphy *, struct wireless_dev *);
1: +  int (*set_coalesce)(struct wiphy *, struct cfg80211_coalesce *);
1: +  int (*channel_switch)(struct wiphy *, struct net_device *,
1: +                        struct cfg80211_csa_settings *);
1: +  int (*set_qos_map)(struct wiphy *, struct net_device *,
1: +                     struct cfg80211_qos_map *);
1: +  int (*set_ap_chanwidth)(struct wiphy *, struct net_device *,
1: +                          struct cfg80211_chan_def *);
1: +  int (*add_tx_ts)(struct wiphy *, struct net_device *, u8, const u8 *, u8,
1: +                   u16);
1: +  int (*del_tx_ts)(struct wiphy *, struct net_device *, u8, const u8 *);
1: +  int (*tdls_channel_switch)(struct wiphy *, struct net_device *, const u8 *,
1: +                             u8, struct cfg80211_chan_def *);
1: +  void (*tdls_cancel_channel_switch)(struct wiphy *, struct net_device *,
1: +                                     const u8 *);
1: +  int (*start_nan)(struct wiphy *, struct wireless_dev *,
1: +                   struct cfg80211_nan_conf *);
1: +  void (*stop_nan)(struct wiphy *, struct wireless_dev *);
1: +  int (*add_nan_func)(struct wiphy *, struct wireless_dev *,
1: +                      struct cfg80211_nan_func *);
1: +  void (*del_nan_func)(struct wiphy *, struct wireless_dev *, u64);
1: +  int (*nan_change_conf)(struct wiphy *, struct wireless_dev *,
1: +                         struct cfg80211_nan_conf *, u32);
1: +  int (*set_multicast_to_unicast)(struct wiphy *, struct net_device *,
1: +                                  const bool);
1: +  int (*get_txq_stats)(struct wiphy *, struct wireless_dev *,
1: +                       struct cfg80211_txq_stats *);
1: +  int (*set_pmk)(struct wiphy *, struct net_device *,
1: +                 const struct cfg80211_pmk_conf *);
1: +  int (*del_pmk)(struct wiphy *, struct net_device *, const u8 *);
1: +  int (*external_auth)(struct wiphy *, struct net_device *,
1: +                       struct cfg80211_external_auth_params *);
1: +  int (*tx_control_port)(struct wiphy *, struct net_device *, const u8 *,
1: +                         size_t, const u8 *, const __be16, const bool, u64 *);
1: +  int (*get_ftm_responder_stats)(struct wiphy *, struct net_device *,
1: +                                 struct cfg80211_ftm_responder_stats *);
1: +  int (*start_pmsr)(struct wiphy *, struct wireless_dev *,
1: +                    struct cfg80211_pmsr_request *);
1: +  void (*abort_pmsr)(struct wiphy *, struct wireless_dev *,
1: +                     struct cfg80211_pmsr_request *);
1: +  int (*update_owe_info)(struct wiphy *, struct net_device *,
1: +                         struct cfg80211_update_owe_info *);
1: +  int (*probe_mesh_link)(struct wiphy *, struct net_device *, const u8 *,
1: +                         size_t);
1: +  int (*set_tid_config)(struct wiphy *, struct net_device *,
1: +                        struct cfg80211_tid_config *);
1: +  int (*reset_tid_config)(struct wiphy *, struct net_device *, const u8 *, u8);
1:  };
1:  
1:  enum wiphy_flags {
1: -	WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = 1,
1: -	WIPHY_FLAG_SPLIT_SCAN_6GHZ = 4,
1: -	WIPHY_FLAG_NETNS_OK = 8,
1: -	WIPHY_FLAG_PS_ON_BY_DEFAULT = 16,
1: -	WIPHY_FLAG_4ADDR_AP = 32,
1: -	WIPHY_FLAG_4ADDR_STATION = 64,
1: -	WIPHY_FLAG_CONTROL_PORT_PROTOCOL = 128,
1: -	WIPHY_FLAG_IBSS_RSN = 256,
1: -	WIPHY_FLAG_MESH_AUTH = 1024,
1: -	WIPHY_FLAG_SUPPORTS_FW_ROAM = 8192,
1: -	WIPHY_FLAG_AP_UAPSD = 16384,
1: -	WIPHY_FLAG_SUPPORTS_TDLS = 32768,
1: -	WIPHY_FLAG_TDLS_EXTERNAL_SETUP = 65536,
1: -	WIPHY_FLAG_HAVE_AP_SME = 131072,
1: -	WIPHY_FLAG_REPORTS_OBSS = 262144,
1: -	WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD = 524288,
1: -	WIPHY_FLAG_OFFCHAN_TX = 1048576,
1: -	WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL = 2097152,
1: -	WIPHY_FLAG_SUPPORTS_5_10_MHZ = 4194304,
1: -	WIPHY_FLAG_HAS_CHANNEL_SWITCH = 8388608,
1: -	WIPHY_FLAG_HAS_STATIC_WEP = 16777216,
1: +  WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = 1,
1: +  WIPHY_FLAG_SPLIT_SCAN_6GHZ = 4,
1: +  WIPHY_FLAG_NETNS_OK = 8,
1: +  WIPHY_FLAG_PS_ON_BY_DEFAULT = 16,
1: +  WIPHY_FLAG_4ADDR_AP = 32,
1: +  WIPHY_FLAG_4ADDR_STATION = 64,
1: +  WIPHY_FLAG_CONTROL_PORT_PROTOCOL = 128,
1: +  WIPHY_FLAG_IBSS_RSN = 256,
1: +  WIPHY_FLAG_MESH_AUTH = 1024,
1: +  WIPHY_FLAG_SUPPORTS_FW_ROAM = 8192,
1: +  WIPHY_FLAG_AP_UAPSD = 16384,
1: +  WIPHY_FLAG_SUPPORTS_TDLS = 32768,
1: +  WIPHY_FLAG_TDLS_EXTERNAL_SETUP = 65536,
1: +  WIPHY_FLAG_HAVE_AP_SME = 131072,
1: +  WIPHY_FLAG_REPORTS_OBSS = 262144,
1: +  WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD = 524288,
1: +  WIPHY_FLAG_OFFCHAN_TX = 1048576,
1: +  WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL = 2097152,
1: +  WIPHY_FLAG_SUPPORTS_5_10_MHZ = 4194304,
1: +  WIPHY_FLAG_HAS_CHANNEL_SWITCH = 8388608,
1: +  WIPHY_FLAG_HAS_STATIC_WEP = 16777216,
1:  };
1:  
1:  struct ieee80211_iface_limit {
1: -	u16 max;
1: -	u16 types;
1: +  u16 max;
1: +  u16 types;
1:  };
1:  
1:  struct ieee80211_iface_combination {
1: -	const struct ieee80211_iface_limit *limits;
1: -	u32 num_different_channels;
1: -	u16 max_interfaces;
1: -	u8 n_limits;
1: -	bool beacon_int_infra_match;
1: -	u8 radar_detect_widths;
1: -	u8 radar_detect_regions;
1: -	u32 beacon_int_min_gcd;
1: +  const struct ieee80211_iface_limit *limits;
1: +  u32 num_different_channels;
1: +  u16 max_interfaces;
1: +  u8 n_limits;
1: +  bool beacon_int_infra_match;
1: +  u8 radar_detect_widths;
1: +  u8 radar_detect_regions;
1: +  u32 beacon_int_min_gcd;
1:  };
1:  
1:  struct ieee80211_txrx_stypes {
1: -	u16 tx;
1: -	u16 rx;
1: +  u16 tx;
1: +  u16 rx;
1:  };
1:  
1:  enum wiphy_wowlan_support_flags {
1: -	WIPHY_WOWLAN_ANY = 1,
1: -	WIPHY_WOWLAN_MAGIC_PKT = 2,
1: -	WIPHY_WOWLAN_DISCONNECT = 4,
1: -	WIPHY_WOWLAN_SUPPORTS_GTK_REKEY = 8,
1: -	WIPHY_WOWLAN_GTK_REKEY_FAILURE = 16,
1: -	WIPHY_WOWLAN_EAP_IDENTITY_REQ = 32,
1: -	WIPHY_WOWLAN_4WAY_HANDSHAKE = 64,
1: -	WIPHY_WOWLAN_RFKILL_RELEASE = 128,
1: -	WIPHY_WOWLAN_NET_DETECT = 256,
1: +  WIPHY_WOWLAN_ANY = 1,
1: +  WIPHY_WOWLAN_MAGIC_PKT = 2,
1: +  WIPHY_WOWLAN_DISCONNECT = 4,
1: +  WIPHY_WOWLAN_SUPPORTS_GTK_REKEY = 8,
1: +  WIPHY_WOWLAN_GTK_REKEY_FAILURE = 16,
1: +  WIPHY_WOWLAN_EAP_IDENTITY_REQ = 32,
1: +  WIPHY_WOWLAN_4WAY_HANDSHAKE = 64,
1: +  WIPHY_WOWLAN_RFKILL_RELEASE = 128,
1: +  WIPHY_WOWLAN_NET_DETECT = 256,
1:  };
1:  
1:  struct wiphy_wowlan_tcp_support {
1: -	const struct nl80211_wowlan_tcp_data_token_feature *tok;
1: -	u32 data_payload_max;
1: -	u32 data_interval_max;
1: -	u32 wake_payload_max;
1: -	bool seq;
1: +  const struct nl80211_wowlan_tcp_data_token_feature *tok;
1: +  u32 data_payload_max;
1: +  u32 data_interval_max;
1: +  u32 wake_payload_max;
1: +  bool seq;
1:  };
1:  
1:  struct wiphy_wowlan_support {
1: -	u32 flags;
1: -	int n_patterns;
1: -	int pattern_max_len;
1: -	int pattern_min_len;
1: -	int max_pkt_offset;
1: -	int max_nd_match_sets;
1: -	const struct wiphy_wowlan_tcp_support *tcp;
1: +  u32 flags;
1: +  int n_patterns;
1: +  int pattern_max_len;
1: +  int pattern_min_len;
1: +  int max_pkt_offset;
1: +  int max_nd_match_sets;
1: +  const struct wiphy_wowlan_tcp_support *tcp;
1:  };
1:  
1:  struct wiphy_coalesce_support {
1: -	int n_rules;
1: -	int max_delay;
1: -	int n_patterns;
1: -	int pattern_max_len;
1: -	int pattern_min_len;
1: -	int max_pkt_offset;
1: +  int n_rules;
1: +  int max_delay;
1: +  int n_patterns;
1: +  int pattern_max_len;
1: +  int pattern_min_len;
1: +  int max_pkt_offset;
1:  };
1:  
1:  struct wiphy_vendor_command {
1: -	struct nl80211_vendor_cmd_info info;
1: -	u32 flags;
1: -	int (*doit)(struct wiphy *, struct wireless_dev *, const void *, int);
1: -	int (*dumpit)(struct wiphy *, struct wireless_dev *, struct sk_buff *, const void *, int, long unsigned int *);
1: -	const struct nla_policy *policy;
1: -	unsigned int maxattr;
1: +  struct nl80211_vendor_cmd_info info;
1: +  u32 flags;
1: +  int (*doit)(struct wiphy *, struct wireless_dev *, const void *, int);
1: +  int (*dumpit)(struct wiphy *, struct wireless_dev *, struct sk_buff *,
1: +                const void *, int, long unsigned int *);
1: +  const struct nla_policy *policy;
1: +  unsigned int maxattr;
1:  };
1:  
1:  struct wiphy_iftype_ext_capab {
1: -	enum nl80211_iftype iftype;
1: -	const u8 *extended_capabilities;
1: -	const u8 *extended_capabilities_mask;
1: -	u8 extended_capabilities_len;
1: +  enum nl80211_iftype iftype;
1: +  const u8 *extended_capabilities;
1: +  const u8 *extended_capabilities_mask;
1: +  u8 extended_capabilities_len;
1:  };
1:  
1:  struct cfg80211_pmsr_capabilities {
1: -	unsigned int max_peers;
1: -	u8 report_ap_tsf: 1;
1: -	u8 randomize_mac_addr: 1;
1: -	struct {
1: -		u32 preambles;
1: -		u32 bandwidths;
1: -		s8 max_bursts_exponent;
1: -		u8 max_ftms_per_burst;
1: -		u8 supported: 1;
1: -		u8 asap: 1;
1: -		u8 non_asap: 1;
1: -		u8 request_lci: 1;
1: -		u8 request_civicloc: 1;
1: -		u8 trigger_based: 1;
1: -		u8 non_trigger_based: 1;
1: -	} ftm;
1: +  unsigned int max_peers;
1: +  u8 report_ap_tsf : 1;
1: +  u8 randomize_mac_addr : 1;
1: +  struct {
1: +    u32 preambles;
1: +    u32 bandwidths;
1: +    s8 max_bursts_exponent;
1: +    u8 max_ftms_per_burst;
1: +    u8 supported : 1;
1: +    u8 asap : 1;
1: +    u8 non_asap : 1;
1: +    u8 request_lci : 1;
1: +    u8 request_civicloc : 1;
1: +    u8 trigger_based : 1;
1: +    u8 non_trigger_based : 1;
1: +  } ftm;
1:  };
1:  
1:  struct wiphy_iftype_akm_suites {
1: -	u16 iftypes_mask;
1: -	const u32 *akm_suites;
1: -	int n_akm_suites;
1: +  u16 iftypes_mask;
1: +  const u32 *akm_suites;
1: +  int n_akm_suites;
1:  };
1:  
1:  struct cfg80211_cached_keys {
1: -	struct key_params params[4];
1: -	u8 data[52];
1: -	int def;
1: +  struct key_params params[4];
1: +  u8 data[52];
1: +  int def;
1:  };
1:  
1:  struct cfg80211_internal_bss {
1: -	struct list_head list;
1: -	struct list_head hidden_list;
1: -	struct rb_node rbn;
1: -	u64 ts_boottime;
1: -	long unsigned int ts;
1: -	long unsigned int refcount;
1: -	atomic_t hold;
1: -	u64 parent_tsf;
1: -	u8 parent_bssid[6];
1: -	struct cfg80211_bss pub;
1: +  struct list_head list;
1: +  struct list_head hidden_list;
1: +  struct rb_node rbn;
1: +  u64 ts_boottime;
1: +  long unsigned int ts;
1: +  long unsigned int refcount;
1: +  atomic_t hold;
1: +  u64 parent_tsf;
1: +  u8 parent_bssid[6];
1: +  struct cfg80211_bss pub;
1:  };
1:  
1:  struct cfg80211_cqm_config {
1: -	u32 rssi_hyst;
1: -	s32 last_rssi_event_value;
1: -	int n_rssi_thresholds;
1: -	s32 rssi_thresholds[0];
1: +  u32 rssi_hyst;
1: +  s32 last_rssi_event_value;
1: +  int n_rssi_thresholds;
1: +  s32 rssi_thresholds[0];
1:  };
1:  
1:  struct cfg80211_fils_resp_params {
1: -	const u8 *kek;
1: -	size_t kek_len;
1: -	bool update_erp_next_seq_num;
1: -	u16 erp_next_seq_num;
1: -	const u8 *pmk;
1: -	size_t pmk_len;
1: -	const u8 *pmkid;
1: +  const u8 *kek;
1: +  size_t kek_len;
1: +  bool update_erp_next_seq_num;
1: +  u16 erp_next_seq_num;
1: +  const u8 *pmk;
1: +  size_t pmk_len;
1: +  const u8 *pmkid;
1:  };
1:  
1:  struct cfg80211_connect_resp_params {
1: -	int status;
1: -	const u8 *bssid;
1: -	struct cfg80211_bss *bss;
1: -	const u8 *req_ie;
1: -	size_t req_ie_len;
1: -	const u8 *resp_ie;
1: -	size_t resp_ie_len;
1: -	struct cfg80211_fils_resp_params fils;
1: -	enum nl80211_timeout_reason timeout_reason;
1: +  int status;
1: +  const u8 *bssid;
1: +  struct cfg80211_bss *bss;
1: +  const u8 *req_ie;
1: +  size_t req_ie_len;
1: +  const u8 *resp_ie;
1: +  size_t resp_ie_len;
1: +  struct cfg80211_fils_resp_params fils;
1: +  enum nl80211_timeout_reason timeout_reason;
1:  };
1:  
1:  struct cfg80211_roam_info {
1: -	struct ieee80211_channel *channel;
1: -	struct cfg80211_bss *bss;
1: -	const u8 *bssid;
1: -	const u8 *req_ie;
1: -	size_t req_ie_len;
1: -	const u8 *resp_ie;
1: -	size_t resp_ie_len;
1: -	struct cfg80211_fils_resp_params fils;
1: +  struct ieee80211_channel *channel;
1: +  struct cfg80211_bss *bss;
1: +  const u8 *bssid;
1: +  const u8 *req_ie;
1: +  size_t req_ie_len;
1: +  const u8 *resp_ie;
1: +  size_t resp_ie_len;
1: +  struct cfg80211_fils_resp_params fils;
1:  };
1:  
1:  enum rfkill_type {
1: -	RFKILL_TYPE_ALL = 0,
1: -	RFKILL_TYPE_WLAN = 1,
1: -	RFKILL_TYPE_BLUETOOTH = 2,
1: -	RFKILL_TYPE_UWB = 3,
1: -	RFKILL_TYPE_WIMAX = 4,
1: -	RFKILL_TYPE_WWAN = 5,
1: -	RFKILL_TYPE_GPS = 6,
1: -	RFKILL_TYPE_FM = 7,
1: -	RFKILL_TYPE_NFC = 8,
1: -	NUM_RFKILL_TYPES = 9,
1: +  RFKILL_TYPE_ALL = 0,
1: +  RFKILL_TYPE_WLAN = 1,
1: +  RFKILL_TYPE_BLUETOOTH = 2,
1: +  RFKILL_TYPE_UWB = 3,
1: +  RFKILL_TYPE_WIMAX = 4,
1: +  RFKILL_TYPE_WWAN = 5,
1: +  RFKILL_TYPE_GPS = 6,
1: +  RFKILL_TYPE_FM = 7,
1: +  RFKILL_TYPE_NFC = 8,
1: +  NUM_RFKILL_TYPES = 9,
1:  };
1:  
1:  struct rfkill;
1:  
1:  struct rfkill_ops {
1: -	void (*poll)(struct rfkill *, void *);
1: -	void (*query)(struct rfkill *, void *);
1: -	int (*set_block)(void *, bool);
1: +  void (*poll)(struct rfkill *, void *);
1: +  void (*query)(struct rfkill *, void *);
1: +  int (*set_block)(void *, bool);
1:  };
1:  
1:  struct cfg80211_registered_device {
1: -	const struct cfg80211_ops *ops;
1: -	struct list_head list;
1: -	struct rfkill_ops rfkill_ops;
1: -	struct rfkill *rfkill;
1: -	struct work_struct rfkill_block;
1: -	char country_ie_alpha2[2];
1: -	const struct ieee80211_regdomain *requested_regd;
1: -	enum environment_cap env;
1: -	int wiphy_idx;
1: -	int devlist_generation;
1: -	int wdev_id;
1: -	int opencount;
1: -	wait_queue_head_t dev_wait;
1: -	struct list_head beacon_registrations;
1: -	spinlock_t beacon_registrations_lock;
1: -	int num_running_ifaces;
1: -	int num_running_monitor_ifaces;
1: -	u64 cookie_counter;
1: -	spinlock_t bss_lock;
1: -	struct list_head bss_list;
1: -	struct rb_root bss_tree;
1: -	u32 bss_generation;
1: -	u32 bss_entries;
1: -	struct cfg80211_scan_request *scan_req;
1: -	struct cfg80211_scan_request *int_scan_req;
1: -	struct sk_buff *scan_msg;
1: -	struct list_head sched_scan_req_list;
1: -	time64_t suspend_at;
1: -	struct work_struct scan_done_wk;
1: -	struct genl_info *cur_cmd_info;
1: -	struct work_struct conn_work;
1: -	struct work_struct event_work;
1: -	struct delayed_work dfs_update_channels_wk;
1: -	u32 crit_proto_nlportid;
1: -	struct cfg80211_coalesce *coalesce;
1: -	struct work_struct destroy_work;
1: -	struct work_struct sched_scan_stop_wk;
1: -	struct work_struct sched_scan_res_wk;
1: -	struct cfg80211_chan_def radar_chandef;
1: -	struct work_struct propagate_radar_detect_wk;
1: -	struct cfg80211_chan_def cac_done_chandef;
1: -	struct work_struct propagate_cac_done_wk;
1: -	struct work_struct mgmt_registrations_update_wk;
1: -	long: 64;
1: -	struct wiphy wiphy;
1: +  const struct cfg80211_ops *ops;
1: +  struct list_head list;
1: +  struct rfkill_ops rfkill_ops;
1: +  struct rfkill *rfkill;
1: +  struct work_struct rfkill_block;
1: +  char country_ie_alpha2[2];
1: +  const struct ieee80211_regdomain *requested_regd;
1: +  enum environment_cap env;
1: +  int wiphy_idx;
1: +  int devlist_generation;
1: +  int wdev_id;
1: +  int opencount;
1: +  wait_queue_head_t dev_wait;
1: +  struct list_head beacon_registrations;
1: +  spinlock_t beacon_registrations_lock;
1: +  int num_running_ifaces;
1: +  int num_running_monitor_ifaces;
1: +  u64 cookie_counter;
1: +  spinlock_t bss_lock;
1: +  struct list_head bss_list;
1: +  struct rb_root bss_tree;
1: +  u32 bss_generation;
1: +  u32 bss_entries;
1: +  struct cfg80211_scan_request *scan_req;
1: +  struct cfg80211_scan_request *int_scan_req;
1: +  struct sk_buff *scan_msg;
1: +  struct list_head sched_scan_req_list;
1: +  time64_t suspend_at;
1: +  struct work_struct scan_done_wk;
1: +  struct genl_info *cur_cmd_info;
1: +  struct work_struct conn_work;
1: +  struct work_struct event_work;
1: +  struct delayed_work dfs_update_channels_wk;
1: +  u32 crit_proto_nlportid;
1: +  struct cfg80211_coalesce *coalesce;
1: +  struct work_struct destroy_work;
1: +  struct work_struct sched_scan_stop_wk;
1: +  struct work_struct sched_scan_res_wk;
1: +  struct cfg80211_chan_def radar_chandef;
1: +  struct work_struct propagate_radar_detect_wk;
1: +  struct cfg80211_chan_def cac_done_chandef;
1: +  struct work_struct propagate_cac_done_wk;
1: +  struct work_struct mgmt_registrations_update_wk;
1: +  long : 64;
1: +  struct wiphy wiphy;
1:  };
1:  
1:  enum cfg80211_event_type {
1: -	EVENT_CONNECT_RESULT = 0,
1: -	EVENT_ROAMED = 1,
1: -	EVENT_DISCONNECTED = 2,
1: -	EVENT_IBSS_JOINED = 3,
1: -	EVENT_STOPPED = 4,
1: -	EVENT_PORT_AUTHORIZED = 5,
1: +  EVENT_CONNECT_RESULT = 0,
1: +  EVENT_ROAMED = 1,
1: +  EVENT_DISCONNECTED = 2,
1: +  EVENT_IBSS_JOINED = 3,
1: +  EVENT_STOPPED = 4,
1: +  EVENT_PORT_AUTHORIZED = 5,
1:  };
1:  
1:  struct cfg80211_event {
1: -	struct list_head list;
1: -	enum cfg80211_event_type type;
1: -	union {
1: -		struct cfg80211_connect_resp_params cr;
1: -		struct cfg80211_roam_info rm;
1: -		struct {
1: -			const u8 *ie;
1: -			size_t ie_len;
1: -			u16 reason;
1: -			bool locally_generated;
1: -		} dc;
1: -		struct {
1: -			u8 bssid[6];
1: -			struct ieee80211_channel *channel;
1: -		} ij;
1: -		struct {
1: -			u8 bssid[6];
1: -		} pa;
1: -	};
1: +  struct list_head list;
1: +  enum cfg80211_event_type type;
1: +  union {
1: +    struct cfg80211_connect_resp_params cr;
1: +    struct cfg80211_roam_info rm;
1: +    struct {
1: +      const u8 *ie;
1: +      size_t ie_len;
1: +      u16 reason;
1: +      bool locally_generated;
1: +    } dc;
1: +    struct {
1: +      u8 bssid[6];
1: +      struct ieee80211_channel *channel;
1: +    } ij;
1: +    struct {
1: +      u8 bssid[6];
1: +    } pa;
1: +  };
1:  };
1:  
1:  struct cfg80211_beacon_registration {
1: -	struct list_head list;
1: -	u32 nlportid;
1: +  struct list_head list;
1: +  u32 nlportid;
1:  };
1:  
1:  struct radiotap_align_size {
1: -	uint8_t align: 4;
1: -	uint8_t size: 4;
1: +  uint8_t align : 4;
1: +  uint8_t size : 4;
1:  };
1:  
1:  struct ieee80211_radiotap_namespace {
1: -	const struct radiotap_align_size *align_size;
1: -	int n_bits;
1: -	uint32_t oui;
1: -	uint8_t subns;
1: +  const struct radiotap_align_size *align_size;
1: +  int n_bits;
1: +  uint32_t oui;
1: +  uint8_t subns;
1:  };
1:  
1:  struct ieee80211_radiotap_vendor_namespaces {
1: -	const struct ieee80211_radiotap_namespace *ns;
1: -	int n_ns;
1: +  const struct ieee80211_radiotap_namespace *ns;
1: +  int n_ns;
1:  };
1:  
1:  struct ieee80211_radiotap_header;
1:  
1:  struct ieee80211_radiotap_iterator {
1: -	struct ieee80211_radiotap_header *_rtheader;
1: -	const struct ieee80211_radiotap_vendor_namespaces *_vns;
1: -	const struct ieee80211_radiotap_namespace *current_namespace;
1: -	unsigned char *_arg;
1: -	unsigned char *_next_ns_data;
1: -	__le32 *_next_bitmap;
1: -	unsigned char *this_arg;
1: -	int this_arg_index;
1: -	int this_arg_size;
1: -	int is_radiotap_ns;
1: -	int _max_length;
1: -	int _arg_index;
1: -	uint32_t _bitmap_shifter;
1: -	int _reset_on_ext;
1: +  struct ieee80211_radiotap_header *_rtheader;
1: +  const struct ieee80211_radiotap_vendor_namespaces *_vns;
1: +  const struct ieee80211_radiotap_namespace *current_namespace;
1: +  unsigned char *_arg;
1: +  unsigned char *_next_ns_data;
1: +  __le32 *_next_bitmap;
1: +  unsigned char *this_arg;
1: +  int this_arg_index;
1: +  int this_arg_size;
1: +  int is_radiotap_ns;
1: +  int _max_length;
1: +  int _arg_index;
1: +  uint32_t _bitmap_shifter;
1: +  int _reset_on_ext;
1:  };
1:  
1:  struct ieee80211_radiotap_header {
1: -	uint8_t it_version;
1: -	uint8_t it_pad;
1: -	__le16 it_len;
1: -	__le32 it_present;
1: +  uint8_t it_version;
1: +  uint8_t it_pad;
1: +  __le16 it_len;
1: +  __le32 it_present;
1:  };
1:  
1:  enum ieee80211_radiotap_presence {
1: -	IEEE80211_RADIOTAP_TSFT = 0,
1: -	IEEE80211_RADIOTAP_FLAGS = 1,
1: -	IEEE80211_RADIOTAP_RATE = 2,
1: -	IEEE80211_RADIOTAP_CHANNEL = 3,
1: -	IEEE80211_RADIOTAP_FHSS = 4,
1: -	IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
1: -	IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
1: -	IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
1: -	IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
1: -	IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
1: -	IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
1: -	IEEE80211_RADIOTAP_ANTENNA = 11,
1: -	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
1: -	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
1: -	IEEE80211_RADIOTAP_RX_FLAGS = 14,
1: -	IEEE80211_RADIOTAP_TX_FLAGS = 15,
1: -	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
1: -	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
1: -	IEEE80211_RADIOTAP_MCS = 19,
1: -	IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
1: -	IEEE80211_RADIOTAP_VHT = 21,
1: -	IEEE80211_RADIOTAP_TIMESTAMP = 22,
1: -	IEEE80211_RADIOTAP_HE = 23,
1: -	IEEE80211_RADIOTAP_HE_MU = 24,
1: -	IEEE80211_RADIOTAP_ZERO_LEN_PSDU = 26,
1: -	IEEE80211_RADIOTAP_LSIG = 27,
1: -	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
1: -	IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
1: -	IEEE80211_RADIOTAP_EXT = 31,
1: +  IEEE80211_RADIOTAP_TSFT = 0,
1: +  IEEE80211_RADIOTAP_FLAGS = 1,
1: +  IEEE80211_RADIOTAP_RATE = 2,
1: +  IEEE80211_RADIOTAP_CHANNEL = 3,
1: +  IEEE80211_RADIOTAP_FHSS = 4,
1: +  IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
1: +  IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
1: +  IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
1: +  IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
1: +  IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
1: +  IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
1: +  IEEE80211_RADIOTAP_ANTENNA = 11,
1: +  IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
1: +  IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
1: +  IEEE80211_RADIOTAP_RX_FLAGS = 14,
1: +  IEEE80211_RADIOTAP_TX_FLAGS = 15,
1: +  IEEE80211_RADIOTAP_RTS_RETRIES = 16,
1: +  IEEE80211_RADIOTAP_DATA_RETRIES = 17,
1: +  IEEE80211_RADIOTAP_MCS = 19,
1: +  IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
1: +  IEEE80211_RADIOTAP_VHT = 21,
1: +  IEEE80211_RADIOTAP_TIMESTAMP = 22,
1: +  IEEE80211_RADIOTAP_HE = 23,
1: +  IEEE80211_RADIOTAP_HE_MU = 24,
1: +  IEEE80211_RADIOTAP_ZERO_LEN_PSDU = 26,
1: +  IEEE80211_RADIOTAP_LSIG = 27,
1: +  IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
1: +  IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
1: +  IEEE80211_RADIOTAP_EXT = 31,
1:  };
1:  
1:  struct ieee80211_hdr {
1: -	__le16 frame_control;
1: -	__le16 duration_id;
1: -	u8 addr1[6];
1: -	u8 addr2[6];
1: -	u8 addr3[6];
1: -	__le16 seq_ctrl;
1: -	u8 addr4[6];
1: +  __le16 frame_control;
1: +  __le16 duration_id;
1: +  u8 addr1[6];
1: +  u8 addr2[6];
1: +  u8 addr3[6];
1: +  __le16 seq_ctrl;
1: +  u8 addr4[6];
1:  };
1:  
1:  struct ieee80211s_hdr {
1: -	u8 flags;
1: -	u8 ttl;
1: -	__le32 seqnum;
1: -	u8 eaddr1[6];
1: -	u8 eaddr2[6];
1: +  u8 flags;
1: +  u8 ttl;
1: +  __le32 seqnum;
1: +  u8 eaddr1[6];
1: +  u8 eaddr2[6];
1:  } __attribute__((packed));
1:  
1:  enum ieee80211_p2p_attr_id {
1: -	IEEE80211_P2P_ATTR_STATUS = 0,
1: -	IEEE80211_P2P_ATTR_MINOR_REASON = 1,
1: -	IEEE80211_P2P_ATTR_CAPABILITY = 2,
1: -	IEEE80211_P2P_ATTR_DEVICE_ID = 3,
1: -	IEEE80211_P2P_ATTR_GO_INTENT = 4,
1: -	IEEE80211_P2P_ATTR_GO_CONFIG_TIMEOUT = 5,
1: -	IEEE80211_P2P_ATTR_LISTEN_CHANNEL = 6,
1: -	IEEE80211_P2P_ATTR_GROUP_BSSID = 7,
1: -	IEEE80211_P2P_ATTR_EXT_LISTEN_TIMING = 8,
1: -	IEEE80211_P2P_ATTR_INTENDED_IFACE_ADDR = 9,
1: -	IEEE80211_P2P_ATTR_MANAGABILITY = 10,
1: -	IEEE80211_P2P_ATTR_CHANNEL_LIST = 11,
1: -	IEEE80211_P2P_ATTR_ABSENCE_NOTICE = 12,
1: -	IEEE80211_P2P_ATTR_DEVICE_INFO = 13,
1: -	IEEE80211_P2P_ATTR_GROUP_INFO = 14,
1: -	IEEE80211_P2P_ATTR_GROUP_ID = 15,
1: -	IEEE80211_P2P_ATTR_INTERFACE = 16,
1: -	IEEE80211_P2P_ATTR_OPER_CHANNEL = 17,
1: -	IEEE80211_P2P_ATTR_INVITE_FLAGS = 18,
1: -	IEEE80211_P2P_ATTR_VENDOR_SPECIFIC = 221,
1: -	IEEE80211_P2P_ATTR_MAX = 222,
1: +  IEEE80211_P2P_ATTR_STATUS = 0,
1: +  IEEE80211_P2P_ATTR_MINOR_REASON = 1,
1: +  IEEE80211_P2P_ATTR_CAPABILITY = 2,
1: +  IEEE80211_P2P_ATTR_DEVICE_ID = 3,
1: +  IEEE80211_P2P_ATTR_GO_INTENT = 4,
1: +  IEEE80211_P2P_ATTR_GO_CONFIG_TIMEOUT = 5,
1: +  IEEE80211_P2P_ATTR_LISTEN_CHANNEL = 6,
1: +  IEEE80211_P2P_ATTR_GROUP_BSSID = 7,
1: +  IEEE80211_P2P_ATTR_EXT_LISTEN_TIMING = 8,
1: +  IEEE80211_P2P_ATTR_INTENDED_IFACE_ADDR = 9,
1: +  IEEE80211_P2P_ATTR_MANAGABILITY = 10,
1: +  IEEE80211_P2P_ATTR_CHANNEL_LIST = 11,
1: +  IEEE80211_P2P_ATTR_ABSENCE_NOTICE = 12,
1: +  IEEE80211_P2P_ATTR_DEVICE_INFO = 13,
1: +  IEEE80211_P2P_ATTR_GROUP_INFO = 14,
1: +  IEEE80211_P2P_ATTR_GROUP_ID = 15,
1: +  IEEE80211_P2P_ATTR_INTERFACE = 16,
1: +  IEEE80211_P2P_ATTR_OPER_CHANNEL = 17,
1: +  IEEE80211_P2P_ATTR_INVITE_FLAGS = 18,
1: +  IEEE80211_P2P_ATTR_VENDOR_SPECIFIC = 221,
1: +  IEEE80211_P2P_ATTR_MAX = 222,
1:  };
1:  
1:  enum ieee80211_vht_chanwidth {
1: -	IEEE80211_VHT_CHANWIDTH_USE_HT = 0,
1: -	IEEE80211_VHT_CHANWIDTH_80MHZ = 1,
1: -	IEEE80211_VHT_CHANWIDTH_160MHZ = 2,
1: -	IEEE80211_VHT_CHANWIDTH_80P80MHZ = 3,
1: +  IEEE80211_VHT_CHANWIDTH_USE_HT = 0,
1: +  IEEE80211_VHT_CHANWIDTH_80MHZ = 1,
1: +  IEEE80211_VHT_CHANWIDTH_160MHZ = 2,
1: +  IEEE80211_VHT_CHANWIDTH_80P80MHZ = 3,
1:  };
1:  
1:  enum ieee80211_statuscode {
1: -	WLAN_STATUS_SUCCESS = 0,
1: -	WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
1: -	WLAN_STATUS_CAPS_UNSUPPORTED = 10,
1: -	WLAN_STATUS_REASSOC_NO_ASSOC = 11,
1: -	WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
1: -	WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
1: -	WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
1: -	WLAN_STATUS_CHALLENGE_FAIL = 15,
1: -	WLAN_STATUS_AUTH_TIMEOUT = 16,
1: -	WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
1: -	WLAN_STATUS_ASSOC_DENIED_RATES = 18,
1: -	WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
1: -	WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
1: -	WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
1: -	WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
1: -	WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
1: -	WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
1: -	WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
1: -	WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
1: -	WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY = 30,
1: -	WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION = 31,
1: -	WLAN_STATUS_INVALID_IE = 40,
1: -	WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
1: -	WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
1: -	WLAN_STATUS_INVALID_AKMP = 43,
1: -	WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
1: -	WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
1: -	WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
1: -	WLAN_STATUS_UNSPECIFIED_QOS = 32,
1: -	WLAN_STATUS_ASSOC_DENIED_NOBANDWIDTH = 33,
1: -	WLAN_STATUS_ASSOC_DENIED_LOWACK = 34,
1: -	WLAN_STATUS_ASSOC_DENIED_UNSUPP_QOS = 35,
1: -	WLAN_STATUS_REQUEST_DECLINED = 37,
1: -	WLAN_STATUS_INVALID_QOS_PARAM = 38,
1: -	WLAN_STATUS_CHANGE_TSPEC = 39,
1: -	WLAN_STATUS_WAIT_TS_DELAY = 47,
1: -	WLAN_STATUS_NO_DIRECT_LINK = 48,
1: -	WLAN_STATUS_STA_NOT_PRESENT = 49,
1: -	WLAN_STATUS_STA_NOT_QSTA = 50,
1: -	WLAN_STATUS_ANTI_CLOG_REQUIRED = 76,
1: -	WLAN_STATUS_FCG_NOT_SUPP = 78,
1: -	WLAN_STATUS_STA_NO_TBTT = 78,
1: -	WLAN_STATUS_REJECTED_WITH_SUGGESTED_CHANGES = 39,
1: -	WLAN_STATUS_REJECTED_FOR_DELAY_PERIOD = 47,
1: -	WLAN_STATUS_REJECT_WITH_SCHEDULE = 83,
1: -	WLAN_STATUS_PENDING_ADMITTING_FST_SESSION = 86,
1: -	WLAN_STATUS_PERFORMING_FST_NOW = 87,
1: -	WLAN_STATUS_PENDING_GAP_IN_BA_WINDOW = 88,
1: -	WLAN_STATUS_REJECT_U_PID_SETTING = 89,
1: -	WLAN_STATUS_REJECT_DSE_BAND = 96,
1: -	WLAN_STATUS_DENIED_WITH_SUGGESTED_BAND_AND_CHANNEL = 99,
1: -	WLAN_STATUS_DENIED_DUE_TO_SPECTRUM_MANAGEMENT = 103,
1: -	WLAN_STATUS_FILS_AUTHENTICATION_FAILURE = 108,
1: -	WLAN_STATUS_UNKNOWN_AUTHENTICATION_SERVER = 109,
1: -	WLAN_STATUS_SAE_HASH_TO_ELEMENT = 126,
1: -	WLAN_STATUS_SAE_PK = 127,
1: +  WLAN_STATUS_SUCCESS = 0,
1: +  WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
1: +  WLAN_STATUS_CAPS_UNSUPPORTED = 10,
1: +  WLAN_STATUS_REASSOC_NO_ASSOC = 11,
1: +  WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
1: +  WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
1: +  WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
1: +  WLAN_STATUS_CHALLENGE_FAIL = 15,
1: +  WLAN_STATUS_AUTH_TIMEOUT = 16,
1: +  WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
1: +  WLAN_STATUS_ASSOC_DENIED_RATES = 18,
1: +  WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
1: +  WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
1: +  WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
1: +  WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
1: +  WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
1: +  WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
1: +  WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
1: +  WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
1: +  WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY = 30,
1: +  WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION = 31,
1: +  WLAN_STATUS_INVALID_IE = 40,
1: +  WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
1: +  WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
1: +  WLAN_STATUS_INVALID_AKMP = 43,
1: +  WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
1: +  WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
1: +  WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
1: +  WLAN_STATUS_UNSPECIFIED_QOS = 32,
1: +  WLAN_STATUS_ASSOC_DENIED_NOBANDWIDTH = 33,
1: +  WLAN_STATUS_ASSOC_DENIED_LOWACK = 34,
1: +  WLAN_STATUS_ASSOC_DENIED_UNSUPP_QOS = 35,
1: +  WLAN_STATUS_REQUEST_DECLINED = 37,
1: +  WLAN_STATUS_INVALID_QOS_PARAM = 38,
1: +  WLAN_STATUS_CHANGE_TSPEC = 39,
1: +  WLAN_STATUS_WAIT_TS_DELAY = 47,
1: +  WLAN_STATUS_NO_DIRECT_LINK = 48,
1: +  WLAN_STATUS_STA_NOT_PRESENT = 49,
1: +  WLAN_STATUS_STA_NOT_QSTA = 50,
1: +  WLAN_STATUS_ANTI_CLOG_REQUIRED = 76,
1: +  WLAN_STATUS_FCG_NOT_SUPP = 78,
1: +  WLAN_STATUS_STA_NO_TBTT = 78,
1: +  WLAN_STATUS_REJECTED_WITH_SUGGESTED_CHANGES = 39,
1: +  WLAN_STATUS_REJECTED_FOR_DELAY_PERIOD = 47,
1: +  WLAN_STATUS_REJECT_WITH_SCHEDULE = 83,
1: +  WLAN_STATUS_PENDING_ADMITTING_FST_SESSION = 86,
1: +  WLAN_STATUS_PERFORMING_FST_NOW = 87,
1: +  WLAN_STATUS_PENDING_GAP_IN_BA_WINDOW = 88,
1: +  WLAN_STATUS_REJECT_U_PID_SETTING = 89,
1: +  WLAN_STATUS_REJECT_DSE_BAND = 96,
1: +  WLAN_STATUS_DENIED_WITH_SUGGESTED_BAND_AND_CHANNEL = 99,
1: +  WLAN_STATUS_DENIED_DUE_TO_SPECTRUM_MANAGEMENT = 103,
1: +  WLAN_STATUS_FILS_AUTHENTICATION_FAILURE = 108,
1: +  WLAN_STATUS_UNKNOWN_AUTHENTICATION_SERVER = 109,
1: +  WLAN_STATUS_SAE_HASH_TO_ELEMENT = 126,
1: +  WLAN_STATUS_SAE_PK = 127,
1:  };
1:  
1:  enum ieee80211_eid {
1: -	WLAN_EID_SSID = 0,
1: -	WLAN_EID_SUPP_RATES = 1,
1: -	WLAN_EID_FH_PARAMS = 2,
1: -	WLAN_EID_DS_PARAMS = 3,
1: -	WLAN_EID_CF_PARAMS = 4,
1: -	WLAN_EID_TIM = 5,
1: -	WLAN_EID_IBSS_PARAMS = 6,
1: -	WLAN_EID_COUNTRY = 7,
1: -	WLAN_EID_REQUEST = 10,
1: -	WLAN_EID_QBSS_LOAD = 11,
1: -	WLAN_EID_EDCA_PARAM_SET = 12,
1: -	WLAN_EID_TSPEC = 13,
1: -	WLAN_EID_TCLAS = 14,
1: -	WLAN_EID_SCHEDULE = 15,
1: -	WLAN_EID_CHALLENGE = 16,
1: -	WLAN_EID_PWR_CONSTRAINT = 32,
1: -	WLAN_EID_PWR_CAPABILITY = 33,
1: -	WLAN_EID_TPC_REQUEST = 34,
1: -	WLAN_EID_TPC_REPORT = 35,
1: -	WLAN_EID_SUPPORTED_CHANNELS = 36,
1: -	WLAN_EID_CHANNEL_SWITCH = 37,
1: -	WLAN_EID_MEASURE_REQUEST = 38,
1: -	WLAN_EID_MEASURE_REPORT = 39,
1: -	WLAN_EID_QUIET = 40,
1: -	WLAN_EID_IBSS_DFS = 41,
1: -	WLAN_EID_ERP_INFO = 42,
1: -	WLAN_EID_TS_DELAY = 43,
1: -	WLAN_EID_TCLAS_PROCESSING = 44,
1: -	WLAN_EID_HT_CAPABILITY = 45,
1: -	WLAN_EID_QOS_CAPA = 46,
1: -	WLAN_EID_RSN = 48,
1: -	WLAN_EID_802_15_COEX = 49,
1: -	WLAN_EID_EXT_SUPP_RATES = 50,
1: -	WLAN_EID_AP_CHAN_REPORT = 51,
1: -	WLAN_EID_NEIGHBOR_REPORT = 52,
1: -	WLAN_EID_RCPI = 53,
1: -	WLAN_EID_MOBILITY_DOMAIN = 54,
1: -	WLAN_EID_FAST_BSS_TRANSITION = 55,
1: -	WLAN_EID_TIMEOUT_INTERVAL = 56,
1: -	WLAN_EID_RIC_DATA = 57,
1: -	WLAN_EID_DSE_REGISTERED_LOCATION = 58,
1: -	WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
1: -	WLAN_EID_EXT_CHANSWITCH_ANN = 60,
1: -	WLAN_EID_HT_OPERATION = 61,
1: -	WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
1: -	WLAN_EID_BSS_AVG_ACCESS_DELAY = 63,
1: -	WLAN_EID_ANTENNA_INFO = 64,
1: -	WLAN_EID_RSNI = 65,
1: -	WLAN_EID_MEASUREMENT_PILOT_TX_INFO = 66,
1: -	WLAN_EID_BSS_AVAILABLE_CAPACITY = 67,
1: -	WLAN_EID_BSS_AC_ACCESS_DELAY = 68,
1: -	WLAN_EID_TIME_ADVERTISEMENT = 69,
1: -	WLAN_EID_RRM_ENABLED_CAPABILITIES = 70,
1: -	WLAN_EID_MULTIPLE_BSSID = 71,
1: -	WLAN_EID_BSS_COEX_2040 = 72,
1: -	WLAN_EID_BSS_INTOLERANT_CHL_REPORT = 73,
1: -	WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74,
1: -	WLAN_EID_RIC_DESCRIPTOR = 75,
1: -	WLAN_EID_MMIE = 76,
1: -	WLAN_EID_ASSOC_COMEBACK_TIME = 77,
1: -	WLAN_EID_EVENT_REQUEST = 78,
1: -	WLAN_EID_EVENT_REPORT = 79,
1: -	WLAN_EID_DIAGNOSTIC_REQUEST = 80,
1: -	WLAN_EID_DIAGNOSTIC_REPORT = 81,
1: -	WLAN_EID_LOCATION_PARAMS = 82,
1: -	WLAN_EID_NON_TX_BSSID_CAP = 83,
1: -	WLAN_EID_SSID_LIST = 84,
1: -	WLAN_EID_MULTI_BSSID_IDX = 85,
1: -	WLAN_EID_FMS_DESCRIPTOR = 86,
1: -	WLAN_EID_FMS_REQUEST = 87,
1: -	WLAN_EID_FMS_RESPONSE = 88,
1: -	WLAN_EID_QOS_TRAFFIC_CAPA = 89,
1: -	WLAN_EID_BSS_MAX_IDLE_PERIOD = 90,
1: -	WLAN_EID_TSF_REQUEST = 91,
1: -	WLAN_EID_TSF_RESPOSNE = 92,
1: -	WLAN_EID_WNM_SLEEP_MODE = 93,
1: -	WLAN_EID_TIM_BCAST_REQ = 94,
1: -	WLAN_EID_TIM_BCAST_RESP = 95,
1: -	WLAN_EID_COLL_IF_REPORT = 96,
1: -	WLAN_EID_CHANNEL_USAGE = 97,
1: -	WLAN_EID_TIME_ZONE = 98,
1: -	WLAN_EID_DMS_REQUEST = 99,
1: -	WLAN_EID_DMS_RESPONSE = 100,
1: -	WLAN_EID_LINK_ID = 101,
1: -	WLAN_EID_WAKEUP_SCHEDUL = 102,
1: -	WLAN_EID_CHAN_SWITCH_TIMING = 104,
1: -	WLAN_EID_PTI_CONTROL = 105,
1: -	WLAN_EID_PU_BUFFER_STATUS = 106,
1: -	WLAN_EID_INTERWORKING = 107,
1: -	WLAN_EID_ADVERTISEMENT_PROTOCOL = 108,
1: -	WLAN_EID_EXPEDITED_BW_REQ = 109,
1: -	WLAN_EID_QOS_MAP_SET = 110,
1: -	WLAN_EID_ROAMING_CONSORTIUM = 111,
1: -	WLAN_EID_EMERGENCY_ALERT = 112,
1: -	WLAN_EID_MESH_CONFIG = 113,
1: -	WLAN_EID_MESH_ID = 114,
1: -	WLAN_EID_LINK_METRIC_REPORT = 115,
1: -	WLAN_EID_CONGESTION_NOTIFICATION = 116,
1: -	WLAN_EID_PEER_MGMT = 117,
1: -	WLAN_EID_CHAN_SWITCH_PARAM = 118,
1: -	WLAN_EID_MESH_AWAKE_WINDOW = 119,
1: -	WLAN_EID_BEACON_TIMING = 120,
1: -	WLAN_EID_MCCAOP_SETUP_REQ = 121,
1: -	WLAN_EID_MCCAOP_SETUP_RESP = 122,
1: -	WLAN_EID_MCCAOP_ADVERT = 123,
1: -	WLAN_EID_MCCAOP_TEARDOWN = 124,
1: -	WLAN_EID_GANN = 125,
1: -	WLAN_EID_RANN = 126,
1: -	WLAN_EID_EXT_CAPABILITY = 127,
1: -	WLAN_EID_PREQ = 130,
1: -	WLAN_EID_PREP = 131,
1: -	WLAN_EID_PERR = 132,
1: -	WLAN_EID_PXU = 137,
1: -	WLAN_EID_PXUC = 138,
1: -	WLAN_EID_AUTH_MESH_PEER_EXCH = 139,
1: -	WLAN_EID_MIC = 140,
1: -	WLAN_EID_DESTINATION_URI = 141,
1: -	WLAN_EID_UAPSD_COEX = 142,
1: -	WLAN_EID_WAKEUP_SCHEDULE = 143,
1: -	WLAN_EID_EXT_SCHEDULE = 144,
1: -	WLAN_EID_STA_AVAILABILITY = 145,
1: -	WLAN_EID_DMG_TSPEC = 146,
1: -	WLAN_EID_DMG_AT = 147,
1: -	WLAN_EID_DMG_CAP = 148,
1: -	WLAN_EID_CISCO_VENDOR_SPECIFIC = 150,
1: -	WLAN_EID_DMG_OPERATION = 151,
1: -	WLAN_EID_DMG_BSS_PARAM_CHANGE = 152,
1: -	WLAN_EID_DMG_BEAM_REFINEMENT = 153,
1: -	WLAN_EID_CHANNEL_MEASURE_FEEDBACK = 154,
1: -	WLAN_EID_AWAKE_WINDOW = 157,
1: -	WLAN_EID_MULTI_BAND = 158,
1: -	WLAN_EID_ADDBA_EXT = 159,
1: -	WLAN_EID_NEXT_PCP_LIST = 160,
1: -	WLAN_EID_PCP_HANDOVER = 161,
1: -	WLAN_EID_DMG_LINK_MARGIN = 162,
1: -	WLAN_EID_SWITCHING_STREAM = 163,
1: -	WLAN_EID_SESSION_TRANSITION = 164,
1: -	WLAN_EID_DYN_TONE_PAIRING_REPORT = 165,
1: -	WLAN_EID_CLUSTER_REPORT = 166,
1: -	WLAN_EID_RELAY_CAP = 167,
1: -	WLAN_EID_RELAY_XFER_PARAM_SET = 168,
1: -	WLAN_EID_BEAM_LINK_MAINT = 169,
1: -	WLAN_EID_MULTIPLE_MAC_ADDR = 170,
1: -	WLAN_EID_U_PID = 171,
1: -	WLAN_EID_DMG_LINK_ADAPT_ACK = 172,
1: -	WLAN_EID_MCCAOP_ADV_OVERVIEW = 174,
1: -	WLAN_EID_QUIET_PERIOD_REQ = 175,
1: -	WLAN_EID_QUIET_PERIOD_RESP = 177,
1: -	WLAN_EID_EPAC_POLICY = 182,
1: -	WLAN_EID_CLISTER_TIME_OFF = 183,
1: -	WLAN_EID_INTER_AC_PRIO = 184,
1: -	WLAN_EID_SCS_DESCRIPTOR = 185,
1: -	WLAN_EID_QLOAD_REPORT = 186,
1: -	WLAN_EID_HCCA_TXOP_UPDATE_COUNT = 187,
1: -	WLAN_EID_HL_STREAM_ID = 188,
1: -	WLAN_EID_GCR_GROUP_ADDR = 189,
1: -	WLAN_EID_ANTENNA_SECTOR_ID_PATTERN = 190,
1: -	WLAN_EID_VHT_CAPABILITY = 191,
1: -	WLAN_EID_VHT_OPERATION = 192,
1: -	WLAN_EID_EXTENDED_BSS_LOAD = 193,
1: -	WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
1: -	WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
1: -	WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
1: -	WLAN_EID_AID = 197,
1: -	WLAN_EID_QUIET_CHANNEL = 198,
1: -	WLAN_EID_OPMODE_NOTIF = 199,
1: -	WLAN_EID_REDUCED_NEIGHBOR_REPORT = 201,
1: -	WLAN_EID_AID_REQUEST = 210,
1: -	WLAN_EID_AID_RESPONSE = 211,
1: -	WLAN_EID_S1G_BCN_COMPAT = 213,
1: -	WLAN_EID_S1G_SHORT_BCN_INTERVAL = 214,
1: -	WLAN_EID_S1G_CAPABILITIES = 217,
1: -	WLAN_EID_VENDOR_SPECIFIC = 221,
1: -	WLAN_EID_QOS_PARAMETER = 222,
1: -	WLAN_EID_S1G_OPERATION = 232,
1: -	WLAN_EID_CAG_NUMBER = 237,
1: -	WLAN_EID_AP_CSN = 239,
1: -	WLAN_EID_FILS_INDICATION = 240,
1: -	WLAN_EID_DILS = 241,
1: -	WLAN_EID_FRAGMENT = 242,
1: -	WLAN_EID_RSNX = 244,
1: -	WLAN_EID_EXTENSION = 255,
1: +  WLAN_EID_SSID = 0,
1: +  WLAN_EID_SUPP_RATES = 1,
1: +  WLAN_EID_FH_PARAMS = 2,
1: +  WLAN_EID_DS_PARAMS = 3,
1: +  WLAN_EID_CF_PARAMS = 4,
1: +  WLAN_EID_TIM = 5,
1: +  WLAN_EID_IBSS_PARAMS = 6,
1: +  WLAN_EID_COUNTRY = 7,
1: +  WLAN_EID_REQUEST = 10,
1: +  WLAN_EID_QBSS_LOAD = 11,
1: +  WLAN_EID_EDCA_PARAM_SET = 12,
1: +  WLAN_EID_TSPEC = 13,
1: +  WLAN_EID_TCLAS = 14,
1: +  WLAN_EID_SCHEDULE = 15,
1: +  WLAN_EID_CHALLENGE = 16,
1: +  WLAN_EID_PWR_CONSTRAINT = 32,
1: +  WLAN_EID_PWR_CAPABILITY = 33,
1: +  WLAN_EID_TPC_REQUEST = 34,
1: +  WLAN_EID_TPC_REPORT = 35,
1: +  WLAN_EID_SUPPORTED_CHANNELS = 36,
1: +  WLAN_EID_CHANNEL_SWITCH = 37,
1: +  WLAN_EID_MEASURE_REQUEST = 38,
1: +  WLAN_EID_MEASURE_REPORT = 39,
1: +  WLAN_EID_QUIET = 40,
1: +  WLAN_EID_IBSS_DFS = 41,
1: +  WLAN_EID_ERP_INFO = 42,
1: +  WLAN_EID_TS_DELAY = 43,
1: +  WLAN_EID_TCLAS_PROCESSING = 44,
1: +  WLAN_EID_HT_CAPABILITY = 45,
1: +  WLAN_EID_QOS_CAPA = 46,
1: +  WLAN_EID_RSN = 48,
1: +  WLAN_EID_802_15_COEX = 49,
1: +  WLAN_EID_EXT_SUPP_RATES = 50,
1: +  WLAN_EID_AP_CHAN_REPORT = 51,
1: +  WLAN_EID_NEIGHBOR_REPORT = 52,
1: +  WLAN_EID_RCPI = 53,
1: +  WLAN_EID_MOBILITY_DOMAIN = 54,
1: +  WLAN_EID_FAST_BSS_TRANSITION = 55,
1: +  WLAN_EID_TIMEOUT_INTERVAL = 56,
1: +  WLAN_EID_RIC_DATA = 57,
1: +  WLAN_EID_DSE_REGISTERED_LOCATION = 58,
1: +  WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
1: +  WLAN_EID_EXT_CHANSWITCH_ANN = 60,
1: +  WLAN_EID_HT_OPERATION = 61,
1: +  WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
1: +  WLAN_EID_BSS_AVG_ACCESS_DELAY = 63,
1: +  WLAN_EID_ANTENNA_INFO = 64,
1: +  WLAN_EID_RSNI = 65,
1: +  WLAN_EID_MEASUREMENT_PILOT_TX_INFO = 66,
1: +  WLAN_EID_BSS_AVAILABLE_CAPACITY = 67,
1: +  WLAN_EID_BSS_AC_ACCESS_DELAY = 68,
1: +  WLAN_EID_TIME_ADVERTISEMENT = 69,
1: +  WLAN_EID_RRM_ENABLED_CAPABILITIES = 70,
1: +  WLAN_EID_MULTIPLE_BSSID = 71,
1: +  WLAN_EID_BSS_COEX_2040 = 72,
1: +  WLAN_EID_BSS_INTOLERANT_CHL_REPORT = 73,
1: +  WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74,
1: +  WLAN_EID_RIC_DESCRIPTOR = 75,
1: +  WLAN_EID_MMIE = 76,
1: +  WLAN_EID_ASSOC_COMEBACK_TIME = 77,
1: +  WLAN_EID_EVENT_REQUEST = 78,
1: +  WLAN_EID_EVENT_REPORT = 79,
1: +  WLAN_EID_DIAGNOSTIC_REQUEST = 80,
1: +  WLAN_EID_DIAGNOSTIC_REPORT = 81,
1: +  WLAN_EID_LOCATION_PARAMS = 82,
1: +  WLAN_EID_NON_TX_BSSID_CAP = 83,
1: +  WLAN_EID_SSID_LIST = 84,
1: +  WLAN_EID_MULTI_BSSID_IDX = 85,
1: +  WLAN_EID_FMS_DESCRIPTOR = 86,
1: +  WLAN_EID_FMS_REQUEST = 87,
1: +  WLAN_EID_FMS_RESPONSE = 88,
1: +  WLAN_EID_QOS_TRAFFIC_CAPA = 89,
1: +  WLAN_EID_BSS_MAX_IDLE_PERIOD = 90,
1: +  WLAN_EID_TSF_REQUEST = 91,
1: +  WLAN_EID_TSF_RESPOSNE = 92,
1: +  WLAN_EID_WNM_SLEEP_MODE = 93,
1: +  WLAN_EID_TIM_BCAST_REQ = 94,
1: +  WLAN_EID_TIM_BCAST_RESP = 95,
1: +  WLAN_EID_COLL_IF_REPORT = 96,
1: +  WLAN_EID_CHANNEL_USAGE = 97,
1: +  WLAN_EID_TIME_ZONE = 98,
1: +  WLAN_EID_DMS_REQUEST = 99,
1: +  WLAN_EID_DMS_RESPONSE = 100,
1: +  WLAN_EID_LINK_ID = 101,
1: +  WLAN_EID_WAKEUP_SCHEDUL = 102,
1: +  WLAN_EID_CHAN_SWITCH_TIMING = 104,
1: +  WLAN_EID_PTI_CONTROL = 105,
1: +  WLAN_EID_PU_BUFFER_STATUS = 106,
1: +  WLAN_EID_INTERWORKING = 107,
1: +  WLAN_EID_ADVERTISEMENT_PROTOCOL = 108,
1: +  WLAN_EID_EXPEDITED_BW_REQ = 109,
1: +  WLAN_EID_QOS_MAP_SET = 110,
1: +  WLAN_EID_ROAMING_CONSORTIUM = 111,
1: +  WLAN_EID_EMERGENCY_ALERT = 112,
1: +  WLAN_EID_MESH_CONFIG = 113,
1: +  WLAN_EID_MESH_ID = 114,
1: +  WLAN_EID_LINK_METRIC_REPORT = 115,
1: +  WLAN_EID_CONGESTION_NOTIFICATION = 116,
1: +  WLAN_EID_PEER_MGMT = 117,
1: +  WLAN_EID_CHAN_SWITCH_PARAM = 118,
1: +  WLAN_EID_MESH_AWAKE_WINDOW = 119,
1: +  WLAN_EID_BEACON_TIMING = 120,
1: +  WLAN_EID_MCCAOP_SETUP_REQ = 121,
1: +  WLAN_EID_MCCAOP_SETUP_RESP = 122,
1: +  WLAN_EID_MCCAOP_ADVERT = 123,
1: +  WLAN_EID_MCCAOP_TEARDOWN = 124,
1: +  WLAN_EID_GANN = 125,
1: +  WLAN_EID_RANN = 126,
1: +  WLAN_EID_EXT_CAPABILITY = 127,
1: +  WLAN_EID_PREQ = 130,
1: +  WLAN_EID_PREP = 131,
1: +  WLAN_EID_PERR = 132,
1: +  WLAN_EID_PXU = 137,
1: +  WLAN_EID_PXUC = 138,
1: +  WLAN_EID_AUTH_MESH_PEER_EXCH = 139,
1: +  WLAN_EID_MIC = 140,
1: +  WLAN_EID_DESTINATION_URI = 141,
1: +  WLAN_EID_UAPSD_COEX = 142,
1: +  WLAN_EID_WAKEUP_SCHEDULE = 143,
1: +  WLAN_EID_EXT_SCHEDULE = 144,
1: +  WLAN_EID_STA_AVAILABILITY = 145,
1: +  WLAN_EID_DMG_TSPEC = 146,
1: +  WLAN_EID_DMG_AT = 147,
1: +  WLAN_EID_DMG_CAP = 148,
1: +  WLAN_EID_CISCO_VENDOR_SPECIFIC = 150,
1: +  WLAN_EID_DMG_OPERATION = 151,
1: +  WLAN_EID_DMG_BSS_PARAM_CHANGE = 152,
1: +  WLAN_EID_DMG_BEAM_REFINEMENT = 153,
1: +  WLAN_EID_CHANNEL_MEASURE_FEEDBACK = 154,
1: +  WLAN_EID_AWAKE_WINDOW = 157,
1: +  WLAN_EID_MULTI_BAND = 158,
1: +  WLAN_EID_ADDBA_EXT = 159,
1: +  WLAN_EID_NEXT_PCP_LIST = 160,
1: +  WLAN_EID_PCP_HANDOVER = 161,
1: +  WLAN_EID_DMG_LINK_MARGIN = 162,
1: +  WLAN_EID_SWITCHING_STREAM = 163,
1: +  WLAN_EID_SESSION_TRANSITION = 164,
1: +  WLAN_EID_DYN_TONE_PAIRING_REPORT = 165,
1: +  WLAN_EID_CLUSTER_REPORT = 166,
1: +  WLAN_EID_RELAY_CAP = 167,
1: +  WLAN_EID_RELAY_XFER_PARAM_SET = 168,
1: +  WLAN_EID_BEAM_LINK_MAINT = 169,
1: +  WLAN_EID_MULTIPLE_MAC_ADDR = 170,
1: +  WLAN_EID_U_PID = 171,
1: +  WLAN_EID_DMG_LINK_ADAPT_ACK = 172,
1: +  WLAN_EID_MCCAOP_ADV_OVERVIEW = 174,
1: +  WLAN_EID_QUIET_PERIOD_REQ = 175,
1: +  WLAN_EID_QUIET_PERIOD_RESP = 177,
1: +  WLAN_EID_EPAC_POLICY = 182,
1: +  WLAN_EID_CLISTER_TIME_OFF = 183,
1: +  WLAN_EID_INTER_AC_PRIO = 184,
1: +  WLAN_EID_SCS_DESCRIPTOR = 185,
1: +  WLAN_EID_QLOAD_REPORT = 186,
1: +  WLAN_EID_HCCA_TXOP_UPDATE_COUNT = 187,
1: +  WLAN_EID_HL_STREAM_ID = 188,
1: +  WLAN_EID_GCR_GROUP_ADDR = 189,
1: +  WLAN_EID_ANTENNA_SECTOR_ID_PATTERN = 190,
1: +  WLAN_EID_VHT_CAPABILITY = 191,
1: +  WLAN_EID_VHT_OPERATION = 192,
1: +  WLAN_EID_EXTENDED_BSS_LOAD = 193,
1: +  WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
1: +  WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
1: +  WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
1: +  WLAN_EID_AID = 197,
1: +  WLAN_EID_QUIET_CHANNEL = 198,
1: +  WLAN_EID_OPMODE_NOTIF = 199,
1: +  WLAN_EID_REDUCED_NEIGHBOR_REPORT = 201,
1: +  WLAN_EID_AID_REQUEST = 210,
1: +  WLAN_EID_AID_RESPONSE = 211,
1: +  WLAN_EID_S1G_BCN_COMPAT = 213,
1: +  WLAN_EID_S1G_SHORT_BCN_INTERVAL = 214,
1: +  WLAN_EID_S1G_CAPABILITIES = 217,
1: +  WLAN_EID_VENDOR_SPECIFIC = 221,
1: +  WLAN_EID_QOS_PARAMETER = 222,
1: +  WLAN_EID_S1G_OPERATION = 232,
1: +  WLAN_EID_CAG_NUMBER = 237,
1: +  WLAN_EID_AP_CSN = 239,
1: +  WLAN_EID_FILS_INDICATION = 240,
1: +  WLAN_EID_DILS = 241,
1: +  WLAN_EID_FRAGMENT = 242,
1: +  WLAN_EID_RSNX = 244,
1: +  WLAN_EID_EXTENSION = 255,
1:  };
1:  
1:  struct element {
1: -	u8 id;
1: -	u8 datalen;
1: -	u8 data[0];
1: +  u8 id;
1: +  u8 datalen;
1: +  u8 data[0];
1:  };
1:  
1:  enum nl80211_he_ru_alloc {
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_26 = 0,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_52 = 1,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_106 = 2,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_242 = 3,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_484 = 4,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_996 = 5,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC_2x996 = 6,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_26 = 0,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_52 = 1,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_106 = 2,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_242 = 3,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_484 = 4,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_996 = 5,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC_2x996 = 6,
1:  };
1:  
1:  enum ieee80211_channel_flags {
1: -	IEEE80211_CHAN_DISABLED = 1,
1: -	IEEE80211_CHAN_NO_IR = 2,
1: -	IEEE80211_CHAN_RADAR = 8,
1: -	IEEE80211_CHAN_NO_HT40PLUS = 16,
1: -	IEEE80211_CHAN_NO_HT40MINUS = 32,
1: -	IEEE80211_CHAN_NO_OFDM = 64,
1: -	IEEE80211_CHAN_NO_80MHZ = 128,
1: -	IEEE80211_CHAN_NO_160MHZ = 256,
1: -	IEEE80211_CHAN_INDOOR_ONLY = 512,
1: -	IEEE80211_CHAN_IR_CONCURRENT = 1024,
1: -	IEEE80211_CHAN_NO_20MHZ = 2048,
1: -	IEEE80211_CHAN_NO_10MHZ = 4096,
1: -	IEEE80211_CHAN_NO_HE = 8192,
1: -	IEEE80211_CHAN_1MHZ = 16384,
1: -	IEEE80211_CHAN_2MHZ = 32768,
1: -	IEEE80211_CHAN_4MHZ = 65536,
1: -	IEEE80211_CHAN_8MHZ = 131072,
1: -	IEEE80211_CHAN_16MHZ = 262144,
1: +  IEEE80211_CHAN_DISABLED = 1,
1: +  IEEE80211_CHAN_NO_IR = 2,
1: +  IEEE80211_CHAN_RADAR = 8,
1: +  IEEE80211_CHAN_NO_HT40PLUS = 16,
1: +  IEEE80211_CHAN_NO_HT40MINUS = 32,
1: +  IEEE80211_CHAN_NO_OFDM = 64,
1: +  IEEE80211_CHAN_NO_80MHZ = 128,
1: +  IEEE80211_CHAN_NO_160MHZ = 256,
1: +  IEEE80211_CHAN_INDOOR_ONLY = 512,
1: +  IEEE80211_CHAN_IR_CONCURRENT = 1024,
1: +  IEEE80211_CHAN_NO_20MHZ = 2048,
1: +  IEEE80211_CHAN_NO_10MHZ = 4096,
1: +  IEEE80211_CHAN_NO_HE = 8192,
1: +  IEEE80211_CHAN_1MHZ = 16384,
1: +  IEEE80211_CHAN_2MHZ = 32768,
1: +  IEEE80211_CHAN_4MHZ = 65536,
1: +  IEEE80211_CHAN_8MHZ = 131072,
1: +  IEEE80211_CHAN_16MHZ = 262144,
1:  };
1:  
1:  enum ieee80211_rate_flags {
1: -	IEEE80211_RATE_SHORT_PREAMBLE = 1,
1: -	IEEE80211_RATE_MANDATORY_A = 2,
1: -	IEEE80211_RATE_MANDATORY_B = 4,
1: -	IEEE80211_RATE_MANDATORY_G = 8,
1: -	IEEE80211_RATE_ERP_G = 16,
1: -	IEEE80211_RATE_SUPPORTS_5MHZ = 32,
1: -	IEEE80211_RATE_SUPPORTS_10MHZ = 64,
1: +  IEEE80211_RATE_SHORT_PREAMBLE = 1,
1: +  IEEE80211_RATE_MANDATORY_A = 2,
1: +  IEEE80211_RATE_MANDATORY_B = 4,
1: +  IEEE80211_RATE_MANDATORY_G = 8,
1: +  IEEE80211_RATE_ERP_G = 16,
1: +  IEEE80211_RATE_SUPPORTS_5MHZ = 32,
1: +  IEEE80211_RATE_SUPPORTS_10MHZ = 64,
1:  };
1:  
1:  struct iface_combination_params {
1: -	int num_different_channels;
1: -	u8 radar_detect;
1: -	int iftype_num[13];
1: -	u32 new_beacon_int;
1: +  int num_different_channels;
1: +  u8 radar_detect;
1: +  int iftype_num[13];
1: +  u32 new_beacon_int;
1:  };
1:  
1:  enum rate_info_flags {
1: -	RATE_INFO_FLAGS_MCS = 1,
1: -	RATE_INFO_FLAGS_VHT_MCS = 2,
1: -	RATE_INFO_FLAGS_SHORT_GI = 4,
1: -	RATE_INFO_FLAGS_DMG = 8,
1: -	RATE_INFO_FLAGS_HE_MCS = 16,
1: -	RATE_INFO_FLAGS_EDMG = 32,
1: +  RATE_INFO_FLAGS_MCS = 1,
1: +  RATE_INFO_FLAGS_VHT_MCS = 2,
1: +  RATE_INFO_FLAGS_SHORT_GI = 4,
1: +  RATE_INFO_FLAGS_DMG = 8,
1: +  RATE_INFO_FLAGS_HE_MCS = 16,
1: +  RATE_INFO_FLAGS_EDMG = 32,
1:  };
1:  
1:  enum rate_info_bw {
1: -	RATE_INFO_BW_20 = 0,
1: -	RATE_INFO_BW_5 = 1,
1: -	RATE_INFO_BW_10 = 2,
1: -	RATE_INFO_BW_40 = 3,
1: -	RATE_INFO_BW_80 = 4,
1: -	RATE_INFO_BW_160 = 5,
1: -	RATE_INFO_BW_HE_RU = 6,
1: +  RATE_INFO_BW_20 = 0,
1: +  RATE_INFO_BW_5 = 1,
1: +  RATE_INFO_BW_10 = 2,
1: +  RATE_INFO_BW_40 = 3,
1: +  RATE_INFO_BW_80 = 4,
1: +  RATE_INFO_BW_160 = 5,
1: +  RATE_INFO_BW_HE_RU = 6,
1:  };
1:  
1:  struct iapp_layer2_update {
1: -	u8 da[6];
1: -	u8 sa[6];
1: -	__be16 len;
1: -	u8 dsap;
1: -	u8 ssap;
1: -	u8 control;
1: -	u8 xid_info[3];
1: +  u8 da[6];
1: +  u8 sa[6];
1: +  __be16 len;
1: +  u8 dsap;
1: +  u8 ssap;
1: +  u8 control;
1: +  u8 xid_info[3];
1:  };
1:  
1:  enum nl80211_reg_rule_flags {
1: -	NL80211_RRF_NO_OFDM = 1,
1: -	NL80211_RRF_NO_CCK = 2,
1: -	NL80211_RRF_NO_INDOOR = 4,
1: -	NL80211_RRF_NO_OUTDOOR = 8,
1: -	NL80211_RRF_DFS = 16,
1: -	NL80211_RRF_PTP_ONLY = 32,
1: -	NL80211_RRF_PTMP_ONLY = 64,
1: -	NL80211_RRF_NO_IR = 128,
1: -	__NL80211_RRF_NO_IBSS = 256,
1: -	NL80211_RRF_AUTO_BW = 2048,
1: -	NL80211_RRF_IR_CONCURRENT = 4096,
1: -	NL80211_RRF_NO_HT40MINUS = 8192,
1: -	NL80211_RRF_NO_HT40PLUS = 16384,
1: -	NL80211_RRF_NO_80MHZ = 32768,
1: -	NL80211_RRF_NO_160MHZ = 65536,
1: -	NL80211_RRF_NO_HE = 131072,
1: +  NL80211_RRF_NO_OFDM = 1,
1: +  NL80211_RRF_NO_CCK = 2,
1: +  NL80211_RRF_NO_INDOOR = 4,
1: +  NL80211_RRF_NO_OUTDOOR = 8,
1: +  NL80211_RRF_DFS = 16,
1: +  NL80211_RRF_PTP_ONLY = 32,
1: +  NL80211_RRF_PTMP_ONLY = 64,
1: +  NL80211_RRF_NO_IR = 128,
1: +  __NL80211_RRF_NO_IBSS = 256,
1: +  NL80211_RRF_AUTO_BW = 2048,
1: +  NL80211_RRF_IR_CONCURRENT = 4096,
1: +  NL80211_RRF_NO_HT40MINUS = 8192,
1: +  NL80211_RRF_NO_HT40PLUS = 16384,
1: +  NL80211_RRF_NO_80MHZ = 32768,
1: +  NL80211_RRF_NO_160MHZ = 65536,
1: +  NL80211_RRF_NO_HE = 131072,
1:  };
1:  
1:  enum nl80211_channel_type {
1: -	NL80211_CHAN_NO_HT = 0,
1: -	NL80211_CHAN_HT20 = 1,
1: -	NL80211_CHAN_HT40MINUS = 2,
1: -	NL80211_CHAN_HT40PLUS = 3,
1: +  NL80211_CHAN_NO_HT = 0,
1: +  NL80211_CHAN_HT20 = 1,
1: +  NL80211_CHAN_HT40MINUS = 2,
1: +  NL80211_CHAN_HT40PLUS = 3,
1:  };
1:  
1:  enum ieee80211_regd_source {
1: -	REGD_SOURCE_INTERNAL_DB = 0,
1: -	REGD_SOURCE_CRDA = 1,
1: -	REGD_SOURCE_CACHED = 2,
1: +  REGD_SOURCE_INTERNAL_DB = 0,
1: +  REGD_SOURCE_CRDA = 1,
1: +  REGD_SOURCE_CACHED = 2,
1:  };
1:  
1:  enum reg_request_treatment {
1: -	REG_REQ_OK = 0,
1: -	REG_REQ_IGNORE = 1,
1: -	REG_REQ_INTERSECT = 2,
1: -	REG_REQ_ALREADY_SET = 3,
1: +  REG_REQ_OK = 0,
1: +  REG_REQ_IGNORE = 1,
1: +  REG_REQ_INTERSECT = 2,
1: +  REG_REQ_ALREADY_SET = 3,
1:  };
1:  
1:  struct reg_beacon {
1: -	struct list_head list;
1: -	struct ieee80211_channel chan;
1: +  struct list_head list;
1: +  struct ieee80211_channel chan;
1:  };
1:  
1:  struct reg_regdb_apply_request {
1: -	struct list_head list;
1: -	const struct ieee80211_regdomain *regdom;
1: +  struct list_head list;
1: +  const struct ieee80211_regdomain *regdom;
1:  };
1:  
1:  struct fwdb_country {
1: -	u8 alpha2[2];
1: -	__be16 coll_ptr;
1: +  u8 alpha2[2];
1: +  __be16 coll_ptr;
1:  };
1:  
1:  struct fwdb_header {
1: -	__be32 magic;
1: -	__be32 version;
1: -	struct fwdb_country country[0];
1: +  __be32 magic;
1: +  __be32 version;
1: +  struct fwdb_country country[0];
1:  };
1:  
1:  struct fwdb_collection {
1: -	u8 len;
1: -	u8 n_rules;
1: -	u8 dfs_region;
1: -	char: 8;
1: +  u8 len;
1: +  u8 n_rules;
1: +  u8 dfs_region;
1: +  char : 8;
1:  };
1:  
1:  enum fwdb_flags {
1: -	FWDB_FLAG_NO_OFDM = 1,
1: -	FWDB_FLAG_NO_OUTDOOR = 2,
1: -	FWDB_FLAG_DFS = 4,
1: -	FWDB_FLAG_NO_IR = 8,
1: -	FWDB_FLAG_AUTO_BW = 16,
1: +  FWDB_FLAG_NO_OFDM = 1,
1: +  FWDB_FLAG_NO_OUTDOOR = 2,
1: +  FWDB_FLAG_DFS = 4,
1: +  FWDB_FLAG_NO_IR = 8,
1: +  FWDB_FLAG_AUTO_BW = 16,
1:  };
1:  
1:  struct fwdb_wmm_ac {
1: -	u8 ecw;
1: -	u8 aifsn;
1: -	__be16 cot;
1: +  u8 ecw;
1: +  u8 aifsn;
1: +  __be16 cot;
1:  };
1:  
1:  struct fwdb_wmm_rule {
1: -	struct fwdb_wmm_ac client[4];
1: -	struct fwdb_wmm_ac ap[4];
1: +  struct fwdb_wmm_ac client[4];
1: +  struct fwdb_wmm_ac ap[4];
1:  };
1:  
1:  struct fwdb_rule {
1: -	u8 len;
1: -	u8 flags;
1: -	__be16 max_eirp;
1: -	__be32 start;
1: -	__be32 end;
1: -	__be32 max_bw;
1: -	__be16 cac_timeout;
1: -	__be16 wmm_ptr;
1: +  u8 len;
1: +  u8 flags;
1: +  __be16 max_eirp;
1: +  __be32 start;
1: +  __be32 end;
1: +  __be32 max_bw;
1: +  __be16 cac_timeout;
1: +  __be16 wmm_ptr;
1:  };
1:  
1:  enum nl80211_scan_flags {
1: -	NL80211_SCAN_FLAG_LOW_PRIORITY = 1,
1: -	NL80211_SCAN_FLAG_FLUSH = 2,
1: -	NL80211_SCAN_FLAG_AP = 4,
1: -	NL80211_SCAN_FLAG_RANDOM_ADDR = 8,
1: -	NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME = 16,
1: -	NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP = 32,
1: -	NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE = 64,
1: -	NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 128,
1: -	NL80211_SCAN_FLAG_LOW_SPAN = 256,
1: -	NL80211_SCAN_FLAG_LOW_POWER = 512,
1: -	NL80211_SCAN_FLAG_HIGH_ACCURACY = 1024,
1: -	NL80211_SCAN_FLAG_RANDOM_SN = 2048,
1: -	NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 4096,
1: -	NL80211_SCAN_FLAG_FREQ_KHZ = 8192,
1: -	NL80211_SCAN_FLAG_COLOCATED_6GHZ = 16384,
1: +  NL80211_SCAN_FLAG_LOW_PRIORITY = 1,
1: +  NL80211_SCAN_FLAG_FLUSH = 2,
1: +  NL80211_SCAN_FLAG_AP = 4,
1: +  NL80211_SCAN_FLAG_RANDOM_ADDR = 8,
1: +  NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME = 16,
1: +  NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP = 32,
1: +  NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE = 64,
1: +  NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 128,
1: +  NL80211_SCAN_FLAG_LOW_SPAN = 256,
1: +  NL80211_SCAN_FLAG_LOW_POWER = 512,
1: +  NL80211_SCAN_FLAG_HIGH_ACCURACY = 1024,
1: +  NL80211_SCAN_FLAG_RANDOM_SN = 2048,
1: +  NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 4096,
1: +  NL80211_SCAN_FLAG_FREQ_KHZ = 8192,
1: +  NL80211_SCAN_FLAG_COLOCATED_6GHZ = 16384,
1:  };
1:  
1:  struct ieee80211_msrment_ie {
1: -	u8 token;
1: -	u8 mode;
1: -	u8 type;
1: -	u8 request[0];
1: +  u8 token;
1: +  u8 mode;
1: +  u8 type;
1: +  u8 request[0];
1:  };
1:  
1:  struct ieee80211_ext_chansw_ie {
1: -	u8 mode;
1: -	u8 new_operating_class;
1: -	u8 new_ch_num;
1: -	u8 count;
1: +  u8 mode;
1: +  u8 new_operating_class;
1: +  u8 new_ch_num;
1: +  u8 count;
1:  };
1:  
1:  struct ieee80211_tpc_report_ie {
1: -	u8 tx_power;
1: -	u8 link_margin;
1: +  u8 tx_power;
1: +  u8 link_margin;
1:  };
1:  
1:  struct ieee80211_s1g_bcn_compat_ie {
1: -	__le16 compat_info;
1: -	__le16 beacon_int;
1: -	__le32 tsf_completion;
1: +  __le16 compat_info;
1: +  __le16 beacon_int;
1: +  __le32 tsf_completion;
1:  };
1:  
1:  struct ieee80211_s1g_oper_ie {
1: -	u8 ch_width;
1: -	u8 oper_class;
1: -	u8 primary_ch;
1: -	u8 oper_ch;
1: -	__le16 basic_mcs_nss;
1: +  u8 ch_width;
1: +  u8 oper_class;
1: +  u8 primary_ch;
1: +  u8 oper_ch;
1: +  __le16 basic_mcs_nss;
1:  };
1:  
1:  struct ieee80211_ext {
1: -	__le16 frame_control;
1: -	__le16 duration;
1: -	union {
1: -		struct {
1: -			u8 sa[6];
1: -			__le32 timestamp;
1: -			u8 change_seq;
1: -			u8 variable[0];
1: -		} __attribute__((packed)) s1g_beacon;
1: -		struct {
1: -			u8 sa[6];
1: -			__le32 timestamp;
1: -			u8 change_seq;
1: -			u8 next_tbtt[3];
1: -			u8 variable[0];
1: -		} __attribute__((packed)) s1g_short_beacon;
1: -	} u;
1: +  __le16 frame_control;
1: +  __le16 duration;
1: +  union {
1: +    struct {
1: +      u8 sa[6];
1: +      __le32 timestamp;
1: +      u8 change_seq;
1: +      u8 variable[0];
1: +    } __attribute__((packed)) s1g_beacon;
1: +    struct {
1: +      u8 sa[6];
1: +      __le32 timestamp;
1: +      u8 change_seq;
1: +      u8 next_tbtt[3];
1: +      u8 variable[0];
1: +    } __attribute__((packed)) s1g_short_beacon;
1: +  } u;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_mgmt {
1: -	__le16 frame_control;
1: -	__le16 duration;
1: -	u8 da[6];
1: -	u8 sa[6];
1: -	u8 bssid[6];
1: -	__le16 seq_ctrl;
1: -	union {
1: -		struct {
1: -			__le16 auth_alg;
1: -			__le16 auth_transaction;
1: -			__le16 status_code;
1: -			u8 variable[0];
1: -		} auth;
1: -		struct {
1: -			__le16 reason_code;
1: -		} deauth;
1: -		struct {
1: -			__le16 capab_info;
1: -			__le16 listen_interval;
1: -			u8 variable[0];
1: -		} assoc_req;
1: -		struct {
1: -			__le16 capab_info;
1: -			__le16 status_code;
1: -			__le16 aid;
1: -			u8 variable[0];
1: -		} assoc_resp;
1: -		struct {
1: -			__le16 capab_info;
1: -			__le16 status_code;
1: -			__le16 aid;
1: -			u8 variable[0];
1: -		} reassoc_resp;
1: -		struct {
1: -			__le16 capab_info;
1: -			__le16 status_code;
1: -			u8 variable[0];
1: -		} s1g_assoc_resp;
1: -		struct {
1: -			__le16 capab_info;
1: -			__le16 status_code;
1: -			u8 variable[0];
1: -		} s1g_reassoc_resp;
1: -		struct {
1: -			__le16 capab_info;
1: -			__le16 listen_interval;
1: -			u8 current_ap[6];
1: -			u8 variable[0];
1: -		} reassoc_req;
1: -		struct {
1: -			__le16 reason_code;
1: -		} disassoc;
1: -		struct {
1: -			__le64 timestamp;
1: -			__le16 beacon_int;
1: -			__le16 capab_info;
1: -			u8 variable[0];
1: -		} __attribute__((packed)) beacon;
1: -		struct {
1: -			u8 variable[0];
1: -		} probe_req;
1: -		struct {
1: -			__le64 timestamp;
1: -			__le16 beacon_int;
1: -			__le16 capab_info;
1: -			u8 variable[0];
1: -		} __attribute__((packed)) probe_resp;
1: -		struct {
1: -			u8 category;
1: -			union {
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					u8 status_code;
1: -					u8 variable[0];
1: -				} wme_action;
1: -				struct {
1: -					u8 action_code;
1: -					u8 variable[0];
1: -				} chan_switch;
1: -				struct {
1: -					u8 action_code;
1: -					struct ieee80211_ext_chansw_ie data;
1: -					u8 variable[0];
1: -				} ext_chan_switch;
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					u8 element_id;
1: -					u8 length;
1: -					struct ieee80211_msrment_ie msr_elem;
1: -				} measurement;
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					__le16 capab;
1: -					__le16 timeout;
1: -					__le16 start_seq_num;
1: -					u8 variable[0];
1: -				} addba_req;
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					__le16 status;
1: -					__le16 capab;
1: -					__le16 timeout;
1: -				} addba_resp;
1: -				struct {
1: -					u8 action_code;
1: -					__le16 params;
1: -					__le16 reason_code;
1: -				} __attribute__((packed)) delba;
1: -				struct {
1: -					u8 action_code;
1: -					u8 variable[0];
1: -				} self_prot;
1: -				struct {
1: -					u8 action_code;
1: -					u8 variable[0];
1: -				} mesh_action;
1: -				struct {
1: -					u8 action;
1: -					u8 trans_id[2];
1: -				} sa_query;
1: -				struct {
1: -					u8 action;
1: -					u8 smps_control;
1: -				} ht_smps;
1: -				struct {
1: -					u8 action_code;
1: -					u8 chanwidth;
1: -				} ht_notify_cw;
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					__le16 capability;
1: -					u8 variable[0];
1: -				} tdls_discover_resp;
1: -				struct {
1: -					u8 action_code;
1: -					u8 operating_mode;
1: -				} vht_opmode_notif;
1: -				struct {
1: -					u8 action_code;
1: -					u8 membership[8];
1: -					u8 position[16];
1: -				} vht_group_notif;
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					u8 tpc_elem_id;
1: -					u8 tpc_elem_length;
1: -					struct ieee80211_tpc_report_ie tpc;
1: -				} tpc_report;
1: -				struct {
1: -					u8 action_code;
1: -					u8 dialog_token;
1: -					u8 follow_up;
1: -					u8 tod[6];
1: -					u8 toa[6];
1: -					__le16 tod_error;
1: -					__le16 toa_error;
1: -					u8 variable[0];
1: -				} __attribute__((packed)) ftm;
1: -			} u;
1: -		} __attribute__((packed)) action;
1: -	} u;
1: +  __le16 frame_control;
1: +  __le16 duration;
1: +  u8 da[6];
1: +  u8 sa[6];
1: +  u8 bssid[6];
1: +  __le16 seq_ctrl;
1: +  union {
1: +    struct {
1: +      __le16 auth_alg;
1: +      __le16 auth_transaction;
1: +      __le16 status_code;
1: +      u8 variable[0];
1: +    } auth;
1: +    struct {
1: +      __le16 reason_code;
1: +    } deauth;
1: +    struct {
1: +      __le16 capab_info;
1: +      __le16 listen_interval;
1: +      u8 variable[0];
1: +    } assoc_req;
1: +    struct {
1: +      __le16 capab_info;
1: +      __le16 status_code;
1: +      __le16 aid;
1: +      u8 variable[0];
1: +    } assoc_resp;
1: +    struct {
1: +      __le16 capab_info;
1: +      __le16 status_code;
1: +      __le16 aid;
1: +      u8 variable[0];
1: +    } reassoc_resp;
1: +    struct {
1: +      __le16 capab_info;
1: +      __le16 status_code;
1: +      u8 variable[0];
1: +    } s1g_assoc_resp;
1: +    struct {
1: +      __le16 capab_info;
1: +      __le16 status_code;
1: +      u8 variable[0];
1: +    } s1g_reassoc_resp;
1: +    struct {
1: +      __le16 capab_info;
1: +      __le16 listen_interval;
1: +      u8 current_ap[6];
1: +      u8 variable[0];
1: +    } reassoc_req;
1: +    struct {
1: +      __le16 reason_code;
1: +    } disassoc;
1: +    struct {
1: +      __le64 timestamp;
1: +      __le16 beacon_int;
1: +      __le16 capab_info;
1: +      u8 variable[0];
1: +    } __attribute__((packed)) beacon;
1: +    struct {
1: +      u8 variable[0];
1: +    } probe_req;
1: +    struct {
1: +      __le64 timestamp;
1: +      __le16 beacon_int;
1: +      __le16 capab_info;
1: +      u8 variable[0];
1: +    } __attribute__((packed)) probe_resp;
1: +    struct {
1: +      u8 category;
1: +      union {
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          u8 status_code;
1: +          u8 variable[0];
1: +        } wme_action;
1: +        struct {
1: +          u8 action_code;
1: +          u8 variable[0];
1: +        } chan_switch;
1: +        struct {
1: +          u8 action_code;
1: +          struct ieee80211_ext_chansw_ie data;
1: +          u8 variable[0];
1: +        } ext_chan_switch;
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          u8 element_id;
1: +          u8 length;
1: +          struct ieee80211_msrment_ie msr_elem;
1: +        } measurement;
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          __le16 capab;
1: +          __le16 timeout;
1: +          __le16 start_seq_num;
1: +          u8 variable[0];
1: +        } addba_req;
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          __le16 status;
1: +          __le16 capab;
1: +          __le16 timeout;
1: +        } addba_resp;
1: +        struct {
1: +          u8 action_code;
1: +          __le16 params;
1: +          __le16 reason_code;
1: +        } __attribute__((packed)) delba;
1: +        struct {
1: +          u8 action_code;
1: +          u8 variable[0];
1: +        } self_prot;
1: +        struct {
1: +          u8 action_code;
1: +          u8 variable[0];
1: +        } mesh_action;
1: +        struct {
1: +          u8 action;
1: +          u8 trans_id[2];
1: +        } sa_query;
1: +        struct {
1: +          u8 action;
1: +          u8 smps_control;
1: +        } ht_smps;
1: +        struct {
1: +          u8 action_code;
1: +          u8 chanwidth;
1: +        } ht_notify_cw;
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          __le16 capability;
1: +          u8 variable[0];
1: +        } tdls_discover_resp;
1: +        struct {
1: +          u8 action_code;
1: +          u8 operating_mode;
1: +        } vht_opmode_notif;
1: +        struct {
1: +          u8 action_code;
1: +          u8 membership[8];
1: +          u8 position[16];
1: +        } vht_group_notif;
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          u8 tpc_elem_id;
1: +          u8 tpc_elem_length;
1: +          struct ieee80211_tpc_report_ie tpc;
1: +        } tpc_report;
1: +        struct {
1: +          u8 action_code;
1: +          u8 dialog_token;
1: +          u8 follow_up;
1: +          u8 tod[6];
1: +          u8 toa[6];
1: +          __le16 tod_error;
1: +          __le16 toa_error;
1: +          u8 variable[0];
1: +        } __attribute__((packed)) ftm;
1: +      } u;
1: +    } __attribute__((packed)) action;
1: +  } u;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_ht_operation {
1: -	u8 primary_chan;
1: -	u8 ht_param;
1: -	__le16 operation_mode;
1: -	__le16 stbc_param;
1: -	u8 basic_set[16];
1: +  u8 primary_chan;
1: +  u8 ht_param;
1: +  __le16 operation_mode;
1: +  __le16 stbc_param;
1: +  u8 basic_set[16];
1:  };
1:  
1:  enum ieee80211_eid_ext {
1: -	WLAN_EID_EXT_ASSOC_DELAY_INFO = 1,
1: -	WLAN_EID_EXT_FILS_REQ_PARAMS = 2,
1: -	WLAN_EID_EXT_FILS_KEY_CONFIRM = 3,
1: -	WLAN_EID_EXT_FILS_SESSION = 4,
1: -	WLAN_EID_EXT_FILS_HLP_CONTAINER = 5,
1: -	WLAN_EID_EXT_FILS_IP_ADDR_ASSIGN = 6,
1: -	WLAN_EID_EXT_KEY_DELIVERY = 7,
1: -	WLAN_EID_EXT_FILS_WRAPPED_DATA = 8,
1: -	WLAN_EID_EXT_FILS_PUBLIC_KEY = 12,
1: -	WLAN_EID_EXT_FILS_NONCE = 13,
1: -	WLAN_EID_EXT_FUTURE_CHAN_GUIDANCE = 14,
1: -	WLAN_EID_EXT_HE_CAPABILITY = 35,
1: -	WLAN_EID_EXT_HE_OPERATION = 36,
1: -	WLAN_EID_EXT_UORA = 37,
1: -	WLAN_EID_EXT_HE_MU_EDCA = 38,
1: -	WLAN_EID_EXT_HE_SPR = 39,
1: -	WLAN_EID_EXT_NDP_FEEDBACK_REPORT_PARAMSET = 41,
1: -	WLAN_EID_EXT_BSS_COLOR_CHG_ANN = 42,
1: -	WLAN_EID_EXT_QUIET_TIME_PERIOD_SETUP = 43,
1: -	WLAN_EID_EXT_ESS_REPORT = 45,
1: -	WLAN_EID_EXT_OPS = 46,
1: -	WLAN_EID_EXT_HE_BSS_LOAD = 47,
1: -	WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52,
1: -	WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,
1: -	WLAN_EID_EXT_NON_INHERITANCE = 56,
1: -	WLAN_EID_EXT_KNOWN_BSSID = 57,
1: -	WLAN_EID_EXT_SHORT_SSID_LIST = 58,
1: -	WLAN_EID_EXT_HE_6GHZ_CAPA = 59,
1: -	WLAN_EID_EXT_UL_MU_POWER_CAPA = 60,
1: +  WLAN_EID_EXT_ASSOC_DELAY_INFO = 1,
1: +  WLAN_EID_EXT_FILS_REQ_PARAMS = 2,
1: +  WLAN_EID_EXT_FILS_KEY_CONFIRM = 3,
1: +  WLAN_EID_EXT_FILS_SESSION = 4,
1: +  WLAN_EID_EXT_FILS_HLP_CONTAINER = 5,
1: +  WLAN_EID_EXT_FILS_IP_ADDR_ASSIGN = 6,
1: +  WLAN_EID_EXT_KEY_DELIVERY = 7,
1: +  WLAN_EID_EXT_FILS_WRAPPED_DATA = 8,
1: +  WLAN_EID_EXT_FILS_PUBLIC_KEY = 12,
1: +  WLAN_EID_EXT_FILS_NONCE = 13,
1: +  WLAN_EID_EXT_FUTURE_CHAN_GUIDANCE = 14,
1: +  WLAN_EID_EXT_HE_CAPABILITY = 35,
1: +  WLAN_EID_EXT_HE_OPERATION = 36,
1: +  WLAN_EID_EXT_UORA = 37,
1: +  WLAN_EID_EXT_HE_MU_EDCA = 38,
1: +  WLAN_EID_EXT_HE_SPR = 39,
1: +  WLAN_EID_EXT_NDP_FEEDBACK_REPORT_PARAMSET = 41,
1: +  WLAN_EID_EXT_BSS_COLOR_CHG_ANN = 42,
1: +  WLAN_EID_EXT_QUIET_TIME_PERIOD_SETUP = 43,
1: +  WLAN_EID_EXT_ESS_REPORT = 45,
1: +  WLAN_EID_EXT_OPS = 46,
1: +  WLAN_EID_EXT_HE_BSS_LOAD = 47,
1: +  WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52,
1: +  WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,
1: +  WLAN_EID_EXT_NON_INHERITANCE = 56,
1: +  WLAN_EID_EXT_KNOWN_BSSID = 57,
1: +  WLAN_EID_EXT_SHORT_SSID_LIST = 58,
1: +  WLAN_EID_EXT_HE_6GHZ_CAPA = 59,
1: +  WLAN_EID_EXT_UL_MU_POWER_CAPA = 60,
1:  };
1:  
1:  struct ieee80211_neighbor_ap_info {
1: -	u8 tbtt_info_hdr;
1: -	u8 tbtt_info_len;
1: -	u8 op_class;
1: -	u8 channel;
1: +  u8 tbtt_info_hdr;
1: +  u8 tbtt_info_len;
1: +  u8 op_class;
1: +  u8 channel;
1:  };
1:  
1:  enum ieee80211_privacy {
1: -	IEEE80211_PRIVACY_ON = 0,
1: -	IEEE80211_PRIVACY_OFF = 1,
1: -	IEEE80211_PRIVACY_ANY = 2,
1: +  IEEE80211_PRIVACY_ON = 0,
1: +  IEEE80211_PRIVACY_OFF = 1,
1: +  IEEE80211_PRIVACY_ANY = 2,
1:  };
1:  
1:  struct cfg80211_inform_bss {
1: -	struct ieee80211_channel *chan;
1: -	enum nl80211_bss_scan_width scan_width;
1: -	s32 signal;
1: -	u64 boottime_ns;
1: -	u64 parent_tsf;
1: -	u8 parent_bssid[6];
1: -	u8 chains;
1: -	s8 chain_signal[4];
1: +  struct ieee80211_channel *chan;
1: +  enum nl80211_bss_scan_width scan_width;
1: +  s32 signal;
1: +  u64 boottime_ns;
1: +  u64 parent_tsf;
1: +  u8 parent_bssid[6];
1: +  u8 chains;
1: +  s8 chain_signal[4];
1:  };
1:  
1:  enum cfg80211_bss_frame_type {
1: -	CFG80211_BSS_FTYPE_UNKNOWN = 0,
1: -	CFG80211_BSS_FTYPE_BEACON = 1,
1: -	CFG80211_BSS_FTYPE_PRESP = 2,
1: +  CFG80211_BSS_FTYPE_UNKNOWN = 0,
1: +  CFG80211_BSS_FTYPE_BEACON = 1,
1: +  CFG80211_BSS_FTYPE_PRESP = 2,
1:  };
1:  
1:  struct cfg80211_colocated_ap {
1: -	struct list_head list;
1: -	u8 bssid[6];
1: -	u8 ssid[32];
1: -	size_t ssid_len;
1: -	u32 short_ssid;
1: -	u32 center_freq;
1: -	u8 unsolicited_probe: 1;
1: -	u8 oct_recommended: 1;
1: -	u8 same_ssid: 1;
1: -	u8 multi_bss: 1;
1: -	u8 transmitted_bssid: 1;
1: -	u8 colocated_ess: 1;
1: -	u8 short_ssid_valid: 1;
1: +  struct list_head list;
1: +  u8 bssid[6];
1: +  u8 ssid[32];
1: +  size_t ssid_len;
1: +  u32 short_ssid;
1: +  u32 center_freq;
1: +  u8 unsolicited_probe : 1;
1: +  u8 oct_recommended : 1;
1: +  u8 same_ssid : 1;
1: +  u8 multi_bss : 1;
1: +  u8 transmitted_bssid : 1;
1: +  u8 colocated_ess : 1;
1: +  u8 short_ssid_valid : 1;
1:  };
1:  
1:  enum bss_compare_mode {
1: -	BSS_CMP_REGULAR = 0,
1: -	BSS_CMP_HIDE_ZLEN = 1,
1: -	BSS_CMP_HIDE_NUL = 2,
1: +  BSS_CMP_REGULAR = 0,
1: +  BSS_CMP_HIDE_ZLEN = 1,
1: +  BSS_CMP_HIDE_NUL = 2,
1:  };
1:  
1:  struct cfg80211_non_tx_bss {
1: -	struct cfg80211_bss *tx_bss;
1: -	u8 max_bssid_indicator;
1: -	u8 bssid_index;
1: +  struct cfg80211_bss *tx_bss;
1: +  u8 max_bssid_indicator;
1: +  u8 bssid_index;
1:  };
1:  
1:  enum ieee80211_vht_mcs_support {
1: -	IEEE80211_VHT_MCS_SUPPORT_0_7 = 0,
1: -	IEEE80211_VHT_MCS_SUPPORT_0_8 = 1,
1: -	IEEE80211_VHT_MCS_SUPPORT_0_9 = 2,
1: -	IEEE80211_VHT_MCS_NOT_SUPPORTED = 3,
1: +  IEEE80211_VHT_MCS_SUPPORT_0_7 = 0,
1: +  IEEE80211_VHT_MCS_SUPPORT_0_8 = 1,
1: +  IEEE80211_VHT_MCS_SUPPORT_0_9 = 2,
1: +  IEEE80211_VHT_MCS_NOT_SUPPORTED = 3,
1:  };
1:  
1:  enum ieee80211_he_mcs_support {
1: -	IEEE80211_HE_MCS_SUPPORT_0_7 = 0,
1: -	IEEE80211_HE_MCS_SUPPORT_0_9 = 1,
1: -	IEEE80211_HE_MCS_SUPPORT_0_11 = 2,
1: -	IEEE80211_HE_MCS_NOT_SUPPORTED = 3,
1: +  IEEE80211_HE_MCS_SUPPORT_0_7 = 0,
1: +  IEEE80211_HE_MCS_SUPPORT_0_9 = 1,
1: +  IEEE80211_HE_MCS_SUPPORT_0_11 = 2,
1: +  IEEE80211_HE_MCS_NOT_SUPPORTED = 3,
1:  };
1:  
1:  enum ieee80211_mesh_sync_method {
1: -	IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,
1: -	IEEE80211_SYNC_METHOD_VENDOR = 255,
1: +  IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,
1: +  IEEE80211_SYNC_METHOD_VENDOR = 255,
1:  };
1:  
1:  enum ieee80211_mesh_path_protocol {
1: -	IEEE80211_PATH_PROTOCOL_HWMP = 1,
1: -	IEEE80211_PATH_PROTOCOL_VENDOR = 255,
1: +  IEEE80211_PATH_PROTOCOL_HWMP = 1,
1: +  IEEE80211_PATH_PROTOCOL_VENDOR = 255,
1:  };
1:  
1:  enum ieee80211_mesh_path_metric {
1: -	IEEE80211_PATH_METRIC_AIRTIME = 1,
1: -	IEEE80211_PATH_METRIC_VENDOR = 255,
1: +  IEEE80211_PATH_METRIC_AIRTIME = 1,
1: +  IEEE80211_PATH_METRIC_VENDOR = 255,
1:  };
1:  
1:  enum nl80211_attrs {
1: -	NL80211_ATTR_UNSPEC = 0,
1: -	NL80211_ATTR_WIPHY = 1,
1: -	NL80211_ATTR_WIPHY_NAME = 2,
1: -	NL80211_ATTR_IFINDEX = 3,
1: -	NL80211_ATTR_IFNAME = 4,
1: -	NL80211_ATTR_IFTYPE = 5,
1: -	NL80211_ATTR_MAC = 6,
1: -	NL80211_ATTR_KEY_DATA = 7,
1: -	NL80211_ATTR_KEY_IDX = 8,
1: -	NL80211_ATTR_KEY_CIPHER = 9,
1: -	NL80211_ATTR_KEY_SEQ = 10,
1: -	NL80211_ATTR_KEY_DEFAULT = 11,
1: -	NL80211_ATTR_BEACON_INTERVAL = 12,
1: -	NL80211_ATTR_DTIM_PERIOD = 13,
1: -	NL80211_ATTR_BEACON_HEAD = 14,
1: -	NL80211_ATTR_BEACON_TAIL = 15,
1: -	NL80211_ATTR_STA_AID = 16,
1: -	NL80211_ATTR_STA_FLAGS = 17,
1: -	NL80211_ATTR_STA_LISTEN_INTERVAL = 18,
1: -	NL80211_ATTR_STA_SUPPORTED_RATES = 19,
1: -	NL80211_ATTR_STA_VLAN = 20,
1: -	NL80211_ATTR_STA_INFO = 21,
1: -	NL80211_ATTR_WIPHY_BANDS = 22,
1: -	NL80211_ATTR_MNTR_FLAGS = 23,
1: -	NL80211_ATTR_MESH_ID = 24,
1: -	NL80211_ATTR_STA_PLINK_ACTION = 25,
1: -	NL80211_ATTR_MPATH_NEXT_HOP = 26,
1: -	NL80211_ATTR_MPATH_INFO = 27,
1: -	NL80211_ATTR_BSS_CTS_PROT = 28,
1: -	NL80211_ATTR_BSS_SHORT_PREAMBLE = 29,
1: -	NL80211_ATTR_BSS_SHORT_SLOT_TIME = 30,
1: -	NL80211_ATTR_HT_CAPABILITY = 31,
1: -	NL80211_ATTR_SUPPORTED_IFTYPES = 32,
1: -	NL80211_ATTR_REG_ALPHA2 = 33,
1: -	NL80211_ATTR_REG_RULES = 34,
1: -	NL80211_ATTR_MESH_CONFIG = 35,
1: -	NL80211_ATTR_BSS_BASIC_RATES = 36,
1: -	NL80211_ATTR_WIPHY_TXQ_PARAMS = 37,
1: -	NL80211_ATTR_WIPHY_FREQ = 38,
1: -	NL80211_ATTR_WIPHY_CHANNEL_TYPE = 39,
1: -	NL80211_ATTR_KEY_DEFAULT_MGMT = 40,
1: -	NL80211_ATTR_MGMT_SUBTYPE = 41,
1: -	NL80211_ATTR_IE = 42,
1: -	NL80211_ATTR_MAX_NUM_SCAN_SSIDS = 43,
1: -	NL80211_ATTR_SCAN_FREQUENCIES = 44,
1: -	NL80211_ATTR_SCAN_SSIDS = 45,
1: -	NL80211_ATTR_GENERATION = 46,
1: -	NL80211_ATTR_BSS = 47,
1: -	NL80211_ATTR_REG_INITIATOR = 48,
1: -	NL80211_ATTR_REG_TYPE = 49,
1: -	NL80211_ATTR_SUPPORTED_COMMANDS = 50,
1: -	NL80211_ATTR_FRAME = 51,
1: -	NL80211_ATTR_SSID = 52,
1: -	NL80211_ATTR_AUTH_TYPE = 53,
1: -	NL80211_ATTR_REASON_CODE = 54,
1: -	NL80211_ATTR_KEY_TYPE = 55,
1: -	NL80211_ATTR_MAX_SCAN_IE_LEN = 56,
1: -	NL80211_ATTR_CIPHER_SUITES = 57,
1: -	NL80211_ATTR_FREQ_BEFORE = 58,
1: -	NL80211_ATTR_FREQ_AFTER = 59,
1: -	NL80211_ATTR_FREQ_FIXED = 60,
1: -	NL80211_ATTR_WIPHY_RETRY_SHORT = 61,
1: -	NL80211_ATTR_WIPHY_RETRY_LONG = 62,
1: -	NL80211_ATTR_WIPHY_FRAG_THRESHOLD = 63,
1: -	NL80211_ATTR_WIPHY_RTS_THRESHOLD = 64,
1: -	NL80211_ATTR_TIMED_OUT = 65,
1: -	NL80211_ATTR_USE_MFP = 66,
1: -	NL80211_ATTR_STA_FLAGS2 = 67,
1: -	NL80211_ATTR_CONTROL_PORT = 68,
1: -	NL80211_ATTR_TESTDATA = 69,
1: -	NL80211_ATTR_PRIVACY = 70,
1: -	NL80211_ATTR_DISCONNECTED_BY_AP = 71,
1: -	NL80211_ATTR_STATUS_CODE = 72,
1: -	NL80211_ATTR_CIPHER_SUITES_PAIRWISE = 73,
1: -	NL80211_ATTR_CIPHER_SUITE_GROUP = 74,
1: -	NL80211_ATTR_WPA_VERSIONS = 75,
1: -	NL80211_ATTR_AKM_SUITES = 76,
1: -	NL80211_ATTR_REQ_IE = 77,
1: -	NL80211_ATTR_RESP_IE = 78,
1: -	NL80211_ATTR_PREV_BSSID = 79,
1: -	NL80211_ATTR_KEY = 80,
1: -	NL80211_ATTR_KEYS = 81,
1: -	NL80211_ATTR_PID = 82,
1: -	NL80211_ATTR_4ADDR = 83,
1: -	NL80211_ATTR_SURVEY_INFO = 84,
1: -	NL80211_ATTR_PMKID = 85,
1: -	NL80211_ATTR_MAX_NUM_PMKIDS = 86,
1: -	NL80211_ATTR_DURATION = 87,
1: -	NL80211_ATTR_COOKIE = 88,
1: -	NL80211_ATTR_WIPHY_COVERAGE_CLASS = 89,
1: -	NL80211_ATTR_TX_RATES = 90,
1: -	NL80211_ATTR_FRAME_MATCH = 91,
1: -	NL80211_ATTR_ACK = 92,
1: -	NL80211_ATTR_PS_STATE = 93,
1: -	NL80211_ATTR_CQM = 94,
1: -	NL80211_ATTR_LOCAL_STATE_CHANGE = 95,
1: -	NL80211_ATTR_AP_ISOLATE = 96,
1: -	NL80211_ATTR_WIPHY_TX_POWER_SETTING = 97,
1: -	NL80211_ATTR_WIPHY_TX_POWER_LEVEL = 98,
1: -	NL80211_ATTR_TX_FRAME_TYPES = 99,
1: -	NL80211_ATTR_RX_FRAME_TYPES = 100,
1: -	NL80211_ATTR_FRAME_TYPE = 101,
1: -	NL80211_ATTR_CONTROL_PORT_ETHERTYPE = 102,
1: -	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT = 103,
1: -	NL80211_ATTR_SUPPORT_IBSS_RSN = 104,
1: -	NL80211_ATTR_WIPHY_ANTENNA_TX = 105,
1: -	NL80211_ATTR_WIPHY_ANTENNA_RX = 106,
1: -	NL80211_ATTR_MCAST_RATE = 107,
1: -	NL80211_ATTR_OFFCHANNEL_TX_OK = 108,
1: -	NL80211_ATTR_BSS_HT_OPMODE = 109,
1: -	NL80211_ATTR_KEY_DEFAULT_TYPES = 110,
1: -	NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION = 111,
1: -	NL80211_ATTR_MESH_SETUP = 112,
1: -	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX = 113,
1: -	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX = 114,
1: -	NL80211_ATTR_SUPPORT_MESH_AUTH = 115,
1: -	NL80211_ATTR_STA_PLINK_STATE = 116,
1: -	NL80211_ATTR_WOWLAN_TRIGGERS = 117,
1: -	NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED = 118,
1: -	NL80211_ATTR_SCHED_SCAN_INTERVAL = 119,
1: -	NL80211_ATTR_INTERFACE_COMBINATIONS = 120,
1: -	NL80211_ATTR_SOFTWARE_IFTYPES = 121,
1: -	NL80211_ATTR_REKEY_DATA = 122,
1: -	NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS = 123,
1: -	NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN = 124,
1: -	NL80211_ATTR_SCAN_SUPP_RATES = 125,
1: -	NL80211_ATTR_HIDDEN_SSID = 126,
1: -	NL80211_ATTR_IE_PROBE_RESP = 127,
1: -	NL80211_ATTR_IE_ASSOC_RESP = 128,
1: -	NL80211_ATTR_STA_WME = 129,
1: -	NL80211_ATTR_SUPPORT_AP_UAPSD = 130,
1: -	NL80211_ATTR_ROAM_SUPPORT = 131,
1: -	NL80211_ATTR_SCHED_SCAN_MATCH = 132,
1: -	NL80211_ATTR_MAX_MATCH_SETS = 133,
1: -	NL80211_ATTR_PMKSA_CANDIDATE = 134,
1: -	NL80211_ATTR_TX_NO_CCK_RATE = 135,
1: -	NL80211_ATTR_TDLS_ACTION = 136,
1: -	NL80211_ATTR_TDLS_DIALOG_TOKEN = 137,
1: -	NL80211_ATTR_TDLS_OPERATION = 138,
1: -	NL80211_ATTR_TDLS_SUPPORT = 139,
1: -	NL80211_ATTR_TDLS_EXTERNAL_SETUP = 140,
1: -	NL80211_ATTR_DEVICE_AP_SME = 141,
1: -	NL80211_ATTR_DONT_WAIT_FOR_ACK = 142,
1: -	NL80211_ATTR_FEATURE_FLAGS = 143,
1: -	NL80211_ATTR_PROBE_RESP_OFFLOAD = 144,
1: -	NL80211_ATTR_PROBE_RESP = 145,
1: -	NL80211_ATTR_DFS_REGION = 146,
1: -	NL80211_ATTR_DISABLE_HT = 147,
1: -	NL80211_ATTR_HT_CAPABILITY_MASK = 148,
1: -	NL80211_ATTR_NOACK_MAP = 149,
1: -	NL80211_ATTR_INACTIVITY_TIMEOUT = 150,
1: -	NL80211_ATTR_RX_SIGNAL_DBM = 151,
1: -	NL80211_ATTR_BG_SCAN_PERIOD = 152,
1: -	NL80211_ATTR_WDEV = 153,
1: -	NL80211_ATTR_USER_REG_HINT_TYPE = 154,
1: -	NL80211_ATTR_CONN_FAILED_REASON = 155,
1: -	NL80211_ATTR_AUTH_DATA = 156,
1: -	NL80211_ATTR_VHT_CAPABILITY = 157,
1: -	NL80211_ATTR_SCAN_FLAGS = 158,
1: -	NL80211_ATTR_CHANNEL_WIDTH = 159,
1: -	NL80211_ATTR_CENTER_FREQ1 = 160,
1: -	NL80211_ATTR_CENTER_FREQ2 = 161,
1: -	NL80211_ATTR_P2P_CTWINDOW = 162,
1: -	NL80211_ATTR_P2P_OPPPS = 163,
1: -	NL80211_ATTR_LOCAL_MESH_POWER_MODE = 164,
1: -	NL80211_ATTR_ACL_POLICY = 165,
1: -	NL80211_ATTR_MAC_ADDRS = 166,
1: -	NL80211_ATTR_MAC_ACL_MAX = 167,
1: -	NL80211_ATTR_RADAR_EVENT = 168,
1: -	NL80211_ATTR_EXT_CAPA = 169,
1: -	NL80211_ATTR_EXT_CAPA_MASK = 170,
1: -	NL80211_ATTR_STA_CAPABILITY = 171,
1: -	NL80211_ATTR_STA_EXT_CAPABILITY = 172,
1: -	NL80211_ATTR_PROTOCOL_FEATURES = 173,
1: -	NL80211_ATTR_SPLIT_WIPHY_DUMP = 174,
1: -	NL80211_ATTR_DISABLE_VHT = 175,
1: -	NL80211_ATTR_VHT_CAPABILITY_MASK = 176,
1: -	NL80211_ATTR_MDID = 177,
1: -	NL80211_ATTR_IE_RIC = 178,
1: -	NL80211_ATTR_CRIT_PROT_ID = 179,
1: -	NL80211_ATTR_MAX_CRIT_PROT_DURATION = 180,
1: -	NL80211_ATTR_PEER_AID = 181,
1: -	NL80211_ATTR_COALESCE_RULE = 182,
1: -	NL80211_ATTR_CH_SWITCH_COUNT = 183,
1: -	NL80211_ATTR_CH_SWITCH_BLOCK_TX = 184,
1: -	NL80211_ATTR_CSA_IES = 185,
1: -	NL80211_ATTR_CNTDWN_OFFS_BEACON = 186,
1: -	NL80211_ATTR_CNTDWN_OFFS_PRESP = 187,
1: -	NL80211_ATTR_RXMGMT_FLAGS = 188,
1: -	NL80211_ATTR_STA_SUPPORTED_CHANNELS = 189,
1: -	NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES = 190,
1: -	NL80211_ATTR_HANDLE_DFS = 191,
1: -	NL80211_ATTR_SUPPORT_5_MHZ = 192,
1: -	NL80211_ATTR_SUPPORT_10_MHZ = 193,
1: -	NL80211_ATTR_OPMODE_NOTIF = 194,
1: -	NL80211_ATTR_VENDOR_ID = 195,
1: -	NL80211_ATTR_VENDOR_SUBCMD = 196,
1: -	NL80211_ATTR_VENDOR_DATA = 197,
1: -	NL80211_ATTR_VENDOR_EVENTS = 198,
1: -	NL80211_ATTR_QOS_MAP = 199,
1: -	NL80211_ATTR_MAC_HINT = 200,
1: -	NL80211_ATTR_WIPHY_FREQ_HINT = 201,
1: -	NL80211_ATTR_MAX_AP_ASSOC_STA = 202,
1: -	NL80211_ATTR_TDLS_PEER_CAPABILITY = 203,
1: -	NL80211_ATTR_SOCKET_OWNER = 204,
1: -	NL80211_ATTR_CSA_C_OFFSETS_TX = 205,
1: -	NL80211_ATTR_MAX_CSA_COUNTERS = 206,
1: -	NL80211_ATTR_TDLS_INITIATOR = 207,
1: -	NL80211_ATTR_USE_RRM = 208,
1: -	NL80211_ATTR_WIPHY_DYN_ACK = 209,
1: -	NL80211_ATTR_TSID = 210,
1: -	NL80211_ATTR_USER_PRIO = 211,
1: -	NL80211_ATTR_ADMITTED_TIME = 212,
1: -	NL80211_ATTR_SMPS_MODE = 213,
1: -	NL80211_ATTR_OPER_CLASS = 214,
1: -	NL80211_ATTR_MAC_MASK = 215,
1: -	NL80211_ATTR_WIPHY_SELF_MANAGED_REG = 216,
1: -	NL80211_ATTR_EXT_FEATURES = 217,
1: -	NL80211_ATTR_SURVEY_RADIO_STATS = 218,
1: -	NL80211_ATTR_NETNS_FD = 219,
1: -	NL80211_ATTR_SCHED_SCAN_DELAY = 220,
1: -	NL80211_ATTR_REG_INDOOR = 221,
1: -	NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS = 222,
1: -	NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL = 223,
1: -	NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS = 224,
1: -	NL80211_ATTR_SCHED_SCAN_PLANS = 225,
1: -	NL80211_ATTR_PBSS = 226,
1: -	NL80211_ATTR_BSS_SELECT = 227,
1: -	NL80211_ATTR_STA_SUPPORT_P2P_PS = 228,
1: -	NL80211_ATTR_PAD = 229,
1: -	NL80211_ATTR_IFTYPE_EXT_CAPA = 230,
1: -	NL80211_ATTR_MU_MIMO_GROUP_DATA = 231,
1: -	NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR = 232,
1: -	NL80211_ATTR_SCAN_START_TIME_TSF = 233,
1: -	NL80211_ATTR_SCAN_START_TIME_TSF_BSSID = 234,
1: -	NL80211_ATTR_MEASUREMENT_DURATION = 235,
1: -	NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY = 236,
1: -	NL80211_ATTR_MESH_PEER_AID = 237,
1: -	NL80211_ATTR_NAN_MASTER_PREF = 238,
1: -	NL80211_ATTR_BANDS = 239,
1: -	NL80211_ATTR_NAN_FUNC = 240,
1: -	NL80211_ATTR_NAN_MATCH = 241,
1: -	NL80211_ATTR_FILS_KEK = 242,
1: -	NL80211_ATTR_FILS_NONCES = 243,
1: -	NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED = 244,
1: -	NL80211_ATTR_BSSID = 245,
1: -	NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI = 246,
1: -	NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST = 247,
1: -	NL80211_ATTR_TIMEOUT_REASON = 248,
1: -	NL80211_ATTR_FILS_ERP_USERNAME = 249,
1: -	NL80211_ATTR_FILS_ERP_REALM = 250,
1: -	NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM = 251,
1: -	NL80211_ATTR_FILS_ERP_RRK = 252,
1: -	NL80211_ATTR_FILS_CACHE_ID = 253,
1: -	NL80211_ATTR_PMK = 254,
1: -	NL80211_ATTR_SCHED_SCAN_MULTI = 255,
1: -	NL80211_ATTR_SCHED_SCAN_MAX_REQS = 256,
1: -	NL80211_ATTR_WANT_1X_4WAY_HS = 257,
1: -	NL80211_ATTR_PMKR0_NAME = 258,
1: -	NL80211_ATTR_PORT_AUTHORIZED = 259,
1: -	NL80211_ATTR_EXTERNAL_AUTH_ACTION = 260,
1: -	NL80211_ATTR_EXTERNAL_AUTH_SUPPORT = 261,
1: -	NL80211_ATTR_NSS = 262,
1: -	NL80211_ATTR_ACK_SIGNAL = 263,
1: -	NL80211_ATTR_CONTROL_PORT_OVER_NL80211 = 264,
1: -	NL80211_ATTR_TXQ_STATS = 265,
1: -	NL80211_ATTR_TXQ_LIMIT = 266,
1: -	NL80211_ATTR_TXQ_MEMORY_LIMIT = 267,
1: -	NL80211_ATTR_TXQ_QUANTUM = 268,
1: -	NL80211_ATTR_HE_CAPABILITY = 269,
1: -	NL80211_ATTR_FTM_RESPONDER = 270,
1: -	NL80211_ATTR_FTM_RESPONDER_STATS = 271,
1: -	NL80211_ATTR_TIMEOUT = 272,
1: -	NL80211_ATTR_PEER_MEASUREMENTS = 273,
1: -	NL80211_ATTR_AIRTIME_WEIGHT = 274,
1: -	NL80211_ATTR_STA_TX_POWER_SETTING = 275,
1: -	NL80211_ATTR_STA_TX_POWER = 276,
1: -	NL80211_ATTR_SAE_PASSWORD = 277,
1: -	NL80211_ATTR_TWT_RESPONDER = 278,
1: -	NL80211_ATTR_HE_OBSS_PD = 279,
1: -	NL80211_ATTR_WIPHY_EDMG_CHANNELS = 280,
1: -	NL80211_ATTR_WIPHY_EDMG_BW_CONFIG = 281,
1: -	NL80211_ATTR_VLAN_ID = 282,
1: -	NL80211_ATTR_HE_BSS_COLOR = 283,
1: -	NL80211_ATTR_IFTYPE_AKM_SUITES = 284,
1: -	NL80211_ATTR_TID_CONFIG = 285,
1: -	NL80211_ATTR_CONTROL_PORT_NO_PREAUTH = 286,
1: -	NL80211_ATTR_PMK_LIFETIME = 287,
1: -	NL80211_ATTR_PMK_REAUTH_THRESHOLD = 288,
1: -	NL80211_ATTR_RECEIVE_MULTICAST = 289,
1: -	NL80211_ATTR_WIPHY_FREQ_OFFSET = 290,
1: -	NL80211_ATTR_CENTER_FREQ1_OFFSET = 291,
1: -	NL80211_ATTR_SCAN_FREQ_KHZ = 292,
1: -	NL80211_ATTR_HE_6GHZ_CAPABILITY = 293,
1: -	NL80211_ATTR_FILS_DISCOVERY = 294,
1: -	NL80211_ATTR_UNSOL_BCAST_PROBE_RESP = 295,
1: -	NL80211_ATTR_S1G_CAPABILITY = 296,
1: -	NL80211_ATTR_S1G_CAPABILITY_MASK = 297,
1: -	NL80211_ATTR_SAE_PWE = 298,
1: -	__NL80211_ATTR_AFTER_LAST = 299,
1: -	NUM_NL80211_ATTR = 299,
1: -	NL80211_ATTR_MAX = 298,
1: +  NL80211_ATTR_UNSPEC = 0,
1: +  NL80211_ATTR_WIPHY = 1,
1: +  NL80211_ATTR_WIPHY_NAME = 2,
1: +  NL80211_ATTR_IFINDEX = 3,
1: +  NL80211_ATTR_IFNAME = 4,
1: +  NL80211_ATTR_IFTYPE = 5,
1: +  NL80211_ATTR_MAC = 6,
1: +  NL80211_ATTR_KEY_DATA = 7,
1: +  NL80211_ATTR_KEY_IDX = 8,
1: +  NL80211_ATTR_KEY_CIPHER = 9,
1: +  NL80211_ATTR_KEY_SEQ = 10,
1: +  NL80211_ATTR_KEY_DEFAULT = 11,
1: +  NL80211_ATTR_BEACON_INTERVAL = 12,
1: +  NL80211_ATTR_DTIM_PERIOD = 13,
1: +  NL80211_ATTR_BEACON_HEAD = 14,
1: +  NL80211_ATTR_BEACON_TAIL = 15,
1: +  NL80211_ATTR_STA_AID = 16,
1: +  NL80211_ATTR_STA_FLAGS = 17,
1: +  NL80211_ATTR_STA_LISTEN_INTERVAL = 18,
1: +  NL80211_ATTR_STA_SUPPORTED_RATES = 19,
1: +  NL80211_ATTR_STA_VLAN = 20,
1: +  NL80211_ATTR_STA_INFO = 21,
1: +  NL80211_ATTR_WIPHY_BANDS = 22,
1: +  NL80211_ATTR_MNTR_FLAGS = 23,
1: +  NL80211_ATTR_MESH_ID = 24,
1: +  NL80211_ATTR_STA_PLINK_ACTION = 25,
1: +  NL80211_ATTR_MPATH_NEXT_HOP = 26,
1: +  NL80211_ATTR_MPATH_INFO = 27,
1: +  NL80211_ATTR_BSS_CTS_PROT = 28,
1: +  NL80211_ATTR_BSS_SHORT_PREAMBLE = 29,
1: +  NL80211_ATTR_BSS_SHORT_SLOT_TIME = 30,
1: +  NL80211_ATTR_HT_CAPABILITY = 31,
1: +  NL80211_ATTR_SUPPORTED_IFTYPES = 32,
1: +  NL80211_ATTR_REG_ALPHA2 = 33,
1: +  NL80211_ATTR_REG_RULES = 34,
1: +  NL80211_ATTR_MESH_CONFIG = 35,
1: +  NL80211_ATTR_BSS_BASIC_RATES = 36,
1: +  NL80211_ATTR_WIPHY_TXQ_PARAMS = 37,
1: +  NL80211_ATTR_WIPHY_FREQ = 38,
1: +  NL80211_ATTR_WIPHY_CHANNEL_TYPE = 39,
1: +  NL80211_ATTR_KEY_DEFAULT_MGMT = 40,
1: +  NL80211_ATTR_MGMT_SUBTYPE = 41,
1: +  NL80211_ATTR_IE = 42,
1: +  NL80211_ATTR_MAX_NUM_SCAN_SSIDS = 43,
1: +  NL80211_ATTR_SCAN_FREQUENCIES = 44,
1: +  NL80211_ATTR_SCAN_SSIDS = 45,
1: +  NL80211_ATTR_GENERATION = 46,
1: +  NL80211_ATTR_BSS = 47,
1: +  NL80211_ATTR_REG_INITIATOR = 48,
1: +  NL80211_ATTR_REG_TYPE = 49,
1: +  NL80211_ATTR_SUPPORTED_COMMANDS = 50,
1: +  NL80211_ATTR_FRAME = 51,
1: +  NL80211_ATTR_SSID = 52,
1: +  NL80211_ATTR_AUTH_TYPE = 53,
1: +  NL80211_ATTR_REASON_CODE = 54,
1: +  NL80211_ATTR_KEY_TYPE = 55,
1: +  NL80211_ATTR_MAX_SCAN_IE_LEN = 56,
1: +  NL80211_ATTR_CIPHER_SUITES = 57,
1: +  NL80211_ATTR_FREQ_BEFORE = 58,
1: +  NL80211_ATTR_FREQ_AFTER = 59,
1: +  NL80211_ATTR_FREQ_FIXED = 60,
1: +  NL80211_ATTR_WIPHY_RETRY_SHORT = 61,
1: +  NL80211_ATTR_WIPHY_RETRY_LONG = 62,
1: +  NL80211_ATTR_WIPHY_FRAG_THRESHOLD = 63,
1: +  NL80211_ATTR_WIPHY_RTS_THRESHOLD = 64,
1: +  NL80211_ATTR_TIMED_OUT = 65,
1: +  NL80211_ATTR_USE_MFP = 66,
1: +  NL80211_ATTR_STA_FLAGS2 = 67,
1: +  NL80211_ATTR_CONTROL_PORT = 68,
1: +  NL80211_ATTR_TESTDATA = 69,
1: +  NL80211_ATTR_PRIVACY = 70,
1: +  NL80211_ATTR_DISCONNECTED_BY_AP = 71,
1: +  NL80211_ATTR_STATUS_CODE = 72,
1: +  NL80211_ATTR_CIPHER_SUITES_PAIRWISE = 73,
1: +  NL80211_ATTR_CIPHER_SUITE_GROUP = 74,
1: +  NL80211_ATTR_WPA_VERSIONS = 75,
1: +  NL80211_ATTR_AKM_SUITES = 76,
1: +  NL80211_ATTR_REQ_IE = 77,
1: +  NL80211_ATTR_RESP_IE = 78,
1: +  NL80211_ATTR_PREV_BSSID = 79,
1: +  NL80211_ATTR_KEY = 80,
1: +  NL80211_ATTR_KEYS = 81,
1: +  NL80211_ATTR_PID = 82,
1: +  NL80211_ATTR_4ADDR = 83,
1: +  NL80211_ATTR_SURVEY_INFO = 84,
1: +  NL80211_ATTR_PMKID = 85,
1: +  NL80211_ATTR_MAX_NUM_PMKIDS = 86,
1: +  NL80211_ATTR_DURATION = 87,
1: +  NL80211_ATTR_COOKIE = 88,
1: +  NL80211_ATTR_WIPHY_COVERAGE_CLASS = 89,
1: +  NL80211_ATTR_TX_RATES = 90,
1: +  NL80211_ATTR_FRAME_MATCH = 91,
1: +  NL80211_ATTR_ACK = 92,
1: +  NL80211_ATTR_PS_STATE = 93,
1: +  NL80211_ATTR_CQM = 94,
1: +  NL80211_ATTR_LOCAL_STATE_CHANGE = 95,
1: +  NL80211_ATTR_AP_ISOLATE = 96,
1: +  NL80211_ATTR_WIPHY_TX_POWER_SETTING = 97,
1: +  NL80211_ATTR_WIPHY_TX_POWER_LEVEL = 98,
1: +  NL80211_ATTR_TX_FRAME_TYPES = 99,
1: +  NL80211_ATTR_RX_FRAME_TYPES = 100,
1: +  NL80211_ATTR_FRAME_TYPE = 101,
1: +  NL80211_ATTR_CONTROL_PORT_ETHERTYPE = 102,
1: +  NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT = 103,
1: +  NL80211_ATTR_SUPPORT_IBSS_RSN = 104,
1: +  NL80211_ATTR_WIPHY_ANTENNA_TX = 105,
1: +  NL80211_ATTR_WIPHY_ANTENNA_RX = 106,
1: +  NL80211_ATTR_MCAST_RATE = 107,
1: +  NL80211_ATTR_OFFCHANNEL_TX_OK = 108,
1: +  NL80211_ATTR_BSS_HT_OPMODE = 109,
1: +  NL80211_ATTR_KEY_DEFAULT_TYPES = 110,
1: +  NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION = 111,
1: +  NL80211_ATTR_MESH_SETUP = 112,
1: +  NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX = 113,
1: +  NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX = 114,
1: +  NL80211_ATTR_SUPPORT_MESH_AUTH = 115,
1: +  NL80211_ATTR_STA_PLINK_STATE = 116,
1: +  NL80211_ATTR_WOWLAN_TRIGGERS = 117,
1: +  NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED = 118,
1: +  NL80211_ATTR_SCHED_SCAN_INTERVAL = 119,
1: +  NL80211_ATTR_INTERFACE_COMBINATIONS = 120,
1: +  NL80211_ATTR_SOFTWARE_IFTYPES = 121,
1: +  NL80211_ATTR_REKEY_DATA = 122,
1: +  NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS = 123,
1: +  NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN = 124,
1: +  NL80211_ATTR_SCAN_SUPP_RATES = 125,
1: +  NL80211_ATTR_HIDDEN_SSID = 126,
1: +  NL80211_ATTR_IE_PROBE_RESP = 127,
1: +  NL80211_ATTR_IE_ASSOC_RESP = 128,
1: +  NL80211_ATTR_STA_WME = 129,
1: +  NL80211_ATTR_SUPPORT_AP_UAPSD = 130,
1: +  NL80211_ATTR_ROAM_SUPPORT = 131,
1: +  NL80211_ATTR_SCHED_SCAN_MATCH = 132,
1: +  NL80211_ATTR_MAX_MATCH_SETS = 133,
1: +  NL80211_ATTR_PMKSA_CANDIDATE = 134,
1: +  NL80211_ATTR_TX_NO_CCK_RATE = 135,
1: +  NL80211_ATTR_TDLS_ACTION = 136,
1: +  NL80211_ATTR_TDLS_DIALOG_TOKEN = 137,
1: +  NL80211_ATTR_TDLS_OPERATION = 138,
1: +  NL80211_ATTR_TDLS_SUPPORT = 139,
1: +  NL80211_ATTR_TDLS_EXTERNAL_SETUP = 140,
1: +  NL80211_ATTR_DEVICE_AP_SME = 141,
1: +  NL80211_ATTR_DONT_WAIT_FOR_ACK = 142,
1: +  NL80211_ATTR_FEATURE_FLAGS = 143,
1: +  NL80211_ATTR_PROBE_RESP_OFFLOAD = 144,
1: +  NL80211_ATTR_PROBE_RESP = 145,
1: +  NL80211_ATTR_DFS_REGION = 146,
1: +  NL80211_ATTR_DISABLE_HT = 147,
1: +  NL80211_ATTR_HT_CAPABILITY_MASK = 148,
1: +  NL80211_ATTR_NOACK_MAP = 149,
1: +  NL80211_ATTR_INACTIVITY_TIMEOUT = 150,
1: +  NL80211_ATTR_RX_SIGNAL_DBM = 151,
1: +  NL80211_ATTR_BG_SCAN_PERIOD = 152,
1: +  NL80211_ATTR_WDEV = 153,
1: +  NL80211_ATTR_USER_REG_HINT_TYPE = 154,
1: +  NL80211_ATTR_CONN_FAILED_REASON = 155,
1: +  NL80211_ATTR_AUTH_DATA = 156,
1: +  NL80211_ATTR_VHT_CAPABILITY = 157,
1: +  NL80211_ATTR_SCAN_FLAGS = 158,
1: +  NL80211_ATTR_CHANNEL_WIDTH = 159,
1: +  NL80211_ATTR_CENTER_FREQ1 = 160,
1: +  NL80211_ATTR_CENTER_FREQ2 = 161,
1: +  NL80211_ATTR_P2P_CTWINDOW = 162,
1: +  NL80211_ATTR_P2P_OPPPS = 163,
1: +  NL80211_ATTR_LOCAL_MESH_POWER_MODE = 164,
1: +  NL80211_ATTR_ACL_POLICY = 165,
1: +  NL80211_ATTR_MAC_ADDRS = 166,
1: +  NL80211_ATTR_MAC_ACL_MAX = 167,
1: +  NL80211_ATTR_RADAR_EVENT = 168,
1: +  NL80211_ATTR_EXT_CAPA = 169,
1: +  NL80211_ATTR_EXT_CAPA_MASK = 170,
1: +  NL80211_ATTR_STA_CAPABILITY = 171,
1: +  NL80211_ATTR_STA_EXT_CAPABILITY = 172,
1: +  NL80211_ATTR_PROTOCOL_FEATURES = 173,
1: +  NL80211_ATTR_SPLIT_WIPHY_DUMP = 174,
1: +  NL80211_ATTR_DISABLE_VHT = 175,
1: +  NL80211_ATTR_VHT_CAPABILITY_MASK = 176,
1: +  NL80211_ATTR_MDID = 177,
1: +  NL80211_ATTR_IE_RIC = 178,
1: +  NL80211_ATTR_CRIT_PROT_ID = 179,
1: +  NL80211_ATTR_MAX_CRIT_PROT_DURATION = 180,
1: +  NL80211_ATTR_PEER_AID = 181,
1: +  NL80211_ATTR_COALESCE_RULE = 182,
1: +  NL80211_ATTR_CH_SWITCH_COUNT = 183,
1: +  NL80211_ATTR_CH_SWITCH_BLOCK_TX = 184,
1: +  NL80211_ATTR_CSA_IES = 185,
1: +  NL80211_ATTR_CNTDWN_OFFS_BEACON = 186,
1: +  NL80211_ATTR_CNTDWN_OFFS_PRESP = 187,
1: +  NL80211_ATTR_RXMGMT_FLAGS = 188,
1: +  NL80211_ATTR_STA_SUPPORTED_CHANNELS = 189,
1: +  NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES = 190,
1: +  NL80211_ATTR_HANDLE_DFS = 191,
1: +  NL80211_ATTR_SUPPORT_5_MHZ = 192,
1: +  NL80211_ATTR_SUPPORT_10_MHZ = 193,
1: +  NL80211_ATTR_OPMODE_NOTIF = 194,
1: +  NL80211_ATTR_VENDOR_ID = 195,
1: +  NL80211_ATTR_VENDOR_SUBCMD = 196,
1: +  NL80211_ATTR_VENDOR_DATA = 197,
1: +  NL80211_ATTR_VENDOR_EVENTS = 198,
1: +  NL80211_ATTR_QOS_MAP = 199,
1: +  NL80211_ATTR_MAC_HINT = 200,
1: +  NL80211_ATTR_WIPHY_FREQ_HINT = 201,
1: +  NL80211_ATTR_MAX_AP_ASSOC_STA = 202,
1: +  NL80211_ATTR_TDLS_PEER_CAPABILITY = 203,
1: +  NL80211_ATTR_SOCKET_OWNER = 204,
1: +  NL80211_ATTR_CSA_C_OFFSETS_TX = 205,
1: +  NL80211_ATTR_MAX_CSA_COUNTERS = 206,
1: +  NL80211_ATTR_TDLS_INITIATOR = 207,
1: +  NL80211_ATTR_USE_RRM = 208,
1: +  NL80211_ATTR_WIPHY_DYN_ACK = 209,
1: +  NL80211_ATTR_TSID = 210,
1: +  NL80211_ATTR_USER_PRIO = 211,
1: +  NL80211_ATTR_ADMITTED_TIME = 212,
1: +  NL80211_ATTR_SMPS_MODE = 213,
1: +  NL80211_ATTR_OPER_CLASS = 214,
1: +  NL80211_ATTR_MAC_MASK = 215,
1: +  NL80211_ATTR_WIPHY_SELF_MANAGED_REG = 216,
1: +  NL80211_ATTR_EXT_FEATURES = 217,
1: +  NL80211_ATTR_SURVEY_RADIO_STATS = 218,
1: +  NL80211_ATTR_NETNS_FD = 219,
1: +  NL80211_ATTR_SCHED_SCAN_DELAY = 220,
1: +  NL80211_ATTR_REG_INDOOR = 221,
1: +  NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS = 222,
1: +  NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL = 223,
1: +  NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS = 224,
1: +  NL80211_ATTR_SCHED_SCAN_PLANS = 225,
1: +  NL80211_ATTR_PBSS = 226,
1: +  NL80211_ATTR_BSS_SELECT = 227,
1: +  NL80211_ATTR_STA_SUPPORT_P2P_PS = 228,
1: +  NL80211_ATTR_PAD = 229,
1: +  NL80211_ATTR_IFTYPE_EXT_CAPA = 230,
1: +  NL80211_ATTR_MU_MIMO_GROUP_DATA = 231,
1: +  NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR = 232,
1: +  NL80211_ATTR_SCAN_START_TIME_TSF = 233,
1: +  NL80211_ATTR_SCAN_START_TIME_TSF_BSSID = 234,
1: +  NL80211_ATTR_MEASUREMENT_DURATION = 235,
1: +  NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY = 236,
1: +  NL80211_ATTR_MESH_PEER_AID = 237,
1: +  NL80211_ATTR_NAN_MASTER_PREF = 238,
1: +  NL80211_ATTR_BANDS = 239,
1: +  NL80211_ATTR_NAN_FUNC = 240,
1: +  NL80211_ATTR_NAN_MATCH = 241,
1: +  NL80211_ATTR_FILS_KEK = 242,
1: +  NL80211_ATTR_FILS_NONCES = 243,
1: +  NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED = 244,
1: +  NL80211_ATTR_BSSID = 245,
1: +  NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI = 246,
1: +  NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST = 247,
1: +  NL80211_ATTR_TIMEOUT_REASON = 248,
1: +  NL80211_ATTR_FILS_ERP_USERNAME = 249,
1: +  NL80211_ATTR_FILS_ERP_REALM = 250,
1: +  NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM = 251,
1: +  NL80211_ATTR_FILS_ERP_RRK = 252,
1: +  NL80211_ATTR_FILS_CACHE_ID = 253,
1: +  NL80211_ATTR_PMK = 254,
1: +  NL80211_ATTR_SCHED_SCAN_MULTI = 255,
1: +  NL80211_ATTR_SCHED_SCAN_MAX_REQS = 256,
1: +  NL80211_ATTR_WANT_1X_4WAY_HS = 257,
1: +  NL80211_ATTR_PMKR0_NAME = 258,
1: +  NL80211_ATTR_PORT_AUTHORIZED = 259,
1: +  NL80211_ATTR_EXTERNAL_AUTH_ACTION = 260,
1: +  NL80211_ATTR_EXTERNAL_AUTH_SUPPORT = 261,
1: +  NL80211_ATTR_NSS = 262,
1: +  NL80211_ATTR_ACK_SIGNAL = 263,
1: +  NL80211_ATTR_CONTROL_PORT_OVER_NL80211 = 264,
1: +  NL80211_ATTR_TXQ_STATS = 265,
1: +  NL80211_ATTR_TXQ_LIMIT = 266,
1: +  NL80211_ATTR_TXQ_MEMORY_LIMIT = 267,
1: +  NL80211_ATTR_TXQ_QUANTUM = 268,
1: +  NL80211_ATTR_HE_CAPABILITY = 269,
1: +  NL80211_ATTR_FTM_RESPONDER = 270,
1: +  NL80211_ATTR_FTM_RESPONDER_STATS = 271,
1: +  NL80211_ATTR_TIMEOUT = 272,
1: +  NL80211_ATTR_PEER_MEASUREMENTS = 273,
1: +  NL80211_ATTR_AIRTIME_WEIGHT = 274,
1: +  NL80211_ATTR_STA_TX_POWER_SETTING = 275,
1: +  NL80211_ATTR_STA_TX_POWER = 276,
1: +  NL80211_ATTR_SAE_PASSWORD = 277,
1: +  NL80211_ATTR_TWT_RESPONDER = 278,
1: +  NL80211_ATTR_HE_OBSS_PD = 279,
1: +  NL80211_ATTR_WIPHY_EDMG_CHANNELS = 280,
1: +  NL80211_ATTR_WIPHY_EDMG_BW_CONFIG = 281,
1: +  NL80211_ATTR_VLAN_ID = 282,
1: +  NL80211_ATTR_HE_BSS_COLOR = 283,
1: +  NL80211_ATTR_IFTYPE_AKM_SUITES = 284,
1: +  NL80211_ATTR_TID_CONFIG = 285,
1: +  NL80211_ATTR_CONTROL_PORT_NO_PREAUTH = 286,
1: +  NL80211_ATTR_PMK_LIFETIME = 287,
1: +  NL80211_ATTR_PMK_REAUTH_THRESHOLD = 288,
1: +  NL80211_ATTR_RECEIVE_MULTICAST = 289,
1: +  NL80211_ATTR_WIPHY_FREQ_OFFSET = 290,
1: +  NL80211_ATTR_CENTER_FREQ1_OFFSET = 291,
1: +  NL80211_ATTR_SCAN_FREQ_KHZ = 292,
1: +  NL80211_ATTR_HE_6GHZ_CAPABILITY = 293,
1: +  NL80211_ATTR_FILS_DISCOVERY = 294,
1: +  NL80211_ATTR_UNSOL_BCAST_PROBE_RESP = 295,
1: +  NL80211_ATTR_S1G_CAPABILITY = 296,
1: +  NL80211_ATTR_S1G_CAPABILITY_MASK = 297,
1: +  NL80211_ATTR_SAE_PWE = 298,
1: +  __NL80211_ATTR_AFTER_LAST = 299,
1: +  NUM_NL80211_ATTR = 299,
1: +  NL80211_ATTR_MAX = 298,
1:  };
1:  
1:  enum nl80211_sta_flags {
1: -	__NL80211_STA_FLAG_INVALID = 0,
1: -	NL80211_STA_FLAG_AUTHORIZED = 1,
1: -	NL80211_STA_FLAG_SHORT_PREAMBLE = 2,
1: -	NL80211_STA_FLAG_WME = 3,
1: -	NL80211_STA_FLAG_MFP = 4,
1: -	NL80211_STA_FLAG_AUTHENTICATED = 5,
1: -	NL80211_STA_FLAG_TDLS_PEER = 6,
1: -	NL80211_STA_FLAG_ASSOCIATED = 7,
1: -	__NL80211_STA_FLAG_AFTER_LAST = 8,
1: -	NL80211_STA_FLAG_MAX = 7,
1: +  __NL80211_STA_FLAG_INVALID = 0,
1: +  NL80211_STA_FLAG_AUTHORIZED = 1,
1: +  NL80211_STA_FLAG_SHORT_PREAMBLE = 2,
1: +  NL80211_STA_FLAG_WME = 3,
1: +  NL80211_STA_FLAG_MFP = 4,
1: +  NL80211_STA_FLAG_AUTHENTICATED = 5,
1: +  NL80211_STA_FLAG_TDLS_PEER = 6,
1: +  NL80211_STA_FLAG_ASSOCIATED = 7,
1: +  __NL80211_STA_FLAG_AFTER_LAST = 8,
1: +  NL80211_STA_FLAG_MAX = 7,
1:  };
1:  
1:  enum nl80211_sta_p2p_ps_status {
1: -	NL80211_P2P_PS_UNSUPPORTED = 0,
1: -	NL80211_P2P_PS_SUPPORTED = 1,
1: -	NUM_NL80211_P2P_PS_STATUS = 2,
1: +  NL80211_P2P_PS_UNSUPPORTED = 0,
1: +  NL80211_P2P_PS_SUPPORTED = 1,
1: +  NUM_NL80211_P2P_PS_STATUS = 2,
1:  };
1:  
1:  enum nl80211_rate_info {
1: -	__NL80211_RATE_INFO_INVALID = 0,
1: -	NL80211_RATE_INFO_BITRATE = 1,
1: -	NL80211_RATE_INFO_MCS = 2,
1: -	NL80211_RATE_INFO_40_MHZ_WIDTH = 3,
1: -	NL80211_RATE_INFO_SHORT_GI = 4,
1: -	NL80211_RATE_INFO_BITRATE32 = 5,
1: -	NL80211_RATE_INFO_VHT_MCS = 6,
1: -	NL80211_RATE_INFO_VHT_NSS = 7,
1: -	NL80211_RATE_INFO_80_MHZ_WIDTH = 8,
1: -	NL80211_RATE_INFO_80P80_MHZ_WIDTH = 9,
1: -	NL80211_RATE_INFO_160_MHZ_WIDTH = 10,
1: -	NL80211_RATE_INFO_10_MHZ_WIDTH = 11,
1: -	NL80211_RATE_INFO_5_MHZ_WIDTH = 12,
1: -	NL80211_RATE_INFO_HE_MCS = 13,
1: -	NL80211_RATE_INFO_HE_NSS = 14,
1: -	NL80211_RATE_INFO_HE_GI = 15,
1: -	NL80211_RATE_INFO_HE_DCM = 16,
1: -	NL80211_RATE_INFO_HE_RU_ALLOC = 17,
1: -	__NL80211_RATE_INFO_AFTER_LAST = 18,
1: -	NL80211_RATE_INFO_MAX = 17,
1: +  __NL80211_RATE_INFO_INVALID = 0,
1: +  NL80211_RATE_INFO_BITRATE = 1,
1: +  NL80211_RATE_INFO_MCS = 2,
1: +  NL80211_RATE_INFO_40_MHZ_WIDTH = 3,
1: +  NL80211_RATE_INFO_SHORT_GI = 4,
1: +  NL80211_RATE_INFO_BITRATE32 = 5,
1: +  NL80211_RATE_INFO_VHT_MCS = 6,
1: +  NL80211_RATE_INFO_VHT_NSS = 7,
1: +  NL80211_RATE_INFO_80_MHZ_WIDTH = 8,
1: +  NL80211_RATE_INFO_80P80_MHZ_WIDTH = 9,
1: +  NL80211_RATE_INFO_160_MHZ_WIDTH = 10,
1: +  NL80211_RATE_INFO_10_MHZ_WIDTH = 11,
1: +  NL80211_RATE_INFO_5_MHZ_WIDTH = 12,
1: +  NL80211_RATE_INFO_HE_MCS = 13,
1: +  NL80211_RATE_INFO_HE_NSS = 14,
1: +  NL80211_RATE_INFO_HE_GI = 15,
1: +  NL80211_RATE_INFO_HE_DCM = 16,
1: +  NL80211_RATE_INFO_HE_RU_ALLOC = 17,
1: +  __NL80211_RATE_INFO_AFTER_LAST = 18,
1: +  NL80211_RATE_INFO_MAX = 17,
1:  };
1:  
1:  enum nl80211_sta_bss_param {
1: -	__NL80211_STA_BSS_PARAM_INVALID = 0,
1: -	NL80211_STA_BSS_PARAM_CTS_PROT = 1,
1: -	NL80211_STA_BSS_PARAM_SHORT_PREAMBLE = 2,
1: -	NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME = 3,
1: -	NL80211_STA_BSS_PARAM_DTIM_PERIOD = 4,
1: -	NL80211_STA_BSS_PARAM_BEACON_INTERVAL = 5,
1: -	__NL80211_STA_BSS_PARAM_AFTER_LAST = 6,
1: -	NL80211_STA_BSS_PARAM_MAX = 5,
1: +  __NL80211_STA_BSS_PARAM_INVALID = 0,
1: +  NL80211_STA_BSS_PARAM_CTS_PROT = 1,
1: +  NL80211_STA_BSS_PARAM_SHORT_PREAMBLE = 2,
1: +  NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME = 3,
1: +  NL80211_STA_BSS_PARAM_DTIM_PERIOD = 4,
1: +  NL80211_STA_BSS_PARAM_BEACON_INTERVAL = 5,
1: +  __NL80211_STA_BSS_PARAM_AFTER_LAST = 6,
1: +  NL80211_STA_BSS_PARAM_MAX = 5,
1:  };
1:  
1:  enum nl80211_sta_info {
1: -	__NL80211_STA_INFO_INVALID = 0,
1: -	NL80211_STA_INFO_INACTIVE_TIME = 1,
1: -	NL80211_STA_INFO_RX_BYTES = 2,
1: -	NL80211_STA_INFO_TX_BYTES = 3,
1: -	NL80211_STA_INFO_LLID = 4,
1: -	NL80211_STA_INFO_PLID = 5,
1: -	NL80211_STA_INFO_PLINK_STATE = 6,
1: -	NL80211_STA_INFO_SIGNAL = 7,
1: -	NL80211_STA_INFO_TX_BITRATE = 8,
1: -	NL80211_STA_INFO_RX_PACKETS = 9,
1: -	NL80211_STA_INFO_TX_PACKETS = 10,
1: -	NL80211_STA_INFO_TX_RETRIES = 11,
1: -	NL80211_STA_INFO_TX_FAILED = 12,
1: -	NL80211_STA_INFO_SIGNAL_AVG = 13,
1: -	NL80211_STA_INFO_RX_BITRATE = 14,
1: -	NL80211_STA_INFO_BSS_PARAM = 15,
1: -	NL80211_STA_INFO_CONNECTED_TIME = 16,
1: -	NL80211_STA_INFO_STA_FLAGS = 17,
1: -	NL80211_STA_INFO_BEACON_LOSS = 18,
1: -	NL80211_STA_INFO_T_OFFSET = 19,
1: -	NL80211_STA_INFO_LOCAL_PM = 20,
1: -	NL80211_STA_INFO_PEER_PM = 21,
1: -	NL80211_STA_INFO_NONPEER_PM = 22,
1: -	NL80211_STA_INFO_RX_BYTES64 = 23,
1: -	NL80211_STA_INFO_TX_BYTES64 = 24,
1: -	NL80211_STA_INFO_CHAIN_SIGNAL = 25,
1: -	NL80211_STA_INFO_CHAIN_SIGNAL_AVG = 26,
1: -	NL80211_STA_INFO_EXPECTED_THROUGHPUT = 27,
1: -	NL80211_STA_INFO_RX_DROP_MISC = 28,
1: -	NL80211_STA_INFO_BEACON_RX = 29,
1: -	NL80211_STA_INFO_BEACON_SIGNAL_AVG = 30,
1: -	NL80211_STA_INFO_TID_STATS = 31,
1: -	NL80211_STA_INFO_RX_DURATION = 32,
1: -	NL80211_STA_INFO_PAD = 33,
1: -	NL80211_STA_INFO_ACK_SIGNAL = 34,
1: -	NL80211_STA_INFO_ACK_SIGNAL_AVG = 35,
1: -	NL80211_STA_INFO_RX_MPDUS = 36,
1: -	NL80211_STA_INFO_FCS_ERROR_COUNT = 37,
1: -	NL80211_STA_INFO_CONNECTED_TO_GATE = 38,
1: -	NL80211_STA_INFO_TX_DURATION = 39,
1: -	NL80211_STA_INFO_AIRTIME_WEIGHT = 40,
1: -	NL80211_STA_INFO_AIRTIME_LINK_METRIC = 41,
1: -	NL80211_STA_INFO_ASSOC_AT_BOOTTIME = 42,
1: -	NL80211_STA_INFO_CONNECTED_TO_AS = 43,
1: -	__NL80211_STA_INFO_AFTER_LAST = 44,
1: -	NL80211_STA_INFO_MAX = 43,
1: +  __NL80211_STA_INFO_INVALID = 0,
1: +  NL80211_STA_INFO_INACTIVE_TIME = 1,
1: +  NL80211_STA_INFO_RX_BYTES = 2,
1: +  NL80211_STA_INFO_TX_BYTES = 3,
1: +  NL80211_STA_INFO_LLID = 4,
1: +  NL80211_STA_INFO_PLID = 5,
1: +  NL80211_STA_INFO_PLINK_STATE = 6,
1: +  NL80211_STA_INFO_SIGNAL = 7,
1: +  NL80211_STA_INFO_TX_BITRATE = 8,
1: +  NL80211_STA_INFO_RX_PACKETS = 9,
1: +  NL80211_STA_INFO_TX_PACKETS = 10,
1: +  NL80211_STA_INFO_TX_RETRIES = 11,
1: +  NL80211_STA_INFO_TX_FAILED = 12,
1: +  NL80211_STA_INFO_SIGNAL_AVG = 13,
1: +  NL80211_STA_INFO_RX_BITRATE = 14,
1: +  NL80211_STA_INFO_BSS_PARAM = 15,
1: +  NL80211_STA_INFO_CONNECTED_TIME = 16,
1: +  NL80211_STA_INFO_STA_FLAGS = 17,
1: +  NL80211_STA_INFO_BEACON_LOSS = 18,
1: +  NL80211_STA_INFO_T_OFFSET = 19,
1: +  NL80211_STA_INFO_LOCAL_PM = 20,
1: +  NL80211_STA_INFO_PEER_PM = 21,
1: +  NL80211_STA_INFO_NONPEER_PM = 22,
1: +  NL80211_STA_INFO_RX_BYTES64 = 23,
1: +  NL80211_STA_INFO_TX_BYTES64 = 24,
1: +  NL80211_STA_INFO_CHAIN_SIGNAL = 25,
1: +  NL80211_STA_INFO_CHAIN_SIGNAL_AVG = 26,
1: +  NL80211_STA_INFO_EXPECTED_THROUGHPUT = 27,
1: +  NL80211_STA_INFO_RX_DROP_MISC = 28,
1: +  NL80211_STA_INFO_BEACON_RX = 29,
1: +  NL80211_STA_INFO_BEACON_SIGNAL_AVG = 30,
1: +  NL80211_STA_INFO_TID_STATS = 31,
1: +  NL80211_STA_INFO_RX_DURATION = 32,
1: +  NL80211_STA_INFO_PAD = 33,
1: +  NL80211_STA_INFO_ACK_SIGNAL = 34,
1: +  NL80211_STA_INFO_ACK_SIGNAL_AVG = 35,
1: +  NL80211_STA_INFO_RX_MPDUS = 36,
1: +  NL80211_STA_INFO_FCS_ERROR_COUNT = 37,
1: +  NL80211_STA_INFO_CONNECTED_TO_GATE = 38,
1: +  NL80211_STA_INFO_TX_DURATION = 39,
1: +  NL80211_STA_INFO_AIRTIME_WEIGHT = 40,
1: +  NL80211_STA_INFO_AIRTIME_LINK_METRIC = 41,
1: +  NL80211_STA_INFO_ASSOC_AT_BOOTTIME = 42,
1: +  NL80211_STA_INFO_CONNECTED_TO_AS = 43,
1: +  __NL80211_STA_INFO_AFTER_LAST = 44,
1: +  NL80211_STA_INFO_MAX = 43,
1:  };
1:  
1:  enum nl80211_tid_stats {
1: -	__NL80211_TID_STATS_INVALID = 0,
1: -	NL80211_TID_STATS_RX_MSDU = 1,
1: -	NL80211_TID_STATS_TX_MSDU = 2,
1: -	NL80211_TID_STATS_TX_MSDU_RETRIES = 3,
1: -	NL80211_TID_STATS_TX_MSDU_FAILED = 4,
1: -	NL80211_TID_STATS_PAD = 5,
1: -	NL80211_TID_STATS_TXQ_STATS = 6,
1: -	NUM_NL80211_TID_STATS = 7,
1: -	NL80211_TID_STATS_MAX = 6,
1: +  __NL80211_TID_STATS_INVALID = 0,
1: +  NL80211_TID_STATS_RX_MSDU = 1,
1: +  NL80211_TID_STATS_TX_MSDU = 2,
1: +  NL80211_TID_STATS_TX_MSDU_RETRIES = 3,
1: +  NL80211_TID_STATS_TX_MSDU_FAILED = 4,
1: +  NL80211_TID_STATS_PAD = 5,
1: +  NL80211_TID_STATS_TXQ_STATS = 6,
1: +  NUM_NL80211_TID_STATS = 7,
1: +  NL80211_TID_STATS_MAX = 6,
1:  };
1:  
1:  enum nl80211_txq_stats {
1: -	__NL80211_TXQ_STATS_INVALID = 0,
1: -	NL80211_TXQ_STATS_BACKLOG_BYTES = 1,
1: -	NL80211_TXQ_STATS_BACKLOG_PACKETS = 2,
1: -	NL80211_TXQ_STATS_FLOWS = 3,
1: -	NL80211_TXQ_STATS_DROPS = 4,
1: -	NL80211_TXQ_STATS_ECN_MARKS = 5,
1: -	NL80211_TXQ_STATS_OVERLIMIT = 6,
1: -	NL80211_TXQ_STATS_OVERMEMORY = 7,
1: -	NL80211_TXQ_STATS_COLLISIONS = 8,
1: -	NL80211_TXQ_STATS_TX_BYTES = 9,
1: -	NL80211_TXQ_STATS_TX_PACKETS = 10,
1: -	NL80211_TXQ_STATS_MAX_FLOWS = 11,
1: -	NUM_NL80211_TXQ_STATS = 12,
1: -	NL80211_TXQ_STATS_MAX = 11,
1: +  __NL80211_TXQ_STATS_INVALID = 0,
1: +  NL80211_TXQ_STATS_BACKLOG_BYTES = 1,
1: +  NL80211_TXQ_STATS_BACKLOG_PACKETS = 2,
1: +  NL80211_TXQ_STATS_FLOWS = 3,
1: +  NL80211_TXQ_STATS_DROPS = 4,
1: +  NL80211_TXQ_STATS_ECN_MARKS = 5,
1: +  NL80211_TXQ_STATS_OVERLIMIT = 6,
1: +  NL80211_TXQ_STATS_OVERMEMORY = 7,
1: +  NL80211_TXQ_STATS_COLLISIONS = 8,
1: +  NL80211_TXQ_STATS_TX_BYTES = 9,
1: +  NL80211_TXQ_STATS_TX_PACKETS = 10,
1: +  NL80211_TXQ_STATS_MAX_FLOWS = 11,
1: +  NUM_NL80211_TXQ_STATS = 12,
1: +  NL80211_TXQ_STATS_MAX = 11,
1:  };
1:  
1:  enum nl80211_mpath_info {
1: -	__NL80211_MPATH_INFO_INVALID = 0,
1: -	NL80211_MPATH_INFO_FRAME_QLEN = 1,
1: -	NL80211_MPATH_INFO_SN = 2,
1: -	NL80211_MPATH_INFO_METRIC = 3,
1: -	NL80211_MPATH_INFO_EXPTIME = 4,
1: -	NL80211_MPATH_INFO_FLAGS = 5,
1: -	NL80211_MPATH_INFO_DISCOVERY_TIMEOUT = 6,
1: -	NL80211_MPATH_INFO_DISCOVERY_RETRIES = 7,
1: -	NL80211_MPATH_INFO_HOP_COUNT = 8,
1: -	NL80211_MPATH_INFO_PATH_CHANGE = 9,
1: -	__NL80211_MPATH_INFO_AFTER_LAST = 10,
1: -	NL80211_MPATH_INFO_MAX = 9,
1: +  __NL80211_MPATH_INFO_INVALID = 0,
1: +  NL80211_MPATH_INFO_FRAME_QLEN = 1,
1: +  NL80211_MPATH_INFO_SN = 2,
1: +  NL80211_MPATH_INFO_METRIC = 3,
1: +  NL80211_MPATH_INFO_EXPTIME = 4,
1: +  NL80211_MPATH_INFO_FLAGS = 5,
1: +  NL80211_MPATH_INFO_DISCOVERY_TIMEOUT = 6,
1: +  NL80211_MPATH_INFO_DISCOVERY_RETRIES = 7,
1: +  NL80211_MPATH_INFO_HOP_COUNT = 8,
1: +  NL80211_MPATH_INFO_PATH_CHANGE = 9,
1: +  __NL80211_MPATH_INFO_AFTER_LAST = 10,
1: +  NL80211_MPATH_INFO_MAX = 9,
1:  };
1:  
1:  enum nl80211_band_iftype_attr {
1: -	__NL80211_BAND_IFTYPE_ATTR_INVALID = 0,
1: -	NL80211_BAND_IFTYPE_ATTR_IFTYPES = 1,
1: -	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC = 2,
1: -	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY = 3,
1: -	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET = 4,
1: -	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE = 5,
1: -	NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA = 6,
1: -	__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST = 7,
1: -	NL80211_BAND_IFTYPE_ATTR_MAX = 6,
1: +  __NL80211_BAND_IFTYPE_ATTR_INVALID = 0,
1: +  NL80211_BAND_IFTYPE_ATTR_IFTYPES = 1,
1: +  NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC = 2,
1: +  NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY = 3,
1: +  NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET = 4,
1: +  NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE = 5,
1: +  NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA = 6,
1: +  __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST = 7,
1: +  NL80211_BAND_IFTYPE_ATTR_MAX = 6,
1:  };
1:  
1:  enum nl80211_band_attr {
1: -	__NL80211_BAND_ATTR_INVALID = 0,
1: -	NL80211_BAND_ATTR_FREQS = 1,
1: -	NL80211_BAND_ATTR_RATES = 2,
1: -	NL80211_BAND_ATTR_HT_MCS_SET = 3,
1: -	NL80211_BAND_ATTR_HT_CAPA = 4,
1: -	NL80211_BAND_ATTR_HT_AMPDU_FACTOR = 5,
1: -	NL80211_BAND_ATTR_HT_AMPDU_DENSITY = 6,
1: -	NL80211_BAND_ATTR_VHT_MCS_SET = 7,
1: -	NL80211_BAND_ATTR_VHT_CAPA = 8,
1: -	NL80211_BAND_ATTR_IFTYPE_DATA = 9,
1: -	NL80211_BAND_ATTR_EDMG_CHANNELS = 10,
1: -	NL80211_BAND_ATTR_EDMG_BW_CONFIG = 11,
1: -	__NL80211_BAND_ATTR_AFTER_LAST = 12,
1: -	NL80211_BAND_ATTR_MAX = 11,
1: +  __NL80211_BAND_ATTR_INVALID = 0,
1: +  NL80211_BAND_ATTR_FREQS = 1,
1: +  NL80211_BAND_ATTR_RATES = 2,
1: +  NL80211_BAND_ATTR_HT_MCS_SET = 3,
1: +  NL80211_BAND_ATTR_HT_CAPA = 4,
1: +  NL80211_BAND_ATTR_HT_AMPDU_FACTOR = 5,
1: +  NL80211_BAND_ATTR_HT_AMPDU_DENSITY = 6,
1: +  NL80211_BAND_ATTR_VHT_MCS_SET = 7,
1: +  NL80211_BAND_ATTR_VHT_CAPA = 8,
1: +  NL80211_BAND_ATTR_IFTYPE_DATA = 9,
1: +  NL80211_BAND_ATTR_EDMG_CHANNELS = 10,
1: +  NL80211_BAND_ATTR_EDMG_BW_CONFIG = 11,
1: +  __NL80211_BAND_ATTR_AFTER_LAST = 12,
1: +  NL80211_BAND_ATTR_MAX = 11,
1:  };
1:  
1:  enum nl80211_wmm_rule {
1: -	__NL80211_WMMR_INVALID = 0,
1: -	NL80211_WMMR_CW_MIN = 1,
1: -	NL80211_WMMR_CW_MAX = 2,
1: -	NL80211_WMMR_AIFSN = 3,
1: -	NL80211_WMMR_TXOP = 4,
1: -	__NL80211_WMMR_LAST = 5,
1: -	NL80211_WMMR_MAX = 4,
1: +  __NL80211_WMMR_INVALID = 0,
1: +  NL80211_WMMR_CW_MIN = 1,
1: +  NL80211_WMMR_CW_MAX = 2,
1: +  NL80211_WMMR_AIFSN = 3,
1: +  NL80211_WMMR_TXOP = 4,
1: +  __NL80211_WMMR_LAST = 5,
1: +  NL80211_WMMR_MAX = 4,
1:  };
1:  
1:  enum nl80211_frequency_attr {
1: -	__NL80211_FREQUENCY_ATTR_INVALID = 0,
1: -	NL80211_FREQUENCY_ATTR_FREQ = 1,
1: -	NL80211_FREQUENCY_ATTR_DISABLED = 2,
1: -	NL80211_FREQUENCY_ATTR_NO_IR = 3,
1: -	__NL80211_FREQUENCY_ATTR_NO_IBSS = 4,
1: -	NL80211_FREQUENCY_ATTR_RADAR = 5,
1: -	NL80211_FREQUENCY_ATTR_MAX_TX_POWER = 6,
1: -	NL80211_FREQUENCY_ATTR_DFS_STATE = 7,
1: -	NL80211_FREQUENCY_ATTR_DFS_TIME = 8,
1: -	NL80211_FREQUENCY_ATTR_NO_HT40_MINUS = 9,
1: -	NL80211_FREQUENCY_ATTR_NO_HT40_PLUS = 10,
1: -	NL80211_FREQUENCY_ATTR_NO_80MHZ = 11,
1: -	NL80211_FREQUENCY_ATTR_NO_160MHZ = 12,
1: -	NL80211_FREQUENCY_ATTR_DFS_CAC_TIME = 13,
1: -	NL80211_FREQUENCY_ATTR_INDOOR_ONLY = 14,
1: -	NL80211_FREQUENCY_ATTR_IR_CONCURRENT = 15,
1: -	NL80211_FREQUENCY_ATTR_NO_20MHZ = 16,
1: -	NL80211_FREQUENCY_ATTR_NO_10MHZ = 17,
1: -	NL80211_FREQUENCY_ATTR_WMM = 18,
1: -	NL80211_FREQUENCY_ATTR_NO_HE = 19,
1: -	NL80211_FREQUENCY_ATTR_OFFSET = 20,
1: -	NL80211_FREQUENCY_ATTR_1MHZ = 21,
1: -	NL80211_FREQUENCY_ATTR_2MHZ = 22,
1: -	NL80211_FREQUENCY_ATTR_4MHZ = 23,
1: -	NL80211_FREQUENCY_ATTR_8MHZ = 24,
1: -	NL80211_FREQUENCY_ATTR_16MHZ = 25,
1: -	__NL80211_FREQUENCY_ATTR_AFTER_LAST = 26,
1: -	NL80211_FREQUENCY_ATTR_MAX = 25,
1: +  __NL80211_FREQUENCY_ATTR_INVALID = 0,
1: +  NL80211_FREQUENCY_ATTR_FREQ = 1,
1: +  NL80211_FREQUENCY_ATTR_DISABLED = 2,
1: +  NL80211_FREQUENCY_ATTR_NO_IR = 3,
1: +  __NL80211_FREQUENCY_ATTR_NO_IBSS = 4,
1: +  NL80211_FREQUENCY_ATTR_RADAR = 5,
1: +  NL80211_FREQUENCY_ATTR_MAX_TX_POWER = 6,
1: +  NL80211_FREQUENCY_ATTR_DFS_STATE = 7,
1: +  NL80211_FREQUENCY_ATTR_DFS_TIME = 8,
1: +  NL80211_FREQUENCY_ATTR_NO_HT40_MINUS = 9,
1: +  NL80211_FREQUENCY_ATTR_NO_HT40_PLUS = 10,
1: +  NL80211_FREQUENCY_ATTR_NO_80MHZ = 11,
1: +  NL80211_FREQUENCY_ATTR_NO_160MHZ = 12,
1: +  NL80211_FREQUENCY_ATTR_DFS_CAC_TIME = 13,
1: +  NL80211_FREQUENCY_ATTR_INDOOR_ONLY = 14,
1: +  NL80211_FREQUENCY_ATTR_IR_CONCURRENT = 15,
1: +  NL80211_FREQUENCY_ATTR_NO_20MHZ = 16,
1: +  NL80211_FREQUENCY_ATTR_NO_10MHZ = 17,
1: +  NL80211_FREQUENCY_ATTR_WMM = 18,
1: +  NL80211_FREQUENCY_ATTR_NO_HE = 19,
1: +  NL80211_FREQUENCY_ATTR_OFFSET = 20,
1: +  NL80211_FREQUENCY_ATTR_1MHZ = 21,
1: +  NL80211_FREQUENCY_ATTR_2MHZ = 22,
1: +  NL80211_FREQUENCY_ATTR_4MHZ = 23,
1: +  NL80211_FREQUENCY_ATTR_8MHZ = 24,
1: +  NL80211_FREQUENCY_ATTR_16MHZ = 25,
1: +  __NL80211_FREQUENCY_ATTR_AFTER_LAST = 26,
1: +  NL80211_FREQUENCY_ATTR_MAX = 25,
1:  };
1:  
1:  enum nl80211_bitrate_attr {
1: -	__NL80211_BITRATE_ATTR_INVALID = 0,
1: -	NL80211_BITRATE_ATTR_RATE = 1,
1: -	NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE = 2,
1: -	__NL80211_BITRATE_ATTR_AFTER_LAST = 3,
1: -	NL80211_BITRATE_ATTR_MAX = 2,
1: +  __NL80211_BITRATE_ATTR_INVALID = 0,
1: +  NL80211_BITRATE_ATTR_RATE = 1,
1: +  NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE = 2,
1: +  __NL80211_BITRATE_ATTR_AFTER_LAST = 3,
1: +  NL80211_BITRATE_ATTR_MAX = 2,
1:  };
1:  
1:  enum nl80211_reg_type {
1: -	NL80211_REGDOM_TYPE_COUNTRY = 0,
1: -	NL80211_REGDOM_TYPE_WORLD = 1,
1: -	NL80211_REGDOM_TYPE_CUSTOM_WORLD = 2,
1: -	NL80211_REGDOM_TYPE_INTERSECTION = 3,
1: +  NL80211_REGDOM_TYPE_COUNTRY = 0,
1: +  NL80211_REGDOM_TYPE_WORLD = 1,
1: +  NL80211_REGDOM_TYPE_CUSTOM_WORLD = 2,
1: +  NL80211_REGDOM_TYPE_INTERSECTION = 3,
1:  };
1:  
1:  enum nl80211_reg_rule_attr {
1: -	__NL80211_REG_RULE_ATTR_INVALID = 0,
1: -	NL80211_ATTR_REG_RULE_FLAGS = 1,
1: -	NL80211_ATTR_FREQ_RANGE_START = 2,
1: -	NL80211_ATTR_FREQ_RANGE_END = 3,
1: -	NL80211_ATTR_FREQ_RANGE_MAX_BW = 4,
1: -	NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN = 5,
1: -	NL80211_ATTR_POWER_RULE_MAX_EIRP = 6,
1: -	NL80211_ATTR_DFS_CAC_TIME = 7,
1: -	__NL80211_REG_RULE_ATTR_AFTER_LAST = 8,
1: -	NL80211_REG_RULE_ATTR_MAX = 7,
1: +  __NL80211_REG_RULE_ATTR_INVALID = 0,
1: +  NL80211_ATTR_REG_RULE_FLAGS = 1,
1: +  NL80211_ATTR_FREQ_RANGE_START = 2,
1: +  NL80211_ATTR_FREQ_RANGE_END = 3,
1: +  NL80211_ATTR_FREQ_RANGE_MAX_BW = 4,
1: +  NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN = 5,
1: +  NL80211_ATTR_POWER_RULE_MAX_EIRP = 6,
1: +  NL80211_ATTR_DFS_CAC_TIME = 7,
1: +  __NL80211_REG_RULE_ATTR_AFTER_LAST = 8,
1: +  NL80211_REG_RULE_ATTR_MAX = 7,
1:  };
1:  
1:  enum nl80211_sched_scan_match_attr {
1: -	__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID = 0,
1: -	NL80211_SCHED_SCAN_MATCH_ATTR_SSID = 1,
1: -	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI = 2,
1: -	NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI = 3,
1: -	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST = 4,
1: -	NL80211_SCHED_SCAN_MATCH_ATTR_BSSID = 5,
1: -	NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6,
1: -	__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST = 7,
1: -	NL80211_SCHED_SCAN_MATCH_ATTR_MAX = 6,
1: +  __NL80211_SCHED_SCAN_MATCH_ATTR_INVALID = 0,
1: +  NL80211_SCHED_SCAN_MATCH_ATTR_SSID = 1,
1: +  NL80211_SCHED_SCAN_MATCH_ATTR_RSSI = 2,
1: +  NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI = 3,
1: +  NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST = 4,
1: +  NL80211_SCHED_SCAN_MATCH_ATTR_BSSID = 5,
1: +  NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6,
1: +  __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST = 7,
1: +  NL80211_SCHED_SCAN_MATCH_ATTR_MAX = 6,
1:  };
1:  
1:  enum nl80211_survey_info {
1: -	__NL80211_SURVEY_INFO_INVALID = 0,
1: -	NL80211_SURVEY_INFO_FREQUENCY = 1,
1: -	NL80211_SURVEY_INFO_NOISE = 2,
1: -	NL80211_SURVEY_INFO_IN_USE = 3,
1: -	NL80211_SURVEY_INFO_TIME = 4,
1: -	NL80211_SURVEY_INFO_TIME_BUSY = 5,
1: -	NL80211_SURVEY_INFO_TIME_EXT_BUSY = 6,
1: -	NL80211_SURVEY_INFO_TIME_RX = 7,
1: -	NL80211_SURVEY_INFO_TIME_TX = 8,
1: -	NL80211_SURVEY_INFO_TIME_SCAN = 9,
1: -	NL80211_SURVEY_INFO_PAD = 10,
1: -	NL80211_SURVEY_INFO_TIME_BSS_RX = 11,
1: -	NL80211_SURVEY_INFO_FREQUENCY_OFFSET = 12,
1: -	__NL80211_SURVEY_INFO_AFTER_LAST = 13,
1: -	NL80211_SURVEY_INFO_MAX = 12,
1: +  __NL80211_SURVEY_INFO_INVALID = 0,
1: +  NL80211_SURVEY_INFO_FREQUENCY = 1,
1: +  NL80211_SURVEY_INFO_NOISE = 2,
1: +  NL80211_SURVEY_INFO_IN_USE = 3,
1: +  NL80211_SURVEY_INFO_TIME = 4,
1: +  NL80211_SURVEY_INFO_TIME_BUSY = 5,
1: +  NL80211_SURVEY_INFO_TIME_EXT_BUSY = 6,
1: +  NL80211_SURVEY_INFO_TIME_RX = 7,
1: +  NL80211_SURVEY_INFO_TIME_TX = 8,
1: +  NL80211_SURVEY_INFO_TIME_SCAN = 9,
1: +  NL80211_SURVEY_INFO_PAD = 10,
1: +  NL80211_SURVEY_INFO_TIME_BSS_RX = 11,
1: +  NL80211_SURVEY_INFO_FREQUENCY_OFFSET = 12,
1: +  __NL80211_SURVEY_INFO_AFTER_LAST = 13,
1: +  NL80211_SURVEY_INFO_MAX = 12,
1:  };
1:  
1:  enum nl80211_meshconf_params {
1: -	__NL80211_MESHCONF_INVALID = 0,
1: -	NL80211_MESHCONF_RETRY_TIMEOUT = 1,
1: -	NL80211_MESHCONF_CONFIRM_TIMEOUT = 2,
1: -	NL80211_MESHCONF_HOLDING_TIMEOUT = 3,
1: -	NL80211_MESHCONF_MAX_PEER_LINKS = 4,
1: -	NL80211_MESHCONF_MAX_RETRIES = 5,
1: -	NL80211_MESHCONF_TTL = 6,
1: -	NL80211_MESHCONF_AUTO_OPEN_PLINKS = 7,
1: -	NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES = 8,
1: -	NL80211_MESHCONF_PATH_REFRESH_TIME = 9,
1: -	NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT = 10,
1: -	NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT = 11,
1: -	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL = 12,
1: -	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME = 13,
1: -	NL80211_MESHCONF_HWMP_ROOTMODE = 14,
1: -	NL80211_MESHCONF_ELEMENT_TTL = 15,
1: -	NL80211_MESHCONF_HWMP_RANN_INTERVAL = 16,
1: -	NL80211_MESHCONF_GATE_ANNOUNCEMENTS = 17,
1: -	NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL = 18,
1: -	NL80211_MESHCONF_FORWARDING = 19,
1: -	NL80211_MESHCONF_RSSI_THRESHOLD = 20,
1: -	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR = 21,
1: -	NL80211_MESHCONF_HT_OPMODE = 22,
1: -	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT = 23,
1: -	NL80211_MESHCONF_HWMP_ROOT_INTERVAL = 24,
1: -	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL = 25,
1: -	NL80211_MESHCONF_POWER_MODE = 26,
1: -	NL80211_MESHCONF_AWAKE_WINDOW = 27,
1: -	NL80211_MESHCONF_PLINK_TIMEOUT = 28,
1: -	NL80211_MESHCONF_CONNECTED_TO_GATE = 29,
1: -	NL80211_MESHCONF_NOLEARN = 30,
1: -	NL80211_MESHCONF_CONNECTED_TO_AS = 31,
1: -	__NL80211_MESHCONF_ATTR_AFTER_LAST = 32,
1: -	NL80211_MESHCONF_ATTR_MAX = 31,
1: +  __NL80211_MESHCONF_INVALID = 0,
1: +  NL80211_MESHCONF_RETRY_TIMEOUT = 1,
1: +  NL80211_MESHCONF_CONFIRM_TIMEOUT = 2,
1: +  NL80211_MESHCONF_HOLDING_TIMEOUT = 3,
1: +  NL80211_MESHCONF_MAX_PEER_LINKS = 4,
1: +  NL80211_MESHCONF_MAX_RETRIES = 5,
1: +  NL80211_MESHCONF_TTL = 6,
1: +  NL80211_MESHCONF_AUTO_OPEN_PLINKS = 7,
1: +  NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES = 8,
1: +  NL80211_MESHCONF_PATH_REFRESH_TIME = 9,
1: +  NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT = 10,
1: +  NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT = 11,
1: +  NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL = 12,
1: +  NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME = 13,
1: +  NL80211_MESHCONF_HWMP_ROOTMODE = 14,
1: +  NL80211_MESHCONF_ELEMENT_TTL = 15,
1: +  NL80211_MESHCONF_HWMP_RANN_INTERVAL = 16,
1: +  NL80211_MESHCONF_GATE_ANNOUNCEMENTS = 17,
1: +  NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL = 18,
1: +  NL80211_MESHCONF_FORWARDING = 19,
1: +  NL80211_MESHCONF_RSSI_THRESHOLD = 20,
1: +  NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR = 21,
1: +  NL80211_MESHCONF_HT_OPMODE = 22,
1: +  NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT = 23,
1: +  NL80211_MESHCONF_HWMP_ROOT_INTERVAL = 24,
1: +  NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL = 25,
1: +  NL80211_MESHCONF_POWER_MODE = 26,
1: +  NL80211_MESHCONF_AWAKE_WINDOW = 27,
1: +  NL80211_MESHCONF_PLINK_TIMEOUT = 28,
1: +  NL80211_MESHCONF_CONNECTED_TO_GATE = 29,
1: +  NL80211_MESHCONF_NOLEARN = 30,
1: +  NL80211_MESHCONF_CONNECTED_TO_AS = 31,
1: +  __NL80211_MESHCONF_ATTR_AFTER_LAST = 32,
1: +  NL80211_MESHCONF_ATTR_MAX = 31,
1:  };
1:  
1:  enum nl80211_mesh_setup_params {
1: -	__NL80211_MESH_SETUP_INVALID = 0,
1: -	NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL = 1,
1: -	NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC = 2,
1: -	NL80211_MESH_SETUP_IE = 3,
1: -	NL80211_MESH_SETUP_USERSPACE_AUTH = 4,
1: -	NL80211_MESH_SETUP_USERSPACE_AMPE = 5,
1: -	NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC = 6,
1: -	NL80211_MESH_SETUP_USERSPACE_MPM = 7,
1: -	NL80211_MESH_SETUP_AUTH_PROTOCOL = 8,
1: -	__NL80211_MESH_SETUP_ATTR_AFTER_LAST = 9,
1: -	NL80211_MESH_SETUP_ATTR_MAX = 8,
1: +  __NL80211_MESH_SETUP_INVALID = 0,
1: +  NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL = 1,
1: +  NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC = 2,
1: +  NL80211_MESH_SETUP_IE = 3,
1: +  NL80211_MESH_SETUP_USERSPACE_AUTH = 4,
1: +  NL80211_MESH_SETUP_USERSPACE_AMPE = 5,
1: +  NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC = 6,
1: +  NL80211_MESH_SETUP_USERSPACE_MPM = 7,
1: +  NL80211_MESH_SETUP_AUTH_PROTOCOL = 8,
1: +  __NL80211_MESH_SETUP_ATTR_AFTER_LAST = 9,
1: +  NL80211_MESH_SETUP_ATTR_MAX = 8,
1:  };
1:  
1:  enum nl80211_txq_attr {
1: -	__NL80211_TXQ_ATTR_INVALID = 0,
1: -	NL80211_TXQ_ATTR_AC = 1,
1: -	NL80211_TXQ_ATTR_TXOP = 2,
1: -	NL80211_TXQ_ATTR_CWMIN = 3,
1: -	NL80211_TXQ_ATTR_CWMAX = 4,
1: -	NL80211_TXQ_ATTR_AIFS = 5,
1: -	__NL80211_TXQ_ATTR_AFTER_LAST = 6,
1: -	NL80211_TXQ_ATTR_MAX = 5,
1: +  __NL80211_TXQ_ATTR_INVALID = 0,
1: +  NL80211_TXQ_ATTR_AC = 1,
1: +  NL80211_TXQ_ATTR_TXOP = 2,
1: +  NL80211_TXQ_ATTR_CWMIN = 3,
1: +  NL80211_TXQ_ATTR_CWMAX = 4,
1: +  NL80211_TXQ_ATTR_AIFS = 5,
1: +  __NL80211_TXQ_ATTR_AFTER_LAST = 6,
1: +  NL80211_TXQ_ATTR_MAX = 5,
1:  };
1:  
1:  enum nl80211_bss {
1: -	__NL80211_BSS_INVALID = 0,
1: -	NL80211_BSS_BSSID = 1,
1: -	NL80211_BSS_FREQUENCY = 2,
1: -	NL80211_BSS_TSF = 3,
1: -	NL80211_BSS_BEACON_INTERVAL = 4,
1: -	NL80211_BSS_CAPABILITY = 5,
1: -	NL80211_BSS_INFORMATION_ELEMENTS = 6,
1: -	NL80211_BSS_SIGNAL_MBM = 7,
1: -	NL80211_BSS_SIGNAL_UNSPEC = 8,
1: -	NL80211_BSS_STATUS = 9,
1: -	NL80211_BSS_SEEN_MS_AGO = 10,
1: -	NL80211_BSS_BEACON_IES = 11,
1: -	NL80211_BSS_CHAN_WIDTH = 12,
1: -	NL80211_BSS_BEACON_TSF = 13,
1: -	NL80211_BSS_PRESP_DATA = 14,
1: -	NL80211_BSS_LAST_SEEN_BOOTTIME = 15,
1: -	NL80211_BSS_PAD = 16,
1: -	NL80211_BSS_PARENT_TSF = 17,
1: -	NL80211_BSS_PARENT_BSSID = 18,
1: -	NL80211_BSS_CHAIN_SIGNAL = 19,
1: -	NL80211_BSS_FREQUENCY_OFFSET = 20,
1: -	__NL80211_BSS_AFTER_LAST = 21,
1: -	NL80211_BSS_MAX = 20,
1: +  __NL80211_BSS_INVALID = 0,
1: +  NL80211_BSS_BSSID = 1,
1: +  NL80211_BSS_FREQUENCY = 2,
1: +  NL80211_BSS_TSF = 3,
1: +  NL80211_BSS_BEACON_INTERVAL = 4,
1: +  NL80211_BSS_CAPABILITY = 5,
1: +  NL80211_BSS_INFORMATION_ELEMENTS = 6,
1: +  NL80211_BSS_SIGNAL_MBM = 7,
1: +  NL80211_BSS_SIGNAL_UNSPEC = 8,
1: +  NL80211_BSS_STATUS = 9,
1: +  NL80211_BSS_SEEN_MS_AGO = 10,
1: +  NL80211_BSS_BEACON_IES = 11,
1: +  NL80211_BSS_CHAN_WIDTH = 12,
1: +  NL80211_BSS_BEACON_TSF = 13,
1: +  NL80211_BSS_PRESP_DATA = 14,
1: +  NL80211_BSS_LAST_SEEN_BOOTTIME = 15,
1: +  NL80211_BSS_PAD = 16,
1: +  NL80211_BSS_PARENT_TSF = 17,
1: +  NL80211_BSS_PARENT_BSSID = 18,
1: +  NL80211_BSS_CHAIN_SIGNAL = 19,
1: +  NL80211_BSS_FREQUENCY_OFFSET = 20,
1: +  __NL80211_BSS_AFTER_LAST = 21,
1: +  NL80211_BSS_MAX = 20,
1:  };
1:  
1:  enum nl80211_bss_status {
1: -	NL80211_BSS_STATUS_AUTHENTICATED = 0,
1: -	NL80211_BSS_STATUS_ASSOCIATED = 1,
1: -	NL80211_BSS_STATUS_IBSS_JOINED = 2,
1: +  NL80211_BSS_STATUS_AUTHENTICATED = 0,
1: +  NL80211_BSS_STATUS_ASSOCIATED = 1,
1: +  NL80211_BSS_STATUS_IBSS_JOINED = 2,
1:  };
1:  
1:  enum nl80211_key_type {
1: -	NL80211_KEYTYPE_GROUP = 0,
1: -	NL80211_KEYTYPE_PAIRWISE = 1,
1: -	NL80211_KEYTYPE_PEERKEY = 2,
1: -	NUM_NL80211_KEYTYPES = 3,
1: +  NL80211_KEYTYPE_GROUP = 0,
1: +  NL80211_KEYTYPE_PAIRWISE = 1,
1: +  NL80211_KEYTYPE_PEERKEY = 2,
1: +  NUM_NL80211_KEYTYPES = 3,
1:  };
1:  
1:  enum nl80211_wpa_versions {
1: -	NL80211_WPA_VERSION_1 = 1,
1: -	NL80211_WPA_VERSION_2 = 2,
1: -	NL80211_WPA_VERSION_3 = 4,
1: +  NL80211_WPA_VERSION_1 = 1,
1: +  NL80211_WPA_VERSION_2 = 2,
1: +  NL80211_WPA_VERSION_3 = 4,
1:  };
1:  
1:  enum nl80211_key_default_types {
1: -	__NL80211_KEY_DEFAULT_TYPE_INVALID = 0,
1: -	NL80211_KEY_DEFAULT_TYPE_UNICAST = 1,
1: -	NL80211_KEY_DEFAULT_TYPE_MULTICAST = 2,
1: -	NUM_NL80211_KEY_DEFAULT_TYPES = 3,
1: +  __NL80211_KEY_DEFAULT_TYPE_INVALID = 0,
1: +  NL80211_KEY_DEFAULT_TYPE_UNICAST = 1,
1: +  NL80211_KEY_DEFAULT_TYPE_MULTICAST = 2,
1: +  NUM_NL80211_KEY_DEFAULT_TYPES = 3,
1:  };
1:  
1:  enum nl80211_key_attributes {
1: -	__NL80211_KEY_INVALID = 0,
1: -	NL80211_KEY_DATA = 1,
1: -	NL80211_KEY_IDX = 2,
1: -	NL80211_KEY_CIPHER = 3,
1: -	NL80211_KEY_SEQ = 4,
1: -	NL80211_KEY_DEFAULT = 5,
1: -	NL80211_KEY_DEFAULT_MGMT = 6,
1: -	NL80211_KEY_TYPE = 7,
1: -	NL80211_KEY_DEFAULT_TYPES = 8,
1: -	NL80211_KEY_MODE = 9,
1: -	NL80211_KEY_DEFAULT_BEACON = 10,
1: -	__NL80211_KEY_AFTER_LAST = 11,
1: -	NL80211_KEY_MAX = 10,
1: +  __NL80211_KEY_INVALID = 0,
1: +  NL80211_KEY_DATA = 1,
1: +  NL80211_KEY_IDX = 2,
1: +  NL80211_KEY_CIPHER = 3,
1: +  NL80211_KEY_SEQ = 4,
1: +  NL80211_KEY_DEFAULT = 5,
1: +  NL80211_KEY_DEFAULT_MGMT = 6,
1: +  NL80211_KEY_TYPE = 7,
1: +  NL80211_KEY_DEFAULT_TYPES = 8,
1: +  NL80211_KEY_MODE = 9,
1: +  NL80211_KEY_DEFAULT_BEACON = 10,
1: +  __NL80211_KEY_AFTER_LAST = 11,
1: +  NL80211_KEY_MAX = 10,
1:  };
1:  
1:  enum nl80211_tx_rate_attributes {
1: -	__NL80211_TXRATE_INVALID = 0,
1: -	NL80211_TXRATE_LEGACY = 1,
1: -	NL80211_TXRATE_HT = 2,
1: -	NL80211_TXRATE_VHT = 3,
1: -	NL80211_TXRATE_GI = 4,
1: -	NL80211_TXRATE_HE = 5,
1: -	NL80211_TXRATE_HE_GI = 6,
1: -	NL80211_TXRATE_HE_LTF = 7,
1: -	__NL80211_TXRATE_AFTER_LAST = 8,
1: -	NL80211_TXRATE_MAX = 7,
1: +  __NL80211_TXRATE_INVALID = 0,
1: +  NL80211_TXRATE_LEGACY = 1,
1: +  NL80211_TXRATE_HT = 2,
1: +  NL80211_TXRATE_VHT = 3,
1: +  NL80211_TXRATE_GI = 4,
1: +  NL80211_TXRATE_HE = 5,
1: +  NL80211_TXRATE_HE_GI = 6,
1: +  NL80211_TXRATE_HE_LTF = 7,
1: +  __NL80211_TXRATE_AFTER_LAST = 8,
1: +  NL80211_TXRATE_MAX = 7,
1:  };
1:  
1:  struct nl80211_txrate_vht {
1: -	__u16 mcs[8];
1: +  __u16 mcs[8];
1:  };
1:  
1:  struct nl80211_txrate_he {
1: -	__u16 mcs[8];
1: +  __u16 mcs[8];
1:  };
1:  
1:  enum nl80211_ps_state {
1: -	NL80211_PS_DISABLED = 0,
1: -	NL80211_PS_ENABLED = 1,
1: +  NL80211_PS_DISABLED = 0,
1: +  NL80211_PS_ENABLED = 1,
1:  };
1:  
1:  enum nl80211_attr_cqm {
1: -	__NL80211_ATTR_CQM_INVALID = 0,
1: -	NL80211_ATTR_CQM_RSSI_THOLD = 1,
1: -	NL80211_ATTR_CQM_RSSI_HYST = 2,
1: -	NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT = 3,
1: -	NL80211_ATTR_CQM_PKT_LOSS_EVENT = 4,
1: -	NL80211_ATTR_CQM_TXE_RATE = 5,
1: -	NL80211_ATTR_CQM_TXE_PKTS = 6,
1: -	NL80211_ATTR_CQM_TXE_INTVL = 7,
1: -	NL80211_ATTR_CQM_BEACON_LOSS_EVENT = 8,
1: -	NL80211_ATTR_CQM_RSSI_LEVEL = 9,
1: -	__NL80211_ATTR_CQM_AFTER_LAST = 10,
1: -	NL80211_ATTR_CQM_MAX = 9,
1: +  __NL80211_ATTR_CQM_INVALID = 0,
1: +  NL80211_ATTR_CQM_RSSI_THOLD = 1,
1: +  NL80211_ATTR_CQM_RSSI_HYST = 2,
1: +  NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT = 3,
1: +  NL80211_ATTR_CQM_PKT_LOSS_EVENT = 4,
1: +  NL80211_ATTR_CQM_TXE_RATE = 5,
1: +  NL80211_ATTR_CQM_TXE_PKTS = 6,
1: +  NL80211_ATTR_CQM_TXE_INTVL = 7,
1: +  NL80211_ATTR_CQM_BEACON_LOSS_EVENT = 8,
1: +  NL80211_ATTR_CQM_RSSI_LEVEL = 9,
1: +  __NL80211_ATTR_CQM_AFTER_LAST = 10,
1: +  NL80211_ATTR_CQM_MAX = 9,
1:  };
1:  
1:  enum nl80211_cqm_rssi_threshold_event {
1: -	NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW = 0,
1: -	NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH = 1,
1: -	NL80211_CQM_RSSI_BEACON_LOSS_EVENT = 2,
1: +  NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW = 0,
1: +  NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH = 1,
1: +  NL80211_CQM_RSSI_BEACON_LOSS_EVENT = 2,
1:  };
1:  
1:  enum nl80211_tid_config_attr {
1: -	__NL80211_TID_CONFIG_ATTR_INVALID = 0,
1: -	NL80211_TID_CONFIG_ATTR_PAD = 1,
1: -	NL80211_TID_CONFIG_ATTR_VIF_SUPP = 2,
1: -	NL80211_TID_CONFIG_ATTR_PEER_SUPP = 3,
1: -	NL80211_TID_CONFIG_ATTR_OVERRIDE = 4,
1: -	NL80211_TID_CONFIG_ATTR_TIDS = 5,
1: -	NL80211_TID_CONFIG_ATTR_NOACK = 6,
1: -	NL80211_TID_CONFIG_ATTR_RETRY_SHORT = 7,
1: -	NL80211_TID_CONFIG_ATTR_RETRY_LONG = 8,
1: -	NL80211_TID_CONFIG_ATTR_AMPDU_CTRL = 9,
1: -	NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL = 10,
1: -	NL80211_TID_CONFIG_ATTR_AMSDU_CTRL = 11,
1: -	NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE = 12,
1: -	NL80211_TID_CONFIG_ATTR_TX_RATE = 13,
1: -	__NL80211_TID_CONFIG_ATTR_AFTER_LAST = 14,
1: -	NL80211_TID_CONFIG_ATTR_MAX = 13,
1: +  __NL80211_TID_CONFIG_ATTR_INVALID = 0,
1: +  NL80211_TID_CONFIG_ATTR_PAD = 1,
1: +  NL80211_TID_CONFIG_ATTR_VIF_SUPP = 2,
1: +  NL80211_TID_CONFIG_ATTR_PEER_SUPP = 3,
1: +  NL80211_TID_CONFIG_ATTR_OVERRIDE = 4,
1: +  NL80211_TID_CONFIG_ATTR_TIDS = 5,
1: +  NL80211_TID_CONFIG_ATTR_NOACK = 6,
1: +  NL80211_TID_CONFIG_ATTR_RETRY_SHORT = 7,
1: +  NL80211_TID_CONFIG_ATTR_RETRY_LONG = 8,
1: +  NL80211_TID_CONFIG_ATTR_AMPDU_CTRL = 9,
1: +  NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL = 10,
1: +  NL80211_TID_CONFIG_ATTR_AMSDU_CTRL = 11,
1: +  NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE = 12,
1: +  NL80211_TID_CONFIG_ATTR_TX_RATE = 13,
1: +  __NL80211_TID_CONFIG_ATTR_AFTER_LAST = 14,
1: +  NL80211_TID_CONFIG_ATTR_MAX = 13,
1:  };
1:  
1:  enum nl80211_packet_pattern_attr {
1: -	__NL80211_PKTPAT_INVALID = 0,
1: -	NL80211_PKTPAT_MASK = 1,
1: -	NL80211_PKTPAT_PATTERN = 2,
1: -	NL80211_PKTPAT_OFFSET = 3,
1: -	NUM_NL80211_PKTPAT = 4,
1: -	MAX_NL80211_PKTPAT = 3,
1: +  __NL80211_PKTPAT_INVALID = 0,
1: +  NL80211_PKTPAT_MASK = 1,
1: +  NL80211_PKTPAT_PATTERN = 2,
1: +  NL80211_PKTPAT_OFFSET = 3,
1: +  NUM_NL80211_PKTPAT = 4,
1: +  MAX_NL80211_PKTPAT = 3,
1:  };
1:  
1:  struct nl80211_pattern_support {
1: -	__u32 max_patterns;
1: -	__u32 min_pattern_len;
1: -	__u32 max_pattern_len;
1: -	__u32 max_pkt_offset;
1: +  __u32 max_patterns;
1: +  __u32 min_pattern_len;
1: +  __u32 max_pattern_len;
1: +  __u32 max_pkt_offset;
1:  };
1:  
1:  enum nl80211_wowlan_triggers {
1: -	__NL80211_WOWLAN_TRIG_INVALID = 0,
1: -	NL80211_WOWLAN_TRIG_ANY = 1,
1: -	NL80211_WOWLAN_TRIG_DISCONNECT = 2,
1: -	NL80211_WOWLAN_TRIG_MAGIC_PKT = 3,
1: -	NL80211_WOWLAN_TRIG_PKT_PATTERN = 4,
1: -	NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED = 5,
1: -	NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE = 6,
1: -	NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST = 7,
1: -	NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE = 8,
1: -	NL80211_WOWLAN_TRIG_RFKILL_RELEASE = 9,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211 = 10,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN = 11,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023 = 12,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN = 13,
1: -	NL80211_WOWLAN_TRIG_TCP_CONNECTION = 14,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH = 15,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST = 16,
1: -	NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS = 17,
1: -	NL80211_WOWLAN_TRIG_NET_DETECT = 18,
1: -	NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS = 19,
1: -	NUM_NL80211_WOWLAN_TRIG = 20,
1: -	MAX_NL80211_WOWLAN_TRIG = 19,
1: +  __NL80211_WOWLAN_TRIG_INVALID = 0,
1: +  NL80211_WOWLAN_TRIG_ANY = 1,
1: +  NL80211_WOWLAN_TRIG_DISCONNECT = 2,
1: +  NL80211_WOWLAN_TRIG_MAGIC_PKT = 3,
1: +  NL80211_WOWLAN_TRIG_PKT_PATTERN = 4,
1: +  NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED = 5,
1: +  NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE = 6,
1: +  NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST = 7,
1: +  NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE = 8,
1: +  NL80211_WOWLAN_TRIG_RFKILL_RELEASE = 9,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211 = 10,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN = 11,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023 = 12,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN = 13,
1: +  NL80211_WOWLAN_TRIG_TCP_CONNECTION = 14,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH = 15,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST = 16,
1: +  NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS = 17,
1: +  NL80211_WOWLAN_TRIG_NET_DETECT = 18,
1: +  NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS = 19,
1: +  NUM_NL80211_WOWLAN_TRIG = 20,
1: +  MAX_NL80211_WOWLAN_TRIG = 19,
1:  };
1:  
1:  enum nl80211_wowlan_tcp_attrs {
1: -	__NL80211_WOWLAN_TCP_INVALID = 0,
1: -	NL80211_WOWLAN_TCP_SRC_IPV4 = 1,
1: -	NL80211_WOWLAN_TCP_DST_IPV4 = 2,
1: -	NL80211_WOWLAN_TCP_DST_MAC = 3,
1: -	NL80211_WOWLAN_TCP_SRC_PORT = 4,
1: -	NL80211_WOWLAN_TCP_DST_PORT = 5,
1: -	NL80211_WOWLAN_TCP_DATA_PAYLOAD = 6,
1: -	NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ = 7,
1: -	NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN = 8,
1: -	NL80211_WOWLAN_TCP_DATA_INTERVAL = 9,
1: -	NL80211_WOWLAN_TCP_WAKE_PAYLOAD = 10,
1: -	NL80211_WOWLAN_TCP_WAKE_MASK = 11,
1: -	NUM_NL80211_WOWLAN_TCP = 12,
1: -	MAX_NL80211_WOWLAN_TCP = 11,
1: +  __NL80211_WOWLAN_TCP_INVALID = 0,
1: +  NL80211_WOWLAN_TCP_SRC_IPV4 = 1,
1: +  NL80211_WOWLAN_TCP_DST_IPV4 = 2,
1: +  NL80211_WOWLAN_TCP_DST_MAC = 3,
1: +  NL80211_WOWLAN_TCP_SRC_PORT = 4,
1: +  NL80211_WOWLAN_TCP_DST_PORT = 5,
1: +  NL80211_WOWLAN_TCP_DATA_PAYLOAD = 6,
1: +  NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ = 7,
1: +  NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN = 8,
1: +  NL80211_WOWLAN_TCP_DATA_INTERVAL = 9,
1: +  NL80211_WOWLAN_TCP_WAKE_PAYLOAD = 10,
1: +  NL80211_WOWLAN_TCP_WAKE_MASK = 11,
1: +  NUM_NL80211_WOWLAN_TCP = 12,
1: +  MAX_NL80211_WOWLAN_TCP = 11,
1:  };
1:  
1:  struct nl80211_coalesce_rule_support {
1: -	__u32 max_rules;
1: -	struct nl80211_pattern_support pat;
1: -	__u32 max_delay;
1: +  __u32 max_rules;
1: +  struct nl80211_pattern_support pat;
1: +  __u32 max_delay;
1:  };
1:  
1:  enum nl80211_attr_coalesce_rule {
1: -	__NL80211_COALESCE_RULE_INVALID = 0,
1: -	NL80211_ATTR_COALESCE_RULE_DELAY = 1,
1: -	NL80211_ATTR_COALESCE_RULE_CONDITION = 2,
1: -	NL80211_ATTR_COALESCE_RULE_PKT_PATTERN = 3,
1: -	NUM_NL80211_ATTR_COALESCE_RULE = 4,
1: -	NL80211_ATTR_COALESCE_RULE_MAX = 3,
1: +  __NL80211_COALESCE_RULE_INVALID = 0,
1: +  NL80211_ATTR_COALESCE_RULE_DELAY = 1,
1: +  NL80211_ATTR_COALESCE_RULE_CONDITION = 2,
1: +  NL80211_ATTR_COALESCE_RULE_PKT_PATTERN = 3,
1: +  NUM_NL80211_ATTR_COALESCE_RULE = 4,
1: +  NL80211_ATTR_COALESCE_RULE_MAX = 3,
1:  };
1:  
1:  enum nl80211_iface_limit_attrs {
1: -	NL80211_IFACE_LIMIT_UNSPEC = 0,
1: -	NL80211_IFACE_LIMIT_MAX = 1,
1: -	NL80211_IFACE_LIMIT_TYPES = 2,
1: -	NUM_NL80211_IFACE_LIMIT = 3,
1: -	MAX_NL80211_IFACE_LIMIT = 2,
1: +  NL80211_IFACE_LIMIT_UNSPEC = 0,
1: +  NL80211_IFACE_LIMIT_MAX = 1,
1: +  NL80211_IFACE_LIMIT_TYPES = 2,
1: +  NUM_NL80211_IFACE_LIMIT = 3,
1: +  MAX_NL80211_IFACE_LIMIT = 2,
1:  };
1:  
1:  enum nl80211_if_combination_attrs {
1: -	NL80211_IFACE_COMB_UNSPEC = 0,
1: -	NL80211_IFACE_COMB_LIMITS = 1,
1: -	NL80211_IFACE_COMB_MAXNUM = 2,
1: -	NL80211_IFACE_COMB_STA_AP_BI_MATCH = 3,
1: -	NL80211_IFACE_COMB_NUM_CHANNELS = 4,
1: -	NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS = 5,
1: -	NL80211_IFACE_COMB_RADAR_DETECT_REGIONS = 6,
1: -	NL80211_IFACE_COMB_BI_MIN_GCD = 7,
1: -	NUM_NL80211_IFACE_COMB = 8,
1: -	MAX_NL80211_IFACE_COMB = 7,
1: +  NL80211_IFACE_COMB_UNSPEC = 0,
1: +  NL80211_IFACE_COMB_LIMITS = 1,
1: +  NL80211_IFACE_COMB_MAXNUM = 2,
1: +  NL80211_IFACE_COMB_STA_AP_BI_MATCH = 3,
1: +  NL80211_IFACE_COMB_NUM_CHANNELS = 4,
1: +  NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS = 5,
1: +  NL80211_IFACE_COMB_RADAR_DETECT_REGIONS = 6,
1: +  NL80211_IFACE_COMB_BI_MIN_GCD = 7,
1: +  NUM_NL80211_IFACE_COMB = 8,
1: +  MAX_NL80211_IFACE_COMB = 7,
1:  };
1:  
1:  enum nl80211_plink_state {
1: -	NL80211_PLINK_LISTEN = 0,
1: -	NL80211_PLINK_OPN_SNT = 1,
1: -	NL80211_PLINK_OPN_RCVD = 2,
1: -	NL80211_PLINK_CNF_RCVD = 3,
1: -	NL80211_PLINK_ESTAB = 4,
1: -	NL80211_PLINK_HOLDING = 5,
1: -	NL80211_PLINK_BLOCKED = 6,
1: -	NUM_NL80211_PLINK_STATES = 7,
1: -	MAX_NL80211_PLINK_STATES = 6,
1: +  NL80211_PLINK_LISTEN = 0,
1: +  NL80211_PLINK_OPN_SNT = 1,
1: +  NL80211_PLINK_OPN_RCVD = 2,
1: +  NL80211_PLINK_CNF_RCVD = 3,
1: +  NL80211_PLINK_ESTAB = 4,
1: +  NL80211_PLINK_HOLDING = 5,
1: +  NL80211_PLINK_BLOCKED = 6,
1: +  NUM_NL80211_PLINK_STATES = 7,
1: +  MAX_NL80211_PLINK_STATES = 6,
1:  };
1:  
1:  enum plink_actions {
1: -	NL80211_PLINK_ACTION_NO_ACTION = 0,
1: -	NL80211_PLINK_ACTION_OPEN = 1,
1: -	NL80211_PLINK_ACTION_BLOCK = 2,
1: -	NUM_NL80211_PLINK_ACTIONS = 3,
1: +  NL80211_PLINK_ACTION_NO_ACTION = 0,
1: +  NL80211_PLINK_ACTION_OPEN = 1,
1: +  NL80211_PLINK_ACTION_BLOCK = 2,
1: +  NUM_NL80211_PLINK_ACTIONS = 3,
1:  };
1:  
1:  enum nl80211_rekey_data {
1: -	__NL80211_REKEY_DATA_INVALID = 0,
1: -	NL80211_REKEY_DATA_KEK = 1,
1: -	NL80211_REKEY_DATA_KCK = 2,
1: -	NL80211_REKEY_DATA_REPLAY_CTR = 3,
1: -	NL80211_REKEY_DATA_AKM = 4,
1: -	NUM_NL80211_REKEY_DATA = 5,
1: -	MAX_NL80211_REKEY_DATA = 4,
1: +  __NL80211_REKEY_DATA_INVALID = 0,
1: +  NL80211_REKEY_DATA_KEK = 1,
1: +  NL80211_REKEY_DATA_KCK = 2,
1: +  NL80211_REKEY_DATA_REPLAY_CTR = 3,
1: +  NL80211_REKEY_DATA_AKM = 4,
1: +  NUM_NL80211_REKEY_DATA = 5,
1: +  MAX_NL80211_REKEY_DATA = 4,
1:  };
1:  
1:  enum nl80211_sta_wme_attr {
1: -	__NL80211_STA_WME_INVALID = 0,
1: -	NL80211_STA_WME_UAPSD_QUEUES = 1,
1: -	NL80211_STA_WME_MAX_SP = 2,
1: -	__NL80211_STA_WME_AFTER_LAST = 3,
1: -	NL80211_STA_WME_MAX = 2,
1: +  __NL80211_STA_WME_INVALID = 0,
1: +  NL80211_STA_WME_UAPSD_QUEUES = 1,
1: +  NL80211_STA_WME_MAX_SP = 2,
1: +  __NL80211_STA_WME_AFTER_LAST = 3,
1: +  NL80211_STA_WME_MAX = 2,
1:  };
1:  
1:  enum nl80211_pmksa_candidate_attr {
1: -	__NL80211_PMKSA_CANDIDATE_INVALID = 0,
1: -	NL80211_PMKSA_CANDIDATE_INDEX = 1,
1: -	NL80211_PMKSA_CANDIDATE_BSSID = 2,
1: -	NL80211_PMKSA_CANDIDATE_PREAUTH = 3,
1: -	NUM_NL80211_PMKSA_CANDIDATE = 4,
1: -	MAX_NL80211_PMKSA_CANDIDATE = 3,
1: +  __NL80211_PMKSA_CANDIDATE_INVALID = 0,
1: +  NL80211_PMKSA_CANDIDATE_INDEX = 1,
1: +  NL80211_PMKSA_CANDIDATE_BSSID = 2,
1: +  NL80211_PMKSA_CANDIDATE_PREAUTH = 3,
1: +  NUM_NL80211_PMKSA_CANDIDATE = 4,
1: +  MAX_NL80211_PMKSA_CANDIDATE = 3,
1:  };
1:  
1:  enum nl80211_connect_failed_reason {
1: -	NL80211_CONN_FAIL_MAX_CLIENTS = 0,
1: -	NL80211_CONN_FAIL_BLOCKED_CLIENT = 1,
1: +  NL80211_CONN_FAIL_MAX_CLIENTS = 0,
1: +  NL80211_CONN_FAIL_BLOCKED_CLIENT = 1,
1:  };
1:  
1:  enum nl80211_protocol_features {
1: -	NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP = 1,
1: +  NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP = 1,
1:  };
1:  
1:  enum nl80211_sched_scan_plan {
1: -	__NL80211_SCHED_SCAN_PLAN_INVALID = 0,
1: -	NL80211_SCHED_SCAN_PLAN_INTERVAL = 1,
1: -	NL80211_SCHED_SCAN_PLAN_ITERATIONS = 2,
1: -	__NL80211_SCHED_SCAN_PLAN_AFTER_LAST = 3,
1: -	NL80211_SCHED_SCAN_PLAN_MAX = 2,
1: +  __NL80211_SCHED_SCAN_PLAN_INVALID = 0,
1: +  NL80211_SCHED_SCAN_PLAN_INTERVAL = 1,
1: +  NL80211_SCHED_SCAN_PLAN_ITERATIONS = 2,
1: +  __NL80211_SCHED_SCAN_PLAN_AFTER_LAST = 3,
1: +  NL80211_SCHED_SCAN_PLAN_MAX = 2,
1:  };
1:  
1:  struct nl80211_bss_select_rssi_adjust {
1: -	__u8 band;
1: -	__s8 delta;
1: +  __u8 band;
1: +  __s8 delta;
1:  };
1:  
1:  enum nl80211_nan_publish_type {
1: -	NL80211_NAN_SOLICITED_PUBLISH = 1,
1: -	NL80211_NAN_UNSOLICITED_PUBLISH = 2,
1: +  NL80211_NAN_SOLICITED_PUBLISH = 1,
1: +  NL80211_NAN_UNSOLICITED_PUBLISH = 2,
1:  };
1:  
1:  enum nl80211_nan_func_term_reason {
1: -	NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST = 0,
1: -	NL80211_NAN_FUNC_TERM_REASON_TTL_EXPIRED = 1,
1: -	NL80211_NAN_FUNC_TERM_REASON_ERROR = 2,
1: +  NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST = 0,
1: +  NL80211_NAN_FUNC_TERM_REASON_TTL_EXPIRED = 1,
1: +  NL80211_NAN_FUNC_TERM_REASON_ERROR = 2,
1:  };
1:  
1:  enum nl80211_nan_func_attributes {
1: -	__NL80211_NAN_FUNC_INVALID = 0,
1: -	NL80211_NAN_FUNC_TYPE = 1,
1: -	NL80211_NAN_FUNC_SERVICE_ID = 2,
1: -	NL80211_NAN_FUNC_PUBLISH_TYPE = 3,
1: -	NL80211_NAN_FUNC_PUBLISH_BCAST = 4,
1: -	NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE = 5,
1: -	NL80211_NAN_FUNC_FOLLOW_UP_ID = 6,
1: -	NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID = 7,
1: -	NL80211_NAN_FUNC_FOLLOW_UP_DEST = 8,
1: -	NL80211_NAN_FUNC_CLOSE_RANGE = 9,
1: -	NL80211_NAN_FUNC_TTL = 10,
1: -	NL80211_NAN_FUNC_SERVICE_INFO = 11,
1: -	NL80211_NAN_FUNC_SRF = 12,
1: -	NL80211_NAN_FUNC_RX_MATCH_FILTER = 13,
1: -	NL80211_NAN_FUNC_TX_MATCH_FILTER = 14,
1: -	NL80211_NAN_FUNC_INSTANCE_ID = 15,
1: -	NL80211_NAN_FUNC_TERM_REASON = 16,
1: -	NUM_NL80211_NAN_FUNC_ATTR = 17,
1: -	NL80211_NAN_FUNC_ATTR_MAX = 16,
1: +  __NL80211_NAN_FUNC_INVALID = 0,
1: +  NL80211_NAN_FUNC_TYPE = 1,
1: +  NL80211_NAN_FUNC_SERVICE_ID = 2,
1: +  NL80211_NAN_FUNC_PUBLISH_TYPE = 3,
1: +  NL80211_NAN_FUNC_PUBLISH_BCAST = 4,
1: +  NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE = 5,
1: +  NL80211_NAN_FUNC_FOLLOW_UP_ID = 6,
1: +  NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID = 7,
1: +  NL80211_NAN_FUNC_FOLLOW_UP_DEST = 8,
1: +  NL80211_NAN_FUNC_CLOSE_RANGE = 9,
1: +  NL80211_NAN_FUNC_TTL = 10,
1: +  NL80211_NAN_FUNC_SERVICE_INFO = 11,
1: +  NL80211_NAN_FUNC_SRF = 12,
1: +  NL80211_NAN_FUNC_RX_MATCH_FILTER = 13,
1: +  NL80211_NAN_FUNC_TX_MATCH_FILTER = 14,
1: +  NL80211_NAN_FUNC_INSTANCE_ID = 15,
1: +  NL80211_NAN_FUNC_TERM_REASON = 16,
1: +  NUM_NL80211_NAN_FUNC_ATTR = 17,
1: +  NL80211_NAN_FUNC_ATTR_MAX = 16,
1:  };
1:  
1:  enum nl80211_nan_srf_attributes {
1: -	__NL80211_NAN_SRF_INVALID = 0,
1: -	NL80211_NAN_SRF_INCLUDE = 1,
1: -	NL80211_NAN_SRF_BF = 2,
1: -	NL80211_NAN_SRF_BF_IDX = 3,
1: -	NL80211_NAN_SRF_MAC_ADDRS = 4,
1: -	NUM_NL80211_NAN_SRF_ATTR = 5,
1: -	NL80211_NAN_SRF_ATTR_MAX = 4,
1: +  __NL80211_NAN_SRF_INVALID = 0,
1: +  NL80211_NAN_SRF_INCLUDE = 1,
1: +  NL80211_NAN_SRF_BF = 2,
1: +  NL80211_NAN_SRF_BF_IDX = 3,
1: +  NL80211_NAN_SRF_MAC_ADDRS = 4,
1: +  NUM_NL80211_NAN_SRF_ATTR = 5,
1: +  NL80211_NAN_SRF_ATTR_MAX = 4,
1:  };
1:  
1:  enum nl80211_nan_match_attributes {
1: -	__NL80211_NAN_MATCH_INVALID = 0,
1: -	NL80211_NAN_MATCH_FUNC_LOCAL = 1,
1: -	NL80211_NAN_MATCH_FUNC_PEER = 2,
1: -	NUM_NL80211_NAN_MATCH_ATTR = 3,
1: -	NL80211_NAN_MATCH_ATTR_MAX = 2,
1: +  __NL80211_NAN_MATCH_INVALID = 0,
1: +  NL80211_NAN_MATCH_FUNC_LOCAL = 1,
1: +  NL80211_NAN_MATCH_FUNC_PEER = 2,
1: +  NUM_NL80211_NAN_MATCH_ATTR = 3,
1: +  NL80211_NAN_MATCH_ATTR_MAX = 2,
1:  };
1:  
1:  enum nl80211_ftm_responder_attributes {
1: -	__NL80211_FTM_RESP_ATTR_INVALID = 0,
1: -	NL80211_FTM_RESP_ATTR_ENABLED = 1,
1: -	NL80211_FTM_RESP_ATTR_LCI = 2,
1: -	NL80211_FTM_RESP_ATTR_CIVICLOC = 3,
1: -	__NL80211_FTM_RESP_ATTR_LAST = 4,
1: -	NL80211_FTM_RESP_ATTR_MAX = 3,
1: +  __NL80211_FTM_RESP_ATTR_INVALID = 0,
1: +  NL80211_FTM_RESP_ATTR_ENABLED = 1,
1: +  NL80211_FTM_RESP_ATTR_LCI = 2,
1: +  NL80211_FTM_RESP_ATTR_CIVICLOC = 3,
1: +  __NL80211_FTM_RESP_ATTR_LAST = 4,
1: +  NL80211_FTM_RESP_ATTR_MAX = 3,
1:  };
1:  
1:  enum nl80211_ftm_responder_stats {
1: -	__NL80211_FTM_STATS_INVALID = 0,
1: -	NL80211_FTM_STATS_SUCCESS_NUM = 1,
1: -	NL80211_FTM_STATS_PARTIAL_NUM = 2,
1: -	NL80211_FTM_STATS_FAILED_NUM = 3,
1: -	NL80211_FTM_STATS_ASAP_NUM = 4,
1: -	NL80211_FTM_STATS_NON_ASAP_NUM = 5,
1: -	NL80211_FTM_STATS_TOTAL_DURATION_MSEC = 6,
1: -	NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM = 7,
1: -	NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM = 8,
1: -	NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM = 9,
1: -	NL80211_FTM_STATS_PAD = 10,
1: -	__NL80211_FTM_STATS_AFTER_LAST = 11,
1: -	NL80211_FTM_STATS_MAX = 10,
1: +  __NL80211_FTM_STATS_INVALID = 0,
1: +  NL80211_FTM_STATS_SUCCESS_NUM = 1,
1: +  NL80211_FTM_STATS_PARTIAL_NUM = 2,
1: +  NL80211_FTM_STATS_FAILED_NUM = 3,
1: +  NL80211_FTM_STATS_ASAP_NUM = 4,
1: +  NL80211_FTM_STATS_NON_ASAP_NUM = 5,
1: +  NL80211_FTM_STATS_TOTAL_DURATION_MSEC = 6,
1: +  NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM = 7,
1: +  NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM = 8,
1: +  NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM = 9,
1: +  NL80211_FTM_STATS_PAD = 10,
1: +  __NL80211_FTM_STATS_AFTER_LAST = 11,
1: +  NL80211_FTM_STATS_MAX = 10,
1:  };
1:  
1:  enum nl80211_peer_measurement_type {
1: -	NL80211_PMSR_TYPE_INVALID = 0,
1: -	NL80211_PMSR_TYPE_FTM = 1,
1: -	NUM_NL80211_PMSR_TYPES = 2,
1: -	NL80211_PMSR_TYPE_MAX = 1,
1: +  NL80211_PMSR_TYPE_INVALID = 0,
1: +  NL80211_PMSR_TYPE_FTM = 1,
1: +  NUM_NL80211_PMSR_TYPES = 2,
1: +  NL80211_PMSR_TYPE_MAX = 1,
1:  };
1:  
1:  enum nl80211_peer_measurement_req {
1: -	__NL80211_PMSR_REQ_ATTR_INVALID = 0,
1: -	NL80211_PMSR_REQ_ATTR_DATA = 1,
1: -	NL80211_PMSR_REQ_ATTR_GET_AP_TSF = 2,
1: -	NUM_NL80211_PMSR_REQ_ATTRS = 3,
1: -	NL80211_PMSR_REQ_ATTR_MAX = 2,
1: +  __NL80211_PMSR_REQ_ATTR_INVALID = 0,
1: +  NL80211_PMSR_REQ_ATTR_DATA = 1,
1: +  NL80211_PMSR_REQ_ATTR_GET_AP_TSF = 2,
1: +  NUM_NL80211_PMSR_REQ_ATTRS = 3,
1: +  NL80211_PMSR_REQ_ATTR_MAX = 2,
1:  };
1:  
1:  enum nl80211_peer_measurement_peer_attrs {
1: -	__NL80211_PMSR_PEER_ATTR_INVALID = 0,
1: -	NL80211_PMSR_PEER_ATTR_ADDR = 1,
1: -	NL80211_PMSR_PEER_ATTR_CHAN = 2,
1: -	NL80211_PMSR_PEER_ATTR_REQ = 3,
1: -	NL80211_PMSR_PEER_ATTR_RESP = 4,
1: -	NUM_NL80211_PMSR_PEER_ATTRS = 5,
1: -	NL80211_PMSR_PEER_ATTR_MAX = 4,
1: +  __NL80211_PMSR_PEER_ATTR_INVALID = 0,
1: +  NL80211_PMSR_PEER_ATTR_ADDR = 1,
1: +  NL80211_PMSR_PEER_ATTR_CHAN = 2,
1: +  NL80211_PMSR_PEER_ATTR_REQ = 3,
1: +  NL80211_PMSR_PEER_ATTR_RESP = 4,
1: +  NUM_NL80211_PMSR_PEER_ATTRS = 5,
1: +  NL80211_PMSR_PEER_ATTR_MAX = 4,
1:  };
1:  
1:  enum nl80211_peer_measurement_attrs {
1: -	__NL80211_PMSR_ATTR_INVALID = 0,
1: -	NL80211_PMSR_ATTR_MAX_PEERS = 1,
1: -	NL80211_PMSR_ATTR_REPORT_AP_TSF = 2,
1: -	NL80211_PMSR_ATTR_RANDOMIZE_MAC_ADDR = 3,
1: -	NL80211_PMSR_ATTR_TYPE_CAPA = 4,
1: -	NL80211_PMSR_ATTR_PEERS = 5,
1: -	NUM_NL80211_PMSR_ATTR = 6,
1: -	NL80211_PMSR_ATTR_MAX = 5,
1: +  __NL80211_PMSR_ATTR_INVALID = 0,
1: +  NL80211_PMSR_ATTR_MAX_PEERS = 1,
1: +  NL80211_PMSR_ATTR_REPORT_AP_TSF = 2,
1: +  NL80211_PMSR_ATTR_RANDOMIZE_MAC_ADDR = 3,
1: +  NL80211_PMSR_ATTR_TYPE_CAPA = 4,
1: +  NL80211_PMSR_ATTR_PEERS = 5,
1: +  NUM_NL80211_PMSR_ATTR = 6,
1: +  NL80211_PMSR_ATTR_MAX = 5,
1:  };
1:  
1:  enum nl80211_peer_measurement_ftm_capa {
1: -	__NL80211_PMSR_FTM_CAPA_ATTR_INVALID = 0,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_ASAP = 1,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_NON_ASAP = 2,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_REQ_LCI = 3,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_REQ_CIVICLOC = 4,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_PREAMBLES = 5,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS = 6,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT = 7,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST = 8,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED = 9,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED = 10,
1: -	NUM_NL80211_PMSR_FTM_CAPA_ATTR = 11,
1: -	NL80211_PMSR_FTM_CAPA_ATTR_MAX = 10,
1: +  __NL80211_PMSR_FTM_CAPA_ATTR_INVALID = 0,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_ASAP = 1,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_NON_ASAP = 2,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_REQ_LCI = 3,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_REQ_CIVICLOC = 4,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_PREAMBLES = 5,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS = 6,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT = 7,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST = 8,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED = 9,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED = 10,
1: +  NUM_NL80211_PMSR_FTM_CAPA_ATTR = 11,
1: +  NL80211_PMSR_FTM_CAPA_ATTR_MAX = 10,
1:  };
1:  
1:  enum nl80211_peer_measurement_ftm_req {
1: -	__NL80211_PMSR_FTM_REQ_ATTR_INVALID = 0,
1: -	NL80211_PMSR_FTM_REQ_ATTR_ASAP = 1,
1: -	NL80211_PMSR_FTM_REQ_ATTR_PREAMBLE = 2,
1: -	NL80211_PMSR_FTM_REQ_ATTR_NUM_BURSTS_EXP = 3,
1: -	NL80211_PMSR_FTM_REQ_ATTR_BURST_PERIOD = 4,
1: -	NL80211_PMSR_FTM_REQ_ATTR_BURST_DURATION = 5,
1: -	NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST = 6,
1: -	NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES = 7,
1: -	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI = 8,
1: -	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC = 9,
1: -	NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED = 10,
1: -	NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED = 11,
1: -	NUM_NL80211_PMSR_FTM_REQ_ATTR = 12,
1: -	NL80211_PMSR_FTM_REQ_ATTR_MAX = 11,
1: +  __NL80211_PMSR_FTM_REQ_ATTR_INVALID = 0,
1: +  NL80211_PMSR_FTM_REQ_ATTR_ASAP = 1,
1: +  NL80211_PMSR_FTM_REQ_ATTR_PREAMBLE = 2,
1: +  NL80211_PMSR_FTM_REQ_ATTR_NUM_BURSTS_EXP = 3,
1: +  NL80211_PMSR_FTM_REQ_ATTR_BURST_PERIOD = 4,
1: +  NL80211_PMSR_FTM_REQ_ATTR_BURST_DURATION = 5,
1: +  NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST = 6,
1: +  NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES = 7,
1: +  NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI = 8,
1: +  NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC = 9,
1: +  NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED = 10,
1: +  NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED = 11,
1: +  NUM_NL80211_PMSR_FTM_REQ_ATTR = 12,
1: +  NL80211_PMSR_FTM_REQ_ATTR_MAX = 11,
1:  };
1:  
1:  enum nl80211_obss_pd_attributes {
1: -	__NL80211_HE_OBSS_PD_ATTR_INVALID = 0,
1: -	NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET = 1,
1: -	NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET = 2,
1: -	NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET = 3,
1: -	NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP = 4,
1: -	NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP = 5,
1: -	NL80211_HE_OBSS_PD_ATTR_SR_CTRL = 6,
1: -	__NL80211_HE_OBSS_PD_ATTR_LAST = 7,
1: -	NL80211_HE_OBSS_PD_ATTR_MAX = 6,
1: +  __NL80211_HE_OBSS_PD_ATTR_INVALID = 0,
1: +  NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET = 1,
1: +  NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET = 2,
1: +  NL80211_HE_OBSS_PD_ATTR_NON_SRG_MAX_OFFSET = 3,
1: +  NL80211_HE_OBSS_PD_ATTR_BSS_COLOR_BITMAP = 4,
1: +  NL80211_HE_OBSS_PD_ATTR_PARTIAL_BSSID_BITMAP = 5,
1: +  NL80211_HE_OBSS_PD_ATTR_SR_CTRL = 6,
1: +  __NL80211_HE_OBSS_PD_ATTR_LAST = 7,
1: +  NL80211_HE_OBSS_PD_ATTR_MAX = 6,
1:  };
1:  
1:  enum nl80211_bss_color_attributes {
1: -	__NL80211_HE_BSS_COLOR_ATTR_INVALID = 0,
1: -	NL80211_HE_BSS_COLOR_ATTR_COLOR = 1,
1: -	NL80211_HE_BSS_COLOR_ATTR_DISABLED = 2,
1: -	NL80211_HE_BSS_COLOR_ATTR_PARTIAL = 3,
1: -	__NL80211_HE_BSS_COLOR_ATTR_LAST = 4,
1: -	NL80211_HE_BSS_COLOR_ATTR_MAX = 3,
1: +  __NL80211_HE_BSS_COLOR_ATTR_INVALID = 0,
1: +  NL80211_HE_BSS_COLOR_ATTR_COLOR = 1,
1: +  NL80211_HE_BSS_COLOR_ATTR_DISABLED = 2,
1: +  NL80211_HE_BSS_COLOR_ATTR_PARTIAL = 3,
1: +  __NL80211_HE_BSS_COLOR_ATTR_LAST = 4,
1: +  NL80211_HE_BSS_COLOR_ATTR_MAX = 3,
1:  };
1:  
1:  enum nl80211_iftype_akm_attributes {
1: -	__NL80211_IFTYPE_AKM_ATTR_INVALID = 0,
1: -	NL80211_IFTYPE_AKM_ATTR_IFTYPES = 1,
1: -	NL80211_IFTYPE_AKM_ATTR_SUITES = 2,
1: -	__NL80211_IFTYPE_AKM_ATTR_LAST = 3,
1: -	NL80211_IFTYPE_AKM_ATTR_MAX = 2,
1: +  __NL80211_IFTYPE_AKM_ATTR_INVALID = 0,
1: +  NL80211_IFTYPE_AKM_ATTR_IFTYPES = 1,
1: +  NL80211_IFTYPE_AKM_ATTR_SUITES = 2,
1: +  __NL80211_IFTYPE_AKM_ATTR_LAST = 3,
1: +  NL80211_IFTYPE_AKM_ATTR_MAX = 2,
1:  };
1:  
1:  enum nl80211_fils_discovery_attributes {
1: -	__NL80211_FILS_DISCOVERY_ATTR_INVALID = 0,
1: -	NL80211_FILS_DISCOVERY_ATTR_INT_MIN = 1,
1: -	NL80211_FILS_DISCOVERY_ATTR_INT_MAX = 2,
1: -	NL80211_FILS_DISCOVERY_ATTR_TMPL = 3,
1: -	__NL80211_FILS_DISCOVERY_ATTR_LAST = 4,
1: -	NL80211_FILS_DISCOVERY_ATTR_MAX = 3,
1: +  __NL80211_FILS_DISCOVERY_ATTR_INVALID = 0,
1: +  NL80211_FILS_DISCOVERY_ATTR_INT_MIN = 1,
1: +  NL80211_FILS_DISCOVERY_ATTR_INT_MAX = 2,
1: +  NL80211_FILS_DISCOVERY_ATTR_TMPL = 3,
1: +  __NL80211_FILS_DISCOVERY_ATTR_LAST = 4,
1: +  NL80211_FILS_DISCOVERY_ATTR_MAX = 3,
1:  };
1:  
1:  enum nl80211_unsol_bcast_probe_resp_attributes {
1: -	__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INVALID = 0,
1: -	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT = 1,
1: -	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL = 2,
1: -	__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_LAST = 3,
1: -	NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX = 2,
1: +  __NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INVALID = 0,
1: +  NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT = 1,
1: +  NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL = 2,
1: +  __NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_LAST = 3,
1: +  NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX = 2,
1:  };
1:  
1:  enum survey_info_flags {
1: -	SURVEY_INFO_NOISE_DBM = 1,
1: -	SURVEY_INFO_IN_USE = 2,
1: -	SURVEY_INFO_TIME = 4,
1: -	SURVEY_INFO_TIME_BUSY = 8,
1: -	SURVEY_INFO_TIME_EXT_BUSY = 16,
1: -	SURVEY_INFO_TIME_RX = 32,
1: -	SURVEY_INFO_TIME_TX = 64,
1: -	SURVEY_INFO_TIME_SCAN = 128,
1: -	SURVEY_INFO_TIME_BSS_RX = 256,
1: +  SURVEY_INFO_NOISE_DBM = 1,
1: +  SURVEY_INFO_IN_USE = 2,
1: +  SURVEY_INFO_TIME = 4,
1: +  SURVEY_INFO_TIME_BUSY = 8,
1: +  SURVEY_INFO_TIME_EXT_BUSY = 16,
1: +  SURVEY_INFO_TIME_RX = 32,
1: +  SURVEY_INFO_TIME_TX = 64,
1: +  SURVEY_INFO_TIME_SCAN = 128,
1: +  SURVEY_INFO_TIME_BSS_RX = 256,
1:  };
1:  
1:  enum cfg80211_ap_settings_flags {
1: -	AP_SETTINGS_EXTERNAL_AUTH_SUPPORT = 1,
1: +  AP_SETTINGS_EXTERNAL_AUTH_SUPPORT = 1,
1:  };
1:  
1:  enum station_parameters_apply_mask {
1: -	STATION_PARAM_APPLY_UAPSD = 1,
1: -	STATION_PARAM_APPLY_CAPABILITY = 2,
1: -	STATION_PARAM_APPLY_PLINK_STATE = 4,
1: -	STATION_PARAM_APPLY_STA_TXPOWER = 8,
1: +  STATION_PARAM_APPLY_UAPSD = 1,
1: +  STATION_PARAM_APPLY_CAPABILITY = 2,
1: +  STATION_PARAM_APPLY_PLINK_STATE = 4,
1: +  STATION_PARAM_APPLY_STA_TXPOWER = 8,
1:  };
1:  
1:  enum cfg80211_station_type {
1: -	CFG80211_STA_AP_CLIENT = 0,
1: -	CFG80211_STA_AP_CLIENT_UNASSOC = 1,
1: -	CFG80211_STA_AP_MLME_CLIENT = 2,
1: -	CFG80211_STA_AP_STA = 3,
1: -	CFG80211_STA_IBSS = 4,
1: -	CFG80211_STA_TDLS_PEER_SETUP = 5,
1: -	CFG80211_STA_TDLS_PEER_ACTIVE = 6,
1: -	CFG80211_STA_MESH_PEER_KERNEL = 7,
1: -	CFG80211_STA_MESH_PEER_USER = 8,
1: +  CFG80211_STA_AP_CLIENT = 0,
1: +  CFG80211_STA_AP_CLIENT_UNASSOC = 1,
1: +  CFG80211_STA_AP_MLME_CLIENT = 2,
1: +  CFG80211_STA_AP_STA = 3,
1: +  CFG80211_STA_IBSS = 4,
1: +  CFG80211_STA_TDLS_PEER_SETUP = 5,
1: +  CFG80211_STA_TDLS_PEER_ACTIVE = 6,
1: +  CFG80211_STA_MESH_PEER_KERNEL = 7,
1: +  CFG80211_STA_MESH_PEER_USER = 8,
1:  };
1:  
1:  enum bss_param_flags {
1: -	BSS_PARAM_FLAGS_CTS_PROT = 1,
1: -	BSS_PARAM_FLAGS_SHORT_PREAMBLE = 2,
1: -	BSS_PARAM_FLAGS_SHORT_SLOT_TIME = 4,
1: +  BSS_PARAM_FLAGS_CTS_PROT = 1,
1: +  BSS_PARAM_FLAGS_SHORT_PREAMBLE = 2,
1: +  BSS_PARAM_FLAGS_SHORT_SLOT_TIME = 4,
1:  };
1:  
1:  enum monitor_flags {
1: -	MONITOR_FLAG_CHANGED = 1,
1: -	MONITOR_FLAG_FCSFAIL = 2,
1: -	MONITOR_FLAG_PLCPFAIL = 4,
1: -	MONITOR_FLAG_CONTROL = 8,
1: -	MONITOR_FLAG_OTHER_BSS = 16,
1: -	MONITOR_FLAG_COOK_FRAMES = 32,
1: -	MONITOR_FLAG_ACTIVE = 64,
1: +  MONITOR_FLAG_CHANGED = 1,
1: +  MONITOR_FLAG_FCSFAIL = 2,
1: +  MONITOR_FLAG_PLCPFAIL = 4,
1: +  MONITOR_FLAG_CONTROL = 8,
1: +  MONITOR_FLAG_OTHER_BSS = 16,
1: +  MONITOR_FLAG_COOK_FRAMES = 32,
1: +  MONITOR_FLAG_ACTIVE = 64,
1:  };
1:  
1:  enum mpath_info_flags {
1: -	MPATH_INFO_FRAME_QLEN = 1,
1: -	MPATH_INFO_SN = 2,
1: -	MPATH_INFO_METRIC = 4,
1: -	MPATH_INFO_EXPTIME = 8,
1: -	MPATH_INFO_DISCOVERY_TIMEOUT = 16,
1: -	MPATH_INFO_DISCOVERY_RETRIES = 32,
1: -	MPATH_INFO_FLAGS = 64,
1: -	MPATH_INFO_HOP_COUNT = 128,
1: -	MPATH_INFO_PATH_CHANGE = 256,
1: +  MPATH_INFO_FRAME_QLEN = 1,
1: +  MPATH_INFO_SN = 2,
1: +  MPATH_INFO_METRIC = 4,
1: +  MPATH_INFO_EXPTIME = 8,
1: +  MPATH_INFO_DISCOVERY_TIMEOUT = 16,
1: +  MPATH_INFO_DISCOVERY_RETRIES = 32,
1: +  MPATH_INFO_FLAGS = 64,
1: +  MPATH_INFO_HOP_COUNT = 128,
1: +  MPATH_INFO_PATH_CHANGE = 256,
1:  };
1:  
1:  enum cfg80211_assoc_req_flags {
1: -	ASSOC_REQ_DISABLE_HT = 1,
1: -	ASSOC_REQ_DISABLE_VHT = 2,
1: -	ASSOC_REQ_USE_RRM = 4,
1: -	CONNECT_REQ_EXTERNAL_AUTH_SUPPORT = 8,
1: +  ASSOC_REQ_DISABLE_HT = 1,
1: +  ASSOC_REQ_DISABLE_VHT = 2,
1: +  ASSOC_REQ_USE_RRM = 4,
1: +  CONNECT_REQ_EXTERNAL_AUTH_SUPPORT = 8,
1:  };
1:  
1:  enum cfg80211_connect_params_changed {
1: -	UPDATE_ASSOC_IES = 1,
1: -	UPDATE_FILS_ERP_INFO = 2,
1: -	UPDATE_AUTH_TYPE = 4,
1: +  UPDATE_ASSOC_IES = 1,
1: +  UPDATE_FILS_ERP_INFO = 2,
1: +  UPDATE_AUTH_TYPE = 4,
1:  };
1:  
1:  enum wiphy_params_flags {
1: -	WIPHY_PARAM_RETRY_SHORT = 1,
1: -	WIPHY_PARAM_RETRY_LONG = 2,
1: -	WIPHY_PARAM_FRAG_THRESHOLD = 4,
1: -	WIPHY_PARAM_RTS_THRESHOLD = 8,
1: -	WIPHY_PARAM_COVERAGE_CLASS = 16,
1: -	WIPHY_PARAM_DYN_ACK = 32,
1: -	WIPHY_PARAM_TXQ_LIMIT = 64,
1: -	WIPHY_PARAM_TXQ_MEMORY_LIMIT = 128,
1: -	WIPHY_PARAM_TXQ_QUANTUM = 256,
1: +  WIPHY_PARAM_RETRY_SHORT = 1,
1: +  WIPHY_PARAM_RETRY_LONG = 2,
1: +  WIPHY_PARAM_FRAG_THRESHOLD = 4,
1: +  WIPHY_PARAM_RTS_THRESHOLD = 8,
1: +  WIPHY_PARAM_COVERAGE_CLASS = 16,
1: +  WIPHY_PARAM_DYN_ACK = 32,
1: +  WIPHY_PARAM_TXQ_LIMIT = 64,
1: +  WIPHY_PARAM_TXQ_MEMORY_LIMIT = 128,
1: +  WIPHY_PARAM_TXQ_QUANTUM = 256,
1:  };
1:  
1:  struct cfg80211_wowlan_nd_match {
1: -	struct cfg80211_ssid ssid;
1: -	int n_channels;
1: -	u32 channels[0];
1: +  struct cfg80211_ssid ssid;
1: +  int n_channels;
1: +  u32 channels[0];
1:  };
1:  
1:  struct cfg80211_wowlan_nd_info {
1: -	int n_matches;
1: -	struct cfg80211_wowlan_nd_match *matches[0];
1: +  int n_matches;
1: +  struct cfg80211_wowlan_nd_match *matches[0];
1:  };
1:  
1:  struct cfg80211_wowlan_wakeup {
1: -	bool disconnect;
1: -	bool magic_pkt;
1: -	bool gtk_rekey_failure;
1: -	bool eap_identity_req;
1: -	bool four_way_handshake;
1: -	bool rfkill_release;
1: -	bool packet_80211;
1: -	bool tcp_match;
1: -	bool tcp_connlost;
1: -	bool tcp_nomoretokens;
1: -	s32 pattern_idx;
1: -	u32 packet_present_len;
1: -	u32 packet_len;
1: -	const void *packet;
1: -	struct cfg80211_wowlan_nd_info *net_detect;
1: +  bool disconnect;
1: +  bool magic_pkt;
1: +  bool gtk_rekey_failure;
1: +  bool eap_identity_req;
1: +  bool four_way_handshake;
1: +  bool rfkill_release;
1: +  bool packet_80211;
1: +  bool tcp_match;
1: +  bool tcp_connlost;
1: +  bool tcp_nomoretokens;
1: +  s32 pattern_idx;
1: +  u32 packet_present_len;
1: +  u32 packet_len;
1: +  const void *packet;
1: +  struct cfg80211_wowlan_nd_info *net_detect;
1:  };
1:  
1:  enum cfg80211_nan_conf_changes {
1: -	CFG80211_NAN_CONF_CHANGED_PREF = 1,
1: -	CFG80211_NAN_CONF_CHANGED_BANDS = 2,
1: +  CFG80211_NAN_CONF_CHANGED_PREF = 1,
1: +  CFG80211_NAN_CONF_CHANGED_BANDS = 2,
1:  };
1:  
1:  enum wiphy_vendor_command_flags {
1: -	WIPHY_VENDOR_CMD_NEED_WDEV = 1,
1: -	WIPHY_VENDOR_CMD_NEED_NETDEV = 2,
1: -	WIPHY_VENDOR_CMD_NEED_RUNNING = 4,
1: +  WIPHY_VENDOR_CMD_NEED_WDEV = 1,
1: +  WIPHY_VENDOR_CMD_NEED_NETDEV = 2,
1: +  WIPHY_VENDOR_CMD_NEED_RUNNING = 4,
1:  };
1:  
1:  enum wiphy_opmode_flag {
1: -	STA_OPMODE_MAX_BW_CHANGED = 1,
1: -	STA_OPMODE_SMPS_MODE_CHANGED = 2,
1: -	STA_OPMODE_N_SS_CHANGED = 4,
1: +  STA_OPMODE_MAX_BW_CHANGED = 1,
1: +  STA_OPMODE_SMPS_MODE_CHANGED = 2,
1: +  STA_OPMODE_N_SS_CHANGED = 4,
1:  };
1:  
1:  struct sta_opmode_info {
1: -	u32 changed;
1: -	enum nl80211_smps_mode smps_mode;
1: -	enum nl80211_chan_width bw;
1: -	u8 rx_nss;
1: +  u32 changed;
1: +  enum nl80211_smps_mode smps_mode;
1: +  enum nl80211_chan_width bw;
1: +  u8 rx_nss;
1:  };
1:  
1:  struct cfg80211_ft_event_params {
1: -	const u8 *ies;
1: -	size_t ies_len;
1: -	const u8 *target_ap;
1: -	const u8 *ric_ies;
1: -	size_t ric_ies_len;
1: +  const u8 *ies;
1: +  size_t ies_len;
1: +  const u8 *target_ap;
1: +  const u8 *ric_ies;
1: +  size_t ric_ies_len;
1:  };
1:  
1:  struct cfg80211_nan_match_params {
1: -	enum nl80211_nan_function_type type;
1: -	u8 inst_id;
1: -	u8 peer_inst_id;
1: -	const u8 *addr;
1: -	u8 info_len;
1: -	const u8 *info;
1: -	u64 cookie;
1: +  enum nl80211_nan_function_type type;
1: +  u8 inst_id;
1: +  u8 peer_inst_id;
1: +  const u8 *addr;
1: +  u8 info_len;
1: +  const u8 *info;
1: +  u64 cookie;
1:  };
1:  
1:  enum nl80211_multicast_groups {
1: -	NL80211_MCGRP_CONFIG = 0,
1: -	NL80211_MCGRP_SCAN = 1,
1: -	NL80211_MCGRP_REGULATORY = 2,
1: -	NL80211_MCGRP_MLME = 3,
1: -	NL80211_MCGRP_VENDOR = 4,
1: -	NL80211_MCGRP_NAN = 5,
1: -	NL80211_MCGRP_TESTMODE = 6,
1: +  NL80211_MCGRP_CONFIG = 0,
1: +  NL80211_MCGRP_SCAN = 1,
1: +  NL80211_MCGRP_REGULATORY = 2,
1: +  NL80211_MCGRP_MLME = 3,
1: +  NL80211_MCGRP_VENDOR = 4,
1: +  NL80211_MCGRP_NAN = 5,
1: +  NL80211_MCGRP_TESTMODE = 6,
1:  };
1:  
1:  struct key_parse {
1: -	struct key_params p;
1: -	int idx;
1: -	int type;
1: -	bool def;
1: -	bool defmgmt;
1: -	bool defbeacon;
1: -	bool def_uni;
1: -	bool def_multi;
1: +  struct key_params p;
1: +  int idx;
1: +  int type;
1: +  bool def;
1: +  bool defmgmt;
1: +  bool defbeacon;
1: +  bool def_uni;
1: +  bool def_multi;
1:  };
1:  
1:  struct nl80211_dump_wiphy_state {
1: -	s64 filter_wiphy;
1: -	long int start;
1: -	long int split_start;
1: -	long int band_start;
1: -	long int chan_start;
1: -	long int capa_start;
1: -	bool split;
1: +  s64 filter_wiphy;
1: +  long int start;
1: +  long int split_start;
1: +  long int band_start;
1: +  long int chan_start;
1: +  long int capa_start;
1: +  bool split;
1:  };
1:  
1:  struct get_key_cookie {
1: -	struct sk_buff *msg;
1: -	int error;
1: -	int idx;
1: +  struct sk_buff *msg;
1: +  int error;
1: +  int idx;
1:  };
1:  
1:  enum ieee80211_category {
1: -	WLAN_CATEGORY_SPECTRUM_MGMT = 0,
1: -	WLAN_CATEGORY_QOS = 1,
1: -	WLAN_CATEGORY_DLS = 2,
1: -	WLAN_CATEGORY_BACK = 3,
1: -	WLAN_CATEGORY_PUBLIC = 4,
1: -	WLAN_CATEGORY_RADIO_MEASUREMENT = 5,
1: -	WLAN_CATEGORY_HT = 7,
1: -	WLAN_CATEGORY_SA_QUERY = 8,
1: -	WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9,
1: -	WLAN_CATEGORY_WNM = 10,
1: -	WLAN_CATEGORY_WNM_UNPROTECTED = 11,
1: -	WLAN_CATEGORY_TDLS = 12,
1: -	WLAN_CATEGORY_MESH_ACTION = 13,
1: -	WLAN_CATEGORY_MULTIHOP_ACTION = 14,
1: -	WLAN_CATEGORY_SELF_PROTECTED = 15,
1: -	WLAN_CATEGORY_DMG = 16,
1: -	WLAN_CATEGORY_WMM = 17,
1: -	WLAN_CATEGORY_FST = 18,
1: -	WLAN_CATEGORY_UNPROT_DMG = 20,
1: -	WLAN_CATEGORY_VHT = 21,
1: -	WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,
1: -	WLAN_CATEGORY_VENDOR_SPECIFIC = 127,
1: +  WLAN_CATEGORY_SPECTRUM_MGMT = 0,
1: +  WLAN_CATEGORY_QOS = 1,
1: +  WLAN_CATEGORY_DLS = 2,
1: +  WLAN_CATEGORY_BACK = 3,
1: +  WLAN_CATEGORY_PUBLIC = 4,
1: +  WLAN_CATEGORY_RADIO_MEASUREMENT = 5,
1: +  WLAN_CATEGORY_HT = 7,
1: +  WLAN_CATEGORY_SA_QUERY = 8,
1: +  WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9,
1: +  WLAN_CATEGORY_WNM = 10,
1: +  WLAN_CATEGORY_WNM_UNPROTECTED = 11,
1: +  WLAN_CATEGORY_TDLS = 12,
1: +  WLAN_CATEGORY_MESH_ACTION = 13,
1: +  WLAN_CATEGORY_MULTIHOP_ACTION = 14,
1: +  WLAN_CATEGORY_SELF_PROTECTED = 15,
1: +  WLAN_CATEGORY_DMG = 16,
1: +  WLAN_CATEGORY_WMM = 17,
1: +  WLAN_CATEGORY_FST = 18,
1: +  WLAN_CATEGORY_UNPROT_DMG = 20,
1: +  WLAN_CATEGORY_VHT = 21,
1: +  WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,
1: +  WLAN_CATEGORY_VENDOR_SPECIFIC = 127,
1:  };
1:  
1:  struct cfg80211_mgmt_registration {
1: -	struct list_head list;
1: -	struct wireless_dev *wdev;
1: -	u32 nlportid;
1: -	int match_len;
1: -	__le16 frame_type;
1: -	bool multicast_rx;
1: -	u8 match[0];
1: +  struct list_head list;
1: +  struct wireless_dev *wdev;
1: +  u32 nlportid;
1: +  int match_len;
1: +  __le16 frame_type;
1: +  bool multicast_rx;
1: +  u8 match[0];
1:  };
1:  
1:  struct cfg80211_conn {
1: -	struct cfg80211_connect_params params;
1: -	enum {
1: -		CFG80211_CONN_SCANNING = 0,
1: -		CFG80211_CONN_SCAN_AGAIN = 1,
1: -		CFG80211_CONN_AUTHENTICATE_NEXT = 2,
1: -		CFG80211_CONN_AUTHENTICATING = 3,
1: -		CFG80211_CONN_AUTH_FAILED_TIMEOUT = 4,
1: -		CFG80211_CONN_ASSOCIATE_NEXT = 5,
1: -		CFG80211_CONN_ASSOCIATING = 6,
1: -		CFG80211_CONN_ASSOC_FAILED = 7,
1: -		CFG80211_CONN_ASSOC_FAILED_TIMEOUT = 8,
1: -		CFG80211_CONN_DEAUTH = 9,
1: -		CFG80211_CONN_ABANDON = 10,
1: -		CFG80211_CONN_CONNECTED = 11,
1: -	} state;
1: -	u8 bssid[6];
1: -	u8 prev_bssid[6];
1: -	const u8 *ie;
1: -	size_t ie_len;
1: -	bool auto_auth;
1: -	bool prev_bssid_valid;
1: +  struct cfg80211_connect_params params;
1: +  enum {
1: +    CFG80211_CONN_SCANNING = 0,
1: +    CFG80211_CONN_SCAN_AGAIN = 1,
1: +    CFG80211_CONN_AUTHENTICATE_NEXT = 2,
1: +    CFG80211_CONN_AUTHENTICATING = 3,
1: +    CFG80211_CONN_AUTH_FAILED_TIMEOUT = 4,
1: +    CFG80211_CONN_ASSOCIATE_NEXT = 5,
1: +    CFG80211_CONN_ASSOCIATING = 6,
1: +    CFG80211_CONN_ASSOC_FAILED = 7,
1: +    CFG80211_CONN_ASSOC_FAILED_TIMEOUT = 8,
1: +    CFG80211_CONN_DEAUTH = 9,
1: +    CFG80211_CONN_ABANDON = 10,
1: +    CFG80211_CONN_CONNECTED = 11,
1: +  } state;
1: +  u8 bssid[6];
1: +  u8 prev_bssid[6];
1: +  const u8 *ie;
1: +  size_t ie_len;
1: +  bool auto_auth;
1: +  bool prev_bssid_valid;
1:  };
1:  
1:  enum cfg80211_chan_mode {
1: -	CHAN_MODE_UNDEFINED = 0,
1: -	CHAN_MODE_SHARED = 1,
1: -	CHAN_MODE_EXCLUSIVE = 2,
1: +  CHAN_MODE_UNDEFINED = 0,
1: +  CHAN_MODE_SHARED = 1,
1: +  CHAN_MODE_EXCLUSIVE = 2,
1:  };
1:  
1:  struct trace_event_raw_rdev_suspend {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	bool any;
1: -	bool disconnect;
1: -	bool magic_pkt;
1: -	bool gtk_rekey_failure;
1: -	bool eap_identity_req;
1: -	bool four_way_handshake;
1: -	bool rfkill_release;
1: -	bool valid_wow;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  bool any;
1: +  bool disconnect;
1: +  bool magic_pkt;
1: +  bool gtk_rekey_failure;
1: +  bool eap_identity_req;
1: +  bool four_way_handshake;
1: +  bool rfkill_release;
1: +  bool valid_wow;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_scan {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_only_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_enabled_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	bool enabled;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  bool enabled;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_add_virtual_intf {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 __data_loc_vir_intf_name;
1: -	enum nl80211_iftype type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 __data_loc_vir_intf_name;
1: +  enum nl80211_iftype type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_wdev_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_wdev_cookie_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_change_virtual_intf {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_iftype type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_iftype type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_key_handle {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 mac_addr[6];
1: -	u8 key_index;
1: -	bool pairwise;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 mac_addr[6];
1: +  u8 key_index;
1: +  bool pairwise;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_add_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 mac_addr[6];
1: -	u8 key_index;
1: -	bool pairwise;
1: -	u8 mode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 mac_addr[6];
1: +  u8 key_index;
1: +  bool pairwise;
1: +  u8 mode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_default_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 key_index;
1: -	bool unicast;
1: -	bool multicast;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 key_index;
1: +  bool unicast;
1: +  bool multicast;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_default_mgmt_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 key_index;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 key_index;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_default_beacon_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 key_index;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 key_index;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_start_ap {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	int beacon_interval;
1: -	int dtim_period;
1: -	char ssid[33];
1: -	enum nl80211_hidden_ssid hidden_ssid;
1: -	u32 wpa_ver;
1: -	bool privacy;
1: -	enum nl80211_auth_type auth_type;
1: -	int inactivity_timeout;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  int beacon_interval;
1: +  int dtim_period;
1: +  char ssid[33];
1: +  enum nl80211_hidden_ssid hidden_ssid;
1: +  u32 wpa_ver;
1: +  bool privacy;
1: +  enum nl80211_auth_type auth_type;
1: +  int inactivity_timeout;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_change_beacon {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u32 __data_loc_head;
1: -	u32 __data_loc_tail;
1: -	u32 __data_loc_beacon_ies;
1: -	u32 __data_loc_proberesp_ies;
1: -	u32 __data_loc_assocresp_ies;
1: -	u32 __data_loc_probe_resp;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u32 __data_loc_head;
1: +  u32 __data_loc_tail;
1: +  u32 __data_loc_beacon_ies;
1: +  u32 __data_loc_proberesp_ies;
1: +  u32 __data_loc_assocresp_ies;
1: +  u32 __data_loc_probe_resp;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_netdev_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_station_add_change {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 sta_mac[6];
1: -	u32 sta_flags_mask;
1: -	u32 sta_flags_set;
1: -	u32 sta_modify_mask;
1: -	int listen_interval;
1: -	u16 capability;
1: -	u16 aid;
1: -	u8 plink_action;
1: -	u8 plink_state;
1: -	u8 uapsd_queues;
1: -	u8 max_sp;
1: -	u8 opmode_notif;
1: -	bool opmode_notif_used;
1: -	u8 ht_capa[26];
1: -	u8 vht_capa[12];
1: -	char vlan[16];
1: -	u32 __data_loc_supported_rates;
1: -	u32 __data_loc_ext_capab;
1: -	u32 __data_loc_supported_channels;
1: -	u32 __data_loc_supported_oper_classes;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 sta_mac[6];
1: +  u32 sta_flags_mask;
1: +  u32 sta_flags_set;
1: +  u32 sta_modify_mask;
1: +  int listen_interval;
1: +  u16 capability;
1: +  u16 aid;
1: +  u8 plink_action;
1: +  u8 plink_state;
1: +  u8 uapsd_queues;
1: +  u8 max_sp;
1: +  u8 opmode_notif;
1: +  bool opmode_notif_used;
1: +  u8 ht_capa[26];
1: +  u8 vht_capa[12];
1: +  char vlan[16];
1: +  u32 __data_loc_supported_rates;
1: +  u32 __data_loc_ext_capab;
1: +  u32 __data_loc_supported_channels;
1: +  u32 __data_loc_supported_oper_classes;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_netdev_mac_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 sta_mac[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 sta_mac[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_station_del {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 sta_mac[6];
1: -	u8 subtype;
1: -	u16 reason_code;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 sta_mac[6];
1: +  u8 subtype;
1: +  u16 reason_code;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_dump_station {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 sta_mac[6];
1: -	int idx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 sta_mac[6];
1: +  int idx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_station_info {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	int generation;
1: -	u32 connected_time;
1: -	u32 inactive_time;
1: -	u32 rx_bytes;
1: -	u32 tx_bytes;
1: -	u32 rx_packets;
1: -	u32 tx_packets;
1: -	u32 tx_retries;
1: -	u32 tx_failed;
1: -	u32 rx_dropped_misc;
1: -	u32 beacon_loss_count;
1: -	u16 llid;
1: -	u16 plid;
1: -	u8 plink_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  int generation;
1: +  u32 connected_time;
1: +  u32 inactive_time;
1: +  u32 rx_bytes;
1: +  u32 tx_bytes;
1: +  u32 rx_packets;
1: +  u32 tx_packets;
1: +  u32 tx_retries;
1: +  u32 tx_failed;
1: +  u32 rx_dropped_misc;
1: +  u32 beacon_loss_count;
1: +  u16 llid;
1: +  u16 plid;
1: +  u8 plink_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_mpath_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 dst[6];
1: -	u8 next_hop[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 dst[6];
1: +  u8 next_hop[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_dump_mpath {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 dst[6];
1: -	u8 next_hop[6];
1: -	int idx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 dst[6];
1: +  u8 next_hop[6];
1: +  int idx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_get_mpp {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 dst[6];
1: -	u8 mpp[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 dst[6];
1: +  u8 mpp[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_dump_mpp {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 dst[6];
1: -	u8 mpp[6];
1: -	int idx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 dst[6];
1: +  u8 mpp[6];
1: +  int idx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_mpath_info {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	int generation;
1: -	u32 filled;
1: -	u32 frame_qlen;
1: -	u32 sn;
1: -	u32 metric;
1: -	u32 exptime;
1: -	u32 discovery_timeout;
1: -	u8 discovery_retries;
1: -	u8 flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  int generation;
1: +  u32 filled;
1: +  u32 frame_qlen;
1: +  u32 sn;
1: +  u32 metric;
1: +  u32 exptime;
1: +  u32 discovery_timeout;
1: +  u8 discovery_retries;
1: +  u8 flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_mesh_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u16 dot11MeshRetryTimeout;
1: -	u16 dot11MeshConfirmTimeout;
1: -	u16 dot11MeshHoldingTimeout;
1: -	u16 dot11MeshMaxPeerLinks;
1: -	u8 dot11MeshMaxRetries;
1: -	u8 dot11MeshTTL;
1: -	u8 element_ttl;
1: -	bool auto_open_plinks;
1: -	u32 dot11MeshNbrOffsetMaxNeighbor;
1: -	u8 dot11MeshHWMPmaxPREQretries;
1: -	u32 path_refresh_time;
1: -	u32 dot11MeshHWMPactivePathTimeout;
1: -	u16 min_discovery_timeout;
1: -	u16 dot11MeshHWMPpreqMinInterval;
1: -	u16 dot11MeshHWMPperrMinInterval;
1: -	u16 dot11MeshHWMPnetDiameterTraversalTime;
1: -	u8 dot11MeshHWMPRootMode;
1: -	u16 dot11MeshHWMPRannInterval;
1: -	bool dot11MeshGateAnnouncementProtocol;
1: -	bool dot11MeshForwarding;
1: -	s32 rssi_threshold;
1: -	u16 ht_opmode;
1: -	u32 dot11MeshHWMPactivePathToRootTimeout;
1: -	u16 dot11MeshHWMProotInterval;
1: -	u16 dot11MeshHWMPconfirmationInterval;
1: -	bool dot11MeshNolearn;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u16 dot11MeshRetryTimeout;
1: +  u16 dot11MeshConfirmTimeout;
1: +  u16 dot11MeshHoldingTimeout;
1: +  u16 dot11MeshMaxPeerLinks;
1: +  u8 dot11MeshMaxRetries;
1: +  u8 dot11MeshTTL;
1: +  u8 element_ttl;
1: +  bool auto_open_plinks;
1: +  u32 dot11MeshNbrOffsetMaxNeighbor;
1: +  u8 dot11MeshHWMPmaxPREQretries;
1: +  u32 path_refresh_time;
1: +  u32 dot11MeshHWMPactivePathTimeout;
1: +  u16 min_discovery_timeout;
1: +  u16 dot11MeshHWMPpreqMinInterval;
1: +  u16 dot11MeshHWMPperrMinInterval;
1: +  u16 dot11MeshHWMPnetDiameterTraversalTime;
1: +  u8 dot11MeshHWMPRootMode;
1: +  u16 dot11MeshHWMPRannInterval;
1: +  bool dot11MeshGateAnnouncementProtocol;
1: +  bool dot11MeshForwarding;
1: +  s32 rssi_threshold;
1: +  u16 ht_opmode;
1: +  u32 dot11MeshHWMPactivePathToRootTimeout;
1: +  u16 dot11MeshHWMProotInterval;
1: +  u16 dot11MeshHWMPconfirmationInterval;
1: +  bool dot11MeshNolearn;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_update_mesh_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u16 dot11MeshRetryTimeout;
1: -	u16 dot11MeshConfirmTimeout;
1: -	u16 dot11MeshHoldingTimeout;
1: -	u16 dot11MeshMaxPeerLinks;
1: -	u8 dot11MeshMaxRetries;
1: -	u8 dot11MeshTTL;
1: -	u8 element_ttl;
1: -	bool auto_open_plinks;
1: -	u32 dot11MeshNbrOffsetMaxNeighbor;
1: -	u8 dot11MeshHWMPmaxPREQretries;
1: -	u32 path_refresh_time;
1: -	u32 dot11MeshHWMPactivePathTimeout;
1: -	u16 min_discovery_timeout;
1: -	u16 dot11MeshHWMPpreqMinInterval;
1: -	u16 dot11MeshHWMPperrMinInterval;
1: -	u16 dot11MeshHWMPnetDiameterTraversalTime;
1: -	u8 dot11MeshHWMPRootMode;
1: -	u16 dot11MeshHWMPRannInterval;
1: -	bool dot11MeshGateAnnouncementProtocol;
1: -	bool dot11MeshForwarding;
1: -	s32 rssi_threshold;
1: -	u16 ht_opmode;
1: -	u32 dot11MeshHWMPactivePathToRootTimeout;
1: -	u16 dot11MeshHWMProotInterval;
1: -	u16 dot11MeshHWMPconfirmationInterval;
1: -	bool dot11MeshNolearn;
1: -	u32 mask;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u16 dot11MeshRetryTimeout;
1: +  u16 dot11MeshConfirmTimeout;
1: +  u16 dot11MeshHoldingTimeout;
1: +  u16 dot11MeshMaxPeerLinks;
1: +  u8 dot11MeshMaxRetries;
1: +  u8 dot11MeshTTL;
1: +  u8 element_ttl;
1: +  bool auto_open_plinks;
1: +  u32 dot11MeshNbrOffsetMaxNeighbor;
1: +  u8 dot11MeshHWMPmaxPREQretries;
1: +  u32 path_refresh_time;
1: +  u32 dot11MeshHWMPactivePathTimeout;
1: +  u16 min_discovery_timeout;
1: +  u16 dot11MeshHWMPpreqMinInterval;
1: +  u16 dot11MeshHWMPperrMinInterval;
1: +  u16 dot11MeshHWMPnetDiameterTraversalTime;
1: +  u8 dot11MeshHWMPRootMode;
1: +  u16 dot11MeshHWMPRannInterval;
1: +  bool dot11MeshGateAnnouncementProtocol;
1: +  bool dot11MeshForwarding;
1: +  s32 rssi_threshold;
1: +  u16 ht_opmode;
1: +  u32 dot11MeshHWMPactivePathToRootTimeout;
1: +  u16 dot11MeshHWMProotInterval;
1: +  u16 dot11MeshHWMPconfirmationInterval;
1: +  bool dot11MeshNolearn;
1: +  u32 mask;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_join_mesh {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u16 dot11MeshRetryTimeout;
1: -	u16 dot11MeshConfirmTimeout;
1: -	u16 dot11MeshHoldingTimeout;
1: -	u16 dot11MeshMaxPeerLinks;
1: -	u8 dot11MeshMaxRetries;
1: -	u8 dot11MeshTTL;
1: -	u8 element_ttl;
1: -	bool auto_open_plinks;
1: -	u32 dot11MeshNbrOffsetMaxNeighbor;
1: -	u8 dot11MeshHWMPmaxPREQretries;
1: -	u32 path_refresh_time;
1: -	u32 dot11MeshHWMPactivePathTimeout;
1: -	u16 min_discovery_timeout;
1: -	u16 dot11MeshHWMPpreqMinInterval;
1: -	u16 dot11MeshHWMPperrMinInterval;
1: -	u16 dot11MeshHWMPnetDiameterTraversalTime;
1: -	u8 dot11MeshHWMPRootMode;
1: -	u16 dot11MeshHWMPRannInterval;
1: -	bool dot11MeshGateAnnouncementProtocol;
1: -	bool dot11MeshForwarding;
1: -	s32 rssi_threshold;
1: -	u16 ht_opmode;
1: -	u32 dot11MeshHWMPactivePathToRootTimeout;
1: -	u16 dot11MeshHWMProotInterval;
1: -	u16 dot11MeshHWMPconfirmationInterval;
1: -	bool dot11MeshNolearn;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u16 dot11MeshRetryTimeout;
1: +  u16 dot11MeshConfirmTimeout;
1: +  u16 dot11MeshHoldingTimeout;
1: +  u16 dot11MeshMaxPeerLinks;
1: +  u8 dot11MeshMaxRetries;
1: +  u8 dot11MeshTTL;
1: +  u8 element_ttl;
1: +  bool auto_open_plinks;
1: +  u32 dot11MeshNbrOffsetMaxNeighbor;
1: +  u8 dot11MeshHWMPmaxPREQretries;
1: +  u32 path_refresh_time;
1: +  u32 dot11MeshHWMPactivePathTimeout;
1: +  u16 min_discovery_timeout;
1: +  u16 dot11MeshHWMPpreqMinInterval;
1: +  u16 dot11MeshHWMPperrMinInterval;
1: +  u16 dot11MeshHWMPnetDiameterTraversalTime;
1: +  u8 dot11MeshHWMPRootMode;
1: +  u16 dot11MeshHWMPRannInterval;
1: +  bool dot11MeshGateAnnouncementProtocol;
1: +  bool dot11MeshForwarding;
1: +  s32 rssi_threshold;
1: +  u16 ht_opmode;
1: +  u32 dot11MeshHWMPactivePathToRootTimeout;
1: +  u16 dot11MeshHWMProotInterval;
1: +  u16 dot11MeshHWMPconfirmationInterval;
1: +  bool dot11MeshNolearn;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_change_bss {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	int use_cts_prot;
1: -	int use_short_preamble;
1: -	int use_short_slot_time;
1: -	int ap_isolate;
1: -	int ht_opmode;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  int use_cts_prot;
1: +  int use_short_preamble;
1: +  int use_short_slot_time;
1: +  int ap_isolate;
1: +  int ht_opmode;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_txq_params {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_ac ac;
1: -	u16 txop;
1: -	u16 cwmin;
1: -	u16 cwmax;
1: -	u8 aifs;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_ac ac;
1: +  u16 txop;
1: +  u16 cwmin;
1: +  u16 cwmax;
1: +  u8 aifs;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_libertas_set_mesh_channel {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_monitor_channel {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_auth {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	enum nl80211_auth_type auth_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  enum nl80211_auth_type auth_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_assoc {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	u8 prev_bssid[6];
1: -	bool use_mfp;
1: -	u32 flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  u8 prev_bssid[6];
1: +  bool use_mfp;
1: +  u32 flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_deauth {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	u16 reason_code;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  u16 reason_code;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_disassoc {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	u16 reason_code;
1: -	bool local_state_change;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  u16 reason_code;
1: +  bool local_state_change;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_mgmt_tx_cancel_wait {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_power_mgmt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	bool enabled;
1: -	int timeout;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  bool enabled;
1: +  int timeout;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_connect {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	char ssid[33];
1: -	enum nl80211_auth_type auth_type;
1: -	bool privacy;
1: -	u32 wpa_versions;
1: -	u32 flags;
1: -	u8 prev_bssid[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  char ssid[33];
1: +  enum nl80211_auth_type auth_type;
1: +  bool privacy;
1: +  u32 wpa_versions;
1: +  u32 flags;
1: +  u8 prev_bssid[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_update_connect_params {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u32 changed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u32 changed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_cqm_rssi_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	s32 rssi_thold;
1: -	u32 rssi_hyst;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  s32 rssi_thold;
1: +  u32 rssi_hyst;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_cqm_rssi_range_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	s32 rssi_low;
1: -	s32 rssi_high;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  s32 rssi_low;
1: +  s32 rssi_high;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_cqm_txe_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u32 rate;
1: -	u32 pkts;
1: -	u32 intvl;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u32 rate;
1: +  u32 pkts;
1: +  u32 intvl;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_disconnect {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u16 reason_code;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u16 reason_code;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_join_ibss {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	char ssid[33];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  char ssid[33];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_join_ocb {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_wiphy_params {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 changed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 changed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_tx_power {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	enum nl80211_tx_power_setting type;
1: -	int mbm;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  enum nl80211_tx_power_setting type;
1: +  int mbm;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_int {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int func_ret;
1: -	int func_fill;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int func_ret;
1: +  int func_fill;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_bitrate_mask {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_update_mgmt_frame_registrations {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u16 global_stypes;
1: -	u16 interface_stypes;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u16 global_stypes;
1: +  u16 interface_stypes;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_tx_rx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	u32 tx;
1: -	u32 rx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  u32 tx;
1: +  u32 rx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_void_tx_rx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 tx;
1: -	u32 tx_max;
1: -	u32 rx;
1: -	u32 rx_max;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 tx;
1: +  u32 tx_max;
1: +  u32 rx;
1: +  u32 rx_max;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_tx_rx_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 tx;
1: -	u32 rx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 tx;
1: +  u32 rx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_netdev_id_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u64 id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u64 id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_tdls_mgmt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u8 action_code;
1: -	u8 dialog_token;
1: -	u16 status_code;
1: -	u32 peer_capability;
1: -	bool initiator;
1: -	u32 __data_loc_buf;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u8 action_code;
1: +  u8 dialog_token;
1: +  u16 status_code;
1: +  u32 peer_capability;
1: +  bool initiator;
1: +  u32 __data_loc_buf;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_dump_survey {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	int idx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  int idx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_survey_info {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	int ret;
1: -	u64 time;
1: -	u64 time_busy;
1: -	u64 time_ext_busy;
1: -	u64 time_rx;
1: -	u64 time_tx;
1: -	u64 time_scan;
1: -	u32 filled;
1: -	s8 noise;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  int ret;
1: +  u64 time;
1: +  u64 time_busy;
1: +  u64 time_ext_busy;
1: +  u64 time_rx;
1: +  u64 time_tx;
1: +  u64 time_scan;
1: +  u32 filled;
1: +  s8 noise;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_tdls_oper {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	enum nl80211_tdls_operation oper;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  enum nl80211_tdls_operation oper;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_pmksa {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_probe_client {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_remain_on_channel {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	unsigned int duration;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  unsigned int duration;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_int_cookie {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_cancel_remain_on_channel {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_mgmt_tx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	bool offchan;
1: -	unsigned int wait;
1: -	bool no_cck;
1: -	bool dont_wait_for_ack;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  bool offchan;
1: +  unsigned int wait;
1: +  bool no_cck;
1: +  bool dont_wait_for_ack;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_tx_control_port {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 dest[6];
1: -	__be16 proto;
1: -	bool unencrypted;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 dest[6];
1: +  __be16 proto;
1: +  bool unencrypted;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_noack_map {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u16 noack_map;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u16 noack_map;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_return_chandef {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_start_nan {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u8 master_pref;
1: -	u8 bands;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u8 master_pref;
1: +  u8 bands;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_nan_change_conf {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u8 master_pref;
1: -	u8 bands;
1: -	u32 changes;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u8 master_pref;
1: +  u8 bands;
1: +  u32 changes;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_add_nan_func {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u8 func_type;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u8 func_type;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_del_nan_func {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_mac_acl {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u32 acl_policy;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u32 acl_policy;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_update_ft_ies {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u16 md;
1: -	u32 __data_loc_ie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u16 md;
1: +  u32 __data_loc_ie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_crit_proto_start {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u16 proto;
1: -	u16 duration;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u16 proto;
1: +  u16 duration;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_crit_proto_stop {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	bool radar_required;
1: -	bool block_tx;
1: -	u8 count;
1: -	u32 __data_loc_bcn_ofs;
1: -	u32 __data_loc_pres_ofs;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  bool radar_required;
1: +  bool block_tx;
1: +  u8 count;
1: +  u32 __data_loc_bcn_ofs;
1: +  u32 __data_loc_pres_ofs;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_qos_map {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 num_des;
1: -	u8 dscp_exception[42];
1: -	u8 up[16];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 num_des;
1: +  u8 dscp_exception[42];
1: +  u8 up[16];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_ap_chanwidth {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_add_tx_ts {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u8 tsid;
1: -	u8 user_prio;
1: -	u16 admitted_time;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u8 tsid;
1: +  u8 user_prio;
1: +  u16 admitted_time;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_del_tx_ts {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u8 tsid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u8 tsid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_tdls_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 addr[6];
1: -	u8 oper_class;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 addr[6];
1: +  u8 oper_class;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_tdls_cancel_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_pmk {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 aa[6];
1: -	u8 pmk_len;
1: -	u8 pmk_r0_name_len;
1: -	u32 __data_loc_pmk;
1: -	u32 __data_loc_pmk_r0_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 aa[6];
1: +  u8 pmk_len;
1: +  u8 pmk_r0_name_len;
1: +  u32 __data_loc_pmk;
1: +  u32 __data_loc_pmk_r0_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_del_pmk {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 aa[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 aa[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_external_auth {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	u8 ssid[33];
1: -	u16 status;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  u8 ssid[33];
1: +  u16 status;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_start_radar_detection {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u32 cac_time_ms;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u32 cac_time_ms;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_mcast_rate {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	int mcast_rate[5];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  int mcast_rate[5];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_coalesce {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int n_rules;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int n_rules;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_multicast_to_unicast {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	bool enabled;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  bool enabled;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_get_ftm_responder_stats {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u64 timestamp;
1: -	u32 success_num;
1: -	u32 partial_num;
1: -	u32 failed_num;
1: -	u32 asap_num;
1: -	u32 non_asap_num;
1: -	u64 duration;
1: -	u32 unknown_triggers;
1: -	u32 reschedule;
1: -	u32 out_of_window;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u64 timestamp;
1: +  u32 success_num;
1: +  u32 partial_num;
1: +  u32 failed_num;
1: +  u32 asap_num;
1: +  u32 non_asap_num;
1: +  u64 duration;
1: +  u32 unknown_triggers;
1: +  u32 reschedule;
1: +  u32 out_of_window;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_return_bool {
1: -	struct trace_entry ent;
1: -	bool ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  bool ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_netdev_mac_evt {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 macaddr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 macaddr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_netdev_evt_only {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_send_rx_assoc {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_netdev_frame_event {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u32 __data_loc_frame;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u32 __data_loc_frame;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_tx_mlme_mgmt {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u32 __data_loc_frame;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u32 __data_loc_frame;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_netdev_mac_evt {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 mac[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 mac[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_michael_mic_failure {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 addr[6];
1: -	enum nl80211_key_type key_type;
1: -	int key_id;
1: -	u8 tsc[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 addr[6];
1: +  enum nl80211_key_type key_type;
1: +  int key_id;
1: +  u8 tsc[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_ready_on_channel {
1: -	struct trace_entry ent;
1: -	u32 id;
1: -	u64 cookie;
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	unsigned int duration;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 id;
1: +  u64 cookie;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  unsigned int duration;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_ready_on_channel_expired {
1: -	struct trace_entry ent;
1: -	u32 id;
1: -	u64 cookie;
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 id;
1: +  u64 cookie;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_tx_mgmt_expired {
1: -	struct trace_entry ent;
1: -	u32 id;
1: -	u64 cookie;
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 id;
1: +  u64 cookie;
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_new_sta {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 mac_addr[6];
1: -	int generation;
1: -	u32 connected_time;
1: -	u32 inactive_time;
1: -	u32 rx_bytes;
1: -	u32 tx_bytes;
1: -	u32 rx_packets;
1: -	u32 tx_packets;
1: -	u32 tx_retries;
1: -	u32 tx_failed;
1: -	u32 rx_dropped_misc;
1: -	u32 beacon_loss_count;
1: -	u16 llid;
1: -	u16 plid;
1: -	u8 plink_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 mac_addr[6];
1: +  int generation;
1: +  u32 connected_time;
1: +  u32 inactive_time;
1: +  u32 rx_bytes;
1: +  u32 tx_bytes;
1: +  u32 rx_packets;
1: +  u32 tx_packets;
1: +  u32 tx_retries;
1: +  u32 tx_failed;
1: +  u32 rx_dropped_misc;
1: +  u32 beacon_loss_count;
1: +  u16 llid;
1: +  u16 plid;
1: +  u8 plink_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_rx_mgmt {
1: -	struct trace_entry ent;
1: -	u32 id;
1: -	int freq;
1: -	int sig_dbm;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 id;
1: +  int freq;
1: +  int sig_dbm;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_mgmt_tx_status {
1: -	struct trace_entry ent;
1: -	u32 id;
1: -	u64 cookie;
1: -	bool ack;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 id;
1: +  u64 cookie;
1: +  bool ack;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_control_port_tx_status {
1: -	struct trace_entry ent;
1: -	u32 id;
1: -	u64 cookie;
1: -	bool ack;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 id;
1: +  u64 cookie;
1: +  bool ack;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_rx_control_port {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	int len;
1: -	u8 from[6];
1: -	u16 proto;
1: -	bool unencrypted;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  int len;
1: +  u8 from[6];
1: +  u16 proto;
1: +  bool unencrypted;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_cqm_rssi_notify {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_cqm_rssi_threshold_event rssi_event;
1: -	s32 rssi_level;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_cqm_rssi_threshold_event rssi_event;
1: +  s32 rssi_level;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_reg_can_beacon {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	enum nl80211_iftype iftype;
1: -	bool check_no_ir;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  enum nl80211_iftype iftype;
1: +  bool check_no_ir;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_chandef_dfs_required {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_ch_switch_notify {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_ch_switch_started_notify {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_radar_event {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_cac_event {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	enum nl80211_radar_event evt;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  enum nl80211_radar_event evt;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_rx_evt {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_ibss_joined {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 bssid[6];
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 bssid[6];
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_probe_status {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 addr[6];
1: -	u64 cookie;
1: -	bool acked;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 addr[6];
1: +  u64 cookie;
1: +  bool acked;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_cqm_pktloss_notify {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u32 num_packets;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u32 num_packets;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_pmksa_candidate_notify {
1: -	struct trace_entry ent;
1: -	char name[16];
1: -	int ifindex;
1: -	int index;
1: -	u8 bssid[6];
1: -	bool preauth;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char name[16];
1: +  int ifindex;
1: +  int index;
1: +  u8 bssid[6];
1: +  bool preauth;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_report_obss_beacon {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int freq;
1: -	int sig_dbm;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int freq;
1: +  int sig_dbm;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_tdls_oper_request {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	enum nl80211_tdls_operation oper;
1: -	u16 reason_code;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  enum nl80211_tdls_operation oper;
1: +  u16 reason_code;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_scan_done {
1: -	struct trace_entry ent;
1: -	u32 n_channels;
1: -	u32 __data_loc_ie;
1: -	u32 rates[5];
1: -	u32 wdev_id;
1: -	u8 wiphy_mac[6];
1: -	bool no_cck;
1: -	bool aborted;
1: -	u64 scan_start_tsf;
1: -	u8 tsf_bssid[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 n_channels;
1: +  u32 __data_loc_ie;
1: +  u32 rates[5];
1: +  u32 wdev_id;
1: +  u8 wiphy_mac[6];
1: +  bool no_cck;
1: +  bool aborted;
1: +  u64 scan_start_tsf;
1: +  u8 tsf_bssid[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wiphy_id_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u64 id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u64 id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_get_bss {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	u8 bssid[6];
1: -	u32 __data_loc_ssid;
1: -	enum ieee80211_bss_type bss_type;
1: -	enum ieee80211_privacy privacy;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  u8 bssid[6];
1: +  u32 __data_loc_ssid;
1: +  enum ieee80211_bss_type bss_type;
1: +  enum ieee80211_privacy privacy;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_inform_bss_frame {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	enum nl80211_bss_scan_width scan_width;
1: -	u32 __data_loc_mgmt;
1: -	s32 signal;
1: -	u64 ts_boottime;
1: -	u64 parent_tsf;
1: -	u8 parent_bssid[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  enum nl80211_bss_scan_width scan_width;
1: +  u32 __data_loc_mgmt;
1: +  s32 signal;
1: +  u64 ts_boottime;
1: +  u64 parent_tsf;
1: +  u8 parent_bssid[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_bss_evt {
1: -	struct trace_entry ent;
1: -	u8 bssid[6];
1: -	enum nl80211_band band;
1: -	u32 center_freq;
1: -	u16 freq_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u8 bssid[6];
1: +  enum nl80211_band band;
1: +  u32 center_freq;
1: +  u16 freq_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_return_uint {
1: -	struct trace_entry ent;
1: -	unsigned int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  unsigned int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_return_u32 {
1: -	struct trace_entry ent;
1: -	u32 ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  u32 ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_report_wowlan_wakeup {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	bool non_wireless;
1: -	bool disconnect;
1: -	bool magic_pkt;
1: -	bool gtk_rekey_failure;
1: -	bool eap_identity_req;
1: -	bool four_way_handshake;
1: -	bool rfkill_release;
1: -	s32 pattern_idx;
1: -	u32 packet_len;
1: -	u32 __data_loc_packet;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  bool non_wireless;
1: +  bool disconnect;
1: +  bool magic_pkt;
1: +  bool gtk_rekey_failure;
1: +  bool eap_identity_req;
1: +  bool four_way_handshake;
1: +  bool rfkill_release;
1: +  s32 pattern_idx;
1: +  u32 packet_len;
1: +  u32 __data_loc_packet;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_ft_event {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u32 __data_loc_ies;
1: -	u8 target_ap[6];
1: -	u32 __data_loc_ric_ies;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u32 __data_loc_ies;
1: +  u8 target_ap[6];
1: +  u32 __data_loc_ric_ies;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_stop_iface {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_pmsr_report {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u64 cookie;
1: -	u8 addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u64 cookie;
1: +  u8 addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_pmsr_complete {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 id;
1: -	u64 cookie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 id;
1: +  u64 cookie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_update_owe_info {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u16 status;
1: -	u32 __data_loc_ie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u16 status;
1: +  u32 __data_loc_ie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_cfg80211_update_owe_info_event {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u32 __data_loc_ie;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u32 __data_loc_ie;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_probe_mesh_link {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 dest[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 dest[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_set_tid_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_rdev_reset_tid_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char name[16];
1: -	int ifindex;
1: -	u8 peer[6];
1: -	u8 tids;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char name[16];
1: +  int ifindex;
1: +  u8 peer[6];
1: +  u8 tids;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_rdev_suspend {};
1: @@ -131721,7 +133265,7 @@ struct trace_event_data_offsets_wiphy_only_evt {};
1:  struct trace_event_data_offsets_wiphy_enabled_evt {};
1:  
1:  struct trace_event_data_offsets_rdev_add_virtual_intf {
1: -	u32 vir_intf_name;
1: +  u32 vir_intf_name;
1:  };
1:  
1:  struct trace_event_data_offsets_wiphy_wdev_evt {};
1: @@ -131743,21 +133287,21 @@ struct trace_event_data_offsets_rdev_set_default_beacon_key {};
1:  struct trace_event_data_offsets_rdev_start_ap {};
1:  
1:  struct trace_event_data_offsets_rdev_change_beacon {
1: -	u32 head;
1: -	u32 tail;
1: -	u32 beacon_ies;
1: -	u32 proberesp_ies;
1: -	u32 assocresp_ies;
1: -	u32 probe_resp;
1: +  u32 head;
1: +  u32 tail;
1: +  u32 beacon_ies;
1: +  u32 proberesp_ies;
1: +  u32 assocresp_ies;
1: +  u32 probe_resp;
1:  };
1:  
1:  struct trace_event_data_offsets_wiphy_netdev_evt {};
1:  
1:  struct trace_event_data_offsets_station_add_change {
1: -	u32 supported_rates;
1: -	u32 ext_capab;
1: -	u32 supported_channels;
1: -	u32 supported_oper_classes;
1: +  u32 supported_rates;
1: +  u32 ext_capab;
1: +  u32 supported_channels;
1: +  u32 supported_oper_classes;
1:  };
1:  
1:  struct trace_event_data_offsets_wiphy_netdev_mac_evt {};
1: @@ -131839,7 +133383,7 @@ struct trace_event_data_offsets_tx_rx_evt {};
1:  struct trace_event_data_offsets_wiphy_netdev_id_evt {};
1:  
1:  struct trace_event_data_offsets_rdev_tdls_mgmt {
1: -	u32 buf;
1: +  u32 buf;
1:  };
1:  
1:  struct trace_event_data_offsets_rdev_dump_survey {};
1: @@ -131877,7 +133421,7 @@ struct trace_event_data_offsets_rdev_del_nan_func {};
1:  struct trace_event_data_offsets_rdev_set_mac_acl {};
1:  
1:  struct trace_event_data_offsets_rdev_update_ft_ies {
1: -	u32 ie;
1: +  u32 ie;
1:  };
1:  
1:  struct trace_event_data_offsets_rdev_crit_proto_start {};
1: @@ -131885,8 +133429,8 @@ struct trace_event_data_offsets_rdev_crit_proto_start {};
1:  struct trace_event_data_offsets_rdev_crit_proto_stop {};
1:  
1:  struct trace_event_data_offsets_rdev_channel_switch {
1: -	u32 bcn_ofs;
1: -	u32 pres_ofs;
1: +  u32 bcn_ofs;
1: +  u32 pres_ofs;
1:  };
1:  
1:  struct trace_event_data_offsets_rdev_set_qos_map {};
1: @@ -131902,8 +133446,8 @@ struct trace_event_data_offsets_rdev_tdls_channel_switch {};
1:  struct trace_event_data_offsets_rdev_tdls_cancel_channel_switch {};
1:  
1:  struct trace_event_data_offsets_rdev_set_pmk {
1: -	u32 pmk;
1: -	u32 pmk_r0_name;
1: +  u32 pmk;
1: +  u32 pmk_r0_name;
1:  };
1:  
1:  struct trace_event_data_offsets_rdev_del_pmk {};
1: @@ -131929,11 +133473,11 @@ struct trace_event_data_offsets_netdev_evt_only {};
1:  struct trace_event_data_offsets_cfg80211_send_rx_assoc {};
1:  
1:  struct trace_event_data_offsets_netdev_frame_event {
1: -	u32 frame;
1: +  u32 frame;
1:  };
1:  
1:  struct trace_event_data_offsets_cfg80211_tx_mlme_mgmt {
1: -	u32 frame;
1: +  u32 frame;
1:  };
1:  
1:  struct trace_event_data_offsets_netdev_mac_evt {};
1: @@ -131985,17 +133529,17 @@ struct trace_event_data_offsets_cfg80211_report_obss_beacon {};
1:  struct trace_event_data_offsets_cfg80211_tdls_oper_request {};
1:  
1:  struct trace_event_data_offsets_cfg80211_scan_done {
1: -	u32 ie;
1: +  u32 ie;
1:  };
1:  
1:  struct trace_event_data_offsets_wiphy_id_evt {};
1:  
1:  struct trace_event_data_offsets_cfg80211_get_bss {
1: -	u32 ssid;
1: +  u32 ssid;
1:  };
1:  
1:  struct trace_event_data_offsets_cfg80211_inform_bss_frame {
1: -	u32 mgmt;
1: +  u32 mgmt;
1:  };
1:  
1:  struct trace_event_data_offsets_cfg80211_bss_evt {};
1: @@ -132005,12 +133549,12 @@ struct trace_event_data_offsets_cfg80211_return_uint {};
1:  struct trace_event_data_offsets_cfg80211_return_u32 {};
1:  
1:  struct trace_event_data_offsets_cfg80211_report_wowlan_wakeup {
1: -	u32 packet;
1: +  u32 packet;
1:  };
1:  
1:  struct trace_event_data_offsets_cfg80211_ft_event {
1: -	u32 ies;
1: -	u32 ric_ies;
1: +  u32 ies;
1: +  u32 ric_ies;
1:  };
1:  
1:  struct trace_event_data_offsets_cfg80211_stop_iface {};
1: @@ -132020,11 +133564,11 @@ struct trace_event_data_offsets_cfg80211_pmsr_report {};
1:  struct trace_event_data_offsets_cfg80211_pmsr_complete {};
1:  
1:  struct trace_event_data_offsets_rdev_update_owe_info {
1: -	u32 ie;
1: +  u32 ie;
1:  };
1:  
1:  struct trace_event_data_offsets_cfg80211_update_owe_info_event {
1: -	u32 ie;
1: +  u32 ie;
1:  };
1:  
1:  struct trace_event_data_offsets_rdev_probe_mesh_link {};
1: @@ -132033,11 +133577,13 @@ struct trace_event_data_offsets_rdev_set_tid_config {};
1:  
1:  struct trace_event_data_offsets_rdev_reset_tid_config {};
1:  
1: -typedef void (*btf_trace_rdev_suspend)(void *, struct wiphy *, struct cfg80211_wowlan *);
1: +typedef void (*btf_trace_rdev_suspend)(void *, struct wiphy *,
1: +                                       struct cfg80211_wowlan *);
1:  
1:  typedef void (*btf_trace_rdev_return_int)(void *, struct wiphy *, int);
1:  
1: -typedef void (*btf_trace_rdev_scan)(void *, struct wiphy *, struct cfg80211_scan_request *);
1: +typedef void (*btf_trace_rdev_scan)(void *, struct wiphy *,
1: +                                    struct cfg80211_scan_request *);
1:  
1:  typedef void (*btf_trace_rdev_resume)(void *, struct wiphy *);
1:  
1: @@ -132049,307 +133595,537 @@ typedef void (*btf_trace_rdev_rfkill_poll)(void *, struct wiphy *);
1:  
1:  typedef void (*btf_trace_rdev_set_wakeup)(void *, struct wiphy *, bool);
1:  
1: -typedef void (*btf_trace_rdev_add_virtual_intf)(void *, struct wiphy *, char *, enum nl80211_iftype);
1: +typedef void (*btf_trace_rdev_add_virtual_intf)(void *, struct wiphy *, char *,
1: +                                                enum nl80211_iftype);
1:  
1: -typedef void (*btf_trace_rdev_return_wdev)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_return_wdev)(void *, struct wiphy *,
1: +                                           struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_del_virtual_intf)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_del_virtual_intf)(void *, struct wiphy *,
1: +                                                struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_change_virtual_intf)(void *, struct wiphy *, struct net_device *, enum nl80211_iftype);
1: +typedef void (*btf_trace_rdev_change_virtual_intf)(void *, struct wiphy *,
1: +                                                   struct net_device *,
1: +                                                   enum nl80211_iftype);
1:  
1: -typedef void (*btf_trace_rdev_get_key)(void *, struct wiphy *, struct net_device *, u8, bool, const u8 *);
1: +typedef void (*btf_trace_rdev_get_key)(void *, struct wiphy *,
1: +                                       struct net_device *, u8, bool,
1: +                                       const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_del_key)(void *, struct wiphy *, struct net_device *, u8, bool, const u8 *);
1: +typedef void (*btf_trace_rdev_del_key)(void *, struct wiphy *,
1: +                                       struct net_device *, u8, bool,
1: +                                       const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_add_key)(void *, struct wiphy *, struct net_device *, u8, bool, const u8 *, u8);
1: +typedef void (*btf_trace_rdev_add_key)(void *, struct wiphy *,
1: +                                       struct net_device *, u8, bool,
1: +                                       const u8 *, u8);
1:  
1: -typedef void (*btf_trace_rdev_set_default_key)(void *, struct wiphy *, struct net_device *, u8, bool, bool);
1: +typedef void (*btf_trace_rdev_set_default_key)(void *, struct wiphy *,
1: +                                               struct net_device *, u8, bool,
1: +                                               bool);
1:  
1: -typedef void (*btf_trace_rdev_set_default_mgmt_key)(void *, struct wiphy *, struct net_device *, u8);
1: +typedef void (*btf_trace_rdev_set_default_mgmt_key)(void *, struct wiphy *,
1: +                                                    struct net_device *, u8);
1:  
1: -typedef void (*btf_trace_rdev_set_default_beacon_key)(void *, struct wiphy *, struct net_device *, u8);
1: +typedef void (*btf_trace_rdev_set_default_beacon_key)(void *, struct wiphy *,
1: +                                                      struct net_device *, u8);
1:  
1: -typedef void (*btf_trace_rdev_start_ap)(void *, struct wiphy *, struct net_device *, struct cfg80211_ap_settings *);
1: +typedef void (*btf_trace_rdev_start_ap)(void *, struct wiphy *,
1: +                                        struct net_device *,
1: +                                        struct cfg80211_ap_settings *);
1:  
1: -typedef void (*btf_trace_rdev_change_beacon)(void *, struct wiphy *, struct net_device *, struct cfg80211_beacon_data *);
1: +typedef void (*btf_trace_rdev_change_beacon)(void *, struct wiphy *,
1: +                                             struct net_device *,
1: +                                             struct cfg80211_beacon_data *);
1:  
1: -typedef void (*btf_trace_rdev_stop_ap)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_stop_ap)(void *, struct wiphy *,
1: +                                       struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_set_rekey_data)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_set_rekey_data)(void *, struct wiphy *,
1: +                                              struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_get_mesh_config)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_get_mesh_config)(void *, struct wiphy *,
1: +                                               struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_leave_mesh)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_leave_mesh)(void *, struct wiphy *,
1: +                                          struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_leave_ibss)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_leave_ibss)(void *, struct wiphy *,
1: +                                          struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_leave_ocb)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_leave_ocb)(void *, struct wiphy *,
1: +                                         struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_flush_pmksa)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_flush_pmksa)(void *, struct wiphy *,
1: +                                           struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_end_cac)(void *, struct wiphy *, struct net_device *);
1: +typedef void (*btf_trace_rdev_end_cac)(void *, struct wiphy *,
1: +                                       struct net_device *);
1:  
1: -typedef void (*btf_trace_rdev_add_station)(void *, struct wiphy *, struct net_device *, u8 *, struct station_parameters *);
1: +typedef void (*btf_trace_rdev_add_station)(void *, struct wiphy *,
1: +                                           struct net_device *, u8 *,
1: +                                           struct station_parameters *);
1:  
1: -typedef void (*btf_trace_rdev_change_station)(void *, struct wiphy *, struct net_device *, u8 *, struct station_parameters *);
1: +typedef void (*btf_trace_rdev_change_station)(void *, struct wiphy *,
1: +                                              struct net_device *, u8 *,
1: +                                              struct station_parameters *);
1:  
1: -typedef void (*btf_trace_rdev_del_station)(void *, struct wiphy *, struct net_device *, struct station_del_parameters *);
1: +typedef void (*btf_trace_rdev_del_station)(void *, struct wiphy *,
1: +                                           struct net_device *,
1: +                                           struct station_del_parameters *);
1:  
1: -typedef void (*btf_trace_rdev_get_station)(void *, struct wiphy *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_rdev_get_station)(void *, struct wiphy *,
1: +                                           struct net_device *, const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_del_mpath)(void *, struct wiphy *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_rdev_del_mpath)(void *, struct wiphy *,
1: +                                         struct net_device *, const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_dump_station)(void *, struct wiphy *, struct net_device *, int, u8 *);
1: +typedef void (*btf_trace_rdev_dump_station)(void *, struct wiphy *,
1: +                                            struct net_device *, int, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_return_int_station_info)(void *, struct wiphy *, int, struct station_info *);
1: +typedef void (*btf_trace_rdev_return_int_station_info)(void *, struct wiphy *,
1: +                                                       int,
1: +                                                       struct station_info *);
1:  
1: -typedef void (*btf_trace_rdev_add_mpath)(void *, struct wiphy *, struct net_device *, u8 *, u8 *);
1: +typedef void (*btf_trace_rdev_add_mpath)(void *, struct wiphy *,
1: +                                         struct net_device *, u8 *, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_change_mpath)(void *, struct wiphy *, struct net_device *, u8 *, u8 *);
1: +typedef void (*btf_trace_rdev_change_mpath)(void *, struct wiphy *,
1: +                                            struct net_device *, u8 *, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_get_mpath)(void *, struct wiphy *, struct net_device *, u8 *, u8 *);
1: +typedef void (*btf_trace_rdev_get_mpath)(void *, struct wiphy *,
1: +                                         struct net_device *, u8 *, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_dump_mpath)(void *, struct wiphy *, struct net_device *, int, u8 *, u8 *);
1: +typedef void (*btf_trace_rdev_dump_mpath)(void *, struct wiphy *,
1: +                                          struct net_device *, int, u8 *, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_get_mpp)(void *, struct wiphy *, struct net_device *, u8 *, u8 *);
1: +typedef void (*btf_trace_rdev_get_mpp)(void *, struct wiphy *,
1: +                                       struct net_device *, u8 *, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_dump_mpp)(void *, struct wiphy *, struct net_device *, int, u8 *, u8 *);
1: +typedef void (*btf_trace_rdev_dump_mpp)(void *, struct wiphy *,
1: +                                        struct net_device *, int, u8 *, u8 *);
1:  
1: -typedef void (*btf_trace_rdev_return_int_mpath_info)(void *, struct wiphy *, int, struct mpath_info *);
1: +typedef void (*btf_trace_rdev_return_int_mpath_info)(void *, struct wiphy *,
1: +                                                     int, struct mpath_info *);
1:  
1: -typedef void (*btf_trace_rdev_return_int_mesh_config)(void *, struct wiphy *, int, struct mesh_config *);
1: +typedef void (*btf_trace_rdev_return_int_mesh_config)(void *, struct wiphy *,
1: +                                                      int,
1: +                                                      struct mesh_config *);
1:  
1: -typedef void (*btf_trace_rdev_update_mesh_config)(void *, struct wiphy *, struct net_device *, u32, const struct mesh_config *);
1: +typedef void (*btf_trace_rdev_update_mesh_config)(void *, struct wiphy *,
1: +                                                  struct net_device *, u32,
1: +                                                  const struct mesh_config *);
1:  
1: -typedef void (*btf_trace_rdev_join_mesh)(void *, struct wiphy *, struct net_device *, const struct mesh_config *, const struct mesh_setup *);
1: +typedef void (*btf_trace_rdev_join_mesh)(void *, struct wiphy *,
1: +                                         struct net_device *,
1: +                                         const struct mesh_config *,
1: +                                         const struct mesh_setup *);
1:  
1: -typedef void (*btf_trace_rdev_change_bss)(void *, struct wiphy *, struct net_device *, struct bss_parameters *);
1: +typedef void (*btf_trace_rdev_change_bss)(void *, struct wiphy *,
1: +                                          struct net_device *,
1: +                                          struct bss_parameters *);
1:  
1: -typedef void (*btf_trace_rdev_set_txq_params)(void *, struct wiphy *, struct net_device *, struct ieee80211_txq_params *);
1: +typedef void (*btf_trace_rdev_set_txq_params)(void *, struct wiphy *,
1: +                                              struct net_device *,
1: +                                              struct ieee80211_txq_params *);
1:  
1: -typedef void (*btf_trace_rdev_libertas_set_mesh_channel)(void *, struct wiphy *, struct net_device *, struct ieee80211_channel *);
1: +typedef void (*btf_trace_rdev_libertas_set_mesh_channel)(
1: +    void *, struct wiphy *, struct net_device *, struct ieee80211_channel *);
1:  
1: -typedef void (*btf_trace_rdev_set_monitor_channel)(void *, struct wiphy *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_rdev_set_monitor_channel)(void *, struct wiphy *,
1: +                                                   struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_rdev_auth)(void *, struct wiphy *, struct net_device *, struct cfg80211_auth_request *);
1: +typedef void (*btf_trace_rdev_auth)(void *, struct wiphy *, struct net_device *,
1: +                                    struct cfg80211_auth_request *);
1:  
1: -typedef void (*btf_trace_rdev_assoc)(void *, struct wiphy *, struct net_device *, struct cfg80211_assoc_request *);
1: +typedef void (*btf_trace_rdev_assoc)(void *, struct wiphy *,
1: +                                     struct net_device *,
1: +                                     struct cfg80211_assoc_request *);
1:  
1: -typedef void (*btf_trace_rdev_deauth)(void *, struct wiphy *, struct net_device *, struct cfg80211_deauth_request *);
1: +typedef void (*btf_trace_rdev_deauth)(void *, struct wiphy *,
1: +                                      struct net_device *,
1: +                                      struct cfg80211_deauth_request *);
1:  
1: -typedef void (*btf_trace_rdev_disassoc)(void *, struct wiphy *, struct net_device *, struct cfg80211_disassoc_request *);
1: +typedef void (*btf_trace_rdev_disassoc)(void *, struct wiphy *,
1: +                                        struct net_device *,
1: +                                        struct cfg80211_disassoc_request *);
1:  
1: -typedef void (*btf_trace_rdev_mgmt_tx_cancel_wait)(void *, struct wiphy *, struct wireless_dev *, u64);
1: +typedef void (*btf_trace_rdev_mgmt_tx_cancel_wait)(void *, struct wiphy *,
1: +                                                   struct wireless_dev *, u64);
1:  
1: -typedef void (*btf_trace_rdev_set_power_mgmt)(void *, struct wiphy *, struct net_device *, bool, int);
1: +typedef void (*btf_trace_rdev_set_power_mgmt)(void *, struct wiphy *,
1: +                                              struct net_device *, bool, int);
1:  
1: -typedef void (*btf_trace_rdev_connect)(void *, struct wiphy *, struct net_device *, struct cfg80211_connect_params *);
1: +typedef void (*btf_trace_rdev_connect)(void *, struct wiphy *,
1: +                                       struct net_device *,
1: +                                       struct cfg80211_connect_params *);
1:  
1: -typedef void (*btf_trace_rdev_update_connect_params)(void *, struct wiphy *, struct net_device *, struct cfg80211_connect_params *, u32);
1: +typedef void (*btf_trace_rdev_update_connect_params)(
1: +    void *, struct wiphy *, struct net_device *,
1: +    struct cfg80211_connect_params *, u32);
1:  
1: -typedef void (*btf_trace_rdev_set_cqm_rssi_config)(void *, struct wiphy *, struct net_device *, s32, u32);
1: +typedef void (*btf_trace_rdev_set_cqm_rssi_config)(void *, struct wiphy *,
1: +                                                   struct net_device *, s32,
1: +                                                   u32);
1:  
1: -typedef void (*btf_trace_rdev_set_cqm_rssi_range_config)(void *, struct wiphy *, struct net_device *, s32, s32);
1: +typedef void (*btf_trace_rdev_set_cqm_rssi_range_config)(void *, struct wiphy *,
1: +                                                         struct net_device *,
1: +                                                         s32, s32);
1:  
1: -typedef void (*btf_trace_rdev_set_cqm_txe_config)(void *, struct wiphy *, struct net_device *, u32, u32, u32);
1: +typedef void (*btf_trace_rdev_set_cqm_txe_config)(void *, struct wiphy *,
1: +                                                  struct net_device *, u32, u32,
1: +                                                  u32);
1:  
1: -typedef void (*btf_trace_rdev_disconnect)(void *, struct wiphy *, struct net_device *, u16);
1: +typedef void (*btf_trace_rdev_disconnect)(void *, struct wiphy *,
1: +                                          struct net_device *, u16);
1:  
1: -typedef void (*btf_trace_rdev_join_ibss)(void *, struct wiphy *, struct net_device *, struct cfg80211_ibss_params *);
1: +typedef void (*btf_trace_rdev_join_ibss)(void *, struct wiphy *,
1: +                                         struct net_device *,
1: +                                         struct cfg80211_ibss_params *);
1:  
1: -typedef void (*btf_trace_rdev_join_ocb)(void *, struct wiphy *, struct net_device *, const struct ocb_setup *);
1: +typedef void (*btf_trace_rdev_join_ocb)(void *, struct wiphy *,
1: +                                        struct net_device *,
1: +                                        const struct ocb_setup *);
1:  
1:  typedef void (*btf_trace_rdev_set_wiphy_params)(void *, struct wiphy *, u32);
1:  
1: -typedef void (*btf_trace_rdev_get_tx_power)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_get_tx_power)(void *, struct wiphy *,
1: +                                            struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_set_tx_power)(void *, struct wiphy *, struct wireless_dev *, enum nl80211_tx_power_setting, int);
1: +typedef void (*btf_trace_rdev_set_tx_power)(void *, struct wiphy *,
1: +                                            struct wireless_dev *,
1: +                                            enum nl80211_tx_power_setting, int);
1:  
1:  typedef void (*btf_trace_rdev_return_int_int)(void *, struct wiphy *, int, int);
1:  
1: -typedef void (*btf_trace_rdev_set_bitrate_mask)(void *, struct wiphy *, struct net_device *, const u8 *, const struct cfg80211_bitrate_mask *);
1: +typedef void (*btf_trace_rdev_set_bitrate_mask)(
1: +    void *, struct wiphy *, struct net_device *, const u8 *,
1: +    const struct cfg80211_bitrate_mask *);
1:  
1: -typedef void (*btf_trace_rdev_update_mgmt_frame_registrations)(void *, struct wiphy *, struct wireless_dev *, struct mgmt_frame_regs *);
1: +typedef void (*btf_trace_rdev_update_mgmt_frame_registrations)(
1: +    void *, struct wiphy *, struct wireless_dev *, struct mgmt_frame_regs *);
1:  
1: -typedef void (*btf_trace_rdev_return_int_tx_rx)(void *, struct wiphy *, int, u32, u32);
1: +typedef void (*btf_trace_rdev_return_int_tx_rx)(void *, struct wiphy *, int,
1: +                                                u32, u32);
1:  
1: -typedef void (*btf_trace_rdev_return_void_tx_rx)(void *, struct wiphy *, u32, u32, u32, u32);
1: +typedef void (*btf_trace_rdev_return_void_tx_rx)(void *, struct wiphy *, u32,
1: +                                                 u32, u32, u32);
1:  
1:  typedef void (*btf_trace_rdev_set_antenna)(void *, struct wiphy *, u32, u32);
1:  
1: -typedef void (*btf_trace_rdev_sched_scan_start)(void *, struct wiphy *, struct net_device *, u64);
1: +typedef void (*btf_trace_rdev_sched_scan_start)(void *, struct wiphy *,
1: +                                                struct net_device *, u64);
1:  
1: -typedef void (*btf_trace_rdev_sched_scan_stop)(void *, struct wiphy *, struct net_device *, u64);
1: +typedef void (*btf_trace_rdev_sched_scan_stop)(void *, struct wiphy *,
1: +                                               struct net_device *, u64);
1:  
1: -typedef void (*btf_trace_rdev_tdls_mgmt)(void *, struct wiphy *, struct net_device *, u8 *, u8, u8, u16, u32, bool, const u8 *, size_t);
1: +typedef void (*btf_trace_rdev_tdls_mgmt)(void *, struct wiphy *,
1: +                                         struct net_device *, u8 *, u8, u8, u16,
1: +                                         u32, bool, const u8 *, size_t);
1:  
1: -typedef void (*btf_trace_rdev_dump_survey)(void *, struct wiphy *, struct net_device *, int);
1: +typedef void (*btf_trace_rdev_dump_survey)(void *, struct wiphy *,
1: +                                           struct net_device *, int);
1:  
1: -typedef void (*btf_trace_rdev_return_int_survey_info)(void *, struct wiphy *, int, struct survey_info *);
1: +typedef void (*btf_trace_rdev_return_int_survey_info)(void *, struct wiphy *,
1: +                                                      int,
1: +                                                      struct survey_info *);
1:  
1: -typedef void (*btf_trace_rdev_tdls_oper)(void *, struct wiphy *, struct net_device *, u8 *, enum nl80211_tdls_operation);
1: +typedef void (*btf_trace_rdev_tdls_oper)(void *, struct wiphy *,
1: +                                         struct net_device *, u8 *,
1: +                                         enum nl80211_tdls_operation);
1:  
1: -typedef void (*btf_trace_rdev_probe_client)(void *, struct wiphy *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_rdev_probe_client)(void *, struct wiphy *,
1: +                                            struct net_device *, const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_set_pmksa)(void *, struct wiphy *, struct net_device *, struct cfg80211_pmksa *);
1: +typedef void (*btf_trace_rdev_set_pmksa)(void *, struct wiphy *,
1: +                                         struct net_device *,
1: +                                         struct cfg80211_pmksa *);
1:  
1: -typedef void (*btf_trace_rdev_del_pmksa)(void *, struct wiphy *, struct net_device *, struct cfg80211_pmksa *);
1: +typedef void (*btf_trace_rdev_del_pmksa)(void *, struct wiphy *,
1: +                                         struct net_device *,
1: +                                         struct cfg80211_pmksa *);
1:  
1: -typedef void (*btf_trace_rdev_remain_on_channel)(void *, struct wiphy *, struct wireless_dev *, struct ieee80211_channel *, unsigned int);
1: +typedef void (*btf_trace_rdev_remain_on_channel)(void *, struct wiphy *,
1: +                                                 struct wireless_dev *,
1: +                                                 struct ieee80211_channel *,
1: +                                                 unsigned int);
1:  
1: -typedef void (*btf_trace_rdev_return_int_cookie)(void *, struct wiphy *, int, u64);
1: +typedef void (*btf_trace_rdev_return_int_cookie)(void *, struct wiphy *, int,
1: +                                                 u64);
1:  
1: -typedef void (*btf_trace_rdev_cancel_remain_on_channel)(void *, struct wiphy *, struct wireless_dev *, u64);
1: +typedef void (*btf_trace_rdev_cancel_remain_on_channel)(void *, struct wiphy *,
1: +                                                        struct wireless_dev *,
1: +                                                        u64);
1:  
1: -typedef void (*btf_trace_rdev_mgmt_tx)(void *, struct wiphy *, struct wireless_dev *, struct cfg80211_mgmt_tx_params *);
1: +typedef void (*btf_trace_rdev_mgmt_tx)(void *, struct wiphy *,
1: +                                       struct wireless_dev *,
1: +                                       struct cfg80211_mgmt_tx_params *);
1:  
1: -typedef void (*btf_trace_rdev_tx_control_port)(void *, struct wiphy *, struct net_device *, const u8 *, size_t, const u8 *, __be16, bool);
1: +typedef void (*btf_trace_rdev_tx_control_port)(void *, struct wiphy *,
1: +                                               struct net_device *, const u8 *,
1: +                                               size_t, const u8 *, __be16,
1: +                                               bool);
1:  
1: -typedef void (*btf_trace_rdev_set_noack_map)(void *, struct wiphy *, struct net_device *, u16);
1: +typedef void (*btf_trace_rdev_set_noack_map)(void *, struct wiphy *,
1: +                                             struct net_device *, u16);
1:  
1: -typedef void (*btf_trace_rdev_get_channel)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_get_channel)(void *, struct wiphy *,
1: +                                           struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_return_chandef)(void *, struct wiphy *, int, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_rdev_return_chandef)(void *, struct wiphy *, int,
1: +                                              struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_rdev_start_p2p_device)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_start_p2p_device)(void *, struct wiphy *,
1: +                                                struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_stop_p2p_device)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_stop_p2p_device)(void *, struct wiphy *,
1: +                                               struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_start_nan)(void *, struct wiphy *, struct wireless_dev *, struct cfg80211_nan_conf *);
1: +typedef void (*btf_trace_rdev_start_nan)(void *, struct wiphy *,
1: +                                         struct wireless_dev *,
1: +                                         struct cfg80211_nan_conf *);
1:  
1: -typedef void (*btf_trace_rdev_nan_change_conf)(void *, struct wiphy *, struct wireless_dev *, struct cfg80211_nan_conf *, u32);
1: +typedef void (*btf_trace_rdev_nan_change_conf)(void *, struct wiphy *,
1: +                                               struct wireless_dev *,
1: +                                               struct cfg80211_nan_conf *, u32);
1:  
1: -typedef void (*btf_trace_rdev_stop_nan)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_stop_nan)(void *, struct wiphy *,
1: +                                        struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_add_nan_func)(void *, struct wiphy *, struct wireless_dev *, const struct cfg80211_nan_func *);
1: +typedef void (*btf_trace_rdev_add_nan_func)(void *, struct wiphy *,
1: +                                            struct wireless_dev *,
1: +                                            const struct cfg80211_nan_func *);
1:  
1: -typedef void (*btf_trace_rdev_del_nan_func)(void *, struct wiphy *, struct wireless_dev *, u64);
1: +typedef void (*btf_trace_rdev_del_nan_func)(void *, struct wiphy *,
1: +                                            struct wireless_dev *, u64);
1:  
1: -typedef void (*btf_trace_rdev_set_mac_acl)(void *, struct wiphy *, struct net_device *, struct cfg80211_acl_data *);
1: +typedef void (*btf_trace_rdev_set_mac_acl)(void *, struct wiphy *,
1: +                                           struct net_device *,
1: +                                           struct cfg80211_acl_data *);
1:  
1: -typedef void (*btf_trace_rdev_update_ft_ies)(void *, struct wiphy *, struct net_device *, struct cfg80211_update_ft_ies_params *);
1: +typedef void (*btf_trace_rdev_update_ft_ies)(
1: +    void *, struct wiphy *, struct net_device *,
1: +    struct cfg80211_update_ft_ies_params *);
1:  
1: -typedef void (*btf_trace_rdev_crit_proto_start)(void *, struct wiphy *, struct wireless_dev *, enum nl80211_crit_proto_id, u16);
1: +typedef void (*btf_trace_rdev_crit_proto_start)(void *, struct wiphy *,
1: +                                                struct wireless_dev *,
1: +                                                enum nl80211_crit_proto_id,
1: +                                                u16);
1:  
1: -typedef void (*btf_trace_rdev_crit_proto_stop)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_crit_proto_stop)(void *, struct wiphy *,
1: +                                               struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_channel_switch)(void *, struct wiphy *, struct net_device *, struct cfg80211_csa_settings *);
1: +typedef void (*btf_trace_rdev_channel_switch)(void *, struct wiphy *,
1: +                                              struct net_device *,
1: +                                              struct cfg80211_csa_settings *);
1:  
1: -typedef void (*btf_trace_rdev_set_qos_map)(void *, struct wiphy *, struct net_device *, struct cfg80211_qos_map *);
1: +typedef void (*btf_trace_rdev_set_qos_map)(void *, struct wiphy *,
1: +                                           struct net_device *,
1: +                                           struct cfg80211_qos_map *);
1:  
1: -typedef void (*btf_trace_rdev_set_ap_chanwidth)(void *, struct wiphy *, struct net_device *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_rdev_set_ap_chanwidth)(void *, struct wiphy *,
1: +                                                struct net_device *,
1: +                                                struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_rdev_add_tx_ts)(void *, struct wiphy *, struct net_device *, u8, const u8 *, u8, u16);
1: +typedef void (*btf_trace_rdev_add_tx_ts)(void *, struct wiphy *,
1: +                                         struct net_device *, u8, const u8 *,
1: +                                         u8, u16);
1:  
1: -typedef void (*btf_trace_rdev_del_tx_ts)(void *, struct wiphy *, struct net_device *, u8, const u8 *);
1: +typedef void (*btf_trace_rdev_del_tx_ts)(void *, struct wiphy *,
1: +                                         struct net_device *, u8, const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_tdls_channel_switch)(void *, struct wiphy *, struct net_device *, const u8 *, u8, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_rdev_tdls_channel_switch)(void *, struct wiphy *,
1: +                                                   struct net_device *,
1: +                                                   const u8 *, u8,
1: +                                                   struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_rdev_tdls_cancel_channel_switch)(void *, struct wiphy *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_rdev_tdls_cancel_channel_switch)(void *,
1: +                                                          struct wiphy *,
1: +                                                          struct net_device *,
1: +                                                          const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_set_pmk)(void *, struct wiphy *, struct net_device *, struct cfg80211_pmk_conf *);
1: +typedef void (*btf_trace_rdev_set_pmk)(void *, struct wiphy *,
1: +                                       struct net_device *,
1: +                                       struct cfg80211_pmk_conf *);
1:  
1: -typedef void (*btf_trace_rdev_del_pmk)(void *, struct wiphy *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_rdev_del_pmk)(void *, struct wiphy *,
1: +                                       struct net_device *, const u8 *);
1:  
1: -typedef void (*btf_trace_rdev_external_auth)(void *, struct wiphy *, struct net_device *, struct cfg80211_external_auth_params *);
1: +typedef void (*btf_trace_rdev_external_auth)(
1: +    void *, struct wiphy *, struct net_device *,
1: +    struct cfg80211_external_auth_params *);
1:  
1: -typedef void (*btf_trace_rdev_start_radar_detection)(void *, struct wiphy *, struct net_device *, struct cfg80211_chan_def *, u32);
1: +typedef void (*btf_trace_rdev_start_radar_detection)(void *, struct wiphy *,
1: +                                                     struct net_device *,
1: +                                                     struct cfg80211_chan_def *,
1: +                                                     u32);
1:  
1: -typedef void (*btf_trace_rdev_set_mcast_rate)(void *, struct wiphy *, struct net_device *, int *);
1: +typedef void (*btf_trace_rdev_set_mcast_rate)(void *, struct wiphy *,
1: +                                              struct net_device *, int *);
1:  
1: -typedef void (*btf_trace_rdev_set_coalesce)(void *, struct wiphy *, struct cfg80211_coalesce *);
1: +typedef void (*btf_trace_rdev_set_coalesce)(void *, struct wiphy *,
1: +                                            struct cfg80211_coalesce *);
1:  
1: -typedef void (*btf_trace_rdev_abort_scan)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_abort_scan)(void *, struct wiphy *,
1: +                                          struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_set_multicast_to_unicast)(void *, struct wiphy *, struct net_device *, const bool);
1: +typedef void (*btf_trace_rdev_set_multicast_to_unicast)(void *, struct wiphy *,
1: +                                                        struct net_device *,
1: +                                                        const bool);
1:  
1: -typedef void (*btf_trace_rdev_get_txq_stats)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_rdev_get_txq_stats)(void *, struct wiphy *,
1: +                                             struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_rdev_get_ftm_responder_stats)(void *, struct wiphy *, struct net_device *, struct cfg80211_ftm_responder_stats *);
1: +typedef void (*btf_trace_rdev_get_ftm_responder_stats)(
1: +    void *, struct wiphy *, struct net_device *,
1: +    struct cfg80211_ftm_responder_stats *);
1:  
1: -typedef void (*btf_trace_rdev_start_pmsr)(void *, struct wiphy *, struct wireless_dev *, u64);
1: +typedef void (*btf_trace_rdev_start_pmsr)(void *, struct wiphy *,
1: +                                          struct wireless_dev *, u64);
1:  
1: -typedef void (*btf_trace_rdev_abort_pmsr)(void *, struct wiphy *, struct wireless_dev *, u64);
1: +typedef void (*btf_trace_rdev_abort_pmsr)(void *, struct wiphy *,
1: +                                          struct wireless_dev *, u64);
1:  
1:  typedef void (*btf_trace_cfg80211_return_bool)(void *, bool);
1:  
1: -typedef void (*btf_trace_cfg80211_notify_new_peer_candidate)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_notify_new_peer_candidate)(
1: +    void *, struct net_device *, const u8 *);
1:  
1:  typedef void (*btf_trace_cfg80211_send_rx_auth)(void *, struct net_device *);
1:  
1: -typedef void (*btf_trace_cfg80211_send_rx_assoc)(void *, struct net_device *, struct cfg80211_bss *);
1: +typedef void (*btf_trace_cfg80211_send_rx_assoc)(void *, struct net_device *,
1: +                                                 struct cfg80211_bss *);
1:  
1: -typedef void (*btf_trace_cfg80211_rx_unprot_mlme_mgmt)(void *, struct net_device *, const u8 *, int);
1: +typedef void (*btf_trace_cfg80211_rx_unprot_mlme_mgmt)(void *,
1: +                                                       struct net_device *,
1: +                                                       const u8 *, int);
1:  
1: -typedef void (*btf_trace_cfg80211_rx_mlme_mgmt)(void *, struct net_device *, const u8 *, int);
1: +typedef void (*btf_trace_cfg80211_rx_mlme_mgmt)(void *, struct net_device *,
1: +                                                const u8 *, int);
1:  
1: -typedef void (*btf_trace_cfg80211_tx_mlme_mgmt)(void *, struct net_device *, const u8 *, int);
1: +typedef void (*btf_trace_cfg80211_tx_mlme_mgmt)(void *, struct net_device *,
1: +                                                const u8 *, int);
1:  
1: -typedef void (*btf_trace_cfg80211_send_auth_timeout)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_send_auth_timeout)(void *,
1: +                                                     struct net_device *,
1: +                                                     const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_send_assoc_timeout)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_send_assoc_timeout)(void *,
1: +                                                      struct net_device *,
1: +                                                      const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_michael_mic_failure)(void *, struct net_device *, const u8 *, enum nl80211_key_type, int, const u8 *);
1: +typedef void (*btf_trace_cfg80211_michael_mic_failure)(void *,
1: +                                                       struct net_device *,
1: +                                                       const u8 *,
1: +                                                       enum nl80211_key_type,
1: +                                                       int, const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_ready_on_channel)(void *, struct wireless_dev *, u64, struct ieee80211_channel *, unsigned int);
1: +typedef void (*btf_trace_cfg80211_ready_on_channel)(void *,
1: +                                                    struct wireless_dev *, u64,
1: +                                                    struct ieee80211_channel *,
1: +                                                    unsigned int);
1:  
1: -typedef void (*btf_trace_cfg80211_ready_on_channel_expired)(void *, struct wireless_dev *, u64, struct ieee80211_channel *);
1: +typedef void (*btf_trace_cfg80211_ready_on_channel_expired)(
1: +    void *, struct wireless_dev *, u64, struct ieee80211_channel *);
1:  
1: -typedef void (*btf_trace_cfg80211_tx_mgmt_expired)(void *, struct wireless_dev *, u64, struct ieee80211_channel *);
1: +typedef void (*btf_trace_cfg80211_tx_mgmt_expired)(void *,
1: +                                                   struct wireless_dev *, u64,
1: +                                                   struct ieee80211_channel *);
1:  
1: -typedef void (*btf_trace_cfg80211_new_sta)(void *, struct net_device *, const u8 *, struct station_info *);
1: +typedef void (*btf_trace_cfg80211_new_sta)(void *, struct net_device *,
1: +                                           const u8 *, struct station_info *);
1:  
1: -typedef void (*btf_trace_cfg80211_del_sta)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_del_sta)(void *, struct net_device *,
1: +                                           const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_rx_mgmt)(void *, struct wireless_dev *, int, int);
1: +typedef void (*btf_trace_cfg80211_rx_mgmt)(void *, struct wireless_dev *, int,
1: +                                           int);
1:  
1: -typedef void (*btf_trace_cfg80211_mgmt_tx_status)(void *, struct wireless_dev *, u64, bool);
1: +typedef void (*btf_trace_cfg80211_mgmt_tx_status)(void *, struct wireless_dev *,
1: +                                                  u64, bool);
1:  
1: -typedef void (*btf_trace_cfg80211_control_port_tx_status)(void *, struct wireless_dev *, u64, bool);
1: +typedef void (*btf_trace_cfg80211_control_port_tx_status)(void *,
1: +                                                          struct wireless_dev *,
1: +                                                          u64, bool);
1:  
1: -typedef void (*btf_trace_cfg80211_rx_control_port)(void *, struct net_device *, struct sk_buff *, bool);
1: +typedef void (*btf_trace_cfg80211_rx_control_port)(void *, struct net_device *,
1: +                                                   struct sk_buff *, bool);
1:  
1: -typedef void (*btf_trace_cfg80211_cqm_rssi_notify)(void *, struct net_device *, enum nl80211_cqm_rssi_threshold_event, s32);
1: +typedef void (*btf_trace_cfg80211_cqm_rssi_notify)(
1: +    void *, struct net_device *, enum nl80211_cqm_rssi_threshold_event, s32);
1:  
1: -typedef void (*btf_trace_cfg80211_reg_can_beacon)(void *, struct wiphy *, struct cfg80211_chan_def *, enum nl80211_iftype, bool);
1: +typedef void (*btf_trace_cfg80211_reg_can_beacon)(void *, struct wiphy *,
1: +                                                  struct cfg80211_chan_def *,
1: +                                                  enum nl80211_iftype, bool);
1:  
1: -typedef void (*btf_trace_cfg80211_chandef_dfs_required)(void *, struct wiphy *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_cfg80211_chandef_dfs_required)(
1: +    void *, struct wiphy *, struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_cfg80211_ch_switch_notify)(void *, struct net_device *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_cfg80211_ch_switch_notify)(void *, struct net_device *,
1: +                                                    struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_cfg80211_ch_switch_started_notify)(void *, struct net_device *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_cfg80211_ch_switch_started_notify)(
1: +    void *, struct net_device *, struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_cfg80211_radar_event)(void *, struct wiphy *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_cfg80211_radar_event)(void *, struct wiphy *,
1: +                                               struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_cfg80211_cac_event)(void *, struct net_device *, enum nl80211_radar_event);
1: +typedef void (*btf_trace_cfg80211_cac_event)(void *, struct net_device *,
1: +                                             enum nl80211_radar_event);
1:  
1: -typedef void (*btf_trace_cfg80211_rx_spurious_frame)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_rx_spurious_frame)(void *,
1: +                                                     struct net_device *,
1: +                                                     const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_rx_unexpected_4addr_frame)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_rx_unexpected_4addr_frame)(
1: +    void *, struct net_device *, const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_ibss_joined)(void *, struct net_device *, const u8 *, struct ieee80211_channel *);
1: +typedef void (*btf_trace_cfg80211_ibss_joined)(void *, struct net_device *,
1: +                                               const u8 *,
1: +                                               struct ieee80211_channel *);
1:  
1: -typedef void (*btf_trace_cfg80211_probe_status)(void *, struct net_device *, const u8 *, u64, bool);
1: +typedef void (*btf_trace_cfg80211_probe_status)(void *, struct net_device *,
1: +                                                const u8 *, u64, bool);
1:  
1: -typedef void (*btf_trace_cfg80211_cqm_pktloss_notify)(void *, struct net_device *, const u8 *, u32);
1: +typedef void (*btf_trace_cfg80211_cqm_pktloss_notify)(void *,
1: +                                                      struct net_device *,
1: +                                                      const u8 *, u32);
1:  
1: -typedef void (*btf_trace_cfg80211_gtk_rekey_notify)(void *, struct net_device *, const u8 *);
1: +typedef void (*btf_trace_cfg80211_gtk_rekey_notify)(void *, struct net_device *,
1: +                                                    const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_pmksa_candidate_notify)(void *, struct net_device *, int, const u8 *, bool);
1: +typedef void (*btf_trace_cfg80211_pmksa_candidate_notify)(void *,
1: +                                                          struct net_device *,
1: +                                                          int, const u8 *,
1: +                                                          bool);
1:  
1: -typedef void (*btf_trace_cfg80211_report_obss_beacon)(void *, struct wiphy *, const u8 *, size_t, int, int);
1: +typedef void (*btf_trace_cfg80211_report_obss_beacon)(void *, struct wiphy *,
1: +                                                      const u8 *, size_t, int,
1: +                                                      int);
1:  
1: -typedef void (*btf_trace_cfg80211_tdls_oper_request)(void *, struct wiphy *, struct net_device *, const u8 *, enum nl80211_tdls_operation, u16);
1: +typedef void (*btf_trace_cfg80211_tdls_oper_request)(
1: +    void *, struct wiphy *, struct net_device *, const u8 *,
1: +    enum nl80211_tdls_operation, u16);
1:  
1: -typedef void (*btf_trace_cfg80211_scan_done)(void *, struct cfg80211_scan_request *, struct cfg80211_scan_info *);
1: +typedef void (*btf_trace_cfg80211_scan_done)(void *,
1: +                                             struct cfg80211_scan_request *,
1: +                                             struct cfg80211_scan_info *);
1:  
1: -typedef void (*btf_trace_cfg80211_sched_scan_stopped)(void *, struct wiphy *, u64);
1: +typedef void (*btf_trace_cfg80211_sched_scan_stopped)(void *, struct wiphy *,
1: +                                                      u64);
1:  
1: -typedef void (*btf_trace_cfg80211_sched_scan_results)(void *, struct wiphy *, u64);
1: +typedef void (*btf_trace_cfg80211_sched_scan_results)(void *, struct wiphy *,
1: +                                                      u64);
1:  
1: -typedef void (*btf_trace_cfg80211_get_bss)(void *, struct wiphy *, struct ieee80211_channel *, const u8 *, const u8 *, size_t, enum ieee80211_bss_type, enum ieee80211_privacy);
1: +typedef void (*btf_trace_cfg80211_get_bss)(void *, struct wiphy *,
1: +                                           struct ieee80211_channel *,
1: +                                           const u8 *, const u8 *, size_t,
1: +                                           enum ieee80211_bss_type,
1: +                                           enum ieee80211_privacy);
1:  
1: -typedef void (*btf_trace_cfg80211_inform_bss_frame)(void *, struct wiphy *, struct cfg80211_inform_bss *, struct ieee80211_mgmt *, size_t);
1: +typedef void (*btf_trace_cfg80211_inform_bss_frame)(
1: +    void *, struct wiphy *, struct cfg80211_inform_bss *,
1: +    struct ieee80211_mgmt *, size_t);
1:  
1:  typedef void (*btf_trace_cfg80211_return_bss)(void *, struct cfg80211_bss *);
1:  
1: @@ -132357,1163 +134133,1256 @@ typedef void (*btf_trace_cfg80211_return_uint)(void *, unsigned int);
1:  
1:  typedef void (*btf_trace_cfg80211_return_u32)(void *, u32);
1:  
1: -typedef void (*btf_trace_cfg80211_report_wowlan_wakeup)(void *, struct wiphy *, struct wireless_dev *, struct cfg80211_wowlan_wakeup *);
1: +typedef void (*btf_trace_cfg80211_report_wowlan_wakeup)(
1: +    void *, struct wiphy *, struct wireless_dev *,
1: +    struct cfg80211_wowlan_wakeup *);
1:  
1: -typedef void (*btf_trace_cfg80211_ft_event)(void *, struct wiphy *, struct net_device *, struct cfg80211_ft_event_params *);
1: +typedef void (*btf_trace_cfg80211_ft_event)(void *, struct wiphy *,
1: +                                            struct net_device *,
1: +                                            struct cfg80211_ft_event_params *);
1:  
1: -typedef void (*btf_trace_cfg80211_stop_iface)(void *, struct wiphy *, struct wireless_dev *);
1: +typedef void (*btf_trace_cfg80211_stop_iface)(void *, struct wiphy *,
1: +                                              struct wireless_dev *);
1:  
1: -typedef void (*btf_trace_cfg80211_pmsr_report)(void *, struct wiphy *, struct wireless_dev *, u64, const u8 *);
1: +typedef void (*btf_trace_cfg80211_pmsr_report)(void *, struct wiphy *,
1: +                                               struct wireless_dev *, u64,
1: +                                               const u8 *);
1:  
1: -typedef void (*btf_trace_cfg80211_pmsr_complete)(void *, struct wiphy *, struct wireless_dev *, u64);
1: +typedef void (*btf_trace_cfg80211_pmsr_complete)(void *, struct wiphy *,
1: +                                                 struct wireless_dev *, u64);
1:  
1: -typedef void (*btf_trace_rdev_update_owe_info)(void *, struct wiphy *, struct net_device *, struct cfg80211_update_owe_info *);
1: +typedef void (*btf_trace_rdev_update_owe_info)(
1: +    void *, struct wiphy *, struct net_device *,
1: +    struct cfg80211_update_owe_info *);
1:  
1: -typedef void (*btf_trace_cfg80211_update_owe_info_event)(void *, struct wiphy *, struct net_device *, struct cfg80211_update_owe_info *);
1: +typedef void (*btf_trace_cfg80211_update_owe_info_event)(
1: +    void *, struct wiphy *, struct net_device *,
1: +    struct cfg80211_update_owe_info *);
1:  
1: -typedef void (*btf_trace_rdev_probe_mesh_link)(void *, struct wiphy *, struct net_device *, const u8 *, const u8 *, size_t);
1: +typedef void (*btf_trace_rdev_probe_mesh_link)(void *, struct wiphy *,
1: +                                               struct net_device *, const u8 *,
1: +                                               const u8 *, size_t);
1:  
1: -typedef void (*btf_trace_rdev_set_tid_config)(void *, struct wiphy *, struct net_device *, struct cfg80211_tid_config *);
1: +typedef void (*btf_trace_rdev_set_tid_config)(void *, struct wiphy *,
1: +                                              struct net_device *,
1: +                                              struct cfg80211_tid_config *);
1:  
1: -typedef void (*btf_trace_rdev_reset_tid_config)(void *, struct wiphy *, struct net_device *, const u8 *, u8);
1: +typedef void (*btf_trace_rdev_reset_tid_config)(void *, struct wiphy *,
1: +                                                struct net_device *, const u8 *,
1: +                                                u8);
1:  
1:  enum nl80211_peer_measurement_status {
1: -	NL80211_PMSR_STATUS_SUCCESS = 0,
1: -	NL80211_PMSR_STATUS_REFUSED = 1,
1: -	NL80211_PMSR_STATUS_TIMEOUT = 2,
1: -	NL80211_PMSR_STATUS_FAILURE = 3,
1: +  NL80211_PMSR_STATUS_SUCCESS = 0,
1: +  NL80211_PMSR_STATUS_REFUSED = 1,
1: +  NL80211_PMSR_STATUS_TIMEOUT = 2,
1: +  NL80211_PMSR_STATUS_FAILURE = 3,
1:  };
1:  
1:  enum nl80211_peer_measurement_resp {
1: -	__NL80211_PMSR_RESP_ATTR_INVALID = 0,
1: -	NL80211_PMSR_RESP_ATTR_DATA = 1,
1: -	NL80211_PMSR_RESP_ATTR_STATUS = 2,
1: -	NL80211_PMSR_RESP_ATTR_HOST_TIME = 3,
1: -	NL80211_PMSR_RESP_ATTR_AP_TSF = 4,
1: -	NL80211_PMSR_RESP_ATTR_FINAL = 5,
1: -	NL80211_PMSR_RESP_ATTR_PAD = 6,
1: -	NUM_NL80211_PMSR_RESP_ATTRS = 7,
1: -	NL80211_PMSR_RESP_ATTR_MAX = 6,
1: +  __NL80211_PMSR_RESP_ATTR_INVALID = 0,
1: +  NL80211_PMSR_RESP_ATTR_DATA = 1,
1: +  NL80211_PMSR_RESP_ATTR_STATUS = 2,
1: +  NL80211_PMSR_RESP_ATTR_HOST_TIME = 3,
1: +  NL80211_PMSR_RESP_ATTR_AP_TSF = 4,
1: +  NL80211_PMSR_RESP_ATTR_FINAL = 5,
1: +  NL80211_PMSR_RESP_ATTR_PAD = 6,
1: +  NUM_NL80211_PMSR_RESP_ATTRS = 7,
1: +  NL80211_PMSR_RESP_ATTR_MAX = 6,
1:  };
1:  
1:  enum nl80211_peer_measurement_ftm_failure_reasons {
1: -	NL80211_PMSR_FTM_FAILURE_UNSPECIFIED = 0,
1: -	NL80211_PMSR_FTM_FAILURE_NO_RESPONSE = 1,
1: -	NL80211_PMSR_FTM_FAILURE_REJECTED = 2,
1: -	NL80211_PMSR_FTM_FAILURE_WRONG_CHANNEL = 3,
1: -	NL80211_PMSR_FTM_FAILURE_PEER_NOT_CAPABLE = 4,
1: -	NL80211_PMSR_FTM_FAILURE_INVALID_TIMESTAMP = 5,
1: -	NL80211_PMSR_FTM_FAILURE_PEER_BUSY = 6,
1: -	NL80211_PMSR_FTM_FAILURE_BAD_CHANGED_PARAMS = 7,
1: +  NL80211_PMSR_FTM_FAILURE_UNSPECIFIED = 0,
1: +  NL80211_PMSR_FTM_FAILURE_NO_RESPONSE = 1,
1: +  NL80211_PMSR_FTM_FAILURE_REJECTED = 2,
1: +  NL80211_PMSR_FTM_FAILURE_WRONG_CHANNEL = 3,
1: +  NL80211_PMSR_FTM_FAILURE_PEER_NOT_CAPABLE = 4,
1: +  NL80211_PMSR_FTM_FAILURE_INVALID_TIMESTAMP = 5,
1: +  NL80211_PMSR_FTM_FAILURE_PEER_BUSY = 6,
1: +  NL80211_PMSR_FTM_FAILURE_BAD_CHANGED_PARAMS = 7,
1:  };
1:  
1:  enum nl80211_peer_measurement_ftm_resp {
1: -	__NL80211_PMSR_FTM_RESP_ATTR_INVALID = 0,
1: -	NL80211_PMSR_FTM_RESP_ATTR_FAIL_REASON = 1,
1: -	NL80211_PMSR_FTM_RESP_ATTR_BURST_INDEX = 2,
1: -	NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_ATTEMPTS = 3,
1: -	NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_SUCCESSES = 4,
1: -	NL80211_PMSR_FTM_RESP_ATTR_BUSY_RETRY_TIME = 5,
1: -	NL80211_PMSR_FTM_RESP_ATTR_NUM_BURSTS_EXP = 6,
1: -	NL80211_PMSR_FTM_RESP_ATTR_BURST_DURATION = 7,
1: -	NL80211_PMSR_FTM_RESP_ATTR_FTMS_PER_BURST = 8,
1: -	NL80211_PMSR_FTM_RESP_ATTR_RSSI_AVG = 9,
1: -	NL80211_PMSR_FTM_RESP_ATTR_RSSI_SPREAD = 10,
1: -	NL80211_PMSR_FTM_RESP_ATTR_TX_RATE = 11,
1: -	NL80211_PMSR_FTM_RESP_ATTR_RX_RATE = 12,
1: -	NL80211_PMSR_FTM_RESP_ATTR_RTT_AVG = 13,
1: -	NL80211_PMSR_FTM_RESP_ATTR_RTT_VARIANCE = 14,
1: -	NL80211_PMSR_FTM_RESP_ATTR_RTT_SPREAD = 15,
1: -	NL80211_PMSR_FTM_RESP_ATTR_DIST_AVG = 16,
1: -	NL80211_PMSR_FTM_RESP_ATTR_DIST_VARIANCE = 17,
1: -	NL80211_PMSR_FTM_RESP_ATTR_DIST_SPREAD = 18,
1: -	NL80211_PMSR_FTM_RESP_ATTR_LCI = 19,
1: -	NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC = 20,
1: -	NL80211_PMSR_FTM_RESP_ATTR_PAD = 21,
1: -	NUM_NL80211_PMSR_FTM_RESP_ATTR = 22,
1: -	NL80211_PMSR_FTM_RESP_ATTR_MAX = 21,
1: +  __NL80211_PMSR_FTM_RESP_ATTR_INVALID = 0,
1: +  NL80211_PMSR_FTM_RESP_ATTR_FAIL_REASON = 1,
1: +  NL80211_PMSR_FTM_RESP_ATTR_BURST_INDEX = 2,
1: +  NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_ATTEMPTS = 3,
1: +  NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_SUCCESSES = 4,
1: +  NL80211_PMSR_FTM_RESP_ATTR_BUSY_RETRY_TIME = 5,
1: +  NL80211_PMSR_FTM_RESP_ATTR_NUM_BURSTS_EXP = 6,
1: +  NL80211_PMSR_FTM_RESP_ATTR_BURST_DURATION = 7,
1: +  NL80211_PMSR_FTM_RESP_ATTR_FTMS_PER_BURST = 8,
1: +  NL80211_PMSR_FTM_RESP_ATTR_RSSI_AVG = 9,
1: +  NL80211_PMSR_FTM_RESP_ATTR_RSSI_SPREAD = 10,
1: +  NL80211_PMSR_FTM_RESP_ATTR_TX_RATE = 11,
1: +  NL80211_PMSR_FTM_RESP_ATTR_RX_RATE = 12,
1: +  NL80211_PMSR_FTM_RESP_ATTR_RTT_AVG = 13,
1: +  NL80211_PMSR_FTM_RESP_ATTR_RTT_VARIANCE = 14,
1: +  NL80211_PMSR_FTM_RESP_ATTR_RTT_SPREAD = 15,
1: +  NL80211_PMSR_FTM_RESP_ATTR_DIST_AVG = 16,
1: +  NL80211_PMSR_FTM_RESP_ATTR_DIST_VARIANCE = 17,
1: +  NL80211_PMSR_FTM_RESP_ATTR_DIST_SPREAD = 18,
1: +  NL80211_PMSR_FTM_RESP_ATTR_LCI = 19,
1: +  NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC = 20,
1: +  NL80211_PMSR_FTM_RESP_ATTR_PAD = 21,
1: +  NUM_NL80211_PMSR_FTM_RESP_ATTR = 22,
1: +  NL80211_PMSR_FTM_RESP_ATTR_MAX = 21,
1:  };
1:  
1:  struct cfg80211_pmsr_ftm_result {
1: -	const u8 *lci;
1: -	const u8 *civicloc;
1: -	unsigned int lci_len;
1: -	unsigned int civicloc_len;
1: -	enum nl80211_peer_measurement_ftm_failure_reasons failure_reason;
1: -	u32 num_ftmr_attempts;
1: -	u32 num_ftmr_successes;
1: -	s16 burst_index;
1: -	u8 busy_retry_time;
1: -	u8 num_bursts_exp;
1: -	u8 burst_duration;
1: -	u8 ftms_per_burst;
1: -	s32 rssi_avg;
1: -	s32 rssi_spread;
1: -	struct rate_info tx_rate;
1: -	struct rate_info rx_rate;
1: -	s64 rtt_avg;
1: -	s64 rtt_variance;
1: -	s64 rtt_spread;
1: -	s64 dist_avg;
1: -	s64 dist_variance;
1: -	s64 dist_spread;
1: -	u16 num_ftmr_attempts_valid: 1;
1: -	u16 num_ftmr_successes_valid: 1;
1: -	u16 rssi_avg_valid: 1;
1: -	u16 rssi_spread_valid: 1;
1: -	u16 tx_rate_valid: 1;
1: -	u16 rx_rate_valid: 1;
1: -	u16 rtt_avg_valid: 1;
1: -	u16 rtt_variance_valid: 1;
1: -	u16 rtt_spread_valid: 1;
1: -	u16 dist_avg_valid: 1;
1: -	u16 dist_variance_valid: 1;
1: -	u16 dist_spread_valid: 1;
1: +  const u8 *lci;
1: +  const u8 *civicloc;
1: +  unsigned int lci_len;
1: +  unsigned int civicloc_len;
1: +  enum nl80211_peer_measurement_ftm_failure_reasons failure_reason;
1: +  u32 num_ftmr_attempts;
1: +  u32 num_ftmr_successes;
1: +  s16 burst_index;
1: +  u8 busy_retry_time;
1: +  u8 num_bursts_exp;
1: +  u8 burst_duration;
1: +  u8 ftms_per_burst;
1: +  s32 rssi_avg;
1: +  s32 rssi_spread;
1: +  struct rate_info tx_rate;
1: +  struct rate_info rx_rate;
1: +  s64 rtt_avg;
1: +  s64 rtt_variance;
1: +  s64 rtt_spread;
1: +  s64 dist_avg;
1: +  s64 dist_variance;
1: +  s64 dist_spread;
1: +  u16 num_ftmr_attempts_valid : 1;
1: +  u16 num_ftmr_successes_valid : 1;
1: +  u16 rssi_avg_valid : 1;
1: +  u16 rssi_spread_valid : 1;
1: +  u16 tx_rate_valid : 1;
1: +  u16 rx_rate_valid : 1;
1: +  u16 rtt_avg_valid : 1;
1: +  u16 rtt_variance_valid : 1;
1: +  u16 rtt_spread_valid : 1;
1: +  u16 dist_avg_valid : 1;
1: +  u16 dist_variance_valid : 1;
1: +  u16 dist_spread_valid : 1;
1:  };
1:  
1:  struct cfg80211_pmsr_result {
1: -	u64 host_time;
1: -	u64 ap_tsf;
1: -	enum nl80211_peer_measurement_status status;
1: -	u8 addr[6];
1: -	u8 final: 1;
1: -	u8 ap_tsf_valid: 1;
1: -	enum nl80211_peer_measurement_type type;
1: -	union {
1: -		struct cfg80211_pmsr_ftm_result ftm;
1: -	};
1: +  u64 host_time;
1: +  u64 ap_tsf;
1: +  enum nl80211_peer_measurement_status status;
1: +  u8 addr[6];
1: +  u8 final : 1;
1: +  u8 ap_tsf_valid : 1;
1: +  enum nl80211_peer_measurement_type type;
1: +  union {
1: +    struct cfg80211_pmsr_ftm_result ftm;
1: +  };
1:  };
1:  
1:  struct ieee80211_channel_sw_ie {
1: -	u8 mode;
1: -	u8 new_ch_num;
1: -	u8 count;
1: +  u8 mode;
1: +  u8 new_ch_num;
1: +  u8 count;
1:  };
1:  
1:  struct ieee80211_sec_chan_offs_ie {
1: -	u8 sec_chan_offs;
1: +  u8 sec_chan_offs;
1:  };
1:  
1:  struct ieee80211_mesh_chansw_params_ie {
1: -	u8 mesh_ttl;
1: -	u8 mesh_flags;
1: -	__le16 mesh_reason;
1: -	__le16 mesh_pre_value;
1: +  u8 mesh_ttl;
1: +  u8 mesh_flags;
1: +  __le16 mesh_reason;
1: +  __le16 mesh_pre_value;
1:  };
1:  
1:  struct ieee80211_wide_bw_chansw_ie {
1: -	u8 new_channel_width;
1: -	u8 new_center_freq_seg0;
1: -	u8 new_center_freq_seg1;
1: +  u8 new_channel_width;
1: +  u8 new_center_freq_seg0;
1: +  u8 new_center_freq_seg1;
1:  };
1:  
1:  struct ieee80211_tim_ie {
1: -	u8 dtim_count;
1: -	u8 dtim_period;
1: -	u8 bitmap_ctrl;
1: -	u8 virtual_map[1];
1: +  u8 dtim_count;
1: +  u8 dtim_period;
1: +  u8 bitmap_ctrl;
1: +  u8 virtual_map[1];
1:  };
1:  
1:  struct ieee80211_meshconf_ie {
1: -	u8 meshconf_psel;
1: -	u8 meshconf_pmetric;
1: -	u8 meshconf_congest;
1: -	u8 meshconf_synch;
1: -	u8 meshconf_auth;
1: -	u8 meshconf_form;
1: -	u8 meshconf_cap;
1: +  u8 meshconf_psel;
1: +  u8 meshconf_pmetric;
1: +  u8 meshconf_congest;
1: +  u8 meshconf_synch;
1: +  u8 meshconf_auth;
1: +  u8 meshconf_form;
1: +  u8 meshconf_cap;
1:  };
1:  
1:  struct ieee80211_rann_ie {
1: -	u8 rann_flags;
1: -	u8 rann_hopcount;
1: -	u8 rann_ttl;
1: -	u8 rann_addr[6];
1: -	__le32 rann_seq;
1: -	__le32 rann_interval;
1: -	__le32 rann_metric;
1: +  u8 rann_flags;
1: +  u8 rann_hopcount;
1: +  u8 rann_ttl;
1: +  u8 rann_addr[6];
1: +  __le32 rann_seq;
1: +  __le32 rann_interval;
1: +  __le32 rann_metric;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_addba_ext_ie {
1: -	u8 data;
1: +  u8 data;
1:  };
1:  
1:  struct ieee80211_aid_response_ie {
1: -	__le16 aid;
1: -	u8 switch_count;
1: -	__le16 response_int;
1: +  __le16 aid;
1: +  u8 switch_count;
1: +  __le16 response_int;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_ch_switch_timing {
1: -	__le16 switch_time;
1: -	__le16 switch_timeout;
1: +  __le16 switch_time;
1: +  __le16 switch_timeout;
1:  };
1:  
1:  struct ieee80211_tdls_lnkie {
1: -	u8 ie_type;
1: -	u8 ie_len;
1: -	u8 bssid[6];
1: -	u8 init_sta[6];
1: -	u8 resp_sta[6];
1: +  u8 ie_type;
1: +  u8 ie_len;
1: +  u8 bssid[6];
1: +  u8 init_sta[6];
1: +  u8 resp_sta[6];
1:  };
1:  
1:  struct ieee80211_p2p_noa_desc {
1: -	u8 count;
1: -	__le32 duration;
1: -	__le32 interval;
1: -	__le32 start_time;
1: +  u8 count;
1: +  __le32 duration;
1: +  __le32 interval;
1: +  __le32 start_time;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_p2p_noa_attr {
1: -	u8 index;
1: -	u8 oppps_ctwindow;
1: -	struct ieee80211_p2p_noa_desc desc[4];
1: +  u8 index;
1: +  u8 oppps_ctwindow;
1: +  struct ieee80211_p2p_noa_desc desc[4];
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_vht_operation {
1: -	u8 chan_width;
1: -	u8 center_freq_seg0_idx;
1: -	u8 center_freq_seg1_idx;
1: -	__le16 basic_mcs_set;
1: +  u8 chan_width;
1: +  u8 center_freq_seg0_idx;
1: +  u8 center_freq_seg1_idx;
1: +  __le16 basic_mcs_set;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_he_spr {
1: -	u8 he_sr_control;
1: -	u8 optional[0];
1: +  u8 he_sr_control;
1: +  u8 optional[0];
1:  };
1:  
1:  struct ieee80211_he_mu_edca_param_ac_rec {
1: -	u8 aifsn;
1: -	u8 ecw_min_max;
1: -	u8 mu_edca_timer;
1: +  u8 aifsn;
1: +  u8 ecw_min_max;
1: +  u8 mu_edca_timer;
1:  };
1:  
1:  struct ieee80211_mu_edca_param_set {
1: -	u8 mu_qos_info;
1: -	struct ieee80211_he_mu_edca_param_ac_rec ac_be;
1: -	struct ieee80211_he_mu_edca_param_ac_rec ac_bk;
1: -	struct ieee80211_he_mu_edca_param_ac_rec ac_vi;
1: -	struct ieee80211_he_mu_edca_param_ac_rec ac_vo;
1: +  u8 mu_qos_info;
1: +  struct ieee80211_he_mu_edca_param_ac_rec ac_be;
1: +  struct ieee80211_he_mu_edca_param_ac_rec ac_bk;
1: +  struct ieee80211_he_mu_edca_param_ac_rec ac_vi;
1: +  struct ieee80211_he_mu_edca_param_ac_rec ac_vo;
1:  };
1:  
1:  struct ieee80211_timeout_interval_ie {
1: -	u8 type;
1: -	__le32 value;
1: +  u8 type;
1: +  __le32 value;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_bss_max_idle_period_ie {
1: -	__le16 max_idle_period;
1: -	u8 idle_options;
1: +  __le16 max_idle_period;
1: +  u8 idle_options;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_bssid_index {
1: -	u8 bssid_index;
1: -	u8 dtim_period;
1: -	u8 dtim_count;
1: +  u8 bssid_index;
1: +  u8 dtim_period;
1: +  u8 dtim_count;
1:  };
1:  
1:  struct ieee80211_multiple_bssid_configuration {
1: -	u8 bssid_count;
1: -	u8 profile_periodicity;
1: +  u8 bssid_count;
1: +  u8 profile_periodicity;
1:  };
1:  
1:  enum ieee80211_radiotap_mcs_have {
1: -	IEEE80211_RADIOTAP_MCS_HAVE_BW = 1,
1: -	IEEE80211_RADIOTAP_MCS_HAVE_MCS = 2,
1: -	IEEE80211_RADIOTAP_MCS_HAVE_GI = 4,
1: -	IEEE80211_RADIOTAP_MCS_HAVE_FMT = 8,
1: -	IEEE80211_RADIOTAP_MCS_HAVE_FEC = 16,
1: -	IEEE80211_RADIOTAP_MCS_HAVE_STBC = 32,
1: +  IEEE80211_RADIOTAP_MCS_HAVE_BW = 1,
1: +  IEEE80211_RADIOTAP_MCS_HAVE_MCS = 2,
1: +  IEEE80211_RADIOTAP_MCS_HAVE_GI = 4,
1: +  IEEE80211_RADIOTAP_MCS_HAVE_FMT = 8,
1: +  IEEE80211_RADIOTAP_MCS_HAVE_FEC = 16,
1: +  IEEE80211_RADIOTAP_MCS_HAVE_STBC = 32,
1:  };
1:  
1:  enum ieee80211_radiotap_vht_known {
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_STBC = 1,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_TXOP_PS_NA = 2,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_GI = 4,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_SGI_NSYM_DIS = 8,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_LDPC_EXTRA_OFDM_SYM = 16,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED = 32,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH = 64,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_GROUP_ID = 128,
1: -	IEEE80211_RADIOTAP_VHT_KNOWN_PARTIAL_AID = 256,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_STBC = 1,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_TXOP_PS_NA = 2,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_GI = 4,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_SGI_NSYM_DIS = 8,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_LDPC_EXTRA_OFDM_SYM = 16,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED = 32,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH = 64,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_GROUP_ID = 128,
1: +  IEEE80211_RADIOTAP_VHT_KNOWN_PARTIAL_AID = 256,
1:  };
1:  
1:  enum ieee80211_max_queues {
1: -	IEEE80211_MAX_QUEUES = 16,
1: -	IEEE80211_MAX_QUEUE_MAP = 65535,
1: +  IEEE80211_MAX_QUEUES = 16,
1: +  IEEE80211_MAX_QUEUE_MAP = 65535,
1:  };
1:  
1:  struct ieee80211_tx_queue_params {
1: -	u16 txop;
1: -	u16 cw_min;
1: -	u16 cw_max;
1: -	u8 aifs;
1: -	bool acm;
1: -	bool uapsd;
1: -	bool mu_edca;
1: -	struct ieee80211_he_mu_edca_param_ac_rec mu_edca_param_rec;
1: +  u16 txop;
1: +  u16 cw_min;
1: +  u16 cw_max;
1: +  u8 aifs;
1: +  bool acm;
1: +  bool uapsd;
1: +  bool mu_edca;
1: +  struct ieee80211_he_mu_edca_param_ac_rec mu_edca_param_rec;
1:  };
1:  
1:  struct ieee80211_low_level_stats {
1: -	unsigned int dot11ACKFailureCount;
1: -	unsigned int dot11RTSFailureCount;
1: -	unsigned int dot11FCSErrorCount;
1: -	unsigned int dot11RTSSuccessCount;
1: +  unsigned int dot11ACKFailureCount;
1: +  unsigned int dot11RTSFailureCount;
1: +  unsigned int dot11FCSErrorCount;
1: +  unsigned int dot11RTSSuccessCount;
1:  };
1:  
1:  struct ieee80211_chanctx_conf {
1: -	struct cfg80211_chan_def def;
1: -	struct cfg80211_chan_def min_def;
1: -	u8 rx_chains_static;
1: -	u8 rx_chains_dynamic;
1: -	bool radar_enabled;
1: -	long: 40;
1: -	u8 drv_priv[0];
1: +  struct cfg80211_chan_def def;
1: +  struct cfg80211_chan_def min_def;
1: +  u8 rx_chains_static;
1: +  u8 rx_chains_dynamic;
1: +  bool radar_enabled;
1: +  long : 40;
1: +  u8 drv_priv[0];
1:  };
1:  
1:  enum ieee80211_chanctx_switch_mode {
1: -	CHANCTX_SWMODE_REASSIGN_VIF = 0,
1: -	CHANCTX_SWMODE_SWAP_CONTEXTS = 1,
1: +  CHANCTX_SWMODE_REASSIGN_VIF = 0,
1: +  CHANCTX_SWMODE_SWAP_CONTEXTS = 1,
1:  };
1:  
1:  struct ieee80211_vif;
1:  
1:  struct ieee80211_vif_chanctx_switch {
1: -	struct ieee80211_vif *vif;
1: -	struct ieee80211_chanctx_conf *old_ctx;
1: -	struct ieee80211_chanctx_conf *new_ctx;
1: +  struct ieee80211_vif *vif;
1: +  struct ieee80211_chanctx_conf *old_ctx;
1: +  struct ieee80211_chanctx_conf *new_ctx;
1:  };
1:  
1:  struct ieee80211_mu_group_data {
1: -	u8 membership[8];
1: -	u8 position[16];
1: +  u8 membership[8];
1: +  u8 position[16];
1:  };
1:  
1:  struct ieee80211_fils_discovery {
1: -	u32 min_interval;
1: -	u32 max_interval;
1: +  u32 min_interval;
1: +  u32 max_interval;
1:  };
1:  
1:  struct ieee80211_ftm_responder_params;
1:  
1:  struct ieee80211_bss_conf {
1: -	const u8 *bssid;
1: -	u8 htc_trig_based_pkt_ext;
1: -	bool multi_sta_back_32bit;
1: -	bool uora_exists;
1: -	bool ack_enabled;
1: -	u8 uora_ocw_range;
1: -	u16 frame_time_rts_th;
1: -	bool he_support;
1: -	bool twt_requester;
1: -	bool twt_responder;
1: -	bool twt_protected;
1: -	bool assoc;
1: -	bool ibss_joined;
1: -	bool ibss_creator;
1: -	u16 aid;
1: -	bool use_cts_prot;
1: -	bool use_short_preamble;
1: -	bool use_short_slot;
1: -	bool enable_beacon;
1: -	u8 dtim_period;
1: -	u16 beacon_int;
1: -	u16 assoc_capability;
1: -	u64 sync_tsf;
1: -	u32 sync_device_ts;
1: -	u8 sync_dtim_count;
1: -	u32 basic_rates;
1: -	struct ieee80211_rate *beacon_rate;
1: -	int mcast_rate[5];
1: -	u16 ht_operation_mode;
1: -	s32 cqm_rssi_thold;
1: -	u32 cqm_rssi_hyst;
1: -	s32 cqm_rssi_low;
1: -	s32 cqm_rssi_high;
1: -	struct cfg80211_chan_def chandef;
1: -	struct ieee80211_mu_group_data mu_group;
1: -	__be32 arp_addr_list[4];
1: -	int arp_addr_cnt;
1: -	bool qos;
1: -	bool idle;
1: -	bool ps;
1: -	u8 ssid[32];
1: -	size_t ssid_len;
1: -	bool hidden_ssid;
1: -	int txpower;
1: -	enum nl80211_tx_power_setting txpower_type;
1: -	struct ieee80211_p2p_noa_attr p2p_noa_attr;
1: -	bool allow_p2p_go_ps;
1: -	u16 max_idle_period;
1: -	bool protected_keep_alive;
1: -	bool ftm_responder;
1: -	struct ieee80211_ftm_responder_params *ftmr_params;
1: -	bool nontransmitted;
1: -	u8 transmitter_bssid[6];
1: -	u8 bssid_index;
1: -	u8 bssid_indicator;
1: -	bool ema_ap;
1: -	u8 profile_periodicity;
1: -	struct {
1: -		u32 params;
1: -		u16 nss_set;
1: -	} he_oper;
1: -	struct ieee80211_he_obss_pd he_obss_pd;
1: -	struct cfg80211_he_bss_color he_bss_color;
1: -	struct ieee80211_fils_discovery fils_discovery;
1: -	u32 unsol_bcast_probe_resp_interval;
1: -	bool s1g;
1: -	struct cfg80211_bitrate_mask beacon_tx_rate;
1: +  const u8 *bssid;
1: +  u8 htc_trig_based_pkt_ext;
1: +  bool multi_sta_back_32bit;
1: +  bool uora_exists;
1: +  bool ack_enabled;
1: +  u8 uora_ocw_range;
1: +  u16 frame_time_rts_th;
1: +  bool he_support;
1: +  bool twt_requester;
1: +  bool twt_responder;
1: +  bool twt_protected;
1: +  bool assoc;
1: +  bool ibss_joined;
1: +  bool ibss_creator;
1: +  u16 aid;
1: +  bool use_cts_prot;
1: +  bool use_short_preamble;
1: +  bool use_short_slot;
1: +  bool enable_beacon;
1: +  u8 dtim_period;
1: +  u16 beacon_int;
1: +  u16 assoc_capability;
1: +  u64 sync_tsf;
1: +  u32 sync_device_ts;
1: +  u8 sync_dtim_count;
1: +  u32 basic_rates;
1: +  struct ieee80211_rate *beacon_rate;
1: +  int mcast_rate[5];
1: +  u16 ht_operation_mode;
1: +  s32 cqm_rssi_thold;
1: +  u32 cqm_rssi_hyst;
1: +  s32 cqm_rssi_low;
1: +  s32 cqm_rssi_high;
1: +  struct cfg80211_chan_def chandef;
1: +  struct ieee80211_mu_group_data mu_group;
1: +  __be32 arp_addr_list[4];
1: +  int arp_addr_cnt;
1: +  bool qos;
1: +  bool idle;
1: +  bool ps;
1: +  u8 ssid[32];
1: +  size_t ssid_len;
1: +  bool hidden_ssid;
1: +  int txpower;
1: +  enum nl80211_tx_power_setting txpower_type;
1: +  struct ieee80211_p2p_noa_attr p2p_noa_attr;
1: +  bool allow_p2p_go_ps;
1: +  u16 max_idle_period;
1: +  bool protected_keep_alive;
1: +  bool ftm_responder;
1: +  struct ieee80211_ftm_responder_params *ftmr_params;
1: +  bool nontransmitted;
1: +  u8 transmitter_bssid[6];
1: +  u8 bssid_index;
1: +  u8 bssid_indicator;
1: +  bool ema_ap;
1: +  u8 profile_periodicity;
1: +  struct {
1: +    u32 params;
1: +    u16 nss_set;
1: +  } he_oper;
1: +  struct ieee80211_he_obss_pd he_obss_pd;
1: +  struct cfg80211_he_bss_color he_bss_color;
1: +  struct ieee80211_fils_discovery fils_discovery;
1: +  u32 unsol_bcast_probe_resp_interval;
1: +  bool s1g;
1: +  struct cfg80211_bitrate_mask beacon_tx_rate;
1:  };
1:  
1:  struct ieee80211_txq;
1:  
1:  struct ieee80211_vif {
1: -	enum nl80211_iftype type;
1: -	struct ieee80211_bss_conf bss_conf;
1: -	u8 addr[6];
1: -	bool p2p;
1: -	bool csa_active;
1: -	bool mu_mimo_owner;
1: -	u8 cab_queue;
1: -	u8 hw_queue[4];
1: -	struct ieee80211_txq *txq;
1: -	struct ieee80211_chanctx_conf *chanctx_conf;
1: -	u32 driver_flags;
1: -	u32 offload_flags;
1: -	bool probe_req_reg;
1: -	bool rx_mcast_action_reg;
1: -	bool txqs_stopped[4];
1: -	short: 16;
1: -	u8 drv_priv[0];
1: +  enum nl80211_iftype type;
1: +  struct ieee80211_bss_conf bss_conf;
1: +  u8 addr[6];
1: +  bool p2p;
1: +  bool csa_active;
1: +  bool mu_mimo_owner;
1: +  u8 cab_queue;
1: +  u8 hw_queue[4];
1: +  struct ieee80211_txq *txq;
1: +  struct ieee80211_chanctx_conf *chanctx_conf;
1: +  u32 driver_flags;
1: +  u32 offload_flags;
1: +  bool probe_req_reg;
1: +  bool rx_mcast_action_reg;
1: +  bool txqs_stopped[4];
1: +  short : 16;
1: +  u8 drv_priv[0];
1:  };
1:  
1:  enum ieee80211_bss_change {
1: -	BSS_CHANGED_ASSOC = 1,
1: -	BSS_CHANGED_ERP_CTS_PROT = 2,
1: -	BSS_CHANGED_ERP_PREAMBLE = 4,
1: -	BSS_CHANGED_ERP_SLOT = 8,
1: -	BSS_CHANGED_HT = 16,
1: -	BSS_CHANGED_BASIC_RATES = 32,
1: -	BSS_CHANGED_BEACON_INT = 64,
1: -	BSS_CHANGED_BSSID = 128,
1: -	BSS_CHANGED_BEACON = 256,
1: -	BSS_CHANGED_BEACON_ENABLED = 512,
1: -	BSS_CHANGED_CQM = 1024,
1: -	BSS_CHANGED_IBSS = 2048,
1: -	BSS_CHANGED_ARP_FILTER = 4096,
1: -	BSS_CHANGED_QOS = 8192,
1: -	BSS_CHANGED_IDLE = 16384,
1: -	BSS_CHANGED_SSID = 32768,
1: -	BSS_CHANGED_AP_PROBE_RESP = 65536,
1: -	BSS_CHANGED_PS = 131072,
1: -	BSS_CHANGED_TXPOWER = 262144,
1: -	BSS_CHANGED_P2P_PS = 524288,
1: -	BSS_CHANGED_BEACON_INFO = 1048576,
1: -	BSS_CHANGED_BANDWIDTH = 2097152,
1: -	BSS_CHANGED_OCB = 4194304,
1: -	BSS_CHANGED_MU_GROUPS = 8388608,
1: -	BSS_CHANGED_KEEP_ALIVE = 16777216,
1: -	BSS_CHANGED_MCAST_RATE = 33554432,
1: -	BSS_CHANGED_FTM_RESPONDER = 67108864,
1: -	BSS_CHANGED_TWT = 134217728,
1: -	BSS_CHANGED_HE_OBSS_PD = 268435456,
1: -	BSS_CHANGED_HE_BSS_COLOR = 536870912,
1: -	BSS_CHANGED_FILS_DISCOVERY = 1073741824,
1: -	BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = 2147483648,
1: +  BSS_CHANGED_ASSOC = 1,
1: +  BSS_CHANGED_ERP_CTS_PROT = 2,
1: +  BSS_CHANGED_ERP_PREAMBLE = 4,
1: +  BSS_CHANGED_ERP_SLOT = 8,
1: +  BSS_CHANGED_HT = 16,
1: +  BSS_CHANGED_BASIC_RATES = 32,
1: +  BSS_CHANGED_BEACON_INT = 64,
1: +  BSS_CHANGED_BSSID = 128,
1: +  BSS_CHANGED_BEACON = 256,
1: +  BSS_CHANGED_BEACON_ENABLED = 512,
1: +  BSS_CHANGED_CQM = 1024,
1: +  BSS_CHANGED_IBSS = 2048,
1: +  BSS_CHANGED_ARP_FILTER = 4096,
1: +  BSS_CHANGED_QOS = 8192,
1: +  BSS_CHANGED_IDLE = 16384,
1: +  BSS_CHANGED_SSID = 32768,
1: +  BSS_CHANGED_AP_PROBE_RESP = 65536,
1: +  BSS_CHANGED_PS = 131072,
1: +  BSS_CHANGED_TXPOWER = 262144,
1: +  BSS_CHANGED_P2P_PS = 524288,
1: +  BSS_CHANGED_BEACON_INFO = 1048576,
1: +  BSS_CHANGED_BANDWIDTH = 2097152,
1: +  BSS_CHANGED_OCB = 4194304,
1: +  BSS_CHANGED_MU_GROUPS = 8388608,
1: +  BSS_CHANGED_KEEP_ALIVE = 16777216,
1: +  BSS_CHANGED_MCAST_RATE = 33554432,
1: +  BSS_CHANGED_FTM_RESPONDER = 67108864,
1: +  BSS_CHANGED_TWT = 134217728,
1: +  BSS_CHANGED_HE_OBSS_PD = 268435456,
1: +  BSS_CHANGED_HE_BSS_COLOR = 536870912,
1: +  BSS_CHANGED_FILS_DISCOVERY = 1073741824,
1: +  BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = 2147483648,
1:  };
1:  
1:  enum ieee80211_event_type {
1: -	RSSI_EVENT = 0,
1: -	MLME_EVENT = 1,
1: -	BAR_RX_EVENT = 2,
1: -	BA_FRAME_TIMEOUT = 3,
1: +  RSSI_EVENT = 0,
1: +  MLME_EVENT = 1,
1: +  BAR_RX_EVENT = 2,
1: +  BA_FRAME_TIMEOUT = 3,
1:  };
1:  
1:  enum ieee80211_rssi_event_data {
1: -	RSSI_EVENT_HIGH = 0,
1: -	RSSI_EVENT_LOW = 1,
1: +  RSSI_EVENT_HIGH = 0,
1: +  RSSI_EVENT_LOW = 1,
1:  };
1:  
1:  struct ieee80211_rssi_event {
1: -	enum ieee80211_rssi_event_data data;
1: +  enum ieee80211_rssi_event_data data;
1:  };
1:  
1:  enum ieee80211_mlme_event_data {
1: -	AUTH_EVENT = 0,
1: -	ASSOC_EVENT = 1,
1: -	DEAUTH_RX_EVENT = 2,
1: -	DEAUTH_TX_EVENT = 3,
1: +  AUTH_EVENT = 0,
1: +  ASSOC_EVENT = 1,
1: +  DEAUTH_RX_EVENT = 2,
1: +  DEAUTH_TX_EVENT = 3,
1:  };
1:  
1:  enum ieee80211_mlme_event_status {
1: -	MLME_SUCCESS = 0,
1: -	MLME_DENIED = 1,
1: -	MLME_TIMEOUT = 2,
1: +  MLME_SUCCESS = 0,
1: +  MLME_DENIED = 1,
1: +  MLME_TIMEOUT = 2,
1:  };
1:  
1:  struct ieee80211_mlme_event {
1: -	enum ieee80211_mlme_event_data data;
1: -	enum ieee80211_mlme_event_status status;
1: -	u16 reason;
1: +  enum ieee80211_mlme_event_data data;
1: +  enum ieee80211_mlme_event_status status;
1: +  u16 reason;
1:  };
1:  
1:  struct ieee80211_sta;
1:  
1:  struct ieee80211_ba_event {
1: -	struct ieee80211_sta *sta;
1: -	u16 tid;
1: -	u16 ssn;
1: +  struct ieee80211_sta *sta;
1: +  u16 tid;
1: +  u16 ssn;
1:  };
1:  
1:  enum ieee80211_sta_rx_bandwidth {
1: -	IEEE80211_STA_RX_BW_20 = 0,
1: -	IEEE80211_STA_RX_BW_40 = 1,
1: -	IEEE80211_STA_RX_BW_80 = 2,
1: -	IEEE80211_STA_RX_BW_160 = 3,
1: +  IEEE80211_STA_RX_BW_20 = 0,
1: +  IEEE80211_STA_RX_BW_40 = 1,
1: +  IEEE80211_STA_RX_BW_80 = 2,
1: +  IEEE80211_STA_RX_BW_160 = 3,
1:  };
1:  
1:  enum ieee80211_smps_mode {
1: -	IEEE80211_SMPS_AUTOMATIC = 0,
1: -	IEEE80211_SMPS_OFF = 1,
1: -	IEEE80211_SMPS_STATIC = 2,
1: -	IEEE80211_SMPS_DYNAMIC = 3,
1: -	IEEE80211_SMPS_NUM_MODES = 4,
1: +  IEEE80211_SMPS_AUTOMATIC = 0,
1: +  IEEE80211_SMPS_OFF = 1,
1: +  IEEE80211_SMPS_STATIC = 2,
1: +  IEEE80211_SMPS_DYNAMIC = 3,
1: +  IEEE80211_SMPS_NUM_MODES = 4,
1:  };
1:  
1:  struct ieee80211_sta_txpwr {
1: -	s16 power;
1: -	enum nl80211_tx_power_setting type;
1: +  s16 power;
1: +  enum nl80211_tx_power_setting type;
1:  };
1:  
1:  struct ieee80211_sta_rates;
1:  
1:  struct ieee80211_sta {
1: -	u32 supp_rates[5];
1: -	u8 addr[6];
1: -	u16 aid;
1: -	struct ieee80211_sta_ht_cap ht_cap;
1: -	short: 16;
1: -	struct ieee80211_sta_vht_cap vht_cap;
1: -	struct ieee80211_sta_he_cap he_cap;
1: -	struct ieee80211_he_6ghz_capa he_6ghz_capa;
1: -	char: 8;
1: -	u16 max_rx_aggregation_subframes;
1: -	bool wme;
1: -	u8 uapsd_queues;
1: -	u8 max_sp;
1: -	u8 rx_nss;
1: -	enum ieee80211_sta_rx_bandwidth bandwidth;
1: -	enum ieee80211_smps_mode smps_mode;
1: -	int: 32;
1: -	struct ieee80211_sta_rates *rates;
1: -	bool tdls;
1: -	bool tdls_initiator;
1: -	bool mfp;
1: -	u8 max_amsdu_subframes;
1: -	u16 max_amsdu_len;
1: -	bool support_p2p_ps;
1: -	char: 8;
1: -	u16 max_rc_amsdu_len;
1: -	u16 max_tid_amsdu_len[16];
1: -	short: 16;
1: -	struct ieee80211_sta_txpwr txpwr;
1: -	int: 32;
1: -	struct ieee80211_txq *txq[17];
1: -	u8 drv_priv[0];
1: +  u32 supp_rates[5];
1: +  u8 addr[6];
1: +  u16 aid;
1: +  struct ieee80211_sta_ht_cap ht_cap;
1: +  short : 16;
1: +  struct ieee80211_sta_vht_cap vht_cap;
1: +  struct ieee80211_sta_he_cap he_cap;
1: +  struct ieee80211_he_6ghz_capa he_6ghz_capa;
1: +  char : 8;
1: +  u16 max_rx_aggregation_subframes;
1: +  bool wme;
1: +  u8 uapsd_queues;
1: +  u8 max_sp;
1: +  u8 rx_nss;
1: +  enum ieee80211_sta_rx_bandwidth bandwidth;
1: +  enum ieee80211_smps_mode smps_mode;
1: +  int : 32;
1: +  struct ieee80211_sta_rates *rates;
1: +  bool tdls;
1: +  bool tdls_initiator;
1: +  bool mfp;
1: +  u8 max_amsdu_subframes;
1: +  u16 max_amsdu_len;
1: +  bool support_p2p_ps;
1: +  char : 8;
1: +  u16 max_rc_amsdu_len;
1: +  u16 max_tid_amsdu_len[16];
1: +  short : 16;
1: +  struct ieee80211_sta_txpwr txpwr;
1: +  int : 32;
1: +  struct ieee80211_txq *txq[17];
1: +  u8 drv_priv[0];
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_event {
1: -	enum ieee80211_event_type type;
1: -	union {
1: -		struct ieee80211_rssi_event rssi;
1: -		struct ieee80211_mlme_event mlme;
1: -		struct ieee80211_ba_event ba;
1: -	} u;
1: +  enum ieee80211_event_type type;
1: +  union {
1: +    struct ieee80211_rssi_event rssi;
1: +    struct ieee80211_mlme_event mlme;
1: +    struct ieee80211_ba_event ba;
1: +  } u;
1:  };
1:  
1:  struct ieee80211_ftm_responder_params {
1: -	const u8 *lci;
1: -	const u8 *civicloc;
1: -	size_t lci_len;
1: -	size_t civicloc_len;
1: +  const u8 *lci;
1: +  const u8 *civicloc;
1: +  size_t lci_len;
1: +  size_t civicloc_len;
1:  };
1:  
1:  struct ieee80211_tx_rate {
1: -	s8 idx;
1: -	u16 count: 5;
1: -	u16 flags: 11;
1: +  s8 idx;
1: +  u16 count : 5;
1: +  u16 flags : 11;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_key_conf {
1: -	atomic64_t tx_pn;
1: -	u32 cipher;
1: -	u8 icv_len;
1: -	u8 iv_len;
1: -	u8 hw_key_idx;
1: -	s8 keyidx;
1: -	u16 flags;
1: -	u8 keylen;
1: -	u8 key[0];
1: +  atomic64_t tx_pn;
1: +  u32 cipher;
1: +  u8 icv_len;
1: +  u8 iv_len;
1: +  u8 hw_key_idx;
1: +  s8 keyidx;
1: +  u16 flags;
1: +  u8 keylen;
1: +  u8 key[0];
1:  };
1:  
1:  struct ieee80211_tx_info {
1: -	u32 flags;
1: -	u32 band: 3;
1: -	u32 ack_frame_id: 13;
1: -	u32 hw_queue: 4;
1: -	u32 tx_time_est: 10;
1: -	union {
1: -		struct {
1: -			union {
1: -				struct {
1: -					struct ieee80211_tx_rate rates[4];
1: -					s8 rts_cts_rate_idx;
1: -					u8 use_rts: 1;
1: -					u8 use_cts_prot: 1;
1: -					u8 short_preamble: 1;
1: -					u8 skip_table: 1;
1: -				};
1: -				long unsigned int jiffies;
1: -			};
1: -			struct ieee80211_vif *vif;
1: -			struct ieee80211_key_conf *hw_key;
1: -			u32 flags;
1: -			codel_time_t enqueue_time;
1: -		} control;
1: -		struct {
1: -			u64 cookie;
1: -		} ack;
1: -		struct {
1: -			struct ieee80211_tx_rate rates[4];
1: -			s32 ack_signal;
1: -			u8 ampdu_ack_len;
1: -			u8 ampdu_len;
1: -			u8 antenna;
1: -			u16 tx_time;
1: -			bool is_valid_ack_signal;
1: -			void *status_driver_data[2];
1: -		} status;
1: -		struct {
1: -			struct ieee80211_tx_rate driver_rates[4];
1: -			u8 pad[4];
1: -			void *rate_driver_data[3];
1: -		};
1: -		void *driver_data[5];
1: -	};
1: +  u32 flags;
1: +  u32 band : 3;
1: +  u32 ack_frame_id : 13;
1: +  u32 hw_queue : 4;
1: +  u32 tx_time_est : 10;
1: +  union {
1: +    struct {
1: +      union {
1: +        struct {
1: +          struct ieee80211_tx_rate rates[4];
1: +          s8 rts_cts_rate_idx;
1: +          u8 use_rts : 1;
1: +          u8 use_cts_prot : 1;
1: +          u8 short_preamble : 1;
1: +          u8 skip_table : 1;
1: +        };
1: +        long unsigned int jiffies;
1: +      };
1: +      struct ieee80211_vif *vif;
1: +      struct ieee80211_key_conf *hw_key;
1: +      u32 flags;
1: +      codel_time_t enqueue_time;
1: +    } control;
1: +    struct {
1: +      u64 cookie;
1: +    } ack;
1: +    struct {
1: +      struct ieee80211_tx_rate rates[4];
1: +      s32 ack_signal;
1: +      u8 ampdu_ack_len;
1: +      u8 ampdu_len;
1: +      u8 antenna;
1: +      u16 tx_time;
1: +      bool is_valid_ack_signal;
1: +      void *status_driver_data[2];
1: +    } status;
1: +    struct {
1: +      struct ieee80211_tx_rate driver_rates[4];
1: +      u8 pad[4];
1: +      void *rate_driver_data[3];
1: +    };
1: +    void *driver_data[5];
1: +  };
1:  };
1:  
1:  struct ieee80211_tx_status {
1: -	struct ieee80211_sta *sta;
1: -	struct ieee80211_tx_info *info;
1: -	struct sk_buff *skb;
1: -	struct rate_info *rate;
1: -	struct list_head *free_list;
1: +  struct ieee80211_sta *sta;
1: +  struct ieee80211_tx_info *info;
1: +  struct sk_buff *skb;
1: +  struct rate_info *rate;
1: +  struct list_head *free_list;
1:  };
1:  
1:  struct ieee80211_scan_ies {
1: -	const u8 *ies[5];
1: -	size_t len[5];
1: -	const u8 *common_ies;
1: -	size_t common_ie_len;
1: +  const u8 *ies[5];
1: +  size_t len[5];
1: +  const u8 *common_ies;
1: +  size_t common_ie_len;
1:  };
1:  
1:  struct ieee80211_rx_status {
1: -	u64 mactime;
1: -	u64 boottime_ns;
1: -	u32 device_timestamp;
1: -	u32 ampdu_reference;
1: -	u32 flag;
1: -	u16 freq: 13;
1: -	u16 freq_offset: 1;
1: -	u8 enc_flags;
1: -	u8 encoding: 2;
1: -	u8 bw: 3;
1: -	u8 he_ru: 3;
1: -	u8 he_gi: 2;
1: -	u8 he_dcm: 1;
1: -	u8 rate_idx;
1: -	u8 nss;
1: -	u8 rx_flags;
1: -	u8 band;
1: -	u8 antenna;
1: -	s8 signal;
1: -	u8 chains;
1: -	s8 chain_signal[4];
1: -	u8 ampdu_delimiter_crc;
1: -	u8 zero_length_psdu_type;
1: +  u64 mactime;
1: +  u64 boottime_ns;
1: +  u32 device_timestamp;
1: +  u32 ampdu_reference;
1: +  u32 flag;
1: +  u16 freq : 13;
1: +  u16 freq_offset : 1;
1: +  u8 enc_flags;
1: +  u8 encoding : 2;
1: +  u8 bw : 3;
1: +  u8 he_ru : 3;
1: +  u8 he_gi : 2;
1: +  u8 he_dcm : 1;
1: +  u8 rate_idx;
1: +  u8 nss;
1: +  u8 rx_flags;
1: +  u8 band;
1: +  u8 antenna;
1: +  s8 signal;
1: +  u8 chains;
1: +  s8 chain_signal[4];
1: +  u8 ampdu_delimiter_crc;
1: +  u8 zero_length_psdu_type;
1:  };
1:  
1:  enum ieee80211_conf_flags {
1: -	IEEE80211_CONF_MONITOR = 1,
1: -	IEEE80211_CONF_PS = 2,
1: -	IEEE80211_CONF_IDLE = 4,
1: -	IEEE80211_CONF_OFFCHANNEL = 8,
1: +  IEEE80211_CONF_MONITOR = 1,
1: +  IEEE80211_CONF_PS = 2,
1: +  IEEE80211_CONF_IDLE = 4,
1: +  IEEE80211_CONF_OFFCHANNEL = 8,
1:  };
1:  
1:  enum ieee80211_conf_changed {
1: -	IEEE80211_CONF_CHANGE_SMPS = 2,
1: -	IEEE80211_CONF_CHANGE_LISTEN_INTERVAL = 4,
1: -	IEEE80211_CONF_CHANGE_MONITOR = 8,
1: -	IEEE80211_CONF_CHANGE_PS = 16,
1: -	IEEE80211_CONF_CHANGE_POWER = 32,
1: -	IEEE80211_CONF_CHANGE_CHANNEL = 64,
1: -	IEEE80211_CONF_CHANGE_RETRY_LIMITS = 128,
1: -	IEEE80211_CONF_CHANGE_IDLE = 256,
1: +  IEEE80211_CONF_CHANGE_SMPS = 2,
1: +  IEEE80211_CONF_CHANGE_LISTEN_INTERVAL = 4,
1: +  IEEE80211_CONF_CHANGE_MONITOR = 8,
1: +  IEEE80211_CONF_CHANGE_PS = 16,
1: +  IEEE80211_CONF_CHANGE_POWER = 32,
1: +  IEEE80211_CONF_CHANGE_CHANNEL = 64,
1: +  IEEE80211_CONF_CHANGE_RETRY_LIMITS = 128,
1: +  IEEE80211_CONF_CHANGE_IDLE = 256,
1:  };
1:  
1:  struct ieee80211_conf {
1: -	u32 flags;
1: -	int power_level;
1: -	int dynamic_ps_timeout;
1: -	u16 listen_interval;
1: -	u8 ps_dtim_period;
1: -	u8 long_frame_max_tx_count;
1: -	u8 short_frame_max_tx_count;
1: -	struct cfg80211_chan_def chandef;
1: -	bool radar_enabled;
1: -	enum ieee80211_smps_mode smps_mode;
1: +  u32 flags;
1: +  int power_level;
1: +  int dynamic_ps_timeout;
1: +  u16 listen_interval;
1: +  u8 ps_dtim_period;
1: +  u8 long_frame_max_tx_count;
1: +  u8 short_frame_max_tx_count;
1: +  struct cfg80211_chan_def chandef;
1: +  bool radar_enabled;
1: +  enum ieee80211_smps_mode smps_mode;
1:  };
1:  
1:  struct ieee80211_channel_switch {
1: -	u64 timestamp;
1: -	u32 device_timestamp;
1: -	bool block_tx;
1: -	struct cfg80211_chan_def chandef;
1: -	u8 count;
1: -	u32 delay;
1: +  u64 timestamp;
1: +  u32 device_timestamp;
1: +  bool block_tx;
1: +  struct cfg80211_chan_def chandef;
1: +  u8 count;
1: +  u32 delay;
1:  };
1:  
1:  struct ieee80211_txq {
1: -	struct ieee80211_vif *vif;
1: -	struct ieee80211_sta *sta;
1: -	u8 tid;
1: -	u8 ac;
1: -	long: 48;
1: -	u8 drv_priv[0];
1: +  struct ieee80211_vif *vif;
1: +  struct ieee80211_sta *sta;
1: +  u8 tid;
1: +  u8 ac;
1: +  long : 48;
1: +  u8 drv_priv[0];
1:  };
1:  
1:  struct ieee80211_key_seq {
1: -	union {
1: -		struct {
1: -			u32 iv32;
1: -			u16 iv16;
1: -		} tkip;
1: -		struct {
1: -			u8 pn[6];
1: -		} ccmp;
1: -		struct {
1: -			u8 pn[6];
1: -		} aes_cmac;
1: -		struct {
1: -			u8 pn[6];
1: -		} aes_gmac;
1: -		struct {
1: -			u8 pn[6];
1: -		} gcmp;
1: -		struct {
1: -			u8 seq[16];
1: -			u8 seq_len;
1: -		} hw;
1: -	};
1: +  union {
1: +    struct {
1: +      u32 iv32;
1: +      u16 iv16;
1: +    } tkip;
1: +    struct {
1: +      u8 pn[6];
1: +    } ccmp;
1: +    struct {
1: +      u8 pn[6];
1: +    } aes_cmac;
1: +    struct {
1: +      u8 pn[6];
1: +    } aes_gmac;
1: +    struct {
1: +      u8 pn[6];
1: +    } gcmp;
1: +    struct {
1: +      u8 seq[16];
1: +      u8 seq_len;
1: +    } hw;
1: +  };
1:  };
1:  
1:  struct ieee80211_cipher_scheme {
1: -	u32 cipher;
1: -	u16 iftype;
1: -	u8 hdr_len;
1: -	u8 pn_len;
1: -	u8 pn_off;
1: -	u8 key_idx_off;
1: -	u8 key_idx_mask;
1: -	u8 key_idx_shift;
1: -	u8 mic_len;
1: +  u32 cipher;
1: +  u16 iftype;
1: +  u8 hdr_len;
1: +  u8 pn_len;
1: +  u8 pn_off;
1: +  u8 key_idx_off;
1: +  u8 key_idx_mask;
1: +  u8 key_idx_shift;
1: +  u8 mic_len;
1:  };
1:  
1:  enum set_key_cmd {
1: -	SET_KEY = 0,
1: -	DISABLE_KEY = 1,
1: +  SET_KEY = 0,
1: +  DISABLE_KEY = 1,
1:  };
1:  
1:  enum ieee80211_sta_state {
1: -	IEEE80211_STA_NOTEXIST = 0,
1: -	IEEE80211_STA_NONE = 1,
1: -	IEEE80211_STA_AUTH = 2,
1: -	IEEE80211_STA_ASSOC = 3,
1: -	IEEE80211_STA_AUTHORIZED = 4,
1: +  IEEE80211_STA_NOTEXIST = 0,
1: +  IEEE80211_STA_NONE = 1,
1: +  IEEE80211_STA_AUTH = 2,
1: +  IEEE80211_STA_ASSOC = 3,
1: +  IEEE80211_STA_AUTHORIZED = 4,
1:  };
1:  
1:  struct ieee80211_sta_rates {
1: -	struct callback_head callback_head;
1: -	struct {
1: -		s8 idx;
1: -		u8 count;
1: -		u8 count_cts;
1: -		u8 count_rts;
1: -		u16 flags;
1: -	} rate[4];
1: +  struct callback_head callback_head;
1: +  struct {
1: +    s8 idx;
1: +    u8 count;
1: +    u8 count_cts;
1: +    u8 count_rts;
1: +    u16 flags;
1: +  } rate[4];
1:  };
1:  
1:  enum sta_notify_cmd {
1: -	STA_NOTIFY_SLEEP = 0,
1: -	STA_NOTIFY_AWAKE = 1,
1: +  STA_NOTIFY_SLEEP = 0,
1: +  STA_NOTIFY_AWAKE = 1,
1:  };
1:  
1:  struct ieee80211_tx_control {
1: -	struct ieee80211_sta *sta;
1: +  struct ieee80211_sta *sta;
1:  };
1:  
1:  enum ieee80211_hw_flags {
1: -	IEEE80211_HW_HAS_RATE_CONTROL = 0,
1: -	IEEE80211_HW_RX_INCLUDES_FCS = 1,
1: -	IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING = 2,
1: -	IEEE80211_HW_SIGNAL_UNSPEC = 3,
1: -	IEEE80211_HW_SIGNAL_DBM = 4,
1: -	IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC = 5,
1: -	IEEE80211_HW_SPECTRUM_MGMT = 6,
1: -	IEEE80211_HW_AMPDU_AGGREGATION = 7,
1: -	IEEE80211_HW_SUPPORTS_PS = 8,
1: -	IEEE80211_HW_PS_NULLFUNC_STACK = 9,
1: -	IEEE80211_HW_SUPPORTS_DYNAMIC_PS = 10,
1: -	IEEE80211_HW_MFP_CAPABLE = 11,
1: -	IEEE80211_HW_WANT_MONITOR_VIF = 12,
1: -	IEEE80211_HW_NO_AUTO_VIF = 13,
1: -	IEEE80211_HW_SW_CRYPTO_CONTROL = 14,
1: -	IEEE80211_HW_SUPPORT_FAST_XMIT = 15,
1: -	IEEE80211_HW_REPORTS_TX_ACK_STATUS = 16,
1: -	IEEE80211_HW_CONNECTION_MONITOR = 17,
1: -	IEEE80211_HW_QUEUE_CONTROL = 18,
1: -	IEEE80211_HW_SUPPORTS_PER_STA_GTK = 19,
1: -	IEEE80211_HW_AP_LINK_PS = 20,
1: -	IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 21,
1: -	IEEE80211_HW_SUPPORTS_RC_TABLE = 22,
1: -	IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 23,
1: -	IEEE80211_HW_TIMING_BEACON_ONLY = 24,
1: -	IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 25,
1: -	IEEE80211_HW_CHANCTX_STA_CSA = 26,
1: -	IEEE80211_HW_SUPPORTS_CLONED_SKBS = 27,
1: -	IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS = 28,
1: -	IEEE80211_HW_TDLS_WIDER_BW = 29,
1: -	IEEE80211_HW_SUPPORTS_AMSDU_IN_AMPDU = 30,
1: -	IEEE80211_HW_BEACON_TX_STATUS = 31,
1: -	IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR = 32,
1: -	IEEE80211_HW_SUPPORTS_REORDERING_BUFFER = 33,
1: -	IEEE80211_HW_USES_RSS = 34,
1: -	IEEE80211_HW_TX_AMSDU = 35,
1: -	IEEE80211_HW_TX_FRAG_LIST = 36,
1: -	IEEE80211_HW_REPORTS_LOW_ACK = 37,
1: -	IEEE80211_HW_SUPPORTS_TX_FRAG = 38,
1: -	IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA = 39,
1: -	IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP = 40,
1: -	IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP = 41,
1: -	IEEE80211_HW_BUFF_MMPDU_TXQ = 42,
1: -	IEEE80211_HW_SUPPORTS_VHT_EXT_NSS_BW = 43,
1: -	IEEE80211_HW_STA_MMPDU_TXQ = 44,
1: -	IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN = 45,
1: -	IEEE80211_HW_SUPPORTS_MULTI_BSSID = 46,
1: -	IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID = 47,
1: -	IEEE80211_HW_AMPDU_KEYBORDER_SUPPORT = 48,
1: -	IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD = 49,
1: -	NUM_IEEE80211_HW_FLAGS = 50,
1: +  IEEE80211_HW_HAS_RATE_CONTROL = 0,
1: +  IEEE80211_HW_RX_INCLUDES_FCS = 1,
1: +  IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING = 2,
1: +  IEEE80211_HW_SIGNAL_UNSPEC = 3,
1: +  IEEE80211_HW_SIGNAL_DBM = 4,
1: +  IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC = 5,
1: +  IEEE80211_HW_SPECTRUM_MGMT = 6,
1: +  IEEE80211_HW_AMPDU_AGGREGATION = 7,
1: +  IEEE80211_HW_SUPPORTS_PS = 8,
1: +  IEEE80211_HW_PS_NULLFUNC_STACK = 9,
1: +  IEEE80211_HW_SUPPORTS_DYNAMIC_PS = 10,
1: +  IEEE80211_HW_MFP_CAPABLE = 11,
1: +  IEEE80211_HW_WANT_MONITOR_VIF = 12,
1: +  IEEE80211_HW_NO_AUTO_VIF = 13,
1: +  IEEE80211_HW_SW_CRYPTO_CONTROL = 14,
1: +  IEEE80211_HW_SUPPORT_FAST_XMIT = 15,
1: +  IEEE80211_HW_REPORTS_TX_ACK_STATUS = 16,
1: +  IEEE80211_HW_CONNECTION_MONITOR = 17,
1: +  IEEE80211_HW_QUEUE_CONTROL = 18,
1: +  IEEE80211_HW_SUPPORTS_PER_STA_GTK = 19,
1: +  IEEE80211_HW_AP_LINK_PS = 20,
1: +  IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 21,
1: +  IEEE80211_HW_SUPPORTS_RC_TABLE = 22,
1: +  IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 23,
1: +  IEEE80211_HW_TIMING_BEACON_ONLY = 24,
1: +  IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 25,
1: +  IEEE80211_HW_CHANCTX_STA_CSA = 26,
1: +  IEEE80211_HW_SUPPORTS_CLONED_SKBS = 27,
1: +  IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS = 28,
1: +  IEEE80211_HW_TDLS_WIDER_BW = 29,
1: +  IEEE80211_HW_SUPPORTS_AMSDU_IN_AMPDU = 30,
1: +  IEEE80211_HW_BEACON_TX_STATUS = 31,
1: +  IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR = 32,
1: +  IEEE80211_HW_SUPPORTS_REORDERING_BUFFER = 33,
1: +  IEEE80211_HW_USES_RSS = 34,
1: +  IEEE80211_HW_TX_AMSDU = 35,
1: +  IEEE80211_HW_TX_FRAG_LIST = 36,
1: +  IEEE80211_HW_REPORTS_LOW_ACK = 37,
1: +  IEEE80211_HW_SUPPORTS_TX_FRAG = 38,
1: +  IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA = 39,
1: +  IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP = 40,
1: +  IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP = 41,
1: +  IEEE80211_HW_BUFF_MMPDU_TXQ = 42,
1: +  IEEE80211_HW_SUPPORTS_VHT_EXT_NSS_BW = 43,
1: +  IEEE80211_HW_STA_MMPDU_TXQ = 44,
1: +  IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN = 45,
1: +  IEEE80211_HW_SUPPORTS_MULTI_BSSID = 46,
1: +  IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID = 47,
1: +  IEEE80211_HW_AMPDU_KEYBORDER_SUPPORT = 48,
1: +  IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD = 49,
1: +  NUM_IEEE80211_HW_FLAGS = 50,
1:  };
1:  
1:  struct ieee80211_hw {
1: -	struct ieee80211_conf conf;
1: -	struct wiphy *wiphy;
1: -	const char *rate_control_algorithm;
1: -	void *priv;
1: -	long unsigned int flags[1];
1: -	unsigned int extra_tx_headroom;
1: -	unsigned int extra_beacon_tailroom;
1: -	int vif_data_size;
1: -	int sta_data_size;
1: -	int chanctx_data_size;
1: -	int txq_data_size;
1: -	u16 queues;
1: -	u16 max_listen_interval;
1: -	s8 max_signal;
1: -	u8 max_rates;
1: -	u8 max_report_rates;
1: -	u8 max_rate_tries;
1: -	u16 max_rx_aggregation_subframes;
1: -	u16 max_tx_aggregation_subframes;
1: -	u8 max_tx_fragments;
1: -	u8 offchannel_tx_hw_queue;
1: -	u8 radiotap_mcs_details;
1: -	u16 radiotap_vht_details;
1: -	struct {
1: -		int units_pos;
1: -		s16 accuracy;
1: -	} radiotap_timestamp;
1: -	netdev_features_t netdev_features;
1: -	u8 uapsd_queues;
1: -	u8 uapsd_max_sp_len;
1: -	u8 n_cipher_schemes;
1: -	const struct ieee80211_cipher_scheme *cipher_schemes;
1: -	u8 max_nan_de_entries;
1: -	u8 tx_sk_pacing_shift;
1: -	u8 weight_multiplier;
1: -	u32 max_mtu;
1: +  struct ieee80211_conf conf;
1: +  struct wiphy *wiphy;
1: +  const char *rate_control_algorithm;
1: +  void *priv;
1: +  long unsigned int flags[1];
1: +  unsigned int extra_tx_headroom;
1: +  unsigned int extra_beacon_tailroom;
1: +  int vif_data_size;
1: +  int sta_data_size;
1: +  int chanctx_data_size;
1: +  int txq_data_size;
1: +  u16 queues;
1: +  u16 max_listen_interval;
1: +  s8 max_signal;
1: +  u8 max_rates;
1: +  u8 max_report_rates;
1: +  u8 max_rate_tries;
1: +  u16 max_rx_aggregation_subframes;
1: +  u16 max_tx_aggregation_subframes;
1: +  u8 max_tx_fragments;
1: +  u8 offchannel_tx_hw_queue;
1: +  u8 radiotap_mcs_details;
1: +  u16 radiotap_vht_details;
1: +  struct {
1: +    int units_pos;
1: +    s16 accuracy;
1: +  } radiotap_timestamp;
1: +  netdev_features_t netdev_features;
1: +  u8 uapsd_queues;
1: +  u8 uapsd_max_sp_len;
1: +  u8 n_cipher_schemes;
1: +  const struct ieee80211_cipher_scheme *cipher_schemes;
1: +  u8 max_nan_de_entries;
1: +  u8 tx_sk_pacing_shift;
1: +  u8 weight_multiplier;
1: +  u32 max_mtu;
1:  };
1:  
1:  struct ieee80211_scan_request {
1: -	struct ieee80211_scan_ies ies;
1: -	struct cfg80211_scan_request req;
1: +  struct ieee80211_scan_ies ies;
1: +  struct cfg80211_scan_request req;
1:  };
1:  
1:  struct ieee80211_tdls_ch_sw_params {
1: -	struct ieee80211_sta *sta;
1: -	struct cfg80211_chan_def *chandef;
1: -	u8 action_code;
1: -	u32 status;
1: -	u32 timestamp;
1: -	u16 switch_time;
1: -	u16 switch_timeout;
1: -	struct sk_buff *tmpl_skb;
1: -	u32 ch_sw_tm_ie;
1: +  struct ieee80211_sta *sta;
1: +  struct cfg80211_chan_def *chandef;
1: +  u8 action_code;
1: +  u32 status;
1: +  u32 timestamp;
1: +  u16 switch_time;
1: +  u16 switch_timeout;
1: +  struct sk_buff *tmpl_skb;
1: +  u32 ch_sw_tm_ie;
1:  };
1:  
1:  enum ieee80211_filter_flags {
1: -	FIF_ALLMULTI = 2,
1: -	FIF_FCSFAIL = 4,
1: -	FIF_PLCPFAIL = 8,
1: -	FIF_BCN_PRBRESP_PROMISC = 16,
1: -	FIF_CONTROL = 32,
1: -	FIF_OTHER_BSS = 64,
1: -	FIF_PSPOLL = 128,
1: -	FIF_PROBE_REQ = 256,
1: -	FIF_MCAST_ACTION = 512,
1: +  FIF_ALLMULTI = 2,
1: +  FIF_FCSFAIL = 4,
1: +  FIF_PLCPFAIL = 8,
1: +  FIF_BCN_PRBRESP_PROMISC = 16,
1: +  FIF_CONTROL = 32,
1: +  FIF_OTHER_BSS = 64,
1: +  FIF_PSPOLL = 128,
1: +  FIF_PROBE_REQ = 256,
1: +  FIF_MCAST_ACTION = 512,
1:  };
1:  
1:  enum ieee80211_ampdu_mlme_action {
1: -	IEEE80211_AMPDU_RX_START = 0,
1: -	IEEE80211_AMPDU_RX_STOP = 1,
1: -	IEEE80211_AMPDU_TX_START = 2,
1: -	IEEE80211_AMPDU_TX_STOP_CONT = 3,
1: -	IEEE80211_AMPDU_TX_STOP_FLUSH = 4,
1: -	IEEE80211_AMPDU_TX_STOP_FLUSH_CONT = 5,
1: -	IEEE80211_AMPDU_TX_OPERATIONAL = 6,
1: +  IEEE80211_AMPDU_RX_START = 0,
1: +  IEEE80211_AMPDU_RX_STOP = 1,
1: +  IEEE80211_AMPDU_TX_START = 2,
1: +  IEEE80211_AMPDU_TX_STOP_CONT = 3,
1: +  IEEE80211_AMPDU_TX_STOP_FLUSH = 4,
1: +  IEEE80211_AMPDU_TX_STOP_FLUSH_CONT = 5,
1: +  IEEE80211_AMPDU_TX_OPERATIONAL = 6,
1:  };
1:  
1:  struct ieee80211_ampdu_params {
1: -	enum ieee80211_ampdu_mlme_action action;
1: -	struct ieee80211_sta *sta;
1: -	u16 tid;
1: -	u16 ssn;
1: -	u16 buf_size;
1: -	bool amsdu;
1: -	u16 timeout;
1: +  enum ieee80211_ampdu_mlme_action action;
1: +  struct ieee80211_sta *sta;
1: +  u16 tid;
1: +  u16 ssn;
1: +  u16 buf_size;
1: +  bool amsdu;
1: +  u16 timeout;
1:  };
1:  
1:  enum ieee80211_frame_release_type {
1: -	IEEE80211_FRAME_RELEASE_PSPOLL = 0,
1: -	IEEE80211_FRAME_RELEASE_UAPSD = 1,
1: +  IEEE80211_FRAME_RELEASE_PSPOLL = 0,
1: +  IEEE80211_FRAME_RELEASE_UAPSD = 1,
1:  };
1:  
1:  enum ieee80211_roc_type {
1: -	IEEE80211_ROC_TYPE_NORMAL = 0,
1: -	IEEE80211_ROC_TYPE_MGMT_TX = 1,
1: +  IEEE80211_ROC_TYPE_NORMAL = 0,
1: +  IEEE80211_ROC_TYPE_MGMT_TX = 1,
1:  };
1:  
1:  enum ieee80211_reconfig_type {
1: -	IEEE80211_RECONFIG_TYPE_RESTART = 0,
1: -	IEEE80211_RECONFIG_TYPE_SUSPEND = 1,
1: +  IEEE80211_RECONFIG_TYPE_RESTART = 0,
1: +  IEEE80211_RECONFIG_TYPE_SUSPEND = 1,
1:  };
1:  
1:  struct ieee80211_ops {
1: -	void (*tx)(struct ieee80211_hw *, struct ieee80211_tx_control *, struct sk_buff *);
1: -	int (*start)(struct ieee80211_hw *);
1: -	void (*stop)(struct ieee80211_hw *);
1: -	int (*suspend)(struct ieee80211_hw *, struct cfg80211_wowlan *);
1: -	int (*resume)(struct ieee80211_hw *);
1: -	void (*set_wakeup)(struct ieee80211_hw *, bool);
1: -	int (*add_interface)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*change_interface)(struct ieee80211_hw *, struct ieee80211_vif *, enum nl80211_iftype, bool);
1: -	void (*remove_interface)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*config)(struct ieee80211_hw *, u32);
1: -	void (*bss_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u32);
1: -	int (*start_ap)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*stop_ap)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	u64 (*prepare_multicast)(struct ieee80211_hw *, struct netdev_hw_addr_list *);
1: -	void (*configure_filter)(struct ieee80211_hw *, unsigned int, unsigned int *, u64);
1: -	void (*config_iface_filter)(struct ieee80211_hw *, struct ieee80211_vif *, unsigned int, unsigned int);
1: -	int (*set_tim)(struct ieee80211_hw *, struct ieee80211_sta *, bool);
1: -	int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *);
1: -	void (*update_tkip_key)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_key_conf *, struct ieee80211_sta *, u32, u16 *);
1: -	void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *);
1: -	void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int);
1: -	int (*hw_scan)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_scan_request *);
1: -	void (*cancel_hw_scan)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*sched_scan_start)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_sched_scan_request *, struct ieee80211_scan_ies *);
1: -	int (*sched_scan_stop)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*sw_scan_start)(struct ieee80211_hw *, struct ieee80211_vif *, const u8 *);
1: -	void (*sw_scan_complete)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*get_stats)(struct ieee80211_hw *, struct ieee80211_low_level_stats *);
1: -	void (*get_key_seq)(struct ieee80211_hw *, struct ieee80211_key_conf *, struct ieee80211_key_seq *);
1: -	int (*set_frag_threshold)(struct ieee80211_hw *, u32);
1: -	int (*set_rts_threshold)(struct ieee80211_hw *, u32);
1: -	int (*sta_add)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *);
1: -	int (*sta_remove)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *);
1: -	void (*sta_notify)(struct ieee80211_hw *, struct ieee80211_vif *, enum sta_notify_cmd, struct ieee80211_sta *);
1: -	int (*sta_set_txpwr)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *);
1: -	int (*sta_state)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, enum ieee80211_sta_state, enum ieee80211_sta_state);
1: -	void (*sta_pre_rcu_remove)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *);
1: -	void (*sta_rc_update)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, u32);
1: -	void (*sta_rate_tbl_update)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *);
1: -	void (*sta_statistics)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct station_info *);
1: -	int (*conf_tx)(struct ieee80211_hw *, struct ieee80211_vif *, u16, const struct ieee80211_tx_queue_params *);
1: -	u64 (*get_tsf)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*set_tsf)(struct ieee80211_hw *, struct ieee80211_vif *, u64);
1: -	void (*offset_tsf)(struct ieee80211_hw *, struct ieee80211_vif *, s64);
1: -	void (*reset_tsf)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*tx_last_beacon)(struct ieee80211_hw *);
1: -	int (*ampdu_action)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_ampdu_params *);
1: -	int (*get_survey)(struct ieee80211_hw *, int, struct survey_info *);
1: -	void (*rfkill_poll)(struct ieee80211_hw *);
1: -	void (*set_coverage_class)(struct ieee80211_hw *, s16);
1: -	void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool);
1: -	void (*channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel_switch *);
1: -	int (*set_antenna)(struct ieee80211_hw *, u32, u32);
1: -	int (*get_antenna)(struct ieee80211_hw *, u32 *, u32 *);
1: -	int (*remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel *, int, enum ieee80211_roc_type);
1: -	int (*cancel_remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*set_ringparam)(struct ieee80211_hw *, u32, u32);
1: -	void (*get_ringparam)(struct ieee80211_hw *, u32 *, u32 *, u32 *, u32 *);
1: -	bool (*tx_frames_pending)(struct ieee80211_hw *);
1: -	int (*set_bitrate_mask)(struct ieee80211_hw *, struct ieee80211_vif *, const struct cfg80211_bitrate_mask *);
1: -	void (*event_callback)(struct ieee80211_hw *, struct ieee80211_vif *, const struct ieee80211_event *);
1: -	void (*allow_buffered_frames)(struct ieee80211_hw *, struct ieee80211_sta *, u16, int, enum ieee80211_frame_release_type, bool);
1: -	void (*release_buffered_frames)(struct ieee80211_hw *, struct ieee80211_sta *, u16, int, enum ieee80211_frame_release_type, bool);
1: -	int (*get_et_sset_count)(struct ieee80211_hw *, struct ieee80211_vif *, int);
1: -	void (*get_et_stats)(struct ieee80211_hw *, struct ieee80211_vif *, struct ethtool_stats *, u64 *);
1: -	void (*get_et_strings)(struct ieee80211_hw *, struct ieee80211_vif *, u32, u8 *);
1: -	void (*mgd_prepare_tx)(struct ieee80211_hw *, struct ieee80211_vif *, u16);
1: -	void (*mgd_protect_tdls_discover)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*add_chanctx)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *);
1: -	void (*remove_chanctx)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *);
1: -	void (*change_chanctx)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, u32);
1: -	int (*assign_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_chanctx_conf *);
1: -	void (*unassign_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_chanctx_conf *);
1: -	int (*switch_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif_chanctx_switch *, int, enum ieee80211_chanctx_switch_mode);
1: -	void (*reconfig_complete)(struct ieee80211_hw *, enum ieee80211_reconfig_type);
1: -	void (*ipv6_addr_change)(struct ieee80211_hw *, struct ieee80211_vif *, struct inet6_dev *);
1: -	void (*channel_switch_beacon)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_chan_def *);
1: -	int (*pre_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel_switch *);
1: -	int (*post_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*abort_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*channel_switch_rx_beacon)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel_switch *);
1: -	int (*join_ibss)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*leave_ibss)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	u32 (*get_expected_throughput)(struct ieee80211_hw *, struct ieee80211_sta *);
1: -	int (*get_txpower)(struct ieee80211_hw *, struct ieee80211_vif *, int *);
1: -	int (*tdls_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, u8, struct cfg80211_chan_def *, struct sk_buff *, u32);
1: -	void (*tdls_cancel_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *);
1: -	void (*tdls_recv_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_tdls_ch_sw_params *);
1: -	void (*wake_tx_queue)(struct ieee80211_hw *, struct ieee80211_txq *);
1: -	void (*sync_rx_queues)(struct ieee80211_hw *);
1: -	int (*start_nan)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_nan_conf *);
1: -	int (*stop_nan)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	int (*nan_change_conf)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_nan_conf *, u32);
1: -	int (*add_nan_func)(struct ieee80211_hw *, struct ieee80211_vif *, const struct cfg80211_nan_func *);
1: -	void (*del_nan_func)(struct ieee80211_hw *, struct ieee80211_vif *, u8);
1: -	bool (*can_aggregate_in_amsdu)(struct ieee80211_hw *, struct sk_buff *, struct sk_buff *);
1: -	int (*get_ftm_responder_stats)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_ftm_responder_stats *);
1: -	int (*start_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *);
1: -	void (*abort_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *);
1: -	int (*set_tid_config)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct cfg80211_tid_config *);
1: -	int (*reset_tid_config)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, u8);
1: -	void (*update_vif_offload)(struct ieee80211_hw *, struct ieee80211_vif *);
1: -	void (*sta_set_4addr)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, bool);
1: +  void (*tx)(struct ieee80211_hw *, struct ieee80211_tx_control *,
1: +             struct sk_buff *);
1: +  int (*start)(struct ieee80211_hw *);
1: +  void (*stop)(struct ieee80211_hw *);
1: +  int (*suspend)(struct ieee80211_hw *, struct cfg80211_wowlan *);
1: +  int (*resume)(struct ieee80211_hw *);
1: +  void (*set_wakeup)(struct ieee80211_hw *, bool);
1: +  int (*add_interface)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  int (*change_interface)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                          enum nl80211_iftype, bool);
1: +  void (*remove_interface)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  int (*config)(struct ieee80211_hw *, u32);
1: +  void (*bss_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                           struct ieee80211_bss_conf *, u32);
1: +  int (*start_ap)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*stop_ap)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  u64 (*prepare_multicast)(struct ieee80211_hw *, struct netdev_hw_addr_list *);
1: +  void (*configure_filter)(struct ieee80211_hw *, unsigned int, unsigned int *,
1: +                           u64);
1: +  void (*config_iface_filter)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                              unsigned int, unsigned int);
1: +  int (*set_tim)(struct ieee80211_hw *, struct ieee80211_sta *, bool);
1: +  int (*set_key)(struct ieee80211_hw *, enum set_key_cmd,
1: +                 struct ieee80211_vif *, struct ieee80211_sta *,
1: +                 struct ieee80211_key_conf *);
1: +  void (*update_tkip_key)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                          struct ieee80211_key_conf *, struct ieee80211_sta *,
1: +                          u32, u16 *);
1: +  void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                         struct cfg80211_gtk_rekey_data *);
1: +  void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                                  int);
1: +  int (*hw_scan)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                 struct ieee80211_scan_request *);
1: +  void (*cancel_hw_scan)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  int (*sched_scan_start)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                          struct cfg80211_sched_scan_request *,
1: +                          struct ieee80211_scan_ies *);
1: +  int (*sched_scan_stop)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*sw_scan_start)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                        const u8 *);
1: +  void (*sw_scan_complete)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  int (*get_stats)(struct ieee80211_hw *, struct ieee80211_low_level_stats *);
1: +  void (*get_key_seq)(struct ieee80211_hw *, struct ieee80211_key_conf *,
1: +                      struct ieee80211_key_seq *);
1: +  int (*set_frag_threshold)(struct ieee80211_hw *, u32);
1: +  int (*set_rts_threshold)(struct ieee80211_hw *, u32);
1: +  int (*sta_add)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                 struct ieee80211_sta *);
1: +  int (*sta_remove)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                    struct ieee80211_sta *);
1: +  void (*sta_notify)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                     enum sta_notify_cmd, struct ieee80211_sta *);
1: +  int (*sta_set_txpwr)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                       struct ieee80211_sta *);
1: +  int (*sta_state)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                   struct ieee80211_sta *, enum ieee80211_sta_state,
1: +                   enum ieee80211_sta_state);
1: +  void (*sta_pre_rcu_remove)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                             struct ieee80211_sta *);
1: +  void (*sta_rc_update)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                        struct ieee80211_sta *, u32);
1: +  void (*sta_rate_tbl_update)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                              struct ieee80211_sta *);
1: +  void (*sta_statistics)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                         struct ieee80211_sta *, struct station_info *);
1: +  int (*conf_tx)(struct ieee80211_hw *, struct ieee80211_vif *, u16,
1: +                 const struct ieee80211_tx_queue_params *);
1: +  u64 (*get_tsf)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*set_tsf)(struct ieee80211_hw *, struct ieee80211_vif *, u64);
1: +  void (*offset_tsf)(struct ieee80211_hw *, struct ieee80211_vif *, s64);
1: +  void (*reset_tsf)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  int (*tx_last_beacon)(struct ieee80211_hw *);
1: +  int (*ampdu_action)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                      struct ieee80211_ampdu_params *);
1: +  int (*get_survey)(struct ieee80211_hw *, int, struct survey_info *);
1: +  void (*rfkill_poll)(struct ieee80211_hw *);
1: +  void (*set_coverage_class)(struct ieee80211_hw *, s16);
1: +  void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool);
1: +  void (*channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                         struct ieee80211_channel_switch *);
1: +  int (*set_antenna)(struct ieee80211_hw *, u32, u32);
1: +  int (*get_antenna)(struct ieee80211_hw *, u32 *, u32 *);
1: +  int (*remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                           struct ieee80211_channel *, int,
1: +                           enum ieee80211_roc_type);
1: +  int (*cancel_remain_on_channel)(struct ieee80211_hw *,
1: +                                  struct ieee80211_vif *);
1: +  int (*set_ringparam)(struct ieee80211_hw *, u32, u32);
1: +  void (*get_ringparam)(struct ieee80211_hw *, u32 *, u32 *, u32 *, u32 *);
1: +  bool (*tx_frames_pending)(struct ieee80211_hw *);
1: +  int (*set_bitrate_mask)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                          const struct cfg80211_bitrate_mask *);
1: +  void (*event_callback)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                         const struct ieee80211_event *);
1: +  void (*allow_buffered_frames)(struct ieee80211_hw *, struct ieee80211_sta *,
1: +                                u16, int, enum ieee80211_frame_release_type,
1: +                                bool);
1: +  void (*release_buffered_frames)(struct ieee80211_hw *, struct ieee80211_sta *,
1: +                                  u16, int, enum ieee80211_frame_release_type,
1: +                                  bool);
1: +  int (*get_et_sset_count)(struct ieee80211_hw *, struct ieee80211_vif *, int);
1: +  void (*get_et_stats)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                       struct ethtool_stats *, u64 *);
1: +  void (*get_et_strings)(struct ieee80211_hw *, struct ieee80211_vif *, u32,
1: +                         u8 *);
1: +  void (*mgd_prepare_tx)(struct ieee80211_hw *, struct ieee80211_vif *, u16);
1: +  void (*mgd_protect_tdls_discover)(struct ieee80211_hw *,
1: +                                    struct ieee80211_vif *);
1: +  int (*add_chanctx)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *);
1: +  void (*remove_chanctx)(struct ieee80211_hw *,
1: +                         struct ieee80211_chanctx_conf *);
1: +  void (*change_chanctx)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *,
1: +                         u32);
1: +  int (*assign_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                            struct ieee80211_chanctx_conf *);
1: +  void (*unassign_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                               struct ieee80211_chanctx_conf *);
1: +  int (*switch_vif_chanctx)(struct ieee80211_hw *,
1: +                            struct ieee80211_vif_chanctx_switch *, int,
1: +                            enum ieee80211_chanctx_switch_mode);
1: +  void (*reconfig_complete)(struct ieee80211_hw *,
1: +                            enum ieee80211_reconfig_type);
1: +  void (*ipv6_addr_change)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                           struct inet6_dev *);
1: +  void (*channel_switch_beacon)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                                struct cfg80211_chan_def *);
1: +  int (*pre_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                            struct ieee80211_channel_switch *);
1: +  int (*post_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*abort_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*channel_switch_rx_beacon)(struct ieee80211_hw *,
1: +                                   struct ieee80211_vif *,
1: +                                   struct ieee80211_channel_switch *);
1: +  int (*join_ibss)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*leave_ibss)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  u32 (*get_expected_throughput)(struct ieee80211_hw *, struct ieee80211_sta *);
1: +  int (*get_txpower)(struct ieee80211_hw *, struct ieee80211_vif *, int *);
1: +  int (*tdls_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                             struct ieee80211_sta *, u8,
1: +                             struct cfg80211_chan_def *, struct sk_buff *, u32);
1: +  void (*tdls_cancel_channel_switch)(struct ieee80211_hw *,
1: +                                     struct ieee80211_vif *,
1: +                                     struct ieee80211_sta *);
1: +  void (*tdls_recv_channel_switch)(struct ieee80211_hw *,
1: +                                   struct ieee80211_vif *,
1: +                                   struct ieee80211_tdls_ch_sw_params *);
1: +  void (*wake_tx_queue)(struct ieee80211_hw *, struct ieee80211_txq *);
1: +  void (*sync_rx_queues)(struct ieee80211_hw *);
1: +  int (*start_nan)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                   struct cfg80211_nan_conf *);
1: +  int (*stop_nan)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  int (*nan_change_conf)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                         struct cfg80211_nan_conf *, u32);
1: +  int (*add_nan_func)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                      const struct cfg80211_nan_func *);
1: +  void (*del_nan_func)(struct ieee80211_hw *, struct ieee80211_vif *, u8);
1: +  bool (*can_aggregate_in_amsdu)(struct ieee80211_hw *, struct sk_buff *,
1: +                                 struct sk_buff *);
1: +  int (*get_ftm_responder_stats)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                                 struct cfg80211_ftm_responder_stats *);
1: +  int (*start_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                    struct cfg80211_pmsr_request *);
1: +  void (*abort_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                     struct cfg80211_pmsr_request *);
1: +  int (*set_tid_config)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                        struct ieee80211_sta *, struct cfg80211_tid_config *);
1: +  int (*reset_tid_config)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                          struct ieee80211_sta *, u8);
1: +  void (*update_vif_offload)(struct ieee80211_hw *, struct ieee80211_vif *);
1: +  void (*sta_set_4addr)(struct ieee80211_hw *, struct ieee80211_vif *,
1: +                        struct ieee80211_sta *, bool);
1:  };
1:  
1:  struct ieee80211_tx_rate_control {
1: -	struct ieee80211_hw *hw;
1: -	struct ieee80211_supported_band *sband;
1: -	struct ieee80211_bss_conf *bss_conf;
1: -	struct sk_buff *skb;
1: -	struct ieee80211_tx_rate reported_rate;
1: -	bool rts;
1: -	bool short_preamble;
1: -	u32 rate_idx_mask;
1: -	u8 *rate_idx_mcs_mask;
1: -	bool bss;
1: +  struct ieee80211_hw *hw;
1: +  struct ieee80211_supported_band *sband;
1: +  struct ieee80211_bss_conf *bss_conf;
1: +  struct sk_buff *skb;
1: +  struct ieee80211_tx_rate reported_rate;
1: +  bool rts;
1: +  bool short_preamble;
1: +  u32 rate_idx_mask;
1: +  u8 *rate_idx_mcs_mask;
1: +  bool bss;
1:  };
1:  
1:  enum rate_control_capabilities {
1: -	RATE_CTRL_CAPA_VHT_EXT_NSS_BW = 1,
1: +  RATE_CTRL_CAPA_VHT_EXT_NSS_BW = 1,
1:  };
1:  
1:  struct rate_control_ops {
1: -	long unsigned int capa;
1: -	const char *name;
1: -	void * (*alloc)(struct ieee80211_hw *);
1: -	void (*add_debugfs)(struct ieee80211_hw *, void *, struct dentry *);
1: -	void (*free)(void *);
1: -	void * (*alloc_sta)(void *, struct ieee80211_sta *, gfp_t);
1: -	void (*rate_init)(void *, struct ieee80211_supported_band *, struct cfg80211_chan_def *, struct ieee80211_sta *, void *);
1: -	void (*rate_update)(void *, struct ieee80211_supported_band *, struct cfg80211_chan_def *, struct ieee80211_sta *, void *, u32);
1: -	void (*free_sta)(void *, struct ieee80211_sta *, void *);
1: -	void (*tx_status_ext)(void *, struct ieee80211_supported_band *, void *, struct ieee80211_tx_status *);
1: -	void (*tx_status)(void *, struct ieee80211_supported_band *, struct ieee80211_sta *, void *, struct sk_buff *);
1: -	void (*get_rate)(void *, struct ieee80211_sta *, void *, struct ieee80211_tx_rate_control *);
1: -	void (*add_sta_debugfs)(void *, void *, struct dentry *);
1: -	u32 (*get_expected_throughput)(void *);
1: +  long unsigned int capa;
1: +  const char *name;
1: +  void *(*alloc)(struct ieee80211_hw *);
1: +  void (*add_debugfs)(struct ieee80211_hw *, void *, struct dentry *);
1: +  void (*free)(void *);
1: +  void *(*alloc_sta)(void *, struct ieee80211_sta *, gfp_t);
1: +  void (*rate_init)(void *, struct ieee80211_supported_band *,
1: +                    struct cfg80211_chan_def *, struct ieee80211_sta *, void *);
1: +  void (*rate_update)(void *, struct ieee80211_supported_band *,
1: +                      struct cfg80211_chan_def *, struct ieee80211_sta *,
1: +                      void *, u32);
1: +  void (*free_sta)(void *, struct ieee80211_sta *, void *);
1: +  void (*tx_status_ext)(void *, struct ieee80211_supported_band *, void *,
1: +                        struct ieee80211_tx_status *);
1: +  void (*tx_status)(void *, struct ieee80211_supported_band *,
1: +                    struct ieee80211_sta *, void *, struct sk_buff *);
1: +  void (*get_rate)(void *, struct ieee80211_sta *, void *,
1: +                   struct ieee80211_tx_rate_control *);
1: +  void (*add_sta_debugfs)(void *, void *, struct dentry *);
1: +  u32 (*get_expected_throughput)(void *);
1:  };
1:  
1:  struct fq_tin;
1:  
1:  struct fq_flow___2 {
1: -	struct fq_tin *tin;
1: -	struct list_head flowchain;
1: -	struct list_head backlogchain;
1: -	struct sk_buff_head queue;
1: -	u32 backlog;
1: -	int deficit;
1: +  struct fq_tin *tin;
1: +  struct list_head flowchain;
1: +  struct list_head backlogchain;
1: +  struct sk_buff_head queue;
1: +  u32 backlog;
1: +  int deficit;
1:  };
1:  
1:  struct fq_tin {
1: -	struct list_head new_flows;
1: -	struct list_head old_flows;
1: -	u32 backlog_bytes;
1: -	u32 backlog_packets;
1: -	u32 overlimit;
1: -	u32 collisions;
1: -	u32 flows;
1: -	u32 tx_bytes;
1: -	u32 tx_packets;
1: +  struct list_head new_flows;
1: +  struct list_head old_flows;
1: +  u32 backlog_bytes;
1: +  u32 backlog_packets;
1: +  u32 overlimit;
1: +  u32 collisions;
1: +  u32 flows;
1: +  u32 tx_bytes;
1: +  u32 tx_packets;
1:  };
1:  
1:  struct fq {
1: -	struct fq_flow___2 *flows;
1: -	struct list_head backlogs;
1: -	spinlock_t lock;
1: -	u32 flows_cnt;
1: -	u32 limit;
1: -	u32 memory_limit;
1: -	u32 memory_usage;
1: -	u32 quantum;
1: -	u32 backlog;
1: -	u32 overlimit;
1: -	u32 overmemory;
1: -	u32 collisions;
1: +  struct fq_flow___2 *flows;
1: +  struct list_head backlogs;
1: +  spinlock_t lock;
1: +  u32 flows_cnt;
1: +  u32 limit;
1: +  u32 memory_limit;
1: +  u32 memory_usage;
1: +  u32 quantum;
1: +  u32 backlog;
1: +  u32 overlimit;
1: +  u32 overmemory;
1: +  u32 collisions;
1:  };
1:  
1:  enum ieee80211_internal_tkip_state {
1: -	TKIP_STATE_NOT_INIT = 0,
1: -	TKIP_STATE_PHASE1_DONE = 1,
1: -	TKIP_STATE_PHASE1_HW_UPLOADED = 2,
1: +  TKIP_STATE_NOT_INIT = 0,
1: +  TKIP_STATE_PHASE1_DONE = 1,
1: +  TKIP_STATE_PHASE1_HW_UPLOADED = 2,
1:  };
1:  
1:  struct tkip_ctx {
1: -	u16 p1k[5];
1: -	u32 p1k_iv32;
1: -	enum ieee80211_internal_tkip_state state;
1: +  u16 p1k[5];
1: +  u32 p1k_iv32;
1: +  enum ieee80211_internal_tkip_state state;
1:  };
1:  
1:  struct tkip_ctx_rx {
1: -	struct tkip_ctx ctx;
1: -	u32 iv32;
1: -	u16 iv16;
1: +  struct tkip_ctx ctx;
1: +  u32 iv32;
1: +  u16 iv16;
1:  };
1:  
1:  struct ieee80211_local;
1: @@ -133523,197 +135392,197 @@ struct ieee80211_sub_if_data;
1:  struct sta_info;
1:  
1:  struct ieee80211_key {
1: -	struct ieee80211_local *local;
1: -	struct ieee80211_sub_if_data *sdata;
1: -	struct sta_info *sta;
1: -	struct list_head list;
1: -	unsigned int flags;
1: -	union {
1: -		struct {
1: -			spinlock_t txlock;
1: -			struct tkip_ctx tx;
1: -			struct tkip_ctx_rx rx[16];
1: -			u32 mic_failures;
1: -		} tkip;
1: -		struct {
1: -			u8 rx_pn[102];
1: -			struct crypto_aead *tfm;
1: -			u32 replays;
1: -		} ccmp;
1: -		struct {
1: -			u8 rx_pn[6];
1: -			struct crypto_shash *tfm;
1: -			u32 replays;
1: -			u32 icverrors;
1: -		} aes_cmac;
1: -		struct {
1: -			u8 rx_pn[6];
1: -			struct crypto_aead *tfm;
1: -			u32 replays;
1: -			u32 icverrors;
1: -		} aes_gmac;
1: -		struct {
1: -			u8 rx_pn[102];
1: -			struct crypto_aead *tfm;
1: -			u32 replays;
1: -		} gcmp;
1: -		struct {
1: -			u8 rx_pn[272];
1: -		} gen;
1: -	} u;
1: -	struct ieee80211_key_conf conf;
1: +  struct ieee80211_local *local;
1: +  struct ieee80211_sub_if_data *sdata;
1: +  struct sta_info *sta;
1: +  struct list_head list;
1: +  unsigned int flags;
1: +  union {
1: +    struct {
1: +      spinlock_t txlock;
1: +      struct tkip_ctx tx;
1: +      struct tkip_ctx_rx rx[16];
1: +      u32 mic_failures;
1: +    } tkip;
1: +    struct {
1: +      u8 rx_pn[102];
1: +      struct crypto_aead *tfm;
1: +      u32 replays;
1: +    } ccmp;
1: +    struct {
1: +      u8 rx_pn[6];
1: +      struct crypto_shash *tfm;
1: +      u32 replays;
1: +      u32 icverrors;
1: +    } aes_cmac;
1: +    struct {
1: +      u8 rx_pn[6];
1: +      struct crypto_aead *tfm;
1: +      u32 replays;
1: +      u32 icverrors;
1: +    } aes_gmac;
1: +    struct {
1: +      u8 rx_pn[102];
1: +      struct crypto_aead *tfm;
1: +      u32 replays;
1: +    } gcmp;
1: +    struct {
1: +      u8 rx_pn[272];
1: +    } gen;
1: +  } u;
1: +  struct ieee80211_key_conf conf;
1:  };
1:  
1:  enum mac80211_scan_state {
1: -	SCAN_DECISION = 0,
1: -	SCAN_SET_CHANNEL = 1,
1: -	SCAN_SEND_PROBE = 2,
1: -	SCAN_SUSPEND = 3,
1: -	SCAN_RESUME = 4,
1: -	SCAN_ABORT = 5,
1: +  SCAN_DECISION = 0,
1: +  SCAN_SET_CHANNEL = 1,
1: +  SCAN_SEND_PROBE = 2,
1: +  SCAN_SUSPEND = 3,
1: +  SCAN_RESUME = 4,
1: +  SCAN_ABORT = 5,
1:  };
1:  
1:  struct rate_control_ref;
1:  
1:  struct ieee80211_local {
1: -	struct ieee80211_hw hw;
1: -	struct fq fq;
1: -	struct codel_vars *cvars;
1: -	struct codel_params cparams;
1: -	spinlock_t active_txq_lock[4];
1: -	struct list_head active_txqs[4];
1: -	u16 schedule_round[4];
1: -	u16 airtime_flags;
1: -	u32 aql_txq_limit_low[4];
1: -	u32 aql_txq_limit_high[4];
1: -	u32 aql_threshold;
1: -	atomic_t aql_total_pending_airtime;
1: -	const struct ieee80211_ops *ops;
1: -	struct workqueue_struct *workqueue;
1: -	long unsigned int queue_stop_reasons[16];
1: -	int q_stop_reasons[160];
1: -	spinlock_t queue_stop_reason_lock;
1: -	int open_count;
1: -	int monitors;
1: -	int cooked_mntrs;
1: -	int fif_fcsfail;
1: -	int fif_plcpfail;
1: -	int fif_control;
1: -	int fif_other_bss;
1: -	int fif_pspoll;
1: -	int fif_probe_req;
1: -	bool probe_req_reg;
1: -	bool rx_mcast_action_reg;
1: -	unsigned int filter_flags;
1: -	bool wiphy_ciphers_allocated;
1: -	bool use_chanctx;
1: -	spinlock_t filter_lock;
1: -	struct work_struct reconfig_filter;
1: -	struct netdev_hw_addr_list mc_list;
1: -	bool tim_in_locked_section;
1: -	bool suspended;
1: -	bool resuming;
1: -	bool quiescing;
1: -	bool started;
1: -	bool in_reconfig;
1: -	bool wowlan;
1: -	struct work_struct radar_detected_work;
1: -	u8 rx_chains;
1: -	u8 sband_allocated;
1: -	int tx_headroom;
1: -	struct tasklet_struct tasklet;
1: -	struct sk_buff_head skb_queue;
1: -	struct sk_buff_head skb_queue_unreliable;
1: -	spinlock_t rx_path_lock;
1: -	struct mutex sta_mtx;
1: -	spinlock_t tim_lock;
1: -	long unsigned int num_sta;
1: -	struct list_head sta_list;
1: -	struct rhltable sta_hash;
1: -	struct timer_list sta_cleanup;
1: -	int sta_generation;
1: -	struct sk_buff_head pending[16];
1: -	struct tasklet_struct tx_pending_tasklet;
1: -	struct tasklet_struct wake_txqs_tasklet;
1: -	atomic_t agg_queue_stop[16];
1: -	atomic_t iff_allmultis;
1: -	struct rate_control_ref *rate_ctrl;
1: -	struct arc4_ctx wep_tx_ctx;
1: -	struct arc4_ctx wep_rx_ctx;
1: -	u32 wep_iv;
1: -	struct list_head interfaces;
1: -	struct list_head mon_list;
1: -	struct mutex iflist_mtx;
1: -	struct mutex key_mtx;
1: -	struct mutex mtx;
1: -	long unsigned int scanning;
1: -	struct cfg80211_ssid scan_ssid;
1: -	struct cfg80211_scan_request *int_scan_req;
1: -	struct cfg80211_scan_request *scan_req;
1: -	struct ieee80211_scan_request *hw_scan_req;
1: -	struct cfg80211_chan_def scan_chandef;
1: -	enum nl80211_band hw_scan_band;
1: -	int scan_channel_idx;
1: -	int scan_ies_len;
1: -	int hw_scan_ies_bufsize;
1: -	struct cfg80211_scan_info scan_info;
1: -	struct work_struct sched_scan_stopped_work;
1: -	struct ieee80211_sub_if_data *sched_scan_sdata;
1: -	struct cfg80211_sched_scan_request *sched_scan_req;
1: -	u8 scan_addr[6];
1: -	long unsigned int leave_oper_channel_time;
1: -	enum mac80211_scan_state next_scan_state;
1: -	struct delayed_work scan_work;
1: -	struct ieee80211_sub_if_data *scan_sdata;
1: -	struct cfg80211_chan_def _oper_chandef;
1: -	struct ieee80211_channel *tmp_channel;
1: -	struct list_head chanctx_list;
1: -	struct mutex chanctx_mtx;
1: -	int total_ps_buffered;
1: -	bool pspolling;
1: -	struct ieee80211_sub_if_data *ps_sdata;
1: -	struct work_struct dynamic_ps_enable_work;
1: -	struct work_struct dynamic_ps_disable_work;
1: -	struct timer_list dynamic_ps_timer;
1: -	struct notifier_block ifa_notifier;
1: -	struct notifier_block ifa6_notifier;
1: -	int dynamic_ps_forced_timeout;
1: -	int user_power_level;
1: -	enum ieee80211_smps_mode smps_mode;
1: -	struct work_struct restart_work;
1: -	struct delayed_work roc_work;
1: -	struct list_head roc_list;
1: -	struct work_struct hw_roc_start;
1: -	struct work_struct hw_roc_done;
1: -	long unsigned int hw_roc_start_time;
1: -	u64 roc_cookie_counter;
1: -	struct idr ack_status_frames;
1: -	spinlock_t ack_status_lock;
1: -	struct ieee80211_sub_if_data *p2p_sdata;
1: -	struct ieee80211_sub_if_data *monitor_sdata;
1: -	struct cfg80211_chan_def monitor_chandef;
1: -	u8 ext_capa[8];
1: -	struct work_struct tdls_chsw_work;
1: -	struct sk_buff_head skb_queue_tdls_chsw;
1: +  struct ieee80211_hw hw;
1: +  struct fq fq;
1: +  struct codel_vars *cvars;
1: +  struct codel_params cparams;
1: +  spinlock_t active_txq_lock[4];
1: +  struct list_head active_txqs[4];
1: +  u16 schedule_round[4];
1: +  u16 airtime_flags;
1: +  u32 aql_txq_limit_low[4];
1: +  u32 aql_txq_limit_high[4];
1: +  u32 aql_threshold;
1: +  atomic_t aql_total_pending_airtime;
1: +  const struct ieee80211_ops *ops;
1: +  struct workqueue_struct *workqueue;
1: +  long unsigned int queue_stop_reasons[16];
1: +  int q_stop_reasons[160];
1: +  spinlock_t queue_stop_reason_lock;
1: +  int open_count;
1: +  int monitors;
1: +  int cooked_mntrs;
1: +  int fif_fcsfail;
1: +  int fif_plcpfail;
1: +  int fif_control;
1: +  int fif_other_bss;
1: +  int fif_pspoll;
1: +  int fif_probe_req;
1: +  bool probe_req_reg;
1: +  bool rx_mcast_action_reg;
1: +  unsigned int filter_flags;
1: +  bool wiphy_ciphers_allocated;
1: +  bool use_chanctx;
1: +  spinlock_t filter_lock;
1: +  struct work_struct reconfig_filter;
1: +  struct netdev_hw_addr_list mc_list;
1: +  bool tim_in_locked_section;
1: +  bool suspended;
1: +  bool resuming;
1: +  bool quiescing;
1: +  bool started;
1: +  bool in_reconfig;
1: +  bool wowlan;
1: +  struct work_struct radar_detected_work;
1: +  u8 rx_chains;
1: +  u8 sband_allocated;
1: +  int tx_headroom;
1: +  struct tasklet_struct tasklet;
1: +  struct sk_buff_head skb_queue;
1: +  struct sk_buff_head skb_queue_unreliable;
1: +  spinlock_t rx_path_lock;
1: +  struct mutex sta_mtx;
1: +  spinlock_t tim_lock;
1: +  long unsigned int num_sta;
1: +  struct list_head sta_list;
1: +  struct rhltable sta_hash;
1: +  struct timer_list sta_cleanup;
1: +  int sta_generation;
1: +  struct sk_buff_head pending[16];
1: +  struct tasklet_struct tx_pending_tasklet;
1: +  struct tasklet_struct wake_txqs_tasklet;
1: +  atomic_t agg_queue_stop[16];
1: +  atomic_t iff_allmultis;
1: +  struct rate_control_ref *rate_ctrl;
1: +  struct arc4_ctx wep_tx_ctx;
1: +  struct arc4_ctx wep_rx_ctx;
1: +  u32 wep_iv;
1: +  struct list_head interfaces;
1: +  struct list_head mon_list;
1: +  struct mutex iflist_mtx;
1: +  struct mutex key_mtx;
1: +  struct mutex mtx;
1: +  long unsigned int scanning;
1: +  struct cfg80211_ssid scan_ssid;
1: +  struct cfg80211_scan_request *int_scan_req;
1: +  struct cfg80211_scan_request *scan_req;
1: +  struct ieee80211_scan_request *hw_scan_req;
1: +  struct cfg80211_chan_def scan_chandef;
1: +  enum nl80211_band hw_scan_band;
1: +  int scan_channel_idx;
1: +  int scan_ies_len;
1: +  int hw_scan_ies_bufsize;
1: +  struct cfg80211_scan_info scan_info;
1: +  struct work_struct sched_scan_stopped_work;
1: +  struct ieee80211_sub_if_data *sched_scan_sdata;
1: +  struct cfg80211_sched_scan_request *sched_scan_req;
1: +  u8 scan_addr[6];
1: +  long unsigned int leave_oper_channel_time;
1: +  enum mac80211_scan_state next_scan_state;
1: +  struct delayed_work scan_work;
1: +  struct ieee80211_sub_if_data *scan_sdata;
1: +  struct cfg80211_chan_def _oper_chandef;
1: +  struct ieee80211_channel *tmp_channel;
1: +  struct list_head chanctx_list;
1: +  struct mutex chanctx_mtx;
1: +  int total_ps_buffered;
1: +  bool pspolling;
1: +  struct ieee80211_sub_if_data *ps_sdata;
1: +  struct work_struct dynamic_ps_enable_work;
1: +  struct work_struct dynamic_ps_disable_work;
1: +  struct timer_list dynamic_ps_timer;
1: +  struct notifier_block ifa_notifier;
1: +  struct notifier_block ifa6_notifier;
1: +  int dynamic_ps_forced_timeout;
1: +  int user_power_level;
1: +  enum ieee80211_smps_mode smps_mode;
1: +  struct work_struct restart_work;
1: +  struct delayed_work roc_work;
1: +  struct list_head roc_list;
1: +  struct work_struct hw_roc_start;
1: +  struct work_struct hw_roc_done;
1: +  long unsigned int hw_roc_start_time;
1: +  u64 roc_cookie_counter;
1: +  struct idr ack_status_frames;
1: +  spinlock_t ack_status_lock;
1: +  struct ieee80211_sub_if_data *p2p_sdata;
1: +  struct ieee80211_sub_if_data *monitor_sdata;
1: +  struct cfg80211_chan_def monitor_chandef;
1: +  u8 ext_capa[8];
1: +  struct work_struct tdls_chsw_work;
1: +  struct sk_buff_head skb_queue_tdls_chsw;
1:  };
1:  
1:  struct ieee80211_fragment_entry {
1: -	struct sk_buff_head skb_list;
1: -	long unsigned int first_frag_time;
1: -	u16 seq;
1: -	u16 extra_len;
1: -	u16 last_frag;
1: -	u8 rx_queue;
1: -	bool check_sequential_pn;
1: -	u8 last_pn[6];
1: +  struct sk_buff_head skb_list;
1: +  long unsigned int first_frag_time;
1: +  u16 seq;
1: +  u16 extra_len;
1: +  u16 last_frag;
1: +  u8 rx_queue;
1: +  bool check_sequential_pn;
1: +  u8 last_pn[6];
1:  };
1:  
1:  struct ps_data {
1: -	u8 tim[256];
1: -	struct sk_buff_head bc_buf;
1: -	atomic_t num_sta_ps;
1: -	int dtim_count;
1: -	bool dtim_bc_mc;
1: +  u8 tim[256];
1: +  struct sk_buff_head bc_buf;
1: +  atomic_t num_sta_ps;
1: +  int dtim_count;
1: +  bool dtim_bc_mc;
1:  };
1:  
1:  struct beacon_data;
1: @@ -133725,39 +135594,39 @@ struct fils_discovery_data;
1:  struct unsol_bcast_probe_resp_data;
1:  
1:  struct ieee80211_if_ap {
1: -	struct beacon_data *beacon;
1: -	struct probe_resp *probe_resp;
1: -	struct fils_discovery_data *fils_discovery;
1: -	struct unsol_bcast_probe_resp_data *unsol_bcast_probe_resp;
1: -	struct cfg80211_beacon_data *next_beacon;
1: -	struct list_head vlans;
1: -	struct ps_data ps;
1: -	atomic_t num_mcast_sta;
1: -	bool multicast_to_unicast;
1: +  struct beacon_data *beacon;
1: +  struct probe_resp *probe_resp;
1: +  struct fils_discovery_data *fils_discovery;
1: +  struct unsol_bcast_probe_resp_data *unsol_bcast_probe_resp;
1: +  struct cfg80211_beacon_data *next_beacon;
1: +  struct list_head vlans;
1: +  struct ps_data ps;
1: +  atomic_t num_mcast_sta;
1: +  bool multicast_to_unicast;
1:  };
1:  
1:  struct ieee80211_if_vlan {
1: -	struct list_head list;
1: -	struct sta_info *sta;
1: -	atomic_t num_mcast_sta;
1: +  struct list_head list;
1: +  struct sta_info *sta;
1: +  atomic_t num_mcast_sta;
1:  };
1:  
1:  struct ewma_beacon_signal {
1: -	long unsigned int internal;
1: +  long unsigned int internal;
1:  };
1:  
1:  struct ieee80211_sta_tx_tspec {
1: -	long unsigned int time_slice_start;
1: -	u32 admitted_time;
1: -	u8 tsid;
1: -	s8 up;
1: -	u32 consumed_tx_time;
1: -	enum {
1: -		TX_TSPEC_ACTION_NONE = 0,
1: -		TX_TSPEC_ACTION_DOWNGRADE = 1,
1: -		TX_TSPEC_ACTION_STOP_DOWNGRADE = 2,
1: -	} action;
1: -	bool downgraded;
1: +  long unsigned int time_slice_start;
1: +  u32 admitted_time;
1: +  u8 tsid;
1: +  s8 up;
1: +  u32 consumed_tx_time;
1: +  enum {
1: +    TX_TSPEC_ACTION_NONE = 0,
1: +    TX_TSPEC_ACTION_DOWNGRADE = 1,
1: +    TX_TSPEC_ACTION_STOP_DOWNGRADE = 2,
1: +  } action;
1: +  bool downgraded;
1:  };
1:  
1:  struct ieee80211_mgd_auth_data;
1: @@ -133765,126 +135634,126 @@ struct ieee80211_mgd_auth_data;
1:  struct ieee80211_mgd_assoc_data;
1:  
1:  struct ieee80211_if_managed {
1: -	struct timer_list timer;
1: -	struct timer_list conn_mon_timer;
1: -	struct timer_list bcn_mon_timer;
1: -	struct timer_list chswitch_timer;
1: -	struct work_struct monitor_work;
1: -	struct work_struct chswitch_work;
1: -	struct work_struct beacon_connection_loss_work;
1: -	struct work_struct csa_connection_drop_work;
1: -	long unsigned int beacon_timeout;
1: -	long unsigned int probe_timeout;
1: -	int probe_send_count;
1: -	bool nullfunc_failed;
1: -	bool connection_loss;
1: -	short: 16;
1: -	struct cfg80211_bss *associated;
1: -	struct ieee80211_mgd_auth_data *auth_data;
1: -	struct ieee80211_mgd_assoc_data *assoc_data;
1: -	u8 bssid[6];
1: -	bool powersave;
1: -	bool broken_ap;
1: -	bool have_beacon;
1: -	u8 dtim_period;
1: -	short: 16;
1: -	enum ieee80211_smps_mode req_smps;
1: -	enum ieee80211_smps_mode driver_smps_mode;
1: -	int: 32;
1: -	struct work_struct request_smps_work;
1: -	unsigned int flags;
1: -	bool csa_waiting_bcn;
1: -	bool csa_ignored_same_chan;
1: -	bool beacon_crc_valid;
1: -	char: 8;
1: -	u32 beacon_crc;
1: -	bool status_acked;
1: -	bool status_received;
1: -	__le16 status_fc;
1: -	enum {
1: -		IEEE80211_MFP_DISABLED = 0,
1: -		IEEE80211_MFP_OPTIONAL = 1,
1: -		IEEE80211_MFP_REQUIRED = 2,
1: -	} mfp;
1: -	unsigned int uapsd_queues;
1: -	unsigned int uapsd_max_sp_len;
1: -	int wmm_last_param_set;
1: -	int mu_edca_last_param_set;
1: -	u8 use_4addr;
1: -	char: 8;
1: -	s16 p2p_noa_index;
1: -	struct ewma_beacon_signal ave_beacon_signal;
1: -	unsigned int count_beacon_signal;
1: -	unsigned int beacon_loss_count;
1: -	int last_cqm_event_signal;
1: -	int rssi_min_thold;
1: -	int rssi_max_thold;
1: -	int last_ave_beacon_signal;
1: -	struct ieee80211_ht_cap ht_capa;
1: -	struct ieee80211_ht_cap ht_capa_mask;
1: -	struct ieee80211_vht_cap vht_capa;
1: -	struct ieee80211_vht_cap vht_capa_mask;
1: -	struct ieee80211_s1g_cap s1g_capa;
1: -	struct ieee80211_s1g_cap s1g_capa_mask;
1: -	u8 tdls_peer[6];
1: -	struct delayed_work tdls_peer_del_work;
1: -	struct sk_buff *orig_teardown_skb;
1: -	struct sk_buff *teardown_skb;
1: -	spinlock_t teardown_lock;
1: -	bool tdls_chan_switch_prohibited;
1: -	bool tdls_wider_bw_prohibited;
1: -	long: 48;
1: -	struct ieee80211_sta_tx_tspec tx_tspec[4];
1: -	struct delayed_work tx_tspec_wk;
1: -	u8 *assoc_req_ies;
1: -	size_t assoc_req_ies_len;
1: +  struct timer_list timer;
1: +  struct timer_list conn_mon_timer;
1: +  struct timer_list bcn_mon_timer;
1: +  struct timer_list chswitch_timer;
1: +  struct work_struct monitor_work;
1: +  struct work_struct chswitch_work;
1: +  struct work_struct beacon_connection_loss_work;
1: +  struct work_struct csa_connection_drop_work;
1: +  long unsigned int beacon_timeout;
1: +  long unsigned int probe_timeout;
1: +  int probe_send_count;
1: +  bool nullfunc_failed;
1: +  bool connection_loss;
1: +  short : 16;
1: +  struct cfg80211_bss *associated;
1: +  struct ieee80211_mgd_auth_data *auth_data;
1: +  struct ieee80211_mgd_assoc_data *assoc_data;
1: +  u8 bssid[6];
1: +  bool powersave;
1: +  bool broken_ap;
1: +  bool have_beacon;
1: +  u8 dtim_period;
1: +  short : 16;
1: +  enum ieee80211_smps_mode req_smps;
1: +  enum ieee80211_smps_mode driver_smps_mode;
1: +  int : 32;
1: +  struct work_struct request_smps_work;
1: +  unsigned int flags;
1: +  bool csa_waiting_bcn;
1: +  bool csa_ignored_same_chan;
1: +  bool beacon_crc_valid;
1: +  char : 8;
1: +  u32 beacon_crc;
1: +  bool status_acked;
1: +  bool status_received;
1: +  __le16 status_fc;
1: +  enum {
1: +    IEEE80211_MFP_DISABLED = 0,
1: +    IEEE80211_MFP_OPTIONAL = 1,
1: +    IEEE80211_MFP_REQUIRED = 2,
1: +  } mfp;
1: +  unsigned int uapsd_queues;
1: +  unsigned int uapsd_max_sp_len;
1: +  int wmm_last_param_set;
1: +  int mu_edca_last_param_set;
1: +  u8 use_4addr;
1: +  char : 8;
1: +  s16 p2p_noa_index;
1: +  struct ewma_beacon_signal ave_beacon_signal;
1: +  unsigned int count_beacon_signal;
1: +  unsigned int beacon_loss_count;
1: +  int last_cqm_event_signal;
1: +  int rssi_min_thold;
1: +  int rssi_max_thold;
1: +  int last_ave_beacon_signal;
1: +  struct ieee80211_ht_cap ht_capa;
1: +  struct ieee80211_ht_cap ht_capa_mask;
1: +  struct ieee80211_vht_cap vht_capa;
1: +  struct ieee80211_vht_cap vht_capa_mask;
1: +  struct ieee80211_s1g_cap s1g_capa;
1: +  struct ieee80211_s1g_cap s1g_capa_mask;
1: +  u8 tdls_peer[6];
1: +  struct delayed_work tdls_peer_del_work;
1: +  struct sk_buff *orig_teardown_skb;
1: +  struct sk_buff *teardown_skb;
1: +  spinlock_t teardown_lock;
1: +  bool tdls_chan_switch_prohibited;
1: +  bool tdls_wider_bw_prohibited;
1: +  long : 48;
1: +  struct ieee80211_sta_tx_tspec tx_tspec[4];
1: +  struct delayed_work tx_tspec_wk;
1: +  u8 *assoc_req_ies;
1: +  size_t assoc_req_ies_len;
1:  } __attribute__((packed));
1:  
1:  struct ieee80211_if_ibss {
1: -	struct timer_list timer;
1: -	struct work_struct csa_connection_drop_work;
1: -	long unsigned int last_scan_completed;
1: -	u32 basic_rates;
1: -	bool fixed_bssid;
1: -	bool fixed_channel;
1: -	bool privacy;
1: -	bool control_port;
1: -	bool userspace_handles_dfs;
1: -	char: 8;
1: -	u8 bssid[6];
1: -	u8 ssid[32];
1: -	u8 ssid_len;
1: -	u8 ie_len;
1: -	long: 48;
1: -	u8 *ie;
1: -	struct cfg80211_chan_def chandef;
1: -	long unsigned int ibss_join_req;
1: -	struct beacon_data *presp;
1: -	struct ieee80211_ht_cap ht_capa;
1: -	struct ieee80211_ht_cap ht_capa_mask;
1: -	int: 32;
1: -	spinlock_t incomplete_lock;
1: -	struct list_head incomplete_stations;
1: -	enum {
1: -		IEEE80211_IBSS_MLME_SEARCH = 0,
1: -		IEEE80211_IBSS_MLME_JOINED = 1,
1: -	} state;
1: -	int: 32;
1: +  struct timer_list timer;
1: +  struct work_struct csa_connection_drop_work;
1: +  long unsigned int last_scan_completed;
1: +  u32 basic_rates;
1: +  bool fixed_bssid;
1: +  bool fixed_channel;
1: +  bool privacy;
1: +  bool control_port;
1: +  bool userspace_handles_dfs;
1: +  char : 8;
1: +  u8 bssid[6];
1: +  u8 ssid[32];
1: +  u8 ssid_len;
1: +  u8 ie_len;
1: +  long : 48;
1: +  u8 *ie;
1: +  struct cfg80211_chan_def chandef;
1: +  long unsigned int ibss_join_req;
1: +  struct beacon_data *presp;
1: +  struct ieee80211_ht_cap ht_capa;
1: +  struct ieee80211_ht_cap ht_capa_mask;
1: +  int : 32;
1: +  spinlock_t incomplete_lock;
1: +  struct list_head incomplete_stations;
1: +  enum {
1: +    IEEE80211_IBSS_MLME_SEARCH = 0,
1: +    IEEE80211_IBSS_MLME_JOINED = 1,
1: +  } state;
1: +  int : 32;
1:  } __attribute__((packed));
1:  
1:  struct mesh_preq_queue {
1: -	struct list_head list;
1: -	u8 dst[6];
1: -	u8 flags;
1: +  struct list_head list;
1: +  u8 dst[6];
1: +  u8 flags;
1:  };
1:  
1:  struct mesh_stats {
1: -	__u32 fwded_mcast;
1: -	__u32 fwded_unicast;
1: -	__u32 fwded_frames;
1: -	__u32 dropped_frames_ttl;
1: -	__u32 dropped_frames_no_route;
1: -	__u32 dropped_frames_congestion;
1: +  __u32 fwded_mcast;
1: +  __u32 fwded_unicast;
1: +  __u32 fwded_frames;
1: +  __u32 dropped_frames_ttl;
1: +  __u32 dropped_frames_no_route;
1: +  __u32 dropped_frames_congestion;
1:  };
1:  
1:  struct mesh_rmc;
1: @@ -133896,84 +135765,84 @@ struct mesh_csa_settings;
1:  struct mesh_table;
1:  
1:  struct ieee80211_if_mesh {
1: -	struct timer_list housekeeping_timer;
1: -	struct timer_list mesh_path_timer;
1: -	struct timer_list mesh_path_root_timer;
1: -	long unsigned int wrkq_flags;
1: -	long unsigned int mbss_changed;
1: -	bool userspace_handles_dfs;
1: -	u8 mesh_id[32];
1: -	size_t mesh_id_len;
1: -	u8 mesh_pp_id;
1: -	u8 mesh_pm_id;
1: -	u8 mesh_cc_id;
1: -	u8 mesh_sp_id;
1: -	u8 mesh_auth_id;
1: -	u32 sn;
1: -	u32 preq_id;
1: -	atomic_t mpaths;
1: -	long unsigned int last_sn_update;
1: -	long unsigned int next_perr;
1: -	long unsigned int last_preq;
1: -	struct mesh_rmc *rmc;
1: -	spinlock_t mesh_preq_queue_lock;
1: -	struct mesh_preq_queue preq_queue;
1: -	int preq_queue_len;
1: -	struct mesh_stats mshstats;
1: -	struct mesh_config mshcfg;
1: -	atomic_t estab_plinks;
1: -	u32 mesh_seqnum;
1: -	bool accepting_plinks;
1: -	int num_gates;
1: -	struct beacon_data *beacon;
1: -	const u8 *ie;
1: -	u8 ie_len;
1: -	enum {
1: -		IEEE80211_MESH_SEC_NONE = 0,
1: -		IEEE80211_MESH_SEC_AUTHED = 1,
1: -		IEEE80211_MESH_SEC_SECURED = 2,
1: -	} security;
1: -	bool user_mpm;
1: -	const struct ieee80211_mesh_sync_ops *sync_ops;
1: -	s64 sync_offset_clockdrift_max;
1: -	spinlock_t sync_offset_lock;
1: -	enum nl80211_mesh_power_mode nonpeer_pm;
1: -	int ps_peers_light_sleep;
1: -	int ps_peers_deep_sleep;
1: -	struct ps_data ps;
1: -	struct mesh_csa_settings *csa;
1: -	enum {
1: -		IEEE80211_MESH_CSA_ROLE_NONE = 0,
1: -		IEEE80211_MESH_CSA_ROLE_INIT = 1,
1: -		IEEE80211_MESH_CSA_ROLE_REPEATER = 2,
1: -	} csa_role;
1: -	u8 chsw_ttl;
1: -	u16 pre_value;
1: -	int meshconf_offset;
1: -	struct mesh_table *mesh_paths;
1: -	struct mesh_table *mpp_paths;
1: -	int mesh_paths_generation;
1: -	int mpp_paths_generation;
1: +  struct timer_list housekeeping_timer;
1: +  struct timer_list mesh_path_timer;
1: +  struct timer_list mesh_path_root_timer;
1: +  long unsigned int wrkq_flags;
1: +  long unsigned int mbss_changed;
1: +  bool userspace_handles_dfs;
1: +  u8 mesh_id[32];
1: +  size_t mesh_id_len;
1: +  u8 mesh_pp_id;
1: +  u8 mesh_pm_id;
1: +  u8 mesh_cc_id;
1: +  u8 mesh_sp_id;
1: +  u8 mesh_auth_id;
1: +  u32 sn;
1: +  u32 preq_id;
1: +  atomic_t mpaths;
1: +  long unsigned int last_sn_update;
1: +  long unsigned int next_perr;
1: +  long unsigned int last_preq;
1: +  struct mesh_rmc *rmc;
1: +  spinlock_t mesh_preq_queue_lock;
1: +  struct mesh_preq_queue preq_queue;
1: +  int preq_queue_len;
1: +  struct mesh_stats mshstats;
1: +  struct mesh_config mshcfg;
1: +  atomic_t estab_plinks;
1: +  u32 mesh_seqnum;
1: +  bool accepting_plinks;
1: +  int num_gates;
1: +  struct beacon_data *beacon;
1: +  const u8 *ie;
1: +  u8 ie_len;
1: +  enum {
1: +    IEEE80211_MESH_SEC_NONE = 0,
1: +    IEEE80211_MESH_SEC_AUTHED = 1,
1: +    IEEE80211_MESH_SEC_SECURED = 2,
1: +  } security;
1: +  bool user_mpm;
1: +  const struct ieee80211_mesh_sync_ops *sync_ops;
1: +  s64 sync_offset_clockdrift_max;
1: +  spinlock_t sync_offset_lock;
1: +  enum nl80211_mesh_power_mode nonpeer_pm;
1: +  int ps_peers_light_sleep;
1: +  int ps_peers_deep_sleep;
1: +  struct ps_data ps;
1: +  struct mesh_csa_settings *csa;
1: +  enum {
1: +    IEEE80211_MESH_CSA_ROLE_NONE = 0,
1: +    IEEE80211_MESH_CSA_ROLE_INIT = 1,
1: +    IEEE80211_MESH_CSA_ROLE_REPEATER = 2,
1: +  } csa_role;
1: +  u8 chsw_ttl;
1: +  u16 pre_value;
1: +  int meshconf_offset;
1: +  struct mesh_table *mesh_paths;
1: +  struct mesh_table *mpp_paths;
1: +  int mesh_paths_generation;
1: +  int mpp_paths_generation;
1:  };
1:  
1:  struct ieee80211_if_ocb {
1: -	struct timer_list housekeeping_timer;
1: -	long unsigned int wrkq_flags;
1: -	spinlock_t incomplete_lock;
1: -	struct list_head incomplete_stations;
1: -	bool joined;
1: +  struct timer_list housekeeping_timer;
1: +  long unsigned int wrkq_flags;
1: +  spinlock_t incomplete_lock;
1: +  struct list_head incomplete_stations;
1: +  bool joined;
1:  };
1:  
1:  struct ieee80211_if_mntr {
1: -	u32 flags;
1: -	u8 mu_follow_addr[6];
1: -	struct list_head list;
1: +  u32 flags;
1: +  u8 mu_follow_addr[6];
1: +  struct list_head list;
1:  };
1:  
1:  struct ieee80211_if_nan {
1: -	struct cfg80211_nan_conf conf;
1: -	spinlock_t func_lock;
1: -	struct idr function_inst_ids;
1: +  struct cfg80211_nan_conf conf;
1: +  spinlock_t func_lock;
1: +  struct idr function_inst_ids;
1:  };
1:  
1:  struct mac80211_qos_map;
1: @@ -133981,104 +135850,104 @@ struct mac80211_qos_map;
1:  struct ieee80211_chanctx;
1:  
1:  struct ieee80211_sub_if_data {
1: -	struct list_head list;
1: -	struct wireless_dev wdev;
1: -	struct list_head key_list;
1: -	int crypto_tx_tailroom_needed_cnt;
1: -	int crypto_tx_tailroom_pending_dec;
1: -	struct delayed_work dec_tailroom_needed_wk;
1: -	struct net_device *dev;
1: -	struct ieee80211_local *local;
1: -	unsigned int flags;
1: -	long unsigned int state;
1: -	char name[16];
1: -	struct ieee80211_fragment_entry fragments[4];
1: -	unsigned int fragment_next;
1: -	u16 noack_map;
1: -	u8 wmm_acm;
1: -	struct ieee80211_key *keys[8];
1: -	struct ieee80211_key *default_unicast_key;
1: -	struct ieee80211_key *default_multicast_key;
1: -	struct ieee80211_key *default_mgmt_key;
1: -	struct ieee80211_key *default_beacon_key;
1: -	u16 sequence_number;
1: -	__be16 control_port_protocol;
1: -	bool control_port_no_encrypt;
1: -	bool control_port_no_preauth;
1: -	bool control_port_over_nl80211;
1: -	int encrypt_headroom;
1: -	atomic_t num_tx_queued;
1: -	struct ieee80211_tx_queue_params tx_conf[4];
1: -	struct mac80211_qos_map *qos_map;
1: -	struct work_struct csa_finalize_work;
1: -	bool csa_block_tx;
1: -	struct cfg80211_chan_def csa_chandef;
1: -	struct list_head assigned_chanctx_list;
1: -	struct list_head reserved_chanctx_list;
1: -	struct ieee80211_chanctx *reserved_chanctx;
1: -	struct cfg80211_chan_def reserved_chandef;
1: -	bool reserved_radar_required;
1: -	bool reserved_ready;
1: -	struct work_struct recalc_smps;
1: -	struct work_struct work;
1: -	struct sk_buff_head skb_queue;
1: -	u8 needed_rx_chains;
1: -	enum ieee80211_smps_mode smps_mode;
1: -	int user_power_level;
1: -	int ap_power_level;
1: -	bool radar_required;
1: -	struct delayed_work dfs_cac_timer_work;
1: -	struct ieee80211_if_ap *bss;
1: -	u32 rc_rateidx_mask[5];
1: -	bool rc_has_mcs_mask[5];
1: -	u8 rc_rateidx_mcs_mask[50];
1: -	bool rc_has_vht_mcs_mask[5];
1: -	u16 rc_rateidx_vht_mcs_mask[40];
1: -	u32 beacon_rateidx_mask[5];
1: -	bool beacon_rate_set;
1: -	union {
1: -		struct ieee80211_if_ap ap;
1: -		struct ieee80211_if_vlan vlan;
1: -		struct ieee80211_if_managed mgd;
1: -		struct ieee80211_if_ibss ibss;
1: -		struct ieee80211_if_mesh mesh;
1: -		struct ieee80211_if_ocb ocb;
1: -		struct ieee80211_if_mntr mntr;
1: -		struct ieee80211_if_nan nan;
1: -	} u;
1: -	struct ieee80211_vif vif;
1: +  struct list_head list;
1: +  struct wireless_dev wdev;
1: +  struct list_head key_list;
1: +  int crypto_tx_tailroom_needed_cnt;
1: +  int crypto_tx_tailroom_pending_dec;
1: +  struct delayed_work dec_tailroom_needed_wk;
1: +  struct net_device *dev;
1: +  struct ieee80211_local *local;
1: +  unsigned int flags;
1: +  long unsigned int state;
1: +  char name[16];
1: +  struct ieee80211_fragment_entry fragments[4];
1: +  unsigned int fragment_next;
1: +  u16 noack_map;
1: +  u8 wmm_acm;
1: +  struct ieee80211_key *keys[8];
1: +  struct ieee80211_key *default_unicast_key;
1: +  struct ieee80211_key *default_multicast_key;
1: +  struct ieee80211_key *default_mgmt_key;
1: +  struct ieee80211_key *default_beacon_key;
1: +  u16 sequence_number;
1: +  __be16 control_port_protocol;
1: +  bool control_port_no_encrypt;
1: +  bool control_port_no_preauth;
1: +  bool control_port_over_nl80211;
1: +  int encrypt_headroom;
1: +  atomic_t num_tx_queued;
1: +  struct ieee80211_tx_queue_params tx_conf[4];
1: +  struct mac80211_qos_map *qos_map;
1: +  struct work_struct csa_finalize_work;
1: +  bool csa_block_tx;
1: +  struct cfg80211_chan_def csa_chandef;
1: +  struct list_head assigned_chanctx_list;
1: +  struct list_head reserved_chanctx_list;
1: +  struct ieee80211_chanctx *reserved_chanctx;
1: +  struct cfg80211_chan_def reserved_chandef;
1: +  bool reserved_radar_required;
1: +  bool reserved_ready;
1: +  struct work_struct recalc_smps;
1: +  struct work_struct work;
1: +  struct sk_buff_head skb_queue;
1: +  u8 needed_rx_chains;
1: +  enum ieee80211_smps_mode smps_mode;
1: +  int user_power_level;
1: +  int ap_power_level;
1: +  bool radar_required;
1: +  struct delayed_work dfs_cac_timer_work;
1: +  struct ieee80211_if_ap *bss;
1: +  u32 rc_rateidx_mask[5];
1: +  bool rc_has_mcs_mask[5];
1: +  u8 rc_rateidx_mcs_mask[50];
1: +  bool rc_has_vht_mcs_mask[5];
1: +  u16 rc_rateidx_vht_mcs_mask[40];
1: +  u32 beacon_rateidx_mask[5];
1: +  bool beacon_rate_set;
1: +  union {
1: +    struct ieee80211_if_ap ap;
1: +    struct ieee80211_if_vlan vlan;
1: +    struct ieee80211_if_managed mgd;
1: +    struct ieee80211_if_ibss ibss;
1: +    struct ieee80211_if_mesh mesh;
1: +    struct ieee80211_if_ocb ocb;
1: +    struct ieee80211_if_mntr mntr;
1: +    struct ieee80211_if_nan nan;
1: +  } u;
1: +  struct ieee80211_vif vif;
1:  };
1:  
1:  struct ieee80211_sta_rx_stats {
1: -	long unsigned int packets;
1: -	long unsigned int last_rx;
1: -	long unsigned int num_duplicates;
1: -	long unsigned int fragments;
1: -	long unsigned int dropped;
1: -	int last_signal;
1: -	u8 chains;
1: -	s8 chain_signal_last[4];
1: -	u32 last_rate;
1: -	struct u64_stats_sync syncp;
1: -	u64 bytes;
1: -	u64 msdu[17];
1: +  long unsigned int packets;
1: +  long unsigned int last_rx;
1: +  long unsigned int num_duplicates;
1: +  long unsigned int fragments;
1: +  long unsigned int dropped;
1: +  int last_signal;
1: +  u8 chains;
1: +  s8 chain_signal_last[4];
1: +  u32 last_rate;
1: +  struct u64_stats_sync syncp;
1: +  u64 bytes;
1: +  u64 msdu[17];
1:  };
1:  
1:  struct ewma_signal {
1: -	long unsigned int internal;
1: +  long unsigned int internal;
1:  };
1:  
1:  struct ewma_avg_signal {
1: -	long unsigned int internal;
1: +  long unsigned int internal;
1:  };
1:  
1:  struct airtime_info {
1: -	u64 rx_airtime;
1: -	u64 tx_airtime;
1: -	s64 deficit;
1: -	atomic_t aql_tx_pending;
1: -	u32 aql_limit_low;
1: -	u32 aql_limit_high;
1: +  u64 rx_airtime;
1: +  u64 tx_airtime;
1: +  s64 deficit;
1: +  atomic_t aql_tx_pending;
1: +  u32 aql_limit_low;
1: +  u32 aql_limit_high;
1:  };
1:  
1:  struct tid_ampdu_rx;
1: @@ -134086,20 +135955,20 @@ struct tid_ampdu_rx;
1:  struct tid_ampdu_tx;
1:  
1:  struct sta_ampdu_mlme {
1: -	struct mutex mtx;
1: -	struct tid_ampdu_rx *tid_rx[16];
1: -	u8 tid_rx_token[16];
1: -	long unsigned int tid_rx_timer_expired[1];
1: -	long unsigned int tid_rx_stop_requested[1];
1: -	long unsigned int tid_rx_manage_offl[1];
1: -	long unsigned int agg_session_valid[1];
1: -	long unsigned int unexpected_agg[1];
1: -	struct work_struct work;
1: -	struct tid_ampdu_tx *tid_tx[16];
1: -	struct tid_ampdu_tx *tid_start_tx[16];
1: -	long unsigned int last_addba_req_time[16];
1: -	u8 addba_req_num[16];
1: -	u8 dialog_token_allocator;
1: +  struct mutex mtx;
1: +  struct tid_ampdu_rx *tid_rx[16];
1: +  u8 tid_rx_token[16];
1: +  long unsigned int tid_rx_timer_expired[1];
1: +  long unsigned int tid_rx_stop_requested[1];
1: +  long unsigned int tid_rx_manage_offl[1];
1: +  long unsigned int agg_session_valid[1];
1: +  long unsigned int unexpected_agg[1];
1: +  struct work_struct work;
1: +  struct tid_ampdu_tx *tid_tx[16];
1: +  struct tid_ampdu_tx *tid_start_tx[16];
1: +  long unsigned int last_addba_req_time[16];
1: +  u8 addba_req_num[16];
1: +  u8 dialog_token_allocator;
1:  };
1:  
1:  struct ieee80211_fast_tx;
1: @@ -134107,2330 +135976,2336 @@ struct ieee80211_fast_tx;
1:  struct ieee80211_fast_rx;
1:  
1:  struct sta_info {
1: -	struct list_head list;
1: -	struct list_head free_list;
1: -	struct callback_head callback_head;
1: -	struct rhlist_head hash_node;
1: -	u8 addr[6];
1: -	struct ieee80211_local *local;
1: -	struct ieee80211_sub_if_data *sdata;
1: -	struct ieee80211_key *gtk[8];
1: -	struct ieee80211_key *ptk[4];
1: -	u8 ptk_idx;
1: -	struct rate_control_ref *rate_ctrl;
1: -	void *rate_ctrl_priv;
1: -	spinlock_t rate_ctrl_lock;
1: -	spinlock_t lock;
1: -	struct ieee80211_fast_tx *fast_tx;
1: -	struct ieee80211_fast_rx *fast_rx;
1: -	struct ieee80211_sta_rx_stats *pcpu_rx_stats;
1: -	struct work_struct drv_deliver_wk;
1: -	u16 listen_interval;
1: -	bool dead;
1: -	bool removed;
1: -	bool uploaded;
1: -	enum ieee80211_sta_state sta_state;
1: -	long unsigned int _flags;
1: -	spinlock_t ps_lock;
1: -	struct sk_buff_head ps_tx_buf[4];
1: -	struct sk_buff_head tx_filtered[4];
1: -	long unsigned int driver_buffered_tids;
1: -	long unsigned int txq_buffered_tids;
1: -	u64 assoc_at;
1: -	long int last_connected;
1: -	struct ieee80211_sta_rx_stats rx_stats;
1: -	struct {
1: -		struct ewma_signal signal;
1: -		struct ewma_signal chain_signal[4];
1: -	} rx_stats_avg;
1: -	__le16 last_seq_ctrl[17];
1: -	struct {
1: -		long unsigned int filtered;
1: -		long unsigned int retry_failed;
1: -		long unsigned int retry_count;
1: -		unsigned int lost_packets;
1: -		long unsigned int last_pkt_time;
1: -		u64 msdu_retries[17];
1: -		u64 msdu_failed[17];
1: -		long unsigned int last_ack;
1: -		s8 last_ack_signal;
1: -		bool ack_signal_filled;
1: -		struct ewma_avg_signal avg_ack_signal;
1: -	} status_stats;
1: -	struct {
1: -		u64 packets[4];
1: -		u64 bytes[4];
1: -		struct ieee80211_tx_rate last_rate;
1: -		struct rate_info last_rate_info;
1: -		u64 msdu[17];
1: -	} tx_stats;
1: -	u16 tid_seq[16];
1: -	struct airtime_info airtime[4];
1: -	u16 airtime_weight;
1: -	struct sta_ampdu_mlme ampdu_mlme;
1: -	enum ieee80211_sta_rx_bandwidth cur_max_bandwidth;
1: -	enum ieee80211_smps_mode known_smps_mode;
1: -	const struct ieee80211_cipher_scheme *cipher_scheme;
1: -	struct codel_params cparams;
1: -	u8 reserved_tid;
1: -	struct cfg80211_chan_def tdls_chandef;
1: -	struct ieee80211_sta sta;
1: +  struct list_head list;
1: +  struct list_head free_list;
1: +  struct callback_head callback_head;
1: +  struct rhlist_head hash_node;
1: +  u8 addr[6];
1: +  struct ieee80211_local *local;
1: +  struct ieee80211_sub_if_data *sdata;
1: +  struct ieee80211_key *gtk[8];
1: +  struct ieee80211_key *ptk[4];
1: +  u8 ptk_idx;
1: +  struct rate_control_ref *rate_ctrl;
1: +  void *rate_ctrl_priv;
1: +  spinlock_t rate_ctrl_lock;
1: +  spinlock_t lock;
1: +  struct ieee80211_fast_tx *fast_tx;
1: +  struct ieee80211_fast_rx *fast_rx;
1: +  struct ieee80211_sta_rx_stats *pcpu_rx_stats;
1: +  struct work_struct drv_deliver_wk;
1: +  u16 listen_interval;
1: +  bool dead;
1: +  bool removed;
1: +  bool uploaded;
1: +  enum ieee80211_sta_state sta_state;
1: +  long unsigned int _flags;
1: +  spinlock_t ps_lock;
1: +  struct sk_buff_head ps_tx_buf[4];
1: +  struct sk_buff_head tx_filtered[4];
1: +  long unsigned int driver_buffered_tids;
1: +  long unsigned int txq_buffered_tids;
1: +  u64 assoc_at;
1: +  long int last_connected;
1: +  struct ieee80211_sta_rx_stats rx_stats;
1: +  struct {
1: +    struct ewma_signal signal;
1: +    struct ewma_signal chain_signal[4];
1: +  } rx_stats_avg;
1: +  __le16 last_seq_ctrl[17];
1: +  struct {
1: +    long unsigned int filtered;
1: +    long unsigned int retry_failed;
1: +    long unsigned int retry_count;
1: +    unsigned int lost_packets;
1: +    long unsigned int last_pkt_time;
1: +    u64 msdu_retries[17];
1: +    u64 msdu_failed[17];
1: +    long unsigned int last_ack;
1: +    s8 last_ack_signal;
1: +    bool ack_signal_filled;
1: +    struct ewma_avg_signal avg_ack_signal;
1: +  } status_stats;
1: +  struct {
1: +    u64 packets[4];
1: +    u64 bytes[4];
1: +    struct ieee80211_tx_rate last_rate;
1: +    struct rate_info last_rate_info;
1: +    u64 msdu[17];
1: +  } tx_stats;
1: +  u16 tid_seq[16];
1: +  struct airtime_info airtime[4];
1: +  u16 airtime_weight;
1: +  struct sta_ampdu_mlme ampdu_mlme;
1: +  enum ieee80211_sta_rx_bandwidth cur_max_bandwidth;
1: +  enum ieee80211_smps_mode known_smps_mode;
1: +  const struct ieee80211_cipher_scheme *cipher_scheme;
1: +  struct codel_params cparams;
1: +  u8 reserved_tid;
1: +  struct cfg80211_chan_def tdls_chandef;
1: +  struct ieee80211_sta sta;
1:  };
1:  
1:  struct tid_ampdu_tx {
1: -	struct callback_head callback_head;
1: -	struct timer_list session_timer;
1: -	struct timer_list addba_resp_timer;
1: -	struct sk_buff_head pending;
1: -	struct sta_info *sta;
1: -	long unsigned int state;
1: -	long unsigned int last_tx;
1: -	u16 timeout;
1: -	u8 dialog_token;
1: -	u8 stop_initiator;
1: -	bool tx_stop;
1: -	u16 buf_size;
1: -	u16 failed_bar_ssn;
1: -	bool bar_pending;
1: -	bool amsdu;
1: -	u8 tid;
1: +  struct callback_head callback_head;
1: +  struct timer_list session_timer;
1: +  struct timer_list addba_resp_timer;
1: +  struct sk_buff_head pending;
1: +  struct sta_info *sta;
1: +  long unsigned int state;
1: +  long unsigned int last_tx;
1: +  u16 timeout;
1: +  u8 dialog_token;
1: +  u8 stop_initiator;
1: +  bool tx_stop;
1: +  u16 buf_size;
1: +  u16 failed_bar_ssn;
1: +  bool bar_pending;
1: +  bool amsdu;
1: +  u8 tid;
1:  };
1:  
1:  struct tid_ampdu_rx {
1: -	struct callback_head callback_head;
1: -	spinlock_t reorder_lock;
1: -	u64 reorder_buf_filtered;
1: -	struct sk_buff_head *reorder_buf;
1: -	long unsigned int *reorder_time;
1: -	struct sta_info *sta;
1: -	struct timer_list session_timer;
1: -	struct timer_list reorder_timer;
1: -	long unsigned int last_rx;
1: -	u16 head_seq_num;
1: -	u16 stored_mpdu_num;
1: -	u16 ssn;
1: -	u16 buf_size;
1: -	u16 timeout;
1: -	u8 tid;
1: -	u8 auto_seq: 1;
1: -	u8 removed: 1;
1: -	u8 started: 1;
1: +  struct callback_head callback_head;
1: +  spinlock_t reorder_lock;
1: +  u64 reorder_buf_filtered;
1: +  struct sk_buff_head *reorder_buf;
1: +  long unsigned int *reorder_time;
1: +  struct sta_info *sta;
1: +  struct timer_list session_timer;
1: +  struct timer_list reorder_timer;
1: +  long unsigned int last_rx;
1: +  u16 head_seq_num;
1: +  u16 stored_mpdu_num;
1: +  u16 ssn;
1: +  u16 buf_size;
1: +  u16 timeout;
1: +  u8 tid;
1: +  u8 auto_seq : 1;
1: +  u8 removed : 1;
1: +  u8 started : 1;
1:  };
1:  
1:  struct ieee80211_fast_tx {
1: -	struct ieee80211_key *key;
1: -	u8 hdr_len;
1: -	u8 sa_offs;
1: -	u8 da_offs;
1: -	u8 pn_offs;
1: -	u8 band;
1: -	char: 8;
1: -	u8 hdr[56];
1: -	struct callback_head callback_head;
1: +  struct ieee80211_key *key;
1: +  u8 hdr_len;
1: +  u8 sa_offs;
1: +  u8 da_offs;
1: +  u8 pn_offs;
1: +  u8 band;
1: +  char : 8;
1: +  u8 hdr[56];
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct ieee80211_fast_rx {
1: -	struct net_device *dev;
1: -	enum nl80211_iftype vif_type;
1: -	u8 vif_addr[6];
1: -	u8 rfc1042_hdr[6];
1: -	__be16 control_port_protocol;
1: -	__le16 expected_ds_bits;
1: -	u8 icv_len;
1: -	u8 key: 1;
1: -	u8 internal_forward: 1;
1: -	u8 uses_rss: 1;
1: -	u8 da_offs;
1: -	u8 sa_offs;
1: -	struct callback_head callback_head;
1: +  struct net_device *dev;
1: +  enum nl80211_iftype vif_type;
1: +  u8 vif_addr[6];
1: +  u8 rfc1042_hdr[6];
1: +  __be16 control_port_protocol;
1: +  __le16 expected_ds_bits;
1: +  u8 icv_len;
1: +  u8 key : 1;
1: +  u8 internal_forward : 1;
1: +  u8 uses_rss : 1;
1: +  u8 da_offs;
1: +  u8 sa_offs;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct rate_control_ref {
1: -	const struct rate_control_ops *ops;
1: -	void *priv;
1: +  const struct rate_control_ops *ops;
1: +  void *priv;
1:  };
1:  
1:  struct beacon_data {
1: -	u8 *head;
1: -	u8 *tail;
1: -	int head_len;
1: -	int tail_len;
1: -	struct ieee80211_meshconf_ie *meshconf;
1: -	u16 cntdwn_counter_offsets[2];
1: -	u8 cntdwn_current_counter;
1: -	struct callback_head callback_head;
1: +  u8 *head;
1: +  u8 *tail;
1: +  int head_len;
1: +  int tail_len;
1: +  struct ieee80211_meshconf_ie *meshconf;
1: +  u16 cntdwn_counter_offsets[2];
1: +  u8 cntdwn_current_counter;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  struct probe_resp {
1: -	struct callback_head callback_head;
1: -	int len;
1: -	u16 cntdwn_counter_offsets[2];
1: -	u8 data[0];
1: +  struct callback_head callback_head;
1: +  int len;
1: +  u16 cntdwn_counter_offsets[2];
1: +  u8 data[0];
1:  };
1:  
1:  struct fils_discovery_data {
1: -	struct callback_head callback_head;
1: -	int len;
1: -	u8 data[0];
1: +  struct callback_head callback_head;
1: +  int len;
1: +  u8 data[0];
1:  };
1:  
1:  struct unsol_bcast_probe_resp_data {
1: -	struct callback_head callback_head;
1: -	int len;
1: -	u8 data[0];
1: +  struct callback_head callback_head;
1: +  int len;
1: +  u8 data[0];
1:  };
1:  
1:  struct ieee80211_mgd_auth_data {
1: -	struct cfg80211_bss *bss;
1: -	long unsigned int timeout;
1: -	int tries;
1: -	u16 algorithm;
1: -	u16 expected_transaction;
1: -	u8 key[13];
1: -	u8 key_len;
1: -	u8 key_idx;
1: -	bool done;
1: -	bool peer_confirmed;
1: -	bool timeout_started;
1: -	u16 sae_trans;
1: -	u16 sae_status;
1: -	size_t data_len;
1: -	u8 data[0];
1: +  struct cfg80211_bss *bss;
1: +  long unsigned int timeout;
1: +  int tries;
1: +  u16 algorithm;
1: +  u16 expected_transaction;
1: +  u8 key[13];
1: +  u8 key_len;
1: +  u8 key_idx;
1: +  bool done;
1: +  bool peer_confirmed;
1: +  bool timeout_started;
1: +  u16 sae_trans;
1: +  u16 sae_status;
1: +  size_t data_len;
1: +  u8 data[0];
1:  };
1:  
1:  struct ieee80211_mgd_assoc_data {
1: -	struct cfg80211_bss *bss;
1: -	const u8 *supp_rates;
1: -	long unsigned int timeout;
1: -	int tries;
1: -	u16 capability;
1: -	u8 prev_bssid[6];
1: -	u8 ssid[32];
1: -	u8 ssid_len;
1: -	u8 supp_rates_len;
1: -	bool wmm;
1: -	bool uapsd;
1: -	bool need_beacon;
1: -	bool synced;
1: -	bool timeout_started;
1: -	u8 ap_ht_param;
1: -	struct ieee80211_vht_cap ap_vht_cap;
1: -	u8 fils_nonces[32];
1: -	u8 fils_kek[64];
1: -	size_t fils_kek_len;
1: -	size_t ie_len;
1: -	u8 ie[0];
1: +  struct cfg80211_bss *bss;
1: +  const u8 *supp_rates;
1: +  long unsigned int timeout;
1: +  int tries;
1: +  u16 capability;
1: +  u8 prev_bssid[6];
1: +  u8 ssid[32];
1: +  u8 ssid_len;
1: +  u8 supp_rates_len;
1: +  bool wmm;
1: +  bool uapsd;
1: +  bool need_beacon;
1: +  bool synced;
1: +  bool timeout_started;
1: +  u8 ap_ht_param;
1: +  struct ieee80211_vht_cap ap_vht_cap;
1: +  u8 fils_nonces[32];
1: +  u8 fils_kek[64];
1: +  size_t fils_kek_len;
1: +  size_t ie_len;
1: +  u8 ie[0];
1:  };
1:  
1:  struct ieee802_11_elems;
1:  
1:  struct ieee80211_mesh_sync_ops {
1: -	void (*rx_bcn_presp)(struct ieee80211_sub_if_data *, u16, struct ieee80211_mgmt *, struct ieee802_11_elems *, struct ieee80211_rx_status *);
1: -	void (*adjust_tsf)(struct ieee80211_sub_if_data *, struct beacon_data *);
1: +  void (*rx_bcn_presp)(struct ieee80211_sub_if_data *, u16,
1: +                       struct ieee80211_mgmt *, struct ieee802_11_elems *,
1: +                       struct ieee80211_rx_status *);
1: +  void (*adjust_tsf)(struct ieee80211_sub_if_data *, struct beacon_data *);
1:  };
1:  
1:  struct ieee802_11_elems {
1: -	const u8 *ie_start;
1: -	size_t total_len;
1: -	const struct ieee80211_tdls_lnkie *lnk_id;
1: -	const struct ieee80211_ch_switch_timing *ch_sw_timing;
1: -	const u8 *ext_capab;
1: -	const u8 *ssid;
1: -	const u8 *supp_rates;
1: -	const u8 *ds_params;
1: -	const struct ieee80211_tim_ie *tim;
1: -	const u8 *challenge;
1: -	const u8 *rsn;
1: -	const u8 *rsnx;
1: -	const u8 *erp_info;
1: -	const u8 *ext_supp_rates;
1: -	const u8 *wmm_info;
1: -	const u8 *wmm_param;
1: -	const struct ieee80211_ht_cap *ht_cap_elem;
1: -	const struct ieee80211_ht_operation *ht_operation;
1: -	const struct ieee80211_vht_cap *vht_cap_elem;
1: -	const struct ieee80211_vht_operation *vht_operation;
1: -	const struct ieee80211_meshconf_ie *mesh_config;
1: -	const u8 *he_cap;
1: -	const struct ieee80211_he_operation *he_operation;
1: -	const struct ieee80211_he_spr *he_spr;
1: -	const struct ieee80211_mu_edca_param_set *mu_edca_param_set;
1: -	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
1: -	const u8 *uora_element;
1: -	const u8 *mesh_id;
1: -	const u8 *peering;
1: -	const __le16 *awake_window;
1: -	const u8 *preq;
1: -	const u8 *prep;
1: -	const u8 *perr;
1: -	const struct ieee80211_rann_ie *rann;
1: -	const struct ieee80211_channel_sw_ie *ch_switch_ie;
1: -	const struct ieee80211_ext_chansw_ie *ext_chansw_ie;
1: -	const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie;
1: -	const u8 *max_channel_switch_time;
1: -	const u8 *country_elem;
1: -	const u8 *pwr_constr_elem;
1: -	const u8 *cisco_dtpc_elem;
1: -	const struct ieee80211_timeout_interval_ie *timeout_int;
1: -	const u8 *opmode_notif;
1: -	const struct ieee80211_sec_chan_offs_ie *sec_chan_offs;
1: -	struct ieee80211_mesh_chansw_params_ie *mesh_chansw_params_ie;
1: -	const struct ieee80211_bss_max_idle_period_ie *max_idle_period_ie;
1: -	const struct ieee80211_multiple_bssid_configuration *mbssid_config_ie;
1: -	const struct ieee80211_bssid_index *bssid_index;
1: -	u8 max_bssid_indicator;
1: -	u8 dtim_count;
1: -	u8 dtim_period;
1: -	const struct ieee80211_addba_ext_ie *addba_ext_ie;
1: -	const struct ieee80211_s1g_cap *s1g_capab;
1: -	const struct ieee80211_s1g_oper_ie *s1g_oper;
1: -	const struct ieee80211_s1g_bcn_compat_ie *s1g_bcn_compat;
1: -	const struct ieee80211_aid_response_ie *aid_resp;
1: -	u8 ext_capab_len;
1: -	u8 ssid_len;
1: -	u8 supp_rates_len;
1: -	u8 tim_len;
1: -	u8 challenge_len;
1: -	u8 rsn_len;
1: -	u8 rsnx_len;
1: -	u8 ext_supp_rates_len;
1: -	u8 wmm_info_len;
1: -	u8 wmm_param_len;
1: -	u8 he_cap_len;
1: -	u8 mesh_id_len;
1: -	u8 peering_len;
1: -	u8 preq_len;
1: -	u8 prep_len;
1: -	u8 perr_len;
1: -	u8 country_elem_len;
1: -	u8 bssid_index_len;
1: -	bool parse_error;
1: +  const u8 *ie_start;
1: +  size_t total_len;
1: +  const struct ieee80211_tdls_lnkie *lnk_id;
1: +  const struct ieee80211_ch_switch_timing *ch_sw_timing;
1: +  const u8 *ext_capab;
1: +  const u8 *ssid;
1: +  const u8 *supp_rates;
1: +  const u8 *ds_params;
1: +  const struct ieee80211_tim_ie *tim;
1: +  const u8 *challenge;
1: +  const u8 *rsn;
1: +  const u8 *rsnx;
1: +  const u8 *erp_info;
1: +  const u8 *ext_supp_rates;
1: +  const u8 *wmm_info;
1: +  const u8 *wmm_param;
1: +  const struct ieee80211_ht_cap *ht_cap_elem;
1: +  const struct ieee80211_ht_operation *ht_operation;
1: +  const struct ieee80211_vht_cap *vht_cap_elem;
1: +  const struct ieee80211_vht_operation *vht_operation;
1: +  const struct ieee80211_meshconf_ie *mesh_config;
1: +  const u8 *he_cap;
1: +  const struct ieee80211_he_operation *he_operation;
1: +  const struct ieee80211_he_spr *he_spr;
1: +  const struct ieee80211_mu_edca_param_set *mu_edca_param_set;
1: +  const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
1: +  const u8 *uora_element;
1: +  const u8 *mesh_id;
1: +  const u8 *peering;
1: +  const __le16 *awake_window;
1: +  const u8 *preq;
1: +  const u8 *prep;
1: +  const u8 *perr;
1: +  const struct ieee80211_rann_ie *rann;
1: +  const struct ieee80211_channel_sw_ie *ch_switch_ie;
1: +  const struct ieee80211_ext_chansw_ie *ext_chansw_ie;
1: +  const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie;
1: +  const u8 *max_channel_switch_time;
1: +  const u8 *country_elem;
1: +  const u8 *pwr_constr_elem;
1: +  const u8 *cisco_dtpc_elem;
1: +  const struct ieee80211_timeout_interval_ie *timeout_int;
1: +  const u8 *opmode_notif;
1: +  const struct ieee80211_sec_chan_offs_ie *sec_chan_offs;
1: +  struct ieee80211_mesh_chansw_params_ie *mesh_chansw_params_ie;
1: +  const struct ieee80211_bss_max_idle_period_ie *max_idle_period_ie;
1: +  const struct ieee80211_multiple_bssid_configuration *mbssid_config_ie;
1: +  const struct ieee80211_bssid_index *bssid_index;
1: +  u8 max_bssid_indicator;
1: +  u8 dtim_count;
1: +  u8 dtim_period;
1: +  const struct ieee80211_addba_ext_ie *addba_ext_ie;
1: +  const struct ieee80211_s1g_cap *s1g_capab;
1: +  const struct ieee80211_s1g_oper_ie *s1g_oper;
1: +  const struct ieee80211_s1g_bcn_compat_ie *s1g_bcn_compat;
1: +  const struct ieee80211_aid_response_ie *aid_resp;
1: +  u8 ext_capab_len;
1: +  u8 ssid_len;
1: +  u8 supp_rates_len;
1: +  u8 tim_len;
1: +  u8 challenge_len;
1: +  u8 rsn_len;
1: +  u8 rsnx_len;
1: +  u8 ext_supp_rates_len;
1: +  u8 wmm_info_len;
1: +  u8 wmm_param_len;
1: +  u8 he_cap_len;
1: +  u8 mesh_id_len;
1: +  u8 peering_len;
1: +  u8 preq_len;
1: +  u8 prep_len;
1: +  u8 perr_len;
1: +  u8 country_elem_len;
1: +  u8 bssid_index_len;
1: +  bool parse_error;
1:  };
1:  
1:  struct mesh_csa_settings {
1: -	struct callback_head callback_head;
1: -	struct cfg80211_csa_settings settings;
1: +  struct callback_head callback_head;
1: +  struct cfg80211_csa_settings settings;
1:  };
1:  
1:  struct mesh_rmc {
1: -	struct hlist_head bucket[256];
1: -	u32 idx_mask;
1: +  struct hlist_head bucket[256];
1: +  u32 idx_mask;
1:  };
1:  
1:  struct mesh_table {
1: -	struct hlist_head known_gates;
1: -	spinlock_t gates_lock;
1: -	struct rhashtable rhead;
1: -	struct hlist_head walk_head;
1: -	spinlock_t walk_lock;
1: -	atomic_t entries;
1: +  struct hlist_head known_gates;
1: +  spinlock_t gates_lock;
1: +  struct rhashtable rhead;
1: +  struct hlist_head walk_head;
1: +  spinlock_t walk_lock;
1: +  atomic_t entries;
1:  };
1:  
1:  enum ieee80211_sub_if_data_flags {
1: -	IEEE80211_SDATA_ALLMULTI = 1,
1: -	IEEE80211_SDATA_OPERATING_GMODE = 4,
1: -	IEEE80211_SDATA_DONT_BRIDGE_PACKETS = 8,
1: -	IEEE80211_SDATA_DISCONNECT_RESUME = 16,
1: -	IEEE80211_SDATA_IN_DRIVER = 32,
1: +  IEEE80211_SDATA_ALLMULTI = 1,
1: +  IEEE80211_SDATA_OPERATING_GMODE = 4,
1: +  IEEE80211_SDATA_DONT_BRIDGE_PACKETS = 8,
1: +  IEEE80211_SDATA_DISCONNECT_RESUME = 16,
1: +  IEEE80211_SDATA_IN_DRIVER = 32,
1:  };
1:  
1:  enum ieee80211_chanctx_mode {
1: -	IEEE80211_CHANCTX_SHARED = 0,
1: -	IEEE80211_CHANCTX_EXCLUSIVE = 1,
1: +  IEEE80211_CHANCTX_SHARED = 0,
1: +  IEEE80211_CHANCTX_EXCLUSIVE = 1,
1:  };
1:  
1:  enum ieee80211_chanctx_replace_state {
1: -	IEEE80211_CHANCTX_REPLACE_NONE = 0,
1: -	IEEE80211_CHANCTX_WILL_BE_REPLACED = 1,
1: -	IEEE80211_CHANCTX_REPLACES_OTHER = 2,
1: +  IEEE80211_CHANCTX_REPLACE_NONE = 0,
1: +  IEEE80211_CHANCTX_WILL_BE_REPLACED = 1,
1: +  IEEE80211_CHANCTX_REPLACES_OTHER = 2,
1:  };
1:  
1:  struct ieee80211_chanctx {
1: -	struct list_head list;
1: -	struct callback_head callback_head;
1: -	struct list_head assigned_vifs;
1: -	struct list_head reserved_vifs;
1: -	enum ieee80211_chanctx_replace_state replace_state;
1: -	struct ieee80211_chanctx *replace_ctx;
1: -	enum ieee80211_chanctx_mode mode;
1: -	bool driver_present;
1: -	struct ieee80211_chanctx_conf conf;
1: +  struct list_head list;
1: +  struct callback_head callback_head;
1: +  struct list_head assigned_vifs;
1: +  struct list_head reserved_vifs;
1: +  enum ieee80211_chanctx_replace_state replace_state;
1: +  struct ieee80211_chanctx *replace_ctx;
1: +  enum ieee80211_chanctx_mode mode;
1: +  bool driver_present;
1: +  struct ieee80211_chanctx_conf conf;
1:  };
1:  
1:  struct mac80211_qos_map {
1: -	struct cfg80211_qos_map qos_map;
1: -	struct callback_head callback_head;
1: +  struct cfg80211_qos_map qos_map;
1: +  struct callback_head callback_head;
1:  };
1:  
1:  enum {
1: -	IEEE80211_RX_MSG = 1,
1: -	IEEE80211_TX_STATUS_MSG = 2,
1: +  IEEE80211_RX_MSG = 1,
1: +  IEEE80211_TX_STATUS_MSG = 2,
1:  };
1:  
1:  enum queue_stop_reason {
1: -	IEEE80211_QUEUE_STOP_REASON_DRIVER = 0,
1: -	IEEE80211_QUEUE_STOP_REASON_PS = 1,
1: -	IEEE80211_QUEUE_STOP_REASON_CSA = 2,
1: -	IEEE80211_QUEUE_STOP_REASON_AGGREGATION = 3,
1: -	IEEE80211_QUEUE_STOP_REASON_SUSPEND = 4,
1: -	IEEE80211_QUEUE_STOP_REASON_SKB_ADD = 5,
1: -	IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL = 6,
1: -	IEEE80211_QUEUE_STOP_REASON_FLUSH = 7,
1: -	IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN = 8,
1: -	IEEE80211_QUEUE_STOP_REASON_RESERVE_TID = 9,
1: -	IEEE80211_QUEUE_STOP_REASONS = 10,
1: +  IEEE80211_QUEUE_STOP_REASON_DRIVER = 0,
1: +  IEEE80211_QUEUE_STOP_REASON_PS = 1,
1: +  IEEE80211_QUEUE_STOP_REASON_CSA = 2,
1: +  IEEE80211_QUEUE_STOP_REASON_AGGREGATION = 3,
1: +  IEEE80211_QUEUE_STOP_REASON_SUSPEND = 4,
1: +  IEEE80211_QUEUE_STOP_REASON_SKB_ADD = 5,
1: +  IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL = 6,
1: +  IEEE80211_QUEUE_STOP_REASON_FLUSH = 7,
1: +  IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN = 8,
1: +  IEEE80211_QUEUE_STOP_REASON_RESERVE_TID = 9,
1: +  IEEE80211_QUEUE_STOP_REASONS = 10,
1:  };
1:  
1:  enum {
1: -	SCAN_SW_SCANNING = 0,
1: -	SCAN_HW_SCANNING = 1,
1: -	SCAN_ONCHANNEL_SCANNING = 2,
1: -	SCAN_COMPLETED = 3,
1: -	SCAN_ABORTED = 4,
1: -	SCAN_HW_CANCELLED = 5,
1: +  SCAN_SW_SCANNING = 0,
1: +  SCAN_HW_SCANNING = 1,
1: +  SCAN_ONCHANNEL_SCANNING = 2,
1: +  SCAN_COMPLETED = 3,
1: +  SCAN_ABORTED = 4,
1: +  SCAN_HW_CANCELLED = 5,
1:  };
1:  
1:  struct ieee80211_bar {
1: -	__le16 frame_control;
1: -	__le16 duration;
1: -	__u8 ra[6];
1: -	__u8 ta[6];
1: -	__le16 control;
1: -	__le16 start_seq_num;
1: +  __le16 frame_control;
1: +  __le16 duration;
1: +  __u8 ra[6];
1: +  __u8 ta[6];
1: +  __le16 control;
1: +  __le16 start_seq_num;
1:  };
1:  
1:  enum ieee80211_ht_actioncode {
1: -	WLAN_HT_ACTION_NOTIFY_CHANWIDTH = 0,
1: -	WLAN_HT_ACTION_SMPS = 1,
1: -	WLAN_HT_ACTION_PSMP = 2,
1: -	WLAN_HT_ACTION_PCO_PHASE = 3,
1: -	WLAN_HT_ACTION_CSI = 4,
1: -	WLAN_HT_ACTION_NONCOMPRESSED_BF = 5,
1: -	WLAN_HT_ACTION_COMPRESSED_BF = 6,
1: -	WLAN_HT_ACTION_ASEL_IDX_FEEDBACK = 7,
1: +  WLAN_HT_ACTION_NOTIFY_CHANWIDTH = 0,
1: +  WLAN_HT_ACTION_SMPS = 1,
1: +  WLAN_HT_ACTION_PSMP = 2,
1: +  WLAN_HT_ACTION_PCO_PHASE = 3,
1: +  WLAN_HT_ACTION_CSI = 4,
1: +  WLAN_HT_ACTION_NONCOMPRESSED_BF = 5,
1: +  WLAN_HT_ACTION_COMPRESSED_BF = 6,
1: +  WLAN_HT_ACTION_ASEL_IDX_FEEDBACK = 7,
1:  };
1:  
1:  enum ieee80211_tdls_actioncode {
1: -	WLAN_TDLS_SETUP_REQUEST = 0,
1: -	WLAN_TDLS_SETUP_RESPONSE = 1,
1: -	WLAN_TDLS_SETUP_CONFIRM = 2,
1: -	WLAN_TDLS_TEARDOWN = 3,
1: -	WLAN_TDLS_PEER_TRAFFIC_INDICATION = 4,
1: -	WLAN_TDLS_CHANNEL_SWITCH_REQUEST = 5,
1: -	WLAN_TDLS_CHANNEL_SWITCH_RESPONSE = 6,
1: -	WLAN_TDLS_PEER_PSM_REQUEST = 7,
1: -	WLAN_TDLS_PEER_PSM_RESPONSE = 8,
1: -	WLAN_TDLS_PEER_TRAFFIC_RESPONSE = 9,
1: -	WLAN_TDLS_DISCOVERY_REQUEST = 10,
1: +  WLAN_TDLS_SETUP_REQUEST = 0,
1: +  WLAN_TDLS_SETUP_RESPONSE = 1,
1: +  WLAN_TDLS_SETUP_CONFIRM = 2,
1: +  WLAN_TDLS_TEARDOWN = 3,
1: +  WLAN_TDLS_PEER_TRAFFIC_INDICATION = 4,
1: +  WLAN_TDLS_CHANNEL_SWITCH_REQUEST = 5,
1: +  WLAN_TDLS_CHANNEL_SWITCH_RESPONSE = 6,
1: +  WLAN_TDLS_PEER_PSM_REQUEST = 7,
1: +  WLAN_TDLS_PEER_PSM_RESPONSE = 8,
1: +  WLAN_TDLS_PEER_TRAFFIC_RESPONSE = 9,
1: +  WLAN_TDLS_DISCOVERY_REQUEST = 10,
1:  };
1:  
1:  enum ieee80211_radiotap_tx_flags {
1: -	IEEE80211_RADIOTAP_F_TX_FAIL = 1,
1: -	IEEE80211_RADIOTAP_F_TX_CTS = 2,
1: -	IEEE80211_RADIOTAP_F_TX_RTS = 4,
1: -	IEEE80211_RADIOTAP_F_TX_NOACK = 8,
1: -	IEEE80211_RADIOTAP_F_TX_NOSEQNO = 16,
1: -	IEEE80211_RADIOTAP_F_TX_ORDER = 32,
1: +  IEEE80211_RADIOTAP_F_TX_FAIL = 1,
1: +  IEEE80211_RADIOTAP_F_TX_CTS = 2,
1: +  IEEE80211_RADIOTAP_F_TX_RTS = 4,
1: +  IEEE80211_RADIOTAP_F_TX_NOACK = 8,
1: +  IEEE80211_RADIOTAP_F_TX_NOSEQNO = 16,
1: +  IEEE80211_RADIOTAP_F_TX_ORDER = 32,
1:  };
1:  
1:  enum ieee80211_radiotap_mcs_flags {
1: -	IEEE80211_RADIOTAP_MCS_BW_MASK = 3,
1: -	IEEE80211_RADIOTAP_MCS_BW_20 = 0,
1: -	IEEE80211_RADIOTAP_MCS_BW_40 = 1,
1: -	IEEE80211_RADIOTAP_MCS_BW_20L = 2,
1: -	IEEE80211_RADIOTAP_MCS_BW_20U = 3,
1: -	IEEE80211_RADIOTAP_MCS_SGI = 4,
1: -	IEEE80211_RADIOTAP_MCS_FMT_GF = 8,
1: -	IEEE80211_RADIOTAP_MCS_FEC_LDPC = 16,
1: -	IEEE80211_RADIOTAP_MCS_STBC_MASK = 96,
1: -	IEEE80211_RADIOTAP_MCS_STBC_1 = 1,
1: -	IEEE80211_RADIOTAP_MCS_STBC_2 = 2,
1: -	IEEE80211_RADIOTAP_MCS_STBC_3 = 3,
1: -	IEEE80211_RADIOTAP_MCS_STBC_SHIFT = 5,
1: +  IEEE80211_RADIOTAP_MCS_BW_MASK = 3,
1: +  IEEE80211_RADIOTAP_MCS_BW_20 = 0,
1: +  IEEE80211_RADIOTAP_MCS_BW_40 = 1,
1: +  IEEE80211_RADIOTAP_MCS_BW_20L = 2,
1: +  IEEE80211_RADIOTAP_MCS_BW_20U = 3,
1: +  IEEE80211_RADIOTAP_MCS_SGI = 4,
1: +  IEEE80211_RADIOTAP_MCS_FMT_GF = 8,
1: +  IEEE80211_RADIOTAP_MCS_FEC_LDPC = 16,
1: +  IEEE80211_RADIOTAP_MCS_STBC_MASK = 96,
1: +  IEEE80211_RADIOTAP_MCS_STBC_1 = 1,
1: +  IEEE80211_RADIOTAP_MCS_STBC_2 = 2,
1: +  IEEE80211_RADIOTAP_MCS_STBC_3 = 3,
1: +  IEEE80211_RADIOTAP_MCS_STBC_SHIFT = 5,
1:  };
1:  
1:  enum ieee80211_radiotap_vht_flags {
1: -	IEEE80211_RADIOTAP_VHT_FLAG_STBC = 1,
1: -	IEEE80211_RADIOTAP_VHT_FLAG_TXOP_PS_NA = 2,
1: -	IEEE80211_RADIOTAP_VHT_FLAG_SGI = 4,
1: -	IEEE80211_RADIOTAP_VHT_FLAG_SGI_NSYM_M10_9 = 8,
1: -	IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM = 16,
1: -	IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED = 32,
1: +  IEEE80211_RADIOTAP_VHT_FLAG_STBC = 1,
1: +  IEEE80211_RADIOTAP_VHT_FLAG_TXOP_PS_NA = 2,
1: +  IEEE80211_RADIOTAP_VHT_FLAG_SGI = 4,
1: +  IEEE80211_RADIOTAP_VHT_FLAG_SGI_NSYM_M10_9 = 8,
1: +  IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM = 16,
1: +  IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED = 32,
1:  };
1:  
1:  struct ieee80211_radiotap_he {
1: -	__le16 data1;
1: -	__le16 data2;
1: -	__le16 data3;
1: -	__le16 data4;
1: -	__le16 data5;
1: -	__le16 data6;
1: +  __le16 data1;
1: +  __le16 data2;
1: +  __le16 data3;
1: +  __le16 data4;
1: +  __le16 data5;
1: +  __le16 data6;
1:  };
1:  
1:  enum ieee80211_radiotap_he_bits {
1: -	IEEE80211_RADIOTAP_HE_DATA1_FORMAT_MASK = 3,
1: -	IEEE80211_RADIOTAP_HE_DATA1_FORMAT_SU = 0,
1: -	IEEE80211_RADIOTAP_HE_DATA1_FORMAT_EXT_SU = 1,
1: -	IEEE80211_RADIOTAP_HE_DATA1_FORMAT_MU = 2,
1: -	IEEE80211_RADIOTAP_HE_DATA1_FORMAT_TRIG = 3,
1: -	IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN = 4,
1: -	IEEE80211_RADIOTAP_HE_DATA1_BEAM_CHANGE_KNOWN = 8,
1: -	IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN = 16,
1: -	IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN = 32,
1: -	IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN = 64,
1: -	IEEE80211_RADIOTAP_HE_DATA1_CODING_KNOWN = 128,
1: -	IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN = 256,
1: -	IEEE80211_RADIOTAP_HE_DATA1_STBC_KNOWN = 512,
1: -	IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN = 1024,
1: -	IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE2_KNOWN = 2048,
1: -	IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE3_KNOWN = 4096,
1: -	IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE4_KNOWN = 8192,
1: -	IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN = 16384,
1: -	IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN = 32768,
1: -	IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_KNOWN = 1,
1: -	IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN = 2,
1: -	IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN = 4,
1: -	IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN = 8,
1: -	IEEE80211_RADIOTAP_HE_DATA2_TXBF_KNOWN = 16,
1: -	IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN = 32,
1: -	IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN = 64,
1: -	IEEE80211_RADIOTAP_HE_DATA2_MIDAMBLE_KNOWN = 128,
1: -	IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET = 16128,
1: -	IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET_KNOWN = 16384,
1: -	IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC = 32768,
1: -	IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR = 63,
1: -	IEEE80211_RADIOTAP_HE_DATA3_BEAM_CHANGE = 64,
1: -	IEEE80211_RADIOTAP_HE_DATA3_UL_DL = 128,
1: -	IEEE80211_RADIOTAP_HE_DATA3_DATA_MCS = 3840,
1: -	IEEE80211_RADIOTAP_HE_DATA3_DATA_DCM = 4096,
1: -	IEEE80211_RADIOTAP_HE_DATA3_CODING = 8192,
1: -	IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG = 16384,
1: -	IEEE80211_RADIOTAP_HE_DATA3_STBC = 32768,
1: -	IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE = 15,
1: -	IEEE80211_RADIOTAP_HE_DATA4_MU_STA_ID = 32752,
1: -	IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE1 = 15,
1: -	IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE2 = 240,
1: -	IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE3 = 3840,
1: -	IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4 = 61440,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC = 15,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_20MHZ = 0,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_40MHZ = 1,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_80MHZ = 2,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_160MHZ = 3,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_26T = 4,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_52T = 5,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_106T = 6,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_242T = 7,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_484T = 8,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_996T = 9,
1: -	IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_2x996T = 10,
1: -	IEEE80211_RADIOTAP_HE_DATA5_GI = 48,
1: -	IEEE80211_RADIOTAP_HE_DATA5_GI_0_8 = 0,
1: -	IEEE80211_RADIOTAP_HE_DATA5_GI_1_6 = 1,
1: -	IEEE80211_RADIOTAP_HE_DATA5_GI_3_2 = 2,
1: -	IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE = 192,
1: -	IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN = 0,
1: -	IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X = 1,
1: -	IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X = 2,
1: -	IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X = 3,
1: -	IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS = 1792,
1: -	IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD = 12288,
1: -	IEEE80211_RADIOTAP_HE_DATA5_TXBF = 16384,
1: -	IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG = 32768,
1: -	IEEE80211_RADIOTAP_HE_DATA6_NSTS = 15,
1: -	IEEE80211_RADIOTAP_HE_DATA6_DOPPLER = 16,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN = 32,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW = 192,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_20MHZ = 0,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_40MHZ = 1,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_80MHZ = 2,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_160MHZ = 3,
1: -	IEEE80211_RADIOTAP_HE_DATA6_TXOP = 32512,
1: -	IEEE80211_RADIOTAP_HE_DATA6_MIDAMBLE_PDCTY = 32768,
1: +  IEEE80211_RADIOTAP_HE_DATA1_FORMAT_MASK = 3,
1: +  IEEE80211_RADIOTAP_HE_DATA1_FORMAT_SU = 0,
1: +  IEEE80211_RADIOTAP_HE_DATA1_FORMAT_EXT_SU = 1,
1: +  IEEE80211_RADIOTAP_HE_DATA1_FORMAT_MU = 2,
1: +  IEEE80211_RADIOTAP_HE_DATA1_FORMAT_TRIG = 3,
1: +  IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN = 4,
1: +  IEEE80211_RADIOTAP_HE_DATA1_BEAM_CHANGE_KNOWN = 8,
1: +  IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN = 16,
1: +  IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN = 32,
1: +  IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN = 64,
1: +  IEEE80211_RADIOTAP_HE_DATA1_CODING_KNOWN = 128,
1: +  IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN = 256,
1: +  IEEE80211_RADIOTAP_HE_DATA1_STBC_KNOWN = 512,
1: +  IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN = 1024,
1: +  IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE2_KNOWN = 2048,
1: +  IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE3_KNOWN = 4096,
1: +  IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE4_KNOWN = 8192,
1: +  IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN = 16384,
1: +  IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN = 32768,
1: +  IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_KNOWN = 1,
1: +  IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN = 2,
1: +  IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN = 4,
1: +  IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN = 8,
1: +  IEEE80211_RADIOTAP_HE_DATA2_TXBF_KNOWN = 16,
1: +  IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN = 32,
1: +  IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN = 64,
1: +  IEEE80211_RADIOTAP_HE_DATA2_MIDAMBLE_KNOWN = 128,
1: +  IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET = 16128,
1: +  IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET_KNOWN = 16384,
1: +  IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC = 32768,
1: +  IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR = 63,
1: +  IEEE80211_RADIOTAP_HE_DATA3_BEAM_CHANGE = 64,
1: +  IEEE80211_RADIOTAP_HE_DATA3_UL_DL = 128,
1: +  IEEE80211_RADIOTAP_HE_DATA3_DATA_MCS = 3840,
1: +  IEEE80211_RADIOTAP_HE_DATA3_DATA_DCM = 4096,
1: +  IEEE80211_RADIOTAP_HE_DATA3_CODING = 8192,
1: +  IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG = 16384,
1: +  IEEE80211_RADIOTAP_HE_DATA3_STBC = 32768,
1: +  IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE = 15,
1: +  IEEE80211_RADIOTAP_HE_DATA4_MU_STA_ID = 32752,
1: +  IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE1 = 15,
1: +  IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE2 = 240,
1: +  IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE3 = 3840,
1: +  IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4 = 61440,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC = 15,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_20MHZ = 0,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_40MHZ = 1,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_80MHZ = 2,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_160MHZ = 3,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_26T = 4,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_52T = 5,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_106T = 6,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_242T = 7,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_484T = 8,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_996T = 9,
1: +  IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_2x996T = 10,
1: +  IEEE80211_RADIOTAP_HE_DATA5_GI = 48,
1: +  IEEE80211_RADIOTAP_HE_DATA5_GI_0_8 = 0,
1: +  IEEE80211_RADIOTAP_HE_DATA5_GI_1_6 = 1,
1: +  IEEE80211_RADIOTAP_HE_DATA5_GI_3_2 = 2,
1: +  IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE = 192,
1: +  IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN = 0,
1: +  IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X = 1,
1: +  IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X = 2,
1: +  IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X = 3,
1: +  IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS = 1792,
1: +  IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD = 12288,
1: +  IEEE80211_RADIOTAP_HE_DATA5_TXBF = 16384,
1: +  IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG = 32768,
1: +  IEEE80211_RADIOTAP_HE_DATA6_NSTS = 15,
1: +  IEEE80211_RADIOTAP_HE_DATA6_DOPPLER = 16,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN = 32,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW = 192,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_20MHZ = 0,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_40MHZ = 1,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_80MHZ = 2,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_160MHZ = 3,
1: +  IEEE80211_RADIOTAP_HE_DATA6_TXOP = 32512,
1: +  IEEE80211_RADIOTAP_HE_DATA6_MIDAMBLE_PDCTY = 32768,
1:  };
1:  
1:  enum ieee80211_ac_numbers {
1: -	IEEE80211_AC_VO = 0,
1: -	IEEE80211_AC_VI = 1,
1: -	IEEE80211_AC_BE = 2,
1: -	IEEE80211_AC_BK = 3,
1: +  IEEE80211_AC_VO = 0,
1: +  IEEE80211_AC_VI = 1,
1: +  IEEE80211_AC_BE = 2,
1: +  IEEE80211_AC_BK = 3,
1:  };
1:  
1:  enum mac80211_tx_info_flags {
1: -	IEEE80211_TX_CTL_REQ_TX_STATUS = 1,
1: -	IEEE80211_TX_CTL_ASSIGN_SEQ = 2,
1: -	IEEE80211_TX_CTL_NO_ACK = 4,
1: -	IEEE80211_TX_CTL_CLEAR_PS_FILT = 8,
1: -	IEEE80211_TX_CTL_FIRST_FRAGMENT = 16,
1: -	IEEE80211_TX_CTL_SEND_AFTER_DTIM = 32,
1: -	IEEE80211_TX_CTL_AMPDU = 64,
1: -	IEEE80211_TX_CTL_INJECTED = 128,
1: -	IEEE80211_TX_STAT_TX_FILTERED = 256,
1: -	IEEE80211_TX_STAT_ACK = 512,
1: -	IEEE80211_TX_STAT_AMPDU = 1024,
1: -	IEEE80211_TX_STAT_AMPDU_NO_BACK = 2048,
1: -	IEEE80211_TX_CTL_RATE_CTRL_PROBE = 4096,
1: -	IEEE80211_TX_INTFL_OFFCHAN_TX_OK = 8192,
1: -	IEEE80211_TX_CTL_HW_80211_ENCAP = 16384,
1: -	IEEE80211_TX_INTFL_RETRIED = 32768,
1: -	IEEE80211_TX_INTFL_DONT_ENCRYPT = 65536,
1: -	IEEE80211_TX_CTL_NO_PS_BUFFER = 131072,
1: -	IEEE80211_TX_CTL_MORE_FRAMES = 262144,
1: -	IEEE80211_TX_INTFL_RETRANSMISSION = 524288,
1: -	IEEE80211_TX_INTFL_MLME_CONN_TX = 1048576,
1: -	IEEE80211_TX_INTFL_NL80211_FRAME_TX = 2097152,
1: -	IEEE80211_TX_CTL_LDPC = 4194304,
1: -	IEEE80211_TX_CTL_STBC = 25165824,
1: -	IEEE80211_TX_CTL_TX_OFFCHAN = 33554432,
1: -	IEEE80211_TX_INTFL_TKIP_MIC_FAILURE = 67108864,
1: -	IEEE80211_TX_CTL_NO_CCK_RATE = 134217728,
1: -	IEEE80211_TX_STATUS_EOSP = 268435456,
1: -	IEEE80211_TX_CTL_USE_MINRATE = 536870912,
1: -	IEEE80211_TX_CTL_DONTFRAG = 1073741824,
1: -	IEEE80211_TX_STAT_NOACK_TRANSMITTED = 2147483648,
1: +  IEEE80211_TX_CTL_REQ_TX_STATUS = 1,
1: +  IEEE80211_TX_CTL_ASSIGN_SEQ = 2,
1: +  IEEE80211_TX_CTL_NO_ACK = 4,
1: +  IEEE80211_TX_CTL_CLEAR_PS_FILT = 8,
1: +  IEEE80211_TX_CTL_FIRST_FRAGMENT = 16,
1: +  IEEE80211_TX_CTL_SEND_AFTER_DTIM = 32,
1: +  IEEE80211_TX_CTL_AMPDU = 64,
1: +  IEEE80211_TX_CTL_INJECTED = 128,
1: +  IEEE80211_TX_STAT_TX_FILTERED = 256,
1: +  IEEE80211_TX_STAT_ACK = 512,
1: +  IEEE80211_TX_STAT_AMPDU = 1024,
1: +  IEEE80211_TX_STAT_AMPDU_NO_BACK = 2048,
1: +  IEEE80211_TX_CTL_RATE_CTRL_PROBE = 4096,
1: +  IEEE80211_TX_INTFL_OFFCHAN_TX_OK = 8192,
1: +  IEEE80211_TX_CTL_HW_80211_ENCAP = 16384,
1: +  IEEE80211_TX_INTFL_RETRIED = 32768,
1: +  IEEE80211_TX_INTFL_DONT_ENCRYPT = 65536,
1: +  IEEE80211_TX_CTL_NO_PS_BUFFER = 131072,
1: +  IEEE80211_TX_CTL_MORE_FRAMES = 262144,
1: +  IEEE80211_TX_INTFL_RETRANSMISSION = 524288,
1: +  IEEE80211_TX_INTFL_MLME_CONN_TX = 1048576,
1: +  IEEE80211_TX_INTFL_NL80211_FRAME_TX = 2097152,
1: +  IEEE80211_TX_CTL_LDPC = 4194304,
1: +  IEEE80211_TX_CTL_STBC = 25165824,
1: +  IEEE80211_TX_CTL_TX_OFFCHAN = 33554432,
1: +  IEEE80211_TX_INTFL_TKIP_MIC_FAILURE = 67108864,
1: +  IEEE80211_TX_CTL_NO_CCK_RATE = 134217728,
1: +  IEEE80211_TX_STATUS_EOSP = 268435456,
1: +  IEEE80211_TX_CTL_USE_MINRATE = 536870912,
1: +  IEEE80211_TX_CTL_DONTFRAG = 1073741824,
1: +  IEEE80211_TX_STAT_NOACK_TRANSMITTED = 2147483648,
1:  };
1:  
1:  enum mac80211_tx_control_flags {
1: -	IEEE80211_TX_CTRL_PORT_CTRL_PROTO = 1,
1: -	IEEE80211_TX_CTRL_PS_RESPONSE = 2,
1: -	IEEE80211_TX_CTRL_RATE_INJECT = 4,
1: -	IEEE80211_TX_CTRL_AMSDU = 8,
1: -	IEEE80211_TX_CTRL_FAST_XMIT = 16,
1: -	IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP = 32,
1: -	IEEE80211_TX_INTCFL_NEED_TXPROCESSING = 64,
1: -	IEEE80211_TX_CTRL_NO_SEQNO = 128,
1: -	IEEE80211_TX_CTRL_DONT_REORDER = 256,
1: +  IEEE80211_TX_CTRL_PORT_CTRL_PROTO = 1,
1: +  IEEE80211_TX_CTRL_PS_RESPONSE = 2,
1: +  IEEE80211_TX_CTRL_RATE_INJECT = 4,
1: +  IEEE80211_TX_CTRL_AMSDU = 8,
1: +  IEEE80211_TX_CTRL_FAST_XMIT = 16,
1: +  IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP = 32,
1: +  IEEE80211_TX_INTCFL_NEED_TXPROCESSING = 64,
1: +  IEEE80211_TX_CTRL_NO_SEQNO = 128,
1: +  IEEE80211_TX_CTRL_DONT_REORDER = 256,
1:  };
1:  
1:  enum mac80211_rate_control_flags {
1: -	IEEE80211_TX_RC_USE_RTS_CTS = 1,
1: -	IEEE80211_TX_RC_USE_CTS_PROTECT = 2,
1: -	IEEE80211_TX_RC_USE_SHORT_PREAMBLE = 4,
1: -	IEEE80211_TX_RC_MCS = 8,
1: -	IEEE80211_TX_RC_GREEN_FIELD = 16,
1: -	IEEE80211_TX_RC_40_MHZ_WIDTH = 32,
1: -	IEEE80211_TX_RC_DUP_DATA = 64,
1: -	IEEE80211_TX_RC_SHORT_GI = 128,
1: -	IEEE80211_TX_RC_VHT_MCS = 256,
1: -	IEEE80211_TX_RC_80_MHZ_WIDTH = 512,
1: -	IEEE80211_TX_RC_160_MHZ_WIDTH = 1024,
1: +  IEEE80211_TX_RC_USE_RTS_CTS = 1,
1: +  IEEE80211_TX_RC_USE_CTS_PROTECT = 2,
1: +  IEEE80211_TX_RC_USE_SHORT_PREAMBLE = 4,
1: +  IEEE80211_TX_RC_MCS = 8,
1: +  IEEE80211_TX_RC_GREEN_FIELD = 16,
1: +  IEEE80211_TX_RC_40_MHZ_WIDTH = 32,
1: +  IEEE80211_TX_RC_DUP_DATA = 64,
1: +  IEEE80211_TX_RC_SHORT_GI = 128,
1: +  IEEE80211_TX_RC_VHT_MCS = 256,
1: +  IEEE80211_TX_RC_80_MHZ_WIDTH = 512,
1: +  IEEE80211_TX_RC_160_MHZ_WIDTH = 1024,
1:  };
1:  
1:  enum ieee80211_sta_info_flags {
1: -	WLAN_STA_AUTH = 0,
1: -	WLAN_STA_ASSOC = 1,
1: -	WLAN_STA_PS_STA = 2,
1: -	WLAN_STA_AUTHORIZED = 3,
1: -	WLAN_STA_SHORT_PREAMBLE = 4,
1: -	WLAN_STA_WDS = 5,
1: -	WLAN_STA_CLEAR_PS_FILT = 6,
1: -	WLAN_STA_MFP = 7,
1: -	WLAN_STA_BLOCK_BA = 8,
1: -	WLAN_STA_PS_DRIVER = 9,
1: -	WLAN_STA_PSPOLL = 10,
1: -	WLAN_STA_TDLS_PEER = 11,
1: -	WLAN_STA_TDLS_PEER_AUTH = 12,
1: -	WLAN_STA_TDLS_INITIATOR = 13,
1: -	WLAN_STA_TDLS_CHAN_SWITCH = 14,
1: -	WLAN_STA_TDLS_OFF_CHANNEL = 15,
1: -	WLAN_STA_TDLS_WIDER_BW = 16,
1: -	WLAN_STA_UAPSD = 17,
1: -	WLAN_STA_SP = 18,
1: -	WLAN_STA_4ADDR_EVENT = 19,
1: -	WLAN_STA_INSERTED = 20,
1: -	WLAN_STA_RATE_CONTROL = 21,
1: -	WLAN_STA_TOFFSET_KNOWN = 22,
1: -	WLAN_STA_MPSP_OWNER = 23,
1: -	WLAN_STA_MPSP_RECIPIENT = 24,
1: -	WLAN_STA_PS_DELIVER = 25,
1: -	WLAN_STA_USES_ENCRYPTION = 26,
1: -	NUM_WLAN_STA_FLAGS = 27,
1: +  WLAN_STA_AUTH = 0,
1: +  WLAN_STA_ASSOC = 1,
1: +  WLAN_STA_PS_STA = 2,
1: +  WLAN_STA_AUTHORIZED = 3,
1: +  WLAN_STA_SHORT_PREAMBLE = 4,
1: +  WLAN_STA_WDS = 5,
1: +  WLAN_STA_CLEAR_PS_FILT = 6,
1: +  WLAN_STA_MFP = 7,
1: +  WLAN_STA_BLOCK_BA = 8,
1: +  WLAN_STA_PS_DRIVER = 9,
1: +  WLAN_STA_PSPOLL = 10,
1: +  WLAN_STA_TDLS_PEER = 11,
1: +  WLAN_STA_TDLS_PEER_AUTH = 12,
1: +  WLAN_STA_TDLS_INITIATOR = 13,
1: +  WLAN_STA_TDLS_CHAN_SWITCH = 14,
1: +  WLAN_STA_TDLS_OFF_CHANNEL = 15,
1: +  WLAN_STA_TDLS_WIDER_BW = 16,
1: +  WLAN_STA_UAPSD = 17,
1: +  WLAN_STA_SP = 18,
1: +  WLAN_STA_4ADDR_EVENT = 19,
1: +  WLAN_STA_INSERTED = 20,
1: +  WLAN_STA_RATE_CONTROL = 21,
1: +  WLAN_STA_TOFFSET_KNOWN = 22,
1: +  WLAN_STA_MPSP_OWNER = 23,
1: +  WLAN_STA_MPSP_RECIPIENT = 24,
1: +  WLAN_STA_PS_DELIVER = 25,
1: +  WLAN_STA_USES_ENCRYPTION = 26,
1: +  NUM_WLAN_STA_FLAGS = 27,
1:  };
1:  
1:  enum ieee80211_sta_flags {
1: -	IEEE80211_STA_CONNECTION_POLL = 2,
1: -	IEEE80211_STA_CONTROL_PORT = 4,
1: -	IEEE80211_STA_DISABLE_HT = 16,
1: -	IEEE80211_STA_MFP_ENABLED = 64,
1: -	IEEE80211_STA_UAPSD_ENABLED = 128,
1: -	IEEE80211_STA_NULLFUNC_ACKED = 256,
1: -	IEEE80211_STA_RESET_SIGNAL_AVE = 512,
1: -	IEEE80211_STA_DISABLE_40MHZ = 1024,
1: -	IEEE80211_STA_DISABLE_VHT = 2048,
1: -	IEEE80211_STA_DISABLE_80P80MHZ = 4096,
1: -	IEEE80211_STA_DISABLE_160MHZ = 8192,
1: -	IEEE80211_STA_DISABLE_WMM = 16384,
1: -	IEEE80211_STA_ENABLE_RRM = 32768,
1: -	IEEE80211_STA_DISABLE_HE = 65536,
1: +  IEEE80211_STA_CONNECTION_POLL = 2,
1: +  IEEE80211_STA_CONTROL_PORT = 4,
1: +  IEEE80211_STA_DISABLE_HT = 16,
1: +  IEEE80211_STA_MFP_ENABLED = 64,
1: +  IEEE80211_STA_UAPSD_ENABLED = 128,
1: +  IEEE80211_STA_NULLFUNC_ACKED = 256,
1: +  IEEE80211_STA_RESET_SIGNAL_AVE = 512,
1: +  IEEE80211_STA_DISABLE_40MHZ = 1024,
1: +  IEEE80211_STA_DISABLE_VHT = 2048,
1: +  IEEE80211_STA_DISABLE_80P80MHZ = 4096,
1: +  IEEE80211_STA_DISABLE_160MHZ = 8192,
1: +  IEEE80211_STA_DISABLE_WMM = 16384,
1: +  IEEE80211_STA_ENABLE_RRM = 32768,
1: +  IEEE80211_STA_DISABLE_HE = 65536,
1:  };
1:  
1:  enum ieee80211_sdata_state_bits {
1: -	SDATA_STATE_RUNNING = 0,
1: -	SDATA_STATE_OFFCHANNEL = 1,
1: -	SDATA_STATE_OFFCHANNEL_BEACON_STOPPED = 2,
1: +  SDATA_STATE_RUNNING = 0,
1: +  SDATA_STATE_OFFCHANNEL = 1,
1: +  SDATA_STATE_OFFCHANNEL_BEACON_STOPPED = 2,
1:  };
1:  
1:  enum ieee80211_rate_control_changed {
1: -	IEEE80211_RC_BW_CHANGED = 1,
1: -	IEEE80211_RC_SMPS_CHANGED = 2,
1: -	IEEE80211_RC_SUPP_RATES_CHANGED = 4,
1: -	IEEE80211_RC_NSS_CHANGED = 8,
1: +  IEEE80211_RC_BW_CHANGED = 1,
1: +  IEEE80211_RC_SMPS_CHANGED = 2,
1: +  IEEE80211_RC_SUPP_RATES_CHANGED = 4,
1: +  IEEE80211_RC_NSS_CHANGED = 8,
1:  };
1:  
1:  struct ieee80211_qos_hdr {
1: -	__le16 frame_control;
1: -	__le16 duration_id;
1: -	u8 addr1[6];
1: -	u8 addr2[6];
1: -	u8 addr3[6];
1: -	__le16 seq_ctrl;
1: -	__le16 qos_ctrl;
1: +  __le16 frame_control;
1: +  __le16 duration_id;
1: +  u8 addr1[6];
1: +  u8 addr2[6];
1: +  u8 addr3[6];
1: +  __le16 seq_ctrl;
1: +  __le16 qos_ctrl;
1:  };
1:  
1:  enum ieee80211_vif_flags {
1: -	IEEE80211_VIF_BEACON_FILTER = 1,
1: -	IEEE80211_VIF_SUPPORTS_CQM_RSSI = 2,
1: -	IEEE80211_VIF_SUPPORTS_UAPSD = 4,
1: -	IEEE80211_VIF_GET_NOA_UPDATE = 8,
1: +  IEEE80211_VIF_BEACON_FILTER = 1,
1: +  IEEE80211_VIF_SUPPORTS_CQM_RSSI = 2,
1: +  IEEE80211_VIF_SUPPORTS_UAPSD = 4,
1: +  IEEE80211_VIF_GET_NOA_UPDATE = 8,
1:  };
1:  
1:  enum ieee80211_agg_stop_reason {
1: -	AGG_STOP_DECLINED = 0,
1: -	AGG_STOP_LOCAL_REQUEST = 1,
1: -	AGG_STOP_PEER_REQUEST = 2,
1: -	AGG_STOP_DESTROY_STA = 3,
1: +  AGG_STOP_DECLINED = 0,
1: +  AGG_STOP_LOCAL_REQUEST = 1,
1: +  AGG_STOP_PEER_REQUEST = 2,
1: +  AGG_STOP_DESTROY_STA = 3,
1:  };
1:  
1:  enum sta_stats_type {
1: -	STA_STATS_RATE_TYPE_INVALID = 0,
1: -	STA_STATS_RATE_TYPE_LEGACY = 1,
1: -	STA_STATS_RATE_TYPE_HT = 2,
1: -	STA_STATS_RATE_TYPE_VHT = 3,
1: -	STA_STATS_RATE_TYPE_HE = 4,
1: -	STA_STATS_RATE_TYPE_S1G = 5,
1: +  STA_STATS_RATE_TYPE_INVALID = 0,
1: +  STA_STATS_RATE_TYPE_LEGACY = 1,
1: +  STA_STATS_RATE_TYPE_HT = 2,
1: +  STA_STATS_RATE_TYPE_VHT = 3,
1: +  STA_STATS_RATE_TYPE_HE = 4,
1: +  STA_STATS_RATE_TYPE_S1G = 5,
1:  };
1:  
1:  struct txq_info {
1: -	struct fq_tin tin;
1: -	struct fq_flow___2 def_flow;
1: -	struct codel_vars def_cvars;
1: -	struct codel_stats cstats;
1: -	struct sk_buff_head frags;
1: -	struct list_head schedule_order;
1: -	u16 schedule_round;
1: -	long unsigned int flags;
1: -	struct ieee80211_txq txq;
1: +  struct fq_tin tin;
1: +  struct fq_flow___2 def_flow;
1: +  struct codel_vars def_cvars;
1: +  struct codel_stats cstats;
1: +  struct sk_buff_head frags;
1: +  struct list_head schedule_order;
1: +  u16 schedule_round;
1: +  long unsigned int flags;
1: +  struct ieee80211_txq txq;
1:  };
1:  
1:  enum mac80211_rx_flags {
1: -	RX_FLAG_MMIC_ERROR = 1,
1: -	RX_FLAG_DECRYPTED = 2,
1: -	RX_FLAG_MACTIME_PLCP_START = 4,
1: -	RX_FLAG_MMIC_STRIPPED = 8,
1: -	RX_FLAG_IV_STRIPPED = 16,
1: -	RX_FLAG_FAILED_FCS_CRC = 32,
1: -	RX_FLAG_FAILED_PLCP_CRC = 64,
1: -	RX_FLAG_MACTIME_START = 128,
1: -	RX_FLAG_NO_SIGNAL_VAL = 256,
1: -	RX_FLAG_AMPDU_DETAILS = 512,
1: -	RX_FLAG_PN_VALIDATED = 1024,
1: -	RX_FLAG_DUP_VALIDATED = 2048,
1: -	RX_FLAG_AMPDU_LAST_KNOWN = 4096,
1: -	RX_FLAG_AMPDU_IS_LAST = 8192,
1: -	RX_FLAG_AMPDU_DELIM_CRC_ERROR = 16384,
1: -	RX_FLAG_AMPDU_DELIM_CRC_KNOWN = 32768,
1: -	RX_FLAG_MACTIME_END = 65536,
1: -	RX_FLAG_ONLY_MONITOR = 131072,
1: -	RX_FLAG_SKIP_MONITOR = 262144,
1: -	RX_FLAG_AMSDU_MORE = 524288,
1: -	RX_FLAG_RADIOTAP_VENDOR_DATA = 1048576,
1: -	RX_FLAG_MIC_STRIPPED = 2097152,
1: -	RX_FLAG_ALLOW_SAME_PN = 4194304,
1: -	RX_FLAG_ICV_STRIPPED = 8388608,
1: -	RX_FLAG_AMPDU_EOF_BIT = 16777216,
1: -	RX_FLAG_AMPDU_EOF_BIT_KNOWN = 33554432,
1: -	RX_FLAG_RADIOTAP_HE = 67108864,
1: -	RX_FLAG_RADIOTAP_HE_MU = 134217728,
1: -	RX_FLAG_RADIOTAP_LSIG = 268435456,
1: -	RX_FLAG_NO_PSDU = 536870912,
1: +  RX_FLAG_MMIC_ERROR = 1,
1: +  RX_FLAG_DECRYPTED = 2,
1: +  RX_FLAG_MACTIME_PLCP_START = 4,
1: +  RX_FLAG_MMIC_STRIPPED = 8,
1: +  RX_FLAG_IV_STRIPPED = 16,
1: +  RX_FLAG_FAILED_FCS_CRC = 32,
1: +  RX_FLAG_FAILED_PLCP_CRC = 64,
1: +  RX_FLAG_MACTIME_START = 128,
1: +  RX_FLAG_NO_SIGNAL_VAL = 256,
1: +  RX_FLAG_AMPDU_DETAILS = 512,
1: +  RX_FLAG_PN_VALIDATED = 1024,
1: +  RX_FLAG_DUP_VALIDATED = 2048,
1: +  RX_FLAG_AMPDU_LAST_KNOWN = 4096,
1: +  RX_FLAG_AMPDU_IS_LAST = 8192,
1: +  RX_FLAG_AMPDU_DELIM_CRC_ERROR = 16384,
1: +  RX_FLAG_AMPDU_DELIM_CRC_KNOWN = 32768,
1: +  RX_FLAG_MACTIME_END = 65536,
1: +  RX_FLAG_ONLY_MONITOR = 131072,
1: +  RX_FLAG_SKIP_MONITOR = 262144,
1: +  RX_FLAG_AMSDU_MORE = 524288,
1: +  RX_FLAG_RADIOTAP_VENDOR_DATA = 1048576,
1: +  RX_FLAG_MIC_STRIPPED = 2097152,
1: +  RX_FLAG_ALLOW_SAME_PN = 4194304,
1: +  RX_FLAG_ICV_STRIPPED = 8388608,
1: +  RX_FLAG_AMPDU_EOF_BIT = 16777216,
1: +  RX_FLAG_AMPDU_EOF_BIT_KNOWN = 33554432,
1: +  RX_FLAG_RADIOTAP_HE = 67108864,
1: +  RX_FLAG_RADIOTAP_HE_MU = 134217728,
1: +  RX_FLAG_RADIOTAP_LSIG = 268435456,
1: +  RX_FLAG_NO_PSDU = 536870912,
1:  };
1:  
1:  enum ieee80211_key_flags {
1: -	IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = 1,
1: -	IEEE80211_KEY_FLAG_GENERATE_IV = 2,
1: -	IEEE80211_KEY_FLAG_GENERATE_MMIC = 4,
1: -	IEEE80211_KEY_FLAG_PAIRWISE = 8,
1: -	IEEE80211_KEY_FLAG_SW_MGMT_TX = 16,
1: -	IEEE80211_KEY_FLAG_PUT_IV_SPACE = 32,
1: -	IEEE80211_KEY_FLAG_RX_MGMT = 64,
1: -	IEEE80211_KEY_FLAG_RESERVE_TAILROOM = 128,
1: -	IEEE80211_KEY_FLAG_PUT_MIC_SPACE = 256,
1: -	IEEE80211_KEY_FLAG_NO_AUTO_TX = 512,
1: -	IEEE80211_KEY_FLAG_GENERATE_MMIE = 1024,
1: +  IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = 1,
1: +  IEEE80211_KEY_FLAG_GENERATE_IV = 2,
1: +  IEEE80211_KEY_FLAG_GENERATE_MMIC = 4,
1: +  IEEE80211_KEY_FLAG_PAIRWISE = 8,
1: +  IEEE80211_KEY_FLAG_SW_MGMT_TX = 16,
1: +  IEEE80211_KEY_FLAG_PUT_IV_SPACE = 32,
1: +  IEEE80211_KEY_FLAG_RX_MGMT = 64,
1: +  IEEE80211_KEY_FLAG_RESERVE_TAILROOM = 128,
1: +  IEEE80211_KEY_FLAG_PUT_MIC_SPACE = 256,
1: +  IEEE80211_KEY_FLAG_NO_AUTO_TX = 512,
1: +  IEEE80211_KEY_FLAG_GENERATE_MMIE = 1024,
1:  };
1:  
1:  typedef unsigned int ieee80211_tx_result;
1:  
1:  struct ieee80211_tx_data {
1: -	struct sk_buff *skb;
1: -	struct sk_buff_head skbs;
1: -	struct ieee80211_local *local;
1: -	struct ieee80211_sub_if_data *sdata;
1: -	struct sta_info *sta;
1: -	struct ieee80211_key *key;
1: -	struct ieee80211_tx_rate rate;
1: -	unsigned int flags;
1: +  struct sk_buff *skb;
1: +  struct sk_buff_head skbs;
1: +  struct ieee80211_local *local;
1: +  struct ieee80211_sub_if_data *sdata;
1: +  struct sta_info *sta;
1: +  struct ieee80211_key *key;
1: +  struct ieee80211_tx_rate rate;
1: +  unsigned int flags;
1:  };
1:  
1:  typedef unsigned int ieee80211_rx_result;
1:  
1:  struct ieee80211_rx_data {
1: -	struct list_head *list;
1: -	struct sk_buff *skb;
1: -	struct ieee80211_local *local;
1: -	struct ieee80211_sub_if_data *sdata;
1: -	struct sta_info *sta;
1: -	struct ieee80211_key *key;
1: -	unsigned int flags;
1: -	int seqno_idx;
1: -	int security_idx;
1: -	u32 tkip_iv32;
1: -	u16 tkip_iv16;
1: +  struct list_head *list;
1: +  struct sk_buff *skb;
1: +  struct ieee80211_local *local;
1: +  struct ieee80211_sub_if_data *sdata;
1: +  struct sta_info *sta;
1: +  struct ieee80211_key *key;
1: +  unsigned int flags;
1: +  int seqno_idx;
1: +  int security_idx;
1: +  u32 tkip_iv32;
1: +  u16 tkip_iv16;
1:  };
1:  
1:  struct ieee80211_mmie {
1: -	u8 element_id;
1: -	u8 length;
1: -	__le16 key_id;
1: -	u8 sequence_number[6];
1: -	u8 mic[8];
1: +  u8 element_id;
1: +  u8 length;
1: +  __le16 key_id;
1: +  u8 sequence_number[6];
1: +  u8 mic[8];
1:  };
1:  
1:  struct ieee80211_mmie_16 {
1: -	u8 element_id;
1: -	u8 length;
1: -	__le16 key_id;
1: -	u8 sequence_number[6];
1: -	u8 mic[16];
1: +  u8 element_id;
1: +  u8 length;
1: +  __le16 key_id;
1: +  u8 sequence_number[6];
1: +  u8 mic[16];
1:  };
1:  
1:  enum ieee80211_internal_key_flags {
1: -	KEY_FLAG_UPLOADED_TO_HARDWARE = 1,
1: -	KEY_FLAG_TAINTED = 2,
1: -	KEY_FLAG_CIPHER_SCHEME = 4,
1: +  KEY_FLAG_UPLOADED_TO_HARDWARE = 1,
1: +  KEY_FLAG_TAINTED = 2,
1: +  KEY_FLAG_CIPHER_SCHEME = 4,
1:  };
1:  
1:  enum {
1: -	TKIP_DECRYPT_OK = 0,
1: -	TKIP_DECRYPT_NO_EXT_IV = 4294967295,
1: -	TKIP_DECRYPT_INVALID_KEYIDX = 4294967294,
1: -	TKIP_DECRYPT_REPLAY = 4294967293,
1: +  TKIP_DECRYPT_OK = 0,
1: +  TKIP_DECRYPT_NO_EXT_IV = 4294967295,
1: +  TKIP_DECRYPT_INVALID_KEYIDX = 4294967294,
1: +  TKIP_DECRYPT_REPLAY = 4294967293,
1:  };
1:  
1:  enum mac80211_rx_encoding {
1: -	RX_ENC_LEGACY = 0,
1: -	RX_ENC_HT = 1,
1: -	RX_ENC_VHT = 2,
1: -	RX_ENC_HE = 3,
1: +  RX_ENC_LEGACY = 0,
1: +  RX_ENC_HT = 1,
1: +  RX_ENC_VHT = 2,
1: +  RX_ENC_HE = 3,
1:  };
1:  
1:  struct ieee80211_bss {
1: -	u32 device_ts_beacon;
1: -	u32 device_ts_presp;
1: -	bool wmm_used;
1: -	bool uapsd_supported;
1: -	u8 supp_rates[32];
1: -	size_t supp_rates_len;
1: -	struct ieee80211_rate *beacon_rate;
1: -	u32 vht_cap_info;
1: -	bool has_erp_value;
1: -	u8 erp_value;
1: -	u8 corrupt_data;
1: -	u8 valid_data;
1: +  u32 device_ts_beacon;
1: +  u32 device_ts_presp;
1: +  bool wmm_used;
1: +  bool uapsd_supported;
1: +  u8 supp_rates[32];
1: +  size_t supp_rates_len;
1: +  struct ieee80211_rate *beacon_rate;
1: +  u32 vht_cap_info;
1: +  bool has_erp_value;
1: +  u8 erp_value;
1: +  u8 corrupt_data;
1: +  u8 valid_data;
1:  };
1:  
1:  enum ieee80211_bss_corrupt_data_flags {
1: -	IEEE80211_BSS_CORRUPT_BEACON = 1,
1: -	IEEE80211_BSS_CORRUPT_PROBE_RESP = 2,
1: +  IEEE80211_BSS_CORRUPT_BEACON = 1,
1: +  IEEE80211_BSS_CORRUPT_PROBE_RESP = 2,
1:  };
1:  
1:  enum ieee80211_bss_valid_data_flags {
1: -	IEEE80211_BSS_VALID_WMM = 2,
1: -	IEEE80211_BSS_VALID_RATES = 4,
1: -	IEEE80211_BSS_VALID_ERP = 8,
1: +  IEEE80211_BSS_VALID_WMM = 2,
1: +  IEEE80211_BSS_VALID_RATES = 4,
1: +  IEEE80211_BSS_VALID_ERP = 8,
1:  };
1:  
1:  enum {
1: -	IEEE80211_PROBE_FLAG_DIRECTED = 1,
1: -	IEEE80211_PROBE_FLAG_MIN_CONTENT = 2,
1: -	IEEE80211_PROBE_FLAG_RANDOM_SN = 4,
1: +  IEEE80211_PROBE_FLAG_DIRECTED = 1,
1: +  IEEE80211_PROBE_FLAG_MIN_CONTENT = 2,
1: +  IEEE80211_PROBE_FLAG_RANDOM_SN = 4,
1:  };
1:  
1:  struct ieee80211_roc_work {
1: -	struct list_head list;
1: -	struct ieee80211_sub_if_data *sdata;
1: -	struct ieee80211_channel *chan;
1: -	bool started;
1: -	bool abort;
1: -	bool hw_begun;
1: -	bool notified;
1: -	bool on_channel;
1: -	long unsigned int start_time;
1: -	u32 duration;
1: -	u32 req_duration;
1: -	struct sk_buff *frame;
1: -	u64 cookie;
1: -	u64 mgmt_tx_cookie;
1: -	enum ieee80211_roc_type type;
1: +  struct list_head list;
1: +  struct ieee80211_sub_if_data *sdata;
1: +  struct ieee80211_channel *chan;
1: +  bool started;
1: +  bool abort;
1: +  bool hw_begun;
1: +  bool notified;
1: +  bool on_channel;
1: +  long unsigned int start_time;
1: +  u32 duration;
1: +  u32 req_duration;
1: +  struct sk_buff *frame;
1: +  u64 cookie;
1: +  u64 mgmt_tx_cookie;
1: +  enum ieee80211_roc_type type;
1:  };
1:  
1:  enum ieee80211_back_actioncode {
1: -	WLAN_ACTION_ADDBA_REQ = 0,
1: -	WLAN_ACTION_ADDBA_RESP = 1,
1: -	WLAN_ACTION_DELBA = 2,
1: +  WLAN_ACTION_ADDBA_REQ = 0,
1: +  WLAN_ACTION_ADDBA_RESP = 1,
1: +  WLAN_ACTION_DELBA = 2,
1:  };
1:  
1:  enum ieee80211_back_parties {
1: -	WLAN_BACK_RECIPIENT = 0,
1: -	WLAN_BACK_INITIATOR = 1,
1: +  WLAN_BACK_RECIPIENT = 0,
1: +  WLAN_BACK_INITIATOR = 1,
1:  };
1:  
1:  enum txq_info_flags {
1: -	IEEE80211_TXQ_STOP = 0,
1: -	IEEE80211_TXQ_AMPDU = 1,
1: -	IEEE80211_TXQ_NO_AMSDU = 2,
1: -	IEEE80211_TXQ_STOP_NETIF_TX = 3,
1: +  IEEE80211_TXQ_STOP = 0,
1: +  IEEE80211_TXQ_AMPDU = 1,
1: +  IEEE80211_TXQ_NO_AMSDU = 2,
1: +  IEEE80211_TXQ_STOP_NETIF_TX = 3,
1:  };
1:  
1:  enum ieee80211_vht_opmode_bits {
1: -	IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK = 3,
1: -	IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ = 0,
1: -	IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ = 1,
1: -	IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ = 2,
1: -	IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ = 3,
1: -	IEEE80211_OPMODE_NOTIF_BW_160_80P80 = 4,
1: -	IEEE80211_OPMODE_NOTIF_RX_NSS_MASK = 112,
1: -	IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT = 4,
1: -	IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF = 128,
1: +  IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK = 3,
1: +  IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ = 0,
1: +  IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ = 1,
1: +  IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ = 2,
1: +  IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ = 3,
1: +  IEEE80211_OPMODE_NOTIF_BW_160_80P80 = 4,
1: +  IEEE80211_OPMODE_NOTIF_RX_NSS_MASK = 112,
1: +  IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT = 4,
1: +  IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF = 128,
1:  };
1:  
1:  enum ieee80211_spectrum_mgmt_actioncode {
1: -	WLAN_ACTION_SPCT_MSR_REQ = 0,
1: -	WLAN_ACTION_SPCT_MSR_RPRT = 1,
1: -	WLAN_ACTION_SPCT_TPC_REQ = 2,
1: -	WLAN_ACTION_SPCT_TPC_RPRT = 3,
1: -	WLAN_ACTION_SPCT_CHL_SWITCH = 4,
1: +  WLAN_ACTION_SPCT_MSR_REQ = 0,
1: +  WLAN_ACTION_SPCT_MSR_RPRT = 1,
1: +  WLAN_ACTION_SPCT_TPC_REQ = 2,
1: +  WLAN_ACTION_SPCT_TPC_RPRT = 3,
1: +  WLAN_ACTION_SPCT_CHL_SWITCH = 4,
1:  };
1:  
1:  struct ieee80211_csa_ie {
1: -	struct cfg80211_chan_def chandef;
1: -	u8 mode;
1: -	u8 count;
1: -	u8 ttl;
1: -	u16 pre_value;
1: -	u16 reason_code;
1: -	u32 max_switch_time;
1: +  struct cfg80211_chan_def chandef;
1: +  u8 mode;
1: +  u8 count;
1: +  u8 ttl;
1: +  u16 pre_value;
1: +  u16 reason_code;
1: +  u32 max_switch_time;
1:  };
1:  
1:  enum ieee80211_vht_actioncode {
1: -	WLAN_VHT_ACTION_COMPRESSED_BF = 0,
1: -	WLAN_VHT_ACTION_GROUPID_MGMT = 1,
1: -	WLAN_VHT_ACTION_OPMODE_NOTIF = 2,
1: +  WLAN_VHT_ACTION_COMPRESSED_BF = 0,
1: +  WLAN_VHT_ACTION_GROUPID_MGMT = 1,
1: +  WLAN_VHT_ACTION_OPMODE_NOTIF = 2,
1:  };
1:  
1:  enum ieee80211_offload_flags {
1: -	IEEE80211_OFFLOAD_ENCAP_ENABLED = 1,
1: -	IEEE80211_OFFLOAD_ENCAP_4ADDR = 2,
1: +  IEEE80211_OFFLOAD_ENCAP_ENABLED = 1,
1: +  IEEE80211_OFFLOAD_ENCAP_4ADDR = 2,
1:  };
1:  
1:  enum ieee80211_tpt_led_trigger_flags {
1: -	IEEE80211_TPT_LEDTRIG_FL_RADIO = 1,
1: -	IEEE80211_TPT_LEDTRIG_FL_WORK = 2,
1: -	IEEE80211_TPT_LEDTRIG_FL_CONNECTED = 4,
1: +  IEEE80211_TPT_LEDTRIG_FL_RADIO = 1,
1: +  IEEE80211_TPT_LEDTRIG_FL_WORK = 2,
1: +  IEEE80211_TPT_LEDTRIG_FL_CONNECTED = 4,
1:  };
1:  
1:  struct rate_control_alg {
1: -	struct list_head list;
1: -	const struct rate_control_ops *ops;
1: +  struct list_head list;
1: +  const struct rate_control_ops *ops;
1:  };
1:  
1:  struct michael_mic_ctx {
1: -	u32 l;
1: -	u32 r;
1: +  u32 l;
1: +  u32 r;
1:  };
1:  
1:  struct ieee80211_csa_settings {
1: -	const u16 *counter_offsets_beacon;
1: -	const u16 *counter_offsets_presp;
1: -	int n_counter_offsets_beacon;
1: -	int n_counter_offsets_presp;
1: -	u8 count;
1: +  const u16 *counter_offsets_beacon;
1: +  const u16 *counter_offsets_presp;
1: +  int n_counter_offsets_beacon;
1: +  int n_counter_offsets_presp;
1: +  u8 count;
1:  };
1:  
1:  struct ieee80211_hdr_3addr {
1: -	__le16 frame_control;
1: -	__le16 duration_id;
1: -	u8 addr1[6];
1: -	u8 addr2[6];
1: -	u8 addr3[6];
1: -	__le16 seq_ctrl;
1: +  __le16 frame_control;
1: +  __le16 duration_id;
1: +  u8 addr1[6];
1: +  u8 addr2[6];
1: +  u8 addr3[6];
1: +  __le16 seq_ctrl;
1:  };
1:  
1:  enum ieee80211_ht_chanwidth_values {
1: -	IEEE80211_HT_CHANWIDTH_20MHZ = 0,
1: -	IEEE80211_HT_CHANWIDTH_ANY = 1,
1: +  IEEE80211_HT_CHANWIDTH_20MHZ = 0,
1: +  IEEE80211_HT_CHANWIDTH_ANY = 1,
1:  };
1:  
1:  struct ieee80211_tdls_data {
1: -	u8 da[6];
1: -	u8 sa[6];
1: -	__be16 ether_type;
1: -	u8 payload_type;
1: -	u8 category;
1: -	u8 action_code;
1: -	union {
1: -		struct {
1: -			u8 dialog_token;
1: -			__le16 capability;
1: -			u8 variable[0];
1: -		} __attribute__((packed)) setup_req;
1: -		struct {
1: -			__le16 status_code;
1: -			u8 dialog_token;
1: -			__le16 capability;
1: -			u8 variable[0];
1: -		} __attribute__((packed)) setup_resp;
1: -		struct {
1: -			__le16 status_code;
1: -			u8 dialog_token;
1: -			u8 variable[0];
1: -		} __attribute__((packed)) setup_cfm;
1: -		struct {
1: -			__le16 reason_code;
1: -			u8 variable[0];
1: -		} teardown;
1: -		struct {
1: -			u8 dialog_token;
1: -			u8 variable[0];
1: -		} discover_req;
1: -		struct {
1: -			u8 target_channel;
1: -			u8 oper_class;
1: -			u8 variable[0];
1: -		} chan_switch_req;
1: -		struct {
1: -			__le16 status_code;
1: -			u8 variable[0];
1: -		} chan_switch_resp;
1: -	} u;
1: +  u8 da[6];
1: +  u8 sa[6];
1: +  __be16 ether_type;
1: +  u8 payload_type;
1: +  u8 category;
1: +  u8 action_code;
1: +  union {
1: +    struct {
1: +      u8 dialog_token;
1: +      __le16 capability;
1: +      u8 variable[0];
1: +    } __attribute__((packed)) setup_req;
1: +    struct {
1: +      __le16 status_code;
1: +      u8 dialog_token;
1: +      __le16 capability;
1: +      u8 variable[0];
1: +    } __attribute__((packed)) setup_resp;
1: +    struct {
1: +      __le16 status_code;
1: +      u8 dialog_token;
1: +      u8 variable[0];
1: +    } __attribute__((packed)) setup_cfm;
1: +    struct {
1: +      __le16 reason_code;
1: +      u8 variable[0];
1: +    } teardown;
1: +    struct {
1: +      u8 dialog_token;
1: +      u8 variable[0];
1: +    } discover_req;
1: +    struct {
1: +      u8 target_channel;
1: +      u8 oper_class;
1: +      u8 variable[0];
1: +    } chan_switch_req;
1: +    struct {
1: +      __le16 status_code;
1: +      u8 variable[0];
1: +    } chan_switch_resp;
1: +  } u;
1:  } __attribute__((packed));
1:  
1:  enum ieee80211_self_protected_actioncode {
1: -	WLAN_SP_RESERVED = 0,
1: -	WLAN_SP_MESH_PEERING_OPEN = 1,
1: -	WLAN_SP_MESH_PEERING_CONFIRM = 2,
1: -	WLAN_SP_MESH_PEERING_CLOSE = 3,
1: -	WLAN_SP_MGK_INFORM = 4,
1: -	WLAN_SP_MGK_ACK = 5,
1: +  WLAN_SP_RESERVED = 0,
1: +  WLAN_SP_MESH_PEERING_OPEN = 1,
1: +  WLAN_SP_MESH_PEERING_CONFIRM = 2,
1: +  WLAN_SP_MESH_PEERING_CLOSE = 3,
1: +  WLAN_SP_MGK_INFORM = 4,
1: +  WLAN_SP_MGK_ACK = 5,
1:  };
1:  
1:  enum ieee80211_pub_actioncode {
1: -	WLAN_PUB_ACTION_20_40_BSS_COEX = 0,
1: -	WLAN_PUB_ACTION_DSE_ENABLEMENT = 1,
1: -	WLAN_PUB_ACTION_DSE_DEENABLEMENT = 2,
1: -	WLAN_PUB_ACTION_DSE_REG_LOC_ANN = 3,
1: -	WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,
1: -	WLAN_PUB_ACTION_DSE_MSMT_REQ = 5,
1: -	WLAN_PUB_ACTION_DSE_MSMT_RESP = 6,
1: -	WLAN_PUB_ACTION_MSMT_PILOT = 7,
1: -	WLAN_PUB_ACTION_DSE_PC = 8,
1: -	WLAN_PUB_ACTION_VENDOR_SPECIFIC = 9,
1: -	WLAN_PUB_ACTION_GAS_INITIAL_REQ = 10,
1: -	WLAN_PUB_ACTION_GAS_INITIAL_RESP = 11,
1: -	WLAN_PUB_ACTION_GAS_COMEBACK_REQ = 12,
1: -	WLAN_PUB_ACTION_GAS_COMEBACK_RESP = 13,
1: -	WLAN_PUB_ACTION_TDLS_DISCOVER_RES = 14,
1: -	WLAN_PUB_ACTION_LOC_TRACK_NOTI = 15,
1: -	WLAN_PUB_ACTION_QAB_REQUEST_FRAME = 16,
1: -	WLAN_PUB_ACTION_QAB_RESPONSE_FRAME = 17,
1: -	WLAN_PUB_ACTION_QMF_POLICY = 18,
1: -	WLAN_PUB_ACTION_QMF_POLICY_CHANGE = 19,
1: -	WLAN_PUB_ACTION_QLOAD_REQUEST = 20,
1: -	WLAN_PUB_ACTION_QLOAD_REPORT = 21,
1: -	WLAN_PUB_ACTION_HCCA_TXOP_ADVERT = 22,
1: -	WLAN_PUB_ACTION_HCCA_TXOP_RESPONSE = 23,
1: -	WLAN_PUB_ACTION_PUBLIC_KEY = 24,
1: -	WLAN_PUB_ACTION_CHANNEL_AVAIL_QUERY = 25,
1: -	WLAN_PUB_ACTION_CHANNEL_SCHEDULE_MGMT = 26,
1: -	WLAN_PUB_ACTION_CONTACT_VERI_SIGNAL = 27,
1: -	WLAN_PUB_ACTION_GDD_ENABLEMENT_REQ = 28,
1: -	WLAN_PUB_ACTION_GDD_ENABLEMENT_RESP = 29,
1: -	WLAN_PUB_ACTION_NETWORK_CHANNEL_CONTROL = 30,
1: -	WLAN_PUB_ACTION_WHITE_SPACE_MAP_ANN = 31,
1: -	WLAN_PUB_ACTION_FTM_REQUEST = 32,
1: -	WLAN_PUB_ACTION_FTM = 33,
1: -	WLAN_PUB_ACTION_FILS_DISCOVERY = 34,
1: +  WLAN_PUB_ACTION_20_40_BSS_COEX = 0,
1: +  WLAN_PUB_ACTION_DSE_ENABLEMENT = 1,
1: +  WLAN_PUB_ACTION_DSE_DEENABLEMENT = 2,
1: +  WLAN_PUB_ACTION_DSE_REG_LOC_ANN = 3,
1: +  WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,
1: +  WLAN_PUB_ACTION_DSE_MSMT_REQ = 5,
1: +  WLAN_PUB_ACTION_DSE_MSMT_RESP = 6,
1: +  WLAN_PUB_ACTION_MSMT_PILOT = 7,
1: +  WLAN_PUB_ACTION_DSE_PC = 8,
1: +  WLAN_PUB_ACTION_VENDOR_SPECIFIC = 9,
1: +  WLAN_PUB_ACTION_GAS_INITIAL_REQ = 10,
1: +  WLAN_PUB_ACTION_GAS_INITIAL_RESP = 11,
1: +  WLAN_PUB_ACTION_GAS_COMEBACK_REQ = 12,
1: +  WLAN_PUB_ACTION_GAS_COMEBACK_RESP = 13,
1: +  WLAN_PUB_ACTION_TDLS_DISCOVER_RES = 14,
1: +  WLAN_PUB_ACTION_LOC_TRACK_NOTI = 15,
1: +  WLAN_PUB_ACTION_QAB_REQUEST_FRAME = 16,
1: +  WLAN_PUB_ACTION_QAB_RESPONSE_FRAME = 17,
1: +  WLAN_PUB_ACTION_QMF_POLICY = 18,
1: +  WLAN_PUB_ACTION_QMF_POLICY_CHANGE = 19,
1: +  WLAN_PUB_ACTION_QLOAD_REQUEST = 20,
1: +  WLAN_PUB_ACTION_QLOAD_REPORT = 21,
1: +  WLAN_PUB_ACTION_HCCA_TXOP_ADVERT = 22,
1: +  WLAN_PUB_ACTION_HCCA_TXOP_RESPONSE = 23,
1: +  WLAN_PUB_ACTION_PUBLIC_KEY = 24,
1: +  WLAN_PUB_ACTION_CHANNEL_AVAIL_QUERY = 25,
1: +  WLAN_PUB_ACTION_CHANNEL_SCHEDULE_MGMT = 26,
1: +  WLAN_PUB_ACTION_CONTACT_VERI_SIGNAL = 27,
1: +  WLAN_PUB_ACTION_GDD_ENABLEMENT_REQ = 28,
1: +  WLAN_PUB_ACTION_GDD_ENABLEMENT_RESP = 29,
1: +  WLAN_PUB_ACTION_NETWORK_CHANNEL_CONTROL = 30,
1: +  WLAN_PUB_ACTION_WHITE_SPACE_MAP_ANN = 31,
1: +  WLAN_PUB_ACTION_FTM_REQUEST = 32,
1: +  WLAN_PUB_ACTION_FTM = 33,
1: +  WLAN_PUB_ACTION_FILS_DISCOVERY = 34,
1:  };
1:  
1:  enum ieee80211_sa_query_action {
1: -	WLAN_ACTION_SA_QUERY_REQUEST = 0,
1: -	WLAN_ACTION_SA_QUERY_RESPONSE = 1,
1: +  WLAN_ACTION_SA_QUERY_REQUEST = 0,
1: +  WLAN_ACTION_SA_QUERY_RESPONSE = 1,
1:  };
1:  
1:  enum ieee80211_radiotap_flags {
1: -	IEEE80211_RADIOTAP_F_CFP = 1,
1: -	IEEE80211_RADIOTAP_F_SHORTPRE = 2,
1: -	IEEE80211_RADIOTAP_F_WEP = 4,
1: -	IEEE80211_RADIOTAP_F_FRAG = 8,
1: -	IEEE80211_RADIOTAP_F_FCS = 16,
1: -	IEEE80211_RADIOTAP_F_DATAPAD = 32,
1: -	IEEE80211_RADIOTAP_F_BADFCS = 64,
1: +  IEEE80211_RADIOTAP_F_CFP = 1,
1: +  IEEE80211_RADIOTAP_F_SHORTPRE = 2,
1: +  IEEE80211_RADIOTAP_F_WEP = 4,
1: +  IEEE80211_RADIOTAP_F_FRAG = 8,
1: +  IEEE80211_RADIOTAP_F_FCS = 16,
1: +  IEEE80211_RADIOTAP_F_DATAPAD = 32,
1: +  IEEE80211_RADIOTAP_F_BADFCS = 64,
1:  };
1:  
1:  enum ieee80211_radiotap_channel_flags {
1: -	IEEE80211_CHAN_CCK = 32,
1: -	IEEE80211_CHAN_OFDM = 64,
1: -	IEEE80211_CHAN_2GHZ = 128,
1: -	IEEE80211_CHAN_5GHZ = 256,
1: -	IEEE80211_CHAN_DYN = 1024,
1: -	IEEE80211_CHAN_HALF = 16384,
1: -	IEEE80211_CHAN_QUARTER = 32768,
1: +  IEEE80211_CHAN_CCK = 32,
1: +  IEEE80211_CHAN_OFDM = 64,
1: +  IEEE80211_CHAN_2GHZ = 128,
1: +  IEEE80211_CHAN_5GHZ = 256,
1: +  IEEE80211_CHAN_DYN = 1024,
1: +  IEEE80211_CHAN_HALF = 16384,
1: +  IEEE80211_CHAN_QUARTER = 32768,
1:  };
1:  
1:  enum ieee80211_radiotap_rx_flags {
1: -	IEEE80211_RADIOTAP_F_RX_BADPLCP = 2,
1: +  IEEE80211_RADIOTAP_F_RX_BADPLCP = 2,
1:  };
1:  
1:  enum ieee80211_radiotap_ampdu_flags {
1: -	IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN = 1,
1: -	IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN = 2,
1: -	IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN = 4,
1: -	IEEE80211_RADIOTAP_AMPDU_IS_LAST = 8,
1: -	IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR = 16,
1: -	IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN = 32,
1: -	IEEE80211_RADIOTAP_AMPDU_EOF = 64,
1: -	IEEE80211_RADIOTAP_AMPDU_EOF_KNOWN = 128,
1: +  IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN = 1,
1: +  IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN = 2,
1: +  IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN = 4,
1: +  IEEE80211_RADIOTAP_AMPDU_IS_LAST = 8,
1: +  IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR = 16,
1: +  IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN = 32,
1: +  IEEE80211_RADIOTAP_AMPDU_EOF = 64,
1: +  IEEE80211_RADIOTAP_AMPDU_EOF_KNOWN = 128,
1:  };
1:  
1:  enum ieee80211_radiotap_vht_coding {
1: -	IEEE80211_RADIOTAP_CODING_LDPC_USER0 = 1,
1: -	IEEE80211_RADIOTAP_CODING_LDPC_USER1 = 2,
1: -	IEEE80211_RADIOTAP_CODING_LDPC_USER2 = 4,
1: -	IEEE80211_RADIOTAP_CODING_LDPC_USER3 = 8,
1: +  IEEE80211_RADIOTAP_CODING_LDPC_USER0 = 1,
1: +  IEEE80211_RADIOTAP_CODING_LDPC_USER1 = 2,
1: +  IEEE80211_RADIOTAP_CODING_LDPC_USER2 = 4,
1: +  IEEE80211_RADIOTAP_CODING_LDPC_USER3 = 8,
1:  };
1:  
1:  enum ieee80211_radiotap_timestamp_flags {
1: -	IEEE80211_RADIOTAP_TIMESTAMP_FLAG_64BIT = 0,
1: -	IEEE80211_RADIOTAP_TIMESTAMP_FLAG_32BIT = 1,
1: -	IEEE80211_RADIOTAP_TIMESTAMP_FLAG_ACCURACY = 2,
1: +  IEEE80211_RADIOTAP_TIMESTAMP_FLAG_64BIT = 0,
1: +  IEEE80211_RADIOTAP_TIMESTAMP_FLAG_32BIT = 1,
1: +  IEEE80211_RADIOTAP_TIMESTAMP_FLAG_ACCURACY = 2,
1:  };
1:  
1:  struct ieee80211_radiotap_he_mu {
1: -	__le16 flags1;
1: -	__le16 flags2;
1: -	u8 ru_ch1[4];
1: -	u8 ru_ch2[4];
1: +  __le16 flags1;
1: +  __le16 flags2;
1: +  u8 ru_ch1[4];
1: +  u8 ru_ch2[4];
1:  };
1:  
1:  struct ieee80211_radiotap_lsig {
1: -	__le16 data1;
1: -	__le16 data2;
1: +  __le16 data1;
1: +  __le16 data2;
1:  };
1:  
1:  enum mac80211_rx_encoding_flags {
1: -	RX_ENC_FLAG_SHORTPRE = 1,
1: -	RX_ENC_FLAG_SHORT_GI = 4,
1: -	RX_ENC_FLAG_HT_GF = 8,
1: -	RX_ENC_FLAG_STBC_MASK = 48,
1: -	RX_ENC_FLAG_LDPC = 64,
1: -	RX_ENC_FLAG_BF = 128,
1: +  RX_ENC_FLAG_SHORTPRE = 1,
1: +  RX_ENC_FLAG_SHORT_GI = 4,
1: +  RX_ENC_FLAG_HT_GF = 8,
1: +  RX_ENC_FLAG_STBC_MASK = 48,
1: +  RX_ENC_FLAG_LDPC = 64,
1: +  RX_ENC_FLAG_BF = 128,
1:  };
1:  
1:  struct ieee80211_vendor_radiotap {
1: -	u32 present;
1: -	u8 align;
1: -	u8 oui[3];
1: -	u8 subns;
1: -	u8 pad;
1: -	u16 len;
1: -	u8 data[0];
1: +  u32 present;
1: +  u8 align;
1: +  u8 oui[3];
1: +  u8 subns;
1: +  u8 pad;
1: +  u16 len;
1: +  u8 data[0];
1:  };
1:  
1:  enum ieee80211_packet_rx_flags {
1: -	IEEE80211_RX_AMSDU = 8,
1: -	IEEE80211_RX_MALFORMED_ACTION_FRM = 16,
1: -	IEEE80211_RX_DEFERRED_RELEASE = 32,
1: +  IEEE80211_RX_AMSDU = 8,
1: +  IEEE80211_RX_MALFORMED_ACTION_FRM = 16,
1: +  IEEE80211_RX_DEFERRED_RELEASE = 32,
1:  };
1:  
1:  enum ieee80211_rx_flags {
1: -	IEEE80211_RX_CMNTR = 1,
1: -	IEEE80211_RX_BEACON_REPORTED = 2,
1: +  IEEE80211_RX_CMNTR = 1,
1: +  IEEE80211_RX_BEACON_REPORTED = 2,
1:  };
1:  
1:  struct ieee80211_rts {
1: -	__le16 frame_control;
1: -	__le16 duration;
1: -	u8 ra[6];
1: -	u8 ta[6];
1: +  __le16 frame_control;
1: +  __le16 duration;
1: +  u8 ra[6];
1: +  u8 ta[6];
1:  };
1:  
1:  struct ieee80211_cts {
1: -	__le16 frame_control;
1: -	__le16 duration;
1: -	u8 ra[6];
1: +  __le16 frame_control;
1: +  __le16 duration;
1: +  u8 ra[6];
1:  };
1:  
1:  struct ieee80211_pspoll {
1: -	__le16 frame_control;
1: -	__le16 aid;
1: -	u8 bssid[6];
1: -	u8 ta[6];
1: +  __le16 frame_control;
1: +  __le16 aid;
1: +  u8 bssid[6];
1: +  u8 ta[6];
1:  };
1:  
1:  struct ieee80211_mutable_offsets {
1: -	u16 tim_offset;
1: -	u16 tim_length;
1: -	u16 cntdwn_counter_offs[2];
1: +  u16 tim_offset;
1: +  u16 tim_length;
1: +  u16 cntdwn_counter_offs[2];
1:  };
1:  
1: -typedef struct sk_buff *fq_tin_dequeue_t(struct fq *, struct fq_tin *, struct fq_flow___2 *);
1: +typedef struct sk_buff *fq_tin_dequeue_t(struct fq *, struct fq_tin *,
1: +                                         struct fq_flow___2 *);
1:  
1: -typedef void fq_skb_free_t(struct fq *, struct fq_tin *, struct fq_flow___2 *, struct sk_buff *);
1: +typedef void fq_skb_free_t(struct fq *, struct fq_tin *, struct fq_flow___2 *,
1: +                           struct sk_buff *);
1:  
1: -typedef bool fq_skb_filter_t(struct fq *, struct fq_tin *, struct fq_flow___2 *, struct sk_buff *, void *);
1: +typedef bool fq_skb_filter_t(struct fq *, struct fq_tin *, struct fq_flow___2 *,
1: +                             struct sk_buff *, void *);
1:  
1: -typedef struct fq_flow___2 *fq_flow_get_default_t(struct fq *, struct fq_tin *, int, struct sk_buff *);
1: +typedef struct fq_flow___2 *fq_flow_get_default_t(struct fq *, struct fq_tin *,
1: +                                                  int, struct sk_buff *);
1:  
1:  enum mesh_path_flags {
1: -	MESH_PATH_ACTIVE = 1,
1: -	MESH_PATH_RESOLVING = 2,
1: -	MESH_PATH_SN_VALID = 4,
1: -	MESH_PATH_FIXED = 8,
1: -	MESH_PATH_RESOLVED = 16,
1: -	MESH_PATH_REQ_QUEUED = 32,
1: -	MESH_PATH_DELETED = 64,
1: +  MESH_PATH_ACTIVE = 1,
1: +  MESH_PATH_RESOLVING = 2,
1: +  MESH_PATH_SN_VALID = 4,
1: +  MESH_PATH_FIXED = 8,
1: +  MESH_PATH_RESOLVED = 16,
1: +  MESH_PATH_REQ_QUEUED = 32,
1: +  MESH_PATH_DELETED = 64,
1:  };
1:  
1:  struct mesh_path {
1: -	u8 dst[6];
1: -	u8 mpp[6];
1: -	struct rhash_head rhash;
1: -	struct hlist_node walk_list;
1: -	struct hlist_node gate_list;
1: -	struct ieee80211_sub_if_data *sdata;
1: -	struct sta_info *next_hop;
1: -	struct timer_list timer;
1: -	struct sk_buff_head frame_queue;
1: -	struct callback_head rcu;
1: -	u32 sn;
1: -	u32 metric;
1: -	u8 hop_count;
1: -	long unsigned int exp_time;
1: -	u32 discovery_timeout;
1: -	u8 discovery_retries;
1: -	enum mesh_path_flags flags;
1: -	spinlock_t state_lock;
1: -	u8 rann_snd_addr[6];
1: -	u32 rann_metric;
1: -	long unsigned int last_preq_to_root;
1: -	bool is_root;
1: -	bool is_gate;
1: -	u32 path_change_count;
1: +  u8 dst[6];
1: +  u8 mpp[6];
1: +  struct rhash_head rhash;
1: +  struct hlist_node walk_list;
1: +  struct hlist_node gate_list;
1: +  struct ieee80211_sub_if_data *sdata;
1: +  struct sta_info *next_hop;
1: +  struct timer_list timer;
1: +  struct sk_buff_head frame_queue;
1: +  struct callback_head rcu;
1: +  u32 sn;
1: +  u32 metric;
1: +  u8 hop_count;
1: +  long unsigned int exp_time;
1: +  u32 discovery_timeout;
1: +  u8 discovery_retries;
1: +  enum mesh_path_flags flags;
1: +  spinlock_t state_lock;
1: +  u8 rann_snd_addr[6];
1: +  u32 rann_metric;
1: +  long unsigned int last_preq_to_root;
1: +  bool is_root;
1: +  bool is_gate;
1: +  u32 path_change_count;
1:  };
1:  
1:  enum ieee80211_encrypt {
1: -	ENCRYPT_NO = 0,
1: -	ENCRYPT_MGMT = 1,
1: -	ENCRYPT_DATA = 2,
1: +  ENCRYPT_NO = 0,
1: +  ENCRYPT_MGMT = 1,
1: +  ENCRYPT_DATA = 2,
1:  };
1:  
1:  enum ieee80211_s1g_chanwidth {
1: -	IEEE80211_S1G_CHANWIDTH_1MHZ = 0,
1: -	IEEE80211_S1G_CHANWIDTH_2MHZ = 1,
1: -	IEEE80211_S1G_CHANWIDTH_4MHZ = 3,
1: -	IEEE80211_S1G_CHANWIDTH_8MHZ = 7,
1: -	IEEE80211_S1G_CHANWIDTH_16MHZ = 15,
1: +  IEEE80211_S1G_CHANWIDTH_1MHZ = 0,
1: +  IEEE80211_S1G_CHANWIDTH_2MHZ = 1,
1: +  IEEE80211_S1G_CHANWIDTH_4MHZ = 3,
1: +  IEEE80211_S1G_CHANWIDTH_8MHZ = 7,
1: +  IEEE80211_S1G_CHANWIDTH_16MHZ = 15,
1:  };
1:  
1:  struct ieee80211_he_6ghz_oper {
1: -	u8 primary;
1: -	u8 control;
1: -	u8 ccfs0;
1: -	u8 ccfs1;
1: -	u8 minrate;
1: +  u8 primary;
1: +  u8 control;
1: +  u8 ccfs0;
1: +  u8 ccfs1;
1: +  u8 minrate;
1:  };
1:  
1:  enum ieee80211_interface_iteration_flags {
1: -	IEEE80211_IFACE_ITER_NORMAL = 0,
1: -	IEEE80211_IFACE_ITER_RESUME_ALL = 1,
1: -	IEEE80211_IFACE_ITER_ACTIVE = 2,
1: -	IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER = 4,
1: +  IEEE80211_IFACE_ITER_NORMAL = 0,
1: +  IEEE80211_IFACE_ITER_RESUME_ALL = 1,
1: +  IEEE80211_IFACE_ITER_ACTIVE = 2,
1: +  IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER = 4,
1:  };
1:  
1:  struct ieee80211_noa_data {
1: -	u32 next_tsf;
1: -	bool has_next_tsf;
1: -	u8 absent;
1: -	u8 count[4];
1: -	struct {
1: -		u32 start;
1: -		u32 duration;
1: -		u32 interval;
1: -	} desc[4];
1: +  u32 next_tsf;
1: +  bool has_next_tsf;
1: +  u8 absent;
1: +  u8 count[4];
1: +  struct {
1: +    u32 start;
1: +    u32 duration;
1: +    u32 interval;
1: +  } desc[4];
1:  };
1:  
1:  enum ieee80211_chanctx_change {
1: -	IEEE80211_CHANCTX_CHANGE_WIDTH = 1,
1: -	IEEE80211_CHANCTX_CHANGE_RX_CHAINS = 2,
1: -	IEEE80211_CHANCTX_CHANGE_RADAR = 4,
1: -	IEEE80211_CHANCTX_CHANGE_CHANNEL = 8,
1: -	IEEE80211_CHANCTX_CHANGE_MIN_WIDTH = 16,
1: +  IEEE80211_CHANCTX_CHANGE_WIDTH = 1,
1: +  IEEE80211_CHANCTX_CHANGE_RX_CHAINS = 2,
1: +  IEEE80211_CHANCTX_CHANGE_RADAR = 4,
1: +  IEEE80211_CHANCTX_CHANGE_CHANNEL = 8,
1: +  IEEE80211_CHANCTX_CHANGE_MIN_WIDTH = 16,
1:  };
1:  
1:  struct trace_vif_entry {
1: -	enum nl80211_iftype vif_type;
1: -	bool p2p;
1: -	char vif_name[16];
1: +  enum nl80211_iftype vif_type;
1: +  bool p2p;
1: +  char vif_name[16];
1:  } __attribute__((packed));
1:  
1:  struct trace_chandef_entry {
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1:  };
1:  
1:  struct trace_switch_entry {
1: -	struct trace_vif_entry vif;
1: -	struct trace_chandef_entry old_chandef;
1: -	struct trace_chandef_entry new_chandef;
1: +  struct trace_vif_entry vif;
1: +  struct trace_chandef_entry old_chandef;
1: +  struct trace_chandef_entry new_chandef;
1:  } __attribute__((packed));
1:  
1:  struct trace_event_raw_local_only_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_local_sdata_addr_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_local_u32_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 value;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 value;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_local_sdata_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_return_int {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_return_bool {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	bool ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  bool ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_return_u32 {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_return_u64 {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u64 ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u64 ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_wakeup {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	bool enabled;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  bool enabled;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_change_interface {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 new_type;
1: -	bool new_p2p;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 new_type;
1: +  bool new_p2p;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_config {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 changed;
1: -	u32 flags;
1: -	int power_level;
1: -	int dynamic_ps_timeout;
1: -	u16 listen_interval;
1: -	u8 long_frame_max_tx_count;
1: -	u8 short_frame_max_tx_count;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	int smps;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 changed;
1: +  u32 flags;
1: +  int power_level;
1: +  int dynamic_ps_timeout;
1: +  u16 listen_interval;
1: +  u8 long_frame_max_tx_count;
1: +  u8 short_frame_max_tx_count;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  int smps;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_bss_info_changed {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 changed;
1: -	bool assoc;
1: -	bool ibss_joined;
1: -	bool ibss_creator;
1: -	u16 aid;
1: -	bool cts;
1: -	bool shortpre;
1: -	bool shortslot;
1: -	bool enable_beacon;
1: -	u8 dtimper;
1: -	u16 bcnint;
1: -	u16 assoc_cap;
1: -	u64 sync_tsf;
1: -	u32 sync_device_ts;
1: -	u8 sync_dtim_count;
1: -	u32 basic_rates;
1: -	int mcast_rate[5];
1: -	u16 ht_operation_mode;
1: -	s32 cqm_rssi_thold;
1: -	s32 cqm_rssi_hyst;
1: -	u32 channel_width;
1: -	u32 channel_cfreq1;
1: -	u32 channel_cfreq1_offset;
1: -	u32 __data_loc_arp_addr_list;
1: -	int arp_addr_cnt;
1: -	bool qos;
1: -	bool idle;
1: -	bool ps;
1: -	u32 __data_loc_ssid;
1: -	bool hidden_ssid;
1: -	int txpower;
1: -	u8 p2p_oppps_ctwindow;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 changed;
1: +  bool assoc;
1: +  bool ibss_joined;
1: +  bool ibss_creator;
1: +  u16 aid;
1: +  bool cts;
1: +  bool shortpre;
1: +  bool shortslot;
1: +  bool enable_beacon;
1: +  u8 dtimper;
1: +  u16 bcnint;
1: +  u16 assoc_cap;
1: +  u64 sync_tsf;
1: +  u32 sync_device_ts;
1: +  u8 sync_dtim_count;
1: +  u32 basic_rates;
1: +  int mcast_rate[5];
1: +  u16 ht_operation_mode;
1: +  s32 cqm_rssi_thold;
1: +  s32 cqm_rssi_hyst;
1: +  u32 channel_width;
1: +  u32 channel_cfreq1;
1: +  u32 channel_cfreq1_offset;
1: +  u32 __data_loc_arp_addr_list;
1: +  int arp_addr_cnt;
1: +  bool qos;
1: +  bool idle;
1: +  bool ps;
1: +  u32 __data_loc_ssid;
1: +  bool hidden_ssid;
1: +  int txpower;
1: +  u8 p2p_oppps_ctwindow;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_prepare_multicast {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int mc_count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int mc_count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_configure_filter {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	unsigned int changed;
1: -	unsigned int total;
1: -	u64 multicast;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  unsigned int changed;
1: +  unsigned int total;
1: +  u64 multicast;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_config_iface_filter {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	unsigned int filter_flags;
1: -	unsigned int changed_flags;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  unsigned int filter_flags;
1: +  unsigned int changed_flags;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_tim {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char sta_addr[6];
1: -	bool set;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char sta_addr[6];
1: +  bool set;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u32 cipher;
1: -	u8 hw_key_idx;
1: -	u8 flags;
1: -	s8 keyidx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u32 cipher;
1: +  u8 hw_key_idx;
1: +  u8 flags;
1: +  s8 keyidx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_update_tkip_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u32 iv32;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u32 iv32;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_sw_scan_start {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char mac_addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char mac_addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_stats {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int ret;
1: -	unsigned int ackfail;
1: -	unsigned int rtsfail;
1: -	unsigned int fcserr;
1: -	unsigned int rtssucc;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int ret;
1: +  unsigned int ackfail;
1: +  unsigned int rtsfail;
1: +  unsigned int fcserr;
1: +  unsigned int rtssucc;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_key_seq {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 cipher;
1: -	u8 hw_key_idx;
1: -	u8 flags;
1: -	s8 keyidx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 cipher;
1: +  u8 hw_key_idx;
1: +  u8 flags;
1: +  s8 keyidx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_coverage_class {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	s16 value;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  s16 value;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_sta_notify {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u32 cmd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u32 cmd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_sta_state {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u32 old_state;
1: -	u32 new_state;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u32 old_state;
1: +  u32 new_state;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_sta_set_txpwr {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	s16 txpwr;
1: -	u8 type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  s16 txpwr;
1: +  u8 type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_sta_rc_update {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u32 changed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u32 changed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_sta_event {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_conf_tx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u16 ac;
1: -	u16 txop;
1: -	u16 cw_min;
1: -	u16 cw_max;
1: -	u8 aifs;
1: -	bool uapsd;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u16 ac;
1: +  u16 txop;
1: +  u16 cw_min;
1: +  u16 cw_max;
1: +  u8 aifs;
1: +  bool uapsd;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_tsf {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u64 tsf;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u64 tsf;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_offset_tsf {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	s64 tsf_offset;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  s64 tsf_offset;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_ampdu_action {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	enum ieee80211_ampdu_mlme_action ieee80211_ampdu_mlme_action;
1: -	char sta_addr[6];
1: -	u16 tid;
1: -	u16 ssn;
1: -	u16 buf_size;
1: -	bool amsdu;
1: -	u16 timeout;
1: -	u16 action;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  enum ieee80211_ampdu_mlme_action ieee80211_ampdu_mlme_action;
1: +  char sta_addr[6];
1: +  u16 tid;
1: +  u16 ssn;
1: +  u16 buf_size;
1: +  bool amsdu;
1: +  u16 timeout;
1: +  u16 action;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_survey {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int idx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int idx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_flush {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	bool drop;
1: -	u32 queues;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  bool drop;
1: +  u32 queues;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u64 timestamp;
1: -	u32 device_timestamp;
1: -	bool block_tx;
1: -	u8 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u64 timestamp;
1: +  u32 device_timestamp;
1: +  bool block_tx;
1: +  u8 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_antenna {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 tx_ant;
1: -	u32 rx_ant;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 tx_ant;
1: +  u32 rx_ant;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_antenna {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 tx_ant;
1: -	u32 rx_ant;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 tx_ant;
1: +  u32 rx_ant;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_remain_on_channel {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	int center_freq;
1: -	int freq_offset;
1: -	unsigned int duration;
1: -	u32 type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  int center_freq;
1: +  int freq_offset;
1: +  unsigned int duration;
1: +  u32 type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_ringparam {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 tx;
1: -	u32 rx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 tx;
1: +  u32 rx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_ringparam {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 tx;
1: -	u32 tx_max;
1: -	u32 rx;
1: -	u32 rx_max;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 tx;
1: +  u32 tx_max;
1: +  u32 rx;
1: +  u32 rx_max;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_bitrate_mask {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 legacy_2g;
1: -	u32 legacy_5g;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 legacy_2g;
1: +  u32 legacy_5g;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_rekey_data {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 kek[16];
1: -	u8 kck[16];
1: -	u8 replay_ctr[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 kek[16];
1: +  u8 kck[16];
1: +  u8 replay_ctr[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_event_callback {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_release_evt {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char sta_addr[6];
1: -	u16 tids;
1: -	int num_frames;
1: -	int reason;
1: -	bool more_data;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char sta_addr[6];
1: +  u16 tids;
1: +  int num_frames;
1: +  int reason;
1: +  bool more_data;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_mgd_prepare_tx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 duration;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 duration;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_local_chanctx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u32 min_control_freq;
1: -	u32 min_freq_offset;
1: -	u32 min_chan_width;
1: -	u32 min_center_freq1;
1: -	u32 min_freq1_offset;
1: -	u32 min_center_freq2;
1: -	u8 rx_chains_static;
1: -	u8 rx_chains_dynamic;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u32 min_control_freq;
1: +  u32 min_freq_offset;
1: +  u32 min_chan_width;
1: +  u32 min_center_freq1;
1: +  u32 min_freq1_offset;
1: +  u32 min_center_freq2;
1: +  u8 rx_chains_static;
1: +  u8 rx_chains_dynamic;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_change_chanctx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u32 min_control_freq;
1: -	u32 min_freq_offset;
1: -	u32 min_chan_width;
1: -	u32 min_center_freq1;
1: -	u32 min_freq1_offset;
1: -	u32 min_center_freq2;
1: -	u8 rx_chains_static;
1: -	u8 rx_chains_dynamic;
1: -	u32 changed;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u32 min_control_freq;
1: +  u32 min_freq_offset;
1: +  u32 min_chan_width;
1: +  u32 min_center_freq1;
1: +  u32 min_freq1_offset;
1: +  u32 min_center_freq2;
1: +  u8 rx_chains_static;
1: +  u8 rx_chains_dynamic;
1: +  u32 changed;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_switch_vif_chanctx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	int n_vifs;
1: -	u32 mode;
1: -	u32 __data_loc_vifs;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  int n_vifs;
1: +  u32 mode;
1: +  u32 __data_loc_vifs;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_local_sdata_chanctx {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u32 min_control_freq;
1: -	u32 min_freq_offset;
1: -	u32 min_chan_width;
1: -	u32 min_center_freq1;
1: -	u32 min_freq1_offset;
1: -	u32 min_center_freq2;
1: -	u8 rx_chains_static;
1: -	u8 rx_chains_dynamic;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u32 min_control_freq;
1: +  u32 min_freq_offset;
1: +  u32 min_chan_width;
1: +  u32 min_center_freq1;
1: +  u32 min_freq1_offset;
1: +  u32 min_center_freq2;
1: +  u8 rx_chains_static;
1: +  u8 rx_chains_dynamic;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_start_ap {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 dtimper;
1: -	u16 bcnint;
1: -	u32 __data_loc_ssid;
1: -	bool hidden_ssid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 dtimper;
1: +  u16 bcnint;
1: +  u32 __data_loc_ssid;
1: +  bool hidden_ssid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_reconfig_complete {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u8 reconfig_type;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u8 reconfig_type;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_join_ibss {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 dtimper;
1: -	u16 bcnint;
1: -	u32 __data_loc_ssid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 dtimper;
1: +  u16 bcnint;
1: +  u32 __data_loc_ssid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_expected_throughput {
1: -	struct trace_entry ent;
1: -	char sta_addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char sta_addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_start_nan {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 master_pref;
1: -	u8 bands;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 master_pref;
1: +  u8 bands;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_stop_nan {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_nan_change_conf {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 master_pref;
1: -	u8 bands;
1: -	u32 changes;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 master_pref;
1: +  u8 bands;
1: +  u32 changes;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_add_nan_func {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 type;
1: -	u8 inst_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 type;
1: +  u8 inst_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_del_nan_func {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 instance_id;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 instance_id;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_start_tx_ba_session {
1: -	struct trace_entry ent;
1: -	char sta_addr[6];
1: -	u16 tid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char sta_addr[6];
1: +  u16 tid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_start_tx_ba_cb {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 ra[6];
1: -	u16 tid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 ra[6];
1: +  u16 tid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_stop_tx_ba_session {
1: -	struct trace_entry ent;
1: -	char sta_addr[6];
1: -	u16 tid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char sta_addr[6];
1: +  u16 tid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_stop_tx_ba_cb {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 ra[6];
1: -	u16 tid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 ra[6];
1: +  u16 tid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_beacon_loss {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_connection_loss {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_cqm_rssi_notify {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 rssi_event;
1: -	s32 rssi_level;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 rssi_event;
1: +  s32 rssi_level;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_scan_completed {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	bool aborted;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  bool aborted;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_sched_scan_results {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_sched_scan_stopped {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_sta_block_awake {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char sta_addr[6];
1: -	bool block;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char sta_addr[6];
1: +  bool block;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_chswitch_done {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	bool success;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  bool success;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_gtk_rekey_notify {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 bssid[6];
1: -	u8 replay_ctr[8];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 bssid[6];
1: +  u8 replay_ctr[8];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_enable_rssi_reports {
1: -	struct trace_entry ent;
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	int rssi_min_thold;
1: -	int rssi_max_thold;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  int rssi_min_thold;
1: +  int rssi_max_thold;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_eosp {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char sta_addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char sta_addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_send_eosp_nullfunc {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char sta_addr[6];
1: -	u8 tid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char sta_addr[6];
1: +  u8 tid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_sta_set_buffered {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char sta_addr[6];
1: -	u8 tid;
1: -	bool buffered;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char sta_addr[6];
1: +  u8 tid;
1: +  bool buffered;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_wake_queue {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u16 queue;
1: -	u32 reason;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u16 queue;
1: +  u32 reason;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_stop_queue {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	u16 queue;
1: -	u32 reason;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  u16 queue;
1: +  u32 reason;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_set_default_unicast_key {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	int key_idx;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  int key_idx;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_api_radar_detected {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_channel_switch_beacon {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_pre_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u64 timestamp;
1: -	u32 device_timestamp;
1: -	bool block_tx;
1: -	u8 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u64 timestamp;
1: +  u32 device_timestamp;
1: +  bool block_tx;
1: +  u8 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_channel_switch_rx_beacon {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u64 timestamp;
1: -	u32 device_timestamp;
1: -	bool block_tx;
1: -	u8 count;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u64 timestamp;
1: +  u32 device_timestamp;
1: +  bool block_tx;
1: +  u8 count;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_txpower {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	int dbm;
1: -	int ret;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  int dbm;
1: +  int ret;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_tdls_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u8 oper_class;
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u8 oper_class;
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_tdls_cancel_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_tdls_recv_channel_switch {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	u8 action_code;
1: -	char sta_addr[6];
1: -	u32 control_freq;
1: -	u32 freq_offset;
1: -	u32 chan_width;
1: -	u32 center_freq1;
1: -	u32 freq1_offset;
1: -	u32 center_freq2;
1: -	u32 status;
1: -	bool peer_initiator;
1: -	u32 timestamp;
1: -	u16 switch_time;
1: -	u16 switch_timeout;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  u8 action_code;
1: +  char sta_addr[6];
1: +  u32 control_freq;
1: +  u32 freq_offset;
1: +  u32 chan_width;
1: +  u32 center_freq1;
1: +  u32 freq1_offset;
1: +  u32 center_freq2;
1: +  u32 status;
1: +  bool peer_initiator;
1: +  u32 timestamp;
1: +  u16 switch_time;
1: +  u16 switch_timeout;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_wake_tx_queue {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	u8 ac;
1: -	u8 tid;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  u8 ac;
1: +  u8 tid;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_get_ftm_responder_stats {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_drv_sta_set_4addr {
1: -	struct trace_entry ent;
1: -	char wiphy_name[32];
1: -	enum nl80211_iftype vif_type;
1: -	void *sdata;
1: -	bool p2p;
1: -	u32 __data_loc_vif_name;
1: -	char sta_addr[6];
1: -	bool enabled;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  char wiphy_name[32];
1: +  enum nl80211_iftype vif_type;
1: +  void *sdata;
1: +  bool p2p;
1: +  u32 __data_loc_vif_name;
1: +  char sta_addr[6];
1: +  bool enabled;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_local_only_evt {};
1:  
1:  struct trace_event_data_offsets_local_sdata_addr_evt {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_local_u32_evt {};
1:  
1:  struct trace_event_data_offsets_local_sdata_evt {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_return_int {};
1: @@ -136444,15 +138319,15 @@ struct trace_event_data_offsets_drv_return_u64 {};
1:  struct trace_event_data_offsets_drv_set_wakeup {};
1:  
1:  struct trace_event_data_offsets_drv_change_interface {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_config {};
1:  
1:  struct trace_event_data_offsets_drv_bss_info_changed {
1: -	u32 vif_name;
1: -	u32 arp_addr_list;
1: -	u32 ssid;
1: +  u32 vif_name;
1: +  u32 arp_addr_list;
1: +  u32 ssid;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_prepare_multicast {};
1: @@ -136460,21 +138335,21 @@ struct trace_event_data_offsets_drv_prepare_multicast {};
1:  struct trace_event_data_offsets_drv_configure_filter {};
1:  
1:  struct trace_event_data_offsets_drv_config_iface_filter {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_set_tim {};
1:  
1:  struct trace_event_data_offsets_drv_set_key {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_update_tkip_key {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_sw_scan_start {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_get_stats {};
1: @@ -136484,39 +138359,39 @@ struct trace_event_data_offsets_drv_get_key_seq {};
1:  struct trace_event_data_offsets_drv_set_coverage_class {};
1:  
1:  struct trace_event_data_offsets_drv_sta_notify {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_sta_state {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_sta_set_txpwr {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_sta_rc_update {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_sta_event {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_conf_tx {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_set_tsf {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_offset_tsf {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_ampdu_action {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_get_survey {};
1: @@ -136524,7 +138399,7 @@ struct trace_event_data_offsets_drv_get_survey {};
1:  struct trace_event_data_offsets_drv_flush {};
1:  
1:  struct trace_event_data_offsets_drv_channel_switch {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_set_antenna {};
1: @@ -136532,7 +138407,7 @@ struct trace_event_data_offsets_drv_set_antenna {};
1:  struct trace_event_data_offsets_drv_get_antenna {};
1:  
1:  struct trace_event_data_offsets_drv_remain_on_channel {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_set_ringparam {};
1: @@ -136540,21 +138415,21 @@ struct trace_event_data_offsets_drv_set_ringparam {};
1:  struct trace_event_data_offsets_drv_get_ringparam {};
1:  
1:  struct trace_event_data_offsets_drv_set_bitrate_mask {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_set_rekey_data {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_event_callback {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_release_evt {};
1:  
1:  struct trace_event_data_offsets_drv_mgd_prepare_tx {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_local_chanctx {};
1: @@ -136562,69 +138437,69 @@ struct trace_event_data_offsets_local_chanctx {};
1:  struct trace_event_data_offsets_drv_change_chanctx {};
1:  
1:  struct trace_event_data_offsets_drv_switch_vif_chanctx {
1: -	u32 vifs;
1: +  u32 vifs;
1:  };
1:  
1:  struct trace_event_data_offsets_local_sdata_chanctx {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_start_ap {
1: -	u32 vif_name;
1: -	u32 ssid;
1: +  u32 vif_name;
1: +  u32 ssid;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_reconfig_complete {};
1:  
1:  struct trace_event_data_offsets_drv_join_ibss {
1: -	u32 vif_name;
1: -	u32 ssid;
1: +  u32 vif_name;
1: +  u32 ssid;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_get_expected_throughput {};
1:  
1:  struct trace_event_data_offsets_drv_start_nan {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_stop_nan {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_nan_change_conf {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_add_nan_func {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_del_nan_func {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_start_tx_ba_session {};
1:  
1:  struct trace_event_data_offsets_api_start_tx_ba_cb {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_stop_tx_ba_session {};
1:  
1:  struct trace_event_data_offsets_api_stop_tx_ba_cb {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_beacon_loss {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_connection_loss {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_cqm_rssi_notify {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_scan_completed {};
1: @@ -136636,15 +138511,15 @@ struct trace_event_data_offsets_api_sched_scan_stopped {};
1:  struct trace_event_data_offsets_api_sta_block_awake {};
1:  
1:  struct trace_event_data_offsets_api_chswitch_done {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_gtk_rekey_notify {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_enable_rssi_reports {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_eosp {};
1: @@ -136658,56 +138533,57 @@ struct trace_event_data_offsets_wake_queue {};
1:  struct trace_event_data_offsets_stop_queue {};
1:  
1:  struct trace_event_data_offsets_drv_set_default_unicast_key {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_api_radar_detected {};
1:  
1:  struct trace_event_data_offsets_drv_channel_switch_beacon {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_pre_channel_switch {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_channel_switch_rx_beacon {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_get_txpower {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_tdls_channel_switch {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_tdls_cancel_channel_switch {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_tdls_recv_channel_switch {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_wake_tx_queue {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_get_ftm_responder_stats {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  struct trace_event_data_offsets_drv_sta_set_4addr {
1: -	u32 vif_name;
1: +  u32 vif_name;
1:  };
1:  
1:  typedef void (*btf_trace_drv_return_void)(void *, struct ieee80211_local *);
1:  
1:  typedef void (*btf_trace_drv_return_int)(void *, struct ieee80211_local *, int);
1:  
1: -typedef void (*btf_trace_drv_return_bool)(void *, struct ieee80211_local *, bool);
1: +typedef void (*btf_trace_drv_return_bool)(void *, struct ieee80211_local *,
1: +                                          bool);
1:  
1:  typedef void (*btf_trace_drv_return_u32)(void *, struct ieee80211_local *, u32);
1:  
1: @@ -136715,9 +138591,11 @@ typedef void (*btf_trace_drv_return_u64)(void *, struct ieee80211_local *, u64);
1:  
1:  typedef void (*btf_trace_drv_start)(void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_get_et_strings)(void *, struct ieee80211_local *, u32);
1: +typedef void (*btf_trace_drv_get_et_strings)(void *, struct ieee80211_local *,
1: +                                             u32);
1:  
1: -typedef void (*btf_trace_drv_get_et_sset_count)(void *, struct ieee80211_local *, u32);
1: +typedef void (*btf_trace_drv_get_et_sset_count)(void *,
1: +                                                struct ieee80211_local *, u32);
1:  
1:  typedef void (*btf_trace_drv_get_et_stats)(void *, struct ieee80211_local *);
1:  
1: @@ -136725,606 +138603,781 @@ typedef void (*btf_trace_drv_suspend)(void *, struct ieee80211_local *);
1:  
1:  typedef void (*btf_trace_drv_resume)(void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_set_wakeup)(void *, struct ieee80211_local *, bool);
1: +typedef void (*btf_trace_drv_set_wakeup)(void *, struct ieee80211_local *,
1: +                                         bool);
1:  
1:  typedef void (*btf_trace_drv_stop)(void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_add_interface)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_add_interface)(void *, struct ieee80211_local *,
1: +                                            struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_change_interface)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, enum nl80211_iftype, bool);
1: +typedef void (*btf_trace_drv_change_interface)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sub_if_data *,
1: +                                               enum nl80211_iftype, bool);
1:  
1: -typedef void (*btf_trace_drv_remove_interface)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_remove_interface)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sub_if_data *);
1:  
1:  typedef void (*btf_trace_drv_config)(void *, struct ieee80211_local *, u32);
1:  
1: -typedef void (*btf_trace_drv_bss_info_changed)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_bss_conf *, u32);
1: +typedef void (*btf_trace_drv_bss_info_changed)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sub_if_data *,
1: +                                               struct ieee80211_bss_conf *,
1: +                                               u32);
1:  
1: -typedef void (*btf_trace_drv_prepare_multicast)(void *, struct ieee80211_local *, int);
1: +typedef void (*btf_trace_drv_prepare_multicast)(void *,
1: +                                                struct ieee80211_local *, int);
1:  
1: -typedef void (*btf_trace_drv_configure_filter)(void *, struct ieee80211_local *, unsigned int, unsigned int *, u64);
1: +typedef void (*btf_trace_drv_configure_filter)(void *, struct ieee80211_local *,
1: +                                               unsigned int, unsigned int *,
1: +                                               u64);
1:  
1: -typedef void (*btf_trace_drv_config_iface_filter)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, unsigned int, unsigned int);
1: +typedef void (*btf_trace_drv_config_iface_filter)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    unsigned int, unsigned int);
1:  
1: -typedef void (*btf_trace_drv_set_tim)(void *, struct ieee80211_local *, struct ieee80211_sta *, bool);
1: +typedef void (*btf_trace_drv_set_tim)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sta *, bool);
1:  
1: -typedef void (*btf_trace_drv_set_key)(void *, struct ieee80211_local *, enum set_key_cmd, struct ieee80211_sub_if_data *, struct ieee80211_sta *, struct ieee80211_key_conf *);
1: +typedef void (*btf_trace_drv_set_key)(void *, struct ieee80211_local *,
1: +                                      enum set_key_cmd,
1: +                                      struct ieee80211_sub_if_data *,
1: +                                      struct ieee80211_sta *,
1: +                                      struct ieee80211_key_conf *);
1:  
1: -typedef void (*btf_trace_drv_update_tkip_key)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_key_conf *, struct ieee80211_sta *, u32);
1: +typedef void (*btf_trace_drv_update_tkip_key)(void *, struct ieee80211_local *,
1: +                                              struct ieee80211_sub_if_data *,
1: +                                              struct ieee80211_key_conf *,
1: +                                              struct ieee80211_sta *, u32);
1:  
1: -typedef void (*btf_trace_drv_hw_scan)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_hw_scan)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_cancel_hw_scan)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_cancel_hw_scan)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_sched_scan_start)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_sched_scan_start)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_sched_scan_stop)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_sched_scan_stop)(void *, struct ieee80211_local *,
1: +                                              struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_sw_scan_start)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, const u8 *);
1: +typedef void (*btf_trace_drv_sw_scan_start)(void *, struct ieee80211_local *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            const u8 *);
1:  
1: -typedef void (*btf_trace_drv_sw_scan_complete)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_sw_scan_complete)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_get_stats)(void *, struct ieee80211_local *, struct ieee80211_low_level_stats *, int);
1: +typedef void (*btf_trace_drv_get_stats)(void *, struct ieee80211_local *,
1: +                                        struct ieee80211_low_level_stats *,
1: +                                        int);
1:  
1: -typedef void (*btf_trace_drv_get_key_seq)(void *, struct ieee80211_local *, struct ieee80211_key_conf *);
1: +typedef void (*btf_trace_drv_get_key_seq)(void *, struct ieee80211_local *,
1: +                                          struct ieee80211_key_conf *);
1:  
1: -typedef void (*btf_trace_drv_set_frag_threshold)(void *, struct ieee80211_local *, u32);
1: +typedef void (*btf_trace_drv_set_frag_threshold)(void *,
1: +                                                 struct ieee80211_local *, u32);
1:  
1: -typedef void (*btf_trace_drv_set_rts_threshold)(void *, struct ieee80211_local *, u32);
1: +typedef void (*btf_trace_drv_set_rts_threshold)(void *,
1: +                                                struct ieee80211_local *, u32);
1:  
1: -typedef void (*btf_trace_drv_set_coverage_class)(void *, struct ieee80211_local *, s16);
1: +typedef void (*btf_trace_drv_set_coverage_class)(void *,
1: +                                                 struct ieee80211_local *, s16);
1:  
1: -typedef void (*btf_trace_drv_sta_notify)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, enum sta_notify_cmd, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_notify)(void *, struct ieee80211_local *,
1: +                                         struct ieee80211_sub_if_data *,
1: +                                         enum sta_notify_cmd,
1: +                                         struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sta_state)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *, enum ieee80211_sta_state, enum ieee80211_sta_state);
1: +typedef void (*btf_trace_drv_sta_state)(void *, struct ieee80211_local *,
1: +                                        struct ieee80211_sub_if_data *,
1: +                                        struct ieee80211_sta *,
1: +                                        enum ieee80211_sta_state,
1: +                                        enum ieee80211_sta_state);
1:  
1: -typedef void (*btf_trace_drv_sta_set_txpwr)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_set_txpwr)(void *, struct ieee80211_local *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sta_rc_update)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *, u32);
1: +typedef void (*btf_trace_drv_sta_rc_update)(void *, struct ieee80211_local *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            struct ieee80211_sta *, u32);
1:  
1: -typedef void (*btf_trace_drv_sta_statistics)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_statistics)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sta_add)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_add)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sub_if_data *,
1: +                                      struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sta_remove)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_remove)(void *, struct ieee80211_local *,
1: +                                         struct ieee80211_sub_if_data *,
1: +                                         struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sta_pre_rcu_remove)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_pre_rcu_remove)(void *,
1: +                                                 struct ieee80211_local *,
1: +                                                 struct ieee80211_sub_if_data *,
1: +                                                 struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sync_rx_queues)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sync_rx_queues)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_sta_rate_tbl_update)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_sta_rate_tbl_update)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_conf_tx)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, u16, const struct ieee80211_tx_queue_params *);
1: +typedef void (*btf_trace_drv_conf_tx)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sub_if_data *, u16,
1: +                                      const struct ieee80211_tx_queue_params *);
1:  
1: -typedef void (*btf_trace_drv_get_tsf)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_get_tsf)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_set_tsf)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, u64);
1: +typedef void (*btf_trace_drv_set_tsf)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sub_if_data *, u64);
1:  
1: -typedef void (*btf_trace_drv_offset_tsf)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, s64);
1: +typedef void (*btf_trace_drv_offset_tsf)(void *, struct ieee80211_local *,
1: +                                         struct ieee80211_sub_if_data *, s64);
1:  
1: -typedef void (*btf_trace_drv_reset_tsf)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_reset_tsf)(void *, struct ieee80211_local *,
1: +                                        struct ieee80211_sub_if_data *);
1:  
1:  typedef void (*btf_trace_drv_tx_last_beacon)(void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_ampdu_action)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_ampdu_params *);
1: +typedef void (*btf_trace_drv_ampdu_action)(void *, struct ieee80211_local *,
1: +                                           struct ieee80211_sub_if_data *,
1: +                                           struct ieee80211_ampdu_params *);
1:  
1: -typedef void (*btf_trace_drv_get_survey)(void *, struct ieee80211_local *, int, struct survey_info *);
1: +typedef void (*btf_trace_drv_get_survey)(void *, struct ieee80211_local *, int,
1: +                                         struct survey_info *);
1:  
1: -typedef void (*btf_trace_drv_flush)(void *, struct ieee80211_local *, u32, bool);
1: +typedef void (*btf_trace_drv_flush)(void *, struct ieee80211_local *, u32,
1: +                                    bool);
1:  
1: -typedef void (*btf_trace_drv_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_channel_switch *);
1: +typedef void (*btf_trace_drv_channel_switch)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             struct ieee80211_channel_switch *);
1:  
1: -typedef void (*btf_trace_drv_set_antenna)(void *, struct ieee80211_local *, u32, u32, int);
1: +typedef void (*btf_trace_drv_set_antenna)(void *, struct ieee80211_local *, u32,
1: +                                          u32, int);
1:  
1: -typedef void (*btf_trace_drv_get_antenna)(void *, struct ieee80211_local *, u32, u32, int);
1: +typedef void (*btf_trace_drv_get_antenna)(void *, struct ieee80211_local *, u32,
1: +                                          u32, int);
1:  
1: -typedef void (*btf_trace_drv_remain_on_channel)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_channel *, unsigned int, enum ieee80211_roc_type);
1: +typedef void (*btf_trace_drv_remain_on_channel)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_channel *, unsigned int, enum ieee80211_roc_type);
1:  
1: -typedef void (*btf_trace_drv_cancel_remain_on_channel)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_cancel_remain_on_channel)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_set_ringparam)(void *, struct ieee80211_local *, u32, u32);
1: +typedef void (*btf_trace_drv_set_ringparam)(void *, struct ieee80211_local *,
1: +                                            u32, u32);
1:  
1: -typedef void (*btf_trace_drv_get_ringparam)(void *, struct ieee80211_local *, u32 *, u32 *, u32 *, u32 *);
1: +typedef void (*btf_trace_drv_get_ringparam)(void *, struct ieee80211_local *,
1: +                                            u32 *, u32 *, u32 *, u32 *);
1:  
1: -typedef void (*btf_trace_drv_tx_frames_pending)(void *, struct ieee80211_local *);
1: +typedef void (*btf_trace_drv_tx_frames_pending)(void *,
1: +                                                struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_offchannel_tx_cancel_wait)(void *, struct ieee80211_local *);
1: +typedef void (*btf_trace_drv_offchannel_tx_cancel_wait)(
1: +    void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_set_bitrate_mask)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, const struct cfg80211_bitrate_mask *);
1: +typedef void (*btf_trace_drv_set_bitrate_mask)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    const struct cfg80211_bitrate_mask *);
1:  
1: -typedef void (*btf_trace_drv_set_rekey_data)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct cfg80211_gtk_rekey_data *);
1: +typedef void (*btf_trace_drv_set_rekey_data)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             struct cfg80211_gtk_rekey_data *);
1:  
1: -typedef void (*btf_trace_drv_event_callback)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, const struct ieee80211_event *);
1: +typedef void (*btf_trace_drv_event_callback)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             const struct ieee80211_event *);
1:  
1: -typedef void (*btf_trace_drv_release_buffered_frames)(void *, struct ieee80211_local *, struct ieee80211_sta *, u16, int, enum ieee80211_frame_release_type, bool);
1: +typedef void (*btf_trace_drv_release_buffered_frames)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sta *, u16, int,
1: +    enum ieee80211_frame_release_type, bool);
1:  
1: -typedef void (*btf_trace_drv_allow_buffered_frames)(void *, struct ieee80211_local *, struct ieee80211_sta *, u16, int, enum ieee80211_frame_release_type, bool);
1: +typedef void (*btf_trace_drv_allow_buffered_frames)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sta *, u16, int,
1: +    enum ieee80211_frame_release_type, bool);
1:  
1: -typedef void (*btf_trace_drv_mgd_prepare_tx)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, u16);
1: +typedef void (*btf_trace_drv_mgd_prepare_tx)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             u16);
1:  
1: -typedef void (*btf_trace_drv_mgd_protect_tdls_discover)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_mgd_protect_tdls_discover)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_add_chanctx)(void *, struct ieee80211_local *, struct ieee80211_chanctx *);
1: +typedef void (*btf_trace_drv_add_chanctx)(void *, struct ieee80211_local *,
1: +                                          struct ieee80211_chanctx *);
1:  
1: -typedef void (*btf_trace_drv_remove_chanctx)(void *, struct ieee80211_local *, struct ieee80211_chanctx *);
1: +typedef void (*btf_trace_drv_remove_chanctx)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_chanctx *);
1:  
1: -typedef void (*btf_trace_drv_change_chanctx)(void *, struct ieee80211_local *, struct ieee80211_chanctx *, u32);
1: +typedef void (*btf_trace_drv_change_chanctx)(void *, struct ieee80211_local *,
1: +                                             struct ieee80211_chanctx *, u32);
1:  
1: -typedef void (*btf_trace_drv_switch_vif_chanctx)(void *, struct ieee80211_local *, struct ieee80211_vif_chanctx_switch *, int, enum ieee80211_chanctx_switch_mode);
1: +typedef void (*btf_trace_drv_switch_vif_chanctx)(
1: +    void *, struct ieee80211_local *, struct ieee80211_vif_chanctx_switch *,
1: +    int, enum ieee80211_chanctx_switch_mode);
1:  
1: -typedef void (*btf_trace_drv_assign_vif_chanctx)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_chanctx *);
1: +typedef void (*btf_trace_drv_assign_vif_chanctx)(void *,
1: +                                                 struct ieee80211_local *,
1: +                                                 struct ieee80211_sub_if_data *,
1: +                                                 struct ieee80211_chanctx *);
1:  
1: -typedef void (*btf_trace_drv_unassign_vif_chanctx)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_chanctx *);
1: +typedef void (*btf_trace_drv_unassign_vif_chanctx)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_chanctx *);
1:  
1: -typedef void (*btf_trace_drv_start_ap)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_bss_conf *);
1: +typedef void (*btf_trace_drv_start_ap)(void *, struct ieee80211_local *,
1: +                                       struct ieee80211_sub_if_data *,
1: +                                       struct ieee80211_bss_conf *);
1:  
1: -typedef void (*btf_trace_drv_stop_ap)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_stop_ap)(void *, struct ieee80211_local *,
1: +                                      struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_reconfig_complete)(void *, struct ieee80211_local *, enum ieee80211_reconfig_type);
1: +typedef void (*btf_trace_drv_reconfig_complete)(void *,
1: +                                                struct ieee80211_local *,
1: +                                                enum ieee80211_reconfig_type);
1:  
1: -typedef void (*btf_trace_drv_ipv6_addr_change)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_ipv6_addr_change)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_join_ibss)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_bss_conf *);
1: +typedef void (*btf_trace_drv_join_ibss)(void *, struct ieee80211_local *,
1: +                                        struct ieee80211_sub_if_data *,
1: +                                        struct ieee80211_bss_conf *);
1:  
1: -typedef void (*btf_trace_drv_leave_ibss)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_leave_ibss)(void *, struct ieee80211_local *,
1: +                                         struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_get_expected_throughput)(void *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_get_expected_throughput)(void *,
1: +                                                      struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_start_nan)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct cfg80211_nan_conf *);
1: +typedef void (*btf_trace_drv_start_nan)(void *, struct ieee80211_local *,
1: +                                        struct ieee80211_sub_if_data *,
1: +                                        struct cfg80211_nan_conf *);
1:  
1: -typedef void (*btf_trace_drv_stop_nan)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_stop_nan)(void *, struct ieee80211_local *,
1: +                                       struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_nan_change_conf)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct cfg80211_nan_conf *, u32);
1: +typedef void (*btf_trace_drv_nan_change_conf)(void *, struct ieee80211_local *,
1: +                                              struct ieee80211_sub_if_data *,
1: +                                              struct cfg80211_nan_conf *, u32);
1:  
1: -typedef void (*btf_trace_drv_add_nan_func)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, const struct cfg80211_nan_func *);
1: +typedef void (*btf_trace_drv_add_nan_func)(void *, struct ieee80211_local *,
1: +                                           struct ieee80211_sub_if_data *,
1: +                                           const struct cfg80211_nan_func *);
1:  
1: -typedef void (*btf_trace_drv_del_nan_func)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, u8);
1: +typedef void (*btf_trace_drv_del_nan_func)(void *, struct ieee80211_local *,
1: +                                           struct ieee80211_sub_if_data *, u8);
1:  
1: -typedef void (*btf_trace_drv_start_pmsr)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_start_pmsr)(void *, struct ieee80211_local *,
1: +                                         struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_abort_pmsr)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_abort_pmsr)(void *, struct ieee80211_local *,
1: +                                         struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_api_start_tx_ba_session)(void *, struct ieee80211_sta *, u16);
1: +typedef void (*btf_trace_api_start_tx_ba_session)(void *,
1: +                                                  struct ieee80211_sta *, u16);
1:  
1: -typedef void (*btf_trace_api_start_tx_ba_cb)(void *, struct ieee80211_sub_if_data *, const u8 *, u16);
1: +typedef void (*btf_trace_api_start_tx_ba_cb)(void *,
1: +                                             struct ieee80211_sub_if_data *,
1: +                                             const u8 *, u16);
1:  
1: -typedef void (*btf_trace_api_stop_tx_ba_session)(void *, struct ieee80211_sta *, u16);
1: +typedef void (*btf_trace_api_stop_tx_ba_session)(void *, struct ieee80211_sta *,
1: +                                                 u16);
1:  
1: -typedef void (*btf_trace_api_stop_tx_ba_cb)(void *, struct ieee80211_sub_if_data *, const u8 *, u16);
1: +typedef void (*btf_trace_api_stop_tx_ba_cb)(void *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            const u8 *, u16);
1:  
1:  typedef void (*btf_trace_api_restart_hw)(void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_api_beacon_loss)(void *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_api_beacon_loss)(void *,
1: +                                          struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_api_connection_loss)(void *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_api_connection_loss)(void *,
1: +                                              struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_api_cqm_rssi_notify)(void *, struct ieee80211_sub_if_data *, enum nl80211_cqm_rssi_threshold_event, s32);
1: +typedef void (*btf_trace_api_cqm_rssi_notify)(
1: +    void *, struct ieee80211_sub_if_data *,
1: +    enum nl80211_cqm_rssi_threshold_event, s32);
1:  
1: -typedef void (*btf_trace_api_cqm_beacon_loss_notify)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_api_cqm_beacon_loss_notify)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_api_scan_completed)(void *, struct ieee80211_local *, bool);
1: +typedef void (*btf_trace_api_scan_completed)(void *, struct ieee80211_local *,
1: +                                             bool);
1:  
1: -typedef void (*btf_trace_api_sched_scan_results)(void *, struct ieee80211_local *);
1: +typedef void (*btf_trace_api_sched_scan_results)(void *,
1: +                                                 struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_api_sched_scan_stopped)(void *, struct ieee80211_local *);
1: +typedef void (*btf_trace_api_sched_scan_stopped)(void *,
1: +                                                 struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_api_sta_block_awake)(void *, struct ieee80211_local *, struct ieee80211_sta *, bool);
1: +typedef void (*btf_trace_api_sta_block_awake)(void *, struct ieee80211_local *,
1: +                                              struct ieee80211_sta *, bool);
1:  
1: -typedef void (*btf_trace_api_chswitch_done)(void *, struct ieee80211_sub_if_data *, bool);
1: +typedef void (*btf_trace_api_chswitch_done)(void *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            bool);
1:  
1: -typedef void (*btf_trace_api_ready_on_channel)(void *, struct ieee80211_local *);
1: +typedef void (*btf_trace_api_ready_on_channel)(void *,
1: +                                               struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_api_remain_on_channel_expired)(void *, struct ieee80211_local *);
1: +typedef void (*btf_trace_api_remain_on_channel_expired)(
1: +    void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_api_gtk_rekey_notify)(void *, struct ieee80211_sub_if_data *, const u8 *, const u8 *);
1: +typedef void (*btf_trace_api_gtk_rekey_notify)(void *,
1: +                                               struct ieee80211_sub_if_data *,
1: +                                               const u8 *, const u8 *);
1:  
1: -typedef void (*btf_trace_api_enable_rssi_reports)(void *, struct ieee80211_sub_if_data *, int, int);
1: +typedef void (*btf_trace_api_enable_rssi_reports)(
1: +    void *, struct ieee80211_sub_if_data *, int, int);
1:  
1: -typedef void (*btf_trace_api_eosp)(void *, struct ieee80211_local *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_api_eosp)(void *, struct ieee80211_local *,
1: +                                   struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_api_send_eosp_nullfunc)(void *, struct ieee80211_local *, struct ieee80211_sta *, u8);
1: +typedef void (*btf_trace_api_send_eosp_nullfunc)(void *,
1: +                                                 struct ieee80211_local *,
1: +                                                 struct ieee80211_sta *, u8);
1:  
1: -typedef void (*btf_trace_api_sta_set_buffered)(void *, struct ieee80211_local *, struct ieee80211_sta *, u8, bool);
1: +typedef void (*btf_trace_api_sta_set_buffered)(void *, struct ieee80211_local *,
1: +                                               struct ieee80211_sta *, u8,
1: +                                               bool);
1:  
1: -typedef void (*btf_trace_wake_queue)(void *, struct ieee80211_local *, u16, enum queue_stop_reason);
1: +typedef void (*btf_trace_wake_queue)(void *, struct ieee80211_local *, u16,
1: +                                     enum queue_stop_reason);
1:  
1: -typedef void (*btf_trace_stop_queue)(void *, struct ieee80211_local *, u16, enum queue_stop_reason);
1: +typedef void (*btf_trace_stop_queue)(void *, struct ieee80211_local *, u16,
1: +                                     enum queue_stop_reason);
1:  
1: -typedef void (*btf_trace_drv_set_default_unicast_key)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, int);
1: +typedef void (*btf_trace_drv_set_default_unicast_key)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, int);
1:  
1:  typedef void (*btf_trace_api_radar_detected)(void *, struct ieee80211_local *);
1:  
1: -typedef void (*btf_trace_drv_channel_switch_beacon)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_drv_channel_switch_beacon)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_drv_pre_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_channel_switch *);
1: +typedef void (*btf_trace_drv_pre_channel_switch)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_channel_switch *);
1:  
1: -typedef void (*btf_trace_drv_post_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_post_channel_switch)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_abort_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_abort_channel_switch)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_channel_switch_rx_beacon)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_channel_switch *);
1: +typedef void (*btf_trace_drv_channel_switch_rx_beacon)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_channel_switch *);
1:  
1: -typedef void (*btf_trace_drv_get_txpower)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, int, int);
1: +typedef void (*btf_trace_drv_get_txpower)(void *, struct ieee80211_local *,
1: +                                          struct ieee80211_sub_if_data *, int,
1: +                                          int);
1:  
1: -typedef void (*btf_trace_drv_tdls_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *, u8, struct cfg80211_chan_def *);
1: +typedef void (*btf_trace_drv_tdls_channel_switch)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_sta *, u8, struct cfg80211_chan_def *);
1:  
1: -typedef void (*btf_trace_drv_tdls_cancel_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *);
1: +typedef void (*btf_trace_drv_tdls_cancel_channel_switch)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_sta *);
1:  
1: -typedef void (*btf_trace_drv_tdls_recv_channel_switch)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_tdls_ch_sw_params *);
1: +typedef void (*btf_trace_drv_tdls_recv_channel_switch)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct ieee80211_tdls_ch_sw_params *);
1:  
1: -typedef void (*btf_trace_drv_wake_tx_queue)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct txq_info *);
1: +typedef void (*btf_trace_drv_wake_tx_queue)(void *, struct ieee80211_local *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            struct txq_info *);
1:  
1: -typedef void (*btf_trace_drv_get_ftm_responder_stats)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct cfg80211_ftm_responder_stats *);
1: +typedef void (*btf_trace_drv_get_ftm_responder_stats)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *,
1: +    struct cfg80211_ftm_responder_stats *);
1:  
1: -typedef void (*btf_trace_drv_update_vif_offload)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1: +typedef void (*btf_trace_drv_update_vif_offload)(
1: +    void *, struct ieee80211_local *, struct ieee80211_sub_if_data *);
1:  
1: -typedef void (*btf_trace_drv_sta_set_4addr)(void *, struct ieee80211_local *, struct ieee80211_sub_if_data *, struct ieee80211_sta *, bool);
1: +typedef void (*btf_trace_drv_sta_set_4addr)(void *, struct ieee80211_local *,
1: +                                            struct ieee80211_sub_if_data *,
1: +                                            struct ieee80211_sta *, bool);
1:  
1:  struct ieee80211_country_ie_triplet {
1: -	union {
1: -		struct {
1: -			u8 first_channel;
1: -			u8 num_channels;
1: -			s8 max_power;
1: -		} chans;
1: -		struct {
1: -			u8 reg_extension_id;
1: -			u8 reg_class;
1: -			u8 coverage_class;
1: -		} ext;
1: -	};
1: +  union {
1: +    struct {
1: +      u8 first_channel;
1: +      u8 num_channels;
1: +      s8 max_power;
1: +    } chans;
1: +    struct {
1: +      u8 reg_extension_id;
1: +      u8 reg_class;
1: +      u8 coverage_class;
1: +    } ext;
1: +  };
1:  };
1:  
1:  enum ieee80211_timeout_interval_type {
1: -	WLAN_TIMEOUT_REASSOC_DEADLINE = 1,
1: -	WLAN_TIMEOUT_KEY_LIFETIME = 2,
1: -	WLAN_TIMEOUT_ASSOC_COMEBACK = 3,
1: +  WLAN_TIMEOUT_REASSOC_DEADLINE = 1,
1: +  WLAN_TIMEOUT_KEY_LIFETIME = 2,
1: +  WLAN_TIMEOUT_ASSOC_COMEBACK = 3,
1:  };
1:  
1:  enum ieee80211_idle_options {
1: -	WLAN_IDLE_OPTIONS_PROTECTED_KEEP_ALIVE = 1,
1: +  WLAN_IDLE_OPTIONS_PROTECTED_KEEP_ALIVE = 1,
1:  };
1:  
1:  struct ieee80211_wmm_ac_param {
1: -	u8 aci_aifsn;
1: -	u8 cw;
1: -	__le16 txop_limit;
1: +  u8 aci_aifsn;
1: +  u8 cw;
1: +  __le16 txop_limit;
1:  };
1:  
1:  struct ieee80211_wmm_param_ie {
1: -	u8 element_id;
1: -	u8 len;
1: -	u8 oui[3];
1: -	u8 oui_type;
1: -	u8 oui_subtype;
1: -	u8 version;
1: -	u8 qos_info;
1: -	u8 reserved;
1: -	struct ieee80211_wmm_ac_param ac[4];
1: +  u8 element_id;
1: +  u8 len;
1: +  u8 oui[3];
1: +  u8 oui_type;
1: +  u8 oui_subtype;
1: +  u8 version;
1: +  u8 qos_info;
1: +  u8 reserved;
1: +  struct ieee80211_wmm_ac_param ac[4];
1:  };
1:  
1:  enum ocb_deferred_task_flags {
1: -	OCB_WORK_HOUSEKEEPING = 0,
1: +  OCB_WORK_HOUSEKEEPING = 0,
1:  };
1:  
1:  struct mcs_group {
1: -	u8 shift;
1: -	u16 duration[12];
1: +  u8 shift;
1: +  u16 duration[12];
1:  };
1:  
1:  struct netlbl_af4list {
1: -	__be32 addr;
1: -	__be32 mask;
1: -	u32 valid;
1: -	struct list_head list;
1: +  __be32 addr;
1: +  __be32 mask;
1: +  u32 valid;
1: +  struct list_head list;
1:  };
1:  
1:  struct netlbl_af6list {
1: -	struct in6_addr addr;
1: -	struct in6_addr mask;
1: -	u32 valid;
1: -	struct list_head list;
1: +  struct in6_addr addr;
1: +  struct in6_addr mask;
1: +  u32 valid;
1: +  struct list_head list;
1:  };
1:  
1:  struct netlbl_domaddr_map {
1: -	struct list_head list4;
1: -	struct list_head list6;
1: +  struct list_head list4;
1: +  struct list_head list6;
1:  };
1:  
1:  struct netlbl_dommap_def {
1: -	u32 type;
1: -	union {
1: -		struct netlbl_domaddr_map *addrsel;
1: -		struct cipso_v4_doi *cipso;
1: -		struct calipso_doi *calipso;
1: -	};
1: +  u32 type;
1: +  union {
1: +    struct netlbl_domaddr_map *addrsel;
1: +    struct cipso_v4_doi *cipso;
1: +    struct calipso_doi *calipso;
1: +  };
1:  };
1:  
1:  struct netlbl_domaddr4_map {
1: -	struct netlbl_dommap_def def;
1: -	struct netlbl_af4list list;
1: +  struct netlbl_dommap_def def;
1: +  struct netlbl_af4list list;
1:  };
1:  
1:  struct netlbl_domaddr6_map {
1: -	struct netlbl_dommap_def def;
1: -	struct netlbl_af6list list;
1: +  struct netlbl_dommap_def def;
1: +  struct netlbl_af6list list;
1:  };
1:  
1:  struct netlbl_dom_map {
1: -	char *domain;
1: -	u16 family;
1: -	struct netlbl_dommap_def def;
1: -	u32 valid;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  char *domain;
1: +  u16 family;
1: +  struct netlbl_dommap_def def;
1: +  u32 valid;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netlbl_domhsh_tbl {
1: -	struct list_head *tbl;
1: -	u32 size;
1: +  struct list_head *tbl;
1: +  u32 size;
1:  };
1:  
1:  enum {
1: -	NLBL_MGMT_C_UNSPEC = 0,
1: -	NLBL_MGMT_C_ADD = 1,
1: -	NLBL_MGMT_C_REMOVE = 2,
1: -	NLBL_MGMT_C_LISTALL = 3,
1: -	NLBL_MGMT_C_ADDDEF = 4,
1: -	NLBL_MGMT_C_REMOVEDEF = 5,
1: -	NLBL_MGMT_C_LISTDEF = 6,
1: -	NLBL_MGMT_C_PROTOCOLS = 7,
1: -	NLBL_MGMT_C_VERSION = 8,
1: -	__NLBL_MGMT_C_MAX = 9,
1: +  NLBL_MGMT_C_UNSPEC = 0,
1: +  NLBL_MGMT_C_ADD = 1,
1: +  NLBL_MGMT_C_REMOVE = 2,
1: +  NLBL_MGMT_C_LISTALL = 3,
1: +  NLBL_MGMT_C_ADDDEF = 4,
1: +  NLBL_MGMT_C_REMOVEDEF = 5,
1: +  NLBL_MGMT_C_LISTDEF = 6,
1: +  NLBL_MGMT_C_PROTOCOLS = 7,
1: +  NLBL_MGMT_C_VERSION = 8,
1: +  __NLBL_MGMT_C_MAX = 9,
1:  };
1:  
1:  enum {
1: -	NLBL_MGMT_A_UNSPEC = 0,
1: -	NLBL_MGMT_A_DOMAIN = 1,
1: -	NLBL_MGMT_A_PROTOCOL = 2,
1: -	NLBL_MGMT_A_VERSION = 3,
1: -	NLBL_MGMT_A_CV4DOI = 4,
1: -	NLBL_MGMT_A_IPV6ADDR = 5,
1: -	NLBL_MGMT_A_IPV6MASK = 6,
1: -	NLBL_MGMT_A_IPV4ADDR = 7,
1: -	NLBL_MGMT_A_IPV4MASK = 8,
1: -	NLBL_MGMT_A_ADDRSELECTOR = 9,
1: -	NLBL_MGMT_A_SELECTORLIST = 10,
1: -	NLBL_MGMT_A_FAMILY = 11,
1: -	NLBL_MGMT_A_CLPDOI = 12,
1: -	__NLBL_MGMT_A_MAX = 13,
1: +  NLBL_MGMT_A_UNSPEC = 0,
1: +  NLBL_MGMT_A_DOMAIN = 1,
1: +  NLBL_MGMT_A_PROTOCOL = 2,
1: +  NLBL_MGMT_A_VERSION = 3,
1: +  NLBL_MGMT_A_CV4DOI = 4,
1: +  NLBL_MGMT_A_IPV6ADDR = 5,
1: +  NLBL_MGMT_A_IPV6MASK = 6,
1: +  NLBL_MGMT_A_IPV4ADDR = 7,
1: +  NLBL_MGMT_A_IPV4MASK = 8,
1: +  NLBL_MGMT_A_ADDRSELECTOR = 9,
1: +  NLBL_MGMT_A_SELECTORLIST = 10,
1: +  NLBL_MGMT_A_FAMILY = 11,
1: +  NLBL_MGMT_A_CLPDOI = 12,
1: +  __NLBL_MGMT_A_MAX = 13,
1:  };
1:  
1:  struct netlbl_domhsh_walk_arg {
1: -	struct netlink_callback *nl_cb;
1: -	struct sk_buff *skb;
1: -	u32 seq;
1: +  struct netlink_callback *nl_cb;
1: +  struct sk_buff *skb;
1: +  u32 seq;
1:  };
1:  
1:  enum {
1: -	NLBL_UNLABEL_C_UNSPEC = 0,
1: -	NLBL_UNLABEL_C_ACCEPT = 1,
1: -	NLBL_UNLABEL_C_LIST = 2,
1: -	NLBL_UNLABEL_C_STATICADD = 3,
1: -	NLBL_UNLABEL_C_STATICREMOVE = 4,
1: -	NLBL_UNLABEL_C_STATICLIST = 5,
1: -	NLBL_UNLABEL_C_STATICADDDEF = 6,
1: -	NLBL_UNLABEL_C_STATICREMOVEDEF = 7,
1: -	NLBL_UNLABEL_C_STATICLISTDEF = 8,
1: -	__NLBL_UNLABEL_C_MAX = 9,
1: +  NLBL_UNLABEL_C_UNSPEC = 0,
1: +  NLBL_UNLABEL_C_ACCEPT = 1,
1: +  NLBL_UNLABEL_C_LIST = 2,
1: +  NLBL_UNLABEL_C_STATICADD = 3,
1: +  NLBL_UNLABEL_C_STATICREMOVE = 4,
1: +  NLBL_UNLABEL_C_STATICLIST = 5,
1: +  NLBL_UNLABEL_C_STATICADDDEF = 6,
1: +  NLBL_UNLABEL_C_STATICREMOVEDEF = 7,
1: +  NLBL_UNLABEL_C_STATICLISTDEF = 8,
1: +  __NLBL_UNLABEL_C_MAX = 9,
1:  };
1:  
1:  enum {
1: -	NLBL_UNLABEL_A_UNSPEC = 0,
1: -	NLBL_UNLABEL_A_ACPTFLG = 1,
1: -	NLBL_UNLABEL_A_IPV6ADDR = 2,
1: -	NLBL_UNLABEL_A_IPV6MASK = 3,
1: -	NLBL_UNLABEL_A_IPV4ADDR = 4,
1: -	NLBL_UNLABEL_A_IPV4MASK = 5,
1: -	NLBL_UNLABEL_A_IFACE = 6,
1: -	NLBL_UNLABEL_A_SECCTX = 7,
1: -	__NLBL_UNLABEL_A_MAX = 8,
1: +  NLBL_UNLABEL_A_UNSPEC = 0,
1: +  NLBL_UNLABEL_A_ACPTFLG = 1,
1: +  NLBL_UNLABEL_A_IPV6ADDR = 2,
1: +  NLBL_UNLABEL_A_IPV6MASK = 3,
1: +  NLBL_UNLABEL_A_IPV4ADDR = 4,
1: +  NLBL_UNLABEL_A_IPV4MASK = 5,
1: +  NLBL_UNLABEL_A_IFACE = 6,
1: +  NLBL_UNLABEL_A_SECCTX = 7,
1: +  __NLBL_UNLABEL_A_MAX = 8,
1:  };
1:  
1:  struct netlbl_unlhsh_tbl {
1: -	struct list_head *tbl;
1: -	u32 size;
1: +  struct list_head *tbl;
1: +  u32 size;
1:  };
1:  
1:  struct netlbl_unlhsh_addr4 {
1: -	u32 secid;
1: -	struct netlbl_af4list list;
1: -	struct callback_head rcu;
1: +  u32 secid;
1: +  struct netlbl_af4list list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netlbl_unlhsh_addr6 {
1: -	u32 secid;
1: -	struct netlbl_af6list list;
1: -	struct callback_head rcu;
1: +  u32 secid;
1: +  struct netlbl_af6list list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netlbl_unlhsh_iface {
1: -	int ifindex;
1: -	struct list_head addr4_list;
1: -	struct list_head addr6_list;
1: -	u32 valid;
1: -	struct list_head list;
1: -	struct callback_head rcu;
1: +  int ifindex;
1: +  struct list_head addr4_list;
1: +  struct list_head addr6_list;
1: +  u32 valid;
1: +  struct list_head list;
1: +  struct callback_head rcu;
1:  };
1:  
1:  struct netlbl_unlhsh_walk_arg {
1: -	struct netlink_callback *nl_cb;
1: -	struct sk_buff *skb;
1: -	u32 seq;
1: +  struct netlink_callback *nl_cb;
1: +  struct sk_buff *skb;
1: +  u32 seq;
1:  };
1:  
1:  enum {
1: -	NLBL_CIPSOV4_C_UNSPEC = 0,
1: -	NLBL_CIPSOV4_C_ADD = 1,
1: -	NLBL_CIPSOV4_C_REMOVE = 2,
1: -	NLBL_CIPSOV4_C_LIST = 3,
1: -	NLBL_CIPSOV4_C_LISTALL = 4,
1: -	__NLBL_CIPSOV4_C_MAX = 5,
1: +  NLBL_CIPSOV4_C_UNSPEC = 0,
1: +  NLBL_CIPSOV4_C_ADD = 1,
1: +  NLBL_CIPSOV4_C_REMOVE = 2,
1: +  NLBL_CIPSOV4_C_LIST = 3,
1: +  NLBL_CIPSOV4_C_LISTALL = 4,
1: +  __NLBL_CIPSOV4_C_MAX = 5,
1:  };
1:  
1:  enum {
1: -	NLBL_CIPSOV4_A_UNSPEC = 0,
1: -	NLBL_CIPSOV4_A_DOI = 1,
1: -	NLBL_CIPSOV4_A_MTYPE = 2,
1: -	NLBL_CIPSOV4_A_TAG = 3,
1: -	NLBL_CIPSOV4_A_TAGLST = 4,
1: -	NLBL_CIPSOV4_A_MLSLVLLOC = 5,
1: -	NLBL_CIPSOV4_A_MLSLVLREM = 6,
1: -	NLBL_CIPSOV4_A_MLSLVL = 7,
1: -	NLBL_CIPSOV4_A_MLSLVLLST = 8,
1: -	NLBL_CIPSOV4_A_MLSCATLOC = 9,
1: -	NLBL_CIPSOV4_A_MLSCATREM = 10,
1: -	NLBL_CIPSOV4_A_MLSCAT = 11,
1: -	NLBL_CIPSOV4_A_MLSCATLST = 12,
1: -	__NLBL_CIPSOV4_A_MAX = 13,
1: +  NLBL_CIPSOV4_A_UNSPEC = 0,
1: +  NLBL_CIPSOV4_A_DOI = 1,
1: +  NLBL_CIPSOV4_A_MTYPE = 2,
1: +  NLBL_CIPSOV4_A_TAG = 3,
1: +  NLBL_CIPSOV4_A_TAGLST = 4,
1: +  NLBL_CIPSOV4_A_MLSLVLLOC = 5,
1: +  NLBL_CIPSOV4_A_MLSLVLREM = 6,
1: +  NLBL_CIPSOV4_A_MLSLVL = 7,
1: +  NLBL_CIPSOV4_A_MLSLVLLST = 8,
1: +  NLBL_CIPSOV4_A_MLSCATLOC = 9,
1: +  NLBL_CIPSOV4_A_MLSCATREM = 10,
1: +  NLBL_CIPSOV4_A_MLSCAT = 11,
1: +  NLBL_CIPSOV4_A_MLSCATLST = 12,
1: +  __NLBL_CIPSOV4_A_MAX = 13,
1:  };
1:  
1:  struct netlbl_cipsov4_doiwalk_arg {
1: -	struct netlink_callback *nl_cb;
1: -	struct sk_buff *skb;
1: -	u32 seq;
1: +  struct netlink_callback *nl_cb;
1: +  struct sk_buff *skb;
1: +  u32 seq;
1:  };
1:  
1:  struct netlbl_domhsh_walk_arg___2 {
1: -	struct netlbl_audit *audit_info;
1: -	u32 doi;
1: +  struct netlbl_audit *audit_info;
1: +  u32 doi;
1:  };
1:  
1:  enum {
1: -	NLBL_CALIPSO_C_UNSPEC = 0,
1: -	NLBL_CALIPSO_C_ADD = 1,
1: -	NLBL_CALIPSO_C_REMOVE = 2,
1: -	NLBL_CALIPSO_C_LIST = 3,
1: -	NLBL_CALIPSO_C_LISTALL = 4,
1: -	__NLBL_CALIPSO_C_MAX = 5,
1: +  NLBL_CALIPSO_C_UNSPEC = 0,
1: +  NLBL_CALIPSO_C_ADD = 1,
1: +  NLBL_CALIPSO_C_REMOVE = 2,
1: +  NLBL_CALIPSO_C_LIST = 3,
1: +  NLBL_CALIPSO_C_LISTALL = 4,
1: +  __NLBL_CALIPSO_C_MAX = 5,
1:  };
1:  
1:  enum {
1: -	NLBL_CALIPSO_A_UNSPEC = 0,
1: -	NLBL_CALIPSO_A_DOI = 1,
1: -	NLBL_CALIPSO_A_MTYPE = 2,
1: -	__NLBL_CALIPSO_A_MAX = 3,
1: +  NLBL_CALIPSO_A_UNSPEC = 0,
1: +  NLBL_CALIPSO_A_DOI = 1,
1: +  NLBL_CALIPSO_A_MTYPE = 2,
1: +  __NLBL_CALIPSO_A_MAX = 3,
1:  };
1:  
1:  struct netlbl_calipso_doiwalk_arg {
1: -	struct netlink_callback *nl_cb;
1: -	struct sk_buff *skb;
1: -	u32 seq;
1: +  struct netlink_callback *nl_cb;
1: +  struct sk_buff *skb;
1: +  u32 seq;
1:  };
1:  
1:  enum p9_msg_t {
1: -	P9_TLERROR = 6,
1: -	P9_RLERROR = 7,
1: -	P9_TSTATFS = 8,
1: -	P9_RSTATFS = 9,
1: -	P9_TLOPEN = 12,
1: -	P9_RLOPEN = 13,
1: -	P9_TLCREATE = 14,
1: -	P9_RLCREATE = 15,
1: -	P9_TSYMLINK = 16,
1: -	P9_RSYMLINK = 17,
1: -	P9_TMKNOD = 18,
1: -	P9_RMKNOD = 19,
1: -	P9_TRENAME = 20,
1: -	P9_RRENAME = 21,
1: -	P9_TREADLINK = 22,
1: -	P9_RREADLINK = 23,
1: -	P9_TGETATTR = 24,
1: -	P9_RGETATTR = 25,
1: -	P9_TSETATTR = 26,
1: -	P9_RSETATTR = 27,
1: -	P9_TXATTRWALK = 30,
1: -	P9_RXATTRWALK = 31,
1: -	P9_TXATTRCREATE = 32,
1: -	P9_RXATTRCREATE = 33,
1: -	P9_TREADDIR = 40,
1: -	P9_RREADDIR = 41,
1: -	P9_TFSYNC = 50,
1: -	P9_RFSYNC = 51,
1: -	P9_TLOCK = 52,
1: -	P9_RLOCK = 53,
1: -	P9_TGETLOCK = 54,
1: -	P9_RGETLOCK = 55,
1: -	P9_TLINK = 70,
1: -	P9_RLINK = 71,
1: -	P9_TMKDIR = 72,
1: -	P9_RMKDIR = 73,
1: -	P9_TRENAMEAT = 74,
1: -	P9_RRENAMEAT = 75,
1: -	P9_TUNLINKAT = 76,
1: -	P9_RUNLINKAT = 77,
1: -	P9_TVERSION = 100,
1: -	P9_RVERSION = 101,
1: -	P9_TAUTH = 102,
1: -	P9_RAUTH = 103,
1: -	P9_TATTACH = 104,
1: -	P9_RATTACH = 105,
1: -	P9_TERROR = 106,
1: -	P9_RERROR = 107,
1: -	P9_TFLUSH = 108,
1: -	P9_RFLUSH = 109,
1: -	P9_TWALK = 110,
1: -	P9_RWALK = 111,
1: -	P9_TOPEN = 112,
1: -	P9_ROPEN = 113,
1: -	P9_TCREATE = 114,
1: -	P9_RCREATE = 115,
1: -	P9_TREAD = 116,
1: -	P9_RREAD = 117,
1: -	P9_TWRITE = 118,
1: -	P9_RWRITE = 119,
1: -	P9_TCLUNK = 120,
1: -	P9_RCLUNK = 121,
1: -	P9_TREMOVE = 122,
1: -	P9_RREMOVE = 123,
1: -	P9_TSTAT = 124,
1: -	P9_RSTAT = 125,
1: -	P9_TWSTAT = 126,
1: -	P9_RWSTAT = 127,
1: +  P9_TLERROR = 6,
1: +  P9_RLERROR = 7,
1: +  P9_TSTATFS = 8,
1: +  P9_RSTATFS = 9,
1: +  P9_TLOPEN = 12,
1: +  P9_RLOPEN = 13,
1: +  P9_TLCREATE = 14,
1: +  P9_RLCREATE = 15,
1: +  P9_TSYMLINK = 16,
1: +  P9_RSYMLINK = 17,
1: +  P9_TMKNOD = 18,
1: +  P9_RMKNOD = 19,
1: +  P9_TRENAME = 20,
1: +  P9_RRENAME = 21,
1: +  P9_TREADLINK = 22,
1: +  P9_RREADLINK = 23,
1: +  P9_TGETATTR = 24,
1: +  P9_RGETATTR = 25,
1: +  P9_TSETATTR = 26,
1: +  P9_RSETATTR = 27,
1: +  P9_TXATTRWALK = 30,
1: +  P9_RXATTRWALK = 31,
1: +  P9_TXATTRCREATE = 32,
1: +  P9_RXATTRCREATE = 33,
1: +  P9_TREADDIR = 40,
1: +  P9_RREADDIR = 41,
1: +  P9_TFSYNC = 50,
1: +  P9_RFSYNC = 51,
1: +  P9_TLOCK = 52,
1: +  P9_RLOCK = 53,
1: +  P9_TGETLOCK = 54,
1: +  P9_RGETLOCK = 55,
1: +  P9_TLINK = 70,
1: +  P9_RLINK = 71,
1: +  P9_TMKDIR = 72,
1: +  P9_RMKDIR = 73,
1: +  P9_TRENAMEAT = 74,
1: +  P9_RRENAMEAT = 75,
1: +  P9_TUNLINKAT = 76,
1: +  P9_RUNLINKAT = 77,
1: +  P9_TVERSION = 100,
1: +  P9_RVERSION = 101,
1: +  P9_TAUTH = 102,
1: +  P9_RAUTH = 103,
1: +  P9_TATTACH = 104,
1: +  P9_RATTACH = 105,
1: +  P9_TERROR = 106,
1: +  P9_RERROR = 107,
1: +  P9_TFLUSH = 108,
1: +  P9_RFLUSH = 109,
1: +  P9_TWALK = 110,
1: +  P9_RWALK = 111,
1: +  P9_TOPEN = 112,
1: +  P9_ROPEN = 113,
1: +  P9_TCREATE = 114,
1: +  P9_RCREATE = 115,
1: +  P9_TREAD = 116,
1: +  P9_RREAD = 117,
1: +  P9_TWRITE = 118,
1: +  P9_RWRITE = 119,
1: +  P9_TCLUNK = 120,
1: +  P9_RCLUNK = 121,
1: +  P9_TREMOVE = 122,
1: +  P9_RREMOVE = 123,
1: +  P9_TSTAT = 124,
1: +  P9_RSTAT = 125,
1: +  P9_TWSTAT = 126,
1: +  P9_RWSTAT = 127,
1:  };
1:  
1:  enum p9_proto_versions {
1: -	p9_proto_legacy = 0,
1: -	p9_proto_2000u = 1,
1: -	p9_proto_2000L = 2,
1: +  p9_proto_legacy = 0,
1: +  p9_proto_2000u = 1,
1: +  p9_proto_2000L = 2,
1:  };
1:  
1:  enum p9_req_status_t {
1: -	REQ_STATUS_ALLOC = 0,
1: -	REQ_STATUS_UNSENT = 1,
1: -	REQ_STATUS_SENT = 2,
1: -	REQ_STATUS_RCVD = 3,
1: -	REQ_STATUS_FLSHD = 4,
1: -	REQ_STATUS_ERROR = 5,
1: +  REQ_STATUS_ALLOC = 0,
1: +  REQ_STATUS_UNSENT = 1,
1: +  REQ_STATUS_SENT = 2,
1: +  REQ_STATUS_RCVD = 3,
1: +  REQ_STATUS_FLSHD = 4,
1: +  REQ_STATUS_ERROR = 5,
1:  };
1:  
1:  struct trace_event_raw_9p_client_req {
1: -	struct trace_entry ent;
1: -	void *clnt;
1: -	__u8 type;
1: -	__u32 tag;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *clnt;
1: +  __u8 type;
1: +  __u32 tag;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_9p_client_res {
1: -	struct trace_entry ent;
1: -	void *clnt;
1: -	__u8 type;
1: -	__u32 tag;
1: -	__u32 err;
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *clnt;
1: +  __u8 type;
1: +  __u32 tag;
1: +  __u32 err;
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_raw_9p_protocol_dump {
1: -	struct trace_entry ent;
1: -	void *clnt;
1: -	__u8 type;
1: -	__u16 tag;
1: -	unsigned char line[32];
1: -	char __data[0];
1: +  struct trace_entry ent;
1: +  void *clnt;
1: +  __u8 type;
1: +  __u16 tag;
1: +  unsigned char line[32];
1: +  char __data[0];
1:  };
1:  
1:  struct trace_event_data_offsets_9p_client_req {};
1: @@ -137333,680 +139386,684 @@ struct trace_event_data_offsets_9p_client_res {};
1:  
1:  struct trace_event_data_offsets_9p_protocol_dump {};
1:  
1: -typedef void (*btf_trace_9p_client_req)(void *, struct p9_client *, int8_t, int);
1: +typedef void (*btf_trace_9p_client_req)(void *, struct p9_client *, int8_t,
1: +                                        int);
1:  
1: -typedef void (*btf_trace_9p_client_res)(void *, struct p9_client *, int8_t, int, int);
1: +typedef void (*btf_trace_9p_client_res)(void *, struct p9_client *, int8_t, int,
1: +                                        int);
1:  
1: -typedef void (*btf_trace_9p_protocol_dump)(void *, struct p9_client *, struct p9_fcall *);
1: +typedef void (*btf_trace_9p_protocol_dump)(void *, struct p9_client *,
1: +                                           struct p9_fcall *);
1:  
1:  enum {
1: -	Opt_msize = 0,
1: -	Opt_trans = 1,
1: -	Opt_legacy = 2,
1: -	Opt_version = 3,
1: -	Opt_err___10 = 4,
1: +  Opt_msize = 0,
1: +  Opt_trans = 1,
1: +  Opt_legacy = 2,
1: +  Opt_version = 3,
1: +  Opt_err___10 = 4,
1:  };
1:  
1:  struct errormap {
1: -	char *name;
1: -	int val;
1: -	int namelen;
1: -	struct hlist_node list;
1: +  char *name;
1: +  int val;
1: +  int namelen;
1: +  struct hlist_node list;
1:  };
1:  
1:  struct p9_fd_opts {
1: -	int rfd;
1: -	int wfd;
1: -	u16 port;
1: -	bool privport;
1: +  int rfd;
1: +  int wfd;
1: +  u16 port;
1: +  bool privport;
1:  };
1:  
1:  enum {
1: -	Opt_port___2 = 0,
1: -	Opt_rfdno = 1,
1: -	Opt_wfdno = 2,
1: -	Opt_err___11 = 3,
1: -	Opt_privport = 4,
1: +  Opt_port___2 = 0,
1: +  Opt_rfdno = 1,
1: +  Opt_wfdno = 2,
1: +  Opt_err___11 = 3,
1: +  Opt_privport = 4,
1:  };
1:  
1:  enum {
1: -	Rworksched = 1,
1: -	Rpending = 2,
1: -	Wworksched = 4,
1: -	Wpending = 8,
1: +  Rworksched = 1,
1: +  Rpending = 2,
1: +  Wworksched = 4,
1: +  Wpending = 8,
1:  };
1:  
1:  struct p9_conn;
1:  
1:  struct p9_poll_wait {
1: -	struct p9_conn *conn;
1: -	wait_queue_entry_t wait;
1: -	wait_queue_head_t *wait_addr;
1: +  struct p9_conn *conn;
1: +  wait_queue_entry_t wait;
1: +  wait_queue_head_t *wait_addr;
1:  };
1:  
1:  struct p9_conn {
1: -	struct list_head mux_list;
1: -	struct p9_client *client;
1: -	int err;
1: -	struct list_head req_list;
1: -	struct list_head unsent_req_list;
1: -	struct p9_req_t *rreq;
1: -	struct p9_req_t *wreq;
1: -	char tmp_buf[7];
1: -	struct p9_fcall rc;
1: -	int wpos;
1: -	int wsize;
1: -	char *wbuf;
1: -	struct list_head poll_pending_link;
1: -	struct p9_poll_wait poll_wait[2];
1: -	poll_table pt;
1: -	struct work_struct rq;
1: -	struct work_struct wq;
1: -	long unsigned int wsched;
1: +  struct list_head mux_list;
1: +  struct p9_client *client;
1: +  int err;
1: +  struct list_head req_list;
1: +  struct list_head unsent_req_list;
1: +  struct p9_req_t *rreq;
1: +  struct p9_req_t *wreq;
1: +  char tmp_buf[7];
1: +  struct p9_fcall rc;
1: +  int wpos;
1: +  int wsize;
1: +  char *wbuf;
1: +  struct list_head poll_pending_link;
1: +  struct p9_poll_wait poll_wait[2];
1: +  poll_table pt;
1: +  struct work_struct rq;
1: +  struct work_struct wq;
1: +  long unsigned int wsched;
1:  };
1:  
1:  struct p9_trans_fd {
1: -	struct file *rd;
1: -	struct file *wr;
1: -	struct p9_conn conn;
1: +  struct file *rd;
1: +  struct file *wr;
1: +  struct p9_conn conn;
1:  };
1:  
1:  struct virtio_9p_config {
1: -	__virtio16 tag_len;
1: -	__u8 tag[0];
1: +  __virtio16 tag_len;
1: +  __u8 tag[0];
1:  };
1:  
1:  struct virtio_chan {
1: -	bool inuse;
1: -	spinlock_t lock;
1: -	struct p9_client *client;
1: -	struct virtio_device *vdev;
1: -	struct virtqueue *vq;
1: -	int ring_bufs_avail;
1: -	wait_queue_head_t *vc_wq;
1: -	long unsigned int p9_max_pages;
1: -	struct scatterlist sg[128];
1: -	char *tag;
1: -	struct list_head chan_list;
1: +  bool inuse;
1: +  spinlock_t lock;
1: +  struct p9_client *client;
1: +  struct virtio_device *vdev;
1: +  struct virtqueue *vq;
1: +  int ring_bufs_avail;
1: +  wait_queue_head_t *vc_wq;
1: +  long unsigned int p9_max_pages;
1: +  struct scatterlist sg[128];
1: +  char *tag;
1: +  struct list_head chan_list;
1:  };
1:  
1:  struct dcbmsg {
1: -	__u8 dcb_family;
1: -	__u8 cmd;
1: -	__u16 dcb_pad;
1: +  __u8 dcb_family;
1: +  __u8 cmd;
1: +  __u16 dcb_pad;
1:  };
1:  
1:  enum dcbnl_commands {
1: -	DCB_CMD_UNDEFINED = 0,
1: -	DCB_CMD_GSTATE = 1,
1: -	DCB_CMD_SSTATE = 2,
1: -	DCB_CMD_PGTX_GCFG = 3,
1: -	DCB_CMD_PGTX_SCFG = 4,
1: -	DCB_CMD_PGRX_GCFG = 5,
1: -	DCB_CMD_PGRX_SCFG = 6,
1: -	DCB_CMD_PFC_GCFG = 7,
1: -	DCB_CMD_PFC_SCFG = 8,
1: -	DCB_CMD_SET_ALL = 9,
1: -	DCB_CMD_GPERM_HWADDR = 10,
1: -	DCB_CMD_GCAP = 11,
1: -	DCB_CMD_GNUMTCS = 12,
1: -	DCB_CMD_SNUMTCS = 13,
1: -	DCB_CMD_PFC_GSTATE = 14,
1: -	DCB_CMD_PFC_SSTATE = 15,
1: -	DCB_CMD_BCN_GCFG = 16,
1: -	DCB_CMD_BCN_SCFG = 17,
1: -	DCB_CMD_GAPP = 18,
1: -	DCB_CMD_SAPP = 19,
1: -	DCB_CMD_IEEE_SET = 20,
1: -	DCB_CMD_IEEE_GET = 21,
1: -	DCB_CMD_GDCBX = 22,
1: -	DCB_CMD_SDCBX = 23,
1: -	DCB_CMD_GFEATCFG = 24,
1: -	DCB_CMD_SFEATCFG = 25,
1: -	DCB_CMD_CEE_GET = 26,
1: -	DCB_CMD_IEEE_DEL = 27,
1: -	__DCB_CMD_ENUM_MAX = 28,
1: -	DCB_CMD_MAX = 27,
1: +  DCB_CMD_UNDEFINED = 0,
1: +  DCB_CMD_GSTATE = 1,
1: +  DCB_CMD_SSTATE = 2,
1: +  DCB_CMD_PGTX_GCFG = 3,
1: +  DCB_CMD_PGTX_SCFG = 4,
1: +  DCB_CMD_PGRX_GCFG = 5,
1: +  DCB_CMD_PGRX_SCFG = 6,
1: +  DCB_CMD_PFC_GCFG = 7,
1: +  DCB_CMD_PFC_SCFG = 8,
1: +  DCB_CMD_SET_ALL = 9,
1: +  DCB_CMD_GPERM_HWADDR = 10,
1: +  DCB_CMD_GCAP = 11,
1: +  DCB_CMD_GNUMTCS = 12,
1: +  DCB_CMD_SNUMTCS = 13,
1: +  DCB_CMD_PFC_GSTATE = 14,
1: +  DCB_CMD_PFC_SSTATE = 15,
1: +  DCB_CMD_BCN_GCFG = 16,
1: +  DCB_CMD_BCN_SCFG = 17,
1: +  DCB_CMD_GAPP = 18,
1: +  DCB_CMD_SAPP = 19,
1: +  DCB_CMD_IEEE_SET = 20,
1: +  DCB_CMD_IEEE_GET = 21,
1: +  DCB_CMD_GDCBX = 22,
1: +  DCB_CMD_SDCBX = 23,
1: +  DCB_CMD_GFEATCFG = 24,
1: +  DCB_CMD_SFEATCFG = 25,
1: +  DCB_CMD_CEE_GET = 26,
1: +  DCB_CMD_IEEE_DEL = 27,
1: +  __DCB_CMD_ENUM_MAX = 28,
1: +  DCB_CMD_MAX = 27,
1:  };
1:  
1:  enum dcbnl_attrs {
1: -	DCB_ATTR_UNDEFINED = 0,
1: -	DCB_ATTR_IFNAME = 1,
1: -	DCB_ATTR_STATE = 2,
1: -	DCB_ATTR_PFC_STATE = 3,
1: -	DCB_ATTR_PFC_CFG = 4,
1: -	DCB_ATTR_NUM_TC = 5,
1: -	DCB_ATTR_PG_CFG = 6,
1: -	DCB_ATTR_SET_ALL = 7,
1: -	DCB_ATTR_PERM_HWADDR = 8,
1: -	DCB_ATTR_CAP = 9,
1: -	DCB_ATTR_NUMTCS = 10,
1: -	DCB_ATTR_BCN = 11,
1: -	DCB_ATTR_APP = 12,
1: -	DCB_ATTR_IEEE = 13,
1: -	DCB_ATTR_DCBX = 14,
1: -	DCB_ATTR_FEATCFG = 15,
1: -	DCB_ATTR_CEE = 16,
1: -	__DCB_ATTR_ENUM_MAX = 17,
1: -	DCB_ATTR_MAX = 16,
1: +  DCB_ATTR_UNDEFINED = 0,
1: +  DCB_ATTR_IFNAME = 1,
1: +  DCB_ATTR_STATE = 2,
1: +  DCB_ATTR_PFC_STATE = 3,
1: +  DCB_ATTR_PFC_CFG = 4,
1: +  DCB_ATTR_NUM_TC = 5,
1: +  DCB_ATTR_PG_CFG = 6,
1: +  DCB_ATTR_SET_ALL = 7,
1: +  DCB_ATTR_PERM_HWADDR = 8,
1: +  DCB_ATTR_CAP = 9,
1: +  DCB_ATTR_NUMTCS = 10,
1: +  DCB_ATTR_BCN = 11,
1: +  DCB_ATTR_APP = 12,
1: +  DCB_ATTR_IEEE = 13,
1: +  DCB_ATTR_DCBX = 14,
1: +  DCB_ATTR_FEATCFG = 15,
1: +  DCB_ATTR_CEE = 16,
1: +  __DCB_ATTR_ENUM_MAX = 17,
1: +  DCB_ATTR_MAX = 16,
1:  };
1:  
1:  enum ieee_attrs {
1: -	DCB_ATTR_IEEE_UNSPEC = 0,
1: -	DCB_ATTR_IEEE_ETS = 1,
1: -	DCB_ATTR_IEEE_PFC = 2,
1: -	DCB_ATTR_IEEE_APP_TABLE = 3,
1: -	DCB_ATTR_IEEE_PEER_ETS = 4,
1: -	DCB_ATTR_IEEE_PEER_PFC = 5,
1: -	DCB_ATTR_IEEE_PEER_APP = 6,
1: -	DCB_ATTR_IEEE_MAXRATE = 7,
1: -	DCB_ATTR_IEEE_QCN = 8,
1: -	DCB_ATTR_IEEE_QCN_STATS = 9,
1: -	DCB_ATTR_DCB_BUFFER = 10,
1: -	__DCB_ATTR_IEEE_MAX = 11,
1: +  DCB_ATTR_IEEE_UNSPEC = 0,
1: +  DCB_ATTR_IEEE_ETS = 1,
1: +  DCB_ATTR_IEEE_PFC = 2,
1: +  DCB_ATTR_IEEE_APP_TABLE = 3,
1: +  DCB_ATTR_IEEE_PEER_ETS = 4,
1: +  DCB_ATTR_IEEE_PEER_PFC = 5,
1: +  DCB_ATTR_IEEE_PEER_APP = 6,
1: +  DCB_ATTR_IEEE_MAXRATE = 7,
1: +  DCB_ATTR_IEEE_QCN = 8,
1: +  DCB_ATTR_IEEE_QCN_STATS = 9,
1: +  DCB_ATTR_DCB_BUFFER = 10,
1: +  __DCB_ATTR_IEEE_MAX = 11,
1:  };
1:  
1:  enum ieee_attrs_app {
1: -	DCB_ATTR_IEEE_APP_UNSPEC = 0,
1: -	DCB_ATTR_IEEE_APP = 1,
1: -	__DCB_ATTR_IEEE_APP_MAX = 2,
1: +  DCB_ATTR_IEEE_APP_UNSPEC = 0,
1: +  DCB_ATTR_IEEE_APP = 1,
1: +  __DCB_ATTR_IEEE_APP_MAX = 2,
1:  };
1:  
1:  enum cee_attrs {
1: -	DCB_ATTR_CEE_UNSPEC = 0,
1: -	DCB_ATTR_CEE_PEER_PG = 1,
1: -	DCB_ATTR_CEE_PEER_PFC = 2,
1: -	DCB_ATTR_CEE_PEER_APP_TABLE = 3,
1: -	DCB_ATTR_CEE_TX_PG = 4,
1: -	DCB_ATTR_CEE_RX_PG = 5,
1: -	DCB_ATTR_CEE_PFC = 6,
1: -	DCB_ATTR_CEE_APP_TABLE = 7,
1: -	DCB_ATTR_CEE_FEAT = 8,
1: -	__DCB_ATTR_CEE_MAX = 9,
1: +  DCB_ATTR_CEE_UNSPEC = 0,
1: +  DCB_ATTR_CEE_PEER_PG = 1,
1: +  DCB_ATTR_CEE_PEER_PFC = 2,
1: +  DCB_ATTR_CEE_PEER_APP_TABLE = 3,
1: +  DCB_ATTR_CEE_TX_PG = 4,
1: +  DCB_ATTR_CEE_RX_PG = 5,
1: +  DCB_ATTR_CEE_PFC = 6,
1: +  DCB_ATTR_CEE_APP_TABLE = 7,
1: +  DCB_ATTR_CEE_FEAT = 8,
1: +  __DCB_ATTR_CEE_MAX = 9,
1:  };
1:  
1:  enum peer_app_attr {
1: -	DCB_ATTR_CEE_PEER_APP_UNSPEC = 0,
1: -	DCB_ATTR_CEE_PEER_APP_INFO = 1,
1: -	DCB_ATTR_CEE_PEER_APP = 2,
1: -	__DCB_ATTR_CEE_PEER_APP_MAX = 3,
1: +  DCB_ATTR_CEE_PEER_APP_UNSPEC = 0,
1: +  DCB_ATTR_CEE_PEER_APP_INFO = 1,
1: +  DCB_ATTR_CEE_PEER_APP = 2,
1: +  __DCB_ATTR_CEE_PEER_APP_MAX = 3,
1:  };
1:  
1:  enum dcbnl_tc_attrs {
1: -	DCB_TC_ATTR_PARAM_UNDEFINED = 0,
1: -	DCB_TC_ATTR_PARAM_PGID = 1,
1: -	DCB_TC_ATTR_PARAM_UP_MAPPING = 2,
1: -	DCB_TC_ATTR_PARAM_STRICT_PRIO = 3,
1: -	DCB_TC_ATTR_PARAM_BW_PCT = 4,
1: -	DCB_TC_ATTR_PARAM_ALL = 5,
1: -	__DCB_TC_ATTR_PARAM_ENUM_MAX = 6,
1: -	DCB_TC_ATTR_PARAM_MAX = 5,
1: +  DCB_TC_ATTR_PARAM_UNDEFINED = 0,
1: +  DCB_TC_ATTR_PARAM_PGID = 1,
1: +  DCB_TC_ATTR_PARAM_UP_MAPPING = 2,
1: +  DCB_TC_ATTR_PARAM_STRICT_PRIO = 3,
1: +  DCB_TC_ATTR_PARAM_BW_PCT = 4,
1: +  DCB_TC_ATTR_PARAM_ALL = 5,
1: +  __DCB_TC_ATTR_PARAM_ENUM_MAX = 6,
1: +  DCB_TC_ATTR_PARAM_MAX = 5,
1:  };
1:  
1:  enum dcbnl_bcn_attrs {
1: -	DCB_BCN_ATTR_UNDEFINED = 0,
1: -	DCB_BCN_ATTR_RP_0 = 1,
1: -	DCB_BCN_ATTR_RP_1 = 2,
1: -	DCB_BCN_ATTR_RP_2 = 3,
1: -	DCB_BCN_ATTR_RP_3 = 4,
1: -	DCB_BCN_ATTR_RP_4 = 5,
1: -	DCB_BCN_ATTR_RP_5 = 6,
1: -	DCB_BCN_ATTR_RP_6 = 7,
1: -	DCB_BCN_ATTR_RP_7 = 8,
1: -	DCB_BCN_ATTR_RP_ALL = 9,
1: -	DCB_BCN_ATTR_BCNA_0 = 10,
1: -	DCB_BCN_ATTR_BCNA_1 = 11,
1: -	DCB_BCN_ATTR_ALPHA = 12,
1: -	DCB_BCN_ATTR_BETA = 13,
1: -	DCB_BCN_ATTR_GD = 14,
1: -	DCB_BCN_ATTR_GI = 15,
1: -	DCB_BCN_ATTR_TMAX = 16,
1: -	DCB_BCN_ATTR_TD = 17,
1: -	DCB_BCN_ATTR_RMIN = 18,
1: -	DCB_BCN_ATTR_W = 19,
1: -	DCB_BCN_ATTR_RD = 20,
1: -	DCB_BCN_ATTR_RU = 21,
1: -	DCB_BCN_ATTR_WRTT = 22,
1: -	DCB_BCN_ATTR_RI = 23,
1: -	DCB_BCN_ATTR_C = 24,
1: -	DCB_BCN_ATTR_ALL = 25,
1: -	__DCB_BCN_ATTR_ENUM_MAX = 26,
1: -	DCB_BCN_ATTR_MAX = 25,
1: +  DCB_BCN_ATTR_UNDEFINED = 0,
1: +  DCB_BCN_ATTR_RP_0 = 1,
1: +  DCB_BCN_ATTR_RP_1 = 2,
1: +  DCB_BCN_ATTR_RP_2 = 3,
1: +  DCB_BCN_ATTR_RP_3 = 4,
1: +  DCB_BCN_ATTR_RP_4 = 5,
1: +  DCB_BCN_ATTR_RP_5 = 6,
1: +  DCB_BCN_ATTR_RP_6 = 7,
1: +  DCB_BCN_ATTR_RP_7 = 8,
1: +  DCB_BCN_ATTR_RP_ALL = 9,
1: +  DCB_BCN_ATTR_BCNA_0 = 10,
1: +  DCB_BCN_ATTR_BCNA_1 = 11,
1: +  DCB_BCN_ATTR_ALPHA = 12,
1: +  DCB_BCN_ATTR_BETA = 13,
1: +  DCB_BCN_ATTR_GD = 14,
1: +  DCB_BCN_ATTR_GI = 15,
1: +  DCB_BCN_ATTR_TMAX = 16,
1: +  DCB_BCN_ATTR_TD = 17,
1: +  DCB_BCN_ATTR_RMIN = 18,
1: +  DCB_BCN_ATTR_W = 19,
1: +  DCB_BCN_ATTR_RD = 20,
1: +  DCB_BCN_ATTR_RU = 21,
1: +  DCB_BCN_ATTR_WRTT = 22,
1: +  DCB_BCN_ATTR_RI = 23,
1: +  DCB_BCN_ATTR_C = 24,
1: +  DCB_BCN_ATTR_ALL = 25,
1: +  __DCB_BCN_ATTR_ENUM_MAX = 26,
1: +  DCB_BCN_ATTR_MAX = 25,
1:  };
1:  
1:  enum dcbnl_app_attrs {
1: -	DCB_APP_ATTR_UNDEFINED = 0,
1: -	DCB_APP_ATTR_IDTYPE = 1,
1: -	DCB_APP_ATTR_ID = 2,
1: -	DCB_APP_ATTR_PRIORITY = 3,
1: -	__DCB_APP_ATTR_ENUM_MAX = 4,
1: -	DCB_APP_ATTR_MAX = 3,
1: +  DCB_APP_ATTR_UNDEFINED = 0,
1: +  DCB_APP_ATTR_IDTYPE = 1,
1: +  DCB_APP_ATTR_ID = 2,
1: +  DCB_APP_ATTR_PRIORITY = 3,
1: +  __DCB_APP_ATTR_ENUM_MAX = 4,
1: +  DCB_APP_ATTR_MAX = 3,
1:  };
1:  
1:  enum dcbnl_featcfg_attrs {
1: -	DCB_FEATCFG_ATTR_UNDEFINED = 0,
1: -	DCB_FEATCFG_ATTR_ALL = 1,
1: -	DCB_FEATCFG_ATTR_PG = 2,
1: -	DCB_FEATCFG_ATTR_PFC = 3,
1: -	DCB_FEATCFG_ATTR_APP = 4,
1: -	__DCB_FEATCFG_ATTR_ENUM_MAX = 5,
1: -	DCB_FEATCFG_ATTR_MAX = 4,
1: +  DCB_FEATCFG_ATTR_UNDEFINED = 0,
1: +  DCB_FEATCFG_ATTR_ALL = 1,
1: +  DCB_FEATCFG_ATTR_PG = 2,
1: +  DCB_FEATCFG_ATTR_PFC = 3,
1: +  DCB_FEATCFG_ATTR_APP = 4,
1: +  __DCB_FEATCFG_ATTR_ENUM_MAX = 5,
1: +  DCB_FEATCFG_ATTR_MAX = 4,
1:  };
1:  
1:  struct dcb_app_type {
1: -	int ifindex;
1: -	struct dcb_app app;
1: -	struct list_head list;
1: -	u8 dcbx;
1: +  int ifindex;
1: +  struct dcb_app app;
1: +  struct list_head list;
1: +  u8 dcbx;
1:  };
1:  
1:  struct dcb_ieee_app_prio_map {
1: -	u64 map[8];
1: +  u64 map[8];
1:  };
1:  
1:  struct dcb_ieee_app_dscp_map {
1: -	u8 map[64];
1: +  u8 map[64];
1:  };
1:  
1:  enum dcbevent_notif_type {
1: -	DCB_APP_EVENT = 1,
1: +  DCB_APP_EVENT = 1,
1:  };
1:  
1:  struct reply_func {
1: -	int type;
1: -	int (*cb)(struct net_device *, struct nlmsghdr *, u32, struct nlattr **, struct sk_buff *);
1: +  int type;
1: +  int (*cb)(struct net_device *, struct nlmsghdr *, u32, struct nlattr **,
1: +            struct sk_buff *);
1:  };
1:  
1:  enum dns_payload_content_type {
1: -	DNS_PAYLOAD_IS_SERVER_LIST = 0,
1: +  DNS_PAYLOAD_IS_SERVER_LIST = 0,
1:  };
1:  
1:  struct dns_payload_header {
1: -	__u8 zero;
1: -	__u8 content;
1: -	__u8 version;
1: +  __u8 zero;
1: +  __u8 content;
1: +  __u8 version;
1:  };
1:  
1:  enum {
1: -	dns_key_data = 0,
1: -	dns_key_error = 1,
1: +  dns_key_data = 0,
1: +  dns_key_error = 1,
1:  };
1:  
1:  struct sockaddr_xdp {
1: -	__u16 sxdp_family;
1: -	__u16 sxdp_flags;
1: -	__u32 sxdp_ifindex;
1: -	__u32 sxdp_queue_id;
1: -	__u32 sxdp_shared_umem_fd;
1: +  __u16 sxdp_family;
1: +  __u16 sxdp_flags;
1: +  __u32 sxdp_ifindex;
1: +  __u32 sxdp_queue_id;
1: +  __u32 sxdp_shared_umem_fd;
1:  };
1:  
1:  struct xdp_ring_offset {
1: -	__u64 producer;
1: -	__u64 consumer;
1: -	__u64 desc;
1: -	__u64 flags;
1: +  __u64 producer;
1: +  __u64 consumer;
1: +  __u64 desc;
1: +  __u64 flags;
1:  };
1:  
1:  struct xdp_mmap_offsets {
1: -	struct xdp_ring_offset rx;
1: -	struct xdp_ring_offset tx;
1: -	struct xdp_ring_offset fr;
1: -	struct xdp_ring_offset cr;
1: +  struct xdp_ring_offset rx;
1: +  struct xdp_ring_offset tx;
1: +  struct xdp_ring_offset fr;
1: +  struct xdp_ring_offset cr;
1:  };
1:  
1:  struct xdp_umem_reg {
1: -	__u64 addr;
1: -	__u64 len;
1: -	__u32 chunk_size;
1: -	__u32 headroom;
1: -	__u32 flags;
1: +  __u64 addr;
1: +  __u64 len;
1: +  __u32 chunk_size;
1: +  __u32 headroom;
1: +  __u32 flags;
1:  };
1:  
1:  struct xdp_statistics {
1: -	__u64 rx_dropped;
1: -	__u64 rx_invalid_descs;
1: -	__u64 tx_invalid_descs;
1: -	__u64 rx_ring_full;
1: -	__u64 rx_fill_ring_empty_descs;
1: -	__u64 tx_ring_empty_descs;
1: +  __u64 rx_dropped;
1: +  __u64 rx_invalid_descs;
1: +  __u64 tx_invalid_descs;
1: +  __u64 rx_ring_full;
1: +  __u64 rx_fill_ring_empty_descs;
1: +  __u64 tx_ring_empty_descs;
1:  };
1:  
1:  struct xdp_options {
1: -	__u32 flags;
1: +  __u32 flags;
1:  };
1:  
1:  struct xdp_ring;
1:  
1:  struct xsk_queue {
1: -	u32 ring_mask;
1: -	u32 nentries;
1: -	u32 cached_prod;
1: -	u32 cached_cons;
1: -	struct xdp_ring *ring;
1: -	u64 invalid_descs;
1: -	u64 queue_empty_descs;
1: +  u32 ring_mask;
1: +  u32 nentries;
1: +  u32 cached_prod;
1: +  u32 cached_cons;
1: +  struct xdp_ring *ring;
1: +  u64 invalid_descs;
1: +  u64 queue_empty_descs;
1:  };
1:  
1:  struct xdp_ring_offset_v1 {
1: -	__u64 producer;
1: -	__u64 consumer;
1: -	__u64 desc;
1: +  __u64 producer;
1: +  __u64 consumer;
1: +  __u64 desc;
1:  };
1:  
1:  struct xdp_mmap_offsets_v1 {
1: -	struct xdp_ring_offset_v1 rx;
1: -	struct xdp_ring_offset_v1 tx;
1: -	struct xdp_ring_offset_v1 fr;
1: -	struct xdp_ring_offset_v1 cr;
1: +  struct xdp_ring_offset_v1 rx;
1: +  struct xdp_ring_offset_v1 tx;
1: +  struct xdp_ring_offset_v1 fr;
1: +  struct xdp_ring_offset_v1 cr;
1:  };
1:  
1:  struct xsk_map_node {
1: -	struct list_head node;
1: -	struct xsk_map *map;
1: -	struct xdp_sock **map_entry;
1: +  struct list_head node;
1: +  struct xsk_map *map;
1: +  struct xdp_sock **map_entry;
1:  };
1:  
1:  struct xdp_ring {
1: -	u32 producer;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 pad1;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 consumer;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 pad2;
1: -	u32 flags;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	u32 pad3;
1: -	long: 32;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: -	long: 64;
1: +  u32 producer;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 pad1;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 consumer;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 pad2;
1: +  u32 flags;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  u32 pad3;
1: +  long : 32;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1: +  long : 64;
1:  };
1:  
1:  struct xdp_rxtx_ring {
1: -	struct xdp_ring ptrs;
1: -	struct xdp_desc desc[0];
1: +  struct xdp_ring ptrs;
1: +  struct xdp_desc desc[0];
1:  };
1:  
1:  struct xdp_umem_ring {
1: -	struct xdp_ring ptrs;
1: -	u64 desc[0];
1: +  struct xdp_ring ptrs;
1: +  u64 desc[0];
1:  };
1:  
1:  struct xsk_dma_map {
1: -	dma_addr_t *dma_pages;
1: -	struct device *dev;
1: -	struct net_device *netdev;
1: -	refcount_t users;
1: -	struct list_head list;
1: -	u32 dma_pages_cnt;
1: -	bool dma_need_sync;
1: +  dma_addr_t *dma_pages;
1: +  struct device *dev;
1: +  struct net_device *netdev;
1: +  refcount_t users;
1: +  struct list_head list;
1: +  u32 dma_pages_cnt;
1: +  bool dma_need_sync;
1:  };
1:  
1:  struct xdp_diag_req {
1: -	__u8 sdiag_family;
1: -	__u8 sdiag_protocol;
1: -	__u16 pad;
1: -	__u32 xdiag_ino;
1: -	__u32 xdiag_show;
1: -	__u32 xdiag_cookie[2];
1: +  __u8 sdiag_family;
1: +  __u8 sdiag_protocol;
1: +  __u16 pad;
1: +  __u32 xdiag_ino;
1: +  __u32 xdiag_show;
1: +  __u32 xdiag_cookie[2];
1:  };
1:  
1:  struct xdp_diag_msg {
1: -	__u8 xdiag_family;
1: -	__u8 xdiag_type;
1: -	__u16 pad;
1: -	__u32 xdiag_ino;
1: -	__u32 xdiag_cookie[2];
1: +  __u8 xdiag_family;
1: +  __u8 xdiag_type;
1: +  __u16 pad;
1: +  __u32 xdiag_ino;
1: +  __u32 xdiag_cookie[2];
1:  };
1:  
1:  enum {
1: -	XDP_DIAG_NONE = 0,
1: -	XDP_DIAG_INFO = 1,
1: -	XDP_DIAG_UID = 2,
1: -	XDP_DIAG_RX_RING = 3,
1: -	XDP_DIAG_TX_RING = 4,
1: -	XDP_DIAG_UMEM = 5,
1: -	XDP_DIAG_UMEM_FILL_RING = 6,
1: -	XDP_DIAG_UMEM_COMPLETION_RING = 7,
1: -	XDP_DIAG_MEMINFO = 8,
1: -	XDP_DIAG_STATS = 9,
1: -	__XDP_DIAG_MAX = 10,
1: +  XDP_DIAG_NONE = 0,
1: +  XDP_DIAG_INFO = 1,
1: +  XDP_DIAG_UID = 2,
1: +  XDP_DIAG_RX_RING = 3,
1: +  XDP_DIAG_TX_RING = 4,
1: +  XDP_DIAG_UMEM = 5,
1: +  XDP_DIAG_UMEM_FILL_RING = 6,
1: +  XDP_DIAG_UMEM_COMPLETION_RING = 7,
1: +  XDP_DIAG_MEMINFO = 8,
1: +  XDP_DIAG_STATS = 9,
1: +  __XDP_DIAG_MAX = 10,
1:  };
1:  
1:  struct xdp_diag_info {
1: -	__u32 ifindex;
1: -	__u32 queue_id;
1: +  __u32 ifindex;
1: +  __u32 queue_id;
1:  };
1:  
1:  struct xdp_diag_ring {
1: -	__u32 entries;
1: +  __u32 entries;
1:  };
1:  
1:  struct xdp_diag_umem {
1: -	__u64 size;
1: -	__u32 id;
1: -	__u32 num_pages;
1: -	__u32 chunk_size;
1: -	__u32 headroom;
1: -	__u32 ifindex;
1: -	__u32 queue_id;
1: -	__u32 flags;
1: -	__u32 refs;
1: +  __u64 size;
1: +  __u32 id;
1: +  __u32 num_pages;
1: +  __u32 chunk_size;
1: +  __u32 headroom;
1: +  __u32 ifindex;
1: +  __u32 queue_id;
1: +  __u32 flags;
1: +  __u32 refs;
1:  };
1:  
1:  struct xdp_diag_stats {
1: -	__u64 n_rx_dropped;
1: -	__u64 n_rx_invalid;
1: -	__u64 n_rx_full;
1: -	__u64 n_fill_ring_empty;
1: -	__u64 n_tx_invalid;
1: -	__u64 n_tx_ring_empty;
1: +  __u64 n_rx_dropped;
1: +  __u64 n_rx_invalid;
1: +  __u64 n_rx_full;
1: +  __u64 n_fill_ring_empty;
1: +  __u64 n_tx_invalid;
1: +  __u64 n_tx_ring_empty;
1:  };
1:  
1:  struct pcibios_fwaddrmap {
1: -	struct list_head list;
1: -	struct pci_dev *dev;
1: -	resource_size_t fw_addr[17];
1: +  struct list_head list;
1: +  struct pci_dev *dev;
1: +  resource_size_t fw_addr[17];
1:  };
1:  
1:  struct pci_check_idx_range {
1: -	int start;
1: -	int end;
1: +  int start;
1: +  int end;
1:  };
1:  
1:  struct pci_raw_ops {
1: -	int (*read)(unsigned int, unsigned int, unsigned int, int, int, u32 *);
1: -	int (*write)(unsigned int, unsigned int, unsigned int, int, int, u32);
1: +  int (*read)(unsigned int, unsigned int, unsigned int, int, int, u32 *);
1: +  int (*write)(unsigned int, unsigned int, unsigned int, int, int, u32);
1:  };
1:  
1:  struct pci_mmcfg_region {
1: -	struct list_head list;
1: -	struct resource res;
1: -	u64 address;
1: -	char *virt;
1: -	u16 segment;
1: -	u8 start_bus;
1: -	u8 end_bus;
1: -	char name[30];
1: +  struct list_head list;
1: +  struct resource res;
1: +  u64 address;
1: +  char *virt;
1: +  u16 segment;
1: +  u8 start_bus;
1: +  u8 end_bus;
1: +  char name[30];
1:  };
1:  
1:  struct acpi_table_mcfg {
1: -	struct acpi_table_header header;
1: -	u8 reserved[8];
1: +  struct acpi_table_header header;
1: +  u8 reserved[8];
1:  };
1:  
1:  struct acpi_mcfg_allocation {
1: -	u64 address;
1: -	u16 pci_segment;
1: -	u8 start_bus_number;
1: -	u8 end_bus_number;
1: -	u32 reserved;
1: +  u64 address;
1: +  u16 pci_segment;
1: +  u8 start_bus_number;
1: +  u8 end_bus_number;
1: +  u32 reserved;
1:  };
1:  
1:  struct pci_mmcfg_hostbridge_probe {
1: -	u32 bus;
1: -	u32 devfn;
1: -	u32 vendor;
1: -	u32 device;
1: -	const char * (*probe)();
1: +  u32 bus;
1: +  u32 devfn;
1: +  u32 vendor;
1: +  u32 device;
1: +  const char *(*probe)();
1:  };
1:  
1:  typedef bool (*check_reserved_t)(u64, u64, unsigned int);
1:  
1:  struct pci_root_info {
1: -	struct acpi_pci_root_info common;
1: -	struct pci_sysdata sd;
1: -	bool mcfg_added;
1: -	u8 start_bus;
1: -	u8 end_bus;
1: +  struct acpi_pci_root_info common;
1: +  struct pci_sysdata sd;
1: +  bool mcfg_added;
1: +  u8 start_bus;
1: +  u8 end_bus;
1:  };
1:  
1:  struct irq_info___2 {
1: -	u8 bus;
1: -	u8 devfn;
1: -	struct {
1: -		u8 link;
1: -		u16 bitmap;
1: -	} __attribute__((packed)) irq[4];
1: -	u8 slot;
1: -	u8 rfu;
1: +  u8 bus;
1: +  u8 devfn;
1: +  struct {
1: +    u8 link;
1: +    u16 bitmap;
1: +  } __attribute__((packed)) irq[4];
1: +  u8 slot;
1: +  u8 rfu;
1:  };
1:  
1:  struct irq_routing_table {
1: -	u32 signature;
1: -	u16 version;
1: -	u16 size;
1: -	u8 rtr_bus;
1: -	u8 rtr_devfn;
1: -	u16 exclusive_irqs;
1: -	u16 rtr_vendor;
1: -	u16 rtr_device;
1: -	u32 miniport_data;
1: -	u8 rfu[11];
1: -	u8 checksum;
1: -	struct irq_info___2 slots[0];
1: +  u32 signature;
1: +  u16 version;
1: +  u16 size;
1: +  u8 rtr_bus;
1: +  u8 rtr_devfn;
1: +  u16 exclusive_irqs;
1: +  u16 rtr_vendor;
1: +  u16 rtr_device;
1: +  u32 miniport_data;
1: +  u8 rfu[11];
1: +  u8 checksum;
1: +  struct irq_info___2 slots[0];
1:  };
1:  
1:  struct irq_router {
1: -	char *name;
1: -	u16 vendor;
1: -	u16 device;
1: -	int (*get)(struct pci_dev *, struct pci_dev *, int);
1: -	int (*set)(struct pci_dev *, struct pci_dev *, int, int);
1: +  char *name;
1: +  u16 vendor;
1: +  u16 device;
1: +  int (*get)(struct pci_dev *, struct pci_dev *, int);
1: +  int (*set)(struct pci_dev *, struct pci_dev *, int, int);
1:  };
1:  
1:  struct irq_router_handler {
1: -	u16 vendor;
1: -	int (*probe)(struct irq_router *, struct pci_dev *, u16);
1: +  u16 vendor;
1: +  int (*probe)(struct irq_router *, struct pci_dev *, u16);
1:  };
1:  
1:  struct pci_setup_rom {
1: -	struct setup_data data;
1: -	uint16_t vendor;
1: -	uint16_t devid;
1: -	uint64_t pcilen;
1: -	long unsigned int segment;
1: -	long unsigned int bus;
1: -	long unsigned int device;
1: -	long unsigned int function;
1: -	uint8_t romdata[0];
1: +  struct setup_data data;
1: +  uint16_t vendor;
1: +  uint16_t devid;
1: +  uint64_t pcilen;
1: +  long unsigned int segment;
1: +  long unsigned int bus;
1: +  long unsigned int device;
1: +  long unsigned int function;
1: +  uint8_t romdata[0];
1:  };
1:  
1:  enum pci_bf_sort_state {
1: -	pci_bf_sort_default = 0,
1: -	pci_force_nobf = 1,
1: -	pci_force_bf = 2,
1: -	pci_dmi_bf = 3,
1: +  pci_bf_sort_default = 0,
1: +  pci_force_nobf = 1,
1: +  pci_force_bf = 2,
1: +  pci_dmi_bf = 3,
1:  };
1:  
1:  struct pci_root_res {
1: -	struct list_head list;
1: -	struct resource res;
1: +  struct list_head list;
1: +  struct resource res;
1:  };
1:  
1:  struct pci_root_info___2 {
1: -	struct list_head list;
1: -	char name[12];
1: -	struct list_head resources;
1: -	struct resource busn;
1: -	int node;
1: -	int link;
1: +  struct list_head list;
1: +  char name[12];
1: +  struct list_head resources;
1: +  struct resource busn;
1: +  int node;
1: +  int link;
1:  };
1:  
1:  struct amd_hostbridge {
1: -	u32 bus;
1: -	u32 slot;
1: -	u32 device;
1: +  u32 bus;
1: +  u32 slot;
1: +  u32 device;
1:  };
1:  
1:  struct saved_msr {
1: -	bool valid;
1: -	struct msr_info info;
1: +  bool valid;
1: +  struct msr_info info;
1:  };
1:  
1:  struct saved_msrs {
1: -	unsigned int num;
1: -	struct saved_msr *array;
1: +  unsigned int num;
1: +  struct saved_msr *array;
1:  };
1:  
1:  struct saved_context {
1: -	struct pt_regs regs;
1: -	u16 ds;
1: -	u16 es;
1: -	u16 fs;
1: -	u16 gs;
1: -	long unsigned int kernelmode_gs_base;
1: -	long unsigned int usermode_gs_base;
1: -	long unsigned int fs_base;
1: -	long unsigned int cr0;
1: -	long unsigned int cr2;
1: -	long unsigned int cr3;
1: -	long unsigned int cr4;
1: -	u64 misc_enable;
1: -	bool misc_enable_saved;
1: -	struct saved_msrs saved_msrs;
1: -	long unsigned int efer;
1: -	u16 gdt_pad;
1: -	struct desc_ptr gdt_desc;
1: -	u16 idt_pad;
1: -	struct desc_ptr idt;
1: -	u16 ldt;
1: -	u16 tss;
1: -	long unsigned int tr;
1: -	long unsigned int safety;
1: -	long unsigned int return_address;
1: +  struct pt_regs regs;
1: +  u16 ds;
1: +  u16 es;
1: +  u16 fs;
1: +  u16 gs;
1: +  long unsigned int kernelmode_gs_base;
1: +  long unsigned int usermode_gs_base;
1: +  long unsigned int fs_base;
1: +  long unsigned int cr0;
1: +  long unsigned int cr2;
1: +  long unsigned int cr3;
1: +  long unsigned int cr4;
1: +  u64 misc_enable;
1: +  bool misc_enable_saved;
1: +  struct saved_msrs saved_msrs;
1: +  long unsigned int efer;
1: +  u16 gdt_pad;
1: +  struct desc_ptr gdt_desc;
1: +  u16 idt_pad;
1: +  struct desc_ptr idt;
1: +  u16 ldt;
1: +  u16 tss;
1: +  long unsigned int tr;
1: +  long unsigned int safety;
1: +  long unsigned int return_address;
1:  } __attribute__((packed));
1:  
1:  typedef int (*pm_cpu_match_t)(const struct x86_cpu_id *);
1: Ignoring changes in the following files (wrong extension):
1:     src/cc/libbpf/travis-ci/vmtest/prepare_selftests-4.9.0.sh
1:     src/cc/libbpf/src/.gitignore
1:     src/cc/libbpf/travis-ci/vmtest/configs/INDEX
1:     src/cc/libbpf/travis-ci/vmtest/prepare_selftests-5.5.0.sh
1:     src/cc/libbpf/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0
1:     docs/kernel-versions.md
1:     src/cc/libbpf/src/libbpf.map
1:     src/cc/libbpf/travis-ci/vmtest/checkout_latest_kernel.sh
1:     src/cc/libbpf/src/Makefile
1:     src/cc/libbpf/travis-ci/vmtest/run.sh
1:     src/cc/libbpf/.travis.yml
1:     src/cc/libbpf/.lgtm.yml
1:     src/cc/libbpf/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
1:     src/cc/libbpf/LICENSE.LGPL-2.1
1:     src/cc/libbpf/travis-ci/managers/travis_wait.bash
1:     src/cc/libbpf/travis-ci/vmtest/configs/latest.config
1:     src/cc/libbpf/travis-ci/vmtest/prepare_selftests.sh
1:     src/cc/libbpf/travis-ci/vmtest/mkrootfs.sh
1:     src/cc/libbpf/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
1:     src/cc/libbpf/travis-ci/vmtest/build_selftests.sh
1:     src/cc/libbpf/travis-ci/vmtest/run_selftests.sh
1:     src/cc/libbpf/README.md
1:     src/cc/libbpf/travis-ci/vmtest/run_vmtest.sh
1:     src/cc/libbpf/travis-ci/managers/debian.sh
1:     src/cc/libbpf/LICENSE
1:     src/cc/libbpf/LICENSE.BSD-2-Clause
1:     src/cc/libbpf/BPF-CHECKPOINT-COMMIT
1:     src/cc/libbpf/travis-ci/vmtest/build_pahole.sh
1:     src/cc/libbpf/scripts/sync-kernel.sh
1:     src/cc/libbpf/travis-ci/managers/ubuntu.sh
1:     src/cc/libbpf/scripts/coverity.sh
1:     src/cc/libbpf/CHECKPOINT-COMMIT
1:     src/cc/libbpf/src/libbpf.pc.template
1:     src/cc/libbpf/travis-ci/vmtest/helpers.sh
1: Running clang-format on the following files:
1:     src/cc/libbpf.c
1:     src/cc/libbpf/src/btf.h
1:     src/cc/libbpf/travis-ci/vmtest/vmlinux.h
1:     src/cc/libbpf/src/btf.c
1:     src/cc/libbpf/src/libbpf_internal.h
1:     src/cc/libbpf/src/bpf_helper_defs.h
1:     src/cc/libbpf/src/skel_internal.h
1:     src/cc/libbpf/include/uapi/linux/if_link.h
1:     src/cc/libbpf/src/btf_dump.c
1:     src/cc/libbpf/src/strset.h
1:     src/cc/libbpf/src/strset.c
1:     src/cc/libbpf/src/hashmap.c
1:     src/cc/libbpf/src/hashmap.h
1:     src/cc/libbpf/include/uapi/linux/pkt_sched.h
1:     src/cc/export/helpers.h
1:     src/cc/libbpf/include/asm/barrier.h
1:     src/cc/libbpf/src/netlink.c
1:     src/cc/libbpf/src/libbpf_errno.c
1:     introspection/bps.c
1:     src/cc/libbpf/include/uapi/linux/bpf_common.h
1:     src/cc/libbpf/src/libbpf.h
1:     src/cc/libbpf/src/libbpf.c
1:     src/cc/libbpf/include/linux/compiler.h
1:     src/cc/libbpf/include/linux/kernel.h
1:     src/cc/libbpf/include/linux/list.h
1:     src/cc/libbpf/include/uapi/linux/if_xdp.h
1:     src/cc/libbpf/src/ringbuf.c
1:     src/cc/libbpf/include/linux/err.h
1:     src/cc/libbpf/src/linker.c
1:     src/cc/libbpf/src/bpf_endian.h
1:     src/cc/libbpf/include/linux/types.h
1:     src/cc/libbpf/include/linux/overflow.h
1:     src/cc/libbpf/src/nlattr.c
1:     src/cc/libbpf/src/xsk.c
1:     src/cc/libbpf/src/nlattr.h
1:     src/cc/libbpf/src/xsk.h
1:     src/cc/libbpf/src/str_error.c
1:     src/cc/libbpf/src/str_error.h
1:     src/cc/libbpf/src/libbpf_probes.c
1:     src/cc/libbpf/src/bpf.c
1:     src/cc/libbpf/src/bpf.h
1:     src/cc/libbpf/include/uapi/linux/bpf.h
1:     src/cc/libbpf/src/bpf_core_read.h
1:     src/cc/libbpf/src/libbpf_legacy.h
1:     src/cc/libbpf/include/uapi/linux/btf.h
1:     src/cc/libbpf/include/uapi/linux/netlink.h
1:     src/cc/libbpf/src/bpf_tracing.h
1:     src/cc/libbpf/src/bpf_gen_internal.h
1:     src/cc/libbpf/src/bpf_prog_linfo.c
1:     src/cc/libbpf/include/uapi/linux/pkt_cls.h
1:     src/cc/libbpf/src/bpf_helpers.h
1:     src/cc/libbpf/src/gen_loader.c
1:     src/cc/compat/linux/virtual_bpf.h
1:     src/cc/libbpf/include/linux/ring_buffer.h
1:     src/cc/libbpf/src/libbpf_common.h
1:     src/cc/libbpf/include/linux/filter.h
1: old tree: f462928d1187bff6b89cce7524e46980c52f473c
1: new tree: bbc83386d6cd310452f37cb19202c0029e5f914d
 1/46 Test  #1: style-check ......................   Passed   12.01 sec
test 2
      Start  2: c_test_static

2: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "c_test_static" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/cc/test_static"
2: Test timeout computed to be: 9.99988e+06
2: clang -cc1 -triple x86_64-unknown-linux-gnu -emit-llvm-bc -emit-llvm-uselists -disable-free -disable-llvm-verifier -main-file-name main.c -mrelocation-model static -mthread-model posix -fmath-errno -masm-verbose -mconstructor-aliases -fuse-init-array -target-cpu x86-64 -momit-leaf-frame-pointer -dwarf-column-info -debugger-tuning=gdb -coverage-file /usr/src/linux-headers-4.13.0-38-generic/main.c -nostdsysteminc -nobuiltininc -resource-dir ../lib/clang/3.8.1 -isystem /virtual/lib/clang/include -include ./include/linux/kconfig.h -include /virtual/include/bcc/bpf.h -include /virtual/include/bcc/bpf_workaround.h -include /virtual/include/bcc/helpers.h -isystem /virtual/include -I /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/cc -D __BPF_TRACING__ -I arch/x86/include/ -I arch/x86/include/generated -I include -I arch/x86/include/uapi -I arch/x86/include/generated/uapi -I include/uapi -I include/generated/uapi -D __KERNEL__ -D KBUILD_MODNAME="bcc" -O2 -Wno-deprecated-declarations -Wno-gnu-variable-sized-type-not-at-end -Wno-pragma-once-outside-header -Wno-address-of-packed-member -Wno-unknown-warning-option -Wno-unused-value -Wno-pointer-sign -fdebug-compilation-dir /usr/src/linux-headers-4.13.0-38-generic -ferror-limit 19 -fmessage-length 0 -fobjc-runtime=gcc -fdiagnostics-show-option -vectorize-loops -vectorize-slp -o main.bc -x c /virtual/main.c
2: #if defined(BPF_LICENSE)
2: #error BPF_LICENSE cannot be specified through cflags
2: #endif
2: #if !defined(CONFIG_CC_STACKPROTECTOR)
2: #if defined(CONFIG_CC_STACKPROTECTOR_AUTO) \
2:     || defined(CONFIG_CC_STACKPROTECTOR_REGULAR) \
2:     || defined(CONFIG_CC_STACKPROTECTOR_STRONG)
2: #define CONFIG_CC_STACKPROTECTOR
2: #endif
2: #endif
2: #define bpf_probe_read_kernel bpf_probe_read
2: #define bpf_probe_read_kernel_str bpf_probe_read_str
2: #define bpf_probe_read_user bpf_probe_read
2: #define bpf_probe_read_user_str bpf_probe_read_str
2: BPF_TABLE("array", int, int, stats, 10);
2: 
2: #include <bcc/footer.h>
2: Running from kernel directory at: /lib/modules/4.13.0-38-generic/build
 2/46 Test  #2: c_test_static ....................   Passed    1.02 sec
test 3
      Start  3: test_libbcc

3: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "c_test_all" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/cc/test_libbcc"
3: Test timeout computed to be: 9.99988e+06
3: Parse error:
3:     4@i%ra+1r
3: -------^
3: unshare: failed to execute ruby: No such file or directory
3: 
3: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3: test_libbcc is a Catch v1.4.0 host application.
3: Run with -? for options
3: 
3: -------------------------------------------------------------------------------
3: test probing running Ruby process in namespaces
3:   in separate mount namespace
3: -------------------------------------------------------------------------------
3: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/cc/test_usdt_probes.cc:352
3: ...............................................................................
3: 
3: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/cc/test_usdt_probes.cc:367: FAILED:
3:   REQUIRE( res.msg() == "" )
3: with expansion:
3:   "Unable to load USDT ruby:gc__mark__begin from binary  PID 7443 for probe
3:   on_event"
3:   ==
3:   ""
3: 
3: unshare: unrecognized option '--kill-child'
3: Try 'unshare --help' for more information.
3: -------------------------------------------------------------------------------
3: test probing running Ruby process in namespaces
3:   in separate mount namespace and separate PID namespace
3: -------------------------------------------------------------------------------
3: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/cc/test_usdt_probes.cc:352
3: ...............................................................................
3: 
3: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/cc/test_usdt_probes.cc:393: FAILED:
3:   REQUIRE( res.msg() == "" )
3: with expansion:
3:   "No valid Binary Path or PID provided"
3:   ==
3:   ""
3: 
3: ===============================================================================
3: test cases:  41 |  40 passed | 1 failed as expected
3: assertions: 658 | 656 passed | 2 failed as expected
3: 
 3/46 Test  #3: test_libbcc ......................   Passed   15.48 sec
test 4
      Start  4: py_test_stat1_b

4: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_stat1_b" "namespace" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_stat1.py" "test_stat1.b" "proto.b"
4: Test timeout computed to be: 9.99988e+06
4: Actual changes:
4: tx-checksumming: off
4: 	tx-checksum-ip-generic: off
4: 	tx-checksum-sctp: off
4: tcp-segmentation-offload: off
4: 	tx-tcp-segmentation: off [requested on]
4: 	tx-tcp-ecn-segmentation: off [requested on]
4: 	tx-tcp-mangleid-segmentation: off [requested on]
4: 	tx-tcp6-segmentation: off [requested on]
4: udp-fragmentation-offload: off [requested on]
4: .PING 172.16.1.1 (172.16.1.1) 56(84) bytes of data.
4: . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
4: --- 172.16.1.1 ping statistics ---
4: 100 packets transmitted, 100 received, 0% packet loss, time 2ms
4: rtt min/avg/max/mdev = 0.006/0.009/0.145/0.014 ms, ipg/ewma 0.024/0.009 ms
4: .
4: ----------------------------------------------------------------------
4: Ran 2 tests in 0.510s
4: 
4: OK
 4/46 Test  #4: py_test_stat1_b ..................   Passed    1.28 sec
test 5
      Start  5: py_test_bpf_log

5: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_bpf_prog" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_bpf_log.py"
5: Test timeout computed to be: 9.99988e+06
 5/46 Test  #5: py_test_bpf_log ..................   Passed    1.68 sec
test 6
      Start  6: py_test_stat1_c

6: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_stat1_c" "namespace" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_stat1.py" "test_stat1.c"
6: Test timeout computed to be: 9.99988e+06
6: Actual changes:
6: tx-checksumming: off
6: 	tx-checksum-ip-generic: off
6: 	tx-checksum-sctp: off
6: tcp-segmentation-offload: off
6: 	tx-tcp-segmentation: off [requested on]
6: 	tx-tcp-ecn-segmentation: off [requested on]
6: 	tx-tcp-mangleid-segmentation: off [requested on]
6: 	tx-tcp6-segmentation: off [requested on]
6: udp-fragmentation-offload: off [requested on]
6: .PING 172.16.1.1 (172.16.1.1) 56(84) bytes of data.
6: . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
6: --- 172.16.1.1 ping statistics ---
6: 100 packets transmitted, 100 received, 0% packet loss, time 2ms
6: rtt min/avg/max/mdev = 0.004/0.007/0.086/0.010 ms, ipg/ewma 0.020/0.006 ms
6: .
6: ----------------------------------------------------------------------
6: Ran 2 tests in 0.501s
6: 
6: OK
 6/46 Test  #6: py_test_stat1_c ..................   Passed    0.90 sec
test 7
      Start  7: py_test_xlate1_c

7: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_xlate1_c" "namespace" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_xlate1.py" "test_xlate1.c"
7: Test timeout computed to be: 9.99988e+06
7: Actual changes:
7: tx-checksumming: off
7: 	tx-checksum-ip-generic: off
7: 	tx-checksum-sctp: off
7: tcp-segmentation-offload: off
7: 	tx-tcp-segmentation: off [requested on]
7: 	tx-tcp-ecn-segmentation: off [requested on]
7: 	tx-tcp-mangleid-segmentation: off [requested on]
7: 	tx-tcp6-segmentation: off [requested on]
7: udp-fragmentation-offload: off [requested on]
7: PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data.
7: 64 bytes from 192.168.1.1: icmp_seq=1 ttl=64 time=0.066 ms
7: 
7: --- 192.168.1.1 ping statistics ---
7: 1 packets transmitted, 1 received, 0% packet loss, time 0ms
7: rtt min/avg/max/mdev = 0.066/0.066/0.066/0.000 ms
7: .
7: ----------------------------------------------------------------------
7: Ran 1 test in 0.329s
7: 
7: OK
 7/46 Test  #7: py_test_xlate1_c .................   Passed    1.02 sec
test 8
      Start  8: py_test_call1

8: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_call1_c" "namespace" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_call1.py" "test_call1.c"
8: Test timeout computed to be: 9.99988e+06
8: Actual changes:
8: tx-checksumming: off
8: 	tx-checksum-ip-generic: off
8: 	tx-checksum-sctp: off
8: tcp-segmentation-offload: off
8: 	tx-tcp-segmentation: off [requested on]
8: 	tx-tcp-ecn-segmentation: off [requested on]
8: 	tx-tcp-mangleid-segmentation: off [requested on]
8: 	tx-tcp6-segmentation: off [requested on]
8: udp-fragmentation-offload: off [requested on]
8: .
8: ----------------------------------------------------------------------
8: Ran 1 test in 0.255s
8: 
8: OK
 8/46 Test  #8: py_test_call1 ....................   Passed    1.00 sec
test 9
      Start  9: py_test_trace1

9: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_trace1" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_trace1.py" "test_trace1.b" "kprobe.b"
9: Test timeout computed to be: 9.99988e+06
9: .
9: ----------------------------------------------------------------------
9: Ran 1 test in 0.365s
9: 
9: OK
9: ('fd 8:', 'stat1 1', 'stat2 1')
9: ('fd ffff899a13137e00:', 'stat1 2', 'stat2 0')
9: ('fd 9:', 'stat1 200', 'stat2 100')
9: ('fd 7:', 'stat1 0', 'stat2 1')
 9/46 Test  #9: py_test_trace1 ...................   Passed    0.57 sec
test 10
      Start 10: py_test_trace2

10: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_trace2" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_trace2.py"
10: Test timeout computed to be: 9.99988e+06
10: .
10: ----------------------------------------------------------------------
10: Ran 1 test in 4.262s
10: 
10: OK
10: ('ptr ffff899a16a05d00:', 'stat1 (0 2)')
10: ('ptr ffff899a16a20000:', 'stat1 (0 102)')
10: ('ptr ffff899a1336ae80:', 'stat1 (0 6)')
10: ('ptr ffff899a01a5ae80:', 'stat1 (0 4)')
10: ('ptr ffff899a16a22e80:', 'stat1 (0 1)')
10: ('ptr ffff899a12ed9740:', 'stat1 (0 1)')
10: ('ptr ffff899a16a21740:', 'stat1 (0 1)')
10: ('ptr ffff899a136aae80:', 'stat1 (0 10)')
10: ('ptr ffff899a169cc5c0:', 'stat1 (0 1)')
10: ('ptr ffffffff8a412480:', 'stat1 (0 47)')
10: ('ptr ffff899a13368000:', 'stat1 (0 20)')
10: ('ptr ffff899a11c10000:', 'stat1 (0 1)')
10: ('ptr ffff899a15b30000:', 'stat1 (0 100)')
10: ('ptr ffff899a14b5ae80:', 'stat1 (0 1)')
10: ('ptr ffff899a12fa1740:', 'stat1 (0 1)')
10: ('ptr ffff899a01a5c5c0:', 'stat1 (0 1)')
10: ('ptr ffff899a01921740:', 'stat1 (0 1)')
10/46 Test #10: py_test_trace2 ...................   Passed    4.36 sec
test 11
      Start 11: py_test_trace3_c

11: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_trace3_c" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_trace3.py" "test_trace3.c"
11: Test timeout computed to be: 9.99988e+06
11: 1024+0 records in
11: 1024+0 records out
11: 4194304 bytes (4.2 MB, 4.0 MiB) copied, 0.00426227 s, 984 MB/s
11: 1024+0 records in
11: 1024+0 records out
11: 4194304 bytes (4.2 MB, 4.0 MiB) copied, 0.0167596 s, 250 MB/s
11: ('latency 0:', 'count 0')
11: ('latency 1:', 'count 0')
11: ('latency 2:', 'count 0')
11: ('latency 3:', 'count 0')
11: ('latency 4:', 'count 0')
11: ('latency 5:', 'count 0')
11: ('latency 6:', 'count 0')
11: ('latency 7:', 'count 0')
11: ('latency 8:', 'count 0')
11: ('latency 9:', 'count 0')
11: ('latency 10:', 'count 0')
11: ('latency 11:', 'count 0')
11: ('latency 12:', 'count 0')
11: ('latency 13:', 'count 0')
11: ('latency 14:', 'count 0')
11: ('latency 15:', 'count 0')
11: ('latency 16:', 'count 0')
11: ('latency 17:', 'count 0')
11: ('latency 18:', 'count 0')
11: ('latency 19:', 'count 0')
11: ('latency 20:', 'count 0')
11: ('latency 21:', 'count 0')
11: ('latency 22:', 'count 0')
11: ('latency 23:', 'count 0')
11: ('latency 24:', 'count 0')
11: ('latency 25:', 'count 0')
11: ('latency 26:', 'count 0')
11: ('latency 27:', 'count 0')
11: ('latency 28:', 'count 0')
11: ('latency 29:', 'count 0')
11: ('latency 30:', 'count 0')
11: ('latency 31:', 'count 0')
11: ('latency 32:', 'count 0')
11: ('latency 33:', 'count 0')
11: ('latency 34:', 'count 0')
11: ('latency 35:', 'count 0')
11: ('latency 36:', 'count 0')
11: ('latency 37:', 'count 0')
11: ('latency 38:', 'count 0')
11: ('latency 39:', 'count 0')
11: ('latency 40:', 'count 0')
11: ('latency 41:', 'count 0')
11: ('latency 42:', 'count 0')
11: ('latency 43:', 'count 0')
11: ('latency 44:', 'count 0')
11: ('latency 45:', 'count 0')
11: ('latency 46:', 'count 0')
11: ('latency 47:', 'count 0')
11: ('latency 48:', 'count 0')
11: ('latency 49:', 'count 0')
11: ('latency 50:', 'count 0')
11: ('latency 51:', 'count 0')
11: ('latency 52:', 'count 0')
11: ('latency 53:', 'count 0')
11: ('latency 54:', 'count 0')
11: ('latency 55:', 'count 0')
11: ('latency 56:', 'count 0')
11: ('latency 57:', 'count 0')
11: ('latency 58:', 'count 0')
11: ('latency 59:', 'count 0')
11: ('latency 60:', 'count 0')
11: ('latency 61:', 'count 0')
11: ('latency 62:', 'count 0')
11: ('latency 63:', 'count 0')
11: ('latency 64:', 'count 0')
11: ('latency 65:', 'count 0')
11: ('latency 66:', 'count 0')
11: ('latency 67:', 'count 0')
11: ('latency 68:', 'count 0')
11: ('latency 69:', 'count 0')
11: ('latency 70:', 'count 0')
11: ('latency 71:', 'count 0')
11: ('latency 72:', 'count 0')
11: ('latency 73:', 'count 0')
11: ('latency 74:', 'count 0')
11: ('latency 75:', 'count 0')
11: ('latency 76:', 'count 0')
11: ('latency 77:', 'count 0')
11: ('latency 78:', 'count 0')
11: ('latency 79:', 'count 0')
11: ('latency 80:', 'count 0')
11: ('latency 81:', 'count 0')
11: ('latency 82:', 'count 0')
11: ('latency 83:', 'count 0')
11: ('latency 84:', 'count 0')
11: ('latency 85:', 'count 0')
11: ('latency 86:', 'count 0')
11: ('latency 87:', 'count 0')
11: ('latency 88:', 'count 0')
11: ('latency 89:', 'count 0')
11: ('latency 90:', 'count 0')
11: ('latency 91:', 'count 0')
11: ('latency 92:', 'count 0')
11: ('latency 93:', 'count 0')
11: ('latency 94:', 'count 0')
11: ('latency 95:', 'count 0')
11: ('latency 96:', 'count 0')
11: ('latency 97:', 'count 0')
11: ('latency 98:', 'count 0')
11: ('latency 99:', 'count 0')
11: .
11: ----------------------------------------------------------------------
11: Ran 1 test in 1.597s
11: 
11: OK
11/46 Test #11: py_test_trace3_c .................   Passed    1.81 sec
test 12
      Start 12: py_test_trace4

12: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_trace4" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_trace4.py"
12: Test timeout computed to be: 9.99988e+06
12: ..
12: ----------------------------------------------------------------------
12: Ran 2 tests in 1.518s
12: 
12: OK
12/46 Test #12: py_test_trace4 ...................   Passed    1.73 sec
test 13
      Start 13: py_test_trace_maxactive

13: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_trace_maxactive" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_trace_maxactive.py"
13: Test timeout computed to be: 9.99988e+06
13: .
13: ----------------------------------------------------------------------
13: Ran 1 test in 0.955s
13: 
13: OK
13/46 Test #13: py_test_trace_maxactive ..........   Passed    1.11 sec
test 14
      Start 14: py_test_probe_count

14: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_probe_count" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_probe_count.py"
14: Test timeout computed to be: 9.99988e+06
14: ...cannot attach kprobe, probe entry may not exist
14: ...
14: ----------------------------------------------------------------------
14: Ran 6 tests in 5.635s
14: 
14: OK
14/46 Test #14: py_test_probe_count ..............   Passed    5.69 sec
test 15
      Start 15: py_test_debuginfo

15: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_debuginfo" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_debuginfo.py"
15: Test timeout computed to be: 9.99988e+06
15: ......
15: ----------------------------------------------------------------------
15: Ran 6 tests in 0.539s
15: 
15: OK
15/46 Test #15: py_test_debuginfo ................   Passed    0.65 sec
test 16
      Start 16: py_test_brb

16: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_brb_c" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_brb.py" "test_brb.c"
16: Test timeout computed to be: 9.99988e+06
16: net.ipv4.ip_forward = 1
16: ARPING 100.1.1.254
16: 42 bytes from 7a:ba:5f:6f:7a:65 (100.1.1.254): index=0 time=6.829 usec
16: 
16: --- 100.1.1.254 statistics ---
16: 1 packets transmitted, 1 packets received,   0% unanswered (0 extra)
16: rtt min/avg/max/std-dev = 0.007/0.007/0.007/0.000 ms
16: ARPING 200.1.1.254
16: 42 bytes from 2a:c9:7b:a2:d0:18 (200.1.1.254): index=0 time=6.742 usec
16: 
16: --- 200.1.1.254 statistics ---
16: 1 packets transmitted, 1 packets received,   0% unanswered (0 extra)
16: rtt min/avg/max/std-dev = 0.007/0.007/0.007/0.000 ms
16: PING 200.1.1.1 (200.1.1.1) 56(84) bytes of data.
16: 64 bytes from 200.1.1.1: icmp_seq=1 ttl=63 time=0.128 ms
16: 64 bytes from 200.1.1.1: icmp_seq=2 ttl=63 time=0.116 ms
16: 
16: --- 200.1.1.1 ping statistics ---
16: 2 packets transmitted, 2 received, 0% packet loss, time 1031ms
16: rtt min/avg/max/mdev = 0.116/0.122/0.128/0.006 ms
16: [ ID] Interval       Transfer     Bandwidth
16: [  9]  0.0- 1.0 sec  2.40 GBytes  20.6 Gbits/sec
16: [ ID] Interval       Transfer     Bandwidth
16: [ 10]  0.0- 1.0 sec  2.40 GBytes  20.5 Gbits/sec
16: Starting netserver with host 'IN(6)ADDR_ANY' port '12865' and family AF_UNSPEC
16: MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 200.1.1.1 () port 0 AF_INET : demo
16: Recv   Send    Send                          
16: Socket Socket  Message  Elapsed              
16: Size   Size    Size     Time     Throughput  
16: bytes  bytes   bytes    secs.    10^6bits/sec  
16: 
16:  87380  16384  65160    1.00     23289.10   
16: MIGRATED TCP REQUEST/RESPONSE TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 200.1.1.1 () port 0 AF_INET : demo : first burst 0
16: Local /Remote
16: Socket Size   Request  Resp.   Elapsed  Trans.
16: Send   Recv   Size     Size    Time     Rate         
16: bytes  Bytes  bytes    bytes   secs.    per sec   
16: 
16: 16384  87380  1        1       1.00     19649.53   
16: 16384  87380 
16: .
16: ----------------------------------------------------------------------
16: Ran 1 test in 9.807s
16: 
16: OK
16/46 Test #16: py_test_brb ......................   Passed    9.94 sec
test 17
      Start 17: py_test_brb2

17: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_brb2_c" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_brb2.py" "test_brb2.c"
17: Test timeout computed to be: 9.99988e+06
17: net.ipv4.ip_forward = 1
17: PING 200.1.1.1 (200.1.1.1) 56(84) bytes of data.
17: 64 bytes from 200.1.1.1: icmp_seq=1 ttl=63 time=0.197 ms
17: 64 bytes from 200.1.1.1: icmp_seq=2 ttl=63 time=0.075 ms
17: 
17: --- 200.1.1.1 ping statistics ---
17: 2 packets transmitted, 2 received, 0% packet loss, time 1011ms
17: rtt min/avg/max/mdev = 0.075/0.136/0.197/0.061 ms
17: [ ID] Interval       Transfer     Bandwidth
17: [  9]  0.0- 1.0 sec  2.20 GBytes  18.9 Gbits/sec
17: [ ID] Interval       Transfer     Bandwidth
17: [ 10]  0.0- 1.0 sec  2.20 GBytes  18.8 Gbits/sec
17: Starting netserver with host 'IN(6)ADDR_ANY' port '12865' and family AF_UNSPEC
17: MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 200.1.1.1 () port 0 AF_INET : demo
17: Recv   Send    Send                          
17: Socket Socket  Message  Elapsed              
17: Size   Size    Size     Time     Throughput  
17: bytes  bytes   bytes    secs.    10^6bits/sec  
17: 
17:  87380  16384  65160    1.00     22122.26   
17: MIGRATED TCP REQUEST/RESPONSE TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 200.1.1.1 () port 0 AF_INET : demo : first burst 0
17: Local /Remote
17: Socket Size   Request  Resp.   Elapsed  Trans.
17: Send   Recv   Size     Size    Time     Rate         
17: bytes  Bytes  bytes    bytes   secs.    per sec   
17: 
17: 16384  87380  1        1       1.00     17852.43   
17: 16384  87380 
17: .
17: ----------------------------------------------------------------------
17: Ran 1 test in 7.805s
17: 
17: OK
17/46 Test #17: py_test_brb2 .....................   Passed    7.95 sec
test 18
      Start 18: py_test_clang

18: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_clang" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_clang.py"
18: Test timeout computed to be: 9.99988e+06
18: .............In file included from /virtual/main.c:3:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ./virtual/main.c:2:1: error: field has incomplete type 'struct key_t'
18: BPF_HASH(drops, struct key_t);
18: ^
18: /virtual/include/bcc/helpers.h:257:48: note: expanded from macro 'BPF_HASH'
18:   BPF_HASHX(__VA_ARGS__, BPF_HASH4, BPF_HASH3, BPF_HASH2, BPF_HASH1)(__VA_ARGS__)
18:                                                ^
18: /virtual/main.c:2:24: note: forward declaration of 'struct key_t'
18: BPF_HASH(drops, struct key_t);
18:                        ^
18: /virtual/main.c:2:1: error: field has incomplete type 'struct key_t'
18: BPF_HASH(drops, struct key_t);
18: ^
18: /virtual/include/bcc/helpers.h:257:48: note: expanded from macro 'BPF_HASH'
18:   BPF_HASHX(__VA_ARGS__, BPF_HASH4, BPF_HASH3, BPF_HASH2, BPF_HASH1)(__VA_ARGS__)
18:                                                ^
18: /virtual/main.c:2:24: note: forward declaration of 'struct key_t'
18: BPF_HASH(drops, struct key_t);
18:                        ^
18: 2 errors generated.
18: ../virtual/main.c:6:12: error: cannot call non-static helper function
18:     return bar();
18:            ^
18: 1 error generated.
18: ..ss....In file included from /virtual/main.c:3:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ...In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .........In file included from /virtual/main.c:2:
18: In file included from include/net/tcp.h:24:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/tcp.h:24:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .......In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ..In file included from /virtual/main.c:3:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ...In file included from /virtual/main.c:3:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/inet_sock.h:27:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ../virtual/main.c:7:12: warning: incompatible pointer to integer conversion returning 'u32 *' (aka 'unsigned int *') from a function with result type 'int' [-Wint-conversion]
18:     return *(&skp->sk_daddr);
18:            ^~~~~~~~~~~~~~~~~
18: 1 warning generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:3:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ...In file included from /virtual/main.c:2:
18: In file included from include/net/tcp.h:24:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: .In file included from /virtual/main.c:2:
18: In file included from include/net/tcp.h:24:
18: In file included from include/linux/tcp.h:23:
18: In file included from include/net/sock.h:58:
18: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(pn->memcg, idx, val);
18:         ~~~~~~~~~~~~~~~            ^~~
18: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         __mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
18:         mod_memcg_state(page->mem_cgroup, idx, val);
18:         ~~~~~~~~~~~~~~~                   ^~~
18: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
18:                 count_memcg_events(page->mem_cgroup, idx, 1);
18:                 ~~~~~~~~~~~~~~~~~~                   ^~~
18: 5 warnings generated.
18: ........./virtual/main.c:1:30: error: expected expression
18: int failure(void *ctx) { if (); return 0; }
18:                              ^
18: 1 error generated.
18: ../virtual/main.c:3:73: error: too many arguments, bcc only supports in-register parameters
18: int many(struct pt_regs *ctx, int a, int b, int c, int d, int e, int f, int g) {
18:                                                                         ^
18: 1 error generated.
18: ....
18: ----------------------------------------------------------------------
18: Ran 83 tests in 79.040s
18: 
18: OK (skipped=2)
18: 0
18/46 Test #18: py_test_clang ....................   Passed   79.50 sec
test 19
      Start 19: py_test_histogram

19: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_histogram" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_histogram.py"
19: Test timeout computed to be: 9.99988e+06
19: 
19: Bucket ptr = 'kworker/1:1'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 0        |                                        |
19:   67108864 -> 134217727  : 2        |****************************************|
19: 
19: Bucket ptr = 'python'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 2        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 0        |                                        |
19:   67108864 -> 134217727  : 200      |****************************************|
19: 
19: Bucket ptr = 'RemoteInvocatio'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 10       |****************************************|
19: 
19: Bucket ptr = 'rcu_sched'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 4        |****************************************|
19: 
19: Bucket ptr = 'iscsid'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 0        |                                        |
19:   67108864 -> 134217727  : 2        |****************************************|
19: 
19: Bucket ptr = 'ctest'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 20       |****************************************|
19: 
19: Bucket ptr = 'VM Periodic Tas'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 40       |****************************************|
19: 
19: Bucket ptr = 'VM Thread'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 0        |                                        |
19:   67108864 -> 134217727  : 2        |****************************************|
19: 
19: Bucket ptr = 'swapper/0'
19:      value               : count     distribution
19:          0 -> 1          : 4        |****                                    |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 4        |****                                    |
19:    4194304 -> 8388607    : 2        |**                                      |
19:    8388608 -> 16777215   : 2        |**                                      |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 8        |********                                |
19:   67108864 -> 134217727  : 10       |**********                              |
19:  134217728 -> 268435455  : 40       |****************************************|
19:  268435456 -> 536870911  : 20       |********************                    |
19: 
19: Bucket ptr = 'kworker/u4:0'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 2        |****************************************|
19: 
19: Bucket ptr = 'kworker/0:8'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 2        |****************************************|
19: 
19: Bucket ptr = 'G1 Young RemSet'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 8        |****************************************|
19: 
19: Bucket ptr = 'gmain'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 2        |****************************************|
19: 
19: Bucket ptr = 'ntpd'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0   ....
19: ----------------------------------------------------------------------
19: Ran 4 tests in 3.724s
19: 
19: OK
19:      |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 0        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 2        |****************************************|
19: 
19: Bucket ptr = 'swapper/1'
19:      value               : count     distribution
19:          0 -> 1          : 0        |                                        |
19:          2 -> 3          : 0        |                                        |
19:          4 -> 7          : 0        |                                        |
19:          8 -> 15         : 0        |                                        |
19:         16 -> 31         : 0        |                                        |
19:         32 -> 63         : 0        |                                        |
19:         64 -> 127        : 0        |                                        |
19:        128 -> 255        : 0        |                                        |
19:        256 -> 511        : 0        |                                        |
19:        512 -> 1023       : 0        |                                        |
19:       1024 -> 2047       : 0        |                                        |
19:       2048 -> 4095       : 0        |                                        |
19:       4096 -> 8191       : 0        |                                        |
19:       8192 -> 16383      : 0        |                                        |
19:      16384 -> 32767      : 0        |                                        |
19:      32768 -> 65535      : 0        |                                        |
19:      65536 -> 131071     : 0        |                                        |
19:     131072 -> 262143     : 0        |                                        |
19:     262144 -> 524287     : 0        |                                        |
19:     524288 -> 1048575    : 0        |                                        |
19:    1048576 -> 2097151    : 0        |                                        |
19:    2097152 -> 4194303    : 0        |                                        |
19:    4194304 -> 8388607    : 0        |                                        |
19:    8388608 -> 16777215   : 2        |                                        |
19:   16777216 -> 33554431   : 0        |                                        |
19:   33554432 -> 67108863   : 2        |                                        |
19:   67108864 -> 134217727  : 200      |****************************************|
19/46 Test #19: py_test_histogram ................   Passed    3.79 sec
test 20
      Start 20: py_array

20: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_array" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_array.py"
20: Test timeout computed to be: 9.99988e+06
20: ....
20: ----------------------------------------------------------------------
20: Ran 4 tests in 1.626s
20: 
20: OK
20/46 Test #20: py_array .........................   Passed    1.68 sec
test 21
      Start 21: py_uprobes

21: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_uprobes" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_uprobes.py"
21: Test timeout computed to be: 9.99988e+06
21: .Python 2.7.14
21: .Arena 0:
21: system bytes     =   29110272
21: in use bytes     =    3155280
21: Total (incl. mmap):
21: system bytes     =   29900800
21: in use bytes     =    3945808
21: max mmap regions =          7
21: max mmap bytes   =    9203712
21: .
21: ----------------------------------------------------------------------
21: Ran 3 tests in 8.669s
21: 
21: OK
21/46 Test #21: py_uprobes .......................   Passed    8.73 sec
test 22
      Start 22: py_uprobes_2

22: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_uprobes2" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_uprobes2.py"
22: Test timeout computed to be: 9.99988e+06
22: .
22: ----------------------------------------------------------------------
22: Ran 1 test in 0.289s
22: 
22: OK
22/46 Test #22: py_uprobes_2 .....................   Passed    0.37 sec
test 23
      Start 23: py_test_stackid

23: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_stackid" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_stackid.py"
23: Test timeout computed to be: 9.99988e+06
23: s.
23: ----------------------------------------------------------------------
23: Ran 2 tests in 0.357s
23: 
23: OK (skipped=1)
23/46 Test #23: py_test_stackid ..................   Passed    0.52 sec
test 24
      Start 24: py_test_tracepoint

24: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_tracepoint" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_tracepoint.py"
24: Test timeout computed to be: 9.99988e+06
24: ..
24: ----------------------------------------------------------------------
24: Ran 2 tests in 2.475s
24: 
24: OK
24/46 Test #24: py_test_tracepoint ...............   Passed    2.56 sec
test 25
      Start 25: py_test_perf_event

25: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_perf_event" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_perf_event.py"
25: Test timeout computed to be: 9.99988e+06
25: perf_event_open: No such file or directory
25: s
25: ----------------------------------------------------------------------
25: Ran 1 test in 0.357s
25: 
25: OK (skipped=1)
25/46 Test #25: py_test_perf_event ...............   Passed    0.51 sec
test 26
      Start 26: py_test_utils

26: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_utils" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_utils.py"
26: Test timeout computed to be: 9.99988e+06
26: ..
26: ----------------------------------------------------------------------
26: Ran 2 tests in 0.001s
26: 
26: OK
26/46 Test #26: py_test_utils ....................   Passed    0.05 sec
test 27
      Start 27: py_test_percpu

27: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_percpu" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_percpu.py"
27: Test timeout computed to be: 9.99988e+06
27: ....
27: ----------------------------------------------------------------------
27: Ran 4 tests in 2.923s
27: 
27: OK
27/46 Test #27: py_test_percpu ...................   Passed    2.98 sec
test 28
      Start 28: py_test_dump_func

28: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_dump_func" "simple" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_dump_func.py"
28: Test timeout computed to be: 9.99988e+06
28: .
28: ----------------------------------------------------------------------
28: Ran 1 test in 0.126s
28: 
28: OK
28/46 Test #28: py_test_dump_func ................   Passed    0.18 sec
test 29
      Start 29: py_test_disassembler

29: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_disassembler" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_disassembler.py"
29: Test timeout computed to be: 9.99988e+06
29: ..
29: ----------------------------------------------------------------------
29: Ran 2 tests in 0.240s
29: 
29: OK
29/46 Test #29: py_test_disassembler .............   Passed    0.30 sec
test 30
      Start 30: py_test_tools_smoke

30: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_tools_smoke" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_tools_smoke.py"
30: Test timeout computed to be: 9.99988e+06
30: Traceback (most recent call last):
30:   File "../../tools/argdist.py", line 708, in run
30:     self._main_loop()
30:   File "../../tools/argdist.py", line 698, in _main_loop
30:     exit()
30:   File "/usr/lib/python2.7/site.py", line 366, in __call__
30:     raise SystemExit(code)
30: SystemExit: None
30: ..In file included from /virtual/main.c:17:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: ...'unknown': I need something more specific.
30: .'unknown': I need something more specific.
30: 'unknown': I need something more specific.
30: 'unknown': I need something more specific.
30: 'unknown': I need something more specific.
30: .......s.............'unknown': I need something more specific.
30: ......Killed
30: .s..........libbpf: failed to find valid kernel BTF
30: libbpf: vmlinux BTF is not found
30: ......'unknown': I need something more specific.
30: .In file included from /virtual/main.c:6:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: ........In file included from /virtual/main.c:15:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: .In file included from /virtual/main.c:15:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: .In file included from /virtual/main.c:3:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: .In file included from /virtual/main.c:5:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: .In file included from /virtual/main.c:3:
30: In file included from include/linux/tcp.h:23:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: .In file included from /virtual/main.c:3:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: .In file included from /virtual/main.c:15:
30: In file included from include/net/sock.h:58:
30: include/linux/memcontrol.h:580:31: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:593:29: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(pn->memcg, idx, val);
30:         ~~~~~~~~~~~~~~~            ^~~
30: include/linux/memcontrol.h:605:38: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         __mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:618:36: warning: implicit conversion from enumeration type 'enum node_stat_item' to different enumeration type 'enum memcg_stat_item' [-Wenum-conversion]
30:         mod_memcg_state(page->mem_cgroup, idx, val);
30:         ~~~~~~~~~~~~~~~                   ^~~
30: include/linux/memcontrol.h:639:40: warning: implicit conversion from enumeration type 'enum memcg_stat_item' to different enumeration type 'enum vm_event_item' [-Wenum-conversion]
30:                 count_memcg_events(page->mem_cgroup, idx, 1);
30:                 ~~~~~~~~~~~~~~~~~~                   ^~~
30: 5 warnings generated.
30: 'unknown': I need something more specific.
30: ...'unknown': I need something more specific.
30: .....'unknown': I need something more specific.
30: ...libbpf: failed to find valid kernel BTF
30: libbpf: vmlinux BTF is not found
30: ......
30: ----------------------------------------------------------------------
30: Ran 83 tests in 277.272s
30: 
30: OK (skipped=2)
30/46 Test #30: py_test_tools_smoke ..............   Passed  277.38 sec
test 31
      Start 31: py_test_tools_memleak

31: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_tools_memleak" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_tools_memleak.py"
31: Test timeout computed to be: 9.99988e+06
31: cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .cannot attach uprobe, Device or resource busy
31: .
31: ----------------------------------------------------------------------
31: Ran 8 tests in 24.028s
31: 
31: OK
31/46 Test #31: py_test_tools_memleak ............   Passed   24.07 sec
test 32
      Start 32: py_test_usdt

32: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_usdt" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_usdt.py"
32: Test timeout computed to be: 9.99988e+06
32: <stdin>:23:17: warning: null character(s) preserved in literal
32: <stdin>:28:17: warning: null character(s) preserved in literal
32: <stdin>: In function ‘int main()’:
32: <stdin>:25:49: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘uint64_t {aka long unsigned int}’ [-Wformat=]
32: <stdin>:30:49: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘uint64_t {aka long unsigned int}’ [-Wformat=]
32: clang -cc1 -triple x86_64-unknown-linux-gnu -emit-llvm-bc -emit-llvm-uselists -disable-free -disable-llvm-verifier -main-file-name main.c -mrelocation-model static -mthread-model posix -fmath-errno -masm-verbose -mconstructor-aliases -fuse-init-array -target-cpu x86-64 -momit-leaf-frame-pointer -dwarf-column-info -debugger-tuning=gdb -coverage-file /usr/src/linux-headers-4.13.0-38-generic/main.c -nostdsysteminc -nobuiltininc -resource-dir ../lib/clang/3.8.1 -isystem /virtual/lib/clang/include -include ./include/linux/kconfig.h -include /virtual/include/bcc/bpf.h -include /virtual/include/bcc/bpf_workaround.h -include /virtual/include/bcc/helpers.h -isystem /virtual/include -I /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python -D __BPF_TRACING__ -I arch/x86/include/ -I arch/x86/include/generated -I include -I arch/x86/include/uapi -I arch/x86/include/generated/uapi -I include/uapi -I include/generated/uapi -D __KERNEL__ -D KBUILD_MODNAME="bcc" -O2 -Wno-deprecated-declarations -Wno-gnu-variable-sized-type-not-at-end -Wno-pragma-once-outside-header -Wno-address-of-packed-member -Wno-unknown-warning-option -Wno-unused-value -Wno-pointer-sign -fdebug-compilation-dir /usr/src/linux-headers-4.13.0-38-generic -ferror-limit 19 -fmessage-length 0 -fobjc-runtime=gcc -fdiagnostics-show-option -vectorize-loops -vectorize-slp -o main.bc -x c /virtual/main.c
32: #if defined(BPF_LICENSE)
32: #error BPF_LICENSE cannot be specified through cflags
32: #endif
32: #if !defined(CONFIG_CC_STACKPROTECTOR)
32: #if defined(CONFIG_CC_STACKPROTECTOR_AUTO) \
32:     || defined(CONFIG_CC_STACKPROTECTOR_REGULAR) \
32:     || defined(CONFIG_CC_STACKPROTECTOR_STRONG)
32: #define CONFIG_CC_STACKPROTECTOR
32: #endif
32: #endif
32: #define bpf_probe_read_kernel bpf_probe_read
32: #define bpf_probe_read_kernel_str bpf_probe_read_str
32: #define bpf_probe_read_user bpf_probe_read
32: #define bpf_probe_read_user_str bpf_probe_read_str
32: #include <uapi/linux/ptrace.h>
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace1_1(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int8_t)) return -1;
32:   switch(PT_REGS_IP(ctx)) {
32:   case 0x55acf8b5280bULL: *((int8_t *)dest) = ctx->ax; __asm__ __volatile__("": : :"memory"); return 0;
32:   case 0x55acf8b52811ULL: *((int8_t *)dest) = ctx->ax; __asm__ __volatile__("": : :"memory"); return 0;
32:   }
32:   return -1;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace1_2(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int32_t)) return -1;
32:   switch(PT_REGS_IP(ctx)) {
32:   case 0x55acf8b5280bULL: { u64 __addr = ctx->bp + -204; __asm__ __volatile__("": : :"memory"); int32_t __res = 0x0; bpf_probe_read_user(&__res, sizeof(__res), (void *)__addr); *((int32_t *)dest) = __res; } return 0;
32:   case 0x55acf8b52811ULL: { u64 __addr = ctx->bp + -208; __asm__ __volatile__("": : :"memory"); int32_t __res = 0x0; bpf_probe_read_user(&__res, sizeof(__res), (void *)__addr); *((int32_t *)dest) = __res; } return 0;
32:   }
32:   return -1;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace3_1(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int32_t)) return -1;
32:   switch(PT_REGS_IP(ctx)) {
32:   case 0x55acf8b5280cULL: { u64 __addr = ctx->bp + -208; __asm__ __volatile__("": : :"memory"); int32_t __res = 0x0; bpf_probe_read_user(&__res, sizeof(__res), (void *)__addr); *((int32_t *)dest) = __res; } return 0;
32:   case 0x55acf8b5281fULL: *((int32_t *)dest) = ctx->ax; __asm__ __volatile__("": : :"memory"); return 0;
32:   }
32:   return -1;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace3_2(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int32_t)) return -1;
32:   switch(PT_REGS_IP(ctx)) {
32:   case 0x55acf8b5280cULL: { u64 __addr = ctx->bp + -204; __asm__ __volatile__("": : :"memory"); int32_t __res = 0x0; bpf_probe_read_user(&__res, sizeof(__res), (void *)__addr); *((int32_t *)dest) = __res; } return 0;
32:   case 0x55acf8b5281fULL: *((int32_t *)dest) = ctx->dx; __asm__ __volatile__("": : :"memory"); return 0;
32:   }
32:   return -1;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace2_1(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int32_t)) return -1;
32:   *((int32_t *)dest) = 5;
32:   return 0;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace2_2(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int8_t)) return -1;
32:   *((int8_t *)dest) = ctx->ax; __asm__ __volatile__("": : :"memory");
32:   return 0;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace4_1(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int64_t)) return -1;
32:   *((int64_t *)dest) = ctx->ax; __asm__ __volatile__("": : :"memory");
32:   return 0;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace4_2(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int64_t)) return -1;
32:   *((int64_t *)dest) = ctx->dx; __asm__ __volatile__("": : :"memory");
32:   return 0;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace5_1(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int64_t)) return -1;
32:   *((int64_t *)dest) = ctx->dx; __asm__ __volatile__("": : :"memory");
32:   return 0;
32: }
32: __attribute__((always_inline))
32: static __always_inline int _bpf_readarg_do_trace5_2(struct pt_regs *ctx, void *dest, size_t len) {
32:   if (len != sizeof(int64_t)) return -1;
32:   *((int64_t *)dest) = ctx->ax; __asm__ __volatile__("": : :"memory");
32:   return 0;
32: }
32: 
32: #include <linux/blkdev.h>
32: #include <uapi/linux/ptrace.h>
32: 
32: struct probe_result_t1 {
32:   char v1;
32:   int  v2;
32: };
32: 
32: struct probe_result_t2 {
32:   int  v1;
32:   char v2;
32: };
32: 
32: struct probe_result_t3 {
32:   int v1;
32:   int v2;
32: };
32: 
32: struct probe_result_t4 {
32:   u64  v1;
32:   char v2[8];
32: };
32: 
32: struct probe_result_t5 {
32:   char v1[8];
32:   u64  v2;
32: };
32: 
32: BPF_PERF_OUTPUT(event1);
32: BPF_PERF_OUTPUT(event2);
32: BPF_PERF_OUTPUT(event3);
32: BPF_PERF_OUTPUT(event4);
32: BPF_PERF_OUTPUT(event5);
32: 
32: __attribute__((section(".bpf.fn.do_trace1")))
32: int do_trace1(struct pt_regs *ctx) {
32: 
32:     struct probe_result_t1 result = {};
32:     _bpf_readarg_do_trace1_1(ctx, &result.v1, sizeof(*(&result.v1)));
32:     _bpf_readarg_do_trace1_2(ctx, &result.v2, sizeof(*(&result.v2)));
32:     bpf_perf_event_output(ctx, bpf_pseudo_fd(1, -1), CUR_CPU_IDENTIFIER, &result, sizeof(result));
32:     return 0;
32: };
32: __attribute__((section(".bpf.fn.do_trace2")))
32: int do_trace2(struct pt_regs *ctx) {
32: 
32:     struct probe_result_t2 result = {};
32:     _bpf_readarg_do_trace2_1(ctx, &result.v1, sizeof(*(&result.v1)));
32:     _bpf_readarg_do_trace2_2(ctx, &result.v2, sizeof(*(&result.v2)));
32:     bpf_perf_event_output(ctx, bpf_pseudo_fd(1, -2), CUR_CPU_IDENTIFIER, &result, sizeof(result));
32:     return 0;
32: }
32: __attribute__((section(".bpf.fn.do_trace3")))
32: int do_trace3(struct pt_regs *ctx) {
32: 
32:     struct probe_result_t3 result = {};
32:     _bpf_readarg_do_trace3_1(ctx, &result.v1, sizeof(*(&result.v1)));
32:     _bpf_readarg_do_trace3_2(ctx, &result.v2, sizeof(*(&result.v2)));
32:     bpf_perf_event_output(ctx, bpf_pseudo_fd(1, -3), CUR_CPU_IDENTIFIER, &result, sizeof(result));
32:     return 0;
32: }
32: __attribute__((section(".bpf.fn.do_trace4")))
32: int do_trace4(struct pt_regs *ctx) {
32: 
32:     struct probe_result_t4 result = {};
32:     _bpf_readarg_do_trace4_1(ctx, &result.v1, sizeof(*(&result.v1)));
32:     ({ u64 __addr = 0x0; _bpf_readarg_do_trace4_2(ctx, &__addr, sizeof(__addr));bpf_probe_read(&result.v2, sizeof(result.v2), (void *)__addr);});
32:     bpf_perf_event_output(ctx, bpf_pseudo_fd(1, -4), CUR_CPU_IDENTIFIER, &result, sizeof(result));
32:     return 0;
32: }
32: __attribute__((section(".bpf.fn.do_trace5")))
32: int do_trace5(struct pt_regs *ctx) {
32: 
32:     struct probe_result_t5 result = {};
32:     ({ u64 __addr = 0x0; _bpf_readarg_do_trace5_1(ctx, &__addr, sizeof(__addr));bpf_probe_read(&result.v1, sizeof(result.v1), (void *)__addr);});
32:     _bpf_readarg_do_trace5_2(ctx, &result.v2, sizeof(*(&result.v2)));
32:     bpf_perf_event_output(ctx, bpf_pseudo_fd(1, -5), CUR_CPU_IDENTIFIER, &result, sizeof(result));
32:     return 0;
32: }
32: 
32: #include <bcc/footer.h>
32: .
32: ----------------------------------------------------------------------
32: Ran 1 test in 4.061s
32: 
32: OK
32: Running from kernel directory at: /lib/modules/4.13.0-38-generic/build
32: str5
32: str4
32: str7
32: str6
32: str9
32: str8
32/46 Test #32: py_test_usdt .....................   Passed    4.37 sec
test 33
      Start 33: py_test_usdt2

33: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_usdt2" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_usdt2.py"
33: Test timeout computed to be: 9.99988e+06
33: .
33: ----------------------------------------------------------------------
33: Ran 1 test in 2.057s
33: 
33: OK
33/46 Test #33: py_test_usdt2 ....................   Passed    2.25 sec
test 34
      Start 34: py_test_usdt3

34: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_usdt3" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_usdt3.py"
34: Test timeout computed to be: 9.99988e+06
34: test:probe [sema 0x0]
34:   location #1 /proc/8601/root/tmp/tmpNN_jHs/liba.so 0x5d1
34:     argument #1 4 signed   bytes @ *(bp - 4)
34:   location #2 /proc/8601/root/tmp/tmpNN_jHs/libb.so 0x5d1
34:     argument #1 4 signed   bytes @ *(bp - 4)
34:   location #3 /proc/8601/root/tmp/tmpNN_jHs/a.out 0x7b1
34:     argument #1 4 signed   bytes @ *(bp - 4)
34: test_dup_name:probe [sema 0x0]
34:   location #1 /proc/8601/root/tmp/tmpNN_jHs/liba.so 0x5d2
34:     argument #1 4 signed   bytes @ *(bp - 4)
34:   location #2 /proc/8601/root/tmp/tmpNN_jHs/libb.so 0x5d2
34:     argument #1 4 signed   bytes @ *(bp - 4)
34:   location #3 /proc/8601/root/tmp/tmpNN_jHs/a.out 0x7b2
34:     argument #1 4 signed   bytes @ *(bp - 4)
34: libc:setjmp [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x36dd1
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ si
34:     argument #3 8 unsigned bytes @ ax
34: libc:longjmp [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x36eb3
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ si
34:     argument #3 8 unsigned bytes @ dx
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x127703
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ si
34:     argument #3 8 unsigned bytes @ dx
34: libc:longjmp_target [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x36ecf
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ ax
34:     argument #3 8 unsigned bytes @ dx
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x12771f
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ ax
34:     argument #3 8 unsigned bytes @ dx
34: libc:memory_mallopt_arena_max [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x87e73
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 32)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x91120
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ *(&mp_ + 32)
34: libc:memory_mallopt_arena_test [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x87e83
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 24)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x91179
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ *(&mp_ + 24)
34: libc:memory_tunable_tcache_max_bytes [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x87e9b
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 88)
34: libc:memory_tunable_tcache_count [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x87ed3
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 96)
34: libc:memory_tunable_tcache_unsorted_limit [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x87ee3
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 104)
34: libc:memory_mallopt_trim_threshold [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x88133
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 0)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x911f0
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ *(&mp_ + 0)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34: libc:memory_mallopt_top_pad [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x88153
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 8)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x911d0
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ *(&mp_ + 8)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34: libc:memory_mallopt_mmap_threshold [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8817b
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ *(&mp_ + 16)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x911af
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ *(&mp_ + 16)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34: libc:memory_mallopt_mmap_max [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x88193
34:     argument #1 4 signed   bytes @ ax
34:     argument #2 4 signed   bytes @ *(&mp_ + 44)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x91188
34:     argument #1 4 signed   bytes @ bx
34:     argument #2 4 signed   bytes @ *(&mp_ + 44)
34:     argument #3 4 signed   bytes @ *(&mp_ + 52)
34: libc:memory_mallopt_perturb [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x881b3
34:     argument #1 4 signed   bytes @ ax
34:     argument #2 4 signed   bytes @ *(&perturb_byte + 0)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x91210
34:     argument #1 4 signed   bytes @ bx
34:     argument #2 4 signed   bytes @ *(&perturb_byte + 0)
34: libc:memory_heap_new [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x882d8
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ bp
34: libc:memory_sbrk_less [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x886ee
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 signed   bytes @ r12
34: libc:memory_arena_reuse_free_list [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8880c
34:     argument #1 8 unsigned bytes @ dx
34: libc:memory_arena_reuse_wait [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8893c
34:     argument #1 8 unsigned bytes @ r8
34:     argument #2 8 unsigned bytes @ r8
34:     argument #3 8 unsigned bytes @ bx
34: libc:memory_arena_reuse [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x88a6c
34:     argument #1 8 unsigned bytes @ dx
34:     argument #2 8 unsigned bytes @ bx
34: libc:memory_arena_new [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x88ce8
34:     argument #1 8 unsigned bytes @ dx
34:     argument #2 8 unsigned bytes @ bp
34: libc:memory_arena_retry [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x88ee9
34:     argument #1 8 unsigned bytes @ si
34:     argument #2 8 unsigned bytes @ di
34: libc:memory_heap_free [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8abf1
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 8 unsigned bytes @ ax
34: libc:memory_heap_less [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8acad
34:     argument #1 8 unsigned bytes @ r15
34:     argument #2 8 unsigned bytes @ r10
34: libc:memory_heap_more [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8b4b5
34:     argument #1 8 unsigned bytes @ r8
34:     argument #2 8 unsigned bytes @ cx
34: libc:memory_sbrk_more [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8b7af
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 signed   bytes @ dx
34: libc:memory_malloc_retry [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8da68
34:     argument #1 8 unsigned bytes @ bp
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8f0b8
34:     argument #1 8 unsigned bytes @ bp
34: libc:memory_mallopt_check_action [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8ee93
34:     argument #1 4 signed   bytes @ ax
34:     argument #2 4 signed   bytes @ *(&check_action + 0)
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x91228
34:     argument #1 4 signed   bytes @ bx
34:     argument #2 4 signed   bytes @ *(&check_action + 0)
34: libc:memory_memalign_retry [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8f2e8
34:     argument #1 8 unsigned bytes @ r12
34:     argument #2 8 unsigned bytes @ bx
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8ff18
34:     argument #1 8 unsigned bytes @ r12
34:     argument #2 8 unsigned bytes @ bx
34:   location #3 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x901a0
34:     argument #1 8 unsigned bytes @ r12
34:     argument #2 8 unsigned bytes @ bx
34:   location #4 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x90470
34:     argument #1 8 unsigned bytes @ r12
34:     argument #2 8 unsigned bytes @ bx
34:   location #5 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x91488
34:     argument #1 8 unsigned bytes @ bx
34:     argument #2 8 unsigned bytes @ r12
34: libc:memory_mallopt_free_dyn_thresholds [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8f4b1
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ cx
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x18c3a8
34:     argument #1 8 unsigned bytes @ ax
34:     argument #2 8 unsigned bytes @ di
34: libc:memory_realloc_retry [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8f980
34:     argument #1 8 unsigned bytes @ r12
34:     argument #2 8 unsigned bytes @ bp
34:   location #2 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x8fcf0
34:     argument #1 8 unsigned bytes @ r15
34:     argument #2 8 unsigned bytes @ bx
34: libc:memory_calloc_retry [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x90790
34:     argument #1 8 unsigned bytes @ r12
34: libc:memory_mallopt [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x910c4
34:     argument #1 4 signed   bytes @ bp
34:     argument #2 4 signed   bytes @ bx
34: libc:memory_mallopt_mxfast [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x910f2
34:     argument #1 4 signed   bytes @ bx
34:     argument #2 8 unsigned bytes @ *(&global_max_fast + 0)
34: libc:lll_lock_wait_private [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/libc-2.26.so 0x123154
34:     argument #1 8 unsigned bytes @ di
34: rtld:init_start [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x3a5f
34:     argument #1 4 signed   bytes @ 0
34:     argument #2 8 unsigned bytes @ bx
34: rtld:init_complete [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x41c8
34:     argument #1 4 signed   bytes @ 0
34:     argument #2 8 unsigned bytes @ bx
34: rtld:map_failed [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x5ac6
34:     argument #1 8 signed   bytes @ *(sp + 72)
34:     argument #2 8 unsigned bytes @ bp
34: rtld:map_start [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x6a3a
34:     argument #1 8 signed   bytes @ *(bp + 40)
34:     argument #2 8 unsigned bytes @ bx
34: rtld:map_complete [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x15a17
34:     argument #1 8 signed   bytes @ *(r15 + 40)
34:     argument #2 8 unsigned bytes @ bx
34:     argument #3 8 unsigned bytes @ *(bp - 104)
34: rtld:reloc_complete [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x15be1
34:     argument #1 8 signed   bytes @ *(ax + 40)
34:     argument #2 8 unsigned bytes @ *(bp - 120)
34:     argument #3 8 unsigned bytes @ *(bp - 104)
34: rtld:reloc_start [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x15d96
34:     argument #1 8 signed   bytes @ *(cx + 40)
34:     argument #2 8 unsigned bytes @ *(bp - 120)
34: rtld:unmap_start [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x1698a
34:     argument #1 8 signed   bytes @ r15
34:     argument #2 8 unsigned bytes @ r14
34: rtld:unmap_complete [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x16c11
34:     argument #1 8 signed   bytes @ *(bp - 112)
34:     argument #2 8 unsigned bytes @ bx
34: rtld:setjmp [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x1d5ad
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ si
34:     argument #3 8 unsigned bytes @ ax
34: rtld:longjmp [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x1d5ed
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ si
34:     argument #3 8 unsigned bytes @ dx
34: rtld:longjmp_target [sema 0x0]
34:   location #1 /proc/8601/root/lib/x86_64-linux-gnu/ld-2.26.so 0x1d609
34:     argument #1 8 unsigned bytes @ di
34:     argument #2 4 signed   bytes @ ax
34:     argument #3 8 unsigned bytes @ dx
34: .
34: ----------------------------------------------------------------------
34: Ran 1 test in 1.146s
34: 
34: OK
34: temp directory: /tmp/tmpNN_jHs
34/46 Test #34: py_test_usdt3 ....................   Passed    1.32 sec
test 35
      Start 35: py_test_license

35: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_license" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_license.py"
35: Test timeout computed to be: 9.99988e+06
35: /virtual/main.c:2:2: error: BPF_LICENSE cannot be specified through cflags
35: #error BPF_LICENSE cannot be specified through cflags
35:  ^
35: 1 error generated.
35: x/virtual/main.c:2:2: error: BPF_LICENSE cannot be specified through cflags
35: #error BPF_LICENSE cannot be specified through cflags
35:  ^
35: 1 error generated.
35: x.bpf: Failed to load program: Invalid argument
35: 0: (bf) r6 = r1
35: 1: (85) call bpf_ktime_get_ns#5
35: cannot call GPL only function from proprietary program
35: 
35: x../virtual/main.c:2:2: error: BPF_LICENSE cannot be specified through cflags
35: #error BPF_LICENSE cannot be specified through cflags
35:  ^
35: 1 error generated.
35: xbpf: Failed to load program: Invalid argument
35: 0: (bf) r6 = r1
35: 1: (85) call bpf_ktime_get_ns#5
35: cannot call GPL only function from proprietary program
35: 
35: x..
35: ----------------------------------------------------------------------
35: Ran 10 tests in 2.889s
35: 
35: OK (expected failures=5)
35/46 Test #35: py_test_license ..................   Passed    2.94 sec
test 36
      Start 36: py_test_free_bcc_memory

36: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_free_bcc_memory" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_free_bcc_memory.py"
36: Test timeout computed to be: 9.99988e+06
36: .
36: ----------------------------------------------------------------------
36: Ran 1 test in 0.263s
36: 
36: OK
36: Before freeing llvm memory: RssFile:  35064 kB
36: After  freeing llvm memory: RssFile:  10384 kB
36/46 Test #36: py_test_free_bcc_memory ..........   Passed    0.32 sec
test 37
      Start 37: py_test_rlimit

37: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_rlimit" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_rlimit.py"
37: Test timeout computed to be: 9.99988e+06
37: could not open bpf map: unused, error: Operation not permitted
37: .
37: ----------------------------------------------------------------------
37: Ran 1 test in 0.468s
37: 
37: OK
37/46 Test #37: py_test_rlimit ...................   Passed    0.52 sec
test 38
      Start 38: py_test_lpm_trie

38: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_lpm_trie" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_lpm_trie.py"
38: Test timeout computed to be: 9.99988e+06
38: ..
38: ----------------------------------------------------------------------
38: Ran 2 tests in 0.462s
38: 
38: OK
38/46 Test #38: py_test_lpm_trie .................   Passed    0.54 sec
test 39
      Start 39: py_ringbuf

39: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_ringbuf" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_ringbuf.py"
39: Test timeout computed to be: 9.99988e+06
39: ssss
39: ----------------------------------------------------------------------
39: Ran 4 tests in 0.000s
39: 
39: OK (skipped=4)
39/46 Test #39: py_ringbuf .......................   Passed    0.06 sec
test 40
      Start 40: py_queuestack

40: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_queuestack" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_queuestack.py"
40: Test timeout computed to be: 9.99988e+06
40: ss
40: ----------------------------------------------------------------------
40: Ran 2 tests in 0.000s
40: 
40: OK (skipped=2)
40/46 Test #40: py_queuestack ....................   Passed    0.05 sec
test 41
      Start 41: py_test_map_batch_ops

41: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_map_batch_ops" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_map_batch_ops.py"
41: Test timeout computed to be: 9.99988e+06
41: ssssss
41: ----------------------------------------------------------------------
41: Ran 6 tests in 0.000s
41: 
41: OK (skipped=6)
41/46 Test #41: py_test_map_batch_ops ............   Passed    0.05 sec
test 42
      Start 42: py_test_map_in_map

42: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "py_test_map_in_map" "sudo" "/home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/python/test_map_in_map.py"
42: Test timeout computed to be: 9.99988e+06
42: ...
42: ----------------------------------------------------------------------
42: Ran 3 tests in 0.990s
42: 
42: OK
42/46 Test #42: py_test_map_in_map ...............   Passed    1.04 sec
test 43
      Start 43: lua_test_clang

43: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "lua_test_clang" "sudo" "/usr/bin/luajit" "test_clang.lua"
43: Test timeout computed to be: 9.99988e+06
43: /virtual/main.c:1:30: error: expected expression
43: int failure(void *ctx) { if (); return 0; }
43:                              ^
43: 1 error generated.
43: ....................
43: Ran 20 tests in 13.056 seconds, 20 successes, 0 failures
43: OK
43/46 Test #43: lua_test_clang ...................   Passed   13.08 sec
test 44
      Start 44: lua_test_uprobes

44: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "lua_test_uprobes" "sudo" "/usr/bin/luajit" "test_uprobes.lua"
44: Test timeout computed to be: 9.99988e+06
44: Python 2.7.14
44: Arena 0:
44: system bytes     =   24547328
44: in use bytes     =    1194928
44: Total (incl. mmap):
44: system bytes     =   24547328
44: in use bytes     =    1194928
44: max mmap regions =          6
44: max mmap bytes   =    8413184
44: ..
44: Ran 2 tests in 0.517 seconds, 2 successes, 0 failures
44: OK
44/46 Test #44: lua_test_uprobes .................   Passed    0.66 sec
test 45
      Start 45: lua_test_dump

45: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/build/tests/wrapper.sh "lua_test_dump" "sudo" "/usr/bin/luajit" "test_dump.lua"
45: Test timeout computed to be: 9.99988e+06
45: .
45: Ran 1 tests in 0.240 seconds, 1 successes, 0 failures
45: OK
45/46 Test #45: lua_test_dump ....................   Passed    0.26 sec
test 46
      Start 46: lua_test_standalone

46: Test command: /home/iovisor/jenkins/workspace/bcc-pr/label/ubuntu1710/tests/lua/test_standalone.sh
46: Test timeout computed to be: 9.99988e+06
46: + cd src/lua
46: + [[ ! -x bcc-lua ]]
46: + echo 'bcc-lua not built --- skipping'
46: bcc-lua not built --- skipping
46: + exit 0
46/46 Test #46: lua_test_standalone ..............   Passed    0.00 sec

100% tests passed, 0 tests failed out of 46

Total Test time (real) = 498.33 sec
+ head -n 1 Testing/TAG
+ cp Testing/20210712-2013/Test.xml ./CTestResults.xml
Taking single-use agent ubuntu1710-slave-5a6 offline.
Finished: SUCCESS